Skip to content

assert instead of erroring on lua upvalues #17

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
D-Berg wants to merge 1 commit into from
+30 −20
Open

assert instead of erroring on lua upvalues #17

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
41 changes: 23 additions & 18 deletions src/actions/build_package.zig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -296,11 +296,9 @@ fn luaEnvSet(state: ?*zlua.LuaState) callconv(.c) c_int {
return 2;
}

const ud = lua.toUserdata(lua.upvalueIndex(1)) orelse {
lua.pushNil();
_ = lua.pushLString("null userdata");
return 2;
};
const ud = lua.toUserdata(lua.upvalueIndex(1));
assert(ud != null);

const env_map: *std.process.Environ.Map = @ptrCast(@alignCast(ud));

const key = lua.toLString(1);
Expand All @@ -326,11 +324,9 @@ fn luaEnvGet(state: ?*zlua.LuaState) callconv(.c) c_int {
return 2;
}

const ud = lua.toUserdata(lua.upvalueIndex(1)) orelse {
lua.pushNil();
_ = lua.pushLString("null userdata");
return 2;
};
const ud = lua.toUserdata(lua.upvalueIndex(1));
assert(ud != null);

const env_map: *std.process.Environ.Map = @ptrCast(@alignCast(ud));

const key = lua.toString(1);
Expand All @@ -351,11 +347,9 @@ fn luaEnvAppend(state: ?*zlua.LuaState) callconv(.c) c_int {
return 2;
}

const ud = lua.toUserdata(lua.upvalueIndex(1)) orelse {
lua.pushNil();
_ = lua.pushLString("null userdata");
return 2;
};
const ud = lua.toUserdata(lua.upvalueIndex(1));
assert(ud != null);

const env: *std.process.Environ.Map = @ptrCast(@alignCast(ud));

const key = lua.toLString(1);
Expand Down Expand Up @@ -391,7 +385,10 @@ fn luaRun(state: ?*zlua.LuaState) callconv(.c) c_int {
return 2;
}

const ctx: *const RunContext = @ptrCast(@alignCast(lua.toUserdata(lua.upvalueIndex(1))));
const ud = lua.toUserdata(lua.upvalueIndex(1));
assert(ud != null);

const ctx: *const RunContext = @ptrCast(@alignCast(ud));

var scratch_arena: std.heap.ArenaAllocator = .init(ctx.gpa);
defer scratch_arena.deinit();
Expand Down Expand Up @@ -508,7 +505,10 @@ const DepContext = struct {
fn luaDep(state: ?*zlua.LuaState) callconv(.c) c_int {
const lua: zlua.State = .{ .inner = state.? };

const ctx: *const DepContext = @ptrCast(@alignCast(lua.toUserdata(lua.upvalueIndex(1))));
const ud = lua.toUserdata(lua.upvalueIndex(1));
assert(ud != null);

const ctx: *const DepContext = @ptrCast(@alignCast(ud));
var arena_impl: std.heap.ArenaAllocator = .init(ctx.gpa);
defer arena_impl.deinit();

Expand Down Expand Up @@ -572,9 +572,14 @@ fn luaDep(state: ?*zlua.LuaState) callconv(.c) c_int {
const PathJoinContext = struct {
gpa: Allocator,
};

fn luaPathJoin(state: ?*zlua.LuaState) callconv(.c) c_int {
const lua: zlua.State = .{ .inner = state.? };
const ctx: *const PathJoinContext = @ptrCast(@alignCast(lua.toUserdata(lua.upvalueIndex(1))));

const ud = lua.toUserdata(lua.upvalueIndex(1));
assert(ud != null);

const ctx: *const PathJoinContext = @ptrCast(@alignCast(ud));

const argc: usize = @intCast(lua.getTop());

Expand Down
9 changes: 7 additions & 2 deletions src/lua_helpers.zig
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
const std = @import("std");
const zlua = @import("zlua");
const builtin = @import("builtin");
const assert = std.debug.assert;

pub fn lua_pkg(state: ?*zlua.LuaState) callconv(.c) c_int {
const lua: zlua.State = .{ .inner = state.? };
Expand Down Expand Up @@ -36,7 +37,7 @@ pub fn pushChecked(
native: zlua.CFunction,
context: ?*anyopaque,
) !void {
std.debug.assert(lua.getField(zlua.REGISTRYINDEX, "packa.checked") == .function);
assert(lua.getField(zlua.REGISTRYINDEX, "packa.checked") == .function);

var upvalues: usize = 0;
if (context) |ctx| {
Expand All @@ -53,7 +54,11 @@ const TestContext = struct {

fn testFailure(state: ?*zlua.LuaState) callconv(.c) c_int {
const lua: zlua.State = .{ .inner = state.? };
const context: *TestContext = @ptrCast(@alignCast(lua.toUserdata(lua.upvalueIndex(1))));

const ud = lua.toUserdata(lua.upvalueIndex(1));
assert(ud != null);

const context: *TestContext = @ptrCast(@alignCast(ud));
defer context.cleaned = true;

lua.pushNil();
Expand Down