chore: update for Zig 0.10.0

In anticipation for the Zig release coming soon (and the new self-hosted
compiler finally free of bugs that prevented this project from
compiling), this updates the sources for each version of Lua to work in
the new compiler. Mostly trivial changes.

Note that at this point Lua 5.1 doesn't yet compile due to a bug that
was just fixed in Zig, and will be addressed later on.

Author: natecraddock

build.zig

@@ -54,7 +54,7 @@ pub fn linkAndPackage(b: *Builder, step: *LibExeObjStep, options: Options) std.b
     const lib_path = libPath(options.version);
     return .{
         .name = "ziglua",
-        .path = .{ .path = std.fs.path.join(b.allocator, &.{ dir(), lib_path }) catch unreachable },
+        .source = .{ .path = std.fs.path.join(b.allocator, &.{ dir(), lib_path }) catch unreachable },
     };
 }
 
@@ -84,9 +84,9 @@ fn buildLua(b: *Builder, step: *LibExeObjStep, options: Options) *LibExeObjStep
 
     const apicheck = step.build_mode == .Debug and options.use_apicheck;
 
-    step.addIncludeDir(std.fs.path.join(b.allocator, &.{ dir(), lib_dir }) catch unreachable);
+    step.addIncludePath(std.fs.path.join(b.allocator, &.{ dir(), lib_dir }) catch unreachable);
 
-    const target = (std.zig.system.NativeTargetInfo.detect(b.allocator, step.target) catch unreachable).target;
+    const target = (std.zig.system.NativeTargetInfo.detect(step.target) catch unreachable).target;
 
     const flags = [_][]const u8{
         // Standard version used in Lua Makefile

src/ziglua-5.1/lib.zig

@@ -21,11 +21,11 @@ const Allocator = std.mem.Allocator;
 /// `osize` is the original size or a code, and `nsize` is the new size
 ///
 /// See https://www.lua.org/manual/5.4/manual.html#lua_Alloc for more details
-pub const AllocFn = fn (data: ?*anyopaque, ptr: ?*anyopaque, osize: usize, nsize: usize) callconv(.C) ?*anyopaque;
+pub const AllocFn = *const fn (data: ?*anyopaque, ptr: ?*anyopaque, osize: usize, nsize: usize) callconv(.C) ?*anyopaque;
 
 /// Type for C functions
 /// See https://www.lua.org/manual/5.4/manual.html#lua_CFunction for the protocol
-pub const CFn = fn (state: ?*LuaState) callconv(.C) c_int;
+pub const CFn = *const fn (state: ?*LuaState) callconv(.C) c_int;
 
 /// The internal Lua debug structure
 const Debug = c.lua_Debug;
@@ -109,7 +109,7 @@ pub const FnReg = struct {
 };
 
 /// Type for debugging hook functions
-pub const CHookFn = fn (state: ?*LuaState, ar: ?*Debug) callconv(.C) void;
+pub const CHookFn = *const fn (state: ?*LuaState, ar: ?*Debug) callconv(.C) void;
 
 /// Specifies on which events the hook will be called
 pub const HookMask = packed struct {
@@ -199,7 +199,7 @@ pub const mult_return = c.LUA_MULTRET;
 pub const Number = c.lua_Number;
 
 /// The type of the reader function used by `Lua.load()`
-pub const CReaderFn = fn (state: ?*LuaState, data: ?*anyopaque, size: [*c]usize) callconv(.C) [*c]const u8;
+pub const CReaderFn = *const fn (state: ?*LuaState, data: ?*anyopaque, size: [*c]usize) callconv(.C) [*c]const u8;
 
 /// The possible status of a call to `Lua.resumeThread`
 pub const ResumeStatus = enum(u1) {
@@ -251,7 +251,7 @@ pub const err_file = c.LUA_ERRFILE;
 pub const Stream = c.luaL_Stream;
 
 /// The type of the writer function used by `Lua.dump()`
-pub const CWriterFn = fn (state: ?*LuaState, buf: ?*const anyopaque, size: usize, data: ?*anyopaque) callconv(.C) c_int;
+pub const CWriterFn = *const fn (state: ?*LuaState, buf: ?*const anyopaque, size: usize, data: ?*anyopaque) callconv(.C) c_int;
 
 /// A Zig wrapper around the Lua C API
 /// Represents a Lua state or thread and contains the entire state of the Lua interpreter
@@ -262,8 +262,6 @@ pub const Lua = struct {
     /// Allows Lua to allocate memory using a Zig allocator passed in via data.
     /// See https://www.lua.org/manual/5.4/manual.html#lua_Alloc for more details
     fn alloc(data: ?*anyopaque, ptr: ?*anyopaque, osize: usize, nsize: usize) callconv(.C) ?*anyopaque {
-        _ = osize; // unused
-
         // just like malloc() returns a pointer "which is suitably aligned for any built-in type",
         // the memory allocated by this function should also be aligned for any type that Lua may
         // desire to allocate. use the largest alignment for the target
@@ -282,6 +280,8 @@ pub const Lua = struct {
             // when nsize is not zero the allocator must behave like realloc
             const new_ptr = allocator.reallocAdvanced(prev_slice, alignment, nsize, .exact) catch return null;
             return new_ptr.ptr;
+        } else if (nsize == 0) {
+            return null;
         } else {
             // ptr is null, allocate a new block of memory
             const new_ptr = allocator.alignedAlloc(u8, alignment, nsize) catch return null;

src/ziglua-5.1/tests.zig

@@ -42,7 +42,6 @@ const sub = struct {
 
 fn alloc(data: ?*anyopaque, ptr: ?*anyopaque, osize: usize, nsize: usize) callconv(.C) ?*anyopaque {
     _ = data;
-    _ = osize;
 
     const alignment = @alignOf(std.c.max_align_t);
     if (@ptrCast(?[*]align(alignment) u8, @alignCast(alignment, ptr))) |prev_ptr| {
@@ -53,6 +52,8 @@ fn alloc(data: ?*anyopaque, ptr: ?*anyopaque, osize: usize, nsize: usize) callco
         }
         const new_ptr = testing.allocator.reallocAdvanced(prev_slice, alignment, nsize, .exact) catch return null;
         return new_ptr.ptr;
+    } else if (nsize == 0) {
+        return null;
     } else {
         const new_ptr = testing.allocator.alignedAlloc(u8, alignment, nsize) catch return null;
         return new_ptr.ptr;
@@ -1040,7 +1041,7 @@ test "userdata" {
     defer lua.deinit();
 
     const Type = struct { a: i32, b: f32 };
-    try lua.newMetatable("Type");
+    try lua.newMetatable(@typeName(Type));
 
     const checkUdata = ziglua.wrap(struct {
         fn inner(l: *Lua) i32 {
@@ -1061,7 +1062,7 @@ test "userdata" {
 
     {
         var t = lua.newUserdata(Type);
-        lua.getField(ziglua.registry_index, "Type");
+        lua.getField(ziglua.registry_index, @typeName(Type));
         lua.setMetatable(-2);
         t.a = 1234;
         t.b = 3.14;