summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--src/declarative/qml/parser/qmljs.g73
-rw-r--r--src/declarative/qml/parser/qmljsgrammar.cpp1308
-rw-r--r--src/declarative/qml/parser/qmljsgrammar_p.h14
-rw-r--r--src/declarative/qml/parser/qmljsparser.cpp489
-rw-r--r--src/declarative/qml/parser/qmljsparser_p.h4
-rw-r--r--src/declarative/qml/qml.pri6
-rw-r--r--src/declarative/qml/qmlcompiler.cpp2
-rw-r--r--src/declarative/qml/qmlcomponentjs.cpp (renamed from src/declarative/qml/qmlbindablecomponent.cpp)34
-rw-r--r--src/declarative/qml/qmlcomponentjs.h (renamed from src/declarative/qml/qmlbindablecomponent.h)12
-rw-r--r--src/declarative/qml/qmlcomponentjs_p.h (renamed from src/declarative/qml/qmlbindablecomponent_p.h)10
-rw-r--r--src/declarative/qml/qmlengine.cpp8
-rw-r--r--src/declarative/util/qmlfontfamily.cpp13
-rw-r--r--src/declarative/util/qmlfontfamily.h4
13 files changed, 1044 insertions, 933 deletions
diff --git a/src/declarative/qml/parser/qmljs.g b/src/declarative/qml/parser/qmljs.g
index 5f0fe8f..ccfe7fd 100644
--- a/src/declarative/qml/parser/qmljs.g
+++ b/src/declarative/qml/parser/qmljs.g
@@ -741,8 +741,8 @@ UiObjectMember: UiObjectDefinition ;
UiObjectMember: UiQualifiedId T_COLON T_LBRACKET UiArrayMemberList T_RBRACKET ;
/.
case $rule_number: {
- AST::UiArrayBinding *node = makeAstNode<AST::UiArrayBinding> (driver->nodePool(), sym(1).UiQualifiedId->finish(),
- sym(4).UiArrayMemberList->finish());
+ AST::UiArrayBinding *node = makeAstNode<AST::UiArrayBinding> (driver->nodePool(),
+ sym(1).UiQualifiedId->finish(), sym(4).UiArrayMemberList->finish());
node->colonToken = loc(2);
node->lbracketToken = loc(3);
node->rbracketToken = loc(5);
@@ -750,7 +750,7 @@ case $rule_number: {
} break;
./
-UiObjectMember: UiQualifiedId T_COLON Expression UiObjectInitializer ;
+UiObjectMember: UiQualifiedId T_COLON Expression UiObjectInitializer ;
/.
case $rule_number: {
if (AST::UiQualifiedId *qualifiedId = reparseAsQualifiedId(sym(3).Expression)) {
@@ -769,6 +769,48 @@ case $rule_number: {
} break;
./
+UiObjectMember: UiQualifiedId UiSignature T_COLON Expression UiObjectInitializer ;
+/.
+case $rule_number: {
+ if (AST::UiQualifiedId *qualifiedId = reparseAsQualifiedId(sym(4).Expression)) {
+ AST::UiObjectBinding *node = makeAstNode<AST::UiObjectBinding> (driver->nodePool(),
+ sym(1).UiQualifiedId->finish(), qualifiedId, sym(5).UiObjectInitializer);
+ node->colonToken = loc(3);
+ sym(1).Node = node;
+ } else {
+ sym(1).Node = 0;
+
+ diagnostic_messages.append(DiagnosticMessage(DiagnosticMessage::Error, loc(2),
+ QLatin1String("Expected a type name after token `:'")));
+
+ return false; // ### recover
+ }
+} break;
+./
+
+UiObjectMember: UiQualifiedId UiSignature T_COLON Block ;
+/.case $rule_number:./
+
+UiObjectMember: UiQualifiedId UiSignature T_COLON EmptyStatement ;
+/.case $rule_number:./
+
+UiObjectMember: UiQualifiedId UiSignature T_COLON ExpressionStatement ;
+/.case $rule_number:./
+
+UiObjectMember: UiQualifiedId UiSignature T_COLON IfStatement ; --- ### do we really want if statement in a binding?
+/.case $rule_number:./
+
+/.
+{
+ AST::UiScriptBinding *node = makeAstNode<AST::UiScriptBinding> (driver->nodePool(),
+ sym(1).UiQualifiedId->finish(), sym(4).Statement);
+ node->colonToken = loc(3);
+ sym(1).Node = node;
+} break;
+./
+
+
+
UiObjectMember: UiQualifiedId T_COLON Block ;
/.case $rule_number:./
@@ -783,8 +825,8 @@ UiObjectMember: UiQualifiedId T_COLON IfStatement ; --- ### do we really want if
/.
{
- AST::UiScriptBinding *node = makeAstNode<AST::UiScriptBinding> (driver->nodePool(), sym(1).UiQualifiedId->finish(),
- sym(3).Statement);
+ AST::UiScriptBinding *node = makeAstNode<AST::UiScriptBinding> (driver->nodePool(),
+ sym(1).UiQualifiedId->finish(), sym(3).Statement);
node->colonToken = loc(2);
sym(1).Node = node;
} break;
@@ -837,27 +879,40 @@ case $rule_number: {
} break;
./
-UiObjectMember: T_SIGNAL T_IDENTIFIER T_LPAREN UiParameterListOpt T_RPAREN ;
+UiFormal: JsIdentifier ;
+UiFormal: JsIdentifier T_AS JsIdentifier ;
+
+UiFormalList: UiFormal ;
+UiFormalList: UiFormalList T_COMMA UiFormal ;
+
+UiSignature: T_LPAREN T_RPAREN ;
+UiSignature: T_LPAREN UiFormalList T_RPAREN ;
+
+UiObjectMember: T_SIGNAL T_IDENTIFIER T_LPAREN UiParameterListOpt T_RPAREN T_AUTOMATIC_SEMICOLON ;
+UiObjectMember: T_SIGNAL T_IDENTIFIER T_LPAREN UiParameterListOpt T_RPAREN T_SEMICOLON ;
/.
case $rule_number: {
AST::UiPublicMember *node = makeAstNode<AST::UiPublicMember> (driver->nodePool(), (NameId *)0, sym(2).sval);
node->type = AST::UiPublicMember::Signal;
node->propertyToken = loc(1);
node->typeToken = loc(2);
- node->identifierToken = loc(3);
+ node->identifierToken = loc(2);
node->parameters = sym(4).UiParameterList;
+ node->semicolonToken = loc(6);
sym(1).Node = node;
} break;
./
-UiObjectMember: T_SIGNAL T_IDENTIFIER ;
+UiObjectMember: T_SIGNAL T_IDENTIFIER T_AUTOMATIC_SEMICOLON ;
+UiObjectMember: T_SIGNAL T_IDENTIFIER T_SEMICOLON ;
/.
case $rule_number: {
AST::UiPublicMember *node = makeAstNode<AST::UiPublicMember> (driver->nodePool(), (NameId *)0, sym(2).sval);
node->type = AST::UiPublicMember::Signal;
node->propertyToken = loc(1);
node->typeToken = loc(2);
- node->identifierToken = loc(3);
+ node->identifierToken = loc(2);
+ node->semicolonToken = loc(3);
sym(1).Node = node;
} break;
./
diff --git a/src/declarative/qml/parser/qmljsgrammar.cpp b/src/declarative/qml/parser/qmljsgrammar.cpp
index 1b23be6..21dde3f 100644
--- a/src/declarative/qml/parser/qmljsgrammar.cpp
+++ b/src/declarative/qml/parser/qmljsgrammar.cpp
@@ -58,401 +58,434 @@ 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, 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};
+ 108, 108, 108, 108, 108, 108, 108, 108, 108, 108,
+ 108, 116, 116, 116, 117, 117, 118, 118, 119, 119,
+ 120, 120, 111, 111, 108, 108, 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,
+ 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, 112, 176, 176,
+ 175, 175, 122, 122, 177, 177, 178, 178, 180, 180,
+ 179, 181, 184, 182, 182, 185, 183, 183, 113, 114,
+ 114, 115, 115, 165, 165, 165, 165, 165, 165, 165,
+ 166, 166, 166, 166, 167, 167, 167, 167, 168, 168,
+ 169, 171, 186, 186, 189, 189, 187, 187, 190, 188,
+ 170, 170, 170, 172, 172, 173, 173, 173, 191, 192,
+ 174, 174, 121, 133, 196, 196, 193, 193, 194, 194,
+ 197, 198, 198, 199, 199, 195, 195, 126, 126, 200};
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, 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,
+ 5, 4, 5, 4, 4, 4, 4, 3, 3, 3,
+ 3, 1, 1, 1, 0, 1, 2, 4, 1, 3,
+ 1, 3, 2, 3, 6, 6, 3, 3, 4, 4,
+ 5, 5, 6, 6, 7, 7, 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, 2, 3, 3, 4, 5, 3, 4,
+ 3, 1, 3, 1, 2, 3, 4, 1, 2, 3,
+ 5, 1, 1, 1, 1, 1, 1, 1, 1, 1,
1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
- 1, 1, 1, 1, 1, 1, 1, 1, 1, 4,
- 3, 5, 1, 2, 4, 4, 4, 3, 0, 1,
- 1, 3, 1, 1, 1, 2, 2, 1, 2, 2,
- 2, 2, 2, 2, 2, 2, 2, 1, 3, 3,
- 3, 1, 3, 3, 1, 3, 3, 3, 1, 3,
- 3, 3, 3, 3, 3, 1, 3, 3, 3, 3,
- 3, 1, 3, 3, 3, 3, 1, 3, 3, 3,
- 3, 1, 3, 1, 3, 1, 3, 1, 3, 1,
- 3, 1, 3, 1, 3, 1, 3, 1, 3, 1,
- 3, 1, 5, 1, 5, 1, 3, 1, 3, 1,
- 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
- 1, 1, 3, 0, 1, 1, 3, 0, 1, 1,
- 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
- 1, 1, 1, 1, 3, 1, 2, 0, 1, 3,
- 3, 1, 1, 1, 3, 1, 3, 2, 2, 2,
- 0, 1, 2, 0, 1, 1, 2, 2, 7, 5,
- 7, 7, 5, 9, 10, 7, 8, 2, 2, 3,
- 3, 2, 2, 3, 3, 3, 3, 5, 5, 3,
- 5, 1, 2, 0, 1, 4, 3, 3, 3, 3,
- 3, 3, 3, 3, 4, 5, 2, 2, 2, 8,
- 8, 1, 3, 0, 1, 0, 1, 1, 1, 2,
- 1, 1, 0, 1, 0, 1, 2};
+ 1, 1, 4, 3, 5, 1, 2, 4, 4, 4,
+ 3, 0, 1, 1, 3, 1, 1, 1, 2, 2,
+ 1, 2, 2, 2, 2, 2, 2, 2, 2, 2,
+ 1, 3, 3, 3, 1, 3, 3, 1, 3, 3,
+ 3, 1, 3, 3, 3, 3, 3, 3, 1, 3,
+ 3, 3, 3, 3, 1, 3, 3, 3, 3, 1,
+ 3, 3, 3, 3, 1, 3, 1, 3, 1, 3,
+ 1, 3, 1, 3, 1, 3, 1, 3, 1, 3,
+ 1, 3, 1, 3, 1, 5, 1, 5, 1, 3,
+ 1, 3, 1, 1, 1, 1, 1, 1, 1, 1,
+ 1, 1, 1, 1, 1, 3, 0, 1, 1, 3,
+ 0, 1, 1, 1, 1, 1, 1, 1, 1, 1,
+ 1, 1, 1, 1, 1, 1, 1, 3, 1, 2,
+ 0, 1, 3, 3, 1, 1, 1, 3, 1, 3,
+ 2, 2, 2, 0, 1, 2, 0, 1, 1, 2,
+ 2, 7, 5, 7, 7, 5, 9, 10, 7, 8,
+ 2, 2, 3, 3, 2, 2, 3, 3, 3, 3,
+ 5, 5, 3, 5, 1, 2, 0, 1, 4, 3,
+ 3, 3, 3, 3, 3, 3, 3, 4, 5, 2,
+ 2, 2, 8, 8, 1, 3, 0, 1, 0, 1,
+ 1, 1, 2, 1, 1, 0, 1, 0, 1, 2};
const int QmlJSGrammar::action_default [] = {
- 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, 21, 0, 178, 245, 209, 217, 213,
+ 157, 229, 205, 3, 142, 75, 158, 221, 225, 146,
+ 175, 156, 161, 141, 195, 182, 0, 82, 83, 78,
+ 346, 71, 348, 0, 0, 0, 0, 80, 0, 0,
+ 76, 79, 0, 0, 72, 73, 81, 74, 0, 77,
+ 0, 0, 171, 0, 0, 158, 177, 160, 159, 0,
+ 0, 0, 173, 174, 172, 176, 0, 206, 0, 0,
+ 0, 0, 196, 0, 0, 0, 0, 0, 0, 186,
+ 0, 0, 0, 180, 181, 179, 184, 188, 187, 185,
+ 183, 198, 197, 199, 0, 214, 0, 210, 0, 0,
+ 152, 139, 151, 140, 108, 109, 110, 135, 111, 136,
+ 112, 113, 114, 115, 116, 117, 118, 119, 120, 121,
+ 122, 123, 124, 137, 125, 126, 127, 128, 129, 130,
+ 131, 132, 133, 134, 138, 0, 0, 150, 246, 153,
+ 0, 154, 0, 155, 149, 0, 242, 235, 233, 240,
+ 241, 239, 238, 244, 237, 236, 234, 243, 230, 0,
+ 218, 0, 0, 222, 0, 0, 226, 0, 0, 152,
+ 144, 0, 143, 0, 148, 162, 0, 347, 337, 338,
+ 0, 335, 0, 336, 0, 339, 253, 260, 259, 267,
+ 255, 0, 256, 340, 0, 345, 257, 258, 263, 261,
+ 342, 341, 344, 264, 0, 275, 0, 0, 0, 0,
+ 346, 71, 0, 348, 72, 247, 289, 73, 0, 0,
+ 0, 276, 0, 0, 265, 266, 0, 254, 262, 290,
+ 291, 334, 343, 0, 305, 306, 307, 308, 0, 301,
+ 302, 303, 304, 331, 332, 0, 0, 0, 0, 0,
+ 294, 295, 251, 249, 211, 219, 215, 231, 207, 252,
+ 0, 158, 223, 227, 200, 189, 0, 0, 208, 0,
+ 0, 0, 0, 201, 0, 0, 0, 0, 0, 193,
+ 191, 194, 192, 190, 203, 202, 204, 0, 216, 0,
+ 212, 0, 250, 158, 0, 232, 247, 248, 0, 247,
+ 0, 0, 297, 0, 0, 0, 299, 0, 220, 0,
+ 0, 224, 0, 0, 228, 287, 0, 279, 288, 282,
+ 0, 286, 0, 247, 280, 0, 247, 0, 0, 298,
+ 0, 0, 0, 300, 347, 337, 0, 0, 339, 0,
+ 333, 0, 323, 0, 0, 0, 293, 0, 292, 0,
+ 349, 0, 107, 269, 272, 0, 108, 275, 111, 136,
+ 113, 114, 78, 118, 119, 71, 120, 123, 76, 79,
+ 72, 247, 73, 81, 126, 74, 128, 77, 130, 131,
+ 276, 133, 134, 138, 0, 100, 0, 0, 102, 106,
+ 104, 90, 103, 105, 0, 101, 89, 270, 268, 146,
+ 147, 152, 0, 145, 0, 322, 0, 309, 310, 0,
+ 321, 0, 0, 0, 312, 317, 315, 318, 0, 0,
+ 316, 317, 0, 313, 0, 314, 271, 320, 0, 271,
+ 319, 0, 324, 325, 0, 271, 326, 327, 0, 0,
+ 328, 0, 0, 0, 329, 330, 164, 163, 0, 0,
+ 0, 296, 0, 0, 0, 311, 284, 277, 0, 285,
+ 281, 0, 283, 273, 0, 274, 278, 94, 0, 0,
+ 98, 84, 0, 86, 96, 0, 87, 97, 99, 88,
+ 95, 85, 0, 91, 168, 166, 170, 167, 165, 169,
+ 2, 5, 0, 7, 6, 0, 1, 92, 69, 70,
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};
+ 0, 0, 14, 0, 19, 20, 93, 0, 15, 16,
+ 0, 17, 18, 8, 22, 0, 4, 0, 29, 67,
+ 0, 0, 72, 27, 73, 30, 23, 0, 0, 68,
+ 0, 44, 43, 42, 0, 0, 61, 0, 62, 0,
+ 65, 66, 0, 0, 0, 59, 0, 60, 0, 63,
+ 64, 0, 57, 45, 58, 46, 0, 0, 0, 0,
+ 48, 0, 55, 56, 47, 28, 24, 0, 0, 0,
+ 38, 39, 0, 40, 41, 271, 0, 32, 108, 275,
+ 111, 136, 113, 114, 78, 118, 119, 71, 120, 123,
+ 76, 79, 72, 247, 73, 81, 126, 74, 128, 77,
+ 130, 131, 276, 133, 134, 138, 75, 0, 25, 0,
+ 31, 26, 49, 53, 51, 0, 0, 50, 0, 54,
+ 52, 0, 34, 35, 0, 36, 37, 33, 350};
const int QmlJSGrammar::goto_default [] = {
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};
+ 525, 535, 537, 536, 617, 528, 579, 186, 190, 192,
+ 196, 553, 566, 565, 624, 625, 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 [] = {
- 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,
+ 157, 803, 2033, -22, 55, 68, -95, 96, 32, -10,
+ 282, -95, 348, 42, -95, -95, 636, 92, 75, 201,
+ 218, -95, -95, -95, 544, 253, 803, -95, -95, -95,
+ 179, -95, 1760, 1230, 803, 803, 803, -95, 719, 803,
+ -95, -95, 803, 803, -95, -95, -95, -95, 803, -95,
+ 803, 803, -95, 803, 803, 104, 202, -95, -95, 803,
+ 803, 803, -95, -95, -95, 198, 803, 340, 803, 803,
+ 803, 803, 544, 803, 803, 803, 803, 803, 803, 206,
+ 803, 803, 803, 64, 72, 69, 253, 167, 182, 158,
+ 150, 454, 544, 544, 803, -70, 803, 96, 1669, 803,
+ 803, -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, 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,
+ -95, -95, -95, -95, -95, 137, 803, -95, -95, 82,
+ 61, -95, 803, -95, -95, 803, -95, -95, -95, -95,
+ -95, -95, -95, -95, -95, -95, -95, -95, -95, 803,
+ 6, 803, 803, 43, 39, 803, -95, 1669, 803, 803,
+ -95, 143, -95, 9, -95, -95, 29, -95, 264, 59,
+ 10, -95, 259, -95, 8, 1942, -95, -95, -95, -95,
+ -95, 274, -95, -95, 31, -95, -95, -95, -95, -95,
+ -95, 1942, -95, -95, 421, -95, 414, 105, 2033, 40,
+ 234, 71, 41, 2215, 66, 803, -95, 65, 28, 803,
+ 20, -95, 22, 11, -95, -95, 290, -95, -95, -95,
+ -95, -95, -95, 119, -95, -95, -95, -95, 112, -95,
+ -95, -95, -95, -95, -95, -17, 27, 803, 135, 117,
+ -95, -95, 975, -95, 48, -6, 62, -95, 400, 85,
+ 63, 569, 93, 102, 472, 235, 205, 803, 400, 803,
+ 803, 803, 803, 398, 803, 803, 803, 803, 803, 253,
+ 295, 323, 241, 323, 472, 472, 355, 803, 5, 803,
+ 81, 803, -95, 636, 803, -95, 803, 76, 53, 803,
+ 57, 2033, -95, 803, 146, 2033, -95, 803, 54, 803,
+ 803, 90, 84, 803, -95, 12, 125, -24, -95, -95,
+ 803, -95, 203, 803, -95, -49, 803, -47, 2033, -95,
+ 803, 130, 2033, -95, -34, 285, -28, 0, 1942, -21,
+ -95, 2033, -95, 803, 129, 2033, 1, 2033, -95, 17,
+ 19, -29, -95, -95, 2033, -33, 405, 21, 375, 107,
+ 803, 2033, 23, -20, 305, -1, -31, 719, 3, 4,
+ -95, 891, -95, 7, -35, -3, 803, 33, 2, 803,
+ 13, 803, -18, -11, 803, -95, 1851, 16, -95, -95,
+ -95, -95, -95, -95, 803, -95, -95, -95, -95, 281,
+ -95, 803, -45, -95, 2033, -95, 70, -95, -95, 2033,
+ -95, 803, 122, -12, -95, 14, -95, 34, 106, 803,
+ -95, -2, 30, -95, -19, -95, 2033, -95, 103, 2033,
+ -95, 250, -95, -95, 116, 2033, 18, -95, -5, 2,
+ -95, 280, -60, 2, -95, -95, -95, -95, 803, 110,
+ 2033, -95, 803, 99, 2033, -95, -8, -95, 156, -95,
+ -95, 803, -95, -95, 136, -95, -95, -95, 97, 1317,
+ -95, -95, 1404, -95, -95, 1491, -95, -95, -95, -95,
+ -95, -95, 98, -95, -95, -95, -95, -95, -95, -95,
+ -95, -95, 433, -95, 51, 344, -95, -95, -95, -95,
+ 139, 366, 155, -95, -95, 73, -95, -95, 186, -95,
+ 190, 162, -95, 101, -95, -95, -95, 131, -95, -95,
+ 88, -95, -95, -95, -95, 111, -95, 495, -95, -95,
+ 47, 298, 221, -95, 60, -95, -95, 518, 306, -95,
+ 255, -95, -95, -95, 58, 292, -95, 803, -95, 246,
+ -95, -95, 52, 56, 164, -95, 803, -95, 228, -95,
+ -95, 151, -95, 209, -95, 95, 67, 175, 200, 210,
+ -95, 86, -95, -95, -95, -95, -95, 1143, 303, 91,
+ -95, -95, 347, -95, -95, 2124, 1578, -95, 397, 89,
+ 386, 80, 803, 2033, 94, 26, 308, 74, 25, 719,
+ 44, 49, -95, 891, -95, 45, 24, 37, 803, 36,
+ 15, 803, 50, 803, 38, 35, 46, 120, -95, 372,
+ -95, -95, -14, -95, -95, 183, 238, -95, 257, -95,
+ -95, 1059, -95, -95, 335, -95, -95, -95, -95,
- -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};
+ -106, 3, 1, -106, -106, -106, -106, -106, -106, -106,
+ -106, -106, -106, -106, -106, -106, -54, -106, -106, -106,
+ -106, -106, -106, -106, -106, -106, 72, -106, -106, -106,
+ 4, -106, -106, -16, 18, 100, 170, -106, 174, 167,
+ -106, -106, 164, 182, -106, -106, -106, -106, 127, -106,
+ 126, 117, -106, 113, 131, -106, -106, -106, -106, 146,
+ 135, 143, -106, -106, -106, -106, 139, -106, 159, 173,
+ 109, 83, -106, 136, 149, 150, 156, 133, 120, -106,
+ 158, 176, 177, -106, -106, -106, -106, -106, -106, -106,
+ -106, -106, -106, -106, 91, -106, 101, -106, 94, -2,
+ -29, -106, -106, -106, -106, -106, -106, -106, -106, -106,
+ -106, -106, -106, -106, -106, -106, -106, -106, -106, -106,
+ -106, -106, -106, -106, -106, -106, -106, -106, -106, -106,
+ -106, -106, -106, -106, -106, -106, 33, -106, -106, -106,
+ -106, -106, 14, -106, -106, 19, -106, -106, -106, -106,
+ -106, -106, -106, -106, -106, -106, -106, -106, -106, 85,
+ -106, 63, 49, -106, -106, 53, -106, 311, 60, 118,
+ -106, -106, -106, -106, -106, -106, -106, -106, 51, -106,
+ -106, -106, -4, -106, -106, 59, -106, -106, -106, -106,
+ -106, -106, -106, -106, -106, -106, -106, -106, -106, -106,
+ -106, 122, -106, -106, 30, -106, 44, -106, 41, -106,
+ 27, -106, -106, -106, -106, 84, -106, -106, -106, 71,
+ 58, -106, -106, -106, -106, -106, 64, -106, -106, -106,
+ -106, -106, -106, -106, -106, -106, -106, -106, -106, -106,
+ -106, -106, -106, -106, -106, -106, -106, 13, -106, -106,
+ -106, -106, 65, -106, -106, -106, -106, -106, -106, -106,
+ -106, -106, -106, -106, -106, -106, -1, 197, -106, 188,
+ 187, 221, 229, -106, 90, 87, 93, 105, 107, -106,
+ -106, -106, -106, -106, -106, -106, -106, 230, -106, 207,
+ -106, 219, -106, -106, 205, -106, 180, -106, -106, 106,
+ -106, 28, -106, 31, -106, 26, -106, 185, -106, 198,
+ 186, -106, -106, 217, -106, -106, -106, -106, -106, -106,
+ 220, -106, 81, 97, -106, -106, 172, -106, 76, -106,
+ 78, -106, 69, -106, -106, 89, -106, -106, 86, -106,
+ -106, 75, -106, 80, -106, 70, -106, 82, -106, -106,
+ -106, -106, -106, -106, 42, -106, 39, -106, 40, -106,
+ 214, 48, -106, -106, 37, -106, -106, 163, -106, -106,
+ -106, 52, -106, -106, -106, -106, 61, -106, 50, 151,
+ -106, 67, -106, -106, 43, -106, 45, -106, -106, -106,
+ -106, -106, -106, -106, 47, -106, -106, -106, -106, -106,
+ -106, 98, -106, -106, 57, -106, -106, -106, -106, 54,
+ -106, 55, -106, -106, -106, -106, -106, -38, -106, 66,
+ -106, -24, -106, -106, -106, -106, -15, -106, -106, -18,
+ -106, -106, -106, -106, -106, -106, -46, -106, -106, 24,
+ -106, 36, -106, 25, -106, -106, -106, -106, 35, -106,
+ 68, -106, 34, -106, 38, -106, -106, -106, -106, -106,
+ -106, 21, -106, -106, 111, -106, -106, -106, -106, 62,
+ -106, -106, 132, -106, -106, 56, -106, -106, -106, -106,
+ -106, -106, -106, -106, -106, -106, -106, -106, -106, -106,
+ -106, -106, 92, -106, 77, 96, -106, -106, -106, -106,
+ -106, -106, -9, -106, -106, -106, -106, -106, 0, -106,
+ -7, -106, -106, -106, -106, -106, -106, 22, -106, -106,
+ -106, -106, -106, -106, -106, -106, -106, 265, -106, -106,
+ -106, 16, -106, -106, -106, -106, -106, 280, -106, -106,
+ -11, -106, -106, -106, -106, -106, -106, 23, -106, -106,
+ -106, -106, -106, -106, -106, -106, 29, -106, -106, -106,
+ -106, -106, -106, 12, -106, -106, -106, 11, 8, 5,
+ -106, -106, -106, -106, -106, -106, -106, 277, 2, -106,
+ -106, -106, 7, -106, -106, -106, 233, -106, 9, -106,
+ 15, -106, 73, 17, -106, -106, 6, -106, -106, 74,
+ -106, -106, -106, 32, -106, -106, -106, -106, 20, -106,
+ 10, 151, -106, 104, -106, -106, -106, -106, -106, 112,
+ -106, -106, -106, -106, -106, -106, 88, -106, 95, -106,
+ -106, 284, -106, -106, -8, -106, -106, -106, -106};
const int QmlJSGrammar::action_info [] = {
- -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,
+ 443, 411, 335, 419, -127, 343, -102, 330, 96, 461,
+ -124, -106, 326, 328, -105, 403, 252, 347, 448, 419,
+ -132, 415, 398, 394, 384, 452, 396, 386, -135, 320,
+ -116, 441, 337, 338, 340, 435, 425, 426, 439, 419,
+ -129, 185, 287, -129, -127, 159, 165, 452, 435, 267,
+ 136, -124, -105, 435, 94, 638, -106, -132, 448, 246,
+ 411, 343, 252, 247, 411, 178, 492, 182, 96, 174,
+ 184, 452, 409, 404, 448, 626, 252, 343, 341, -92,
+ 94, -102, 267, 289, 136, 554, 231, 545, 335, 561,
+ 142, 313, 307, 291, 159, 307, -135, 66, 631, 0,
+ 0, -116, 287, 568, 53, 472, 136, 136, 53, 53,
+ 429, 136, 53, 540, 299, 54, 422, 301, 136, 54,
+ 54, 144, 438, 54, 296, 161, 510, 571, 619, 162,
+ 136, 408, 407, 322, 507, 506, 439, 136, 136, 492,
+ 289, 244, 243, 136, 527, 136, 57, 573, 572, 522,
+ 521, 136, 309, 473, 136, 0, 310, 58, 483, 454,
+ 31, 423, 515, 514, 464, 31, 244, 243, 244, 243,
+ 450, 556, 0, 242, 241, 80, 620, 81, 251, 250,
+ 237, 236, 413, 80, 31, 81, 323, 563, 82, 345,
+ 332, 628, 80, 137, 81, 249, 82, 44, 45, 172,
+ 504, 503, 44, 45, 31, 82, 305, 80, 31, 81,
+ 59, 0, 564, 562, 59, 31, 167, 465, 463, 31,
+ 82, 44, 45, 519, 518, 557, 555, 0, 502, 541,
+ 59, 80, 31, 81, 31, 168, 136, 169, 541, 31,
+ 0, 44, 45, 629, 82, 44, 45, 3, 2, 1,
+ 541, 517, 44, 45, 136, 60, 44, 45, 136, 60,
+ 80, 61, 81, 31, 0, 61, 80, 31, 81, 44,
+ 45, 44, 45, 82, 543, 60, 44, 45, 80, 82,
+ 81, 61, 136, 543, 541, 542, 31, 0, 31, 560,
+ 559, 82, 0, 31, 542, 543, 167, 98, 0, 547,
+ 44, 45, 0, 0, 44, 45, 542, 551, 550, 31,
+ 0, 433, 432, 577, 31, 168, 99, 401, 100, 31,
+ 80, 510, 81, 44, 45, 44, 45, 31, 0, 543,
+ 44, 45, 31, 82, 31, 230, 229, 31, 0, 527,
+ 542, -346, 578, 136, -346, 0, 44, 45, 80, 0,
+ 81, 44, 45, 548, 546, 136, 44, 45, 68, 69,
+ 0, 82, 0, 623, 44, 45, 68, 69, 527, 44,
+ 45, 44, 45, 31, 44, 45, 0, 0, 274, 275,
+ 527, 510, 0, 0, 0, 70, 71, 276, 0, 0,
+ 277, 0, 278, 70, 71, 0, 230, 229, 0, 0,
+ 0, 31, 0, 499, 31, 0, 0, 0, 230, 229,
+ 44, 45, 0, 511, 0, 31, 0, 0, 269, 270,
+ 0, 274, 275, 0, 0, 0, 31, 512, 509, 498,
+ 276, 499, 0, 277, 31, 278, 240, 239, 44, 45,
+ 0, 44, 45, 31, 0, 271, 272, 240, 239, 0,
+ 31, 0, 44, 45, 0, 508, 0, 498, 235, 234,
+ 0, 0, 31, 44, 45, 0, 235, 234, 0, 0,
+ 0, 44, 45, 0, 0, 240, 239, 73, 74, 0,
+ 44, 45, 235, 234, 0, 75, 76, 44, 45, 77,
+ 0, 78, 499, 0, 0, 274, 275, 0, 500, 44,
+ 45, 0, 0, 0, 276, 530, 0, 277, 0, 278,
+ 0, 0, 0, 0, 0, 0, 0, 531, 498, 0,
+ 0, 0, 0, 0, 31, 0, 0, 0, 530, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 531, 0, 0, 0, 0, 0, 0, 31, 0, 0,
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, 532, 534, 0, 0, 0, 0, 73, 74, 221,
+ 0, 0, 146, 575, 0, 75, 76, 499, 205, 77,
+ 498, 78, 147, 0, 532, 534, 148, 0, 0, 0,
+ 0, 0, 221, 0, 0, 149, 0, 150, 0, 0,
+ 303, 205, 0, 498, 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, 146,
+ 0, 0, 0, 0, 0, 0, 0, 0, 157, 147,
+ 0, 0, 0, 148, 0, 0, 0, 0, 0, 0,
+ 0, 0, 149, 0, 150, 0, 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, 157, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 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, 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, 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, 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, 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, -125, 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, 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,
+ 26, 27, 28, 0, 0, 0, 0, 0, 0, 0,
+ 0, 30, 0, 0, 0, 0, 0, 0, 31, 212,
+ 0, 0, 585, 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,
+ 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, 26, 27, 28, 0, 0, 0,
+ 0, 0, 0, 0, 0, 30, 0, 0, 0, 0,
+ 0, 0, 31, 212, 0, 0, 585, 586, 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, 0, 0, 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,
+ 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, 476, 0, 0, 0, 0, 0, 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, 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,
- 481, 0, 0, 0, 0, 0, 0, 0, 0, 46,
+ 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,
@@ -464,39 +497,31 @@ const int QmlJSGrammar::action_info [] = {
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, 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, 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, 31,
+ 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, 0, 0, 0,
+ 0, 0, 0, 121, 0, 0, 0, 389, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 124,
- 0, 0, 0, 0, 0, 0, 44, 45, 125, 126,
+ 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,
@@ -504,19 +529,19 @@ const int QmlJSGrammar::action_info [] = {
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,
+ 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, 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, 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, 204, 0, 0,
0, 0, 206, 0, 26, 27, 28, 208, 0, 0,
0, 0, 0, 0, 209, 30, 0, 0, 0, 0,
@@ -526,187 +551,199 @@ const int QmlJSGrammar::action_info [] = {
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,
+ 0, 0, 0, 0, 0, 0, 0, 0, 588, 105,
+ 106, 0, 0, 590, 110, 592, 27, 28, 593, 0,
+ 113, 0, 0, 0, 115, 595, 596, 0, 0, 0,
+ 0, 0, 0, 597, 598, 119, 120, 213, 33, 0,
+ 34, 0, 0, 0, 35, 0, 36, 599, 39, 0,
+ 0, 601, 0, 0, 0, 42, 0, 43, 0, 0,
+ 0, 0, 0, 603, 0, 216, 0, 0, 0, 605,
+ 602, 604, 606, 607, 608, 48, 610, 611, 612, 613,
+ 614, 615, 0, 0, 600, 609, 594, 589, 591, 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,
+ -271, 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,
- 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,
- 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,
+ 505, 135, 516, 490, 141, 183, 13, 637, 315, 513,
+ 544, 622, 145, 177, 570, 177, 248, 467, 233, 245,
+ 574, 482, 587, 431, 238, 552, 549, 434, 306, 569,
+ 302, 520, 558, 567, 304, 297, 334, 453, 449, 233,
+ 455, 445, 444, 245, 397, 442, 177, 143, 233, 238,
+ 245, 440, 158, 238, 462, 297, 410, 420, 412, 405,
+ 181, 202, 430, 171, 431, 427, 138, 434, 424, 428,
+ 451, 333, 346, 456, 431, 434, 385, 342, 329, 387,
+ 395, 331, 164, 344, 348, 523, 166, 297, 202, 477,
+ 315, 0, 0, 0, 0, 480, 0, 627, 181, 0,
+ 297, 497, 501, 101, 622, 497, 55, 524, 261, 297,
+ 55, 399, 447, 265, 400, 55, 55, 175, 175, 630,
+ 456, 497, 163, 621, 202, 0, 55, 0, 55, 103,
+ 55, 141, 93, 55, 55, 280, 55, 402, 279, 0,
+ 0, 281, 160, 55, 55, 484, 95, 55, 55, 447,
+ 55, 141, 55, 282, 97, 283, 55, 173, 92, 56,
+ 55, 475, 447, 55, 325, 474, 0, 324, 90, 55,
+ 55, 446, 489, 300, 55, 297, 55, 65, 55, 55,
+ 63, 89, 55, 297, 79, 339, 55, 336, 64, 55,
+ 67, 62, 55, 55, 55, 466, 446, 86, 87, 55,
+ 399, 55, 55, 400, 88, 83, 0, 55, 72, 487,
+ 55, 399, 486, 55, 400, 485, 55, 0, 0, 55,
+ 55, 0, 91, 84, 85, 55, 232, 488, 55, 293,
+ 55, 55, 0, 265, 265, 265, 265, 284, 273, 327,
+ 55, 55, 616, 308, 618, 265, 265, 298, 293, 268,
+ 55, 312, 0, 265, 0, 265, 0, 55, 311, 175,
+ 293, 290, 293, 293, 55, 265, 467, 265, 265, 265,
+ 295, 285, 55, 55, 497, 538, 0, 265, 265, 286,
+ 582, 0, 314, 0, 292, 321, 288, 634, 0, 497,
+ 538, 529, 539, 576, 580, 581, 583, 584, 0, 0,
+ 0, 632, 633, 635, 636, 0, 529, 539, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 101, 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, 103, 170, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 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,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0};
+ 0, 0, 0, 0, 0, 0, 0};
const int QmlJSGrammar::action_check [] = {
- 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,
+ 60, 36, 36, 5, 7, 36, 7, 31, 78, 17,
+ 7, 7, 61, 60, 7, 60, 36, 16, 36, 5,
+ 7, 33, 55, 7, 7, 36, 55, 8, 7, 17,
+ 7, 36, 60, 33, 55, 33, 55, 7, 20, 5,
+ 7, 33, 48, 7, 7, 2, 7, 36, 33, 1,
+ 8, 7, 7, 33, 48, 0, 7, 7, 36, 76,
+ 36, 36, 36, 36, 36, 36, 88, 8, 78, 60,
+ 60, 36, 7, 7, 36, 89, 36, 36, 7, 33,
+ 48, 7, 1, 78, 8, 29, 55, 29, 36, 29,
+ 8, 7, 2, 8, 2, 2, 7, 1, 7, -1,
+ -1, 7, 48, 8, 40, 8, 8, 8, 40, 40,
+ 7, 8, 40, 66, 61, 51, 10, 60, 8, 51,
+ 51, 60, 6, 51, 61, 50, 15, 60, 8, 54,
+ 8, 61, 62, 8, 61, 62, 20, 8, 8, 88,
+ 78, 61, 62, 8, 33, 8, 42, 61, 62, 61,
+ 62, 8, 50, 56, 8, -1, 54, 53, 60, 60,
+ 29, 55, 61, 62, 8, 29, 61, 62, 61, 62,
+ 60, 7, -1, 61, 62, 25, 56, 27, 61, 62,
+ 61, 62, 60, 25, 29, 27, 61, 36, 38, 60,
+ 60, 8, 25, 56, 27, 60, 38, 66, 67, 56,
+ 61, 62, 66, 67, 29, 38, 60, 25, 29, 27,
+ 12, -1, 61, 62, 12, 29, 15, 61, 62, 29,
+ 38, 66, 67, 61, 62, 61, 62, -1, 89, 29,
+ 12, 25, 29, 27, 29, 34, 8, 36, 29, 29,
+ -1, 66, 67, 60, 38, 66, 67, 90, 91, 92,
+ 29, 89, 66, 67, 8, 57, 66, 67, 8, 57,
+ 25, 63, 27, 29, -1, 63, 25, 29, 27, 66,
+ 67, 66, 67, 38, 74, 57, 66, 67, 25, 38,
+ 27, 63, 8, 74, 29, 85, 29, -1, 29, 61,
+ 62, 38, -1, 29, 85, 74, 15, 15, -1, 7,
+ 66, 67, -1, -1, 66, 67, 85, 61, 62, 29,
+ -1, 61, 62, 7, 29, 34, 34, 36, 36, 29,
+ 25, 15, 27, 66, 67, 66, 67, 29, -1, 74,
+ 66, 67, 29, 38, 29, 61, 62, 29, -1, 33,
+ 85, 36, 36, 8, 36, -1, 66, 67, 25, -1,
+ 27, 66, 67, 61, 62, 8, 66, 67, 18, 19,
+ -1, 38, -1, 60, 66, 67, 18, 19, 33, 66,
+ 67, 66, 67, 29, 66, 67, -1, -1, 23, 24,
+ 33, 15, -1, -1, -1, 45, 46, 32, -1, -1,
+ 35, -1, 37, 45, 46, -1, 61, 62, -1, -1,
+ -1, 29, -1, 59, 29, -1, -1, -1, 61, 62,
+ 66, 67, -1, 47, -1, 29, -1, -1, 18, 19,
+ -1, 23, 24, -1, -1, -1, 29, 61, 62, 85,
+ 32, 59, -1, 35, 29, 37, 61, 62, 66, 67,
+ -1, 66, 67, 29, -1, 45, 46, 61, 62, -1,
+ 29, -1, 66, 67, -1, 89, -1, 85, 61, 62,
+ -1, -1, 29, 66, 67, -1, 61, 62, -1, -1,
+ -1, 66, 67, -1, -1, 61, 62, 23, 24, -1,
+ 66, 67, 61, 62, -1, 31, 32, 66, 67, 35,
+ -1, 37, 59, -1, -1, 23, 24, -1, 65, 66,
+ 67, -1, -1, -1, 32, 10, -1, 35, -1, 37,
+ -1, -1, -1, -1, -1, -1, -1, 22, 85, -1,
+ -1, -1, -1, -1, 29, -1, -1, -1, 10, -1,
-1, -1, -1, -1, -1, -1, -1, -1, -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, -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, -1, -1, -1, -1, -1,
- -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, 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, 74, 75, -1, -1,
- -1, -1, 80, 81, 82, -1, -1, -1, 86, -1,
- -1, -1, -1, -1, -1, -1, -1, 7, -1, -1,
+ 55, -1, -1, -1, 59, -1, -1, -1, -1, -1,
+ -1, 66, 67, -1, -1, -1, -1, 23, 24, 74,
+ -1, -1, 3, 55, -1, 31, 32, 59, 83, 35,
+ 85, 37, 13, -1, 66, 67, 17, -1, -1, -1,
+ -1, -1, 74, -1, -1, 26, -1, 28, -1, -1,
+ 31, 83, -1, 85, -1, -1, -1, -1, 39, -1,
+ 41, 42, -1, -1, -1, -1, -1, -1, 49, -1,
+ -1, 52, 53, -1, -1, -1, -1, 58, -1, -1,
+ -1, -1, -1, 64, -1, -1, -1, -1, -1, 3,
+ -1, -1, -1, -1, -1, -1, -1, -1, 79, 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,
+ -1, -1, -1, -1, -1, 49, -1, -1, 52, 53,
+ -1, -1, -1, -1, 58, -1, -1, -1, -1, -1,
+ 64, -1, -1, -1, -1, -1, -1, -1, -1, -1,
+ -1, -1, -1, -1, -1, 79, -1, -1, -1, -1,
+ -1, -1, -1, -1, -1, -1, -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, -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,
+ -1, -1, -1, -1, -1, -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, 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, -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, 74,
+ 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, 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, -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, 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, -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, -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,
@@ -736,39 +773,31 @@ const int QmlJSGrammar::action_check [] = {
-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, 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, -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, 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, 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, -1, -1, 8, -1, -1, 11,
+ 12, 13, -1, -1, -1, -1, -1, -1, -1, -1,
+ 22, -1, -1, -1, -1, -1, -1, 29, -1, -1,
+ -1, 33, 34, -1, 36, -1, -1, -1, 40, -1,
+ 42, 43, 44, -1, -1, 47, -1, -1, -1, 51,
+ -1, 53, -1, -1, 56, -1, -1, 59, -1, -1,
+ -1, -1, -1, 65, 66, 67, -1, 69, -1, 71,
+ -1, 73, -1, 75, -1, -1, -1, -1, 80, 81,
+ 82, -1, -1, 85, 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, -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, 43, -1, -1, -1, 47, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1, -1, 59,
- -1, -1, -1, -1, -1, -1, 66, 67, 68, 69,
+ -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,
@@ -776,19 +805,19 @@ const int QmlJSGrammar::action_check [] = {
-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,
+ -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, 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, 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,
@@ -798,79 +827,66 @@ const int QmlJSGrammar::action_check [] = {
-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,
+ -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, -1,
+ 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,
- -1, -1, -1, -1, 59, -1, 61, -1, -1, -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,
- 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,
- 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,
- -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
+ 9, 3, 9, 2, 33, 9, 3, 15, 9, 9,
+ 21, 9, 66, 9, 9, 9, 3, 33, 9, 2,
+ 9, 3, 15, 3, 9, 9, 3, 17, 2, 21,
+ 2, 9, 3, 21, 3, 3, 9, 3, 3, 9,
+ 2, 17, 17, 2, 2, 9, 9, 33, 9, 9,
+ 2, 97, 33, 9, 33, 3, 2, 95, 3, 2,
+ 9, 2, 80, 3, 3, 80, 33, 17, 92, 3,
+ 2, 2, 2, 9, 3, 17, 33, 2, 2, 34,
+ 33, 3, 33, 3, 2, 8, 33, 3, 2, 33,
+ 9, -1, -1, -1, -1, 33, -1, 9, 9, -1,
+ 3, 9, 10, 9, 9, 9, 43, 11, 43, 3,
+ 43, 37, 45, 48, 40, 43, 43, 45, 45, 24,
+ 9, 9, 59, 11, 2, -1, 43, -1, 43, 35,
+ 43, 33, 49, 43, 43, 48, 43, 39, 48, -1,
+ -1, 48, 57, 43, 43, 45, 55, 43, 43, 45,
+ 43, 33, 43, 48, 53, 48, 43, 39, 49, 46,
+ 43, 29, 45, 43, 67, 33, -1, 86, 48, 43,
+ 43, 45, 45, 67, 43, 3, 43, 46, 43, 43,
+ 45, 48, 43, 3, 48, 99, 43, 98, 45, 43,
+ 51, 45, 43, 43, 43, 84, 45, 48, 48, 43,
+ 37, 43, 43, 40, 48, 47, -1, 43, 49, 45,
+ 43, 37, 45, 43, 40, 45, 43, -1, -1, 43,
+ 43, -1, 49, 47, 47, 43, 104, 45, 43, 43,
+ 43, 43, -1, 48, 48, 48, 48, 50, 50, 67,
+ 43, 43, 9, 58, 11, 48, 48, 67, 43, 52,
+ 43, 65, -1, 48, -1, 48, -1, 43, 60, 45,
+ 43, 54, 43, 43, 43, 48, 33, 48, 48, 48,
+ 65, 50, 43, 43, 9, 10, -1, 48, 48, 50,
+ 3, -1, 65, -1, 65, 65, 56, 3, -1, 9,
+ 10, 26, 27, 13, 17, 18, 19, 20, -1, -1,
+ -1, 17, 18, 19, 20, -1, 26, 27, -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, 23, 24, -1, -1, -1,
+ 9, -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, 35, 36, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, -1};
+ -1, -1, -1, -1, -1, -1, -1};
diff --git a/src/declarative/qml/parser/qmljsgrammar_p.h b/src/declarative/qml/parser/qmljsgrammar_p.h
index c760564..c2bc60e 100644
--- a/src/declarative/qml/parser/qmljsgrammar_p.h
+++ b/src/declarative/qml/parser/qmljsgrammar_p.h
@@ -154,15 +154,15 @@ public:
T_XOR = 78,
T_XOR_EQ = 79,
- ACCEPT_STATE = 616,
- RULE_COUNT = 337,
- STATE_COUNT = 617,
+ ACCEPT_STATE = 638,
+ RULE_COUNT = 350,
+ STATE_COUNT = 639,
TERMINAL_COUNT = 95,
- NON_TERMINAL_COUNT = 103,
+ NON_TERMINAL_COUNT = 106,
- GOTO_INDEX_OFFSET = 617,
- GOTO_INFO_OFFSET = 2231,
- GOTO_CHECK_OFFSET = 2231
+ GOTO_INDEX_OFFSET = 639,
+ GOTO_INFO_OFFSET = 2310,
+ GOTO_CHECK_OFFSET = 2310
};
static const char *const spell [];
diff --git a/src/declarative/qml/parser/qmljsparser.cpp b/src/declarative/qml/parser/qmljsparser.cpp
index e64774e..22f3820 100644
--- a/src/declarative/qml/parser/qmljsparser.cpp
+++ b/src/declarative/qml/parser/qmljsparser.cpp
@@ -337,8 +337,8 @@ case 28: {
} break;
case 30: {
- AST::UiArrayBinding *node = makeAstNode<AST::UiArrayBinding> (driver->nodePool(), sym(1).UiQualifiedId->finish(),
- sym(4).UiArrayMemberList->finish());
+ AST::UiArrayBinding *node = makeAstNode<AST::UiArrayBinding> (driver->nodePool(),
+ sym(1).UiQualifiedId->finish(), sym(4).UiArrayMemberList->finish());
node->colonToken = loc(2);
node->lbracketToken = loc(3);
node->rbracketToken = loc(5);
@@ -360,62 +360,87 @@ case 31: {
return false; // ### recover
}
} break;
-case 32:case 33:case 34:case 35:
+
+case 32: {
+ if (AST::UiQualifiedId *qualifiedId = reparseAsQualifiedId(sym(4).Expression)) {
+ AST::UiObjectBinding *node = makeAstNode<AST::UiObjectBinding> (driver->nodePool(),
+ sym(1).UiQualifiedId->finish(), qualifiedId, sym(5).UiObjectInitializer);
+ node->colonToken = loc(3);
+ sym(1).Node = node;
+ } else {
+ sym(1).Node = 0;
+
+ diagnostic_messages.append(DiagnosticMessage(DiagnosticMessage::Error, loc(2),
+ QLatin1String("Expected a type name after token `:'")));
+
+ return false; // ### recover
+ }
+} break;
+case 33:case 34:case 35:case 36:
{
- AST::UiScriptBinding *node = makeAstNode<AST::UiScriptBinding> (driver->nodePool(), sym(1).UiQualifiedId->finish(),
- sym(3).Statement);
+ AST::UiScriptBinding *node = makeAstNode<AST::UiScriptBinding> (driver->nodePool(),
+ sym(1).UiQualifiedId->finish(), sym(4).Statement);
+ node->colonToken = loc(3);
+ sym(1).Node = node;
+} break;
+case 37:case 38:case 39:case 40:
+{
+ AST::UiScriptBinding *node = makeAstNode<AST::UiScriptBinding> (driver->nodePool(),
+ sym(1).UiQualifiedId->finish(), sym(3).Statement);
node->colonToken = loc(2);
sym(1).Node = node;
} break;
-case 36:
+case 41:
-case 37: {
+case 42: {
sym(1).sval = driver->intern(lexer->characterBuffer(), lexer->characterCount());
break;
}
-case 39: {
+case 44: {
sym(1).Node = 0;
} break;
-case 40: {
+case 45: {
sym(1).Node = sym(1).UiParameterList->finish ();
} break;
-case 41: {
+case 46: {
AST::UiParameterList *node = makeAstNode<AST::UiParameterList> (driver->nodePool(), sym(1).sval, sym(2).sval);
node->identifierToken = loc(2);
sym(1).Node = node;
} break;
-case 42: {
+case 47: {
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 43: {
+case 55: {
AST::UiPublicMember *node = makeAstNode<AST::UiPublicMember> (driver->nodePool(), (NameId *)0, sym(2).sval);
node->type = AST::UiPublicMember::Signal;
node->propertyToken = loc(1);
node->typeToken = loc(2);
- node->identifierToken = loc(3);
+ node->identifierToken = loc(2);
node->parameters = sym(4).UiParameterList;
+ node->semicolonToken = loc(6);
sym(1).Node = node;
} break;
-case 44: {
+case 57: {
AST::UiPublicMember *node = makeAstNode<AST::UiPublicMember> (driver->nodePool(), (NameId *)0, sym(2).sval);
node->type = AST::UiPublicMember::Signal;
node->propertyToken = loc(1);
node->typeToken = loc(2);
- node->identifierToken = loc(3);
+ node->identifierToken = loc(2);
+ node->semicolonToken = loc(3);
sym(1).Node = node;
} break;
-case 46: {
+case 59: {
AST::UiPublicMember *node = makeAstNode<AST::UiPublicMember> (driver->nodePool(), sym(2).sval, sym(3).sval);
node->propertyToken = loc(1);
node->typeToken = loc(2);
@@ -424,7 +449,7 @@ case 46: {
sym(1).Node = node;
} break;
-case 48: {
+case 61: {
AST::UiPublicMember *node = makeAstNode<AST::UiPublicMember> (driver->nodePool(), sym(3).sval, sym(4).sval);
node->isDefaultMember = true;
node->defaultToken = loc(1);
@@ -435,7 +460,7 @@ case 48: {
sym(1).Node = node;
} break;
-case 50: {
+case 63: {
AST::UiPublicMember *node = makeAstNode<AST::UiPublicMember> (driver->nodePool(), sym(2).sval, sym(3).sval,
sym(5).Expression);
node->propertyToken = loc(1);
@@ -446,7 +471,7 @@ case 50: {
sym(1).Node = node;
} break;
-case 52: {
+case 65: {
AST::UiPublicMember *node = makeAstNode<AST::UiPublicMember> (driver->nodePool(), sym(3).sval, sym(4).sval,
sym(6).Expression);
node->isDefaultMember = true;
@@ -459,76 +484,76 @@ case 52: {
sym(1).Node = node;
} break;
-case 53: {
+case 66: {
sym(1).Node = makeAstNode<AST::UiSourceElement>(driver->nodePool(), sym(1).Node);
} break;
-case 54: {
+case 67: {
sym(1).Node = makeAstNode<AST::UiSourceElement>(driver->nodePool(), sym(1).Node);
} break;
-case 55:
-case 56:
+case 68:
+case 69:
{
AST::UiQualifiedId *node = makeAstNode<AST::UiQualifiedId> (driver->nodePool(), driver->intern(lexer->characterBuffer(), lexer->characterCount()));
node->identifierToken = loc(1);
sym(1).Node = node;
} break;
-case 58: {
+case 71: {
QString s = QLatin1String(QmlJSGrammar::spell[T_PROPERTY]);
sym(1).sval = driver->intern(s.constData(), s.length());
break;
}
-case 59: {
+case 72: {
QString s = QLatin1String(QmlJSGrammar::spell[T_SIGNAL]);
sym(1).sval = driver->intern(s.constData(), s.length());
break;
}
-case 60: {
+case 73: {
AST::ThisExpression *node = makeAstNode<AST::ThisExpression> (driver->nodePool());
node->thisToken = loc(1);
sym(1).Node = node;
} break;
-case 61: {
+case 74: {
AST::IdentifierExpression *node = makeAstNode<AST::IdentifierExpression> (driver->nodePool(), sym(1).sval);
node->identifierToken = loc(1);
sym(1).Node = node;
} break;
-case 62: {
+case 75: {
AST::NullExpression *node = makeAstNode<AST::NullExpression> (driver->nodePool());
node->nullToken = loc(1);
sym(1).Node = node;
} break;
-case 63: {
+case 76: {
AST::TrueLiteral *node = makeAstNode<AST::TrueLiteral> (driver->nodePool());
node->trueToken = loc(1);
sym(1).Node = node;
} break;
-case 64: {
+case 77: {
AST::FalseLiteral *node = makeAstNode<AST::FalseLiteral> (driver->nodePool());
node->falseToken = loc(1);
sym(1).Node = node;
} break;
-case 65: {
+case 78: {
AST::NumericLiteral *node = makeAstNode<AST::NumericLiteral> (driver->nodePool(), sym(1).dval);
node->literalToken = loc(1);
sym(1).Node = node;
} break;
-case 66:
-case 67: {
+case 79:
+case 80: {
AST::StringLiteral *node = makeAstNode<AST::StringLiteral> (driver->nodePool(), sym(1).sval);
node->literalToken = loc(1);
sym(1).Node = node;
} break;
-case 68: {
+case 81: {
bool rx = lexer->scanRegExp(Lexer::NoPrefix);
if (!rx) {
diagnostic_messages.append(DiagnosticMessage(DiagnosticMessage::Error, location(lexer), lexer->errorMessage()));
@@ -539,7 +564,7 @@ case 68: {
sym(1).Node = node;
} break;
-case 69: {
+case 82: {
bool rx = lexer->scanRegExp(Lexer::EqualPrefix);
if (!rx) {
diagnostic_messages.append(DiagnosticMessage(DiagnosticMessage::Error, location(lexer), lexer->errorMessage()));
@@ -550,28 +575,28 @@ case 69: {
sym(1).Node = node;
} break;
-case 70: {
+case 83: {
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 71: {
+case 84: {
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 72: {
+case 85: {
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 73: {
+case 86: {
AST::ArrayLiteral *node = makeAstNode<AST::ArrayLiteral> (driver->nodePool(), sym(2).ElementList->finish (),
(AST::Elision *) 0);
node->lbracketToken = loc(1);
@@ -580,7 +605,7 @@ case 73: {
sym(1).Node = node;
} break;
-case 74: {
+case 87: {
AST::ArrayLiteral *node = makeAstNode<AST::ArrayLiteral> (driver->nodePool(), sym(2).ElementList->finish (),
sym(4).Elision->finish());
node->lbracketToken = loc(1);
@@ -589,7 +614,7 @@ case 74: {
sym(1).Node = node;
} break;
-case 75: {
+case 88: {
AST::ObjectLiteral *node = 0;
if (sym(2).Node)
node = makeAstNode<AST::ObjectLiteral> (driver->nodePool(),
@@ -601,7 +626,7 @@ case 75: {
sym(1).Node = node;
} break;
-case 76: {
+case 89: {
AST::ObjectLiteral *node = makeAstNode<AST::ObjectLiteral> (driver->nodePool(),
sym(2).PropertyNameAndValueList->finish ());
node->lbraceToken = loc(1);
@@ -609,67 +634,67 @@ case 76: {
sym(1).Node = node;
} break;
-case 77: {
+case 90: {
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 78: {
+case 91: {
AST::UiQualifiedId *node = makeAstNode<AST::UiQualifiedId> (driver->nodePool(), sym(1).sval);
node->identifierToken = loc(1);
sym(1).Node = node;
} break;
-case 79: {
+case 92: {
AST::UiQualifiedId *node = makeAstNode<AST::UiQualifiedId> (driver->nodePool(), sym(1).UiQualifiedId, sym(3).sval);
node->identifierToken = loc(3);
sym(1).Node = node;
} break;
-case 80: {
+case 93: {
sym(1).Node = makeAstNode<AST::ElementList> (driver->nodePool(), (AST::Elision *) 0, sym(1).Expression);
} break;
-case 81: {
+case 94: {
sym(1).Node = makeAstNode<AST::ElementList> (driver->nodePool(), sym(1).Elision->finish(), sym(2).Expression);
} break;
-case 82: {
+case 95: {
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 83: {
+case 96: {
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 84: {
+case 97: {
AST::Elision *node = makeAstNode<AST::Elision> (driver->nodePool());
node->commaToken = loc(1);
sym(1).Node = node;
} break;
-case 85: {
+case 98: {
AST::Elision *node = makeAstNode<AST::Elision> (driver->nodePool(), sym(1).Elision);
node->commaToken = loc(2);
sym(1).Node = node;
} break;
-case 86: {
+case 99: {
AST::PropertyNameAndValueList *node = makeAstNode<AST::PropertyNameAndValueList> (driver->nodePool(),
sym(1).PropertyName, sym(3).Expression);
node->colonToken = loc(2);
sym(1).Node = node;
} break;
-case 87: {
+case 100: {
AST::PropertyNameAndValueList *node = makeAstNode<AST::PropertyNameAndValueList> (driver->nodePool(),
sym(1).PropertyNameAndValueList, sym(3).PropertyName, sym(5).Expression);
node->commaToken = loc(2);
@@ -677,62 +702,36 @@ case 87: {
sym(1).Node = node;
} break;
-case 88: {
+case 101: {
AST::IdentifierPropertyName *node = makeAstNode<AST::IdentifierPropertyName> (driver->nodePool(), sym(1).sval);
node->propertyNameToken = loc(1);
sym(1).Node = node;
} break;
-case 89:
-case 90: {
+case 102:
+case 103: {
AST::IdentifierPropertyName *node = makeAstNode<AST::IdentifierPropertyName> (driver->nodePool(), driver->intern(lexer->characterBuffer(), lexer->characterCount()));
node->propertyNameToken = loc(1);
sym(1).Node = node;
} break;
-case 91: {
+case 104: {
AST::StringLiteralPropertyName *node = makeAstNode<AST::StringLiteralPropertyName> (driver->nodePool(), sym(1).sval);
node->propertyNameToken = loc(1);
sym(1).Node = node;
} break;
-case 92: {
+case 105: {
AST::NumericLiteralPropertyName *node = makeAstNode<AST::NumericLiteralPropertyName> (driver->nodePool(), sym(1).dval);
node->propertyNameToken = loc(1);
sym(1).Node = node;
} break;
-case 93: {
+case 106: {
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:
-
-case 100:
-
-case 101:
-
-case 102:
-
-case 103:
-
-case 104:
-
-case 105:
-
-case 106:
-
case 107:
case 108:
@@ -768,25 +767,51 @@ case 122:
case 123:
case 124:
+
+case 125:
+
+case 126:
+
+case 127:
+
+case 128:
+
+case 129:
+
+case 130:
+
+case 131:
+
+case 132:
+
+case 133:
+
+case 134:
+
+case 135:
+
+case 136:
+
+case 137:
{
sym(1).sval = driver->intern(lexer->characterBuffer(), lexer->characterCount());
} break;
-case 129: {
+case 142: {
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 130: {
+case 143: {
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 131: {
+case 144: {
AST::NewMemberExpression *node = makeAstNode<AST::NewMemberExpression> (driver->nodePool(), sym(2).Expression, sym(4).ArgumentList);
node->newToken = loc(1);
node->lparenToken = loc(3);
@@ -794,384 +819,384 @@ case 131: {
sym(1).Node = node;
} break;
-case 133: {
+case 146: {
AST::NewExpression *node = makeAstNode<AST::NewExpression> (driver->nodePool(), sym(2).Expression);
node->newToken = loc(1);
sym(1).Node = node;
} break;
-case 134: {
+case 147: {
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 135: {
+case 148: {
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 136: {
+case 149: {
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 137: {
+case 150: {
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 138: {
+case 151: {
sym(1).Node = 0;
} break;
-case 139: {
+case 152: {
sym(1).Node = sym(1).ArgumentList->finish();
} break;
-case 140: {
+case 153: {
sym(1).Node = makeAstNode<AST::ArgumentList> (driver->nodePool(), sym(1).Expression);
} break;
-case 141: {
+case 154: {
AST::ArgumentList *node = makeAstNode<AST::ArgumentList> (driver->nodePool(), sym(1).ArgumentList, sym(3).Expression);
node->commaToken = loc(2);
sym(1).Node = node;
} break;
-case 145: {
+case 158: {
AST::PostIncrementExpression *node = makeAstNode<AST::PostIncrementExpression> (driver->nodePool(), sym(1).Expression);
node->incrementToken = loc(2);
sym(1).Node = node;
} break;
-case 146: {
+case 159: {
AST::PostDecrementExpression *node = makeAstNode<AST::PostDecrementExpression> (driver->nodePool(), sym(1).Expression);
node->decrementToken = loc(2);
sym(1).Node = node;
} break;
-case 148: {
+case 161: {
AST::DeleteExpression *node = makeAstNode<AST::DeleteExpression> (driver->nodePool(), sym(2).Expression);
node->deleteToken = loc(1);
sym(1).Node = node;
} break;
-case 149: {
+case 162: {
AST::VoidExpression *node = makeAstNode<AST::VoidExpression> (driver->nodePool(), sym(2).Expression);
node->voidToken = loc(1);
sym(1).Node = node;
} break;
-case 150: {
+case 163: {
AST::TypeOfExpression *node = makeAstNode<AST::TypeOfExpression> (driver->nodePool(), sym(2).Expression);
node->typeofToken = loc(1);
sym(1).Node = node;
} break;
-case 151: {
+case 164: {
AST::PreIncrementExpression *node = makeAstNode<AST::PreIncrementExpression> (driver->nodePool(), sym(2).Expression);
node->incrementToken = loc(1);
sym(1).Node = node;
} break;
-case 152: {
+case 165: {
AST::PreDecrementExpression *node = makeAstNode<AST::PreDecrementExpression> (driver->nodePool(), sym(2).Expression);
node->decrementToken = loc(1);
sym(1).Node = node;
} break;
-case 153: {
+case 166: {
AST::UnaryPlusExpression *node = makeAstNode<AST::UnaryPlusExpression> (driver->nodePool(), sym(2).Expression);
node->plusToken = loc(1);
sym(1).Node = node;
} break;
-case 154: {
+case 167: {
AST::UnaryMinusExpression *node = makeAstNode<AST::UnaryMinusExpression> (driver->nodePool(), sym(2).Expression);
node->minusToken = loc(1);
sym(1).Node = node;
} break;
-case 155: {
+case 168: {
AST::TildeExpression *node = makeAstNode<AST::TildeExpression> (driver->nodePool(), sym(2).Expression);
node->tildeToken = loc(1);
sym(1).Node = node;
} break;
-case 156: {
+case 169: {
AST::NotExpression *node = makeAstNode<AST::NotExpression> (driver->nodePool(), sym(2).Expression);
node->notToken = loc(1);
sym(1).Node = node;
} break;
-case 158: {
+case 171: {
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 159: {
+case 172: {
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 160: {
+case 173: {
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 162: {
+case 175: {
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 163: {
+case 176: {
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 165: {
+case 178: {
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 166: {
+case 179: {
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 167: {
+case 180: {
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 169: {
+case 182: {
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 170: {
+case 183: {
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 171: {
+case 184: {
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 172: {
+case 185: {
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 173: {
+case 186: {
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 174: {
+case 187: {
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 176: {
+case 189: {
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 177: {
+case 190: {
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 178: {
+case 191: {
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 179: {
+case 192: {
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 180: {
+case 193: {
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 182: {
+case 195: {
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 183: {
+case 196: {
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 184: {
+case 197: {
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 185: {
+case 198: {
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 187: {
+case 200: {
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 188: {
+case 201: {
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 189: {
+case 202: {
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 190: {
+case 203: {
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 192: {
+case 205: {
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 194: {
+case 207: {
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 196: {
+case 209: {
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 198: {
+case 211: {
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 200: {
+case 213: {
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 202: {
+case 215: {
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 204: {
+case 217: {
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 206: {
+case 219: {
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 208: {
+case 221: {
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 210: {
+case 223: {
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 212: {
+case 225: {
AST::ConditionalExpression *node = makeAstNode<AST::ConditionalExpression> (driver->nodePool(), sym(1).Expression,
sym(3).Expression, sym(5).Expression);
node->questionToken = loc(2);
@@ -1179,7 +1204,7 @@ case 212: {
sym(1).Node = node;
} break;
-case 214: {
+case 227: {
AST::ConditionalExpression *node = makeAstNode<AST::ConditionalExpression> (driver->nodePool(), sym(1).Expression,
sym(3).Expression, sym(5).Expression);
node->questionToken = loc(2);
@@ -1187,112 +1212,112 @@ case 214: {
sym(1).Node = node;
} break;
-case 216: {
+case 229: {
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 218: {
+case 231: {
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 219: {
+case 232: {
sym(1).ival = QSOperator::Assign;
} break;
-case 220: {
+case 233: {
sym(1).ival = QSOperator::InplaceMul;
} break;
-case 221: {
+case 234: {
sym(1).ival = QSOperator::InplaceDiv;
} break;
-case 222: {
+case 235: {
sym(1).ival = QSOperator::InplaceMod;
} break;
-case 223: {
+case 236: {
sym(1).ival = QSOperator::InplaceAdd;
} break;
-case 224: {
+case 237: {
sym(1).ival = QSOperator::InplaceSub;
} break;
-case 225: {
+case 238: {
sym(1).ival = QSOperator::InplaceLeftShift;
} break;
-case 226: {
+case 239: {
sym(1).ival = QSOperator::InplaceRightShift;
} break;
-case 227: {
+case 240: {
sym(1).ival = QSOperator::InplaceURightShift;
} break;
-case 228: {
+case 241: {
sym(1).ival = QSOperator::InplaceAnd;
} break;
-case 229: {
+case 242: {
sym(1).ival = QSOperator::InplaceXor;
} break;
-case 230: {
+case 243: {
sym(1).ival = QSOperator::InplaceOr;
} break;
-case 232: {
+case 245: {
AST::Expression *node = makeAstNode<AST::Expression> (driver->nodePool(), sym(1).Expression, sym(3).Expression);
node->commaToken = loc(2);
sym(1).Node = node;
} break;
-case 233: {
+case 246: {
sym(1).Node = 0;
} break;
-case 236: {
+case 249: {
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 250: {
sym(1).Node = 0;
} break;
-case 254: {
+case 267: {
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 255: {
+case 268: {
sym(1).Node = makeAstNode<AST::StatementList> (driver->nodePool(), sym(1).Statement);
} break;
-case 256: {
+case 269: {
sym(1).Node = makeAstNode<AST::StatementList> (driver->nodePool(), sym(1).StatementList, sym(2).Statement);
} break;
-case 257: {
+case 270: {
sym(1).Node = 0;
} break;
-case 258: {
+case 271: {
sym(1).Node = sym(1).StatementList->finish ();
} break;
-case 260: {
+case 273: {
AST::VariableStatement *node = makeAstNode<AST::VariableStatement> (driver->nodePool(),
sym(2).VariableDeclarationList->finish (/*readOnly=*/sym(1).ival == T_CONST));
node->declarationKindToken = loc(1);
@@ -1300,76 +1325,76 @@ case 260: {
sym(1).Node = node;
} break;
-case 261: {
+case 274: {
sym(1).ival = T_CONST;
} break;
-case 262: {
+case 275: {
sym(1).ival = T_VAR;
} break;
-case 263: {
+case 276: {
sym(1).Node = makeAstNode<AST::VariableDeclarationList> (driver->nodePool(), sym(1).VariableDeclaration);
} break;
-case 264: {
+case 277: {
AST::VariableDeclarationList *node = makeAstNode<AST::VariableDeclarationList> (driver->nodePool(),
sym(1).VariableDeclarationList, sym(3).VariableDeclaration);
node->commaToken = loc(2);
sym(1).Node = node;
} break;
-case 265: {
+case 278: {
sym(1).Node = makeAstNode<AST::VariableDeclarationList> (driver->nodePool(), sym(1).VariableDeclaration);
} break;
-case 266: {
+case 279: {
sym(1).Node = makeAstNode<AST::VariableDeclarationList> (driver->nodePool(), sym(1).VariableDeclarationList, sym(3).VariableDeclaration);
} break;
-case 267: {
+case 280: {
AST::VariableDeclaration *node = makeAstNode<AST::VariableDeclaration> (driver->nodePool(), sym(1).sval, sym(2).Expression);
node->identifierToken = loc(1);
sym(1).Node = node;
} break;
-case 268: {
+case 281: {
AST::VariableDeclaration *node = makeAstNode<AST::VariableDeclaration> (driver->nodePool(), sym(1).sval, sym(2).Expression);
node->identifierToken = loc(1);
sym(1).Node = node;
} break;
-case 269: {
+case 282: {
// ### TODO: AST for initializer
sym(1) = sym(2);
} break;
-case 270: {
+case 283: {
sym(1).Node = 0;
} break;
-case 272: {
+case 285: {
// ### TODO: AST for initializer
sym(1) = sym(2);
} break;
-case 273: {
+case 286: {
sym(1).Node = 0;
} break;
-case 275: {
+case 288: {
AST::EmptyStatement *node = makeAstNode<AST::EmptyStatement> (driver->nodePool());
node->semicolonToken = loc(1);
sym(1).Node = node;
} break;
-case 277: {
+case 290: {
AST::ExpressionStatement *node = makeAstNode<AST::ExpressionStatement> (driver->nodePool(), sym(1).Expression);
node->semicolonToken = loc(2);
sym(1).Node = node;
} break;
-case 278: {
+case 291: {
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);
@@ -1378,7 +1403,7 @@ case 278: {
sym(1).Node = node;
} break;
-case 279: {
+case 292: {
AST::IfStatement *node = makeAstNode<AST::IfStatement> (driver->nodePool(), sym(3).Expression, sym(5).Statement);
node->ifToken = loc(1);
node->lparenToken = loc(2);
@@ -1386,7 +1411,7 @@ case 279: {
sym(1).Node = node;
} break;
-case 281: {
+case 294: {
AST::DoWhileStatement *node = makeAstNode<AST::DoWhileStatement> (driver->nodePool(), sym(2).Statement, sym(5).Expression);
node->doToken = loc(1);
node->whileToken = loc(3);
@@ -1396,7 +1421,7 @@ case 281: {
sym(1).Node = node;
} break;
-case 282: {
+case 295: {
AST::WhileStatement *node = makeAstNode<AST::WhileStatement> (driver->nodePool(), sym(3).Expression, sym(5).Statement);
node->whileToken = loc(1);
node->lparenToken = loc(2);
@@ -1404,7 +1429,7 @@ case 282: {
sym(1).Node = node;
} break;
-case 283: {
+case 296: {
AST::ForStatement *node = makeAstNode<AST::ForStatement> (driver->nodePool(), sym(3).Expression,
sym(5).Expression, sym(7).Expression, sym(9).Statement);
node->forToken = loc(1);
@@ -1415,7 +1440,7 @@ case 283: {
sym(1).Node = node;
} break;
-case 284: {
+case 297: {
AST::LocalForStatement *node = makeAstNode<AST::LocalForStatement> (driver->nodePool(),
sym(4).VariableDeclarationList->finish (/*readOnly=*/false), sym(6).Expression,
sym(8).Expression, sym(10).Statement);
@@ -1428,7 +1453,7 @@ case 284: {
sym(1).Node = node;
} break;
-case 285: {
+case 298: {
AST:: ForEachStatement *node = makeAstNode<AST::ForEachStatement> (driver->nodePool(), sym(3).Expression,
sym(5).Expression, sym(7).Statement);
node->forToken = loc(1);
@@ -1438,7 +1463,7 @@ case 285: {
sym(1).Node = node;
} break;
-case 286: {
+case 299: {
AST::LocalForEachStatement *node = makeAstNode<AST::LocalForEachStatement> (driver->nodePool(),
sym(4).VariableDeclaration, sym(6).Expression, sym(8).Statement);
node->forToken = loc(1);
@@ -1449,14 +1474,14 @@ case 286: {
sym(1).Node = node;
} break;
-case 288: {
+case 301: {
AST::ContinueStatement *node = makeAstNode<AST::ContinueStatement> (driver->nodePool());
node->continueToken = loc(1);
node->semicolonToken = loc(2);
sym(1).Node = node;
} break;
-case 290: {
+case 303: {
AST::ContinueStatement *node = makeAstNode<AST::ContinueStatement> (driver->nodePool(), sym(2).sval);
node->continueToken = loc(1);
node->identifierToken = loc(2);
@@ -1464,14 +1489,14 @@ case 290: {
sym(1).Node = node;
} break;
-case 292: {
+case 305: {
AST::BreakStatement *node = makeAstNode<AST::BreakStatement> (driver->nodePool());
node->breakToken = loc(1);
node->semicolonToken = loc(2);
sym(1).Node = node;
} break;
-case 294: {
+case 307: {
AST::BreakStatement *node = makeAstNode<AST::BreakStatement> (driver->nodePool(), sym(2).sval);
node->breakToken = loc(1);
node->identifierToken = loc(2);
@@ -1479,14 +1504,14 @@ case 294: {
sym(1).Node = node;
} break;
-case 296: {
+case 309: {
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 297: {
+case 310: {
AST::WithStatement *node = makeAstNode<AST::WithStatement> (driver->nodePool(), sym(3).Expression, sym(5).Statement);
node->withToken = loc(1);
node->lparenToken = loc(2);
@@ -1494,7 +1519,7 @@ case 297: {
sym(1).Node = node;
} break;
-case 298: {
+case 311: {
AST::SwitchStatement *node = makeAstNode<AST::SwitchStatement> (driver->nodePool(), sym(3).Expression, sym(5).CaseBlock);
node->switchToken = loc(1);
node->lparenToken = loc(2);
@@ -1502,90 +1527,90 @@ case 298: {
sym(1).Node = node;
} break;
-case 299: {
+case 312: {
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 300: {
+case 313: {
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 301: {
+case 314: {
sym(1).Node = makeAstNode<AST::CaseClauses> (driver->nodePool(), sym(1).CaseClause);
} break;
-case 302: {
+case 315: {
sym(1).Node = makeAstNode<AST::CaseClauses> (driver->nodePool(), sym(1).CaseClauses, sym(2).CaseClause);
} break;
-case 303: {
+case 316: {
sym(1).Node = 0;
} break;
-case 304: {
+case 317: {
sym(1).Node = sym(1).CaseClauses->finish ();
} break;
-case 305: {
+case 318: {
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 306: {
+case 319: {
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 307:
-case 308: {
+case 320:
+case 321: {
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 309: {
+case 322: {
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 311: {
+case 324: {
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 312: {
+case 325: {
AST::TryStatement *node = makeAstNode<AST::TryStatement> (driver->nodePool(), sym(2).Statement, sym(3).Catch);
node->tryToken = loc(1);
sym(1).Node = node;
} break;
-case 313: {
+case 326: {
AST::TryStatement *node = makeAstNode<AST::TryStatement> (driver->nodePool(), sym(2).Statement, sym(3).Finally);
node->tryToken = loc(1);
sym(1).Node = node;
} break;
-case 314: {
+case 327: {
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 315: {
+case 328: {
AST::Catch *node = makeAstNode<AST::Catch> (driver->nodePool(), sym(3).sval, sym(5).Block);
node->catchToken = loc(1);
node->lparenToken = loc(2);
@@ -1594,20 +1619,20 @@ case 315: {
sym(1).Node = node;
} break;
-case 316: {
+case 329: {
AST::Finally *node = makeAstNode<AST::Finally> (driver->nodePool(), sym(2).Block);
node->finallyToken = loc(1);
sym(1).Node = node;
} break;
-case 318: {
+case 331: {
AST::DebuggerStatement *node = makeAstNode<AST::DebuggerStatement> (driver->nodePool());
node->debuggerToken = loc(1);
node->semicolonToken = loc(2);
sym(1).Node = node;
} break;
-case 319: {
+case 332: {
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);
@@ -1618,7 +1643,7 @@ case 319: {
sym(1).Node = node;
} break;
-case 320: {
+case 333: {
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)
@@ -1630,56 +1655,56 @@ case 320: {
sym(1).Node = node;
} break;
-case 321: {
+case 334: {
AST::FormalParameterList *node = makeAstNode<AST::FormalParameterList> (driver->nodePool(), sym(1).sval);
node->identifierToken = loc(1);
sym(1).Node = node;
} break;
-case 322: {
+case 335: {
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 323: {
+case 336: {
sym(1).Node = 0;
} break;
-case 324: {
+case 337: {
sym(1).Node = sym(1).FormalParameterList->finish ();
} break;
-case 325: {
+case 338: {
sym(1).Node = 0;
} break;
-case 327: {
+case 340: {
sym(1).Node = makeAstNode<AST::FunctionBody> (driver->nodePool(), sym(1).SourceElements->finish ());
} break;
-case 328: {
+case 341: {
sym(1).Node = makeAstNode<AST::SourceElements> (driver->nodePool(), sym(1).SourceElement);
} break;
-case 329: {
+case 342: {
sym(1).Node = makeAstNode<AST::SourceElements> (driver->nodePool(), sym(1).SourceElements, sym(2).SourceElement);
} break;
-case 330: {
+case 343: {
sym(1).Node = makeAstNode<AST::StatementSourceElement> (driver->nodePool(), sym(1).Statement);
} break;
-case 331: {
+case 344: {
sym(1).Node = makeAstNode<AST::FunctionSourceElement> (driver->nodePool(), sym(1).FunctionDeclaration);
} break;
-case 332: {
+case 345: {
sym(1).sval = 0;
} break;
-case 334: {
+case 347: {
sym(1).Node = 0;
} break;
diff --git a/src/declarative/qml/parser/qmljsparser_p.h b/src/declarative/qml/parser/qmljsparser_p.h
index 6f36484..be5317b 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 68
+#define J_SCRIPT_REGEXPLITERAL_RULE1 81
-#define J_SCRIPT_REGEXPLITERAL_RULE2 69
+#define J_SCRIPT_REGEXPLITERAL_RULE2 82
QT_END_NAMESPACE
diff --git a/src/declarative/qml/qml.pri b/src/declarative/qml/qml.pri
index d8b69df..6ee670e 100644
--- a/src/declarative/qml/qml.pri
+++ b/src/declarative/qml/qml.pri
@@ -5,7 +5,7 @@ SOURCES += qml/qmlparser.cpp \
qml/qmlexpression.cpp \
qml/qmlbinding.cpp \
qml/qmlmetaproperty.cpp \
- qml/qmlbindablecomponent.cpp \
+ qml/qmlcomponentjs.cpp \
qml/qmlcomponent.cpp \
qml/qmlcontext.cpp \
qml/qmlcustomparser.cpp \
@@ -38,8 +38,8 @@ HEADERS += qml/qmlparser_p.h \
qml/qmlbinding.h \
qml/qmlbinding_p.h \
qml/qmlmetaproperty.h \
- qml/qmlbindablecomponent.h \
- qml/qmlbindablecomponent_p.h \
+ qml/qmlcomponentjs.h \
+ qml/qmlcomponentjs_p.h \
qml/qmlcomponent.h \
qml/qmlcomponent_p.h \
qml/qmlcustomparser_p.h \
diff --git a/src/declarative/qml/qmlcompiler.cpp b/src/declarative/qml/qmlcompiler.cpp
index 20f0d93f..2e8666d 100644
--- a/src/declarative/qml/qmlcompiler.cpp
+++ b/src/declarative/qml/qmlcompiler.cpp
@@ -1427,7 +1427,7 @@ bool QmlCompiler::buildAttachedProperty(QmlParser::Property *prop,
const BindingContext &ctxt)
{
Q_ASSERT(prop->value);
- int id = QmlMetaType::attachedPropertiesFuncId("Qt/4.6/"+prop->name); // XXX Should not hard-code namespace
+ int id = QmlMetaType::attachedPropertiesFuncId(prop->name);
Q_ASSERT(id != -1); // This is checked in compileProperty()
prop->index = id;
diff --git a/src/declarative/qml/qmlbindablecomponent.cpp b/src/declarative/qml/qmlcomponentjs.cpp
index 6938592..32c2249 100644
--- a/src/declarative/qml/qmlbindablecomponent.cpp
+++ b/src/declarative/qml/qmlcomponentjs.cpp
@@ -39,48 +39,48 @@
**
****************************************************************************/
-#include "qmlbindablecomponent.h"
-#include "qmlbindablecomponent_p.h"
+#include "qmlcomponentjs.h"
+#include "qmlcomponentjs_p.h"
#include "qmlcomponent.h"
QT_BEGIN_NAMESPACE
-QmlBindableComponent::QmlBindableComponent(QmlEngine *engine, QObject *parent)
- : QmlComponent(*(new QmlBindableComponentPrivate), parent)
+QmlComponentJS::QmlComponentJS(QmlEngine *engine, QObject *parent)
+ : QmlComponent(*(new QmlComponentJSPrivate), parent)
{
- Q_D(QmlBindableComponent);
+ Q_D(QmlComponentJS);
d->engine = engine;
connect(this, SIGNAL(statusChanged(QmlComponent::Status)),
this, SLOT(statusChange(QmlComponent::Status)));
}
-QmlBindableComponent::QmlBindableComponent(QmlEngine *engine, const QUrl &url, QObject *parent)
- : QmlComponent(*(new QmlBindableComponentPrivate), parent)
+QmlComponentJS::QmlComponentJS(QmlEngine *engine, const QUrl &url, QObject *parent)
+ : QmlComponent(*(new QmlComponentJSPrivate), parent)
{
- Q_D(QmlBindableComponent);
+ Q_D(QmlComponentJS);
d->engine = engine;
loadUrl(url);
connect(this, SIGNAL(statusChanged(QmlComponent::Status)),
this, SLOT(statusChange(QmlComponent::Status)));
}
-void QmlBindableComponent::setContext(QmlContext* c)
+void QmlComponentJS::setContext(QmlContext* c)
{
- Q_D(QmlBindableComponent);
+ Q_D(QmlComponentJS);
d->ctxt =c;
}
/*!
Create a script object instance from this component. Returns a null
script object if creation failed. It will create the instance in the
- same context that it was created it. QmlBindableComponent is only
+ same context that it was created it. QmlComponentJS is only
meant to be created from with script - C++ developers should just use
QmlComponent directly.
Similar to QmlComponent::create(), but creates an object suitable
for usage within scripts.
*/
-QScriptValue QmlBindableComponent::createObject()
+QScriptValue QmlComponentJS::createObject()
{
- Q_D(QmlBindableComponent);
+ Q_D(QmlComponentJS);
QObject* ret = create(d->ctxt);
return QmlEngine::qmlScriptObject(ret, d->engine);
}
@@ -95,9 +95,9 @@ QScriptValue QmlBindableComponent::createObject()
\sa errors()
*/
-QString QmlBindableComponent::errorsString() const
+QString QmlComponentJS::errorsString() const
{
- Q_D(const QmlBindableComponent);
+ Q_D(const QmlComponentJS);
QString ret;
if(!isError())
return ret;
@@ -110,9 +110,9 @@ QString QmlBindableComponent::errorsString() const
}
-void QmlBindableComponent::statusChange(QmlComponent::Status newStatus)
+void QmlComponentJS::statusChange(QmlComponent::Status newStatus)
{
- Q_D(QmlBindableComponent);
+ Q_D(QmlComponentJS);
if(newStatus == d->prevStatus)
return;
if(newStatus == QmlComponent::Null || d->prevStatus == QmlComponent::Null)
diff --git a/src/declarative/qml/qmlbindablecomponent.h b/src/declarative/qml/qmlcomponentjs.h
index 43e3537..5ad1635 100644
--- a/src/declarative/qml/qmlbindablecomponent.h
+++ b/src/declarative/qml/qmlcomponentjs.h
@@ -55,17 +55,17 @@ QT_BEGIN_NAMESPACE
QT_MODULE(Declarative)
-class QmlBindableComponentPrivate;
+class QmlComponentJSPrivate;
class QmlEngine;
class QmlContext;
-class Q_DECLARATIVE_EXPORT QmlBindableComponent : public QmlComponent
+class Q_DECLARATIVE_EXPORT QmlComponentJS : public QmlComponent
{
Q_OBJECT
- Q_DECLARE_PRIVATE(QmlBindableComponent)
+ Q_DECLARE_PRIVATE(QmlComponentJS)
friend class QmlEngine;
public:
- QmlBindableComponent(QmlEngine *, const QUrl &url, QObject *parent = 0);
- QmlBindableComponent(QmlEngine *, QObject *parent=0);
+ QmlComponentJS(QmlEngine *, const QUrl &url, QObject *parent = 0);
+ QmlComponentJS(QmlEngine *, QObject *parent=0);
Q_PROPERTY(bool isNull READ isNull NOTIFY isNullChanged);
Q_PROPERTY(bool isReady READ isReady NOTIFY isReadyChanged);
Q_PROPERTY(bool isError READ isError NOTIFY isErrorChanged);
@@ -86,7 +86,7 @@ private slots:
QT_END_NAMESPACE
-QML_DECLARE_TYPE(QmlBindableComponent)
+QML_DECLARE_TYPE(QmlComponentJS)
QT_END_HEADER
#endif
diff --git a/src/declarative/qml/qmlbindablecomponent_p.h b/src/declarative/qml/qmlcomponentjs_p.h
index 79335df..75d5517 100644
--- a/src/declarative/qml/qmlbindablecomponent_p.h
+++ b/src/declarative/qml/qmlcomponentjs_p.h
@@ -54,18 +54,18 @@
//
#include "qmlcomponent.h"
-#include "qmlbindablecomponent.h"
+#include "qmlcomponentjs.h"
#include "qmlcomponent_p.h"
QT_BEGIN_NAMESPACE
class QmlContext;
-class QmlBindableComponentPrivate : public QmlComponentPrivate
+class QmlComponentJSPrivate : public QmlComponentPrivate
{
- Q_DECLARE_PUBLIC(QmlBindableComponent)
+ Q_DECLARE_PUBLIC(QmlComponentJS)
public:
- QmlBindableComponentPrivate() : QmlComponentPrivate(),
- prevStatus(QmlBindableComponent::Null), ctxt(0)
+ QmlComponentJSPrivate() : QmlComponentPrivate(),
+ prevStatus(QmlComponentJS::Null), ctxt(0)
{ }
QmlComponent::Status prevStatus;
diff --git a/src/declarative/qml/qmlengine.cpp b/src/declarative/qml/qmlengine.cpp
index 33c6710..69cc542 100644
--- a/src/declarative/qml/qmlengine.cpp
+++ b/src/declarative/qml/qmlengine.cpp
@@ -71,7 +71,7 @@
#include <QtCore/qcoreapplication.h>
#include <QtCore/qdir.h>
#include <qmlcomponent.h>
-#include <qmlbindablecomponent.h>
+#include <qmlcomponentjs.h>
#include "private/qmlmetaproperty_p.h"
#include <private/qmlbinding_p.h>
#include <private/qmlvme_p.h>
@@ -602,18 +602,18 @@ QScriptValue QmlEngine::qmlScriptObject(QObject* object, QmlEngine* engine)
*/
QScriptValue QmlEngine::createComponent(QScriptContext *ctxt, QScriptEngine *engine)
{
- QmlBindableComponent* c;
+ QmlComponentJS* c;
QmlEngine* activeEngine = qobject_cast<QmlEngine*>(
engine->globalObject().property(QLatin1String("qmlEngine")).toQObject());
QmlContext* context =activeEngine->d_func()->currentExpression->context();
if(ctxt->argumentCount() != 1 || !activeEngine){
- c = new QmlBindableComponent(activeEngine);
+ c = new QmlComponentJS(activeEngine);
}else{
QUrl url = QUrl(context->resolvedUrl(ctxt->argument(0).toString()));
if(!url.isValid()){
url = QUrl(ctxt->argument(0).toString());
}
- c = new QmlBindableComponent(activeEngine, url, activeEngine);
+ c = new QmlComponentJS(activeEngine, url, activeEngine);
}
c->setContext(context);
return engine->newQObject(c);
diff --git a/src/declarative/util/qmlfontfamily.cpp b/src/declarative/util/qmlfontfamily.cpp
index 407d2ab..e539085 100644
--- a/src/declarative/util/qmlfontfamily.cpp
+++ b/src/declarative/util/qmlfontfamily.cpp
@@ -57,13 +57,14 @@ class QmlFontFamilyPrivate : public QObjectPrivate
Q_DECLARE_PUBLIC(QmlFontFamily);
public:
- QmlFontFamilyPrivate() : reply(0) {}
+ QmlFontFamilyPrivate() : reply(0), loading(false) {}
void addFontToDatabase(const QByteArray &);
QUrl url;
QString name;
QNetworkReply *reply;
+ bool loading;
};
QML_DEFINE_TYPE(Qt,4,6,(QT_VERSION&0x00ff00)>>8,FontFamily,QmlFontFamily)
@@ -94,6 +95,8 @@ void QmlFontFamily::setSource(const QUrl &url)
return;
d->url = qmlContext(this)->resolvedUrl(url);
+ d->loading = true;
+ emit loadingChanged();
#ifndef QT_NO_LOCALFILE_OPTIMIZED_QML
if (d->url.scheme() == QLatin1String("file")) {
QFile file(d->url.toLocalFile());
@@ -125,6 +128,12 @@ void QmlFontFamily::setName(const QString &name)
emit nameChanged();
}
+bool QmlFontFamily::isLoading() const
+{
+ Q_D(const QmlFontFamily);
+ return d->loading;
+}
+
void QmlFontFamily::replyFinished()
{
Q_D(QmlFontFamily);
@@ -144,6 +153,8 @@ void QmlFontFamilyPrivate::addFontToDatabase(const QByteArray &ba)
if (id != -1) {
name = QFontDatabase::applicationFontFamilies(id).at(0);
emit q->nameChanged();
+ loading = false;
+ emit q->loadingChanged();
} else {
qWarning() << "Cannot load font: " << name << url;
}
diff --git a/src/declarative/util/qmlfontfamily.h b/src/declarative/util/qmlfontfamily.h
index 739a553..c647f67 100644
--- a/src/declarative/util/qmlfontfamily.h
+++ b/src/declarative/util/qmlfontfamily.h
@@ -59,6 +59,7 @@ class Q_DECLARATIVE_EXPORT QmlFontFamily : public QObject
Q_PROPERTY(QUrl source READ source WRITE setSource NOTIFY sourceChanged)
Q_PROPERTY(QString name READ name WRITE setName NOTIFY nameChanged)
+ Q_PROPERTY(bool loading READ isLoading NOTIFY loadingChanged)
public:
QmlFontFamily(QObject *parent = 0);
@@ -70,11 +71,14 @@ public:
QString name() const;
void setName(const QString &name);
+ bool isLoading() const;
+
private Q_SLOTS:
void replyFinished();
Q_SIGNALS:
void nameChanged();
+ void loadingChanged();
};
QT_END_NAMESPACE
generated by cgit v0.12 at 2025-01-05 22:19:29 (GMT)