diff options
| author | Lars Knoll <lars.knoll@qt.io> | 2018-05-27 16:44:00 +0200 |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@qt.io> | 2018-05-28 11:47:23 +0000 |
| commit | 7f93ecd31494d17351ff8e16820b7117aa07d90b (patch) | |
| tree | 6c93c1de148394d62f4c6f4545577657d52127f1 /src/qml/parser | |
| parent | 1fc9c52e9984e08d32631ed3d61a9c45f2990b36 (diff) | |
The first branch in a ( ? : ) operator can always include the in keyword
Fix the grammar to be compliant with the spec in this case.
Change-Id: I5740c9427db6f5c6c2551d4e23f1f14070e497fb
Reviewed-by: Robin Burchell <robin.burchell@crimson.no>
Diffstat (limited to 'src/qml/parser')
| -rw-r--r-- | src/qml/parser/qqmljs.g | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/qml/parser/qqmljs.g b/src/qml/parser/qqmljs.g index ad19fbe0d9..405513b435 100644 --- a/src/qml/parser/qqmljs.g +++ b/src/qml/parser/qqmljs.g @@ -2469,7 +2469,7 @@ LogicalORExpression_In: LogicalORExpression_In T_OR_OR LogicalANDExpression_In; ConditionalExpression: LogicalORExpression; ConditionalExpression_In: LogicalORExpression_In; -ConditionalExpression: LogicalORExpression T_QUESTION AssignmentExpression T_COLON AssignmentExpression; +ConditionalExpression: LogicalORExpression T_QUESTION AssignmentExpression_In T_COLON AssignmentExpression; /. case $rule_number: Q_FALLTHROUGH(); ./ ConditionalExpression_In: LogicalORExpression_In T_QUESTION AssignmentExpression_In T_COLON AssignmentExpression_In; /. |