[latex3-commits] [git/LaTeX3-latex3-latex3] master: Drop \__str_if_eq_x_return:nn (632c579)
Joseph Wright
joseph.wright at morningstar2.co.uk
Thu Mar 29 21:20:03 CEST 2018
Repository : https://github.com/latex3/latex3
On branch : master
Link : https://github.com/latex3/latex3/commit/632c579f26e706333103c43fdb85798443589d55
>---------------------------------------------------------------
commit 632c579f26e706333103c43fdb85798443589d55
Author: Joseph Wright <joseph.wright at morningstar2.co.uk>
Date: Thu Mar 29 20:20:03 2018 +0100
Drop \__str_if_eq_x_return:nn
>---------------------------------------------------------------
632c579f26e706333103c43fdb85798443589d55
l3kernel/l3str.dtx | 29 ---------------------------
l3kernel/l3token.dtx | 6 ++++--
l3kernel/testfiles/m3expl001.luatex.tlg | 1 -
l3kernel/testfiles/m3expl001.ptex.tlg | 1 -
l3kernel/testfiles/m3expl001.tlg | 1 -
l3kernel/testfiles/m3expl001.uptex.tlg | 1 -
l3kernel/testfiles/m3expl001.xetex.tlg | 1 -
l3kernel/testfiles/m3expl003.luatex.tlg | 1 -
l3kernel/testfiles/m3expl003.ptex.tlg | 1 -
l3kernel/testfiles/m3expl003.tlg | 1 -
l3kernel/testfiles/m3expl003.uptex.tlg | 1 -
l3kernel/testfiles/m3expl003.xetex.tlg | 1 -
l3trial/l3kernel-extras/l3kernel-extras.dtx | 6 +++++-
13 files changed, 9 insertions(+), 42 deletions(-)
diff --git a/l3kernel/l3str.dtx b/l3kernel/l3str.dtx
index b091fd0..d8115fe 100644
--- a/l3kernel/l3str.dtx
+++ b/l3kernel/l3str.dtx
@@ -811,17 +811,6 @@
% condition is true, and |+1| or |-1| otherwise.
% \end{function}
%
-% \begin{function}{\__str_if_eq_x_return:nn}
-% \begin{syntax}
-% \cs{__str_if_eq_x_return:nn} \Arg{tl_1} \Arg{tl_2}
-% \end{syntax}
-% Compares the full expansion of two \meta{token lists} on a character by
-% character basis, and is \texttt{true} if the two lists contain the same
-% characters in the same order. Either \cs{prg_return_true:} or
-% \cs{prg_return_false:} is then left in the input stream. This is a version
-% of \cs{str_if_eq_x:nnTF} coded for speed.
-% \end{function}
-%
% \begin{function}[EXP]{\__str_to_other:n}
% \begin{syntax}
% \cs{__str_to_other:n} \Arg{token list}
@@ -1135,24 +1124,6 @@
% \end{macro}
% \end{macro}
%
-% \begin{macro}[EXP]{\@@_if_eq_x_return:nn}
-% It turns out that we often need to compare a token list
-% with the result of applying some function to it, and
-% return with \cs{prg_return_true/false:}. This test is
-% similar to \cs{str_if_eq:nnTF} (see \pkg{l3str}),
-% but is hard-coded for speed.
-% \begin{macrocode}
-\cs_new:Npn \@@_if_eq_x_return:nn #1 #2
- {
- \if_int_compare:w \@@_if_eq_x:nn {#1} {#2} = 0 \exp_stop_f:
- \prg_return_true:
- \else:
- \prg_return_false:
- \fi:
- }
-% \end{macrocode}
-% \end{macro}
-%
% \begin{macro}[pTF, EXP]
% {
% \str_if_eq:nn, \str_if_eq:Vn, \str_if_eq:on, \str_if_eq:nV,
diff --git a/l3kernel/l3token.dtx b/l3kernel/l3token.dtx
index 77bd61a..518270e 100644
--- a/l3kernel/l3token.dtx
+++ b/l3kernel/l3token.dtx
@@ -1971,7 +1971,7 @@
% function cannot be defined on the fly because tests must remain
% expandable): instead the first argument of the auxiliary (plus the
% delimiter to avoid complications with trailing spaces) is compared
-% using \cs{__str_if_eq_x_return:nn} to the result of applying
+% using \cs{str_if_eq_x:nnTF} to the result of applying
% \cs{token_to_str:N} to a control sequence. Second, the
% \tn{meaning} of primitives such as \tn{dimen} or \tn{dimendef}
% starts in the same way as registers such as
@@ -2019,7 +2019,7 @@
\exp_not:N \prg_return_false:
\exp_not:N \else:
}
- \exp_not:N \__str_if_eq_x_return:nn
+ \exp_not:N \str_if_eq_x:nnTF
{
\exp_not:N \exp_after:wN
\exp_not:c { @@_delimit_by_ #2 :w }
@@ -2027,6 +2027,8 @@
? \tl_to_str:n {#2} \exp_not:N \q_stop
}
{ \exp_not:n {#3} }
+ { \exp_not:N \prg_return_true: }
+ { \exp_not:N \prg_return_false: }
\cs_if_exist:cT { tex_ #2 :D }
{
\exp_not:N \fi:
diff --git a/l3kernel/testfiles/m3expl001.luatex.tlg b/l3kernel/testfiles/m3expl001.luatex.tlg
index c4c64da..2798c9f 100644
--- a/l3kernel/testfiles/m3expl001.luatex.tlg
+++ b/l3kernel/testfiles/m3expl001.luatex.tlg
@@ -714,7 +714,6 @@ Defining \str_if_empty:cF on line ...
Defining \str_if_empty:cTF on line ...
Defining \__str_if_eq_x:nn on line ...
Defining \__str_escape_x:n on line ...
-Defining \__str_if_eq_x_return:nn on line ...
Defining \str_if_eq_p:nn on line ...
Defining \str_if_eq:nnT on line ...
Defining \str_if_eq:nnF on line ...
diff --git a/l3kernel/testfiles/m3expl001.ptex.tlg b/l3kernel/testfiles/m3expl001.ptex.tlg
index 453a804..fbf5d37 100644
--- a/l3kernel/testfiles/m3expl001.ptex.tlg
+++ b/l3kernel/testfiles/m3expl001.ptex.tlg
@@ -712,7 +712,6 @@ Defining \str_if_empty:cT on line ...
Defining \str_if_empty:cF on line ...
Defining \str_if_empty:cTF on line ...
Defining \__str_if_eq_x:nn on line ...
-Defining \__str_if_eq_x_return:nn on line ...
Defining \str_if_eq_p:nn on line ...
Defining \str_if_eq:nnT on line ...
Defining \str_if_eq:nnF on line ...
diff --git a/l3kernel/testfiles/m3expl001.tlg b/l3kernel/testfiles/m3expl001.tlg
index d4568b3..5190e48 100644
--- a/l3kernel/testfiles/m3expl001.tlg
+++ b/l3kernel/testfiles/m3expl001.tlg
@@ -712,7 +712,6 @@ Defining \str_if_empty:cT on line ...
Defining \str_if_empty:cF on line ...
Defining \str_if_empty:cTF on line ...
Defining \__str_if_eq_x:nn on line ...
-Defining \__str_if_eq_x_return:nn on line ...
Defining \str_if_eq_p:nn on line ...
Defining \str_if_eq:nnT on line ...
Defining \str_if_eq:nnF on line ...
diff --git a/l3kernel/testfiles/m3expl001.uptex.tlg b/l3kernel/testfiles/m3expl001.uptex.tlg
index d730f4e..2b46b93 100644
--- a/l3kernel/testfiles/m3expl001.uptex.tlg
+++ b/l3kernel/testfiles/m3expl001.uptex.tlg
@@ -712,7 +712,6 @@ Defining \str_if_empty:cT on line ...
Defining \str_if_empty:cF on line ...
Defining \str_if_empty:cTF on line ...
Defining \__str_if_eq_x:nn on line ...
-Defining \__str_if_eq_x_return:nn on line ...
Defining \str_if_eq_p:nn on line ...
Defining \str_if_eq:nnT on line ...
Defining \str_if_eq:nnF on line ...
diff --git a/l3kernel/testfiles/m3expl001.xetex.tlg b/l3kernel/testfiles/m3expl001.xetex.tlg
index ffabc59..9b35993 100644
--- a/l3kernel/testfiles/m3expl001.xetex.tlg
+++ b/l3kernel/testfiles/m3expl001.xetex.tlg
@@ -712,7 +712,6 @@ Defining \str_if_empty:cT on line ...
Defining \str_if_empty:cF on line ...
Defining \str_if_empty:cTF on line ...
Defining \__str_if_eq_x:nn on line ...
-Defining \__str_if_eq_x_return:nn on line ...
Defining \str_if_eq_p:nn on line ...
Defining \str_if_eq:nnT on line ...
Defining \str_if_eq:nnF on line ...
diff --git a/l3kernel/testfiles/m3expl003.luatex.tlg b/l3kernel/testfiles/m3expl003.luatex.tlg
index c4c64da..2798c9f 100644
--- a/l3kernel/testfiles/m3expl003.luatex.tlg
+++ b/l3kernel/testfiles/m3expl003.luatex.tlg
@@ -714,7 +714,6 @@ Defining \str_if_empty:cF on line ...
Defining \str_if_empty:cTF on line ...
Defining \__str_if_eq_x:nn on line ...
Defining \__str_escape_x:n on line ...
-Defining \__str_if_eq_x_return:nn on line ...
Defining \str_if_eq_p:nn on line ...
Defining \str_if_eq:nnT on line ...
Defining \str_if_eq:nnF on line ...
diff --git a/l3kernel/testfiles/m3expl003.ptex.tlg b/l3kernel/testfiles/m3expl003.ptex.tlg
index 453a804..fbf5d37 100644
--- a/l3kernel/testfiles/m3expl003.ptex.tlg
+++ b/l3kernel/testfiles/m3expl003.ptex.tlg
@@ -712,7 +712,6 @@ Defining \str_if_empty:cT on line ...
Defining \str_if_empty:cF on line ...
Defining \str_if_empty:cTF on line ...
Defining \__str_if_eq_x:nn on line ...
-Defining \__str_if_eq_x_return:nn on line ...
Defining \str_if_eq_p:nn on line ...
Defining \str_if_eq:nnT on line ...
Defining \str_if_eq:nnF on line ...
diff --git a/l3kernel/testfiles/m3expl003.tlg b/l3kernel/testfiles/m3expl003.tlg
index d4568b3..5190e48 100644
--- a/l3kernel/testfiles/m3expl003.tlg
+++ b/l3kernel/testfiles/m3expl003.tlg
@@ -712,7 +712,6 @@ Defining \str_if_empty:cT on line ...
Defining \str_if_empty:cF on line ...
Defining \str_if_empty:cTF on line ...
Defining \__str_if_eq_x:nn on line ...
-Defining \__str_if_eq_x_return:nn on line ...
Defining \str_if_eq_p:nn on line ...
Defining \str_if_eq:nnT on line ...
Defining \str_if_eq:nnF on line ...
diff --git a/l3kernel/testfiles/m3expl003.uptex.tlg b/l3kernel/testfiles/m3expl003.uptex.tlg
index d730f4e..2b46b93 100644
--- a/l3kernel/testfiles/m3expl003.uptex.tlg
+++ b/l3kernel/testfiles/m3expl003.uptex.tlg
@@ -712,7 +712,6 @@ Defining \str_if_empty:cT on line ...
Defining \str_if_empty:cF on line ...
Defining \str_if_empty:cTF on line ...
Defining \__str_if_eq_x:nn on line ...
-Defining \__str_if_eq_x_return:nn on line ...
Defining \str_if_eq_p:nn on line ...
Defining \str_if_eq:nnT on line ...
Defining \str_if_eq:nnF on line ...
diff --git a/l3kernel/testfiles/m3expl003.xetex.tlg b/l3kernel/testfiles/m3expl003.xetex.tlg
index ffabc59..9b35993 100644
--- a/l3kernel/testfiles/m3expl003.xetex.tlg
+++ b/l3kernel/testfiles/m3expl003.xetex.tlg
@@ -712,7 +712,6 @@ Defining \str_if_empty:cT on line ...
Defining \str_if_empty:cF on line ...
Defining \str_if_empty:cTF on line ...
Defining \__str_if_eq_x:nn on line ...
-Defining \__str_if_eq_x_return:nn on line ...
Defining \str_if_eq_p:nn on line ...
Defining \str_if_eq:nnT on line ...
Defining \str_if_eq:nnF on line ...
diff --git a/l3trial/l3kernel-extras/l3kernel-extras.dtx b/l3trial/l3kernel-extras/l3kernel-extras.dtx
index 222b0bb..7a2e87d 100644
--- a/l3trial/l3kernel-extras/l3kernel-extras.dtx
+++ b/l3trial/l3kernel-extras/l3kernel-extras.dtx
@@ -1266,7 +1266,11 @@
\cs_new:Npn \__skip_compare:wwN #1; #2; #3
{
\if_charcode:w = #3
- \__str_if_eq_x_return:nn {#1} {#2}
+ \if_int_compare:w \__str_if_eq_x:nn {#1} {#2} = 0 \exp_stop_f:
+ \prg_return_true:
+ \else:
+ \prg_return_false:
+ \fi:
\else:
\if_dim:w \etex_glueexpr:D #1 #3 \etex_glueexpr:D #2 \scan_stop:
\exp_after:wN \__skip_compare_auxii:wwN
More information about the latex3-commits
mailing list