canonize references into space:clay

This commit is contained in:
Anton Dyudin 2016-12-01 15:59:17 -08:00
parent e7140e3c37
commit 75b2840b97
12 changed files with 72 additions and 69 deletions

View File

@ -5,7 +5,8 @@
/- sole, lens :: console structures
/+ sole :: console library
[. sole]
=, space:clay
=, space:userlib
=, format
:: :: ::
:::: :: ::::
:: :: ::
@ -228,7 +229,7 @@
;~(pose sym (easy dp-default-app))
==
++ dp-beam :: ++beam
%+ cook |=(a/path =+((tome a) ?^(- u [he-beak (flop a)])))
%+ cook |=(a/path =+((de-beam a) ?^(- u [he-beak (flop a)])))
=+ vez=(vang | dp-path)
(sear plex:vez (stag %conl poor:vez))
::
@ -238,11 +239,11 @@
auru:urlp:url:eyre
::
++ dp-model ;~(plug dp-server dp-config) :: ++dojo-model
++ dp-path (tope he-beam) :: ++path
++ dp-path (en-beam he-beam) :: ++path
++ dp-server (stag 0 (most fas sym)) :: ++dojo-server
++ dp-twig tall:(vang | dp-path) :: ++twig
++ dp-rood :: 'dir' twig
=> (vang | (tope dir))
=> (vang | (en-beam dir))
;~ pose
rood
::
@ -472,9 +473,9 @@
?: ?=({@ $~} pax) ~[i.pax %home '0']
?: ?=({@ @ $~} pax) ~[i.pax i.t.pax '0']
pax
=. dir (need (tome pax))
=. dir (need (de-beam pax))
=- +>(..dy (he-diff %tan - ~))
rose+[" " `~]^~[leaf+"=%" (smyt (tope he-beak s.dir))]
rose+[" " `~]^~[leaf+"=%" (smyt (en-beam he-beak s.dir))]
==
::
$poke
@ -492,7 +493,7 @@
%info
/file
our.hid
(foal (tope p.p.mad) cay)
(foal (en-beam p.p.mad) cay)
==
::
$flat
@ -1073,7 +1074,7 @@
?- -.sink.com
$stdout [%show %0]
$output-file $(sink.com [%command (cat 3 '@' pax.sink.com)])
$output-clay [%file (need (tome pax.sink.com))]
$output-clay [%file (need (de-beam pax.sink.com))]
$url [%http %post `~. url.sink.com]
$to-api !!
$send-api [%poke our.hid api.sink.com]

View File

@ -5,7 +5,8 @@
/- talk, sole
/+ talk, sole, time-to-id, twitter
/= seed /~ !>(.)
=, space:clay
=, space:userlib
=, format
=, unity
::
::::
@ -2320,7 +2321,7 @@
^- move
=+ ^- paf/path
=+ day=(year %*(. (yore now.hid) +.t +:*tarp))
%+ tope [our.hid %home da+now.hid]
%+ en-beam [our.hid %home da+now.hid]
/talk-telegrams/(scot %da day)/[man]/talk
=+ grams:(~(got by stories) man)
[ost.hid %info /jamfile our.hid (foal paf [%talk-telegrams !>(-)])]

View File

@ -7,6 +7,7 @@
::
:::: ~fyr
::
=, ^eyre
|%
++ twit-path :: valid peer path
$% {$cred $~} :: credential info

View File

@ -4,7 +4,6 @@
|= pit/vase
=, ^eyre
=, crypto
=, space:clay
=, bytes:eyre
=, js:eyre
=, url:eyre
@ -791,7 +790,7 @@
::
$born +>.$(ged hen) :: register external
$serv
=< ~&([%serving (tope top)] .)
=< ~&([%serving (en-beam top)] .)
?^(p.kyz +>.$(top p.kyz) +>.$(q.top p.kyz))
::
$crud
@ -1051,7 +1050,7 @@
(give-thou 307 [location+(crip url)]~ ~)
:: (give-html:abet 200 ~ (redir:xml url))
?. ?=($mime p.cay)
=+ bek=(norm-beak -:(need (tome (need (puck p.tee)))))
=+ bek=(norm-beak -:(need (de-beam (need (puck p.tee)))))
(exec-live ac+q.tee bek [%flag [p.sih `~] %cast %mime [%$ cay]])
(give-mime q.tee p.sih cay)
::
@ -1287,7 +1286,7 @@
::
++ resolve-bake
|= {ses/(unit hole) dom/(unit @t) men/mend mar/mark arg/coin bem/beam}
=+ wir=[%at (pack [- +]:(tope -.bem ~)) (fall ses %$) men ?~(dom ~ [u.dom]~)]
=+ wir=[%at (pack [- +]:(en-beam -.bem ~)) (fall ses %$) men ?~(dom ~ [u.dom]~)]
=. -.bem (norm-beak -.bem)
=+ req=[%bake mar arg bem]
=+ red=[%bake %red-quri arg bem]
@ -1370,11 +1369,11 @@
=+ =< tyk=(drop-list (turn q.pok .)) :: a path whose elements
|=(a/knot `(unit tyke)`(rush a gasp:vast)) :: are in /=foo==/=bar
?~ tyk ~ :: syntax
=+ %- posh:(vang & (tope top)) :: that the base path
=+ %- posh:(vang & (en-beam top)) :: that the base path
[[~ (zing u.tyk)] ~] :: can interpolate into
?~ - ~ ::
=+ (plex:vast %conl u) :: staticly, and make a
(biff - tome) :: valid beam
(biff - de-beam) :: valid beam
::
++ as-aux-request :: /~/... req parser
^- (unit perk)
@ -1513,7 +1512,7 @@
=+ ext=(fall p.pok %urb)
=+ bem=?-(-.hem $beam p.hem, $spur [-.top (weld p.hem s.top)])
~| bad-beam+q.bem
?< =([~ 0] (sky [151 %noun] %cw (tope bem(+ ~, r [%da now]))))
?< =([~ 0] (sky [151 %noun] %cw (en-beam bem(+ ~, r [%da now]))))
=+ men=?+(mef !! $get mef, $head mef) :: redact result
=+ arg=(fcgi payload fcgi-cred)
=+ [%bake men ext arg bem]
@ -1932,7 +1931,7 @@
+12.q
=+ ^= ato
%- sky
[[151 %noun] %cx (tope root-beak [%atom (flop %_(dom . sec+dom))])]
[[151 %noun] %cx (en-beam root-beak [%atom (flop %_(dom . sec+dom))])]
=+ key=?~(ato '' ;;(@t u.ato)) :: XX jael
=. key
?~ key ''

