diff --git a/lib/hall-json.hoon b/lib/hall-json.hoon index ee23866df..5181cac71 100644 --- a/lib/hall-json.hoon +++ b/lib/hall-json.hoon @@ -37,8 +37,8 @@ |= a/coin ^- (unit place) ?+ a ~ - {$$ $da @da} `p.a - {$$ $ud @ud} `p.a + [%$ %da @da] `p.a + [%$ %ud @ud] `p.a == nuck:so == @@ -71,6 +71,9 @@ ++ dank ::: tank |= a/tank ?: ?=($leaf -.a) (frond %leaf (tape p.a)) + :: TODO: No idea what a plum is, but it was recently added + :: + ?: ?=($plum -.a) (frond %plum [%o ~]) %+ frond -.a %- pairs ?- -.a diff --git a/ren/collections/elem.hoon b/ren/collections/elem.hoon index f9ec98f53..8f00c465c 100644 --- a/ren/collections/elem.hoon +++ b/ren/collections/elem.hoon @@ -4,7 +4,7 @@ /? 309 /+ collections, cram /= gas /$ fuel:html -/= itm /% /collections-web-item/ +/= itm /collections-web-item/ :: :: /= collection-post diff --git a/ren/collections/web-item.hoon b/ren/collections/web-item.hoon index 77056f063..f85736247 100644 --- a/ren/collections/web-item.hoon +++ b/ren/collections/web-item.hoon @@ -1,7 +1,7 @@ /+ collections /= gas /$ fuel:html /= raw - /^ $?(raw-item:collections ~) + /^ $@(~ raw-item:collections) /| /; |= [a=(map knot cord) b=@t ~] ^- raw-item:collections [%umd a b] @@ -13,11 +13,12 @@ == :: /= col - /^ $? [config:collections (map knot item:collections) ~] - [%no-config (map knot item:collections) ~] - ~ + /^ $@ ~ + $% [%config config=config:collections items=(map knot item:collections) ~] + [%no-config items=(map knot item:collections) ~] == - /| /. /collections-config/ + /| /. /~ %config + /collections-config/ /_ /collections-item/ == :: @@ -27,6 +28,7 @@ :: /~ ~ == + :: :: ^- item:collections @@ -38,11 +40,11 @@ ?: ?=(%no-config -.col) ?: =(s.bem.gas /collections/web) ?~ raw - [%collection *config:collections +<.col] - [%both [*config:collections +<.col] raw] + [%collection *config:collections items.col] + [%both [*config:collections items.col] raw] ?~ raw !! [%raw raw] ?~ raw - [%collection -.col +<.col] -[%both [-.col +<.col] raw] + [%collection config.col items.col] +[%both [config.col items.col] raw] diff --git a/sys/hoon.hoon b/sys/hoon.hoon index d596e76c3..c275034ed 100644 --- a/sys/hoon.hoon +++ b/sys/hoon.hoon @@ -5137,7 +5137,7 @@ ++ ban (just '>') ++ bar (just '|') ++ bas (just '\\') :: XX deprecated -++ bat (just '\\') +++ bat (just '\\') ++ buc (just '$') :: XX deprecated ++ bus (just '$') ++ cab (just '_') @@ -5145,6 +5145,7 @@ ++ col (just ':') ++ com (just ',') ++ dot (just '.') +++ fas (just '/') :: XX deprecated? ++ gal (just '<') :: XX deprecated ++ gar (just '>') :: XX deprecated ++ vat (just '@') :: pronounced "at" @@ -5153,7 +5154,7 @@ ++ ket (just '^') ++ leb (just '{') ++ led (just '<') -++ lob (just '{') +++ lob (just '{') ++ lit (just '(') ++ lac (just '[') ++ lus (just '+') @@ -5163,7 +5164,7 @@ ++ rac (just ']') ++ reb (just '}') ++ rob (just '}') -++ rit (just ')') +++ rit (just ')') ++ say (just '\'') ++ sig (just '~') ++ tar (just '*')