[latex3-commits] [l3svn] r7385 - Clean up l3regex tracing code (still currently unusable)

noreply at latex-project.org noreply at latex-project.org
Mon Jul 17 03:42:23 CEST 2017


Author: bruno
Date: 2017-07-17 03:42:23 +0200 (Mon, 17 Jul 2017)
New Revision: 7385

Modified:
   trunk/l3kernel/l3regex.dtx
   trunk/l3kernel/testfiles/m3expl001.luatex.tlg
   trunk/l3kernel/testfiles/m3expl001.ptex.tlg
   trunk/l3kernel/testfiles/m3expl001.tlg
   trunk/l3kernel/testfiles/m3expl001.uptex.tlg
   trunk/l3kernel/testfiles/m3expl001.xetex.tlg
   trunk/l3kernel/testfiles/m3expl002.luatex.tlg
   trunk/l3kernel/testfiles/m3expl002.ptex.tlg
   trunk/l3kernel/testfiles/m3expl002.tlg
   trunk/l3kernel/testfiles/m3expl002.uptex.tlg
   trunk/l3kernel/testfiles/m3expl002.xetex.tlg
   trunk/l3kernel/testfiles/m3expl003.luatex.tlg
   trunk/l3kernel/testfiles/m3expl003.ptex.tlg
   trunk/l3kernel/testfiles/m3expl003.tlg
   trunk/l3kernel/testfiles/m3expl003.uptex.tlg
   trunk/l3kernel/testfiles/m3expl003.xetex.tlg
   trunk/l3kernel/testfiles/m3expl004.luatex.tlg
   trunk/l3kernel/testfiles/m3expl004.ptex.tlg
   trunk/l3kernel/testfiles/m3expl004.tlg
   trunk/l3kernel/testfiles/m3expl004.uptex.tlg
   trunk/l3kernel/testfiles/m3expl004.xetex.tlg
   trunk/l3kernel/testfiles/m3expl006.luatex.tlg
   trunk/l3kernel/testfiles/m3expl006.ptex.tlg
   trunk/l3kernel/testfiles/m3expl006.tlg
   trunk/l3kernel/testfiles/m3expl006.uptex.tlg
   trunk/l3kernel/testfiles/m3expl006.xetex.tlg
   trunk/l3kernel/testfiles/m3int001.luatex.tlg
   trunk/l3kernel/testfiles/m3int001.ptex.tlg
   trunk/l3kernel/testfiles/m3int001.tlg
   trunk/l3kernel/testfiles/m3int001.uptex.tlg
   trunk/l3kernel/testfiles/m3int001.xetex.tlg
   trunk/l3kernel/testfiles/m3int002.luatex.tlg
   trunk/l3kernel/testfiles/m3int002.ptex.tlg
   trunk/l3kernel/testfiles/m3int002.tlg
   trunk/l3kernel/testfiles/m3int002.uptex.tlg
   trunk/l3kernel/testfiles/m3int002.xetex.tlg
   trunk/l3kernel/testfiles/m3tl-analysis001.luatex.tlg
   trunk/l3kernel/testfiles/m3tl-analysis001.ptex.tlg
   trunk/l3kernel/testfiles/m3tl-analysis001.tlg
   trunk/l3kernel/testfiles/m3tl-analysis001.uptex.tlg
   trunk/l3kernel/testfiles/m3tl-analysis001.xetex.tlg
   trunk/l3trial/l3benchmark/testfiles/m3benchmark001.tlg
Log:
Clean up l3regex tracing code (still currently unusable)

The large number of test file changes is because the code defines
one more int variable.  The tracing code just needs an interface
to changing \g__debug_trace_regex_int from 0 to 1 or 2 (and back).


Modified: trunk/l3kernel/l3regex.dtx
===================================================================
--- trunk/l3kernel/l3regex.dtx	2017-07-17 00:38:38 UTC (rev 7384)
+++ trunk/l3kernel/l3regex.dtx	2017-07-17 01:42:23 UTC (rev 7385)
@@ -1441,9 +1441,16 @@
 %   \cs{__tl_build_one:o} by a single call to \cs{__tl_build_one:x}, because
 %   the \texttt{x}-expanding assignment may be interrupted by |\x|.
 %    \begin{macrocode}
+\__debug_patch:nnNNpn
+  {
+    \__debug_trace_push:nnN { regex } { 1 } \@@_escape_use:nnnn
+    \__tl_build:Nw \l_@@_internal_a_tl
+      \__tl_build_one:n { \__debug_trace_pop:nnN { regex } { 1 } \@@_escape_use:nnnn }
+      \use_none:nn
+  }
+  { }
 \cs_new_protected:Npn \@@_escape_use:nnnn #1#2#3#4
   {
-%<trace>    \trace_push:nnn { regex } { 1 } { @@_escape_use:nnnn }
     \__tl_build:Nw \l_@@_internal_a_tl
       \cs_set:Npn \@@_escape_unescaped:N ##1 { #1 }
       \cs_set:Npn \@@_escape_escaped:N ##1 { #2 }
@@ -1457,7 +1464,6 @@
         }
       \__tl_build_one:o \l_@@_internal_b_tl
     \__tl_build_end:
-%<trace>    \trace_pop:nnn { regex } { 1 } { @@_escape_use:nnnn }
     \l_@@_internal_a_tl
   }
 %    \end{macrocode}
@@ -3665,9 +3671,14 @@
     \@@_compile:n {#1}
     \@@_build:N \l_@@_internal_regex
   }
+\__debug_patch:nnNNpn
+  { \__debug_trace_push:nnN { regex } { 1 } \@@_build:N }
+  {
+    \@@_trace_states:n { 2 }
+    \__debug_trace_pop:nnN { regex } { 1 } \@@_build:N
+  }
 \cs_new_protected:Npn \@@_build:N #1
   {
-%<trace>    \trace_push:nnn { regex } { 1 } { @@_build }
     \@@_standard_escapechar:
     \int_zero:N \l_@@_capturing_group_int
     \int_set_eq:NN \l_@@_max_state_int \l_@@_min_state_int
@@ -3678,8 +3689,6 @@
     \@@_group:nnnN {#1} { 1 } { 0 } \c_false_bool
     \@@_toks_put_right:Nn \l_@@_right_state_int
       { \@@_action_success: }
-%<trace>    \@@_trace_states:n { 2 }
-%<trace>    \trace_pop:nnn { regex } { 1 } { @@_build }
   }
 %    \end{macrocode}
 % \end{macro}
@@ -3691,9 +3700,14 @@
 %   work properly at the outer level, we need to put the appropriate
 %   \texttt{left} and \texttt{right} states in their sequence.
 %    \begin{macrocode}
+\__debug_patch:nnNNpn
+  { \__debug_trace_push:nnN { regex } { 1 } \@@_build_for_cs:n }
+  {
+    \@@_trace_states:n { 2 }
+    \__debug_trace_pop:nnN { regex } { 1 } \@@_build_for_cs:n
+  }
 \cs_new_protected:Npn \@@_build_for_cs:n #1
   {
-%<trace>    \trace_push:nnn { regex } { 1 } { @@_build_for_cs }
     \int_set_eq:NN \l_@@_max_state_int \l_@@_min_state_int
     \@@_build_new_state:
     \@@_build_new_state:
@@ -3706,8 +3720,6 @@
           \exp_after:wN \@@_action_success:
         \fi:
       }
-%<trace>    \@@_trace_states:n { 2 }
-%<trace>    \trace_pop:nnn { regex } { 1 } { @@_build_for_cs }
   }
 %    \end{macrocode}
 % \end{macro}
@@ -3760,10 +3772,9 @@
 %   \texttt{right} state is the new empty state, and the \texttt{left}
 %   state points to the previously \enquote{current} state.
 %    \begin{macrocode}
