aboutsummaryrefslogtreecommitdiffstats
path: root/src/qml/parser/qqmljsgrammar_p.h
diff options
context:
space:
mode:
authorMichael Brasser <mbrasser@ford.com>2017-08-17 18:24:39 -0500
committerSimon Hausmann <simon.hausmann@qt.io>2017-08-18 18:03:34 +0000
commitcf1dcc857a5b9fdc55f21508c812bb4110cf93b7 (patch)
tree81ad9ad112de838786e2450fe72fc97bf23b9674 /src/qml/parser/qqmljsgrammar_p.h
parentad63e8491bdf6e85af1a72a44ef643321e6ceec0 (diff)
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 <simon.hausmann@qt.io>
Diffstat (limited to 'src/qml/parser/qqmljsgrammar_p.h')
-rw-r--r--src/qml/parser/qqmljsgrammar_p.h12
1 files changed, 6 insertions, 6 deletions
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[];