Reversed toss order.

This commit is contained in:
C. Guy Yarvin 2014-06-21 11:42:34 -07:00
parent 5a1963fd52
commit bfd17aae6c
8 changed files with 71 additions and 64 deletions

View File

@ -1616,7 +1616,7 @@
=. ton.fox (~(su go ton.fox) gus)
:_ fox
:~ :- hen
[%toss %a ~ %want p.bon [%r %ta t.t.q.q.bon] `(unit will)`wyl]
[%toss ~ %a %want p.bon [%r %ta t.t.q.q.bon] `(unit will)`wyl]
==
%re :: %re
:_ fox
@ -1633,7 +1633,7 @@
%+ turn paz
|= him=ship
:- hen
[%toss %a ~ %want [p.p.bon him] /q/yu [q.p.bon r.bon]]
[%toss ~ %a %want [p.p.bon him] /q/yu [q.p.bon r.bon]]
==
::
%ouzo

View File

@ -408,7 +408,7 @@
|= [lap=wire ted=@ud] :: XX ugly
^+ +>
%= +>
duv :_(duv `move`[~ %toss %b ~ [%hail ~]])
duv :_(duv `move`[~ %toss ~ %b [%hail ~]])
paq.gyr
%- ~(gas to *(qeu gyro))
%+ skip
@ -420,7 +420,7 @@
|= [lap=wire ted=@ud pod=prod] :: install prompt
^+ +>
%_ +>
duv :_(duv [~ %toss %b ~ [%hail ~]])
duv :_(duv [~ %toss ~ %b [%hail ~]])
paq.gyr (~(put to paq.gyr) [ted lap pod])
==
::
@ -806,7 +806,7 @@
::
++ gull :: request control
|= [tea=wire him=ship ryf=riff]
(gram ~ %toss %c tea [%warp [who him] ryf])
(gram ~ %toss tea %c [%warp [who him] ryf])
::
++ gulf :: stop request
|= [tea=wire kit=kite]
@ -895,17 +895,17 @@
%mx |- ^+ +>.^^$
?~ p.gud +>.^^$
$(p.gud t.p.gud, +>.^^$ ^$(gud i.p.gud))
%ok (gram ~ %toss %c ~ %info who p.gud q.gud)
%ok (gram ~ %toss ~ %c %info who p.gud q.gud)
%sc good:+>.^$(sac ?~(p.gud ?~(sac ~ +.sac) [u.p.gud sac]))
%sp !!
%sq =+ tea=(bist %ma r.gud)
%+ gram ~
[%toss %a tea [%want [who p.gud] [%q q.gud %b tea] s.gud]]
%sr (gram ~ %toss %a ~ [%want [who p.gud] [%r q.gud] r.gud])
[%toss tea %a [%want [who p.gud] [%q q.gud %b tea] s.gud]]
%sr (gram ~ %toss ~ %a [%want [who p.gud] [%r q.gud] r.gud])
%te (gram ~ %give %tell p.gud)
%th (gram ~ %toss %e ~ %that p.gud q.gud)
%th (gram ~ %toss ~ %e %that p.gud q.gud)
%tq =+ tea=(bist %ma p.gud)
(gram ~ %toss %e tea [%them ~ q.gud])
(gram ~ %toss tea %e [%them ~ q.gud])
%va !!
%xx =+ gah=((soft ghat) p.gud)
?~ gah
@ -919,7 +919,7 @@
?. ?=([@ ~] p.gud)
~& [%batz-xyz p.gud]
!!
(gram ~ %toss i.p.gud ~ u.hug)
(gram ~ %toss ~ i.p.gud u.hug)
==
==
::
@ -945,7 +945,7 @@
%es :: ~& %es-loss
(gull (bist %ma lap) p.gal q.gal ~)
%hp +>
%ht (gram ~ %toss %e (bist [%ma lap]) [%band who ~])
%ht (gram ~ %toss (bist [%ma lap]) %e [%band who ~])
%lq (gump | p.gal gyp ted lap)
%ow +>
%rt +>
@ -963,7 +963,7 @@
%es :: ~& %es-moor
(gull (bist %ma lap) p.gal q.gal [~ r.gal])
%hp +>
%ht (gram ~ %toss %e [%b (bist [%ma lap])] [%band who p.gal])
%ht (gram ~ %toss [%b (bist [%ma lap])] %e [%band who p.gal])
%lq (gump & p.gal [gyp ted lap])
%ow +>
%rt +>
@ -1353,7 +1353,7 @@
..^^$(dez (~(put by dez) hen [[p.q.hic (bard p.q.hic)] ~]))
::
?(%make %sith)
[[[hen [%toss %a ~ q.hic]] ~] ..^^$]
[[[hen [%toss ~ %a q.hic]] ~] ..^^$]
==
?> ?=(^ u.dus)
=+ beg=`brat`[[p.i.u.dus bred] q.i.u.dus]

