Merge pull request #103 from gilzoide/bugfix/reload-gdextension

Use Ref<LuaFunction> instead of sol::protected_function in Lua methods

Author: gilzoide

CHANGELOG.md

@@ -20,6 +20,7 @@
 ### Fixed
 - Use `xcframework` instead of `dylib` in iOS exports
 - Crash when Lua errors, but the error object is not a string
+- Crash when reloading the GDExtension
 
 
 ## [0.3.0](https://github.com/gilzoide/lua-gdextension/releases/tag/0.3.0)

src/LuaCoroutine.cpp

@@ -80,6 +80,10 @@ sol::protected_function_result LuaCoroutine::_resume(lua_State *L, const Variant
 	return function_result;
 }
 
+Variant LuaCoroutine::invoke_lua(Ref<LuaFunction> f, const VariantArguments& args, bool return_lua_error) {
+	return invoke_lua(f->get_function(), args, return_lua_error);
+}
+
 Variant LuaCoroutine::invoke_lua(const sol::protected_function& f, const VariantArguments& args, bool return_lua_error) {
 	LuaCoroutinePool pool(f.lua_state());
 	sol::thread coroutine = pool.acquire(f);

src/LuaCoroutine.hpp

@@ -46,6 +46,7 @@ class LuaCoroutine : public LuaThread {
 	Variant resumev(const Array& args);
 	Variant resume(const Variant **argv, GDExtensionInt argc, GDExtensionCallError& error);
 
+	static Variant invoke_lua(Ref<LuaFunction> f, const VariantArguments& args, bool return_lua_error);
 	static Variant invoke_lua(const sol::protected_function& f, const VariantArguments& args, bool return_lua_error);
 
 protected:

src/LuaFunction.cpp

@@ -49,6 +49,10 @@ Variant LuaFunction::invoke(const Variant **args, GDExtensionInt arg_count, GDEx
 	return invoke_lua(lua_object, VariantArguments(args, arg_count), true);
 }
 
+Variant LuaFunction::invoke_lua(Ref<LuaFunction> f, const VariantArguments& args, bool return_lua_error) {
+	return invoke_lua(f->get_function(), args, return_lua_error);
+}
+
 Variant LuaFunction::invoke_lua(const sol::protected_function& f, const VariantArguments& args, bool return_lua_error) {
 	sol::protected_function_result result = f.call(args);
 	return to_variant(result, return_lua_error);

src/LuaFunction.hpp

@@ -42,6 +42,7 @@ class LuaFunction : public LuaObjectSubclass<sol::protected_function> {
 	Variant invokev(const Array& args);
 	Variant invoke(const Variant **args, GDExtensionInt arg_count, GDExtensionCallError &error);
 
+	static Variant invoke_lua(Ref<LuaFunction> f, const VariantArguments& args, bool return_lua_error);
 	static Variant invoke_lua(const sol::protected_function& f, const VariantArguments& args, bool return_lua_error);
 
 	Callable to_callable() const;

src/LuaObject.hpp

@@ -41,7 +41,7 @@ class LuaObject : public RefCounted {
 	uint64_t get_pointer_value() const;
 
 	template<typename Subclass, typename ref_t>
-	static Subclass *wrap_object(const sol::basic_object<ref_t>& lua_obj) {
+	static Ref<Subclass> wrap_object(const sol::basic_object<ref_t>& lua_obj) {
 		if (LuaObject **known_obj = known_objects.getptr(lua_obj.pointer())) {
 			return (Subclass *) *known_obj;
 		}

src/LuaState.cpp

@@ -189,15 +189,15 @@ Variant LuaState::do_file(const String& filename, LoadMode mode, LuaTable *env)
 	return ::luagdextension::do_file(lua_state, filename, (sol::load_mode) mode, env);
 }
 
-LuaTable *LuaState::get_globals() const {
+Ref<LuaTable> LuaState::get_globals() const {
 	return LuaObject::wrap_object<LuaTable>(lua_state.globals());
 }
 
-LuaTable *LuaState::get_registry() const {
+Ref<LuaTable> LuaState::get_registry() const {
 	return LuaObject::wrap_object<LuaTable>(lua_state.registry());
 }
 
-LuaThread *LuaState::get_main_thread() const {
+Ref<LuaThread> LuaState::get_main_thread() const {
 	return LuaObject::wrap_object<LuaThread>(sol::thread(lua_state, lua_state));
 }
 

src/LuaState.hpp

@@ -114,9 +114,9 @@ class LuaState : public RefCounted {
 	Variant do_string(const String& chunk, const String& chunkname = "", LuaTable *env = nullptr);
 	Variant do_file(const String& filename, LoadMode mode = LOAD_MODE_ANY, LuaTable *env = nullptr);
 
-	LuaTable *get_globals() const;
-	LuaTable *get_registry() const;
-	LuaThread *get_main_thread() const;
+	Ref<LuaTable> get_globals() const;
+	Ref<LuaTable> get_registry() const;
+	Ref<LuaThread> get_main_thread() const;
 
 	String get_package_path() const;
 	String get_package_cpath() const;

src/LuaThread.cpp

@@ -92,7 +92,7 @@ void LuaThread::set_hook(Variant hook, BitField<HookMask> mask, int count) {
 	lua_push(L, hook);  // value (hook)
 	lua_rawset(L, -3);  // hooktable[L] = hook
 	lua_pop(L, 1);
-	if (hook) {
+	if (hook && mask) {
 		lua_sethook(L, hookf, mask, count);
 	}
 	else {

src/script-language/LuaScriptMethod.cpp

@@ -21,37 +21,32 @@
  */
 #include "LuaScriptMethod.hpp"
 
+#include "../LuaDebug.hpp"
 #include "../utils/stack_top_checker.hpp"
 
 namespace luagdextension {
 
 LuaScriptMethod::LuaScriptMethod(const StringName& name, sol::protected_function method)
 	: name(name)
-	, method(method)
+	, method(LuaObject::wrap_object<LuaFunction>(method))
 {
 }
 
 bool LuaScriptMethod::is_valid() const {
-	return method.valid();
+	return method.is_valid();
 }
 
 int LuaScriptMethod::get_line_defined() const {
 #ifdef DEBUG_ENABLED
-	lua_Debug lua_info;
-	method.push();
-	lua_getinfo(method.lua_state(), ">S", &lua_info);
-	return lua_info.linedefined;
+	return method->get_debug_info()->get_line_defined();
 #else
 	return -1;
 #endif
 }
 
 Variant LuaScriptMethod::get_argument_count() const {
 #ifdef DEBUG_ENABLED
-	lua_Debug lua_info;
-	method.push();
-	lua_getinfo(method.lua_state(), ">u", &lua_info);
-	return lua_info.nparams;
+	return method->get_debug_info()->get_nparams();
 #else
 	return {};
 #endif
@@ -62,22 +57,19 @@ MethodInfo LuaScriptMethod::to_method_info() const {
 	mi.name = name;
 
 #ifdef DEBUG_ENABLED
-	sol::state_view state = method.lua_state();
+	sol::state_view state = method->get_function().lua_state();
 	StackTopChecker topcheck(state);
 
-	lua_Debug lua_info;
-	method.push(state);
-	lua_getinfo(state, ">u", &lua_info);
-	
-	auto methodpop = sol::stack::push_pop(state, method);
-	for (int i = 0; i < lua_info.nparams; i++) {
+	auto debug_info = method->get_debug_info();
+	auto methodpop = sol::stack::push_pop(state, method->get_function());
+	for (int i = 0; i < debug_info->get_nparams(); i++) {
 		String arg_name = lua_getlocal(state, nullptr, i + 1);
 		if (i == 0 && arg_name == "self") {
 			continue;
 		}
 		mi.arguments.push_back(PropertyInfo(Variant::Type::NIL, arg_name));
 	}
-	if (lua_info.isvararg) {
+	if (debug_info->is_vararg()) {
 		mi.flags |= GDEXTENSION_METHOD_FLAG_VARARG;
 	}
 #endif