diff options
author | Aaron Kennedy <aaron.kennedy@nokia.com> | 2009-07-09 07:25:16 (GMT) |
---|---|---|
committer | Aaron Kennedy <aaron.kennedy@nokia.com> | 2009-07-09 07:25:16 (GMT) |
commit | 8a6e5d5c95a8ae586c8fc2fa63be0228c4cefb53 (patch) | |
tree | 92326e96d070ac6c437f7b3cd8d6ac906b2b7656 /src/declarative/qml/parser | |
parent | 6c901f67fb2f2e73fa362e72d985a04fa57cdf48 (diff) | |
download | Qt-8a6e5d5c95a8ae586c8fc2fa63be0228c4cefb53.zip Qt-8a6e5d5c95a8ae586c8fc2fa63be0228c4cefb53.tar.gz Qt-8a6e5d5c95a8ae586c8fc2fa63be0228c4cefb53.tar.bz2 |
Expand input keyword to include "as" support
Diffstat (limited to 'src/declarative/qml/parser')
-rw-r--r-- | src/declarative/qml/parser/qmljs.g | 43 | ||||
-rw-r--r-- | src/declarative/qml/parser/qmljsast_p.h | 10 | ||||
-rw-r--r-- | src/declarative/qml/parser/qmljsgrammar.cpp | 1415 | ||||
-rw-r--r-- | src/declarative/qml/parser/qmljsgrammar_p.h | 19 | ||||
-rw-r--r-- | src/declarative/qml/parser/qmljslexer.cpp | 2 | ||||
-rw-r--r-- | src/declarative/qml/parser/qmljsparser.cpp | 478 | ||||
-rw-r--r-- | src/declarative/qml/parser/qmljsparser_p.h | 4 |
7 files changed, 1026 insertions, 945 deletions
diff --git a/src/declarative/qml/parser/qmljs.g b/src/declarative/qml/parser/qmljs.g index c7952e2..3ed6ee2 100644 --- a/src/declarative/qml/parser/qmljs.g +++ b/src/declarative/qml/parser/qmljs.g @@ -84,6 +84,7 @@ --- context keywords. %token T_PUBLIC "public" %token T_IMPORT "import" +%token T_AS "as" %nonassoc SHIFT_THERE %nonassoc T_IDENTIFIER T_COLON T_SIGNAL T_PROPERTY @@ -537,6 +538,48 @@ case $rule_number: { } break; ./ +UiImport: T_IMPORT T_STRING_LITERAL T_AS JsIdentifier T_AUTOMATIC_SEMICOLON; +UiImport: T_IMPORT T_STRING_LITERAL T_AS JsIdentifier T_SEMICOLON; +/. +case $rule_number: { + AST::UiImport *node = makeAstNode<AST::UiImport>(driver->nodePool(), sym(2).sval); + node->importId = sym(4).sval; + node->importToken = loc(1); + node->fileNameToken = loc(2); + node->asToken = loc(3); + node->importIdToken = loc(4); + node->semicolonToken = loc(5); + sym(1).Node = node; +} break; +./ + +UiImport: T_IMPORT UiQualifiedId T_AUTOMATIC_SEMICOLON; +UiImport: T_IMPORT UiQualifiedId T_SEMICOLON; +/. +case $rule_number: { + AST::UiImport *node = makeAstNode<AST::UiImport>(driver->nodePool(), sym(2).UiQualifiedId); + node->importToken = loc(1); + node->fileNameToken = loc(2); + node->semicolonToken = loc(3); + sym(1).Node = node; +} break; +./ + +UiImport: T_IMPORT UiQualifiedId T_AS JsIdentifier T_AUTOMATIC_SEMICOLON; +UiImport: T_IMPORT UiQualifiedId T_AS JsIdentifier T_SEMICOLON; +/. +case $rule_number: { + AST::UiImport *node = makeAstNode<AST::UiImport>(driver->nodePool(), sym(2).UiQualifiedId); + node->importId = sym(4).sval; + node->importToken = loc(1); + node->fileNameToken = loc(2); + node->asToken = loc(3); + node->importIdToken = loc(4); + node->semicolonToken = loc(5); + sym(1).Node = node; +} break; +./ + Empty: ; /. case $rule_number: { diff --git a/src/declarative/qml/parser/qmljsast_p.h b/src/declarative/qml/parser/qmljsast_p.h index ba655f3..bde78c0 100644 --- a/src/declarative/qml/parser/qmljsast_p.h +++ b/src/declarative/qml/parser/qmljsast_p.h @@ -2221,15 +2221,23 @@ public: QMLJS_DECLARE_AST_NODE(UiImport) UiImport(NameId *fileName) - : fileName(fileName) + : fileName(fileName), importUri(0), importId(0) + { kind = K; } + + UiImport(UiQualifiedId *uri) + : fileName(0), importUri(uri), importId(0) { kind = K; } virtual void accept0(Visitor *visitor); // attributes NameId *fileName; + UiQualifiedId *importUri; + NameId *importId; SourceLocation importToken; SourceLocation fileNameToken; + SourceLocation asToken; + SourceLocation importIdToken; SourceLocation semicolonToken; }; diff --git a/src/declarative/qml/parser/qmljsgrammar.cpp b/src/declarative/qml/parser/qmljsgrammar.cpp index b7a08d8..5ff2ed8 100644 --- a/src/declarative/qml/parser/qmljsgrammar.cpp +++ b/src/declarative/qml/parser/qmljsgrammar.cpp @@ -51,618 +51,613 @@ const char *const QmlJSGrammar::spell [] = { "||", "+", "+=", "++", "?", "}", "]", "%", "%=", "return", ")", ";", 0, "*", "*=", "string literal", "property", "signal", "switch", "this", "throw", "~", "try", "typeof", "var", "void", "while", "with", "^", "^=", - "null", "true", "false", "const", "debugger", "reserved word", "multiline string literal", "public", "import", 0, - 0}; + "null", "true", "false", "const", "debugger", "reserved word", "multiline string literal", "public", "import", "as", + 0, 0}; const int QmlJSGrammar::lhs [] = { - 91, 92, 92, 95, 95, 96, 96, 94, 93, 98, - 98, 100, 100, 101, 101, 97, 99, 99, 103, 104, - 104, 99, 99, 99, 99, 99, 99, 99, 111, 111, - 111, 112, 112, 113, 113, 99, 99, 99, 99, 99, - 99, 99, 99, 99, 99, 99, 99, 102, 102, 114, - 114, 114, 117, 117, 117, 117, 117, 117, 117, 117, - 117, 117, 117, 117, 117, 117, 117, 117, 117, 102, - 102, 119, 119, 119, 119, 118, 118, 121, 121, 123, - 123, 123, 123, 123, 123, 124, 124, 124, 124, 124, - 124, 124, 124, 124, 124, 124, 124, 124, 124, 124, - 124, 124, 124, 124, 124, 124, 124, 124, 124, 124, - 124, 124, 124, 124, 124, 124, 125, 125, 126, 126, - 126, 126, 126, 129, 129, 130, 130, 130, 130, 128, - 128, 131, 131, 132, 132, 133, 133, 133, 134, 134, - 134, 134, 134, 134, 134, 134, 134, 134, 135, 135, - 135, 135, 136, 136, 136, 137, 137, 137, 137, 138, - 138, 138, 138, 138, 138, 138, 139, 139, 139, 139, - 139, 139, 140, 140, 140, 140, 140, 141, 141, 141, - 141, 141, 142, 142, 143, 143, 144, 144, 145, 145, - 146, 146, 147, 147, 148, 148, 149, 149, 150, 150, - 151, 151, 152, 152, 153, 153, 122, 122, 154, 154, - 155, 155, 155, 155, 155, 155, 155, 155, 155, 155, - 155, 155, 105, 105, 156, 156, 157, 157, 158, 158, - 159, 159, 159, 159, 159, 159, 159, 159, 159, 159, - 159, 159, 159, 159, 159, 106, 170, 170, 169, 169, - 116, 116, 171, 171, 172, 172, 174, 174, 173, 175, - 178, 176, 176, 179, 177, 177, 107, 108, 108, 110, - 110, 160, 160, 160, 160, 160, 160, 160, 161, 161, - 161, 161, 162, 162, 162, 162, 163, 163, 164, 166, - 180, 180, 183, 183, 181, 181, 184, 182, 165, 165, - 165, 167, 167, 168, 168, 168, 185, 186, 109, 109, - 115, 127, 190, 190, 187, 187, 188, 188, 191, 192, - 192, 193, 193, 189, 189, 120, 120, 194}; + 92, 93, 93, 96, 96, 97, 97, 97, 97, 97, + 97, 97, 97, 95, 94, 101, 101, 103, 103, 104, + 104, 100, 102, 102, 105, 106, 106, 102, 102, 102, + 102, 102, 102, 102, 113, 113, 113, 114, 114, 115, + 115, 102, 102, 102, 102, 102, 102, 102, 102, 102, + 102, 102, 102, 99, 99, 98, 98, 98, 118, 118, + 118, 118, 118, 118, 118, 118, 118, 118, 118, 118, + 118, 118, 118, 118, 118, 99, 99, 120, 120, 120, + 120, 119, 119, 122, 122, 124, 124, 124, 124, 124, + 124, 125, 125, 125, 125, 125, 125, 125, 125, 125, + 125, 125, 125, 125, 125, 125, 125, 125, 125, 125, + 125, 125, 125, 125, 125, 125, 125, 125, 125, 125, + 125, 125, 126, 126, 127, 127, 127, 127, 127, 130, + 130, 131, 131, 131, 131, 129, 129, 132, 132, 133, + 133, 134, 134, 134, 135, 135, 135, 135, 135, 135, + 135, 135, 135, 135, 136, 136, 136, 136, 137, 137, + 137, 138, 138, 138, 138, 139, 139, 139, 139, 139, + 139, 139, 140, 140, 140, 140, 140, 140, 141, 141, + 141, 141, 141, 142, 142, 142, 142, 142, 143, 143, + 144, 144, 145, 145, 146, 146, 147, 147, 148, 148, + 149, 149, 150, 150, 151, 151, 152, 152, 153, 153, + 154, 154, 123, 123, 155, 155, 156, 156, 156, 156, + 156, 156, 156, 156, 156, 156, 156, 156, 107, 107, + 157, 157, 158, 158, 159, 159, 160, 160, 160, 160, + 160, 160, 160, 160, 160, 160, 160, 160, 160, 160, + 160, 108, 171, 171, 170, 170, 117, 117, 172, 172, + 173, 173, 175, 175, 174, 176, 179, 177, 177, 180, + 178, 178, 109, 110, 110, 112, 112, 161, 161, 161, + 161, 161, 161, 161, 162, 162, 162, 162, 163, 163, + 163, 163, 164, 164, 165, 167, 181, 181, 184, 184, + 182, 182, 185, 183, 166, 166, 166, 168, 168, 169, + 169, 169, 186, 187, 111, 111, 116, 128, 191, 191, + 188, 188, 189, 189, 192, 193, 193, 194, 194, 190, + 190, 121, 121, 195}; const int QmlJSGrammar:: rhs[] = { - 2, 1, 1, 1, 2, 3, 3, 0, 1, 1, - 2, 1, 3, 2, 3, 2, 1, 5, 1, 2, - 2, 4, 3, 3, 3, 3, 3, 3, 1, 1, - 1, 0, 1, 2, 4, 5, 2, 4, 4, 5, - 5, 6, 6, 7, 7, 1, 1, 1, 1, 1, + 2, 1, 1, 1, 2, 3, 3, 5, 5, 3, + 3, 5, 5, 0, 1, 1, 2, 1, 3, 2, + 3, 2, 1, 5, 1, 2, 2, 4, 3, 3, + 3, 3, 3, 3, 1, 1, 1, 0, 1, 2, + 4, 5, 2, 4, 4, 5, 5, 6, 6, 7, + 7, 1, 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 2, 3, 3, + 4, 5, 3, 4, 3, 1, 3, 1, 2, 3, + 4, 1, 2, 3, 5, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, - 1, 2, 3, 3, 4, 5, 3, 4, 3, 1, - 3, 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, 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, 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, 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, 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, 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, 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}; const int QmlJSGrammar::action_default [] = { - 8, 2, 0, 4, 3, 0, 0, 0, 6, 7, - 5, 70, 50, 51, 48, 49, 52, 9, 0, 1, - 0, 0, 16, 71, 46, 253, 0, 0, 51, 14, - 52, 254, 17, 10, 0, 0, 0, 47, 0, 31, - 30, 29, 0, 0, 40, 0, 41, 156, 223, 187, - 195, 191, 135, 207, 183, 0, 120, 54, 136, 199, - 203, 124, 153, 134, 139, 119, 173, 160, 0, 60, - 61, 57, 324, 326, 0, 0, 0, 0, 0, 0, - 55, 58, 0, 0, 59, 53, 0, 56, 0, 0, - 149, 0, 0, 136, 155, 138, 137, 0, 0, 0, - 151, 152, 150, 154, 0, 184, 0, 0, 0, 0, - 174, 0, 0, 0, 0, 0, 0, 164, 0, 0, - 0, 158, 159, 157, 162, 166, 165, 163, 161, 176, - 175, 177, 0, 192, 0, 188, 0, 0, 130, 117, - 129, 118, 86, 87, 88, 113, 89, 114, 90, 91, - 92, 93, 94, 95, 96, 97, 98, 99, 100, 101, - 102, 115, 103, 104, 105, 106, 107, 108, 109, 110, - 111, 112, 116, 0, 0, 128, 224, 131, 0, 132, - 0, 133, 127, 44, 45, 0, 220, 213, 211, 218, - 219, 217, 216, 222, 215, 214, 212, 221, 208, 0, - 196, 0, 0, 200, 0, 0, 204, 0, 0, 130, - 122, 0, 121, 0, 126, 140, 0, 325, 315, 316, - 0, 313, 0, 314, 0, 317, 231, 238, 237, 245, - 233, 0, 234, 318, 0, 323, 235, 236, 241, 239, - 320, 319, 322, 242, 0, 0, 0, 0, 0, 324, - 50, 0, 326, 51, 225, 267, 52, 0, 0, 0, - 0, 0, 243, 244, 232, 240, 268, 269, 312, 321, - 0, 283, 284, 285, 286, 0, 279, 280, 281, 282, - 309, 310, 0, 0, 0, 0, 0, 272, 273, 229, - 227, 189, 197, 193, 209, 185, 230, 0, 136, 201, - 205, 178, 167, 0, 0, 186, 0, 0, 0, 0, - 179, 0, 0, 0, 0, 0, 171, 169, 172, 170, - 168, 181, 180, 182, 0, 194, 0, 190, 0, 228, - 136, 0, 210, 225, 226, 0, 225, 0, 0, 275, - 0, 0, 0, 277, 0, 198, 0, 0, 202, 0, - 0, 206, 265, 0, 257, 266, 260, 0, 264, 0, - 225, 258, 0, 225, 0, 0, 276, 0, 0, 0, - 278, 325, 315, 0, 0, 317, 0, 311, 0, 301, - 0, 0, 0, 271, 0, 270, 0, 327, 0, 85, - 247, 250, 0, 86, 253, 89, 114, 91, 92, 57, - 96, 97, 50, 98, 101, 55, 58, 51, 225, 52, - 59, 104, 53, 106, 56, 108, 109, 254, 111, 112, - 116, 0, 78, 0, 0, 80, 84, 82, 68, 81, - 83, 0, 79, 67, 248, 246, 124, 125, 130, 0, - 123, 0, 300, 0, 287, 288, 0, 299, 0, 0, - 0, 290, 295, 293, 296, 0, 0, 294, 295, 0, - 291, 0, 292, 249, 298, 0, 249, 297, 0, 302, - 303, 0, 249, 304, 305, 0, 0, 306, 0, 0, - 0, 307, 308, 142, 141, 0, 0, 0, 274, 0, - 0, 0, 289, 72, 0, 0, 76, 62, 0, 64, - 74, 0, 65, 75, 77, 66, 73, 63, 0, 69, - 146, 144, 148, 145, 143, 147, 0, 0, 0, 38, - 0, 39, 0, 42, 43, 37, 32, 33, 0, 0, - 0, 0, 35, 36, 34, 15, 11, 0, 23, 26, - 24, 0, 25, 28, 249, 0, 19, 0, 27, 22, - 86, 253, 89, 114, 91, 92, 57, 96, 97, 50, - 98, 101, 55, 58, 51, 225, 52, 59, 104, 53, - 106, 56, 108, 109, 254, 111, 112, 116, 54, 0, - 12, 0, 18, 13, 20, 21, 262, 255, 0, 263, - 259, 0, 261, 251, 0, 252, 256, 328}; + 14, 2, 0, 4, 3, 0, 0, 76, 56, 57, + 54, 55, 58, 0, 0, 0, 6, 7, 0, 8, + 9, 0, 10, 0, 11, 0, 12, 13, 77, 5, + 15, 0, 1, 0, 22, 52, 259, 0, 0, 57, + 20, 58, 260, 23, 16, 0, 0, 0, 53, 0, + 37, 36, 35, 0, 0, 46, 0, 47, 162, 229, + 193, 201, 197, 141, 213, 189, 0, 126, 60, 142, + 205, 209, 130, 159, 140, 145, 125, 179, 166, 0, + 66, 67, 63, 330, 332, 0, 0, 0, 0, 0, + 0, 61, 64, 0, 0, 65, 59, 0, 62, 0, + 0, 155, 0, 0, 142, 161, 144, 143, 0, 0, + 0, 157, 158, 156, 160, 0, 190, 0, 0, 0, + 0, 180, 0, 0, 0, 0, 0, 0, 170, 0, + 0, 0, 164, 165, 163, 168, 172, 171, 169, 167, + 182, 181, 183, 0, 198, 0, 194, 0, 0, 136, + 123, 135, 124, 92, 93, 94, 119, 95, 120, 96, + 97, 98, 99, 100, 101, 102, 103, 104, 105, 106, + 107, 108, 121, 109, 110, 111, 112, 113, 114, 115, + 116, 117, 118, 122, 0, 0, 134, 230, 137, 0, + 138, 0, 139, 133, 50, 51, 0, 226, 219, 217, + 224, 225, 223, 222, 228, 221, 220, 218, 227, 214, + 0, 202, 0, 0, 206, 0, 0, 210, 0, 0, + 136, 128, 0, 127, 0, 132, 146, 0, 331, 321, + 322, 0, 319, 0, 320, 0, 323, 237, 244, 243, + 251, 239, 0, 240, 324, 0, 329, 241, 242, 247, + 245, 326, 325, 328, 248, 0, 0, 0, 0, 0, + 330, 56, 0, 332, 57, 231, 273, 58, 0, 0, + 0, 0, 0, 249, 250, 238, 246, 274, 275, 318, + 327, 0, 289, 290, 291, 292, 0, 285, 286, 287, + 288, 315, 316, 0, 0, 0, 0, 0, 278, 279, + 235, 233, 195, 203, 199, 215, 191, 236, 0, 142, + 207, 211, 184, 173, 0, 0, 192, 0, 0, 0, + 0, 185, 0, 0, 0, 0, 0, 177, 175, 178, + 176, 174, 187, 186, 188, 0, 200, 0, 196, 0, + 234, 142, 0, 216, 231, 232, 0, 231, 0, 0, + 281, 0, 0, 0, 283, 0, 204, 0, 0, 208, + 0, 0, 212, 271, 0, 263, 272, 266, 0, 270, + 0, 231, 264, 0, 231, 0, 0, 282, 0, 0, + 0, 284, 331, 321, 0, 0, 323, 0, 317, 0, + 307, 0, 0, 0, 277, 0, 276, 0, 333, 0, + 91, 253, 256, 0, 92, 259, 95, 120, 97, 98, + 63, 102, 103, 56, 104, 107, 61, 64, 57, 231, + 58, 65, 110, 59, 112, 62, 114, 115, 260, 117, + 118, 122, 0, 84, 0, 0, 86, 90, 88, 74, + 87, 89, 0, 85, 73, 254, 252, 130, 131, 136, + 0, 129, 0, 306, 0, 293, 294, 0, 305, 0, + 0, 0, 296, 301, 299, 302, 0, 0, 300, 301, + 0, 297, 0, 298, 255, 304, 0, 255, 303, 0, + 308, 309, 0, 255, 310, 311, 0, 0, 312, 0, + 0, 0, 313, 314, 148, 147, 0, 0, 0, 280, + 0, 0, 0, 295, 78, 0, 0, 82, 68, 0, + 70, 80, 0, 71, 81, 83, 72, 79, 69, 0, + 75, 152, 150, 154, 151, 149, 153, 0, 0, 0, + 44, 0, 45, 0, 48, 49, 43, 38, 39, 0, + 0, 0, 0, 41, 42, 40, 21, 17, 0, 29, + 32, 30, 0, 31, 34, 255, 0, 25, 0, 33, + 28, 92, 259, 95, 120, 97, 98, 63, 102, 103, + 56, 104, 107, 61, 64, 57, 231, 58, 65, 110, + 59, 112, 62, 114, 115, 260, 117, 118, 122, 60, + 0, 18, 0, 24, 19, 26, 27, 268, 261, 0, + 269, 265, 0, 267, 257, 0, 258, 262, 334}; const int QmlJSGrammar::goto_default [] = { - 6, 5, 19, 1, 4, 3, 32, 34, 33, 579, - 22, 18, 547, 548, 231, 226, 230, 232, 229, 236, - 517, 528, 527, 57, 235, 264, 65, 495, 494, 388, - 387, 48, 386, 389, 140, 61, 56, 178, 63, 52, - 177, 58, 64, 90, 62, 47, 67, 66, 301, 54, - 295, 49, 291, 51, 293, 50, 292, 59, 299, 60, - 300, 53, 294, 290, 331, 443, 296, 297, 390, 237, - 228, 227, 239, 265, 238, 243, 262, 263, 392, 391, - 36, 588, 587, 353, 354, 590, 356, 589, 355, 451, - 455, 458, 454, 453, 473, 474, 220, 234, 216, 219, - 233, 241, 240, 0}; + 6, 5, 32, 1, 4, 3, 68, 31, 43, 45, + 44, 590, 34, 558, 559, 242, 237, 241, 243, 240, + 247, 528, 539, 538, 246, 275, 76, 506, 505, 399, + 398, 59, 397, 400, 151, 72, 67, 189, 74, 63, + 188, 69, 75, 101, 73, 58, 78, 77, 312, 65, + 306, 60, 302, 62, 304, 61, 303, 70, 310, 71, + 311, 64, 305, 301, 342, 454, 307, 308, 401, 248, + 239, 238, 250, 276, 249, 254, 273, 274, 403, 402, + 47, 599, 598, 364, 365, 601, 367, 600, 366, 462, + 466, 469, 465, 464, 484, 485, 231, 245, 227, 230, + 244, 252, 251, 0}; const int QmlJSGrammar::action_index [] = { - -9, -91, 70, -91, 9, 338, 83, 124, -91, -91, - -91, -91, -91, -91, -91, -91, -91, -91, 110, -91, - 187, 490, -91, -91, -91, -91, 64, 208, 195, -91, - 74, -91, -91, -91, 573, 181, 176, -91, 160, -91, - -91, -91, 45, 274, -91, 820, -91, 129, -91, 76, - 39, 11, 315, -91, 319, 250, -91, -91, 527, 65, - 128, 356, 229, -91, -91, -91, 464, 241, 820, -91, - -91, -91, 217, 1653, 1233, 820, 820, 820, 740, 820, - -91, -91, 820, 820, -91, -91, 820, -91, 820, 820, - -91, 820, 820, 113, 239, -91, -91, 820, 820, 820, - -91, -91, -91, 236, 820, 323, 820, 820, 820, 820, - 444, 820, 820, 820, 820, 820, 820, 301, 820, 820, - 820, 108, 82, 78, 166, 170, 182, 165, 280, 454, - 474, 434, 820, 66, 820, 90, 1566, 820, 820, -91, - -91, -91, -91, -91, -91, -91, -91, -91, -91, -91, - -91, -91, -91, -91, -91, -91, -91, -91, -91, -91, - -91, -91, -91, -91, -91, -91, -91, -91, -91, -91, - -91, -91, -91, 118, 820, -91, -91, 84, 72, -91, - 820, -91, -91, -91, -91, 820, -91, -91, -91, -91, - -91, -91, -91, -91, -91, -91, -91, -91, -91, 820, - 69, 820, 820, 86, 79, 820, -91, 1566, 820, 820, - -91, 102, -91, 80, -91, -91, 71, -91, 169, 85, - 81, -91, 133, -91, 67, 1914, -91, -91, -91, -91, - -91, 198, -91, -91, 21, -91, -91, -91, -91, -91, - -91, 1914, -91, -91, 373, 359, 106, 1827, 44, 253, - 68, 37, 2088, 62, 820, -91, 61, 48, 820, 49, - 58, 60, -91, -91, -91, -91, -91, -91, -91, -91, - 75, -91, -91, -91, -91, 88, -91, -91, -91, -91, - -91, -91, 55, 54, 820, 91, 109, -91, -91, 984, - -91, 77, 53, 7, -91, 270, 73, 59, 661, 63, - 127, 492, 302, 256, 820, 313, 820, 820, 820, 820, - 424, 820, 820, 820, 820, 820, 200, 188, 192, 206, - 185, 350, 424, 395, 820, -50, 820, 23, 820, -91, - 571, 820, -91, 820, -1, -57, 820, -59, 1827, -91, - 820, 119, 1827, -91, 820, -32, 820, 820, 12, 10, - 820, -91, 2, 126, -16, -91, -91, 820, -91, 258, - 820, -91, -34, 820, -35, 1827, -91, 820, 105, 1827, - -91, -10, 234, -40, -12, 1914, -49, -91, 1827, -91, - 820, 134, 1827, -13, 1827, -91, 3, 1, -47, -91, - -91, 1827, 6, 349, 56, 388, 95, 820, 1827, 131, - 26, 314, 52, 15, 740, 43, 29, -91, 904, -91, - 27, -3, 22, 820, 25, -2, 820, 30, 820, 5, - 8, 820, -91, 1740, 32, -91, -91, -91, -91, -91, - -91, 820, -91, -91, -91, -91, 213, -91, 820, -48, - -91, 1827, -91, 111, -91, -91, 1827, -91, 820, 94, - 33, -91, 0, -91, 41, 98, 820, -91, 40, 28, - -91, 17, -91, 1827, -91, 107, 1827, -91, 210, -91, - -91, 92, 1827, -7, -91, -18, -11, -91, 135, -37, - -22, -91, -91, -91, -91, 820, 87, 1827, -91, 820, - 103, 1827, -91, -91, 96, 1316, -91, -91, 1067, -91, - -91, 1150, -91, -91, -91, -91, -91, -91, 101, -91, - -91, -91, -91, -91, -91, -91, 24, 19, 248, -91, - 820, -91, 242, -91, -91, -36, 223, 47, -58, 247, - 232, 228, -91, -91, -91, -91, -91, 1479, -91, -91, - -91, 337, -91, -91, 2001, 1399, -91, 122, -91, -91, - 334, 50, 347, 114, 820, 1827, 131, 18, 317, 46, - 16, 740, 51, 57, -91, 904, -91, 31, 20, 35, - 820, 36, 14, 820, 42, 820, 4, 34, 38, 214, - -91, 327, -91, -91, -91, -91, 13, -91, 203, -91, - -91, 820, -91, -91, 211, -91, -91, -91, + -11, -92, 395, -92, 10, 364, 99, -92, -92, -92, + -92, -92, -92, 135, 285, 214, -92, -92, 93, -92, + -92, 214, -92, 214, -92, 101, -92, -92, -92, -92, + -92, 97, -92, 462, -92, -92, -92, 72, 198, 193, + -92, 75, -92, -92, -92, 485, 299, 171, -92, 174, + -92, -92, -92, 74, 192, -92, 761, -92, 85, -92, + 96, 73, 14, 227, -92, 292, 131, -92, -92, 600, + 94, 123, 168, 176, -92, -92, -92, 511, 157, 761, + -92, -92, -92, 139, 1604, 1263, 761, 761, 761, 680, + 761, -92, -92, 761, 761, -92, -92, 761, -92, 761, + 761, -92, 761, 761, 90, 205, -92, -92, 761, 761, + 761, -92, -92, -92, 195, 761, 305, 761, 761, 761, + 761, 511, 761, 761, 761, 761, 761, 761, 203, 761, + 761, 761, 119, 77, 91, 191, 185, 188, 194, 222, + 415, 405, 432, 761, 9, 761, 81, 1516, 761, 761, + -92, -92, -92, -92, -92, -92, -92, -92, -92, -92, + -92, -92, -92, -92, -92, -92, -92, -92, -92, -92, + -92, -92, -92, -92, -92, -92, -92, -92, -92, -92, + -92, -92, -92, -92, 108, 761, -92, -92, 82, 67, + -92, 761, -92, -92, -92, -92, 761, -92, -92, -92, + -92, -92, -92, -92, -92, -92, -92, -92, -92, -92, + 761, 70, 761, 761, 78, 71, 761, -92, 1516, 761, + 761, -92, 102, -92, 62, -92, -92, 59, -92, 214, + 68, 60, -92, 255, -92, 55, 1780, -92, -92, -92, + -92, -92, 232, -92, -92, 69, -92, -92, -92, -92, + -92, -92, 1780, -92, -92, 344, 359, 95, 1868, 65, + 246, 76, 58, 2044, 64, 761, -92, 63, 48, 761, + 40, 39, 49, -92, -92, -92, -92, -92, -92, -92, + -92, 104, -92, -92, -92, -92, 86, -92, -92, -92, + -92, -92, -92, -4, 50, 761, 129, 118, -92, -92, + 842, -92, 88, 43, -12, -92, 373, 66, 32, 536, + 151, 124, 442, 264, 250, 761, 373, 761, 761, 761, + 761, 329, 761, 761, 761, 761, 761, 244, 270, 280, + 271, 245, 352, 442, 335, 761, -74, 761, 4, 761, + -92, 600, 761, -92, 761, 2, -52, 761, -40, 1868, + -92, 761, 127, 1868, -92, 761, -34, 761, 761, 15, + 12, 761, -92, -1, 111, -16, -92, -92, 761, -92, + 261, 761, -92, -31, 761, -36, 1868, -92, 761, 107, + 1868, -92, -14, 237, -49, -32, 1780, -23, -92, 1868, + -92, 761, 92, 1868, -10, 1868, -92, 51, 54, 26, + -92, -92, 1868, 24, 319, 57, 333, 79, 761, 1868, + 56, 29, 263, 42, 19, 680, 30, 31, -92, 927, + -92, 28, 0, 22, 761, 33, 13, 761, 36, 761, + 5, -3, 761, -92, 1692, 44, -92, -92, -92, -92, + -92, -92, 761, -92, -92, -92, -92, 175, -92, 761, + -58, -92, 1868, -92, 89, -92, -92, 1868, -92, 761, + 100, 35, -92, 23, -92, 16, 116, 761, -92, 8, + 11, -92, -28, -92, 1868, -92, 98, 1868, -92, 226, + -92, -92, 103, 1868, -13, -92, -24, -8, -92, 169, + -37, -7, -92, -92, -92, -92, 761, 125, 1868, -92, + 761, 126, 1868, -92, -92, 138, 1011, -92, -92, 1179, + -92, -92, 1095, -92, -92, -92, -92, -92, -92, 121, + -92, -92, -92, -92, -92, -92, -92, -5, 18, 224, + -92, 761, -92, 212, -92, -92, -33, 172, 61, -60, + 214, 140, 214, -92, -92, -92, -92, -92, 1428, -92, + -92, -92, 307, -92, -92, 1956, 1347, -92, 83, -92, + -92, 316, 47, 336, 114, 761, 1868, 52, 21, 290, + 46, 20, 680, 45, 53, -92, 927, -92, 37, 6, + 38, 761, 41, 17, 761, 27, 761, 3, 25, 34, + 105, -92, 342, -92, -92, -92, -92, -9, -92, 183, + -92, -92, 761, -92, -92, 214, -92, -92, -92, - -104, -104, -104, -104, -4, 75, -104, -104, -104, -104, - -104, -104, -104, -104, -104, -104, -104, -104, -104, -104, - -17, 331, -104, -104, -104, -104, -104, -1, -104, -104, - -104, -104, -104, -104, 259, -104, -15, -104, 4, -104, - -104, -104, -104, -104, -104, 9, -104, -104, -104, -104, - -104, -104, -104, -104, -104, -104, -104, -104, -43, -104, - -104, -104, -104, -104, -104, -104, -104, -104, 61, -104, - -104, -104, -7, -104, -3, 13, 116, 124, 133, 121, - -104, -104, 99, 67, -104, -104, 77, -104, 96, 92, - -104, 84, 90, -104, -104, -104, -104, 163, 86, 80, - -104, -104, -104, -104, 100, -104, 83, 64, 66, 158, - -104, 156, 117, 120, 105, 135, 141, -104, 150, 139, - 129, -104, -104, -104, -104, -104, -104, -104, -104, -104, - -104, -104, 137, -104, 142, -104, 165, 31, 17, -104, - -104, -104, -104, -104, -104, -104, -104, -104, -104, -104, + -104, -104, 87, -104, 69, 82, -104, -104, -104, -104, + -104, -104, -104, -104, -104, 49, -104, -104, -104, -104, + -104, 45, -104, 50, -104, -104, -104, -104, -104, -104, + -104, -104, -104, 253, -104, -104, -104, -104, 26, -104, + -104, -104, -104, -104, -104, 261, -104, 1, -104, -7, + -104, -104, -104, -104, -104, -104, -11, -104, -104, -104, + -104, -104, -104, -104, -104, -104, -104, -104, -104, -38, + -104, -104, -104, -104, -104, -104, -104, -104, -104, 135, + -104, -104, -104, 11, -104, -16, 8, 139, 147, 148, + 144, -104, -104, 138, 127, -104, -104, 115, -104, 119, + 150, -104, 120, 125, -104, -104, -104, -104, 116, 232, + 172, -104, -104, -104, -104, 171, -104, 151, 154, 158, + 161, -104, 163, 165, 143, 126, 64, 68, -104, 80, + 86, 61, -104, -104, -104, -104, -104, -104, -104, -104, + -104, -104, -104, 63, -104, 67, -104, 74, 20, 6, -104, -104, -104, -104, -104, -104, -104, -104, -104, -104, -104, -104, -104, -104, -104, -104, -104, -104, -104, -104, - -104, -104, -104, -104, 21, -104, -104, -104, -104, -104, - 34, -104, -104, -104, -104, 43, -104, -104, -104, -104, - -104, -104, -104, -104, -104, -104, -104, -104, -104, 45, - -104, 91, 46, -104, -104, 48, -104, 232, 140, 56, - -104, -104, -104, -104, -104, -104, -104, -104, 39, -104, - -104, -104, 33, -104, -104, -10, -104, -104, -104, -104, -104, -104, -104, -104, -104, -104, -104, -104, -104, -104, - -104, 58, -104, -104, 36, 37, -104, 8, -104, 14, - -104, -104, -104, -104, 41, -104, -104, -104, 40, 38, + -104, -104, -104, -104, -104, 28, -104, -104, -104, -104, + -104, 14, -104, -104, -104, -104, 12, -104, -104, -104, -104, -104, -104, -104, -104, -104, -104, -104, -104, -104, + 89, -104, 94, 31, -104, -104, 38, -104, 204, 51, + 102, -104, -104, -104, -104, -104, -104, -104, -104, 7, + -104, -104, -104, 16, -104, -104, -59, -104, -104, -104, -104, -104, -104, -104, -104, -104, -104, -104, -104, -104, - -104, -104, -104, -104, 47, -104, -104, -104, -104, 104, + -104, -104, 44, -104, -104, 92, 19, -104, -41, -104, + 24, -104, -104, -104, -104, 5, -104, -104, -104, -4, + -8, -104, -104, -104, -104, -104, -104, -104, -104, -104, -104, -104, -104, -104, -104, -104, -104, -104, -104, -104, - -104, -104, -104, 44, 192, -104, 202, 211, 208, 205, - -104, 53, 29, 42, 60, 68, -104, -104, -104, -104, - -104, -104, -104, -104, 170, -104, 189, -104, 168, -104, - -104, 166, -104, 78, -104, -104, 57, -104, 10, -104, - 49, -104, -11, -104, 172, -104, 176, 169, -104, -104, - 162, -104, -104, -104, -104, -104, -104, 217, -104, 178, - 182, -104, -104, 175, -104, -29, -104, 27, -104, 16, - -104, -104, 89, -104, -104, 126, -104, -104, -28, -104, - 24, -104, -32, -104, -33, -104, -104, -104, -104, -104, - -104, -35, -104, 19, -104, 20, -104, 112, -18, -104, - -104, 28, -104, -104, 134, -104, -104, -104, 35, -104, - -104, -104, -104, 30, -104, 32, 132, -104, 136, -104, - -104, 15, -104, 2, -104, -104, -104, -104, -104, -104, - -104, 51, -104, -104, -104, -104, -104, -104, 155, -104, - -104, 22, -104, -104, -104, -104, 23, -104, 52, -104, - -104, -104, -104, -104, -25, -104, 55, -104, -26, -104, - -104, -104, -104, 18, -104, -104, 25, -104, -104, -104, - -104, -104, -104, -85, -104, -104, -6, -104, 50, -104, - -13, -104, -104, -104, -104, -2, -104, -53, -104, 12, - -104, -39, -104, -104, -104, 1, -104, -104, 125, -104, - -104, -14, -104, -104, -104, -104, -104, -104, -104, -104, + -104, -104, -104, -104, -104, 52, -104, -104, -104, -104, + 91, -104, -104, -104, -104, -104, -104, -104, -104, -104, + -104, -104, -104, -104, 66, 185, -104, 177, 173, 176, + 188, -104, 88, 95, 97, 107, 101, -104, -104, -104, + -104, -104, -104, -104, -104, 212, -104, 187, -104, 199, + -104, -104, 201, -104, 108, -104, -104, 100, -104, -14, + -104, 34, -104, -20, -104, 200, -104, 211, 209, -104, + -104, 202, -104, -104, -104, -104, -104, -104, 186, -104, + 90, 98, -104, -104, 85, -104, -22, -104, 37, -104, + -10, -104, -104, 81, -104, -104, 43, -104, -104, -15, + -104, 32, -104, -24, -104, -34, -104, -104, -104, -104, + -104, -104, -32, -104, 92, -104, 33, -104, 76, -27, + -104, -104, 36, -104, -104, 114, -104, -104, -104, 25, + -104, -104, -104, -104, 18, -104, 59, 79, -104, 83, + -104, -104, 42, -104, 39, -104, -104, -104, -104, -104, + -104, -104, 55, -104, -104, -104, -104, -104, -104, 166, + -104, -104, 15, -104, -104, -104, -104, -3, -104, 46, + -104, -104, -104, -104, -104, -23, -104, 53, -104, -26, + -104, -104, -104, -104, -21, -104, -104, -73, -104, -104, + -104, -104, -104, -104, -94, -104, -104, 0, -104, 22, + -104, 13, -104, -104, -104, -104, 3, -104, -47, -104, + 9, -104, -49, -104, -104, -104, -19, -104, -104, 169, + -104, -104, -25, -104, -104, -104, -104, -104, -104, -104, -104, -104, -104, -104, -104, -104, -104, -104, -104, -104, - -9, -104, -104, -104, -104, -104, 5, -104, -104, -12, - 11, -20, -104, -104, -104, -104, -104, 257, -104, -104, - -104, 3, -104, -104, -104, 214, -104, -104, -104, -104, - -19, -104, 7, -104, 54, -49, -104, -104, -5, -104, - -104, 81, -104, -104, -104, 6, -104, -104, -104, -104, - 0, -104, -8, 74, -104, 95, -104, -104, -104, -104, - -104, 238, -104, -104, -104, -104, -104, -104, -104, -104, - -104, -31, -104, -104, 62, -104, -104, -104}; + -104, -13, -104, -104, -104, -104, -104, 10, -104, -104, + -6, -18, 4, -104, -104, -104, -104, -104, 264, -104, + -104, -104, 48, -104, -104, -104, 330, -104, -104, -104, + -104, 92, -104, 71, -104, 60, 21, -104, -104, 70, + -104, -104, 57, -104, -104, -104, 23, -104, -104, -104, + -104, 35, -104, 47, 41, -104, 56, -104, -104, -104, + -104, -104, 73, -104, -104, -104, -104, -104, -104, -104, + -104, -104, 54, -104, -104, 72, -104, -104, -104}; const int QmlJSGrammar::action_info [] = { - 526, 338, 533, 384, 336, 456, 377, 174, 433, 423, - 421, 472, 440, 476, 344, 367, 324, 350, 478, 357, - 374, 375, 472, 480, 304, 365, 372, 363, 326, -105, - 591, 472, -107, 448, -83, 463, -84, -110, -83, 431, - 485, 485, -105, -107, 489, 456, 456, 472, 518, -110, - -102, 380, 380, -80, 289, 530, 448, -113, -102, -80, - 372, 435, 289, -113, -84, 344, 452, 199, 446, 441, - 489, -70, 462, 380, 43, 378, 268, 104, 304, 2, - 289, 328, 472, 597, 448, 326, 205, 132, 199, 134, - 284, 104, 180, 222, 485, 174, 489, 2, 475, 174, - 225, 324, 174, 525, 498, 0, 0, 218, 459, 174, - 174, 174, 476, 174, 466, 174, 0, 132, 91, 0, - 333, 0, 91, 0, 0, 20, 174, 174, 0, 92, - 38, 283, 182, 92, 359, 7, 274, 273, -94, 0, - 214, 224, 174, 21, 134, 0, 0, 487, 91, 279, - 278, 286, 499, 460, 450, 95, 281, 280, 212, 92, - 0, 509, 12, 491, 12, 369, 96, 281, 280, 91, - 288, 287, 445, 444, 175, 281, 280, 346, 201, 342, - 92, 347, 202, 585, 584, 9, 8, 360, 537, 39, - 118, 118, 119, 119, 382, 118, 20, 119, 12, 13, - 16, 13, 16, 120, 120, 12, 174, 118, 120, 119, - 118, 594, 119, 118, 21, 119, 12, 118, 174, 119, - 120, 0, 581, 120, 39, 118, 120, 119, 207, 0, - 120, 118, 0, 119, 41, 13, 16, 12, 120, 0, - 12, 97, 13, 16, 120, 40, 12, 208, 97, 438, - 174, 97, 39, 13, 16, 520, 0, 12, 174, 267, - 266, 39, 0, 12, 595, 593, 118, 0, 119, 41, - 582, 470, 469, 0, 13, 16, 12, 13, 16, 120, - 40, 45, 12, 13, 16, 12, 98, 12, 306, 307, - 0, 0, 99, 98, 13, 16, 98, 41, 0, 99, - 13, 16, 99, 524, 523, 118, 41, 119, 40, 521, - 519, 184, 183, 13, 16, 308, 309, 40, 120, 13, - 16, 0, 13, 16, 13, 16, 118, 118, 119, 119, - 136, 306, 307, 0, 0, 46, 44, 106, 107, 120, - 120, 106, 107, 12, 0, 174, 12, 0, 0, 137, - -324, 138, 0, -324, 0, 0, 12, 0, 308, 309, - 0, 0, 0, 12, 108, 109, 0, 12, 108, 109, - 21, 207, 0, 311, 312, 0, 12, 0, 12, 0, - 13, 16, 313, 13, 16, 314, 15, 315, 12, 0, - 208, 0, 209, 13, 16, 272, 271, 15, 267, 266, - 13, 16, 12, 0, 13, 16, 0, 0, 277, 276, - 272, 271, 14, 13, 16, 13, 16, 12, 311, 312, - 277, 276, 0, 14, 0, 13, 16, 313, 0, 0, - 314, 0, 315, 0, 272, 271, 0, 0, 0, 13, - 16, 0, 0, 0, 0, 0, 0, 311, 312, 277, - 276, 0, 0, 0, 13, 16, 313, 111, 112, 314, - 0, 315, 0, 0, 0, 113, 114, 111, 112, 115, - 0, 116, 0, 0, 0, 113, 114, 111, 112, 115, - 0, 116, 0, 0, 0, 113, 114, 111, 112, 115, - 0, 116, 0, 0, 0, 113, 114, 111, 112, 115, - 26, 116, 0, 0, 0, 113, 114, 0, 0, 115, - 0, 116, 27, 0, 0, 311, 312, 0, 0, 12, - 0, 0, 0, 0, 313, 0, 0, 314, 0, 315, - 186, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 187, 0, 0, 0, 188, 29, 0, 0, 0, 15, - 0, 0, 0, 189, 0, 190, 28, 30, 0, 0, - 0, 0, 0, 0, 31, 0, 191, 0, 192, 95, - 0, 0, 0, 25, 186, 14, 193, 0, 0, 194, - 96, 0, 0, 26, 187, 195, 0, 0, 188, 0, - 0, 196, 0, 0, 0, 27, 0, 189, 0, 190, - 0, 0, 12, 0, 0, 0, 197, 0, 0, 0, - 191, 0, 192, 95, 0, 0, 0, 0, 0, 0, - 193, 0, 0, 194, 96, 0, 0, 0, 535, 195, - 0, 0, 15, 0, 0, 196, 0, 0, 0, 28, - 30, 0, 0, 0, 0, 0, 0, 31, 0, 0, - 197, 0, 0, 0, 0, 0, 25, 0, 14, 0, - 0, 0, 0, 0, 186, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 187, 0, 0, 0, 188, 0, - 0, 0, 0, 0, 0, 0, 0, 189, 0, 190, - 0, 0, 340, 0, 0, 0, 0, 0, 0, 0, - 191, 0, 192, 95, 0, 0, 0, 0, 0, 0, - 193, 0, 0, 194, 96, 0, 0, 0, 0, 195, - 0, 0, 0, 0, 0, 196, 0, 0, 0, 0, + 544, 386, 451, 537, 337, 315, 395, 487, 602, 347, + 185, 385, 489, 467, 335, 378, 368, 355, 474, 361, + 349, 467, 383, 491, 376, 483, 483, 473, 467, -111, + 374, 383, 388, 500, -116, -89, 459, -108, -90, 496, + -113, 496, 459, -116, -89, -111, 483, 529, -113, -86, + 483, 442, -108, -86, -119, 391, 391, 300, 432, -100, + -90, 500, 434, -100, -119, 300, 337, -76, 463, 541, + 457, 452, 294, 483, 339, 496, 233, 2, 216, 446, + 210, 444, 115, 389, 459, 500, 295, 145, 236, 315, + 191, 335, 145, 344, 391, 229, 210, 115, 2, 608, + 185, 300, 0, 54, 536, 477, 185, 0, 185, 486, + 185, 0, 23, 592, 0, 185, 185, 102, 143, 370, + 235, 143, 225, 487, 279, 102, 470, 193, 103, 185, + 33, 102, 106, 185, 185, 185, 103, 185, 49, 185, + 292, 291, 103, 107, 596, 595, 509, 290, 289, 0, + 456, 455, 393, 355, 20, 19, 292, 291, 223, 102, + 461, 593, 27, 26, 186, 285, 284, 380, 8, 50, + 103, 471, 371, 212, 357, 292, 291, 213, 358, 299, + 298, 520, 129, 218, 130, 498, 502, 353, 108, 297, + 218, 605, 195, 194, 510, 131, 17, 16, 8, 56, + 8, 50, 219, 50, 220, 9, 12, 108, 0, 219, + 129, 449, 130, 129, 52, 130, 129, 108, 130, 129, + 185, 130, 50, 131, 15, 51, 131, 8, 129, 131, + 130, 531, 131, 109, 185, 9, 12, 9, 12, 110, + 185, 131, 147, 8, 606, 604, 52, 129, 52, 130, + 0, 0, 109, 57, 55, 0, 0, 51, 110, 51, + 131, 148, 109, 149, 9, 12, 8, 52, 110, 129, + 129, 130, 130, 535, 534, 8, 0, 0, 51, 8, + 9, 12, 131, 131, 8, 532, 530, 481, 480, 129, + 8, 130, 8, 278, 277, 129, 129, 130, 130, -330, + 23, 0, 131, 9, 12, 129, 548, 130, 131, 131, + 117, 118, 9, 12, 23, 185, 9, 12, 131, 8, + 0, 9, 12, 117, 118, 0, -330, 9, 12, 9, + 12, 0, 33, 0, 0, 0, 0, 119, 120, 0, + 33, 0, 0, 0, 0, 8, 24, 22, 8, 0, + 119, 120, 322, 323, 0, 0, 9, 12, 322, 323, + 0, 324, 8, 0, 325, 8, 326, 324, 278, 277, + 325, 8, 326, 8, 21, 322, 323, 283, 282, 0, + 283, 282, 9, 12, 324, 9, 12, 325, 8, 326, + 0, 317, 318, 8, 288, 287, 0, 288, 287, 9, + 12, 11, 9, 12, 0, 283, 282, 0, 9, 12, + 9, 12, 0, 0, 0, 0, 0, 0, 319, 320, + 288, 287, 0, 11, 8, 9, 12, 10, 122, 123, + 9, 12, 0, 0, 0, 0, 124, 125, 122, 123, + 126, 0, 127, 0, 0, 0, 124, 125, 0, 10, + 126, 0, 127, 0, 11, 122, 123, 0, 0, 0, + 13, 9, 12, 124, 125, 322, 323, 126, 0, 127, + 0, 0, 37, 0, 324, 0, 0, 325, 0, 326, + 10, 0, 0, 0, 38, 0, 0, 0, 0, 0, + 0, 8, 0, 0, 0, 37, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 38, 0, 0, + 0, 0, 0, 0, 8, 0, 0, 40, 0, 0, + 0, 11, 0, 0, 0, 0, 0, 0, 39, 41, + 0, 0, 0, 0, 122, 123, 42, 0, 0, 197, + 546, 0, 124, 125, 11, 36, 126, 10, 127, 198, + 0, 39, 41, 199, 0, 0, 0, 0, 0, 42, + 0, 0, 200, 0, 201, 0, 0, 351, 36, 0, + 10, 0, 0, 0, 0, 202, 0, 203, 106, 0, + 0, 0, 0, 0, 0, 204, 0, 0, 205, 107, + 0, 0, 0, 0, 206, 0, 0, 0, 0, 0, + 207, 0, 0, 197, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 198, 0, 208, 0, 199, 0, 0, + 0, 0, 0, 0, 0, 0, 200, 0, 201, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 202, + 0, 203, 106, 0, 0, 0, 0, 0, 0, 204, + 0, 0, 205, 107, 0, 0, 0, 0, 206, 0, + 0, 0, 0, 0, 207, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 208, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 197, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 69, 70, 0, 0, 0, 0, 0, 0, - 0, 0, 72, 0, 0, 0, 0, 0, 0, 12, - 0, 0, 0, 73, 74, 0, 75, 0, 0, 0, - 0, 0, 0, 78, 0, 0, 0, 81, 0, 0, + 0, 0, 80, 81, 0, 0, 0, 0, 0, 0, + 0, 0, 83, 0, 0, 0, 0, 0, 0, 8, + 0, 0, 0, 84, 85, 0, 86, 0, 0, 0, + 0, 0, 0, 89, 0, 0, 0, 92, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 84, 13, 16, 0, 85, + 0, 0, 0, 0, 0, 95, 9, 12, 0, 96, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 80, 87, 71, 0, 0, 0, 0, 0, 0, 0, - 0, 68, 69, 70, 0, 0, 0, 0, 0, 0, - 0, 0, 72, 0, 0, 0, 0, 0, 0, 12, - 0, 0, 0, 73, 74, 0, 75, 0, 0, 0, - 76, 0, 77, 78, 79, 0, 0, 81, 0, 0, - 0, 82, 0, 83, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 84, 13, 16, 0, 85, - 0, 86, 0, 88, 0, 89, 0, 0, 0, 0, - 80, 87, 71, 0, 0, 0, 0, 0, 0, 0, - 0, -103, 0, 0, 0, 68, 69, 70, 0, 0, - 0, 0, 0, 0, 0, 0, 72, 0, 0, 0, - 0, 0, 0, 12, 0, 0, 0, 73, 74, 0, - 75, 0, 0, 0, 76, 0, 77, 78, 79, 0, - 0, 81, 0, 0, 0, 82, 0, 83, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 84, - 13, 16, 0, 85, 0, 86, 0, 88, 0, 89, - 0, 0, 0, 0, 80, 87, 71, 0, 0, 0, - 0, 0, 0, 0, 0, 68, 69, 70, 0, 0, - 0, 0, 0, 0, 0, 0, 72, 0, 0, 0, - 0, 0, 0, 12, 0, 0, 0, 73, 74, 0, - 75, 0, 0, 0, 76, 0, 77, 78, 79, 0, - 0, 81, 0, 0, 0, 82, 0, 83, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 84, - 13, 16, 0, 85, 0, 86, 0, 88, 303, 89, - 0, 0, 0, 0, 80, 87, 71, 0, 0, 0, - 0, 0, 0, 0, 0, 496, 0, 0, 68, 69, - 70, 0, 0, 0, 0, 0, 0, 0, 0, 72, - 0, 0, 0, 0, 0, 0, 12, 0, 0, 0, - 73, 74, 0, 75, 0, 0, 0, 76, 0, 77, - 78, 79, 0, 0, 81, 0, 0, 0, 82, 0, - 83, 0, 0, 502, 0, 0, 0, 0, 0, 0, - 0, 0, 84, 13, 16, 0, 85, 0, 86, 0, - 88, 0, 89, 0, 0, 0, 0, 80, 87, 71, - 0, 0, 0, 0, 0, 0, 0, 0, 504, 0, - 0, 68, 69, 70, 0, 0, 0, 0, 0, 0, - 0, 0, 72, 0, 0, 0, 0, 0, 0, 12, - 0, 0, 0, 73, 74, 0, 75, 0, 0, 0, - 76, 0, 77, 78, 79, 0, 0, 81, 0, 0, - 0, 82, 0, 83, 0, 0, 505, 0, 0, 0, - 0, 0, 0, 0, 0, 84, 13, 16, 0, 85, - 0, 86, 0, 88, 0, 89, 0, 0, 0, 0, - 80, 87, 71, 0, 0, 0, 0, 0, 0, 0, - 0, 496, 0, 0, 68, 69, 70, 0, 0, 0, - 0, 0, 0, 0, 0, 72, 0, 0, 0, 0, - 0, 0, 12, 0, 0, 0, 73, 74, 0, 75, - 0, 0, 0, 76, 0, 77, 78, 79, 0, 0, - 81, 0, 0, 0, 82, 0, 83, 0, 0, 497, - 0, 0, 0, 0, 0, 0, 0, 0, 84, 13, - 16, 0, 85, 0, 86, 0, 88, 0, 89, 0, - 0, 0, 0, 80, 87, 71, 0, 0, 0, 0, - 0, 0, 0, 0, 504, 0, 0, 68, 69, 70, - 0, 0, 0, 0, 0, 0, 0, 0, 72, 0, - 0, 0, 0, 0, 0, 12, 0, 0, 0, 73, - 74, 0, 75, 0, 0, 0, 76, 0, 77, 78, - 79, 0, 0, 81, 0, 0, 0, 82, 0, 83, - 0, 0, 507, 0, 0, 0, 0, 0, 0, 0, - 0, 84, 13, 16, 0, 85, 0, 86, 0, 88, - 0, 89, 0, 0, 0, 0, 80, 87, 71, 0, - 0, 0, 0, 0, 0, 0, 0, 496, 0, 0, - 68, 69, 70, 0, 0, 0, 0, 0, 0, 0, - 0, 72, 0, 0, 0, 0, 0, 0, 12, 0, - 0, 0, 73, 74, 0, 75, 0, 0, 0, 76, - 0, 77, 78, 79, 0, 0, 81, 0, 0, 0, - 82, 0, 83, 0, 0, 497, 0, 0, 15, 0, - 0, 0, 0, 0, 84, 13, 16, 0, 85, 0, - 86, 0, 88, 0, 89, 0, 0, 0, 0, 80, - 87, 71, 0, 0, 14, 0, 0, 0, 0, 0, - 68, 69, 70, 0, 0, 0, 0, 0, 0, 0, - 0, 72, 0, 0, 0, 0, 0, 0, 12, 251, - 0, 0, 544, 545, 0, 75, 0, 0, 0, 76, - 0, 77, 78, 79, 0, 0, 81, 0, 0, 0, - 82, 0, 83, 0, 0, 0, 0, 0, 0, 0, - 255, 0, 0, 0, 84, 13, 16, 0, 85, 0, - 86, 0, 88, 0, 89, 0, 0, 0, 0, 80, - 87, 71, 0, 246, 0, 546, 0, 0, 0, 0, - 142, 143, 144, 0, 0, 146, 148, 149, 0, 0, - 150, 0, 151, 0, 0, 0, 153, 154, 155, 0, - 0, 0, 0, 0, 0, 12, 156, 157, 158, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 159, + 91, 98, 82, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 79, 80, 81, 0, 0, 0, 0, 0, + 0, 0, 0, 83, 0, 0, 0, 0, 0, 0, + 8, 0, 0, 0, 84, 85, 0, 86, 0, 0, + 0, 87, 0, 88, 89, 90, 0, 0, 92, 0, + 0, 0, 93, 0, 94, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 95, 9, 12, 0, + 96, 0, 97, 0, 99, 0, 100, 0, 0, 0, + 0, 91, 98, 82, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 79, 80, 81, 0, 0, 0, 0, + 0, 0, 0, 0, 83, 0, 0, 0, 0, 0, + 0, 8, 0, 0, 0, 84, 85, 0, 86, 0, + 0, 0, 87, 0, 88, 89, 90, 0, 0, 92, + 0, 0, 0, 93, 0, 94, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 95, 9, 12, + 0, 96, 0, 97, 0, 99, 314, 100, 0, 0, + 0, 0, 91, 98, 82, 0, 0, 0, 0, 0, + 0, 0, 0, 0, -109, 0, 0, 0, 79, 80, + 81, 0, 0, 0, 0, 0, 0, 0, 0, 83, + 0, 0, 0, 0, 0, 0, 8, 0, 0, 0, + 84, 85, 0, 86, 0, 0, 0, 87, 0, 88, + 89, 90, 0, 0, 92, 0, 0, 0, 93, 0, + 94, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 95, 9, 12, 0, 96, 0, 97, 0, + 99, 0, 100, 0, 0, 0, 0, 91, 98, 82, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 515, + 0, 0, 79, 80, 81, 0, 0, 0, 0, 0, + 0, 0, 0, 83, 0, 0, 0, 0, 0, 0, + 8, 0, 0, 0, 84, 85, 0, 86, 0, 0, + 0, 87, 0, 88, 89, 90, 0, 0, 92, 0, + 0, 0, 93, 0, 94, 0, 0, 518, 0, 0, + 0, 0, 0, 0, 0, 0, 95, 9, 12, 0, + 96, 0, 97, 0, 99, 0, 100, 0, 0, 0, + 0, 91, 98, 82, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 515, 0, 0, 79, 80, 81, 0, + 0, 0, 0, 0, 0, 0, 0, 83, 0, 0, + 0, 0, 0, 0, 8, 0, 0, 0, 84, 85, + 0, 86, 0, 0, 0, 87, 0, 88, 89, 90, + 0, 0, 92, 0, 0, 0, 93, 0, 94, 0, + 0, 516, 0, 0, 0, 0, 0, 0, 0, 0, + 95, 9, 12, 0, 96, 0, 97, 0, 99, 0, + 100, 0, 0, 0, 0, 91, 98, 82, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 507, 0, 0, + 79, 80, 81, 0, 0, 0, 0, 0, 0, 0, + 0, 83, 0, 0, 0, 0, 0, 0, 8, 0, + 0, 0, 84, 85, 0, 86, 0, 0, 0, 87, + 0, 88, 89, 90, 0, 0, 92, 0, 0, 0, + 93, 0, 94, 0, 0, 513, 0, 0, 0, 0, + 0, 0, 0, 0, 95, 9, 12, 0, 96, 0, + 97, 0, 99, 0, 100, 0, 0, 0, 0, 91, + 98, 82, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 507, 0, 0, 79, 80, 81, 0, 0, 0, + 0, 0, 0, 0, 0, 83, 0, 0, 0, 0, + 0, 0, 8, 0, 0, 0, 84, 85, 0, 86, + 0, 0, 0, 87, 0, 88, 89, 90, 0, 0, + 92, 0, 0, 0, 93, 0, 94, 0, 0, 508, + 0, 0, 0, 0, 0, 0, 0, 0, 95, 9, + 12, 0, 96, 0, 97, 0, 99, 0, 100, 0, + 0, 0, 0, 91, 98, 82, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 507, 0, 0, 79, 80, + 81, 0, 0, 0, 0, 0, 0, 0, 0, 83, + 0, 0, 0, 0, 0, 0, 8, 0, 0, 0, + 84, 85, 0, 86, 0, 0, 0, 87, 0, 88, + 89, 90, 0, 0, 92, 0, 0, 0, 93, 0, + 94, 0, 0, 508, 0, 0, 11, 0, 0, 0, + 0, 0, 95, 9, 12, 0, 96, 0, 97, 0, + 99, 0, 100, 0, 0, 0, 0, 91, 98, 82, + 0, 0, 10, 0, 0, 0, 0, 0, 0, 79, + 80, 81, 0, 0, 0, 0, 0, 0, 0, 0, + 83, 0, 0, 0, 0, 0, 0, 8, 262, 0, + 0, 555, 556, 0, 86, 0, 0, 0, 87, 0, + 88, 89, 90, 0, 0, 92, 0, 0, 0, 93, + 0, 94, 0, 0, 0, 0, 0, 0, 0, 266, + 0, 0, 0, 95, 9, 12, 0, 96, 0, 97, + 0, 99, 0, 100, 0, 0, 0, 0, 91, 98, + 82, 0, 257, 0, 557, 0, 0, 0, 0, 0, + 153, 154, 155, 0, 0, 157, 159, 160, 0, 0, + 161, 0, 162, 0, 0, 0, 164, 165, 166, 0, + 0, 0, 0, 0, 0, 8, 167, 168, 169, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 170, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 162, 0, 0, 0, 0, - 0, 0, 13, 16, 163, 164, 165, 0, 167, 168, - 169, 170, 171, 172, 0, 0, 160, 166, 152, 145, - 147, 161, 0, 0, 0, 0, 0, 142, 143, 144, - 0, 0, 146, 148, 149, 0, 0, 150, 0, 151, - 0, 0, 0, 153, 154, 155, 0, 0, 0, 0, - 0, 0, 425, 156, 157, 158, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 159, 0, 0, 0, - 426, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 162, 0, 0, 0, 0, 0, 430, 427, - 429, 163, 164, 165, 0, 167, 168, 169, 170, 171, - 172, 0, 0, 160, 166, 152, 145, 147, 161, 0, - 0, 0, 0, 0, 142, 143, 144, 0, 0, 146, - 148, 149, 0, 0, 150, 0, 151, 0, 0, 0, - 153, 154, 155, 0, 0, 0, 0, 0, 0, 425, - 156, 157, 158, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 159, 0, 0, 0, 426, 0, 0, - 0, 0, 0, 0, 0, 428, 0, 0, 0, 162, - 0, 0, 0, 0, 0, 430, 427, 429, 163, 164, - 165, 0, 167, 168, 169, 170, 171, 172, 0, 0, - 160, 166, 152, 145, 147, 161, 0, 0, 0, 0, - 0, 244, 0, 0, 0, 0, 245, 0, 68, 69, - 70, 247, 0, 0, 0, 0, 0, 0, 248, 72, - 0, 0, 0, 0, 0, 0, 250, 251, 0, 0, - 252, 74, 0, 75, 0, 0, 0, 76, 0, 77, - 78, 79, 0, 0, 81, 0, 0, 0, 82, 0, - 83, 0, 0, 0, 0, 0, 254, 0, 255, 0, - 0, 0, 84, 253, 256, 257, 85, 258, 86, 259, - 88, 31, 89, 260, 261, 0, 0, 80, 87, 71, - 25, 246, 0, 0, 0, 0, 0, 0, 244, 0, - 0, 0, 0, 245, 0, 68, 69, 70, 247, 0, - 0, 0, 0, 0, 0, 248, 249, 0, 0, 0, - 0, 0, 0, 250, 251, 0, 0, 252, 74, 0, - 75, 0, 0, 0, 76, 0, 77, 78, 79, 0, - 0, 81, 0, 0, 0, 82, 0, 83, 0, 0, - 0, 0, 0, 254, 0, 255, 0, 0, 0, 84, - 253, 256, 257, 85, 258, 86, 259, 88, 31, 89, - 260, 261, 0, 0, 80, 87, 71, 25, 246, 0, - 0, 0, 0, 0, 0, 550, 143, 144, 0, 0, - 552, 148, 554, 69, 70, 555, 0, 151, 0, 0, - 0, 153, 557, 558, 0, 0, 0, 0, 0, 0, - 559, 560, 157, 158, 252, 74, 0, 75, 0, 0, - 0, 76, 0, 77, 561, 79, 0, 0, 563, 0, - 0, 0, 82, 0, 83, 0, 0, 0, 0, 0, - 565, 0, 255, 0, 0, 0, 567, 564, 566, 568, - 569, 570, 86, 572, 573, 574, 575, 576, 577, 0, - 0, 562, 571, 556, 551, 553, 161, 0, 0, 0, - 0, 0, 393, 143, 144, 0, 0, 395, 148, 397, - 69, 70, 398, 0, 151, 0, 0, 0, 153, 400, - 401, 0, 0, 0, 0, 0, 0, 402, 403, 157, - 158, 252, 74, 0, 75, 0, 0, 0, 76, 0, - 77, 404, 79, 0, 0, 406, 0, 0, 0, 82, - 0, 83, 0, -249, 0, 0, 0, 408, 0, 255, - 0, 0, 0, 410, 407, 409, 411, 412, 413, 86, - 415, 416, 417, 418, 419, 420, 0, 0, 405, 414, - 399, 394, 396, 161, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 173, 0, 0, 0, 0, + 0, 0, 9, 12, 174, 175, 176, 0, 178, 179, + 180, 181, 182, 183, 0, 0, 171, 177, 163, 156, + 158, 172, 0, 0, 0, 0, 0, 0, 153, 154, + 155, 0, 0, 157, 159, 160, 0, 0, 161, 0, + 162, 0, 0, 0, 164, 165, 166, 0, 0, 0, + 0, 0, 0, 436, 167, 168, 169, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 170, 0, 0, + 0, 437, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 173, 0, 0, 0, 0, 0, 441, + 438, 440, 174, 175, 176, 0, 178, 179, 180, 181, + 182, 183, 0, 0, 171, 177, 163, 156, 158, 172, + 0, 0, 0, 0, 0, 0, 153, 154, 155, 0, + 0, 157, 159, 160, 0, 0, 161, 0, 162, 0, + 0, 0, 164, 165, 166, 0, 0, 0, 0, 0, + 0, 436, 167, 168, 169, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 170, 0, 0, 0, 437, + 0, 0, 0, 0, 0, 0, 0, 439, 0, 0, + 0, 173, 0, 0, 0, 0, 0, 441, 438, 440, + 174, 175, 176, 0, 178, 179, 180, 181, 182, 183, + 0, 0, 171, 177, 163, 156, 158, 172, 0, 0, + 0, 0, 0, 0, 255, 0, 0, 0, 0, 256, + 0, 79, 80, 81, 258, 0, 0, 0, 0, 0, + 0, 259, 260, 0, 0, 0, 0, 0, 0, 261, + 262, 0, 0, 263, 85, 0, 86, 0, 0, 0, + 87, 0, 88, 89, 90, 0, 0, 92, 0, 0, + 0, 93, 0, 94, 0, 0, 0, 0, 0, 265, + 0, 266, 0, 0, 0, 95, 264, 267, 268, 96, + 269, 97, 270, 99, 42, 100, 271, 272, 0, 0, + 91, 98, 82, 36, 257, 0, 0, 0, 0, 0, + 0, 0, 255, 0, 0, 0, 0, 256, 0, 79, + 80, 81, 258, 0, 0, 0, 0, 0, 0, 259, + 83, 0, 0, 0, 0, 0, 0, 261, 262, 0, + 0, 263, 85, 0, 86, 0, 0, 0, 87, 0, + 88, 89, 90, 0, 0, 92, 0, 0, 0, 93, + 0, 94, 0, 0, 0, 0, 0, 265, 0, 266, + 0, 0, 0, 95, 264, 267, 268, 96, 269, 97, + 270, 99, 42, 100, 271, 272, 0, 0, 91, 98, + 82, 36, 257, 0, 0, 0, 0, 0, 0, 0, + 561, 154, 155, 0, 0, 563, 159, 565, 80, 81, + 566, 0, 162, 0, 0, 0, 164, 568, 569, 0, + 0, 0, 0, 0, 0, 570, 571, 168, 169, 263, + 85, 0, 86, 0, 0, 0, 87, 0, 88, 572, + 90, 0, 0, 574, 0, 0, 0, 93, 0, 94, + 0, 0, 0, 0, 0, 576, 0, 266, 0, 0, + 0, 578, 575, 577, 579, 580, 581, 97, 583, 584, + 585, 586, 587, 588, 0, 0, 573, 582, 567, 562, + 564, 172, 0, 0, 0, 0, 0, 0, 404, 154, + 155, 0, 0, 406, 159, 408, 80, 81, 409, 0, + 162, 0, 0, 0, 164, 411, 412, 0, 0, 0, + 0, 0, 0, 413, 414, 168, 169, 263, 85, 0, + 86, 0, 0, 0, 87, 0, 88, 415, 90, 0, + 0, 417, 0, 0, 0, 93, 0, 94, 0, -255, + 0, 0, 0, 419, 0, 266, 0, 0, 0, 421, + 418, 420, 422, 423, 424, 97, 426, 427, 428, 429, + 430, 431, 0, 0, 416, 425, 410, 405, 407, 172, + 0, 0, 0, 0, 0, 0, - 592, 10, 481, 532, 270, 522, 23, 471, 586, 482, - 477, 534, 486, 549, 468, 488, 217, 503, 217, 282, - 334, 185, 516, 55, 42, 529, 490, 508, 493, 492, - 275, 531, 506, 434, 424, 385, 383, 371, 381, 366, - 379, 368, 270, 275, 468, 173, 422, 471, 179, 334, - 282, 217, 176, 471, 468, 334, 223, 343, 242, 270, - 275, 285, 221, 341, 461, 181, 449, 352, 457, 465, - 93, 334, 0, 479, 198, 317, 282, 204, 339, 206, - 0, 17, 432, 93, 370, 586, 93, 179, 318, 0, - 442, 447, 334, 213, 93, 93, 464, 215, 11, 316, - 200, 93, 93, 467, 215, 93, 319, 93, 93, 93, - 514, 129, 221, 130, 320, 93, 436, 483, 93, 437, - 515, 93, 337, 102, 93, 93, 242, 93, 94, 101, - 110, 93, 93, 93, 103, 484, 93, 93, 484, 483, - 93, 93, 513, 335, 596, 298, 93, 0, 203, 105, - 302, 126, 501, 93, 211, 215, 500, 93, 93, 510, - 269, 93, 93, 124, 512, 93, 125, 511, 436, 436, - 93, 437, 437, 93, 123, 483, 93, 93, 93, 484, - 93, 127, 93, 93, 122, 373, 179, 128, 139, 334, - 133, 93, 439, 135, 242, 121, 334, 93, 141, 93, - 0, 352, 117, 330, 93, 131, 100, 330, 302, 330, - 330, 93, 302, 93, 302, 302, 302, 93, 302, 0, - 580, 0, 302, 376, 325, 351, 0, 0, 345, 332, - 93, 329, 349, 93, 348, 302, 0, 578, 302, 0, - 364, 327, 305, 93, 583, 493, 93, 362, 302, 93, - 310, 302, 93, 323, 302, 139, 322, 302, 330, 321, - 0, 11, 361, 302, 0, 141, 210, 536, 0, 0, - 35, 541, 538, 540, 542, 539, 543, 0, 0, 0, - 358, 0, 11, 24, 37, 0, 0, 0, 0, 0, + 545, 488, 533, 542, 66, 478, 514, 597, 482, 253, + 543, 479, 517, 232, 53, 504, 493, 228, 497, 503, + 345, 499, 234, 519, 501, 286, 196, 293, 490, 492, + 382, 540, 527, 479, 396, 184, 445, 190, 345, 286, + 345, 293, 228, 209, 394, 192, 377, 392, 354, 352, + 479, 25, 379, 390, 350, 18, 28, 475, 381, 187, + 560, 460, 215, 482, 472, 458, 222, 296, 476, 217, + 468, 435, 363, 433, 29, 482, 228, 286, 597, 7, + 150, 594, 104, 453, 494, 603, 443, 232, 7, 293, + 30, 0, 447, 7, 14, 448, 363, 104, 281, 495, + 345, 104, 104, 226, 104, 104, 134, 152, 104, 104, + 138, 253, 253, 345, 139, 345, 144, 104, 146, 226, + 104, 104, 494, 345, 104, 132, 495, 104, 0, 104, + 104, 133, 309, 190, 327, 104, 104, 313, 104, 224, + 387, 328, 104, 329, 211, 0, 280, 331, 104, 447, + 375, 214, 448, 330, 607, 0, 104, 104, 526, 111, + 104, 104, 494, 373, 105, 348, 104, 104, 104, 114, + 525, 0, 137, 346, 372, 0, 104, 384, 226, 104, + 104, 524, 521, 447, 104, 104, 448, 523, 104, 136, + 522, 104, 104, 495, 0, 104, 512, 190, 121, 104, + 511, 140, 104, 450, 104, 141, 104, 0, 142, 128, + 150, 135, 104, 104, 104, 113, 0, 104, 104, 313, + 116, 332, 313, 313, 333, 321, 104, 341, 104, 104, + 0, 313, 313, 313, 313, 316, 334, 152, 221, 338, + 341, 104, 341, 341, 0, 313, 313, 313, 313, 369, + 341, 0, 104, 104, 0, 313, 356, 313, 313, 7, + 46, 0, 340, 0, 343, 362, 336, 7, 46, 359, + 0, 547, 360, 104, 0, 112, 0, 35, 48, 552, + 549, 551, 553, 550, 554, 35, 48, 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, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 589, 0, 591, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 35, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 11, 24, 37, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 504, 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, 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, 0}; const int QmlJSGrammar::action_check [] = { - 36, 60, 60, 16, 61, 5, 55, 8, 55, 8, - 7, 33, 60, 20, 2, 31, 48, 7, 36, 17, - 60, 33, 33, 60, 1, 60, 36, 61, 78, 7, - 17, 33, 7, 36, 7, 7, 7, 7, 7, 7, - 36, 36, 7, 7, 36, 5, 5, 33, 29, 7, - 7, 36, 36, 7, 36, 8, 36, 7, 7, 7, - 36, 55, 36, 7, 7, 2, 33, 2, 7, 7, - 36, 33, 55, 36, 29, 7, 55, 1, 1, 88, - 36, 8, 33, 0, 36, 78, 7, 48, 2, 78, - 36, 1, 8, 8, 36, 8, 36, 88, 6, 8, - 33, 48, 8, 29, 8, -1, -1, 36, 10, 8, - 8, 8, 20, 8, 7, 8, -1, 48, 40, -1, - 61, -1, 40, -1, -1, 15, 8, 8, -1, 51, - 66, 76, 60, 51, 8, 65, 61, 62, 7, -1, - 60, 60, 8, 33, 78, -1, -1, 60, 40, 61, - 62, 60, 56, 55, 60, 42, 61, 62, 56, 51, - -1, 60, 29, 60, 29, 60, 53, 61, 62, 40, - 61, 62, 61, 62, 56, 61, 62, 50, 50, 60, - 51, 54, 54, 61, 62, 61, 62, 61, 7, 29, - 25, 25, 27, 27, 60, 25, 15, 27, 29, 66, - 67, 66, 67, 38, 38, 29, 8, 25, 38, 27, - 25, 8, 27, 25, 33, 27, 29, 25, 8, 27, - 38, -1, 8, 38, 29, 25, 38, 27, 15, -1, - 38, 25, -1, 27, 74, 66, 67, 29, 38, -1, - 29, 12, 66, 67, 38, 85, 29, 34, 12, 36, - 8, 12, 29, 66, 67, 7, -1, 29, 8, 61, - 62, 29, -1, 29, 61, 62, 25, -1, 27, 74, - 56, 61, 62, -1, 66, 67, 29, 66, 67, 38, - 85, 7, 29, 66, 67, 29, 57, 29, 18, 19, - -1, -1, 63, 57, 66, 67, 57, 74, -1, 63, - 66, 67, 63, 61, 62, 25, 74, 27, 85, 61, - 62, 61, 62, 66, 67, 45, 46, 85, 38, 66, - 67, -1, 66, 67, 66, 67, 25, 25, 27, 27, - 15, 18, 19, -1, -1, 61, 62, 18, 19, 38, - 38, 18, 19, 29, -1, 8, 29, -1, -1, 34, - 36, 36, -1, 36, -1, -1, 29, -1, 45, 46, - -1, -1, -1, 29, 45, 46, -1, 29, 45, 46, - 33, 15, -1, 23, 24, -1, 29, -1, 29, -1, - 66, 67, 32, 66, 67, 35, 59, 37, 29, -1, - 34, -1, 36, 66, 67, 61, 62, 59, 61, 62, - 66, 67, 29, -1, 66, 67, -1, -1, 61, 62, - 61, 62, 85, 66, 67, 66, 67, 29, 23, 24, - 61, 62, -1, 85, -1, 66, 67, 32, -1, -1, - 35, -1, 37, -1, 61, 62, -1, -1, -1, 66, - 67, -1, -1, -1, -1, -1, -1, 23, 24, 61, - 62, -1, -1, -1, 66, 67, 32, 23, 24, 35, - -1, 37, -1, -1, -1, 31, 32, 23, 24, 35, - -1, 37, -1, -1, -1, 31, 32, 23, 24, 35, - -1, 37, -1, -1, -1, 31, 32, 23, 24, 35, - -1, 37, -1, -1, -1, 31, 32, 23, 24, 35, - 10, 37, -1, -1, -1, 31, 32, -1, -1, 35, - -1, 37, 22, -1, -1, 23, 24, -1, -1, 29, - -1, -1, -1, -1, 32, -1, -1, 35, -1, 37, - 3, -1, -1, -1, -1, -1, -1, -1, -1, -1, - 13, -1, -1, -1, 17, 55, -1, -1, -1, 59, - -1, -1, -1, 26, -1, 28, 66, 67, -1, -1, - -1, -1, -1, -1, 74, -1, 39, -1, 41, 42, - -1, -1, -1, 83, 3, 85, 49, -1, -1, 52, - 53, -1, -1, 10, 13, 58, -1, -1, 17, -1, - -1, 64, -1, -1, -1, 22, -1, 26, -1, 28, - -1, -1, 29, -1, -1, -1, 79, -1, -1, -1, - 39, -1, 41, 42, -1, -1, -1, -1, -1, -1, - 49, -1, -1, 52, 53, -1, -1, -1, 55, 58, - -1, -1, 59, -1, -1, 64, -1, -1, -1, 66, - 67, -1, -1, -1, -1, -1, -1, 74, -1, -1, - 79, -1, -1, -1, -1, -1, 83, -1, 85, -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, -1, -1, 26, -1, 28, - -1, -1, 31, -1, -1, -1, -1, -1, -1, -1, - 39, -1, 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, + 60, 33, 60, 36, 78, 1, 16, 20, 17, 61, + 8, 60, 36, 5, 48, 31, 17, 2, 7, 7, + 60, 5, 36, 60, 60, 33, 33, 55, 5, 7, + 61, 36, 55, 36, 7, 7, 36, 7, 7, 36, + 7, 36, 36, 7, 7, 7, 33, 29, 7, 7, + 33, 7, 7, 7, 7, 36, 36, 36, 7, 7, + 7, 36, 8, 7, 7, 36, 78, 33, 33, 8, + 7, 7, 76, 33, 8, 36, 8, 88, 7, 55, + 2, 55, 1, 7, 36, 36, 36, 78, 33, 1, + 8, 48, 78, 61, 36, 36, 2, 1, 88, 0, + 8, 36, -1, 29, 29, 7, 8, -1, 8, 6, + 8, -1, 15, 8, -1, 8, 8, 40, 48, 8, + 60, 48, 60, 20, 55, 40, 10, 60, 51, 8, + 33, 40, 42, 8, 8, 8, 51, 8, 66, 8, + 61, 62, 51, 53, 61, 62, 8, 61, 62, -1, + 61, 62, 60, 2, 61, 62, 61, 62, 56, 40, + 60, 56, 61, 62, 56, 61, 62, 60, 29, 29, + 51, 55, 61, 50, 50, 61, 62, 54, 54, 61, + 62, 60, 25, 15, 27, 60, 60, 60, 12, 60, + 15, 8, 61, 62, 56, 38, 61, 62, 29, 7, + 29, 29, 34, 29, 36, 66, 67, 12, -1, 34, + 25, 36, 27, 25, 74, 27, 25, 12, 27, 25, + 8, 27, 29, 38, 89, 85, 38, 29, 25, 38, + 27, 7, 38, 57, 8, 66, 67, 66, 67, 63, + 8, 38, 15, 29, 61, 62, 74, 25, 74, 27, + -1, -1, 57, 61, 62, -1, -1, 85, 63, 85, + 38, 34, 57, 36, 66, 67, 29, 74, 63, 25, + 25, 27, 27, 61, 62, 29, -1, -1, 85, 29, + 66, 67, 38, 38, 29, 61, 62, 61, 62, 25, + 29, 27, 29, 61, 62, 25, 25, 27, 27, 36, + 15, -1, 38, 66, 67, 25, 7, 27, 38, 38, + 18, 19, 66, 67, 15, 8, 66, 67, 38, 29, + -1, 66, 67, 18, 19, -1, 36, 66, 67, 66, + 67, -1, 33, -1, -1, -1, -1, 45, 46, -1, + 33, -1, -1, -1, -1, 29, 61, 62, 29, -1, + 45, 46, 23, 24, -1, -1, 66, 67, 23, 24, + -1, 32, 29, -1, 35, 29, 37, 32, 61, 62, + 35, 29, 37, 29, 89, 23, 24, 61, 62, -1, + 61, 62, 66, 67, 32, 66, 67, 35, 29, 37, + -1, 18, 19, 29, 61, 62, -1, 61, 62, 66, + 67, 59, 66, 67, -1, 61, 62, -1, 66, 67, + 66, 67, -1, -1, -1, -1, -1, -1, 45, 46, + 61, 62, -1, 59, 29, 66, 67, 85, 23, 24, + 66, 67, -1, -1, -1, -1, 31, 32, 23, 24, + 35, -1, 37, -1, -1, -1, 31, 32, -1, 85, + 35, -1, 37, -1, 59, 23, 24, -1, -1, -1, + 65, 66, 67, 31, 32, 23, 24, 35, -1, 37, + -1, -1, 10, -1, 32, -1, -1, 35, -1, 37, + 85, -1, -1, -1, 22, -1, -1, -1, -1, -1, + -1, 29, -1, -1, -1, 10, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, 22, -1, -1, + -1, -1, -1, -1, 29, -1, -1, 55, -1, -1, + -1, 59, -1, -1, -1, -1, -1, -1, 66, 67, + -1, -1, -1, -1, 23, 24, 74, -1, -1, 3, + 55, -1, 31, 32, 59, 83, 35, 85, 37, 13, + -1, 66, 67, 17, -1, -1, -1, -1, -1, 74, + -1, -1, 26, -1, 28, -1, -1, 31, 83, -1, + 85, -1, -1, -1, -1, 39, -1, 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, 3, -1, -1, -1, -1, -1, -1, + -1, -1, -1, 13, -1, 79, -1, 17, -1, -1, + -1, -1, -1, -1, -1, -1, 26, -1, 28, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, 39, + -1, 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, -1, -1, -1, -1, -1, -1, -1, 79, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - 79, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -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, @@ -671,47 +666,56 @@ const int QmlJSGrammar::action_check [] = { -1, -1, -1, -1, -1, 65, 66, 67, -1, 69, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 80, 81, 82, -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, -1, 69, - -1, 71, -1, 73, -1, 75, -1, -1, -1, -1, - 80, 81, 82, -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, -1, 69, -1, 71, -1, 73, -1, 75, - -1, -1, -1, -1, 80, 81, 82, -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, -1, 69, -1, 71, -1, 73, 74, 75, - -1, -1, -1, -1, 80, 81, 82, -1, -1, -1, - -1, -1, -1, -1, -1, 8, -1, -1, 11, 12, + -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, -1, + 69, -1, 71, -1, 73, -1, 75, -1, -1, -1, + -1, 80, 81, 82, -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, + -1, 69, -1, 71, -1, 73, 74, 75, -1, -1, + -1, -1, 80, 81, 82, -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, 56, -1, -1, -1, -1, -1, -1, + 53, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 65, 66, 67, -1, 69, -1, 71, -1, 73, -1, 75, -1, -1, -1, -1, 80, 81, 82, - -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, -1, 69, - -1, 71, -1, 73, -1, 75, -1, -1, -1, -1, - 80, 81, 82, -1, -1, -1, -1, -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, -1, + 69, -1, 71, -1, 73, -1, 75, -1, -1, -1, + -1, 80, 81, 82, -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, -1, 69, -1, 71, -1, 73, -1, + 75, -1, -1, -1, -1, 80, 81, 82, -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, -1, 69, -1, + 71, -1, 73, -1, 75, -1, -1, -1, -1, 80, + 81, 82, -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, @@ -720,31 +724,23 @@ const int QmlJSGrammar::action_check [] = { -1, -1, -1, -1, -1, -1, -1, -1, 65, 66, 67, -1, 69, -1, 71, -1, 73, -1, 75, -1, -1, -1, -1, 80, 81, 82, -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, -1, 69, -1, 71, -1, 73, - -1, 75, -1, -1, -1, -1, 80, 81, 82, -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, 59, -1, - -1, -1, -1, -1, 65, 66, 67, -1, 69, -1, - 71, -1, 73, -1, 75, -1, -1, -1, -1, 80, - 81, 82, -1, -1, 85, -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, -1, 69, -1, - 71, -1, 73, -1, 75, -1, -1, -1, -1, 80, - 81, 82, -1, 84, -1, 86, -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, 59, -1, -1, -1, + -1, -1, 65, 66, 67, -1, 69, -1, 71, -1, + 73, -1, 75, -1, -1, -1, -1, 80, 81, 82, + -1, -1, 85, -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, -1, 69, -1, 71, + -1, 73, -1, 75, -1, -1, -1, -1, 80, 81, + 82, -1, 84, -1, 86, -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, @@ -753,102 +749,103 @@ const int QmlJSGrammar::action_check [] = { -1, -1, -1, -1, -1, 59, -1, -1, -1, -1, -1, -1, 66, 67, 68, 69, 70, -1, 72, 73, 74, 75, 76, 77, -1, -1, 80, 81, 82, 83, - 84, 85, -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, 68, 69, 70, -1, 72, 73, 74, 75, 76, - 77, -1, -1, 80, 81, 82, 83, 84, 85, -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, 68, 69, - 70, -1, 72, 73, 74, 75, 76, 77, -1, -1, - 80, 81, 82, 83, 84, 85, -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, -1, -1, 80, 81, 82, - 83, 84, -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, -1, -1, 80, 81, 82, 83, 84, -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, -1, - -1, 80, 81, 82, 83, 84, 85, -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, + 84, 85, -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, 68, 69, 70, -1, 72, 73, 74, 75, + 76, 77, -1, -1, 80, 81, 82, 83, 84, 85, + -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, + 68, 69, 70, -1, 72, 73, 74, 75, 76, 77, + -1, -1, 80, 81, 82, 83, 84, 85, -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, -1, -1, + 80, 81, 82, 83, 84, -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, 55, -1, -1, -1, 59, -1, 61, + -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, -1, -1, 80, 81, - 82, 83, 84, 85, -1, -1, -1, -1, -1, + 82, 83, 84, -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, -1, -1, 80, 81, 82, 83, + 84, 85, -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, -1, -1, 80, 81, 82, 83, 84, 85, + -1, -1, -1, -1, -1, -1, - 31, 5, 15, 23, 23, 14, 23, 15, 23, 15, - 95, 23, 14, 10, 14, 68, 23, 31, 23, 68, - 14, 64, 23, 14, 20, 20, 14, 14, 31, 68, - 23, 20, 31, 68, 32, 68, 68, 23, 14, 68, - 68, 14, 23, 23, 14, 14, 31, 15, 31, 14, - 68, 23, 31, 15, 14, 14, 23, 68, 68, 23, - 23, 14, 23, 14, 90, 31, 14, 23, 93, 14, - 41, 14, -1, 23, 31, 46, 68, 31, 68, 31, - -1, 6, 31, 41, 68, 23, 41, 31, 46, -1, - 68, 68, 14, 37, 41, 41, 78, 43, 23, 46, - 55, 41, 41, 78, 43, 41, 46, 41, 41, 41, - 43, 47, 23, 47, 46, 41, 35, 43, 41, 38, - 43, 41, 65, 43, 41, 41, 68, 41, 44, 43, - 47, 41, 41, 41, 44, 43, 41, 41, 43, 43, - 41, 41, 43, 65, 82, 41, 41, -1, 57, 49, - 46, 46, 27, 41, 14, 43, 31, 41, 41, 43, - 102, 41, 41, 46, 43, 41, 46, 43, 35, 35, - 41, 38, 38, 41, 45, 43, 41, 41, 41, 43, - 41, 46, 41, 41, 45, 96, 31, 46, 23, 14, - 53, 41, 37, 51, 68, 45, 14, 41, 33, 41, - -1, 23, 46, 41, 41, 47, 43, 41, 46, 41, - 41, 41, 46, 41, 46, 46, 46, 41, 46, -1, - 6, -1, 46, 97, 54, 63, -1, -1, 56, 63, - 41, 63, 63, 41, 58, 46, -1, 23, 46, -1, - 65, 52, 50, 41, 6, 31, 41, 65, 46, 41, - 48, 46, 41, 48, 46, 23, 48, 46, 41, 48, - -1, 23, 84, 46, -1, 33, 34, 8, -1, -1, - 11, 14, 15, 16, 17, 18, 19, -1, -1, -1, - 63, -1, 23, 24, 25, -1, -1, -1, -1, -1, + 6, 95, 15, 21, 15, 78, 31, 6, 16, 68, + 6, 15, 31, 6, 21, 31, 16, 6, 15, 68, + 15, 68, 6, 15, 15, 6, 64, 68, 6, 16, + 6, 21, 6, 15, 68, 15, 68, 31, 15, 6, + 15, 68, 6, 31, 68, 31, 68, 15, 68, 15, + 15, 6, 15, 68, 68, 6, 6, 78, 68, 31, + 12, 15, 31, 16, 90, 68, 15, 15, 15, 31, + 93, 32, 6, 31, 5, 16, 6, 6, 6, 6, + 6, 8, 41, 68, 43, 31, 31, 6, 6, 68, + 8, -1, 35, 6, 7, 38, 6, 41, 6, 43, + 15, 41, 41, 43, 41, 41, 45, 33, 41, 41, + 46, 68, 68, 15, 46, 15, 53, 41, 51, 43, + 41, 41, 43, 15, 41, 45, 43, 41, -1, 41, + 41, 45, 41, 31, 46, 41, 41, 46, 41, 37, + 97, 46, 41, 46, 55, -1, 102, 46, 41, 35, + 65, 57, 38, 46, 82, -1, 41, 41, 43, 43, + 41, 41, 43, 65, 44, 65, 41, 41, 41, 44, + 43, -1, 46, 65, 84, -1, 41, 96, 43, 41, + 41, 43, 43, 35, 41, 41, 38, 43, 41, 46, + 43, 41, 41, 43, -1, 41, 27, 31, 47, 41, + 31, 47, 41, 37, 41, 47, 41, -1, 47, 46, + 6, 46, 41, 41, 41, 43, -1, 41, 41, 46, + 49, 48, 46, 46, 48, 48, 41, 41, 41, 41, + -1, 46, 46, 46, 46, 50, 48, 33, 34, 52, + 41, 41, 41, 41, -1, 46, 46, 46, 46, 63, + 41, -1, 41, 41, -1, 46, 56, 46, 46, 6, + 7, -1, 63, -1, 63, 63, 54, 6, 7, 58, + -1, 10, 63, 41, -1, 43, -1, 24, 25, 15, + 16, 17, 18, 19, 20, 24, 25, -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, -1, -1, -1, + -1, -1, -1, -1, -1, -1, 6, -1, 8, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, 11, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, 23, 24, 25, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, 31, -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, -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}; diff --git a/src/declarative/qml/parser/qmljsgrammar_p.h b/src/declarative/qml/parser/qmljsgrammar_p.h index fde9969..a8d4bdf 100644 --- a/src/declarative/qml/parser/qmljsgrammar_p.h +++ b/src/declarative/qml/parser/qmljsgrammar_p.h @@ -59,11 +59,12 @@ class QmlJSGrammar public: enum { EOF_SYMBOL = 0, - REDUCE_HERE = 90, - SHIFT_THERE = 89, + REDUCE_HERE = 91, + SHIFT_THERE = 90, T_AND = 1, T_AND_AND = 2, T_AND_EQ = 3, + T_AS = 89, T_AUTOMATIC_SEMICOLON = 62, T_BREAK = 4, T_CASE = 5, @@ -150,15 +151,15 @@ public: T_XOR = 78, T_XOR_EQ = 79, - ACCEPT_STATE = 597, - RULE_COUNT = 328, - STATE_COUNT = 598, - TERMINAL_COUNT = 91, + ACCEPT_STATE = 608, + RULE_COUNT = 334, + STATE_COUNT = 609, + TERMINAL_COUNT = 92, NON_TERMINAL_COUNT = 104, - GOTO_INDEX_OFFSET = 598, - GOTO_INFO_OFFSET = 2179, - GOTO_CHECK_OFFSET = 2179 + GOTO_INDEX_OFFSET = 609, + GOTO_INFO_OFFSET = 2136, + GOTO_CHECK_OFFSET = 2136 }; static const char *const spell []; diff --git a/src/declarative/qml/parser/qmljslexer.cpp b/src/declarative/qml/parser/qmljslexer.cpp index e0de71a..a22169d 100644 --- a/src/declarative/qml/parser/qmljslexer.cpp +++ b/src/declarative/qml/parser/qmljslexer.cpp @@ -159,6 +159,8 @@ int Lexer::findReservedWord(const QChar *c, int size) const return QmlJSGrammar::T_IF; else if (c[0] == QLatin1Char('i') && c[1] == QLatin1Char('n')) return QmlJSGrammar::T_IN; + else if (c[0] == QLatin1Char('a') && c[1] == QLatin1Char('s')) + return QmlJSGrammar::T_AS; } break; case 3: { diff --git a/src/declarative/qml/parser/qmljsparser.cpp b/src/declarative/qml/parser/qmljsparser.cpp index 8720023..679d0b3 100644 --- a/src/declarative/qml/parser/qmljsparser.cpp +++ b/src/declarative/qml/parser/qmljsparser.cpp @@ -220,56 +220,86 @@ case 6: { sym(1).Node = node; } break; -case 7: { +case 8: { + AST::UiImport *node = makeAstNode<AST::UiImport>(driver->nodePool(), sym(2).sval); + node->importId = sym(4).sval; + node->importToken = loc(1); + node->fileNameToken = loc(2); + node->asToken = loc(3); + node->importIdToken = loc(4); + node->semicolonToken = loc(5); + sym(1).Node = node; +} break; + +case 10: { + AST::UiImport *node = makeAstNode<AST::UiImport>(driver->nodePool(), sym(2).UiQualifiedId); + node->importToken = loc(1); + node->fileNameToken = loc(2); + node->semicolonToken = loc(3); + sym(1).Node = node; +} break; + +case 12: { + AST::UiImport *node = makeAstNode<AST::UiImport>(driver->nodePool(), sym(2).UiQualifiedId); + node->importId = sym(4).sval; + node->importToken = loc(1); + node->fileNameToken = loc(2); + node->asToken = loc(3); + node->importIdToken = loc(4); + node->semicolonToken = loc(5); + sym(1).Node = node; +} break; + +case 13: { sym(1).Node = 0; } break; -case 8: { +case 14: { sym(1).Node = makeAstNode<AST::UiObjectMemberList> (driver->nodePool(), sym(1).UiObjectMember); } break; -case 9: { +case 15: { sym(1).Node = makeAstNode<AST::UiObjectMemberList> (driver->nodePool(), sym(1).UiObjectMember); } break; -case 10: { +case 16: { AST::UiObjectMemberList *node = makeAstNode<AST:: UiObjectMemberList> (driver->nodePool(), sym(1).UiObjectMemberList, sym(2).UiObjectMember); sym(1).Node = node; } break; -case 11: { +case 17: { sym(1).Node = makeAstNode<AST::UiArrayMemberList> (driver->nodePool(), sym(1).UiObjectMember); } break; -case 12: { +case 18: { AST::UiArrayMemberList *node = makeAstNode<AST::UiArrayMemberList> (driver->nodePool(), sym(1).UiArrayMemberList, sym(3).UiObjectMember); node->commaToken = loc(2); sym(1).Node = node; } break; -case 13: { +case 19: { 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 14: { +case 20: { 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 15: { +case 21: { AST::UiObjectDefinition *node = makeAstNode<AST::UiObjectDefinition> (driver->nodePool(), sym(1).UiQualifiedId->finish(), sym(2).UiObjectInitializer); sym(1).Node = node; } break; -case 17: { +case 23: { AST::UiArrayBinding *node = makeAstNode<AST::UiArrayBinding> (driver->nodePool(), sym(1).UiQualifiedId->finish(), sym(4).UiArrayMemberList->finish()); node->colonToken = loc(2); @@ -278,19 +308,19 @@ case 17: { sym(1).Node = node; } break; -case 18: { +case 24: { AST::StringLiteral *node = makeAstNode<AST::StringLiteral> (driver->nodePool(), sym(1).sval); node->literalToken = loc(1); sym(1).Node = node; } break; -case 20: { +case 26: { AST::ExpressionStatement *node = makeAstNode<AST::ExpressionStatement> (driver->nodePool(), sym(1).Expression); node->semicolonToken = loc(2); sym(1).Node = node; } break; -case 21: { +case 27: { if (AST::UiQualifiedId *qualifiedId = reparseAsQualifiedId(sym(3).Expression)) { AST::UiObjectBinding *node = makeAstNode<AST::UiObjectBinding> (driver->nodePool(), sym(1).UiQualifiedId->finish(), qualifiedId, sym(4).UiObjectInitializer); @@ -305,7 +335,7 @@ case 21: { return false; // ### recover } } break; -case 22:case 23:case 24:case 25:case 26:case 27: +case 28:case 29:case 30:case 31:case 32:case 33: { AST::UiScriptBinding *node = makeAstNode<AST::UiScriptBinding> (driver->nodePool(), sym(1).UiQualifiedId->finish(), sym(3).Statement); @@ -313,35 +343,35 @@ case 22:case 23:case 24:case 25:case 26:case 27: sym(1).Node = node; } break; -case 28: +case 34: -case 29: { +case 35: { sym(1).sval = driver->intern(lexer->characterBuffer(), lexer->characterCount()); break; } -case 31: { +case 37: { sym(1).Node = 0; } break; -case 32: { +case 38: { sym(1).Node = sym(1).UiParameterList->finish (); } break; -case 33: { +case 39: { AST::UiParameterList *node = makeAstNode<AST::UiParameterList> (driver->nodePool(), sym(1).sval, sym(2).sval); node->identifierToken = loc(2); sym(1).Node = node; } break; -case 34: { +case 40: { 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 35: { +case 41: { AST::UiPublicMember *node = makeAstNode<AST::UiPublicMember> (driver->nodePool(), (NameId *)0, sym(2).sval); node->type = AST::UiPublicMember::Signal; node->propertyToken = loc(1); @@ -351,7 +381,7 @@ case 35: { sym(1).Node = node; } break; -case 36: { +case 42: { AST::UiPublicMember *node = makeAstNode<AST::UiPublicMember> (driver->nodePool(), (NameId *)0, sym(2).sval); node->type = AST::UiPublicMember::Signal; node->propertyToken = loc(1); @@ -360,7 +390,7 @@ case 36: { sym(1).Node = node; } break; -case 38: { +case 44: { AST::UiPublicMember *node = makeAstNode<AST::UiPublicMember> (driver->nodePool(), sym(2).sval, sym(3).sval); node->propertyToken = loc(1); node->typeToken = loc(2); @@ -369,7 +399,7 @@ case 38: { sym(1).Node = node; } break; -case 40: { +case 46: { AST::UiPublicMember *node = makeAstNode<AST::UiPublicMember> (driver->nodePool(), sym(3).sval, sym(4).sval); node->isDefaultMember = true; node->defaultToken = loc(1); @@ -380,7 +410,7 @@ case 40: { sym(1).Node = node; } break; -case 42: { +case 48: { AST::UiPublicMember *node = makeAstNode<AST::UiPublicMember> (driver->nodePool(), sym(2).sval, sym(3).sval, sym(5).Expression); node->propertyToken = loc(1); @@ -391,7 +421,7 @@ case 42: { sym(1).Node = node; } break; -case 44: { +case 50: { AST::UiPublicMember *node = makeAstNode<AST::UiPublicMember> (driver->nodePool(), sym(3).sval, sym(4).sval, sym(6).Expression); node->isDefaultMember = true; @@ -404,76 +434,76 @@ case 44: { sym(1).Node = node; } break; -case 45: { +case 51: { sym(1).Node = makeAstNode<AST::UiSourceElement>(driver->nodePool(), sym(1).Node); } break; -case 46: { +case 52: { sym(1).Node = makeAstNode<AST::UiSourceElement>(driver->nodePool(), sym(1).Node); } break; -case 47: -case 48: +case 53: +case 54: { AST::UiQualifiedId *node = makeAstNode<AST::UiQualifiedId> (driver->nodePool(), driver->intern(lexer->characterBuffer(), lexer->characterCount())); node->identifierToken = loc(1); sym(1).Node = node; } break; -case 50: { +case 56: { QString s = QLatin1String(QmlJSGrammar::spell[T_PROPERTY]); sym(1).sval = driver->intern(s.constData(), s.length()); break; } -case 51: { +case 57: { QString s = QLatin1String(QmlJSGrammar::spell[T_SIGNAL]); sym(1).sval = driver->intern(s.constData(), s.length()); break; } -case 52: { +case 58: { AST::ThisExpression *node = makeAstNode<AST::ThisExpression> (driver->nodePool()); node->thisToken = loc(1); sym(1).Node = node; } break; -case 53: { +case 59: { AST::IdentifierExpression *node = makeAstNode<AST::IdentifierExpression> (driver->nodePool(), sym(1).sval); node->identifierToken = loc(1); sym(1).Node = node; } break; -case 54: { +case 60: { AST::NullExpression *node = makeAstNode<AST::NullExpression> (driver->nodePool()); node->nullToken = loc(1); sym(1).Node = node; } break; -case 55: { +case 61: { AST::TrueLiteral *node = makeAstNode<AST::TrueLiteral> (driver->nodePool()); node->trueToken = loc(1); sym(1).Node = node; } break; -case 56: { +case 62: { AST::FalseLiteral *node = makeAstNode<AST::FalseLiteral> (driver->nodePool()); node->falseToken = loc(1); sym(1).Node = node; } break; -case 57: { +case 63: { AST::NumericLiteral *node = makeAstNode<AST::NumericLiteral> (driver->nodePool(), sym(1).dval, lexer->flags); node->literalToken = loc(1); sym(1).Node = node; } break; -case 58: { +case 64: { AST::StringLiteral *node = makeAstNode<AST::StringLiteral> (driver->nodePool(), sym(1).sval); node->literalToken = loc(1); sym(1).Node = node; } break; -case 59: { +case 65: { bool rx = lexer->scanRegExp(Lexer::NoPrefix); if (!rx) { diagnostic_messages.append(DiagnosticMessage(DiagnosticMessage::Error, location(lexer), lexer->errorMessage())); @@ -484,7 +514,7 @@ case 59: { sym(1).Node = node; } break; -case 60: { +case 66: { bool rx = lexer->scanRegExp(Lexer::EqualPrefix); if (!rx) { diagnostic_messages.append(DiagnosticMessage(DiagnosticMessage::Error, location(lexer), lexer->errorMessage())); @@ -495,28 +525,28 @@ case 60: { sym(1).Node = node; } break; -case 61: { +case 67: { 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 62: { +case 68: { 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 63: { +case 69: { 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 64: { +case 70: { AST::ArrayLiteral *node = makeAstNode<AST::ArrayLiteral> (driver->nodePool(), sym(2).ElementList->finish (), (AST::Elision *) 0); node->lbracketToken = loc(1); @@ -525,7 +555,7 @@ case 64: { sym(1).Node = node; } break; -case 65: { +case 71: { AST::ArrayLiteral *node = makeAstNode<AST::ArrayLiteral> (driver->nodePool(), sym(2).ElementList->finish (), sym(4).Elision->finish()); node->lbracketToken = loc(1); @@ -534,7 +564,7 @@ case 65: { sym(1).Node = node; } break; -case 66: { +case 72: { AST::ObjectLiteral *node = 0; if (sym(2).Node) node = makeAstNode<AST::ObjectLiteral> (driver->nodePool(), @@ -546,7 +576,7 @@ case 66: { sym(1).Node = node; } break; -case 67: { +case 73: { AST::ObjectLiteral *node = makeAstNode<AST::ObjectLiteral> (driver->nodePool(), sym(2).PropertyNameAndValueList->finish ()); node->lbraceToken = loc(1); @@ -554,67 +584,67 @@ case 67: { sym(1).Node = node; } break; -case 68: { +case 74: { 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 69: { +case 75: { AST::UiQualifiedId *node = makeAstNode<AST::UiQualifiedId> (driver->nodePool(), sym(1).sval); node->identifierToken = loc(1); sym(1).Node = node; } break; -case 70: { +case 76: { AST::UiQualifiedId *node = makeAstNode<AST::UiQualifiedId> (driver->nodePool(), sym(1).UiQualifiedId, sym(3).sval); node->identifierToken = loc(3); sym(1).Node = node; } break; -case 71: { +case 77: { sym(1).Node = makeAstNode<AST::ElementList> (driver->nodePool(), (AST::Elision *) 0, sym(1).Expression); } break; -case 72: { +case 78: { sym(1).Node = makeAstNode<AST::ElementList> (driver->nodePool(), sym(1).Elision->finish(), sym(2).Expression); } break; -case 73: { +case 79: { 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 74: { +case 80: { 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 75: { +case 81: { AST::Elision *node = makeAstNode<AST::Elision> (driver->nodePool()); node->commaToken = loc(1); sym(1).Node = node; } break; -case 76: { +case 82: { AST::Elision *node = makeAstNode<AST::Elision> (driver->nodePool(), sym(1).Elision); node->commaToken = loc(2); sym(1).Node = node; } break; -case 77: { +case 83: { AST::PropertyNameAndValueList *node = makeAstNode<AST::PropertyNameAndValueList> (driver->nodePool(), sym(1).PropertyName, sym(3).Expression); node->colonToken = loc(2); sym(1).Node = node; } break; -case 78: { +case 84: { AST::PropertyNameAndValueList *node = makeAstNode<AST::PropertyNameAndValueList> (driver->nodePool(), sym(1).PropertyNameAndValueList, sym(3).PropertyName, sym(5).Expression); node->commaToken = loc(2); @@ -622,48 +652,36 @@ case 78: { sym(1).Node = node; } break; -case 79: { +case 85: { AST::IdentifierPropertyName *node = makeAstNode<AST::IdentifierPropertyName> (driver->nodePool(), sym(1).sval); node->propertyNameToken = loc(1); sym(1).Node = node; } break; -case 80: -case 81: { +case 86: +case 87: { AST::IdentifierPropertyName *node = makeAstNode<AST::IdentifierPropertyName> (driver->nodePool(), driver->intern(lexer->characterBuffer(), lexer->characterCount())); node->propertyNameToken = loc(1); sym(1).Node = node; } break; -case 82: { +case 88: { AST::StringLiteralPropertyName *node = makeAstNode<AST::StringLiteralPropertyName> (driver->nodePool(), sym(1).sval); node->propertyNameToken = loc(1); sym(1).Node = node; } break; -case 83: { +case 89: { AST::NumericLiteralPropertyName *node = makeAstNode<AST::NumericLiteralPropertyName> (driver->nodePool(), sym(1).dval); node->propertyNameToken = loc(1); sym(1).Node = node; } break; -case 84: { +case 90: { AST::IdentifierPropertyName *node = makeAstNode<AST::IdentifierPropertyName> (driver->nodePool(), sym(1).sval); node->propertyNameToken = loc(1); sym(1).Node = node; } break; -case 85: - -case 86: - -case 87: - -case 88: - -case 89: - -case 90: - case 91: case 92: @@ -713,25 +731,37 @@ case 113: case 114: case 115: + +case 116: + +case 117: + +case 118: + +case 119: + +case 120: + +case 121: { sym(1).sval = driver->intern(lexer->characterBuffer(), lexer->characterCount()); } break; -case 120: { +case 126: { 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 121: { +case 127: { 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 122: { +case 128: { AST::NewMemberExpression *node = makeAstNode<AST::NewMemberExpression> (driver->nodePool(), sym(2).Expression, sym(4).ArgumentList); node->newToken = loc(1); node->lparenToken = loc(3); @@ -739,384 +769,384 @@ case 122: { sym(1).Node = node; } break; -case 124: { +case 130: { AST::NewExpression *node = makeAstNode<AST::NewExpression> (driver->nodePool(), sym(2).Expression); node->newToken = loc(1); sym(1).Node = node; } break; -case 125: { +case 131: { 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 126: { +case 132: { 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 127: { +case 133: { 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 128: { +case 134: { 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 129: { +case 135: { sym(1).Node = 0; } break; -case 130: { +case 136: { sym(1).Node = sym(1).ArgumentList->finish(); } break; -case 131: { +case 137: { sym(1).Node = makeAstNode<AST::ArgumentList> (driver->nodePool(), sym(1).Expression); } break; -case 132: { +case 138: { AST::ArgumentList *node = makeAstNode<AST::ArgumentList> (driver->nodePool(), sym(1).ArgumentList, sym(3).Expression); node->commaToken = loc(2); sym(1).Node = node; } break; -case 136: { +case 142: { AST::PostIncrementExpression *node = makeAstNode<AST::PostIncrementExpression> (driver->nodePool(), sym(1).Expression); node->incrementToken = loc(2); sym(1).Node = node; } break; -case 137: { +case 143: { AST::PostDecrementExpression *node = makeAstNode<AST::PostDecrementExpression> (driver->nodePool(), sym(1).Expression); node->decrementToken = loc(2); sym(1).Node = node; } break; -case 139: { +case 145: { AST::DeleteExpression *node = makeAstNode<AST::DeleteExpression> (driver->nodePool(), sym(2).Expression); node->deleteToken = loc(1); sym(1).Node = node; } break; -case 140: { +case 146: { AST::VoidExpression *node = makeAstNode<AST::VoidExpression> (driver->nodePool(), sym(2).Expression); node->voidToken = loc(1); sym(1).Node = node; } break; -case 141: { +case 147: { AST::TypeOfExpression *node = makeAstNode<AST::TypeOfExpression> (driver->nodePool(), sym(2).Expression); node->typeofToken = loc(1); sym(1).Node = node; } break; -case 142: { +case 148: { AST::PreIncrementExpression *node = makeAstNode<AST::PreIncrementExpression> (driver->nodePool(), sym(2).Expression); node->incrementToken = loc(1); sym(1).Node = node; } break; -case 143: { +case 149: { AST::PreDecrementExpression *node = makeAstNode<AST::PreDecrementExpression> (driver->nodePool(), sym(2).Expression); node->decrementToken = loc(1); sym(1).Node = node; } break; -case 144: { +case 150: { AST::UnaryPlusExpression *node = makeAstNode<AST::UnaryPlusExpression> (driver->nodePool(), sym(2).Expression); node->plusToken = loc(1); sym(1).Node = node; } break; -case 145: { +case 151: { AST::UnaryMinusExpression *node = makeAstNode<AST::UnaryMinusExpression> (driver->nodePool(), sym(2).Expression); node->minusToken = loc(1); sym(1).Node = node; } break; -case 146: { +case 152: { AST::TildeExpression *node = makeAstNode<AST::TildeExpression> (driver->nodePool(), sym(2).Expression); node->tildeToken = loc(1); sym(1).Node = node; } break; -case 147: { +case 153: { AST::NotExpression *node = makeAstNode<AST::NotExpression> (driver->nodePool(), sym(2).Expression); node->notToken = loc(1); sym(1).Node = node; } break; -case 149: { +case 155: { 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 150: { +case 156: { 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 151: { +case 157: { 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 153: { +case 159: { 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 154: { +case 160: { 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 156: { +case 162: { 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 157: { +case 163: { 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 158: { +case 164: { 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 160: { +case 166: { 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 161: { +case 167: { 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 162: { +case 168: { 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 163: { +case 169: { 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 164: { +case 170: { 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 165: { +case 171: { 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 167: { +case 173: { 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 168: { +case 174: { 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 169: { +case 175: { 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 170: { +case 176: { 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 171: { +case 177: { 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 173: { +case 179: { 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 174: { +case 180: { 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 175: { +case 181: { 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 176: { +case 182: { 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 178: { +case 184: { 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 179: { +case 185: { 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 180: { +case 186: { 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 181: { +case 187: { 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 183: { +case 189: { 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 185: { +case 191: { 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 187: { +case 193: { 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 189: { +case 195: { 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 191: { +case 197: { 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 193: { +case 199: { 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 195: { +case 201: { 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 197: { +case 203: { 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 199: { +case 205: { 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 201: { +case 207: { 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 203: { +case 209: { AST::ConditionalExpression *node = makeAstNode<AST::ConditionalExpression> (driver->nodePool(), sym(1).Expression, sym(3).Expression, sym(5).Expression); node->questionToken = loc(2); @@ -1124,7 +1154,7 @@ case 203: { sym(1).Node = node; } break; -case 205: { +case 211: { AST::ConditionalExpression *node = makeAstNode<AST::ConditionalExpression> (driver->nodePool(), sym(1).Expression, sym(3).Expression, sym(5).Expression); node->questionToken = loc(2); @@ -1132,112 +1162,112 @@ case 205: { sym(1).Node = node; } break; -case 207: { +case 213: { 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 209: { +case 215: { 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 210: { +case 216: { sym(1).ival = QSOperator::Assign; } break; -case 211: { +case 217: { sym(1).ival = QSOperator::InplaceMul; } break; -case 212: { +case 218: { sym(1).ival = QSOperator::InplaceDiv; } break; -case 213: { +case 219: { sym(1).ival = QSOperator::InplaceMod; } break; -case 214: { +case 220: { sym(1).ival = QSOperator::InplaceAdd; } break; -case 215: { +case 221: { sym(1).ival = QSOperator::InplaceSub; } break; -case 216: { +case 222: { sym(1).ival = QSOperator::InplaceLeftShift; } break; -case 217: { +case 223: { sym(1).ival = QSOperator::InplaceRightShift; } break; -case 218: { +case 224: { sym(1).ival = QSOperator::InplaceURightShift; } break; -case 219: { +case 225: { sym(1).ival = QSOperator::InplaceAnd; } break; -case 220: { +case 226: { sym(1).ival = QSOperator::InplaceXor; } break; -case 221: { +case 227: { sym(1).ival = QSOperator::InplaceOr; } break; -case 223: { +case 229: { AST::Expression *node = makeAstNode<AST::Expression> (driver->nodePool(), sym(1).Expression, sym(3).Expression); node->commaToken = loc(2); sym(1).Node = node; } break; -case 224: { +case 230: { sym(1).Node = 0; } break; -case 227: { +case 233: { AST::Expression *node = makeAstNode<AST::Expression> (driver->nodePool(), sym(1).Expression, sym(3).Expression); node->commaToken = loc(2); sym(1).Node = node; } break; -case 228: { +case 234: { sym(1).Node = 0; } break; -case 245: { +case 251: { 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 246: { +case 252: { sym(1).Node = makeAstNode<AST::StatementList> (driver->nodePool(), sym(1).Statement); } break; -case 247: { +case 253: { sym(1).Node = makeAstNode<AST::StatementList> (driver->nodePool(), sym(1).StatementList, sym(2).Statement); } break; -case 248: { +case 254: { sym(1).Node = 0; } break; -case 249: { +case 255: { sym(1).Node = sym(1).StatementList->finish (); } break; -case 251: { +case 257: { AST::VariableStatement *node = makeAstNode<AST::VariableStatement> (driver->nodePool(), sym(2).VariableDeclarationList->finish (/*readOnly=*/sym(1).ival == T_CONST)); node->declarationKindToken = loc(1); @@ -1245,76 +1275,76 @@ case 251: { sym(1).Node = node; } break; -case 252: { +case 258: { sym(1).ival = T_CONST; } break; -case 253: { +case 259: { sym(1).ival = T_VAR; } break; -case 254: { +case 260: { sym(1).Node = makeAstNode<AST::VariableDeclarationList> (driver->nodePool(), sym(1).VariableDeclaration); } break; -case 255: { +case 261: { AST::VariableDeclarationList *node = makeAstNode<AST::VariableDeclarationList> (driver->nodePool(), sym(1).VariableDeclarationList, sym(3).VariableDeclaration); node->commaToken = loc(2); sym(1).Node = node; } break; -case 256: { +case 262: { sym(1).Node = makeAstNode<AST::VariableDeclarationList> (driver->nodePool(), sym(1).VariableDeclaration); } break; -case 257: { +case 263: { sym(1).Node = makeAstNode<AST::VariableDeclarationList> (driver->nodePool(), sym(1).VariableDeclarationList, sym(3).VariableDeclaration); } break; -case 258: { +case 264: { AST::VariableDeclaration *node = makeAstNode<AST::VariableDeclaration> (driver->nodePool(), sym(1).sval, sym(2).Expression); node->identifierToken = loc(1); sym(1).Node = node; } break; -case 259: { +case 265: { AST::VariableDeclaration *node = makeAstNode<AST::VariableDeclaration> (driver->nodePool(), sym(1).sval, sym(2).Expression); node->identifierToken = loc(1); sym(1).Node = node; } break; -case 260: { +case 266: { // ### TODO: AST for initializer sym(1) = sym(2); } break; -case 261: { +case 267: { sym(1).Node = 0; } break; -case 263: { +case 269: { // ### TODO: AST for initializer sym(1) = sym(2); } break; -case 264: { +case 270: { sym(1).Node = 0; } break; -case 266: { +case 272: { AST::EmptyStatement *node = makeAstNode<AST::EmptyStatement> (driver->nodePool()); node->semicolonToken = loc(1); sym(1).Node = node; } break; -case 268: { +case 274: { AST::ExpressionStatement *node = makeAstNode<AST::ExpressionStatement> (driver->nodePool(), sym(1).Expression); node->semicolonToken = loc(2); sym(1).Node = node; } break; -case 269: { +case 275: { 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); @@ -1323,7 +1353,7 @@ case 269: { sym(1).Node = node; } break; -case 270: { +case 276: { AST::IfStatement *node = makeAstNode<AST::IfStatement> (driver->nodePool(), sym(3).Expression, sym(5).Statement); node->ifToken = loc(1); node->lparenToken = loc(2); @@ -1331,7 +1361,7 @@ case 270: { sym(1).Node = node; } break; -case 272: { +case 278: { AST::DoWhileStatement *node = makeAstNode<AST::DoWhileStatement> (driver->nodePool(), sym(2).Statement, sym(5).Expression); node->doToken = loc(1); node->whileToken = loc(3); @@ -1341,7 +1371,7 @@ case 272: { sym(1).Node = node; } break; -case 273: { +case 279: { AST::WhileStatement *node = makeAstNode<AST::WhileStatement> (driver->nodePool(), sym(3).Expression, sym(5).Statement); node->whileToken = loc(1); node->lparenToken = loc(2); @@ -1349,7 +1379,7 @@ case 273: { sym(1).Node = node; } break; -case 274: { +case 280: { AST::ForStatement *node = makeAstNode<AST::ForStatement> (driver->nodePool(), sym(3).Expression, sym(5).Expression, sym(7).Expression, sym(9).Statement); node->forToken = loc(1); @@ -1360,7 +1390,7 @@ case 274: { sym(1).Node = node; } break; -case 275: { +case 281: { AST::LocalForStatement *node = makeAstNode<AST::LocalForStatement> (driver->nodePool(), sym(4).VariableDeclarationList->finish (/*readOnly=*/false), sym(6).Expression, sym(8).Expression, sym(10).Statement); @@ -1373,7 +1403,7 @@ case 275: { sym(1).Node = node; } break; -case 276: { +case 282: { AST:: ForEachStatement *node = makeAstNode<AST::ForEachStatement> (driver->nodePool(), sym(3).Expression, sym(5).Expression, sym(7).Statement); node->forToken = loc(1); @@ -1383,7 +1413,7 @@ case 276: { sym(1).Node = node; } break; -case 277: { +case 283: { AST::LocalForEachStatement *node = makeAstNode<AST::LocalForEachStatement> (driver->nodePool(), sym(4).VariableDeclaration, sym(6).Expression, sym(8).Statement); node->forToken = loc(1); @@ -1394,14 +1424,14 @@ case 277: { sym(1).Node = node; } break; -case 279: { +case 285: { AST::ContinueStatement *node = makeAstNode<AST::ContinueStatement> (driver->nodePool()); node->continueToken = loc(1); node->semicolonToken = loc(2); sym(1).Node = node; } break; -case 281: { +case 287: { AST::ContinueStatement *node = makeAstNode<AST::ContinueStatement> (driver->nodePool(), sym(2).sval); node->continueToken = loc(1); node->identifierToken = loc(2); @@ -1409,14 +1439,14 @@ case 281: { sym(1).Node = node; } break; -case 283: { +case 289: { AST::BreakStatement *node = makeAstNode<AST::BreakStatement> (driver->nodePool()); node->breakToken = loc(1); node->semicolonToken = loc(2); sym(1).Node = node; } break; -case 285: { +case 291: { AST::BreakStatement *node = makeAstNode<AST::BreakStatement> (driver->nodePool(), sym(2).sval); node->breakToken = loc(1); node->identifierToken = loc(2); @@ -1424,14 +1454,14 @@ case 285: { sym(1).Node = node; } break; -case 287: { +case 293: { 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 288: { +case 294: { AST::WithStatement *node = makeAstNode<AST::WithStatement> (driver->nodePool(), sym(3).Expression, sym(5).Statement); node->withToken = loc(1); node->lparenToken = loc(2); @@ -1439,7 +1469,7 @@ case 288: { sym(1).Node = node; } break; -case 289: { +case 295: { AST::SwitchStatement *node = makeAstNode<AST::SwitchStatement> (driver->nodePool(), sym(3).Expression, sym(5).CaseBlock); node->switchToken = loc(1); node->lparenToken = loc(2); @@ -1447,90 +1477,90 @@ case 289: { sym(1).Node = node; } break; -case 290: { +case 296: { 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 291: { +case 297: { 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 292: { +case 298: { sym(1).Node = makeAstNode<AST::CaseClauses> (driver->nodePool(), sym(1).CaseClause); } break; -case 293: { +case 299: { sym(1).Node = makeAstNode<AST::CaseClauses> (driver->nodePool(), sym(1).CaseClauses, sym(2).CaseClause); } break; -case 294: { +case 300: { sym(1).Node = 0; } break; -case 295: { +case 301: { sym(1).Node = sym(1).CaseClauses->finish (); } break; -case 296: { +case 302: { 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 297: { +case 303: { 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 298: -case 299: { +case 304: +case 305: { 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 300: { +case 306: { 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 302: { +case 308: { 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 303: { +case 309: { AST::TryStatement *node = makeAstNode<AST::TryStatement> (driver->nodePool(), sym(2).Statement, sym(3).Catch); node->tryToken = loc(1); sym(1).Node = node; } break; -case 304: { +case 310: { AST::TryStatement *node = makeAstNode<AST::TryStatement> (driver->nodePool(), sym(2).Statement, sym(3).Finally); node->tryToken = loc(1); sym(1).Node = node; } break; -case 305: { +case 311: { 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 306: { +case 312: { AST::Catch *node = makeAstNode<AST::Catch> (driver->nodePool(), sym(3).sval, sym(5).Block); node->catchToken = loc(1); node->lparenToken = loc(2); @@ -1539,20 +1569,20 @@ case 306: { sym(1).Node = node; } break; -case 307: { +case 313: { AST::Finally *node = makeAstNode<AST::Finally> (driver->nodePool(), sym(2).Block); node->finallyToken = loc(1); sym(1).Node = node; } break; -case 309: { +case 315: { AST::DebuggerStatement *node = makeAstNode<AST::DebuggerStatement> (driver->nodePool()); node->debuggerToken = loc(1); node->semicolonToken = loc(2); sym(1).Node = node; } break; -case 310: { +case 316: { 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); @@ -1563,7 +1593,7 @@ case 310: { sym(1).Node = node; } break; -case 311: { +case 317: { 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) @@ -1575,56 +1605,56 @@ case 311: { sym(1).Node = node; } break; -case 312: { +case 318: { AST::FormalParameterList *node = makeAstNode<AST::FormalParameterList> (driver->nodePool(), sym(1).sval); node->identifierToken = loc(1); sym(1).Node = node; } break; -case 313: { +case 319: { 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 314: { +case 320: { sym(1).Node = 0; } break; -case 315: { +case 321: { sym(1).Node = sym(1).FormalParameterList->finish (); } break; -case 316: { +case 322: { sym(1).Node = 0; } break; -case 318: { +case 324: { sym(1).Node = makeAstNode<AST::FunctionBody> (driver->nodePool(), sym(1).SourceElements->finish ()); } break; -case 319: { +case 325: { sym(1).Node = makeAstNode<AST::SourceElements> (driver->nodePool(), sym(1).SourceElement); } break; -case 320: { +case 326: { sym(1).Node = makeAstNode<AST::SourceElements> (driver->nodePool(), sym(1).SourceElements, sym(2).SourceElement); } break; -case 321: { +case 327: { sym(1).Node = makeAstNode<AST::StatementSourceElement> (driver->nodePool(), sym(1).Statement); } break; -case 322: { +case 328: { sym(1).Node = makeAstNode<AST::FunctionSourceElement> (driver->nodePool(), sym(1).FunctionDeclaration); } break; -case 323: { +case 329: { sym(1).sval = 0; } break; -case 325: { +case 331: { sym(1).Node = 0; } break; diff --git a/src/declarative/qml/parser/qmljsparser_p.h b/src/declarative/qml/parser/qmljsparser_p.h index 55b76cf..e82c9c5 100644 --- a/src/declarative/qml/parser/qmljsparser_p.h +++ b/src/declarative/qml/parser/qmljsparser_p.h @@ -198,9 +198,9 @@ protected: -#define J_SCRIPT_REGEXPLITERAL_RULE1 59 +#define J_SCRIPT_REGEXPLITERAL_RULE1 65 -#define J_SCRIPT_REGEXPLITERAL_RULE2 60 +#define J_SCRIPT_REGEXPLITERAL_RULE2 66 QT_END_NAMESPACE |