parser: Add "let" keyword (& T_LET)

We also tie this up to the existing skeletal "const" support so that they
are also checked for duplicate declarations.

While we do that, change from using a boolean to an enum so we make the scope of
a declaration a little more easily comprehensible.

Change-Id: I6a6e08aed4e16a53690d6f6bafb55632807b6024
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>

1 files changed, 29 insertions, 28 deletions

diff --git a/src/qml/parser/qqmljsgrammar_p.h b/src/qml/parser/qqmljsgrammar_p.h
index 050ef6c288..b4f762d28b 100644
--- a/src/qml/parser/qqmljsgrammar_p.h
+++ b/src/qml/parser/qqmljsgrammar_p.h
@@ -61,23 +61,23 @@ class QQmlJSGrammar
 public:
   enum VariousConstants {
     EOF_SYMBOL = 0,
-    REDUCE_HERE = 105,
-    SHIFT_THERE = 104,
+    REDUCE_HERE = 106,
+    SHIFT_THERE = 105,
     T_AND = 1,
     T_AND_AND = 2,
     T_AND_EQ = 3,
-    T_AS = 93,
+    T_AS = 94,
     T_AUTOMATIC_SEMICOLON = 62,
     T_BREAK = 4,
     T_CASE = 5,
     T_CATCH = 6,
     T_COLON = 7,
     T_COMMA = 8,
-    T_COMMENT = 88,
-    T_COMPATIBILITY_SEMICOLON = 89,
+    T_COMMENT = 89,
+    T_COMPATIBILITY_SEMICOLON = 90,
     T_CONST = 84,
     T_CONTINUE = 9,
-    T_DEBUGGER = 85,
+    T_DEBUGGER = 86,
     T_DEFAULT = 10,
     T_DELETE = 11,
     T_DIVIDE_ = 12,
@@ -88,19 +88,19 @@ public:
     T_EQ = 17,
     T_EQ_EQ = 18,
     T_EQ_EQ_EQ = 19,
-    T_ERROR = 97,
+    T_ERROR = 98,
     T_FALSE = 83,
-    T_FEED_JS_EXPRESSION = 101,
-    T_FEED_JS_PROGRAM = 103,
-    T_FEED_JS_SOURCE_ELEMENT = 102,
-    T_FEED_JS_STATEMENT = 100,
-    T_FEED_UI_OBJECT_MEMBER = 99,
-    T_FEED_UI_PROGRAM = 98,
+    T_FEED_JS_EXPRESSION = 102,
+    T_FEED_JS_PROGRAM = 104,
+    T_FEED_JS_SOURCE_ELEMENT = 103,
+    T_FEED_JS_STATEMENT = 101,
+    T_FEED_UI_OBJECT_MEMBER = 100,
+    T_FEED_UI_PROGRAM = 99,
     T_FINALLY = 20,
     T_FOR = 21,
     T_FUNCTION = 22,
     T_GE = 23,
-    T_GET = 95,
+    T_GET = 96,
     T_GT = 24,
     T_GT_GT = 25,
     T_GT_GT_EQ = 26,
@@ -108,12 +108,13 @@ public:
     T_GT_GT_GT_EQ = 28,
     T_IDENTIFIER = 29,
     T_IF = 30,
-    T_IMPORT = 91,
+    T_IMPORT = 92,
     T_IN = 31,
     T_INSTANCEOF = 32,
     T_LBRACE = 33,
     T_LBRACKET = 34,
     T_LE = 35,
+    T_LET = 85,
     T_LPAREN = 36,
     T_LT = 37,
     T_LT_LT = 38,
@@ -121,34 +122,34 @@ public:
     T_MINUS = 40,
     T_MINUS_EQ = 41,
     T_MINUS_MINUS = 42,
-    T_MULTILINE_STRING_LITERAL = 87,
+    T_MULTILINE_STRING_LITERAL = 88,
     T_NEW = 43,
     T_NOT = 44,
     T_NOT_EQ = 45,
     T_NOT_EQ_EQ = 46,
     T_NULL = 81,
     T_NUMERIC_LITERAL = 47,
-    T_ON = 94,
+    T_ON = 95,
     T_OR = 48,
     T_OR_EQ = 49,
     T_OR_OR = 50,
     T_PLUS = 51,
     T_PLUS_EQ = 52,
     T_PLUS_PLUS = 53,
-    T_PRAGMA = 92,
+    T_PRAGMA = 93,
     T_PROPERTY = 66,
-    T_PUBLIC = 90,
+    T_PUBLIC = 91,
     T_QUESTION = 54,
     T_RBRACE = 55,
     T_RBRACKET = 56,
     T_READONLY = 68,
     T_REMAINDER = 57,
     T_REMAINDER_EQ = 58,
-    T_RESERVED_WORD = 86,
+    T_RESERVED_WORD = 87,
     T_RETURN = 59,
     T_RPAREN = 60,
     T_SEMICOLON = 61,
-    T_SET = 96,
+    T_SET = 97,
     T_SIGNAL = 67,
     T_STAR = 63,
     T_STAR_EQ = 64,
@@ -167,15 +168,15 @@ public:
     T_XOR = 79,
     T_XOR_EQ = 80,
 
-    ACCEPT_STATE = 674,
-    RULE_COUNT = 361,
-    STATE_COUNT = 675,
-    TERMINAL_COUNT = 106,
+    ACCEPT_STATE = 678,
+    RULE_COUNT = 363,
+    STATE_COUNT = 679,
+    TERMINAL_COUNT = 107,
     NON_TERMINAL_COUNT = 111,
 
-    GOTO_INDEX_OFFSET = 675,
-    GOTO_INFO_OFFSET = 3078,
-    GOTO_CHECK_OFFSET = 3078
+    GOTO_INDEX_OFFSET = 679,
+    GOTO_INFO_OFFSET = 3203,
+    GOTO_CHECK_OFFSET = 3203
   };
 
   static const char  *const    spell [];