ilyakooo0/urbit
1
0
Fork 0
mirror of https://github.com/ilyakooo0/urbit.git synced 2024-11-28 11:40:11 +03:00
Code Issues Packages Projects Releases Wiki Activity

End use of legacy $| and $& syntax.

Browse Source
This commit is contained in:
C. Guy Yarvin 2018-03-18 20:54:47 -07:00
parent 26577078fa
commit 5f7d3922bd
32 changed files with 393 additions and 393 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/ask.hoon
View File

@ -89,7 +89,7 @@
?^ wom [[(effect mor+help)]~ +>.$] :: show help
?: =(~ buf.som) [[(effect txt+"Please enter womb ship")]~ +>.$]
=/ try (rose (tufa buf.som) fed:ag)
?. ?=({$& ^} try)
?. ?=({%& ^} try)
[[(effect bel+~)]~ +>.$]
=> .(wom p.try) :: XX TMI
(transmit set+~ pro+prompt ~) :: XX handle multiple links?

30
app/dojo.hoon
View File

@ -1274,13 +1274,13 @@
=. +>+>.$ (he-diff %tan tan)
=+ vax=(spec (slot 3 q.cag))
?+ -.q.vax !!
$&
%&
?~ +.q.vax
~& %dy-made-dial-abort
(dy-rash %bel ~)
(dy-meal (slot 7 vax))
::
$|
%|
=< he-pone
%- dy-diff(pro `(slap (slot 7 vax) [%limb %q]))
=+ pom=(sole-prompt +<.q.vax)
@ -1297,15 +1297,15 @@
=+ vax=(spec (slot 3 q.cag))
~_ (sell q.cag)
?+ -.q.vax !!
$&
%&
?~ +.q.vax
~& %dy-made-scar-abort
(dy-rash %bel ~)
(dy-meal (slot 7 vax))
::
$|
=> .(vax (slap vax !,(*hoon ?>(?=($| -) .)))) :: XX working spec #72
=+ typ={$| (unit knot) hiss:eyre *}
%|
=> .(vax (slap vax !,(*hoon ?>(?=(%| -) .)))) :: XX working spec #72
=+ 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)
@ -1401,8 +1401,8 @@
^- (each (unit (each dojo-command tape)) @ud)
=+ foy=(he-dope txt)
?- -.foy
$| [%| q.p.foy]
$& [%& p.foy]
%| [%| q.p.foy]
%& [%& p.foy]
==
::
++ he-easter :: hint messages
@ -1490,7 +1490,7 @@
?> ?=(^ poy)
=< he-pine
?- -.reg
$& %. p.reg
%& %. p.reg
=+ dye=~(. dy u.poy(pux ~))
?+ way !!
{$hand $~} dy-hand:dye
@ -1500,7 +1500,7 @@
{$scar $~} dy-made-scar:dye
{$edit $~} dy-made-edit:dye
==
$| (he-diff(poy ~) %tan p.reg)
%| (he-diff(poy ~) %tan p.reg)
$tabl !!
==
::
@ -1542,7 +1542,7 @@
==
+>.$
=+ foy=(he-dope (tufa buf.say))
?: ?=($& -.foy) +>.$
?: ?=(%& -.foy) +>.$
:: ~& [%bad-change dat ted.cal]
:: ~& [%our-leg leg.say]
(he-errd `dat q.p.foy)
@ -1565,16 +1565,16 @@
==
=+ doy=(he-duke txt)
?- -.doy
$| (he-errd ~ p.doy)
$&
%| (he-errd ~ p.doy)
%&
?~ p.doy
(he-errd ~ (lent txt))
=+ old=(weld ?~(buf "> " " ") (tufa buf.say))
=^ cal say (~(transmit ^sole say) [%set ~])
=. +>.$ (he-diff %mor txt+old nex+~ det+cal ~)
?- -.u.p.doy
$& (he-plan(buf ~) p.u.p.doy)
$| he-prom(buf p.u.p.doy)
%& (he-plan(buf ~) p.u.p.doy)
%| he-prom(buf p.u.p.doy)
==
==
::

10
app/mark-dashboard.hoon
View File

@ -7,8 +7,8 @@
%- ~(run by a)
|= b/(each vase tang)
?- -.b
$& (tape:enjs (text p.b))
$| (tape:enjs (of-wall (wush 160 (flop p.b))))
%& (tape:enjs (text p.b))
%| (tape:enjs (of-wall (wush 160 (flop p.b))))
==
++ wush
|= {wid/@u tan/tang} ^- wall
@ -32,11 +32,11 @@
%- malt
%+ turn p.a
|= {k/gage v/gage} ^- {mark (each vase tang)}
:- ?>(?=({$& $mark * @tas} k) q.q.p.k)
:- ?>(?=({%& $mark * @tas} k) q.q.p.k)
?- -.v
$tabl !!
$& [%& q.p.v]
$| v
%& [%& q.p.v]
%| v
==
::
++ build-marks

8
app/talk.hoon
View File

@ -657,8 +657,8 @@
^- (set circle)
?~ a ~
?- -.i.a
$& (~(put in $(a t.a)) p.i.a)
$| (~(uni in $(a t.a)) p.i.a)
%& (~(put in $(a t.a)) p.i.a)
%| (~(uni in $(a t.a)) p.i.a)
==
::
++ cirs :< non-empty circles
@ -913,7 +913,7 @@
|= {inv/sole-edit buf/(list @c)}
^- {lit/(list sole-edit) err/(unit @u)}
=+ res=(rose (tufa buf) sh-read)
?: ?=($| -.res) [[inv]~ `p.res]
?: ?=(%| -.res) [[inv]~ `p.res]
:_ ~
?~ p.res ~
=+ wok=u.p.res
@ -2325,7 +2325,7 @@
=+ hok=r.p.p.url.sep
=- (swag [a=(sub (max wyd (lent -)) wyd) b=wyd] -)
^- tape
=< ?: ?=($& -.hok)
=< ?: ?=(%& -.hok)
(reel p.hok .)
+:(scow %if p.hok)
|= {a/knot b/tape}

2
app/twit.hoon
View File

@ -253,7 +253,7 @@
$post
=+ (raid:wired +.pax mez=%uv ~)
=+ sta=(~(get by out) mez)
?. ?=({$~ $| *} sta)
?. ?=({$~ %| *} sta)
[%none ~]
[%full twit-post+p.u.sta]
::

2
gen/hood/init-auth-basic.hoon
View File

@ -20,7 +20,7 @@
[%& %oauth-hostname "api hostname: https://"]
%+ sole-go thos:de-purl:html
|= hot/host:eyre
?: ?=($| -.hot)
?: ?=(%| -.hot)
~|(%ips-unsupported !!)
%+ sole-lo
[%& %auth-user "username: "]

2
gen/hood/init-oauth1.hoon
View File

@ -22,7 +22,7 @@
[%& %oauth-hostname "api hostname: https://"]
%+ sole-go thos:urlp
|= hot/host
?: ?=($| -.hot)
?: ?=(%| -.hot)
~|(%ips-unsupported !!)
%+ sole-lo
[%& %oauth-client "consumer key: "]

2
gen/hood/init-oauth2.hoon
View File

@ -22,7 +22,7 @@
[%& %oauth-hostname "api hostname: https://"]
%+ sole-go thos:de-purl:html
|= hot/host:eyre
?: ?=($| -.hot)
?: ?=(%| -.hot)
~|(%ips-unsupported !!)
%+ sole-lo
[%& %oauth-client "client id: "]

18
gen/musk.hoon
View File

@ -12,7 +12,7 @@
?~ jon
~& %constant-stopped
!!
?. ?=($& -.u.jon)
?. ?=(%& -.u.jon)
~& %constant-blocked
!!
:: [p.pro [%1 p.u.jon]]
@ -40,10 +40,10 @@
::
$% :: no; noun has partial block substructure
::
{$| left/stencil rite/stencil}
{%| left/stencil rite/stencil}
:: yes; noun is either fully complete, or fully blocked
::
{$& blocks/(set block)}
{%& blocks/(set block)}
==
::
++ output
@ -278,7 +278,7 @@
tal/seminoun
==
^- seminoun
?. ?& &(?=($& -.mask.hed) ?=($& -.mask.tal))
?. ?& &(?=(%& -.mask.hed) ?=(%& -.mask.tal))
=(=(~ blocks.mask.hed) =(~ blocks.mask.tal))
==
:: default merge
@ -314,7 +314,7 @@
?- -.mask.bus
:: subject is fully blocked or complete
::
$& :: if fully blocked, produce self
%& :: if fully blocked, produce self
::
?^ blocks.mask.bus bus
:: descending into atom, stop
@ -325,7 +325,7 @@
$(axe lat, bus [&+~ ?:(=(2 now) -.data.bus +.data.bus)])
:: subject is partly blocked
::
$| :: descend into partial cell
%| :: descend into partial cell
::
%= $
axe lat
@ -345,7 +345,7 @@
?~ noy ~
:: if partial block, squash blocks and stop
::
?: ?=($| -.mask.noy) [&+(squash mask.noy) ~]
?: ?=(%| -.mask.noy) [&+(squash mask.noy) ~]
:: if full block, propagate block
::
?: ?=(^ blocks.mask.noy) [mask.noy ~]
@ -359,8 +359,8 @@
|= tyn/stencil
^- (set block)
?- -.tyn
$& blocks.tyn
$| (~(uni in $(tyn left.tyn)) $(tyn rite.tyn))
%& blocks.tyn
%| (~(uni in $(tyn left.tyn)) $(tyn rite.tyn))
==
--
--

2
gen/solid.hoon
View File

@ -22,7 +22,7 @@
=+ txt=.^(@t %cx (weld pax `path`[%hoon ~]))
=+ rax=.^(@t %cx (weld arp `path`[%hoon ~]))
=+ ^= ken
=- ?:(?=($& -.res) p.res (mean (flop p.res)))
=- ?:(?=(%& -.res) p.res (mean (flop p.res)))
^= res %- mule |.
~& %solid-loaded
=+ gen=(rain pax txt)

4
gen/test.hoon
View File

@ -31,12 +31,12 @@
=+ name=(spud (flop pax))
=+ run=(mule |.((test eny)))
?- -.run
$| :: the stack is already flopped for output?
%| :: the stack is already flopped for output?
;: weld
p:run
`tang`[[%leaf (weld name " CRASHED")] ~]
==
$& ?: =(~ p:run)
%& ?: =(~ p:run)
[[%leaf (weld name " OK")] ~]
:: Create a welded list of all failures indented.
%- flop

16
lib/down-jet/parse.hoon
View File

@ -161,11 +161,11 @@
=- (cook crip (lite -))
%+ sear
%- flit
|= a/$^({marx $~} $%({$& marx} {$| p/mane}))
|= a/$^({marx $~} $%({%& marx} {%| p/mane}))
?- -.a
^ (madn n.a)
$& (madn n.a)
$| (madn p.a)
%& (madn n.a)
%| (madn p.a)
==
;~(pose empt:de-xml (pech [head tail]:de-xml))
::
@ -307,7 +307,7 @@
=> |%
++ nufh {tape kids}
++ fens ?($'*' $'_')
++ nuft {nufh ?(tape {tape ?($| fens)})}
++ nuft {nufh ?(tape {tape ?(%| fens)})}
++ reso
|= a/nufh
^- kids
@ -393,8 +393,8 @@
::
++ flome
|= a/_+:*nuft
^- {(unit ?($| fens)) tape}
?. ?=({* ?($| fens)} a)
^- {(unit ?(%| fens)) tape}
?. ?=({* ?(%| fens)} a)
[~ a]
[[~ +.a] -.a]
::
@ -579,8 +579,8 @@
?~ q.i.c
i.c
?. ?& ?=({* $~} q.i.c)
?=({$emph $|} -.i.c)
?=({$emph $|} -.i.q.i.c)
?=({$emph %|} -.i.c)
?=({$emph %|} -.i.q.i.c)
==
i.c(q $(c q.i.c))
[[%emph %&] $(c q.i.q.i.c)]