-\cs_new_protected:Npn \@@_build_new_state:
+\__debug_patch:nnNNpn
   {
-%<*trace>
-    \trace:nnx { regex } { 2 }
+    \__debug_trace:nnx { regex } { 2 }
       {
         regex~new~state~
         L=\int_use:N \l_@@_left_state_int ~ -> ~
@@ -3771,7 +3782,10 @@
         M=\int_use:N \l_@@_max_state_int ~ -> ~
         \int_eval:n { \l_@@_max_state_int + 1 }
       }
-%</trace>
+  }
+  { }
+\cs_new_protected:Npn \@@_build_new_state:
+  {
     \@@_toks_clear:N \l_@@_max_state_int
     \int_set_eq:NN \l_@@_left_state_int \l_@@_right_state_int
     \int_set_eq:NN \l_@@_right_state_int \l_@@_max_state_int
@@ -3924,9 +3938,11 @@
 %   auxiliaries expects \texttt{left_state} and \texttt{right_state} to
 %   be set properly.
 %    \begin{macrocode}
+\__debug_patch:nnNNpn
+  { \__debug_trace_push:nnN { regex } { 1 } \@@_group_aux:nnnnN }
+  { \__debug_trace_pop:nnN { regex } { 1 } \@@_group_aux:nnnnN }
 \cs_new_protected:Npn \@@_group_aux:nnnnN #1#2#3#4#5
   {
-%<trace>        \trace_push:nnn { regex } { 1 } { @@_group }
       \if_int_compare:w #3 = 0 \exp_stop_f:
         \@@_build_new_state:
 %<assert>\assert_int:n { \l_@@_max_state_int = \l_@@_right_state_int + 1 }
@@ -3942,7 +3958,6 @@
       \or:   \@@_group_repeat:nnN  {#1} {#3}      #5
       \else: \@@_group_repeat:nnnN {#1} {#3} {#4} #5
       \fi:
-%<trace>       \trace_pop:nnn { regex } { 1 } { @@_group }
   }
 %    \end{macrocode}
 % \end{macro}
@@ -4006,9 +4021,11 @@
 %   the group. The left and right states of the group are extracted from
 %   the relevant sequences.
 %    \begin{macrocode}
+\__debug_patch:nnNNpn
+  { \__debug_trace_push:nnN { regex } { 1 } \@@_branch:n }
+  { \__debug_trace_pop:nnN { regex } { 1 } \@@_branch:n }
 \cs_new_protected:Npn \@@_branch:n #1
   {
-%<trace>    \trace_push:nnn { regex } { 1 } { @@_branch }
     \@@_build_new_state:
     \seq_get:NN \l_@@_left_state_seq \l_@@_internal_a_tl
     \int_set:Nn \l_@@_left_state_int \l_@@_internal_a_tl
@@ -4018,7 +4035,6 @@
     \seq_get:NN \l_@@_right_state_seq \l_@@_internal_a_tl
     \@@_build_transition_right:nNn \@@_action_free:n
       \l_@@_right_state_int \l_@@_internal_a_tl
-%<trace>    \trace_pop:nnn { regex } { 1 } { @@_branch }
   }
 %    \end{macrocode}
 % \end{macro}
@@ -4492,6 +4508,7 @@
 % \subsubsection{Matching: framework}
 %
 % \begin{macro}[int]{\@@_match:n}
+% \begin{macro}[aux]{\@@_match_init:}
 %   First store the query into \tn{toks} registers and arrays (see
 %   \cs{@@_query_set:nnn}). Then initialize the variables that should
 %   be set once for each user function (even for multiple
@@ -4502,10 +4519,14 @@
 %   smothering an empty match at the start). Once all this is set up, we
 %   are ready for the ride. Find the first match.
 %    \begin{macrocode}
+\__debug_patch:nnNNpn
+  {
+    \__debug_trace_push:nnN { regex } { 1 } \@@_match:n
+    \__debug_trace:nnx { regex } { 1 } { analyzing~query~token~list }
+  }
+  { \__debug_trace_pop:nnN { regex } { 1 } \@@_match:n }
 \cs_new_protected:Npn \@@_match:n #1
   {
-%<trace>    \trace_push:nnx { regex } { 1 } { @@_match }
-%<trace>    \trace:nnx { regex } { 1 } { analyzing~query~token~list }
     \int_zero:N \l_@@_balance_int
     \int_set:Nn \l_@@_curr_pos_int { 2 * \l_@@_max_state_int }
     \@@_query_set:nnn { } { -1 } { -2 }
@@ -4514,7 +4535,14 @@
       { \@@_query_set:nnn {##1} {"##2} {##3} }
     \int_set_eq:NN \l_@@_max_pos_int \l_@@_curr_pos_int
     \@@_query_set:nnn { } { -1 } { -2 }
-%<trace>    \trace:nnx { regex } { 1 } { initializing }
+    \@@_match_init:
+    \@@_match_once:
+  }
+\__debug_patch:nnNNpn
+  { \__debug_trace:nnx { regex } { 1 } { initializing } }
+  { }
+\cs_new_protected:Npn \@@_match_init:
+  {
     \bool_gset_false:N \g_@@_success_bool
     \int_step_inline:nnnn
       \l_@@_min_state_int { 1 } { \l_@@_max_state_int - 1 }
@@ -4526,11 +4554,10 @@
       { 2 * \l_@@_max_state_int }
     \int_set_eq:NN \l_@@_submatch_int \l_@@_min_submatch_int
     \bool_set_false:N \l_@@_empty_success_bool
-    \@@_match_once:
-%<trace>    \trace_pop:nnx { regex } { 1 } { @@_match }
   }
 %    \end{macrocode}
 % \end{macro}
+% \end{macro}
 %
 % \begin{macro}[int]{\@@_match_once:}
 %   This function finds one match, then does some action defined by the
@@ -4692,11 +4719,11 @@
 %   state is marked as $\texttt{step}+1$: any thread hitting it at that
 %   point will be terminated.
 %    \begin{macrocode}
+\__debug_patch:nnNNpn
+  { \__debug_trace:nnx { regex } { 2 } { state~\int_use:N \l_@@_curr_state_int } }
+  { }
 \cs_new_protected:Npn \@@_use_state:
   {
-%<*trace>
-    \trace:nnx { regex } { 2 } { state~\int_use:N \l_@@_curr_state_int }
-%</trace>
     \__intarray_gset_fast:Nnn \g_@@_state_active_intarray
       { \l_@@_curr_state_int } { \l_@@_step_int }
     \@@_toks_use:w \l_@@_curr_state_int
@@ -5056,9 +5083,11 @@
 %   parsed, make sure that there is no open csname. Finally, define the
 %   \texttt{balance_one_match} and \texttt{do_one_match} functions.
 %    \begin{macrocode}
+\__debug_patch:nnNNpn
+  { \__debug_trace_push:nnN { regex } { 1 } \@@_replacement:n }
+  { \__debug_trace_pop:nnN { regex } { 1 } \@@_replacement:n }
 \cs_new_protected:Npn \@@_replacement:n #1
   {
-%<trace>    \trace_push:nnn { regex } { 1 } { @@_replacement:n }
     \__tl_build:Nw \l_@@_internal_a_tl
       \int_zero:N \l_@@_balance_int
       \tl_clear:N \l_@@_balance_tl
@@ -5095,7 +5124,6 @@
         }
     \__tl_build_end:
     \exp_args:No \@@_replacement_aux:n \l_@@_internal_a_tl
-%<trace>    \trace_pop:nnn { regex } { 1 } { @@_replacement:n }
   }
 \cs_new_protected:Npn \@@_replacement_aux:n #1
   {
@@ -6435,27 +6463,60 @@
 %
 % \subsection{Code for tracing}
 %
-% The tracing code is still very experimental, and is meant to be used
-% with the \pkg{l3trace} package, currently in \texttt{l3trial}.
+% There is a more extensive implementation of tracing in the l3trial
+% package \pkg{l3trace}.  Function names are a bit different but could
+% be merged.
 %
+% \begin{macro}[int]
+%   {\__debug_trace_push:nnN, \__debug_trace_pop:nnN, \__debug_trace:nnx}
+%   Here |#1| is the module name (\texttt{regex}) and |#2| is
+%   typically~1.  If the module's current tracing level is less than
+%   |#2| show nothing, otherwise write |#3| to the terminal.
+%    \begin{macrocode}
+\__debug:TF
+  {
+    \cs_new_protected:Npn \__debug_trace_push:nnN #1#2#3
+      { \__debug_trace:nnx {#1} {#2} { entering~ \token_to_str:N #3 } }
+    \cs_new_protected:Npn \__debug_trace_pop:nnN #1#2#3
+      { \__debug_trace:nnx {#1} {#2} { leaving~ \token_to_str:N #3 } }
+    \cs_new_protected:Npn \__debug_trace:nnx #1#2#3
+      {
+        \int_compare:nNnF
+          { \int_use:c { g__debug_trace_#1_int } } < {#2}
+          { \iow_term:x { Trace:~#3 } }
+      }
+  }
+  { }
+%    \end{macrocode}
+% \end{macro}
+%
+% \begin{variable}{\g__debug_trace_regex_int}
+%   No tracing when that is zero.
+%    \begin{macrocode}
+\int_new:N \g__debug_trace_regex_int
+%    \end{macrocode}
+% \end{variable}
+%
 % \begin{macro}[int]{\@@_trace_states:n}
 %   This function lists the contents of all states of the \textsc{nfa},
 %   stored in \tn{toks} from $0$ to \cs{l_@@_max_state_int}
 %   (excluded).
 %    \begin{macrocode}
-%<*trace>
-\cs_new_protected:Npn \@@_trace_states:n #1
+\__debug:TF
   {
-    \int_step_inline:nnnn
-      \l_@@_min_state_int
-      { 1 }
-      { \l_@@_max_state_int - 1 }
+    \cs_new_protected:Npn \@@_trace_states:n #1
       {
-        \trace:nnx { regex } { #1 }
-          { \iow_char:N \\toks ##1 = { \@@_toks_use:w ##1 } }
+        \int_step_inline:nnnn
+          \l_@@_min_state_int
+          { 1 }
+          { \l_@@_max_state_int - 1 }
+          {
+            \__debug_trace:nnx { regex } {#1}
+              { \iow_char:N \\toks ##1 = { \@@_toks_use:w ##1 } }
+          }
       }
   }
-%</trace>
+  { }
 %    \end{macrocode}
 % \end{macro}
 %

Modified: trunk/l3kernel/testfiles/m3expl001.luatex.tlg
===================================================================
--- trunk/l3kernel/testfiles/m3expl001.luatex.tlg	2017-07-17 00:38:38 UTC (rev 7384)
+++ trunk/l3kernel/testfiles/m3expl001.luatex.tlg	2017-07-17 01:42:23 UTC (rev 7385)
@@ -4782,6 +4782,7 @@
 Defining \l__regex_saved_success_bool on line ...
 Defining \l__regex_match_success_bool on line ...
 Defining \__regex_match:n on line ...
+Defining \__regex_match_init: on line ...
 Defining \__regex_match_once: on line ...
 Defining \__regex_single_match: on line ...
 Defining \__regex_multi_match:n on line ...
@@ -4955,6 +4956,12 @@
 Defining message LaTeX/kernel/replacement-missing-rbrace on line ...
 Defining message LaTeX/kernel/replacement-missing-rparen on line ...
 Defining \__regex_msg_repeated:nnN on line ...
+Defining \__debug_trace_push:nnN on line ...
+Defining \__debug_trace_pop:nnN on line ...
+Defining \__debug_trace:nnx on line ...
+Defining \g__debug_trace_regex_int on line ...
+\g__debug_trace_regex_int=\count192
+Defining \__regex_trace_states:n on line ...
 Defining \box_new:N on line ...
 Defining \box_new:c on line ...
 Defining \box_clear:N on line ...
@@ -5691,7 +5698,7 @@
 Defining \c__expl_def_ext_tl on line ...
  (l3pdfmode.def
 Defining \l__driver_color_stack_int on line ...
-\l__driver_color_stack_int=\count192
+\l__driver_color_stack_int=\count193
 Defining \__driver_color_ensure_current: on line ...
 Defining \__driver_color_convert:w on line ...
 Defining \__driver_color_convert_gray:w on line ...

Modified: trunk/l3kernel/testfiles/m3expl001.ptex.tlg
===================================================================
--- trunk/l3kernel/testfiles/m3expl001.ptex.tlg	2017-07-17 00:38:38 UTC (rev 7384)
+++ trunk/l3kernel/testfiles/m3expl001.ptex.tlg	2017-07-17 01:42:23 UTC (rev 7385)
@@ -4772,6 +4772,7 @@
 Defining \l__regex_saved_success_bool on line ...
 Defining \l__regex_match_success_bool on line ...
 Defining \__regex_match:n on line ...
+Defining \__regex_match_init: on line ...
 Defining \__regex_match_once: on line ...
 Defining \__regex_single_match: on line ...
 Defining \__regex_multi_match:n on line ...
@@ -4945,6 +4946,12 @@
 Defining message LaTeX/kernel/replacement-missing-rbrace on line ...
 Defining message LaTeX/kernel/replacement-missing-rparen on line ...
 Defining \__regex_msg_repeated:nnN on line ...
+Defining \__debug_trace_push:nnN on line ...
+Defining \__debug_trace_pop:nnN on line ...
+Defining \__debug_trace:nnx on line ...
+Defining \g__debug_trace_regex_int on line ...
+\g__debug_trace_regex_int=\count192
+Defining \__regex_trace_states:n on line ...
 Defining \box_new:N on line ...
 Defining \box_new:c on line ...
 Defining \box_clear:N on line ...
@@ -5694,7 +5701,7 @@
 Defining \__driver_image_getbb_png:n on line ...
 Defining \__driver_image_getbb_pdf:n on line ...
 Defining \g__driver_image_int on line ...
-\g__driver_image_int=\count192
+\g__driver_image_int=\count193
 Defining \__driver_image_include_eps:n on line ...
 Defining \__driver_image_include_jpg:n on line ...
 Defining \__driver_image_include_png:n on line ...

Modified: trunk/l3kernel/testfiles/m3expl001.tlg
===================================================================
--- trunk/l3kernel/testfiles/m3expl001.tlg	2017-07-17 00:38:38 UTC (rev 7384)
+++ trunk/l3kernel/testfiles/m3expl001.tlg	2017-07-17 01:42:23 UTC (rev 7385)
@@ -4772,6 +4772,7 @@
 Defining \l__regex_saved_success_bool on line ...
 Defining \l__regex_match_success_bool on line ...
 Defining \__regex_match:n on line ...
+Defining \__regex_match_init: on line ...
 Defining \__regex_match_once: on line ...
 Defining \__regex_single_match: on line ...
 Defining \__regex_multi_match:n on line ...
@@ -4945,6 +4946,12 @@
 Defining message LaTeX/kernel/replacement-missing-rbrace on line ...
 Defining message LaTeX/kernel/replacement-missing-rparen on line ...
 Defining \__regex_msg_repeated:nnN on line ...
+Defining \__debug_trace_push:nnN on line ...
+Defining \__debug_trace_pop:nnN on line ...
+Defining \__debug_trace:nnx on line ...
+Defining \g__debug_trace_regex_int on line ...
+\g__debug_trace_regex_int=\count194
+Defining \__regex_trace_states:n on line ...
 Defining \box_new:N on line ...
 Defining \box_new:c on line ...
 Defining \box_clear:N on line ...
@@ -5883,7 +5890,7 @@
 Defining \c__expl_def_ext_tl on line ...
  (l3pdfmode.def
 Defining \l__driver_color_stack_int on line ...
-\l__driver_color_stack_int=\count194
+\l__driver_color_stack_int=\count195
 Defining \__driver_color_ensure_current: on line ...
 Defining \__driver_color_convert:w on line ...
 Defining \__driver_color_convert_gray:w on line ...

Modified: trunk/l3kernel/testfiles/m3expl001.uptex.tlg
===================================================================
--- trunk/l3kernel/testfiles/m3expl001.uptex.tlg	2017-07-17 00:38:38 UTC (rev 7384)
+++ trunk/l3kernel/testfiles/m3expl001.uptex.tlg	2017-07-17 01:42:23 UTC (rev 7385)
@@ -4770,6 +4770,7 @@
 Defining \l__regex_saved_success_bool on line ...
 Defining \l__regex_match_success_bool on line ...
 Defining \__regex_match:n on line ...
+Defining \__regex_match_init: on line ...
 Defining \__regex_match_once: on line ...
 Defining \__regex_single_match: on line ...
 Defining \__regex_multi_match:n on line ...
@@ -4943,6 +4944,12 @@
 Defining message LaTeX/kernel/replacement-missing-rbrace on line ...
 Defining message LaTeX/kernel/replacement-missing-rparen on line ...
 Defining \__regex_msg_repeated:nnN on line ...
+Defining \__debug_trace_push:nnN on line ...
+Defining \__debug_trace_pop:nnN on line ...
+Defining \__debug_trace:nnx on line ...
+Defining \g__debug_trace_regex_int on line ...
+\g__debug_trace_regex_int=\count190
+Defining \__regex_trace_states:n on line ...
 Defining \box_new:N on line ...
 Defining \box_new:c on line ...
 Defining \box_clear:N on line ...
@@ -5893,7 +5900,7 @@
 Defining \__driver_image_getbb_png:n on line ...
 Defining \__driver_image_getbb_pdf:n on line ...
 Defining \g__driver_image_int on line ...
-\g__driver_image_int=\count190
+\g__driver_image_int=\count191
 Defining \__driver_image_include_eps:n on line ...
 Defining \__driver_image_include_jpg:n on line ...
 Defining \__driver_image_include_png:n on line ...

Modified: trunk/l3kernel/testfiles/m3expl001.xetex.tlg
===================================================================
--- trunk/l3kernel/testfiles/m3expl001.xetex.tlg	2017-07-17 00:38:38 UTC (rev 7384)
+++ trunk/l3kernel/testfiles/m3expl001.xetex.tlg	2017-07-17 01:42:23 UTC (rev 7385)
@@ -4760,6 +4760,7 @@
 Defining \l__regex_saved_success_bool on line ...
 Defining \l__regex_match_success_bool on line ...
 Defining \__regex_match:n on line ...
+Defining \__regex_match_init: on line ...
 Defining \__regex_match_once: on line ...
 Defining \__regex_single_match: on line ...
 Defining \__regex_multi_match:n on line ...
@@ -4933,6 +4934,12 @@
 Defining message LaTeX/kernel/replacement-missing-rbrace on line ...
 Defining message LaTeX/kernel/replacement-missing-rparen on line ...
 Defining \__regex_msg_repeated:nnN on line ...
+Defining \__debug_trace_push:nnN on line ...
+Defining \__debug_trace_pop:nnN on line ...
+Defining \__debug_trace:nnx on line ...
+Defining \g__debug_trace_regex_int on line ...
+\g__debug_trace_regex_int=\count189
+Defining \__regex_trace_states:n on line ...
 Defining \box_new:N on line ...
 Defining \box_new:c on line ...
 Defining \box_clear:N on line ...
@@ -5674,7 +5681,7 @@
 Defining \__driver_box_use_scale:Nnn on line ...
 Defining \__driver_image_getbb_eps:n on line ...
 Defining \g__driver_image_int on line ...
-\g__driver_image_int=\count189
+\g__driver_image_int=\count190
 Defining \__driver_image_include_eps:n on line ...
 Defining \__driver_image_include_jpg:n on line ...
 Defining \__driver_image_include_png:n on line ...

Modified: trunk/l3kernel/testfiles/m3expl002.luatex.tlg
===================================================================
--- trunk/l3kernel/testfiles/m3expl002.luatex.tlg	2017-07-17 00:38:38 UTC (rev 7384)
+++ trunk/l3kernel/testfiles/m3expl002.luatex.tlg	2017-07-17 01:42:23 UTC (rev 7385)
@@ -101,6 +101,7 @@
 \l__regex_min_submatch_int=\count189
 \l__regex_submatch_int=\count190
 \l__regex_zeroth_submatch_int=\count191
+\g__debug_trace_regex_int=\count192
 \c_empty_box=\box56
 \l_tmpa_box=\box57
 \l_tmpb_box=\box58
@@ -142,6 +143,6 @@
 \l__coffin_scaled_total_height_dim=\dimen161
 \l__coffin_scaled_width_dim=\dimen162
 ) (l3pdfmode.def
-\l__driver_color_stack_int=\count192
+\l__driver_color_stack_int=\count193
 \l__driver_tmp_box=\box71
 ))

Modified: trunk/l3kernel/testfiles/m3expl002.ptex.tlg
===================================================================
--- trunk/l3kernel/testfiles/m3expl002.ptex.tlg	2017-07-17 00:38:38 UTC (rev 7384)
+++ trunk/l3kernel/testfiles/m3expl002.ptex.tlg	2017-07-17 01:42:23 UTC (rev 7385)
@@ -102,6 +102,7 @@
 \l__regex_min_submatch_int=\count189
 \l__regex_submatch_int=\count190
 \l__regex_zeroth_submatch_int=\count191
+\g__debug_trace_regex_int=\count192
 \c_empty_box=\box56
 \l_tmpa_box=\box57
 \l_tmpb_box=\box58
@@ -143,6 +144,6 @@
 \l__coffin_scaled_total_height_dim=\dimen161
 \l__coffin_scaled_width_dim=\dimen162
 ) (l3dvipdfmx.def
-\g__driver_image_int=\count192
+\g__driver_image_int=\count193
 \l__driver_tmp_box=\box71
 ))

Modified: trunk/l3kernel/testfiles/m3expl002.tlg
===================================================================
--- trunk/l3kernel/testfiles/m3expl002.tlg	2017-07-17 00:38:38 UTC (rev 7384)
+++ trunk/l3kernel/testfiles/m3expl002.tlg	2017-07-17 01:42:23 UTC (rev 7385)
@@ -102,6 +102,7 @@
 \l__regex_min_submatch_int=\count191
 \l__regex_submatch_int=\count192
 \l__regex_zeroth_submatch_int=\count193
+\g__debug_trace_regex_int=\count194
 \c_empty_box=\box56
 \l_tmpa_box=\box57
 \l_tmpb_box=\box58
@@ -143,6 +144,6 @@
 \l__coffin_scaled_total_height_dim=\dimen161
 \l__coffin_scaled_width_dim=\dimen162
 ) (l3pdfmode.def
-\l__driver_color_stack_int=\count194
+\l__driver_color_stack_int=\count195
 \l__driver_tmp_box=\box71
 ))

Modified: trunk/l3kernel/testfiles/m3expl002.uptex.tlg
===================================================================
--- trunk/l3kernel/testfiles/m3expl002.uptex.tlg	2017-07-17 00:38:38 UTC (rev 7384)
+++ trunk/l3kernel/testfiles/m3expl002.uptex.tlg	2017-07-17 01:42:23 UTC (rev 7385)
@@ -100,6 +100,7 @@
 \l__regex_min_submatch_int=\count187
 \l__regex_submatch_int=\count188
 \l__regex_zeroth_submatch_int=\count189
+\g__debug_trace_regex_int=\count190
 \c_empty_box=\box56
 \l_tmpa_box=\box57
 \l_tmpb_box=\box58
@@ -141,6 +142,6 @@
 \l__coffin_scaled_total_height_dim=\dimen161
 \l__coffin_scaled_width_dim=\dimen162
 ) (l3dvipdfmx.def
-\g__driver_image_int=\count190
+\g__driver_image_int=\count191
 \l__driver_tmp_box=\box71
 ))

Modified: trunk/l3kernel/testfiles/m3expl002.xetex.tlg
===================================================================
--- trunk/l3kernel/testfiles/m3expl002.xetex.tlg	2017-07-17 00:38:38 UTC (rev 7384)
+++ trunk/l3kernel/testfiles/m3expl002.xetex.tlg	2017-07-17 01:42:23 UTC (rev 7385)
@@ -97,6 +97,7 @@
 \l__regex_min_submatch_int=\count186
 \l__regex_submatch_int=\count187
 \l__regex_zeroth_submatch_int=\count188
+\g__debug_trace_regex_int=\count189
 \c_empty_box=\box56
 \l_tmpa_box=\box57
 \l_tmpb_box=\box58
@@ -138,6 +139,6 @@
 \l__coffin_scaled_total_height_dim=\dimen161
 \l__coffin_scaled_width_dim=\dimen162
 ) (l3xdvipdfmx.def
-\g__driver_image_int=\count189
+\g__driver_image_int=\count190
 \l__driver_tmp_box=\box71
 ))

Modified: trunk/l3kernel/testfiles/m3expl003.luatex.tlg
===================================================================
--- trunk/l3kernel/testfiles/m3expl003.luatex.tlg	2017-07-17 00:38:38 UTC (rev 7384)
+++ trunk/l3kernel/testfiles/m3expl003.luatex.tlg	2017-07-17 01:42:23 UTC (rev 7385)
@@ -4782,6 +4782,7 @@
 Defining \l__regex_saved_success_bool on line ...
 Defining \l__regex_match_success_bool on line ...
 Defining \__regex_match:n on line ...
+Defining \__regex_match_init: on line ...
 Defining \__regex_match_once: on line ...
 Defining \__regex_single_match: on line ...
 Defining \__regex_multi_match:n on line ...
@@ -4955,6 +4956,12 @@
 Defining message LaTeX/kernel/replacement-missing-rbrace on line ...
 Defining message LaTeX/kernel/replacement-missing-rparen on line ...
 Defining \__regex_msg_repeated:nnN on line ...
+Defining \__debug_trace_push:nnN on line ...
+Defining \__debug_trace_pop:nnN on line ...
+Defining \__debug_trace:nnx on line ...
+Defining \g__debug_trace_regex_int on line ...
+\g__debug_trace_regex_int=\count192
+Defining \__regex_trace_states:n on line ...
 Defining \box_new:N on line ...
 Defining \box_new:c on line ...
 Defining \box_clear:N on line ...
@@ -5691,7 +5698,7 @@
 Defining \c__expl_def_ext_tl on line ...
  (l3pdfmode.def
 Defining \l__driver_color_stack_int on line ...
-\l__driver_color_stack_int=\count192
+\l__driver_color_stack_int=\count193
 Defining \__driver_color_ensure_current: on line ...
 Defining \__driver_color_convert:w on line ...
 Defining \__driver_color_convert_gray:w on line ...

Modified: trunk/l3kernel/testfiles/m3expl003.ptex.tlg
===================================================================
--- trunk/l3kernel/testfiles/m3expl003.ptex.tlg	2017-07-17 00:38:38 UTC (rev 7384)
+++ trunk/l3kernel/testfiles/m3expl003.ptex.tlg	2017-07-17 01:42:23 UTC (rev 7385)
@@ -4772,6 +4772,7 @@
 Defining \l__regex_saved_success_bool on line ...
 Defining \l__regex_match_success_bool on line ...
 Defining \__regex_match:n on line ...
+Defining \__regex_match_init: on line ...
 Defining \__regex_match_once: on line ...
 Defining \__regex_single_match: on line ...
 Defining \__regex_multi_match:n on line ...
@@ -4945,6 +4946,12 @@
 Defining message LaTeX/kernel/replacement-missing-rbrace on line ...
 Defining message LaTeX/kernel/replacement-missing-rparen on line ...
 Defining \__regex_msg_repeated:nnN on line ...
+Defining \__debug_trace_push:nnN on line ...
+Defining \__debug_trace_pop:nnN on line ...
+Defining \__debug_trace:nnx on line ...
+Defining \g__debug_trace_regex_int on line ...
+\g__debug_trace_regex_int=\count192
+Defining \__regex_trace_states:n on line ...
 Defining \box_new:N on line ...
 Defining \box_new:c on line ...
 Defining \box_clear:N on line ...
@@ -5694,7 +5701,7 @@
 Defining \__driver_image_getbb_png:n on line ...
 Defining \__driver_image_getbb_pdf:n on line ...
 Defining \g__driver_image_int on line ...
-\g__driver_image_int=\count192
+\g__driver_image_int=\count193
 Defining \__driver_image_include_eps:n on line ...
 Defining \__driver_image_include_jpg:n on line ...
 Defining \__driver_image_include_png:n on line ...

Modified: trunk/l3kernel/testfiles/m3expl003.tlg
===================================================================
--- trunk/l3kernel/testfiles/m3expl003.tlg	2017-07-17 00:38:38 UTC (rev 7384)
+++ trunk/l3kernel/testfiles/m3expl003.tlg	2017-07-17 01:42:23 UTC (rev 7385)
@@ -4772,6 +4772,7 @@
 Defining \l__regex_saved_success_bool on line ...
 Defining \l__regex_match_success_bool on line ...
 Defining \__regex_match:n on line ...
+Defining \__regex_match_init: on line ...
 Defining \__regex_match_once: on line ...
 Defining \__regex_single_match: on line ...
 Defining \__regex_multi_match:n on line ...
@@ -4945,6 +4946,12 @@
 Defining message LaTeX/kernel/replacement-missing-rbrace on line ...
 Defining message LaTeX/kernel/replacement-missing-rparen on line ...
 Defining \__regex_msg_repeated:nnN on line ...
+Defining \__debug_trace_push:nnN on line ...
+Defining \__debug_trace_pop:nnN on line ...
+Defining \__debug_trace:nnx on line ...
+Defining \g__debug_trace_regex_int on line ...
+\g__debug_trace_regex_int=\count194
+Defining \__regex_trace_states:n on line ...
 Defining \box_new:N on line ...
 Defining \box_new:c on line ...
 Defining \box_clear:N on line ...
@@ -5883,7 +5890,7 @@
 Defining \c__expl_def_ext_tl on line ...
  (l3pdfmode.def
 Defining \l__driver_color_stack_int on line ...
-\l__driver_color_stack_int=\count194
+\l__driver_color_stack_int=\count195
 Defining \__driver_color_ensure_current: on line ...
 Defining \__driver_color_convert:w on line ...
 Defining \__driver_color_convert_gray:w on line ...

Modified: trunk/l3kernel/testfiles/m3expl003.uptex.tlg
===================================================================
--- trunk/l3kernel/testfiles/m3expl003.uptex.tlg	2017-07-17 00:38:38 UTC (rev 7384)
+++ trunk/l3kernel/testfiles/m3expl003.uptex.tlg	2017-07-17 01:42:23 UTC (rev 7385)
@@ -4770,6 +4770,7 @@
 Defining \l__regex_saved_success_bool on line ...
 Defining \l__regex_match_success_bool on line ...
 Defining \__regex_match:n on line ...
+Defining \__regex_match_init: on line ...
 Defining \__regex_match_once: on line ...
 Defining \__regex_single_match: on line ...
 Defining \__regex_multi_match:n on line ...
@@ -4943,6 +4944,12 @@
 Defining message LaTeX/kernel/replacement-missing-rbrace on line ...
 Defining message LaTeX/kernel/replacement-missing-rparen on line ...
 Defining \__regex_msg_repeated:nnN on line ...
+Defining \__debug_trace_push:nnN on line ...
+Defining \__debug_trace_pop:nnN on line ...
+Defining \__debug_trace:nnx on line ...
+Defining \g__debug_trace_regex_int on line ...
+\g__debug_trace_regex_int=\count190
+Defining \__regex_trace_states:n on line ...
 Defining \box_new:N on line ...
 Defining \box_new:c on line ...
 Defining \box_clear:N on line ...
@@ -5893,7 +5900,7 @@
 Defining \__driver_image_getbb_png:n on line ...
 Defining \__driver_image_getbb_pdf:n on line ...
 Defining \g__driver_image_int on line ...
-\g__driver_image_int=\count190
+\g__driver_image_int=\count191
 Defining \__driver_image_include_eps:n on line ...
 Defining \__driver_image_include_jpg:n on line ...
 Defining \__driver_image_include_png:n on line ...

Modified: trunk/l3kernel/testfiles/m3expl003.xetex.tlg
===================================================================
--- trunk/l3kernel/testfiles/m3expl003.xetex.tlg	2017-07-17 00:38:38 UTC (rev 7384)
+++ trunk/l3kernel/testfiles/m3expl003.xetex.tlg	2017-07-17 01:42:23 UTC (rev 7385)
@@ -4760,6 +4760,7 @@
 Defining \l__regex_saved_success_bool on line ...
 Defining \l__regex_match_success_bool on line ...
 Defining \__regex_match:n on line ...
+Defining \__regex_match_init: on line ...
 Defining \__regex_match_once: on line ...
 Defining \__regex_single_match: on line ...
 Defining \__regex_multi_match:n on line ...
@@ -4933,6 +4934,12 @@
 Defining message LaTeX/kernel/replacement-missing-rbrace on line ...
 Defining message LaTeX/kernel/replacement-missing-rparen on line ...
 Defining \__regex_msg_repeated:nnN on line ...
+Defining \__debug_trace_push:nnN on line ...
+Defining \__debug_trace_pop:nnN on line ...
+Defining \__debug_trace:nnx on line ...
+Defining \g__debug_trace_regex_int on line ...
+\g__debug_trace_regex_int=\count189
+Defining \__regex_trace_states:n on line ...
 Defining \box_new:N on line ...
 Defining \box_new:c on line ...
 Defining \box_clear:N on line ...
@@ -5674,7 +5681,7 @@
 Defining \__driver_box_use_scale:Nnn on line ...
 Defining \__driver_image_getbb_eps:n on line ...
 Defining \g__driver_image_int on line ...
-\g__driver_image_int=\count189
+\g__driver_image_int=\count190
 Defining \__driver_image_include_eps:n on line ...
 Defining \__driver_image_include_jpg:n on line ...
 Defining \__driver_image_include_png:n on line ...

Modified: trunk/l3kernel/testfiles/m3expl004.luatex.tlg
===================================================================
--- trunk/l3kernel/testfiles/m3expl004.luatex.tlg	2017-07-17 00:38:38 UTC (rev 7384)
+++ trunk/l3kernel/testfiles/m3expl004.luatex.tlg	2017-07-17 01:42:23 UTC (rev 7385)
@@ -101,6 +101,7 @@
 \l__regex_min_submatch_int=\count189
 \l__regex_submatch_int=\count190
 \l__regex_zeroth_submatch_int=\count191
+\g__debug_trace_regex_int=\count192
 \c_empty_box=\box56
 \l_tmpa_box=\box57
 \l_tmpb_box=\box58
@@ -142,6 +143,6 @@
 \l__coffin_scaled_total_height_dim=\dimen161
 \l__coffin_scaled_width_dim=\dimen162
 ) (l3pdfmode.def
-\l__driver_color_stack_int=\count192
+\l__driver_color_stack_int=\count193
 \l__driver_tmp_box=\box71
 ))

Modified: trunk/l3kernel/testfiles/m3expl004.ptex.tlg
===================================================================
--- trunk/l3kernel/testfiles/m3expl004.ptex.tlg	2017-07-17 00:38:38 UTC (rev 7384)
+++ trunk/l3kernel/testfiles/m3expl004.ptex.tlg	2017-07-17 01:42:23 UTC (rev 7385)
@@ -102,6 +102,7 @@
 \l__regex_min_submatch_int=\count189
 \l__regex_submatch_int=\count190
 \l__regex_zeroth_submatch_int=\count191
+\g__debug_trace_regex_int=\count192
 \c_empty_box=\box56
 \l_tmpa_box=\box57
 \l_tmpb_box=\box58
@@ -143,6 +144,6 @@
 \l__coffin_scaled_total_height_dim=\dimen161
 \l__coffin_scaled_width_dim=\dimen162
 ) (l3dvipdfmx.def
-\g__driver_image_int=\count192
+\g__driver_image_int=\count193
 \l__driver_tmp_box=\box71
 ))

Modified: trunk/l3kernel/testfiles/m3expl004.tlg
===================================================================
--- trunk/l3kernel/testfiles/m3expl004.tlg	2017-07-17 00:38:38 UTC (rev 7384)
+++ trunk/l3kernel/testfiles/m3expl004.tlg	2017-07-17 01:42:23 UTC (rev 7385)
@@ -102,6 +102,7 @@
 \l__regex_min_submatch_int=\count191
 \l__regex_submatch_int=\count192
 \l__regex_zeroth_submatch_int=\count193
+\g__debug_trace_regex_int=\count194
 \c_empty_box=\box56
 \l_tmpa_box=\box57
 \l_tmpb_box=\box58
@@ -143,6 +144,6 @@
 \l__coffin_scaled_total_height_dim=\dimen161
 \l__coffin_scaled_width_dim=\dimen162
 ) (l3pdfmode.def
-\l__driver_color_stack_int=\count194
+\l__driver_color_stack_int=\count195
 \l__driver_tmp_box=\box71
 ))

Modified: trunk/l3kernel/testfiles/m3expl004.uptex.tlg
===================================================================
--- trunk/l3kernel/testfiles/m3expl004.uptex.tlg	2017-07-17 00:38:38 UTC (rev 7384)
+++ trunk/l3kernel/testfiles/m3expl004.uptex.tlg	2017-07-17 01:42:23 UTC (rev 7385)
@@ -100,6 +100,7 @@
 \l__regex_min_submatch_int=\count187
 \l__regex_submatch_int=\count188
 \l__regex_zeroth_submatch_int=\count189
+\g__debug_trace_regex_int=\count190
 \c_empty_box=\box56
 \l_tmpa_box=\box57
 \l_tmpb_box=\box58
@@ -141,6 +142,6 @@
 \l__coffin_scaled_total_height_dim=\dimen161
 \l__coffin_scaled_width_dim=\dimen162
 ) (l3dvipdfmx.def
-\g__driver_image_int=\count190
+\g__driver_image_int=\count191
 \l__driver_tmp_box=\box71
 ))

Modified: trunk/l3kernel/testfiles/m3expl004.xetex.tlg
===================================================================
--- trunk/l3kernel/testfiles/m3expl004.xetex.tlg	2017-07-17 00:38:38 UTC (rev 7384)
+++ trunk/l3kernel/testfiles/m3expl004.xetex.tlg	2017-07-17 01:42:23 UTC (rev 7385)
@@ -97,6 +97,7 @@
 \l__regex_min_submatch_int=\count186
 \l__regex_submatch_int=\count187
 \l__regex_zeroth_submatch_int=\count188
+\g__debug_trace_regex_int=\count189
 \c_empty_box=\box56
 \l_tmpa_box=\box57
 \l_tmpb_box=\box58
@@ -138,6 +139,6 @@
 \l__coffin_scaled_total_height_dim=\dimen161
 \l__coffin_scaled_width_dim=\dimen162
 ) (l3xdvipdfmx.def
-\g__driver_image_int=\count189
+\g__driver_image_int=\count190
 \l__driver_tmp_box=\box71
 ))

Modified: trunk/l3kernel/testfiles/m3expl006.luatex.tlg
===================================================================
--- trunk/l3kernel/testfiles/m3expl006.luatex.tlg	2017-07-17 00:38:38 UTC (rev 7384)
+++ trunk/l3kernel/testfiles/m3expl006.luatex.tlg	2017-07-17 01:42:23 UTC (rev 7385)
@@ -102,6 +102,7 @@
 \l__regex_min_submatch_int=\count189
 \l__regex_submatch_int=\count190
 \l__regex_zeroth_submatch_int=\count191
+\g__debug_trace_regex_int=\count192
 \c_empty_box=\box56
 \l_tmpa_box=\box57
 \l_tmpb_box=\box58
@@ -143,6 +144,6 @@
 \l__coffin_scaled_total_height_dim=\dimen161
 \l__coffin_scaled_width_dim=\dimen162
 ) (l3pdfmode.def
-\l__driver_color_stack_int=\count192
+\l__driver_color_stack_int=\count193
 \l__driver_tmp_box=\box71
 ))

