[latex3-commits] [git/LaTeX3-latex3-latex3] scan-quark: Replace quarks by scan marks in l3fp-{functions, interchange, symbolic, types} (eb77118f3)
PhelypeOleinik
tex.phelype at gmail.com
Fri Mar 20 21:36:08 CET 2020
Repository : https://github.com/latex3/latex3
On branch : scan-quark
Link : https://github.com/latex3/latex3/commit/eb77118f3e90122be412c85372ecb421060f9421
>---------------------------------------------------------------
commit eb77118f3e90122be412c85372ecb421060f9421
Author: PhelypeOleinik <tex.phelype at gmail.com>
Date: Fri Mar 20 17:36:08 2020 -0300
Replace quarks by scan marks in l3fp-{functions,interchange,symbolic,types}
To match the changes in the main l3fp module
>---------------------------------------------------------------
eb77118f3e90122be412c85372ecb421060f9421
l3trial/l3fp-extras/l3fp-functions.dtx | 22 +++++++++++-----------
l3trial/l3fp-extras/l3fp-interchange.dtx | 6 +++---
l3trial/l3fp-extras/l3fp-symbolic.dtx | 12 ++++++------
l3trial/l3fp-extras/l3fp-types.dtx | 12 ++++++------
4 files changed, 26 insertions(+), 26 deletions(-)
diff --git a/l3trial/l3fp-extras/l3fp-functions.dtx b/l3trial/l3fp-extras/l3fp-functions.dtx
index fa3dfca12..ff6312e6e 100644
--- a/l3trial/l3fp-extras/l3fp-functions.dtx
+++ b/l3trial/l3fp-extras/l3fp-functions.dtx
@@ -149,25 +149,25 @@
% code~|#1| followed by a brace group with this token list. This
% results in a floating point result, which is then correctly parsed
% as the next operand of whatever was looking for one. The trailing
-% \cs{s_@@_mark} is used as a special infix operator to indicate that
-% the next token has already gone through \cs{@@_parse_infix:NN}.
+% \cs{s_@@_expr_mark} is used as a special infix operator to indicate
+% that the next token has already gone through \cs{@@_parse_infix:NN}.
% \begin{macrocode}
\cs_new:Npn \@@_function_apply:nw #1#2 @
{
\@@_parse:n
{
\@@_function_store:wwNwnn #2
- \s_@@_mark \@@_function_store:wwNwnn ;
- \s_@@_mark \@@_function_store_end:wnnn
- \s_@@_stop { } { } {#1}
+ \s_@@_expr_mark \@@_function_store:wwNwnn ;
+ \s_@@_expr_mark \@@_function_store_end:wnnn
+ \s_@@_expr_stop { } { } {#1}
}
- \s_@@_mark
+ \s_@@_expr_mark
}
\cs_new:Npn \@@_function_store:wwNwnn
- #1; #2 \s_@@_mark #3#4 \s_@@_stop #5#6
- { #3 #2 \s_@@_mark #3#4 \s_@@_stop { #5 #6 } { { #1; } } }
+ #1; #2 \s_@@_expr_mark #3#4 \s_@@_expr_stop #5#6
+ { #3 #2 \s_@@_expr_mark #3#4 \s_@@_expr_stop { #5 #6 } { { #1; } } }
\cs_new:Npn \@@_function_store_end:wnnn
- #1 \s_@@_stop #2#3#4
+ #1 \s_@@_expr_stop #2#3#4
{ #4 {#2} }
% \end{macrocode}
% \end{macro}
@@ -245,7 +245,7 @@
\exp_after:wN ,
\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 ;
@@ -360,7 +360,7 @@
\cs_new:Npn \@@_function_arg_few:w #1 @ { \exp_after:wN \c_nan_fp }
\cs_new:Npn \@@_function_arg_get:w #1#2#3; #4 @
{
- \@@_exp_after_array_f:w #3; \s_@@_stop
+ \@@_exp_after_array_f:w #3; \s_@@_expr_stop
\exp_after:wN \exp_stop_f:
}
% \end{macrocode}
diff --git a/l3trial/l3fp-extras/l3fp-interchange.dtx b/l3trial/l3fp-extras/l3fp-interchange.dtx
index 1cbefc180..57dba0b8c 100644
--- a/l3trial/l3fp-extras/l3fp-interchange.dtx
+++ b/l3trial/l3fp-extras/l3fp-interchange.dtx
@@ -134,7 +134,7 @@
\cs_new:Npn \@@_from_bytes:n #1
{
\int_compare:nNnTF { \str_count:n {#1} } = { 8 }
- { \@@_from_bytes:Nw #1 \q_stop }
+ { \@@_from_bytes:Nw #1 \s_@@_stop }
{ \@@_from_bytes_invalid: }
}
\cs_new:Npn \@@_from_bytes:Nw #1
@@ -150,7 +150,7 @@
{ \@@_from_bytes_finite:Nnw }
#1 {#2}
}
-\cs_new:Npn \@@_from_bytes_special:Nnw #1#2#3 \q_stop
+\cs_new:Npn \@@_from_bytes_special:Nnw #1#2#3 \s_@@_stop
{
\int_case:nnF { \int_div_truncate:nn {#2} {2} }
{
@@ -166,7 +166,7 @@
{ \@@_from_bytes_finite:NNnNNNNw 4 }
#1 {#2}
}
-\cs_new:Npn \@@_from_bytes_finite:NNnNNNNw #1#2#3#4#5#6#7#8 \q_stop
+\cs_new:Npn \@@_from_bytes_finite:NNnNNNNw #1#2#3#4#5#6#7#8 \s_@@_stop
{
\@@_parse:n
{
diff --git a/l3trial/l3fp-extras/l3fp-symbolic.dtx b/l3trial/l3fp-extras/l3fp-symbolic.dtx
index e7e7123e6..b19f48b69 100644
--- a/l3trial/l3fp-extras/l3fp-symbolic.dtx
+++ b/l3trial/l3fp-extras/l3fp-symbolic.dtx
@@ -174,12 +174,12 @@
\cs_new:Npn \@@_if_has_symbolic:nTF #1
{
\@@_if_has_symbolic_aux:w
- #1 \q_mark \use_i:nn
- \s_@@_symbolic \q_mark \use_ii:nn
- \q_stop
+ #1 \s_@@_mark \use_i:nn
+ \s_@@_symbolic \s_@@_mark \use_ii:nn
+ \s_@@_stop
}
\cs_new:Npn \@@_if_has_symbolic_aux:w
- #1 \s_@@_symbolic #2 \q_mark #3#4 \q_stop { #3 }
+ #1 \s_@@_symbolic #2 \s_@@_mark #3#4 \s_@@_stop { #3 }
% \end{macrocode}
% \end{macro}
%
@@ -200,7 +200,7 @@
\exp_after:wN \exp_end: \exp_after:wN
{
\exp:w \exp_end_continue_f:w
- \@@_exp_after_array_f:w #3 \s_@@_stop
+ \@@_exp_after_array_f:w #3 \s_@@_expr_stop
\exp_after:wN
}
\exp_after:wN ;
@@ -522,7 +522,7 @@
\fp_if_exist:cTF { l_@@_variable_#1_fp }
{
\exp_last_unbraced:Nf \@@_exp_after_array_f:w
- { \use:c { l_@@_variable_#1_fp } } \s_@@_stop
+ { \use:c { l_@@_variable_#1_fp } } \s_@@_expr_stop
\exp_after:wN \exp_stop_f: #2
}
{
diff --git a/l3trial/l3fp-extras/l3fp-types.dtx b/l3trial/l3fp-extras/l3fp-types.dtx
index a311f94d2..3cdd98787 100644
--- a/l3trial/l3fp-extras/l3fp-types.dtx
+++ b/l3trial/l3fp-extras/l3fp-types.dtx
@@ -121,17 +121,17 @@
\cs_new:Npx \@@_types_cs_to_op:N #1
{
\exp_not:N \exp_after:wN \exp_not:N \@@_types_cs_to_op_auxi:wwwn
- \exp_not:N \token_to_str:N #1 \exp_not:N \q_mark
- \exp_not:N \use_i_delimit_by_q_stop:nw
- \tl_to_str:n { _ _ fp _ _ o : w } \exp_not:N \q_mark
- { \exp_not:N \use_i_delimit_by_q_stop:nw ? }
- \exp_not:N \q_stop
+ \exp_not:N \token_to_str:N #1 \exp_not:N \s_@@_mark
+ \exp_not:N \@@_use_i_delimit_by_s_stop:nw
+ \tl_to_str:n { _ _ fp _ _ o : w } \exp_not:N \s_@@_mark
+ { \exp_not:N \@@_use_i_delimit_by_s_stop:nw ? }
+ \exp_not:N \s_@@_stop
}
\use:x
{
\cs_new:Npn \exp_not:N \@@_types_cs_to_op_auxi:wwwn
##1 \tl_to_str:n { _ _ fp _ } ##2
- \tl_to_str:n { _ o : w } ##3 \exp_not:N \q_mark ##4 { ##4 {##2} }
+ \tl_to_str:n { _ o : w } ##3 \exp_not:N \s_@@_mark ##4 { ##4 {##2} }
}
% \end{macrocode}
% \end{macro}
More information about the latex3-commits
mailing list.