[latex3-commits] [git/LaTeX3-latex3-latex3] master: Avoid \show in l3regex test file to avoid LuaTeX-specific tlg (7d4ae9363)

[Joseph Wright]

Repository : https://github.com/latex3/latex3
On branch  : master
Link       : https://github.com/latex3/latex3/commit/7d4ae93634bde47af6cd0a50e5e77e9fc5f59241

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

commit 7d4ae93634bde47af6cd0a50e5e77e9fc5f59241
Author: Bruno Le Floch <blflatex at gmail.com>
Date:   Mon Jul 20 09:45:05 2020 +0200

    Avoid \show in l3regex test file to avoid LuaTeX-specific tlg


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

7d4ae93634bde47af6cd0a50e5e77e9fc5f59241
 l3kernel/testfiles/m3regex011.lvt |  7 ++++---
 l3kernel/testfiles/m3regex011.tlg | 12 +++---------
 2 files changed, 7 insertions(+), 12 deletions(-)

diff --git a/l3kernel/testfiles/m3regex011.lvt b/l3kernel/testfiles/m3regex011.lvt
index bde3cbd93..64b483004 100644
--- a/l3kernel/testfiles/m3regex011.lvt
+++ b/l3kernel/testfiles/m3regex011.lvt
@@ -34,13 +34,14 @@
 
 \OMIT
 \cs_set:Npn \test:w #1 \s_stop { \TYPE { | \exp_not:n {#1} | } }
+\cs_set:Npn \test_show:w { \exp_after:wN \test:w \token_to_meaning:N }
 \TIMO
 
 \TEST { Peek~regex }
   {
     \peek_regex:nTF { } { \TRUE \test:w } { \ERROR \test:w } \aaa \s_stop
     \peek_regex:nT { a } { \TRUE \test:w } a \s_stop
-    \peek_regex:nF { . (. a()) } { \ERROR \test:w } \test:w { a b \s_stop \show } \s_stop
+    \peek_regex:nF { . (. a()) } { \ERROR \test:w } \test:w { a b \s_stop \test_show:w } \s_stop
     \peek_regex:nTF { a \{ } { \TRUE \test:w } { \ERROR \test:w } a { b } \s_stop
     \peek_regex:nTF { \cL. } { \ERROR \test:w } { \FALSE \test:w } \aaa \s_stop
     \peek_regex:nT { b } { \ERROR \test:w } \test:w a \s_stop
@@ -49,8 +50,8 @@
     \SEPARATOR
     \peek_regex_remove:nTF { } { \TRUE \test:w } { \ERROR \test:w } \aaa \s_stop
     \peek_regex_remove:nT { a } { \TRUE \test:w } a \s_stop
-    \peek_regex_remove:nF { . (. a()) } { \ERROR \test:w } \test:w { a b \s_stop \show } \s_stop
-    \peek_regex_remove:nTF { a \{ } { \TRUE \test:w } { \ERROR \test:w } a { b \s_stop \show } \s_stop
+    \peek_regex_remove:nF { . (. a()) } { \ERROR \test:w } \test:w { a b \s_stop \test_show:w } \s_stop
+    \peek_regex_remove:nTF { a \{ } { \TRUE \test:w } { \ERROR \test:w } a { b \s_stop \test_show:w } \s_stop
     \peek_regex_remove:nTF { \cL. } { \ERROR \test:w } { \FALSE \test:w } \aaa \s_stop
     \peek_regex_remove:nT { b } { \ERROR \test:w } \test:w a \s_stop
     \peek_regex_remove:nF { \c[^C] . (. a()) } { \FALSE \test:w } \test:w { a b } c \s_stop
diff --git a/l3kernel/testfiles/m3regex011.tlg b/l3kernel/testfiles/m3regex011.tlg
index c37bd68dd..5395e3941 100644
--- a/l3kernel/testfiles/m3regex011.tlg
+++ b/l3kernel/testfiles/m3regex011.tlg
@@ -20,7 +20,7 @@ TRUE
 |\aaa |
 TRUE
 |a|
-|ab\s_stop \show |
+|ab\s_stop \test_show:w |
 TRUE
 |a{b}|
 FALSE
@@ -35,16 +35,10 @@ TRUE
 |\aaa |
 TRUE
 ||
-> end-group character }.
-<argument> ... \test:w }\test:w {ab\s_stop \show }
-                                                  \s_stop \peek_regex_remove...
-l. ...  }
+|end-group character }|
 TRUE
 |b|
-> end-group character }.
-<argument> ...}{\ERROR \test:w }a{b\s_stop \show }
-                                                  \s_stop \peek_regex_remove...
-l. ...  }
+|end-group character }|
 FALSE
 |\aaa |
 |a|