commit c2bf1ef94fd7e0706504d270b54d6f30c2cc5a2e
parent 9facb33ceb7735b3597975ffd99b3462f17f958b
Author: robert <robertrussell.72001@gmail.com>
Date: Mon, 18 Apr 2022 12:42:35 -0700
Rename queue macros to match conventions
count, dimen, muskip, etc. for registers
num, dim, mu, etc. for values
Diffstat:
| M | control.tex | | | 24 | ++++++++++++------------ |
| M | queue.tex | | | 86 | ++++++++++++++++++++++++++++++++++++++++---------------------------------------- |
2 files changed, 55 insertions(+), 55 deletions(-)
diff --git a/control.tex b/control.tex
@@ -13,7 +13,7 @@
\newcount\@forlim
\newcount\@forstep
\def\fornum#1=#2..#3\do{\fornumstep#1=#2..#3:1\do}
-\def\fornumstep#1=#2..#3:#4\do#5{%
+\def\fornumstep#1=#2..#3:#4\do#5{% XXX require open brace like \foreach
\@forsave
\def\@body{\edef#1{\the\@forcnt}#5}%
\@forcnt=\numexpr#2\relax
@@ -29,20 +29,20 @@
}
\def\@forsave{%
\let\qtok=\@body \pushtok\@loopstack
- \qcount=\@forcnt \pushcount\@loopstack
- \qcount=\@forlim \pushcount\@loopstack
- \qcount=\@forstep \pushcount\@loopstack
+ \qnum=\@forcnt \pushnum\@loopstack
+ \qnum=\@forlim \pushnum\@loopstack
+ \qnum=\@forstep \pushnum\@loopstack
}
\def\@forrestore{%
- \popcount\@loopstack \@forstep=\qcount
- \popcount\@loopstack \@forlim=\qcount
- \popcount\@loopstack \@forcnt=\qcount
+ \popnum\@loopstack \@forstep=\qnum
+ \popnum\@loopstack \@forlim=\qnum
+ \popnum\@loopstack \@forcnt=\qnum
\poptok\@loopstack \let\@body=\qtok
}
\def\foreach#1\do#2#{\@foreachA{#1}{#2}}
\def\@foreachA#1#2#3{%
- \let\qtok\@body \pushtok\@loopstack
+ \let\qtok=\@body \pushtok\@loopstack
\gdef\@body#2{#3\futurelet\@next\@foreachB}%
\@body#1\@foreachend
\poptok\@loopstack \let\@body=\qtok
@@ -52,11 +52,11 @@
\newcount\swnum
\def\switchnum#1#{%
- \qcount=\sqnum \pushcount\@loopstack \swnum=\numexpr#1\relax
+ \qnum=\sqnum \pushnum\@loopstack \swnum=\numexpr#1\relax
\let\qtok=\case \pushtok\@loopstack \let\case=\@casenum
\@fallthroughfalse \@switchnum
}
-\def\@switchnum#1{#1\@endswitch \popcount\@loopstack \swnum=\qcount}
+\def\@switchnum#1{#1\@endswitch \popnum\@loopstack \swnum=\qnum}
\def\@casenum#1#{%
\if@fallthrough
\ea\@case
@@ -69,11 +69,11 @@
\newdimen\swdim
\def\switchdim#1#{%
- \qdimen=\swdim \pushdimen\@loopstack \swdim=\dimexpr#1\relax
+ \qdim=\swdim \pushdim\@loopstack \swdim=\dimexpr#1\relax
\let\qtok=\case \pushtok\@loopstack \let\case=\@casedim
\@fallthroughfalse \@switchdim
}
-\def\@switchdim#1{#1\@endswitch \popdimen\@loopstack \swdim=\qdimen}
+\def\@switchdim#1{#1\@endswitch \popdim\@loopstack \swdim=\qdim}
\def\@casedim#1#{%
\if@fallthrough
\ea\@case
diff --git a/queue.tex b/queue.tex
@@ -1,9 +1,9 @@
\newcount\@qn
\newcount\@qt
-\newcount\qcount
-\newdimen\qdimen
+\newcount\qnum
+\newdimen\qdim
\newskip\qskip
-\newmuskip\qmuskip
+\newmuskip\qmu
\newbox\qbox
\newtoks\qtoks
\newif\if@qapp
@@ -22,19 +22,19 @@
\def\@qmodify#1{\def\@qop{#1}\afterassignment\@qexec\@qn=}
\def\@qcs{q:\the\@qn:\the\@qt}
-\def\@qwcount {\@qmodify{\penalty\qcount}}
-\def\@qwdimen {\@qmodify{\kern\qdimen}}
-\def\@qwskip {\@qmodify{\hskip\qskip}}
-\def\@qwmuskip{\@qmodify{\hskip\mutoglue\qmuskip}}
-\def\@qwbox {\@qmodify{\box\qbox}}
-\def\@qwtoks {\@qmodify{\xcsdef\@qcs{\the\qtoks}\gincr\@qt}}
-\def\@qwtok {\@qmodify{\gcslet\@qcs\qtok\gincr\@qt}}
+\def\@qwnum {\@qmodify{\penalty\qnum}}
+\def\@qwdim {\@qmodify{\kern\qdim}}
+\def\@qwskip{\@qmodify{\hskip\qskip}}
+\def\@qwmu {\@qmodify{\hskip\mutoglue\qmu}}
+\def\@qwbox {\@qmodify{\box\qbox}}
+\def\@qwtoks{\@qmodify{\xcsdef\@qcs{\the\qtoks}\gincr\@qt}}
+\def\@qwtok {\@qmodify{\gcslet\@qcs\qtok\gincr\@qt}}
-\protected\def\precount {\@qappfalse \@qwcount}
-\protected\def\predimen {\@qappfalse \@qwdimen}
-\protected\def\preskip {\@qappfalse \@qwskip}
-\protected\def\premuskip{\@qappfalse \@qwmuskip}
-\protected\def\prebox {\@qappfalse \@qwbox}
+\protected\def\prenum {\@qappfalse \@qwnum}
+\protected\def\predim {\@qappfalse \@qwdim}
+\protected\def\preskip{\@qappfalse \@qwskip}
+\protected\def\premu {\@qappfalse \@qwmu}
+\protected\def\prebox {\@qappfalse \@qwbox}
% TODO: Implement prepending of tok and toks, which have their own stacking
% mechanism using \@qt. My current idea for how to implement this is to track
% two integers, \@qh (head) and \@qt (tail), for the allocation of unique
@@ -50,36 +50,36 @@
% constant time operations, whereas popping becomes amortized constant
% (assuming that compaction happens only after pops).
-\protected\def\pushcount {\@qapptrue \@qwcount}
-\protected\def\pushdimen {\@qapptrue \@qwdimen}
-\protected\def\pushskip {\@qapptrue \@qwskip}
-\protected\def\pushmuskip{\@qapptrue \@qwmuskip}
-\protected\def\pushbox {\@qapptrue \@qwbox}
-\protected\def\pushtoks {\@qapptrue \@qwtoks}
-\protected\def\pushtok {\@qapptrue \@qwtok}
+\protected\def\pushnum {\@qapptrue \@qwnum}
+\protected\def\pushdim {\@qapptrue \@qwdim}
+\protected\def\pushskip{\@qapptrue \@qwskip}
+\protected\def\pushmu {\@qapptrue \@qwmu}
+\protected\def\pushbox {\@qapptrue \@qwbox}
+\protected\def\pushtoks{\@qapptrue \@qwtoks}
+\protected\def\pushtok {\@qapptrue \@qwtok}
-\def\@qrcount {\@qmodify{\g\qcount\lastpenalty \if@qpeek\else\unpenalty\fi}}
-\def\@qrdimen {\@qmodify{\g\qdimen\lastkern \if@qpeek\else\unkern\fi}}
-\def\@qrskip {\@qmodify{\g\qskip\lastskip \if@qpeek\else\unskip\fi}}
-\def\@qrmuskip{\@qmodify{\g\qmuskip\gluetomu\lastskip \if@qpeek\else\unskip\fi}}
-\def\@qrbox {\@qmodify{\g\setbox\qbox\lastbox \if@qpeek\copy\qbox\fi}}
-\def\@qrtoks {\@qmodify{{\if@qpeek\else\g\fi\decr\@qt \gletcs\qtok\@qcs \g\qtoks\ea{\qtok}}}}
-\def\@qrtok {\@qmodify{{\if@qpeek\else\g\fi\decr\@qt \gletcs\qtok\@qcs}}}
+\def\@qrnum {\@qmodify{\g\qnum\lastpenalty \if@qpeek\else\unpenalty\fi}}
+\def\@qrdim {\@qmodify{\g\qdim\lastkern \if@qpeek\else\unkern\fi}}
+\def\@qrskip{\@qmodify{\g\qskip\lastskip \if@qpeek\else\unskip\fi}}
+\def\@qrmu {\@qmodify{\g\qmu\gluetomu\lastskip \if@qpeek\else\unskip\fi}}
+\def\@qrbox {\@qmodify{\g\setbox\qbox\lastbox \if@qpeek\copy\qbox\fi}}
+\def\@qrtoks{\@qmodify{{\if@qpeek\else\g\fi\decr\@qt \gletcs\qtok\@qcs \g\qtoks\ea{\qtok}}}}
+\def\@qrtok {\@qmodify{{\if@qpeek\else\g\fi\decr\@qt \gletcs\qtok\@qcs}}}
-\protected\def\popcount {\@qpeekfalse \@qrcount}
-\protected\def\popdimen {\@qpeekfalse \@qrdimen}
-\protected\def\popskip {\@qpeekfalse \@qrskip}
-\protected\def\popmuskip{\@qpeekfalse \@qrmuskip}
-\protected\def\popbox {\@qpeekfalse \@qrbox}
-\protected\def\poptoks {\@qpeekfalse \@qrtoks}
-\protected\def\poptok {\@qpeekfalse \@qrtok}
+\protected\def\popnum {\@qpeekfalse \@qrnum}
+\protected\def\popdim {\@qpeekfalse \@qrdim}
+\protected\def\popskip{\@qpeekfalse \@qrskip}
+\protected\def\popmu {\@qpeekfalse \@qrmu}
+\protected\def\popbox {\@qpeekfalse \@qrbox}
+\protected\def\poptoks{\@qpeekfalse \@qrtoks}
+\protected\def\poptok {\@qpeekfalse \@qrtok}
-\protected\def\peekcount {\@qpeektrue \@qrcount}
-\protected\def\peekdimen {\@qpeektrue \@qrdimen}
-\protected\def\peekskip {\@qpeektrue \@qrskip}
-\protected\def\peekmuskip{\@qpeektrue \@qrmuskip}
-\protected\def\peekbox {\@qpeektrue \@qrbox}
-\protected\def\peektoks {\@qpeektrue \@qrtoks}
-\protected\def\peektok {\@qpeektrue \@qrtok}
+\protected\def\peeknum {\@qpeektrue \@qrnum}
+\protected\def\peekdim {\@qpeektrue \@qrdim}
+\protected\def\peekskip{\@qpeektrue \@qrskip}
+\protected\def\peekmu {\@qpeektrue \@qrmu}
+\protected\def\peekbox {\@qpeektrue \@qrbox}
+\protected\def\peektoks{\@qpeektrue \@qrtoks}
+\protected\def\peektok {\@qpeektrue \@qrtok}
\endinput
