diff --git a/arvo/eyre.hoon b/arvo/eyre.hoon index 2656fc1c9b..2df9cae526 100644 --- a/arvo/eyre.hoon +++ b/arvo/eyre.hoon @@ -750,7 +750,7 @@ =+ cuf=`cuft`+>.sih ?- -.cuf ?($coup $reap) - ~? ?=($lens r.q.tee) hen=hen^hcuf=-.cuf + :: ~? ?=($lens r.q.tee) hen=hen^hcuf=-.cuf (get-ack:(ire-ix p.tee) q.tee ?~(p.cuf ~ `[-.cuf u.p.cuf])) :: $doff !! @@ -1469,11 +1469,11 @@ him her aut (~(put in aut) her) ..ya - ~& logon+[our her ses] + :: ~& logon+[our her ses] ?. =(our her) ..ya =+ sap=(~(get by sop) ses) - ~& sap + :: ~& sap+sap ?. ?=({$~ @ $|} sap) ..ya (ames-gram -.u.sap aut+~ ses) diff --git a/arvo/ford.hoon b/arvo/ford.hoon index 73ae05453a..e2874ef078 100644 --- a/arvo/ford.hoon +++ b/arvo/ford.hoon @@ -14,12 +14,18 @@ $% $: $c :: to %clay $% {$warp p/sock q/riff} :: == == :: - $: $g :: to %clay + $: $f :: to %ford + $% {$exec p/@p q/(unit bilk)} :: + == == :: + $: $g :: to %gall $% {$deal p/sock q/cush} :: == == == :: ++ sign :: in result $<- $% $: $c :: by %clay $% {$writ p/riot} :: + == == :: + $: $f :: by %ford + $% {$made p/@uvH q/gage} :: == == :: $: $g :: by %gall $% {$unto p/cuft} :: @@ -205,6 +211,7 @@ +>.$ ?- -.+.sih $writ (~(resp zo [num u.tus]) [van ren bem] p.+.sih) + $made (~(resm zo [num u.tus]) [van ren bem] [p q]:+.sih) $unto ?+ -.p.+.sih ~|(ford-strange-unto+-.p.+.sih !!) $diff (~(resd zo [num u.tus]) [van ren bem] p.p.+.sih) @@ -1773,14 +1780,28 @@ =+ (cat 3 van ren) exec(keg (~(put by keg) [- bem] r.u.rot)) :: - ++ resd + ++ resd :: take %diff |= {{van/vane ren/care bem/beam} cag/cage} ^+ ..zo ?> ?=($g van) + =. mow + :_ mow + :^ hen %pass (camp-wire van ren bem) + [%f %exec our ~ bek %cast ((hard mark) -.s.bem) %$ cag] + ..zo + :: + ++ resm :: take %made + |= {{van/vane ren/care bem/beam} dep/@uvH gag/gage} :: XX depends? + ^+ ..zo + ?> ?=($g van) =. kig (~(del in kig) +<-.$) =. mow :_(mow [hen (cancel van ren bem)]) + ?: ?=($| -.gag) + amok:(expo [%made dep %| leaf+"ford-scry-made-fail" p.gag]) + ?: ?=($tabl -.gag) + amok:(expo [%made dep %| leaf+"ford-scry-made-strange" ~]) =+ (cat 3 van ren) - exec(keg (~(put by keg) [- bem] cag)) + exec(keg (~(put by keg) [- bem] p.gag)) :: ++ syve ^- sley diff --git a/arvo/gall.hoon b/arvo/gall.hoon index 1117765c2d..e7f23da45b 100644 --- a/arvo/gall.hoon +++ b/arvo/gall.hoon @@ -1,5 +1,4 @@ !: :: %gall, agent execution - !? 163 :::: |= pit/vase @@ -490,9 +489,9 @@ byk:(~(got by bum) dap) :: ++ mo-peek - |= {dap/dude pry/prey ren/@tas tyl/path} + |= {dap/dude pry/prey ren/@tas tyl/path mar/mark} ^- (unit (unit cage)) - (ap-peek:(ap-abed:ap dap pry) ren tyl) + (ap-peek:(ap-abed:ap dap pry) ren tyl mar) :: ++ mo-clip :: apply club |= {dap/dude pry/prey cub/club} @@ -636,11 +635,11 @@ (ap-sake p.zem) :: ++ ap-peek - |= {ren/@tas tyl/path} + |= {ren/@tas tyl/path mar/mark} ^- (unit (unit cage)) =+ cug=(ap-find %peek ren tyl) ?~ cug - ((slog leaf+"peek find fail" >tyl< ~) [~ ~]) + ((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)])) @@ -652,6 +651,8 @@ =+ caz=(spec (slot 7 p.zem)) ?. &(?=({p/@ *} q.caz) ((sane %tas) p.q.caz)) ((slog leaf+"scry: malformed cage" ~) [~ ~]) + ?. =(mar p.q.caz) + [~ ~] ``[p.q.caz (slot 3 caz)] == :: @@ -1306,7 +1307,12 @@ ~ ?. (~(has by bum:(~(got by pol.all) who)) syd) [~ ~] - (mo-peek:(mo-abed:mo who *duct) syd high+`who ren tyl) + ?. ?=(^ tyl) + ~ + =+ =+ `path`(flop tyl) + ?> ?=(^ -) + [mar=i pax=(flop t)] + (mo-peek:(mo-abed:mo who *duct) syd high+`who ren pax mar) :: ++ stay :: save w+o cache `axle`all