From 2b5e57de2d470023808d455cba722e66956be7f5 Mon Sep 17 00:00:00 2001 From: "C. Guy Yarvin" Date: Mon, 21 Jul 2014 15:14:52 -0700 Subject: [PATCH] Replace ++logo with ++mark to match doc. --- arvo/ames.hoon | 2 +- arvo/batz.hoon | 6 ++-- arvo/clay.hoon | 2 +- arvo/dill.hoon | 2 +- arvo/eyre.hoon | 18 ++++++------ arvo/ford.hoon | 79 ++++++++++++++++++++++---------------------------- arvo/gall.hoon | 20 ++++++------- arvo/hoon.hoon | 7 +++-- arvo/zuse.hoon | 6 ++-- 9 files changed, 66 insertions(+), 76 deletions(-) diff --git a/arvo/ames.hoon b/arvo/ames.hoon index 7671300612..b5671cf71d 100644 --- a/arvo/ames.hoon +++ b/arvo/ames.hoon @@ -1533,7 +1533,7 @@ :: ++ scry |= [fur=(unit (set monk)) ren=@tas who=ship syd=desk lot=coin tyl=path] - ^- (unit (unit (pair logo ,*))) + ^- (unit (unit (pair mark ,*))) ?~ tyl [~ ~] =+ hun=(slaw %p i.tyl) ?~ hun [~ ~] diff --git a/arvo/batz.hoon b/arvo/batz.hoon index 8154c2cee7..2972014e8e 100644 --- a/arvo/batz.hoon +++ b/arvo/batz.hoon @@ -89,8 +89,8 @@ [%nice ~] :: by %gall [%note p=@tD q=tank] :: by %clay [%pipe p=(unit ,[p=tutu q=(list)])] :: by %batz - [%rush p=logo q=*] :: - [%rust p=logo q=*] :: + [%rush p=mark q=*] :: + [%rust p=mark q=*] :: [%thou p=httr] :: by %eyre [%waft p=sock q=*] :: by %ames [%went p=ship q=cape] :: by %ames @@ -1429,7 +1429,7 @@ :: ++ scry |= [fur=(unit (set monk)) ren=@tas his=ship syd=desk lot=coin tyl=path] - ^- (unit (unit (pair logo ,*))) + ^- (unit (unit (pair mark ,*))) ~ :: ++ stay [%0 big dez] diff --git a/arvo/clay.hoon b/arvo/clay.hoon index 9d35ee3c27..357d0f3ebe 100644 --- a/arvo/clay.hoon +++ b/arvo/clay.hoon @@ -496,7 +496,7 @@ :: ++ scry :: inspect |= [fur=(unit (set monk)) ren=@tas his=ship syd=desk lot=coin tyl=path] - ^- (unit (unit (pair logo ,*))) + ^- (unit (unit (pair mark ,*))) =+ got=(~(has by fat.ruf) his) =+ luk=?.(?=(%$ -.lot) ~ ((soft case) p.lot)) ?~ luk [~ ~] diff --git a/arvo/dill.hoon b/arvo/dill.hoon index 13bf163f21..5efa5dc208 100644 --- a/arvo/dill.hoon +++ b/arvo/dill.hoon @@ -600,7 +600,7 @@ :: ++ scry |= [fur=(unit (set monk)) ren=@tas his=ship syd=desk lot=coin tyl=path] - ^- (unit (unit (pair logo ,*))) + ^- (unit (unit (pair mark ,*))) [~ ~ [%tank >dug<]] :: ++ stay [%0 dug] diff --git a/arvo/eyre.hoon b/arvo/eyre.hoon index d8cd193964..00dcbb0f09 100644 --- a/arvo/eyre.hoon +++ b/arvo/eyre.hoon @@ -55,8 +55,8 @@ ++ riff ,[p=desk q=(unit rave)] :: see %clay ++ silk :: see %ford $& [p=silk q=silk] :: - $% [%boil p=logo q=beam r=path] :: - [%cast p=logo q=beak r=silk] :: + $% [%boil p=mark q=beam r=path] :: + [%cast p=mark q=beak r=silk] :: [%done p=(set beam) q=cage] :: == :: ++ sign :: in result $<- @@ -84,8 +84,8 @@ $% [%dumb ~] :: [%mean p=(unit ,[p=term q=(list tank)])] :: [%nice ~] :: - [%rush p=logo q=*] :: - [%rust p=logo q=*] :: + [%rush p=mark q=*] :: + [%rust p=mark q=*] :: == == :: $: @tas :: by any $% [%crud p=@tas q=(list tank)] :: @@ -135,7 +135,7 @@ == :: ++ pimp :: traced request $: ful=? :: | === HEAD - fur=(unit logo) :: type goal + fur=(unit mark) :: type goal hen=duct :: event trace som=seam :: logical request pez=pest :: request state @@ -150,7 +150,7 @@ ++ seam :: logical request $% [%ape p=ship q=@ud r=@ud] :: subscribe pull [%aph p=ship q=@ud r=@ud s=json] :: app heartbeat - [%apg p=term q=ship r=logo s=path] :: app get/start + [%apg p=term q=ship r=mark s=path] :: app get/start [%apm p=ship q=@ud r=@ud s=hasp t=json] :: message send [%aps p=ship q=@ud s=hasp t=path] :: subscribe [%apu p=ship q=@ud s=hasp t=path] :: unsubscribe @@ -1319,7 +1319,7 @@ ^- (unit seam) =+ won==(%n (rsh 3 2 nep)) %+ bind - ^- (unit ,[logo tube]) + ^- (unit ,[mark tube]) =+ ^= zac ^- (unit ,[p=@ta q=path]) ?: won [~ (scot %da now) paw] @@ -1338,7 +1338,7 @@ p.u.zac t.q.u.zac == - |= [for=logo toe=tube] + |= [for=mark toe=tube] ^- seam :^ %fun for toe(s (weld s.toe `path`[~(rent co (flux [nep ~] quy)) %web ~])) @@ -2306,7 +2306,7 @@ :: ++ scry |= [our=(unit (set monk)) ren=@tas who=ship syd=desk lot=coin tyl=path] - ^- (unit (unit (pair logo ,*))) + ^- (unit (unit (pair mark ,*))) ~ :: ++ stay `bolo`+>-.$ diff --git a/arvo/ford.hoon b/arvo/ford.hoon index a1aa0d12c5..d2bc7b6162 100644 --- a/arvo/ford.hoon +++ b/arvo/ford.hoon @@ -17,11 +17,10 @@ [%s p=@ud q=@ud r=@ud] :: semantic version == :: ++ hood :: assembly plan - $: [how=beam rem=heel] :: beam and remainder - zus=@ud :: zuse kelvin + $: zus=@ud :: zuse kelvin pro=(list hoof) :: protocols lib=(list hoof) :: libraries - :: res=(map term (pair beam horn)) :: resources + :: res=(map term (pair beam horn)) :: resources src=(list hoop) :: program == :: ++ hoof :: reference @@ -40,7 +39,7 @@ $| ~ :: leaf $% [%day p=horn] :: list by time [%fan p=(map term horn)] :: tuple - [%for p=logo q=horn] :: leaf mark + [%for p=mark q=horn] :: leaf mark [%hub p=horn] :: list by number [%nap p=horn] :: soft map == :: @@ -63,11 +62,11 @@ == == == :: ++ silk :: construction layer $& [p=silk q=silk] :: cons - $% [%bake p=logo q=beam r=path] :: local synthesis - [%boil p=logo q=beam r=path] :: general synthesis - [%brew p=logo q=beam r=path] :: specific synthesis + $% [%bake p=mark q=beam r=path] :: local synthesis + [%boil p=mark q=beam r=path] :: general synthesis + [%brew p=mark q=beam r=path] :: specific synthesis [%call p=silk q=silk] :: slam - [%cast p=logo q=beak r=silk] :: translate + [%cast p=mark q=beak r=silk] :: translate [%done p=(set beam) q=cage] :: literal [%dude p=tank q=silk] :: error wrap [%dune p=(set beam) q=(unit cage)] :: unit literal @@ -75,7 +74,7 @@ [%plan p=beam q=spur r=hood] :: structured assembly [%reef ~] :: kernel reef [%ride p=silk q=sill] :: obsolete old plan - [%vale p=logo q=sack r=*] :: validate [our his] + [%vale p=mark q=sack r=*] :: validate [our his] == :: ++ sill :: code construction $& [p=sill q=sill] :: compose @@ -422,14 +421,20 @@ ++ hood %+ ifix [gay gay] %+ cook |=(a=^hood a) - %+ stag [bem rem] ;~ plug ;~ pose - (ifix [;~(plug pat wut gap) gap] dem) + (ifix [;~(plug fas wut gap) gap] dem) (easy zuse) == - hoos - hoos + :: + ;~ pose + (ifix [;~(plug fas hep gap) gap] (most ;~(plug com gaw) hoof)) + (easy ~) + == + ;~ pose + (ifix [;~(plug fas lus gap) gap] (most ;~(plug com gaw) hoof)) + (easy ~) + == (star hoop) == :: @@ -443,13 +448,6 @@ (stag %here sym) == :: - ++ hoos - %+ cook |=(a=(list ^hoof) a) - ;~ pose - (ifix [;~(plug pat lus gap) gap] (most ;~(plug com ace) hoof)) - (easy ~) - == - :: ++ hoop %+ knee *^hoop |. ~+ %+ cook |=(a=^hoop a) @@ -513,39 +511,29 @@ (fine cof p.cay vax) :: ++ krab :: load to vase - |= [cof=cafe for=logo how=logo bem=beam rem=heel] + |= [cof=cafe for=mark how=mark bem=beam rem=heel] ^- (bolt vase) %+ cope (fane cof %bake how bem rem) |= [cof=cafe gen=twig] (maim cof pit gen) :: ++ lace :: load and check - |= [cof=cafe for=logo bem=beam rem=heel] + |= [cof=cafe for=mark bem=beam rem=heel] ^- (bolt (unit vase)) =+ bek=`beak`[p.bem q.bem r.bem] %+ cope (lend cof bem) |= [cof=cafe arc=arch] ?^ q.arc (cope (liar cof bem) (lake for bek)) - ?: (~(has by r.arc) %hood) + ?: (~(has by r.arc) %hoon) %+ cope (fade cof bem rem) |= [cof=cafe hyd=hood] %+ cope (abut:(meow bem rem) cof hyd) - |= [cof=cafe vax=vase] - (fine cof ~ vax) - ?: (~(has by r.arc) %hook) - %+ cope (krab cof for %hook bem rem) - |= [cof=cafe vax=vase] - %+ cope ((lair for bem) cof vax) - |= [cof=cafe vax=vase] - (fine cof ~ vax) - ?: (~(has by r.arc) %hoon) - %+ cope (krab cof for %hoon bem rem) (lake for bek) (fine cof ~) :: ++ lake :: check/coerce - |= [for=logo bek=beak] + |= [for=mark bek=beak] |= [cof=cafe sam=vase] ^- (bolt (unit vase)) ?: ?=(?(%gate %core %hoon %hook %hood) for) @@ -561,7 +549,7 @@ (fine cof ~ pro) :: ++ lave :: validate - |= [cof=cafe for=logo sax=sack som=*] + |= [cof=cafe for=mark sax=sack som=*] =+ lok=`case`[%da now] =+ ^= own ^- ship =+ von=(ska %cy (tope [[p.sax %main lok] /core/ref/[for]/sys])) @@ -569,7 +557,7 @@ ((lake for [own %main lok]) cof [%noun som]) :: ++ lair :: metaload - |= [for=logo bem=beam] + |= [for=mark bem=beam] |= [cof=cafe vax=vase] ^- (bolt vase) ?. (~(nest ut -:!>(*silk)) | p.vax) @@ -601,7 +589,7 @@ (fine cof ?^(u.u.von [%cell %noun %noun] [%atom %$]) u.u.von) :: ++ lily :: translation targets - |= [cof=cafe for=logo bek=beak] + |= [cof=cafe for=mark bek=beak] ^- (bolt (list ,@tas)) %+ cope %+ cope (lend cof [p.bek %main r.bek] `path`~[%tan for %sys]) @@ -611,7 +599,7 @@ (fine cof ?.(=(%hoon for) all [%hoot all])) :: ++ lima :: load at depth - |= [cof=cafe for=logo bem=beam rem=heel] + |= [cof=cafe for=mark bem=beam rem=heel] ^- (bolt (unit vase)) %+ cope (lend cof bem) |= [cof=cafe arc=arch] @@ -631,7 +619,7 @@ (fine cof ~ vax) :: ++ lime :: load beam - |= [cof=cafe for=logo bem=beam rem=heel] + |= [cof=cafe for=mark bem=beam rem=heel] =+ [mob=bem mer=(flop rem)] |- ^- (bolt vase) %+ cope (lima cof for mob (flop mer)) @@ -642,7 +630,7 @@ ^$(s.mob t.s.mob, mer [i.s.mob mer]) :: ++ link :: translate - |= [cof=cafe too=logo for=logo bek=beak vax=vase] + |= [cof=cafe too=mark for=mark bek=beak vax=vase] ^- (bolt vase) ?: =(too for) (fine cof vax) ?: |(=(%noun for) =(%$ for)) @@ -689,7 +677,7 @@ -- :: ++ lope :: translation pipe - |= [cof=cafe for=logo yaw=(list logo) bek=beak vax=vase] + |= [cof=cafe for=mark yaw=(list mark) bek=beak vax=vase] ^- (bolt vase) ?~ yaw (fine cof vax) %+ cope (link cof i.yaw for bek vax) @@ -806,7 +794,7 @@ %+ cope (lave cof p.kas q.kas r.kas) |= [cof=cafe vux=(unit vase)] ?~ vux - (flaw cof [%leaf "invalid logos: {<[p.kas q.kas]>}"]~) + (flaw cof [%leaf "invalid marks: {<[p.kas q.kas]>}"]~) (fine cof `cage`[p.kas u.vux]) == :: @@ -878,10 +866,11 @@ =+ bem=(hone %gate %pro i.bir) %+ cope (fade cof bem ~) |= [cof=cafe hyd=hood] - %+ cope (apex(lot ~) cof hyd) - |= [cof=cafe sel=_..neck] + %+ cope (apex(boy ~) cof hyd) + |= [cof=cafe sel=_..head] =. ..head %= sel + boy boy zeg zeg rop (~(put by rop) cog [i.bir [%tssg (flop boy.sel)]]) == @@ -991,7 +980,7 @@ :: ++ scry |= [fur=(unit (set monk)) ren=@tas who=ship syd=desk lot=coin tyl=path] - ^- (unit (unit (pair logo ,*))) + ^- (unit (unit (pair mark ,*))) ~ :: ++ stay :: save w/o cache diff --git a/arvo/gall.hoon b/arvo/gall.hoon index 08998531ed..600e529021 100644 --- a/arvo/gall.hoon +++ b/arvo/gall.hoon @@ -78,13 +78,13 @@ r=(map bone duct) :: by bone == :: ++ roon :: foreign response - $% [%d p=logo q=*] :: diff + $% [%d p=mark q=*] :: diff [%e p=(unit ,[p=term q=(list tank)])] :: error - [%f p=logo q=*] :: full refresh + [%f p=mark q=*] :: full refresh [%k ~] :: message response == :: ++ rook :: foreign request - $% [%m p=logo q=*] :: message + $% [%m p=mark q=*] :: message [%s p=path] :: subscribe [%u ~] :: cancel/unsubscribe == :: @@ -106,12 +106,12 @@ == :: ++ silk :: see %ford $& [p=silk q=silk] :: - $% [%boil p=logo q=beam r=path] :: + $% [%boil p=mark q=beam r=path] :: [%call p=silk q=silk] :: [%done p=(set beam) q=cage] :: [%mute p=silk q=(list (pair wing silk))] :: [%ride p=silk q=sill] :: - [%vale p=logo q=sack r=*] :: + [%vale p=mark q=sack r=*] :: == :: ++ sill :: see %ford $% [%dirt p=twig] :: @@ -125,8 +125,8 @@ $% [%dumb ~] :: [%mean p=(unit ,[p=term q=(list tank)])] :: [%nice ~] :: - [%rush p=logo q=*] :: - [%rust p=logo q=*] :: + [%rush p=mark q=*] :: + [%rust p=mark q=*] :: == == :: $: %f :: by %ford $% [%made p=(each bead (list tank))] :: @@ -237,7 +237,7 @@ lot=coin tyl=path == - ^- (unit (unit (pair logo ,*))) + ^- (unit (unit (pair mark ,*))) =+ ^= vew ^- lens :: XX future scry %. :- use :- [who syd ((hard case) p.lot)] @@ -528,7 +528,7 @@ ((hard null) q.vax) =+ ^= yob |= vax=vase ^- cage - [((hard logo) -.q.vax) (slot 3 vax)] + [((hard mark) -.q.vax) (slot 3 vax)] =+ ^= yar |= vax=vase ^- arch ((hard arch) q.vax) @@ -675,7 +675,7 @@ ?. &(?=(^ q.vax) ?=(@ -.q.vax)) [~ (give %crud %peek-lame *(list tank))] :: ~> %slog.[0 (skol p:(slot 3 vax))] - :- `[((hard logo) -.q.vax) (slot 3 vax)] + :- `[((hard mark) -.q.vax) (slot 3 vax)] +>.$ | [~ (give %crud %made p.p.+.sih)] == diff --git a/arvo/hoon.hoon b/arvo/hoon.hoon index a103898fc3..caf3226a7c 100644 --- a/arvo/hoon.hoon +++ b/arvo/hoon.hoon @@ -2737,6 +2737,7 @@ ;~(plug gah ;~(pose gah vul)) vul == +++ gaw (cold ~ (star ;~(pose vul gah))) :: classic white ++ gay ;~(pose gap (easy ~)) :: ++ vul %- cold :- ~ :: comments ;~ plug col col @@ -9469,7 +9470,7 @@ == :: ++ desk ,@tas :: ship desk case spur ++ cage (cask vase) :: global metadata -++ cask |*(a=$+(* *) (pair logo a)) :: global data +++ cask |*(a=$+(* *) (pair mark a)) :: global data ++ cuff :: permissions $: p=kirk :: readers q=(set monk) :: authors @@ -9505,7 +9506,7 @@ ++ y *(unit (unit arch)) :: directory ++ z *(unit (unit cage)) :: current subtree -- :: -++ logo ,@tas :: content type +++ mark ,@tas :: content type ++ mill (each vase milt) :: vase/metavase ++ milt ,[p=* q=*] :: metavase ++ monk (each ship khan) :: general identity @@ -9709,7 +9710,7 @@ ?~ q.pro ~ ?~ +.q.pro [~ ~] =+ dat=(slot 7 pro) - [~ ~ (logo q.dat) (slot 3 dat)] + [~ ~ (mark q.dat) (slot 3 dat)] :: ++ soar :: scrub vane |= sev=vase diff --git a/arvo/zuse.hoon b/arvo/zuse.hoon index 1baf946265..9300a3cf03 100644 --- a/arvo/zuse.hoon +++ b/arvo/zuse.hoon @@ -2381,7 +2381,7 @@ pul(q.q [(rsh 3 1 (scot %p who)) q.q.pul]) [%va p=@tas q=(unit vase)] :: set/clear variable [%xx p=curd] :: return card [%xy p=path q=curd] :: push card - [%xz p=[p=ship q=term] q=ship r=logo s=zang] + [%xz p=[p=ship q=term] q=ship r=mark s=zang] [%zz p=path q=path r=curd] :: == :: ++ zang :: XX evil hack @@ -2405,7 +2405,7 @@ pul(q.q [(rsh 3 1 (scot %p who)) q.q.pul]) == :: ++ goad :: common note $% [%eg p=riot] :: simple result - [%gr p=logo q=*] :: gall rush/rust + [%gr p=mark q=*] :: gall rush/rust [%hp p=httr] :: http response :: [%ht p=@ud q=scab r=cred s=moth] :: http request [%it p=~] :: interrupt event @@ -2494,7 +2494,7 @@ pul(q.q [(rsh 3 1 (scot %p who)) q.q.pul]) [%wan p=wain] :: text lines [%zap p=@ud q=(list tank)] :: status/error == :: -++ luge ,[p=logo q=*] :: fully typed content +++ luge ,[p=mark q=*] :: fully typed content ++ maki ,[p=@ta q=@ta r=@ta s=path] :: ++ mace (list ,[p=life q=ring]) :: private secrets ++ marv ?(%da %tas %ud) :: release form