[latex3-commits] [git/LaTeX3-latex3-latex3] master: Update error message and some comments in l3regex (45de927)

[Bruno Le Floch]

Repository : https://github.com/latex3/latex3
On branch  : master
Link       : https://github.com/latex3/latex3/commit/45de92758b6edde2c656d06bf01df58d9c4710f6

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

commit 45de92758b6edde2c656d06bf01df58d9c4710f6
Author: Bruno Le Floch <bruno at le-floch.fr>
Date:   Thu Oct 11 15:23:08 2018 +0200

    Update error message and some comments in l3regex


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

45de92758b6edde2c656d06bf01df58d9c4710f6
 l3kernel/l3regex.dtx              |    8 +++-----
 l3kernel/testfiles/m3regex009.tlg |   32 ++++++++++++++++----------------
 2 files changed, 19 insertions(+), 21 deletions(-)

diff --git a/l3kernel/l3regex.dtx b/l3kernel/l3regex.dtx
index 66ed9ae..4b45d45 100644
--- a/l3kernel/l3regex.dtx
+++ b/l3kernel/l3regex.dtx
@@ -877,7 +877,7 @@
 %   \item \cs{g_@@_thread_state_intarray} maps each \meta{thread} (with
 %     $\texttt{min_active} \leq \meta{thread} < \texttt{max_active}$) to
 %     the \meta{state} in which the \meta{thread} currently is. The
-%     \meta{threads} or ordered starting from the best to the least
+%     \meta{threads} are ordered starting from the best to the least
 %     preferred.
 %   \item \tn{toks}\meta{thread} holds the submatch information for the
 %     \meta{thread}, as the contents of a property list.
@@ -899,9 +899,6 @@
 %     block corresponding to one match with all its submatches stored in
 %     consecutive entries.
 % \end{itemize}
-% \tn{count} registers are not abused, which means that we can safely
-% use named integers in this module. Note that \tn{box} registers are
-% not abused either; maybe we could leverage those for some purpose.
 %
 % The code is structured as follows. Variables are introduced in the
 % relevant section. First we present some generic helper functions. Then
@@ -6415,7 +6412,8 @@
   { Invalid~nested~'\iow_char:N\\c'~escape~in~regular~expression. }
   {
     The~'\iow_char:N\\c'~escape~cannot~be~used~within~
-    a~control~sequence~test~'\iow_char:N\\c{...}'.~
+    a~control~sequence~test~'\iow_char:N\\c{...}'~
+    nor~another~category~test.~
     To~combine~several~category~tests,~use~'\iow_char:N\\c[...]'.
   }
 \__kernel_msg_new:nnnn { kernel } { c-C-invalid }
diff --git a/l3kernel/testfiles/m3regex009.tlg b/l3kernel/testfiles/m3regex009.tlg
index a5421a7..8749116 100644
--- a/l3kernel/testfiles/m3regex009.tlg
+++ b/l3kernel/testfiles/m3regex009.tlg
@@ -580,8 +580,8 @@ l. ...  }
 !...............................................  
 l. ...  }
 |'''''''''''''''''''''''''''''''''''''''''''''''
-| The '\c' escape cannot be used within a control sequence test '\c{...}'. To
-| combine several category tests, use '\c[...]'.
+| The '\c' escape cannot be used within a control sequence test '\c{...}' nor
+| another category test. To combine several category tests, use '\c[...]'.
 |...............................................
 "\c{x\c[AL].}"
 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
@@ -596,8 +596,8 @@ l. ...  }
 !...............................................  
 l. ...  }
 |'''''''''''''''''''''''''''''''''''''''''''''''
-| The '\c' escape cannot be used within a control sequence test '\c{...}'. To
-| combine several category tests, use '\c[...]'.
+| The '\c' escape cannot be used within a control sequence test '\c{...}' nor
+| another category test. To combine several category tests, use '\c[...]'.
 |...............................................
 "\c{x\cL}"
 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
@@ -612,8 +612,8 @@ l. ...  }
 !...............................................  
 l. ...  }
 |'''''''''''''''''''''''''''''''''''''''''''''''
-| The '\c' escape cannot be used within a control sequence test '\c{...}'. To
-| combine several category tests, use '\c[...]'.
+| The '\c' escape cannot be used within a control sequence test '\c{...}' nor
+| another category test. To combine several category tests, use '\c[...]'.
 |...............................................
 "\c{x\c[AL]}"
 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
@@ -628,8 +628,8 @@ l. ...  }
 !...............................................  
 l. ...  }
 |'''''''''''''''''''''''''''''''''''''''''''''''
-| The '\c' escape cannot be used within a control sequence test '\c{...}'. To
-| combine several category tests, use '\c[...]'.
+| The '\c' escape cannot be used within a control sequence test '\c{...}' nor
+| another category test. To combine several category tests, use '\c[...]'.
 |...............................................
 "[\c{abc]"
 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
@@ -675,8 +675,8 @@ l. ...  }
 !...............................................  
 l. ...  }
 |'''''''''''''''''''''''''''''''''''''''''''''''
-| The '\c' escape cannot be used within a control sequence test '\c{...}'. To
-| combine several category tests, use '\c[...]'.
+| The '\c' escape cannot be used within a control sequence test '\c{...}' nor
+| another category test. To combine several category tests, use '\c[...]'.
 |...............................................
 "[\c{x\c[AL].}]"
 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
@@ -691,8 +691,8 @@ l. ...  }
 !...............................................  
 l. ...  }
 |'''''''''''''''''''''''''''''''''''''''''''''''
-| The '\c' escape cannot be used within a control sequence test '\c{...}'. To
-| combine several category tests, use '\c[...]'.
+| The '\c' escape cannot be used within a control sequence test '\c{...}' nor
+| another category test. To combine several category tests, use '\c[...]'.
 |...............................................
 "[\c{x\cL}]"
 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
@@ -707,8 +707,8 @@ l. ...  }
 !...............................................  
 l. ...  }
 |'''''''''''''''''''''''''''''''''''''''''''''''
-| The '\c' escape cannot be used within a control sequence test '\c{...}'. To
-| combine several category tests, use '\c[...]'.
+| The '\c' escape cannot be used within a control sequence test '\c{...}' nor
+| another category test. To combine several category tests, use '\c[...]'.
 |...............................................
 "[\c{x\c[AL]}]"
 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
@@ -723,8 +723,8 @@ l. ...  }
 !...............................................  
 l. ...  }
 |'''''''''''''''''''''''''''''''''''''''''''''''
-| The '\c' escape cannot be used within a control sequence test '\c{...}'. To
-| combine several category tests, use '\c[...]'.
+| The '\c' escape cannot be used within a control sequence test '\c{...}' nor
+| another category test. To combine several category tests, use '\c[...]'.
 |...............................................
 "\cCA"
 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!