[latex3-commits] [git/LaTeX3-latex3-latex3] seq_indexed_map: Rename \seq_indexed_map_... to \seq_map_indexed_... (8d2c9b4ba)
PhelypeOleinik
tex.phelype at gmail.com
Thu Jun 18 13:13:40 CEST 2020
Repository : https://github.com/latex3/latex3
On branch : seq_indexed_map
Link : https://github.com/latex3/latex3/commit/8d2c9b4babe85399640483d1d8ebfba3c80a5ed1
>---------------------------------------------------------------
commit 8d2c9b4babe85399640483d1d8ebfba3c80a5ed1
Author: PhelypeOleinik <tex.phelype at gmail.com>
Date: Thu Jun 18 08:13:40 2020 -0300
Rename \seq_indexed_map_... to \seq_map_indexed_...
>---------------------------------------------------------------
8d2c9b4babe85399640483d1d8ebfba3c80a5ed1
l3kernel/CHANGELOG.md | 2 +-
l3kernel/l3seq.dtx | 30 +++++++++++++++---------------
l3kernel/testfiles/m3seq008.lvt | 22 +++++++++++-----------
l3kernel/testfiles/m3seq008.tlg | 4 ++--
4 files changed, 29 insertions(+), 29 deletions(-)
diff --git a/l3kernel/CHANGELOG.md b/l3kernel/CHANGELOG.md
index 4742e2e02..b3be097c7 100644
--- a/l3kernel/CHANGELOG.md
+++ b/l3kernel/CHANGELOG.md
@@ -9,7 +9,7 @@ this project uses date-based 'snapshot' version identifiers.
### Changed
- Moved `\seq_indexed_map_inline:Nn` and `\seq_indexed_map_function:Nn`
- to stable.
+ to stable as `\seq_map_indexed_inline:Nn` and `\seq_map_indexed_function:Nn`.
## [2020-06-03]
diff --git a/l3kernel/l3seq.dtx b/l3kernel/l3seq.dtx
index 1b0f05782..d2cf5e2a6 100644
--- a/l3kernel/l3seq.dtx
+++ b/l3kernel/l3seq.dtx
@@ -578,9 +578,9 @@
% \meta{items} are returned from left to right.
% \end{function}
%
-% \begin{function}[rEXP,added = 2018-05-03]{\seq_indexed_map_function:NN}
+% \begin{function}[rEXP,added = 2018-05-03]{\seq_map_indexed_function:NN}
% \begin{syntax}
-% \cs{seq_indexed_map_function:NN} \meta{seq~var} \meta{function}
+% \cs{seq_map_indexed_function:NN} \meta{seq~var} \meta{function}
% \end{syntax}
% Applies \meta{function} to every entry in the \meta{sequence
% variable}. The \meta{function} should have signature |:nn|. It
@@ -588,9 +588,9 @@
% |1| for the first entry, then |2| and so on) and the \meta{item}.
% \end{function}
%
-% \begin{function}[added = 2018-05-03]{\seq_indexed_map_inline:Nn}
+% \begin{function}[added = 2018-05-03]{\seq_map_indexed_inline:Nn}
% \begin{syntax}
-% \cs{seq_indexed_map_inline:Nn} \meta{seq~var} \Arg{inline function}
+% \cs{seq_map_indexed_inline:Nn} \meta{seq~var} \Arg{inline function}
% \end{syntax}
% Applies \meta{inline function} to every entry in the \meta{sequence
% variable}. The \meta{inline function} should consist of code which
@@ -2040,30 +2040,30 @@
%
% \begin{macro}
% {
-% \seq_indexed_map_function:NN, \seq_indexed_map_inline:Nn,
-% \@@_indexed_map:nNN, \@@_indexed_map:Nw
+% \seq_map_indexed_function:NN, \seq_map_indexed_inline:Nn,
+% \@@_map_indexed:nNN, \@@_map_indexed:Nw
% }
% Similar to \cs{seq_map_function:NN} but we keep track of the item
-% index as a |;|-delimited argument of \cs{@@_indexed_map:Nw}.
+% index as a |;|-delimited argument of \cs{@@_map_indexed:Nw}.
% \begin{macrocode}
-\cs_new:Npn \seq_indexed_map_function:NN #1#2
+\cs_new:Npn \seq_map_indexed_function:NN #1#2
{
- \@@_indexed_map:NN #1#2
+ \@@_map_indexed:NN #1#2
\prg_break_point:Nn \seq_map_break: { }
}
-\cs_new_protected:Npn \seq_indexed_map_inline:Nn #1#2
+\cs_new_protected:Npn \seq_map_indexed_inline:Nn #1#2
{
\int_gincr:N \g__kernel_prg_map_int
\cs_gset_protected:cpn
{ @@_map_ \int_use:N \g__kernel_prg_map_int :w } ##1##2 {#2}
- \exp_args:NNc \@@_indexed_map:NN #1
+ \exp_args:NNc \@@_map_indexed:NN #1
{ @@_map_ \int_use:N \g__kernel_prg_map_int :w }
\prg_break_point:Nn \seq_map_break:
{ \int_gdecr:N \g__kernel_prg_map_int }
}
-\cs_new:Npn \@@_indexed_map:NN #1#2
+\cs_new:Npn \@@_map_indexed:NN #1#2
{
- \exp_after:wN \@@_indexed_map:Nw
+ \exp_after:wN \@@_map_indexed:Nw
\exp_after:wN #2
\int_value:w 1
\exp_after:wN \use_i:nn
@@ -2071,11 +2071,11 @@
#1
\prg_break: \@@_item:n { } \prg_break_point:
}
-\cs_new:Npn \@@_indexed_map:Nw #1#2 ; #3 \@@_item:n #4
+\cs_new:Npn \@@_map_indexed:Nw #1#2 ; #3 \@@_item:n #4
{
#3
#1 {#2} {#4}
- \exp_after:wN \@@_indexed_map:Nw
+ \exp_after:wN \@@_map_indexed:Nw
\exp_after:wN #1
\int_value:w \int_eval:w 1 + #2 ;
}
diff --git a/l3kernel/testfiles/m3seq008.lvt b/l3kernel/testfiles/m3seq008.lvt
index e26cfd396..96bac8afb 100644
--- a/l3kernel/testfiles/m3seq008.lvt
+++ b/l3kernel/testfiles/m3seq008.lvt
@@ -1,5 +1,5 @@
%
-% Copyright (C) 2014,2017-2019 The LaTeX3 Project
+% Copyright (C) 2014,2017-2020 The LaTeX3 Project
%
\documentclass{minimal}
@@ -55,26 +55,26 @@
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-\TESTEXP { seq_indexed_map_function:NN }
+\TESTEXP { seq_map_indexed_function:NN }
{
- \seq_indexed_map_function:NN \l_tmpa_seq \test:nn
+ \seq_map_indexed_function:NN \l_tmpa_seq \test:nn
\SEPARATOR \NEWLINE
- \seq_indexed_map_function:NN \l_tmpb_seq \test:nn
+ \seq_map_indexed_function:NN \l_tmpb_seq \test:nn
\SEPARATOR \NEWLINE
- \seq_indexed_map_function:NN \g_tmpa_seq \test:nn
+ \seq_map_indexed_function:NN \g_tmpa_seq \test:nn
\SEPARATOR \NEWLINE
- \seq_indexed_map_function:NN \g_tmpb_seq \test:nn
+ \seq_map_indexed_function:NN \g_tmpb_seq \test:nn
}
-\TEST { seq_indexed_map_inline:Nn }
+\TEST { seq_map_indexed_inline:Nn }
{
- \seq_indexed_map_inline:Nn \l_tmpa_seq { \TYPE { \tl_to_str:n { "#1":"#2" } } }
+ \seq_map_indexed_inline:Nn \l_tmpa_seq { \TYPE { \tl_to_str:n { "#1":"#2" } } }
\SEPARATOR
- \seq_indexed_map_inline:Nn \l_tmpb_seq { \TYPE { \tl_to_str:n { "#1":"#2" } } }
+ \seq_map_indexed_inline:Nn \l_tmpb_seq { \TYPE { \tl_to_str:n { "#1":"#2" } } }
\SEPARATOR
- \seq_indexed_map_inline:Nn \g_tmpa_seq { \TYPE { \tl_to_str:n { "#1":"#2" } } }
+ \seq_map_indexed_inline:Nn \g_tmpa_seq { \TYPE { \tl_to_str:n { "#1":"#2" } } }
\SEPARATOR
- \seq_indexed_map_inline:Nn \g_tmpb_seq { \TYPE { \tl_to_str:n { "#1":"#2" } } }
+ \seq_map_indexed_inline:Nn \g_tmpb_seq { \TYPE { \tl_to_str:n { "#1":"#2" } } }
}
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
diff --git a/l3kernel/testfiles/m3seq008.tlg b/l3kernel/testfiles/m3seq008.tlg
index fe449c64e..805b4362f 100644
--- a/l3kernel/testfiles/m3seq008.tlg
+++ b/l3kernel/testfiles/m3seq008.tlg
@@ -23,7 +23,7 @@ TEST 1: seq_mapthread_function:NNN
============================================================
============================================================
============================================================
-TEST 2: seq_indexed_map_function:NN
+TEST 2: seq_map_indexed_function:NN
============================================================
"1":"c"
"2":"b"
@@ -42,7 +42,7 @@ TEST 2: seq_indexed_map_function:NN
============================================================
============================================================
============================================================
-TEST 3: seq_indexed_map_inline:Nn
+TEST 3: seq_map_indexed_inline:Nn
============================================================
"1":"c"
"2":"b"
More information about the latex3-commits
mailing list.