From f3a04e7ef6a64ce9d9a540bbf56c0c345cb15bc7 Mon Sep 17 00:00:00 2001
From: Roberto Raggi <roberto.raggi@nokia.com>
Date: Mon, 27 Jul 2009 01:51:19 +0200
Subject: [PATCH] Updated the QML front-end to release
 be7b6bcac093abfb1ca1afedcdc6c5d12da12c8e

---
 src/plugins/duieditor/parser/parser.pri       |    1 +
 src/plugins/duieditor/parser/qmljs.g          |  148 +-
 src/plugins/duieditor/parser/qmljsast.cpp     |   63 +-
 src/plugins/duieditor/parser/qmljsast_p.h     |  117 +-
 src/plugins/duieditor/parser/qmljsastfwd_p.h  |    3 +
 .../duieditor/parser/qmljsastvisitor_p.h      |    6 +
 src/plugins/duieditor/parser/qmljsgrammar.cpp | 1459 +++++++++--------
 src/plugins/duieditor/parser/qmljsgrammar_p.h |   18 +-
 src/plugins/duieditor/parser/qmljslexer.cpp   |   58 -
 src/plugins/duieditor/parser/qmljslexer_p.h   |   19 -
 src/plugins/duieditor/parser/qmljsparser.cpp  |  513 +++---
 src/plugins/duieditor/parser/qmljsparser_p.h  |    7 +-
 12 files changed, 1269 insertions(+), 1143 deletions(-)

diff --git a/src/plugins/duieditor/parser/parser.pri b/src/plugins/duieditor/parser/parser.pri
index 610b2aab00a..1ea249aeb17 100644
--- a/src/plugins/duieditor/parser/parser.pri
+++ b/src/plugins/duieditor/parser/parser.pri
@@ -1,5 +1,6 @@
 
 INCLUDEPATH += $$PWD
+DEPENDPATH += $$PWD
 
 HEADERS += $$PWD/qmljsast_p.h \
            $$PWD/qmljsastfwd_p.h \
diff --git a/src/plugins/duieditor/parser/qmljs.g b/src/plugins/duieditor/parser/qmljs.g
index 43cce407e3e..a1c4ba2c6c9 100644
--- a/src/plugins/duieditor/parser/qmljs.g
+++ b/src/plugins/duieditor/parser/qmljs.g
@@ -271,6 +271,9 @@ public:
       AST::UiObjectMemberList *UiObjectMemberList;
       AST::UiArrayMemberList *UiArrayMemberList;
       AST::UiQualifiedId *UiQualifiedId;
+      AST::UiSignature *UiSignature;
+      AST::UiFormalList *UiFormalList;
+      AST::UiFormal *UiFormal;
     };
 
 public:
@@ -741,8 +744,8 @@ UiObjectMember: UiObjectDefinition ;
 UiObjectMember: UiQualifiedId T_COLON T_LBRACKET UiArrayMemberList T_RBRACKET ;
 /.
 case $rule_number: {
-    AST::UiArrayBinding *node = makeAstNode<AST::UiArrayBinding> (driver->nodePool(), sym(1).UiQualifiedId->finish(),
-        sym(4).UiArrayMemberList->finish());
+    AST::UiArrayBinding *node = makeAstNode<AST::UiArrayBinding> (driver->nodePool(),
+        sym(1).UiQualifiedId->finish(), sym(4).UiArrayMemberList->finish());
     node->colonToken = loc(2);
     node->lbracketToken = loc(3);
     node->rbracketToken = loc(5);
@@ -750,33 +753,32 @@ case $rule_number: {
 }   break;
 ./
 
-UiMultilineStringLiteral: T_MULTILINE_STRING_LITERAL ;
+UiObjectMember: UiQualifiedId             T_COLON Expression UiObjectInitializer ;
 /.
 case $rule_number: {
-  AST::StringLiteral *node = makeAstNode<AST::StringLiteral> (driver->nodePool(), sym(1).sval);
-  node->literalToken = loc(1);
-  sym(1).Node = node;
-} break;
-./
+  if (AST::UiQualifiedId *qualifiedId = reparseAsQualifiedId(sym(3).Expression)) {
+    AST::UiObjectBinding *node = makeAstNode<AST::UiObjectBinding> (driver->nodePool(),
+      sym(1).UiQualifiedId->finish(), qualifiedId, sym(4).UiObjectInitializer);
+    node->colonToken = loc(2);
+    sym(1).Node = node;
+  } else {
+    sym(1).Node = 0;
 
-UiMultilineStringStatement: UiMultilineStringLiteral T_AUTOMATIC_SEMICOLON ;  -- automatic semicolon
-UiMultilineStringStatement: UiMultilineStringLiteral T_SEMICOLON ;
-/.
-case $rule_number: {
-  AST::ExpressionStatement *node = makeAstNode<AST::ExpressionStatement> (driver->nodePool(), sym(1).Expression);
-  node->semicolonToken = loc(2);
-  sym(1).Node = node;
+    diagnostic_messages.append(DiagnosticMessage(DiagnosticMessage::Error, loc(2),
+      QLatin1String("Expected a type name after token `:'")));
+
+    return false; // ### recover
+  }
 } break;
 ./
 
-
-UiObjectMember: UiQualifiedId T_COLON Expression UiObjectInitializer ;
+UiObjectMember: UiQualifiedId UiSignature T_COLON Expression UiObjectInitializer ;
 /.
 case $rule_number: {
-  if (AST::UiQualifiedId *qualifiedId = reparseAsQualifiedId(sym(3).Expression)) {
+  if (AST::UiQualifiedId *qualifiedId = reparseAsQualifiedId(sym(4).Expression)) {
     AST::UiObjectBinding *node = makeAstNode<AST::UiObjectBinding> (driver->nodePool(),
-      sym(1).UiQualifiedId->finish(), qualifiedId, sym(4).UiObjectInitializer);
-    node->colonToken = loc(2);
+      sym(1).UiQualifiedId->finish(), qualifiedId, sym(5).UiObjectInitializer);
+    node->colonToken = loc(3);
     sym(1).Node = node;
   } else {
     sym(1).Node = 0;
@@ -789,19 +791,36 @@ case $rule_number: {
 } break;
 ./
 
-UiObjectMember: UiQualifiedId T_COLON Block ;
+UiObjectMember: UiQualifiedId UiSignature T_COLON Block ;
 /.case $rule_number:./
 
-UiObjectMember: UiQualifiedId T_COLON EmptyStatement ;
+UiObjectMember: UiQualifiedId UiSignature T_COLON EmptyStatement ;
 /.case $rule_number:./
 
-UiObjectMember: UiQualifiedId T_COLON ExpressionStatement ;
+UiObjectMember: UiQualifiedId UiSignature T_COLON ExpressionStatement ;
+/.case $rule_number:./
+
+UiObjectMember: UiQualifiedId UiSignature T_COLON IfStatement ; --- ### do we really want if statement in a binding?
+/.case $rule_number:./
+
+/.
+{
+    AST::UiScriptBinding *node = makeAstNode<AST::UiScriptBinding> (driver->nodePool(),
+        sym(1).UiQualifiedId->finish(), sym(4).Statement);
+    node->colonToken = loc(3);
+    sym(1).Node = node;
+}   break;
+./
+
+
+
+UiObjectMember: UiQualifiedId T_COLON Block ;
 /.case $rule_number:./
 
-UiObjectMember: UiQualifiedId T_COLON DebuggerStatement ;
+UiObjectMember: UiQualifiedId T_COLON EmptyStatement ;
 /.case $rule_number:./
 
-UiObjectMember: UiQualifiedId T_COLON UiMultilineStringStatement ;
+UiObjectMember: UiQualifiedId T_COLON ExpressionStatement ;
 /.case $rule_number:./
 
 UiObjectMember: UiQualifiedId T_COLON IfStatement ; --- ### do we really want if statement in a binding?
@@ -809,8 +828,8 @@ UiObjectMember: UiQualifiedId T_COLON IfStatement ; --- ### do we really want if
 
 /.
 {
-    AST::UiScriptBinding *node = makeAstNode<AST::UiScriptBinding> (driver->nodePool(), sym(1).UiQualifiedId->finish(),
-        sym(3).Statement);
+    AST::UiScriptBinding *node = makeAstNode<AST::UiScriptBinding> (driver->nodePool(),
+        sym(1).UiQualifiedId->finish(), sym(3).Statement);
     node->colonToken = loc(2);
     sym(1).Node = node;
 }   break;
@@ -863,27 +882,89 @@ case $rule_number: {
 } break;
 ./
 
-UiObjectMember: T_SIGNAL T_IDENTIFIER T_LPAREN UiParameterListOpt T_RPAREN ;
+UiFormal: JsIdentifier ;
+/.
+case $rule_number: {
+    AST::UiFormal *node = makeAstNode<AST::UiFormal>(driver->nodePool(), sym(1).sval);
+    node->identifierToken = loc(1);
+    sym(1).UiFormal = node;
+} break;
+./
+
+UiFormal: JsIdentifier T_AS JsIdentifier ;
+/.
+case $rule_number: {
+    AST::UiFormal *node = makeAstNode<AST::UiFormal>(driver->nodePool(),
+        sym(1).sval, sym(3).sval);
+    node->identifierToken = loc(1);
+    node->asToken = loc(2);
+    node->aliasToken = loc(3);
+    sym(1).UiFormal = node;
+} break;
+./
+
+UiFormalList: UiFormal ;
+/.
+case $rule_number: {
+    sym(1).UiFormalList = makeAstNode<AST::UiFormalList>(driver->nodePool(),
+        sym(1).UiFormal);
+} break;
+./
+
+UiFormalList: UiFormalList T_COMMA UiFormal ;
+/.
+case $rule_number: {
+    sym(1).UiFormalList = makeAstNode<AST::UiFormalList>(driver->nodePool(),
+        sym(1).UiFormalList, sym(3).UiFormal);
+} break;
+./
+
+UiSignature: T_LPAREN              T_RPAREN ;
+/.
+case $rule_number: {
+    AST::UiSignature *node = makeAstNode<AST::UiSignature>(driver->nodePool());
+    node->lparenToken = loc(1);
+    node->rparenToken = loc(3);
+    sym(1).UiSignature = node;
+} break;
+./
+
+UiSignature: T_LPAREN UiFormalList T_RPAREN ;
+/.
+case $rule_number: {
+    AST::UiSignature *node = makeAstNode<AST::UiSignature>(driver->nodePool(),
+        sym(2).UiFormalList->finish());
+    node->lparenToken = loc(1);
+    node->rparenToken = loc(3);
+    sym(1).UiSignature = node;
+} break;
+./
+
+UiObjectMember: T_SIGNAL T_IDENTIFIER T_LPAREN UiParameterListOpt T_RPAREN T_AUTOMATIC_SEMICOLON ;
+UiObjectMember: T_SIGNAL T_IDENTIFIER T_LPAREN UiParameterListOpt T_RPAREN T_SEMICOLON ;
 /.
 case $rule_number: {
     AST::UiPublicMember *node = makeAstNode<AST::UiPublicMember> (driver->nodePool(), (NameId *)0, sym(2).sval);
     node->type = AST::UiPublicMember::Signal;
     node->propertyToken = loc(1);
     node->typeToken = loc(2);
-    node->identifierToken = loc(3);
+    node->identifierToken = loc(2);
     node->parameters = sym(4).UiParameterList;
+    node->semicolonToken = loc(6);
     sym(1).Node = node;
 }   break;
 ./
 
-UiObjectMember: T_SIGNAL T_IDENTIFIER ;
+UiObjectMember: T_SIGNAL T_IDENTIFIER T_AUTOMATIC_SEMICOLON ;
+UiObjectMember: T_SIGNAL T_IDENTIFIER T_SEMICOLON ;
 /.
 case $rule_number: {
     AST::UiPublicMember *node = makeAstNode<AST::UiPublicMember> (driver->nodePool(), (NameId *)0, sym(2).sval);
     node->type = AST::UiPublicMember::Signal;
     node->propertyToken = loc(1);
     node->typeToken = loc(2);
-    node->identifierToken = loc(3);
+    node->identifierToken = loc(2);
+    node->semicolonToken = loc(3);
     sym(1).Node = node;
 }   break;
 ./
@@ -1047,12 +1128,15 @@ case $rule_number: {
 PrimaryExpression: T_NUMERIC_LITERAL ;
 /.
 case $rule_number: {
-  AST::NumericLiteral *node = makeAstNode<AST::NumericLiteral> (driver->nodePool(), sym(1).dval, lexer->flags);
+  AST::NumericLiteral *node = makeAstNode<AST::NumericLiteral> (driver->nodePool(), sym(1).dval);
   node->literalToken = loc(1);
   sym(1).Node = node;
 } break;
 ./
 
+PrimaryExpression: T_MULTILINE_STRING_LITERAL ;
+/.case $rule_number:./
+
 PrimaryExpression: T_STRING_LITERAL ;
 /.
 case $rule_number: {
diff --git a/src/plugins/duieditor/parser/qmljsast.cpp b/src/plugins/duieditor/parser/qmljsast.cpp
index d10c07121d4..1d7f09eb5a2 100644
--- a/src/plugins/duieditor/parser/qmljsast.cpp
+++ b/src/plugins/duieditor/parser/qmljsast.cpp
@@ -49,44 +49,6 @@ QT_BEGIN_NAMESPACE
 
 namespace QmlJS { namespace AST {
 
-int NumericLiteral::suffixLength[] = {
-    0, // noSuffix
-    2, // emSuffix
-    2, // exSuffix
-    2, // pxSuffix
-    2, // cmSuffix
-    2, // mmSuffix
-    2, // inSuffix
-    2, // ptSuffix
-    2, // pcSuffix
-    3, // degSuffix
-    3, // radSuffix
-    4, // gradSuffix
-    2, // msSuffix
-    1, // sSuffix
-    2, // hzSuffix
-    3  // khzSuffix
-};
-
-const char *const NumericLiteral::suffixSpell[] = {
-    "",
-    "em",
-    "ex",
-    "px",
-    "cm",
-    "mm",
-    "in",
-    "pt",
-    "pc",
-    "deg",
-    "rad",
-    "grad",
-    "ms",
-    "s",
-    "hz",
-    "khz"
-};
-
 ExpressionNode *Node::expressionCast()
 {
     return 0;
@@ -839,6 +801,31 @@ void UiProgram::accept0(Visitor *visitor)
     visitor->endVisit(this);
 }
 
+void UiSignature::accept0(Visitor *visitor)
+{
+    if (visitor->visit(this)) {
+        acceptChild(formals, visitor);
+    }
+    visitor->endVisit(this);
+}
+
+void UiFormalList::accept0(Visitor *visitor)
+{
+    if (visitor->visit(this)) {
+        for (UiFormalList *it = this; it; it = it->next) {
+            acceptChild(it->formal, visitor);
+        }
+    }
+    visitor->endVisit(this);
+}
+
+void UiFormal::accept0(Visitor *visitor)
+{
+    if (visitor->visit(this)) {
+    }
+    visitor->endVisit(this);
+}
+
 void UiPublicMember::accept0(Visitor *visitor)
 {
     if (visitor->visit(this)) {
diff --git a/src/plugins/duieditor/parser/qmljsast_p.h b/src/plugins/duieditor/parser/qmljsast_p.h
index 6d269accf8b..97451539407 100644
--- a/src/plugins/duieditor/parser/qmljsast_p.h
+++ b/src/plugins/duieditor/parser/qmljsast_p.h
@@ -104,7 +104,7 @@ enum Op {
 
 } // namespace QSOperator
 
-namespace QmlJS { 
+namespace QmlJS {
 class NameId;
 namespace AST {
 
@@ -213,7 +213,10 @@ public:
         Kind_UiPublicMember,
         Kind_UiQualifiedId,
         Kind_UiScriptBinding,
-        Kind_UiSourceElement
+        Kind_UiSourceElement,
+        Kind_UiFormal,
+        Kind_UiFormalList,
+        Kind_UiSignature
     };
 
     inline Node()
@@ -269,6 +272,89 @@ public:
     virtual SourceLocation lastSourceLocation() const = 0;
 };
 
+class UiFormal: public Node
+{
+public:
+    QMLJS_DECLARE_AST_NODE(UiFormal)
+
+    UiFormal(NameId *name, NameId *alias = 0)
+      : name(name), alias(alias)
+    { }
+
+    virtual SourceLocation firstSourceLocation() const
+    { return SourceLocation(); }
+
+    virtual SourceLocation lastSourceLocation() const
+    { return SourceLocation(); }
+
+    virtual void accept0(Visitor *visitor);
+
+// attributes
+    NameId *name;
+    NameId *alias;
+    SourceLocation identifierToken;
+    SourceLocation asToken;
+    SourceLocation aliasToken;
+};
+
+class UiFormalList: public Node
+{
+public:
+    QMLJS_DECLARE_AST_NODE(UiFormalList)
+
+    UiFormalList(UiFormal *formal)
+            : formal(formal), next(this) {}
+
+    UiFormalList(UiFormalList *previous, UiFormal *formal)
+            : formal(formal)
+    {
+        next = previous->next;
+        previous->next = this;
+    }
+
+    UiFormalList *finish()
+    {
+        UiFormalList *head = next;
+        next = 0;
+        return head;
+    }
+
+    virtual SourceLocation firstSourceLocation() const
+    { return SourceLocation(); }
+
+    virtual SourceLocation lastSourceLocation() const
+    { return SourceLocation(); }
+
+    virtual void accept0(Visitor *visitor);
+
+// attributes
+    UiFormal *formal;
+    UiFormalList *next;
+};
+
+class UiSignature: public Node
+{
+public:
+    QMLJS_DECLARE_AST_NODE(UiSignature)
+
+    UiSignature(UiFormalList *formals = 0)
+        : formals(formals)
+    { }
+
+    virtual SourceLocation firstSourceLocation() const
+    { return SourceLocation(); }
+
+    virtual SourceLocation lastSourceLocation() const
+    { return SourceLocation(); }
+
+    virtual void accept0(Visitor *visitor);
+
+// attributes
+    SourceLocation lparenToken;
+    UiFormalList *formals;
+    SourceLocation rparenToken;
+};
+
 class NestedExpression: public ExpressionNode
 {
 public:
@@ -400,30 +486,8 @@ class NumericLiteral: public ExpressionNode
 public:
     QMLJS_DECLARE_AST_NODE(NumericLiteral)
 
-    enum Suffix { // ### keep it in sync with the Suffix enum in qmljslexer_p.h
-        noSuffix,
-        emSuffix,
-        exSuffix,
-        pxSuffix,
-        cmSuffix,
-        mmSuffix,
-        inSuffix,
-        ptSuffix,
-        pcSuffix,
-        degSuffix,
-        radSuffix,
-        gradSuffix,
-        msSuffix,
-        sSuffix,
-        hzSuffix,
-        khzSuffix
-    };
-
-    static int suffixLength[];
-    static const char *const suffixSpell[];
-
-    NumericLiteral(double v, int suffix):
-        value(v), suffix(suffix) { kind = K; }
+    NumericLiteral(double v):
+        value(v) { kind = K; }
     virtual ~NumericLiteral() {}
 
     virtual void accept0(Visitor *visitor);
@@ -436,7 +500,6 @@ public:
 
 // attributes:
     double value;
-    int suffix;
     SourceLocation literalToken;
 };
 
diff --git a/src/plugins/duieditor/parser/qmljsastfwd_p.h b/src/plugins/duieditor/parser/qmljsastfwd_p.h
index 339bea48807..f79cfc2ac6c 100644
--- a/src/plugins/duieditor/parser/qmljsastfwd_p.h
+++ b/src/plugins/duieditor/parser/qmljsastfwd_p.h
@@ -176,6 +176,9 @@ class UiObjectMember;
 class UiObjectMemberList;
 class UiArrayMemberList;
 class UiQualifiedId;
+class UiFormalList;
+class UiFormal;
+class UiSignature;
 
 } } // namespace AST
 
diff --git a/src/plugins/duieditor/parser/qmljsastvisitor_p.h b/src/plugins/duieditor/parser/qmljsastvisitor_p.h
index 3677b1a1fde..237640f577a 100644
--- a/src/plugins/duieditor/parser/qmljsastvisitor_p.h
+++ b/src/plugins/duieditor/parser/qmljsastvisitor_p.h
@@ -82,6 +82,9 @@ public:
     virtual bool visit(UiObjectMemberList *) { return true; }
     virtual bool visit(UiArrayMemberList *) { return true; }
     virtual bool visit(UiQualifiedId *) { return true; }
+    virtual bool visit(UiSignature *) { return true; }
+    virtual bool visit(UiFormalList *) { return true; }
+    virtual bool visit(UiFormal *) { return true; }
 
     virtual void endVisit(UiProgram *) {}
     virtual void endVisit(UiImportList *) {}
@@ -96,6 +99,9 @@ public:
     virtual void endVisit(UiObjectMemberList *) {}
     virtual void endVisit(UiArrayMemberList *) {}
     virtual void endVisit(UiQualifiedId *) {}
+    virtual void endVisit(UiSignature *) {}
+    virtual void endVisit(UiFormalList *) {}
+    virtual void endVisit(UiFormal *) {}
 
     // QmlJS
     virtual bool visit(ThisExpression *) { return true; }
diff --git a/src/plugins/duieditor/parser/qmljsgrammar.cpp b/src/plugins/duieditor/parser/qmljsgrammar.cpp
index 4fba480c9b6..21dde3fe9bd 100644
--- a/src/plugins/duieditor/parser/qmljsgrammar.cpp
+++ b/src/plugins/duieditor/parser/qmljsgrammar.cpp
@@ -2,7 +2,7 @@
 /****************************************************************************
 **
 ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
-** Contact: Qt Software Information (qt-info@nokia.com)
+** Contact: Nokia Corporation (qt-info@nokia.com)
 **
 ** This file is part of the QtCore module of the Qt Toolkit.
 **
@@ -35,7 +35,7 @@
 ** met: http://www.gnu.org/copyleft/gpl.html.
 **
 ** If you are unsure which license is appropriate for your use, please
-** contact the sales department at qt-sales@nokia.com.
+** contact the sales department at http://www.qtsoftware.com/contact.
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
@@ -58,677 +58,686 @@ const int QmlJSGrammar::lhs [] = {
   95, 95, 95, 96, 99, 99, 102, 102, 103, 103, 
   103, 103, 103, 103, 103, 103, 103, 103, 103, 103, 
   101, 100, 107, 107, 109, 109, 110, 110, 106, 108, 
-  108, 111, 112, 112, 108, 108, 108, 108, 108, 108, 
-  108, 118, 118, 118, 119, 119, 120, 120, 108, 108, 
   108, 108, 108, 108, 108, 108, 108, 108, 108, 108, 
-  105, 105, 104, 104, 104, 123, 123, 123, 123, 123, 
+  108, 116, 116, 116, 117, 117, 118, 118, 119, 119, 
+  120, 120, 111, 111, 108, 108, 108, 108, 108, 108, 
+  108, 108, 108, 108, 108, 108, 108, 108, 105, 105, 
+  104, 104, 104, 123, 123, 123, 123, 123, 123, 123, 
   123, 123, 123, 123, 123, 123, 123, 123, 123, 123, 
-  123, 123, 105, 105, 125, 125, 125, 125, 124, 124, 
-  127, 127, 129, 129, 129, 129, 129, 129, 130, 130, 
+  123, 105, 105, 125, 125, 125, 125, 124, 124, 127, 
+  127, 129, 129, 129, 129, 129, 129, 130, 130, 130, 
   130, 130, 130, 130, 130, 130, 130, 130, 130, 130, 
   130, 130, 130, 130, 130, 130, 130, 130, 130, 130, 
-  130, 130, 130, 130, 130, 130, 130, 130, 130, 131, 
-  131, 132, 132, 132, 132, 132, 135, 135, 136, 136, 
-  136, 136, 134, 134, 137, 137, 138, 138, 139, 139, 
-  139, 140, 140, 140, 140, 140, 140, 140, 140, 140, 
-  140, 141, 141, 141, 141, 142, 142, 142, 143, 143, 
-  143, 143, 144, 144, 144, 144, 144, 144, 144, 145, 
-  145, 145, 145, 145, 145, 146, 146, 146, 146, 146, 
-  147, 147, 147, 147, 147, 148, 148, 149, 149, 150, 
-  150, 151, 151, 152, 152, 153, 153, 154, 154, 155, 
-  155, 156, 156, 157, 157, 158, 158, 159, 159, 128, 
-  128, 160, 160, 161, 161, 161, 161, 161, 161, 161, 
-  161, 161, 161, 161, 161, 98, 98, 162, 162, 163, 
-  163, 164, 164, 97, 97, 97, 97, 97, 97, 97, 
-  97, 97, 97, 97, 97, 97, 97, 97, 113, 175, 
-  175, 174, 174, 122, 122, 176, 176, 177, 177, 179, 
-  179, 178, 180, 183, 181, 181, 184, 182, 182, 114, 
-  115, 115, 117, 117, 165, 165, 165, 165, 165, 165, 
-  165, 166, 166, 166, 166, 167, 167, 167, 167, 168, 
-  168, 169, 171, 185, 185, 188, 188, 186, 186, 189, 
-  187, 170, 170, 170, 172, 172, 173, 173, 173, 190, 
-  191, 116, 116, 121, 133, 195, 195, 192, 192, 193, 
-  193, 196, 197, 197, 198, 198, 194, 194, 126, 126, 
-  199};
+  130, 130, 130, 130, 130, 130, 130, 130, 131, 131, 
+  132, 132, 132, 132, 132, 135, 135, 136, 136, 136, 
+  136, 134, 134, 137, 137, 138, 138, 139, 139, 139, 
+  140, 140, 140, 140, 140, 140, 140, 140, 140, 140, 
+  141, 141, 141, 141, 142, 142, 142, 143, 143, 143, 
+  143, 144, 144, 144, 144, 144, 144, 144, 145, 145, 
+  145, 145, 145, 145, 146, 146, 146, 146, 146, 147, 
+  147, 147, 147, 147, 148, 148, 149, 149, 150, 150, 
+  151, 151, 152, 152, 153, 153, 154, 154, 155, 155, 
+  156, 156, 157, 157, 158, 158, 159, 159, 128, 128, 
+  160, 160, 161, 161, 161, 161, 161, 161, 161, 161, 
+  161, 161, 161, 161, 98, 98, 162, 162, 163, 163, 
+  164, 164, 97, 97, 97, 97, 97, 97, 97, 97, 
+  97, 97, 97, 97, 97, 97, 97, 112, 176, 176, 
+  175, 175, 122, 122, 177, 177, 178, 178, 180, 180, 
+  179, 181, 184, 182, 182, 185, 183, 183, 113, 114, 
+  114, 115, 115, 165, 165, 165, 165, 165, 165, 165, 
+  166, 166, 166, 166, 167, 167, 167, 167, 168, 168, 
+  169, 171, 186, 186, 189, 189, 187, 187, 190, 188, 
+  170, 170, 170, 172, 172, 173, 173, 173, 191, 192, 
+  174, 174, 121, 133, 196, 196, 193, 193, 194, 194, 
+  197, 198, 198, 199, 199, 195, 195, 126, 126, 200};
 
 const int QmlJSGrammar:: rhs[] = {
   2, 2, 2, 2, 1, 1, 1, 2, 3, 3, 
   5, 5, 3, 3, 4, 4, 6, 6, 5, 5, 
   0, 1, 1, 2, 1, 3, 2, 3, 2, 1, 
-  5, 1, 2, 2, 4, 3, 3, 3, 3, 3, 
-  3, 1, 1, 1, 0, 1, 2, 4, 5, 2, 
-  4, 4, 5, 5, 6, 6, 7, 7, 1, 1, 
+  5, 4, 5, 4, 4, 4, 4, 3, 3, 3, 
+  3, 1, 1, 1, 0, 1, 2, 4, 1, 3, 
+  1, 3, 2, 3, 6, 6, 3, 3, 4, 4, 
+  5, 5, 6, 6, 7, 7, 1, 1, 1, 1, 
   1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 
-  1, 1, 1, 1, 2, 3, 3, 4, 5, 3, 
-  4, 3, 1, 3, 1, 2, 3, 4, 1, 2, 
-  3, 5, 1, 1, 1, 1, 1, 1, 1, 1, 
+  1, 1, 1, 2, 3, 3, 4, 5, 3, 4, 
+  3, 1, 3, 1, 2, 3, 4, 1, 2, 3, 
+  5, 1, 1, 1, 1, 1, 1, 1, 1, 1, 
   1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 
   1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 
   1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 
-  1, 1, 1, 4, 3, 5, 1, 2, 4, 4, 
-  4, 3, 0, 1, 1, 3, 1, 1, 1, 2, 
-  2, 1, 2, 2, 2, 2, 2, 2, 2, 2, 
-  2, 1, 3, 3, 3, 1, 3, 3, 1, 3, 
-  3, 3, 1, 3, 3, 3, 3, 3, 3, 1, 
-  3, 3, 3, 3, 3, 1, 3, 3, 3, 3, 
-  1, 3, 3, 3, 3, 1, 3, 1, 3, 1, 
-  3, 1, 3, 1, 3, 1, 3, 1, 3, 1, 
-  3, 1, 3, 1, 3, 1, 5, 1, 5, 1, 
-  3, 1, 3, 1, 1, 1, 1, 1, 1, 1, 
-  1, 1, 1, 1, 1, 1, 3, 0, 1, 1, 
-  3, 0, 1, 1, 1, 1, 1, 1, 1, 1, 
-  1, 1, 1, 1, 1, 1, 1, 1, 3, 1, 
-  2, 0, 1, 3, 3, 1, 1, 1, 3, 1, 
-  3, 2, 2, 2, 0, 1, 2, 0, 1, 1, 
-  2, 2, 7, 5, 7, 7, 5, 9, 10, 7, 
-  8, 2, 2, 3, 3, 2, 2, 3, 3, 3, 
-  3, 5, 5, 3, 5, 1, 2, 0, 1, 4, 
-  3, 3, 3, 3, 3, 3, 3, 3, 4, 5, 
-  2, 2, 2, 8, 8, 1, 3, 0, 1, 0, 
-  1, 1, 1, 2, 1, 1, 0, 1, 0, 1, 
-  2};
+  1, 1, 4, 3, 5, 1, 2, 4, 4, 4, 
+  3, 0, 1, 1, 3, 1, 1, 1, 2, 2, 
+  1, 2, 2, 2, 2, 2, 2, 2, 2, 2, 
+  1, 3, 3, 3, 1, 3, 3, 1, 3, 3, 
+  3, 1, 3, 3, 3, 3, 3, 3, 1, 3, 
+  3, 3, 3, 3, 1, 3, 3, 3, 3, 1, 
+  3, 3, 3, 3, 1, 3, 1, 3, 1, 3, 
+  1, 3, 1, 3, 1, 3, 1, 3, 1, 3, 
+  1, 3, 1, 3, 1, 5, 1, 5, 1, 3, 
+  1, 3, 1, 1, 1, 1, 1, 1, 1, 1, 
+  1, 1, 1, 1, 1, 3, 0, 1, 1, 3, 
+  0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 
+  1, 1, 1, 1, 1, 1, 1, 3, 1, 2, 
+  0, 1, 3, 3, 1, 1, 1, 3, 1, 3, 
+  2, 2, 2, 0, 1, 2, 0, 1, 1, 2, 
+  2, 7, 5, 7, 7, 5, 9, 10, 7, 8, 
+  2, 2, 3, 3, 2, 2, 3, 3, 3, 3, 
+  5, 5, 3, 5, 1, 2, 0, 1, 4, 3, 
+  3, 3, 3, 3, 3, 3, 3, 4, 5, 2, 
+  2, 2, 8, 8, 1, 3, 0, 1, 0, 1, 
+  1, 1, 2, 1, 1, 0, 1, 0, 1, 2};
 
 const int QmlJSGrammar::action_default [] = {
-  0, 0, 0, 21, 0, 169, 236, 200, 208, 204, 
-  148, 220, 196, 3, 133, 67, 149, 212, 216, 137, 
-  166, 147, 152, 132, 186, 173, 0, 73, 74, 70, 
-  337, 63, 339, 0, 0, 0, 0, 0, 0, 68, 
-  71, 0, 0, 64, 65, 72, 66, 0, 69, 0, 
-  0, 162, 0, 0, 149, 168, 151, 150, 0, 0, 
-  0, 164, 165, 163, 167, 0, 197, 0, 0, 0, 
-  0, 187, 0, 0, 0, 0, 0, 0, 177, 0, 
-  0, 0, 171, 172, 170, 175, 179, 178, 176, 174, 
-  189, 188, 190, 0, 205, 0, 201, 0, 0, 143, 
-  130, 142, 131, 99, 100, 101, 126, 102, 127, 103, 
-  104, 105, 106, 107, 108, 109, 110, 111, 112, 113, 
-  114, 115, 128, 116, 117, 118, 119, 120, 121, 122, 
-  123, 124, 125, 129, 0, 0, 141, 237, 144, 0, 
-  145, 0, 146, 140, 0, 233, 226, 224, 231, 232, 
-  230, 229, 235, 228, 227, 225, 234, 221, 0, 209, 
-  0, 0, 213, 0, 0, 217, 0, 0, 143, 135, 
-  0, 134, 0, 139, 153, 0, 338, 328, 329, 0, 
-  326, 0, 327, 0, 330, 244, 251, 250, 258, 246, 
-  0, 247, 331, 0, 336, 248, 249, 254, 252, 333, 
-  332, 335, 255, 0, 266, 0, 0, 0, 0, 337, 
-  63, 0, 339, 64, 238, 280, 65, 0, 0, 0, 
-  267, 0, 0, 256, 257, 0, 245, 253, 281, 282, 
-  325, 334, 0, 296, 297, 298, 299, 0, 292, 293, 
-  294, 295, 322, 323, 0, 0, 0, 0, 0, 285, 
-  286, 242, 240, 202, 210, 206, 222, 198, 243, 0, 
-  149, 214, 218, 191, 180, 0, 0, 199, 0, 0, 
-  0, 0, 192, 0, 0, 0, 0, 0, 184, 182, 
-  185, 183, 181, 194, 193, 195, 0, 207, 0, 203, 
-  0, 241, 149, 0, 223, 238, 239, 0, 238, 0, 
-  0, 288, 0, 0, 0, 290, 0, 211, 0, 0, 
-  215, 0, 0, 219, 278, 0, 270, 279, 273, 0, 
-  277, 0, 238, 271, 0, 238, 0, 0, 289, 0, 
-  0, 0, 291, 338, 328, 0, 0, 330, 0, 324, 
-  0, 314, 0, 0, 0, 284, 0, 283, 0, 340, 
-  0, 98, 260, 263, 0, 99, 266, 102, 127, 104, 
-  105, 70, 109, 110, 63, 111, 114, 68, 71, 64, 
-  238, 65, 72, 117, 66, 119, 69, 121, 122, 267, 
-  124, 125, 129, 0, 91, 0, 0, 93, 97, 95, 
-  81, 94, 96, 0, 92, 80, 261, 259, 137, 138, 
-  143, 0, 136, 0, 313, 0, 300, 301, 0, 312, 
-  0, 0, 0, 303, 308, 306, 309, 0, 0, 307, 
-  308, 0, 304, 0, 305, 262, 311, 0, 262, 310, 
-  0, 315, 316, 0, 262, 317, 318, 0, 0, 319, 
-  0, 0, 0, 320, 321, 155, 154, 0, 0, 0, 
-  287, 0, 0, 0, 302, 275, 268, 0, 276, 272, 
-  0, 274, 264, 0, 265, 269, 85, 0, 0, 89, 
-  75, 0, 77, 87, 0, 78, 88, 90, 79, 86, 
-  76, 0, 82, 159, 157, 161, 158, 156, 160, 2, 
-  5, 0, 7, 6, 0, 1, 83, 61, 62, 0, 
-  0, 0, 9, 10, 0, 11, 12, 0, 13, 0, 
-  0, 14, 0, 19, 20, 84, 0, 15, 16, 0, 
-  17, 18, 8, 22, 0, 4, 0, 29, 59, 0, 
-  0, 64, 27, 65, 30, 23, 0, 0, 60, 0, 
-  44, 43, 42, 0, 0, 53, 0, 54, 0, 57, 
-  58, 0, 0, 0, 51, 0, 52, 0, 55, 56, 
-  50, 45, 46, 0, 0, 0, 0, 48, 49, 47, 
-  28, 24, 0, 36, 39, 37, 0, 38, 41, 262, 
-  0, 32, 0, 40, 35, 99, 266, 102, 127, 104, 
-  105, 70, 109, 110, 63, 111, 114, 68, 71, 64, 
-  238, 65, 72, 117, 66, 119, 69, 121, 122, 267, 
-  124, 125, 129, 67, 0, 25, 0, 31, 26, 33, 
-  34, 341};
+  0, 0, 0, 21, 0, 178, 245, 209, 217, 213, 
+  157, 229, 205, 3, 142, 75, 158, 221, 225, 146, 
+  175, 156, 161, 141, 195, 182, 0, 82, 83, 78, 
+  346, 71, 348, 0, 0, 0, 0, 80, 0, 0, 
+  76, 79, 0, 0, 72, 73, 81, 74, 0, 77, 
+  0, 0, 171, 0, 0, 158, 177, 160, 159, 0, 
+  0, 0, 173, 174, 172, 176, 0, 206, 0, 0, 
+  0, 0, 196, 0, 0, 0, 0, 0, 0, 186, 
+  0, 0, 0, 180, 181, 179, 184, 188, 187, 185, 
+  183, 198, 197, 199, 0, 214, 0, 210, 0, 0, 
+  152, 139, 151, 140, 108, 109, 110, 135, 111, 136, 
+  112, 113, 114, 115, 116, 117, 118, 119, 120, 121, 
+  122, 123, 124, 137, 125, 126, 127, 128, 129, 130, 
+  131, 132, 133, 134, 138, 0, 0, 150, 246, 153, 
+  0, 154, 0, 155, 149, 0, 242, 235, 233, 240, 
+  241, 239, 238, 244, 237, 236, 234, 243, 230, 0, 
+  218, 0, 0, 222, 0, 0, 226, 0, 0, 152, 
+  144, 0, 143, 0, 148, 162, 0, 347, 337, 338, 
+  0, 335, 0, 336, 0, 339, 253, 260, 259, 267, 
+  255, 0, 256, 340, 0, 345, 257, 258, 263, 261, 
+  342, 341, 344, 264, 0, 275, 0, 0, 0, 0, 
+  346, 71, 0, 348, 72, 247, 289, 73, 0, 0, 
+  0, 276, 0, 0, 265, 266, 0, 254, 262, 290, 
+  291, 334, 343, 0, 305, 306, 307, 308, 0, 301, 
+  302, 303, 304, 331, 332, 0, 0, 0, 0, 0, 
+  294, 295, 251, 249, 211, 219, 215, 231, 207, 252, 
+  0, 158, 223, 227, 200, 189, 0, 0, 208, 0, 
+  0, 0, 0, 201, 0, 0, 0, 0, 0, 193, 
+  191, 194, 192, 190, 203, 202, 204, 0, 216, 0, 
+  212, 0, 250, 158, 0, 232, 247, 248, 0, 247, 
+  0, 0, 297, 0, 0, 0, 299, 0, 220, 0, 
+  0, 224, 0, 0, 228, 287, 0, 279, 288, 282, 
+  0, 286, 0, 247, 280, 0, 247, 0, 0, 298, 
+  0, 0, 0, 300, 347, 337, 0, 0, 339, 0, 
+  333, 0, 323, 0, 0, 0, 293, 0, 292, 0, 
+  349, 0, 107, 269, 272, 0, 108, 275, 111, 136, 
+  113, 114, 78, 118, 119, 71, 120, 123, 76, 79, 
+  72, 247, 73, 81, 126, 74, 128, 77, 130, 131, 
+  276, 133, 134, 138, 0, 100, 0, 0, 102, 106, 
+  104, 90, 103, 105, 0, 101, 89, 270, 268, 146, 
+  147, 152, 0, 145, 0, 322, 0, 309, 310, 0, 
+  321, 0, 0, 0, 312, 317, 315, 318, 0, 0, 
+  316, 317, 0, 313, 0, 314, 271, 320, 0, 271, 
+  319, 0, 324, 325, 0, 271, 326, 327, 0, 0, 
+  328, 0, 0, 0, 329, 330, 164, 163, 0, 0, 
+  0, 296, 0, 0, 0, 311, 284, 277, 0, 285, 
+  281, 0, 283, 273, 0, 274, 278, 94, 0, 0, 
+  98, 84, 0, 86, 96, 0, 87, 97, 99, 88, 
+  95, 85, 0, 91, 168, 166, 170, 167, 165, 169, 
+  2, 5, 0, 7, 6, 0, 1, 92, 69, 70, 
+  0, 0, 0, 9, 10, 0, 11, 12, 0, 13, 
+  0, 0, 14, 0, 19, 20, 93, 0, 15, 16, 
+  0, 17, 18, 8, 22, 0, 4, 0, 29, 67, 
+  0, 0, 72, 27, 73, 30, 23, 0, 0, 68, 
+  0, 44, 43, 42, 0, 0, 61, 0, 62, 0, 
+  65, 66, 0, 0, 0, 59, 0, 60, 0, 63, 
+  64, 0, 57, 45, 58, 46, 0, 0, 0, 0, 
+  48, 0, 55, 56, 47, 28, 24, 0, 0, 0, 
+  38, 39, 0, 40, 41, 271, 0, 32, 108, 275, 
+  111, 136, 113, 114, 78, 118, 119, 71, 120, 123, 
+  76, 79, 72, 247, 73, 81, 126, 74, 128, 77, 
+  130, 131, 276, 133, 134, 138, 75, 0, 25, 0, 
+  31, 26, 49, 53, 51, 0, 0, 50, 0, 54, 
+  52, 0, 34, 35, 0, 36, 37, 33, 350};
 
 const int QmlJSGrammar::goto_default [] = {
-  4, 495, 352, 190, 494, 525, 490, 493, 492, 15, 
-  524, 534, 536, 535, 614, 527, 582, 583, 185, 189, 
-  191, 188, 195, 552, 563, 562, 194, 226, 23, 468, 
-  467, 350, 349, 6, 348, 351, 101, 19, 14, 139, 
-  21, 10, 138, 16, 22, 51, 20, 5, 25, 24, 
-  263, 12, 257, 7, 253, 9, 255, 8, 254, 17, 
-  261, 18, 262, 11, 256, 252, 293, 405, 258, 259, 
-  196, 187, 186, 198, 227, 197, 202, 223, 224, 354, 
-  353, 225, 457, 456, 315, 316, 459, 318, 458, 317, 
-  413, 417, 420, 416, 415, 435, 436, 179, 193, 175, 
-  178, 192, 200, 199, 0};
+  4, 496, 353, 191, 495, 526, 491, 494, 493, 15, 
+  525, 535, 537, 536, 617, 528, 579, 186, 190, 192, 
+  196, 553, 566, 565, 624, 625, 195, 227, 23, 469, 
+  468, 351, 350, 6, 349, 352, 102, 19, 14, 140, 
+  21, 10, 139, 16, 22, 52, 20, 5, 25, 24, 
+  264, 12, 258, 7, 254, 9, 256, 8, 255, 17, 
+  262, 18, 263, 11, 257, 253, 294, 406, 259, 260, 
+  197, 188, 187, 199, 228, 198, 203, 224, 225, 189, 
+  355, 354, 226, 458, 457, 316, 317, 460, 319, 459, 
+  318, 414, 418, 421, 417, 416, 436, 437, 180, 194, 
+  176, 179, 193, 201, 200, 0};
 
 const int QmlJSGrammar::action_index [] = {
-  236, 824, 1879, -3, 176, 80, -95, 102, 36, -14, 
-  266, -95, 337, 90, -95, -95, 528, 100, 78, 344, 
-  220, -95, -95, -95, 565, 177, 824, -95, -95, -95, 
-  209, -95, 1697, 1083, 824, 824, 824, 740, 824, -95, 
-  -95, 824, 824, -95, -95, -95, -95, 824, -95, 824, 
-  824, -95, 824, 824, 136, 183, -95, -95, 824, 824, 
-  824, -95, -95, -95, 146, 824, 342, 824, 824, 690, 
-  824, 565, 824, 824, 824, 824, 824, 824, 156, 824, 
-  824, 824, 134, 124, 84, 232, 255, 261, 260, 218, 
-  487, 472, 565, 824, 49, 824, 73, 1606, 824, 824, 
+  157, 803, 2033, -22, 55, 68, -95, 96, 32, -10, 
+  282, -95, 348, 42, -95, -95, 636, 92, 75, 201, 
+  218, -95, -95, -95, 544, 253, 803, -95, -95, -95, 
+  179, -95, 1760, 1230, 803, 803, 803, -95, 719, 803, 
+  -95, -95, 803, 803, -95, -95, -95, -95, 803, -95, 
+  803, 803, -95, 803, 803, 104, 202, -95, -95, 803, 
+  803, 803, -95, -95, -95, 198, 803, 340, 803, 803, 
+  803, 803, 544, 803, 803, 803, 803, 803, 803, 206, 
+  803, 803, 803, 64, 72, 69, 253, 167, 182, 158, 
+  150, 454, 544, 544, 803, -70, 803, 96, 1669, 803, 
+  803, -95, -95, -95, -95, -95, -95, -95, -95, -95, 
   -95, -95, -95, -95, -95, -95, -95, -95, -95, -95, 
   -95, -95, -95, -95, -95, -95, -95, -95, -95, -95, 
-  -95, -95, -95, -95, -95, -95, -95, -95, -95, -95, 
-  -95, -95, -95, -95, 137, 824, -95, -95, 63, 35, 
-  -95, 824, -95, -95, 824, -95, -95, -95, -95, -95, 
-  -95, -95, -95, -95, -95, -95, -95, -95, 824, 38, 
-  824, 824, 70, 62, 824, -95, 1606, 824, 824, -95, 
-  104, -95, 37, -95, -95, 40, -95, 198, 67, 46, 
-  -95, 168, -95, 45, 1970, -95, -95, -95, -95, -95, 
-  205, -95, -95, 44, -95, -95, -95, -95, -95, -95, 
-  1970, -95, -95, 375, -95, 427, 82, 1879, 32, 243, 
-  59, 53, 2152, 74, 824, -95, 76, 58, 824, 57, 
-  -95, 65, 64, -95, -95, 300, -95, -95, -95, -95, 
-  -95, -95, 79, -95, -95, -95, -95, 77, -95, -95, 
-  -95, -95, -95, -95, 50, 68, 824, 110, 72, -95, 
-  -95, 996, -95, 60, 34, -8, -95, 421, 71, 19, 
-  582, 61, 92, 420, 287, 249, 824, 304, 824, 824, 
-  824, 824, 394, 824, 824, 824, 824, 824, 308, 279, 
-  286, 293, 294, 379, 373, 493, 824, -5, 824, 66, 
-  824, -95, 657, 824, -95, 824, 54, 30, 824, 33, 
-  1879, -95, 824, 117, 1879, -95, 824, 69, 824, 824, 
-  94, 52, 824, -95, 75, 111, 56, -95, -95, 824, 
-  -95, 278, 824, -95, 55, 824, -15, 1879, -95, 824, 
-  122, 1879, -95, -22, 305, -42, -27, 1970, -51, -95, 
-  1879, -95, 824, 113, 1879, -1, 1879, -95, 6, 3, 
-  -45, -95, -95, 1879, -32, 409, 14, 424, 107, 824, 
-  1879, 2, -34, 318, 81, -35, 740, -4, -7, -95, 
-  912, -95, 0, -12, 21, 824, 41, 20, 824, 43, 
-  824, 16, 15, 824, -95, 1788, 31, -95, -95, -95, 
-  -95, -95, -95, 824, -95, -95, -95, -95, 269, -95, 
-  824, 17, -95, 1879, -95, 86, -95, -95, 1879, -95, 
-  824, 103, 23, -95, 42, -95, 26, 112, 824, -95, 
-  28, 25, -95, -25, -95, 1879, -95, 101, 1879, -95, 
-  281, -95, -95, 109, 1879, 9, -95, -10, 11, -95, 
-  272, -17, 8, -95, -95, -95, -95, 824, 99, 1879, 
-  -95, 824, 106, 1879, -95, 22, -95, 190, -95, -95, 
-  824, -95, -95, 229, -95, -95, -95, 105, 1257, -95, 
-  -95, 1344, -95, -95, 1170, -95, -95, -95, -95, -95, 
-  -95, 97, -95, -95, -95, -95, -95, -95, -95, -95, 
-  -95, 468, -95, -39, 334, -95, -95, -95, -95, 201, 
-  359, 194, -95, -95, 88, -95, -95, 202, -95, 207, 
-  164, -95, 129, -95, -95, -95, 181, -95, -95, 91, 
-  -95, -95, -95, -95, 121, -95, 491, -95, -95, -9, 
-  225, 170, -95, 7, -95, -95, 477, 264, -95, 126, 
-  -95, -95, -95, 5, 144, -95, 824, -95, 188, -95, 
-  -95, 4, 13, 158, -95, 824, -95, 180, -95, -95, 
-  1, 133, 27, -33, 155, 127, 163, -95, -95, -95, 
-  -95, -95, 1428, -95, -95, -95, 329, -95, -95, 2061, 
-  1515, -95, 125, -95, -95, 398, 51, 384, 118, 824, 
-  1879, 18, 24, 328, 81, 29, 740, 48, 47, -95, 
-  912, -95, 39, -28, -2, 824, 12, -11, 824, 10, 
-  824, -20, -24, -13, 115, -95, 395, -95, -95, -95, 
-  -95, -95, 
+  -95, -95, -95, -95, -95, 137, 803, -95, -95, 82, 
+  61, -95, 803, -95, -95, 803, -95, -95, -95, -95, 
+  -95, -95, -95, -95, -95, -95, -95, -95, -95, 803, 
+  6, 803, 803, 43, 39, 803, -95, 1669, 803, 803, 
+  -95, 143, -95, 9, -95, -95, 29, -95, 264, 59, 
+  10, -95, 259, -95, 8, 1942, -95, -95, -95, -95, 
+  -95, 274, -95, -95, 31, -95, -95, -95, -95, -95, 
+  -95, 1942, -95, -95, 421, -95, 414, 105, 2033, 40, 
+  234, 71, 41, 2215, 66, 803, -95, 65, 28, 803, 
+  20, -95, 22, 11, -95, -95, 290, -95, -95, -95, 
+  -95, -95, -95, 119, -95, -95, -95, -95, 112, -95, 
+  -95, -95, -95, -95, -95, -17, 27, 803, 135, 117, 
+  -95, -95, 975, -95, 48, -6, 62, -95, 400, 85, 
+  63, 569, 93, 102, 472, 235, 205, 803, 400, 803, 
+  803, 803, 803, 398, 803, 803, 803, 803, 803, 253, 
+  295, 323, 241, 323, 472, 472, 355, 803, 5, 803, 
+  81, 803, -95, 636, 803, -95, 803, 76, 53, 803, 
+  57, 2033, -95, 803, 146, 2033, -95, 803, 54, 803, 
+  803, 90, 84, 803, -95, 12, 125, -24, -95, -95, 
+  803, -95, 203, 803, -95, -49, 803, -47, 2033, -95, 
+  803, 130, 2033, -95, -34, 285, -28, 0, 1942, -21, 
+  -95, 2033, -95, 803, 129, 2033, 1, 2033, -95, 17, 
+  19, -29, -95, -95, 2033, -33, 405, 21, 375, 107, 
+  803, 2033, 23, -20, 305, -1, -31, 719, 3, 4, 
+  -95, 891, -95, 7, -35, -3, 803, 33, 2, 803, 
+  13, 803, -18, -11, 803, -95, 1851, 16, -95, -95, 
+  -95, -95, -95, -95, 803, -95, -95, -95, -95, 281, 
+  -95, 803, -45, -95, 2033, -95, 70, -95, -95, 2033, 
+  -95, 803, 122, -12, -95, 14, -95, 34, 106, 803, 
+  -95, -2, 30, -95, -19, -95, 2033, -95, 103, 2033, 
+  -95, 250, -95, -95, 116, 2033, 18, -95, -5, 2, 
+  -95, 280, -60, 2, -95, -95, -95, -95, 803, 110, 
+  2033, -95, 803, 99, 2033, -95, -8, -95, 156, -95, 
+  -95, 803, -95, -95, 136, -95, -95, -95, 97, 1317, 
+  -95, -95, 1404, -95, -95, 1491, -95, -95, -95, -95, 
+  -95, -95, 98, -95, -95, -95, -95, -95, -95, -95, 
+  -95, -95, 433, -95, 51, 344, -95, -95, -95, -95, 
+  139, 366, 155, -95, -95, 73, -95, -95, 186, -95, 
+  190, 162, -95, 101, -95, -95, -95, 131, -95, -95, 
+  88, -95, -95, -95, -95, 111, -95, 495, -95, -95, 
+  47, 298, 221, -95, 60, -95, -95, 518, 306, -95, 
+  255, -95, -95, -95, 58, 292, -95, 803, -95, 246, 
+  -95, -95, 52, 56, 164, -95, 803, -95, 228, -95, 
+  -95, 151, -95, 209, -95, 95, 67, 175, 200, 210, 
+  -95, 86, -95, -95, -95, -95, -95, 1143, 303, 91, 
+  -95, -95, 347, -95, -95, 2124, 1578, -95, 397, 89, 
+  386, 80, 803, 2033, 94, 26, 308, 74, 25, 719, 
+  44, 49, -95, 891, -95, 45, 24, 37, 803, 36, 
+  15, 803, 50, 803, 38, 35, 46, 120, -95, 372, 
+  -95, -95, -14, -95, -95, 183, 238, -95, 257, -95, 
+  -95, 1059, -95, -95, 335, -95, -95, -95, -95, 
 
-  -105, 21, 23, -105, -105, -105, -105, -105, -105, -105, 
-  -105, -105, -105, -105, -105, -105, -45, -105, -105, -105, 
-  -105, -105, -105, -105, -105, -105, 82, -105, -105, -105, 
-  35, -105, -105, 31, 33, 179, 161, 176, 165, -105, 
-  -105, 183, 182, -105, -105, -105, -105, 140, -105, 143, 
-  139, -105, 159, 135, -105, -105, -105, -105, 156, 155, 
-  152, -105, -105, -105, -105, 90, -105, 126, 128, 130, 
-  160, -105, 169, 115, 87, 89, 124, 97, -105, 73, 
-  76, 39, -105, -105, -105, -105, -105, -105, -105, -105, 
-  -105, -105, -105, 168, -105, 108, -105, 80, 74, 70, 
-  -105, -105, -105, -105, -105, -105, -105, -105, -105, -105, 
-  -105, -105, -105, -105, -105, -105, -105, -105, -105, -105, 
-  -105, -105, -105, -105, -105, -105, -105, -105, -105, -105, 
-  -105, -105, -105, -105, -105, 62, -105, -105, -105, -105, 
-  -105, 55, -105, -105, 66, -105, -105, -105, -105, -105, 
-  -105, -105, -105, -105, -105, -105, -105, -105, 100, -105, 
-  148, -31, -105, -105, -33, -105, 206, 37, 103, -105, 
-  -105, -105, -105, -105, -105, -105, -105, 22, -105, -105, 
-  -105, 19, -105, -105, 28, -105, -105, -105, -105, -105, 
-  -105, -105, -105, -105, -105, -105, -105, -105, -105, -105, 
-  91, -105, -105, 64, -105, 50, -105, 41, -105, 43, 
-  -105, -105, -105, -105, 54, -105, -105, -105, 42, 67, 
-  -105, -105, -105, -105, -105, 4, -105, -105, -105, -105, 
-  -105, -105, -105, -105, -105, -105, -105, -105, -105, -105, 
-  -105, -105, -105, -105, -105, -105, 34, -105, -105, -105, 
-  -105, 107, -105, -105, -105, -105, -105, -105, -105, -105, 
-  -105, -105, -105, -105, -105, 17, 197, -105, 230, 234, 
-  242, 211, -105, 122, 116, 105, 96, 78, -105, -105, 
-  -105, -105, -105, -105, -105, -105, 188, -105, 215, -105, 
-  214, -105, -105, 203, -105, 153, -105, -105, 273, -105, 
-  5, -105, 3, -105, 12, -105, 217, -105, 223, 190, 
-  -105, -105, 187, -105, -105, -105, -105, -105, -105, 238, 
-  -105, 129, 186, -105, -105, 189, -105, 52, -105, 53, 
-  -105, 56, -105, -105, 137, -105, -105, 98, -105, -105, 
-  40, -105, 45, -105, 44, -105, 59, -105, -105, -105, 
-  -105, -105, -105, 61, -105, 57, -105, 60, -105, 109, 
-  68, -105, -105, 46, -105, -105, 150, -105, -105, -105, 
-  29, -105, -105, -105, -105, 0, -105, 32, 86, -105, 
-  123, -105, -105, -6, -105, -26, -105, -105, -105, -105, 
-  -105, -105, -105, -24, -105, -105, -105, -105, -105, -105, 
-  95, -105, -105, 16, -105, -105, -105, -105, 2, -105, 
-  8, -105, -105, -105, -105, -105, -19, -105, 75, -105, 
-  -38, -105, -105, -105, -105, -17, -105, -105, -30, -105, 
-  -105, -105, -105, -105, -105, -58, -105, -105, 58, -105, 
-  51, -105, 49, -105, -105, -105, -105, 171, -105, 72, 
-  -105, 65, -105, 63, -105, -105, -105, -105, -105, -105, 
-  38, -105, -105, 184, -105, -105, -105, -105, 47, -105, 
-  -105, 147, -105, -105, 48, -105, -105, -105, -105, -105, 
-  -105, -105, -105, -105, -105, -105, -105, -105, -105, -105, 
-  -105, 88, -105, 71, 85, -105, -105, -105, -105, -105, 
-  -105, 1, -105, -105, -105, -105, -105, -4, -105, 6, 
-  -105, -105, -105, -105, -105, -105, 7, -105, -105, -105, 
-  -105, -105, -105, -105, -105, -105, 369, -105, -105, -105, 
-  10, -105, -105, -105, -105, -105, 278, -105, -105, -22, 
-  -105, -105, -105, -105, -105, -105, 69, -105, -105, -105, 
-  -105, -105, -105, -105, -105, 9, -105, -105, -105, -105, 
-  -105, 24, -105, -105, 11, 18, 25, -105, -105, -105, 
-  -105, -105, 290, -105, -105, -105, 36, -105, -105, -105, 
-  210, -105, -105, -105, -105, 30, -105, 26, -105, 79, 
-  27, -105, -105, 13, -105, -105, 77, -105, -105, -105, 
-  20, -105, -105, -105, -105, 14, -105, 15, 117, -105, 
-  104, -105, -105, -105, -105, -105, 81, -105, -105, -105, 
-  -105, -105};
+  -106, 3, 1, -106, -106, -106, -106, -106, -106, -106, 
+  -106, -106, -106, -106, -106, -106, -54, -106, -106, -106, 
+  -106, -106, -106, -106, -106, -106, 72, -106, -106, -106, 
+  4, -106, -106, -16, 18, 100, 170, -106, 174, 167, 
+  -106, -106, 164, 182, -106, -106, -106, -106, 127, -106, 
+  126, 117, -106, 113, 131, -106, -106, -106, -106, 146, 
+  135, 143, -106, -106, -106, -106, 139, -106, 159, 173, 
+  109, 83, -106, 136, 149, 150, 156, 133, 120, -106, 
+  158, 176, 177, -106, -106, -106, -106, -106, -106, -106, 
+  -106, -106, -106, -106, 91, -106, 101, -106, 94, -2, 
+  -29, -106, -106, -106, -106, -106, -106, -106, -106, -106, 
+  -106, -106, -106, -106, -106, -106, -106, -106, -106, -106, 
+  -106, -106, -106, -106, -106, -106, -106, -106, -106, -106, 
+  -106, -106, -106, -106, -106, -106, 33, -106, -106, -106, 
+  -106, -106, 14, -106, -106, 19, -106, -106, -106, -106, 
+  -106, -106, -106, -106, -106, -106, -106, -106, -106, 85, 
+  -106, 63, 49, -106, -106, 53, -106, 311, 60, 118, 
+  -106, -106, -106, -106, -106, -106, -106, -106, 51, -106, 
+  -106, -106, -4, -106, -106, 59, -106, -106, -106, -106, 
+  -106, -106, -106, -106, -106, -106, -106, -106, -106, -106, 
+  -106, 122, -106, -106, 30, -106, 44, -106, 41, -106, 
+  27, -106, -106, -106, -106, 84, -106, -106, -106, 71, 
+  58, -106, -106, -106, -106, -106, 64, -106, -106, -106, 
+  -106, -106, -106, -106, -106, -106, -106, -106, -106, -106, 
+  -106, -106, -106, -106, -106, -106, -106, 13, -106, -106, 
+  -106, -106, 65, -106, -106, -106, -106, -106, -106, -106, 
+  -106, -106, -106, -106, -106, -106, -1, 197, -106, 188, 
+  187, 221, 229, -106, 90, 87, 93, 105, 107, -106, 
+  -106, -106, -106, -106, -106, -106, -106, 230, -106, 207, 
+  -106, 219, -106, -106, 205, -106, 180, -106, -106, 106, 
+  -106, 28, -106, 31, -106, 26, -106, 185, -106, 198, 
+  186, -106, -106, 217, -106, -106, -106, -106, -106, -106, 
+  220, -106, 81, 97, -106, -106, 172, -106, 76, -106, 
+  78, -106, 69, -106, -106, 89, -106, -106, 86, -106, 
+  -106, 75, -106, 80, -106, 70, -106, 82, -106, -106, 
+  -106, -106, -106, -106, 42, -106, 39, -106, 40, -106, 
+  214, 48, -106, -106, 37, -106, -106, 163, -106, -106, 
+  -106, 52, -106, -106, -106, -106, 61, -106, 50, 151, 
+  -106, 67, -106, -106, 43, -106, 45, -106, -106, -106, 
+  -106, -106, -106, -106, 47, -106, -106, -106, -106, -106, 
+  -106, 98, -106, -106, 57, -106, -106, -106, -106, 54, 
+  -106, 55, -106, -106, -106, -106, -106, -38, -106, 66, 
+  -106, -24, -106, -106, -106, -106, -15, -106, -106, -18, 
+  -106, -106, -106, -106, -106, -106, -46, -106, -106, 24, 
+  -106, 36, -106, 25, -106, -106, -106, -106, 35, -106, 
+  68, -106, 34, -106, 38, -106, -106, -106, -106, -106, 
+  -106, 21, -106, -106, 111, -106, -106, -106, -106, 62, 
+  -106, -106, 132, -106, -106, 56, -106, -106, -106, -106, 
+  -106, -106, -106, -106, -106, -106, -106, -106, -106, -106, 
+  -106, -106, 92, -106, 77, 96, -106, -106, -106, -106, 
+  -106, -106, -9, -106, -106, -106, -106, -106, 0, -106, 
+  -7, -106, -106, -106, -106, -106, -106, 22, -106, -106, 
+  -106, -106, -106, -106, -106, -106, -106, 265, -106, -106, 
+  -106, 16, -106, -106, -106, -106, -106, 280, -106, -106, 
+  -11, -106, -106, -106, -106, -106, -106, 23, -106, -106, 
+  -106, -106, -106, -106, -106, -106, 29, -106, -106, -106, 
+  -106, -106, -106, 12, -106, -106, -106, 11, 8, 5, 
+  -106, -106, -106, -106, -106, -106, -106, 277, 2, -106, 
+  -106, -106, 7, -106, -106, -106, 233, -106, 9, -106, 
+  15, -106, 73, 17, -106, -106, 6, -106, -106, 74, 
+  -106, -106, -106, 32, -106, -106, -106, -106, 20, -106, 
+  10, 151, -106, 104, -106, -106, -106, -106, -106, 112, 
+  -106, -106, -106, -106, -106, -106, 88, -106, 95, -106, 
+  -106, 284, -106, -106, -8, -106, -106, -106, -106};
 
 const int QmlJSGrammar::action_info [] = {
-  -97, 342, 251, -115, 339, -118, 337, -96, 410, -107, 
-  395, 385, 451, 383, 334, 346, 447, -123, 336, -120, 
-  -83, -126, 434, 397, 410, -107, 440, 568, -118, 438, 
-  424, 418, 425, 418, 544, 565, 560, 561, 393, 460, 
-  334, 434, 553, 442, 434, 327, -96, 418, -120, 491, 
-  -123, 451, 447, 434, -97, -115, 414, 539, -126, 312, 
-  251, 266, 135, 306, 95, 342, 340, 266, 251, 164, 
-  288, 141, 158, 288, 65, 181, 177, 402, 184, 290, 
-  295, 403, 286, 408, 93, 491, 93, 329, -93, 342, 
-  434, 298, 319, 300, 410, 143, 306, 173, 135, 230, 
-  451, 447, 158, 65, 246, 135, 183, 135, 428, 135, 
-  0, 135, 135, 471, 135, 437, 325, 286, 135, 321, 
-  52, 135, 421, 616, 52, 135, 245, 95, 160, 438, 
-  135, 53, 161, 250, 249, 53, 509, 0, 241, 240, 
-  236, 235, 308, 243, 242, 135, 309, 407, 406, 506, 
-  505, 546, 521, 520, 526, 540, 540, 482, 58, 449, 
-  171, 472, 540, 412, 52, 555, 453, 422, 243, 242, 
-  248, 617, 322, 344, 52, 53, 621, 304, 56, 243, 
-  242, 79, 331, 80, 31, 53, 620, 619, 135, 57, 
-  514, 513, 31, 136, 81, 58, 135, 31, 463, 540, 
-  542, 542, 79, 59, 80, 547, 545, 542, 0, 60, 
-  31, 541, 541, 135, 0, 81, 0, 0, 541, 556, 
-  554, 43, 44, 31, 0, 518, 517, 31, 0, 43, 
-  44, 31, 58, 0, 43, 44, 31, 0, 31, 0, 
-  59, 559, 558, 79, 542, 80, 60, 43, 44, 550, 
-  549, 464, 462, 516, 31, 541, 81, 79, 31, 80, 
-  43, 44, 503, 502, 43, 44, 229, 228, 43, 44, 
-  81, 572, 31, 43, 44, 43, 44, 59, 31, 509, 
-  79, 97, 80, 60, 166, 79, 79, 80, 80, 135, 
-  501, 43, 44, 81, 0, 43, 44, 526, 81, 81, 
-  98, 31, 99, 167, 79, 400, 80, 31, 0, 43, 
-  44, 79, 79, 80, 80, 43, 44, 81, 79, 79, 
-  80, 80, 268, 269, 81, 81, 3, 2, 1, 31, 
-  0, 81, 81, 79, 31, 80, 0, 135, 43, 44, 
-  0, 0, 432, 431, 43, 44, 81, 31, 0, 270, 
-  271, 0, 0, 0, -337, 67, 68, 31, 0, 166, 
-  67, 68, 526, 31, -337, 0, 43, 44, 0, 0, 
-  0, 43, 44, 0, 509, 0, 0, 0, 167, 0, 
-  168, 0, 69, 70, 43, 44, 0, 69, 70, 0, 
-  229, 228, 0, 498, 43, 44, 273, 274, 0, 0, 
-  43, 44, 273, 274, 31, 275, 510, 0, 276, 0, 
-  277, 275, 0, 31, 276, 0, 277, 273, 274, 497, 
-  511, 508, 0, 0, 31, 0, 275, 31, 0, 276, 
-  0, 277, 0, 0, 0, 0, 234, 233, 31, 268, 
-  269, 43, 44, 273, 274, 239, 238, 0, 507, 0, 
-  43, 44, 275, 31, 498, 276, 31, 277, 0, 234, 
-  233, 43, 44, 0, 43, 44, 270, 271, 0, 0, 
-  234, 233, 0, 0, 0, 43, 44, 0, 0, 0, 
-  497, 0, 0, 0, 0, 239, 238, 529, 239, 238, 
-  43, 44, 0, 43, 44, 72, 73, 31, 0, 530, 
-  0, 529, 0, 74, 75, 0, 31, 76, 0, 77, 
-  72, 73, 0, 530, 0, 0, 273, 274, 74, 75, 
-  31, 0, 76, 0, 77, 275, 0, 498, 276, 0, 
-  277, 145, 570, 499, 43, 44, 498, 0, 0, 0, 
-  0, 146, 0, 531, 533, 147, 532, 0, 0, 0, 
-  498, 220, 0, 497, 148, 0, 149, 531, 533, 0, 
-  204, 0, 497, 0, 0, 220, 0, 150, 0, 151, 
-  56, 0, 0, 0, 204, 0, 497, 152, 0, 0, 
-  153, 57, 0, 0, 0, 145, 154, 0, 72, 73, 
-  0, 0, 155, 0, 0, 146, 74, 75, 0, 147, 
-  76, 0, 77, 0, 0, 0, 0, 156, 148, 0, 
-  149, 0, 0, 302, 0, 0, 0, 0, 0, 0, 
-  0, 150, 0, 151, 56, 0, 0, 0, 0, 0, 
-  0, 152, 0, 0, 153, 57, 0, 0, 0, 0, 
-  154, 0, 0, 0, 0, 0, 155, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-  145, 156, 0, 0, 0, 0, 0, 0, 0, 0, 
-  146, 0, 0, 0, 147, 0, 0, 0, 0, 0, 
-  0, 0, 0, 148, 0, 149, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 150, 0, 151, 56, 
-  0, 26, 27, 28, 0, 0, 152, 0, 0, 153, 
-  57, 0, 30, 0, 0, 154, 0, 0, 0, 31, 
-  0, 155, 0, 32, 33, 0, 34, 0, 0, 0, 
-  35, 0, 36, 37, 38, 0, 156, 40, 0, 0, 
-  0, 41, 0, 42, 0, 0, 0, 0, 0, 0, 
-  0, 0, 27, 28, 0, 45, 43, 44, 0, 46, 
-  0, 47, 30, 49, 0, 50, 0, 0, 0, 31, 
-  39, 48, 29, 32, 33, 0, 34, 0, 0, 0, 
-  0, 0, 0, 37, 0, 0, 0, 40, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 45, 43, 44, 0, 46, 
+  443, 411, 335, 419, -127, 343, -102, 330, 96, 461, 
+  -124, -106, 326, 328, -105, 403, 252, 347, 448, 419, 
+  -132, 415, 398, 394, 384, 452, 396, 386, -135, 320, 
+  -116, 441, 337, 338, 340, 435, 425, 426, 439, 419, 
+  -129, 185, 287, -129, -127, 159, 165, 452, 435, 267, 
+  136, -124, -105, 435, 94, 638, -106, -132, 448, 246, 
+  411, 343, 252, 247, 411, 178, 492, 182, 96, 174, 
+  184, 452, 409, 404, 448, 626, 252, 343, 341, -92, 
+  94, -102, 267, 289, 136, 554, 231, 545, 335, 561, 
+  142, 313, 307, 291, 159, 307, -135, 66, 631, 0, 
+  0, -116, 287, 568, 53, 472, 136, 136, 53, 53, 
+  429, 136, 53, 540, 299, 54, 422, 301, 136, 54, 
+  54, 144, 438, 54, 296, 161, 510, 571, 619, 162, 
+  136, 408, 407, 322, 507, 506, 439, 136, 136, 492, 
+  289, 244, 243, 136, 527, 136, 57, 573, 572, 522, 
+  521, 136, 309, 473, 136, 0, 310, 58, 483, 454, 
+  31, 423, 515, 514, 464, 31, 244, 243, 244, 243, 
+  450, 556, 0, 242, 241, 80, 620, 81, 251, 250, 
+  237, 236, 413, 80, 31, 81, 323, 563, 82, 345, 
+  332, 628, 80, 137, 81, 249, 82, 44, 45, 172, 
+  504, 503, 44, 45, 31, 82, 305, 80, 31, 81, 
+  59, 0, 564, 562, 59, 31, 167, 465, 463, 31, 
+  82, 44, 45, 519, 518, 557, 555, 0, 502, 541, 
+  59, 80, 31, 81, 31, 168, 136, 169, 541, 31, 
+  0, 44, 45, 629, 82, 44, 45, 3, 2, 1, 
+  541, 517, 44, 45, 136, 60, 44, 45, 136, 60, 
+  80, 61, 81, 31, 0, 61, 80, 31, 81, 44, 
+  45, 44, 45, 82, 543, 60, 44, 45, 80, 82, 
+  81, 61, 136, 543, 541, 542, 31, 0, 31, 560, 
+  559, 82, 0, 31, 542, 543, 167, 98, 0, 547, 
+  44, 45, 0, 0, 44, 45, 542, 551, 550, 31, 
+  0, 433, 432, 577, 31, 168, 99, 401, 100, 31, 
+  80, 510, 81, 44, 45, 44, 45, 31, 0, 543, 
+  44, 45, 31, 82, 31, 230, 229, 31, 0, 527, 
+  542, -346, 578, 136, -346, 0, 44, 45, 80, 0, 
+  81, 44, 45, 548, 546, 136, 44, 45, 68, 69, 
+  0, 82, 0, 623, 44, 45, 68, 69, 527, 44, 
+  45, 44, 45, 31, 44, 45, 0, 0, 274, 275, 
+  527, 510, 0, 0, 0, 70, 71, 276, 0, 0, 
+  277, 0, 278, 70, 71, 0, 230, 229, 0, 0, 
+  0, 31, 0, 499, 31, 0, 0, 0, 230, 229, 
+  44, 45, 0, 511, 0, 31, 0, 0, 269, 270, 
+  0, 274, 275, 0, 0, 0, 31, 512, 509, 498, 
+  276, 499, 0, 277, 31, 278, 240, 239, 44, 45, 
+  0, 44, 45, 31, 0, 271, 272, 240, 239, 0, 
+  31, 0, 44, 45, 0, 508, 0, 498, 235, 234, 
+  0, 0, 31, 44, 45, 0, 235, 234, 0, 0, 
+  0, 44, 45, 0, 0, 240, 239, 73, 74, 0, 
+  44, 45, 235, 234, 0, 75, 76, 44, 45, 77, 
+  0, 78, 499, 0, 0, 274, 275, 0, 500, 44, 
+  45, 0, 0, 0, 276, 530, 0, 277, 0, 278, 
+  0, 0, 0, 0, 0, 0, 0, 531, 498, 0, 
+  0, 0, 0, 0, 31, 0, 0, 0, 530, 0, 
   0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-  39, 48, 29, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 26, 27, 28, 0, 0, 
-  0, 0, 0, 0, 0, 0, 30, 0, 0, 0, 
-  0, 0, 0, 31, 0, 0, 0, 32, 33, 0, 
-  34, 0, 0, 0, 35, 0, 36, 37, 38, 0, 
-  0, 40, 0, 0, 0, 41, 0, 42, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 0, 45, 
-  43, 44, 0, 46, 0, 47, 0, 49, 0, 50, 
-  0, 0, 0, 0, 39, 48, 29, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 0, -116, 
-  0, 0, 0, 26, 27, 28, 0, 0, 0, 0, 
-  0, 0, 0, 0, 30, 0, 0, 0, 0, 0, 
-  0, 31, 0, 0, 0, 32, 33, 0, 34, 0, 
-  0, 0, 35, 0, 36, 37, 38, 0, 0, 40, 
-  0, 0, 0, 41, 0, 42, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 45, 43, 44, 
-  0, 46, 0, 47, 0, 49, 0, 50, 0, 0, 
-  0, 0, 39, 48, 29, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 26, 27, 28, 
-  0, 0, 0, 0, 0, 0, 0, 0, 30, 0, 
-  0, 0, 0, 0, 0, 31, 0, 0, 0, 32, 
-  33, 0, 34, 0, 0, 0, 35, 0, 36, 37, 
-  38, 0, 0, 40, 0, 0, 0, 41, 0, 42, 
+  531, 0, 0, 0, 0, 0, 0, 31, 0, 0, 
+  533, 0, 0, 0, 499, 0, 0, 0, 0, 0, 
+  0, 532, 534, 0, 0, 0, 0, 73, 74, 221, 
+  0, 0, 146, 575, 0, 75, 76, 499, 205, 77, 
+  498, 78, 147, 0, 532, 534, 148, 0, 0, 0, 
+  0, 0, 221, 0, 0, 149, 0, 150, 0, 0, 
+  303, 205, 0, 498, 0, 0, 0, 0, 151, 0, 
+  152, 57, 0, 0, 0, 0, 0, 0, 153, 0, 
+  0, 154, 58, 0, 0, 0, 0, 155, 0, 0, 
+  0, 0, 0, 156, 0, 0, 0, 0, 0, 146, 
+  0, 0, 0, 0, 0, 0, 0, 0, 157, 147, 
+  0, 0, 0, 148, 0, 0, 0, 0, 0, 0, 
+  0, 0, 149, 0, 150, 0, 0, 0, 0, 0, 
+  0, 0, 0, 0, 0, 151, 0, 152, 57, 0, 
+  0, 0, 0, 0, 0, 153, 0, 0, 154, 58, 
+  0, 0, 0, 0, 155, 0, 0, 0, 0, 0, 
+  156, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
+  0, 0, 0, 0, 0, 157, 0, 0, 0, 0, 
   0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 45, 43, 44, 0, 46, 0, 47, 0, 49, 
-  265, 50, 0, 0, 0, 0, 39, 48, 29, 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, 469, 0, 0, 26, 27, 28, 0, 0, 0, 
+  0, 0, 0, 0, 46, 44, 45, 0, 47, 0, 
+  0, 0, 0, 0, 0, 0, 0, 0, 0, 40, 
+  49, 29, 0, 0, 0, 37, 0, 0, 0, 0, 
+  0, 0, 0, 0, 26, 27, 28, 0, 0, 0, 
   0, 0, 0, 0, 0, 30, 0, 0, 0, 0, 
   0, 0, 31, 0, 0, 0, 32, 33, 0, 34, 
-  0, 0, 0, 35, 0, 36, 37, 38, 0, 0, 
-  40, 0, 0, 0, 41, 0, 42, 0, 0, 470, 
-  0, 0, 0, 0, 0, 0, 0, 0, 45, 43, 
-  44, 0, 46, 0, 47, 0, 49, 0, 50, 0, 
-  0, 0, 0, 39, 48, 29, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 477, 0, 
+  0, 0, 0, 35, 0, 36, 38, 39, 0, 0, 
+  41, 0, 0, 0, 42, 0, 43, 0, 0, 0, 
+  0, 0, 0, 0, 0, 0, 0, 0, 46, 44, 
+  45, 0, 47, 0, 48, 0, 50, 0, 51, 0, 
+  0, 0, 0, 40, 49, 29, 0, 0, 0, 37, 
+  0, 0, 0, 0, 0, 0, 0, 0, -125, 0, 
+  0, 0, 26, 27, 28, 0, 0, 0, 0, 0, 
+  0, 0, 0, 30, 0, 0, 0, 0, 0, 0, 
+  31, 0, 0, 0, 32, 33, 0, 34, 0, 0, 
+  0, 35, 0, 36, 38, 39, 0, 0, 41, 0, 
+  0, 0, 42, 0, 43, 0, 0, 0, 0, 0, 
+  0, 0, 0, 0, 0, 0, 46, 44, 45, 0, 
+  47, 0, 48, 0, 50, 0, 51, 0, 0, 0, 
+  0, 40, 49, 29, 0, 0, 0, 37, 0, 0, 
+  0, 0, 0, 0, 0, 0, 26, 27, 28, 0, 
+  0, 0, 0, 0, 0, 0, 0, 30, 0, 0, 
+  0, 0, 0, 0, 31, 0, 0, 0, 32, 33, 
+  0, 34, 0, 0, 0, 35, 0, 36, 38, 39, 
+  0, 0, 41, 0, 0, 0, 42, 0, 43, 0, 
+  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
+  46, 44, 45, 0, 47, 0, 48, 0, 50, 266, 
+  51, 0, 0, 0, 0, 40, 49, 29, 0, 0, 
+  0, 37, 0, 0, 0, 0, 0, 0, 0, 0, 
+  26, 27, 28, 0, 0, 0, 0, 0, 0, 0, 
+  0, 30, 0, 0, 0, 0, 0, 0, 31, 212, 
+  0, 0, 585, 33, 0, 34, 0, 0, 0, 35, 
+  0, 36, 38, 39, 0, 0, 41, 0, 0, 0, 
+  42, 0, 43, 0, 0, 0, 0, 0, 0, 0, 
+  216, 0, 0, 0, 46, 44, 45, 0, 47, 0, 
+  48, 0, 50, 0, 51, 0, 0, 0, 0, 40, 
+  49, 29, 0, 0, 0, 37, 0, 0, 0, 0, 
+  0, 0, 0, 0, 26, 27, 28, 0, 0, 0, 
+  0, 0, 0, 0, 0, 30, 0, 0, 0, 0, 
+  0, 0, 31, 212, 0, 0, 585, 586, 0, 34, 
+  0, 0, 0, 35, 0, 36, 38, 39, 0, 0, 
+  41, 0, 0, 0, 42, 0, 43, 0, 0, 0, 
+  0, 0, 0, 0, 216, 0, 0, 0, 46, 44, 
+  45, 0, 47, 0, 48, 0, 50, 0, 51, 0, 
+  0, 0, 0, 40, 49, 29, 0, 0, 0, 37, 
+  0, 0, 0, 0, 0, 0, 0, 0, 470, 0, 
   0, 26, 27, 28, 0, 0, 0, 0, 0, 0, 
   0, 0, 30, 0, 0, 0, 0, 0, 0, 31, 
   0, 0, 0, 32, 33, 0, 34, 0, 0, 0, 
-  35, 0, 36, 37, 38, 0, 0, 40, 0, 0, 
-  0, 41, 0, 42, 0, 0, 478, 0, 0, 0, 
-  0, 0, 0, 0, 0, 45, 43, 44, 0, 46, 
-  0, 47, 0, 49, 0, 50, 0, 0, 0, 0, 
-  39, 48, 29, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 477, 0, 0, 26, 27, 
+  35, 0, 36, 38, 39, 0, 0, 41, 0, 0, 
+  0, 42, 0, 43, 0, 0, 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, 478, 0, 0, 26, 27, 
   28, 0, 0, 0, 0, 0, 0, 0, 0, 30, 
   0, 0, 0, 0, 0, 0, 31, 0, 0, 0, 
   32, 33, 0, 34, 0, 0, 0, 35, 0, 36, 
-  37, 38, 0, 0, 40, 0, 0, 0, 41, 0, 
-  42, 0, 0, 480, 0, 0, 0, 0, 0, 0, 
-  0, 0, 45, 43, 44, 0, 46, 0, 47, 0, 
-  49, 0, 50, 0, 0, 0, 0, 39, 48, 29, 
-  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 469, 0, 0, 26, 27, 28, 0, 0, 
+  38, 39, 0, 0, 41, 0, 0, 0, 42, 0, 
+  43, 0, 0, 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, 470, 0, 0, 26, 27, 28, 0, 0, 
   0, 0, 0, 0, 0, 0, 30, 0, 0, 0, 
   0, 0, 0, 31, 0, 0, 0, 32, 33, 0, 
-  34, 0, 0, 0, 35, 0, 36, 37, 38, 0, 
-  0, 40, 0, 0, 0, 41, 0, 42, 0, 0, 
-  475, 0, 0, 0, 0, 0, 0, 0, 0, 45, 
-  43, 44, 0, 46, 0, 47, 0, 49, 0, 50, 
-  0, 0, 0, 0, 39, 48, 29, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 0, 26, 
+  34, 0, 0, 0, 35, 0, 36, 38, 39, 0, 
+  0, 41, 0, 0, 0, 42, 0, 43, 0, 0, 
+  476, 0, 0, 0, 0, 0, 0, 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, 470, 0, 0, 26, 
   27, 28, 0, 0, 0, 0, 0, 0, 0, 0, 
-  30, 0, 0, 0, 0, 0, 0, 31, 211, 0, 
-  0, 579, 580, 0, 34, 0, 0, 0, 35, 0, 
-  36, 37, 38, 0, 0, 40, 0, 0, 0, 41, 
-  0, 42, 0, 0, 0, 0, 0, 0, 0, 215, 
-  0, 0, 0, 45, 43, 44, 0, 46, 0, 47, 
-  0, 49, 0, 50, 0, 0, 0, 0, 39, 48, 
-  29, 0, 206, 0, 581, 0, 0, 0, 0, 0, 
-  0, 0, 0, 469, 0, 0, 26, 27, 28, 0, 
-  0, 0, 0, 0, 0, 0, 0, 30, 0, 0, 
-  0, 0, 0, 0, 31, 0, 0, 0, 32, 33, 
-  0, 34, 0, 0, 0, 35, 0, 36, 37, 38, 
-  0, 0, 40, 0, 0, 0, 41, 0, 42, 0, 
-  0, 470, 0, 0, 498, 0, 0, 0, 0, 0, 
-  45, 43, 44, 0, 46, 0, 47, 0, 49, 0, 
-  50, 0, 0, 0, 0, 39, 48, 29, 0, 0, 
-  497, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-  103, 104, 105, 0, 0, 107, 109, 110, 0, 0, 
-  111, 0, 112, 0, 0, 0, 114, 115, 116, 0, 
-  0, 0, 0, 0, 0, 31, 117, 118, 119, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 0, 120, 
-  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 123, 0, 0, 0, 0, 
-  0, 0, 43, 44, 124, 125, 126, 0, 128, 129, 
-  130, 131, 132, 133, 0, 0, 121, 127, 113, 106, 
-  108, 122, 0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 103, 104, 105, 0, 0, 107, 109, 110, 0, 
-  0, 111, 0, 112, 0, 0, 0, 114, 115, 116, 
-  0, 0, 0, 0, 0, 0, 387, 117, 118, 119, 
-  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-  120, 0, 0, 0, 388, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 123, 0, 0, 0, 
-  0, 0, 392, 389, 391, 124, 125, 126, 0, 128, 
-  129, 130, 131, 132, 133, 0, 0, 121, 127, 113, 
-  106, 108, 122, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 103, 104, 105, 0, 0, 107, 109, 110, 
-  0, 0, 111, 0, 112, 0, 0, 0, 114, 115, 
-  116, 0, 0, 0, 0, 0, 0, 387, 117, 118, 
-  119, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 120, 0, 0, 0, 388, 0, 0, 0, 0, 
-  0, 0, 0, 390, 0, 0, 0, 123, 0, 0, 
-  0, 0, 0, 392, 389, 391, 124, 125, 126, 0, 
-  128, 129, 130, 131, 132, 133, 0, 0, 121, 127, 
-  113, 106, 108, 122, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 203, 0, 0, 0, 0, 205, 0, 
-  26, 27, 28, 207, 0, 0, 0, 0, 0, 0, 
-  208, 30, 0, 0, 0, 0, 0, 0, 210, 211, 
-  0, 0, 212, 33, 0, 34, 0, 0, 0, 35, 
-  0, 36, 37, 38, 0, 0, 40, 0, 0, 0, 
-  41, 0, 42, 0, 0, 0, 0, 0, 214, 0, 
-  215, 0, 0, 0, 45, 213, 216, 217, 46, 218, 
-  47, 219, 49, 220, 50, 221, 222, 0, 0, 39, 
-  48, 29, 204, 206, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 203, 0, 0, 0, 0, 205, 
-  0, 26, 27, 28, 207, 0, 0, 0, 0, 0, 
-  0, 208, 209, 0, 0, 0, 0, 0, 0, 210, 
-  211, 0, 0, 212, 33, 0, 34, 0, 0, 0, 
-  35, 0, 36, 37, 38, 0, 0, 40, 0, 0, 
-  0, 41, 0, 42, 0, 0, 0, 0, 0, 214, 
-  0, 215, 0, 0, 0, 45, 213, 216, 217, 46, 
-  218, 47, 219, 49, 220, 50, 221, 222, 0, 0, 
-  39, 48, 29, 204, 206, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 585, 104, 105, 0, 0, 
-  587, 109, 589, 27, 28, 590, 0, 112, 0, 0, 
-  0, 114, 592, 593, 0, 0, 0, 0, 0, 0, 
-  594, 595, 118, 119, 212, 33, 0, 34, 0, 0, 
-  0, 35, 0, 36, 596, 38, 0, 0, 598, 0, 
-  0, 0, 41, 0, 42, 0, 0, 0, 0, 0, 
-  600, 0, 215, 0, 0, 0, 602, 599, 601, 603, 
-  604, 605, 47, 607, 608, 609, 610, 611, 612, 0, 
-  0, 597, 606, 591, 586, 588, 122, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 355, 104, 105, 0, 
-  0, 357, 109, 359, 27, 28, 360, 0, 112, 0, 
-  0, 0, 114, 362, 363, 0, 0, 0, 0, 0, 
-  0, 364, 365, 118, 119, 212, 33, 0, 34, 0, 
-  0, 0, 35, 0, 36, 366, 38, 0, 0, 368, 
-  0, 0, 0, 41, 0, 42, 0, -262, 0, 0, 
-  0, 370, 0, 215, 0, 0, 0, 372, 369, 371, 
-  373, 374, 375, 47, 377, 378, 379, 380, 381, 382, 
-  0, 0, 367, 376, 361, 356, 358, 122, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 
+  30, 0, 0, 0, 0, 0, 0, 31, 0, 0, 
+  0, 32, 33, 0, 34, 0, 0, 0, 35, 0, 
+  36, 38, 39, 0, 0, 41, 0, 0, 0, 42, 
+  0, 43, 0, 0, 471, 0, 0, 499, 0, 0, 
+  0, 0, 0, 46, 44, 45, 0, 47, 0, 48, 
+  0, 50, 0, 51, 0, 0, 0, 0, 40, 49, 
+  29, 0, 0, 498, 37, 0, 0, 0, 0, 0, 
+  0, 0, 0, 104, 105, 106, 0, 0, 108, 110, 
+  111, 0, 0, 112, 0, 113, 0, 0, 0, 115, 
+  116, 117, 0, 0, 0, 0, 0, 0, 31, 118, 
+  119, 120, 0, 0, 0, 0, 0, 0, 0, 0, 
+  0, 0, 121, 0, 0, 0, 0, 0, 0, 0, 
+  0, 0, 0, 0, 0, 0, 0, 0, 124, 0, 
+  0, 0, 0, 0, 0, 44, 45, 125, 126, 127, 
+  0, 129, 130, 131, 132, 133, 134, 0, 0, 122, 
+  128, 114, 107, 109, 123, 0, 0, 0, 0, 0, 
+  0, 0, 0, 0, 104, 105, 106, 0, 0, 108, 
+  110, 111, 0, 0, 112, 0, 113, 0, 0, 0, 
+  115, 116, 117, 0, 0, 0, 0, 0, 0, 388, 
+  118, 119, 120, 0, 0, 0, 0, 0, 0, 0, 
+  0, 0, 0, 121, 0, 0, 0, 389, 0, 0, 
+  0, 0, 0, 0, 0, 0, 0, 0, 0, 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, 210, 0, 0, 0, 0, 0, 
+  0, 211, 212, 0, 0, 213, 33, 0, 34, 0, 
+  0, 0, 35, 0, 36, 38, 39, 0, 0, 41, 
+  0, 0, 0, 42, 0, 43, 0, 0, 0, 0, 
+  0, 215, 0, 216, 0, 0, 0, 46, 214, 217, 
+  218, 47, 219, 48, 220, 50, 221, 51, 222, 223, 
+  0, 0, 40, 49, 29, 205, 207, 0, 37, 0, 
+  0, 0, 0, 0, 0, 0, 0, 204, 0, 0, 
+  0, 0, 206, 0, 26, 27, 28, 208, 0, 0, 
+  0, 0, 0, 0, 209, 30, 0, 0, 0, 0, 
+  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, 588, 105, 
+  106, 0, 0, 590, 110, 592, 27, 28, 593, 0, 
+  113, 0, 0, 0, 115, 595, 596, 0, 0, 0, 
+  0, 0, 0, 597, 598, 119, 120, 213, 33, 0, 
+  34, 0, 0, 0, 35, 0, 36, 599, 39, 0, 
+  0, 601, 0, 0, 0, 42, 0, 43, 0, 0, 
+  0, 0, 0, 603, 0, 216, 0, 0, 0, 605, 
+  602, 604, 606, 607, 608, 48, 610, 611, 612, 613, 
+  614, 615, 0, 0, 600, 609, 594, 589, 591, 123, 
+  37, 0, 0, 0, 0, 0, 0, 0, 0, 356, 
+  105, 106, 0, 0, 358, 110, 360, 27, 28, 361, 
+  0, 113, 0, 0, 0, 115, 363, 364, 0, 0, 
+  0, 0, 0, 0, 365, 366, 119, 120, 213, 33, 
+  0, 34, 0, 0, 0, 35, 0, 36, 367, 39, 
+  0, 0, 369, 0, 0, 0, 42, 0, 43, 0, 
+  -271, 0, 0, 0, 371, 0, 216, 0, 0, 0, 
+  373, 370, 372, 374, 375, 376, 48, 378, 379, 380, 
+  381, 382, 383, 0, 0, 368, 377, 362, 357, 359, 
+  123, 37, 0, 0, 0, 0, 0, 0, 0, 0, 
 
-  165, 543, 163, 430, 409, 512, 303, 301, 386, 394, 
-  504, 411, 557, 455, 305, 515, 519, 430, 404, 551, 
-  569, 144, 176, 296, 13, 489, 314, 384, 182, 244, 
-  201, 180, 296, 433, 567, 237, 481, 247, 439, 232, 
-  170, 566, 341, 244, 176, 430, 345, 564, 343, 429, 
-  433, 584, 333, 423, 328, 176, 330, 296, 332, 237, 
-  441, 347, 426, 396, 466, 454, 232, 443, 452, 237, 
-  244, 461, 548, 232, 450, 419, 444, 134, 427, 522, 
-  479, 476, 54, 0, 0, 433, 84, 0, 142, 100, 
-  496, 0, 618, 201, 496, 137, 523, 496, 500, 157, 
-  201, 0, 0, 140, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 398, 102, 54, 399, 0, 54, 
-  82, 54, 54, 83, 174, 54, 282, 174, 140, 54, 
-  54, 445, 54, 54, 401, 86, 140, 87, 314, 54, 
-  54, 66, 172, 54, 281, 89, 180, 54, 54, 446, 
-  260, 54, 54, 280, 174, 264, 296, 159, 54, 54, 
-  54, 96, 445, 85, 279, 54, 54, 54, 446, 54, 
-  278, 54, 88, 54, 448, 71, 474, 90, 54, 91, 
-  473, 64, 54, 54, 446, 488, 54, 398, 445, 296, 
-  399, 54, 296, 455, 231, 54, 338, 63, 54, 54, 
-  62, 61, 54, 54, 54, 55, 484, 162, 54, 92, 
-  485, 54, 54, 398, 323, 100, 399, 78, 0, 613, 
-  297, 615, 54, 94, 483, 54, 54, 487, 486, 0, 
-  292, 54, 0, 292, 335, 264, 264, 0, 264, 0, 
-  54, 102, 169, 466, 287, 264, 292, 0, 0, 267, 
-  0, 264, 313, 324, 54, 311, 326, 292, 54, 264, 
-  54, 285, 264, 264, 0, 264, 54, 465, 294, 289, 
-  0, 264, 0, 54, 0, 307, 296, 54, 264, 291, 
-  272, 292, 264, 310, 283, 54, 264, 496, 537, 0, 
-  264, 571, 284, 576, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 320, 528, 538, 0, 0, 573, 575, 
-  577, 574, 578, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-  299, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
+  505, 135, 516, 490, 141, 183, 13, 637, 315, 513, 
+  544, 622, 145, 177, 570, 177, 248, 467, 233, 245, 
+  574, 482, 587, 431, 238, 552, 549, 434, 306, 569, 
+  302, 520, 558, 567, 304, 297, 334, 453, 449, 233, 
+  455, 445, 444, 245, 397, 442, 177, 143, 233, 238, 
+  245, 440, 158, 238, 462, 297, 410, 420, 412, 405, 
+  181, 202, 430, 171, 431, 427, 138, 434, 424, 428, 
+  451, 333, 346, 456, 431, 434, 385, 342, 329, 387, 
+  395, 331, 164, 344, 348, 523, 166, 297, 202, 477, 
+  315, 0, 0, 0, 0, 480, 0, 627, 181, 0, 
+  297, 497, 501, 101, 622, 497, 55, 524, 261, 297, 
+  55, 399, 447, 265, 400, 55, 55, 175, 175, 630, 
+  456, 497, 163, 621, 202, 0, 55, 0, 55, 103, 
+  55, 141, 93, 55, 55, 280, 55, 402, 279, 0, 
+  0, 281, 160, 55, 55, 484, 95, 55, 55, 447, 
+  55, 141, 55, 282, 97, 283, 55, 173, 92, 56, 
+  55, 475, 447, 55, 325, 474, 0, 324, 90, 55, 
+  55, 446, 489, 300, 55, 297, 55, 65, 55, 55, 
+  63, 89, 55, 297, 79, 339, 55, 336, 64, 55, 
+  67, 62, 55, 55, 55, 466, 446, 86, 87, 55, 
+  399, 55, 55, 400, 88, 83, 0, 55, 72, 487, 
+  55, 399, 486, 55, 400, 485, 55, 0, 0, 55, 
+  55, 0, 91, 84, 85, 55, 232, 488, 55, 293, 
+  55, 55, 0, 265, 265, 265, 265, 284, 273, 327, 
+  55, 55, 616, 308, 618, 265, 265, 298, 293, 268, 
+  55, 312, 0, 265, 0, 265, 0, 55, 311, 175, 
+  293, 290, 293, 293, 55, 265, 467, 265, 265, 265, 
+  295, 285, 55, 55, 497, 538, 0, 265, 265, 286, 
+  582, 0, 314, 0, 292, 321, 288, 634, 0, 497, 
+  538, 529, 539, 576, 580, 581, 583, 584, 0, 0, 
+  0, 632, 633, 635, 636, 0, 529, 539, 0, 0, 
   0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 496, 537, 
+  101, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
   0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 528, 538, 0, 0, 0, 
+  0, 0, 0, 0, 0, 0, 103, 170, 0, 0, 
   0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
   0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
   0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
   0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
   0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
   0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0};
+  0, 0, 0, 0, 0, 0, 0};
 
 const int QmlJSGrammar::action_check [] = {
-  7, 36, 36, 7, 55, 7, 33, 7, 36, 7, 
-  55, 8, 36, 7, 36, 16, 36, 7, 60, 7, 
-  33, 7, 33, 55, 36, 7, 36, 60, 7, 20, 
-  55, 5, 7, 5, 29, 8, 29, 36, 7, 17, 
-  36, 33, 29, 60, 33, 60, 7, 5, 7, 88, 
-  7, 36, 36, 33, 7, 7, 33, 66, 7, 7, 
-  36, 1, 8, 2, 78, 36, 7, 1, 36, 7, 
-  78, 8, 2, 78, 1, 8, 36, 60, 33, 8, 
-  61, 7, 48, 7, 48, 88, 48, 31, 7, 36, 
-  33, 61, 17, 60, 36, 60, 2, 60, 8, 55, 
-  36, 36, 2, 1, 36, 8, 60, 8, 7, 8, 
-  -1, 8, 8, 8, 8, 6, 61, 48, 8, 8, 
-  40, 8, 10, 8, 40, 8, 76, 78, 50, 20, 
-  8, 51, 54, 61, 62, 51, 15, -1, 61, 62, 
-  61, 62, 50, 61, 62, 8, 54, 61, 62, 61, 
-  62, 7, 61, 62, 33, 29, 29, 60, 12, 60, 
-  56, 56, 29, 60, 40, 7, 60, 55, 61, 62, 
-  60, 56, 61, 60, 40, 51, 0, 60, 42, 61, 
-  62, 25, 60, 27, 29, 51, 61, 62, 8, 53, 
-  61, 62, 29, 56, 38, 12, 8, 29, 8, 29, 
-  74, 74, 25, 57, 27, 61, 62, 74, -1, 63, 
-  29, 85, 85, 8, -1, 38, -1, -1, 85, 61, 
-  62, 66, 67, 29, -1, 61, 62, 29, -1, 66, 
-  67, 29, 12, -1, 66, 67, 29, -1, 29, -1, 
-  57, 61, 62, 25, 74, 27, 63, 66, 67, 61, 
-  62, 61, 62, 89, 29, 85, 38, 25, 29, 27, 
-  66, 67, 61, 62, 66, 67, 61, 62, 66, 67, 
-  38, 7, 29, 66, 67, 66, 67, 57, 29, 15, 
-  25, 15, 27, 63, 15, 25, 25, 27, 27, 8, 
-  89, 66, 67, 38, -1, 66, 67, 33, 38, 38, 
-  34, 29, 36, 34, 25, 36, 27, 29, -1, 66, 
-  67, 25, 25, 27, 27, 66, 67, 38, 25, 25, 
-  27, 27, 18, 19, 38, 38, 90, 91, 92, 29, 
-  -1, 38, 38, 25, 29, 27, -1, 8, 66, 67, 
-  -1, -1, 61, 62, 66, 67, 38, 29, -1, 45, 
-  46, -1, -1, -1, 36, 18, 19, 29, -1, 15, 
-  18, 19, 33, 29, 36, -1, 66, 67, -1, -1, 
-  -1, 66, 67, -1, 15, -1, -1, -1, 34, -1, 
-  36, -1, 45, 46, 66, 67, -1, 45, 46, -1, 
-  61, 62, -1, 59, 66, 67, 23, 24, -1, -1, 
-  66, 67, 23, 24, 29, 32, 47, -1, 35, -1, 
-  37, 32, -1, 29, 35, -1, 37, 23, 24, 85, 
-  61, 62, -1, -1, 29, -1, 32, 29, -1, 35, 
-  -1, 37, -1, -1, -1, -1, 61, 62, 29, 18, 
-  19, 66, 67, 23, 24, 61, 62, -1, 89, -1, 
-  66, 67, 32, 29, 59, 35, 29, 37, -1, 61, 
-  62, 66, 67, -1, 66, 67, 45, 46, -1, -1, 
-  61, 62, -1, -1, -1, 66, 67, -1, -1, -1, 
-  85, -1, -1, -1, -1, 61, 62, 10, 61, 62, 
-  66, 67, -1, 66, 67, 23, 24, 29, -1, 22, 
-  -1, 10, -1, 31, 32, -1, 29, 35, -1, 37, 
-  23, 24, -1, 22, -1, -1, 23, 24, 31, 32, 
-  29, -1, 35, -1, 37, 32, -1, 59, 35, -1, 
-  37, 3, 55, 65, 66, 67, 59, -1, -1, -1, 
-  -1, 13, -1, 66, 67, 17, 55, -1, -1, -1, 
-  59, 74, -1, 85, 26, -1, 28, 66, 67, -1, 
-  83, -1, 85, -1, -1, 74, -1, 39, -1, 41, 
-  42, -1, -1, -1, 83, -1, 85, 49, -1, -1, 
-  52, 53, -1, -1, -1, 3, 58, -1, 23, 24, 
-  -1, -1, 64, -1, -1, 13, 31, 32, -1, 17, 
-  35, -1, 37, -1, -1, -1, -1, 79, 26, -1, 
-  28, -1, -1, 31, -1, -1, -1, -1, -1, -1, 
-  -1, 39, -1, 41, 42, -1, -1, -1, -1, -1, 
-  -1, 49, -1, -1, 52, 53, -1, -1, -1, -1, 
-  58, -1, -1, -1, -1, -1, 64, -1, -1, -1, 
+  60, 36, 36, 5, 7, 36, 7, 31, 78, 17, 
+  7, 7, 61, 60, 7, 60, 36, 16, 36, 5, 
+  7, 33, 55, 7, 7, 36, 55, 8, 7, 17, 
+  7, 36, 60, 33, 55, 33, 55, 7, 20, 5, 
+  7, 33, 48, 7, 7, 2, 7, 36, 33, 1, 
+  8, 7, 7, 33, 48, 0, 7, 7, 36, 76, 
+  36, 36, 36, 36, 36, 36, 88, 8, 78, 60, 
+  60, 36, 7, 7, 36, 89, 36, 36, 7, 33, 
+  48, 7, 1, 78, 8, 29, 55, 29, 36, 29, 
+  8, 7, 2, 8, 2, 2, 7, 1, 7, -1, 
+  -1, 7, 48, 8, 40, 8, 8, 8, 40, 40, 
+  7, 8, 40, 66, 61, 51, 10, 60, 8, 51, 
+  51, 60, 6, 51, 61, 50, 15, 60, 8, 54, 
+  8, 61, 62, 8, 61, 62, 20, 8, 8, 88, 
+  78, 61, 62, 8, 33, 8, 42, 61, 62, 61, 
+  62, 8, 50, 56, 8, -1, 54, 53, 60, 60, 
+  29, 55, 61, 62, 8, 29, 61, 62, 61, 62, 
+  60, 7, -1, 61, 62, 25, 56, 27, 61, 62, 
+  61, 62, 60, 25, 29, 27, 61, 36, 38, 60, 
+  60, 8, 25, 56, 27, 60, 38, 66, 67, 56, 
+  61, 62, 66, 67, 29, 38, 60, 25, 29, 27, 
+  12, -1, 61, 62, 12, 29, 15, 61, 62, 29, 
+  38, 66, 67, 61, 62, 61, 62, -1, 89, 29, 
+  12, 25, 29, 27, 29, 34, 8, 36, 29, 29, 
+  -1, 66, 67, 60, 38, 66, 67, 90, 91, 92, 
+  29, 89, 66, 67, 8, 57, 66, 67, 8, 57, 
+  25, 63, 27, 29, -1, 63, 25, 29, 27, 66, 
+  67, 66, 67, 38, 74, 57, 66, 67, 25, 38, 
+  27, 63, 8, 74, 29, 85, 29, -1, 29, 61, 
+  62, 38, -1, 29, 85, 74, 15, 15, -1, 7, 
+  66, 67, -1, -1, 66, 67, 85, 61, 62, 29, 
+  -1, 61, 62, 7, 29, 34, 34, 36, 36, 29, 
+  25, 15, 27, 66, 67, 66, 67, 29, -1, 74, 
+  66, 67, 29, 38, 29, 61, 62, 29, -1, 33, 
+  85, 36, 36, 8, 36, -1, 66, 67, 25, -1, 
+  27, 66, 67, 61, 62, 8, 66, 67, 18, 19, 
+  -1, 38, -1, 60, 66, 67, 18, 19, 33, 66, 
+  67, 66, 67, 29, 66, 67, -1, -1, 23, 24, 
+  33, 15, -1, -1, -1, 45, 46, 32, -1, -1, 
+  35, -1, 37, 45, 46, -1, 61, 62, -1, -1, 
+  -1, 29, -1, 59, 29, -1, -1, -1, 61, 62, 
+  66, 67, -1, 47, -1, 29, -1, -1, 18, 19, 
+  -1, 23, 24, -1, -1, -1, 29, 61, 62, 85, 
+  32, 59, -1, 35, 29, 37, 61, 62, 66, 67, 
+  -1, 66, 67, 29, -1, 45, 46, 61, 62, -1, 
+  29, -1, 66, 67, -1, 89, -1, 85, 61, 62, 
+  -1, -1, 29, 66, 67, -1, 61, 62, -1, -1, 
+  -1, 66, 67, -1, -1, 61, 62, 23, 24, -1, 
+  66, 67, 61, 62, -1, 31, 32, 66, 67, 35, 
+  -1, 37, 59, -1, -1, 23, 24, -1, 65, 66, 
+  67, -1, -1, -1, 32, 10, -1, 35, -1, 37, 
+  -1, -1, -1, -1, -1, -1, -1, 22, 85, -1, 
+  -1, -1, -1, -1, 29, -1, -1, -1, 10, -1, 
   -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 
-  3, 79, -1, -1, -1, -1, -1, -1, -1, -1, 
-  13, -1, -1, -1, 17, -1, -1, -1, -1, -1, 
-  -1, -1, -1, 26, -1, 28, -1, -1, -1, -1, 
-  -1, -1, -1, -1, -1, -1, 39, -1, 41, 42, 
-  -1, 11, 12, 13, -1, -1, 49, -1, -1, 52, 
-  53, -1, 22, -1, -1, 58, -1, -1, -1, 29, 
-  -1, 64, -1, 33, 34, -1, 36, -1, -1, -1, 
-  40, -1, 42, 43, 44, -1, 79, 47, -1, -1, 
-  -1, 51, -1, 53, -1, -1, -1, -1, -1, -1, 
-  -1, -1, 12, 13, -1, 65, 66, 67, -1, 69, 
-  -1, 71, 22, 73, -1, 75, -1, -1, -1, 29, 
-  80, 81, 82, 33, 34, -1, 36, -1, -1, -1, 
-  -1, -1, -1, 43, -1, -1, -1, 47, -1, -1, 
+  22, -1, -1, -1, -1, -1, -1, 29, -1, -1, 
+  55, -1, -1, -1, 59, -1, -1, -1, -1, -1, 
+  -1, 66, 67, -1, -1, -1, -1, 23, 24, 74, 
+  -1, -1, 3, 55, -1, 31, 32, 59, 83, 35, 
+  85, 37, 13, -1, 66, 67, 17, -1, -1, -1, 
+  -1, -1, 74, -1, -1, 26, -1, 28, -1, -1, 
+  31, 83, -1, 85, -1, -1, -1, -1, 39, -1, 
+  41, 42, -1, -1, -1, -1, -1, -1, 49, -1, 
+  -1, 52, 53, -1, -1, -1, -1, 58, -1, -1, 
+  -1, -1, -1, 64, -1, -1, -1, -1, -1, 3, 
+  -1, -1, -1, -1, -1, -1, -1, -1, 79, 13, 
+  -1, -1, -1, 17, -1, -1, -1, -1, -1, -1, 
+  -1, -1, 26, -1, 28, -1, -1, -1, -1, -1, 
+  -1, -1, -1, -1, -1, 39, -1, 41, 42, -1, 
+  -1, -1, -1, -1, -1, 49, -1, -1, 52, 53, 
+  -1, -1, -1, -1, 58, -1, -1, -1, -1, -1, 
+  64, -1, -1, -1, -1, -1, -1, -1, -1, -1, 
+  -1, -1, -1, -1, -1, 79, -1, -1, -1, -1, 
   -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 
-  -1, -1, -1, -1, -1, 65, 66, 67, -1, 69, 
+  -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, 
-  80, 81, 82, -1, -1, -1, -1, -1, -1, -1, 
-  -1, -1, -1, -1, -1, 11, 12, 13, -1, -1, 
-  -1, -1, -1, -1, -1, -1, 22, -1, -1, -1, 
-  -1, -1, -1, 29, -1, -1, -1, 33, 34, -1, 
-  36, -1, -1, -1, 40, -1, 42, 43, 44, -1, 
-  -1, 47, -1, -1, -1, 51, -1, 53, -1, -1, 
-  -1, -1, -1, -1, -1, -1, -1, -1, -1, 65, 
-  66, 67, -1, 69, -1, 71, -1, 73, -1, 75, 
-  -1, -1, -1, -1, 80, 81, 82, -1, -1, -1, 
-  -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, -1, -1, 
-  -1, -1, -1, -1, -1, -1, -1, 11, 12, 13, 
-  -1, -1, -1, -1, -1, -1, -1, -1, 22, -1, 
-  -1, -1, -1, -1, -1, 29, -1, -1, -1, 33, 
-  34, -1, 36, -1, -1, -1, 40, -1, 42, 43, 
-  44, -1, -1, 47, -1, -1, -1, 51, -1, 53, 
-  -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 
-  -1, 65, 66, 67, -1, 69, -1, 71, -1, 73, 
-  74, 75, -1, -1, -1, -1, 80, 81, 82, -1, 
-  -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 
-  -1, 8, -1, -1, 11, 12, 13, -1, -1, -1, 
+  -1, -1, -1, -1, 65, 66, 67, -1, 69, -1, 
+  -1, -1, -1, -1, -1, -1, -1, -1, -1, 80, 
+  81, 82, -1, -1, -1, 86, -1, -1, -1, -1, 
+  -1, -1, -1, -1, 11, 12, 13, -1, -1, -1, 
   -1, -1, -1, -1, -1, 22, -1, -1, -1, -1, 
   -1, -1, 29, -1, -1, -1, 33, 34, -1, 36, 
   -1, -1, -1, 40, -1, 42, 43, 44, -1, -1, 
-  47, -1, -1, -1, 51, -1, 53, -1, -1, 56, 
+  47, -1, -1, -1, 51, -1, 53, -1, -1, -1, 
   -1, -1, -1, -1, -1, -1, -1, -1, 65, 66, 
   67, -1, 69, -1, 71, -1, 73, -1, 75, -1, 
-  -1, -1, -1, 80, 81, 82, -1, -1, -1, -1, 
+  -1, -1, -1, 80, 81, 82, -1, -1, -1, 86, 
+  -1, -1, -1, -1, -1, -1, -1, -1, 7, -1, 
+  -1, -1, 11, 12, 13, -1, -1, -1, -1, -1, 
+  -1, -1, -1, 22, -1, -1, -1, -1, -1, -1, 
+  29, -1, -1, -1, 33, 34, -1, 36, -1, -1, 
+  -1, 40, -1, 42, 43, 44, -1, -1, 47, -1, 
+  -1, -1, 51, -1, 53, -1, -1, -1, -1, -1, 
+  -1, -1, -1, -1, -1, -1, 65, 66, 67, -1, 
+  69, -1, 71, -1, 73, -1, 75, -1, -1, -1, 
+  -1, 80, 81, 82, -1, -1, -1, 86, -1, -1, 
+  -1, -1, -1, -1, -1, -1, 11, 12, 13, -1, 
+  -1, -1, -1, -1, -1, -1, -1, 22, -1, -1, 
+  -1, -1, -1, -1, 29, -1, -1, -1, 33, 34, 
+  -1, 36, -1, -1, -1, 40, -1, 42, 43, 44, 
+  -1, -1, 47, -1, -1, -1, 51, -1, 53, -1, 
+  -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 
+  65, 66, 67, -1, 69, -1, 71, -1, 73, 74, 
+  75, -1, -1, -1, -1, 80, 81, 82, -1, -1, 
+  -1, 86, -1, -1, -1, -1, -1, -1, -1, -1, 
+  11, 12, 13, -1, -1, -1, -1, -1, -1, -1, 
+  -1, 22, -1, -1, -1, -1, -1, -1, 29, 30, 
+  -1, -1, 33, 34, -1, 36, -1, -1, -1, 40, 
+  -1, 42, 43, 44, -1, -1, 47, -1, -1, -1, 
+  51, -1, 53, -1, -1, -1, -1, -1, -1, -1, 
+  61, -1, -1, -1, 65, 66, 67, -1, 69, -1, 
+  71, -1, 73, -1, 75, -1, -1, -1, -1, 80, 
+  81, 82, -1, -1, -1, 86, -1, -1, -1, -1, 
+  -1, -1, -1, -1, 11, 12, 13, -1, -1, -1, 
+  -1, -1, -1, -1, -1, 22, -1, -1, -1, -1, 
+  -1, -1, 29, 30, -1, -1, 33, 34, -1, 36, 
+  -1, -1, -1, 40, -1, 42, 43, 44, -1, -1, 
+  47, -1, -1, -1, 51, -1, 53, -1, -1, -1, 
+  -1, -1, -1, -1, 61, -1, -1, -1, 65, 66, 
+  67, -1, 69, -1, 71, -1, 73, -1, 75, -1, 
+  -1, -1, -1, 80, 81, 82, -1, -1, -1, 86, 
   -1, -1, -1, -1, -1, -1, -1, -1, 8, -1, 
   -1, 11, 12, 13, -1, -1, -1, -1, -1, -1, 
   -1, -1, 22, -1, -1, -1, -1, -1, -1, 29, 
@@ -737,7 +746,7 @@ const int QmlJSGrammar::action_check [] = {
   -1, 51, -1, 53, -1, -1, 56, -1, -1, -1, 
   -1, -1, -1, -1, -1, 65, 66, 67, -1, 69, 
   -1, 71, -1, 73, -1, 75, -1, -1, -1, -1, 
-  80, 81, 82, -1, -1, -1, -1, -1, -1, -1, 
+  80, 81, 82, -1, -1, -1, 86, -1, -1, -1, 
   -1, -1, -1, -1, -1, 8, -1, -1, 11, 12, 
   13, -1, -1, -1, -1, -1, -1, -1, -1, 22, 
   -1, -1, -1, -1, -1, -1, 29, -1, -1, -1, 
@@ -746,7 +755,7 @@ const int QmlJSGrammar::action_check [] = {
   53, -1, -1, 56, -1, -1, -1, -1, -1, -1, 
   -1, -1, 65, 66, 67, -1, 69, -1, 71, -1, 
   73, -1, 75, -1, -1, -1, -1, 80, 81, 82, 
-  -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 
+  -1, -1, -1, 86, -1, -1, -1, -1, -1, -1, 
   -1, -1, 8, -1, -1, 11, 12, 13, -1, -1, 
   -1, -1, -1, -1, -1, -1, 22, -1, -1, -1, 
   -1, -1, -1, 29, -1, -1, -1, 33, 34, -1, 
@@ -755,135 +764,129 @@ const int QmlJSGrammar::action_check [] = {
   56, -1, -1, -1, -1, -1, -1, -1, -1, 65, 
   66, 67, -1, 69, -1, 71, -1, 73, -1, 75, 
   -1, -1, -1, -1, 80, 81, 82, -1, -1, -1, 
-  -1, -1, -1, -1, -1, -1, -1, -1, -1, 11, 
+  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, 30, -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, 61, 
+  -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, 84, -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, -1, -1, -1, -1, -1, -1, -1, -1, -1, 
-  4, 5, 6, -1, -1, 9, 10, 11, -1, -1, 
-  14, -1, 16, -1, -1, -1, 20, 21, 22, -1, 
-  -1, -1, -1, -1, -1, 29, 30, 31, 32, -1, 
-  -1, -1, -1, -1, -1, -1, -1, -1, -1, 43, 
-  -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 
-  -1, -1, -1, -1, -1, 59, -1, -1, -1, -1, 
-  -1, -1, 66, 67, 68, 69, 70, -1, 72, 73, 
-  74, 75, 76, 77, -1, -1, 80, 81, 82, 83, 
-  84, 85, -1, -1, -1, -1, -1, -1, -1, -1, 
-  -1, 4, 5, 6, -1, -1, 9, 10, 11, -1, 
-  -1, 14, -1, 16, -1, -1, -1, 20, 21, 22, 
-  -1, -1, -1, -1, -1, -1, 29, 30, 31, 32, 
-  -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 
-  43, -1, -1, -1, 47, -1, -1, -1, -1, -1, 
-  -1, -1, -1, -1, -1, -1, 59, -1, -1, -1, 
-  -1, -1, 65, 66, 67, 68, 69, 70, -1, 72, 
-  73, 74, 75, 76, 77, -1, -1, 80, 81, 82, 
-  83, 84, 85, -1, -1, -1, -1, -1, -1, -1, 
-  -1, -1, 4, 5, 6, -1, -1, 9, 10, 11, 
-  -1, -1, 14, -1, 16, -1, -1, -1, 20, 21, 
-  22, -1, -1, -1, -1, -1, -1, 29, 30, 31, 
-  32, -1, -1, -1, -1, -1, -1, -1, -1, -1, 
-  -1, 43, -1, -1, -1, 47, -1, -1, -1, -1, 
-  -1, -1, -1, 55, -1, -1, -1, 59, -1, -1, 
-  -1, -1, -1, 65, 66, 67, 68, 69, 70, -1, 
-  72, 73, 74, 75, 76, 77, -1, -1, 80, 81, 
-  82, 83, 84, 85, -1, -1, -1, -1, -1, -1, 
-  -1, -1, -1, 4, -1, -1, -1, -1, 9, -1, 
-  11, 12, 13, 14, -1, -1, -1, -1, -1, -1, 
+  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, 
-  -1, -1, 33, 34, -1, 36, -1, -1, -1, 40, 
-  -1, 42, 43, 44, -1, -1, 47, -1, -1, -1, 
-  51, -1, 53, -1, -1, -1, -1, -1, 59, -1, 
-  61, -1, -1, -1, 65, 66, 67, 68, 69, 70, 
-  71, 72, 73, 74, 75, 76, 77, -1, -1, 80, 
-  81, 82, 83, 84, -1, -1, -1, -1, -1, -1, 
-  -1, -1, -1, -1, 4, -1, -1, -1, -1, 9, 
-  -1, 11, 12, 13, 14, -1, -1, -1, -1, -1, 
-  -1, 21, 22, -1, -1, -1, -1, -1, -1, 29, 
-  30, -1, -1, 33, 34, -1, 36, -1, -1, -1, 
-  40, -1, 42, 43, 44, -1, -1, 47, -1, -1, 
-  -1, 51, -1, 53, -1, -1, -1, -1, -1, 59, 
-  -1, 61, -1, -1, -1, 65, 66, 67, 68, 69, 
-  70, 71, 72, 73, 74, 75, 76, 77, -1, -1, 
-  80, 81, 82, 83, 84, -1, -1, -1, -1, -1, 
+  31, 32, -1, -1, -1, -1, -1, -1, -1, -1, 
+  -1, -1, 43, -1, -1, -1, -1, -1, -1, -1, 
+  -1, -1, -1, -1, -1, -1, -1, -1, 59, -1, 
+  -1, -1, -1, -1, -1, 66, 67, 68, 69, 70, 
+  -1, 72, 73, 74, 75, 76, 77, -1, -1, 80, 
+  81, 82, 83, 84, 85, -1, -1, -1, -1, -1, 
+  -1, -1, -1, -1, 4, 5, 6, -1, -1, 9, 
+  10, 11, -1, -1, 14, -1, 16, -1, -1, -1, 
+  20, 21, 22, -1, -1, -1, -1, -1, -1, 29, 
+  30, 31, 32, -1, -1, -1, -1, -1, -1, -1, 
+  -1, -1, -1, 43, -1, -1, -1, 47, -1, -1, 
+  -1, -1, -1, -1, -1, -1, -1, -1, -1, 59, 
+  -1, -1, -1, -1, -1, 65, 66, 67, 68, 69, 
+  70, -1, 72, 73, 74, 75, 76, 77, -1, -1, 
+  80, 81, 82, 83, 84, 85, -1, -1, -1, -1, 
   -1, -1, -1, -1, -1, 4, 5, 6, -1, -1, 
-  9, 10, 11, 12, 13, 14, -1, 16, -1, -1, 
+  9, 10, 11, -1, -1, 14, -1, 16, -1, -1, 
   -1, 20, 21, 22, -1, -1, -1, -1, -1, -1, 
-  29, 30, 31, 32, 33, 34, -1, 36, -1, -1, 
-  -1, 40, -1, 42, 43, 44, -1, -1, 47, -1, 
-  -1, -1, 51, -1, 53, -1, -1, -1, -1, -1, 
-  59, -1, 61, -1, -1, -1, 65, 66, 67, 68, 
-  69, 70, 71, 72, 73, 74, 75, 76, 77, -1, 
+  29, 30, 31, 32, -1, -1, -1, -1, -1, -1, 
+  -1, -1, -1, -1, 43, -1, -1, -1, 47, -1, 
+  -1, -1, -1, -1, -1, -1, 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, 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, -1, -1, -1, -1, 4, -1, -1, -1, 
+  -1, 9, -1, 11, 12, 13, 14, -1, -1, -1, 
+  -1, -1, -1, 21, 22, -1, -1, -1, -1, -1, 
+  -1, 29, 30, -1, -1, 33, 34, -1, 36, -1, 
   -1, -1, 40, -1, 42, 43, 44, -1, -1, 47, 
-  -1, -1, -1, 51, -1, 53, -1, 55, -1, -1, 
+  -1, -1, -1, 51, -1, 53, -1, -1, -1, -1, 
   -1, 59, -1, 61, -1, -1, -1, 65, 66, 67, 
   68, 69, 70, 71, 72, 73, 74, 75, 76, 77, 
-  -1, -1, 80, 81, 82, 83, 84, 85, -1, -1, 
-  -1, -1, -1, -1, -1, -1, -1, 
+  -1, -1, 80, 81, 82, 83, 84, -1, 86, -1, 
+  -1, -1, -1, -1, -1, -1, -1, 4, -1, -1, 
+  -1, -1, 9, -1, 11, 12, 13, 14, -1, -1, 
+  -1, -1, -1, -1, 21, 22, -1, -1, -1, -1, 
+  -1, -1, 29, 30, -1, -1, 33, 34, -1, 36, 
+  -1, -1, -1, 40, -1, 42, 43, 44, -1, -1, 
+  47, -1, -1, -1, 51, -1, 53, -1, -1, -1, 
+  -1, -1, 59, -1, 61, -1, -1, -1, 65, 66, 
+  67, 68, 69, 70, 71, 72, 73, 74, 75, 76, 
+  77, -1, -1, 80, 81, 82, 83, 84, -1, 86, 
+  -1, -1, -1, -1, -1, -1, -1, -1, 4, 5, 
+  6, -1, -1, 9, 10, 11, 12, 13, 14, -1, 
+  16, -1, -1, -1, 20, 21, 22, -1, -1, -1, 
+  -1, -1, -1, 29, 30, 31, 32, 33, 34, -1, 
+  36, -1, -1, -1, 40, -1, 42, 43, 44, -1, 
+  -1, 47, -1, -1, -1, 51, -1, 53, -1, -1, 
+  -1, -1, -1, 59, -1, 61, -1, -1, -1, 65, 
+  66, 67, 68, 69, 70, 71, 72, 73, 74, 75, 
+  76, 77, -1, -1, 80, 81, 82, 83, 84, 85, 
+  86, -1, -1, -1, -1, -1, -1, -1, -1, 4, 
+  5, 6, -1, -1, 9, 10, 11, 12, 13, 14, 
+  -1, 16, -1, -1, -1, 20, 21, 22, -1, -1, 
+  -1, -1, -1, -1, 29, 30, 31, 32, 33, 34, 
+  -1, 36, -1, -1, -1, 40, -1, 42, 43, 44, 
+  -1, -1, 47, -1, -1, -1, 51, -1, 53, -1, 
+  55, -1, -1, -1, 59, -1, 61, -1, -1, -1, 
+  65, 66, 67, 68, 69, 70, 71, 72, 73, 74, 
+  75, 76, 77, -1, -1, 80, 81, 82, 83, 84, 
+  85, 86, -1, -1, -1, -1, -1, -1, -1, -1, 
 
-  33, 23, 33, 3, 2, 9, 3, 2, 34, 33, 
-  9, 3, 3, 9, 2, 9, 9, 3, 2, 9, 
-  9, 66, 9, 3, 3, 2, 9, 33, 9, 2, 
-  2, 9, 3, 18, 9, 9, 3, 3, 96, 9, 
-  3, 23, 2, 2, 9, 3, 2, 23, 3, 79, 
-  18, 15, 9, 91, 2, 9, 3, 3, 2, 9, 
-  9, 2, 79, 2, 33, 2, 9, 18, 3, 9, 
-  2, 33, 3, 9, 2, 94, 18, 3, 3, 8, 
-  33, 33, 43, -1, -1, 18, 47, -1, 33, 9, 
-  9, -1, 11, 2, 9, 33, 11, 9, 10, 33, 
-  2, -1, -1, 33, -1, -1, -1, -1, -1, -1, 
-  -1, -1, -1, -1, 37, 35, 43, 40, -1, 43, 
-  47, 43, 43, 47, 45, 43, 48, 45, 33, 43, 
-  43, 45, 43, 43, 39, 48, 33, 48, 9, 43, 
-  43, 51, 39, 43, 48, 48, 9, 43, 43, 45, 
-  43, 43, 43, 48, 45, 48, 3, 57, 43, 43, 
-  43, 53, 45, 48, 48, 43, 43, 43, 45, 43, 
-  48, 43, 48, 43, 3, 49, 29, 49, 43, 49, 
-  33, 46, 43, 43, 45, 45, 43, 37, 45, 3, 
-  40, 43, 3, 9, 103, 43, 98, 45, 43, 43, 
-  45, 45, 43, 43, 43, 46, 45, 59, 43, 49, 
-  45, 43, 43, 37, 85, 9, 40, 48, -1, 9, 
-  67, 11, 43, 55, 45, 43, 43, 45, 45, -1, 
-  43, 43, -1, 43, 97, 48, 48, -1, 48, -1, 
-  43, 35, 36, 33, 56, 48, 43, -1, -1, 52, 
-  -1, 48, 65, 67, 43, 65, 67, 43, 43, 48, 
-  43, 50, 48, 48, -1, 48, 43, 83, 65, 54, 
-  -1, 48, -1, 43, -1, 58, 3, 43, 48, 65, 
-  50, 43, 48, 60, 50, 43, 48, 9, 10, -1, 
-  48, 13, 50, 3, -1, -1, -1, -1, -1, -1, 
-  -1, -1, -1, 65, 26, 27, -1, -1, 18, 19, 
-  20, 21, 22, -1, -1, -1, -1, -1, -1, -1, 
-  -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 
-  -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 
-  67, -1, -1, -1, -1, -1, -1, -1, -1, -1, 
-  -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 
-  -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 
-  -1, -1, -1, -1, -1, -1, -1, -1, 9, 10, 
+  9, 3, 9, 2, 33, 9, 3, 15, 9, 9, 
+  21, 9, 66, 9, 9, 9, 3, 33, 9, 2, 
+  9, 3, 15, 3, 9, 9, 3, 17, 2, 21, 
+  2, 9, 3, 21, 3, 3, 9, 3, 3, 9, 
+  2, 17, 17, 2, 2, 9, 9, 33, 9, 9, 
+  2, 97, 33, 9, 33, 3, 2, 95, 3, 2, 
+  9, 2, 80, 3, 3, 80, 33, 17, 92, 3, 
+  2, 2, 2, 9, 3, 17, 33, 2, 2, 34, 
+  33, 3, 33, 3, 2, 8, 33, 3, 2, 33, 
+  9, -1, -1, -1, -1, 33, -1, 9, 9, -1, 
+  3, 9, 10, 9, 9, 9, 43, 11, 43, 3, 
+  43, 37, 45, 48, 40, 43, 43, 45, 45, 24, 
+  9, 9, 59, 11, 2, -1, 43, -1, 43, 35, 
+  43, 33, 49, 43, 43, 48, 43, 39, 48, -1, 
+  -1, 48, 57, 43, 43, 45, 55, 43, 43, 45, 
+  43, 33, 43, 48, 53, 48, 43, 39, 49, 46, 
+  43, 29, 45, 43, 67, 33, -1, 86, 48, 43, 
+  43, 45, 45, 67, 43, 3, 43, 46, 43, 43, 
+  45, 48, 43, 3, 48, 99, 43, 98, 45, 43, 
+  51, 45, 43, 43, 43, 84, 45, 48, 48, 43, 
+  37, 43, 43, 40, 48, 47, -1, 43, 49, 45, 
+  43, 37, 45, 43, 40, 45, 43, -1, -1, 43, 
+  43, -1, 49, 47, 47, 43, 104, 45, 43, 43, 
+  43, 43, -1, 48, 48, 48, 48, 50, 50, 67, 
+  43, 43, 9, 58, 11, 48, 48, 67, 43, 52, 
+  43, 65, -1, 48, -1, 48, -1, 43, 60, 45, 
+  43, 54, 43, 43, 43, 48, 33, 48, 48, 48, 
+  65, 50, 43, 43, 9, 10, -1, 48, 48, 50, 
+  3, -1, 65, -1, 65, 65, 56, 3, -1, 9, 
+  10, 26, 27, 13, 17, 18, 19, 20, -1, -1, 
+  -1, 17, 18, 19, 20, -1, 26, 27, -1, -1, 
   -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 
-  -1, -1, -1, -1, -1, 26, 27, -1, -1, -1, 
+  9, -1, -1, -1, -1, -1, -1, -1, -1, -1, 
   -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 
+  -1, -1, -1, -1, -1, -1, 35, 36, -1, -1, 
   -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 
   -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 
   -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 
   -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 
   -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 
   -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 
-  -1, -1, -1, -1};
+  -1, -1, -1, -1, -1, -1, -1};
 
diff --git a/src/plugins/duieditor/parser/qmljsgrammar_p.h b/src/plugins/duieditor/parser/qmljsgrammar_p.h
index da42f8c4123..c2bc60ef922 100644
--- a/src/plugins/duieditor/parser/qmljsgrammar_p.h
+++ b/src/plugins/duieditor/parser/qmljsgrammar_p.h
@@ -2,7 +2,7 @@
 /****************************************************************************
 **
 ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
-** Contact: Qt Software Information (qt-info@nokia.com)
+** Contact: Nokia Corporation (qt-info@nokia.com)
 **
 ** This file is part of the QtCore module of the Qt Toolkit.
 **
@@ -35,7 +35,7 @@
 ** met: http://www.gnu.org/copyleft/gpl.html.
 **
 ** If you are unsure which license is appropriate for your use, please
-** contact the sales department at qt-sales@nokia.com.
+** contact the sales department at http://www.qtsoftware.com/contact.
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
@@ -154,15 +154,15 @@ public:
     T_XOR = 78,
     T_XOR_EQ = 79,
 
-    ACCEPT_STATE = 621,
-    RULE_COUNT = 341,
-    STATE_COUNT = 622,
+    ACCEPT_STATE = 638,
+    RULE_COUNT = 350,
+    STATE_COUNT = 639,
     TERMINAL_COUNT = 95,
-    NON_TERMINAL_COUNT = 105,
+    NON_TERMINAL_COUNT = 106,
 
-    GOTO_INDEX_OFFSET = 622,
-    GOTO_INFO_OFFSET = 2247,
-    GOTO_CHECK_OFFSET = 2247
+    GOTO_INDEX_OFFSET = 639,
+    GOTO_INFO_OFFSET = 2310,
+    GOTO_CHECK_OFFSET = 2310
   };
 
   static const char  *const spell [];
diff --git a/src/plugins/duieditor/parser/qmljslexer.cpp b/src/plugins/duieditor/parser/qmljslexer.cpp
index a22169dda00..beb5ebd49b3 100644
--- a/src/plugins/duieditor/parser/qmljslexer.cpp
+++ b/src/plugins/duieditor/parser/qmljslexer.cpp
@@ -755,64 +755,6 @@ int Lexer::lex()
             bol = false;
     }
 
-    if (state == Number) {
-        // CSS-style suffix for numeric literals
-
-        flags = noSuffix;
-
-        const ushort c = QChar::toLower(current);
-        const ushort n1 = QChar::toLower(next1);
-        const ushort n2 = QChar::toLower(next2);
-        const ushort n3 = QChar::toLower(next3);
-
-        if (c == 'e' && n1 == 'm') {
-            flags = emSuffix;
-            shift(2);
-        } else if (c == 'e' && n1 == 'x') {
-            flags = exSuffix;
-            shift(2);
-        } else if (c == 'p' && n1 == 'x') {
-            flags = pxSuffix;
-            shift(2);
-        } else if (c == 'c' && n1 == 'm') {
-            flags = cmSuffix;
-            shift(2);
-        } else if (c == 'm' && n1 == 'm') {
-            flags = mmSuffix;
-            shift(2);
-        } else if (c == 'i' && n1 == 'n') {
-            flags = inSuffix;
-            shift(2);
-        } else if (c == 'p' && n1 == 't') {
-            flags = ptSuffix;
-            shift(2);
-        } else if (c == 'p' && n1 == 'c') {
-            flags = pcSuffix;
-            shift(1);
-        } else if (c == 'd' && n1 == 'e' && n2 == 'g') {
-            flags = degSuffix;
-            shift(3);
-        } else if (c == 'r' && n1 == 'a' && n2 == 'd') {
-            flags = radSuffix;
-            shift(3);
-        } else if (c == 'g' && n1 == 'r' && n2 == 'a' && n3 == 'd') {
-            flags = gradSuffix;
-            shift(4);
-        } else if (c == 'm' && n1 == 's') {
-            flags = msSuffix;
-            shift(2);
-        } else if (c == 's') {
-            flags = sSuffix;
-            shift(1);
-        } else if (c == 'h' && n1 == 'z') {
-            flags = hzSuffix;
-            shift(2);
-        } else if (c == 'k' && n1 == 'h' && n2 == 'z') {
-            flags = khzSuffix;
-            shift(3);
-        }
-    }
-
     // no identifiers allowed directly after numeric literal, e.g. "3in" is bad
     if ((state == Number || state == Octal || state == Hex)
          && isIdentLetter(current)) {
diff --git a/src/plugins/duieditor/parser/qmljslexer_p.h b/src/plugins/duieditor/parser/qmljslexer_p.h
index e1ff23e0536..5817868f50a 100644
--- a/src/plugins/duieditor/parser/qmljslexer_p.h
+++ b/src/plugins/duieditor/parser/qmljslexer_p.h
@@ -112,25 +112,6 @@ public:
                  Other,
                  Bad };
 
-    enum Suffix {
-        noSuffix,
-        emSuffix,
-        exSuffix,
-        pxSuffix,
-        cmSuffix,
-        mmSuffix,
-        inSuffix,
-        ptSuffix,
-        pcSuffix,
-        degSuffix,
-        radSuffix,
-        gradSuffix,
-        msSuffix,
-        sSuffix,
-        hzSuffix,
-        khzSuffix
-    };
-
     enum Error {
         NoError,
         IllegalCharacter,
diff --git a/src/plugins/duieditor/parser/qmljsparser.cpp b/src/plugins/duieditor/parser/qmljsparser.cpp
index 08a424eaad0..9bd6e6fac70 100644
--- a/src/plugins/duieditor/parser/qmljsparser.cpp
+++ b/src/plugins/duieditor/parser/qmljsparser.cpp
@@ -337,8 +337,8 @@ case 28: {
 }   break;
 
 case 30: {
-    AST::UiArrayBinding *node = makeAstNode<AST::UiArrayBinding> (driver->nodePool(), sym(1).UiQualifiedId->finish(),
-        sym(4).UiArrayMemberList->finish());
+    AST::UiArrayBinding *node = makeAstNode<AST::UiArrayBinding> (driver->nodePool(),
+        sym(1).UiQualifiedId->finish(), sym(4).UiArrayMemberList->finish());
     node->colonToken = loc(2);
     node->lbracketToken = loc(3);
     node->rbracketToken = loc(5);
@@ -346,18 +346,6 @@ case 30: {
 }   break;
 
 case 31: {
-  AST::StringLiteral *node = makeAstNode<AST::StringLiteral> (driver->nodePool(), sym(1).sval);
-  node->literalToken = loc(1);
-  sym(1).Node = node;
-} break;
-
-case 33: {
-  AST::ExpressionStatement *node = makeAstNode<AST::ExpressionStatement> (driver->nodePool(), sym(1).Expression);
-  node->semicolonToken = loc(2);
-  sym(1).Node = node;
-} break;
-
-case 34: {
   if (AST::UiQualifiedId *qualifiedId = reparseAsQualifiedId(sym(3).Expression)) {
     AST::UiObjectBinding *node = makeAstNode<AST::UiObjectBinding> (driver->nodePool(),
       sym(1).UiQualifiedId->finish(), qualifiedId, sym(4).UiObjectInitializer);
@@ -372,10 +360,33 @@ case 34: {
     return false; // ### recover
   }
 } break;
-case 35:case 36:case 37:case 38:case 39:case 40:
+
+case 32: {
+  if (AST::UiQualifiedId *qualifiedId = reparseAsQualifiedId(sym(4).Expression)) {
+    AST::UiObjectBinding *node = makeAstNode<AST::UiObjectBinding> (driver->nodePool(),
+      sym(1).UiQualifiedId->finish(), qualifiedId, sym(5).UiObjectInitializer);
+    node->colonToken = loc(3);
+    sym(1).Node = node;
+  } else {
+    sym(1).Node = 0;
+
+    diagnostic_messages.append(DiagnosticMessage(DiagnosticMessage::Error, loc(2),
+      QLatin1String("Expected a type name after token `:'")));
+
+    return false; // ### recover
+  }
+} break;
+case 33:case 34:case 35:case 36:
 {
-    AST::UiScriptBinding *node = makeAstNode<AST::UiScriptBinding> (driver->nodePool(), sym(1).UiQualifiedId->finish(),
-        sym(3).Statement);
+    AST::UiScriptBinding *node = makeAstNode<AST::UiScriptBinding> (driver->nodePool(),
+        sym(1).UiQualifiedId->finish(), sym(4).Statement);
+    node->colonToken = loc(3);
+    sym(1).Node = node;
+}   break;
+case 37:case 38:case 39:case 40:
+{
+    AST::UiScriptBinding *node = makeAstNode<AST::UiScriptBinding> (driver->nodePool(),
+        sym(1).UiQualifiedId->finish(), sym(3).Statement);
     node->colonToken = loc(2);
     sym(1).Node = node;
 }   break;
@@ -409,25 +420,67 @@ case 47: {
 } break;
 
 case 48: {
+    AST::UiFormal *node = makeAstNode<AST::UiFormal>(driver->nodePool(), sym(1).sval);
+    node->identifierToken = loc(1);
+    sym(1).UiFormal = node;
+} break;
+
+case 49: {
+    AST::UiFormal *node = makeAstNode<AST::UiFormal>(driver->nodePool(),
+        sym(1).sval, sym(3).sval);
+    node->identifierToken = loc(1);
+    node->asToken = loc(2);
+    node->aliasToken = loc(3);
+    sym(1).UiFormal = node;
+} break;
+
+case 50: {
+    sym(1).UiFormalList = makeAstNode<AST::UiFormalList>(driver->nodePool(),
+        sym(1).UiFormal);
+} break;
+
+case 51: {
+    sym(1).UiFormalList = makeAstNode<AST::UiFormalList>(driver->nodePool(),
+        sym(1).UiFormalList, sym(3).UiFormal);
+} break;
+
+case 52: {
+    AST::UiSignature *node = makeAstNode<AST::UiSignature>(driver->nodePool());
+    node->lparenToken = loc(1);
+    node->rparenToken = loc(3);
+    sym(1).UiSignature = node;
+} break;
+
+case 53: {
+    AST::UiSignature *node = makeAstNode<AST::UiSignature>(driver->nodePool(),
+        sym(2).UiFormalList->finish());
+    node->lparenToken = loc(1);
+    node->rparenToken = loc(3);
+    sym(1).UiSignature = node;
+} break;
+
+case 55: {
     AST::UiPublicMember *node = makeAstNode<AST::UiPublicMember> (driver->nodePool(), (NameId *)0, sym(2).sval);
     node->type = AST::UiPublicMember::Signal;
     node->propertyToken = loc(1);
     node->typeToken = loc(2);
-    node->identifierToken = loc(3);
+    node->identifierToken = loc(2);
     node->parameters = sym(4).UiParameterList;
+    node->semicolonToken = loc(6);
     sym(1).Node = node;
 }   break;
 
-case 49: {
+case 57: {
     AST::UiPublicMember *node = makeAstNode<AST::UiPublicMember> (driver->nodePool(), (NameId *)0, sym(2).sval);
     node->type = AST::UiPublicMember::Signal;
     node->propertyToken = loc(1);
     node->typeToken = loc(2);
-    node->identifierToken = loc(3);
+    node->identifierToken = loc(2);
+    node->semicolonToken = loc(3);
     sym(1).Node = node;
 }   break;
 
-case 51: {
+case 59: {
     AST::UiPublicMember *node = makeAstNode<AST::UiPublicMember> (driver->nodePool(), sym(2).sval, sym(3).sval);
     node->propertyToken = loc(1);
     node->typeToken = loc(2);
@@ -436,7 +489,7 @@ case 51: {
     sym(1).Node = node;
 }   break;
 
-case 53: {
+case 61: {
     AST::UiPublicMember *node = makeAstNode<AST::UiPublicMember> (driver->nodePool(), sym(3).sval, sym(4).sval);
     node->isDefaultMember = true;
     node->defaultToken = loc(1);
@@ -447,7 +500,7 @@ case 53: {
     sym(1).Node = node;
 }   break;
 
-case 55: {
+case 63: {
     AST::UiPublicMember *node = makeAstNode<AST::UiPublicMember> (driver->nodePool(), sym(2).sval, sym(3).sval,
         sym(5).Expression);
     node->propertyToken = loc(1);
@@ -458,7 +511,7 @@ case 55: {
     sym(1).Node = node;
 }   break;
 
-case 57: {
+case 65: {
     AST::UiPublicMember *node = makeAstNode<AST::UiPublicMember> (driver->nodePool(), sym(3).sval, sym(4).sval,
         sym(6).Expression);
     node->isDefaultMember = true;
@@ -471,76 +524,76 @@ case 57: {
     sym(1).Node = node;
 }   break;
 
-case 58: {
+case 66: {
     sym(1).Node = makeAstNode<AST::UiSourceElement>(driver->nodePool(), sym(1).Node);
 }   break;
 
-case 59: {
+case 67: {
     sym(1).Node = makeAstNode<AST::UiSourceElement>(driver->nodePool(), sym(1).Node);
 }   break;
-case 60: 
-case 61:
+case 68: 
+case 69:
 {
     AST::UiQualifiedId *node = makeAstNode<AST::UiQualifiedId> (driver->nodePool(), driver->intern(lexer->characterBuffer(), lexer->characterCount()));
     node->identifierToken = loc(1);
     sym(1).Node = node;
 }   break;
 
-case 63: {
+case 71: {
     QString s = QLatin1String(QmlJSGrammar::spell[T_PROPERTY]);
     sym(1).sval = driver->intern(s.constData(), s.length());
     break;
 }
 
-case 64: {
+case 72: {
     QString s = QLatin1String(QmlJSGrammar::spell[T_SIGNAL]);
     sym(1).sval = driver->intern(s.constData(), s.length());
     break;
 }
 
-case 65: {
+case 73: {
   AST::ThisExpression *node = makeAstNode<AST::ThisExpression> (driver->nodePool());
   node->thisToken = loc(1);
   sym(1).Node = node;
 } break;
 
-case 66: {
+case 74: {
   AST::IdentifierExpression *node = makeAstNode<AST::IdentifierExpression> (driver->nodePool(), sym(1).sval);
   node->identifierToken = loc(1);
   sym(1).Node = node;
 } break;
 
-case 67: {
+case 75: {
   AST::NullExpression *node = makeAstNode<AST::NullExpression> (driver->nodePool());
   node->nullToken = loc(1);
   sym(1).Node = node;
 } break;
 
-case 68: {
+case 76: {
   AST::TrueLiteral *node = makeAstNode<AST::TrueLiteral> (driver->nodePool());
   node->trueToken = loc(1);
   sym(1).Node = node;
 } break;
 
-case 69: {
+case 77: {
   AST::FalseLiteral *node = makeAstNode<AST::FalseLiteral> (driver->nodePool());
   node->falseToken = loc(1);
   sym(1).Node = node;
 } break;
 
-case 70: {
-  AST::NumericLiteral *node = makeAstNode<AST::NumericLiteral> (driver->nodePool(), sym(1).dval, lexer->flags);
+case 78: {
+  AST::NumericLiteral *node = makeAstNode<AST::NumericLiteral> (driver->nodePool(), sym(1).dval);
   node->literalToken = loc(1);
   sym(1).Node = node;
 } break;
-
-case 71: {
+case 79:
+case 80: {
   AST::StringLiteral *node = makeAstNode<AST::StringLiteral> (driver->nodePool(), sym(1).sval);
   node->literalToken = loc(1);
   sym(1).Node = node;
 } break;
 
-case 72: {
+case 81: {
   bool rx = lexer->scanRegExp(Lexer::NoPrefix);
   if (!rx) {
     diagnostic_messages.append(DiagnosticMessage(DiagnosticMessage::Error, location(lexer), lexer->errorMessage()));
@@ -551,7 +604,7 @@ case 72: {
   sym(1).Node = node;
 } break;
 
-case 73: {
+case 82: {
   bool rx = lexer->scanRegExp(Lexer::EqualPrefix);
   if (!rx) {
     diagnostic_messages.append(DiagnosticMessage(DiagnosticMessage::Error, location(lexer), lexer->errorMessage()));
@@ -562,28 +615,28 @@ case 73: {
   sym(1).Node = node;
 } break;
 
-case 74: {
+case 83: {
   AST::ArrayLiteral *node = makeAstNode<AST::ArrayLiteral> (driver->nodePool(), (AST::Elision *) 0);
   node->lbracketToken = loc(1);
   node->rbracketToken = loc(2);
   sym(1).Node = node;
 } break;
 
-case 75: {
+case 84: {
   AST::ArrayLiteral *node = makeAstNode<AST::ArrayLiteral> (driver->nodePool(), sym(2).Elision->finish());
   node->lbracketToken = loc(1);
   node->rbracketToken = loc(3);
   sym(1).Node = node;
 } break;
 
-case 76: {
+case 85: {
   AST::ArrayLiteral *node = makeAstNode<AST::ArrayLiteral> (driver->nodePool(), sym(2).ElementList->finish ());
   node->lbracketToken = loc(1);
   node->rbracketToken = loc(3);
   sym(1).Node = node;
 } break;
 
-case 77: {
+case 86: {
   AST::ArrayLiteral *node = makeAstNode<AST::ArrayLiteral> (driver->nodePool(), sym(2).ElementList->finish (),
     (AST::Elision *) 0);
   node->lbracketToken = loc(1);
@@ -592,7 +645,7 @@ case 77: {
   sym(1).Node = node;
 } break;
 
-case 78: {
+case 87: {
   AST::ArrayLiteral *node = makeAstNode<AST::ArrayLiteral> (driver->nodePool(), sym(2).ElementList->finish (),
     sym(4).Elision->finish());
   node->lbracketToken = loc(1);
@@ -601,7 +654,7 @@ case 78: {
   sym(1).Node = node;
 } break;
 
-case 79: {
+case 88: {
   AST::ObjectLiteral *node = 0;
   if (sym(2).Node)
     node = makeAstNode<AST::ObjectLiteral> (driver->nodePool(),
@@ -613,7 +666,7 @@ case 79: {
   sym(1).Node = node;
 } break;
 
-case 80: {
+case 89: {
   AST::ObjectLiteral *node = makeAstNode<AST::ObjectLiteral> (driver->nodePool(),
     sym(2).PropertyNameAndValueList->finish ());
   node->lbraceToken = loc(1);
@@ -621,67 +674,67 @@ case 80: {
   sym(1).Node = node;
 } break;
 
-case 81: {
+case 90: {
   AST::NestedExpression *node = makeAstNode<AST::NestedExpression>(driver->nodePool(), sym(2).Expression);
   node->lparenToken = loc(1);
   node->rparenToken = loc(3);
   sym(1).Node = node;
 } break;
 
-case 82: {
+case 91: {
     AST::UiQualifiedId *node = makeAstNode<AST::UiQualifiedId> (driver->nodePool(), sym(1).sval);
     node->identifierToken = loc(1);
     sym(1).Node = node;
 }   break;
 
-case 83: {
+case 92: {
     AST::UiQualifiedId *node = makeAstNode<AST::UiQualifiedId> (driver->nodePool(), sym(1).UiQualifiedId, sym(3).sval);
     node->identifierToken = loc(3);
     sym(1).Node = node;
 }   break;
 
-case 84: {
+case 93: {
   sym(1).Node = makeAstNode<AST::ElementList> (driver->nodePool(), (AST::Elision *) 0, sym(1).Expression);
 } break;
 
-case 85: {
+case 94: {
   sym(1).Node = makeAstNode<AST::ElementList> (driver->nodePool(), sym(1).Elision->finish(), sym(2).Expression);
 } break;
 
-case 86: {
+case 95: {
   AST::ElementList *node = makeAstNode<AST::ElementList> (driver->nodePool(), sym(1).ElementList,
     (AST::Elision *) 0, sym(3).Expression);
   node->commaToken = loc(2);
   sym(1).Node = node;
 } break;
 
-case 87: {
+case 96: {
   AST::ElementList *node = makeAstNode<AST::ElementList> (driver->nodePool(), sym(1).ElementList, sym(3).Elision->finish(),
     sym(4).Expression);
   node->commaToken = loc(2);
   sym(1).Node = node;
 } break;
 
-case 88: {
+case 97: {
   AST::Elision *node = makeAstNode<AST::Elision> (driver->nodePool());
   node->commaToken = loc(1);
   sym(1).Node = node;
 } break;
 
-case 89: {
+case 98: {
   AST::Elision *node = makeAstNode<AST::Elision> (driver->nodePool(), sym(1).Elision);
   node->commaToken = loc(2);
   sym(1).Node = node;
 } break;
 
-case 90: {
+case 99: {
   AST::PropertyNameAndValueList *node = makeAstNode<AST::PropertyNameAndValueList> (driver->nodePool(),
       sym(1).PropertyName, sym(3).Expression);
   node->colonToken = loc(2);
   sym(1).Node = node;
 } break;
 
-case 91: {
+case 100: {
   AST::PropertyNameAndValueList *node = makeAstNode<AST::PropertyNameAndValueList> (driver->nodePool(),
       sym(1).PropertyNameAndValueList, sym(3).PropertyName, sym(5).Expression);
   node->commaToken = loc(2);
@@ -689,54 +742,36 @@ case 91: {
   sym(1).Node = node;
 } break;
 
-case 92: {
+case 101: {
   AST::IdentifierPropertyName *node = makeAstNode<AST::IdentifierPropertyName> (driver->nodePool(), sym(1).sval);
   node->propertyNameToken = loc(1);
   sym(1).Node = node;
 } break;
-case 93:
-case 94: {
+case 102:
+case 103: {
   AST::IdentifierPropertyName *node = makeAstNode<AST::IdentifierPropertyName> (driver->nodePool(), driver->intern(lexer->characterBuffer(), lexer->characterCount()));
   node->propertyNameToken = loc(1);
   sym(1).Node = node;
 } break;
 
-case 95: {
+case 104: {
   AST::StringLiteralPropertyName *node = makeAstNode<AST::StringLiteralPropertyName> (driver->nodePool(), sym(1).sval);
   node->propertyNameToken = loc(1);
   sym(1).Node = node;
 } break;
 
-case 96: {
+case 105: {
   AST::NumericLiteralPropertyName *node = makeAstNode<AST::NumericLiteralPropertyName> (driver->nodePool(), sym(1).dval);
   node->propertyNameToken = loc(1);
   sym(1).Node = node;
 } break;
 
-case 97: {
+case 106: {
   AST::IdentifierPropertyName *node = makeAstNode<AST::IdentifierPropertyName> (driver->nodePool(), sym(1).sval);
   node->propertyNameToken = loc(1);
   sym(1).Node = node;
 } break;
 
-case 98:
-
-case 99:
-
-case 100:
-
-case 101:
-
-case 102:
-
-case 103:
-
-case 104:
-
-case 105:
-
-case 106:
-
 case 107:
 
 case 108:
@@ -780,25 +815,43 @@ case 126:
 case 127:
 
 case 128:
+
+case 129:
+
+case 130:
+
+case 131:
+
+case 132:
+
+case 133:
+
+case 134:
+
+case 135:
+
+case 136:
+
+case 137:
 {
   sym(1).sval = driver->intern(lexer->characterBuffer(), lexer->characterCount());
 } break;
 
-case 133: {
+case 142: {
   AST::ArrayMemberExpression *node = makeAstNode<AST::ArrayMemberExpression> (driver->nodePool(), sym(1).Expression, sym(3).Expression);
   node->lbracketToken = loc(2);
   node->rbracketToken = loc(4);
   sym(1).Node = node;
 } break;
 
-case 134: {
+case 143: {
   AST::FieldMemberExpression *node = makeAstNode<AST::FieldMemberExpression> (driver->nodePool(), sym(1).Expression, sym(3).sval);
   node->dotToken = loc(2);
   node->identifierToken = loc(3);
   sym(1).Node = node;
 } break;
 
-case 135: {
+case 144: {
   AST::NewMemberExpression *node = makeAstNode<AST::NewMemberExpression> (driver->nodePool(), sym(2).Expression, sym(4).ArgumentList);
   node->newToken = loc(1);
   node->lparenToken = loc(3);
@@ -806,384 +859,384 @@ case 135: {
   sym(1).Node = node;
 } break;
 
-case 137: {
+case 146: {
   AST::NewExpression *node = makeAstNode<AST::NewExpression> (driver->nodePool(), sym(2).Expression);
   node->newToken = loc(1);
   sym(1).Node = node;
 } break;
 
-case 138: {
+case 147: {
   AST::CallExpression *node = makeAstNode<AST::CallExpression> (driver->nodePool(), sym(1).Expression, sym(3).ArgumentList);
   node->lparenToken = loc(2);
   node->rparenToken = loc(4);
   sym(1).Node = node;
 } break;
 
-case 139: {
+case 148: {
   AST::CallExpression *node = makeAstNode<AST::CallExpression> (driver->nodePool(), sym(1).Expression, sym(3).ArgumentList);
   node->lparenToken = loc(2);
   node->rparenToken = loc(4);
   sym(1).Node = node;
 } break;
 
-case 140: {
+case 149: {
   AST::ArrayMemberExpression *node = makeAstNode<AST::ArrayMemberExpression> (driver->nodePool(), sym(1).Expression, sym(3).Expression);
   node->lbracketToken = loc(2);
   node->rbracketToken = loc(4);
   sym(1).Node = node;
 } break;
 
-case 141: {
+case 150: {
   AST::FieldMemberExpression *node = makeAstNode<AST::FieldMemberExpression> (driver->nodePool(), sym(1).Expression, sym(3).sval);
   node->dotToken = loc(2);
   node->identifierToken = loc(3);
   sym(1).Node = node;
 } break;
 
-case 142: {
+case 151: {
   sym(1).Node = 0;
 } break;
 
-case 143: {
+case 152: {
   sym(1).Node = sym(1).ArgumentList->finish();
 } break;
 
-case 144: {
+case 153: {
   sym(1).Node = makeAstNode<AST::ArgumentList> (driver->nodePool(), sym(1).Expression);
 } break;
 
-case 145: {
+case 154: {
   AST::ArgumentList *node = makeAstNode<AST::ArgumentList> (driver->nodePool(), sym(1).ArgumentList, sym(3).Expression);
   node->commaToken = loc(2);
   sym(1).Node = node;
 } break;
 
-case 149: {
+case 158: {
   AST::PostIncrementExpression *node = makeAstNode<AST::PostIncrementExpression> (driver->nodePool(), sym(1).Expression);
   node->incrementToken = loc(2);
   sym(1).Node = node;
 } break;
 
-case 150: {
+case 159: {
   AST::PostDecrementExpression *node = makeAstNode<AST::PostDecrementExpression> (driver->nodePool(), sym(1).Expression);
   node->decrementToken = loc(2);
   sym(1).Node = node;
 } break;
 
-case 152: {
+case 161: {
   AST::DeleteExpression *node = makeAstNode<AST::DeleteExpression> (driver->nodePool(), sym(2).Expression);
   node->deleteToken = loc(1);
   sym(1).Node = node;
 } break;
 
-case 153: {
+case 162: {
   AST::VoidExpression *node = makeAstNode<AST::VoidExpression> (driver->nodePool(), sym(2).Expression);
   node->voidToken = loc(1);
   sym(1).Node = node;
 } break;
 
-case 154: {
+case 163: {
   AST::TypeOfExpression *node = makeAstNode<AST::TypeOfExpression> (driver->nodePool(), sym(2).Expression);
   node->typeofToken = loc(1);
   sym(1).Node = node;
 } break;
 
-case 155: {
+case 164: {
   AST::PreIncrementExpression *node = makeAstNode<AST::PreIncrementExpression> (driver->nodePool(), sym(2).Expression);
   node->incrementToken = loc(1);
   sym(1).Node = node;
 } break;
 
-case 156: {
+case 165: {
   AST::PreDecrementExpression *node = makeAstNode<AST::PreDecrementExpression> (driver->nodePool(), sym(2).Expression);
   node->decrementToken = loc(1);
   sym(1).Node = node;
 } break;
 
-case 157: {
+case 166: {
   AST::UnaryPlusExpression *node = makeAstNode<AST::UnaryPlusExpression> (driver->nodePool(), sym(2).Expression);
   node->plusToken = loc(1);
   sym(1).Node = node;
 } break;
 
-case 158: {
+case 167: {
   AST::UnaryMinusExpression *node = makeAstNode<AST::UnaryMinusExpression> (driver->nodePool(), sym(2).Expression);
   node->minusToken = loc(1);
   sym(1).Node = node;
 } break;
 
-case 159: {
+case 168: {
   AST::TildeExpression *node = makeAstNode<AST::TildeExpression> (driver->nodePool(), sym(2).Expression);
   node->tildeToken = loc(1);
   sym(1).Node = node;
 } break;
 
-case 160: {
+case 169: {
   AST::NotExpression *node = makeAstNode<AST::NotExpression> (driver->nodePool(), sym(2).Expression);
   node->notToken = loc(1);
   sym(1).Node = node;
 } break;
 
-case 162: {
+case 171: {
   AST::BinaryExpression *node = makeAstNode<AST::BinaryExpression> (driver->nodePool(), sym(1).Expression,
     QSOperator::Mul, sym(3).Expression);
   node->operatorToken = loc(2);
   sym(1).Node = node;
 } break;
 
-case 163: {
+case 172: {
   AST::BinaryExpression *node = makeAstNode<AST::BinaryExpression> (driver->nodePool(), sym(1).Expression,
     QSOperator::Div, sym(3).Expression);
   node->operatorToken = loc(2);
   sym(1).Node = node;
 } break;
 
-case 164: {
+case 173: {
   AST::BinaryExpression *node = makeAstNode<AST::BinaryExpression> (driver->nodePool(), sym(1).Expression,
     QSOperator::Mod, sym(3).Expression);
   node->operatorToken = loc(2);
   sym(1).Node = node;
 } break;
 
-case 166: {
+case 175: {
   AST::BinaryExpression *node = makeAstNode<AST::BinaryExpression> (driver->nodePool(), sym(1).Expression,
     QSOperator::Add, sym(3).Expression);
   node->operatorToken = loc(2);
   sym(1).Node = node;
 } break;
 
-case 167: {
+case 176: {
   AST::BinaryExpression *node = makeAstNode<AST::BinaryExpression> (driver->nodePool(), sym(1).Expression,
     QSOperator::Sub, sym(3).Expression);
   node->operatorToken = loc(2);
   sym(1).Node = node;
 } break;
 
-case 169: {
+case 178: {
   AST::BinaryExpression *node = makeAstNode<AST::BinaryExpression> (driver->nodePool(), sym(1).Expression,
     QSOperator::LShift, sym(3).Expression);
   node->operatorToken = loc(2);
   sym(1).Node = node;
 } break;
 
-case 170: {
+case 179: {
   AST::BinaryExpression *node = makeAstNode<AST::BinaryExpression> (driver->nodePool(), sym(1).Expression,
     QSOperator::RShift, sym(3).Expression);
   node->operatorToken = loc(2);
   sym(1).Node = node;
 } break;
 
-case 171: {
+case 180: {
   AST::BinaryExpression *node = makeAstNode<AST::BinaryExpression> (driver->nodePool(), sym(1).Expression,
     QSOperator::URShift, sym(3).Expression);
   node->operatorToken = loc(2);
   sym(1).Node = node;
 } break;
 
-case 173: {
+case 182: {
   AST::BinaryExpression *node = makeAstNode<AST::BinaryExpression> (driver->nodePool(), sym(1).Expression,
     QSOperator::Lt, sym(3).Expression);
   node->operatorToken = loc(2);
   sym(1).Node = node;
 } break;
 
-case 174: {
+case 183: {
   AST::BinaryExpression *node = makeAstNode<AST::BinaryExpression> (driver->nodePool(), sym(1).Expression,
     QSOperator::Gt, sym(3).Expression);
   node->operatorToken = loc(2);
   sym(1).Node = node;
 } break;
 
-case 175: {
+case 184: {
   AST::BinaryExpression *node = makeAstNode<AST::BinaryExpression> (driver->nodePool(), sym(1).Expression,
     QSOperator::Le, sym(3).Expression);
   node->operatorToken = loc(2);
   sym(1).Node = node;
 } break;
 
-case 176: {
+case 185: {
   AST::BinaryExpression *node = makeAstNode<AST::BinaryExpression> (driver->nodePool(), sym(1).Expression,
     QSOperator::Ge, sym(3).Expression);
   node->operatorToken = loc(2);
   sym(1).Node = node;
 } break;
 
-case 177: {
+case 186: {
   AST::BinaryExpression *node = makeAstNode<AST::BinaryExpression> (driver->nodePool(), sym(1).Expression,
     QSOperator::InstanceOf, sym(3).Expression);
   node->operatorToken = loc(2);
   sym(1).Node = node;
 } break;
 
-case 178: {
+case 187: {
   AST::BinaryExpression *node = makeAstNode<AST::BinaryExpression> (driver->nodePool(), sym(1).Expression,
     QSOperator::In, sym(3).Expression);
   node->operatorToken = loc(2);
   sym(1).Node = node;
 } break;
 
-case 180: {
+case 189: {
   AST::BinaryExpression *node = makeAstNode<AST::BinaryExpression> (driver->nodePool(), sym(1).Expression,
     QSOperator::Lt, sym(3).Expression);
   node->operatorToken = loc(2);
   sym(1).Node = node;
 } break;
 
-case 181: {
+case 190: {
   AST::BinaryExpression *node = makeAstNode<AST::BinaryExpression> (driver->nodePool(), sym(1).Expression,
     QSOperator::Gt, sym(3).Expression);
   node->operatorToken = loc(2);
   sym(1).Node = node;
 } break;
 
-case 182: {
+case 191: {
   AST::BinaryExpression *node = makeAstNode<AST::BinaryExpression> (driver->nodePool(), sym(1).Expression,
     QSOperator::Le, sym(3).Expression);
   node->operatorToken = loc(2);
   sym(1).Node = node;
 } break;
 
-case 183: {
+case 192: {
   AST::BinaryExpression *node = makeAstNode<AST::BinaryExpression> (driver->nodePool(), sym(1).Expression,
    QSOperator::Ge, sym(3).Expression);
   node->operatorToken = loc(2);
   sym(1).Node = node;
 } break;
 
-case 184: {
+case 193: {
   AST::BinaryExpression *node = makeAstNode<AST::BinaryExpression> (driver->nodePool(), sym(1).Expression,
     QSOperator::InstanceOf, sym(3).Expression);
   node->operatorToken = loc(2);
   sym(1).Node = node;
 } break;
 
-case 186: {
+case 195: {
   AST::BinaryExpression *node = makeAstNode<AST::BinaryExpression> (driver->nodePool(), sym(1).Expression,
     QSOperator::Equal, sym(3).Expression);
   node->operatorToken = loc(2);
   sym(1).Node = node;
 } break;
 
-case 187: {
+case 196: {
   AST::BinaryExpression *node = makeAstNode<AST::BinaryExpression> (driver->nodePool(), sym(1).Expression,
     QSOperator::NotEqual, sym(3).Expression);
   node->operatorToken = loc(2);
   sym(1).Node = node;
 } break;
 
-case 188: {
+case 197: {
   AST::BinaryExpression *node = makeAstNode<AST::BinaryExpression> (driver->nodePool(), sym(1).Expression,
     QSOperator::StrictEqual, sym(3).Expression);
   node->operatorToken = loc(2);
   sym(1).Node = node;
 } break;
 
-case 189: {
+case 198: {
   AST::BinaryExpression *node = makeAstNode<AST::BinaryExpression> (driver->nodePool(), sym(1).Expression,
     QSOperator::StrictNotEqual, sym(3).Expression);
   node->operatorToken = loc(2);
   sym(1).Node = node;
 } break;
 
-case 191: {
+case 200: {
   AST::BinaryExpression *node = makeAstNode<AST::BinaryExpression> (driver->nodePool(), sym(1).Expression,
     QSOperator::Equal, sym(3).Expression);
   node->operatorToken = loc(2);
   sym(1).Node = node;
 } break;
 
-case 192: {
+case 201: {
   AST::BinaryExpression *node = makeAstNode<AST::BinaryExpression> (driver->nodePool(), sym(1).Expression,
     QSOperator::NotEqual, sym(3).Expression);
   node->operatorToken = loc(2);
   sym(1).Node = node;
 } break;
 
-case 193: {
+case 202: {
   AST::BinaryExpression *node = makeAstNode<AST::BinaryExpression> (driver->nodePool(), sym(1).Expression,
     QSOperator::StrictEqual, sym(3).Expression);
   node->operatorToken = loc(2);
   sym(1).Node = node;
 } break;
 
-case 194: {
+case 203: {
   AST::BinaryExpression *node = makeAstNode<AST::BinaryExpression> (driver->nodePool(), sym(1).Expression,
     QSOperator::StrictNotEqual, sym(3).Expression);
   node->operatorToken = loc(2);
   sym(1).Node = node;
 } break;
 
-case 196: {
+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 198: {
+case 207: {
   AST::BinaryExpression *node = makeAstNode<AST::BinaryExpression> (driver->nodePool(), sym(1).Expression,
     QSOperator::BitAnd, sym(3).Expression);
   node->operatorToken = loc(2);
   sym(1).Node = node;
 } break;
 
-case 200: {
+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 202: {
+case 211: {
   AST::BinaryExpression *node = makeAstNode<AST::BinaryExpression> (driver->nodePool(), sym(1).Expression,
     QSOperator::BitXor, sym(3).Expression);
   node->operatorToken = loc(2);
   sym(1).Node = node;
 } break;
 
-case 204: {
+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 206: {
+case 215: {
   AST::BinaryExpression *node = makeAstNode<AST::BinaryExpression> (driver->nodePool(), sym(1).Expression,
     QSOperator::BitOr, sym(3).Expression);
   node->operatorToken = loc(2);
   sym(1).Node = node;
 } break;
 
-case 208: {
+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 210: {
+case 219: {
   AST::BinaryExpression *node = makeAstNode<AST::BinaryExpression> (driver->nodePool(), sym(1).Expression,
     QSOperator::And, sym(3).Expression);
   node->operatorToken = loc(2);
   sym(1).Node = node;
 } break;
 
-case 212: {
+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 214: {
+case 223: {
   AST::BinaryExpression *node = makeAstNode<AST::BinaryExpression> (driver->nodePool(), sym(1).Expression,
     QSOperator::Or, sym(3).Expression);
   node->operatorToken = loc(2);
   sym(1).Node = node;
 } break;
 
-case 216: {
+case 225: {
   AST::ConditionalExpression *node = makeAstNode<AST::ConditionalExpression> (driver->nodePool(), sym(1).Expression,
     sym(3).Expression, sym(5).Expression);
   node->questionToken = loc(2);
@@ -1191,7 +1244,7 @@ case 216: {
   sym(1).Node = node;
 } break;
 
-case 218: {
+case 227: {
   AST::ConditionalExpression *node = makeAstNode<AST::ConditionalExpression> (driver->nodePool(), sym(1).Expression,
     sym(3).Expression, sym(5).Expression);
   node->questionToken = loc(2);
@@ -1199,112 +1252,112 @@ case 218: {
   sym(1).Node = node;
 } break;
 
-case 220: {
+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 222: {
+case 231: {
   AST::BinaryExpression *node = makeAstNode<AST::BinaryExpression> (driver->nodePool(), sym(1).Expression,
     sym(2).ival, sym(3).Expression);
   node->operatorToken = loc(2);
   sym(1).Node = node;
 } break;
 
-case 223: {
+case 232: {
   sym(1).ival = QSOperator::Assign;
 } break;
 
-case 224: {
+case 233: {
   sym(1).ival = QSOperator::InplaceMul;
 } break;
 
-case 225: {
+case 234: {
   sym(1).ival = QSOperator::InplaceDiv;
 } break;
 
-case 226: {
+case 235: {
   sym(1).ival = QSOperator::InplaceMod;
 } break;
 
-case 227: {
+case 236: {
   sym(1).ival = QSOperator::InplaceAdd;
 } break;
 
-case 228: {
+case 237: {
   sym(1).ival = QSOperator::InplaceSub;
 } break;
 
-case 229: {
+case 238: {
   sym(1).ival = QSOperator::InplaceLeftShift;
 } break;
 
-case 230: {
+case 239: {
   sym(1).ival = QSOperator::InplaceRightShift;
 } break;
 
-case 231: {
+case 240: {
   sym(1).ival = QSOperator::InplaceURightShift;
 } break;
 
-case 232: {
+case 241: {
   sym(1).ival = QSOperator::InplaceAnd;
 } break;
 
-case 233: {
+case 242: {
   sym(1).ival = QSOperator::InplaceXor;
 } break;
 
-case 234: {
+case 243: {
   sym(1).ival = QSOperator::InplaceOr;
 } break;
 
-case 236: {
+case 245: {
   AST::Expression *node = makeAstNode<AST::Expression> (driver->nodePool(), sym(1).Expression, sym(3).Expression);
   node->commaToken = loc(2);
   sym(1).Node = node;
 } break;
 
-case 237: {
+case 246: {
   sym(1).Node = 0;
 } break;
 
-case 240: {
+case 249: {
   AST::Expression *node = makeAstNode<AST::Expression> (driver->nodePool(), sym(1).Expression, sym(3).Expression);
   node->commaToken = loc(2);
   sym(1).Node = node;
 } break;
 
-case 241: {
+case 250: {
   sym(1).Node = 0;
 } break;
 
-case 258: {
+case 267: {
   AST::Block *node = makeAstNode<AST::Block> (driver->nodePool(), sym(2).StatementList);
   node->lbraceToken = loc(1);
   node->rbraceToken = loc(3);
   sym(1).Node = node;
 } break;
 
-case 259: {
+case 268: {
   sym(1).Node = makeAstNode<AST::StatementList> (driver->nodePool(), sym(1).Statement);
 } break;
 
-case 260: {
+case 269: {
   sym(1).Node = makeAstNode<AST::StatementList> (driver->nodePool(), sym(1).StatementList, sym(2).Statement);
 } break;
 
-case 261: {
+case 270: {
   sym(1).Node = 0;
 } break;
 
-case 262: {
+case 271: {
   sym(1).Node = sym(1).StatementList->finish ();
 } break;
 
-case 264: {
+case 273: {
   AST::VariableStatement *node = makeAstNode<AST::VariableStatement> (driver->nodePool(),
      sym(2).VariableDeclarationList->finish (/*readOnly=*/sym(1).ival == T_CONST));
   node->declarationKindToken = loc(1);
@@ -1312,76 +1365,76 @@ case 264: {
   sym(1).Node = node;
 } break;
 
-case 265: {
+case 274: {
   sym(1).ival = T_CONST;
 } break;
 
-case 266: {
+case 275: {
   sym(1).ival = T_VAR;
 } break;
 
-case 267: {
+case 276: {
   sym(1).Node = makeAstNode<AST::VariableDeclarationList> (driver->nodePool(), sym(1).VariableDeclaration);
 } break;
 
-case 268: {
+case 277: {
   AST::VariableDeclarationList *node = makeAstNode<AST::VariableDeclarationList> (driver->nodePool(),
     sym(1).VariableDeclarationList, sym(3).VariableDeclaration);
   node->commaToken = loc(2);
   sym(1).Node = node;
 } break;
 
-case 269: {
+case 278: {
   sym(1).Node = makeAstNode<AST::VariableDeclarationList> (driver->nodePool(), sym(1).VariableDeclaration);
 } break;
 
-case 270: {
+case 279: {
   sym(1).Node = makeAstNode<AST::VariableDeclarationList> (driver->nodePool(), sym(1).VariableDeclarationList, sym(3).VariableDeclaration);
 } break;
 
-case 271: {
+case 280: {
   AST::VariableDeclaration *node = makeAstNode<AST::VariableDeclaration> (driver->nodePool(), sym(1).sval, sym(2).Expression);
   node->identifierToken = loc(1);
   sym(1).Node = node;
 } break;
 
-case 272: {
+case 281: {
   AST::VariableDeclaration *node = makeAstNode<AST::VariableDeclaration> (driver->nodePool(), sym(1).sval, sym(2).Expression);
   node->identifierToken = loc(1);
   sym(1).Node = node;
 } break;
 
-case 273: {
+case 282: {
   // ### TODO: AST for initializer
   sym(1) = sym(2);
 } break;
 
-case 274: {
+case 283: {
   sym(1).Node = 0;
 } break;
 
-case 276: {
+case 285: {
   // ### TODO: AST for initializer
   sym(1) = sym(2);
 } break;
 
-case 277: {
+case 286: {
   sym(1).Node = 0;
 } break;
 
-case 279: {
+case 288: {
   AST::EmptyStatement *node = makeAstNode<AST::EmptyStatement> (driver->nodePool());
   node->semicolonToken = loc(1);
   sym(1).Node = node;
 } break;
 
-case 281: {
+case 290: {
   AST::ExpressionStatement *node = makeAstNode<AST::ExpressionStatement> (driver->nodePool(), sym(1).Expression);
   node->semicolonToken = loc(2);
   sym(1).Node = node;
 } break;
 
-case 282: {
+case 291: {
   AST::IfStatement *node = makeAstNode<AST::IfStatement> (driver->nodePool(), sym(3).Expression, sym(5).Statement, sym(7).Statement);
   node->ifToken = loc(1);
   node->lparenToken = loc(2);
@@ -1390,7 +1443,7 @@ case 282: {
   sym(1).Node = node;
 } break;
 
-case 283: {
+case 292: {
   AST::IfStatement *node = makeAstNode<AST::IfStatement> (driver->nodePool(), sym(3).Expression, sym(5).Statement);
   node->ifToken = loc(1);
   node->lparenToken = loc(2);
@@ -1398,7 +1451,7 @@ case 283: {
   sym(1).Node = node;
 } break;
 
-case 285: {
+case 294: {
   AST::DoWhileStatement *node = makeAstNode<AST::DoWhileStatement> (driver->nodePool(), sym(2).Statement, sym(5).Expression);
   node->doToken = loc(1);
   node->whileToken = loc(3);
@@ -1408,7 +1461,7 @@ case 285: {
   sym(1).Node = node;
 } break;
 
-case 286: {
+case 295: {
   AST::WhileStatement *node = makeAstNode<AST::WhileStatement> (driver->nodePool(), sym(3).Expression, sym(5).Statement);
   node->whileToken = loc(1);
   node->lparenToken = loc(2);
@@ -1416,7 +1469,7 @@ case 286: {
   sym(1).Node = node;
 } break;
 
-case 287: {
+case 296: {
   AST::ForStatement *node = makeAstNode<AST::ForStatement> (driver->nodePool(), sym(3).Expression,
     sym(5).Expression, sym(7).Expression, sym(9).Statement);
   node->forToken = loc(1);
@@ -1427,7 +1480,7 @@ case 287: {
   sym(1).Node = node;
 } break;
 
-case 288: {
+case 297: {
   AST::LocalForStatement *node = makeAstNode<AST::LocalForStatement> (driver->nodePool(),
      sym(4).VariableDeclarationList->finish (/*readOnly=*/false), sym(6).Expression,
      sym(8).Expression, sym(10).Statement);
@@ -1440,7 +1493,7 @@ case 288: {
   sym(1).Node = node;
 } break;
 
-case 289: {
+case 298: {
   AST:: ForEachStatement *node = makeAstNode<AST::ForEachStatement> (driver->nodePool(), sym(3).Expression,
     sym(5).Expression, sym(7).Statement);
   node->forToken = loc(1);
@@ -1450,7 +1503,7 @@ case 289: {
   sym(1).Node = node;
 } break;
 
-case 290: {
+case 299: {
   AST::LocalForEachStatement *node = makeAstNode<AST::LocalForEachStatement> (driver->nodePool(),
     sym(4).VariableDeclaration, sym(6).Expression, sym(8).Statement);
   node->forToken = loc(1);
@@ -1461,14 +1514,14 @@ case 290: {
   sym(1).Node = node;
 } break;
 
-case 292: {
+case 301: {
   AST::ContinueStatement *node = makeAstNode<AST::ContinueStatement> (driver->nodePool());
   node->continueToken = loc(1);
   node->semicolonToken = loc(2);
   sym(1).Node = node;
 } break;
 
-case 294: {
+case 303: {
   AST::ContinueStatement *node = makeAstNode<AST::ContinueStatement> (driver->nodePool(), sym(2).sval);
   node->continueToken = loc(1);
   node->identifierToken = loc(2);
@@ -1476,14 +1529,14 @@ case 294: {
   sym(1).Node = node;
 } break;
 
-case 296: {
+case 305: {
   AST::BreakStatement *node = makeAstNode<AST::BreakStatement> (driver->nodePool());
   node->breakToken = loc(1);
   node->semicolonToken = loc(2);
   sym(1).Node = node;
 } break;
 
-case 298: {
+case 307: {
   AST::BreakStatement *node = makeAstNode<AST::BreakStatement> (driver->nodePool(), sym(2).sval);
   node->breakToken = loc(1);
   node->identifierToken = loc(2);
@@ -1491,14 +1544,14 @@ case 298: {
   sym(1).Node = node;
 } break;
 
-case 300: {
+case 309: {
   AST::ReturnStatement *node = makeAstNode<AST::ReturnStatement> (driver->nodePool(), sym(2).Expression);
   node->returnToken = loc(1);
   node->semicolonToken = loc(3);
   sym(1).Node = node;
 } break;
 
-case 301: {
+case 310: {
   AST::WithStatement *node = makeAstNode<AST::WithStatement> (driver->nodePool(), sym(3).Expression, sym(5).Statement);
   node->withToken = loc(1);
   node->lparenToken = loc(2);
@@ -1506,7 +1559,7 @@ case 301: {
   sym(1).Node = node;
 } break;
 
-case 302: {
+case 311: {
   AST::SwitchStatement *node = makeAstNode<AST::SwitchStatement> (driver->nodePool(), sym(3).Expression, sym(5).CaseBlock);
   node->switchToken = loc(1);
   node->lparenToken = loc(2);
@@ -1514,90 +1567,90 @@ case 302: {
   sym(1).Node = node;
 } break;
 
-case 303: {
+case 312: {
   AST::CaseBlock *node = makeAstNode<AST::CaseBlock> (driver->nodePool(), sym(2).CaseClauses);
   node->lbraceToken = loc(1);
   node->rbraceToken = loc(3);
   sym(1).Node = node;
 } break;
 
-case 304: {
+case 313: {
   AST::CaseBlock *node = makeAstNode<AST::CaseBlock> (driver->nodePool(), sym(2).CaseClauses, sym(3).DefaultClause, sym(4).CaseClauses);
   node->lbraceToken = loc(1);
   node->rbraceToken = loc(5);
   sym(1).Node = node;
 } break;
 
-case 305: {
+case 314: {
   sym(1).Node = makeAstNode<AST::CaseClauses> (driver->nodePool(), sym(1).CaseClause);
 } break;
 
-case 306: {
+case 315: {
   sym(1).Node = makeAstNode<AST::CaseClauses> (driver->nodePool(), sym(1).CaseClauses, sym(2).CaseClause);
 } break;
 
-case 307: {
+case 316: {
   sym(1).Node = 0;
 } break;
 
-case 308: {
+case 317: {
   sym(1).Node = sym(1).CaseClauses->finish ();
 } break;
 
-case 309: {
+case 318: {
   AST::CaseClause *node = makeAstNode<AST::CaseClause> (driver->nodePool(), sym(2).Expression, sym(4).StatementList);
   node->caseToken = loc(1);
   node->colonToken = loc(3);
   sym(1).Node = node;
 } break;
 
-case 310: {
+case 319: {
   AST::DefaultClause *node = makeAstNode<AST::DefaultClause> (driver->nodePool(), sym(3).StatementList);
   node->defaultToken = loc(1);
   node->colonToken = loc(2);
   sym(1).Node = node;
 } break;
-case 311:
-case 312: {
+case 320:
+case 321: {
   AST::LabelledStatement *node = makeAstNode<AST::LabelledStatement> (driver->nodePool(), driver->intern(lexer->characterBuffer(), lexer->characterCount()), sym(3).Statement);
   node->identifierToken = loc(1);
   node->colonToken = loc(2);
   sym(1).Node = node;
 } break;
 
-case 313: {
+case 322: {
   AST::LabelledStatement *node = makeAstNode<AST::LabelledStatement> (driver->nodePool(), sym(1).sval, sym(3).Statement);
   node->identifierToken = loc(1);
   node->colonToken = loc(2);
   sym(1).Node = node;
 } break;
 
-case 315: {
+case 324: {
   AST::ThrowStatement *node = makeAstNode<AST::ThrowStatement> (driver->nodePool(), sym(2).Expression);
   node->throwToken = loc(1);
   node->semicolonToken = loc(3);
   sym(1).Node = node;
 } break;
 
-case 316: {
+case 325: {
   AST::TryStatement *node = makeAstNode<AST::TryStatement> (driver->nodePool(), sym(2).Statement, sym(3).Catch);
   node->tryToken = loc(1);
   sym(1).Node = node;
 } break;
 
-case 317: {
+case 326: {
   AST::TryStatement *node = makeAstNode<AST::TryStatement> (driver->nodePool(), sym(2).Statement, sym(3).Finally);
   node->tryToken = loc(1);
   sym(1).Node = node;
 } break;
 
-case 318: {
+case 327: {
   AST::TryStatement *node = makeAstNode<AST::TryStatement> (driver->nodePool(), sym(2).Statement, sym(3).Catch, sym(4).Finally);
   node->tryToken = loc(1);
   sym(1).Node = node;
 } break;
 
-case 319: {
+case 328: {
   AST::Catch *node = makeAstNode<AST::Catch> (driver->nodePool(), sym(3).sval, sym(5).Block);
   node->catchToken = loc(1);
   node->lparenToken = loc(2);
@@ -1606,20 +1659,20 @@ case 319: {
   sym(1).Node = node;
 } break;
 
-case 320: {
+case 329: {
   AST::Finally *node = makeAstNode<AST::Finally> (driver->nodePool(), sym(2).Block);
   node->finallyToken = loc(1);
   sym(1).Node = node;
 } break;
 
-case 322: {
+case 331: {
   AST::DebuggerStatement *node = makeAstNode<AST::DebuggerStatement> (driver->nodePool());
   node->debuggerToken = loc(1);
   node->semicolonToken = loc(2);
   sym(1).Node = node;
 } break;
 
-case 323: {
+case 332: {
   AST::FunctionDeclaration *node = makeAstNode<AST::FunctionDeclaration> (driver->nodePool(), sym(2).sval, sym(4).FormalParameterList, sym(7).FunctionBody);
   node->functionToken = loc(1);
   node->identifierToken = loc(2);
@@ -1630,7 +1683,7 @@ case 323: {
   sym(1).Node = node;
 } break;
 
-case 324: {
+case 333: {
   AST::FunctionExpression *node = makeAstNode<AST::FunctionExpression> (driver->nodePool(), sym(2).sval, sym(4).FormalParameterList, sym(7).FunctionBody);
   node->functionToken = loc(1);
   if (sym(2).sval)
@@ -1642,56 +1695,56 @@ case 324: {
   sym(1).Node = node;
 } break;
 
-case 325: {
+case 334: {
   AST::FormalParameterList *node = makeAstNode<AST::FormalParameterList> (driver->nodePool(), sym(1).sval);
   node->identifierToken = loc(1);
   sym(1).Node = node;
 } break;
 
-case 326: {
+case 335: {
   AST::FormalParameterList *node = makeAstNode<AST::FormalParameterList> (driver->nodePool(), sym(1).FormalParameterList, sym(3).sval);
   node->commaToken = loc(2);
   node->identifierToken = loc(3);
   sym(1).Node = node;
 } break;
 
-case 327: {
+case 336: {
   sym(1).Node = 0;
 } break;
 
-case 328: {
+case 337: {
   sym(1).Node = sym(1).FormalParameterList->finish ();
 } break;
 
-case 329: {
+case 338: {
   sym(1).Node = 0;
 } break;
 
-case 331: {
+case 340: {
   sym(1).Node = makeAstNode<AST::FunctionBody> (driver->nodePool(), sym(1).SourceElements->finish ());
 } break;
 
-case 332: {
+case 341: {
   sym(1).Node = makeAstNode<AST::SourceElements> (driver->nodePool(), sym(1).SourceElement);
 } break;
 
-case 333: {
+case 342: {
   sym(1).Node = makeAstNode<AST::SourceElements> (driver->nodePool(), sym(1).SourceElements, sym(2).SourceElement);
 } break;
 
-case 334: {
+case 343: {
   sym(1).Node = makeAstNode<AST::StatementSourceElement> (driver->nodePool(), sym(1).Statement);
 } break;
 
-case 335: {
+case 344: {
   sym(1).Node = makeAstNode<AST::FunctionSourceElement> (driver->nodePool(), sym(1).FunctionDeclaration);
 } break;
 
-case 336: {
+case 345: {
   sym(1).sval = 0;
 } break;
 
-case 338: {
+case 347: {
   sym(1).Node = 0;
 } break;
 
diff --git a/src/plugins/duieditor/parser/qmljsparser_p.h b/src/plugins/duieditor/parser/qmljsparser_p.h
index 92730399524..e352f4371fd 100644
--- a/src/plugins/duieditor/parser/qmljsparser_p.h
+++ b/src/plugins/duieditor/parser/qmljsparser_p.h
@@ -120,6 +120,9 @@ public:
       AST::UiObjectMemberList *UiObjectMemberList;
       AST::UiArrayMemberList *UiArrayMemberList;
       AST::UiQualifiedId *UiQualifiedId;
+      AST::UiSignature *UiSignature;
+      AST::UiFormalList *UiFormalList;
+      AST::UiFormal *UiFormal;
     };
 
 public:
@@ -219,9 +222,9 @@ protected:
 
 
 
-#define J_SCRIPT_REGEXPLITERAL_RULE1 72
+#define J_SCRIPT_REGEXPLITERAL_RULE1 81
 
-#define J_SCRIPT_REGEXPLITERAL_RULE2 73
+#define J_SCRIPT_REGEXPLITERAL_RULE2 82
 
 QT_END_NAMESPACE
 
-- 
GitLab