ilyakooo0/urbit
1
0
Fork 0
mirror of https://github.com/ilyakooo0/urbit.git synced 2024-12-02 07:06:41 +03:00
Code Issues Packages Projects Releases Wiki Activity

remove %boil ancestry search, transfer "virtual path" arg to be a coin

Browse Source
This commit is contained in:
Anton Dyudin 2016-01-04 17:15:58 -08:00
parent 4e761e00cd
commit 2cf4efcebe
4 changed files with 57 additions and 81 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ape/dojo.hoon
View File

@ -729,7 +729,7 @@
=- ?~(too - [%cast u.too -]) =- ?~(too - [%cast u.too -])
:+ %ride gen :+ %ride gen
:- [%$ dy-twig-head] :- [%$ dy-twig-head]
[%plan he-beam / zuse arc lib ~ ~] [%plan he-beam blob/** zuse arc lib ~ ~]
:: ::
++ dy-step :: advance project ++ dy-step :: advance project
|= nex=@ud |= nex=@ud

27
arvo/eyre.hoon
View File

@ -141,7 +141,7 @@
$| ~ $| ~
$% [%$ p=httr] :: direct response $% [%$ p=httr] :: direct response
[%red ~] :: parent redirect [%red ~] :: parent redirect
[%boil p=whir q=term r=beam] :: ford request [%bake p=whir q=term r=beam] :: ford request
:: ::
[%js p=@t] :: script [%js p=@t] :: script
[%json p=json] :: data [%json p=json] :: data
@ -159,13 +159,11 @@
:: ::
++ fcgi :: credential caboose ++ fcgi :: credential caboose
|= [quy=quay ced=cred] ^- coin |= [quy=quay ced=cred] ^- coin
:* %many :+ %many
[%$ %ta ~] [%blob ced]
[%blob ced] |- ^- (list coin)
|- ^- (list coin) ?~ quy [%$ %n ~]~
?~ quy ~ [[%$ %t p.i.quy] [%$ %t q.i.quy] $(quy t.quy)]
[[%$ %t p.i.quy] [%$ %t q.i.quy] $(quy t.quy)]
==
:: ::
++ gsig |=([a=dock b=path] [(scot %p p.a) q.a b]) ++ gsig |=([a=dock b=path] [(scot %p p.a) q.a b])
++ session-from-cookies ++ session-from-cookies
@ -940,13 +938,13 @@
++ nice-json (teba ^nice-json) ++ nice-json (teba ^nice-json)
++ pass-note (teba ^pass-note) ++ pass-note (teba ^pass-note)
:: ::
++ ford-boil ++ ford-bake
|= [wir=whir ext=term bem=beam] |= [wir=whir ext=term bem=beam]
=+ yac=for-client =+ yac=for-client
=. him.yac ?.(aut anon him.yac) =. him.yac ?.(aut anon him.yac)
=+ arg=/web/[~(rent co (fcgi quy fcgi-cred.yac))] =+ arg=(fcgi quy fcgi-cred.yac)
=. r.bem ?+(r.bem r.bem [%ud %0] da/now) =. r.bem ?+(r.bem r.bem [%ud %0] da/now)
(execute wir -.bem [%boil ext bem arg]) (execute wir -.bem [%bake ext arg bem])
:: ::
:: ::
++ apex ++ apex
@ -967,7 +965,7 @@
%json (give-json 200 cug p.pez) %json (give-json 200 cug p.pez)
%html (give-html 200 cug p.pez) %html (give-html 200 cug p.pez)
%htme (give-html 401 cug p.pez) %htme (give-html 401 cug p.pez)
%boil (ford-boil +.pez) %bake (ford-bake +.pez)
%red %red
=+ url=(earn hat pok(p [~ %html]) quy) =+ url=(earn hat pok(p [~ %html]) quy)
?+ p.pok ~|(bad-redirect/[p.pok url] !!) ?+ p.pok ~|(bad-redirect/[p.pok url] !!)
@ -1158,7 +1156,7 @@
~| bad-beam/q.bem ~| bad-beam/q.bem
?< =([~ 0] (sky %cw (tope bem(+ ~, r [%da now])))) ?< =([~ 0] (sky %cw (tope bem(+ ~, r [%da now]))))
=+ [wir ext bem] =+ [wir ext bem]
?.(aut [%& %boil -] [%| (ford-boil -)]) :: XX properly ?.(aut [%& %bake -] [%| (ford-bake -)]) :: XX properly
:: ::
%bugs %bugs
?- p.hem ?- p.hem
@ -1218,7 +1216,7 @@
?~ p.pez pez ?~ p.pez pez
?+ -.p.pez ~&(bad-inject/p.pez !!) ?+ -.p.pez ~&(bad-inject/p.pez !!)
%red pez %red pez
%boil %bake
=. ya abet.yac =. ya abet.yac
[%| (resolve ~ p.pez(p [%at ses.yac p.p.pez]))] [%| (resolve ~ p.pez(p [%at ses.yac p.p.pez]))]
:: ::
@ -1633,3 +1631,4 @@
q.hin q.hin
[mos ..^$] [mos ..^$]
-- --

75
arvo/ford.hoon
View File

@ -56,7 +56,7 @@
== :: == ::
++ calx :: concrete cache line ++ calx :: concrete cache line
$% [%hood p=calm q=(pair beam cage) r=hood] :: compile $% [%hood p=calm q=(pair beam cage) r=hood] :: compile
[%bake p=calm q=(trel mark beam heel) r=(unit vase)]:: load [%bake p=calm q=(trel mark coin beam) r=(unit vase)] :: load
[%lilt p=calm q=beak r=(jug mark mark)] :: translation graph [%lilt p=calm q=beak r=(jug mark mark)] :: translation graph
[%slit p=calm q=[p=type q=type] r=type] :: slam type [%slit p=calm q=[p=type q=type] r=type] :: slam type
[%slim p=calm q=[p=type q=twig] r=(pair type nock)]:: mint [%slim p=calm q=[p=type q=twig] r=(pair type nock)]:: mint
@ -279,9 +279,7 @@
== == == ==
:: ::
++ zo ++ zo
~% %ford-z ~% %ford-z ..is ~
..is
~
|_ [num=@ud task] |_ [num=@ud task]
++ abet %_(..zo q.tad.bay (~(put by q.tad.bay) num +<+)) ++ abet %_(..zo q.tad.bay (~(put by q.tad.bay) num +<+))
++ amok ++ amok
@ -575,7 +573,7 @@
|= [cof=cafe for=mark bem=beam] |= [cof=cafe for=mark bem=beam]
^- (bolt hood) ^- (bolt hood)
%+ cool |.(leaf/"ford: fade {<[(tope bem)]>}") %+ cool |.(leaf/"ford: fade {<[(tope bem)]>}")
%+ cope (cope (make cof [%bake for bem ~]) furl) %+ cope (liar cof %*(. bem s [for s.bem]))
|= [cof=cafe cay=cage] |= [cof=cafe cay=cage]
%+ (clef %hood) (fine cof bem(r [%ud 0]) cay) %+ (clef %hood) (fine cof bem(r [%ud 0]) cay)
^- (burg (pair beam cage) hood) ^- (burg (pair beam cage) hood)
@ -599,7 +597,7 @@
?~ opt (flue cof) ?~ opt (flue cof)
|- ^- (bolt (unit beam)) |- ^- (bolt (unit beam))
=. i.s.bem (tack opt) =. i.s.bem (tack opt)
%+ cope (lima cof %hoon bem ~) %+ cope (lima cof %hoon many/~ bem)
|= [cof=cafe vax=(unit vase)] ^- (bolt (unit beam)) |= [cof=cafe vax=(unit vase)] ^- (bolt (unit beam))
?^ vax (fine cof `bem) ?^ vax (fine cof `bem)
?~ t.opt (flue cof) ?~ t.opt (flue cof)
@ -905,7 +903,7 @@
(fine cof (some |)) (fine cof (some |))
:: ::
++ lace :: load real or virtual ++ lace :: load real or virtual
|= [cof=cafe for=mark bem=beam arg=heel lit=?] |= [cof=cafe for=mark arg=coin bem=beam lit=?]
^- (bolt vase) ^- (bolt vase)
=. s.bem [for s.bem] =. s.bem [for s.bem]
?: lit ?: lit
@ -980,7 +978,7 @@
|= [cof=cafe bem=beam] ^- (bolt vase) |= [cof=cafe bem=beam] ^- (bolt vase)
%+ cope (fame cof bem) %+ cope (fame cof bem)
|= [cof=cafe bem=beam] |= [cof=cafe bem=beam]
(cope (fade cof %hoon bem) abut:(meow bem ~)) (cope (fade cof %hoon bem) abut:(meow bem many/~))
:: ::
++ lend :: load arch ++ lend :: load arch
|= [cof=cafe bem=beam] |= [cof=cafe bem=beam]
@ -1075,36 +1073,34 @@
-- --
:: ::
++ lima :: load at depth ++ lima :: load at depth
|= [cof=cafe for=mark bem=beam arg=heel] |= [cof=cafe for=mark arg=coin bem=beam]
%+ (clef %bake) [p=cof q=[%0 p=[bem `~] q=[for bem arg]]] %+ (clef %bake) [p=cof q=[%0 p=[bem `~] q=[for arg bem]]]
|= [cof=cafe for=mark bem=beam arg=heel] |= [cof=cafe for=mark arg=coin bem=beam]
^- (bolt (unit vase)) ^- (bolt (unit vase))
%+ cope (laze cof bem) %+ cope (laze cof bem)
|= [cof=cafe mal=(map mark ,?)] |= [cof=cafe mal=(map mark ,?)]
=+ lit=(~(get by mal) for) =+ lit=(~(get by mal) for)
?^ lit ?^ lit
(cope (lace cof for bem arg u.lit) (flux some)) (cope (lace cof for arg bem u.lit) (flux some))
=+ opt=(sa (turn (~(tap by mal)) head)) :: XX asymptotics =+ opt=(sa (turn (~(tap by mal)) head)) :: XX asymptotics
%+ cope (lion cof for opt) %+ cope (lion cof for opt)
|= [cof=cafe wuy=(list ,@tas)] |= [cof=cafe wuy=(list ,@tas)]
?~ wuy (flue cof) ?~ wuy (flue cof)
%+ cope %+ cope
(lace cof i.wuy bem arg (~(got by mal) i.wuy)) (lace cof i.wuy arg bem (~(got by mal) i.wuy))
|= [cof=cafe hoc=vase] |= [cof=cafe hoc=vase]
(cope (lope cof i.wuy t.wuy hoc) (flux some)) (cope (lope cof i.wuy t.wuy hoc) (flux some))
:: ::
++ lime :: load beam ++ lime :: load beam
|= [cof=cafe for=mark bem=beam arg=heel] |= [cof=cafe for=mark arg=coin bem=beam]
=+ [mob=bem mer=(flop arg)] ^- (bolt vase)
|- ^- (bolt vase) %+ cope (lima cof for arg bem)
%+ cope (lima cof for mob (flop mer))
|= [cof=cafe vux=(unit vase)] |= [cof=cafe vux=(unit vase)]
?^ vux (fine cof u.vux) ?^ vux (fine cof u.vux)
?~ s.mob (limp cof for bem arg) (limp cof for arg bem)
^$(s.mob t.s.mob, mer [i.s.mob mer])
:: ::
++ limp :: render ++ limp :: render
|= [cof=cafe for=mark bem=beam arg=heel] |= [cof=cafe for=mark arg=coin bem=beam]
%+ cope (fame cof -.bem /[for]/ren) %+ cope (fame cof -.bem /[for]/ren)
|= [cof=cafe bom=beam] |= [cof=cafe bom=beam]
(cope (fade cof %hoon bom) abut:(meow bem arg)) (cope (fade cof %hoon bom) abut:(meow bem arg))
@ -1192,7 +1188,7 @@
:: =+ ^= pre :: =+ ^= pre
:: ?+ -.kas -.kas :: ?+ -.kas -.kas
:: ^ %cell :: ^ %cell
:: %boil [-.kas p.kas (tope q.kas)] :: :: %boil [-.kas p.kas (tope q.kas)]
:: %bake [-.kas p.kas (tope q.kas)] :: %bake [-.kas p.kas (tope q.kas)]
:: %core [-.kas (tope p.kas)] :: %core [-.kas (tope p.kas)]
:: == :: ==
@ -1214,21 +1210,21 @@
== ==
:: ::
%$ (fine cof %& p.kas) %$ (fine cof %& p.kas)
:: %bake
:: :: ~& > [p.kas (tope q.kas)]
:: :: %+ cool |.(leaf/"ford: bake {<p.kas>} {<(tope q.kas)>}")
:: %+ cope (lima cof p.kas q.kas r.kas s.kas)
:: |= [cof=cafe vux=(unit vase)]
:: ?~ vux
:: (flaw cof leaf/"file not found" (smyt (tope r.kas)) ~)
:: (fine cof [%& p.kas u.vux])
:: ::
%bake %bake
:: ~& > [p.kas (tope q.kas)]
:: %+ cool |.(leaf/"ford: bake {<p.kas>} {<(tope q.kas)>}")
%+ cope (lima cof p.kas q.kas r.kas)
|= [cof=cafe vux=(unit vase)]
?~ vux
(flaw cof leaf/"file not found" (smyt (tope q.kas)) ~)
(fine cof [%& p.kas u.vux])
::
%boil
^- (bolt gage) ^- (bolt gage)
%+ cool |.(leaf/"ford: boil {<p.kas>} {<(tope q.kas)>} {<r.kas>}") %+ cool |.(leaf/"ford: bake {<p.kas>} {<(tope r.kas)>} {~(rend co q.kas)}")
%+ cope (lamp cof q.kas) %+ cope (lamp cof r.kas)
|= [cof=cafe bem=beam] |= [cof=cafe bem=beam]
%+ cope (lime cof p.kas bem r.kas) %+ cope (lime cof p.kas q.kas bem)
|= [cof=cafe vax=vase] |= [cof=cafe vax=vase]
(fine cof `gage`[%& p.kas vax]) (fine cof `gage`[%& p.kas vax])
:: ::
@ -1381,14 +1377,13 @@
|=(val=* `vase`[typ val]) |=(val=* `vase`[typ val])
:: ::
++ meow :: assemble ++ meow :: assemble
|= [how=beam arg=heel] |= [how=beam arg=coin]
=| $: rop=(map term (pair hoof twig)) :: structures =| $: rop=(map term (pair hoof twig)) :: structures
bil=(map term (pair hoof twig)) :: libraries bil=(map term (pair hoof twig)) :: libraries
boy=(list twig) :: body stack boy=(list twig) :: body stack
lit=? :: drop arguments lit=? :: drop arguments
== ==
~% %meow ..meow ~% %meow ..meow ~
~
|% |%
++ able :: assemble preamble ++ able :: assemble preamble
^- twig ^- twig
@ -1478,7 +1473,9 @@
%arg %arg
%+ cope (maim cof bax p.hon) %+ cope (maim cof bax p.hon)
|= [cof=cafe gat=vase] |= [cof=cafe gat=vase]
(maul cof gat !>([how arg])) %+ cope (maim cof !>(~) ((jock |) arg))
|= [cof=cafe val=vase]
(maul cof gat (slop !>(how) val))
:: ::
%alt %alt
=+ opt=|.(>(turn p.hon |=([a=path ^] a))<) =+ opt=|.(>(turn p.hon |=([a=path ^] a))<)
@ -1546,7 +1543,9 @@
(flaw cof [%leaf "type error: {<p.hon>} {<q.hon>}"]~) (flaw cof [%leaf "type error: {<p.hon>} {<q.hon>}"]~)
(fine cof [p.tug q.vax]) (fine cof [p.tug q.vax])
:: ::
%toy (cope (cope (make cof %boil p.hon how ?:(lit ~ arg)) furl) feel) %toy
=+ [%bake p.hon ?:(lit many/~ arg) how]
(cope (cope (make cof -) furl) feel)
== ==
:: ::
++ head :: consume structures ++ head :: consume structures

34
arvo/zuse.hoon
View File

@ -1117,32 +1117,11 @@
?:(=(~ fyl) ~ [(crip (flop fyl)) ~]) ?:(=(~ fyl) ~ [(crip (flop fyl)) ~])
:: ::
++ fuel :: parse fcgi ++ fuel :: parse fcgi
|= [bem=beam but=path] =+ packed-quay=|-($|(~ [p=@t q=@t t=$]))
|= [bem=beam ced=noun:cred quy=packed-quay]
^- epic ^- epic
?> ?=([%web @ *] but) =+ qix=|-(`quay`?~(quy quy [[p q]:quy $(quy t.quy)]))
=+ dyb=(slay i.t.but) [(mo qix) ((hard cred) ced) bem /]
?> ?& ?=([~ %many *] dyb)
?=([* * *] p.u.dyb)
?=([%$ %ta *] i.p.u.dyb)
?=([%blob *] i.t.p.u.dyb)
==
=+ ced=((hard cred) p.i.t.p.u.dyb)
:: =+ nep=q.p.i.p.u.dyb
=+ ^= gut ^- (list ,@t)
%+ turn t.t.p.u.dyb
|= a=coin ^- @t
?> ?=([%$ %t @] a)
?>(((sane %t) q.p.a) q.p.a)
=+ ^= quy
|- ^- (list ,[p=@t q=@t])
?~ gut ~
?> ?=(^ t.gut)
[[i.gut i.t.gut] $(gut t.t.gut)]
:* (~(gas by *(map cord cord)) quy)
ced
bem
t.t.but
==
:: ::
++ sifo :: 64-bit encode ++ sifo :: 64-bit encode
|= tig=@ |= tig=@
@ -2531,8 +2510,7 @@
++ silk :: construction layer ++ silk :: construction layer
$& [p=silk q=silk] :: cons $& [p=silk q=silk] :: cons
$% [%$ p=cage] :: literal $% [%$ p=cage] :: literal
[%bake p=mark q=beam r=path] :: local synthesis [%bake p=mark q=coin r=beam] :: local synthesis
[%boil p=mark q=beam r=path] :: general synthesis
[%bunt p=mark] :: example of mark [%bunt p=mark] :: example of mark
[%call p=silk q=silk] :: slam [%call p=silk q=silk] :: slam
[%cast p=mark q=silk] :: translate [%cast p=mark q=silk] :: translate
@ -2545,7 +2523,7 @@
[%mash p=mark q=milk r=milk] :: annotate [%mash p=mark q=milk r=milk] :: annotate
[%mute p=silk q=(list (pair wing silk))] :: mutant [%mute p=silk q=(list (pair wing silk))] :: mutant
[%pact p=silk q=silk] :: patch [%pact p=silk q=silk] :: patch
[%plan p=beam q=spur r=hood] :: structured assembly [%plan p=beam q=coin r=hood] :: structured assembly
[%reef ~] :: kernel reef [%reef ~] :: kernel reef
[%ride p=twig q=silk] :: silk thru twig [%ride p=twig q=silk] :: silk thru twig
[%tabl p=(list (pair silk silk))] :: list [%tabl p=(list (pair silk silk))] :: list