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

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

View File

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

View File

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

View File

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

View File

@ -1117,32 +1117,11 @@
?:(=(~ fyl) ~ [(crip (flop fyl)) ~])
::
++ fuel :: parse fcgi
|= [bem=beam but=path]
=+ packed-quay=|-($|(~ [p=@t q=@t t=$]))
|= [bem=beam ced=noun:cred quy=packed-quay]
^- epic
?> ?=([%web @ *] but)
=+ dyb=(slay i.t.but)
?> ?& ?=([~ %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
==
=+ qix=|-(`quay`?~(quy quy [[p q]:quy $(quy t.quy)]))
[(mo qix) ((hard cred) ced) bem /]
::
++ sifo :: 64-bit encode
|= tig=@
@ -2531,8 +2510,7 @@
++ silk :: construction layer
$& [p=silk q=silk] :: cons
$% [%$ p=cage] :: literal
[%bake p=mark q=beam r=path] :: local synthesis
[%boil p=mark q=beam r=path] :: general synthesis
[%bake p=mark q=coin r=beam] :: local synthesis
[%bunt p=mark] :: example of mark
[%call p=silk q=silk] :: slam
[%cast p=mark q=silk] :: translate
@ -2545,7 +2523,7 @@
[%mash p=mark q=milk r=milk] :: annotate
[%mute p=silk q=(list (pair wing silk))] :: mutant
[%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
[%ride p=twig q=silk] :: silk thru twig
[%tabl p=(list (pair silk silk))] :: list