From 91f8049819e98507d5e4b7987a171a970c7a045a Mon Sep 17 00:00:00 2001 From: Anton Dyudin Date: Tue, 6 Dec 2016 19:13:33 -0800 Subject: [PATCH] remove ^vane shims requires vere without crypto:ames --- app/ask.hoon | 2 +- app/dojo.hoon | 54 ++++++++-------- app/gh.hoon | 2 +- app/github.hoon | 2 +- app/gmail.hoon | 2 +- app/hood.hoon | 2 +- app/pipe.hoon | 2 +- app/talk.hoon | 6 +- app/twit.hoon | 2 +- lib/basic-auth.hoon | 2 +- lib/drum.hoon | 108 ++++++++++++++++---------------- lib/helm.hoon | 14 ++--- lib/hep-to-cab.hoon | 2 +- lib/interpolate.hoon | 2 +- lib/kiln.hoon | 18 +++--- lib/oauth1.hoon | 2 +- lib/oauth2.hoon | 2 +- lib/talk.hoon | 4 +- lib/twitter.hoon | 2 +- lib/womb.hoon | 14 ++--- lib/write.hoon | 14 ++--- mar/atom.hoon | 2 +- mar/css.hoon | 2 +- mar/hoon.hoon | 2 +- mar/httr.hoon | 2 +- mar/js.hoon | 2 +- mar/json.hoon | 2 +- mar/md.hoon | 2 +- mar/plan.hoon | 2 +- mar/purl.hoon | 2 +- mar/quri.hoon | 2 +- mar/recoverable-error.hoon | 2 +- mar/txt-diff.hoon | 4 +- mar/txt.hoon | 4 +- ren/rss-xml.hoon | 2 +- ren/tree/head.hoon | 4 +- sur/lens.hoon | 4 +- sur/plan/acct.hoon | 2 +- sur/sole.hoon | 10 +-- sur/talk.hoon | 6 +- sys/vane/ames.hoon | 2 +- sys/vane/behn.hoon | 2 +- sys/vane/clay.hoon | 96 ++++++++++++++-------------- sys/vane/dill.hoon | 18 +++--- sys/vane/eyre.hoon | 28 ++++----- sys/vane/ford.hoon | 42 ++++++------- sys/vane/gall.hoon | 6 +- sys/vane/jael.hoon | 12 ++-- sys/zuse.hoon | 124 +++++++++++++++++-------------------- 49 files changed, 318 insertions(+), 328 deletions(-) diff --git a/app/ask.hoon b/app/ask.hoon index f08858fddf..8da13af72a 100644 --- a/app/ask.hoon +++ b/app/ask.hoon @@ -13,7 +13,7 @@ ++ email @t -- :: -=, ^gall +=, gall |_ $: bow/bowl adr/(map email {time invited}) sos/(map bone sole-share) diff --git a/app/dojo.hoon b/app/dojo.hoon index 9052b4aa2f..282f23e3b9 100644 --- a/app/dojo.hoon +++ b/app/dojo.hoon @@ -20,7 +20,7 @@ $: say/sole-share :: command-line state dir/beam :: active path poy/(unit dojo-project) :: working - {lib/(list hoof:^ford) sur/(list hoof:^ford)} :: lib+sur + {lib/(list hoof:ford) sur/(list hoof:ford)} :: lib+sur var/(map term cage) :: variable state old/(set term) :: used TLVs buf/tape :: multiline buffer @@ -37,7 +37,7 @@ $: $http :: http outbound p/?($post $put) q/(unit knot) - r/purl:^eyre + r/purl:eyre == {$poke p/goal} :: poke app {$show p/?($0 $1 $2 $3)} :: print val+span+twig @@ -48,7 +48,7 @@ q/dojo-build :: general build == :: ++ dojo-build :: one arvo step - $% {$ur p/(unit knot) q/purl:^eyre} :: http GET request + $% {$ur p/(unit knot) q/purl:eyre} :: http GET request {$ge p/dojo-model} :: generator {$dv p/path} :: core from source {$ex p/twig} :: hoon expression @@ -97,22 +97,22 @@ wire (unit knot) mark - {$hiss hiss:^eyre} + {$hiss hiss:eyre} == - {$exec wire @p (unit {beak silk:^ford})} :: + {$exec wire @p (unit {beak silk:ford})} :: {$deal wire sock term club} :: - {$info wire @p toro:^clay} :: + {$info wire @p toro:clay} :: == :: ++ move (pair bone card) :: user-level move ++ sign :: - $% {$made p/@uvH q/gage:^ford} :: - {$unto p/cuft:^gall} :: + $% {$made p/@uvH q/gage:ford} :: + {$unto p/cuft:gall} :: == :: -- :: :: :: :::: :: :: :: -=, ^gall +=, gall |_ $: hid/bowl :: system state house :: program state == :: @@ -235,7 +235,7 @@ :: ++ dp-iden-url %+ cook - |=({a/(unit knot) b/purl:^eyre} [`(fall a *knot) b]) + |=({a/(unit knot) b/purl:eyre} [`(fall a *knot) b]) auru:de-purl:html :: ++ dp-model ;~(plug dp-server dp-config) :: ++dojo-model @@ -278,13 +278,13 @@ ++ dy-abet +>(poy `+<) :: resolve ++ dy-amok +>(poy ~) :: terminate ++ dy-ford :: send work to ford - |= {way/wire kas/silk:^ford} + |= {way/wire kas/silk:ford} ^+ +>+> ?> ?=($~ pux) (he-card(poy `+>+<(pux `way)) %exec way our.hid `[he-beak kas]) :: ++ dy-eyre :: send work to eyre - |= {way/wire usr/(unit knot) req/hiss:^eyre} + |= {way/wire usr/(unit knot) req/hiss:eyre} ^+ +>+> ?> ?=($~ pux) (he-card(poy `+>+<(pux `way)) %hiss way usr %httr %hiss req) @@ -299,7 +299,7 @@ ++ dy-slam :: call by ford |= {way/wire gat/vase sam/vase} ^+ +>+> - (dy-ford way `silk:^ford`[%call [%$ %noun gat] [%$ %noun sam]]) + (dy-ford way `silk:ford`[%call [%$ %noun gat] [%$ %noun sam]]) :: ++ dy-errd :: reject change, abet |= {rev/(unit sole-edit) err/@u} @@ -462,10 +462,10 @@ $now ~|(%time-is-immutable !!) $our ~|(%self-is-immutable !!) $lib - .(lib ((dy-cast (list hoof:^ford) !>(*(list hoof:^ford))) q.cay)) + .(lib ((dy-cast (list hoof:ford) !>(*(list hoof:ford))) q.cay)) :: $sur - .(sur ((dy-cast (list hoof:^ford) !>(*(list hoof:^ford))) q.cay)) + .(sur ((dy-cast (list hoof:ford) !>(*(list hoof:ford))) q.cay)) :: $dir =+ ^= pax ^- path =+ pax=((dy-cast path !>(*path)) q.cay) @@ -507,7 +507,7 @@ $http ?> ?=($mime p.cay) =+ mim=;;(mime q.q.cay) - =+ maf=(~(add ja *math:^eyre) %content-type (en-mite:mimes:html p.mim)) + =+ maf=(~(add ja *math:eyre) %content-type (en-mite:mimes:html p.mim)) (dy-eyre /show q.p.mad [r.p.mad p.p.mad maf ~ q.mim]) :: $show @@ -528,7 +528,7 @@ ?+ p.cay [(sell q.cay)]~ $tang ;;(tang q.q.cay) $httr - =+ hit=;;(httr:^eyre q.q.cay) + =+ hit=;;(httr:eyre q.q.cay) =- (flop (turn `wall`- |=(a/tape leaf+(dash:us a '')))) :- "HTTP {}" %+ weld @@ -561,7 +561,7 @@ ++ dy-shown $? twig $^ {dy-shown dy-shown} - $% {$ur (unit knot) purl:^eyre} + $% {$ur (unit knot) purl:eyre} {$dv path} {$as mark dy-shown} {$do twig dy-shown} @@ -613,7 +613,7 @@ ++ dy-vase |=(num/@ud q:(dy-cage num)) :: known vase ++ dy-silk-vase |=(vax/vase [%$ %noun vax]) :: vase to silk ++ dy-silk-sources :: arglist to silk - |= src/(list dojo-source) ^- silk:^ford + |= src/(list dojo-source) ^- silk:ford %- dy-silk-vase |- ?~ src !>(~) @@ -621,7 +621,7 @@ :: ++ dy-silk-config :: configure |= {cay/cage cig/dojo-config} - ^- {wire silk:^ford} + ^- {wire silk:ford} ?. (~(nest ut [%cell [%atom %$ ~] %noun]) | p.q.cay) :: :: naked gate @@ -646,7 +646,7 @@ :+ %mute (dy-silk-vase (fall (slew 27 gat) !>(~))) %+ turn (~(tap by q.cig)) |= {a/term b/(unit dojo-source)} - ^- (pair wing silk:^ford) + ^- (pair wing silk:ford) :- [a ~] %- dy-silk-vase ?~(b !>([~ ~]) (dy-vase p.u.b)) @@ -701,7 +701,7 @@ :: $| => .(vax (slap vax !,(*twig ?>(?=($| -) .)))) :: XX working spec #72 - =+ typ={$| (unit knot) hiss:^eyre *} + =+ typ={$| (unit knot) hiss:eyre *} =+ [~ usr hiz ~]=((dy-cast typ !>(*typ)) vax) =. ..dy (he-diff %tan leaf+"< {(en-purl:html p.hiz)}" ~) (dy-eyre(pro `(slap (slot 15 vax) limb+%r)) /scar usr hiz) @@ -729,7 +729,7 @@ ?: ?=($ur -.bil) (dy-eyre /hand p.bil [q.bil %get ~ ~]) %- dy-ford - ^- (pair path silk:^ford) + ^- (pair path silk:ford) ?- -.bil $ge (dy-silk-config (dy-cage p.p.p.bil) q.p.bil) $dv [/hand [%core he-beak (flop p.bil)]] @@ -775,7 +775,7 @@ :: ++ dy-mare :: build expression |= gen/twig - ^- silk:^ford + ^- silk:ford =+ too=(dy-twig-mark gen) =- ?~(too - [%cast u.too -]) :+ %ride gen @@ -894,7 +894,7 @@ [& %$ (weld he-prow ?~(buf "> " "< "))] :: ++ he-made :: result from ford - |= {way/wire dep/@uvH reg/gage:^ford} + |= {way/wire dep/@uvH reg/gage:ford} ^+ +> ?> ?=(^ poy) =< he-pine @@ -914,7 +914,7 @@ == :: ++ he-sigh :: result from eyre - |= {way/wire hit/httr:^eyre} + |= {way/wire hit/httr:eyre} ^+ +> ?> ?=(^ poy) =< he-pine @@ -927,7 +927,7 @@ == :: ++ he-unto :: result from behn - |= {way/wire cit/cuft:^gall} + |= {way/wire cit/cuft:gall} ^+ +> ?. ?=($coup -.cit) ~& [%strange-unto cit] diff --git a/app/gh.hoon b/app/gh.hoon index 2a136cf3d8..e8d29ce6b8 100644 --- a/app/gh.hoon +++ b/app/gh.hoon @@ -48,7 +48,7 @@ -- =+ connector=(connector move sub-result) :: Set up connector library :: -=, ^gall +=, gall |_ $: hid/bowl hook/(map @t {id/@t listeners/(set bone)}) :: map events to listeners == diff --git a/app/github.hoon b/app/github.hoon index 8c5a28575d..ab53909a9c 100644 --- a/app/github.hoon +++ b/app/github.hoon @@ -12,7 +12,7 @@ {$gh-issue-comment issue-comment:gh} == -- -=, ^gall +=, gall |_ {hid/bowl *} ++ poke-path |= pax/path diff --git a/app/gmail.hoon b/app/gmail.hoon index 4e9874e032..1ce9a408fa 100644 --- a/app/gmail.hoon +++ b/app/gmail.hoon @@ -54,7 +54,7 @@ (star ;~(pose (cold '+' (just '-')) (cold '/' (just '_')) next)) -- :: -=, ^gall +=, gall |_ $: hid/bowl count/@ web-hooks/(map @t {id/@t listeners/(set bone)}) received-ids/(list @t) diff --git a/app/hood.hoon b/app/hood.hoon index a4a474d44f..c870bf705f 100644 --- a/app/hood.hoon +++ b/app/hood.hoon @@ -48,7 +48,7 @@ :: :: :: :::: :: :: :: :: :: -=, ^gall +=, gall |_ $: hid/bowl :: system state hood-1 :: server state == :: diff --git a/app/pipe.hoon b/app/pipe.hoon index bae345b42d..7a2d83cf48 100644 --- a/app/pipe.hoon +++ b/app/pipe.hoon @@ -8,7 +8,7 @@ == -- :: -=, ^gall +=, gall |_ {hid/bowl connections/(set {app/term source/path station/knot})} ++ poke-noun |= arg/* diff --git a/app/talk.hoon b/app/talk.hoon index 4531573cc3..296c9c4aba 100644 --- a/app/talk.hoon +++ b/app/talk.hoon @@ -80,7 +80,7 @@ == :: ++ card :: general card $% {$diff lime} :: - {$info wire @p @tas nori:^clay} :: + {$info wire @p @tas nori:clay} :: {$peer wire dock path} :: {$poke wire dock pear} :: {$pull wire dock $~} :: @@ -181,7 +181,7 @@ q.nb -- -- -=, ^gall +=, gall |_ {hid/bowl house} ++ ra :: per transaction |_ moves/(list move) @@ -1386,7 +1386,7 @@ =. +>.$ pa-abet:(~(pa-reform pa man pur) con) ?:(neu +>.$ ra-homes) :: - ++ ra-base-hart .^(hart:^eyre %e /(scot %p our.hid)/host/(scot %da now.hid)) + ++ ra-base-hart .^(hart:eyre %e /(scot %p our.hid)/host/(scot %da now.hid)) ++ ra-fora-post |= {pax/path sup/path hed/@t txt/@t} =. ..ra-emit diff --git a/app/twit.hoon b/app/twit.hoon index a24e589ff7..c521929197 100644 --- a/app/twit.hoon +++ b/app/twit.hoon @@ -7,7 +7,7 @@ :: :::: ~fyr :: -=, ^eyre +=, eyre =, html |% ++ twit-path :: valid peer path diff --git a/lib/basic-auth.hoon b/lib/basic-auth.hoon index acc5635e1c..16bd35ca7a 100644 --- a/lib/basic-auth.hoon +++ b/lib/basic-auth.hoon @@ -2,7 +2,7 @@ :: :::: /hoon/basic-auth/lib :: -=, ^eyre +=, eyre |% ++ keys @t -- diff --git a/lib/drum.hoon b/lib/drum.hoon index 261f6f1c18..098c2c7074 100644 --- a/lib/drum.hoon +++ b/lib/drum.hoon @@ -22,9 +22,9 @@ :: :: ++ drum-pith-2 :: $: sys/(unit bone) :: local console - eel/(set gill:^gall) :: connect to - ray/(set well:^gall) :: - fur/(map dude:^gall (unit server)) :: servers + eel/(set gill:gall) :: connect to + ray/(set well:gall) :: + fur/(map dude:gall (unit server)) :: servers bin/(map bone source) :: terminals == :: :: :: :: @@ -45,8 +45,8 @@ off/@ud :: window offset kil/kill :: kill buffer inx/@ud :: ring index - fug/(map gill:^gall (unit target)) :: connections - mir/(pair @ud stub:^dill) :: mirrored terminal + fug/(map gill:gall (unit target)) :: connections + mir/(pair @ud stub:dill) :: mirrored terminal == :: ++ history :: past input $: pos/@ud :: input position @@ -61,8 +61,8 @@ ++ target :: application target $: $= blt :: curr & prev belts %+ pair - (unit dill-belt:^dill) - (unit dill-belt:^dill) + (unit dill-belt:dill) + (unit dill-belt:dill) ris/(unit search) :: reverse-i-search hit/history :: all past input pom/sole-prompt :: static prompt @@ -75,8 +75,8 @@ |% ++ deft-apes :: default servers |= our/ship - %- ~(gas in *(set well:^gall)) - ^- (list well:^gall) + %- ~(gas in *(set well:gall)) + ^- (list well:gall) =+ myr=(clan:title our) ?: ?=($pawn myr) [[%base %talk] [%base %dojo] ~] @@ -86,8 +86,8 @@ :: ++ deft-fish :: default connects |= our/ship - %- ~(gas in *(set gill:^gall)) - ^- (list gill:^gall) + %- ~(gas in *(set gill:gall)) + ^- (list gill:gall) ?: ?=($earl (clan:title our)) [[(sein:title our) %talk] [our %dojo] ~] [[our %talk] [our %dojo] ~] @@ -105,18 +105,18 @@ == :: :: ++ drum-path :: encode path - |= gyl/gill:^gall + |= gyl/gill:gall ^- wire [%drum %phat (scot %p p.gyl) q.gyl ~] :: ++ drum-phat :: decode path - |= way/wire ^- gill:^gall + |= way/wire ^- gill:gall ?>(?=({@ @ $~} way) [(slav %p i.way) i.t.way]) -- :: :::: :: -|= {hid/bowl:^gall drum-part} :: main drum work +|= {hid/bowl:gall drum-part} :: main drum work =+ (fall (~(get by bin) ost.hid) *source) =* dev - => |% :: arvo structures @@ -125,7 +125,7 @@ {$talk-command command:talk} :: == :: ++ lime :: update - $% {$dill-blit dill-blit:^dill} :: + $% {$dill-blit dill-blit:dill} :: == :: ++ card :: general card $% {$conf wire dock $load ship term} :: @@ -136,7 +136,7 @@ == :: ++ move (pair bone card) :: user-level move -- -|_ {moz/(list move) biz/(list dill-blit:^dill)} +|_ {moz/(list move) biz/(list dill-blit:dill)} ++ diff-sole-effect-phat :: app event |= {way/wire fec/sole-effect} =< se-abet =< se-view @@ -152,28 +152,28 @@ (se-text "[{}, driving {}]") :: ++ poke-dill-belt :: terminal event - |= bet/dill-belt:^dill + |= bet/dill-belt:dill =< se-abet =< se-view (se-belt bet) :: ++ poke-start :: start app - |= wel/well:^gall + |= wel/well:gall =< se-abet =< se-view (se-born wel) :: ++ poke-link :: connect app - |= gyl/gill:^gall + |= gyl/gill:gall =< se-abet =< se-view (se-link gyl) :: ++ poke-unlink :: disconnect app - |= gyl/gill:^gall + |= gyl/gill:gall =< se-abet =< se-view (se-klin gyl) :: ++ poke-exit :: shutdown |= $~ - se-abet:(se-blit-sys `dill-blit:^dill`[%qit ~]) + se-abet:(se-blit-sys `dill-blit:dill`[%qit ~]) :: ++ poke-put :: write file |= {pax/path txt/@} @@ -198,11 +198,11 @@ >[%drum-coup-fail src.hid ost.hid gyl]< :: ++ take-onto :: ack start - |= {way/wire saw/(each suss:^gall tang)} + |= {way/wire saw/(each suss:gall tang)} =< se-abet =< se-view ?> ?=({@ @ $~} way) ?> (~(has by fur) i.t.way) - =/ wel/well:^gall [i.way i.t.way] + =/ wel/well:gall [i.way i.t.way] ?- saw {$| *} (se-dump p.saw) {$& *} ?> =(q.wel p.p.saw) @@ -240,7 +240,7 @@ ^+ . %+ roll (~(tap in ray)) =< .(con +>) - |= {wel/well:^gall con/_..se-adit} ^+ con + |= {wel/well:gall con/_..se-adit} ^+ con =. +>.$ con =+ hig=(~(get by fur) q.wel) ?: &(?=(^ hig) |(?=($~ u.hig) =(p.wel syd.u.u.hig))) +>.$ @@ -252,7 +252,7 @@ ^+ . %+ roll (~(tap in eel)) =< .(con +>) - |= {gil/gill:^gall con/_.} ^+ con + |= {gil/gill:gall con/_.} ^+ con =. +>.$ con ?: (~(has by fug) gil) +>.$ @@ -272,21 +272,21 @@ ^+ . %- ~(rep by fug) =< .(con +>) - |= {{gil/gill:^gall *} con/_.} ^+ con + |= {{gil/gill:gall *} con/_.} ^+ con =. +>.$ con ?: (~(has in eel) gil) +>.$ (se-nuke gil) :: ++ se-aint :: ignore result - |= gyl/gill:^gall + |= gyl/gill:gall ^- ? ?. (~(has by bin) ost.hid) & =+ gyr=(~(get by fug) gyl) |(?=($~ gyr) ?=($~ u.gyr)) :: ++ se-alas :: recalculate index - |= gyl/gill:^gall + |= gyl/gill:gall =+ [xin=0 wag=se-amor] |- ^+ +>.^$ ?~ wag +>.^$(inx 0) @@ -294,9 +294,9 @@ $(wag t.wag, xin +(xin)) :: ++ se-amor :: live targets - ^- (list gill:^gall) + ^- (list gill:gall) %+ skim (~(tap in eel)) - |=(a/gill:^gall ?=({$~ $~ *} (~(get by fug) a))) + |=(a/gill:gall ?=({$~ $~ *} (~(get by fug) a))) :: ++ se-anon :: rotate index =+ wag=se-amor @@ -305,13 +305,13 @@ +(inx (mod +(inx) (lent wag))) :: ++ se-agon :: current gill - ^- (unit gill:^gall) + ^- (unit gill:gall) =+ wag=se-amor ?~ wag ~ - `(snag inx `(list gill:^gall)`wag) + `(snag inx `(list gill:gall)`wag) :: ++ se-belt :: handle input - |= bet/dill-belt:^dill + |= bet/dill-belt:dill ^+ +> ?: ?=({?($cru $hey $rez $yow) *} bet) :: target-agnostic ?- bet @@ -326,7 +326,7 @@ ta-abet:(ta-belt:(se-tame u.gul) bet) :: ++ se-born :: new server - |= wel/well:^gall + |= wel/well:gall ^+ +> ?: (~(has in ray) wel) (se-text "[already running {}/{}]") @@ -336,7 +336,7 @@ == :: ++ se-drop :: disconnect - |= {pej/? gyl/gill:^gall} + |= {pej/? gyl/gill:gall} ^+ +> =+ lag=se-agon ?. (~(has by fug) gyl) +>.$ @@ -364,36 +364,36 @@ $(wol t.wol, +>.^$ (se-blit %out (tuba i.wol))) :: ++ se-join :: confirm connection - |= gyl/gill:^gall + |= gyl/gill:gall ^+ +> =. +> (se-text "[linked to {}]") ?> ?=($~ (~(got by fug) gyl)) (se-alas(fug (~(put by fug) gyl `*target)) gyl) :: ++ se-nuke :: teardown connection - |= gyl/gill:^gall + |= gyl/gill:gall ^+ +> (se-drop:(se-pull gyl) & gyl) :: ++ se-klin :: disconnect app - |= gyl/gill:^gall + |= gyl/gill:gall +>(eel (~(del in eel) gyl)) :: ++ se-link :: connect to app - |= gyl/gill:^gall + |= gyl/gill:gall +>(eel (~(put in eel) gyl)) :: ++ se-blit :: give output - |= bil/dill-blit:^dill + |= bil/dill-blit:dill +>(biz [bil biz]) :: ++ se-blit-sys :: output to system - |= bil/dill-blit:^dill ^+ +> + |= bil/dill-blit:dill ^+ +> ?~ sys ~&(%se-blit-no-sys +>) (se-emit [u.sys %diff %dill-blit bil]) :: ++ se-show :: show buffer, raw - |= lin/(pair @ud stub:^dill) + |= lin/(pair @ud stub:dill) ^+ +> ?: =(mir lin) +> =. +> ?:(=(p.mir p.lin) +> (se-blit %hop (add p.lin (lent-stye:klr q.lin)))) @@ -401,7 +401,7 @@ +>(mir lin) :: ++ se-just :: adjusted buffer - |= lin/(pair @ud stub:^dill) + |= lin/(pair @ud stub:dill) ^+ +> =. off ?:((lth p.lin edg) 0 (sub p.lin edg)) (se-show (sub p.lin off) (scag:klr edg (slag:klr off q.lin))) @@ -434,30 +434,30 @@ (se-blit %out (tuba txt)) :: ++ se-poke :: send a poke - |= {gyl/gill:^gall par/pear} + |= {gyl/gill:gall par/pear} (se-emit [ost.hid %poke (drum-path gyl) gyl par]) :: ++ se-peer :: send a peer - |= gyl/gill:^gall + |= gyl/gill:gall %- se-emit(fug (~(put by fug) gyl ~)) [ost.hid %peer (drum-path gyl) gyl /sole] :: ++ se-pull :: cancel subscription - |= gyl/gill:^gall + |= gyl/gill:gall (se-emit [ost.hid %pull (drum-path gyl) gyl ~]) :: ++ se-tame :: switch connection - |= gyl/gill:^gall + |= gyl/gill:gall ^+ ta ~(. ta gyl (need (~(got by fug) gyl))) :: ++ se-diff :: receive results - |= {gyl/gill:^gall fec/sole-effect} + |= {gyl/gill:gall fec/sole-effect} ^+ +> ta-abet:(ta-fec:(se-tame gyl) fec) :: ++ ta :: per target - |_ {gyl/gill:^gall target} :: app and state + |_ {gyl/gill:gall target} :: app and state ++ ta-abet :: resolve ^+ ..ta ..ta(fug (~(put by fug) gyl ``target`+<+)) @@ -491,7 +491,7 @@ .(..ta (se-blit %bel ~), q.blt ~) :: forget belt :: ++ ta-belt :: handle input - |= bet/dill-belt:^dill + |= bet/dill-belt:dill ^+ +> ?< ?=({?($cru $hey $rez $yow) *} bet) :: target-specific =. blt [q.blt `bet] :: remember belt @@ -826,10 +826,10 @@ (ta-hom (cat:edit pos.inp txt)) :: ++ ta-vew :: computed prompt - ^- (pair @ud stub:^dill) - =; vew/(pair (list @c) styx:^dill) + ^- (pair @ud stub:dill) + =; vew/(pair (list @c) styx:dill) =+ lin=(make:klr q.vew) - :_ (welp lin [*stye:^dill p.vew]~) + :_ (welp lin [*stye:dill p.vew]~) (add pos.inp (lent-char:klr lin)) ?: vis.pom :- buf.say.inp :: default prompt @@ -909,7 +909,7 @@ -- :: ++ klr :: styx/stub engine - =, ^dill + =, dill |% ++ make :: stub from styx |= a/styx ^- stub diff --git a/lib/helm.hoon b/lib/helm.hoon index bbc52527b1..0d1ccbc06e 100644 --- a/lib/helm.hoon +++ b/lib/helm.hoon @@ -11,7 +11,7 @@ |% :: :: ++ helm-part {$helm $0 helm-pith} :: helm state ++ helm-pith :: helm content - $: bur/(unit (pair ship mace:^ames)) :: requesting ticket + $: bur/(unit (pair ship mace:ames)) :: requesting ticket hoc/(map bone helm-session) :: consoles == :: ++ helm-session :: @@ -25,7 +25,7 @@ $: his/@p :: identity tic/@p :: ticket eny/@t :: entropy - ges/gens:^ames :: description + ges/gens:ames :: description == :: ++ hood-init :: report init $: him/ship :: @@ -40,13 +40,13 @@ :: :: :: :::: :: :: :: :: :: -|= {bowl:^gall helm-part} :: main helm work +|= {bowl:gall helm-part} :: main helm work =+ sez=(fall (~(get by hoc) ost) *helm-session) => |% :: arvo structures ++ card :: - $% {$cash wire p/@p q/buck:^ames} :: + $% {$cash wire p/@p q/buck:ames} :: {$conf wire dock $load ship term} :: - {$flog wire flog:^dill} :: + {$flog wire flog:dill} :: {$funk wire @p @p @} :: {$serv wire ?(desk beam)} :: {$poke wire dock pear} :: @@ -173,7 +173,7 @@ [%flog /reset %veer p way txt] :: ++ poke-wyll :: hear certificate - |= wil/(unit wyll:^ames) + |= wil/(unit wyll:ames) ?> ?=(^ bur) ?> ?=(^ wil) =< abet @@ -187,7 +187,7 @@ (emit %flog /helm %verb ~) :: ++ take-onto :: result of %conf - |= saw/(each suss:^gall tang) =< abet + |= saw/(each suss:gall tang) =< abet %- emit ?- -.saw $| [%flog ~ %crud %onto `tang`p.saw] diff --git a/lib/hep-to-cab.hoon b/lib/hep-to-cab.hoon index 4b6b3414c5..9937e589a2 100644 --- a/lib/hep-to-cab.hoon +++ b/lib/hep-to-cab.hoon @@ -19,7 +19,7 @@ ++ term |=(a/^term (gsub '-' '_' a)) :: single atom ++ path |=(a/^path (turn a term)) :: path elements ++ quay :: query string keys - |= a/quay:^eyre ^+ a + |= a/quay:eyre ^+ a %+ turn a |=({p/@t q/@t} [(term p) q]) -- diff --git a/lib/interpolate.hoon b/lib/interpolate.hoon index b258ed9399..b8d2ad606f 100644 --- a/lib/interpolate.hoon +++ b/lib/interpolate.hoon @@ -6,7 +6,7 @@ :: :::: ~fyr :: -=, ^eyre +=, eyre |% ++ parse-url |= a/$@(cord:purl purl) ^- purl diff --git a/lib/kiln.hoon b/lib/kiln.hoon index 32405b0d6a..4a67084cf1 100644 --- a/lib/kiln.hoon +++ b/lib/kiln.hoon @@ -5,7 +5,7 @@ :: :: :: :::: :: :: :: :: :: -=, ^clay +=, clay =, space:userlib =, format |% :: :: @@ -54,11 +54,11 @@ :: :: :: :::: :: :: :: :: :: -|= {bowl:^gall kiln-part} :: main kiln work +|= {bowl:gall kiln-part} :: main kiln work ?> =(src our) => |% :: arvo structures ++ card :: - $% {$exec wire @p $~ {beak silk:^ford}} :: + $% {$exec wire @p $~ {beak silk:ford}} :: {$drop wire @p @tas} :: {$info wire @p @tas nori} :: {$mont wire @tas @p @tas path} :: @@ -256,7 +256,7 @@ abet:abet:(mere:(take way) are) :: ++ take-made :: - |= {way/wire dep/@uvH reg/gage:^ford} + |= {way/wire dep/@uvH reg/gage:ford} abet:abet:(made:(take way) dep reg) :: ++ take-coup-fancy :: @@ -423,11 +423,11 @@ (ford-fail p.res) :: ++ gage-to-cages - |= gag/gage:^ford ^- (list (pair cage cage)) + |= gag/gage:ford ^- (list (pair cage cage)) (unwrap-tang (gage-to-tage gag)) :: ++ gage-to-tage - |= gag/gage:^ford + |= gag/gage:ford ^- (each (list (pair cage cage)) tang) ?. ?=($tabl -.gag) (mule |.(`$~`(ford-fail >%strange-gage< ~))) @@ -494,11 +494,11 @@ %- blab :_ ~ :* ost %exec /kiln/[syd] our ~ [our tic %da now] %tabl - ^- (list (pair silk:^ford silk:^ford)) + ^- (list (pair silk:ford silk:ford)) :: ~& > kiln-mashing+[p.are syd=syd +<.abet] %+ turn (~(tap in p.are)) |= pax/path - ^- (pair silk:^ford silk:^ford) + ^- (pair silk:ford silk:ford) :- [%$ %path -:!>(*path) pax] =+ base=[%file [our tic %da now] (flop pax)] =+ alis=[%file [her sud cas] (flop pax)] @@ -562,7 +562,7 @@ (welp (tape-to-tanks "\0a{c}{a}") >b< ~) :: ++ made - |= {dep/@uvH reg/gage:^ford} + |= {dep/@uvH reg/gage:ford} ^+ +> ?: ?=($| -.reg) =+ "failed to mash" diff --git a/lib/oauth1.hoon b/lib/oauth1.hoon index 1519a85633..97bae83e8c 100644 --- a/lib/oauth1.hoon +++ b/lib/oauth1.hoon @@ -4,7 +4,7 @@ :: /+ interpolate, hep-to-cab =, mimes:html -=, ^eyre +=, eyre |% ++ keys cord:{key/@t sec/@t} :: app key pair ++ token :: user keys diff --git a/lib/oauth2.hoon b/lib/oauth2.hoon index 594ad65ae3..8a640aeeff 100644 --- a/lib/oauth2.hoon +++ b/lib/oauth2.hoon @@ -3,7 +3,7 @@ :::: /hoon/oauth2/lib :: /+ hep-to-cab, interpolate -=, ^eyre +=, eyre =, mimes:html =, html |% diff --git a/lib/talk.hoon b/lib/talk.hoon index 33427fd079..f8e0aa5297 100644 --- a/lib/talk.hoon +++ b/lib/talk.hoon @@ -9,7 +9,7 @@ :::: :: [. ^talk] -|_ bol/bowl:^gall +|_ bol/bowl:gall ++ main :: main story |= our/ship ^- cord =+ can=(clan:title our) @@ -19,7 +19,7 @@ == :: ++ said-url :: app url - |= url/purl:^eyre + |= url/purl:eyre :^ ost.bol %poke /said-url :+ [our.bol %talk] %talk-command ^- command diff --git a/lib/twitter.hoon b/lib/twitter.hoon index 9e59efc74e..c0f9f01dd2 100644 --- a/lib/twitter.hoon +++ b/lib/twitter.hoon @@ -6,7 +6,7 @@ /- twitter /+ interpolate, hep-to-cab =+ sur-twit:^twitter :: XX -=, ^eyre +=, eyre =, mimes:html =, html =, format diff --git a/lib/womb.hoon b/lib/womb.hoon index 8b4c3fb309..65e6bcb5f0 100644 --- a/lib/womb.hoon +++ b/lib/womb.hoon @@ -5,7 +5,7 @@ /+ talk, old-phon =, wired =, title -=, womb:^jael +=, womb:jael :: :: :: :::: :: :: :: :: :: @@ -113,14 +113,14 @@ {$reinvite aut/passcode tid/passcode inv/invite-j}:: move to another == :: ++ card :: - $% {$flog wire flog:^dill} :: - {$info wire @p @tas nori:^clay} :: fs write (backup) + $% {$flog wire flog:dill} :: + {$info wire @p @tas nori:clay} :: fs write (backup) :: {$wait $~} :: delay acknowledgment {$diff gilt} :: subscription response {$poke wire dock pear} :: app RPC {$next wire p/ring} :: update private key {$tick wire p/@pG q/@p} :: save ticket - {$knew wire p/ship q/wyll:^ames} :: learn will (old pki) + {$knew wire p/ship q/wyll:ames} :: learn will (old pki) {$jaelwomb wire task:womb} :: manage rights == :: ++ pear :: @@ -140,7 +140,7 @@ ++ move (pair bone card) :: user-level move :: ++ transaction :: logged poke - $% {$report her/@p wyl/wyll:^ames} + $% {$report her/@p wyl/wyll:ames} {$claim aut/passcode her/@p} {$recycle who/mail him/knot tik/knot} {$bonus tid/cord pla/@ud sta/@ud} @@ -177,7 +177,7 @@ :: :: :: =+ cfg=[can-claim=& can-recycle=&] :: temporarily disabled =+ [replay=| stat-no-email=|] :: XX globals -|= {bowl:^gall part} :: main womb work +|= {bowl:gall part} :: main womb work |_ moz/(list move) ++ abet :: resolve ^- (quip move *part) @@ -400,7 +400,7 @@ ~& %rekey-stub . :: ++ poke-report :: report wyll - |= {her/@p wyl/wyll:^ames} :: + |= {her/@p wyl/wyll:ames} :: =< abet =. log-transaction (log-transaction %report +<) ?> =(src src) :: self-authenticated diff --git a/lib/write.hoon b/lib/write.hoon index c2f5d9c580..4732d6047d 100644 --- a/lib/write.hoon +++ b/lib/write.hoon @@ -16,14 +16,14 @@ :: |% ++ data $%({$json json} {$mime mime}) -++ card $% {$exec wire @p $~ {beak silk:^ford}} - {$info wire @p toro:^clay} +++ card $% {$exec wire @p $~ {beak silk:ford}} + {$info wire @p toro:clay} == -- :: :::: :: -|= {bowl:^gall part} +|= {bowl:gall part} =* par +<+ |_ moz/(list {bone card}) ++ abet [(flop moz) `part`par] @@ -53,8 +53,8 @@ |= dif/plan-diff ^+ abet ?. =(our src) ~|(foreign-write+[our=our src=src] !!) - =; sob/soba:^clay - ?~(sob abet abet:(emit %info write+~ our `toro:^clay`[q.byk %& sob])) + =; sob/soba:clay + ?~(sob abet abet:(emit %info write+~ our `toro:clay`[q.byk %& sob])) =+ pax=`path`/web/plan =+ paf=(en-beam beak-now (flop pax)) ?~ [fil:.^(arch %cy paf)] @@ -115,7 +115,7 @@ pax=/(scot %p our)/code/(scot %da now)/(scot %p our) :: ++ poke-sec-atom - |= {hot/host:^eyre dat/@} + |= {hot/host:eyre dat/@} ?> ?=($& -.hot) =. p.hot (scag 2 p.hot) :: ignore subdomain =. dat (scot %uw (en:crua:crypto ames-secret dat)) @@ -132,7 +132,7 @@ [our ~ beak-now %cast u.ext $+cay] :: ++ made - |= {pax/wire @ res/gage:^ford} ^+ abet + |= {pax/wire @ res/gage:ford} ^+ abet :: ?. =(our src) :: ~|(foreign-write/[our=our src=src] !!) ?+ -.res ~|(gage+-.res !!) diff --git a/mar/atom.hoon b/mar/atom.hoon index d3ed2377c5..aaa017b1b2 100644 --- a/mar/atom.hoon +++ b/mar/atom.hoon @@ -9,7 +9,7 @@ |_ ato/@ ++ grab |% ++ noun @ - ++ mime |=({* p/octs:^eyre} q.p) + ++ mime |=({* p/octs:eyre} q.p) -- ++ grow |% ++ mime [/application/x-urb-unknown (as-octs ato)] diff --git a/mar/css.hoon b/mar/css.hoon index 4ddf0e86e6..39e9bc9450 100644 --- a/mar/css.hoon +++ b/mar/css.hoon @@ -2,7 +2,7 @@ :::: /hoon/css/mar :: /? 310 -=, ^eyre +=, eyre =, mimes:html |_ mud/@t ++ grow :: convert to diff --git a/mar/hoon.hoon b/mar/hoon.hoon index d0eb10635a..ee5b8bad5f 100644 --- a/mar/hoon.hoon +++ b/mar/hoon.hoon @@ -3,7 +3,7 @@ :: /? 310 :: -=, ^eyre +=, eyre |_ own/@t :: ++ grow :: convert to diff --git a/mar/httr.hoon b/mar/httr.hoon index 4eb11b74c2..2a54a26a7f 100644 --- a/mar/httr.hoon +++ b/mar/httr.hoon @@ -3,7 +3,7 @@ :: /? 310 :: -=, ^eyre +=, eyre =, format =, html |_ hit/httr diff --git a/mar/js.hoon b/mar/js.hoon index 005df99784..1c997c7ada 100644 --- a/mar/js.hoon +++ b/mar/js.hoon @@ -3,7 +3,7 @@ :: /? 310 :: -=, ^eyre +=, eyre |_ mud/@ ++ grow |% diff --git a/mar/json.hoon b/mar/json.hoon index b7ac99bea5..cad1298af6 100644 --- a/mar/json.hoon +++ b/mar/json.hoon @@ -5,7 +5,7 @@ :: :::: compute :: -=, ^eyre +=, eyre =, format =, html |_ jon/json diff --git a/mar/md.hoon b/mar/md.hoon index 4def61c83a..1d704867b4 100644 --- a/mar/md.hoon +++ b/mar/md.hoon @@ -12,7 +12,7 @@ -- ++ grab |% - ++ mime |=({p/mite:^eyre q/octs:^eyre} q.q) + ++ mime |=({p/mite:eyre q/octs:eyre} q.q) ++ noun @t ++ txt of-wain:format -- diff --git a/mar/plan.hoon b/mar/plan.hoon index 9e2db09924..12c6950066 100644 --- a/mar/plan.hoon +++ b/mar/plan.hoon @@ -6,7 +6,7 @@ :: :::: ~fyr :: -=, ^eyre +=, eyre =, html =, format |_ all/{{who/@txname loc/@txloc} acc/(map knot plan-acct)} diff --git a/mar/purl.hoon b/mar/purl.hoon index b4e799a60e..72714c132d 100644 --- a/mar/purl.hoon +++ b/mar/purl.hoon @@ -2,7 +2,7 @@ :::: /hoon/purl/mar :: /? 310 -=, ^eyre +=, eyre |_ url/purl :: ++ grow |% ++ hiss [url %get ~ ~] diff --git a/mar/quri.hoon b/mar/quri.hoon index d8f0724781..ecd0b2768b 100644 --- a/mar/quri.hoon +++ b/mar/quri.hoon @@ -2,7 +2,7 @@ :::: /hoon/quri/mar :: /? 310 -=, ^eyre +=, eyre =, mimes:html =, html |_ url/quri diff --git a/mar/recoverable-error.hoon b/mar/recoverable-error.hoon index 44e8739883..b0ce871383 100644 --- a/mar/recoverable-error.hoon +++ b/mar/recoverable-error.hoon @@ -6,7 +6,7 @@ :: :::: ~fyr :: -=, ^eyre +=, eyre =, format =, html |_ recoverable-error diff --git a/mar/txt-diff.hoon b/mar/txt-diff.hoon index e82ed46905..e457594b04 100644 --- a/mar/txt-diff.hoon +++ b/mar/txt-diff.hoon @@ -2,10 +2,10 @@ :::: /hoon/txt-diff/mar :: /? 310 -|_ txt-diff/(urge:^clay cord) +|_ txt-diff/(urge:clay cord) :: ++ grab :: convert from |% - ++ noun (urge:^clay cord) :: make from %noun + ++ noun (urge:clay cord) :: make from %noun -- -- diff --git a/mar/txt.hoon b/mar/txt.hoon index 1fb9fbcead..e47a84e2d3 100644 --- a/mar/txt.hoon +++ b/mar/txt.hoon @@ -3,7 +3,7 @@ :: /? 310 :: -=, ^clay +=, clay =, differ =, format =, mimes:html @@ -11,7 +11,7 @@ :: ++ grab :: convert from |% - ++ mime |=({p/mite:^eyre q/octs:^eyre} (to-wain q.q)) + ++ mime |=({p/mite:eyre q/octs:eyre} (to-wain q.q)) ++ noun wain :: clam from %noun ++ json (corl to-wain so:dejs:format) -- diff --git a/ren/rss-xml.hoon b/ren/rss-xml.hoon index cbf1161f8e..48899b0306 100644 --- a/ren/rss-xml.hoon +++ b/ren/rss-xml.hoon @@ -12,7 +12,7 @@ :: ::~& [sum=sum kid=kid] :: Link from relative path -=, ^eyre +=, eyre =, html =+ hok=.^(hart %e /(scot %p our)/host/real) =+ ref=|=(a/path (en-purl hok `(weld tub a) ~)) diff --git a/ren/tree/head.hoon b/ren/tree/head.hoon index 2f87ce3e50..c45b03cb85 100644 --- a/ren/tree/head.hoon +++ b/ren/tree/head.hoon @@ -7,13 +7,13 @@ /= aut /$ %+ cork fuel:html :: after parsing params, =, title - |= gas/epic:^eyre ^- ? :: check that the fcgi + |= gas/epic:eyre ^- ? :: check that the fcgi %+ lien (~(tap in (~(get ju aut.ced.gas) %$))) :: has an identity |=(a/knot !=(%pawn (clan (slav %p a)))) :: which isn't a comet /= dbg /^ {nopack/? nomin/?} /$ %+ cork fuel:html :: after parsing params, - |= gas/epic:^eyre ^- {? ?} :: check if the query + |= gas/epic:eyre ^- {? ?} :: check if the query :- (~(has by qix.gas) 'dbg.nopack') :: dictates separate files (~(has by qix.gas) 'dbg.nomin') :: and/or unminified assets :: diff --git a/sur/lens.hoon b/sur/lens.hoon index e966b83cc2..6678c340df 100644 --- a/sur/lens.hoon +++ b/sur/lens.hoon @@ -7,7 +7,7 @@ $% {$data data/@} {$dojo command/@t} {$clay pax/@t} - {$url url/purl:^eyre} + {$url url/purl:eyre} {$api api/term command/@t} {$get-api api/term endpoint/(list @t)} {$as mar/mark next/source} :: can't be at the @@ -19,7 +19,7 @@ $% {$stdout $~} {$output-file pax/@t} {$output-clay pax/path} - {$url url/purl:^eyre} + {$url url/purl:eyre} {$to-api api/term command/@t} {$send-api api/term endpoint/(list @t)} {$command command/@t} diff --git a/sur/plan/acct.hoon b/sur/plan/acct.hoon index 857336f820..6c2e50278c 100644 --- a/sur/plan/acct.hoon +++ b/sur/plan/acct.hoon @@ -1 +1 @@ -{usr/knot url/(unit purf:^eyre)} +{usr/knot url/(unit purf:eyre)} diff --git a/sur/sole.hoon b/sur/sole.hoon index d4087f09d7..50692198e6 100644 --- a/sur/sole.hoon +++ b/sur/sole.hoon @@ -28,7 +28,7 @@ {$clr $~} :: clear screen {$det sole-change} :: edit command {$err p/@ud} :: error point - {$klr p/styx:^dill} :: styled text line + {$klr p/styx:dill} :: styled text line {$mor p/(list sole-effect)} :: multiple effects {$nex $~} :: save clear command {$pro sole-prompt} :: set prompt @@ -46,7 +46,7 @@ ++ sole-prompt :: prompt definition $: vis/? :: command visible tag/term :: history mode - cad/styx:^dill :: caption + cad/styx:dill :: caption == :: ++ sole-share :: symmetric state $: ven/sole-clock :: our vector clock @@ -76,8 +76,8 @@ %+ each (unit out) :: ~ is abort %^ trel :: fetch and continue (unit knot) - hiss:^eyre - $-(httr:^eyre (sole-request out)) + hiss:eyre + $-(httr:eyre (sole-request out)) :: :: ++ sole-gen :: XX virtual type @@ -105,7 +105,7 @@ :: :: ++ sole-at :: fetch url =| usr/knot :: - |* {pul/_purl:^eyre fun/$-(httr:^eyre *)} :: + |* {pul/_purl:eyre fun/$-(httr:eyre *)} :: :- p=*(list tank) :: q=[%| p=`usr q=[pul %get ~ ~] r=fun] :: :: :: diff --git a/sur/talk.hoon b/sur/talk.hoon index 51a331498c..6b1b4996f2 100644 --- a/sur/talk.hoon +++ b/sur/talk.hoon @@ -60,7 +60,7 @@ {$ext p/@tas q/*} :: extended action {$fat p/torso q/speech} :: attachment :: {$inv p/station} :: invite to station - {$url p/purf:^eyre} :: parsed url + {$url p/purf:eyre} :: parsed url {$ire p/serial q/speech} :: in-reply-to {$lin p/? q/@t} :: no/@ text line {$mor p/(list speech)} :: multiplex @@ -68,10 +68,10 @@ $: $api :: api message service/@tas :: service name id/@t :: id on the service - id-url/purf:^eyre :: link to id + id-url/purf:eyre :: link to id summary/@t :: summary of event body/@t :: body of event - url/purf:^eyre :: link to event + url/purf:eyre :: link to event meta/json :: other data for web == :: == :: diff --git a/sys/vane/ames.hoon b/sys/vane/ames.hoon index 882d33f94d..14e41e033b 100644 --- a/sys/vane/ames.hoon +++ b/sys/vane/ames.hoon @@ -6,7 +6,7 @@ :: :: :: :::: :::::: ames structures :: :: :: -=, ^ames +=, ames =, crypto |% :: ++ bait {p/skin q/@ud r/dove} :: fmt nrecvd spec diff --git a/sys/vane/behn.hoon b/sys/vane/behn.hoon index 1390bbae95..31999b6a6c 100644 --- a/sys/vane/behn.hoon +++ b/sys/vane/behn.hoon @@ -1,7 +1,7 @@ !: :: %behn, just a timer !? 164 :::: -=, ^behn +=, behn |= pit/vase => =~ |% diff --git a/sys/vane/clay.hoon b/sys/vane/clay.hoon index 7cd77340e1..48235fce2f 100644 --- a/sys/vane/clay.hoon +++ b/sys/vane/clay.hoon @@ -11,7 +11,7 @@ :: :::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::: |= pit/vase -=, ^clay +=, clay => |% ++ aeon @ud :: version number :: @@ -335,7 +335,7 @@ $% {$flog p/{$crud p/@tas q/(list tank)}} :: to %dill == == :: $: $f :: - $% {$exec p/@p q/(unit {beak silk:^ford})} :: + $% {$exec p/@p q/(unit {beak silk:ford})} :: == == :: $: $t :: $% {$wait p/@da} :: @@ -352,7 +352,7 @@ {$writ p/riot} :: == == :: $: $f :: - $% {$made p/@uvH q/gage:^ford} :: + $% {$made p/@uvH q/gage:ford} :: == == :: $: $t :: $% {$wake $~} :: timer activate @@ -477,7 +477,7 @@ :: ++gage-to-success-cages? :: ++ gage-to-cages - |= gag/gage:^ford + |= gag/gage:ford ^- (list (pair cage cage)) (unwrap-tang (gage-to-cages-or-error gag)) :: @@ -485,12 +485,12 @@ :: ++gage-to-cages? :: ++ gage-to-success-cages - |= gag/gage:^ford + |= gag/gage:ford ^- (list (pair cage cage)) ?. ?=($tabl -.gag) (ford-fail ?-(-.gag $| p.gag, $& [>%strange-gage p.p.gag<]~)) %+ murn p.gag - |= {key/gage:^ford val/gage:^ford} + |= {key/gage:ford val/gage:ford} ^- (unit {cage cage}) ?. ?=($& -.key) (ford-fail ?-(-.key $| p.key, $tabl [>%strange-gage<]~)) @@ -508,7 +508,7 @@ :: of cages. :: ++ gage-to-cages-or-error - |= gag/gage:^ford + |= gag/gage:ford ^- (each (list (pair cage cage)) tang) ?: ?=($| -.gag) (mule |.(`$~`(ford-fail p.gag))) ?. ?=($tabl -.gag) @@ -732,10 +732,10 @@ %- emit :* hen %pass [%ergoing (scot %p her) syd ~] %f %exec our ~ [her syd %da now] %tabl - ^- (list (pair silk:^ford silk:^ford)) + ^- (list (pair silk:ford silk:ford)) %+ turn `(list path)`mus |= a/path - ^- (pair silk:^ford silk:^ford) + ^- (pair silk:ford silk:ford) :- [%$ %path !>(a)] :+ %cast %mime =+ (need (need (read-x:ze let.dom a))) @@ -942,7 +942,7 @@ :~ :* hen %pass [%inserting (scot %p her) syd (scot %da wen) ~] %f %exec our ~ [her syd %da wen] %tabl - ^- (list (pair silk:^ford silk:^ford)) + ^- (list (pair silk:ford silk:ford)) %+ turn ins |= {pax/path mis/miso} ?> ?=($ins -.mis) @@ -953,7 +953,7 @@ :* hen %pass [%diffing (scot %p her) syd (scot %da wen) ~] %f %exec our ~ [her syd %da wen] %tabl - ^- (list (pair silk:^ford silk:^ford)) + ^- (list (pair silk:ford silk:ford)) %+ turn dif |= {pax/path mis/miso} ?> ?=($dif -.mis) @@ -965,7 +965,7 @@ :* hen %pass [%castifying (scot %p her) syd (scot %da wen) ~] %f %exec our ~ [her syd %da wen] %tabl - ^- (list (pair silk:^ford silk:^ford)) + ^- (list (pair silk:ford silk:ford)) %+ turn mut |= {pax/path mis/miso} ?> ?=($mut -.mis) @@ -1040,7 +1040,7 @@ :: diffs and mutations), then we go ahead and run ++apply-edit. :: ++ take-inserting - |= {wen/@da res/gage:^ford} + |= {wen/@da res/gage:ford} ^+ +> ?~ dok ~& %clay-take-inserting-unexpected-made +>.$ @@ -1068,7 +1068,7 @@ :: insertions and mutations), then we go ahead and run ++apply-edit. :: ++ take-diffing - |= {wen/@da res/gage:^ford} + |= {wen/@da res/gage:ford} ^+ +> ?~ dok ~& %clay-take-diffing-unexpected-made +>.$ @@ -1099,7 +1099,7 @@ :: this is handled in ++take-mutating. :: ++ take-castify - |= {wen/@da res/gage:^ford} + |= {wen/@da res/gage:ford} ^+ +> ?~ dok ~& %clay-take-castifying-unexpected-made +>.$ @@ -1120,7 +1120,7 @@ :* hen %pass [%mutating (scot %p her) syd (scot %da wen) ~] %f %exec our ~ [her syd %da wen] %tabl - ^- (list (pair silk:^ford silk:^ford)) + ^- (list (pair silk:ford silk:ford)) %+ turn cat |= {pax/path cay/cage} :- [%$ %path -:!>(*path) pax] @@ -1138,7 +1138,7 @@ :: ++apply-edit. :: ++ take-mutating - |= {wen/@da res/gage:^ford} + |= {wen/@da res/gage:ford} ^+ +> ?~ dok ~& %clay-take-mutating-unexpected-made +>.$ @@ -1217,10 +1217,10 @@ %- emit :* hen %pass [%patching (scot %p her) syd ~] %f %exec our :^ ~ [her syd %da now] %tabl - ^- (list (pair silk:^ford silk:^ford)) + ^- (list (pair silk:ford silk:ford)) %+ turn (~(tap by hat)) |= {a/path b/lobe} - ^- (pair silk:^ford silk:^ford) + ^- (pair silk:ford silk:ford) :- [%$ %path-hash !>([a b])] (lobe-to-silk:ze a b) == @@ -1236,7 +1236,7 @@ :: mim in dok). The result is handled in ++take-ergo. :: ++ take-patch - |= res/gage:^ford + |= res/gage:ford ^+ +> :: ~& %taking-patch ?: ?=($| -.res) @@ -1303,10 +1303,10 @@ %- emit(dok ~) :* hen %pass [%ergoing (scot %p her) syd ~] %f %exec our ~ [her syd %da now] %tabl - ^- (list (pair silk:^ford silk:^ford)) + ^- (list (pair silk:ford silk:ford)) %+ turn (~(tap in sum)) |= a/path - ^- (pair silk:^ford silk:^ford) + ^- (pair silk:ford silk:ford) :- [%$ %path !>(a)] =+ b=(~(got by can) a) ?: ?=($del -.b) @@ -1327,7 +1327,7 @@ :: an %ergo card) to keep unix up-to-date. Send this to unix. :: ++ take-ergo - |= res/gage:^ford + |= res/gage:ford ^+ +> ?: ?=($| -.res) (print-to-dill '!' %rose [" " "" ""] leaf+"clay ergo failed" p.res) @@ -1475,7 +1475,7 @@ :: ++ vale-page |= a/page - ^- silk:^ford + ^- silk:ford ?. ?=($hoon p.a) [%vale a] ?. ?=(@t q.a) [%dude |.(>%weird-hoon<) %ride [%fail ~] %$ *cage] [%$ p.a [%atom %t ~] q.a] @@ -1485,7 +1485,7 @@ :: This completes the receiving of %x foreign data. :: ++ take-foreign-x - |= {car/care cas/case pax/path res/gage:^ford} + |= {car/care cas/case pax/path res/gage:ford} ^+ +> ?> ?=(^ ref) ?. ?=($& -.res) @@ -1573,7 +1573,7 @@ :* hen %pass [%foreign-plops (scot %p our) (scot %p her) syd lum ~] %f %exec our ~ [her syd cas] %tabl - ^- (list (pair silk:^ford silk:^ford)) + ^- (list (pair silk:ford silk:ford)) %+ turn (~(tap in pop)) |= a/plop ?- -.a @@ -1587,7 +1587,7 @@ :: state. :: ++ take-foreign-plops - |= {lem/(unit @da) res/gage:^ford} + |= {lem/(unit @da) res/gage:ford} ^+ +> ?> ?=(^ ref) ?> ?=(^ nak.u.ref) @@ -1785,13 +1785,13 @@ :: ++ lobe-to-silk |= {pax/path lob/lobe} - ^- silk:^ford + ^- silk:ford =+ ^- hat/(map path lobe) ?: =(let.dom 0) ~ q:(aeon-to-yaki let.dom) =+ lol=`(unit lobe)`?.(=(~ ref) `0vsen.tinel (~(get by hat) pax)) - |- ^- silk:^ford + |- ^- silk:ford ?: =([~ lob] lol) =+ (need (need (read-x let.dom pax))) ?> ?=($& -<) @@ -2428,7 +2428,7 @@ :: we're in, and call the appropriate function for that stage. :: ++ route - |= {sat/term res/(each riot gage:^ford)} + |= {sat/term res/(each riot gage:ford)} ^+ +>.$ ?. =(sat wat.dat) ~| :* %hold-your-horses-merge-out-of-order @@ -2716,10 +2716,10 @@ =+ (cat 3 %diff- nam) [%merge (scot %p p.bob) q.bob (scot %p p.ali) q.ali - ~] %f %exec p.bob ~ [p.oth q.oth r.oth] %tabl - ^- (list (pair silk:^ford silk:^ford)) + ^- (list (pair silk:ford silk:ford)) %+ murn (~(tap by q.bas.dat)) |= {pax/path lob/lobe} - ^- (unit (pair silk:^ford silk:^ford)) + ^- (unit (pair silk:ford silk:ford)) =+ a=(~(get by q.yak) pax) ?~ a ~ @@ -2745,7 +2745,7 @@ :: call ++diff-bob. :: ++ diffed-ali - |= res/gage:^ford + |= res/gage:ford ^+ +> =+ tay=(gage-to-cages-or-error res) ?: ?=($| -.tay) @@ -2793,7 +2793,7 @@ :: call ++merge. :: ++ diffed-bob - |= res/gage:^ford + |= res/gage:ford ^+ +> =+ tay=(gage-to-cages-or-error res) ?: ?=($| -.tay) @@ -2844,10 +2844,10 @@ :* hen %pass [%merge (scot %p p.bob) q.bob (scot %p p.ali) q.ali %merge ~] %f %exec p.bob ~ [p.bob q.bob da+now] %tabl - ^- (list (pair silk:^ford silk:^ford)) + ^- (list (pair silk:ford silk:ford)) %+ turn (~(tap by (~(int by can.dal.dat) can.dob.dat))) |= {pax/path *} - ^- (pair silk:^ford silk:^ford) + ^- (pair silk:ford silk:ford) =+ cal=(~(got by can.dal.dat) pax) =+ cob=(~(got by can.dob.dat) pax) =+ ^= her @@ -2861,7 +2861,7 @@ :: Put merged changes in bof.dat and call ++build. :: ++ merged - |= res/gage:^ford + |= res/gage:ford =+ tay=(gage-to-cages-or-error res) ?: ?=($| -.tay) (error:he %merge-bad-made leaf+"merging failed" p.tay) @@ -2884,10 +2884,10 @@ :* hen %pass [%merge (scot %p p.bob) q.bob (scot %p p.ali) q.ali %build ~] %f %exec p.bob ~ [p.bob q.bob da+now] %tabl - ^- (list (pair silk:^ford silk:^ford)) + ^- (list (pair silk:ford silk:ford)) %+ murn (~(tap by bof.dat)) |= {pax/path cay/(unit cage)} - ^- (unit (pair silk:^ford silk:^ford)) + ^- (unit (pair silk:ford silk:ford)) ?~ cay ~ :- ~ @@ -2909,7 +2909,7 @@ :: Sum all the changes into a new commit (new.dat), and checkout. :: ++ built - |= res/gage:^ford + |= res/gage:ford ^+ +> =+ tay=(gage-to-cages-or-error res) ?: ?=($| -.tay) @@ -3031,10 +3031,10 @@ :* hen %pass [%merge (scot %p p.bob) q.bob (scot %p p.ali) q.ali %checkout ~] %f %exec p.bob ~ val %tabl - ^- (list (pair silk:^ford silk:^ford)) + ^- (list (pair silk:ford silk:ford)) %+ murn (~(tap by q.new.dat)) |= {pax/path lob/lobe} - ^- (unit (pair silk:^ford silk:^ford)) + ^- (unit (pair silk:ford silk:ford)) ?: (~(has by bop.dat) pax) ~ `[[%$ %path !>(pax)] (merge-lobe-to-silk:he pax lob)] @@ -3044,7 +3044,7 @@ :: some of the changes, call ++ergo. :: ++ checked-out - |= res/gage:^ford + |= res/gage:ford ^+ +> =+ tay=(gage-to-cages-or-error res) ?: ?=($| -.tay) @@ -3088,10 +3088,10 @@ :* hen %pass [%merge (scot %p p.bob) q.bob (scot %p p.ali) q.ali %ergo ~] %f %exec p.bob ~ val %tabl - ^- (list (pair silk:^ford silk:^ford)) + ^- (list (pair silk:ford silk:ford)) %+ turn (~(tap in sum)) |= a/path - ^- (pair silk:^ford silk:^ford) + ^- (pair silk:ford silk:ford) :- [%$ %path !>(a)] =+ b=(~(got by erg.dat) a) ?. b @@ -3103,7 +3103,7 @@ :: Tell unix about the changes made by the merge. :: ++ ergoed - |= res/gage:^ford + |= res/gage:ford ^+ +> =+ tay=(gage-to-cages-or-error res) ?: ?=($| -.tay) @@ -3163,7 +3163,7 @@ :: ++ merge-lobe-to-silk |= {pax/path lob/lobe} - ^- silk:^ford + ^- silk:ford =+ hat=q.ali.dat =+ hot=q.bob.dat =+ ^= lal @@ -3171,7 +3171,7 @@ |= had/dome (~(get by q:(tako-to-yaki (~(got by hit.had) let.had))) pax) =+ lol=(~(get by hot) pax) - |- ^- silk:^ford + |- ^- silk:ford ?: =([~ lob] lol) =+ (need (need (read-x let.dom pax))) ?> ?=($& -<) diff --git a/sys/vane/dill.hoon b/sys/vane/dill.hoon index 9ac25d29d8..90b7d76638 100644 --- a/sys/vane/dill.hoon +++ b/sys/vane/dill.hoon @@ -2,7 +2,7 @@ :: dill (4d), terminal handling :: |= pit/vase -=, ^dill +=, dill => |% :: interface tiles ++ gill (pair ship term) :: general contact -- :: @@ -46,8 +46,8 @@ {$sith p/@p q/@uw r/?} :: == :: ++ note-clay :: - $% {$merg p/@p q/@tas r/@p s/@tas t/case u/germ:^clay}:: merge desks - {$warp p/sock q/riff:^clay} :: wait for clay hack + $% {$merg p/@p q/@tas r/@p s/@tas t/case u/germ:clay}:: merge desks + {$warp p/sock q/riff:clay} :: wait for clay hack == :: ++ note-dill :: note to self, odd $% {$crud p/@tas q/(list tank)} :: @@ -61,7 +61,7 @@ == :: ++ note-gall :: $% {$conf dock $load ship desk} :: - {$deal p/sock q/cush:^gall} :: + {$deal p/sock q/cush:gall} :: == :: ++ note :: out request $-> $? {?($a $b $c $e $f $g) $wegh $~} :: @@ -77,14 +77,14 @@ ++ sign-clay :: $% {$mere p/(each (set path) (pair term tang))} :: {$note p/@tD q/tank} :: - {$writ p/riot:^clay} :: + {$writ p/riot:clay} :: == :: ++ sign-dill :: $% {$blit p/(list blit)} :: == :: ++ sign-gall :: - $% {$onto p/(each suss:^gall tang)} :: - {$unto p/cuft:^gall} :: + $% {$onto p/(each suss:gall tang)} :: + {$unto p/cuft:gall} :: == :: ++ sign :: in result $<- $? {?($a $b $c $e $f $g) $mass p/mass} :: @@ -119,7 +119,7 @@ (crud p.kyz q.kyz) $blew (send %rez p.p.kyz q.p.kyz) $heft heft - $tick =+ ^= ges ^- gens:^ames + $tick =+ ^= ges ^- gens:ames :- %en =+ can=(clan:title p.kyz) ?- can @@ -130,7 +130,7 @@ $pawn [%pawn ~] == =+ yen=(scot %p (shax :(mix %ticket eny now))) - =+ ^= beg ^- {his/@p tic/@p yen/@t ges/gens:^ames} + =+ ^= beg ^- {his/@p tic/@p yen/@t ges/gens:ames} [p.kyz q.kyz yen ges] =+ cmd=[%hood %poke `cage`[%helm-begin !>(beg)]] %= +>.$ diff --git a/sys/vane/eyre.hoon b/sys/vane/eyre.hoon index 2500e98ce3..5b633944df 100644 --- a/sys/vane/eyre.hoon +++ b/sys/vane/eyre.hoon @@ -2,7 +2,7 @@ !? 164 :::: |= pit/vase -=, ^eyre +=, eyre =, wired =, unity =, format @@ -29,29 +29,29 @@ {$mini-jael-task *} :: XX types == == :: $: $f :: to %ford - $% {$exec p/@p q/(unit {beak silk:^ford})} :: + $% {$exec p/@p q/(unit {beak silk:ford})} :: {$wasp p/@p q/@uvH r/?} :: == == :: $: $g :: to %gall - $% {$deal p/sock q/cush:^gall} :: full transmission + $% {$deal p/sock q/cush:gall} :: full transmission == == == :: ++ sign :: in result $<- $? $: $a :: by %ames $% {$woot p/ship q/path r/coop} :: acknowledgment - {$went ship cape:^ames} :: XX ignore + {$went ship cape:ames} :: XX ignore == == :: $: $b :: by %behn $% {$wake $~} :: timer activate == == :: $: $g :: by %gall - $% {$unto p/cuft:^gall} :: within agent + $% {$unto p/cuft:gall} :: within agent == == :: $: $e :: by self $% {$thou p/httr} :: response for proxy {$mini-jael-gift *} :: XX types == == :: $: $f :: by %ford - $% {$made p/@uvH q/gage:^ford} :: + $% {$made p/@uvH q/gage:ford} :: {$news p/@uvH} :: == == :: $: @tas :: by any @@ -950,7 +950,7 @@ :: $unto :: app response ?> ?=($%({$le $~} {$of @ ^}) tee) - =+ cuf=`cuft:^gall`+>.sih + =+ cuf=`cuft:gall`+>.sih ?- -.cuf ?($coup $reap) =/ ack ?~(p.cuf ~ `[-.cuf u.p.cuf]) @@ -1137,14 +1137,14 @@ =- -(hen hen.+) (pass-note(hen `~) on+~ %f [%wasp our a &]) :: - ++ ford-req |=({bek/beak kas/silk:^ford} [%f [%exec our `[bek kas]]]) + ++ ford-req |=({bek/beak kas/silk:ford} [%f [%exec our `[bek kas]]]) ++ exec-live - |= {tea/whir req/{beak silk:^ford}} + |= {tea/whir req/{beak silk:ford}} =. lyv (~(put by lyv) hen [%exec tea]) (execute tea req) :: ++ execute - |= {tea/whir bek/beak sil/silk:^ford} + |= {tea/whir bek/beak sil/silk:ford} %+ pass-note tea :^ %f %exec our `[bek [%dude |.(leaf+"eyre: execute {}") sil]] @@ -1288,7 +1288,7 @@ =. -.bem (norm-beak -.bem) =+ req=[%bake mar arg bem] =+ red=[%bake %red-quri arg bem] - (exec-live wir -.bem `silk:^ford`[%alts ~[req red]]) + (exec-live wir -.bem `silk:ford`[%alts ~[req red]]) :: :: ++ is-anon =([~ ''] (~(get by (molt quy)) 'anon')) @@ -1890,7 +1890,7 @@ ++ self . ++ abet +>(sec (~(put by sec) +<- +<+)) ++ execute - |=({a/whir-se b/{beak silk:^ford}} (execute:abet se+[a usr dom] b)) + |=({a/whir-se b/{beak silk:ford}} (execute:abet se+[a usr dom] b)) ++ dead-this |=(a/tang (fail:abet 500 0v0 a)) ++ dead-hiss |=(a/tang pump(req ~(nap to req), ..vi (give-sigh %| a))) ++ eyre-them |=({a/whir-se b/vase} (eyre-them:abet se+[a usr dom] b)) @@ -1907,7 +1907,7 @@ ++ build %^ execute %core root-beak :::+ %dude [|.(+)]:>%mod-samp< - ^- silk:^ford + ^- silk:ford :^ %mute core+[root-beak (flop %_(dom . sec+dom))] [[%& 12]~ %$ bale+!>(*(bale @))] :: XX specify on type? ?~ cor ~ @@ -1922,7 +1922,7 @@ %^ execute arm root-beak call+[ride+[limb+arm prep-cor] [%$ sam]] :: - ++ prep-cor ^- silk:^ford + ++ prep-cor ^- silk:ford ?~ cor ~|(%no-core !!) ?~ u.cor ~|(%nil-driver !!) :+ %$ %core diff --git a/sys/vane/ford.hoon b/sys/vane/ford.hoon index 26aa88978a..8125e4ebfd 100644 --- a/sys/vane/ford.hoon +++ b/sys/vane/ford.hoon @@ -3,7 +3,7 @@ !? 164 :::: |= pit/vase -=, ^ford +=, ford =, format => =~ :: structures @@ -12,23 +12,23 @@ ++ move {p/duct q/(wind note gift:able)} :: local move ++ note :: out request $-> $% $: $c :: to %clay - $% {$warp p/sock q/riff:^clay} :: + $% {$warp p/sock q/riff:clay} :: == == :: $: $f :: to %ford - $% {$exec p/@p q/(unit bilk:^ford)} :: + $% {$exec p/@p q/(unit bilk:ford)} :: == == :: $: $g :: to %gall - $% {$deal p/sock q/cush:^gall} :: + $% {$deal p/sock q/cush:gall} :: == == == :: ++ sign :: in result $<- $% $: $c :: by %clay - $% {$writ p/riot:^clay} :: + $% {$writ p/riot:clay} :: == == :: $: $f :: by %ford - $% {$made p/@uvH q/gage:^ford} :: + $% {$made p/@uvH q/gage:ford} :: == == :: $: $g :: by %gall - $% {$unto p/cuft:^gall} :: + $% {$unto p/cuft:gall} :: == == == :: -- :: |% :: structures @@ -47,7 +47,7 @@ $: p/cafe :: cache $= q :: $% {$0 p/(set beam) q/a} :: depends+product - {$1 p/(set {van/vane ren/care:^clay bem/beam tan/tang})} :: blocks + {$1 p/(set {van/vane ren/care:clay bem/beam tan/tang})} :: blocks {$2 p/(set beam) q/tang} :: depends+error == :: == :: @@ -85,7 +85,7 @@ $: nah/duct :: cause {bek/beak kas/silk} :: problem keg/(map (pair term beam) cage) :: block results - kig/(set (trel vane care:^clay beam)) :: blocks + kig/(set (trel vane care:clay beam)) :: blocks == :: ++ gagl (list (pair gage gage)) :: ++ vane ?($a $b $c $d $e $f $g) :: @@ -203,7 +203,7 @@ ~(exec zo [num `task`[hen kub ~ ~]]) :: ++ axon :: take - |= {num/@ud {van/vane ren/care:^clay bem/beam} sih/sign} + |= {num/@ud {van/vane ren/care:clay bem/beam} sih/sign} ^+ +> ?: ?=({$unto $quit *} +.sih) +>.$ @@ -302,18 +302,18 @@ $(kiz t.kiz, mow :_(mow [hen (cancel i.kiz)])) :: ++ cancel :: stop a request - |= {van/vane ren/care:^clay bem/beam} + |= {van/vane ren/care:clay bem/beam} ^- (wind note gift:able) ?+ van ~|(stub-cancel+van !!) $c [%pass (camp-wire +<) van [%warp [our p.bem] q.bem ~]] $g [%pass (camp-wire +<) van [%deal [our p.bem] q.bem [%pull ~]]] == ++ camp-wire :: encode block - |= {van/vane ren/care:^clay bem/beam} ^- wire + |= {van/vane ren/care:clay bem/beam} ^- wire [(scot %p our) (scot %ud num) van ren (en-beam bem)] :: ++ camp :: request a file - |= {van/vane ren/care:^clay bem/beam} + |= {van/vane ren/care:clay bem/beam} ^+ +> ~& >> [%camping van ren bem] %_ +>.$ @@ -439,17 +439,17 @@ ^= p %- silt %+ turn p.faw - |=(a/{vane care:^clay beam} [-.a +<.a +>.a *tang]) + |=(a/{vane care:clay beam} [-.a +<.a +>.a *tang]) $| [%2 p=*(set beam) q=p.faw] == ^= faw - |- ^- (each (list (trel vane care:^clay beam)) tang) + |- ^- (each (list (trel vane care:clay beam)) tang) ?~ p.ton [%& ~] =+ nex=$(p.ton t.p.ton) =+ err=|=(a/tape [%| leaf+a ?:(?=($& -.nex) ~ p.nex)]) =+ pax=(path i.p.ton) ?~ pax (err "blocking empty") - =+ ren=((soft care:^clay) (rsh 3 1 i.pax)) + =+ ren=((soft care:clay) (rsh 3 1 i.pax)) ?~ ren (err "blocking not care: {}") =+ zis=(de-beam t.pax) @@ -1758,7 +1758,7 @@ -- :: ++ pact-hoon :: .hoon special case - |= {a/@t b/(urge:^clay cord)} ^- @t + |= {a/@t b/(urge:clay cord)} ^- @t ~| %lurk-hoon =, format =, differ (of-wain (lurk (to-wain a) b)) @@ -1803,7 +1803,7 @@ == :: ++ resp - |= {{van/vane ren/care:^clay bem/beam} rot/riot:^clay} + |= {{van/vane ren/care:clay bem/beam} rot/riot:clay} ^+ ..zo ?> ?=($c van) =. kig (~(del in kig) +<-.$) @@ -1814,7 +1814,7 @@ exec(keg (~(put by keg) [- bem] r.u.rot)) :: ++ resd :: take %diff - |= {{van/vane ren/care:^clay bem/beam} cag/cage} + |= {{van/vane ren/care:clay bem/beam} cag/cage} ^+ ..zo ?> ?=($g van) ?: |(!?=($x ren) =(-.s.bem p.cag)) @@ -1829,7 +1829,7 @@ ..zo :: ++ resm :: take %made - |= {{van/vane ren/care:^clay bem/beam} dep/@uvH gag/gage} + |= {{van/vane ren/care:clay bem/beam} dep/@uvH gag/gage} ^+ ..zo ?> ?=($g van) =. kig (~(del in kig) +<-.$) @@ -1964,7 +1964,7 @@ ?> ?=({@ @ ^} t.t.tea) =+ :* num=(slav %ud i.t.tea) van=((hard vane) i.t.t.tea) - ren=((hard care:^clay) i.t.t.t.tea) + ren=((hard care:clay) i.t.t.t.tea) bem=(need (de-beam t.t.t.t.tea)) == abet:(~(axon za [our hen [now eny ski] ~] bay) num [van ren bem] q.hin) diff --git a/sys/vane/gall.hoon b/sys/vane/gall.hoon index 89df104fd5..8ffd71bb4f 100644 --- a/sys/vane/gall.hoon +++ b/sys/vane/gall.hoon @@ -3,7 +3,7 @@ :::: |= pit/vase => =~ -=, ^gall +=, gall |% :::::::::::::::::::::::::::::::::::::::::::::::::::::: rest of arvo :::::::::::::::::::::::::::::::::::::::::::::::::::::: ++ volt ?($low $high) :: voltage @@ -139,7 +139,7 @@ (~(nest ut p.u.bol) %| -:!>(*bowl)) :: ++ mo-boom :: complete new boot - |= {dap/dude byk/beak dep/@uvH gux/gage:^ford} + |= {dap/dude byk/beak dep/@uvH gux/gage:ford} ^+ +> ?- -.gux $tabl ~|(%made-tabl !!) @@ -179,7 +179,7 @@ == :: ++ mo-boon :: complete old boot - |= {dap/dude byk/beak dep/@uvH gux/gage:^ford} + |= {dap/dude byk/beak dep/@uvH gux/gage:ford} ^+ +> =+ sut=(~(get by bum) dap) ?~ sut diff --git a/sys/vane/jael.hoon b/sys/vane/jael.hoon index 39c1fc6be2..8840028392 100644 --- a/sys/vane/jael.hoon +++ b/sys/vane/jael.hoon @@ -16,12 +16,12 @@ :: - task for converting invites to tickets :: |= pit/vase -=, pki:^jael -=, rights:^jael -=, able:^jael +=, pki:jael +=, rights:jael +=, able:jael =, title =, crypto -=* womb womb:^jael +=* womb womb:jael =, jael :: :::: :::: # models :: data structures @@ -813,7 +813,7 @@ |=((map @ta @) (~(run by +<) |=(@ (mug +<)))) :: $urban - [%urban (~(run by p.rys) |=({@da code:^ames} [+<- (mug +<+)]))] + [%urban (~(run by p.rys) |=({@da code:ames} [+<- (mug +<+)]))] == :: :: ++remove:up ++ remove :: pig minus gob @@ -1900,7 +1900,7 @@ ++ grow-lick :: check signature |= {pub/pass ash/@ val/@} ^- ? - =+ ver=(sure:as:(com:nu:crub pub) *code:^ames val) + =+ ver=(sure:as:(com:nu:crub pub) *code:ames val) ?~ ver | =(ash u.ver) :: :: grow-like/ex:ur diff --git a/sys/zuse.hoon b/sys/zuse.hoon index 32e8622cca..481d8fde1e 100644 --- a/sys/zuse.hoon +++ b/sys/zuse.hoon @@ -39,12 +39,12 @@ :: ++ ames ^? :: :::: - :::: ++^ames :: (1a) network + :::: ++ames :: (1a) network :: :::: |% ++ able ^? :: :: - :::: ++able:^behn :: (1a1) arvo moves + :::: ++able:behn :: (1a1) arvo moves :: :::: |% ++ card :: out cards @@ -256,12 +256,12 @@ :: ++ behn ^? :: :::: - :::: ++^behn :: (1b) timekeeping + :::: ++behn :: (1b) timekeeping :: :::: |% ++ able ^? :: :: - :::: ++able:^behn :: (1b1) arvo moves + :::: ++able:behn :: (1b1) arvo moves :: :::: |% ++ gift :: out result <-$ @@ -279,12 +279,12 @@ :: ++ clay ^? :: :::: - :::: ++^clay :: (1c) version control + :::: ++clay :: (1c) version control :: :::: |% ++ able ^? :: :: - :::: ++able:^dill :: (1c1) arvo moves + :::: ++able:dill :: (1c1) arvo moves :: :::: |% ++ gift :: out result <-$ @@ -419,12 +419,12 @@ :: ++ dill ^? :: :::: - :::: ++^dill :: (1d) console + :::: ++dill :: (1d) console :: :::: |% ++ able ^? :: :: - :::: ++able:^dill :: (1d1) arvo moves + :::: ++able:dill :: (1d1) arvo moves :: :::: |% ++ gift :: out result <-$ @@ -533,12 +533,12 @@ :: ++ eyre ^? :: :::: - :::: ++^eyre :: (1e) oldweb + :::: ++eyre :: (1e) oldweb :: :::: |% ++ able ^? :: :: - :::: ++able:^eyre :: (1e1) arvo moves + :::: ++able:eyre :: (1e1) arvo moves :: :::: |% ++ gift :: out result <-$ @@ -663,12 +663,12 @@ :: ++ ford ^? :: :::: - :::: ++^ford :: (1f) build + :::: ++ford :: (1f) build :: :::: |% ++ able ^? :: :: - :::: ++able:^ford :: (1f1) arvo moves + :::: ++able:ford :: (1f1) arvo moves :: :::: |% ++ gift :: out result <-$ @@ -750,12 +750,12 @@ :: ++ gall ^? :: :::: - :::: ++^gall :: (1g) applications + :::: ++gall :: (1g) applications :: :::: |% ++ able ^? :: :: - :::: ++able:^gall :: (1g1) arvo moves + :::: ++able:gall :: (1g1) arvo moves :: :::: |% ++ gift :: outgoing result @@ -822,12 +822,12 @@ :: ++ jael ^? :: :::: - :::: ++^jael :: (1h) security + :::: ++jael :: (1h) security :: :::: |% ++ able ^? :: :: - :::: ++able:^jael :: (1h1) arvo moves + :::: ++able:jael :: (1h1) arvo moves :: :::: =, pki =, rights @@ -959,7 +959,7 @@ == -- :: :: - :::: ++pki:^jael :: (1h2) certificates + :::: ++pki:jael :: (1h2) certificates :: :::: ++ pki ^? |% @@ -1006,7 +1006,7 @@ ++ will (map life cert) :: meta-certificate -- :: pki :: :: - :::: ++rights:^jael :: (1h3) claims + :::: ++rights:jael :: (1h3) claims :: :::: ++ rights ^? =, pki @@ -1068,12 +1068,12 @@ :: ++ xmas ^? :: :::: - :::: ++^xmas :: (1i) networking + :::: ++xmas :: (1i) networking :: :::: |% ++ able ^? :: :: - :::: ++able:^xmas :: (1i1) arvo moves + :::: ++able:xmas :: (1i1) arvo moves :: :::: |% ++ gift :: @@ -1369,7 +1369,7 @@ :::: ++crypto :: (2a2) cryptography :: :::: ++ crypto ^? - =, ^ames + =, ames =, number |% :: :: ++aes:crypto @@ -3284,7 +3284,7 @@ :::: ++differ :: (2d) hunt-mcilroy :: :::: ++ differ ^? - =, ^clay + =, clay =, format |% :: :: ++berk:differ @@ -3442,7 +3442,7 @@ :::: ++html :: (2e) text encodings :: :::: ++ html ^? - =, ^eyre + =, eyre |% :: :: :::: ++mimes:html :: (2e1) MIME @@ -4133,7 +4133,7 @@ name :: :: ++clan:title ++ clan :: ship to rank - |= who/ship ^- rank:^ames + |= who/ship ^- rank:ames =+ wid=(met 3 who) ?: (lte wid 1) %czar ?: =(2 wid) %king @@ -4154,7 +4154,7 @@ (rap 3 yow ' ' woy ~) :: :: ++gnow:title ++ gnow :: full display name - |= {who/@p gos/gcos:^ames} ^- @t + |= {who/@p gos/gcos:ames} ^- @t ?- -.gos $czar (rap 3 '|' (rap 3 (glam who)) '|' ~) $king (rap 3 '_' p.gos '_' ~) @@ -4168,7 +4168,7 @@ $punk ~['"' q.p.gos '"'] ?($lord $lady) =+ ^= nad - =+ nam=`name:^ames`s.p.p.gos + =+ nam=`name:ames`s.p.p.gos %+ rap 3 :~ p.nam ?~(q.nam 0 (cat 3 ' ' u.q.nam)) @@ -4383,7 +4383,7 @@ :::: ++space:userlib :: (2uC) file utils :: :::: ++ space ^? - =, ^clay + =, clay |% :: :: ++feel:space:userlib ++ feel :: simple file write @@ -4505,7 +4505,7 @@ :::: ++pubsub:userlib :: (2uG) application :: :::: ++ pubsub ^? - =, ^gall + =, gall |% :: :: ++pale:pubsub: ++ pale :: filter peers @@ -4524,52 +4524,42 @@ :: ++ zuse %309 :: hoon+zuse kelvin ++ gift-arvo :: out result <-$ - $? gift:able:^ames - gift:able:^behn - gift:able:^clay - gift:able:^dill - gift:able:^eyre - gift:able:^ford - gift:able:^gall + $? gift:able:ames + gift:able:behn + gift:able:clay + gift:able:dill + gift:able:eyre + gift:able:ford + gift:able:gall == ++ task-arvo :: in request ->$ - $? task:able:^ames - task:able:^clay - task:able:^behn - task:able:^dill - task:able:^eyre - task:able:^ford - task:able:^gall + $? task:able:ames + task:able:clay + task:able:behn + task:able:dill + task:able:eyre + task:able:ford + task:able:gall == ++ note-arvo :: out request $-> $? {@tas $meta vase} - $% {$a task:able:^ames} - {$b task:able:^behn} - {$c task:able:^clay} - {$d task:able:^dill} - {$e task:able:^eyre} - {$f task:able:^ford} - {$g task:able:^gall} + $% {$a task:able:ames} + {$b task:able:behn} + {$c task:able:clay} + {$d task:able:dill} + {$e task:able:eyre} + {$f task:able:ford} + {$g task:able:gall} == == ++ sign-arvo :: in result $<- - $% {$a gift:able:^ames} - {$b gift:able:^behn} - {$c gift:able:^clay} - {$d gift:able:^dill} - {$e gift:able:^eyre} - {$f gift:able:^ford} - {$g gift:able:^gall} - {$j gift:able:^jael} + $% {$a gift:able:ames} + {$b gift:able:behn} + {$c gift:able:clay} + {$d gift:able:dill} + {$e gift:able:eyre} + {$f gift:able:ford} + {$g gift:able:gall} + {$j gift:able:jael} == :: -:: -:: XX transitional alias layer -++ ames [crypto=crua=[en=en de=de]:crua:crypto] :: hardcoded vere interface -++ behn !! -++ clay !! -++ dill !! -++ eyre !! -++ ford !! -++ gall !! -++ jael !! -- ::