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

[PhelypeOleinik]

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

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

commit 0c881a88c25415a3614ecebb9f29c8f515913f78
Author: PhelypeOleinik <tex.phelype at gmail.com>
Date:   Thu Mar 19 20:26:59 2020 -0300

    Replace quarks by scan marks in l3prop


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

0c881a88c25415a3614ecebb9f29c8f515913f78
 l3kernel/l3prop.dtx               | 55 ++++++++++++++++++++++++++++++---------
 l3kernel/testfiles/m3quark001.tlg |  7 ++---
 2 files changed, 46 insertions(+), 16 deletions(-)

diff --git a/l3kernel/l3prop.dtx b/l3kernel/l3prop.dtx
index 3bacdb137..c3b2e83c4 100644
--- a/l3kernel/l3prop.dtx
+++ b/l3kernel/l3prop.dtx
@@ -617,6 +617,35 @@
 %    \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{variable}{\q_@@_recursion_tail,\q_@@_recursion_stop}
+%   Internal recursion quarks.
+%    \begin{macrocode}
+\quark_new:N \q_@@_recursion_tail
+\quark_new:N \q_@@_recursion_stop
+%    \end{macrocode}
+% \end{variable}
+%
+% \begin{macro}[EXP]{\@@_if_recursion_tail_stop:n}
+% \begin{macro}[EXP]{\@@_if_recursion_tail_stop:o}
+%   Functions to query recursion quarks.
+%    \begin{macrocode}
+\__kernel_quark_test_generate:NNNn \@@_if_recursion_tail_stop:n
+  \q_@@_recursion_tail \q_@@_recursion_stop { @@ }
+\cs_generate_variant:Nn \@@_if_recursion_tail_stop:n { o }
+%    \end{macrocode}
+% \end{macro}
+% \end{macro}
+%
 % \subsection{Allocation and initialisation}
 %
 % \begin{macro}[tested = m3prop001]{\prop_new:N, \prop_new:c}
@@ -754,27 +783,27 @@
 \cs_new_protected:Npn \@@_from_keyval:n #1
   {
     \@@_from_keyval_loop:w \prg_do_nothing: #1 ,
-      \q_recursion_tail , \q_recursion_stop
+      \q_@@_recursion_tail , \q_@@_recursion_stop
   }
 \cs_new_protected:Npn \@@_from_keyval_loop:w #1 ,
   {
-    \quark_if_recursion_tail_stop:o {#1}
+    \@@_if_recursion_tail_stop:o {#1}
     \@@_from_keyval_split:Nw \@@_from_keyval_key:n
-      #1 = = \q_stop {#1}
+      #1 = = \s_@@_stop {#1}
     \@@_from_keyval_loop:w \prg_do_nothing:
   }
 \cs_new_protected:Npn \@@_from_keyval_split:Nw #1#2 =
   { \tl_trim_spaces_apply:oN {#2} #1 }
 \cs_new_protected:Npn \@@_from_keyval_key:n #1
-  { \@@_from_keyval_key:w #1 \q_nil }
-\cs_new_protected:Npn \@@_from_keyval_key:w #1 \q_nil #2 \q_stop
+  { \@@_from_keyval_key:w #1 \s_@@_mark }
+\cs_new_protected:Npn \@@_from_keyval_key:w #1 \s_@@_mark #2 \s_@@_stop
   {
     \@@_from_keyval_split:Nw \@@_from_keyval_value:n
-      \prg_do_nothing: #2 \q_stop {#1}
+      \prg_do_nothing: #2 \s_@@_stop {#1}
   }
 \cs_new_protected:Npn \@@_from_keyval_value:n #1
-  { \@@_from_keyval_value:w #1 \q_nil }
-\cs_new_protected:Npn \@@_from_keyval_value:w #1 \q_nil #2 \q_stop #3#4
+  { \@@_from_keyval_value:w #1 \s_@@_mark }
+\cs_new_protected:Npn \@@_from_keyval_value:w #1 \s_@@_mark #2 \s_@@_stop #3#4
   {
     \tl_if_empty:nF { #3 #1 #2 }
       {
@@ -829,10 +858,10 @@
 \cs_new_protected:Npn \@@_split_aux:NnTF #1#2#3#4
   {
     \cs_set:Npn \@@_split_aux:w ##1
-      \@@_pair:wn #2 \s_@@ ##2 ##3 \q_mark ##4 ##5 \q_stop
+      \@@_pair:wn #2 \s_@@ ##2 ##3 \s_@@_mark ##4 ##5 \s_@@_stop
       { ##4 {#3} {#4} }
-    \exp_after:wN \@@_split_aux:w #1 \q_mark \use_i:nn
-      \@@_pair:wn #2 \s_@@ { } \q_mark \use_ii:nn \q_stop
+    \exp_after:wN \@@_split_aux:w #1 \s_@@_mark \use_i:nn
+      \@@_pair:wn #2 \s_@@ { } \s_@@_mark \use_ii:nn \s_@@_stop
   }
 \cs_new:Npn \@@_split_aux:w { }
 %    \end{macrocode}
@@ -1157,7 +1186,7 @@
   {
     \exp_last_unbraced:Noo \@@_if_in:nwwn { \tl_to_str:n {#2} } #1
       \@@_pair:wn \tl_to_str:n {#2} \s_@@ { }
-      \q_recursion_tail
+      \q_@@_recursion_tail
     \prg_break_point:
   }
 \cs_new:Npn \@@_if_in:nwwn #1#2 \@@_pair:wn #3 \s_@@ #4
@@ -1168,7 +1197,7 @@
   }
 \cs_new:Npn \@@_if_in:N #1
   {
-    \if_meaning:w \q_recursion_tail #1
+    \if_meaning:w \q_@@_recursion_tail #1
       \prg_return_false:
     \else:
       \prg_return_true:
diff --git a/l3kernel/testfiles/m3quark001.tlg b/l3kernel/testfiles/m3quark001.tlg
index 0dd1923bb..82ef30643 100644
--- a/l3kernel/testfiles/m3quark001.tlg
+++ b/l3kernel/testfiles/m3quark001.tlg
@@ -83,9 +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__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__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)