[latex3-commits] [git/LaTeX3-latex3-latex3] master: Revert ""map_analysis" better than "analysis_map"" (856f03d)

[Joseph Wright]

Repository : https://github.com/latex3/latex3
On branch  : master
Link       : https://github.com/latex3/latex3/commit/856f03d7ed6d81ae445b48412b6ee2ab6850f18b

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

commit 856f03d7ed6d81ae445b48412b6ee2ab6850f18b
Author: Joseph Wright <joseph.wright at morningstar2.co.uk>
Date:   Mon Apr 9 19:37:18 2018 +0100

    Revert ""map_analysis" better than "analysis_map""
    
    This reverts commit 35bf15f120032ef3656bb8d13283879b29cecf68.


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

856f03d7ed6d81ae445b48412b6ee2ab6850f18b
 l3kernel/l3regex.dtx                    |    4 ++--
 l3kernel/l3tl-analysis.dtx              |   24 ++++++++++++------------
 l3kernel/testfiles/m3expl001.luatex.tlg |    6 +++---
 l3kernel/testfiles/m3expl001.ptex.tlg   |    6 +++---
 l3kernel/testfiles/m3expl001.tlg        |    6 +++---
 l3kernel/testfiles/m3expl001.uptex.tlg  |    6 +++---
 l3kernel/testfiles/m3expl001.xetex.tlg  |    6 +++---
 l3kernel/testfiles/m3expl003.luatex.tlg |    6 +++---
 l3kernel/testfiles/m3expl003.ptex.tlg   |    6 +++---
 l3kernel/testfiles/m3expl003.tlg        |    6 +++---
 l3kernel/testfiles/m3expl003.uptex.tlg  |    6 +++---
 l3kernel/testfiles/m3expl003.xetex.tlg  |    6 +++---
 12 files changed, 44 insertions(+), 44 deletions(-)

