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

Merge pull request #86088 from dalexeev/gds-fix-static-func-as-callable-in-static-context

Browse source 
GDScript: Fix accessing static function as `Callable` in static context
This commit is contained in:
Rémi Verschelde 2024-01-02 18:05:16 +01:00
commit 2e1725bef6
No known key found for this signature in database
GPG key ID: C3336907360768E1
3 changed files with 15 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
modules/gdscript/gdscript_compiler.cpp
View file

@ -322,9 +322,13 @@ GDScriptCodeGenerator::Address GDScriptCompiler::_parse_expression(CodeGen &code
if (member.type == GDScriptParser::ClassNode::Member::FUNCTION || member.type == GDScriptParser::ClassNode::Member::SIGNAL) {
// Get like it was a property.
GDScriptCodeGenerator::Address temp = codegen.add_temporary(); // TODO: Get type here.
GDScriptCodeGenerator::Address self(GDScriptCodeGenerator::Address::SELF);
gen->write_get_named(temp, identifier, self);
GDScriptCodeGenerator::Address base(GDScriptCodeGenerator::Address::SELF);
if (member.type == GDScriptParser::ClassNode::Member::FUNCTION && member.function->is_static) {
base = GDScriptCodeGenerator::Address(GDScriptCodeGenerator::Address::CLASS);
}
gen->write_get_named(temp, identifier, base);
return temp;
}
}

8
modules/gdscript/tests/scripts/runtime/features/static_method_as_callable.gd
View file

@ -1,12 +1,18 @@
# GH-79521
# GH-79521, GH-86032
class_name TestStaticMethodAsCallable
static func static_func() -> String:
return "Test"
static func another_static_func():
prints("another_static_func:", static_func.call(), static_func.is_valid())
func test():
var a: Callable = TestStaticMethodAsCallable.static_func
var b: Callable = static_func
prints(a.call(), a.is_valid())
prints(b.call(), b.is_valid())
@warning_ignore("static_called_on_instance")
another_static_func()
TestStaticMethodAsCallable.another_static_func()

2
modules/gdscript/tests/scripts/runtime/features/static_method_as_callable.out
View file

@ -1,3 +1,5 @@
GDTEST_OK
Test true
Test true
another_static_func: Test true
another_static_func: Test true