mirror of
https://github.com/urbit/shrub.git
synced 2025-01-03 10:02:32 +03:00
Completed syntax adaptation of main code path.
This commit is contained in:
C. Guy Yarvin
parent
c57a7615dd
commit
b3a08a9fb3
@ -625,13 +625,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) [%cnzy %q]))
|
||||
=+ pom=(sole-prompt +<.q.vax)
|
||||
@ -648,13 +648,13 @@
|
||||
=+ 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))
|
||||
::
|
||||
{$|}
|
||||
$|
|
||||
=+ hiz=;;(hiss +<.q.vax)
|
||||
=. ..dy (he-diff %tan leaf/"< {(earn p.hiz)}" ~)
|
||||
(dy-eyre(pro `(slap (slot 7 vax) cnzy/%q)) /scar hiz)
|
||||
@ -759,8 +759,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
|
||||
@ -770,7 +770,7 @@
|
||||
^- msg+(unit tape)
|
||||
?+ (clan our.hid) ~
|
||||
$pawn ?+ egg ~
|
||||
$5 `":: To request a planet, run |ask 'your@email.co'"
|
||||
$5 `":: To request a planet, run |ask 'your@email.co'"
|
||||
== ==
|
||||
::
|
||||
++ he-abet :: resolve
|
||||
@ -842,16 +842,16 @@
|
||||
?> ?=(^ poy)
|
||||
=< he-pine
|
||||
?- -.reg
|
||||
{$&} %. p.reg
|
||||
=+ dye=~(. dy u.poy(pux ~))
|
||||
?+ way !!
|
||||
{$hand $~} dy-hand:dye
|
||||
{$dial $~} dy-made-dial:dye
|
||||
{$gent $~} dy-made-gent:dye
|
||||
{$scar $~} dy-made-scar:dye
|
||||
{$edit $~} dy-made-edit:dye
|
||||
==
|
||||
{$|} (he-diff(poy ~) %tan p.reg)
|
||||
$& %. p.reg
|
||||
=+ dye=~(. dy u.poy(pux ~))
|
||||
?+ way !!
|
||||
{$hand $~} dy-hand:dye
|
||||
{$dial $~} dy-made-dial:dye
|
||||
{$gent $~} dy-made-gent:dye
|
||||
{$scar $~} dy-made-scar:dye
|
||||
{$edit $~} dy-made-edit:dye
|
||||
==
|
||||
$| (he-diff(poy ~) %tan p.reg)
|
||||
$tabl !!
|
||||
==
|
||||
::
|
||||
@ -917,16 +917,16 @@
|
||||
==
|
||||
=+ doy=(he-duke txt)
|
||||
?- -.doy
|
||||
{$|} (he-diff [%err p.doy])
|
||||
{$&}
|
||||
$| (he-diff [%err p.doy])
|
||||
$&
|
||||
?~ p.doy
|
||||
(he-diff [%err (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)
|
||||
==
|
||||
==
|
||||
::
|
||||
|
||||
@ -182,8 +182,8 @@
|
||||
^- (set partner)
|
||||
?~ 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)
|
||||
==
|
||||
::
|
||||
++ para :: partners alias
|
||||
@ -1420,15 +1420,15 @@
|
||||
^+ +>
|
||||
:: ~& [%ra-conduct pub her tay]
|
||||
?- -.tay
|
||||
{$&} ?: pub
|
||||
=. her our.hid :: XX security!
|
||||
?: =(her p.p.tay)
|
||||
(ra-record q.p.tay p.p.tay tip)
|
||||
(ra-transmit p.tay tip)
|
||||
?. =(our.hid p.p.tay)
|
||||
+>
|
||||
(ra-record q.p.tay her tip)
|
||||
{$|} !!
|
||||
$& ?: pub
|
||||
=. her our.hid :: XX security!
|
||||
?: =(her p.p.tay)
|
||||
(ra-record q.p.tay p.p.tay tip)
|
||||
(ra-transmit p.tay tip)
|
||||
?. =(our.hid p.p.tay)
|
||||
+>
|
||||
(ra-record q.p.tay her tip)
|
||||
$| !!
|
||||
==
|
||||
::
|
||||
++ ra-record :: add to story
|
||||
@ -1560,16 +1560,16 @@
|
||||
|= tay+partner
|
||||
^- (list card)
|
||||
?- -.tay
|
||||
{$|} ~& tweet-abjure/p.p.tay
|
||||
!!
|
||||
$| ~& tweet-abjure/p.p.tay
|
||||
!!
|
||||
::
|
||||
{$&} ~& [%pa-abjure [our.hid man] [p.p.tay q.p.tay]]
|
||||
:_ ~
|
||||
:* %pull
|
||||
/friend/show/[man]/(scot %p p.p.tay)/[q.p.tay]
|
||||
[p.p.tay %talk]
|
||||
~
|
||||
==
|
||||
$& ~& [%pa-abjure [our.hid man] [p.p.tay q.p.tay]]
|
||||
:_ ~
|
||||
:* %pull
|
||||
/friend/show/[man]/(scot %p p.p.tay)/[q.p.tay]
|
||||
[p.p.tay %talk]
|
||||
~
|
||||
==
|
||||
==
|
||||
::
|
||||
++ pa-acquire :: subscribe to
|
||||
@ -1582,14 +1582,14 @@
|
||||
:: =+ num=(fall (~(get by sequence) tay) 0) :: XX unused
|
||||
=+ old=(sub now.hid ~d1)
|
||||
?- -.tay
|
||||
{$|} !!
|
||||
{$&} :: ~& [%pa-acquire [our.hid man] [p.p.tay q.p.tay]]
|
||||
:_ ~
|
||||
:* %peer
|
||||
/friend/show/[man]/(scot %p p.p.tay)/[q.p.tay]
|
||||
[p.p.tay %talk]
|
||||
/afx/[q.p.tay]/(scot %da old)
|
||||
==
|
||||
$| !!
|
||||
$& :: ~& [%pa-acquire [our.hid man] [p.p.tay q.p.tay]]
|
||||
:_ ~
|
||||
:* %peer
|
||||
/friend/show/[man]/(scot %p p.p.tay)/[q.p.tay]
|
||||
[p.p.tay %talk]
|
||||
/afx/[q.p.tay]/(scot %da old)
|
||||
==
|
||||
==
|
||||
::
|
||||
++ pa-reform :: reconfigure, ugly
|
||||
@ -1832,18 +1832,18 @@
|
||||
++ ta-beat :: more relevant
|
||||
|= two+partner ^- ?
|
||||
?- -.one
|
||||
{$&}
|
||||
$&
|
||||
?- -.two
|
||||
{$|} %&
|
||||
{$&} (~(sn-best sn man p.one) p.two)
|
||||
$| %&
|
||||
$& (~(sn-best sn man p.one) p.two)
|
||||
==
|
||||
::
|
||||
{$|}
|
||||
$|
|
||||
?- -.two
|
||||
{$&} %|
|
||||
{$|} ?: =(-.p.two -.p.one)
|
||||
(lth (mug +.p.one) (mug +.p.two))
|
||||
(lth -.p.two -.p.one)
|
||||
$& %|
|
||||
$| ?: =(-.p.two -.p.one)
|
||||
(lth (mug +.p.one) (mug +.p.two))
|
||||
(lth -.p.two -.p.one)
|
||||
==
|
||||
==
|
||||
++ ta-best :: most relevant
|
||||
@ -1854,14 +1854,14 @@
|
||||
|= moy+(unit ?)
|
||||
^- tape
|
||||
?- -.one
|
||||
{$&}
|
||||
$&
|
||||
?~ moy
|
||||
=+ cha=(~(get by nik) one ~ ~)
|
||||
=- ?~(cha - "'{u.cha ~}' {-}")
|
||||
~(sn-phat sn man p.one)
|
||||
(~(sn-curt sn man p.one) u.moy)
|
||||
::
|
||||
{$|}
|
||||
$|
|
||||
=+ ^= pre ^- tape
|
||||
?- -.p.one
|
||||
$twitter "@t:"
|
||||
|
||||
@ -257,8 +257,8 @@
|
||||
(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)]
|
||||
~
|
||||
==
|
||||
@ -275,11 +275,11 @@
|
||||
=* hed i.p.gag
|
||||
?- -.p.hed
|
||||
$tabl (mule |.(`$~`(ford-fail >%strange-gage< ~)))
|
||||
{$|} (mule |.(`$~`(ford-fail p.p.hed)))
|
||||
{$&} ?- -.q.hed
|
||||
$| (mule |.(`$~`(ford-fail p.p.hed)))
|
||||
$& ?- -.q.hed
|
||||
$tabl (mule |.(`$~`(ford-fail >%strange-gage< ~)))
|
||||
{$|} (mule |.(`$~`(ford-fail p.q.hed)))
|
||||
{$&} =+ $(p.gag t.p.gag)
|
||||
$| (mule |.(`$~`(ford-fail p.q.hed)))
|
||||
$& =+ $(p.gag t.p.gag)
|
||||
?+(- [[p.p p.q]:hed -] {@ *} -)
|
||||
== ==
|
||||
::
|
||||
@ -477,19 +477,19 @@
|
||||
^+ +>
|
||||
=+ pre=`path`~[(scot %p her) syd (scot %ud let.dom)]
|
||||
?- -.lem
|
||||
{$|} (print-to-dill '=' %leaf :(weld (trip p.lem) " " (spud pre)))
|
||||
{$&} |- ^+ +>.^$
|
||||
?~ p.lem +>.^$
|
||||
=. +>.^$
|
||||
%+ print-to-dill
|
||||
?-(-.q.i.p.lem $del '-', $ins '+', $dif ':')
|
||||
:+ %rose ["/" "/" ~]
|
||||
%+ turn (weld pre p.i.p.lem)
|
||||
|= a+cord
|
||||
?: ((sane %ta) a)
|
||||
[%leaf (trip a)]
|
||||
[%leaf (dash:ut (trip a) '\'')]
|
||||
$(p.lem t.p.lem)
|
||||
$| (print-to-dill '=' %leaf :(weld (trip p.lem) " " (spud pre)))
|
||||
$& |- ^+ +>.^$
|
||||
?~ p.lem +>.^$
|
||||
=. +>.^$
|
||||
%+ print-to-dill
|
||||
?-(-.q.i.p.lem $del '-', $ins '+', $dif ':')
|
||||
:+ %rose ["/" "/" ~]
|
||||
%+ turn (weld pre p.i.p.lem)
|
||||
|= a+cord
|
||||
?: ((sane %ta) a)
|
||||
[%leaf (trip a)]
|
||||
[%leaf (dash:ut (trip a) '\'')]
|
||||
$(p.lem t.p.lem)
|
||||
==
|
||||
::
|
||||
:: This is the entry point to the commit flow. It deserves some
|
||||
@ -1432,26 +1432,26 @@
|
||||
|= {wen+@da lem+nuri} :: edit
|
||||
^- {(unit (map path lobe)) _..ze}
|
||||
?- -.lem
|
||||
{$&}
|
||||
=^ yak lat.ran :: merge objects
|
||||
%+ forge-yaki wen
|
||||
?: =(let.dom 0) :: initial import
|
||||
[~ p.lem]
|
||||
[(some r:(aeon-to-yaki let.dom)) p.lem]
|
||||
?. ?| =(0 let.dom)
|
||||
!=((lent p.yak) 1)
|
||||
!(equiv q.yak q:(aeon-to-yaki let.dom))
|
||||
==
|
||||
`..ze :: silently ignore
|
||||
=: let.dom +(let.dom)
|
||||
hit.dom (~(put by hit.dom) +(let.dom) r.yak)
|
||||
hut.ran (~(put by hut.ran) r.yak yak)
|
||||
==
|
||||
[`q.yak ..ze]
|
||||
:: +>.$(ank (checkout-ankh q.yak))
|
||||
{$|}
|
||||
?< (~(has by lab.dom) p.lem)
|
||||
[~ ..ze(lab.dom (~(put by lab.dom) p.lem let.dom))]
|
||||
$&
|
||||
=^ yak lat.ran :: merge objects
|
||||
%+ forge-yaki wen
|
||||
?: =(let.dom 0) :: initial import
|
||||
[~ p.lem]
|
||||
[(some r:(aeon-to-yaki let.dom)) p.lem]
|
||||
?. ?| =(0 let.dom)
|
||||
!=((lent p.yak) 1)
|
||||
!(equiv q.yak q:(aeon-to-yaki let.dom))
|
||||
==
|
||||
`..ze :: silently ignore
|
||||
=: let.dom +(let.dom)
|
||||
hit.dom (~(put by hit.dom) +(let.dom) r.yak)
|
||||
hut.ran (~(put by hut.ran) r.yak yak)
|
||||
==
|
||||
[`q.yak ..ze]
|
||||
:: +>.$(ank (checkout-ankh q.yak))
|
||||
$|
|
||||
?< (~(has by lab.dom) p.lem)
|
||||
[~ ..ze(lab.dom (~(put by lab.dom) p.lem let.dom))]
|
||||
==
|
||||
::
|
||||
++ equiv :: test paths
|
||||
|
||||
@ -298,8 +298,8 @@
|
||||
{$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 *}
|
||||
|
||||
@ -576,10 +576,10 @@
|
||||
=+ maf=(eat-headers r.heq)
|
||||
=+ ^= pul ^- purl
|
||||
?- -.ryp
|
||||
{$&} ?>(=(sec p.p.p.ryp) p.ryp)
|
||||
{$|} =+ hot=(~(get ja maf) %host)
|
||||
?> ?=({@ $~} hot)
|
||||
[[sec (rash i.hot thor:epur)] p.ryp q.ryp]
|
||||
$& ?>(=(sec p.p.p.ryp) p.ryp)
|
||||
$| =+ hot=(~(get ja maf) %host)
|
||||
?> ?=({@ $~} hot)
|
||||
[[sec (rash i.hot thor:epur)] p.ryp q.ryp]
|
||||
==
|
||||
=. p.p.pul |(p.p.pul ?=(hoke r.p.pul))
|
||||
=+ her=(host-to-ship r.p.pul)
|
||||
@ -744,8 +744,8 @@
|
||||
|= {sus+(each duct ixor) con+_..axon}
|
||||
=. ..axon con
|
||||
?- -.sus
|
||||
{$&} (give-json(hen p.sus) 205 ~ %b &)
|
||||
{$|} (get-even:(ire-ix p.sus) +.sih)
|
||||
$& (give-json(hen p.sus) 205 ~ %b &)
|
||||
$| (get-even:(ire-ix p.sus) +.sih)
|
||||
==
|
||||
::
|
||||
$made
|
||||
|
||||
@ -113,8 +113,8 @@
|
||||
|= {a+cafe b+gage} ^- (bolt cage)
|
||||
?- -.b
|
||||
$tabl (flaw a >%bad-marc< ~)
|
||||
{$|} (flaw a p.b)
|
||||
{$&} (fine a p.b)
|
||||
$| (flaw a p.b)
|
||||
$& (fine a p.b)
|
||||
==
|
||||
::
|
||||
++ fret :: lift error
|
||||
@ -430,12 +430,12 @@
|
||||
$0 [%0 p=*(set beam) q=(fun p.ton)]
|
||||
$1 :: ~& [%coup-need ((list path) p.ton)]
|
||||
=- ?- -.faw
|
||||
{$&} :- %1
|
||||
^= p
|
||||
%- sa
|
||||
%+ turn p.faw
|
||||
|=(a+{care beam} [-.a +.a *tang])
|
||||
{$|} [%2 p=*(set beam) q=p.faw]
|
||||
$& :- %1
|
||||
^= p
|
||||
%- sa
|
||||
%+ turn p.faw
|
||||
|=(a+{care beam} [-.a +.a *tang])
|
||||
$| [%2 p=*(set beam) q=p.faw]
|
||||
==
|
||||
^= faw
|
||||
|- ^- (each (list (pair care beam)) tang)
|
||||
@ -453,8 +453,8 @@
|
||||
?~ zis
|
||||
(err "blocking not beam")
|
||||
?- -.nex
|
||||
{$&} [%& [u.ren u.zis] p.nex]
|
||||
{$|} nex
|
||||
$& [%& [u.ren u.zis] p.nex]
|
||||
$| nex
|
||||
==
|
||||
==
|
||||
::
|
||||
@ -463,8 +463,8 @@
|
||||
|* {tod+(each * tang) fun+$+(* *)}
|
||||
%+ (coup cof)
|
||||
?- -.tod
|
||||
{$&} [%0 p=p.tod]
|
||||
{$|} [%2 p=p.tod]
|
||||
$& [%0 p=p.tod]
|
||||
$| [%2 p=p.tod]
|
||||
==
|
||||
fun
|
||||
::
|
||||
@ -1249,8 +1249,8 @@
|
||||
|= {cof+cafe sut+type gen+twig}
|
||||
=+ puz=(mule |.((~(mint ut sut) [%noun gen])))
|
||||
?- -.puz
|
||||
{$|} (flaw cof p.puz)
|
||||
{$&} (fine cof p.puz)
|
||||
$| (flaw cof p.puz)
|
||||
$& (fine cof p.puz)
|
||||
==
|
||||
::
|
||||
++ maim :: slap
|
||||
@ -1442,8 +1442,8 @@
|
||||
%+ cool |.(%.(%want ~(dunk ut (~(peek ut gat) %free 6))))
|
||||
=+ top=(mule |.((slit gat sam)))
|
||||
?- -.top
|
||||
{$|} (flaw cof p.top)
|
||||
{$&} (fine cof p.top)
|
||||
$| (flaw cof p.top)
|
||||
$& (fine cof p.top)
|
||||
==
|
||||
::
|
||||
++ maul :: slam
|
||||
@ -1721,8 +1721,8 @@
|
||||
|= {cof+cafe hop+hoop}
|
||||
^- (bolt _..wilt)
|
||||
?- -.hop
|
||||
{$&} (fine cof ..wilt(boy [p.hop boy]))
|
||||
{$|}
|
||||
$& (fine cof ..wilt(boy [p.hop boy]))
|
||||
$|
|
||||
=. r.p.hop ?:(?=({$ud $0} r.p.hop) r.how r.p.hop)
|
||||
%+ cool |.(leaf/"ford: wilt {<[(tope p.hop)]>}")
|
||||
%+ cope (lend cof p.hop)
|
||||
|
||||
@ -147,11 +147,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"]~)
|
||||
@ -193,8 +193,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)
|
||||
==
|
||||
::
|
||||
@ -328,8 +328,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
|
||||
==
|
||||
@ -359,9 +359,9 @@
|
||||
==
|
||||
?- -.q.+>.sih
|
||||
$tabl ~|(%made-tabl !!)
|
||||
{$|} (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)
|
||||
$| (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)
|
||||
==
|
||||
::
|
||||
$req :: inbound request
|
||||
@ -373,8 +373,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)
|
||||
@ -395,8 +395,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
|
||||
@ -438,8 +438,8 @@
|
||||
$out ?: ?=({$f $made *} q.hin)
|
||||
?- -.q.+>.q.hin
|
||||
$tabl ~|(%made-tabl !!)
|
||||
{$&} ap-abet:(ap-pout:pap t.t.t.pax %diff +.q.+>.q.hin)
|
||||
{$|}
|
||||
$& ap-abet:(ap-pout:pap t.t.t.pax %diff +.q.+>.q.hin)
|
||||
$|
|
||||
=+ why=p.q.+>.q.hin
|
||||
=. why (turn why |=(a+tank rose/[~ "! " ~]^[a]~))
|
||||
~> %slog.`rose/[" " "[" "]"]^[>%mo-cook-fail< (flop why)]
|
||||
|
||||
@ -4701,7 +4701,7 @@
|
||||
|* taq+_|.(**)
|
||||
=+ mud=(mute taq)
|
||||
?- -.mud
|
||||
{$&} [%& p=$:taq] :: XX transition
|
||||
$& [%& p=$:taq] :: XX transition
|
||||
$| [%| p=p.mud]
|
||||
==
|
||||
::
|
||||
@ -4724,8 +4724,8 @@
|
||||
?~ bur ~
|
||||
:_ $(bur t.bur)
|
||||
?- -.i.bur
|
||||
{$&} i.bur
|
||||
{$|} [%| q.i.bur p.i.bur]
|
||||
$& i.bur
|
||||
$| [%| q.i.bur p.i.bur]
|
||||
==
|
||||
::
|
||||
++ diff :: generate patch
|
||||
@ -4879,14 +4879,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)
|
||||
@ -4911,12 +4911,12 @@
|
||||
^+ rag
|
||||
?- -.p.rag
|
||||
$| ?- -.new
|
||||
{$|} [[%| (weld p.new p.p.rag) (weld q.new q.p.rag)] q.rag]
|
||||
{$&} [new [p.rag q.rag]]
|
||||
$| [[%| (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 ?:(=(0 p.p.rag) q.rag [p.rag q.rag])]
|
||||
$& [[%& (add p.p.rag p.new)] q.rag]
|
||||
==
|
||||
==
|
||||
::
|
||||
@ -6305,8 +6305,8 @@
|
||||
^- {p+axis q+type}
|
||||
:- p.pok
|
||||
?- -.q.pok
|
||||
{$&} p.q.pok
|
||||
{$|} (roll q.q.pok =+([p=[p=*type q=*foot] q=`type`%void] |.((fork p.p q))))
|
||||
$& p.q.pok
|
||||
$| (roll q.q.pok =+([p=[p=*type q=*foot] q=`type`%void] |.((fork p.p q))))
|
||||
==
|
||||
::
|
||||
++ flee
|
||||
@ -6323,8 +6323,8 @@
|
||||
|= pok+port
|
||||
^- prop
|
||||
?- -.q.pok
|
||||
{$&} [p.pok [~ [[p.q.pok [%elm ~ 1]] ~]]]
|
||||
{$|} [p.pok [p.q.pok q.q.pok]]
|
||||
$& [p.pok [~ [[p.q.pok [%elm ~ 1]] ~]]]
|
||||
$| [p.pok [p.q.pok q.q.pok]]
|
||||
==
|
||||
::
|
||||
++ fork :: make %fork type
|
||||
@ -6726,15 +6726,15 @@
|
||||
|= gen+twig
|
||||
^- twig
|
||||
?- -.tig
|
||||
{$&} ?~(p.tig gen [%tstr u.p.tig q.tig gen])
|
||||
{$|} [%tsls ?~(p.tig q.tig [%ktts u.p.tig q.tig]) gen]
|
||||
$& ?~(p.tig gen [%tstr u.p.tig q.tig gen])
|
||||
$| [%tsls ?~(p.tig q.tig [%ktts u.p.tig q.tig]) gen]
|
||||
==
|
||||
::
|
||||
++ puce
|
||||
^- wing
|
||||
?- -.tig
|
||||
{$&} ?~(p.tig q.tig [u.p.tig ~])
|
||||
{$|} [[%& 2] ~]
|
||||
$& ?~(p.tig q.tig [u.p.tig ~])
|
||||
$| [[%& 2] ~]
|
||||
==
|
||||
::
|
||||
++ wthp |= opt+tine
|
||||
@ -6919,10 +6919,10 @@
|
||||
::
|
||||
{$reed *}
|
||||
?- nag
|
||||
{$&} [%wtpt [[%& axe] ~] $(sec p.sec, nag |) $(sec q.sec, nag [& &])]
|
||||
{$|} $(sec p.sec)
|
||||
^ $(sec q.sec)
|
||||
* !!
|
||||
$& [%wtpt [[%& axe] ~] $(sec p.sec, nag |) $(sec q.sec, nag [& &])]
|
||||
$| $(sec p.sec)
|
||||
^ $(sec q.sec)
|
||||
* !!
|
||||
==
|
||||
::
|
||||
{$weed *}
|
||||
@ -7495,15 +7495,15 @@
|
||||
=> .(i.peh ?^(i.peh i.peh [%| p=0 q=i.peh]))
|
||||
=+ ^= poz ^- post
|
||||
?- -.i.peh
|
||||
{$&} [p.i.peh %& (peek %both p.i.peh)]
|
||||
{$|} (finq p.i.peh %both q.i.peh)
|
||||
$& [p.i.peh %& (peek %both p.i.peh)]
|
||||
$| (finq p.i.peh %both q.i.peh)
|
||||
==
|
||||
|- ^- type
|
||||
?: =(1 p.poz)
|
||||
?- -.q.poz
|
||||
$0 ?- -.i.peh
|
||||
{$&} ^$(peh t.peh)
|
||||
{$|} (face q.i.peh ^$(peh t.peh, sut p.q.poz))
|
||||
$& ^$(peh t.peh)
|
||||
$| (face q.i.peh ^$(peh t.peh, sut p.q.poz))
|
||||
==
|
||||
$1 ^$(peh t.peh)
|
||||
$2 %+ bull
|
||||
@ -8932,8 +8932,8 @@
|
||||
=+ zar=$(hyp t.hyp)
|
||||
=+ ^= syp
|
||||
?- -.q.zar
|
||||
{$&} p.q.zar
|
||||
{$|} (fire (turn q.q.zar |=({p+type q+foot} [p [%ash ~ 1]])))
|
||||
$& p.q.zar
|
||||
$| (fire (turn q.q.zar |=({p+type q+foot} [p [%ash ~ 1]])))
|
||||
==
|
||||
?- i.hyp
|
||||
{$& *}
|
||||
@ -10412,8 +10412,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
|
||||
@ -10422,8 +10422,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])
|
||||
::
|
||||
@ -10479,8 +10479,8 @@
|
||||
|= a+duct
|
||||
%- bind :_ |=(b+(pair arvo worm) [`move`[a p.b] q.b])
|
||||
=- ?- -.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)
|
||||
|
||||
@ -1256,8 +1256,8 @@
|
||||
++ apex
|
||||
|= qur+quri
|
||||
?- -.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))
|
||||
==
|
||||
::
|
||||
++ body
|
||||
@ -1276,10 +1276,10 @@
|
||||
?:(&(p.har !?=(hoke r.har)) "https://" "http://")
|
||||
::
|
||||
?- -.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)])))
|
||||
$| (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)])))
|
||||
==
|
||||
::
|
||||
?~(q.har ~ `tape`[':' (trip (rsh 3 2 (scot %ui u.q.har)))])
|
||||
|
||||
@ -161,9 +161,9 @@
|
||||
%- flit
|
||||
|= a+$^({marx $~} $%({$& marx} {$| p+mane}))
|
||||
?- -.a
|
||||
^ (madn n.a)
|
||||
{$&} (madn n.a)
|
||||
{$|} (madn p.a)
|
||||
^ (madn n.a)
|
||||
$& (madn n.a)
|
||||
$| (madn p.a)
|
||||
==
|
||||
::
|
||||
++ line
|
||||
|
||||
@ -210,10 +210,10 @@
|
||||
?> (~(has by fur) i.t.way)
|
||||
=+ wel=`well`[i.way i.t.way]
|
||||
?- -.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]))
|
||||
$| (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]))
|
||||
==
|
||||
::
|
||||
++ quit-phat ::
|
||||
|
||||
@ -178,8 +178,8 @@
|
||||
|= saw+(each suss 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
|
||||
|
||||
@ -365,15 +365,15 @@
|
||||
?~ p.gag ~
|
||||
=* hed i.p.gag
|
||||
?- -.p.hed
|
||||
{$tabl} (mule |.(`$~`(ford-fail >%strange-gage< ~)))
|
||||
{$|} (mule |.(`$~`(ford-fail p.p.hed)))
|
||||
{$&}
|
||||
$tabl (mule |.(`$~`(ford-fail >%strange-gage< ~)))
|
||||
$| (mule |.(`$~`(ford-fail p.p.hed)))
|
||||
$&
|
||||
?- -.q.hed
|
||||
$tabl (mule |.(`$~`(ford-fail >%strange-gage< ~)))
|
||||
{$|} (mule |.(`$~`(ford-fail p.q.hed)))
|
||||
{$&} =+ $(p.gag t.p.gag)
|
||||
$| (mule |.(`$~`(ford-fail p.q.hed)))
|
||||
$& =+ $(p.gag t.p.gag)
|
||||
?+(- [[p.p p.q]:hed -] {@ *} -)
|
||||
==
|
||||
==
|
||||
==
|
||||
::
|
||||
++ perform ::
|
||||
|
||||
@ -72,11 +72,11 @@
|
||||
++ parn
|
||||
|= a+partner ^- cord
|
||||
?- -.a
|
||||
{$&} (stat p.a)
|
||||
{$|} %- crip
|
||||
?- -.p.a
|
||||
$twitter "{(trip -.p.a)}/{(trip p.p.a)}"
|
||||
==
|
||||
$& (stat p.a)
|
||||
$| %- crip
|
||||
?- -.p.a
|
||||
$twitter "{(trip -.p.a)}/{(trip p.p.a)}"
|
||||
==
|
||||
==
|
||||
::
|
||||
++ stat
|
||||
|
||||
@ -268,11 +268,11 @@
|
||||
++ parn
|
||||
|= a+partner ^- cord
|
||||
?- -.a
|
||||
{$&} (stat p.a)
|
||||
{$|} %- crip
|
||||
?- -.p.a
|
||||
$twitter "{(trip -.p.a)}/{(trip p.p.a)}"
|
||||
==
|
||||
$& (stat p.a)
|
||||
$| %- crip
|
||||
?- -.p.a
|
||||
$twitter "{(trip -.p.a)}/{(trip p.p.a)}"
|
||||
==
|
||||
==
|
||||
::
|
||||
++ stat
|
||||
|
||||
37
mar/txt.hoon
37
mar/txt.hoon
@ -41,9 +41,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])
|
||||
@ -52,7 +52,8 @@
|
||||
|=(cud+(urge cord) [i.bob cud])
|
||||
%+ 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])
|
||||
@ -62,10 +63,10 @@
|
||||
~
|
||||
==
|
||||
::
|
||||
{$|}
|
||||
$|
|
||||
?- -.i.bob
|
||||
{$|} ~
|
||||
{$&}
|
||||
$| ~
|
||||
$&
|
||||
?: =(p.i.bob (lent p.i.ali))
|
||||
%+ bind $(ali t.ali, bob t.bob)
|
||||
|=(cud+(urge cord) [i.ali cud])
|
||||
@ -101,16 +102,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))
|
||||
@ -121,14 +122,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))
|
||||
@ -196,10 +197,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]
|
||||
@ -220,9 +221,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]
|
||||
@ -242,7 +243,7 @@
|
||||
bob.res
|
||||
==
|
||||
::
|
||||
{$|}
|
||||
$|
|
||||
=+ loa=(lent p.i.ali)
|
||||
=+ lob=(lent p.i.bob)
|
||||
?: =(loa lob)
|
||||
|
||||
Loading…
Reference in New Issue
Block a user