[latex3-commits] [latex3/latex3] e-type: Switch from x- to e-type in l3seq (f855978e9)
github at latex-project.org
github at latex-project.org
Tue Sep 26 15:07:28 CEST 2023
Repository : https://github.com/latex3/latex3
On branch : e-type
Link : https://github.com/latex3/latex3/commit/f855978e9f929257a02d08900195055a91c7c447
>---------------------------------------------------------------
commit f855978e9f929257a02d08900195055a91c7c447
Author: Joseph Wright <joseph.wright at morningstar2.co.uk>
Date: Tue Sep 26 13:41:57 2023 +0100
Switch from x- to e-type in l3seq
>---------------------------------------------------------------
f855978e9f929257a02d08900195055a91c7c447
l3experimental/xgalley/l3galley.dtx | 2 +-
l3kernel/l3cctab.dtx | 2 +-
l3kernel/l3doc.dtx | 2 +-
l3kernel/l3file.dtx | 4 +-
l3kernel/l3regex.dtx | 2 +-
l3kernel/l3seq.dtx | 166 ++++++++++++++++++------------------
l3kernel/l3sort.dtx | 2 +-
l3kernel/testfiles/m3seq002.lvt | 8 +-
l3trial/l3trace/l3trace.dtx | 2 +-
9 files changed, 97 insertions(+), 93 deletions(-)
diff --git a/l3experimental/xgalley/l3galley.dtx b/l3experimental/xgalley/l3galley.dtx
index 2fc73535b..f9145c344 100644
--- a/l3experimental/xgalley/l3galley.dtx
+++ b/l3experimental/xgalley/l3galley.dtx
@@ -1755,7 +1755,7 @@
{
\seq_gpop_left:NNF #2 \l_@@_tmp_tl
{ \tl_set:Nn \l_@@_tmp_tl { 0pt } }
- \seq_put_right:Nx \l_@@_tmp_seq
+ \seq_put_right:Ne \l_@@_tmp_seq
{ \dim_eval:n { ##1 + \l_@@_tmp_tl } }
}
}
diff --git a/l3kernel/l3cctab.dtx b/l3kernel/l3cctab.dtx
index de0bd27c4..5b989ab4b 100644
--- a/l3kernel/l3cctab.dtx
+++ b/l3kernel/l3cctab.dtx
@@ -637,7 +637,7 @@
% \begin{macrocode}
\cs_new_protected:Npn \@@_chk_group_begin:n #1
{
- \seq_gpush:Nx \g_@@_group_seq
+ \seq_gpush:Ne \g_@@_group_seq
{ \int_use:N \tex_currentgrouplevel:D }
\cs_set_eq:cN { @@_group_ #1 _chk: } \prg_do_nothing:
}
diff --git a/l3kernel/l3doc.dtx b/l3kernel/l3doc.dtx
index 36ff5d44a..9c9bbc37e 100644
--- a/l3kernel/l3doc.dtx
+++ b/l3kernel/l3doc.dtx
@@ -3339,7 +3339,7 @@ and all files in that bundle must be distributed together.
{
\seq_set_filter:NNn \l_@@_tmpa_seq \l_@@_names_seq
{ ! \@@_if_macro_internal_p:n {##1} }
- \seq_gput_right:Nx \g_@@_not_tested_seq
+ \seq_gput_right:Ne \g_@@_not_tested_seq
{
\seq_use:Nn \l_@@_tmpa_seq { , }
\bool_if:NTF \l_@@_macro_pTF_bool {~(pTF)}
diff --git a/l3kernel/l3file.dtx b/l3kernel/l3file.dtx
index bbeef6419..9e4ef57e0 100644
--- a/l3kernel/l3file.dtx
+++ b/l3kernel/l3file.dtx
@@ -2605,7 +2605,7 @@
{
\cs_set:Npn \@@_tmp:w ##1 " ##2 " ##3 \s_@@_stop
{ { } {##2} { } }
- \seq_gput_right:Nx \g_@@_stack_seq
+ \seq_gput_right:Ne \g_@@_stack_seq
{
\exp_after:wN \@@_tmp:w \tex_jobname:D
" \tex_jobname:D " \s_@@_stop
@@ -3512,7 +3512,7 @@
% \begin{macrocode}
\cs_new_protected:Npn \@@_input_push:n #1
{
- \seq_gpush:Nx \g_@@_stack_seq
+ \seq_gpush:Ne \g_@@_stack_seq
{
{ \g_file_curr_dir_str }
{ \g_file_curr_name_str }
diff --git a/l3kernel/l3regex.dtx b/l3kernel/l3regex.dtx
index 3082c28d4..7edea4e62 100644
--- a/l3kernel/l3regex.dtx
+++ b/l3kernel/l3regex.dtx
@@ -4113,7 +4113,7 @@
% second argument in a deeper level of nesting.
% \begin{macrocode}
\cs_new_protected:Npn \@@_show_push:n #1
- { \seq_put_right:Nx \l_@@_show_prefix_seq { #1 ~ } }
+ { \seq_put_right:Ne \l_@@_show_prefix_seq { #1 ~ } }
\cs_new_protected:Npn \@@_show_pop:
{ \seq_pop_right:NN \l_@@_show_prefix_seq \l_@@_internal_a_tl }
\cs_new_protected:Npn \@@_show_scope:nn #1#2
diff --git a/l3kernel/l3seq.dtx b/l3kernel/l3seq.dtx
index 50fceb78e..de354e7a6 100644
--- a/l3kernel/l3seq.dtx
+++ b/l3kernel/l3seq.dtx
@@ -128,10 +128,11 @@
% {
% \seq_set_split:Nnn ,
% \seq_set_split:NVn , \seq_set_split:NnV , \seq_set_split:NVV ,
+% \seq_set_split:Nne , \seq_set_split:Nee ,
% \seq_set_split:Nnx , \seq_set_split:Nxx ,
% \seq_gset_split:Nnn,
% \seq_gset_split:NVn , \seq_gset_split:NnV, \seq_gset_split:NVV,
-% \seq_gset_split:Nnx , \seq_gset_split:Nxx
+% \seq_gset_split:Nne , \seq_gset_split:Nee
% }
% \begin{syntax}
% \cs{seq_set_split:Nnn} \meta{seq~var} \Arg{delimiter} \Arg{token list}
@@ -196,14 +197,14 @@
% \section{Appending data to sequences}
%
% \begin{function}{
-% \seq_put_left:Nn, \seq_put_left:NV, \seq_put_left:Nv,
+% \seq_put_left:Nn, \seq_put_left:NV, \seq_put_left:Nv, \seq_put_left:Ne,
% \seq_put_left:No, \seq_put_left:Nx,
-% \seq_put_left:cn, \seq_put_left:cV, \seq_put_left:cv,
-% \seq_put_left:co, \seq_put_left:cx,
-% \seq_gput_left:Nn, \seq_gput_left:NV, \seq_gput_left:Nv,
+% \seq_put_left:cn, \seq_put_left:cV, \seq_put_left:cv, \seq_put_left:ce,
+% \seq_put_left:co,
+% \seq_gput_left:Nn, \seq_gput_left:NV, \seq_gput_left:Nv, \seq_gput_left:Ne,
% \seq_gput_left:No, \seq_gput_left:Nx,
-% \seq_gput_left:cn, \seq_gput_left:cV, \seq_gput_left:cv,
-% \seq_gput_left:co, \seq_gput_left:cx
+% \seq_gput_left:cn, \seq_gput_left:cV, \seq_gput_left:cv, \seq_gput_left:ce,
+% \seq_gput_left:co
% }
% \begin{syntax}
% \cs{seq_put_left:Nn} \meta{seq~var} \Arg{item}
@@ -212,13 +213,13 @@
% \end{function}
%
% \begin{function}{
-% \seq_put_right:Nn, \seq_put_right:NV, \seq_put_right:Nv,
+% \seq_put_right:Nn, \seq_put_right:NV, \seq_put_right:Nv, \seq_put_right:Ne,
% \seq_put_right:No, \seq_put_right:Nx,
-% \seq_put_right:cn, \seq_put_right:cV, \seq_put_right:cv,
-% \seq_put_right:co, \seq_put_right:cx,
-% \seq_gput_right:Nn, \seq_gput_right:NV, \seq_gput_right:Nv,
+% \seq_put_right:cn, \seq_put_right:cV, \seq_put_right:cv, \seq_put_right:ce,
+% \seq_put_right:co,
+% \seq_gput_right:Nn, \seq_gput_right:NV, \seq_gput_right:Nv, \seq_gput_right:Ne,
% \seq_gput_right:No, \seq_gput_right:Nx,
-% \seq_gput_right:cn, \seq_gput_right:cV, \seq_gput_right:cv,
+% \seq_gput_right:cn, \seq_gput_right:cV, \seq_gput_right:cv, \seq_gput_right:ce,
% \seq_gput_right:co, \seq_gput_right:cx
% }
% \begin{syntax}
@@ -471,10 +472,12 @@
%
% \begin{function}
% {
-% \seq_remove_all:Nn, \seq_remove_all:NV, \seq_remove_all:Nx,
-% \seq_remove_all:cn, \seq_remove_all:cV, \seq_remove_all:cx,
-% \seq_gremove_all:Nn, \seq_gremove_all:NV, \seq_gremove_all:Nx,
-% \seq_gremove_all:cn, \seq_gremove_all:cV, \seq_gremove_all:cx
+% \seq_remove_all:Nn, \seq_remove_all:NV, \seq_remove_all:Ne,
+% \seq_remove_all:cn, \seq_remove_all:cV, \seq_remove_all:ce,
+% \seq_gremove_all:Nn, \seq_gremove_all:NV, \seq_gremove_all:Ne,
+% \seq_gremove_all:Nx,
+% \seq_gremove_all:cn, \seq_gremove_all:cV, \seq_gremove_all:ce,
+% \seq_gremove_all:cx
% }
% \begin{syntax}
% \cs{seq_remove_all:Nn} \meta{seq~var} \Arg{item}
@@ -554,8 +557,10 @@
%
% \begin{function}[TF]
% {
-% \seq_if_in:Nn, \seq_if_in:NV, \seq_if_in:Nv, \seq_if_in:No, \seq_if_in:Nx,
-% \seq_if_in:cn, \seq_if_in:cV, \seq_if_in:cv, \seq_if_in:co, \seq_if_in:cx
+% \seq_if_in:Nn, \seq_if_in:NV, \seq_if_in:Nv, \seq_if_in:Ne,
+% \seq_if_in:No, \seq_if_in:Nx,
+% \seq_if_in:cn, \seq_if_in:cV, \seq_if_in:cv, \seq_if_in:ce,
+% \seq_if_in:co, \seq_if_in:cx
% }
% \begin{syntax}
% \cs{seq_if_in:NnTF} \meta{seq~var} \Arg{item} \Arg{true code} \Arg{false code}
@@ -905,11 +910,13 @@
%
% \begin{function}
% {
-% \seq_push:Nn, \seq_push:NV, \seq_push:Nv, \seq_push:No, \seq_push:Nx,
-% \seq_push:cn, \seq_push:cV, \seq_push:cv, \seq_push:co, \seq_push:cx,
-% \seq_gpush:Nn, \seq_gpush:NV, \seq_gpush:Nv,
+% \seq_push:Nn, \seq_push:NV, \seq_push:Nv, \seq_push:Ne,
+% \seq_push:No,
+% \seq_push:cn, \seq_push:cV, \seq_push:cv, \seq_push:ce,
+% \seq_push:co,
+% \seq_gpush:Nn, \seq_gpush:NV, \seq_gpush:Nv, \seq_gpush:Ne,
% \seq_gpush:No, \seq_gpush:Nx,
-% \seq_gpush:cn, \seq_gpush:cV, \seq_gpush:cv,
+% \seq_gpush:cn, \seq_gpush:cV, \seq_gpush:cv, \seq_gpush:ce,
% \seq_gpush:co, \seq_gpush:cx
% }
% \begin{syntax}
@@ -1083,7 +1090,7 @@
% raised. The definition should always be set globally.
% \end{function}
%
-% \begin{function}{\@@_push_item_def:n, \@@_push_item_def:x}
+% \begin{function}{\@@_push_item_def:n, \@@_push_item_def:e}
% \begin{syntax}
% \cs{@@_push_item_def:n} \Arg{code}
% \end{syntax}
@@ -1278,10 +1285,11 @@
% {
% \seq_set_split:Nnn ,
% \seq_set_split:NVn , \seq_set_split:NnV , \seq_set_split:NVV ,
+% \seq_set_split:Nne , \seq_set_split:Nee ,
% \seq_set_split:Nnx , \seq_set_split:Nxx ,
% \seq_gset_split:Nnn,
% \seq_gset_split:NVn , \seq_gset_split:NnV, \seq_gset_split:NVV,
-% \seq_gset_split:Nnx, \seq_gset_split:Nxx
+% \seq_gset_split:Nne, \seq_gset_split:Nee
% }
% \begin{macro}
% {
@@ -1354,8 +1362,9 @@
}
\cs_new:Npn \@@_set_split:w #1 \@@_set_split_end:
{ \@@_wrap_item:n {#1} }
-\cs_generate_variant:Nn \seq_set_split:Nnn { NV , NnV , NVV , Nnx , Nxx }
-\cs_generate_variant:Nn \seq_gset_split:Nnn { NV , NnV , NVV , Nnx , Nxx }
+\cs_generate_variant:Nn \seq_set_split:Nnn { NV , NnV , NVV , Nne , Nee }
+\cs_generate_variant:Nn \seq_set_split:Nnn { Nnx , Nxx }
+\cs_generate_variant:Nn \seq_gset_split:Nnn { NV , NnV , NVV , Nne , Nee }
\cs_generate_variant:Nn \seq_set_split_keep_spaces:Nnn { NnV }
\cs_generate_variant:Nn \seq_gset_split_keep_spaces:Nnn { NnV }
% \end{macrocode}
@@ -1395,17 +1404,17 @@
% \subsection{Appending data to either end}
%
% \begin{macro}{
-% \seq_put_left:Nn, \seq_put_left:NV, \seq_put_left:Nv,
+% \seq_put_left:Nn, \seq_put_left:NV, \seq_put_left:Nv, \seq_put_left:Ne,
% \seq_put_left:No, \seq_put_left:Nx,
-% \seq_put_left:cn, \seq_put_left:cV, \seq_put_left:cv,
-% \seq_put_left:co, \seq_put_left:cx
+% \seq_put_left:cn, \seq_put_left:cV, \seq_put_left:cv,\seq_put_left:ce,
+% \seq_put_left:co
% }
% \UnitTested
% \begin{macro}{
-% \seq_gput_left:Nn, \seq_gput_left:NV, \seq_gput_left:Nv,
+% \seq_gput_left:Nn, \seq_gput_left:NV, \seq_gput_left:Nv, \seq_gput_left:Ne,
% \seq_gput_left:No, \seq_gput_left:Nx,
-% \seq_gput_left:cn, \seq_gput_left:cV, \seq_gput_left:cv,
-% \seq_gput_left:co, \seq_gput_left:cx
+% \seq_gput_left:cn, \seq_gput_left:cV, \seq_gput_left:cv, \seq_gput_left:ce,
+% \seq_gput_left:co
% }
% \begin{macro}[EXP]{\@@_put_left_aux:w}
% When adding to the left of a sequence, remove \cs{s_@@}. This is
@@ -1429,10 +1438,10 @@
}
}
\cs_new:Npn \@@_put_left_aux:w \s_@@ { \exp_stop_f: }
-\cs_generate_variant:Nn \seq_put_left:Nn { NV , Nv , No , Nx }
-\cs_generate_variant:Nn \seq_put_left:Nn { c , cV , cv , co , cx }
-\cs_generate_variant:Nn \seq_gput_left:Nn { NV , Nv , No , Nx }
-\cs_generate_variant:Nn \seq_gput_left:Nn { c , cV , cv , co , cx }
+\cs_generate_variant:Nn \seq_put_left:Nn { NV , Nv , Ne , No , Nx }
+\cs_generate_variant:Nn \seq_put_left:Nn { c , cV , cv , ce , co }
+\cs_generate_variant:Nn \seq_gput_left:Nn { NV , Nv , Ne , No , Nx }
+\cs_generate_variant:Nn \seq_gput_left:Nn { c , cV , cv , ce , co }
% \end{macrocode}
% \end{macro}
% \end{macro}
@@ -1440,17 +1449,17 @@
%
% \begin{macro}
% {
-% \seq_put_right:Nn, \seq_put_right:NV, \seq_put_right:Nv,
+% \seq_put_right:Nn, \seq_put_right:NV, \seq_put_right:Nv, \seq_put_right:Ne,
% \seq_put_right:No, \seq_put_right:Nx,
-% \seq_put_right:cn, \seq_put_right:cV, \seq_put_right:cv,
-% \seq_put_right:co, \seq_put_right:cx
+% \seq_put_right:cn, \seq_put_right:cV, \seq_put_right:cv, \seq_put_right:cx,
+% \seq_put_right:co
% }
% \UnitTested
% \begin{macro}
% {
-% \seq_gput_right:Nn, \seq_gput_right:NV, \seq_gput_right:Nv,
+% \seq_gput_right:Nn, \seq_gput_right:NV, \seq_gput_right:Nv, \seq_gput_right:Ne,
% \seq_gput_right:No, \seq_gput_right:Nx,
-% \seq_gput_right:cn, \seq_gput_right:cV, \seq_gput_right:cv,
+% \seq_gput_right:cn, \seq_gput_right:cV, \seq_gput_right:cv, \seq_gput_right:ce,
% \seq_gput_right:co, \seq_gput_right:cx
% }
% Since there is no trailing marker, adding an item to the right of a
@@ -1460,10 +1469,10 @@
{ \tl_put_right:Nn #1 { \@@_item:n {#2} } }
\cs_new_protected:Npn \seq_gput_right:Nn #1#2
{ \tl_gput_right:Nn #1 { \@@_item:n {#2} } }
-\cs_generate_variant:Nn \seq_gput_right:Nn { NV , Nv , No , Nx }
-\cs_generate_variant:Nn \seq_gput_right:Nn { c , cV , cv , co , cx }
-\cs_generate_variant:Nn \seq_put_right:Nn { NV , Nv , No , Nx }
-\cs_generate_variant:Nn \seq_put_right:Nn { c , cV , cv , co , cx }
+\cs_generate_variant:Nn \seq_gput_right:Nn { NV , Nv , Ne , No , Nx }
+\cs_generate_variant:Nn \seq_gput_right:Nn { c , cV , cv , ce , co }
+\cs_generate_variant:Nn \seq_put_right:Nn { NV , Nv , Ne , No , Nx }
+\cs_generate_variant:Nn \seq_put_right:Nn { c , cV , cv , ce , co , cx }
% \end{macrocode}
% \end{macro}
% \end{macro}
@@ -1515,14 +1524,16 @@
%
% \begin{macro}
% {
-% \seq_remove_all:Nn, \seq_remove_all:NV, \seq_remove_all:Nx,
-% \seq_remove_all:cn, \seq_remove_all:cV, \seq_remove_all:cx
+% \seq_remove_all:Nn, \seq_remove_all:NV, \seq_remove_all:Ne,
+% \seq_remove_all:cn, \seq_remove_all:cV, \seq_remove_all:ce
% }
% \UnitTested
% \begin{macro}
% {
-% \seq_gremove_all:Nn, \seq_gremove_all:NV, \seq_gremove_all:Nx,
-% \seq_gremove_all:cn, \seq_gremove_all:cV, \seq_gremove_all:cx
+% \seq_gremove_all:Nn, \seq_gremove_all:NV, \seq_gremove_all:Ne,
+% \seq_gremove_all:Nx,
+% \seq_gremove_all:cn, \seq_gremove_all:cV, \seq_gremove_all:ce,
+% \seq_gremove_all:Nx
% }
% \UnitTested
% \begin{macro}{\@@_remove_all_aux:NNn}
@@ -1564,8 +1575,9 @@
#1 #2 {#2}
\@@_pop_item_def:
}
-\cs_generate_variant:Nn \seq_remove_all:Nn { NV , Nx , c , cV , cx }
-\cs_generate_variant:Nn \seq_gremove_all:Nn { NV , Nx , c , cV , cx }
+\cs_generate_variant:Nn \seq_remove_all:Nn { NV , Ne , c , cV , ce }
+\cs_generate_variant:Nn \seq_gremove_all:Nn { NV , Ne , c , cV , ce }
+\cs_generate_variant:Nn \seq_gremove_all:Nn { Nx , cx }
% \end{macrocode}
% \end{macro}
% \end{macro}
@@ -1793,7 +1805,7 @@
\seq_gclear:N \g_@@_internal_seq
\int_step_inline:nn \l_@@_internal_a_int
{
- \seq_gput_right:Nx \g_@@_internal_seq
+ \seq_gput_right:Ne \g_@@_internal_seq
{ \tex_the:D \tex_toks:D ##1 }
}
\group_end:
@@ -1820,8 +1832,10 @@
%
% \begin{macro}[TF]
% {
-% \seq_if_in:Nn, \seq_if_in:NV, \seq_if_in:Nv, \seq_if_in:No, \seq_if_in:Nx,
-% \seq_if_in:cn, \seq_if_in:cV, \seq_if_in:cv, \seq_if_in:co, \seq_if_in:cx
+% \seq_if_in:Nn, \seq_if_in:NV, \seq_if_in:Nv, \seq_if_in:Ne,
+% \seq_if_in:No, \seq_if_in:Nx,
+% \seq_if_in:cn, \seq_if_in:cV, \seq_if_in:cv,\seq_if_in:ce,
+% \seq_if_in:co, \seq_if_in:cx
% }
% \UnitTested
% \begin{macro}{\@@_if_in:}
@@ -1854,7 +1868,7 @@
\cs_new:Npn \@@_if_in:
{ \prg_break:n { \group_end: \prg_return_true: } }
\prg_generate_conditional_variant:Nnn \seq_if_in:Nn
- { NV , Nv , No , Nx , c , cV , cv , co , cx } { T , F , TF }
+ { NV , Nv , Ne , No , Nx , c , cV , cv , ce , co , cx } { T , F , TF }
% \end{macrocode}
% \end{macro}
% \end{macro}
@@ -2174,7 +2188,7 @@
% \end{macro}
% \end{macro}
%
-% \begin{macro}{\@@_push_item_def:n, \@@_push_item_def:x}
+% \begin{macro}{\@@_push_item_def:n, \@@_push_item_def:e}
% \begin{macro}{\@@_push_item_def:}
% \begin{macro}{\@@_pop_item_def:}
% The definition of \cs{@@_item:n} needs to be saved and restored at
@@ -2186,7 +2200,7 @@
\@@_push_item_def:
\cs_gset:Npn \@@_item:n ##1
}
-\cs_new_protected:Npn \@@_push_item_def:x
+\cs_new_protected:Npn \@@_push_item_def:e
{
\@@_push_item_def:
\cs_gset:Npx \@@_item:n ##1
@@ -2269,7 +2283,7 @@
% \begin{macrocode}
\cs_new_protected:Npn \seq_map_variable:NNn #1#2#3
{
- \@@_push_item_def:x
+ \@@_push_item_def:e
{
\tl_set:Nn \exp_not:N #2 {##1}
\exp_not:n {#3}
@@ -2507,37 +2521,27 @@
% The same functions as for sequences, but with the correct naming.
%
% \begin{macro}{
-% \seq_push:Nn, \seq_push:NV, \seq_push:Nv, \seq_push:No, \seq_push:Nx,
-% \seq_push:cn, \seq_push:cV, \seq_push:cV, \seq_push:co, \seq_push:cx
+% \seq_push:Nn, \seq_push:NV, \seq_push:Nv, \seq_push:Ne,
+% \seq_push:No,
+% \seq_push:cn, \seq_push:cV, \seq_push:cv, \seq_push:ce,
+% \seq_push:co
% }
% \UnitTested
% \begin{macro}{
-% \seq_gpush:Nn, \seq_gpush:NV, \seq_gpush:Nv, \seq_gpush:No, \seq_gpush:Nx,
-% \seq_gpush:cn, \seq_gpush:cV, \seq_gpush:cv, \seq_gpush:co, \seq_gpush:cx
+% \seq_gpush:Nn, \seq_gpush:NV, \seq_gpush:Nv, \seq_gpush:Ne,
+% \seq_gpush:No, \seq_gpush:Nx,
+% \seq_gpush:cn, \seq_gpush:cV, \seq_gpush:cv, \seq_gpush:ce,
+% \seq_gpush:co, \seq_gpush:cx
% }
% \UnitTested
% Pushing to a sequence is the same as adding on the left.
% \begin{macrocode}
-\cs_new_eq:NN \seq_push:Nn \seq_put_left:Nn
-\cs_new_eq:NN \seq_push:NV \seq_put_left:NV
-\cs_new_eq:NN \seq_push:Nv \seq_put_left:Nv
-\cs_new_eq:NN \seq_push:No \seq_put_left:No
-\cs_new_eq:NN \seq_push:Nx \seq_put_left:Nx
-\cs_new_eq:NN \seq_push:cn \seq_put_left:cn
-\cs_new_eq:NN \seq_push:cV \seq_put_left:cV
-\cs_new_eq:NN \seq_push:cv \seq_put_left:cv
-\cs_new_eq:NN \seq_push:co \seq_put_left:co
-\cs_new_eq:NN \seq_push:cx \seq_put_left:cx
+\cs_new_eq:NN \seq_push:Nn \seq_put_left:Nn
+\cs_generate_variant:Nn \seq_push:Nn { NV , Nv , Ne , c , cV , cv , ce }
+\cs_generate_variant:Nn \seq_push:Nn { No , co }
\cs_new_eq:NN \seq_gpush:Nn \seq_gput_left:Nn
-\cs_new_eq:NN \seq_gpush:NV \seq_gput_left:NV
-\cs_new_eq:NN \seq_gpush:Nv \seq_gput_left:Nv
-\cs_new_eq:NN \seq_gpush:No \seq_gput_left:No
-\cs_new_eq:NN \seq_gpush:Nx \seq_gput_left:Nx
-\cs_new_eq:NN \seq_gpush:cn \seq_gput_left:cn
-\cs_new_eq:NN \seq_gpush:cV \seq_gput_left:cV
-\cs_new_eq:NN \seq_gpush:cv \seq_gput_left:cv
-\cs_new_eq:NN \seq_gpush:co \seq_gput_left:co
-\cs_new_eq:NN \seq_gpush:cx \seq_gput_left:cx
+\cs_generate_variant:Nn \seq_gpush:Nn { NV , Nv , Ne , c , cV , cv , ce }
+\cs_generate_variant:Nn \seq_gpush:Nn { No , Nx , co , cx }
% \end{macrocode}
% \end{macro}
% \end{macro}
diff --git a/l3kernel/l3sort.dtx b/l3kernel/l3sort.dtx
index 38b8cbb14..3032b7d5d 100644
--- a/l3kernel/l3sort.dtx
+++ b/l3kernel/l3sort.dtx
@@ -432,7 +432,7 @@
\int_step_inline:nnn
\l_@@_min_int { \l_@@_top_int - 1 }
{
- \seq_gput_right:Nx \g_@@_internal_seq
+ \seq_gput_right:Ne \g_@@_internal_seq
{ \tex_the:D \tex_toks:D ##1 }
}
\group_end:
diff --git a/l3kernel/testfiles/m3seq002.lvt b/l3kernel/testfiles/m3seq002.lvt
index 42b323b16..1896aced3 100644
--- a/l3kernel/testfiles/m3seq002.lvt
+++ b/l3kernel/testfiles/m3seq002.lvt
@@ -133,7 +133,7 @@
\tl_set:Nn \l_tmpc_tl { FULL~EXPANSION }
\seq_put_left:Nn \l_tmpa_seq { \ERROR A \par }
\seq_put_left:No \l_tmpa_seq { \l_tmpa_tl \par }
- \seq_put_left:Nx \l_tmpa_seq { \l_tmpa_tl \par }
+ \seq_put_left:Ne \l_tmpa_seq { \l_tmpa_tl \par }
\seq_put_left:cn {l_tmpa_seq} { \ERROR B \par }
\seq_put_left:co {l_tmpa_seq} { \l_tmpb_tl \par }
\seq_log:N \l_tmpa_seq
@@ -146,7 +146,7 @@
\tl_set:Nn \l_tmpc_tl { FULL~EXPANSION }
\seq_put_right:Nn \l_tmpa_seq { \ERROR A \par }
\seq_put_right:No \l_tmpa_seq { \l_tmpa_tl \par }
- \seq_put_right:Nx \l_tmpa_seq { \l_tmpa_tl \par }
+ \seq_put_right:Ne \l_tmpa_seq { \l_tmpa_tl \par }
\seq_put_right:cn {l_tmpa_seq} { \ERROR B \par }
\seq_put_right:co {l_tmpa_seq} { \l_tmpb_tl \par }
\seq_log:N \l_tmpa_seq
@@ -160,7 +160,7 @@
{
\seq_gput_left:Nn \g_b_seq { \ERROR A \par }
\seq_gput_left:No \g_b_seq { \l_tmpa_tl \par }
- \seq_gput_left:Nx \g_b_seq { \l_tmpa_tl \par }
+ \seq_gput_left:Ne \g_b_seq { \l_tmpa_tl \par }
\seq_gput_left:cn {g_b_seq} { \ERROR B \par }
\seq_gput_left:co {g_b_seq} { \l_tmpb_tl \par }
}
@@ -175,7 +175,7 @@
{
\seq_gput_right:Nn \g_b_seq { \ERROR A \par }
\seq_gput_right:No \g_b_seq { \l_tmpa_tl \par }
- \seq_gput_right:Nx \g_b_seq { \l_tmpa_tl \par }
+ \seq_gput_right:Ne \g_b_seq { \l_tmpa_tl \par }
\seq_gput_right:cn {g_b_seq} { \ERROR B \par }
\seq_gput_right:co {g_b_seq} { \l_tmpb_tl \par }
}
diff --git a/l3trial/l3trace/l3trace.dtx b/l3trial/l3trace/l3trace.dtx
index 03bf96b19..639168b64 100644
--- a/l3trial/l3trace/l3trace.dtx
+++ b/l3trial/l3trace/l3trace.dtx
@@ -177,7 +177,7 @@
{ \int_use:c { g_trace_ \tl_to_str:n {#1} _level_int } }
{
\trace_display:x { entering~#3 }
- \seq_gput_right:Nx \g_trace_nesting_seq { \tl_to_str:n {#1} }
+ \seq_gput_right:Ne \g_trace_nesting_seq { \tl_to_str:n {#1} }
}
}
}
More information about the latex3-commits
mailing list.