Port to Lua 5.4.2

Author: siffiejoe

.github/workflows/run-tests.yml

@@ -1,18 +1,37 @@
 name: run-tests
-on: [push, pull_request]
+on:
+  push:
+    branches: ["master"]
+  pull_request:
 jobs:
   test:
     strategy:
       fail-fast: false
       matrix:
-        luaVersion: ["5.1.3", "5.1.4", "5.1.5", "5.2.2", "5.2.3", "5.2.4", "5.3.0", "5.3.1", "5.3.2", "5.3.3", "5.3.4", "5.3.5", "5.3.6", "5.4.0", "5.4.1"]
+        luaVersion:
+          - "5.1.3"
+          - "5.1.4"
+          - "5.1.5"
+          - "5.2.2"
+          - "5.2.3"
+          - "5.2.4"
+          - "5.3.0"
+          - "5.3.1"
+          - "5.3.2"
+          - "5.3.3"
+          - "5.3.4"
+          - "5.3.5"
+          - "5.3.6"
+          - "5.4.0"
+          - "5.4.1"
+          - "5.4.2"
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v2
-      - uses: leafo/gh-actions-lua@v7
+      - uses: leafo/gh-actions-lua@v8
         with:
           luaVersion: ${{ matrix.luaVersion }}
-      - uses: leafo/gh-actions-luarocks@v3
+      - uses: leafo/gh-actions-luarocks@v4
       - run: luarocks make CFLAGS="-Wall -Wextra -O2 -fPIC"
       - run: lua tests/test.lua
 

compat.c

