[latex3-commits] [l3svn] r7365 - Make sure variants of \tl_set_eq:NN obey check-declarations

[noreply at latex-project.org]

Author: bruno
Date: 2017-07-15 04:31:42 +0200 (Sat, 15 Jul 2017)
New Revision: 7365

Modified:
   trunk/l3kernel/l3keys.dtx
   trunk/l3kernel/l3prg.dtx
   trunk/l3kernel/l3tl.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/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
Log:
Make sure variants of \tl_set_eq:NN obey check-declarations

The Nc, cN, cc variants of \tl_set_eq:NN were direct copies of \cs_set_eq:NN
variants, so they didn't pick up the declarations' checking.  Now fixed, but
I had to use the lower-level \cs_set_eq:NN in one place in l3keys.


Modified: trunk/l3kernel/l3keys.dtx
===================================================================
--- trunk/l3kernel/l3keys.dtx	2017-07-15 02:23:14 UTC (rev 7364)
+++ trunk/l3kernel/l3keys.dtx	2017-07-15 02:31:42 UTC (rev 7365)
@@ -1549,7 +1549,8 @@
 %   Assigning a key to one or more groups uses comma lists. As the list of
 %   groups only exists if there is anything to do, the setting is done using
 %   a scratch list. For the usual grouping reasons we use the low-level
-%   approach to undefining a list.
+%   approach to undefining a list.  We also use the low-level approach for
+%   the other case to avoid tripping up the |check-declarations| code.
 %    \begin{macrocode}
 \cs_new_protected:Npn \@@_groups_set:n #1
   {
@@ -1560,7 +1561,7 @@
           \tex_undefined:D
       }
       {
-        \clist_set_eq:cN { \c_@@_groups_root_tl \l_keys_path_tl }
+        \cs_set_eq:cN { \c_@@_groups_root_tl \l_keys_path_tl }
           \l_@@_groups_clist
       }
   }

Modified: trunk/l3kernel/l3prg.dtx
===================================================================
--- trunk/l3kernel/l3prg.dtx	2017-07-15 02:23:14 UTC (rev 7364)
+++ trunk/l3kernel/l3prg.dtx	2017-07-15 02:31:42 UTC (rev 7365)
@@ -840,13 +840,9 @@
 %   because that has the correct checking code.
 %    \begin{macrocode}
 \cs_new_eq:NN \bool_set_eq:NN  \tl_set_eq:NN
-\cs_new_eq:NN \bool_set_eq:Nc  \tl_set_eq:Nc
-\cs_new_eq:NN \bool_set_eq:cN  \tl_set_eq:cN
-\cs_new_eq:NN \bool_set_eq:cc  \tl_set_eq:cc
 \cs_new_eq:NN \bool_gset_eq:NN \tl_gset_eq:NN
-\cs_new_eq:NN \bool_gset_eq:Nc \tl_gset_eq:Nc
-\cs_new_eq:NN \bool_gset_eq:cN \tl_gset_eq:cN
-\cs_new_eq:NN \bool_gset_eq:cc \tl_gset_eq:cc
+\cs_generate_variant:Nn \bool_set_eq:NN { Nc, cN, cc }
+\cs_generate_variant:Nn \bool_gset_eq:NN { Nc, cN, cc }
 %    \end{macrocode}
 % \end{macro}
 %

Modified: trunk/l3kernel/l3tl.dtx
===================================================================
--- trunk/l3kernel/l3tl.dtx	2017-07-15 02:23:14 UTC (rev 7364)
+++ trunk/l3kernel/l3tl.dtx	2017-07-15 02:31:42 UTC (rev 7365)
@@ -1157,28 +1157,25 @@
 %   For setting token list variables equal to each other.  When checking
 %   is turned on, make sure both variables exist.
 %    \begin{macrocode}
-\cs_new_eq:NN \tl_set_eq:NN  \cs_set_eq:NN
-\cs_new_eq:NN \tl_set_eq:cN  \cs_set_eq:cN
-\cs_new_eq:NN \tl_set_eq:Nc  \cs_set_eq:Nc
-\cs_new_eq:NN \tl_set_eq:cc  \cs_set_eq:cc
-\cs_new_eq:NN \tl_gset_eq:NN \cs_gset_eq:NN
-\cs_new_eq:NN \tl_gset_eq:cN \cs_gset_eq:cN
-\cs_new_eq:NN \tl_gset_eq:Nc \cs_gset_eq:Nc
-\cs_new_eq:NN \tl_gset_eq:cc \cs_gset_eq:cc
 \tex_ifodd:D \l at expl@debug at bool
