From f6f7d2fab40a74f3654de498673e92e298cff98f Mon Sep 17 00:00:00 2001 From: Joe Bryan Date: Fri, 20 Nov 2020 14:07:53 -0800 Subject: [PATCH] hoon: modernizes $tank and surrounding declarations --- pkg/arvo/sys/hoon.hoon | 41 +++++++++++++++++++++++------------------ 1 file changed, 23 insertions(+), 18 deletions(-) diff --git a/pkg/arvo/sys/hoon.hoon b/pkg/arvo/sys/hoon.hoon index 8314338b2..226c3e2e0 100644 --- a/pkg/arvo/sys/hoon.hoon +++ b/pkg/arvo/sys/hoon.hoon @@ -1973,24 +1973,29 @@ :: cord +$ tint ?($r $g $b $c $m $y $k $w $~) :: text color -++ tang (list tank) :: bottom-first error -++ tank $~ [%leaf ~] :: - $% {$leaf p/tape} :: printing formats - $: $palm :: backstep list - p/{p/tape q/tape r/tape s/tape} :: - q/(list tank) :: - == :: - $: $rose :: flat list - p/{p/tape q/tape r/tape} :: mid open close - q/(list tank) :: - == :: - == :: -++ tape (list @tD) :: utf8 string as list -++ tour (list @c) :: utf32 clusters -++ tarp {d/@ud h/@ud m/@ud s/@ud f/(list @ux)} :: parsed time -++ term @tas :: ascii symbol -++ wain (list cord) :: text lines -++ wall (list tape) :: text lines ++$ tang (list tank) :: bottom-first error +:: +:: $tank: formatted print tree +:: +:: %leaf: just a tape +:: %palm: backstep list +:: flat-mid, open, flat-open, flat-close +:: %rose: flat list +:: flat-mid, open, close +:: ++$ tank + $~ leaf/~ + $% [%leaf p=tape] + [%palm p=(qual tape tape tape tape) q=(list tank)] + [%rose p=(trel tape tape tape) q=(list tank)] + == +:: ++$ tape (list @tD) :: utf8 string as list ++$ tour (list @c) :: utf32 clusters ++$ tarp {d/@ud h/@ud m/@ud s/@ud f/(list @ux)} :: parsed time ++$ term @tas :: ascii symbol ++$ wain (list cord) :: text lines ++$ wall (list tape) :: text lines :: :::: 2p: serialization :: :: ::