Modified: trunk/l3kernel/testfiles/m3expl006.ptex.tlg
===================================================================
--- trunk/l3kernel/testfiles/m3expl006.ptex.tlg	2017-07-17 00:38:38 UTC (rev 7384)
+++ trunk/l3kernel/testfiles/m3expl006.ptex.tlg	2017-07-17 01:42:23 UTC (rev 7385)
@@ -103,6 +103,7 @@
 \l__regex_min_submatch_int=\count189
 \l__regex_submatch_int=\count190
 \l__regex_zeroth_submatch_int=\count191
+\g__debug_trace_regex_int=\count192
 \c_empty_box=\box56
 \l_tmpa_box=\box57
 \l_tmpb_box=\box58
@@ -144,6 +145,6 @@
 \l__coffin_scaled_total_height_dim=\dimen161
 \l__coffin_scaled_width_dim=\dimen162
 ) (l3dvipdfmx.def
-\g__driver_image_int=\count192
+\g__driver_image_int=\count193
 \l__driver_tmp_box=\box71
 ))

Modified: trunk/l3kernel/testfiles/m3expl006.tlg
===================================================================
--- trunk/l3kernel/testfiles/m3expl006.tlg	2017-07-17 00:38:38 UTC (rev 7384)
+++ trunk/l3kernel/testfiles/m3expl006.tlg	2017-07-17 01:42:23 UTC (rev 7385)
@@ -103,6 +103,7 @@
 \l__regex_min_submatch_int=\count191
 \l__regex_submatch_int=\count192
 \l__regex_zeroth_submatch_int=\count193
