Upgrade to Zig 0.15.1 and track Zig latest stable on main instead of nightly

Author: thsackos

.github/workflows/tests-ubuntu.yml

@@ -20,7 +20,7 @@ jobs:
     - name: (Z) Install Zig
       uses: mlugg/setup-zig@v2
       with:
-        version: 0.15.0-dev.565+8e72a2528
+        version: 0.15.1
 
     - name: Run tests
       shell: bash

.github/workflows/tests-windows.yml

@@ -20,7 +20,7 @@ jobs:
     - name: (Z) Install Zig
       uses: mlugg/setup-zig@v2
       with:
-        version: 0.15.0-dev.565+8e72a2528
+        version: 0.15.1
 
     - name: ▶️ Run tests
       shell: pwsh

LICENSE

@@ -1,14 +1,18 @@
 Copyright (c) 2025 Theodore Sackos
 
-Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation
-files (the " Software"), to deal in the Software without restriction, including without limitation the rights to use, copy,
-modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software
-is furnished to do so, subject to the following conditions:
+Permission is hereby granted, free of charge, to any person obtaining a copy of this
+software and associated documentation files (the " Software"), to deal in the Software
+without restriction, including without limitation the rights to use, copy, modify,
+merge, publish, distribute, sublicense, and/or sell copies of the Software, and to
+permit persons to whom the Software is furnished to do so, subject to the following
+conditions:
 
-The above copyright notice and this permission notice (including the next paragraph) shall be included in all copies or substantial
-portions of the Software.
+The above copyright notice and this permission notice (including the next
+paragraph) shall be included in all copies or substantial portions of the Software.
 
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
-OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS
-BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT
-OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED,
+INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR
+PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
+TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE
+USE OR OTHER DEALINGS IN THE SOFTWARE.

README.md

@@ -23,7 +23,9 @@ checks in `Debug` and `ReleaseSafe` builds and provides full test coverage of th
 
 ## Zig Version
 
-The `main` branch targets recent builds of Zig's `master` branch (last tested with Zig `0.15.0-dev.565+8e72a2528`).
+The `main` branch targets the latest stable Zig version. Currently `0.15.1`.
+
+For other Zig versions look for branches with the named version.
 
 ## Installation & Usage
 

build.zig

@@ -18,8 +18,9 @@ pub fn build(b: *std.Build) void {
         .optimize = optimize,
     });
 