-  \cs_set_protected:Npn \tl_set_eq:NN #1#2
+  \cs_new_protected:Npn \tl_set_eq:NN #1#2
     {
       \__chk_if_exist_var:N #1
       \__chk_if_exist_var:N #2
       \cs_set_eq:NN #1 #2
     }
-  \cs_set_protected:Npn \tl_gset_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
       \cs_gset_eq:NN #1 #2
     }
+\else:
+  \cs_new_eq:NN \tl_set_eq:NN  \cs_set_eq:NN
+  \cs_new_eq:NN \tl_gset_eq:NN \cs_gset_eq:NN
 \fi:
+\cs_generate_variant:Nn \tl_set_eq:NN { cN, Nc, cc }
+\cs_generate_variant:Nn \tl_gset_eq:NN { cN, Nc, cc }
 %    \end{macrocode}
 % \end{macro}
 % \end{macro}

Modified: trunk/l3kernel/testfiles/m3expl001.luatex.tlg
===================================================================
--- trunk/l3kernel/testfiles/m3expl001.luatex.tlg	2017-07-15 02:23:14 UTC (rev 7364)
+++ trunk/l3kernel/testfiles/m3expl001.luatex.tlg	2017-07-15 02:31:42 UTC (rev 7365)
@@ -255,10 +255,10 @@
 Defining \tl_clear_new:c on line ...
 Defining \tl_gclear_new:c on line ...
 Defining \tl_set_eq:NN on line ...
+Defining \tl_gset_eq:NN on line ...
 Defining \tl_set_eq:cN on line ...
 Defining \tl_set_eq:Nc on line ...
 Defining \tl_set_eq:cc on line ...
-Defining \tl_gset_eq:NN on line ...
 Defining \tl_gset_eq:cN on line ...
 Defining \tl_gset_eq:Nc on line ...
 Defining \tl_gset_eq:cc on line ...
@@ -1761,10 +1761,10 @@
 Defining \bool_gset_true:c on line ...
 Defining \bool_gset_false:c on line ...
 Defining \bool_set_eq:NN on line ...
+Defining \bool_gset_eq:NN on line ...
 Defining \bool_set_eq:Nc on line ...
 Defining \bool_set_eq:cN on line ...
 Defining \bool_set_eq:cc on line ...
-Defining \bool_gset_eq:NN on line ...
 Defining \bool_gset_eq:Nc on line ...
 Defining \bool_gset_eq:cN on line ...
 Defining \bool_gset_eq:cc on line ...

Modified: trunk/l3kernel/testfiles/m3expl001.ptex.tlg
===================================================================
--- trunk/l3kernel/testfiles/m3expl001.ptex.tlg	2017-07-15 02:23:14 UTC (rev 7364)
+++ trunk/l3kernel/testfiles/m3expl001.ptex.tlg	2017-07-15 02:31:42 UTC (rev 7365)
@@ -254,10 +254,10 @@
 Defining \tl_clear_new:c on line ...
 Defining \tl_gclear_new:c on line ...
 Defining \tl_set_eq:NN on line ...
+Defining \tl_gset_eq:NN on line ...
 Defining \tl_set_eq:cN on line ...
 Defining \tl_set_eq:Nc on line ...
 Defining \tl_set_eq:cc on line ...
-Defining \tl_gset_eq:NN on line ...
 Defining \tl_gset_eq:cN on line ...
 Defining \tl_gset_eq:Nc on line ...
 Defining \tl_gset_eq:cc on line ...
@@ -1493,10 +1493,10 @@
 Defining \bool_gset_true:c on line ...
 Defining \bool_gset_false:c on line ...
 Defining \bool_set_eq:NN on line ...
+Defining \bool_gset_eq:NN on line ...
 Defining \bool_set_eq:Nc on line ...
 Defining \bool_set_eq:cN on line ...
 Defining \bool_set_eq:cc on line ...
