[latex3-commits] [git/LaTeX3-latex3-latex3] scan-quark: Replace quarks by scan marks in l3sort (0a4b5d372)

[PhelypeOleinik]

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

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

commit 0a4b5d372e261b9b7f85295813547e433fc5f438
Author: PhelypeOleinik <tex.phelype at gmail.com>
Date:   Fri Mar 20 19:08:25 2020 -0300

    Replace quarks by scan marks in l3sort


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

0a4b5d372e261b9b7f85295813547e433fc5f438
 l3kernel/l3sort.dtx               | 55 +++++++++++++++++++++++----------------
 l3kernel/testfiles/m3quark001.tlg |  2 +-
 2 files changed, 33 insertions(+), 24 deletions(-)

diff --git a/l3kernel/l3sort.dtx b/l3kernel/l3sort.dtx
index d26ecdcf2..32cc1c96f 100644
--- a/l3kernel/l3sort.dtx
+++ b/l3kernel/l3sort.dtx
@@ -199,6 +199,15 @@
 % \end{variable}
 % \end{variable}
 %
+% \begin{variable}{\s_@@_mark,\s_@@_stop,\s_@@_scan_stop}
+%   Internal scan marks.
+%    \begin{macrocode}
+\scan_new:N \s_@@_mark
+\scan_new:N \s_@@_stop
+\scan_new:N \s_@@_scan_stop
+%    \end{macrocode}
+% \end{variable}
+%
 % \subsection{Finding available \tn{toks} registers}
 %
 % \begin{macro}{\@@_shrink_range:}
@@ -555,7 +564,7 @@
     \prg_do_nothing:
     \@@_return_mark:w
     \@@_return_mark:w
-    \q_mark
+    \s_@@_mark
     \@@_return_none_error:
   }
 %    \end{macrocode}
@@ -575,26 +584,26 @@
 %   so that it produces an error.
 %    \begin{macrocode}
 \cs_new_protected:Npn \sort_return_same:
-    #1 \@@_return_mark:w #2 \q_mark
+    #1 \@@_return_mark:w #2 \s_@@_mark
   {
     #1
     #2
     \@@_return_two_error:
     \@@_return_mark:w
-    \q_mark
+    \s_@@_mark
     \@@_return_same:w
   }
 \cs_new_protected:Npn \sort_return_swapped:
-    #1 \@@_return_mark:w #2 \q_mark
+    #1 \@@_return_mark:w #2 \s_@@_mark
   {
     #1
     #2
     \@@_return_two_error:
     \@@_return_mark:w
-    \q_mark
+    \s_@@_mark
     \@@_return_swapped:w
   }
-\cs_new_protected:Npn \@@_return_mark:w #1 \q_mark { }
+\cs_new_protected:Npn \@@_return_mark:w #1 \s_@@_mark { }
 \cs_new_protected:Npn \@@_return_none_error:
   {
     \__kernel_msg_error:nnxx { kernel } { return-none }
@@ -859,7 +868,7 @@
             \@@_quick_prepare:Nnnn #2 { } { }
               #1
               { \prg_break_point: \@@_quick_prepare_end:NNNnw }
-            \q_stop
+            \s_@@_stop
           }
       }
   }
@@ -868,13 +877,13 @@
     \prg_break: #4 \prg_break_point:
     \@@_quick_prepare:Nnnn #1 { #2 #3 } { #1 {#4} }
   }
-\cs_new:Npn \@@_quick_prepare_end:NNNnw #1#2#3#4#5 \q_stop
+\cs_new:Npn \@@_quick_prepare_end:NNNnw #1#2#3#4#5 \s_@@_stop
   {
     \@@_quick_split:NnNn #4 \@@_quick_end:nnTFNn { }
-    \q_mark { \@@_quick_cleanup:w \exp_stop_f: }
-    \s_stop \q_stop
+    \s_@@_mark { \@@_quick_cleanup:w \exp_stop_f: }
+    \s_@@_scan_stop \s_@@_stop
   }
