[latex3-commits] [l3svn] r7382 - Make all existence checks subdued to check-declarations option

noreply at latex-project.org noreply at latex-project.org
Mon Jul 17 00:04:35 CEST 2017


Author: bruno
Date: 2017-07-17 00:04:34 +0200 (Mon, 17 Jul 2017)
New Revision: 7382

Modified:
   trunk/l3kernel/l3basics.dtx
   trunk/l3kernel/l3candidates.dtx
   trunk/l3kernel/l3expan.dtx
   trunk/l3kernel/l3flag.dtx
   trunk/l3kernel/l3prg.dtx
   trunk/l3kernel/l3tl.dtx
Log:
Make all existence checks subdued to check-declarations option

Possibly controversial: now by default \cs_generate_variant:Nn does not
check the base form is defined (like \tl_put_right:cn does not check
its first argument is defined).  I've left in the non-existence checks
done by \cs_new:Npn etc. but maybe these should be disabled by default?


Modified: trunk/l3kernel/l3basics.dtx
===================================================================
--- trunk/l3kernel/l3basics.dtx	2017-07-16 21:13:19 UTC (rev 7381)
+++ trunk/l3kernel/l3basics.dtx	2017-07-16 22:04:34 UTC (rev 7382)
@@ -1149,15 +1149,6 @@
 %
 % \section{Internal kernel functions}
 %
-% \begin{function}{\__chk_if_exist_cs:N, \__chk_if_exist_cs:c}
-%   \begin{syntax}
-%     \cs{__chk_if_exist_cs:N} \meta{cs}
-%   \end{syntax}
-%   This function checks that \meta{cs} exists according to the
-%   criteria for \cs{cs_if_exist_p:N}, and if not raises a kernel-level
-%   error.
-% \end{function}
-%
 % \begin{function}{\__chk_if_free_cs:N, \__chk_if_free_cs:c}
 %   \begin{syntax}
 %     \cs{__chk_if_free_cs:N} \meta{cs}
@@ -1167,74 +1158,6 @@
 %   error.
 % \end{function}
 %