-Defining \bool_gset_eq:NN on line ...
 Defining \bool_gset_eq:Nc on line ...
 Defining \bool_gset_eq:cN on line ...
 Defining \bool_gset_eq:cc on line ...

Modified: trunk/l3kernel/testfiles/m3expl001.tlg
===================================================================
--- trunk/l3kernel/testfiles/m3expl001.tlg	2017-07-15 02:23:14 UTC (rev 7364)
+++ trunk/l3kernel/testfiles/m3expl001.tlg	2017-07-15 02:31:42 UTC (rev 7365)
@@ -254,10 +254,10 @@
 Defining \tl_clear_new:c on line ...
 Defining \tl_gclear_new:c on line ...
 Defining \tl_set_eq:NN on line ...
+Defining \tl_gset_eq:NN on line ...
 Defining \tl_set_eq:cN on line ...
 Defining \tl_set_eq:Nc on line ...
 Defining \tl_set_eq:cc on line ...
-Defining \tl_gset_eq:NN on line ...
 Defining \tl_gset_eq:cN on line ...
 Defining \tl_gset_eq:Nc on line ...
 Defining \tl_gset_eq:cc on line ...
@@ -1493,10 +1493,10 @@
 Defining \bool_gset_true:c on line ...
 Defining \bool_gset_false:c on line ...
 Defining \bool_set_eq:NN on line ...
+Defining \bool_gset_eq:NN on line ...
 Defining \bool_set_eq:Nc on line ...
 Defining \bool_set_eq:cN on line ...
 Defining \bool_set_eq:cc on line ...
-Defining \bool_gset_eq:NN on line ...
 Defining \bool_gset_eq:Nc on line ...
 Defining \bool_gset_eq:cN on line ...
 Defining \bool_gset_eq:cc on line ...

Modified: trunk/l3kernel/testfiles/m3expl001.uptex.tlg
===================================================================
--- trunk/l3kernel/testfiles/m3expl001.uptex.tlg	2017-07-15 02:23:14 UTC (rev 7364)
+++ trunk/l3kernel/testfiles/m3expl001.uptex.tlg	2017-07-15 02:31:42 UTC (rev 7365)
@@ -254,10 +254,10 @@
 Defining \tl_clear_new:c on line ...
 Defining \tl_gclear_new:c on line ...
 Defining \tl_set_eq:NN on line ...
+Defining \tl_gset_eq:NN on line ...
 Defining \tl_set_eq:cN on line ...
 Defining \tl_set_eq:Nc on line ...
 Defining \tl_set_eq:cc on line ...
-Defining \tl_gset_eq:NN on line ...
 Defining \tl_gset_eq:cN on line ...
 Defining \tl_gset_eq:Nc on line ...
 Defining \tl_gset_eq:cc on line ...
@@ -1493,10 +1493,10 @@
 Defining \bool_gset_true:c on line ...
 Defining \bool_gset_false:c on line ...
 Defining \bool_set_eq:NN on line ...
+Defining \bool_gset_eq:NN on line ...
 Defining \bool_set_eq:Nc on line ...
 Defining \bool_set_eq:cN on line ...
 Defining \bool_set_eq:cc on line ...
-Defining \bool_gset_eq:NN on line ...
 Defining \bool_gset_eq:Nc on line ...
 Defining \bool_gset_eq:cN on line ...
 Defining \bool_gset_eq:cc on line ...

Modified: trunk/l3kernel/testfiles/m3expl001.xetex.tlg
===================================================================
--- trunk/l3kernel/testfiles/m3expl001.xetex.tlg	2017-07-15 02:23:14 UTC (rev 7364)
+++ trunk/l3kernel/testfiles/m3expl001.xetex.tlg	2017-07-15 02:31:42 UTC (rev 7365)
@@ -254,10 +254,10 @@
 Defining \tl_clear_new:c on line ...
 Defining \tl_gclear_new:c on line ...
 Defining \tl_set_eq:NN on line ...
+Defining \tl_gset_eq:NN on line ...
 Defining \tl_set_eq:cN on line ...
 Defining \tl_set_eq:Nc on line ...
 Defining \tl_set_eq:cc on line ...
-Defining \tl_gset_eq:NN on line ...
 Defining \tl_gset_eq:cN on line ...
 Defining \tl_gset_eq:Nc on line ...
 Defining \tl_gset_eq:cc on line ...
