Stowage/godot
2
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2025-10-31 13:41:03 +00:00
Code Issues Projects Releases Packages Wiki Activity

GDScript: Show error when there's an inheritance cycle

Browse source
This commit is contained in:
George Marques 2020-08-26 16:01:08 -03:00
parent 4a3fca47e5
commit b2b45987d0
No known key found for this signature in database
GPG key ID: 046BD46A3201E43D
1 changed files with 14 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

15
modules/gdscript/gdscript_analyzer.cpp
View file

@ -302,6 +302,16 @@ Error GDScriptAnalyzer::resolve_inheritance(GDScriptParser::ClassNode *p_class,
return ERR_PARSE_ERROR; return ERR_PARSE_ERROR;
} }
// Check for cyclic inheritance.
const GDScriptParser::ClassNode *base_class = result.class_type;
while (base_class) {
if (base_class->fqcn == p_class->fqcn) {
push_error("Cyclic inheritance.", p_class);
return ERR_PARSE_ERROR;
}
base_class = base_class->base_type.class_type;
}
p_class->base_type = result; p_class->base_type = result;
class_type.native_type = result.native_type; class_type.native_type = result.native_type;
p_class->set_datatype(class_type); p_class->set_datatype(class_type);
@ -309,7 +319,10 @@ Error GDScriptAnalyzer::resolve_inheritance(GDScriptParser::ClassNode *p_class,
if (p_recursive) { if (p_recursive) {
for (int i = 0; i < p_class->members.size(); i++) { for (int i = 0; i < p_class->members.size(); i++) {
if (p_class->members[i].type == GDScriptParser::ClassNode::Member::CLASS) { if (p_class->members[i].type == GDScriptParser::ClassNode::Member::CLASS) {
resolve_inheritance(p_class->members[i].m_class, true); Error err = resolve_inheritance(p_class->members[i].m_class, true);
if (err) {
return err;
}
} }
} }
} }