+\g__debug_trace_regex_int=\count194
 \c_empty_box=\box56
 \l_tmpa_box=\box57
 \l_tmpb_box=\box58
@@ -144,6 +145,6 @@
 \l__coffin_scaled_total_height_dim=\dimen161
 \l__coffin_scaled_width_dim=\dimen162
 ) (l3pdfmode.def
-\l__driver_color_stack_int=\count194
+\l__driver_color_stack_int=\count195
 \l__driver_tmp_box=\box71
 ))

Modified: trunk/l3kernel/testfiles/m3expl006.uptex.tlg
===================================================================
--- trunk/l3kernel/testfiles/m3expl006.uptex.tlg	2017-07-17 00:38:38 UTC (rev 7384)
+++ trunk/l3kernel/testfiles/m3expl006.uptex.tlg	2017-07-17 01:42:23 UTC (rev 7385)
@@ -101,6 +101,7 @@
 \l__regex_min_submatch_int=\count187
 \l__regex_submatch_int=\count188
 \l__regex_zeroth_submatch_int=\count189
+\g__debug_trace_regex_int=\count190
 \c_empty_box=\box56
 \l_tmpa_box=\box57
 \l_tmpb_box=\box58
@@ -142,6 +143,6 @@
 \l__coffin_scaled_total_height_dim=\dimen161
 \l__coffin_scaled_width_dim=\dimen162
 ) (l3dvipdfmx.def
-\g__driver_image_int=\count190
+\g__driver_image_int=\count191
 \l__driver_tmp_box=\box71
 ))

