[latex3-commits] [git/LaTeX3-latex3-latex3] master: Revert "Use @@ notation inside l3fp" (1d58708)
Bruno Le Floch
bruno at le-floch.fr
Sun Mar 25 22:10:33 CEST 2018
Repository : https://github.com/latex3/latex3
On branch : master
Link : https://github.com/latex3/latex3/commit/1d58708bd46f0759a537e95156f0e18cfa2dd16d
>---------------------------------------------------------------
commit 1d58708bd46f0759a537e95156f0e18cfa2dd16d
Author: Bruno Le Floch <bruno at le-floch.fr>
Date: Sun Mar 25 16:10:33 2018 -0400
Revert "Use @@ notation inside l3fp"
This reverts commit a9a76dee41aaea2c05eff139f1b1871735b76497.
Most of the changes were incorrect because the @@ notation is not changed to
the module name in verbatim and similar places.
>---------------------------------------------------------------
1d58708bd46f0759a537e95156f0e18cfa2dd16d
l3kernel/l3fp-aux.dtx | 10 +++++-----
l3kernel/l3fp-basics.dtx | 2 +-
l3kernel/l3fp-convert.dtx | 4 ++--
l3kernel/l3fp-parse.dtx | 48 ++++++++++++++++++++++-----------------------
l3kernel/l3fp.dtx | 4 ++--
5 files changed, 34 insertions(+), 34 deletions(-)
diff --git a/l3kernel/l3fp-aux.dtx b/l3kernel/l3fp-aux.dtx
index 1b5b3f2..d7f0fbb 100644
--- a/l3kernel/l3fp-aux.dtx
+++ b/l3kernel/l3fp-aux.dtx
@@ -128,8 +128,8 @@
% \Arg{X_1} \Arg{X_2} \Arg{X_3} \Arg{X_4} |;|
% \end{quote}
% Here, the \meta{exponent} is an integer, between
-% $-\ExplSyntaxOn\int_use:N\c_@@_minus_min_exponent_int$ and
-% $\ExplSyntaxOn\int_use:N\c_@@_max_exponent_int$. The body consists
+% $-\ExplSyntaxOn\int_use:N\c__fp_minus_min_exponent_int$ and
+% $\ExplSyntaxOn\int_use:N\c__fp_max_exponent_int$. The body consists
% in four blocks of exactly $4$ digits,
% $0000 \leq \meta{X_i} \leq 9999$, and the floating point is
% \[
@@ -526,7 +526,7 @@
%
% \begin{macro}[EXP]{\@@_if_type_fp:NTwFw}
% Used as \cs{@@_if_type_fp:NTwFw} \meta{marker} \Arg{true code}
-% \cs{s_@@} \Arg{false code} \cs{q_stop}, this test whether the
+% \cs{s__fp} \Arg{false code} \cs{q_stop}, this test whether the
% \meta{marker} is \cs{s_@@} or not and runs the appropriate
% \meta{code}. The very unusual syntax is for optimization purposes
% as that function is used for all floating point operations.
@@ -557,7 +557,7 @@
% {\@@_type_from_scan:N, \@@_type_from_scan_other:N, \@@_type_from_scan:w}
% Used as \cs{@@_type_from_scan:N} \meta{token}.
% Grabs the pieces of the stringified \meta{token} which lies after
-% the first |s_@@|. If the \meta{token} does not contain that
+% the first |s__fp|. If the \meta{token} does not contain that
% string, the result is |_?|.
% \begin{macrocode}
\cs_new:Npn \@@_type_from_scan:N #1
@@ -624,7 +624,7 @@
% 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
-% start with |\s_@@|. If it doesn't start with |\s_@@| the function
+% start with |\s__fp|. If it doesn't start with |\s__fp| the function
% \cs{@@_exp_after_?_f:nw} defined in \pkg{l3fp-parse} gives an error;
% another special \meta{type} is |stop|, useful for loops, see below.
% The |nw| function has an important optimization for floating points
diff --git a/l3kernel/l3fp-basics.dtx b/l3kernel/l3fp-basics.dtx
index ac5eab2..a1e199b 100644
--- a/l3kernel/l3fp-basics.dtx
+++ b/l3kernel/l3fp-basics.dtx
@@ -110,7 +110,7 @@
% opposite signs, shift the significand of the smaller one to match the
% bigger one, perform the addition or subtraction of significands,
% check for a carry, round, and pack using the
-% \cs[no-index]{_@@_basics_pack_\ldots{}} functions.
+% \cs[no-index]{__fp_basics_pack_\ldots{}} functions.
% \end{itemize}
% The trickiest part is to round correctly when adding or subtracting
% normal floating point numbers.
diff --git a/l3kernel/l3fp-convert.dtx b/l3kernel/l3fp-convert.dtx
index 9214113..fed9ba3 100644
--- a/l3kernel/l3fp-convert.dtx
+++ b/l3kernel/l3fp-convert.dtx
@@ -576,11 +576,11 @@
% speed here ends up irrelevant, we can simplify the code for the
% auxiliary to become
% \begin{verbatim}
-% \cs_new:Npn \@@_array_to_clist_loop:Nw #1#2;
+% \cs_new:Npn \__fp_array_to_clist_loop:Nw #1#2;
% {
% \use_none:n #1
% { , ~ } \fp_to_tl:n { #1 #2 ; }
-% \@@_array_to_clist_loop:Nw
+% \__fp_array_to_clist_loop:Nw
% }
% \end{verbatim}
% The \cs{use_ii:nn} function is expanded after \cs{@@_expand:n} is
diff --git a/l3kernel/l3fp-parse.dtx b/l3kernel/l3fp-parse.dtx
index 29b918c..b51d0dd 100644
--- a/l3kernel/l3fp-parse.dtx
+++ b/l3kernel/l3fp-parse.dtx
@@ -293,7 +293,7 @@
% expands to
% \begin{quote}
% \meta{number}\\
-% | \@@_parse_infix_|\meta{operator}|:N| \meta{precedence}
+% | \__fp_parse_infix_|\meta{operator}|:N| \meta{precedence}
% \end{quote}
% expanding the \texttt{infix} auxiliary before leaving the above in the
% input stream.
@@ -304,7 +304,7 @@
% being computed as |(1-2)-3|, but |2^3^4| should be evaluated as
% |2^(3^4)| instead. For this reason, and to support the equivalence
% between |**| and~|^| more easily, each binary operator is converted to
-% a control sequence |\@@_parse_infix_|\meta{operator}|:N| when it is
+% a control sequence |\__fp_parse_infix_|\meta{operator}|:N| when it is
% encountered for the first time. Instead of passing both precedences
% to a test function to do the comparison steps above, we pass the
% \meta{precedence} (of the earlier operator) to the \texttt{infix}
@@ -312,7 +312,7 @@
% perform the computation of the \meta{operator}. If it should not be
% performed, the \texttt{infix} auxiliary expands to
% \begin{syntax}
-% |@| \cs{use_none:n} |\@@_parse_infix_|\meta{operator}|:N|
+% |@| \cs{use_none:n} |\__fp_parse_infix_|\meta{operator}|:N|
% \end{syntax}
% and otherwise it calls \cs{@@_parse_operand:Nw} with the precedence of
% the \meta{operator} to find its second operand \meta{number_2} and the
@@ -320,7 +320,7 @@
% \begin{syntax}
% |@| \cs{@@_parse_apply_binary:NwNwN}
% ~~~~\meta{operator} \meta{number_2}
-% |@| |\@@_parse_infix_|\meta{operator_2}|:N|
+% |@| |\__fp_parse_infix_|\meta{operator_2}|:N|
% \end{syntax}
% The \texttt{infix} function is responsible for comparing precedences,
% but cannot directly call the computation functions, because the first
@@ -343,7 +343,7 @@
% \begin{syntax}
% \cs{@@_parse_continue:NwN} \meta{precedence}
% \meta{number} |@|
-% \cs{use_none:n} |\@@_parse_infix_|\meta{operator}|:N|
+% \cs{use_none:n} |\__fp_parse_infix_|\meta{operator}|:N|
% \end{syntax}
% or
% \begin{syntax}
@@ -351,18 +351,18 @@
% \meta{number} |@|
% \cs{@@_parse_apply_binary:NwNwN}
% ~~\meta{operator} \meta{number_2}
-% |@| |\@@_parse_infix_|\meta{operator_2}|:N|
+% |@| |\__fp_parse_infix_|\meta{operator_2}|:N|
% \end{syntax}
% The definition of \cs{@@_parse_continue:NwN} is then very simple:
% \begin{syntax}
-% |\cs_new:Npn \@@_parse_continue:NwN #1#2@#3 { #3 #1 #2 @ }|
+% |\cs_new:Npn \__fp_parse_continue:NwN #1#2@#3 { #3 #1 #2 @ }|
% \end{syntax}
% In the first case, |#3|~is \cs{use_none:n}, yielding
% \begin{syntax}
% \cs{use_none:n} \meta{precedence} \meta{number} |@|
-% |\@@_parse_infix_|\meta{operator}|:N|
+% |\__fp_parse_infix_|\meta{operator}|:N|
% \end{syntax}
-% then \meta{number} |@| |\@@_parse_infix_|\meta{operator}|:N|. In
+% then \meta{number} |@| |\__fp_parse_infix_|\meta{operator}|:N|. In
% the second case, |#3|~is \cs{@@_parse_apply_binary:NwNwN}, whose role
% is to compute \meta{number} \meta{operator} \meta{number_2} and to
% prepare for the next comparison of precedences: first we get
@@ -370,18 +370,18 @@
% \cs{@@_parse_apply_binary:NwNwN}
% ~~\meta{precedence} \meta{number} |@|
% ~~\meta{operator} \meta{number_2}
-% |@| |\@@_parse_infix_|\meta{operator_2}|:N|
+% |@| |\__fp_parse_infix_|\meta{operator_2}|:N|
% \end{syntax}
% then
% \begin{syntax}
% \cs{exp_after:wN} \cs{@@_parse_continue:NwN}
% \cs{exp_after:wN} \meta{precedence}
% \cs{exp:w} \cs{exp_end_continue_f:w}
-% |\@@_|\meta{operator}|_o:ww| \meta{number} \meta{number_2}
+% |\__fp_|\meta{operator}|_o:ww| \meta{number} \meta{number_2}
% \cs{exp:w} \cs{exp_end_continue_f:w}
-% |\@@_parse_infix_|\meta{operator_2}|:N| \meta{precedence}
+% |\__fp_parse_infix_|\meta{operator_2}|:N| \meta{precedence}
% \end{syntax}
-% where |\@@_|\meta{operator}|_o:ww| computes \meta{number}
+% where |\__fp_|\meta{operator}|_o:ww| computes \meta{number}
% \meta{operator} \meta{number_2} and expands after the result, thus
% triggers the comparison of the precedence of the \meta{operator_2} and
% the \meta{precedence}, continuing the loop.
@@ -501,7 +501,7 @@
% juxtaposition, as letters cannot be proper infix operators.
% \item Otherwise (including in the case of digits), if the token is a
% known infix operator, the appropriate
-% |\@@_infix_|\meta{operator}|:N| function is built, and if it
+% |\__fp_infix_|\meta{operator}|:N| function is built, and if it
% does not exist, we complain. In particular, the juxtaposition
% |\c_zero 2| is disallowed.
% \end{itemize}
@@ -572,7 +572,7 @@
% Reads the \enquote{\ttfamily\ldots{}}, performing every computation
% with a precedence higher than \meta{precedence}, then expands to
% \begin{syntax}
-% \meta{result} |@| |\@@_parse_infix_|\meta{operation}|:N| \ldots{}
+% \meta{result} |@| |\__fp_parse_infix_|\meta{operation}|:N| \ldots{}
% \end{syntax}
% where the \meta{operation} is the first operation with a lower
% precedence, possibly \texttt{end}, and the
@@ -605,11 +605,11 @@
% \meta{operation} has a precedence higher than \meta{precedence},
% expands to
% \begin{syntax}
-% \meta{operand_1} |@| \cs{@@_parse_apply_binary:NwNwN} \meta{operation} \meta{operand_2} |@| |\@@_parse_infix_|\meta{operation_2}|:N| \ldots{}
+% \meta{operand_1} |@| \cs{@@_parse_apply_binary:NwNwN} \meta{operation} \meta{operand_2} |@| |\__fp_parse_infix_|\meta{operation_2}|:N| \ldots{}
% \end{syntax}
% and otherwise expands to
% \begin{syntax}
-% \meta{operand} |@| \cs{use_none:n} |\@@_parse_infix_|\meta{operation}|:N| \ldots{}
+% \meta{operand} |@| \cs{use_none:n} |\__fp_parse_infix_|\meta{operation}|:N| \ldots{}
% \end{syntax}
% \end{macro}
%
@@ -753,7 +753,7 @@
% \end{itemize}
% This scheme is extensible: additional types can be added by starting
% the variables with a scan mark of the form \cs[no-index]{s_@@_\meta{type}} and
-% defining |\@@_exp_after_|\meta{type}|_f:nw|. In all cases, we
+% defining |\__fp_exp_after_|\meta{type}|_f:nw|. In all cases, we
% make sure that the second argument of \cs{@@_parse_infix:NN} is
% correctly expanded.
% A special case only enabled in \LaTeXe{} is that if \tn{protect} is
@@ -936,7 +936,7 @@
% If it is an \textsc{ascii} letter, \cs{@@_parse_letters:N} beyond this one and give
% the result to \cs{@@_parse_word:Nw}. Otherwise, the character is
% assumed to be a prefix operator, and we build
-% |\@@_parse_prefix_|\meta{operator}|:Nw|.
+% |\__fp_parse_prefix_|\meta{operator}|:Nw|.
% \begin{macrocode}
\cs_new:Npn \@@_parse_one_other:NN #1 #2
{
@@ -1059,11 +1059,11 @@
%
% Numbers are parsed as follows: first we trim leading zeros, then
% if the next character is a digit, start reading a significand $\geq 1$
-% with the set of functions |\@@_parse_large|\ldots{}; if it is a
+% with the set of functions |\__fp_parse_large|\ldots{}; if it is a
% period, the significand is~$<1$; and otherwise it is zero. In the
% second case, trim additional zeros after the period, counting them for
% an exponent shift $\meta{exp_1}<0$, then read the significand with the
-% set of functions |\@@_parse_small|\ldots{} Once the significand is
+% set of functions |\__fp_parse_small|\ldots{} Once the significand is
% read, read the exponent if |e|~is present.
%
% \begin{macro}[rEXP]{\@@_parse_trim_zeros:N, \@@_parse_trim_end:w}
@@ -1831,7 +1831,7 @@
% The unary~|-| and boolean not are harder: we parse the operand using
% a precedence equal to the maximum of the previous precedence~|##1|
% and the precedence \cs{c_@@_prec_not_int} of the unary operator, then call
-% the appropriate |\@@_|\meta{operation}|_o:w| function,
+% the appropriate |\__fp_|\meta{operation}|_o:w| function,
% where the \meta{operation} is |set_sign| or |not|.
% \begin{macrocode}
\cs_set_protected:Npn \@@_tmp:w #1#2#3#4
@@ -2316,7 +2316,7 @@
% \end{macrocode}
% \end{macro}
%
-% \begin{macro}[verb, EXP]{\@@_parse_infix_,:N}
+% \begin{macro}[verb, EXP]{\__fp_parse_infix_,:N}
% \begin{macro}[EXP]{\@@_parse_infix_comma:w, \@@_parse_apply_comma:NwNwN}
% As for other infix operations, if the previous operations has higher
% precedence the comma waits. Otherwise we call
@@ -2796,7 +2796,7 @@
% \begin{macro}{\@@_new_function:NNnnn, \@@_new_function:Ncfnn}
% \begin{macro}{\@@_function_args:Nwn}
% Save the code provided by the user in the control sequence
-% |\@@_user_#1|. Define |#1| to call \cs{@@_function_apply:nw}
+% |\__fp_user_#1|. Define |#1| to call \cs{@@_function_apply:nw}
% after parsing one operand using \cs{@@_parse_operand:Nw} with
% precedence~$16$. The auxiliary \cs{@@_function_args:Nwn} receives
% the user function and the number of arguments (half of the number of
diff --git a/l3kernel/l3fp.dtx b/l3kernel/l3fp.dtx
index 9720e05..8524ec0 100644
--- a/l3kernel/l3fp.dtx
+++ b/l3kernel/l3fp.dtx
@@ -1429,8 +1429,8 @@
% hard-code the logarithms of $44$ small integers instead of $9$.
% \item Improve notations in the explanations of the division
% algorithm (\pkg{l3fp-basics}).
-% \item Understand and document \cs{_@@_basics_pack_weird_low:NNNNw}
-% and \cs{_@@_basics_pack_weird_high:NNNNNNNNw} better. Move the
+% \item Understand and document \cs{__fp_basics_pack_weird_low:NNNNw}
+% and \cs{__fp_basics_pack_weird_high:NNNNNNNNw} better. Move the
% other \texttt{basics_pack} auxiliaries to \pkg{l3fp-aux} under a
% better name.
% \item Find out if underflow can really occur for trigonometric
More information about the latex3-commits
mailing list