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

GDScript: Make sure Lua-style dicts use StringName as keys

Browse Source
This commit is contained in:
George Marques 2021-04-23 16:00:23 -03:00
parent c7511de02e
commit 1e4ff2ede6
No known key found for this signature in database
GPG Key ID: 046BD46A3201E43D
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
modules/gdscript/gdscript_compiler.cpp
View File

@ -427,8 +427,8 @@ GDScriptCodeGenerator::Address GDScriptCompiler::_parse_expression(CodeGen &code
} }
break; break;
case GDScriptParser::DictionaryNode::LUA_TABLE: case GDScriptParser::DictionaryNode::LUA_TABLE:
// Lua-style: key is an identifier interpreted as string. // Lua-style: key is an identifier interpreted as StringName.
String key = static_cast<const GDScriptParser::IdentifierNode *>(dn->elements[i].key)->name; StringName key = static_cast<const GDScriptParser::IdentifierNode *>(dn->elements[i].key)->name;
element = codegen.add_constant(key); element = codegen.add_constant(key);
break; break;
} }

2
modules/gdscript/gdscript_parser.cpp
View File

@ -2440,6 +2440,8 @@ GDScriptParser::ExpressionNode *GDScriptParser::parse_dictionary(ExpressionNode
push_error(R"(Expected "=" after dictionary key.)"); push_error(R"(Expected "=" after dictionary key.)");
} }
} }
key->is_constant = true;
key->reduced_value = static_cast<IdentifierNode *>(key)->name;
break; break;
case DictionaryNode::PYTHON_DICT: case DictionaryNode::PYTHON_DICT:
if (!match(GDScriptTokenizer::Token::COLON)) { if (!match(GDScriptTokenizer::Token::COLON)) {