diff --git a/bin/brass.pill b/bin/brass.pill index 699e21881d..9b3491aca6 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 9f46af497e..5cc1116a4a 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 23b7a32ffd..0898f60781 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 1776879330..249406be73 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 d9a5f3091c..3cd6870d76 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