Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
9 changes: 5 additions & 4 deletions src/lib.zig
Original file line number Diff line number Diff line change
Expand Up @@ -2521,14 +2521,15 @@ pub const Lua = opaque {

/// Starts and resumes a coroutine in the given thread
/// See https://www.lua.org/manual/5.4/manual.html#lua_resume
fn resumeThread54(lua: *Lua, from: ?*Lua, num_args: i32, num_results: *i32) CallError!ResumeStatus {
fn resumeThread54(lua: *Lua, from: ?*Lua, num_args: i32) CallError!struct { ResumeStatus, i32 } {
var num_results: i32 = undefined;
const from_state: ?*LuaState = if (from) |from_val| @ptrCast(from_val) else null;
const thread_status = c.lua_resume(@ptrCast(lua), from_state, num_args, num_results);
const thread_status = c.lua_resume(@ptrCast(lua), from_state, num_args, &num_results);
switch (thread_status) {
StatusCode.err_runtime => return error.LuaRuntime,
StatusCode.err_memory => return error.OutOfMemory,
StatusCode.err_error => return error.LuaMsgHandler,
else => return @enumFromInt(thread_status),
else => return .{ @enumFromInt(thread_status), num_results },
}
}

Expand Down Expand Up @@ -3099,7 +3100,7 @@ pub const Lua = opaque {
/// * Lua Runtime Errors: `none`
///
/// See https://www.lua.org/manual/5.4/manual.html#lua_xmove
pub fn xMove(lua: *Lua, to: *Lua, num: i32) void {
pub fn moveToThread(lua: *Lua, to: *Lua, num: i32) void {
c.lua_xmove(@ptrCast(lua), @ptrCast(to), num);
}

Expand Down
16 changes: 8 additions & 8 deletions src/tests.zig
Original file line number Diff line number Diff line change
Expand Up @@ -939,7 +939,7 @@ test "threads" {
lua.pushInteger(10);
lua.pushNil();

lua.xMove(new_thread, 2);
lua.moveToThread(new_thread, 2);
try expectEqual(2, new_thread.getTop());
}

Expand Down Expand Up @@ -1148,14 +1148,15 @@ test "yielding" {
if (zlua.lang == .lua54 or zlua.lang == .lua55) {
try expect(thread.isYieldable());

var results: i32 = undefined;
while (i < 5) : (i += 1) {
try expectEqual(.yield, try thread.resumeThread(lua, 0, &results));
const status, const num_results = try thread.resumeThread(lua, 0);
try expectEqual(.yield, status);
try expectEqual(1, num_results);
try expectEqual(i, try thread.toInteger(-1));
thread.pop(results);
thread.pop(num_results);
}

try expectEqual(.ok, try thread.resumeThread(lua, 0, &results));
try expectEqual(.ok, (try thread.resumeThread(lua, 0))[0]);
} else {
// Lua 5.3
try expect(!thread.isYieldable());
Expand Down Expand Up @@ -1258,12 +1259,11 @@ test "resuming" {
);
_ = thread.getGlobal("counter");

var num_results: i32 = 0;
var i: i32 = 1;
while (i <= 5) : (i += 1) {
try expectEqual(.yield, switch (zlua.lang) {
.lua51, .luajit => thread.resumeThread(0),
.lua54, .lua55 => thread.resumeThread(lua, 0, &num_results),
.lua54, .lua55 => (try thread.resumeThread(lua, 0))[0],
else => thread.resumeThread(lua, 0),
});

Expand All @@ -1273,7 +1273,7 @@ test "resuming" {

try expectEqual(.ok, switch (zlua.lang) {
.lua51, .luajit => thread.resumeThread(0),
.lua54, .lua55 => thread.resumeThread(lua, 0, &num_results),
.lua54, .lua55 => (try thread.resumeThread(lua, 0))[0],
else => thread.resumeThread(lua, 0),
});

Expand Down
Loading