From 7f93ecd31494d17351ff8e16820b7117aa07d90b Mon Sep 17 00:00:00 2001 From: Lars Knoll Date: Sun, 27 May 2018 16:44:00 +0200 Subject: 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 --- src/qml/parser/qqmljs.g | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/qml/parser') 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; /. -- cgit v1.2.3