diff --git a/base/ape/bit.hoon b/ape/bit.hoon similarity index 99% rename from base/ape/bit.hoon rename to ape/bit.hoon index 45983dce4..2771356c2 100644 --- a/base/ape/bit.hoon +++ b/ape/bit.hoon @@ -4,7 +4,7 @@ :: /? 314 /- *talk, *bit-api -/+ talk, sole, http, mean +/+ talk, sole, http !: :::: sivtyv-barnel :: be sure to have oauth2-code markk diff --git a/base/ape/cloud.hoon b/ape/cloud.hoon similarity index 100% rename from base/ape/cloud.hoon rename to ape/cloud.hoon diff --git a/base/ape/curl.hoon b/ape/curl.hoon similarity index 100% rename from base/ape/curl.hoon rename to ape/curl.hoon diff --git a/base/ape/dojo.hoon b/ape/dojo.hoon similarity index 99% rename from base/ape/dojo.hoon rename to ape/dojo.hoon index 7eea9b7e2..5db9eaa46 100644 --- a/base/ape/dojo.hoon +++ b/ape/dojo.hoon @@ -369,7 +369,9 @@ :: ++ dy-done :: dialog submit |= txt=tape - ?> ?=(^ pro) + ?. ?=(^ pro) + ~& %dy-no-prompt + (dy-diff %bel ~) (dy-slam /dial u.pro !>(txt)) :: ++ dy-over :: finish construction @@ -452,7 +454,7 @@ :: ++ dy-twig-head :: dynamic state ^- vase - :(slop !>(`our=@p`our.hid) !>(`tym=@da`now.hid) !>(`eny=@uvI`eny.hid)) + :(slop !>(`our=@p`our.hid) !>(`now=@da`now.hid) !>(`eny=@uvI`eny.hid)) :: ++ dy-made-dial :: dialog product |= cag=cage @@ -670,6 +672,7 @@ ++ peer-sole |= [pax=path] ^- (quip move +>) + :: ~& [%dojo-peer ost.hid pax] ~? !=(src.hid our.hid) [%dojo-peer-stranger ost.hid src.hid pax] :: ?> =(src.hid our.hid) ~? (~(has by hoc) ost.hid) [%dojo-peer-replaced ost.hid pax] @@ -689,6 +692,7 @@ ++ poke-sole-action |= [act=sole-action] ^- (quip move +>) + ~| [%dojo-poke ost.hid -.act (~(run by hoc) ,~)] :: ~& [%dojo-poke ost.hid src.hid act] :: ~? !=(src.hid our.hid) [%dojo-poke ost.hid src.hid] he-abet:(~(he-type he [ost.hid ~] (~(got by hoc) ost.hid)) act) diff --git a/base/ape/hood.hoon b/ape/hood.hoon similarity index 87% rename from base/ape/hood.hoon rename to ape/hood.hoon index edb2ffbd7..883ee3a9b 100644 --- a/base/ape/hood.hoon +++ b/ape/hood.hoon @@ -71,37 +71,40 @@ ++ from-helm (from-lib %helm [..$ ,_abet]:(helm-work)) ++ from-kiln (from-lib %kiln [..$ ,_abet]:(kiln-work)) :: -++ poke-dill-belt (wrap poke-dill-belt):from-drum -++ poke-helm-init (wrap poke-init):from-helm -++ poke-helm-verb (wrap poke-verb):from-helm -++ poke-helm-send-hi (wrap poke-send-hi):from-helm -++ poke-helm-hi (wrap poke-hi):from-helm -++ poke-hood-link (wrap poke-link):from-drum -++ poke-hood-mass (wrap poke-mass):from-helm -++ poke-hood-sync (wrap poke-sync):from-kiln -++ poke-hood-unsync (wrap poke-unsync):from-kiln -++ poke-hood-unix (wrap poke-unix):from-kiln -++ poke-hood-begin (wrap poke-begin):from-helm -++ poke-hood-invite (wrap poke-invite):from-helm -++ poke-hood-merge (wrap poke-merge):from-kiln -++ poke-hood-reload (wrap poke-reload):from-helm -++ poke-hood-reset (wrap poke-reset):from-helm -++ poke-hood-start (wrap poke-start):from-drum -++ poke-hood-reload-desk (wrap poke-reload-desk):from-helm -++ poke-kiln-cp (wrap poke-cp):from-kiln -++ poke-kiln-rm (wrap poke-rm):from-kiln -++ poke-kiln-mv (wrap poke-mv):from-kiln -++ poke-kiln-schedule (wrap poke-schedule):from-kiln -++ poke-will (wrap poke-will):from-helm +++ init-helm |=([way=wire *] [~ +>]) +++ made-kiln (wrap take-made):from-kiln ++ mere-kiln (wrap take-mere):from-kiln ++ mere-kiln-sync (wrap take-mere-sync):from-kiln -++ made-kiln (wrap take-made):from-kiln -++ init-helm |=([way=wire *] [~ +>]) ++ note-helm (wrap take-note):from-helm -++ reap-drum-phat (wrap reap-phat):from-drum ++ onto-drum (wrap take-onto):from-drum ++ peer-drum (wrap peer):from-drum +++ poke-dill-belt (wrap poke-dill-belt):from-drum +++ poke-drum-link (wrap poke-link):from-drum +++ poke-drum-start (wrap poke-start):from-drum +++ poke-helm-hi (wrap poke-hi):from-helm +++ poke-helm-init (wrap poke-init):from-helm +++ poke-helm-invite (wrap poke-invite):from-helm +++ poke-helm-mass (wrap poke-mass):from-helm +++ poke-helm-reload (wrap poke-reload):from-helm +++ poke-helm-reload-desk (wrap poke-reload-desk):from-helm +++ poke-helm-reset (wrap poke-reset):from-helm +++ poke-helm-send-hi (wrap poke-send-hi):from-helm +++ poke-helm-verb (wrap poke-verb):from-helm +++ poke-hood-begin (wrap poke-begin):from-helm +++ poke-hood-sync (wrap poke-sync):from-kiln +++ poke-kiln-cp (wrap poke-cp):from-kiln +++ poke-kiln-label (wrap poke-label):from-kiln +++ poke-kiln-merge (wrap poke-merge):from-kiln +++ poke-kiln-mount (wrap poke-mount):from-kiln +++ poke-kiln-mv (wrap poke-mv):from-kiln +++ poke-kiln-rm (wrap poke-rm):from-kiln +++ poke-kiln-schedule (wrap poke-schedule):from-kiln +++ poke-kiln-sync (wrap poke-sync):from-kiln +++ poke-kiln-unmount (wrap poke-unmount):from-kiln +++ poke-kiln-unsync (wrap poke-unsync):from-kiln +++ poke-will (wrap poke-will):from-helm ++ quit-drum-phat (wrap quit-phat):from-drum +++ reap-drum-phat (wrap reap-phat):from-drum ++ woot-helm (wrap take-woot):from-helm ++ writ-kiln-sync (wrap take-writ):from-kiln -- diff --git a/base/ape/oct1.hoon b/ape/oct1.hoon similarity index 100% rename from base/ape/oct1.hoon rename to ape/oct1.hoon diff --git a/base/ape/oct2.hoon b/ape/oct2.hoon similarity index 100% rename from base/ape/oct2.hoon rename to ape/oct2.hoon diff --git a/base/ape/oct3.hoon b/ape/oct3.hoon similarity index 100% rename from base/ape/oct3.hoon rename to ape/oct3.hoon diff --git a/base/ape/oct4.hoon b/ape/oct4.hoon similarity index 100% rename from base/ape/oct4.hoon rename to ape/oct4.hoon diff --git a/base/ape/talk.hoon b/ape/talk.hoon similarity index 99% rename from base/ape/talk.hoon rename to ape/talk.hoon index 2a20366dc..76514010a 100644 --- a/base/ape/talk.hoon +++ b/ape/talk.hoon @@ -782,7 +782,7 @@ %_(+> coz [cod coz]) :: ++ sh-twig-head ^- vase :: eval data - :(slop !>(`our=@p`our.hid) !>(`tym=@da`now.hid) !>(`eny=@uvI`eny.hid)) + :(slop !>(`our=@p`our.hid) !>(`now=@da`now.hid) !>(`eny=@uvI`eny.hid)) :: ++ sh-work :: do work |= job=work @@ -1659,6 +1659,7 @@ ?+ -.sep ~&(tr-lost/sep "") %fat =+ rem=$(sep q.sep) + ?: (gth (lent rem) 60) (trim 62 rem) =- "{rem} {(trim (sub 60 (lent rem)) -)}" ?+ -.p.sep "..." %tank ~(ram re %rose [" " `~] +.p.sep) @@ -1682,10 +1683,11 @@ ++ peer :: accept subscription |= [pax=path] ^- [(list move) _+>] - :: ~& [%talk-peer src.hid ost.hid pax] + ~? !=(src.hid our.hid) [%peer-talk-stranger src.hid] + :: ~& [%talk-peer src ost pax] ?: ?=([%sole *] pax) ?> =(our.hid src.hid) - ?< (~(has by shells) ost.hid) + ~? (~(has by shells) ost.hid) [%talk-peer-replaced ost.hid pax] ra-abet:(~(ra-console ra ost.hid ~) src.hid t.pax) :: ~& [%talk-peer-data ost.hid src.hid pax] ra-abet:(~(ra-subscribe ra ost.hid ~) src.hid pax) diff --git a/base/ape/twif.hoon b/ape/twif.hoon similarity index 100% rename from base/ape/twif.hoon rename to ape/twif.hoon diff --git a/base/ape/twit.hoon b/ape/twit.hoon similarity index 100% rename from base/ape/twit.hoon rename to ape/twit.hoon diff --git a/base/arvo/ames.hoon b/arvo/ames.hoon similarity index 99% rename from base/arvo/ames.hoon rename to arvo/ames.hoon index e6e6b2b75..c876dae1e 100644 --- a/base/arvo/ames.hoon +++ b/arvo/ames.hoon @@ -1,4 +1,4 @@ -!: :: ames (4a), networking +:: :: ames (4a), networking :: |= pit=vase => =~ @@ -413,7 +413,7 @@ vix=(bex +((cut 0 [25 2] mag))) :: width of sender tay=(cut 0 [27 5] mag) :: message type == - ?> =(7 vez) + ?> =(0 vez) ?> =(chk (end 0 20 (mug bod))) :+ [(end 3 wix bod) (cut 3 [wix vix] bod)] (kins tay) @@ -433,7 +433,7 @@ =+ tay=(ksin q.kec) %+ mix %+ can 0 - :~ [3 7] + :~ [3 0] [20 (mug bod)] [2 yax] [2 qax] @@ -1018,7 +1018,7 @@ ++ gnaw :: gnaw:am |= [kay=cape ryn=lane pac=rock] :: process packet ^- [p=(list boon) q=fort] - ?. =(7 (end 0 3 pac)) [~ fox] + ?. =(0 (end 0 3 pac)) [~ fox] =+ kec=(bite pac) ?: (goop p.p.kec) [~ fox] ?. (~(has by urb.ton.fox) q.p.kec) diff --git a/base/arvo/time.hoon b/arvo/behn.hoon similarity index 97% rename from base/arvo/time.hoon rename to arvo/behn.hoon index a9b0453dc..f281bd481 100644 --- a/base/arvo/time.hoon +++ b/arvo/behn.hoon @@ -1,4 +1,4 @@ -:: :: %time, just a timer +:: :: %behn, just a timer !? 164 !::: |= pit=vase @@ -12,7 +12,7 @@ == :: ++ broq |* [a=_,* b=_,*] :: brodal skew qeu (list (sqeu a b)) :: -++ gift gift-time :: out result <-$ +++ gift gift-behn :: out result <-$ ++ kiss :: in request ->$ $% [%rest p=@da] :: cancel alarm [%wait p=@da] :: set alarm @@ -161,10 +161,10 @@ q.hic ^- kiss ?: ?=(%soft -.q.hic) - :: ~& [%time-call-soft (,@tas `*`-.p.q.hic)] + :: ~& [%behn-call-soft (,@tas `*`-.p.q.hic)] ((hard kiss) p.q.hic) ?: (~(nest ut -:!>(*kiss)) | p.hic) q.hic - ~& [%time-call-flub (,@tas `*`-.q.hic)] + ~& [%behn-call-flub (,@tas `*`-.q.hic)] ((hard kiss) q.hic) == =^ mof tym @@ -193,7 +193,7 @@ %wegh :_ tym :_ ~ :^ hen %give %mass - :- %time + :- %behn :- %| :~ tym/`tym == diff --git a/base/arvo/clay.hoon b/arvo/clay.hoon similarity index 91% rename from base/arvo/clay.hoon rename to arvo/clay.hoon index 7893d3c06..99c8a1e4b 100644 --- a/base/arvo/clay.hoon +++ b/arvo/clay.hoon @@ -1,4 +1,4 @@ -!: +!: :: clay (4c), revision control :: |= pit=vase @@ -15,7 +15,6 @@ dom=dome :: desk data dok=(unit dork) :: outstanding diffs mer=(map (pair ship desk) mery) :: outstanding merges - syn=? :: sync to unix == :: ++ gift gift-clay :: out result <-$ ++ kiss kiss-clay :: in request ->$ @@ -82,6 +81,8 @@ $: fat=(map ship room) :: domestic hoy=(map ship rung) :: foreign ran=rang :: hashes + mon=(map term beam) :: mount points + hez=(unit duct) :: sync duct == :: ++ rede :: universal project $: lim=@da :: complete to @@ -90,7 +91,6 @@ dom=dome :: revision state dok=(unit dork) :: outstanding diffs mer=(map (pair ship desk) mery) :: outstanding merges - syn=? :: sync to unix == :: ++ rind :: request manager $: nix=@ud :: request index @@ -101,7 +101,6 @@ == :: ++ room :: fs per ship $: hun=duct :: terminal duct - hez=(unit duct) :: sync duct dos=(map desk dojo) :: native desk == :: ++ rove :: stored request @@ -113,12 +112,12 @@ == :: ++ tage ,[[%tabl p=(list (pair marc marc))] q=vase] :: %tabl gage ++ dork :: diff work - $: del=(list (pair path cage)) :: deletes + $: del=(list path) :: deletes ink=(list (pair path cage)) :: hoo{n,k} ins=(unit (list (pair path cage))) :: inserts dig=(map path cage) :: store diffs dif=(unit (list (trel path lobe cage))) :: changes - muc=(map path (pair cage cage)) :: store miso + muc=(map path cage) :: store miso muh=(map path lobe) :: store hashes mut=(unit (list (trel path lobe cage))) :: mutations mim=(map path mime) :: mime cache @@ -132,7 +131,7 @@ |% ++ de :: per desk |= [now=@da hen=duct hun=duct hez=(unit duct)] - |= [[who=@p for=@p] syd=@ta rede ran=rang] + |= [[who=@p for=@p] syd=@ta rede ran=rang mon=(map term beam)] =* red +<+>- =| yel=(list ,[p=duct q=gift]) =| byn=(list ,[p=duct q=riot]) @@ -226,7 +225,7 @@ ?. ?=(%path p.pax) (mule |.(`~`~|([%expected-path got=p.pax] !!))) $(tay t.tay, can (~(put by can) ((hard path) q.q.pax) q.i.tay)) - + :: ++ balk :: read and send |= [hen=duct cay=(unit (each cage lobe)) mun=mood] ^+ +> @@ -283,10 +282,42 @@ fod.u.ref (~(put by fod.u.ref) hen inx) == :: - ++ lynx - |= sun=(unit ,?) + ++ must-ergo + |= can=(list path) + ^- (map term (pair ,@ud (set path))) + %- mo ^- (list (trel term ,@ud (set path))) + %+ murn (~(tap by mon)) + |= [nam=term bem=beam] + ^- (unit (trel term ,@ud (set path))) + =- ?~(- ~ `[nam (lent s.bem) (sa -)]) + %+ skim can + |= pax=path + &(=(p.bem for) =(q.bem syd) =((flop s.bem) (scag (lent s.bem) pax))) + :: + ++ mont + |= [pot=term pax=path] ^+ +> - +>.$(syn ?~(sun !syn u.sun)) + =+ can=(turn (~(tap by q:(aeon-to-yaki:ze let.dom))) head) + =+ mus=(skim can |=(paf=path =(pax (scag (lent pax) paf)))) + ?~ mus + +>.$ + %_ +>.$ + tag + :_ tag + :* hen %pass [%ergoing (scot %p who) syd ~] %f + %exec who [who syd %da now] ~ %tabl + ^- (list (pair silk silk)) + %+ turn `(list path)`mus + |= a=path + ^- (pair silk silk) + :- [%done ~ %path !>(a)] + :+ %cast %mime + =+ (need (need (read-x:ze let.dom a))) + ?: ?=(%& -<) + [%done ~ p.-] + (lobe-to-silk:ze a p.-) + == + == :: ++ ease :: release request ^+ . @@ -349,7 +380,6 @@ =+ sar=(lobes-at-path:ze u.nab r.q.rav) =+ ear=(lobes-at-path:ze top r.q.rav) =. +>.$ - ?: =(sar ear) +>.$ (bleb hen u.nab ?:(p.rav ~ `[u.nab top])) ?^ huy (blub hen) @@ -363,7 +393,6 @@ ^+ +> %= +> reg ~& %merge-announce reg - :: ?~(hez reg :_(reg [u.hez [%ergo who syd let.dom]])) :: yel [[hen %note '=' %leaf ~] yel] :: XX do better == :: @@ -416,7 +445,7 @@ :* %+ turn del |= [pax=path mis=miso] ?> ?=(%del -.mis) - [pax p.mis] + pax :: %+ turn ink |= [pax=path mis=miso] @@ -439,7 +468,7 @@ %+ turn mut |= [pax=path mis=miso] ?> ?=(%mut -.mis) - [pax p.mis q.mis] + [pax p.mis] :: ~ :: @@ -469,9 +498,9 @@ |= [pax=path mis=miso] ^- (unit (pair path mime)) ?> ?=(%mut -.mis) - ?. ?=(%mime p.q.mis) + ?. ?=(%mime p.p.mis) ~ - `[pax ((hard mime) q.q.q.mis)] + `[pax ((hard mime) q.q.p.mis)] == == == @@ -507,7 +536,8 @@ |= [pax=path mis=miso] ?> ?=(%mut -.mis) :- [%done ~ %path -:!>(*path) pax] - [%cast p.p.mis [%done ~ q.mis]] + =+ (lobe-to-mark:ze (~(got by q:(aeon-to-yaki:ze let.dom)) pax)) + [%cast - [%done ~ p.mis]] == == :: @@ -521,10 +551,11 @@ :- [%diffing (scot %p who) syd (scot %da wen) pax] :^ %f %exec who :+ [who syd %da wen] ~ ^- silk - =+ =+ (slag (dec (lent pax)) pax) - =+ ?~(- %$ i.-) - [%cast - [%done ~ q.mis]] - [%diff [%done ~ p.mis] -] + :+ %diff + (lobe-to-silk:ze pax (~(got by q:(aeon-to-yaki:ze let.dom)) pax)) + =+ (slag (dec (lent pax)) pax) + =+ ?~(- %$ i.-) + [%cast - [%done ~ p.mis]] :: %ins :- [%casting (scot %p who) syd (scot %da wen) pax] @@ -546,7 +577,7 @@ ?> ?=(^ mut.u.dok) ;: welp ^- (list (pair path misu)) - (turn del.u.dok |=([pax=path cay=cage] [pax %del cay])) + (turn del.u.dok |=(pax=path [pax %del ~])) :: ^- (list (pair path misu)) (turn ink.u.dok |=([pax=path cay=cage] [pax %ins cay])) @@ -635,7 +666,8 @@ %+ turn cat |= [pax=path cay=cage] :- [%done ~ %path -:!>(*path) pax] - [%diff [%done ~ p:(~(got by muc.u.dok) pax)] [%done ~ cay]] + =+ (lobe-to-silk:ze pax (~(got by q:(aeon-to-yaki:ze let.dom)) pax)) + [%diff - [%done ~ cay]] == :: ++ take-mutating @@ -681,7 +713,7 @@ ?> ?=(^ mut.u.dok) ;: welp ^- (list (pair path misu)) - (turn del.u.dok |=([pax=path cay=cage] [pax %del cay])) + (turn del.u.dok |=(pax=path [pax %del ~])) :: ^- (list (pair path misu)) (turn ink.u.dok |=([pax=path cay=cage] [pax %ins cay])) @@ -716,26 +748,29 @@ =. +>.$ =>(wake ?>(?=(^ dok) .)) :: ~& %checked-out ?~ hez +>.$(dok ~) - ?. syn +>.$(dok ~) - =+ ^= ceq - |= a=miso - ?| ?=(%del -.a) - &(?=(%ins -.a) ?=(%mime -.+.a)) - &(?=(%mut -.a) ?=(%mime -.+>.a)) - == + =+ mus=(must-ergo (turn sim head)) + ?: =(~ mus) + +>.$(dok ~) + =+ ^- sum=(set path) + =+ (turn (~(tap by mus)) (corl tail tail)) + %+ roll - + |= [pak=(set path) acc=(set path)] + (~(uni in acc) pak) + =+ can=(mo sim) :: ~& %forming-ergo :: =- ~& %formed-ergo - %_ +>.$ dok ~ - tag :: ?~(hez reg :_(reg [u.hez [%ergo who syd let.dom]])) + tag :_ tag :* hen %pass [%ergoing (scot %p who) syd ~] %f %exec who [who syd %da now] ~ %tabl ^- (list (pair silk silk)) - %+ turn sim - |= [a=path b=misu] + %+ turn (~(tap in sum)) + |= a=path ^- (pair silk silk) :- [%done ~ %path !>(a)] + =+ b=(~(got by can) a) ?: ?=(%del -.b) [%done ~ %null !>(~)] =+ (~(get by mim.u.dok) a) @@ -757,20 +792,26 @@ [[hen %note '!' %rose [" " "" ""] leaf/"clay ergo failed" p.res] yel] == ?~ hez ~|(%no-sync-duct !!) - ?. syn ~|(%sync-off !!) + =+ ^- can=(map path (unit mime)) + %- mo ^- mode + %+ turn (gage-to-cages res) + |= [pax=cage mim=cage] + ?. ?=(%path p.pax) + ~|(%ergo-bad-path-mark !!) + :- ((hard path) q.q.pax) + ?. ?=(%mime p.mim) + ~ + `((hard mime) q.q.mim) + =+ mus=(must-ergo (turn (~(tap by can)) head)) %= +>.$ reg - :_ reg - :* u.hez %ergo who syd let.dom - ^- (list ,[path (unit mime)]) - %+ turn (gage-to-cages res) - |= [pax=cage mim=cage] - ?. ?=(%path p.pax) - ~|(%ergo-bad-path-mark !!) - :- ((hard path) q.q.pax) - ?. ?=(%mime p.mim) - ~ - `((hard mime) q.q.mim) + %- welp :_ reg + %+ turn (~(tap by mus)) + |= [pot=term len=@ud pak=(set path)] + :* u.hez %ergo pot + %+ turn (~(tap in pak)) + |= pax=path + [(slag len pax) (~(got by can) pax)] == == :: @@ -825,7 +866,8 @@ =+ let=let =+ hut=(~(uni by hut.ran) nut) =+ lat=(~(uni by lat.ran) nat) - =+ =+ yon=`aeon`1 :: sanity check + =+ ?: =(0 let) ~ + =+ yon=`aeon`1 :: sanity check |- ~| yon=yon =+ tak=(~(got by hit) yon) @@ -1262,6 +1304,9 @@ %+ ~(put by bar) pax (make-delta p.mys [(lobe-to-mark u.har) u.har] [p q.q]:q.mys) :: XX check vase !evil + :: XX of course that's a problem, p.u.ber isn't in rang since it + :: was just cretated. We shouldn't be sending multiple + :: diffs %+ ~(put by bar) pax (make-delta p.mys [(lobe-to-mark p.u.ber) p.u.ber] [p q.q]:q.mys) :: XX check vase !evil @@ -1407,6 +1452,8 @@ ^- nako :+ hit.dom let.dom + ?~ =(0 b) + [~ ~] (data-twixt-takos (~(get by hit.dom) a) (aeon-to-tako b)) :: ++ query :: query:ze @@ -1572,7 +1619,7 @@ (rewind yon) |= a=(unit ,_+>.$) ^- (unit (each cage lobe)) - ?~ a + ?~ a ~ `(unit (each cage lobe))`(bind (read:u.a mun) (cury same %&)) :: @@ -2008,7 +2055,6 @@ !! [%pact (lobe-to-silk pax u.-) [%done ~ u.cay]] == - :: ++ built |= res=gage @@ -2143,23 +2189,31 @@ =. ank.dom ank.dat ?~ hez (done:he ~) - ?. syn + =+ mus=(must-ergo (turn (~(tap by erg.dat)) head)) + ?: =(~ mus) (done:he ~) ergo :: ++ ergo ^+ . =- %_(+ tag [- tag]) + =+ ^- sum=(set path) + =+ (must-ergo (turn (~(tap by erg.dat)) head)) + =+ (turn (~(tap by -)) (corl tail tail)) + %+ roll - + |= [pak=(set path) acc=(set path)] + (~(uni in acc) pak) =+ zez=ze(ank.dom ank.dat) =+ val=?:(?=(%init gem.dat) ali bob) :* hen %pass [%merge (scot %p p.bob) q.bob (scot %p p.ali) q.ali %ergo ~] %f %exec p.bob [p.val q.val cas.dat] ~ %tabl ^- (list (pair silk silk)) - %+ turn (~(tap by erg.dat)) - |= [a=path b=?] + %+ turn (~(tap in sum)) + |= a=path ^- (pair silk silk) :- [%done ~ %path !>(a)] + =+ b=(~(got by erg.dat) a) ?. b [%done ~ %null !>(~)] :+ %cast %mime @@ -2172,25 +2226,33 @@ =+ tay=(gage-to-tage res) ?: ?=(%| -.tay) (error:he %ergo-bad-made leaf/"merge ergo failed" p.tay) - =+ =| can=mick - |- ^- tan=$&(mick [p=term q=tang]) - ?~ p.tay can + =+ =| nac=mode + |- ^- tan=$&(mode [p=term q=tang]) + ?~ p.tay nac =* pax p.i.p.tay ?. ?=(%path p.pax) [%ergo >[%expected-path got=p.pax]< ~] =* mim q.i.p.tay =+ mit=?.(?=(%mime p.mim) ~ `((hard mime) q.q.mim)) - $(p.tay t.p.tay, can :_(can [((hard path) q.q.pax) mit])) + $(p.tay t.p.tay, nac :_(nac [((hard path) q.q.pax) mit])) ?: ?=([@ *] tan) (error:he tan) + =+ `can=(map path (unit mime))`(mo tan) ?~ hez (error:he %ergo-no-hez ~) - ?. syn - (error:he %ergo-sync-off ~) ?: ?=(%| -.gon.dat) +>.$ %_ +>.$ don %| - reg [[u.hez %ergo who syd let.dom tan] reg] + reg + =+ mus=(must-ergo (turn (~(tap by erg.dat)) head)) + %- welp :_ reg + %+ turn (~(tap by mus)) + |= [pot=term len=@ud pak=(set path)] + :* u.hez %ergo pot + %+ turn (~(tap in pak)) + |= pax=path + [(slag len pax) (~(got by can) pax)] + == == :: ++ he @@ -2250,7 +2312,7 @@ %+ roll (~(tap in unk)) |= [yak=yaki qar=(map tako (set tako))] (~(put by qar) r.yak (reachable-takos r.yak)) - |- + |- ^- (set yaki) ?~ unk gud =+ bun=(~(del in `(set yaki)`unk) n.unk) @@ -2271,8 +2333,8 @@ ?^(rug u.rug *rung) =+ ^= red ^- rede =+ yit=(~(get by rus.rug) syd) - ?^(yit u.yit `rede`[~2000.1.1 ~ [~ *rind] *dome ~ ~ %|]) - ((de now hen ~ ~) [who him] syd red ran.ruf) + ?^(yit u.yit `rede`[~2000.1.1 ~ [~ *rind] *dome ~ ~]) + ((de now hen ~ hez.ruf) [who him] syd red ran.ruf mon.ruf) :: ++ posh |= [him=ship syd=desk red=rede ruf=raft] @@ -2294,7 +2356,7 @@ %_ +> ran.ruf run dos.yar - (~(put by dos.yar) syd [qyx.red dom.red dok.red mer.red syn.red]) + (~(put by dos.yar) syd [qyx.red dom.red dok.red mer.red]) == :: ++ wake @@ -2311,10 +2373,10 @@ =+ ^= saq ^- dojo =+ saq=(~(get by dos.yar) syd) ?~(saq *dojo u.saq) - %^ (de now hen hun.yar hez.yar) + %^ (de now hen hun.yar hez.ruf) [who who] syd - [[now qyx.saq ~ dom.saq dok.saq mer.saq syn.saq] ran.ruf] + [[now qyx.saq ~ dom.saq dok.saq mer.saq] ran.ruf mon.ruf] -- -- :::::::::::::::::::::::::::::::::::::::::::::::::::::::: @@ -2346,8 +2408,12 @@ == ^- [p=(list move) q=_..^$] ?- -.q.hic + %boat + :_ ..^$ + [hen %give %hill (turn (~(tap by mon.ruf)) head)]~ + :: %init - :_ ..^$(fat.ruf (~(put by fat.ruf) p.q.hic [hen ~ ~])) + :_ ..^$(fat.ruf (~(put by fat.ruf) p.q.hic [hen ~])) =+ [bos=(sein p.q.hic) can=(clan p.q.hic)] %- zing ^- (list (list move)) :~ ?: =(bos p.q.hic) ~ @@ -2369,61 +2435,50 @@ abet:une :: ~& :+ %infoed :: len=(lent mos) - :: %+ turn mos + :: %+ turn mos :: |= move :: ^- [duct (unit path) term term] :: :- p :: ^- [(unit path) term term] :: ?+ -.q [~ *term *term] - :: %pass + :: %pass :: ^- [(unit path) term term] :: [`p.q [- +<]:q.q] - :: %give + :: %give :: ^- [(unit path) term term] :: [~ %give -.p.q] :: == [mos ..^$] :: %into - =+ yar=(~(got by fat.ruf) p.q.hic) - :_ ..^$(fat.ruf (~(put by fat.ruf) p.q.hic yar(hez [~ hen]))) - ^- (list move) - ?: =(%$ q.q.hic) - ~ - =+ dos=(~(get by dos.yar) q.q.hic) - ?: &(?=(^ dos) !=(0 +>-.+<.+.dos)) :: ank.s.u.dos - ?: =(ank.dom.u.dos q.q.hic) - ~ - :_ ~ - :* hen %pass / %c %info p.q.hic q.q.hic %& - (khan-to-soba `ank.dom.u.dos `r.q.hic) + =. hez.ruf `hen + :_ ..^$ + =+ bem=(~(get by mon.ruf) p.q.hic) + ?: &(?=(~ bem) !=(%$ p.q.hic)) + ~|([%bad-mount-point-from-unix p.q.hic] !!) + =+ ^- bem=beam + ?^ bem + u.bem + [[?>(?=(^ fat.ruf) p.n.fat.ruf) %base %ud 1] ~] + =+ rom=(~(got by fat.ruf) p.bem) + =+ dos=(~(got by dos.rom) q.bem) + ?: =(0 let.dom.dos) + =+ cos=(mode-to-soba ~ s.bem q.q.hic r.q.hic) + =+ ^- [one=(list ,[path miso]) two=(list ,[path miso])] + %+ skid q.cos + |= [a=path b=miso] + ?& ?=(%ins -.b) + ?=(%mime p.p.b) + =+ (slag (dec (lent a)) a) + ?| =([%hook ~] -) + =([%hoon ~] -) + == == + :~ [hen %pass /one %c %info p.bem q.bem %& p.cos one] + [hen %pass /two %c %info p.bem q.bem %& p.cos two] == - =+ cos=(khan-to-soba ~ `r.q.hic) - =+ ^- [one=(list ,[path miso]) two=(list ,[path miso])] - %+ skid q.cos - |= [a=path b=miso] - ?& ?=(%ins -.b) - ?=(%mime p.p.b) - =+ (slag (dec (lent a)) a) - ?| =([%hook ~] -) - =([%hoon ~] -) - == == - :~ [hen %pass /one %c %info p.q.hic q.q.hic %& p.cos one] - [hen %pass /two %c %info p.q.hic q.q.hic %& p.cos two] - == - :: - %lynx - ?: =(%$ q.q.hic) - [~ ..^$] - =^ mos ruf - =+ une=(un p.q.hic now hen ruf) - =+ ^= zat - (lynx:(di:wake:une q.q.hic) r.q.hic) - =+ zot=abet.zat - :- -.zot - =. une (pish:une q.q.hic +.zot ran.zat) - abet:une - [mos ..^$] + =+ yak=(~(got by hut.ran.ruf) (~(got by hit.dom.dos) let.dom.dos)) + =+ cos=(mode-to-soba q.yak (flop s.bem) q.q.hic r.q.hic) + [hen %pass / %c %info p.bem q.bem %& cos]~ :: %merg :: direct state up ?: =(%$ q.q.hic) @@ -2437,6 +2492,47 @@ =. une (pish:une q.q.hic +.zot ran.zat) abet:une [mos ..^$] + :: + %mont + =. hez.ruf ?^(hez.ruf hez.ruf `[[%$ %sync ~] ~]) + =+ pot=(~(get by mon.ruf) p.q.hic) + ?^ pot + ~& [%already-mounted pot] + [~ ..^$] + =. mon.ruf + (~(put by mon.ruf) p.q.hic [q.q.hic r.q.hic %ud 0] (flop s.q.hic)) + =+ yar=(~(get by fat.ruf) q.q.hic) + ?~ yar + [~ ..^$] + =+ dos=(~(get by dos.u.yar) r.q.hic) + ?~ dos + [~ ..^$] + =+ une=(un q.q.hic now hen ruf) + =+ wex=(di:une r.q.hic) + =+ wao=(mont:wex p.q.hic s.q.hic) + =+ woo=abet:wao + [-.woo ..^$(ruf abet:(pish:une r.q.hic +.woo ran.wao))] + :: + %ogre + ?~ hez.ruf + ~& %no-sync-duct + [~ ..^$] + ?@ p.q.hic + ?. (~(has by mon.ruf) p.q.hic) + ~& [%not-mounted p.q.hic] + [~ ..^$] + :_ ..^$(mon.ruf (~(del by mon.ruf) p.q.hic)) + [u.hez.ruf %give %ogre p.q.hic]~ + :_ %_ ..^$ + mon.ruf + %- mo + %+ skip (~(tap by mon.ruf)) + (corl (cury test p.q.hic) tail) + == + %+ turn + (skim (~(tap by mon.ruf)) (corl (cury test p.q.hic) tail)) + |= [pot=term bem=beam] + [u.hez.ruf %give %ogre pot] :: %warp =^ mos ruf @@ -2553,7 +2649,7 @@ [(weld -.sip -.woo) ..^$(ruf abet:[+.sip])] ?: ?=([%blab care @ @ *] tea) ?> ?=(%made +<.q.hin) - ?. ?=(%& -.q.q.hin) + ?. ?=(%& -.q.q.hin) ~| %blab-fail ~> %mean.|.(?+(-.q.q.hin -.q.q.hin %| p.q.q.hin)) !! :: interpolate ford fail into stack trace @@ -2727,71 +2823,43 @@ ^- rand [p q [p q.q]:r] :: -:: XX perhaps fil.khan should be (unit (unit mime)) and !> -++ khan-to-soba - |= [ank=(unit ankh) kan=(unit khan)] +++ mode-to-soba + |= [hat=(map path lobe) pax=path all=? mod=mode] ^- soba :- *cart - =| pax=path - :: =- ~& [%khan (turn - |=((pair path miso) [p -.q]))] - - |- ^- (list ,[p=path q=miso]) - ?~ ank - ?~ kan - :: ~& [pax %ank-kan-sig] + %+ welp + ^- (list (pair path miso)) + ?. all ~ - :: ~& [pax %ank-sig] - =+ ?~ dir.u.kan - ~ - =+ (~(tap by u.dir.u.kan)) - :: ~& [%dirukan pax=pax (~(run by u.dir.u.kan) (cury test ~))] - |- ^- (list (pair path miso)) - ?~ +< ~ - ?~ q.i $(+< t) - (weld ^$(pax [p.i pax], kan `u.q.i) $(+< t)) - ?~ fil.u.kan - - - ?~ u.fil.u.kan - - - :: ~& [pax %ins-1] - [[(flop pax) %ins u.u.fil.u.kan] -] - ?~ kan - :: ~& [pax %kan-sig] - =+ =+ (~(tap by r.u.ank)) - |-(?~(+< ~ (weld ^$(pax [p.i pax], ank `q.i) $(+< t)))) - ?~ q.u.ank - - - [[(flop pax) %del q.u.q.u.ank] -] - :: ~& [pax %neither-sig] - =+ ?~ dir.u.kan - ~ - %+ weld - =+ (~(tap by r.u.ank)) - |- ^- (list ,[p=path q=miso]) - ?~ +< ~ - =+ (~(get by u.dir.u.kan) p.i) - ?: ?=([~ ~] -) $(+< t) - %- weld :_ $(+< t) - :: ~& [pax %ankhing p.i ?=(~ -)] - ^$(pax [p.i pax], ank `q.i, kan ?~(- ~ `u.u.-)) - =+ (~(tap by u.dir.u.kan)) - :: ~& [%sdirukan pax=pax (~(run by dir.u.kan) (cury test ~))] - |- ^- (list ,[p=path q=miso]) - ?~ +< ~ - ?~ q.i $(+< t) - ?: (~(has by r.u.ank) p.i) $(+< t) - :: ~& [pax %khaning p.i] - %- weld :_ $(+< t) - ^$(pax [p.i pax], kan `u.q.i, ank ~) - ?~ q.u.ank - ?~ fil.u.kan - - - ?~ u.fil.u.kan - - - :: ~& %ins-2 - [[(flop pax) %ins u.u.fil.u.kan] -] - ?~ fil.u.kan - - - ?~ u.fil.u.kan - [[(flop pax) %del q.u.q.u.ank] -] - [[(flop pax) %mut q.u.q.u.ank u.u.fil.u.kan] -] + =+ mad=(mo mod) + =+ len=(lent pax) + =+ ^- descendants=(list path) + %+ turn + %+ skim (~(tap by hat)) + |= [paf=path lob=lobe] + =(pax (scag len paf)) + |= [paf=path lob=lobe] + (slag len paf) + %+ murn + descendants + |= pat=path + ^- (unit (pair path ,[%del ~])) + ?: (~(has by mad) pat) + ~ + `[(weld pax pat) %del ~] + ^- (list (pair path miso)) + %+ murn mod + |= [pat=path mim=(unit mime)] + ^- (unit (pair path miso)) + =+ paf=(weld pax pat) + ?~ mim + =+ (~(get by hat) paf) + ?~ - + ~& [%deleting-already-gone pax pat] + ~ + `[paf %del ~] + =+ (~(get by hat) paf) + ?~ - + `[paf %ins %mime -:!>(*mime) u.mim] + `[paf %mut %mime -:!>(*mime) u.mim] -- diff --git a/base/arvo/dill.hoon b/arvo/dill.hoon similarity index 99% rename from base/arvo/dill.hoon rename to arvo/dill.hoon index d97ece29c..52b2fd816 100644 --- a/base/arvo/dill.hoon +++ b/arvo/dill.hoon @@ -1,4 +1,4 @@ -!: +:: :: dill (4d), terminal handling :: |= pit=vase diff --git a/base/arvo/eyre.hoon b/arvo/eyre.hoon similarity index 99% rename from base/arvo/eyre.hoon rename to arvo/eyre.hoon index 933bb3af5..96ec71c52 100644 --- a/base/arvo/eyre.hoon +++ b/arvo/eyre.hoon @@ -1,4 +1,4 @@ -!: :: %eyre, http servant +:: :: %eyre, http servant !? 164 :::: |= pit=vase @@ -10,6 +10,10 @@ ++ note :: out request $-> $% $: %a :: to %ames $% [%wont p=sock q=[path *]] :: + == == :: + $: %b :: to %behn + $% [%wait p=@da] :: + [%rest p=@da] :: == == :: $: %d :: to %dill $% [%flog p=[%crud p=@tas q=(list tank)]] :: @@ -24,14 +28,13 @@ == == :: $: %g :: to %gall $% [%deal p=sock q=cush] :: full transmission - == == :: - $: %t :: to %temp - $% [%wait p=@da] :: - [%rest p=@da] :: == == == :: ++ sign :: in result $<- $? $: %a :: by %ames $% [%woot p=ship q=coop] :: + == == :: + $: %b :: by %behn + $% [%wake ~] :: timer activate == == :: $: %g :: by %gall $% [%unto p=cuft] :: within agent @@ -42,9 +45,6 @@ $: %f :: by %ford $% [%made p=@uvH q=gage] :: [%news ~] :: - == == :: - $: %t :: by %time - $% [%wake ~] :: timer activate == == :: $: @tas :: by any $% [%crud p=@tas q=(list tank)] :: @@ -414,7 +414,7 @@ return urb.redir($ship.text().toLowerCase()) // XX redundant? req( "/~/auth.json?PUT", - {ship:ship.innerText.toLowerCase(), code:pass.value}, + {ship:$ship.text().toLowerCase(), code:pass.value}, function(){ if(urb.foreign) urb.redir() else document.location.reload() @@ -1399,7 +1399,7 @@ =< abet ?~ ude done =. hen p.u.ude - =. ..ix (pass-note of//[ire] [%t %rest era]) + =. ..ix (pass-note of//[ire] [%b %rest era]) (give-even(ude ~) q.u.ude num ven) :: ++ give-even @@ -1428,7 +1428,7 @@ ?: =(a p.eve) ?^ ude ~&(e/ix/wait/replaced=p.u.ude abet(u.ude [hen &])) =. era (add ~s30 now) - (pass-note:abet(ude [~ hen &]) of//[ire] [%t %wait era]) + (pass-note:abet(ude [~ hen &]) of//[ire] [%b %wait era]) ?: (gth a p.eve) ~|(seq-high/cur=p.eve !!) =+ ven=~|(seq-low/cur=p.eve (~(got by q.eve) a)) abet:(give-even & a ven) diff --git a/base/arvo/ford.hoon b/arvo/ford.hoon similarity index 95% rename from base/arvo/ford.hoon rename to arvo/ford.hoon index fa7c31e08..8bd746d86 100644 --- a/base/arvo/ford.hoon +++ b/arvo/ford.hoon @@ -1,4 +1,4 @@ -!::::: +:::::: :: :: %ford, new execution control !? 164 :::: @@ -156,6 +156,14 @@ =+ gib=(wox p.n.r.arc) ?~(gib rac [[u.gib p.n.r.arc] rac]) :: +++ tack :: fold path to term + |= a=[i=term t=(list term)] ^- term + (rap 3 |-([i.a ?~(t.a ~ ['-' $(a t.a)])])) +:: +++ tear :: split term + =- |=(a=term (rush a (most hep sym))) + sym=(cook crip ;~(plug low (star ;~(pose low nud)))) +:: ++ norm :: normalize beam rev |= [ska=sled bem=beam] %_ bem @@ -368,9 +376,9 @@ == :: ++ cool :: error caption - |* [cyt=trap hoc=(bolt)] + |* [cyt=$|(term trap) hoc=(bolt)] ?. ?=(%2 -.q.hoc) hoc - [p.hoc [%2 p.q.hoc *cyt q.q.hoc]] + [p.hoc [%2 p.q.hoc ?^(cyt *cyt [>`@tas`cyt<]~) q.q.hoc]] :: ++ cope :: bolt along |* [hoc=(bolt) fun=(burg)] @@ -386,6 +394,21 @@ %0 [%0 p=(grom `_p.q.nuf`p.q.hoc p.q.nuf) q=q.q.nuf] == == :: + ++ coop :: bolt alter + |* [hoc=(bolt) fun=(burg)] + ?- -.q.hoc + %1 hoc + %0 hoc + %2 =+ nuf=(fun(+<- p.hoc)) + :- p=p.nuf + ^= q + ?- -.q.nuf + %1 q.nuf + %0 [%0 p=(grom `_p.q.nuf`p.q.hoc p.q.nuf) q=q.q.nuf] + %2 =. q.q.nuf (welp q.q.nuf q.q.hoc) + [%2 p=(grom `_p.q.nuf`p.q.hoc p.q.nuf) q=q.q.nuf] + == == + :: ++ coup :: toon to bolt |= cof=cafe |* [ton=toon fun=$+(* *)] @@ -951,23 +974,35 @@ ^- (burg beak (jug mark mark)) |= [cof=cafe bek=beak] =. ^bek bek - %+ cope (lend cof [bek /mar]) - |= [cof=cafe arc=arch] - :: =- =+((cope - |=([cafe lil=(jug mark mark)] ~&(lil=lil (flue cof)))) +<) - =+ all=(~(tap by r.arc)) - |- ^- (bolt (jug mark mark)) - ?~ all (flue cof) - %+ cope $(cof cof, all t.all) - |= [cof=cafe lil=(jug mark mark)] - =* for p.i.all - =+ raf=(fang cof for) - ?: ?=(%2 -.q.raf) - =. q.q.raf :_(q.q.raf leaf/"! {<`mark`for>} build failed, ignoring.") - ((slog 0 (flop q.q.raf)) (fine cof lil)) - %+ cope `(bolt vase)`raf - |= [cof=cafe vax=vase] + %+ cope + =| sup=path + |- ^- (bolt (list ,[mark vase])) + %+ cope (lend cof [bek (welp sup /mar)]) + |= [cof=cafe arc=arch] + =+ all=(skim (turn (~(tap by r.arc)) head) (sane %tas)) + |- ^- (bolt (list ,[mark vase])) + ?~ all (fine cof ~) + %+ cope $(all t.all) + |= [cof=cafe dep=(list ,[mark vase])] + %+ cope ^^^$(cof cof, sup [i.all sup]) + |= [cof=cafe wid=(list ,[mark vase])] ^- (bolt (list ,[mark vase])) + =+ [res=(weld wid dep) pax=(flop sup)] + ?~ pax (fine cof res) + ?. (~(has by r.arc) %hoon) (fine cof res) + =+ :- sil=[%core (norm ska bek (welp sup /mar))] + for=(rap 3 |-([i.pax ?~(t.pax ~ ['-' $(pax t.pax)])])) + =+ raf=(;~(cope make furl feel) cof sil) + ?: ?=(%2 -.q.raf) + =- ((slog 0 (flop `tang`-)) (fine cof res)) + ?^ t.pax ~ :: error on top-level marks + :_(q.q.raf leaf/"! {<`mark`for>} build failed, ignoring.") + (cope `(bolt vase)`raf (flux |=(vax=vase [[for vax] res]))) + |= [cof=cafe all=(list ,[mark vase])] ^- (bolt (jug mark mark)) %+ fine cof - %- ~(gas ju lil) + |- ^- (jug mark mark) + ?~ all ~ + %- ~(gas ju $(all t.all)) + =+ [for vax]=i.all ~| weg=(jam 3 p.vax) %+ weld ^- (list ,[mark mark]) @@ -1171,8 +1206,19 @@ :: %core %+ cool |.(leaf/"ford: core {<(tope p.kas)>}") - %+ cope (cope (fade cof %hoon p.kas) abut:(meow p.kas ~)) - (flux |=(cor=vase [%& %core cor])) + %- cope :_ (flux |=(cor=vase [%& %core cor])) + =+ bem=p.kas + ?~ s.bem (cope (fade cof %hoon bem) abut:(meow bem ~)) + =+ opt=`(list term)`(fall (tear i.s.bem) ~) + ?~ opt (cope (fade cof %hoon bem) abut:(meow bem ~)) + |- ^- (bolt vase) + =. i.s.bem (tack opt) + %+ coop (cope (fade cof %hoon bem) abut:(meow bem ~)) + |= [cof=cafe ~] ^- (bolt vase) + ?~ t.opt (flaw cof ~) + %+ coop ^$(cof cof, opt t.opt, t.s.bem :_(t.s.bem i.opt)) + |= [cof=cafe ~] ^- (bolt vase) + ^$(cof cof, opt :_(t.t.opt (tack i.opt i.t.opt ~))) :: %diff %+ cool |.(leaf/"ford: diff {<`@p`(mug p.kas)>} {<`@p`(mug q.kas)>}") @@ -1454,6 +1500,7 @@ %see =. r.p.hon ?:(?=([%ud 0] r.p.hon) r.how r.p.hon) $(hon q.hon, how p.hon) + :: %saw %+ cope $(hon q.hon) |= [cof=cafe sam=vase] @@ -1684,7 +1731,7 @@ :: ++ load :: highly forgiving |= old=axle - =. pol.old (~(run by pol.old) |=(baby +<(jav ~))) + ::=. pol.old (~(run by pol.old) |=(baby +<(jav ~))) ..^$(+>- old) ::=. old :: ?. ?=([%0 *] old) old :: remove at 1 diff --git a/base/arvo/gall.hoon b/arvo/gall.hoon similarity index 95% rename from base/arvo/gall.hoon rename to arvo/gall.hoon index 29d655a43..74a0b42c8 100644 --- a/base/arvo/gall.hoon +++ b/arvo/gall.hoon @@ -29,8 +29,14 @@ -- :: |% :::::::::::::::::::::::::::::::::::::::::::::::::::::: %gall state :::::::::::::::::::::::::::::::::::::::::::::::::::::: +++ axle-n ?(axle axle-0) :: upgrade path +++ axle-0 ,[%0 pol=(map ship mast-0)] :: +++ mast-0 :: + (cork mast |=(mast +<(bum (~(run by bum) seat-0)))) :: +++ seat-0 :: + (cork seat |=(seat +<(|7 zam=(scar |7.+<)))) :: ++ axle :: all state - $: %0 :: state version + $: %1 :: state version pol=(map ship mast) :: apps by ship == :: ++ gest :: subscriber data @@ -67,6 +73,7 @@ ged=gest :: subscribers hav=vase :: running state byk=beak :: update control + pyl=(map bone mark) :: req'd translations zam=scar :: opaque ducts == :: ++ sofa :: queue for blocked @@ -313,24 +320,16 @@ (mo-boon i.t.pax (mo-chew t.t.pax) +>.sih) :: %pel :: translated peer - ?> ?=([@ @ ~] t.pax) - =+ :* mar=i.t.pax - dap=i.t.t.pax - == - ?: ?=([%f %made *] sih) - ?- -.q.+.sih - %tabl ~|(%made-tabl !!) - %& (mo-give %unto %diff p.q.+>.sih) - %| =. p.q.+>.sih (turn p.q.+>.sih |=(a=tank rose/[~ "! " ~]^[a]~)) - ~> %slog.`%*(. >[%wh %y]< +> [>%mo-cyst-fail< (flop p.q.+>.sih)]) - (mo-give %unto %quit ~) :: XX better errors pls - == - ?> ?=([%g %unto *] sih) - ?. ?=(%diff -.+>.sih) - (mo-give %unto +>.sih) - %+ mo-pass - [%sys pax] - [%f %exec our (mo-beak dap) ~ %cast mar %done ~ `cage`+>+.sih] + ?> ?=([@ ~] t.pax) + =+ mar=i.t.pax + ?> ?=([%f %made *] sih) + ?- -.q.+.sih + %tabl ~|(%made-tabl !!) + %& (mo-give %unto %diff p.q.+>.sih) + %| =. p.q.+>.sih (turn p.q.+>.sih |=(a=tank rose/[~ "! " ~]^[a]~)) + ~> %slog.`%*(. >[%wh %y]< +> [>%mo-cyst-fail< (flop p.q.+>.sih)]) + (mo-give %unto %quit ~) :: XX better errors pls + == :: %red :: diff ack ?> ?=([@ @ @ ~] t.pax) @@ -437,7 +436,7 @@ %& ap-abet:(ap-pout:pap t.t.t.pax %diff +.q.+>.q.hin) %| =+ why=p.q.+>.q.hin =. why (turn why |=(a=tank rose/[~ "! " ~]^[a]~)) - ~> %slog.`%*(. >[%wh %y]< +> [>%mo-cook-fail< (flop why)]) + ~> %slog.`rose/[" " "[" "]"]^[>%mo-cook-fail< (flop why)] ~& [him=q.q.pry our=our pax=pax] :: :: here we should crash because the right thing @@ -493,10 +492,6 @@ %+ mo-pass [%sys %val (scot %p q.q.pry) dap ~] [%f %exec our (mo-beak dap) ~ %cast p.cub %done ~ q.cub] - ?: ?=(%peel -.cub) - %+ mo-pass - [%sys %pel p.cub dap ~] - [%g %deal [q.q.pry our] dap %peer q.cub] ap-abet:(ap-club:(ap-abed:ap dap pry) cub) :: ++ mo-club :: local action @@ -596,7 +591,17 @@ :- (~(got by r.zam) p.cov) ?- -.q.cov ?(%slip %sick) !! - %give ?<(=(0 p.cov) [%give %unto p.q.cov]) + %give + ?< =(0 p.cov) + ?. ?=(%diff -.p.q.cov) + [%give %unto p.q.cov] + =+ cay=`cage`p.p.q.cov + =+ mar=(fall (~(get by pyl) p.cov) p.cay) + ?: =(mar p.cay) [%give %unto p.q.cov] + :+ %pass + [%sys %pel dap ~] + [%f %exec our (mo-beak dap) ~ %cast mar %done ~ cay] + :: %pass :+ %pass `path`[%use dap p.q.cov] ?- -.q.q.cov @@ -612,7 +617,7 @@ ++ ap-call :: call into server |= [cog=term arg=vase] ^- [(unit tang) _+>] - =. +> ap-bowl + =. +> ap-bowl =+ arm=(ap-farm cog) ?: ?=(%| -.arm) [`p.arm +>.$] =+ zem=(ap-slam cog p.arm arg) @@ -623,7 +628,7 @@ |= cub=club ^+ +> ?- -.cub - %peel !! + %peel (ap-peel +.cub) %poke (ap-poke +.cub) %peer (ap-peer +.cub) %puff !! @@ -884,6 +889,11 @@ ^+ +> (ap-prep(hav vax) `hav) :: + ++ ap-peel + |= [mar=mark pax=path] + =. pyl (~(put by pyl) ost mar) + (ap-peer pax) + :: ++ ap-peer :: apply %peer |= pax=path ^+ +> @@ -923,13 +933,15 @@ =+ cug=(ap-find /lame) ?~ cug =. why [>%ap-lame dap wut< (turn why |=(a=tank rose/[~ "! " ~]^[a]~))] - ~> %slog.`%*(. >[%wh %y]< +> (flop why)) + ~> %slog.`rose/[" " "[" "]"]^(flop why) +>.$ =^ cam +>.$ %+ ap-call q.u.cug !>([wut why]) ?^ cam - ~&([%ap-lame-lame u.cam] +>.$) + =. why [>%ap-lame-lame< (turn u.cam |=(a=tank rose/[~ "! " ~]^[a]~))] + ~> %slog.`rose/[" " "[" "]"]^(welp (flop why) leaf/"." (flop u.cam)) + +>.$ +>.$ :: ++ ap-pour :: generic take @@ -1109,10 +1121,11 @@ %exec `%f %flog `%d %info `%c - %lynx `%c %merg `%c + %mont `%c + %ogre `%c %them `%e - %wait `%t + %wait `%b %want `%a %wont `%a :: XX for begin; remove %warp `%c @@ -1172,9 +1185,14 @@ ~ :: ++ load :: recreate vane - |= old=axle + |= old=axle-n ^+ ..^$ - ..^$(all old) + ?: ?=(%1 -.old) ..^$(all old) + %= $ + old => |=(seat-0 `seat`+<(zam [~ zam])) + => |=(mast-0 +<(bum (~(run by bum) +>))) + old(- %1, pol (~(run by pol.old) .)) + == :: ++ scry |= [fur=(unit (set monk)) ren=@tas who=ship syd=desk lot=coin tyl=path] diff --git a/base/arvo/hoon.hoon b/arvo/hoon.hoon similarity index 97% rename from base/arvo/hoon.hoon rename to arvo/hoon.hoon index de3083933..1b20d91e4 100644 --- a/base/arvo/hoon.hoon +++ b/arvo/hoon.hoon @@ -158,7 +158,7 @@ ++ tang (list tank) :: bottom-first error ++ tank $% [%leaf p=tape] :: printing formats $: %palm :: backstep list - p=[p=tape q=tape r=tape s=tape] :: + p=[p=tape q=tape r=tape s=tape] :: q=(list tank) :: == :: $: %rose :: flat list @@ -257,7 +257,7 @@ [%dtwt p=twig] :: nock 3 cell test :: :::::: prettyprinting [%hxgl p=tusk] :: prettyprint tape - [%hxgr p=tusk] :: prettyprint tank + [%hxgr p=tusk] :: prettyprint tank :: :::::: type conversion [%ktbr p=twig] :: %gold core to %iron [%ktdt p=twig q=twig] :: cast q to type (p q) @@ -308,7 +308,7 @@ [%wthz p=tiki q=tine] :: tiki %wthp [%wtcl p=twig q=twig r=twig] :: if p, then q, else r [%wtdt p=twig q=twig r=twig] :: unless, ?:(p r q) - [%wtkt p=wing q=twig r=twig] :: if p is a cell + [%wtkt p=wing q=twig r=twig] :: if p is a cell [%wtkz p=tiki q=twig r=twig] :: tiki %wtkt [%wtgl p=twig q=twig] :: assert |, ?:(p !! q) [%wtgr p=twig q=twig] :: assert &, ?:(p q !!) @@ -400,7 +400,7 @@ ++ unce |* a=_,* :: change part $% [%& p=@ud] :: skip[copy] [%| p=(list a) q=(list a)] :: p -> q[chunk] - == :: + == :: ++ unit |* a=_,* :: maybe $|(~ [~ u=a]) :: ++ upas :: tree change (%d) @@ -527,10 +527,10 @@ ~/ %lth |= [a=@ b=@] ^- ? - ?& !=(a b) - |- - ?| =(0 a) - ?& !=(0 b) + ?& !=(a b) + |- + ?| =(0 a) + ?& !=(0 b) $(a (dec a), b (dec b)) == == == :: @@ -692,7 +692,7 @@ ^- @ =+ b=0 |- - ?~ a b + ?~ a b $(a t.a, b +(b)) :: ++ levy @@ -942,9 +942,9 @@ a (rsh 0 1 a) b (rsh 0 1 b) c +(c) - d %+ add d - %^ lsh 0 c - ?& =(0 (end 0 1 a)) + d %+ add d + %^ lsh 0 c + ?& =(0 (end 0 1 a)) =(0 (end 0 1 b)) == == @@ -959,9 +959,9 @@ a (rsh 0 1 a) b (rsh 0 1 b) c +(c) - d %+ add d - %^ lsh 0 c - ?| =(0 (end 0 1 a)) + d %+ add d + %^ lsh 0 c + ?| =(0 (end 0 1 a)) =(0 (end 0 1 b)) == == @@ -1058,7 +1058,7 @@ |= [syd=@ key=@] ?> (lte (met 5 syd) 1) =+ ^= row - |= [a=@ b=@] + |= [a=@ b=@] (con (end 5 1 (lsh 0 a b)) (rsh 0 (sub 32 a) b)) =+ mow=|=([a=@ b=@] (end 5 1 (mul a b))) =+ len=(met 5 key) @@ -1074,7 +1074,7 @@ ?: =(inx len) goc =+ kop=(cut 5 [inx 1] key) =. kop (mow kop 0xcc9e.2d51) - =. kop (row 15 kop) + =. kop (row 15 kop) =. kop (mow kop 0x1b87.3593) =. goc (mix kop goc) =. goc (row 13 goc) @@ -1182,7 +1182,7 @@ :: ++ pad |=(a=@ =+(b=(met 3 a) ?:((gte b 21) 0 (sub 21 b)))) ++ enc |=(a=@ux `@ux`(mix (lsh 3 4 a) (tok a))) - ++ den + ++ den |= a=@ux ^- (unit ,@ux) =+ b=(rsh 3 4 a) ?. =((tok b) (end 3 4 a)) @@ -1272,9 +1272,9 @@ |= (trel ,? a (map a ,@ud)) ^+ r =+ (~(get by r) q) - ?: p + ?: p (~(put by r) q ?~(- 1 +(u.-))) - ?> ?=(^ -) + ?> ?=(^ -) ?:(=(0 u.-) (~(del by r) q) (~(put by r) q (dec u.-))) :::::::::::::::::::::::::::::::::::::::::::::::::::::::::: :: section 2cG, floating point :: @@ -1415,7 +1415,7 @@ =+ n=(^sub (met 0 a) (^add p 1)) =+ r=(end 0 n a) (rne p a r n) - :: + :: :: the real rnd ++ rne |= [p=@u a=@u r=@u n=@u] ^- @u =+ b=(rsh 0 n a) @@ -1461,14 +1461,13 @@ ++ inf |= [b=@u n=[s=? e=@s a=@u]] &(=(e.n (^mul 2 +(b))) =(0 (ira a.n))) - ++ gar |= [b=@u n=[s=? e=@s a=@u] m=[s=? e=@s a=@u]] + ++ gar |= [b=@u n=[s=? e=@s a=@u] m=[s=? e=@s a=@u]] ^- (unit ,[s=? e=@s a=@u]) ?: (snan b n) ~|(%floating-nan !!) ?: (snan b n) ~|(%floating-nan !!) ?: (nan b n) [~ n] ?: (nan b m) [~ m] ~ - ++ pro |= [b=@u p=@u n=[s=? e=@s a=@u]] ^- [s=? e=@s a=@u] =+ maxexp=`@s`(^mul 2 +(b)) @@ -1478,7 +1477,6 @@ ?: &(=(1 (mod e.n 2)) (^gte e.n minexp)) (szer:vl:fl b p s.n) :: flush denorms n - ++ err |= [b=@u p=@u n=[s=? e=@s a=@u]] ^- (unit tape) ?: (snan b n) [~ "snan"] @@ -1488,7 +1486,7 @@ ~ -- :::::::::::: - ++ add |= [b=@u p=@u n=[s=? e=@s a=@u] m=[s=? e=@s a=@u]] + ++ add |= [b=@u p=@u n=[s=? e=@s a=@u] m=[s=? e=@s a=@u]] ^- [s=? e=@s a=@u] =+ g=(gar:te:fl b n m) ?: ?=(^ g) @@ -1511,7 +1509,7 @@ =+ e2=(sum:si (sun:si dif2) e.n) (pro:te:fl b p [s=|(s.n s.m) e=e2 a=(lia p a3)]) - ++ sub |= [b=@u p=@u n=[s=? e=@s a=@u] m=[s=? e=@s a=@u]] + ++ sub |= [b=@u p=@u n=[s=? e=@s a=@u] m=[s=? e=@s a=@u]] ^- [s=? e=@s a=@u] =+ g=(gar:te:fl b n m) ?: ?=(^ g) @@ -1675,7 +1673,7 @@ ++ bex |= a=@s ^- @rd (bit [s=%.y e=a a=(ari:fl mlen 0)]) - + ++ ipow |= [exp=@s n=@rd] ^- @rd ?: =(0 (mod exp 2)) @@ -3558,7 +3556,7 @@ :: %r ?+ hay (z-co q.p.lot) - %d + %d =+ r=(rlyd q.p.lot) ?~ e.r ['.' '~' (r-co r)] @@ -3605,7 +3603,7 @@ => .(rex ['.' (t-co ((d-co 1) der) ne)]) => .(rex ((d-co 1) nub)) ?:(syn rex ['-' rex]) - ++ t-co |= [a=tape n=?] ^- tape + ++ t-co |= [a=tape n=?] ^- tape ?: n a ?~ a ~|(%empty-frac !!) t.a :: @@ -3773,12 +3771,12 @@ ;~ plug ;~(pose (cold | hep) (easy &)) ;~(plug dim:ag ;~(pose ;~(pfix dot ;~(plug zer dim:ag)) (easy [0 0]))) - ;~ pose - ;~ pfix - (just 'e') + ;~ pose + ;~ pfix + (just 'e') (cook some ;~(plug ;~(pose (cold | hep) (easy &)) dim:ag)) - == - (easy ~) + == + (easy ~) == == ;~ pose @@ -3788,7 +3786,7 @@ :: (stag %rs (cook ryls voy)) == ++ royl-cell - |= [a=? b=[c=@ d=@ e=@] f=(unit ,[h=? i=@])] + |= [a=? b=[c=@ d=@ e=@] f=(unit ,[h=? i=@])] ^- [? @ @ @ (unit ,@s)] ?~ f [a c.b d.b e.b ~] @@ -5004,7 +5002,7 @@ -- ~% %ed + ~ |% - ++ puck :: public key + ++ puck :: public key ~/ %puck |= sk=@I ^- @ ?: (gth (met 3 sk) 32) !! @@ -5015,12 +5013,12 @@ (lsh 0 3 (cut 0 [3 (sub b 5)] h)) =+ aa=(scam bb a) (etch aa) - ++ suck :: keypair from seed + ++ suck :: keypair from seed |= se=@I ^- @uJ =+ pu=(puck se) (can 0 ~[[b se] [b pu]]) :: - ++ sign :: certify + ++ sign :: certify ~/ %sign |= [m=@ se=@] ^- @ =+ sk=(suck se) @@ -5050,7 +5048,7 @@ (~(sit fo l) (add r (mul (shaz ha) a))) (can 0 ~[[b (etch rr)] [b ss]]) :: - ++ veri :: validate + ++ veri :: validate ~/ %veri |= [s=@ m=@ pk=@] ^- ? ?: (gth (div b 4) (met 3 s)) | @@ -5070,189 +5068,185 @@ ++ scr :: scrypt ~% %scr + ~ |% - ++ sal |= [x=@ r=@] :: salsa20 hash - ?> =((mod r 2) 0) :: with r rounds - =+ few==>(fe .(a 5)) - =+ ^= rot - |= [a=@ b=@] - (mix (end 5 1 (lsh 0 a b)) (rsh 0 (sub 32 a) b)) - =+ ^= lea - |= [a=@ b=@] - (net:few (sum:few (net:few a) (net:few b))) - => |% ++ qr :: quarterround - |= y=[@ @ @ @ ~] - =+ zb=(mix &2.y (rot 7 (sum:few &1.y &4.y))) - =+ zc=(mix &3.y (rot 9 (sum:few zb &1.y))) - =+ zd=(mix &4.y (rot 13 (sum:few zc zb))) - =+ za=(mix &1.y (rot 18 (sum:few zd zc))) - ~[za zb zc zd] - ++ rr :: rowround - |= [y=(list ,@)] - =+ za=(qr ~[&1.y &2.y &3.y &4.y]) - =+ zb=(qr ~[&6.y &7.y &8.y &5.y]) - =+ zc=(qr ~[&11.y &12.y &9.y &10.y]) - =+ zd=(qr ~[&16.y &13.y &14.y &15.y]) - ^- (list ,@) :~ - &1.za &2.za &3.za &4.za - &4.zb &1.zb &2.zb &3.zb - &3.zc &4.zc &1.zc &2.zc - &2.zd &3.zd &4.zd &1.zd - == - ++ cr :: columnround - |= [x=(list ,@)] - =+ ^= y %- rr ^- (list ,@) :~ - &1.x &5.x &9.x &13.x - &2.x &6.x &10.x &14.x - &3.x &7.x &11.x &15.x - &4.x &8.x &12.x &16.x - == - ^- (list ,@) :~ - &1.y &5.y &9.y &13.y - &2.y &6.y &10.y &14.y - &3.y &7.y &11.y &15.y - &4.y &8.y &12.y &16.y - == - ++ dr :: doubleround - |= [x=(list ,@)] - (rr (cr x)) - ++ al :: add two lists - |= [a=(list ,@) b=(list ,@)] - |- ^- (list ,@) - ?~ a ~ ?~ b ~ - [i=(sum:few -.a -.b) t=$(a +.a, b +.b)] - -- - =+ xw=(rpp 5 16 x) - =+ ^= ow |- ^- (list ,@) - ?~ r xw - $(xw (dr xw), r (sub r 2)) - (rep 5 (al xw ow)) + ++ sal + |= [x=@ r=@] :: salsa20 hash + ?> =((mod r 2) 0) :: with r rounds + =+ few==>(fe .(a 5)) + =+ ^= rot + |= [a=@ b=@] + (mix (end 5 1 (lsh 0 a b)) (rsh 0 (sub 32 a) b)) + =+ ^= lea + |= [a=@ b=@] + (net:few (sum:few (net:few a) (net:few b))) + => |% + ++ qr :: quarterround + |= y=[@ @ @ @ ~] + =+ zb=(mix &2.y (rot 7 (sum:few &1.y &4.y))) + =+ zc=(mix &3.y (rot 9 (sum:few zb &1.y))) + =+ zd=(mix &4.y (rot 13 (sum:few zc zb))) + =+ za=(mix &1.y (rot 18 (sum:few zd zc))) + ~[za zb zc zd] + ++ rr :: rowround + |= [y=(list ,@)] + =+ za=(qr ~[&1.y &2.y &3.y &4.y]) + =+ zb=(qr ~[&6.y &7.y &8.y &5.y]) + =+ zc=(qr ~[&11.y &12.y &9.y &10.y]) + =+ zd=(qr ~[&16.y &13.y &14.y &15.y]) + ^- (list ,@) :~ + &1.za &2.za &3.za &4.za + &4.zb &1.zb &2.zb &3.zb + &3.zc &4.zc &1.zc &2.zc + &2.zd &3.zd &4.zd &1.zd == + ++ cr :: columnround + |= [x=(list ,@)] + =+ ya=(qr ~[&1.x &5.x &9.x &13.x]) + =+ yb=(qr ~[&6.x &10.x &14.x &2.x]) + =+ yc=(qr ~[&11.x &15.x &3.x &7.x]) + =+ yd=(qr ~[&16.x &4.x &8.x &12.x]) + ^- (list ,@) :~ + &1.ya &4.yb &3.yc &2.yd + &2.ya &1.yb &4.yc &3.yd + &3.ya &2.yb &1.yc &4.yd + &4.ya &3.yb &2.yc &1.yd == + ++ dr :: doubleround + |= [x=(list ,@)] + (rr (cr x)) + ++ al :: add two lists + |= [a=(list ,@) b=(list ,@)] + |- ^- (list ,@) + ?~ a ~ ?~ b ~ + [i=(sum:few -.a -.b) t=$(a +.a, b +.b)] + -- + =+ xw=(rpp 5 16 x) + =+ ^= ow |- ^- (list ,@) + ?~ r xw + $(xw (dr xw), r (sub r 2)) + (rep 5 (al xw ow)) :: - ++ rpp |= [a=bloq b=@ c=@] :: rip w/filler blocks - =+ q=(rip a c) - =+ w=(lent q) - ?. =(w b) - ?. (lth w b) (slag (sub w b) q) - ^+ q (weld q (reap (sub b (lent q)) 0)) - q + ++ rpp + |= [a=bloq b=@ c=@] :: rip w/filler blocks + =+ q=(rip a c) + =+ w=(lent q) + ?. =(w b) + ?. (lth w b) (slag (sub w b) q) + ^+ q (weld q (reap (sub b (lent q)) 0)) + q :: - ++ xrl |= [a=(list ,@) b=(list ,@)] :: xor lists - |- ^- (list ,@) - ?~ a b ?~ b a - [i=(mix -.a -.b) t=$(a +.a, b +.b)] + ++ bls + |= [a=@ b=(list ,@)] :: split to sublists + ?> =((mod (lent b) a) 0) + |- ^- (list (list ,@)) + ?~ b ~ + [i=(scag a `(list ,@)`b) t=$(b (slag a `(list ,@)`b))] :: - ++ xrm |= [a=(list (list ,@)) b=(list (list ,@))] - |- ^- (list (list ,@)) - ?~ a b ?~ b a - [i=(xrl -.a -.b) t=$(a +.a, b +.b)] + ++ slb + |= [a=(list (list ,@))] + |- ^- (list ,@) + ?~ a ~ + (weld `(list ,@)`-.a $(a +.a)) :: - ++ bls |= [a=@ b=(list ,@)] :: split to sublists - ?> =((mod (lent b) a) 0) - |- ^- (list (list ,@)) - ?~ b ~ - [i=(scag a `(list ,@)`b) t=$(b (slag a `(list ,@)`b))] + ++ sbm + |= [r=@ b=(list ,@)] :: scryptBlockMix + ?> =((lent b) (mul 2 r)) + =+ [x=(snag (dec (mul 2 r)) b) c=0] + =| [ya=(list ,@) yb=(list ,@)] + |- ^- (list ,@) + ?~ b (flop (weld yb ya)) + =. x (sal (mix x -.b) 8) + ?~ (mod c 2) + $(c +(c), b +.b, ya [i=x t=ya]) + $(c +(c), b +.b, yb [i=x t=yb]) :: - ++ slb |= [a=(list (list ,@))] - |- ^- (list ,@) - ?~ a ~ - (weld `(list ,@)`-.a $(a +.a)) + ++ srm + |= [r=@ b=(list ,@) n=@] :: scryptROMix + ?> ?& =((lent b) (mul 2 r)) + =(n (bex (dec (xeb n)))) + (lth n (bex (mul r 16))) + == + =+ [v=*(list (list ,@)) c=0] + =. v + |- ^- (list (list ,@)) + =+ w=(sbm r b) + ?: =(c n) (flop v) + $(c +(c), v [i=[b] t=v], b w) + =+ x=(sbm r (snag (dec n) v)) + |- ^- (list ,@) + ?: =(c n) x + =+ q=(snag (dec (mul r 2)) x) + =+ z=`(list ,@)`(snag (mod q n) v) + =+ ^= w |- ^- (list ,@) + ?~ x ~ ?~ z ~ + [i=(mix -.x -.z) t=$(x +.x, z +.z)] + $(x (sbm r w), c +(c)) :: - ++ sbm |= [r=@ b=(list ,@)] :: scryptBlockMix - ?> =((lent b) (mul 2 r)) - =+ [x=(snag (dec (mul 2 r)) b) c=0] - =| [ya=(list ,@) yb=(list ,@)] - |- ^- (list ,@) - ?~ b (flop (weld yb ya)) - =. x (sal (mix x -.b) 8) - ?~ (mod c 2) - $(c +(c), b +.b, ya [i=x t=ya]) - $(c +(c), b +.b, yb [i=x t=yb]) + ++ hmc + |= [k=@ t=@] :: HMAC-SHA-256 + (hml k (met 3 k) t (met 3 t)) :: - ++ srm |= [r=@ b=(list ,@) n=@] :: scryptROMix - ?> ?& - =((lent b) (mul 2 r)) - =(n (bex (dec (xeb n)))) - (lth n (bex (mul r 16))) - == - =| v=(list (list ,@)) - =+ c=0 - =. v - |- ^- (list (list ,@)) - =+ w=(sbm r b) - ?: =(c n) (flop v) - $(c +(c), v [i=[b] t=v], b w) - =+ x=(sbm r (snag (dec n) v)) - |- ^- (list ,@) - ?: =(c n) x - =+ q=(snag (dec (mul r 2)) x) - $(x (sbm r (xrl x (snag (mod q n) v))), c +(c)) - :: - ++ hmc |= [k=@ t=@] :: HMAC-SHA-256 - (hml k (met 3 k) t (met 3 t)) - :: - ++ hml |= [k=@ kl=@ t=@ tl=@] :: w/length - =. k (end 3 kl k) =. t (end 3 tl t) - =+ b=64 - =. k ?. (gth kl b) k (shay kl k) - =+ ^= q %+ shay (add b tl) - (add (lsh 3 b t) (mix k (fil 3 b 0x36))) - %+ shay (add b 32) - (add (lsh 3 b q) (mix k (fil 3 b 0x5c))) + ++ hml + |= [k=@ kl=@ t=@ tl=@] :: w/length + => .(k (end 3 kl k), t (end 3 tl t)) + =+ b=64 + =. k ?. (gth kl b) k (shay kl k) + =+ ^= q %+ shay (add b tl) + (add (lsh 3 b t) (mix k (fil 3 b 0x36))) + %+ shay (add b 32) + (add (lsh 3 b q) (mix k (fil 3 b 0x5c))) :: ++ pbk ~/ %pbk :: PBKDF2-HMAC-SHA256 - |= [p=@ s=@ c=@ d=@] - (pbl p (met 3 p) s (met 3 s) c d) + |= [p=@ s=@ c=@ d=@] + (pbl p (met 3 p) s (met 3 s) c d) :: ++ pbl ~/ %pbl :: w/length - |= [p=@ pl=@ s=@ sl=@ c=@ d=@] - =. p (end 3 pl p) =. s (end 3 sl s) - =+ h=32 - ?> ?& (lte d (bex 30)) :: max key length 1GB - (lte c (bex 28)) :: max iterations 2^28 - !=(c 0) - == - =+ ^= l ?~ (mod d h) - (div d h) - +((div d h)) - =+ r=(sub d (mul h (dec l))) - =+ [t=0 j=1 k=1] - =. t |- ^- @ - ?: (gth j l) t - =+ u=(add s (lsh 3 sl (rep 3 (flop (rpp 3 4 j))))) - =+ f=0 =. f |- ^- @ - ?: (gth k c) f - =+ q=(hml p pl u ?:(=(k 1) (add sl 4) h)) - $(u q, f (mix f q), k +(k)) - $(t (add t (lsh 3 (mul (dec j) h) f)), j +(j)) - (end 3 d t) + |= [p=@ pl=@ s=@ sl=@ c=@ d=@] + => .(p (end 3 pl p), s (end 3 sl s)) + =+ h=32 + ?> ?& (lte d (bex 30)) :: max key length 1GB + (lte c (bex 28)) :: max iterations 2^28 + !=(c 0) + == + =+ ^= l ?~ (mod d h) + (div d h) + +((div d h)) + =+ r=(sub d (mul h (dec l))) + =+ [t=0 j=1 k=1] + =. t |- ^- @ + ?: (gth j l) t + =+ u=(add s (lsh 3 sl (rep 3 (flop (rpp 3 4 j))))) + =+ f=0 =. f |- ^- @ + ?: (gth k c) f + =+ q=(hml p pl u ?:(=(k 1) (add sl 4) h)) + $(u q, f (mix f q), k +(k)) + $(t (add t (lsh 3 (mul (dec j) h) f)), j +(j)) + (end 3 d t) :: ++ hsh ~/ %hsh :: scrypt - |= [p=@ s=@ n=@ r=@ z=@ d=@] - (hsl p (met 3 p) s (met 3 s) n r z d) + |= [p=@ s=@ n=@ r=@ z=@ d=@] + (hsl p (met 3 p) s (met 3 s) n r z d) :: ++ hsl ~/ %hsl :: w/length - |= [p=@ pl=@ s=@ sl=@ n=@ r=@ z=@ d=@] - =| v=(list (list ,@)) - =. p (end 3 pl p) =. s (end 3 sl s) - =+ u=(mul (mul 128 r) z) - ?> ?& =(n (bex (dec (xeb n)))) :: n is power of 2 - !=(r 0) !=(z 0) - %+ lte :: max 1GB memory - (mul (mul 128 r) (dec (add n z))) - (bex 30) - (lth pl (bex 31)) - (lth sl (bex 31)) - == - =+ ^= b =+ %^ rpp 3 u - (pbl p pl s sl 1 u) - %+ turn (bls (mul 128 r) -) - |=(a=(list ,@) (rpp 9 (mul 2 r) (rep 3 a))) - ?> =((lent b) z) - =+ ^= q - =+ |- ?~ b (flop v) - $(b +.b, v [i=(srm r -.b n) t=v]) - %+ turn `(list (list ,@))`- - |=(a=(list ,@) (rpp 3 (mul 128 r) (rep 9 a))) - (pbl p pl (rep 3 (slb q)) u 1 d) + |= [p=@ pl=@ s=@ sl=@ n=@ r=@ z=@ d=@] + =| v=(list (list ,@)) + => .(p (end 3 pl p), s (end 3 sl s)) + =+ u=(mul (mul 128 r) z) + ?> ?& =(n (bex (dec (xeb n)))) :: n is power of 2 + !=(r 0) !=(z 0) + %+ lte :: max 1GB memory + (mul (mul 128 r) (dec (add n z))) + (bex 30) + (lth pl (bex 31)) + (lth sl (bex 31)) + == + =+ ^= b =+ (rpp 3 u (pbl p pl s sl 1 u)) + %+ turn (bls (mul 128 r) -) + |=(a=(list ,@) (rpp 9 (mul 2 r) (rep 3 a))) + ?> =((lent b) z) + =+ ^= q + =+ |- ?~ b (flop v) + $(b +.b, v [i=(srm r -.b n) t=v]) + %+ turn `(list (list ,@))`- + |=(a=(list ,@) (rpp 3 (mul 128 r) (rep 9 a))) + (pbl p pl (rep 3 (slb q)) u 1 d) -- :::::::::::::::::::::::::::::::::::::::::::::::::::::::::: :: section 2eY, SHA-256 (move me) :: @@ -5757,7 +5751,7 @@ :: :::::::::::::::::::::::::::::::::::::::::::::::::::::: :: section 2fA, miscellaneous funs :: :: :: -++ bull :: make %bull type +++ bull :: make %bull type |= [bid=twin der=type] ^- type ?:(|(=(%void der) =(%void s.bid)) %void [%bull bid der]) @@ -5792,7 +5786,7 @@ [%face cog der] :: ++ bool ^-(type [%fork [%cube 0 %atom %f] [%cube 1 %atom %f]]) :: -:!>(*?) -++ flay +++ flay ~/ %flay |= pok=port ^- [p=axis q=type] @@ -6031,7 +6025,7 @@ ++ seed :: hoon/hoon core vase ^- vase !! - :: ~+ :: trimmed + :: ~+ :: trimmed :: !;(*type ..seed) :: ++ seem |=(toy=typo `type`toy) :: promote typo @@ -6101,7 +6095,7 @@ ~ `[(~(peek ut p.vax) %free axe) .*(q.vax [0 axe])] :: -++ slab +++ slab |= [cog=@tas typ=type] !=(~ q:(~(fino ut typ) 0 %free cog)) :: @@ -6137,7 +6131,7 @@ |= [sut=type ref=type] ^- [? worm] ?: (~(has in nes) [sut ref]) [& +>+<] - ?. (~(nest ut sut) | ref) + ?. (~(nest ut sut) | ref) :: ~& %nest-failed [| +>+<] [& +>+<(nes (~(put in nes) [sut ref]))] @@ -6190,7 +6184,7 @@ ++ spec :: specialize vase |= vax=vase ^- [vase worm] - =+ ^= gen ^- twig + =+ ^= gen ^- twig ?@ q.vax [%wtts [%axil [%atom %$]] [%$ 1]~] ?@ -.q.vax [%wtts [%leaf %tas -.q.vax] [%$ 2]~] [%wtts [%axil %cell] [%$ 1]~] @@ -6445,7 +6439,7 @@ [%cnzz [@ ~]] i.p.gen [%zpcb *] $(gen q.gen) [@ *] =+(neg=open ?:(=(gen neg) [%0 ~] $(gen neg))) - [^ *] =+ toe=[$(gen p.gen) $(gen q.gen)] + [^ *] =+ toe=[$(gen p.gen) $(gen q.gen)] ?:(=(toe [[%0 ~] [%0 ~]]) [%0 ~] [%2 toe]) == :: @@ -6496,7 +6490,7 @@ [i.p.gen $(p.gen t.p.gen)] :: [%cncb *] [%ktls [%cnzz p.gen] %cnts p.gen q.gen] - [%cncl *] + [%cncl *] =+ rem=[%cnsg [%$ ~] p.gen q.gen] ?. ?=([%zpcb ^ %cnzz @ ~] p.gen) rem => .(p.gen `[@ ^ @ p=@tas ~]`p.gen) @@ -7083,7 +7077,7 @@ %type =+ cis=((hard tank) .*(.(sut lum) !=(duck))) :: type bypass :^ ~ %palm - [~ ~ ~ ~] + [~ ~ ~ ~] [[%leaf '#' 't' '/' ~] cis ~] :: %wall @@ -8546,7 +8540,7 @@ $(i.ruw t.i.ruw, cah [i.i.ruw cah]) $(i.ruw t.i.ruw, cah ~, yun [p.i.i.ruw (wod cah yun)]) :: - ++ posh !: + ++ posh !: |= [pre=(unit tyke) pof=(unit ,[p=@ud q=tyke])] ^- (unit (list twig)) =- ?^(- - ~&(%posh-fail -)) @@ -8569,7 +8563,7 @@ ^- (unit tusk) ?~ goo `~ %+ both - ?^(i.goo i.goo ?~(pag ~ `u=i.pag)) + ?^(i.goo i.goo ?~(pag ~ `u=i.pag)) $(goo t.goo, pag ?~(pag ~ t.pag)) :: ++ poor @@ -8997,7 +8991,7 @@ ;~ pose ;~ less (jest '"""') %+ ifix [doq doq] - %- star + %- star ;~ pose ;~(pfix bas ;~(pose bas doq kel bix:ab)) ;~(less doq bas kel prn) @@ -9007,7 +9001,7 @@ :: %- inde %+ ifix [(jest '"""\0a') (jest '\0a"""')] - %- star + %- star ;~ pose ;~(pfix bas ;~(pose bas kel bix:ab)) ;~(less bas kel prn) @@ -9422,7 +9416,7 @@ %pel [~ %cnts ~(rake ap ros) p.vil] %pat [~ %bcpt ~(rake ap ros) p.vil] %ket [~ ros p.vil] - %tis =+ tog=~(hock ap ros) + %tis =+ tog=~(hock ap ros) ?:(=([%0 ~] tog) ~ [~ %ktts tog p.vil]) == :: @@ -9572,7 +9566,7 @@ :::::: :::::::::::::::::::::::::::::::::::::::::::::::::::::: :::::: :::::: profiling support; move me :::::: :::::: :::::::::::::::::::::::::::::::::::::::::::::::::::::: -++ doss +++ doss $: mon=moan :: sample count hit=(map term ,@ud) :: hit points cut=(map path hump) :: cut points @@ -9613,11 +9607,11 @@ =+ nax=`(unit path)`?~(t.paz ~ `i.t.paz) =+ hup=`hump`=+(hup=(~(get by cut.day) i.paz) ?^(hup u.hup [*moan ~ ~])) :+ (pi-mope mot mon.hup) - ?~ lax out.hup - =+ hag=(~(get by out.hup) u.lax) + ?~ lax out.hup + =+ hag=(~(get by out.hup) u.lax) (~(put by out.hup) u.lax ?~(hag 1 +(u.hag))) - ?~ nax inn.hup - =+ hag=(~(get by inn.hup) u.nax) + ?~ nax inn.hup + =+ hag=(~(get by inn.hup) u.nax) (~(put by inn.hup) u.nax ?~(hag 1 +(u.hag))) == ++ pi-mope :: add sample @@ -9792,7 +9786,7 @@ == :: ++ wire path :: event pretext ::::: hacks and tools -++ slod +++ slod |= sed=slad ^- slut |= raw=* @@ -9857,7 +9851,7 @@ | [%| [%cell typ.vil p.p.hil] p.hil] == :: - ++ slur :: call gate on + ++ slur :: call gate on |= [gat=vase hil=mill] ^- (unit (pair vase worm)) =+ sam=(slot 6 gat) @@ -9879,7 +9873,7 @@ :: ++ slur-pro :: profiling slur ~/ %slur-pro - |= [lal=@tas gat=vase hil=mill] + |= [lal=@tas gat=vase hil=mill] ?+ lal (slur-z gat hil) %a (slur-a gat hil) %b (slur-b gat hil) @@ -9949,7 +9943,7 @@ [%sick p=[p=@tas q=*]] %- (bond |.([%| p.p.q.caq])) =^ yav p.sew (~(spot wa p.sew) 3 caq) - %+ bind (song yav) + %+ bind (song yav) |= [hil=mill vel=worm] [%& [%sick hil] vel] :: @@ -10021,10 +10015,10 @@ (slid [%& duc.vil hen] (slix hil)) ~| [%swim-take-vane lal] =^ vax p.sew (~(slap wa p.sew) rig [%cnzy %take]) - %^ slur-pro lal vax + %^ slur-pro lal vax ;: slid - [%& pah.vil u.pux] - [%& duc.vil hen] + [%& pah.vil u.pux] + [%& duc.vil hen] (slix (slid [%& [%cube org %atom %tas] org] hil)) == ?~ pru @@ -10075,6 +10069,7 @@ |= hap=path ^- @tas ?+ hap !! [@ %ames *] %a + [@ %boat *] %c [@ %newt *] %a [@ %sync *] %c [@ %term *] %d @@ -10129,7 +10124,7 @@ :: =. lac |(lac ?=(?(%g %f) p.gum)) :: =. lac &(lac !?=(%b p.gum)) %+ fire - p.gum + p.gum ?- -.r.gum %pass ~? &(!lac !=(%$ p.gum)) diff --git a/base/arvo/jael.hoon b/arvo/jael.hoon similarity index 98% rename from base/arvo/jael.hoon rename to arvo/jael.hoon index 622038b25..adc2e52b4 100644 --- a/base/arvo/jael.hoon +++ b/arvo/jael.hoon @@ -42,7 +42,7 @@ == :: ++ move ,[p=duct q=(mold note gift)] :: typed move ++ note :: out request $-> - $% $: %t :: to %time + $% $: %b :: to %behn $% [%wait p=@da] :: [%rest p=@da] :: == == == :: diff --git a/base/arvo/kahn.hoon b/arvo/kahn.hoon similarity index 100% rename from base/arvo/kahn.hoon rename to arvo/kahn.hoon diff --git a/base/arvo/lunt.hoon b/arvo/lunt.hoon similarity index 100% rename from base/arvo/lunt.hoon rename to arvo/lunt.hoon diff --git a/base/arvo/musk.hoon b/arvo/musk.hoon similarity index 100% rename from base/arvo/musk.hoon rename to arvo/musk.hoon diff --git a/base/arvo/zuse.hoon b/arvo/zuse.hoon similarity index 98% rename from base/arvo/zuse.hoon rename to arvo/zuse.hoon index f2a2f099e..6cdd24cd7 100644 --- a/base/arvo/zuse.hoon +++ b/arvo/zuse.hoon @@ -1029,9 +1029,7 @@ ^- miso =+ dir=((hard arch) .^(%cy pax)) ?~ q.dir [%ins val] - =+ for=((hard mark) -:(flop pax)) - ?> =(for p.val) - [%mut [for p.q.val .^(%cx pax)] val] + [%mut val] :: ++ file :: simple file load |= pax=path @@ -1049,7 +1047,7 @@ |= pax=path ^- toro ?> ?=([* * * *] pax) - [i.t.pax [%& [*cart [[t.t.t.pax [%del %$ !>(.^(%cx pax))]] ~]]]] + [i.t.pax [%& [*cart [[t.t.t.pax [%del ~]] ~]]]] :: ++ furl :: unify changes |= [one=toro two=toro] @@ -1163,12 +1161,13 @@ :: ++ ofis :: XX broken =- |=(a=cord (rash a fel)) - =- fel=;~(sfix (boss 64 (plus siw)) (stun 0^2 tis)) + =< fel=(cook |=(a=@ `@t`(swap 3 a)) (bass 64 .)) + =- (cook welp ;~(plug (plus siw) (stun 0^2 (cold %0 tis)))) ^= siw ;~ pose - dit - (cook |=(a=@ (sub a (sub 'A' 10))) (shim 'A' 'Z')) - (cook |=(a=@ (sub a (sub 'a' 36))) (shim 'a' 'z')) + (cook |=(a=@ (sub a 'A')) (shim 'A' 'Z')) + (cook |=(a=@ (sub a 'G')) (shim 'a' 'z')) + (cook |=(a=@ (add a 4)) (shim '0' '9')) (cold 62 (just '+')) (cold 63 (just '/')) == @@ -2114,13 +2113,13 @@ ++ mime ,[p=mite q=octs] :: mimetyped data ++ mite (list ,@ta) :: mime type ++ miso :: ankh delta - $% [%del p=cage] :: delete + $% [%del ~] :: delete [%ins p=cage] :: insert [%dif p=cage] :: mutate from diff - [%mut p=cage q=cage] :: mutate from raw + [%mut p=cage] :: mutate from raw == :: ++ misu :: computed delta - $% [%del p=cage] :: delete + $% [%del ~] :: delete [%ins p=cage] :: insert [%dif p=lobe q=cage] :: mutate from diff == :: @@ -2322,29 +2321,46 @@ [%wont p=sock q=path r=*] :: e2e send message == :: :: +:::: %behn + :: +++ gift-behn :: out result <-$ + $% [%mass p=mass] :: memory usage + [%wake ~] :: wakey-wakey + == :: +++ kiss-behn :: in request ->$ + $% [%rest p=@da] :: cancel alarm + [%wait p=@da] :: set alarm + [%wake ~] :: timer activate + [%wegh ~] :: report memory + == :: +:: :::: %clay :: ++ khan :: $: fil=(unit (unit cage)) :: XX see khan-to-soba dir=(unit (map ,@ta (unit khan))) :: == :: -++ mick (list ,[path (unit mime)]) +++ mode (list ,[path (unit mime)]) ++ riff ,[p=desk q=(unit rave)] :: request/desist :::: :: ++ gift-clay :: out result <-$ - $% [%ergo p=@p q=@tas r=@ud s=mick] :: version update + $% [%ergo p=@tas q=mode] :: version update + [%hill p=(list ,@tas)] :: mount points [%mack p=(unit tang)] :: ack [%mass p=mass] :: memory usage [%mere p=(each (set path) (pair term tang))] :: merge result [%note p=@tD q=tank] :: debug message + [%ogre p=@tas] :: delete mount point [%writ p=riot] :: response == :: ++ kiss-clay :: in request ->$ - $% [%info p=@p q=@tas r=nori] :: internal edit + $% [%boat ~] :: pier rebooted + [%info p=@p q=@tas r=nori] :: internal edit [%init p=@p] :: report install - [%into p=@p q=@tas r=khan] :: external edit - [%lynx p=@p q=@tas r=(unit ,?)] :: sync to unix + [%into p=@tas q=? r=mode] :: external edit [%merg p=@p q=@tas r=@p s=@tas t=germ] :: merge desks + [%mont p=@tas q=@p r=@tas s=path] :: mount to unix + [%ogre p=$|(@tas beam)] :: delete mount point [%warp p=sock q=riff] :: file request [%wegh ~] :: report memory [%west p=sack q=path r=*] :: network request @@ -2587,19 +2603,6 @@ [%mack p=(unit tang)] :: message ack == :: :: -:::: %time - :: -++ gift-time :: out result <-$ - $% [%mass p=mass] :: memory usage - [%wake ~] :: wakey-wakey - == :: -++ kiss-time :: in request ->$ - $% [%rest p=@da] :: cancel alarm - [%wait p=@da] :: set alarm - [%wake ~] :: timer activate - [%wegh ~] :: report memory - == :: -:: :::: %arvo :: ++ gift-arvo :: out result <-$ @@ -2609,7 +2612,7 @@ gift-eyre gift-ford gift-gall - gift-time + gift-behn == ++ kiss-arvo :: in request ->$ $? kiss-ames @@ -2618,25 +2621,25 @@ kiss-eyre kiss-ford kiss-gall - kiss-time + kiss-behn == ++ note-arvo :: out request $-> $? [@tas %meta vase] $% [%a kiss-ames] + [%b kiss-behn] [%c kiss-clay] [%d kiss-dill] [%e kiss-eyre] [%f kiss-ford] [%g kiss-gall] - [%t kiss-time] == == ++ sign-arvo :: in result $<- $% [%a gift-ames] + [%b gift-behn] [%c gift-clay] [%d gift-dill] [%e gift-eyre] [%f gift-ford] [%g gift-gall] - [%t gift-time] == -- diff --git a/base/cat/hood/mv.hoon b/base/cat/hood/mv.hoon deleted file mode 100644 index 4dd6cc488..000000000 --- a/base/cat/hood/mv.hoon +++ /dev/null @@ -1 +0,0 @@ -|=([^ [input=path output=path ~] ~] kiln-cp/[input output]) diff --git a/base/mar/cloud-auth/door.hook b/base/mar/cloud-auth/door.hook deleted file mode 100644 index 695a9b6b1..000000000 --- a/base/mar/cloud-auth/door.hook +++ /dev/null @@ -1,16 +0,0 @@ -:: this mark is used to receive incoming oauth2 tokens that we use to poke our %gall server -:: -:::: /hook/door/do-auth/mar - :: -/? 310 -!: -|_ cod=cord -:: -++ grab :: converter arm - |% - ++ noun ,@t :: clam from noun - ++ json (cork (ot authcode/so platform/so ~):jo need) :: (need (so:jo jon)) - -- --- - - diff --git a/base/mar/cloud-secret/door.hook b/base/mar/cloud-secret/door.hook deleted file mode 100644 index 3cdf63110..000000000 --- a/base/mar/cloud-secret/door.hook +++ /dev/null @@ -1,9 +0,0 @@ -!: -|_ cod=cord -:: -++ grab :: converter am - |% - ++ noun ,@t :: clam from noun - ++ json (cork (ot secret/so platform/so ~):jo need) :: (need (so:jo jon)) - -- --- diff --git a/base/cat/bit/act.hoon b/cat/bit/act.hoon similarity index 100% rename from base/cat/bit/act.hoon rename to cat/bit/act.hoon diff --git a/base/cat/bit/address-contact.hoon b/cat/bit/address-contact.hoon similarity index 100% rename from base/cat/bit/address-contact.hoon rename to cat/bit/address-contact.hoon diff --git a/base/cat/bit/auth.hoon b/cat/bit/auth.hoon similarity index 100% rename from base/cat/bit/auth.hoon rename to cat/bit/auth.hoon diff --git a/base/cat/bit/buy.hoon b/cat/bit/buy.hoon similarity index 100% rename from base/cat/bit/buy.hoon rename to cat/bit/buy.hoon diff --git a/base/cat/bit/contact-address.hoon b/cat/bit/contact-address.hoon similarity index 100% rename from base/cat/bit/contact-address.hoon rename to cat/bit/contact-address.hoon diff --git a/base/cat/bit/list.hoon b/cat/bit/list.hoon similarity index 100% rename from base/cat/bit/list.hoon rename to cat/bit/list.hoon diff --git a/base/cat/bit/sell.hoon b/cat/bit/sell.hoon similarity index 100% rename from base/cat/bit/sell.hoon rename to cat/bit/sell.hoon diff --git a/base/cat/bit/send.hoon b/cat/bit/send.hoon similarity index 100% rename from base/cat/bit/send.hoon rename to cat/bit/send.hoon diff --git a/base/cat/cat.hoon b/cat/cat.hoon similarity index 100% rename from base/cat/cat.hoon rename to cat/cat.hoon diff --git a/base/cat/cat/pretty.hoon b/cat/cat/pretty.hoon similarity index 100% rename from base/cat/cat/pretty.hoon rename to cat/cat/pretty.hoon diff --git a/base/cat/coin/keys.hoon b/cat/coin/keys.hoon similarity index 100% rename from base/cat/coin/keys.hoon rename to cat/coin/keys.hoon diff --git a/base/cat/curl/url.hoon b/cat/curl/url.hoon similarity index 100% rename from base/cat/curl/url.hoon rename to cat/curl/url.hoon diff --git a/base/cat/hello.hoon b/cat/hello.hoon similarity index 100% rename from base/cat/hello.hoon rename to cat/hello.hoon diff --git a/base/cat/hood/breload.hoon b/cat/hood/breload.hoon similarity index 81% rename from base/cat/hood/breload.hoon rename to cat/hood/breload.hoon index 254a5b452..fe532c236 100644 --- a/base/cat/hood/breload.hoon +++ b/cat/hood/breload.hoon @@ -8,5 +8,5 @@ |= $: [now=@da eny=@uvI bec=beak] [arg=(list term) ~] == -:+ %hood-reload-desk %base +:+ %helm-reload-desk %base arg diff --git a/base/cat/hood/cp.hoon b/cat/hood/cp.hoon similarity index 100% rename from base/cat/hood/cp.hoon rename to cat/hood/cp.hoon diff --git a/base/cat/hood/hi.hoon b/cat/hood/hi.hoon similarity index 100% rename from base/cat/hood/hi.hoon rename to cat/hood/hi.hoon diff --git a/base/cat/hood/init.hoon b/cat/hood/init.hoon similarity index 100% rename from base/cat/hood/init.hoon rename to cat/hood/init.hoon diff --git a/base/cat/hood/invite.hoon b/cat/hood/invite.hoon similarity index 84% rename from base/cat/hood/invite.hoon rename to cat/hood/invite.hoon index 19653c4e4..156cdab21 100644 --- a/base/cat/hood/invite.hoon +++ b/cat/hood/invite.hoon @@ -8,4 +8,4 @@ |= $: [now=@da eny=@uvI bec=beak] [[who=@p myl=@t ~] ~] == -[%hood-invite who myl] +[%helm-invite who myl] diff --git a/cat/hood/label.hoon b/cat/hood/label.hoon new file mode 100644 index 000000000..9b4113620 --- /dev/null +++ b/cat/hood/label.hoon @@ -0,0 +1,12 @@ +:: +:::: /hoon/label/hood/cat + :: +/? 314 +:: +:::: + !: +|= $: [now=@da eny=@uvI bec=beak] + [arg=[syd=desk lab=@tas ~] ~] + == +:- %kiln-label +[syd lab]:arg diff --git a/base/cat/hood/link.hoon b/cat/hood/link.hoon similarity index 92% rename from base/cat/hood/link.hoon rename to cat/hood/link.hoon index 80ddd6c4f..dc70d442b 100644 --- a/base/cat/hood/link.hoon +++ b/cat/hood/link.hoon @@ -8,7 +8,7 @@ |= $: [now=@da eny=@uvI byk=beak] [arg=$?([dap=term ~] [who=ship dap=term ~]) ~] == -:- %hood-link +:- %drum-link ?~ +.arg [p.byk dap.arg] [who.arg dap.arg] diff --git a/base/cat/hood/mass.hoon b/cat/hood/mass.hoon similarity index 88% rename from base/cat/hood/mass.hoon rename to cat/hood/mass.hoon index 2e02919c9..30deb428d 100644 --- a/base/cat/hood/mass.hoon +++ b/cat/hood/mass.hoon @@ -8,4 +8,4 @@ |= $: [now=@da eny=@uvI bec=beak] [arg=~ ~] == -[%hood-mass ~] +[%helm-mass ~] diff --git a/base/cat/hood/merge.hoon b/cat/hood/merge.hoon similarity index 92% rename from base/cat/hood/merge.hoon rename to cat/hood/merge.hoon index d57fdb9fe..667100284 100644 --- a/base/cat/hood/merge.hoon +++ b/cat/hood/merge.hoon @@ -8,5 +8,5 @@ |= $: [now=@da eny=@uvI bec=beak] [[syd=@tas her=@p sud=@tas gem=?([?(%auto germ) ~] ~)] ~] == -:- %hood-merge +:- %kiln-merge [syd her sud ?~(gem %auto -.gem)] diff --git a/cat/hood/mount.hoon b/cat/hood/mount.hoon new file mode 100644 index 000000000..485dfb97d --- /dev/null +++ b/cat/hood/mount.hoon @@ -0,0 +1,12 @@ +:: +:::: /hoon/mount/hood/cat + :: +/? 314 +:: +:::: + !: +|= $: [now=@da eny=@uvI bec=beak] + [arg=[pax=path pot=@tas ~] ~] + == +:- %kiln-mount +[pax pot]:arg diff --git a/cat/hood/mv.hoon b/cat/hood/mv.hoon new file mode 100644 index 000000000..72e380578 --- /dev/null +++ b/cat/hood/mv.hoon @@ -0,0 +1 @@ +|=([^ [input=path output=path ~] ~] kiln-mv/[input output]) diff --git a/base/cat/hood/reload-desk.hoon b/cat/hood/reload-desk.hoon similarity index 86% rename from base/cat/hood/reload-desk.hoon rename to cat/hood/reload-desk.hoon index fcd49767f..71e60de30 100644 --- a/base/cat/hood/reload-desk.hoon +++ b/cat/hood/reload-desk.hoon @@ -8,5 +8,5 @@ |= $: [now=@da eny=@uvI bec=beak] [arg=[desk (list term)] ~] == -:- %hood-reload-desk +:- %helm-reload-desk arg diff --git a/base/cat/hood/reload.hoon b/cat/hood/reload.hoon similarity index 88% rename from base/cat/hood/reload.hoon rename to cat/hood/reload.hoon index f25d28966..99d74a06e 100644 --- a/base/cat/hood/reload.hoon +++ b/cat/hood/reload.hoon @@ -8,5 +8,5 @@ |= $: [now=@da eny=@uvI bec=beak] [arg=(list term) ~] == -:- %hood-reload +:- %helm-reload arg diff --git a/base/cat/hood/reset.hoon b/cat/hood/reset.hoon similarity index 87% rename from base/cat/hood/reset.hoon rename to cat/hood/reset.hoon index 2bcc37fec..6974c7ae6 100644 --- a/base/cat/hood/reset.hoon +++ b/cat/hood/reset.hoon @@ -8,4 +8,4 @@ |= $: [now=@da eny=@uvI bec=beak] [arg=~ ~] == -[%hood-reset ~] +[%helm-reset ~] diff --git a/base/cat/hood/rm.hoon b/cat/hood/rm.hoon similarity index 100% rename from base/cat/hood/rm.hoon rename to cat/hood/rm.hoon diff --git a/base/cat/hood/schedule.hoon b/cat/hood/schedule.hoon similarity index 100% rename from base/cat/hood/schedule.hoon rename to cat/hood/schedule.hoon diff --git a/base/cat/hood/start.hoon b/cat/hood/start.hoon similarity index 93% rename from base/cat/hood/start.hoon rename to cat/hood/start.hoon index 098a9b709..077c92e92 100644 --- a/base/cat/hood/start.hoon +++ b/cat/hood/start.hoon @@ -8,7 +8,7 @@ |= $: [now=@da eny=@uvI bec=beak] [arg=[@ $|(~ [@ ~])] ~] == -:- %hood-start +:- %drum-start ?> ((sane %tas) -.arg) ?@ +.arg [%home -.arg] ?> ((sane %tas) +<.arg) diff --git a/base/cat/hood/sync.hoon b/cat/hood/sync.hoon similarity index 91% rename from base/cat/hood/sync.hoon rename to cat/hood/sync.hoon index 887a0be59..97ac1bbc4 100644 --- a/base/cat/hood/sync.hoon +++ b/cat/hood/sync.hoon @@ -8,5 +8,5 @@ |= $: [now=@da eny=@uvI bec=beak] [arg=[syd=@tas her=@p sud=@tas ~] ~] == -:- %hood-sync +:- %kiln-sync [syd her sud]:arg diff --git a/base/cat/hood/unix.hoon b/cat/hood/unix.hoon similarity index 100% rename from base/cat/hood/unix.hoon rename to cat/hood/unix.hoon diff --git a/cat/hood/unmount.hoon b/cat/hood/unmount.hoon new file mode 100644 index 000000000..73806b55c --- /dev/null +++ b/cat/hood/unmount.hoon @@ -0,0 +1,12 @@ +:: +:::: /hoon/mount/hood/cat + :: +/? 314 +:: +:::: + !: +|= $: [now=@da eny=@uvI bec=beak] + [[mon=$|(term [span path]) ~] ~] + == +:- %kiln-unmount +mon diff --git a/base/cat/hood/verb.hoon b/cat/hood/verb.hoon similarity index 89% rename from base/cat/hood/verb.hoon rename to cat/hood/verb.hoon index 57576b81f..dddf9babe 100644 --- a/base/cat/hood/verb.hoon +++ b/cat/hood/verb.hoon @@ -9,5 +9,5 @@ |= $: [now=@da eny=@ bec=beak] [~ ~] == -~& %hood-verb +~& %helm-verb [%helm-verb ~] diff --git a/base/cat/ls.hoon b/cat/ls.hoon similarity index 100% rename from base/cat/ls.hoon rename to cat/ls.hoon diff --git a/base/cat/ls/subdir.hoon b/cat/ls/subdir.hoon similarity index 100% rename from base/cat/ls/subdir.hoon rename to cat/ls/subdir.hoon diff --git a/base/cat/solid.hoon b/cat/solid.hoon similarity index 97% rename from base/cat/solid.hoon rename to cat/solid.hoon index 52eb26273..bfc641385 100644 --- a/base/cat/solid.hoon +++ b/cat/solid.hoon @@ -23,10 +23,10 @@ [%g %gall] [%f %ford] [%a %ames] + [%b %behn] [%c %clay] [%d %dill] [%e %eyre] - [%t %time] == |- ^+ all ?~ vay all diff --git a/base/cat/ticket.hoon b/cat/ticket.hoon similarity index 100% rename from base/cat/ticket.hoon rename to cat/ticket.hoon diff --git a/base/cat/tree.hoon b/cat/tree.hoon similarity index 100% rename from base/cat/tree.hoon rename to cat/tree.hoon diff --git a/base/cat/twit/as.hoon b/cat/twit/as.hoon similarity index 100% rename from base/cat/twit/as.hoon rename to cat/twit/as.hoon diff --git a/base/cat/twit/tweet.hoon b/cat/twit/tweet.hoon similarity index 100% rename from base/cat/twit/tweet.hoon rename to cat/twit/tweet.hoon diff --git a/base/cat/twit/twitter-feed.hoon b/cat/twit/twitter-feed.hoon similarity index 100% rename from base/cat/twit/twitter-feed.hoon rename to cat/twit/twitter-feed.hoon diff --git a/base/dog/hood/begin.hoon b/dog/hood/begin.hoon similarity index 84% rename from base/dog/hood/begin.hoon rename to dog/hood/begin.hoon index d82acd68b..0a98967a1 100644 --- a/base/dog/hood/begin.hoon +++ b/dog/hood/begin.hoon @@ -14,20 +14,20 @@ == ^- (sole-result (cask begs)) %+ sole-lo - [%& %hood-begin "your ship: ~"] + [%& %helm-begin "your ship: ~"] %+ sole-go fed:ag |= his=@p %+ sole-lo - [%& %hood-ticket "your ticket: ~"] + [%& %helm-ticket "your ticket: ~"] %+ sole-go fed:ag |= tic=@p %+ sole-lo - [%& %hood-entropy "some entropy: "] + [%& %helm-entropy "some entropy: "] %+ sole-go (boss 256 (more gon qit)) |= yen=@t =+ ney=(shax yen) %+ sole-yo `tank`[%leaf "entropy check: {(scow %p `@p`(mug ney))}"] -%+ sole-so %hood-begin +%+ sole-so %helm-begin :* his tic ney diff --git a/base/dog/twit/auth.hoon b/dog/twit/auth.hoon similarity index 100% rename from base/dog/twit/auth.hoon rename to dog/twit/auth.hoon diff --git a/base/dog/twit/auth/hoontap-keys.txt b/dog/twit/auth/hoontap-keys.txt similarity index 100% rename from base/dog/twit/auth/hoontap-keys.txt rename to dog/twit/auth/hoontap-keys.txt diff --git a/base/elem.hook b/elem.hook similarity index 100% rename from base/elem.hook rename to elem.hook diff --git a/base/lib/base.css b/lib/base.css similarity index 100% rename from base/lib/base.css rename to lib/base.css diff --git a/base/lib/drum.hoon b/lib/drum.hoon similarity index 100% rename from base/lib/drum.hoon rename to lib/drum.hoon diff --git a/base/lib/helm.hoon b/lib/helm.hoon similarity index 99% rename from base/lib/helm.hoon rename to lib/helm.hoon index 30c7cd758..ac4ea28fb 100644 --- a/base/lib/helm.hoon +++ b/lib/helm.hoon @@ -131,12 +131,12 @@ ^- (list ,[p=@tas q=@tas]) :~ [%$ %zuse] [%a %ames] + [%b %behn] [%c %clay] [%d %dill] [%e %eyre] [%f %ford] [%g %gall] - [%t %time] == |= [p=@tas q=@tas] =+ way=`path`(welp top /[q]) diff --git a/base/lib/http.hoon b/lib/http.hoon similarity index 100% rename from base/lib/http.hoon rename to lib/http.hoon diff --git a/base/lib/kiln.hoon b/lib/kiln.hoon similarity index 93% rename from base/lib/kiln.hoon rename to lib/kiln.hoon index cacc0c3cc..59fa1f61e 100644 --- a/base/lib/kiln.hoon +++ b/lib/kiln.hoon @@ -21,10 +21,12 @@ :: :: :: :::: :: :: :: :: :: -++ hood-unix :: - $: syd=desk :: - syn=(unit bean) :: +++ hood-mount :: + $: pax=path :: + pot=term :: == :: +++ hood-unmount :: + $|(term [span path]) :: ++ hood-sync :: $: syd=desk :: her=ship :: @@ -55,7 +57,8 @@ ++ card :: $% [%exec wire @p beak (unit silk)] :: [%info wire @p @tas nori] :: - [%lynx wire @p @tas (unit ,?)] :: + [%mont wire @tas @p @tas path] :: + [%ogre wire $|(@tas beam)] :: [%merg wire @p @tas @p @tas germ] :: [%poke wire dock pear] :: [%warp wire sock riff] :: @@ -76,9 +79,23 @@ ^+ +> ?~(+< +> $(+< t.+<, +> (emit i.+<))) :: - ++ poke-unix :: - |= hood-unix - abet:(emit %lynx /kiln our syd syn) + ++ poke-mount + |= hood-mount + =+ bem=(tome pax) + ?~ bem + =+ "can't mount bad path: {}" + abet:(spam leaf/- ~) + abet:(emit %mont /mount pot p.u.bem q.u.bem (flop s.u.bem)) + :: + ++ poke-unmount + |= mon=hood-unmount + ?^ mon + =+ bem=(tome mon) + ?~ bem + =+ "can't unmount bad path: {}" + abet:(spam leaf/- ~) + abet:(emit %ogre /unmount-beam [[p q %ud 0] s]:u.bem) + abet:(emit %ogre /unmount-point mon) :: ++ poke-sync :: |= hos=hood-sync @@ -118,6 +135,11 @@ %+ furl (fray output) (foal output -:(flop input) %noun .^(%cx input)) :: + ++ poke-label + |= [syd=desk lab=@tas] + =+ pax=/(scot %p our)/[syd]/[lab] + (do-info "labeled {(spud pax)}" [syd %| lab]) + :: ++ poke-schedule |= [where=path tym=@da eve=@t] =. where (welp where /sched) @@ -217,8 +239,7 @@ =. +>.$ %- spam ?: ?=(%& -.mes) - ~ - :: [leaf/"sync succeeded from {} on {} to {}" ~] + [leaf/"sync succeeded from {} on {} to {}" ~] ?+ p.p.mes :* leaf/"sync failed from {} on {} to {}" leaf/"please manually merge the desks with" diff --git a/base/lib/oct1.hoon b/lib/oct1.hoon similarity index 100% rename from base/lib/oct1.hoon rename to lib/oct1.hoon diff --git a/base/lib/oct2.hoon b/lib/oct2.hoon similarity index 100% rename from base/lib/oct2.hoon rename to lib/oct2.hoon diff --git a/base/lib/oct3.hoon b/lib/oct3.hoon similarity index 100% rename from base/lib/oct3.hoon rename to lib/oct3.hoon diff --git a/base/lib/oct4.hoon b/lib/oct4.hoon similarity index 100% rename from base/lib/oct4.hoon rename to lib/oct4.hoon diff --git a/base/lib/react.hoon b/lib/react.hoon similarity index 100% rename from base/lib/react.hoon rename to lib/react.hoon diff --git a/base/lib/sh-utils.hoon b/lib/sh-utils.hoon similarity index 100% rename from base/lib/sh-utils.hoon rename to lib/sh-utils.hoon diff --git a/base/lib/shu.hoon b/lib/shu.hoon similarity index 100% rename from base/lib/shu.hoon rename to lib/shu.hoon diff --git a/base/lib/sole.hoon b/lib/sole.hoon similarity index 100% rename from base/lib/sole.hoon rename to lib/sole.hoon diff --git a/base/lib/syntax/codemirror.css b/lib/syntax/codemirror.css similarity index 100% rename from base/lib/syntax/codemirror.css rename to lib/syntax/codemirror.css diff --git a/base/lib/syntax/hoon.js b/lib/syntax/hoon.js similarity index 100% rename from base/lib/syntax/hoon.js rename to lib/syntax/hoon.js diff --git a/base/lib/talk.hoon b/lib/talk.hoon similarity index 100% rename from base/lib/talk.hoon rename to lib/talk.hoon diff --git a/base/lib/twitter.hoon b/lib/twitter.hoon similarity index 100% rename from base/lib/twitter.hoon rename to lib/twitter.hoon diff --git a/base/lib/urb.js b/lib/urb.js similarity index 100% rename from base/lib/urb.js rename to lib/urb.js diff --git a/base/mar/acto-game.hoon b/mar/acto-game.hoon similarity index 100% rename from base/mar/acto-game.hoon rename to mar/acto-game.hoon diff --git a/base/mar/atom.hoon b/mar/atom.hoon similarity index 100% rename from base/mar/atom.hoon rename to mar/atom.hoon diff --git a/base/mar/bit-accounts.hoon b/mar/bit/accounts.hoon similarity index 100% rename from base/mar/bit-accounts.hoon rename to mar/bit/accounts.hoon diff --git a/base/mar/bit-addr-made.hoon b/mar/bit/addr-made.hoon similarity index 100% rename from base/mar/bit-addr-made.hoon rename to mar/bit/addr-made.hoon diff --git a/base/mar/bit-addr-request.hoon b/mar/bit/addr-request.hoon similarity index 100% rename from base/mar/bit-addr-request.hoon rename to mar/bit/addr-request.hoon diff --git a/base/mar/bit-api-call.hoon b/mar/bit/api-call.hoon similarity index 100% rename from base/mar/bit-api-call.hoon rename to mar/bit/api-call.hoon diff --git a/base/mar/bit-get-token.hoon b/mar/bit/get-token.hoon similarity index 100% rename from base/mar/bit-get-token.hoon rename to mar/bit/get-token.hoon diff --git a/base/mar/bit-transaction.hoon b/mar/bit/transaction.hoon similarity index 100% rename from base/mar/bit-transaction.hoon rename to mar/bit/transaction.hoon diff --git a/base/mar/client-secret.hoon b/mar/client-secret.hoon similarity index 100% rename from base/mar/client-secret.hoon rename to mar/client-secret.hoon diff --git a/base/mar/cloud-auth.hoon b/mar/cloud/auth.hoon similarity index 100% rename from base/mar/cloud-auth.hoon rename to mar/cloud/auth.hoon diff --git a/base/mar/cloud-secret.hoon b/mar/cloud/secret.hoon similarity index 100% rename from base/mar/cloud-secret.hoon rename to mar/cloud/secret.hoon diff --git a/base/mar/coffee.hoon b/mar/coffee.hoon similarity index 100% rename from base/mar/coffee.hoon rename to mar/coffee.hoon diff --git a/base/mar/css.hoon b/mar/css.hoon similarity index 100% rename from base/mar/css.hoon rename to mar/css.hoon diff --git a/base/mar/dill-belt.hoon b/mar/dill/belt.hoon similarity index 100% rename from base/mar/dill-belt.hoon rename to mar/dill/belt.hoon diff --git a/base/mar/dill-blit.hoon b/mar/dill/blit.hoon similarity index 100% rename from base/mar/dill-blit.hoon rename to mar/dill/blit.hoon diff --git a/base/mar/down.hoon b/mar/down.hoon similarity index 100% rename from base/mar/down.hoon rename to mar/down.hoon diff --git a/base/mar/down/html5-entities.json b/mar/down/html5-entities.json similarity index 100% rename from base/mar/down/html5-entities.json rename to mar/down/html5-entities.json diff --git a/base/mar/down/parse.hoon b/mar/down/parse.hoon similarity index 100% rename from base/mar/down/parse.hoon rename to mar/down/parse.hoon diff --git a/base/mar/down/rend.hoon b/mar/down/rend.hoon similarity index 100% rename from base/mar/down/rend.hoon rename to mar/down/rend.hoon diff --git a/base/mar/elem.hoon b/mar/elem.hoon similarity index 100% rename from base/mar/elem.hoon rename to mar/elem.hoon diff --git a/base/mar/eot.hoon b/mar/eot.hoon similarity index 100% rename from base/mar/eot.hoon rename to mar/eot.hoon diff --git a/base/mar/helm-hi.hoon b/mar/helm-hi.hoon similarity index 100% rename from base/mar/helm-hi.hoon rename to mar/helm-hi.hoon diff --git a/base/mar/hiss.hoon b/mar/hiss.hoon similarity index 100% rename from base/mar/hiss.hoon rename to mar/hiss.hoon diff --git a/base/mar/hook.hoon b/mar/hook.hoon similarity index 100% rename from base/mar/hook.hoon rename to mar/hook.hoon diff --git a/base/mar/hoon.hoon b/mar/hoon.hoon similarity index 100% rename from base/mar/hoon.hoon rename to mar/hoon.hoon diff --git a/base/mar/html.hoon b/mar/html.hoon similarity index 100% rename from base/mar/html.hoon rename to mar/html.hoon diff --git a/base/mar/httpreq.hoon b/mar/httpreq.hoon similarity index 100% rename from base/mar/httpreq.hoon rename to mar/httpreq.hoon diff --git a/base/mar/httr.hoon b/mar/httr.hoon similarity index 100% rename from base/mar/httr.hoon rename to mar/httr.hoon diff --git a/base/mar/hymn.hoon b/mar/hymn.hoon similarity index 100% rename from base/mar/hymn.hoon rename to mar/hymn.hoon diff --git a/base/mar/js.hoon b/mar/js.hoon similarity index 100% rename from base/mar/js.hoon rename to mar/js.hoon diff --git a/base/mar/json.hoon b/mar/json.hoon similarity index 100% rename from base/mar/json.hoon rename to mar/json.hoon diff --git a/base/mar/markdown.hoon b/mar/markdown.hoon similarity index 100% rename from base/mar/markdown.hoon rename to mar/markdown.hoon diff --git a/base/mar/md.hoon b/mar/md.hoon similarity index 100% rename from base/mar/md.hoon rename to mar/md.hoon diff --git a/base/mar/mess.hoon b/mar/mess.hoon similarity index 100% rename from base/mar/mess.hoon rename to mar/mess.hoon diff --git a/base/mar/mime.hoon b/mar/mime.hoon similarity index 100% rename from base/mar/mime.hoon rename to mar/mime.hoon diff --git a/base/mar/oauth-tokens.hoon b/mar/oauth-tokens.hoon similarity index 100% rename from base/mar/oauth-tokens.hoon rename to mar/oauth-tokens.hoon diff --git a/base/mar/oauth2-code.hoon b/mar/oauth2-code.hoon similarity index 100% rename from base/mar/oauth2-code.hoon rename to mar/oauth2-code.hoon diff --git a/base/mar/oct3-move.hoon b/mar/oct3/move.hoon similarity index 100% rename from base/mar/oct3-move.hoon rename to mar/oct3/move.hoon diff --git a/base/mar/oct3-update.hoon b/mar/oct3/update.hoon similarity index 100% rename from base/mar/oct3-update.hoon rename to mar/oct3/update.hoon diff --git a/base/mar/oct4-move.hoon b/mar/oct4/move.hoon similarity index 100% rename from base/mar/oct4-move.hoon rename to mar/oct4/move.hoon diff --git a/base/mar/oct4-update.hoon b/mar/oct4/update.hoon similarity index 100% rename from base/mar/oct4-update.hoon rename to mar/oct4/update.hoon diff --git a/base/mar/otf.hoon b/mar/otf.hoon similarity index 59% rename from base/mar/otf.hoon rename to mar/otf.hoon index 202f49b67..d48b4bddc 100644 --- a/base/mar/otf.hoon +++ b/mar/otf.hoon @@ -5,17 +5,16 @@ :: :::: compute :: -|_ otf=@ +|_ otf=mime :: ++ grow :: convert to |% - ++ mime :: convert to %mime - [/font/otf (taco otf)] + ++ mime otf :: convert to %mime -- ++ grab |% - ++ mime |=([p=mite q=octs] q.q) - ++ noun ,@ + ++ mime |=([mite p=octs] [/font/otf p]) + ++ noun ^mime -- ++ grad |% diff --git a/base/mar/purl.hoon b/mar/purl.hoon similarity index 100% rename from base/mar/purl.hoon rename to mar/purl.hoon diff --git a/base/mar/react-snip.hoon b/mar/react-snip.hoon similarity index 100% rename from base/mar/react-snip.hoon rename to mar/react-snip.hoon diff --git a/base/mar/react.hoon b/mar/react.hoon similarity index 100% rename from base/mar/react.hoon rename to mar/react.hoon diff --git a/base/mar/sched.hoon b/mar/sched.hoon similarity index 100% rename from base/mar/sched.hoon rename to mar/sched.hoon diff --git a/base/mar/snip.hoon b/mar/snip.hoon similarity index 100% rename from base/mar/snip.hoon rename to mar/snip.hoon diff --git a/base/mar/sole-action.hoon b/mar/sole/action.hoon similarity index 100% rename from base/mar/sole-action.hoon rename to mar/sole/action.hoon diff --git a/base/mar/sole-effect.hoon b/mar/sole/effect.hoon similarity index 100% rename from base/mar/sole-effect.hoon rename to mar/sole/effect.hoon diff --git a/base/mar/styl.hoon b/mar/styl.hoon similarity index 100% rename from base/mar/styl.hoon rename to mar/styl.hoon diff --git a/base/mar/talk-command.hoon b/mar/talk/command.hoon similarity index 100% rename from base/mar/talk-command.hoon rename to mar/talk/command.hoon diff --git a/base/mar/talk-report.hoon b/mar/talk/report.hoon similarity index 100% rename from base/mar/talk-report.hoon rename to mar/talk/report.hoon diff --git a/base/mar/tang.hoon b/mar/tang.hoon similarity index 100% rename from base/mar/tang.hoon rename to mar/tang.hoon diff --git a/base/mar/txt-diff.hoon b/mar/txt-diff.hoon similarity index 100% rename from base/mar/txt-diff.hoon rename to mar/txt-diff.hoon diff --git a/base/mar/txt.hoon b/mar/txt.hoon similarity index 100% rename from base/mar/txt.hoon rename to mar/txt.hoon diff --git a/base/mar/urb.hoon b/mar/urb.hoon similarity index 100% rename from base/mar/urb.hoon rename to mar/urb.hoon diff --git a/base/mar/user.hoon b/mar/user.hoon similarity index 100% rename from base/mar/user.hoon rename to mar/user.hoon diff --git a/base/mar/users.hoon b/mar/users.hoon similarity index 100% rename from base/mar/users.hoon rename to mar/users.hoon diff --git a/base/mar/will.hoon b/mar/will.hoon similarity index 100% rename from base/mar/will.hoon rename to mar/will.hoon diff --git a/base/mar/woff.hoon b/mar/woff.hoon similarity index 57% rename from base/mar/woff.hoon rename to mar/woff.hoon index 627e20641..854569013 100644 --- a/base/mar/woff.hoon +++ b/mar/woff.hoon @@ -5,17 +5,16 @@ :: :::: compute :: -|_ otf=@ +|_ wof=mime :: ++ grow :: convert to |% - ++ mime :: convert to %mime - [/application/font-woff (taco otf)] + ++ mime wof :: convert to %mime -- ++ grab |% - ++ mime |=([p=mite q=octs] q.q) - ++ noun ,@ + ++ mime |=([mite p=octs] [/application/font-woff p]) + ++ noun ^mime -- ++ grad |% diff --git a/base/pub/bit/fab/hymn.hook b/pub/bit/fab/hymn.hook similarity index 100% rename from base/pub/bit/fab/hymn.hook rename to pub/bit/fab/hymn.hook diff --git a/base/pub/cloud/fab/hymn.hook b/pub/cloud/fab/hymn.hook similarity index 100% rename from base/pub/cloud/fab/hymn.hook rename to pub/cloud/fab/hymn.hook diff --git a/base/pub/cloud/src/main.css b/pub/cloud/src/main.css similarity index 100% rename from base/pub/cloud/src/main.css rename to pub/cloud/src/main.css diff --git a/base/pub/cloud/src/main.js b/pub/cloud/src/main.js similarity index 100% rename from base/pub/cloud/src/main.js rename to pub/cloud/src/main.js diff --git a/base/pub/coin/fab/hymn.hook b/pub/coin/fab/hymn.hook similarity index 100% rename from base/pub/coin/fab/hymn.hook rename to pub/coin/fab/hymn.hook diff --git a/base/pub/doc.md b/pub/doc.md similarity index 100% rename from base/pub/doc.md rename to pub/doc.md diff --git a/base/pub/doc/arvo.md b/pub/doc/arvo.md similarity index 100% rename from base/pub/doc/arvo.md rename to pub/doc/arvo.md diff --git a/base/pub/doc/arvo/ames.md b/pub/doc/arvo/ames.md similarity index 100% rename from base/pub/doc/arvo/ames.md rename to pub/doc/arvo/ames.md diff --git a/base/pub/doc/arvo/ames/commentary.md b/pub/doc/arvo/ames/commentary.md similarity index 100% rename from base/pub/doc/arvo/ames/commentary.md rename to pub/doc/arvo/ames/commentary.md diff --git a/base/pub/doc/arvo/arvo.md b/pub/doc/arvo/arvo.md similarity index 100% rename from base/pub/doc/arvo/arvo.md rename to pub/doc/arvo/arvo.md diff --git a/base/pub/doc/arvo/arvo/commentary.md b/pub/doc/arvo/arvo/commentary.md similarity index 100% rename from base/pub/doc/arvo/arvo/commentary.md rename to pub/doc/arvo/arvo/commentary.md diff --git a/base/pub/doc/arvo/clay.md b/pub/doc/arvo/clay.md similarity index 100% rename from base/pub/doc/arvo/clay.md rename to pub/doc/arvo/clay.md diff --git a/base/pub/doc/arvo/clay/commentary.md b/pub/doc/arvo/clay/commentary.md similarity index 100% rename from base/pub/doc/arvo/clay/commentary.md rename to pub/doc/arvo/clay/commentary.md diff --git a/base/pub/doc/arvo/dill.md b/pub/doc/arvo/dill.md similarity index 100% rename from base/pub/doc/arvo/dill.md rename to pub/doc/arvo/dill.md diff --git a/base/pub/doc/arvo/dill/commentary.md b/pub/doc/arvo/dill/commentary.md similarity index 100% rename from base/pub/doc/arvo/dill/commentary.md rename to pub/doc/arvo/dill/commentary.md diff --git a/base/pub/doc/arvo/eyre.md b/pub/doc/arvo/eyre.md similarity index 100% rename from base/pub/doc/arvo/eyre.md rename to pub/doc/arvo/eyre.md diff --git a/base/pub/doc/arvo/eyre/commentary.md b/pub/doc/arvo/eyre/commentary.md similarity index 100% rename from base/pub/doc/arvo/eyre/commentary.md rename to pub/doc/arvo/eyre/commentary.md diff --git a/base/pub/doc/arvo/ford.md b/pub/doc/arvo/ford.md similarity index 100% rename from base/pub/doc/arvo/ford.md rename to pub/doc/arvo/ford.md diff --git a/base/pub/doc/arvo/ford/commentary.md b/pub/doc/arvo/ford/commentary.md similarity index 100% rename from base/pub/doc/arvo/ford/commentary.md rename to pub/doc/arvo/ford/commentary.md diff --git a/base/pub/doc/arvo/gall.md b/pub/doc/arvo/gall.md similarity index 100% rename from base/pub/doc/arvo/gall.md rename to pub/doc/arvo/gall.md diff --git a/base/pub/doc/arvo/gall/gall.md b/pub/doc/arvo/gall/gall.md similarity index 100% rename from base/pub/doc/arvo/gall/gall.md rename to pub/doc/arvo/gall/gall.md diff --git a/base/pub/doc/arvo/ives.md b/pub/doc/arvo/ives.md similarity index 100% rename from base/pub/doc/arvo/ives.md rename to pub/doc/arvo/ives.md diff --git a/base/pub/doc/arvo/ives/ives.md b/pub/doc/arvo/ives/ives.md similarity index 100% rename from base/pub/doc/arvo/ives/ives.md rename to pub/doc/arvo/ives/ives.md diff --git a/base/pub/doc/arvo/jael.md b/pub/doc/arvo/jael.md similarity index 100% rename from base/pub/doc/arvo/jael.md rename to pub/doc/arvo/jael.md diff --git a/base/pub/doc/arvo/jael/jael.md b/pub/doc/arvo/jael/jael.md similarity index 100% rename from base/pub/doc/arvo/jael/jael.md rename to pub/doc/arvo/jael/jael.md diff --git a/base/pub/doc/arvo/kahn.md b/pub/doc/arvo/kahn.md similarity index 100% rename from base/pub/doc/arvo/kahn.md rename to pub/doc/arvo/kahn.md diff --git a/base/pub/doc/arvo/kahn/kahn.md b/pub/doc/arvo/kahn/kahn.md similarity index 100% rename from base/pub/doc/arvo/kahn/kahn.md rename to pub/doc/arvo/kahn/kahn.md diff --git a/base/pub/doc/arvo/lunt.md b/pub/doc/arvo/lunt.md similarity index 100% rename from base/pub/doc/arvo/lunt.md rename to pub/doc/arvo/lunt.md diff --git a/base/pub/doc/arvo/lunt/lunt.md b/pub/doc/arvo/lunt/lunt.md similarity index 100% rename from base/pub/doc/arvo/lunt/lunt.md rename to pub/doc/arvo/lunt/lunt.md diff --git a/base/pub/doc/arvo/time.md b/pub/doc/arvo/time.md similarity index 100% rename from base/pub/doc/arvo/time.md rename to pub/doc/arvo/time.md diff --git a/base/pub/doc/arvo/util.md b/pub/doc/arvo/util.md similarity index 100% rename from base/pub/doc/arvo/util.md rename to pub/doc/arvo/util.md diff --git a/base/pub/doc/guide.md b/pub/doc/guide.md similarity index 100% rename from base/pub/doc/guide.md rename to pub/doc/guide.md diff --git a/base/pub/doc/guide/a-ford.md b/pub/doc/guide/a-ford.md similarity index 100% rename from base/pub/doc/guide/a-ford.md rename to pub/doc/guide/a-ford.md diff --git a/base/pub/doc/guide/b-cli.md b/pub/doc/guide/b-cli.md similarity index 100% rename from base/pub/doc/guide/b-cli.md rename to pub/doc/guide/b-cli.md diff --git a/base/pub/doc/guide/c-gall.md b/pub/doc/guide/c-gall.md similarity index 100% rename from base/pub/doc/guide/c-gall.md rename to pub/doc/guide/c-gall.md diff --git a/base/pub/doc/guide/d-app.md b/pub/doc/guide/d-app.md similarity index 100% rename from base/pub/doc/guide/d-app.md rename to pub/doc/guide/d-app.md diff --git a/base/pub/doc/guide/e-dev.md b/pub/doc/guide/e-dev.md similarity index 100% rename from base/pub/doc/guide/e-dev.md rename to pub/doc/guide/e-dev.md diff --git a/base/pub/doc/hoon.md b/pub/doc/hoon.md similarity index 100% rename from base/pub/doc/hoon.md rename to pub/doc/hoon.md diff --git a/base/pub/doc/hoon/library.md b/pub/doc/hoon/library.md similarity index 100% rename from base/pub/doc/hoon/library.md rename to pub/doc/hoon/library.md diff --git a/base/pub/doc/hoon/library/0.md b/pub/doc/hoon/library/0.md similarity index 100% rename from base/pub/doc/hoon/library/0.md rename to pub/doc/hoon/library/0.md diff --git a/base/pub/doc/hoon/library/1.md b/pub/doc/hoon/library/1.md similarity index 100% rename from base/pub/doc/hoon/library/1.md rename to pub/doc/hoon/library/1.md diff --git a/base/pub/doc/hoon/library/2a.md b/pub/doc/hoon/library/2a.md similarity index 100% rename from base/pub/doc/hoon/library/2a.md rename to pub/doc/hoon/library/2a.md diff --git a/base/pub/doc/hoon/library/2b.md b/pub/doc/hoon/library/2b.md similarity index 100% rename from base/pub/doc/hoon/library/2b.md rename to pub/doc/hoon/library/2b.md diff --git a/base/pub/doc/hoon/library/2c.md b/pub/doc/hoon/library/2c.md similarity index 100% rename from base/pub/doc/hoon/library/2c.md rename to pub/doc/hoon/library/2c.md diff --git a/base/pub/doc/hoon/library/2da.md b/pub/doc/hoon/library/2da.md similarity index 100% rename from base/pub/doc/hoon/library/2da.md rename to pub/doc/hoon/library/2da.md diff --git a/base/pub/doc/hoon/library/2db.md b/pub/doc/hoon/library/2db.md similarity index 100% rename from base/pub/doc/hoon/library/2db.md rename to pub/doc/hoon/library/2db.md diff --git a/base/pub/doc/hoon/library/2dc.md b/pub/doc/hoon/library/2dc.md similarity index 100% rename from base/pub/doc/hoon/library/2dc.md rename to pub/doc/hoon/library/2dc.md diff --git a/base/pub/doc/hoon/library/2dd.md b/pub/doc/hoon/library/2dd.md similarity index 100% rename from base/pub/doc/hoon/library/2dd.md rename to pub/doc/hoon/library/2dd.md diff --git a/base/pub/doc/hoon/library/2ea.md b/pub/doc/hoon/library/2ea.md similarity index 100% rename from base/pub/doc/hoon/library/2ea.md rename to pub/doc/hoon/library/2ea.md diff --git a/base/pub/doc/hoon/library/2eb.md b/pub/doc/hoon/library/2eb.md similarity index 100% rename from base/pub/doc/hoon/library/2eb.md rename to pub/doc/hoon/library/2eb.md diff --git a/base/pub/doc/hoon/library/2ec.md b/pub/doc/hoon/library/2ec.md similarity index 100% rename from base/pub/doc/hoon/library/2ec.md rename to pub/doc/hoon/library/2ec.md diff --git a/base/pub/doc/hoon/library/2ed.md b/pub/doc/hoon/library/2ed.md similarity index 100% rename from base/pub/doc/hoon/library/2ed.md rename to pub/doc/hoon/library/2ed.md diff --git a/base/pub/doc/hoon/library/2ee.md b/pub/doc/hoon/library/2ee.md similarity index 100% rename from base/pub/doc/hoon/library/2ee.md rename to pub/doc/hoon/library/2ee.md diff --git a/base/pub/doc/hoon/library/2ef.md b/pub/doc/hoon/library/2ef.md similarity index 100% rename from base/pub/doc/hoon/library/2ef.md rename to pub/doc/hoon/library/2ef.md diff --git a/base/pub/doc/hoon/library/2eg.md b/pub/doc/hoon/library/2eg.md similarity index 100% rename from base/pub/doc/hoon/library/2eg.md rename to pub/doc/hoon/library/2eg.md diff --git a/base/pub/doc/hoon/library/2eh.md b/pub/doc/hoon/library/2eh.md similarity index 100% rename from base/pub/doc/hoon/library/2eh.md rename to pub/doc/hoon/library/2eh.md diff --git a/base/pub/doc/hoon/library/2ei.md b/pub/doc/hoon/library/2ei.md similarity index 100% rename from base/pub/doc/hoon/library/2ei.md rename to pub/doc/hoon/library/2ei.md diff --git a/base/pub/doc/hoon/library/2ej.md b/pub/doc/hoon/library/2ej.md similarity index 100% rename from base/pub/doc/hoon/library/2ej.md rename to pub/doc/hoon/library/2ej.md diff --git a/base/pub/doc/hoon/library/2ek.md b/pub/doc/hoon/library/2ek.md similarity index 100% rename from base/pub/doc/hoon/library/2ek.md rename to pub/doc/hoon/library/2ek.md diff --git a/base/pub/doc/hoon/library/2el.md b/pub/doc/hoon/library/2el.md similarity index 100% rename from base/pub/doc/hoon/library/2el.md rename to pub/doc/hoon/library/2el.md diff --git a/base/pub/doc/hoon/library/2em.md b/pub/doc/hoon/library/2em.md similarity index 100% rename from base/pub/doc/hoon/library/2em.md rename to pub/doc/hoon/library/2em.md diff --git a/base/pub/doc/hoon/library/2en.md b/pub/doc/hoon/library/2en.md similarity index 100% rename from base/pub/doc/hoon/library/2en.md rename to pub/doc/hoon/library/2en.md diff --git a/base/pub/doc/hoon/library/2eo.md b/pub/doc/hoon/library/2eo.md similarity index 100% rename from base/pub/doc/hoon/library/2eo.md rename to pub/doc/hoon/library/2eo.md diff --git a/base/pub/doc/hoon/library/2ep.md b/pub/doc/hoon/library/2ep.md similarity index 100% rename from base/pub/doc/hoon/library/2ep.md rename to pub/doc/hoon/library/2ep.md diff --git a/base/pub/doc/hoon/library/2ew.md b/pub/doc/hoon/library/2ew.md similarity index 100% rename from base/pub/doc/hoon/library/2ew.md rename to pub/doc/hoon/library/2ew.md diff --git a/base/pub/doc/hoon/library/2ex.md b/pub/doc/hoon/library/2ex.md similarity index 100% rename from base/pub/doc/hoon/library/2ex.md rename to pub/doc/hoon/library/2ex.md diff --git a/base/pub/doc/hoon/library/2ey.md b/pub/doc/hoon/library/2ey.md similarity index 100% rename from base/pub/doc/hoon/library/2ey.md rename to pub/doc/hoon/library/2ey.md diff --git a/base/pub/doc/hoon/library/2ez.md b/pub/doc/hoon/library/2ez.md similarity index 100% rename from base/pub/doc/hoon/library/2ez.md rename to pub/doc/hoon/library/2ez.md diff --git a/base/pub/doc/hoon/library/3ba.md b/pub/doc/hoon/library/3ba.md similarity index 100% rename from base/pub/doc/hoon/library/3ba.md rename to pub/doc/hoon/library/3ba.md diff --git a/base/pub/doc/hoon/library/3bb.md b/pub/doc/hoon/library/3bb.md similarity index 100% rename from base/pub/doc/hoon/library/3bb.md rename to pub/doc/hoon/library/3bb.md diff --git a/base/pub/doc/hoon/library/3bc.md b/pub/doc/hoon/library/3bc.md similarity index 100% rename from base/pub/doc/hoon/library/3bc.md rename to pub/doc/hoon/library/3bc.md diff --git a/base/pub/doc/hoon/library/3bd.md b/pub/doc/hoon/library/3bd.md similarity index 100% rename from base/pub/doc/hoon/library/3bd.md rename to pub/doc/hoon/library/3bd.md diff --git a/base/pub/doc/hoon/library/3be.md b/pub/doc/hoon/library/3be.md similarity index 100% rename from base/pub/doc/hoon/library/3be.md rename to pub/doc/hoon/library/3be.md diff --git a/base/pub/doc/hoon/library/3bf.md b/pub/doc/hoon/library/3bf.md similarity index 100% rename from base/pub/doc/hoon/library/3bf.md rename to pub/doc/hoon/library/3bf.md diff --git a/base/pub/doc/hoon/library/3bg.md b/pub/doc/hoon/library/3bg.md similarity index 100% rename from base/pub/doc/hoon/library/3bg.md rename to pub/doc/hoon/library/3bg.md diff --git a/base/pub/doc/hoon/library/3bh.md b/pub/doc/hoon/library/3bh.md similarity index 100% rename from base/pub/doc/hoon/library/3bh.md rename to pub/doc/hoon/library/3bh.md diff --git a/base/pub/doc/hoon/library/3bi.md b/pub/doc/hoon/library/3bi.md similarity index 100% rename from base/pub/doc/hoon/library/3bi.md rename to pub/doc/hoon/library/3bi.md diff --git a/base/pub/doc/hoon/reference.md b/pub/doc/hoon/reference.md similarity index 100% rename from base/pub/doc/hoon/reference.md rename to pub/doc/hoon/reference.md diff --git a/base/pub/doc/hoon/reference/odors.md b/pub/doc/hoon/reference/odors.md similarity index 100% rename from base/pub/doc/hoon/reference/odors.md rename to pub/doc/hoon/reference/odors.md diff --git a/base/pub/doc/hoon/runes.md b/pub/doc/hoon/runes.md similarity index 100% rename from base/pub/doc/hoon/runes.md rename to pub/doc/hoon/runes.md diff --git a/base/pub/doc/hoon/runes/bc.md b/pub/doc/hoon/runes/bc.md similarity index 100% rename from base/pub/doc/hoon/runes/bc.md rename to pub/doc/hoon/runes/bc.md diff --git a/base/pub/doc/hoon/runes/bc/bcbr.md b/pub/doc/hoon/runes/bc/bcbr.md similarity index 100% rename from base/pub/doc/hoon/runes/bc/bcbr.md rename to pub/doc/hoon/runes/bc/bcbr.md diff --git a/base/pub/doc/hoon/runes/bc/bccb.md b/pub/doc/hoon/runes/bc/bccb.md similarity index 100% rename from base/pub/doc/hoon/runes/bc/bccb.md rename to pub/doc/hoon/runes/bc/bccb.md diff --git a/base/pub/doc/hoon/runes/bc/bccl.md b/pub/doc/hoon/runes/bc/bccl.md similarity index 100% rename from base/pub/doc/hoon/runes/bc/bccl.md rename to pub/doc/hoon/runes/bc/bccl.md diff --git a/base/pub/doc/hoon/runes/bc/bccm.md b/pub/doc/hoon/runes/bc/bccm.md similarity index 100% rename from base/pub/doc/hoon/runes/bc/bccm.md rename to pub/doc/hoon/runes/bc/bccm.md diff --git a/base/pub/doc/hoon/runes/bc/bccn.md b/pub/doc/hoon/runes/bc/bccn.md similarity index 100% rename from base/pub/doc/hoon/runes/bc/bccn.md rename to pub/doc/hoon/runes/bc/bccn.md diff --git a/base/pub/doc/hoon/runes/bc/bckt.md b/pub/doc/hoon/runes/bc/bckt.md similarity index 100% rename from base/pub/doc/hoon/runes/bc/bckt.md rename to pub/doc/hoon/runes/bc/bckt.md diff --git a/base/pub/doc/hoon/runes/bc/bcls.md b/pub/doc/hoon/runes/bc/bcls.md similarity index 100% rename from base/pub/doc/hoon/runes/bc/bcls.md rename to pub/doc/hoon/runes/bc/bcls.md diff --git a/base/pub/doc/hoon/runes/bc/bcpm.md b/pub/doc/hoon/runes/bc/bcpm.md similarity index 100% rename from base/pub/doc/hoon/runes/bc/bcpm.md rename to pub/doc/hoon/runes/bc/bcpm.md diff --git a/base/pub/doc/hoon/runes/bc/bcpt.md b/pub/doc/hoon/runes/bc/bcpt.md similarity index 100% rename from base/pub/doc/hoon/runes/bc/bcpt.md rename to pub/doc/hoon/runes/bc/bcpt.md diff --git a/base/pub/doc/hoon/runes/bc/bctr.md b/pub/doc/hoon/runes/bc/bctr.md similarity index 100% rename from base/pub/doc/hoon/runes/bc/bctr.md rename to pub/doc/hoon/runes/bc/bctr.md diff --git a/base/pub/doc/hoon/runes/bc/bcts.md b/pub/doc/hoon/runes/bc/bcts.md similarity index 100% rename from base/pub/doc/hoon/runes/bc/bcts.md rename to pub/doc/hoon/runes/bc/bcts.md diff --git a/base/pub/doc/hoon/runes/bc/bcwt.md b/pub/doc/hoon/runes/bc/bcwt.md similarity index 100% rename from base/pub/doc/hoon/runes/bc/bcwt.md rename to pub/doc/hoon/runes/bc/bcwt.md diff --git a/base/pub/doc/hoon/runes/bc/bczp.md b/pub/doc/hoon/runes/bc/bczp.md similarity index 100% rename from base/pub/doc/hoon/runes/bc/bczp.md rename to pub/doc/hoon/runes/bc/bczp.md diff --git a/base/pub/doc/hoon/runes/br.md b/pub/doc/hoon/runes/br.md similarity index 100% rename from base/pub/doc/hoon/runes/br.md rename to pub/doc/hoon/runes/br.md diff --git a/base/pub/doc/hoon/runes/br/brcb.md b/pub/doc/hoon/runes/br/brcb.md similarity index 100% rename from base/pub/doc/hoon/runes/br/brcb.md rename to pub/doc/hoon/runes/br/brcb.md diff --git a/base/pub/doc/hoon/runes/br/brcn.md b/pub/doc/hoon/runes/br/brcn.md similarity index 100% rename from base/pub/doc/hoon/runes/br/brcn.md rename to pub/doc/hoon/runes/br/brcn.md diff --git a/base/pub/doc/hoon/runes/br/brdt.md b/pub/doc/hoon/runes/br/brdt.md similarity index 100% rename from base/pub/doc/hoon/runes/br/brdt.md rename to pub/doc/hoon/runes/br/brdt.md diff --git a/base/pub/doc/hoon/runes/br/brfs.md b/pub/doc/hoon/runes/br/brfs.md similarity index 100% rename from base/pub/doc/hoon/runes/br/brfs.md rename to pub/doc/hoon/runes/br/brfs.md diff --git a/base/pub/doc/hoon/runes/br/brhp.md b/pub/doc/hoon/runes/br/brhp.md similarity index 100% rename from base/pub/doc/hoon/runes/br/brhp.md rename to pub/doc/hoon/runes/br/brhp.md diff --git a/base/pub/doc/hoon/runes/br/brkt.md b/pub/doc/hoon/runes/br/brkt.md similarity index 100% rename from base/pub/doc/hoon/runes/br/brkt.md rename to pub/doc/hoon/runes/br/brkt.md diff --git a/base/pub/doc/hoon/runes/br/brls.md b/pub/doc/hoon/runes/br/brls.md similarity index 100% rename from base/pub/doc/hoon/runes/br/brls.md rename to pub/doc/hoon/runes/br/brls.md diff --git a/base/pub/doc/hoon/runes/br/brtr.md b/pub/doc/hoon/runes/br/brtr.md similarity index 100% rename from base/pub/doc/hoon/runes/br/brtr.md rename to pub/doc/hoon/runes/br/brtr.md diff --git a/base/pub/doc/hoon/runes/br/brts.md b/pub/doc/hoon/runes/br/brts.md similarity index 100% rename from base/pub/doc/hoon/runes/br/brts.md rename to pub/doc/hoon/runes/br/brts.md diff --git a/base/pub/doc/hoon/runes/br/brwt.md b/pub/doc/hoon/runes/br/brwt.md similarity index 100% rename from base/pub/doc/hoon/runes/br/brwt.md rename to pub/doc/hoon/runes/br/brwt.md diff --git a/base/pub/doc/hoon/runes/cl.md b/pub/doc/hoon/runes/cl.md similarity index 100% rename from base/pub/doc/hoon/runes/cl.md rename to pub/doc/hoon/runes/cl.md diff --git a/base/pub/doc/hoon/runes/cl/clcb.md b/pub/doc/hoon/runes/cl/clcb.md similarity index 100% rename from base/pub/doc/hoon/runes/cl/clcb.md rename to pub/doc/hoon/runes/cl/clcb.md diff --git a/base/pub/doc/hoon/runes/cl/clfs.md b/pub/doc/hoon/runes/cl/clfs.md similarity index 100% rename from base/pub/doc/hoon/runes/cl/clfs.md rename to pub/doc/hoon/runes/cl/clfs.md diff --git a/base/pub/doc/hoon/runes/cl/clhp.md b/pub/doc/hoon/runes/cl/clhp.md similarity index 100% rename from base/pub/doc/hoon/runes/cl/clhp.md rename to pub/doc/hoon/runes/cl/clhp.md diff --git a/base/pub/doc/hoon/runes/cl/clkt.md b/pub/doc/hoon/runes/cl/clkt.md similarity index 100% rename from base/pub/doc/hoon/runes/cl/clkt.md rename to pub/doc/hoon/runes/cl/clkt.md diff --git a/base/pub/doc/hoon/runes/cl/clls.md b/pub/doc/hoon/runes/cl/clls.md similarity index 100% rename from base/pub/doc/hoon/runes/cl/clls.md rename to pub/doc/hoon/runes/cl/clls.md diff --git a/base/pub/doc/hoon/runes/cl/clsg.md b/pub/doc/hoon/runes/cl/clsg.md similarity index 100% rename from base/pub/doc/hoon/runes/cl/clsg.md rename to pub/doc/hoon/runes/cl/clsg.md diff --git a/base/pub/doc/hoon/runes/cl/cltr.md b/pub/doc/hoon/runes/cl/cltr.md similarity index 100% rename from base/pub/doc/hoon/runes/cl/cltr.md rename to pub/doc/hoon/runes/cl/cltr.md diff --git a/base/pub/doc/hoon/runes/cn.md b/pub/doc/hoon/runes/cn.md similarity index 100% rename from base/pub/doc/hoon/runes/cn.md rename to pub/doc/hoon/runes/cn.md diff --git a/base/pub/doc/hoon/runes/cn/cncb.md b/pub/doc/hoon/runes/cn/cncb.md similarity index 100% rename from base/pub/doc/hoon/runes/cn/cncb.md rename to pub/doc/hoon/runes/cn/cncb.md diff --git a/base/pub/doc/hoon/runes/cn/cncl.md b/pub/doc/hoon/runes/cn/cncl.md similarity index 100% rename from base/pub/doc/hoon/runes/cn/cncl.md rename to pub/doc/hoon/runes/cn/cncl.md diff --git a/base/pub/doc/hoon/runes/cn/cndt.md b/pub/doc/hoon/runes/cn/cndt.md similarity index 100% rename from base/pub/doc/hoon/runes/cn/cndt.md rename to pub/doc/hoon/runes/cn/cndt.md diff --git a/base/pub/doc/hoon/runes/cn/cnhp.md b/pub/doc/hoon/runes/cn/cnhp.md similarity index 53% rename from base/pub/doc/hoon/runes/cn/cnhp.md rename to pub/doc/hoon/runes/cn/cnhp.md index d0dc8b66e..586c9f0c6 100644 --- a/base/pub/doc/hoon/runes/cn/cnhp.md +++ b/pub/doc/hoon/runes/cn/cnhp.md @@ -3,10 +3,9 @@ Slam, n-arguments -`%-` is a synthetic rune that that [pull]()s [`$`]() from the [door]() -`p` with its sample set to `[%cltr q]`. `%-` in the most common case -simply [slam]()s `p` with the list of arguments in `q`. `%-` is similar -to a function call, and is most familiar in its irregular form `(p q)`. +Slam, 1 (or n) argument(s) + +%- is a synthetic rune that that pulls $ from the door p with its sample set to [%cltr q]. %- in both its tall and wide forms is like a function call with one argument. However, %-is most commonly used in its irregular form, where p and q are enclosed within () where q is a list of n arguments. Produces -------- diff --git a/base/pub/doc/hoon/runes/cn/cnkt.md b/pub/doc/hoon/runes/cn/cnkt.md similarity index 100% rename from base/pub/doc/hoon/runes/cn/cnkt.md rename to pub/doc/hoon/runes/cn/cnkt.md diff --git a/base/pub/doc/hoon/runes/cn/cnls.md b/pub/doc/hoon/runes/cn/cnls.md similarity index 100% rename from base/pub/doc/hoon/runes/cn/cnls.md rename to pub/doc/hoon/runes/cn/cnls.md diff --git a/base/pub/doc/hoon/runes/cn/cnsg.md b/pub/doc/hoon/runes/cn/cnsg.md similarity index 100% rename from base/pub/doc/hoon/runes/cn/cnsg.md rename to pub/doc/hoon/runes/cn/cnsg.md diff --git a/base/pub/doc/hoon/runes/cn/cntr.md b/pub/doc/hoon/runes/cn/cntr.md similarity index 100% rename from base/pub/doc/hoon/runes/cn/cntr.md rename to pub/doc/hoon/runes/cn/cntr.md diff --git a/base/pub/doc/hoon/runes/cn/cnts.md b/pub/doc/hoon/runes/cn/cnts.md similarity index 100% rename from base/pub/doc/hoon/runes/cn/cnts.md rename to pub/doc/hoon/runes/cn/cnts.md diff --git a/base/pub/doc/hoon/runes/cn/cnzy.md b/pub/doc/hoon/runes/cn/cnzy.md similarity index 100% rename from base/pub/doc/hoon/runes/cn/cnzy.md rename to pub/doc/hoon/runes/cn/cnzy.md diff --git a/base/pub/doc/hoon/runes/cn/cnzz.md b/pub/doc/hoon/runes/cn/cnzz.md similarity index 100% rename from base/pub/doc/hoon/runes/cn/cnzz.md rename to pub/doc/hoon/runes/cn/cnzz.md diff --git a/base/pub/doc/hoon/runes/dt.md b/pub/doc/hoon/runes/dt.md similarity index 100% rename from base/pub/doc/hoon/runes/dt.md rename to pub/doc/hoon/runes/dt.md diff --git a/base/pub/doc/hoon/runes/dt/dtkt.md b/pub/doc/hoon/runes/dt/dtkt.md similarity index 100% rename from base/pub/doc/hoon/runes/dt/dtkt.md rename to pub/doc/hoon/runes/dt/dtkt.md diff --git a/base/pub/doc/hoon/runes/dt/dtls.md b/pub/doc/hoon/runes/dt/dtls.md similarity index 100% rename from base/pub/doc/hoon/runes/dt/dtls.md rename to pub/doc/hoon/runes/dt/dtls.md diff --git a/base/pub/doc/hoon/runes/dt/dttr.md b/pub/doc/hoon/runes/dt/dttr.md similarity index 100% rename from base/pub/doc/hoon/runes/dt/dttr.md rename to pub/doc/hoon/runes/dt/dttr.md diff --git a/base/pub/doc/hoon/runes/dt/dtts.md b/pub/doc/hoon/runes/dt/dtts.md similarity index 100% rename from base/pub/doc/hoon/runes/dt/dtts.md rename to pub/doc/hoon/runes/dt/dtts.md diff --git a/base/pub/doc/hoon/runes/dt/dtwt.md b/pub/doc/hoon/runes/dt/dtwt.md similarity index 100% rename from base/pub/doc/hoon/runes/dt/dtwt.md rename to pub/doc/hoon/runes/dt/dtwt.md diff --git a/base/pub/doc/hoon/runes/dt/dtzy.md b/pub/doc/hoon/runes/dt/dtzy.md similarity index 100% rename from base/pub/doc/hoon/runes/dt/dtzy.md rename to pub/doc/hoon/runes/dt/dtzy.md diff --git a/base/pub/doc/hoon/runes/dt/dtzz.md b/pub/doc/hoon/runes/dt/dtzz.md similarity index 100% rename from base/pub/doc/hoon/runes/dt/dtzz.md rename to pub/doc/hoon/runes/dt/dtzz.md diff --git a/base/pub/doc/hoon/runes/hx.md b/pub/doc/hoon/runes/hx.md similarity index 100% rename from base/pub/doc/hoon/runes/hx.md rename to pub/doc/hoon/runes/hx.md diff --git a/base/pub/doc/hoon/runes/hx/hxgl.md b/pub/doc/hoon/runes/hx/hxgl.md similarity index 100% rename from base/pub/doc/hoon/runes/hx/hxgl.md rename to pub/doc/hoon/runes/hx/hxgl.md diff --git a/base/pub/doc/hoon/runes/hx/hxgr.md b/pub/doc/hoon/runes/hx/hxgr.md similarity index 100% rename from base/pub/doc/hoon/runes/hx/hxgr.md rename to pub/doc/hoon/runes/hx/hxgr.md diff --git a/base/pub/doc/hoon/runes/kt.md b/pub/doc/hoon/runes/kt.md similarity index 100% rename from base/pub/doc/hoon/runes/kt.md rename to pub/doc/hoon/runes/kt.md diff --git a/base/pub/doc/hoon/runes/kt/ktbr.md b/pub/doc/hoon/runes/kt/ktbr.md similarity index 100% rename from base/pub/doc/hoon/runes/kt/ktbr.md rename to pub/doc/hoon/runes/kt/ktbr.md diff --git a/base/pub/doc/hoon/runes/kt/ktdt.md b/pub/doc/hoon/runes/kt/ktdt.md similarity index 100% rename from base/pub/doc/hoon/runes/kt/ktdt.md rename to pub/doc/hoon/runes/kt/ktdt.md diff --git a/base/pub/doc/hoon/runes/kt/kthp.md b/pub/doc/hoon/runes/kt/kthp.md similarity index 100% rename from base/pub/doc/hoon/runes/kt/kthp.md rename to pub/doc/hoon/runes/kt/kthp.md diff --git a/base/pub/doc/hoon/runes/kt/ktls.md b/pub/doc/hoon/runes/kt/ktls.md similarity index 100% rename from base/pub/doc/hoon/runes/kt/ktls.md rename to pub/doc/hoon/runes/kt/ktls.md diff --git a/base/pub/doc/hoon/runes/kt/ktpm.md b/pub/doc/hoon/runes/kt/ktpm.md similarity index 100% rename from base/pub/doc/hoon/runes/kt/ktpm.md rename to pub/doc/hoon/runes/kt/ktpm.md diff --git a/base/pub/doc/hoon/runes/kt/ktsg.md b/pub/doc/hoon/runes/kt/ktsg.md similarity index 100% rename from base/pub/doc/hoon/runes/kt/ktsg.md rename to pub/doc/hoon/runes/kt/ktsg.md diff --git a/base/pub/doc/hoon/runes/kt/ktts.md b/pub/doc/hoon/runes/kt/ktts.md similarity index 100% rename from base/pub/doc/hoon/runes/kt/ktts.md rename to pub/doc/hoon/runes/kt/ktts.md diff --git a/base/pub/doc/hoon/runes/kt/ktwt.md b/pub/doc/hoon/runes/kt/ktwt.md similarity index 100% rename from base/pub/doc/hoon/runes/kt/ktwt.md rename to pub/doc/hoon/runes/kt/ktwt.md diff --git a/base/pub/doc/hoon/runes/sg.md b/pub/doc/hoon/runes/sg.md similarity index 100% rename from base/pub/doc/hoon/runes/sg.md rename to pub/doc/hoon/runes/sg.md diff --git a/base/pub/doc/hoon/runes/sg/sgbc.md b/pub/doc/hoon/runes/sg/sgbc.md similarity index 100% rename from base/pub/doc/hoon/runes/sg/sgbc.md rename to pub/doc/hoon/runes/sg/sgbc.md diff --git a/base/pub/doc/hoon/runes/sg/sgbr.md b/pub/doc/hoon/runes/sg/sgbr.md similarity index 100% rename from base/pub/doc/hoon/runes/sg/sgbr.md rename to pub/doc/hoon/runes/sg/sgbr.md diff --git a/base/pub/doc/hoon/runes/sg/sgcb.md b/pub/doc/hoon/runes/sg/sgcb.md similarity index 100% rename from base/pub/doc/hoon/runes/sg/sgcb.md rename to pub/doc/hoon/runes/sg/sgcb.md diff --git a/base/pub/doc/hoon/runes/sg/sgcn.md b/pub/doc/hoon/runes/sg/sgcn.md similarity index 100% rename from base/pub/doc/hoon/runes/sg/sgcn.md rename to pub/doc/hoon/runes/sg/sgcn.md diff --git a/base/pub/doc/hoon/runes/sg/sgfs.md b/pub/doc/hoon/runes/sg/sgfs.md similarity index 100% rename from base/pub/doc/hoon/runes/sg/sgfs.md rename to pub/doc/hoon/runes/sg/sgfs.md diff --git a/base/pub/doc/hoon/runes/sg/sggl.md b/pub/doc/hoon/runes/sg/sggl.md similarity index 100% rename from base/pub/doc/hoon/runes/sg/sggl.md rename to pub/doc/hoon/runes/sg/sggl.md diff --git a/base/pub/doc/hoon/runes/sg/sggr.md b/pub/doc/hoon/runes/sg/sggr.md similarity index 100% rename from base/pub/doc/hoon/runes/sg/sggr.md rename to pub/doc/hoon/runes/sg/sggr.md diff --git a/base/pub/doc/hoon/runes/sg/sgls.md b/pub/doc/hoon/runes/sg/sgls.md similarity index 100% rename from base/pub/doc/hoon/runes/sg/sgls.md rename to pub/doc/hoon/runes/sg/sgls.md diff --git a/base/pub/doc/hoon/runes/sg/sgpm.md b/pub/doc/hoon/runes/sg/sgpm.md similarity index 100% rename from base/pub/doc/hoon/runes/sg/sgpm.md rename to pub/doc/hoon/runes/sg/sgpm.md diff --git a/base/pub/doc/hoon/runes/sg/sgts.md b/pub/doc/hoon/runes/sg/sgts.md similarity index 100% rename from base/pub/doc/hoon/runes/sg/sgts.md rename to pub/doc/hoon/runes/sg/sgts.md diff --git a/base/pub/doc/hoon/runes/sg/sgwt.md b/pub/doc/hoon/runes/sg/sgwt.md similarity index 100% rename from base/pub/doc/hoon/runes/sg/sgwt.md rename to pub/doc/hoon/runes/sg/sgwt.md diff --git a/base/pub/doc/hoon/runes/sg/sgzp.md b/pub/doc/hoon/runes/sg/sgzp.md similarity index 100% rename from base/pub/doc/hoon/runes/sg/sgzp.md rename to pub/doc/hoon/runes/sg/sgzp.md diff --git a/base/pub/doc/hoon/runes/sm.md b/pub/doc/hoon/runes/sm.md similarity index 100% rename from base/pub/doc/hoon/runes/sm.md rename to pub/doc/hoon/runes/sm.md diff --git a/base/pub/doc/hoon/runes/sm/smcl.md b/pub/doc/hoon/runes/sm/smcl.md similarity index 100% rename from base/pub/doc/hoon/runes/sm/smcl.md rename to pub/doc/hoon/runes/sm/smcl.md diff --git a/base/pub/doc/hoon/runes/sm/smcn.md b/pub/doc/hoon/runes/sm/smcn.md similarity index 100% rename from base/pub/doc/hoon/runes/sm/smcn.md rename to pub/doc/hoon/runes/sm/smcn.md diff --git a/base/pub/doc/hoon/runes/sm/smdq.md b/pub/doc/hoon/runes/sm/smdq.md similarity index 100% rename from base/pub/doc/hoon/runes/sm/smdq.md rename to pub/doc/hoon/runes/sm/smdq.md diff --git a/base/pub/doc/hoon/runes/sm/smhp.md b/pub/doc/hoon/runes/sm/smhp.md similarity index 100% rename from base/pub/doc/hoon/runes/sm/smhp.md rename to pub/doc/hoon/runes/sm/smhp.md diff --git a/base/pub/doc/hoon/runes/sm/smls.md b/pub/doc/hoon/runes/sm/smls.md similarity index 100% rename from base/pub/doc/hoon/runes/sm/smls.md rename to pub/doc/hoon/runes/sm/smls.md diff --git a/base/pub/doc/hoon/runes/sm/smsg.md b/pub/doc/hoon/runes/sm/smsg.md similarity index 100% rename from base/pub/doc/hoon/runes/sm/smsg.md rename to pub/doc/hoon/runes/sm/smsg.md diff --git a/base/pub/doc/hoon/runes/sm/smsm.md b/pub/doc/hoon/runes/sm/smsm.md similarity index 100% rename from base/pub/doc/hoon/runes/sm/smsm.md rename to pub/doc/hoon/runes/sm/smsm.md diff --git a/base/pub/doc/hoon/runes/sm/smtr.md b/pub/doc/hoon/runes/sm/smtr.md similarity index 100% rename from base/pub/doc/hoon/runes/sm/smtr.md rename to pub/doc/hoon/runes/sm/smtr.md diff --git a/base/pub/doc/hoon/runes/sm/smzz.md b/pub/doc/hoon/runes/sm/smzz.md similarity index 100% rename from base/pub/doc/hoon/runes/sm/smzz.md rename to pub/doc/hoon/runes/sm/smzz.md diff --git a/base/pub/doc/hoon/runes/ts.md b/pub/doc/hoon/runes/ts.md similarity index 100% rename from base/pub/doc/hoon/runes/ts.md rename to pub/doc/hoon/runes/ts.md diff --git a/base/pub/doc/hoon/runes/ts/tsbr.md b/pub/doc/hoon/runes/ts/tsbr.md similarity index 100% rename from base/pub/doc/hoon/runes/ts/tsbr.md rename to pub/doc/hoon/runes/ts/tsbr.md diff --git a/base/pub/doc/hoon/runes/ts/tscl.md b/pub/doc/hoon/runes/ts/tscl.md similarity index 100% rename from base/pub/doc/hoon/runes/ts/tscl.md rename to pub/doc/hoon/runes/ts/tscl.md diff --git a/base/pub/doc/hoon/runes/ts/tsdt.md b/pub/doc/hoon/runes/ts/tsdt.md similarity index 100% rename from base/pub/doc/hoon/runes/ts/tsdt.md rename to pub/doc/hoon/runes/ts/tsdt.md diff --git a/base/pub/doc/hoon/runes/ts/tsgl.md b/pub/doc/hoon/runes/ts/tsgl.md similarity index 100% rename from base/pub/doc/hoon/runes/ts/tsgl.md rename to pub/doc/hoon/runes/ts/tsgl.md diff --git a/base/pub/doc/hoon/runes/ts/tsgr.md b/pub/doc/hoon/runes/ts/tsgr.md similarity index 100% rename from base/pub/doc/hoon/runes/ts/tsgr.md rename to pub/doc/hoon/runes/ts/tsgr.md diff --git a/base/pub/doc/hoon/runes/ts/tshp.md b/pub/doc/hoon/runes/ts/tshp.md similarity index 100% rename from base/pub/doc/hoon/runes/ts/tshp.md rename to pub/doc/hoon/runes/ts/tshp.md diff --git a/base/pub/doc/hoon/runes/ts/tskt.md b/pub/doc/hoon/runes/ts/tskt.md similarity index 100% rename from base/pub/doc/hoon/runes/ts/tskt.md rename to pub/doc/hoon/runes/ts/tskt.md diff --git a/base/pub/doc/hoon/runes/ts/tsls.md b/pub/doc/hoon/runes/ts/tsls.md similarity index 100% rename from base/pub/doc/hoon/runes/ts/tsls.md rename to pub/doc/hoon/runes/ts/tsls.md diff --git a/base/pub/doc/hoon/runes/ts/tssg.md b/pub/doc/hoon/runes/ts/tssg.md similarity index 100% rename from base/pub/doc/hoon/runes/ts/tssg.md rename to pub/doc/hoon/runes/ts/tssg.md diff --git a/base/pub/doc/hoon/runes/ts/tstr.md b/pub/doc/hoon/runes/ts/tstr.md similarity index 100% rename from base/pub/doc/hoon/runes/ts/tstr.md rename to pub/doc/hoon/runes/ts/tstr.md diff --git a/base/pub/doc/hoon/runes/wt.md b/pub/doc/hoon/runes/wt.md similarity index 100% rename from base/pub/doc/hoon/runes/wt.md rename to pub/doc/hoon/runes/wt.md diff --git a/base/pub/doc/hoon/runes/wt/wtbr.md b/pub/doc/hoon/runes/wt/wtbr.md similarity index 100% rename from base/pub/doc/hoon/runes/wt/wtbr.md rename to pub/doc/hoon/runes/wt/wtbr.md diff --git a/base/pub/doc/hoon/runes/wt/wtcl.md b/pub/doc/hoon/runes/wt/wtcl.md similarity index 100% rename from base/pub/doc/hoon/runes/wt/wtcl.md rename to pub/doc/hoon/runes/wt/wtcl.md diff --git a/base/pub/doc/hoon/runes/wt/wtdt.md b/pub/doc/hoon/runes/wt/wtdt.md similarity index 100% rename from base/pub/doc/hoon/runes/wt/wtdt.md rename to pub/doc/hoon/runes/wt/wtdt.md diff --git a/base/pub/doc/hoon/runes/wt/wtgl.md b/pub/doc/hoon/runes/wt/wtgl.md similarity index 100% rename from base/pub/doc/hoon/runes/wt/wtgl.md rename to pub/doc/hoon/runes/wt/wtgl.md diff --git a/base/pub/doc/hoon/runes/wt/wtgr.md b/pub/doc/hoon/runes/wt/wtgr.md similarity index 100% rename from base/pub/doc/hoon/runes/wt/wtgr.md rename to pub/doc/hoon/runes/wt/wtgr.md diff --git a/base/pub/doc/hoon/runes/wt/wthp.md b/pub/doc/hoon/runes/wt/wthp.md similarity index 100% rename from base/pub/doc/hoon/runes/wt/wthp.md rename to pub/doc/hoon/runes/wt/wthp.md diff --git a/base/pub/doc/hoon/runes/wt/wthz.md b/pub/doc/hoon/runes/wt/wthz.md similarity index 100% rename from base/pub/doc/hoon/runes/wt/wthz.md rename to pub/doc/hoon/runes/wt/wthz.md diff --git a/base/pub/doc/hoon/runes/wt/wtkt.md b/pub/doc/hoon/runes/wt/wtkt.md similarity index 100% rename from base/pub/doc/hoon/runes/wt/wtkt.md rename to pub/doc/hoon/runes/wt/wtkt.md diff --git a/base/pub/doc/hoon/runes/wt/wtkz.md b/pub/doc/hoon/runes/wt/wtkz.md similarity index 100% rename from base/pub/doc/hoon/runes/wt/wtkz.md rename to pub/doc/hoon/runes/wt/wtkz.md diff --git a/base/pub/doc/hoon/runes/wt/wtls.md b/pub/doc/hoon/runes/wt/wtls.md similarity index 100% rename from base/pub/doc/hoon/runes/wt/wtls.md rename to pub/doc/hoon/runes/wt/wtls.md diff --git a/base/pub/doc/hoon/runes/wt/wtlz.md b/pub/doc/hoon/runes/wt/wtlz.md similarity index 100% rename from base/pub/doc/hoon/runes/wt/wtlz.md rename to pub/doc/hoon/runes/wt/wtlz.md diff --git a/base/pub/doc/hoon/runes/wt/wtpm.md b/pub/doc/hoon/runes/wt/wtpm.md similarity index 100% rename from base/pub/doc/hoon/runes/wt/wtpm.md rename to pub/doc/hoon/runes/wt/wtpm.md diff --git a/base/pub/doc/hoon/runes/wt/wtpt.md b/pub/doc/hoon/runes/wt/wtpt.md similarity index 100% rename from base/pub/doc/hoon/runes/wt/wtpt.md rename to pub/doc/hoon/runes/wt/wtpt.md diff --git a/base/pub/doc/hoon/runes/wt/wtpz.md b/pub/doc/hoon/runes/wt/wtpz.md similarity index 100% rename from base/pub/doc/hoon/runes/wt/wtpz.md rename to pub/doc/hoon/runes/wt/wtpz.md diff --git a/base/pub/doc/hoon/runes/wt/wtsg.md b/pub/doc/hoon/runes/wt/wtsg.md similarity index 100% rename from base/pub/doc/hoon/runes/wt/wtsg.md rename to pub/doc/hoon/runes/wt/wtsg.md diff --git a/base/pub/doc/hoon/runes/wt/wtsz.md b/pub/doc/hoon/runes/wt/wtsz.md similarity index 100% rename from base/pub/doc/hoon/runes/wt/wtsz.md rename to pub/doc/hoon/runes/wt/wtsz.md diff --git a/base/pub/doc/hoon/runes/wt/wtts.md b/pub/doc/hoon/runes/wt/wtts.md similarity index 100% rename from base/pub/doc/hoon/runes/wt/wtts.md rename to pub/doc/hoon/runes/wt/wtts.md diff --git a/base/pub/doc/hoon/runes/wt/wttz.md b/pub/doc/hoon/runes/wt/wttz.md similarity index 100% rename from base/pub/doc/hoon/runes/wt/wttz.md rename to pub/doc/hoon/runes/wt/wttz.md diff --git a/base/pub/doc/hoon/runes/wt/wtzp.md b/pub/doc/hoon/runes/wt/wtzp.md similarity index 100% rename from base/pub/doc/hoon/runes/wt/wtzp.md rename to pub/doc/hoon/runes/wt/wtzp.md diff --git a/base/pub/doc/hoon/runes/zp.md b/pub/doc/hoon/runes/zp.md similarity index 100% rename from base/pub/doc/hoon/runes/zp.md rename to pub/doc/hoon/runes/zp.md diff --git a/base/pub/doc/hoon/runes/zp/zpcb.md b/pub/doc/hoon/runes/zp/zpcb.md similarity index 100% rename from base/pub/doc/hoon/runes/zp/zpcb.md rename to pub/doc/hoon/runes/zp/zpcb.md diff --git a/base/pub/doc/hoon/runes/zp/zpcm.md b/pub/doc/hoon/runes/zp/zpcm.md similarity index 100% rename from base/pub/doc/hoon/runes/zp/zpcm.md rename to pub/doc/hoon/runes/zp/zpcm.md diff --git a/base/pub/doc/hoon/runes/zp/zpfs.md b/pub/doc/hoon/runes/zp/zpfs.md similarity index 100% rename from base/pub/doc/hoon/runes/zp/zpfs.md rename to pub/doc/hoon/runes/zp/zpfs.md diff --git a/base/pub/doc/hoon/runes/zp/zpgr.md b/pub/doc/hoon/runes/zp/zpgr.md similarity index 100% rename from base/pub/doc/hoon/runes/zp/zpgr.md rename to pub/doc/hoon/runes/zp/zpgr.md diff --git a/base/pub/doc/hoon/runes/zp/zpsm.md b/pub/doc/hoon/runes/zp/zpsm.md similarity index 100% rename from base/pub/doc/hoon/runes/zp/zpsm.md rename to pub/doc/hoon/runes/zp/zpsm.md diff --git a/base/pub/doc/hoon/runes/zp/zpts.md b/pub/doc/hoon/runes/zp/zpts.md similarity index 100% rename from base/pub/doc/hoon/runes/zp/zpts.md rename to pub/doc/hoon/runes/zp/zpts.md diff --git a/base/pub/doc/hoon/runes/zp/zpwt.md b/pub/doc/hoon/runes/zp/zpwt.md similarity index 100% rename from base/pub/doc/hoon/runes/zp/zpwt.md rename to pub/doc/hoon/runes/zp/zpwt.md diff --git a/base/pub/doc/hoon/runes/zp/zpzp.md b/pub/doc/hoon/runes/zp/zpzp.md similarity index 100% rename from base/pub/doc/hoon/runes/zp/zpzp.md rename to pub/doc/hoon/runes/zp/zpzp.md diff --git a/base/pub/doc/nock.md b/pub/doc/nock.md similarity index 100% rename from base/pub/doc/nock.md rename to pub/doc/nock.md diff --git a/base/pub/doc/nock/reference.md b/pub/doc/nock/reference.md similarity index 97% rename from base/pub/doc/nock/reference.md rename to pub/doc/nock/reference.md index 0d1f4977a..1550b9273 100644 --- a/base/pub/doc/nock/reference.md +++ b/pub/doc/nock/reference.md @@ -710,6 +710,13 @@ variants of `10` as equivalent.) ------------------------------------------------------------------------ +Op 11: Retrieve +----------- + +**operator 11** retrieves data from the global namespace at the path it is given. + +nock 11 is an additional nock operation provided by arvo to provide access to the global namespace. It's provided by arvo, so even though it's not technically a part of the nock, any code that arvo runs has access to it. When nock running on top of arvo hits nock 11, it either produces a value or blocks. The most common usage is with clay, where ^(%cx /path/to/file) will produce the referred-to-file. + Crash default ------------- diff --git a/base/pub/doc/reference.md b/pub/doc/reference.md similarity index 100% rename from base/pub/doc/reference.md rename to pub/doc/reference.md diff --git a/base/pub/doc/reference/glossary.md b/pub/doc/reference/glossary.md similarity index 100% rename from base/pub/doc/reference/glossary.md rename to pub/doc/reference/glossary.md diff --git a/base/pub/doc/reference/u3.md b/pub/doc/reference/u3.md similarity index 100% rename from base/pub/doc/reference/u3.md rename to pub/doc/reference/u3.md diff --git a/base/pub/doc/reference/vere.md b/pub/doc/reference/vere.md similarity index 100% rename from base/pub/doc/reference/vere.md rename to pub/doc/reference/vere.md diff --git a/base/pub/doc/talk.md b/pub/doc/talk.md similarity index 100% rename from base/pub/doc/talk.md rename to pub/doc/talk.md diff --git a/base/pub/doc/talk/help.txt b/pub/doc/talk/help.txt similarity index 100% rename from base/pub/doc/talk/help.txt rename to pub/doc/talk/help.txt diff --git a/base/pub/fab/readme.md b/pub/fab/readme.md similarity index 100% rename from base/pub/fab/readme.md rename to pub/fab/readme.md diff --git a/base/pub/match/hymn.hook b/pub/match/hymn.hook similarity index 100% rename from base/pub/match/hymn.hook rename to pub/match/hymn.hook diff --git a/base/pub/oct3/fab/hymn.hook b/pub/oct3/fab/hymn.hook similarity index 100% rename from base/pub/oct3/fab/hymn.hook rename to pub/oct3/fab/hymn.hook diff --git a/base/pub/oct3/src/main.css b/pub/oct3/src/main.css similarity index 100% rename from base/pub/oct3/src/main.css rename to pub/oct3/src/main.css diff --git a/base/pub/oct3/src/main.js b/pub/oct3/src/main.js similarity index 100% rename from base/pub/oct3/src/main.js rename to pub/oct3/src/main.js diff --git a/base/pub/sole/fab/hymn.hook b/pub/sole/fab/hymn.hook similarity index 100% rename from base/pub/sole/fab/hymn.hook rename to pub/sole/fab/hymn.hook diff --git a/base/pub/sole/src/main.coffee b/pub/sole/src/main.coffee similarity index 100% rename from base/pub/sole/src/main.coffee rename to pub/sole/src/main.coffee diff --git a/base/pub/sole/src/share.coffee b/pub/sole/src/share.coffee similarity index 100% rename from base/pub/sole/src/share.coffee rename to pub/sole/src/share.coffee diff --git a/base/pub/src/readme.md b/pub/src/readme.md similarity index 100% rename from base/pub/src/readme.md rename to pub/src/readme.md diff --git a/base/pub/talk/fab/hymn.hook b/pub/talk/fab/hymn.hook similarity index 100% rename from base/pub/talk/fab/hymn.hook rename to pub/talk/fab/hymn.hook diff --git a/base/pub/talk/src/css/fonts.styl b/pub/talk/src/css/fonts.styl similarity index 100% rename from base/pub/talk/src/css/fonts.styl rename to pub/talk/src/css/fonts.styl diff --git a/base/pub/talk/src/css/main.css b/pub/talk/src/css/main.css similarity index 100% rename from base/pub/talk/src/css/main.css rename to pub/talk/src/css/main.css diff --git a/base/pub/talk/src/css/main.styl b/pub/talk/src/css/main.styl similarity index 100% rename from base/pub/talk/src/css/main.styl rename to pub/talk/src/css/main.styl diff --git a/base/pub/talk/src/css/mobile.styl b/pub/talk/src/css/mobile.styl similarity index 100% rename from base/pub/talk/src/css/mobile.styl rename to pub/talk/src/css/mobile.styl diff --git a/pub/talk/src/js/.main.js b/pub/talk/src/js/.main.js new file mode 100644 index 000000000..e69de29bb diff --git a/base/pub/talk/src/js/actions/MessageActions.coffee b/pub/talk/src/js/actions/MessageActions.coffee similarity index 100% rename from base/pub/talk/src/js/actions/MessageActions.coffee rename to pub/talk/src/js/actions/MessageActions.coffee diff --git a/base/pub/talk/src/js/actions/StationActions.coffee b/pub/talk/src/js/actions/StationActions.coffee similarity index 100% rename from base/pub/talk/src/js/actions/StationActions.coffee rename to pub/talk/src/js/actions/StationActions.coffee diff --git a/base/pub/talk/src/js/components/MemberComponent.coffee b/pub/talk/src/js/components/MemberComponent.coffee similarity index 100% rename from base/pub/talk/src/js/components/MemberComponent.coffee rename to pub/talk/src/js/components/MemberComponent.coffee diff --git a/base/pub/talk/src/js/components/MessagesComponent.coffee b/pub/talk/src/js/components/MessagesComponent.coffee similarity index 100% rename from base/pub/talk/src/js/components/MessagesComponent.coffee rename to pub/talk/src/js/components/MessagesComponent.coffee diff --git a/base/pub/talk/src/js/components/StationComponent.coffee b/pub/talk/src/js/components/StationComponent.coffee similarity index 100% rename from base/pub/talk/src/js/components/StationComponent.coffee rename to pub/talk/src/js/components/StationComponent.coffee diff --git a/base/pub/talk/src/js/components/StationsComponent.coffee b/pub/talk/src/js/components/StationsComponent.coffee similarity index 100% rename from base/pub/talk/src/js/components/StationsComponent.coffee rename to pub/talk/src/js/components/StationsComponent.coffee diff --git a/base/pub/talk/src/js/components/TalkComponent.coffee b/pub/talk/src/js/components/TalkComponent.coffee similarity index 100% rename from base/pub/talk/src/js/components/TalkComponent.coffee rename to pub/talk/src/js/components/TalkComponent.coffee diff --git a/base/pub/talk/src/js/components/WritingComponent.coffee b/pub/talk/src/js/components/WritingComponent.coffee similarity index 100% rename from base/pub/talk/src/js/components/WritingComponent.coffee rename to pub/talk/src/js/components/WritingComponent.coffee diff --git a/base/pub/talk/src/js/dep/director.js b/pub/talk/src/js/dep/director.js similarity index 100% rename from base/pub/talk/src/js/dep/director.js rename to pub/talk/src/js/dep/director.js diff --git a/base/pub/talk/src/js/dispatcher/Dispatcher.coffee b/pub/talk/src/js/dispatcher/Dispatcher.coffee similarity index 100% rename from base/pub/talk/src/js/dispatcher/Dispatcher.coffee rename to pub/talk/src/js/dispatcher/Dispatcher.coffee diff --git a/base/pub/talk/src/js/main.coffee b/pub/talk/src/js/main.coffee similarity index 100% rename from base/pub/talk/src/js/main.coffee rename to pub/talk/src/js/main.coffee diff --git a/base/pub/talk/src/js/main.js b/pub/talk/src/js/main.js similarity index 100% rename from base/pub/talk/src/js/main.js rename to pub/talk/src/js/main.js diff --git a/base/pub/talk/src/js/module.coffee b/pub/talk/src/js/module.coffee similarity index 100% rename from base/pub/talk/src/js/module.coffee rename to pub/talk/src/js/module.coffee diff --git a/base/pub/talk/src/js/module.js b/pub/talk/src/js/module.js similarity index 100% rename from base/pub/talk/src/js/module.js rename to pub/talk/src/js/module.js diff --git a/base/pub/talk/src/js/move.coffee b/pub/talk/src/js/move.coffee similarity index 100% rename from base/pub/talk/src/js/move.coffee rename to pub/talk/src/js/move.coffee diff --git a/base/pub/talk/src/js/package.json b/pub/talk/src/js/package.json similarity index 100% rename from base/pub/talk/src/js/package.json rename to pub/talk/src/js/package.json diff --git a/base/pub/talk/src/js/persistence/MessagePersistence.coffee b/pub/talk/src/js/persistence/MessagePersistence.coffee similarity index 100% rename from base/pub/talk/src/js/persistence/MessagePersistence.coffee rename to pub/talk/src/js/persistence/MessagePersistence.coffee diff --git a/base/pub/talk/src/js/persistence/StationPersistence.coffee b/pub/talk/src/js/persistence/StationPersistence.coffee similarity index 100% rename from base/pub/talk/src/js/persistence/StationPersistence.coffee rename to pub/talk/src/js/persistence/StationPersistence.coffee diff --git a/base/pub/talk/src/js/stores/MessageStore.coffee b/pub/talk/src/js/stores/MessageStore.coffee similarity index 100% rename from base/pub/talk/src/js/stores/MessageStore.coffee rename to pub/talk/src/js/stores/MessageStore.coffee diff --git a/base/pub/talk/src/js/stores/StationStore.coffee b/pub/talk/src/js/stores/StationStore.coffee similarity index 100% rename from base/pub/talk/src/js/stores/StationStore.coffee rename to pub/talk/src/js/stores/StationStore.coffee diff --git a/base/pub/talk/src/js/test.js b/pub/talk/src/js/test.js similarity index 100% rename from base/pub/talk/src/js/test.js rename to pub/talk/src/js/test.js diff --git a/base/pub/talk/src/js/util.coffee b/pub/talk/src/js/util.coffee similarity index 100% rename from base/pub/talk/src/js/util.coffee rename to pub/talk/src/js/util.coffee diff --git a/base/pub/test.sched b/pub/test.sched similarity index 100% rename from base/pub/test.sched rename to pub/test.sched diff --git a/base/pub/tree/src/css/fonts.styl b/pub/tree/src/css/fonts.styl similarity index 100% rename from base/pub/tree/src/css/fonts.styl rename to pub/tree/src/css/fonts.styl diff --git a/base/pub/tree/src/css/main.css b/pub/tree/src/css/main.css similarity index 100% rename from base/pub/tree/src/css/main.css rename to pub/tree/src/css/main.css diff --git a/base/pub/tree/src/css/main.styl b/pub/tree/src/css/main.styl similarity index 100% rename from base/pub/tree/src/css/main.styl rename to pub/tree/src/css/main.styl diff --git a/base/pub/tree/src/css/mobile.styl b/pub/tree/src/css/mobile.styl similarity index 100% rename from base/pub/tree/src/css/mobile.styl rename to pub/tree/src/css/mobile.styl diff --git a/base/pub/tree/src/js/actions/TreeActions.coffee b/pub/tree/src/js/actions/TreeActions.coffee similarity index 100% rename from base/pub/tree/src/js/actions/TreeActions.coffee rename to pub/tree/src/js/actions/TreeActions.coffee diff --git a/base/pub/tree/src/js/components/AnchorComponent.coffee b/pub/tree/src/js/components/AnchorComponent.coffee similarity index 100% rename from base/pub/tree/src/js/components/AnchorComponent.coffee rename to pub/tree/src/js/components/AnchorComponent.coffee diff --git a/base/pub/tree/src/js/components/BodyComponent.coffee b/pub/tree/src/js/components/BodyComponent.coffee similarity index 100% rename from base/pub/tree/src/js/components/BodyComponent.coffee rename to pub/tree/src/js/components/BodyComponent.coffee diff --git a/base/pub/tree/src/js/components/CodeMirror.coffee b/pub/tree/src/js/components/CodeMirror.coffee similarity index 100% rename from base/pub/tree/src/js/components/CodeMirror.coffee rename to pub/tree/src/js/components/CodeMirror.coffee diff --git a/base/pub/tree/src/js/components/KidsComponent.coffee b/pub/tree/src/js/components/KidsComponent.coffee similarity index 100% rename from base/pub/tree/src/js/components/KidsComponent.coffee rename to pub/tree/src/js/components/KidsComponent.coffee diff --git a/base/pub/tree/src/js/components/ListComponent.coffee b/pub/tree/src/js/components/ListComponent.coffee similarity index 100% rename from base/pub/tree/src/js/components/ListComponent.coffee rename to pub/tree/src/js/components/ListComponent.coffee diff --git a/base/pub/tree/src/js/components/LoadComponent.coffee b/pub/tree/src/js/components/LoadComponent.coffee similarity index 100% rename from base/pub/tree/src/js/components/LoadComponent.coffee rename to pub/tree/src/js/components/LoadComponent.coffee diff --git a/base/pub/tree/src/js/dispatcher/Dispatcher.coffee b/pub/tree/src/js/dispatcher/Dispatcher.coffee similarity index 100% rename from base/pub/tree/src/js/dispatcher/Dispatcher.coffee rename to pub/tree/src/js/dispatcher/Dispatcher.coffee diff --git a/base/pub/tree/src/js/main.coffee b/pub/tree/src/js/main.coffee similarity index 100% rename from base/pub/tree/src/js/main.coffee rename to pub/tree/src/js/main.coffee diff --git a/base/pub/tree/src/js/main.js b/pub/tree/src/js/main.js similarity index 100% rename from base/pub/tree/src/js/main.js rename to pub/tree/src/js/main.js diff --git a/base/pub/tree/src/js/package.json b/pub/tree/src/js/package.json similarity index 100% rename from base/pub/tree/src/js/package.json rename to pub/tree/src/js/package.json diff --git a/base/pub/tree/src/js/persistence/TreePersistence.coffee b/pub/tree/src/js/persistence/TreePersistence.coffee similarity index 100% rename from base/pub/tree/src/js/persistence/TreePersistence.coffee rename to pub/tree/src/js/persistence/TreePersistence.coffee diff --git a/base/pub/tree/src/js/stores/TreeStore.coffee b/pub/tree/src/js/stores/TreeStore.coffee similarity index 100% rename from base/pub/tree/src/js/stores/TreeStore.coffee rename to pub/tree/src/js/stores/TreeStore.coffee diff --git a/base/pub/tree/src/readme.md b/pub/tree/src/readme.md similarity index 100% rename from base/pub/tree/src/readme.md rename to pub/tree/src/readme.md diff --git a/base/spec/nock/5.txt b/spec/nock/5.txt similarity index 100% rename from base/spec/nock/5.txt rename to spec/nock/5.txt diff --git a/base/sur/bang-args.hoon b/sur/bang-args.hoon similarity index 100% rename from base/sur/bang-args.hoon rename to sur/bang-args.hoon diff --git a/base/sur/bit-api.hoon b/sur/bit-api.hoon similarity index 100% rename from base/sur/bit-api.hoon rename to sur/bit-api.hoon diff --git a/base/sur/cp-args.hoon b/sur/cp-args.hoon similarity index 100% rename from base/sur/cp-args.hoon rename to sur/cp-args.hoon diff --git a/base/sur/demo-args.hoon b/sur/demo-args.hoon similarity index 100% rename from base/sur/demo-args.hoon rename to sur/demo-args.hoon diff --git a/base/sur/down.hoon b/sur/down.hoon similarity index 100% rename from base/sur/down.hoon rename to sur/down.hoon diff --git a/base/sur/foobar.hoon b/sur/foobar.hoon similarity index 100% rename from base/sur/foobar.hoon rename to sur/foobar.hoon diff --git a/base/sur/helm.hoon b/sur/helm.hoon similarity index 100% rename from base/sur/helm.hoon rename to sur/helm.hoon diff --git a/base/sur/hi-args.hoon b/sur/hi-args.hoon similarity index 100% rename from base/sur/hi-args.hoon rename to sur/hi-args.hoon diff --git a/base/sur/hood.hoon b/sur/hood.hoon similarity index 100% rename from base/sur/hood.hoon rename to sur/hood.hoon diff --git a/base/sur/into-args.hoon b/sur/into-args.hoon similarity index 100% rename from base/sur/into-args.hoon rename to sur/into-args.hoon diff --git a/base/sur/kyev.hoon b/sur/kyev.hoon similarity index 100% rename from base/sur/kyev.hoon rename to sur/kyev.hoon diff --git a/base/sur/markdown.hoon b/sur/markdown.hoon similarity index 100% rename from base/sur/markdown.hoon rename to sur/markdown.hoon diff --git a/base/sur/mess.hoon b/sur/mess.hoon similarity index 100% rename from base/sur/mess.hoon rename to sur/mess.hoon diff --git a/base/sur/mv-args.hoon b/sur/mv-args.hoon similarity index 100% rename from base/sur/mv-args.hoon rename to sur/mv-args.hoon diff --git a/base/sur/oct1.hoon b/sur/oct1.hoon similarity index 100% rename from base/sur/oct1.hoon rename to sur/oct1.hoon diff --git a/base/sur/oct2.hoon b/sur/oct2.hoon similarity index 100% rename from base/sur/oct2.hoon rename to sur/oct2.hoon diff --git a/base/sur/oct3.hoon b/sur/oct3.hoon similarity index 100% rename from base/sur/oct3.hoon rename to sur/oct3.hoon diff --git a/base/sur/oct4.hoon b/sur/oct4.hoon similarity index 100% rename from base/sur/oct4.hoon rename to sur/oct4.hoon diff --git a/base/sur/reload-args.hoon b/sur/reload-args.hoon similarity index 100% rename from base/sur/reload-args.hoon rename to sur/reload-args.hoon diff --git a/base/sur/rm-args.hoon b/sur/rm-args.hoon similarity index 100% rename from base/sur/rm-args.hoon rename to sur/rm-args.hoon diff --git a/base/sur/sole.hoon b/sur/sole.hoon similarity index 100% rename from base/sur/sole.hoon rename to sur/sole.hoon diff --git a/base/sur/sync-args.hoon b/sur/sync-args.hoon similarity index 100% rename from base/sur/sync-args.hoon rename to sur/sync-args.hoon diff --git a/base/sur/talk.hoon b/sur/talk.hoon similarity index 100% rename from base/sur/talk.hoon rename to sur/talk.hoon diff --git a/base/sur/term-ctrl.hoon b/sur/term-ctrl.hoon similarity index 100% rename from base/sur/term-ctrl.hoon rename to sur/term-ctrl.hoon diff --git a/base/sur/term-in.hoon b/sur/term-in.hoon similarity index 100% rename from base/sur/term-in.hoon rename to sur/term-in.hoon diff --git a/base/sur/term-line.hoon b/sur/term-line.hoon similarity index 100% rename from base/sur/term-line.hoon rename to sur/term-line.hoon diff --git a/base/sur/ticket-args.hoon b/sur/ticket-args.hoon similarity index 100% rename from base/sur/ticket-args.hoon rename to sur/ticket-args.hoon diff --git a/base/sur/twitter.hoon b/sur/twitter.hoon similarity index 100% rename from base/sur/twitter.hoon rename to sur/twitter.hoon diff --git a/base/sur/unsync-args.hoon b/sur/unsync-args.hoon similarity index 100% rename from base/sur/unsync-args.hoon rename to sur/unsync-args.hoon diff --git a/base/sur/user.hoon b/sur/user.hoon similarity index 100% rename from base/sur/user.hoon rename to sur/user.hoon diff --git a/base/sur/users.hoon b/sur/users.hoon similarity index 100% rename from base/sur/users.hoon rename to sur/users.hoon diff --git a/base/sur/verb-args.hoon b/sur/verb-args.hoon similarity index 100% rename from base/sur/verb-args.hoon rename to sur/verb-args.hoon diff --git a/base/sur/wand.hoon b/sur/wand.hoon similarity index 100% rename from base/sur/wand.hoon rename to sur/wand.hoon diff --git a/base/sur/zing.hoon b/sur/zing.hoon similarity index 100% rename from base/sur/zing.hoon rename to sur/zing.hoon diff --git a/base/sur/zong.hoon b/sur/zong.hoon similarity index 100% rename from base/sur/zong.hoon rename to sur/zong.hoon diff --git a/base/sur/zung.hoon b/sur/zung.hoon similarity index 100% rename from base/sur/zung.hoon rename to sur/zung.hoon diff --git a/base/tree/hymn.hook b/tree/hymn.hook similarity index 100% rename from base/tree/hymn.hook rename to tree/hymn.hook diff --git a/base/tree/json.hook b/tree/json.hook similarity index 100% rename from base/tree/json.hook rename to tree/json.hook diff --git a/base/tree/util.hoon b/tree/util.hoon similarity index 100% rename from base/tree/util.hoon rename to tree/util.hoon diff --git a/base/try/readme.md b/try/readme.md similarity index 100% rename from base/try/readme.md rename to try/readme.md