summaryrefslogtreecommitdiffstats
path: root/src/declarative/qml
diff options
context:
space:
mode:
authorMichael Brasser <michael.brasser@nokia.com>2009-07-02 03:11:43 (GMT)
committerMichael Brasser <michael.brasser@nokia.com>2009-07-02 03:11:43 (GMT)
commit8aba610c22c44bf36eb2e539a06b65753c48bbc2 (patch)
treea09af5ec3edd87ffcf041fe030135e58d49cb520 /src/declarative/qml
parentdafd625842e2c66551857810a3660c534962746e (diff)
parent305de45a8d184738dc07fb7e5c787b9dbb5b3c6b (diff)
downloadQt-8aba610c22c44bf36eb2e539a06b65753c48bbc2.zip
Qt-8aba610c22c44bf36eb2e539a06b65753c48bbc2.tar.gz
Qt-8aba610c22c44bf36eb2e539a06b65753c48bbc2.tar.bz2
Merge branch 'kinetic-declarativeui' of git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
Diffstat (limited to 'src/declarative/qml')
-rw-r--r--src/declarative/qml/parser/qmljs.g47
-rw-r--r--src/declarative/qml/parser/qmljsast_p.h42
-rw-r--r--src/declarative/qml/parser/qmljsgrammar.cpp1229
-rw-r--r--src/declarative/qml/parser/qmljsgrammar_p.h18
-rw-r--r--src/declarative/qml/parser/qmljsparser.cpp431
-rw-r--r--src/declarative/qml/parser/qmljsparser_p.h5
-rw-r--r--src/declarative/qml/qmlbasicscript.cpp7
-rw-r--r--src/declarative/qml/qmlbasicscript_p.h1
-rw-r--r--src/declarative/qml/qmlcompiler.cpp9
-rw-r--r--src/declarative/qml/qmlcomponent.cpp23
-rw-r--r--src/declarative/qml/qmlcomponent.h1
-rw-r--r--src/declarative/qml/qmlengine.cpp61
-rw-r--r--src/declarative/qml/qmlmetaproperty.cpp43
-rw-r--r--src/declarative/qml/qmlmetaproperty.h3
-rw-r--r--src/declarative/qml/qmlparser.cpp3
-rw-r--r--src/declarative/qml/qmlparser_p.h2
-rw-r--r--src/declarative/qml/qmlscriptparser.cpp60
-rw-r--r--src/declarative/qml/qmlvmemetaobject.cpp5
18 files changed, 1065 insertions, 925 deletions
diff --git a/src/declarative/qml/parser/qmljs.g b/src/declarative/qml/parser/qmljs.g
index ed5f653..c7952e2 100644
--- a/src/declarative/qml/parser/qmljs.g
+++ b/src/declarative/qml/parser/qmljs.g
@@ -254,6 +254,7 @@ public:
AST::UiProgram *UiProgram;
AST::UiImportList *UiImportList;
AST::UiImport *UiImport;
+ AST::UiParameterList *UiParameterList;
AST::UiPublicMember *UiPublicMember;
AST::UiObjectDefinition *UiObjectDefinition;
AST::UiObjectInitializer *UiObjectInitializer;
@@ -706,6 +707,52 @@ case $rule_number: {
UiPropertyType: T_IDENTIFIER ;
+UiParameterListOpt: ;
+/.
+case $rule_number: {
+ sym(1).Node = 0;
+} break;
+./
+
+UiParameterListOpt: UiParameterList ;
+/.
+case $rule_number: {
+ sym(1).Node = sym(1).UiParameterList->finish ();
+} break;
+./
+
+UiParameterList: UiPropertyType JsIdentifier ;
+/.
+case $rule_number: {
+ AST::UiParameterList *node = makeAstNode<AST::UiParameterList> (driver->nodePool(), sym(1).sval, sym(2).sval);
+ node->identifierToken = loc(2);
+ sym(1).Node = node;
+} break;
+./
+
+UiParameterList: UiParameterList T_COMMA UiPropertyType JsIdentifier ;
+/.
+case $rule_number: {
+ 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;
+./
+
+UiObjectMember: T_SIGNAL T_IDENTIFIER T_LPAREN UiParameterListOpt T_RPAREN ;
+/.
+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->parameters = sym(4).UiParameterList;
+ sym(1).Node = node;
+} break;
+./
+
UiObjectMember: T_SIGNAL T_IDENTIFIER ;
/.
case $rule_number: {
diff --git a/src/declarative/qml/parser/qmljsast_p.h b/src/declarative/qml/parser/qmljsast_p.h
index 1db037a..ba655f3 100644
--- a/src/declarative/qml/parser/qmljsast_p.h
+++ b/src/declarative/qml/parser/qmljsast_p.h
@@ -209,6 +209,7 @@ public:
Kind_UiObjectMemberList,
Kind_UiArrayMemberList,
Kind_UiProgram,
+ Kind_UiParameterList,
Kind_UiPublicMember,
Kind_UiQualifiedId,
Kind_UiScriptBinding,
@@ -2351,6 +2352,42 @@ public:
SourceLocation rbraceToken;
};
+class UiParameterList: public Node
+{
+public:
+ QMLJS_DECLARE_AST_NODE(UiParameterList)
+
+ UiParameterList(NameId *t, NameId *n):
+ type (t), name (n), next (this)
+ { kind = K; }
+
+ UiParameterList(UiParameterList *previous, NameId *t, NameId *n):
+ type (t), name (n)
+ {
+ kind = K;
+ next = previous->next;
+ previous->next = this;
+ }
+
+ virtual ~UiParameterList() {}
+
+ virtual void accept0(Visitor *) {}
+
+ inline UiParameterList *finish ()
+ {
+ UiParameterList *front = next;
+ next = 0;
+ return front;
+ }
+
+// attributes
+ NameId *type;
+ NameId *name;
+ UiParameterList *next;
+ SourceLocation commaToken;
+ SourceLocation identifierToken;
+};
+
class UiPublicMember: public UiObjectMember
{
public:
@@ -2358,13 +2395,13 @@ public:
UiPublicMember(NameId *memberType,
NameId *name)
- : type(Property), memberType(memberType), name(name), expression(0), isDefaultMember(false)
+ : type(Property), memberType(memberType), name(name), expression(0), isDefaultMember(false), parameters(0)
{ kind = K; }
UiPublicMember(NameId *memberType,
NameId *name,
ExpressionNode *expression)
- : type(Property), memberType(memberType), name(name), expression(expression), isDefaultMember(false)
+ : type(Property), memberType(memberType), name(name), expression(expression), isDefaultMember(false), parameters(0)
{ kind = K; }
virtual SourceLocation firstSourceLocation() const
@@ -2388,6 +2425,7 @@ public:
NameId *name;
ExpressionNode *expression;
bool isDefaultMember;
+ UiParameterList *parameters;
SourceLocation defaultToken;
SourceLocation propertyToken;
SourceLocation typeToken;
diff --git a/src/declarative/qml/parser/qmljsgrammar.cpp b/src/declarative/qml/parser/qmljsgrammar.cpp
index 835ee44..b7a08d8 100644
--- a/src/declarative/qml/parser/qmljsgrammar.cpp
+++ b/src/declarative/qml/parser/qmljsgrammar.cpp
@@ -2,7 +2,7 @@
/****************************************************************************
**
** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
-** Contact: Qt Software Information (qt-info@nokia.com)
+** Contact: Nokia Corporation (qt-info@nokia.com)
**
** This file is part of the QtCore module of the Qt Toolkit.
**
@@ -35,7 +35,7 @@
** met: http://www.gnu.org/copyleft/gpl.html.
**
** If you are unsure which license is appropriate for your use, please
-** contact the sales department at qt-sales@nokia.com.
+** contact the sales department at http://www.qtsoftware.com/contact.
** $QT_END_LICENSE$
**
****************************************************************************/
@@ -58,620 +58,651 @@ const int QmlJSGrammar::lhs [] = {
91, 92, 92, 95, 95, 96, 96, 94, 93, 98,
98, 100, 100, 101, 101, 97, 99, 99, 103, 104,
104, 99, 99, 99, 99, 99, 99, 99, 111, 111,
- 111, 99, 99, 99, 99, 99, 99, 99, 99, 99,
- 99, 99, 102, 102, 114, 114, 114, 115, 115, 115,
- 115, 115, 115, 115, 115, 115, 115, 115, 115, 115,
- 115, 115, 115, 115, 102, 102, 117, 117, 117, 117,
- 116, 116, 119, 119, 121, 121, 121, 121, 121, 121,
- 122, 122, 122, 122, 122, 122, 122, 122, 122, 122,
- 122, 122, 122, 122, 122, 122, 122, 122, 122, 122,
- 122, 122, 122, 122, 122, 122, 122, 122, 122, 122,
- 122, 123, 123, 124, 124, 124, 124, 124, 127, 127,
- 128, 128, 128, 128, 126, 126, 129, 129, 130, 130,
- 131, 131, 131, 132, 132, 132, 132, 132, 132, 132,
- 132, 132, 132, 133, 133, 133, 133, 134, 134, 134,
- 135, 135, 135, 135, 136, 136, 136, 136, 136, 136,
- 136, 137, 137, 137, 137, 137, 137, 138, 138, 138,
- 138, 138, 139, 139, 139, 139, 139, 140, 140, 141,
- 141, 142, 142, 143, 143, 144, 144, 145, 145, 146,
- 146, 147, 147, 148, 148, 149, 149, 150, 150, 151,
- 151, 120, 120, 152, 152, 153, 153, 153, 153, 153,
- 153, 153, 153, 153, 153, 153, 153, 105, 105, 154,
- 154, 155, 155, 156, 156, 157, 157, 157, 157, 157,
- 157, 157, 157, 157, 157, 157, 157, 157, 157, 157,
- 106, 168, 168, 167, 167, 113, 113, 169, 169, 170,
- 170, 172, 172, 171, 173, 176, 174, 174, 177, 175,
- 175, 107, 108, 108, 110, 110, 158, 158, 158, 158,
- 158, 158, 158, 159, 159, 159, 159, 160, 160, 160,
- 160, 161, 161, 162, 164, 178, 178, 181, 181, 179,
- 179, 182, 180, 163, 163, 163, 165, 165, 166, 166,
- 166, 183, 184, 109, 109, 112, 125, 188, 188, 185,
- 185, 186, 186, 189, 190, 190, 191, 191, 187, 187,
- 118, 118, 192};
+ 111, 112, 112, 113, 113, 99, 99, 99, 99, 99,
+ 99, 99, 99, 99, 99, 99, 99, 102, 102, 114,
+ 114, 114, 117, 117, 117, 117, 117, 117, 117, 117,
+ 117, 117, 117, 117, 117, 117, 117, 117, 117, 102,
+ 102, 119, 119, 119, 119, 118, 118, 121, 121, 123,
+ 123, 123, 123, 123, 123, 124, 124, 124, 124, 124,
+ 124, 124, 124, 124, 124, 124, 124, 124, 124, 124,
+ 124, 124, 124, 124, 124, 124, 124, 124, 124, 124,
+ 124, 124, 124, 124, 124, 124, 125, 125, 126, 126,
+ 126, 126, 126, 129, 129, 130, 130, 130, 130, 128,
+ 128, 131, 131, 132, 132, 133, 133, 133, 134, 134,
+ 134, 134, 134, 134, 134, 134, 134, 134, 135, 135,
+ 135, 135, 136, 136, 136, 137, 137, 137, 137, 138,
+ 138, 138, 138, 138, 138, 138, 139, 139, 139, 139,
+ 139, 139, 140, 140, 140, 140, 140, 141, 141, 141,
+ 141, 141, 142, 142, 143, 143, 144, 144, 145, 145,
+ 146, 146, 147, 147, 148, 148, 149, 149, 150, 150,
+ 151, 151, 152, 152, 153, 153, 122, 122, 154, 154,
+ 155, 155, 155, 155, 155, 155, 155, 155, 155, 155,
+ 155, 155, 105, 105, 156, 156, 157, 157, 158, 158,
+ 159, 159, 159, 159, 159, 159, 159, 159, 159, 159,
+ 159, 159, 159, 159, 159, 106, 170, 170, 169, 169,
+ 116, 116, 171, 171, 172, 172, 174, 174, 173, 175,
+ 178, 176, 176, 179, 177, 177, 107, 108, 108, 110,
+ 110, 160, 160, 160, 160, 160, 160, 160, 161, 161,
+ 161, 161, 162, 162, 162, 162, 163, 163, 164, 166,
+ 180, 180, 183, 183, 181, 181, 184, 182, 165, 165,
+ 165, 167, 167, 168, 168, 168, 185, 186, 109, 109,
+ 115, 127, 190, 190, 187, 187, 188, 188, 191, 192,
+ 192, 193, 193, 189, 189, 120, 120, 194};
const int QmlJSGrammar:: rhs[] = {
2, 1, 1, 1, 2, 3, 3, 0, 1, 1,
2, 1, 3, 2, 3, 2, 1, 5, 1, 2,
2, 4, 3, 3, 3, 3, 3, 3, 1, 1,
- 1, 2, 4, 4, 5, 5, 6, 6, 7, 7,
+ 1, 0, 1, 2, 4, 5, 2, 4, 4, 5,
+ 5, 6, 6, 7, 7, 1, 1, 1, 1, 1,
1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
- 1, 1, 1, 1, 1, 1, 2, 3, 3, 4,
- 5, 3, 4, 3, 1, 3, 1, 2, 3, 4,
- 1, 2, 3, 5, 1, 1, 1, 1, 1, 1,
+ 1, 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, 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};
+ 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 [] = {
8, 2, 0, 4, 3, 0, 0, 0, 6, 7,
- 5, 65, 45, 46, 43, 44, 47, 9, 0, 1,
- 0, 0, 16, 66, 41, 248, 0, 0, 46, 14,
- 47, 249, 17, 10, 0, 0, 0, 42, 0, 31,
- 30, 29, 0, 0, 35, 0, 36, 151, 218, 182,
- 190, 186, 130, 202, 178, 0, 115, 49, 131, 194,
- 198, 119, 148, 129, 134, 114, 168, 155, 0, 55,
- 56, 52, 319, 321, 0, 0, 0, 0, 0, 0,
- 50, 53, 0, 0, 54, 48, 0, 51, 0, 0,
- 144, 0, 0, 131, 150, 133, 132, 0, 0, 0,
- 146, 147, 145, 149, 0, 179, 0, 0, 0, 0,
- 169, 0, 0, 0, 0, 0, 0, 159, 0, 0,
- 0, 153, 154, 152, 157, 161, 160, 158, 156, 171,
- 170, 172, 0, 187, 0, 183, 0, 0, 125, 112,
- 124, 113, 81, 82, 83, 108, 84, 109, 85, 86,
- 87, 88, 89, 90, 91, 92, 93, 94, 95, 96,
- 97, 110, 98, 99, 100, 101, 102, 103, 104, 105,
- 106, 107, 111, 0, 0, 123, 219, 126, 0, 127,
- 0, 128, 122, 39, 40, 0, 215, 208, 206, 213,
- 214, 212, 211, 217, 210, 209, 207, 216, 203, 0,
- 191, 0, 0, 195, 0, 0, 199, 0, 0, 125,
- 117, 0, 116, 0, 121, 135, 0, 320, 310, 311,
- 0, 308, 0, 309, 0, 312, 226, 233, 232, 240,
- 228, 0, 229, 313, 0, 318, 230, 231, 236, 234,
- 315, 314, 317, 237, 0, 0, 0, 0, 0, 319,
- 45, 0, 321, 46, 220, 262, 47, 0, 0, 0,
- 0, 0, 238, 239, 227, 235, 263, 264, 307, 316,
- 0, 278, 279, 280, 281, 0, 274, 275, 276, 277,
- 304, 305, 0, 0, 0, 0, 0, 267, 268, 224,
- 222, 184, 192, 188, 204, 180, 225, 0, 131, 196,
- 200, 173, 162, 0, 0, 181, 0, 0, 0, 0,
- 174, 0, 0, 0, 0, 0, 166, 164, 167, 165,
- 163, 176, 175, 177, 0, 189, 0, 185, 0, 223,
- 131, 0, 205, 220, 221, 0, 220, 0, 0, 270,
- 0, 0, 0, 272, 0, 193, 0, 0, 197, 0,
- 0, 201, 260, 0, 252, 261, 255, 0, 259, 0,
- 220, 253, 0, 220, 0, 0, 271, 0, 0, 0,
- 273, 320, 310, 0, 0, 312, 0, 306, 0, 296,
- 0, 0, 0, 266, 0, 265, 0, 322, 0, 80,
- 242, 245, 0, 81, 248, 84, 109, 86, 87, 52,
- 91, 92, 45, 93, 96, 50, 53, 46, 220, 47,
- 54, 99, 48, 101, 51, 103, 104, 249, 106, 107,
- 111, 0, 73, 0, 0, 75, 79, 77, 63, 76,
- 78, 0, 74, 62, 243, 241, 119, 120, 125, 0,
- 118, 0, 295, 0, 282, 283, 0, 294, 0, 0,
- 0, 285, 290, 288, 291, 0, 0, 289, 290, 0,
- 286, 0, 287, 244, 293, 0, 244, 292, 0, 297,
- 298, 0, 244, 299, 300, 0, 0, 301, 0, 0,
- 0, 302, 303, 137, 136, 0, 0, 0, 269, 0,
- 0, 0, 284, 67, 0, 0, 71, 57, 0, 59,
- 69, 0, 60, 70, 72, 61, 68, 58, 0, 64,
- 141, 139, 143, 140, 138, 142, 0, 0, 0, 33,
- 0, 34, 0, 37, 38, 32, 15, 11, 0, 23,
- 26, 24, 0, 25, 28, 244, 0, 19, 0, 27,
- 22, 81, 248, 84, 109, 86, 87, 52, 91, 92,
- 45, 93, 96, 50, 53, 46, 220, 47, 54, 99,
- 48, 101, 51, 103, 104, 249, 106, 107, 111, 49,
- 0, 12, 0, 18, 13, 20, 21, 257, 250, 0,
- 258, 254, 0, 256, 246, 0, 247, 251, 323};
+ 5, 70, 50, 51, 48, 49, 52, 9, 0, 1,
+ 0, 0, 16, 71, 46, 253, 0, 0, 51, 14,
+ 52, 254, 17, 10, 0, 0, 0, 47, 0, 31,
+ 30, 29, 0, 0, 40, 0, 41, 156, 223, 187,
+ 195, 191, 135, 207, 183, 0, 120, 54, 136, 199,
+ 203, 124, 153, 134, 139, 119, 173, 160, 0, 60,
+ 61, 57, 324, 326, 0, 0, 0, 0, 0, 0,
+ 55, 58, 0, 0, 59, 53, 0, 56, 0, 0,
+ 149, 0, 0, 136, 155, 138, 137, 0, 0, 0,
+ 151, 152, 150, 154, 0, 184, 0, 0, 0, 0,
+ 174, 0, 0, 0, 0, 0, 0, 164, 0, 0,
+ 0, 158, 159, 157, 162, 166, 165, 163, 161, 176,
+ 175, 177, 0, 192, 0, 188, 0, 0, 130, 117,
+ 129, 118, 86, 87, 88, 113, 89, 114, 90, 91,
+ 92, 93, 94, 95, 96, 97, 98, 99, 100, 101,
+ 102, 115, 103, 104, 105, 106, 107, 108, 109, 110,
+ 111, 112, 116, 0, 0, 128, 224, 131, 0, 132,
+ 0, 133, 127, 44, 45, 0, 220, 213, 211, 218,
+ 219, 217, 216, 222, 215, 214, 212, 221, 208, 0,
+ 196, 0, 0, 200, 0, 0, 204, 0, 0, 130,
+ 122, 0, 121, 0, 126, 140, 0, 325, 315, 316,
+ 0, 313, 0, 314, 0, 317, 231, 238, 237, 245,
+ 233, 0, 234, 318, 0, 323, 235, 236, 241, 239,
+ 320, 319, 322, 242, 0, 0, 0, 0, 0, 324,
+ 50, 0, 326, 51, 225, 267, 52, 0, 0, 0,
+ 0, 0, 243, 244, 232, 240, 268, 269, 312, 321,
+ 0, 283, 284, 285, 286, 0, 279, 280, 281, 282,
+ 309, 310, 0, 0, 0, 0, 0, 272, 273, 229,
+ 227, 189, 197, 193, 209, 185, 230, 0, 136, 201,
+ 205, 178, 167, 0, 0, 186, 0, 0, 0, 0,
+ 179, 0, 0, 0, 0, 0, 171, 169, 172, 170,
+ 168, 181, 180, 182, 0, 194, 0, 190, 0, 228,
+ 136, 0, 210, 225, 226, 0, 225, 0, 0, 275,
+ 0, 0, 0, 277, 0, 198, 0, 0, 202, 0,
+ 0, 206, 265, 0, 257, 266, 260, 0, 264, 0,
+ 225, 258, 0, 225, 0, 0, 276, 0, 0, 0,
+ 278, 325, 315, 0, 0, 317, 0, 311, 0, 301,
+ 0, 0, 0, 271, 0, 270, 0, 327, 0, 85,
+ 247, 250, 0, 86, 253, 89, 114, 91, 92, 57,
+ 96, 97, 50, 98, 101, 55, 58, 51, 225, 52,
+ 59, 104, 53, 106, 56, 108, 109, 254, 111, 112,
+ 116, 0, 78, 0, 0, 80, 84, 82, 68, 81,
+ 83, 0, 79, 67, 248, 246, 124, 125, 130, 0,
+ 123, 0, 300, 0, 287, 288, 0, 299, 0, 0,
+ 0, 290, 295, 293, 296, 0, 0, 294, 295, 0,
+ 291, 0, 292, 249, 298, 0, 249, 297, 0, 302,
+ 303, 0, 249, 304, 305, 0, 0, 306, 0, 0,
+ 0, 307, 308, 142, 141, 0, 0, 0, 274, 0,
+ 0, 0, 289, 72, 0, 0, 76, 62, 0, 64,
+ 74, 0, 65, 75, 77, 66, 73, 63, 0, 69,
+ 146, 144, 148, 145, 143, 147, 0, 0, 0, 38,
+ 0, 39, 0, 42, 43, 37, 32, 33, 0, 0,
+ 0, 0, 35, 36, 34, 15, 11, 0, 23, 26,
+ 24, 0, 25, 28, 249, 0, 19, 0, 27, 22,
+ 86, 253, 89, 114, 91, 92, 57, 96, 97, 50,
+ 98, 101, 55, 58, 51, 225, 52, 59, 104, 53,
+ 106, 56, 108, 109, 254, 111, 112, 116, 54, 0,
+ 12, 0, 18, 13, 20, 21, 262, 255, 0, 263,
+ 259, 0, 261, 251, 0, 252, 256, 328};
const int QmlJSGrammar::goto_default [] = {
- 6, 5, 19, 1, 4, 3, 32, 34, 33, 570,
- 22, 18, 538, 539, 231, 226, 230, 232, 229, 236,
- 517, 235, 264, 57, 65, 495, 494, 388, 387, 48,
- 386, 389, 140, 61, 56, 178, 63, 52, 177, 58,
- 64, 90, 62, 47, 67, 66, 301, 54, 295, 49,
- 291, 51, 293, 50, 292, 59, 299, 60, 300, 53,
- 294, 290, 331, 443, 296, 297, 390, 237, 228, 227,
- 239, 265, 238, 243, 262, 263, 392, 391, 36, 579,
- 578, 353, 354, 581, 356, 580, 355, 451, 455, 458,
- 454, 453, 473, 474, 220, 234, 216, 219, 233, 241,
- 240, 0};
+ 6, 5, 19, 1, 4, 3, 32, 34, 33, 579,
+ 22, 18, 547, 548, 231, 226, 230, 232, 229, 236,
+ 517, 528, 527, 57, 235, 264, 65, 495, 494, 388,
+ 387, 48, 386, 389, 140, 61, 56, 178, 63, 52,
+ 177, 58, 64, 90, 62, 47, 67, 66, 301, 54,
+ 295, 49, 291, 51, 293, 50, 292, 59, 299, 60,
+ 300, 53, 294, 290, 331, 443, 296, 297, 390, 237,
+ 228, 227, 239, 265, 238, 243, 262, 263, 392, 391,
+ 36, 588, 587, 353, 354, 590, 356, 589, 355, 451,
+ 455, 458, 454, 453, 473, 474, 220, 234, 216, 219,
+ 233, 241, 240, 0};
const int QmlJSGrammar::action_index [] = {
- 8, -91, 14, -91, -15, 296, 67, 94, -91, -91,
- -91, -91, -91, -91, -91, -91, -91, -91, 109, -91,
- 184, 408, -91, -91, -91, -91, 45, 125, 170, -91,
- 46, -91, -91, -91, 429, 171, 130, -91, 120, -91,
- -91, -91, -19, 169, -91, 733, -91, 72, -91, 22,
- -26, -59, 173, -91, 278, 174, -91, -91, 574, 51,
- 112, 183, 177, -91, -91, -91, 412, 214, 733, -91,
- -91, -91, 161, 1566, 980, 733, 733, 733, 653, 733,
- -91, -91, 733, 733, -91, -91, 733, -91, 733, 733,
- -91, 733, 733, 98, 235, -91, -91, 733, 733, 733,
- -91, -91, -91, 230, 733, 276, 733, 733, 733, 733,
- 396, 733, 733, 733, 733, 733, 733, 288, 733, 733,
- 733, 88, 87, 74, 288, 288, 288, 218, 221, 486,
- 372, 362, 733, 4, 733, 76, 1479, 733, 733, -91,
+ -9, -91, 70, -91, 9, 338, 83, 124, -91, -91,
+ -91, -91, -91, -91, -91, -91, -91, -91, 110, -91,
+ 187, 490, -91, -91, -91, -91, 64, 208, 195, -91,
+ 74, -91, -91, -91, 573, 181, 176, -91, 160, -91,
+ -91, -91, 45, 274, -91, 820, -91, 129, -91, 76,
+ 39, 11, 315, -91, 319, 250, -91, -91, 527, 65,
+ 128, 356, 229, -91, -91, -91, 464, 241, 820, -91,
+ -91, -91, 217, 1653, 1233, 820, 820, 820, 740, 820,
+ -91, -91, 820, 820, -91, -91, 820, -91, 820, 820,
+ -91, 820, 820, 113, 239, -91, -91, 820, 820, 820,
+ -91, -91, -91, 236, 820, 323, 820, 820, 820, 820,
+ 444, 820, 820, 820, 820, 820, 820, 301, 820, 820,
+ 820, 108, 82, 78, 166, 170, 182, 165, 280, 454,
+ 474, 434, 820, 66, 820, 90, 1566, 820, 820, -91,
-91, -91, -91, -91, -91, -91, -91, -91, -91, -91,
-91, -91, -91, -91, -91, -91, -91, -91, -91, -91,
-91, -91, -91, -91, -91, -91, -91, -91, -91, -91,
- -91, -91, -91, 102, 733, -91, -91, 60, 3, -91,
- 733, -91, -91, -91, -91, 733, -91, -91, -91, -91,
- -91, -91, -91, -91, -91, -91, -91, -91, -91, 733,
- -6, 733, 733, 30, 32, 733, -91, 1479, 733, 733,
- -91, 107, -91, -14, -91, -91, 69, -91, 191, 49,
- 18, -91, 233, -91, 47, 1827, -91, -91, -91, -91,
- -91, 204, -91, -91, 39, -91, -91, -91, -91, -91,
- -91, 1827, -91, -91, 322, 281, 103, 1740, 50, 203,
- 77, 40, 2001, 53, 733, -91, 52, 29, 733, 25,
- 28, 35, -91, -91, -91, -91, -91, -91, -91, -91,
- 113, -91, -91, -91, -91, 106, -91, -91, -91, -91,
- -91, -91, 15, 68, 733, 135, 119, -91, -91, 897,
- -91, 82, 58, 17, -91, 261, 84, 42, 494, 91,
- 79, 304, 288, 208, 733, 245, 733, 733, 733, 733,
- 418, 733, 733, 733, 733, 733, 288, 288, 288, 288,
- 288, 343, 336, 279, 733, -57, 733, 19, 733, -91,
- 574, 733, -91, 733, -7, -30, 733, -60, 1740, -91,
- 733, 111, 1740, -91, 733, 2, 733, 733, 43, 37,
- 733, -91, 34, 118, 23, -91, -91, 733, -91, 238,
- 733, -91, -5, 733, -17, 1740, -91, 733, 133, 1740,
- -91, -9, 194, -32, -8, 1827, -25, -91, 1740, -91,
- 733, 100, 1740, 21, 1740, -91, 31, 26, -20, -91,
- -91, 1740, -38, 283, 41, 291, 85, 733, 1740, -1,
- -34, 252, 54, -27, 653, 9, 5, -91, 817, -91,
- 6, -21, 7, 733, 11, -28, 733, 1, 733, -33,
- -10, 733, -91, 1653, 33, -91, -91, -91, -91, -91,
- -91, 733, -91, -91, -91, -91, 172, -91, 733, -24,
- -91, 1740, -91, 73, -91, -91, 1740, -91, 733, 93,
- 0, -91, 24, -91, 36, 122, 733, -91, 44, 48,
- -91, -3, -91, 1740, -91, 110, 1740, -91, 192, -91,
- -91, 124, 1740, 27, -91, -12, -29, -91, 155, -53,
- -22, -91, -91, -91, -91, 733, 123, 1740, -91, 733,
- 92, 1740, -91, -91, 105, 1229, -91, -91, 1146, -91,
- -91, 1063, -91, -91, -91, -91, -91, -91, 90, -91,
- -91, -91, -91, -91, -91, -91, 71, 70, 222, -91,
- 733, -91, 164, -91, -91, -91, -91, -91, 1392, -91,
- -91, -91, 268, -91, -91, 1914, 1312, -91, 75, -91,
- -91, 350, 55, 303, 108, 733, 1740, 59, 38, 242,
- 62, 40, 527, 63, 81, -91, 817, -91, 138, 29,
- 65, 733, 78, 56, 733, 80, 733, 61, 66, 57,
- 101, -91, 347, -91, -91, -91, -91, 64, -91, 140,
- -91, -91, 733, -91, -91, 144, -91, -91, -91,
+ -91, -91, -91, 118, 820, -91, -91, 84, 72, -91,
+ 820, -91, -91, -91, -91, 820, -91, -91, -91, -91,
+ -91, -91, -91, -91, -91, -91, -91, -91, -91, 820,
+ 69, 820, 820, 86, 79, 820, -91, 1566, 820, 820,
+ -91, 102, -91, 80, -91, -91, 71, -91, 169, 85,
+ 81, -91, 133, -91, 67, 1914, -91, -91, -91, -91,
+ -91, 198, -91, -91, 21, -91, -91, -91, -91, -91,
+ -91, 1914, -91, -91, 373, 359, 106, 1827, 44, 253,
+ 68, 37, 2088, 62, 820, -91, 61, 48, 820, 49,
+ 58, 60, -91, -91, -91, -91, -91, -91, -91, -91,
+ 75, -91, -91, -91, -91, 88, -91, -91, -91, -91,
+ -91, -91, 55, 54, 820, 91, 109, -91, -91, 984,
+ -91, 77, 53, 7, -91, 270, 73, 59, 661, 63,
+ 127, 492, 302, 256, 820, 313, 820, 820, 820, 820,
+ 424, 820, 820, 820, 820, 820, 200, 188, 192, 206,
+ 185, 350, 424, 395, 820, -50, 820, 23, 820, -91,
+ 571, 820, -91, 820, -1, -57, 820, -59, 1827, -91,
+ 820, 119, 1827, -91, 820, -32, 820, 820, 12, 10,
+ 820, -91, 2, 126, -16, -91, -91, 820, -91, 258,
+ 820, -91, -34, 820, -35, 1827, -91, 820, 105, 1827,
+ -91, -10, 234, -40, -12, 1914, -49, -91, 1827, -91,
+ 820, 134, 1827, -13, 1827, -91, 3, 1, -47, -91,
+ -91, 1827, 6, 349, 56, 388, 95, 820, 1827, 131,
+ 26, 314, 52, 15, 740, 43, 29, -91, 904, -91,
+ 27, -3, 22, 820, 25, -2, 820, 30, 820, 5,
+ 8, 820, -91, 1740, 32, -91, -91, -91, -91, -91,
+ -91, 820, -91, -91, -91, -91, 213, -91, 820, -48,
+ -91, 1827, -91, 111, -91, -91, 1827, -91, 820, 94,
+ 33, -91, 0, -91, 41, 98, 820, -91, 40, 28,
+ -91, 17, -91, 1827, -91, 107, 1827, -91, 210, -91,
+ -91, 92, 1827, -7, -91, -18, -11, -91, 135, -37,
+ -22, -91, -91, -91, -91, 820, 87, 1827, -91, 820,
+ 103, 1827, -91, -91, 96, 1316, -91, -91, 1067, -91,
+ -91, 1150, -91, -91, -91, -91, -91, -91, 101, -91,
+ -91, -91, -91, -91, -91, -91, 24, 19, 248, -91,
+ 820, -91, 242, -91, -91, -36, 223, 47, -58, 247,
+ 232, 228, -91, -91, -91, -91, -91, 1479, -91, -91,
+ -91, 337, -91, -91, 2001, 1399, -91, 122, -91, -91,
+ 334, 50, 347, 114, 820, 1827, 131, 18, 317, 46,
+ 16, 740, 51, 57, -91, 904, -91, 31, 20, 35,
+ 820, 36, 14, 820, 42, 820, 4, 34, 38, 214,
+ -91, 327, -91, -91, -91, -91, 13, -91, 203, -91,
+ -91, 820, -91, -91, 211, -91, -91, -91,
- -102, -102, -102, -102, 19, 103, -102, -102, -102, -102,
- -102, -102, -102, -102, -102, -102, -102, -102, -102, -102,
- -4, 249, -102, -102, -102, -102, -102, -7, -102, -102,
- -102, -102, -102, -102, 257, -102, -13, -102, -11, -102,
- -102, -102, -102, -102, -102, -3, -102, -102, -102, -102,
- -102, -102, -102, -102, -102, -102, -102, -102, -44, -102,
- -102, -102, -102, -102, -102, -102, -102, -102, 141, -102,
- -102, -102, -8, -102, 0, 16, 116, 122, 129, 119,
- -102, -102, 90, 64, -102, -102, 94, -102, 91, 86,
- -102, 71, 79, -102, -102, -102, -102, 159, 81, 76,
- -102, -102, -102, -102, 98, -102, 67, 63, 47, 163,
- -102, 160, 115, 104, 105, 127, 133, -102, 151, 144,
- 130, -102, -102, -102, -102, -102, -102, -102, -102, -102,
- -102, -102, 145, -102, 152, -102, 162, 31, 21, -102,
- -102, -102, -102, -102, -102, -102, -102, -102, -102, -102,
- -102, -102, -102, -102, -102, -102, -102, -102, -102, -102,
- -102, -102, -102, -102, -102, -102, -102, -102, -102, -102,
- -102, -102, -102, -102, 23, -102, -102, -102, -102, -102,
- 29, -102, -102, -102, -102, 34, -102, -102, -102, -102,
- -102, -102, -102, -102, -102, -102, -102, -102, -102, 89,
- -102, 68, 36, -102, -102, 42, -102, 235, 46, 49,
- -102, -102, -102, -102, -102, -102, -102, -102, 33, -102,
- -102, -102, 26, -102, -102, -18, -102, -102, -102, -102,
- -102, -102, -102, -102, -102, -102, -102, -102, -102, -102,
- -102, 53, -102, -102, 8, 20, -102, -5, -102, 32,
- -102, -102, -102, -102, 39, -102, -102, -102, 37, 73,
- -102, -102, -102, -102, -102, -102, -102, -102, -102, -102,
- -102, -102, -102, -102, -102, -102, -102, -102, -102, -102,
- -102, -102, -102, -102, 40, -102, -102, -102, -102, 97,
- -102, -102, -102, -102, -102, -102, -102, -102, -102, -102,
- -102, -102, -102, 41, 213, -102, 186, 199, 203, 209,
- -102, 50, 51, 38, 57, 60, -102, -102, -102, -102,
- -102, -102, -102, -102, 212, -102, 174, -102, 166, -102,
- -102, 168, -102, 125, -102, -102, 61, -102, 1, -102,
- 45, -102, -9, -102, 172, -102, 184, 176, -102, -102,
- 170, -102, -102, -102, -102, -102, -102, 215, -102, 124,
- 132, -102, -102, 178, -102, -29, -102, 25, -102, 2,
- -102, -102, 62, -102, -102, 102, -102, -102, -28, -102,
- 22, -102, -31, -102, -33, -102, -102, -102, -102, -102,
- -102, -34, -102, 17, -102, 18, -102, 111, -20, -102,
- -102, 24, -102, -102, 153, -102, -102, -102, 30, -102,
- -102, -102, -102, 28, -102, 73, 140, -102, 205, -102,
- -102, 5, -102, 44, -102, -102, -102, -102, -102, -102,
- -102, 43, -102, -102, -102, -102, -102, -102, 135, -102,
- -102, 7, -102, -102, -102, -102, 4, -102, 55, -102,
- -102, -102, -102, -102, -25, -102, 48, -102, 9, -102,
- -102, -102, -102, -69, -102, -102, -70, -102, -102, -102,
- -102, -102, -102, -92, -102, -102, -12, -102, -10, -102,
- -1, -102, -102, -102, -102, 11, -102, -40, -102, 14,
- -102, -39, -102, -102, -102, -17, -102, -102, 54, -102,
- -102, -24, -102, -102, -102, -102, -102, -102, -102, -102,
- -102, -102, -102, -102, -102, -102, -102, -102, -102, -102,
- 3, -102, -102, -102, -102, -102, -102, -102, 267, -102,
- -102, -102, 12, -102, -102, -102, 301, -102, -102, -102,
- -102, -19, -102, -15, -102, 59, -64, -102, -102, -2,
- -102, -102, 142, -102, -102, -102, -14, -102, -102, -102,
- -102, 6, -102, 73, 52, -102, 75, -102, -102, -102,
- -102, -102, 128, -102, -102, -102, -102, -102, -102, -102,
- -102, -102, -6, -102, -102, 58, -102, -102, -102};
+ -104, -104, -104, -104, -4, 75, -104, -104, -104, -104,
+ -104, -104, -104, -104, -104, -104, -104, -104, -104, -104,
+ -17, 331, -104, -104, -104, -104, -104, -1, -104, -104,
+ -104, -104, -104, -104, 259, -104, -15, -104, 4, -104,
+ -104, -104, -104, -104, -104, 9, -104, -104, -104, -104,
+ -104, -104, -104, -104, -104, -104, -104, -104, -43, -104,
+ -104, -104, -104, -104, -104, -104, -104, -104, 61, -104,
+ -104, -104, -7, -104, -3, 13, 116, 124, 133, 121,
+ -104, -104, 99, 67, -104, -104, 77, -104, 96, 92,
+ -104, 84, 90, -104, -104, -104, -104, 163, 86, 80,
+ -104, -104, -104, -104, 100, -104, 83, 64, 66, 158,
+ -104, 156, 117, 120, 105, 135, 141, -104, 150, 139,
+ 129, -104, -104, -104, -104, -104, -104, -104, -104, -104,
+ -104, -104, 137, -104, 142, -104, 165, 31, 17, -104,
+ -104, -104, -104, -104, -104, -104, -104, -104, -104, -104,
+ -104, -104, -104, -104, -104, -104, -104, -104, -104, -104,
+ -104, -104, -104, -104, -104, -104, -104, -104, -104, -104,
+ -104, -104, -104, -104, 21, -104, -104, -104, -104, -104,
+ 34, -104, -104, -104, -104, 43, -104, -104, -104, -104,
+ -104, -104, -104, -104, -104, -104, -104, -104, -104, 45,
+ -104, 91, 46, -104, -104, 48, -104, 232, 140, 56,
+ -104, -104, -104, -104, -104, -104, -104, -104, 39, -104,
+ -104, -104, 33, -104, -104, -10, -104, -104, -104, -104,
+ -104, -104, -104, -104, -104, -104, -104, -104, -104, -104,
+ -104, 58, -104, -104, 36, 37, -104, 8, -104, 14,
+ -104, -104, -104, -104, 41, -104, -104, -104, 40, 38,
+ -104, -104, -104, -104, -104, -104, -104, -104, -104, -104,
+ -104, -104, -104, -104, -104, -104, -104, -104, -104, -104,
+ -104, -104, -104, -104, 47, -104, -104, -104, -104, 104,
+ -104, -104, -104, -104, -104, -104, -104, -104, -104, -104,
+ -104, -104, -104, 44, 192, -104, 202, 211, 208, 205,
+ -104, 53, 29, 42, 60, 68, -104, -104, -104, -104,
+ -104, -104, -104, -104, 170, -104, 189, -104, 168, -104,
+ -104, 166, -104, 78, -104, -104, 57, -104, 10, -104,
+ 49, -104, -11, -104, 172, -104, 176, 169, -104, -104,
+ 162, -104, -104, -104, -104, -104, -104, 217, -104, 178,
+ 182, -104, -104, 175, -104, -29, -104, 27, -104, 16,
+ -104, -104, 89, -104, -104, 126, -104, -104, -28, -104,
+ 24, -104, -32, -104, -33, -104, -104, -104, -104, -104,
+ -104, -35, -104, 19, -104, 20, -104, 112, -18, -104,
+ -104, 28, -104, -104, 134, -104, -104, -104, 35, -104,
+ -104, -104, -104, 30, -104, 32, 132, -104, 136, -104,
+ -104, 15, -104, 2, -104, -104, -104, -104, -104, -104,
+ -104, 51, -104, -104, -104, -104, -104, -104, 155, -104,
+ -104, 22, -104, -104, -104, -104, 23, -104, 52, -104,
+ -104, -104, -104, -104, -25, -104, 55, -104, -26, -104,
+ -104, -104, -104, 18, -104, -104, 25, -104, -104, -104,
+ -104, -104, -104, -85, -104, -104, -6, -104, 50, -104,
+ -13, -104, -104, -104, -104, -2, -104, -53, -104, 12,
+ -104, -39, -104, -104, -104, 1, -104, -104, 125, -104,
+ -104, -14, -104, -104, -104, -104, -104, -104, -104, -104,
+ -104, -104, -104, -104, -104, -104, -104, -104, -104, -104,
+ -9, -104, -104, -104, -104, -104, 5, -104, -104, -12,
+ 11, -20, -104, -104, -104, -104, -104, 257, -104, -104,
+ -104, 3, -104, -104, -104, 214, -104, -104, -104, -104,
+ -19, -104, 7, -104, 54, -49, -104, -104, -5, -104,
+ -104, 81, -104, -104, -104, 6, -104, -104, -104, -104,
+ 0, -104, -8, 74, -104, 95, -104, -104, -104, -104,
+ -104, 238, -104, -104, -104, -104, -104, -104, -104, -104,
+ -104, -31, -104, -104, 62, -104, -104, -104};
const int QmlJSGrammar::action_info [] = {
- 338, 174, 289, 485, 472, 472, -89, 480, -105, 380,
- 43, 472, -79, -78, -100, 448, -97, 435, -102, 134,
- 304, 326, 132, 104, 478, 375, 489, 372, 374, 456,
- 377, 336, 199, 452, 423, 433, 440, 384, 421, 205,
- 431, 456, 132, 365, 350, 344, 214, 476, -108, 456,
- 324, 357, 462, 199, 367, 463, 363, 222, 472, 446,
- 441, -75, -108, 182, 485, 448, -89, 588, 180, -75,
- -97, 489, -100, 2, 289, 525, 380, 104, 224, 7,
- 225, 582, 134, 304, 378, -102, 289, -105, -79, 472,
- -65, 283, 328, 344, 268, 326, 2, 485, 174, 518,
- 174, 174, 489, 333, 284, 218, 324, 372, 174, 572,
- 174, 38, 91, 498, 91, 174, 0, 466, 174, 174,
- 0, 0, 0, 92, 20, 92, 359, 91, 91, 346,
- 475, 174, 459, 347, 445, 444, 576, 575, 92, 92,
- 95, 174, 21, 174, 476, -78, 281, 280, 585, 39,
- 509, 96, 491, 450, 12, 9, 8, 573, 175, 12,
- 382, 499, 201, 212, 281, 280, 202, 279, 278, 281,
- 280, 342, 174, 12, 274, 273, 45, 460, 528, 360,
- 288, 287, 174, 487, 12, 0, 20, 207, 136, 97,
- 12, 13, 16, 369, 41, 286, 13, 16, 207, 39,
- 174, 586, 584, 0, 21, 40, 208, 137, 438, 138,
- 13, 16, 174, 12, 0, 0, 0, 208, 0, 209,
- 12, 13, 16, 12, 0, 524, 523, 13, 16, 520,
- 46, 44, 12, 0, 98, 184, 183, 12, 0, 118,
- 99, 119, 97, 118, 41, 119, 118, 97, 119, 0,
- 13, 16, 120, 470, 469, 40, 120, 13, 16, 120,
- 13, 16, 12, 306, 307, 267, 266, 12, 0, 13,
- 16, 12, 0, 0, 13, 16, 174, 0, -319, 306,
- 307, 12, 0, 521, 519, 0, 0, 98, -319, 0,
- 308, 309, 98, 99, 106, 107, 106, 107, 99, 13,
- 16, 21, 311, 312, 13, 16, 308, 309, 13, 16,
- 12, 313, 12, 118, 314, 119, 315, 0, 13, 16,
- 12, 108, 109, 108, 109, 12, 120, 311, 312, 267,
- 266, 0, 12, 0, 0, 0, 313, 0, 0, 314,
- 0, 315, 277, 276, 272, 271, 0, 13, 16, 13,
- 16, 12, 277, 276, 0, 15, 0, 13, 16, 311,
- 312, 0, 13, 16, 277, 276, 311, 312, 313, 13,
- 16, 314, 0, 315, 0, 313, 12, 0, 314, 12,
- 315, 14, 0, 272, 271, 111, 112, 0, 13, 16,
- 0, 0, 0, 113, 114, 111, 112, 115, 0, 116,
- 0, 0, 0, 113, 114, 0, 15, 115, 0, 116,
- 0, 272, 271, 13, 16, 0, 13, 16, 26, 111,
- 112, 0, 0, 0, 0, 0, 0, 113, 114, 0,
- 27, 115, 14, 116, 0, 111, 112, 12, 0, 26,
- 0, 311, 312, 113, 114, 0, 0, 115, 0, 116,
- 313, 27, 0, 314, 0, 315, 0, 0, 12, 0,
- 0, 0, 0, 29, 0, 0, 0, 15, 0, 0,
- 0, 0, 0, 0, 28, 30, 0, 0, 0, 0,
- 0, 0, 31, 0, 526, 0, 0, 0, 15, 0,
- 0, 25, 0, 14, 0, 28, 30, 186, 0, 0,
- 0, 0, 0, 31, 0, 0, 0, 187, 0, 111,
- 112, 188, 25, 0, 14, 0, 0, 113, 114, 0,
- 189, 115, 190, 116, 0, 340, 0, 0, 0, 0,
- 0, 0, 0, 191, 0, 192, 95, 0, 0, 69,
- 70, 0, 0, 193, 0, 0, 194, 96, 0, 72,
- 0, 0, 195, 0, 0, 0, 12, 0, 196, 0,
- 73, 74, 0, 75, 0, 0, 0, 0, 0, 0,
- 78, 0, 0, 197, 81, 0, 0, 186, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 187, 0, 0,
- 0, 188, 84, 13, 16, 0, 85, 0, 0, 0,
- 189, 0, 190, 0, 0, 0, 0, 80, 87, 71,
- 0, 0, 0, 191, 0, 192, 95, 0, 0, 0,
- 0, 0, 0, 193, 0, 0, 194, 96, 0, 0,
- 0, 0, 195, 0, 0, 0, 0, 0, 196, 0,
+ 526, 338, 533, 384, 336, 456, 377, 174, 433, 423,
+ 421, 472, 440, 476, 344, 367, 324, 350, 478, 357,
+ 374, 375, 472, 480, 304, 365, 372, 363, 326, -105,
+ 591, 472, -107, 448, -83, 463, -84, -110, -83, 431,
+ 485, 485, -105, -107, 489, 456, 456, 472, 518, -110,
+ -102, 380, 380, -80, 289, 530, 448, -113, -102, -80,
+ 372, 435, 289, -113, -84, 344, 452, 199, 446, 441,
+ 489, -70, 462, 380, 43, 378, 268, 104, 304, 2,
+ 289, 328, 472, 597, 448, 326, 205, 132, 199, 134,
+ 284, 104, 180, 222, 485, 174, 489, 2, 475, 174,
+ 225, 324, 174, 525, 498, 0, 0, 218, 459, 174,
+ 174, 174, 476, 174, 466, 174, 0, 132, 91, 0,
+ 333, 0, 91, 0, 0, 20, 174, 174, 0, 92,
+ 38, 283, 182, 92, 359, 7, 274, 273, -94, 0,
+ 214, 224, 174, 21, 134, 0, 0, 487, 91, 279,
+ 278, 286, 499, 460, 450, 95, 281, 280, 212, 92,
+ 0, 509, 12, 491, 12, 369, 96, 281, 280, 91,
+ 288, 287, 445, 444, 175, 281, 280, 346, 201, 342,
+ 92, 347, 202, 585, 584, 9, 8, 360, 537, 39,
+ 118, 118, 119, 119, 382, 118, 20, 119, 12, 13,
+ 16, 13, 16, 120, 120, 12, 174, 118, 120, 119,
+ 118, 594, 119, 118, 21, 119, 12, 118, 174, 119,
+ 120, 0, 581, 120, 39, 118, 120, 119, 207, 0,
+ 120, 118, 0, 119, 41, 13, 16, 12, 120, 0,
+ 12, 97, 13, 16, 120, 40, 12, 208, 97, 438,
+ 174, 97, 39, 13, 16, 520, 0, 12, 174, 267,
+ 266, 39, 0, 12, 595, 593, 118, 0, 119, 41,
+ 582, 470, 469, 0, 13, 16, 12, 13, 16, 120,
+ 40, 45, 12, 13, 16, 12, 98, 12, 306, 307,
+ 0, 0, 99, 98, 13, 16, 98, 41, 0, 99,
+ 13, 16, 99, 524, 523, 118, 41, 119, 40, 521,
+ 519, 184, 183, 13, 16, 308, 309, 40, 120, 13,
+ 16, 0, 13, 16, 13, 16, 118, 118, 119, 119,
+ 136, 306, 307, 0, 0, 46, 44, 106, 107, 120,
+ 120, 106, 107, 12, 0, 174, 12, 0, 0, 137,
+ -324, 138, 0, -324, 0, 0, 12, 0, 308, 309,
+ 0, 0, 0, 12, 108, 109, 0, 12, 108, 109,
+ 21, 207, 0, 311, 312, 0, 12, 0, 12, 0,
+ 13, 16, 313, 13, 16, 314, 15, 315, 12, 0,
+ 208, 0, 209, 13, 16, 272, 271, 15, 267, 266,
+ 13, 16, 12, 0, 13, 16, 0, 0, 277, 276,
+ 272, 271, 14, 13, 16, 13, 16, 12, 311, 312,
+ 277, 276, 0, 14, 0, 13, 16, 313, 0, 0,
+ 314, 0, 315, 0, 272, 271, 0, 0, 0, 13,
+ 16, 0, 0, 0, 0, 0, 0, 311, 312, 277,
+ 276, 0, 0, 0, 13, 16, 313, 111, 112, 314,
+ 0, 315, 0, 0, 0, 113, 114, 111, 112, 115,
+ 0, 116, 0, 0, 0, 113, 114, 111, 112, 115,
+ 0, 116, 0, 0, 0, 113, 114, 111, 112, 115,
+ 0, 116, 0, 0, 0, 113, 114, 111, 112, 115,
+ 26, 116, 0, 0, 0, 113, 114, 0, 0, 115,
+ 0, 116, 27, 0, 0, 311, 312, 0, 0, 12,
+ 0, 0, 0, 0, 313, 0, 0, 314, 0, 315,
+ 186, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 187, 0, 0, 0, 188, 29, 0, 0, 0, 15,
+ 0, 0, 0, 189, 0, 190, 28, 30, 0, 0,
+ 0, 0, 0, 0, 31, 0, 191, 0, 192, 95,
+ 0, 0, 0, 25, 186, 14, 193, 0, 0, 194,
+ 96, 0, 0, 26, 187, 195, 0, 0, 188, 0,
+ 0, 196, 0, 0, 0, 27, 0, 189, 0, 190,
+ 0, 0, 12, 0, 0, 0, 197, 0, 0, 0,
+ 191, 0, 192, 95, 0, 0, 0, 0, 0, 0,
+ 193, 0, 0, 194, 96, 0, 0, 0, 535, 195,
+ 0, 0, 15, 0, 0, 196, 0, 0, 0, 28,
+ 30, 0, 0, 0, 0, 0, 0, 31, 0, 0,
+ 197, 0, 0, 0, 0, 0, 25, 0, 14, 0,
+ 0, 0, 0, 0, 186, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 187, 0, 0, 0, 188, 0,
+ 0, 0, 0, 0, 0, 0, 0, 189, 0, 190,
+ 0, 0, 340, 0, 0, 0, 0, 0, 0, 0,
+ 191, 0, 192, 95, 0, 0, 0, 0, 0, 0,
+ 193, 0, 0, 194, 96, 0, 0, 0, 0, 195,
+ 0, 0, 0, 0, 0, 196, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 197, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 69, 70, 0, 0, 0,
- 0, 0, 0, 0, 0, 72, 0, 0, 0, 0,
- 0, 0, 12, 0, 0, 0, 73, 74, 0, 75,
- 0, 0, 0, 0, 0, 0, 78, 0, 0, 0,
- 81, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 84, 13,
- 16, 0, 85, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 80, 87, 71, 0, 0, 0, 0,
- 0, 0, 0, 0, 68, 69, 70, 0, 0, 0,
- 0, 0, 0, 0, 0, 72, 0, 0, 0, 0,
- 0, 0, 12, 0, 0, 0, 73, 74, 0, 75,
- 0, 0, 0, 76, 0, 77, 78, 79, 0, 0,
- 81, 0, 0, 0, 82, 0, 83, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 84, 13,
- 16, 0, 85, 0, 86, 0, 88, 0, 89, 0,
- 0, 0, 0, 80, 87, 71, 0, 0, 0, 0,
- 0, 0, 0, 0, -98, 0, 0, 0, 68, 69,
+ 197, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 69, 70, 0, 0, 0, 0, 0, 0,
+ 0, 0, 72, 0, 0, 0, 0, 0, 0, 12,
+ 0, 0, 0, 73, 74, 0, 75, 0, 0, 0,
+ 0, 0, 0, 78, 0, 0, 0, 81, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 84, 13, 16, 0, 85,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 80, 87, 71, 0, 0, 0, 0, 0, 0, 0,
+ 0, 68, 69, 70, 0, 0, 0, 0, 0, 0,
+ 0, 0, 72, 0, 0, 0, 0, 0, 0, 12,
+ 0, 0, 0, 73, 74, 0, 75, 0, 0, 0,
+ 76, 0, 77, 78, 79, 0, 0, 81, 0, 0,
+ 0, 82, 0, 83, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 84, 13, 16, 0, 85,
+ 0, 86, 0, 88, 0, 89, 0, 0, 0, 0,
+ 80, 87, 71, 0, 0, 0, 0, 0, 0, 0,
+ 0, -103, 0, 0, 0, 68, 69, 70, 0, 0,
+ 0, 0, 0, 0, 0, 0, 72, 0, 0, 0,
+ 0, 0, 0, 12, 0, 0, 0, 73, 74, 0,
+ 75, 0, 0, 0, 76, 0, 77, 78, 79, 0,
+ 0, 81, 0, 0, 0, 82, 0, 83, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 84,
+ 13, 16, 0, 85, 0, 86, 0, 88, 0, 89,
+ 0, 0, 0, 0, 80, 87, 71, 0, 0, 0,
+ 0, 0, 0, 0, 0, 68, 69, 70, 0, 0,
+ 0, 0, 0, 0, 0, 0, 72, 0, 0, 0,
+ 0, 0, 0, 12, 0, 0, 0, 73, 74, 0,
+ 75, 0, 0, 0, 76, 0, 77, 78, 79, 0,
+ 0, 81, 0, 0, 0, 82, 0, 83, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 84,
+ 13, 16, 0, 85, 0, 86, 0, 88, 303, 89,
+ 0, 0, 0, 0, 80, 87, 71, 0, 0, 0,
+ 0, 0, 0, 0, 0, 496, 0, 0, 68, 69,
70, 0, 0, 0, 0, 0, 0, 0, 0, 72,
0, 0, 0, 0, 0, 0, 12, 0, 0, 0,
73, 74, 0, 75, 0, 0, 0, 76, 0, 77,
78, 79, 0, 0, 81, 0, 0, 0, 82, 0,
- 83, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 83, 0, 0, 502, 0, 0, 0, 0, 0, 0,
0, 0, 84, 13, 16, 0, 85, 0, 86, 0,
88, 0, 89, 0, 0, 0, 0, 80, 87, 71,
- 0, 0, 0, 0, 0, 0, 0, 0, 68, 69,
- 70, 0, 0, 0, 0, 0, 0, 0, 0, 72,
- 0, 0, 0, 0, 0, 0, 12, 0, 0, 0,
- 73, 74, 0, 75, 0, 0, 0, 76, 0, 77,
- 78, 79, 0, 0, 81, 0, 0, 0, 82, 0,
- 83, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 84, 13, 16, 0, 85, 0, 86, 0,
- 88, 303, 89, 0, 0, 0, 0, 80, 87, 71,
- 0, 0, 0, 0, 0, 0, 0, 0, 496, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 504, 0,
0, 68, 69, 70, 0, 0, 0, 0, 0, 0,
0, 0, 72, 0, 0, 0, 0, 0, 0, 12,
0, 0, 0, 73, 74, 0, 75, 0, 0, 0,
76, 0, 77, 78, 79, 0, 0, 81, 0, 0,
- 0, 82, 0, 83, 0, 0, 497, 0, 0, 0,
+ 0, 82, 0, 83, 0, 0, 505, 0, 0, 0,
0, 0, 0, 0, 0, 84, 13, 16, 0, 85,
0, 86, 0, 88, 0, 89, 0, 0, 0, 0,
80, 87, 71, 0, 0, 0, 0, 0, 0, 0,
- 0, 504, 0, 0, 68, 69, 70, 0, 0, 0,
+ 0, 496, 0, 0, 68, 69, 70, 0, 0, 0,
0, 0, 0, 0, 0, 72, 0, 0, 0, 0,
0, 0, 12, 0, 0, 0, 73, 74, 0, 75,
0, 0, 0, 76, 0, 77, 78, 79, 0, 0,
- 81, 0, 0, 0, 82, 0, 83, 0, 0, 505,
+ 81, 0, 0, 0, 82, 0, 83, 0, 0, 497,
0, 0, 0, 0, 0, 0, 0, 0, 84, 13,
16, 0, 85, 0, 86, 0, 88, 0, 89, 0,
0, 0, 0, 80, 87, 71, 0, 0, 0, 0,
- 0, 0, 0, 0, 496, 0, 0, 68, 69, 70,
+ 0, 0, 0, 0, 504, 0, 0, 68, 69, 70,
0, 0, 0, 0, 0, 0, 0, 0, 72, 0,
0, 0, 0, 0, 0, 12, 0, 0, 0, 73,
74, 0, 75, 0, 0, 0, 76, 0, 77, 78,
79, 0, 0, 81, 0, 0, 0, 82, 0, 83,
- 0, 0, 502, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 507, 0, 0, 0, 0, 0, 0, 0,
0, 84, 13, 16, 0, 85, 0, 86, 0, 88,
0, 89, 0, 0, 0, 0, 80, 87, 71, 0,
- 0, 0, 0, 0, 0, 0, 0, 504, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 496, 0, 0,
68, 69, 70, 0, 0, 0, 0, 0, 0, 0,
0, 72, 0, 0, 0, 0, 0, 0, 12, 0,
0, 0, 73, 74, 0, 75, 0, 0, 0, 76,
0, 77, 78, 79, 0, 0, 81, 0, 0, 0,
- 82, 0, 83, 0, 0, 507, 0, 0, 0, 0,
+ 82, 0, 83, 0, 0, 497, 0, 0, 15, 0,
0, 0, 0, 0, 84, 13, 16, 0, 85, 0,
86, 0, 88, 0, 89, 0, 0, 0, 0, 80,
- 87, 71, 0, 0, 0, 0, 0, 0, 0, 0,
- 496, 0, 0, 68, 69, 70, 0, 0, 0, 0,
- 0, 0, 0, 0, 72, 0, 0, 0, 0, 0,
- 0, 12, 0, 0, 0, 73, 74, 0, 75, 0,
- 0, 0, 76, 0, 77, 78, 79, 0, 0, 81,
- 0, 0, 0, 82, 0, 83, 0, 0, 497, 0,
- 0, 15, 0, 0, 0, 0, 0, 84, 13, 16,
- 0, 85, 0, 86, 0, 88, 0, 89, 0, 0,
- 0, 0, 80, 87, 71, 0, 0, 14, 0, 0,
- 0, 0, 0, 68, 69, 70, 0, 0, 0, 0,
- 0, 0, 0, 0, 72, 0, 0, 0, 0, 0,
- 0, 12, 251, 0, 0, 535, 536, 0, 75, 0,
- 0, 0, 76, 0, 77, 78, 79, 0, 0, 81,
- 0, 0, 0, 82, 0, 83, 0, 0, 0, 0,
- 0, 0, 0, 255, 0, 0, 0, 84, 13, 16,
- 0, 85, 0, 86, 0, 88, 0, 89, 0, 0,
- 0, 0, 80, 87, 71, 0, 246, 0, 537, 0,
- 0, 0, 0, 142, 143, 144, 0, 0, 146, 148,
- 149, 0, 0, 150, 0, 151, 0, 0, 0, 153,
- 154, 155, 0, 0, 0, 0, 0, 0, 12, 156,
- 157, 158, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 159, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 162, 0,
- 0, 0, 0, 0, 0, 13, 16, 163, 164, 165,
- 0, 167, 168, 169, 170, 171, 172, 0, 0, 160,
- 166, 152, 145, 147, 161, 0, 0, 0, 0, 0,
+ 87, 71, 0, 0, 14, 0, 0, 0, 0, 0,
+ 68, 69, 70, 0, 0, 0, 0, 0, 0, 0,
+ 0, 72, 0, 0, 0, 0, 0, 0, 12, 251,
+ 0, 0, 544, 545, 0, 75, 0, 0, 0, 76,
+ 0, 77, 78, 79, 0, 0, 81, 0, 0, 0,
+ 82, 0, 83, 0, 0, 0, 0, 0, 0, 0,
+ 255, 0, 0, 0, 84, 13, 16, 0, 85, 0,
+ 86, 0, 88, 0, 89, 0, 0, 0, 0, 80,
+ 87, 71, 0, 246, 0, 546, 0, 0, 0, 0,
142, 143, 144, 0, 0, 146, 148, 149, 0, 0,
150, 0, 151, 0, 0, 0, 153, 154, 155, 0,
- 0, 0, 0, 0, 0, 425, 156, 157, 158, 0,
+ 0, 0, 0, 0, 0, 12, 156, 157, 158, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 159,
- 0, 0, 0, 426, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 162, 0, 0, 0, 0,
- 0, 430, 427, 429, 163, 164, 165, 0, 167, 168,
+ 0, 0, 13, 16, 163, 164, 165, 0, 167, 168,
169, 170, 171, 172, 0, 0, 160, 166, 152, 145,
147, 161, 0, 0, 0, 0, 0, 142, 143, 144,
0, 0, 146, 148, 149, 0, 0, 150, 0, 151,
0, 0, 0, 153, 154, 155, 0, 0, 0, 0,
0, 0, 425, 156, 157, 158, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 159, 0, 0, 0,
- 426, 0, 0, 0, 0, 0, 0, 0, 428, 0,
+ 426, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 162, 0, 0, 0, 0, 0, 430, 427,
429, 163, 164, 165, 0, 167, 168, 169, 170, 171,
172, 0, 0, 160, 166, 152, 145, 147, 161, 0,
- 0, 0, 0, 0, 244, 0, 0, 0, 0, 245,
- 0, 68, 69, 70, 247, 0, 0, 0, 0, 0,
- 0, 248, 72, 0, 0, 0, 0, 0, 0, 250,
- 251, 0, 0, 252, 74, 0, 75, 0, 0, 0,
- 76, 0, 77, 78, 79, 0, 0, 81, 0, 0,
- 0, 82, 0, 83, 0, 0, 0, 0, 0, 254,
- 0, 255, 0, 0, 0, 84, 253, 256, 257, 85,
- 258, 86, 259, 88, 31, 89, 260, 261, 0, 0,
- 80, 87, 71, 25, 246, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 142, 143, 144, 0, 0, 146,
+ 148, 149, 0, 0, 150, 0, 151, 0, 0, 0,
+ 153, 154, 155, 0, 0, 0, 0, 0, 0, 425,
+ 156, 157, 158, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 159, 0, 0, 0, 426, 0, 0,
+ 0, 0, 0, 0, 0, 428, 0, 0, 0, 162,
+ 0, 0, 0, 0, 0, 430, 427, 429, 163, 164,
+ 165, 0, 167, 168, 169, 170, 171, 172, 0, 0,
+ 160, 166, 152, 145, 147, 161, 0, 0, 0, 0,
0, 244, 0, 0, 0, 0, 245, 0, 68, 69,
- 70, 247, 0, 0, 0, 0, 0, 0, 248, 249,
+ 70, 247, 0, 0, 0, 0, 0, 0, 248, 72,
0, 0, 0, 0, 0, 0, 250, 251, 0, 0,
252, 74, 0, 75, 0, 0, 0, 76, 0, 77,
78, 79, 0, 0, 81, 0, 0, 0, 82, 0,
83, 0, 0, 0, 0, 0, 254, 0, 255, 0,
0, 0, 84, 253, 256, 257, 85, 258, 86, 259,
88, 31, 89, 260, 261, 0, 0, 80, 87, 71,
- 25, 246, 0, 0, 0, 0, 0, 0, 541, 143,
- 144, 0, 0, 543, 148, 545, 69, 70, 546, 0,
- 151, 0, 0, 0, 153, 548, 549, 0, 0, 0,
- 0, 0, 0, 550, 551, 157, 158, 252, 74, 0,
- 75, 0, 0, 0, 76, 0, 77, 552, 79, 0,
- 0, 554, 0, 0, 0, 82, 0, 83, 0, 0,
- 0, 0, 0, 556, 0, 255, 0, 0, 0, 558,
- 555, 557, 559, 560, 561, 86, 563, 564, 565, 566,
- 567, 568, 0, 0, 553, 562, 547, 542, 544, 161,
- 0, 0, 0, 0, 0, 393, 143, 144, 0, 0,
- 395, 148, 397, 69, 70, 398, 0, 151, 0, 0,
- 0, 153, 400, 401, 0, 0, 0, 0, 0, 0,
- 402, 403, 157, 158, 252, 74, 0, 75, 0, 0,
- 0, 76, 0, 77, 404, 79, 0, 0, 406, 0,
- 0, 0, 82, 0, 83, 0, -244, 0, 0, 0,
- 408, 0, 255, 0, 0, 0, 410, 407, 409, 411,
- 412, 413, 86, 415, 416, 417, 418, 419, 420, 0,
- 0, 405, 414, 399, 394, 396, 161, 0, 0, 0,
- 0, 0,
+ 25, 246, 0, 0, 0, 0, 0, 0, 244, 0,
+ 0, 0, 0, 245, 0, 68, 69, 70, 247, 0,
+ 0, 0, 0, 0, 0, 248, 249, 0, 0, 0,
+ 0, 0, 0, 250, 251, 0, 0, 252, 74, 0,
+ 75, 0, 0, 0, 76, 0, 77, 78, 79, 0,
+ 0, 81, 0, 0, 0, 82, 0, 83, 0, 0,
+ 0, 0, 0, 254, 0, 255, 0, 0, 0, 84,
+ 253, 256, 257, 85, 258, 86, 259, 88, 31, 89,
+ 260, 261, 0, 0, 80, 87, 71, 25, 246, 0,
+ 0, 0, 0, 0, 0, 550, 143, 144, 0, 0,
+ 552, 148, 554, 69, 70, 555, 0, 151, 0, 0,
+ 0, 153, 557, 558, 0, 0, 0, 0, 0, 0,
+ 559, 560, 157, 158, 252, 74, 0, 75, 0, 0,
+ 0, 76, 0, 77, 561, 79, 0, 0, 563, 0,
+ 0, 0, 82, 0, 83, 0, 0, 0, 0, 0,
+ 565, 0, 255, 0, 0, 0, 567, 564, 566, 568,
+ 569, 570, 86, 572, 573, 574, 575, 576, 577, 0,
+ 0, 562, 571, 556, 551, 553, 161, 0, 0, 0,
+ 0, 0, 393, 143, 144, 0, 0, 395, 148, 397,
+ 69, 70, 398, 0, 151, 0, 0, 0, 153, 400,
+ 401, 0, 0, 0, 0, 0, 0, 402, 403, 157,
+ 158, 252, 74, 0, 75, 0, 0, 0, 76, 0,
+ 77, 404, 79, 0, 0, 406, 0, 0, 0, 82,
+ 0, 83, 0, -249, 0, 0, 0, 408, 0, 255,
+ 0, 0, 0, 410, 407, 409, 411, 412, 413, 86,
+ 415, 416, 417, 418, 419, 420, 0, 0, 405, 414,
+ 399, 394, 396, 161, 0, 0, 0, 0, 0,
- 334, 477, 282, 482, 270, 503, 467, 464, 275, 42,
- 577, 55, 506, 479, 481, 217, 516, 522, 185, 23,
- 468, 217, 540, 583, 10, 486, 488, 492, 490, 493,
- 508, 270, 434, 385, 422, 383, 381, 366, 379, 368,
- 270, 275, 468, 275, 334, 173, 282, 217, 242, 223,
- 179, 468, 176, 334, 285, 371, 221, 343, 181, 341,
- 211, 282, 465, 198, 352, 204, 457, 339, 370, 449,
- 447, 206, 432, 442, 424, 334, 0, 93, 179, 501,
- 0, 577, 318, 500, 213, 221, 93, 0, 471, 93,
- 93, 93, 130, 483, 316, 317, 93, 461, 93, 93,
- 215, 319, 93, 93, 320, 514, 93, 93, 129, 17,
- 93, 0, 110, 94, 93, 93, 484, 102, 93, 242,
- 93, 103, 101, 203, 337, 93, 11, 484, 93, 93,
- 93, 513, 483, 93, 574, 515, 298, 93, 587, 334,
- 0, 302, 200, 93, 93, 105, 334, 352, 125, 126,
- 93, 11, 215, 269, 93, 93, 373, 510, 93, 124,
- 512, 93, 436, 511, 179, 437, 93, 0, 242, 93,
- 439, 127, 93, 123, 0, 436, 0, 128, 437, 93,
- 93, 483, 215, 93, 93, 139, 436, 122, 335, 437,
- 93, 93, 334, 141, 121, 362, 133, 376, 93, 93,
- 100, 135, 93, 0, 117, 330, 361, 330, 131, 330,
- 302, 93, 302, 93, 302, 330, 302, 0, 302, 0,
- 302, 0, 0, 93, 327, 93, 345, 329, 302, 332,
- 302, 351, 310, 0, 0, 0, 0, 349, 93, 0,
- 348, 364, 93, 302, 93, 321, 484, 302, 93, 322,
- 0, 93, 93, 302, 330, 323, 302, 302, 139, 302,
- 35, 305, 0, 0, 325, 527, 141, 210, 35, 0,
- 24, 37, 11, 0, 0, 0, 358, 0, 24, 37,
- 11, 532, 529, 531, 533, 530, 534, 0, 0, 0,
+ 592, 10, 481, 532, 270, 522, 23, 471, 586, 482,
+ 477, 534, 486, 549, 468, 488, 217, 503, 217, 282,
+ 334, 185, 516, 55, 42, 529, 490, 508, 493, 492,
+ 275, 531, 506, 434, 424, 385, 383, 371, 381, 366,
+ 379, 368, 270, 275, 468, 173, 422, 471, 179, 334,
+ 282, 217, 176, 471, 468, 334, 223, 343, 242, 270,
+ 275, 285, 221, 341, 461, 181, 449, 352, 457, 465,
+ 93, 334, 0, 479, 198, 317, 282, 204, 339, 206,
+ 0, 17, 432, 93, 370, 586, 93, 179, 318, 0,
+ 442, 447, 334, 213, 93, 93, 464, 215, 11, 316,
+ 200, 93, 93, 467, 215, 93, 319, 93, 93, 93,
+ 514, 129, 221, 130, 320, 93, 436, 483, 93, 437,
+ 515, 93, 337, 102, 93, 93, 242, 93, 94, 101,
+ 110, 93, 93, 93, 103, 484, 93, 93, 484, 483,
+ 93, 93, 513, 335, 596, 298, 93, 0, 203, 105,
+ 302, 126, 501, 93, 211, 215, 500, 93, 93, 510,
+ 269, 93, 93, 124, 512, 93, 125, 511, 436, 436,
+ 93, 437, 437, 93, 123, 483, 93, 93, 93, 484,
+ 93, 127, 93, 93, 122, 373, 179, 128, 139, 334,
+ 133, 93, 439, 135, 242, 121, 334, 93, 141, 93,
+ 0, 352, 117, 330, 93, 131, 100, 330, 302, 330,
+ 330, 93, 302, 93, 302, 302, 302, 93, 302, 0,
+ 580, 0, 302, 376, 325, 351, 0, 0, 345, 332,
+ 93, 329, 349, 93, 348, 302, 0, 578, 302, 0,
+ 364, 327, 305, 93, 583, 493, 93, 362, 302, 93,
+ 310, 302, 93, 323, 302, 139, 322, 302, 330, 321,
+ 0, 11, 361, 302, 0, 141, 210, 536, 0, 0,
+ 35, 541, 538, 540, 542, 539, 543, 0, 0, 0,
+ 358, 0, 11, 24, 37, 0, 0, 0, 0, 0,
+ 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, 571, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 569, 0, 0, 0, 0, 0,
- 493, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 35, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 11, 24, 37, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 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 [] = {
- 60, 8, 36, 36, 33, 33, 7, 60, 7, 36,
- 29, 33, 7, 7, 7, 36, 7, 55, 7, 78,
- 1, 78, 48, 1, 36, 33, 36, 36, 60, 5,
- 55, 61, 2, 33, 8, 55, 60, 16, 7, 7,
- 7, 5, 48, 60, 7, 2, 60, 20, 7, 5,
- 48, 17, 55, 2, 31, 7, 61, 8, 33, 7,
- 7, 7, 7, 60, 36, 36, 7, 0, 8, 7,
- 7, 36, 7, 88, 36, 29, 36, 1, 60, 65,
- 33, 17, 78, 1, 7, 7, 36, 7, 7, 33,
- 33, 76, 8, 2, 55, 78, 88, 36, 8, 29,
- 8, 8, 36, 61, 36, 36, 48, 36, 8, 8,
- 8, 66, 40, 8, 40, 8, -1, 7, 8, 8,
- -1, -1, -1, 51, 15, 51, 8, 40, 40, 50,
- 6, 8, 10, 54, 61, 62, 61, 62, 51, 51,
- 42, 8, 33, 8, 20, 7, 61, 62, 8, 29,
- 60, 53, 60, 60, 29, 61, 62, 56, 56, 29,
- 60, 56, 50, 56, 61, 62, 54, 61, 62, 61,
- 62, 60, 8, 29, 61, 62, 7, 55, 7, 61,
- 61, 62, 8, 60, 29, -1, 15, 15, 15, 12,
- 29, 66, 67, 60, 74, 60, 66, 67, 15, 29,
- 8, 61, 62, -1, 33, 85, 34, 34, 36, 36,
- 66, 67, 8, 29, -1, -1, -1, 34, -1, 36,
- 29, 66, 67, 29, -1, 61, 62, 66, 67, 7,
- 61, 62, 29, -1, 57, 61, 62, 29, -1, 25,
- 63, 27, 12, 25, 74, 27, 25, 12, 27, -1,
- 66, 67, 38, 61, 62, 85, 38, 66, 67, 38,
- 66, 67, 29, 18, 19, 61, 62, 29, -1, 66,
- 67, 29, -1, -1, 66, 67, 8, -1, 36, 18,
- 19, 29, -1, 61, 62, -1, -1, 57, 36, -1,
- 45, 46, 57, 63, 18, 19, 18, 19, 63, 66,
- 67, 33, 23, 24, 66, 67, 45, 46, 66, 67,
- 29, 32, 29, 25, 35, 27, 37, -1, 66, 67,
- 29, 45, 46, 45, 46, 29, 38, 23, 24, 61,
- 62, -1, 29, -1, -1, -1, 32, -1, -1, 35,
- -1, 37, 61, 62, 61, 62, -1, 66, 67, 66,
- 67, 29, 61, 62, -1, 59, -1, 66, 67, 23,
- 24, -1, 66, 67, 61, 62, 23, 24, 32, 66,
- 67, 35, -1, 37, -1, 32, 29, -1, 35, 29,
- 37, 85, -1, 61, 62, 23, 24, -1, 66, 67,
- -1, -1, -1, 31, 32, 23, 24, 35, -1, 37,
- -1, -1, -1, 31, 32, -1, 59, 35, -1, 37,
- -1, 61, 62, 66, 67, -1, 66, 67, 10, 23,
- 24, -1, -1, -1, -1, -1, -1, 31, 32, -1,
- 22, 35, 85, 37, -1, 23, 24, 29, -1, 10,
- -1, 23, 24, 31, 32, -1, -1, 35, -1, 37,
- 32, 22, -1, 35, -1, 37, -1, -1, 29, -1,
- -1, -1, -1, 55, -1, -1, -1, 59, -1, -1,
- -1, -1, -1, -1, 66, 67, -1, -1, -1, -1,
- -1, -1, 74, -1, 55, -1, -1, -1, 59, -1,
- -1, 83, -1, 85, -1, 66, 67, 3, -1, -1,
- -1, -1, -1, 74, -1, -1, -1, 13, -1, 23,
- 24, 17, 83, -1, 85, -1, -1, 31, 32, -1,
- 26, 35, 28, 37, -1, 31, -1, -1, -1, -1,
- -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, 3, -1, -1,
- -1, -1, -1, -1, -1, -1, -1, 13, -1, -1,
- -1, 17, 65, 66, 67, -1, 69, -1, -1, -1,
- 26, -1, 28, -1, -1, -1, -1, 80, 81, 82,
- -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,
+ 36, 60, 60, 16, 61, 5, 55, 8, 55, 8,
+ 7, 33, 60, 20, 2, 31, 48, 7, 36, 17,
+ 60, 33, 33, 60, 1, 60, 36, 61, 78, 7,
+ 17, 33, 7, 36, 7, 7, 7, 7, 7, 7,
+ 36, 36, 7, 7, 36, 5, 5, 33, 29, 7,
+ 7, 36, 36, 7, 36, 8, 36, 7, 7, 7,
+ 36, 55, 36, 7, 7, 2, 33, 2, 7, 7,
+ 36, 33, 55, 36, 29, 7, 55, 1, 1, 88,
+ 36, 8, 33, 0, 36, 78, 7, 48, 2, 78,
+ 36, 1, 8, 8, 36, 8, 36, 88, 6, 8,
+ 33, 48, 8, 29, 8, -1, -1, 36, 10, 8,
+ 8, 8, 20, 8, 7, 8, -1, 48, 40, -1,
+ 61, -1, 40, -1, -1, 15, 8, 8, -1, 51,
+ 66, 76, 60, 51, 8, 65, 61, 62, 7, -1,
+ 60, 60, 8, 33, 78, -1, -1, 60, 40, 61,
+ 62, 60, 56, 55, 60, 42, 61, 62, 56, 51,
+ -1, 60, 29, 60, 29, 60, 53, 61, 62, 40,
+ 61, 62, 61, 62, 56, 61, 62, 50, 50, 60,
+ 51, 54, 54, 61, 62, 61, 62, 61, 7, 29,
+ 25, 25, 27, 27, 60, 25, 15, 27, 29, 66,
+ 67, 66, 67, 38, 38, 29, 8, 25, 38, 27,
+ 25, 8, 27, 25, 33, 27, 29, 25, 8, 27,
+ 38, -1, 8, 38, 29, 25, 38, 27, 15, -1,
+ 38, 25, -1, 27, 74, 66, 67, 29, 38, -1,
+ 29, 12, 66, 67, 38, 85, 29, 34, 12, 36,
+ 8, 12, 29, 66, 67, 7, -1, 29, 8, 61,
+ 62, 29, -1, 29, 61, 62, 25, -1, 27, 74,
+ 56, 61, 62, -1, 66, 67, 29, 66, 67, 38,
+ 85, 7, 29, 66, 67, 29, 57, 29, 18, 19,
+ -1, -1, 63, 57, 66, 67, 57, 74, -1, 63,
+ 66, 67, 63, 61, 62, 25, 74, 27, 85, 61,
+ 62, 61, 62, 66, 67, 45, 46, 85, 38, 66,
+ 67, -1, 66, 67, 66, 67, 25, 25, 27, 27,
+ 15, 18, 19, -1, -1, 61, 62, 18, 19, 38,
+ 38, 18, 19, 29, -1, 8, 29, -1, -1, 34,
+ 36, 36, -1, 36, -1, -1, 29, -1, 45, 46,
+ -1, -1, -1, 29, 45, 46, -1, 29, 45, 46,
+ 33, 15, -1, 23, 24, -1, 29, -1, 29, -1,
+ 66, 67, 32, 66, 67, 35, 59, 37, 29, -1,
+ 34, -1, 36, 66, 67, 61, 62, 59, 61, 62,
+ 66, 67, 29, -1, 66, 67, -1, -1, 61, 62,
+ 61, 62, 85, 66, 67, 66, 67, 29, 23, 24,
+ 61, 62, -1, 85, -1, 66, 67, 32, -1, -1,
+ 35, -1, 37, -1, 61, 62, -1, -1, -1, 66,
+ 67, -1, -1, -1, -1, -1, -1, 23, 24, 61,
+ 62, -1, -1, -1, 66, 67, 32, 23, 24, 35,
+ -1, 37, -1, -1, -1, 31, 32, 23, 24, 35,
+ -1, 37, -1, -1, -1, 31, 32, 23, 24, 35,
+ -1, 37, -1, -1, -1, 31, 32, 23, 24, 35,
+ -1, 37, -1, -1, -1, 31, 32, 23, 24, 35,
+ 10, 37, -1, -1, -1, 31, 32, -1, -1, 35,
+ -1, 37, 22, -1, -1, 23, 24, -1, -1, 29,
+ -1, -1, -1, -1, 32, -1, -1, 35, -1, 37,
+ 3, -1, -1, -1, -1, -1, -1, -1, -1, -1,
+ 13, -1, -1, -1, 17, 55, -1, -1, -1, 59,
+ -1, -1, -1, 26, -1, 28, 66, 67, -1, -1,
+ -1, -1, -1, -1, 74, -1, 39, -1, 41, 42,
+ -1, -1, -1, 83, 3, 85, 49, -1, -1, 52,
+ 53, -1, -1, 10, 13, 58, -1, -1, 17, -1,
+ -1, 64, -1, -1, -1, 22, -1, 26, -1, 28,
+ -1, -1, 29, -1, -1, -1, 79, -1, -1, -1,
+ 39, -1, 41, 42, -1, -1, -1, -1, -1, -1,
+ 49, -1, -1, 52, 53, -1, -1, -1, 55, 58,
+ -1, -1, 59, -1, -1, 64, -1, -1, -1, 66,
+ 67, -1, -1, -1, -1, -1, -1, 74, -1, -1,
+ 79, -1, -1, -1, -1, -1, 83, -1, 85, -1,
+ -1, -1, -1, -1, 3, -1, -1, -1, -1, -1,
+ -1, -1, -1, -1, 13, -1, -1, -1, 17, -1,
+ -1, -1, -1, -1, -1, -1, -1, 26, -1, 28,
+ -1, -1, 31, -1, -1, -1, -1, -1, -1, -1,
+ 39, -1, 41, 42, -1, -1, -1, -1, -1, -1,
+ 49, -1, -1, 52, 53, -1, -1, -1, -1, 58,
+ -1, -1, -1, -1, -1, 64, -1, -1, -1, -1,
-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, 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, -1,
- -1, -1, -1, -1, 11, 12, 13, -1, -1, -1,
- -1, -1, -1, -1, -1, 22, -1, -1, -1, -1,
- -1, -1, 29, -1, -1, -1, 33, 34, -1, 36,
- -1, -1, -1, 40, -1, 42, 43, 44, -1, -1,
- 47, -1, -1, -1, 51, -1, 53, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, -1, -1, 65, 66,
- 67, -1, 69, -1, 71, -1, 73, -1, 75, -1,
- -1, -1, -1, 80, 81, 82, -1, -1, -1, -1,
- -1, -1, -1, -1, 7, -1, -1, -1, 11, 12,
+ 79, -1, -1, -1, -1, -1, -1, -1, -1, -1,
+ -1, -1, 12, 13, -1, -1, -1, -1, -1, -1,
+ -1, -1, 22, -1, -1, -1, -1, -1, -1, 29,
+ -1, -1, -1, 33, 34, -1, 36, -1, -1, -1,
+ -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, -1, -1, -1, -1,
+ -1, 11, 12, 13, -1, -1, -1, -1, -1, -1,
+ -1, -1, 22, -1, -1, -1, -1, -1, -1, 29,
+ -1, -1, -1, 33, 34, -1, 36, -1, -1, -1,
+ 40, -1, 42, 43, 44, -1, -1, 47, -1, -1,
+ -1, 51, -1, 53, -1, -1, -1, -1, -1, -1,
+ -1, -1, -1, -1, -1, 65, 66, 67, -1, 69,
+ -1, 71, -1, 73, -1, 75, -1, -1, -1, -1,
+ 80, 81, 82, -1, -1, -1, -1, -1, -1, -1,
+ -1, 7, -1, -1, -1, 11, 12, 13, -1, -1,
+ -1, -1, -1, -1, -1, -1, 22, -1, -1, -1,
+ -1, -1, -1, 29, -1, -1, -1, 33, 34, -1,
+ 36, -1, -1, -1, 40, -1, 42, 43, 44, -1,
+ -1, 47, -1, -1, -1, 51, -1, 53, -1, -1,
+ -1, -1, -1, -1, -1, -1, -1, -1, -1, 65,
+ 66, 67, -1, 69, -1, 71, -1, 73, -1, 75,
+ -1, -1, -1, -1, 80, 81, 82, -1, -1, -1,
+ -1, -1, -1, -1, -1, 11, 12, 13, -1, -1,
+ -1, -1, -1, -1, -1, -1, 22, -1, -1, -1,
+ -1, -1, -1, 29, -1, -1, -1, 33, 34, -1,
+ 36, -1, -1, -1, 40, -1, 42, 43, 44, -1,
+ -1, 47, -1, -1, -1, 51, -1, 53, -1, -1,
+ -1, -1, -1, -1, -1, -1, -1, -1, -1, 65,
+ 66, 67, -1, 69, -1, 71, -1, 73, 74, 75,
+ -1, -1, -1, -1, 80, 81, 82, -1, -1, -1,
+ -1, -1, -1, -1, -1, 8, -1, -1, 11, 12,
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,
+ 53, -1, -1, 56, -1, -1, -1, -1, -1, -1,
-1, -1, 65, 66, 67, -1, 69, -1, 71, -1,
73, -1, 75, -1, -1, -1, -1, 80, 81, 82,
- -1, -1, -1, -1, -1, -1, -1, -1, 11, 12,
- 13, -1, -1, -1, -1, -1, -1, -1, -1, 22,
- -1, -1, -1, -1, -1, -1, 29, -1, -1, -1,
- 33, 34, -1, 36, -1, -1, -1, 40, -1, 42,
- 43, 44, -1, -1, 47, -1, -1, -1, 51, -1,
- 53, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, 65, 66, 67, -1, 69, -1, 71, -1,
- 73, 74, 75, -1, -1, -1, -1, 80, 81, 82,
-1, -1, -1, -1, -1, -1, -1, -1, 8, -1,
-1, 11, 12, 13, -1, -1, -1, -1, -1, -1,
-1, -1, 22, -1, -1, -1, -1, -1, -1, 29,
@@ -702,61 +733,44 @@ const int QmlJSGrammar::action_check [] = {
-1, 22, -1, -1, -1, -1, -1, -1, 29, -1,
-1, -1, 33, 34, -1, 36, -1, -1, -1, 40,
-1, 42, 43, 44, -1, -1, 47, -1, -1, -1,
- 51, -1, 53, -1, -1, 56, -1, -1, -1, -1,
+ 51, -1, 53, -1, -1, 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, -1, -1, -1, -1, -1, -1,
- 8, -1, -1, 11, 12, 13, -1, -1, -1, -1,
- -1, -1, -1, -1, 22, -1, -1, -1, -1, -1,
- -1, 29, -1, -1, -1, 33, 34, -1, 36, -1,
- -1, -1, 40, -1, 42, 43, 44, -1, -1, 47,
- -1, -1, -1, 51, -1, 53, -1, -1, 56, -1,
- -1, 59, -1, -1, -1, -1, -1, 65, 66, 67,
- -1, 69, -1, 71, -1, 73, -1, 75, -1, -1,
- -1, -1, 80, 81, 82, -1, -1, 85, -1, -1,
- -1, -1, -1, 11, 12, 13, -1, -1, -1, -1,
- -1, -1, -1, -1, 22, -1, -1, -1, -1, -1,
- -1, 29, 30, -1, -1, 33, 34, -1, 36, -1,
- -1, -1, 40, -1, 42, 43, 44, -1, -1, 47,
- -1, -1, -1, 51, -1, 53, -1, -1, -1, -1,
- -1, -1, -1, 61, -1, -1, -1, 65, 66, 67,
- -1, 69, -1, 71, -1, 73, -1, 75, -1, -1,
- -1, -1, 80, 81, 82, -1, 84, -1, 86, -1,
- -1, -1, -1, 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,
+ 81, 82, -1, -1, 85, -1, -1, -1, -1, -1,
+ 11, 12, 13, -1, -1, -1, -1, -1, -1, -1,
+ -1, 22, -1, -1, -1, -1, -1, -1, 29, 30,
+ -1, -1, 33, 34, -1, 36, -1, -1, -1, 40,
+ -1, 42, 43, 44, -1, -1, 47, -1, -1, -1,
+ 51, -1, 53, -1, -1, -1, -1, -1, -1, -1,
+ 61, -1, -1, -1, 65, 66, 67, -1, 69, -1,
+ 71, -1, 73, -1, 75, -1, -1, -1, -1, 80,
+ 81, 82, -1, 84, -1, 86, -1, -1, -1, -1,
4, 5, 6, -1, -1, 9, 10, 11, -1, -1,
14, -1, 16, -1, -1, -1, 20, 21, 22, -1,
-1, -1, -1, -1, -1, 29, 30, 31, 32, -1,
-1, -1, -1, -1, -1, -1, -1, -1, -1, 43,
- -1, -1, -1, 47, -1, -1, -1, -1, -1, -1,
+ -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
-1, -1, -1, -1, -1, 59, -1, -1, -1, -1,
- -1, 65, 66, 67, 68, 69, 70, -1, 72, 73,
+ -1, -1, 66, 67, 68, 69, 70, -1, 72, 73,
74, 75, 76, 77, -1, -1, 80, 81, 82, 83,
84, 85, -1, -1, -1, -1, -1, 4, 5, 6,
-1, -1, 9, 10, 11, -1, -1, 14, -1, 16,
-1, -1, -1, 20, 21, 22, -1, -1, -1, -1,
-1, -1, 29, 30, 31, 32, -1, -1, -1, -1,
-1, -1, -1, -1, -1, -1, 43, -1, -1, -1,
- 47, -1, -1, -1, -1, -1, -1, -1, 55, -1,
+ 47, -1, -1, -1, -1, -1, -1, -1, -1, -1,
-1, -1, 59, -1, -1, -1, -1, -1, 65, 66,
67, 68, 69, 70, -1, 72, 73, 74, 75, 76,
77, -1, -1, 80, 81, 82, 83, 84, 85, -1,
- -1, -1, -1, -1, 4, -1, -1, -1, -1, 9,
- -1, 11, 12, 13, 14, -1, -1, -1, -1, -1,
- -1, 21, 22, -1, -1, -1, -1, -1, -1, 29,
- 30, -1, -1, 33, 34, -1, 36, -1, -1, -1,
- 40, -1, 42, 43, 44, -1, -1, 47, -1, -1,
- -1, 51, -1, 53, -1, -1, -1, -1, -1, 59,
- -1, 61, -1, -1, -1, 65, 66, 67, 68, 69,
- 70, 71, 72, 73, 74, 75, 76, 77, -1, -1,
- 80, 81, 82, 83, 84, -1, -1, -1, -1, -1,
+ -1, -1, -1, -1, 4, 5, 6, -1, -1, 9,
+ 10, 11, -1, -1, 14, -1, 16, -1, -1, -1,
+ 20, 21, 22, -1, -1, -1, -1, -1, -1, 29,
+ 30, 31, 32, -1, -1, -1, -1, -1, -1, -1,
+ -1, -1, -1, 43, -1, -1, -1, 47, -1, -1,
+ -1, -1, -1, -1, -1, 55, -1, -1, -1, 59,
+ -1, -1, -1, -1, -1, 65, 66, 67, 68, 69,
+ 70, -1, 72, 73, 74, 75, 76, 77, -1, -1,
+ 80, 81, 82, 83, 84, 85, -1, -1, -1, -1,
-1, 4, -1, -1, -1, -1, 9, -1, 11, 12,
13, 14, -1, -1, -1, -1, -1, -1, 21, 22,
-1, -1, -1, -1, -1, -1, 29, 30, -1, -1,
@@ -765,65 +779,76 @@ const int QmlJSGrammar::action_check [] = {
53, -1, -1, -1, -1, -1, 59, -1, 61, -1,
-1, -1, 65, 66, 67, 68, 69, 70, 71, 72,
73, 74, 75, 76, 77, -1, -1, 80, 81, 82,
- 83, 84, -1, -1, -1, -1, -1, -1, 4, 5,
- 6, -1, -1, 9, 10, 11, 12, 13, 14, -1,
- 16, -1, -1, -1, 20, 21, 22, -1, -1, -1,
- -1, -1, -1, 29, 30, 31, 32, 33, 34, -1,
+ 83, 84, -1, -1, -1, -1, -1, -1, 4, -1,
+ -1, -1, -1, 9, -1, 11, 12, 13, 14, -1,
+ -1, -1, -1, -1, -1, 21, 22, -1, -1, -1,
+ -1, -1, -1, 29, 30, -1, -1, 33, 34, -1,
36, -1, -1, -1, 40, -1, 42, 43, 44, -1,
-1, 47, -1, -1, -1, 51, -1, 53, -1, -1,
-1, -1, -1, 59, -1, 61, -1, -1, -1, 65,
66, 67, 68, 69, 70, 71, 72, 73, 74, 75,
- 76, 77, -1, -1, 80, 81, 82, 83, 84, 85,
+ 76, 77, -1, -1, 80, 81, 82, 83, 84, -1,
-1, -1, -1, -1, -1, 4, 5, 6, -1, -1,
9, 10, 11, 12, 13, 14, -1, 16, -1, -1,
-1, 20, 21, 22, -1, -1, -1, -1, -1, -1,
29, 30, 31, 32, 33, 34, -1, 36, -1, -1,
-1, 40, -1, 42, 43, 44, -1, -1, 47, -1,
- -1, -1, 51, -1, 53, -1, 55, -1, -1, -1,
+ -1, -1, 51, -1, 53, -1, -1, -1, -1, -1,
59, -1, 61, -1, -1, -1, 65, 66, 67, 68,
69, 70, 71, 72, 73, 74, 75, 76, 77, -1,
-1, 80, 81, 82, 83, 84, 85, -1, -1, -1,
- -1, -1,
+ -1, -1, 4, 5, 6, -1, -1, 9, 10, 11,
+ 12, 13, 14, -1, 16, -1, -1, -1, 20, 21,
+ 22, -1, -1, -1, -1, -1, -1, 29, 30, 31,
+ 32, 33, 34, -1, 36, -1, -1, -1, 40, -1,
+ 42, 43, 44, -1, -1, 47, -1, -1, -1, 51,
+ -1, 53, -1, 55, -1, -1, -1, 59, -1, 61,
+ -1, -1, -1, 65, 66, 67, 68, 69, 70, 71,
+ 72, 73, 74, 75, 76, 77, -1, -1, 80, 81,
+ 82, 83, 84, 85, -1, -1, -1, -1, -1,
- 14, 93, 66, 15, 23, 29, 76, 76, 23, 20,
- 23, 14, 29, 23, 15, 23, 23, 14, 62, 23,
- 14, 23, 10, 29, 5, 14, 66, 66, 14, 29,
- 14, 23, 66, 66, 29, 66, 14, 66, 66, 14,
- 23, 23, 14, 23, 14, 14, 66, 23, 66, 23,
- 29, 14, 29, 14, 14, 23, 23, 66, 29, 14,
- 14, 66, 14, 29, 23, 29, 91, 66, 66, 14,
- 66, 29, 29, 66, 30, 14, -1, 39, 29, 25,
- -1, 23, 44, 29, 35, 23, 39, -1, 15, 39,
- 39, 39, 45, 41, 44, 44, 39, 88, 39, 39,
- 41, 44, 39, 39, 44, 41, 39, 39, 45, 6,
- 39, -1, 45, 42, 39, 39, 41, 41, 39, 66,
- 39, 42, 41, 55, 63, 39, 23, 41, 39, 39,
- 39, 41, 41, 39, 6, 41, 39, 39, 80, 14,
- -1, 44, 53, 39, 39, 47, 14, 23, 44, 44,
- 39, 23, 41, 100, 39, 39, 94, 41, 39, 44,
- 41, 39, 33, 41, 29, 36, 39, -1, 66, 39,
- 35, 44, 39, 43, -1, 33, -1, 44, 36, 39,
- 39, 41, 41, 39, 39, 23, 33, 43, 63, 36,
- 39, 39, 14, 31, 43, 63, 51, 95, 39, 39,
- 41, 49, 39, -1, 44, 39, 82, 39, 45, 39,
- 44, 39, 44, 39, 44, 39, 44, -1, 44, -1,
- 44, -1, -1, 39, 50, 39, 54, 61, 44, 61,
- 44, 61, 46, -1, -1, -1, -1, 61, 39, -1,
- 56, 63, 39, 44, 39, 46, 41, 44, 39, 46,
- -1, 39, 39, 44, 39, 46, 44, 44, 23, 44,
- 11, 48, -1, -1, 52, 8, 31, 32, 11, -1,
- 21, 22, 23, -1, -1, -1, 61, -1, 21, 22,
- 23, 14, 15, 16, 17, 18, 19, -1, -1, -1,
+ 31, 5, 15, 23, 23, 14, 23, 15, 23, 15,
+ 95, 23, 14, 10, 14, 68, 23, 31, 23, 68,
+ 14, 64, 23, 14, 20, 20, 14, 14, 31, 68,
+ 23, 20, 31, 68, 32, 68, 68, 23, 14, 68,
+ 68, 14, 23, 23, 14, 14, 31, 15, 31, 14,
+ 68, 23, 31, 15, 14, 14, 23, 68, 68, 23,
+ 23, 14, 23, 14, 90, 31, 14, 23, 93, 14,
+ 41, 14, -1, 23, 31, 46, 68, 31, 68, 31,
+ -1, 6, 31, 41, 68, 23, 41, 31, 46, -1,
+ 68, 68, 14, 37, 41, 41, 78, 43, 23, 46,
+ 55, 41, 41, 78, 43, 41, 46, 41, 41, 41,
+ 43, 47, 23, 47, 46, 41, 35, 43, 41, 38,
+ 43, 41, 65, 43, 41, 41, 68, 41, 44, 43,
+ 47, 41, 41, 41, 44, 43, 41, 41, 43, 43,
+ 41, 41, 43, 65, 82, 41, 41, -1, 57, 49,
+ 46, 46, 27, 41, 14, 43, 31, 41, 41, 43,
+ 102, 41, 41, 46, 43, 41, 46, 43, 35, 35,
+ 41, 38, 38, 41, 45, 43, 41, 41, 41, 43,
+ 41, 46, 41, 41, 45, 96, 31, 46, 23, 14,
+ 53, 41, 37, 51, 68, 45, 14, 41, 33, 41,
+ -1, 23, 46, 41, 41, 47, 43, 41, 46, 41,
+ 41, 41, 46, 41, 46, 46, 46, 41, 46, -1,
+ 6, -1, 46, 97, 54, 63, -1, -1, 56, 63,
+ 41, 63, 63, 41, 58, 46, -1, 23, 46, -1,
+ 65, 52, 50, 41, 6, 31, 41, 65, 46, 41,
+ 48, 46, 41, 48, 46, 23, 48, 46, 41, 48,
+ -1, 23, 84, 46, -1, 33, 34, 8, -1, -1,
+ 11, 14, 15, 16, 17, 18, 19, -1, -1, -1,
+ 63, -1, 23, 24, 25, -1, -1, -1, -1, -1,
+ -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
+ -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
+ -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
+ -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, -1, 6, -1, -1,
+ -1, -1, 11, -1, -1, -1, -1, -1, -1, -1,
+ -1, -1, -1, -1, 23, 24, 25, -1, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, 23, -1, -1, -1, -1, -1,
- 29, -1, -1, -1, -1, -1, -1, -1, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
-1, -1, -1, -1, -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 c514485..fde9969 100644
--- a/src/declarative/qml/parser/qmljsgrammar_p.h
+++ b/src/declarative/qml/parser/qmljsgrammar_p.h
@@ -2,7 +2,7 @@
/****************************************************************************
**
** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
-** Contact: Qt Software Information (qt-info@nokia.com)
+** Contact: Nokia Corporation (qt-info@nokia.com)
**
** This file is part of the QtCore module of the Qt Toolkit.
**
@@ -35,7 +35,7 @@
** met: http://www.gnu.org/copyleft/gpl.html.
**
** If you are unsure which license is appropriate for your use, please
-** contact the sales department at qt-sales@nokia.com.
+** contact the sales department at http://www.qtsoftware.com/contact.
** $QT_END_LICENSE$
**
****************************************************************************/
@@ -150,15 +150,15 @@ public:
T_XOR = 78,
T_XOR_EQ = 79,
- ACCEPT_STATE = 588,
- RULE_COUNT = 323,
- STATE_COUNT = 589,
+ ACCEPT_STATE = 597,
+ RULE_COUNT = 328,
+ STATE_COUNT = 598,
TERMINAL_COUNT = 91,
- NON_TERMINAL_COUNT = 102,
+ NON_TERMINAL_COUNT = 104,
- GOTO_INDEX_OFFSET = 589,
- GOTO_INFO_OFFSET = 2092,
- GOTO_CHECK_OFFSET = 2092
+ GOTO_INDEX_OFFSET = 598,
+ GOTO_INFO_OFFSET = 2179,
+ GOTO_CHECK_OFFSET = 2179
};
static const char *const spell [];
diff --git a/src/declarative/qml/parser/qmljsparser.cpp b/src/declarative/qml/parser/qmljsparser.cpp
index 6ecff3d..8720023 100644
--- a/src/declarative/qml/parser/qmljsparser.cpp
+++ b/src/declarative/qml/parser/qmljsparser.cpp
@@ -321,15 +321,46 @@ case 29: {
}
case 31: {
+ sym(1).Node = 0;
+} break;
+
+case 32: {
+ sym(1).Node = sym(1).UiParameterList->finish ();
+} break;
+
+case 33: {
+ AST::UiParameterList *node = makeAstNode<AST::UiParameterList> (driver->nodePool(), sym(1).sval, sym(2).sval);
+ node->identifierToken = loc(2);
+ sym(1).Node = node;
+} break;
+
+case 34: {
+ AST::UiParameterList *node = makeAstNode<AST::UiParameterList> (driver->nodePool(), sym(1).UiParameterList, sym(3).sval, sym(4).sval);
+ node->commaToken = loc(2);
+ node->identifierToken = loc(4);
+ sym(1).Node = node;
+} break;
+
+case 35: {
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->parameters = sym(4).UiParameterList;
sym(1).Node = node;
} break;
-case 33: {
+case 36: {
+ 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);
+ sym(1).Node = node;
+} break;
+
+case 38: {
AST::UiPublicMember *node = makeAstNode<AST::UiPublicMember> (driver->nodePool(), sym(2).sval, sym(3).sval);
node->propertyToken = loc(1);
node->typeToken = loc(2);
@@ -338,7 +369,7 @@ case 33: {
sym(1).Node = node;
} break;
-case 35: {
+case 40: {
AST::UiPublicMember *node = makeAstNode<AST::UiPublicMember> (driver->nodePool(), sym(3).sval, sym(4).sval);
node->isDefaultMember = true;
node->defaultToken = loc(1);
@@ -349,7 +380,7 @@ case 35: {
sym(1).Node = node;
} break;
-case 37: {
+case 42: {
AST::UiPublicMember *node = makeAstNode<AST::UiPublicMember> (driver->nodePool(), sym(2).sval, sym(3).sval,
sym(5).Expression);
node->propertyToken = loc(1);
@@ -360,7 +391,7 @@ case 37: {
sym(1).Node = node;
} break;
-case 39: {
+case 44: {
AST::UiPublicMember *node = makeAstNode<AST::UiPublicMember> (driver->nodePool(), sym(3).sval, sym(4).sval,
sym(6).Expression);
node->isDefaultMember = true;
@@ -373,76 +404,76 @@ case 39: {
sym(1).Node = node;
} break;
-case 40: {
+case 45: {
sym(1).Node = makeAstNode<AST::UiSourceElement>(driver->nodePool(), sym(1).Node);
} break;
-case 41: {
+case 46: {
sym(1).Node = makeAstNode<AST::UiSourceElement>(driver->nodePool(), sym(1).Node);
} break;
-case 42:
-case 43:
+case 47:
+case 48:
{
AST::UiQualifiedId *node = makeAstNode<AST::UiQualifiedId> (driver->nodePool(), driver->intern(lexer->characterBuffer(), lexer->characterCount()));
node->identifierToken = loc(1);
sym(1).Node = node;
} break;
-case 45: {
+case 50: {
QString s = QLatin1String(QmlJSGrammar::spell[T_PROPERTY]);
sym(1).sval = driver->intern(s.constData(), s.length());
break;
}
-case 46: {
+case 51: {
QString s = QLatin1String(QmlJSGrammar::spell[T_SIGNAL]);
sym(1).sval = driver->intern(s.constData(), s.length());
break;
}
-case 47: {
+case 52: {
AST::ThisExpression *node = makeAstNode<AST::ThisExpression> (driver->nodePool());
node->thisToken = loc(1);
sym(1).Node = node;
} break;
-case 48: {
+case 53: {
AST::IdentifierExpression *node = makeAstNode<AST::IdentifierExpression> (driver->nodePool(), sym(1).sval);
node->identifierToken = loc(1);
sym(1).Node = node;
} break;
-case 49: {
+case 54: {
AST::NullExpression *node = makeAstNode<AST::NullExpression> (driver->nodePool());
node->nullToken = loc(1);
sym(1).Node = node;
} break;
-case 50: {
+case 55: {
AST::TrueLiteral *node = makeAstNode<AST::TrueLiteral> (driver->nodePool());
node->trueToken = loc(1);
sym(1).Node = node;
} break;
-case 51: {
+case 56: {
AST::FalseLiteral *node = makeAstNode<AST::FalseLiteral> (driver->nodePool());
node->falseToken = loc(1);
sym(1).Node = node;
} break;
-case 52: {
+case 57: {
AST::NumericLiteral *node = makeAstNode<AST::NumericLiteral> (driver->nodePool(), sym(1).dval, lexer->flags);
node->literalToken = loc(1);
sym(1).Node = node;
} break;
-case 53: {
+case 58: {
AST::StringLiteral *node = makeAstNode<AST::StringLiteral> (driver->nodePool(), sym(1).sval);
node->literalToken = loc(1);
sym(1).Node = node;
} break;
-case 54: {
+case 59: {
bool rx = lexer->scanRegExp(Lexer::NoPrefix);
if (!rx) {
diagnostic_messages.append(DiagnosticMessage(DiagnosticMessage::Error, location(lexer), lexer->errorMessage()));
@@ -453,7 +484,7 @@ case 54: {
sym(1).Node = node;
} break;
-case 55: {
+case 60: {
bool rx = lexer->scanRegExp(Lexer::EqualPrefix);
if (!rx) {
diagnostic_messages.append(DiagnosticMessage(DiagnosticMessage::Error, location(lexer), lexer->errorMessage()));
@@ -464,28 +495,28 @@ case 55: {
sym(1).Node = node;
} break;
-case 56: {
+case 61: {
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 57: {
+case 62: {
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 58: {
+case 63: {
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 59: {
+case 64: {
AST::ArrayLiteral *node = makeAstNode<AST::ArrayLiteral> (driver->nodePool(), sym(2).ElementList->finish (),
(AST::Elision *) 0);
node->lbracketToken = loc(1);
@@ -494,7 +525,7 @@ case 59: {
sym(1).Node = node;
} break;
-case 60: {
+case 65: {
AST::ArrayLiteral *node = makeAstNode<AST::ArrayLiteral> (driver->nodePool(), sym(2).ElementList->finish (),
sym(4).Elision->finish());
node->lbracketToken = loc(1);
@@ -503,7 +534,7 @@ case 60: {
sym(1).Node = node;
} break;
-case 61: {
+case 66: {
AST::ObjectLiteral *node = 0;
if (sym(2).Node)
node = makeAstNode<AST::ObjectLiteral> (driver->nodePool(),
@@ -515,7 +546,7 @@ case 61: {
sym(1).Node = node;
} break;
-case 62: {
+case 67: {
AST::ObjectLiteral *node = makeAstNode<AST::ObjectLiteral> (driver->nodePool(),
sym(2).PropertyNameAndValueList->finish ());
node->lbraceToken = loc(1);
@@ -523,67 +554,67 @@ case 62: {
sym(1).Node = node;
} break;
-case 63: {
+case 68: {
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 64: {
+case 69: {
AST::UiQualifiedId *node = makeAstNode<AST::UiQualifiedId> (driver->nodePool(), sym(1).sval);
node->identifierToken = loc(1);
sym(1).Node = node;
} break;
-case 65: {
+case 70: {
AST::UiQualifiedId *node = makeAstNode<AST::UiQualifiedId> (driver->nodePool(), sym(1).UiQualifiedId, sym(3).sval);
node->identifierToken = loc(3);
sym(1).Node = node;
} break;
-case 66: {
+case 71: {
sym(1).Node = makeAstNode<AST::ElementList> (driver->nodePool(), (AST::Elision *) 0, sym(1).Expression);
} break;
-case 67: {
+case 72: {
sym(1).Node = makeAstNode<AST::ElementList> (driver->nodePool(), sym(1).Elision->finish(), sym(2).Expression);
} break;
-case 68: {
+case 73: {
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 69: {
+case 74: {
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 70: {
+case 75: {
AST::Elision *node = makeAstNode<AST::Elision> (driver->nodePool());
node->commaToken = loc(1);
sym(1).Node = node;
} break;
-case 71: {
+case 76: {
AST::Elision *node = makeAstNode<AST::Elision> (driver->nodePool(), sym(1).Elision);
node->commaToken = loc(2);
sym(1).Node = node;
} break;
-case 72: {
+case 77: {
AST::PropertyNameAndValueList *node = makeAstNode<AST::PropertyNameAndValueList> (driver->nodePool(),
sym(1).PropertyName, sym(3).Expression);
node->colonToken = loc(2);
sym(1).Node = node;
} break;
-case 73: {
+case 78: {
AST::PropertyNameAndValueList *node = makeAstNode<AST::PropertyNameAndValueList> (driver->nodePool(),
sym(1).PropertyNameAndValueList, sym(3).PropertyName, sym(5).Expression);
node->commaToken = loc(2);
@@ -591,46 +622,36 @@ case 73: {
sym(1).Node = node;
} break;
-case 74: {
+case 79: {
AST::IdentifierPropertyName *node = makeAstNode<AST::IdentifierPropertyName> (driver->nodePool(), sym(1).sval);
node->propertyNameToken = loc(1);
sym(1).Node = node;
} break;
-case 75:
-case 76: {
+case 80:
+case 81: {
AST::IdentifierPropertyName *node = makeAstNode<AST::IdentifierPropertyName> (driver->nodePool(), driver->intern(lexer->characterBuffer(), lexer->characterCount()));
node->propertyNameToken = loc(1);
sym(1).Node = node;
} break;
-case 77: {
+case 82: {
AST::StringLiteralPropertyName *node = makeAstNode<AST::StringLiteralPropertyName> (driver->nodePool(), sym(1).sval);
node->propertyNameToken = loc(1);
sym(1).Node = node;
} break;
-case 78: {
+case 83: {
AST::NumericLiteralPropertyName *node = makeAstNode<AST::NumericLiteralPropertyName> (driver->nodePool(), sym(1).dval);
node->propertyNameToken = loc(1);
sym(1).Node = node;
} break;
-case 79: {
+case 84: {
AST::IdentifierPropertyName *node = makeAstNode<AST::IdentifierPropertyName> (driver->nodePool(), sym(1).sval);
node->propertyNameToken = loc(1);
sym(1).Node = node;
} break;
-case 80:
-
-case 81:
-
-case 82:
-
-case 83:
-
-case 84:
-
case 85:
case 86:
@@ -682,25 +703,35 @@ case 108:
case 109:
case 110:
+
+case 111:
+
+case 112:
+
+case 113:
+
+case 114:
+
+case 115:
{
sym(1).sval = driver->intern(lexer->characterBuffer(), lexer->characterCount());
} break;
-case 115: {
+case 120: {
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 116: {
+case 121: {
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 117: {
+case 122: {
AST::NewMemberExpression *node = makeAstNode<AST::NewMemberExpression> (driver->nodePool(), sym(2).Expression, sym(4).ArgumentList);
node->newToken = loc(1);
node->lparenToken = loc(3);
@@ -708,384 +739,384 @@ case 117: {
sym(1).Node = node;
} break;
-case 119: {
+case 124: {
AST::NewExpression *node = makeAstNode<AST::NewExpression> (driver->nodePool(), sym(2).Expression);
node->newToken = loc(1);
sym(1).Node = node;
} break;
-case 120: {
+case 125: {
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 121: {
+case 126: {
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 122: {
+case 127: {
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 123: {
+case 128: {
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 124: {
+case 129: {
sym(1).Node = 0;
} break;
-case 125: {
+case 130: {
sym(1).Node = sym(1).ArgumentList->finish();
} break;
-case 126: {
+case 131: {
sym(1).Node = makeAstNode<AST::ArgumentList> (driver->nodePool(), sym(1).Expression);
} break;
-case 127: {
+case 132: {
AST::ArgumentList *node = makeAstNode<AST::ArgumentList> (driver->nodePool(), sym(1).ArgumentList, sym(3).Expression);
node->commaToken = loc(2);
sym(1).Node = node;
} break;
-case 131: {
+case 136: {
AST::PostIncrementExpression *node = makeAstNode<AST::PostIncrementExpression> (driver->nodePool(), sym(1).Expression);
node->incrementToken = loc(2);
sym(1).Node = node;
} break;
-case 132: {
+case 137: {
AST::PostDecrementExpression *node = makeAstNode<AST::PostDecrementExpression> (driver->nodePool(), sym(1).Expression);
node->decrementToken = loc(2);
sym(1).Node = node;
} break;
-case 134: {
+case 139: {
AST::DeleteExpression *node = makeAstNode<AST::DeleteExpression> (driver->nodePool(), sym(2).Expression);
node->deleteToken = loc(1);
sym(1).Node = node;
} break;
-case 135: {
+case 140: {
AST::VoidExpression *node = makeAstNode<AST::VoidExpression> (driver->nodePool(), sym(2).Expression);
node->voidToken = loc(1);
sym(1).Node = node;
} break;
-case 136: {
+case 141: {
AST::TypeOfExpression *node = makeAstNode<AST::TypeOfExpression> (driver->nodePool(), sym(2).Expression);
node->typeofToken = loc(1);
sym(1).Node = node;
} break;
-case 137: {
+case 142: {
AST::PreIncrementExpression *node = makeAstNode<AST::PreIncrementExpression> (driver->nodePool(), sym(2).Expression);
node->incrementToken = loc(1);
sym(1).Node = node;
} break;
-case 138: {
+case 143: {
AST::PreDecrementExpression *node = makeAstNode<AST::PreDecrementExpression> (driver->nodePool(), sym(2).Expression);
node->decrementToken = loc(1);
sym(1).Node = node;
} break;
-case 139: {
+case 144: {
AST::UnaryPlusExpression *node = makeAstNode<AST::UnaryPlusExpression> (driver->nodePool(), sym(2).Expression);
node->plusToken = loc(1);
sym(1).Node = node;
} break;
-case 140: {
+case 145: {
AST::UnaryMinusExpression *node = makeAstNode<AST::UnaryMinusExpression> (driver->nodePool(), sym(2).Expression);
node->minusToken = loc(1);
sym(1).Node = node;
} break;
-case 141: {
+case 146: {
AST::TildeExpression *node = makeAstNode<AST::TildeExpression> (driver->nodePool(), sym(2).Expression);
node->tildeToken = loc(1);
sym(1).Node = node;
} break;
-case 142: {
+case 147: {
AST::NotExpression *node = makeAstNode<AST::NotExpression> (driver->nodePool(), sym(2).Expression);
node->notToken = loc(1);
sym(1).Node = node;
} break;
-case 144: {
+case 149: {
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 145: {
+case 150: {
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 146: {
+case 151: {
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 148: {
+case 153: {
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 149: {
+case 154: {
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 151: {
+case 156: {
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 152: {
+case 157: {
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 153: {
+case 158: {
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 155: {
+case 160: {
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 156: {
+case 161: {
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 157: {
+case 162: {
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 158: {
+case 163: {
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 159: {
+case 164: {
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 160: {
+case 165: {
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 162: {
+case 167: {
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 163: {
+case 168: {
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 164: {
+case 169: {
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 165: {
+case 170: {
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 166: {
+case 171: {
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 168: {
+case 173: {
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 169: {
+case 174: {
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 170: {
+case 175: {
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 171: {
+case 176: {
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 173: {
+case 178: {
AST::BinaryExpression *node = makeAstNode<AST::BinaryExpression> (driver->nodePool(), sym(1).Expression,
QSOperator::Equal, sym(3).Expression);
node->operatorToken = loc(2);
sym(1).Node = node;
} break;
-case 174: {
+case 179: {
AST::BinaryExpression *node = makeAstNode<AST::BinaryExpression> (driver->nodePool(), sym(1).Expression,
QSOperator::NotEqual, sym(3).Expression);
node->operatorToken = loc(2);
sym(1).Node = node;
} break;
-case 175: {
+case 180: {
AST::BinaryExpression *node = makeAstNode<AST::BinaryExpression> (driver->nodePool(), sym(1).Expression,
QSOperator::StrictEqual, sym(3).Expression);
node->operatorToken = loc(2);
sym(1).Node = node;
} break;
-case 176: {
+case 181: {
AST::BinaryExpression *node = makeAstNode<AST::BinaryExpression> (driver->nodePool(), sym(1).Expression,
QSOperator::StrictNotEqual, sym(3).Expression);
node->operatorToken = loc(2);
sym(1).Node = node;
} break;
-case 178: {
+case 183: {
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 180: {
+case 185: {
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 182: {
+case 187: {
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 184: {
+case 189: {
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 186: {
+case 191: {
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 188: {
+case 193: {
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 190: {
+case 195: {
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 192: {
+case 197: {
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 194: {
+case 199: {
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 196: {
+case 201: {
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 198: {
+case 203: {
AST::ConditionalExpression *node = makeAstNode<AST::ConditionalExpression> (driver->nodePool(), sym(1).Expression,
sym(3).Expression, sym(5).Expression);
node->questionToken = loc(2);
@@ -1093,7 +1124,7 @@ case 198: {
sym(1).Node = node;
} break;
-case 200: {
+case 205: {
AST::ConditionalExpression *node = makeAstNode<AST::ConditionalExpression> (driver->nodePool(), sym(1).Expression,
sym(3).Expression, sym(5).Expression);
node->questionToken = loc(2);
@@ -1101,112 +1132,112 @@ case 200: {
sym(1).Node = node;
} break;
-case 202: {
+case 207: {
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 204: {
+case 209: {
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 205: {
+case 210: {
sym(1).ival = QSOperator::Assign;
} break;
-case 206: {
+case 211: {
sym(1).ival = QSOperator::InplaceMul;
} break;
-case 207: {
+case 212: {
sym(1).ival = QSOperator::InplaceDiv;
} break;
-case 208: {
+case 213: {
sym(1).ival = QSOperator::InplaceMod;
} break;
-case 209: {
+case 214: {
sym(1).ival = QSOperator::InplaceAdd;
} break;
-case 210: {
+case 215: {
sym(1).ival = QSOperator::InplaceSub;
} break;
-case 211: {
+case 216: {
sym(1).ival = QSOperator::InplaceLeftShift;
} break;
-case 212: {
+case 217: {
sym(1).ival = QSOperator::InplaceRightShift;
} break;
-case 213: {
+case 218: {
sym(1).ival = QSOperator::InplaceURightShift;
} break;
-case 214: {
+case 219: {
sym(1).ival = QSOperator::InplaceAnd;
} break;
-case 215: {
+case 220: {
sym(1).ival = QSOperator::InplaceXor;
} break;
-case 216: {
+case 221: {
sym(1).ival = QSOperator::InplaceOr;
} break;
-case 218: {
+case 223: {
AST::Expression *node = makeAstNode<AST::Expression> (driver->nodePool(), sym(1).Expression, sym(3).Expression);
node->commaToken = loc(2);
sym(1).Node = node;
} break;
-case 219: {
+case 224: {
sym(1).Node = 0;
} break;
-case 222: {
+case 227: {
AST::Expression *node = makeAstNode<AST::Expression> (driver->nodePool(), sym(1).Expression, sym(3).Expression);
node->commaToken = loc(2);
sym(1).Node = node;
} break;
-case 223: {
+case 228: {
sym(1).Node = 0;
} break;
-case 240: {
+case 245: {
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 241: {
+case 246: {
sym(1).Node = makeAstNode<AST::StatementList> (driver->nodePool(), sym(1).Statement);
} break;
-case 242: {
+case 247: {
sym(1).Node = makeAstNode<AST::StatementList> (driver->nodePool(), sym(1).StatementList, sym(2).Statement);
} break;
-case 243: {
+case 248: {
sym(1).Node = 0;
} break;
-case 244: {
+case 249: {
sym(1).Node = sym(1).StatementList->finish ();
} break;
-case 246: {
+case 251: {
AST::VariableStatement *node = makeAstNode<AST::VariableStatement> (driver->nodePool(),
sym(2).VariableDeclarationList->finish (/*readOnly=*/sym(1).ival == T_CONST));
node->declarationKindToken = loc(1);
@@ -1214,76 +1245,76 @@ case 246: {
sym(1).Node = node;
} break;
-case 247: {
+case 252: {
sym(1).ival = T_CONST;
} break;
-case 248: {
+case 253: {
sym(1).ival = T_VAR;
} break;
-case 249: {
+case 254: {
sym(1).Node = makeAstNode<AST::VariableDeclarationList> (driver->nodePool(), sym(1).VariableDeclaration);
} break;
-case 250: {
+case 255: {
AST::VariableDeclarationList *node = makeAstNode<AST::VariableDeclarationList> (driver->nodePool(),
sym(1).VariableDeclarationList, sym(3).VariableDeclaration);
node->commaToken = loc(2);
sym(1).Node = node;
} break;
-case 251: {
+case 256: {
sym(1).Node = makeAstNode<AST::VariableDeclarationList> (driver->nodePool(), sym(1).VariableDeclaration);
} break;
-case 252: {
+case 257: {
sym(1).Node = makeAstNode<AST::VariableDeclarationList> (driver->nodePool(), sym(1).VariableDeclarationList, sym(3).VariableDeclaration);
} break;
-case 253: {
+case 258: {
AST::VariableDeclaration *node = makeAstNode<AST::VariableDeclaration> (driver->nodePool(), sym(1).sval, sym(2).Expression);
node->identifierToken = loc(1);
sym(1).Node = node;
} break;
-case 254: {
+case 259: {
AST::VariableDeclaration *node = makeAstNode<AST::VariableDeclaration> (driver->nodePool(), sym(1).sval, sym(2).Expression);
node->identifierToken = loc(1);
sym(1).Node = node;
} break;
-case 255: {
+case 260: {
// ### TODO: AST for initializer
sym(1) = sym(2);
} break;
-case 256: {
+case 261: {
sym(1).Node = 0;
} break;
-case 258: {
+case 263: {
// ### TODO: AST for initializer
sym(1) = sym(2);
} break;
-case 259: {
+case 264: {
sym(1).Node = 0;
} break;
-case 261: {
+case 266: {
AST::EmptyStatement *node = makeAstNode<AST::EmptyStatement> (driver->nodePool());
node->semicolonToken = loc(1);
sym(1).Node = node;
} break;
-case 263: {
+case 268: {
AST::ExpressionStatement *node = makeAstNode<AST::ExpressionStatement> (driver->nodePool(), sym(1).Expression);
node->semicolonToken = loc(2);
sym(1).Node = node;
} break;
-case 264: {
+case 269: {
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);
@@ -1292,7 +1323,7 @@ case 264: {
sym(1).Node = node;
} break;
-case 265: {
+case 270: {
AST::IfStatement *node = makeAstNode<AST::IfStatement> (driver->nodePool(), sym(3).Expression, sym(5).Statement);
node->ifToken = loc(1);
node->lparenToken = loc(2);
@@ -1300,7 +1331,7 @@ case 265: {
sym(1).Node = node;
} break;
-case 267: {
+case 272: {
AST::DoWhileStatement *node = makeAstNode<AST::DoWhileStatement> (driver->nodePool(), sym(2).Statement, sym(5).Expression);
node->doToken = loc(1);
node->whileToken = loc(3);
@@ -1310,7 +1341,7 @@ case 267: {
sym(1).Node = node;
} break;
-case 268: {
+case 273: {
AST::WhileStatement *node = makeAstNode<AST::WhileStatement> (driver->nodePool(), sym(3).Expression, sym(5).Statement);
node->whileToken = loc(1);
node->lparenToken = loc(2);
@@ -1318,7 +1349,7 @@ case 268: {
sym(1).Node = node;
} break;
-case 269: {
+case 274: {
AST::ForStatement *node = makeAstNode<AST::ForStatement> (driver->nodePool(), sym(3).Expression,
sym(5).Expression, sym(7).Expression, sym(9).Statement);
node->forToken = loc(1);
@@ -1329,7 +1360,7 @@ case 269: {
sym(1).Node = node;
} break;
-case 270: {
+case 275: {
AST::LocalForStatement *node = makeAstNode<AST::LocalForStatement> (driver->nodePool(),
sym(4).VariableDeclarationList->finish (/*readOnly=*/false), sym(6).Expression,
sym(8).Expression, sym(10).Statement);
@@ -1342,7 +1373,7 @@ case 270: {
sym(1).Node = node;
} break;
-case 271: {
+case 276: {
AST:: ForEachStatement *node = makeAstNode<AST::ForEachStatement> (driver->nodePool(), sym(3).Expression,
sym(5).Expression, sym(7).Statement);
node->forToken = loc(1);
@@ -1352,7 +1383,7 @@ case 271: {
sym(1).Node = node;
} break;
-case 272: {
+case 277: {
AST::LocalForEachStatement *node = makeAstNode<AST::LocalForEachStatement> (driver->nodePool(),
sym(4).VariableDeclaration, sym(6).Expression, sym(8).Statement);
node->forToken = loc(1);
@@ -1363,14 +1394,14 @@ case 272: {
sym(1).Node = node;
} break;
-case 274: {
+case 279: {
AST::ContinueStatement *node = makeAstNode<AST::ContinueStatement> (driver->nodePool());
node->continueToken = loc(1);
node->semicolonToken = loc(2);
sym(1).Node = node;
} break;
-case 276: {
+case 281: {
AST::ContinueStatement *node = makeAstNode<AST::ContinueStatement> (driver->nodePool(), sym(2).sval);
node->continueToken = loc(1);
node->identifierToken = loc(2);
@@ -1378,14 +1409,14 @@ case 276: {
sym(1).Node = node;
} break;
-case 278: {
+case 283: {
AST::BreakStatement *node = makeAstNode<AST::BreakStatement> (driver->nodePool());
node->breakToken = loc(1);
node->semicolonToken = loc(2);
sym(1).Node = node;
} break;
-case 280: {
+case 285: {
AST::BreakStatement *node = makeAstNode<AST::BreakStatement> (driver->nodePool(), sym(2).sval);
node->breakToken = loc(1);
node->identifierToken = loc(2);
@@ -1393,14 +1424,14 @@ case 280: {
sym(1).Node = node;
} break;
-case 282: {
+case 287: {
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 283: {
+case 288: {
AST::WithStatement *node = makeAstNode<AST::WithStatement> (driver->nodePool(), sym(3).Expression, sym(5).Statement);
node->withToken = loc(1);
node->lparenToken = loc(2);
@@ -1408,7 +1439,7 @@ case 283: {
sym(1).Node = node;
} break;
-case 284: {
+case 289: {
AST::SwitchStatement *node = makeAstNode<AST::SwitchStatement> (driver->nodePool(), sym(3).Expression, sym(5).CaseBlock);
node->switchToken = loc(1);
node->lparenToken = loc(2);
@@ -1416,90 +1447,90 @@ case 284: {
sym(1).Node = node;
} break;
-case 285: {
+case 290: {
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 286: {
+case 291: {
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 287: {
+case 292: {
sym(1).Node = makeAstNode<AST::CaseClauses> (driver->nodePool(), sym(1).CaseClause);
} break;
-case 288: {
+case 293: {
sym(1).Node = makeAstNode<AST::CaseClauses> (driver->nodePool(), sym(1).CaseClauses, sym(2).CaseClause);
} break;
-case 289: {
+case 294: {
sym(1).Node = 0;
} break;
-case 290: {
+case 295: {
sym(1).Node = sym(1).CaseClauses->finish ();
} break;
-case 291: {
+case 296: {
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 292: {
+case 297: {
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 293:
-case 294: {
+case 298:
+case 299: {
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 295: {
+case 300: {
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 297: {
+case 302: {
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 298: {
+case 303: {
AST::TryStatement *node = makeAstNode<AST::TryStatement> (driver->nodePool(), sym(2).Statement, sym(3).Catch);
node->tryToken = loc(1);
sym(1).Node = node;
} break;
-case 299: {
+case 304: {
AST::TryStatement *node = makeAstNode<AST::TryStatement> (driver->nodePool(), sym(2).Statement, sym(3).Finally);
node->tryToken = loc(1);
sym(1).Node = node;
} break;
-case 300: {
+case 305: {
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 301: {
+case 306: {
AST::Catch *node = makeAstNode<AST::Catch> (driver->nodePool(), sym(3).sval, sym(5).Block);
node->catchToken = loc(1);
node->lparenToken = loc(2);
@@ -1508,20 +1539,20 @@ case 301: {
sym(1).Node = node;
} break;
-case 302: {
+case 307: {
AST::Finally *node = makeAstNode<AST::Finally> (driver->nodePool(), sym(2).Block);
node->finallyToken = loc(1);
sym(1).Node = node;
} break;
-case 304: {
+case 309: {
AST::DebuggerStatement *node = makeAstNode<AST::DebuggerStatement> (driver->nodePool());
node->debuggerToken = loc(1);
node->semicolonToken = loc(2);
sym(1).Node = node;
} break;
-case 305: {
+case 310: {
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);
@@ -1532,7 +1563,7 @@ case 305: {
sym(1).Node = node;
} break;
-case 306: {
+case 311: {
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)
@@ -1544,56 +1575,56 @@ case 306: {
sym(1).Node = node;
} break;
-case 307: {
+case 312: {
AST::FormalParameterList *node = makeAstNode<AST::FormalParameterList> (driver->nodePool(), sym(1).sval);
node->identifierToken = loc(1);
sym(1).Node = node;
} break;
-case 308: {
+case 313: {
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 309: {
+case 314: {
sym(1).Node = 0;
} break;
-case 310: {
+case 315: {
sym(1).Node = sym(1).FormalParameterList->finish ();
} break;
-case 311: {
+case 316: {
sym(1).Node = 0;
} break;
-case 313: {
+case 318: {
sym(1).Node = makeAstNode<AST::FunctionBody> (driver->nodePool(), sym(1).SourceElements->finish ());
} break;
-case 314: {
+case 319: {
sym(1).Node = makeAstNode<AST::SourceElements> (driver->nodePool(), sym(1).SourceElement);
} break;
-case 315: {
+case 320: {
sym(1).Node = makeAstNode<AST::SourceElements> (driver->nodePool(), sym(1).SourceElements, sym(2).SourceElement);
} break;
-case 316: {
+case 321: {
sym(1).Node = makeAstNode<AST::StatementSourceElement> (driver->nodePool(), sym(1).Statement);
} break;
-case 317: {
+case 322: {
sym(1).Node = makeAstNode<AST::FunctionSourceElement> (driver->nodePool(), sym(1).FunctionDeclaration);
} break;
-case 318: {
+case 323: {
sym(1).sval = 0;
} break;
-case 320: {
+case 325: {
sym(1).Node = 0;
} break;
diff --git a/src/declarative/qml/parser/qmljsparser_p.h b/src/declarative/qml/parser/qmljsparser_p.h
index cd2c7f5..55b76cf 100644
--- a/src/declarative/qml/parser/qmljsparser_p.h
+++ b/src/declarative/qml/parser/qmljsparser_p.h
@@ -109,6 +109,7 @@ public:
AST::UiProgram *UiProgram;
AST::UiImportList *UiImportList;
AST::UiImport *UiImport;
+ AST::UiParameterList *UiParameterList;
AST::UiPublicMember *UiPublicMember;
AST::UiObjectDefinition *UiObjectDefinition;
AST::UiObjectInitializer *UiObjectInitializer;
@@ -197,9 +198,9 @@ protected:
-#define J_SCRIPT_REGEXPLITERAL_RULE1 54
+#define J_SCRIPT_REGEXPLITERAL_RULE1 59
-#define J_SCRIPT_REGEXPLITERAL_RULE2 55
+#define J_SCRIPT_REGEXPLITERAL_RULE2 60
QT_END_NAMESPACE
diff --git a/src/declarative/qml/qmlbasicscript.cpp b/src/declarative/qml/qmlbasicscript.cpp
index 8f25ea4..0cfb587 100644
--- a/src/declarative/qml/qmlbasicscript.cpp
+++ b/src/declarative/qml/qmlbasicscript.cpp
@@ -137,9 +137,6 @@ QDebug operator<<(QDebug lhs, const QmlBasicScriptNodeCache &rhs)
case QmlBasicScriptNodeCache::Attached:
lhs << "Attached" << rhs.object << rhs.attached;
break;
- case QmlBasicScriptNodeCache::Signal:
- lhs << "Signal" << rhs.object << rhs.core;
- break;
case QmlBasicScriptNodeCache::SignalProperty:
lhs << "SignalProperty" << rhs.object << rhs.core;
break;
@@ -276,10 +273,6 @@ QVariant QmlBasicScriptNodeCache::value(const char *) const
case Attached:
return qVariantFromValue(static_cast<QObject *>(attached));
break;
- case Signal:
- // XXX
- Q_ASSERT(!"Not implemented");
- break;
case SignalProperty:
break;
case Variant:
diff --git a/src/declarative/qml/qmlbasicscript_p.h b/src/declarative/qml/qmlbasicscript_p.h
index c7ab280..0c69397 100644
--- a/src/declarative/qml/qmlbasicscript_p.h
+++ b/src/declarative/qml/qmlbasicscript_p.h
@@ -124,7 +124,6 @@ public:
enum { Invalid,
Core,
Attached,
- Signal,
SignalProperty,
Variant
} type;
diff --git a/src/declarative/qml/qmlcompiler.cpp b/src/declarative/qml/qmlcompiler.cpp
index 3353838..bb9f90c 100644
--- a/src/declarative/qml/qmlcompiler.cpp
+++ b/src/declarative/qml/qmlcompiler.cpp
@@ -1451,7 +1451,14 @@ bool QmlCompiler::compileDynamicMeta(QmlParser::Object *obj)
for (int ii = 0; ii < obj->dynamicSignals.count(); ++ii) {
const Object::DynamicSignal &s = obj->dynamicSignals.at(ii);
- builder.addSignal(s.name + "()");
+ QByteArray sig(s.name + "(");
+ for (int jj = 0; jj < s.parameterTypes.count(); ++jj) {
+ if (jj) sig.append(",");
+ sig.append(s.parameterTypes.at(jj));
+ }
+ sig.append(")");
+ QMetaMethodBuilder b = builder.addSignal(sig);
+ b.setParameterNames(s.parameterNames);
}
int slotStart = obj->dynamicSlots.isEmpty()?-1:output->primitives.count();
diff --git a/src/declarative/qml/qmlcomponent.cpp b/src/declarative/qml/qmlcomponent.cpp
index 0fd65d3..d6b38c9 100644
--- a/src/declarative/qml/qmlcomponent.cpp
+++ b/src/declarative/qml/qmlcomponent.cpp
@@ -372,6 +372,29 @@ QList<QmlError> QmlComponent::errors() const
}
/*!
+ Return the list of errors that occured during the last compile or create
+ operation, as a single string. An empty string is returned if isError()
+ is not set.
+
+ This function is similar to errors(), except more useful when called from
+ QML. C++ code should usually use errors().
+
+ \sa errors()
+*/
+QString QmlComponent::errorsString() const
+{
+ Q_D(const QmlComponent);
+ QString ret;
+ if(!isError())
+ return ret;
+ foreach(const QmlError &e, d->errors){
+ ret += e.url().toString() + ":" + QString::number(e.line()) + " "
+ + e.description() + "\n";
+ }
+ return ret;
+}
+
+/*!
Return the component URL. This is the URL passed to either the constructor,
or the loadUrl() or setData() methods.
*/
diff --git a/src/declarative/qml/qmlcomponent.h b/src/declarative/qml/qmlcomponent.h
index db34e16..b29c123 100644
--- a/src/declarative/qml/qmlcomponent.h
+++ b/src/declarative/qml/qmlcomponent.h
@@ -82,6 +82,7 @@ public:
Q_INVOKABLE bool isLoading() const;
QList<QmlError> errors() const;
+ Q_INVOKABLE QString errorsString() const;
QUrl url() const;
diff --git a/src/declarative/qml/qmlengine.cpp b/src/declarative/qml/qmlengine.cpp
index d6bc537..ad3f4b6 100644
--- a/src/declarative/qml/qmlengine.cpp
+++ b/src/declarative/qml/qmlengine.cpp
@@ -82,14 +82,6 @@ DEFINE_BOOL_CONFIG_OPTION(qmlDebugger, QML_DEBUGGER)
QML_DEFINE_TYPE(QObject,Object)
-static QScriptValue qmlMetaProperty_emit(QScriptContext *ctx, QScriptEngine *engine)
-{
- QmlMetaProperty mp = qscriptvalue_cast<QmlMetaProperty>(ctx->thisObject());
- if (mp.type() & QmlMetaProperty::Signal)
- mp.emitSignal();
- return engine->nullValue();
-}
-
struct StaticQtMetaObject : public QObject
{
static const QMetaObject *get()
@@ -143,11 +135,6 @@ QmlEnginePrivate::QmlEnginePrivate(QmlEngine *e)
: rootContext(0), currentBindContext(0), currentExpression(0), q(e),
rootComponent(0), networkAccessManager(0), typeManager(e), uniqueId(1)
{
- QScriptValue proto = scriptEngine.newObject();
- proto.setProperty(QLatin1String("emit"),
- scriptEngine.newFunction(qmlMetaProperty_emit));
- scriptEngine.setDefaultPrototype(qMetaTypeId<QmlMetaProperty>(), proto);
-
QScriptValue qtObject = scriptEngine.newQMetaObject(StaticQtMetaObject::get());
scriptEngine.globalObject().setProperty(QLatin1String("Qt"), qtObject);
}
@@ -278,22 +265,18 @@ QScriptValue QmlEnginePrivate::propertyObject(const QScriptString &propName,
if (!prop.isValid())
return QScriptValue();
- if (prop.type() & QmlMetaProperty::Signal) {
- return scriptEngine.newVariant(qVariantFromValue(prop));
+ QVariant var = prop.read();
+ if (prop.needsChangedNotifier())
+ capturedProperties << CapturedProperty(prop);
+ QObject *varobj = QmlMetaType::toQObject(var);
+ if (!varobj)
+ varobj = qvariant_cast<QObject *>(var);
+ if (varobj) {
+ return scriptEngine.newObject(objectClass, scriptEngine.newVariant(QVariant::fromValue(varobj)));
} else {
- QVariant var = prop.read();
- if (prop.needsChangedNotifier())
- capturedProperties << CapturedProperty(prop);
- QObject *varobj = QmlMetaType::toQObject(var);
- if (!varobj)
- varobj = qvariant_cast<QObject *>(var);
- if (varobj) {
- return scriptEngine.newObject(objectClass, scriptEngine.newVariant(QVariant::fromValue(varobj)));
- } else {
- if (var.type() == QVariant::Bool)
- return QScriptValue(&scriptEngine, var.toBool());
- return scriptEngine.newVariant(var);
- }
+ if (var.type() == QVariant::Bool)
+ return QScriptValue(&scriptEngine, var.toBool());
+ return scriptEngine.newVariant(var);
}
}
@@ -358,13 +341,6 @@ bool QmlEnginePrivate::fetchCache(QmlBasicScriptNodeCache &cache, const QString
cache.core = prop.coreIndex();
return true;
- } else if (prop.type() & QmlMetaProperty::Signal) {
-
- cache.object = obj;
- cache.type = QmlBasicScriptNodeCache::Signal;
- cache.core = prop.coreIndex();
- return true;
-
}
return false;
@@ -859,6 +835,7 @@ QScriptValue QmlEngine::qmlScriptObject(QObject* object, QmlEngine* engine)
sprite = component.createObject();
if(sprite == 0){
// Error Handling
+ print(component.errorsString());
}else{
sprite.parent = page;
sprite.x = 200;
@@ -866,7 +843,9 @@ QScriptValue QmlEngine::qmlScriptObject(QObject* object, QmlEngine* engine)
}
\endcode
- \sa QmlComponent::createObject()
+ If you want to just create an arbitrary string of QML, instead of
+ loading a qml file, consider the evalQML() function.
+ \sa QmlComponent::createObject(), QmlEngine::createQMLObject()
*/
QScriptValue QmlEngine::createComponent(QScriptContext *ctxt, QScriptEngine *engine)
{
@@ -876,6 +855,8 @@ QScriptValue QmlEngine::createComponent(QScriptContext *ctxt, QScriptEngine *eng
if(ctxt->argumentCount() != 1 || !activeEngine){
c = new QmlComponent(activeEngine);
}else{
+ //### This url needs to be resolved in the context that the function
+ //### is called - it can't be done here.
QUrl url = QUrl(ctxt->argument(0).toString());
c = new QmlComponent(activeEngine, url, activeEngine);
}
@@ -892,6 +873,14 @@ QScriptValue QmlEngine::createComponent(QScriptContext *ctxt, QScriptEngine *eng
Returns the created object, or null if there is an error. In the case of an
error, details of the error are output using qWarning().
+
+ Note that this function returns immediately, and therefore may not work if
+ the QML loads new components. If you are trying to load a new component,
+ for example from a QML file, consider the createComponent() function
+ instead. 'New components' refers to external QML files that have not yet
+ been loaded, and so it is safe to use evalQml to load built-in components.
+
+ \sa QmlEngine::createComponent()
*/
QScriptValue QmlEngine::createQMLObject(QScriptContext *ctxt, QScriptEngine *engine)
{
diff --git a/src/declarative/qml/qmlmetaproperty.cpp b/src/declarative/qml/qmlmetaproperty.cpp
index a2138c9..90acd72 100644
--- a/src/declarative/qml/qmlmetaproperty.cpp
+++ b/src/declarative/qml/qmlmetaproperty.cpp
@@ -243,15 +243,6 @@ void QmlMetaProperty::initProperty(QObject *obj, const QString &name)
}
if (!d->name.isEmpty())
d->type = Property;
-
- if (d->type == Invalid) {
- int sig = findSignal(obj, name.toLatin1());
- if (sig != -1) {
- d->signal = obj->metaObject()->method(sig);
- d->type = Signal;
- d->coreIdx = sig;
- }
- }
}
/*!
@@ -284,7 +275,6 @@ QmlMetaProperty::QmlMetaProperty(const QmlMetaProperty &other)
\value Invalid The property is invalid.
\value Property The property is a regular Qt property.
\value SignalProperty The property is a signal property.
- \value Signal The property is a signal.
\value Default The property is the default property.
\value Attached The property is an attached property.
*/
@@ -583,26 +573,6 @@ QmlBindableValue *QmlMetaProperty::setBinding(QmlBindableValue *binding) const
return 0;
}
-/*! \internal */
-int QmlMetaProperty::findSignal(const QObject *obj, const char *name)
-{
- const QMetaObject *mo = obj->metaObject();
- int methods = mo->methodCount();
- for (int ii = 0; ii < methods; ++ii) {
- QMetaMethod method = mo->method(ii);
- if (method.methodType() != QMetaMethod::Signal)
- continue;
-
- QByteArray methodName = method.signature();
- int idx = methodName.indexOf('(');
- methodName = methodName.left(idx);
-
- if (methodName == name)
- return ii;
- }
- return -1;
-}
-
void QmlMetaPropertyPrivate::findSignalInt(QObject *obj, const QString &name)
{
const QMetaObject *mo = obj->metaObject();
@@ -958,17 +928,6 @@ bool QmlMetaProperty::connectNotifier(QObject *dest, const char *slot) const
}
}
-/*! \internal */
-void QmlMetaProperty::emitSignal()
-{
- if (type() & Signal) {
- if (d->signal.parameterTypes().isEmpty())
- d->object->metaObject()->activate(d->object, d->coreIdx, 0);
- else
- qWarning() << "QmlMetaProperty: Cannot emit signal with parameters";
- }
-}
-
/*!
Return the Qt metaobject index of the property.
*/
@@ -1019,7 +978,7 @@ void QmlMetaProperty::restore(quint32 id, QObject *obj)
d->name = QLatin1String(p.name());
d->propType = p.propertyType;
d->coreIdx = id;
- } else if (d->type & SignalProperty || d->type & Signal) {
+ } else if (d->type & SignalProperty) {
d->signal = obj->metaObject()->method(id);
d->coreIdx = id;
}
diff --git a/src/declarative/qml/qmlmetaproperty.h b/src/declarative/qml/qmlmetaproperty.h
index 6c28a86..688c4fd 100644
--- a/src/declarative/qml/qmlmetaproperty.h
+++ b/src/declarative/qml/qmlmetaproperty.h
@@ -86,7 +86,6 @@ public:
QVariant read() const;
void write(const QVariant &) const;
- void emitSignal();
bool hasChangedNotifier() const;
bool needsChangedNotifier() const;
@@ -101,7 +100,6 @@ public:
enum Type { Invalid = 0x00,
Property = 0x01,
SignalProperty = 0x02,
- Signal = 0x04,
Default = 0x08,
Attached = 0x10 };
@@ -126,7 +124,6 @@ public:
QmlBindableValue *binding() const;
QmlBindableValue *setBinding(QmlBindableValue *) const;
- static int findSignal(const QObject *, const char *);
static QmlMetaProperty createProperty(QObject *, const QString &);
int coreIndex() const;
diff --git a/src/declarative/qml/qmlparser.cpp b/src/declarative/qml/qmlparser.cpp
index e9dedf8..2e7eb69 100644
--- a/src/declarative/qml/qmlparser.cpp
+++ b/src/declarative/qml/qmlparser.cpp
@@ -123,7 +123,8 @@ QmlParser::Object::DynamicSignal::DynamicSignal()
}
QmlParser::Object::DynamicSignal::DynamicSignal(const DynamicSignal &o)
-: name(o.name)
+: name(o.name), parameterTypes(o.parameterTypes),
+ parameterNames(o.parameterNames)
{
}
diff --git a/src/declarative/qml/qmlparser_p.h b/src/declarative/qml/qmlparser_p.h
index 3aab066..9daa336 100644
--- a/src/declarative/qml/qmlparser_p.h
+++ b/src/declarative/qml/qmlparser_p.h
@@ -157,6 +157,8 @@ namespace QmlParser
DynamicSignal(const DynamicSignal &);
QByteArray name;
+ QList<QByteArray> parameterTypes;
+ QList<QByteArray> parameterNames;
};
struct DynamicSlot {
DynamicSlot();
diff --git a/src/declarative/qml/qmlscriptparser.cpp b/src/declarative/qml/qmlscriptparser.cpp
index 1f31e54..a256978 100644
--- a/src/declarative/qml/qmlscriptparser.cpp
+++ b/src/declarative/qml/qmlscriptparser.cpp
@@ -479,35 +479,59 @@ bool ProcessAST::visit(AST::UiImport *node)
bool ProcessAST::visit(AST::UiPublicMember *node)
{
+ const struct TypeNameToType {
+ const char *name;
+ Object::DynamicProperty::Type type;
+ const char *qtName;
+ } propTypeNameToTypes[] = {
+ { "int", Object::DynamicProperty::Int, "int" },
+ { "bool", Object::DynamicProperty::Bool, "bool" },
+ { "double", Object::DynamicProperty::Real, "double" },
+ { "real", Object::DynamicProperty::Real, "qreal" },
+ { "string", Object::DynamicProperty::String, "QString" },
+ { "url", Object::DynamicProperty::Url, "QUrl" },
+ { "color", Object::DynamicProperty::Color, "QColor" },
+ { "date", Object::DynamicProperty::Date, "QDate" },
+ { "var", Object::DynamicProperty::Variant, "QVariant" },
+ { "variant", Object::DynamicProperty::Variant, "QVariant" }
+ };
+ const int propTypeNameToTypesCount = sizeof(propTypeNameToTypes) /
+ sizeof(propTypeNameToTypes[0]);
+
if(node->type == AST::UiPublicMember::Signal) {
const QString name = node->name->asString();
Object::DynamicSignal signal;
signal.name = name.toUtf8();
+ AST::UiParameterList *p = node->parameters;
+ while (p) {
+ const QString memberType = p->type->asString();
+ const char *qtType = 0;
+ for(int ii = 0; !qtType && ii < propTypeNameToTypesCount; ++ii) {
+ if(QLatin1String(propTypeNameToTypes[ii].name) == memberType)
+ qtType = propTypeNameToTypes[ii].qtName;
+ }
+
+ if (!qtType) {
+ QmlError error;
+ error.setDescription(QCoreApplication::translate("QmlParser","Expected parameter type"));
+ error.setLine(node->typeToken.startLine);
+ error.setColumn(node->typeToken.startColumn);
+ _parser->_errors << error;
+ return false;
+ }
+
+ signal.parameterTypes << qtType;
+ signal.parameterNames << p->name->asString().toUtf8();
+ p = p->finish();
+ }
+
_stateStack.top().object->dynamicSignals << signal;
} else {
const QString memberType = node->memberType->asString();
const QString name = node->name->asString();
- const struct TypeNameToType {
- const char *name;
- Object::DynamicProperty::Type type;
- } propTypeNameToTypes[] = {
- { "int", Object::DynamicProperty::Int },
- { "bool", Object::DynamicProperty::Bool },
- { "double", Object::DynamicProperty::Real },
- { "real", Object::DynamicProperty::Real },
- { "string", Object::DynamicProperty::String },
- { "url", Object::DynamicProperty::Url },
- { "color", Object::DynamicProperty::Color },
- { "date", Object::DynamicProperty::Date },
- { "var", Object::DynamicProperty::Variant },
- { "variant", Object::DynamicProperty::Variant }
- };
- const int propTypeNameToTypesCount = sizeof(propTypeNameToTypes) /
- sizeof(propTypeNameToTypes[0]);
-
bool typeFound = false;
Object::DynamicProperty::Type type;
for(int ii = 0; !typeFound && ii < propTypeNameToTypesCount; ++ii) {
diff --git a/src/declarative/qml/qmlvmemetaobject.cpp b/src/declarative/qml/qmlvmemetaobject.cpp
index 3b784a4..ec269b8 100644
--- a/src/declarative/qml/qmlvmemetaobject.cpp
+++ b/src/declarative/qml/qmlvmemetaobject.cpp
@@ -168,7 +168,10 @@ int QmlVMEMetaObject::metaCall(QMetaObject::Call c, int id, void **a)
return id;
}
} else if(c == QMetaObject::InvokeMetaMethod) {
- if(id >= baseSlot && id < (baseSlot + slotCount)) {
+ if (id >= baseSig && (baseSlot == -1 || id < baseSlot)) {
+ QMetaObject::activate(object, id, a);
+ return id;
+ } else if (id >= baseSlot && id < (baseSlot + slotCount)) {
int idx = id - baseSlot + slotDataIdx;
QmlContext *ctxt = qmlContext(object);
QmlExpression expr(ctxt, slotData->at(idx), object);
generated by cgit v0.12 at 2024-11-21 18:44:18 (GMT)