Modified: trunk/l3kernel/testfiles/m3expl006.xetex.tlg
===================================================================
--- trunk/l3kernel/testfiles/m3expl006.xetex.tlg	2017-07-17 00:38:38 UTC (rev 7384)
+++ trunk/l3kernel/testfiles/m3expl006.xetex.tlg	2017-07-17 01:42:23 UTC (rev 7385)
@@ -98,6 +98,7 @@
 \l__regex_min_submatch_int=\count186
 \l__regex_submatch_int=\count187
 \l__regex_zeroth_submatch_int=\count188
+\g__debug_trace_regex_int=\count189
 \c_empty_box=\box56
 \l_tmpa_box=\box57
 \l_tmpb_box=\box58
@@ -139,6 +140,6 @@
 \l__coffin_scaled_total_height_dim=\dimen161
 \l__coffin_scaled_width_dim=\dimen162
 ) (l3xdvipdfmx.def
-\g__driver_image_int=\count189
+\g__driver_image_int=\count190
 \l__driver_tmp_box=\box71
 ))

Modified: trunk/l3kernel/testfiles/m3int001.luatex.tlg
===================================================================
--- trunk/l3kernel/testfiles/m3int001.luatex.tlg	2017-07-17 00:38:38 UTC (rev 7384)
+++ trunk/l3kernel/testfiles/m3int001.luatex.tlg	2017-07-17 01:42:23 UTC (rev 7385)
@@ -5,11 +5,11 @@
 TEST 1: allocating new registers; no worries
 ============================================================
 Defining \l_testa_int on line ...
