diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2017-12-12 00:14:36 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-12-12 00:14:36 +0100 |
| commit | 8cd4b9bf27c893c18b020c5c0bbb578ae489f00b (patch) | |
| tree | 442395f1f8ddaa7bd30431928a1a288c184cac6f | |
| parent | 3a078603112710d1d2719d7919711ab76ae161f0 (diff) | |
| parent | 2c190b975ebcadd50ce18d498a8689ef6cb2d02c (diff) | |
Merge pull request #14555 from bojidar-bg/14324-nested-ternary
Properly support nested ternary expressions
| -rw-r--r-- | modules/gdscript/gdscript_parser.cpp | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/modules/gdscript/gdscript_parser.cpp b/modules/gdscript/gdscript_parser.cpp index 599f204184..36ae61e388 100644 --- a/modules/gdscript/gdscript_parser.cpp +++ b/modules/gdscript/gdscript_parser.cpp @@ -1140,6 +1140,7 @@ GDScriptParser::Node *GDScriptParser::_parse_expression(Node *p_parent, bool p_s bool unary = false; bool ternary = false; bool error = false; + bool right_to_left = false; switch (expression[i].op) { @@ -1194,11 +1195,13 @@ GDScriptParser::Node *GDScriptParser::_parse_expression(Node *p_parent, bool p_s case OperatorNode::OP_TERNARY_IF: priority = 14; ternary = true; + right_to_left = true; break; case OperatorNode::OP_TERNARY_ELSE: priority = 14; 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_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) { _set_error("Unexpected operator"); return NULL; } - // < is used for left to right (default) - // <= is used for right to left next_op = i; min_priority = priority; is_unary = unary; |