[latex3-commits] [git/LaTeX3-latex3-latex3] master: Correct an internal function signature (3b5b0eb)

Joseph Wright joseph.wright at morningstar2.co.uk
Sun Mar 25 22:45:10 CEST 2018 

Repository : https://github.com/latex3/latex3
On branch  : master
Link       : https://github.com/latex3/latex3/commit/3b5b0eb55f3c6f08e75cd16d01f9b111a21c2e02

>---------------------------------------------------------------

commit 3b5b0eb55f3c6f08e75cd16d01f9b111a21c2e02
Author: Joseph Wright <joseph.wright at morningstar2.co.uk>
Date:   Sun Mar 25 20:31:17 2018 +0100

    Correct an internal function signature
    
    ... which almost misled me badly!


>---------------------------------------------------------------

3b5b0eb55f3c6f08e75cd16d01f9b111a21c2e02
 l3kernel/l3regex.dtx                    |   20 ++++++++++----------
 l3kernel/testfiles/m3expl001.luatex.tlg |    2 +-
 l3kernel/testfiles/m3expl001.ptex.tlg   |    2 +-
 l3kernel/testfiles/m3expl001.tlg        |    2 +-
 l3kernel/testfiles/m3expl001.uptex.tlg  |    2 +-
 l3kernel/testfiles/m3expl001.xetex.tlg  |    2 +-
 l3kernel/testfiles/m3expl003.luatex.tlg |    2 +-
 l3kernel/testfiles/m3expl003.ptex.tlg   |    2 +-
 l3kernel/testfiles/m3expl003.tlg        |    2 +-
 l3kernel/testfiles/m3expl003.uptex.tlg  |    2 +-
 l3kernel/testfiles/m3expl003.xetex.tlg  |    2 +-
 11 files changed, 20 insertions(+), 20 deletions(-)

diff --git a/l3kernel/l3regex.dtx b/l3kernel/l3regex.dtx
index ef07553..6041fee 100644
--- a/l3kernel/l3regex.dtx
+++ b/l3kernel/l3regex.dtx
@@ -2219,7 +2219,7 @@
 %    \end{macrocode}
 % \end{macro}
 %
-% \begin{macro}{\@@_compile_one:x}
+% \begin{macro}{\@@_compile_one:n}
 %   This is used after finding one \enquote{test}, such as |\d|, or a
 %   raw character. If that followed a catcode test (\emph{e.g.}, |\cL|),
 %   then restore the mode. If we are not in a class, then the test is
@@ -2227,7 +2227,7 @@
 %   search for quantifiers. In any case, insert the test, possibly
 %   together with a catcode test if appropriate.
 %    \begin{macrocode}
