From ee91ef68889ff978a15dc3c1fa6b317067ae616a Mon Sep 17 00:00:00 2001 From: "C. Guy Yarvin" Date: Tue, 7 Apr 2015 19:19:31 -0700 Subject: [PATCH 1/2] "Fix" init sync. --- arvo/dill.hoon | 6 +++++- main/app/talk/core.hook | 6 +++--- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/arvo/dill.hoon b/arvo/dill.hoon index ef98b32eb3..de5bebf5f5 100644 --- a/arvo/dill.hoon +++ b/arvo/dill.hoon @@ -378,6 +378,7 @@ :_(..^$ ?~(hey.all ~ [u.hey.all %slip %d p.q.hic]~)) =. hey.all ?^(hey.all hey.all `hen) ?: ?=(%init -.q.hic) + :: ~& [%call-init hen] ?: =(ore.all `p.q.hic) [~ ..^$] =: ore.all `p.q.hic @@ -392,7 +393,8 @@ [[fap %dojo] [fap %talk] ~] [[p.q.hic %dojo] [p.q.hic %talk] ~] =^ moz all abet:(need (ax (need hey.all) [%flow %sole flo])) - [moz ..^$] + ?: |((lth p.q.hic 256) (gte p.q.hic (bex 64))) [moz ..^$] :: XX HORRIBLE + [:_(moz [(need hey.all) %give %init p.q.hic]) ..^$] =+ nus=(ax hen q.hic) ?~ nus ~& [%dill-no-flow q.hic] @@ -423,8 +425,10 @@ ^- [p=(list move) q=_..^$] ?: =(~ ore.all) ?: ?=([%a %init *] q.hin) + :: ~& [%take-init hen] =. hey.all ?^(hey.all hey.all `hen) [[[hen %give +.q.hin] ~] ..^$] + :: [~ ..^$] ~& [%take-back q.hin] [~ ..^$] ?. (~(has by dug.all) hen) diff --git a/main/app/talk/core.hook b/main/app/talk/core.hook index 49401aae37..1627c2c37c 100644 --- a/main/app/talk/core.hook +++ b/main/app/talk/core.hook @@ -324,10 +324,10 @@ |= num=@ud ^+ +> =+ bun=(scow %ud num) - =+ pad=(sub 36 (lent bun)) - =+ now=`@da`(dis lat.hid 0xffff.ffff.ffff.ffff.0000.0000.0000.0000) + :: =+ pad=(sub 36 (lent bun)) + :: =+ now=`@da`(dis lat.hid 0xffff.ffff.ffff.ffff.0000.0000.0000.0000) %+ sh-fact %txt - "----------------| [{bun}] {(runt [pad ' '] (scow %da now))}" + (runt [(sub 15 (lent bun)) '-'] "[{bun}]") :: ++ sh-repo-house-diff |= [one=shelf two=shelf] From 56948115ef2e29a870e578dc1aadbe0932605906 Mon Sep 17 00:00:00 2001 From: Philip C Monk Date: Wed, 8 Apr 2015 14:27:51 -0400 Subject: [PATCH 2/2] added :helm+init --- arvo/dill.hoon | 8 ++++++-- main/app/helm/core.hook | 15 ++++++++++++++- 2 files changed, 20 insertions(+), 3 deletions(-) diff --git a/arvo/dill.hoon b/arvo/dill.hoon index ef98b32eb3..2fccd64976 100644 --- a/arvo/dill.hoon +++ b/arvo/dill.hoon @@ -142,6 +142,7 @@ == :: ++ note-dill :: note to self, odd $% [%crud p=@tas q=(list tank)] :: + [%init p=ship] :: [%text p=tape] :: [%veer p=@ta q=path r=@t] :: install vane [%vega p=path] :: reboot by path @@ -155,7 +156,7 @@ == :: ++ note :: $% [%a note-ames] :: out request $-> - [%c note-clay] + [%c note-clay] :: [%d note-dill] :: [%g note-gall] :: == :: @@ -375,11 +376,14 @@ :_(..^$ [hen %pass ~ (note %a p.q.hic)]~) ?: ?=(%flog -.q.hic) :: ~& [%dill-flog +.q.hic] + ?: ?=([%crud %hax-init [%leaf *] ~] p.q.hic) + =+ him=(slav %p (crip p.i.q.p.q.hic)) + :_(..^$ ?~(hey.all ~ [u.hey.all %give %init him]~)) :_(..^$ ?~(hey.all ~ [u.hey.all %slip %d p.q.hic]~)) =. hey.all ?^(hey.all hey.all `hen) ?: ?=(%init -.q.hic) ?: =(ore.all `p.q.hic) - [~ ..^$] + [[hen %give q.hic]~ ..^$] =: ore.all `p.q.hic dug.all ~ == diff --git a/main/app/helm/core.hook b/main/app/helm/core.hook index 50e55aa921..088a225a47 100644 --- a/main/app/helm/core.hook +++ b/main/app/helm/core.hook @@ -26,7 +26,8 @@ $% [%reload p=(list term)] :: reload vanes == :: ++ dill-flog :: sent to %dill - $% [%veer p=@ta q=path r=@t] :: install vane + $% [%crud p=%hax-init [%leaf p=tape] ~] :: initialize ship + [%veer p=@ta q=path r=@t] :: install vane [%vega p=path] :: reboot by path [%verb ~] :: verbose mode == :: @@ -122,6 +123,13 @@ :_ moz [ost %pass /verb %d %flog %verb ~] == + ++ he-wish-init + |= him=ship + %_ +>.$ + moz + :_ moz + [ost %pass /init %d %flog %crud %hax-init leaf/(scow %p him) ~] + == -- :: ++ hake :: poke core @@ -139,6 +147,11 @@ ~& %poke-helm-verb he-abet:he-wish-verb:(hake ost her) :: +++ poke-helm-init + |= [ost=bone her=ship him=ship] + ~& %poke-helm-init + he-abet:(he-wish-init:(hake ost her) him) +:: ++ poke-helm-reload |= [ost=bone her=ship all=(list term)] ~& %poke-helm-reload