diff --git a/ape/oct1.hoon b/ape/oct1.hoon index 559c3d8d5..b3d961958 100644 --- a/ape/oct1.hoon +++ b/ape/oct1.hoon @@ -32,7 +32,7 @@ :::: :::::: process tools :: :: :: ++ abet [(flop moz) .(moz ~)] :: resolve -++ bike $+(_. _+>) :: self-transformer +++ bike $-(_. _+>) :: self-transformer ++ dish |=(cad/card %_(+> moz [[ost cad] moz])) :: request ++ eels (~(tap by sup)) :: all clients ++ echo |= {all/(list sink) fun/bike} =+ old=+>+<- :: diff --git a/ape/oct2.hoon b/ape/oct2.hoon index b839c8e8b..ad9186386 100644 --- a/ape/oct2.hoon +++ b/ape/oct2.hoon @@ -46,7 +46,7 @@ :::: :::::: process tools :: :: :: ++ abet [(flop moz) .(moz ~)] :: resolve -++ bike $+(_. _+>) :: self-transformer +++ bike $-(_. _+>) :: self-transformer ++ dish |=(cad/card %_(+> moz [[ost cad] moz])) :: request ++ echo |= {all/(list sink) fun/bike} =+ old=+>+<- :: publish to all |- ^+ +>.^$ ?~ all +>.^$(+<- old) :: diff --git a/ape/oct3.hoon b/ape/oct3.hoon index 43c2d8275..ba2f2bb99 100644 --- a/ape/oct3.hoon +++ b/ape/oct3.hoon @@ -48,7 +48,7 @@ :::: :::::: process tools :: :: :: ++ abet [(flop moz) .(moz ~)] :: resolve -++ bike $+(_. _+>) :: self-transformer +++ bike $-(_. _+>) :: self-transformer ++ dish |=(cad/card %_(+> moz [[ost cad] moz])) :: request ++ echo |= {all/(list sink) fun/bike} =+ old=+>+<- :: publish to all |- ^+ +>.^$ ?~ all +>.^$(+<- old) :: diff --git a/ape/oct4.hoon b/ape/oct4.hoon index 28144dc62..341045d50 100644 --- a/ape/oct4.hoon +++ b/ape/oct4.hoon @@ -54,7 +54,7 @@ :::: :::::: process tools :: :: :: ++ abet [(flop moz) .(moz ~)] :: resolve -++ bike $+(_. _+>) :: self-transformer +++ bike $-(_. _+>) :: self-transformer ++ dish |=(cad/card %_(+> moz [[ost cad] moz])) :: request ++ done (echo eels |=(_. (dish:+< %quit ~))) :: cancel everyone ++ echo |= {all/(list sink) fun/bike} =+ old=+>+<- :: publish to all diff --git a/ape/talk.hoon b/ape/talk.hoon index b1e108230..ea555608c 100644 --- a/ape/talk.hoon +++ b/ape/talk.hoon @@ -1294,7 +1294,7 @@ :: ++ ra-know :: story monad |= man/knot - |* fun/$+(_pa _+>) + |* fun/$-(_pa _+>) ^+ +>+> =+ pur=(~(get by stories) man) ?~ pur @@ -2092,12 +2092,12 @@ == :: ++ etch-friend :: - |= {way/wire fun/$+({man/knot cuz/station} {(list move) _.})} + |= {way/wire fun/$-({man/knot cuz/station} {(list move) _.})} =+ wer=(etch way) ?>(?=($friend -.wer) (fun p.wer q.wer)) :: ++ etch-repeat :: - |= {way/wire fun/$+({num/@ud src/@p man/knot} {(list move) _.})} + |= {way/wire fun/$-({num/@ud src/@p man/knot} {(list move) _.})} =+ wer=(etch way) ?>(?=($repeat -.wer) (fun p.wer q.wer r.wer)) :: diff --git a/arvo/clay.hoon b/arvo/clay.hoon index 8b9be408a..a2b2ac33f 100644 --- a/arvo/clay.hoon +++ b/arvo/clay.hoon @@ -1138,7 +1138,7 @@ (silt lat) :: ++ mabe :: maybe fire function - |= {rov/rove fun/$+(@da _.)} + |= {rov/rove fun/$-(@da _.)} ^+ +>.$ %+ fall %+ bind diff --git a/arvo/eyre.hoon b/arvo/eyre.hoon index 07d4e39dc..dc4b590be 100644 --- a/arvo/eyre.hoon +++ b/arvo/eyre.hoon @@ -176,7 +176,7 @@ (biff (from-cookies maf |=({k/@ @} =(%ship k))) (slat %p)) :: ++ from-cookies - |= {maf/math fil/$+({@t @t} ?)} + |= {maf/math fil/$-({@t @t} ?)} =+ `cot/(list @t)`(~(get ju maf) 'cookie') =+ `cok/quay`(zing `(list quay)`(murn cot (curr rush cock:epur))) |- ^- (unit cord) @@ -540,7 +540,7 @@ $: now/@da :: event date eny/@ :: unique entropy our/ship :: current ship - sky/$+({* *} (unit)) :: system namespace + sky/$-({* *} (unit)) :: system namespace == :: mow/(list move) :: pending actions == :: @@ -930,7 +930,7 @@ |% ++ abet ..handle ++ done . - ++ teba |*(a/$+(* ..handle) |*(b/* %_(done ..handle (a b)))) + ++ teba |*(a/$-(* ..handle) |*(b/* %_(done ..handle (a b)))) ++ execute (teba ^execute) ++ del-deps (teba ^del-deps) ++ new-deps (teba ^new-deps) @@ -1432,7 +1432,7 @@ =. +> poll-rest ..ix(wix (~(del by wix) ire)) :: - ++ teba |*(a/$+(* ..ix) |*(b/* %_(done ..ix (a b)))) + ++ teba |*(a/$-(* ..ix) |*(b/* %_(done ..ix (a b)))) ++ give-json (teba ^give-json) ++ pass-note (teba ^pass-note) ++ hurl-note diff --git a/arvo/ford.hoon b/arvo/ford.hoon index 350b554bc..67d1f12f9 100644 --- a/arvo/ford.hoon +++ b/arvo/ford.hoon @@ -31,7 +31,7 @@ jav/(map * calx) :: cache == :: ++ bolt :: gonadic edge - |* a/$+(* *) :: product clam + |* a/$-(* *) :: product clam $: p/cafe :: cache $= q :: $% {$0 p/(set beam) q/a} :: depends+product @@ -41,8 +41,8 @@ == :: :: :: ++ burg :: gonadic rule - |* {a/$+(* *) b/$+(* *)} :: from and to - $+({c/cafe d/a} (bolt b)) :: + |* {a/$-(* *) b/$-(* *)} :: from and to + $-({c/cafe d/a} (bolt b)) :: :: :: ++ cafe :: live cache $: p/(set calx) :: used @@ -147,7 +147,7 @@ (~(gas by one) (~(tap by two) ~)) :: XX ugh :: ++ lark :: filter arch names - |= {wox/$+(knot (unit @)) arc/arch} + |= {wox/$-(knot (unit @)) arc/arch} ^- (map @ knot) %- ~(gas by *(map @ knot)) =| rac/(list (pair @ knot)) @@ -423,7 +423,7 @@ :: ++ coup :: toon to bolt |= cof/cafe - |* {ton/toon fun/$+(* *)} + |* {ton/toon fun/$-(* *)} :- p=cof ^= q ?- -.ton @@ -461,7 +461,7 @@ :: ++ cowl :: each to bolt |= cof/cafe - |* {tod/(each * tang) fun/$+(* *)} + |* {tod/(each * tang) fun/$-(* *)} %+ (coup cof) ?- -.tod $& [%0 p=p.tod] @@ -927,7 +927,7 @@ :: ++ done . ++ with - |* {a/(bolt _done) b/$+(_done (bolt))} ^+ *b + |* {a/(bolt _done) b/$-(_done (bolt))} ^+ *b (cope a |=({cof/cafe c/_done} (b c(cof cof)))) :: ++ return diff --git a/arvo/hoon.hoon b/arvo/hoon.hoon index d2a3d2b6c..12402a8fc 100644 --- a/arvo/hoon.hoon +++ b/arvo/hoon.hoon @@ -1,4 +1,4 @@ -:::::: :::::::::::::::::::::::::::::::::::::::::::::::::::::: +:::::: :::::::::::::::::::::::::::::::::::::::::::::::::::::: :::::: :::::: Preface :::::: :::::: :::::::::::::::::::::::::::::::::::::::::::::::::::::: ?> ?=(@ .) :: atom subject @@ -16,7 +16,7 @@ ~% %k.151 ~ ~ :: |% :: ++ hoon %151 :: version stub --- :: +-- :: :::::: :::::::::::::::::::::::::::::::::::::::::::::::::::::: :::::: :::::: volume 1, Hoon models :::::: :::::: :::::::::::::::::::::::::::::::::::::::::::::::::::::: @@ -132,7 +132,7 @@ ++ pole |* a/$-(* *) :: nameless list $@($~ {a (pole a)}) :: ++ port (each palo (pair span nock)) :: successful match -++ qual |* {a/$-(* *) b/$-(* *) c/$+(* *) d/$+(* *)} :: just a quadruple +++ qual |* {a/$-(* *) b/$-(* *) c/$-(* *) d/$-(* *)} :: just a quadruple {p/a q/b r/c s/d} :: ++ ring @ :: private key ++ rule _|=(nail *edge) :: parsing rule @@ -178,7 +178,7 @@ {$2 p/toga q/toga} :: cell toga == :: ++ trap |*(a/_* _|?(*a)) :: makes perfect sense -++ trel |* {a/$-(* *) b/$-(* *) c/$+(* *)} :: just a triple +++ trel |* {a/$-(* *) b/$-(* *) c/$-(* *)} :: just a triple {p/a q/b r/c} :: ++ tuna :: tagflow $% {$a p/twig} :: plain text @@ -212,7 +212,6 @@ {$bccl p/(list twig)} :: tuple {$bccn p/(list twig)} :: tagged fork (kelp) {$bchp p/twig q/twig} :: function - {$bcls p/twig q/twig} :: function {$bckt p/twig q/twig} :: pairhead fork (bush) {$bcwt p/(list twig)} :: untagged fork {$bcts p/term q/twig} :: name @@ -7003,7 +7002,6 @@ :: {$bckt *} [%bush boil(gen p.gen) boil(gen q.gen)] {$bchp *} [%weed [%brsg p.gen [%cnbc [%tsgr [%$ 7] q.gen]]]] - {$bcls *} [%weed [%brsg p.gen [%cnbc [%tsgr [%$ 7] q.gen]]]] {$bcts *} [%bark p.gen boil(gen q.gen)] {$bcwt *} =+ (turn p.gen |=(a/twig boil(gen a))) ?~(- [%axil %void] [%fern -]) @@ -7063,7 +7061,6 @@ {$bccl *} ~(clam al boil) {$bccn *} ~(clam al boil) {$bchp *} ~(clam al boil) - {$bcls *} ~(clam al boil) {$bckt *} ~(clam al boil) {$bcwt *} ~(clam al boil) {$bcts *} ~(clam al boil) @@ -9741,7 +9738,6 @@ [':' (rune col %bccl exps)] ['%' (rune cen %bccn exps)] ['^' (rune ket %bckt expb)] - ['+' (rune lus %bcls expb)] ['-' (rune hep %bchp expb)] ['=' (rune tis %bcts expg)] ['?' (rune wut %bcwt exps)] diff --git a/arvo/zuse.hoon b/arvo/zuse.hoon index 7b8c1198d..002475e53 100644 --- a/arvo/zuse.hoon +++ b/arvo/zuse.hoon @@ -777,7 +777,7 @@ :: ++ jo :: json reparser => |% ++ grub (unit *) - ++ fist $+(json grub) + ++ fist $-(json grub) -- |% ++ ar :: array as list @@ -810,12 +810,12 @@ |=(jon/json ?.(?=({$b *} jon) ~ [~ u=!p.jon])) :: ++ ci :: maybe transform - |* {poq/$+(* *) wit/fist} + |* {poq/$-(* *) wit/fist} |= jon/json (biff (wit jon) poq) :: ++ cu :: transform - |* {poq/$+(* *) wit/fist} + |* {poq/$-(* *) wit/fist} |= jon/json (bind (wit jon) poq) :: @@ -1457,7 +1457,7 @@ == == ++ pale :: filter peers - |= {hid/bowl fun/$+(sink ?)} + |= {hid/bowl fun/$-(sink ?)} (skim (~(tap by sup.hid)) fun) :: ++ prix :: filter gate @@ -1474,7 +1474,7 @@ ?:((lth u.one u.two) one two) :: ++ mole :: new to old sky - |= ska/$+(* (unit (unit))) + |= ska/$-(* (unit (unit))) |= a/* ^- (unit) =+ b=(ska a) @@ -1483,8 +1483,8 @@ [~ u.u.b] :: ++ myle :: new to old sky - |= ska/$+({* *} (unit (unit))) - ^- $+({* *} (unit)) + |= ska/$-({* *} (unit (unit))) + ^- $-({* *} (unit)) |= a/{* *} ^- (unit) =+ b=(ska a) diff --git a/lib/down-jet/parse.hoon b/lib/down-jet/parse.hoon index 203cebaa6..3134f06a4 100644 --- a/lib/down-jet/parse.hoon +++ b/lib/down-jet/parse.hoon @@ -85,7 +85,7 @@ [i.q.tub $(q.tub t.q.tub)] :: ++ enrule :: XX - |* a/$+(tape *) + |* a/$-(tape *) |= tub/nail ^- (like a) [[0 0] ~ (a q.tub) [0 0] ~] @@ -93,7 +93,7 @@ =~ |% ++ strip - |= {a/$+(nail edge) b/tape} + |= {a/$-(nail edge) b/tape} ^- tape =+ q:(a 1^1 b) ?~(- b q.q.u.-) @@ -183,7 +183,7 @@ |=({a/kids b/{tape (unit tape)}} [[%link b] a]) |% ++ apex - =+ ^- rob/$+(nail (like {kids $@(cord {tape (unit tape)})})) + =+ ^- rob/$-(nail (like {kids $@(cord {tape (unit tape)})})) ;~(plug text(nol &) labe) :: |= tub/nail diff --git a/lib/kiln.hoon b/lib/kiln.hoon index 55dafc350..ccb97973a 100644 --- a/lib/kiln.hoon +++ b/lib/kiln.hoon @@ -263,7 +263,7 @@ (emil cards) %+ roll `(list @tas)`vanes =< %_(. cur-vanes ^cur-vanes) - ::^- $+([@tas _+>.^$] _+>.^$) + ::^- $-([@tas _+>.^$] _+>.^$) |= {syd/@tas cur-vanes/(map @tas @uvI) cards/(list card)} =+ ^= new-vane .^(@uvI %cz /(scot %p our)/home/(scot %da now)/arvo/[syd]/hoon) diff --git a/lib/sole.hoon b/lib/sole.hoon index 3d987dff0..15441e0b7 100644 --- a/lib/sole.hoon +++ b/lib/sole.hoon @@ -112,7 +112,7 @@ [dat abet:(apply(his.ven +(his.ven)) dat)] :: ++ remit :: conditional accept - |= {cal/sole-change ask/$+((list @c) ?)} + |= {cal/sole-change ask/$-((list @c) ?)} ^- {(unit sole-change) sole-share} =+ old=buf =^ dat +>+<.$ (receive cal) diff --git a/lib/tree.hoon b/lib/tree.hoon index e90072311..5bcf4161d 100644 --- a/lib/tree.hoon +++ b/lib/tree.hoon @@ -19,7 +19,7 @@ :: ++ baff |*({a/(unit) b/(trap)} ?^(a a *b)) ++ find-in-tree - |* {paz/fist:jo fun/$+(* (unit))} + |* {paz/fist:jo fun/$-(* (unit))} |= jon/json =+ a=`(list json)`~[jon] |^ (try) @@ -32,7 +32,7 @@ -- :: ++ map-to-json - |* {a/$+(* cord) b/$+(* json)} + |* {a/$-(* cord) b/$-(* json)} |* c/(map) ^- json ~! c (jobe (turn (~(tap by c)) |*({* *} [(a +<-) (b +<+)]))) diff --git a/lib/twitter.hoon b/lib/twitter.hoon index ac1ececd4..35b0c5695 100644 --- a/lib/twitter.hoon +++ b/lib/twitter.hoon @@ -119,7 +119,7 @@ ++ mean (ot errors+(ar (ot message+so code+ni ~)) ~):jo ++ stat =+ jo - ^- $+(json (unit {id/@u who/@ta now/@da txt/@t})) + ^- $-(json (unit {id/@u who/@ta now/@da txt/@t})) %- ot :~ id+ni user+(ot (fasp screen-name+(su user)) ~) @@ -128,7 +128,7 @@ == ++ usel =+ jo - ^- $+(json (unit (list who/@ta))) + ^- $-(json (unit (list who/@ta))) =- (ot users+(ar -) ~) (ot (fasp screen-name+(su user)) ~) -- @@ -192,7 +192,7 @@ (roll +< |=({p/tid q/@t} (cat 3 (cat 3 q ',') (lutt p)))) :: ++ mold :: construct request - |* {med/meth pax/path a/$+(* *)} + |* {med/meth pax/path a/$-(* *)} |= {args/a quy/quay} (valve med (cowl pax args quy) key est eny) :: diff --git a/mar/talk/command.hoon b/mar/talk/command.hoon index ab70e079d..6c7aa79c9 100644 --- a/mar/talk/command.hoon +++ b/mar/talk/command.hoon @@ -39,7 +39,7 @@ |* a/fist (cu ~(gas in *(set _(need *a))) (ar a)) :: - ++ lake |*(a/_* $+(json (unit a))) + ++ lake |*(a/_* $-(json (unit a))) ++ peach |* a/{rule rule} |= tub/nail @@ -56,7 +56,7 @@ :: :: ++ thot - ^- $+(json (unit thought)) + ^- $-(json (unit thought)) %- ot :~ serial+ceri audience+audi @@ -64,11 +64,11 @@ == :: ++ ceri - ^- $+(json (unit serial)) + ^- $-(json (unit serial)) (ci (slat %uv) so) :: ++ audi - ^- $+(json (unit audience)) + ^- $-(json (unit audience)) (op parn memb) :: ++ auri (op parn (ci (soft presence) so)) @@ -76,7 +76,7 @@ ++ lope (ot [visible+bo sender+(mu (su parn)) ~]) :: ++ parn - ^- $+(nail (like partner)) + ^- $-(nail (like partner)) %+ peach ;~((glue fas) ;~(pfix sig fed:ag) urs:ab) %+ sear (soft passport) @@ -97,7 +97,7 @@ == :: ++ stam - ^- $+(json (unit statement)) + ^- $-(json (unit statement)) %+ cu eval (ot date+di bouquet+(as (ar so)) speech+spec ~) :: @@ -113,7 +113,7 @@ == :: ++ conf - ^- $+(json (unit config)) + ^- $-(json (unit config)) %- ot :~ sources+(as (su parn)) caption+so diff --git a/sur/sole.hoon b/sur/sole.hoon index 9a3dc1516..fe2294f9d 100644 --- a/sur/sole.hoon +++ b/sur/sole.hoon @@ -55,30 +55,30 @@ :: :: :: :: ++ sole-dialog :: standard dialog - |* out/$+(* *) :: output structure - $+(sole-input (sole-result out)) :: output function + |* out/$-(* *) :: output structure + $-(sole-input (sole-result out)) :: output function :: :: ++ sole-input tape :: prompt input ++ sole-result :: conditional result - |* out/$+(* *) :: output structure + |* out/$-(* *) :: output structure $@(@ud (sole-product out)) :: error position :: :: ++ sole-product :: success result - |* out/$+(* *) :: + |* out/$-(* *) :: %+ pair (list tank) :: %+ each (unit out) :: ~ is abort (pair sole-prompt (sole-dialog out)) :: ask and continue :: :: ++ sole-request :: scraper result - |* out/$+(* *) :: output structure + |* out/$-(* *) :: output structure %+ pair (list tank) :: %+ each (unit out) :: ~ is abort - (pair hiss $+(httr (sole-request out))) :: fetch and continue + (pair hiss $-(httr (sole-request out))) :: fetch and continue :: :: ++ sole-gen :: XX virtual type - $% {$say $+((sole-args) (cask))} :: direct noun - {$ask $+((sole-args) (sole-product (cask)))} :: dialog - {$get $+((sole-args) (sole-request (cask)))} :: scraper + $% {$say $-((sole-args) (cask))} :: direct noun + {$ask $-((sole-args) (sole-product (cask)))} :: dialog + {$get $-((sole-args) (sole-request (cask)))} :: scraper == :: ++ sole-args :: generator arguments |* _[* *] :: @@ -99,14 +99,14 @@ [p=*(list tank) q=[%| p=pom q=mor]] :: :: :: ++ sole-at :: fetch url - |* {pul/_purl fun/$+(httr *)} :: + |* {pul/_purl fun/$-(httr *)} :: [p=*(list tank) q=[%| p=[pul %get ~ ~] q=fun]] :: :: :: ++ sole-no :: empty result [p=*(list tank) q=[%& ~]] :: :: :: ++ sole-go :: parse by rule - |* {sef/rule fun/$+(* *)} :: + |* {sef/rule fun/$-(* *)} :: |= txt/sole-input :: =+ vex=(sef [0 0] txt) :: ?: |(!=((lent txt) q.p.vex) ?=($~ q.vex)) ::