View File

@ -95,7 +95,7 @@
%+ turn (flop say)
|= [a=duct b=path c=ship d=[p=@ud q=riff]]
:- a
[%toss %a b %want [who c] [%q %re p.q.d (scot %ud p.d) ~] q.d]
[%toss b %a %want [who c] [%q %re p.q.d (scot %ud p.d) ~] q.d]
==
::
++ aver :: read
@ -458,8 +458,8 @@
=+ ryf=((hard riff) s.q.hic)
:_ ..^$
:~ :- hen
:^ %toss %c
[(scot %p p.p.q.hic) (scot %p q.p.q.hic) r.q.hic]
:^ %toss [(scot %p p.p.q.hic) (scot %p q.p.q.hic) r.q.hic]
%c
[%warp [p.p.q.hic p.p.q.hic] ryf]
==
::
@ -530,7 +530,7 @@
=+ him=(need (slaw %p i.t.tea))
:_ ..^$
:~ :- hen
[%toss %a ~ [%want [our him] [%r %re %c t.t.tea] p.p.q.hin]]
[%toss ~ %a [%want [our him] [%r %re %c t.t.tea] p.p.q.hin]]
==
::
%went

View File

@ -290,7 +290,7 @@
==
::
?(%hail %make %sith)
+>.$(mos :_(mos [hen %toss %b ~ sin]))
+>.$(mos :_(mos [hen %toss ~ %b sin]))
::
%note ?.(p.yar +>.$ (fume p.sin q.sin)) :: debug message
%save :: write a file
@ -379,7 +379,7 @@
%d ?: ?& =(0 bul.u.q.q.yar)
=(0 bus.u.q.q.yar)
==
+>.$(mos :_(mos [hen %toss %b ~ [%kill ~]]))
+>.$(mos :_(mos [hen %toss ~ %b [%kill ~]]))
$(kyz [%belt %del ~])
%e (edit u.q.q.yar(bus bul.u.q.q.yar))
%f $(kyz [%belt %aro %r])
@ -427,8 +427,8 @@
==
%r (edit u.q.q.yar(hyr [~ ~]))
:: TODO
:: %w +>.$(mos :_(mos [hen %toss %b ~ [%limn ~]]))
%x +>.$(mos :_(mos [hen %toss %b ~ [%ling ~]]))
:: %w +>.$(mos :_(mos [hen %toss ~ %b [%limn ~]]))
%x +>.$(mos :_(mos [hen %toss ~ %b [%ling ~]]))
%y ?: =(0 p.r.q.yar)
beep
$(kyz [%belt %txt (snag q.r.q.yar r.r.q.yar)])
@ -497,9 +497,9 @@
[p.hyt.u.q.q.yar [jab ?~(q.hyt.u.q.q.yar ~ +.q.hyt.u.q.q.yar)]]
::
mos
:* [hen %toss %b ~ [%hail ~]]
:* [hen %toss ~ %b [%hail ~]]
[hen %give [%bbye ~]]
[hen %toss %b ~ [%line jab]]
[hen %toss ~ %b [%line jab]]
[hen %give [%blit [[%mor ~] ~]]]
mos
==
@ -525,7 +525,7 @@
%boot
%= +>.$
mos
:_(mos [hen %toss %b ~ p.kyz])
:_(mos [hen %toss ~ %b p.kyz])
==
::
%crud :: error trace
@ -535,18 +535,18 @@
(fume:$(q.kyz t.q.kyz) '!' `tank`i.q.kyz)
::
%hail :: refresh
+>.$(mos :_(mos [hen %toss %b ~ kyz]))
+>.$(mos :_(mos [hen %toss ~ %b kyz]))
::
%harm :: all terms hung up
=+ nug=((map duct yard) [[hen (~(get by dug) hen)] ~ ~])
^+ +>.$
%= +>.$
dug nug
mos :_(mos [hen %toss %b ~ kyz])
mos :_(mos [hen %toss ~ %b kyz])
==
::
%hook :: this term hung up
+>.$(dug (~(del by dug) hen), mos :_(mos [hen %toss %b ~ kyz]))
+>.$(dug (~(del by dug) hen), mos :_(mos [hen %toss ~ %b kyz]))
::
%talk (furl (~(win re p.kyz) 0 p.q.yar)) :: program output
%text $(kyz [%talk %leaf p.kyz]) :: simple message