-\cs_new_protected:Npn \@@_compile_one:x #1
+\cs_new_protected:Npn \@@_compile_one:n #1
   {
     \@@_mode_quit_c:
     \@@_if_in_class:TF { }
@@ -2461,13 +2461,13 @@
         \str_if_eq:nnTF {#2#3} { \@@_compile_special:N - }
           { \@@_compile_range:Nw #1 }
           {
-            \@@_compile_one:x
               { \@@_item_equal:n { \__int_value:w `#1 ~ } }
+            \@@_compile_one:n
             #2 #3
           }
       }
       {
-        \@@_compile_one:x
+        \@@_compile_one:n
           { \@@_item_equal:n { \__int_value:w `#1 ~ } }
         #2 #3
       }
@@ -2540,7 +2540,7 @@
   {
     \exp_not:N \@@_if_in_class:TF
       { \@@_compile_raw:N . }
-      { \@@_compile_one:x \exp_not:c { @@_prop_.: } }
+      { \@@_compile_one:n \exp_not:c { @@_prop_.: } }
   }
 \cs_new_protected:cpn { @@_prop_.: }
   {
@@ -2568,10 +2568,10 @@
 \cs_set_protected:Npn \@@_tmp:w #1#2
   {
     \cs_new_protected:cpx { @@_compile_/#1: }
-      { \@@_compile_one:x \exp_not:c { @@_prop_#1: } }
+      { \@@_compile_one:n \exp_not:c { @@_prop_#1: } }
     \cs_new_protected:cpx { @@_compile_/#2: }
       {
-        \@@_compile_one:x
+        \@@_compile_one:n
           { \@@_item_reverse:n \exp_not:c { @@_prop_#1: } }
       }
   }
@@ -2581,7 +2581,7 @@
 \@@_tmp:w v V
 \@@_tmp:w w W
 \cs_new_protected:cpn { @@_compile_/N: }
-  { \@@_compile_one:x \@@_prop_N: }
+  { \@@_compile_one:n \@@_prop_N: }
 %    \end{macrocode}
 % \end{macro}
 %
@@ -2827,7 +2827,7 @@
       {
         \cs_if_exist:cTF { @@_posix_ \l_@@_internal_a_tl : }
           {
-            \@@_compile_one:x
+            \@@_compile_one:n
               {
                 \bool_if:NF \l_@@_internal_bool \@@_item_reverse:n
                 \exp_not:c { @@_posix_ \l_@@_internal_a_tl : }
@@ -3176,7 +3176,7 @@
         \exp_after:wN \@@_compile_cs_aux:Nn \l_@@_internal_regex
         \q_nil \q_nil \q_recursion_stop
       }
-    \exp_args:Nx \@@_compile_one:x
+    \exp_args:Nx \@@_compile_one:n
       {
         \flag_if_raised:nTF { @@_cs }
           { \@@_item_cs:n { \exp_not:o \l_@@_internal_regex } }
diff --git a/l3kernel/testfiles/m3expl001.luatex.tlg b/l3kernel/testfiles/m3expl001.luatex.tlg
index c54e6d7..6dd811b 100644
--- a/l3kernel/testfiles/m3expl001.luatex.tlg
+++ b/l3kernel/testfiles/m3expl001.luatex.tlg
@@ -4901,7 +4901,7 @@ Defining \__regex_compile_end: on line ...
 Defining \__regex_compile:n on line ...
 Defining \__regex_compile_special:N on line ...
 Defining \__regex_compile_escaped:N on line ...
-Defining \__regex_compile_one:x on line ...
+Defining \__regex_compile_one:n on line ...
 Defining \__regex_compile_abort_tokens:n on line ...
 Defining \__regex_compile_abort_tokens:x on line ...
 Defining \__regex_compile_quantifier:w on line ...
diff --git a/l3kernel/testfiles/m3expl001.ptex.tlg b/l3kernel/testfiles/m3expl001.ptex.tlg
index 1b8200e..f3dfb45 100644
--- a/l3kernel/testfiles/m3expl001.ptex.tlg
+++ b/l3kernel/testfiles/m3expl001.ptex.tlg
@@ -4840,7 +4840,7 @@ Defining \__regex_compile_end: on line ...
 Defining \__regex_compile:n on line ...
 Defining \__regex_compile_special:N on line ...
 Defining \__regex_compile_escaped:N on line ...
-Defining \__regex_compile_one:x on line ...
+Defining \__regex_compile_one:n on line ...
 Defining \__regex_compile_abort_tokens:n on line ...
 Defining \__regex_compile_abort_tokens:x on line ...
 Defining \__regex_compile_quantifier:w on line ...
diff --git a/l3kernel/testfiles/m3expl001.tlg b/l3kernel/testfiles/m3expl001.tlg
index 79aced7..26223e7 100644
--- a/l3kernel/testfiles/m3expl001.tlg
+++ b/l3kernel/testfiles/m3expl001.tlg
@@ -4840,7 +4840,7 @@ Defining \__regex_compile_end: on line ...
 Defining \__regex_compile:n on line ...
 Defining \__regex_compile_special:N on line ...
 Defining \__regex_compile_escaped:N on line ...
-Defining \__regex_compile_one:x on line ...
+Defining \__regex_compile_one:n on line ...
 Defining \__regex_compile_abort_tokens:n on line ...
 Defining \__regex_compile_abort_tokens:x on line ...
 Defining \__regex_compile_quantifier:w on line ...
diff --git a/l3kernel/testfiles/m3expl001.uptex.tlg b/l3kernel/testfiles/m3expl001.uptex.tlg
index 9fb73d3..a770167 100644
--- a/l3kernel/testfiles/m3expl001.uptex.tlg
+++ b/l3kernel/testfiles/m3expl001.uptex.tlg
@@ -4838,7 +4838,7 @@ Defining \__regex_compile_end: on line ...
 Defining \__regex_compile:n on line ...
 Defining \__regex_compile_special:N on line ...
 Defining \__regex_compile_escaped:N on line ...
-Defining \__regex_compile_one:x on line ...
+Defining \__regex_compile_one:n on line ...
 Defining \__regex_compile_abort_tokens:n on line ...
 Defining \__regex_compile_abort_tokens:x on line ...
 Defining \__regex_compile_quantifier:w on line ...
diff --git a/l3kernel/testfiles/m3expl001.xetex.tlg b/l3kernel/testfiles/m3expl001.xetex.tlg
index e75fc86..00afeee 100644
--- a/l3kernel/testfiles/m3expl001.xetex.tlg
+++ b/l3kernel/testfiles/m3expl001.xetex.tlg
@@ -4878,7 +4878,7 @@ Defining \__regex_compile_end: on line ...
 Defining \__regex_compile:n on line ...
 Defining \__regex_compile_special:N on line ...
 Defining \__regex_compile_escaped:N on line ...
-Defining \__regex_compile_one:x on line ...
+Defining \__regex_compile_one:n on line ...
 Defining \__regex_compile_abort_tokens:n on line ...
 Defining \__regex_compile_abort_tokens:x on line ...
 Defining \__regex_compile_quantifier:w on line ...
diff --git a/l3kernel/testfiles/m3expl003.luatex.tlg b/l3kernel/testfiles/m3expl003.luatex.tlg
index c54e6d7..6dd811b 100644
--- a/l3kernel/testfiles/m3expl003.luatex.tlg
+++ b/l3kernel/testfiles/m3expl003.luatex.tlg
@@ -4901,7 +4901,7 @@ Defining \__regex_compile_end: on line ...
 Defining \__regex_compile:n on line ...
 Defining \__regex_compile_special:N on line ...
 Defining \__regex_compile_escaped:N on line ...
-Defining \__regex_compile_one:x on line ...
+Defining \__regex_compile_one:n on line ...
 Defining \__regex_compile_abort_tokens:n on line ...
 Defining \__regex_compile_abort_tokens:x on line ...
 Defining \__regex_compile_quantifier:w on line ...
diff --git a/l3kernel/testfiles/m3expl003.ptex.tlg b/l3kernel/testfiles/m3expl003.ptex.tlg
index 1b8200e..f3dfb45 100644
--- a/l3kernel/testfiles/m3expl003.ptex.tlg
+++ b/l3kernel/testfiles/m3expl003.ptex.tlg
@@ -4840,7 +4840,7 @@ Defining \__regex_compile_end: on line ...
 Defining \__regex_compile:n on line ...
 Defining \__regex_compile_special:N on line ...
 Defining \__regex_compile_escaped:N on line ...
-Defining \__regex_compile_one:x on line ...
+Defining \__regex_compile_one:n on line ...
 Defining \__regex_compile_abort_tokens:n on line ...
 Defining \__regex_compile_abort_tokens:x on line ...
 Defining \__regex_compile_quantifier:w on line ...
diff --git a/l3kernel/testfiles/m3expl003.tlg b/l3kernel/testfiles/m3expl003.tlg
index 79aced7..26223e7 100644
--- a/l3kernel/testfiles/m3expl003.tlg
+++ b/l3kernel/testfiles/m3expl003.tlg
@@ -4840,7 +4840,7 @@ Defining \__regex_compile_end: on line ...
 Defining \__regex_compile:n on line ...
 Defining \__regex_compile_special:N on line ...
 Defining \__regex_compile_escaped:N on line ...
-Defining \__regex_compile_one:x on line ...
+Defining \__regex_compile_one:n on line ...
 Defining \__regex_compile_abort_tokens:n on line ...
 Defining \__regex_compile_abort_tokens:x on line ...
 Defining \__regex_compile_quantifier:w on line ...
diff --git a/l3kernel/testfiles/m3expl003.uptex.tlg b/l3kernel/testfiles/m3expl003.uptex.tlg
index 9fb73d3..a770167 100644
--- a/l3kernel/testfiles/m3expl003.uptex.tlg
+++ b/l3kernel/testfiles/m3expl003.uptex.tlg
@@ -4838,7 +4838,7 @@ Defining \__regex_compile_end: on line ...
 Defining \__regex_compile:n on line ...
 Defining \__regex_compile_special:N on line ...
 Defining \__regex_compile_escaped:N on line ...
-Defining \__regex_compile_one:x on line ...
+Defining \__regex_compile_one:n on line ...
 Defining \__regex_compile_abort_tokens:n on line ...
 Defining \__regex_compile_abort_tokens:x on line ...
 Defining \__regex_compile_quantifier:w on line ...
diff --git a/l3kernel/testfiles/m3expl003.xetex.tlg b/l3kernel/testfiles/m3expl003.xetex.tlg
index e75fc86..00afeee 100644
--- a/l3kernel/testfiles/m3expl003.xetex.tlg
+++ b/l3kernel/testfiles/m3expl003.xetex.tlg
@@ -4878,7 +4878,7 @@ Defining \__regex_compile_end: on line ...
 Defining \__regex_compile:n on line ...
 Defining \__regex_compile_special:N on line ...
 Defining \__regex_compile_escaped:N on line ...
-Defining \__regex_compile_one:x on line ...
+Defining \__regex_compile_one:n on line ...
 Defining \__regex_compile_abort_tokens:n on line ...
 Defining \__regex_compile_abort_tokens:x on line ...
 Defining \__regex_compile_quantifier:w on line ...

More information about the latex3-commits mailing list