Refactoring

KritzelKratzel · KritzelKratzel · commit fe76532c0a4e · 2025-03-15T13:09:11.000+01:00
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -0,0 +1,33 @@
+name: release
+
+on:
+  push:
+    tags:
+    - 'v*'
+
+jobs:
+  release:
+    runs-on: ubuntu-22.04
+
+    steps:
+      - id: get-version
+        uses: battila7/get-version-action@v2
+
+      - uses: actions/checkout@v3
+        with:
+          submodules: true
+
+      - id: release-asset
+        run: |
+          version=${{ steps.get-version.outputs.version-without-v }}
+          cd ..
+          cp -r lua-ffi lua-ffi-$version
+          rm -rf lua-ffi-$version/.git*
+          tar zcfv lua-ffi-$version.tar.gz lua-ffi-$version
+
+      - uses: marvinpinto/action-automatic-releases@latest
+        with:
+          repo_token: ${{ secrets.GITHUB_TOKEN }}
+          draft: true
+          prerelease: false
+          files: ../lua-ffi-*.tar.gz
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -152,7 +152,7 @@ include(FindPkgConfig)
 
 # Version settings
 set(LUA_FFI_VERSION_MAJOR 1)
-set(LUA_FFI_VERSION_MINOR 0)
+set(LUA_FFI_VERSION_MINOR 1)
 set(LUA_FFI_VERSION_PATCH 0)
 
 # Define options for selecting Lua versions
diff --git a/README.md b/README.md
@@ -6,7 +6,7 @@
 [4]: https://github.com/zhaojh329/lua-ffi/pulls
 [5]: https://img.shields.io/badge/Issues-welcome-brightgreen.svg?style=plastic
 [6]: https://github.com/zhaojh329/lua-ffi/issues/new
-[7]: https://img.shields.io/badge/release-1.0.0-blue.svg?style=plastic
+[7]: https://img.shields.io/badge/release-1.1.0-blue.svg?style=plastic
 [8]: https://github.com/zhaojh329/lua-ffi/releases
 [9]: https://github.com/zhaojh329/lua-ffi/workflows/build/badge.svg
 
diff --git a/ffi.c b/ffi.c
@@ -444,6 +444,7 @@ static struct ctype *ctype_new(lua_State *L, bool keep)
     struct ctype *ct = lua_newuserdata(L, sizeof(struct ctype));
 
     ct->type = CTYPE_VOID;
+    ct->ft = &ffi_type_void;
     ct->is_const = false;
 
     luaL_getmetatable(L, CTYPE_MT);
@@ -2497,15 +2498,17 @@ static void createmetatable(lua_State *L, const char *name, const struct luaL_Re
 
 static void create_nullptr(lua_State *L)
 {
-#ifndef _MSC_VER
-    // Currently segfaults on Win10 with MSVC
-    struct ctype *ct = ctype_new(L, false);
-    ctype_to_ptr(L, ct);
+    struct ctype match = {
+        .type = CTYPE_VOID,
+        .ft = &ffi_type_void
+    };
+    struct ctype *ct;
+
+    ctype_to_ptr(L, &match);
+
+    ct = ctype_lookup(L, &match, false);
+
     cdata_ptr_set(cdata_new(L, ct, NULL), NULL);
-#else
-    // Pushing NULL als lightuserdata has the same effect
-    lua_pushlightuserdata (L, NULL);
-#endif
 }
 
 DLL int luaopen_ffi(lua_State *L)
diff --git a/tests/test.lua b/tests/test.lua
@@ -43,6 +43,9 @@ ffi.cdef([[
 ]])
 
 local tests = {
+    function()
+        print(ffi.nullptr)
+    end,
     function()
         local a = ffi.new('int [10]', {1, 2, 3})
         assert(a[0] == 1)
