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

Merge pull request #14555 from bojidar-bg/14324-nested-ternary

Browse source 
Properly support nested ternary expressions
This commit is contained in:
Rémi Verschelde 2017-12-12 00:14:36 +01:00 committed by GitHub
commit 8cd4b9bf27
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 7 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
modules/gdscript/gdscript_parser.cpp
View file

@ -1140,6 +1140,7 @@ GDScriptParser::Node *GDScriptParser::_parse_expression(Node *p_parent, bool p_s
bool unary = false; bool unary = false;
bool ternary = false; bool ternary = false;
bool error = false; bool error = false;
bool right_to_left = false;
switch (expression[i].op) { switch (expression[i].op) {
@ -1194,11 +1195,13 @@ GDScriptParser::Node *GDScriptParser::_parse_expression(Node *p_parent, bool p_s
case OperatorNode::OP_TERNARY_IF: case OperatorNode::OP_TERNARY_IF:
priority = 14; priority = 14;
ternary = true; ternary = true;
right_to_left = true;
break; break;
case OperatorNode::OP_TERNARY_ELSE: case OperatorNode::OP_TERNARY_ELSE:
priority = 14; priority = 14;
error = true; error = true;
break; // Errors out when found without IF (since IF would consume it) // Rigth-to-left should be false in this case, otherwise it would always error.
break;
case OperatorNode::OP_ASSIGN: priority = 15; break; case OperatorNode::OP_ASSIGN: priority = 15; break;
case OperatorNode::OP_ASSIGN_ADD: priority = 15; break; case OperatorNode::OP_ASSIGN_ADD: priority = 15; break;
@ -1218,13 +1221,13 @@ GDScriptParser::Node *GDScriptParser::_parse_expression(Node *p_parent, bool p_s
} }
} }
if (priority < min_priority) { if (priority < min_priority || (right_to_left && priority == min_priority)) {
// < is used for left to right (default)
// <= is used for right to left
if (error) { if (error) {
_set_error("Unexpected operator"); _set_error("Unexpected operator");
return NULL; return NULL;
} }
// < is used for left to right (default)
// <= is used for right to left
next_op = i; next_op = i;
min_priority = priority; min_priority = priority;
is_unary = unary; is_unary = unary;