From 0231d41cb6073a3f13c311b1ef927b8b081b4349 Mon Sep 17 00:00:00 2001 From: "C. Guy Yarvin" Date: Mon, 25 Jan 2016 16:47:58 -0800 Subject: [PATCH] .^ fully transitioned. --- ape/talk.hoon | 4 ++-- arvo/hoon.hoon | 18 +++++++----------- arvo/zuse.hoon | 8 ++++---- gen/solid.hoon | 4 +++- gen/ticket.hoon | 2 +- lib/helm.hoon | 6 +++--- lib/kiln.hoon | 8 ++++---- 7 files changed, 24 insertions(+), 26 deletions(-) diff --git a/ape/talk.hoon b/ape/talk.hoon index 8c466d8b5c..1be35cb659 100644 --- a/ape/talk.hoon +++ b/ape/talk.hoon @@ -2160,8 +2160,8 @@ ++ poke-load |= man/knot =+ ^= grams - %- (hard (list telegram)) - .^ %cx + .^ (list telegram) + %cx /(scot %p our.hid)/home/(scot %da now.hid)/talk/[man]/talk-telegrams == =+ toy=(~(got by stories) man) diff --git a/arvo/hoon.hoon b/arvo/hoon.hoon index 88de538801..c592063bcf 100644 --- a/arvo/hoon.hoon +++ b/arvo/hoon.hoon @@ -244,8 +244,7 @@ {$cnsg p/wing q/twig r/(list twig)} :: new cnsg {$cnts p/wing q/(list (pair wing twig))} :: eval. p w+ q changes :: :::::: nock - {$dtkt p/twig} :: nock 11 data skyhook - {$dthx p/twig q/twig} :: nock 12 data skyhook + {$dtkt p/twig q/twig} :: nock 12 data skyhook {$dtls p/twig} :: nock 4 increment {$dttr p/twig q/twig} :: nock p w+ formula q {$dtts p/twig q/twig} :: nock 5 equality test @@ -6499,7 +6498,7 @@ :: ++ reck :: parse hoon file |= bon/path - (rain bon ((hard @t) .^(%cx (weld bon `path`[%hoon ~])))) + (rain bon .^(@t %cx (weld bon `path`[%hoon ~]))) :: ++ seem |=(toy/typo `span`toy) :: promote typo ++ seer |=(vix/vise `vase`vix) :: promote vise @@ -8530,8 +8529,7 @@ {$brcn *} (grow %gold [%$ 1] p.gen) :: {$cnts *} (~(mint et p.gen q.gen) gol) - {$dtkt *} [(nice %noun) [%11 q:$(gen p.gen, gol %noun)]] - {$dthx *} + {$dtkt *} =+ nef=$(gen [%cnbc p.gen]) [p.nef [%12 [%1 p.nef] q:$(gen q.gen, gol %noun)]] :: @@ -8681,8 +8679,7 @@ :: {$brcn *} (grow %gold [%$ 1] p.gen) {$cnts *} (~(mull et p.gen q.gen) gol dox) - {$dtkt *} =+($(gen p.gen, gol %noun) (beth %noun)) - {$dthx *} =+($(gen q.gen, gol %noun) $(gen [%cnbc p.gen])) + {$dtkt *} =+($(gen q.gen, gol %noun) $(gen [%cnbc p.gen])) {$dtls *} =+($(gen p.gen, gol [%atom %$ ~]) (beth [%atom %$ ~])) {$sand *} (beth (play gen)) {$rock *} (beth (play gen)) @@ -8975,8 +8972,7 @@ {^ *} (cell $(gen p.gen) $(gen q.gen)) {$brcn *} (core sut %gold sut [[%0 0] p.gen]) {$cnts *} ~(play et p.gen q.gen) - {$dtkt *} %noun - {$dthx *} $(gen [%cnbc p.gen]) + {$dtkt *} $(gen [%cnbc p.gen]) {$dtls *} [%atom %$ ~] {$rock *} |- ^- span ?@ q.gen [%atom p.gen `q.gen] @@ -9762,8 +9758,8 @@ ['*' (rune tar %dttr expb)] ['=' (rune tis %dtts expb)] ['?' (rune wut %dtwt expa)] - ['^' (rune ket %dtkt expn)] - ['#' (rune hax %dthx expx)] + ['#' (rune hax %dtkt expx)] + ['^' (rune ket %dtkt expx)] == == :- '^' diff --git a/arvo/zuse.hoon b/arvo/zuse.hoon index 52e6034f7f..ac5e51776a 100644 --- a/arvo/zuse.hoon +++ b/arvo/zuse.hoon @@ -1033,15 +1033,15 @@ ++ feel :: simple file write |= {pax/path val/cage} ^- miso - =+ dir=((hard arch) .^(%cy pax)) + =+ dir=.^(arch %cy pax) ?~ fil.dir [%ins val] [%mut val] :: ++ file :: simple file load |= pax/path ^- (unit) - =+ dir=((hard arch) .^(%cy pax)) - ?~(fil.dir ~ [~ .^(%cx pax)]) + =+ dir=.^(arch %cy pax) + ?~(fil.dir ~ [~ .^(* %cx pax)]) :: ++ foal :: high-level write |= {pax/path val/cage} @@ -1429,7 +1429,7 @@ |= {{our/@p now/@da} him/@p} ^- @t =+ yow=(scot %p him) =+ pax=[(scot %p our) %name (scot %da now) yow ~] - =+ woy=((hard @t) .^(%a pax)) + =+ woy=.^(@t %a pax) ?: =(%$ woy) yow (rap 3 yow ' ' woy ~) :: diff --git a/gen/solid.hoon b/gen/solid.hoon index 95e041f497..5f73c83752 100644 --- a/gen/solid.hoon +++ b/gen/solid.hoon @@ -14,6 +14,8 @@ =+ pax=`path`(weld top `path`[%hoon ~]) ~& %solid-start =+ gen=(reck pax) +:: =+ nig=(rick pax) +:: ~& [%mugs gen+(mug gen) nig+(mug nig)] ~& %solid-parsed =+ ken=q:(~(mint ut %noun) %noun gen) ~& %solid-compiled @@ -32,7 +34,7 @@ |- ^+ all ?~ vay all =+ pax=(weld top `path`[q.i.vay ~]) -=+ txt=((hard @) .^(%cx (weld pax `path`[%hoon ~]))) +=+ txt=.^(@ %cx (weld pax `path`[%hoon ~])) =+ sam=[now `ovum`[[%gold ~] [%veer p.i.vay pax txt]]] ~& [%solid-veer i.vay] =+ gat=.*(all .*(all [0 42])) diff --git a/gen/ticket.hoon b/gen/ticket.hoon index d482fc62c0..f4b861306c 100644 --- a/gen/ticket.hoon +++ b/gen/ticket.hoon @@ -10,4 +10,4 @@ {{her/@p ~} ~} == :- %noun -((hard @p) .^(/a+(scot %p p.bec)/tick+(scot %da now)/(scot %p her))) +.^(@p /a+(scot %p p.bec)/tick+(scot %da now)/(scot %p her)) diff --git a/lib/helm.hoon b/lib/helm.hoon index d1ad3b24d2..9f466fe148 100644 --- a/lib/helm.hoon +++ b/lib/helm.hoon @@ -113,7 +113,7 @@ %- flop %+ turn all =+ top=`path`/(scot %p our)/[syd]/(scot %da now)/arvo - =+ ark=(arch .^(%cy top)) + =+ ark=.^(arch %cy top) =+ van=(~(tap by dir.ark)) |= nam/@tas =. nam @@ -125,7 +125,7 @@ `term`p.i.zaz =+ tip=(end 3 1 nam) =+ way=(welp top /[nam]) - =+ fil=(@ .^(%cx (welp way /hoon))) + =+ fil=.^(@ %cx (welp way /hoon)) [%flog /reload [%veer ?:(=('z' tip) %$ tip) way fil]] :: ++ poke-invite :: send invite; fake @@ -153,7 +153,7 @@ == |= {p/@tas q/@tas} =+ way=`path`(welp top /[q]) - =+ txt=((hard @) .^(%cx (welp way /hoon))) + =+ txt=.^(@ %cx (welp way /hoon)) [%flog /reset %veer p way txt] :: ++ poke-deset :: deset system diff --git a/lib/kiln.hoon b/lib/kiln.hoon index 452c6a6280..d74a5e199b 100644 --- a/lib/kiln.hoon +++ b/lib/kiln.hoon @@ -135,14 +135,14 @@ |= {input/path output/path} %+ do-info "copied" ?> =(-:(flop input) -:(flop output)) - (foal output -:(flop input) [%atom %t ~] .^(%cx input)) :: XX type + (foal output -:(flop input) [%atom %t ~] .^(* %cx input)) :: XX type :: ++ poke-mv |= {input/path output/path} %+ do-info "moved" ?> =(-:(flop input) -:(flop output)) %+ furl (fray output) - (foal output -:(flop input) %noun .^(%cx input)) + (foal output -:(flop input) %noun .^(* %cx input)) :: ++ poke-label |= {syd/desk lab/@tas} @@ -288,7 +288,7 @@ :* ost %merg /kiln/sync/[syd]/(scot %p her)/[sud] our syd her sud ud+let - ?: =(0 .^(%cw /(scot %p our)/[syd]/(scot %da now))) + ?: =(0 .^(* %cw /(scot %p our)/[syd]/(scot %da now))) %init %mate == @@ -393,7 +393,7 @@ =. cas [%da now] ?. ?=($auto gim) perform(auto |, gem gim, her her, sud sud) - ?: =(0 .^(%cw /(scot %p our)/[syd]/(scot %da now))) + ?: =(0 .^(* %cw /(scot %p our)/[syd]/(scot %da now))) => $(gim %init) .(auto &) => $(gim %fine)