4
lib/hall-legacy.hoon
View File

@ -168,14 +168,14 @@
|= p/partner
^- (unit circle:hall)
?- -.p
$& :+ ~ p.p.p
%& :+ ~ p.p.p
?: ?| =(q.p.p 'porch')
=(q.p.p 'court')
=(q.p.p 'floor')
==
%inbox
q.p.p
$| ~
%| ~
==
::
++ convert-speech

4
lib/hood/drum.hoon
View File

@ -201,8 +201,8 @@
?> (~(has by fur) i.t.way)
=/ wel/well:gall [i.way i.t.way]
?- saw
{$| *} (se-dump p.saw)
{$& *} ?> =(q.wel p.p.saw)
{%| *} (se-dump p.saw)
{%& *} ?> =(q.wel p.p.saw)
:: =. +>.$ (se-text "live {<p.saw>}")
+>.$(fur (~(put by fur) q.wel `[p.wel %da r.p.saw]))
==

4
lib/hood/helm.hoon
View File

@ -230,8 +230,8 @@
|= saw/(each suss:gall tang) =< abet
%- emit
?- -.saw
$| [%flog ~ %crud %onto `tang`p.saw]
$& [%flog ~ %text "<{<p.saw>}>"]
%| [%flog ~ %crud %onto `tang`p.saw]
%& [%flog ~ %text "<{<p.saw>}>"]
==
::
++ take-note :: result of %init

18
lib/hood/kiln.hoon
View File

@ -392,7 +392,7 @@
=. let +(let)
=. +>.$
%- spam
?: ?=($& -.mes)
?: ?=(%& -.mes)
[(render "sync succeeded" sud her syd) ~]
?+ p.p.mes
:* (render "sync failed" sud her syd)
@ -444,7 +444,7 @@
::
++ unwrap-tang
|* res/(each * tang)
?: ?=($& -.res)
?: ?=(%& -.res)
p.res
(ford-fail p.res)
::
@ -462,12 +462,12 @@
?~ p.gag ~
?- -.p.i.p.gag
$tabl (mule |.(`$~`(ford-fail >%strange-gage< ~)))
$| (mule |.(`$~`(ford-fail p.p.i.p.gag)))
$&
%| (mule |.(`$~`(ford-fail p.p.i.p.gag)))
%&
?- -.q.i.p.gag
$tabl (mule |.(`$~`(ford-fail >%strange-gage< ~)))
$| (mule |.(`$~`(ford-fail p.q.i.p.gag)))
$& =+ $(p.gag t.p.gag)
%| (mule |.(`$~`(ford-fail p.q.i.p.gag)))
%& =+ $(p.gag t.p.gag)
?+(- [[p.p p.q]:i.p.gag -] {@ *} -)
==
==
@ -509,7 +509,7 @@
|= are/(each (set path) (pair term tang))
^+ +>
?: =(%meld gem)
?: ?=($& -.are)
?: ?=(%& -.are)
?. auto
=+ "merged with strategy {<gem>}"
win:(spam leaf+- ?~(p.are ~ [>`(set path)`p.are< ~]))
@ -538,7 +538,7 @@
==
=+ "failed to merge with strategy meld"
lose:(spam leaf+- >p.p.are< q.p.are)
?: ?=($& -.are)
?: ?=(%& -.are)
=+ "merged with strategy {<gem>}"
win:(spam leaf+- ?~(p.are ~ [>`(set path)`p.are< ~]))
?. auto
@ -590,7 +590,7 @@
++ made
|= {dep/@uvH reg/gage:ford}
^+ +>
?: ?=($| -.reg)
?: ?=(%| -.reg)
=+ "failed to mash"
lose:(spam leaf+- p.reg)
=+ ^- can/(list (pair path (unit miso)))

26
lib/hood/womb.hoon
View File

@ -34,8 +34,8 @@
|* (managed) ::
?- +< ::
$~ ~ :: unsplit
{$~ $| *} ~ :: delivered
{$~ $& *} (some p.u.+<) :: subdivided
{$~ %| *} ~ :: delivered
{$~ %& *} (some p.u.+<) :: subdivided
== ::
:: ::
++ moon (managed _!!) :: undivided moon
@ -375,7 +375,7 @@
=+ (~(get by stars.office) who)
?^ - u
=+ gal=(get-managed-galaxy (sein who))
?. ?=({$~ $& *} gal) ~|(unavailable-star+(sein who) !!)
?. ?=({$~ %& *} gal) ~|(unavailable-star+(sein who) !!)
(fall (~(get by box.r.p.u.gal) (neis who)) ~)
::
++ mod-managed-star :: office write
@ -385,7 +385,7 @@
+>.$(stars.office (~(put by stars.office) who sta))
%+ mod-managed-galaxy (sein who)
|= gal/galaxy ^- galaxy
?> ?=({$~ $& *} gal)
?> ?=({$~ %& *} gal)
gal(r.p.u (~(put fo r.p.u.gal) (neis who) sta))
::
++ get-managed-planet :: office read
@ -394,10 +394,10 @@
?^ - u
?: (~(has by galaxies.office) (sein who))
=+ gal=(get-managed-galaxy (sein who))
?. ?=({$~ $& *} gal) ~|(unavailable-galaxy+(sein who) !!)
?. ?=({$~ %& *} gal) ~|(unavailable-galaxy+(sein who) !!)
(~(get fo q.p.u.gal) who)
=+ sta=(get-managed-star (sein who))
?. ?=({$~ $& *} sta) ~|(unavailable-star+(sein who) !!)
?. ?=({$~ %& *} sta) ~|(unavailable-star+(sein who) !!)
(~(get fo q.p.u.sta) who)
::
++ mod-managed-planet :: office write
@ -408,11 +408,11 @@
?: (~(has by galaxies.office) (sein who))
%+ mod-managed-galaxy (sein who)
|= gal/galaxy ^- galaxy
?> ?=({$~ $& *} gal)
?> ?=({$~ %& *} gal)
gal(q.p.u (~(put fo q.p.u.gal) (neis who) pla))
%+ mod-managed-star (sein who)
|= sta/star ^- star
?> ?=({$~ $& *} sta)
?> ?=({$~ %& *} sta)
sta(q.p.u (~(put fo q.p.u.sta) (neis who) pla))
::
++ get-live :: last-heard time ++live
@ -430,7 +430,7 @@
::
++ stat-planet :: stat of planet
|= {who/@p man/planet} ^- stat
?. ?=({$~ $& ^} man) (stat-any who man)
?. ?=({$~ %& ^} man) (stat-any who man)
:- (get-live who)
=+ pla=u:(divided man)
:- %split
@ -440,7 +440,7 @@
::
++ stat-star :: stat of star
|= {who/@p man/star} ^- stat
?. ?=({$~ $& ^} man) (stat-any who man)
?. ?=({$~ %& ^} man) (stat-any who man)
:- (get-live who)
=+ sta=u:(divided man)
:- %split
@ -453,7 +453,7 @@
::
++ stat-galaxy :: stat of galaxy
|= {who/@p man/galaxy} ^- stat
?. ?=({$~ $& ^} man) (stat-any who man)
?. ?=({$~ %& ^} man) (stat-any who man)
=+ gal=u:(divided man)
:- (get-live who)
:- %split
@ -718,8 +718,8 @@
++ needy
|* a/(each * tang)
?- -.a
$& p.a
$| ((slog (flop p.a)) (mean p.a))
%& p.a
%| ((slog (flop p.a)) (mean p.a))
==
::
++ poke-do-claim :: deliver ticket

6
lib/hood/write.hoon
View File

@ -119,7 +119,7 @@
::
++ poke-sec-atom
|= {hot/host:eyre dat/@}
?> ?=($& -.hot)
?> ?=(%& -.hot)
=. p.hot (scag 2 p.hot) :: ignore subdomain
=. dat (scot %uw (en:crua:crypto ames-secret dat))
(poke--data [`%atom [%sec p.hot]] %mime / (as-octs dat))
@ -139,8 +139,8 @@
:: ?. =(our src)
:: ~|(foreign-write/[our=our src=src] !!)
?+ -.res ~|(gage+-.res !!)
$| (mean p.res)
$& =- abet:(emit %info write+~ our -)
%| (mean p.res)
%& =- abet:(emit %info write+~ our -)
(foal :(welp (en-beam beak-now ~) pax /[-.p.res]) p.res)
==
--

22
lib/new-hoon.hoon
View File

@ -9,7 +9,7 @@
|* a=^
+.a
::
++ either |*([a=mold b=mold] $%({$& p/a} {$| p/b})) :: either
++ either |*([a=mold b=mold] $%({%& p/a} {%| p/b})) :: either
::
++ thr
|%
@ -17,8 +17,8 @@
:> applies {b} {a} is first, or {b} to {a} is second.
|* [a=(either) b=$-(* *) c=$-(* *)]
?- -.a
$& (b p.a)
$| (c p.a)
%& (b p.a)
%| (c p.a)
==
::
++ firsts
@ -29,8 +29,8 @@
?~ a
~
?- -.i.a
$& [p.i.a $(a t.a)]
$| $(a t.a)
%& [p.i.a $(a t.a)]
%| $(a t.a)
==
::
++ seconds
@ -41,8 +41,8 @@
?~ a
~
?- -.i.a
$& $(a t.a)
$| [p.i.a $(a t.a)]
%& $(a t.a)
%| [p.i.a $(a t.a)]
==
::
++ partition
@ -55,8 +55,8 @@
[~ ~]
=+ ret=$(a t.a)
?- -.i.a
$& [[p.i.a -.ret] +.ret]
$| [-.ret [p.i.a +.ret]]
%& [[p.i.a -.ret] +.ret]
%| [-.ret [p.i.a +.ret]]
==
--
++ maybe |*(a=mold $@($~ {$~ u/a})) :: maybe
@ -1452,8 +1452,8 @@
=+ x=(fun n.a)
~! x
?- -.x
$& [(put (union -.lr -.rr) p.n.a +.x) (union +.lr +.rr)]
$| [(union -.lr -.rr) (put (union +.lr +.rr) p.n.a +.x)]
%& [(put (union -.lr -.rr) p.n.a +.x) (union +.lr +.rr)]
%| [(union -.lr -.rr) (put (union +.lr +.rr) p.n.a +.x)]
==
::
:: ++split, ++split-lookup and ++split-root do not make sense without

50
mar/txt.hoon
View File

