asgardius/virtualx-engine
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

GDScript: Allow string keys on Lua-style dictionaries

Browse source 
Which is useful when the key isn't a valid identifier, such as keys with
spaces or numeric keys.
This commit is contained in:
George Marques 2021-09-15 09:56:24 -03:00
parent 32f8f74d83
commit 5d31ce4b16
No known key found for this signature in database
GPG key ID: 046BD46A3201E43D
10 changed files with 48 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
modules/gdscript/gdscript_compiler.cpp
View file

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

15
modules/gdscript/gdscript_parser.cpp
View file

@ -2472,8 +2472,13 @@ GDScriptParser::ExpressionNode *GDScriptParser::parse_dictionary(ExpressionNode
switch (dictionary->style) {
case DictionaryNode::LUA_TABLE:
if (key != nullptr && key->type != Node::IDENTIFIER) {
push_error("Expected identifier as LUA-style dictionary key.");
if (key != nullptr && key->type != Node::IDENTIFIER && key->type != Node::LITERAL) {
push_error("Expected identifier or string as LUA-style dictionary key.");
advance();
break;
}
if (key != nullptr && key->type == Node::LITERAL && static_cast<LiteralNode *>(key)->value.get_type() != Variant::STRING) {
push_error("Expected identifier or string as LUA-style dictionary key.");
advance();
break;
}
@ -2487,7 +2492,11 @@ GDScriptParser::ExpressionNode *GDScriptParser::parse_dictionary(ExpressionNode
}
if (key != nullptr) {
key->is_constant = true;
key->reduced_value = static_cast<IdentifierNode *>(key)->name;
if (key->type == Node::IDENTIFIER) {
key->reduced_value = static_cast<IdentifierNode *>(key)->name;
} else if (key->type == Node::LITERAL) {
key->reduced_value = StringName(static_cast<LiteralNode *>(key)->value.operator String());
}
}
break;
case DictionaryNode::PYTHON_DICT:

6
modules/gdscript/tests/scripts/analyzer/errors/dictionary_duplicate_key_lua.gd Normal file
View file

@ -0,0 +1,6 @@
func test():
var lua_dict = {
a = 1,
b = 2,
a = 3, # Duplicate isn't allowed.
}

2
modules/gdscript/tests/scripts/analyzer/errors/dictionary_duplicate_key_lua.out Normal file
View file

@ -0,0 +1,2 @@
GDTEST_ANALYZER_ERROR
Key "a" was already used in this dictionary (at line 3).

6
modules/gdscript/tests/scripts/analyzer/errors/dictionary_duplicate_key_lua_with_string.gd Normal file
View file

@ -0,0 +1,6 @@
func test():
var lua_dict_with_string = {
a = 1,
b = 2,
"a" = 3, # Duplicate isn't allowed.
}

2
modules/gdscript/tests/scripts/analyzer/errors/dictionary_duplicate_key_lua_with_string.out Normal file
View file

@ -0,0 +1,2 @@
GDTEST_ANALYZER_ERROR
Key "a" was already used in this dictionary (at line 3).

6
modules/gdscript/tests/scripts/analyzer/errors/dictionary_duplicate_key_python.gd Normal file
View file

@ -0,0 +1,6 @@
func test():
var python_dict = {
"a": 1,
"b": 2,
"a": 3, # Duplicate isn't allowed.
}

2
modules/gdscript/tests/scripts/analyzer/errors/dictionary_duplicate_key_python.out Normal file
View file

@ -0,0 +1,2 @@
GDTEST_ANALYZER_ERROR
Key "a" was already used in this dictionary (at line 3).

9
modules/gdscript/tests/scripts/parser/features/dictionary_lua_style.gd Normal file
View file

@ -0,0 +1,9 @@
func test():
var lua_dict = {
a = 1,
"b" = 2, # Using strings are allowed too.
"with spaces" = 3, # Especially useful when key has spaces...
"2" = 4, # ... or invalid identifiers.
}
print(lua_dict)

2
modules/gdscript/tests/scripts/parser/features/dictionary_lua_style.out Normal file
View file

@ -0,0 +1,2 @@
GDTEST_OK
{2:4, a:1, b:2, with spaces:3}