[latex3-commits] [git/LaTeX3-latex3-latex3] scan-quark: Replace quarks by scan marks in l3regex (44b2bf189)

[PhelypeOleinik]

Repository : https://github.com/latex3/latex3
On branch  : scan-quark
Link       : https://github.com/latex3/latex3/commit/44b2bf189d2518d2c8a3a277be313b8095e9d60e

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

commit 44b2bf189d2518d2c8a3a277be313b8095e9d60e
Author: PhelypeOleinik <tex.phelype at gmail.com>
Date:   Fri Mar 20 19:34:44 2020 -0300

    Replace quarks by scan marks in l3regex


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

44b2bf189d2518d2c8a3a277be313b8095e9d60e
 l3kernel/l3regex.dtx | 52 +++++++++++++++++++++++++++++++++++++++++++++-------
 1 file changed, 45 insertions(+), 7 deletions(-)

diff --git a/l3kernel/l3regex.dtx b/l3kernel/l3regex.dtx
index 6fbdb21eb..2042fbcf2 100644
--- a/l3kernel/l3regex.dtx
+++ b/l3kernel/l3regex.dtx
@@ -1105,6 +1105,43 @@
 %    \end{macrocode}
 % \end{variable}
 %
+% \subsubsection{Internal auxiliaries}
+%
+% \begin{variable}{\q_@@_recursion_stop}
+%   Internal recursion quarks.
+%    \begin{macrocode}
+\quark_new:N \q_@@_recursion_stop
+%    \end{macrocode}
+% \end{variable}
+%
+% \begin{macro}[EXP]{
+%     \@@_use_none_delimit_by_q_recursion_stop:w,
+%     \@@_use_i_delimit_by_q_recursion_stop:nw
+%   }
+%   Functions to gobble up to a quark.
+%    \begin{macrocode}
+\cs_new:Npn \@@_use_none_delimit_by_q_recursion_stop:w
+  #1 \q_@@_recursion_stop { }
+\cs_new:Npn \@@_use_i_delimit_by_q_recursion_stop:nw
+  #1 #2 \q_@@_recursion_stop {#1}
+%    \end{macrocode}
+% \end{macro}
+%
+% \begin{variable}{\q_@@_nil}
+%   Internal quarks.
+%    \begin{macrocode}
+\quark_new:N \q_@@_nil
+%    \end{macrocode}
+% \end{variable}
+%
+% \begin{macro}[pTF]{\@@_if_nil:n}
+%   Branching quark conditional.
+%    \begin{macrocode}
+\__kernel_quark_conditional_generate:NNnn \@@_if_nil:N
+  \q_@@_nil { @@ } { F }
+%    \end{macrocode}
+% \end{macro}
+%
 % \begin{macro}{\@@_break_point:TF}
 % \begin{macro}{\@@_break_true:w}
 %   When testing whether a character of the query token list matches
@@ -3242,7 +3279,7 @@
     \tl_set:Nx \l_@@_internal_a_tl
       {
         \exp_after:wN \@@_compile_cs_aux:Nn \l_@@_internal_regex
-        \q_nil \q_nil \q_recursion_stop
+        \q_@@_nil \q_@@_nil \q_@@_recursion_stop
       }
     \exp_args:Nx \@@_compile_one:n
       {
@@ -3260,12 +3297,13 @@
       {
         \scan_stop:
         \@@_compile_cs_aux:NNnnnN #2
-        \q_nil \q_nil \q_nil \q_nil \q_nil \q_nil \q_recursion_stop
+        \q_@@_nil \q_@@_nil \q_@@_nil
+        \q_@@_nil \q_@@_nil \q_@@_nil \q_@@_recursion_stop
         \@@_compile_cs_aux:Nn
       }
       {
-        \quark_if_nil:NF #1 { \flag_raise_if_clear:n { @@_cs } }
-        \use_none_delimit_by_q_recursion_stop:w
+        \@@_if_nil:NF #1 { \flag_raise_if_clear:n { @@_cs } }
+        \@@_use_none_delimit_by_q_recursion_stop:w
       }
   }
 \cs_new:Npn \@@_compile_cs_aux:NNnnnN #1#2#3#4#5#6
@@ -3284,12 +3322,12 @@
         \@@_compile_cs_aux:NNnnnN
       }
       {
-        \quark_if_nil:NF #1
+        \@@_if_nil:NF #1
           {
             \flag_raise_if_clear:n { @@_cs }
-            \use_i_delimit_by_q_recursion_stop:nw
+            \@@_use_i_delimit_by_q_recursion_stop:nw
           }
-        \use_none_delimit_by_q_recursion_stop:w
+        \@@_use_none_delimit_by_q_recursion_stop:w
       }
   }
 %    \end{macrocode}