From 586552698182b71ce464e8dc8886c1c332e500ea Mon Sep 17 00:00:00 2001 From: "C. Guy Yarvin" Date: Mon, 8 Jun 2015 15:16:04 -0700 Subject: [PATCH 01/13] Debug printfs. --- base/ape/talk.hoon | 5 +++-- base/lib/drum.hoon | 1 + 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/base/ape/talk.hoon b/base/ape/talk.hoon index 416b24ea02..3b60423962 100644 --- a/base/ape/talk.hoon +++ b/base/ape/talk.hoon @@ -1,6 +1,6 @@ :: :: :: :::: /hoon/talk/app :: :: - :: :: :: + :: :: :: /? 314 /- *talk, *sole /+ talk, sole @@ -286,6 +286,7 @@ :: ++ sh-rend :: print on one line |= gam=telegram + ~& [%sh-rend gam] (sh-pass:(sh-fact %txt ~(tr-line tr man.she gam)) q.q.gam) :: ++ sh-numb :: print msg number @@ -1389,7 +1390,7 @@ (pa-sauce ost [%quit ~]~) =+ ^= ruv ^- (unit river) ?: ?=(~ pax) - `[[%ud ?:((lth count 64) 0 (sub count 64))] [%da (dec (bex 128))]] + Q`[[%ud ?:((lth count 64) 0 (sub count 64))] [%da (dec (bex 128))]] ?: ?=([@ ~] pax) =+ say=(slay i.pax) ?. ?=([~ %$ ?(%ud %da) @] say) ~ diff --git a/base/lib/drum.hoon b/base/lib/drum.hoon index 7af6b1607c..e4173162e5 100644 --- a/base/lib/drum.hoon +++ b/base/lib/drum.hoon @@ -178,6 +178,7 @@ |_ [moz=(list move) biz=(list dill-blit)] ++ diff-sole-effect-phat :: |= [way=wire fec=sole-effect] + ~? ?=(%txt -.fec) [%phat +.fec] =< se-abet =< se-view =+ gyl=(drum-phat way) ?: (se-aint gyl) +>.$ From 4a10194d5c2f871bf8f95406d216dde633af7415 Mon Sep 17 00:00:00 2001 From: "C. Guy Yarvin" Date: Mon, 8 Jun 2015 15:17:47 -0700 Subject: [PATCH 02/13] Typo. --- base/ape/talk.hoon | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/base/ape/talk.hoon b/base/ape/talk.hoon index 3b60423962..1d5fc57529 100644 --- a/base/ape/talk.hoon +++ b/base/ape/talk.hoon @@ -1390,7 +1390,7 @@ (pa-sauce ost [%quit ~]~) =+ ^= ruv ^- (unit river) ?: ?=(~ pax) - Q`[[%ud ?:((lth count 64) 0 (sub count 64))] [%da (dec (bex 128))]] + `[[%ud ?:((lth count 64) 0 (sub count 64))] [%da (dec (bex 128))]] ?: ?=([@ ~] pax) =+ say=(slay i.pax) ?. ?=([~ %$ ?(%ud %da) @] say) ~ From 481a8cc2d08bf82ec7128e867507361ec619f3e6 Mon Sep 17 00:00:00 2001 From: "C. Guy Yarvin" Date: Mon, 8 Jun 2015 15:41:38 -0700 Subject: [PATCH 03/13] Moar printf. --- base/ape/talk.hoon | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/base/ape/talk.hoon b/base/ape/talk.hoon index 1d5fc57529..f0e84ff383 100644 --- a/base/ape/talk.hoon +++ b/base/ape/talk.hoon @@ -1400,7 +1400,7 @@ ?. ?=([~ %$ ?(%ud %da) @] say) ~ ?. ?=([~ %$ ?(%ud %da) @] den) ~ `[(point +>.say) (point +>.den)] - :: ~& [%pa-listen her pax ruv] + ~& [%pa-listen her pax ruv] ?~ ruv ~& [%pa-listen-malformed pax] (pa-sauce ost [%quit ~]~) From 50d0d7e5fae02190f829e404168a3424495626d5 Mon Sep 17 00:00:00 2001 From: "C. Guy Yarvin" Date: Mon, 8 Jun 2015 15:52:51 -0700 Subject: [PATCH 04/13] Moar printf. --- base/ape/talk.hoon | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/base/ape/talk.hoon b/base/ape/talk.hoon index f0e84ff383..923d72647e 100644 --- a/base/ape/talk.hoon +++ b/base/ape/talk.hoon @@ -215,6 +215,7 @@ ++ sh-fact :: send console effect |= fec=sole-effect ^+ +> + ~& [%fact ost fec] +>(moves :_(moves [ost %diff %sole-effect fec])) :: ++ sh-peep :: peer to path @@ -286,8 +287,9 @@ :: ++ sh-rend :: print on one line |= gam=telegram - ~& [%sh-rend gam] - (sh-pass:(sh-fact %txt ~(tr-line tr man.she gam)) q.q.gam) + =+ lin=~(tr-line man.she gam) + ~& [%sh-rend ost lin q.q.gam gam] + (sh-pass:(sh-fact %txt lin) q.q.gam) :: ++ sh-numb :: print msg number |= num=@ud @@ -1400,7 +1402,7 @@ ?. ?=([~ %$ ?(%ud %da) @] say) ~ ?. ?=([~ %$ ?(%ud %da) @] den) ~ `[(point +>.say) (point +>.den)] - ~& [%pa-listen her pax ruv] + ~& [%pa-listen count her pax ruv] ?~ ruv ~& [%pa-listen-malformed pax] (pa-sauce ost [%quit ~]~) From 5a179293811a72a7256d6dcff2bf890c02e82363 Mon Sep 17 00:00:00 2001 From: "C. Guy Yarvin" Date: Mon, 8 Jun 2015 15:53:43 -0700 Subject: [PATCH 05/13] Right. --- base/ape/talk.hoon | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/base/ape/talk.hoon b/base/ape/talk.hoon index 923d72647e..af03431f66 100644 --- a/base/ape/talk.hoon +++ b/base/ape/talk.hoon @@ -287,7 +287,7 @@ :: ++ sh-rend :: print on one line |= gam=telegram - =+ lin=~(tr-line man.she gam) + =+ lin=~(tr-line tr man.she gam) ~& [%sh-rend ost lin q.q.gam gam] (sh-pass:(sh-fact %txt lin) q.q.gam) :: From 50beabda7f15e98b5e630c32efaae40ad881083f Mon Sep 17 00:00:00 2001 From: "C. Guy Yarvin" Date: Mon, 8 Jun 2015 16:17:06 -0700 Subject: [PATCH 06/13] Right. --- base/lib/drum.hoon | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/base/lib/drum.hoon b/base/lib/drum.hoon index e4173162e5..0440993d0c 100644 --- a/base/lib/drum.hoon +++ b/base/lib/drum.hoon @@ -178,8 +178,8 @@ |_ [moz=(list move) biz=(list dill-blit)] ++ diff-sole-effect-phat :: |= [way=wire fec=sole-effect] - ~? ?=(%txt -.fec) [%phat +.fec] =< se-abet =< se-view + ~? ?=(%txt -.fec) [%phat +.fec] =+ gyl=(drum-phat way) ?: (se-aint gyl) +>.$ (se-diff gyl fec) From b9b470ae785a4535e34a2d338bdb5f4badc67211 Mon Sep 17 00:00:00 2001 From: "C. Guy Yarvin" Date: Mon, 8 Jun 2015 16:20:50 -0700 Subject: [PATCH 07/13] Moar! --- base/lib/drum.hoon | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/base/lib/drum.hoon b/base/lib/drum.hoon index 0440993d0c..16bfe452a8 100644 --- a/base/lib/drum.hoon +++ b/base/lib/drum.hoon @@ -179,7 +179,7 @@ ++ diff-sole-effect-phat :: |= [way=wire fec=sole-effect] =< se-abet =< se-view - ~? ?=(%txt -.fec) [%phat +.fec] + ~& [%phat +.fec] =+ gyl=(drum-phat way) ?: (se-aint gyl) +>.$ (se-diff gyl fec) From 1d0962677623e206a72070b39228f1a9e652d970 Mon Sep 17 00:00:00 2001 From: "C. Guy Yarvin" Date: Mon, 8 Jun 2015 16:36:14 -0700 Subject: [PATCH 08/13] Less. --- base/arvo/gall.hoon | 4 ++-- base/lib/drum.hoon | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/base/arvo/gall.hoon b/base/arvo/gall.hoon index f67b3286f2..cbf8e226b8 100644 --- a/base/arvo/gall.hoon +++ b/base/arvo/gall.hoon @@ -678,10 +678,10 @@ ++ ap-fill :: add to queue ^- [? _.] =+ suy=(fall (~(get by qel.ged) ost) 0) - ?: =(20 suy) + ?: =(40 suy) ~& [%ap-fill-full [our dap] q.q.pry ost] [%| +] - :: ~? !=(20 suy) [%ap-fill-add [[our dap] q.q.pry ost] +(suy)] + :: ~? !=(40 suy) [%ap-fill-add [[our dap] q.q.pry ost] +(suy)] [%& +(qel.ged (~(put by qel.ged) ost +(suy)))] :: ++ ap-find :: general arm diff --git a/base/lib/drum.hoon b/base/lib/drum.hoon index 16bfe452a8..74a57d8ba7 100644 --- a/base/lib/drum.hoon +++ b/base/lib/drum.hoon @@ -179,7 +179,6 @@ ++ diff-sole-effect-phat :: |= [way=wire fec=sole-effect] =< se-abet =< se-view - ~& [%phat +.fec] =+ gyl=(drum-phat way) ?: (se-aint gyl) +>.$ (se-diff gyl fec) @@ -689,7 +688,8 @@ %tan (ta-tan p.fec) %sag +>(+> (se-blit fec)) %sav +>(+> (se-blit fec)) - %txt $(fec [%tan [%leaf p.fec]~]) + %txt ~& [%ta-fec (tape p.fec)] + $(fec [%tan [%leaf p.fec]~]) == :: ++ ta-dog :: change cursor From ecc39e0fefbf75a5144239628009b7f5d860700b Mon Sep 17 00:00:00 2001 From: "C. Guy Yarvin" Date: Mon, 8 Jun 2015 16:46:26 -0700 Subject: [PATCH 09/13] Printf. --- base/ape/talk.hoon | 6 +++++- base/lib/drum.hoon | 1 + 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/base/ape/talk.hoon b/base/ape/talk.hoon index af03431f66..60e8764717 100644 --- a/base/ape/talk.hoon +++ b/base/ape/talk.hoon @@ -918,7 +918,11 @@ ?~ q.yop ~ ?~(t.q.yop `i.q.yop `[%mor (flop `(list sole-effect)`q.yop)]) == - ?~(foc moz [[ost %diff %sole-effect u.foc] moz]) + ?~ foc + moz + ~& [%ra-abed-fx-mug `@p`(mug u.foc)] + ~& [%ra-abed-fx u.foc] + [[ost %diff %sole-effect u.foc] moz]) :: ++ ra-abet :: complete core ra-abed:ra-axel diff --git a/base/lib/drum.hoon b/base/lib/drum.hoon index 74a57d8ba7..763dd2becb 100644 --- a/base/lib/drum.hoon +++ b/base/lib/drum.hoon @@ -179,6 +179,7 @@ ++ diff-sole-effect-phat :: |= [way=wire fec=sole-effect] =< se-abet =< se-view + ~& [%diff-effect `@p`(mug fec)] =+ gyl=(drum-phat way) ?: (se-aint gyl) +>.$ (se-diff gyl fec) From edb77b95cb342a9c0e66dd5d0f934d26cd97e582 Mon Sep 17 00:00:00 2001 From: "C. Guy Yarvin" Date: Mon, 8 Jun 2015 16:46:56 -0700 Subject: [PATCH 10/13] But actually compiling. --- base/ape/talk.hoon | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/base/ape/talk.hoon b/base/ape/talk.hoon index 60e8764717..4d71db77d9 100644 --- a/base/ape/talk.hoon +++ b/base/ape/talk.hoon @@ -922,7 +922,7 @@ moz ~& [%ra-abed-fx-mug `@p`(mug u.foc)] ~& [%ra-abed-fx u.foc] - [[ost %diff %sole-effect u.foc] moz]) + [[ost %diff %sole-effect u.foc] moz] :: ++ ra-abet :: complete core ra-abed:ra-axel From e35e682bd402e228995d7a5d9409941d3a1eacb4 Mon Sep 17 00:00:00 2001 From: "C. Guy Yarvin" Date: Mon, 8 Jun 2015 16:48:46 -0700 Subject: [PATCH 11/13] Yes. --- base/ape/talk.hoon | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/base/ape/talk.hoon b/base/ape/talk.hoon index 4d71db77d9..c1c950bfbb 100644 --- a/base/ape/talk.hoon +++ b/base/ape/talk.hoon @@ -1,6 +1,6 @@ :: :: :: :::: /hoon/talk/app :: :: - :: :: :: + :: :: :: /? 314 /- *talk, *sole /+ talk, sole From 5c745dbcc40cdabf3233165263c47ab0119f7741 Mon Sep 17 00:00:00 2001 From: "C. Guy Yarvin" Date: Mon, 8 Jun 2015 17:05:43 -0700 Subject: [PATCH 12/13] Prinrtf. --- base/ape/talk.hoon | 5 +---- base/lib/drum.hoon | 5 ++++- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/base/ape/talk.hoon b/base/ape/talk.hoon index c1c950bfbb..68579274b1 100644 --- a/base/ape/talk.hoon +++ b/base/ape/talk.hoon @@ -215,7 +215,6 @@ ++ sh-fact :: send console effect |= fec=sole-effect ^+ +> - ~& [%fact ost fec] +>(moves :_(moves [ost %diff %sole-effect fec])) :: ++ sh-peep :: peer to path @@ -287,9 +286,7 @@ :: ++ sh-rend :: print on one line |= gam=telegram - =+ lin=~(tr-line tr man.she gam) - ~& [%sh-rend ost lin q.q.gam gam] - (sh-pass:(sh-fact %txt lin) q.q.gam) + (sh-pass:(sh-fact %txt ~(tr-line tr man.she gam)) q.q.gam) :: ++ sh-numb :: print msg number |= num=@ud diff --git a/base/lib/drum.hoon b/base/lib/drum.hoon index 763dd2becb..2af50a65a5 100644 --- a/base/lib/drum.hoon +++ b/base/lib/drum.hoon @@ -179,8 +179,8 @@ ++ diff-sole-effect-phat :: |= [way=wire fec=sole-effect] =< se-abet =< se-view - ~& [%diff-effect `@p`(mug fec)] =+ gyl=(drum-phat way) + ~& [%diff-effect pax gyl (se-aint gyl) `@p`(mug fec)] ?: (se-aint gyl) +>.$ (se-diff gyl fec) :: @@ -212,6 +212,7 @@ ++ reap-phat :: |= [way=wire saw=(unit tang)] =< se-abet =< se-view + ~& [%reap-phat way] =+ gyl=(drum-phat way) ?~ saw (se-join gyl) @@ -375,6 +376,7 @@ ++ se-joke :: prepare connection |= gyl=gill ^+ +> + ~& [%se-joke gyl] =+ lag=se-agon ?~ lag +>.$ ?: =(~ fug) +>.$ @@ -383,6 +385,7 @@ ++ se-join :: confirm connection |= gyl=gill ^+ +> + ~& [%se-join gyl] =. +> (se-text "[linked to {}]") ?> =(~ (~(got by fug) gyl)) (se-alas:se-prom(liv.maz |, fug (~(put by fug) gyl `*target)) gyl) From d290c2288bbca951f5ece8b1802d12bf2bf5b9ef Mon Sep 17 00:00:00 2001 From: "C. Guy Yarvin" Date: Mon, 8 Jun 2015 17:06:42 -0700 Subject: [PATCH 13/13] But compiling. --- base/lib/drum.hoon | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/base/lib/drum.hoon b/base/lib/drum.hoon index 2af50a65a5..0431ee1bb1 100644 --- a/base/lib/drum.hoon +++ b/base/lib/drum.hoon @@ -180,7 +180,7 @@ |= [way=wire fec=sole-effect] =< se-abet =< se-view =+ gyl=(drum-phat way) - ~& [%diff-effect pax gyl (se-aint gyl) `@p`(mug fec)] + ~& [%diff-effect way gyl (se-aint gyl) `@p`(mug fec)] ?: (se-aint gyl) +>.$ (se-diff gyl fec) ::