From edfaa3ee5d2681b75db57680dc0efb437d2b3fef Mon Sep 17 00:00:00 2001 From: Philip C Monk Date: Tue, 13 Jan 2015 20:58:25 -0500 Subject: [PATCH] boots now (sort of) --- arvo/clay.hoon | 7 ++++++- arvo/zuse.hoon | 8 ++++---- 2 files changed, 10 insertions(+), 5 deletions(-) diff --git a/arvo/clay.hoon b/arvo/clay.hoon index 4637590b9..0a52499d8 100644 --- a/arvo/clay.hoon +++ b/arvo/clay.hoon @@ -730,7 +730,11 @@ q.hic ^- kiss ?: ?=(%soft -.q.hic) - ((hard kiss) p.q.hic) + =+ ((soft kiss) p.q.hic) + ?~ - + ~& [%clay-bad-soft -.p.q.hic] + !! + u.- ?: (~(nest ut -:!>(*kiss)) | p.hic) q.hic ~& [%clay-call-flub (,@tas `*`-.q.hic)] ((hard kiss) q.hic) @@ -770,6 +774,7 @@ :- -.zot =. une (pish:une q.q.hic +.zot ran.zat) abet:une(hez.yar ?.(=(%into -.q.hic) hez.yar.une [~ hen])) + ~& %intoing [mos ..^$] :: ?(%ingo %invo) :: not yet used diff --git a/arvo/zuse.hoon b/arvo/zuse.hoon index 7abd6ebc2..ee191ef66 100644 --- a/arvo/zuse.hoon +++ b/arvo/zuse.hoon @@ -1024,7 +1024,7 @@ ^- soba :- [p.ank p.bus] %- flop - myz:(change-tree:(zu ank) %c bus) + myz:(change-tree:(zu ank) bus) :: ++ loth |= pat=(map path ,*) @@ -1892,7 +1892,7 @@ ?~(way +> $(way t.way, +> (descend i.way))) :: ++ overwrite :: write over - |= [pum=umph val=(unit ,[p=cash q=cage])] + |= val=(unit ,[p=cash q=cage]) ^+ +> ?~ q.ank ?~ val +> @@ -1903,9 +1903,9 @@ (push-change %mut q.u.q.ank q.u.val) :: ++ change-tree :: modify tree - |= [pum=umph bus=ankh] + |= bus=ankh ^+ +> - =. +> (overwrite pum q.bus) + =. +> (overwrite q.bus) =+ [yeg=(~(tap by r.ank) ~) gey=(~(tap by r.bus) ~)] =. +>.$ |- ^+ +>.^$