-% \begin{function}{\__chk_if_exist_var:N}
-%   \begin{syntax}
-%     \cs{__chk_if_exist_var:N} \meta{var}
-%   \end{syntax}
-%   This function checks that \meta{var} is defined according to the
-%   criteria for \cs{cs_if_free_p:N}, and if not raises a kernel-level
-%   error. This function is only created if the package option
-%   \texttt{check-declarations} is active.
-% \end{function}
-%
-% \begin{function}{\__debug_log:x}
-%   \begin{syntax}
-%     \cs{__debug_log:x} \Arg{message text}
-%   \end{syntax}
-%   Only defined when debugging is enabled (hence only in package mode
-%   with the right options).  If the \texttt{log-functions} option is
-%   active, this function writes the \meta{message text} to the log file
-%   using \cs{iow_log:x}.  Otherwise, the \meta{message text} is ignored
-%   using \cs{use_none:n}.
-% \end{function}
-%
-% \begin{function}{\__debug_suspend_log:, \__debug_resume_log:}
-%   \begin{syntax}
-%     \cs{__debug_suspend_log:} \ldots{} \cs{__debug_log:x} \ldots{} \cs{__debug_resume_log:}
-%   \end{syntax}
-%   Any \cs{__debug_log:x} command between \cs{__debug_suspend_log:} and
-%   \cs{__debug_resume_log:} is suppressed.  These two commands can be
-%   nested and do nothing when debugging is disabled.
-% \end{function}
-%
-% \begin{function}{\__debug_patch:nnNw}
-%   \begin{syntax}
-%     \cs{__debug_patch:nnNw} \Arg{before} \Arg{after} \meta{definition} \ldots{}
-%   \end{syntax}
-%   If debugging is enabled (by one of few \pkg{expl3} options that
-%   imply \texttt{enable-debug}), adds the \meta{before} and
-%   \meta{after} tokens (which can involve |#1| and so on) in the
-%   \meta{definition} that follows.  Otherwise ignore the \meta{before}
-%   and \meta{after} code and perform the \meta{definition} with no
-%   patching.  The \meta{definition} must start with \cs{cs_new:Npn} or
-%   \cs{cs_set:Npn} or \cs{cs_gset:Npn} or \cs{prg_new_conditional:Npnn}
-%   or their protected counterparts.  Other cases could be added as
-%   needed.
-% \end{function}
-%
-% \begin{function}{\__debug_patch_args:nNw}
-%   \begin{syntax}
-%     \cs{__debug_patch_args:nNw} \Arg{arguments} \meta{definition} \ldots{}
-%   \end{syntax}
-%   Like \cs{__debug_patch:nnNw}, this tweaks the following definition,
-%   but from the \enquote{inside out}.  Namely, it replaces |#1|, |#2|
-%   and so on in the \meta{replacement text} of the definition as
-%   indicated by the \meta{arguments}.  More precisely, a temporary
-%   function is defined using the \meta{definition} with the
-%   \meta{parameter text} and \meta{replacement text}, then the result
-%   of expanding that function once in front of the \meta{arguments} is
-%   used as \meta{parameter text} when defining the actual function.
-%   For instance,
-%   \begin{quote}
-%     \cs{__debug_patch_args:nNw} |{ { (#1) } }| \\
-%     \cs{cs_new:Npn} \cs{int_eval:n} |#1| \\
-%     ~~|{ \__int_value:w \__int_eval:w #1 \__int_eval_end: }|
-%   \end{quote}
-%   replaces |#1| by |(#1)| in the definition of \cs{int_eval:n} when
-%   debugging is enabled.
-%   This fails if the \meta{replacement text} contains~|##|.
-% \end{function}
-%
 % \begin{function}[EXP]{\__cs_count_signature:N, \__cs_count_signature:c}
 %   \begin{syntax}
 %     \cs{__cs_count_signature:N} \meta{function}
@@ -1289,6 +1212,93 @@
 %   normally (spaces, characters with category other).
 % \end{function}
 %
+% \begin{function}{\__debug:TF}
+%   \begin{syntax}
+%     \cs{__debug:TF} \Arg{true code} \Arg{false code}
+%   \end{syntax}
+%   Runs the \meta{true code} if debugging is enabled, namely only in
+%   \LaTeXe{} package mode with one of the options
+%   \texttt{check-declarations}, \texttt{enable-debug}, or
+%   \texttt{log-functions}.  Otherwise runs the \meta{false code}.  The
+%   |T| and |F| variants are not provided for this low-level
+%   conditional.
+% \end{function}
+%
+% \begin{function}{\__debug_chk_cs_exist:N, \__debug_chk_cs_exist:c}
+%   \begin{syntax}
+%     \cs{__debug_chk_cs_exist:N} \meta{cs}
+%   \end{syntax}
+%   This function is only created if debugging is enabled.  It checks
+%   that \meta{cs} exists according to the criteria for
+%   \cs{cs_if_exist_p:N}, and if not raises a kernel-level error.
+% \end{function}
+%
+% \begin{function}{\__debug_chk_var_exist:N}
+%   \begin{syntax}
+%     \cs{__debug_chk_var_exist:N} \meta{var}
+%   \end{syntax}
+%   This function is only created if debugging is enabled.  It checks
+%   that \meta{var} is defined according to the criteria for
+%   \cs{cs_if_exist_p:N}, and if not raises a kernel-level error.
+% \end{function}
+%
+% \begin{function}{\__debug_log:x}
+%   \begin{syntax}
+%     \cs{__debug_log:x} \Arg{message text}
+%   \end{syntax}
+%   If the \texttt{log-functions} option is active, this function writes
+%   the \meta{message text} to the log file using \cs{iow_log:x}.
+%   Otherwise, the \meta{message text} is ignored using \cs{use_none:n}.
+%   This function is only created if debugging is enabled.
+% \end{function}
+%
+% \begin{function}{\__debug_suspend_log:, \__debug_resume_log:}
+%   \begin{syntax}
+%     \cs{__debug_suspend_log:} \ldots{} \cs{__debug_log:x} \ldots{} \cs{__debug_resume_log:}
+%   \end{syntax}
+%   Any \cs{__debug_log:x} command between \cs{__debug_suspend_log:} and
+%   \cs{__debug_resume_log:} is suppressed.  These two commands can be
+%   nested.  These functions are only created if debugging is enabled.
+% \end{function}
+%
+% \begin{function}{\__debug_patch:nnNw}
+%   \begin{syntax}
+%     \cs{__debug_patch:nnNw} \Arg{before} \Arg{after} \meta{definition} \ldots{}
+%   \end{syntax}
+%   If debugging is not enabled, this function ignores the \meta{before}
+%   and \meta{after} code and performs the \meta{definition} with no
+%   patching.  Otherwise it adds the \meta{before} and \meta{after}
+%   tokens (which can involve |#1| and so on) in the \meta{definition}
+%   that follows.  The \meta{definition} must start with \cs{cs_new:Npn}
+%   or \cs{cs_set:Npn} or \cs{cs_gset:Npn} or
+%   \cs{prg_new_conditional:Npnn} or their protected counterparts.
+%   Other cases can be added as needed.
+% \end{function}
+%
+% \begin{function}{\__debug_patch_args:nNw}
+%   \begin{syntax}
+%     \cs{__debug_patch_args:nNw} \Arg{arguments} \meta{definition} \ldots{}
+%   \end{syntax}
+%   Like \cs{__debug_patch:nnNw}, this tweaks the following definition,
+%   but from the \enquote{inside out} (and if debugging is not enabled,
+%   the \meta{arguments} are ignored).  Namely, it replaces |#1|, |#2|
+%   and so on in the \meta{replacement text} of the definition as
+%   indicated by the \meta{arguments}.  More precisely, a temporary
+%   function is defined using the \meta{definition} with the
+%   \meta{parameter text} and \meta{replacement text}, then the result
+%   of expanding that function once in front of the \meta{arguments} is
+%   used as \meta{parameter text} when defining the actual function.
+%   For instance,
+%   \begin{quote}
+%     \cs{__debug_patch_args:nNw} |{ { (#1) } }| \\
+%     \cs{cs_new:Npn} \cs{int_eval:n} |#1| \\
+%     ~~|{ \__int_value:w \__int_eval:w #1 \__int_eval_end: }|
+%   \end{quote}
+%   replaces |#1| by |(#1)| in the definition of \cs{int_eval:n} when
+%   debugging is enabled.
+%   This fails if the \meta{replacement text} contains~|##|.
+% \end{function}
+%
 % \begin{function}{\__kernel_register_show:N, \__kernel_register_show:c}
 %   \begin{syntax}
 %     \cs{__kernel_register_show:N} \meta{register}
@@ -1708,17 +1718,19 @@
 % \end{macro}
 %
 % \begin{macro}{\debug_check_declarations_on:, \debug_check_declarations_off:}
-% \begin{macro}[int]{\__chk_if_exist_var:N}
+% \begin{macro}[int]{\__debug_chk_var_exist:N}
+% \begin{macro}[int]{\__debug_chk_cs_exist:N, \__debug_chk_cs_exist:c}
 %   When debugging is not active these two user functions produce an
-%   error.  Otherwise they set up \cs{__chk_if_exist_var:N}, a function
-%   which when \texttt{check-declarations} is active tests that a given
-%   variable is defined.
+%   error.  Otherwise they set up \cs{__debug_chk_var_exist:N} and
+%   \cs{__debug_chk_cs_exist:N}, two functions that test (when
+%   \texttt{check-declarations} is active) that their argument is
+%   defined.
 %    \begin{macrocode}
 \__debug:TF
   {
     \cs_set_protected:Npn \debug_check_declarations_on:
       {
-        \cs_set_protected:Npn \__chk_if_exist_var:N ##1
+        \cs_set_protected:Npn \__debug_chk_var_exist:N ##1
           {
             \cs_if_exist:NF ##1
               {
@@ -1726,9 +1738,20 @@
                   { \token_to_str:N ##1 }
               }
           }
+        \cs_set_protected:Npn \__debug_chk_cs_exist:N ##1
+          {
+            \cs_if_exist:NF ##1
+              {
+                \__msg_kernel_error:nnx { kernel } { command-not-defined }
+                  { \token_to_str:N ##1 }
+              }
+          }
       }
     \cs_set_protected:Npn \debug_check_declarations_off:
-      { \cs_set_protected:Npn \__chk_if_exist_var:N ##1 { } }
+      {
+        \cs_set_protected:Npn \__debug_chk_var_exist:N ##1 { }
+        \cs_set_protected:Npn \__debug_chk_cs_exist:N ##1 { }
+      }
     \tex_ifodd:D \l at expl@check at declarations@bool
       \debug_check_declarations_on:
     \else:
@@ -1747,9 +1770,12 @@
           { \token_to_str:N \debug_check_declarations_off: }
       }
   }
+\cs_set_protected:Npn \__debug_chk_cs_exist:c
+  { \exp_args:Nc \__debug_chk_cs_exist:N }
 %    \end{macrocode}
 % \end{macro}
 % \end{macro}
+% \end{macro}
 %
 % \begin{macro}{\debug_log_functions_on:, \debug_log_functions_off:}
 % \begin{macro}[int]{\__debug_log:x, \__debug_suspend_log:, \__debug_resume_log:}
@@ -2340,26 +2366,22 @@
       #5 {#1} {#2} {#3} {#4}
     \__prg_set_eq_conditional_loop:nnnnNw {#1} {#2} {#3} {#4} #5
   }
+\__debug_patch:nnNw
+  { \__debug_chk_cs_exist:c { #5 _p : #6    } } { }
 \cs_set:Npn \__prg_set_eq_conditional_p_form:wNnnnn #1 \q_stop #2#3#4#5#6
-  {
-    \__chk_if_exist_cs:c { #5 _p : #6    }
-    #2 { #3 _p : #4    } { #5 _p : #6    }
-  }
+  { #2 { #3 _p : #4    }    { #5 _p : #6    } }
+\__debug_patch:nnNw
+  { \__debug_chk_cs_exist:c { #5    : #6 TF } } { }
 \cs_set:Npn \__prg_set_eq_conditional_TF_form:wNnnnn #1 \q_stop #2#3#4#5#6
-  {
-    \__chk_if_exist_cs:c { #5    : #6 TF }
-    #2 { #3    : #4 TF } { #5    : #6 TF }
-  }
+  { #2 { #3    : #4 TF }    { #5    : #6 TF } }
+\__debug_patch:nnNw
+  { \__debug_chk_cs_exist:c { #5    : #6 T  } } { }
 \cs_set:Npn \__prg_set_eq_conditional_T_form:wNnnnn #1 \q_stop #2#3#4#5#6
-  {
-    \__chk_if_exist_cs:c { #5    : #6 T  }
-    #2 { #3    : #4 T  } { #5    : #6 T  }
-  }
+  { #2 { #3    : #4 T  }    { #5    : #6 T  } }
+\__debug_patch:nnNw
+  { \__debug_chk_cs_exist:c { #5    : #6  F } } { }
 \cs_set:Npn \__prg_set_eq_conditional_F_form:wNnnnn #1 \q_stop #2#3#4#5#6
-  {
-    \__chk_if_exist_cs:c { #5    : #6  F }
-    #2 { #3    : #4  F } { #5    : #6  F }
-  }
+  { #2 { #3    : #4  F }    { #5    : #6  F } }
 %    \end{macrocode}
 % \end{macro}
 % \end{macro}
@@ -2707,23 +2729,6 @@
 %    \end{macrocode}
 % \end{macro}
 %
-% \begin{macro}[int]{\__chk_if_exist_cs:N, \__chk_if_exist_cs:c}
-%    This function issues an error message when the control sequence
-%    in its argument does not exist.
-%    \begin{macrocode}
-\cs_set_protected:Npn \__chk_if_exist_cs:N #1
-  {
-    \cs_if_exist:NF #1
-      {
-        \__msg_kernel_error:nnx { kernel } { command-not-defined }
-          { \token_to_str:N #1 }
-      }
-  }
-\cs_set_protected:Npn \__chk_if_exist_cs:c
-  { \exp_args:Nc \__chk_if_exist_cs:N }
-%    \end{macrocode}
-% \end{macro}
-%
 % \subsection{Defining new functions}
 %
 % \begin{macro}

Modified: trunk/l3kernel/l3candidates.dtx
===================================================================
--- trunk/l3kernel/l3candidates.dtx	2017-07-16 21:13:19 UTC (rev 7381)
+++ trunk/l3kernel/l3candidates.dtx	2017-07-16 22:04:34 UTC (rev 7382)
@@ -92,9 +92,9 @@
 %   \end{syntax}
 %   Turn on and off within a group the code that checks that all
 %   \pkg{expl3} variables used were previously declared, as done
-%   globally by the \texttt{check-declarations} option.  This can only
-%   be used if \pkg{expl3} is loaded with one of the options
-%   \texttt{check-declarations}, \texttt{log-functions}, or
+%   globally by the \texttt{check-declarations} option.  These functions
+%   can only be used in \LaTeXe{} package mode loaded with one of the
+%   options \texttt{check-declarations}, \texttt{log-functions}, or
 %   \texttt{enable-debug}.
 % \end{function}
 %
@@ -108,7 +108,10 @@
 %   soon-to-be-deprecated commands to produce errors.  This allows
 %   testing code even if it relies on other packages: load all other
 %   packages, call \cs{debug_deprecation_on:}, and load the code that
-%   one is interested in testing.
+%   one is interested in testing.  These functions can only be used in
+%   \LaTeXe{} package mode loaded with one of the options
+%   \texttt{check-declarations}, \texttt{log-functions}, or
+%   \texttt{enable-debug}.
 % \end{function}
 %
 % \begin{function}[added = 2017-07-14]
@@ -119,9 +122,9 @@
 %   \end{syntax}
 %   Turn on and off within a group the code that logs function
 %   definitions, as done globally by the \texttt{log-functions} option.
-%   This can only be used if \pkg{expl3} is loaded with one of the
-%   options \texttt{check-declarations}, \texttt{log-functions}, or
-%   \texttt{enable-debug}.
+%   These functions can only be used in \LaTeXe{} package mode loaded
+%   with one of the options \texttt{check-declarations},
+%   \texttt{log-functions}, or \texttt{enable-debug}.
 % \end{function}
 %
 % \begin{function}[added = 2017-07-04]{\mode_leave_vertical:}
@@ -1466,7 +1469,6 @@
 %   Shifting the corners and poles of a coffin means subtracting the
 %   appropriate values from the $x$- and $y$-components. For
 %   the poles, this means that the direction vector is unchanged.
-%   When debugging wrap expressions in parentheses.
 %    \begin{macrocode}
 \cs_new_protected:Npn \@@_shift_corner:Nnnn #1#2#3#4
   {

Modified: trunk/l3kernel/l3expan.dtx
===================================================================
--- trunk/l3kernel/l3expan.dtx	2017-07-16 21:13:19 UTC (rev 7381)
+++ trunk/l3kernel/l3expan.dtx	2017-07-16 22:04:34 UTC (rev 7382)
@@ -1476,9 +1476,9 @@
 %   iterate through the comma list of variant argument specifiers, which
 %   we first convert to a string: the reason is explained later.
 %    \begin{macrocode}
+\__debug_patch:nnNw { \__debug_chk_cs_exist:N #1 } { }
 \cs_new_protected:Npn \cs_generate_variant:Nn #1#2
   {
-    \__chk_if_exist_cs:N #1
     \@@_generate_variant:N #1
     \exp_after:wN \@@_split_function:NN
     \exp_after:wN #1

Modified: trunk/l3kernel/l3flag.dtx
===================================================================
--- trunk/l3kernel/l3flag.dtx	2017-07-16 21:13:19 UTC (rev 7381)
+++ trunk/l3kernel/l3flag.dtx	2017-07-16 22:04:34 UTC (rev 7382)
@@ -197,7 +197,7 @@
 %   function defined by \cs{flag_new:n}.
 %    \begin{macrocode}
 \__debug_patch:nnNw
-  { \exp_args:Nc \__chk_if_exist_var:N { flag~#1 } } { }
+  { \exp_args:Nc \__debug_chk_var_exist:N { flag~#1 } } { }
 \cs_new_protected:Npn \flag_clear:n #1 { \@@_clear:wn 0 ; {#1} }
 \cs_new_protected:Npn \@@_clear:wn #1 ; #2
   {
@@ -240,7 +240,7 @@
 % \subsection{Expandable flag commands}
 %
 % \begin{macro}[EXP,aux]{\@@_chk_exist:n}
-%   Analogue of \cs{__chk_if_exist_var:N} for flags, and with an
+%   Analogue of \cs{__debug_chk_var_exist:N} for flags, and with an
 %   expandable error.  We need to add checks by hand because flags are
 %   not implemented in terms of other variables.  Not all functions need
 %   to be patched since some are defined in terms of others.

Modified: trunk/l3kernel/l3prg.dtx
===================================================================
--- trunk/l3kernel/l3prg.dtx	2017-07-16 21:13:19 UTC (rev 7381)
+++ trunk/l3kernel/l3prg.dtx	2017-07-16 22:04:34 UTC (rev 7382)
@@ -811,16 +811,16 @@
 %   make sure the boolean exists.  This is needed because booleans are
 %   not based on token lists nor on \TeX{} registers.
 %    \begin{macrocode}
-\__debug_patch:nnNw { \__chk_if_exist_var:N #1 } { }
+\__debug_patch:nnNw { \__debug_chk_var_exist:N #1 } { }
 \cs_new_protected:Npn \bool_set_true:N #1
   { \cs_set_eq:NN #1 \c_true_bool }
-\__debug_patch:nnNw { \__chk_if_exist_var:N #1 } { }
+\__debug_patch:nnNw { \__debug_chk_var_exist:N #1 } { }
 \cs_new_protected:Npn \bool_set_false:N #1
   { \cs_set_eq:NN #1 \c_false_bool }
-\__debug_patch:nnNw { \__chk_if_exist_var:N #1 } { }
+\__debug_patch:nnNw { \__debug_chk_var_exist:N #1 } { }
 \cs_new_protected:Npn \bool_gset_true:N #1
   { \cs_gset_eq:NN #1 \c_true_bool }
-\__debug_patch:nnNw { \__chk_if_exist_var:N #1 } { }
+\__debug_patch:nnNw { \__debug_chk_var_exist:N #1 } { }
 \cs_new_protected:Npn \bool_gset_false:N #1
   { \cs_gset_eq:NN #1 \c_false_bool }
 \cs_generate_variant:Nn \bool_set_true:N   { c }
@@ -855,10 +855,10 @@
 %   argument the meaning \cs{c_true_bool} or \cs{c_false_bool}.
 %   Again, we include some checking code.
 %    \begin{macrocode}
-\__debug_patch:nnNw { \__chk_if_exist_var:N #1 } { }
+\__debug_patch:nnNw { \__debug_chk_var_exist:N #1 } { }
 \cs_new_protected:Npn \bool_set:Nn #1#2
   { \tex_chardef:D #1 = \bool_if_p:n {#2} }
-\__debug_patch:nnNw { \__chk_if_exist_var:N #1 } { }
+\__debug_patch:nnNw { \__debug_chk_var_exist:N #1 } { }
 \cs_new_protected:Npn \bool_gset:Nn #1#2
   { \tex_global:D \tex_chardef:D #1 = \bool_if_p:n {#2} }
 \cs_generate_variant:Nn \bool_set:Nn  { c }

Modified: trunk/l3kernel/l3tl.dtx
===================================================================
--- trunk/l3kernel/l3tl.dtx	2017-07-16 21:13:19 UTC (rev 7381)
+++ trunk/l3kernel/l3tl.dtx	2017-07-16 22:04:34 UTC (rev 7382)
@@ -1160,14 +1160,14 @@
 \tex_ifodd:D \l at expl@enable at debug@bool
   \cs_new_protected:Npn \tl_set_eq:NN #1#2
     {
-      \__chk_if_exist_var:N #1
-      \__chk_if_exist_var:N #2
+      \__debug_chk_var_exist:N #1
+      \__debug_chk_var_exist:N #2
       \cs_set_eq:NN #1 #2
     }
   \cs_new_protected:Npn \tl_gset_eq:NN #1#2
     {
-      \__chk_if_exist_var:N #1
-      \__chk_if_exist_var:N #2
+      \__debug_chk_var_exist:N #1
+      \__debug_chk_var_exist:N #2
       \cs_gset_eq:NN #1 #2
     }
 \else:
@@ -1188,18 +1188,18 @@
 %    \begin{macrocode}
 \__debug_patch:nnNw
   {
-    \__chk_if_exist_var:N #1
-    \__chk_if_exist_var:N #2
-    \__chk_if_exist_var:N #3
+    \__debug_chk_var_exist:N #1
+    \__debug_chk_var_exist:N #2
+    \__debug_chk_var_exist:N #3
   }
   { }
 \cs_new_protected:Npn \tl_concat:NNN #1#2#3
   { \tl_set:Nx #1 { \exp_not:o {#2} \exp_not:o {#3} } }
 \__debug_patch:nnNw
   {
-    \__chk_if_exist_var:N #1
-    \__chk_if_exist_var:N #2
-    \__chk_if_exist_var:N #3
+    \__debug_chk_var_exist:N #1
+    \__debug_chk_var_exist:N #2
+    \__debug_chk_var_exist:N #3
   }
   { }
 \cs_new_protected:Npn \tl_gconcat:NNN #1#2#3
@@ -1255,22 +1255,22 @@
 %   prefixed by a call to \cs{__debug_patch:nnNw} which adds an
 %   existence check to the definition.
 %    \begin{macrocode}
-\__debug_patch:nnNw { \__chk_if_exist_var:N #1 } { }
+\__debug_patch:nnNw { \__debug_chk_var_exist:N #1 } { }
 \cs_new_protected:Npn \tl_set:Nn #1#2
   { \cs_set_nopar:Npx #1 { \exp_not:n {#2} } }
-\__debug_patch:nnNw { \__chk_if_exist_var:N #1 } { }
+\__debug_patch:nnNw { \__debug_chk_var_exist:N #1 } { }
 \cs_new_protected:Npn \tl_set:No #1#2
   { \cs_set_nopar:Npx #1 { \exp_not:o {#2} } }
-\__debug_patch:nnNw { \__chk_if_exist_var:N #1 } { }
+\__debug_patch:nnNw { \__debug_chk_var_exist:N #1 } { }
 \cs_new_protected:Npn \tl_set:Nx #1#2
   { \cs_set_nopar:Npx #1 {#2} }
-\__debug_patch:nnNw { \__chk_if_exist_var:N #1 } { }
+\__debug_patch:nnNw { \__debug_chk_var_exist:N #1 } { }
 \cs_new_protected:Npn \tl_gset:Nn #1#2
   { \cs_gset_nopar:Npx #1 { \exp_not:n {#2} } }
-\__debug_patch:nnNw { \__chk_if_exist_var:N #1 } { }
+\__debug_patch:nnNw { \__debug_chk_var_exist:N #1 } { }
 \cs_new_protected:Npn \tl_gset:No #1#2
   { \cs_gset_nopar:Npx #1 { \exp_not:o {#2} } }
-\__debug_patch:nnNw { \__chk_if_exist_var:N #1 } { }
+\__debug_patch:nnNw { \__debug_chk_var_exist:N #1 } { }
 \cs_new_protected:Npn \tl_gset:Nx #1#2
   { \cs_gset_nopar:Npx #1 {#2} }
 \cs_generate_variant:Nn \tl_set:Nn  {         NV , Nv , Nf }
@@ -1295,28 +1295,28 @@
 %   }
 % Adding to the left is done directly to gain a little performance.
 %    \begin{macrocode}
-\__debug_patch:nnNw { \__chk_if_exist_var:N #1 } { }
+\__debug_patch:nnNw { \__debug_chk_var_exist:N #1 } { }
 \cs_new_protected:Npn \tl_put_left:Nn #1#2
   { \cs_set_nopar:Npx #1 { \exp_not:n {#2} \exp_not:o #1 } }
-\__debug_patch:nnNw { \__chk_if_exist_var:N #1 } { }
+\__debug_patch:nnNw { \__debug_chk_var_exist:N #1 } { }
 \cs_new_protected:Npn \tl_put_left:NV #1#2
   { \cs_set_nopar:Npx #1 { \exp_not:V #2 \exp_not:o #1 } }
-\__debug_patch:nnNw { \__chk_if_exist_var:N #1 } { }
+\__debug_patch:nnNw { \__debug_chk_var_exist:N #1 } { }
 \cs_new_protected:Npn \tl_put_left:No #1#2
   { \cs_set_nopar:Npx #1 { \exp_not:o {#2} \exp_not:o #1 } }
-\__debug_patch:nnNw { \__chk_if_exist_var:N #1 } { }
+\__debug_patch:nnNw { \__debug_chk_var_exist:N #1 } { }
 \cs_new_protected:Npn \tl_put_left:Nx #1#2
   { \cs_set_nopar:Npx #1 { #2 \exp_not:o #1 } }
-\__debug_patch:nnNw { \__chk_if_exist_var:N #1 } { }
+\__debug_patch:nnNw { \__debug_chk_var_exist:N #1 } { }
 \cs_new_protected:Npn \tl_gput_left:Nn #1#2
   { \cs_gset_nopar:Npx #1 { \exp_not:n {#2} \exp_not:o #1 } }
-\__debug_patch:nnNw { \__chk_if_exist_var:N #1 } { }
+\__debug_patch:nnNw { \__debug_chk_var_exist:N #1 } { }
 \cs_new_protected:Npn \tl_gput_left:NV #1#2
   { \cs_gset_nopar:Npx #1 { \exp_not:V #2 \exp_not:o #1 } }
-\__debug_patch:nnNw { \__chk_if_exist_var:N #1 } { }
+\__debug_patch:nnNw { \__debug_chk_var_exist:N #1 } { }
 \cs_new_protected:Npn \tl_gput_left:No #1#2
   { \cs_gset_nopar:Npx #1 { \exp_not:o {#2} \exp_not:o #1 } }
-\__debug_patch:nnNw { \__chk_if_exist_var:N #1 } { }
+\__debug_patch:nnNw { \__debug_chk_var_exist:N #1 } { }
 \cs_new_protected:Npn \tl_gput_left:Nx #1#2
   { \cs_gset_nopar:Npx #1 { #2 \exp_not:o {#1} } }
 \cs_generate_variant:Nn \tl_put_left:Nn  { c }
@@ -1345,28 +1345,28 @@
 %   }
 % The same on the right.
 %    \begin{macrocode}
-\__debug_patch:nnNw { \__chk_if_exist_var:N #1 } { }
+\__debug_patch:nnNw { \__debug_chk_var_exist:N #1 } { }
 \cs_new_protected:Npn \tl_put_right:Nn #1#2
   { \cs_set_nopar:Npx #1 { \exp_not:o #1 \exp_not:n {#2} } }
-\__debug_patch:nnNw { \__chk_if_exist_var:N #1 } { }
+\__debug_patch:nnNw { \__debug_chk_var_exist:N #1 } { }
 \cs_new_protected:Npn \tl_put_right:NV #1#2
   { \cs_set_nopar:Npx #1 { \exp_not:o #1 \exp_not:V #2 } }
-\__debug_patch:nnNw { \__chk_if_exist_var:N #1 } { }
+\__debug_patch:nnNw { \__debug_chk_var_exist:N #1 } { }
 \cs_new_protected:Npn \tl_put_right:No #1#2
   { \cs_set_nopar:Npx #1 { \exp_not:o #1 \exp_not:o {#2} } }
-\__debug_patch:nnNw { \__chk_if_exist_var:N #1 } { }
+\__debug_patch:nnNw { \__debug_chk_var_exist:N #1 } { }
 \cs_new_protected:Npn \tl_put_right:Nx #1#2
   { \cs_set_nopar:Npx #1 { \exp_not:o #1 #2 } }
-\__debug_patch:nnNw { \__chk_if_exist_var:N #1 } { }
+\__debug_patch:nnNw { \__debug_chk_var_exist:N #1 } { }
 \cs_new_protected:Npn \tl_gput_right:Nn #1#2
   { \cs_gset_nopar:Npx #1 { \exp_not:o #1 \exp_not:n {#2} } }
-\__debug_patch:nnNw { \__chk_if_exist_var:N #1 } { }
+\__debug_patch:nnNw { \__debug_chk_var_exist:N #1 } { }
 \cs_new_protected:Npn \tl_gput_right:NV #1#2
   { \cs_gset_nopar:Npx #1 { \exp_not:o #1 \exp_not:V #2 } }
-\__debug_patch:nnNw { \__chk_if_exist_var:N #1 } { }
+\__debug_patch:nnNw { \__debug_chk_var_exist:N #1 } { }
 \cs_new_protected:Npn \tl_gput_right:No #1#2
   { \cs_gset_nopar:Npx #1 { \exp_not:o #1 \exp_not:o {#2} } }
-\__debug_patch:nnNw { \__chk_if_exist_var:N #1 } { }
+\__debug_patch:nnNw { \__debug_chk_var_exist:N #1 } { }
 \cs_new_protected:Npn \tl_gput_right:Nx #1#2
   { \cs_gset_nopar:Npx #1 { \exp_not:o {#1} #2 } }
 \cs_generate_variant:Nn \tl_put_right:Nn  { c }



More information about the latex3-commits mailing list