diff --git a/arvo/ford.hoon b/arvo/ford.hoon index 8d04646e0..2f13f5dd3 100644 --- a/arvo/ford.hoon +++ b/arvo/ford.hoon @@ -646,7 +646,7 @@ == :: ;~ pose - (ifix [;~(plug fas hep gap) gap] (most ;~(plug com gaw) hoot)) + (ifix [;~(plug fas hep gap) gap] (most ;~(plug com gaw) hoof)) (easy ~) == :: @@ -670,12 +670,6 @@ == == :: - ++ hoot - ;~ pose - (stag %| ;~(pfix tar hoof)) - (stag %& hoof) - == - :: ++ hoop ;~ pose (stag %| ;~(pfix ;~(plug fas fas gap) have)) @@ -1657,19 +1651,16 @@ == :: ++ head :: consume structures - |= [cof=cafe bir=(list hoot)] + |= [cof=cafe bir=(list hoof)] ^- (bolt ,_..head) ?~ bir (fine cof ..head) - =. boy - ?: p.i.bir boy - (welp boy [[[%cnzy p.q.i.bir] [%$ 1]] ~]) - =+ byf=(~(get by rop) p.q.i.bir) + =+ byf=(~(get by rop) p.i.bir) ?^ byf - ?. =(`hoof`q.i.bir `hoof`p.u.byf) - (flaw cof [%leaf "structure mismatch: {<~[p.u.byf q.i.bir]>}"]~) + ?. =(`hoof`i.bir `hoof`p.u.byf) + (flaw cof [%leaf "structure mismatch: {<~[p.u.byf i.bir]>}"]~) $(bir t.bir) - %+ cope (fame cof (hone %sur q.i.bir)) + %+ cope (fame cof (hone %sur i.bir)) |= [cof=cafe bem=beam] %+ cope (fade cof %hoon bem) |= [cof=cafe hyd=hood] @@ -1681,8 +1672,8 @@ zeg zeg how how rop %+ ~(put by (~(uni by rop) rop.sel)) - p.q.i.bir - [q.i.bir [%tssg (flop boy.sel)]] + p.i.bir + [i.bir [%tssg (flop boy.sel)]] == ^^^$(cof cof, bir t.bir) :: diff --git a/arvo/zuse.hoon b/arvo/zuse.hoon index 23575ebff..6fdcc7d23 100644 --- a/arvo/zuse.hoon +++ b/arvo/zuse.hoon @@ -2355,11 +2355,11 @@ == :: ++ kiss-clay :: in request ->$ $% [%boat ~] :: pier rebooted - [%info p=@p q=desk r=nori] :: internal edit + [%info p=@p q=@tas r=nori] :: internal edit [%init p=@p] :: report install - [%into p=desk q=? r=mode] :: external edit - [%merg p=@p q=desk r=@p s=desk t=germ] :: merge desks - [%mont p=@tas q=@p r=desk s=path] :: mount to unix + [%into p=@tas q=? r=mode] :: external edit + [%merg p=@p q=@tas r=@p s=@tas t=germ] :: merge desks + [%mont p=@tas q=@p r=@tas s=path] :: mount to unix [%ogre p=$|(@tas beam)] :: delete mount point [%warp p=sock q=riff] :: file request [%wegh ~] :: report memory @@ -2488,13 +2488,12 @@ :: ++ hood :: assembly plan $: zus=@ud :: zuse kelvin - sur=(list hoot) :: structures + sur=(list hoof) :: structures lib=(list hoof) :: libraries fan=(list horn) :: resources src=(list hoop) :: program == :: ++ hoof (pair term (unit (pair case ship))) :: resource reference -++ hoot (pair bean hoof) :: structure gate/core ++ hoop :: source in hood $% [%& p=twig] :: direct twig [%| p=beam] :: resource location