@ -45,9 +45,9 @@
?~ ali `bob
?~ bob `ali
?- -.i.ali
$&
%&
?- -.i.bob
$&
%&
?: =(p.i.ali p.i.bob)
%+ bind $(ali t.ali, bob t.bob)
|=(cud/(urge cord) [i.ali cud])
@ -57,7 +57,7 @@
%+ bind $(ali t.ali, p.i.bob (sub p.i.bob p.i.ali))
|=(cud/(urge cord) [i.ali cud])
::
$|
%|
?: =(p.i.ali (lent p.i.bob))
%+ bind $(ali t.ali, bob t.bob)
|=(cud/(urge cord) [i.bob cud])
@ -67,10 +67,10 @@
~
==
::
$|
%|
?- -.i.bob
$| ~
$&
%| ~
%&
?: =(p.i.bob (lent p.i.ali))
%+ bind $(ali t.ali, bob t.bob)
|=(cud/(urge cord) [i.ali cud])
@ -85,11 +85,11 @@
^- (urge cord)
?~ wig ~
?~ t.wig wig
?: ?=($& -.i.wig)
?: ?=($& -.i.t.wig)
?: ?=(%& -.i.wig)
?: ?=(%& -.i.t.wig)
$(wig [[%& (add p.i.wig p.i.t.wig)] t.t.wig])
[i.wig $(wig t.wig)]
?: ?=($| -.i.t.wig)
?: ?=(%| -.i.t.wig)
$(wig [[%| (welp p.i.wig p.i.t.wig) (welp q.i.wig q.i.t.wig)] t.t.wig])
[i.wig $(wig t.wig)]
--
@ -106,16 +106,16 @@
?~ ali bob
?~ bob ali
?- -.i.ali
$&
%&
?- -.i.bob
$&
%&
?: =(p.i.ali p.i.bob)
[i.ali $(ali t.ali, bob t.bob)]
?: (gth p.i.ali p.i.bob)
[i.bob $(p.i.ali (sub p.i.ali p.i.bob), bob t.bob)]
[i.ali $(ali t.ali, p.i.bob (sub p.i.bob p.i.ali))]
::
$|
%|
?: =(p.i.ali (lent p.i.bob))
[i.bob $(ali t.ali, bob t.bob)]
?: (gth p.i.ali (lent p.i.bob))
@ -126,14 +126,14 @@
:: ~ :: here, alice is good for a while, but not for the whole
== :: length of bob's changes
::
$|
%|
?- -.i.bob
$|
%|
=+ ^- {fic/(unce cord) ali/(urge cord) bob/(urge cord)}
(resolve ali bob)
[fic $(ali ali, bob bob)]
::
$&
%&
?: =(p.i.bob (lent p.i.ali))
[i.ali $(ali t.ali, bob t.bob)]
?: (gth p.i.bob (lent p.i.ali))
@ -179,17 +179,17 @@
^- (urge cord)
?~ wig ~
?~ t.wig wig
?: ?=($& -.i.wig)
?: ?=($& -.i.t.wig)
?: ?=(%& -.i.wig)
?: ?=(%& -.i.t.wig)
$(wig [[%& (add p.i.wig p.i.t.wig)] t.t.wig])
[i.wig $(wig t.wig)]
?: ?=($| -.i.t.wig)
?: ?=(%| -.i.t.wig)
$(wig [[%| (welp p.i.wig p.i.t.wig) (welp q.i.wig q.i.t.wig)] t.t.wig])
[i.wig $(wig t.wig)]
::
++ resolve
|= {ali/(urge cord) bob/(urge cord)}
^- {fic/{$| p/(list cord) q/(list cord)} ali/(urge cord) bob/(urge cord)}
^- {fic/{%| p/(list cord) q/(list cord)} ali/(urge cord) bob/(urge cord)}
=- [[%| bac (annotate alc boc bac)] ali bob]
|- ^- $: $: bac/(list cord)
alc/(list cord)
@ -201,10 +201,10 @@
?~ ali [[~ ~ ~] ali bob]
?~ bob [[~ ~ ~] ali bob]
?- -.i.ali
$&
%&
?- -.i.bob
$& [[~ ~ ~] ali bob] :: no conflict
$|
%& [[~ ~ ~] ali bob] :: no conflict
%|
=+ lob=(lent p.i.bob)
?: =(lob p.i.ali)
[[p.i.bob p.i.bob q.i.bob] t.ali t.bob]
@ -225,9 +225,9 @@
==
==
::
$|
%|
?- -.i.bob
$&
%&
=+ loa=(lent p.i.ali)
?: =(loa p.i.bob)
[[p.i.ali q.i.ali p.i.ali] t.ali t.bob]
@ -247,7 +247,7 @@
bob.res
==
::
$|
%|
=+ loa=(lent p.i.ali)
=+ lob=(lent p.i.bob)
?: =(loa lob)

24
sys/arvo.hoon
View File

