[latex3-commits] [git/LaTeX3-latex3-latex3] luaintarray: Directly expand use:n/use_none:n in getter (2c4c6e38a)

Marcel Fabian Krüger tex at 2krueger.de
Sat Nov 13 11:29:06 CET 2021


Repository : https://github.com/latex3/latex3
On branch  : luaintarray
Link       : https://github.com/latex3/latex3/commit/2c4c6e38af1cfc14980acaf48858a6cb1b72fafd

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

commit 2c4c6e38af1cfc14980acaf48858a6cb1b72fafd
Author: Marcel Fabian Krüger <tex at 2krueger.de>
Date:   Sat Nov 13 11:25:59 2021 +0100

    Directly expand use:n/use_none:n in getter


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

2c4c6e38af1cfc14980acaf48858a6cb1b72fafd
 l3kernel/l3intarray.dtx | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/l3kernel/l3intarray.dtx b/l3kernel/l3intarray.dtx
index 7e59b577b..e842d28c0 100644
--- a/l3kernel/l3intarray.dtx
+++ b/l3kernel/l3intarray.dtx
@@ -270,6 +270,7 @@ local get_csname = token.get_csname
 local put_next = token.put_next
 local s_@@ = token_create's_@@'
 local use_none
+local expand_after_scan_stop
 local comma = token_create(string.byte',')
 
 local use_i = token_create'use:n'
@@ -277,6 +278,7 @@ if use_i.cmdname == "undefined_cs" then
   use_i = nil
 else
   use_none = token_create'use_none:n'
+  expand_after_scan_stop = {token_create'exp_after:wN', token_create'scan_stop:'}
 end
 
 local scan_argument = token.scan_argument
@@ -321,6 +323,7 @@ luacmd('@@_gset_count:Nw', function()
   if not use_i then
     use_i = token_create'use:n'
     use_none = token_create'use_none:n'
+    expand_after_scan_stop = {token_create'exp_after:wN', token_create'scan_stop:'}
   end
   local t = @@_table()
   local n = scan_int()
@@ -435,6 +438,8 @@ luacmd('@@_item:wF', function()
     tex.l_@@_bad_index_int = i
     put_next(use_i)
   end
+  put_next(expand_after_scan_stop)
+  scan_token()
   sprint(-2, item or 0)
 end, 'global')
 





More information about the latex3-commits mailing list.