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

Merge pull request #10542 from karroffel/gdscript-match-index 

support enums and nested constants in match statement
This commit is contained in:
Rémi Verschelde 2017-08-23 08:05:52 +02:00 committed by GitHub
parent eb238a04da 57654d4b95
commit 1ad68c946e
1 changed files with 20 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
modules/gdscript/gd_parser.cpp
View File

@ -1894,7 +1894,26 @@ GDParser::PatternNode *GDParser::_parse_pattern(bool p_static) {
return NULL; return NULL;
} }
if (value->type != Node::TYPE_IDENTIFIER && value->type != Node::TYPE_CONSTANT) { if (value->type == Node::TYPE_OPERATOR) {
// Maybe it's SomeEnum.VALUE
Node *current_value = value;
while (current_value->type == Node::TYPE_OPERATOR) {
OperatorNode *op_node = static_cast<OperatorNode *>(current_value);
if (op_node->op != OperatorNode::OP_INDEX_NAMED) {
_set_error("Invalid operator in pattern. Only index (`A.B`) is allowed");
return NULL;
}
current_value = op_node->arguments[0];
}
if (current_value->type != Node::TYPE_IDENTIFIER) {
_set_error("Only constant expression or variables allowed in a pattern");
return NULL;
}
} else if (value->type != Node::TYPE_IDENTIFIER && value->type != Node::TYPE_CONSTANT) {
_set_error("Only constant expressions or variables allowed in a pattern"); _set_error("Only constant expressions or variables allowed in a pattern");
return NULL; return NULL;
} }