Implement LuaScriptInstance tostring

Author: gilzoide

src/script-language/LuaScript.cpp

@@ -322,12 +322,26 @@ void LuaScript::_instance_notification(LuaScriptInstance *instance, int32_t what
 	}
 }
 
+bool LuaScript::_instance_tostring(LuaScriptInstance *instance, String& str) const {
+	if (const Ref<LuaFunction> *method = methods.getptr("__tostring")) {
+		Variant result = method->ptr()->call_method(instance);
+		if (LuaError *lua_error = Object::cast_to<LuaError>(result)) {
+			ERR_FAIL_V_MSG(false, lua_error->get_message());
+		}
+		str = result;
+		return true;
+	}
+	else {
+		return false;
+	}
+}
+
 void LuaScript::_bind_methods() {
 	ClassDB::bind_vararg_method(METHOD_FLAGS_DEFAULT, "new", &LuaScript::_new);
 }
 
 String LuaScript::_to_string() const {
-	return String("[%s:%d]") % Array::make(get_class(), get_instance_id());
+	return String("[%s:%d]") % Array::make(get_class_static(), get_instance_id());
 }
 
 void LuaScript::process_script_result(const Variant& result) {
@@ -364,7 +378,6 @@ void LuaScript::process_script_result(const Variant& result) {
 			default:
 				// TODO: add support for property metadata
 				properties[key] = LuaScriptProperty {
-					.name = key,
 					.type = value.get_type(),
 					.default_value = value,
 				};

src/script-language/LuaScript.hpp

@@ -37,7 +37,6 @@ class LuaScriptLanguage;
 class LuaTable;
 
 struct LuaScriptProperty {
-	StringName name;
 	Variant::Type type;
 	Variant default_value;
 
@@ -94,6 +93,7 @@ class LuaScript : public ScriptExtension {
 	bool _instance_get(LuaScriptInstance *instance, const StringName& p_name, Variant& p_value) const;
 	Variant _instance_call(LuaScriptInstance *instance, const StringName& p_name, const Variant **p_args, GDExtensionInt p_argument_count, GDExtensionCallError& r_error) const;
 	void _instance_notification(LuaScriptInstance *instance, int32_t what, GDExtensionBool reversed) const;
+	bool _instance_tostring(LuaScriptInstance *instance, String& str) const;
 
 protected:
 	static void _bind_methods();

src/script-language/LuaScriptInstance.cpp

@@ -32,6 +32,7 @@ namespace luagdextension {
 LuaScriptInstance::LuaScriptInstance(Object *owner, Ref<LuaScript> script)
 	: owner(owner)
 	, script(script)
+	, properties()
 {
 	known_instances.insert(owner, this);
 }
@@ -79,7 +80,9 @@ void notification_func(LuaScriptInstance *p_instance, int32_t p_what, GDExtensio
 	p_instance->script->_instance_notification(p_instance, p_what, p_reversed);
 }
 
-GDExtensionScriptInstanceToString to_string_func;
+void to_string_func(LuaScriptInstance *p_instance, GDExtensionBool *r_is_valid, String *r_out) {
+	*r_is_valid = p_instance->script->_instance_tostring(p_instance, *r_out);
+}
 
 void refcount_incremented_func(LuaScriptInstance *) {
 }

src/script-language/LuaScriptInstance.hpp

@@ -41,7 +41,7 @@ struct LuaScriptInstance {
 
 	Object *owner;
 	Ref<LuaScript> script;
-	Dictionary properties = {};
+	Dictionary properties;
 
 private:
 	static HashMap<Object *, LuaScriptInstance *> known_instances;