-    const lib = b.addStaticLibrary(.{
+    const lib = b.addLibrary(.{
         .name = "luajit",
+        .linkage = .static,
         .root_module = lib_mod,
     });
     lib.root_module.addImport("c", luajit_build);

build.zig.zon

@@ -1,11 +1,11 @@
 .{
     .name = .luajit,
     .fingerprint = 0xda4bba66d285c19c,
-    .version = "2.0.0",
+    .version = "2.1.0",
     .dependencies = .{
         .luajit_build = .{
-            .url = "git+https://github.com/sackosoft/zig-luajit-build#d75c20acaa4df39f51187926fa9d98e4e5231064",
-            .hash = "luajit_build-1.1.4-HFjoU14-AACEEcPwP8nRnDSLS3EByuR8u5ZWAXBq08PH",
+            .url = "git+https://github.com/sackosoft/zig-luajit-build#1664f2be707feccf4191fb8c6c6dff9ac2bd6edb",
+            .hash = "luajit_build-1.1.6-HFjoU9xAAAANlxEGfin2P8D_sVc-AHtqKC6Fg8WWztZN",
         },
     },
     .paths = .{

examples/simple-repl/LAST_TESTED_WITH_ZIG_VERSION.txt

@@ -1,6 +1,35 @@
+# simple-repl
+
+This sample application is provided to demonstrate the functionality of the the `zig-luajit` bindings.
+It creates a Read-Evaluate-Print Loop (REPL) which reads a line of Lua code as input from the user,
+evaluates the expression and prints the result to the output.
+
+## Version
+
+Last tested with Zig version `0.15.1`.
+
+## Usage
+
 Usage instructions:
 
-* Build the repl with `zig build` -- ensure your current working directory is within `zig-luajit/examples/simple-repl`.
-* Run the executable with `zig-luajit/examples/simple-repl/zig-out/bin/simple-repl`.
-* Use `print()` to make Lua print the value to standard output.
-    - The `simple-repl` does not do any output itself.
+* Ensure your current working directory is `zig-luajit/examples/simple-repl`.
+* Use `zig build run` to run the application.
+* Use `print()` to write Lua values to standard output. The REPL does not do any output itself.
+* Use `exit` or `quit` or `Ctrl+C` to stop.
+
+## Example Output
+
+Here's a sample of running the interpreter:
+
+```
+~/repos/zig-luajit/examples/simple-repl > zig build run
+> print('Hello, world!')
+Hello, world!
+> print(1 + 1)
+2
+> f = function() print("Yes, even functions work too") end
+> f()
+Yes, even functions work too
+> exit
+~/repos/zig-luajit/examples/simple-repl > 
+```

examples/simple-repl/README.md

@@ -14,24 +14,35 @@ pub fn main() !void {
 
     lua.openBaseLib();
 
-    const stdin = std.io.getStdIn();
-    const stdout = std.io.getStdOut();
+    var stdin_buffer: [1024]u8 = undefined;
+    var stdin_reader = std.fs.File.stdin().reader(&stdin_buffer);
+    const stdin = &stdin_reader.interface;
 
-    var buf: [1025]u8 = undefined;
-    const read_slice = buf[0..1024];
+    var stdout_buffer: [1024]u8 = undefined;
+    var stdout_writer = std.fs.File.stdout().writer(&stdout_buffer);
+    const stdout = &stdout_writer.interface;
+
+    var line_buffer: [1025]u8 = undefined;
 
     while (true) {
         try stdout.writeAll("> ");
+        try stdout.flush();
+
+        var line_writer = std.Io.Writer.fixed(&line_buffer);
+        const input_len = try stdin.streamDelimiterLimit(&line_writer, '\n', std.Io.Limit.limited(1024));
+        if (input_len == 0) continue;
 
-        const input = try stdin.reader().readUntilDelimiter(read_slice, '\n');
-        if (input.len == 0) continue;
+        // Throw away the `\n` on the input.
+        stdin.toss(1);
 
-        if (std.mem.eql(u8, input, "exit")) break;
+        // Replace the `\n` terminated string with a null terminated (`\0`) string.
+        line_buffer[input_len] = '\u{0}';
+        const input = line_buffer[0..input_len :0];
 
-        buf[input.len] = 0;
-        const actual = buf[0..input.len :0];
+        if (std.mem.eql(u8, input[0..4], "exit")) break;
+        if (std.mem.eql(u8, input[0..4], "quit")) break;
 
-        lua.doString(actual) catch |err| {
+        lua.doString(input) catch |err| {
             std.debug.print("Error: {}\n", .{err});
             continue;
         };

examples/simple-repl/main.zig

@@ -15,7 +15,7 @@ pub const AllocFn = fn (
     ptr: ?*anyopaque,
     osize: usize,
     nsize: usize,
-) callconv(.C) ?*align(max_alignment_bytes) anyopaque;
+) callconv(.c) ?*align(max_alignment_bytes) anyopaque;
 
 /// Memory allocation function used by Lua instances. This functino acts as an adaptor from the C API to the
 /// idiomatic Zig `std.mem.Allocator` type. The implementation provides functionality similar to realloc.
@@ -37,7 +37,7 @@ pub const AllocFn = fn (
 ///
 /// From: `void * (*lua_Alloc) (void *ud, void *ptr, size_t osize, size_t nsize);`
 /// Refer to: https://www.lua.org/manual/5.1/manual.html#lua_Alloc
-pub fn alloc(ud: ?*anyopaque, ptr: ?*anyopaque, osize: usize, nsize: usize) callconv(.C) ?*align(max_alignment_bytes) anyopaque {
+pub fn alloc(ud: ?*anyopaque, ptr: ?*anyopaque, osize: usize, nsize: usize) callconv(.c) ?*align(max_alignment_bytes) anyopaque {
     std.debug.assert(ud != null);
 
     const user_data: *AllocationUserdata = @ptrCast(@alignCast(ud.?));