@ -120,7 +120,7 @@
++ ruck :: update vase
|= {pax/path txt/@ta}
^+ +>
=- ?:(?=($| -.res) ((slog p.res) +>.$) p.res)
=- ?:(?=(%| -.res) ((slog p.res) +>.$) p.res)
^= res %- mule |.
=+ arg=[~2000.1.1 0 =>(~ |~(* ~))]
=+ rig=(slym q.sew arg)
@ -143,7 +143,7 @@
++ slid
|= {hed/mill tal/mill}
^- mill
?: &(?=($& -.hed) ?=($& -.tal))
?: &(?=(%& -.hed) ?=(%& -.tal))
[%& (slop p.hed p.tal)]
[%| [%cell p.p.hed p.p.tal] [q.p.hed q.p.tal]]
::
@ -151,8 +151,8 @@
|= hil/mill
^- mill
?- -.hil
$& [%& (slop [typ.vil p.p.hil] p.hil)]
$| [%| [%cell typ.vil p.p.hil] p.hil]
%& [%& (slop [typ.vil p.p.hil] p.hil)]
%| [%| [%cell typ.vil p.p.hil] p.hil]
==
::
++ slur :: call gate on
@ -161,8 +161,8 @@
=+ sam=(slot 6 gat)
=+ ^= hig
?- -.hil
$& (~(nest wa p.sew) p.sam p.p.hil)
$| (~(nets wa p.sew) p.sam p.p.hil)
%& (~(nest wa p.sew) p.sam p.p.hil)
%| (~(nets wa p.sew) p.sam p.p.hil)
==
?.(-.hig ~ `[(slym gat +>.hil) +.hig])
::
@ -218,8 +218,8 @@
|= a/duct
%+ bind
=- ?- -.har
$| ~& [%dead-card p.har] ~ :: XX properly log?
$& (some p.har)
%| ~& [%dead-card p.har] ~ :: XX properly log?
%& (some p.har)
==
^= har ^- (each (pair arvo worm) term)
=^ caq p.sew (~(spot wa p.sew) 3 wec)
@ -331,7 +331,7 @@
::
++ vint :: create vane
|= {lal/@tas vil/vile bud/vase pax/path txt/@ta} ::
=- ?:(?=($| -.res) ((slog p.res) ~) (some p.res))
=- ?:(?=(%| -.res) ((slog p.res) ~) (some p.res))
^= res %- mule |.
=+ gen=(rain pax txt)
~& [%vane-parsed `@p`(mug gen)]
@ -565,7 +565,7 @@
++ veke :: build new kernel
|= {now/@da hap/path zup/path}
^- *
=- ?:(?=($& -.res) p.res ((slog p.res) ~))
=- ?:(?=(%& -.res) p.res ((slog p.res) ~))
^= res %- mule |.
=+ pax=(weld hap `path`[%hoon ~])
=+ wax=(weld zup `path`[%hoon ~])
@ -584,7 +584,7 @@
++ vega :: reboot kernel
|= {now/@da ova/(list ovum) hap/path zup/path}
^- (unit {p/(list ovum) q/*})
=- ?:(?=($| -.res) ((slog p.res) ~) `p.res)
=- ?:(?=(%| -.res) ((slog p.res) ~) `p.res)
^= res %- mule |.
=+ ken=(veke now hap zup)
~& [%vega-kernel `@ux`(mug ken)]
@ -602,7 +602,7 @@
++ veer :: install vane/tang
|= {now/@da fav/curd}
=> .(fav ((hard {$veer lal/@ta pax/path txt/@t}) fav))
=- ?:(?=($| -.res) ((slog p.res) +>.$) p.res)
=- ?:(?=(%| -.res) ((slog p.res) +>.$) p.res)
^= res %- mule |.
?: =(%$ lal.fav)
~& [%tang pax.fav `@p`(mug txt.fav)]

160
sys/hoon.hoon
View File

@ -291,7 +291,7 @@
:>
:> mold generator: produces a discriminated fork between two types,
:> defaulting to {a}.
|*({a/$-(* *) b/$-(* *)} $%({$| p/b} {$& p/a}))
|*({a/$-(* *) b/$-(* *)} $%({%| p/b} {%& p/a}))
::
++ gate
:> function
@ -3768,7 +3768,7 @@
rud
rux
::
++ rf `tape`[?-(a $& '&', $| '|', * !!) ~]
++ rf `tape`[?-(a %& '&', %| '|', * !!) ~]
++ rn `tape`[?>(=(0 a) '~') ~]
++ rt `tape`['\'' (weld (mesc (trip a)) `tape`['\'' ~])]
++ rta rt
@ -4268,12 +4268,12 @@
?+ -.lim (show '#')
~ (show '$')
c/@ (show c.lim)
{$& $1} (show '.')
{$& c/@}
{%& $1} (show '.')
{%& c/@}
[%leaf '+' ~(rud at c.lim)]
::
{$| @ ~} (show ',')
{$| n/@ ~ c/@}
{%| @ ~} (show ',')
{%| n/@ ~ c/@}
[%leaf (weld (reap n.lim '^') ?~(c.lim "$" (trip c.lim)))]
==
--
@ -5532,8 +5532,8 @@
|% +- $
=+ mud=(mute taq)
?- -.mud
$& [%& p=$:taq]
$| [%| p=p.mud]
%& [%& p=$:taq]
%| [%| p=p.mud]
==
--
::
@ -5584,15 +5584,15 @@
{$elm p/hoon} :: wet arm, generic
== ::
++ limb $@ term :: wing element
$% {$& p/axis} :: by geometry
{$| p/@ud q/(unit term)} :: by name
$% {%& p/axis} :: by geometry
{%| p/@ud q/(unit term)} :: by name
== ::
++ metl ?($gold $iron $zinc $lead) :: core variance
+= null ~ :: null, nil, etc
++ onyx (list (pair type foot)) :: arm activation
++ opal :: limb match
$% {$& p/type} :: leg
{$| p/axis q/(set {p/type q/foot})} :: arm
$% {%& p/type} :: leg
{%| p/axis q/(set {p/type q/foot})} :: arm
== ::
++ pica (pair ? cord) :: & prose, | code
++ palo (pair vein opal) :: wing trace, match
@ -5600,12 +5600,12 @@
++ port (each palo (pair type nock)) :: successful match
++ root hoon :: produce model
++ tent :: model builder
$% {$| p/wing q/tent r/(list plan)} :: ~(p q r...)
{$& p/(list wing)} :: a.b:c.d
$% {%| p/wing q/tent r/(list plan)} :: ~(p q r...)
{%& p/(list wing)} :: a.b:c.d
== ::
++ tiki :: test case
$% {$& p/(unit term) q/wing} :: simple wing
{$| p/(unit term) q/hoon} :: named wing
$% {%& p/(unit term) q/wing} :: simple wing
{%| p/(unit term) q/hoon} :: named wing
== ::
++ plan :: data structure
$~ [%base %null] ::
@ -5830,8 +5830,8 @@
== ::
++ tine :: partial noun
$@ ~ :: open
$% {$& p/tine q/tine} :: half-blocked
{$| p/(set)} :: fully blocked
$% {%& p/tine q/tine} :: half-blocked
{%| p/(set)} :: fully blocked
== ::
++ tool $@(term tune) :: type decoration
++ tune :: complex
@ -6617,7 +6617,7 @@
++ blue
|= gen/hoon
^- hoon
?. &(?=($| -.tik) ?=(~ p.tik)) gen
?. &(?=(%| -.tik) ?=(~ p.tik)) gen
[%tsgr [%$ 3] gen]
::
++ teal
@ -6629,15 +6629,15 @@
|= gen/hoon
^- hoon
?- -.tik
$& ?~(p.tik gen [%tstr [~ u.p.tik] [%wing q.tik] gen])
$| [%tsls ?~(p.tik q.tik [%ktts u.p.tik q.tik]) gen]
%& ?~(p.tik gen [%tstr [~ u.p.tik] [%wing q.tik] gen])
%| [%tsls ?~(p.tik q.tik [%ktts u.p.tik q.tik]) gen]
==
::
++ puce
^- wing
?- -.tik
$& ?~(p.tik q.tik [u.p.tik ~])
$| [[%& 2] ~]
%& ?~(p.tik q.tik [u.p.tik ~])
%| [[%& 2] ~]
==
::
++ wthp |= opt/(list (pair plan hoon))
@ -8187,8 +8187,8 @@
^- type
=+ fid=(find %both hyp)
?- -.fid
$| sut
$& =< q
%| sut
%& =< q
%+ take p.p.fid
|=(a/type ?:(pol (fuse(sut a) ref) (crop(sut a) ref)))
==
@ -8204,7 +8204,7 @@
++ elbo
|= {lop/palo rig/(list (pair wing hoon))}
^- type
?: ?=($& -.q.lop)
?: ?=(%& -.q.lop)
|- ^- type
?~ rig
p.q.lop
@ -8231,7 +8231,7 @@
^- (pair type nock)
=+ axe=(tend p.lop)
=| hej/(list (pair axis nock))
?: ?=($& -.q.lop)
?: ?=(%& -.q.lop)
=- [p.- (hike axe q.-)]
|- ^- (pair type (list (pair axis nock)))
?~ rig
@ -8259,8 +8259,8 @@
++ endo
|= {lop/(pair palo palo) dox/type rig/(list (pair wing hoon))}
^- (pair type type)
?: ?=($& -.q.p.lop)
?> ?=($& -.q.q.lop)
?: ?=(%& -.q.p.lop)
?> ?=(%& -.q.q.lop)
|- ^- (pair type type)
?~ rig
[p.q.p.lop p.q.q.lop]
@ -8274,7 +8274,7 @@
p.q.p.lop q.p.dar
p.q.q.lop q.q.dar
==
?> ?=($| -.q.q.lop)
?> ?=(%| -.q.q.lop)
?> =(p.q.p.lop p.q.q.lop)
=+ hag=[p=~(tap in q.q.p.lop) q=~(tap in q.q.q.lop)]
=- [(fire p.-) (fire(vet |) q.-)]
@ -8423,7 +8423,7 @@
=+ cin=(oc (bin:ad make:lib:ad))
=. rig (flop rig) :: XX this unbreaks, void order in devulc
=+ axe=(tend p.lop)
?: ?=($& -.q.lop)
?: ?=(%& -.q.lop)
=- [p.- (hike axe q.-)]
(echo:cin p.q.lop rig)
=- [p.- [%9 p.q.lop (hike axe q.-)]]
@ -8435,14 +8435,14 @@
++ play
^- type
=+ lug=(find %read hyp)
?: ?=($| -.lug) ~>(%mean.[%leaf "hoon"] ?>(?=(~ rig) p.p.lug))
?: ?=(%| -.lug) ~>(%mean.[%leaf "hoon"] ?>(?=(~ rig) p.p.lug))
(elbo p.lug rig)
::
++ mint
|= gol/type
^- (pair type nock)
=+ lug=(find %read hyp)
?: ?=($| -.lug) ~>(%mean.[%leaf "hoon"] ?>(?=(~ rig) p.lug))
?: ?=(%| -.lug) ~>(%mean.[%leaf "hoon"] ?>(?=(~ rig) p.lug))
=- ?>(?|(!vet (nest(sut gol) & p.-)) -)
(etco p.lug rig)
::
@ -8450,10 +8450,10 @@
|= {gol/type dox/type}
^- {type type}
=+ lug=[p=(find %read hyp) q=(find(sut dox) %read hyp)]
?: ?=($| -.p.lug)
?> &(?=($| -.q.lug) ?=(~ rig))
?: ?=(%| -.p.lug)
?> &(?=(%| -.q.lug) ?=(~ rig))
[p.p.p.lug p.p.q.lug]
?> ?=($& -.q.lug)
?> ?=(%& -.q.lug)
=- ?>(?|(!vet (nest(sut gol) & p.-)) -)
(endo [p.p.lug p.q.lug] dox rig)
--
@ -8481,8 +8481,8 @@
|= lap/opal
^- type
?- -.lap
$& p.lap
$| %- fire
%& p.lap
%| %- fire
%+ turn ~(tap in q.lap)
|= {a/type b/foot}
[a [%ash %$ 1]]
@ -8505,22 +8505,22 @@
[%& ~ ~ %& sut]
=+ mor=$(hyp t.hyp)
?- -.mor
$|
%|
?- -.p.mor
$& mor
$|
%& mor
%|
=+ fex=(mint(sut p.q.p.p.mor) %noun [%wing i.hyp ~])
[%| %| p.p.p.mor p.fex (comb q.q.p.p.mor q.fex)]
==
::
$&
%&
=. sut (felt q.q.p.mor)
=> :_ +
:* axe=`axis`1
lon=p.q.p.mor
heg=?^(i.hyp i.hyp [%| p=0 q=(some i.hyp)])
==
?: ?=($& -.heg)
?: ?=(%& -.heg)
[%& ~ [`p.heg lon] %& (peek way p.heg)]
=| gil/(set type)
=< $
@ -8536,22 +8536,22 @@
?: =(hax yor) hax
?~ hax yor
?~ yor hax
?: ?=($| -.hax)
?> ?& ?=($| -.yor)
?=($| -.p.hax)
?=($| -.p.yor)
?: ?=(%| -.hax)
?> ?& ?=(%| -.yor)
?=(%| -.p.hax)
?=(%| -.p.yor)
=(q.q.p.p.hax q.q.p.p.yor)
==
:^ %|
%|
(join p.p.p.hax p.p.p.yor)
[(fork p.q.p.p.hax p.q.p.p.yor ~) q.q.p.p.hax]
?> ?=($& -.yor)
?> ?=(%& -.yor)
?> =(p.q.p.hax p.q.p.yor)
?: &(?=($& -.q.q.p.hax) ?=($& -.q.q.p.yor))
?: &(?=(%& -.q.q.p.hax) ?=(%& -.q.q.p.yor))
:^ %& (join p.p.hax p.p.yor) p.q.p.hax
[%& (fork p.q.q.p.hax p.q.q.p.yor ~)]
?> &(?=($| -.q.q.p.hax) ?=($| -.q.q.p.yor))
?> &(?=(%| -.q.q.p.hax) ?=(%| -.q.q.p.yor))
?> =(p.q.q.p.hax p.q.q.p.yor)
=+ wal=(~(uni in q.q.q.p.hax) q.q.q.p.yor)
:^ %& ~ p.q.p.hax
@ -8566,7 +8566,7 @@
?~ q.heg here
=+ taf=$(axe (peg axe 2), sut p.sut)
?~ taf ~
?: |(?=($& -.taf) ?=($| -.p.taf))
?: |(?=(%& -.taf) ?=(%| -.p.taf))
taf
$(axe (peg axe 3), p.heg p.p.taf, sut q.sut)
::
@ -8605,8 +8605,8 @@
$(sut q.sut, lon [~ lon], p.heg +(p.heg))
=+ tor=(fund way u.q.u.tyr)
?- -.tor
$& [%& ~ (weld p.p.tor `vein`[~ `axe lon]) q.p.tor]
$| [%| %| p.u.tyr p.p.tor (comb [%0 axe] q.p.tor)]
%& [%& ~ (weld p.p.tor `vein`[~ `axe lon]) q.p.tor]
%| [%| %| p.u.tyr p.p.tor (comb [%0 axe] q.p.tor)]
==
++ next
|- ^- pony
@ -8615,12 +8615,12 @@
=+ tiv=(mint(sut q.sut) %noun i.q.zot)
=+ fid=^$(sut p.tiv, lon ~, axe 1, gil ~)
?~ fid ~
?: ?=({$| $& *} fid)
?: ?=({%| %& *} fid)
$(q.zot t.q.zot, p.heg p.p.fid)
=+ ^- {wat/what vat/(pair type nock)}
?- -.fid
$& [p.p.fid (fine %& q.p.fid)]
$| [p.p.p.fid (fine %| q.p.p.fid)]
%& [p.p.fid (fine %& q.p.fid)]
%| [p.p.p.fid (fine %| q.p.p.fid)]
==
[%| %| wat p.vat (comb (comb [%0 axe] q.tiv) q.vat)]
--
@ -8647,10 +8647,10 @@
~_ (show [%c %find] %l hyp)
=- ?@ - !!
?- -<
$& [%& q.p.-]
$| ?- -.p.-
$| [%| q.p.p.-]
$& !!
%& [%& q.p.-]
%| ?- -.p.-
%| [%| q.p.p.-]
%& !!
== ==
(fond way hyp)
::
@ -8668,11 +8668,11 @@
|= tor/port
^- (pair type nock)
?- -.tor
$| p.tor
$& =+ axe=(tend p.p.tor)
%| p.tor
%& =+ axe=(tend p.p.tor)
?- -.q.p.tor
$& [`type`p.q.p.tor %0 axe]
$| [(fire ~(tap in q.q.p.tor)) [%9 p.q.p.tor %0 axe]]
%& [`type`p.q.p.tor %0 axe]
%| [(fire ~(tap in q.q.p.tor)) [%9 p.q.p.tor %0 axe]]
== ==
::
++ fire
@ -9007,7 +9007,7 @@
{$sgzp *} ~_(duck(sut (play p.gen)) $(gen q.gen))
{$sggr *}
=+ hum=$(gen q.gen)
:: ?: &(huz !?=($|(@ [?(%sgcn %sgls) ^]) p.gen))
:: ?: &(huz !?=(%|(@ [?(%sgcn %sgls) ^]) p.gen))
:: hum
:- p.hum
:+ %10
@ -9047,11 +9047,11 @@
~| [%test q.gen]
|- ^- nock
?- -.fid
$& ?- -.q.p.fid
$& (fish(sut ref) (tend p.p.fid))
$| $(fid [%| (fine fid)])
%& ?- -.q.p.fid
%& (fish(sut ref) (tend p.p.fid))
%| $(fid [%| (fine fid)])
==
$| [%7 q.p.fid (fish(sut ref) 1)]
%| [%7 q.p.fid (fish(sut ref) 1)]
==
::
{$dbug *}
@ -9809,7 +9809,7 @@
|= {hyp/wing mur/type}
~_ (show [%c %tack] %l hyp)
=+ fid=(find %rite hyp)
?> ?=($& -.fid)
?> ?=(%& -.fid)
(take p.p.fid |=(type mur))
::
++ tend
@ -10656,8 +10656,8 @@
%+ cook
|= tum/(each manx:hoon marl:hoon) ^- hoon
?- -.tum
$& [%xray p.tum]
$| [%mcts p.tum]
%& [%xray p.tum]
%| [%mcts p.tum]
==
top-level
::
@ -10728,8 +10728,8 @@
++ drop-top
|= a/(each tuna:hoon marl:hoon) ^- marl:hoon
?- -.a
$& [p.a]~
$| p.a
%& [p.a]~
%| p.a
==
::
++ join-tops
@ -12225,9 +12225,9 @@
++ muck ?:(tol gap ace) :: general separator
++ teak %+ knee *tiki |. ~+ :: wing or hoon
=+ ^= gub
|= {a/term b/$%({$& p/wing} {$| p/hoon})}
|= {a/term b/$%({%& p/wing} {%| p/hoon})}
^- tiki
?-(-.b $& [%& [~ a] p.b], $| [%| [~ a] p.b])
?-(-.b %& [%& [~ a] p.b], %| [%| [~ a] p.b])
=+ ^= wyp
;~ pose
%+ cook gub
@ -12594,8 +12594,8 @@
=^ mes +>+<.$ (slot 6 dor)
=^ hip +>+<.$
?- -.som
$& (nest p.mes p.p.som)
$| (nets p.mes -.p.som)
%& (nest p.mes p.p.som)
%| (nets p.mes -.p.som)
==
?> hip
[[p.dor q.dor(+6 +7.som)] +>+<.$]
@ -12605,8 +12605,8 @@
^- worm
=^ hip +>+<.$
?- -.som
$& (nest typ p.p.som)
$| (nets typ -.p.som)
%& (nest typ p.p.som)
%| (nets typ -.p.som)
==
?> hip
+>+<.$

