From bffbeb435746ef4bfc3abbbce80006f657360f3a Mon Sep 17 00:00:00 2001
From: Karl Berry <karl@freefriends.org>
Date: Mon, 11 May 2020 20:47:47 +0000
Subject: l3kernel (11may20)

git-svn-id: svn://tug.org/texlive/trunk@55101 c570f23f-e606-0410-a88d-b1316a301751
---
 Master/texmf-dist/tex/latex/l3kernel/l3debug.def | 25 +++++++++++++++---------
 1 file changed, 16 insertions(+), 9 deletions(-)

(limited to 'Master/texmf-dist/tex/latex/l3kernel/l3debug.def')

diff --git a/Master/texmf-dist/tex/latex/l3kernel/l3debug.def b/Master/texmf-dist/tex/latex/l3kernel/l3debug.def
index cfe9bcf7de7..8f0b6e73e4d 100644
--- a/Master/texmf-dist/tex/latex/l3kernel/l3debug.def
+++ b/Master/texmf-dist/tex/latex/l3kernel/l3debug.def
@@ -20,6 +20,13 @@
 %% 
 %% File: l3debug.dtx
 \ProvidesExplFile{l3debug.def}{2019-04-06}{}{L3 Debugging support}
+\scan_new:N \s__debug_stop
+\cs_new:Npn \__debug_use_i_delimit_by_s_stop:nw #1 #2 \s__debug_stop {#1}
+\quark_new:N \q__debug_recursion_tail
+\quark_new:N \q__debug_recursion_stop
+\cs_new:Npn \__debug_use_none_delimit_by_q_recursion_stop:w
+  #1 \q__debug_recursion_stop { }
+\__kernel_quark_new_test:N \__debug_if_recursion_tail_stop:N
 \cs_set_protected:Npn \debug_on:n #1
    {
     \exp_args:No \clist_map_inline:nn { \tl_to_str:n {#1} }
@@ -139,9 +146,9 @@
   { \exp_args:NNf \__debug_chk_var_scope_aux:Nn #1 { \cs_to_str:N #2 } }
 \cs_new_protected:Npn \__debug_chk_var_scope_aux:Nn #1#2
   {
-    \if:w _ \use_i:nn \use_i_delimit_by_q_stop:nw #2 ? ? \q_stop
+    \if:w _ \use_i:nn \__debug_use_i_delimit_by_s_stop:nw #2 ? ? \s__debug_stop
       \exp_after:wN \__debug_chk_var_scope_aux:NNn
-        \use_i_delimit_by_q_stop:nw #2 ? \q_stop
+        \__debug_use_i_delimit_by_s_stop:nw #2 ? \s__debug_stop
         #1 {#2}
     \else:
       \exp_args:Nc \__debug_chk_var_scope_aux:NNn
@@ -216,16 +223,16 @@
 \cs_new:Npn \__debug_build_parm_text:n #1
   {
     \__debug_arg_list_from_signature:nNN { 1 } \c_false_bool #1
-    \q_recursion_tail \q_recursion_stop
+    \q__debug_recursion_tail \q__debug_recursion_stop
   }
 \cs_new:Npn \__debug_build_arg_list:n #1
   {
     \__debug_arg_list_from_signature:nNN { 1 } \c_true_bool #1
-    \q_recursion_tail \q_recursion_stop
+    \q__debug_recursion_tail \q__debug_recursion_stop
   }
 \cs_new:Npn \__debug_arg_list_from_signature:nNN #1 #2 #3
   {
-    \quark_if_recursion_tail_stop:N #3
+    \__debug_if_recursion_tail_stop:N #3
     \__debug_arg_check_invalid:N #3
     \bool_if:NT #2 { \__debug_arg_if_braced:NT #3 { \use_none:n } }
     \use:n { \c_hash_str \int_eval:n {#1} }
@@ -246,7 +253,7 @@
     \exp_end:
   }
 \cs_new:Npn \__debug_parm_terminate:w
-  { \exp_after:wN \use_none_delimit_by_q_recursion_stop:w \exp:w }
+  { \exp_after:wN \__debug_use_none_delimit_by_q_recursion_stop:w \exp:w }
 \prg_new_conditional:Npnn \__debug_arg_if_braced:N #1 { T }
   { \exp_args:Nf \__debug_arg_if_braced:n { \__debug_get_base_form:N #1 } }
 \cs_new:Npn \__debug_arg_if_braced:n #1
@@ -332,7 +339,7 @@
             ####2 \tl_to_str:n { -> }
             ####3 \c_backslash_str \tl_to_str:n { __debug_ }
                     \cs_to_str:N #1
-            ####4 \exp_not:N \q_mark
+            ####4 \s__debug_stop
             {
               \exp_not:N \exp_args:Nx \exp_not:N \tex_scantokens:D
                 {
@@ -346,7 +353,7 @@
                 }
             }
         }
-      \exp_after:wN \__debug_tmp:w \cs_meaning:N #1 \q_mark
+      \exp_after:wN \__debug_tmp:w \cs_meaning:N #1 \s__debug_stop
     }
   \cs_set_protected:Npn \__kernel_patch_weird:nnn
     {
@@ -943,7 +950,7 @@
           \__kernel_chk_expr:nNnN
             {##1} \tex_glueexpr:D { } \skip_if_finite:n
         ; \prg_return_false:
-        #1 ; \prg_return_true: \q_stop
+        #1 ; \prg_return_true: \s__skip_stop
       }
   }
 \exp_args:No \__skip_tmp:w { \tl_to_str:n { fil } }
-- 
cgit v1.2.3