View File

@ -492,12 +492,12 @@
++ haji :: send %pc login
|= [our=ship him=ship ses=hole]
^+ +>
+>.$(mow :_(mow [hen %toss %a ~ [%want [our him] [%r %pc ~] ses]]))
+>.$(mow :_(mow [hen %toss ~ %a [%want [our him] [%r %pc ~] ses]]))
::
++ hajj :: send %pr response
|= [our=ship him=ship tus=path har=httr]
^+ +>
+>.$(mow :_(mow [hen %toss %a ~ [%want [our him] [%r %pr tus] har]]))
+>.$(mow :_(mow [hen %toss ~ %a [%want [our him] [%r %pr tus] har]]))
::
++ hare :: receive request
|= [our=ship tus=path him=ship hor=*]
@ -507,8 +507,8 @@
mow
:_ mow
:- hen
:^ %toss %e
[(scot %p our) (scot %p him) tus]
:^ %toss [(scot %p our) (scot %p him) tus]
%e
?~(hux [%thud ~] [%this u.hux])
==
::
@ -546,8 +546,8 @@
%_ +>
mow
:_ mow
:^ hen %toss %c
[[%hoot (scot %p our) ses (scot %ud num) ~] [%warp [our our] rif]]
:+ hen %toss
[[%hoot (scot %p our) ses (scot %ud num) ~] %c [%warp [our our] rif]]
==
::
++ hone :: kill ford
@ -555,7 +555,7 @@
%_ +>
mow
:_ mow
[hen %toss %f [%honk (scot %p our) ses (scot %ud num) ~] [%exec our ~]]
[hen %toss [%honk (scot %p our) ses (scot %ud num) ~] %f [%exec our ~]]
==
::
++ honk :: ford request
@ -564,7 +564,7 @@
%_ +>
mow
:_ mow
[hen %toss %f [%honk (scot %p our) ses (scot %ud num) ~] [%exec our `kas]]
[hen %toss [%honk (scot %p our) ses (scot %ud num) ~] %f [%exec our `kas]]
==
::
++ hops :: cancel remote
@ -576,8 +576,8 @@
mow
:_ mow
:- hen
:^ %toss %a
[%hork (scot %p sor.rot) mun ~]
:^ %toss [%hork (scot %p sor.rot) mun ~]
%a
[%want [sor.rot him] [%q %pr %e %hork mun ~] ~]
==
::
@ -602,8 +602,8 @@
mow
:_ mow
:- hen
:^ %toss %a
[%hork (scot %p sor.rot) mun ~]
:^ %toss [%hork (scot %p sor.rot) mun ~]
%a
[%want [sor.rot him] [%q %pr %e %hork mun ~] [~ hyx]]
::
fon
@ -1746,8 +1746,8 @@
?~ fuv mow
:_ mow
:- hen
:^ %toss %b
[%cons (scot %p our) ses (scot %ud p.som.pip) ~]
:^ %toss [%cons (scot %p our) ses (scot %ud p.som.pip) ~]
%b
u.fuv
==
[~ `pimp`pip(pez `pest`[%fin %raw 200 ~ ~])]
@ -1965,7 +1965,7 @@
++ toss :: toss to gall
|= [suc=term noh=note]
^+ +>
+>(mow [[hen %toss %g (hoop suc) noh] mow])
+>(mow [[hen %toss (hoop suc) %g noh] mow])
::
++ yule :: swig state
|= suc=term

View File

@ -181,8 +181,8 @@
kiz t.kiz
mow :_ mow
:- hen
:^ %toss %c
[(scot %p our) (scot %ud num) (scot %ud p.i.kiz) ~]
:^ %toss [(scot %p our) (scot %ud num) (scot %ud p.i.kiz) ~]
%c
[%warp [our p.q.i.kiz] q.q.i.kiz ~]
==
::
@ -196,8 +196,8 @@
%= $
mow :_ mow
:- hen
:^ %toss %c
[(scot %p our) (scot %ud num) (scot %ud tik) ~]
:^ %toss [(scot %p our) (scot %ud num) (scot %ud tik) ~]
%c
[%warp [our p.bem] q.bem [~ %& %x r.bem s.bem]]
==
::

View File

