[latex3-commits] [git/LaTeX3-latex3-latex3] scan-quark: Make error message more precise (2a257284e)

[Bruno Le Floch]

Repository : https://github.com/latex3/latex3
On branch  : scan-quark
Link       : https://github.com/latex3/latex3/commit/2a257284eecd0290fd0869f08970bfa93f7acf0b

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

commit 2a257284eecd0290fd0869f08970bfa93f7acf0b
Author: Bruno Le Floch <bruno at le-floch.fr>
Date:   Thu May 7 00:10:56 2020 +0200

    Make error message more precise


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

2a257284eecd0290fd0869f08970bfa93f7acf0b
 l3kernel/l3msg.dtx                | 5 ++++-
 l3kernel/l3quark.dtx              | 9 ++++++---
 l3kernel/testfiles/m3quark002.tlg | 3 +--
 3 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/l3kernel/l3msg.dtx b/l3kernel/l3msg.dtx
index bc91a3c89..42a285950 100644
--- a/l3kernel/l3msg.dtx
+++ b/l3kernel/l3msg.dtx
@@ -1820,7 +1820,10 @@
   {
     \c__msg_coding_error_text_tl
     LaTeX~has~been~asked~to~create~quark~test~function~'#1'~
-    with~signature~'#2',~but~that~signature~is~not~valid.
+    \tl_if_empty:nTF {#2}
+      { but~that~name~ }
+      { with~signature~'#2',~but~that~signature~ }
+    is~not~valid.
   }
 \__kernel_msg_new:nnn { kernel } { invalid-quark }
   { Invalid~quark~variable~'#1'. }
diff --git a/l3kernel/l3quark.dtx b/l3kernel/l3quark.dtx
index 2587ef7a3..39a6d59e1 100644
--- a/l3kernel/l3quark.dtx
+++ b/l3kernel/l3quark.dtx
@@ -641,7 +641,8 @@
 \cs_new_protected:Npn \@@_new_test_aux:Nn #1 #2
   {
     \if_meaning:w \q_nil #2 \q_nil
-      \__kernel_msg_expandable_error:nn { kernel } { invalid-quark-function }
+      \__kernel_msg_error:nnx { kernel } { invalid-quark-function }
+        { \token_to_str:N #1 }
     \else:
       \@@_new_test:Nccn #1
         { q__#2_recursion_tail } { q__#2_recursion_stop } { __#2 }
@@ -664,10 +665,12 @@
 \cs_new_protected:Npn \@@_new_conditional:Nnnn #1#2#3#4
   {
     \if_meaning:w \q_nil #2 \q_nil
-      \__kernel_msg_error:nn { kernel } { invalid-quark-function }
+      \__kernel_msg_error:nnx { kernel } { invalid-quark-function }
+        { \token_to_str:N #1 }
     \else:
       \if_meaning:w \q_nil #3 \q_nil
-        \__kernel_msg_error:nn { kernel } { invalid-quark-function }
+        \__kernel_msg_error:nnx { kernel } { invalid-quark-function }
+          { \token_to_str:N #1 }
       \else:
         \exp_last_unbraced:Nf \@@_new_test_aux:nnNNnnnn
           { \cs_split_function:N #1 }
diff --git a/l3kernel/testfiles/m3quark002.tlg b/l3kernel/testfiles/m3quark002.tlg
index 50f7e82a0..a40419ef6 100644
--- a/l3kernel/testfiles/m3quark002.tlg
+++ b/l3kernel/testfiles/m3quark002.tlg
@@ -92,6 +92,5 @@ For immediate help type H <return>.
 l. ...}
 This is a coding error.
 LaTeX has been asked to create quark test function
-'\__test_quark_if_recursion_tail_break' with signature '', but that signature
-is not valid.
+'\__test_quark_if_recursion_tail_break' but that name is not valid.
 ============================================================