summaryrefslogtreecommitdiffstats
path: root/src/declarative/qml
diff options
context:
space:
mode:
authorRoberto Raggi <roberto.raggi@nokia.com>2009-07-16 13:43:28 (GMT)
committerRoberto Raggi <roberto.raggi@nokia.com>2009-07-16 13:43:28 (GMT)
commit3bd0062535aaa991fadf739f9362851afacb19eb (patch)
tree33ce9d3c324f0d0e351455a6a10cbcfec4f0dbd8 /src/declarative/qml
parent9df0a5e79c268e4e8cc2fa0f9d4c88fefc146305 (diff)
downloadQt-3bd0062535aaa991fadf739f9362851afacb19eb.zip
Qt-3bd0062535aaa991fadf739f9362851afacb19eb.tar.gz
Qt-3bd0062535aaa991fadf739f9362851afacb19eb.tar.bz2
Recognize T_MULTILINE_STRING_LITERAL as a primary expression and removed UiMultilineStringLiteral statements.
Diffstat (limited to 'src/declarative/qml')
-rw-r--r--src/declarative/qml/parser/qmljs.g29
-rw-r--r--src/declarative/qml/parser/qmljsgrammar.cpp1427
-rw-r--r--src/declarative/qml/parser/qmljsgrammar_p.h18
-rw-r--r--src/declarative/qml/parser/qmljsparser.cpp428
-rw-r--r--src/declarative/qml/parser/qmljsparser_p.h4
5 files changed, 929 insertions, 977 deletions
diff --git a/src/declarative/qml/parser/qmljs.g b/src/declarative/qml/parser/qmljs.g
index 43cce40..20ee27d 100644
--- a/src/declarative/qml/parser/qmljs.g
+++ b/src/declarative/qml/parser/qmljs.g
@@ -750,26 +750,6 @@ case $rule_number: {
} break;
./
-UiMultilineStringLiteral: T_MULTILINE_STRING_LITERAL ;
-/.
-case $rule_number: {
- AST::StringLiteral *node = makeAstNode<AST::StringLiteral> (driver->nodePool(), sym(1).sval);
- node->literalToken = loc(1);
- sym(1).Node = node;
-} break;
-./
-
-UiMultilineStringStatement: UiMultilineStringLiteral T_AUTOMATIC_SEMICOLON ; -- automatic semicolon
-UiMultilineStringStatement: UiMultilineStringLiteral T_SEMICOLON ;
-/.
-case $rule_number: {
- AST::ExpressionStatement *node = makeAstNode<AST::ExpressionStatement> (driver->nodePool(), sym(1).Expression);
- node->semicolonToken = loc(2);
- sym(1).Node = node;
-} break;
-./
-
-
UiObjectMember: UiQualifiedId T_COLON Expression UiObjectInitializer ;
/.
case $rule_number: {
@@ -798,12 +778,6 @@ UiObjectMember: UiQualifiedId T_COLON EmptyStatement ;
UiObjectMember: UiQualifiedId T_COLON ExpressionStatement ;
/.case $rule_number:./
-UiObjectMember: UiQualifiedId T_COLON DebuggerStatement ;
-/.case $rule_number:./
-
-UiObjectMember: UiQualifiedId T_COLON UiMultilineStringStatement ;
-/.case $rule_number:./
-
UiObjectMember: UiQualifiedId T_COLON IfStatement ; --- ### do we really want if statement in a binding?
/.case $rule_number:./
@@ -1053,6 +1027,9 @@ case $rule_number: {
} break;
./
+PrimaryExpression: T_MULTILINE_STRING_LITERAL ;
+/.case $rule_number:./
+
PrimaryExpression: T_STRING_LITERAL ;
/.
case $rule_number: {
diff --git a/src/declarative/qml/parser/qmljsgrammar.cpp b/src/declarative/qml/parser/qmljsgrammar.cpp
index 4fba480..1b23be6 100644
--- a/src/declarative/qml/parser/qmljsgrammar.cpp
+++ b/src/declarative/qml/parser/qmljsgrammar.cpp
@@ -2,7 +2,7 @@
/****************************************************************************
**
** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
-** Contact: Qt Software Information (qt-info@nokia.com)
+** Contact: Nokia Corporation (qt-info@nokia.com)
**
** This file is part of the QtCore module of the Qt Toolkit.
**
@@ -35,7 +35,7 @@
** met: http://www.gnu.org/copyleft/gpl.html.
**
** If you are unsure which license is appropriate for your use, please
-** contact the sales department at qt-sales@nokia.com.
+** contact the sales department at http://www.qtsoftware.com/contact.
** $QT_END_LICENSE$
**
****************************************************************************/
@@ -58,550 +58,541 @@ const int QmlJSGrammar::lhs [] = {
95, 95, 95, 96, 99, 99, 102, 102, 103, 103,
103, 103, 103, 103, 103, 103, 103, 103, 103, 103,
101, 100, 107, 107, 109, 109, 110, 110, 106, 108,
- 108, 111, 112, 112, 108, 108, 108, 108, 108, 108,
- 108, 118, 118, 118, 119, 119, 120, 120, 108, 108,
- 108, 108, 108, 108, 108, 108, 108, 108, 108, 108,
- 105, 105, 104, 104, 104, 123, 123, 123, 123, 123,
- 123, 123, 123, 123, 123, 123, 123, 123, 123, 123,
- 123, 123, 105, 105, 125, 125, 125, 125, 124, 124,
- 127, 127, 129, 129, 129, 129, 129, 129, 130, 130,
- 130, 130, 130, 130, 130, 130, 130, 130, 130, 130,
- 130, 130, 130, 130, 130, 130, 130, 130, 130, 130,
- 130, 130, 130, 130, 130, 130, 130, 130, 130, 131,
- 131, 132, 132, 132, 132, 132, 135, 135, 136, 136,
- 136, 136, 134, 134, 137, 137, 138, 138, 139, 139,
- 139, 140, 140, 140, 140, 140, 140, 140, 140, 140,
- 140, 141, 141, 141, 141, 142, 142, 142, 143, 143,
- 143, 143, 144, 144, 144, 144, 144, 144, 144, 145,
- 145, 145, 145, 145, 145, 146, 146, 146, 146, 146,
- 147, 147, 147, 147, 147, 148, 148, 149, 149, 150,
- 150, 151, 151, 152, 152, 153, 153, 154, 154, 155,
- 155, 156, 156, 157, 157, 158, 158, 159, 159, 128,
- 128, 160, 160, 161, 161, 161, 161, 161, 161, 161,
- 161, 161, 161, 161, 161, 98, 98, 162, 162, 163,
- 163, 164, 164, 97, 97, 97, 97, 97, 97, 97,
- 97, 97, 97, 97, 97, 97, 97, 97, 113, 175,
- 175, 174, 174, 122, 122, 176, 176, 177, 177, 179,
- 179, 178, 180, 183, 181, 181, 184, 182, 182, 114,
- 115, 115, 117, 117, 165, 165, 165, 165, 165, 165,
- 165, 166, 166, 166, 166, 167, 167, 167, 167, 168,
- 168, 169, 171, 185, 185, 188, 188, 186, 186, 189,
- 187, 170, 170, 170, 172, 172, 173, 173, 173, 190,
- 191, 116, 116, 121, 133, 195, 195, 192, 192, 193,
- 193, 196, 197, 197, 198, 198, 194, 194, 126, 126,
- 199};
+ 108, 108, 108, 108, 108, 108, 115, 115, 115, 116,
+ 116, 117, 117, 108, 108, 108, 108, 108, 108, 108,
+ 108, 108, 108, 108, 108, 105, 105, 104, 104, 104,
+ 120, 120, 120, 120, 120, 120, 120, 120, 120, 120,
+ 120, 120, 120, 120, 120, 120, 120, 120, 105, 105,
+ 122, 122, 122, 122, 121, 121, 124, 124, 126, 126,
+ 126, 126, 126, 126, 127, 127, 127, 127, 127, 127,
+ 127, 127, 127, 127, 127, 127, 127, 127, 127, 127,
+ 127, 127, 127, 127, 127, 127, 127, 127, 127, 127,
+ 127, 127, 127, 127, 127, 128, 128, 129, 129, 129,
+ 129, 129, 132, 132, 133, 133, 133, 133, 131, 131,
+ 134, 134, 135, 135, 136, 136, 136, 137, 137, 137,
+ 137, 137, 137, 137, 137, 137, 137, 138, 138, 138,
+ 138, 139, 139, 139, 140, 140, 140, 140, 141, 141,
+ 141, 141, 141, 141, 141, 142, 142, 142, 142, 142,
+ 142, 143, 143, 143, 143, 143, 144, 144, 144, 144,
+ 144, 145, 145, 146, 146, 147, 147, 148, 148, 149,
+ 149, 150, 150, 151, 151, 152, 152, 153, 153, 154,
+ 154, 155, 155, 156, 156, 125, 125, 157, 157, 158,
+ 158, 158, 158, 158, 158, 158, 158, 158, 158, 158,
+ 158, 98, 98, 159, 159, 160, 160, 161, 161, 97,
+ 97, 97, 97, 97, 97, 97, 97, 97, 97, 97,
+ 97, 97, 97, 97, 111, 173, 173, 172, 172, 119,
+ 119, 174, 174, 175, 175, 177, 177, 176, 178, 181,
+ 179, 179, 182, 180, 180, 112, 113, 113, 114, 114,
+ 162, 162, 162, 162, 162, 162, 162, 163, 163, 163,
+ 163, 164, 164, 164, 164, 165, 165, 166, 168, 183,
+ 183, 186, 186, 184, 184, 187, 185, 167, 167, 167,
+ 169, 169, 170, 170, 170, 188, 189, 171, 171, 118,
+ 130, 193, 193, 190, 190, 191, 191, 194, 195, 195,
+ 196, 196, 192, 192, 123, 123, 197};
const int QmlJSGrammar:: rhs[] = {
2, 2, 2, 2, 1, 1, 1, 2, 3, 3,
5, 5, 3, 3, 4, 4, 6, 6, 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,
+ 5, 4, 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, 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,
+ 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, 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,
+ 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,
- 1, 3, 3, 3, 3, 1, 3, 1, 3, 1,
+ 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, 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};
+ 3, 1, 3, 1, 3, 1, 3, 1, 3, 1,
+ 3, 1, 5, 1, 5, 1, 3, 1, 3, 1,
+ 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
+ 1, 1, 3, 0, 1, 1, 3, 0, 1, 1,
+ 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
+ 1, 1, 1, 1, 3, 1, 2, 0, 1, 3,
+ 3, 1, 1, 1, 3, 1, 3, 2, 2, 2,
+ 0, 1, 2, 0, 1, 1, 2, 2, 7, 5,
+ 7, 7, 5, 9, 10, 7, 8, 2, 2, 3,
+ 3, 2, 2, 3, 3, 3, 3, 5, 5, 3,
+ 5, 1, 2, 0, 1, 4, 3, 3, 3, 3,
+ 3, 3, 3, 3, 4, 5, 2, 2, 2, 8,
+ 8, 1, 3, 0, 1, 0, 1, 1, 1, 2,
+ 1, 1, 0, 1, 0, 1, 2};
const int QmlJSGrammar::action_default [] = {
- 0, 0, 0, 21, 0, 169, 236, 200, 208, 204,
- 148, 220, 196, 3, 133, 67, 149, 212, 216, 137,
- 166, 147, 152, 132, 186, 173, 0, 73, 74, 70,
- 337, 63, 339, 0, 0, 0, 0, 0, 0, 68,
- 71, 0, 0, 64, 65, 72, 66, 0, 69, 0,
- 0, 162, 0, 0, 149, 168, 151, 150, 0, 0,
- 0, 164, 165, 163, 167, 0, 197, 0, 0, 0,
- 0, 187, 0, 0, 0, 0, 0, 0, 177, 0,
- 0, 0, 171, 172, 170, 175, 179, 178, 176, 174,
- 189, 188, 190, 0, 205, 0, 201, 0, 0, 143,
- 130, 142, 131, 99, 100, 101, 126, 102, 127, 103,
- 104, 105, 106, 107, 108, 109, 110, 111, 112, 113,
- 114, 115, 128, 116, 117, 118, 119, 120, 121, 122,
- 123, 124, 125, 129, 0, 0, 141, 237, 144, 0,
- 145, 0, 146, 140, 0, 233, 226, 224, 231, 232,
- 230, 229, 235, 228, 227, 225, 234, 221, 0, 209,
- 0, 0, 213, 0, 0, 217, 0, 0, 143, 135,
- 0, 134, 0, 139, 153, 0, 338, 328, 329, 0,
- 326, 0, 327, 0, 330, 244, 251, 250, 258, 246,
- 0, 247, 331, 0, 336, 248, 249, 254, 252, 333,
- 332, 335, 255, 0, 266, 0, 0, 0, 0, 337,
- 63, 0, 339, 64, 238, 280, 65, 0, 0, 0,
- 267, 0, 0, 256, 257, 0, 245, 253, 281, 282,
- 325, 334, 0, 296, 297, 298, 299, 0, 292, 293,
- 294, 295, 322, 323, 0, 0, 0, 0, 0, 285,
- 286, 242, 240, 202, 210, 206, 222, 198, 243, 0,
- 149, 214, 218, 191, 180, 0, 0, 199, 0, 0,
- 0, 0, 192, 0, 0, 0, 0, 0, 184, 182,
- 185, 183, 181, 194, 193, 195, 0, 207, 0, 203,
- 0, 241, 149, 0, 223, 238, 239, 0, 238, 0,
- 0, 288, 0, 0, 0, 290, 0, 211, 0, 0,
- 215, 0, 0, 219, 278, 0, 270, 279, 273, 0,
- 277, 0, 238, 271, 0, 238, 0, 0, 289, 0,
- 0, 0, 291, 338, 328, 0, 0, 330, 0, 324,
- 0, 314, 0, 0, 0, 284, 0, 283, 0, 340,
- 0, 98, 260, 263, 0, 99, 266, 102, 127, 104,
- 105, 70, 109, 110, 63, 111, 114, 68, 71, 64,
- 238, 65, 72, 117, 66, 119, 69, 121, 122, 267,
- 124, 125, 129, 0, 91, 0, 0, 93, 97, 95,
- 81, 94, 96, 0, 92, 80, 261, 259, 137, 138,
- 143, 0, 136, 0, 313, 0, 300, 301, 0, 312,
- 0, 0, 0, 303, 308, 306, 309, 0, 0, 307,
- 308, 0, 304, 0, 305, 262, 311, 0, 262, 310,
- 0, 315, 316, 0, 262, 317, 318, 0, 0, 319,
- 0, 0, 0, 320, 321, 155, 154, 0, 0, 0,
- 287, 0, 0, 0, 302, 275, 268, 0, 276, 272,
- 0, 274, 264, 0, 265, 269, 85, 0, 0, 89,
- 75, 0, 77, 87, 0, 78, 88, 90, 79, 86,
- 76, 0, 82, 159, 157, 161, 158, 156, 160, 2,
- 5, 0, 7, 6, 0, 1, 83, 61, 62, 0,
- 0, 0, 9, 10, 0, 11, 12, 0, 13, 0,
- 0, 14, 0, 19, 20, 84, 0, 15, 16, 0,
- 17, 18, 8, 22, 0, 4, 0, 29, 59, 0,
- 0, 64, 27, 65, 30, 23, 0, 0, 60, 0,
- 44, 43, 42, 0, 0, 53, 0, 54, 0, 57,
- 58, 0, 0, 0, 51, 0, 52, 0, 55, 56,
- 50, 45, 46, 0, 0, 0, 0, 48, 49, 47,
- 28, 24, 0, 36, 39, 37, 0, 38, 41, 262,
- 0, 32, 0, 40, 35, 99, 266, 102, 127, 104,
- 105, 70, 109, 110, 63, 111, 114, 68, 71, 64,
- 238, 65, 72, 117, 66, 119, 69, 121, 122, 267,
- 124, 125, 129, 67, 0, 25, 0, 31, 26, 33,
- 34, 341};
+ 0, 0, 0, 21, 0, 165, 232, 196, 204, 200,
+ 144, 216, 192, 3, 129, 62, 145, 208, 212, 133,
+ 162, 143, 148, 128, 182, 169, 0, 69, 70, 65,
+ 333, 58, 335, 0, 0, 0, 0, 67, 0, 0,
+ 63, 66, 0, 0, 59, 60, 68, 61, 0, 64,
+ 0, 0, 158, 0, 0, 145, 164, 147, 146, 0,
+ 0, 0, 160, 161, 159, 163, 0, 193, 0, 0,
+ 0, 0, 183, 0, 0, 0, 0, 0, 0, 173,
+ 0, 0, 0, 167, 168, 166, 171, 175, 174, 172,
+ 170, 185, 184, 186, 0, 201, 0, 197, 0, 0,
+ 139, 126, 138, 127, 95, 96, 97, 122, 98, 123,
+ 99, 100, 101, 102, 103, 104, 105, 106, 107, 108,
+ 109, 110, 111, 124, 112, 113, 114, 115, 116, 117,
+ 118, 119, 120, 121, 125, 0, 0, 137, 233, 140,
+ 0, 141, 0, 142, 136, 0, 229, 222, 220, 227,
+ 228, 226, 225, 231, 224, 223, 221, 230, 217, 0,
+ 205, 0, 0, 209, 0, 0, 213, 0, 0, 139,
+ 131, 0, 130, 0, 135, 149, 0, 334, 324, 325,
+ 0, 322, 0, 323, 0, 326, 240, 247, 246, 254,
+ 242, 0, 243, 327, 0, 332, 244, 245, 250, 248,
+ 329, 328, 331, 251, 0, 262, 0, 0, 0, 0,
+ 333, 58, 0, 335, 59, 234, 276, 60, 0, 0,
+ 0, 263, 0, 0, 252, 253, 0, 241, 249, 277,
+ 278, 321, 330, 0, 292, 293, 294, 295, 0, 288,
+ 289, 290, 291, 318, 319, 0, 0, 0, 0, 0,
+ 281, 282, 238, 236, 198, 206, 202, 218, 194, 239,
+ 0, 145, 210, 214, 187, 176, 0, 0, 195, 0,
+ 0, 0, 0, 188, 0, 0, 0, 0, 0, 180,
+ 178, 181, 179, 177, 190, 189, 191, 0, 203, 0,
+ 199, 0, 237, 145, 0, 219, 234, 235, 0, 234,
+ 0, 0, 284, 0, 0, 0, 286, 0, 207, 0,
+ 0, 211, 0, 0, 215, 274, 0, 266, 275, 269,
+ 0, 273, 0, 234, 267, 0, 234, 0, 0, 285,
+ 0, 0, 0, 287, 334, 324, 0, 0, 326, 0,
+ 320, 0, 310, 0, 0, 0, 280, 0, 279, 0,
+ 336, 0, 94, 256, 259, 0, 95, 262, 98, 123,
+ 100, 101, 65, 105, 106, 58, 107, 110, 63, 66,
+ 59, 234, 60, 68, 113, 61, 115, 64, 117, 118,
+ 263, 120, 121, 125, 0, 87, 0, 0, 89, 93,
+ 91, 77, 90, 92, 0, 88, 76, 257, 255, 133,
+ 134, 139, 0, 132, 0, 309, 0, 296, 297, 0,
+ 308, 0, 0, 0, 299, 304, 302, 305, 0, 0,
+ 303, 304, 0, 300, 0, 301, 258, 307, 0, 258,
+ 306, 0, 311, 312, 0, 258, 313, 314, 0, 0,
+ 315, 0, 0, 0, 316, 317, 151, 150, 0, 0,
+ 0, 283, 0, 0, 0, 298, 271, 264, 0, 272,
+ 268, 0, 270, 260, 0, 261, 265, 81, 0, 0,
+ 85, 71, 0, 73, 83, 0, 74, 84, 86, 75,
+ 82, 72, 0, 78, 155, 153, 157, 154, 152, 156,
+ 2, 5, 0, 7, 6, 0, 1, 79, 56, 57,
+ 0, 0, 0, 9, 10, 0, 11, 12, 0, 13,
+ 0, 0, 14, 0, 19, 20, 80, 0, 15, 16,
+ 0, 17, 18, 8, 22, 0, 4, 0, 29, 54,
+ 0, 0, 59, 27, 60, 30, 23, 0, 0, 55,
+ 0, 39, 38, 37, 0, 0, 48, 0, 49, 0,
+ 52, 53, 0, 0, 0, 46, 0, 47, 0, 50,
+ 51, 45, 40, 41, 0, 0, 0, 0, 43, 44,
+ 42, 28, 24, 0, 33, 34, 0, 35, 36, 258,
+ 0, 32, 95, 262, 98, 123, 100, 101, 65, 105,
+ 106, 58, 107, 110, 63, 66, 59, 234, 60, 68,
+ 113, 61, 115, 64, 117, 118, 263, 120, 121, 125,
+ 62, 0, 25, 0, 31, 26, 337};
const int QmlJSGrammar::goto_default [] = {
- 4, 495, 352, 190, 494, 525, 490, 493, 492, 15,
- 524, 534, 536, 535, 614, 527, 582, 583, 185, 189,
- 191, 188, 195, 552, 563, 562, 194, 226, 23, 468,
- 467, 350, 349, 6, 348, 351, 101, 19, 14, 139,
- 21, 10, 138, 16, 22, 51, 20, 5, 25, 24,
- 263, 12, 257, 7, 253, 9, 255, 8, 254, 17,
- 261, 18, 262, 11, 256, 252, 293, 405, 258, 259,
- 196, 187, 186, 198, 227, 197, 202, 223, 224, 354,
- 353, 225, 457, 456, 315, 316, 459, 318, 458, 317,
- 413, 417, 420, 416, 415, 435, 436, 179, 193, 175,
- 178, 192, 200, 199, 0};
+ 4, 496, 353, 191, 495, 526, 491, 494, 493, 15,
+ 525, 535, 537, 536, 611, 528, 186, 190, 192, 196,
+ 553, 564, 563, 195, 227, 23, 469, 468, 351, 350,
+ 6, 349, 352, 102, 19, 14, 140, 21, 10, 139,
+ 16, 22, 52, 20, 5, 25, 24, 264, 12, 258,
+ 7, 254, 9, 256, 8, 255, 17, 262, 18, 263,
+ 11, 257, 253, 294, 406, 259, 260, 197, 188, 187,
+ 199, 228, 198, 203, 224, 225, 189, 355, 354, 226,
+ 458, 457, 316, 317, 460, 319, 459, 318, 414, 418,
+ 421, 417, 416, 436, 437, 180, 194, 176, 179, 193,
+ 201, 200, 0};
const int QmlJSGrammar::action_index [] = {
- 236, 824, 1879, -3, 176, 80, -95, 102, 36, -14,
- 266, -95, 337, 90, -95, -95, 528, 100, 78, 344,
- 220, -95, -95, -95, 565, 177, 824, -95, -95, -95,
- 209, -95, 1697, 1083, 824, 824, 824, 740, 824, -95,
- -95, 824, 824, -95, -95, -95, -95, 824, -95, 824,
- 824, -95, 824, 824, 136, 183, -95, -95, 824, 824,
- 824, -95, -95, -95, 146, 824, 342, 824, 824, 690,
- 824, 565, 824, 824, 824, 824, 824, 824, 156, 824,
- 824, 824, 134, 124, 84, 232, 255, 261, 260, 218,
- 487, 472, 565, 824, 49, 824, 73, 1606, 824, 824,
+ 208, 808, 1863, 61, 100, 76, -95, 95, 59, 54,
+ 261, -95, 405, 86, -95, -95, 641, 91, 67, 187,
+ 200, -95, -95, -95, 446, 206, 808, -95, -95, -95,
+ 188, -95, 1681, 1412, 808, 808, 808, -95, 724, 808,
+ -95, -95, 808, 808, -95, -95, -95, -95, 808, -95,
+ 808, 808, -95, 808, 808, 131, 212, -95, -95, 808,
+ 808, 808, -95, -95, -95, 157, 808, 405, 808, 808,
+ 808, 808, 471, 808, 808, 808, 808, 808, 808, 161,
+ 808, 808, 808, 112, 119, 117, 154, 178, 173, 234,
+ 233, 456, 549, 409, 808, 9, 808, 72, 1590, 808,
+ 808, -95, -95, -95, -95, -95, -95, -95, -95, -95,
-95, -95, -95, -95, -95, -95, -95, -95, -95, -95,
-95, -95, -95, -95, -95, -95, -95, -95, -95, -95,
- -95, -95, -95, -95, -95, -95, -95, -95, -95, -95,
- -95, -95, -95, -95, 137, 824, -95, -95, 63, 35,
- -95, 824, -95, -95, 824, -95, -95, -95, -95, -95,
- -95, -95, -95, -95, -95, -95, -95, -95, 824, 38,
- 824, 824, 70, 62, 824, -95, 1606, 824, 824, -95,
- 104, -95, 37, -95, -95, 40, -95, 198, 67, 46,
- -95, 168, -95, 45, 1970, -95, -95, -95, -95, -95,
- 205, -95, -95, 44, -95, -95, -95, -95, -95, -95,
- 1970, -95, -95, 375, -95, 427, 82, 1879, 32, 243,
- 59, 53, 2152, 74, 824, -95, 76, 58, 824, 57,
- -95, 65, 64, -95, -95, 300, -95, -95, -95, -95,
- -95, -95, 79, -95, -95, -95, -95, 77, -95, -95,
- -95, -95, -95, -95, 50, 68, 824, 110, 72, -95,
- -95, 996, -95, 60, 34, -8, -95, 421, 71, 19,
- 582, 61, 92, 420, 287, 249, 824, 304, 824, 824,
- 824, 824, 394, 824, 824, 824, 824, 824, 308, 279,
- 286, 293, 294, 379, 373, 493, 824, -5, 824, 66,
- 824, -95, 657, 824, -95, 824, 54, 30, 824, 33,
- 1879, -95, 824, 117, 1879, -95, 824, 69, 824, 824,
- 94, 52, 824, -95, 75, 111, 56, -95, -95, 824,
- -95, 278, 824, -95, 55, 824, -15, 1879, -95, 824,
- 122, 1879, -95, -22, 305, -42, -27, 1970, -51, -95,
- 1879, -95, 824, 113, 1879, -1, 1879, -95, 6, 3,
- -45, -95, -95, 1879, -32, 409, 14, 424, 107, 824,
- 1879, 2, -34, 318, 81, -35, 740, -4, -7, -95,
- 912, -95, 0, -12, 21, 824, 41, 20, 824, 43,
- 824, 16, 15, 824, -95, 1788, 31, -95, -95, -95,
- -95, -95, -95, 824, -95, -95, -95, -95, 269, -95,
- 824, 17, -95, 1879, -95, 86, -95, -95, 1879, -95,
- 824, 103, 23, -95, 42, -95, 26, 112, 824, -95,
- 28, 25, -95, -25, -95, 1879, -95, 101, 1879, -95,
- 281, -95, -95, 109, 1879, 9, -95, -10, 11, -95,
- 272, -17, 8, -95, -95, -95, -95, 824, 99, 1879,
- -95, 824, 106, 1879, -95, 22, -95, 190, -95, -95,
- 824, -95, -95, 229, -95, -95, -95, 105, 1257, -95,
- -95, 1344, -95, -95, 1170, -95, -95, -95, -95, -95,
- -95, 97, -95, -95, -95, -95, -95, -95, -95, -95,
- -95, 468, -95, -39, 334, -95, -95, -95, -95, 201,
- 359, 194, -95, -95, 88, -95, -95, 202, -95, 207,
- 164, -95, 129, -95, -95, -95, 181, -95, -95, 91,
- -95, -95, -95, -95, 121, -95, 491, -95, -95, -9,
- 225, 170, -95, 7, -95, -95, 477, 264, -95, 126,
- -95, -95, -95, 5, 144, -95, 824, -95, 188, -95,
- -95, 4, 13, 158, -95, 824, -95, 180, -95, -95,
- 1, 133, 27, -33, 155, 127, 163, -95, -95, -95,
- -95, -95, 1428, -95, -95, -95, 329, -95, -95, 2061,
- 1515, -95, 125, -95, -95, 398, 51, 384, 118, 824,
- 1879, 18, 24, 328, 81, 29, 740, 48, 47, -95,
- 912, -95, 39, -28, -2, 824, 12, -11, 824, 10,
- 824, -20, -24, -13, 115, -95, 395, -95, -95, -95,
- -95, -95,
+ -95, -95, -95, -95, -95, 139, 808, -95, -95, 66,
+ 23, -95, 808, -95, -95, 808, -95, -95, -95, -95,
+ -95, -95, -95, -95, -95, -95, -95, -95, -95, 808,
+ 33, 808, 808, 69, 57, 808, -95, 1590, 808, 808,
+ -95, 126, -95, 8, -95, -95, 29, -95, 186, 62,
+ 60, -95, 207, -95, 36, 1954, -95, -95, -95, -95,
+ -95, 205, -95, -95, 35, -95, -95, -95, -95, -95,
+ -95, 1954, -95, -95, 386, -95, 398, 77, 1863, 50,
+ 162, 78, 42, 2136, 73, 808, -95, 85, 48, 808,
+ 56, -95, 43, 39, -95, -95, 328, -95, -95, -95,
+ -95, -95, -95, 75, -95, -95, -95, -95, 84, -95,
+ -95, -95, -95, -95, -95, 38, 55, 808, 102, 79,
+ -95, -95, 892, -95, 175, 47, 34, -95, 324, 74,
+ 16, 551, 65, 68, 477, 278, 328, 808, 292, 808,
+ 808, 808, 808, 402, 808, 808, 808, 808, 808, 302,
+ 306, 303, 282, 307, 385, 477, 477, 808, -2, 808,
+ 71, 808, -95, 641, 808, -95, 808, 58, 63, 808,
+ 51, 1863, -95, 808, 147, 1863, -95, 808, 14, 808,
+ 808, 96, 92, 808, -95, 80, 105, 70, -95, -95,
+ 808, -95, 255, 808, -95, -58, 808, -39, 1863, -95,
+ 808, 120, 1863, -95, -20, 259, -47, -21, 1954, -36,
+ -95, 1863, -95, 808, 101, 1863, 11, 1863, -95, 15,
+ 3, -45, -95, -95, 1863, -54, 401, 2, 337, 116,
+ 808, 1863, 0, -32, 318, -1, -28, 724, 81, -5,
+ -95, 980, -95, 45, 19, 46, 808, 44, 17, 808,
+ 41, 808, 13, -8, 808, -95, 1772, 49, -95, -95,
+ -95, -95, -95, -95, 808, -95, -95, -95, -95, 272,
+ -95, 808, -13, -95, 1863, -95, 64, -95, -95, 1863,
+ -95, 808, 98, 4, -95, 25, -95, 31, 93, 808,
+ -95, 40, 37, -95, -12, -95, 1863, -95, 123, 1863,
+ -95, 288, -95, -95, 109, 1863, 20, -95, -4, 1,
+ -95, 328, -14, 21, -95, -95, -95, -95, 808, 115,
+ 1863, -95, 808, 125, 1863, -95, 12, -95, 185, -95,
+ -95, 808, -95, -95, 252, -95, -95, -95, 97, 1154,
+ -95, -95, 1067, -95, -95, 1241, -95, -95, -95, -95,
+ -95, -95, 94, -95, -95, -95, -95, -95, -95, -95,
+ -95, -95, 407, -95, -73, 376, -95, -95, -95, -95,
+ 179, 321, 198, -95, -95, 110, -95, -95, 227, -95,
+ 248, 228, -95, 89, -95, -95, -95, 219, -95, -95,
+ 103, -95, -95, -95, -95, 127, -95, 475, -95, -95,
+ -46, 168, 165, -95, -6, -95, -95, 500, 189, -95,
+ 158, -95, -95, -95, 32, 176, -95, 808, -95, 262,
+ -95, -95, 6, 10, 128, -95, 808, -95, 148, -95,
+ -95, 5, 145, 30, -3, 213, 177, 216, -95, -95,
+ -95, -95, -95, 1325, -95, -95, 327, -95, -95, 2045,
+ 1499, -95, 345, 26, 330, 82, 808, 1863, 28, 22,
+ 310, 52, 27, 584, 81, 53, -95, 980, -95, 24,
+ -31, -7, 808, 7, -9, 808, 18, 808, -10, -19,
+ -15, 111, -95, 334, -95, -95, -95,
- -105, 21, 23, -105, -105, -105, -105, -105, -105, -105,
- -105, -105, -105, -105, -105, -105, -45, -105, -105, -105,
- -105, -105, -105, -105, -105, -105, 82, -105, -105, -105,
- 35, -105, -105, 31, 33, 179, 161, 176, 165, -105,
- -105, 183, 182, -105, -105, -105, -105, 140, -105, 143,
- 139, -105, 159, 135, -105, -105, -105, -105, 156, 155,
- 152, -105, -105, -105, -105, 90, -105, 126, 128, 130,
- 160, -105, 169, 115, 87, 89, 124, 97, -105, 73,
- 76, 39, -105, -105, -105, -105, -105, -105, -105, -105,
- -105, -105, -105, 168, -105, 108, -105, 80, 74, 70,
- -105, -105, -105, -105, -105, -105, -105, -105, -105, -105,
- -105, -105, -105, -105, -105, -105, -105, -105, -105, -105,
- -105, -105, -105, -105, -105, -105, -105, -105, -105, -105,
- -105, -105, -105, -105, -105, 62, -105, -105, -105, -105,
- -105, 55, -105, -105, 66, -105, -105, -105, -105, -105,
- -105, -105, -105, -105, -105, -105, -105, -105, 100, -105,
- 148, -31, -105, -105, -33, -105, 206, 37, 103, -105,
- -105, -105, -105, -105, -105, -105, -105, 22, -105, -105,
- -105, 19, -105, -105, 28, -105, -105, -105, -105, -105,
- -105, -105, -105, -105, -105, -105, -105, -105, -105, -105,
- 91, -105, -105, 64, -105, 50, -105, 41, -105, 43,
- -105, -105, -105, -105, 54, -105, -105, -105, 42, 67,
- -105, -105, -105, -105, -105, 4, -105, -105, -105, -105,
- -105, -105, -105, -105, -105, -105, -105, -105, -105, -105,
- -105, -105, -105, -105, -105, -105, 34, -105, -105, -105,
- -105, 107, -105, -105, -105, -105, -105, -105, -105, -105,
- -105, -105, -105, -105, -105, 17, 197, -105, 230, 234,
- 242, 211, -105, 122, 116, 105, 96, 78, -105, -105,
- -105, -105, -105, -105, -105, -105, 188, -105, 215, -105,
- 214, -105, -105, 203, -105, 153, -105, -105, 273, -105,
- 5, -105, 3, -105, 12, -105, 217, -105, 223, 190,
- -105, -105, 187, -105, -105, -105, -105, -105, -105, 238,
- -105, 129, 186, -105, -105, 189, -105, 52, -105, 53,
- -105, 56, -105, -105, 137, -105, -105, 98, -105, -105,
- 40, -105, 45, -105, 44, -105, 59, -105, -105, -105,
- -105, -105, -105, 61, -105, 57, -105, 60, -105, 109,
- 68, -105, -105, 46, -105, -105, 150, -105, -105, -105,
- 29, -105, -105, -105, -105, 0, -105, 32, 86, -105,
- 123, -105, -105, -6, -105, -26, -105, -105, -105, -105,
- -105, -105, -105, -24, -105, -105, -105, -105, -105, -105,
- 95, -105, -105, 16, -105, -105, -105, -105, 2, -105,
- 8, -105, -105, -105, -105, -105, -19, -105, 75, -105,
- -38, -105, -105, -105, -105, -17, -105, -105, -30, -105,
- -105, -105, -105, -105, -105, -58, -105, -105, 58, -105,
- 51, -105, 49, -105, -105, -105, -105, 171, -105, 72,
- -105, 65, -105, 63, -105, -105, -105, -105, -105, -105,
- 38, -105, -105, 184, -105, -105, -105, -105, 47, -105,
- -105, 147, -105, -105, 48, -105, -105, -105, -105, -105,
- -105, -105, -105, -105, -105, -105, -105, -105, -105, -105,
- -105, 88, -105, 71, 85, -105, -105, -105, -105, -105,
- -105, 1, -105, -105, -105, -105, -105, -4, -105, 6,
- -105, -105, -105, -105, -105, -105, 7, -105, -105, -105,
- -105, -105, -105, -105, -105, -105, 369, -105, -105, -105,
- 10, -105, -105, -105, -105, -105, 278, -105, -105, -22,
- -105, -105, -105, -105, -105, -105, 69, -105, -105, -105,
- -105, -105, -105, -105, -105, 9, -105, -105, -105, -105,
- -105, 24, -105, -105, 11, 18, 25, -105, -105, -105,
- -105, -105, 290, -105, -105, -105, 36, -105, -105, -105,
- 210, -105, -105, -105, -105, 30, -105, 26, -105, 79,
- 27, -105, -105, 13, -105, -105, 77, -105, -105, -105,
- 20, -105, -105, -105, -105, 14, -105, 15, 117, -105,
- 104, -105, -105, -105, -105, -105, 81, -105, -105, -105,
- -105, -105};
+ -103, 37, 13, -103, -103, -103, -103, -103, -103, -103,
+ -103, -103, -103, -103, -103, -103, -55, -103, -103, -103,
+ -103, -103, -103, -103, -103, -103, 89, -103, -103, -103,
+ 24, -103, -103, 6, 15, 92, 100, -103, 154, 66,
+ -103, -103, 86, 143, -103, -103, -103, -103, 152, -103,
+ 144, 140, -103, 134, 135, -103, -103, -103, -103, 161,
+ 170, 176, -103, -103, -103, -103, 174, -103, 169, 153,
+ 162, 167, -103, 128, 126, 112, 116, 119, 113, -103,
+ 111, 104, 110, -103, -103, -103, -103, -103, -103, -103,
+ -103, -103, -103, -103, 63, -103, 120, -103, 88, 77,
+ 57, -103, -103, -103, -103, -103, -103, -103, -103, -103,
+ -103, -103, -103, -103, -103, -103, -103, -103, -103, -103,
+ -103, -103, -103, -103, -103, -103, -103, -103, -103, -103,
+ -103, -103, -103, -103, -103, -103, 28, -103, -103, -103,
+ -103, -103, 31, -103, -103, 36, -103, -103, -103, -103,
+ -103, -103, -103, -103, -103, -103, -103, -103, -103, 157,
+ -103, 125, -24, -103, -103, -14, -103, 210, 27, 160,
+ -103, -103, -103, -103, -103, -103, -103, -103, 8, -103,
+ -103, -103, -5, -103, -103, 74, -103, -103, -103, -103,
+ -103, -103, -103, -103, -103, -103, -103, -103, -103, -103,
+ -103, 94, -103, -103, 44, -103, 35, -103, 81, -103,
+ 61, -103, -103, -103, -103, 75, -103, -103, -103, 4,
+ -7, -103, -103, -103, -103, -103, 26, -103, -103, -103,
+ -103, -103, -103, -103, -103, -103, -103, -103, -103, -103,
+ -103, -103, -103, -103, -103, -103, -103, 68, -103, -103,
+ -103, -103, 90, -103, -103, -103, -103, -103, -103, -103,
+ -103, -103, -103, -103, -103, -103, 70, 220, -103, 208,
+ 231, 230, 234, -103, 101, 82, 60, 76, 79, -103,
+ -103, -103, -103, -103, -103, -103, -103, 211, -103, 194,
+ -103, 192, -103, -103, 204, -103, 166, -103, -103, 197,
+ -103, 23, -103, -1, -103, 9, -103, 180, -103, 181,
+ 223, -103, -103, 227, -103, -103, -103, -103, -103, -103,
+ 184, -103, 93, 98, -103, -103, 108, -103, 83, -103,
+ 78, -103, 40, -103, -103, 109, -103, -103, 102, -103,
+ -103, 41, -103, 43, -103, 52, -103, 62, -103, -103,
+ -103, -103, -103, -103, 55, -103, 50, -103, 51, -103,
+ 107, 49, -103, -103, 73, -103, -103, 154, -103, -103,
+ -103, 64, -103, -103, -103, -103, 16, -103, 12, 147,
+ -103, 103, -103, -103, -4, -103, 0, -103, -103, -103,
+ -103, -103, -103, -103, 7, -103, -103, -103, -103, -103,
+ -103, 187, -103, -103, 25, -103, -103, -103, -103, 71,
+ -103, 65, -103, -103, -103, -103, -103, -44, -103, 46,
+ -103, -34, -103, -103, -103, -103, -21, -103, -103, -45,
+ -103, -103, -103, -103, -103, -103, -32, -103, -103, 53,
+ -103, 56, -103, 47, -103, -103, -103, -103, 42, -103,
+ 45, -103, 38, -103, 48, -103, -103, -103, -103, -103,
+ -103, 22, -103, -103, 124, -103, -103, -103, -103, 59,
+ -103, -103, 137, -103, -103, 54, -103, -103, -103, -103,
+ -103, -103, -103, -103, -103, -103, -103, -103, -103, -103,
+ -103, -103, 248, -103, -3, 114, -103, -103, -103, -103,
+ -103, -103, 5, -103, -103, -103, -103, -103, -8, -103,
+ 85, -103, -103, -103, -103, -103, -103, 11, -103, -103,
+ -103, -103, -103, -103, -103, -103, -103, 342, -103, -103,
+ -103, 29, -103, -103, -103, -103, -103, 273, -103, -103,
+ 3, -103, -103, -103, -103, -103, -103, 18, -103, -103,
+ -103, -103, -103, -103, -103, -103, 21, -103, -103, -103,
+ -103, -103, 2, -103, -103, 20, 14, 30, -103, -103,
+ -103, -103, -103, 284, -103, -103, -2, -103, -103, -103,
+ 222, -103, -9, -103, -6, -103, 96, 10, -103, -103,
+ 1, -103, -103, 80, -103, -103, -103, 72, -103, -103,
+ -103, -103, 69, -103, 58, 67, -103, 97, -103, -103,
+ -103, -103, -103, 84, -103, -103, -103};
const int QmlJSGrammar::action_info [] = {
- -97, 342, 251, -115, 339, -118, 337, -96, 410, -107,
- 395, 385, 451, 383, 334, 346, 447, -123, 336, -120,
- -83, -126, 434, 397, 410, -107, 440, 568, -118, 438,
- 424, 418, 425, 418, 544, 565, 560, 561, 393, 460,
- 334, 434, 553, 442, 434, 327, -96, 418, -120, 491,
- -123, 451, 447, 434, -97, -115, 414, 539, -126, 312,
- 251, 266, 135, 306, 95, 342, 340, 266, 251, 164,
- 288, 141, 158, 288, 65, 181, 177, 402, 184, 290,
- 295, 403, 286, 408, 93, 491, 93, 329, -93, 342,
- 434, 298, 319, 300, 410, 143, 306, 173, 135, 230,
- 451, 447, 158, 65, 246, 135, 183, 135, 428, 135,
- 0, 135, 135, 471, 135, 437, 325, 286, 135, 321,
- 52, 135, 421, 616, 52, 135, 245, 95, 160, 438,
- 135, 53, 161, 250, 249, 53, 509, 0, 241, 240,
- 236, 235, 308, 243, 242, 135, 309, 407, 406, 506,
- 505, 546, 521, 520, 526, 540, 540, 482, 58, 449,
- 171, 472, 540, 412, 52, 555, 453, 422, 243, 242,
- 248, 617, 322, 344, 52, 53, 621, 304, 56, 243,
- 242, 79, 331, 80, 31, 53, 620, 619, 135, 57,
- 514, 513, 31, 136, 81, 58, 135, 31, 463, 540,
- 542, 542, 79, 59, 80, 547, 545, 542, 0, 60,
- 31, 541, 541, 135, 0, 81, 0, 0, 541, 556,
- 554, 43, 44, 31, 0, 518, 517, 31, 0, 43,
- 44, 31, 58, 0, 43, 44, 31, 0, 31, 0,
- 59, 559, 558, 79, 542, 80, 60, 43, 44, 550,
- 549, 464, 462, 516, 31, 541, 81, 79, 31, 80,
- 43, 44, 503, 502, 43, 44, 229, 228, 43, 44,
- 81, 572, 31, 43, 44, 43, 44, 59, 31, 509,
- 79, 97, 80, 60, 166, 79, 79, 80, 80, 135,
- 501, 43, 44, 81, 0, 43, 44, 526, 81, 81,
- 98, 31, 99, 167, 79, 400, 80, 31, 0, 43,
- 44, 79, 79, 80, 80, 43, 44, 81, 79, 79,
- 80, 80, 268, 269, 81, 81, 3, 2, 1, 31,
- 0, 81, 81, 79, 31, 80, 0, 135, 43, 44,
- 0, 0, 432, 431, 43, 44, 81, 31, 0, 270,
- 271, 0, 0, 0, -337, 67, 68, 31, 0, 166,
- 67, 68, 526, 31, -337, 0, 43, 44, 0, 0,
- 0, 43, 44, 0, 509, 0, 0, 0, 167, 0,
- 168, 0, 69, 70, 43, 44, 0, 69, 70, 0,
- 229, 228, 0, 498, 43, 44, 273, 274, 0, 0,
- 43, 44, 273, 274, 31, 275, 510, 0, 276, 0,
- 277, 275, 0, 31, 276, 0, 277, 273, 274, 497,
- 511, 508, 0, 0, 31, 0, 275, 31, 0, 276,
- 0, 277, 0, 0, 0, 0, 234, 233, 31, 268,
- 269, 43, 44, 273, 274, 239, 238, 0, 507, 0,
- 43, 44, 275, 31, 498, 276, 31, 277, 0, 234,
- 233, 43, 44, 0, 43, 44, 270, 271, 0, 0,
- 234, 233, 0, 0, 0, 43, 44, 0, 0, 0,
- 497, 0, 0, 0, 0, 239, 238, 529, 239, 238,
- 43, 44, 0, 43, 44, 72, 73, 31, 0, 530,
- 0, 529, 0, 74, 75, 0, 31, 76, 0, 77,
- 72, 73, 0, 530, 0, 0, 273, 274, 74, 75,
- 31, 0, 76, 0, 77, 275, 0, 498, 276, 0,
- 277, 145, 570, 499, 43, 44, 498, 0, 0, 0,
- 0, 146, 0, 531, 533, 147, 532, 0, 0, 0,
- 498, 220, 0, 497, 148, 0, 149, 531, 533, 0,
- 204, 0, 497, 0, 0, 220, 0, 150, 0, 151,
- 56, 0, 0, 0, 204, 0, 497, 152, 0, 0,
- 153, 57, 0, 0, 0, 145, 154, 0, 72, 73,
- 0, 0, 155, 0, 0, 146, 74, 75, 0, 147,
- 76, 0, 77, 0, 0, 0, 0, 156, 148, 0,
- 149, 0, 0, 302, 0, 0, 0, 0, 0, 0,
- 0, 150, 0, 151, 56, 0, 0, 0, 0, 0,
- 0, 152, 0, 0, 153, 57, 0, 0, 0, 0,
- 154, 0, 0, 0, 0, 0, 155, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 145, 156, 0, 0, 0, 0, 0, 0, 0, 0,
- 146, 0, 0, 0, 147, 0, 0, 0, 0, 0,
- 0, 0, 0, 148, 0, 149, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 150, 0, 151, 56,
- 0, 26, 27, 28, 0, 0, 152, 0, 0, 153,
- 57, 0, 30, 0, 0, 154, 0, 0, 0, 31,
- 0, 155, 0, 32, 33, 0, 34, 0, 0, 0,
- 35, 0, 36, 37, 38, 0, 156, 40, 0, 0,
- 0, 41, 0, 42, 0, 0, 0, 0, 0, 0,
- 0, 0, 27, 28, 0, 45, 43, 44, 0, 46,
- 0, 47, 30, 49, 0, 50, 0, 0, 0, 31,
- 39, 48, 29, 32, 33, 0, 34, 0, 0, 0,
- 0, 0, 0, 37, 0, 0, 0, 40, 0, 0,
+ -114, 398, -93, 326, 252, 411, -89, -103, 343, -122,
+ 396, 386, 338, 337, -116, 492, 335, 452, -79, 340,
+ 540, 328, 384, 561, 435, -119, 448, 347, 452, 461,
+ 419, -92, 441, -122, 435, -103, 419, 415, 566, 554,
+ 439, 562, 335, 425, 426, 419, 443, 403, -119, 448,
+ 435, -116, -92, -114, 435, 411, 394, 569, 252, -89,
+ -93, 545, 287, 343, 165, 178, 136, 307, 174, 185,
+ 182, 159, 267, 66, 142, 452, 289, 296, 343, 448,
+ 404, 94, 291, 144, 411, 341, 252, 96, -111, 435,
+ 231, 247, 409, 159, 136, 287, 66, 320, 307, 313,
+ 616, 330, 136, 422, 0, 472, 136, 94, 0, 136,
+ 136, 301, 289, 322, 246, 438, 53, 161, 309, 613,
+ 184, 162, 310, 136, 299, 408, 407, 54, 136, 439,
+ 429, 136, 96, 136, 136, 556, 237, 236, 244, 243,
+ 251, 250, 510, 244, 243, 242, 241, 136, 423, 492,
+ 515, 514, 53, 473, 483, 136, 136, 53, 413, 53,
+ 527, 345, 249, 54, 522, 521, 323, 614, 54, 59,
+ 54, 507, 506, 57, 541, 450, 267, 244, 243, 80,
+ 332, 81, 172, 547, 58, 454, 80, 541, 81, 557,
+ 555, 31, 82, 464, 541, 137, 573, 31, 80, 82,
+ 81, 0, 167, 80, 510, 81, 541, 305, 0, 560,
+ 559, 82, 59, 136, 60, 31, 82, 31, 0, 543,
+ 61, 168, 527, 169, 59, 0, 0, 31, 44, 45,
+ 542, 80, 543, 81, 44, 45, 31, 548, 546, 543,
+ 504, 503, 31, 542, 82, 31, 465, 463, 31, 0,
+ 542, 543, 44, 45, 44, 45, 31, 60, 80, 80,
+ 81, 81, 542, 61, 44, 45, 230, 229, 502, 60,
+ 136, 82, 82, 44, 45, 61, 98, 31, 0, 44,
+ 45, 31, 44, 45, 31, 44, 45, 167, 31, 519,
+ 518, 0, 0, 44, 45, 99, 136, 100, 3, 2,
+ 1, 0, 0, 80, 0, 81, 168, 80, 401, 81,
+ 269, 270, 0, 0, 44, 45, 82, 517, 44, 45,
+ 82, 44, 45, 551, 550, 44, 45, 80, 80, 81,
+ 81, 80, 80, 81, 81, 136, 510, 271, 272, 31,
+ 82, 82, 269, 270, 82, 82, -333, 31, 0, 433,
+ 432, 0, 0, 0, -333, 0, 0, 31, 0, 31,
+ 527, 0, 0, 31, 0, 0, 31, 0, 511, 271,
+ 272, 0, 0, 0, 31, 0, 44, 45, 0, 0,
+ 0, 0, 512, 509, 44, 45, 0, 0, 230, 229,
+ 0, 240, 239, 499, 44, 45, 44, 45, 240, 239,
+ 44, 45, 0, 44, 45, 31, 235, 234, 274, 275,
+ 508, 44, 45, 0, 0, 31, 0, 276, 0, 498,
+ 277, 0, 278, 68, 69, 274, 275, 31, 0, 0,
+ 31, 0, 73, 74, 276, 499, 31, 277, 0, 278,
+ 75, 76, 44, 45, 77, 0, 78, 235, 234, 0,
+ 70, 71, 44, 45, 0, 0, 0, 0, 0, 240,
+ 239, 498, 235, 234, 44, 45, 499, 44, 45, 73,
+ 74, 0, 500, 44, 45, 0, 0, 75, 76, 73,
+ 74, 77, 0, 78, 0, 530, 0, 75, 76, 0,
+ 0, 77, 498, 78, 73, 74, 0, 531, 0, 0,
+ 274, 275, 75, 76, 31, 0, 77, 0, 78, 276,
+ 530, 0, 277, 0, 278, 0, 0, 0, 0, 0,
+ 0, 0, 531, 0, 0, 0, 0, 0, 0, 31,
+ 533, 0, 0, 0, 499, 0, 0, 0, 0, 0,
+ 0, 532, 534, 0, 0, 0, 0, 0, 0, 221,
+ 0, 0, 0, 0, 146, 571, 0, 0, 205, 499,
+ 498, 0, 0, 0, 147, 0, 532, 534, 148, 0,
+ 0, 0, 73, 74, 221, 0, 0, 149, 0, 150,
+ 75, 76, 303, 205, 77, 498, 78, 0, 0, 0,
+ 151, 0, 152, 57, 0, 0, 27, 28, 0, 0,
+ 153, 0, 0, 154, 58, 0, 30, 0, 0, 155,
+ 0, 0, 0, 31, 0, 156, 0, 32, 33, 0,
+ 34, 0, 0, 0, 0, 0, 0, 38, 0, 0,
+ 157, 41, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 146, 0, 0, 0, 0, 46,
+ 44, 45, 0, 47, 147, 0, 0, 0, 148, 0,
+ 0, 0, 0, 0, 40, 49, 29, 149, 0, 150,
+ 37, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 151, 0, 152, 57, 0, 0, 0, 0, 0, 0,
+ 153, 0, 0, 154, 58, 0, 0, 0, 0, 155,
+ 0, 0, 0, 0, 0, 156, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 45, 43, 44, 0, 46,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 39, 48, 29, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 26, 27, 28, 0, 0,
+ 157, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 27, 28, 0, 0,
0, 0, 0, 0, 0, 0, 30, 0, 0, 0,
0, 0, 0, 31, 0, 0, 0, 32, 33, 0,
- 34, 0, 0, 0, 35, 0, 36, 37, 38, 0,
- 0, 40, 0, 0, 0, 41, 0, 42, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 45,
- 43, 44, 0, 46, 0, 47, 0, 49, 0, 50,
- 0, 0, 0, 0, 39, 48, 29, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, -116,
+ 34, 0, 0, 0, 0, 0, 0, 38, 0, 0,
+ 0, 41, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 46,
+ 44, 45, 0, 47, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 40, 49, 29, 0, 0, 0,
+ 37, 0, 0, 0, 0, 0, 0, 0, 0, 26,
+ 27, 28, 0, 0, 0, 0, 0, 0, 0, 0,
+ 30, 0, 0, 0, 0, 0, 0, 31, 0, 0,
+ 0, 32, 33, 0, 34, 0, 0, 0, 35, 0,
+ 36, 38, 39, 0, 0, 41, 0, 0, 0, 42,
+ 0, 43, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 46, 44, 45, 0, 47, 0, 48,
+ 0, 50, 0, 51, 0, 0, 0, 0, 40, 49,
+ 29, 0, 0, 0, 37, 0, 0, 0, 0, 0,
0, 0, 0, 26, 27, 28, 0, 0, 0, 0,
0, 0, 0, 0, 30, 0, 0, 0, 0, 0,
0, 31, 0, 0, 0, 32, 33, 0, 34, 0,
- 0, 0, 35, 0, 36, 37, 38, 0, 0, 40,
- 0, 0, 0, 41, 0, 42, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 45, 43, 44,
- 0, 46, 0, 47, 0, 49, 0, 50, 0, 0,
- 0, 0, 39, 48, 29, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 26, 27, 28,
- 0, 0, 0, 0, 0, 0, 0, 0, 30, 0,
- 0, 0, 0, 0, 0, 31, 0, 0, 0, 32,
- 33, 0, 34, 0, 0, 0, 35, 0, 36, 37,
- 38, 0, 0, 40, 0, 0, 0, 41, 0, 42,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 45, 43, 44, 0, 46, 0, 47, 0, 49,
- 265, 50, 0, 0, 0, 0, 39, 48, 29, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 469, 0, 0, 26, 27, 28, 0, 0, 0,
- 0, 0, 0, 0, 0, 30, 0, 0, 0, 0,
- 0, 0, 31, 0, 0, 0, 32, 33, 0, 34,
- 0, 0, 0, 35, 0, 36, 37, 38, 0, 0,
- 40, 0, 0, 0, 41, 0, 42, 0, 0, 470,
- 0, 0, 0, 0, 0, 0, 0, 0, 45, 43,
- 44, 0, 46, 0, 47, 0, 49, 0, 50, 0,
- 0, 0, 0, 39, 48, 29, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 477, 0,
+ 0, 0, 35, 0, 36, 38, 39, 0, 0, 41,
+ 0, 0, 0, 42, 0, 43, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 46, 44, 45,
+ 0, 47, 0, 48, 0, 50, 266, 51, 0, 0,
+ 0, 0, 40, 49, 29, 0, 0, 0, 37, 0,
+ 0, 0, 0, 0, 0, 0, 0, -112, 0, 0,
0, 26, 27, 28, 0, 0, 0, 0, 0, 0,
0, 0, 30, 0, 0, 0, 0, 0, 0, 31,
0, 0, 0, 32, 33, 0, 34, 0, 0, 0,
- 35, 0, 36, 37, 38, 0, 0, 40, 0, 0,
- 0, 41, 0, 42, 0, 0, 478, 0, 0, 0,
- 0, 0, 0, 0, 0, 45, 43, 44, 0, 46,
- 0, 47, 0, 49, 0, 50, 0, 0, 0, 0,
- 39, 48, 29, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 477, 0, 0, 26, 27,
+ 35, 0, 36, 38, 39, 0, 0, 41, 0, 0,
+ 0, 42, 0, 43, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 46, 44, 45, 0, 47,
+ 0, 48, 0, 50, 0, 51, 0, 0, 0, 0,
+ 40, 49, 29, 0, 0, 0, 37, 0, 0, 0,
+ 0, 0, 0, 0, 0, 470, 0, 0, 26, 27,
28, 0, 0, 0, 0, 0, 0, 0, 0, 30,
0, 0, 0, 0, 0, 0, 31, 0, 0, 0,
32, 33, 0, 34, 0, 0, 0, 35, 0, 36,
- 37, 38, 0, 0, 40, 0, 0, 0, 41, 0,
- 42, 0, 0, 480, 0, 0, 0, 0, 0, 0,
- 0, 0, 45, 43, 44, 0, 46, 0, 47, 0,
- 49, 0, 50, 0, 0, 0, 0, 39, 48, 29,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 469, 0, 0, 26, 27, 28, 0, 0,
+ 38, 39, 0, 0, 41, 0, 0, 0, 42, 0,
+ 43, 0, 0, 476, 0, 0, 0, 0, 0, 0,
+ 0, 0, 46, 44, 45, 0, 47, 0, 48, 0,
+ 50, 0, 51, 0, 0, 0, 0, 40, 49, 29,
+ 0, 0, 0, 37, 0, 0, 0, 0, 0, 0,
+ 0, 0, 478, 0, 0, 26, 27, 28, 0, 0,
0, 0, 0, 0, 0, 0, 30, 0, 0, 0,
0, 0, 0, 31, 0, 0, 0, 32, 33, 0,
- 34, 0, 0, 0, 35, 0, 36, 37, 38, 0,
- 0, 40, 0, 0, 0, 41, 0, 42, 0, 0,
- 475, 0, 0, 0, 0, 0, 0, 0, 0, 45,
- 43, 44, 0, 46, 0, 47, 0, 49, 0, 50,
- 0, 0, 0, 0, 39, 48, 29, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 26,
- 27, 28, 0, 0, 0, 0, 0, 0, 0, 0,
- 30, 0, 0, 0, 0, 0, 0, 31, 211, 0,
- 0, 579, 580, 0, 34, 0, 0, 0, 35, 0,
- 36, 37, 38, 0, 0, 40, 0, 0, 0, 41,
- 0, 42, 0, 0, 0, 0, 0, 0, 0, 215,
- 0, 0, 0, 45, 43, 44, 0, 46, 0, 47,
- 0, 49, 0, 50, 0, 0, 0, 0, 39, 48,
- 29, 0, 206, 0, 581, 0, 0, 0, 0, 0,
- 0, 0, 0, 469, 0, 0, 26, 27, 28, 0,
+ 34, 0, 0, 0, 35, 0, 36, 38, 39, 0,
+ 0, 41, 0, 0, 0, 42, 0, 43, 0, 0,
+ 481, 0, 0, 0, 0, 0, 0, 0, 0, 46,
+ 44, 45, 0, 47, 0, 48, 0, 50, 0, 51,
+ 0, 0, 0, 0, 40, 49, 29, 0, 0, 0,
+ 37, 0, 0, 0, 0, 0, 0, 0, 0, 478,
+ 0, 0, 26, 27, 28, 0, 0, 0, 0, 0,
+ 0, 0, 0, 30, 0, 0, 0, 0, 0, 0,
+ 31, 0, 0, 0, 32, 33, 0, 34, 0, 0,
+ 0, 35, 0, 36, 38, 39, 0, 0, 41, 0,
+ 0, 0, 42, 0, 43, 0, 0, 479, 0, 0,
+ 0, 0, 0, 0, 0, 0, 46, 44, 45, 0,
+ 47, 0, 48, 0, 50, 0, 51, 0, 0, 0,
+ 0, 40, 49, 29, 0, 0, 0, 37, 0, 0,
+ 0, 0, 0, 0, 0, 0, 26, 27, 28, 0,
0, 0, 0, 0, 0, 0, 0, 30, 0, 0,
- 0, 0, 0, 0, 31, 0, 0, 0, 32, 33,
- 0, 34, 0, 0, 0, 35, 0, 36, 37, 38,
- 0, 0, 40, 0, 0, 0, 41, 0, 42, 0,
- 0, 470, 0, 0, 498, 0, 0, 0, 0, 0,
- 45, 43, 44, 0, 46, 0, 47, 0, 49, 0,
- 50, 0, 0, 0, 0, 39, 48, 29, 0, 0,
- 497, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 103, 104, 105, 0, 0, 107, 109, 110, 0, 0,
- 111, 0, 112, 0, 0, 0, 114, 115, 116, 0,
- 0, 0, 0, 0, 0, 31, 117, 118, 119, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 120,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 123, 0, 0, 0, 0,
- 0, 0, 43, 44, 124, 125, 126, 0, 128, 129,
- 130, 131, 132, 133, 0, 0, 121, 127, 113, 106,
- 108, 122, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 103, 104, 105, 0, 0, 107, 109, 110, 0,
- 0, 111, 0, 112, 0, 0, 0, 114, 115, 116,
- 0, 0, 0, 0, 0, 0, 387, 117, 118, 119,
+ 0, 0, 0, 0, 31, 212, 0, 0, 579, 580,
+ 0, 34, 0, 0, 0, 35, 0, 36, 38, 39,
+ 0, 0, 41, 0, 0, 0, 42, 0, 43, 0,
+ 0, 0, 0, 0, 0, 0, 216, 0, 0, 0,
+ 46, 44, 45, 0, 47, 0, 48, 0, 50, 0,
+ 51, 0, 0, 0, 0, 40, 49, 29, 0, 0,
+ 0, 37, 0, 0, 0, 0, 0, 0, 0, 0,
+ 470, 0, 0, 26, 27, 28, 0, 0, 0, 0,
+ 0, 0, 0, 0, 30, 0, 0, 0, 0, 0,
+ 0, 31, 0, 0, 0, 32, 33, 0, 34, 0,
+ 0, 0, 35, 0, 36, 38, 39, 0, 0, 41,
+ 0, 0, 0, 42, 0, 43, 0, 0, 471, 0,
+ 0, 0, 0, 0, 0, 0, 0, 46, 44, 45,
+ 0, 47, 0, 48, 0, 50, 0, 51, 0, 0,
+ 0, 0, 40, 49, 29, 0, 0, 0, 37, 0,
+ 0, 0, 0, 0, 0, 0, 0, 470, 0, 0,
+ 26, 27, 28, 0, 0, 0, 0, 0, 0, 0,
+ 0, 30, 0, 0, 0, 0, 0, 0, 31, 0,
+ 0, 0, 32, 33, 0, 34, 0, 0, 0, 35,
+ 0, 36, 38, 39, 0, 0, 41, 0, 0, 0,
+ 42, 0, 43, 0, 0, 471, 0, 0, 499, 0,
+ 0, 0, 0, 0, 46, 44, 45, 0, 47, 0,
+ 48, 0, 50, 0, 51, 0, 0, 0, 0, 40,
+ 49, 29, 0, 0, 498, 37, 0, 0, 0, 0,
+ 0, 0, 0, 0, 104, 105, 106, 0, 0, 108,
+ 110, 111, 0, 0, 112, 0, 113, 0, 0, 0,
+ 115, 116, 117, 0, 0, 0, 0, 0, 0, 31,
+ 118, 119, 120, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 121, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 124,
+ 0, 0, 0, 0, 0, 0, 44, 45, 125, 126,
+ 127, 0, 129, 130, 131, 132, 133, 134, 0, 0,
+ 122, 128, 114, 107, 109, 123, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 104, 105, 106, 0, 0,
+ 108, 110, 111, 0, 0, 112, 0, 113, 0, 0,
+ 0, 115, 116, 117, 0, 0, 0, 0, 0, 0,
+ 388, 118, 119, 120, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 121, 0, 0, 0, 389, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 120, 0, 0, 0, 388, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 123, 0, 0, 0,
- 0, 0, 392, 389, 391, 124, 125, 126, 0, 128,
- 129, 130, 131, 132, 133, 0, 0, 121, 127, 113,
- 106, 108, 122, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 103, 104, 105, 0, 0, 107, 109, 110,
- 0, 0, 111, 0, 112, 0, 0, 0, 114, 115,
- 116, 0, 0, 0, 0, 0, 0, 387, 117, 118,
- 119, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 120, 0, 0, 0, 388, 0, 0, 0, 0,
- 0, 0, 0, 390, 0, 0, 0, 123, 0, 0,
- 0, 0, 0, 392, 389, 391, 124, 125, 126, 0,
- 128, 129, 130, 131, 132, 133, 0, 0, 121, 127,
- 113, 106, 108, 122, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 203, 0, 0, 0, 0, 205, 0,
- 26, 27, 28, 207, 0, 0, 0, 0, 0, 0,
- 208, 30, 0, 0, 0, 0, 0, 0, 210, 211,
- 0, 0, 212, 33, 0, 34, 0, 0, 0, 35,
- 0, 36, 37, 38, 0, 0, 40, 0, 0, 0,
- 41, 0, 42, 0, 0, 0, 0, 0, 214, 0,
- 215, 0, 0, 0, 45, 213, 216, 217, 46, 218,
- 47, 219, 49, 220, 50, 221, 222, 0, 0, 39,
- 48, 29, 204, 206, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 203, 0, 0, 0, 0, 205,
- 0, 26, 27, 28, 207, 0, 0, 0, 0, 0,
- 0, 208, 209, 0, 0, 0, 0, 0, 0, 210,
- 211, 0, 0, 212, 33, 0, 34, 0, 0, 0,
- 35, 0, 36, 37, 38, 0, 0, 40, 0, 0,
- 0, 41, 0, 42, 0, 0, 0, 0, 0, 214,
- 0, 215, 0, 0, 0, 45, 213, 216, 217, 46,
- 218, 47, 219, 49, 220, 50, 221, 222, 0, 0,
- 39, 48, 29, 204, 206, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 585, 104, 105, 0, 0,
- 587, 109, 589, 27, 28, 590, 0, 112, 0, 0,
- 0, 114, 592, 593, 0, 0, 0, 0, 0, 0,
- 594, 595, 118, 119, 212, 33, 0, 34, 0, 0,
- 0, 35, 0, 36, 596, 38, 0, 0, 598, 0,
- 0, 0, 41, 0, 42, 0, 0, 0, 0, 0,
- 600, 0, 215, 0, 0, 0, 602, 599, 601, 603,
- 604, 605, 47, 607, 608, 609, 610, 611, 612, 0,
- 0, 597, 606, 591, 586, 588, 122, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 355, 104, 105, 0,
- 0, 357, 109, 359, 27, 28, 360, 0, 112, 0,
- 0, 0, 114, 362, 363, 0, 0, 0, 0, 0,
- 0, 364, 365, 118, 119, 212, 33, 0, 34, 0,
- 0, 0, 35, 0, 36, 366, 38, 0, 0, 368,
- 0, 0, 0, 41, 0, 42, 0, -262, 0, 0,
- 0, 370, 0, 215, 0, 0, 0, 372, 369, 371,
- 373, 374, 375, 47, 377, 378, 379, 380, 381, 382,
- 0, 0, 367, 376, 361, 356, 358, 122, 0, 0,
- 0, 0, 0, 0, 0, 0, 0,
+ 124, 0, 0, 0, 0, 0, 393, 390, 392, 125,
+ 126, 127, 0, 129, 130, 131, 132, 133, 134, 0,
+ 0, 122, 128, 114, 107, 109, 123, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 104, 105, 106, 0,
+ 0, 108, 110, 111, 0, 0, 112, 0, 113, 0,
+ 0, 0, 115, 116, 117, 0, 0, 0, 0, 0,
+ 0, 388, 118, 119, 120, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 121, 0, 0, 0, 389,
+ 0, 0, 0, 0, 0, 0, 0, 391, 0, 0,
+ 0, 124, 0, 0, 0, 0, 0, 393, 390, 392,
+ 125, 126, 127, 0, 129, 130, 131, 132, 133, 134,
+ 0, 0, 122, 128, 114, 107, 109, 123, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 204, 0, 0,
+ 0, 0, 206, 0, 26, 27, 28, 208, 0, 0,
+ 0, 0, 0, 0, 209, 30, 0, 0, 0, 0,
+ 0, 0, 211, 212, 0, 0, 213, 33, 0, 34,
+ 0, 0, 0, 35, 0, 36, 38, 39, 0, 0,
+ 41, 0, 0, 0, 42, 0, 43, 0, 0, 0,
+ 0, 0, 215, 0, 216, 0, 0, 0, 46, 214,
+ 217, 218, 47, 219, 48, 220, 50, 221, 51, 222,
+ 223, 0, 0, 40, 49, 29, 205, 207, 0, 37,
+ 0, 0, 0, 0, 0, 0, 0, 0, 204, 0,
+ 0, 0, 0, 206, 0, 26, 27, 28, 208, 0,
+ 0, 0, 0, 0, 0, 209, 210, 0, 0, 0,
+ 0, 0, 0, 211, 212, 0, 0, 213, 33, 0,
+ 34, 0, 0, 0, 35, 0, 36, 38, 39, 0,
+ 0, 41, 0, 0, 0, 42, 0, 43, 0, 0,
+ 0, 0, 0, 215, 0, 216, 0, 0, 0, 46,
+ 214, 217, 218, 47, 219, 48, 220, 50, 221, 51,
+ 222, 223, 0, 0, 40, 49, 29, 205, 207, 0,
+ 37, 0, 0, 0, 0, 0, 0, 0, 0, 582,
+ 105, 106, 0, 0, 584, 110, 586, 27, 28, 587,
+ 0, 113, 0, 0, 0, 115, 589, 590, 0, 0,
+ 0, 0, 0, 0, 591, 592, 119, 120, 213, 33,
+ 0, 34, 0, 0, 0, 35, 0, 36, 593, 39,
+ 0, 0, 595, 0, 0, 0, 42, 0, 43, 0,
+ 0, 0, 0, 0, 597, 0, 216, 0, 0, 0,
+ 599, 596, 598, 600, 601, 602, 48, 604, 605, 606,
+ 607, 608, 609, 0, 0, 594, 603, 588, 583, 585,
+ 123, 37, 0, 0, 0, 0, 0, 0, 0, 0,
+ 356, 105, 106, 0, 0, 358, 110, 360, 27, 28,
+ 361, 0, 113, 0, 0, 0, 115, 363, 364, 0,
+ 0, 0, 0, 0, 0, 365, 366, 119, 120, 213,
+ 33, 0, 34, 0, 0, 0, 35, 0, 36, 367,
+ 39, 0, 0, 369, 0, 0, 0, 42, 0, 43,
+ 0, -258, 0, 0, 0, 371, 0, 216, 0, 0,
+ 0, 373, 370, 372, 374, 375, 376, 48, 378, 379,
+ 380, 381, 382, 383, 0, 0, 368, 377, 362, 357,
+ 359, 123, 37, 0, 0, 0, 0, 0, 0, 0,
+ 0,
- 165, 543, 163, 430, 409, 512, 303, 301, 386, 394,
- 504, 411, 557, 455, 305, 515, 519, 430, 404, 551,
- 569, 144, 176, 296, 13, 489, 314, 384, 182, 244,
- 201, 180, 296, 433, 567, 237, 481, 247, 439, 232,
- 170, 566, 341, 244, 176, 430, 345, 564, 343, 429,
- 433, 584, 333, 423, 328, 176, 330, 296, 332, 237,
- 441, 347, 426, 396, 466, 454, 232, 443, 452, 237,
- 244, 461, 548, 232, 450, 419, 444, 134, 427, 522,
- 479, 476, 54, 0, 0, 433, 84, 0, 142, 100,
- 496, 0, 618, 201, 496, 137, 523, 496, 500, 157,
- 201, 0, 0, 140, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 398, 102, 54, 399, 0, 54,
- 82, 54, 54, 83, 174, 54, 282, 174, 140, 54,
- 54, 445, 54, 54, 401, 86, 140, 87, 314, 54,
- 54, 66, 172, 54, 281, 89, 180, 54, 54, 446,
- 260, 54, 54, 280, 174, 264, 296, 159, 54, 54,
- 54, 96, 445, 85, 279, 54, 54, 54, 446, 54,
- 278, 54, 88, 54, 448, 71, 474, 90, 54, 91,
- 473, 64, 54, 54, 446, 488, 54, 398, 445, 296,
- 399, 54, 296, 455, 231, 54, 338, 63, 54, 54,
- 62, 61, 54, 54, 54, 55, 484, 162, 54, 92,
- 485, 54, 54, 398, 323, 100, 399, 78, 0, 613,
- 297, 615, 54, 94, 483, 54, 54, 487, 486, 0,
- 292, 54, 0, 292, 335, 264, 264, 0, 264, 0,
- 54, 102, 169, 466, 287, 264, 292, 0, 0, 267,
- 0, 264, 313, 324, 54, 311, 326, 292, 54, 264,
- 54, 285, 264, 264, 0, 264, 54, 465, 294, 289,
- 0, 264, 0, 54, 0, 307, 296, 54, 264, 291,
- 272, 292, 264, 310, 283, 54, 264, 496, 537, 0,
- 264, 571, 284, 576, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 320, 528, 538, 0, 0, 573, 575,
- 577, 574, 578, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 233, 513, 304, 238, 183, 523, 164, 431, 145, 434,
+ 177, 306, 245, 581, 505, 490, 166, 181, 482, 431,
+ 520, 549, 565, 544, 558, 302, 385, 405, 434, 570,
+ 171, 387, 430, 177, 567, 456, 467, 395, 552, 568,
+ 13, 453, 333, 342, 238, 449, 344, 451, 420, 428,
+ 455, 245, 462, 233, 346, 424, 427, 397, 138, 233,
+ 238, 143, 440, 444, 348, 442, 158, 297, 412, 445,
+ 334, 248, 431, 410, 434, 297, 202, 0, 297, 315,
+ 135, 331, 177, 245, 477, 329, 0, 141, 0, 480,
+ 0, 0, 0, 497, 516, 615, 202, 101, 0, 0,
+ 55, 297, 315, 55, 202, 281, 55, 55, 486, 446,
+ 0, 297, 0, 0, 399, 95, 55, 400, 181, 55,
+ 103, 282, 55, 497, 283, 524, 55, 280, 487, 55,
+ 261, 175, 55, 456, 484, 265, 55, 55, 175, 447,
+ 55, 55, 485, 55, 55, 447, 279, 55, 84, 175,
+ 55, 55, 55, 55, 85, 83, 55, 87, 90, 55,
+ 55, 88, 325, 475, 89, 55, 55, 474, 55, 297,
+ 97, 86, 327, 79, 55, 55, 324, 56, 65, 0,
+ 55, 163, 447, 55, 55, 488, 446, 55, 399, 446,
+ 141, 400, 55, 55, 489, 232, 173, 55, 339, 91,
+ 297, 55, 55, 62, 336, 466, 0, 55, 92, 55,
+ 55, 160, 63, 93, 55, 72, 55, 141, 64, 101,
+ 55, 55, 67, 402, 293, 265, 265, 0, 0, 265,
+ 298, 610, 293, 612, 55, 308, 0, 265, 311, 265,
+ 0, 0, 103, 170, 293, 290, 321, 0, 55, 265,
+ 0, 55, 467, 265, 292, 273, 265, 497, 501, 0,
+ 55, 300, 0, 293, 288, 265, 295, 293, 265, 268,
+ 55, 55, 265, 0, 55, 265, 265, 285, 284, 265,
+ 0, 286, 497, 538, 0, 312, 572, 576, 0, 314,
+ 0, 0, 0, 0, 0, 0, 529, 539, 0, 0,
+ 574, 575, 577, 578, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 299, 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, 496, 537,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 528, 538, 0, 0, 0,
+ 0, 497, 538, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 529, 539, 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,
@@ -609,135 +600,116 @@ const int QmlJSGrammar::action_info [] = {
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0};
+ 0, 0, 0, 0, 0};
const int QmlJSGrammar::action_check [] = {
- 7, 36, 36, 7, 55, 7, 33, 7, 36, 7,
- 55, 8, 36, 7, 36, 16, 36, 7, 60, 7,
- 33, 7, 33, 55, 36, 7, 36, 60, 7, 20,
- 55, 5, 7, 5, 29, 8, 29, 36, 7, 17,
- 36, 33, 29, 60, 33, 60, 7, 5, 7, 88,
- 7, 36, 36, 33, 7, 7, 33, 66, 7, 7,
- 36, 1, 8, 2, 78, 36, 7, 1, 36, 7,
- 78, 8, 2, 78, 1, 8, 36, 60, 33, 8,
- 61, 7, 48, 7, 48, 88, 48, 31, 7, 36,
- 33, 61, 17, 60, 36, 60, 2, 60, 8, 55,
- 36, 36, 2, 1, 36, 8, 60, 8, 7, 8,
- -1, 8, 8, 8, 8, 6, 61, 48, 8, 8,
- 40, 8, 10, 8, 40, 8, 76, 78, 50, 20,
- 8, 51, 54, 61, 62, 51, 15, -1, 61, 62,
- 61, 62, 50, 61, 62, 8, 54, 61, 62, 61,
- 62, 7, 61, 62, 33, 29, 29, 60, 12, 60,
- 56, 56, 29, 60, 40, 7, 60, 55, 61, 62,
- 60, 56, 61, 60, 40, 51, 0, 60, 42, 61,
- 62, 25, 60, 27, 29, 51, 61, 62, 8, 53,
- 61, 62, 29, 56, 38, 12, 8, 29, 8, 29,
- 74, 74, 25, 57, 27, 61, 62, 74, -1, 63,
- 29, 85, 85, 8, -1, 38, -1, -1, 85, 61,
- 62, 66, 67, 29, -1, 61, 62, 29, -1, 66,
- 67, 29, 12, -1, 66, 67, 29, -1, 29, -1,
- 57, 61, 62, 25, 74, 27, 63, 66, 67, 61,
- 62, 61, 62, 89, 29, 85, 38, 25, 29, 27,
- 66, 67, 61, 62, 66, 67, 61, 62, 66, 67,
- 38, 7, 29, 66, 67, 66, 67, 57, 29, 15,
- 25, 15, 27, 63, 15, 25, 25, 27, 27, 8,
- 89, 66, 67, 38, -1, 66, 67, 33, 38, 38,
- 34, 29, 36, 34, 25, 36, 27, 29, -1, 66,
- 67, 25, 25, 27, 27, 66, 67, 38, 25, 25,
- 27, 27, 18, 19, 38, 38, 90, 91, 92, 29,
- -1, 38, 38, 25, 29, 27, -1, 8, 66, 67,
- -1, -1, 61, 62, 66, 67, 38, 29, -1, 45,
- 46, -1, -1, -1, 36, 18, 19, 29, -1, 15,
- 18, 19, 33, 29, 36, -1, 66, 67, -1, -1,
- -1, 66, 67, -1, 15, -1, -1, -1, 34, -1,
- 36, -1, 45, 46, 66, 67, -1, 45, 46, -1,
- 61, 62, -1, 59, 66, 67, 23, 24, -1, -1,
- 66, 67, 23, 24, 29, 32, 47, -1, 35, -1,
- 37, 32, -1, 29, 35, -1, 37, 23, 24, 85,
- 61, 62, -1, -1, 29, -1, 32, 29, -1, 35,
- -1, 37, -1, -1, -1, -1, 61, 62, 29, 18,
- 19, 66, 67, 23, 24, 61, 62, -1, 89, -1,
- 66, 67, 32, 29, 59, 35, 29, 37, -1, 61,
- 62, 66, 67, -1, 66, 67, 45, 46, -1, -1,
- 61, 62, -1, -1, -1, 66, 67, -1, -1, -1,
- 85, -1, -1, -1, -1, 61, 62, 10, 61, 62,
- 66, 67, -1, 66, 67, 23, 24, 29, -1, 22,
- -1, 10, -1, 31, 32, -1, 29, 35, -1, 37,
- 23, 24, -1, 22, -1, -1, 23, 24, 31, 32,
- 29, -1, 35, -1, 37, 32, -1, 59, 35, -1,
- 37, 3, 55, 65, 66, 67, 59, -1, -1, -1,
- -1, 13, -1, 66, 67, 17, 55, -1, -1, -1,
- 59, 74, -1, 85, 26, -1, 28, 66, 67, -1,
- 83, -1, 85, -1, -1, 74, -1, 39, -1, 41,
- 42, -1, -1, -1, 83, -1, 85, 49, -1, -1,
- 52, 53, -1, -1, -1, 3, 58, -1, 23, 24,
- -1, -1, 64, -1, -1, 13, 31, 32, -1, 17,
- 35, -1, 37, -1, -1, -1, -1, 79, 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, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- 3, 79, -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, -1, -1,
- -1, -1, -1, -1, -1, -1, 39, -1, 41, 42,
- -1, 11, 12, 13, -1, -1, 49, -1, -1, 52,
- 53, -1, 22, -1, -1, 58, -1, -1, -1, 29,
- -1, 64, -1, 33, 34, -1, 36, -1, -1, -1,
- 40, -1, 42, 43, 44, -1, 79, 47, -1, -1,
- -1, 51, -1, 53, -1, -1, -1, -1, -1, -1,
- -1, -1, 12, 13, -1, 65, 66, 67, -1, 69,
- -1, 71, 22, 73, -1, 75, -1, -1, -1, 29,
- 80, 81, 82, 33, 34, -1, 36, -1, -1, -1,
- -1, -1, -1, 43, -1, -1, -1, 47, -1, -1,
- -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, 65, 66, 67, -1, 69,
+ 7, 55, 7, 61, 36, 36, 7, 7, 36, 7,
+ 55, 8, 33, 60, 7, 88, 36, 36, 33, 55,
+ 66, 60, 7, 29, 33, 7, 36, 16, 36, 17,
+ 5, 7, 36, 7, 33, 7, 5, 33, 8, 29,
+ 20, 36, 36, 55, 7, 5, 60, 60, 7, 36,
+ 33, 7, 7, 7, 33, 36, 7, 60, 36, 7,
+ 7, 29, 48, 36, 7, 36, 8, 2, 60, 33,
+ 8, 2, 1, 1, 8, 36, 78, 61, 36, 36,
+ 7, 48, 8, 60, 36, 7, 36, 78, 7, 33,
+ 55, 36, 7, 2, 8, 48, 1, 17, 2, 7,
+ 0, 31, 8, 10, -1, 8, 8, 48, -1, 8,
+ 8, 60, 78, 8, 76, 6, 40, 50, 50, 8,
+ 60, 54, 54, 8, 61, 61, 62, 51, 8, 20,
+ 7, 8, 78, 8, 8, 7, 61, 62, 61, 62,
+ 61, 62, 15, 61, 62, 61, 62, 8, 55, 88,
+ 61, 62, 40, 56, 60, 8, 8, 40, 60, 40,
+ 33, 60, 60, 51, 61, 62, 61, 56, 51, 12,
+ 51, 61, 62, 42, 29, 60, 1, 61, 62, 25,
+ 60, 27, 56, 7, 53, 60, 25, 29, 27, 61,
+ 62, 29, 38, 8, 29, 56, 7, 29, 25, 38,
+ 27, -1, 15, 25, 15, 27, 29, 60, -1, 61,
+ 62, 38, 12, 8, 57, 29, 38, 29, -1, 74,
+ 63, 34, 33, 36, 12, -1, -1, 29, 66, 67,
+ 85, 25, 74, 27, 66, 67, 29, 61, 62, 74,
+ 61, 62, 29, 85, 38, 29, 61, 62, 29, -1,
+ 85, 74, 66, 67, 66, 67, 29, 57, 25, 25,
+ 27, 27, 85, 63, 66, 67, 61, 62, 89, 57,
+ 8, 38, 38, 66, 67, 63, 15, 29, -1, 66,
+ 67, 29, 66, 67, 29, 66, 67, 15, 29, 61,
+ 62, -1, -1, 66, 67, 34, 8, 36, 90, 91,
+ 92, -1, -1, 25, -1, 27, 34, 25, 36, 27,
+ 18, 19, -1, -1, 66, 67, 38, 89, 66, 67,
+ 38, 66, 67, 61, 62, 66, 67, 25, 25, 27,
+ 27, 25, 25, 27, 27, 8, 15, 45, 46, 29,
+ 38, 38, 18, 19, 38, 38, 36, 29, -1, 61,
+ 62, -1, -1, -1, 36, -1, -1, 29, -1, 29,
+ 33, -1, -1, 29, -1, -1, 29, -1, 47, 45,
+ 46, -1, -1, -1, 29, -1, 66, 67, -1, -1,
+ -1, -1, 61, 62, 66, 67, -1, -1, 61, 62,
+ -1, 61, 62, 59, 66, 67, 66, 67, 61, 62,
+ 66, 67, -1, 66, 67, 29, 61, 62, 23, 24,
+ 89, 66, 67, -1, -1, 29, -1, 32, -1, 85,
+ 35, -1, 37, 18, 19, 23, 24, 29, -1, -1,
+ 29, -1, 23, 24, 32, 59, 29, 35, -1, 37,
+ 31, 32, 66, 67, 35, -1, 37, 61, 62, -1,
+ 45, 46, 66, 67, -1, -1, -1, -1, -1, 61,
+ 62, 85, 61, 62, 66, 67, 59, 66, 67, 23,
+ 24, -1, 65, 66, 67, -1, -1, 31, 32, 23,
+ 24, 35, -1, 37, -1, 10, -1, 31, 32, -1,
+ -1, 35, 85, 37, 23, 24, -1, 22, -1, -1,
+ 23, 24, 31, 32, 29, -1, 35, -1, 37, 32,
+ 10, -1, 35, -1, 37, -1, -1, -1, -1, -1,
+ -1, -1, 22, -1, -1, -1, -1, -1, -1, 29,
+ 55, -1, -1, -1, 59, -1, -1, -1, -1, -1,
+ -1, 66, 67, -1, -1, -1, -1, -1, -1, 74,
+ -1, -1, -1, -1, 3, 55, -1, -1, 83, 59,
+ 85, -1, -1, -1, 13, -1, 66, 67, 17, -1,
+ -1, -1, 23, 24, 74, -1, -1, 26, -1, 28,
+ 31, 32, 31, 83, 35, 85, 37, -1, -1, -1,
+ 39, -1, 41, 42, -1, -1, 12, 13, -1, -1,
+ 49, -1, -1, 52, 53, -1, 22, -1, -1, 58,
+ -1, -1, -1, 29, -1, 64, -1, 33, 34, -1,
+ 36, -1, -1, -1, -1, -1, -1, 43, -1, -1,
+ 79, 47, -1, -1, -1, -1, -1, -1, -1, -1,
+ -1, -1, -1, -1, 3, -1, -1, -1, -1, 65,
+ 66, 67, -1, 69, 13, -1, -1, -1, 17, -1,
+ -1, -1, -1, -1, 80, 81, 82, 26, -1, 28,
+ 86, -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,
- 80, 81, 82, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, 11, 12, 13, -1, -1,
+ 79, -1, -1, -1, -1, -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, 40, -1, 42, 43, 44, -1,
- -1, 47, -1, -1, -1, 51, -1, 53, -1, -1,
+ 36, -1, -1, -1, -1, -1, -1, 43, -1, -1,
+ -1, 47, -1, -1, -1, -1, -1, -1, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1, -1, 65,
- 66, 67, -1, 69, -1, 71, -1, 73, -1, 75,
+ 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, -1, -1, -1, -1, 7,
+ 86, -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, 86, -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, -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, -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, 8, -1,
+ -1, 69, -1, 71, -1, 73, 74, 75, -1, -1,
+ -1, -1, 80, 81, 82, -1, -1, -1, 86, -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, 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,
+ 80, 81, 82, -1, -1, -1, 86, -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,
@@ -746,7 +718,7 @@ const int QmlJSGrammar::action_check [] = {
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, 86, -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,
@@ -755,129 +727,144 @@ const int QmlJSGrammar::action_check [] = {
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, 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, 8, -1, -1, 11, 12, 13, -1,
+ 86, -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, 86, -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, -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, 56, -1, -1, 59, -1, -1, -1, -1, -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, -1,
- 85, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- 4, 5, 6, -1, -1, 9, 10, 11, -1, -1,
- 14, -1, 16, -1, -1, -1, 20, 21, 22, -1,
- -1, -1, -1, -1, -1, 29, 30, 31, 32, -1,
- -1, -1, -1, -1, -1, -1, -1, -1, -1, 43,
- -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, 59, -1, -1, -1, -1,
- -1, -1, 66, 67, 68, 69, 70, -1, 72, 73,
- 74, 75, 76, 77, -1, -1, 80, 81, 82, 83,
- 84, 85, -1, -1, -1, -1, -1, -1, -1, -1,
- -1, 4, 5, 6, -1, -1, 9, 10, 11, -1,
- -1, 14, -1, 16, -1, -1, -1, 20, 21, 22,
- -1, -1, -1, -1, -1, -1, 29, 30, 31, 32,
- -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- 43, -1, -1, -1, 47, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, 59, -1, -1, -1,
- -1, -1, 65, 66, 67, 68, 69, 70, -1, 72,
- 73, 74, 75, 76, 77, -1, -1, 80, 81, 82,
- 83, 84, 85, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, 4, 5, 6, -1, -1, 9, 10, 11,
- -1, -1, 14, -1, 16, -1, -1, -1, 20, 21,
- 22, -1, -1, -1, -1, -1, -1, 29, 30, 31,
- 32, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- -1, 43, -1, -1, -1, 47, -1, -1, -1, -1,
- -1, -1, -1, 55, -1, -1, -1, 59, -1, -1,
- -1, -1, -1, 65, 66, 67, 68, 69, 70, -1,
- 72, 73, 74, 75, 76, 77, -1, -1, 80, 81,
- 82, 83, 84, 85, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, 4, -1, -1, -1, -1, 9, -1,
- 11, 12, 13, 14, -1, -1, -1, -1, -1, -1,
- 21, 22, -1, -1, -1, -1, -1, -1, 29, 30,
+ -1, 86, -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, 86, -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, -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, -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,
+ 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, 86, -1, -1, -1, -1,
+ -1, -1, -1, -1, 4, 5, 6, -1, -1, 9,
+ 10, 11, -1, -1, 14, -1, 16, -1, -1, -1,
+ 20, 21, 22, -1, -1, -1, -1, -1, -1, 29,
+ 30, 31, 32, -1, -1, -1, -1, -1, -1, -1,
+ -1, -1, -1, 43, -1, -1, -1, -1, -1, -1,
+ -1, -1, -1, -1, -1, -1, -1, -1, -1, 59,
+ -1, -1, -1, -1, -1, -1, 66, 67, 68, 69,
+ 70, -1, 72, 73, 74, 75, 76, 77, -1, -1,
+ 80, 81, 82, 83, 84, 85, -1, -1, -1, -1,
-1, -1, -1, -1, -1, 4, 5, 6, -1, -1,
- 9, 10, 11, 12, 13, 14, -1, 16, -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, 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,
+ 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, -1, -1, -1, 4, 5, 6, -1,
- -1, 9, 10, 11, 12, 13, 14, -1, 16, -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, 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, 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, -1, -1, -1,
+ -1, -1, -1, -1, -1, -1, -1, 4, -1, -1,
+ -1, -1, 9, -1, 11, 12, 13, 14, -1, -1,
+ -1, -1, -1, -1, 21, 22, -1, -1, -1, -1,
+ -1, -1, 29, 30, -1, -1, 33, 34, -1, 36,
+ -1, -1, -1, 40, -1, 42, 43, 44, -1, -1,
+ 47, -1, -1, -1, 51, -1, 53, -1, -1, -1,
+ -1, -1, 59, -1, 61, -1, -1, -1, 65, 66,
+ 67, 68, 69, 70, 71, 72, 73, 74, 75, 76,
+ 77, -1, -1, 80, 81, 82, 83, 84, -1, 86,
+ -1, -1, -1, -1, -1, -1, -1, -1, 4, -1,
+ -1, -1, -1, 9, -1, 11, 12, 13, 14, -1,
+ -1, -1, -1, -1, -1, 21, 22, -1, -1, -1,
+ -1, -1, -1, 29, 30, -1, -1, 33, 34, -1,
+ 36, -1, -1, -1, 40, -1, 42, 43, 44, -1,
+ -1, 47, -1, -1, -1, 51, -1, 53, -1, -1,
+ -1, -1, -1, 59, -1, 61, -1, -1, -1, 65,
+ 66, 67, 68, 69, 70, 71, 72, 73, 74, 75,
+ 76, 77, -1, -1, 80, 81, 82, 83, 84, -1,
+ 86, -1, -1, -1, -1, -1, -1, -1, -1, 4,
+ 5, 6, -1, -1, 9, 10, 11, 12, 13, 14,
+ -1, 16, -1, -1, -1, 20, 21, 22, -1, -1,
+ -1, -1, -1, -1, 29, 30, 31, 32, 33, 34,
+ -1, 36, -1, -1, -1, 40, -1, 42, 43, 44,
+ -1, -1, 47, -1, -1, -1, 51, -1, 53, -1,
+ -1, -1, -1, -1, 59, -1, 61, -1, -1, -1,
+ 65, 66, 67, 68, 69, 70, 71, 72, 73, 74,
+ 75, 76, 77, -1, -1, 80, 81, 82, 83, 84,
+ 85, 86, -1, -1, -1, -1, -1, -1, -1, -1,
+ 4, 5, 6, -1, -1, 9, 10, 11, 12, 13,
+ 14, -1, 16, -1, -1, -1, 20, 21, 22, -1,
+ -1, -1, -1, -1, -1, 29, 30, 31, 32, 33,
+ 34, -1, 36, -1, -1, -1, 40, -1, 42, 43,
+ 44, -1, -1, 47, -1, -1, -1, 51, -1, 53,
+ -1, 55, -1, -1, -1, 59, -1, 61, -1, -1,
+ -1, 65, 66, 67, 68, 69, 70, 71, 72, 73,
+ 74, 75, 76, 77, -1, -1, 80, 81, 82, 83,
+ 84, 85, 86, -1, -1, -1, -1, -1, -1, -1,
+ -1,
- 33, 23, 33, 3, 2, 9, 3, 2, 34, 33,
- 9, 3, 3, 9, 2, 9, 9, 3, 2, 9,
- 9, 66, 9, 3, 3, 2, 9, 33, 9, 2,
- 2, 9, 3, 18, 9, 9, 3, 3, 96, 9,
- 3, 23, 2, 2, 9, 3, 2, 23, 3, 79,
- 18, 15, 9, 91, 2, 9, 3, 3, 2, 9,
- 9, 2, 79, 2, 33, 2, 9, 18, 3, 9,
- 2, 33, 3, 9, 2, 94, 18, 3, 3, 8,
- 33, 33, 43, -1, -1, 18, 47, -1, 33, 9,
- 9, -1, 11, 2, 9, 33, 11, 9, 10, 33,
- 2, -1, -1, 33, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, 37, 35, 43, 40, -1, 43,
- 47, 43, 43, 47, 45, 43, 48, 45, 33, 43,
- 43, 45, 43, 43, 39, 48, 33, 48, 9, 43,
- 43, 51, 39, 43, 48, 48, 9, 43, 43, 45,
- 43, 43, 43, 48, 45, 48, 3, 57, 43, 43,
- 43, 53, 45, 48, 48, 43, 43, 43, 45, 43,
- 48, 43, 48, 43, 3, 49, 29, 49, 43, 49,
- 33, 46, 43, 43, 45, 45, 43, 37, 45, 3,
- 40, 43, 3, 9, 103, 43, 98, 45, 43, 43,
- 45, 45, 43, 43, 43, 46, 45, 59, 43, 49,
- 45, 43, 43, 37, 85, 9, 40, 48, -1, 9,
- 67, 11, 43, 55, 45, 43, 43, 45, 45, -1,
- 43, 43, -1, 43, 97, 48, 48, -1, 48, -1,
- 43, 35, 36, 33, 56, 48, 43, -1, -1, 52,
- -1, 48, 65, 67, 43, 65, 67, 43, 43, 48,
- 43, 50, 48, 48, -1, 48, 43, 83, 65, 54,
- -1, 48, -1, 43, -1, 58, 3, 43, 48, 65,
- 50, 43, 48, 60, 50, 43, 48, 9, 10, -1,
- 48, 13, 50, 3, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, 65, 26, 27, -1, -1, 18, 19,
- 20, 21, 22, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
+ 9, 9, 3, 9, 9, 8, 30, 3, 63, 16,
+ 9, 2, 2, 15, 9, 2, 30, 9, 3, 3,
+ 9, 3, 20, 20, 3, 2, 30, 2, 16, 9,
+ 3, 31, 77, 9, 20, 9, 30, 30, 9, 9,
+ 3, 3, 2, 2, 9, 3, 3, 2, 92, 3,
+ 2, 2, 30, 9, 2, 89, 77, 2, 30, 9,
+ 9, 30, 94, 16, 2, 9, 30, 3, 3, 16,
+ 9, 3, 3, 2, 16, 3, 2, -1, 3, 9,
+ 3, 3, 9, 2, 30, 2, -1, 30, -1, 30,
+ -1, -1, -1, 9, 9, 11, 2, 9, -1, -1,
+ 40, 3, 9, 40, 2, 45, 40, 40, 42, 42,
+ -1, 3, -1, -1, 34, 52, 40, 37, 9, 40,
+ 32, 45, 40, 9, 45, 11, 40, 45, 42, 40,
+ 40, 42, 40, 9, 42, 45, 40, 40, 42, 42,
+ 40, 40, 42, 40, 40, 42, 45, 40, 44, 42,
+ 40, 40, 40, 40, 44, 44, 40, 45, 45, 40,
+ 40, 45, 64, 26, 45, 40, 40, 30, 40, 3,
+ 50, 45, 64, 45, 40, 40, 83, 43, 43, -1,
+ 40, 56, 42, 40, 40, 42, 42, 40, 34, 42,
+ 30, 37, 40, 40, 42, 101, 36, 40, 96, 46,
+ 3, 40, 40, 42, 95, 81, -1, 40, 46, 40,
+ 40, 54, 42, 46, 40, 46, 40, 30, 42, 9,
+ 40, 40, 48, 36, 40, 45, 45, -1, -1, 45,
+ 64, 9, 40, 11, 40, 55, -1, 45, 57, 45,
+ -1, -1, 32, 33, 40, 51, 62, -1, 40, 45,
+ -1, 40, 30, 45, 62, 47, 45, 9, 10, -1,
+ 40, 64, -1, 40, 53, 45, 62, 40, 45, 49,
+ 40, 40, 45, -1, 40, 45, 45, 47, 47, 45,
+ -1, 47, 9, 10, -1, 62, 13, 3, -1, 62,
+ -1, -1, -1, -1, -1, -1, 23, 24, -1, -1,
+ 16, 17, 18, 19, -1, -1, -1, -1, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- 67, -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, 9, 10,
-1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, 26, 27, -1, -1, -1,
+ -1, 9, 10, -1, -1, -1, -1, -1, -1, -1,
+ -1, -1, -1, -1, -1, 23, 24, -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,
@@ -885,5 +872,5 @@ const int QmlJSGrammar::action_check [] = {
-1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, -1};
+ -1, -1, -1, -1, -1};
diff --git a/src/declarative/qml/parser/qmljsgrammar_p.h b/src/declarative/qml/parser/qmljsgrammar_p.h
index da42f8c..c760564 100644
--- a/src/declarative/qml/parser/qmljsgrammar_p.h
+++ b/src/declarative/qml/parser/qmljsgrammar_p.h
@@ -2,7 +2,7 @@
/****************************************************************************
**
** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
-** Contact: Qt Software Information (qt-info@nokia.com)
+** Contact: Nokia Corporation (qt-info@nokia.com)
**
** This file is part of the QtCore module of the Qt Toolkit.
**
@@ -35,7 +35,7 @@
** met: http://www.gnu.org/copyleft/gpl.html.
**
** If you are unsure which license is appropriate for your use, please
-** contact the sales department at qt-sales@nokia.com.
+** contact the sales department at http://www.qtsoftware.com/contact.
** $QT_END_LICENSE$
**
****************************************************************************/
@@ -154,15 +154,15 @@ public:
T_XOR = 78,
T_XOR_EQ = 79,
- ACCEPT_STATE = 621,
- RULE_COUNT = 341,
- STATE_COUNT = 622,
+ ACCEPT_STATE = 616,
+ RULE_COUNT = 337,
+ STATE_COUNT = 617,
TERMINAL_COUNT = 95,
- NON_TERMINAL_COUNT = 105,
+ NON_TERMINAL_COUNT = 103,
- GOTO_INDEX_OFFSET = 622,
- GOTO_INFO_OFFSET = 2247,
- GOTO_CHECK_OFFSET = 2247
+ GOTO_INDEX_OFFSET = 617,
+ GOTO_INFO_OFFSET = 2231,
+ GOTO_CHECK_OFFSET = 2231
};
static const char *const spell [];
diff --git a/src/declarative/qml/parser/qmljsparser.cpp b/src/declarative/qml/parser/qmljsparser.cpp
index 08a424e..a1236d5 100644
--- a/src/declarative/qml/parser/qmljsparser.cpp
+++ b/src/declarative/qml/parser/qmljsparser.cpp
@@ -346,18 +346,6 @@ case 30: {
} break;
case 31: {
- AST::StringLiteral *node = makeAstNode<AST::StringLiteral> (driver->nodePool(), sym(1).sval);
- node->literalToken = loc(1);
- sym(1).Node = node;
-} break;
-
-case 33: {
- AST::ExpressionStatement *node = makeAstNode<AST::ExpressionStatement> (driver->nodePool(), sym(1).Expression);
- node->semicolonToken = loc(2);
- sym(1).Node = node;
-} break;
-
-case 34: {
if (AST::UiQualifiedId *qualifiedId = reparseAsQualifiedId(sym(3).Expression)) {
AST::UiObjectBinding *node = makeAstNode<AST::UiObjectBinding> (driver->nodePool(),
sym(1).UiQualifiedId->finish(), qualifiedId, sym(4).UiObjectInitializer);
@@ -372,7 +360,7 @@ case 34: {
return false; // ### recover
}
} break;
-case 35:case 36:case 37:case 38:case 39:case 40:
+case 32:case 33:case 34:case 35:
{
AST::UiScriptBinding *node = makeAstNode<AST::UiScriptBinding> (driver->nodePool(), sym(1).UiQualifiedId->finish(),
sym(3).Statement);
@@ -380,35 +368,35 @@ case 35:case 36:case 37:case 38:case 39:case 40:
sym(1).Node = node;
} break;
-case 41:
+case 36:
-case 42: {
+case 37: {
sym(1).sval = driver->intern(lexer->characterBuffer(), lexer->characterCount());
break;
}
-case 44: {
+case 39: {
sym(1).Node = 0;
} break;
-case 45: {
+case 40: {
sym(1).Node = sym(1).UiParameterList->finish ();
} break;
-case 46: {
+case 41: {
AST::UiParameterList *node = makeAstNode<AST::UiParameterList> (driver->nodePool(), sym(1).sval, sym(2).sval);
node->identifierToken = loc(2);
sym(1).Node = node;
} break;
-case 47: {
+case 42: {
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 48: {
+case 43: {
AST::UiPublicMember *node = makeAstNode<AST::UiPublicMember> (driver->nodePool(), (NameId *)0, sym(2).sval);
node->type = AST::UiPublicMember::Signal;
node->propertyToken = loc(1);
@@ -418,7 +406,7 @@ case 48: {
sym(1).Node = node;
} break;
-case 49: {
+case 44: {
AST::UiPublicMember *node = makeAstNode<AST::UiPublicMember> (driver->nodePool(), (NameId *)0, sym(2).sval);
node->type = AST::UiPublicMember::Signal;
node->propertyToken = loc(1);
@@ -427,7 +415,7 @@ case 49: {
sym(1).Node = node;
} break;
-case 51: {
+case 46: {
AST::UiPublicMember *node = makeAstNode<AST::UiPublicMember> (driver->nodePool(), sym(2).sval, sym(3).sval);
node->propertyToken = loc(1);
node->typeToken = loc(2);
@@ -436,7 +424,7 @@ case 51: {
sym(1).Node = node;
} break;
-case 53: {
+case 48: {
AST::UiPublicMember *node = makeAstNode<AST::UiPublicMember> (driver->nodePool(), sym(3).sval, sym(4).sval);
node->isDefaultMember = true;
node->defaultToken = loc(1);
@@ -447,7 +435,7 @@ case 53: {
sym(1).Node = node;
} break;
-case 55: {
+case 50: {
AST::UiPublicMember *node = makeAstNode<AST::UiPublicMember> (driver->nodePool(), sym(2).sval, sym(3).sval,
sym(5).Expression);
node->propertyToken = loc(1);
@@ -458,7 +446,7 @@ case 55: {
sym(1).Node = node;
} break;
-case 57: {
+case 52: {
AST::UiPublicMember *node = makeAstNode<AST::UiPublicMember> (driver->nodePool(), sym(3).sval, sym(4).sval,
sym(6).Expression);
node->isDefaultMember = true;
@@ -471,76 +459,76 @@ case 57: {
sym(1).Node = node;
} break;
-case 58: {
+case 53: {
sym(1).Node = makeAstNode<AST::UiSourceElement>(driver->nodePool(), sym(1).Node);
} break;
-case 59: {
+case 54: {
sym(1).Node = makeAstNode<AST::UiSourceElement>(driver->nodePool(), sym(1).Node);
} break;
-case 60:
-case 61:
+case 55:
+case 56:
{
AST::UiQualifiedId *node = makeAstNode<AST::UiQualifiedId> (driver->nodePool(), driver->intern(lexer->characterBuffer(), lexer->characterCount()));
node->identifierToken = loc(1);
sym(1).Node = node;
} break;
-case 63: {
+case 58: {
QString s = QLatin1String(QmlJSGrammar::spell[T_PROPERTY]);
sym(1).sval = driver->intern(s.constData(), s.length());
break;
}
-case 64: {
+case 59: {
QString s = QLatin1String(QmlJSGrammar::spell[T_SIGNAL]);
sym(1).sval = driver->intern(s.constData(), s.length());
break;
}
-case 65: {
+case 60: {
AST::ThisExpression *node = makeAstNode<AST::ThisExpression> (driver->nodePool());
node->thisToken = loc(1);
sym(1).Node = node;
} break;
-case 66: {
+case 61: {
AST::IdentifierExpression *node = makeAstNode<AST::IdentifierExpression> (driver->nodePool(), sym(1).sval);
node->identifierToken = loc(1);
sym(1).Node = node;
} break;
-case 67: {
+case 62: {
AST::NullExpression *node = makeAstNode<AST::NullExpression> (driver->nodePool());
node->nullToken = loc(1);
sym(1).Node = node;
} break;
-case 68: {
+case 63: {
AST::TrueLiteral *node = makeAstNode<AST::TrueLiteral> (driver->nodePool());
node->trueToken = loc(1);
sym(1).Node = node;
} break;
-case 69: {
+case 64: {
AST::FalseLiteral *node = makeAstNode<AST::FalseLiteral> (driver->nodePool());
node->falseToken = loc(1);
sym(1).Node = node;
} break;
-case 70: {
+case 65: {
AST::NumericLiteral *node = makeAstNode<AST::NumericLiteral> (driver->nodePool(), sym(1).dval, lexer->flags);
node->literalToken = loc(1);
sym(1).Node = node;
} break;
-
-case 71: {
+case 66:
+case 67: {
AST::StringLiteral *node = makeAstNode<AST::StringLiteral> (driver->nodePool(), sym(1).sval);
node->literalToken = loc(1);
sym(1).Node = node;
} break;
-case 72: {
+case 68: {
bool rx = lexer->scanRegExp(Lexer::NoPrefix);
if (!rx) {
diagnostic_messages.append(DiagnosticMessage(DiagnosticMessage::Error, location(lexer), lexer->errorMessage()));
@@ -551,7 +539,7 @@ case 72: {
sym(1).Node = node;
} break;
-case 73: {
+case 69: {
bool rx = lexer->scanRegExp(Lexer::EqualPrefix);
if (!rx) {
diagnostic_messages.append(DiagnosticMessage(DiagnosticMessage::Error, location(lexer), lexer->errorMessage()));
@@ -562,28 +550,28 @@ case 73: {
sym(1).Node = node;
} break;
-case 74: {
+case 70: {
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 75: {
+case 71: {
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 76: {
+case 72: {
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 77: {
+case 73: {
AST::ArrayLiteral *node = makeAstNode<AST::ArrayLiteral> (driver->nodePool(), sym(2).ElementList->finish (),
(AST::Elision *) 0);
node->lbracketToken = loc(1);
@@ -592,7 +580,7 @@ case 77: {
sym(1).Node = node;
} break;
-case 78: {
+case 74: {
AST::ArrayLiteral *node = makeAstNode<AST::ArrayLiteral> (driver->nodePool(), sym(2).ElementList->finish (),
sym(4).Elision->finish());
node->lbracketToken = loc(1);
@@ -601,7 +589,7 @@ case 78: {
sym(1).Node = node;
} break;
-case 79: {
+case 75: {
AST::ObjectLiteral *node = 0;
if (sym(2).Node)
node = makeAstNode<AST::ObjectLiteral> (driver->nodePool(),
@@ -613,7 +601,7 @@ case 79: {
sym(1).Node = node;
} break;
-case 80: {
+case 76: {
AST::ObjectLiteral *node = makeAstNode<AST::ObjectLiteral> (driver->nodePool(),
sym(2).PropertyNameAndValueList->finish ());
node->lbraceToken = loc(1);
@@ -621,67 +609,67 @@ case 80: {
sym(1).Node = node;
} break;
-case 81: {
+case 77: {
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 82: {
+case 78: {
AST::UiQualifiedId *node = makeAstNode<AST::UiQualifiedId> (driver->nodePool(), sym(1).sval);
node->identifierToken = loc(1);
sym(1).Node = node;
} break;
-case 83: {
+case 79: {
AST::UiQualifiedId *node = makeAstNode<AST::UiQualifiedId> (driver->nodePool(), sym(1).UiQualifiedId, sym(3).sval);
node->identifierToken = loc(3);
sym(1).Node = node;
} break;
-case 84: {
+case 80: {
sym(1).Node = makeAstNode<AST::ElementList> (driver->nodePool(), (AST::Elision *) 0, sym(1).Expression);
} break;
-case 85: {
+case 81: {
sym(1).Node = makeAstNode<AST::ElementList> (driver->nodePool(), sym(1).Elision->finish(), sym(2).Expression);
} break;
-case 86: {
+case 82: {
AST::ElementList *node = makeAstNode<AST::ElementList> (driver->nodePool(), sym(1).ElementList,
(AST::Elision *) 0, sym(3).Expression);
node->commaToken = loc(2);
sym(1).Node = node;
} break;
-case 87: {
+case 83: {
AST::ElementList *node = makeAstNode<AST::ElementList> (driver->nodePool(), sym(1).ElementList, sym(3).Elision->finish(),
sym(4).Expression);
node->commaToken = loc(2);
sym(1).Node = node;
} break;
-case 88: {
+case 84: {
AST::Elision *node = makeAstNode<AST::Elision> (driver->nodePool());
node->commaToken = loc(1);
sym(1).Node = node;
} break;
-case 89: {
+case 85: {
AST::Elision *node = makeAstNode<AST::Elision> (driver->nodePool(), sym(1).Elision);
node->commaToken = loc(2);
sym(1).Node = node;
} break;
-case 90: {
+case 86: {
AST::PropertyNameAndValueList *node = makeAstNode<AST::PropertyNameAndValueList> (driver->nodePool(),
sym(1).PropertyName, sym(3).Expression);
node->colonToken = loc(2);
sym(1).Node = node;
} break;
-case 91: {
+case 87: {
AST::PropertyNameAndValueList *node = makeAstNode<AST::PropertyNameAndValueList> (driver->nodePool(),
sym(1).PropertyNameAndValueList, sym(3).PropertyName, sym(5).Expression);
node->commaToken = loc(2);
@@ -689,36 +677,44 @@ case 91: {
sym(1).Node = node;
} break;
-case 92: {
+case 88: {
AST::IdentifierPropertyName *node = makeAstNode<AST::IdentifierPropertyName> (driver->nodePool(), sym(1).sval);
node->propertyNameToken = loc(1);
sym(1).Node = node;
} break;
-case 93:
-case 94: {
+case 89:
+case 90: {
AST::IdentifierPropertyName *node = makeAstNode<AST::IdentifierPropertyName> (driver->nodePool(), driver->intern(lexer->characterBuffer(), lexer->characterCount()));
node->propertyNameToken = loc(1);
sym(1).Node = node;
} break;
-case 95: {
+case 91: {
AST::StringLiteralPropertyName *node = makeAstNode<AST::StringLiteralPropertyName> (driver->nodePool(), sym(1).sval);
node->propertyNameToken = loc(1);
sym(1).Node = node;
} break;
-case 96: {
+case 92: {
AST::NumericLiteralPropertyName *node = makeAstNode<AST::NumericLiteralPropertyName> (driver->nodePool(), sym(1).dval);
node->propertyNameToken = loc(1);
sym(1).Node = node;
} break;
-case 97: {
+case 93: {
AST::IdentifierPropertyName *node = makeAstNode<AST::IdentifierPropertyName> (driver->nodePool(), sym(1).sval);
node->propertyNameToken = loc(1);
sym(1).Node = node;
} break;
+case 94:
+
+case 95:
+
+case 96:
+
+case 97:
+
case 98:
case 99:
@@ -772,33 +768,25 @@ case 122:
case 123:
case 124:
-
-case 125:
-
-case 126:
-
-case 127:
-
-case 128:
{
sym(1).sval = driver->intern(lexer->characterBuffer(), lexer->characterCount());
} break;
-case 133: {
+case 129: {
AST::ArrayMemberExpression *node = makeAstNode<AST::ArrayMemberExpression> (driver->nodePool(), sym(1).Expression, sym(3).Expression);
node->lbracketToken = loc(2);
node->rbracketToken = loc(4);
sym(1).Node = node;
} break;
-case 134: {
+case 130: {
AST::FieldMemberExpression *node = makeAstNode<AST::FieldMemberExpression> (driver->nodePool(), sym(1).Expression, sym(3).sval);
node->dotToken = loc(2);
node->identifierToken = loc(3);
sym(1).Node = node;
} break;
-case 135: {
+case 131: {
AST::NewMemberExpression *node = makeAstNode<AST::NewMemberExpression> (driver->nodePool(), sym(2).Expression, sym(4).ArgumentList);
node->newToken = loc(1);
node->lparenToken = loc(3);
@@ -806,384 +794,384 @@ case 135: {
sym(1).Node = node;
} break;
-case 137: {
+case 133: {
AST::NewExpression *node = makeAstNode<AST::NewExpression> (driver->nodePool(), sym(2).Expression);
node->newToken = loc(1);
sym(1).Node = node;
} break;
-case 138: {
+case 134: {
AST::CallExpression *node = makeAstNode<AST::CallExpression> (driver->nodePool(), sym(1).Expression, sym(3).ArgumentList);
node->lparenToken = loc(2);
node->rparenToken = loc(4);
sym(1).Node = node;
} break;
-case 139: {
+case 135: {
AST::CallExpression *node = makeAstNode<AST::CallExpression> (driver->nodePool(), sym(1).Expression, sym(3).ArgumentList);
node->lparenToken = loc(2);
node->rparenToken = loc(4);
sym(1).Node = node;
} break;
-case 140: {
+case 136: {
AST::ArrayMemberExpression *node = makeAstNode<AST::ArrayMemberExpression> (driver->nodePool(), sym(1).Expression, sym(3).Expression);
node->lbracketToken = loc(2);
node->rbracketToken = loc(4);
sym(1).Node = node;
} break;
-case 141: {
+case 137: {
AST::FieldMemberExpression *node = makeAstNode<AST::FieldMemberExpression> (driver->nodePool(), sym(1).Expression, sym(3).sval);
node->dotToken = loc(2);
node->identifierToken = loc(3);
sym(1).Node = node;
} break;
-case 142: {
+case 138: {
sym(1).Node = 0;
} break;
-case 143: {
+case 139: {
sym(1).Node = sym(1).ArgumentList->finish();
} break;
-case 144: {
+case 140: {
sym(1).Node = makeAstNode<AST::ArgumentList> (driver->nodePool(), sym(1).Expression);
} break;
-case 145: {
+case 141: {
AST::ArgumentList *node = makeAstNode<AST::ArgumentList> (driver->nodePool(), sym(1).ArgumentList, sym(3).Expression);
node->commaToken = loc(2);
sym(1).Node = node;
} break;
-case 149: {
+case 145: {
AST::PostIncrementExpression *node = makeAstNode<AST::PostIncrementExpression> (driver->nodePool(), sym(1).Expression);
node->incrementToken = loc(2);
sym(1).Node = node;
} break;
-case 150: {
+case 146: {
AST::PostDecrementExpression *node = makeAstNode<AST::PostDecrementExpression> (driver->nodePool(), sym(1).Expression);
node->decrementToken = loc(2);
sym(1).Node = node;
} break;
-case 152: {
+case 148: {
AST::DeleteExpression *node = makeAstNode<AST::DeleteExpression> (driver->nodePool(), sym(2).Expression);
node->deleteToken = loc(1);
sym(1).Node = node;
} break;
-case 153: {
+case 149: {
AST::VoidExpression *node = makeAstNode<AST::VoidExpression> (driver->nodePool(), sym(2).Expression);
node->voidToken = loc(1);
sym(1).Node = node;
} break;
-case 154: {
+case 150: {
AST::TypeOfExpression *node = makeAstNode<AST::TypeOfExpression> (driver->nodePool(), sym(2).Expression);
node->typeofToken = loc(1);
sym(1).Node = node;
} break;
-case 155: {
+case 151: {
AST::PreIncrementExpression *node = makeAstNode<AST::PreIncrementExpression> (driver->nodePool(), sym(2).Expression);
node->incrementToken = loc(1);
sym(1).Node = node;
} break;
-case 156: {
+case 152: {
AST::PreDecrementExpression *node = makeAstNode<AST::PreDecrementExpression> (driver->nodePool(), sym(2).Expression);
node->decrementToken = loc(1);
sym(1).Node = node;
} break;
-case 157: {
+case 153: {
AST::UnaryPlusExpression *node = makeAstNode<AST::UnaryPlusExpression> (driver->nodePool(), sym(2).Expression);
node->plusToken = loc(1);
sym(1).Node = node;
} break;
-case 158: {
+case 154: {
AST::UnaryMinusExpression *node = makeAstNode<AST::UnaryMinusExpression> (driver->nodePool(), sym(2).Expression);
node->minusToken = loc(1);
sym(1).Node = node;
} break;
-case 159: {
+case 155: {
AST::TildeExpression *node = makeAstNode<AST::TildeExpression> (driver->nodePool(), sym(2).Expression);
node->tildeToken = loc(1);
sym(1).Node = node;
} break;
-case 160: {
+case 156: {
AST::NotExpression *node = makeAstNode<AST::NotExpression> (driver->nodePool(), sym(2).Expression);
node->notToken = loc(1);
sym(1).Node = node;
} break;
-case 162: {
+case 158: {
AST::BinaryExpression *node = makeAstNode<AST::BinaryExpression> (driver->nodePool(), sym(1).Expression,
QSOperator::Mul, sym(3).Expression);
node->operatorToken = loc(2);
sym(1).Node = node;
} break;
-case 163: {
+case 159: {
AST::BinaryExpression *node = makeAstNode<AST::BinaryExpression> (driver->nodePool(), sym(1).Expression,
QSOperator::Div, sym(3).Expression);
node->operatorToken = loc(2);
sym(1).Node = node;
} break;
-case 164: {
+case 160: {
AST::BinaryExpression *node = makeAstNode<AST::BinaryExpression> (driver->nodePool(), sym(1).Expression,
QSOperator::Mod, sym(3).Expression);
node->operatorToken = loc(2);
sym(1).Node = node;
} break;
-case 166: {
+case 162: {
AST::BinaryExpression *node = makeAstNode<AST::BinaryExpression> (driver->nodePool(), sym(1).Expression,
QSOperator::Add, sym(3).Expression);
node->operatorToken = loc(2);
sym(1).Node = node;
} break;
-case 167: {
+case 163: {
AST::BinaryExpression *node = makeAstNode<AST::BinaryExpression> (driver->nodePool(), sym(1).Expression,
QSOperator::Sub, sym(3).Expression);
node->operatorToken = loc(2);
sym(1).Node = node;
} break;
-case 169: {
+case 165: {
AST::BinaryExpression *node = makeAstNode<AST::BinaryExpression> (driver->nodePool(), sym(1).Expression,
QSOperator::LShift, sym(3).Expression);
node->operatorToken = loc(2);
sym(1).Node = node;
} break;
-case 170: {
+case 166: {
AST::BinaryExpression *node = makeAstNode<AST::BinaryExpression> (driver->nodePool(), sym(1).Expression,
QSOperator::RShift, sym(3).Expression);
node->operatorToken = loc(2);
sym(1).Node = node;
} break;
-case 171: {
+case 167: {
AST::BinaryExpression *node = makeAstNode<AST::BinaryExpression> (driver->nodePool(), sym(1).Expression,
QSOperator::URShift, sym(3).Expression);
node->operatorToken = loc(2);
sym(1).Node = node;
} break;
-case 173: {
+case 169: {
AST::BinaryExpression *node = makeAstNode<AST::BinaryExpression> (driver->nodePool(), sym(1).Expression,
QSOperator::Lt, sym(3).Expression);
node->operatorToken = loc(2);
sym(1).Node = node;
} break;
-case 174: {
+case 170: {
AST::BinaryExpression *node = makeAstNode<AST::BinaryExpression> (driver->nodePool(), sym(1).Expression,
QSOperator::Gt, sym(3).Expression);
node->operatorToken = loc(2);
sym(1).Node = node;
} break;
-case 175: {
+case 171: {
AST::BinaryExpression *node = makeAstNode<AST::BinaryExpression> (driver->nodePool(), sym(1).Expression,
QSOperator::Le, sym(3).Expression);
node->operatorToken = loc(2);
sym(1).Node = node;
} break;
-case 176: {
+case 172: {
AST::BinaryExpression *node = makeAstNode<AST::BinaryExpression> (driver->nodePool(), sym(1).Expression,
QSOperator::Ge, sym(3).Expression);
node->operatorToken = loc(2);
sym(1).Node = node;
} break;
-case 177: {
+case 173: {
AST::BinaryExpression *node = makeAstNode<AST::BinaryExpression> (driver->nodePool(), sym(1).Expression,
QSOperator::InstanceOf, sym(3).Expression);
node->operatorToken = loc(2);
sym(1).Node = node;
} break;
-case 178: {
+case 174: {
AST::BinaryExpression *node = makeAstNode<AST::BinaryExpression> (driver->nodePool(), sym(1).Expression,
QSOperator::In, sym(3).Expression);
node->operatorToken = loc(2);
sym(1).Node = node;
} break;
-case 180: {
+case 176: {
AST::BinaryExpression *node = makeAstNode<AST::BinaryExpression> (driver->nodePool(), sym(1).Expression,
QSOperator::Lt, sym(3).Expression);
node->operatorToken = loc(2);
sym(1).Node = node;
} break;
-case 181: {
+case 177: {
AST::BinaryExpression *node = makeAstNode<AST::BinaryExpression> (driver->nodePool(), sym(1).Expression,
QSOperator::Gt, sym(3).Expression);
node->operatorToken = loc(2);
sym(1).Node = node;
} break;
-case 182: {
+case 178: {
AST::BinaryExpression *node = makeAstNode<AST::BinaryExpression> (driver->nodePool(), sym(1).Expression,
QSOperator::Le, sym(3).Expression);
node->operatorToken = loc(2);
sym(1).Node = node;
} break;
-case 183: {
+case 179: {
AST::BinaryExpression *node = makeAstNode<AST::BinaryExpression> (driver->nodePool(), sym(1).Expression,
QSOperator::Ge, sym(3).Expression);
node->operatorToken = loc(2);
sym(1).Node = node;
} break;
-case 184: {
+case 180: {
AST::BinaryExpression *node = makeAstNode<AST::BinaryExpression> (driver->nodePool(), sym(1).Expression,
QSOperator::InstanceOf, sym(3).Expression);
node->operatorToken = loc(2);
sym(1).Node = node;
} break;
-case 186: {
+case 182: {
AST::BinaryExpression *node = makeAstNode<AST::BinaryExpression> (driver->nodePool(), sym(1).Expression,
QSOperator::Equal, sym(3).Expression);
node->operatorToken = loc(2);
sym(1).Node = node;
} break;
-case 187: {
+case 183: {
AST::BinaryExpression *node = makeAstNode<AST::BinaryExpression> (driver->nodePool(), sym(1).Expression,
QSOperator::NotEqual, sym(3).Expression);
node->operatorToken = loc(2);
sym(1).Node = node;
} break;
-case 188: {
+case 184: {
AST::BinaryExpression *node = makeAstNode<AST::BinaryExpression> (driver->nodePool(), sym(1).Expression,
QSOperator::StrictEqual, sym(3).Expression);
node->operatorToken = loc(2);
sym(1).Node = node;
} break;
-case 189: {
+case 185: {
AST::BinaryExpression *node = makeAstNode<AST::BinaryExpression> (driver->nodePool(), sym(1).Expression,
QSOperator::StrictNotEqual, sym(3).Expression);
node->operatorToken = loc(2);
sym(1).Node = node;
} break;
-case 191: {
+case 187: {
AST::BinaryExpression *node = makeAstNode<AST::BinaryExpression> (driver->nodePool(), sym(1).Expression,
QSOperator::Equal, sym(3).Expression);
node->operatorToken = loc(2);
sym(1).Node = node;
} break;
-case 192: {
+case 188: {
AST::BinaryExpression *node = makeAstNode<AST::BinaryExpression> (driver->nodePool(), sym(1).Expression,
QSOperator::NotEqual, sym(3).Expression);
node->operatorToken = loc(2);
sym(1).Node = node;
} break;
-case 193: {
+case 189: {
AST::BinaryExpression *node = makeAstNode<AST::BinaryExpression> (driver->nodePool(), sym(1).Expression,
QSOperator::StrictEqual, sym(3).Expression);
node->operatorToken = loc(2);
sym(1).Node = node;
} break;
-case 194: {
+case 190: {
AST::BinaryExpression *node = makeAstNode<AST::BinaryExpression> (driver->nodePool(), sym(1).Expression,
QSOperator::StrictNotEqual, sym(3).Expression);
node->operatorToken = loc(2);
sym(1).Node = node;
} break;
-case 196: {
+case 192: {
AST::BinaryExpression *node = makeAstNode<AST::BinaryExpression> (driver->nodePool(), sym(1).Expression,
QSOperator::BitAnd, sym(3).Expression);
node->operatorToken = loc(2);
sym(1).Node = node;
} break;
-case 198: {
+case 194: {
AST::BinaryExpression *node = makeAstNode<AST::BinaryExpression> (driver->nodePool(), sym(1).Expression,
QSOperator::BitAnd, sym(3).Expression);
node->operatorToken = loc(2);
sym(1).Node = node;
} break;
-case 200: {
+case 196: {
AST::BinaryExpression *node = makeAstNode<AST::BinaryExpression> (driver->nodePool(), sym(1).Expression,
QSOperator::BitXor, sym(3).Expression);
node->operatorToken = loc(2);
sym(1).Node = node;
} break;
-case 202: {
+case 198: {
AST::BinaryExpression *node = makeAstNode<AST::BinaryExpression> (driver->nodePool(), sym(1).Expression,
QSOperator::BitXor, sym(3).Expression);
node->operatorToken = loc(2);
sym(1).Node = node;
} break;
-case 204: {
+case 200: {
AST::BinaryExpression *node = makeAstNode<AST::BinaryExpression> (driver->nodePool(), sym(1).Expression,
QSOperator::BitOr, sym(3).Expression);
node->operatorToken = loc(2);
sym(1).Node = node;
} break;
-case 206: {
+case 202: {
AST::BinaryExpression *node = makeAstNode<AST::BinaryExpression> (driver->nodePool(), sym(1).Expression,
QSOperator::BitOr, sym(3).Expression);
node->operatorToken = loc(2);
sym(1).Node = node;
} break;
-case 208: {
+case 204: {
AST::BinaryExpression *node = makeAstNode<AST::BinaryExpression> (driver->nodePool(), sym(1).Expression,
QSOperator::And, sym(3).Expression);
node->operatorToken = loc(2);
sym(1).Node = node;
} break;
-case 210: {
+case 206: {
AST::BinaryExpression *node = makeAstNode<AST::BinaryExpression> (driver->nodePool(), sym(1).Expression,
QSOperator::And, sym(3).Expression);
node->operatorToken = loc(2);
sym(1).Node = node;
} break;
-case 212: {
+case 208: {
AST::BinaryExpression *node = makeAstNode<AST::BinaryExpression> (driver->nodePool(), sym(1).Expression,
QSOperator::Or, sym(3).Expression);
node->operatorToken = loc(2);
sym(1).Node = node;
} break;
-case 214: {
+case 210: {
AST::BinaryExpression *node = makeAstNode<AST::BinaryExpression> (driver->nodePool(), sym(1).Expression,
QSOperator::Or, sym(3).Expression);
node->operatorToken = loc(2);
sym(1).Node = node;
} break;
-case 216: {
+case 212: {
AST::ConditionalExpression *node = makeAstNode<AST::ConditionalExpression> (driver->nodePool(), sym(1).Expression,
sym(3).Expression, sym(5).Expression);
node->questionToken = loc(2);
@@ -1191,7 +1179,7 @@ case 216: {
sym(1).Node = node;
} break;
-case 218: {
+case 214: {
AST::ConditionalExpression *node = makeAstNode<AST::ConditionalExpression> (driver->nodePool(), sym(1).Expression,
sym(3).Expression, sym(5).Expression);
node->questionToken = loc(2);
@@ -1199,112 +1187,112 @@ case 218: {
sym(1).Node = node;
} break;
-case 220: {
+case 216: {
AST::BinaryExpression *node = makeAstNode<AST::BinaryExpression> (driver->nodePool(), sym(1).Expression,
sym(2).ival, sym(3).Expression);
node->operatorToken = loc(2);
sym(1).Node = node;
} break;
-case 222: {
+case 218: {
AST::BinaryExpression *node = makeAstNode<AST::BinaryExpression> (driver->nodePool(), sym(1).Expression,
sym(2).ival, sym(3).Expression);
node->operatorToken = loc(2);
sym(1).Node = node;
} break;
-case 223: {
+case 219: {
sym(1).ival = QSOperator::Assign;
} break;
-case 224: {
+case 220: {
sym(1).ival = QSOperator::InplaceMul;
} break;
-case 225: {
+case 221: {
sym(1).ival = QSOperator::InplaceDiv;
} break;
-case 226: {
+case 222: {
sym(1).ival = QSOperator::InplaceMod;
} break;
-case 227: {
+case 223: {
sym(1).ival = QSOperator::InplaceAdd;
} break;
-case 228: {
+case 224: {
sym(1).ival = QSOperator::InplaceSub;
} break;
-case 229: {
+case 225: {
sym(1).ival = QSOperator::InplaceLeftShift;
} break;
-case 230: {
+case 226: {
sym(1).ival = QSOperator::InplaceRightShift;
} break;
-case 231: {
+case 227: {
sym(1).ival = QSOperator::InplaceURightShift;
} break;
-case 232: {
+case 228: {
sym(1).ival = QSOperator::InplaceAnd;
} break;
-case 233: {
+case 229: {
sym(1).ival = QSOperator::InplaceXor;
} break;
-case 234: {
+case 230: {
sym(1).ival = QSOperator::InplaceOr;
} break;
-case 236: {
+case 232: {
AST::Expression *node = makeAstNode<AST::Expression> (driver->nodePool(), sym(1).Expression, sym(3).Expression);
node->commaToken = loc(2);
sym(1).Node = node;
} break;
-case 237: {
+case 233: {
sym(1).Node = 0;
} break;
-case 240: {
+case 236: {
AST::Expression *node = makeAstNode<AST::Expression> (driver->nodePool(), sym(1).Expression, sym(3).Expression);
node->commaToken = loc(2);
sym(1).Node = node;
} break;
-case 241: {
+case 237: {
sym(1).Node = 0;
} break;
-case 258: {
+case 254: {
AST::Block *node = makeAstNode<AST::Block> (driver->nodePool(), sym(2).StatementList);
node->lbraceToken = loc(1);
node->rbraceToken = loc(3);
sym(1).Node = node;
} break;
-case 259: {
+case 255: {
sym(1).Node = makeAstNode<AST::StatementList> (driver->nodePool(), sym(1).Statement);
} break;
-case 260: {
+case 256: {
sym(1).Node = makeAstNode<AST::StatementList> (driver->nodePool(), sym(1).StatementList, sym(2).Statement);
} break;
-case 261: {
+case 257: {
sym(1).Node = 0;
} break;
-case 262: {
+case 258: {
sym(1).Node = sym(1).StatementList->finish ();
} break;
-case 264: {
+case 260: {
AST::VariableStatement *node = makeAstNode<AST::VariableStatement> (driver->nodePool(),
sym(2).VariableDeclarationList->finish (/*readOnly=*/sym(1).ival == T_CONST));
node->declarationKindToken = loc(1);
@@ -1312,76 +1300,76 @@ case 264: {
sym(1).Node = node;
} break;
-case 265: {
+case 261: {
sym(1).ival = T_CONST;
} break;
-case 266: {
+case 262: {
sym(1).ival = T_VAR;
} break;
-case 267: {
+case 263: {
sym(1).Node = makeAstNode<AST::VariableDeclarationList> (driver->nodePool(), sym(1).VariableDeclaration);
} break;
-case 268: {
+case 264: {
AST::VariableDeclarationList *node = makeAstNode<AST::VariableDeclarationList> (driver->nodePool(),
sym(1).VariableDeclarationList, sym(3).VariableDeclaration);
node->commaToken = loc(2);
sym(1).Node = node;
} break;
-case 269: {
+case 265: {
sym(1).Node = makeAstNode<AST::VariableDeclarationList> (driver->nodePool(), sym(1).VariableDeclaration);
} break;
-case 270: {
+case 266: {
sym(1).Node = makeAstNode<AST::VariableDeclarationList> (driver->nodePool(), sym(1).VariableDeclarationList, sym(3).VariableDeclaration);
} break;
-case 271: {
+case 267: {
AST::VariableDeclaration *node = makeAstNode<AST::VariableDeclaration> (driver->nodePool(), sym(1).sval, sym(2).Expression);
node->identifierToken = loc(1);
sym(1).Node = node;
} break;
-case 272: {
+case 268: {
AST::VariableDeclaration *node = makeAstNode<AST::VariableDeclaration> (driver->nodePool(), sym(1).sval, sym(2).Expression);
node->identifierToken = loc(1);
sym(1).Node = node;
} break;
-case 273: {
+case 269: {
// ### TODO: AST for initializer
sym(1) = sym(2);
} break;
-case 274: {
+case 270: {
sym(1).Node = 0;
} break;
-case 276: {
+case 272: {
// ### TODO: AST for initializer
sym(1) = sym(2);
} break;
-case 277: {
+case 273: {
sym(1).Node = 0;
} break;
-case 279: {
+case 275: {
AST::EmptyStatement *node = makeAstNode<AST::EmptyStatement> (driver->nodePool());
node->semicolonToken = loc(1);
sym(1).Node = node;
} break;
-case 281: {
+case 277: {
AST::ExpressionStatement *node = makeAstNode<AST::ExpressionStatement> (driver->nodePool(), sym(1).Expression);
node->semicolonToken = loc(2);
sym(1).Node = node;
} break;
-case 282: {
+case 278: {
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);
@@ -1390,7 +1378,7 @@ case 282: {
sym(1).Node = node;
} break;
-case 283: {
+case 279: {
AST::IfStatement *node = makeAstNode<AST::IfStatement> (driver->nodePool(), sym(3).Expression, sym(5).Statement);
node->ifToken = loc(1);
node->lparenToken = loc(2);
@@ -1398,7 +1386,7 @@ case 283: {
sym(1).Node = node;
} break;
-case 285: {
+case 281: {
AST::DoWhileStatement *node = makeAstNode<AST::DoWhileStatement> (driver->nodePool(), sym(2).Statement, sym(5).Expression);
node->doToken = loc(1);
node->whileToken = loc(3);
@@ -1408,7 +1396,7 @@ case 285: {
sym(1).Node = node;
} break;
-case 286: {
+case 282: {
AST::WhileStatement *node = makeAstNode<AST::WhileStatement> (driver->nodePool(), sym(3).Expression, sym(5).Statement);
node->whileToken = loc(1);
node->lparenToken = loc(2);
@@ -1416,7 +1404,7 @@ case 286: {
sym(1).Node = node;
} break;
-case 287: {
+case 283: {
AST::ForStatement *node = makeAstNode<AST::ForStatement> (driver->nodePool(), sym(3).Expression,
sym(5).Expression, sym(7).Expression, sym(9).Statement);
node->forToken = loc(1);
@@ -1427,7 +1415,7 @@ case 287: {
sym(1).Node = node;
} break;
-case 288: {
+case 284: {
AST::LocalForStatement *node = makeAstNode<AST::LocalForStatement> (driver->nodePool(),
sym(4).VariableDeclarationList->finish (/*readOnly=*/false), sym(6).Expression,
sym(8).Expression, sym(10).Statement);
@@ -1440,7 +1428,7 @@ case 288: {
sym(1).Node = node;
} break;
-case 289: {
+case 285: {
AST:: ForEachStatement *node = makeAstNode<AST::ForEachStatement> (driver->nodePool(), sym(3).Expression,
sym(5).Expression, sym(7).Statement);
node->forToken = loc(1);
@@ -1450,7 +1438,7 @@ case 289: {
sym(1).Node = node;
} break;
-case 290: {
+case 286: {
AST::LocalForEachStatement *node = makeAstNode<AST::LocalForEachStatement> (driver->nodePool(),
sym(4).VariableDeclaration, sym(6).Expression, sym(8).Statement);
node->forToken = loc(1);
@@ -1461,14 +1449,14 @@ case 290: {
sym(1).Node = node;
} break;
-case 292: {
+case 288: {
AST::ContinueStatement *node = makeAstNode<AST::ContinueStatement> (driver->nodePool());
node->continueToken = loc(1);
node->semicolonToken = loc(2);
sym(1).Node = node;
} break;
-case 294: {
+case 290: {
AST::ContinueStatement *node = makeAstNode<AST::ContinueStatement> (driver->nodePool(), sym(2).sval);
node->continueToken = loc(1);
node->identifierToken = loc(2);
@@ -1476,14 +1464,14 @@ case 294: {
sym(1).Node = node;
} break;
-case 296: {
+case 292: {
AST::BreakStatement *node = makeAstNode<AST::BreakStatement> (driver->nodePool());
node->breakToken = loc(1);
node->semicolonToken = loc(2);
sym(1).Node = node;
} break;
-case 298: {
+case 294: {
AST::BreakStatement *node = makeAstNode<AST::BreakStatement> (driver->nodePool(), sym(2).sval);
node->breakToken = loc(1);
node->identifierToken = loc(2);
@@ -1491,14 +1479,14 @@ case 298: {
sym(1).Node = node;
} break;
-case 300: {
+case 296: {
AST::ReturnStatement *node = makeAstNode<AST::ReturnStatement> (driver->nodePool(), sym(2).Expression);
node->returnToken = loc(1);
node->semicolonToken = loc(3);
sym(1).Node = node;
} break;
-case 301: {
+case 297: {
AST::WithStatement *node = makeAstNode<AST::WithStatement> (driver->nodePool(), sym(3).Expression, sym(5).Statement);
node->withToken = loc(1);
node->lparenToken = loc(2);
@@ -1506,7 +1494,7 @@ case 301: {
sym(1).Node = node;
} break;
-case 302: {
+case 298: {
AST::SwitchStatement *node = makeAstNode<AST::SwitchStatement> (driver->nodePool(), sym(3).Expression, sym(5).CaseBlock);
node->switchToken = loc(1);
node->lparenToken = loc(2);
@@ -1514,90 +1502,90 @@ case 302: {
sym(1).Node = node;
} break;
-case 303: {
+case 299: {
AST::CaseBlock *node = makeAstNode<AST::CaseBlock> (driver->nodePool(), sym(2).CaseClauses);
node->lbraceToken = loc(1);
node->rbraceToken = loc(3);
sym(1).Node = node;
} break;
-case 304: {
+case 300: {
AST::CaseBlock *node = makeAstNode<AST::CaseBlock> (driver->nodePool(), sym(2).CaseClauses, sym(3).DefaultClause, sym(4).CaseClauses);
node->lbraceToken = loc(1);
node->rbraceToken = loc(5);
sym(1).Node = node;
} break;
-case 305: {
+case 301: {
sym(1).Node = makeAstNode<AST::CaseClauses> (driver->nodePool(), sym(1).CaseClause);
} break;
-case 306: {
+case 302: {
sym(1).Node = makeAstNode<AST::CaseClauses> (driver->nodePool(), sym(1).CaseClauses, sym(2).CaseClause);
} break;
-case 307: {
+case 303: {
sym(1).Node = 0;
} break;
-case 308: {
+case 304: {
sym(1).Node = sym(1).CaseClauses->finish ();
} break;
-case 309: {
+case 305: {
AST::CaseClause *node = makeAstNode<AST::CaseClause> (driver->nodePool(), sym(2).Expression, sym(4).StatementList);
node->caseToken = loc(1);
node->colonToken = loc(3);
sym(1).Node = node;
} break;
-case 310: {
+case 306: {
AST::DefaultClause *node = makeAstNode<AST::DefaultClause> (driver->nodePool(), sym(3).StatementList);
node->defaultToken = loc(1);
node->colonToken = loc(2);
sym(1).Node = node;
} break;
-case 311:
-case 312: {
+case 307:
+case 308: {
AST::LabelledStatement *node = makeAstNode<AST::LabelledStatement> (driver->nodePool(), driver->intern(lexer->characterBuffer(), lexer->characterCount()), sym(3).Statement);
node->identifierToken = loc(1);
node->colonToken = loc(2);
sym(1).Node = node;
} break;
-case 313: {
+case 309: {
AST::LabelledStatement *node = makeAstNode<AST::LabelledStatement> (driver->nodePool(), sym(1).sval, sym(3).Statement);
node->identifierToken = loc(1);
node->colonToken = loc(2);
sym(1).Node = node;
} break;
-case 315: {
+case 311: {
AST::ThrowStatement *node = makeAstNode<AST::ThrowStatement> (driver->nodePool(), sym(2).Expression);
node->throwToken = loc(1);
node->semicolonToken = loc(3);
sym(1).Node = node;
} break;
-case 316: {
+case 312: {
AST::TryStatement *node = makeAstNode<AST::TryStatement> (driver->nodePool(), sym(2).Statement, sym(3).Catch);
node->tryToken = loc(1);
sym(1).Node = node;
} break;
-case 317: {
+case 313: {
AST::TryStatement *node = makeAstNode<AST::TryStatement> (driver->nodePool(), sym(2).Statement, sym(3).Finally);
node->tryToken = loc(1);
sym(1).Node = node;
} break;
-case 318: {
+case 314: {
AST::TryStatement *node = makeAstNode<AST::TryStatement> (driver->nodePool(), sym(2).Statement, sym(3).Catch, sym(4).Finally);
node->tryToken = loc(1);
sym(1).Node = node;
} break;
-case 319: {
+case 315: {
AST::Catch *node = makeAstNode<AST::Catch> (driver->nodePool(), sym(3).sval, sym(5).Block);
node->catchToken = loc(1);
node->lparenToken = loc(2);
@@ -1606,20 +1594,20 @@ case 319: {
sym(1).Node = node;
} break;
-case 320: {
+case 316: {
AST::Finally *node = makeAstNode<AST::Finally> (driver->nodePool(), sym(2).Block);
node->finallyToken = loc(1);
sym(1).Node = node;
} break;
-case 322: {
+case 318: {
AST::DebuggerStatement *node = makeAstNode<AST::DebuggerStatement> (driver->nodePool());
node->debuggerToken = loc(1);
node->semicolonToken = loc(2);
sym(1).Node = node;
} break;
-case 323: {
+case 319: {
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);
@@ -1630,7 +1618,7 @@ case 323: {
sym(1).Node = node;
} break;
-case 324: {
+case 320: {
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)
@@ -1642,56 +1630,56 @@ case 324: {
sym(1).Node = node;
} break;
-case 325: {
+case 321: {
AST::FormalParameterList *node = makeAstNode<AST::FormalParameterList> (driver->nodePool(), sym(1).sval);
node->identifierToken = loc(1);
sym(1).Node = node;
} break;
-case 326: {
+case 322: {
AST::FormalParameterList *node = makeAstNode<AST::FormalParameterList> (driver->nodePool(), sym(1).FormalParameterList, sym(3).sval);
node->commaToken = loc(2);
node->identifierToken = loc(3);
sym(1).Node = node;
} break;
-case 327: {
+case 323: {
sym(1).Node = 0;
} break;
-case 328: {
+case 324: {
sym(1).Node = sym(1).FormalParameterList->finish ();
} break;
-case 329: {
+case 325: {
sym(1).Node = 0;
} break;
-case 331: {
+case 327: {
sym(1).Node = makeAstNode<AST::FunctionBody> (driver->nodePool(), sym(1).SourceElements->finish ());
} break;
-case 332: {
+case 328: {
sym(1).Node = makeAstNode<AST::SourceElements> (driver->nodePool(), sym(1).SourceElement);
} break;
-case 333: {
+case 329: {
sym(1).Node = makeAstNode<AST::SourceElements> (driver->nodePool(), sym(1).SourceElements, sym(2).SourceElement);
} break;
-case 334: {
+case 330: {
sym(1).Node = makeAstNode<AST::StatementSourceElement> (driver->nodePool(), sym(1).Statement);
} break;
-case 335: {
+case 331: {
sym(1).Node = makeAstNode<AST::FunctionSourceElement> (driver->nodePool(), sym(1).FunctionDeclaration);
} break;
-case 336: {
+case 332: {
sym(1).sval = 0;
} break;
-case 338: {
+case 334: {
sym(1).Node = 0;
} break;
diff --git a/src/declarative/qml/parser/qmljsparser_p.h b/src/declarative/qml/parser/qmljsparser_p.h
index 9273039..6f36484 100644
--- a/src/declarative/qml/parser/qmljsparser_p.h
+++ b/src/declarative/qml/parser/qmljsparser_p.h
@@ -219,9 +219,9 @@ protected:
-#define J_SCRIPT_REGEXPLITERAL_RULE1 72
+#define J_SCRIPT_REGEXPLITERAL_RULE1 68
-#define J_SCRIPT_REGEXPLITERAL_RULE2 73
+#define J_SCRIPT_REGEXPLITERAL_RULE2 69
QT_END_NAMESPACE
generated by cgit v0.12 at 2024-10-25 01:33:58 (GMT)