[latex3-commits] [git/LaTeX3-latex3-latex3] cs-delimited-args: Improve checking for a cs (3a64767cd)

[PhelypeOleinik]

Repository : https://github.com/latex3/latex3
On branch  : cs-delimited-args
Link       : https://github.com/latex3/latex3/commit/3a64767cdf734e0ee833d4e04b7807c1bd4fa03e

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

commit 3a64767cdf734e0ee833d4e04b7807c1bd4fa03e
Author: PhelypeOleinik <tex.phelype at gmail.com>
Date:   Wed Feb 26 12:59:34 2020 -0300

    Improve checking for a cs


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

3a64767cdf734e0ee833d4e04b7807c1bd4fa03e
 l3packages/xparse/xparse.dtx | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/l3packages/xparse/xparse.dtx b/l3packages/xparse/xparse.dtx
index b36aa5fd6..4ce117448 100644
--- a/l3packages/xparse/xparse.dtx
+++ b/l3packages/xparse/xparse.dtx
@@ -2995,7 +2995,7 @@
           \l_@@_fn_tl \char_generate:nn { `#1 } { 11 }
       }
       {
-        \token_if_cs:NTF #1
+        \@@_token_if_cs:NTF #1
           {
             \exp_after:wN \l_@@_fn_tl
             \cs:w \cs_to_str:N #1 ~ \cs_end:
@@ -4406,9 +4406,13 @@
     \tl_set:Nn \l_@@_tmpb_tl {#4}
     \peek_meaning:NTF #2
       {
-        \token_if_cs:NTF #2
-          { \@@_peek_cs_check_equal:NNN #1 #2 }
-          { \@@_peek_true_remove:NNw #1 \l_@@_tmpa_tl }
+        \token_if_eq_meaning:NNTF #2 \c_group_begin_token
+          { \@@_peek_true_remove:NNw #1 \l__xparse_tmpa_tl }
+          {
+            \@@_token_if_cs:NTF #2
+              { \@@_peek_cs_check_equal:NNN #1 #2 }
+              { \@@_peek_true_remove:NNw #1 \l__xparse_tmpa_tl }
+          }
       }
       { \l_@@_tmpb_tl }
   }