From 248894e271308d46e497005924e2c26abcad2062 Mon Sep 17 00:00:00 2001 From: "C. Guy Yarvin" Date: Thu, 22 May 2014 14:48:47 -0700 Subject: [PATCH] More writ elimination. --- arvo/ames.hoon | 44 +++++++++--------------- arvo/batz.hoon | 31 ++++++++--------- arvo/clay.hoon | 41 ++++++----------------- arvo/dill.hoon | 29 ++++++++-------- arvo/eyre.hoon | 90 ++++++++++++++++++++------------------------------ arvo/ford.hoon | 8 ++--- arvo/hoon.hoon | 5 +-- arvo/zuse.hoon | 2 +- 8 files changed, 96 insertions(+), 154 deletions(-) diff --git a/arvo/ames.hoon b/arvo/ames.hoon index dc64fc7d07..bd8e18bbf2 100644 --- a/arvo/ames.hoon +++ b/arvo/ames.hoon @@ -1503,28 +1503,20 @@ ?- -.bon %beer :_ fox(zac (~(put by zac.fox) p.bon `corn`[hen ~ ~ ~])) - :* [[~ %gold p.bon] [/c hen] [%init p.bon]] - [[~ %gold p.bon] hen [%init p.bon]] - [[~ %gold p.bon] [/a hen] [%kick now]] - [[~ %gold p.bon] [/e hen] [%init p.bon]] + :* [[/c hen] [%init p.bon]] + [hen [%init p.bon]] + [[/a hen] [%kick now]] + [[/e hen] [%init p.bon]] ~ - :: =+ bos=(sein p.bon) - :: =. bos ?.(=(bos p.bon) bos ~zod) - :: ?: =(~zod p.bon) ~ - :: :~ [[~ %iron p.bon] [/c hen] [%pull bos %main ~[%main]]] - :: [[~ %iron p.bon] [/c hen] [%pull bos %spec ~[%spec]]] - :: [[~ %iron p.bon] [/c hen] [%pull bos %try ~[%try]]] - :: [[~ %iron p.bon] [/c hen] [%pull bos %arvo ~[%arvo]]] - :: == == :: %coke :: ~& [%tz p.bon q.bon r.bon] :_ fox - :~ [[~ %iron p.p.bon] s.bon [%went q.p.bon r.bon]] + :~ [s.bon [%went q.p.bon r.bon]] == :: - %mead :_(fox [[wru hen [%hear p.bon q.bon]] ~]) + %mead :_(fox [[hen [%hear p.bon q.bon]] ~]) %milk :: ~& [%rx p.bon q.bon] ?> ?=([@ *] q.q.bon) @@ -1532,8 +1524,7 @@ ?> ?=([@ @ *] t.q.q.bon) :_ fox =+ [cak=i.t.q.q.bon ven=i.t.t.q.q.bon] - :~ :- [~ %iron p.p.bon] - =+ neh=(claw p.p.bon) + :~ =+ neh=(claw p.p.bon) ?> ?=(^ neh) :: ~& [%milk-waft [[ven `path`t.t.t.q.q.bon] t.neh]] :- ?: =(%c ven) @@ -1549,8 +1540,7 @@ ?> ?=([@ *] t.q.q.bon) ?+ i.t.q.q.bon :_ fox - :~ :+ [~ %iron p.p.bon] - (claw p.p.bon) + :~ :- (claw p.p.bon) `card`[%wart p.bon i.t.q.q.bon t.t.q.q.bon r.bon] == :: @@ -1559,8 +1549,7 @@ :: ?(%pr %pc) :: %pr, %pc :_ fox - :~ :- [~ %iron p.p.bon] - [[/e hen] `card`[%wart p.bon i.t.q.q.bon t.t.q.q.bon r.bon]] + :~ [[/e hen] `card`[%wart p.bon i.t.q.q.bon t.t.q.q.bon r.bon]] == :: %ta @@ -1569,14 +1558,12 @@ =^ wyl gus (born:gus now gox) =. ton.fox (~(su go ton.fox) gus) :_ fox - :~ :+ [~ %iron p.p.bon] - [/a /a hen] + :~ :- [/a /a hen] `card`[%want p.bon [%r %ta t.t.q.q.bon] `(unit will)`wyl] == %re :: %re :_ fox - :~ :- [~ %iron p.p.bon] - [[/c hen] `card`[%wart p.bon i.t.q.q.bon t.t.q.q.bon r.bon]] + :~ [[/c hen] `card`[%wart p.bon i.t.q.q.bon t.t.q.q.bon r.bon]] == :: %ye :: %ye @@ -1588,21 +1575,20 @@ :_ fox %+ turn paz |= him=ship - :+ [~ %iron p.p.bon] - [/a /a hen] + :- [/a /a hen] [%want [p.p.bon him] /q/yu [q.p.bon r.bon]] == :: %ouzo :: ~& [%send now p.bon `@p`(mug (shaf %flap q.bon))] :_ fox - [[wru hen [%send p.bon q.bon]] ~] + [[hen [%send p.bon q.bon]] ~] :: %wine :_ fox =+ nym=(temp p.p.bon q.p.bon /name) =+ fom=~(rend co %$ %p q.p.bon) - :~ :+ wru [/d hen] + :~ :- [/d hen] :+ %flog %text ;: weld "; " @@ -1617,7 +1603,7 @@ |= [wru=(unit writ) tea=wire hen=duct fav=card] ^- [(list move) _+>] ?: ?=([%crud *] fav) - [[[wru [/d hen] [%flog fav]] ~] +>] + [[[[/d hen] [%flog fav]] ~] +>] =+ ^= fuy ^- [p=(list boon) q=furt] ?+ -.fav [~ fox] diff --git a/arvo/batz.hoon b/arvo/batz.hoon index 9d7fa96b58..044eee53ef 100644 --- a/arvo/batz.hoon +++ b/arvo/batz.hoon @@ -158,10 +158,10 @@ |= [tea=wire hen=duct fav=card] :: handle event ^- [p=(list move) q=brat] ?: ?=([%crud *] fav) - [[[[~ %iron who] [/d hen] [%flog fav]] ~] +<.^^$] + [[[[/d hen] [%flog fav]] ~] +<.^^$] ?+ -.fav - [[[[~ %iron who] hen fav] ~] +<.^^$] - %hail [[[[~ %iron who] hen [%helo prot]] ~] +<.^^$] + [[[hen fav] ~] +<.^^$] + %hail [[[hen [%helo prot]] ~] +<.^^$] %line =+ gyp=?>(?=(^ fog) i.fog) ?: &(=(0 gyp) =(%$ p.fav)) $(fav [%hail ~]) =< abet @@ -169,11 +169,11 @@ lash:(gill:(fist hen) p.fav) lash:(como:(fest gyp hen) p.fav) %kill =+ gyp=?>(?=(^ fog) i.fog) - ?: =(0 gyp) [[[[~ %iron who] hen [%logo ~]] ~] +<.^^$] + ?: =(0 gyp) [[[hen [%logo ~]] ~] +<.^^$] abet:kill:(fest gyp hen) %ling ?> ?=(^ fog) => .(fog (weld t.fog `(list ,@ud)`[i.fog ~])) - [[[[~ %iron who] hen [%helo prot]] ~] +<.^^$] + [[[hen [%helo prot]] ~] +<.^^$] %noop [~ +<.^^$] :: %thee abet:lash:(lean tea hen fav) %thou ?. (fear tea) :: legit @@ -204,7 +204,7 @@ :_ +<.^^$ =+ fom=(trip ((hard ,@) val)) ^- (list move) - :~ :+ [~ %iron who] [/d hen] + :~ :- [/d hen] :+ %flog %text ;: weld pre @@ -271,7 +271,7 @@ :_ +<.^^$ %+ turn (flop `_duv`?:(sam duv [[~ [%helo prot]] duv])) - |=([p=duct q=card] [[~ %iron who] (weld p hen) q]) + |=([p=duct q=card] [(weld p hen) q]) :: ++ bitt |=(lap=path [(scot %ud gyp) lap]) :: bitt:fi:be ++ como :: como:fi:be @@ -1153,10 +1153,9 @@ |= [tea=wire hen=duct fav=card] ^- [p=(list move) q=vane] :: ~& [%batz-beat -.fav [%tea tea] [%hen hen]] - =+ wru=*(unit writ) =+ sky=|=(* `(unit)`=+(a=(ska +<) ?~(a ~ ?~(u.a ~ [~ u.u.a])))) ?: ?=([%crud *] fav) - [[[wru [/d hen] [%flog fav]] ~] ..^$] + [[[[/d hen] [%flog fav]] ~] ..^$] ?: ?=(%wake -.fav) =+ ^= fiy =| fiy=(list ,[p=duct q=ship r=[p=@ud q=@ud r=wire]]) @@ -1202,23 +1201,21 @@ %hail ~& [%beat-hail-soon hen] [~ ..^^$] - :: ?~ wru !! - :: $(dez (~(put by dez) hen [[q.u.wru (bard q.u.wru)] ~])) :: %init :: ~& [%beat-init p.fav hen] =+ bos=(sein p.fav) =. bos ?.(=(bos p.fav) bos ~zod) - :- :- [wru hen fav] + :- :- [hen fav] ?: =(bos p.fav) ~ :_ ~ - [wru [/b hen] [%line (rap 3 ":{(scow %p bos)}/main=/bin/update")]] + [[/b hen] [%line (rap 3 ":{(scow %p bos)}/main=/bin/update")]] =+ doz=(~(put by dez) hen [[p.fav (bard p.fav)] ~]) :: ~& [%beat-init-doz (mug doz)] ..^^$(dez doz) :: ?(%loin %make %sith) - [[[wru [/a [%b tea] hen] fav] ~] ..^^$] + [[[[/a [%b tea] hen] fav] ~] ..^^$] == ?> ?=(^ u.dus) ?+ -.fav @@ -1230,11 +1227,11 @@ %init =+ bos=(sein p.fav) =. bos ?.(=(bos p.fav) bos ~zod) - :- :* [wru hen fav] - [wru [[%b tea] hen] [%hail ~]] + :- :* [hen fav] + [[[%b tea] hen] [%hail ~]] ?: =(bos p.fav) ~ :_ ~ - [wru [/b hen] [%line (rap 3 ":{(scow %p bos)}/main=/bin/update")]] + [[/b hen] [%line (rap 3 ":{(scow %p bos)}/main=/bin/update")]] == ..^^$(dez (~(put by dez) hen [[p.fav (bard p.fav)] u.dus])) :: diff --git a/arvo/clay.hoon b/arvo/clay.hoon index 1b4cc96c0f..f98a6e0eea 100644 --- a/arvo/clay.hoon +++ b/arvo/clay.hoon @@ -24,18 +24,17 @@ :_ ruf(fat (~(put by fat.ruf) who yar)) ;: weld %+ turn (flop yel) - |=([a=duct b=card] [[~ %gold who] hun.yar b]) + |=([a=duct b=card] [hun.yar b]) :: %+ turn (flop byn) - |=([a=duct b=riot] [[~ %gold who] a [%writ b]]) + |=([a=duct b=riot] [a [%writ b]]) :: %+ turn (flop vag) - |=([a=duct b=card] [[~ %gold who] a b]) + |=([a=duct b=card] [a b]) :: %+ turn (flop say) |= [a=duct b=ship c=[p=@ud q=riff]] - :+ [~ %gold who] - [/a a] + :- [/a a] [%want [who b] [%q %re p.q.c (scot %ud p.c) ~] q.c] == :: @@ -368,39 +367,22 @@ |% :: ++ beat :: update |= [tea=wire hen=duct fav=card] - =+ wru=*(unit writ) ^- [p=(list move) q=vane] - ?+ -.fav [[[wru hen fav] ~] ..^$] + ?+ -.fav [[[hen fav] ~] ..^$] %crud - [[[wru [/d hen] %flog fav] ~] ..^$] - :: - %deem - ~& [%beat-deem wru hen] - =. wru - ?^ wru wru - ?. =(%gold (adit hen)) ~ - [~ %gold p.fav] - $(fav q.fav) + [[[[/d hen] %flog fav] ~] ..^$] :: %init - :: [[%tell %0 %leaf "clay: home for {~(rend co ~ %p q.u.wru)}"] ~] - :: ?> ?=(^ wru) - :: ?> =(q.u.wru p.fav) [~ ..^$(fat.ruf (~(put by fat.ruf) p.fav [hen ~ ~ ~]))] :: ?(%info %into) - =. wru - ?^ wru wru - ?. =(%gold (adit hen)) ~ - [~ %gold p.fav] - ?> &(?=(^ wru) =(q.u.wru p.fav)) ?: =(%$ q.fav) ?. ?=(%into -.fav) [~ ..^$] =+ yar=(need (~(get by fat.ruf) p.fav)) [~ ..^$(fat.ruf (~(put by fat.ruf) p.fav yar(hez [~ hen])))] =^ mos ruf =+ ^= zot - abet:(exec:(di:wake:(un q.u.wru now ruf) q.fav) hen now r.fav) + abet:(exec:(di:wake:(un p.fav now ruf) q.fav) hen now r.fav) abet:zot(hez.yar ?.(=(%into -.fav) hez.yar.zot [~ hen])) [mos ..^$] :: @@ -420,7 +402,6 @@ =^ mos ruf =< abet =+ une=(un p.p.fav now ruf) - :: ~& [%clay-warp q.u.wru fav] =+ wex=?.(=(p.p.fav q.p.fav) (do:une q.p.fav p.q.fav) (di:une p.q.fav)) ?~ q.q.fav abet:(ease:wex hen) @@ -431,8 +412,7 @@ ?> ?=(%re q.fav) =+ ryf=((hard riff) s.fav) :_ ..^$ - :~ :+ [~ %iron p.p.fav] - [/c [%c (scot %p p.p.fav) (scot %p q.p.fav) r.fav] hen] + :~ :- [/c [%c (scot %p p.p.fav) (scot %p q.p.fav) r.fav] hen] `card`[%warp [p.p.fav p.p.fav] ryf] == :: @@ -441,8 +421,7 @@ =+ our=(need (slaw %p i.tea)) =+ him=(need (slaw %p i.t.tea)) :_ ..^$ - :~ :+ wru - [/a [%c ~] hen] + :~ :- [/a [%c ~] hen] `card`[%want [our him] [%r %re %c t.t.tea] p.fav] == :: @@ -492,7 +471,7 @@ ++ scry :: inspect |= [our=ship ren=@tas his=ship syd=desk lot=coin tyl=path] ^- (unit (unit)) - =+ ^= whu ^- (unit ,@p) :: XX HEINOUS + =+ ^= whu ^- (unit ,@p) :: XX HEINOUS! ?: (~(has by fat.ruf) his) `his =+ foo=`(list ,[p=ship q=room])`(~(tap by fat.ruf) ~) diff --git a/arvo/dill.hoon b/arvo/dill.hoon index 5ca2a4bdbb..41f016e387 100644 --- a/arvo/dill.hoon +++ b/arvo/dill.hoon @@ -11,11 +11,10 @@ ++ beat :: process move |= [tea=wire hen=duct fav=card] ^- [p=(list move) q=vane] - =+ wru=*(unit writ) ?: ?=(%flog -.fav) :_ ..^$ %+ turn (~(tap by dug) *(list ,[p=duct q=yard])) - |=([a=duct b=yard] [wru [/d a] p.fav]) + |=([a=duct b=yard] [[/d a] p.fav]) =+ ^= yar ^- yard =+ yar=(~(get by dug) hen) ?^ yar u.yar @@ -29,7 +28,7 @@ |= wab=(list blit) ^+ +> ?~ wab +> - +>(mos [[~ hen [%blit (flop wab)]] mos]) + +>(mos [[hen [%blit (flop wab)]] mos]) :: ++ wod :: word forward |= bed=bead @@ -161,7 +160,7 @@ :: ++ leap :: terminal event |- ^+ + - ?+ -.fav +(mos :_(mos [wru hen fav])) + ?+ -.fav +(mos :_(mos [hen fav])) %noop + %belt :: terminal input ?~ q.q.yar @@ -230,7 +229,7 @@ %d ?: ?& =(0 bul.u.q.q.yar) =(0 bus.u.q.q.yar) == - +.$(mos :_(mos [wru [/b /d hen] [%kill ~]])) + +.$(mos :_(mos [[/b /d hen] [%kill ~]])) $(fav [%belt %del ~]) %e (edit u.q.q.yar(bus bul.u.q.q.yar)) %f $(fav [%belt %aro %r]) @@ -263,7 +262,7 @@ ~ (slag (add 2 pos) but.u.q.q.yar) == - %l +.$(mos :_(mos [~ hen %blit [[%clr ~] ~]])) + %l +.$(mos :_(mos [hen %blit [[%clr ~] ~]])) %n $(fav [%belt %aro %d]) %p $(fav [%belt %aro %u]) %u ?: =(0 bus.u.q.q.yar) @@ -278,8 +277,8 @@ == %r (edit u.q.q.yar(hyr [~ ~])) :: TODO - :: %w +.$(mos :_(mos [wru [/b /d hen] [%limn ~]])) - %x +.$(mos :_(mos [wru [/b /d hen] [%ling ~]])) + :: %w +.$(mos :_(mos [[/b /d hen] [%limn ~]])) + %x +.$(mos :_(mos [[/b /d hen] [%ling ~]])) %y ?: =(0 p.r.q.yar) beep $(fav [%belt %txt (snag q.r.q.yar r.r.q.yar)]) @@ -348,10 +347,10 @@ [p.hyt.u.q.q.yar [jab ?~(q.hyt.u.q.q.yar ~ +.q.hyt.u.q.q.yar)]] :: mos - :* [~ [/b /d hen] [%hail ~]] - [~ hen [%bbye ~]] - [wru [/b /d hen] [%line jab]] - [~ hen [%blit [[%mor ~] ~]]] + :* [[/b /d hen] [%hail ~]] + [hen [%bbye ~]] + [[/b /d hen] [%line jab]] + [hen [%blit [[%mor ~] ~]]] mos == == @@ -376,7 +375,7 @@ %boot %= +.$ mos - :_(mos [wru [[%b ~] [%d tea] hen] p.fav]) + :_(mos [[[%b ~] [%d tea] hen] p.fav]) == :: %crud :: error trace @@ -413,12 +412,12 @@ == :: ?(%hail %make %loin %sith) - +.$(mos :_(mos [wru [/b /d hen] fav])) + +.$(mos :_(mos [[/b /d hen] fav])) :: %note ?.(p.yar +.$ (fume p.fav q.fav)) :: debug message %save :: write a file %= +.$ - mos :_(mos [wru hen `card`[%blit [%sav p.fav q.fav] ~]]) + mos :_(mos [hen `card`[%blit [%sav p.fav q.fav] ~]]) == :: %tell (furl (turn p.fav |=(a=@t (trip a)))) :: wall of text diff --git a/arvo/eyre.hoon b/arvo/eyre.hoon index d5244cfd49..97e5909dfe 100644 --- a/arvo/eyre.hoon +++ b/arvo/eyre.hoon @@ -168,8 +168,7 @@ -- |% :: functions ++ ye :: per event - =| $: $: $: wru=(unit writ) :: event authority - tea=wire :: event place + =| $: $: $: tea=wire :: event place hen=duct :: event floor fav=card :: event data == :: @@ -193,7 +192,7 @@ ++ apex |- ^+ + ?+ -.fav - +.$(mow [[wru hen fav] mow]) + +.$(mow [[hen fav] mow]) :: %born +(ged hen) :: register external %init :: register ownership @@ -210,29 +209,21 @@ == :: %made - ?. ?=([%honk @ @ ~] tea) + ?. ?=([%honk @ @ @ ~] tea) +.$ - ?> ?=(^ wru) - (galt q.u.wru i.t.tea (need (slaw %ud i.t.t.tea)) p.fav) - :: - %that :: outbound response - ?> ?=([@ @ @ ~] tea) :: - =+ :* our=(slaw %p i.tea) :: ship - ses=i.t.tea :: session - num=(slaw %ud i.t.t.tea) :: request in session - == :: - !! + %- galt + [(need (slaw %p i.t.tea)) i.t.t.tea (need (slaw %ud i.t.t.t.tea)) p.fav] :: %them :: outbound request ?~ p.fav =+ sud=(need (~(get by kes) hen)) %= +.$ - mow :_(mow [~ ged [%thus sud ~]]) + mow :_(mow [ged [%thus sud ~]]) q.ask (~(del by q.ask) sud) kes (~(del by kes) hen) == %= +.$ - mow :_(mow [~ ged [%thus p.ask p.fav]]) + mow :_(mow [ged [%thus p.ask p.fav]]) p.ask +(p.ask) q.ask (~(put by q.ask) p.ask hen u.p.fav) kes (~(put by kes) hen p.ask) @@ -241,7 +232,7 @@ %they :: inbound response =+ kas=(need (~(get by q.ask) p.fav)) %= +.$ - mow :_(mow [~ p.kas [%thou q.fav]]) + mow :_(mow [p.kas [%thou q.fav]]) q.ask (~(del by q.ask) p.kas) == :: @@ -271,21 +262,20 @@ == :: %thou :: remote return - ?> ?=([@ *] tea) - (hajj (need (slaw %p i.tea)) t.tea p.fav) + ?> ?=([@ @ *] tea) + (hajj (need (slaw %p i.tea)) (need (slaw %p i.t.tea)) t.t.tea p.fav) :: %wart :: remote request - ?> ?=(^ wru) ?+ q.fav ~& [%strange-wart p.fav q.fav] +.$ :: - %pr (hare r.fav q.p.fav s.fav) + %pr (hare p.p.fav r.fav q.p.fav s.fav) %pc (here p.p.fav q.p.fav s.fav) == :: %waft - ?. ?=([%hork @ ~] tea) + ?. ?=([%hork @ @ ~] tea) +.$ (gosh q.p.fav (need (slaw %ud i.t.tea)) ((hard httr) q.fav)) :: @@ -293,16 +283,16 @@ +.$ :: %writ - ?. ?=([%hoot @ @ ~] tea) + ?. ?=([%hoot @ @ @ ~] tea) +.$ - ?> ?=(^ wru) - (gout q.u.wru i.t.tea (need (slaw %ud i.t.t.tea)) p.fav) + %- gout + [(need (slaw %p i.t.tea)) i.t.t.tea (need (slaw %ud i.t.t.t.tea)) p.fav] :: ?(%helo %tell %text %talk %warn) - ?. ?=([%cons @ @ ~] tea) + ?. ?=([%cons @ @ @ ~] tea) +.$ - ?> ?=(^ wru) - (goat q.u.wru i.t.tea (need (slaw %ud i.t.t.tea)) fav) + %- goat + [(need (slaw %p i.t.tea)) i.t.t.tea (need (slaw %ud i.t.t.t.tea)) fav] == :: ++ doss :: host to ship @@ -346,7 +336,7 @@ =+ zur=(~(get by q.rem.u.ryt) num) ?~ zur +>.$ %_ +>.$ - mow :_(mow [wru u.zur [%thou har]]) + mow :_(mow [u.zur [%thou har]]) fon (~(put by fon) him u.ryt(q.rem (~(del by q.rem.u.ryt) num))) == :: @@ -360,25 +350,24 @@ abet:work:(~(iota ya [our ses] u.suf u.cuz) num rot) :: ++ haji :: send %pc login - |= [him=ship ses=hole] + |= [our=ship him=ship ses=hole] ^+ +> - ?> ?=(^ wru) - +>.$(mow :_(mow [wru [/a /e hen] [%want [q.u.wru him] [%r %pc ~] ses]])) + +>.$(mow :_(mow [[/a /e hen] [%want [our him] [%r %pc ~] ses]])) :: ++ hajj :: send %pr response - |= [him=ship tus=path har=httr] + |= [our=ship him=ship tus=path har=httr] ^+ +> - ?> ?=(^ wru) - +>.$(mow :_(mow [wru [/a /e hen] [%want [q.u.wru him] [%r %pr tus] har]])) + +>.$(mow :_(mow [[/a /e hen] [%want [our him] [%r %pr tus] har]])) :: ++ hare :: receive request - |= [tus=path him=ship hor=*] + |= [our=ship tus=path him=ship hor=*] ^+ +> =+ hux=((hard (unit httx)) hor) %_ +>.$ mow :_ mow - [wru [/e [%e (scot %p him) tus] hen] ?~(hux [%thud ~] [%this u.hux])] + :- [/e [%e (scot %p our) (scot %p him) tus] hen] + ?~(hux [%thud ~] [%this u.hux]) == :: ++ here :: receive auth @@ -415,8 +404,7 @@ %_ +> mow :_ mow - :+ [~ %gold our] - [/c [%e %hoot ses (scot %ud num) ~] hen] + :- [/c [%e %hoot (scot %p our) ses (scot %ud num) ~] hen] [%warp [our our] rif] == :: @@ -425,8 +413,7 @@ %_ +> mow :_ mow - :+ [~ %gold our] - [/f [%e %honk ses (scot %ud num) ~] hen] + :- [/f [%e %honk (scot %p our) ses (scot %ud num) ~] hen] [%exec our ~] == :: @@ -436,8 +423,7 @@ %_ +> mow :_ mow - :+ [~ %gold our] - [/f [%e %honk ses (scot %ud num) ~] hen] + :- [/f [%e %honk (scot %p our) ses (scot %ud num) ~] hen] [%exec our `kas] == :: @@ -449,8 +435,7 @@ %_ +>.$ mow :_ mow - :+ [~ %gold sor.rot] - [/a [%e %hork mun ~] hen] + :- [/a [%e %hork (scot %p sor.rot) mun ~] hen] [%want [sor.rot him] [%q %pr %e %hork mun ~] ~] == :: @@ -474,8 +459,7 @@ lor (~(put by lor) hen num [%| him]) mow :_ mow - :+ [~ %gold sor.rot] - [/a [%e %hork mun ~] hen] + :- [/a [%e %hork mun ~] hen] [%want [sor.rot him] [%q %pr %e %hork mun ~] [~ hyx]] :: fon @@ -617,7 +601,7 @@ :: ++ muff :: return card |= fav=card - +>(mow :_(mow [wru hen fav])) + +>(mow :_(mow [hen fav])) :: ++ myth :: load session |= [our=ship ses=hole] @@ -1700,8 +1684,7 @@ mow ?~ fuv mow :_ mow - :+ [~ %gold our] - [/b [%e %cons ses (scot %ud p.som.pip) ~] ~ ~] + :- [/b [%e %cons (scot %p our) ses (scot %ud p.som.pip) ~] ~ ~] u.fuv == [~ `pimp`pip(pez `pest`[%fin %raw 200 ~ ~])] @@ -1734,7 +1717,7 @@ [%next (jape (earn pul.p.som.pip))] == :_(+>.$ [~ pip(pez [%fin %mid /text/json (tact (pojo jon))])]) - =. ..ya (haji u.foy.p.som.pip) + =. ..ya (haji our u.foy.p.som.pip) =+ ^= lup ^- purl :+ ^- hart :+ & ~ @@ -1831,15 +1814,14 @@ ++ beat :: process move |= [tea=wire hen=duct fav=card] ^- [p=(list move) q=vane] - =+ wru=*(unit writ) =+ sky=|=(* `(unit)`=+(a=(ska +<) ?~(a ~ ?~(u.a ~ [~ u.u.a])))) =. ney (shax :(mix (shax now) +(eny) ney)) :: XX!! shd not need ?: ?=(%crud -.fav) - [[[wru [/d hen] %flog fav] ~] ..^$] + [[[[/d hen] %flog fav] ~] ..^$] ^- [p=(list move) q=vane] =. gub ?.(=(0 gub) gub (cat 3 (rsh 3 1 (scot %p (end 6 1 eny))) '-')) =^ mos bol - abet:apex:~(adit ye [[wru tea hen fav] [now eny sky] ~] bol) + abet:apex:~(adit ye [[tea hen fav] [now eny sky] ~] bol) [mos ..^$] :: ++ call :: process move diff --git a/arvo/ford.hoon b/arvo/ford.hoon index d6bdb84258..c9e3509fd5 100644 --- a/arvo/ford.hoon +++ b/arvo/ford.hoon @@ -160,8 +160,7 @@ %= $ kiz t.kiz mow :_ mow - :+ [~ %iron our] - [/c [%f (scot %ud num) (scot %ud p.i.kiz) ~] hen] + :- [/c [%f (scot %ud num) (scot %ud p.i.kiz) ~] hen] [%warp [our p.q.i.kiz] q.q.i.kiz ~] == :: @@ -174,8 +173,7 @@ == %= $ mow :_ mow - :+ [~ %iron our] - [/c [%f (scot %ud num) (scot %ud tik) ~] hen] + :- [/c [%f (scot %ud num) (scot %ud tik) ~] hen] [%warp [our p.bem] q.bem [~ %& %x r.bem s.bem]] == :: @@ -288,7 +286,7 @@ :: ++ expo :: return card |= fav=card - %_(+> mow :_(mow [[~ %iron our] hen fav])) + %_(+> mow :_(mow [hen fav])) :: ++ fade :: compile |= [cof=cafe kas=silk] diff --git a/arvo/hoon.hoon b/arvo/hoon.hoon index 9eedf1bfe7..fc524e82b1 100644 --- a/arvo/hoon.hoon +++ b/arvo/hoon.hoon @@ -2967,6 +2967,7 @@ -- ++ scot |=(mol=dime ~(rent co %$ mol)) ++ scow |=(mol=dime ~(rend co %$ mol)) +++ slav |=([mod=@tas txt=@ta] (need (slaw mod txt))) ++ slaw |= [mod=@tas txt=@ta] ^- (unit ,@) @@ -8769,7 +8770,7 @@ $% [%lead p=ship] :: foreign == :: ++ hilt ?(0 1 2) :: lead iron gold -++ muve ,[~ p=duct q=curd] :: typeless move +++ muve ,[p=duct q=curd] :: typeless move ++ ovum ,[p=wire q=curd] :: typeless ovum ++ pane (list ,[p=@tas q=vase]) :: kernel modules ++ pone (list ,[p=@tas q=vise]) :: kernel modules, old @@ -8918,7 +8919,7 @@ ++ hurl :: start loop no id |= ovo=ovum ^- [p=(list ovum) q=(list ,[p=@tas q=vase])] - (kick [[~ [[(dint p.ovo) ~] p.ovo ~] q.ovo] ~]) + (kick [[[[(dint p.ovo) ~] p.ovo ~] q.ovo] ~]) :: ++ kick :: complete loop |= mor=(list muve) diff --git a/arvo/zuse.hoon b/arvo/zuse.hoon index 4bcbabf4ad..45c66cc03f 100644 --- a/arvo/zuse.hoon +++ b/arvo/zuse.hoon @@ -2319,7 +2319,7 @@ ++ moat ,[p=case q=case] :: change range ++ monk (each ship khan) :: general identity ++ mood ,[p=care q=case r=path] :: request in desk -++ move ,[p=(unit writ) q=duct r=card] :: typeless move +++ move ,[q=duct r=card] :: typeless move ++ moth ,[p=meth q=math r=(unit octs)] :: http operation ++ name ,[p=@t q=(unit ,@t) r=(unit ,@t) s=@t] :: first mid/nick last ++ nave ::