godotengine/godot
1
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2025-11-22 15:06:45 +00:00
Code Releases Wiki Activity

GDSCript: Fix cyclic class dependency detection

Browse Source
This commit is contained in:
George Marques
2018-08-21 13:14:11 -03:00
parent 4ea3e4f551
commit d97624e295
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
modules/gdscript/gdscript_compiler.cpp
View File

@@ -1994,8 +1994,11 @@ Error GDScriptCompiler::_parse_class_level(GDScript *p_script, GDScript *p_owner
p_script->_signals[name] = p_class->_signals[i].arguments; p_script->_signals[name] = p_class->_signals[i].arguments;
} }
if (!p_class->owner) { if (p_class->owner) {
parsed_classes.insert(p_class->name); parsed_classes.insert(p_class->name);
if (parsing_classes.has(p_class->name)) {
parsing_classes.erase(p_class->name);
}
} }
//parse sub-classes //parse sub-classes
@@ -2011,7 +2014,6 @@ Error GDScriptCompiler::_parse_class_level(GDScript *p_script, GDScript *p_owner
Error err = _parse_class_level(subclass.ptr(), p_script, p_class->subclasses[i], p_keep_state); Error err = _parse_class_level(subclass.ptr(), p_script, p_class->subclasses[i], p_keep_state);
if (err) if (err)
return err; return err;
parsing_classes.erase(name);
} }
#ifdef TOOLS_ENABLED #ifdef TOOLS_ENABLED