Eliminate %wtcn in favor of %wtts.

This commit is contained in:
C. Guy Yarvin 2013-12-26 21:43:25 -05:00
parent 497b4b1e31
commit 99a82ccb17

View File

@ -247,7 +247,6 @@
[%wtbr p=tusk] ::
[%wthp p=twig q=tine] ::
[%wtcl p=twig q=twig r=twig] ::
[%wtcn p=twig q=twig] ::
[%wtdt p=twig q=twig r=twig] ::
[%wtkt p=twig q=twig r=twig] ::
[%wtgl p=twig q=twig] ::
@ -376,6 +375,7 @@
~% %hoon
+
==
%al al
%ap ap
%ut ut
%seed seed
@ -4029,6 +4029,11 @@
:: section 2fB, macro expansion ::
::
++ al
~% %al
+>+
==
%bunt bunt
==
=+ [nag=`*`& gom=`axis`1]
|_ sec=tile
::::
@ -4704,8 +4709,7 @@
[%wtdt *] [%wtcl p.gen r.gen q.gen]
[%wtgl *] [%wtcl p.gen [%zpzp ~] q.gen]
[%wtgr *] [%wtcl p.gen q.gen [%zpzp ~]]
[%wtkt *] [%wtcl [%wtcn [%dtpt %$ 0] p.gen] r.gen q.gen]
[%wtts *] [%wtcn ~(bunt al p.gen) q.gen]
[%wtkt *] [%wtcl [%wtts [%axil %atom %$] p.gen] r.gen q.gen]
[%wthp *]
|-
?@ q.gen
@ -4720,7 +4724,7 @@
|-
?@(p.gen [%dtsg %f 0] [%wtcl i.p.gen $(p.gen t.p.gen) [%dtsg %f 1]])
::
[%wtpt *] [%wtcl [%wtcn [%dtpt %$ 0] p.gen] q.gen r.gen]
[%wtpt *] [%wtcl [%wtts [%axil %atom %$] p.gen] q.gen r.gen]
[%wtsg *] [%wtcl [%wtts [%axil %null] p.gen] q.gen r.gen]
[%wtzp *] [%wtcl p.gen [%dtsg %f 1] [%dtsg %f 0]]
[%zpcb *] q.gen
@ -5597,8 +5601,8 @@
++ chip
~/ %chip
|= [way=? gen=twig] ^- type
?: ?=([%wtcn *] gen)
(cull way p:(seek %read ~(rake ap q.gen)) (play p.gen))
?: ?=([%wtts *] gen)
(cull way p:(seek %read ~(rake ap q.gen)) (play ~(bunt al p.gen)))
?: ?&(way ?=([%wtpm *] gen))
|-(?@(p.gen sut $(p.gen t.p.gen, sut ^$(gen i.p.gen))))
?: ?&(!way ?=([%wtbr *] gen))
@ -5729,8 +5733,9 @@
=+ ran=$(sut wux, gen r.gen)
[(fork p.hiq p.ran) (cond duy q.hiq q.ran)]
::
[%wtcn *]
[(nice bean) (fish(sut (play p.gen)) (cove q:$(gen q.gen, gol %noun)))]
[%wtts *]
:- (nice bean)
(fish(sut (play ~(bunt al p.gen))) (cove q:$(gen q.gen, gol %noun)))
::
[%zpcb *]
~! (show %o p.gen)
@ -5886,8 +5891,9 @@
$(sut p.wux, dox q.wux, gen r.gen)
[(nice (fork p.hiq p.ran)) (fork q.hiq q.ran)]
::
[%wtcn *]
=+ waz=[p=(play p.gen) q=(play(sut dox) p.gen)]
[%wtts *]
=+ nob=~(bunt al p.gen)
=+ waz=[p=(play nob) q=(play(sut dox) nob)]
=+ ^= syx :- p=(cove q:(mint %noun q.gen))
q=(cove q:(mint(sut dox) %noun q.gen))
=+ pov=[p=(fish(sut p.waz) p.syx) q=(fish(sut q.waz) q.syx)]
@ -6200,7 +6206,7 @@
%+ fork
?:(=(%void fex) %void $(sut fex, gen q.gen))
?:(=(%void wux) %void $(sut wux, gen r.gen))
[%wtcn *] bean
[%wtts *] bean
[%zpcb *] ~!((show %o p.gen) $(gen q.gen))
[%zpcm *] (play p.gen)
[%zpcn ~] p:seed