[latex3-commits] [git/LaTeX3-latex3-latex3] peek-regex: Change signature of an auxiliary (160d52f6f)

[Bruno Le Floch]

Repository : https://github.com/latex3/latex3
On branch  : peek-regex
Link       : https://github.com/latex3/latex3/commit/160d52f6f7fc781364d9abd86485383cdd26e8b5

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

commit 160d52f6f7fc781364d9abd86485383cdd26e8b5
Author: Bruno Le Floch <bruno at le-floch.fr>
Date:   Sun Jul 12 18:58:56 2020 +0200

    Change signature of an auxiliary


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

160d52f6f7fc781364d9abd86485383cdd26e8b5
 l3kernel/l3regex.dtx | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/l3kernel/l3regex.dtx b/l3kernel/l3regex.dtx
index be81a8c66..26af4d292 100644
--- a/l3kernel/l3regex.dtx
+++ b/l3kernel/l3regex.dtx
@@ -3772,10 +3772,10 @@
 %     how they detect and avoid infinite loops. For now, we just need to
 %     know that the \texttt{group} variant must be used for transitions
 %     back to the start of a group.
-%   \item \cs{@@_action_submatch:n} \Arg{key} where the \meta{key} is
-%     a group number followed by |<| or |>| for the beginning or end of
-%     group. This causes the current position in the query to be stored
-%     as the \meta{key} submatch boundary.
+%   \item \cs{@@_action_submatch:nN} \Arg{group} \meta{key} where the
+%     \meta{key} is |<| or |>| for the beginning or end of group
+%     numbered \meta{group}.  This causes the current position in the
+%     query to be stored as the \meta{key} submatch boundary.
 % \end{itemize}
 %
 % We strive to preserve the following properties while building.
@@ -4195,8 +4195,8 @@
 \cs_new_protected:Npn \@@_group_submatches:nNN #1#2#3
   {
     \if_int_compare:w #1 > - 1 \exp_stop_f:
-      \@@_toks_put_left:Nx #2 { \@@_action_submatch:n { #1 < } }
-      \@@_toks_put_left:Nx #3 { \@@_action_submatch:n { #1 > } }
+      \@@_toks_put_left:Nx #2 { \@@_action_submatch:nN {#1} < }
+      \@@_toks_put_left:Nx #3 { \@@_action_submatch:nN {#1} > }
     \fi:
   }
 %    \end{macrocode}
@@ -4401,7 +4401,7 @@
     \@@_build_new_state:
     \@@_toks_put_right:Nx \l_@@_left_state_int
       {
-        \@@_action_submatch:n { 0< }
+        \@@_action_submatch:nN { 0 } <
         \bool_set_true:N \l_@@_fresh_thread_bool
         \@@_action_free:n
           {
@@ -5007,18 +5007,18 @@
 \cs_new_protected:Npn \@@_disable_submatches:
   {
     \cs_set_protected:Npn \@@_store_submatches: { }
-    \cs_set_protected:Npn \@@_action_submatch:n ##1 { }
+    \cs_set_protected:Npn \@@_action_submatch:nN ##1##2 { }
   }
 %    \end{macrocode}
 % \end{macro}
 %
-% \begin{macro}{\@@_action_submatch:n}
+% \begin{macro}{\@@_action_submatch:nN}
 %   Update the current submatches with the information from the current
 %   position. Maybe a bottleneck.
 %    \begin{macrocode}
-\cs_new_protected:Npn \@@_action_submatch:n #1
+\cs_new_protected:Npn \@@_action_submatch:nN #1#2
   {
-    \prop_put:Nno \l_@@_curr_submatches_prop {#1}
+    \prop_put:Nno \l_@@_curr_submatches_prop { #1 #2 }
       { \int_use:N \l_@@_curr_pos_int }
   }
 %    \end{macrocode}