[latex3-commits] [git/LaTeX3-latex3-latex3] scan-quark: Rename \s_@@_mark and \s_@@_stop (8ea06802c)
PhelypeOleinik
tex.phelype at gmail.com
Fri Mar 20 13:56:55 CET 2020
Repository : https://github.com/latex3/latex3
On branch : scan-quark
Link : https://github.com/latex3/latex3/commit/8ea06802ce992eb63e1f1102068bfd3f90003b5a
>---------------------------------------------------------------
commit 8ea06802ce992eb63e1f1102068bfd3f90003b5a
Author: PhelypeOleinik <tex.phelype at gmail.com>
Date: Fri Mar 20 09:56:55 2020 -0300
Rename \s_@@_mark and \s_@@_stop
These are very specific scan marks, so they better have dedicated names (\s_@@_expr_mark and \s_@@_expr_stop), so they don't mix up with the (upcoming) generic \s_@@_mark and \s_@@_stop used as macro delimiters.
>---------------------------------------------------------------
8ea06802ce992eb63e1f1102068bfd3f90003b5a
l3kernel/l3fp-aux.dtx | 14 +++++++-------
l3kernel/l3fp-logic.dtx | 8 ++++----
l3kernel/l3fp-parse.dtx | 32 ++++++++++++++++----------------
3 files changed, 27 insertions(+), 27 deletions(-)
diff --git a/l3kernel/l3fp-aux.dtx b/l3kernel/l3fp-aux.dtx
index f9601e4d7..20a7325d6 100644
--- a/l3kernel/l3fp-aux.dtx
+++ b/l3kernel/l3fp-aux.dtx
@@ -245,11 +245,11 @@
% \end{macrocode}
% \end{macro}
%
-% \begin{macro}{\s_@@_mark, \s_@@_stop}
+% \begin{macro}{\s_@@_expr_mark, \s_@@_expr_stop}
% Aliases of \cs{tex_relax:D}, used to terminate expressions.
% \begin{macrocode}
-\scan_new:N \s_@@_mark
-\scan_new:N \s_@@_stop
+\scan_new:N \s_@@_expr_mark
+\scan_new:N \s_@@_expr_stop
% \end{macrocode}
% \end{macro}
%
@@ -631,7 +631,7 @@
% \end{macro}
%
% \begin{macro}[EXP]{\@@_exp_after_any_f:Nnw, \@@_exp_after_any_f:nw}
-% \begin{macro}[EXP]{\@@_exp_after_stop_f:nw}
+% \begin{macro}[EXP]{\@@_exp_after_expr_stop_f:nw}
% The |Nnw| function simply dispatches to the appropriate
% \cs[no-index]{@@_exp_after\ldots{}_f:nw} with \enquote{\ldots{}}
% (either empty or |_|\meta{type}) extracted from |#1|, which should
@@ -652,7 +652,7 @@
\q_stop
{#1} #2
}
-\cs_new_eq:NN \@@_exp_after_stop_f:nw \use_none:nn
+\cs_new_eq:NN \@@_exp_after_expr_stop_f:nw \use_none:nn
% \end{macrocode}
% \end{macro}
% \end{macro}
@@ -667,7 +667,7 @@
% \meta{fp_1} |;|\\
% \ldots{}\\
% \meta{fp_n} |;|\\
-% \cs{s_@@_stop}
+% \cs{s_@@_expr_stop}
% \end{quote}
% \begin{macrocode}
\cs_new:Npn \@@_exp_after_tuple_o:w
@@ -679,7 +679,7 @@
\exp_after:wN \@@_tuple_chk:w
\exp_after:wN {
\exp:w \exp_end_continue_f:w
- \@@_exp_after_array_f:w #2 \s_@@_stop
+ \@@_exp_after_array_f:w #2 \s_@@_expr_stop
\exp_after:wN }
\exp_after:wN ;
\exp:w \exp_end_continue_f:w #1
diff --git a/l3kernel/l3fp-logic.dtx b/l3kernel/l3fp-logic.dtx
index d58c523d9..25a0461ae 100644
--- a/l3kernel/l3fp-logic.dtx
+++ b/l3kernel/l3fp-logic.dtx
@@ -691,7 +691,7 @@
\fi:
\exp_after:wN #1
\exp:w \exp_end_continue_f:w
- \@@_exp_after_array_f:w #4 \s_@@_stop
+ \@@_exp_after_array_f:w #4 \s_@@_expr_stop
\exp_after:wN @
\exp:w
\@@_parse_operand:Nw \c_@@_prec_colon_int
@@ -702,7 +702,7 @@
\exp_after:wN \@@_parse_continue:NwN
\exp_after:wN #1
\exp:w \exp_end_continue_f:w
- \@@_exp_after_array_f:w #4 \s_@@_stop
+ \@@_exp_after_array_f:w #4 \s_@@_expr_stop
\exp_after:wN #5
\exp_after:wN #1
\fi:
@@ -712,7 +712,7 @@
\exp_after:wN \@@_parse_continue:NwN
\exp_after:wN #1
\exp:w \exp_end_continue_f:w
- \@@_exp_after_array_f:w #2 \s_@@_stop
+ \@@_exp_after_array_f:w #2 \s_@@_expr_stop
#4 #1
}
\cs_new:Npn \@@_ternary_auxii:NwwN #1#2@#3@#4
@@ -720,7 +720,7 @@
\exp_after:wN \@@_parse_continue:NwN
\exp_after:wN #1
\exp:w \exp_end_continue_f:w
- \@@_exp_after_array_f:w #3 \s_@@_stop
+ \@@_exp_after_array_f:w #3 \s_@@_expr_stop
#4 #1
}
% \end{macrocode}
diff --git a/l3kernel/l3fp-parse.dtx b/l3kernel/l3fp-parse.dtx
index 0d125aeae..6d2ca4cd2 100644
--- a/l3kernel/l3fp-parse.dtx
+++ b/l3kernel/l3fp-parse.dtx
@@ -468,7 +468,7 @@
% \item If the next token is a control sequence with the meaning of
% \cs{scan_stop:}, it can be: \cs{s_@@}, in which case our job is
% done, as what follows is an internal floating point number, or
-% \cs{s_@@_mark}, in which case the expression has come to an early
+% \cs{s_@@_expr_mark}, in which case the expression has come to an early
% end, as we are still looking for a number here, or something else,
% in which case we consider the control sequence to be a bad
% variable resulting from \texttt{c}-expansion.
@@ -499,7 +499,7 @@
% operator. This goes as follows.
% \begin{itemize}
% \item If the next token is a control sequence, it could be the
-% special marker \cs{s_@@_mark}, and
+% special marker \cs{s_@@_expr_mark}, and
% otherwise it is a case of juxtaposing numbers, such as
% |2\c_zero_int|, with an implied multiplication.
% \item If the next token is a letter, it is also a case of
@@ -741,7 +741,7 @@
% \begin{macro}[EXP]
% {
% \@@_parse_one_fp:NN,
-% \@@_exp_after_mark_f:nw,
+% \@@_exp_after_expr_mark_f:nw,
% \@@_exp_after_?_f:nw
% }
% This function receives a \meta{precedence} and a control sequence
@@ -750,8 +750,8 @@
% \item \cs{s_@@} starts a floating point number, and we call
% \cs{@@_exp_after_f:nw}, which |f|-expands after the floating
% point.
-% \item \cs{s_@@_mark} is a premature end, we call
-% \cs{@@_exp_after_mark_f:nw}, which triggers an |fp-early-end|
+% \item \cs{s_@@_expr_mark} is a premature end, we call
+% \cs{@@_exp_after_expr_mark_f:nw}, which triggers an |fp-early-end|
% error.
% \item For a control sequence not containing \cs[no-index]{s_@@}, we call
% \cs{@@_exp_after_?_f:nw}, causing a |bad-variable| error.
@@ -776,7 +776,7 @@
\exp_after:wN #1 \exp:w \@@_parse_expand:w
}
}
-\cs_new:Npn \@@_exp_after_mark_f:nw #1
+\cs_new:Npn \@@_exp_after_expr_mark_f:nw #1
{
\int_case:nnF { \exp_after:wN \use_i:nnn \use_none:nnn #1 }
{
@@ -1947,7 +1947,7 @@
\exp_not:N \token_if_eq_meaning:NNTF #3
\exp_not:c { @@_parse_infix_):N }
{
- \exp_not:N \@@_exp_after_array_f:w #2 \s_@@_stop
+ \exp_not:N \@@_exp_after_array_f:w #2 \s_@@_expr_stop
\exp_not:N \exp_after:wN
\exp_not:N \@@_parse_infix_after_paren:NN
\exp_not:N \exp_after:wN #1
@@ -2116,7 +2116,7 @@
% in two steps. The \cs{@@_parse_operand:Nw} function performs
% computations until reaching an operation with precedence
% \cs{c_@@_prec_end_int} or less, namely, the end of the expression. The
-% marker \cs{s_@@_mark} indicates that the next token is an already
+% marker \cs{s_@@_expr_mark} indicates that the next token is an already
% parsed version of an infix operator, and \cs{@@_parse_infix_end:N}
% has infinitely negative precedence. Finally, clean up a
% (well-defined) set of extra tokens and stop the initial expansion
@@ -2129,12 +2129,12 @@
\exp:w
\@@_parse_operand:Nw \c_@@_prec_end_int
\@@_parse_expand:w #1
- \s_@@_mark \@@_parse_infix_end:N
- \s_@@_stop
+ \s_@@_expr_mark \@@_parse_infix_end:N
+ \s_@@_expr_stop
\exp_end:
}
\cs_new:Npn \@@_parse_after:ww
- #1@ \@@_parse_infix_end:N \s_@@_stop #2 { #2 #1 }
+ #1@ \@@_parse_infix_end:N \s_@@_expr_stop #2 { #2 #1 }
\cs_new:Npn \@@_parse_o:n #1
{
\exp:w
@@ -2142,8 +2142,8 @@
\exp:w
\@@_parse_operand:Nw \c_@@_prec_end_int
\@@_parse_expand:w #1
- \s_@@_mark \@@_parse_infix_end:N
- \s_@@_stop
+ \s_@@_expr_mark \@@_parse_infix_end:N
+ \s_@@_expr_stop
{
\exp_end_continue_f:w
\@@_exp_after_any_f:nw { \exp_after:wN \exp_stop_f: }
@@ -2265,7 +2265,7 @@
{
\if_catcode:w \scan_stop: \exp_not:N #2
\if_int_compare:w
- \@@_str_if_eq:nn { \s_@@_mark } { \exp_not:N #2 }
+ \@@_str_if_eq:nn { \s_@@_expr_mark } { \exp_not:N #2 }
= 0 \exp_stop_f:
\exp_after:wN \exp_after:wN
\exp_after:wN \@@_parse_infix_mark:NNN
@@ -2317,7 +2317,7 @@
{
\if_catcode:w \scan_stop: \exp_not:N #2
\if_int_compare:w
- \@@_str_if_eq:nn { \s_@@_mark } { \exp_not:N #2 }
+ \@@_str_if_eq:nn { \s_@@_expr_mark } { \exp_not:N #2 }
= 0 \exp_stop_f:
\exp_after:wN \exp_after:wN
\exp_after:wN \@@_parse_infix_mark:NNN
@@ -2349,7 +2349,7 @@
% \subsubsection{Closing parentheses and commas}
%
% \begin{macro}[EXP]{\@@_parse_infix_mark:NNN}
-% As an infix operator, \cs{s_@@_mark} means that the next
+% As an infix operator, \cs{s_@@_expr_mark} means that the next
% token~(|#3|) has already gone through \cs{@@_parse_infix:NN} and
% should be provided the precedence~|#1|. The scan mark~|#2| is
% discarded.
More information about the latex3-commits
mailing list.