-\l_testa_int=\count193
+\l_testa_int=\count194
 Defining \g_testa_int on line ...
-\g_testa_int=\count194
+\g_testa_int=\count195
 Defining \g_testb_int on line ...
-\g_testb_int=\count195
+\g_testb_int=\count196
 ============================================================
 ============================================================
 TEST 2: allocating same name: errors expected
@@ -32,10 +32,10 @@
 | this name has already been used elsewhere.
 | 
 | The current meaning is:
-|   \count193
+|   \count194
 |...............................................
 Defining \l_testa_int on line ...
-\l_testa_int=\count196
+\l_testa_int=\count197
 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 !
 ! LaTeX error: "kernel/command-already-defined"
@@ -54,16 +54,16 @@
 | this name has already been used elsewhere.
 | 
 | The current meaning is:
-|   \count194
+|   \count195
 |...............................................
 Defining \g_testa_int on line ...
-\g_testa_int=\count197
+\g_testa_int=\count198
 ============================================================
 ============================================================
 TEST 3: allocate or clear
 ============================================================
 Defining \l_testb_int on line ...
-\l_testb_int=\count198
+\l_testb_int=\count199
 0
 0
 0

Modified: trunk/l3kernel/testfiles/m3int001.ptex.tlg
===================================================================
--- trunk/l3kernel/testfiles/m3int001.ptex.tlg	2017-07-17 00:38:38 UTC (rev 7384)
+++ trunk/l3kernel/testfiles/m3int001.ptex.tlg	2017-07-17 01:42:23 UTC (rev 7385)
@@ -5,11 +5,11 @@
 TEST 1: allocating new registers; no worries
 ============================================================
 Defining \l_testa_int on line ...
-\l_testa_int=\count193
+\l_testa_int=\count194
 Defining \g_testa_int on line ...
-\g_testa_int=\count194
+\g_testa_int=\count195
 Defining \g_testb_int on line ...
-\g_testb_int=\count195
+\g_testb_int=\count196
 ============================================================
 ============================================================
 TEST 2: allocating same name: errors expected
@@ -32,10 +32,10 @@
 | this name has already been used elsewhere.
 | 
 | The current meaning is:
-|   \count193
+|   \count194
 |...............................................
 Defining \l_testa_int on line ...
-\l_testa_int=\count196
+\l_testa_int=\count197
 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 !
 ! LaTeX error: "kernel/command-already-defined"
@@ -54,16 +54,16 @@
 | this name has already been used elsewhere.
 | 
 | The current meaning is:
-|   \count194
+|   \count195
 |...............................................
 Defining \g_testa_int on line ...
-\g_testa_int=\count197
+\g_testa_int=\count198
 ============================================================
 ============================================================
 TEST 3: allocate or clear
 ============================================================
 Defining \l_testb_int on line ...
-\l_testb_int=\count198
+\l_testb_int=\count199
 0
 0
 0

Modified: trunk/l3kernel/testfiles/m3int001.tlg
===================================================================
--- trunk/l3kernel/testfiles/m3int001.tlg	2017-07-17 00:38:38 UTC (rev 7384)
+++ trunk/l3kernel/testfiles/m3int001.tlg	2017-07-17 01:42:23 UTC (rev 7385)
@@ -5,11 +5,11 @@
 TEST 1: allocating new registers; no worries
 ============================================================
 Defining \l_testa_int on line ...
-\l_testa_int=\count195
+\l_testa_int=\count196
 Defining \g_testa_int on line ...
-\g_testa_int=\count196
+\g_testa_int=\count197
 Defining \g_testb_int on line ...
-\g_testb_int=\count197
+\g_testb_int=\count198
 ============================================================
 ============================================================
 TEST 2: allocating same name: errors expected
@@ -32,10 +32,10 @@
 | this name has already been used elsewhere.
 | 
 | The current meaning is:
-|   \count195
+|   \count196
 |...............................................
 Defining \l_testa_int on line ...
-\l_testa_int=\count198
+\l_testa_int=\count199
 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 !
 ! LaTeX error: "kernel/command-already-defined"
@@ -54,16 +54,16 @@
 | this name has already been used elsewhere.
 | 
 | The current meaning is:
-|   \count196
+|   \count197
 |...............................................
 Defining \g_testa_int on line ...
-\g_testa_int=\count199
+\g_testa_int=\count266
 ============================================================
 ============================================================
 TEST 3: allocate or clear
 ============================================================
 Defining \l_testb_int on line ...
-\l_testb_int=\count266
+\l_testb_int=\count267
 0
 0
 0

Modified: trunk/l3kernel/testfiles/m3int001.uptex.tlg
===================================================================
--- trunk/l3kernel/testfiles/m3int001.uptex.tlg	2017-07-17 00:38:38 UTC (rev 7384)
+++ trunk/l3kernel/testfiles/m3int001.uptex.tlg	2017-07-17 01:42:23 UTC (rev 7385)
@@ -5,11 +5,11 @@
 TEST 1: allocating new registers; no worries
 ============================================================
 Defining \l_testa_int on line ...
-\l_testa_int=\count191
+\l_testa_int=\count192
 Defining \g_testa_int on line ...
-\g_testa_int=\count192
+\g_testa_int=\count193
 Defining \g_testb_int on line ...
-\g_testb_int=\count193
+\g_testb_int=\count194
 ============================================================
 ============================================================
 TEST 2: allocating same name: errors expected
@@ -32,10 +32,10 @@
 | this name has already been used elsewhere.
 | 
 | The current meaning is:
-|   \count191
+|   \count192
 |...............................................
 Defining \l_testa_int on line ...
-\l_testa_int=\count194
+\l_testa_int=\count195
 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 !
 ! LaTeX error: "kernel/command-already-defined"
@@ -54,16 +54,16 @@
 | this name has already been used elsewhere.
 | 
 | The current meaning is:
-|   \count192
+|   \count193
 |...............................................
 Defining \g_testa_int on line ...
-\g_testa_int=\count195
+\g_testa_int=\count196
 ============================================================
 ============================================================
 TEST 3: allocate or clear
 ============================================================
 Defining \l_testb_int on line ...
-\l_testb_int=\count196
+\l_testb_int=\count197
 0
 0
 0

Modified: trunk/l3kernel/testfiles/m3int001.xetex.tlg
===================================================================
--- trunk/l3kernel/testfiles/m3int001.xetex.tlg	2017-07-17 00:38:38 UTC (rev 7384)
+++ trunk/l3kernel/testfiles/m3int001.xetex.tlg	2017-07-17 01:42:23 UTC (rev 7385)
@@ -5,11 +5,11 @@
 TEST 1: allocating new registers; no worries
 ============================================================
 Defining \l_testa_int on line ...
-\l_testa_int=\count190
+\l_testa_int=\count191
 Defining \g_testa_int on line ...
-\g_testa_int=\count191
+\g_testa_int=\count192
 Defining \g_testb_int on line ...
-\g_testb_int=\count192
+\g_testb_int=\count193
 ============================================================
 ============================================================
 TEST 2: allocating same name: errors expected
@@ -32,10 +32,10 @@
 | this name has already been used elsewhere.
 | 
 | The current meaning is:
-|   \count190
+|   \count191
 |...............................................
 Defining \l_testa_int on line ...
-\l_testa_int=\count193
+\l_testa_int=\count194
 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 !
 ! LaTeX error: "kernel/command-already-defined"
@@ -54,16 +54,16 @@
 | this name has already been used elsewhere.
 | 
 | The current meaning is:
