asgardius/virtualx-engine
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #87294 from vnen/allow-free-callable

Browse source 
Allow `free()` to be used as Callable
This commit is contained in:
Rémi Verschelde 2024-01-18 16:35:14 +01:00
commit baf87e2717
No known key found for this signature in database
GPG key ID: C3336907360768E1
4 changed files with 22 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
core/object/class_db.cpp
View file

@ -31,6 +31,7 @@
#include "class_db.h" #include "class_db.h"
#include "core/config/engine.h" #include "core/config/engine.h"
#include "core/core_string_names.h"
#include "core/io/resource_loader.h" #include "core/io/resource_loader.h"
#include "core/object/script_language.h" #include "core/object/script_language.h"
#include "core/os/mutex.h" #include "core/os/mutex.h"
@ -1299,6 +1300,12 @@ bool ClassDB::get_property(Object *p_object, const StringName &p_property, Varia
check = check->inherits_ptr; check = check->inherits_ptr;
} }
// The "free()" method is special, so we assume it exists and return a Callable.
if (p_property == CoreStringNames::get_singleton()->_free) {
r_value = Callable(p_object, p_property);
return true;
}
return false; return false;
} }

3
modules/gdscript/gdscript_compiler.cpp
View file

@ -37,6 +37,7 @@
#include "core/config/engine.h" #include "core/config/engine.h"
#include "core/config/project_settings.h" #include "core/config/project_settings.h"
#include "core/core_string_names.h"
bool GDScriptCompiler::_is_class_member_property(CodeGen &codegen, const StringName &p_name) { bool GDScriptCompiler::_is_class_member_property(CodeGen &codegen, const StringName &p_name) {
if (codegen.function_node && codegen.function_node->is_static) { if (codegen.function_node && codegen.function_node->is_static) {
@ -345,7 +346,7 @@ GDScriptCodeGenerator::Address GDScriptCompiler::_parse_expression(CodeGen &code
scr = scr->_base; scr = scr->_base;
} }
if (nc && (ClassDB::has_signal(nc->get_name(), identifier) || ClassDB::has_method(nc->get_name(), identifier))) { if (nc && (identifier == CoreStringNames::get_singleton()->_free || ClassDB::has_signal(nc->get_name(), identifier) || ClassDB::has_method(nc->get_name(), identifier))) {
// Get like it was a property. // Get like it was a property.
GDScriptCodeGenerator::Address temp = codegen.add_temporary(); // TODO: Get type here. GDScriptCodeGenerator::Address temp = codegen.add_temporary(); // TODO: Get type here.
GDScriptCodeGenerator::Address self(GDScriptCodeGenerator::Address::SELF); GDScriptCodeGenerator::Address self(GDScriptCodeGenerator::Address::SELF);

10
modules/gdscript/tests/scripts/runtime/features/free_is_callable.gd Normal file
View file

@ -0,0 +1,10 @@
func test():
var node := Node.new()
var callable: Callable = node.free
callable.call()
print(node)
node = Node.new()
callable = node["free"]
callable.call()
print(node)

3
modules/gdscript/tests/scripts/runtime/features/free_is_callable.out Normal file
View file

@ -0,0 +1,3 @@
GDTEST_OK
<Freed Object>
<Freed Object>