[latex3-commits] [latex3/latex3] e-type: Switch from x- to e-type in l3cctab (d328e8dbd)

[github at latex-project.org]

Repository : https://github.com/latex3/latex3
On branch  : e-type
Link       : https://github.com/latex3/latex3/commit/d328e8dbdcab091aa8a3c1cd062b80033d664fa9

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

commit d328e8dbdcab091aa8a3c1cd062b80033d664fa9
Author: Joseph Wright <joseph.wright at morningstar2.co.uk>
Date:   Tue Sep 26 07:05:27 2023 +0100

    Switch from x- to e-type in l3cctab


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

d328e8dbdcab091aa8a3c1cd062b80033d664fa9
 l3kernel/l3cctab.dtx              | 12 +++++++-----
 l3kernel/testfiles/m3cctab001.lvt |  4 ++--
 2 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/l3kernel/l3cctab.dtx b/l3kernel/l3cctab.dtx
index fc9cdd9e9..397afcf37 100644
--- a/l3kernel/l3cctab.dtx
+++ b/l3kernel/l3cctab.dtx
@@ -543,7 +543,7 @@
       {
         \seq_gpop:NNF \g_@@_unused_seq \l_@@_internal_a_tl
           { \@@_begin_aux: }
-        \exp_args:Nx \@@_chk_group_begin:n
+        \@@_chk_group_begin:e
           { \@@_nesting_number:N \l_@@_internal_a_tl }
         \seq_gpush:NV \g_@@_stack_seq \l_@@_internal_a_tl
         \exp_args:NV \@@_gset:n \l_@@_internal_a_tl
@@ -566,7 +566,7 @@
     \seq_gpop:NNTF \g_@@_stack_seq \l_@@_internal_a_tl
       {
         \seq_gpush:NV \g_@@_unused_seq \l_@@_internal_a_tl
-        \exp_args:Nx \@@_chk_group_end:n
+        \exp_args:Ne \@@_chk_group_end:n
           { \@@_nesting_number:N \l_@@_internal_a_tl }
         \@@_select:N \l_@@_internal_a_tl
       }
@@ -575,7 +575,8 @@
 %    \end{macrocode}
 % \end{macro}
 %
-% \begin{macro}{\@@_chk_group_begin:n,\@@_chk_group_end:n}
+% \begin{macro}
+%   {\@@_chk_group_begin:n,\@@_chk_group_begin:e, \@@_chk_group_end:n}
 %   Catcode tables are not allowed to be intermixed with groups, so here
 %   we check that they are properly nested regarding \TeX{} groups.
 %   \cs{@@_chk_group_begin:n} stores the current group level in a stack,
@@ -640,6 +641,7 @@
       { \int_use:N \tex_currentgrouplevel:D }
     \cs_set_eq:cN { @@_group_ #1 _chk: } \prg_do_nothing:
   }
+\cs_generate_variant:Nn \@@_chk_group_begin:n { e }
 \cs_new_protected:Npn \@@_chk_group_end:n #1
   {
     \seq_gpop:NN \g_@@_group_seq \l_@@_internal_b_tl
@@ -675,10 +677,10 @@
         \exp_after:wN \exp_after:wN \exp_after:wN \@@_nesting_number:w
           \exp_after:wN \token_to_str:N #1
       }
-    \use:x
+    \use:e
       {
         \cs_new:Npn \exp_not:N \@@_nesting_number:w
-          ##1 \tl_to_str:n { g_@@_ } ##2 \tl_to_str:n { _cctab } {##2}
+          #1 \tl_to_str:n { g_@@_ } #2 \tl_to_str:n { _cctab } {#2}
       }
   }
 %    \end{macrocode}
diff --git a/l3kernel/testfiles/m3cctab001.lvt b/l3kernel/testfiles/m3cctab001.lvt
index 2c1831a33..a4ef8cede 100644
--- a/l3kernel/testfiles/m3cctab001.lvt
+++ b/l3kernel/testfiles/m3cctab001.lvt
@@ -199,13 +199,13 @@
     \tl_set_rescan:Nnn \l_tmpa_tl
       { \cctab_select:N \c_str_cctab }
       { abc~def $ $ ^ & _ { } }
-    \use:x { \tl_if_eq:nnTF { \tl_to_str:N \l_tmpa_tl } { \l_tmpa_tl } }
+    \use:e { \tl_if_eq:nnTF { \tl_to_str:N \l_tmpa_tl } { \l_tmpa_tl } }
       { \TRUE } { \ERROR }
     \tl_set_rescan:Nnn \l_tmpb_tl
       { \cctab_select:N \c_other_cctab }
       { abc~def $ $ ^ & _ { } }
     \tl_if_eq:NNTF \l_tmpa_tl \l_tmpb_tl { \ERROR } { \FALSE }
-    \use:x { \tl_replace_all:Nnn \exp_not:N \l_tmpa_tl { ~ } { \c_catcode_other_space_tl } }
+    \use:e { \tl_replace_all:Nnn \exp_not:N \l_tmpa_tl { ~ } { \c_catcode_other_space_tl } }
     \tl_if_eq:NNTF \l_tmpa_tl \l_tmpb_tl { \TRUE } { \ERROR }
   }