@ -373,7 +373,7 @@
|=(a=(pair ship desk) (~(has in ped.sat) a))
|= a=(pair ship desk)
:- hun.mat
:^ %toss %c (away %w %drug (scot %p p.a) q.a ~)
:^ %toss (away %w %drug (scot %p p.a) q.a ~) %c
[%warp [our p.a] q.a ~ %| [%da now] [%da (add now ~d1000)]]
=+ ^= old ^- (list move)
%+ turn
@ -381,7 +381,7 @@
|=(a=(pair ship desk) (~(has in pen) a))
|= a=(pair ship desk)
:- hun.mat
:^ %toss %c (away %w %drug (scot %p p.a) q.a ~)
:^ %toss (away %w %drug (scot %p p.a) q.a ~) %c
[%warp [our p.a] q.a ~]
%_(+>.$ ped.sat pen, mow :(weld new old mow))
::
@ -402,7 +402,7 @@
|= [pax=path kas=silk]
^+ +>
%_ +>
mow :_(mow [hen %toss %f (away pax) [%exec our `kas]])
mow :_(mow [hen %toss (away pax) %f [%exec our `kas]])
onz.sat `[hen pax]
==
::
@ -588,7 +588,7 @@
%= +>
onz.sat ~
mow
:_(mow [hen %toss %f (away q.u.onz.sat) [%exec our ~]])
:_(mow [hen %toss (away q.u.onz.sat) %f [%exec our ~]])
==
+>.$(vey.sat (~(put to vey.sat) hen kon))
::
@ -623,9 +623,9 @@
=+ caq=(spec (slot 3 wec))
?+ q.caq ~&(%sump-bad !!)
::
[%toss p=@tas q=* r=[p=@tas q=*]]
:^ %toss (need ((sand %tas) ((hard ,@) p.q.caq)))
((hard path) q.q.caq)
[%toss p=* q=@tas r=[p=@tas q=*]]
:^ %toss ((hard path) p.q.caq)
(need ((sand %tas) ((hard ,@) q.q.caq)))
[%meta (spec (slot 15 caq))]
::
[%give p=[p=@tas q=*]]

View File

@ -9241,13 +9241,20 @@
++ mill (each vase milt) :: vase/metavase
++ milt ,[p=* q=*] :: metavase
++ monk (each ship khan) :: general identity
++ mold :: general action
|* [a=$+(* *) b=$+(* *)] :: new move
$% [%toss p=term q=path r=a] :: advance
++ mold :: kernel action
|* [a=$+(* *) b=$+(* *)] :: forward/reverse
$% [%toss p=path q=term r=a] :: advance
[%slip p=term q=a] :: lateral
[%sick p=b] :: lame refactoring
[%give p=b] :: retreat
== ::
++ molt :: new kernel action
|* [a=$+(* *) b=$+(* *)] :: forward/reverse
$% [%toss p=path q=a] :: advance
[%slip p=a] :: lateral
[%sick p=b] :: lame refactoring
[%give p=b] :: retreat
== ::
++ muse ,[p=@tas q=duct r=arvo] :: sourced move
++ mosh ,[p=duct q=(mold curd curd)] :: vane move
++ move ,[p=duct q=arvo] :: arvo move
@ -9402,16 +9409,16 @@
=+ caq=(spec (slot 3 wec))
?+ q.caq [%| (cat 3 %funk (,@tas q.caq))]
::
[%toss p=@tas q=* r=[p=@tas q=*]]
[%toss p=* q=@tas r=[p=@tas q=*]]
%- (bond |.([%| p.r.q.caq]))
%+ biff ((soft ,@) p.q.caq)
%+ biff ((soft ,@) q.q.caq)
|= lal=@tas
?. ((sane %tas) lal) ~
%+ biff ((soft path) q.q.caq)
%+ biff ((soft path) p.q.caq)
|= pax=path
%+ bind (song (spec (slot 15 caq)))
|= hil=mill
[%& %toss lal pax hil]
[%& %toss pax lal hil]
::
[%give p=[p=@tas q=*]]
%- (bond |.([%| p.p.q.caq]))
@ -9554,8 +9561,8 @@
%+ kick lac
:~ :* i.p.ovo
~
:^ %toss (dint p.ovo)
t.p.ovo
:^ %toss t.p.ovo
(dint p.ovo)
:+ %&
[%cell [%cube %soft [%atom %tas]] %noun]
[%soft q.ovo]
@ -9591,7 +9598,7 @@
%toss
~? &(!lac !=(%gold p.gum))
[%toss p.gum (,@tas +>-.r.r.gum) q.gum]
[p.r.gum ~ [[p.gum q.r.gum] q.gum] r.r.gum]
[q.r.gum ~ [[p.gum p.r.gum] q.gum] r.r.gum]
::
%give
?> ?=(^ q.gum)