mirror of
https://github.com/godotengine/godot
synced 2024-09-05 19:39:49 +00:00
GDScript: Give an error if dependency can't be parsed
Otherwise this may lead to a crash when the dependency is not present.
This commit is contained in:
parent
613b76cfd5
commit
817fb3d702
|
@ -2029,9 +2029,17 @@ void GDScriptAnalyzer::reduce_get_node(GDScriptParser::GetNodeNode *p_get_node)
|
|||
p_get_node->set_datatype(result);
|
||||
}
|
||||
|
||||
GDScriptParser::DataType GDScriptAnalyzer::make_global_class_meta_type(const StringName &p_class_name) {
|
||||
GDScriptParser::DataType GDScriptAnalyzer::make_global_class_meta_type(const StringName &p_class_name, const GDScriptParser::Node *p_source) {
|
||||
Ref<GDScriptParserRef> ref = get_parser_for(ScriptServer::get_global_class_path(p_class_name));
|
||||
ref->raise_status(GDScriptParserRef::INTERFACE_SOLVED);
|
||||
Error err = ref->raise_status(GDScriptParserRef::INTERFACE_SOLVED);
|
||||
|
||||
if (err) {
|
||||
push_error(vformat(R"(Could not resolve class "%s", because of a parser error.)", p_class_name), p_source);
|
||||
GDScriptParser::DataType type;
|
||||
type.type_source = GDScriptParser::DataType::UNDETECTED;
|
||||
type.kind = GDScriptParser::DataType::VARIANT;
|
||||
return type;
|
||||
}
|
||||
|
||||
GDScriptParser::DataType type;
|
||||
type.type_source = GDScriptParser::DataType::ANNOTATED_EXPLICIT;
|
||||
|
@ -2303,7 +2311,7 @@ void GDScriptAnalyzer::reduce_identifier(GDScriptParser::IdentifierNode *p_ident
|
|||
}
|
||||
|
||||
if (ScriptServer::is_global_class(name)) {
|
||||
p_identifier->set_datatype(make_global_class_meta_type(name));
|
||||
p_identifier->set_datatype(make_global_class_meta_type(name, p_identifier));
|
||||
return;
|
||||
}
|
||||
|
||||
|
|
|
@ -96,7 +96,7 @@ class GDScriptAnalyzer {
|
|||
GDScriptParser::DataType type_from_variant(const Variant &p_value, const GDScriptParser::Node *p_source);
|
||||
GDScriptParser::DataType type_from_metatype(const GDScriptParser::DataType &p_meta_type) const;
|
||||
GDScriptParser::DataType type_from_property(const PropertyInfo &p_property) const;
|
||||
GDScriptParser::DataType make_global_class_meta_type(const StringName &p_class_name);
|
||||
GDScriptParser::DataType make_global_class_meta_type(const StringName &p_class_name, const GDScriptParser::Node *p_source);
|
||||
bool get_function_signature(GDScriptParser::Node *p_source, GDScriptParser::DataType base_type, const StringName &p_function, GDScriptParser::DataType &r_return_type, List<GDScriptParser::DataType> &r_par_types, int &r_default_arg_count, bool &r_static, bool &r_vararg);
|
||||
bool function_signature_from_info(const MethodInfo &p_info, GDScriptParser::DataType &r_return_type, List<GDScriptParser::DataType> &r_par_types, int &r_default_arg_count, bool &r_static, bool &r_vararg);
|
||||
bool validate_call_arg(const List<GDScriptParser::DataType> &p_par_types, int p_default_args_count, bool p_is_vararg, const GDScriptParser::CallNode *p_call);
|
||||
|
|
Loading…
Reference in a new issue