diff --git a/l3kernel/l3regex.dtx b/l3kernel/l3regex.dtx
index 4f522c4..7b3627a 100644
--- a/l3kernel/l3regex.dtx
+++ b/l3kernel/l3regex.dtx
@@ -3362,7 +3362,7 @@
 %    \begin{macrocode}
 \cs_new_protected:Npn \@@_compile_u_not_cs:
   {
-    \tl_map_analysis_inline:on { \l_@@_internal_a_tl }
+    \tl_analysis_map_inline:on { \l_@@_internal_a_tl }
       {
         \tl_build_put_right:Nx \l_@@_build_tl
           {
@@ -4579,7 +4579,7 @@
     \int_set:Nn \l_@@_curr_pos_int { 2 * \l_@@_max_state_int }
     \@@_query_set:nnn { } { -1 } { -2 }
     \int_set_eq:NN \l_@@_min_pos_int \l_@@_curr_pos_int
-    \tl_map_analysis_inline:nn {#1}
+    \tl_analysis_map_inline:nn {#1}
       { \@@_query_set:nnn {##1} {"##3} {##2} }
     \int_set_eq:NN \l_@@_max_pos_int \l_@@_curr_pos_int
     \@@_query_set:nnn { } { -1 } { -2 }
diff --git a/l3kernel/l3tl-analysis.dtx b/l3kernel/l3tl-analysis.dtx
index cfe79ae..5a3ff1b 100644
--- a/l3kernel/l3tl-analysis.dtx
+++ b/l3kernel/l3tl-analysis.dtx
@@ -66,9 +66,9 @@
 % \end{function}
 %
 % \begin{function}[added = 2018-04-09]
-%   {\tl_map_analysis_inline:nn, \tl_map_analysis_inline:on}
+%   {\tl_analysis_map_inline:nn, \tl_analysis_map_inline:on}
 %   \begin{syntax}
-%     \cs{tl_map_analysis_inline:nn} \Arg{token list} \Arg{inline function}
+%     \cs{tl_analysis_map_inline:nn} \Arg{token list} \Arg{inline function}
 %   \end{syntax}
 %   Applies the \meta{inline function} to each individual \meta{token}
 %   in the \meta{token list}. The \meta{inline function} receives three
@@ -878,9 +878,9 @@
 %
 % \subsection{Mapping through the analysis}
 %
-% \begin{macro}{\tl_map_analysis_inline:nn, \tl_map_analysis_inline:on}
-% \begin{macro}{\@@_map_analysis_inline_aux:Nn}
-% \begin{macro}{\@@_map_analysis_inline_aux:nnn}
+% \begin{macro}{\tl_analysis_map_inline:nn, \tl_analysis_map_inline:on}
+% \begin{macro}{\@@_analysis_map_inline_aux:Nn}
+% \begin{macro}{\@@_analysis_map_inline_aux:nnn}
 %   First obtain the analysis of the token list into
 %   \cs{g_@@_analysis_result_tl}. To allow nested mappings, increase the
 %   nesting depth \cs{g__kernel_prg_map_int} (shared between all modules), then
@@ -892,22 +892,22 @@
 %   |#2|, and loops by calling itself. When the loop ends, remember to
 %   decrease the nesting depth.
 %    \begin{macrocode}
-\cs_new_protected:Npn \tl_map_analysis_inline:nn #1
+\cs_new_protected:Npn \tl_analysis_map_inline:nn #1
   {
     \@@_analysis:n {#1}
     \int_gincr:N \g__kernel_prg_map_int
-    \exp_args:Nc \@@_map_analysis_inline_aux:Nn
-      { @@_map_analysis_inline_ \int_use:N \g__kernel_prg_map_int :wNw }
+    \exp_args:Nc \@@_analysis_map_inline_aux:Nn
+      { @@_analysis_map_inline_ \int_use:N \g__kernel_prg_map_int :wNw }
   }
-\cs_generate_variant:Nn \tl_map_analysis_inline:nn { o }
-\cs_new_protected:Npn \@@_map_analysis_inline_aux:Nn #1#2
+\cs_generate_variant:Nn \tl_analysis_map_inline:nn { o }
+\cs_new_protected:Npn \@@_analysis_map_inline_aux:Nn #1#2
   {
     \cs_gset_protected:Npn #1 ##1 \s_@@ ##2 ##3 \s_@@
       {
         \use_none:n ##2
-        \@@_map_analysis_inline_aux:nnn {##1} {##3} {##2}
+        \@@_analysis_map_inline_aux:nnn {##1} {##3} {##2}
       }
-    \cs_gset_protected:Npn \@@_map_analysis_inline_aux:nnn ##1##2##3
+    \cs_gset_protected:Npn \@@_analysis_map_inline_aux:nnn ##1##2##3
       {   
         #2
         #1
diff --git a/l3kernel/testfiles/m3expl001.luatex.tlg b/l3kernel/testfiles/m3expl001.luatex.tlg
index 69f497a..406a541 100644
--- a/l3kernel/testfiles/m3expl001.luatex.tlg
+++ b/l3kernel/testfiles/m3expl001.luatex.tlg
@@ -4316,9 +4316,9 @@ Defining \__tl_analysis_b_cs_test:ww on line ...
 Defining \__tl_analysis_b_special:w on line ...
 Defining \__tl_analysis_b_special_char:wN on line ...
 Defining \__tl_analysis_b_special_space:w on line ...
-Defining \tl_map_analysis_inline:nn on line ...
-Defining \tl_map_analysis_inline:on on line ...
-Defining \__tl_map_analysis_inline_aux:Nn on line ...
+Defining \tl_analysis_map_inline:nn on line ...
+Defining \tl_analysis_map_inline:on on line ...
+Defining \__tl_analysis_map_inline_aux:Nn on line ...
 Defining \tl_show_analysis:N on line ...
 Defining \tl_show_analysis:n on line ...
 Defining \__tl_analysis_show: on line ...
diff --git a/l3kernel/testfiles/m3expl001.ptex.tlg b/l3kernel/testfiles/m3expl001.ptex.tlg
index 56f0fca..deb15d0 100644
--- a/l3kernel/testfiles/m3expl001.ptex.tlg
+++ b/l3kernel/testfiles/m3expl001.ptex.tlg
@@ -4570,9 +4570,9 @@ Defining \__tl_analysis_b_cs_test:ww on line ...
 Defining \__tl_analysis_b_special:w on line ...
 Defining \__tl_analysis_b_special_char:wN on line ...
 Defining \__tl_analysis_b_special_space:w on line ...
-Defining \tl_map_analysis_inline:nn on line ...
-Defining \tl_map_analysis_inline:on on line ...
-Defining \__tl_map_analysis_inline_aux:Nn on line ...
+Defining \tl_analysis_map_inline:nn on line ...
+Defining \tl_analysis_map_inline:on on line ...
+Defining \__tl_analysis_map_inline_aux:Nn on line ...
 Defining \tl_show_analysis:N on line ...
 Defining \tl_show_analysis:n on line ...
 Defining \__tl_analysis_show: on line ...
diff --git a/l3kernel/testfiles/m3expl001.tlg b/l3kernel/testfiles/m3expl001.tlg
index 336f853..e74f2a1 100644
--- a/l3kernel/testfiles/m3expl001.tlg
+++ b/l3kernel/testfiles/m3expl001.tlg
@@ -4570,9 +4570,9 @@ Defining \__tl_analysis_b_cs_test:ww on line ...
 Defining \__tl_analysis_b_special:w on line ...
 Defining \__tl_analysis_b_special_char:wN on line ...
 Defining \__tl_analysis_b_special_space:w on line ...
-Defining \tl_map_analysis_inline:nn on line ...
-Defining \tl_map_analysis_inline:on on line ...
-Defining \__tl_map_analysis_inline_aux:Nn on line ...
+Defining \tl_analysis_map_inline:nn on line ...
+Defining \tl_analysis_map_inline:on on line ...
+Defining \__tl_analysis_map_inline_aux:Nn on line ...
 Defining \tl_show_analysis:N on line ...
 Defining \tl_show_analysis:n on line ...
 Defining \__tl_analysis_show: on line ...
diff --git a/l3kernel/testfiles/m3expl001.uptex.tlg b/l3kernel/testfiles/m3expl001.uptex.tlg
index 12aebe6..9997dde 100644
--- a/l3kernel/testfiles/m3expl001.uptex.tlg
+++ b/l3kernel/testfiles/m3expl001.uptex.tlg
@@ -4570,9 +4570,9 @@ Defining \__tl_analysis_b_cs_test:ww on line ...
 Defining \__tl_analysis_b_special:w on line ...
 Defining \__tl_analysis_b_special_char:wN on line ...
 Defining \__tl_analysis_b_special_space:w on line ...
-Defining \tl_map_analysis_inline:nn on line ...
-Defining \tl_map_analysis_inline:on on line ...
-Defining \__tl_map_analysis_inline_aux:Nn on line ...
+Defining \tl_analysis_map_inline:nn on line ...
+Defining \tl_analysis_map_inline:on on line ...
+Defining \__tl_analysis_map_inline_aux:Nn on line ...
 Defining \tl_show_analysis:N on line ...
 Defining \tl_show_analysis:n on line ...
 Defining \__tl_analysis_show: on line ...
diff --git a/l3kernel/testfiles/m3expl001.xetex.tlg b/l3kernel/testfiles/m3expl001.xetex.tlg
index 3468b0a..df30b74 100644
--- a/l3kernel/testfiles/m3expl001.xetex.tlg
+++ b/l3kernel/testfiles/m3expl001.xetex.tlg
@@ -4289,9 +4289,9 @@ Defining \__tl_analysis_b_cs_test:ww on line ...
 Defining \__tl_analysis_b_special:w on line ...
 Defining \__tl_analysis_b_special_char:wN on line ...
 Defining \__tl_analysis_b_special_space:w on line ...
-Defining \tl_map_analysis_inline:nn on line ...
-Defining \tl_map_analysis_inline:on on line ...
-Defining \__tl_map_analysis_inline_aux:Nn on line ...
+Defining \tl_analysis_map_inline:nn on line ...
+Defining \tl_analysis_map_inline:on on line ...
+Defining \__tl_analysis_map_inline_aux:Nn on line ...
 Defining \tl_show_analysis:N on line ...
 Defining \tl_show_analysis:n on line ...
 Defining \__tl_analysis_show: on line ...
diff --git a/l3kernel/testfiles/m3expl003.luatex.tlg b/l3kernel/testfiles/m3expl003.luatex.tlg
index 69f497a..406a541 100644
--- a/l3kernel/testfiles/m3expl003.luatex.tlg
+++ b/l3kernel/testfiles/m3expl003.luatex.tlg
@@ -4316,9 +4316,9 @@ Defining \__tl_analysis_b_cs_test:ww on line ...
 Defining \__tl_analysis_b_special:w on line ...
 Defining \__tl_analysis_b_special_char:wN on line ...
 Defining \__tl_analysis_b_special_space:w on line ...
-Defining \tl_map_analysis_inline:nn on line ...
-Defining \tl_map_analysis_inline:on on line ...
-Defining \__tl_map_analysis_inline_aux:Nn on line ...
+Defining \tl_analysis_map_inline:nn on line ...
+Defining \tl_analysis_map_inline:on on line ...
+Defining \__tl_analysis_map_inline_aux:Nn on line ...
 Defining \tl_show_analysis:N on line ...
 Defining \tl_show_analysis:n on line ...
 Defining \__tl_analysis_show: on line ...
diff --git a/l3kernel/testfiles/m3expl003.ptex.tlg b/l3kernel/testfiles/m3expl003.ptex.tlg
index 56f0fca..deb15d0 100644
--- a/l3kernel/testfiles/m3expl003.ptex.tlg
+++ b/l3kernel/testfiles/m3expl003.ptex.tlg
@@ -4570,9 +4570,9 @@ Defining \__tl_analysis_b_cs_test:ww on line ...
 Defining \__tl_analysis_b_special:w on line ...
 Defining \__tl_analysis_b_special_char:wN on line ...
 Defining \__tl_analysis_b_special_space:w on line ...
-Defining \tl_map_analysis_inline:nn on line ...
-Defining \tl_map_analysis_inline:on on line ...
-Defining \__tl_map_analysis_inline_aux:Nn on line ...
+Defining \tl_analysis_map_inline:nn on line ...
+Defining \tl_analysis_map_inline:on on line ...
+Defining \__tl_analysis_map_inline_aux:Nn on line ...
 Defining \tl_show_analysis:N on line ...
 Defining \tl_show_analysis:n on line ...
 Defining \__tl_analysis_show: on line ...
diff --git a/l3kernel/testfiles/m3expl003.tlg b/l3kernel/testfiles/m3expl003.tlg
index 336f853..e74f2a1 100644
--- a/l3kernel/testfiles/m3expl003.tlg
+++ b/l3kernel/testfiles/m3expl003.tlg
@@ -4570,9 +4570,9 @@ Defining \__tl_analysis_b_cs_test:ww on line ...
 Defining \__tl_analysis_b_special:w on line ...
 Defining \__tl_analysis_b_special_char:wN on line ...
 Defining \__tl_analysis_b_special_space:w on line ...
-Defining \tl_map_analysis_inline:nn on line ...
-Defining \tl_map_analysis_inline:on on line ...
-Defining \__tl_map_analysis_inline_aux:Nn on line ...
+Defining \tl_analysis_map_inline:nn on line ...
+Defining \tl_analysis_map_inline:on on line ...
+Defining \__tl_analysis_map_inline_aux:Nn on line ...
 Defining \tl_show_analysis:N on line ...
 Defining \tl_show_analysis:n on line ...
 Defining \__tl_analysis_show: on line ...
diff --git a/l3kernel/testfiles/m3expl003.uptex.tlg b/l3kernel/testfiles/m3expl003.uptex.tlg
index 12aebe6..9997dde 100644
--- a/l3kernel/testfiles/m3expl003.uptex.tlg
+++ b/l3kernel/testfiles/m3expl003.uptex.tlg
@@ -4570,9 +4570,9 @@ Defining \__tl_analysis_b_cs_test:ww on line ...
 Defining \__tl_analysis_b_special:w on line ...
 Defining \__tl_analysis_b_special_char:wN on line ...
 Defining \__tl_analysis_b_special_space:w on line ...
-Defining \tl_map_analysis_inline:nn on line ...
-Defining \tl_map_analysis_inline:on on line ...
-Defining \__tl_map_analysis_inline_aux:Nn on line ...
+Defining \tl_analysis_map_inline:nn on line ...
+Defining \tl_analysis_map_inline:on on line ...
+Defining \__tl_analysis_map_inline_aux:Nn on line ...
 Defining \tl_show_analysis:N on line ...
 Defining \tl_show_analysis:n on line ...
 Defining \__tl_analysis_show: on line ...
diff --git a/l3kernel/testfiles/m3expl003.xetex.tlg b/l3kernel/testfiles/m3expl003.xetex.tlg
index 3468b0a..df30b74 100644
--- a/l3kernel/testfiles/m3expl003.xetex.tlg
+++ b/l3kernel/testfiles/m3expl003.xetex.tlg
@@ -4289,9 +4289,9 @@ Defining \__tl_analysis_b_cs_test:ww on line ...
 Defining \__tl_analysis_b_special:w on line ...
 Defining \__tl_analysis_b_special_char:wN on line ...
 Defining \__tl_analysis_b_special_space:w on line ...
-Defining \tl_map_analysis_inline:nn on line ...
-Defining \tl_map_analysis_inline:on on line ...
-Defining \__tl_map_analysis_inline_aux:Nn on line ...
+Defining \tl_analysis_map_inline:nn on line ...
+Defining \tl_analysis_map_inline:on on line ...
+Defining \__tl_analysis_map_inline_aux:Nn on line ...
 Defining \tl_show_analysis:N on line ...
 Defining \tl_show_analysis:n on line ...
 Defining \__tl_analysis_show: on line ...