Eliminate ~, 0-9.

This commit is contained in:
C. Guy Yarvin 2015-12-07 18:11:14 -08:00
parent 5a1c0f1a41
commit 5de65719a9

View File

@ -592,9 +592,9 @@
|= {a+@ b+@} |= {a+@ b+@}
^- @ ^- @
?- b ?- b
1 a $1 a
2 (mul a 2) $2 (mul a 2)
3 +((mul a 2)) $3 +((mul a 2))
* (add (mod b 2) (mul $(b (div b 2)) 2)) * (add (mod b 2) (mul $(b (div b 2)) 2))
== ==
:: ::
@ -3604,10 +3604,10 @@
%+ turn %+ turn
^- (list {p+@ q+@}) ^- (list {p+@ q+@})
?+ b !! ?+ b !!
1 [[0 7] ~] $1 [[0 7] ~]
2 [[8 6] [0 5] ~] $2 [[8 6] [0 5] ~]
3 [[16 6] [8 6] [0 4] ~] $3 [[16 6] [8 6] [0 4] ~]
4 [[24 6] [16 6] [8 6] [0 3] ~] $4 [[24 6] [16 6] [8 6] [0 3] ~]
== ==
|=({p+@ q+@} [q (cut 0 [p q] a)]) |=({p+@ q+@} [q (cut 0 [p q] a)])
$(a (rsh 3 b a)) $(a (rsh 3 b a))
@ -8002,7 +8002,7 @@
{$bull *} {$bull *}
?. =(cog p.p.sut) ?. =(cog p.p.sut)
$(sut q.sut) $(sut q.sut)
?. ?=(0 dep) ?. ?=($0 dep)
$(dep (dec dep), sut q.sut) $(dep (dec dep), sut q.sut)
[0 ~ 1 %2 p.sut q.sut] [0 ~ 1 %2 p.sut q.sut]
:: ::
@ -8032,7 +8032,7 @@
:: ::
{$face *} {$face *}
?: =(cog p.sut) ?: =(cog p.sut)
?. ?=(0 dep) ?. ?=($0 dep)
[(dec dep) ~] [(dec dep) ~]
[0 ~ 1 %0 q.sut] [0 ~ 1 %0 q.sut]
[dep ~] [dep ~]
@ -8050,25 +8050,25 @@
?> &(?=(^ q.hax) ?=(^ q.yor) =(p.hax p.yor) =(p.u.q.hax p.u.q.yor)) ?> &(?=(^ q.hax) ?=(^ q.yor) =(p.hax p.yor) =(p.u.q.hax p.u.q.yor))
:- p.hax :- p.hax
?- -.q.u.q.hax ?- -.q.u.q.hax
0 ?> ?=(0 -.q.u.q.yor) $0 ?> ?=($0 -.q.u.q.yor)
[~ p.u.q.hax %0 (fork p.q.u.q.hax p.q.u.q.yor)] [~ p.u.q.hax %0 (fork p.q.u.q.hax p.q.u.q.yor)]
1 ?> &(?=(1 -.q.u.q.yor) =(p.q.u.q.yor p.q.u.q.hax)) $1 ?> &(?=($1 -.q.u.q.yor) =(p.q.u.q.yor p.q.u.q.hax))
[~ p.u.q.hax %1 p.q.u.q.hax (weld q.q.u.q.hax q.q.u.q.yor)] [~ p.u.q.hax %1 p.q.u.q.hax (weld q.q.u.q.hax q.q.u.q.yor)]
2 ?> ?& ?=(2 -.q.u.q.yor) $2 ?> ?& ?=($2 -.q.u.q.yor)
=(p.p.q.u.q.hax p.p.q.u.q.yor) =(p.p.q.u.q.hax p.p.q.u.q.yor)
=(q.p.q.u.q.hax q.p.q.u.q.yor) =(q.p.q.u.q.hax q.p.q.u.q.yor)
=(r.p.q.u.q.hax r.p.q.u.q.yor) =(r.p.q.u.q.hax r.p.q.u.q.yor)
== ==
:* ~ :* ~
p.u.q.hax p.u.q.hax
%2 %2
:* p.p.q.u.q.hax :* p.p.q.u.q.hax
q.p.q.u.q.hax q.p.q.u.q.hax
r.p.q.u.q.hax r.p.q.u.q.hax
(fork s.p.q.u.q.hax s.p.q.u.q.yor) (fork s.p.q.u.q.hax s.p.q.u.q.yor)
== ==
(fork q.q.u.q.hax q.q.u.q.yor) (fork q.q.u.q.hax q.q.u.q.yor)
== ==
== ==
:: ::
{$hold *} {$hold *}
@ -8390,7 +8390,7 @@
{$ktsg *} {$ktsg *}
=+ nef=$(gen p.gen) =+ nef=$(gen p.gen)
=+ moc=(mink [burn q.nef] |=(* ~)) =+ moc=(mink [burn q.nef] |=(* ~))
[p.nef ?:(?=(0 -.moc) [%1 p.moc] q.nef)] [p.nef ?:(?=($0 -.moc) [%1 p.moc] q.nef)]
:: ::
{$ktts *} =+(vat=$(gen q.gen) [(conk(sut p.vat) p.gen) q.vat]) {$ktts *} =+(vat=$(gen q.gen) [(conk(sut p.vat) p.gen) q.vat])
{$ktwt *} =+(vat=$(gen p.gen) [(wrap(sut p.vat) %lead) q.vat]) {$ktwt *} =+(vat=$(gen p.gen) [(wrap(sut p.vat) %lead) q.vat])
@ -9001,7 +9001,7 @@
|= {way+?($read $rite $both $free) hyp+wing} |= {way+?($read $rite $both $free) hyp+wing}
^- {p+axis q+type} ^- {p+axis q+type}
=+ zar=(seek way hyp) =+ zar=(seek way hyp)
?>(?=(& -.q.zar) [p.zar p.q.zar]) ?>(?=($& -.q.zar) [p.zar p.q.zar])
:: ::
++ sift ++ sift
|= ref+type |= ref+type
@ -10155,9 +10155,9 @@
:- '%' :- '%'
fail fail
:- '&' :- '&'
(stag %leaf (stag %f (cold & pam))) fail
:- '*' :- '*'
(cold [%axil %noun] tar) (stag %herb wide)
:- '?' :- '?'
;~ pose ;~ pose
(stag %fern ;~(pfix wut (ifix [pel per] (most ace toil)))) (stag %fern ;~(pfix wut (ifix [pel per] (most ace toil))))
@ -10184,7 +10184,7 @@
(stag %herb wide) (stag %herb wide)
== ==
:- ['0' '9'] :- ['0' '9']
(stag %leaf bisk:so) fail
:- ['a' 'z'] :- ['a' 'z']
;~ pose ;~ pose
%+ sear %+ sear
@ -10497,7 +10497,7 @@
++ slid ++ slid
|= {hed+mill tal+mill} |= {hed+mill tal+mill}
^- mill ^- mill
?: &(?=(& -.hed) ?=(& -.tal)) ?: &(?=($& -.hed) ?=($& -.tal))
[%& (slop p.hed p.tal)] [%& (slop p.hed p.tal)]
[%| [%cell p.p.hed p.p.tal] [q.p.hed q.p.tal]] [%| [%cell p.p.hed p.p.tal] [q.p.hed q.p.tal]]
:: ::