6
sys/vane/ames.hoon
View File

@ -33,7 +33,7 @@
::
++ meld :: verify connect
|= [new=deyd old=deyd]
^- $&
^- %&
?> (melt new old)
?> .= (shaf %meld (sham q.new))
(need (sure:as:(com:nu:crub:crypto r.q.old) *code p.new))
@ -70,7 +70,7 @@
::
++ pier !: :: initial deyd
|= wed=deyd
^- $&
^- %&
?> =+ rac=(clan:title r.p.q.wed)
=+ loy=(com:nu:crub:crypto r.q.wed)
?: &(r.wed =(rac %czar)) %&
@ -1560,7 +1560,7 @@
++ scry
|= [fur=(unit (set monk)) ren=@tas why=shop syd=desk lot=coin tyl=path]
^- (unit (unit cage))
?. ?=($& -.why) [~ ~]
?. ?=(%& -.why) [~ ~]
?~ tyl [~ ~]
=+ hun=(slaw %p i.tyl)
?~ hun [~ ~]

2
sys/vane/behn.hoon
View File

@ -216,7 +216,7 @@
++ scry
|= {fur/(unit (set monk)) ren/@tas why/shop syd/desk lot/coin tyl/path}
^- (unit (unit cage))
?. ?=($& -.why) ~
?. ?=(%& -.why) ~
=* who p.why
=+ ^= liz
|- ^- (list {@da duct})

120
sys/vane/clay.hoon
View File

