qmljs: use new qml parser

adds support for singleton and getter/setter properties

Change-Id: Ia6691ac7799a46885db0df44617617dcc3c13189
Reviewed-by: Kai Koehne <kai.koehne@digia.com>
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
This commit is contained in:
Fawzi Mohamed
2013-11-06 14:17:23 +01:00
parent 0374d83e83
commit e9c97aa1d1
35 changed files with 2420 additions and 1675 deletions

View File

@@ -52,12 +52,12 @@ class QML_PARSER_EXPORT QmlJSGrammar
public:
enum VariousConstants {
EOF_SYMBOL = 0,
REDUCE_HERE = 102,
SHIFT_THERE = 101,
REDUCE_HERE = 105,
SHIFT_THERE = 104,
T_AND = 1,
T_AND_AND = 2,
T_AND_EQ = 3,
T_AS = 92,
T_AS = 93,
T_AUTOMATIC_SEMICOLON = 62,
T_BREAK = 4,
T_CASE = 5,
@@ -79,18 +79,19 @@ public:
T_EQ = 17,
T_EQ_EQ = 18,
T_EQ_EQ_EQ = 19,
T_ERROR = 94,
T_ERROR = 97,
T_FALSE = 83,
T_FEED_JS_EXPRESSION = 98,
T_FEED_JS_PROGRAM = 100,
T_FEED_JS_SOURCE_ELEMENT = 99,
T_FEED_JS_STATEMENT = 97,
T_FEED_UI_OBJECT_MEMBER = 96,
T_FEED_UI_PROGRAM = 95,
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_FINALLY = 20,
T_FOR = 21,
T_FUNCTION = 22,
T_GE = 23,
T_GET = 95,
T_GT = 24,
T_GT_GT = 25,
T_GT_GT_EQ = 26,
@@ -118,13 +119,14 @@ public:
T_NOT_EQ_EQ = 46,
T_NULL = 81,
T_NUMERIC_LITERAL = 47,
T_ON = 93,
T_ON = 94,
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_PROPERTY = 66,
T_PUBLIC = 90,
T_QUESTION = 54,
@@ -137,6 +139,7 @@ public:
T_RETURN = 59,
T_RPAREN = 60,
T_SEMICOLON = 61,
T_SET = 96,
T_SIGNAL = 67,
T_STAR = 63,
T_STAR_EQ = 64,
@@ -155,15 +158,15 @@ public:
T_XOR = 79,
T_XOR_EQ = 80,
ACCEPT_STATE = 645,
RULE_COUNT = 350,
STATE_COUNT = 646,
TERMINAL_COUNT = 103,
NON_TERMINAL_COUNT = 107,
ACCEPT_STATE = 663,
RULE_COUNT = 357,
STATE_COUNT = 664,
TERMINAL_COUNT = 106,
NON_TERMINAL_COUNT = 111,
GOTO_INDEX_OFFSET = 646,
GOTO_INFO_OFFSET = 3019,
GOTO_CHECK_OFFSET = 3019
GOTO_INDEX_OFFSET = 664,
GOTO_INFO_OFFSET = 3104,
GOTO_CHECK_OFFSET = 3104
};
static const char *const spell [];