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

GDScript: clarify error message about cycles

Browse Source 
They may happen with any cyclic dependency, not only with inheritance.
This commit is contained in:
George Marques 2019-01-16 16:39:44 -02:00
parent 20e6ff263a
commit ced9fcafd4
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
modules/gdscript/gdscript_parser.cpp
View File

@ -5058,7 +5058,7 @@ void GDScriptParser::_determine_inheritance(ClassNode *p_class) {
if (ScriptServer::is_global_class(base)) { if (ScriptServer::is_global_class(base)) {
base_script = ResourceLoader::load(ScriptServer::get_global_class_path(base)); base_script = ResourceLoader::load(ScriptServer::get_global_class_path(base));
if (!base_script.is_valid()) { if (!base_script.is_valid()) {
_set_error("Class '" + base + "' could not be fully loaded (script error or cyclic inheritance).", p_class->line); _set_error("Class '" + base + "' could not be fully loaded (script error or cyclic dependency).", p_class->line);
return; return;
} }
p = NULL; p = NULL;
@ -5387,7 +5387,7 @@ GDScriptParser::DataType GDScriptParser::_resolve_type(const DataType &p_source,
Ref<GDScript> gds = script; Ref<GDScript> gds = script;
if (gds.is_valid()) { if (gds.is_valid()) {
if (!gds->is_valid()) { if (!gds->is_valid()) {
_set_error("Class '" + id + "' could not be fully loaded (script error or cyclic inheritance).", p_line); _set_error("Class '" + id + "' could not be fully loaded (script error or cyclic dependency).", p_line);
return DataType(); return DataType();
} }
result.kind = DataType::GDSCRIPT; result.kind = DataType::GDSCRIPT;
@ -7179,7 +7179,7 @@ GDScriptParser::DataType GDScriptParser::_reduce_identifier_type(const DataType
Ref<GDScript> gds = scr; Ref<GDScript> gds = scr;
if (gds.is_valid()) { if (gds.is_valid()) {
if (!gds->is_valid()) { if (!gds->is_valid()) {
_set_error("Class '" + p_identifier + "' could not be fully loaded (script error or cyclic inheritance)."); _set_error("Class '" + p_identifier + "' could not be fully loaded (script error or cyclic dependency).");
return DataType(); return DataType();
} }
result.kind = DataType::GDSCRIPT; result.kind = DataType::GDSCRIPT;