@ -470,7 +470,7 @@
::
++ unwrap-tang
|* res/(each * tang)
?:(?=($& -.res) p.res (mean p.res))
?:(?=(%& -.res) p.res (mean p.res))
::
:: Parse a gage to a list of pairs of cages, crashing on error.
::
@ -489,16 +489,16 @@
|= gag/gage:ford
^- (list (pair cage cage))
?. ?=($tabl -.gag)
(ford-fail ?-(-.gag $| p.gag, $& [>%strange-gage p.p.gag<]~))
(ford-fail ?-(-.gag %| p.gag, %& [>%strange-gage p.p.gag<]~))
%+ murn p.gag
|= {key/gage:ford val/gage:ford}
^- (unit {cage cage})
?. ?=($& -.key)
(ford-fail ?-(-.key $| p.key, $tabl [>%strange-gage<]~))
?. ?=(%& -.key)
(ford-fail ?-(-.key %| p.key, $tabl [>%strange-gage<]~))
?- -.val
$tabl (ford-fail >%strange-gage< ~)
$& (some [p.key p.val])
$| =. p.val [(sell q.p.key) p.val]
%& (some [p.key p.val])
%| =. p.val [(sell q.p.key) p.val]
~> %slog.[0 %*(. >%ford-fail syd %her %why< |2.+> p.val)]
~
==
@ -511,7 +511,7 @@
++ gage-to-cages-or-error
|= gag/gage:ford
^- (each (list (pair cage cage)) tang)
?: ?=($| -.gag) (mule |.(`$~`(ford-fail p.gag)))
?: ?=(%| -.gag) (mule |.(`$~`(ford-fail p.gag)))
?. ?=($tabl -.gag)
(mule |.(`$~`(ford-fail >%strange-gage p.p.gag< ~)))
=< ?+(. [%& .] {@ *} .)
@ -520,11 +520,11 @@
=* hed i.p.gag
?- -.p.i.p.gag
$tabl (mule |.(`$~`(ford-fail >%strange-gage< ~)))
$| (mule |.(`$~`(ford-fail p.p.i.p.gag)))
$& ?- -.q.i.p.gag
%| (mule |.(`$~`(ford-fail p.p.i.p.gag)))
%& ?- -.q.i.p.gag
$tabl (mule |.(`$~`(ford-fail >%strange-gage< ~)))
$| (mule |.(`$~`(ford-fail p.q.i.p.gag)))
$& =+ $(p.gag t.p.gag)
%| (mule |.(`$~`(ford-fail p.q.i.p.gag)))
%& =+ $(p.gag t.p.gag)
?+(- [[p.p p.q]:i.p.gag -] {@ *} -)
== ==
::
@ -583,7 +583,7 @@
++ blab
|= {hen/duct mun/mood dat/(each cage lobe)}
^+ +>
?: ?=($& -.dat)
?: ?=(%& -.dat)
(emit hen %give %writ ~ [p.mun q.mun syd] r.mun p.dat)
%- emit
:* hen %pass [%blab p.mun (scot q.mun) syd r.mun]
@ -740,7 +740,7 @@
:- [%$ %path !>(a)]
:+ %cast %mime
=+ (need (need (read-x:ze cas a)))
?: ?=($& -<)
?: ?=(%& -<)
[%$ p.-]
(lobe-to-silk:ze a p.-)
==
@ -838,8 +838,8 @@
^+ +>
=+ pre=`path`~[(scot %p her) syd (scot %ud let.dom)]
?- -.lem
$| (print-to-dill '=' %leaf :(weld (trip p.lem) " " (spud pre)))
$& |- ^+ +>.^$
%| (print-to-dill '=' %leaf :(weld (trip p.lem) " " (spud pre)))
%& |- ^+ +>.^$
?~ p.lem +>.^$
=. +>.^$
%+ print-to-dill
@ -918,7 +918,7 @@
++ edit :: apply changes
|= {wen/@da lem/nori}
^+ +>
?: ?=($| -.lem)
?: ?=(%| -.lem)
=^ hat +>.$
(execute-changes:ze wen lem)
?~ hat
@ -960,7 +960,7 @@
|= {pax/path mis/miso}
?> ?=($dif -.mis)
=+ (need (need (read-x:ze let.dom pax)))
?> ?=($& -<)
?> ?=(%& -<)
:- [%$ %path -:!>(*path) pax]
[%pact [%$ p.-] [%$ p.mis]]
==
@ -1241,7 +1241,7 @@
|= res/gage:ford
^+ +>
:: ~& %taking-patch
?: ?=($| -.res)
?: ?=(%| -.res)
=. dok ~
(print-to-dill '!' %rose [" " "" ""] leaf+"clay patch failed" p.res)
:: ~& %editing
@ -1317,7 +1317,7 @@
?^ - [%$ %mime !>(u.-)]
:+ %cast %mime
=+ (need (need (read-x:ze let.dom a)))
?: ?=($& -<)
?: ?=(%& -<)
[%$ p.-]
(lobe-to-silk:ze a p.-)
==
@ -1331,7 +1331,7 @@
++ take-ergo
|= res/gage:ford
^+ +>
?: ?=($| -.res)
?: ?=(%| -.res)
(print-to-dill '!' %rose [" " "" ""] leaf+"clay ergo failed" p.res)
?~ hez ~|(%no-sync-duct !!)
=+ ^- can/(map path (unit mime))
@ -1493,9 +1493,9 @@
|= {car/care cas/case pax/path res/gage:ford}
^+ +>
?> ?=(^ ref)
?. ?=($& -.res)
?. ?=(%& -.res)
~| "validate foreign x failed"
=+ why=?-(-.res $| p.res, $tabl ~[>%bad-marc<])
=+ why=?-(-.res %| p.res, $tabl ~[>%bad-marc<])
~> %mean.|.(%*(. >[%plop-fail %why]< |1.+> why))
!!
?> ?=(@ p.p.res)
@ -1796,7 +1796,7 @@
|- ^- silk:ford
?: =([~ lob] lol)
=+ (need (need (read-x let.dom pax)))
?> ?=($& -<)
?> ?=(%& -<)
[%$ p.-]
=+ bol=(~(got by lat.ran) lob)
?- -.bol
@ -1814,11 +1814,11 @@
++ equivalent-data
|= {one/(each cage lobe) two/(each cage lobe)}
^- ?
?: ?=($& -.one)
?: ?=($& -.two)
?: ?=(%& -.one)
?: ?=(%& -.two)
=([p q.q]:p.one [p q.q]:p.two)
=(p.two (page-to-lobe [p q.q]:p.one))
?: ?=($& -.two)
?: ?=(%& -.two)
=(p.one (page-to-lobe [p q.q]:p.two))
=(p.one p.two)
::
@ -1900,7 +1900,7 @@
|= {wen/@da lem/nuri}
^- {(unit (map path lobe)) _..ze}
?- -.lem
$&
%&
=^ yak lat.ran (forge-yaki wen p.lem) :: create new commit
?. ?| =(0 let.dom)
!=((lent p.yak) 1)
@ -1913,7 +1913,7 @@
==
[`q.yak ..ze]
:: +>.$(ank (map-to-ankh q.yak))
$|
%|
?< (~(has by lab.dom) p.lem)
[~ ..ze(lab.dom (~(put by lab.dom) p.lem let.dom))]
==
@ -2404,7 +2404,7 @@
henmer=hen.u.mer
==
[%| %already-merging-from-somewhere]
?: ?=($| -.dat)
?: ?=(%| -.dat)
~|(p.dat !!)
=+ dat=p.dat
=| don/? :: keep going
@ -2451,13 +2451,13 @@
==
!!
?+ +< ~|((crip <[%bad-stage sat ?~(-.res %riot %gage)]>) !!)
{$ali $& *} %.(p.res fetched-ali)
{$diff-ali $| *} %.(q.p.res diffed-ali)
{$diff-bob $| *} %.(q.p.res diffed-bob)
{$merge $| *} %.(q.p.res merged)
{$build $| *} %.(q.p.res built)
{$checkout $| *} %.(p.res checked-out)
{$ergo $| *} %.(q.p.res ergoed)
{$ali %& *} %.(p.res fetched-ali)
{$diff-ali %| *} %.(q.p.res diffed-ali)
{$diff-bob %| *} %.(q.p.res diffed-bob)
{$merge %| *} %.(q.p.res merged)
{$build %| *} %.(q.p.res built)
{$checkout %| *} %.(p.res checked-out)
{$ergo %| *} %.(q.p.res ergoed)
==
::
:: Start a merge.
@ -2759,12 +2759,12 @@
|= res/gage:ford
^+ +>
=+ tay=(gage-to-cages-or-error res)
?: ?=($| -.tay)
?: ?=(%| -.tay)
(error:he %diff-ali-bad-made leaf+"merge diff ali failed" p.tay)
=+ can=(cages-to-map p.tay)
?: ?=($| -.can)
?: ?=(%| -.can)
(error:he %diff-ali p.can)
?: ?=($| -.gon.dat)
?: ?=(%| -.gon.dat)
+>.$
=. new.dal.dat
%- molt
@ -2807,12 +2807,12 @@
|= res/gage:ford
^+ +>
=+ tay=(gage-to-cages-or-error res)
?: ?=($| -.tay)
?: ?=(%| -.tay)
(error:he %diff-bob-bad-made leaf+"merge diff bob failed" p.tay)
=+ can=(cages-to-map p.tay)
?: ?=($| -.can)
?: ?=(%| -.can)
(error:he %diff-bob p.can)
?: ?=($| -.gon.dat)
?: ?=(%| -.gon.dat)
+>.$
=. new.dob.dat
%- molt
@ -2874,13 +2874,13 @@
++ merged
|= res/gage:ford
=+ tay=(gage-to-cages-or-error res)
?: ?=($| -.tay)
?: ?=(%| -.tay)
(error:he %merge-bad-made leaf+"merging failed" p.tay)
=+ can=(cages-to-map p.tay)
?: ?=($| -.can)
?: ?=(%| -.can)
(error:he %merge p.can)
=+ bof=(~(run by p.can) (flit |=({a/mark ^} !?=($null a))))
?: ?=($| -.gon.dat)
?: ?=(%| -.gon.dat)
+>.$
=. bof.dat bof
build
@ -2923,12 +2923,12 @@
|= res/gage:ford
^+ +>
=+ tay=(gage-to-cages-or-error res)
?: ?=($| -.tay)
?: ?=(%| -.tay)
(error:he %build-bad-made leaf+"delta building failed" p.tay)
=+ bop=(cages-to-map p.tay)
?: ?=($| -.bop)
?: ?=(%| -.bop)
(error:he %built p.bop)
?: ?=($| -.gon.dat)
?: ?=(%| -.gon.dat)
+>.$
=. bop.dat p.bop
=+ ^- con/(map path *) :: 2-change conflict
@ -3059,12 +3059,12 @@
|= {dep/@uvH res/gage:ford}
^+ this
=+ tay=(gage-to-cages-or-error res)
?: ?=($| -.tay)
?: ?=(%| -.tay)
(error:he %checkout-bad-made leaf+"merge checkout failed" p.tay)
=+ can=(cages-to-map p.tay)
?: ?=($| -.can)
?: ?=(%| -.can)
(error:he %checkout p.can)
?: ?=($| -.gon.dat)
?: ?=(%| -.gon.dat)
this
=. let.dom +(let.dom)
=. hit.dom (~(put by hit.dom) let.dom r.new.dat)
@ -3127,7 +3127,7 @@
|= res/gage:ford
^+ +>
=+ tay=(gage-to-cages-or-error res)
?: ?=($| -.tay)
?: ?=(%| -.tay)
(error:he %ergo-bad-made leaf+"merge ergo failed" p.tay)
=+ =| nac/mode
|- ^- tan/$^(mode {p/term q/tang})
@ -3142,7 +3142,7 @@
=+ `can/(map path (unit mime))`(malt tan)
?~ hez
(error:he %ergo-no-hez ~)
?: ?=($| -.gon.dat)
?: ?=(%| -.gon.dat)
+>.$
=+ mus=(must-ergo (turn ~(tap by erg.dat) head))
=< done:he
@ -3168,7 +3168,7 @@
::
++ done
^+ ..he
?< ?=($| -.gon.dat)
?< ?=(%| -.gon.dat)
..he(don |)
::
:: Cancel the merge gracefully and produce an error.
@ -3195,7 +3195,7 @@
|- ^- silk:ford
?: =([~ lob] lol)
=+ (need (need (read-x let.dom pax)))
?> ?=($& -<)
?> ?=(%& -<)
[%$ p.-]
?: =([~ lob] lal)
[%$ +:(need fil.ank:(descend-path:(zu ank:(need alh)) pax))]
@ -3495,7 +3495,7 @@
++ scry :: inspect
|= {fur/(unit (set monk)) ren/@tas why/shop syd/desk lot/coin tyl/path}
^- (unit (unit cage))
?. ?=($& -.why) ~
?. ?=(%& -.why) ~
=* his p.why
:: ~& scry+[ren `path`[(scot %p his) syd ~(rent co lot) tyl]]
:: =- ~& %scry-done -
@ -3510,7 +3510,7 @@
=+ (aver:den u.run u.luk tyl)
?~ - -
?~ u.- -
?: ?=($& -.u.u.-) ``p.u.u.-
?: ?=(%& -.u.u.-) ``p.u.u.-
~
::
++ stay [%1 ruf]
@ -3537,9 +3537,9 @@
[mos ..^$]
?: ?=({$blab care @ @ *} tea)
?> ?=($made +<.q.hin)
?. ?=($& -.q.q.hin)
?. ?=(%& -.q.q.hin)
~| %blab-fail
~> %mean.|.(?+(-.q.q.hin -.q.q.hin $| p.q.q.hin))
~> %mean.|.(?+(-.q.q.hin -.q.q.hin %| p.q.q.hin))
!! :: interpolate ford fail into stack trace
:_ ..^$ :_ ~
:* hen %give %writ ~
@ -3647,7 +3647,7 @@
==
::
$mere
?: ?=($& -.p.+.q.hin)
?: ?=(%& -.p.+.q.hin)
~& 'initial merge succeeded'
[~ ..^$]
~> %slog.

8
sys/vane/dill.hoon
View File

@ -390,15 +390,15 @@
+>(moz :_(moz [hen %give +.sih]))
::
{$c $mere *}
?: ?=($& -.p.sih)
?: ?=(%& -.p.sih)
+>.$
(mean >%dill-mere-fail< >p.p.p.sih< q.p.p.sih)
::
{$g $onto *}
:: ~& [%take-gall-onto +>.sih]
?- -.+>.sih
$| (crud %onto p.p.+>.sih)
$& (done %blit [%lin (tuba "{<p.p.sih>}")]~)
%| (crud %onto p.p.+>.sih)
%& (done %blit [%lin (tuba "{<p.p.sih>}")]~)
==
::
{$g $unto *}
@ -529,7 +529,7 @@
++ scry
|= {fur/(unit (set monk)) ren/@tas why/shop syd/desk lot/coin tyl/path}
^- (unit (unit cage))
?. ?=($& -.why) ~
?. ?=(%& -.why) ~
=* his p.why
[~ ~]
::

54
sys/vane/eyre.hoon
View File

@ -654,8 +654,8 @@
=+ maf=(eat-headers r.heq)
=+ ^= pul ^- purl
?- -.ryp
$& ?>(=(sec p.p.p.ryp) p.ryp)
$| =+ hot=(~(get ja maf) %host)
%& ?>(=(sec p.p.p.ryp) p.ryp)
%| =+ hot=(~(get ja maf) %host)
?> ?=({@ ~} hot)
[[sec (rash i.hot thor:de-purl)] p.ryp q.ryp]
==
@ -833,8 +833,8 @@
|: $:{sus/(each duct ixor) con/_..axon}
=. ..axon con
?- -.sus
$& (give-json(hen p.sus) 200 ~ %s (scot %uv p.sih))
$| (get-even:(ire-ix p.sus) +.sih)
%& (give-json(hen p.sus) 200 ~ %s (scot %uv p.sih))
%| (get-even:(ire-ix p.sus) +.sih)
==
::
$made
@ -848,7 +848,7 @@
{$si ~} (give-sigh q.sih)
{$se ^} (get-made:(dom-vi q.tee) p.tee [p q]:sih)
{$hi ^}
?: ?=($| -.q.sih)
?: ?=(%| -.q.sih)
(give-sigh q.sih) :: XX crash?
=* cay p.q.sih
?> ?=($hiss p.cay)
@ -856,13 +856,13 @@
(eyre-them tee q.cay)
=+ usr=(slav %ta p.tee)
=+ ((hard {pul/purl ^}) q.q.cay)
?. ?=($& -.r.p.pul)
?. ?=(%& -.r.p.pul)
~& [%auth-lost usr (head:en-purl p.pul)]
(eyre-them tee q.cay)
(get-req:(dom-vi usr (scag 2 p.r.p.pul)) q.tee q.cay)
::
:: {$hi ^}
:: ?: ?=($| -.q.sih)
:: ?: ?=(%| -.q.sih)
:: (give-sigh q.sih) :: XX crash?
:: =* cay p.q.sih
:: ?> ?=($hiss p.cay)
@ -879,14 +879,14 @@
== ==
::
{$of @ ^}
?: ?=($| -.q.sih)
?: ?=(%| -.q.sih)
((slog p.q.sih) +>.^$) :: XX get-even %mean
%+ get-rush:(ire-ix p.tee) q.tee
?> ?=($json p.p.q.sih) :: XX others
((hard json) q.q.p.q.sih)
::
{$at ^}
?: ?=($| -.q.sih) $(tee q.tee)
?: ?=(%| -.q.sih) $(tee q.tee)
?. ?=($js -.p.q.sih)
~& e+at-lost+[-.p.q.sih q.tee]
$(tee q.tee)
@ -899,7 +899,7 @@
{$ac ^} ?>((~(has by wup) p.tee) $(ses `p.tee, tee q.tee))
{$ha *}
%- emule |. ^+ ..apex
?. ?=($& -.q.sih)
?. ?=(%& -.q.sih)
(fail 404 p.sih p.q.sih)
=* cay p.q.sih
?: ?=($red-quri p.cay)
@ -936,7 +936,7 @@
++ ses-authed
|= ses/hole
=+ sap=(~(get by sop) ses)
?: ?=({~ @ $&} sap) &
?: ?=({~ @ %&} sap) &
=+ cyz=(~(get by wup) ses)
?~ cyz |
(~(has in aut.u.cyz) our)
@ -1024,7 +1024,7 @@
++ give-sigh :: userspace done
|= res/(each cage tang)
=- +>.$(mow :_(mow [hen %give %sigh `cage`-]))
?. ?=($| -.res) p.res
?. ?=(%| -.res) p.res
[%tang !>(p.res)]
::
++ mean-json |=({sas/@uG err/ares} (give-json sas ~ (ares-to-json err)))
@ -1036,7 +1036,7 @@
^- (unit ship)
:: =+ gow=(~(get by dop) hot) :: XX trust
:: ?^ gow gow
?. ?=($& -.hot) ~
?. ?=(%& -.hot) ~
=+ dom=(flop p.hot) :: domain name
?~ dom ~
(rush i.dom fed:ag)
@ -1080,7 +1080,7 @@
=+ oar=(host-to-ship r.hat)
=. our ?~(oar our u.oar) :: XX
=+ pez=process
?: ?=($| -.pez) p.pez
?: ?=(%| -.pez) p.pez
(resolve ~ p.pez)
::
++ lens
@ -1215,7 +1215,7 @@
$ac
?~ but ~|(no-host+`path`/~/[pef] !!)
=+ `dom/host`~|(bad-host+i.but (rash i.but thos:de-purl))
?: ?=($| -.dom) ~|(auth-ip+dom !!)
?: ?=(%| -.dom) ~|(auth-ip+dom !!)
=- [%oath - p.dom]
~| bad-user+`path`t.but
?> ?=({@ $in ~} t.but)
@ -1323,7 +1323,7 @@
++ process
^- (each pest _done)
=+ pet=parse
?: ?=($| -.pet)
?: ?=(%| -.pet)
[%& %$ p.pet]
(process-parsed p.pet)
::
@ -1404,7 +1404,7 @@
$at
=. ..ya abet.yac
=+ pez=process(pok p.ham, aut |)
?. ?=($& -.pez) ~|(no-inject+p.ham !!)
?. ?=(%& -.pez) ~|(no-inject+p.ham !!)
?~ p.pez pez
?+ -.p.pez ~&(bad-inject+p.pez !!)
$red pez
@ -1431,7 +1431,7 @@
?: |(=(anon him.ham) (~(has in aut.yac) him.ham))
=. ..ya abet.yac(him him.ham)
=+ pez=process(pok rem.ham, aut &)
?: ?=($| -.pez) pez
?: ?=(%| -.pez) pez
[%| (resolve ~ p.pez)]
?. =(our him.ham)
[%| ((teba foreign-auth.yac) him.ham hat rem.ham quy)]
@ -1468,12 +1468,12 @@
++ cookie-domain
^- cord
?- r.hat
{$| @} (cat 3 '; Domain=' (rsh 3 1 (scot %if p.r.hat)))
{$& $org $urbit *} '; Domain=.urbit.org'
{$& @ @ *} =- (rap 3 "; Domain={-}{i.p.r.hat ~}")
{%| @} (cat 3 '; Domain=' (rsh 3 1 (scot %if p.r.hat)))
{%& $org $urbit *} '; Domain=.urbit.org'
{%& @ @ *} =- (rap 3 "; Domain={-}{i.p.r.hat ~}")
(turn (flop `path`t.p.r.hat) |=(a/knot (cat 3 a '.')))
{$& *} '' :: XX security?
{%& *} '' :: XX security?
==
::
++ set-cookie
@ -1566,7 +1566,7 @@
..ya
=+ sap=(~(get by sop) ses)
:: ~& sap+sap
?. ?=({~ @ $|} sap)
?. ?=({~ @ %|} sap)
..ya
(ames-gram -.u.sap aut+~ ses)
==
@ -1960,14 +1960,14 @@
++ on-ford-fail
|: $:{err/$-(tang _boss) try/$-((each cage tang) _boss)}
|= a/(each cage tang) ^+ abet
?-(-.a $| (err p.a), $& (try a))
?-(-.a %| (err p.a), %& (try a))
::
++ on-error
|: $:{err/$-(tang _boss) handle-move/_|.(|~(vase abet))}
|= a/(each cage tang) ^+ abet
=+ try=(possibly-stateful |:(b=self (handle-move(+ b)))) :: XX types
?: ?=($| -.a) (err p.a)
=- ?-(-.- $& p.-, $| (err p.-))
?: ?=(%| -.a) (err p.a)
=- ?-(-.- %& p.-, %| (err p.-))
(mule |.(~|(driver+dom ~|(bad-res+p.q.p.a (try q.p.a)))))
::
++ possibly-stateful
@ -2038,7 +2038,7 @@
++ scry
|= {fur/(unit (set monk)) ren/@tas why/shop syd/desk lot/coin tyl/path}
^- (unit (unit cage))
?. ?=($& -.why) ~
?. ?=(%& -.why) ~
=* who p.why
=+ our=(need hov) :: XX single home
=+ ska=(sloy ski)

