From 043dec26cfa73283a2a2b728e39fdf459a32c123 Mon Sep 17 00:00:00 2001 From: David Kerschner Date: Thu, 5 Sep 2019 14:33:43 -0700 Subject: [PATCH 01/12] hoon: add ast for |$ |$ is being added as a mold builder rune. This change is ultimately part of reclaiming +* for use as aliases on cores. --- bin/brass.pill | 4 ++-- bin/ivory.pill | 4 ++-- bin/solid.pill | 4 ++-- pkg/arvo/sys/hoon.hoon | 2 ++ 4 files changed, 8 insertions(+), 6 deletions(-) diff --git a/bin/brass.pill b/bin/brass.pill index f50e6598d..fb53e99aa 100644 --- a/bin/brass.pill +++ b/bin/brass.pill @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:1825ad5db5c696f36b7333ca906401a505ecc3244ec19f5dcf80cf7857a79065 -size 11221938 +oid sha256:f47eba4eb6b41cd7c731111a3b2e8c3c807c279edfcf34a23cc8dc519de7d0be +size 11381857 diff --git a/bin/ivory.pill b/bin/ivory.pill index 1ff4b80f2..06ff028d6 100644 --- a/bin/ivory.pill +++ b/bin/ivory.pill @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:baf4d3f4c74ad190a3548232cf9caa40c1433cc29070136ceeeea5fa7b99a004 -size 6212767 +oid sha256:47b8b3c18ecafff9978a2bfe8f4eb0bbbb44794819e9302344a0cf86bfaf2292 +size 6358128 diff --git a/bin/solid.pill b/bin/solid.pill index fda0debb6..ce47cb97e 100644 --- a/bin/solid.pill +++ b/bin/solid.pill @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:3595404052bad183ac0be94bf46deec4a14c16c7ed4fd8aa6159eb24ad21a8cb -size 13839902 +oid sha256:dd5f69febbd14bfa1414d3091ffaec2a16cad7e0f37e86e67ff6904e663fb8a7 +size 14007370 diff --git a/pkg/arvo/sys/hoon.hoon b/pkg/arvo/sys/hoon.hoon index 77e62a5de..61cc395ec 100644 --- a/pkg/arvo/sys/hoon.hoon +++ b/pkg/arvo/sys/hoon.hoon @@ -6654,6 +6654,7 @@ {$yell p/(list hoon)} :: render as tank {$xray p/manx:hoot} :: ;foo; templating :: :::::: cores + [%brbs sample=spec body=spec] {$brcb p/spec q/alas r/(map term tome)} :: |_ {$brcl p/hoon q/hoon} :: |: {$brcn p/(unit term) q/(map term tome)} :: |% @@ -8630,6 +8631,7 @@ {$yell *} [%cncl [%limb %cain] [%zpbn [%cltr p.gen]] ~] {$note *} q.gen :: + [%brbs *] [%brtr sample.gen [%ktcl body.gen]] {$brcb *} :+ %tsls [%kttr p.gen] :+ %brcn ~ %- ~(run by r.gen) From 755515463c18c738996bbf00648c4e5685cc9b82 Mon Sep 17 00:00:00 2001 From: David Kerschner Date: Thu, 5 Sep 2019 15:38:37 -0700 Subject: [PATCH 02/12] hoon: add parsing rules for |$ --- bin/brass.pill | 4 ++-- bin/ivory.pill | 4 ++-- bin/solid.pill | 4 ++-- pkg/arvo/sys/hoon.hoon | 15 ++++++++++++++- 4 files changed, 20 insertions(+), 7 deletions(-) diff --git a/bin/brass.pill b/bin/brass.pill index fb53e99aa..810313373 100644 --- a/bin/brass.pill +++ b/bin/brass.pill @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:f47eba4eb6b41cd7c731111a3b2e8c3c807c279edfcf34a23cc8dc519de7d0be -size 11381857 +oid sha256:139456135589739e853c6bb017358aa14f5264b1564d3ea7858e457d5ebecebb +size 11468268 diff --git a/bin/ivory.pill b/bin/ivory.pill index 06ff028d6..ff000165a 100644 --- a/bin/ivory.pill +++ b/bin/ivory.pill @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:47b8b3c18ecafff9978a2bfe8f4eb0bbbb44794819e9302344a0cf86bfaf2292 -size 6358128 +oid sha256:f393c65f57132e31ba4632d9cd6d48053fd7cc1e482d75191ab9d5bfe98caa42 +size 6448632 diff --git a/bin/solid.pill b/bin/solid.pill index ce47cb97e..5d623d4ce 100644 --- a/bin/solid.pill +++ b/bin/solid.pill @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:dd5f69febbd14bfa1414d3091ffaec2a16cad7e0f37e86e67ff6904e663fb8a7 -size 14007370 +oid sha256:e18b11ad08bc4658bdf081669b12eefc0951a658e705ae32464a1d58db1f6282 +size 14099643 diff --git a/pkg/arvo/sys/hoon.hoon b/pkg/arvo/sys/hoon.hoon index 61cc395ec..52b8a3291 100644 --- a/pkg/arvo/sys/hoon.hoon +++ b/pkg/arvo/sys/hoon.hoon @@ -16585,6 +16585,7 @@ ['*' (rune tar %brtr exqc)] ['=' (rune tis %brts exqc)] ['?' (rune wut %brwt expa)] + ['$' (rune bus %brbs exqe)] == == :- '$' @@ -16795,7 +16796,18 @@ == == == - :: + ++ lynx + %+ cook + |= a=(list term) + ^- spec + :- %bscl + =- ?>(?=(^ -) -) + %+ turn a + |= =term + ^- spec + =/ tar [%base %noun] + [%bsts term [%bssg tar [%bshp tar tar]]] + (ifix [lac rac] (most ace sym)) :: list of names ++ whap !: :: chapter %+ cook |= a=(list (pair term hoon)) @@ -16963,6 +16975,7 @@ ++ exqb |.(;~(gunk loan loan)) :: two specs ++ exqc |.(;~(gunk loan loaf)) :: spec then hoon ++ exqd |.(;~(gunk loaf loan)) :: hoon then spec + ++ exqe |.(;~(gunk lynx loan)) :: list of names then spec ++ exqs |.((butt hunk)) :: closed gapped specs ++ exqg |.(;~(gunk sym loan)) :: term and spec ++ exqk |.(;~(gunk loaf ;~(plug loan (easy ~)))) :: hoon with one spec From b226d24a50616e027116122fc452d5c9612d64c1 Mon Sep 17 00:00:00 2001 From: David Kerschner Date: Thu, 5 Sep 2019 16:00:54 -0700 Subject: [PATCH 03/12] hoon: replace +* name usage with ++ name |$ --- bin/brass.pill | 4 +-- bin/ivory.pill | 4 +-- bin/solid.pill | 4 +-- pkg/arvo/sys/hoon.hoon | 53 ++++++++++++++++++++++++------------- pkg/arvo/sys/vane/alef.hoon | 2 +- 5 files changed, 41 insertions(+), 26 deletions(-) diff --git a/bin/brass.pill b/bin/brass.pill index 810313373..9f8344d7d 100644 --- a/bin/brass.pill +++ b/bin/brass.pill @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:139456135589739e853c6bb017358aa14f5264b1564d3ea7858e457d5ebecebb -size 11468268 +oid sha256:7d0dcc26e0ec8b46e5efc1a4cb849f6363acabb5badcce779a9a9b0d9f706aa9 +size 11609631 diff --git a/bin/ivory.pill b/bin/ivory.pill index ff000165a..e81135a68 100644 --- a/bin/ivory.pill +++ b/bin/ivory.pill @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:f393c65f57132e31ba4632d9cd6d48053fd7cc1e482d75191ab9d5bfe98caa42 -size 6448632 +oid sha256:60e8dd550941c240fb7f2998f140552a37fd02c6c9a217b39e87f521fbfa79fb +size 6596816 diff --git a/bin/solid.pill b/bin/solid.pill index 5d623d4ce..f6b91c011 100644 --- a/bin/solid.pill +++ b/bin/solid.pill @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:e18b11ad08bc4658bdf081669b12eefc0951a658e705ae32464a1d58db1f6282 -size 14099643 +oid sha256:418fe36a0b9a080182909efc0451eabe73688ba5fe804aa07a9816e4d4bc1f7b +size 14240735 diff --git a/pkg/arvo/sys/hoon.hoon b/pkg/arvo/sys/hoon.hoon index 52b8a3291..9ad1244f9 100644 --- a/pkg/arvo/sys/hoon.hoon +++ b/pkg/arvo/sys/hoon.hoon @@ -273,7 +273,8 @@ :: 8 bits. @ :: -+* each [this that] +++ each + |$ [this that] :: either {a} or {b}, defaulting to {a}. :: :: mold generator: produces a discriminated fork between two types, @@ -291,7 +292,8 @@ :: sample type of `*`. $-(* *) :: -+* list [item] +++ list + |$ [item] :: null-terminated list :: :: mold generator: produces a mold of a null-terminated list of the @@ -299,14 +301,16 @@ :: $@(~ [i=item t=(list item)]) :: -+* lone [item] +++ lone + |$ [item] :: single item tuple :: :: mold generator: puts the face of `p` on the passed in mold. :: p=item :: -+* lest [item] +++ lest + |$ [item] :: null-terminated non-empty list :: :: mold generator: produces a mold of a null-terminated list of the @@ -322,7 +326,8 @@ :: examples: * @ud ,[p=time q=?(%a %b)] $~(* $-(* *)) :: -+* pair [head tail] +++ pair + |$ [head tail] :: dual tuple :: :: mold generator: produces a tuple of the two types passed in. @@ -332,21 +337,24 @@ :: [p=head q=tail] :: -+* pole [item] +++ pole + |$ [item] :: faceless list :: :: like ++list, but without the faces {i} and {t}. :: $@(~ [item (pole item)]) :: -+* qual [first second third fourth] +++ qual + |$ [first second third fourth] :: quadruple tuple :: :: mold generator: produces a tuple of the four types passed in. :: [p=first q=second r=third s=fourth] :: -+* quip [item state] +++ quip + |$ [item state] :: pair of list of first and second :: :: a common pattern in hoon code is to return a ++list of changes, along with @@ -357,12 +365,14 @@ :: [(list item) state] :: -+* trap [product] +++ trap + |$ [product] :: a core with one arm `$` :: _|?($:product) :: -+* tree [node] +++ tree + |$ [node] :: tree mold generator :: :: a `++tree` can be empty, or contain a node of a type and @@ -370,14 +380,16 @@ :: $@(~ [n=node l=(tree node) r=(tree node)]) :: -+* trel [first second third] +++ trel + |$ [first second third] :: triple tuple :: :: mold generator: produces a tuple of the three types passed in. :: [p=first q=second r=third] :: -+* unit [item] +++ unit + |$ [item] :: maybe :: :: mold generator: either `~` or `[~ u=a]` where `a` is the @@ -1815,18 +1827,21 @@ :::: 2o: containers :: :: :: :: -+* jar [key value] (map key (list value)) :: map of lists -+* jug [key value] (map key (set value)) :: map of sets +++ jar |$ [key value] (map key (list value)) :: map of lists +++ jug |$ [key value] (map key (set value)) :: map of sets :: -+* map [key value] :: table +++ map + |$ [key value] :: table $| (tree (pair key value)) |=(a=(tree (pair)) ~(apt by a)) :: -+* qeu [item] :: queue +++ qeu + |$ [item] :: queue $| (tree item) |=(a=(tree) ~(apt to a)) :: -+* set [item] :: set +++ set + |$ [item] :: set $| (tree item) |=(a=(tree) ~(apt in a)) :: @@ -11911,8 +11926,8 @@ :: +| %helpers :: - +* batt-of [arm] (map term (pair what (map term arm))) - +* chap-of [arm] [doc=what arms=(map term arm)] + ++ batt-of |$ [arm] (map term (pair what (map term arm))) + ++ chap-of |$ [arm] [doc=what arms=(map term arm)] :: :: Traverse over a chapter in a battery. :: diff --git a/pkg/arvo/sys/vane/alef.hoon b/pkg/arvo/sys/vane/alef.hoon index c4b068d36..d9a5f3091 100644 --- a/pkg/arvo/sys/vane/alef.hoon +++ b/pkg/arvo/sys/vane/alef.hoon @@ -6,7 +6,7 @@ +| %generics :: $mk-item: constructor for +ordered-map item type :: -+* mk-item [key val] [key=key val=val] +++ mk-item |$ [key val] [key=key val=val] :: +ordered-map: treap with user-specified horizontal order :: :: Conceptually smaller items go on the left, so the item with the From 936c79d616f596d5e2e117e9a6dbe3cc6eecc052 Mon Sep 17 00:00:00 2001 From: David Kerschner Date: Thu, 5 Sep 2019 17:00:36 -0700 Subject: [PATCH 04/12] hoon: update tall parsing for |$ --- bin/brass.pill | 4 ++-- bin/ivory.pill | 4 ++-- bin/solid.pill | 4 ++-- pkg/arvo/sys/hoon.hoon | 11 ++++++++++- 4 files changed, 16 insertions(+), 7 deletions(-) diff --git a/bin/brass.pill b/bin/brass.pill index 9f8344d7d..1c66cea1b 100644 --- a/bin/brass.pill +++ b/bin/brass.pill @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:7d0dcc26e0ec8b46e5efc1a4cb849f6363acabb5badcce779a9a9b0d9f706aa9 -size 11609631 +oid sha256:a562de0845815ff8c428d6309ef7bdad27875658384a407f09ed331fd6974921 +size 11687466 diff --git a/bin/ivory.pill b/bin/ivory.pill index e81135a68..d2b327d0c 100644 --- a/bin/ivory.pill +++ b/bin/ivory.pill @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:60e8dd550941c240fb7f2998f140552a37fd02c6c9a217b39e87f521fbfa79fb -size 6596816 +oid sha256:e0d5ff3da4ca3a7a3b279fc76902b8131eff39f43fdca39e4fae390e5c90f3e9 +size 6678560 diff --git a/bin/solid.pill b/bin/solid.pill index f6b91c011..af29263eb 100644 --- a/bin/solid.pill +++ b/bin/solid.pill @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:418fe36a0b9a080182909efc0451eabe73688ba5fe804aa07a9816e4d4bc1f7b -size 14240735 +oid sha256:f43577c3560d4dec5b5c456f30ab62add5b7193b9ce60d803ca70fd8c72c3157 +size 14322620 diff --git a/pkg/arvo/sys/hoon.hoon b/pkg/arvo/sys/hoon.hoon index 9ad1244f9..4079601a2 100644 --- a/pkg/arvo/sys/hoon.hoon +++ b/pkg/arvo/sys/hoon.hoon @@ -16811,6 +16811,7 @@ == == == + :: parses [a b c] or == a b c == ++ lynx %+ cook |= a=(list term) @@ -16822,7 +16823,15 @@ ^- spec =/ tar [%base %noun] [%bsts term [%bssg tar [%bshp tar tar]]] - (ifix [lac rac] (most ace sym)) :: list of names + =/ wide (ifix [lac rac] (most ace sym)) + =/ tall + %+ ifix + :- ;~(plug duz gap) + ;~(plug gap duz) + (most gap sym) + ?. tol + wide + ;~(pose wide tall) ++ whap !: :: chapter %+ cook |= a=(list (pair term hoon)) From 0935b87dc678bc98c0d30098583892b2c52d558b Mon Sep 17 00:00:00 2001 From: David Kerschner Date: Tue, 10 Sep 2019 15:03:28 -0700 Subject: [PATCH 05/12] hoon: added barhax to replace barbus barhax will implement changes request in pr and is used to stage changes to barbus --- bin/brass.pill | 4 ++-- bin/ivory.pill | 4 ++-- bin/solid.pill | 4 ++-- pkg/arvo/sys/hoon.hoon | 16 ++++++++++++++-- 4 files changed, 20 insertions(+), 8 deletions(-) diff --git a/bin/brass.pill b/bin/brass.pill index 1c66cea1b..da5405ad3 100644 --- a/bin/brass.pill +++ b/bin/brass.pill @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:a562de0845815ff8c428d6309ef7bdad27875658384a407f09ed331fd6974921 -size 11687466 +oid sha256:261b5519801f67fa67e2d25d9c9a6ed7ed0ee2b1a59212e747c25e07a4db7b7c +size 11826986 diff --git a/bin/ivory.pill b/bin/ivory.pill index d2b327d0c..790dc6f6c 100644 --- a/bin/ivory.pill +++ b/bin/ivory.pill @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:e0d5ff3da4ca3a7a3b279fc76902b8131eff39f43fdca39e4fae390e5c90f3e9 -size 6678560 +oid sha256:e8bbbf19d0465d3bb0bf0e8c50ed45425d19d104b0be60f3123bab3e7b3ef72d +size 6825127 diff --git a/bin/solid.pill b/bin/solid.pill index af29263eb..c612ed856 100644 --- a/bin/solid.pill +++ b/bin/solid.pill @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:f43577c3560d4dec5b5c456f30ab62add5b7193b9ce60d803ca70fd8c72c3157 -size 14322620 +oid sha256:242cb0f06cbdbe26e0142089a0ff6896296b6809ea3cd618e557b4bd03ce8e32 +size 14470098 diff --git a/pkg/arvo/sys/hoon.hoon b/pkg/arvo/sys/hoon.hoon index 4079601a2..c8207b119 100644 --- a/pkg/arvo/sys/hoon.hoon +++ b/pkg/arvo/sys/hoon.hoon @@ -6670,6 +6670,7 @@ {$xray p/manx:hoot} :: ;foo; templating :: :::::: cores [%brbs sample=spec body=spec] + {$brhx sample/(lest term) body/spec} {$brcb p/spec q/alas r/(map term tome)} :: |_ {$brcl p/hoon q/hoon} :: |: {$brcn p/(unit term) q/(map term tome)} :: |% @@ -8647,6 +8648,14 @@ {$note *} q.gen :: [%brbs *] [%brtr sample.gen [%ktcl body.gen]] + {$brhx *} =- ?~ - !! + [%brtr [%bscl -] [%ktcl body.gen]] + ^- (list spec) + %+ turn `(list term)`sample.gen + |= =term + ^- spec + =/ tar [%base %noun] + [%bsts term [%bssg tar [%bshp tar tar]]] {$brcb *} :+ %tsls [%kttr p.gen] :+ %brcn ~ %- ~(run by r.gen) @@ -16600,7 +16609,8 @@ ['*' (rune tar %brtr exqc)] ['=' (rune tis %brts exqc)] ['?' (rune wut %brwt expa)] - ['$' (rune bus %brbs exqe)] + ['$' (rune bus %brbs exqf)] + ['#' (rune hax %brhx exqe)] == == :- '$' @@ -16921,6 +16931,7 @@ ?.(tol fail ;~(sfix zor ;~(plug gap dun))) ++ hank (most muck loaf) :: gapped hoons ++ hunk (most muck loan) :: gapped specs + ++ huns (most muck sym) :: gapped terms ++ lore (sear |=(=hoon ~(flay ap hoon)) loaf) :: skin ++ loaf ?:(tol tall wide) :: tall/wide hoon ++ loan ?:(tol till wyde) :: tall/wide spec @@ -16999,7 +17010,8 @@ ++ exqb |.(;~(gunk loan loan)) :: two specs ++ exqc |.(;~(gunk loan loaf)) :: spec then hoon ++ exqd |.(;~(gunk loaf loan)) :: hoon then spec - ++ exqe |.(;~(gunk lynx loan)) :: list of names then spec + ++ exqf |.(;~(gunk lynx loan)) :: list of names then spec + ++ exqe |.(;~(gunk (butt huns) loan)) :: list of names then spec ++ exqs |.((butt hunk)) :: closed gapped specs ++ exqg |.(;~(gunk sym loan)) :: term and spec ++ exqk |.(;~(gunk loaf ;~(plug loan (easy ~)))) :: hoon with one spec From b752cf660ebff9a1f59d2725c5ff8b016dd1be27 Mon Sep 17 00:00:00 2001 From: David Kerschner Date: Tue, 10 Sep 2019 17:12:12 -0700 Subject: [PATCH 06/12] hoon: add parsing for barhax --- bin/brass.pill | 4 ++-- bin/ivory.pill | 4 ++-- bin/solid.pill | 4 ++-- pkg/arvo/sys/hoon.hoon | 23 ++++++++++++++++++++++- 4 files changed, 28 insertions(+), 7 deletions(-) diff --git a/bin/brass.pill b/bin/brass.pill index da5405ad3..699e21881 100644 --- a/bin/brass.pill +++ b/bin/brass.pill @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:261b5519801f67fa67e2d25d9c9a6ed7ed0ee2b1a59212e747c25e07a4db7b7c -size 11826986 +oid sha256:f50afa10e1b6717588993c72b07e7d0d78fd1e1fb49ce622e21bd388fb9816c0 +size 11905774 diff --git a/bin/ivory.pill b/bin/ivory.pill index 790dc6f6c..9f46af497 100644 --- a/bin/ivory.pill +++ b/bin/ivory.pill @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:e8bbbf19d0465d3bb0bf0e8c50ed45425d19d104b0be60f3123bab3e7b3ef72d -size 6825127 +oid sha256:1929016ed07eb30180a89e0acbb6ca84c2dc1ed75125fd85ae9b6edf961d0383 +size 6911186 diff --git a/bin/solid.pill b/bin/solid.pill index c612ed856..23b7a32ff 100644 --- a/bin/solid.pill +++ b/bin/solid.pill @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:242cb0f06cbdbe26e0142089a0ff6896296b6809ea3cd618e557b4bd03ce8e32 -size 14470098 +oid sha256:617a0ed90f752dca5710bfd029dda0a601d4d1adcc17412f4f5f1b00218d7d67 +size 14553418 diff --git a/pkg/arvo/sys/hoon.hoon b/pkg/arvo/sys/hoon.hoon index c8207b119..177687933 100644 --- a/pkg/arvo/sys/hoon.hoon +++ b/pkg/arvo/sys/hoon.hoon @@ -16842,6 +16842,22 @@ ?. tol wide ;~(pose wide tall) + ++ lunx + =/ wid (ifix [lac rac] (most ace sym)) + =/ tal + ;~ sfix + (most gap sym) + ;~(plug gap duz) + == + =/ one + %- cook :_ sym + |= a=term + `(list term)`~[a] + %- cook + :_ ;~(pose (runq wid tal) one) + :: lestify + |= a=(list term) + ?~(a !! a) ++ whap !: :: chapter %+ cook |= a=(list (pair term hoon)) @@ -16922,6 +16938,11 @@ |@ ++ $ ;~(pfix dif (stag hil (stag tuq (toad har)))) -- + ++ runq :: wide or tall if tol + |* [wid/rule tal/rule] :: else wide + ?. tol + wid + ;~(pose wid tal) :: ++ glop ~+((glue mash)) :: separated by space ++ gunk ~+((glue muck)) :: separated list @@ -17011,7 +17032,7 @@ ++ exqc |.(;~(gunk loan loaf)) :: spec then hoon ++ exqd |.(;~(gunk loaf loan)) :: hoon then spec ++ exqf |.(;~(gunk lynx loan)) :: list of names then spec - ++ exqe |.(;~(gunk (butt huns) loan)) :: list of names then spec + ++ exqe |.(;~(gunk lunx loan)) :: list of names then spec ++ exqs |.((butt hunk)) :: closed gapped specs ++ exqg |.(;~(gunk sym loan)) :: term and spec ++ exqk |.(;~(gunk loaf ;~(plug loan (easy ~)))) :: hoon with one spec From 504e4fcac127ce4342e62ad6e996d3a1cade4150 Mon Sep 17 00:00:00 2001 From: David Kerschner Date: Tue, 10 Sep 2019 17:29:30 -0700 Subject: [PATCH 07/12] hoon: replaced barbus usage with barhax --- bin/brass.pill | 4 ++-- bin/ivory.pill | 4 ++-- bin/solid.pill | 4 ++-- pkg/arvo/sys/hoon.hoon | 38 ++++++++++++++++++------------------- pkg/arvo/sys/vane/alef.hoon | 2 +- 5 files changed, 26 insertions(+), 26 deletions(-) diff --git a/bin/brass.pill b/bin/brass.pill index 699e21881..9b3491aca 100644 --- a/bin/brass.pill +++ b/bin/brass.pill @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:f50afa10e1b6717588993c72b07e7d0d78fd1e1fb49ce622e21bd388fb9816c0 -size 11905774 +oid sha256:ccc2f811aae41aece78fb568aea7ea3fca24330e6d972a66aa4b6885455df9c0 +size 11982925 diff --git a/bin/ivory.pill b/bin/ivory.pill index 9f46af497..5cc1116a4 100644 --- a/bin/ivory.pill +++ b/bin/ivory.pill @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:1929016ed07eb30180a89e0acbb6ca84c2dc1ed75125fd85ae9b6edf961d0383 -size 6911186 +oid sha256:76f9623666c56ef2021cbbb0b42b2dfdcaaf9d62f5987f19b75cfddbfe3a4736 +size 6990940 diff --git a/bin/solid.pill b/bin/solid.pill index 23b7a32ff..0898f6078 100644 --- a/bin/solid.pill +++ b/bin/solid.pill @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:617a0ed90f752dca5710bfd029dda0a601d4d1adcc17412f4f5f1b00218d7d67 -size 14553418 +oid sha256:bf759d502a44d4d66c941484d6be9783045dfeeed596107ee612678d9489c565 +size 14636896 diff --git a/pkg/arvo/sys/hoon.hoon b/pkg/arvo/sys/hoon.hoon index 177687933..249406be7 100644 --- a/pkg/arvo/sys/hoon.hoon +++ b/pkg/arvo/sys/hoon.hoon @@ -274,7 +274,7 @@ @ :: ++ each - |$ [this that] + |# [this that] :: either {a} or {b}, defaulting to {a}. :: :: mold generator: produces a discriminated fork between two types, @@ -293,7 +293,7 @@ $-(* *) :: ++ list - |$ [item] + |# [item] :: null-terminated list :: :: mold generator: produces a mold of a null-terminated list of the @@ -302,7 +302,7 @@ $@(~ [i=item t=(list item)]) :: ++ lone - |$ [item] + |# [item] :: single item tuple :: :: mold generator: puts the face of `p` on the passed in mold. @@ -310,7 +310,7 @@ p=item :: ++ lest - |$ [item] + |# [item] :: null-terminated non-empty list :: :: mold generator: produces a mold of a null-terminated list of the @@ -327,7 +327,7 @@ $~(* $-(* *)) :: ++ pair - |$ [head tail] + |# [head tail] :: dual tuple :: :: mold generator: produces a tuple of the two types passed in. @@ -338,7 +338,7 @@ [p=head q=tail] :: ++ pole - |$ [item] + |# [item] :: faceless list :: :: like ++list, but without the faces {i} and {t}. @@ -346,7 +346,7 @@ $@(~ [item (pole item)]) :: ++ qual - |$ [first second third fourth] + |# [first second third fourth] :: quadruple tuple :: :: mold generator: produces a tuple of the four types passed in. @@ -354,7 +354,7 @@ [p=first q=second r=third s=fourth] :: ++ quip - |$ [item state] + |# [item state] :: pair of list of first and second :: :: a common pattern in hoon code is to return a ++list of changes, along with @@ -366,13 +366,13 @@ [(list item) state] :: ++ trap - |$ [product] + |# [product] :: a core with one arm `$` :: _|?($:product) :: ++ tree - |$ [node] + |# [node] :: tree mold generator :: :: a `++tree` can be empty, or contain a node of a type and @@ -381,7 +381,7 @@ $@(~ [n=node l=(tree node) r=(tree node)]) :: ++ trel - |$ [first second third] + |# [first second third] :: triple tuple :: :: mold generator: produces a tuple of the three types passed in. @@ -389,7 +389,7 @@ [p=first q=second r=third] :: ++ unit - |$ [item] + |# [item] :: maybe :: :: mold generator: either `~` or `[~ u=a]` where `a` is the @@ -1827,21 +1827,21 @@ :::: 2o: containers :: :: :: :: -++ jar |$ [key value] (map key (list value)) :: map of lists -++ jug |$ [key value] (map key (set value)) :: map of sets +++ jar |# [key value] (map key (list value)) :: map of lists +++ jug |# [key value] (map key (set value)) :: map of sets :: ++ map - |$ [key value] :: table + |# [key value] :: table $| (tree (pair key value)) |=(a=(tree (pair)) ~(apt by a)) :: ++ qeu - |$ [item] :: queue + |# [item] :: queue $| (tree item) |=(a=(tree) ~(apt to a)) :: ++ set - |$ [item] :: set + |# [item] :: set $| (tree item) |=(a=(tree) ~(apt in a)) :: @@ -11935,8 +11935,8 @@ :: +| %helpers :: - ++ batt-of |$ [arm] (map term (pair what (map term arm))) - ++ chap-of |$ [arm] [doc=what arms=(map term arm)] + ++ batt-of |# [arm] (map term (pair what (map term arm))) + ++ chap-of |# [arm] [doc=what arms=(map term arm)] :: :: Traverse over a chapter in a battery. :: diff --git a/pkg/arvo/sys/vane/alef.hoon b/pkg/arvo/sys/vane/alef.hoon index d9a5f3091..3cd6870d7 100644 --- a/pkg/arvo/sys/vane/alef.hoon +++ b/pkg/arvo/sys/vane/alef.hoon @@ -6,7 +6,7 @@ +| %generics :: $mk-item: constructor for +ordered-map item type :: -++ mk-item |$ [key val] [key=key val=val] +++ mk-item |# [key val] [key=key val=val] :: +ordered-map: treap with user-specified horizontal order :: :: Conceptually smaller items go on the left, so the item with the From 5762140ebb9a1757f2d758d92efc8a0f00c391df Mon Sep 17 00:00:00 2001 From: David Kerschner Date: Tue, 10 Sep 2019 17:45:19 -0700 Subject: [PATCH 08/12] hoon: changed barbus to match barhax --- bin/brass.pill | 4 ++-- bin/ivory.pill | 4 ++-- bin/solid.pill | 4 ++-- pkg/arvo/sys/hoon.hoon | 15 +++++++++++---- 4 files changed, 17 insertions(+), 10 deletions(-) diff --git a/bin/brass.pill b/bin/brass.pill index 9b3491aca..72c77e197 100644 --- a/bin/brass.pill +++ b/bin/brass.pill @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:ccc2f811aae41aece78fb568aea7ea3fca24330e6d972a66aa4b6885455df9c0 -size 11982925 +oid sha256:537126b7bb7cd6e242df5e9899751a7ec8fcb882b43329d62865dd638e5fc7f4 +size 12123221 diff --git a/bin/ivory.pill b/bin/ivory.pill index 5cc1116a4..9e5b3aadb 100644 --- a/bin/ivory.pill +++ b/bin/ivory.pill @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:76f9623666c56ef2021cbbb0b42b2dfdcaaf9d62f5987f19b75cfddbfe3a4736 -size 6990940 +oid sha256:ad7c63b683fed4c183cabe0bb9d02feebc85d0cfcbddc99d9e7855b900f8a8dc +size 7137529 diff --git a/bin/solid.pill b/bin/solid.pill index 0898f6078..6715c48cd 100644 --- a/bin/solid.pill +++ b/bin/solid.pill @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:bf759d502a44d4d66c941484d6be9783045dfeeed596107ee612678d9489c565 -size 14636896 +oid sha256:ef4789c9af9dec68979b39562e034947d78214e5f385572151a05cd257fb8205 +size 14782712 diff --git a/pkg/arvo/sys/hoon.hoon b/pkg/arvo/sys/hoon.hoon index 249406be7..a3d3b1334 100644 --- a/pkg/arvo/sys/hoon.hoon +++ b/pkg/arvo/sys/hoon.hoon @@ -6669,8 +6669,8 @@ {$yell p/(list hoon)} :: render as tank {$xray p/manx:hoot} :: ;foo; templating :: :::::: cores - [%brbs sample=spec body=spec] - {$brhx sample/(lest term) body/spec} + {$brbs sample/(lest term) body/spec} :: |$ + {$brhx sample/(lest term) body/spec} :: |# {$brcb p/spec q/alas r/(map term tome)} :: |_ {$brcl p/hoon q/hoon} :: |: {$brcn p/(unit term) q/(map term tome)} :: |% @@ -8647,7 +8647,14 @@ {$yell *} [%cncl [%limb %cain] [%zpbn [%cltr p.gen]] ~] {$note *} q.gen :: - [%brbs *] [%brtr sample.gen [%ktcl body.gen]] + {$brbs *} =- ?~ - !! + [%brtr [%bscl -] [%ktcl body.gen]] + ^- (list spec) + %+ turn `(list term)`sample.gen + |= =term + ^- spec + =/ tar [%base %noun] + [%bsts term [%bssg tar [%bshp tar tar]]] {$brhx *} =- ?~ - !! [%brtr [%bscl -] [%ktcl body.gen]] ^- (list spec) @@ -16609,7 +16616,7 @@ ['*' (rune tar %brtr exqc)] ['=' (rune tis %brts exqc)] ['?' (rune wut %brwt expa)] - ['$' (rune bus %brbs exqf)] + ['$' (rune bus %brbs exqe)] ['#' (rune hax %brhx exqe)] == == From 60c6d4fed13f7e8862fb12bbbfd461ad0aded668 Mon Sep 17 00:00:00 2001 From: David Kerschner Date: Tue, 10 Sep 2019 17:54:35 -0700 Subject: [PATCH 09/12] hoon: replace barhax with barbus --- bin/brass.pill | 4 ++-- bin/ivory.pill | 4 ++-- bin/solid.pill | 4 ++-- pkg/arvo/sys/hoon.hoon | 38 ++++++++++++++++++------------------- pkg/arvo/sys/vane/alef.hoon | 2 +- 5 files changed, 26 insertions(+), 26 deletions(-) diff --git a/bin/brass.pill b/bin/brass.pill index 72c77e197..dbe8813b7 100644 --- a/bin/brass.pill +++ b/bin/brass.pill @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:537126b7bb7cd6e242df5e9899751a7ec8fcb882b43329d62865dd638e5fc7f4 -size 12123221 +oid sha256:f708ba3cc81f6c75b48c4c117dfc1ee7707ce375b9082dc5fc46929e4cebe3c8 +size 12200342 diff --git a/bin/ivory.pill b/bin/ivory.pill index 9e5b3aadb..8ef91d94e 100644 --- a/bin/ivory.pill +++ b/bin/ivory.pill @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:ad7c63b683fed4c183cabe0bb9d02feebc85d0cfcbddc99d9e7855b900f8a8dc -size 7137529 +oid sha256:73f5e28d71e37d0e5fdb92d748f11a615aa725244de5b12934737eac947217ce +size 7217572 diff --git a/bin/solid.pill b/bin/solid.pill index 6715c48cd..f1d8589ff 100644 --- a/bin/solid.pill +++ b/bin/solid.pill @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:ef4789c9af9dec68979b39562e034947d78214e5f385572151a05cd257fb8205 -size 14782712 +oid sha256:2b9b953a1f128a2528291c63ebd18503a8bc38e886e2b46aaec4786e9e419449 +size 14865271 diff --git a/pkg/arvo/sys/hoon.hoon b/pkg/arvo/sys/hoon.hoon index a3d3b1334..a18e949ea 100644 --- a/pkg/arvo/sys/hoon.hoon +++ b/pkg/arvo/sys/hoon.hoon @@ -274,7 +274,7 @@ @ :: ++ each - |# [this that] + |$ [this that] :: either {a} or {b}, defaulting to {a}. :: :: mold generator: produces a discriminated fork between two types, @@ -293,7 +293,7 @@ $-(* *) :: ++ list - |# [item] + |$ [item] :: null-terminated list :: :: mold generator: produces a mold of a null-terminated list of the @@ -302,7 +302,7 @@ $@(~ [i=item t=(list item)]) :: ++ lone - |# [item] + |$ [item] :: single item tuple :: :: mold generator: puts the face of `p` on the passed in mold. @@ -310,7 +310,7 @@ p=item :: ++ lest - |# [item] + |$ [item] :: null-terminated non-empty list :: :: mold generator: produces a mold of a null-terminated list of the @@ -327,7 +327,7 @@ $~(* $-(* *)) :: ++ pair - |# [head tail] + |$ [head tail] :: dual tuple :: :: mold generator: produces a tuple of the two types passed in. @@ -338,7 +338,7 @@ [p=head q=tail] :: ++ pole - |# [item] + |$ [item] :: faceless list :: :: like ++list, but without the faces {i} and {t}. @@ -346,7 +346,7 @@ $@(~ [item (pole item)]) :: ++ qual - |# [first second third fourth] + |$ [first second third fourth] :: quadruple tuple :: :: mold generator: produces a tuple of the four types passed in. @@ -354,7 +354,7 @@ [p=first q=second r=third s=fourth] :: ++ quip - |# [item state] + |$ [item state] :: pair of list of first and second :: :: a common pattern in hoon code is to return a ++list of changes, along with @@ -366,13 +366,13 @@ [(list item) state] :: ++ trap - |# [product] + |$ [product] :: a core with one arm `$` :: _|?($:product) :: ++ tree - |# [node] + |$ [node] :: tree mold generator :: :: a `++tree` can be empty, or contain a node of a type and @@ -381,7 +381,7 @@ $@(~ [n=node l=(tree node) r=(tree node)]) :: ++ trel - |# [first second third] + |$ [first second third] :: triple tuple :: :: mold generator: produces a tuple of the three types passed in. @@ -389,7 +389,7 @@ [p=first q=second r=third] :: ++ unit - |# [item] + |$ [item] :: maybe :: :: mold generator: either `~` or `[~ u=a]` where `a` is the @@ -1827,21 +1827,21 @@ :::: 2o: containers :: :: :: :: -++ jar |# [key value] (map key (list value)) :: map of lists -++ jug |# [key value] (map key (set value)) :: map of sets +++ jar |$ [key value] (map key (list value)) :: map of lists +++ jug |$ [key value] (map key (set value)) :: map of sets :: ++ map - |# [key value] :: table + |$ [key value] :: table $| (tree (pair key value)) |=(a=(tree (pair)) ~(apt by a)) :: ++ qeu - |# [item] :: queue + |$ [item] :: queue $| (tree item) |=(a=(tree) ~(apt to a)) :: ++ set - |# [item] :: set + |$ [item] :: set $| (tree item) |=(a=(tree) ~(apt in a)) :: @@ -11942,8 +11942,8 @@ :: +| %helpers :: - ++ batt-of |# [arm] (map term (pair what (map term arm))) - ++ chap-of |# [arm] [doc=what arms=(map term arm)] + ++ batt-of |$ [arm] (map term (pair what (map term arm))) + ++ chap-of |$ [arm] [doc=what arms=(map term arm)] :: :: Traverse over a chapter in a battery. :: diff --git a/pkg/arvo/sys/vane/alef.hoon b/pkg/arvo/sys/vane/alef.hoon index 3cd6870d7..d9a5f3091 100644 --- a/pkg/arvo/sys/vane/alef.hoon +++ b/pkg/arvo/sys/vane/alef.hoon @@ -6,7 +6,7 @@ +| %generics :: $mk-item: constructor for +ordered-map item type :: -++ mk-item |# [key val] [key=key val=val] +++ mk-item |$ [key val] [key=key val=val] :: +ordered-map: treap with user-specified horizontal order :: :: Conceptually smaller items go on the left, so the item with the From 09575c491578d1dccb4ee828897245210ca0e34e Mon Sep 17 00:00:00 2001 From: David Kerschner Date: Tue, 10 Sep 2019 18:19:00 -0700 Subject: [PATCH 10/12] hoon: removed barhax. No hax! --- bin/brass.pill | 4 ++-- bin/ivory.pill | 4 ++-- bin/solid.pill | 4 ++-- pkg/arvo/sys/hoon.hoon | 37 +++---------------------------------- 4 files changed, 9 insertions(+), 40 deletions(-) diff --git a/bin/brass.pill b/bin/brass.pill index dbe8813b7..95442f29f 100644 --- a/bin/brass.pill +++ b/bin/brass.pill @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:f708ba3cc81f6c75b48c4c117dfc1ee7707ce375b9082dc5fc46929e4cebe3c8 -size 12200342 +oid sha256:41a69ace7db7a33dde5487f6a710cf8cfed6f23475a2e37d35abca6a098c8a8b +size 12331517 diff --git a/bin/ivory.pill b/bin/ivory.pill index 8ef91d94e..e7bdff818 100644 --- a/bin/ivory.pill +++ b/bin/ivory.pill @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:73f5e28d71e37d0e5fdb92d748f11a615aa725244de5b12934737eac947217ce -size 7217572 +oid sha256:b6bf34f0b2816d8fdaa299c730f871412d9899045df5efb033bf05e8e476f0a9 +size 7356746 diff --git a/bin/solid.pill b/bin/solid.pill index f1d8589ff..604fe5618 100644 --- a/bin/solid.pill +++ b/bin/solid.pill @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:2b9b953a1f128a2528291c63ebd18503a8bc38e886e2b46aaec4786e9e419449 -size 14865271 +oid sha256:692ecd0969e5af0b2da1556c91c09d2091678fe807ee00fdb042180501e3847d +size 15003324 diff --git a/pkg/arvo/sys/hoon.hoon b/pkg/arvo/sys/hoon.hoon index a18e949ea..a13e02e7f 100644 --- a/pkg/arvo/sys/hoon.hoon +++ b/pkg/arvo/sys/hoon.hoon @@ -6670,7 +6670,6 @@ {$xray p/manx:hoot} :: ;foo; templating :: :::::: cores {$brbs sample/(lest term) body/spec} :: |$ - {$brhx sample/(lest term) body/spec} :: |# {$brcb p/spec q/alas r/(map term tome)} :: |_ {$brcl p/hoon q/hoon} :: |: {$brcn p/(unit term) q/(map term tome)} :: |% @@ -8655,14 +8654,6 @@ ^- spec =/ tar [%base %noun] [%bsts term [%bssg tar [%bshp tar tar]]] - {$brhx *} =- ?~ - !! - [%brtr [%bscl -] [%ktcl body.gen]] - ^- (list spec) - %+ turn `(list term)`sample.gen - |= =term - ^- spec - =/ tar [%base %noun] - [%bsts term [%bssg tar [%bshp tar tar]]] {$brcb *} :+ %tsls [%kttr p.gen] :+ %brcn ~ %- ~(run by r.gen) @@ -16617,7 +16608,6 @@ ['=' (rune tis %brts exqc)] ['?' (rune wut %brwt expa)] ['$' (rune bus %brbs exqe)] - ['#' (rune hax %brhx exqe)] == == :- '$' @@ -16828,28 +16818,8 @@ == == == - :: parses [a b c] or == a b c == - ++ lynx - %+ cook - |= a=(list term) - ^- spec - :- %bscl - =- ?>(?=(^ -) -) - %+ turn a - |= =term - ^- spec - =/ tar [%base %noun] - [%bsts term [%bssg tar [%bshp tar tar]]] - =/ wide (ifix [lac rac] (most ace sym)) - =/ tall - %+ ifix - :- ;~(plug duz gap) - ;~(plug gap duz) - (most gap sym) - ?. tol - wide - ;~(pose wide tall) - ++ lunx + :: parses a or [a b c] or a b c == + ++ lynx =/ wid (ifix [lac rac] (most ace sym)) =/ tal ;~ sfix @@ -17038,8 +17008,7 @@ ++ exqb |.(;~(gunk loan loan)) :: two specs ++ exqc |.(;~(gunk loan loaf)) :: spec then hoon ++ exqd |.(;~(gunk loaf loan)) :: hoon then spec - ++ exqf |.(;~(gunk lynx loan)) :: list of names then spec - ++ exqe |.(;~(gunk lunx loan)) :: list of names then spec + ++ exqe |.(;~(gunk lynx loan)) :: list of names then spec ++ exqs |.((butt hunk)) :: closed gapped specs ++ exqg |.(;~(gunk sym loan)) :: term and spec ++ exqk |.(;~(gunk loaf ;~(plug loan (easy ~)))) :: hoon with one spec From b32fb231660ad98b4e5fa539097811de536822fa Mon Sep 17 00:00:00 2001 From: David Kerschner Date: Tue, 10 Sep 2019 19:35:04 -0700 Subject: [PATCH 11/12] hoon: remove extraneous cast --- bin/brass.pill | 4 ++-- bin/ivory.pill | 4 ++-- bin/solid.pill | 4 ++-- pkg/arvo/sys/hoon.hoon | 1 - 4 files changed, 6 insertions(+), 7 deletions(-) diff --git a/bin/brass.pill b/bin/brass.pill index 95442f29f..25768fcd1 100644 --- a/bin/brass.pill +++ b/bin/brass.pill @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:41a69ace7db7a33dde5487f6a710cf8cfed6f23475a2e37d35abca6a098c8a8b -size 12331517 +oid sha256:ba6be45e2f170ec950258a2d69ead31612eda30979e615ee23059c3091952a09 +size 12457714 diff --git a/bin/ivory.pill b/bin/ivory.pill index e7bdff818..e5613d3cc 100644 --- a/bin/ivory.pill +++ b/bin/ivory.pill @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:b6bf34f0b2816d8fdaa299c730f871412d9899045df5efb033bf05e8e476f0a9 -size 7356746 +oid sha256:bb79993f830957b66d2a57d0c2e777ff2a8bf6d76e88e66923dbd568185ca95e +size 7490038 diff --git a/bin/solid.pill b/bin/solid.pill index 604fe5618..855848a55 100644 --- a/bin/solid.pill +++ b/bin/solid.pill @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:692ecd0969e5af0b2da1556c91c09d2091678fe807ee00fdb042180501e3847d -size 15003324 +oid sha256:011b23352f71743ec7977607de2ab096548a5202bddc9810dd000ffa843ca837 +size 15137876 diff --git a/pkg/arvo/sys/hoon.hoon b/pkg/arvo/sys/hoon.hoon index a13e02e7f..065d6d869 100644 --- a/pkg/arvo/sys/hoon.hoon +++ b/pkg/arvo/sys/hoon.hoon @@ -8648,7 +8648,6 @@ :: {$brbs *} =- ?~ - !! [%brtr [%bscl -] [%ktcl body.gen]] - ^- (list spec) %+ turn `(list term)`sample.gen |= =term ^- spec From 46b681e96ae28227b4fbfc874f5437d64168191d Mon Sep 17 00:00:00 2001 From: David Kerschner Date: Tue, 10 Sep 2019 19:35:43 -0700 Subject: [PATCH 12/12] hoon: removed unused parser type --- bin/brass.pill | 4 ++-- bin/ivory.pill | 4 ++-- bin/solid.pill | 4 ++-- pkg/arvo/sys/hoon.hoon | 1 - 4 files changed, 6 insertions(+), 7 deletions(-) diff --git a/bin/brass.pill b/bin/brass.pill index 25768fcd1..6a9860804 100644 --- a/bin/brass.pill +++ b/bin/brass.pill @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:ba6be45e2f170ec950258a2d69ead31612eda30979e615ee23059c3091952a09 -size 12457714 +oid sha256:ef221ad5101ee8d25835d995623761f2418618f0b0a16f58c59c44075d37d427 +size 12529395 diff --git a/bin/ivory.pill b/bin/ivory.pill index e5613d3cc..97f0fac0d 100644 --- a/bin/ivory.pill +++ b/bin/ivory.pill @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:bb79993f830957b66d2a57d0c2e777ff2a8bf6d76e88e66923dbd568185ca95e -size 7490038 +oid sha256:78b5d5e1dc89c7f35b51ace54a71ecdefc46d8b082f5f2c3bf51e7a018051e03 +size 7565337 diff --git a/bin/solid.pill b/bin/solid.pill index 855848a55..c9b1bc6e3 100644 --- a/bin/solid.pill +++ b/bin/solid.pill @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:011b23352f71743ec7977607de2ab096548a5202bddc9810dd000ffa843ca837 -size 15137876 +oid sha256:148a8bad595a44360663deb7f7c071ac482986d500975e7c34fd5a4dad350f54 +size 15213602 diff --git a/pkg/arvo/sys/hoon.hoon b/pkg/arvo/sys/hoon.hoon index 065d6d869..8e58a5b99 100644 --- a/pkg/arvo/sys/hoon.hoon +++ b/pkg/arvo/sys/hoon.hoon @@ -16928,7 +16928,6 @@ ?.(tol fail ;~(sfix zor ;~(plug gap dun))) ++ hank (most muck loaf) :: gapped hoons ++ hunk (most muck loan) :: gapped specs - ++ huns (most muck sym) :: gapped terms ++ lore (sear |=(=hoon ~(flay ap hoon)) loaf) :: skin ++ loaf ?:(tol tall wide) :: tall/wide hoon ++ loan ?:(tol till wyde) :: tall/wide spec