[latex3-commits] [git/LaTeX3-latex3-latex3] luaintarray: Rename s_@@ to _@@:w (1a8683fd2)

[Marcel Fabian Krüger]

Repository : https://github.com/latex3/latex3
On branch  : luaintarray
Link       : https://github.com/latex3/latex3/commit/1a8683fd2b0724a968ad8b598c6fa86404b48a01

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

commit 1a8683fd2b0724a968ad8b598c6fa86404b48a01
Author: Marcel Fabian Krüger <tex at 2krueger.de>
Date:   Sat Nov 13 17:00:57 2021 +0100

    Rename s_@@ to _@@:w


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

1a8683fd2b0724a968ad8b598c6fa86404b48a01
 l3kernel/l3intarray.dtx                     | 12 ++++++------
 l3kernel/testfiles/m3intarray001.luatex.tlg |  2 +-
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/l3kernel/l3intarray.dtx b/l3kernel/l3intarray.dtx
index 723f7206e..ce96861ee 100644
--- a/l3kernel/l3intarray.dtx
+++ b/l3kernel/l3intarray.dtx
@@ -213,14 +213,14 @@
 %    \end{macrocode}
 % \end{variable}
 %
-% \begin{macro}{\s_@@}
+% \begin{macro}{\@@:w}
 %   Used as marker for intarrays in Lua. Followed by an unbraced number
 %   identifying the array and a single space. This format is used to make it
 %   easy to scan from Lua.
 %    \begin{macrocode}
 %</tex>
 %<*lua>
-luacmd('s_@@', function()
+luacmd('@@:w', function()
   scan_int()
   tex.error'LaTeX Error: Isolated intarray ignored'
 end, 'protected', 'global')
@@ -240,7 +240,7 @@ end, 'protected', 'global')
   {
     \__kernel_chk_if_free_cs:N #1
     \int_gincr:N \g_@@_table_int
-    \cs_gset_nopar:Npx #1 { \s_@@ \int_use:N \g_@@_table_int \c_space_tl }
+    \cs_gset_nopar:Npx #1 { \@@:w \int_use:N \g_@@_table_int \c_space_tl }
   }
 \cs_new_protected:Npn \intarray_new:Nn #1#2
   {
@@ -268,13 +268,13 @@ end, 'protected', 'global')
 tex.runtoks(function()
   tex.sprint("\\begingroup\\catcode`\\:=11 \\catcode`\\_=11\z
     \\def\\__luatex_dummy:{\z
-      \\s_@@\\use:n\\use_none:n\\exp_after:wN\\scan_stop:\z
+      \\@@:w\\use:n\\use_none:n\\exp_after:wN\\scan_stop:\z
     }\\endgroup")
 end)
 
 local scan_token = token.scan_token
 local put_next = token.put_next
-local s_@@ = token_create's_@@'
+local intarray_marker = token_create'@@:w'
 local use_none = token_create'use_none:n'
 local use_i = token_create'use:n'
 local expand_after_scan_stop = {token_create'exp_after:wN',
@@ -291,7 +291,7 @@ local @@_table do
   local tables = get_luadata and get_luadata'@@' or {[0] = {}}
   function @@_table()
     local t = scan_token()
-    if t ~= s_@@ then
+    if t ~= intarray_marker then
       put_next(t)
       tex.error'LaTeX Error: intarray expected'
       return tables[0]
diff --git a/l3kernel/testfiles/m3intarray001.luatex.tlg b/l3kernel/testfiles/m3intarray001.luatex.tlg
index 58d761232..3fd3c31ac 100644
--- a/l3kernel/testfiles/m3intarray001.luatex.tlg
+++ b/l3kernel/testfiles/m3intarray001.luatex.tlg
@@ -22,7 +22,7 @@ This is a coding error.
 LaTeX has been asked to create a new control sequence '\g_testa_intarray' but
 this name has already been used elsewhere.
 The current meaning is:
-  macro:->\s__intarray 9 
+  macro:->\__intarray:w 9 
 Defining \g_testa_intarray on line ...
 ! LaTeX3 Error: Access to an entry beyond an array's bounds.
 For immediate help type H <return>.