From cf1dcc857a5b9fdc55f21508c812bb4110cf93b7 Mon Sep 17 00:00:00 2001 From: Michael Brasser Date: Thu, 17 Aug 2017 18:24:39 -0500 Subject: Support explicit enum value declaration in QML Allow declarations such as: enum MyEnum { Value1 = 1, Value2 } Not all features of C++ enums are supported. Specifically, we don't yet allow: * Negative numbers (Value1 = -1) * Assignment of other values (Value2 = Value1) Change-Id: I4776f8d86bd0c8688c7dd8b7d4ccb2f72fdfe721 Task-number: QTBUG-14861 Reviewed-by: Simon Hausmann --- src/qml/parser/qqmljsgrammar_p.h | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'src/qml/parser/qqmljsgrammar_p.h') diff --git a/src/qml/parser/qqmljsgrammar_p.h b/src/qml/parser/qqmljsgrammar_p.h index aa8450f218..9d028f2191 100644 --- a/src/qml/parser/qqmljsgrammar_p.h +++ b/src/qml/parser/qqmljsgrammar_p.h @@ -169,15 +169,15 @@ public: T_XOR = 79, T_XOR_EQ = 80, - ACCEPT_STATE = 687, - RULE_COUNT = 367, - STATE_COUNT = 688, + ACCEPT_STATE = 691, + RULE_COUNT = 369, + STATE_COUNT = 692, TERMINAL_COUNT = 108, NON_TERMINAL_COUNT = 112, - GOTO_INDEX_OFFSET = 688, - GOTO_INFO_OFFSET = 3217, - GOTO_CHECK_OFFSET = 3217 + GOTO_INDEX_OFFSET = 692, + GOTO_INFO_OFFSET = 3357, + GOTO_CHECK_OFFSET = 3357 }; static const char *const spell[]; -- cgit v1.2.3