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

Merge pull request #79205 from anvilfolk/populate-class-members

Browse Source 
GDScript: Solve `_populate_class_members()` cyclic dependency problem
This commit is contained in:
Yuri Sizov
2023-07-17 19:15:16 +02:00
committed by GitHub
parent 5954c58ee1 7d29ac0bf2
commit 2c55214068
2 changed files with 10 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
modules/gdscript/gdscript.cpp
View File

@@ -787,11 +787,11 @@ Error GDScript::reload(bool p_keep_state) {
err = compiler.compile(&parser, this, p_keep_state); err = compiler.compile(&parser, this, p_keep_state);
if (err) { if (err) {
_err_print_error("GDScript::reload", path.is_empty() ? "built-in" : (const char *)path.utf8().get_data(), compiler.get_error_line(), ("Compile Error: " + compiler.get_error()).utf8().get_data(), false, ERR_HANDLER_SCRIPT);
if (can_run) { if (can_run) {
if (EngineDebugger::is_active()) { if (EngineDebugger::is_active()) {
GDScriptLanguage::get_singleton()->debug_break_parse(_get_debug_path(), compiler.get_error_line(), "Parser Error: " + compiler.get_error()); GDScriptLanguage::get_singleton()->debug_break_parse(_get_debug_path(), compiler.get_error_line(), "Parser Error: " + compiler.get_error());
} }
_err_print_error("GDScript::reload", path.is_empty() ? "built-in" : (const char *)path.utf8().get_data(), compiler.get_error_line(), ("Compile Error: " + compiler.get_error()).utf8().get_data(), false, ERR_HANDLER_SCRIPT);
reloading = false; reloading = false;
return ERR_COMPILATION_FAILED; return ERR_COMPILATION_FAILED;
} else { } else {

13
modules/gdscript/gdscript_compiler.cpp
View File

@@ -2579,9 +2579,9 @@ Error GDScriptCompiler::_populate_class_members(GDScript *p_script, const GDScri
} }
} else if (!base->is_valid()) { } else if (!base->is_valid()) {
Error err = OK; Error err = OK;
Ref<GDScript> base_root = GDScriptCache::get_full_script(base->path, err, p_script->path); Ref<GDScript> base_root = GDScriptCache::get_shallow_script(base->path, err, p_script->path);
if (err) { if (err) {
_set_error(vformat(R"(Could not compile base class "%s" from "%s": %s)", base->fully_qualified_name, base->path, error_names[err]), nullptr); _set_error(vformat(R"(Could not parse base class "%s" from "%s": %s)", base->fully_qualified_name, base->path, error_names[err]), nullptr);
return err; return err;
} }
if (base_root.is_valid()) { if (base_root.is_valid()) {
@@ -2591,7 +2591,12 @@ Error GDScriptCompiler::_populate_class_members(GDScript *p_script, const GDScri
_set_error(vformat(R"(Could not find class "%s" in "%s".)", base->fully_qualified_name, base->path), nullptr); _set_error(vformat(R"(Could not find class "%s" in "%s".)", base->fully_qualified_name, base->path), nullptr);
return ERR_COMPILATION_FAILED; return ERR_COMPILATION_FAILED;
} }
ERR_FAIL_COND_V(!base->is_valid() && !base->reloading, ERR_BUG);
err = _populate_class_members(base.ptr(), p_class->base_type.class_type, p_keep_state);
if (err) {
_set_error(vformat(R"(Could not populate class members of base class "%s" in "%s".)", base->fully_qualified_name, base->path), nullptr);
return err;
}
} }
p_script->base = base; p_script->base = base;
@@ -2968,7 +2973,7 @@ Error GDScriptCompiler::compile(const GDScriptParser *p_parser, GDScript *p_scri
GDScriptCache::add_static_script(p_script); GDScriptCache::add_static_script(p_script);
} }
return GDScriptCache::finish_compiling(main_script->get_path()); return GDScriptCache::finish_compiling(main_script->path);
} }
String GDScriptCompiler::get_error() const { String GDScriptCompiler::get_error() const {