@@ -1759,10 +1759,10 @@
 Defining \bool_gset_true:c on line ...
 Defining \bool_gset_false:c on line ...
 Defining \bool_set_eq:NN on line ...
+Defining \bool_gset_eq:NN on line ...
 Defining \bool_set_eq:Nc on line ...
 Defining \bool_set_eq:cN on line ...
 Defining \bool_set_eq:cc on line ...
-Defining \bool_gset_eq:NN on line ...
 Defining \bool_gset_eq:Nc on line ...
 Defining \bool_gset_eq:cN on line ...
 Defining \bool_gset_eq:cc on line ...

Modified: trunk/l3kernel/testfiles/m3expl003.luatex.tlg
===================================================================
--- trunk/l3kernel/testfiles/m3expl003.luatex.tlg	2017-07-15 02:23:14 UTC (rev 7364)
+++ trunk/l3kernel/testfiles/m3expl003.luatex.tlg	2017-07-15 02:31:42 UTC (rev 7365)
@@ -255,10 +255,10 @@
 Defining \tl_clear_new:c on line ...
 Defining \tl_gclear_new:c on line ...
 Defining \tl_set_eq:NN on line ...
+Defining \tl_gset_eq:NN on line ...
 Defining \tl_set_eq:cN on line ...
 Defining \tl_set_eq:Nc on line ...
 Defining \tl_set_eq:cc on line ...
-Defining \tl_gset_eq:NN on line ...
 Defining \tl_gset_eq:cN on line ...
 Defining \tl_gset_eq:Nc on line ...
 Defining \tl_gset_eq:cc on line ...
@@ -1761,10 +1761,10 @@
 Defining \bool_gset_true:c on line ...
 Defining \bool_gset_false:c on line ...
 Defining \bool_set_eq:NN on line ...
+Defining \bool_gset_eq:NN on line ...
 Defining \bool_set_eq:Nc on line ...
 Defining \bool_set_eq:cN on line ...
 Defining \bool_set_eq:cc on line ...
-Defining \bool_gset_eq:NN on line ...
 Defining \bool_gset_eq:Nc on line ...
 Defining \bool_gset_eq:cN on line ...
 Defining \bool_gset_eq:cc on line ...

Modified: trunk/l3kernel/testfiles/m3expl003.ptex.tlg
===================================================================
--- trunk/l3kernel/testfiles/m3expl003.ptex.tlg	2017-07-15 02:23:14 UTC (rev 7364)
+++ trunk/l3kernel/testfiles/m3expl003.ptex.tlg	2017-07-15 02:31:42 UTC (rev 7365)
@@ -254,10 +254,10 @@
 Defining \tl_clear_new:c on line ...
 Defining \tl_gclear_new:c on line ...
 Defining \tl_set_eq:NN on line ...
+Defining \tl_gset_eq:NN on line ...
 Defining \tl_set_eq:cN on line ...
 Defining \tl_set_eq:Nc on line ...
 Defining \tl_set_eq:cc on line ...
-Defining \tl_gset_eq:NN on line ...
 Defining \tl_gset_eq:cN on line ...
 Defining \tl_gset_eq:Nc on line ...
 Defining \tl_gset_eq:cc on line ...
@@ -1493,10 +1493,10 @@
 Defining \bool_gset_true:c on line ...
 Defining \bool_gset_false:c on line ...
 Defining \bool_set_eq:NN on line ...
+Defining \bool_gset_eq:NN on line ...
 Defining \bool_set_eq:Nc on line ...
 Defining \bool_set_eq:cN on line ...
 Defining \bool_set_eq:cc on line ...
-Defining \bool_gset_eq:NN on line ...
 Defining \bool_gset_eq:Nc on line ...
 Defining \bool_gset_eq:cN on line ...
 Defining \bool_gset_eq:cc on line ...

Modified: trunk/l3kernel/testfiles/m3expl003.tlg
===================================================================
--- trunk/l3kernel/testfiles/m3expl003.tlg	2017-07-15 02:23:14 UTC (rev 7364)
+++ trunk/l3kernel/testfiles/m3expl003.tlg	2017-07-15 02:31:42 UTC (rev 7365)
@@ -254,10 +254,10 @@
 Defining \tl_clear_new:c on line ...
 Defining \tl_gclear_new:c on line ...
 Defining \tl_set_eq:NN on line ...
