From 9ea98e3f1ea04591f2181fc50e175467f95b26c1 Mon Sep 17 00:00:00 2001
From: Alex Orlenko <zxteam@protonmail.com>
Date: Mon, 5 May 2025 12:02:13 +0100
Subject: [PATCH] Sync mlua-sys with the main branch

---
 mlua-sys/src/lua51/compat.rs    |  2 +-
 mlua-sys/src/lua51/lauxlib.rs   |  3 +++
 mlua-sys/src/lua52/compat.rs    |  2 +-
 mlua-sys/src/lua52/lauxlib.rs   |  6 ++++++
 mlua-sys/src/luau/compat.rs     | 15 +++++++++++++++
 mlua-sys/src/luau/luarequire.rs |  2 ++
 6 files changed, 28 insertions(+), 2 deletions(-)

diff --git a/mlua-sys/src/lua51/compat.rs b/mlua-sys/src/lua51/compat.rs
index 8c2d7bf..29837f2 100644
--- a/mlua-sys/src/lua51/compat.rs
+++ b/mlua-sys/src/lua51/compat.rs
@@ -548,7 +548,7 @@ pub unsafe fn luaL_getsubtable(L: *mut lua_State, idx: c_int, fname: *const c_ch
 
 pub unsafe fn luaL_requiref(L: *mut lua_State, modname: *const c_char, openf: lua_CFunction, glb: c_int) {
     luaL_checkstack(L, 3, cstr!("not enough stack slots available"));
-    luaL_getsubtable(L, LUA_REGISTRYINDEX, cstr!("_LOADED"));
+    luaL_getsubtable(L, LUA_REGISTRYINDEX, LUA_LOADED_TABLE);
     if lua_getfield(L, -1, modname) == LUA_TNIL {
         lua_pop(L, 1);
         lua_pushcfunction(L, openf);
diff --git a/mlua-sys/src/lua51/lauxlib.rs b/mlua-sys/src/lua51/lauxlib.rs
index 5423885..78cef29 100644
--- a/mlua-sys/src/lua51/lauxlib.rs
+++ b/mlua-sys/src/lua51/lauxlib.rs
@@ -8,6 +8,9 @@ use super::lua::{self, lua_CFunction, lua_Integer, lua_Number, lua_State};
 // Extra error code for 'luaL_load'
 pub const LUA_ERRFILE: c_int = lua::LUA_ERRERR + 1;
 
+// Key, in the registry, for table of loaded modules
+pub const LUA_LOADED_TABLE: *const c_char = cstr!("_LOADED");
+
 #[repr(C)]
 pub struct luaL_Reg {
     pub name: *const c_char,
diff --git a/mlua-sys/src/lua52/compat.rs b/mlua-sys/src/lua52/compat.rs
index 68c7029..0482914 100644
--- a/mlua-sys/src/lua52/compat.rs
+++ b/mlua-sys/src/lua52/compat.rs
@@ -232,7 +232,7 @@ pub unsafe fn luaL_tolstring(L: *mut lua_State, mut idx: c_int, len: *mut usize)
 
 pub unsafe fn luaL_requiref(L: *mut lua_State, modname: *const c_char, openf: lua_CFunction, glb: c_int) {
     luaL_checkstack(L, 3, cstr!("not enough stack slots available"));
-    luaL_getsubtable(L, LUA_REGISTRYINDEX, cstr!("_LOADED"));
+    luaL_getsubtable(L, LUA_REGISTRYINDEX, LUA_LOADED_TABLE);
     if lua_getfield(L, -1, modname) == LUA_TNIL {
         lua_pop(L, 1);
         lua_pushcfunction(L, openf);
diff --git a/mlua-sys/src/lua52/lauxlib.rs b/mlua-sys/src/lua52/lauxlib.rs
index d5cdf66..fad19eb 100644
--- a/mlua-sys/src/lua52/lauxlib.rs
+++ b/mlua-sys/src/lua52/lauxlib.rs
@@ -8,6 +8,12 @@ use super::lua::{self, lua_CFunction, lua_Integer, lua_Number, lua_State, lua_Un
 // Extra error code for 'luaL_load'
 pub const LUA_ERRFILE: c_int = lua::LUA_ERRERR + 1;
 
+// Key, in the registry, for table of loaded modules
+pub const LUA_LOADED_TABLE: *const c_char = cstr!("_LOADED");
+
+// Key, in the registry, for table of preloaded loaders
+pub const LUA_PRELOAD_TABLE: *const c_char = cstr!("_PRELOAD");
+
 #[repr(C)]
 pub struct luaL_Reg {
     pub name: *const c_char,
diff --git a/mlua-sys/src/luau/compat.rs b/mlua-sys/src/luau/compat.rs
index ebf3aea..4121293 100644
--- a/mlua-sys/src/luau/compat.rs
+++ b/mlua-sys/src/luau/compat.rs
@@ -10,6 +10,8 @@ use super::lauxlib::*;
 use super::lua::*;
 use super::luacode::*;
 
+pub const LUA_RESUMEERROR: c_int = -1;
+
 unsafe fn compat53_reverse(L: *mut lua_State, mut a: c_int, mut b: c_int) {
     while a < b {
         lua_pushvalue(L, a);
@@ -291,6 +293,19 @@ pub unsafe fn lua_resume(L: *mut lua_State, from: *mut lua_State, narg: c_int, n
     ret
 }
 
+#[inline(always)]
+pub unsafe fn lua_resumex(L: *mut lua_State, from: *mut lua_State, narg: c_int, nres: *mut c_int) -> c_int {
+    let ret = if narg == LUA_RESUMEERROR {
+        lua_resumeerror(L, from)
+    } else {
+        lua_resume_(L, from, narg)
+    };
+    if (ret == LUA_OK || ret == LUA_YIELD) && !(nres.is_null()) {
+        *nres = lua_gettop(L);
+    }
+    ret
+}
+
 //
 // lauxlib ported functions
 //
diff --git a/mlua-sys/src/luau/luarequire.rs b/mlua-sys/src/luau/luarequire.rs
index 30a7267..dcdd0b8 100644
--- a/mlua-sys/src/luau/luarequire.rs
+++ b/mlua-sys/src/luau/luarequire.rs
@@ -4,6 +4,8 @@ use std::os::raw::{c_char, c_int, c_void};
 
 use super::lua::lua_State;
 
+pub const LUA_REGISTERED_MODULES_TABLE: *const c_char = cstr!("_REGISTEREDMODULES");
+
 #[repr(C)]
 pub enum luarequire_NavigateResult {
     Success,