From 897cac2e0cb1310d67f7e5f0802ae8cd9ad9df0a Mon Sep 17 00:00:00 2001 From: Anton Dyudin Date: Fri, 5 Aug 2016 16:00:42 -0700 Subject: [PATCH 1/4] fix #219 permanently fatal "bogus core" The next-version subscription was happening after the core check. --- arvo/gall.hoon | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/arvo/gall.hoon b/arvo/gall.hoon index d775f105c8..b2c0f82179 100644 --- a/arvo/gall.hoon +++ b/arvo/gall.hoon @@ -145,22 +145,17 @@ ++ mo-boom :: complete new boot |= {dap/dude byk/beak dep/@uvH gux/gage} ^+ +> + =. +> (mo-bold byk dap dep) ?- -.gux $tabl ~|(%made-tabl !!) - $| - =. +> (mo-bold byk dap dep) - =. +> (mo-give %onto %| p.gux) - +> + $| (mo-give %onto %| p.gux) $& ?> ?=(@ p.p.gux) ?. (mo-okay q.p.gux) (mo-give %onto %| [%leaf "{}: bogus core"]~) - =. +> (mo-bold byk dap dep) =. +> (mo-born dap byk q.p.gux) - =+ old=+>.$ =+ wag=(ap-prop:(ap-abed:ap dap [%high [~ our]]) ~) ?^ -.wag - =. +>.$ old (mo-give %onto %| u.-.wag) =. +>.$ ap-abet:+.wag (mo-give:(mo-claw dap) %onto %& dap %boot now) From d730eb4e44d8215ed85f86cbfe37caa0e6c8cff7 Mon Sep 17 00:00:00 2001 From: Anton Dyudin Date: Fri, 5 Aug 2016 16:01:32 -0700 Subject: [PATCH 2/4] redundant asserts --- arvo/gall.hoon | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/arvo/gall.hoon b/arvo/gall.hoon index b2c0f82179..fa5631b126 100644 --- a/arvo/gall.hoon +++ b/arvo/gall.hoon @@ -150,7 +150,6 @@ $tabl ~|(%made-tabl !!) $| (mo-give %onto %| p.gux) $& - ?> ?=(@ p.p.gux) ?. (mo-okay q.p.gux) (mo-give %onto %| [%leaf "{}: bogus core"]~) =. +> (mo-born dap byk q.p.gux) @@ -189,8 +188,7 @@ ?- -.gux $tabl ~|(%made-tabl !!) $| (mo-give %onto %| p.gux) - $& ?> ?=(@ p.p.gux) - ap-abet:(ap-peep:(ap-abed:ap dap [%high [~ our]]) q.p.gux) + $& ap-abet:(ap-peep:(ap-abed:ap dap [%high [~ our]]) q.p.gux) == :: ++ mo-bold :: wait for dep From 7c13e96c0534a4c8fdf0d14af892ff5775582778 Mon Sep 17 00:00:00 2001 From: Anton Dyudin Date: Fri, 5 Aug 2016 16:11:24 -0700 Subject: [PATCH 3/4] keep old core on ++prep fail, fixing #231 --- arvo/gall.hoon | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/arvo/gall.hoon b/arvo/gall.hoon index fa5631b126..2fea189acd 100644 --- a/arvo/gall.hoon +++ b/arvo/gall.hoon @@ -1075,17 +1075,17 @@ ++ ap-prop :: install |= vux/(unit vase) ^- {(unit tang) _+>} - ?. (ap-fond %prep) + =+ old=+>.$(hav ?~(vux hav u.vux)) + ?. (ap-fond %prep) ?~ vux `+>.$ - =+ [new=p:(slot 13 hav) old=p:(slot 13 u.vux)] ?. (~(nest ut p:(slot 13 hav)) %| p:(slot 13 u.vux)) - :_(+>.$ `(ap-suck "prep mismatch")) + :_(old `(ap-suck "prep mismatch")) `+>.$(+13.q.hav +13.q.u.vux) =^ tur +>.$ %+ ap-call %prep ?~(vux !>(~) (slop !>(~) (slot 13 u.vux))) - ?~(tur `+>.$ :_(+>.$ `u.tur)) + ?~(tur `+>.$ :_(old `u.tur)) :: ++ ap-pule :: silent delete =+ wim=(~(get by sup.ged) ost) From 82df0221811ca2ec9afd9588df261dfc0e98d16d Mon Sep 17 00:00:00 2001 From: Anton Dyudin Date: Fri, 5 Aug 2016 16:47:07 -0700 Subject: [PATCH 4/4] fix #68 gall slam not being type-checked. --- arvo/gall.hoon | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/arvo/gall.hoon b/arvo/gall.hoon index 2fea189acd..8327778da9 100644 --- a/arvo/gall.hoon +++ b/arvo/gall.hoon @@ -640,7 +640,7 @@ ((slog leaf+"peek find fail" >tyl< >mar< ~) [~ ~]) =^ arm +>.$ (ap-farm q.u.cug) ?: ?=($| -.arm) ((slog leaf+"peek farm fail" p.arm) [~ ~]) - =^ zem +>.$ (ap-slam q.u.cug p.arm !>([ren (slag p.u.cug tyl)])) + =^ zem +>.$ (ap-slam q.u.cug p.arm !>((slag p.u.cug `path`[ren tyl]))) ?: ?=($| -.zem) ((slog leaf+"peek slam fail" p.zem) [~ ~]) ?+ q.p.zem ((slog leaf+"peek bad result" ~) [~ ~]) $~ ~ @@ -1172,10 +1172,11 @@ |= {cog/term gat/vase arg/vase} ^- {(each vase tang) _+>} =+ ^= wyz %- mule |. + ?> (~(nest ut p:(slot 6 gat)) %& p.arg) (~(play wa vel) [%cell p.gat p.arg] [%open [%$ ~] [%$ 2] [%$ 3] ~]) ?: ?=($| -.wyz) %- =+ sam=(~(peek ut p.gat) %free 6) - (slog >%ap-slam-mismatch< ~(duck ut p.arg) ~(duck ut sam) ~) + (slog >%ap-slam-mismatch< ~(duck ut p.arg) ~(duck ut sam) p.wyz) :_(+>.$ [%| (ap-suck "call: {}: type mismatch")]) :_ +>.$(vel +>.wyz) =+ ton=(mong [q.gat q.arg] ap-sled)