View File

@ -4,7 +4,7 @@
::::
|= pit/vase
=, ^ford
=, space:clay
=, format
=> =~
:: structures
|%
@ -248,7 +248,7 @@
|= {dep/@uvH dap/(set beam)}
%+ turn (~(tap in dap))
|= bem/beam
:^ hen %pass [(scot %p our) (scot %uv dep) (tope bem)]
:^ hen %pass [(scot %p our) (scot %uv dep) (en-beam bem)]
[%c %warp [our p.bem] q.bem ~]
::
++ awap :: get next revision
@ -280,7 +280,7 @@
mow
=< (welp :_(mow (turn (~(tap in p.u.dap)) .)))
|= bem/beam
:^ hen %pass [(scot %p our) (scot %uv dep) (tope bem)]
:^ hen %pass [(scot %p our) (scot %uv dep) (en-beam bem)]
[%c [%warp [our p.bem] q.bem ~ [%next %z r.bem (flop s.bem)]]]
== ==
::
@ -310,7 +310,7 @@
==
++ camp-wire :: encode block
|= {van/vane ren/care:^clay bem/beam} ^- wire
[(scot %p our) (scot %ud num) van ren (tope bem)]
[(scot %p our) (scot %ud num) van ren (en-beam bem)]
::
++ camp :: request a file
|= {van/vane ren/care:^clay bem/beam}
@ -361,8 +361,8 @@
$0
:: ~& :- %clef-new
:: ?+ sem `term`sem
:: $hood [%hood (tope &1.q.q.hoc)]
:: $bake [%bake `mark`&1.q.q.hoc (tope |2.q.q.hoc)]
:: $hood [%hood (en-beam &1.q.q.hoc)]
:: $bake [%bake `mark`&1.q.q.hoc (en-beam |2.q.q.hoc)]
:: ==
:- p=(came p.nuf `calx`[sem `calm`[now p.q.nuf] q.q.hoc q.q.nuf])
q=q.nuf
@ -452,7 +452,7 @@
=+ ren=((soft care:^clay) (rsh 3 1 i.pax))
?~ ren
(err "blocking not care: {<i.pax>}")
=+ zis=(tome t.pax)
=+ zis=(de-beam t.pax)
?~ zis
(err "blocking not beam: {<t.pax>}")
?: ?=($g (end 3 1 i.pax))
@ -603,9 +603,9 @@
++ fade :: compile to hood
~/ %fade
|= {cof/cafe bem/beam}
:: ~& fade+(tope bem)
:: ~& fade+(en-beam bem)
^- (bolt hood)
%+ cool |.(leaf+"ford: fade {<[(tope bem)]>}")
%+ cool |.(leaf+"ford: fade {<[(en-beam bem)]>}")
%+ cope (liar cof %*(. bem s [%hoon s.bem]))
|= {cof/cafe cay/cage}
%+ (clef %hood) (fine cof bem(r [%ud 0]) cay)
@ -627,7 +627,7 @@
%+ cope une
|= {cof/cafe bom/(unit beam)} ^- (bolt beam)
?^ bom (fine cof u.bom)
(flaw cof leaf+"fame: no {<(tope bem)>}" ~)
(flaw cof leaf+"fame: no {<(en-beam bem)>}" ~)
%+ (clef %path) (fine cof bem)
|= {cof/cafe bem/beam}
=^ pax bem [(flop s.bem) bem(s ~)]
@ -659,7 +659,7 @@
|= {cof/cafe opt/(map term beam)} ^- (bolt (unit beam))
?~ opt (flue cof)
?: ?=({^ $~ $~} opt) (fine cof `q.n.opt)
=+ all=(~(run by `(map term beam)`opt) tope)
=+ all=(~(run by `(map term beam)`opt) en-beam)
(flaw cof leaf+"fame: fork {<all>}" ~)
--
::
@ -671,7 +671,7 @@
++ fair :: hood parsing rule
|= bem/beam
?> ?=({$ud $0} r.bem) :: XX sentinel
=+ vez=(vang & (tope bem))
=+ vez=(vang & (en-beam bem))
=< hood
|%
++ case
@ -683,7 +683,7 @@
::
++ mota ;~(pfix pat mota:vez) :: atom odor
++ hath (sear plex (stag %conl poor)):vez :: hood path
++ have (sear tome ;~(pfix fas hath)) :: hood beam
++ have (sear de-beam ;~(pfix fas hath)) :: hood beam
++ hith :: static path
=> vez
(sear plex (stag %conl (more fas hasp)))
@ -994,7 +994,7 @@
++ lace :: load file
|= {cof/cafe for/mark bem/beam}
^- (bolt vase)
%+ cool |.(leaf+"ford: load {<for>} {<(tope bem)>}")
%+ cool |.(leaf+"ford: load {<for>} {<(en-beam bem)>}")
=. s.bem [for s.bem]
%+ cope (liar cof bem)
|= {cof/cafe cay/cage} ^- (bolt vase)
@ -1077,12 +1077,12 @@
|= {cof/cafe bem/beam}
^- (bolt cage)
?: =([%ud 0] r.bem)
(flaw cof [leaf+"ford: no data: {<(tope bem(s ~))>}"]~)
(flaw cof [leaf+"ford: no data: {<(en-beam bem(s ~))>}"]~)
=+ von=(syve [151 %noun] ~ %cx bem)
?~ von
[p=cof q=[%1 [[%c %x bem ~] ~ ~]]]
?~ u.von
(flaw cof leaf+"file not found" (smyt (tope bem)) ~)
(flaw cof leaf+"file not found" (smyt (en-beam bem)) ~)
(fine cof u.u.von)
::
++ lily
@ -1125,7 +1125,7 @@
%+ cope (lima cof for bem)
|= {cof/cafe vux/(unit vase)}
?^ vux (fine cof u.vux)
(flaw cof leaf+"ford: no {<for>} at {<(tope bem)>}" ~)
(flaw cof leaf+"ford: no {<for>} at {<(en-beam bem)>}" ~)
::
++ link :: translate
~/ %link
@ -1242,8 +1242,8 @@
:: =+ ^= pre
:: ?+ -.kas `term`-.kas
:: ^ %cell
:: $bake [-.kas p.kas (tope r.kas) ~(rent co (abbrev q.kas))]
:: $core [-.kas (tope p.kas)]
:: $bake [-.kas p.kas (en-beam r.kas) ~(rent co (abbrev q.kas))]
:: $core [-.kas (en-beam p.kas)]
:: ==
:: ~? !=(%$ pre) [dyv `term`(cat 3 %make (fil 3 dyv ' ')) pre]
:: =- ~? !=(%$ pre) [dyv `term`(cat 3 %made (fil 3 dyv ' ')) pre] -
@ -1272,7 +1272,7 @@
$bake
^- (bolt gage)
%+ cool
|.(leaf+"ford: bake {<p.kas>} {<(tope r.kas)>} {~(rend co q.kas)}")
|.(leaf+"ford: bake {<p.kas>} {<(en-beam r.kas)>} {~(rend co q.kas)}")
%+ cope (lamp cof r.kas)
|= {cof/cafe bem/beam}
%+ cope (lime cof p.kas q.kas bem)
@ -1322,7 +1322,7 @@
(flux |=(vax/vase [%& p.kas vax]))
::
$core
%+ cool |.(leaf+"ford: core {<(tope p.kas)>}")
%+ cool |.(leaf+"ford: core {<(en-beam p.kas)>}")
(cope (lear cof p.kas) (flux |=(a/vase [%& %core a])))
::
$diff
@ -1575,7 +1575,7 @@
$for
=+ opt=|.(>(turn p.hon |=({a/path ^} a))<)
|- ^- (bolt cage)
?~ p.hon (flaw cof leaf+"ford: no match" >(tope how)< *opt ~)
?~ p.hon (flaw cof leaf+"ford: no match" >(en-beam how)< *opt ~)
?: =(p.i.p.hon (scag (lent p.i.p.hon) (flop s.how)))
^$(hon q.i.p.hon)
$(p.hon t.p.hon)
@ -1626,12 +1626,12 @@
(flux |=(a/vase noun+a))
::
$see
=+ vez=(vang & (tope how))
=+ vez=(vang & (en-beam how))
=+ tuz=(posh:vez p.hon)
?~ tuz (flaw cof leaf+"bad tusk: {<p.hon>}" ~)
=+ pax=(plex:vez %conl u.tuz)
?~ pax (flaw cof leaf+"bad path: {<u.tuz>}" ~)
=+ bem=(tome u.pax)
=+ bem=(de-beam u.pax)
?~ bem (flaw cof leaf+"bad beam: {<u.pax>}" ~)
$(hon q.hon, how u.bem)
::
@ -1648,7 +1648,7 @@
?: p.hon
=. arg ?.(lit arg many+~)
(cope (make cof %bake q.hon arg how) furl)
%+ cool |.(leaf+"ford: hook {<q.hon>} {<(tope how)>}")
%+ cool |.(leaf+"ford: hook {<q.hon>} {<(en-beam how)>}")
%+ cope (fade cof how)
|= {cof/cafe hyd/hood}
%+ cope (abut:(meow how arg) cof hyd)
@ -1725,7 +1725,7 @@
$& (fine cof ..wilt(boy [p.hop boy]))
$|
=. r.p.hop ?:(?=({$ud $0} r.p.hop) r.how r.p.hop)
%+ cool |.(leaf+"ford: wilt {<[(tope p.hop)]>}")
%+ cool |.(leaf+"ford: wilt {<[(en-beam p.hop)]>}")
%+ cope (lend cof p.hop)
|= {cof/cafe arc/arch}
?: (~(has by dir.arc) %hoon)
@ -1752,7 +1752,7 @@
[`(map term foot)`[[p.n.all [%ash [%tow boy.sel]]] lef rig] sel]
|= {cof/cafe mav/(map term foot) sel/_..wilt}
?~ mav
(flaw cof [%leaf "source missing: {<(tope p.hop)>}"]~)
(flaw cof [%leaf "source missing: {<(en-beam p.hop)>}"]~)
(fine cof sel(boy [[%core mav] boy]))
==
--
@ -1808,7 +1808,7 @@
=. kig (~(del in kig) +<-.$)
?~ rot
=^ dep deh.bay (daze ~ deh.bay) :: dependencies?
amok:(expo [%made dep %| (smyt ren (tope bem)) ~])
amok:(expo [%made dep %| (smyt ren (en-beam bem)) ~])
=+ (cat 3 van ren)
exec(keg (~(put by keg) [- bem] r.u.rot))
::
@ -1849,7 +1849,7 @@
%+ biff +<
|= cay/cage ^- (unit cage)
?. -:(nets:wa +.ref `span`p.q.cay) :: error if bad type
~& :^ %ford-syve-lost `path`[tem (tope bem)]
~& :^ %ford-syve-lost `path`[tem (en-beam bem)]
want=;;(span +.ref)
have=p.q.cay
~
@ -1958,13 +1958,13 @@
=^ mos bay
=+ dep=(slaw %uv i.t.tea)
?^ dep
=+ bem=(need (tome t.t.tea))
=+ bem=(need (de-beam t.t.tea))
abet:(~(axun za [our hen [now eny ski] ~] bay) tea u.dep bem q.hin)
?> ?=({@ @ ^} t.t.tea)
=+ :* num=(slav %ud i.t.tea)
van=((hard vane) i.t.t.tea)
ren=((hard care:^clay) i.t.t.t.tea)
bem=(need (tome t.t.t.t.tea))
bem=(need (de-beam t.t.t.t.tea))
==
abet:(~(axon za [our hen [now eny ski] ~] bay) num [van ren bem] q.hin)
[mos ..^$(pol (~(put by pol) our bay))]

View File

@ -2890,7 +2890,7 @@
++ format ^?
|%
:: :: ++to-wain:format
++ to-wain :: atom to line list
++ to-wain :: atom to line list
~% %lore ..is ~
|= lub/@
=| tez/(list @t)
@ -2909,7 +2909,7 @@
?: =(0 lub) (flop tez)
$(lub (rsh 3 +(i.wor) lub), tez [meg.wor tez])
:: :: ++of-wain:format
++ of-wain :: line list to atom
++ of-wain :: line list to atom
|= tez/(list @t)
=| {our/@ i/@ud}
|- ^- @
@ -2920,13 +2920,13 @@
?: =(0 i)
$(i +(i), tez t.tez, our i.tez)
$(i +(i), tez t.tez, our (cat 3 (cat 3 our 10) i.tez))
:: :: ++to-path:format
++ to-path :: beam to path
:: :: ++en-beam:format
++ en-beam :: beam to path
|= bem/beam
^- path
[(scot %p p.bem) q.bem (scot r.bem) (flop s.bem)]
:: :: ++of-path:format
++ of-path :: parse path to beam
:: :: ++de-beam:format
++ de-beam :: parse path to beam
|= pax/path
^- (unit beam)
?. ?=({* * * *} pax) ~
@ -4553,7 +4553,6 @@
++ clay ^?
|%
++ lines [[lore=to-wain role=of-wain]:format unix:userlib]
++ space [[tome=of-path tope=to-path]:format space:userlib]
--
++ dill !!
++ eyre ^?

View File

@ -11,7 +11,7 @@
{{pax/path pot/$@($~ {v/@tas $~})} $~}
==
?~ pot
=+ bem=(need (tome:space:clay pax))
=+ bem=(need (de-beam:format pax))
$(pot ~[?^(s.bem i.s.bem q.bem)])
:- %kiln-mount
[pax v.pot]

View File

@ -12,7 +12,7 @@
--
|%
++ htm-enty :: XX belongs in zuse
=, space:clay
=, space:userlib
=, format
~+
=- |= tub/nail ^- (like @t) %. tub :: export context

View File

@ -6,7 +6,8 @@
:::: :: ::
:: :: ::
=, ^clay
=, space:clay
=, space:userlib
=, format
|% :: ::
++ kiln-part {$kiln $0 kiln-pith} :: kiln state
++ kiln-pith ::
@ -93,7 +94,7 @@
::
++ poke-mount
|= kiln-mount
=+ bem=(tome pax)
=+ bem=(de-beam pax)
?~ bem
=+ "can't mount bad path: {<pax>}"
abet:(spam leaf+- ~)
@ -102,7 +103,7 @@
++ poke-unmount
|= mon/kiln-unmount
?^ mon
=+ bem=(tome mon)
=+ bem=(de-beam mon)
?~ bem
=+ "can't unmount bad path: {<mon>}"
abet:(spam leaf+- ~)

View File

@ -388,7 +388,7 @@
=+ pas=`@uw`(shas %back eny)
~& [%backing-up pas=pas]
=; dif (emit %info /backup [our dif])
%+ foal:space:clay
%+ foal:space:userlib
(welp pax /jam-crub)
[%jam-crub !>((en:crub:crypto pas (jam `part`+:abet)))]
::

View File

@ -4,7 +4,8 @@
::
/? 310
/- plan-diff, plan-acct
=, space:clay
=, format
=, space:userlib
|%
++ part {$write $0 pith} :: no state
++ pith $~
@ -30,10 +31,10 @@
++ poke-wipe
|= sup/path ^+ abet :: XX determine extension, beak
=+ ext=%md
?~ (file (tope beak-now [ext sup]))
?~ (file (en-beam beak-now [ext sup]))
~|(not-found+[ext `path`(flop sup)] !!)
=- abet:(emit %info write+~ our -)
(fray (tope beak-now [ext sup]))
(fray (en-beam beak-now [ext sup]))
::
++ poke-tree
|= {sup/path mim/mime} ^+ abet :: XX determine extension, beak
@ -54,7 +55,7 @@
=; sob/soba:^clay
?~(sob abet abet:(emit %info write+~ our `toro:^clay`[q.byk %& sob]))
=+ pax=`path`/web/plan
=+ paf=(tope beak-now (flop pax))
=+ paf=(en-beam beak-now (flop pax))
?~ [fil:.^(arch %cy paf)]
=+ ins=(pact-plan [['' ''] ~] dif)
[pax %ins plan+!>(ins)]~
@ -136,7 +137,7 @@
?+ -.res ~|(gage+-.res !!)
$| (mean p.res)
$& =- abet:(emit %info write+~ our -)
(foal :(welp (tope beak-now ~) pax /[-.p.res]) p.res)
(foal :(welp (en-beam beak-now ~) pax /[-.p.res]) p.res)
==
--

View File

@ -8,10 +8,10 @@
/= dat /^ tree-include /tree-include/
/= kid /^ (map knot tree-include)
/_ /tree-include/
=, format
=, js:eyre
=, bytes:eyre
=, base64:eyre
=, space:clay
::
::::
::
@ -59,7 +59,7 @@
:- -.a
?- -.a
$name (from-type +.a ?^(s.bem i.s.bem q.bem))
$beak (from-type +.a (crip (spud (tope bem(s /)))))
$beak (from-type +.a (crip (spud (en-beam bem(s /)))))
$path (from-type +.a (crip (spud (flop s.bem))))
$spur (from-type +.a (crip (spud s.bem)))
$bump (from-type +.a bump.dat)