-\cs_new:Npn \@@_quick_cleanup:w #1 \s_stop \q_stop {#1}
+\cs_new:Npn \@@_quick_cleanup:w #1 \s_@@_scan_stop \s_@@_stop {#1}
 %    \end{macrocode}
 % \end{macro}
 % \end{macro}
@@ -976,30 +985,30 @@
 %   continuations are done in such a way to place the pivot in between.
 %    \begin{macrocode}
 \cs_new:Npn \@@_quick_end:nnTFNn #1#2#3#4#5#6 {#5}
-\cs_new:Npn \@@_quick_single_end:nnnwnw #1#2#3#4 \q_mark #5#6 \q_stop
-  { #5 {#3} #6 \q_stop }
-\cs_new:Npn \@@_quick_only_i_end:nnnwnw #1#2#3#4 \q_mark #5#6 \q_stop
+\cs_new:Npn \@@_quick_single_end:nnnwnw #1#2#3#4 \s_@@_mark #5#6 \s_@@_stop
+  { #5 {#3} #6 \s_@@_stop }
+\cs_new:Npn \@@_quick_only_i_end:nnnwnw #1#2#3#4 \s_@@_mark #5#6 \s_@@_stop
   {
     \@@_quick_split:NnNn #1
-      \@@_quick_end:nnTFNn { } \q_mark {#5}
+      \@@_quick_end:nnTFNn { } \s_@@_mark {#5}
     {#3}
-    #6 \q_stop
+    #6 \s_@@_stop
   }
-\cs_new:Npn \@@_quick_only_ii_end:nnnwnw #1#2#3#4 \q_mark #5#6 \q_stop
+\cs_new:Npn \@@_quick_only_ii_end:nnnwnw #1#2#3#4 \s_@@_mark #5#6 \s_@@_stop
   {
     \@@_quick_split:NnNn #2
-      \@@_quick_end:nnTFNn { } \q_mark { #5 {#3} }
-    #6 \q_stop
+      \@@_quick_end:nnTFNn { } \s_@@_mark { #5 {#3} }
+    #6 \s_@@_stop
   }
-\cs_new:Npn \@@_quick_split_end:nnnwnw #1#2#3#4 \q_mark #5#6 \q_stop
+\cs_new:Npn \@@_quick_split_end:nnnwnw #1#2#3#4 \s_@@_mark #5#6 \s_@@_stop
   {
-    \@@_quick_split:NnNn #2 \@@_quick_end:nnTFNn { } \q_mark
+    \@@_quick_split:NnNn #2 \@@_quick_end:nnTFNn { } \s_@@_mark
       {
         \@@_quick_split:NnNn #1
-          \@@_quick_end:nnTFNn { } \q_mark {#5}
+          \@@_quick_end:nnTFNn { } \s_@@_mark {#5}
         {#3}
       }
-    #6 \q_stop
+    #6 \s_@@_stop
   }
 %    \end{macrocode}
 % \end{macro}
diff --git a/l3kernel/testfiles/m3quark001.tlg b/l3kernel/testfiles/m3quark001.tlg
index 019b81b9f..96c95335e 100644
--- a/l3kernel/testfiles/m3quark001.tlg
+++ b/l3kernel/testfiles/m3quark001.tlg
@@ -88,7 +88,7 @@ already been used for a scan mark.
 \s__skip_stop \s__keyval_nil \s__keyval_mark \s__keyval_stop \s__keyval_tail
 \s__keys_stop \s__fp \s__fp_expr_mark \s__fp_expr_stop \s__fp_mark \s__fp_stop
 \s__fp_invalid \s__fp_underflow \s__fp_overflow \s__fp_division \s__fp_exact
-\s__fp_tuple \s__tl \s__foo .
+\s__fp_tuple \s__sort_mark \s__sort_stop \s__sort_scan_stop \s__tl \s__foo .
 ============================================================
 ============================================================
 TEST 14: Use none until s__stop (expect nothing)