diff options
| author | Warwick Allison <warwick.allison@nokia.com> | 2009-07-23 05:47:43 (GMT) |
|---|---|---|
| committer | Warwick Allison <warwick.allison@nokia.com> | 2009-07-23 05:47:43 (GMT) |
| commit | 5054fafde6b32003c8c00877f2579c611d1524f3 (patch) | |
| tree | 9f79976f970095706e82d7d65b068c1e7b728d97 /src/declarative | |
| parent | dd652f37353a01e0172e20f1e7ef24b001a281db (diff) | |
| parent | dc68651b60b552e010735903e45328f8ebf18f69 (diff) | |
| download | Qt-5054fafde6b32003c8c00877f2579c611d1524f3.zip Qt-5054fafde6b32003c8c00877f2579c611d1524f3.tar.gz Qt-5054fafde6b32003c8c00877f2579c611d1524f3.tar.bz2 | |
Merge branch 'kinetic-declarativeui' of git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
Diffstat (limited to 'src/declarative')
38 files changed, 2013 insertions, 1106 deletions
diff --git a/src/declarative/extra/qmlxmllistmodel.cpp b/src/declarative/extra/qmlxmllistmodel.cpp index b1ad127..077e9a9 100644 --- a/src/declarative/extra/qmlxmllistmodel.cpp +++ b/src/declarative/extra/qmlxmllistmodel.cpp @@ -616,6 +616,7 @@ void QmlXmlListModel::requestFinished() { Q_D(QmlXmlListModel); if (d->reply->error() != QNetworkReply::NoError) { + disconnect(d->reply, 0, this, 0); d->reply->deleteLater(); d->reply = 0; d->status = Error; @@ -623,6 +624,7 @@ void QmlXmlListModel::requestFinished() d->status = Idle; QByteArray data = d->reply->readAll(); d->queryId = d->qmlXmlQuery.doQuery(d->query, d->namespaces, data, &d->roleObjects); + disconnect(d->reply, 0, this, 0); d->reply->deleteLater(); d->reply = 0; } diff --git a/src/declarative/qml/parser/qmljs.g b/src/declarative/qml/parser/qmljs.g index 20ee27d..d7fb17c 100644 --- a/src/declarative/qml/parser/qmljs.g +++ b/src/declarative/qml/parser/qmljs.g @@ -81,6 +81,8 @@ %token T_RESERVED_WORD "reserved word" %token T_MULTILINE_STRING_LITERAL "multiline string literal" +%token T_AT "@" + --- context keywords. %token T_PUBLIC "public" %token T_IMPORT "import" @@ -271,6 +273,8 @@ public: AST::UiObjectMemberList *UiObjectMemberList; AST::UiArrayMemberList *UiArrayMemberList; AST::UiQualifiedId *UiQualifiedId; + AST::UiAttributeList *UiAttributeList; + AST::UiAttribute *UiAttribute; }; public: @@ -667,25 +671,93 @@ case $rule_number: { } break; ./ -UiRootMember: UiObjectDefinition ; +UiRootMember: UiAnnotation UiObjectDefinition ; +/. +case $rule_number: { + sym(1).Node = makeAstNode<AST::UiObjectMemberList> (driver->nodePool(), + sym(1).UiAttributeList, sym(2).UiObjectMember); +} break; +./ + +UiAnnotation: Empty ; +UiAnnotation: UiAttributeList ; +/. +case $rule_number: { + sym(1).UiAttributeList = sym(1).UiAttributeList->finish(); +} break; +./ + +UiAttributeList: UiAttribute ; +/. +case $rule_number: { + sym(1).UiAttributeList = makeAstNode<AST::UiAttributeList>(driver->nodePool(), sym(1).UiAttribute); +} break; +./ + +UiAttributeList: UiAttributeList UiAttribute ; +/. +case $rule_number: { + sym(1).UiAttributeList = makeAstNode<AST::UiAttributeList>(driver->nodePool(), + sym(1).UiAttributeList, sym(2).UiAttribute); +} break; +./ + +UiAttributeName: JsIdentifier ; +UiAttributeName: ReservedIdentifier ; + +UiAttribute: T_AT UiAttributeName ; +/. +case $rule_number: { + AST::UiAttribute *ast = makeAstNode<AST::UiAttribute>(driver->nodePool(), sym(2).sval); + ast->atToken = loc(1); + ast->nameToken = loc(2); + sym(1).UiAttribute = ast; +} break; +./ + +UiAttribute: T_AT UiAttributeName T_EQ UiAttributeValue ; +/. +case $rule_number: { + AST::UiAttribute *ast = makeAstNode<AST::UiAttribute>(driver->nodePool(), + sym(2).sval, sym(4).Expression); + ast->atToken = loc(1); + ast->nameToken = loc(2); + ast->equalToken = loc(3); + sym(1).UiAttribute = ast; +} break; +./ + +UiAttributeValue: UiAttributeName ; +/. +case $rule_number: { + AST::IdentifierExpression *node = makeAstNode<AST::IdentifierExpression> (driver->nodePool(), sym(1).sval); + node->identifierToken = loc(1); + sym(1).Node = node; +} break; +./ + +UiAttributeValue: T_NUMERIC_LITERAL ; /. case $rule_number: { - sym(1).Node = makeAstNode<AST::UiObjectMemberList> (driver->nodePool(), sym(1).UiObjectMember); + AST::NumericLiteral *node = makeAstNode<AST::NumericLiteral> (driver->nodePool(), sym(1).dval, lexer->flags); + node->literalToken = loc(1); + sym(1).Node = node; } break; ./ -UiObjectMemberList: UiObjectMember ; +UiObjectMemberList: UiAnnotation UiObjectMember ; /. case $rule_number: { - sym(1).Node = makeAstNode<AST::UiObjectMemberList> (driver->nodePool(), sym(1).UiObjectMember); + sym(1).Node = makeAstNode<AST::UiObjectMemberList> (driver->nodePool(), + sym(1).UiAttributeList, sym(2).UiObjectMember); } break; ./ -UiObjectMemberList: UiObjectMemberList UiObjectMember ; +UiObjectMemberList: UiObjectMemberList UiAnnotation UiObjectMember ; /. case $rule_number: { AST::UiObjectMemberList *node = makeAstNode<AST:: UiObjectMemberList> (driver->nodePool(), - sym(1).UiObjectMemberList, sym(2).UiObjectMember); + sym(1).UiObjectMemberList, sym(2).UiAttributeList, sym(3).UiObjectMember); sym(1).Node = node; } break; ./ @@ -697,9 +769,18 @@ case $rule_number: { } break; ./ -UiArrayMemberList: UiArrayMemberList T_COMMA UiObjectDefinition ; +UiArrayMemberList: UiAttributeList UiObjectDefinition ; +/. +case $rule_number: { + sym(2).UiObjectMember->attributes = sym(1).UiAttributeList->finish(); + sym(1).Node = makeAstNode<AST::UiArrayMemberList> (driver->nodePool(), sym(2).UiObjectMember); +} break; +./ + +UiArrayMemberList: UiArrayMemberList T_COMMA UiAnnotation UiObjectDefinition ; /. case $rule_number: { + sym(4).UiObjectMember->attributes = sym(3).UiAttributeList; AST::UiArrayMemberList *node = makeAstNode<AST::UiArrayMemberList> (driver->nodePool(), sym(1).UiArrayMemberList, sym(3).UiObjectMember); node->commaToken = loc(2); diff --git a/src/declarative/qml/parser/qmljsast.cpp b/src/declarative/qml/parser/qmljsast.cpp index d10c071..fb4ea8a 100644 --- a/src/declarative/qml/parser/qmljsast.cpp +++ b/src/declarative/qml/parser/qmljsast.cpp @@ -839,9 +839,29 @@ void UiProgram::accept0(Visitor *visitor) visitor->endVisit(this); } +void UiAttributeList::accept0(Visitor *visitor) +{ + if (visitor->visit(this)) { + for (UiAttributeList *it = this; it; it = it->next) + acceptChild(it->attribute, visitor); + } + + visitor->endVisit(this); +} + +void UiAttribute::accept0(Visitor *visitor) +{ + if (visitor->visit(this)) { + acceptChild(value, visitor); + } + + visitor->endVisit(this); +} + void UiPublicMember::accept0(Visitor *visitor) { if (visitor->visit(this)) { + acceptChild(attributes, visitor); acceptChild(expression, visitor); } @@ -851,6 +871,7 @@ void UiPublicMember::accept0(Visitor *visitor) void UiObjectDefinition::accept0(Visitor *visitor) { if (visitor->visit(this)) { + acceptChild(attributes, visitor); acceptChild(qualifiedTypeNameId, visitor); acceptChild(initializer, visitor); } @@ -871,6 +892,7 @@ void UiObjectInitializer::accept0(Visitor *visitor) void UiObjectBinding::accept0(Visitor *visitor) { if (visitor->visit(this)) { + acceptChild(attributes, visitor); acceptChild(qualifiedId, visitor); acceptChild(qualifiedTypeNameId, visitor); acceptChild(initializer, visitor); @@ -882,6 +904,7 @@ void UiObjectBinding::accept0(Visitor *visitor) void UiScriptBinding::accept0(Visitor *visitor) { if (visitor->visit(this)) { + acceptChild(attributes, visitor); acceptChild(qualifiedId, visitor); acceptChild(statement, visitor); } @@ -892,6 +915,7 @@ void UiScriptBinding::accept0(Visitor *visitor) void UiArrayBinding::accept0(Visitor *visitor) { if (visitor->visit(this)) { + acceptChild(attributes, visitor); acceptChild(qualifiedId, visitor); for (UiArrayMemberList *it = members; it; it = it->next) acceptChild(it->member, visitor); @@ -949,6 +973,7 @@ void UiImportList::accept0(Visitor *visitor) void UiSourceElement::accept0(Visitor *visitor) { if (visitor->visit(this)) { + acceptChild(attributes, visitor); acceptChild(sourceElement, visitor); } diff --git a/src/declarative/qml/parser/qmljsast_p.h b/src/declarative/qml/parser/qmljsast_p.h index 6d269ac..73b2cbc 100644 --- a/src/declarative/qml/parser/qmljsast_p.h +++ b/src/declarative/qml/parser/qmljsast_p.h @@ -104,7 +104,7 @@ enum Op { } // namespace QSOperator -namespace QmlJS { +namespace QmlJS { class NameId; namespace AST { @@ -213,7 +213,9 @@ public: Kind_UiPublicMember, Kind_UiQualifiedId, Kind_UiScriptBinding, - Kind_UiSourceElement + Kind_UiSourceElement, + Kind_UiAttributeList, + Kind_UiAttribute }; inline Node() @@ -2181,6 +2183,56 @@ public: UiObjectMemberList *members; }; +class UiAttributeList: public Node +{ +public: + QMLJS_DECLARE_AST_NODE(UiAttributeList) + + UiAttributeList(UiAttribute *attribute) + : attribute(attribute), next(this) + { kind = K; } + + UiAttributeList(UiAttributeList *previous, UiAttribute *attribute) + : attribute(attribute) + { + next = previous->next; + previous->next = this; + kind = K; + } + + UiAttributeList *finish() + { + UiAttributeList *head = next; + next = 0; + return head; + } + + virtual void accept0(Visitor *visitor); + +// attributes + UiAttribute *attribute; + UiAttributeList *next; +}; + +class UiAttribute: public Node +{ +public: + QMLJS_DECLARE_AST_NODE(UiAttribute) + + UiAttribute(NameId *name, ExpressionNode *value = 0) + : name(name), value(value) + { kind = K; } + + virtual void accept0(Visitor *visitor); + +// attributes + NameId *name; + ExpressionNode *value; + SourceLocation atToken; + SourceLocation nameToken; + SourceLocation equalToken; +}; + class UiQualifiedId: public Node { public: @@ -2279,6 +2331,9 @@ class UiObjectMember: public Node public: virtual SourceLocation firstSourceLocation() const = 0; virtual SourceLocation lastSourceLocation() const = 0; + +// attributes + UiAttributeList *attributes; }; class UiObjectMemberList: public Node @@ -2286,16 +2341,21 @@ class UiObjectMemberList: public Node public: QMLJS_DECLARE_AST_NODE(UiObjectMemberList) - UiObjectMemberList(UiObjectMember *member) + UiObjectMemberList(UiAttributeList *attributes, UiObjectMember *member) : next(this), member(member) - { kind = K; } + { + kind = K; + member->attributes = attributes; + } - UiObjectMemberList(UiObjectMemberList *previous, UiObjectMember *member) + UiObjectMemberList(UiObjectMemberList *previous, UiAttributeList *attributes, + UiObjectMember *member) : member(member) { kind = K; next = previous->next; previous->next = this; + member->attributes = attributes; } virtual void accept0(Visitor *visitor); diff --git a/src/declarative/qml/parser/qmljsastfwd_p.h b/src/declarative/qml/parser/qmljsastfwd_p.h index 339bea4..18b3704 100644 --- a/src/declarative/qml/parser/qmljsastfwd_p.h +++ b/src/declarative/qml/parser/qmljsastfwd_p.h @@ -176,6 +176,8 @@ class UiObjectMember; class UiObjectMemberList; class UiArrayMemberList; class UiQualifiedId; +class UiAttributeList; +class UiAttribute; } } // namespace AST diff --git a/src/declarative/qml/parser/qmljsastvisitor_p.h b/src/declarative/qml/parser/qmljsastvisitor_p.h index 3677b1a..c2486d7 100644 --- a/src/declarative/qml/parser/qmljsastvisitor_p.h +++ b/src/declarative/qml/parser/qmljsastvisitor_p.h @@ -82,6 +82,8 @@ public: virtual bool visit(UiObjectMemberList *) { return true; } virtual bool visit(UiArrayMemberList *) { return true; } virtual bool visit(UiQualifiedId *) { return true; } + virtual bool visit(UiAttributeList *) { return true; } + virtual bool visit(UiAttribute *) { return true; } virtual void endVisit(UiProgram *) {} virtual void endVisit(UiImportList *) {} @@ -96,6 +98,8 @@ public: virtual void endVisit(UiObjectMemberList *) {} virtual void endVisit(UiArrayMemberList *) {} virtual void endVisit(UiQualifiedId *) {} + virtual void endVisit(UiAttributeList *) {} + virtual void endVisit(UiAttribute *) {} // QmlJS virtual bool visit(ThisExpression *) { return true; } diff --git a/src/declarative/qml/parser/qmljsgrammar.cpp b/src/declarative/qml/parser/qmljsgrammar.cpp index 1b23be6..13a68c8 100644 --- a/src/declarative/qml/parser/qmljsgrammar.cpp +++ b/src/declarative/qml/parser/qmljsgrammar.cpp @@ -51,393 +51,428 @@ const char *const QmlJSGrammar::spell [] = { "||", "+", "+=", "++", "?", "}", "]", "%", "%=", "return", ")", ";", 0, "*", "*=", "string literal", "property", "signal", "switch", "this", "throw", "~", "try", "typeof", "var", "void", "while", "with", "^", "^=", - "null", "true", "false", "const", "debugger", "reserved word", "multiline string literal", "public", "import", "as", - 0, 0, 0, 0, 0}; + "null", "true", "false", "const", "debugger", "reserved word", "multiline string literal", "@", "public", "import", + "as", 0, 0, 0, 0, 0}; const int QmlJSGrammar::lhs [] = { - 95, 95, 95, 96, 99, 99, 102, 102, 103, 103, - 103, 103, 103, 103, 103, 103, 103, 103, 103, 103, - 101, 100, 107, 107, 109, 109, 110, 110, 106, 108, - 108, 108, 108, 108, 108, 108, 115, 115, 115, 116, - 116, 117, 117, 108, 108, 108, 108, 108, 108, 108, - 108, 108, 108, 108, 108, 105, 105, 104, 104, 104, - 120, 120, 120, 120, 120, 120, 120, 120, 120, 120, - 120, 120, 120, 120, 120, 120, 120, 120, 105, 105, - 122, 122, 122, 122, 121, 121, 124, 124, 126, 126, - 126, 126, 126, 126, 127, 127, 127, 127, 127, 127, - 127, 127, 127, 127, 127, 127, 127, 127, 127, 127, - 127, 127, 127, 127, 127, 127, 127, 127, 127, 127, - 127, 127, 127, 127, 127, 128, 128, 129, 129, 129, - 129, 129, 132, 132, 133, 133, 133, 133, 131, 131, - 134, 134, 135, 135, 136, 136, 136, 137, 137, 137, - 137, 137, 137, 137, 137, 137, 137, 138, 138, 138, - 138, 139, 139, 139, 140, 140, 140, 140, 141, 141, - 141, 141, 141, 141, 141, 142, 142, 142, 142, 142, - 142, 143, 143, 143, 143, 143, 144, 144, 144, 144, - 144, 145, 145, 146, 146, 147, 147, 148, 148, 149, - 149, 150, 150, 151, 151, 152, 152, 153, 153, 154, - 154, 155, 155, 156, 156, 125, 125, 157, 157, 158, - 158, 158, 158, 158, 158, 158, 158, 158, 158, 158, - 158, 98, 98, 159, 159, 160, 160, 161, 161, 97, - 97, 97, 97, 97, 97, 97, 97, 97, 97, 97, - 97, 97, 97, 97, 111, 173, 173, 172, 172, 119, - 119, 174, 174, 175, 175, 177, 177, 176, 178, 181, - 179, 179, 182, 180, 180, 112, 113, 113, 114, 114, - 162, 162, 162, 162, 162, 162, 162, 163, 163, 163, - 163, 164, 164, 164, 164, 165, 165, 166, 168, 183, - 183, 186, 186, 184, 184, 187, 185, 167, 167, 167, - 169, 169, 170, 170, 170, 188, 189, 171, 171, 118, - 130, 193, 193, 190, 190, 191, 191, 194, 195, 195, - 196, 196, 192, 192, 123, 123, 197}; + 96, 96, 96, 97, 100, 100, 103, 103, 104, 104, + 104, 104, 104, 104, 104, 104, 104, 104, 104, 104, + 102, 101, 107, 107, 109, 109, 111, 111, 110, 110, + 113, 113, 114, 114, 116, 116, 116, 117, 117, 108, + 115, 115, 115, 115, 115, 115, 115, 122, 122, 122, + 123, 123, 124, 124, 115, 115, 115, 115, 115, 115, + 115, 115, 115, 115, 115, 115, 106, 106, 105, 105, + 105, 127, 127, 127, 127, 127, 127, 127, 127, 127, + 127, 127, 127, 127, 127, 127, 127, 127, 127, 106, + 106, 129, 129, 129, 129, 128, 128, 131, 131, 133, + 133, 133, 133, 133, 133, 112, 112, 112, 112, 112, + 112, 112, 112, 112, 112, 112, 112, 112, 112, 112, + 112, 112, 112, 112, 112, 112, 112, 112, 112, 112, + 112, 112, 112, 112, 112, 112, 134, 134, 135, 135, + 135, 135, 135, 138, 138, 139, 139, 139, 139, 137, + 137, 140, 140, 141, 141, 142, 142, 142, 143, 143, + 143, 143, 143, 143, 143, 143, 143, 143, 144, 144, + 144, 144, 145, 145, 145, 146, 146, 146, 146, 147, + 147, 147, 147, 147, 147, 147, 148, 148, 148, 148, + 148, 148, 149, 149, 149, 149, 149, 150, 150, 150, + 150, 150, 151, 151, 152, 152, 153, 153, 154, 154, + 155, 155, 156, 156, 157, 157, 158, 158, 159, 159, + 160, 160, 161, 161, 162, 162, 132, 132, 163, 163, + 164, 164, 164, 164, 164, 164, 164, 164, 164, 164, + 164, 164, 99, 99, 165, 165, 166, 166, 167, 167, + 98, 98, 98, 98, 98, 98, 98, 98, 98, 98, + 98, 98, 98, 98, 98, 118, 179, 179, 178, 178, + 126, 126, 180, 180, 181, 181, 183, 183, 182, 184, + 187, 185, 185, 188, 186, 186, 119, 120, 120, 121, + 121, 168, 168, 168, 168, 168, 168, 168, 169, 169, + 169, 169, 170, 170, 170, 170, 171, 171, 172, 174, + 189, 189, 192, 192, 190, 190, 193, 191, 173, 173, + 173, 175, 175, 176, 176, 176, 194, 195, 177, 177, + 125, 136, 199, 199, 196, 196, 197, 197, 200, 201, + 201, 202, 202, 198, 198, 130, 130, 203}; const int QmlJSGrammar:: rhs[] = { 2, 2, 2, 2, 1, 1, 1, 2, 3, 3, 5, 5, 3, 3, 4, 4, 6, 6, 5, 5, - 0, 1, 1, 2, 1, 3, 2, 3, 2, 1, - 5, 4, 3, 3, 3, 3, 1, 1, 1, 0, - 1, 2, 4, 5, 2, 4, 4, 5, 5, 6, - 6, 7, 7, 1, 1, 1, 1, 1, 1, 1, + 0, 2, 1, 1, 1, 2, 1, 1, 2, 4, + 1, 1, 2, 3, 1, 2, 4, 2, 3, 2, + 1, 5, 4, 3, 3, 3, 3, 1, 1, 1, + 0, 1, 2, 4, 5, 2, 4, 4, 5, 5, + 6, 6, 7, 7, 1, 1, 1, 1, 1, 1, 1, 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, 2, 3, 3, 4, 5, 3, 4, 3, 1, + 3, 1, 2, 3, 4, 1, 2, 3, 5, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, - 1, 1, 1, 1, 1, 1, 1, 1, 1, 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, + 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, 1, 3, 1, 2, 0, 1, 3, - 3, 1, 1, 1, 3, 1, 3, 2, 2, 2, - 0, 1, 2, 0, 1, 1, 2, 2, 7, 5, - 7, 7, 5, 9, 10, 7, 8, 2, 2, 3, - 3, 2, 2, 3, 3, 3, 3, 5, 5, 3, - 5, 1, 2, 0, 1, 4, 3, 3, 3, 3, - 3, 3, 3, 3, 4, 5, 2, 2, 2, 8, - 8, 1, 3, 0, 1, 0, 1, 1, 1, 2, - 1, 1, 0, 1, 0, 1, 2}; + 1, 1, 1, 3, 0, 1, 1, 3, 0, 1, + 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 3, 1, 2, 0, 1, + 3, 3, 1, 1, 1, 3, 1, 3, 2, 2, + 2, 0, 1, 2, 0, 1, 1, 2, 2, 7, + 5, 7, 7, 5, 9, 10, 7, 8, 2, 2, + 3, 3, 2, 2, 3, 3, 3, 3, 5, 5, + 3, 5, 1, 2, 0, 1, 4, 3, 3, 3, + 3, 3, 3, 3, 3, 4, 5, 2, 2, 2, + 8, 8, 1, 3, 0, 1, 0, 1, 1, 1, + 2, 1, 1, 0, 1, 0, 1, 2}; const int QmlJSGrammar::action_default [] = { - 0, 0, 0, 21, 0, 165, 232, 196, 204, 200, - 144, 216, 192, 3, 129, 62, 145, 208, 212, 133, - 162, 143, 148, 128, 182, 169, 0, 69, 70, 65, - 333, 58, 335, 0, 0, 0, 0, 67, 0, 0, - 63, 66, 0, 0, 59, 60, 68, 61, 0, 64, - 0, 0, 158, 0, 0, 145, 164, 147, 146, 0, - 0, 0, 160, 161, 159, 163, 0, 193, 0, 0, - 0, 0, 183, 0, 0, 0, 0, 0, 0, 173, - 0, 0, 0, 167, 168, 166, 171, 175, 174, 172, - 170, 185, 184, 186, 0, 201, 0, 197, 0, 0, - 139, 126, 138, 127, 95, 96, 97, 122, 98, 123, - 99, 100, 101, 102, 103, 104, 105, 106, 107, 108, - 109, 110, 111, 124, 112, 113, 114, 115, 116, 117, - 118, 119, 120, 121, 125, 0, 0, 137, 233, 140, - 0, 141, 0, 142, 136, 0, 229, 222, 220, 227, - 228, 226, 225, 231, 224, 223, 221, 230, 217, 0, - 205, 0, 0, 209, 0, 0, 213, 0, 0, 139, - 131, 0, 130, 0, 135, 149, 0, 334, 324, 325, - 0, 322, 0, 323, 0, 326, 240, 247, 246, 254, - 242, 0, 243, 327, 0, 332, 244, 245, 250, 248, - 329, 328, 331, 251, 0, 262, 0, 0, 0, 0, - 333, 58, 0, 335, 59, 234, 276, 60, 0, 0, - 0, 263, 0, 0, 252, 253, 0, 241, 249, 277, - 278, 321, 330, 0, 292, 293, 294, 295, 0, 288, - 289, 290, 291, 318, 319, 0, 0, 0, 0, 0, - 281, 282, 238, 236, 198, 206, 202, 218, 194, 239, - 0, 145, 210, 214, 187, 176, 0, 0, 195, 0, - 0, 0, 0, 188, 0, 0, 0, 0, 0, 180, - 178, 181, 179, 177, 190, 189, 191, 0, 203, 0, - 199, 0, 237, 145, 0, 219, 234, 235, 0, 234, - 0, 0, 284, 0, 0, 0, 286, 0, 207, 0, - 0, 211, 0, 0, 215, 274, 0, 266, 275, 269, - 0, 273, 0, 234, 267, 0, 234, 0, 0, 285, - 0, 0, 0, 287, 334, 324, 0, 0, 326, 0, - 320, 0, 310, 0, 0, 0, 280, 0, 279, 0, - 336, 0, 94, 256, 259, 0, 95, 262, 98, 123, - 100, 101, 65, 105, 106, 58, 107, 110, 63, 66, - 59, 234, 60, 68, 113, 61, 115, 64, 117, 118, - 263, 120, 121, 125, 0, 87, 0, 0, 89, 93, - 91, 77, 90, 92, 0, 88, 76, 257, 255, 133, - 134, 139, 0, 132, 0, 309, 0, 296, 297, 0, - 308, 0, 0, 0, 299, 304, 302, 305, 0, 0, - 303, 304, 0, 300, 0, 301, 258, 307, 0, 258, - 306, 0, 311, 312, 0, 258, 313, 314, 0, 0, - 315, 0, 0, 0, 316, 317, 151, 150, 0, 0, - 0, 283, 0, 0, 0, 298, 271, 264, 0, 272, - 268, 0, 270, 260, 0, 261, 265, 81, 0, 0, - 85, 71, 0, 73, 83, 0, 74, 84, 86, 75, - 82, 72, 0, 78, 155, 153, 157, 154, 152, 156, - 2, 5, 0, 7, 6, 0, 1, 79, 56, 57, + 0, 0, 0, 21, 0, 176, 243, 207, 215, 211, + 155, 227, 203, 3, 140, 73, 156, 219, 223, 144, + 173, 154, 159, 139, 193, 180, 0, 80, 81, 76, + 344, 69, 346, 0, 0, 0, 0, 78, 0, 0, + 74, 77, 0, 0, 70, 71, 79, 72, 0, 75, + 0, 0, 169, 0, 0, 156, 175, 158, 157, 0, + 0, 0, 171, 172, 170, 174, 0, 204, 0, 0, + 0, 0, 194, 0, 0, 0, 0, 0, 0, 184, + 0, 0, 0, 178, 179, 177, 182, 186, 185, 183, + 181, 196, 195, 197, 0, 212, 0, 208, 0, 0, + 150, 137, 149, 138, 106, 107, 108, 133, 109, 134, + 110, 111, 112, 113, 114, 115, 116, 117, 118, 119, + 120, 121, 122, 135, 123, 124, 125, 126, 127, 128, + 129, 130, 131, 132, 136, 0, 0, 148, 244, 151, + 0, 152, 0, 153, 147, 0, 240, 233, 231, 238, + 239, 237, 236, 242, 235, 234, 232, 241, 228, 0, + 216, 0, 0, 220, 0, 0, 224, 0, 0, 150, + 142, 0, 141, 0, 146, 160, 0, 345, 335, 336, + 0, 333, 0, 334, 0, 337, 251, 258, 257, 265, + 253, 0, 254, 338, 0, 343, 255, 256, 261, 259, + 340, 339, 342, 262, 0, 273, 0, 0, 0, 0, + 344, 69, 0, 346, 70, 245, 287, 71, 0, 0, + 0, 274, 0, 0, 263, 264, 0, 252, 260, 288, + 289, 332, 341, 0, 303, 304, 305, 306, 0, 299, + 300, 301, 302, 329, 330, 0, 0, 0, 0, 0, + 292, 293, 249, 247, 209, 217, 213, 229, 205, 250, + 0, 156, 221, 225, 198, 187, 0, 0, 206, 0, + 0, 0, 0, 199, 0, 0, 0, 0, 0, 191, + 189, 192, 190, 188, 201, 200, 202, 0, 214, 0, + 210, 0, 248, 156, 0, 230, 245, 246, 0, 245, + 0, 0, 295, 0, 0, 0, 297, 0, 218, 0, + 0, 222, 0, 0, 226, 285, 0, 277, 286, 280, + 0, 284, 0, 245, 278, 0, 245, 0, 0, 296, + 0, 0, 0, 298, 345, 335, 0, 0, 337, 0, + 331, 0, 321, 0, 0, 0, 291, 0, 290, 0, + 347, 0, 105, 267, 270, 0, 106, 273, 109, 134, + 111, 112, 76, 116, 117, 69, 118, 121, 74, 77, + 70, 245, 71, 79, 124, 72, 126, 75, 128, 129, + 274, 131, 132, 136, 0, 98, 0, 0, 100, 104, + 102, 88, 101, 103, 0, 99, 87, 268, 266, 144, + 145, 150, 0, 143, 0, 320, 0, 307, 308, 0, + 319, 0, 0, 0, 310, 315, 313, 316, 0, 0, + 314, 315, 0, 311, 0, 312, 269, 318, 0, 269, + 317, 0, 322, 323, 0, 269, 324, 325, 0, 0, + 326, 0, 0, 0, 327, 328, 162, 161, 0, 0, + 0, 294, 0, 0, 0, 309, 282, 275, 0, 283, + 279, 0, 281, 271, 0, 272, 276, 92, 0, 0, + 96, 82, 0, 84, 94, 0, 85, 95, 97, 86, + 93, 83, 0, 89, 166, 164, 168, 165, 163, 167, + 2, 5, 0, 7, 6, 21, 1, 90, 67, 68, 0, 0, 0, 9, 10, 0, 11, 12, 0, 13, - 0, 0, 14, 0, 19, 20, 80, 0, 15, 16, - 0, 17, 18, 8, 22, 0, 4, 0, 29, 54, - 0, 0, 59, 27, 60, 30, 23, 0, 0, 55, - 0, 39, 38, 37, 0, 0, 48, 0, 49, 0, - 52, 53, 0, 0, 0, 46, 0, 47, 0, 50, - 51, 45, 40, 41, 0, 0, 0, 0, 43, 44, - 42, 28, 24, 0, 33, 34, 0, 35, 36, 258, - 0, 32, 95, 262, 98, 123, 100, 101, 65, 105, - 106, 58, 107, 110, 63, 66, 59, 234, 60, 68, - 113, 61, 115, 64, 117, 118, 263, 120, 121, 125, - 62, 0, 25, 0, 31, 26, 337}; + 0, 0, 14, 0, 19, 20, 91, 0, 15, 16, + 0, 17, 18, 8, 23, 0, 0, 25, 24, 4, + 27, 28, 29, 0, 32, 31, 30, 22, 0, 21, + 40, 38, 0, 21, 65, 0, 0, 70, 71, 41, + 33, 0, 66, 0, 50, 49, 48, 0, 0, 59, + 0, 60, 0, 63, 64, 0, 0, 0, 57, 0, + 58, 0, 61, 62, 56, 51, 52, 0, 0, 0, + 0, 54, 55, 53, 0, 44, 45, 0, 46, 47, + 269, 0, 43, 106, 273, 109, 134, 111, 112, 76, + 116, 117, 69, 118, 121, 74, 77, 70, 245, 71, + 79, 124, 72, 126, 75, 128, 129, 274, 131, 132, + 136, 73, 0, 0, 35, 21, 42, 0, 37, 26, + 36, 39, 0, 34, 348}; const int QmlJSGrammar::goto_default [] = { - 4, 496, 353, 191, 495, 526, 491, 494, 493, 15, - 525, 535, 537, 536, 611, 528, 186, 190, 192, 196, - 553, 564, 563, 195, 227, 23, 469, 468, 351, 350, - 6, 349, 352, 102, 19, 14, 140, 21, 10, 139, - 16, 22, 52, 20, 5, 25, 24, 264, 12, 258, - 7, 254, 9, 256, 8, 255, 17, 262, 18, 263, - 11, 257, 253, 294, 406, 259, 260, 197, 188, 187, - 199, 228, 198, 203, 224, 225, 189, 355, 354, 226, - 458, 457, 316, 317, 460, 319, 459, 318, 414, 418, - 421, 417, 416, 436, 437, 180, 194, 176, 179, 193, - 201, 200, 0}; + 4, 496, 353, 191, 495, 529, 524, 494, 493, 15, + 538, 526, 549, 528, 527, 532, 352, 536, 543, 550, + 622, 540, 186, 190, 192, 196, 566, 577, 576, 195, + 227, 23, 469, 468, 351, 350, 6, 349, 102, 19, + 14, 140, 21, 10, 139, 16, 22, 52, 20, 5, + 25, 24, 264, 12, 258, 7, 254, 9, 256, 8, + 255, 17, 262, 18, 263, 11, 257, 253, 294, 406, + 259, 260, 197, 188, 187, 199, 228, 198, 203, 224, + 225, 189, 355, 354, 226, 458, 457, 316, 317, 460, + 319, 459, 318, 414, 418, 421, 417, 416, 436, 437, + 180, 194, 176, 179, 193, 201, 200, 0}; const int QmlJSGrammar::action_index [] = { - 208, 808, 1863, 61, 100, 76, -95, 95, 59, 54, - 261, -95, 405, 86, -95, -95, 641, 91, 67, 187, - 200, -95, -95, -95, 446, 206, 808, -95, -95, -95, - 188, -95, 1681, 1412, 808, 808, 808, -95, 724, 808, - -95, -95, 808, 808, -95, -95, -95, -95, 808, -95, - 808, 808, -95, 808, 808, 131, 212, -95, -95, 808, - 808, 808, -95, -95, -95, 157, 808, 405, 808, 808, - 808, 808, 471, 808, 808, 808, 808, 808, 808, 161, - 808, 808, 808, 112, 119, 117, 154, 178, 173, 234, - 233, 456, 549, 409, 808, 9, 808, 72, 1590, 808, - 808, -95, -95, -95, -95, -95, -95, -95, -95, -95, - -95, -95, -95, -95, -95, -95, -95, -95, -95, -95, - -95, -95, -95, -95, -95, -95, -95, -95, -95, -95, - -95, -95, -95, -95, -95, 139, 808, -95, -95, 66, - 23, -95, 808, -95, -95, 808, -95, -95, -95, -95, - -95, -95, -95, -95, -95, -95, -95, -95, -95, 808, - 33, 808, 808, 69, 57, 808, -95, 1590, 808, 808, - -95, 126, -95, 8, -95, -95, 29, -95, 186, 62, - 60, -95, 207, -95, 36, 1954, -95, -95, -95, -95, - -95, 205, -95, -95, 35, -95, -95, -95, -95, -95, - -95, 1954, -95, -95, 386, -95, 398, 77, 1863, 50, - 162, 78, 42, 2136, 73, 808, -95, 85, 48, 808, - 56, -95, 43, 39, -95, -95, 328, -95, -95, -95, - -95, -95, -95, 75, -95, -95, -95, -95, 84, -95, - -95, -95, -95, -95, -95, 38, 55, 808, 102, 79, - -95, -95, 892, -95, 175, 47, 34, -95, 324, 74, - 16, 551, 65, 68, 477, 278, 328, 808, 292, 808, - 808, 808, 808, 402, 808, 808, 808, 808, 808, 302, - 306, 303, 282, 307, 385, 477, 477, 808, -2, 808, - 71, 808, -95, 641, 808, -95, 808, 58, 63, 808, - 51, 1863, -95, 808, 147, 1863, -95, 808, 14, 808, - 808, 96, 92, 808, -95, 80, 105, 70, -95, -95, - 808, -95, 255, 808, -95, -58, 808, -39, 1863, -95, - 808, 120, 1863, -95, -20, 259, -47, -21, 1954, -36, - -95, 1863, -95, 808, 101, 1863, 11, 1863, -95, 15, - 3, -45, -95, -95, 1863, -54, 401, 2, 337, 116, - 808, 1863, 0, -32, 318, -1, -28, 724, 81, -5, - -95, 980, -95, 45, 19, 46, 808, 44, 17, 808, - 41, 808, 13, -8, 808, -95, 1772, 49, -95, -95, - -95, -95, -95, -95, 808, -95, -95, -95, -95, 272, - -95, 808, -13, -95, 1863, -95, 64, -95, -95, 1863, - -95, 808, 98, 4, -95, 25, -95, 31, 93, 808, - -95, 40, 37, -95, -12, -95, 1863, -95, 123, 1863, - -95, 288, -95, -95, 109, 1863, 20, -95, -4, 1, - -95, 328, -14, 21, -95, -95, -95, -95, 808, 115, - 1863, -95, 808, 125, 1863, -95, 12, -95, 185, -95, - -95, 808, -95, -95, 252, -95, -95, -95, 97, 1154, - -95, -95, 1067, -95, -95, 1241, -95, -95, -95, -95, - -95, -95, 94, -95, -95, -95, -95, -95, -95, -95, - -95, -95, 407, -95, -73, 376, -95, -95, -95, -95, - 179, 321, 198, -95, -95, 110, -95, -95, 227, -95, - 248, 228, -95, 89, -95, -95, -95, 219, -95, -95, - 103, -95, -95, -95, -95, 127, -95, 475, -95, -95, - -46, 168, 165, -95, -6, -95, -95, 500, 189, -95, - 158, -95, -95, -95, 32, 176, -95, 808, -95, 262, - -95, -95, 6, 10, 128, -95, 808, -95, 148, -95, - -95, 5, 145, 30, -3, 213, 177, 216, -95, -95, - -95, -95, -95, 1325, -95, -95, 327, -95, -95, 2045, - 1499, -95, 345, 26, 330, 82, 808, 1863, 28, 22, - 310, 52, 27, 584, 81, 53, -95, 980, -95, 24, - -31, -7, 808, 7, -9, 808, 18, 808, -10, -19, - -15, 111, -95, 334, -95, -95, -95, + 142, 814, 1973, 78, 97, 86, -96, 90, 73, 71, + 257, -96, 315, 92, -96, -96, 539, 93, 81, 277, + 242, -96, -96, -96, 453, 252, 814, -96, -96, -96, + 214, -96, 1789, 1076, 814, 814, 814, -96, 729, 814, + -96, -96, 814, 814, -96, -96, -96, -96, 814, -96, + 814, 814, -96, 814, 814, 109, 207, -96, -96, 814, + 814, 814, -96, -96, -96, 205, 814, 313, 814, 814, + 814, 814, 434, 814, 814, 814, 814, 814, 814, 184, + 814, 814, 814, 146, 149, 150, 189, 204, 328, 328, + 328, 552, 473, 463, 814, 40, 814, 87, 1605, 814, + 814, -96, -96, -96, -96, -96, -96, -96, -96, -96, + -96, -96, -96, -96, -96, -96, -96, -96, -96, -96, + -96, -96, -96, -96, -96, -96, -96, -96, -96, -96, + -96, -96, -96, -96, -96, 140, 814, -96, -96, 65, + 33, -96, 814, -96, -96, 814, -96, -96, -96, -96, + -96, -96, -96, -96, -96, -96, -96, -96, -96, 814, + 29, 814, 814, 63, 59, 814, -96, 1605, 814, 814, + -96, 96, -96, 15, -96, -96, 31, -96, 208, 60, + 20, -96, 249, -96, 49, 2065, -96, -96, -96, -96, + -96, 248, -96, -96, 44, -96, -96, -96, -96, -96, + -96, 2065, -96, -96, 377, -96, 387, 83, 1973, 58, + 234, 72, 66, 2249, 67, 814, -96, 69, 54, 814, + 53, -96, 51, 45, -96, -96, 283, -96, -96, -96, + -96, -96, -96, 104, -96, -96, -96, -96, 102, -96, + -96, -96, -96, -96, -96, 48, 47, 814, 117, 120, + -96, -96, 988, -96, 77, 57, 64, -96, 406, 76, + 61, 582, 176, 100, 479, 328, 269, 814, 311, 814, + 814, 814, 814, 397, 814, 814, 814, 814, 814, 328, + 328, 328, 328, 328, 345, 360, 341, 814, 39, 814, + 70, 814, -96, 645, 814, -96, 814, 62, 24, 814, + 12, 1973, -96, 814, 131, 1973, -96, 814, 68, 814, + 814, 176, 89, 814, -96, 75, 95, 38, -96, -96, + 814, -96, 273, 814, -96, 79, 814, 74, 1973, -96, + 814, 111, 1973, -96, -16, 279, -41, -12, 2065, -37, + -96, 1973, -96, 814, 119, 1973, 6, 1973, -96, 22, + 18, -32, -96, -96, 1973, -52, 352, -2, 394, 98, + 814, 1973, 82, -34, 308, -7, -30, 729, 2, 4, + -96, 903, -96, 0, -5, 27, 814, 42, 21, 814, + 46, 814, 16, 14, 814, -96, 1881, 52, -96, -96, + -96, -96, -96, -96, 814, -96, -96, -96, -96, 307, + -96, 814, -22, -96, 1973, -96, 107, -96, -96, 1973, + -96, 814, 125, 13, -96, 37, -96, 35, 88, 814, + -96, 34, 10, -96, -4, -96, 1973, -96, 103, 1973, + -96, 263, -96, -96, 108, 1973, -8, -96, 11, 25, + -96, 260, -36, -6, -96, -96, -96, -96, 814, 115, + 1973, -96, 814, 112, 1973, -96, 43, -96, 190, -96, + -96, 814, -96, -96, 194, -96, -96, -96, 99, 1164, + -96, -96, 1337, -96, -96, 1425, -96, -96, -96, -96, + -96, -96, 101, -96, -96, -96, -96, -96, -96, -96, + -96, -96, 408, -96, -54, -57, -96, -96, -96, -96, + 177, 332, 216, -96, -96, 132, -96, -96, 237, -96, + 221, 163, -96, 122, -96, -96, -96, 240, -96, -96, + 126, -96, -96, -96, -96, 1605, 343, -96, -86, -96, + -96, -96, -1, 1697, -96, -96, -96, -96, 159, 121, + -96, -96, 470, 118, -96, -38, 174, 170, 3, -96, + -96, 203, -96, 173, -96, -96, -96, 32, 151, -96, + 814, -96, 145, -96, -96, 5, 7, 223, -96, 814, + -96, 187, -96, -96, 19, 141, 17, -45, 230, 191, + 228, -96, -96, -96, 1249, -96, -96, 309, -96, -96, + 2157, 1513, -96, 338, 1, 369, 85, 814, 1973, 82, + 9, 285, 36, 8, 729, 30, 26, -96, 903, -96, + 50, 28, 56, 814, 55, 23, 814, 41, 814, -26, + -23, -29, 124, 454, -96, -73, -96, 374, -96, -96, + -96, -96, 460, -96, -96, - -103, 37, 13, -103, -103, -103, -103, -103, -103, -103, - -103, -103, -103, -103, -103, -103, -55, -103, -103, -103, - -103, -103, -103, -103, -103, -103, 89, -103, -103, -103, - 24, -103, -103, 6, 15, 92, 100, -103, 154, 66, - -103, -103, 86, 143, -103, -103, -103, -103, 152, -103, - 144, 140, -103, 134, 135, -103, -103, -103, -103, 161, - 170, 176, -103, -103, -103, -103, 174, -103, 169, 153, - 162, 167, -103, 128, 126, 112, 116, 119, 113, -103, - 111, 104, 110, -103, -103, -103, -103, -103, -103, -103, - -103, -103, -103, -103, 63, -103, 120, -103, 88, 77, - 57, -103, -103, -103, -103, -103, -103, -103, -103, -103, - -103, -103, -103, -103, -103, -103, -103, -103, -103, -103, - -103, -103, -103, -103, -103, -103, -103, -103, -103, -103, - -103, -103, -103, -103, -103, -103, 28, -103, -103, -103, - -103, -103, 31, -103, -103, 36, -103, -103, -103, -103, - -103, -103, -103, -103, -103, -103, -103, -103, -103, 157, - -103, 125, -24, -103, -103, -14, -103, 210, 27, 160, - -103, -103, -103, -103, -103, -103, -103, -103, 8, -103, - -103, -103, -5, -103, -103, 74, -103, -103, -103, -103, - -103, -103, -103, -103, -103, -103, -103, -103, -103, -103, - -103, 94, -103, -103, 44, -103, 35, -103, 81, -103, - 61, -103, -103, -103, -103, 75, -103, -103, -103, 4, - -7, -103, -103, -103, -103, -103, 26, -103, -103, -103, - -103, -103, -103, -103, -103, -103, -103, -103, -103, -103, - -103, -103, -103, -103, -103, -103, -103, 68, -103, -103, - -103, -103, 90, -103, -103, -103, -103, -103, -103, -103, - -103, -103, -103, -103, -103, -103, 70, 220, -103, 208, - 231, 230, 234, -103, 101, 82, 60, 76, 79, -103, - -103, -103, -103, -103, -103, -103, -103, 211, -103, 194, - -103, 192, -103, -103, 204, -103, 166, -103, -103, 197, - -103, 23, -103, -1, -103, 9, -103, 180, -103, 181, - 223, -103, -103, 227, -103, -103, -103, -103, -103, -103, - 184, -103, 93, 98, -103, -103, 108, -103, 83, -103, - 78, -103, 40, -103, -103, 109, -103, -103, 102, -103, - -103, 41, -103, 43, -103, 52, -103, 62, -103, -103, - -103, -103, -103, -103, 55, -103, 50, -103, 51, -103, - 107, 49, -103, -103, 73, -103, -103, 154, -103, -103, - -103, 64, -103, -103, -103, -103, 16, -103, 12, 147, - -103, 103, -103, -103, -4, -103, 0, -103, -103, -103, - -103, -103, -103, -103, 7, -103, -103, -103, -103, -103, - -103, 187, -103, -103, 25, -103, -103, -103, -103, 71, - -103, 65, -103, -103, -103, -103, -103, -44, -103, 46, - -103, -34, -103, -103, -103, -103, -21, -103, -103, -45, - -103, -103, -103, -103, -103, -103, -32, -103, -103, 53, - -103, 56, -103, 47, -103, -103, -103, -103, 42, -103, - 45, -103, 38, -103, 48, -103, -103, -103, -103, -103, - -103, 22, -103, -103, 124, -103, -103, -103, -103, 59, - -103, -103, 137, -103, -103, 54, -103, -103, -103, -103, - -103, -103, -103, -103, -103, -103, -103, -103, -103, -103, - -103, -103, 248, -103, -3, 114, -103, -103, -103, -103, - -103, -103, 5, -103, -103, -103, -103, -103, -8, -103, - 85, -103, -103, -103, -103, -103, -103, 11, -103, -103, - -103, -103, -103, -103, -103, -103, -103, 342, -103, -103, - -103, 29, -103, -103, -103, -103, -103, 273, -103, -103, - 3, -103, -103, -103, -103, -103, -103, 18, -103, -103, - -103, -103, -103, -103, -103, -103, 21, -103, -103, -103, - -103, -103, 2, -103, -103, 20, 14, 30, -103, -103, - -103, -103, -103, 284, -103, -103, -2, -103, -103, -103, - 222, -103, -9, -103, -6, -103, 96, 10, -103, -103, - 1, -103, -103, 80, -103, -103, -103, 72, -103, -103, - -103, -103, 69, -103, 58, 67, -103, 97, -103, -103, - -103, -103, -103, 84, -103, -103, -103}; + -108, 7, 100, -6, -108, -108, -108, -108, -108, -108, + -108, -108, -108, -108, -108, -108, -40, -108, -108, -108, + -108, -108, -108, -108, -108, -108, 103, -108, -108, -108, + 32, -108, -108, 27, 37, 80, 79, -108, 89, 159, + -108, -108, 167, 162, -108, -108, -108, -108, 156, -108, + 163, 155, -108, 178, 173, -108, -108, -108, -108, 170, + 177, 180, -108, -108, -108, -108, 116, -108, 119, 112, + 137, 111, -108, 110, 108, 121, 145, 149, 148, -108, + 135, 132, 123, -108, -108, -108, -108, -108, -108, -108, + -108, -108, -108, -108, 130, -108, 128, -108, 143, 43, + 40, -108, -108, -108, -108, -108, -108, -108, -108, -108, + -108, -108, -108, -108, -108, -108, -108, -108, -108, -108, + -108, -108, -108, -108, -108, -108, -108, -108, -108, -108, + -108, -108, -108, -108, -108, -108, 53, -108, -108, -108, + -108, -108, 54, -108, -108, 55, -108, -108, -108, -108, + -108, -108, -108, -108, -108, -108, -108, -108, -108, 106, + -108, 131, -19, -108, -108, -29, -108, 231, 13, 175, + -108, -108, -108, -108, -108, -108, -108, -108, 30, -108, + -108, -108, 3, -108, -108, 18, -108, -108, -108, -108, + -108, -108, -108, -108, -108, -108, -108, -108, -108, -108, + -108, 91, -108, -108, 44, -108, 49, -108, 50, -108, + 57, -108, -108, -108, -108, 59, -108, -108, -108, 56, + 39, -108, -108, -108, -108, -108, 77, -108, -108, -108, + -108, -108, -108, -108, -108, -108, -108, -108, -108, -108, + -108, -108, -108, -108, -108, -108, -108, 24, -108, -108, + -108, -108, 85, -108, -108, -108, -108, -108, -108, -108, + -108, -108, -108, -108, -108, -108, 17, 206, -108, 240, + 232, 205, 209, -108, 96, 84, 93, 95, 87, -108, + -108, -108, -108, -108, -108, -108, -108, 236, -108, 217, + -108, 185, -108, -108, 233, -108, 136, -108, -108, 176, + -108, 0, -108, 8, -108, 41, -108, 184, -108, 187, + 203, -108, -108, 196, -108, -108, -108, -108, -108, -108, + 230, -108, 101, 98, -108, -108, 151, -108, 46, -108, + 52, -108, 65, -108, -108, 113, -108, -108, 90, -108, + -108, 62, -108, 66, -108, 63, -108, 42, -108, -108, + -108, -108, -108, -108, 81, -108, 68, -108, 70, -108, + 74, 83, -108, -108, 45, -108, -108, 78, -108, -108, + -108, 47, -108, -108, -108, -108, 10, -108, -21, 163, + -108, 61, -108, -108, -2, -108, -16, -108, -108, -108, + -108, -108, -108, -108, 21, -108, -108, -108, -108, -108, + -108, 82, -108, -108, 31, -108, -108, -108, -108, 4, + -108, 5, -108, -108, -108, -108, -108, -83, -108, 72, + -108, -13, -108, -108, -108, -108, -26, -108, -108, -22, + -108, -108, -108, -108, -108, -108, -11, -108, -108, -3, + -108, 73, -108, 58, -108, -108, -108, -108, 71, -108, + 69, -108, 67, -108, 76, -108, -108, -108, -108, -108, + -108, 36, -108, -108, 88, -108, -108, -108, -108, 51, + -108, -108, 75, -108, -108, 48, -108, -108, -108, -108, + -108, -108, -108, -108, -108, -108, -108, -108, -108, -108, + -108, -108, 104, -108, 60, -108, -108, -108, -108, -108, + -108, -108, 64, -108, -108, -108, -108, -108, 33, -108, + 6, -108, -108, -108, -108, -108, -108, 9, -108, -108, + -108, -108, -108, -108, -108, 169, 262, -108, 11, -108, + -108, -108, -108, 227, -108, -108, -108, -108, -108, 12, + -108, -108, 278, -8, -108, -108, -5, -108, -108, -108, + -108, -108, -108, -17, -108, -108, -108, -108, -108, -108, + 2, -108, -108, -108, -108, -108, -108, -108, -108, 35, + -108, -108, -108, -108, -108, 23, -108, -108, 26, 25, + 38, -108, -108, -108, 288, -108, -108, 16, -108, -108, + -108, 361, -108, 20, -108, 15, -108, 97, 28, -108, + -108, 22, -108, -108, 94, -108, -108, -108, 29, -108, + -108, -108, -108, 19, -108, 14, 163, -108, 102, -108, + -108, -108, -108, 219, -108, 34, -108, 86, -108, -108, + -108, -108, 286, -108, -108}; const int QmlJSGrammar::action_info [] = { - -114, 398, -93, 326, 252, 411, -89, -103, 343, -122, - 396, 386, 338, 337, -116, 492, 335, 452, -79, 340, - 540, 328, 384, 561, 435, -119, 448, 347, 452, 461, - 419, -92, 441, -122, 435, -103, 419, 415, 566, 554, - 439, 562, 335, 425, 426, 419, 443, 403, -119, 448, - 435, -116, -92, -114, 435, 411, 394, 569, 252, -89, - -93, 545, 287, 343, 165, 178, 136, 307, 174, 185, - 182, 159, 267, 66, 142, 452, 289, 296, 343, 448, - 404, 94, 291, 144, 411, 341, 252, 96, -111, 435, - 231, 247, 409, 159, 136, 287, 66, 320, 307, 313, - 616, 330, 136, 422, 0, 472, 136, 94, 0, 136, - 136, 301, 289, 322, 246, 438, 53, 161, 309, 613, - 184, 162, 310, 136, 299, 408, 407, 54, 136, 439, - 429, 136, 96, 136, 136, 556, 237, 236, 244, 243, - 251, 250, 510, 244, 243, 242, 241, 136, 423, 492, - 515, 514, 53, 473, 483, 136, 136, 53, 413, 53, - 527, 345, 249, 54, 522, 521, 323, 614, 54, 59, - 54, 507, 506, 57, 541, 450, 267, 244, 243, 80, - 332, 81, 172, 547, 58, 454, 80, 541, 81, 557, - 555, 31, 82, 464, 541, 137, 573, 31, 80, 82, - 81, 0, 167, 80, 510, 81, 541, 305, 0, 560, - 559, 82, 59, 136, 60, 31, 82, 31, 0, 543, - 61, 168, 527, 169, 59, 0, 0, 31, 44, 45, - 542, 80, 543, 81, 44, 45, 31, 548, 546, 543, - 504, 503, 31, 542, 82, 31, 465, 463, 31, 0, - 542, 543, 44, 45, 44, 45, 31, 60, 80, 80, - 81, 81, 542, 61, 44, 45, 230, 229, 502, 60, - 136, 82, 82, 44, 45, 61, 98, 31, 0, 44, - 45, 31, 44, 45, 31, 44, 45, 167, 31, 519, - 518, 0, 0, 44, 45, 99, 136, 100, 3, 2, - 1, 0, 0, 80, 0, 81, 168, 80, 401, 81, - 269, 270, 0, 0, 44, 45, 82, 517, 44, 45, - 82, 44, 45, 551, 550, 44, 45, 80, 80, 81, - 81, 80, 80, 81, 81, 136, 510, 271, 272, 31, - 82, 82, 269, 270, 82, 82, -333, 31, 0, 433, - 432, 0, 0, 0, -333, 0, 0, 31, 0, 31, - 527, 0, 0, 31, 0, 0, 31, 0, 511, 271, - 272, 0, 0, 0, 31, 0, 44, 45, 0, 0, - 0, 0, 512, 509, 44, 45, 0, 0, 230, 229, - 0, 240, 239, 499, 44, 45, 44, 45, 240, 239, - 44, 45, 0, 44, 45, 31, 235, 234, 274, 275, - 508, 44, 45, 0, 0, 31, 0, 276, 0, 498, - 277, 0, 278, 68, 69, 274, 275, 31, 0, 0, - 31, 0, 73, 74, 276, 499, 31, 277, 0, 278, - 75, 76, 44, 45, 77, 0, 78, 235, 234, 0, - 70, 71, 44, 45, 0, 0, 0, 0, 0, 240, - 239, 498, 235, 234, 44, 45, 499, 44, 45, 73, - 74, 0, 500, 44, 45, 0, 0, 75, 76, 73, - 74, 77, 0, 78, 0, 530, 0, 75, 76, 0, - 0, 77, 498, 78, 73, 74, 0, 531, 0, 0, - 274, 275, 75, 76, 31, 0, 77, 0, 78, 276, - 530, 0, 277, 0, 278, 0, 0, 0, 0, 0, - 0, 0, 531, 0, 0, 0, 0, 0, 0, 31, - 533, 0, 0, 0, 499, 0, 0, 0, 0, 0, - 0, 532, 534, 0, 0, 0, 0, 0, 0, 221, - 0, 0, 0, 0, 146, 571, 0, 0, 205, 499, - 498, 0, 0, 0, 147, 0, 532, 534, 148, 0, - 0, 0, 73, 74, 221, 0, 0, 149, 0, 150, - 75, 76, 303, 205, 77, 498, 78, 0, 0, 0, - 151, 0, 152, 57, 0, 0, 27, 28, 0, 0, - 153, 0, 0, 154, 58, 0, 30, 0, 0, 155, - 0, 0, 0, 31, 0, 156, 0, 32, 33, 0, - 34, 0, 0, 0, 0, 0, 0, 38, 0, 0, - 157, 41, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 146, 0, 0, 0, 0, 46, - 44, 45, 0, 47, 147, 0, 0, 0, 148, 0, - 0, 0, 0, 0, 40, 49, 29, 149, 0, 150, - 37, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 151, 0, 152, 57, 0, 0, 0, 0, 0, 0, - 153, 0, 0, 154, 58, 0, 0, 0, 0, 155, - 0, 0, 0, 0, 0, 156, 0, 0, 0, 0, + -100, 525, 252, 398, -90, -133, 343, -103, -133, -122, + 448, -104, 439, 452, 525, 582, 533, 426, 340, 337, + 335, 338, 347, 396, 443, 579, 386, 435, 553, 384, + 525, 411, 574, -104, -125, 492, 567, -122, 403, 419, + 419, 335, 419, -100, 343, 252, 415, 441, -130, -127, + 452, 425, 448, -130, 435, 575, 435, -103, 435, 394, + 461, 558, -127, -125, 411, 159, 165, 178, 182, 330, + 136, 267, 301, 142, 404, 174, 409, 94, 267, 341, + 184, 452, 185, 247, 291, 299, 435, 448, 66, -114, + 411, 66, 320, 144, 252, 159, 313, 634, 422, 231, + 136, 0, 343, 322, 136, 287, 0, 472, 0, 136, + 429, 136, 0, 0, 438, 0, 287, 289, 96, 136, + 136, 94, 296, 136, 246, 136, 53, 136, 439, 0, + 0, 161, 625, 136, 328, 162, 0, 54, 0, 136, + 326, 0, 289, 423, 244, 243, 244, 243, 136, 96, + 309, 57, 172, 136, 310, 473, 323, 0, 560, 244, + 243, 483, 58, 242, 241, 237, 236, 492, 408, 407, + 554, 332, 454, 631, 510, 450, 541, 249, 307, 345, + 626, 251, 250, 515, 514, 413, 53, 522, 521, 53, + 53, 305, 539, 507, 506, 136, 137, 54, 464, 554, + 54, 54, 554, 31, 0, 525, 564, 563, 525, 80, + 584, 81, 561, 559, 80, 556, 81, 59, 510, 59, + 554, 0, 82, 31, 519, 518, 555, 82, 0, 80, + 569, 81, 0, 3, 2, 1, 539, 31, 504, 503, + 44, 45, 82, 31, 556, 31, 0, 556, 573, 572, + 31, 465, 463, 517, 59, 555, 136, 31, 555, 31, + 44, 45, 60, 31, 60, 556, 31, 502, 61, 31, + 61, 136, 98, 0, 44, 45, 555, 80, 31, 81, + 44, 45, 44, 45, 570, 568, 0, 44, 45, 31, + 82, 99, 167, 100, 44, 45, 44, 45, 31, 60, + 44, 45, 31, 44, 45, 61, 44, 45, 31, 230, + 229, 168, 31, 169, 31, 44, 45, 136, 0, 0, + 0, -344, 167, 0, 433, 432, 44, 45, 0, 269, + 270, 68, 69, 68, 69, 44, 45, 31, 0, 44, + 45, 168, 539, 401, -344, 44, 45, 510, 0, 44, + 45, 44, 45, 80, 0, 81, 271, 272, 70, 71, + 70, 71, 0, 0, 274, 275, 82, 31, 274, 275, + 230, 229, 31, 276, 44, 45, 277, 276, 278, 511, + 277, 31, 278, 274, 275, 0, 0, 0, 0, 0, + 0, 0, 276, 512, 509, 277, 0, 278, 31, 235, + 234, 0, 499, 31, 44, 45, 31, 0, 0, 44, + 45, 0, 0, 235, 234, 0, 31, 0, 44, 45, + 274, 275, 508, 31, 269, 270, 0, 0, 498, 276, + 240, 239, 277, 499, 278, 44, 45, 31, 235, 234, + 44, 45, 0, 44, 45, 0, 0, 0, 240, 239, + 0, 271, 272, 44, 45, 240, 239, 73, 74, 498, + 44, 45, 0, 0, 0, 75, 76, 499, 0, 77, + 545, 78, 0, 500, 44, 45, 73, 74, 0, 0, + 545, 0, 546, 31, 75, 76, 73, 74, 77, 31, + 78, 0, 546, 498, 75, 76, 73, 74, 77, 31, + 78, 0, 274, 275, 75, 76, 0, 0, 77, 0, + 78, 276, 0, 499, 277, 0, 278, 0, 0, 499, + 44, 45, 0, 0, 0, 0, 547, 548, 0, 499, + 0, 0, 0, 0, 221, 0, 547, 548, 0, 498, + 0, 525, 146, 205, 221, 498, 0, 0, 0, 0, + 0, 0, 147, 205, 0, 498, 148, 0, 0, 0, + 0, 0, 0, 0, 0, 149, 0, 150, 0, 0, + 0, 0, 0, 0, 0, 73, 74, 0, 151, 0, + 152, 57, 0, 75, 76, 146, 0, 77, 153, 78, + 0, 154, 58, 0, 0, 147, 0, 155, 0, 148, + 0, 0, 0, 156, 0, 0, 0, 0, 149, 0, + 150, 0, 0, 303, 0, 0, 0, 0, 157, 0, + 0, 151, 0, 152, 57, 0, 0, 0, 0, 0, + 0, 153, 0, 0, 154, 58, 0, 0, 0, 0, + 155, 0, 0, 0, 0, 0, 156, 0, 146, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 147, 0, + 0, 157, 148, 0, 0, 0, 0, 0, 0, 0, + 0, 149, 0, 150, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 151, 0, 152, 57, 0, 0, + 0, 0, 0, 0, 153, 0, 0, 154, 58, 0, + 0, 0, 0, 155, 0, 0, 0, 0, 0, 156, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 157, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 27, 28, 0, 0, + 0, 0, 0, 0, 157, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 27, 28, 0, 0, 0, 0, 0, 0, 0, + 0, 30, 0, 0, 0, 0, 0, 0, 31, 0, + 0, 0, 32, 33, 0, 34, 0, 0, 0, 0, + 0, 0, 38, 0, 0, 0, 41, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 46, 44, 45, 0, 47, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 40, + 49, 29, 0, 0, 0, 37, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 26, 27, 28, 0, 0, 0, 0, 0, 0, 0, 0, 30, 0, 0, 0, 0, 0, 0, 31, 0, 0, 0, 32, 33, 0, - 34, 0, 0, 0, 0, 0, 0, 38, 0, 0, - 0, 41, 0, 0, 0, 0, 0, 0, 0, 0, + 34, 0, 0, 0, 35, 0, 36, 38, 39, 0, + 0, 41, 0, 0, 0, 42, 0, 43, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 46, - 44, 45, 0, 47, 0, 0, 0, 0, 0, 0, + 44, 45, 0, 47, 0, 48, 0, 50, 0, 51, 0, 0, 0, 0, 40, 49, 29, 0, 0, 0, - 37, 0, 0, 0, 0, 0, 0, 0, 0, 26, + 37, 0, 0, 0, 0, 0, 0, 0, 0, 0, + -123, 0, 0, 0, 26, 27, 28, 0, 0, 0, + 0, 0, 0, 0, 0, 30, 0, 0, 0, 0, + 0, 0, 31, 0, 0, 0, 32, 33, 0, 34, + 0, 0, 0, 35, 0, 36, 38, 39, 0, 0, + 41, 0, 0, 0, 42, 0, 43, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 46, 44, + 45, 0, 47, 0, 48, 0, 50, 0, 51, 0, + 0, 0, 0, 40, 49, 29, 0, 0, 0, 37, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 26, 27, 28, 0, 0, 0, 0, 0, 0, 0, 0, 30, 0, 0, 0, 0, 0, 0, 31, 0, 0, 0, 32, 33, 0, 34, 0, 0, 0, 35, 0, 36, 38, 39, 0, 0, 41, 0, 0, 0, 42, 0, 43, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 46, 44, 45, 0, 47, 0, 48, - 0, 50, 0, 51, 0, 0, 0, 0, 40, 49, + 0, 50, 266, 51, 0, 0, 0, 0, 40, 49, 29, 0, 0, 0, 37, 0, 0, 0, 0, 0, - 0, 0, 0, 26, 27, 28, 0, 0, 0, 0, - 0, 0, 0, 0, 30, 0, 0, 0, 0, 0, - 0, 31, 0, 0, 0, 32, 33, 0, 34, 0, - 0, 0, 35, 0, 36, 38, 39, 0, 0, 41, - 0, 0, 0, 42, 0, 43, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 46, 44, 45, - 0, 47, 0, 48, 0, 50, 266, 51, 0, 0, - 0, 0, 40, 49, 29, 0, 0, 0, 37, 0, - 0, 0, 0, 0, 0, 0, 0, -112, 0, 0, - 0, 26, 27, 28, 0, 0, 0, 0, 0, 0, - 0, 0, 30, 0, 0, 0, 0, 0, 0, 31, - 0, 0, 0, 32, 33, 0, 34, 0, 0, 0, - 35, 0, 36, 38, 39, 0, 0, 41, 0, 0, - 0, 42, 0, 43, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 46, 44, 45, 0, 47, - 0, 48, 0, 50, 0, 51, 0, 0, 0, 0, - 40, 49, 29, 0, 0, 0, 37, 0, 0, 0, + 0, 0, 0, 0, 470, 0, 0, 26, 27, 28, + 0, 0, 0, 0, 0, 0, 0, 0, 30, 0, + 0, 0, 0, 0, 0, 31, 0, 0, 0, 32, + 33, 0, 34, 0, 0, 0, 35, 0, 36, 38, + 39, 0, 0, 41, 0, 0, 0, 42, 0, 43, + 0, 0, 471, 0, 0, 0, 0, 0, 0, 0, + 0, 46, 44, 45, 0, 47, 0, 48, 0, 50, + 0, 51, 0, 0, 0, 0, 40, 49, 29, 0, + 0, 0, 37, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 478, 0, 0, 26, 27, 28, 0, 0, + 0, 0, 0, 0, 0, 0, 30, 0, 0, 0, + 0, 0, 0, 31, 0, 0, 0, 32, 33, 0, + 34, 0, 0, 0, 35, 0, 36, 38, 39, 0, + 0, 41, 0, 0, 0, 42, 0, 43, 0, 0, + 481, 0, 0, 0, 0, 0, 0, 0, 0, 46, + 44, 45, 0, 47, 0, 48, 0, 50, 0, 51, + 0, 0, 0, 0, 40, 49, 29, 0, 0, 0, + 37, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 26, 27, 28, 0, 0, 0, 0, 0, 0, 0, + 0, 30, 0, 0, 0, 0, 0, 0, 31, 212, + 0, 0, 590, 591, 0, 34, 0, 0, 0, 35, + 0, 36, 38, 39, 0, 0, 41, 0, 0, 0, + 42, 0, 43, 0, 0, 0, 0, 0, 0, 0, + 216, 0, 0, 0, 46, 44, 45, 0, 47, 0, + 48, 0, 50, 0, 51, 0, 0, 0, 0, 40, + 49, 29, 0, 0, 0, 37, 0, 0, 0, 0, 0, 0, 0, 0, 0, 470, 0, 0, 26, 27, 28, 0, 0, 0, 0, 0, 0, 0, 0, 30, 0, 0, 0, 0, 0, 0, 31, 0, 0, 0, @@ -447,76 +482,60 @@ const int QmlJSGrammar::action_info [] = { 0, 0, 46, 44, 45, 0, 47, 0, 48, 0, 50, 0, 51, 0, 0, 0, 0, 40, 49, 29, 0, 0, 0, 37, 0, 0, 0, 0, 0, 0, - 0, 0, 478, 0, 0, 26, 27, 28, 0, 0, - 0, 0, 0, 0, 0, 0, 30, 0, 0, 0, - 0, 0, 0, 31, 0, 0, 0, 32, 33, 0, - 34, 0, 0, 0, 35, 0, 36, 38, 39, 0, - 0, 41, 0, 0, 0, 42, 0, 43, 0, 0, - 481, 0, 0, 0, 0, 0, 0, 0, 0, 46, - 44, 45, 0, 47, 0, 48, 0, 50, 0, 51, - 0, 0, 0, 0, 40, 49, 29, 0, 0, 0, - 37, 0, 0, 0, 0, 0, 0, 0, 0, 478, - 0, 0, 26, 27, 28, 0, 0, 0, 0, 0, - 0, 0, 0, 30, 0, 0, 0, 0, 0, 0, - 31, 0, 0, 0, 32, 33, 0, 34, 0, 0, - 0, 35, 0, 36, 38, 39, 0, 0, 41, 0, - 0, 0, 42, 0, 43, 0, 0, 479, 0, 0, - 0, 0, 0, 0, 0, 0, 46, 44, 45, 0, - 47, 0, 48, 0, 50, 0, 51, 0, 0, 0, - 0, 40, 49, 29, 0, 0, 0, 37, 0, 0, - 0, 0, 0, 0, 0, 0, 26, 27, 28, 0, + 0, 0, 0, 478, 0, 0, 26, 27, 28, 0, 0, 0, 0, 0, 0, 0, 0, 30, 0, 0, - 0, 0, 0, 0, 31, 212, 0, 0, 579, 580, + 0, 0, 0, 0, 31, 0, 0, 0, 32, 33, 0, 34, 0, 0, 0, 35, 0, 36, 38, 39, 0, 0, 41, 0, 0, 0, 42, 0, 43, 0, - 0, 0, 0, 0, 0, 0, 216, 0, 0, 0, + 0, 479, 0, 0, 0, 0, 0, 0, 0, 0, 46, 44, 45, 0, 47, 0, 48, 0, 50, 0, 51, 0, 0, 0, 0, 40, 49, 29, 0, 0, 0, 37, 0, 0, 0, 0, 0, 0, 0, 0, - 470, 0, 0, 26, 27, 28, 0, 0, 0, 0, - 0, 0, 0, 0, 30, 0, 0, 0, 0, 0, - 0, 31, 0, 0, 0, 32, 33, 0, 34, 0, - 0, 0, 35, 0, 36, 38, 39, 0, 0, 41, - 0, 0, 0, 42, 0, 43, 0, 0, 471, 0, - 0, 0, 0, 0, 0, 0, 0, 46, 44, 45, - 0, 47, 0, 48, 0, 50, 0, 51, 0, 0, - 0, 0, 40, 49, 29, 0, 0, 0, 37, 0, - 0, 0, 0, 0, 0, 0, 0, 470, 0, 0, - 26, 27, 28, 0, 0, 0, 0, 0, 0, 0, - 0, 30, 0, 0, 0, 0, 0, 0, 31, 0, - 0, 0, 32, 33, 0, 34, 0, 0, 0, 35, - 0, 36, 38, 39, 0, 0, 41, 0, 0, 0, - 42, 0, 43, 0, 0, 471, 0, 0, 499, 0, - 0, 0, 0, 0, 46, 44, 45, 0, 47, 0, - 48, 0, 50, 0, 51, 0, 0, 0, 0, 40, - 49, 29, 0, 0, 498, 37, 0, 0, 0, 0, - 0, 0, 0, 0, 104, 105, 106, 0, 0, 108, - 110, 111, 0, 0, 112, 0, 113, 0, 0, 0, - 115, 116, 117, 0, 0, 0, 0, 0, 0, 31, - 118, 119, 120, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 121, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 124, - 0, 0, 0, 0, 0, 0, 44, 45, 125, 126, - 127, 0, 129, 130, 131, 132, 133, 134, 0, 0, - 122, 128, 114, 107, 109, 123, 0, 0, 0, 0, + 0, 470, 0, 0, 26, 27, 28, 0, 0, 0, + 0, 0, 0, 0, 0, 30, 0, 0, 0, 0, + 0, 0, 31, 0, 0, 0, 32, 33, 0, 34, + 0, 0, 0, 35, 0, 36, 38, 39, 0, 0, + 41, 0, 0, 0, 42, 0, 43, 0, 0, 471, + 0, 0, 499, 0, 0, 0, 0, 0, 46, 44, + 45, 0, 47, 0, 48, 0, 50, 0, 51, 0, + 0, 0, 0, 40, 49, 29, 0, 0, 498, 37, + 525, 0, 0, 0, 0, 0, 0, 0, 0, 104, + 105, 106, 0, 0, 108, 110, 111, 0, 0, 112, + 0, 113, 0, 0, 0, 115, 116, 117, 0, 0, + 0, 0, 0, 0, 31, 118, 119, 120, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 121, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 124, 0, 0, 0, 0, 0, + 0, 44, 45, 125, 126, 127, 0, 129, 130, 131, + 132, 133, 134, 0, 0, 122, 128, 114, 107, 109, + 123, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 104, 105, 106, 0, 0, 108, 110, 111, 0, + 0, 112, 0, 113, 0, 0, 0, 115, 116, 117, + 0, 0, 0, 0, 0, 0, 31, 118, 119, 120, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 121, 0, 0, 0, 534, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 124, 0, 0, 0, + 0, 0, 0, 44, 45, 125, 126, 127, 0, 129, + 130, 131, 132, 133, 134, 0, 0, 122, 128, 114, + 107, 109, 123, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 104, 105, 106, 0, 0, 108, 110, + 111, 0, 0, 112, 0, 113, 0, 0, 0, 115, + 116, 117, 0, 0, 0, 0, 0, 0, 388, 118, + 119, 120, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 121, 0, 0, 0, 389, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 124, 0, + 0, 0, 0, 0, 393, 390, 392, 125, 126, 127, + 0, 129, 130, 131, 132, 133, 134, 0, 0, 122, + 128, 114, 107, 109, 123, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 104, 105, 106, 0, 0, 108, 110, 111, 0, 0, 112, 0, 113, 0, 0, 0, 115, 116, 117, 0, 0, 0, 0, 0, 0, 388, 118, 119, 120, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 121, 0, 0, 0, 389, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 391, 0, 0, 0, 124, 0, 0, 0, 0, 0, 393, 390, 392, 125, 126, 127, 0, 129, 130, 131, 132, 133, 134, 0, 0, 122, 128, 114, 107, 109, 123, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 104, 105, 106, 0, - 0, 108, 110, 111, 0, 0, 112, 0, 113, 0, - 0, 0, 115, 116, 117, 0, 0, 0, 0, 0, - 0, 388, 118, 119, 120, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 121, 0, 0, 0, 389, - 0, 0, 0, 0, 0, 0, 0, 391, 0, 0, - 0, 124, 0, 0, 0, 0, 0, 393, 390, 392, - 125, 126, 127, 0, 129, 130, 131, 132, 133, 134, - 0, 0, 122, 128, 114, 107, 109, 123, 0, 0, 0, 0, 0, 0, 0, 0, 0, 204, 0, 0, 0, 0, 206, 0, 26, 27, 28, 208, 0, 0, 0, 0, 0, 0, 209, 30, 0, 0, 0, 0, @@ -526,190 +545,219 @@ const int QmlJSGrammar::action_info [] = { 0, 0, 215, 0, 216, 0, 0, 0, 46, 214, 217, 218, 47, 219, 48, 220, 50, 221, 51, 222, 223, 0, 0, 40, 49, 29, 205, 207, 0, 37, - 0, 0, 0, 0, 0, 0, 0, 0, 204, 0, - 0, 0, 0, 206, 0, 26, 27, 28, 208, 0, - 0, 0, 0, 0, 0, 209, 210, 0, 0, 0, - 0, 0, 0, 211, 212, 0, 0, 213, 33, 0, - 34, 0, 0, 0, 35, 0, 36, 38, 39, 0, - 0, 41, 0, 0, 0, 42, 0, 43, 0, 0, - 0, 0, 0, 215, 0, 216, 0, 0, 0, 46, - 214, 217, 218, 47, 219, 48, 220, 50, 221, 51, - 222, 223, 0, 0, 40, 49, 29, 205, 207, 0, - 37, 0, 0, 0, 0, 0, 0, 0, 0, 582, - 105, 106, 0, 0, 584, 110, 586, 27, 28, 587, - 0, 113, 0, 0, 0, 115, 589, 590, 0, 0, - 0, 0, 0, 0, 591, 592, 119, 120, 213, 33, - 0, 34, 0, 0, 0, 35, 0, 36, 593, 39, - 0, 0, 595, 0, 0, 0, 42, 0, 43, 0, - 0, 0, 0, 0, 597, 0, 216, 0, 0, 0, - 599, 596, 598, 600, 601, 602, 48, 604, 605, 606, - 607, 608, 609, 0, 0, 594, 603, 588, 583, 585, - 123, 37, 0, 0, 0, 0, 0, 0, 0, 0, - 356, 105, 106, 0, 0, 358, 110, 360, 27, 28, - 361, 0, 113, 0, 0, 0, 115, 363, 364, 0, - 0, 0, 0, 0, 0, 365, 366, 119, 120, 213, - 33, 0, 34, 0, 0, 0, 35, 0, 36, 367, - 39, 0, 0, 369, 0, 0, 0, 42, 0, 43, - 0, -258, 0, 0, 0, 371, 0, 216, 0, 0, - 0, 373, 370, 372, 374, 375, 376, 48, 378, 379, - 380, 381, 382, 383, 0, 0, 368, 377, 362, 357, - 359, 123, 37, 0, 0, 0, 0, 0, 0, 0, - 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 204, + 0, 0, 0, 0, 206, 0, 26, 27, 28, 208, + 0, 0, 0, 0, 0, 0, 209, 210, 0, 0, + 0, 0, 0, 0, 211, 212, 0, 0, 213, 33, + 0, 34, 0, 0, 0, 35, 0, 36, 38, 39, + 0, 0, 41, 0, 0, 0, 42, 0, 43, 0, + 0, 0, 0, 0, 215, 0, 216, 0, 0, 0, + 46, 214, 217, 218, 47, 219, 48, 220, 50, 221, + 51, 222, 223, 0, 0, 40, 49, 29, 205, 207, + 0, 37, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 593, 105, 106, 0, 0, 595, 110, 597, 27, + 28, 598, 0, 113, 0, 0, 0, 115, 600, 601, + 0, 0, 0, 0, 0, 0, 602, 603, 119, 120, + 213, 33, 0, 34, 0, 0, 0, 35, 0, 36, + 604, 39, 0, 0, 606, 0, 0, 0, 42, 0, + 43, 0, 0, 0, 0, 0, 608, 0, 216, 0, + 0, 0, 610, 607, 609, 611, 612, 613, 48, 615, + 616, 617, 618, 619, 620, 0, 0, 605, 614, 599, + 594, 596, 123, 37, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 356, 105, 106, 0, 0, 358, 110, + 360, 27, 28, 361, 0, 113, 0, 0, 0, 115, + 363, 364, 0, 0, 0, 0, 0, 0, 365, 366, + 119, 120, 213, 33, 0, 34, 0, 0, 0, 35, + 0, 36, 367, 39, 0, 0, 369, 0, 0, 0, + 42, 0, 43, 0, -269, 0, 0, 0, 371, 0, + 216, 0, 0, 0, 373, 370, 372, 374, 375, 376, + 48, 378, 379, 380, 381, 382, 383, 0, 0, 368, + 377, 362, 357, 359, 123, 37, 0, 0, 0, 0, + 0, 0, 0, 0, 0, - 233, 513, 304, 238, 183, 523, 164, 431, 145, 434, - 177, 306, 245, 581, 505, 490, 166, 181, 482, 431, - 520, 549, 565, 544, 558, 302, 385, 405, 434, 570, - 171, 387, 430, 177, 567, 456, 467, 395, 552, 568, - 13, 453, 333, 342, 238, 449, 344, 451, 420, 428, - 455, 245, 462, 233, 346, 424, 427, 397, 138, 233, - 238, 143, 440, 444, 348, 442, 158, 297, 412, 445, - 334, 248, 431, 410, 434, 297, 202, 0, 297, 315, - 135, 331, 177, 245, 477, 329, 0, 141, 0, 480, - 0, 0, 0, 497, 516, 615, 202, 101, 0, 0, - 55, 297, 315, 55, 202, 281, 55, 55, 486, 446, - 0, 297, 0, 0, 399, 95, 55, 400, 181, 55, - 103, 282, 55, 497, 283, 524, 55, 280, 487, 55, - 261, 175, 55, 456, 484, 265, 55, 55, 175, 447, - 55, 55, 485, 55, 55, 447, 279, 55, 84, 175, - 55, 55, 55, 55, 85, 83, 55, 87, 90, 55, - 55, 88, 325, 475, 89, 55, 55, 474, 55, 297, - 97, 86, 327, 79, 55, 55, 324, 56, 65, 0, - 55, 163, 447, 55, 55, 488, 446, 55, 399, 446, - 141, 400, 55, 55, 489, 232, 173, 55, 339, 91, - 297, 55, 55, 62, 336, 466, 0, 55, 92, 55, - 55, 160, 63, 93, 55, 72, 55, 141, 64, 101, - 55, 55, 67, 402, 293, 265, 265, 0, 0, 265, - 298, 610, 293, 612, 55, 308, 0, 265, 311, 265, - 0, 0, 103, 170, 293, 290, 321, 0, 55, 265, - 0, 55, 467, 265, 292, 273, 265, 497, 501, 0, - 55, 300, 0, 293, 288, 265, 295, 293, 265, 268, - 55, 55, 265, 0, 55, 265, 265, 285, 284, 265, - 0, 286, 497, 538, 0, 312, 572, 576, 0, 314, - 0, 0, 0, 0, 0, 0, 529, 539, 0, 0, - 574, 575, 577, 578, 0, 0, 0, 0, 0, 0, + 491, 434, 302, 632, 565, 562, 410, 166, 412, 557, + 13, 304, 183, 431, 420, 516, 171, 164, 520, 445, + 202, 387, 431, 542, 238, 629, 315, 248, 145, 233, + 245, 177, 297, 405, 385, 583, 434, 592, 571, 181, + 482, 177, 513, 306, 348, 627, 135, 581, 329, 578, + 297, 580, 245, 233, 177, 331, 427, 395, 238, 431, + 430, 434, 297, 467, 342, 346, 334, 333, 523, 344, + 453, 451, 462, 505, 449, 428, 141, 233, 455, 238, + 444, 424, 442, 397, 477, 245, 456, 480, 440, 138, + 143, 158, 202, 202, 0, 497, 0, 456, 628, 0, + 0, 297, 490, 0, 0, 0, 55, 475, 447, 0, + 315, 474, 0, 497, 501, 0, 0, 399, 141, 55, + 400, 175, 181, 402, 55, 55, 485, 484, 399, 55, + 261, 400, 55, 399, 280, 265, 400, 283, 55, 297, + 55, 55, 55, 281, 175, 282, 279, 55, 55, 447, + 175, 55, 101, 55, 297, 55, 55, 55, 86, 103, + 79, 55, 93, 91, 55, 160, 55, 325, 55, 67, + 72, 87, 85, 55, 466, 55, 55, 55, 530, 297, + 55, 84, 55, 97, 83, 531, 0, 95, 92, 324, + 55, 339, 163, 55, 55, 88, 0, 232, 90, 89, + 55, 55, 447, 489, 55, 298, 486, 55, 55, 488, + 446, 141, 55, 336, 487, 55, 173, 62, 55, 0, + 327, 65, 55, 55, 63, 55, 56, 64, 497, 55, + 293, 630, 55, 629, 265, 265, 530, 265, 0, 0, + 101, 293, 535, 531, 308, 300, 265, 103, 293, 311, + 55, 55, 292, 265, 55, 265, 265, 285, 0, 265, + 268, 286, 55, 314, 0, 0, 0, 265, 0, 170, + 312, 497, 0, 290, 537, 293, 0, 55, 293, 0, + 265, 55, 265, 265, 284, 55, 265, 497, 551, 0, + 265, 587, 273, 0, 288, 497, 551, 321, 0, 0, + 295, 0, 0, 0, 0, 633, 0, 544, 552, 0, + 585, 586, 588, 589, 0, 544, 552, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 497, 538, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 529, 539, 0, 0, 0, + 621, 0, 0, 624, 623, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 467, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0}; + 0, 0, 0, 0, 0, 0, 0, 0, 0}; const int QmlJSGrammar::action_check [] = { - 7, 55, 7, 61, 36, 36, 7, 7, 36, 7, - 55, 8, 33, 60, 7, 88, 36, 36, 33, 55, - 66, 60, 7, 29, 33, 7, 36, 16, 36, 17, - 5, 7, 36, 7, 33, 7, 5, 33, 8, 29, - 20, 36, 36, 55, 7, 5, 60, 60, 7, 36, - 33, 7, 7, 7, 33, 36, 7, 60, 36, 7, - 7, 29, 48, 36, 7, 36, 8, 2, 60, 33, - 8, 2, 1, 1, 8, 36, 78, 61, 36, 36, - 7, 48, 8, 60, 36, 7, 36, 78, 7, 33, - 55, 36, 7, 2, 8, 48, 1, 17, 2, 7, - 0, 31, 8, 10, -1, 8, 8, 48, -1, 8, - 8, 60, 78, 8, 76, 6, 40, 50, 50, 8, - 60, 54, 54, 8, 61, 61, 62, 51, 8, 20, - 7, 8, 78, 8, 8, 7, 61, 62, 61, 62, - 61, 62, 15, 61, 62, 61, 62, 8, 55, 88, - 61, 62, 40, 56, 60, 8, 8, 40, 60, 40, - 33, 60, 60, 51, 61, 62, 61, 56, 51, 12, - 51, 61, 62, 42, 29, 60, 1, 61, 62, 25, - 60, 27, 56, 7, 53, 60, 25, 29, 27, 61, - 62, 29, 38, 8, 29, 56, 7, 29, 25, 38, - 27, -1, 15, 25, 15, 27, 29, 60, -1, 61, - 62, 38, 12, 8, 57, 29, 38, 29, -1, 74, - 63, 34, 33, 36, 12, -1, -1, 29, 66, 67, - 85, 25, 74, 27, 66, 67, 29, 61, 62, 74, - 61, 62, 29, 85, 38, 29, 61, 62, 29, -1, - 85, 74, 66, 67, 66, 67, 29, 57, 25, 25, - 27, 27, 85, 63, 66, 67, 61, 62, 89, 57, - 8, 38, 38, 66, 67, 63, 15, 29, -1, 66, - 67, 29, 66, 67, 29, 66, 67, 15, 29, 61, - 62, -1, -1, 66, 67, 34, 8, 36, 90, 91, - 92, -1, -1, 25, -1, 27, 34, 25, 36, 27, - 18, 19, -1, -1, 66, 67, 38, 89, 66, 67, - 38, 66, 67, 61, 62, 66, 67, 25, 25, 27, - 27, 25, 25, 27, 27, 8, 15, 45, 46, 29, - 38, 38, 18, 19, 38, 38, 36, 29, -1, 61, - 62, -1, -1, -1, 36, -1, -1, 29, -1, 29, - 33, -1, -1, 29, -1, -1, 29, -1, 47, 45, - 46, -1, -1, -1, 29, -1, 66, 67, -1, -1, - -1, -1, 61, 62, 66, 67, -1, -1, 61, 62, - -1, 61, 62, 59, 66, 67, 66, 67, 61, 62, - 66, 67, -1, 66, 67, 29, 61, 62, 23, 24, - 89, 66, 67, -1, -1, 29, -1, 32, -1, 85, - 35, -1, 37, 18, 19, 23, 24, 29, -1, -1, - 29, -1, 23, 24, 32, 59, 29, 35, -1, 37, - 31, 32, 66, 67, 35, -1, 37, 61, 62, -1, - 45, 46, 66, 67, -1, -1, -1, -1, -1, 61, - 62, 85, 61, 62, 66, 67, 59, 66, 67, 23, - 24, -1, 65, 66, 67, -1, -1, 31, 32, 23, - 24, 35, -1, 37, -1, 10, -1, 31, 32, -1, - -1, 35, 85, 37, 23, 24, -1, 22, -1, -1, - 23, 24, 31, 32, 29, -1, 35, -1, 37, 32, - 10, -1, 35, -1, 37, -1, -1, -1, -1, -1, - -1, -1, 22, -1, -1, -1, -1, -1, -1, 29, - 55, -1, -1, -1, 59, -1, -1, -1, -1, -1, - -1, 66, 67, -1, -1, -1, -1, -1, -1, 74, - -1, -1, -1, -1, 3, 55, -1, -1, 83, 59, - 85, -1, -1, -1, 13, -1, 66, 67, 17, -1, - -1, -1, 23, 24, 74, -1, -1, 26, -1, 28, - 31, 32, 31, 83, 35, 85, 37, -1, -1, -1, - 39, -1, 41, 42, -1, -1, 12, 13, -1, -1, - 49, -1, -1, 52, 53, -1, 22, -1, -1, 58, - -1, -1, -1, 29, -1, 64, -1, 33, 34, -1, - 36, -1, -1, -1, -1, -1, -1, 43, -1, -1, - 79, 47, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, 3, -1, -1, -1, -1, 65, - 66, 67, -1, 69, 13, -1, -1, -1, 17, -1, - -1, -1, -1, -1, 80, 81, 82, 26, -1, 28, - 86, -1, -1, -1, -1, -1, -1, -1, -1, -1, - 39, -1, 41, 42, -1, -1, -1, -1, -1, -1, - 49, -1, -1, 52, 53, -1, -1, -1, -1, 58, - -1, -1, -1, -1, -1, 64, -1, -1, -1, -1, + 7, 87, 36, 55, 33, 7, 36, 7, 7, 7, + 36, 7, 20, 36, 87, 60, 17, 7, 55, 60, + 36, 33, 16, 55, 60, 8, 8, 33, 66, 7, + 87, 36, 29, 7, 7, 89, 29, 7, 60, 5, + 5, 36, 5, 7, 36, 36, 33, 36, 7, 7, + 36, 55, 36, 7, 33, 36, 33, 7, 33, 7, + 17, 29, 7, 7, 36, 2, 7, 36, 8, 31, + 8, 1, 60, 8, 7, 60, 7, 48, 1, 7, + 60, 36, 33, 36, 8, 61, 33, 36, 1, 7, + 36, 1, 17, 60, 36, 2, 7, 0, 10, 55, + 8, -1, 36, 8, 8, 48, -1, 8, -1, 8, + 7, 8, -1, -1, 6, -1, 48, 78, 78, 8, + 8, 48, 61, 8, 76, 8, 40, 8, 20, -1, + -1, 50, 8, 8, 60, 54, -1, 51, -1, 8, + 61, -1, 78, 55, 61, 62, 61, 62, 8, 78, + 50, 42, 56, 8, 54, 56, 61, -1, 7, 61, + 62, 60, 53, 61, 62, 61, 62, 89, 61, 62, + 29, 60, 60, 55, 15, 60, 55, 60, 2, 60, + 56, 61, 62, 61, 62, 60, 40, 61, 62, 40, + 40, 60, 33, 61, 62, 8, 56, 51, 8, 29, + 51, 51, 29, 29, -1, 87, 61, 62, 87, 25, + 7, 27, 61, 62, 25, 74, 27, 12, 15, 12, + 29, -1, 38, 29, 61, 62, 85, 38, -1, 25, + 7, 27, -1, 91, 92, 93, 33, 29, 61, 62, + 66, 67, 38, 29, 74, 29, -1, 74, 61, 62, + 29, 61, 62, 90, 12, 85, 8, 29, 85, 29, + 66, 67, 57, 29, 57, 74, 29, 90, 63, 29, + 63, 8, 15, -1, 66, 67, 85, 25, 29, 27, + 66, 67, 66, 67, 61, 62, -1, 66, 67, 29, + 38, 34, 15, 36, 66, 67, 66, 67, 29, 57, + 66, 67, 29, 66, 67, 63, 66, 67, 29, 61, + 62, 34, 29, 36, 29, 66, 67, 8, -1, -1, + -1, 36, 15, -1, 61, 62, 66, 67, -1, 18, + 19, 18, 19, 18, 19, 66, 67, 29, -1, 66, + 67, 34, 33, 36, 36, 66, 67, 15, -1, 66, + 67, 66, 67, 25, -1, 27, 45, 46, 45, 46, + 45, 46, -1, -1, 23, 24, 38, 29, 23, 24, + 61, 62, 29, 32, 66, 67, 35, 32, 37, 47, + 35, 29, 37, 23, 24, -1, -1, -1, -1, -1, + -1, -1, 32, 61, 62, 35, -1, 37, 29, 61, + 62, -1, 59, 29, 66, 67, 29, -1, -1, 66, + 67, -1, -1, 61, 62, -1, 29, -1, 66, 67, + 23, 24, 90, 29, 18, 19, -1, -1, 85, 32, + 61, 62, 35, 59, 37, 66, 67, 29, 61, 62, + 66, 67, -1, 66, 67, -1, -1, -1, 61, 62, + -1, 45, 46, 66, 67, 61, 62, 23, 24, 85, + 66, 67, -1, -1, -1, 31, 32, 59, -1, 35, + 10, 37, -1, 65, 66, 67, 23, 24, -1, -1, + 10, -1, 22, 29, 31, 32, 23, 24, 35, 29, + 37, -1, 22, 85, 31, 32, 23, 24, 35, 29, + 37, -1, 23, 24, 31, 32, -1, -1, 35, -1, + 37, 32, -1, 59, 35, -1, 37, -1, -1, 59, + 66, 67, -1, -1, -1, -1, 66, 67, -1, 59, + -1, -1, -1, -1, 74, -1, 66, 67, -1, 85, + -1, 87, 3, 83, 74, 85, -1, -1, -1, -1, + -1, -1, 13, 83, -1, 85, 17, -1, -1, -1, + -1, -1, -1, -1, -1, 26, -1, 28, -1, -1, + -1, -1, -1, -1, -1, 23, 24, -1, 39, -1, + 41, 42, -1, 31, 32, 3, -1, 35, 49, 37, + -1, 52, 53, -1, -1, 13, -1, 58, -1, 17, + -1, -1, -1, 64, -1, -1, -1, -1, 26, -1, + 28, -1, -1, 31, -1, -1, -1, -1, 79, -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, 3, -1, + -1, -1, -1, -1, -1, -1, -1, -1, 13, -1, + -1, 79, 17, -1, -1, -1, -1, -1, -1, -1, + -1, 26, -1, 28, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, 39, -1, 41, 42, -1, -1, + -1, -1, -1, -1, 49, -1, -1, 52, 53, -1, + -1, -1, -1, 58, -1, -1, -1, -1, -1, 64, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, 79, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -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, - 79, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, 12, 13, -1, -1, + -1, -1, -1, -1, 65, 66, 67, -1, 69, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, 80, + 81, 82, -1, -1, -1, 86, -1, -1, -1, -1, + -1, -1, -1, -1, -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, -1, -1, -1, 43, -1, -1, - -1, 47, -1, -1, -1, -1, -1, -1, -1, -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, -1, -1, -1, -1, -1, + 66, 67, -1, 69, -1, 71, -1, 73, -1, 75, -1, -1, -1, -1, 80, 81, 82, -1, -1, -1, - 86, -1, -1, -1, -1, -1, -1, -1, -1, 11, + 86, -1, -1, -1, -1, -1, -1, -1, -1, -1, + 7, -1, -1, -1, 11, 12, 13, -1, -1, -1, + -1, -1, -1, -1, -1, 22, -1, -1, -1, -1, + -1, -1, 29, -1, -1, -1, 33, 34, -1, 36, + -1, -1, -1, 40, -1, 42, 43, 44, -1, -1, + 47, -1, -1, -1, 51, -1, 53, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, 65, 66, + 67, -1, 69, -1, 71, -1, 73, -1, 75, -1, + -1, -1, -1, 80, 81, 82, -1, -1, -1, 86, + -1, -1, -1, -1, -1, -1, -1, -1, -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, + -1, 73, 74, 75, -1, -1, -1, -1, 80, 81, 82, -1, -1, -1, 86, -1, -1, -1, -1, -1, - -1, -1, -1, 11, 12, 13, -1, -1, -1, -1, - -1, -1, -1, -1, 22, -1, -1, -1, -1, -1, - -1, 29, -1, -1, -1, 33, 34, -1, 36, -1, - -1, -1, 40, -1, 42, 43, 44, -1, -1, 47, - -1, -1, -1, 51, -1, 53, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, 65, 66, 67, - -1, 69, -1, 71, -1, 73, 74, 75, -1, -1, - -1, -1, 80, 81, 82, -1, -1, -1, 86, -1, - -1, -1, -1, -1, -1, -1, -1, 7, -1, -1, - -1, 11, 12, 13, -1, -1, -1, -1, -1, -1, - -1, -1, 22, -1, -1, -1, -1, -1, -1, 29, - -1, -1, -1, 33, 34, -1, 36, -1, -1, -1, - 40, -1, 42, 43, 44, -1, -1, 47, -1, -1, - -1, 51, -1, 53, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, 65, 66, 67, -1, 69, - -1, 71, -1, 73, -1, 75, -1, -1, -1, -1, - 80, 81, 82, -1, -1, -1, 86, -1, -1, -1, + -1, -1, -1, -1, 8, -1, -1, 11, 12, 13, + -1, -1, -1, -1, -1, -1, -1, -1, 22, -1, + -1, -1, -1, -1, -1, 29, -1, -1, -1, 33, + 34, -1, 36, -1, -1, -1, 40, -1, 42, 43, + 44, -1, -1, 47, -1, -1, -1, 51, -1, 53, + -1, -1, 56, -1, -1, -1, -1, -1, -1, -1, + -1, 65, 66, 67, -1, 69, -1, 71, -1, 73, + -1, 75, -1, -1, -1, -1, 80, 81, 82, -1, + -1, -1, 86, -1, -1, -1, -1, -1, -1, -1, + -1, -1, 8, -1, -1, 11, 12, 13, -1, -1, + -1, -1, -1, -1, -1, -1, 22, -1, -1, -1, + -1, -1, -1, 29, -1, -1, -1, 33, 34, -1, + 36, -1, -1, -1, 40, -1, 42, 43, 44, -1, + -1, 47, -1, -1, -1, 51, -1, 53, -1, -1, + 56, -1, -1, -1, -1, -1, -1, -1, -1, 65, + 66, 67, -1, 69, -1, 71, -1, 73, -1, 75, + -1, -1, -1, -1, 80, 81, 82, -1, -1, -1, + 86, -1, -1, -1, -1, -1, -1, -1, -1, -1, + 11, 12, 13, -1, -1, -1, -1, -1, -1, -1, + -1, 22, -1, -1, -1, -1, -1, -1, 29, 30, + -1, -1, 33, 34, -1, 36, -1, -1, -1, 40, + -1, 42, 43, 44, -1, -1, 47, -1, -1, -1, + 51, -1, 53, -1, -1, -1, -1, -1, -1, -1, + 61, -1, -1, -1, 65, 66, 67, -1, 69, -1, + 71, -1, 73, -1, 75, -1, -1, -1, -1, 80, + 81, 82, -1, -1, -1, 86, -1, -1, -1, -1, -1, -1, -1, -1, -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, @@ -719,76 +767,60 @@ const int QmlJSGrammar::action_check [] = { -1, -1, 65, 66, 67, -1, 69, -1, 71, -1, 73, -1, 75, -1, -1, -1, -1, 80, 81, 82, -1, -1, -1, 86, -1, -1, -1, -1, -1, -1, - -1, -1, 8, -1, -1, 11, 12, 13, -1, -1, - -1, -1, -1, -1, -1, -1, 22, -1, -1, -1, - -1, -1, -1, 29, -1, -1, -1, 33, 34, -1, - 36, -1, -1, -1, 40, -1, 42, 43, 44, -1, - -1, 47, -1, -1, -1, 51, -1, 53, -1, -1, - 56, -1, -1, -1, -1, -1, -1, -1, -1, 65, - 66, 67, -1, 69, -1, 71, -1, 73, -1, 75, - -1, -1, -1, -1, 80, 81, 82, -1, -1, -1, - 86, -1, -1, -1, -1, -1, -1, -1, -1, 8, - -1, -1, 11, 12, 13, -1, -1, -1, -1, -1, - -1, -1, -1, 22, -1, -1, -1, -1, -1, -1, - 29, -1, -1, -1, 33, 34, -1, 36, -1, -1, - -1, 40, -1, 42, 43, 44, -1, -1, 47, -1, - -1, -1, 51, -1, 53, -1, -1, 56, -1, -1, - -1, -1, -1, -1, -1, -1, 65, 66, 67, -1, - 69, -1, 71, -1, 73, -1, 75, -1, -1, -1, - -1, 80, 81, 82, -1, -1, -1, 86, -1, -1, - -1, -1, -1, -1, -1, -1, 11, 12, 13, -1, + -1, -1, -1, 8, -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, -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, 61, -1, -1, -1, + -1, 56, -1, -1, -1, -1, -1, -1, -1, -1, 65, 66, 67, -1, 69, -1, 71, -1, 73, -1, 75, -1, -1, -1, -1, 80, 81, 82, -1, -1, -1, 86, -1, -1, -1, -1, -1, -1, -1, -1, - 8, -1, -1, 11, 12, 13, -1, -1, -1, -1, - -1, -1, -1, -1, 22, -1, -1, -1, -1, -1, - -1, 29, -1, -1, -1, 33, 34, -1, 36, -1, - -1, -1, 40, -1, 42, 43, 44, -1, -1, 47, - -1, -1, -1, 51, -1, 53, -1, -1, 56, -1, - -1, -1, -1, -1, -1, -1, -1, 65, 66, 67, - -1, 69, -1, 71, -1, 73, -1, 75, -1, -1, - -1, -1, 80, 81, 82, -1, -1, -1, 86, -1, - -1, -1, -1, -1, -1, -1, -1, 8, -1, -1, - 11, 12, 13, -1, -1, -1, -1, -1, -1, -1, - -1, 22, -1, -1, -1, -1, -1, -1, 29, -1, - -1, -1, 33, 34, -1, 36, -1, -1, -1, 40, - -1, 42, 43, 44, -1, -1, 47, -1, -1, -1, - 51, -1, 53, -1, -1, 56, -1, -1, 59, -1, - -1, -1, -1, -1, 65, 66, 67, -1, 69, -1, - 71, -1, 73, -1, 75, -1, -1, -1, -1, 80, - 81, 82, -1, -1, 85, 86, -1, -1, -1, -1, - -1, -1, -1, -1, 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, 8, -1, -1, 11, 12, 13, -1, -1, -1, + -1, -1, -1, -1, -1, 22, -1, -1, -1, -1, + -1, -1, 29, -1, -1, -1, 33, 34, -1, 36, + -1, -1, -1, 40, -1, 42, 43, 44, -1, -1, + 47, -1, -1, -1, 51, -1, 53, -1, -1, 56, + -1, -1, 59, -1, -1, -1, -1, -1, 65, 66, + 67, -1, 69, -1, 71, -1, 73, -1, 75, -1, + -1, -1, -1, 80, 81, 82, -1, -1, 85, 86, + 87, -1, -1, -1, -1, -1, -1, -1, -1, 4, + 5, 6, -1, -1, 9, 10, 11, -1, -1, 14, + -1, 16, -1, -1, -1, 20, 21, 22, -1, -1, + -1, -1, -1, -1, 29, 30, 31, 32, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, 43, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, 59, -1, -1, -1, -1, -1, + -1, 66, 67, 68, 69, 70, -1, 72, 73, 74, + 75, 76, 77, -1, -1, 80, 81, 82, 83, 84, + 85, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, 4, 5, 6, -1, -1, 9, 10, 11, -1, + -1, 14, -1, 16, -1, -1, -1, 20, 21, 22, + -1, -1, -1, -1, -1, -1, 29, 30, 31, 32, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + 43, -1, -1, -1, 47, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, 59, -1, -1, -1, + -1, -1, -1, 66, 67, 68, 69, 70, -1, 72, + 73, 74, 75, 76, 77, -1, -1, 80, 81, 82, + 83, 84, 85, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, 4, 5, 6, -1, -1, 9, 10, + 11, -1, -1, 14, -1, 16, -1, -1, -1, 20, + 21, 22, -1, -1, -1, -1, -1, -1, 29, 30, + 31, 32, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, 43, -1, -1, -1, 47, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, 59, -1, + -1, -1, -1, -1, 65, 66, 67, 68, 69, 70, + -1, 72, 73, 74, 75, 76, 77, -1, -1, 80, + 81, 82, 83, 84, 85, -1, -1, -1, -1, -1, -1, -1, -1, -1, -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, 55, -1, -1, -1, 59, -1, -1, -1, -1, -1, 65, 66, 67, 68, 69, 70, -1, 72, 73, 74, 75, 76, 77, -1, -1, 80, 81, 82, 83, 84, 85, -1, -1, -1, - -1, -1, -1, -1, -1, -1, 4, 5, 6, -1, - -1, 9, 10, 11, -1, -1, 14, -1, 16, -1, - -1, -1, 20, 21, 22, -1, -1, -1, -1, -1, - -1, 29, 30, 31, 32, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, 43, -1, -1, -1, 47, - -1, -1, -1, -1, -1, -1, -1, 55, -1, -1, - -1, 59, -1, -1, -1, -1, -1, 65, 66, 67, - 68, 69, 70, -1, 72, 73, 74, 75, 76, 77, - -1, -1, 80, 81, 82, 83, 84, 85, -1, -1, -1, -1, -1, -1, -1, -1, -1, 4, -1, -1, -1, -1, 9, -1, 11, 12, 13, 14, -1, -1, -1, -1, -1, -1, 21, 22, -1, -1, -1, -1, @@ -798,79 +830,81 @@ const int QmlJSGrammar::action_check [] = { -1, -1, 59, -1, 61, -1, -1, -1, 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, -1, -1, 80, 81, 82, 83, 84, -1, 86, - -1, -1, -1, -1, -1, -1, -1, -1, 4, -1, - -1, -1, -1, 9, -1, 11, 12, 13, 14, -1, - -1, -1, -1, -1, -1, 21, 22, -1, -1, -1, - -1, -1, -1, 29, 30, -1, -1, 33, 34, -1, - 36, -1, -1, -1, 40, -1, 42, 43, 44, -1, - -1, 47, -1, -1, -1, 51, -1, 53, -1, -1, - -1, -1, -1, 59, -1, 61, -1, -1, -1, 65, - 66, 67, 68, 69, 70, 71, 72, 73, 74, 75, - 76, 77, -1, -1, 80, 81, 82, 83, 84, -1, - 86, -1, -1, -1, -1, -1, -1, -1, -1, 4, - 5, 6, -1, -1, 9, 10, 11, 12, 13, 14, - -1, 16, -1, -1, -1, 20, 21, 22, -1, -1, - -1, -1, -1, -1, 29, 30, 31, 32, 33, 34, + -1, -1, -1, -1, -1, -1, -1, -1, -1, 4, + -1, -1, -1, -1, 9, -1, 11, 12, 13, 14, + -1, -1, -1, -1, -1, -1, 21, 22, -1, -1, + -1, -1, -1, -1, 29, 30, -1, -1, 33, 34, -1, 36, -1, -1, -1, 40, -1, 42, 43, 44, -1, -1, 47, -1, -1, -1, 51, -1, 53, -1, -1, -1, -1, -1, 59, -1, 61, -1, -1, -1, 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, -1, -1, 80, 81, 82, 83, 84, - 85, 86, -1, -1, -1, -1, -1, -1, -1, -1, - 4, 5, 6, -1, -1, 9, 10, 11, 12, 13, - 14, -1, 16, -1, -1, -1, 20, 21, 22, -1, - -1, -1, -1, -1, -1, 29, 30, 31, 32, 33, - 34, -1, 36, -1, -1, -1, 40, -1, 42, 43, - 44, -1, -1, 47, -1, -1, -1, 51, -1, 53, - -1, 55, -1, -1, -1, 59, -1, 61, -1, -1, - -1, 65, 66, 67, 68, 69, 70, 71, 72, 73, - 74, 75, 76, 77, -1, -1, 80, 81, 82, 83, - 84, 85, 86, -1, -1, -1, -1, -1, -1, -1, - -1, + -1, 86, -1, -1, -1, -1, -1, -1, -1, -1, + -1, 4, 5, 6, -1, -1, 9, 10, 11, 12, + 13, 14, -1, 16, -1, -1, -1, 20, 21, 22, + -1, -1, -1, -1, -1, -1, 29, 30, 31, 32, + 33, 34, -1, 36, -1, -1, -1, 40, -1, 42, + 43, 44, -1, -1, 47, -1, -1, -1, 51, -1, + 53, -1, -1, -1, -1, -1, 59, -1, 61, -1, + -1, -1, 65, 66, 67, 68, 69, 70, 71, 72, + 73, 74, 75, 76, 77, -1, -1, 80, 81, 82, + 83, 84, 85, 86, -1, -1, -1, -1, -1, -1, + -1, -1, -1, 4, 5, 6, -1, -1, 9, 10, + 11, 12, 13, 14, -1, 16, -1, -1, -1, 20, + 21, 22, -1, -1, -1, -1, -1, -1, 29, 30, + 31, 32, 33, 34, -1, 36, -1, -1, -1, 40, + -1, 42, 43, 44, -1, -1, 47, -1, -1, -1, + 51, -1, 53, -1, 55, -1, -1, -1, 59, -1, + 61, -1, -1, -1, 65, 66, 67, 68, 69, 70, + 71, 72, 73, 74, 75, 76, 77, -1, -1, 80, + 81, 82, 83, 84, 85, 86, -1, -1, -1, -1, + -1, -1, -1, -1, -1, - 9, 9, 3, 9, 9, 8, 30, 3, 63, 16, - 9, 2, 2, 15, 9, 2, 30, 9, 3, 3, - 9, 3, 20, 20, 3, 2, 30, 2, 16, 9, - 3, 31, 77, 9, 20, 9, 30, 30, 9, 9, - 3, 3, 2, 2, 9, 3, 3, 2, 92, 3, - 2, 2, 30, 9, 2, 89, 77, 2, 30, 9, - 9, 30, 94, 16, 2, 9, 30, 3, 3, 16, - 9, 3, 3, 2, 16, 3, 2, -1, 3, 9, - 3, 3, 9, 2, 30, 2, -1, 30, -1, 30, - -1, -1, -1, 9, 9, 11, 2, 9, -1, -1, - 40, 3, 9, 40, 2, 45, 40, 40, 42, 42, - -1, 3, -1, -1, 34, 52, 40, 37, 9, 40, - 32, 45, 40, 9, 45, 11, 40, 45, 42, 40, - 40, 42, 40, 9, 42, 45, 40, 40, 42, 42, - 40, 40, 42, 40, 40, 42, 45, 40, 44, 42, - 40, 40, 40, 40, 44, 44, 40, 45, 45, 40, - 40, 45, 64, 26, 45, 40, 40, 30, 40, 3, - 50, 45, 64, 45, 40, 40, 83, 43, 43, -1, - 40, 56, 42, 40, 40, 42, 42, 40, 34, 42, - 30, 37, 40, 40, 42, 101, 36, 40, 96, 46, - 3, 40, 40, 42, 95, 81, -1, 40, 46, 40, - 40, 54, 42, 46, 40, 46, 40, 30, 42, 9, - 40, 40, 48, 36, 40, 45, 45, -1, -1, 45, - 64, 9, 40, 11, 40, 55, -1, 45, 57, 45, - -1, -1, 32, 33, 40, 51, 62, -1, 40, 45, - -1, 40, 30, 45, 62, 47, 45, 9, 10, -1, - 40, 64, -1, 40, 53, 45, 62, 40, 45, 49, - 40, 40, 45, -1, 40, 45, 45, 47, 47, 45, - -1, 47, 9, 10, -1, 62, 13, 3, -1, 62, - -1, -1, -1, -1, -1, -1, 23, 24, -1, -1, - 16, 17, 18, 19, -1, -1, -1, -1, -1, -1, + 6, 22, 2, 11, 9, 3, 2, 36, 3, 26, + 3, 3, 9, 3, 97, 9, 3, 36, 9, 22, + 2, 37, 3, 11, 9, 14, 9, 3, 68, 9, + 2, 9, 3, 2, 36, 9, 22, 21, 3, 9, + 3, 9, 9, 2, 2, 11, 3, 9, 2, 26, + 3, 26, 2, 9, 9, 3, 82, 36, 9, 3, + 82, 22, 3, 36, 2, 2, 9, 2, 8, 3, + 3, 2, 36, 9, 3, 3, 36, 9, 2, 9, + 22, 94, 9, 2, 36, 2, 9, 36, 99, 36, + 36, 36, 2, 2, -1, 9, -1, 9, 12, -1, + -1, 3, 2, -1, -1, -1, 45, 32, 47, -1, + 9, 36, -1, 9, 10, -1, -1, 39, 36, 45, + 42, 47, 9, 41, 45, 45, 47, 47, 39, 45, + 45, 42, 45, 39, 50, 50, 42, 50, 45, 3, + 45, 45, 45, 50, 47, 50, 50, 45, 45, 47, + 47, 45, 9, 45, 3, 45, 45, 45, 50, 16, + 50, 45, 51, 51, 45, 59, 45, 69, 45, 53, + 51, 50, 49, 45, 86, 45, 45, 45, 9, 3, + 45, 49, 45, 55, 49, 16, -1, 57, 51, 88, + 45, 101, 61, 45, 45, 50, -1, 106, 50, 50, + 45, 45, 47, 47, 45, 69, 47, 45, 45, 47, + 47, 36, 45, 100, 47, 45, 41, 47, 45, -1, + 69, 48, 45, 45, 47, 45, 48, 47, 9, 45, + 45, 12, 45, 14, 50, 50, 9, 50, -1, -1, + 9, 45, 15, 16, 60, 69, 50, 16, 45, 62, + 45, 45, 67, 50, 45, 50, 50, 52, -1, 50, + 54, 52, 45, 67, -1, -1, -1, 50, -1, 38, + 67, 9, -1, 56, 12, 45, -1, 45, 45, -1, + 50, 45, 50, 50, 52, 45, 50, 9, 10, -1, + 50, 3, 52, -1, 58, 9, 10, 67, -1, -1, + 67, -1, -1, -1, -1, 19, -1, 29, 30, -1, + 22, 23, 24, 25, -1, 29, 30, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, 9, 10, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, 23, 24, -1, -1, -1, + 9, -1, -1, 12, 13, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, 36, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1}; + -1, -1, -1, -1, -1, -1, -1, -1, -1}; diff --git a/src/declarative/qml/parser/qmljsgrammar_p.h b/src/declarative/qml/parser/qmljsgrammar_p.h index c760564..7ffda6a 100644 --- a/src/declarative/qml/parser/qmljsgrammar_p.h +++ b/src/declarative/qml/parser/qmljsgrammar_p.h @@ -59,12 +59,13 @@ class QmlJSGrammar public: enum { EOF_SYMBOL = 0, - REDUCE_HERE = 94, - SHIFT_THERE = 93, + REDUCE_HERE = 95, + SHIFT_THERE = 94, T_AND = 1, T_AND_AND = 2, T_AND_EQ = 3, - T_AS = 89, + T_AS = 90, + T_AT = 87, T_AUTOMATIC_SEMICOLON = 62, T_BREAK = 4, T_CASE = 5, @@ -85,9 +86,9 @@ public: T_EQ_EQ = 18, T_EQ_EQ_EQ = 19, T_FALSE = 82, - T_FEED_JS_EXPRESSION = 92, - T_FEED_JS_STATEMENT = 91, - T_FEED_UI_PROGRAM = 90, + T_FEED_JS_EXPRESSION = 93, + T_FEED_JS_STATEMENT = 92, + T_FEED_UI_PROGRAM = 91, T_FINALLY = 20, T_FOR = 21, T_FUNCTION = 22, @@ -99,7 +100,7 @@ public: T_GT_GT_GT_EQ = 28, T_IDENTIFIER = 29, T_IF = 30, - T_IMPORT = 88, + T_IMPORT = 89, T_IN = 31, T_INSTANCEOF = 32, T_LBRACE = 33, @@ -126,7 +127,7 @@ public: T_PLUS_EQ = 52, T_PLUS_PLUS = 53, T_PROPERTY = 66, - T_PUBLIC = 87, + T_PUBLIC = 88, T_QUESTION = 54, T_RBRACE = 55, T_RBRACKET = 56, @@ -154,15 +155,15 @@ public: T_XOR = 78, T_XOR_EQ = 79, - ACCEPT_STATE = 616, - RULE_COUNT = 337, - STATE_COUNT = 617, - TERMINAL_COUNT = 95, - NON_TERMINAL_COUNT = 103, + ACCEPT_STATE = 634, + RULE_COUNT = 348, + STATE_COUNT = 635, + TERMINAL_COUNT = 96, + NON_TERMINAL_COUNT = 108, - GOTO_INDEX_OFFSET = 617, - GOTO_INFO_OFFSET = 2231, - GOTO_CHECK_OFFSET = 2231 + GOTO_INDEX_OFFSET = 635, + GOTO_INFO_OFFSET = 2345, + GOTO_CHECK_OFFSET = 2345 }; static const char *const spell []; diff --git a/src/declarative/qml/parser/qmljslexer.cpp b/src/declarative/qml/parser/qmljslexer.cpp index a22169d..0756f10 100644 --- a/src/declarative/qml/parser/qmljslexer.cpp +++ b/src/declarative/qml/parser/qmljslexer.cpp @@ -1038,6 +1038,7 @@ int Lexer::matchPunctuator(ushort c1, ushort c2, case '[': shift(1); return QmlJSGrammar::T_LBRACKET; case ']': shift(1); return QmlJSGrammar::T_RBRACKET; case ';': shift(1); return QmlJSGrammar::T_SEMICOLON; + case '@': shift(1); return QmlJSGrammar::T_AT; default: return -1; } diff --git a/src/declarative/qml/parser/qmljsparser.cpp b/src/declarative/qml/parser/qmljsparser.cpp index a1236d5..93f9fda 100644 --- a/src/declarative/qml/parser/qmljsparser.cpp +++ b/src/declarative/qml/parser/qmljsparser.cpp @@ -292,51 +292,100 @@ case 20: { } break; case 21: { - sym(1).Node = makeAstNode<AST::UiObjectMemberList> (driver->nodePool(), sym(1).UiObjectMember); + sym(1).Node = makeAstNode<AST::UiObjectMemberList> (driver->nodePool(), + sym(1).UiAttributeList, sym(2).UiObjectMember); } break; -case 22: { - sym(1).Node = makeAstNode<AST::UiObjectMemberList> (driver->nodePool(), sym(1).UiObjectMember); +case 23: { + sym(1).UiAttributeList = sym(1).UiAttributeList->finish(); } break; -case 23: { +case 24: { + sym(1).UiAttributeList = makeAstNode<AST::UiAttributeList>(driver->nodePool(), sym(1).UiAttribute); +} break; + +case 25: { + sym(1).UiAttributeList = makeAstNode<AST::UiAttributeList>(driver->nodePool(), + sym(1).UiAttributeList, sym(2).UiAttribute); +} break; + +case 28: { + AST::UiAttribute *ast = makeAstNode<AST::UiAttribute>(driver->nodePool(), sym(2).sval); + ast->atToken = loc(1); + ast->nameToken = loc(2); + sym(1).UiAttribute = ast; +} break; + +case 29: { + AST::UiAttribute *ast = makeAstNode<AST::UiAttribute>(driver->nodePool(), + sym(2).sval, sym(4).Expression); + ast->atToken = loc(1); + ast->nameToken = loc(2); + ast->equalToken = loc(3); + sym(1).UiAttribute = ast; +} break; + +case 30: { + AST::IdentifierExpression *node = makeAstNode<AST::IdentifierExpression> (driver->nodePool(), sym(1).sval); + node->identifierToken = loc(1); + sym(1).Node = node; +} break; + +case 31: { + AST::NumericLiteral *node = makeAstNode<AST::NumericLiteral> (driver->nodePool(), sym(1).dval, lexer->flags); + node->literalToken = loc(1); + sym(1).Node = node; +} break; + +case 32: { + sym(1).Node = makeAstNode<AST::UiObjectMemberList> (driver->nodePool(), + sym(1).UiAttributeList, sym(2).UiObjectMember); +} break; + +case 33: { AST::UiObjectMemberList *node = makeAstNode<AST:: UiObjectMemberList> (driver->nodePool(), - sym(1).UiObjectMemberList, sym(2).UiObjectMember); + sym(1).UiObjectMemberList, sym(2).UiAttributeList, sym(3).UiObjectMember); sym(1).Node = node; } break; -case 24: { +case 34: { sym(1).Node = makeAstNode<AST::UiArrayMemberList> (driver->nodePool(), sym(1).UiObjectMember); } break; -case 25: { +case 35: { + sym(2).UiObjectMember->attributes = sym(1).UiAttributeList->finish(); + sym(1).Node = makeAstNode<AST::UiArrayMemberList> (driver->nodePool(), sym(2).UiObjectMember); +} break; + +case 36: { + sym(4).UiObjectMember->attributes = sym(3).UiAttributeList; AST::UiArrayMemberList *node = makeAstNode<AST::UiArrayMemberList> (driver->nodePool(), sym(1).UiArrayMemberList, sym(3).UiObjectMember); node->commaToken = loc(2); sym(1).Node = node; } break; -case 26: { +case 37: { AST::UiObjectInitializer *node = makeAstNode<AST::UiObjectInitializer> (driver->nodePool(), (AST::UiObjectMemberList*)0); node->lbraceToken = loc(1); node->rbraceToken = loc(2); sym(1).Node = node; } break; -case 27: { +case 38: { AST::UiObjectInitializer *node = makeAstNode<AST::UiObjectInitializer> (driver->nodePool(), sym(2).UiObjectMemberList->finish()); node->lbraceToken = loc(1); node->rbraceToken = loc(3); sym(1).Node = node; } break; -case 28: { +case 39: { AST::UiObjectDefinition *node = makeAstNode<AST::UiObjectDefinition> (driver->nodePool(), sym(1).UiQualifiedId->finish(), sym(2).UiObjectInitializer); sym(1).Node = node; } break; -case 30: { +case 41: { AST::UiArrayBinding *node = makeAstNode<AST::UiArrayBinding> (driver->nodePool(), sym(1).UiQualifiedId->finish(), sym(4).UiArrayMemberList->finish()); node->colonToken = loc(2); @@ -345,7 +394,7 @@ case 30: { sym(1).Node = node; } break; -case 31: { +case 42: { if (AST::UiQualifiedId *qualifiedId = reparseAsQualifiedId(sym(3).Expression)) { AST::UiObjectBinding *node = makeAstNode<AST::UiObjectBinding> (driver->nodePool(), sym(1).UiQualifiedId->finish(), qualifiedId, sym(4).UiObjectInitializer); @@ -360,7 +409,7 @@ case 31: { return false; // ### recover } } break; -case 32:case 33:case 34:case 35: +case 43:case 44:case 45:case 46: { AST::UiScriptBinding *node = makeAstNode<AST::UiScriptBinding> (driver->nodePool(), sym(1).UiQualifiedId->finish(), sym(3).Statement); @@ -368,35 +417,35 @@ case 32:case 33:case 34:case 35: sym(1).Node = node; } break; -case 36: +case 47: -case 37: { +case 48: { sym(1).sval = driver->intern(lexer->characterBuffer(), lexer->characterCount()); break; } -case 39: { +case 50: { sym(1).Node = 0; } break; -case 40: { +case 51: { sym(1).Node = sym(1).UiParameterList->finish (); } break; -case 41: { +case 52: { AST::UiParameterList *node = makeAstNode<AST::UiParameterList> (driver->nodePool(), sym(1).sval, sym(2).sval); node->identifierToken = loc(2); sym(1).Node = node; } break; -case 42: { +case 53: { AST::UiParameterList *node = makeAstNode<AST::UiParameterList> (driver->nodePool(), sym(1).UiParameterList, sym(3).sval, sym(4).sval); node->commaToken = loc(2); node->identifierToken = loc(4); sym(1).Node = node; } break; -case 43: { +case 54: { AST::UiPublicMember *node = makeAstNode<AST::UiPublicMember> (driver->nodePool(), (NameId *)0, sym(2).sval); node->type = AST::UiPublicMember::Signal; node->propertyToken = loc(1); @@ -406,7 +455,7 @@ case 43: { sym(1).Node = node; } break; -case 44: { +case 55: { AST::UiPublicMember *node = makeAstNode<AST::UiPublicMember> (driver->nodePool(), (NameId *)0, sym(2).sval); node->type = AST::UiPublicMember::Signal; node->propertyToken = loc(1); @@ -415,7 +464,7 @@ case 44: { sym(1).Node = node; } break; -case 46: { +case 57: { AST::UiPublicMember *node = makeAstNode<AST::UiPublicMember> (driver->nodePool(), sym(2).sval, sym(3).sval); node->propertyToken = loc(1); node->typeToken = loc(2); @@ -424,7 +473,7 @@ case 46: { sym(1).Node = node; } break; -case 48: { +case 59: { AST::UiPublicMember *node = makeAstNode<AST::UiPublicMember> (driver->nodePool(), sym(3).sval, sym(4).sval); node->isDefaultMember = true; node->defaultToken = loc(1); @@ -435,7 +484,7 @@ case 48: { sym(1).Node = node; } break; -case 50: { +case 61: { AST::UiPublicMember *node = makeAstNode<AST::UiPublicMember> (driver->nodePool(), sym(2).sval, sym(3).sval, sym(5).Expression); node->propertyToken = loc(1); @@ -446,7 +495,7 @@ case 50: { sym(1).Node = node; } break; -case 52: { +case 63: { AST::UiPublicMember *node = makeAstNode<AST::UiPublicMember> (driver->nodePool(), sym(3).sval, sym(4).sval, sym(6).Expression); node->isDefaultMember = true; @@ -459,76 +508,76 @@ case 52: { sym(1).Node = node; } break; -case 53: { +case 64: { sym(1).Node = makeAstNode<AST::UiSourceElement>(driver->nodePool(), sym(1).Node); } break; -case 54: { +case 65: { sym(1).Node = makeAstNode<AST::UiSourceElement>(driver->nodePool(), sym(1).Node); } break; -case 55: -case 56: +case 66: +case 67: { AST::UiQualifiedId *node = makeAstNode<AST::UiQualifiedId> (driver->nodePool(), driver->intern(lexer->characterBuffer(), lexer->characterCount())); node->identifierToken = loc(1); sym(1).Node = node; } break; -case 58: { +case 69: { QString s = QLatin1String(QmlJSGrammar::spell[T_PROPERTY]); sym(1).sval = driver->intern(s.constData(), s.length()); break; } -case 59: { +case 70: { QString s = QLatin1String(QmlJSGrammar::spell[T_SIGNAL]); sym(1).sval = driver->intern(s.constData(), s.length()); break; } -case 60: { +case 71: { AST::ThisExpression *node = makeAstNode<AST::ThisExpression> (driver->nodePool()); node->thisToken = loc(1); sym(1).Node = node; } break; -case 61: { +case 72: { AST::IdentifierExpression *node = makeAstNode<AST::IdentifierExpression> (driver->nodePool(), sym(1).sval); node->identifierToken = loc(1); sym(1).Node = node; } break; -case 62: { +case 73: { AST::NullExpression *node = makeAstNode<AST::NullExpression> (driver->nodePool()); node->nullToken = loc(1); sym(1).Node = node; } break; -case 63: { +case 74: { AST::TrueLiteral *node = makeAstNode<AST::TrueLiteral> (driver->nodePool()); node->trueToken = loc(1); sym(1).Node = node; } break; -case 64: { +case 75: { AST::FalseLiteral *node = makeAstNode<AST::FalseLiteral> (driver->nodePool()); node->falseToken = loc(1); sym(1).Node = node; } break; -case 65: { +case 76: { AST::NumericLiteral *node = makeAstNode<AST::NumericLiteral> (driver->nodePool(), sym(1).dval, lexer->flags); node->literalToken = loc(1); sym(1).Node = node; } break; -case 66: -case 67: { +case 77: +case 78: { AST::StringLiteral *node = makeAstNode<AST::StringLiteral> (driver->nodePool(), sym(1).sval); node->literalToken = loc(1); sym(1).Node = node; } break; -case 68: { +case 79: { bool rx = lexer->scanRegExp(Lexer::NoPrefix); if (!rx) { diagnostic_messages.append(DiagnosticMessage(DiagnosticMessage::Error, location(lexer), lexer->errorMessage())); @@ -539,7 +588,7 @@ case 68: { sym(1).Node = node; } break; -case 69: { +case 80: { bool rx = lexer->scanRegExp(Lexer::EqualPrefix); if (!rx) { diagnostic_messages.append(DiagnosticMessage(DiagnosticMessage::Error, location(lexer), lexer->errorMessage())); @@ -550,28 +599,28 @@ case 69: { sym(1).Node = node; } break; -case 70: { +case 81: { AST::ArrayLiteral *node = makeAstNode<AST::ArrayLiteral> (driver->nodePool(), (AST::Elision *) 0); node->lbracketToken = loc(1); node->rbracketToken = loc(2); sym(1).Node = node; } break; -case 71: { +case 82: { AST::ArrayLiteral *node = makeAstNode<AST::ArrayLiteral> (driver->nodePool(), sym(2).Elision->finish()); node->lbracketToken = loc(1); node->rbracketToken = loc(3); sym(1).Node = node; } break; -case 72: { +case 83: { AST::ArrayLiteral *node = makeAstNode<AST::ArrayLiteral> (driver->nodePool(), sym(2).ElementList->finish ()); node->lbracketToken = loc(1); node->rbracketToken = loc(3); sym(1).Node = node; } break; -case 73: { +case 84: { AST::ArrayLiteral *node = makeAstNode<AST::ArrayLiteral> (driver->nodePool(), sym(2).ElementList->finish (), (AST::Elision *) 0); node->lbracketToken = loc(1); @@ -580,7 +629,7 @@ case 73: { sym(1).Node = node; } break; -case 74: { +case 85: { AST::ArrayLiteral *node = makeAstNode<AST::ArrayLiteral> (driver->nodePool(), sym(2).ElementList->finish (), sym(4).Elision->finish()); node->lbracketToken = loc(1); @@ -589,7 +638,7 @@ case 74: { sym(1).Node = node; } break; -case 75: { +case 86: { AST::ObjectLiteral *node = 0; if (sym(2).Node) node = makeAstNode<AST::ObjectLiteral> (driver->nodePool(), @@ -601,7 +650,7 @@ case 75: { sym(1).Node = node; } break; -case 76: { +case 87: { AST::ObjectLiteral *node = makeAstNode<AST::ObjectLiteral> (driver->nodePool(), sym(2).PropertyNameAndValueList->finish ()); node->lbraceToken = loc(1); @@ -609,67 +658,67 @@ case 76: { sym(1).Node = node; } break; -case 77: { +case 88: { AST::NestedExpression *node = makeAstNode<AST::NestedExpression>(driver->nodePool(), sym(2).Expression); node->lparenToken = loc(1); node->rparenToken = loc(3); sym(1).Node = node; } break; -case 78: { +case 89: { AST::UiQualifiedId *node = makeAstNode<AST::UiQualifiedId> (driver->nodePool(), sym(1).sval); node->identifierToken = loc(1); sym(1).Node = node; } break; -case 79: { +case 90: { AST::UiQualifiedId *node = makeAstNode<AST::UiQualifiedId> (driver->nodePool(), sym(1).UiQualifiedId, sym(3).sval); node->identifierToken = loc(3); sym(1).Node = node; } break; -case 80: { +case 91: { sym(1).Node = makeAstNode<AST::ElementList> (driver->nodePool(), (AST::Elision *) 0, sym(1).Expression); } break; -case 81: { +case 92: { sym(1).Node = makeAstNode<AST::ElementList> (driver->nodePool(), sym(1).Elision->finish(), sym(2).Expression); } break; -case 82: { +case 93: { AST::ElementList *node = makeAstNode<AST::ElementList> (driver->nodePool(), sym(1).ElementList, (AST::Elision *) 0, sym(3).Expression); node->commaToken = loc(2); sym(1).Node = node; } break; -case 83: { +case 94: { AST::ElementList *node = makeAstNode<AST::ElementList> (driver->nodePool(), sym(1).ElementList, sym(3).Elision->finish(), sym(4).Expression); node->commaToken = loc(2); sym(1).Node = node; } break; -case 84: { +case 95: { AST::Elision *node = makeAstNode<AST::Elision> (driver->nodePool()); node->commaToken = loc(1); sym(1).Node = node; } break; -case 85: { +case 96: { AST::Elision *node = makeAstNode<AST::Elision> (driver->nodePool(), sym(1).Elision); node->commaToken = loc(2); sym(1).Node = node; } break; -case 86: { +case 97: { AST::PropertyNameAndValueList *node = makeAstNode<AST::PropertyNameAndValueList> (driver->nodePool(), sym(1).PropertyName, sym(3).Expression); node->colonToken = loc(2); sym(1).Node = node; } break; -case 87: { +case 98: { AST::PropertyNameAndValueList *node = makeAstNode<AST::PropertyNameAndValueList> (driver->nodePool(), sym(1).PropertyNameAndValueList, sym(3).PropertyName, sym(5).Expression); node->commaToken = loc(2); @@ -677,58 +726,36 @@ case 87: { sym(1).Node = node; } break; -case 88: { +case 99: { AST::IdentifierPropertyName *node = makeAstNode<AST::IdentifierPropertyName> (driver->nodePool(), sym(1).sval); node->propertyNameToken = loc(1); sym(1).Node = node; } break; -case 89: -case 90: { +case 100: +case 101: { AST::IdentifierPropertyName *node = makeAstNode<AST::IdentifierPropertyName> (driver->nodePool(), driver->intern(lexer->characterBuffer(), lexer->characterCount())); node->propertyNameToken = loc(1); sym(1).Node = node; } break; -case 91: { +case 102: { AST::StringLiteralPropertyName *node = makeAstNode<AST::StringLiteralPropertyName> (driver->nodePool(), sym(1).sval); node->propertyNameToken = loc(1); sym(1).Node = node; } break; -case 92: { +case 103: { AST::NumericLiteralPropertyName *node = makeAstNode<AST::NumericLiteralPropertyName> (driver->nodePool(), sym(1).dval); node->propertyNameToken = loc(1); sym(1).Node = node; } break; -case 93: { +case 104: { AST::IdentifierPropertyName *node = makeAstNode<AST::IdentifierPropertyName> (driver->nodePool(), sym(1).sval); node->propertyNameToken = loc(1); sym(1).Node = node; } break; -case 94: - -case 95: - -case 96: - -case 97: - -case 98: - -case 99: - -case 100: - -case 101: - -case 102: - -case 103: - -case 104: - case 105: case 106: @@ -768,25 +795,47 @@ case 122: case 123: case 124: + +case 125: + +case 126: + +case 127: + +case 128: + +case 129: + +case 130: + +case 131: + +case 132: + +case 133: + +case 134: + +case 135: { sym(1).sval = driver->intern(lexer->characterBuffer(), lexer->characterCount()); } break; -case 129: { +case 140: { AST::ArrayMemberExpression *node = makeAstNode<AST::ArrayMemberExpression> (driver->nodePool(), sym(1).Expression, sym(3).Expression); node->lbracketToken = loc(2); node->rbracketToken = loc(4); sym(1).Node = node; } break; -case 130: { +case 141: { AST::FieldMemberExpression *node = makeAstNode<AST::FieldMemberExpression> (driver->nodePool(), sym(1).Expression, sym(3).sval); node->dotToken = loc(2); node->identifierToken = loc(3); sym(1).Node = node; } break; -case 131: { +case 142: { AST::NewMemberExpression *node = makeAstNode<AST::NewMemberExpression> (driver->nodePool(), sym(2).Expression, sym(4).ArgumentList); node->newToken = loc(1); node->lparenToken = loc(3); @@ -794,384 +843,384 @@ case 131: { sym(1).Node = node; } break; -case 133: { +case 144: { AST::NewExpression *node = makeAstNode<AST::NewExpression> (driver->nodePool(), sym(2).Expression); node->newToken = loc(1); sym(1).Node = node; } break; -case 134: { +case 145: { AST::CallExpression *node = makeAstNode<AST::CallExpression> (driver->nodePool(), sym(1).Expression, sym(3).ArgumentList); node->lparenToken = loc(2); node->rparenToken = loc(4); sym(1).Node = node; } break; -case 135: { +case 146: { AST::CallExpression *node = makeAstNode<AST::CallExpression> (driver->nodePool(), sym(1).Expression, sym(3).ArgumentList); node->lparenToken = loc(2); node->rparenToken = loc(4); sym(1).Node = node; } break; -case 136: { +case 147: { AST::ArrayMemberExpression *node = makeAstNode<AST::ArrayMemberExpression> (driver->nodePool(), sym(1).Expression, sym(3).Expression); node->lbracketToken = loc(2); node->rbracketToken = loc(4); sym(1).Node = node; } break; -case 137: { +case 148: { AST::FieldMemberExpression *node = makeAstNode<AST::FieldMemberExpression> (driver->nodePool(), sym(1).Expression, sym(3).sval); node->dotToken = loc(2); node->identifierToken = loc(3); sym(1).Node = node; } break; -case 138: { +case 149: { sym(1).Node = 0; } break; -case 139: { +case 150: { sym(1).Node = sym(1).ArgumentList->finish(); } break; -case 140: { +case 151: { sym(1).Node = makeAstNode<AST::ArgumentList> (driver->nodePool(), sym(1).Expression); } break; -case 141: { +case 152: { AST::ArgumentList *node = makeAstNode<AST::ArgumentList> (driver->nodePool(), sym(1).ArgumentList, sym(3).Expression); node->commaToken = loc(2); sym(1).Node = node; } break; -case 145: { +case 156: { AST::PostIncrementExpression *node = makeAstNode<AST::PostIncrementExpression> (driver->nodePool(), sym(1).Expression); node->incrementToken = loc(2); sym(1).Node = node; } break; -case 146: { +case 157: { AST::PostDecrementExpression *node = makeAstNode<AST::PostDecrementExpression> (driver->nodePool(), sym(1).Expression); node->decrementToken = loc(2); sym(1).Node = node; } break; -case 148: { +case 159: { AST::DeleteExpression *node = makeAstNode<AST::DeleteExpression> (driver->nodePool(), sym(2).Expression); node->deleteToken = loc(1); sym(1).Node = node; } break; -case 149: { +case 160: { AST::VoidExpression *node = makeAstNode<AST::VoidExpression> (driver->nodePool(), sym(2).Expression); node->voidToken = loc(1); sym(1).Node = node; } break; -case 150: { +case 161: { AST::TypeOfExpression *node = makeAstNode<AST::TypeOfExpression> (driver->nodePool(), sym(2).Expression); node->typeofToken = loc(1); sym(1).Node = node; } break; -case 151: { +case 162: { AST::PreIncrementExpression *node = makeAstNode<AST::PreIncrementExpression> (driver->nodePool(), sym(2).Expression); node->incrementToken = loc(1); sym(1).Node = node; } break; -case 152: { +case 163: { AST::PreDecrementExpression *node = makeAstNode<AST::PreDecrementExpression> (driver->nodePool(), sym(2).Expression); node->decrementToken = loc(1); sym(1).Node = node; } break; -case 153: { +case 164: { AST::UnaryPlusExpression *node = makeAstNode<AST::UnaryPlusExpression> (driver->nodePool(), sym(2).Expression); node->plusToken = loc(1); sym(1).Node = node; } break; -case 154: { +case 165: { AST::UnaryMinusExpression *node = makeAstNode<AST::UnaryMinusExpression> (driver->nodePool(), sym(2).Expression); node->minusToken = loc(1); sym(1).Node = node; } break; -case 155: { +case 166: { AST::TildeExpression *node = makeAstNode<AST::TildeExpression> (driver->nodePool(), sym(2).Expression); node->tildeToken = loc(1); sym(1).Node = node; } break; -case 156: { +case 167: { AST::NotExpression *node = makeAstNode<AST::NotExpression> (driver->nodePool(), sym(2).Expression); node->notToken = loc(1); sym(1).Node = node; } break; -case 158: { +case 169: { AST::BinaryExpression *node = makeAstNode<AST::BinaryExpression> (driver->nodePool(), sym(1).Expression, QSOperator::Mul, sym(3).Expression); node->operatorToken = loc(2); sym(1).Node = node; } break; -case 159: { +case 170: { AST::BinaryExpression *node = makeAstNode<AST::BinaryExpression> (driver->nodePool(), sym(1).Expression, QSOperator::Div, sym(3).Expression); node->operatorToken = loc(2); sym(1).Node = node; } break; -case 160: { +case 171: { AST::BinaryExpression *node = makeAstNode<AST::BinaryExpression> (driver->nodePool(), sym(1).Expression, QSOperator::Mod, sym(3).Expression); node->operatorToken = loc(2); sym(1).Node = node; } break; -case 162: { +case 173: { AST::BinaryExpression *node = makeAstNode<AST::BinaryExpression> (driver->nodePool(), sym(1).Expression, QSOperator::Add, sym(3).Expression); node->operatorToken = loc(2); sym(1).Node = node; } break; -case 163: { +case 174: { AST::BinaryExpression *node = makeAstNode<AST::BinaryExpression> (driver->nodePool(), sym(1).Expression, QSOperator::Sub, sym(3).Expression); node->operatorToken = loc(2); sym(1).Node = node; } break; -case 165: { +case 176: { AST::BinaryExpression *node = makeAstNode<AST::BinaryExpression> (driver->nodePool(), sym(1).Expression, QSOperator::LShift, sym(3).Expression); node->operatorToken = loc(2); sym(1).Node = node; } break; -case 166: { +case 177: { AST::BinaryExpression *node = makeAstNode<AST::BinaryExpression> (driver->nodePool(), sym(1).Expression, QSOperator::RShift, sym(3).Expression); node->operatorToken = loc(2); sym(1).Node = node; } break; -case 167: { +case 178: { AST::BinaryExpression *node = makeAstNode<AST::BinaryExpression> (driver->nodePool(), sym(1).Expression, QSOperator::URShift, sym(3).Expression); node->operatorToken = loc(2); sym(1).Node = node; } break; -case 169: { +case 180: { AST::BinaryExpression *node = makeAstNode<AST::BinaryExpression> (driver->nodePool(), sym(1).Expression, QSOperator::Lt, sym(3).Expression); node->operatorToken = loc(2); sym(1).Node = node; } break; -case 170: { +case 181: { AST::BinaryExpression *node = makeAstNode<AST::BinaryExpression> (driver->nodePool(), sym(1).Expression, QSOperator::Gt, sym(3).Expression); node->operatorToken = loc(2); sym(1).Node = node; } break; -case 171: { +case 182: { AST::BinaryExpression *node = makeAstNode<AST::BinaryExpression> (driver->nodePool(), sym(1).Expression, QSOperator::Le, sym(3).Expression); node->operatorToken = loc(2); sym(1).Node = node; } break; -case 172: { +case 183: { AST::BinaryExpression *node = makeAstNode<AST::BinaryExpression> (driver->nodePool(), sym(1).Expression, QSOperator::Ge, sym(3).Expression); node->operatorToken = loc(2); sym(1).Node = node; } break; -case 173: { +case 184: { AST::BinaryExpression *node = makeAstNode<AST::BinaryExpression> (driver->nodePool(), sym(1).Expression, QSOperator::InstanceOf, sym(3).Expression); node->operatorToken = loc(2); sym(1).Node = node; } break; -case 174: { +case 185: { AST::BinaryExpression *node = makeAstNode<AST::BinaryExpression> (driver->nodePool(), sym(1).Expression, QSOperator::In, sym(3).Expression); node->operatorToken = loc(2); sym(1).Node = node; } break; -case 176: { +case 187: { AST::BinaryExpression *node = makeAstNode<AST::BinaryExpression> (driver->nodePool(), sym(1).Expression, QSOperator::Lt, sym(3).Expression); node->operatorToken = loc(2); sym(1).Node = node; } break; -case 177: { +case 188: { AST::BinaryExpression *node = makeAstNode<AST::BinaryExpression> (driver->nodePool(), sym(1).Expression, QSOperator::Gt, sym(3).Expression); node->operatorToken = loc(2); sym(1).Node = node; } break; -case 178: { +case 189: { AST::BinaryExpression *node = makeAstNode<AST::BinaryExpression> (driver->nodePool(), sym(1).Expression, QSOperator::Le, sym(3).Expression); node->operatorToken = loc(2); sym(1).Node = node; } break; -case 179: { +case 190: { AST::BinaryExpression *node = makeAstNode<AST::BinaryExpression> (driver->nodePool(), sym(1).Expression, QSOperator::Ge, sym(3).Expression); node->operatorToken = loc(2); sym(1).Node = node; } break; -case 180: { +case 191: { AST::BinaryExpression *node = makeAstNode<AST::BinaryExpression> (driver->nodePool(), sym(1).Expression, QSOperator::InstanceOf, sym(3).Expression); node->operatorToken = loc(2); sym(1).Node = node; } break; -case 182: { +case 193: { AST::BinaryExpression *node = makeAstNode<AST::BinaryExpression> (driver->nodePool(), sym(1).Expression, QSOperator::Equal, sym(3).Expression); node->operatorToken = loc(2); sym(1).Node = node; } break; -case 183: { +case 194: { AST::BinaryExpression *node = makeAstNode<AST::BinaryExpression> (driver->nodePool(), sym(1).Expression, QSOperator::NotEqual, sym(3).Expression); node->operatorToken = loc(2); sym(1).Node = node; } break; -case 184: { +case 195: { AST::BinaryExpression *node = makeAstNode<AST::BinaryExpression> (driver->nodePool(), sym(1).Expression, QSOperator::StrictEqual, sym(3).Expression); node->operatorToken = loc(2); sym(1).Node = node; } break; -case 185: { +case 196: { AST::BinaryExpression *node = makeAstNode<AST::BinaryExpression> (driver->nodePool(), sym(1).Expression, QSOperator::StrictNotEqual, sym(3).Expression); node->operatorToken = loc(2); sym(1).Node = node; } break; -case 187: { +case 198: { AST::BinaryExpression *node = makeAstNode<AST::BinaryExpression> (driver->nodePool(), sym(1).Expression, QSOperator::Equal, sym(3).Expression); node->operatorToken = loc(2); sym(1).Node = node; } break; -case 188: { +case 199: { AST::BinaryExpression *node = makeAstNode<AST::BinaryExpression> (driver->nodePool(), sym(1).Expression, QSOperator::NotEqual, sym(3).Expression); node->operatorToken = loc(2); sym(1).Node = node; } break; -case 189: { +case 200: { AST::BinaryExpression *node = makeAstNode<AST::BinaryExpression> (driver->nodePool(), sym(1).Expression, QSOperator::StrictEqual, sym(3).Expression); node->operatorToken = loc(2); sym(1).Node = node; } break; -case 190: { +case 201: { AST::BinaryExpression *node = makeAstNode<AST::BinaryExpression> (driver->nodePool(), sym(1).Expression, QSOperator::StrictNotEqual, sym(3).Expression); node->operatorToken = loc(2); sym(1).Node = node; } break; -case 192: { +case 203: { AST::BinaryExpression *node = makeAstNode<AST::BinaryExpression> (driver->nodePool(), sym(1).Expression, QSOperator::BitAnd, sym(3).Expression); node->operatorToken = loc(2); sym(1).Node = node; } break; -case 194: { +case 205: { AST::BinaryExpression *node = makeAstNode<AST::BinaryExpression> (driver->nodePool(), sym(1).Expression, QSOperator::BitAnd, sym(3).Expression); node->operatorToken = loc(2); sym(1).Node = node; } break; -case 196: { +case 207: { AST::BinaryExpression *node = makeAstNode<AST::BinaryExpression> (driver->nodePool(), sym(1).Expression, QSOperator::BitXor, sym(3).Expression); node->operatorToken = loc(2); sym(1).Node = node; } break; -case 198: { +case 209: { AST::BinaryExpression *node = makeAstNode<AST::BinaryExpression> (driver->nodePool(), sym(1).Expression, QSOperator::BitXor, sym(3).Expression); node->operatorToken = loc(2); sym(1).Node = node; } break; -case 200: { +case 211: { AST::BinaryExpression *node = makeAstNode<AST::BinaryExpression> (driver->nodePool(), sym(1).Expression, QSOperator::BitOr, sym(3).Expression); node->operatorToken = loc(2); sym(1).Node = node; } break; -case 202: { +case 213: { AST::BinaryExpression *node = makeAstNode<AST::BinaryExpression> (driver->nodePool(), sym(1).Expression, QSOperator::BitOr, sym(3).Expression); node->operatorToken = loc(2); sym(1).Node = node; } break; -case 204: { +case 215: { AST::BinaryExpression *node = makeAstNode<AST::BinaryExpression> (driver->nodePool(), sym(1).Expression, QSOperator::And, sym(3).Expression); node->operatorToken = loc(2); sym(1).Node = node; } break; -case 206: { +case 217: { AST::BinaryExpression *node = makeAstNode<AST::BinaryExpression> (driver->nodePool(), sym(1).Expression, QSOperator::And, sym(3).Expression); node->operatorToken = loc(2); sym(1).Node = node; } break; -case 208: { +case 219: { AST::BinaryExpression *node = makeAstNode<AST::BinaryExpression> (driver->nodePool(), sym(1).Expression, QSOperator::Or, sym(3).Expression); node->operatorToken = loc(2); sym(1).Node = node; } break; -case 210: { +case 221: { AST::BinaryExpression *node = makeAstNode<AST::BinaryExpression> (driver->nodePool(), sym(1).Expression, QSOperator::Or, sym(3).Expression); node->operatorToken = loc(2); sym(1).Node = node; } break; -case 212: { +case 223: { AST::ConditionalExpression *node = makeAstNode<AST::ConditionalExpression> (driver->nodePool(), sym(1).Expression, sym(3).Expression, sym(5).Expression); node->questionToken = loc(2); @@ -1179,7 +1228,7 @@ case 212: { sym(1).Node = node; } break; -case 214: { +case 225: { AST::ConditionalExpression *node = makeAstNode<AST::ConditionalExpression> (driver->nodePool(), sym(1).Expression, sym(3).Expression, sym(5).Expression); node->questionToken = loc(2); @@ -1187,112 +1236,112 @@ case 214: { sym(1).Node = node; } break; -case 216: { +case 227: { AST::BinaryExpression *node = makeAstNode<AST::BinaryExpression> (driver->nodePool(), sym(1).Expression, sym(2).ival, sym(3).Expression); node->operatorToken = loc(2); sym(1).Node = node; } break; -case 218: { +case 229: { AST::BinaryExpression *node = makeAstNode<AST::BinaryExpression> (driver->nodePool(), sym(1).Expression, sym(2).ival, sym(3).Expression); node->operatorToken = loc(2); sym(1).Node = node; } break; -case 219: { +case 230: { sym(1).ival = QSOperator::Assign; } break; -case 220: { +case 231: { sym(1).ival = QSOperator::InplaceMul; } break; -case 221: { +case 232: { sym(1).ival = QSOperator::InplaceDiv; } break; -case 222: { +case 233: { sym(1).ival = QSOperator::InplaceMod; } break; -case 223: { +case 234: { sym(1).ival = QSOperator::InplaceAdd; } break; -case 224: { +case 235: { sym(1).ival = QSOperator::InplaceSub; } break; -case 225: { +case 236: { sym(1).ival = QSOperator::InplaceLeftShift; } break; -case 226: { +case 237: { sym(1).ival = QSOperator::InplaceRightShift; } break; -case 227: { +case 238: { sym(1).ival = QSOperator::InplaceURightShift; } break; -case 228: { +case 239: { sym(1).ival = QSOperator::InplaceAnd; } break; -case 229: { +case 240: { sym(1).ival = QSOperator::InplaceXor; } break; -case 230: { +case 241: { sym(1).ival = QSOperator::InplaceOr; } break; -case 232: { +case 243: { AST::Expression *node = makeAstNode<AST::Expression> (driver->nodePool(), sym(1).Expression, sym(3).Expression); node->commaToken = loc(2); sym(1).Node = node; } break; -case 233: { +case 244: { sym(1).Node = 0; } break; -case 236: { +case 247: { AST::Expression *node = makeAstNode<AST::Expression> (driver->nodePool(), sym(1).Expression, sym(3).Expression); node->commaToken = loc(2); sym(1).Node = node; } break; -case 237: { +case 248: { sym(1).Node = 0; } break; -case 254: { +case 265: { AST::Block *node = makeAstNode<AST::Block> (driver->nodePool(), sym(2).StatementList); node->lbraceToken = loc(1); node->rbraceToken = loc(3); sym(1).Node = node; } break; -case 255: { +case 266: { sym(1).Node = makeAstNode<AST::StatementList> (driver->nodePool(), sym(1).Statement); } break; -case 256: { +case 267: { sym(1).Node = makeAstNode<AST::StatementList> (driver->nodePool(), sym(1).StatementList, sym(2).Statement); } break; -case 257: { +case 268: { sym(1).Node = 0; } break; -case 258: { +case 269: { sym(1).Node = sym(1).StatementList->finish (); } break; -case 260: { +case 271: { AST::VariableStatement *node = makeAstNode<AST::VariableStatement> (driver->nodePool(), sym(2).VariableDeclarationList->finish (/*readOnly=*/sym(1).ival == T_CONST)); node->declarationKindToken = loc(1); @@ -1300,76 +1349,76 @@ case 260: { sym(1).Node = node; } break; -case 261: { +case 272: { sym(1).ival = T_CONST; } break; -case 262: { +case 273: { sym(1).ival = T_VAR; } break; -case 263: { +case 274: { sym(1).Node = makeAstNode<AST::VariableDeclarationList> (driver->nodePool(), sym(1).VariableDeclaration); } break; -case 264: { +case 275: { AST::VariableDeclarationList *node = makeAstNode<AST::VariableDeclarationList> (driver->nodePool(), sym(1).VariableDeclarationList, sym(3).VariableDeclaration); node->commaToken = loc(2); sym(1).Node = node; } break; -case 265: { +case 276: { sym(1).Node = makeAstNode<AST::VariableDeclarationList> (driver->nodePool(), sym(1).VariableDeclaration); } break; -case 266: { +case 277: { sym(1).Node = makeAstNode<AST::VariableDeclarationList> (driver->nodePool(), sym(1).VariableDeclarationList, sym(3).VariableDeclaration); } break; -case 267: { +case 278: { AST::VariableDeclaration *node = makeAstNode<AST::VariableDeclaration> (driver->nodePool(), sym(1).sval, sym(2).Expression); node->identifierToken = loc(1); sym(1).Node = node; } break; -case 268: { +case 279: { AST::VariableDeclaration *node = makeAstNode<AST::VariableDeclaration> (driver->nodePool(), sym(1).sval, sym(2).Expression); node->identifierToken = loc(1); sym(1).Node = node; } break; -case 269: { +case 280: { // ### TODO: AST for initializer sym(1) = sym(2); } break; -case 270: { +case 281: { sym(1).Node = 0; } break; -case 272: { +case 283: { // ### TODO: AST for initializer sym(1) = sym(2); } break; -case 273: { +case 284: { sym(1).Node = 0; } break; -case 275: { +case 286: { AST::EmptyStatement *node = makeAstNode<AST::EmptyStatement> (driver->nodePool()); node->semicolonToken = loc(1); sym(1).Node = node; } break; -case 277: { +case 288: { AST::ExpressionStatement *node = makeAstNode<AST::ExpressionStatement> (driver->nodePool(), sym(1).Expression); node->semicolonToken = loc(2); sym(1).Node = node; } break; -case 278: { +case 289: { AST::IfStatement *node = makeAstNode<AST::IfStatement> (driver->nodePool(), sym(3).Expression, sym(5).Statement, sym(7).Statement); node->ifToken = loc(1); node->lparenToken = loc(2); @@ -1378,7 +1427,7 @@ case 278: { sym(1).Node = node; } break; -case 279: { +case 290: { AST::IfStatement *node = makeAstNode<AST::IfStatement> (driver->nodePool(), sym(3).Expression, sym(5).Statement); node->ifToken = loc(1); node->lparenToken = loc(2); @@ -1386,7 +1435,7 @@ case 279: { sym(1).Node = node; } break; -case 281: { +case 292: { AST::DoWhileStatement *node = makeAstNode<AST::DoWhileStatement> (driver->nodePool(), sym(2).Statement, sym(5).Expression); node->doToken = loc(1); node->whileToken = loc(3); @@ -1396,7 +1445,7 @@ case 281: { sym(1).Node = node; } break; -case 282: { +case 293: { AST::WhileStatement *node = makeAstNode<AST::WhileStatement> (driver->nodePool(), sym(3).Expression, sym(5).Statement); node->whileToken = loc(1); node->lparenToken = loc(2); @@ -1404,7 +1453,7 @@ case 282: { sym(1).Node = node; } break; -case 283: { +case 294: { AST::ForStatement *node = makeAstNode<AST::ForStatement> (driver->nodePool(), sym(3).Expression, sym(5).Expression, sym(7).Expression, sym(9).Statement); node->forToken = loc(1); @@ -1415,7 +1464,7 @@ case 283: { sym(1).Node = node; } break; -case 284: { +case 295: { AST::LocalForStatement *node = makeAstNode<AST::LocalForStatement> (driver->nodePool(), sym(4).VariableDeclarationList->finish (/*readOnly=*/false), sym(6).Expression, sym(8).Expression, sym(10).Statement); @@ -1428,7 +1477,7 @@ case 284: { sym(1).Node = node; } break; -case 285: { +case 296: { AST:: ForEachStatement *node = makeAstNode<AST::ForEachStatement> (driver->nodePool(), sym(3).Expression, sym(5).Expression, sym(7).Statement); node->forToken = loc(1); @@ -1438,7 +1487,7 @@ case 285: { sym(1).Node = node; } break; -case 286: { +case 297: { AST::LocalForEachStatement *node = makeAstNode<AST::LocalForEachStatement> (driver->nodePool(), sym(4).VariableDeclaration, sym(6).Expression, sym(8).Statement); node->forToken = loc(1); @@ -1449,14 +1498,14 @@ case 286: { sym(1).Node = node; } break; -case 288: { +case 299: { AST::ContinueStatement *node = makeAstNode<AST::ContinueStatement> (driver->nodePool()); node->continueToken = loc(1); node->semicolonToken = loc(2); sym(1).Node = node; } break; -case 290: { +case 301: { AST::ContinueStatement *node = makeAstNode<AST::ContinueStatement> (driver->nodePool(), sym(2).sval); node->continueToken = loc(1); node->identifierToken = loc(2); @@ -1464,14 +1513,14 @@ case 290: { sym(1).Node = node; } break; -case 292: { +case 303: { AST::BreakStatement *node = makeAstNode<AST::BreakStatement> (driver->nodePool()); node->breakToken = loc(1); node->semicolonToken = loc(2); sym(1).Node = node; } break; -case 294: { +case 305: { AST::BreakStatement *node = makeAstNode<AST::BreakStatement> (driver->nodePool(), sym(2).sval); node->breakToken = loc(1); node->identifierToken = loc(2); @@ -1479,14 +1528,14 @@ case 294: { sym(1).Node = node; } break; -case 296: { +case 307: { AST::ReturnStatement *node = makeAstNode<AST::ReturnStatement> (driver->nodePool(), sym(2).Expression); node->returnToken = loc(1); node->semicolonToken = loc(3); sym(1).Node = node; } break; -case 297: { +case 308: { AST::WithStatement *node = makeAstNode<AST::WithStatement> (driver->nodePool(), sym(3).Expression, sym(5).Statement); node->withToken = loc(1); node->lparenToken = loc(2); @@ -1494,7 +1543,7 @@ case 297: { sym(1).Node = node; } break; -case 298: { +case 309: { AST::SwitchStatement *node = makeAstNode<AST::SwitchStatement> (driver->nodePool(), sym(3).Expression, sym(5).CaseBlock); node->switchToken = loc(1); node->lparenToken = loc(2); @@ -1502,90 +1551,90 @@ case 298: { sym(1).Node = node; } break; -case 299: { +case 310: { AST::CaseBlock *node = makeAstNode<AST::CaseBlock> (driver->nodePool(), sym(2).CaseClauses); node->lbraceToken = loc(1); node->rbraceToken = loc(3); sym(1).Node = node; } break; -case 300: { +case 311: { AST::CaseBlock *node = makeAstNode<AST::CaseBlock> (driver->nodePool(), sym(2).CaseClauses, sym(3).DefaultClause, sym(4).CaseClauses); node->lbraceToken = loc(1); node->rbraceToken = loc(5); sym(1).Node = node; } break; -case 301: { +case 312: { sym(1).Node = makeAstNode<AST::CaseClauses> (driver->nodePool(), sym(1).CaseClause); } break; -case 302: { +case 313: { sym(1).Node = makeAstNode<AST::CaseClauses> (driver->nodePool(), sym(1).CaseClauses, sym(2).CaseClause); } break; -case 303: { +case 314: { sym(1).Node = 0; } break; -case 304: { +case 315: { sym(1).Node = sym(1).CaseClauses->finish (); } break; -case 305: { +case 316: { AST::CaseClause *node = makeAstNode<AST::CaseClause> (driver->nodePool(), sym(2).Expression, sym(4).StatementList); node->caseToken = loc(1); node->colonToken = loc(3); sym(1).Node = node; } break; -case 306: { +case 317: { AST::DefaultClause *node = makeAstNode<AST::DefaultClause> (driver->nodePool(), sym(3).StatementList); node->defaultToken = loc(1); node->colonToken = loc(2); sym(1).Node = node; } break; -case 307: -case 308: { +case 318: +case 319: { AST::LabelledStatement *node = makeAstNode<AST::LabelledStatement> (driver->nodePool(), driver->intern(lexer->characterBuffer(), lexer->characterCount()), sym(3).Statement); node->identifierToken = loc(1); node->colonToken = loc(2); sym(1).Node = node; } break; -case 309: { +case 320: { AST::LabelledStatement *node = makeAstNode<AST::LabelledStatement> (driver->nodePool(), sym(1).sval, sym(3).Statement); node->identifierToken = loc(1); node->colonToken = loc(2); sym(1).Node = node; } break; -case 311: { +case 322: { AST::ThrowStatement *node = makeAstNode<AST::ThrowStatement> (driver->nodePool(), sym(2).Expression); node->throwToken = loc(1); node->semicolonToken = loc(3); sym(1).Node = node; } break; -case 312: { +case 323: { AST::TryStatement *node = makeAstNode<AST::TryStatement> (driver->nodePool(), sym(2).Statement, sym(3).Catch); node->tryToken = loc(1); sym(1).Node = node; } break; -case 313: { +case 324: { AST::TryStatement *node = makeAstNode<AST::TryStatement> (driver->nodePool(), sym(2).Statement, sym(3).Finally); node->tryToken = loc(1); sym(1).Node = node; } break; -case 314: { +case 325: { AST::TryStatement *node = makeAstNode<AST::TryStatement> (driver->nodePool(), sym(2).Statement, sym(3).Catch, sym(4).Finally); node->tryToken = loc(1); sym(1).Node = node; } break; -case 315: { +case 326: { AST::Catch *node = makeAstNode<AST::Catch> (driver->nodePool(), sym(3).sval, sym(5).Block); node->catchToken = loc(1); node->lparenToken = loc(2); @@ -1594,20 +1643,20 @@ case 315: { sym(1).Node = node; } break; -case 316: { +case 327: { AST::Finally *node = makeAstNode<AST::Finally> (driver->nodePool(), sym(2).Block); node->finallyToken = loc(1); sym(1).Node = node; } break; -case 318: { +case 329: { AST::DebuggerStatement *node = makeAstNode<AST::DebuggerStatement> (driver->nodePool()); node->debuggerToken = loc(1); node->semicolonToken = loc(2); sym(1).Node = node; } break; -case 319: { +case 330: { AST::FunctionDeclaration *node = makeAstNode<AST::FunctionDeclaration> (driver->nodePool(), sym(2).sval, sym(4).FormalParameterList, sym(7).FunctionBody); node->functionToken = loc(1); node->identifierToken = loc(2); @@ -1618,7 +1667,7 @@ case 319: { sym(1).Node = node; } break; -case 320: { +case 331: { AST::FunctionExpression *node = makeAstNode<AST::FunctionExpression> (driver->nodePool(), sym(2).sval, sym(4).FormalParameterList, sym(7).FunctionBody); node->functionToken = loc(1); if (sym(2).sval) @@ -1630,56 +1679,56 @@ case 320: { sym(1).Node = node; } break; -case 321: { +case 332: { AST::FormalParameterList *node = makeAstNode<AST::FormalParameterList> (driver->nodePool(), sym(1).sval); node->identifierToken = loc(1); sym(1).Node = node; } break; -case 322: { +case 333: { AST::FormalParameterList *node = makeAstNode<AST::FormalParameterList> (driver->nodePool(), sym(1).FormalParameterList, sym(3).sval); node->commaToken = loc(2); node->identifierToken = loc(3); sym(1).Node = node; } break; -case 323: { +case 334: { sym(1).Node = 0; } break; -case 324: { +case 335: { sym(1).Node = sym(1).FormalParameterList->finish (); } break; -case 325: { +case 336: { sym(1).Node = 0; } break; -case 327: { +case 338: { sym(1).Node = makeAstNode<AST::FunctionBody> (driver->nodePool(), sym(1).SourceElements->finish ()); } break; -case 328: { +case 339: { sym(1).Node = makeAstNode<AST::SourceElements> (driver->nodePool(), sym(1).SourceElement); } break; -case 329: { +case 340: { sym(1).Node = makeAstNode<AST::SourceElements> (driver->nodePool(), sym(1).SourceElements, sym(2).SourceElement); } break; -case 330: { +case 341: { sym(1).Node = makeAstNode<AST::StatementSourceElement> (driver->nodePool(), sym(1).Statement); } break; -case 331: { +case 342: { sym(1).Node = makeAstNode<AST::FunctionSourceElement> (driver->nodePool(), sym(1).FunctionDeclaration); } break; -case 332: { +case 343: { sym(1).sval = 0; } break; -case 334: { +case 345: { sym(1).Node = 0; } break; diff --git a/src/declarative/qml/parser/qmljsparser_p.h b/src/declarative/qml/parser/qmljsparser_p.h index 6f36484..74d3c84 100644 --- a/src/declarative/qml/parser/qmljsparser_p.h +++ b/src/declarative/qml/parser/qmljsparser_p.h @@ -120,6 +120,8 @@ public: AST::UiObjectMemberList *UiObjectMemberList; AST::UiArrayMemberList *UiArrayMemberList; AST::UiQualifiedId *UiQualifiedId; + AST::UiAttributeList *UiAttributeList; + AST::UiAttribute *UiAttribute; }; public: @@ -219,9 +221,9 @@ protected: -#define J_SCRIPT_REGEXPLITERAL_RULE1 68 +#define J_SCRIPT_REGEXPLITERAL_RULE1 79 -#define J_SCRIPT_REGEXPLITERAL_RULE2 69 +#define J_SCRIPT_REGEXPLITERAL_RULE2 80 QT_END_NAMESPACE diff --git a/src/declarative/qml/qml.pri b/src/declarative/qml/qml.pri index b71ca1f..1021dec 100644 --- a/src/declarative/qml/qml.pri +++ b/src/declarative/qml/qml.pri @@ -28,7 +28,8 @@ SOURCES += qml/qmlparser.cpp \ qml/qmlscriptparser.cpp \ qml/qmlenginedebug.cpp \ qml/qmlrewrite.cpp \ - qml/qmlbasicscript.cpp + qml/qmlbasicscript.cpp \ + qml/qmlvaluetype.cpp HEADERS += qml/qmlparser_p.h \ qml/qmlinstruction_p.h \ @@ -72,7 +73,8 @@ HEADERS += qml/qmlparser_p.h \ qml/qmlbasicscript_p.h \ qml/qmlenginedebug_p.h \ qml/qmlrewrite_p.h \ - qml/qpodvector_p.h + qml/qpodvector_p.h \ + qml/qmlvaluetype_p.h # for qtscript debugger contains(QT_CONFIG, scripttools):QT += scripttools diff --git a/src/declarative/qml/qmlbindablecomponent.cpp b/src/declarative/qml/qmlbindablecomponent.cpp index ed9924a..6938592 100644 --- a/src/declarative/qml/qmlbindablecomponent.cpp +++ b/src/declarative/qml/qmlbindablecomponent.cpp @@ -85,6 +85,31 @@ QScriptValue QmlBindableComponent::createObject() return QmlEngine::qmlScriptObject(ret, d->engine); } +/*! + 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 QmlBindableComponent::errorsString() const +{ + Q_D(const QmlBindableComponent); + QString ret; + if(!isError()) + return ret; + foreach(const QmlError &e, d->errors) { + ret += e.url().toString() + QLatin1String(":") + + QString::number(e.line()) + QLatin1String(" ") + + e.description() + QLatin1String("\n"); + } + return ret; +} + + void QmlBindableComponent::statusChange(QmlComponent::Status newStatus) { Q_D(QmlBindableComponent); diff --git a/src/declarative/qml/qmlbindablecomponent.h b/src/declarative/qml/qmlbindablecomponent.h index 2b3e0ce..43e3537 100644 --- a/src/declarative/qml/qmlbindablecomponent.h +++ b/src/declarative/qml/qmlbindablecomponent.h @@ -72,6 +72,7 @@ public: Q_PROPERTY(bool isLoading READ isLoading NOTIFY isLoadingChanged); Q_INVOKABLE QScriptValue createObject(); + Q_INVOKABLE QString errorsString() const; void setContext(QmlContext* c); Q_SIGNALS: diff --git a/src/declarative/qml/qmlbinding.cpp b/src/declarative/qml/qmlbinding.cpp index 57c1187..431dd66 100644 --- a/src/declarative/qml/qmlbinding.cpp +++ b/src/declarative/qml/qmlbinding.cpp @@ -52,7 +52,7 @@ Q_DECLARE_METATYPE(QList<QObject *>); QT_BEGIN_NAMESPACE -DEFINE_BOOL_CONFIG_OPTION(scriptWarnings, QML_SCRIPT_WARNINGS); +QML_DEFINE_NOCREATE_TYPE(QmlBinding); QmlBindingPrivate::QmlBindingPrivate() : inited(false), updating(false), enabled(true), mePtr(0) diff --git a/src/declarative/qml/qmlbinding.h b/src/declarative/qml/qmlbinding.h index 5f6d6f4..c2182d5 100644 --- a/src/declarative/qml/qmlbinding.h +++ b/src/declarative/qml/qmlbinding.h @@ -54,7 +54,6 @@ QT_BEGIN_NAMESPACE QT_MODULE(Declarative) -class QmlExpression; class QmlContext; class QmlBindingPrivate; class Q_DECLARATIVE_EXPORT QmlBinding : public QmlExpression @@ -84,10 +83,10 @@ private: Q_DECLARE_PRIVATE(QmlBinding) }; -Q_DECLARE_METATYPE(QmlBinding*); - QT_END_NAMESPACE +QML_DECLARE_TYPE(QmlBinding); + QT_END_HEADER #endif // QMLBINDING_H diff --git a/src/declarative/qml/qmlcompiler.cpp b/src/declarative/qml/qmlcompiler.cpp index 3d38311..94710c6 100644 --- a/src/declarative/qml/qmlcompiler.cpp +++ b/src/declarative/qml/qmlcompiler.cpp @@ -63,6 +63,7 @@ #include <private/qmlcomponent_p.h> #include "parser/qmljsast_p.h" #include <private/qmlvmemetaobject_p.h> +#include "qmlmetaproperty_p.h" #include "qmlscriptparser_p.h" @@ -76,7 +77,7 @@ using namespace QmlParser; Instantiate a new QmlCompiler. */ QmlCompiler::QmlCompiler() -: output(0) +: output(0), engine(0) { } @@ -571,6 +572,7 @@ bool QmlCompiler::compile(QmlEngine *engine, Object *root = unit->data.tree(); Q_ASSERT(root); + this->engine = engine; compileTree(root); if (!isError()) { @@ -583,6 +585,7 @@ bool QmlCompiler::compile(QmlEngine *engine, compileState = ComponentCompileState(); savedCompileStates.clear(); output = 0; + this->engine = 0; return !isError(); } @@ -877,6 +880,27 @@ void QmlCompiler::genObjectBody(QmlParser::Object *obj) pop.line = prop->location.start.line; output->bytecode << pop; } + + foreach(Property *prop, obj->valueTypeProperties) { + QmlInstruction fetch; + fetch.type = QmlInstruction::FetchValueType; + fetch.fetchValue.property = prop->index; + fetch.fetchValue.type = prop->type; + fetch.line = prop->location.start.line; + + output->bytecode << fetch; + + foreach(Property *vprop, prop->value->valueProperties) { + genPropertyAssignment(vprop, prop->value, prop); + } + + QmlInstruction pop; + pop.type = QmlInstruction::PopValueType; + pop.fetchValue.property = prop->index; + pop.fetchValue.type = prop->type; + pop.line = prop->location.start.line; + output->bytecode << pop; + } } void QmlCompiler::genComponent(QmlParser::Object *obj) @@ -1273,7 +1297,8 @@ void QmlCompiler::genListProperty(QmlParser::Property *prop, } void QmlCompiler::genPropertyAssignment(QmlParser::Property *prop, - QmlParser::Object *obj) + QmlParser::Object *obj, + QmlParser::Property *valueTypeProperty) { for (int ii = 0; ii < prop->values.count(); ++ii) { QmlParser::Value *v = prop->values.at(ii); @@ -1314,12 +1339,19 @@ void QmlCompiler::genPropertyAssignment(QmlParser::Property *prop, QmlInstruction store; store.type = QmlInstruction::StoreValueSource; store.line = v->object->location.start.line; - store.assignValueSource.property = prop->index; + if (valueTypeProperty) { + store.assignValueSource.property = QmlMetaPropertyPrivate::saveValueType(valueTypeProperty->index, prop->index); + store.assignValueSource.owner = 1; + } else { + store.assignValueSource.property = + QmlMetaPropertyPrivate::saveProperty(prop->index); + store.assignValueSource.owner = 0; + } output->bytecode << store; } else if (v->type == Value::PropertyBinding) { - genBindingAssignment(v, prop, obj); + genBindingAssignment(v, prop, obj, valueTypeProperty); } else if (v->type == Value::Literal) { @@ -1419,18 +1451,89 @@ bool QmlCompiler::buildGroupedProperty(QmlParser::Property *prop, Q_ASSERT(prop->type != 0); Q_ASSERT(prop->index != -1); - // Load the nested property's meta type - prop->value->metatype = QmlMetaType::metaObjectForType(prop->type); - if (!prop->value->metatype) - COMPILE_EXCEPTION(prop, "Cannot nest non-QObject property" << prop->name); + if (prop->type < QVariant::UserType) { + QmlEnginePrivate *ep = + static_cast<QmlEnginePrivate *>(QObjectPrivate::get(engine)); + if (ep->valueTypes[prop->type]) { + COMPILE_CHECK(buildValueTypeProperty(ep->valueTypes[prop->type], + prop->value, ctxt.incr())); + obj->addValueTypeProperty(prop); + } else { + COMPILE_EXCEPTION(prop, "Invalid property access"); + } - obj->addGroupedProperty(prop); + } else { + // Load the nested property's meta type + prop->value->metatype = QmlMetaType::metaObjectForType(prop->type); + if (!prop->value->metatype) + COMPILE_EXCEPTION(prop, "Cannot nest non-QObject property" << + prop->name); - COMPILE_CHECK(buildSubObject(prop->value, ctxt.incr())); + obj->addGroupedProperty(prop); + + COMPILE_CHECK(buildSubObject(prop->value, ctxt.incr())); + } return true; } +bool QmlCompiler::buildValueTypeProperty(QObject *type, + QmlParser::Object *obj, + const BindingContext &ctxt) +{ + if (obj->defaultProperty) + COMPILE_EXCEPTION(obj, "Invalid property use"); + obj->metatype = type->metaObject(); + + foreach (Property *prop, obj->properties) { + int idx = type->metaObject()->indexOfProperty(prop->name.constData()); + if (idx == -1) + COMPILE_EXCEPTION(prop, "Cannot assign to non-existant property"); + QMetaProperty p = type->metaObject()->property(idx); + prop->index = idx; + prop->type = p.userType(); + + if (prop->value || prop->values.count() != 1) + COMPILE_EXCEPTION(prop, "Invalid property use"); + + Value *value = prop->values.at(0); + + if (value->object) { + const QMetaObject *c = + output->types.at(value->object->type).metaObject(); + bool isPropertyValue = false; + while (c && !isPropertyValue) { + isPropertyValue = + (c == &QmlPropertyValueSource::staticMetaObject); + c = c->superClass(); + } + + if (!isPropertyValue) { + COMPILE_EXCEPTION(prop, "Invalid property use"); + } else { + COMPILE_CHECK(buildObject(value->object, ctxt)); + value->type = Value::ValueSource; + } + + } else if (value->value.isScript()) { + // ### Check for writability + BindingReference reference; + reference.expression = value->value; + reference.property = prop; + reference.value = value; + reference.bindingContext = ctxt; + reference.bindingContext.owner++; + addBindingReference(reference); + value->type = Value::PropertyBinding; + } else { + COMPILE_CHECK(testLiteralAssignment(p, value)); + value->type = Value::Literal; + } + obj->addValueProperty(prop); + } + + return true; +} // Build assignments to QML lists. QML lists are properties of type // QList<T *> * and QmlList<T *> *. @@ -1951,14 +2054,13 @@ bool QmlCompiler::buildBinding(QmlParser::Value *value, void QmlCompiler::genBindingAssignment(QmlParser::Value *binding, QmlParser::Property *prop, - QmlParser::Object *obj) + QmlParser::Object *obj, + QmlParser::Property *valueTypeProperty) { Q_ASSERT(compileState.bindings.contains(binding)); const BindingReference &ref = compileState.bindings.value(binding); - QMetaProperty mp = obj->metaObject()->property(prop->index); - QmlInstruction store; int dataRef; if (ref.compiledData.isEmpty()) { @@ -1969,10 +2071,19 @@ void QmlCompiler::genBindingAssignment(QmlParser::Value *binding, store.type = QmlInstruction::StoreCompiledBinding; } - store.assignBinding.property = prop->index; + Q_ASSERT(ref.bindingContext.owner == 0 || + (ref.bindingContext.owner != 0 && valueTypeProperty)); + if (ref.bindingContext.owner) { + store.assignBinding.property = + QmlMetaPropertyPrivate::saveValueType(valueTypeProperty->index, + prop->index); + } else { + store.assignBinding.property = + QmlMetaPropertyPrivate::saveProperty(prop->index); + } store.assignBinding.value = dataRef; - store.assignBinding.category = QmlMetaProperty::propertyCategory(mp); store.assignBinding.context = ref.bindingContext.stack; + store.assignBinding.owner = ref.bindingContext.owner; output->bytecode << store; } diff --git a/src/declarative/qml/qmlcompiler_p.h b/src/declarative/qml/qmlcompiler_p.h index 86e6590..094c05a 100644 --- a/src/declarative/qml/qmlcompiler_p.h +++ b/src/declarative/qml/qmlcompiler_p.h @@ -141,9 +141,9 @@ private: struct BindingContext { BindingContext() - : stack(0), object(0) {} + : stack(0), owner(0), object(0) {} BindingContext(QmlParser::Object *o) - : stack(0), object(o) {} + : stack(0), owner(0), object(o) {} BindingContext incr() const { BindingContext rv(object); rv.stack = stack + 1; @@ -151,6 +151,7 @@ private: } bool isSubContext() const { return stack != 0; } int stack; + int owner; QmlParser::Object *object; }; @@ -171,6 +172,9 @@ private: bool buildGroupedProperty(QmlParser::Property *prop, QmlParser::Object *obj, const BindingContext &ctxt); + bool buildValueTypeProperty(QObject *type, + QmlParser::Object *obj, + const BindingContext &ctxt); bool buildListProperty(QmlParser::Property *prop, QmlParser::Object *obj, const BindingContext &ctxt); @@ -208,12 +212,14 @@ private: void genValueProperty(QmlParser::Property *prop, QmlParser::Object *obj); void genListProperty(QmlParser::Property *prop, QmlParser::Object *obj); void genPropertyAssignment(QmlParser::Property *prop, - QmlParser::Object *obj); + QmlParser::Object *obj, + QmlParser::Property *valueTypeProperty = 0); void genLiteralAssignment(const QMetaProperty &prop, QmlParser::Value *value); void genBindingAssignment(QmlParser::Value *binding, QmlParser::Property *prop, - QmlParser::Object *obj); + QmlParser::Object *obj, + QmlParser::Property *valueTypeProperty = 0); int componentTypeRef(); @@ -257,6 +263,7 @@ private: QList<QmlError> exceptions; QmlCompiledData *output; + QmlEngine *engine; }; QT_END_NAMESPACE diff --git a/src/declarative/qml/qmlcomponent.cpp b/src/declarative/qml/qmlcomponent.cpp index d5afaeb..214d2fa 100644 --- a/src/declarative/qml/qmlcomponent.cpp +++ b/src/declarative/qml/qmlcomponent.cpp @@ -390,30 +390,6 @@ 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() + QLatin1String(":") + - QString::number(e.line()) + QLatin1String(" ") + - e.description() + QLatin1String("\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 45b26eb..60b7ccd 100644 --- a/src/declarative/qml/qmlcomponent.h +++ b/src/declarative/qml/qmlcomponent.h @@ -83,7 +83,6 @@ public: 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 2589a16..2229916 100644 --- a/src/declarative/qml/qmlengine.cpp +++ b/src/declarative/qml/qmlengine.cpp @@ -149,6 +149,7 @@ void QmlEnginePrivate::init() scriptEngine.installTranslatorFunctions(); contextClass = new QmlContextScriptClass(q); objectClass = new QmlObjectScriptClass(q); + valueTypeClass = new QmlValueTypeScriptClass(q); rootContext = new QmlContext(q,true); #ifdef QT_SCRIPTTOOLS_LIB if (qmlDebugger()){ @@ -190,7 +191,7 @@ Q_GLOBAL_STATIC(FunctionCache, functionCache); QScriptClass::QueryFlags QmlEnginePrivate::queryObject(const QString &propName, - uint *id, QObject *obj) + uint *id, QObject *obj) { QScriptClass::QueryFlags rv = 0; @@ -224,8 +225,15 @@ QmlEnginePrivate::queryObject(const QString &propName, return rv; } +struct QmlValueTypeReference { + QmlValueType *type; + QGuard<QObject> object; + int property; +}; +Q_DECLARE_METATYPE(QmlValueTypeReference); + QScriptValue QmlEnginePrivate::propertyObject(const QScriptString &propName, - QObject *obj, uint id) + QObject *obj, uint id) { if (id == QmlScriptClass::FunctionId) { QScriptValue sobj = scriptEngine.newQObject(obj); @@ -237,10 +245,20 @@ QScriptValue QmlEnginePrivate::propertyObject(const QScriptString &propName, if (!prop.isValid()) return QScriptValue(); - QVariant var = prop.read(); if (prop.needsChangedNotifier()) capturedProperties << CapturedProperty(prop); - QObject *varobj = QmlMetaType::toQObject(var); + + int propType = prop.propertyType(); + if (propType < QVariant::UserType && valueTypes[propType]) { + QmlValueTypeReference ref; + ref.type = valueTypes[propType]; + ref.object = obj; + ref.property = prop.coreIndex(); + return scriptEngine.newObject(valueTypeClass, scriptEngine.newVariant(QVariant::fromValue(ref))); + } + + QVariant var = prop.read(); + QObject *varobj = (propType < QVariant::UserType)?0:QmlMetaType::toQObject(var); if (!varobj) varobj = qvariant_cast<QObject *>(var); if (varobj) { @@ -681,6 +699,32 @@ QmlScriptClass::QmlScriptClass(QmlEngine *bindengine) { } +QVariant QmlScriptClass::toVariant(QmlEngine *engine, const QScriptValue &val) +{ + QmlEnginePrivate *ep = + static_cast<QmlEnginePrivate *>(QObjectPrivate::get(engine)); + + QScriptClass *sc = val.scriptClass(); + if (!sc) { + return val.toVariant(); + } else if (sc == ep->contextClass) { + return QVariant(); + } else if (sc == ep->objectClass) { + return QVariant::fromValue(val.data().toQObject()); + } else if (sc == ep->valueTypeClass) { + QmlValueTypeReference ref = + qvariant_cast<QmlValueTypeReference>(val.data().toVariant()); + + if (!ref.object) + return QVariant(); + + QMetaProperty p = ref.object->metaObject()->property(ref.property); + return p.read(ref.object); + } + + return QVariant(); +} + ///////////////////////////////////////////////////////////// /* The QmlContextScriptClass handles property access for a QmlContext @@ -807,19 +851,88 @@ void QmlContextScriptClass::setProperty(QScriptValue &object, QmlMetaProperty prop; prop.restore(id, obj); - QVariant v; - QObject *data = value.data().toQObject(); - if (data) { - v = QVariant::fromValue(data); - } else { - v = value.toVariant(); - } + QVariant v = QmlScriptClass::toVariant(engine, value); prop.write(v); scriptEngine->currentContext()->setActivationObject(oldact); } ///////////////////////////////////////////////////////////// +QmlValueTypeScriptClass::QmlValueTypeScriptClass(QmlEngine *bindEngine) +: QmlScriptClass(bindEngine) +{ +} + +QmlValueTypeScriptClass::~QmlValueTypeScriptClass() +{ +} + +QmlValueTypeScriptClass::QueryFlags +QmlValueTypeScriptClass::queryProperty(const QScriptValue &object, + const QScriptString &name, + QueryFlags flags, uint *id) +{ + QmlValueTypeReference ref = + qvariant_cast<QmlValueTypeReference>(object.data().toVariant()); + + if (!ref.object) + return 0; + + QByteArray propName = name.toString().toUtf8(); + + int idx = ref.type->metaObject()->indexOfProperty(propName.constData()); + if (idx == -1) + return 0; + *id = idx; + + QMetaProperty prop = ref.object->metaObject()->property(idx); + + QmlValueTypeScriptClass::QueryFlags rv = + QmlValueTypeScriptClass::HandlesReadAccess; + if (prop.isWritable()) + rv |= QmlValueTypeScriptClass::HandlesWriteAccess; + + return rv; +} + +QScriptValue QmlValueTypeScriptClass::property(const QScriptValue &object, + const QScriptString &name, + uint id) +{ + QmlValueTypeReference ref = + qvariant_cast<QmlValueTypeReference>(object.data().toVariant()); + + if (!ref.object) + return QScriptValue(); + + ref.type->read(ref.object, ref.property); + + QMetaProperty p = ref.type->metaObject()->property(id); + QVariant rv = p.read(ref.type); + + return static_cast<QmlEnginePrivate *>(QObjectPrivate::get(engine))->scriptEngine.newVariant(rv); +} + +void QmlValueTypeScriptClass::setProperty(QScriptValue &object, + const QScriptString &name, + uint id, + const QScriptValue &value) +{ + QmlValueTypeReference ref = + qvariant_cast<QmlValueTypeReference>(object.data().toVariant()); + + if (!ref.object) + return; + + QVariant v = QmlScriptClass::toVariant(engine, value); + + ref.type->read(ref.object, ref.property); + QMetaProperty p = ref.type->metaObject()->property(id); + p.write(ref.type, v); + ref.type->write(ref.object, ref.property); +} + +///////////////////////////////////////////////////////////// /* The QmlObjectScriptClass handles property access for QObjects via QtScript. It is also used to provide a more useful API in @@ -916,13 +1029,7 @@ void QmlObjectScriptClass::setProperty(QScriptValue &object, QmlMetaProperty prop; prop.restore(id, obj); - QVariant v; - QObject *data = value.data().toQObject(); - if (data) { - v = QVariant::fromValue(data); - } else { - v = value.toVariant(); - } + QVariant v = QmlScriptClass::toVariant(engine, value); prop.write(v); scriptEngine->currentContext()->setActivationObject(oldact); diff --git a/src/declarative/qml/qmlengine_p.h b/src/declarative/qml/qmlengine_p.h index 47d2397..af561e7 100644 --- a/src/declarative/qml/qmlengine_p.h +++ b/src/declarative/qml/qmlengine_p.h @@ -66,6 +66,7 @@ #include <private/qpodvector_p.h> #include <QtDeclarative/qml.h> #include <private/qmlbasicscript_p.h> +#include <private/qmlvaluetype_p.h> #include <QtDeclarative/qmlcontext.h> #include <QtDeclarative/qmlengine.h> #include <QtDeclarative/qmlexpression.h> @@ -80,6 +81,7 @@ class QmlExpression; class QmlBasicScriptNodeCache; class QmlContextScriptClass; class QmlObjectScriptClass; +class QmlValueTypeScriptClass; class QScriptEngineDebugger; class QNetworkReply; class QNetworkAccessManager; @@ -120,6 +122,7 @@ public: QmlContextScriptClass *contextClass; QmlObjectScriptClass *objectClass; + QmlValueTypeScriptClass *valueTypeClass; QmlContext *setCurrentBindContext(QmlContext *); QStack<QmlContext *> activeContexts; @@ -167,6 +170,8 @@ public: quint32 getUniqueId() const { return uniqueId++; } + + QmlValueTypeFactory valueTypes; }; class QmlScriptClass : public QScriptClass @@ -187,6 +192,7 @@ public: QmlScriptClass(QmlEngine *); + static QVariant toVariant(QmlEngine *, const QScriptValue &); protected: QmlEngine *engine; }; @@ -230,6 +236,24 @@ public: const QScriptValue &value); }; +class QmlValueTypeScriptClass : public QmlScriptClass +{ +public: + QmlValueTypeScriptClass(QmlEngine *); + ~QmlValueTypeScriptClass(); + + virtual QueryFlags queryProperty(const QScriptValue &object, + const QScriptString &name, + QueryFlags flags, uint *id); + virtual QScriptValue property(const QScriptValue &object, + const QScriptString &name, + uint id); + virtual void setProperty(QScriptValue &object, + const QScriptString &name, + uint id, + const QScriptValue &value); +}; + QT_END_NAMESPACE #endif // QMLENGINE_P_H diff --git a/src/declarative/qml/qmlinstruction.cpp b/src/declarative/qml/qmlinstruction.cpp index 83fb18b..761903c 100644 --- a/src/declarative/qml/qmlinstruction.cpp +++ b/src/declarative/qml/qmlinstruction.cpp @@ -176,12 +176,18 @@ void QmlCompiledData::dump(QmlInstruction *instr, int idx) case QmlInstruction::FetchObject: qWarning() << idx << "\t" << line << "\t" << "FETCH\t\t\t" << instr->fetch.property; break; + case QmlInstruction::FetchValueType: + qWarning() << idx << "\t" << line << "\t" << "FETCH_VALUE\t\t" << instr->fetchValue.property << "\t" << instr->fetchValue.type; + break; case QmlInstruction::PopFetchedObject: qWarning() << idx << "\t" << line << "\t" << "POP"; break; case QmlInstruction::PopQList: qWarning() << idx << "\t" << line << "\t" << "POP_QLIST"; break; + case QmlInstruction::PopValueType: + qWarning() << idx << "\t" << line << "\t" << "POP_VALUE\t\t" << instr->fetchValue.property << "\t" << instr->fetchValue.type; + break; case QmlInstruction::Defer: qWarning() << idx << "\t" << line << "\t" << "DEFER" << "\t\t" << instr->defer.deferCount; break; diff --git a/src/declarative/qml/qmlinstruction_p.h b/src/declarative/qml/qmlinstruction_p.h index a7221c0..dc118b6 100644 --- a/src/declarative/qml/qmlinstruction_p.h +++ b/src/declarative/qml/qmlinstruction_p.h @@ -139,6 +139,7 @@ public: FetchQmlList, /* fetchQmlList */ FetchQList, /* fetch */ FetchObject, /* fetch */ + FetchValueType, /* fetchValue */ // // Stack manipulation @@ -147,6 +148,7 @@ public: // PopQList - Remove a list from the list stack PopFetchedObject, PopQList, + PopValueType, /* fetchValue */ // // Deferred creation @@ -177,12 +179,13 @@ public: } setId; struct { int property; + int owner; } assignValueSource; struct { int property; int value; short context; - short category; + short owner; } assignBinding; struct { int property; @@ -190,6 +193,10 @@ public: struct { int property; int type; + } fetchValue; + struct { + int property; + int type; } fetchQmlList; struct { int castValue; diff --git a/src/declarative/qml/qmlmetaproperty.cpp b/src/declarative/qml/qmlmetaproperty.cpp index daa4242..60b4ac6 100644 --- a/src/declarative/qml/qmlmetaproperty.cpp +++ b/src/declarative/qml/qmlmetaproperty.cpp @@ -49,6 +49,8 @@ #include "qmlboundsignal_p.h" #include <math.h> #include <QtCore/qdebug.h> +#include <QtDeclarative/qmlengine.h> +#include <private/qmlengine_p.h> Q_DECLARE_METATYPE(QList<QObject *>); @@ -162,16 +164,13 @@ void QmlMetaProperty::initDefault(QObject *obj) \internal Creates a QmlMetaProperty for the property at index \a idx of \a obj. - - The QmlMetaProperty is assigned category \a cat. */ -QmlMetaProperty::QmlMetaProperty(QObject *obj, int idx, PropertyCategory cat, QmlContext *ctxt) +QmlMetaProperty::QmlMetaProperty(QObject *obj, int idx, QmlContext *ctxt) : d(new QmlMetaPropertyPrivate) { d->context = ctxt; d->object = obj; d->type = Property; - d->category = cat; QMetaPropertyEx p(obj->metaObject()->property(idx)); d->propType = p.propertyType; d->coreIdx = idx; @@ -309,36 +308,6 @@ QmlMetaPropertyPrivate::propertyCategory() const } /*! - Returns the property category of \a prop. -*/ -QmlMetaProperty::PropertyCategory -QmlMetaProperty::propertyCategory(const QMetaProperty &prop) -{ - if (prop.name()) { - int type = 0; - if (prop.type() == QVariant::LastType) - type = qMetaTypeId<QVariant>(); - else if (prop.type() == QVariant::UserType) - type = prop.userType(); - else - type = prop.type(); - - if (type == qMetaTypeId<QmlBinding *>()) - return Bindable; - else if (QmlMetaType::isList(type)) - return List; - else if (QmlMetaType::isQmlList(type)) - return QmlList; - else if (QmlMetaType::isObject(type)) - return Object; - else - return Normal; - } else { - return InvalidProperty; - } -} - -/*! Returns the type name of the property, or 0 if the property has no type name. */ @@ -426,12 +395,15 @@ QObject *QmlMetaProperty::object() const QmlMetaProperty &QmlMetaProperty::operator=(const QmlMetaProperty &other) { d->name = other.d->name; - d->propType = other.d->propType; - d->type = other.d->type; d->signal = other.d->signal; + d->context = other.d->context; d->coreIdx = other.d->coreIdx; + d->valueTypeIdx = other.d->valueTypeIdx; + d->valueTypeId = other.d->valueTypeId; + d->type = other.d->type; d->attachedFunc = other.d->attachedFunc; d->object = other.d->object; + d->propType = other.d->propType; d->category = other.d->category; return *this; } @@ -615,10 +587,27 @@ QVariant QmlMetaProperty::read() const return sig->expression(); } } else if (type() & Property) { - if (type() & Attached) + if (type() & Attached) { return QVariant::fromValue(d->attachedObject()); - else + } else if(type() & ValueTypeProperty) { + QmlEnginePrivate *ep = d->context?static_cast<QmlEnginePrivate *>(QObjectPrivate::get(d->context->engine())):0; + QmlValueType *valueType = 0; + if (ep) + valueType = ep->valueTypes[d->valueTypeId]; + else + valueType = QmlValueTypeFactory::valueType(d->valueTypeId); + Q_ASSERT(valueType); + + valueType->read(object(), d->coreIdx); + QVariant rv = + valueType->metaObject()->property(d->valueTypeIdx).read(valueType); + if (!ep) + delete valueType; + return rv; + + } else { return d->object->metaObject()->property(d->coreIdx).read(object()); + } } return QVariant(); } @@ -649,7 +638,33 @@ void QmlMetaPropertyPrivate::writeSignalProperty(const QVariant &value) void QmlMetaPropertyPrivate::writeValueProperty(const QVariant &value) { + QObject *object = this->object; + int coreIdx = this->coreIdx; + + QmlValueType *writeBack = 0; + QObject *writeBackObj = 0; + int writeBackIdx = -1; + bool deleteWriteBack = false; + + if (type & QmlMetaProperty::ValueTypeProperty) { + QmlEnginePrivate *ep = context?static_cast<QmlEnginePrivate *>(QObjectPrivate::get(context->engine())):0; + + if (ep) { + writeBack = ep->valueTypes[valueTypeId]; + } else { + writeBack = QmlValueTypeFactory::valueType(valueTypeId); + deleteWriteBack = true; + } + + writeBackObj = this->object; + writeBackIdx = this->coreIdx; + writeBack->read(writeBackObj, writeBackIdx); + object = writeBack; + coreIdx = valueTypeIdx; + } + QMetaProperty prop = object->metaObject()->property(coreIdx); + if (prop.isEnumType()) { QVariant v = value; if (value.type() == QVariant::Double) { //enum values come through the script engine as doubles @@ -659,6 +674,11 @@ void QmlMetaPropertyPrivate::writeValueProperty(const QVariant &value) v.convert(QVariant::Int); } prop.write(object, v); + + if (writeBack) { + writeBack->write(writeBackObj, writeBackIdx); + if (deleteWriteBack) delete writeBack; + } return; } @@ -757,18 +777,18 @@ void QmlMetaPropertyPrivate::writeValueProperty(const QVariant &value) } } else if (category == QmlMetaProperty::Normal) { + bool found = false; switch(t) { case QVariant::Double: { double d; - bool found = true; if (vt == QVariant::Int) { d = value.toInt(); + found = true; } else if (vt == QVariant::UInt) { d = value.toUInt(); - } else { - found = false; - } + found = true; + } if (found) { void *a[1]; @@ -776,7 +796,6 @@ void QmlMetaPropertyPrivate::writeValueProperty(const QVariant &value) QMetaObject::metacall(object, QMetaObject::WriteProperty, coreIdx, a); - return; } } break; @@ -784,14 +803,13 @@ void QmlMetaPropertyPrivate::writeValueProperty(const QVariant &value) case QVariant::Int: { int i; - bool found = true; if (vt == QVariant::Double) { i = (int)value.toDouble(); + found = true; } else if (vt == QVariant::UInt) { i = (int)value.toUInt(); - } else { - found = false; - } + found = true; + } if (found) { void *a[1]; @@ -799,7 +817,6 @@ void QmlMetaPropertyPrivate::writeValueProperty(const QVariant &value) QMetaObject::metacall(object, QMetaObject::WriteProperty, coreIdx, a); - return; } } break; @@ -807,12 +824,10 @@ void QmlMetaPropertyPrivate::writeValueProperty(const QVariant &value) case QVariant::String: { QString s; - bool found = true; if (vt == QVariant::ByteArray) { s = QLatin1String(value.toByteArray()); - } else { - found = false; - } + found = true; + } if (found) { void *a[1]; @@ -820,7 +835,6 @@ void QmlMetaPropertyPrivate::writeValueProperty(const QVariant &value) QMetaObject::metacall(object, QMetaObject::WriteProperty, coreIdx, a); - return; } } break; @@ -833,15 +847,20 @@ void QmlMetaPropertyPrivate::writeValueProperty(const QVariant &value) if (con) { QVariant v = con(value.toString()); prop.write(object, v); - return; + found = true; } } } break; } - prop.write(object, value); + if (!found) + prop.write(object, value); } + if (writeBack) { + writeBack->write(writeBackObj, writeBackIdx); + if (deleteWriteBack) delete writeBack; + } } /*! @@ -936,6 +955,8 @@ int QmlMetaProperty::coreIndex() const return d->coreIdx; } +Q_GLOBAL_STATIC(QmlValueTypeFactory, qmlValueTypes); + /*! Returns the property information serialized into a single integer. QmlMetaProperty uses the bottom 24 bits only. @@ -949,10 +970,35 @@ quint32 QmlMetaProperty::save() const rv = d->coreIdx; } - Q_ASSERT(rv <= 0xFFFF); - Q_ASSERT(type() <= 0xFF); - rv |= (type() << 16); + Q_ASSERT(rv <= 0x7FF); + Q_ASSERT(type() <= 0x3F); + Q_ASSERT(d->valueTypeIdx <= 0x7F); + + rv |= (type() << 18); + if (type() & ValueTypeProperty) + rv |= (d->valueTypeIdx << 11); + + return rv; +} + +quint32 QmlMetaPropertyPrivate::saveValueType(int core, int valueType) +{ + Q_ASSERT(core <= 0x7FF); + Q_ASSERT(valueType <= 0x7F); + quint32 rv = 0; + rv = (QmlMetaProperty::ValueTypeProperty | QmlMetaProperty::Property) << 18; + rv |= core; + rv |= valueType << 11; + return rv; +} + +quint32 QmlMetaPropertyPrivate::saveProperty(int core) +{ + Q_ASSERT(core <= 0x7FF); + quint32 rv = 0; + rv = (QmlMetaProperty::Property) << 18; + rv |= core; return rv; } @@ -962,17 +1008,34 @@ quint32 QmlMetaProperty::save() const to QmlMetaProperty::save(). Only the bottom 24-bits are used, the high bits can be set to any value. */ -void QmlMetaProperty::restore(quint32 id, QObject *obj) +void QmlMetaProperty::restore(quint32 id, QObject *obj, QmlContext *ctxt) { - *this = QmlMetaProperty(); d->object = obj; + d->context = ctxt; id &= 0xFFFFFF; - d->type = id >> 16; + d->type = id >> 18; id &= 0xFFFF; if (d->type & Attached) { d->attachedFunc = id; + } else if (d->type & ValueTypeProperty) { + int coreIdx = id & 0x7FF; + int valueTypeIdx = id >> 11; + + QMetaProperty p(obj->metaObject()->property(coreIdx)); + Q_ASSERT(p.type() < QVariant::UserType); + + QmlValueType *valueType = qmlValueTypes()->valueTypes[p.type()]; + + QMetaPropertyEx p2(valueType->metaObject()->property(valueTypeIdx)); + + d->name = QLatin1String(p2.name()); + d->propType = p2.propertyType; + d->coreIdx = coreIdx; + d->valueTypeIdx = valueTypeIdx; + d->valueTypeId = p.type(); + } else if (d->type & Property) { QMetaPropertyEx p(obj->metaObject()->property(id)); d->name = QLatin1String(p.name()); @@ -981,7 +1044,9 @@ void QmlMetaProperty::restore(quint32 id, QObject *obj) } else if (d->type & SignalProperty) { d->signal = obj->metaObject()->method(id); d->coreIdx = id; - } + } else { + *this = QmlMetaProperty(); + } } /*! @@ -1000,7 +1065,8 @@ QMetaMethod QmlMetaProperty::method() const the QmlMetaProperty(QObject*, QString) constructor, this static function will correctly handle dot properties. */ -QmlMetaProperty QmlMetaProperty::createProperty(QObject *obj, const QString &name) +QmlMetaProperty QmlMetaProperty::createProperty(QObject *obj, + const QString &name) { QStringList path = name.split(QLatin1Char('.')); @@ -1009,6 +1075,30 @@ QmlMetaProperty QmlMetaProperty::createProperty(QObject *obj, const QString &nam for (int jj = 0; jj < path.count() - 1; ++jj) { const QString &pathName = path.at(jj); QmlMetaProperty prop(object, pathName); + + if (jj == path.count() - 2 && + prop.propertyType() < QVariant::UserType && + qmlValueTypes()->valueTypes[prop.propertyType()]) { + // We're now at a value type property + QObject *typeObject = + qmlValueTypes()->valueTypes[prop.propertyType()]; + int idx = typeObject->metaObject()->indexOfProperty(path.last().toUtf8().constData()); + if (idx == -1) + return QmlMetaProperty(); + + QmlMetaProperty p; + p.d->name = pathName + QLatin1String(".") + path.last(); + p.d->context = 0; + p.d->coreIdx = prop.coreIndex(); + p.d->valueTypeIdx = idx; + p.d->valueTypeId = prop.propertyType(); + p.d->type = QmlMetaProperty::ValueTypeProperty | + QmlMetaProperty::Property; + p.d->object = obj; + p.d->propType = typeObject->metaObject()->property(idx).userType(); + return p; + } + QObject *objVal = QmlMetaType::toQObject(prop.read()); if (!objVal) return QmlMetaProperty(); diff --git a/src/declarative/qml/qmlmetaproperty.h b/src/declarative/qml/qmlmetaproperty.h index fdcf9be..2470d5d 100644 --- a/src/declarative/qml/qmlmetaproperty.h +++ b/src/declarative/qml/qmlmetaproperty.h @@ -57,6 +57,7 @@ class QStringList; class QVariant; struct QMetaObject; class QmlContext; +class QmlEngine; class QmlMetaPropertyPrivate; class Q_DECLARATIVE_EXPORT QmlMetaProperty @@ -78,7 +79,7 @@ public: QmlMetaProperty(QObject *, const QString &, QmlContext *); QmlMetaProperty(const QmlMetaProperty &); QmlMetaProperty &operator=(const QmlMetaProperty &); - QmlMetaProperty(QObject *, int, PropertyCategory = Unknown, QmlContext * = 0); + QmlMetaProperty(QObject *, int, QmlContext * = 0); ~QmlMetaProperty(); static QStringList properties(QObject *); @@ -93,7 +94,7 @@ public: bool connectNotifier(QObject *dest, int method) const; quint32 save() const; - void restore(quint32, QObject *); + void restore(quint32, QObject *, QmlContext * = 0); QMetaMethod method() const; @@ -101,7 +102,8 @@ public: Property = 0x01, SignalProperty = 0x02, Default = 0x08, - Attached = 0x10 }; + Attached = 0x10, + ValueTypeProperty = 0x20 }; Type type() const; bool isProperty() const; @@ -112,7 +114,6 @@ public: QObject *object() const; PropertyCategory propertyCategory() const; - static PropertyCategory propertyCategory(const QMetaProperty &); int propertyType() const; const char *propertyTypeName() const; diff --git a/src/declarative/qml/qmlmetaproperty_p.h b/src/declarative/qml/qmlmetaproperty_p.h index 69fd5c3..7efdb6e 100644 --- a/src/declarative/qml/qmlmetaproperty_p.h +++ b/src/declarative/qml/qmlmetaproperty_p.h @@ -62,18 +62,22 @@ class QmlMetaPropertyPrivate { public: QmlMetaPropertyPrivate() - : context(0), coreIdx(-1), type(QmlMetaProperty::Invalid), attachedFunc(-1), + : context(0), coreIdx(-1), valueTypeIdx(-1), valueTypeId(0), + type(QmlMetaProperty::Invalid), attachedFunc(-1), object(0), propType(-1), category(QmlMetaProperty::Unknown) {} QmlMetaPropertyPrivate(const QmlMetaPropertyPrivate &other) : name(other.name), signal(other.signal), context(other.context), - coreIdx(other.coreIdx), type(other.type), attachedFunc(other.attachedFunc), - object(other.object), propType(other.propType), - category(other.category) {} + coreIdx(other.coreIdx), valueTypeIdx(other.valueTypeIdx), + valueTypeId(other.valueTypeId), type(other.type), + attachedFunc(other.attachedFunc), object(other.object), + propType(other.propType), category(other.category) {} QString name; QMetaMethod signal; QmlContext *context; int coreIdx; + int valueTypeIdx; + int valueTypeId; uint type; int attachedFunc; QObject *object; @@ -89,6 +93,9 @@ public: void writeSignalProperty(const QVariant &); void writeValueProperty(const QVariant &); + + static quint32 saveValueType(int, int); + static quint32 saveProperty(int); }; QT_END_NAMESPACE diff --git a/src/declarative/qml/qmlparser.cpp b/src/declarative/qml/qmlparser.cpp index 9eed3f1..2a67c92 100644 --- a/src/declarative/qml/qmlparser.cpp +++ b/src/declarative/qml/qmlparser.cpp @@ -78,6 +78,8 @@ QmlParser::Object::~Object() prop->release(); foreach(Property *prop, groupedProperties) prop->release(); + foreach(Property *prop, valueTypeProperties) + prop->release(); } const QMetaObject *Object::metaObject() const @@ -121,6 +123,12 @@ void QmlParser::Object::addGroupedProperty(Property *p) groupedProperties << p; } +void QmlParser::Object::addValueTypeProperty(Property *p) +{ + p->addref(); + valueTypeProperties << p; +} + Property *QmlParser::Object::getProperty(const QByteArray &name, bool create) { if (!properties.contains(name)) { diff --git a/src/declarative/qml/qmlparser_p.h b/src/declarative/qml/qmlparser_p.h index d23b4ea..927c9e6 100644 --- a/src/declarative/qml/qmlparser_p.h +++ b/src/declarative/qml/qmlparser_p.h @@ -147,10 +147,12 @@ namespace QmlParser void addSignalProperty(Property *); void addAttachedProperty(Property *); void addGroupedProperty(Property *); + void addValueTypeProperty(Property *); QList<Property *> valueProperties; QList<Property *> signalProperties; QList<Property *> attachedProperties; QList<Property *> groupedProperties; + QList<Property *> valueTypeProperties; // The bytes to cast instances by to get to the QmlParserStatus // interface. -1 indicates the type doesn't support this interface. diff --git a/src/declarative/qml/qmlvaluetype.cpp b/src/declarative/qml/qmlvaluetype.cpp new file mode 100644 index 0000000..a01b4a7 --- /dev/null +++ b/src/declarative/qml/qmlvaluetype.cpp @@ -0,0 +1,131 @@ +/**************************************************************************** +** +** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Contact: Qt Software Information (qt-info@nokia.com) +** +** This file is part of the QtDeclarative module of the Qt Toolkit. +** +** $QT_BEGIN_LICENSE:LGPL$ +** No Commercial Usage +** This file contains pre-release code and may not be distributed. +** You may use this file in accordance with the terms and conditions +** contained in the either Technology Preview License Agreement or the +** Beta Release License Agreement. +** +** GNU Lesser General Public License Usage +** Alternatively, this file may be used under the terms of the GNU Lesser +** General Public License version 2.1 as published by the Free Software +** Foundation and appearing in the file LICENSE.LGPL included in the +** packaging of this file. Please review the following information to +** ensure the GNU Lesser General Public License version 2.1 requirements +** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. +** +** In addition, as a special exception, Nokia gives you certain +** additional rights. These rights are described in the Nokia Qt LGPL +** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this +** package. +** +** GNU General Public License Usage +** Alternatively, this file may be used under the terms of the GNU +** General Public License version 3.0 as published by the Free Software +** Foundation and appearing in the file LICENSE.GPL included in the +** packaging of this file. Please review the following information to +** ensure the GNU General Public License version 3.0 requirements will be +** 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. +** $QT_END_LICENSE$ +** +****************************************************************************/ + +#include "qmlvaluetype_p.h" + +QT_BEGIN_NAMESPACE + +QmlValueTypeFactory::QmlValueTypeFactory() +{ + // ### Optimize + for (int ii = 0; ii < (QVariant::UserType - 1); ++ii) + valueTypes[ii] = valueType(ii); +} + +QmlValueTypeFactory::~QmlValueTypeFactory() +{ + for (int ii = 0; ii < (QVariant::UserType - 1); ++ii) + delete valueTypes[ii]; +} + +QmlValueType *QmlValueTypeFactory::valueType(int t) +{ + switch (t) { + case QVariant::Rect: + return new QmlRectValueType; + default: + return 0; + } +} + +QmlValueType::QmlValueType(QObject *parent) +: QObject(parent) +{ +} + +QmlRectValueType::QmlRectValueType(QObject *parent) +: QmlValueType(parent) +{ +} + +void QmlRectValueType::read(QObject *obj, int idx) +{ + void *a[] = { &rect, 0 }; + QMetaObject::metacall(obj, QMetaObject::ReadProperty, idx, a); +} + +void QmlRectValueType::write(QObject *obj, int idx) +{ + void *a[] = { &rect, 0 }; + QMetaObject::metacall(obj, QMetaObject::WriteProperty, idx, a); +} + +int QmlRectValueType::x() const +{ + return rect.x(); +} + +int QmlRectValueType::y() const +{ + return rect.y(); +} + +void QmlRectValueType::setX(int x) +{ + rect.moveLeft(x); +} + +void QmlRectValueType::setY(int y) +{ + rect.moveTop(y); +} + +int QmlRectValueType::width() const +{ + return rect.width(); +} + +int QmlRectValueType::height() const +{ + return rect.height(); +} + +void QmlRectValueType::setWidth(int w) +{ + rect.setWidth(w); +} + +void QmlRectValueType::setHeight(int h) +{ + rect.setHeight(h); +} + +QT_END_NAMESPACE diff --git a/src/declarative/qml/qmlvaluetype_p.h b/src/declarative/qml/qmlvaluetype_p.h new file mode 100644 index 0000000..5581df7 --- /dev/null +++ b/src/declarative/qml/qmlvaluetype_p.h @@ -0,0 +1,110 @@ +/**************************************************************************** +** +** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Contact: Qt Software Information (qt-info@nokia.com) +** +** This file is part of the QtDeclarative module of the Qt Toolkit. +** +** $QT_BEGIN_LICENSE:LGPL$ +** No Commercial Usage +** This file contains pre-release code and may not be distributed. +** You may use this file in accordance with the terms and conditions +** contained in the either Technology Preview License Agreement or the +** Beta Release License Agreement. +** +** GNU Lesser General Public License Usage +** Alternatively, this file may be used under the terms of the GNU Lesser +** General Public License version 2.1 as published by the Free Software +** Foundation and appearing in the file LICENSE.LGPL included in the +** packaging of this file. Please review the following information to +** ensure the GNU Lesser General Public License version 2.1 requirements +** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. +** +** In addition, as a special exception, Nokia gives you certain +** additional rights. These rights are described in the Nokia Qt LGPL +** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this +** package. +** +** GNU General Public License Usage +** Alternatively, this file may be used under the terms of the GNU +** General Public License version 3.0 as published by the Free Software +** Foundation and appearing in the file LICENSE.GPL included in the +** packaging of this file. Please review the following information to +** ensure the GNU General Public License version 3.0 requirements will be +** 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. +** $QT_END_LICENSE$ +** +****************************************************************************/ + +#ifndef QMLVALUETYPE_P_H +#define QMLVALUETYPE_P_H + +// +// W A R N I N G +// ------------- +// +// This file is not part of the Qt API. It exists purely as an +// implementation detail. This header file may change from version to +// version without notice, or even be removed. +// +// We mean it. +// + +#include <QtCore/qobject.h> +#include <QtCore/qrect.h> +#include <QtCore/qvariant.h> + +QT_BEGIN_NAMESPACE + +class QmlValueType : public QObject +{ + Q_OBJECT +public: + QmlValueType(QObject *parent = 0); + virtual void read(QObject *, int) = 0; + virtual void write(QObject *, int) = 0; +}; + +class QmlValueTypeFactory +{ +public: + QmlValueTypeFactory(); + ~QmlValueTypeFactory(); + static QmlValueType *valueType(int); + + QmlValueType *valueTypes[QVariant::UserType - 1]; + QmlValueType *operator[](int idx) const { return valueTypes[idx]; } +}; + +class QmlRectValueType : public QmlValueType +{ + Q_PROPERTY(int x READ x WRITE setX); + Q_PROPERTY(int y READ y WRITE setY); + Q_PROPERTY(int width READ width WRITE setWidth); + Q_PROPERTY(int height READ height WRITE setHeight); + Q_OBJECT +public: + QmlRectValueType(QObject *parent = 0); + + virtual void read(QObject *, int); + virtual void write(QObject *, int); + + int x() const; + int y() const; + void setX(int); + void setY(int); + + int width() const; + int height() const; + void setWidth(int); + void setHeight(int); + +private: + QRect rect; +}; +QT_END_NAMESPACE + +#endif // QMLVALUETYPE_P_H diff --git a/src/declarative/qml/qmlvme.cpp b/src/declarative/qml/qmlvme.cpp index 58b8689..ebf0a73 100644 --- a/src/declarative/qml/qmlvme.cpp +++ b/src/declarative/qml/qmlvme.cpp @@ -142,9 +142,8 @@ QObject *QmlVME::run(QStack<QObject *> &stack, QmlContext *ctxt, QmlCompiledData QStack<ListInstance> qliststack; - QStack<QmlMetaProperty> pushedProperties; - vmeErrors.clear(); + QmlEnginePrivate *ep = ctxt->engine()->d_func(); for (int ii = start; !isError() && ii < (start + count); ++ii) { QmlInstruction &instr = comp->bytecode[ii]; @@ -533,12 +532,13 @@ QObject *QmlVME::run(QStack<QObject *> &stack, QmlContext *ctxt, QmlCompiledData case QmlInstruction::StoreCompiledBinding: { - QObject *target = stack.top(); + QObject *target = + stack.at(stack.count() - 1 - instr.assignBinding.owner); QObject *context = stack.at(stack.count() - 1 - instr.assignBinding.context); - QmlMetaProperty mp(target, instr.assignBinding.property, - (QmlMetaProperty::PropertyCategory)instr.assignBinding.category); + QmlMetaProperty mp; + mp.restore(instr.assignBinding.property, target, ctxt); QmlBinding *bind = new QmlBinding((void *)datas.at(instr.assignBinding.value).constData(), comp, context, ctxt, 0); bindValues.append(bind); @@ -553,12 +553,13 @@ QObject *QmlVME::run(QStack<QObject *> &stack, QmlContext *ctxt, QmlCompiledData case QmlInstruction::StoreBinding: { - QObject *target = stack.top(); + QObject *target = + stack.at(stack.count() - 1 - instr.assignBinding.owner); QObject *context = stack.at(stack.count() - 1 - instr.assignBinding.context); - QmlMetaProperty mp(target, instr.assignBinding.property, - (QmlMetaProperty::PropertyCategory)instr.assignBinding.category); + QmlMetaProperty mp; + mp.restore(instr.assignBinding.property, target, ctxt); QmlBinding *bind = new QmlBinding(primitives.at(instr.assignBinding.value), context, ctxt); bindValues.append(bind); @@ -574,12 +575,14 @@ QObject *QmlVME::run(QStack<QObject *> &stack, QmlContext *ctxt, QmlCompiledData case QmlInstruction::StoreValueSource: { - QObject *assign = stack.pop(); QmlPropertyValueSource *vs = - static_cast<QmlPropertyValueSource *>(assign); - QObject *target = stack.top(); + static_cast<QmlPropertyValueSource *>(stack.pop()); + QObject *target = + stack.at(stack.count() - 1 - instr.assignValueSource.owner); + QmlMetaProperty prop; + prop.restore(instr.assignValueSource.property, target, ctxt); vs->setParent(target); - vs->setTarget(QmlMetaProperty(target, instr.assignValueSource.property)); + vs->setTarget(prop); } break; @@ -762,6 +765,25 @@ QObject *QmlVME::run(QStack<QObject *> &stack, QmlContext *ctxt, QmlCompiledData } break; + case QmlInstruction::FetchValueType: + { + QObject *target = stack.top(); + QmlValueType *valueHandler = + ep->valueTypes[instr.fetchValue.type]; + valueHandler->read(target, instr.fetchValue.property); + stack.push(valueHandler); + } + break; + + case QmlInstruction::PopValueType: + { + QmlValueType *valueHandler = + static_cast<QmlValueType *>(stack.pop()); + QObject *target = stack.top(); + valueHandler->write(target, instr.fetchValue.property); + } + break; + default: qFatal("QmlCompiledData: Internal error - unknown instruction %d", instr.type); break; @@ -778,7 +800,6 @@ QObject *QmlVME::run(QStack<QObject *> &stack, QmlContext *ctxt, QmlCompiledData return 0; } - QmlEnginePrivate *ep = ctxt->engine()->d_func(); if (bindValues.count) ep->bindValues << bindValues; if (parserStatus.count) diff --git a/src/declarative/util/qmlanimation.cpp b/src/declarative/util/qmlanimation.cpp index 7c1e242..27caf20 100644 --- a/src/declarative/util/qmlanimation.cpp +++ b/src/declarative/util/qmlanimation.cpp @@ -1153,7 +1153,9 @@ void QmlParentChangeAction::transition(QmlStateActions &actions, Action &action = actions[ii]; //### should we still use target to filter? - if (action.event /*&& action.event->name() == d->parentChange*/) { //### + //### still need type-specific matching + if (action.event + && action.event->typeName() == QLatin1String("ParentChange")) { Action myAction = action; data->reverse = action.reverseEvent; data->actions << myAction; diff --git a/src/declarative/util/qmlstate.cpp b/src/declarative/util/qmlstate.cpp index 3cd72b1..a5fe8a7 100644 --- a/src/declarative/util/qmlstate.cpp +++ b/src/declarative/util/qmlstate.cpp @@ -74,7 +74,7 @@ ActionEvent::~ActionEvent() { } -QString ActionEvent::name() const +QString ActionEvent::typeName() const { return QString(); } @@ -360,13 +360,13 @@ void QmlState::apply(QmlStateGroup *group, QmlTransition *trans, QmlState *rever if (action.event) { if (!action.event->isReversable()) continue; - for (jj = 0; jj < d->revertList.count(); ++jj) { + /*for (jj = 0; jj < d->revertList.count(); ++jj) { ActionEvent *event = d->revertList.at(jj).event; - if (event && event->name() == action.event->name()) { + if (event && event->typeName() == action.event->typeName()) { found = true; break; } - } + }*/ //### not a close enough match } else { action.fromBinding = action.property.binding(); diff --git a/src/declarative/util/qmlstate.h b/src/declarative/util/qmlstate.h index 1c0d67f..e453446 100644 --- a/src/declarative/util/qmlstate.h +++ b/src/declarative/util/qmlstate.h @@ -83,7 +83,7 @@ class ActionEvent { public: virtual ~ActionEvent(); - virtual QString name() const; + virtual QString typeName() const; virtual void execute(); virtual bool isReversable(); virtual void reverse(); diff --git a/src/declarative/util/qmlstateoperations.cpp b/src/declarative/util/qmlstateoperations.cpp index 2a051bd..791628c 100644 --- a/src/declarative/util/qmlstateoperations.cpp +++ b/src/declarative/util/qmlstateoperations.cpp @@ -142,6 +142,7 @@ QFxItem *QmlParentChange::object() const Q_D(const QmlParentChange); return d->target; } + void QmlParentChange::setObject(QFxItem *target) { Q_D(QmlParentChange); @@ -196,6 +197,11 @@ void QmlParentChange::reverse() d->doChange(d->origParent); } +QString QmlParentChange::typeName() const +{ + return QLatin1String("ParentChange"); +} + class QmlRunScriptPrivate : public QObjectPrivate { public: diff --git a/src/declarative/util/qmlstateoperations.h b/src/declarative/util/qmlstateoperations.h index acbe05e..67cd1cf 100644 --- a/src/declarative/util/qmlstateoperations.h +++ b/src/declarative/util/qmlstateoperations.h @@ -74,6 +74,7 @@ public: virtual void execute(); virtual bool isReversable(); virtual void reverse(); + virtual QString typeName() const; }; class QmlRunScriptPrivate; @@ -94,7 +95,7 @@ public: QString script() const; void setScript(const QString &); - virtual QString name() const; + QString name() const; void setName(const QString &); virtual void execute(); diff --git a/src/declarative/util/qmltransitionmanager.cpp b/src/declarative/util/qmltransitionmanager.cpp index 6f1a8e3..4609de8 100644 --- a/src/declarative/util/qmltransitionmanager.cpp +++ b/src/declarative/util/qmltransitionmanager.cpp @@ -196,7 +196,10 @@ void QmlTransitionManager::transition(const QList<Action> &list, // transition foreach(const Action &action, applyList) { if (action.event) { - action.event->execute(); + if (action.event->isReversable() && action.reverseEvent) + action.event->reverse(); + else + action.event->execute(); } else { action.property.write(action.toValue); } |