godotengine/godot
1
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2025-11-05 12:10:55 +00:00
Code Releases Wiki Activity

GDScript: Check duplicate keys in dictionaries and enums

Browse Source
This commit is contained in:
George Marques
2020-08-19 11:14:16 -03:00
parent f9ad0b30fa
commit cd3f51c67c
2 changed files with 17 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
modules/gdscript/gdscript_parser.cpp
View File

@@ -1022,6 +1022,8 @@ GDScriptParser::EnumNode *GDScriptParser::parse_enum() {
push_multiline(true);
consume(GDScriptTokenizer::Token::BRACE_OPEN, vformat(R"(Expected "{" after %s.)", named ? "enum name" : R"("enum")"));
HashMap<StringName, int> elements;
do {
if (check(GDScriptTokenizer::Token::BRACE_CLOSE)) {
break; // Allow trailing comma.
@@ -1033,7 +1035,9 @@ GDScriptParser::EnumNode *GDScriptParser::parse_enum() {
item.line = previous.start_line;
item.leftmost_column = previous.leftmost_column;
if (!named) {
if (elements.has(item.identifier->name)) {
push_error(vformat(R"(Name "%s" was already in this enum (at line %d).)", item.identifier->name, elements[item.identifier->name]), item.identifier);
} else if (!named) {
// TODO: Abstract this recursive member check.
ClassNode *parent = current_class;
while (parent != nullptr) {
@@ -1045,6 +1049,8 @@ GDScriptParser::EnumNode *GDScriptParser::parse_enum() {
}
}
elements[item.identifier->name] = item.line;
if (match(GDScriptTokenizer::Token::EQUAL)) {
ExpressionNode *value = parse_expression(false);
if (value == nullptr) {