+Defining \tl_gset_eq:NN on line ...
 Defining \tl_set_eq:cN on line ...
 Defining \tl_set_eq:Nc on line ...
 Defining \tl_set_eq:cc on line ...
-Defining \tl_gset_eq:NN on line ...
 Defining \tl_gset_eq:cN on line ...
 Defining \tl_gset_eq:Nc on line ...
 Defining \tl_gset_eq:cc on line ...
@@ -1493,10 +1493,10 @@
 Defining \bool_gset_true:c on line ...
 Defining \bool_gset_false:c on line ...
 Defining \bool_set_eq:NN on line ...
+Defining \bool_gset_eq:NN on line ...
 Defining \bool_set_eq:Nc on line ...
 Defining \bool_set_eq:cN on line ...
 Defining \bool_set_eq:cc on line ...
-Defining \bool_gset_eq:NN on line ...
 Defining \bool_gset_eq:Nc on line ...
 Defining \bool_gset_eq:cN on line ...
 Defining \bool_gset_eq:cc on line ...

Modified: trunk/l3kernel/testfiles/m3expl003.uptex.tlg
===================================================================
--- trunk/l3kernel/testfiles/m3expl003.uptex.tlg	2017-07-15 02:23:14 UTC (rev 7364)
+++ trunk/l3kernel/testfiles/m3expl003.uptex.tlg	2017-07-15 02:31:42 UTC (rev 7365)
@@ -254,10 +254,10 @@
 Defining \tl_clear_new:c on line ...
 Defining \tl_gclear_new:c on line ...
 Defining \tl_set_eq:NN on line ...
+Defining \tl_gset_eq:NN on line ...
 Defining \tl_set_eq:cN on line ...
 Defining \tl_set_eq:Nc on line ...
 Defining \tl_set_eq:cc on line ...
-Defining \tl_gset_eq:NN on line ...
 Defining \tl_gset_eq:cN on line ...
 Defining \tl_gset_eq:Nc on line ...
 Defining \tl_gset_eq:cc on line ...
@@ -1493,10 +1493,10 @@
 Defining \bool_gset_true:c on line ...
 Defining \bool_gset_false:c on line ...
 Defining \bool_set_eq:NN on line ...
+Defining \bool_gset_eq:NN on line ...
 Defining \bool_set_eq:Nc on line ...
 Defining \bool_set_eq:cN on line ...
 Defining \bool_set_eq:cc on line ...
-Defining \bool_gset_eq:NN on line ...
 Defining \bool_gset_eq:Nc on line ...
 Defining \bool_gset_eq:cN on line ...
 Defining \bool_gset_eq:cc on line ...

Modified: trunk/l3kernel/testfiles/m3expl003.xetex.tlg
===================================================================
--- trunk/l3kernel/testfiles/m3expl003.xetex.tlg	2017-07-15 02:23:14 UTC (rev 7364)
+++ trunk/l3kernel/testfiles/m3expl003.xetex.tlg	2017-07-15 02:31:42 UTC (rev 7365)
@@ -254,10 +254,10 @@
 Defining \tl_clear_new:c on line ...
 Defining \tl_gclear_new:c on line ...
 Defining \tl_set_eq:NN on line ...
+Defining \tl_gset_eq:NN on line ...
 Defining \tl_set_eq:cN on line ...
 Defining \tl_set_eq:Nc on line ...
 Defining \tl_set_eq:cc on line ...
-Defining \tl_gset_eq:NN on line ...
 Defining \tl_gset_eq:cN on line ...
 Defining \tl_gset_eq:Nc on line ...
 Defining \tl_gset_eq:cc on line ...
@@ -1759,10 +1759,10 @@
 Defining \bool_gset_true:c on line ...
 Defining \bool_gset_false:c on line ...
 Defining \bool_set_eq:NN on line ...
+Defining \bool_gset_eq:NN on line ...
 Defining \bool_set_eq:Nc on line ...
 Defining \bool_set_eq:cN on line ...
 Defining \bool_set_eq:cc on line ...
-Defining \bool_gset_eq:NN on line ...
 Defining \bool_gset_eq:Nc on line ...
 Defining \bool_gset_eq:cN on line ...
 Defining \bool_gset_eq:cc on line ...