[latex3-commits] [git/LaTeX3-latex3-latex3] luaintarray: Adjust to some expl3 conventions (f4814b176)

[Marcel Fabian Krüger]

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

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

commit f4814b176febe4ac4a6eb263d6fcfcfc9d00f5cb
Author: Marcel Fabian Krüger <tex at 2krueger.de>
Date:   Sat Nov 13 09:23:39 2021 +0100

    Adjust to some expl3 conventions


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

f4814b176febe4ac4a6eb263d6fcfcfc9d00f5cb
 l3kernel/l3intarray.dtx | 2 +-
 l3kernel/l3luatex.dtx   | 9 +++++----
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/l3kernel/l3intarray.dtx b/l3kernel/l3intarray.dtx
index e86564154..ab69829a0 100644
--- a/l3kernel/l3intarray.dtx
+++ b/l3kernel/l3intarray.dtx
@@ -360,7 +360,7 @@ luacmd('@@_gset:wNwF', function()
   end
 end, 'protected', 'global')
 
-luacmd('@@_gset:wNw', function()
+luacmd('@@_gset:w', function()
   local i = scan_int()
   local t = @@_table()
   if t[i] then
diff --git a/l3kernel/l3luatex.dtx b/l3kernel/l3luatex.dtx
index ce954e6f2..d28f3b9e9 100644
--- a/l3kernel/l3luatex.dtx
+++ b/l3kernel/l3luatex.dtx
@@ -689,7 +689,8 @@ end
 %
 % We provide some kernel-internal helpers for this. They will only be available if
 % \texttt{luatexbase} is available. This is not a big restriction though, because
-% ConTeXt (which does not use \texttt{luatexbase}) does not load expl3 in the format.
+% Con\TeX{}t (which does not use \texttt{luatexbase}) does not load \pkg{expl3}
+% in the format.
 %
 %    \begin{macrocode}
 local register_luadata, get_luadata
@@ -710,7 +711,7 @@ if luatexbase then
 
     function register_luadata(name, func)
       if luadata[name] then
-        error(string.format("LaTeX3 error: data name %q already in use", name))
+        error(format("LaTeX error: data name %q already in use", name))
       end
       luadata[name] = func
       luadata_order[#luadata_order + 1] = func and name
@@ -726,11 +727,11 @@ luatexbase.add_to_callback("pre_dump", function()
         local str = "return {"
         for i=1, #luadata_order do
           local name = luadata_order[i]
-          str = string.format('%s[%q]=%s,', str, name, luadata[name]())
+          str = format('%s[%q]=%s,', str, name, luadata[name]())
         end
         lua.bytecode[register] = assert(load(str .. "}"))
       end
-    end, "latex3.luadata")
+    end, "ltx.luadata")
   else
 %    \end{macrocode}
 %