38
sys/vane/ford.hoon
View File

@ -234,8 +234,8 @@
|= {a/cafe b/gage}
?- -.b
$tabl (err:bo a >%bad-marc< ~)
$| (err:bo a p.b)
$& (new:bo a p.b)
%| (err:bo a p.b)
%& (new:bo a p.b)
==
::
++ catch-error
@ -371,18 +371,18 @@
$0 [%0 p=*(set dent) q=(fun p.ton)]
$1 :: ~& [%from-toon:bo-need ((list path) p.ton)]
=- ?- -.faw :: TODO =;
$& :- %1
%& :- %1
^= p
%- silt
%+ turn p.faw
|=(a/{vane care:clay beam} [-.a +<.a +>.a *tang])
$| [%2 p=*(set dent) q=p.faw]
%| [%2 p=*(set dent) q=p.faw]
==
^= faw
|- ^- (each (list (trel vane care:clay beam)) tang)
?~ p.ton [%& ~]
=+ nex=$(p.ton t.p.ton)
=+ err=|=(a/tape [%| leaf+a ?:(?=($& -.nex) ~ p.nex)])
=+ 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))
@ -393,13 +393,13 @@
(err "blocking not beam: {<t.pax>}")
?: ?=($g (end 3 1 i.pax))
?- -.nex
$& [%& [%g u.ren u.zis] p.nex]
$| nex
%& [%& [%g u.ren u.zis] p.nex]
%| nex
==
?: ?=($c (end 3 1 i.pax))
?- -.nex
$& [%& [%c u.ren u.zis] p.nex]
$| nex
%& [%& [%c u.ren u.zis] p.nex]
%| nex
==
(err "blocking bad vane")
==
@ -409,8 +409,8 @@
|* {tod/(each * tang) fun/gate}
%+ (from-toon cof)
?- -.tod
$& [%0 p=p.tod]
$| [%2 p=p.tod]
%& [%0 p=p.tod]
%| [%2 p=p.tod]
==
fun
::
@ -1064,7 +1064,7 @@
?> ?=($g van)
=. kig (~(del in kig) +<-.$) :: TODO rename kig
=. pass (pass (cancel van ren bem))
?: ?=($| -.gag)
?: ?=(%| -.gag)
abut:(give [%made dep %| leaf+"ford-scry-made-fail" p.gag])
?: ?=($tabl -.gag)
abut:(give [%made dep %| leaf+"ford-scry-made-strange" ~])
@ -1376,7 +1376,7 @@
~[leaf+"ford: keel" rose+[" " ~ ~]^(murn yom +)]
|= {a/wing b/type *} ^- (unit tank)
=+ typ=(mule |.(p:(slap suh wing+a)))
?: ?=($| -.typ)
?: ?=(%| -.typ)
(some (show [%c %pull] %l a))
?: (~(nest ut p.typ) | b) ~
%^ some %palm ["." ~ ~ ~]
@ -1650,8 +1650,8 @@
|= {cof/cafe sut/type gen/hoon}
=+ puz=(mule |.((~(mint ut sut) [%noun gen])))
?- -.puz
$| (err:bo cof p.puz)
$& (new:bo cof p.puz)
%| (err:bo cof p.puz)
%& (new:bo cof p.puz)
==
::
++ wrapped-slap
@ -1860,8 +1860,8 @@
%+ admit:bo |.(%.(%want ~(dunk ut (~(peek ut gat) %free 6))))
=+ top=(mule |.((slit gat sam)))
?- -.top
$| (err:bo cof p.top)
$& (new:bo cof p.top)
%| (err:bo cof p.top)
%& (new:bo cof p.top)
==
::
++ maul :: slam
@ -2139,8 +2139,8 @@
|= {cof/cafe hop/hoop}
^- (bolt _..wilt)
?- -.hop
$& (new:bo cof ..wilt(boy [p.hop boy]))
$|
%& (new:bo cof ..wilt(boy [p.hop boy]))
%|
=. r.p.hop ?:(?=({$ud $0} r.p.hop) r.how r.p.hop)
%+ admit:bo |.(leaf+"ford: wilt {<[(en-beam p.hop)]>}")
%+ tug:bo (load-arch cof p.hop)

54
sys/vane/gall.hoon
View File

@ -150,11 +150,11 @@
^+ +>
?- -.gux
$tabl ~|(%made-tabl !!)
$|
%|
=. +> (mo-bold byk dap dep)
=. +> (mo-give %onto %| p.gux)
+>
$&
%&
?> ?=(@ p.p.gux)
?. (mo-okay q.p.gux)
(mo-give %onto %| [%leaf "{<dap>}: bogus core"]~)
@ -196,8 +196,8 @@
=. +>.$ (mo-bold byk dap dep)
?- -.gux
$tabl ~|(%made-tabl !!)
$| (mo-give %onto %| p.gux)
$& ?> ?=(@ p.p.gux)
%| (mo-give %onto %| p.gux)
%& ?> ?=(@ p.p.gux)
ap-abet:(ap-peep:(ap-abed:ap dap [%high [~ our]]) q.p.gux)
==
::
@ -335,8 +335,8 @@
?> ?=({$f $made *} sih)
?- -.q.+.sih
$tabl ~|(%made-tabl !!)
$& (mo-give %unto %diff p.q.+>.sih)
$| =. p.q.+>.sih (turn p.q.+>.sih |=(a/tank rose+[~ "! " ~]^[a]~))
%& (mo-give %unto %diff p.q.+>.sih)
%| =. p.q.+>.sih (turn p.q.+>.sih |=(a/tank rose+[~ "! " ~]^[a]~))
~> %slog.`%*(. >[%wh %y]< +> [>%mo-cyst-fail< (flop p.q.+>.sih)])
(mo-give %unto %quit ~) :: XX better errors pls
==
@ -366,8 +366,8 @@
==
?- -.q.+>.sih
$tabl ~|(%made-tabl !!)
$| (mo-give %mack `p.q.+>.sih) :: XX should crash
$& =. +>.$ (mo-give %mack ~) :: XX pump should ack
%| (mo-give %mack `p.q.+>.sih) :: XX should crash
%& =. +>.$ (mo-give %mack ~) :: XX pump should ack
(mo-give(hen (mo-ball him num)) %unto %diff `cage`p.q.+>.sih)
==
::
@ -380,8 +380,8 @@
?: ?=({$f $made *} sih)
?- -.q.+>.sih
$tabl ~|(%made-tabl !!)
$| (mo-give %mack `p.q.+>.sih) :: XX should crash
$& (mo-pass [%sys pax] %g %deal [him our] i.t.t.pax %poke p.q.+>.sih)
%| (mo-give %mack `p.q.+>.sih) :: XX should crash
%& (mo-pass [%sys pax] %g %deal [him our] i.t.t.pax %poke p.q.+>.sih)
==
?: ?=({$a $woot *} sih) +>.$ :: quit ack, boring
?> ?=({$g $unto *} sih)
@ -401,8 +401,8 @@
?> ?=({$f $made *} sih)
?- -.q.+>.sih
$tabl !!
$| (mo-give %unto %coup `p.q.+>.sih) :: XX invalid, crash
$& (mo-clip dap `prey`[%high ~ him] %poke p.q.sih)
%| (mo-give %unto %coup `p.q.+>.sih) :: XX invalid, crash
%& (mo-clip dap `prey`[%high ~ him] %poke p.q.sih)
==
::
$way :: outbound request
@ -606,9 +606,9 @@
^- {(unit tang) _+>}
=. +> ap-bowl
=^ arm +>.$ (ap-farm cog)
?: ?=($| -.arm) [`p.arm +>.$]
?: ?=(%| -.arm) [`p.arm +>.$]
=^ zem +>.$ (ap-slam cog p.arm arg)
?: ?=($| -.zem) [`p.zem +>.$]
?: ?=(%| -.zem) [`p.zem +>.$]
(ap-sake p.zem)
::
++ ap-peek
@ -623,9 +623,9 @@
?~ cug
((slog leaf+"peek find fail" >tyl< >mar< ~) [~ ~])
=^ arm +>.$ (ap-farm q.u.cug)
?: ?=($| -.arm) ((slog leaf+"peek farm fail" p.arm) [~ ~])
?: ?=(%| -.arm) ((slog leaf+"peek farm fail" p.arm) [~ ~])
=^ zem +>.$ (ap-slam q.u.cug p.arm !>((slag p.u.cug `path`[ren tyl])))
?: ?=($| -.zem) ((slog leaf+"peek slam fail" p.zem) [~ ~])
?: ?=(%| -.zem) ((slog leaf+"peek slam fail" p.zem) [~ ~])
?+ q.p.zem ((slog leaf+"peek bad result" ~) [~ ~])
$~ ~
{$~ $~} [~ ~]
@ -694,7 +694,7 @@
|= cog/term
^- {(each vase tang) _+>}
=+ pyz=(mule |.((~(mint wa vel) p.hav [%limb cog])))
?: ?=($| -.pyz)
?: ?=(%| -.pyz)
:_(+>.$ [%| +.pyz])
:_ +>.$(vel `worm`+>.pyz)
=+ ton=(mock [q.hav q.+<.pyz] ap-sled)
@ -851,7 +851,7 @@
|= {sto/bone vax/vase}
^- {(each cove tang) _+>}
=^ yep +>.$ (ap-move-mess vax)
?: ?=($| -.yep) :_(+>.$ yep)
?: ?=(%| -.yep) :_(+>.$ yep)
=^ gaw vel (~(slot wa vel) 7 vax)
?. &(?=({p/@ q/*} q.gaw) ((sane %tas) p.q.gaw))
:_(+>.$ [%| (ap-suck "poke: malformed cage")])
@ -866,7 +866,7 @@
^- {(each cove tang) _+>}
=^ yep +>.$ (ap-move-mess vax)
:_ +>.$
?: ?=($| -.yep) yep
?: ?=(%| -.yep) yep
=+ mar=((soft mark) +>-.q.vax)
?~ mar
[%| (ap-suck "peel: malformed mark")]
@ -887,7 +887,7 @@
^- {(each cove tang) _+>}
=^ yep +>.$ (ap-move-mess vax)
:_ +>.$
?: ?=($| -.yep) yep
?: ?=(%| -.yep) yep
=+ pux=((soft path) +>.q.vax)
?. &(?=(^ pux) (levy u.pux (sane %ta)))
[%| (ap-suck "peer: malformed path")]
@ -905,7 +905,7 @@
^- {(each cove tang) _+>}
=^ yep +>.$ (ap-move-mess vax)
:_ +>.$
?: ?=($| -.yep) yep
?: ?=(%| -.yep) yep
?. =(~ +>.q.vax)
[%| (ap-suck "pull: malformed card")]
:^ %& sto %pass
@ -1136,11 +1136,11 @@
?@ q.vax :_(+>.$ [%| (ap-suck "move: malformed list")])
=^ hed vel (~(slot wa vel) 2 vax)
=^ sud +>.$ (ap-move hed)
?: ?=($| -.sud) :_(+>.$ sud)
?: ?=(%| -.sud) :_(+>.$ sud)
=^ tel vel (~(slot wa vel) 3 vax)
=^ res +>.$ $(vax tel)
:_ +>.$
?: ?=($| -.res) res
?: ?=(%| -.res) res
[%& p.sud p.res]
::
++ ap-sake :: handle result
@ -1150,10 +1150,10 @@
[`(ap-suck "sake: invalid product (atom)") +>.$]
=^ hed vel (~(slot wa vel) 2 vax)
=^ muz +>.$ (ap-safe hed)
?: ?=($| -.muz) [`p.muz +>.$]
?: ?=(%| -.muz) [`p.muz +>.$]
=^ tel vel (~(slot wa vel) 3 vax)
=^ sav +>.$ (ap-save tel)
?: ?=($| -.sav) [`p.sav +>.$]
?: ?=(%| -.sav) [`p.sav +>.$]
:- ~
%_ +>.$
zip (weld (flop p.muz) zip)
@ -1175,7 +1175,7 @@
^- {(each vase tang) _+>}
=+ ^= wyz %- mule |.
(~(mint wa vel) [%cell p.gat p.arg] [%cnsg [%$ ~] [%$ 2] [%$ 3] ~])
?: ?=($| -.wyz)
?: ?=(%| -.wyz)
%- =+ sam=(~(peek ut p.gat) %free 6)
(slog >%ap-slam-mismatch< ~(duck ut p.arg) ~(duck ut sam) ~)
:_(+>.$ [%| (ap-suck "call: {<cog>}: type mismatch")])
@ -1291,7 +1291,7 @@
++ scry
|= {fur/(unit (set monk)) ren/@tas why/shop syd/desk lot/coin tyl/path}
^- (unit (unit cage))
?. ?=($& -.why) ~
?. ?=(%& -.why) ~
=* his p.why
?: ?& =(%u ren)
=(~ tyl)

