Redefined pfix, sfix in terms of comb, cleaned some variable names.

This commit is contained in:
Gavin Whelan 2014-03-07 16:36:43 -08:00
parent 65c709223a
commit e8b3d3faac

View File

@ -1809,13 +1809,13 @@
::
++ shim
~/ %shim
|= zep=[p=@ q=@]
|= [les=@ mos=@]
~/ %fun
|= tub=nail
^- (like char)
?@ q.tub
(fail tub)
?. ?&((gte i.q.tub p.zep) (lte i.q.tub q.zep))
?. ?&((gte i.q.tub les) (lte i.q.tub mos))
(fail tub)
(next tub)
::
@ -1955,11 +1955,7 @@
::
++ pfix
~/ %pfix
|* [vex=edge sab=_rule]
?@ q.vex
vex
=+ yit=(sab q.u.q.vex)
[p=(last p.yit p.vex) q=q.yit]
(comp |*([a=* b=*] b))
::
++ plug
~/ %plug
@ -1982,11 +1978,7 @@
::
++ sfix
~/ %sfix
|* [vex=edge sab=_rule]
?@ q.vex
vex
=+ yit=(sab q.u.q.vex)
[p=(last p.vex p.yit) q=?@(q.yit ~ [~ u=[p=p.u.q.vex q=q.u.q.yit]])]
(comp |*([a=* b=*] a))
::::::::::::::::::::::::::::::::::::::::::::::::::::::::::
:: section 2eE, parsing (composers) ::
::