[latex3-commits] [git/LaTeX3-latex3-latex3] scan-quark: Replace quarks by scan marks in l3seq (19271a685)

PhelypeOleinik tex.phelype at gmail.com
Wed Mar 11 14:55:01 CET 2020


Repository : https://github.com/latex3/latex3
On branch  : scan-quark
Link       : https://github.com/latex3/latex3/commit/19271a685aed2103887d6f3bcb574ef73e7b264c

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

commit 19271a685aed2103887d6f3bcb574ef73e7b264c
Author: PhelypeOleinik <tex.phelype at gmail.com>
Date:   Wed Mar 11 10:55:01 2020 -0300

    Replace quarks by scan marks in l3seq


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

19271a685aed2103887d6f3bcb574ef73e7b264c
 l3kernel/l3seq.dtx | 32 ++++++++++++++++++++------------
 1 file changed, 20 insertions(+), 12 deletions(-)

diff --git a/l3kernel/l3seq.dtx b/l3kernel/l3seq.dtx
index 44ce65943..b29335948 100644
--- a/l3kernel/l3seq.dtx
+++ b/l3kernel/l3seq.dtx
@@ -985,6 +985,14 @@
 %    \end{macrocode}
 % \end{variable}
 %
+% \begin{variable}{\s_@@_mark,\s_@@_stop}
+%   Private scan marks.
+%    \begin{macrocode}
+\scan_new:N \s_@@_mark
+\scan_new:N \s_@@_stop
+%    \end{macrocode}
+% \end{variable}
+%
 % \begin{macro}{\@@_item:n}
 %   The delimiter is always defined, but when used incorrectly simply
 %   removes its argument and hits an undefined control sequence to
@@ -1643,10 +1651,10 @@
     \tl_set:Nx #2
       {
         \exp_after:wN \@@_get_left:wnw
-        #1 \@@_item:n { \q_no_value } \q_stop
+        #1 \@@_item:n { \q_no_value } \s_@@_stop
       }
   }
-\cs_new:Npn \@@_get_left:wnw #1 \@@_item:n #2#3 \q_stop
+\cs_new:Npn \@@_get_left:wnw #1 \@@_item:n #2#3 \s_@@_stop
   { \exp_not:n {#2} }
 \cs_generate_variant:Nn \seq_get_left:NN { c }
 %    \end{macrocode}
@@ -1668,9 +1676,9 @@
 \cs_new_protected:Npn \seq_gpop_left:NN
   { \@@_pop:NNNN \@@_pop_left:NNN \tl_gset:Nn }
 \cs_new_protected:Npn \@@_pop_left:NNN #1#2#3
-  { \exp_after:wN \@@_pop_left:wnwNNN #2 \q_stop #1#2#3 }
+  { \exp_after:wN \@@_pop_left:wnwNNN #2 \s_@@_stop #1#2#3 }
 \cs_new_protected:Npn \@@_pop_left:wnwNNN
-    #1 \@@_item:n #2#3 \q_stop #4#5#6
+    #1 \@@_item:n #2#3 \s_@@_stop #4#5#6
   {
     #4 #5 { #1 #3 }
     \tl_set:Nn #6 {#2}
@@ -1821,8 +1829,8 @@
 %   of being empty, terminating the loop and returning nothing at all.
 %    \begin{macrocode}
 \cs_new:Npn \seq_item:Nn #1
-  { \exp_after:wN \@@_item:wNn #1 \q_stop #1 }
-\cs_new:Npn \@@_item:wNn \s_@@ #1 \q_stop #2#3
+  { \exp_after:wN \@@_item:wNn #1 \s_@@_stop #1 }
+\cs_new:Npn \@@_item:wNn \s_@@ #1 \s_@@_stop #2#3
   {
     \exp_args:Nf \@@_item:nwn
       { \exp_args:Nf \@@_item:nN { \int_eval:n {#3} } #2 }
@@ -2068,9 +2076,9 @@
           }
           {
             \exp_after:wN \@@_use_setup:w #1 \@@_item:n
-            \q_mark { \@@_use:nwwwwnwn {#3} }
-            \q_mark { \@@_use:nwwn {#4} }
-            \q_stop { }
+            \s_@@_mark { \@@_use:nwwwwnwn {#3} }
+            \s_@@_mark { \@@_use:nwwn {#4} }
+            \s_@@_stop { }
           }
       }
       {
@@ -2083,12 +2091,12 @@
 \cs_new:Npn \@@_use_setup:w \s_@@ { \@@_use:nwwwwnwn { } }
 \cs_new:Npn \@@_use:nwwwwnwn
     #1 \@@_item:n #2 \@@_item:n #3 \@@_item:n #4#5
-    \q_mark #6#7 \q_stop #8
+    \s_@@_mark #6#7 \s_@@_stop #8
   {
     #6 \@@_item:n {#3} \@@_item:n {#4} #5
-    \q_mark {#6} #7 \q_stop { #8 #1 #2 }
+    \s_@@_mark {#6} #7 \s_@@_stop { #8 #1 #2 }
   }
-\cs_new:Npn \@@_use:nwwn #1 \@@_item:n #2 #3 \q_stop #4
+\cs_new:Npn \@@_use:nwwn #1 \@@_item:n #2 #3 \s_@@_stop #4
   { \exp_not:n { #4 #1 #2 } }
 \cs_new:Npn \seq_use:Nn #1#2
   { \seq_use:Nnnn #1 {#2} {#2} {#2} }





More information about the latex3-commits mailing list.