From 26df7ded6e122d7e046656ee8fc4145c6ee30d5a Mon Sep 17 00:00:00 2001 From: "C. Guy Yarvin" Date: Wed, 9 Dec 2015 08:48:57 -0800 Subject: [PATCH] Really almost there. --- ape/hood.hoon | 18 +++--- arvo/ford.hoon | 3 +- arvo/hoon.hoon | 166 +++++-------------------------------------------- lib/kiln.hoon | 2 +- lib/sole.hoon | 2 +- sur/sole.hoon | 2 +- sur/talk.hoon | 2 +- 7 files changed, 31 insertions(+), 164 deletions(-) diff --git a/ape/hood.hoon b/ape/hood.hoon index 5aa6cd2e3..74a0eb8db 100644 --- a/ape/hood.hoon +++ b/ape/hood.hoon @@ -9,7 +9,7 @@ !: :: :: => |% :: module boilerplate ++ hood-0 :: - {$0 lac+(map @tas hood-part)} :: + {$0 lac+(map @tas hood-part)} :: ++ hood-good :: |* hed=hood-head :: |= paw=hood-part :: @@ -18,9 +18,9 @@ $helm ?>(?=($helm -.paw) `helm-part`paw) :: $kiln ?>(?=($kiln -.paw) `kiln-part`paw) :: == :: - ++ hood-head ,_-:*hood-part :: + ++ hood-head __(-:*hood-part) :: ++ hood-make :: - |* [our=@p hed=hood-head] :: + |* {our+@p hed+hood-head} :: ?- hed :: $drum (drum-port our) :: $helm *helm-part :: @@ -36,7 +36,7 @@ :::: :: :: :: :: :: |_ $^ - $: hid+bowl :: system state + _: hid+bowl :: system state hood-0 :: server state == :: ++ able :: find/make part @@ -75,15 +75,15 @@ => .(+< [identity start finish]=+<) =- [wrap=- *start] :: usage (wrap handle-arm):from-foo |* handle+__(finish) - |= _+<.handle + |= __(+<.handle) =. +>.handle (start hid (able identity)) (ably (handle +<)) :: -++ from-drum (from-lib %drum [..$ ,_se-abet]:(drum)) -++ from-helm (from-lib %helm [..$ ,_abet]:(helm)) -++ from-kiln (from-lib %kiln [..$ ,_abet]:(kiln)) +++ from-drum (from-lib %drum [..$ __(se-abet)]:(drum)) +++ from-helm (from-lib %helm [..$ __(abet)]:(helm)) +++ from-kiln (from-lib %kiln [..$ __(abet)]:(kiln)) :: -++ init-helm |=([way=wire *] [~ +>]) +++ init-helm |=({way+wire *} [~ +>]) ++ made-kiln (wrap take-made):from-kiln ++ mere-kiln (wrap take-mere):from-kiln ++ mere-kiln-sync (wrap take-mere-sync):from-kiln diff --git a/arvo/ford.hoon b/arvo/ford.hoon index 7260f06fd..bfb336fb9 100644 --- a/arvo/ford.hoon +++ b/arvo/ford.hoon @@ -1896,7 +1896,8 @@ :: ++ load :: highly forgiving |= old=axle - ..^$(+>- old) + :: ..^$(+>- old) + ..^$ ::=. old :: ?. ?=([%0 *] old) old :: remove at 1 :: :- %1 diff --git a/arvo/hoon.hoon b/arvo/hoon.hoon index 40d5f6d77..7592b1375 100644 --- a/arvo/hoon.hoon +++ b/arvo/hoon.hoon @@ -9565,16 +9565,11 @@ (stag %dtts ;~(pfix tis (ifix [pel per] ;~(glam wide wide)))) :- '?' ;~ pose - %+ stag %bccm - (stag %fern ;~(pfix wut (ifix [pel per] (most ace toil)))) - :: (stag %cbwt ;~(pfix wut (ifix [pel per] (most ace wide)))) - :: + (stag %cbwt ;~(pfix wut (ifix [pel per] (most ace wide)))) (cold [%cbzz %bean] wut) == :- '[' rupl - :- ',' - (stag %bccm ;~(pfix com hill)) :- '^' ;~ pose (stag %cnzz rope) @@ -9656,72 +9651,13 @@ == == ++ sump (ifix [kel ker] (stag %cltr (most ace wide))) -:: ++ noil -:: |= tol=? -:: =< ;~ pfix buc -:: %- stew -:: ^. stet ^. limo -:: :~ -:: ['^' (rung ket %herb exqd)] -:: == -:: == -:: |% -:: ++ toad -:: |* har=__(exqa) -:: =+ dur=(ifix [pel per] $:har(tol |)) -:: ?:(tol ;~(pose ;~(pfix gap $:har(tol &)) dur) dur) -:: :: -:: ++ rung -:: |* {dif+rule tuq+* har+__(exqa)} -:: ;~(pfix dif (stag tuq (toad har))) -:: :: -:: ++ gunk ~+((glue muck)) -:: ++ muck ?:(tol gap ace) -:: ++ butt |*(zor=rule ?:(tol ;~(sfix zor ;~(plug gap duz)) zor)) -:: ++ loaf ?:(tol howl toil) -:: ++ lobe ?:(tol tall wide) -:: ++ exqa |.(loaf) -:: ++ exqb |.(;~(gunk loaf loaf)) -:: ++ exqc |.((butt (most muck loaf))) -:: ++ exqd |.(lobe) -:: ++ exqe |.(;~(gunk sym loaf)) -:: -- ++ noil |= tol=? =< ;~ pfix buc %- stew ^. stet ^. limo :~ - ['|' (rung bar %reed exqb)] - ['&' (rung pam %bush exqb)] - ['?' (rung wut %fern exqc)] - ['_' (rung cab %weed exqd)] ['^' (rung ket %herb exqd)] - ['=' (rung tis %bark exqe)] - :- '+' - %+ cook - |=({a+tile b+tile} [%weed [%brls a [%bctr b]]]) - ;~(pfix lus (toad exqb)) - :- '%' - ;~ pfix cen - %+ sear - |= a=(list tile) ^- (unit tile) - =- ?~(b ~ ?~(u.b ~ [~ %kelp i.u.b t.u.b])) - ^= b - |- ^- (unit (list line)) - ?~ a [~ ~] - =+ c=$(a t.a) - ?~ c ~ - ?. ?=({{$leaf *} *} i.a) ~ - [~ [p.i.a q.i.a] u.c] - (toad exqc) - == - :- ':' - ;~ pfix col - %+ cook - |=(a+(list tile) ?~(a !! ?~(t.a i.a [i.a $(a t.a)]))) - (toad exqc) - == == == |% @@ -10186,113 +10122,43 @@ ^. stet ^. limo :~ :- '%' - ;~ pfix cen - ;~ pose - (stag %leaf (stag %tas (cold %$ buc))) - (stag %leaf (stag %f (cold & pam))) - (stag %leaf (stag %f (cold | bar))) - (stag %leaf (stag %t qut)) - %+ cook - |= lot=coin ^- tile - ?- -.lot - $~ [%leaf p.lot] - $blob - ?@(p.lot [%leaf %$ p.lot] [$(p.lot -.p.lot) $(p.lot +.p.lot)]) - :: - $many - ?~(p.lot [%leaf %n ~] [$(lot i.p.lot) $(p.lot t.p.lot)]) - == - nuck:so - == - == + fail :- '&' - (stag %leaf (stag %f (cold & pam))) + fail :- '*' - (cold [%axil %noun] tar) + (stag %herb wide) :- '?' - ;~ pose - (stag %fern ;~(pfix wut (ifix [pel per] (most ace toil)))) - (stag %axil (cold %bean wut)) - == + (stag %herb wide) :- '@' - ;~(pfix pat (stag %axil (stag %atom mota))) + (stag %herb wide) :- '^' - ;~ pose - (stag %herb (stag %cnzz rope)) - (cold [%axil %cell] ket) - == + (stag %herb wide) :- '(' (stag %herb wide) :- '{' (stag %herb wide) :- '.' - (stag %herb (stag %cnzz rope)) + (stag %herb wide) :- '[' - %+ ifix [sel ser] - %+ cook - |= a+(list tile) - ?~(a !! ?~(t.a i.a [i.a $(a t.a)])) - (most ace toil) + fail :- '_' - ;~ pose - (stag %weed ;~(pfix cab wide)) - (stag %herb wide) - == + (stag %herb wide) :- ['0' '9'] - (stag %leaf bisk:so) + fail :- ['a' 'z'] ;~ pose + %+ sear + |=(a+tile `(unit tile)`~) (stag %bark ;~(plug sym ;~(pfix tis toil))) (stag %herb wide) == :- '$' - ;~ pose - (noil |) - (stag %herb wide) - == + (stag %herb wide) :- '|' - (stag %leaf (stag %f (cold | bar))) + fail :- '~' - (stag %leaf (stag %n (cold ~ sig))) + fail == -:: ++ toil -:: %+ knee *tile |. ~+ -:: %- stew -:: ^. stet ^. limo -:: :~ -:: :- '%' -:: fail -:: :- '&' -:: fail -:: :- '*' -:: (stag %herb wide) -:: :- '?' -:: (stag %herb wide) -:: :- '@' -:: (stag %herb wide) -:: :- '^' -:: (stag %herb wide) -:: :- '(' -:: (stag %herb wide) -:: :- '{' -:: (stag %herb wide) -:: :- '.' -:: (stag %herb wide) -:: :- '[' -:: fail -:: :- '_' -:: (stag %herb wide) -:: :- ['0' '9'] -:: fail -:: :- ['a' 'z'] -:: (stag %herb wide) -:: :- '$' -:: (stag %herb wide) -:: :- '|' -:: fail -:: :- '~' -:: fail -:: == ++ wart |* zor=rule %+ here diff --git a/lib/kiln.hoon b/lib/kiln.hoon index dda268fe2..cc3520373 100644 --- a/lib/kiln.hoon +++ b/lib/kiln.hoon @@ -1,4 +1,4 @@ -:: :: :: +:: :: :: :::: /hoon/kiln/lib :: :: :: :: :: /? 310 :: version diff --git a/lib/sole.hoon b/lib/sole.hoon index 59d168de7..5cc15c6ca 100644 --- a/lib/sole.hoon +++ b/lib/sole.hoon @@ -1,4 +1,4 @@ -:: +:: :::: /hoon/sole/lib :: /? 310 diff --git a/sur/sole.hoon b/sur/sole.hoon index 5cfa278a6..02f25afd5 100644 --- a/sur/sole.hoon +++ b/sur/sole.hoon @@ -1,4 +1,4 @@ - :: +:: :::: /hoon/sole/sur !: |% diff --git a/sur/talk.hoon b/sur/talk.hoon index 67360b25e..eea0bd277 100644 --- a/sur/talk.hoon +++ b/sur/talk.hoon @@ -1,4 +1,4 @@ -:: +:: :::: /hoon/talk/sur !: |%