[latex3-commits] [git/LaTeX3-latex3-latex3] scan-quark: Rename auxiliaries to avoid "get" in expandable functions (0c76187b3)

[Bruno Le Floch]

Repository : https://github.com/latex3/latex3
On branch  : scan-quark
Link       : https://github.com/latex3/latex3/commit/0c76187b39e5f4978e80df79ed7bec7584359afc

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

commit 0c76187b39e5f4978e80df79ed7bec7584359afc
Author: Bruno Le Floch <bruno at le-floch.fr>
Date:   Wed May 6 23:26:13 2020 +0200

    Rename auxiliaries to avoid "get" in expandable functions
    
    (All the "get" functions we have are assignments to a tl variable.)


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

0c76187b39e5f4978e80df79ed7bec7584359afc
 l3kernel/l3quark.dtx | 48 ++++++++++++++++++++++++------------------------
 1 file changed, 24 insertions(+), 24 deletions(-)

diff --git a/l3kernel/l3quark.dtx b/l3kernel/l3quark.dtx
index e817b9f69..4cc9442c7 100644
--- a/l3kernel/l3quark.dtx
+++ b/l3kernel/l3quark.dtx
@@ -632,7 +632,7 @@
 %   \@@_new_test_aux:nnNNnnnn, \@@_new_test_choose:nNnnnn}
 %    \begin{macrocode}
 \cs_new_protected:Npn \__kernel_quark_new_test:N #1
-  { \@@_new_test_aux:Nx #1 { \@@_get_module_name:N #1 } }
+  { \@@_new_test_aux:Nx #1 { \@@_module_name:N #1 } }
 \cs_new_protected:Npn \@@_new_test_aux:Nn #1 #2
   {
     \tl_if_empty:nTF {#2}
@@ -653,8 +653,8 @@
 \cs_new_protected:Npn \__kernel_quark_new_conditional:Nn #1
   {
     \@@_new_conditional:Nxxn #1
-      { \@@_get_quark_name:N #1 }
-      { \@@_get_module_name:N #1 }
+      { \@@_quark_conditional_name:N #1 }
+      { \@@_module_name:N #1 }
   }
 \cs_new_protected:Npn \@@_new_conditional:Nnnn #1#2#3#4
   {
@@ -859,13 +859,13 @@
 %    \end{macrocode}
 % \end{macro}
 %
-% \begin{macro}[EXP]{\@@_get_module_name:N}
+% \begin{macro}[EXP]{\@@_module_name:N}
 % \begin{macro}[EXP]{
-%     \@@_get_module_name:w,
-%     \@@_get_module_name_loop:w,
-%     \@@_get_module_name_end:w
+%     \@@_module_name:w,
+%     \@@_module_name_loop:w,
+%     \@@_module_name_end:w
 %   }
-%   \cs{@@_get_module_name:N} takes a control sequence and returns its
+%   \cs{@@_module_name:N} takes a control sequence and returns its
 %   \meta{module} name, determined as the first non-empty
 %   non-single-character word, separated by |_| or~|:|.  These rules
 %   give the correct result for public functions
@@ -881,48 +881,48 @@
 %    \begin{macrocode}
 \cs_set:Npn \@@_tmp:w #1#2
   {
-    \cs_new:Npn \@@_get_module_name:N ##1
+    \cs_new:Npn \@@_module_name:N ##1
       {
-        \exp_last_unbraced:Nf \@@_get_module_name:w
+        \exp_last_unbraced:Nf \@@_module_name:w
           { \cs_to_str:N ##1 } #1 \s_@@
       }
-    \cs_new:Npn \@@_get_module_name:w ##1 #1 ##2 \s_@@
-      { \@@_get_module_name_loop:w ##1 #2 \use_none:n { } #2 \s_@@ }
-    \cs_new:Npn \@@_get_module_name_loop:w ##1 #2
+    \cs_new:Npn \@@_module_name:w ##1 #1 ##2 \s_@@
+      { \@@_module_name_loop:w ##1 #2 \use_none:n { } #2 \s_@@ }
+    \cs_new:Npn \@@_module_name_loop:w ##1 #2
       {
-        \tl_if_empty:nTF {##1} { \@@_get_module_name_loop:w }
+        \tl_if_empty:nTF {##1} { \@@_module_name_loop:w }
           {
-            \tl_if_single:nTF {##1} { \@@_get_module_name_loop:w }
-              { ##1 \@@_get_module_name_end:w }
+            \tl_if_single:nTF {##1} { \@@_module_name_loop:w }
+              { ##1 \@@_module_name_end:w }
           }
       }
-    \cs_new:Npn \@@_get_module_name_end:w ##1 \s_@@ { }
+    \cs_new:Npn \@@_module_name_end:w ##1 \s_@@ { }
   }
 \exp_after:wN \@@_tmp:w \tl_to_str:n { : _ }
 %    \end{macrocode}
 % \end{macro}
 % \end{macro}
 %
-% \begin{macro}[EXP]{\@@_get_quark_name:N, \@@_get_quark_name:w}
-%   \cs{@@_get_quark_name:N} determines the quark name that the quark
+% \begin{macro}[EXP]{\@@_quark_conditional_name:N, \@@_quark_conditional_name:w}
+%   \cs{@@_quark_conditional_name:N} determines the quark name that the quark
 %   conditional function~|##1| queries, as the part of the function name
 %   between |_quark_if_| and the trailing~|:|.  Again we define it
 %   through \cs{@@_tmp:w}, which receives |:| as |#1| and |_quark_if_|
-%   as |#2|.  The auxiliary \cs{@@_get_quark_name:w} returns the part
+%   as |#2|.  The auxiliary \cs{@@_quark_conditional_name:w} returns the part
 %   between the first |_quark_if_| and the next~|:|, and we apply this
 %   auxiliary to the function name followed by |:| (in case the function
 %   name is lacking a signature), and |_quark_if_:| so that
-%   \cs{@@_get_quark_name:N} returns an empty string if |_quark_if_| is
+%   \cs{@@_quark_conditional_name:N} returns an empty string if |_quark_if_| is
 %   not present.
 %    \begin{macrocode}
 \cs_set:Npn \@@_tmp:w #1 #2 \s_@@
   {
-    \cs_new:Npn \@@_get_quark_name:N ##1
+    \cs_new:Npn \@@_quark_conditional_name:N ##1
       {
-        \exp_last_unbraced:Nf \@@_get_quark_name:w
+        \exp_last_unbraced:Nf \@@_quark_conditional_name:w
           { \cs_to_str:N ##1 } #1 #2 #1 \s_@@
       }
-    \cs_new:Npn \@@_get_quark_name:w
+    \cs_new:Npn \@@_quark_conditional_name:w
       ##1 #2 ##2 #1 ##3 \s_@@ {##2}
   }
 \exp_after:wN \@@_tmp:w \tl_to_str:n { : _quark_if_ } \s_@@