16
sys/vane/jael.hoon
View File

@ -379,15 +379,15 @@
++ div :: allocate
|= b/@ud
^- (unit (pair pile pile))
=< ?-(- $& [~ p], $| ~)
=< ?-(- %& [~ p], %| ~)
|- ^- (each (pair pile pile) @u)
?: =(0 b)
[%& ~ a]
?~ a [%| 0]
=/ al $(a l.a)
?- -.al
$& [%& p.p.al a(l q.p.al)]
$|
%& [%& p.p.al a(l q.p.al)]
%|
=. b (^sub b p.al)
=/ top +((^sub q.n.a p.n.a))
?: =(b top)
@ -398,8 +398,8 @@
(uni(a r.a) [n.a ~ ~])
=/ ar $(a r.a, b (^sub b top))
?- -.ar
$& [%& a(r p.p.ar) q.p.ar]
$| [%| :(add top p.al p.ar)]
%& [%& a(r p.p.ar) q.p.ar]
%| [%| :(add top p.al p.ar)]
==
==
::
@ -1147,7 +1147,7 @@
::
:: pig: purse report for partner
::
?. ?=($| -.q.hug) ..feel
?. ?=(%| -.q.hug) ..feel
=* pig (~(lawn ur urb) our p.hug)
%_ ..feel
moz :_ moz
@ -1627,8 +1627,8 @@
=/ gob (fall (~(get by shy) pal) *safe)
=/ yer ^- (pair bump safe)
?- -.rem
$& [[p.rem ~] (~(splice up gob) p.rem)]
$| [(~(differ up gob) p.rem) p.rem]
%& [[p.rem ~] (~(splice up gob) p.rem)]
%| [(~(differ up gob) p.rem) p.rem]
==
%_ +>.$
shy (~(put by shy) pal q.yer)

68
sys/zuse.hoon
View File

@ -429,12 +429,12 @@
++ mood {p/care q/case r/path} :: request in desk
++ mool {p/case q/(set (pair care path))} :: requests in desk
++ nori :: repository action
$% {$& p/soba} :: delta
{$| p/@tas} :: label
$% {%& p/soba} :: delta
{%| p/@tas} :: label
== ::
++ nuri :: repository action
$% {$& p/suba} :: delta
{$| p/@tas} :: label
$% {%& p/suba} :: delta
{%| p/@tas} :: label
== ::
++ page (cask *) :: untyped cage
++ plop blob :: unvalidated blob
@ -463,8 +463,8 @@
++ toro {p/@ta q/nori} :: general change
++ unce :: change part
|* a/mold ::
$% {$& p/@ud} :: skip[copy]
{$| p/(list a) q/(list a)} :: p -> q[chunk]
$% {%& p/@ud} :: skip[copy]
{%| p/(list a) q/(list a)} :: p -> q[chunk]
== ::
++ urge |*(a/mold (list (unce a))) :: list change
++ yaki :: commit
@ -707,8 +707,8 @@
++ quay (list {p/@t q/@t}) :: parsed url query
++ quer |-($@($~ {p/@t q/@t t/$})) :: query tree
++ quri :: request-uri
$% {$& p/purl} :: absolute
{$| p/pork q/quay} :: relative
$% {%& p/purl} :: absolute
{%| p/pork q/quay} :: relative
== ::
++ rout {p/(list host) q/path r/oryx s/path} :: http route (new)
++ sec-move :: driver effect
@ -742,9 +742,9 @@
-- ::able
++ bilk (pair beak silk) :: sourced request
++ gage :: recursive cage+tang
$% {$& p/cage} :: success
$% {%& p/cage} :: success
{$tabl p/(list (pair gage gage))} :: table of results
{$| p/tang} :: error
{%| p/tang} :: error
== ::
++ hood :: assembly plan
$: zus/@ud :: zuse kelvin
@ -755,8 +755,8 @@
== ::
++ hoof (trel ? term (unit (pair case ship))) :: resource reference
++ hoop :: source in hood
$% {$& p/hoon} :: direct hoon
{$| p/beam} :: resource location
$% {%& p/hoon} :: direct hoon
{%| p/beam} :: resource location
== ::
++ hops :: XX late-bound path
$: pre/(unit tyke) ::
@ -1994,8 +1994,8 @@
%- ~(en cbca key 0)
%+ mix +.pdt
?- -.pdt
$& -.sub
$| +.sub
%& -.sub
%| +.sub
==
:: spec says MSBs, LSBs match test vectors
::
@ -2014,8 +2014,8 @@
%- ~(en cbcb key 0)
%+ mix +.pdt
?- -.pdt
$& -.sub
$| +.sub
%& -.sub
%| +.sub
==
:: spec says MSBs, LSBs match test vectors
::
@ -2034,8 +2034,8 @@
%- ~(en cbcc key 0)
%+ mix +.pdt
?- -.pdt
$& -.sub
$| +.sub
%& -.sub
%| +.sub
==
:: spec says MSBs, LSBs match test vectors
::
@ -3394,8 +3394,8 @@
?~ bur ~
:_ $(bur t.bur)
?- -.i.bur
$& i.bur
$| [%| q.i.bur p.i.bur]
%& i.bur
%| [%| q.i.bur p.i.bur]
==
:: :: ++loss:differ
++ loss :: longest subsequence
@ -3474,14 +3474,14 @@
|- ^+ hel
?~ rug (flop war)
?- -.i.rug
$&
%&
%= $
rug t.rug
hel (slag p.i.rug hel)
war (weld (flop (scag p.i.rug hel)) war)
==
::
$|
%|
%= $
rug t.rug
hel =+ gur=(flop p.i.rug)
@ -3495,7 +3495,7 @@
++ lusk :: lcs to list patch
|* {hel/(list) hev/(list) lcs/(list)}
=+ ^= rag
^- {$%({$& p/@ud} {$| p/_lcs q/_lcs})}
^- {$%({%& p/@ud} {%| p/_lcs q/_lcs})}
[%& 0]
=> .(rag [p=rag q=*(list _rag)])
=< abet =< main
@ -3509,13 +3509,13 @@
|: new=p.rag
^+ rag
?- -.p.rag
$| ?- -.new
$| [[%| (weld p.new p.p.rag) (weld q.new q.p.rag)] q.rag]
$& [new [p.rag q.rag]]
%| ?- -.new
%| [[%| (weld p.new p.p.rag) (weld q.new q.p.rag)] q.rag]
%& [new [p.rag q.rag]]
==
$& ?- -.new
$| [new ?:(=(0 p.p.rag) q.rag [p.rag q.rag])]
$& [[%& (add p.p.rag p.new)] q.rag]
%& ?- -.new
%| [new ?:(=(0 p.p.rag) q.rag [p.rag q.rag])]
%& [[%& (add p.p.rag p.new)] q.rag]
==
==
:: :: ++main:lusk:differ
@ -3936,8 +3936,8 @@
++ apex ::
|= qur/quri ^- tape
?- -.qur
$& (weld (head p.p.qur) `tape`$(qur [%| +.p.qur]))
$| ['/' (weld (body p.qur) (tail q.qur))]
%& (weld (head p.p.qur) `tape`$(qur [%| +.p.qur]))
%| ['/' (weld (body p.qur) (tail q.qur))]
==
:: :: ++apix:en-purl:html
++ apix :: purf to tape
@ -3960,8 +3960,8 @@
?:(&(p.har !?=(hoke r.har)) "https://" "http://")
::
?- -.r.har
$| (trip (rsh 3 1 (scot %if p.r.har)))
$& =+ rit=(flop p.r.har)
%| (trip (rsh 3 1 (scot %if p.r.har)))
%& =+ rit=(flop p.r.har)
|- ^- tape
?~ rit ~
(weld (trip i.rit) ?~(t.rit "" `tape`['.' $(rit t.rit)]))
@ -4575,7 +4575,7 @@
^- toro
~| %furl
?> ?& =(p.one p.two) :: same path
&(?=($& -.q.one) ?=($& -.q.two)) :: both deltas
&(?=(%& -.q.one) ?=(%& -.q.two)) :: both deltas
==
[p.one [%& (weld p.q.one p.q.two)]]
-- ::space

4
web/unmark/all.hoon
View File

@ -28,8 +28,8 @@
%- mule |.
elm:(static:cram (rash (nule:unix ';>' a) apex:(sail &):vast))
?- -.try
$& p.try
$| ;div
%& p.try
%| ;div
;h3: ERROR
;pre: {(wush 120 p.try)}
== ==