[latex3-commits] [git/LaTeX3-latex3-latex3] scan-quark: Replace quarks by scan marks in l3msg (32eabc7ce)

[PhelypeOleinik]

Repository : https://github.com/latex3/latex3
On branch  : scan-quark
Link       : https://github.com/latex3/latex3/commit/32eabc7cef8c8ddd7e5678e3ab3fdc9224bba542

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

commit 32eabc7cef8c8ddd7e5678e3ab3fdc9224bba542
Author: PhelypeOleinik <tex.phelype at gmail.com>
Date:   Thu Mar 19 20:45:00 2020 -0300

    Replace quarks by scan marks in l3msg


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

32eabc7cef8c8ddd7e5678e3ab3fdc9224bba542
 l3kernel/l3msg.dtx                | 35 ++++++++++++++++++++++++++---------
 l3kernel/testfiles/m3quark001.tlg |  8 ++++----
 2 files changed, 30 insertions(+), 13 deletions(-)

diff --git a/l3kernel/l3msg.dtx b/l3kernel/l3msg.dtx
index c244d06fa..47a27cb51 100644
--- a/l3kernel/l3msg.dtx
+++ b/l3kernel/l3msg.dtx
@@ -525,6 +525,23 @@
 %    \end{macrocode}
 % \end{variable}
 %
+% \subsection{Internal auxiliaries}
+%
+% \begin{variable}{\s_@@_mark,\s_@@_stop}
+%   Internal scan marks.
+%    \begin{macrocode}
+\scan_new:N \s_@@_mark
+\scan_new:N \s_@@_stop
+%    \end{macrocode}
+% \end{variable}
+%
+% \begin{macro}[EXP]{\@@_use_none_delimit_by_s_stop:w}
+%   Functions to gobble up to a scan mark.
+%    \begin{macrocode}
+\cs_new:Npn \@@_use_none_delimit_by_s_stop:w #1 \s_@@_stop { }
+%    \end{macrocode}
+% \end{macro}
+%
 % \subsection{Creating messages}
 %
 % Messages are created and used separately, so there two parts to
@@ -1207,15 +1224,15 @@
     {
       \tl_if_in:nnTF { ^^J #1 } { ^^J > ~ }
         {
-          \tl_if_in:nnTF { #1 \q_mark } { . \q_mark }
+          \tl_if_in:nnTF { #1 \s_@@_mark } { . \s_@@_mark }
             { \@@_show_dot:w } { \@@_show:w }
-          ^^J #1 \q_stop
+          ^^J #1 \s_@@_stop
         }
         { \@@_show:nn { ? #1 } { } }
     }
-  \cs_new:Npn \@@_show_dot:w #1 ^^J > ~ #2 . \q_stop
+  \cs_new:Npn \@@_show_dot:w #1 ^^J > ~ #2 . \s_@@_stop
     { \@@_show:nn {#1} {#2} }
-  \cs_new:Npn \@@_show:w #1 ^^J > ~ #2 \q_stop
+  \cs_new:Npn \@@_show:w #1 ^^J > ~ #2 \s_@@_stop
     { \@@_show:nn {#1} {#2} }
   \cs_new_protected:Npn \@@_show:nn #1#2
     {
@@ -1338,16 +1355,16 @@
       {
         \seq_clear:N \l_@@_hierarchy_seq
         \@@_use_hierarchy:nwwN { }
-          #1 \q_mark \@@_use_hierarchy:nwwN
-          /  \q_mark \use_none_delimit_by_q_stop:w
-          \q_stop
+          #1 \s_@@_mark \@@_use_hierarchy:nwwN
+          /  \s_@@_mark \@@_use_none_delimit_by_s_stop:w
+          \s_@@_stop
         \@@_use_redirect_module:n { }
       }
   }
-\cs_new_protected:Npn \@@_use_hierarchy:nwwN #1#2 / #3 \q_mark #4
+\cs_new_protected:Npn \@@_use_hierarchy:nwwN #1#2 / #3 \s_@@_mark #4
   {
     \seq_put_left:Nn \l_@@_hierarchy_seq {#1}
-    #4 { #1 / #2 } #3 \q_mark #4
+    #4 { #1 / #2 } #3 \s_@@_mark #4
   }
 %    \end{macrocode}
 %   At this point, the items of \cs{l_@@_hierarchy_seq} are the
diff --git a/l3kernel/testfiles/m3quark001.tlg b/l3kernel/testfiles/m3quark001.tlg
index 82ef30643..44c658f27 100644
--- a/l3kernel/testfiles/m3quark001.tlg
+++ b/l3kernel/testfiles/m3quark001.tlg
@@ -83,10 +83,10 @@ already been used for a scan mark.
 > \g__scan_marks_tl=\s_stop \s__tl_nil \s__tl_mark \s__tl_stop \s__str_mark
 \s__str_stop \s__seq \s__seq_mark \s__seq_stop \s__int_mark \s__int_stop
 \s__clist_mark \s__clist_stop \s__char_stop \s__token_stop \s__peek_mark
-\s__peek_stop \s__prop \s__prop_mark \s__prop_stop \s__keyval_nil
-\s__keyval_mark \s__keyval_stop \s__keyval_tail \s__fp \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__peek_stop \s__prop \s__prop_mark \s__prop_stop \s__msg_mark \s__msg_stop
+\s__keyval_nil \s__keyval_mark \s__keyval_stop \s__keyval_tail \s__fp
+\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 .
 ============================================================
 ============================================================
 TEST 14: Use none until s__stop (expect nothing)