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

Merge pull request #41709 from ThakeeNathees/dictionary-indexing-bug-fix 

Fixed parser error when indexing a dictionary.
This commit is contained in:
Rémi Verschelde 2020-09-08 21:38:14 +02:00 committed by GitHub
parent bd34d38bf8 4fc14e8e11
commit 2410016638
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 23 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
modules/gdscript/gdscript_analyzer.cpp
View File

@ -2077,18 +2077,32 @@ void GDScriptAnalyzer::reduce_identifier_from_base(GDScriptParser::IdentifierNod
push_error(vformat(R"(Cannot find constant "%s" on type "%s".)", name, base.to_string()), p_identifier);
}
} else {
Callable::CallError temp;
Variant dummy = Variant::construct(base.builtin_type, nullptr, 0, temp);
List<PropertyInfo> properties;
dummy.get_property_list(&properties);
for (const List<PropertyInfo>::Element *E = properties.front(); E != nullptr; E = E->next()) {
const PropertyInfo &prop = E->get();
if (prop.name == name) {
p_identifier->set_datatype(type_from_property(prop));
switch (base.builtin_type) {
case Variant::NIL: {
push_error(vformat(R"(Invalid get index "%s" on base Nil)", name), p_identifier);
return;
}
case Variant::DICTIONARY: {
GDScriptParser::DataType dummy;
dummy.kind = GDScriptParser::DataType::VARIANT;
p_identifier->set_datatype(dummy);
return;
}
default: {
Callable::CallError temp;
Variant dummy = Variant::construct(base.builtin_type, nullptr, 0, temp);
List<PropertyInfo> properties;
dummy.get_property_list(&properties);
for (const List<PropertyInfo>::Element *E = properties.front(); E != nullptr; E = E->next()) {
const PropertyInfo &prop = E->get();
if (prop.name == name) {
p_identifier->set_datatype(type_from_property(prop));
return;
}
}
push_error(vformat(R"(Cannot find property "%s" on base "%s".)", name, base.to_string()), p_identifier);
}
}
push_error(vformat(R"(Cannot find property "%s" on base "%s".)", name, base.to_string()), p_identifier);
}
return;
}