asgardius/virtualx-engine
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Far faster and more efficient method of checking if an identifer refers an autoload.

Browse source
This commit is contained in:
Jason Knight 2023-10-09 14:18:19 -06:00
parent fe7ed984b5
commit 4285c44b47
1 changed files with 42 additions and 76 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

84
modules/gdscript/gdscript_parser.cpp
View file

@ -56,6 +56,21 @@ T *GDScriptParser::alloc_node() {
return t; return t;
} }
static String _lookup_autoload_path_for_identifier(const String &p_identifier) {
String autoload_path;
String autoload_setting_path = "autoload/" + p_identifier;
if (ProjectSettings::get_singleton()->has_setting(autoload_setting_path)) {
autoload_path = ProjectSettings::get_singleton()->get(autoload_setting_path);
if (autoload_path.begins_with("*")) {
autoload_path = autoload_path.right(1);
}
if (!autoload_path.begins_with("res://")) {
autoload_path = "res://" + autoload_path;
}
}
return autoload_path;
}
#ifdef DEBUG_ENABLED #ifdef DEBUG_ENABLED
static String _find_function_name(const GDScriptParser::OperatorNode *p_call); static String _find_function_name(const GDScriptParser::OperatorNode *p_call);
#endif // DEBUG_ENABLED #endif // DEBUG_ENABLED
@ -5497,23 +5512,9 @@ void GDScriptParser::_determine_inheritance(ClassNode *p_class, bool p_recursive
} }
p = nullptr; p = nullptr;
} else { } else {
List<PropertyInfo> props; String autoload_path = _lookup_autoload_path_for_identifier(base);
ProjectSettings::get_singleton()->get_property_list(&props); if (!autoload_path.empty()) {
for (List<PropertyInfo>::Element *E = props.front(); E; E = E->next()) { base_script = ResourceLoader::load(autoload_path);
String s = E->get().name;
if (!s.begins_with("autoload/")) {
continue;
}
String name = s.get_slice("/", 1);
if (name == base) {
String singleton_path = ProjectSettings::get_singleton()->get(s);
if (singleton_path.begins_with("*")) {
singleton_path = singleton_path.right(1);
}
if (!singleton_path.begins_with("res://")) {
singleton_path = "res://" + singleton_path;
}
base_script = ResourceLoader::load(singleton_path);
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 inheritance).", p_class->line);
return; return;
@ -5521,7 +5522,6 @@ void GDScriptParser::_determine_inheritance(ClassNode *p_class, bool p_recursive
p = nullptr; p = nullptr;
} }
} }
}
while (p) { while (p) {
bool found = false; bool found = false;
@ -5869,28 +5869,10 @@ GDScriptParser::DataType GDScriptParser::_resolve_type(const DataType &p_source,
name_part++; name_part++;
continue; continue;
} }
List<PropertyInfo> props;
ProjectSettings::get_singleton()->get_property_list(&props); String autoload_path = _lookup_autoload_path_for_identifier(id);
String singleton_path; if (!autoload_path.empty()) {
for (List<PropertyInfo>::Element *E = props.front(); E; E = E->next()) { Ref<Script> script = ResourceLoader::load(autoload_path);
String s = E->get().name;
if (!s.begins_with("autoload/")) {
continue;
}
String name = s.get_slice("/", 1);
if (name == id) {
singleton_path = ProjectSettings::get_singleton()->get(s);
if (singleton_path.begins_with("*")) {
singleton_path = singleton_path.right(1);
}
if (!singleton_path.begins_with("res://")) {
singleton_path = "res://" + singleton_path;
}
break;
}
}
if (!singleton_path.empty()) {
Ref<Script> script = ResourceLoader::load(singleton_path);
Ref<GDScript> gds = script; Ref<GDScript> gds = script;
if (gds.is_valid()) { if (gds.is_valid()) {
if (!gds->is_valid()) { if (!gds->is_valid()) {
@ -7786,24 +7768,9 @@ GDScriptParser::DataType GDScriptParser::_reduce_identifier_type(const DataType
} }
// Non-tool singletons aren't loaded, check project settings // Non-tool singletons aren't loaded, check project settings
List<PropertyInfo> props; String autoload_path = _lookup_autoload_path_for_identifier(p_identifier);
ProjectSettings::get_singleton()->get_property_list(&props); if (!autoload_path.empty()) {
Ref<Script> singleton = ResourceLoader::load(autoload_path);
for (List<PropertyInfo>::Element *E = props.front(); E; E = E->next()) {
String s = E->get().name;
if (!s.begins_with("autoload/")) {
continue;
}
String name = s.get_slice("/", 1);
if (name == p_identifier) {
String script = ProjectSettings::get_singleton()->get(s);
if (script.begins_with("*")) {
script = script.right(1);
}
if (!script.begins_with("res://")) {
script = "res://" + script;
}
Ref<Script> singleton = ResourceLoader::load(script);
if (singleton.is_valid()) { if (singleton.is_valid()) {
DataType result; DataType result;
result.has_type = true; result.has_type = true;
@ -7822,7 +7789,6 @@ GDScriptParser::DataType GDScriptParser::_reduce_identifier_type(const DataType
} }
} }
} }
}
// This means looking in the current class, which type is always known // This means looking in the current class, which type is always known
_set_error("The identifier \"" + p_identifier.operator String() + "\" isn't declared in the current scope.", p_line); _set_error("The identifier \"" + p_identifier.operator String() + "\" isn't declared in the current scope.", p_line);