diff options
| author | Erik Verbruggen <erik.verbruggen@nokia.com> | 2010-01-18 11:36:28 (GMT) |
|---|---|---|
| committer | Erik Verbruggen <erik.verbruggen@nokia.com> | 2010-01-18 11:36:55 (GMT) |
| commit | 07373821696a06f228696e794d1e4568e51a1456 (patch) | |
| tree | 55384e7d7d96cafa92b760840f2a84cb03614609 /src/declarative/qml/parser | |
| parent | 4a1c0db988c87b4b4922e5a2607adadd633d99a1 (diff) | |
| download | Qt-07373821696a06f228696e794d1e4568e51a1456.zip Qt-07373821696a06f228696e794d1e4568e51a1456.tar.gz Qt-07373821696a06f228696e794d1e4568e51a1456.tar.bz2 | |
Added utility method to parse JavaScript programs.
Reviewed-by: Christian Kamm
Diffstat (limited to 'src/declarative/qml/parser')
| -rw-r--r-- | src/declarative/qml/parser/qmljs.g | 32 | ||||
| -rw-r--r-- | src/declarative/qml/parser/qmljsast.cpp | 11 | ||||
| -rw-r--r-- | src/declarative/qml/parser/qmljsast_p.h | 3 | ||||
| -rw-r--r-- | src/declarative/qml/parser/qmljsgrammar.cpp | 1638 | ||||
| -rw-r--r-- | src/declarative/qml/parser/qmljsgrammar_p.h | 21 | ||||
| -rw-r--r-- | src/declarative/qml/parser/qmljsparser.cpp | 451 | ||||
| -rw-r--r-- | src/declarative/qml/parser/qmljsparser_p.h | 14 |
7 files changed, 1060 insertions, 1110 deletions
diff --git a/src/declarative/qml/parser/qmljs.g b/src/declarative/qml/parser/qmljs.g index 0604457..7fbb3f6 100644 --- a/src/declarative/qml/parser/qmljs.g +++ b/src/declarative/qml/parser/qmljs.g @@ -72,6 +72,7 @@ %token T_FEED_JS_STATEMENT %token T_FEED_JS_EXPRESSION %token T_FEED_JS_SOURCE_ELEMENT +%token T_FEED_JS_PROGRAM %nonassoc SHIFT_THERE %nonassoc T_IDENTIFIER T_COLON T_SIGNAL T_PROPERTY T_READONLY @@ -268,6 +269,7 @@ public: bool parseExpression() { return parse(T_FEED_JS_EXPRESSION); } bool parseSourceElement() { return parse(T_FEED_JS_SOURCE_ELEMENT); } bool parseUiObjectMember() { return parse(T_FEED_UI_OBJECT_MEMBER); } + bool parseProgram() { return parse(T_FEED_JS_PROGRAM); } AST::UiProgram *ast() const { return AST::cast<AST::UiProgram *>(program); } @@ -296,13 +298,8 @@ public: return program->uiObjectMemberCast(); } - AST::SourceElement *sourceElement() const - { - if (! program) - return 0; - - return program->sourceElementCast(); - } + AST::Node *rootNode() const + { return program; } QList<DiagnosticMessage> diagnosticMessages() const { return diagnostic_messages; } @@ -565,6 +562,14 @@ case $rule_number: { } break; ./ +TopLevel: T_FEED_JS_PROGRAM Program ; +/. +case $rule_number: { + sym(1).Node = sym(2).Node; + program = sym(1).Node; +} break; +./ + UiProgram: UiImportListOpt UiRootMember ; /. case $rule_number: { @@ -2881,13 +2886,12 @@ case $rule_number: { } break; ./ ---QmlJSProgram: SourceElements ; ---/. ---case $rule_number: { --- sym(1).Node = makeAstNode<AST::Program> (driver->nodePool(), sym(1).SourceElements->finish ()); --- driver->changeAbstractSyntaxTree(sym(1).Node); ---} break; ---./ +Program: SourceElements ; +/. +case $rule_number: { + sym(1).Node = makeAstNode<AST::Program> (driver->nodePool(), sym(1).SourceElements->finish ()); +} break; +./ SourceElements: SourceElement ; /. diff --git a/src/declarative/qml/parser/qmljsast.cpp b/src/declarative/qml/parser/qmljsast.cpp index 35ae0c8..e80b05e 100644 --- a/src/declarative/qml/parser/qmljsast.cpp +++ b/src/declarative/qml/parser/qmljsast.cpp @@ -81,11 +81,6 @@ UiObjectMember *Node::uiObjectMemberCast() return 0; } -SourceElement *Node::sourceElementCast() -{ - return 0; -} - ExpressionNode *ExpressionNode::expressionCast() { return this; @@ -777,11 +772,6 @@ void SourceElements::accept0(Visitor *visitor) visitor->endVisit(this); } -SourceElement *SourceElement::sourceElementCast() -{ - return this; -} - void FunctionSourceElement::accept0(Visitor *visitor) { if (visitor->visit(this)) { @@ -808,7 +798,6 @@ void DebuggerStatement::accept0(Visitor *visitor) visitor->endVisit(this); } - void UiProgram::accept0(Visitor *visitor) { if (visitor->visit(this)) { diff --git a/src/declarative/qml/parser/qmljsast_p.h b/src/declarative/qml/parser/qmljsast_p.h index 6f7f5cc..032fbb1 100644 --- a/src/declarative/qml/parser/qmljsast_p.h +++ b/src/declarative/qml/parser/qmljsast_p.h @@ -230,7 +230,6 @@ public: virtual BinaryExpression *binaryExpressionCast(); virtual Statement *statementCast(); virtual UiObjectMember *uiObjectMemberCast(); - virtual SourceElement *sourceElementCast(); void accept(Visitor *visitor); static void accept(Node *node, Visitor *visitor); @@ -2165,8 +2164,6 @@ public: { kind = K; } virtual ~SourceElement() {} - - virtual SourceElement *sourceElementCast(); }; class QML_PARSER_EXPORT FunctionSourceElement: public SourceElement diff --git a/src/declarative/qml/parser/qmljsgrammar.cpp b/src/declarative/qml/parser/qmljsgrammar.cpp index c0209fc..b416959 100644 --- a/src/declarative/qml/parser/qmljsgrammar.cpp +++ b/src/declarative/qml/parser/qmljsgrammar.cpp @@ -54,604 +54,581 @@ const char *const QmlJSGrammar::spell [] = { ")", ";", 0, "*", "*=", "string literal", "property", "signal", "readonly", "switch", "this", "throw", "~", "try", "typeof", "var", "void", "while", "with", "^", "^=", "null", "true", "false", "const", "debugger", "reserved word", "multiline string literal", "comment", "public", - "import", "as", 0, 0, 0, 0, 0, 0, 0}; + "import", "as", 0, 0, 0, 0, 0, 0, 0, 0}; const short QmlJSGrammar::lhs [] = { - 99, 99, 99, 99, 99, 100, 105, 105, 108, 108, - 110, 109, 109, 109, 109, 109, 109, 109, 109, 112, - 107, 106, 115, 115, 116, 116, 117, 117, 114, 104, - 104, 104, 104, 104, 104, 104, 123, 123, 123, 124, - 124, 125, 125, 104, 104, 104, 104, 104, 104, 104, - 104, 104, 104, 104, 104, 104, 104, 104, 104, 104, - 104, 113, 113, 113, 113, 128, 128, 128, 128, 128, - 128, 128, 128, 128, 128, 128, 128, 128, 128, 128, - 128, 128, 128, 118, 130, 130, 130, 130, 129, 129, - 132, 132, 134, 134, 134, 134, 134, 134, 135, 135, - 135, 135, 135, 135, 135, 135, 135, 135, 135, 135, - 135, 135, 135, 135, 135, 135, 135, 135, 135, 135, - 135, 135, 135, 135, 135, 135, 135, 135, 135, 136, - 136, 111, 111, 111, 111, 111, 139, 139, 140, 140, - 140, 140, 138, 138, 141, 141, 142, 142, 143, 143, - 143, 144, 144, 144, 144, 144, 144, 144, 144, 144, - 144, 145, 145, 145, 145, 146, 146, 146, 147, 147, - 147, 147, 148, 148, 148, 148, 148, 148, 148, 149, - 149, 149, 149, 149, 149, 150, 150, 150, 150, 150, - 151, 151, 151, 151, 151, 152, 152, 153, 153, 154, - 154, 155, 155, 156, 156, 157, 157, 158, 158, 159, - 159, 160, 160, 161, 161, 162, 162, 163, 163, 133, - 133, 164, 164, 165, 165, 165, 165, 165, 165, 165, - 165, 165, 165, 165, 165, 102, 102, 166, 166, 167, - 167, 168, 168, 101, 101, 101, 101, 101, 101, 101, - 101, 101, 101, 101, 101, 101, 101, 101, 119, 180, - 180, 179, 179, 127, 127, 181, 181, 182, 182, 184, - 184, 183, 185, 188, 186, 186, 189, 187, 187, 120, - 121, 121, 122, 122, 169, 169, 169, 169, 169, 169, - 169, 170, 170, 170, 170, 171, 171, 171, 171, 172, - 172, 173, 175, 190, 190, 193, 193, 191, 191, 194, - 192, 174, 174, 174, 176, 176, 177, 177, 177, 195, - 196, 178, 178, 126, 137, 200, 200, 197, 197, 198, - 198, 201, 202, 202, 103, 103, 199, 199, 131, 131, - 203}; + 100, 100, 100, 100, 100, 100, 101, 107, 107, 110, + 110, 112, 111, 111, 111, 111, 111, 111, 111, 111, + 114, 109, 108, 117, 117, 118, 118, 119, 119, 116, + 105, 105, 105, 105, 105, 105, 105, 125, 125, 125, + 126, 126, 127, 127, 105, 105, 105, 105, 105, 105, + 105, 105, 105, 105, 105, 105, 105, 105, 105, 105, + 105, 105, 115, 115, 115, 115, 130, 130, 130, 130, + 130, 130, 130, 130, 130, 130, 130, 130, 130, 130, + 130, 130, 130, 130, 120, 132, 132, 132, 132, 131, + 131, 134, 134, 136, 136, 136, 136, 136, 136, 137, + 137, 137, 137, 137, 137, 137, 137, 137, 137, 137, + 137, 137, 137, 137, 137, 137, 137, 137, 137, 137, + 137, 137, 137, 137, 137, 137, 137, 137, 137, 137, + 138, 138, 113, 113, 113, 113, 113, 141, 141, 142, + 142, 142, 142, 140, 140, 143, 143, 144, 144, 145, + 145, 145, 146, 146, 146, 146, 146, 146, 146, 146, + 146, 146, 147, 147, 147, 147, 148, 148, 148, 149, + 149, 149, 149, 150, 150, 150, 150, 150, 150, 150, + 151, 151, 151, 151, 151, 151, 152, 152, 152, 152, + 152, 153, 153, 153, 153, 153, 154, 154, 155, 155, + 156, 156, 157, 157, 158, 158, 159, 159, 160, 160, + 161, 161, 162, 162, 163, 163, 164, 164, 165, 165, + 135, 135, 166, 166, 167, 167, 167, 167, 167, 167, + 167, 167, 167, 167, 167, 167, 103, 103, 168, 168, + 169, 169, 170, 170, 102, 102, 102, 102, 102, 102, + 102, 102, 102, 102, 102, 102, 102, 102, 102, 121, + 182, 182, 181, 181, 129, 129, 183, 183, 184, 184, + 186, 186, 185, 187, 190, 188, 188, 191, 189, 189, + 122, 123, 123, 124, 124, 171, 171, 171, 171, 171, + 171, 171, 172, 172, 172, 172, 173, 173, 173, 173, + 174, 174, 175, 177, 192, 192, 195, 195, 193, 193, + 196, 194, 176, 176, 176, 178, 178, 179, 179, 179, + 197, 198, 180, 180, 128, 139, 202, 202, 199, 199, + 200, 200, 203, 106, 204, 204, 104, 104, 201, 201, + 133, 133, 205}; const short QmlJSGrammar::rhs [] = { - 2, 2, 2, 2, 2, 2, 1, 1, 1, 2, - 1, 2, 2, 3, 3, 5, 5, 4, 4, 2, - 0, 1, 1, 2, 1, 3, 2, 3, 2, 1, - 5, 4, 3, 3, 3, 3, 1, 1, 1, 0, - 1, 2, 4, 6, 6, 3, 3, 7, 7, 4, - 4, 5, 5, 6, 6, 7, 7, 7, 7, 1, + 2, 2, 2, 2, 2, 2, 2, 1, 1, 1, + 2, 1, 2, 2, 3, 3, 5, 5, 4, 4, + 2, 0, 1, 1, 2, 1, 3, 2, 3, 2, + 1, 5, 4, 3, 3, 3, 3, 1, 1, 1, + 0, 1, 2, 4, 6, 6, 3, 3, 7, 7, + 4, 4, 5, 5, 6, 6, 7, 7, 7, 7, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, - 1, 1, 1, 1, 1, 2, 3, 3, 4, 5, - 3, 4, 3, 1, 1, 2, 3, 4, 1, 2, - 3, 5, 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 2, 3, 3, 4, + 5, 3, 4, 3, 1, 1, 2, 3, 4, 1, + 2, 3, 5, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, - 1, 1, 1, 4, 3, 5, 1, 2, 4, 4, - 4, 3, 0, 1, 1, 3, 1, 1, 1, 2, - 2, 1, 2, 2, 2, 2, 2, 2, 2, 2, - 2, 1, 3, 3, 3, 1, 3, 3, 1, 3, - 3, 3, 1, 3, 3, 3, 3, 3, 3, 1, - 3, 3, 3, 3, 3, 1, 3, 3, 3, 3, - 1, 3, 3, 3, 3, 1, 3, 1, 3, 1, - 3, 1, 3, 1, 3, 1, 3, 1, 3, 1, - 3, 1, 3, 1, 3, 1, 5, 1, 5, 1, - 3, 1, 3, 1, 1, 1, 1, 1, 1, 1, - 1, 1, 1, 1, 1, 1, 3, 0, 1, 1, - 3, 0, 1, 1, 1, 1, 1, 1, 1, 1, - 1, 1, 1, 1, 1, 1, 1, 1, 3, 1, - 2, 0, 1, 3, 3, 1, 1, 1, 3, 1, - 3, 2, 2, 2, 0, 1, 2, 0, 1, 1, - 2, 2, 7, 5, 7, 7, 5, 9, 10, 7, - 8, 2, 2, 3, 3, 2, 2, 3, 3, 3, - 3, 5, 5, 3, 5, 1, 2, 0, 1, 4, - 3, 3, 3, 3, 3, 3, 3, 3, 4, 5, - 2, 2, 2, 8, 8, 1, 3, 0, 1, 0, - 1, 1, 1, 2, 1, 1, 0, 1, 0, 1, - 2}; + 1, 1, 1, 1, 4, 3, 5, 1, 2, 4, + 4, 4, 3, 0, 1, 1, 3, 1, 1, 1, + 2, 2, 1, 2, 2, 2, 2, 2, 2, 2, + 2, 2, 1, 3, 3, 3, 1, 3, 3, 1, + 3, 3, 3, 1, 3, 3, 3, 3, 3, 3, + 1, 3, 3, 3, 3, 3, 1, 3, 3, 3, + 3, 1, 3, 3, 3, 3, 1, 3, 1, 3, + 1, 3, 1, 3, 1, 3, 1, 3, 1, 3, + 1, 3, 1, 3, 1, 3, 1, 5, 1, 5, + 1, 3, 1, 3, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 3, 0, 1, + 1, 3, 0, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, 1, 3, + 1, 2, 0, 1, 3, 3, 1, 1, 1, 3, + 1, 3, 2, 2, 2, 0, 1, 2, 0, 1, + 1, 2, 2, 7, 5, 7, 7, 5, 9, 10, + 7, 8, 2, 2, 3, 3, 2, 2, 3, 3, + 3, 3, 5, 5, 3, 5, 1, 2, 0, 1, + 4, 3, 3, 3, 3, 3, 3, 3, 3, 4, + 5, 2, 2, 2, 8, 8, 1, 3, 0, 1, + 0, 1, 1, 1, 1, 2, 1, 1, 0, 1, + 0, 1, 2}; const short QmlJSGrammar::action_default [] = { - 0, 0, 0, 0, 0, 21, 0, 169, 236, 200, - 208, 204, 148, 220, 196, 3, 133, 67, 149, 212, - 216, 137, 166, 147, 152, 132, 186, 173, 0, 74, - 75, 70, 337, 62, 339, 0, 0, 0, 0, 72, - 0, 0, 68, 71, 0, 0, 63, 65, 64, 73, - 66, 0, 69, 0, 0, 162, 0, 0, 149, 168, - 151, 150, 0, 0, 0, 164, 165, 163, 167, 0, - 197, 0, 0, 0, 0, 187, 0, 0, 0, 0, - 0, 0, 177, 0, 0, 0, 171, 172, 170, 175, - 179, 178, 176, 174, 189, 188, 190, 0, 205, 0, - 201, 0, 0, 143, 130, 142, 131, 99, 100, 101, - 126, 102, 127, 103, 104, 105, 106, 107, 108, 109, - 110, 111, 112, 113, 114, 115, 128, 116, 117, 118, - 119, 120, 121, 122, 123, 124, 125, 129, 0, 0, - 141, 237, 144, 0, 145, 0, 146, 140, 0, 233, - 226, 224, 231, 232, 230, 229, 235, 228, 227, 225, - 234, 221, 0, 209, 0, 0, 213, 0, 0, 217, - 0, 0, 143, 135, 0, 134, 0, 139, 153, 0, - 338, 328, 329, 0, 326, 0, 327, 0, 330, 244, - 251, 250, 258, 246, 0, 247, 331, 0, 336, 248, - 249, 254, 252, 333, 332, 335, 255, 0, 266, 0, - 0, 0, 0, 337, 62, 0, 339, 63, 238, 280, - 64, 0, 0, 0, 267, 0, 0, 256, 257, 0, - 245, 253, 281, 282, 325, 334, 0, 296, 297, 298, - 299, 0, 292, 293, 294, 295, 322, 323, 0, 0, - 0, 0, 0, 285, 286, 242, 240, 202, 210, 206, - 222, 198, 243, 0, 149, 214, 218, 191, 180, 0, - 0, 199, 0, 0, 0, 0, 192, 0, 0, 0, - 0, 0, 184, 182, 185, 183, 181, 194, 193, 195, - 0, 207, 0, 203, 0, 241, 149, 0, 223, 238, - 239, 0, 238, 0, 0, 288, 0, 0, 0, 290, - 0, 211, 0, 0, 215, 0, 0, 219, 278, 0, - 270, 279, 273, 0, 277, 0, 238, 271, 0, 238, - 0, 0, 289, 0, 0, 0, 291, 338, 328, 0, - 0, 330, 0, 324, 0, 314, 0, 0, 0, 284, - 0, 283, 0, 340, 0, 98, 260, 263, 0, 99, - 266, 102, 127, 104, 105, 70, 109, 110, 62, 111, - 114, 68, 71, 63, 238, 64, 73, 117, 66, 119, - 69, 121, 122, 267, 124, 125, 129, 0, 91, 0, - 0, 93, 97, 95, 82, 94, 96, 0, 92, 81, - 261, 259, 137, 138, 143, 0, 136, 0, 313, 0, - 300, 301, 0, 312, 0, 0, 0, 303, 308, 306, - 309, 0, 0, 307, 308, 0, 304, 0, 305, 262, - 311, 0, 262, 310, 0, 315, 316, 0, 262, 317, - 318, 0, 0, 319, 0, 0, 0, 320, 321, 155, - 154, 0, 0, 0, 287, 0, 0, 0, 302, 275, - 268, 0, 276, 272, 0, 274, 264, 0, 265, 269, - 85, 0, 0, 89, 76, 0, 78, 87, 0, 79, - 88, 90, 80, 86, 77, 0, 83, 159, 157, 161, - 158, 156, 160, 4, 2, 60, 84, 0, 0, 63, - 65, 64, 30, 5, 0, 61, 0, 39, 38, 37, - 0, 0, 52, 0, 53, 0, 58, 59, 0, 39, - 0, 0, 0, 0, 0, 48, 49, 0, 50, 0, - 51, 0, 54, 55, 0, 0, 0, 0, 0, 56, - 57, 0, 46, 40, 47, 41, 0, 0, 0, 0, - 43, 0, 44, 45, 42, 0, 0, 29, 33, 34, - 35, 36, 137, 262, 0, 0, 99, 266, 102, 127, - 104, 105, 70, 109, 110, 62, 111, 114, 68, 71, - 63, 238, 64, 73, 117, 66, 119, 69, 121, 122, - 267, 124, 125, 129, 137, 0, 25, 0, 0, 31, - 26, 32, 27, 23, 0, 28, 24, 7, 0, 9, - 0, 8, 0, 1, 20, 11, 0, 12, 0, 13, - 0, 18, 19, 0, 14, 15, 0, 16, 17, 10, - 22, 6, 341}; + 0, 0, 0, 0, 0, 0, 22, 0, 170, 237, + 201, 209, 205, 149, 221, 197, 3, 134, 68, 150, + 213, 217, 138, 167, 148, 153, 133, 187, 174, 0, + 75, 76, 71, 339, 63, 341, 0, 0, 0, 0, + 73, 0, 0, 69, 72, 0, 0, 64, 66, 65, + 74, 67, 0, 70, 0, 0, 163, 0, 0, 150, + 169, 152, 151, 0, 0, 0, 165, 166, 164, 168, + 0, 198, 0, 0, 0, 0, 188, 0, 0, 0, + 0, 0, 0, 178, 0, 0, 0, 172, 173, 171, + 176, 180, 179, 177, 175, 190, 189, 191, 0, 206, + 0, 202, 0, 0, 144, 131, 143, 132, 100, 101, + 102, 127, 103, 128, 104, 105, 106, 107, 108, 109, + 110, 111, 112, 113, 114, 115, 116, 129, 117, 118, + 119, 120, 121, 122, 123, 124, 125, 126, 130, 0, + 0, 142, 238, 145, 0, 146, 0, 147, 141, 0, + 234, 227, 225, 232, 233, 231, 230, 236, 229, 228, + 226, 235, 222, 0, 210, 0, 0, 214, 0, 0, + 218, 0, 0, 144, 136, 0, 135, 0, 140, 154, + 0, 340, 329, 330, 0, 327, 0, 328, 0, 331, + 245, 252, 251, 259, 247, 0, 248, 332, 0, 338, + 249, 250, 255, 253, 335, 333, 337, 256, 0, 267, + 0, 0, 0, 0, 339, 63, 0, 341, 64, 239, + 281, 65, 0, 0, 0, 268, 0, 0, 257, 258, + 0, 246, 254, 282, 283, 326, 336, 0, 297, 298, + 299, 300, 0, 293, 294, 295, 296, 323, 324, 0, + 0, 0, 0, 0, 286, 287, 243, 241, 203, 211, + 207, 223, 199, 244, 0, 150, 215, 219, 192, 181, + 0, 0, 200, 0, 0, 0, 0, 193, 0, 0, + 0, 0, 0, 185, 183, 186, 184, 182, 195, 194, + 196, 0, 208, 0, 204, 0, 242, 150, 0, 224, + 239, 240, 0, 239, 0, 0, 289, 0, 0, 0, + 291, 0, 212, 0, 0, 216, 0, 0, 220, 279, + 0, 271, 280, 274, 0, 278, 0, 239, 272, 0, + 239, 0, 0, 290, 0, 0, 0, 292, 340, 329, + 0, 0, 331, 0, 325, 0, 315, 0, 0, 0, + 285, 0, 284, 0, 342, 0, 99, 261, 264, 0, + 100, 267, 103, 128, 105, 106, 71, 110, 111, 63, + 112, 115, 69, 72, 64, 239, 65, 74, 118, 67, + 120, 70, 122, 123, 268, 125, 126, 130, 0, 92, + 0, 0, 94, 98, 96, 83, 95, 97, 0, 93, + 82, 262, 260, 138, 139, 144, 0, 137, 0, 314, + 0, 301, 302, 0, 313, 0, 0, 0, 304, 309, + 307, 310, 0, 0, 308, 309, 0, 305, 0, 306, + 263, 312, 0, 263, 311, 0, 316, 317, 0, 263, + 318, 319, 0, 0, 320, 0, 0, 0, 321, 322, + 156, 155, 0, 0, 0, 288, 0, 0, 0, 303, + 276, 269, 0, 277, 273, 0, 275, 265, 0, 266, + 270, 86, 0, 0, 90, 77, 0, 79, 88, 0, + 80, 89, 91, 81, 87, 78, 0, 84, 160, 158, + 162, 159, 157, 161, 6, 334, 4, 2, 61, 85, + 0, 0, 64, 66, 65, 31, 5, 0, 62, 0, + 40, 39, 38, 0, 0, 53, 0, 54, 0, 59, + 60, 0, 40, 0, 0, 0, 0, 0, 49, 50, + 0, 51, 0, 52, 0, 55, 56, 0, 0, 0, + 0, 0, 57, 58, 0, 47, 41, 48, 42, 0, + 0, 0, 0, 44, 0, 45, 46, 43, 0, 0, + 30, 34, 35, 36, 37, 138, 263, 0, 0, 100, + 267, 103, 128, 105, 106, 71, 110, 111, 63, 112, + 115, 69, 72, 64, 239, 65, 74, 118, 67, 120, + 70, 122, 123, 268, 125, 126, 130, 138, 0, 26, + 0, 0, 32, 27, 33, 28, 24, 0, 29, 25, + 8, 0, 10, 0, 9, 0, 1, 21, 12, 0, + 13, 0, 14, 0, 19, 20, 0, 15, 16, 0, + 17, 18, 11, 23, 7, 343}; const short QmlJSGrammar::goto_default [] = { - 6, 613, 356, 194, 203, 503, 612, 631, 607, 611, - 609, 614, 21, 610, 17, 502, 604, 595, 557, 504, - 189, 193, 195, 199, 520, 546, 545, 198, 230, 25, - 472, 471, 354, 353, 8, 352, 355, 105, 16, 143, - 23, 12, 142, 18, 24, 55, 22, 7, 27, 26, - 267, 14, 261, 9, 257, 11, 259, 10, 258, 19, - 265, 20, 266, 13, 260, 256, 297, 409, 262, 263, - 200, 191, 190, 202, 231, 201, 206, 227, 228, 192, - 358, 357, 229, 461, 460, 319, 320, 463, 322, 462, - 321, 417, 421, 424, 420, 419, 439, 440, 183, 197, - 179, 182, 196, 204, 0}; + 7, 616, 206, 195, 204, 506, 494, 615, 634, 610, + 614, 612, 617, 22, 613, 18, 505, 607, 598, 560, + 507, 190, 194, 196, 200, 523, 549, 548, 199, 231, + 26, 473, 472, 355, 354, 9, 353, 356, 106, 17, + 144, 24, 13, 143, 19, 25, 56, 23, 8, 28, + 27, 268, 15, 262, 10, 258, 12, 260, 11, 259, + 20, 266, 21, 267, 14, 261, 257, 298, 410, 263, + 264, 201, 192, 191, 203, 232, 202, 207, 228, 229, + 193, 359, 358, 230, 462, 461, 320, 321, 464, 323, + 463, 322, 418, 422, 425, 421, 420, 440, 441, 184, + 198, 180, 183, 197, 205, 0}; const short QmlJSGrammar::action_index [] = { - 336, 1295, 2402, 2307, 1029, -1, 68, 106, -99, 62, - 24, -9, 266, -99, 315, 69, -99, -99, 582, 92, - 95, 176, 142, -99, -99, -99, 583, 186, 1295, -99, - -99, -99, 341, -99, 2117, 1566, 1295, 1295, 1295, -99, - 932, 1295, -99, -99, 1295, 1295, -99, -99, -99, -99, - -99, 1295, -99, 1295, 1295, -99, 1295, 1295, 105, 217, - -99, -99, 1295, 1295, 1295, -99, -99, -99, 235, 1295, - 431, 1295, 1295, 1295, 1295, 435, 1295, 1295, 1295, 1295, - 1295, 1295, 213, 1295, 1295, 1295, 128, 102, 93, 241, - 240, 219, 218, 237, 482, 450, 492, 1295, 16, 1295, - 182, 2022, 1295, 1295, -99, -99, -99, -99, -99, -99, - -99, -99, -99, -99, -99, -99, -99, -99, -99, -99, - -99, -99, -99, -99, -99, -99, -99, -99, -99, -99, - -99, -99, -99, -99, -99, -99, -99, -99, 114, 1295, - -99, -99, 46, -10, -99, 1295, -99, -99, 1295, -99, - -99, -99, -99, -99, -99, -99, -99, -99, -99, -99, - -99, -99, 1295, 44, 1295, 1295, 76, 66, 1295, -99, - 2022, 1295, 1295, -99, 100, -99, -12, -99, -99, 7, - -99, 314, 29, -26, -99, 296, -99, 3, 2402, -99, - -99, -99, -99, -99, 245, -99, -99, -2, -99, -99, - -99, -99, -99, -99, 2402, -99, -99, 505, -99, 479, - 134, 2307, -35, 291, 84, -30, 2592, 35, 1295, -99, - 34, 4, 1295, -25, -99, 65, 61, -99, -99, 337, - -99, -99, -99, -99, -99, -99, 101, -99, -99, -99, - -99, 141, -99, -99, -99, -99, -99, -99, -51, -11, - 1295, 111, 64, -99, -99, 1475, -99, 82, 38, 14, - -99, 290, 73, 15, 619, 83, 57, 420, 246, 264, - 1295, 299, 1295, 1295, 1295, 1295, 507, 1295, 1295, 1295, - 1295, 1295, 195, 198, 192, 189, 225, 507, 410, 416, - 1295, 1, 1295, 74, 1295, -99, 679, 1295, -99, 1295, - 63, 5, 1295, 52, 2307, -99, 1295, 144, 2307, -99, - 1295, 54, 1295, 1295, 94, 96, 1295, -99, 88, 98, - 86, -99, -99, 1295, -99, 358, 1295, -99, -43, 1295, - -44, 2307, -99, 1295, 107, 2307, -99, -15, 354, -36, - -5, 2402, -28, -99, 2307, -99, 1295, 130, 2307, -4, - 2307, -99, 8, -8, -53, -99, -99, 2307, -52, 433, - 2, 436, 123, 1295, 2307, 0, -31, 425, 13, -3, - 845, 22, 42, -99, 1387, -99, 37, 11, 45, 1295, - 49, 27, 1295, 51, 1295, 26, 23, 1295, -99, 2212, - 48, -99, -99, -99, -99, -99, -99, 1295, -99, -99, - -99, -99, 350, -99, 1295, -29, -99, 2307, -99, 103, - -99, -99, 2307, -99, 1295, 113, 6, -99, 33, -99, - 17, 119, 1295, -99, 25, 28, -99, -23, -99, 2307, - -99, 124, 2307, -99, 173, -99, -99, 121, 2307, 41, - -99, -22, 18, -99, 344, 50, 85, -99, -99, -99, - -99, 1295, 140, 2307, -99, 1295, 129, 2307, -99, 47, - -99, 147, -99, -99, 1295, -99, -99, 274, -99, -99, - -99, 122, 1657, -99, -99, 1839, -99, -99, 1748, -99, - -99, -99, -99, -99, -99, 120, -99, -99, -99, -99, - -99, -99, -99, -99, -99, -99, 160, -62, 657, 153, - -56, -18, -99, -99, 133, -99, 229, -99, -99, -99, - -16, 199, -99, 1295, -99, 180, -99, -99, 261, 72, - 71, 197, 89, 70, 115, -99, -99, 208, -99, 1295, - -99, 193, -99, -99, 202, 40, 60, 1295, 224, -99, - -99, 251, -99, 230, -99, 79, 30, 281, 253, 348, - -99, 125, -99, -99, -99, 1927, 1118, -99, -99, -99, - -99, -99, 335, 2497, 1566, 90, 497, 58, 489, 136, - 1295, 2307, 81, 9, 370, 39, -13, 766, 10, 75, - -99, 1387, -99, 77, 43, 67, 1295, 91, 87, 1295, - 97, 1295, 80, 78, 361, 116, -99, -14, 853, -99, - -99, -99, -99, -99, 1207, -99, -99, -99, 940, -99, - 276, -33, 738, -99, -99, 135, 325, -99, 228, -99, - 99, -99, -99, 285, -99, -99, 131, -99, -99, -99, - -99, -99, -99, + 439, 1109, 2228, 2228, 2132, 814, -74, 18, 147, -100, + 31, -17, -49, 232, -100, 318, 85, -100, -100, 554, + 33, 94, 331, 215, -100, -100, -100, 448, 231, 1109, + -100, -100, -100, 320, -100, 1940, 1472, 1109, 1109, 1109, + -100, 724, 1109, -100, -100, 1109, 1109, -100, -100, -100, + -100, -100, 1109, -100, 1109, 1109, -100, 1109, 1109, 129, + 157, -100, -100, 1109, 1109, 1109, -100, -100, -100, 200, + 1109, 293, 1109, 1109, 1109, 1109, 466, 1109, 1109, 1109, + 1109, 1109, 1109, 179, 1109, 1109, 1109, 119, 125, 95, + 188, 198, 184, 203, 178, 567, 567, 484, 1109, -5, + 1109, 67, 1844, 1109, 1109, -100, -100, -100, -100, -100, + -100, -100, -100, -100, -100, -100, -100, -100, -100, -100, + -100, -100, -100, -100, -100, -100, -100, -100, -100, -100, + -100, -100, -100, -100, -100, -100, -100, -100, -100, 110, + 1109, -100, -100, 70, 61, -100, 1109, -100, -100, 1109, + -100, -100, -100, -100, -100, -100, -100, -100, -100, -100, + -100, -100, -100, 1109, 55, 1109, 1109, 73, 63, 1109, + -100, 1844, 1109, 1109, -100, 141, -100, 41, -100, -100, + 87, -100, 255, 80, 78, -100, 287, -100, 83, 2228, + -100, -100, -100, -100, -100, 225, -100, -100, 52, -100, + -100, -100, -100, -100, -100, 2228, -100, -100, 420, -100, + 408, 113, 2132, 50, 330, 65, 46, 2420, 72, 1109, + -100, 74, 75, 1109, 77, -100, 53, 56, -100, -100, + 323, -100, -100, -100, -100, -100, -100, 96, -100, -100, + -100, -100, 99, -100, -100, -100, -100, -100, -100, 60, + 47, 1109, 118, 93, -100, -100, 1291, -100, 79, 66, + 64, -100, 413, 76, 51, 664, 89, 97, 393, 183, + 337, 1109, 413, 1109, 1109, 1109, 1109, 411, 1109, 1109, + 1109, 1109, 1109, 252, 272, 212, 217, 221, 490, 490, + 383, 1109, 64, 1109, 84, 1109, -100, 536, 1109, -100, + 1109, 69, 68, 1109, 44, 2132, -100, 1109, 124, 2132, + -100, 1109, 54, 1109, 1109, 71, 88, 1109, -100, 82, + 122, 154, -100, -100, 1109, -100, 343, 1109, -100, 81, + 1109, 90, 2132, -100, 1109, 112, 2132, -100, 86, 333, + -39, -10, 2228, -33, -100, 2132, -100, 1109, 246, 2132, + 4, 2132, -100, 10, 16, -21, -100, -100, 2132, -26, + 480, 19, 462, 128, 1109, 2132, 6, -9, 400, 8, + -22, 840, -3, -6, -100, 1202, -100, -7, -28, 5, + 1109, 2, -23, 1109, 0, 1109, -34, -30, 1109, -100, + 2036, 21, -100, -100, -100, -100, -100, -100, 1109, -100, + -100, -100, -100, 209, -100, 1109, 40, -100, 2132, -100, + 101, -100, -100, 2132, -100, 1109, 120, 43, -100, 62, + -100, 59, 109, 1109, -100, 57, 58, -100, 39, -100, + 2132, -100, 117, 2132, -100, 199, -100, -100, 107, 2132, + 34, -100, 24, 11, -100, 346, -19, 14, -100, -100, + -100, -100, 1109, 133, 2132, -100, 1109, 126, 2132, -100, + 20, -100, 173, -100, -100, 1109, -100, -100, 303, -100, + -100, -100, 100, 1656, -100, -100, 1564, -100, -100, 1748, + -100, -100, -100, -100, -100, -100, 131, -100, -100, -100, + -100, -100, -100, -100, -100, 2228, -100, -100, -100, 158, + -20, 752, 165, -16, 22, -100, -100, 98, -100, 189, + -100, -100, -100, 28, 170, -100, 1109, -100, 230, -100, + -100, 247, 1, 13, 238, 37, -24, 106, -100, -100, + 273, -100, 1109, -100, 265, -100, -100, 242, -4, 12, + 1109, 241, -100, -100, 234, -100, 245, -100, 3, 9, + 311, 190, 316, -100, 134, -100, -100, -100, 1380, 1020, + -100, -100, -100, -100, -100, 359, 2324, 1472, 15, 444, + 38, 394, 138, 1109, 2132, 36, 17, 397, 42, 23, + 840, 32, 29, -100, 1202, -100, 26, 35, 48, 1109, + 45, 25, 1109, 49, 1109, 27, 30, 314, 132, -100, + 7, 752, -100, -100, -100, -100, -100, 930, -100, -100, + -100, 752, -100, 253, -87, 617, -100, -100, 102, 290, + -100, 191, -100, 140, -100, -100, 275, -100, -100, 91, + -100, -100, -100, -100, -100, -100, - -105, 6, 90, 3, 224, -105, -105, -105, -105, -105, - -105, -105, -105, -105, -105, -105, -105, -105, -40, -105, - -105, -105, -105, -105, -105, -105, -105, -105, 58, -105, - -105, -105, 1, -105, -105, -24, 13, 80, 87, -105, - 151, 175, -105, -105, 172, 169, -105, -105, -105, -105, - -105, 140, -105, 133, 159, -105, 131, 108, -105, -105, - -105, -105, 153, 143, 147, -105, -105, -105, -105, 136, - -105, 146, 154, 157, 150, -105, 124, 132, 123, 176, - 173, 162, -105, 103, 84, 73, -105, -105, -105, -105, - -105, -105, -105, -105, -105, -105, -105, 104, -105, 96, - -105, 270, 9, 56, -105, -105, -105, -105, -105, -105, - -105, -105, -105, -105, -105, -105, -105, -105, -105, -105, - -105, -105, -105, -105, -105, -105, -105, -105, -105, -105, - -105, -105, -105, -105, -105, -105, -105, -105, -105, 17, - -105, -105, -105, -105, -105, 22, -105, -105, 19, -105, - -105, -105, -105, -105, -105, -105, -105, -105, -105, -105, - -105, -105, 61, -105, 65, 50, -105, -105, 35, -105, - 226, 52, 106, -105, -105, -105, -105, -105, -105, -105, - -105, -10, -105, -105, -105, 46, -105, -105, 57, -105, - -105, -105, -105, -105, -105, -105, -105, -105, -105, -105, - -105, -105, -105, -105, 91, -105, -105, 34, -105, 33, - -105, 31, -105, 66, -105, -105, -105, -105, 179, -105, - -105, -105, 71, 53, -105, -105, -105, -105, -105, -6, - -105, -105, -105, -105, -105, -105, -105, -105, -105, -105, - -105, -105, -105, -105, -105, -105, -105, -105, -105, -105, - 28, -105, -105, -105, -105, 112, -105, -105, -105, -105, - -105, -105, -105, -105, -105, -105, -105, -105, -105, -8, - 187, -105, 218, 240, 237, 228, -105, 110, 109, 86, - 100, 93, -105, -105, -105, -105, -105, -105, -105, -105, - 185, -105, 195, -105, 199, -105, -105, 202, -105, 114, - -105, -105, 141, -105, 30, -105, 26, -105, 25, -105, - 212, -105, 186, 183, -105, -105, 210, -105, -105, -105, - -105, -105, -105, 189, -105, 82, 94, -105, -105, 102, - -105, 76, -105, 78, -105, 74, -105, -105, 75, -105, - -105, 85, -105, -105, 69, -105, 79, -105, 81, -105, - 42, -105, -105, -105, -105, -105, -105, 47, -105, 29, - -105, 63, -105, 164, 37, -105, -105, 36, -105, -105, - 130, -105, -105, -105, 60, -105, -105, -105, -105, 67, - -105, 48, 119, -105, 92, -105, -105, 38, -105, 40, - -105, -105, -105, -105, -105, -105, -105, 45, -105, -105, - -105, -105, -105, -105, 99, -105, -105, 55, -105, -105, - -105, -105, 59, -105, 64, -105, -105, -105, -105, -105, - -29, -105, 62, -105, -30, -105, -105, -105, -105, -16, - -105, -105, -26, -105, -105, -105, -105, -105, -105, -56, - -105, -105, 20, -105, 23, -105, 18, -105, -105, -105, - -105, 39, -105, 44, -105, 49, -105, 43, -105, -105, - -105, -105, -105, -105, 24, -105, -105, 72, -105, -105, - -105, -105, 51, -105, -105, 193, -105, -105, 54, -105, - -105, -105, -105, -105, -105, -105, -105, -105, -105, -105, - -105, -105, -105, -105, -105, -105, -105, -105, -1, -105, - -105, -105, -105, -105, -105, -105, -17, -105, -105, -105, - -105, -105, -105, 32, -105, -105, -105, -105, -105, -105, - -105, -22, -105, -105, -105, -105, -105, -105, -105, -2, - -105, -105, -105, -105, -11, -105, -105, 21, -105, -105, - -105, -105, -105, 12, -105, -105, -105, 14, 10, 8, - -105, -105, -105, -105, -105, 295, 284, -105, -105, -105, - -105, -105, -105, -105, 267, 2, 0, -105, 4, -105, - 168, 15, -105, -105, 7, -105, -105, 182, -105, -105, - -105, 16, -105, -105, -105, -105, 27, -105, 5, 68, - -105, 83, -105, -105, -105, -105, -105, -105, 262, -105, - -105, -105, -105, -105, 370, -105, -105, -105, 11, -105, - -105, -7, 95, -105, -105, -105, -14, -105, -105, -105, - -105, -105, -105, 77, -105, -105, -105, -105, -105, -105, - -105, -105, -105}; + -106, 12, -87, 18, 17, 212, -106, -106, -106, -106, + -106, -106, -106, -106, -106, -106, -106, -106, -106, -53, + -106, -106, -106, -106, -106, -106, -106, -106, -106, 162, + -106, -106, -106, -4, -106, -106, -11, 24, 75, 76, + -106, 83, 55, -106, -106, 157, 158, -106, -106, -106, + -106, -106, 150, -106, 172, 176, -106, 168, 167, -106, + -106, -106, -106, 173, 154, 115, -106, -106, -106, -106, + 147, -106, 121, 113, 112, 125, -106, 128, 143, 146, + 140, 139, 136, -106, 122, 138, 130, -106, -106, -106, + -106, -106, -106, -106, -106, -106, -106, -106, 149, -106, + 153, -106, 110, 82, 46, -106, -106, -106, -106, -106, + -106, -106, -106, -106, -106, -106, -106, -106, -106, -106, + -106, -106, -106, -106, -106, -106, -106, -106, -106, -106, + -106, -106, -106, -106, -106, -106, -106, -106, -106, -106, + 35, -106, -106, -106, -106, -106, 37, -106, -106, 45, + -106, -106, -106, -106, -106, -106, -106, -106, -106, -106, + -106, -106, -106, 92, -106, 88, 58, -106, -106, 51, + -106, 209, 72, 78, -106, -106, -106, -106, -106, -106, + -106, -106, 27, -106, -106, -106, 63, -106, -106, -106, + -106, -106, -106, -106, -106, -106, -106, -106, -106, -106, + -106, -106, -106, -106, -106, 50, -106, -106, 28, -106, + 29, -106, 47, -106, 33, -106, -106, 66, -106, 73, + -106, -106, -106, 81, 53, -106, -106, -106, -106, -106, + -13, -106, -106, -106, -106, -106, -106, -106, -106, -106, + -106, -106, -106, -106, -106, -106, -106, -106, -106, -106, + -106, 9, -106, -106, -106, -106, 111, -106, -106, -106, + -106, -106, -106, -106, -106, -106, -106, -106, -106, -106, + 3, 186, -106, 220, 228, 234, 204, -106, 90, 91, + 94, 97, 93, -106, -106, -106, -106, -106, -106, -106, + -106, 210, -106, 187, -106, 214, -106, -106, 208, -106, + 207, -106, -106, 155, -106, 8, -106, 4, -106, -1, + -106, 217, -106, 177, 185, -106, -106, 184, -106, -106, + -106, -106, -106, -106, 183, -106, 194, 105, -106, -106, + 99, -106, 71, -106, 74, -106, 65, -106, -106, 114, + -106, -106, -55, -106, -106, 64, -106, 44, -106, 30, + -106, 31, -106, -106, -106, -106, -106, -106, 57, -106, + 36, -106, 40, -106, 70, 59, -106, -106, 42, -106, + -106, 104, -106, -106, -106, 38, -106, -106, -106, -106, + 79, -106, 69, 108, -106, 84, -106, -106, 56, -106, + 68, -106, -106, -106, -106, -106, -106, -106, 52, -106, + -106, -106, -106, -106, -106, 109, -106, -106, 77, -106, + -106, -106, -106, 86, -106, 80, -106, -106, -106, -106, + -106, -59, -106, 43, -106, -63, -106, -106, -106, -106, + 98, -106, -106, 95, -106, -106, -106, -106, -106, 60, + -34, -106, -106, 32, -106, 41, -106, 39, -106, -106, + -106, -106, 49, -106, 61, -106, 62, -106, 48, -106, + -106, -106, -106, -106, -106, 23, -106, -106, 96, -106, + -106, -106, -106, 34, -106, -106, 133, -106, -106, 54, + -106, -106, -106, -106, -106, -106, -106, -106, -106, -106, + -106, -106, -106, -106, -106, 67, -106, -106, -106, -106, + -106, 22, -106, -106, -106, -106, -106, -106, -106, -22, + -106, -106, -106, -106, -106, -106, 2, -106, -106, -106, + -106, -106, -106, -106, -19, -106, -106, -106, -106, -106, + -106, -106, 100, -106, -106, -106, -106, -21, -106, -106, + -3, -106, -106, -106, -106, -106, 13, -106, -106, -106, + 11, 14, 10, -106, -106, -106, -106, -106, 279, 283, + -106, -106, -106, -106, -106, -106, 19, 273, 15, 16, + -106, 21, -106, 224, 6, -106, -106, 25, -106, -106, + 85, -106, -106, -106, 26, -106, -106, -106, -106, 20, + -106, 7, 87, -106, 107, -106, -106, -106, -106, -106, + -106, 317, -106, -106, -106, -106, -106, 277, -106, -106, + -106, 0, -106, -106, -2, 271, -106, -106, -106, 1, + -106, -106, -106, -106, -106, -106, 5, -106, -106, -106, + -106, -106, -106, -106, -106, -106}; const short QmlJSGrammar::action_info [] = { - 389, 255, 399, 401, 506, 255, 346, -107, 438, -126, - 534, 541, 350, 511, 444, 387, 331, -115, 329, 556, - -93, 338, 422, 346, 340, 250, 249, 343, 341, -115, - 422, 406, 428, 346, 187, 429, 188, 185, 422, 418, - 414, 412, 407, 181, -96, 255, -93, 414, 177, -97, - 147, 438, -118, 234, 145, 397, -120, 608, -123, 455, - 438, 442, 451, 69, 464, -126, 302, 537, 632, 536, - 99, 139, 97, 168, -118, 270, 299, 139, 162, 414, - 292, 294, -97, 270, -96, 310, 290, 548, -107, 608, - 551, 344, 97, 292, 162, 99, 310, 455, -120, 524, - 527, 451, 290, 316, -123, 323, 325, 312, 139, 521, - 446, 313, 304, 523, 455, 139, 451, 333, 438, 139, - 438, 139, 139, 556, 598, 254, 253, 441, 139, 425, - 475, 432, 139, 56, 0, 0, 0, 139, 139, 0, - 555, 442, 56, 0, 57, 164, 56, 60, 139, 165, - 170, 0, 139, 57, 62, 467, 175, 57, 61, 326, - 622, 621, 240, 239, 411, 410, 556, 335, 56, 171, - 140, 252, 599, 416, 426, 170, 526, 525, 476, 57, - 486, 139, 519, 69, 247, 246, 553, 552, 139, 457, - 348, 170, 628, 627, 171, 247, 246, 247, 246, 63, - 453, 139, 245, 244, 308, 64, 513, 0, 468, 466, - 171, 83, 172, 84, 83, 529, 84, 83, 0, 84, - 83, 0, 84, 83, 85, 84, 507, 85, 509, 62, - 85, 507, 139, 85, 436, 435, 85, 0, 83, 508, - 84, 517, 516, 83, 83, 84, 84, 62, 0, 0, - 83, 85, 84, 139, 533, 532, 85, 85, 507, 507, - 514, 512, 83, 85, 84, 83, 83, 84, 84, 530, - 528, 83, 509, 84, 63, 85, 170, 509, 85, 85, - 64, 101, 507, 508, 85, 540, 539, 543, 508, 625, - 624, 0, 63, 33, 0, 171, 0, 404, 64, 0, - 102, 0, 103, 33, 509, 509, 233, 232, 272, 273, - 33, 0, 544, 542, 33, 508, 508, 272, 273, 623, - 33, 0, 0, 618, 0, 33, 0, 0, 509, 0, - 46, 48, 47, 71, 72, 274, 275, 619, 617, 508, - 46, 48, 47, 33, 274, 275, 0, 46, 48, 47, - 170, 46, 48, 47, 33, 0, 0, 46, 48, 47, - 73, 74, 46, 48, 47, 170, 33, 616, -84, 171, - 33, 172, 0, 33, 0, 0, 170, 33, 0, 0, - 46, 48, 47, 33, 171, 0, 404, 33, 0, 0, - 0, 46, 48, 47, -84, 171, 0, 172, 0, 33, - 0, 0, 0, 46, 48, 47, -337, 46, 48, 47, - 46, 48, 47, 0, 46, 48, 47, 0, 0, 0, - 46, 48, 47, 0, 46, 48, 47, 0, 5, 4, - 3, 1, 2, 277, 278, 0, 46, 48, 47, 277, - 278, 0, 279, 277, 278, 280, 0, 281, 279, 71, - 72, 280, 279, 281, 33, 280, 0, 281, 76, 77, - 0, -337, 33, 0, 0, 33, 78, 79, 0, 0, - 80, 0, 81, 76, 77, 0, 73, 74, 0, 0, - 0, 78, 79, 0, 0, 80, 0, 81, 0, 0, - 0, 46, 48, 47, 238, 237, 0, 243, 242, 46, - 48, 47, 46, 48, 47, 76, 77, 0, 33, 0, - 0, 0, 0, 78, 79, 76, 77, 80, 33, 81, - 0, 0, 0, 78, 79, 0, 33, 80, 0, 81, - 277, 278, 0, 0, 33, 0, 0, 0, 0, 279, - 243, 242, 280, 0, 281, 46, 48, 47, 0, 0, - 243, 242, 0, 0, 0, 46, 48, 47, 238, 237, - 0, 0, 0, 46, 48, 47, 238, 237, 0, 0, - 0, 46, 48, 47, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 149, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 150, 0, 0, 0, 151, - 0, 0, 0, 0, 0, 0, 76, 77, 152, 0, - 153, 0, 0, 0, 78, 79, 0, 0, 80, 0, - 81, 154, 149, 155, 60, 0, 0, 0, 0, 0, - 0, 156, 150, 0, 157, 61, 151, 0, 0, 0, - 158, 0, 0, 0, 0, 152, 159, 153, 0, 0, - 306, 0, 0, 0, 0, 0, 0, 0, 154, 0, - 155, 60, 160, 0, 0, 0, 0, 0, 156, 29, - 30, 157, 61, 0, 0, 0, 0, 158, 0, 32, - 0, 0, 149, 159, 0, 0, 33, 0, 0, 0, - 34, 35, 150, 36, 0, 0, 151, 0, 0, 160, - 498, 0, 0, 0, 43, 152, 0, 153, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 154, 0, - 155, 60, 49, 46, 48, 47, 0, 50, 156, 0, - 0, 157, 61, 0, 0, 0, 0, 158, 42, 52, - 31, 0, 0, 159, 39, 0, 0, 0, 0, 0, - 29, 30, 0, 0, 0, 0, 0, 0, 0, 160, - 32, 0, 0, 0, 0, 0, 0, 33, 0, 0, - 0, 34, 35, 0, 36, 0, 0, 0, 29, 30, - 0, 498, 0, 0, 0, 43, 0, 0, 32, 0, - 0, 0, 0, 0, 0, 33, 0, 0, 0, 34, - 35, 0, 36, 49, 46, 48, 47, 0, 50, 40, - 0, 0, 0, 43, 0, 0, 0, 0, 0, 42, - 52, 31, 0, 0, 0, 39, 0, 0, 0, 0, - 0, 49, 46, 48, 47, 0, 50, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 42, 52, 31, - 0, 0, 0, 39, 0, 0, 0, 29, 30, 0, - 0, 0, 0, 0, 0, 29, 30, 32, 0, 0, - 0, 0, 0, 0, 33, 32, 0, 0, 34, 35, - 0, 36, 33, 0, 0, 0, 34, 35, 40, 36, - 0, 0, 43, 0, 0, 0, 498, 0, 0, 0, - 43, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 49, 46, 48, 47, 0, 50, 0, 0, 49, 46, - 48, 47, 0, 50, 0, 0, 42, 52, 31, 0, - 0, 0, 39, 0, 42, 52, 31, 0, 0, 0, - 39, 0, 0, 0, 29, 30, 0, 0, 0, 0, - 0, 0, 29, 30, 32, 0, 0, 0, 0, 0, - 0, 33, 32, 0, 0, 34, 35, 0, 36, 33, - 0, 0, 0, 34, 35, 40, 36, 0, 0, 43, - 0, 0, 0, 498, 0, 0, 0, 43, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 49, 46, 48, - 47, 0, 50, 0, 0, 49, 46, 48, 47, 0, - 50, 0, 0, 42, 52, 31, 0, 0, 0, 39, - 0, 42, 52, 31, 0, 0, 0, 39, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 497, - 0, 29, 30, 0, 0, 0, 0, 0, 0, 0, - 0, 213, 0, 0, 0, 0, 0, 0, 33, 0, - 0, 0, 34, 35, 0, 36, 0, 0, 0, 0, - 0, 0, 498, 0, 0, 0, 43, 0, 0, 0, + -97, -98, 452, 611, -116, 527, 456, -124, 415, -121, + 439, 551, -119, -108, 347, -94, 611, 388, 635, 540, + 351, 341, 344, 342, 390, 539, -127, 256, 398, 402, + 100, 98, 70, -97, 400, 163, -98, 465, 524, -116, + 559, 447, 530, -108, 439, -127, 509, 439, 559, -94, + 537, 544, -121, 256, 443, -119, -124, 514, 439, 347, + 445, 526, 423, 452, 423, 430, 456, 423, 70, 554, + 169, 415, 345, 311, 100, 163, 419, 140, 146, 408, + 271, 413, 347, 251, 295, 271, 256, 0, 186, 452, + 0, 311, 456, 140, 429, 317, 0, 0, 0, 324, + 407, 178, 291, 98, 305, 558, 0, 235, 476, 0, + 439, 415, 300, 442, 291, 0, 189, 171, 140, 426, + 140, 148, 339, 182, 433, 140, 140, 443, 140, 303, + 326, 559, 140, 0, 140, 57, 172, 250, 188, 140, + 601, 140, 330, 293, 165, 0, 58, 313, 166, 140, + 332, 314, 631, 630, 255, 254, 477, 241, 240, 57, + 246, 245, 412, 411, 427, 57, 141, 529, 528, 63, + 58, 61, 336, 171, 248, 247, 58, 516, 253, 0, + 417, 468, 62, 327, 309, 334, 458, 57, 602, 248, + 247, 487, 172, 454, 522, 556, 555, 176, 58, 248, + 247, 625, 624, 84, 84, 85, 85, 140, 84, 84, + 85, 85, 63, 84, 64, 85, 86, 86, 510, 510, + 65, 86, 86, 84, 171, 85, 86, 63, 84, 0, + 85, 517, 515, 140, 469, 467, 86, 84, 140, 85, + 512, 86, 84, 172, 85, 405, 84, 102, 85, 140, + 86, 511, 628, 627, 140, 86, 84, 64, 85, 86, + 437, 436, 171, 65, 512, 512, 103, 510, 104, 86, + 546, 510, 64, 140, 510, 511, 511, 84, 65, 85, + 532, 172, 626, 405, 34, 0, 234, 233, 0, 0, + 86, 520, 519, 0, 0, 547, 545, 84, 0, 85, + 621, 0, 543, 542, 34, 0, 349, 0, 0, 0, + 86, 72, 73, 512, 622, 620, 34, 512, 0, 34, + 512, 47, 49, 48, 511, 0, 536, 535, 511, 171, + 0, 511, 34, 0, 533, 531, 72, 73, 74, 75, + 34, 47, 49, 48, 619, 34, 171, -85, 172, 34, + 173, 0, 34, 47, 49, 48, 47, 49, 48, 34, + 0, 0, 34, 74, 75, 172, 34, 173, 0, 47, + 49, 48, 34, 0, 171, 34, 0, 47, 49, 48, + 0, 0, 47, 49, 48, 0, 47, 49, 48, 47, + 49, 48, -85, 172, 0, 173, 47, 49, 48, 47, + 49, 48, 0, 47, 49, 48, 278, 279, 0, 47, + 49, 48, 47, 49, 48, 280, 278, 279, 281, 0, + 282, 0, 0, 34, 0, 280, 34, 0, 281, 34, + 282, 273, 274, -339, 278, 279, -339, 34, 0, 0, + 0, 0, 0, 280, 0, 0, 281, 0, 282, 34, + 0, 0, 0, 0, 0, 244, 243, 0, 275, 276, + 47, 49, 48, 47, 49, 48, 47, 49, 48, 244, + 243, 77, 78, 34, 47, 49, 48, 0, 0, 79, + 80, 239, 238, 81, 0, 82, 47, 49, 48, 77, + 78, 34, 0, 0, 0, 0, 0, 79, 80, 0, + 0, 81, 0, 82, 0, 239, 238, 77, 78, 34, + 47, 49, 48, 278, 279, 79, 80, 0, 0, 81, + 0, 82, 280, 244, 243, 281, 0, 282, 47, 49, + 48, 6, 5, 4, 1, 3, 2, 0, 0, 150, + 0, 239, 238, 0, 0, 0, 47, 49, 48, 151, + 0, 0, 0, 152, 0, 0, 0, 150, 0, 0, + 0, 0, 153, 0, 154, 0, 0, 151, 0, 0, + 0, 152, 0, 0, 0, 155, 0, 156, 61, 0, + 153, 0, 154, 0, 0, 157, 0, 0, 158, 62, + 77, 78, 0, 155, 159, 156, 61, 0, 79, 80, + 160, 0, 81, 157, 82, 0, 158, 62, 0, 0, + 0, 0, 159, 0, 0, 0, 161, 0, 160, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 30, + 31, 0, 0, 0, 161, 0, 0, 0, 0, 33, + 0, 0, 0, 0, 0, 0, 34, 0, 0, 0, + 35, 36, 0, 37, 0, 0, 0, 0, 0, 0, + 501, 0, 0, 0, 44, 0, 0, 150, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 151, 0, 0, + 0, 152, 50, 47, 49, 48, 0, 51, 0, 0, + 153, 0, 154, 0, 0, 307, 0, 0, 43, 53, + 32, 0, 0, 155, 40, 156, 61, 0, 0, 0, + 0, 0, 0, 157, 0, 0, 158, 62, 0, 0, + 0, 0, 159, 0, 0, 0, 0, 0, 160, 0, + 0, 0, 0, 0, 0, 0, 30, 31, 0, 0, + 0, 0, 0, 0, 161, 0, 33, 0, 0, 0, + 0, 0, 0, 34, 0, 0, 0, 35, 36, 0, + 37, 0, 0, 0, 30, 31, 0, 41, 0, 0, + 0, 44, 0, 0, 33, 0, 0, 0, 0, 0, + 0, 34, 0, 0, 0, 35, 36, 0, 37, 50, + 47, 49, 48, 0, 51, 501, 0, 0, 0, 44, + 0, 0, 0, 0, 0, 43, 53, 32, 0, 0, + 0, 40, 0, 0, 0, 0, 0, 50, 47, 49, + 48, 0, 51, 0, 500, 0, 30, 31, 0, 0, + 0, 0, 0, 43, 53, 32, 214, 0, 0, 40, + 0, 0, 0, 34, 0, 0, 0, 35, 36, 0, + 37, 0, 30, 31, 0, 0, 0, 501, 0, 0, + 0, 44, 33, 0, 0, 0, 0, 0, 0, 34, + 0, 0, 0, 35, 36, 0, 37, 0, 0, 50, + 502, 504, 503, 41, 51, 0, 0, 44, 0, 225, + 0, 0, 0, 0, 0, 43, 53, 32, 209, 0, + 0, 40, 0, 0, 0, 50, 47, 49, 48, 0, + 51, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 43, 53, 32, 0, 0, 0, 40, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 49, 499, 501, 500, 0, 50, - 0, 0, 0, 0, 224, 0, 0, 0, 0, 0, - 42, 52, 31, 208, 0, 0, 39, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 497, 0, - 29, 30, 0, 0, 0, 0, 0, 0, 0, 0, - 213, 0, 0, 0, 0, 0, 0, 33, 0, 0, - 0, 34, 35, 0, 36, 0, 0, 0, 0, 0, - 0, 498, 0, 0, 0, 43, 0, 0, 0, 0, - 0, 0, 0, 602, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 49, 499, 501, 500, 0, 50, 0, - 0, 0, 0, 224, 0, 0, 0, 0, 0, 42, - 52, 31, 208, 0, 0, 39, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 497, 0, 29, - 30, 0, 0, 0, 0, 0, 0, 0, 0, 213, - 0, 0, 0, 0, 0, 0, 33, 0, 0, 0, - 34, 35, 0, 36, 0, 0, 0, 0, 0, 0, - 498, 0, 0, 0, 43, 0, 0, 0, 0, 0, - 0, 0, 605, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 49, 499, 501, 500, 0, 50, 0, 0, - 0, 0, 224, 0, 0, 0, 0, 0, 42, 52, - 31, 208, 0, 0, 39, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 28, 29, 30, 0, - 0, 0, 0, 0, 0, 0, 0, 32, 0, 0, - 0, 0, 0, 0, 33, 0, 0, 0, 34, 35, - 0, 36, 0, 0, 0, 37, 0, 38, 40, 41, - 0, 0, 43, 0, 0, 0, 44, 0, 45, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 49, 46, 48, 47, 0, 50, 0, 51, 0, 53, - 0, 54, 0, 0, 0, 0, 42, 52, 31, 0, - 0, 0, 39, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, -116, 0, 0, 0, 28, 29, - 30, 0, 0, 0, 0, 0, 0, 0, 0, 32, - 0, 0, 0, 0, 0, 0, 33, 0, 0, 0, - 34, 35, 0, 36, 0, 0, 0, 37, 0, 38, - 40, 41, 0, 0, 43, 0, 0, 0, 44, 0, - 45, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 49, 46, 48, 47, 0, 50, 0, 51, - 0, 53, 0, 54, 0, 0, 0, 0, 42, 52, - 31, 0, 0, 0, 39, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 28, 29, 30, 0, - 0, 0, 0, 0, 0, 0, 0, 32, 0, 0, - 0, 0, 0, 0, 33, 0, 0, 0, 34, 35, - 0, 36, 0, 0, 0, 37, 0, 38, 40, 41, - 0, 0, 43, 0, 0, 0, 44, 0, 45, 0, + 500, 0, 30, 31, 0, 0, 0, 0, 0, 0, + 0, 0, 214, 0, 0, 0, 0, 0, 0, 34, + 0, 0, 0, 35, 36, 0, 37, 0, 0, 0, + 0, 0, 0, 501, 0, 0, 0, 44, 0, 0, + 0, 0, 0, 0, 0, 608, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 50, 502, 504, 503, 0, + 51, 0, 0, 0, 0, 225, 0, 0, 0, 0, + 0, 43, 53, 32, 209, 0, 0, 40, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 49, 46, 48, 47, 0, 50, 0, 51, 0, 53, - 269, 54, 0, 0, 0, 0, 42, 52, 31, 0, - 0, 0, 39, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 473, 0, 0, 28, 29, 30, - 0, 0, 0, 0, 0, 0, 0, 0, 32, 0, - 0, 0, 0, 0, 0, 33, 0, 0, 0, 34, - 35, 0, 36, 0, 0, 0, 37, 0, 38, 40, - 41, 0, 0, 43, 0, 0, 0, 44, 0, 45, - 0, 0, 474, 0, 0, 0, 0, 0, 0, 0, - 0, 49, 46, 48, 47, 0, 50, 0, 51, 0, - 53, 0, 54, 0, 0, 0, 0, 42, 52, 31, - 0, 0, 0, 39, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 481, 0, 0, 28, 29, - 30, 0, 0, 0, 0, 0, 0, 0, 0, 32, - 0, 0, 0, 0, 0, 0, 33, 0, 0, 0, - 34, 35, 0, 36, 0, 0, 0, 37, 0, 38, - 40, 41, 0, 0, 43, 0, 0, 0, 44, 0, - 45, 0, 0, 484, 0, 0, 0, 0, 0, 0, - 0, 0, 49, 46, 48, 47, 0, 50, 0, 51, - 0, 53, 0, 54, 0, 0, 0, 0, 42, 52, - 31, 0, 0, 0, 39, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 481, 0, 0, 28, - 29, 30, 0, 0, 0, 0, 0, 0, 0, 0, - 32, 0, 0, 0, 0, 0, 0, 33, 0, 0, - 0, 34, 35, 0, 36, 0, 0, 0, 37, 0, - 38, 40, 41, 0, 0, 43, 0, 0, 0, 44, - 0, 45, 0, 0, 482, 0, 0, 0, 0, 0, - 0, 0, 0, 49, 46, 48, 47, 0, 50, 0, - 51, 0, 53, 0, 54, 0, 0, 0, 0, 42, - 52, 31, 0, 0, 0, 39, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 473, 0, 0, - 28, 29, 30, 0, 0, 0, 0, 0, 0, 0, - 0, 32, 0, 0, 0, 0, 0, 0, 33, 0, - 0, 0, 34, 35, 0, 36, 0, 0, 0, 37, - 0, 38, 40, 41, 0, 0, 43, 0, 0, 0, - 44, 0, 45, 0, 0, 479, 0, 0, 0, 0, - 0, 0, 0, 0, 49, 46, 48, 47, 0, 50, - 0, 51, 0, 53, 0, 54, 0, 0, 0, 0, - 42, 52, 31, 0, 0, 0, 39, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 28, 29, - 30, 0, 0, 0, 0, 0, 0, 0, 0, 32, - 0, 0, 0, 0, 0, 0, 33, 215, 0, 0, - 563, 564, 0, 36, 0, 0, 0, 37, 0, 38, - 40, 41, 0, 0, 43, 0, 0, 0, 44, 0, - 45, 0, 0, 0, 0, 0, 0, 0, 219, 0, - 0, 0, 49, 46, 48, 47, 0, 50, 0, 51, - 0, 53, 0, 54, 0, 0, 0, 0, 42, 52, - 31, 0, 0, 0, 39, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 107, 108, 109, 0, - 0, 111, 113, 114, 0, 0, 115, 0, 116, 0, - 0, 0, 118, 119, 120, 0, 0, 0, 0, 0, - 0, 33, 121, 122, 123, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 124, 0, 0, 0, 0, + 500, 0, 30, 31, 0, 0, 0, 0, 0, 0, + 0, 0, 214, 0, 0, 0, 0, 0, 0, 34, + 0, 0, 0, 35, 36, 0, 37, 0, 0, 0, + 0, 0, 0, 501, 0, 0, 0, 44, 0, 0, + 0, 0, 0, 0, 0, 605, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 50, 502, 504, 503, 0, + 51, 0, 0, 0, 0, 225, 0, 0, 0, 0, + 0, 43, 53, 32, 209, 0, 0, 40, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 127, 0, 0, 0, 0, 0, 0, 46, 48, - 47, 128, 129, 130, 0, 132, 133, 134, 135, 136, - 137, 0, 0, 125, 131, 117, 110, 112, 126, 0, + 29, 30, 31, 0, 0, 0, 0, 0, 0, 0, + 0, 33, 0, 0, 0, 0, 0, 0, 34, 0, + 0, 0, 35, 36, 0, 37, 0, 0, 0, 38, + 0, 39, 41, 42, 0, 0, 44, 0, 0, 0, + 45, 0, 46, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 50, 47, 49, 48, 0, 51, + 0, 52, 0, 54, 0, 55, 0, 0, 0, 0, + 43, 53, 32, 0, 0, 0, 40, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, -117, + 0, 0, 0, 29, 30, 31, 0, 0, 0, 0, + 0, 0, 0, 0, 33, 0, 0, 0, 0, 0, + 0, 34, 0, 0, 0, 35, 36, 0, 37, 0, + 0, 0, 38, 0, 39, 41, 42, 0, 0, 44, + 0, 0, 0, 45, 0, 46, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 50, 47, 49, + 48, 0, 51, 0, 52, 0, 54, 0, 55, 0, + 0, 0, 0, 43, 53, 32, 0, 0, 0, 40, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 107, 108, 109, 0, 0, 111, 113, 114, 0, - 0, 115, 0, 116, 0, 0, 0, 118, 119, 120, - 0, 0, 0, 0, 0, 0, 391, 121, 122, 123, + 0, 0, 29, 30, 31, 0, 0, 0, 0, 0, + 0, 0, 0, 33, 0, 0, 0, 0, 0, 0, + 34, 0, 0, 0, 35, 36, 0, 37, 0, 0, + 0, 38, 0, 39, 41, 42, 0, 0, 44, 0, + 0, 0, 45, 0, 46, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 50, 47, 49, 48, + 0, 51, 0, 52, 0, 54, 270, 55, 0, 0, + 0, 0, 43, 53, 32, 0, 0, 0, 40, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 124, 0, 0, 0, 392, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 127, 0, 0, 0, - 0, 0, 396, 393, 395, 0, 128, 129, 130, 0, - 132, 133, 134, 135, 136, 137, 0, 0, 125, 131, - 117, 110, 112, 126, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 107, 108, 109, 0, - 0, 111, 113, 114, 0, 0, 115, 0, 116, 0, - 0, 0, 118, 119, 120, 0, 0, 0, 0, 0, - 0, 391, 121, 122, 123, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 124, 0, 0, 0, 392, - 0, 0, 0, 0, 0, 0, 0, 394, 0, 0, - 0, 127, 0, 0, 0, 0, 0, 396, 393, 395, - 0, 128, 129, 130, 0, 132, 133, 134, 135, 136, - 137, 0, 0, 125, 131, 117, 110, 112, 126, 0, + 0, 29, 30, 31, 0, 0, 0, 0, 0, 0, + 0, 0, 33, 0, 0, 0, 0, 0, 0, 34, + 216, 0, 0, 566, 567, 0, 37, 0, 0, 0, + 38, 0, 39, 41, 42, 0, 0, 44, 0, 0, + 0, 45, 0, 46, 0, 0, 0, 0, 0, 0, + 0, 220, 0, 0, 0, 50, 47, 49, 48, 0, + 51, 0, 52, 0, 54, 0, 55, 0, 0, 0, + 0, 43, 53, 32, 0, 0, 0, 40, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 207, 0, 0, 0, 0, 209, 0, 28, 29, - 30, 211, 0, 0, 0, 0, 0, 0, 212, 32, - 0, 0, 0, 0, 0, 0, 214, 215, 0, 0, - 216, 35, 0, 36, 0, 0, 0, 37, 0, 38, - 40, 41, 0, 0, 43, 0, 0, 0, 44, 0, - 45, 0, 0, 0, 0, 0, 218, 0, 219, 0, - 0, 0, 49, 217, 220, 47, 221, 50, 222, 51, - 223, 53, 224, 54, 225, 226, 0, 0, 42, 52, - 31, 208, 210, 0, 39, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 207, 0, 0, 0, - 0, 209, 0, 28, 29, 30, 211, 0, 0, 0, - 0, 0, 0, 212, 213, 0, 0, 0, 0, 0, - 0, 214, 215, 0, 0, 216, 35, 0, 36, 0, - 0, 0, 37, 0, 38, 40, 41, 0, 0, 43, - 0, 0, 0, 44, 0, 45, 0, 0, 0, 0, - 0, 218, 0, 219, 0, 0, 0, 49, 217, 220, - 47, 221, 50, 222, 51, 223, 53, 224, 54, 225, - 226, 0, 0, 42, 52, 31, 208, 210, 0, 39, + 474, 0, 0, 29, 30, 31, 0, 0, 0, 0, + 0, 0, 0, 0, 33, 0, 0, 0, 0, 0, + 0, 34, 0, 0, 0, 35, 36, 0, 37, 0, + 0, 0, 38, 0, 39, 41, 42, 0, 0, 44, + 0, 0, 0, 45, 0, 46, 0, 0, 475, 0, + 0, 0, 0, 0, 0, 0, 0, 50, 47, 49, + 48, 0, 51, 0, 52, 0, 54, 0, 55, 0, + 0, 0, 0, 43, 53, 32, 0, 0, 0, 40, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 566, 108, 109, 0, 0, 568, 113, 570, 29, - 30, 571, 0, 116, 0, 0, 0, 118, 573, 574, - 0, 0, 0, 0, 0, 0, 575, 576, 122, 123, - 216, 35, 0, 36, 0, 0, 0, 37, 0, 38, - 577, 41, 0, 0, 579, 0, 0, 0, 44, 0, - 45, 0, 0, 0, 0, 0, 581, 0, 219, 0, - 0, 0, 583, 580, 582, 47, 584, 585, 586, 51, - 588, 589, 590, 591, 592, 593, 0, 0, 578, 587, - 572, 567, 569, 126, 39, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 359, 108, 109, 0, - 0, 361, 113, 363, 29, 30, 364, 0, 116, 0, - 0, 0, 118, 366, 367, 0, 0, 0, 0, 0, - 0, 368, 369, 122, 123, 216, 35, 0, 36, 0, - 0, 0, 37, 0, 38, 370, 41, 0, 0, 372, - 0, 0, 0, 44, 0, 45, 0, -262, 0, 0, - 0, 374, 0, 219, 0, 0, 0, 376, 373, 375, - 47, 377, 378, 379, 51, 381, 382, 383, 384, 385, - 386, 0, 0, 371, 380, 365, 360, 362, 126, 39, + 0, 0, 474, 0, 0, 29, 30, 31, 0, 0, + 0, 0, 0, 0, 0, 0, 33, 0, 0, 0, + 0, 0, 0, 34, 0, 0, 0, 35, 36, 0, + 37, 0, 0, 0, 38, 0, 39, 41, 42, 0, + 0, 44, 0, 0, 0, 45, 0, 46, 0, 0, + 480, 0, 0, 0, 0, 0, 0, 0, 0, 50, + 47, 49, 48, 0, 51, 0, 52, 0, 54, 0, + 55, 0, 0, 0, 0, 43, 53, 32, 0, 0, + 0, 40, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 482, 0, 0, 29, 30, 31, + 0, 0, 0, 0, 0, 0, 0, 0, 33, 0, + 0, 0, 0, 0, 0, 34, 0, 0, 0, 35, + 36, 0, 37, 0, 0, 0, 38, 0, 39, 41, + 42, 0, 0, 44, 0, 0, 0, 45, 0, 46, + 0, 0, 485, 0, 0, 0, 0, 0, 0, 0, + 0, 50, 47, 49, 48, 0, 51, 0, 52, 0, + 54, 0, 55, 0, 0, 0, 0, 43, 53, 32, + 0, 0, 0, 40, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 482, 0, 0, 29, + 30, 31, 0, 0, 0, 0, 0, 0, 0, 0, + 33, 0, 0, 0, 0, 0, 0, 34, 0, 0, + 0, 35, 36, 0, 37, 0, 0, 0, 38, 0, + 39, 41, 42, 0, 0, 44, 0, 0, 0, 45, + 0, 46, 0, 0, 483, 0, 0, 0, 0, 0, + 0, 0, 0, 50, 47, 49, 48, 0, 51, 0, + 52, 0, 54, 0, 55, 0, 0, 0, 0, 43, + 53, 32, 0, 0, 0, 40, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 108, 109, + 110, 0, 0, 112, 114, 115, 0, 0, 116, 0, + 117, 0, 0, 0, 119, 120, 121, 0, 0, 0, + 0, 0, 0, 34, 122, 123, 124, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 125, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, - - 620, 531, 522, 629, 184, 494, 318, 510, 459, 15, - 470, 518, 138, 535, 236, 180, 485, 248, 241, 300, - 601, 180, 550, 615, 538, 437, 148, 309, 554, 307, - 434, 251, 305, 248, 549, 515, 547, 445, 447, 248, - 448, 443, 452, 236, 351, 458, 454, 241, 236, 400, - 180, 141, 456, 161, 433, 174, 146, 408, 465, 205, - 186, 413, 427, 300, 430, 431, 423, 415, 437, 169, - 434, 345, 388, 437, 434, 390, 336, 241, 332, 398, - 337, 334, 347, 349, 167, 483, 459, 205, 480, 184, - 144, 626, 205, 205, 493, 235, 318, 300, 0, 0, - 0, 58, 0, 178, 58, 300, 0, 496, 58, 0, - 630, 58, 0, 449, 597, 0, 58, 300, 163, 0, - 88, 0, 0, 58, 166, 487, 58, 58, 450, 58, - 58, 87, 488, 144, 284, 58, 58, 450, 405, 58, - 144, 286, 402, 58, 300, 176, 58, 58, 285, 100, - 86, 58, 58, 58, 68, 264, 469, 283, 282, 98, - 268, 328, 58, 402, 449, 0, 58, 58, 327, 330, - 403, 90, 82, 339, 58, 58, 58, 59, 449, 58, - 89, 301, 300, 58, 342, 492, 58, 70, 66, 58, - 58, 403, 67, 58, 402, 75, 58, 58, 65, 96, - 58, 0, 58, 94, 450, 58, 95, 58, 303, 178, - 93, 58, 58, 178, 491, 58, 58, 490, 58, 58, - 489, 92, 403, 478, 91, 0, 296, 477, 58, 58, - 58, 268, 296, 268, 268, 268, 496, 268, 58, 271, - 104, 291, 296, 268, 0, 296, 314, 268, 315, 293, - 268, 495, 505, 296, 324, 58, 0, 0, 268, 0, - 268, 58, 106, 173, 295, 0, 268, 298, 276, 0, - 311, 58, 0, 0, 496, 317, 268, 600, 289, 594, - 58, 597, 596, 58, 104, 268, 597, 288, 268, 603, - 287, 0, 0, 0, 0, 0, 496, 0, 0, 0, - 0, 470, 0, 0, 0, 0, 106, 562, 0, 0, - 0, 495, 505, 0, 565, 558, 559, 560, 561, 0, + 0, 0, 0, 128, 0, 0, 0, 0, 0, 0, + 47, 49, 48, 129, 130, 131, 0, 133, 134, 135, + 136, 137, 138, 0, 0, 126, 132, 118, 111, 113, + 127, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 108, 109, 110, 0, 0, 112, + 114, 115, 0, 0, 116, 0, 117, 0, 0, 0, + 119, 120, 121, 0, 0, 0, 0, 0, 0, 392, + 122, 123, 124, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 125, 0, 0, 0, 393, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 128, + 0, 0, 0, 0, 0, 397, 394, 396, 0, 129, + 130, 131, 0, 133, 134, 135, 136, 137, 138, 0, + 0, 126, 132, 118, 111, 113, 127, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 108, 109, 110, 0, 0, 112, 114, 115, 0, 0, + 116, 0, 117, 0, 0, 0, 119, 120, 121, 0, + 0, 0, 0, 0, 0, 392, 122, 123, 124, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 125, + 0, 0, 0, 393, 0, 0, 0, 0, 0, 0, + 0, 395, 0, 0, 0, 128, 0, 0, 0, 0, + 0, 397, 394, 396, 0, 129, 130, 131, 0, 133, + 134, 135, 136, 137, 138, 0, 0, 126, 132, 118, + 111, 113, 127, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 208, 0, 0, 0, + 0, 210, 0, 29, 30, 31, 212, 0, 0, 0, + 0, 0, 0, 213, 33, 0, 0, 0, 0, 0, + 0, 215, 216, 0, 0, 217, 36, 0, 37, 0, + 0, 0, 38, 0, 39, 41, 42, 0, 0, 44, + 0, 0, 0, 45, 0, 46, 0, 0, 0, 0, + 0, 219, 0, 220, 0, 0, 0, 50, 218, 221, + 48, 222, 51, 223, 52, 224, 54, 225, 55, 226, + 227, 0, 0, 43, 53, 32, 209, 211, 0, 40, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 208, 0, 0, 0, 0, 210, 0, 29, + 30, 31, 212, 0, 0, 0, 0, 0, 0, 213, + 214, 0, 0, 0, 0, 0, 0, 215, 216, 0, + 0, 217, 36, 0, 37, 0, 0, 0, 38, 0, + 39, 41, 42, 0, 0, 44, 0, 0, 0, 45, + 0, 46, 0, 0, 0, 0, 0, 219, 0, 220, + 0, 0, 0, 50, 218, 221, 48, 222, 51, 223, + 52, 224, 54, 225, 55, 226, 227, 0, 0, 43, + 53, 32, 209, 211, 0, 40, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 569, 109, + 110, 0, 0, 571, 114, 573, 30, 31, 574, 0, + 117, 0, 0, 0, 119, 576, 577, 0, 0, 0, + 0, 0, 0, 578, 579, 123, 124, 217, 36, 0, + 37, 0, 0, 0, 38, 0, 39, 580, 42, 0, + 0, 582, 0, 0, 0, 45, 0, 46, 0, 0, + 0, 0, 0, 584, 0, 220, 0, 0, 0, 586, + 583, 585, 48, 587, 588, 589, 52, 591, 592, 593, + 594, 595, 596, 0, 0, 581, 590, 575, 570, 572, + 127, 40, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 360, 109, 110, 0, 0, 362, + 114, 364, 30, 31, 365, 0, 117, 0, 0, 0, + 119, 367, 368, 0, 0, 0, 0, 0, 0, 369, + 370, 123, 124, 217, 36, 0, 37, 0, 0, 0, + 38, 0, 39, 371, 42, 0, 0, 373, 0, 0, + 0, 45, 0, 46, 0, -263, 0, 0, 0, 375, + 0, 220, 0, 0, 0, 377, 374, 376, 48, 378, + 379, 380, 52, 382, 383, 384, 385, 386, 387, 0, + 0, 372, 381, 366, 361, 363, 127, 40, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + + 541, 310, 460, 513, 538, 518, 525, 308, 249, 632, + 306, 181, 252, 618, 149, 16, 623, 495, 319, 497, + 629, 357, 496, 435, 471, 553, 557, 486, 438, 301, + 428, 237, 350, 352, 604, 521, 242, 424, 550, 552, + 181, 301, 185, 237, 242, 343, 432, 348, 338, 249, + 459, 237, 453, 449, 236, 242, 446, 181, 466, 401, + 448, 249, 357, 455, 444, 457, 346, 337, 357, 484, + 142, 236, 147, 333, 438, 175, 301, 335, 187, 409, + 162, 145, 435, 416, 435, 139, 170, 399, 414, 481, + 438, 389, 0, 168, 0, 0, 403, 357, 403, 59, + 357, 490, 301, 534, 391, 0, 0, 0, 301, 0, + 0, 460, 0, 145, 59, 0, 179, 403, 177, 59, + 59, 488, 489, 0, 404, 105, 404, 0, 59, 185, + 451, 59, 59, 450, 59, 59, 59, 59, 59, 283, + 284, 59, 287, 285, 145, 404, 286, 107, 167, 406, + 164, 59, 59, 451, 450, 265, 59, 59, 301, 59, + 269, 68, 96, 95, 479, 59, 59, 331, 478, 59, + 87, 76, 59, 329, 59, 97, 434, 83, 89, 431, + 59, 470, 59, 59, 59, 94, 88, 59, 93, 92, + 59, 59, 90, 59, 59, 91, 493, 59, 59, 71, + 67, 59, 59, 491, 492, 99, 59, 101, 179, 319, + 301, 59, 59, 340, 69, 60, 59, 59, 450, 66, + 59, 59, 451, 304, 105, 499, 269, 297, 297, 297, + 59, 59, 269, 269, 269, 269, 269, 0, 315, 272, + 498, 508, 294, 0, 0, 0, 107, 174, 59, 325, + 318, 316, 297, 269, 59, 290, 0, 269, 297, 269, + 0, 59, 0, 269, 59, 0, 269, 292, 59, 269, + 179, 277, 59, 0, 299, 302, 312, 269, 59, 288, + 296, 328, 609, 269, 499, 289, 597, 633, 606, 599, + 499, 600, 565, 600, 0, 0, 499, 0, 0, 568, + 561, 562, 563, 564, 0, 498, 508, 0, 471, 0, + 0, 498, 508, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 499, 0, 0, 603, 0, 0, 0, 600, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 606, 0, 0, 0, 0, - 0, 0, 496, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 495, 505, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, @@ -659,166 +636,175 @@ const short QmlJSGrammar::action_info [] = { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0}; + 0, 0, 0}; const short QmlJSGrammar::action_check [] = { - 8, 36, 55, 55, 66, 36, 36, 7, 33, 7, - 66, 29, 16, 29, 36, 7, 60, 7, 61, 33, - 7, 36, 5, 36, 60, 36, 77, 55, 33, 7, - 5, 60, 55, 36, 60, 7, 33, 8, 5, 33, - 36, 7, 7, 36, 7, 36, 7, 36, 60, 7, - 60, 33, 7, 55, 8, 7, 7, 90, 7, 36, - 33, 20, 36, 1, 17, 7, 61, 7, 0, 29, - 79, 8, 48, 7, 7, 1, 61, 8, 2, 36, - 79, 8, 7, 1, 7, 2, 48, 8, 7, 90, - 60, 7, 48, 79, 2, 79, 2, 36, 7, 29, - 29, 36, 48, 7, 7, 17, 8, 50, 8, 37, - 60, 54, 60, 24, 36, 8, 36, 31, 33, 8, - 33, 8, 8, 33, 8, 61, 62, 6, 8, 10, - 8, 7, 8, 40, -1, -1, -1, 8, 8, -1, - 7, 20, 40, -1, 51, 50, 40, 42, 8, 54, - 15, -1, 8, 51, 12, 8, 56, 51, 53, 61, - 61, 62, 61, 62, 61, 62, 33, 60, 40, 34, - 56, 60, 56, 60, 55, 15, 61, 62, 56, 51, - 60, 8, 29, 1, 61, 62, 61, 62, 8, 60, - 60, 15, 61, 62, 34, 61, 62, 61, 62, 57, - 60, 8, 61, 62, 60, 63, 7, -1, 61, 62, - 34, 25, 36, 27, 25, 7, 27, 25, -1, 27, - 25, -1, 27, 25, 38, 27, 29, 38, 75, 12, - 38, 29, 8, 38, 61, 62, 38, -1, 25, 86, - 27, 61, 62, 25, 25, 27, 27, 12, -1, -1, - 25, 38, 27, 8, 61, 62, 38, 38, 29, 29, - 61, 62, 25, 38, 27, 25, 25, 27, 27, 61, - 62, 25, 75, 27, 57, 38, 15, 75, 38, 38, - 63, 15, 29, 86, 38, 61, 62, 36, 86, 61, - 62, -1, 57, 29, -1, 34, -1, 36, 63, -1, - 34, -1, 36, 29, 75, 75, 61, 62, 18, 19, - 29, -1, 61, 62, 29, 86, 86, 18, 19, 91, - 29, -1, -1, 47, -1, 29, -1, -1, 75, -1, - 66, 67, 68, 18, 19, 45, 46, 61, 62, 86, - 66, 67, 68, 29, 45, 46, -1, 66, 67, 68, - 15, 66, 67, 68, 29, -1, -1, 66, 67, 68, - 45, 46, 66, 67, 68, 15, 29, 91, 33, 34, - 29, 36, -1, 29, -1, -1, 15, 29, -1, -1, - 66, 67, 68, 29, 34, -1, 36, 29, -1, -1, - -1, 66, 67, 68, 33, 34, -1, 36, -1, 29, - -1, -1, -1, 66, 67, 68, 36, 66, 67, 68, - 66, 67, 68, -1, 66, 67, 68, -1, -1, -1, - 66, 67, 68, -1, 66, 67, 68, -1, 92, 93, - 94, 95, 96, 23, 24, -1, 66, 67, 68, 23, - 24, -1, 32, 23, 24, 35, -1, 37, 32, 18, - 19, 35, 32, 37, 29, 35, -1, 37, 23, 24, - -1, 36, 29, -1, -1, 29, 31, 32, -1, -1, - 35, -1, 37, 23, 24, -1, 45, 46, -1, -1, - -1, 31, 32, -1, -1, 35, -1, 37, -1, -1, - -1, 66, 67, 68, 61, 62, -1, 61, 62, 66, - 67, 68, 66, 67, 68, 23, 24, -1, 29, -1, - -1, -1, -1, 31, 32, 23, 24, 35, 29, 37, - -1, -1, -1, 31, 32, -1, 29, 35, -1, 37, - 23, 24, -1, -1, 29, -1, -1, -1, -1, 32, - 61, 62, 35, -1, 37, 66, 67, 68, -1, -1, - 61, 62, -1, -1, -1, 66, 67, 68, 61, 62, - -1, -1, -1, 66, 67, 68, 61, 62, -1, -1, - -1, 66, 67, 68, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, 3, -1, -1, -1, -1, - -1, -1, -1, -1, -1, 13, -1, -1, -1, 17, - -1, -1, -1, -1, -1, -1, 23, 24, 26, -1, - 28, -1, -1, -1, 31, 32, -1, -1, 35, -1, - 37, 39, 3, 41, 42, -1, -1, -1, -1, -1, - -1, 49, 13, -1, 52, 53, 17, -1, -1, -1, - 58, -1, -1, -1, -1, 26, 64, 28, -1, -1, - 31, -1, -1, -1, -1, -1, -1, -1, 39, -1, - 41, 42, 80, -1, -1, -1, -1, -1, 49, 12, - 13, 52, 53, -1, -1, -1, -1, 58, -1, 22, - -1, -1, 3, 64, -1, -1, 29, -1, -1, -1, - 33, 34, 13, 36, -1, -1, 17, -1, -1, 80, - 43, -1, -1, -1, 47, 26, -1, 28, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, 39, -1, - 41, 42, 65, 66, 67, 68, -1, 70, 49, -1, - -1, 52, 53, -1, -1, -1, -1, 58, 81, 82, - 83, -1, -1, 64, 87, -1, -1, -1, -1, -1, - 12, 13, -1, -1, -1, -1, -1, -1, -1, 80, - 22, -1, -1, -1, -1, -1, -1, 29, -1, -1, - -1, 33, 34, -1, 36, -1, -1, -1, 12, 13, - -1, 43, -1, -1, -1, 47, -1, -1, 22, -1, - -1, -1, -1, -1, -1, 29, -1, -1, -1, 33, - 34, -1, 36, 65, 66, 67, 68, -1, 70, 43, - -1, -1, -1, 47, -1, -1, -1, -1, -1, 81, - 82, 83, -1, -1, -1, 87, -1, -1, -1, -1, - -1, 65, 66, 67, 68, -1, 70, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, 81, 82, 83, - -1, -1, -1, 87, -1, -1, -1, 12, 13, -1, - -1, -1, -1, -1, -1, 12, 13, 22, -1, -1, - -1, -1, -1, -1, 29, 22, -1, -1, 33, 34, - -1, 36, 29, -1, -1, -1, 33, 34, 43, 36, - -1, -1, 47, -1, -1, -1, 43, -1, -1, -1, - 47, -1, -1, -1, -1, -1, -1, -1, -1, -1, - 65, 66, 67, 68, -1, 70, -1, -1, 65, 66, - 67, 68, -1, 70, -1, -1, 81, 82, 83, -1, - -1, -1, 87, -1, 81, 82, 83, -1, -1, -1, - 87, -1, -1, -1, 12, 13, -1, -1, -1, -1, - -1, -1, 12, 13, 22, -1, -1, -1, -1, -1, - -1, 29, 22, -1, -1, 33, 34, -1, 36, 29, - -1, -1, -1, 33, 34, 43, 36, -1, -1, 47, - -1, -1, -1, 43, -1, -1, -1, 47, -1, -1, - -1, -1, -1, -1, -1, -1, -1, 65, 66, 67, - 68, -1, 70, -1, -1, 65, 66, 67, 68, -1, - 70, -1, -1, 81, 82, 83, -1, -1, -1, 87, + 7, 7, 36, 90, 7, 29, 36, 7, 36, 7, + 33, 8, 7, 7, 36, 7, 90, 7, 0, 7, + 16, 60, 55, 33, 8, 29, 7, 36, 7, 55, + 79, 48, 1, 7, 55, 2, 7, 17, 37, 7, + 33, 60, 29, 7, 33, 7, 66, 33, 33, 7, + 66, 29, 7, 36, 20, 7, 7, 29, 33, 36, + 36, 24, 5, 36, 5, 7, 36, 5, 1, 60, + 7, 36, 7, 2, 79, 2, 33, 8, 8, 7, + 1, 7, 36, 36, 8, 1, 36, -1, 8, 36, + -1, 2, 36, 8, 55, 7, -1, -1, -1, 17, + 60, 60, 48, 48, 60, 7, -1, 55, 8, -1, + 33, 36, 61, 6, 48, -1, 33, 15, 8, 10, + 8, 60, 36, 36, 7, 8, 8, 20, 8, 61, + 8, 33, 8, -1, 8, 40, 34, 77, 60, 8, + 8, 8, 61, 79, 50, -1, 51, 50, 54, 8, + 60, 54, 61, 62, 61, 62, 56, 61, 62, 40, + 61, 62, 61, 62, 55, 40, 56, 61, 62, 12, + 51, 42, 60, 15, 61, 62, 51, 7, 60, -1, + 60, 8, 53, 61, 60, 31, 60, 40, 56, 61, + 62, 60, 34, 60, 29, 61, 62, 56, 51, 61, + 62, 61, 62, 25, 25, 27, 27, 8, 25, 25, + 27, 27, 12, 25, 57, 27, 38, 38, 29, 29, + 63, 38, 38, 25, 15, 27, 38, 12, 25, -1, + 27, 61, 62, 8, 61, 62, 38, 25, 8, 27, + 75, 38, 25, 34, 27, 36, 25, 15, 27, 8, + 38, 86, 61, 62, 8, 38, 25, 57, 27, 38, + 61, 62, 15, 63, 75, 75, 34, 29, 36, 38, + 36, 29, 57, 8, 29, 86, 86, 25, 63, 27, + 7, 34, 91, 36, 29, -1, 61, 62, -1, -1, + 38, 61, 62, -1, -1, 61, 62, 25, -1, 27, + 47, -1, 61, 62, 29, -1, 60, -1, -1, -1, + 38, 18, 19, 75, 61, 62, 29, 75, -1, 29, + 75, 66, 67, 68, 86, -1, 61, 62, 86, 15, + -1, 86, 29, -1, 61, 62, 18, 19, 45, 46, + 29, 66, 67, 68, 91, 29, 15, 33, 34, 29, + 36, -1, 29, 66, 67, 68, 66, 67, 68, 29, + -1, -1, 29, 45, 46, 34, 29, 36, -1, 66, + 67, 68, 29, -1, 15, 29, -1, 66, 67, 68, + -1, -1, 66, 67, 68, -1, 66, 67, 68, 66, + 67, 68, 33, 34, -1, 36, 66, 67, 68, 66, + 67, 68, -1, 66, 67, 68, 23, 24, -1, 66, + 67, 68, 66, 67, 68, 32, 23, 24, 35, -1, + 37, -1, -1, 29, -1, 32, 29, -1, 35, 29, + 37, 18, 19, 36, 23, 24, 36, 29, -1, -1, + -1, -1, -1, 32, -1, -1, 35, -1, 37, 29, + -1, -1, -1, -1, -1, 61, 62, -1, 45, 46, + 66, 67, 68, 66, 67, 68, 66, 67, 68, 61, + 62, 23, 24, 29, 66, 67, 68, -1, -1, 31, + 32, 61, 62, 35, -1, 37, 66, 67, 68, 23, + 24, 29, -1, -1, -1, -1, -1, 31, 32, -1, + -1, 35, -1, 37, -1, 61, 62, 23, 24, 29, + 66, 67, 68, 23, 24, 31, 32, -1, -1, 35, + -1, 37, 32, 61, 62, 35, -1, 37, 66, 67, + 68, 92, 93, 94, 95, 96, 97, -1, -1, 3, + -1, 61, 62, -1, -1, -1, 66, 67, 68, 13, + -1, -1, -1, 17, -1, -1, -1, 3, -1, -1, + -1, -1, 26, -1, 28, -1, -1, 13, -1, -1, + -1, 17, -1, -1, -1, 39, -1, 41, 42, -1, + 26, -1, 28, -1, -1, 49, -1, -1, 52, 53, + 23, 24, -1, 39, 58, 41, 42, -1, 31, 32, + 64, -1, 35, 49, 37, -1, 52, 53, -1, -1, + -1, -1, 58, -1, -1, -1, 80, -1, 64, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, 12, + 13, -1, -1, -1, 80, -1, -1, -1, -1, 22, + -1, -1, -1, -1, -1, -1, 29, -1, -1, -1, + 33, 34, -1, 36, -1, -1, -1, -1, -1, -1, + 43, -1, -1, -1, 47, -1, -1, 3, -1, -1, + -1, -1, -1, -1, -1, -1, -1, 13, -1, -1, + -1, 17, 65, 66, 67, 68, -1, 70, -1, -1, + 26, -1, 28, -1, -1, 31, -1, -1, 81, 82, + 83, -1, -1, 39, 87, 41, 42, -1, -1, -1, + -1, -1, -1, 49, -1, -1, 52, 53, -1, -1, + -1, -1, 58, -1, -1, -1, -1, -1, 64, -1, + -1, -1, -1, -1, -1, -1, 12, 13, -1, -1, + -1, -1, -1, -1, 80, -1, 22, -1, -1, -1, + -1, -1, -1, 29, -1, -1, -1, 33, 34, -1, + 36, -1, -1, -1, 12, 13, -1, 43, -1, -1, + -1, 47, -1, -1, 22, -1, -1, -1, -1, -1, + -1, 29, -1, -1, -1, 33, 34, -1, 36, 65, + 66, 67, 68, -1, 70, 43, -1, -1, -1, 47, + -1, -1, -1, -1, -1, 81, 82, 83, -1, -1, + -1, 87, -1, -1, -1, -1, -1, 65, 66, 67, + 68, -1, 70, -1, 10, -1, 12, 13, -1, -1, + -1, -1, -1, 81, 82, 83, 22, -1, -1, 87, + -1, -1, -1, 29, -1, -1, -1, 33, 34, -1, + 36, -1, 12, 13, -1, -1, -1, 43, -1, -1, + -1, 47, 22, -1, -1, -1, -1, -1, -1, 29, + -1, -1, -1, 33, 34, -1, 36, -1, -1, 65, + 66, 67, 68, 43, 70, -1, -1, 47, -1, 75, + -1, -1, -1, -1, -1, 81, 82, 83, 84, -1, + -1, 87, -1, -1, -1, 65, 66, 67, 68, -1, + 70, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 81, 82, 83, -1, -1, -1, 87, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, -1, 10, - -1, 12, 13, -1, -1, -1, -1, -1, -1, -1, - -1, 22, -1, -1, -1, -1, -1, -1, 29, -1, - -1, -1, 33, 34, -1, 36, -1, -1, -1, -1, - -1, -1, 43, -1, -1, -1, 47, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + 10, -1, 12, 13, -1, -1, -1, -1, -1, -1, + -1, -1, 22, -1, -1, -1, -1, -1, -1, 29, + -1, -1, -1, 33, 34, -1, 36, -1, -1, -1, + -1, -1, -1, 43, -1, -1, -1, 47, -1, -1, + -1, -1, -1, -1, -1, 55, -1, -1, -1, -1, + -1, -1, -1, -1, -1, 65, 66, 67, 68, -1, + 70, -1, -1, -1, -1, 75, -1, -1, -1, -1, + -1, 81, 82, 83, 84, -1, -1, 87, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + 10, -1, 12, 13, -1, -1, -1, -1, -1, -1, + -1, -1, 22, -1, -1, -1, -1, -1, -1, 29, + -1, -1, -1, 33, 34, -1, 36, -1, -1, -1, + -1, -1, -1, 43, -1, -1, -1, 47, -1, -1, + -1, -1, -1, -1, -1, 55, -1, -1, -1, -1, + -1, -1, -1, -1, -1, 65, 66, 67, 68, -1, + 70, -1, -1, -1, -1, 75, -1, -1, -1, -1, + -1, 81, 82, 83, 84, -1, -1, 87, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + 11, 12, 13, -1, -1, -1, -1, -1, -1, -1, + -1, 22, -1, -1, -1, -1, -1, -1, 29, -1, + -1, -1, 33, 34, -1, 36, -1, -1, -1, 40, + -1, 42, 43, 44, -1, -1, 47, -1, -1, -1, + 51, -1, 53, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 65, 66, 67, 68, -1, 70, - -1, -1, -1, -1, 75, -1, -1, -1, -1, -1, - 81, 82, 83, 84, -1, -1, 87, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, 10, -1, - 12, 13, -1, -1, -1, -1, -1, -1, -1, -1, - 22, -1, -1, -1, -1, -1, -1, 29, -1, -1, - -1, 33, 34, -1, 36, -1, -1, -1, -1, -1, - -1, 43, -1, -1, -1, 47, -1, -1, -1, -1, - -1, -1, -1, 55, -1, -1, -1, -1, -1, -1, - -1, -1, -1, 65, 66, 67, 68, -1, 70, -1, - -1, -1, -1, 75, -1, -1, -1, -1, -1, 81, - 82, 83, 84, -1, -1, 87, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, 10, -1, 12, - 13, -1, -1, -1, -1, -1, -1, -1, -1, 22, - -1, -1, -1, -1, -1, -1, 29, -1, -1, -1, - 33, 34, -1, 36, -1, -1, -1, -1, -1, -1, - 43, -1, -1, -1, 47, -1, -1, -1, -1, -1, - -1, -1, 55, -1, -1, -1, -1, -1, -1, -1, - -1, -1, 65, 66, 67, 68, -1, 70, -1, -1, - -1, -1, 75, -1, -1, -1, -1, -1, 81, 82, - 83, 84, -1, -1, 87, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, 11, 12, 13, -1, - -1, -1, -1, -1, -1, -1, -1, 22, -1, -1, - -1, -1, -1, -1, 29, -1, -1, -1, 33, 34, - -1, 36, -1, -1, -1, 40, -1, 42, 43, 44, - -1, -1, 47, -1, -1, -1, 51, -1, 53, -1, + -1, 72, -1, 74, -1, 76, -1, -1, -1, -1, + 81, 82, 83, -1, -1, -1, 87, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, 7, + -1, -1, -1, 11, 12, 13, -1, -1, -1, -1, + -1, -1, -1, -1, 22, -1, -1, -1, -1, -1, + -1, 29, -1, -1, -1, 33, 34, -1, 36, -1, + -1, -1, 40, -1, 42, 43, 44, -1, -1, 47, + -1, -1, -1, 51, -1, 53, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, 65, 66, 67, + 68, -1, 70, -1, 72, -1, 74, -1, 76, -1, + -1, -1, -1, 81, 82, 83, -1, -1, -1, 87, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - 65, 66, 67, 68, -1, 70, -1, 72, -1, 74, - -1, 76, -1, -1, -1, -1, 81, 82, 83, -1, - -1, -1, 87, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, 7, -1, -1, -1, 11, 12, - 13, -1, -1, -1, -1, -1, -1, -1, -1, 22, - -1, -1, -1, -1, -1, -1, 29, -1, -1, -1, - 33, 34, -1, 36, -1, -1, -1, 40, -1, 42, - 43, 44, -1, -1, 47, -1, -1, -1, 51, -1, - 53, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, 65, 66, 67, 68, -1, 70, -1, 72, - -1, 74, -1, 76, -1, -1, -1, -1, 81, 82, - 83, -1, -1, -1, 87, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, 11, 12, 13, -1, - -1, -1, -1, -1, -1, -1, -1, 22, -1, -1, - -1, -1, -1, -1, 29, -1, -1, -1, 33, 34, - -1, 36, -1, -1, -1, 40, -1, 42, 43, 44, - -1, -1, 47, -1, -1, -1, 51, -1, 53, -1, + -1, -1, 11, 12, 13, -1, -1, -1, -1, -1, + -1, -1, -1, 22, -1, -1, -1, -1, -1, -1, + 29, -1, -1, -1, 33, 34, -1, 36, -1, -1, + -1, 40, -1, 42, 43, 44, -1, -1, 47, -1, + -1, -1, 51, -1, 53, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, 65, 66, 67, 68, + -1, 70, -1, 72, -1, 74, 75, 76, -1, -1, + -1, -1, 81, 82, 83, -1, -1, -1, 87, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, 11, 12, 13, -1, -1, -1, -1, -1, -1, + -1, -1, 22, -1, -1, -1, -1, -1, -1, 29, + 30, -1, -1, 33, 34, -1, 36, -1, -1, -1, + 40, -1, 42, 43, 44, -1, -1, 47, -1, -1, + -1, 51, -1, 53, -1, -1, -1, -1, -1, -1, + -1, 61, -1, -1, -1, 65, 66, 67, 68, -1, + 70, -1, 72, -1, 74, -1, 76, -1, -1, -1, + -1, 81, 82, 83, -1, -1, -1, 87, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - 65, 66, 67, 68, -1, 70, -1, 72, -1, 74, - 75, 76, -1, -1, -1, -1, 81, 82, 83, -1, - -1, -1, 87, -1, -1, -1, -1, -1, -1, -1, + 8, -1, -1, 11, 12, 13, -1, -1, -1, -1, + -1, -1, -1, -1, 22, -1, -1, -1, -1, -1, + -1, 29, -1, -1, -1, 33, 34, -1, 36, -1, + -1, -1, 40, -1, 42, 43, 44, -1, -1, 47, + -1, -1, -1, 51, -1, 53, -1, -1, 56, -1, + -1, -1, -1, -1, -1, -1, -1, 65, 66, 67, + 68, -1, 70, -1, 72, -1, 74, -1, 76, -1, + -1, -1, -1, 81, 82, 83, -1, -1, -1, 87, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, 8, -1, -1, 11, 12, 13, -1, -1, + -1, -1, -1, -1, -1, -1, 22, -1, -1, -1, + -1, -1, -1, 29, -1, -1, -1, 33, 34, -1, + 36, -1, -1, -1, 40, -1, 42, 43, 44, -1, + -1, 47, -1, -1, -1, 51, -1, 53, -1, -1, + 56, -1, -1, -1, -1, -1, -1, -1, -1, 65, + 66, 67, 68, -1, 70, -1, 72, -1, 74, -1, + 76, -1, -1, -1, -1, 81, 82, 83, -1, -1, + -1, 87, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 8, -1, -1, 11, 12, 13, -1, -1, -1, -1, -1, -1, -1, -1, 22, -1, -1, -1, -1, -1, -1, 29, -1, -1, -1, 33, @@ -828,15 +814,6 @@ const short QmlJSGrammar::action_check [] = { -1, 65, 66, 67, 68, -1, 70, -1, 72, -1, 74, -1, 76, -1, -1, -1, -1, 81, 82, 83, -1, -1, -1, 87, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, 8, -1, -1, 11, 12, - 13, -1, -1, -1, -1, -1, -1, -1, -1, 22, - -1, -1, -1, -1, -1, -1, 29, -1, -1, -1, - 33, 34, -1, 36, -1, -1, -1, 40, -1, 42, - 43, 44, -1, -1, 47, -1, -1, -1, 51, -1, - 53, -1, -1, 56, -1, -1, -1, -1, -1, -1, - -1, -1, 65, 66, 67, 68, -1, 70, -1, 72, - -1, 74, -1, 76, -1, -1, -1, -1, 81, 82, - 83, -1, -1, -1, 87, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 8, -1, -1, 11, 12, 13, -1, -1, -1, -1, -1, -1, -1, -1, 22, -1, -1, -1, -1, -1, -1, 29, -1, -1, @@ -846,62 +823,35 @@ const short QmlJSGrammar::action_check [] = { -1, -1, -1, 65, 66, 67, 68, -1, 70, -1, 72, -1, 74, -1, 76, -1, -1, -1, -1, 81, 82, 83, -1, -1, -1, 87, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, 8, -1, -1, - 11, 12, 13, -1, -1, -1, -1, -1, -1, -1, - -1, 22, -1, -1, -1, -1, -1, -1, 29, -1, - -1, -1, 33, 34, -1, 36, -1, -1, -1, 40, - -1, 42, 43, 44, -1, -1, 47, -1, -1, -1, - 51, -1, 53, -1, -1, 56, -1, -1, -1, -1, - -1, -1, -1, -1, 65, 66, 67, 68, -1, 70, - -1, 72, -1, 74, -1, 76, -1, -1, -1, -1, - 81, 82, 83, -1, -1, -1, 87, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, 11, 12, - 13, -1, -1, -1, -1, -1, -1, -1, -1, 22, - -1, -1, -1, -1, -1, -1, 29, 30, -1, -1, - 33, 34, -1, 36, -1, -1, -1, 40, -1, 42, - 43, 44, -1, -1, 47, -1, -1, -1, 51, -1, - 53, -1, -1, -1, -1, -1, -1, -1, 61, -1, - -1, -1, 65, 66, 67, 68, -1, 70, -1, 72, - -1, 74, -1, 76, -1, -1, -1, -1, 81, 82, - 83, -1, -1, -1, 87, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, 4, 5, 6, -1, - -1, 9, 10, 11, -1, -1, 14, -1, 16, -1, - -1, -1, 20, 21, 22, -1, -1, -1, -1, -1, - -1, 29, 30, 31, 32, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, 43, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, 59, -1, -1, -1, -1, -1, -1, 66, 67, - 68, 69, 70, 71, -1, 73, 74, 75, 76, 77, - 78, -1, -1, 81, 82, 83, 84, 85, 86, -1, + -1, -1, -1, -1, -1, -1, -1, -1, 4, 5, + 6, -1, -1, 9, 10, 11, -1, -1, 14, -1, + 16, -1, -1, -1, 20, 21, 22, -1, -1, -1, + -1, -1, -1, 29, 30, 31, 32, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, 43, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, 4, 5, 6, -1, -1, 9, 10, 11, -1, - -1, 14, -1, 16, -1, -1, -1, 20, 21, 22, - -1, -1, -1, -1, -1, -1, 29, 30, 31, 32, - -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - 43, -1, -1, -1, 47, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, 59, -1, -1, -1, - -1, -1, 65, 66, 67, -1, 69, 70, 71, -1, - 73, 74, 75, 76, 77, 78, -1, -1, 81, 82, - 83, 84, 85, 86, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, 4, 5, 6, -1, - -1, 9, 10, 11, -1, -1, 14, -1, 16, -1, - -1, -1, 20, 21, 22, -1, -1, -1, -1, -1, - -1, 29, 30, 31, 32, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, 43, -1, -1, -1, 47, - -1, -1, -1, -1, -1, -1, -1, 55, -1, -1, - -1, 59, -1, -1, -1, -1, -1, 65, 66, 67, - -1, 69, 70, 71, -1, 73, 74, 75, 76, 77, - 78, -1, -1, 81, 82, 83, 84, 85, 86, -1, + -1, -1, -1, 59, -1, -1, -1, -1, -1, -1, + 66, 67, 68, 69, 70, 71, -1, 73, 74, 75, + 76, 77, 78, -1, -1, 81, 82, 83, 84, 85, + 86, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, 4, 5, 6, -1, -1, 9, + 10, 11, -1, -1, 14, -1, 16, -1, -1, -1, + 20, 21, 22, -1, -1, -1, -1, -1, -1, 29, + 30, 31, 32, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, 43, -1, -1, -1, 47, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, 59, + -1, -1, -1, -1, -1, 65, 66, 67, -1, 69, + 70, 71, -1, 73, 74, 75, 76, 77, 78, -1, + -1, 81, 82, 83, 84, 85, 86, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, 4, -1, -1, -1, -1, 9, -1, 11, 12, - 13, 14, -1, -1, -1, -1, -1, -1, 21, 22, - -1, -1, -1, -1, -1, -1, 29, 30, -1, -1, - 33, 34, -1, 36, -1, -1, -1, 40, -1, 42, - 43, 44, -1, -1, 47, -1, -1, -1, 51, -1, - 53, -1, -1, -1, -1, -1, 59, -1, 61, -1, - -1, -1, 65, 66, 67, 68, 69, 70, 71, 72, - 73, 74, 75, 76, 77, 78, -1, -1, 81, 82, - 83, 84, 85, -1, 87, -1, -1, -1, -1, -1, + 4, 5, 6, -1, -1, 9, 10, 11, -1, -1, + 14, -1, 16, -1, -1, -1, 20, 21, 22, -1, + -1, -1, -1, -1, -1, 29, 30, 31, 32, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, 43, + -1, -1, -1, 47, -1, -1, -1, -1, -1, -1, + -1, 55, -1, -1, -1, 59, -1, -1, -1, -1, + -1, 65, 66, 67, -1, 69, 70, 71, -1, 73, + 74, 75, 76, 77, 78, -1, -1, 81, 82, 83, + 84, 85, 86, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 4, -1, -1, -1, -1, 9, -1, 11, 12, 13, 14, -1, -1, -1, -1, -1, -1, 21, 22, -1, -1, -1, -1, -1, @@ -912,67 +862,71 @@ const short QmlJSGrammar::action_check [] = { 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, 78, -1, -1, 81, 82, 83, 84, 85, -1, 87, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, 4, 5, 6, -1, -1, 9, 10, 11, 12, - 13, 14, -1, 16, -1, -1, -1, 20, 21, 22, - -1, -1, -1, -1, -1, -1, 29, 30, 31, 32, - 33, 34, -1, 36, -1, -1, -1, 40, -1, 42, - 43, 44, -1, -1, 47, -1, -1, -1, 51, -1, - 53, -1, -1, -1, -1, -1, 59, -1, 61, -1, - -1, -1, 65, 66, 67, 68, 69, 70, 71, 72, - 73, 74, 75, 76, 77, 78, -1, -1, 81, 82, - 83, 84, 85, 86, 87, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, 4, 5, 6, -1, - -1, 9, 10, 11, 12, 13, 14, -1, 16, -1, - -1, -1, 20, 21, 22, -1, -1, -1, -1, -1, - -1, 29, 30, 31, 32, 33, 34, -1, 36, -1, - -1, -1, 40, -1, 42, 43, 44, -1, -1, 47, - -1, -1, -1, 51, -1, 53, -1, 55, -1, -1, - -1, 59, -1, 61, -1, -1, -1, 65, 66, 67, - 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, - 78, -1, -1, 81, 82, 83, 84, 85, 86, 87, + -1, -1, 4, -1, -1, -1, -1, 9, -1, 11, + 12, 13, 14, -1, -1, -1, -1, -1, -1, 21, + 22, -1, -1, -1, -1, -1, -1, 29, 30, -1, + -1, 33, 34, -1, 36, -1, -1, -1, 40, -1, + 42, 43, 44, -1, -1, 47, -1, -1, -1, 51, + -1, 53, -1, -1, -1, -1, -1, 59, -1, 61, + -1, -1, -1, 65, 66, 67, 68, 69, 70, 71, + 72, 73, 74, 75, 76, 77, 78, -1, -1, 81, + 82, 83, 84, 85, -1, 87, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, 4, 5, + 6, -1, -1, 9, 10, 11, 12, 13, 14, -1, + 16, -1, -1, -1, 20, 21, 22, -1, -1, -1, + -1, -1, -1, 29, 30, 31, 32, 33, 34, -1, + 36, -1, -1, -1, 40, -1, 42, 43, 44, -1, + -1, 47, -1, -1, -1, 51, -1, 53, -1, -1, + -1, -1, -1, 59, -1, 61, -1, -1, -1, 65, + 66, 67, 68, 69, 70, 71, 72, 73, 74, 75, + 76, 77, 78, -1, -1, 81, 82, 83, 84, 85, + 86, 87, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, 4, 5, 6, -1, -1, 9, + 10, 11, 12, 13, 14, -1, 16, -1, -1, -1, + 20, 21, 22, -1, -1, -1, -1, -1, -1, 29, + 30, 31, 32, 33, 34, -1, 36, -1, -1, -1, + 40, -1, 42, 43, 44, -1, -1, 47, -1, -1, + -1, 51, -1, 53, -1, 55, -1, -1, -1, 59, + -1, 61, -1, -1, -1, 65, 66, 67, 68, 69, + 70, 71, 72, 73, 74, 75, 76, 77, 78, -1, + -1, 81, 82, 83, 84, 85, 86, 87, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, - 14, 3, 24, 10, 14, 2, 14, 24, 14, 3, - 34, 12, 3, 24, 14, 14, 3, 2, 14, 3, - 18, 14, 14, 12, 3, 20, 66, 2, 14, 3, - 3, 3, 2, 2, 24, 3, 24, 14, 20, 2, - 20, 97, 3, 14, 2, 2, 2, 14, 14, 2, - 14, 34, 3, 34, 80, 3, 34, 2, 34, 2, - 14, 2, 92, 3, 80, 3, 95, 3, 20, 34, - 3, 2, 34, 20, 3, 35, 2, 14, 2, 34, - 14, 3, 3, 2, 34, 34, 14, 2, 34, 14, - 34, 14, 2, 2, 4, 4, 14, 3, -1, -1, - -1, 43, -1, 45, 43, 3, -1, 12, 43, -1, - 15, 43, -1, 45, 19, -1, 43, 3, 57, -1, - 47, -1, -1, 43, 59, 45, 43, 43, 45, 43, - 43, 47, 45, 34, 48, 43, 43, 45, 39, 43, - 34, 48, 12, 43, 3, 39, 43, 43, 48, 53, - 47, 43, 43, 43, 46, 43, 84, 48, 48, 55, - 48, 67, 43, 12, 45, -1, 43, 43, 86, 67, - 40, 48, 48, 98, 43, 43, 43, 46, 45, 43, - 48, 67, 3, 43, 99, 45, 43, 51, 45, 43, - 43, 40, 45, 43, 12, 49, 43, 43, 45, 49, - 43, -1, 43, 49, 45, 43, 49, 43, 67, 45, - 48, 43, 43, 45, 45, 43, 43, 45, 43, 43, - 45, 48, 40, 30, 48, -1, 43, 34, 43, 43, - 43, 48, 43, 48, 48, 48, 12, 48, 43, 52, - 14, 56, 43, 48, -1, 43, 60, 48, 65, 54, - 48, 27, 28, 43, 65, 43, -1, -1, 48, -1, - 48, 43, 36, 37, 65, -1, 48, 65, 50, -1, - 58, 43, -1, -1, 12, 65, 48, 15, 50, 12, - 43, 19, 15, 43, 14, 48, 19, 50, 48, 5, - 50, -1, -1, -1, -1, -1, 12, -1, -1, -1, - -1, 34, -1, -1, -1, -1, 36, 12, -1, -1, - -1, 27, 28, -1, 19, 20, 21, 22, 23, -1, - -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + 3, 2, 15, 25, 25, 3, 25, 3, 2, 11, + 2, 15, 3, 13, 67, 3, 15, 104, 15, 2, + 15, 2, 4, 3, 35, 15, 15, 3, 21, 3, + 93, 15, 2, 2, 19, 13, 15, 96, 25, 25, + 15, 3, 15, 15, 15, 100, 3, 3, 15, 2, + 2, 15, 3, 21, 4, 15, 15, 15, 35, 2, + 21, 2, 2, 2, 98, 3, 2, 2, 2, 35, + 35, 4, 35, 2, 21, 3, 3, 3, 15, 2, + 35, 35, 3, 3, 3, 3, 35, 35, 2, 35, + 21, 35, -1, 35, -1, -1, 13, 2, 13, 44, + 2, 46, 3, 3, 36, -1, -1, -1, 3, -1, + -1, 15, -1, 35, 44, -1, 46, 13, 40, 44, + 44, 46, 46, -1, 41, 15, 41, -1, 44, 15, + 46, 44, 44, 46, 44, 44, 44, 44, 44, 49, + 49, 44, 49, 49, 35, 41, 49, 37, 60, 40, + 58, 44, 44, 46, 46, 44, 44, 44, 3, 44, + 49, 46, 50, 50, 31, 44, 44, 68, 35, 44, + 48, 50, 44, 68, 44, 50, 81, 49, 48, 81, + 44, 85, 44, 44, 44, 49, 48, 44, 49, 49, + 44, 44, 49, 44, 44, 49, 46, 44, 44, 52, + 46, 44, 44, 46, 46, 56, 44, 54, 46, 15, + 3, 44, 44, 99, 47, 47, 44, 44, 46, 46, + 44, 44, 46, 68, 15, 13, 49, 44, 44, 44, + 44, 44, 49, 49, 49, 49, 49, -1, 61, 53, + 28, 29, 55, -1, -1, -1, 37, 38, 44, 66, + 66, 66, 44, 49, 44, 51, -1, 49, 44, 49, + -1, 44, -1, 49, 44, -1, 49, 57, 44, 49, + 46, 51, 44, -1, 66, 68, 59, 49, 44, 51, + 66, 87, 5, 49, 13, 51, 13, 16, 5, 16, + 13, 20, 13, 20, -1, -1, 13, -1, -1, 20, + 21, 22, 23, 24, -1, 28, 29, -1, 35, -1, + -1, 28, 29, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + 13, -1, -1, 16, -1, -1, -1, 20, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, 5, -1, -1, -1, -1, - -1, -1, 12, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, 27, 28, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, @@ -980,6 +934,6 @@ const short QmlJSGrammar::action_check [] = { -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1}; + -1, -1, -1}; QT_END_NAMESPACE diff --git a/src/declarative/qml/parser/qmljsgrammar_p.h b/src/declarative/qml/parser/qmljsgrammar_p.h index 74fc7aa..903e2c4 100644 --- a/src/declarative/qml/parser/qmljsgrammar_p.h +++ b/src/declarative/qml/parser/qmljsgrammar_p.h @@ -63,8 +63,8 @@ class QmlJSGrammar public: enum { EOF_SYMBOL = 0, - REDUCE_HERE = 98, - SHIFT_THERE = 97, + REDUCE_HERE = 99, + SHIFT_THERE = 98, T_AND = 1, T_AND_AND = 2, T_AND_EQ = 3, @@ -91,6 +91,7 @@ public: T_EQ_EQ_EQ = 19, T_FALSE = 83, T_FEED_JS_EXPRESSION = 95, + T_FEED_JS_PROGRAM = 97, T_FEED_JS_SOURCE_ELEMENT = 96, T_FEED_JS_STATEMENT = 94, T_FEED_UI_OBJECT_MEMBER = 93, @@ -162,15 +163,15 @@ public: T_XOR = 79, T_XOR_EQ = 80, - ACCEPT_STATE = 632, - RULE_COUNT = 341, - STATE_COUNT = 633, - TERMINAL_COUNT = 99, - NON_TERMINAL_COUNT = 105, + ACCEPT_STATE = 635, + RULE_COUNT = 343, + STATE_COUNT = 636, + TERMINAL_COUNT = 100, + NON_TERMINAL_COUNT = 106, - GOTO_INDEX_OFFSET = 633, - GOTO_INFO_OFFSET = 2691, - GOTO_CHECK_OFFSET = 2691 + GOTO_INDEX_OFFSET = 636, + GOTO_INFO_OFFSET = 2520, + GOTO_CHECK_OFFSET = 2520 }; static const char *const spell []; diff --git a/src/declarative/qml/parser/qmljsparser.cpp b/src/declarative/qml/parser/qmljsparser.cpp index e38f317..c2788f4 100644 --- a/src/declarative/qml/parser/qmljsparser.cpp +++ b/src/declarative/qml/parser/qmljsparser.cpp @@ -220,33 +220,38 @@ case 4: { } break; case 5: { + sym(1).Node = sym(2).Node; + program = sym(1).Node; +} break; + +case 6: { sym(1).UiProgram = makeAstNode<AST::UiProgram> (driver->nodePool(), sym(1).UiImportList, sym(2).UiObjectMemberList->finish()); } break; -case 7: { +case 8: { sym(1).Node = sym(1).UiImportList->finish(); } break; -case 8: { +case 9: { sym(1).Node = makeAstNode<AST::UiImportList> (driver->nodePool(), sym(1).UiImport); } break; -case 9: { +case 10: { sym(1).Node = makeAstNode<AST::UiImportList> (driver->nodePool(), sym(1).UiImportList, sym(2).UiImport); } break; -case 12: { +case 13: { sym(1).UiImport->semicolonToken = loc(2); } break; -case 14: { +case 15: { sym(1).UiImport->versionToken = loc(2); sym(1).UiImport->semicolonToken = loc(3); } break; -case 16: { +case 17: { sym(1).UiImport->versionToken = loc(2); sym(1).UiImport->asToken = loc(3); sym(1).UiImport->importIdToken = loc(4); @@ -254,14 +259,14 @@ case 16: { sym(1).UiImport->semicolonToken = loc(5); } break; -case 18: { +case 19: { sym(1).UiImport->asToken = loc(2); sym(1).UiImport->importIdToken = loc(3); sym(1).UiImport->importId = sym(3).sval; sym(1).UiImport->semicolonToken = loc(4); } break; -case 19: { +case 20: { AST::UiImport *node = 0; if (AST::StringLiteral *importIdLiteral = AST::cast<AST::StringLiteral *>(sym(2).Expression)) { @@ -287,56 +292,56 @@ case 19: { } } break; -case 20: { +case 21: { sym(1).Node = 0; } break; -case 21: { +case 22: { sym(1).Node = makeAstNode<AST::UiObjectMemberList> (driver->nodePool(), sym(1).UiObjectMember); } break; -case 22: { +case 23: { sym(1).Node = makeAstNode<AST::UiObjectMemberList> (driver->nodePool(), sym(1).UiObjectMember); } break; -case 23: { +case 24: { AST::UiObjectMemberList *node = makeAstNode<AST:: UiObjectMemberList> (driver->nodePool(), sym(1).UiObjectMemberList, sym(2).UiObjectMember); sym(1).Node = node; } break; -case 24: { +case 25: { sym(1).Node = makeAstNode<AST::UiArrayMemberList> (driver->nodePool(), sym(1).UiObjectMember); } break; -case 25: { +case 26: { AST::UiArrayMemberList *node = makeAstNode<AST::UiArrayMemberList> (driver->nodePool(), sym(1).UiArrayMemberList, sym(3).UiObjectMember); node->commaToken = loc(2); sym(1).Node = node; } break; -case 26: { +case 27: { AST::UiObjectInitializer *node = makeAstNode<AST::UiObjectInitializer> (driver->nodePool(), (AST::UiObjectMemberList*)0); node->lbraceToken = loc(1); node->rbraceToken = loc(2); sym(1).Node = node; } break; -case 27: { +case 28: { AST::UiObjectInitializer *node = makeAstNode<AST::UiObjectInitializer> (driver->nodePool(), sym(2).UiObjectMemberList->finish()); node->lbraceToken = loc(1); node->rbraceToken = loc(3); sym(1).Node = node; } break; -case 28: { +case 29: { AST::UiObjectDefinition *node = makeAstNode<AST::UiObjectDefinition> (driver->nodePool(), sym(1).UiQualifiedId, sym(2).UiObjectInitializer); sym(1).Node = node; } break; -case 30: { +case 31: { AST::UiArrayBinding *node = makeAstNode<AST::UiArrayBinding> (driver->nodePool(), sym(1).UiQualifiedId, sym(4).UiArrayMemberList->finish()); node->colonToken = loc(2); @@ -345,13 +350,13 @@ case 30: { sym(1).Node = node; } break; -case 31: { +case 32: { AST::UiObjectBinding *node = makeAstNode<AST::UiObjectBinding> (driver->nodePool(), sym(1).UiQualifiedId, sym(3).UiQualifiedId, sym(4).UiObjectInitializer); node->colonToken = loc(2); sym(1).Node = node; } break; -case 32:case 33:case 34:case 35: +case 33:case 34:case 35:case 36: { AST::UiScriptBinding *node = makeAstNode<AST::UiScriptBinding> (driver->nodePool(), sym(1).UiQualifiedId, sym(3).Statement); @@ -359,35 +364,35 @@ case 32:case 33:case 34:case 35: sym(1).Node = node; } break; -case 36: +case 37: -case 37: { +case 38: { sym(1).sval = driver->intern(lexer->characterBuffer(), lexer->characterCount()); break; } -case 39: { +case 40: { sym(1).Node = 0; } break; -case 40: { +case 41: { sym(1).Node = sym(1).UiParameterList->finish (); } break; -case 41: { +case 42: { AST::UiParameterList *node = makeAstNode<AST::UiParameterList> (driver->nodePool(), sym(1).sval, sym(2).sval); node->identifierToken = loc(2); sym(1).Node = node; } break; -case 42: { +case 43: { AST::UiParameterList *node = makeAstNode<AST::UiParameterList> (driver->nodePool(), sym(1).UiParameterList, sym(3).sval, sym(4).sval); node->commaToken = loc(2); node->identifierToken = loc(4); sym(1).Node = node; } break; -case 44: { +case 45: { AST::UiPublicMember *node = makeAstNode<AST::UiPublicMember> (driver->nodePool(), (NameId *)0, sym(2).sval); node->type = AST::UiPublicMember::Signal; node->propertyToken = loc(1); @@ -398,7 +403,7 @@ case 44: { sym(1).Node = node; } break; -case 46: { +case 47: { AST::UiPublicMember *node = makeAstNode<AST::UiPublicMember> (driver->nodePool(), (NameId *)0, sym(2).sval); node->type = AST::UiPublicMember::Signal; node->propertyToken = loc(1); @@ -408,7 +413,7 @@ case 46: { sym(1).Node = node; } break; -case 48: { +case 49: { AST::UiPublicMember *node = makeAstNode<AST::UiPublicMember> (driver->nodePool(), sym(4).sval, sym(6).sval); node->typeModifier = sym(2).sval; node->propertyToken = loc(1); @@ -419,7 +424,7 @@ case 48: { sym(1).Node = node; } break; -case 50: { +case 51: { AST::UiPublicMember *node = makeAstNode<AST::UiPublicMember> (driver->nodePool(), sym(2).sval, sym(3).sval); node->propertyToken = loc(1); node->typeToken = loc(2); @@ -428,7 +433,7 @@ case 50: { sym(1).Node = node; } break; -case 52: { +case 53: { AST::UiPublicMember *node = makeAstNode<AST::UiPublicMember> (driver->nodePool(), sym(3).sval, sym(4).sval); node->isDefaultMember = true; node->defaultToken = loc(1); @@ -439,7 +444,7 @@ case 52: { sym(1).Node = node; } break; -case 54: { +case 55: { AST::UiPublicMember *node = makeAstNode<AST::UiPublicMember> (driver->nodePool(), sym(2).sval, sym(3).sval, sym(5).Expression); node->propertyToken = loc(1); @@ -450,7 +455,7 @@ case 54: { sym(1).Node = node; } break; -case 56: { +case 57: { AST::UiPublicMember *node = makeAstNode<AST::UiPublicMember> (driver->nodePool(), sym(3).sval, sym(4).sval, sym(6).Expression); node->isReadonlyMember = true; @@ -463,7 +468,7 @@ case 56: { sym(1).Node = node; } break; -case 58: { +case 59: { AST::UiPublicMember *node = makeAstNode<AST::UiPublicMember> (driver->nodePool(), sym(3).sval, sym(4).sval, sym(6).Expression); node->isDefaultMember = true; @@ -476,75 +481,75 @@ case 58: { sym(1).Node = node; } break; -case 59: { +case 60: { sym(1).Node = makeAstNode<AST::UiSourceElement>(driver->nodePool(), sym(1).Node); } break; -case 60: { +case 61: { sym(1).Node = makeAstNode<AST::UiSourceElement>(driver->nodePool(), sym(1).Node); } break; -case 62: { +case 63: { QString s = QLatin1String(QmlJSGrammar::spell[T_PROPERTY]); sym(1).sval = driver->intern(s.constData(), s.length()); break; } -case 63: { +case 64: { QString s = QLatin1String(QmlJSGrammar::spell[T_SIGNAL]); sym(1).sval = driver->intern(s.constData(), s.length()); break; } -case 64: { +case 65: { QString s = QLatin1String(QmlJSGrammar::spell[T_READONLY]); sym(1).sval = driver->intern(s.constData(), s.length()); break; } -case 65: { +case 66: { AST::ThisExpression *node = makeAstNode<AST::ThisExpression> (driver->nodePool()); node->thisToken = loc(1); sym(1).Node = node; } break; -case 66: { +case 67: { AST::IdentifierExpression *node = makeAstNode<AST::IdentifierExpression> (driver->nodePool(), sym(1).sval); node->identifierToken = loc(1); sym(1).Node = node; } break; -case 67: { +case 68: { AST::NullExpression *node = makeAstNode<AST::NullExpression> (driver->nodePool()); node->nullToken = loc(1); sym(1).Node = node; } break; -case 68: { +case 69: { AST::TrueLiteral *node = makeAstNode<AST::TrueLiteral> (driver->nodePool()); node->trueToken = loc(1); sym(1).Node = node; } break; -case 69: { +case 70: { AST::FalseLiteral *node = makeAstNode<AST::FalseLiteral> (driver->nodePool()); node->falseToken = loc(1); sym(1).Node = node; } break; -case 70: { +case 71: { AST::NumericLiteral *node = makeAstNode<AST::NumericLiteral> (driver->nodePool(), sym(1).dval); node->literalToken = loc(1); sym(1).Node = node; } break; -case 71: -case 72: { +case 72: +case 73: { AST::StringLiteral *node = makeAstNode<AST::StringLiteral> (driver->nodePool(), sym(1).sval); node->literalToken = loc(1); sym(1).Node = node; } break; -case 73: { +case 74: { bool rx = lexer->scanRegExp(Lexer::NoPrefix); if (!rx) { diagnostic_messages.append(DiagnosticMessage(DiagnosticMessage::Error, location(lexer), lexer->errorMessage())); @@ -555,7 +560,7 @@ case 73: { sym(1).Node = node; } break; -case 74: { +case 75: { bool rx = lexer->scanRegExp(Lexer::EqualPrefix); if (!rx) { diagnostic_messages.append(DiagnosticMessage(DiagnosticMessage::Error, location(lexer), lexer->errorMessage())); @@ -566,28 +571,28 @@ case 74: { sym(1).Node = node; } break; -case 75: { +case 76: { AST::ArrayLiteral *node = makeAstNode<AST::ArrayLiteral> (driver->nodePool(), (AST::Elision *) 0); node->lbracketToken = loc(1); node->rbracketToken = loc(2); sym(1).Node = node; } break; -case 76: { +case 77: { AST::ArrayLiteral *node = makeAstNode<AST::ArrayLiteral> (driver->nodePool(), sym(2).Elision->finish()); node->lbracketToken = loc(1); node->rbracketToken = loc(3); sym(1).Node = node; } break; -case 77: { +case 78: { AST::ArrayLiteral *node = makeAstNode<AST::ArrayLiteral> (driver->nodePool(), sym(2).ElementList->finish ()); node->lbracketToken = loc(1); node->rbracketToken = loc(3); sym(1).Node = node; } break; -case 78: { +case 79: { AST::ArrayLiteral *node = makeAstNode<AST::ArrayLiteral> (driver->nodePool(), sym(2).ElementList->finish (), (AST::Elision *) 0); node->lbracketToken = loc(1); @@ -596,7 +601,7 @@ case 78: { sym(1).Node = node; } break; -case 79: { +case 80: { AST::ArrayLiteral *node = makeAstNode<AST::ArrayLiteral> (driver->nodePool(), sym(2).ElementList->finish (), sym(4).Elision->finish()); node->lbracketToken = loc(1); @@ -605,7 +610,7 @@ case 79: { sym(1).Node = node; } break; -case 80: { +case 81: { AST::ObjectLiteral *node = 0; if (sym(2).Node) node = makeAstNode<AST::ObjectLiteral> (driver->nodePool(), @@ -617,7 +622,7 @@ case 80: { sym(1).Node = node; } break; -case 81: { +case 82: { AST::ObjectLiteral *node = makeAstNode<AST::ObjectLiteral> (driver->nodePool(), sym(2).PropertyNameAndValueList->finish ()); node->lbraceToken = loc(1); @@ -625,14 +630,14 @@ case 81: { sym(1).Node = node; } break; -case 82: { +case 83: { AST::NestedExpression *node = makeAstNode<AST::NestedExpression>(driver->nodePool(), sym(2).Expression); node->lparenToken = loc(1); node->rparenToken = loc(3); sym(1).Node = node; } break; -case 83: { +case 84: { if (AST::ArrayMemberExpression *mem = AST::cast<AST::ArrayMemberExpression *>(sym(1).Expression)) { diagnostic_messages.append(DiagnosticMessage(DiagnosticMessage::Warning, mem->lbracketToken, QLatin1String("Ignored annotation"))); @@ -652,48 +657,48 @@ case 83: { } } break; -case 84: { +case 85: { sym(1).Node = makeAstNode<AST::ElementList> (driver->nodePool(), (AST::Elision *) 0, sym(1).Expression); } break; -case 85: { +case 86: { sym(1).Node = makeAstNode<AST::ElementList> (driver->nodePool(), sym(1).Elision->finish(), sym(2).Expression); } break; -case 86: { +case 87: { AST::ElementList *node = makeAstNode<AST::ElementList> (driver->nodePool(), sym(1).ElementList, (AST::Elision *) 0, sym(3).Expression); node->commaToken = loc(2); sym(1).Node = node; } break; -case 87: { +case 88: { AST::ElementList *node = makeAstNode<AST::ElementList> (driver->nodePool(), sym(1).ElementList, sym(3).Elision->finish(), sym(4).Expression); node->commaToken = loc(2); sym(1).Node = node; } break; -case 88: { +case 89: { AST::Elision *node = makeAstNode<AST::Elision> (driver->nodePool()); node->commaToken = loc(1); sym(1).Node = node; } break; -case 89: { +case 90: { AST::Elision *node = makeAstNode<AST::Elision> (driver->nodePool(), sym(1).Elision); node->commaToken = loc(2); sym(1).Node = node; } break; -case 90: { +case 91: { AST::PropertyNameAndValueList *node = makeAstNode<AST::PropertyNameAndValueList> (driver->nodePool(), sym(1).PropertyName, sym(3).Expression); node->colonToken = loc(2); sym(1).Node = node; } break; -case 91: { +case 92: { AST::PropertyNameAndValueList *node = makeAstNode<AST::PropertyNameAndValueList> (driver->nodePool(), sym(1).PropertyNameAndValueList, sym(3).PropertyName, sym(5).Expression); node->commaToken = loc(2); @@ -701,38 +706,36 @@ case 91: { sym(1).Node = node; } break; -case 92: { +case 93: { AST::IdentifierPropertyName *node = makeAstNode<AST::IdentifierPropertyName> (driver->nodePool(), sym(1).sval); node->propertyNameToken = loc(1); sym(1).Node = node; } break; -case 93: -case 94: { +case 94: +case 95: { AST::IdentifierPropertyName *node = makeAstNode<AST::IdentifierPropertyName> (driver->nodePool(), driver->intern(lexer->characterBuffer(), lexer->characterCount())); node->propertyNameToken = loc(1); sym(1).Node = node; } break; -case 95: { +case 96: { AST::StringLiteralPropertyName *node = makeAstNode<AST::StringLiteralPropertyName> (driver->nodePool(), sym(1).sval); node->propertyNameToken = loc(1); sym(1).Node = node; } break; -case 96: { +case 97: { AST::NumericLiteralPropertyName *node = makeAstNode<AST::NumericLiteralPropertyName> (driver->nodePool(), sym(1).dval); node->propertyNameToken = loc(1); sym(1).Node = node; } break; -case 97: { +case 98: { AST::IdentifierPropertyName *node = makeAstNode<AST::IdentifierPropertyName> (driver->nodePool(), sym(1).sval); node->propertyNameToken = loc(1); sym(1).Node = node; } break; -case 98: - case 99: case 100: @@ -792,25 +795,27 @@ case 126: case 127: case 128: + +case 129: { sym(1).sval = driver->intern(lexer->characterBuffer(), lexer->characterCount()); } break; -case 133: { +case 134: { AST::ArrayMemberExpression *node = makeAstNode<AST::ArrayMemberExpression> (driver->nodePool(), sym(1).Expression, sym(3).Expression); node->lbracketToken = loc(2); node->rbracketToken = loc(4); sym(1).Node = node; } break; -case 134: { +case 135: { AST::FieldMemberExpression *node = makeAstNode<AST::FieldMemberExpression> (driver->nodePool(), sym(1).Expression, sym(3).sval); node->dotToken = loc(2); node->identifierToken = loc(3); sym(1).Node = node; } break; -case 135: { +case 136: { AST::NewMemberExpression *node = makeAstNode<AST::NewMemberExpression> (driver->nodePool(), sym(2).Expression, sym(4).ArgumentList); node->newToken = loc(1); node->lparenToken = loc(3); @@ -818,384 +823,384 @@ case 135: { sym(1).Node = node; } break; -case 137: { +case 138: { AST::NewExpression *node = makeAstNode<AST::NewExpression> (driver->nodePool(), sym(2).Expression); node->newToken = loc(1); sym(1).Node = node; } break; -case 138: { +case 139: { AST::CallExpression *node = makeAstNode<AST::CallExpression> (driver->nodePool(), sym(1).Expression, sym(3).ArgumentList); node->lparenToken = loc(2); node->rparenToken = loc(4); sym(1).Node = node; } break; -case 139: { +case 140: { AST::CallExpression *node = makeAstNode<AST::CallExpression> (driver->nodePool(), sym(1).Expression, sym(3).ArgumentList); node->lparenToken = loc(2); node->rparenToken = loc(4); sym(1).Node = node; } break; -case 140: { +case 141: { AST::ArrayMemberExpression *node = makeAstNode<AST::ArrayMemberExpression> (driver->nodePool(), sym(1).Expression, sym(3).Expression); node->lbracketToken = loc(2); node->rbracketToken = loc(4); sym(1).Node = node; } break; -case 141: { +case 142: { AST::FieldMemberExpression *node = makeAstNode<AST::FieldMemberExpression> (driver->nodePool(), sym(1).Expression, sym(3).sval); node->dotToken = loc(2); node->identifierToken = loc(3); sym(1).Node = node; } break; -case 142: { +case 143: { sym(1).Node = 0; } break; -case 143: { +case 144: { sym(1).Node = sym(1).ArgumentList->finish(); } break; -case 144: { +case 145: { sym(1).Node = makeAstNode<AST::ArgumentList> (driver->nodePool(), sym(1).Expression); } break; -case 145: { +case 146: { AST::ArgumentList *node = makeAstNode<AST::ArgumentList> (driver->nodePool(), sym(1).ArgumentList, sym(3).Expression); node->commaToken = loc(2); sym(1).Node = node; } break; -case 149: { +case 150: { AST::PostIncrementExpression *node = makeAstNode<AST::PostIncrementExpression> (driver->nodePool(), sym(1).Expression); node->incrementToken = loc(2); sym(1).Node = node; } break; -case 150: { +case 151: { AST::PostDecrementExpression *node = makeAstNode<AST::PostDecrementExpression> (driver->nodePool(), sym(1).Expression); node->decrementToken = loc(2); sym(1).Node = node; } break; -case 152: { +case 153: { AST::DeleteExpression *node = makeAstNode<AST::DeleteExpression> (driver->nodePool(), sym(2).Expression); node->deleteToken = loc(1); sym(1).Node = node; } break; -case 153: { +case 154: { AST::VoidExpression *node = makeAstNode<AST::VoidExpression> (driver->nodePool(), sym(2).Expression); node->voidToken = loc(1); sym(1).Node = node; } break; -case 154: { +case 155: { AST::TypeOfExpression *node = makeAstNode<AST::TypeOfExpression> (driver->nodePool(), sym(2).Expression); node->typeofToken = loc(1); sym(1).Node = node; } break; -case 155: { +case 156: { AST::PreIncrementExpression *node = makeAstNode<AST::PreIncrementExpression> (driver->nodePool(), sym(2).Expression); node->incrementToken = loc(1); sym(1).Node = node; } break; -case 156: { +case 157: { AST::PreDecrementExpression *node = makeAstNode<AST::PreDecrementExpression> (driver->nodePool(), sym(2).Expression); node->decrementToken = loc(1); sym(1).Node = node; } break; -case 157: { +case 158: { AST::UnaryPlusExpression *node = makeAstNode<AST::UnaryPlusExpression> (driver->nodePool(), sym(2).Expression); node->plusToken = loc(1); sym(1).Node = node; } break; -case 158: { +case 159: { AST::UnaryMinusExpression *node = makeAstNode<AST::UnaryMinusExpression> (driver->nodePool(), sym(2).Expression); node->minusToken = loc(1); sym(1).Node = node; } break; -case 159: { +case 160: { AST::TildeExpression *node = makeAstNode<AST::TildeExpression> (driver->nodePool(), sym(2).Expression); node->tildeToken = loc(1); sym(1).Node = node; } break; -case 160: { +case 161: { AST::NotExpression *node = makeAstNode<AST::NotExpression> (driver->nodePool(), sym(2).Expression); node->notToken = loc(1); sym(1).Node = node; } break; -case 162: { +case 163: { AST::BinaryExpression *node = makeAstNode<AST::BinaryExpression> (driver->nodePool(), sym(1).Expression, QSOperator::Mul, sym(3).Expression); node->operatorToken = loc(2); sym(1).Node = node; } break; -case 163: { +case 164: { AST::BinaryExpression *node = makeAstNode<AST::BinaryExpression> (driver->nodePool(), sym(1).Expression, QSOperator::Div, sym(3).Expression); node->operatorToken = loc(2); sym(1).Node = node; } break; -case 164: { +case 165: { AST::BinaryExpression *node = makeAstNode<AST::BinaryExpression> (driver->nodePool(), sym(1).Expression, QSOperator::Mod, sym(3).Expression); node->operatorToken = loc(2); sym(1).Node = node; } break; -case 166: { +case 167: { AST::BinaryExpression *node = makeAstNode<AST::BinaryExpression> (driver->nodePool(), sym(1).Expression, QSOperator::Add, sym(3).Expression); node->operatorToken = loc(2); sym(1).Node = node; } break; -case 167: { +case 168: { AST::BinaryExpression *node = makeAstNode<AST::BinaryExpression> (driver->nodePool(), sym(1).Expression, QSOperator::Sub, sym(3).Expression); node->operatorToken = loc(2); sym(1).Node = node; } break; -case 169: { +case 170: { AST::BinaryExpression *node = makeAstNode<AST::BinaryExpression> (driver->nodePool(), sym(1).Expression, QSOperator::LShift, sym(3).Expression); node->operatorToken = loc(2); sym(1).Node = node; } break; -case 170: { +case 171: { AST::BinaryExpression *node = makeAstNode<AST::BinaryExpression> (driver->nodePool(), sym(1).Expression, QSOperator::RShift, sym(3).Expression); node->operatorToken = loc(2); sym(1).Node = node; } break; -case 171: { +case 172: { AST::BinaryExpression *node = makeAstNode<AST::BinaryExpression> (driver->nodePool(), sym(1).Expression, QSOperator::URShift, sym(3).Expression); node->operatorToken = loc(2); sym(1).Node = node; } break; -case 173: { +case 174: { AST::BinaryExpression *node = makeAstNode<AST::BinaryExpression> (driver->nodePool(), sym(1).Expression, QSOperator::Lt, sym(3).Expression); node->operatorToken = loc(2); sym(1).Node = node; } break; -case 174: { +case 175: { AST::BinaryExpression *node = makeAstNode<AST::BinaryExpression> (driver->nodePool(), sym(1).Expression, QSOperator::Gt, sym(3).Expression); node->operatorToken = loc(2); sym(1).Node = node; } break; -case 175: { +case 176: { AST::BinaryExpression *node = makeAstNode<AST::BinaryExpression> (driver->nodePool(), sym(1).Expression, QSOperator::Le, sym(3).Expression); node->operatorToken = loc(2); sym(1).Node = node; } break; -case 176: { +case 177: { AST::BinaryExpression *node = makeAstNode<AST::BinaryExpression> (driver->nodePool(), sym(1).Expression, QSOperator::Ge, sym(3).Expression); node->operatorToken = loc(2); sym(1).Node = node; } break; -case 177: { +case 178: { AST::BinaryExpression *node = makeAstNode<AST::BinaryExpression> (driver->nodePool(), sym(1).Expression, QSOperator::InstanceOf, sym(3).Expression); node->operatorToken = loc(2); sym(1).Node = node; } break; -case 178: { +case 179: { AST::BinaryExpression *node = makeAstNode<AST::BinaryExpression> (driver->nodePool(), sym(1).Expression, QSOperator::In, sym(3).Expression); node->operatorToken = loc(2); sym(1).Node = node; } break; -case 180: { +case 181: { AST::BinaryExpression *node = makeAstNode<AST::BinaryExpression> (driver->nodePool(), sym(1).Expression, QSOperator::Lt, sym(3).Expression); node->operatorToken = loc(2); sym(1).Node = node; } break; -case 181: { +case 182: { AST::BinaryExpression *node = makeAstNode<AST::BinaryExpression> (driver->nodePool(), sym(1).Expression, QSOperator::Gt, sym(3).Expression); node->operatorToken = loc(2); sym(1).Node = node; } break; -case 182: { +case 183: { AST::BinaryExpression *node = makeAstNode<AST::BinaryExpression> (driver->nodePool(), sym(1).Expression, QSOperator::Le, sym(3).Expression); node->operatorToken = loc(2); sym(1).Node = node; } break; -case 183: { +case 184: { AST::BinaryExpression *node = makeAstNode<AST::BinaryExpression> (driver->nodePool(), sym(1).Expression, QSOperator::Ge, sym(3).Expression); node->operatorToken = loc(2); sym(1).Node = node; } break; -case 184: { +case 185: { AST::BinaryExpression *node = makeAstNode<AST::BinaryExpression> (driver->nodePool(), sym(1).Expression, QSOperator::InstanceOf, sym(3).Expression); node->operatorToken = loc(2); sym(1).Node = node; } break; -case 186: { +case 187: { AST::BinaryExpression *node = makeAstNode<AST::BinaryExpression> (driver->nodePool(), sym(1).Expression, QSOperator::Equal, sym(3).Expression); node->operatorToken = loc(2); sym(1).Node = node; } break; -case 187: { +case 188: { AST::BinaryExpression *node = makeAstNode<AST::BinaryExpression> (driver->nodePool(), sym(1).Expression, QSOperator::NotEqual, sym(3).Expression); node->operatorToken = loc(2); sym(1).Node = node; } break; -case 188: { +case 189: { AST::BinaryExpression *node = makeAstNode<AST::BinaryExpression> (driver->nodePool(), sym(1).Expression, QSOperator::StrictEqual, sym(3).Expression); node->operatorToken = loc(2); sym(1).Node = node; } break; -case 189: { +case 190: { AST::BinaryExpression *node = makeAstNode<AST::BinaryExpression> (driver->nodePool(), sym(1).Expression, QSOperator::StrictNotEqual, sym(3).Expression); node->operatorToken = loc(2); sym(1).Node = node; } break; -case 191: { +case 192: { AST::BinaryExpression *node = makeAstNode<AST::BinaryExpression> (driver->nodePool(), sym(1).Expression, QSOperator::Equal, sym(3).Expression); node->operatorToken = loc(2); sym(1).Node = node; } break; -case 192: { +case 193: { AST::BinaryExpression *node = makeAstNode<AST::BinaryExpression> (driver->nodePool(), sym(1).Expression, QSOperator::NotEqual, sym(3).Expression); node->operatorToken = loc(2); sym(1).Node = node; } break; -case 193: { +case 194: { AST::BinaryExpression *node = makeAstNode<AST::BinaryExpression> (driver->nodePool(), sym(1).Expression, QSOperator::StrictEqual, sym(3).Expression); node->operatorToken = loc(2); sym(1).Node = node; } break; -case 194: { +case 195: { AST::BinaryExpression *node = makeAstNode<AST::BinaryExpression> (driver->nodePool(), sym(1).Expression, QSOperator::StrictNotEqual, sym(3).Expression); node->operatorToken = loc(2); sym(1).Node = node; } break; -case 196: { +case 197: { AST::BinaryExpression *node = makeAstNode<AST::BinaryExpression> (driver->nodePool(), sym(1).Expression, QSOperator::BitAnd, sym(3).Expression); node->operatorToken = loc(2); sym(1).Node = node; } break; -case 198: { +case 199: { AST::BinaryExpression *node = makeAstNode<AST::BinaryExpression> (driver->nodePool(), sym(1).Expression, QSOperator::BitAnd, sym(3).Expression); node->operatorToken = loc(2); sym(1).Node = node; } break; -case 200: { +case 201: { AST::BinaryExpression *node = makeAstNode<AST::BinaryExpression> (driver->nodePool(), sym(1).Expression, QSOperator::BitXor, sym(3).Expression); node->operatorToken = loc(2); sym(1).Node = node; } break; -case 202: { +case 203: { AST::BinaryExpression *node = makeAstNode<AST::BinaryExpression> (driver->nodePool(), sym(1).Expression, QSOperator::BitXor, sym(3).Expression); node->operatorToken = loc(2); sym(1).Node = node; } break; -case 204: { +case 205: { AST::BinaryExpression *node = makeAstNode<AST::BinaryExpression> (driver->nodePool(), sym(1).Expression, QSOperator::BitOr, sym(3).Expression); node->operatorToken = loc(2); sym(1).Node = node; } break; -case 206: { +case 207: { AST::BinaryExpression *node = makeAstNode<AST::BinaryExpression> (driver->nodePool(), sym(1).Expression, QSOperator::BitOr, sym(3).Expression); node->operatorToken = loc(2); sym(1).Node = node; } break; -case 208: { +case 209: { AST::BinaryExpression *node = makeAstNode<AST::BinaryExpression> (driver->nodePool(), sym(1).Expression, QSOperator::And, sym(3).Expression); node->operatorToken = loc(2); sym(1).Node = node; } break; -case 210: { +case 211: { AST::BinaryExpression *node = makeAstNode<AST::BinaryExpression> (driver->nodePool(), sym(1).Expression, QSOperator::And, sym(3).Expression); node->operatorToken = loc(2); sym(1).Node = node; } break; -case 212: { +case 213: { AST::BinaryExpression *node = makeAstNode<AST::BinaryExpression> (driver->nodePool(), sym(1).Expression, QSOperator::Or, sym(3).Expression); node->operatorToken = loc(2); sym(1).Node = node; } break; -case 214: { +case 215: { AST::BinaryExpression *node = makeAstNode<AST::BinaryExpression> (driver->nodePool(), sym(1).Expression, QSOperator::Or, sym(3).Expression); node->operatorToken = loc(2); sym(1).Node = node; } break; -case 216: { +case 217: { AST::ConditionalExpression *node = makeAstNode<AST::ConditionalExpression> (driver->nodePool(), sym(1).Expression, sym(3).Expression, sym(5).Expression); node->questionToken = loc(2); @@ -1203,7 +1208,7 @@ case 216: { sym(1).Node = node; } break; -case 218: { +case 219: { AST::ConditionalExpression *node = makeAstNode<AST::ConditionalExpression> (driver->nodePool(), sym(1).Expression, sym(3).Expression, sym(5).Expression); node->questionToken = loc(2); @@ -1211,112 +1216,112 @@ case 218: { sym(1).Node = node; } break; -case 220: { +case 221: { AST::BinaryExpression *node = makeAstNode<AST::BinaryExpression> (driver->nodePool(), sym(1).Expression, sym(2).ival, sym(3).Expression); node->operatorToken = loc(2); sym(1).Node = node; } break; -case 222: { +case 223: { AST::BinaryExpression *node = makeAstNode<AST::BinaryExpression> (driver->nodePool(), sym(1).Expression, sym(2).ival, sym(3).Expression); node->operatorToken = loc(2); sym(1).Node = node; } break; -case 223: { +case 224: { sym(1).ival = QSOperator::Assign; } break; -case 224: { +case 225: { sym(1).ival = QSOperator::InplaceMul; } break; -case 225: { +case 226: { sym(1).ival = QSOperator::InplaceDiv; } break; -case 226: { +case 227: { sym(1).ival = QSOperator::InplaceMod; } break; -case 227: { +case 228: { sym(1).ival = QSOperator::InplaceAdd; } break; -case 228: { +case 229: { sym(1).ival = QSOperator::InplaceSub; } break; -case 229: { +case 230: { sym(1).ival = QSOperator::InplaceLeftShift; } break; -case 230: { +case 231: { sym(1).ival = QSOperator::InplaceRightShift; } break; -case 231: { +case 232: { sym(1).ival = QSOperator::InplaceURightShift; } break; -case 232: { +case 233: { sym(1).ival = QSOperator::InplaceAnd; } break; -case 233: { +case 234: { sym(1).ival = QSOperator::InplaceXor; } break; -case 234: { +case 235: { sym(1).ival = QSOperator::InplaceOr; } break; -case 236: { +case 237: { AST::Expression *node = makeAstNode<AST::Expression> (driver->nodePool(), sym(1).Expression, sym(3).Expression); node->commaToken = loc(2); sym(1).Node = node; } break; -case 237: { +case 238: { sym(1).Node = 0; } break; -case 240: { +case 241: { AST::Expression *node = makeAstNode<AST::Expression> (driver->nodePool(), sym(1).Expression, sym(3).Expression); node->commaToken = loc(2); sym(1).Node = node; } break; -case 241: { +case 242: { sym(1).Node = 0; } break; -case 258: { +case 259: { AST::Block *node = makeAstNode<AST::Block> (driver->nodePool(), sym(2).StatementList); node->lbraceToken = loc(1); node->rbraceToken = loc(3); sym(1).Node = node; } break; -case 259: { +case 260: { sym(1).Node = makeAstNode<AST::StatementList> (driver->nodePool(), sym(1).Statement); } break; -case 260: { +case 261: { sym(1).Node = makeAstNode<AST::StatementList> (driver->nodePool(), sym(1).StatementList, sym(2).Statement); } break; -case 261: { +case 262: { sym(1).Node = 0; } break; -case 262: { +case 263: { sym(1).Node = sym(1).StatementList->finish (); } break; -case 264: { +case 265: { AST::VariableStatement *node = makeAstNode<AST::VariableStatement> (driver->nodePool(), sym(2).VariableDeclarationList->finish (/*readOnly=*/sym(1).ival == T_CONST)); node->declarationKindToken = loc(1); @@ -1324,76 +1329,76 @@ case 264: { sym(1).Node = node; } break; -case 265: { +case 266: { sym(1).ival = T_CONST; } break; -case 266: { +case 267: { sym(1).ival = T_VAR; } break; -case 267: { +case 268: { sym(1).Node = makeAstNode<AST::VariableDeclarationList> (driver->nodePool(), sym(1).VariableDeclaration); } break; -case 268: { +case 269: { AST::VariableDeclarationList *node = makeAstNode<AST::VariableDeclarationList> (driver->nodePool(), sym(1).VariableDeclarationList, sym(3).VariableDeclaration); node->commaToken = loc(2); sym(1).Node = node; } break; -case 269: { +case 270: { sym(1).Node = makeAstNode<AST::VariableDeclarationList> (driver->nodePool(), sym(1).VariableDeclaration); } break; -case 270: { +case 271: { sym(1).Node = makeAstNode<AST::VariableDeclarationList> (driver->nodePool(), sym(1).VariableDeclarationList, sym(3).VariableDeclaration); } break; -case 271: { +case 272: { AST::VariableDeclaration *node = makeAstNode<AST::VariableDeclaration> (driver->nodePool(), sym(1).sval, sym(2).Expression); node->identifierToken = loc(1); sym(1).Node = node; } break; -case 272: { +case 273: { AST::VariableDeclaration *node = makeAstNode<AST::VariableDeclaration> (driver->nodePool(), sym(1).sval, sym(2).Expression); node->identifierToken = loc(1); sym(1).Node = node; } break; -case 273: { +case 274: { // ### TODO: AST for initializer sym(1) = sym(2); } break; -case 274: { +case 275: { sym(1).Node = 0; } break; -case 276: { +case 277: { // ### TODO: AST for initializer sym(1) = sym(2); } break; -case 277: { +case 278: { sym(1).Node = 0; } break; -case 279: { +case 280: { AST::EmptyStatement *node = makeAstNode<AST::EmptyStatement> (driver->nodePool()); node->semicolonToken = loc(1); sym(1).Node = node; } break; -case 281: { +case 282: { AST::ExpressionStatement *node = makeAstNode<AST::ExpressionStatement> (driver->nodePool(), sym(1).Expression); node->semicolonToken = loc(2); sym(1).Node = node; } break; -case 282: { +case 283: { AST::IfStatement *node = makeAstNode<AST::IfStatement> (driver->nodePool(), sym(3).Expression, sym(5).Statement, sym(7).Statement); node->ifToken = loc(1); node->lparenToken = loc(2); @@ -1402,7 +1407,7 @@ case 282: { sym(1).Node = node; } break; -case 283: { +case 284: { AST::IfStatement *node = makeAstNode<AST::IfStatement> (driver->nodePool(), sym(3).Expression, sym(5).Statement); node->ifToken = loc(1); node->lparenToken = loc(2); @@ -1410,7 +1415,7 @@ case 283: { sym(1).Node = node; } break; -case 285: { +case 286: { AST::DoWhileStatement *node = makeAstNode<AST::DoWhileStatement> (driver->nodePool(), sym(2).Statement, sym(5).Expression); node->doToken = loc(1); node->whileToken = loc(3); @@ -1420,7 +1425,7 @@ case 285: { sym(1).Node = node; } break; -case 286: { +case 287: { AST::WhileStatement *node = makeAstNode<AST::WhileStatement> (driver->nodePool(), sym(3).Expression, sym(5).Statement); node->whileToken = loc(1); node->lparenToken = loc(2); @@ -1428,7 +1433,7 @@ case 286: { sym(1).Node = node; } break; -case 287: { +case 288: { AST::ForStatement *node = makeAstNode<AST::ForStatement> (driver->nodePool(), sym(3).Expression, sym(5).Expression, sym(7).Expression, sym(9).Statement); node->forToken = loc(1); @@ -1439,7 +1444,7 @@ case 287: { sym(1).Node = node; } break; -case 288: { +case 289: { AST::LocalForStatement *node = makeAstNode<AST::LocalForStatement> (driver->nodePool(), sym(4).VariableDeclarationList->finish (/*readOnly=*/false), sym(6).Expression, sym(8).Expression, sym(10).Statement); @@ -1452,7 +1457,7 @@ case 288: { sym(1).Node = node; } break; -case 289: { +case 290: { AST:: ForEachStatement *node = makeAstNode<AST::ForEachStatement> (driver->nodePool(), sym(3).Expression, sym(5).Expression, sym(7).Statement); node->forToken = loc(1); @@ -1462,7 +1467,7 @@ case 289: { sym(1).Node = node; } break; -case 290: { +case 291: { AST::LocalForEachStatement *node = makeAstNode<AST::LocalForEachStatement> (driver->nodePool(), sym(4).VariableDeclaration, sym(6).Expression, sym(8).Statement); node->forToken = loc(1); @@ -1473,14 +1478,14 @@ case 290: { sym(1).Node = node; } break; -case 292: { +case 293: { AST::ContinueStatement *node = makeAstNode<AST::ContinueStatement> (driver->nodePool()); node->continueToken = loc(1); node->semicolonToken = loc(2); sym(1).Node = node; } break; -case 294: { +case 295: { AST::ContinueStatement *node = makeAstNode<AST::ContinueStatement> (driver->nodePool(), sym(2).sval); node->continueToken = loc(1); node->identifierToken = loc(2); @@ -1488,14 +1493,14 @@ case 294: { sym(1).Node = node; } break; -case 296: { +case 297: { AST::BreakStatement *node = makeAstNode<AST::BreakStatement> (driver->nodePool()); node->breakToken = loc(1); node->semicolonToken = loc(2); sym(1).Node = node; } break; -case 298: { +case 299: { AST::BreakStatement *node = makeAstNode<AST::BreakStatement> (driver->nodePool(), sym(2).sval); node->breakToken = loc(1); node->identifierToken = loc(2); @@ -1503,14 +1508,14 @@ case 298: { sym(1).Node = node; } break; -case 300: { +case 301: { AST::ReturnStatement *node = makeAstNode<AST::ReturnStatement> (driver->nodePool(), sym(2).Expression); node->returnToken = loc(1); node->semicolonToken = loc(3); sym(1).Node = node; } break; -case 301: { +case 302: { AST::WithStatement *node = makeAstNode<AST::WithStatement> (driver->nodePool(), sym(3).Expression, sym(5).Statement); node->withToken = loc(1); node->lparenToken = loc(2); @@ -1518,7 +1523,7 @@ case 301: { sym(1).Node = node; } break; -case 302: { +case 303: { AST::SwitchStatement *node = makeAstNode<AST::SwitchStatement> (driver->nodePool(), sym(3).Expression, sym(5).CaseBlock); node->switchToken = loc(1); node->lparenToken = loc(2); @@ -1526,90 +1531,90 @@ case 302: { sym(1).Node = node; } break; -case 303: { +case 304: { AST::CaseBlock *node = makeAstNode<AST::CaseBlock> (driver->nodePool(), sym(2).CaseClauses); node->lbraceToken = loc(1); node->rbraceToken = loc(3); sym(1).Node = node; } break; -case 304: { +case 305: { AST::CaseBlock *node = makeAstNode<AST::CaseBlock> (driver->nodePool(), sym(2).CaseClauses, sym(3).DefaultClause, sym(4).CaseClauses); node->lbraceToken = loc(1); node->rbraceToken = loc(5); sym(1).Node = node; } break; -case 305: { +case 306: { sym(1).Node = makeAstNode<AST::CaseClauses> (driver->nodePool(), sym(1).CaseClause); } break; -case 306: { +case 307: { sym(1).Node = makeAstNode<AST::CaseClauses> (driver->nodePool(), sym(1).CaseClauses, sym(2).CaseClause); } break; -case 307: { +case 308: { sym(1).Node = 0; } break; -case 308: { +case 309: { sym(1).Node = sym(1).CaseClauses->finish (); } break; -case 309: { +case 310: { AST::CaseClause *node = makeAstNode<AST::CaseClause> (driver->nodePool(), sym(2).Expression, sym(4).StatementList); node->caseToken = loc(1); node->colonToken = loc(3); sym(1).Node = node; } break; -case 310: { +case 311: { AST::DefaultClause *node = makeAstNode<AST::DefaultClause> (driver->nodePool(), sym(3).StatementList); node->defaultToken = loc(1); node->colonToken = loc(2); sym(1).Node = node; } break; -case 311: -case 312: { +case 312: +case 313: { AST::LabelledStatement *node = makeAstNode<AST::LabelledStatement> (driver->nodePool(), driver->intern(lexer->characterBuffer(), lexer->characterCount()), sym(3).Statement); node->identifierToken = loc(1); node->colonToken = loc(2); sym(1).Node = node; } break; -case 313: { +case 314: { AST::LabelledStatement *node = makeAstNode<AST::LabelledStatement> (driver->nodePool(), sym(1).sval, sym(3).Statement); node->identifierToken = loc(1); node->colonToken = loc(2); sym(1).Node = node; } break; -case 315: { +case 316: { AST::ThrowStatement *node = makeAstNode<AST::ThrowStatement> (driver->nodePool(), sym(2).Expression); node->throwToken = loc(1); node->semicolonToken = loc(3); sym(1).Node = node; } break; -case 316: { +case 317: { AST::TryStatement *node = makeAstNode<AST::TryStatement> (driver->nodePool(), sym(2).Statement, sym(3).Catch); node->tryToken = loc(1); sym(1).Node = node; } break; -case 317: { +case 318: { AST::TryStatement *node = makeAstNode<AST::TryStatement> (driver->nodePool(), sym(2).Statement, sym(3).Finally); node->tryToken = loc(1); sym(1).Node = node; } break; -case 318: { +case 319: { AST::TryStatement *node = makeAstNode<AST::TryStatement> (driver->nodePool(), sym(2).Statement, sym(3).Catch, sym(4).Finally); node->tryToken = loc(1); sym(1).Node = node; } break; -case 319: { +case 320: { AST::Catch *node = makeAstNode<AST::Catch> (driver->nodePool(), sym(3).sval, sym(5).Block); node->catchToken = loc(1); node->lparenToken = loc(2); @@ -1618,20 +1623,20 @@ case 319: { sym(1).Node = node; } break; -case 320: { +case 321: { AST::Finally *node = makeAstNode<AST::Finally> (driver->nodePool(), sym(2).Block); node->finallyToken = loc(1); sym(1).Node = node; } break; -case 322: { +case 323: { AST::DebuggerStatement *node = makeAstNode<AST::DebuggerStatement> (driver->nodePool()); node->debuggerToken = loc(1); node->semicolonToken = loc(2); sym(1).Node = node; } break; -case 323: { +case 324: { AST::FunctionDeclaration *node = makeAstNode<AST::FunctionDeclaration> (driver->nodePool(), sym(2).sval, sym(4).FormalParameterList, sym(7).FunctionBody); node->functionToken = loc(1); node->identifierToken = loc(2); @@ -1642,7 +1647,7 @@ case 323: { sym(1).Node = node; } break; -case 324: { +case 325: { AST::FunctionExpression *node = makeAstNode<AST::FunctionExpression> (driver->nodePool(), sym(2).sval, sym(4).FormalParameterList, sym(7).FunctionBody); node->functionToken = loc(1); if (sym(2).sval) @@ -1654,56 +1659,60 @@ case 324: { sym(1).Node = node; } break; -case 325: { +case 326: { AST::FormalParameterList *node = makeAstNode<AST::FormalParameterList> (driver->nodePool(), sym(1).sval); node->identifierToken = loc(1); sym(1).Node = node; } break; -case 326: { +case 327: { AST::FormalParameterList *node = makeAstNode<AST::FormalParameterList> (driver->nodePool(), sym(1).FormalParameterList, sym(3).sval); node->commaToken = loc(2); node->identifierToken = loc(3); sym(1).Node = node; } break; -case 327: { +case 328: { sym(1).Node = 0; } break; -case 328: { +case 329: { sym(1).Node = sym(1).FormalParameterList->finish (); } break; -case 329: { +case 330: { sym(1).Node = 0; } break; -case 331: { +case 332: { sym(1).Node = makeAstNode<AST::FunctionBody> (driver->nodePool(), sym(1).SourceElements->finish ()); } break; -case 332: { +case 333: { + sym(1).Node = makeAstNode<AST::Program> (driver->nodePool(), sym(1).SourceElements->finish ()); +} break; + +case 334: { sym(1).Node = makeAstNode<AST::SourceElements> (driver->nodePool(), sym(1).SourceElement); } break; -case 333: { +case 335: { sym(1).Node = makeAstNode<AST::SourceElements> (driver->nodePool(), sym(1).SourceElements, sym(2).SourceElement); } break; -case 334: { +case 336: { sym(1).Node = makeAstNode<AST::StatementSourceElement> (driver->nodePool(), sym(1).Statement); } break; -case 335: { +case 337: { sym(1).Node = makeAstNode<AST::FunctionSourceElement> (driver->nodePool(), sym(1).FunctionDeclaration); } break; -case 336: { +case 338: { sym(1).sval = 0; } break; -case 338: { +case 340: { sym(1).Node = 0; } break; diff --git a/src/declarative/qml/parser/qmljsparser_p.h b/src/declarative/qml/parser/qmljsparser_p.h index 660690b..42fb422 100644 --- a/src/declarative/qml/parser/qmljsparser_p.h +++ b/src/declarative/qml/parser/qmljsparser_p.h @@ -134,6 +134,7 @@ public: bool parseExpression() { return parse(T_FEED_JS_EXPRESSION); } bool parseSourceElement() { return parse(T_FEED_JS_SOURCE_ELEMENT); } bool parseUiObjectMember() { return parse(T_FEED_UI_OBJECT_MEMBER); } + bool parseProgram() { return parse(T_FEED_JS_PROGRAM); } AST::UiProgram *ast() const { return AST::cast<AST::UiProgram *>(program); } @@ -162,13 +163,8 @@ public: return program->uiObjectMemberCast(); } - AST::SourceElement *sourceElement() const - { - if (! program) - return 0; - - return program->sourceElementCast(); - } + AST::Node *rootNode() const + { return program; } QList<DiagnosticMessage> diagnosticMessages() const { return diagnostic_messages; } @@ -239,9 +235,9 @@ protected: -#define J_SCRIPT_REGEXPLITERAL_RULE1 73 +#define J_SCRIPT_REGEXPLITERAL_RULE1 74 -#define J_SCRIPT_REGEXPLITERAL_RULE2 74 +#define J_SCRIPT_REGEXPLITERAL_RULE2 75 QT_QML_END_NAMESPACE |