From d08bf31fc03b8ff9ba91d973cc9ee376c7b8293f Mon Sep 17 00:00:00 2001 From: "C. Guy Yarvin" Date: Mon, 4 Aug 2014 10:18:26 -0700 Subject: [PATCH] A great renaming, and other works. --- arvo/ames.hoon | 2 +- arvo/ford.hoon | 31 +++++++++++++--------- main/app/appbug-2/{core.hoon => core.hook} | 0 main/app/chat/{core.hoon => core.hook} | 0 main/app/foobug/{core.hoon => core.hook} | 0 main/app/philbug/{core.hoon => core.hook} | 0 main/app/radio/{core.hoon => core.hook} | 0 main/app/readed/{core.hoon => core.hook} | 0 main/app/written/{core.hoon => core.hook} | 0 main/mac/down/{door.hoon => door.hook} | 0 main/mac/html/{door.hoon => door.hook} | 0 main/mac/hymn/{door.hoon => door.hook} | 0 main/mac/json/{door.hoon => door.hook} | 0 main/mac/md/{door.hoon => door.hook} | 0 main/mac/mime/door.hook | 13 +++++++++ main/mac/user/{door.hoon => door.hook} | 0 main/mac/users/{door.hoon => door.hook} | 0 main/mac/zing/{door.hoon => door.hook} | 0 main/mac/zong/{door.hoon => door.hook} | 0 main/mac/zongs/{door.hoon => door.hook} | 0 main/mac/zung/{door.hoon => door.hook} | 0 main/sur/down/gate.hook | 6 +++++ main/sur/foobar/{gate.hoon => gate.hook} | 0 main/sur/markdown/{core.hoon => core.hook} | 0 main/sur/mess/{gate.hoon => gate.hook} | 0 main/sur/user/{gate.hoon => gate.hook} | 0 main/sur/users/{gate.hoon => gate.hook} | 0 main/sur/wand/gate.hook | 6 +++++ main/sur/zing/{gate.hoon => gate.hook} | 0 main/sur/zong/{gate.hoon => gate.hook} | 0 main/sur/zung/{gate.hoon => gate.hook} | 0 31 files changed, 44 insertions(+), 14 deletions(-) rename main/app/appbug-2/{core.hoon => core.hook} (100%) rename main/app/chat/{core.hoon => core.hook} (100%) rename main/app/foobug/{core.hoon => core.hook} (100%) rename main/app/philbug/{core.hoon => core.hook} (100%) rename main/app/radio/{core.hoon => core.hook} (100%) rename main/app/readed/{core.hoon => core.hook} (100%) rename main/app/written/{core.hoon => core.hook} (100%) rename main/mac/down/{door.hoon => door.hook} (100%) rename main/mac/html/{door.hoon => door.hook} (100%) rename main/mac/hymn/{door.hoon => door.hook} (100%) rename main/mac/json/{door.hoon => door.hook} (100%) rename main/mac/md/{door.hoon => door.hook} (100%) create mode 100644 main/mac/mime/door.hook rename main/mac/user/{door.hoon => door.hook} (100%) rename main/mac/users/{door.hoon => door.hook} (100%) rename main/mac/zing/{door.hoon => door.hook} (100%) rename main/mac/zong/{door.hoon => door.hook} (100%) rename main/mac/zongs/{door.hoon => door.hook} (100%) rename main/mac/zung/{door.hoon => door.hook} (100%) create mode 100644 main/sur/down/gate.hook rename main/sur/foobar/{gate.hoon => gate.hook} (100%) rename main/sur/markdown/{core.hoon => core.hook} (100%) rename main/sur/mess/{gate.hoon => gate.hook} (100%) rename main/sur/user/{gate.hoon => gate.hook} (100%) rename main/sur/users/{gate.hoon => gate.hook} (100%) create mode 100644 main/sur/wand/gate.hook rename main/sur/zing/{gate.hoon => gate.hook} (100%) rename main/sur/zong/{gate.hoon => gate.hook} (100%) rename main/sur/zung/{gate.hoon => gate.hook} (100%) diff --git a/arvo/ames.hoon b/arvo/ames.hoon index 7d0a2a99a..2a642ed95 100644 --- a/arvo/ames.hoon +++ b/arvo/ames.hoon @@ -459,7 +459,7 @@ =+ tay=(ksin q.kec) %+ mix %+ can 0 - :~ [0 7] + :~ [3 70 [20 (mug bod)] [2 yax] [2 qax] diff --git a/arvo/ford.hoon b/arvo/ford.hoon index 70d15572a..3cfc89fab 100644 --- a/arvo/ford.hoon +++ b/arvo/ford.hoon @@ -390,10 +390,10 @@ %_(+> mow :_(mow [hen %give gef])) :: ++ fade :: compile to hood - |= [cof=cafe bem=beam] + |= [cof=cafe for=mark bem=beam] ^- (bolt hood) %+ cool |.(leaf/"ford: fade {<[(tope bem)]>}") - %+ cope (make cof [%bake %hoon bem ~]) + %+ cope (make cof [%bake for bem ~]) |= [cof=cafe cay=cage] %+ (clef %hood) (fine cof bem(r [%ud 0]) cay) ^- (burg (pair beam cage) hood) @@ -416,11 +416,13 @@ =+ oak=[our %main %da now] ?. =(~ (ska %cy (tope [oak pax]))) oak bek - (cope (fade cof bem) abut:(meow bem ~)) + (cope (fade cof %hook bem) abut:(meow bem ~)) :: ++ fair :: hood parsing rule |= bem=beam - =+ vez=(vang | (tope bem(r [%ud 0]))) + =+ :* vez=(vang | (tope bem(r [%ud 0]))) + voz=(vang | (tope bem)) + == =< hood |% ++ case @@ -430,8 +432,8 @@ ?. ?=([%$ ?(%da %ud %tas) *] a) ~ [~ u=(^case a)] :: - ++ hath (cook plex:vez (stag %clsg poor:vez)) :: hood path - ++ have (sear tome hath) :: hood beam + ++ hath (cook plex:voz (stag %clsg poor:voz)) :: hood path + ++ have (sear tome ;~(pfix fas hath)) :: hood beam ++ hood %+ ifix [gay gay] ;~ plug @@ -473,7 +475,7 @@ :: ++ hoop ;~ pose - (stag %| ;~(pfix fas have)) + (stag %| ;~(pfix ;~(plug fas fas gap) have)) (stag %& tall:vez) == :: @@ -613,8 +615,8 @@ |= [cof=cafe arc=arch] ?^ q.arc (cope (cope (liar cof bem) (lake for bek)) fest) - ?: (~(has by r.arc) %hoon) - %+ cope (fade cof bem) + ?: (~(has by r.arc) %hook) + %+ cope (fade cof %hook bem) |= [cof=cafe hyd=hood] (cope (cope (abut:(meow bem arg) cof hyd) (lake for bek)) fest) (fine cof ~) @@ -624,7 +626,7 @@ |= [cof=cafe sam=vase] ^- (bolt vase) %+ cool |.(leaf/"ford: check {<[for bek `@p`(mug q.sam)]>}") - ?: ?=(?(%gate %core %door %hoon %hook %hood) for) + ?: ?=(?(%gate %core %door %hoon %hook) for) :: ~& [%lake-easy for bek] (fine cof sam) %+ cope (fang cof for bek) @@ -1065,7 +1067,7 @@ (flaw cof [%leaf "structure mismatch: {<~[p.u.byf q.i.bir]>}"]~) $(bir t.bir) =+ bem=(hone ?:(p.i.bir %gate %core) %sur q.i.bir) - %+ cope (fade cof bem) + %+ cope (fade cof %hook bem) |= [cof=cafe hyd=hood] %+ cope (apex(boy ~) cof hyd) |= [cof=cafe sel=_..head] @@ -1101,7 +1103,7 @@ (flaw cof [%leaf "library mismatch: {<~[p.u.byf i.bir]>}"]~) $(bir t.bir) =+ bem=(hone %core %lib i.bir) - %+ cope (fade cof bem) + %+ cope (fade cof %hook bem) |= [cof=cafe hyd=hood] %+ cope (apex(zeg goz, boy ~) cof hyd) |= [cof=cafe sel=_..neck] @@ -1116,13 +1118,15 @@ ++ wilt :: process body entry |= [cof=cafe hop=hoop] ^- (bolt _..wilt) + ~& [%wilt hop] ?- -.hop %& (fine cof ..wilt(boy [p.hop boy])) %| + %+ cool |.(leaf/"ford: wilt {<[(tope p.hop)]>}") %+ cope (lend cof p.hop) |= [cof=cafe arc=arch] ?: (~(has by r.arc) %hoon) - %+ cope (fade cof p.hop) + %+ cope (fade cof %hoon p.hop) |= [cof=cafe hyd=hood] %+ cope (apex(boy ~) cof hyd) |= [cof=cafe sel=_..wilt] @@ -1136,6 +1140,7 @@ %+ cope ^$(all r.all, cof cof, sel sel) |= [cof=cafe rig=(map term foot) sel=_..wilt] %+ cope + ~& [%wilt-cope (tope p.hop(s [p.n.all s.p.hop]))] %= ^^^^$ cof cof ..wilt sel(boy ~) diff --git a/main/app/appbug-2/core.hoon b/main/app/appbug-2/core.hook similarity index 100% rename from main/app/appbug-2/core.hoon rename to main/app/appbug-2/core.hook diff --git a/main/app/chat/core.hoon b/main/app/chat/core.hook similarity index 100% rename from main/app/chat/core.hoon rename to main/app/chat/core.hook diff --git a/main/app/foobug/core.hoon b/main/app/foobug/core.hook similarity index 100% rename from main/app/foobug/core.hoon rename to main/app/foobug/core.hook diff --git a/main/app/philbug/core.hoon b/main/app/philbug/core.hook similarity index 100% rename from main/app/philbug/core.hoon rename to main/app/philbug/core.hook diff --git a/main/app/radio/core.hoon b/main/app/radio/core.hook similarity index 100% rename from main/app/radio/core.hoon rename to main/app/radio/core.hook diff --git a/main/app/readed/core.hoon b/main/app/readed/core.hook similarity index 100% rename from main/app/readed/core.hoon rename to main/app/readed/core.hook diff --git a/main/app/written/core.hoon b/main/app/written/core.hook similarity index 100% rename from main/app/written/core.hoon rename to main/app/written/core.hook diff --git a/main/mac/down/door.hoon b/main/mac/down/door.hook similarity index 100% rename from main/mac/down/door.hoon rename to main/mac/down/door.hook diff --git a/main/mac/html/door.hoon b/main/mac/html/door.hook similarity index 100% rename from main/mac/html/door.hoon rename to main/mac/html/door.hook diff --git a/main/mac/hymn/door.hoon b/main/mac/hymn/door.hook similarity index 100% rename from main/mac/hymn/door.hoon rename to main/mac/hymn/door.hook diff --git a/main/mac/json/door.hoon b/main/mac/json/door.hook similarity index 100% rename from main/mac/json/door.hoon rename to main/mac/json/door.hook diff --git a/main/mac/md/door.hoon b/main/mac/md/door.hook similarity index 100% rename from main/mac/md/door.hoon rename to main/mac/md/door.hook diff --git a/main/mac/mime/door.hook b/main/mac/mime/door.hook new file mode 100644 index 000000000..f6792a38f --- /dev/null +++ b/main/mac/mime/door.hook @@ -0,0 +1,13 @@ +:: +:::: /hoon/core/mime/pro + :: +/? 314 +|_ own=[p=mite q=octs] +++ grab + |% + ++ noun :: convert from %noun + |= src=* + ^+ +>+ + +>+(own (,[mite octs] src)) + -- +-- diff --git a/main/mac/user/door.hoon b/main/mac/user/door.hook similarity index 100% rename from main/mac/user/door.hoon rename to main/mac/user/door.hook diff --git a/main/mac/users/door.hoon b/main/mac/users/door.hook similarity index 100% rename from main/mac/users/door.hoon rename to main/mac/users/door.hook diff --git a/main/mac/zing/door.hoon b/main/mac/zing/door.hook similarity index 100% rename from main/mac/zing/door.hoon rename to main/mac/zing/door.hook diff --git a/main/mac/zong/door.hoon b/main/mac/zong/door.hook similarity index 100% rename from main/mac/zong/door.hoon rename to main/mac/zong/door.hook diff --git a/main/mac/zongs/door.hoon b/main/mac/zongs/door.hook similarity index 100% rename from main/mac/zongs/door.hoon rename to main/mac/zongs/door.hook diff --git a/main/mac/zung/door.hoon b/main/mac/zung/door.hook similarity index 100% rename from main/mac/zung/door.hoon rename to main/mac/zung/door.hook diff --git a/main/sur/down/gate.hook b/main/sur/down/gate.hook new file mode 100644 index 000000000..5581fa713 --- /dev/null +++ b/main/sur/down/gate.hook @@ -0,0 +1,6 @@ +:: +:::: /hoon/gate/down/sur + :: +/? 314 +/- *markdown +down diff --git a/main/sur/foobar/gate.hoon b/main/sur/foobar/gate.hook similarity index 100% rename from main/sur/foobar/gate.hoon rename to main/sur/foobar/gate.hook diff --git a/main/sur/markdown/core.hoon b/main/sur/markdown/core.hook similarity index 100% rename from main/sur/markdown/core.hoon rename to main/sur/markdown/core.hook diff --git a/main/sur/mess/gate.hoon b/main/sur/mess/gate.hook similarity index 100% rename from main/sur/mess/gate.hoon rename to main/sur/mess/gate.hook diff --git a/main/sur/user/gate.hoon b/main/sur/user/gate.hook similarity index 100% rename from main/sur/user/gate.hoon rename to main/sur/user/gate.hook diff --git a/main/sur/users/gate.hoon b/main/sur/users/gate.hook similarity index 100% rename from main/sur/users/gate.hoon rename to main/sur/users/gate.hook diff --git a/main/sur/wand/gate.hook b/main/sur/wand/gate.hook new file mode 100644 index 000000000..5581fa713 --- /dev/null +++ b/main/sur/wand/gate.hook @@ -0,0 +1,6 @@ +:: +:::: /hoon/gate/down/sur + :: +/? 314 +/- *markdown +down diff --git a/main/sur/zing/gate.hoon b/main/sur/zing/gate.hook similarity index 100% rename from main/sur/zing/gate.hoon rename to main/sur/zing/gate.hook diff --git a/main/sur/zong/gate.hoon b/main/sur/zong/gate.hook similarity index 100% rename from main/sur/zong/gate.hoon rename to main/sur/zong/gate.hook diff --git a/main/sur/zung/gate.hoon b/main/sur/zung/gate.hook similarity index 100% rename from main/sur/zung/gate.hoon rename to main/sur/zung/gate.hook