@@ -16,7 +16,7 @@ static GetArgFunction const getArgFuncs[] = {
 #elif LUA_VERSION_NUM == 503
   getArg_50300, getArg_50300, getArg_50300, getArg_50300, getArg_50300, getArg_50300, getArg_50300
 #elif LUA_VERSION_NUM == 504
-  getArg_50400, getArg_50400
+  getArg_50400, getArg_50400, getArg_50400
 #else
 #error unsupported Lua version
 #endif
@@ -37,7 +37,7 @@ static BooleanSizeFunction const booleanSizeFuncs[] = {
 #elif LUA_VERSION_NUM == 503
   sizeBoolean_50300, sizeBoolean_50300, sizeBoolean_50300, sizeBoolean_50300, sizeBoolean_50300, sizeBoolean_50300, sizeBoolean_50300
 #elif LUA_VERSION_NUM == 504
-  sizeBoolean_50400, sizeBoolean_50400
+  sizeBoolean_50400, sizeBoolean_50400, sizeBoolean_50400
 #else
 #error unsupported Lua version
 #endif
@@ -58,7 +58,7 @@ static NumberSizeFunction const numberSizeFuncs[] = {
 #elif LUA_VERSION_NUM == 503
   sizeNumber_50300, sizeNumber_50300, sizeNumber_50300, sizeNumber_50300, sizeNumber_50300, sizeNumber_50300, sizeNumber_50300
 #elif LUA_VERSION_NUM == 504
-  sizeNumber_50400, sizeNumber_50400
+  sizeNumber_50400, sizeNumber_50400, sizeNumber_50400
 #else
 #error unsupported Lua version
 #endif
@@ -80,7 +80,7 @@ static StringSizeFunction const stringSizeFuncs[] = {
 #elif LUA_VERSION_NUM == 503
   sizeString_50300, sizeString_50301, sizeString_50301, sizeString_50301, sizeString_50301, sizeString_50301, sizeString_50301
 #elif LUA_VERSION_NUM == 504
-  sizeString_50400, sizeString_50400
+  sizeString_50400, sizeString_50400, sizeString_50400
 #else
 #error unsupported Lua version
 #endif
@@ -101,7 +101,7 @@ static FunctionSizeFunction const functionSizeFuncs[] = {
 #elif LUA_VERSION_NUM == 503
   sizeFunction_50300, sizeFunction_50300, sizeFunction_50300, sizeFunction_50300, sizeFunction_50300, sizeFunction_50300, sizeFunction_50300
 #elif LUA_VERSION_NUM == 504
-  sizeFunction_50400, sizeFunction_50400
+  sizeFunction_50400, sizeFunction_50400, sizeFunction_50400
 #else
 #error unsupported Lua version
 #endif
@@ -123,7 +123,7 @@ static TableNodeFunction const tableNodeFuncs[] = {
 #elif LUA_VERSION_NUM == 503
   tableNode_50300, tableNode_50300, tableNode_50300, tableNode_50300, tableNode_50300, tableNode_50300, tableNode_50300
 #elif LUA_VERSION_NUM == 504
-  tableNode_50400, tableNode_50400
+  tableNode_50400, tableNode_50400, tableNode_50400
 #else
 #error unsupported Lua version
 #endif
@@ -145,7 +145,7 @@ static TableSizeFunction const tableSizeFuncs[] = {
 #elif LUA_VERSION_NUM == 503
   sizeTable_50300, sizeTable_50300, sizeTable_50300, sizeTable_50300, sizeTable_50300, sizeTable_50300, sizeTable_50300
 #elif LUA_VERSION_NUM == 504
-  sizeTable_50400, sizeTable_50400
+  sizeTable_50400, sizeTable_50400, sizeTable_50400
 #else
 #error unsupported Lua version
 #endif
@@ -166,7 +166,7 @@ static UserdataSizeFunction const userdataSizeFuncs[] = {
 #elif LUA_VERSION_NUM == 503
   sizeUserdata_50300, sizeUserdata_50300, sizeUserdata_50300, sizeUserdata_50300, sizeUserdata_50300, sizeUserdata_50300, sizeUserdata_50300
 #elif LUA_VERSION_NUM == 504
-  sizeUserdata_50400, sizeUserdata_50400
+  sizeUserdata_50400, sizeUserdata_50400, sizeUserdata_50400
 #else
 #error unsupported Lua version
 #endif
@@ -180,6 +180,7 @@ extern size_t sizeThread_50300(void const*);
 extern size_t sizeThread_50302(void const*);
 extern size_t sizeThread_50400(void const*);
 extern size_t sizeThread_50401(void const*);
+extern size_t sizeThread_50402(void const*);
 
 static ThreadSizeFunction const threadSizeFuncs[] = {
 #if LUA_VERSION_NUM == 501
@@ -189,7 +190,7 @@ static ThreadSizeFunction const threadSizeFuncs[] = {
 #elif LUA_VERSION_NUM == 503
   sizeThread_50300, sizeThread_50300, sizeThread_50302, sizeThread_50302, sizeThread_50302, sizeThread_50302, sizeThread_50302
 #elif LUA_VERSION_NUM == 504
-  sizeThread_50400, sizeThread_50401
+  sizeThread_50400, sizeThread_50401, sizeThread_50402
 #else
 #error unsupported Lua version
 #endif

compat_50402.c

@@ -0,0 +1,20 @@
+#include <lua.h>
+
+
+#if LUA_VERSION_NUM == 504
+#define LUA_CORE
+#include "lua5.4/2/lstate.h"
+
+
+size_t sizeThread_50402(void const* o)
+{
+  lua_State const* th = thvalue((TValue const*)o);
+  CallInfo *ci = th->base_ci.next;
+  size_t cisize = 0;
+  for (; ci != NULL; ci = ci->next)
+    cisize += sizeof(CallInfo);
+  return sizeof(lua_State) + sizeof(TValue) * (stacksize(th) + EXTRA_STACK) + cisize;
+}
+
+#endif
+

getsize-scm-0.rockspec

@@ -37,6 +37,7 @@ build = {
         "compat_50301.c",
         "compat_50302.c",
         "compat_50401.c",
+        "compat_50402.c",
       }
     }
   }