Return object instead of stack_object in some Lua wrapper functions

Author: gilzoide

src/LuaCoroutine.cpp

@@ -53,7 +53,7 @@ Variant LuaCoroutine::resume(const Variant **args, GDExtensionInt arg_count, GDE
 	lua_State *L = lua_object.thread_state();
 	if (arg_count > 0) {
 		for (int i = 0; i < arg_count; i++) {
-			std::ignore = lua_push(L, *args[i]);
+			lua_push(L, *args[i]);
 		}
 	}
 
@@ -69,7 +69,7 @@ Variant LuaCoroutine::resumev(const Array& args) {
 	lua_State *L = lua_object.thread_state();
 	int arg_count = args.size();
 	for (int i = 0; i < arg_count; i++) {
-		std::ignore = lua_push(L, args[i]);
+		lua_push(L, args[i]);
 	}
 
 	int nresults;

src/LuaFunction.cpp

@@ -45,7 +45,7 @@ Variant LuaFunction::invokev(const Array& args) {
 
 	lua_State *L = lua_object.lua_state();
 	for (int i = 0; i < arg_count; i++) {
-		std::ignore = lua_push(L, args[i]);
+		lua_push(L, args[i]);
 	}
 	sol::variadic_args lua_args(L, -arg_count);
 	return to_variant(lua_object.call(lua_args));
@@ -59,7 +59,7 @@ Variant LuaFunction::invoke(const Variant **args, GDExtensionInt arg_count, GDEx
 
 	lua_State *L = lua_object.lua_state();
 	for (int i = 0; i < arg_count; i++) {
-		std::ignore = lua_push(L, *args[i]);
+		lua_push(L, *args[i]);
 	}
 	sol::variadic_args lua_args(L, -arg_count);
 	return to_variant(lua_object.call(lua_args));
@@ -73,9 +73,9 @@ Variant LuaFunction::invoke_method(const Variant& self, const Variant **args, GD
 	error.error = GDEXTENSION_CALL_OK;
 
 	lua_State *L = lua_object.lua_state();
-	std::ignore = lua_push(L, self);
+	lua_push(L, self);
 	for (int i = 0; i < arg_count; i++) {
-		std::ignore = lua_push(L, *args[i]);
+		lua_push(L, *args[i]);
 	}
 	sol::variadic_args lua_args(L, -(1 + arg_count));
 	return to_variant(lua_object.call(lua_args));

src/LuaTable.cpp

@@ -40,7 +40,7 @@ sol::optional<Variant> LuaTable::try_get(const Variant& key, bool raw) const {
 	StackTopChecker topcheck(lua_object.lua_state());
 	lua_State *L = lua_object.lua_state();
 	sol::stack::push(L, lua_object);
-	std::ignore = lua_push(L, key);
+	lua_push(L, key);
 	if (raw) {
 		lua_rawget(L, -2);
 	}
@@ -62,8 +62,8 @@ bool LuaTable::try_set(const Variant& key, const Variant& value, bool raw) {
 	StackTopChecker topcheck(lua_object.lua_state());
 	lua_State *L = lua_object.lua_state();
 	auto table_popper = sol::stack::push_pop(L, lua_object);
-	std::ignore = lua_push(L, key);
-	std::ignore = lua_push(L, value);
+	lua_push(L, key);
+	lua_push(L, value);
 	if (raw) {
 		lua_rawset(L, -3);
 	}
@@ -130,7 +130,7 @@ bool LuaTable::_iter_next(const Variant& iter) const {
 	lua_State *L = lua_object.lua_state();
 	Array arg = iter;
 	auto table_popper = sol::stack::push_pop(lua_object);
-	auto key = lua_push(L, arg[0]);
+	lua_push(L, arg[0]);
 	if (lua_next(L, -2)) {
 		arg[0] = to_variant(L, -2);
 		lua_pop(L, 2);

src/luaopen/variant.cpp

@@ -41,7 +41,7 @@ using namespace godot;
 namespace luagdextension {
 
 template<Variant::Operator VarOperator>
-sol::stack_object evaluate_binary_operator(sol::this_state state, const sol::stack_object& a, const sol::stack_object& b) {
+sol::object evaluate_binary_operator(sol::this_state state, const sol::stack_object& a, const sol::stack_object& b) {
 	bool is_valid;
 	Variant result;
 	Variant var_a = to_variant(a);
@@ -58,11 +58,11 @@ sol::stack_object evaluate_binary_operator(sol::this_state state, const sol::sta
 			b_str.get_data()
 		);
 	}
-	return lua_push(state, result);
+	return to_lua(state, result);
 }
 
 template<Variant::Operator VarOperator>
-sol::stack_object evaluate_unary_operator(sol::this_state state, const sol::stack_object& a) {
+sol::object evaluate_unary_operator(sol::this_state state, const sol::stack_object& a) {
 	bool is_valid;
 	Variant result;
 	Variant var_a = to_variant(a);
@@ -76,24 +76,23 @@ sol::stack_object evaluate_unary_operator(sol::this_state state, const sol::stac
 			a_str.get_data()
 		);
 	}
-	return lua_push(state, result);
+	return to_lua(state, result);
 }
 
-sol::stack_object variant__index(sol::this_state state, const Variant& variant, const sol::stack_object& key) {
+sol::object variant__index(sol::this_state state, const Variant& variant, const sol::stack_object& key) {
 	bool is_valid;
 	if (key.get_type() == sol::type::string) {
 		StringName string_name = key.as<StringName>();
 		if (Variant::has_member(variant.get_type(), string_name)) {
-			return lua_push(state, variant.get_named(string_name, is_valid));
+			return to_lua(state, variant.get_named(string_name, is_valid));
 		}
 		else if (variant.has_method(string_name)) {
-			sol::stack::push(state, MethodBindByName(string_name));
-			return sol::stack_object(state, -1);
+			return sol::make_object(state, MethodBindByName(string_name));
 		}
 	}
 
 	Variant result = variant.get(to_variant(key), &is_valid);
-	return lua_push(state, result);
+	return to_lua(state, result);
 }
 
 void variant__newindex(sol::this_state state, Variant& variant, const sol::stack_object& key, const sol::stack_object& value) {
@@ -113,7 +112,7 @@ void variant__newindex(sol::this_state state, Variant& variant, const sol::stack
 	}
 }
 
-sol::stack_object variant__length(sol::this_state state, Variant& variant) {
+sol::object variant__length(sol::this_state state, Variant& variant) {
 	return variant_call_string_name(state, variant, "size", sol::variadic_args(state, 0));
 }
 
@@ -167,7 +166,7 @@ sol::object variant__call(sol::this_state state, const Variant& variant, sol::va
 	Callable callable = variant;
 	VariantArguments var_args = args;
 	Variant result = callable.callv(var_args.get_array());
-	return lua_push(state, result);
+	return to_lua(state, result);
 }
 
 }

src/utils/DictionaryIterator.cpp

@@ -44,7 +44,7 @@ std::tuple<sol::object, sol::object> DictionaryIterator::iter_next_lua(sol::this
 	if (kvp.has_value()) {
 		Variant key, value;
 		std::tie(key, value) = kvp.value();
-		return std::make_tuple(lua_push(state, key), lua_push(state, value));
+		return std::make_tuple(to_lua(state, key), to_lua(state, value));
 	}
 	else {
 		return std::make_tuple(sol::nil, sol::nil);

src/utils/IndexedIterator.cpp

@@ -36,7 +36,7 @@ std::tuple<sol::object, sol::object> IndexedIterator::iter_next_lua(sol::this_st
 	bool is_valid, is_out_of_bounds;
 	Variant result = variant.get_indexed(index, is_valid, is_out_of_bounds);
 	if (is_valid && !is_out_of_bounds) {
-		return std::make_tuple(sol::make_object(state, index), lua_push(state, result));
+		return std::make_tuple(sol::make_object(state, index), to_lua(state, result));
 	}
 	else {
 		return std::make_tuple(sol::nil, sol::nil);

src/utils/MethodBindByName.cpp

@@ -21,10 +21,8 @@
  */
 #include "MethodBindByName.hpp"
 
-#include "VariantArguments.hpp"
 #include "VariantType.hpp"
 #include "convert_godot_lua.hpp"
-#include "convert_godot_std.hpp"
 
 #include <godot_cpp/variant/utility_functions.hpp>
 
@@ -36,7 +34,7 @@ const StringName& MethodBindByName::get_method_name() const {
 	return method_name;
 }
 
-sol::stack_object MethodBindByName::call(sol::this_state state, const sol::stack_object& self, const sol::variadic_args& args) const {
+sol::object MethodBindByName::call(sol::this_state state, const sol::stack_object& self, const sol::variadic_args& args) const {
 	if (self.is<VariantType>()) {
 		VariantType var_type = self.as<VariantType>();
 		return variant_static_call_string_name(state, var_type.get_type(), method_name, args);

src/utils/MethodBindByName.hpp

@@ -40,7 +40,7 @@ class MethodBindByName {
 	MethodBindByName(const StringName& method_name);
 
 	const StringName& get_method_name() const;
-	sol::stack_object call(sol::this_state state, const sol::stack_object& self, const sol::variadic_args& args) const;
+	sol::object call(sol::this_state state, const sol::stack_object& self, const sol::variadic_args& args) const;
 
 	static void register_usertype(sol::state_view& state);
 };

src/utils/ObjectIterator.cpp

@@ -42,7 +42,7 @@ Variant ObjectIterator::iter_next() {
 sol::object ObjectIterator::iter_next_lua(sol::this_state state) {
 	bool is_valid;
 	if (variant.iter_next(iterator, is_valid)) {
-		return lua_push(state, variant.iter_get(iterator, is_valid));
+		return to_lua(state, variant.iter_get(iterator, is_valid));
 	}
 	else {
 		return sol::nil;

src/utils/_G_metatable.cpp

@@ -45,7 +45,7 @@ sol::object __index(sol::this_state state, sol::global_table _G, sol::stack_obje
 		auto class_name = key.as<StringName>();
 		if (engine->has_singleton(class_name)) {
 			Variant singleton = engine->get_singleton(class_name);
-			return _G[key] = lua_push(state, singleton);
+			return _G[key] = to_lua(state, singleton);
 		}
 	}
 	if (registry.get_or(module_names::classes, false)) {