-|   \count191
+|   \count192
 |...............................................
 Defining \g_testa_int on line ...
-\g_testa_int=\count194
+\g_testa_int=\count195
 ============================================================
 ============================================================
 TEST 3: allocate or clear
 ============================================================
 Defining \l_testb_int on line ...
-\l_testb_int=\count195
+\l_testb_int=\count196
 0
 0
 0

Modified: trunk/l3kernel/testfiles/m3int002.luatex.tlg
===================================================================
--- trunk/l3kernel/testfiles/m3int002.luatex.tlg	2017-07-17 00:38:38 UTC (rev 7384)
+++ trunk/l3kernel/testfiles/m3int002.luatex.tlg	2017-07-17 01:42:23 UTC (rev 7385)
@@ -164,19 +164,19 @@
 TEST 14: Integer creation
 ============================================================
 Defining \l_A_int on line ...
-\l_A_int=\count194
+\l_A_int=\count195
 Defining \g_A_int on line ...
-\g_A_int=\count195
-\count194
+\g_A_int=\count196
 \count195
+\count196
 Defining \l_B_int on line ...
-\l_B_int=\count196
+\l_B_int=\count197
 Defining \g_B_int on line ...
-\g_B_int=\count197
-\count196
+\g_B_int=\count198
 \count197
-\count196
+\count198
 \count197
+\count198
 ============================================================
 ============================================================
 TEST 15: Integer creation errors
@@ -199,10 +199,10 @@
 | name has already been used elsewhere.
 | 
 | The current meaning is:
-|   \count194
+|   \count195
 |...............................................
 Defining \l_A_int on line ...
-\l_A_int=\count198
+\l_A_int=\count199
 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 !
 ! LaTeX error: "kernel/command-already-defined"
@@ -221,10 +221,10 @@
 | name has already been used elsewhere.
 | 
 | The current meaning is:
-|   \count195
+|   \count196
 |...............................................
 Defining \g_A_int on line ...
-\g_A_int=\count199
+\g_A_int=\count266
 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 !
 ! LaTeX error: "kernel/command-already-defined"
@@ -243,10 +243,10 @@
 | name has already been used elsewhere.
 | 
 | The current meaning is:
-|   \count196
+|   \count197
 |...............................................
 Defining \l_B_int on line ...
-\l_B_int=\count266
+\l_B_int=\count267
 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 !
 ! LaTeX error: "kernel/command-already-defined"
@@ -265,10 +265,10 @@
 | name has already been used elsewhere.
 | 
 | The current meaning is:
-|   \count197
+|   \count198
 |...............................................
 Defining \g_B_int on line ...
-\g_B_int=\count267
+\g_B_int=\count268
 ============================================================
 ============================================================
 TEST 16: Constant integer creation
@@ -277,10 +277,10 @@
 \char"5
 5
 Defining \c_B_int on line ...
-\c_B_int=\count268
-\count268
+\c_B_int=\count269
+\count269
 -10
-\count268
+\count269
 -10
 ============================================================
 ============================================================
@@ -325,10 +325,10 @@
 | name has already been used elsewhere.
 | 
 | The current meaning is:
-|   \count268
+|   \count269
 |...............................................
 Defining \c_B_int on line ...
-\c_B_int=\count269
+\c_B_int=\count270
 ============================================================
 ============================================================
 TEST 18: Set integers equal

Modified: trunk/l3kernel/testfiles/m3int002.ptex.tlg
===================================================================
--- trunk/l3kernel/testfiles/m3int002.ptex.tlg	2017-07-17 00:38:38 UTC (rev 7384)
+++ trunk/l3kernel/testfiles/m3int002.ptex.tlg	2017-07-17 01:42:23 UTC (rev 7385)
@@ -164,19 +164,19 @@
 TEST 14: Integer creation
 ============================================================
 Defining \l_A_int on line ...
-\l_A_int=\count194
+\l_A_int=\count195
 Defining \g_A_int on line ...
-\g_A_int=\count195
-\count194
+\g_A_int=\count196
 \count195
+\count196
 Defining \l_B_int on line ...
-\l_B_int=\count196
+\l_B_int=\count197
 Defining \g_B_int on line ...
-\g_B_int=\count197
-\count196
+\g_B_int=\count198
 \count197
-\count196
+\count198
 \count197
+\count198
 ============================================================
 ============================================================
 TEST 15: Integer creation errors
@@ -199,10 +199,10 @@
 | name has already been used elsewhere.
 | 
 | The current meaning is:
-|   \count194
+|   \count195
 |...............................................
 Defining \l_A_int on line ...
-\l_A_int=\count198
+\l_A_int=\count199
 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 !
 ! LaTeX error: "kernel/command-already-defined"
@@ -221,10 +221,10 @@
 | name has already been used elsewhere.
 | 
 | The current meaning is:
-|   \count195
+|   \count196
 |...............................................
 Defining \g_A_int on line ...
-\g_A_int=\count199
+\g_A_int=\count266
 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 !
 ! LaTeX error: "kernel/command-already-defined"
@@ -243,10 +243,10 @@
 | name has already been used elsewhere.
 | 
 | The current meaning is:
-|   \count196
+|   \count197
 |...............................................
 Defining \l_B_int on line ...
-\l_B_int=\count266
+\l_B_int=\count267
 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 !
 ! LaTeX error: "kernel/command-already-defined"
@@ -265,10 +265,10 @@
 | name has already been used elsewhere.
 | 
 | The current meaning is:
-|   \count197
+|   \count198
 |...............................................
 Defining \g_B_int on line ...
-\g_B_int=\count267
+\g_B_int=\count268
 ============================================================
 ============================================================
 TEST 16: Constant integer creation
@@ -277,10 +277,10 @@
 \mathchar"5
 5
 Defining \c_B_int on line ...
-\c_B_int=\count268
-\count268
+\c_B_int=\count269
+\count269
 -10
-\count268
+\count269
 -10
 ============================================================
 ============================================================
@@ -325,10 +325,10 @@
 | name has already been used elsewhere.
 | 
 | The current meaning is:
-|   \count268
+|   \count269
 |...............................................
 Defining \c_B_int on line ...
-\c_B_int=\count269
+\c_B_int=\count270
 ============================================================
 ============================================================
 TEST 18: Set integers equal

Modified: trunk/l3kernel/testfiles/m3int002.tlg
===================================================================
--- trunk/l3kernel/testfiles/m3int002.tlg	2017-07-17 00:38:38 UTC (rev 7384)
+++ trunk/l3kernel/testfiles/m3int002.tlg	2017-07-17 01:42:23 UTC (rev 7385)
@@ -164,19 +164,19 @@
 TEST 14: Integer creation
 ============================================================
 Defining \l_A_int on line ...
-\l_A_int=\count196
+\l_A_int=\count197
 Defining \g_A_int on line ...
-\g_A_int=\count197
-\count196
+\g_A_int=\count198
 \count197
+\count198
 Defining \l_B_int on line ...
-\l_B_int=\count198
+\l_B_int=\count199
 Defining \g_B_int on line ...
-\g_B_int=\count199
-\count198
+\g_B_int=\count266
 \count199
-\count198
+\count266
 \count199
+\count266
 ============================================================
 ============================================================
 TEST 15: Integer creation errors
@@ -199,10 +199,10 @@
 | name has already been used elsewhere.
 | 
 | The current meaning is:
-|   \count196
+|   \count197
 |...............................................
 Defining \l_A_int on line ...
-\l_A_int=\count266
+\l_A_int=\count267
 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 !
 ! LaTeX error: "kernel/command-already-defined"
@@ -221,10 +221,10 @@
 | name has already been used elsewhere.
 | 
 | The current meaning is:
-|   \count197
+|   \count198
 |...............................................
 Defining \g_A_int on line ...
-\g_A_int=\count267
+\g_A_int=\count268
 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 !
 ! LaTeX error: "kernel/command-already-defined"
@@ -243,10 +243,10 @@
 | name has already been used elsewhere.
 | 
 | The current meaning is:
-|   \count198
+|   \count199
 |...............................................
 Defining \l_B_int on line ...
-\l_B_int=\count268
+\l_B_int=\count269
 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 !
 ! LaTeX error: "kernel/command-already-defined"
@@ -265,10 +265,10 @@
 | name has already been used elsewhere.
 | 
 | The current meaning is:
-|   \count199
+|   \count266
 |...............................................
 Defining \g_B_int on line ...
-\g_B_int=\count269
+\g_B_int=\count270
 ============================================================
 ============================================================
 TEST 16: Constant integer creation
@@ -277,10 +277,10 @@
 \mathchar"5
 5
 Defining \c_B_int on line ...
-\c_B_int=\count270
-\count270
+\c_B_int=\count271
+\count271
 -10
-\count270
+\count271
 -10
 ============================================================
 ============================================================
@@ -325,10 +325,10 @@
 | name has already been used elsewhere.
 | 
 | The current meaning is:
-|   \count270
+|   \count271
 |...............................................
 Defining \c_B_int on line ...
-\c_B_int=\count271
+\c_B_int=\count272
 ============================================================
 ============================================================
 TEST 18: Set integers equal

Modified: trunk/l3kernel/testfiles/m3int002.uptex.tlg
===================================================================
--- trunk/l3kernel/testfiles/m3int002.uptex.tlg	2017-07-17 00:38:38 UTC (rev 7384)
+++ trunk/l3kernel/testfiles/m3int002.uptex.tlg	2017-07-17 01:42:23 UTC (rev 7385)
@@ -164,19 +164,19 @@
 TEST 14: Integer creation
 ============================================================
 Defining \l_A_int on line ...
-\l_A_int=\count192
+\l_A_int=\count193
 Defining \g_A_int on line ...
-\g_A_int=\count193
-\count192
+\g_A_int=\count194
 \count193
+\count194
 Defining \l_B_int on line ...
-\l_B_int=\count194
+\l_B_int=\count195
 Defining \g_B_int on line ...
-\g_B_int=\count195
-\count194
+\g_B_int=\count196
 \count195
-\count194
+\count196
 \count195
