Stowage/godot
2
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2025-10-31 21:51:22 +00:00
Code Issues Projects Releases Packages Wiki Activity

GDScript: Fix array type check on constants

Browse source 
They mistakenly pointing to the wrong union member (variable instead of
constant).
This commit is contained in:
George Marques 2021-03-30 09:07:26 -03:00
parent 85e316a5d5
commit 5d9585d83b
No known key found for this signature in database
GPG key ID: 046BD46A3201E43D
1 changed files with 2 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

4
modules/gdscript/gdscript_analyzer.cpp
View file

@ -644,11 +644,11 @@ void GDScriptAnalyzer::resolve_class_interface(GDScriptParser::ClassNode *p_clas
GDScriptParser::DataType datatype = member.constant->get_datatype(); GDScriptParser::DataType datatype = member.constant->get_datatype();
if (member.constant->initializer) { if (member.constant->initializer) {
if (member.constant->initializer->type == GDScriptParser::Node::ARRAY) { if (member.constant->initializer->type == GDScriptParser::Node::ARRAY) {
GDScriptParser::ArrayNode *array = static_cast<GDScriptParser::ArrayNode *>(member.variable->initializer); GDScriptParser::ArrayNode *array = static_cast<GDScriptParser::ArrayNode *>(member.constant->initializer);
const_fold_array(array); const_fold_array(array);
// Can only infer typed array if it has elements. // Can only infer typed array if it has elements.
if (array->elements.size() > 0 || (member.variable->datatype_specifier != nullptr && specified_type.has_container_element_type())) { if (array->elements.size() > 0 || (member.constant->datatype_specifier != nullptr && specified_type.has_container_element_type())) {
update_array_literal_element_type(specified_type, array); update_array_literal_element_type(specified_type, array);
} }
} else if (member.constant->initializer->type == GDScriptParser::Node::DICTIONARY) { } else if (member.constant->initializer->type == GDScriptParser::Node::DICTIONARY) {