godotengine/godot
1
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2025-11-07 12:30:27 +00:00
Code Releases Wiki Activity

Fix inner class constant assignment

Browse Source
This commit is contained in:
Adam Scott
2022-12-14 08:33:53 -05:00
parent 8d52eea52b
commit 2fefcf7329
4 changed files with 21 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
modules/gdscript/gdscript_analyzer.cpp
View File

@@ -3148,6 +3148,16 @@ void GDScriptAnalyzer::reduce_identifier_from_base(GDScriptParser::IdentifierNod
case GDScriptParser::ClassNode::Member::FUNCTION: case GDScriptParser::ClassNode::Member::FUNCTION:
p_identifier->set_datatype(make_callable_type(member.function->info)); p_identifier->set_datatype(make_callable_type(member.function->info));
break; break;
case GDScriptParser::ClassNode::Member::CLASS:
if (p_base != nullptr && p_base->is_constant) {
Error err = OK;
GDScript *scr = GDScriptCache::get_full_script(base.script_path, err).ptr();
ERR_FAIL_COND_MSG(err != OK, "Error while getting subscript full script.");
scr = scr->find_class(p_identifier->get_datatype().class_type->fqcn);
p_identifier->reduced_value = scr;
p_identifier->is_constant = true;
}
break;
default: default:
break; // Type already set. break; // Type already set.
} }

7
modules/gdscript/tests/scripts/analyzer/features/inner_class_constant_assignment.gd Normal file
View File

@@ -0,0 +1,7 @@
const External = preload("inner_class_constant_assignment_external.notest.gd")
const ExternalInnerClass = External.InnerClass
func test():
var inst_external: ExternalInnerClass = ExternalInnerClass.new()
inst_external.x = 4.0
print(inst_external.x)

2
modules/gdscript/tests/scripts/analyzer/features/inner_class_constant_assignment.out Normal file
View File

@@ -0,0 +1,2 @@
GDTEST_OK
4

2
modules/gdscript/tests/scripts/analyzer/features/inner_class_constant_assignment_external.notest.gd Normal file
View File

@@ -0,0 +1,2 @@
class InnerClass:
var x: = 3.0