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

Merge pull request #70229 from adamscott/fix-class-lookup

Browse source 
Fix outer class lookup
This commit is contained in:
Rémi Verschelde 2022-12-18 00:11:56 +01:00
commit 2ee88192f9
No known key found for this signature in database
GPG key ID: C3336907360768E1
3 changed files with 15 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
modules/gdscript/gdscript_analyzer.cpp
View file

@ -3167,7 +3167,7 @@ void GDScriptAnalyzer::reduce_identifier_from_base(GDScriptParser::IdentifierNod
// TODO: Allow outer static functions.
if (base_class->outer != nullptr) {
List<GDScriptParser::ClassNode *> script_classes;
get_class_node_current_scope_classes(parser->current_class, &script_classes);
get_class_node_current_scope_classes(base_class->outer, &script_classes);
for (GDScriptParser::ClassNode *script_class : script_classes) {
if (script_class->has_member(name)) {
resolve_class_member(script_class, name, p_identifier);

12
modules/gdscript/tests/scripts/analyzer/errors/outer_class_lookup.gd Normal file
View file

@ -0,0 +1,12 @@
class A:
class B:
func test():
print(A.B.D)
class C:
class D:
pass
func test():
var inst = A.B.new()
inst.test()

2
modules/gdscript/tests/scripts/analyzer/errors/outer_class_lookup.out Normal file
View file

@ -0,0 +1,2 @@
GDTEST_ANALYZER_ERROR
Cannot find member "D" in base "B".