godotengine/godot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

GDScript: Add missing member type check when resolving extends

Browse Source 
(cherry picked from commit 66279b98b6)
This commit is contained in:
Danil Alexeev 2023-04-10 09:54:53 +03:00 committed by Yuri Sizov
parent 3a5bc7455e
commit d31002cfbe
7 changed files with 58 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
modules/gdscript/gdscript_analyzer.cpp
View File

@ -478,7 +478,24 @@ Error GDScriptAnalyzer::resolve_class_inheritance(GDScriptParser::ClassNode *p_c
}
if (look_class->has_member(name)) {
resolve_class_member(look_class, name, p_class);
base = look_class->get_member(name).get_datatype();
GDScriptParser::ClassNode::Member member = look_class->get_member(name);
GDScriptParser::DataType member_datatype = member.get_datatype();
switch (member.type) {
case GDScriptParser::ClassNode::Member::CLASS:
break; // OK.
case GDScriptParser::ClassNode::Member::CONSTANT:
if (member_datatype.kind != GDScriptParser::DataType::SCRIPT && member_datatype.kind != GDScriptParser::DataType::CLASS) {
push_error(vformat(R"(Constant "%s" is not a preloaded script or class.)", name), p_class);
return ERR_PARSE_ERROR;
}
break;
default:
push_error(vformat(R"(Cannot use %s "%s" in extends chain.)", member.get_type_name(), name), p_class);
return ERR_PARSE_ERROR;
}
base = member_datatype;
found = true;
break;
}
@ -506,6 +523,10 @@ Error GDScriptAnalyzer::resolve_class_inheritance(GDScriptParser::ClassNode *p_c
GDScriptParser::DataType id_type = id->get_datatype();
if (!id_type.is_set()) {
push_error(vformat(R"(Could not find type "%s" under base "%s".)", id->name, base.to_string()), p_class);
return ERR_PARSE_ERROR;
} else if (id_type.kind != GDScriptParser::DataType::SCRIPT && id_type.kind != GDScriptParser::DataType::CLASS) {
push_error(vformat(R"(Identifier "%s" is not a preloaded script or class.)", id->name), p_class);
return ERR_PARSE_ERROR;
}
base = id_type;

9
modules/gdscript/tests/scripts/analyzer/errors/extend_non_class_constant_1.gd Normal file
View File

@ -0,0 +1,9 @@
# GH-75870
const A = 1
class B extends A:
pass
func test():
pass

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

@ -0,0 +1,2 @@
GDTEST_ANALYZER_ERROR
Constant "A" is not a preloaded script or class.

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

@ -0,0 +1,12 @@
# GH-75870
class A:
const X = 1
const Y = A.X # A.X is now resolved.
class B extends A.X:
pass
func test():
pass

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

@ -0,0 +1,2 @@
GDTEST_ANALYZER_ERROR
Identifier "X" is not a preloaded script or class.

9
modules/gdscript/tests/scripts/analyzer/errors/extend_variable.gd Normal file
View File

@ -0,0 +1,9 @@
# GH-75870
var A = 1
class B extends A:
pass
func test():
pass

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

@ -0,0 +1,2 @@
GDTEST_ANALYZER_ERROR
Cannot use variable "A" in extends chain.