+\count196
 ============================================================
 ============================================================
 TEST 15: Integer creation errors
@@ -199,10 +199,10 @@
 | name has already been used elsewhere.
 | 
 | The current meaning is:
-|   \count192
+|   \count193
 |...............................................
 Defining \l_A_int on line ...
-\l_A_int=\count196
+\l_A_int=\count197
 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 !
 ! LaTeX error: "kernel/command-already-defined"
@@ -221,10 +221,10 @@
 | name has already been used elsewhere.
 | 
 | The current meaning is:
-|   \count193
+|   \count194
 |...............................................
 Defining \g_A_int on line ...
-\g_A_int=\count197
+\g_A_int=\count198
 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 !
 ! LaTeX error: "kernel/command-already-defined"
@@ -243,10 +243,10 @@
 | name has already been used elsewhere.
 | 
 | The current meaning is:
-|   \count194
+|   \count195
 |...............................................
 Defining \l_B_int on line ...
-\l_B_int=\count198
+\l_B_int=\count199
 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 !
 ! LaTeX error: "kernel/command-already-defined"
@@ -265,10 +265,10 @@
 | name has already been used elsewhere.
 | 
 | The current meaning is:
-|   \count195
+|   \count196
 |...............................................
 Defining \g_B_int on line ...
-\g_B_int=\count199
+\g_B_int=\count266
 ============================================================
 ============================================================
 TEST 16: Constant integer creation
@@ -277,10 +277,10 @@
 \kchar"5
 5
 Defining \c_B_int on line ...
-\c_B_int=\count266
-\count266
+\c_B_int=\count267
+\count267
 -10
-\count266
+\count267
 -10
 ============================================================
 ============================================================
@@ -325,10 +325,10 @@
 | name has already been used elsewhere.
 | 
 | The current meaning is:
-|   \count266
+|   \count267
 |...............................................
 Defining \c_B_int on line ...
-\c_B_int=\count267
+\c_B_int=\count268
 ============================================================
 ============================================================
 TEST 18: Set integers equal

Modified: trunk/l3kernel/testfiles/m3int002.xetex.tlg
===================================================================
--- trunk/l3kernel/testfiles/m3int002.xetex.tlg	2017-07-17 00:38:38 UTC (rev 7384)
+++ trunk/l3kernel/testfiles/m3int002.xetex.tlg	2017-07-17 01:42:23 UTC (rev 7385)
@@ -164,19 +164,19 @@
 TEST 14: Integer creation
 ============================================================
 Defining \l_A_int on line ...
-\l_A_int=\count191
+\l_A_int=\count192
 Defining \g_A_int on line ...
-\g_A_int=\count192
-\count191
+\g_A_int=\count193
 \count192
+\count193
 Defining \l_B_int on line ...
-\l_B_int=\count193
+\l_B_int=\count194
 Defining \g_B_int on line ...
-\g_B_int=\count194
-\count193
+\g_B_int=\count195
 \count194
-\count193
+\count195
 \count194
+\count195
 ============================================================
 ============================================================
 TEST 15: Integer creation errors
@@ -199,10 +199,10 @@
 | name has already been used elsewhere.
 | 
 | The current meaning is:
-|   \count191
+|   \count192
 |...............................................
 Defining \l_A_int on line ...
-\l_A_int=\count195
+\l_A_int=\count196
 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 !
 ! LaTeX error: "kernel/command-already-defined"
@@ -221,10 +221,10 @@
 | name has already been used elsewhere.
 | 
 | The current meaning is:
-|   \count192
+|   \count193
 |...............................................
 Defining \g_A_int on line ...
-\g_A_int=\count196
+\g_A_int=\count197
 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 !
 ! LaTeX error: "kernel/command-already-defined"
@@ -243,10 +243,10 @@
 | name has already been used elsewhere.
 | 
 | The current meaning is:
-|   \count193
+|   \count194
 |...............................................
 Defining \l_B_int on line ...
-\l_B_int=\count197
+\l_B_int=\count198
 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 !
 ! LaTeX error: "kernel/command-already-defined"
@@ -265,10 +265,10 @@
 | name has already been used elsewhere.
 | 
 | The current meaning is:
-|   \count194
+|   \count195
 |...............................................
 Defining \g_B_int on line ...
-\g_B_int=\count198
+\g_B_int=\count199
 ============================================================
 ============================================================
 TEST 16: Constant integer creation
@@ -277,10 +277,10 @@
 \char"5
 5
 Defining \c_B_int on line ...
-\c_B_int=\count199
-\count199
+\c_B_int=\count266
+\count266
 -10
-\count199
+\count266
 -10
 ============================================================
 ============================================================
@@ -325,10 +325,10 @@
 | name has already been used elsewhere.
 | 
 | The current meaning is:
-|   \count199
+|   \count266
 |...............................................
 Defining \c_B_int on line ...
-\c_B_int=\count266
+\c_B_int=\count267
 ============================================================
 ============================================================
 TEST 18: Set integers equal

Modified: trunk/l3kernel/testfiles/m3tl-analysis001.luatex.tlg
===================================================================
--- trunk/l3kernel/testfiles/m3tl-analysis001.luatex.tlg	2017-07-17 00:38:38 UTC (rev 7384)
+++ trunk/l3kernel/testfiles/m3tl-analysis001.luatex.tlg	2017-07-17 01:42:23 UTC (rev 7385)
@@ -99,7 +99,7 @@
 The token list contains the tokens:
 >  \l_foo_int (control sequence=\count1234=12)
 >  \l_foo_toks (control sequence=\toks1234=abc)
->  \c_test_int (control sequence=\count193=-1)
+>  \c_test_int (control sequence=\count194=-1)
 >  \c_zero_skip (control sequence=\skip71=0.0pt)
 >  \c_zero_muskip (control sequence=\muskip40)
 >  \tex_count:D (control sequence=\count)

Modified: trunk/l3kernel/testfiles/m3tl-analysis001.ptex.tlg
===================================================================
--- trunk/l3kernel/testfiles/m3tl-analysis001.ptex.tlg	2017-07-17 00:38:38 UTC (rev 7384)
+++ trunk/l3kernel/testfiles/m3tl-analysis001.ptex.tlg	2017-07-17 01:42:23 UTC (rev 7385)
@@ -99,7 +99,7 @@
 The token list contains the tokens:
 >  \l_foo_int (control sequence=\count1234=12)
 >  \l_foo_toks (control sequence=\toks1234=abc)
->  \c_test_int (control sequence=\count193=-1)
+>  \c_test_int (control sequence=\count194=-1)
 >  \c_zero_skip (control sequence=\skip71=0.0pt)
 >  \c_zero_muskip (control sequence=\muskip40)
 >  \tex_count:D (control sequence=\count)

Modified: trunk/l3kernel/testfiles/m3tl-analysis001.tlg
===================================================================
--- trunk/l3kernel/testfiles/m3tl-analysis001.tlg	2017-07-17 00:38:38 UTC (rev 7384)
+++ trunk/l3kernel/testfiles/m3tl-analysis001.tlg	2017-07-17 01:42:23 UTC (rev 7385)
@@ -99,7 +99,7 @@
 The token list contains the tokens:
 >  \l_foo_int (control sequence=\count1234=12)
 >  \l_foo_toks (control sequence=\toks1234=abc)
->  \c_test_int (control sequence=\count195=-1)
+>  \c_test_int (control sequence=\count196=-1)
 >  \c_zero_skip (control sequence=\skip71=0.0pt)
 >  \c_zero_muskip (control sequence=\muskip40)
 >  \tex_count:D (control sequence=\count)

Modified: trunk/l3kernel/testfiles/m3tl-analysis001.uptex.tlg
===================================================================
--- trunk/l3kernel/testfiles/m3tl-analysis001.uptex.tlg	2017-07-17 00:38:38 UTC (rev 7384)
+++ trunk/l3kernel/testfiles/m3tl-analysis001.uptex.tlg	2017-07-17 01:42:23 UTC (rev 7385)
@@ -99,7 +99,7 @@
 The token list contains the tokens:
 >  \l_foo_int (control sequence=\count1234=12)
 >  \l_foo_toks (control sequence=\toks1234=abc)
->  \c_test_int (control sequence=\count191=-1)
+>  \c_test_int (control sequence=\count192=-1)
 >  \c_zero_skip (control sequence=\skip71=0.0pt)
 >  \c_zero_muskip (control sequence=\muskip40)
 >  \tex_count:D (control sequence=\count)

Modified: trunk/l3kernel/testfiles/m3tl-analysis001.xetex.tlg
===================================================================
--- trunk/l3kernel/testfiles/m3tl-analysis001.xetex.tlg	2017-07-17 00:38:38 UTC (rev 7384)
+++ trunk/l3kernel/testfiles/m3tl-analysis001.xetex.tlg	2017-07-17 01:42:23 UTC (rev 7385)
@@ -99,7 +99,7 @@
 The token list contains the tokens:
 >  \l_foo_int (control sequence=\count1234=12)
 >  \l_foo_toks (control sequence=\toks1234=abc)
->  \c_test_int (control sequence=\count190=-1)
+>  \c_test_int (control sequence=\count191=-1)
 >  \c_zero_skip (control sequence=\skip71=0.0pt)
 >  \c_zero_muskip (control sequence=\muskip40)
 >  \tex_count:D (control sequence=\count)

Modified: trunk/l3trial/l3benchmark/testfiles/m3benchmark001.tlg
===================================================================
--- trunk/l3trial/l3benchmark/testfiles/m3benchmark001.tlg	2017-07-17 00:38:38 UTC (rev 7384)
+++ trunk/l3trial/l3benchmark/testfiles/m3benchmark001.tlg	2017-07-17 01:42:23 UTC (rev 7385)
@@ -1,5 +1,5 @@
 This is a generated file for the LaTeX (2e + expl3) validation system.
 Don't change this file in any respect.
 (l3benchmark.sty
-\l__benchmark_repeat_int=\count195
+\l__benchmark_repeat_int=\count196
 )



More information about the latex3-commits mailing list