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

Merge pull request #69907 from rune-scape/sub-script 

Fix subscript of preloaded script
This commit is contained in:
Rémi Verschelde 2022-12-11 15:18:18 +01:00
parent c00b9e5b34 98e1a2031d
commit 185219de4a
No known key found for this signature in database
GPG Key ID: C3336907360768E1
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
modules/gdscript/gdscript_analyzer.cpp
View File

@ -3345,7 +3345,10 @@ void GDScriptAnalyzer::reduce_subscript(GDScriptParser::SubscriptNode *p_subscri
if (p_subscript->attribute == nullptr) { if (p_subscript->attribute == nullptr) {
return; return;
} }
if (p_subscript->base->is_constant) {
GDScriptParser::DataType base_type = p_subscript->base->get_datatype();
// If base is a class metatype, use the analyzer instead.
if (p_subscript->base->is_constant && !(base_type.is_meta_type && base_type.kind == GDScriptParser::DataType::CLASS)) {
// Just try to get it. // Just try to get it.
bool valid = false; bool valid = false;
Variant value = p_subscript->base->reduced_value.get_named(p_subscript->attribute->name, valid); Variant value = p_subscript->base->reduced_value.get_named(p_subscript->attribute->name, valid);
@ -3369,8 +3372,6 @@ void GDScriptAnalyzer::reduce_subscript(GDScriptParser::SubscriptNode *p_subscri
result_type = type_from_variant(value, p_subscript); result_type = type_from_variant(value, p_subscript);
} }
} else { } else {
GDScriptParser::DataType base_type = p_subscript->base->get_datatype();
if (base_type.is_variant() || !base_type.is_hard_type()) { if (base_type.is_variant() || !base_type.is_hard_type()) {
result_type.kind = GDScriptParser::DataType::VARIANT; result_type.kind = GDScriptParser::DataType::VARIANT;
mark_node_unsafe(p_subscript); mark_node_unsafe(p_subscript);