QmlJS: Update to new QmlJS parser.

UiPublicMember is now initialized with a statement.

30 files changed, 1112 insertions, 1021 deletions

diff --git a/src/libs/qmljs/parser/changeLicense.py b/src/libs/qmljs/parser/changeLicense.py
new file mode 100755
index 0000000000..b10ebbc938
--- /dev/null
+++ b/src/libs/qmljs/parser/changeLicense.py
@@ -0,0 +1,24 @@
+#!/usr/bin/python
+import sys
+import os
+
+if not len(sys.argv) >= 3:
+   print("Usage: %s license files..." % os.path.basename(sys.argv[0]))
+   sys.exit()
+
+licenseFileName = sys.argv[1]
+licenseText = ""
+with open(licenseFileName, 'r') as f:
+    licenseText = f.read()
+    licenseText = licenseText[0:licenseText.find('*/')]
+
+files = sys.argv[2:]
+for fileName in files:
+    with open(fileName, 'r') as f:
+        text = f.read()
+    oldEnd = text.find('*/')
+    if oldEnd == -1:
+        oldEnd = 0
+    text = licenseText + text[oldEnd:]
+    with open(fileName, 'w') as f:
+        f.write(text)
diff --git a/src/libs/qmljs/parser/gen-parser.sh b/src/libs/qmljs/parser/gen-parser.sh
index acd6a19ce7..1565e26915 100755
--- a/src/libs/qmljs/parser/gen-parser.sh
+++ b/src/libs/qmljs/parser/gen-parser.sh
@@ -12,3 +12,7 @@ done
 
 # export QmlDirParser
 perl -p -0777 -i -e 's/QT_BEGIN_NAMESPACE\n\nclass QmlError;\nclass QmlDirParser/#include "qmljsglobal_p.h"\n\nQT_BEGIN_NAMESPACE\n\nclass QmlError;\nclass QML_PARSER_EXPORT QmlDirParser/' qmldirparser_p.h
+
+./changeLicense.py $me/../qmljs_global.h qml*.{cpp,h}
+
+echo "Fix licenses in qmljs.g!"
diff --git a/src/libs/qmljs/parser/qmldirparser.cpp b/src/libs/qmljs/parser/qmldirparser.cpp
index c8b67ddc1d..5bb1061739 100644
--- a/src/libs/qmljs/parser/qmldirparser.cpp
+++ b/src/libs/qmljs/parser/qmldirparser.cpp
@@ -6,6 +6,7 @@
 **
 ** Contact: Nokia Corporation (info@qt.nokia.com)
 **
+**
 ** GNU Lesser General Public License Usage
 **
 ** This file may be used under the terms of the GNU Lesser General Public
@@ -132,7 +133,7 @@ bool QmlDirParser::parse()
         } else if (sections[0] == QLatin1String("plugin")) {
             if (sectionCount < 2) {
                 reportError(lineNumber, -1,
-                            QString::fromUtf8("plugin directive requires 2 arguments, but %1 were provided").arg(sectionCount + 1));
+                            QString::fromUtf8("plugin directive requires one or two arguments, but %1 were provided").arg(sectionCount - 1));
 
                 continue;
             }
@@ -144,12 +145,22 @@ bool QmlDirParser::parse()
         } else if (sections[0] == QLatin1String("internal")) {
             if (sectionCount != 3) {
                 reportError(lineNumber, -1,
-                            QString::fromUtf8("internal types require 2 arguments, but %1 were provided").arg(sectionCount + 1));
+                            QString::fromUtf8("internal types require 2 arguments, but %1 were provided").arg(sectionCount - 1));
                 continue;
             }
             Component entry(sections[1], sections[2], -1, -1);
             entry.internal = true;
             _components.append(entry);
+        } else if (sections[0] == QLatin1String("typeinfo")) {
+            if (sectionCount != 2) {
+                reportError(lineNumber, -1,
+                            QString::fromUtf8("typeinfo requires 1 argument, but %1 were provided").arg(sectionCount - 1));
+                continue;
+            }
+#ifdef QT_CREATOR
+            TypeInfo typeInfo(sections[1]);
+            _typeInfos.append(typeInfo);
+#endif
 
         } else if (sectionCount == 2) {
             // No version specified (should only be used for relative qmldir files)
@@ -179,7 +190,7 @@ bool QmlDirParser::parse()
             }
         } else {
             reportError(lineNumber, -1, 
-                        QString::fromUtf8("a component declaration requires 3 arguments, but %1 were provided").arg(sectionCount + 1));
+                        QString::fromUtf8("a component declaration requires two or three arguments, but %1 were provided").arg(sectionCount));
         }
     }
 
@@ -219,4 +230,11 @@ QList<QmlDirParser::Component> QmlDirParser::components() const
     return _components;
 }
 
+#ifdef QT_CREATOR
+QList<QmlDirParser::TypeInfo> QmlDirParser::typeInfos() const
+{
+    return _typeInfos;
+}
+#endif
+
 QT_END_NAMESPACE
diff --git a/src/libs/qmljs/parser/qmldirparser_p.h b/src/libs/qmljs/parser/qmldirparser_p.h
index 294f410508..bdae66fe6f 100644
--- a/src/libs/qmljs/parser/qmldirparser_p.h
+++ b/src/libs/qmljs/parser/qmldirparser_p.h
@@ -6,6 +6,7 @@
 **
 ** Contact: Nokia Corporation (info@qt.nokia.com)
 **
+**
 ** GNU Lesser General Public License Usage
 **
 ** This file may be used under the terms of the GNU Lesser General Public
@@ -101,6 +102,19 @@ public:
     QList<Component> components() const;
     QList<Plugin> plugins() const;
 
+#ifdef QT_CREATOR
+    struct TypeInfo
+    {
+        TypeInfo() {}
+        TypeInfo(const QString &fileName)
+            : fileName(fileName) {}
+
+        QString fileName;
+    };
+
+    QList<TypeInfo> typeInfos() const;
+#endif
+
 private:
     void reportError(int line, int column, const QString &message);
 
@@ -110,6 +124,9 @@ private:
     QString _source;
     QList<Component> _components;
     QList<Plugin> _plugins;
+#ifdef QT_CREATOR
+    QList<TypeInfo> _typeInfos;
+#endif
     unsigned _isParsed: 1;
 };
 
diff --git a/src/libs/qmljs/parser/qmlerror.cpp b/src/libs/qmljs/parser/qmlerror.cpp
index f934391dbe..636c2041b8 100644
--- a/src/libs/qmljs/parser/qmlerror.cpp
+++ b/src/libs/qmljs/parser/qmlerror.cpp
@@ -6,6 +6,7 @@
 **
 ** Contact: Nokia Corporation (info@qt.nokia.com)
 **
+**
 ** GNU Lesser General Public License Usage
 **
 ** This file may be used under the terms of the GNU Lesser General Public
diff --git a/src/libs/qmljs/parser/qmlerror.h b/src/libs/qmljs/parser/qmlerror.h
index 8f07ece021..80f2497c95 100644
--- a/src/libs/qmljs/parser/qmlerror.h
+++ b/src/libs/qmljs/parser/qmlerror.h
@@ -6,6 +6,7 @@
 **
 ** Contact: Nokia Corporation (info@qt.nokia.com)
 **
+**
 ** GNU Lesser General Public License Usage
 **
 ** This file may be used under the terms of the GNU Lesser General Public
diff --git a/src/libs/qmljs/parser/qmljs.g b/src/libs/qmljs/parser/qmljs.g
index 7536e3e8e3..2cae72fa9e 100644
--- a/src/libs/qmljs/parser/qmljs.g
+++ b/src/libs/qmljs/parser/qmljs.g
@@ -6,6 +6,7 @@
 --
 -- Contact: Nokia Corporation (info@qt.nokia.com)
 --
+--
 -- GNU Lesser General Public License Usage
 --
 -- This file may be used under the terms of the GNU Lesser General Public
@@ -97,6 +98,7 @@
 **
 ** Contact: Nokia Corporation (info@qt.nokia.com)
 **
+**
 ** GNU Lesser General Public License Usage
 **
 ** This file may be used under the terms of the GNU Lesser General Public
@@ -120,7 +122,6 @@
 **
 **************************************************************************/
 
-
 #include <QtCore/QtDebug>
 #include <QtGui/QApplication>
 
@@ -141,6 +142,7 @@
 **
 ** Contact: Nokia Corporation (info@qt.nokia.com)
 **
+**
 ** GNU Lesser General Public License Usage
 **
 ** This file may be used under the terms of the GNU Lesser General Public
@@ -165,7 +167,6 @@
 **************************************************************************/
 
 
-
 //
 //  W A R N I N G
 //  -------------
@@ -772,19 +773,14 @@ case $rule_number: {
 } break;
 ./
 
-UiObjectMember: UiQualifiedId T_COLON Block ;
-/.case $rule_number:./
-
-UiObjectMember: UiQualifiedId T_COLON EmptyStatement ;
-/.case $rule_number:./
-
-UiObjectMember: UiQualifiedId T_COLON ExpressionStatement ;
-/.case $rule_number:./
-
-UiObjectMember: UiQualifiedId T_COLON IfStatement ; --- ### do we really want if statement in a binding?
-/.case $rule_number:./
+UiScriptStatement: Block ;
+UiScriptStatement: EmptyStatement ;
+UiScriptStatement: ExpressionStatement ;
+UiScriptStatement: IfStatement ;  --- ### do we really want if statement in a binding?
 
+UiObjectMember: UiQualifiedId T_COLON UiScriptStatement ;
 /.
+case $rule_number:
 {
     AST::UiScriptBinding *node = makeAstNode<AST::UiScriptBinding> (driver->nodePool(),
         sym(1).UiQualifiedId, sym(3).Statement);
@@ -912,51 +908,45 @@ case $rule_number: {
 }   break;
 ./
 
-UiObjectMember: T_PROPERTY UiPropertyType JsIdentifier T_COLON Expression T_AUTOMATIC_SEMICOLON ;
-UiObjectMember: T_PROPERTY UiPropertyType JsIdentifier T_COLON Expression T_SEMICOLON ;
+UiObjectMember: T_PROPERTY UiPropertyType JsIdentifier T_COLON UiScriptStatement ;
 /.
 case $rule_number: {
     AST::UiPublicMember *node = makeAstNode<AST::UiPublicMember> (driver->nodePool(), sym(2).sval, sym(3).sval,
-        sym(5).Expression);
+        sym(5).Statement);
     node->propertyToken = loc(1);
     node->typeToken = loc(2);
     node->identifierToken = loc(3);
     node->colonToken = loc(4);
-    node->semicolonToken = loc(6);
     sym(1).Node = node;
 }   break;
 ./
 
-UiObjectMember: T_READONLY T_PROPERTY UiPropertyType JsIdentifier T_COLON Expression T_AUTOMATIC_SEMICOLON ;
-UiObjectMember: T_READONLY T_PROPERTY UiPropertyType JsIdentifier T_COLON Expression T_SEMICOLON ;
+UiObjectMember: T_READONLY T_PROPERTY UiPropertyType JsIdentifier T_COLON UiScriptStatement ;
 /.
 case $rule_number: {
     AST::UiPublicMember *node = makeAstNode<AST::UiPublicMember> (driver->nodePool(), sym(3).sval, sym(4).sval,
-        sym(6).Expression);
+        sym(6).Statement);
     node->isReadonlyMember = true;
     node->readonlyToken = loc(1);
     node->propertyToken = loc(2);
     node->typeToken = loc(3);
     node->identifierToken = loc(4);
     node->colonToken = loc(5);
-    node->semicolonToken = loc(7);
     sym(1).Node = node;
 }   break;
 ./
 
-UiObjectMember: T_DEFAULT T_PROPERTY UiPropertyType JsIdentifier T_COLON Expression T_AUTOMATIC_SEMICOLON ;
-UiObjectMember: T_DEFAULT T_PROPERTY UiPropertyType JsIdentifier T_COLON Expression T_SEMICOLON ;
+UiObjectMember: T_DEFAULT T_PROPERTY UiPropertyType JsIdentifier T_COLON UiScriptStatement ;
 /.
 case $rule_number: {
     AST::UiPublicMember *node = makeAstNode<AST::UiPublicMember> (driver->nodePool(), sym(3).sval, sym(4).sval,
-        sym(6).Expression);
+        sym(6).Statement);
     node->isDefaultMember = true;
     node->defaultToken = loc(1);
     node->propertyToken = loc(2);
     node->typeToken = loc(3);
     node->identifierToken = loc(4);
     node->colonToken = loc(5);
-    node->semicolonToken = loc(7);
     sym(1).Node = node;
 }   break;
 ./
diff --git a/src/libs/qmljs/parser/qmljsast.cpp b/src/libs/qmljs/parser/qmljsast.cpp
index 620f62f826..2ed9afb922 100644
--- a/src/libs/qmljs/parser/qmljsast.cpp
+++ b/src/libs/qmljs/parser/qmljsast.cpp
@@ -6,6 +6,7 @@
 **
 ** Contact: Nokia Corporation (info@qt.nokia.com)
 **
+**
 ** GNU Lesser General Public License Usage
 **
 ** This file may be used under the terms of the GNU Lesser General Public
@@ -826,7 +827,7 @@ void UiFormal::accept0(Visitor *visitor)
 void UiPublicMember::accept0(Visitor *visitor)
 {
     if (visitor->visit(this)) {
-        accept(expression, visitor);
+        accept(statement, visitor);
         accept(binding, visitor);
     }
 
diff --git a/src/libs/qmljs/parser/qmljsast_p.h b/src/libs/qmljs/parser/qmljsast_p.h
index f32f4592b4..1c3f270129 100644
--- a/src/libs/qmljs/parser/qmljsast_p.h
+++ b/src/libs/qmljs/parser/qmljsast_p.h
@@ -6,6 +6,7 @@
 **
 ** Contact: Nokia Corporation (info@qt.nokia.com)
 **
+**
 ** GNU Lesser General Public License Usage
 **
 ** This file may be used under the terms of the GNU Lesser General Public
@@ -2332,13 +2333,13 @@ public:
 
     UiPublicMember(NameId *memberType,
                    NameId *name)
-        : type(Property), typeModifier(0), memberType(memberType), name(name), expression(0), binding(0), isDefaultMember(false), isReadonlyMember(false), parameters(0)
+        : type(Property), typeModifier(0), memberType(memberType), name(name), statement(0), binding(0), isDefaultMember(false), isReadonlyMember(false), parameters(0)
     { kind = K; }
 
     UiPublicMember(NameId *memberType,
                    NameId *name,
-                   ExpressionNode *expression)
-        : type(Property), typeModifier(0), memberType(memberType), name(name), expression(expression), binding(0), isDefaultMember(false), isReadonlyMember(false), parameters(0)
+                   Statement *statement)
+        : type(Property), typeModifier(0), memberType(memberType), name(name), statement(statement), binding(0), isDefaultMember(false), isReadonlyMember(false), parameters(0)
     { kind = K; }
 
     virtual SourceLocation firstSourceLocation() const
@@ -2366,7 +2367,7 @@ public:
     NameId *typeModifier;
     NameId *memberType;
     NameId *name;
-    ExpressionNode *expression; // initialized with a JS expression
+    Statement *statement; // initialized with a JS expression
     UiObjectMember *binding; // initialized with a QML object or array.
     bool isDefaultMember;
     bool isReadonlyMember;
diff --git a/src/libs/qmljs/parser/qmljsastfwd_p.h b/src/libs/qmljs/parser/qmljsastfwd_p.h
index 7bb82b3269..7e063fa8c4 100644
--- a/src/libs/qmljs/parser/qmljsastfwd_p.h
+++ b/src/libs/qmljs/parser/qmljsastfwd_p.h
@@ -6,6 +6,7 @@
 **
 ** Contact: Nokia Corporation (info@qt.nokia.com)
 **
+**
 ** GNU Lesser General Public License Usage
 **
 ** This file may be used under the terms of the GNU Lesser General Public
diff --git a/src/libs/qmljs/parser/qmljsastvisitor.cpp b/src/libs/qmljs/parser/qmljsastvisitor.cpp
index a365918abc..e067927635 100644
--- a/src/libs/qmljs/parser/qmljsastvisitor.cpp
+++ b/src/libs/qmljs/parser/qmljsastvisitor.cpp
@@ -6,6 +6,7 @@
 **
 ** Contact: Nokia Corporation (info@qt.nokia.com)
 **
+**
 ** GNU Lesser General Public License Usage
 **
 ** This file may be used under the terms of the GNU Lesser General Public
diff --git a/src/libs/qmljs/parser/qmljsastvisitor_p.h b/src/libs/qmljs/parser/qmljsastvisitor_p.h
index 2f91f88728..f8aead108d 100644
--- a/src/libs/qmljs/parser/qmljsastvisitor_p.h
+++ b/src/libs/qmljs/parser/qmljsastvisitor_p.h
@@ -6,6 +6,7 @@
 **
 ** Contact: Nokia Corporation (info@qt.nokia.com)
 **
+**
 ** GNU Lesser General Public License Usage
 **
 ** This file may be used under the terms of the GNU Lesser General Public
diff --git a/src/libs/qmljs/parser/qmljsengine_p.cpp b/src/libs/qmljs/parser/qmljsengine_p.cpp
index d7bc386314..a562bc9aae 100644
--- a/src/libs/qmljs/parser/qmljsengine_p.cpp
+++ b/src/libs/qmljs/parser/qmljsengine_p.cpp
@@ -6,6 +6,7 @@
 **
 ** Contact: Nokia Corporation (info@qt.nokia.com)
 **
+**
 ** GNU Lesser General Public License Usage
 **
 ** This file may be used under the terms of the GNU Lesser General Public
diff --git a/src/libs/qmljs/parser/qmljsengine_p.h b/src/libs/qmljs/parser/qmljsengine_p.h
index 2239d29da9..bc601aff51 100644
--- a/src/libs/qmljs/parser/qmljsengine_p.h
+++ b/src/libs/qmljs/parser/qmljsengine_p.h
@@ -6,6 +6,7 @@
 **
 ** Contact: Nokia Corporation (info@qt.nokia.com)
 **
+**
 ** GNU Lesser General Public License Usage
 **
 ** This file may be used under the terms of the GNU Lesser General Public
@@ -78,12 +79,6 @@ uint qHash(const QmlJS::NameId &id);
 
 } // end of namespace QmlJS
 
-#if defined(Q_CC_MSVC) && _MSC_VER <= 1300
-//this ensures that code outside QmlJS can use the hash function
-//it also a workaround for some compilers
-inline uint qHash(const QmlJS::NameId &nameId) { return QmlJS::qHash(nameId); }
-#endif
-
 namespace QmlJS {
 
 class Lexer;
diff --git a/src/libs/qmljs/parser/qmljsglobal_p.h b/src/libs/qmljs/parser/qmljsglobal_p.h
index 4505135428..334a075f16 100644
--- a/src/libs/qmljs/parser/qmljsglobal_p.h
+++ b/src/libs/qmljs/parser/qmljsglobal_p.h
@@ -6,6 +6,7 @@
 **
 ** Contact: Nokia Corporation (info@qt.nokia.com)
 **
+**
 ** GNU Lesser General Public License Usage
 **
 ** This file may be used under the terms of the GNU Lesser General Public
@@ -28,7 +29,6 @@
 ** Nokia at info@qt.nokia.com.
 **
 **************************************************************************/
-
 #ifndef QMLJSGLOBAL_P_H
 #define QMLJSGLOBAL_P_H
 
@@ -49,7 +49,7 @@
 #else // !QT_CREATOR
 #  define QT_QML_BEGIN_NAMESPACE QT_BEGIN_NAMESPACE
 #  define QT_QML_END_NAMESPACE QT_END_NAMESPACE
-#  define QML_PARSER_EXPORT
+#  define QML_PARSER_EXPORT Q_AUTOTEST_EXPORT
 #endif // QT_CREATOR
 
 #endif // QMLJSGLOBAL_P_H
diff --git a/src/libs/qmljs/parser/qmljsgrammar.cpp b/src/libs/qmljs/parser/qmljsgrammar.cpp
index 3f06e7f3b8..f39ba2daa3 100644
--- a/src/libs/qmljs/parser/qmljsgrammar.cpp
+++ b/src/libs/qmljs/parser/qmljsgrammar.cpp
@@ -6,6 +6,7 @@
 **
 ** Contact: Nokia Corporation (info@qt.nokia.com)
 **
+**
 ** GNU Lesser General Public License Usage
 **
 ** This file may be used under the terms of the GNU Lesser General Public
@@ -51,462 +52,469 @@ const short QmlJSGrammar::lhs [] = {
   101, 101, 101, 101, 101, 101, 102, 108, 108, 111, 
   111, 113, 112, 112, 112, 112, 112, 112, 112, 112, 
   115, 110, 109, 118, 118, 119, 119, 120, 120, 117, 
-  106, 106, 106, 106, 106, 106, 106, 106, 126, 126, 
-  126, 127, 127, 128, 128, 106, 106, 106, 106, 106, 
+  106, 106, 106, 106, 122, 122, 122, 122, 106, 127, 
+  127, 127, 128, 128, 129, 129, 106, 106, 106, 106, 
   106, 106, 106, 106, 106, 106, 106, 106, 106, 106, 
-  106, 106, 106, 106, 106, 116, 116, 116, 116, 116, 
-  131, 131, 131, 131, 131, 131, 131, 131, 131, 131, 
-  131, 131, 131, 131, 131, 131, 131, 131, 121, 133, 
-  133, 133, 133, 132, 132, 135, 135, 137, 137, 137, 
-  137, 137, 137, 138, 138, 138, 138, 138, 138, 138, 
-  138, 138, 138, 138, 138, 138, 138, 138, 138, 138, 
-  138, 138, 138, 138, 138, 138, 138, 138, 138, 138, 
-  138, 138, 138, 138, 139, 139, 114, 114, 114, 114, 
-  114, 142, 142, 143, 143, 143, 143, 141, 141, 144, 
-  144, 145, 145, 146, 146, 146, 147, 147, 147, 147, 
-  147, 147, 147, 147, 147, 147, 148, 148, 148, 148, 
-  149, 149, 149, 150, 150, 150, 150, 151, 151, 151, 
-  151, 151, 151, 151, 152, 152, 152, 152, 152, 152, 
-  153, 153, 153, 153, 153, 154, 154, 154, 154, 154, 
-  155, 155, 156, 156, 157, 157, 158, 158, 159, 159, 
-  160, 160, 161, 161, 162, 162, 163, 163, 164, 164, 
-  165, 165, 166, 166, 136, 136, 167, 167, 168, 168, 
-  168, 168, 168, 168, 168, 168, 168, 168, 168, 168, 
-  104, 104, 169, 169, 170, 170, 171, 171, 103, 103, 
+  106, 106, 106, 116, 116, 116, 116, 116, 132, 132, 
+  132, 132, 132, 132, 132, 132, 132, 132, 132, 132, 
+  132, 132, 132, 132, 132, 132, 121, 134, 134, 134, 
+  134, 133, 133, 136, 136, 138, 138, 138, 138, 138, 
+  138, 139, 139, 139, 139, 139, 139, 139, 139, 139, 
+  139, 139, 139, 139, 139, 139, 139, 139, 139, 139, 
+  139, 139, 139, 139, 139, 139, 139, 139, 139, 139, 
+  139, 139, 140, 140, 114, 114, 114, 114, 114, 143, 
+  143, 144, 144, 144, 144, 142, 142, 145, 145, 146, 
+  146, 147, 147, 147, 148, 148, 148, 148, 148, 148, 
+  148, 148, 148, 148, 149, 149, 149, 149, 150, 150, 
+  150, 151, 151, 151, 151, 152, 152, 152, 152, 152, 
+  152, 152, 153, 153, 153, 153, 153, 153, 154, 154, 
+  154, 154, 154, 155, 155, 155, 155, 155, 156, 156, 
+  157, 157, 158, 158, 159, 159, 160, 160, 161, 161, 
+  162, 162, 163, 163, 164, 164, 165, 165, 166, 166, 
+  167, 167, 137, 137, 168, 168, 169, 169, 169, 169, 
+  169, 169, 169, 169, 169, 169, 169, 169, 104, 104, 
+  170, 170, 171, 171, 172, 172, 103, 103, 103, 103, 
   103, 103, 103, 103, 103, 103, 103, 103, 103, 103, 
-  103, 103, 103, 122, 183, 183, 182, 182, 130, 130, 
-  184, 184, 185, 185, 187, 187, 186, 188, 191, 189, 
-  189, 192, 190, 190, 123, 124, 124, 125, 125, 172, 
-  172, 172, 172, 172, 172, 172, 173, 173, 173, 173, 
-  174, 174, 174, 174, 175, 175, 176, 178, 193, 193, 
-  196, 196, 194, 194, 197, 195, 177, 177, 177, 179, 
-  179, 180, 180, 180, 198, 199, 181, 181, 129, 140, 
-  203, 203, 200, 200, 201, 201, 204, 107, 205, 205, 
-  105, 105, 202, 202, 134, 134, 206};
+  103, 123, 184, 184, 183, 183, 131, 131, 185, 185, 
+  186, 186, 188, 188, 187, 189, 192, 190, 190, 193, 
+  191, 191, 124, 125, 125, 126, 126, 173, 173, 173, 
+  173, 173, 173, 173, 174, 174, 174, 174, 175, 175, 
+  175, 175, 176, 176, 177, 179, 194, 194, 197, 197, 
+  195, 195, 198, 196, 178, 178, 178, 180, 180, 181, 
+  181, 181, 199, 200, 182, 182, 130, 141, 204, 204, 
+  201, 201, 202, 202, 205, 107, 206, 206, 105, 105, 
+  203, 203, 135, 135, 207};
 
 const short QmlJSGrammar::rhs [] = {
   2, 2, 2, 2, 2, 2, 2, 1, 1, 1, 
   2, 1, 2, 2, 3, 3, 5, 5, 4, 4, 
   2, 0, 1, 1, 2, 1, 3, 2, 3, 2, 
-  1, 5, 4, 4, 3, 3, 3, 3, 1, 1, 
-  1, 0, 1, 2, 4, 6, 6, 3, 3, 7, 
-  7, 4, 4, 5, 5, 6, 6, 7, 7, 7, 
-  7, 10, 6, 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, 1, 
-  2, 3, 4, 1, 2, 3, 5, 1, 1, 1, 
+  1, 5, 4, 4, 1, 1, 1, 1, 3, 1, 
+  1, 1, 0, 1, 2, 4, 6, 6, 3, 3, 
+  7, 7, 4, 4, 5, 5, 5, 6, 6, 10, 
+  6, 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, 1, 2, 3, 
+  4, 1, 2, 3, 5, 1, 1, 1, 1, 1, 
   1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 
   1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 
   1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 
-  1, 1, 1, 1, 1, 1, 1, 1, 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, 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, 5, 1, 5, 1, 3, 1, 3, 1, 1, 
+  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, 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, 1, 2, 
-  1, 1, 0, 1, 0, 1, 2};
+  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, 1, 2, 1, 1, 
+  0, 1, 0, 1, 2};
 
 const short QmlJSGrammar::action_default [] = {
-  0, 0, 0, 0, 0, 0, 22, 0, 174, 241, 
-  205, 213, 209, 153, 225, 201, 3, 138, 72, 154, 
-  217, 221, 142, 171, 152, 157, 137, 191, 178, 0, 
-  79, 80, 75, 343, 66, 345, 0, 0, 0, 0, 
-  77, 0, 0, 73, 76, 70, 0, 0, 67, 69, 
-  68, 78, 71, 0, 74, 0, 0, 167, 0, 0, 
-  154, 173, 156, 155, 0, 0, 0, 169, 170, 168, 
-  172, 0, 202, 0, 0, 0, 0, 192, 0, 0, 
-  0, 0, 0, 0, 182, 0, 0, 0, 176, 177, 
-  175, 180, 184, 183, 181, 179, 194, 193, 195, 0, 
-  210, 0, 206, 0, 0, 148, 135, 147, 136, 104, 
-  105, 106, 131, 107, 132, 108, 109, 110, 111, 112, 
-  113, 114, 115, 116, 117, 118, 119, 120, 133, 121, 
-  122, 123, 124, 125, 126, 127, 128, 129, 130, 134, 
-  0, 0, 146, 242, 149, 0, 150, 0, 151, 145, 
-  0, 238, 231, 229, 236, 237, 235, 234, 240, 233, 
-  232, 230, 239, 226, 0, 214, 0, 0, 218, 0, 
-  0, 222, 0, 0, 148, 140, 0, 139, 0, 144, 
-  158, 0, 344, 333, 334, 0, 331, 0, 332, 0, 
-  335, 249, 256, 255, 263, 251, 0, 252, 336, 0, 
-  342, 253, 254, 259, 257, 339, 337, 341, 260, 0, 
-  271, 0, 0, 0, 0, 343, 66, 0, 345, 67, 
-  243, 285, 68, 0, 0, 0, 272, 0, 0, 261, 
-  262, 0, 250, 258, 286, 287, 330, 340, 0, 301, 
-  302, 303, 304, 0, 297, 298, 299, 300, 327, 328, 
-  0, 0, 0, 0, 0, 290, 291, 247, 245, 207, 
-  215, 211, 227, 203, 248, 0, 154, 219, 223, 196, 
-  185, 0, 0, 204, 0, 0, 0, 0, 197, 0, 
-  0, 0, 0, 0, 189, 187, 190, 188, 186, 199, 
-  198, 200, 0, 212, 0, 208, 0, 246, 154, 0, 
-  228, 243, 244, 0, 243, 0, 0, 293, 0, 0, 
-  0, 295, 0, 216, 0, 0, 220, 0, 0, 224, 
-  283, 0, 275, 284, 278, 0, 282, 0, 243, 276, 
-  0, 243, 0, 0, 294, 0, 0, 0, 296, 344, 
-  333, 0, 0, 335, 0, 329, 0, 319, 0, 0, 
-  0, 289, 0, 288, 0, 346, 0, 103, 265, 268, 
-  0, 104, 271, 107, 132, 109, 110, 75, 114, 115, 
-  66, 116, 119, 73, 76, 67, 243, 68, 78, 122, 
-  71, 124, 74, 126, 127, 272, 129, 130, 134, 0, 
-  96, 0, 0, 98, 102, 100, 87, 99, 101, 0, 
-  97, 86, 266, 264, 142, 143, 148, 0, 141, 0, 
-  318, 0, 305, 306, 0, 317, 0, 0, 0, 308, 
-  313, 311, 314, 0, 0, 312, 313, 0, 309, 0, 
-  310, 267, 316, 0, 267, 315, 0, 320, 321, 0, 
-  267, 322, 323, 0, 0, 324, 0, 0, 0, 325, 
-  326, 160, 159, 0, 0, 0, 292, 0, 0, 0, 
-  307, 280, 273, 0, 281, 277, 0, 279, 269, 0, 
-  270, 274, 90, 0, 0, 94, 81, 0, 83, 92, 
-  0, 84, 93, 95, 85, 91, 82, 0, 88, 164, 
-  162, 166, 163, 161, 165, 6, 338, 4, 2, 64, 
-  89, 0, 0, 67, 69, 68, 31, 5, 0, 65, 
-  0, 41, 40, 39, 0, 0, 54, 0, 55, 0, 
-  60, 61, 0, 41, 0, 0, 0, 0, 0, 50, 
-  0, 51, 0, 0, 26, 0, 0, 62, 27, 0, 
-  30, 28, 24, 0, 29, 25, 0, 52, 0, 53, 
-  0, 142, 0, 56, 57, 63, 0, 0, 0, 0, 
-  0, 58, 59, 0, 48, 42, 49, 43, 0, 0, 
-  0, 0, 45, 0, 46, 47, 44, 0, 0, 35, 
-  36, 37, 38, 142, 267, 0, 0, 104, 271, 107, 
-  132, 109, 110, 75, 114, 115, 66, 116, 119, 73, 
-  76, 67, 243, 68, 78, 122, 71, 124, 74, 126, 
-  127, 272, 129, 130, 134, 0, 32, 33, 0, 34, 
-  8, 0, 10, 0, 9, 0, 1, 21, 12, 0, 
-  13, 0, 14, 0, 19, 20, 0, 15, 16, 0, 
-  17, 18, 11, 23, 7, 347};
+  0, 0, 0, 0, 0, 0, 22, 0, 172, 239, 
+  203, 211, 207, 151, 223, 199, 3, 136, 70, 152, 
+  215, 219, 140, 169, 150, 155, 135, 189, 176, 0, 
+  77, 78, 73, 341, 64, 343, 0, 0, 0, 0, 
+  75, 0, 0, 71, 74, 68, 0, 0, 65, 67, 
+  66, 76, 69, 0, 72, 0, 0, 165, 0, 0, 
+  152, 171, 154, 153, 0, 0, 0, 167, 168, 166, 
+  170, 0, 200, 0, 0, 0, 0, 190, 0, 0, 
+  0, 0, 0, 0, 180, 0, 0, 0, 174, 175, 
+  173, 178, 182, 181, 179, 177, 192, 191, 193, 0, 
+  208, 0, 204, 0, 0, 146, 133, 145, 134, 102, 
+  103, 104, 129, 105, 130, 106, 107, 108, 109, 110, 
+  111, 112, 113, 114, 115, 116, 117, 118, 131, 119, 
+  120, 121, 122, 123, 124, 125, 126, 127, 128, 132, 
+  0, 0, 144, 240, 147, 0, 148, 0, 149, 143, 
+  0, 236, 229, 227, 234, 235, 233, 232, 238, 231, 
+  230, 228, 237, 224, 0, 212, 0, 0, 216, 0, 
+  0, 220, 0, 0, 146, 138, 0, 137, 0, 142, 
+  156, 0, 342, 331, 332, 0, 329, 0, 330, 0, 
+  333, 247, 254, 253, 261, 249, 0, 250, 334, 0, 
+  340, 251, 252, 257, 255, 337, 335, 339, 258, 0, 
+  269, 0, 0, 0, 0, 341, 64, 0, 343, 65, 
+  241, 283, 66, 0, 0, 0, 270, 0, 0, 259, 
+  260, 0, 248, 256, 284, 285, 328, 338, 0, 299, 
+  300, 301, 302, 0, 295, 296, 297, 298, 325, 326, 
+  0, 0, 0, 0, 0, 288, 289, 245, 243, 205, 
+  213, 209, 225, 201, 246, 0, 152, 217, 221, 194, 
+  183, 0, 0, 202, 0, 0, 0, 0, 195, 0, 
+  0, 0, 0, 0, 187, 185, 188, 186, 184, 197, 
+  196, 198, 0, 210, 0, 206, 0, 244, 152, 0, 
+  226, 241, 242, 0, 241, 0, 0, 291, 0, 0, 
+  0, 293, 0, 214, 0, 0, 218, 0, 0, 222, 
+  281, 0, 273, 282, 276, 0, 280, 0, 241, 274, 
+  0, 241, 0, 0, 292, 0, 0, 0, 294, 342, 
+  331, 0, 0, 333, 0, 327, 0, 317, 0, 0, 
+  0, 287, 0, 286, 0, 344, 0, 101, 263, 266, 
+  0, 102, 269, 105, 130, 107, 108, 73, 112, 113, 
+  64, 114, 117, 71, 74, 65, 241, 66, 76, 120, 
+  69, 122, 72, 124, 125, 270, 127, 128, 132, 0, 
+  94, 0, 0, 96, 100, 98, 85, 97, 99, 0, 
+  95, 84, 264, 262, 140, 141, 146, 0, 139, 0, 
+  316, 0, 303, 304, 0, 315, 0, 0, 0, 306, 
+  311, 309, 312, 0, 0, 310, 311, 0, 307, 0, 
+  308, 265, 314, 0, 265, 313, 0, 318, 319, 0, 
+  265, 320, 321, 0, 0, 322, 0, 0, 0, 323, 
+  324, 158, 157, 0, 0, 0, 290, 0, 0, 0, 
+  305, 278, 271, 0, 279, 275, 0, 277, 267, 0, 
+  268, 272, 88, 0, 0, 92, 79, 0, 81, 90, 
+  0, 82, 91, 93, 83, 89, 80, 0, 86, 162, 
+  160, 164, 161, 159, 163, 6, 336, 4, 2, 62, 
+  87, 0, 0, 65, 67, 66, 31, 5, 0, 63, 
+  0, 42, 41, 40, 0, 0, 55, 0, 56, 35, 
+  36, 37, 38, 59, 0, 42, 0, 0, 0, 0, 
+  0, 51, 0, 52, 0, 0, 26, 0, 0, 60, 
+  27, 0, 30, 28, 24, 0, 29, 25, 0, 53, 
+  0, 54, 140, 0, 57, 61, 0, 0, 0, 0, 
+  58, 0, 49, 43, 50, 44, 0, 0, 0, 0, 
+  46, 0, 47, 48, 45, 0, 0, 140, 265, 0, 
+  0, 39, 102, 269, 105, 130, 107, 108, 73, 112, 
+  113, 64, 114, 117, 71, 74, 65, 241, 66, 76, 
+  120, 69, 122, 72, 124, 125, 270, 127, 128, 132, 
+  0, 32, 33, 0, 34, 8, 0, 10, 0, 9, 
+  0, 1, 21, 12, 0, 13, 0, 14, 0, 19, 
+  20, 0, 15, 16, 0, 17, 18, 11, 23, 7, 
+  345};
 
 const short QmlJSGrammar::goto_default [] = {
-  7, 626, 207, 196, 205, 507, 495, 625, 644, 620, 
-  624, 622, 627, 22, 623, 18, 506, 543, 533, 540, 
-  535, 191, 195, 197, 201, 524, 568, 567, 200, 232, 
-  26, 474, 473, 356, 355, 9, 354, 357, 107, 17, 
-  145, 24, 13, 144, 19, 25, 57, 23, 8, 28, 
-  27, 269, 15, 263, 10, 259, 12, 261, 11, 260, 
-  20, 267, 21, 268, 14, 262, 258, 299, 411, 264, 
-  265, 202, 193, 192, 204, 233, 203, 208, 229, 230, 
-  194, 360, 359, 231, 463, 462, 321, 322, 465, 324, 
-  464, 323, 419, 423, 426, 422, 421, 441, 442, 185, 
-  199, 181, 184, 198, 206, 0};
+  7, 621, 207, 196, 205, 507, 495, 620, 639, 615, 
+  619, 617, 622, 22, 618, 18, 506, 545, 535, 542, 
+  537, 523, 191, 195, 197, 201, 526, 566, 565, 200, 
+  232, 26, 474, 473, 356, 355, 9, 354, 357, 107, 
+  17, 145, 24, 13, 144, 19, 25, 57, 23, 8, 
+  28, 27, 269, 15, 263, 10, 259, 12, 261, 11, 
+  260, 20, 267, 21, 268, 14, 262, 258, 299, 411, 
+  264, 265, 202, 193, 192, 204, 233, 203, 208, 229, 
+  230, 194, 360, 359, 231, 463, 462, 321, 322, 465, 
+  324, 464, 323, 419, 423, 426, 422, 421, 441, 442, 
+  185, 199, 181, 184, 198, 206, 0};
 
 const short QmlJSGrammar::action_index [] = {
-  421, 1288, 2322, 2322, 2419, 1016, -52, 37, 140, -101, 
-  35, -13, -40, 190, -101, 272, 34, -101, -101, 658, 
-  42, 103, 194, 201, -101, -101, -101, 439, 256, 1288, 
-  -101, -101, -101, 282, -101, 2128, 1751, 1288, 1288, 1288, 
-  -101, 917, 1288, -101, -101, -101, 1288, 1288, -101, -101, 
-  -101, -101, -101, 1288, -101, 1288, 1288, -101, 1288, 1288, 
-  109, 245, -101, -101, 1288, 1288, 1288, -101, -101, -101, 
-  185, 1288, 295, 1288, 1288, 1288, 1288, 461, 1288, 1288, 
-  1288, 1288, 1288, 1288, 256, 1288, 1288, 1288, 155, 119, 
-  114, 176, 256, 332, 202, 332, 560, 560, 471, 1288, 
-  -23, 1288, 53, 2031, 1288, 1288, -101, -101, -101, -101, 
+  350, 1271, 2492, 2492, 2395, 999, 52, 93, 137, -101, 
+  104, 72, 66, 177, -101, 285, 80, -101, -101, 641, 
+  71, 130, 167, 178, -101, -101, -101, 431, 321, 1271, 
+  -101, -101, -101, 393, -101, 2201, 2007, 1271, 1271, 1271, 
+  -101, 811, 1271, -101, -101, -101, 1271, 1271, -101, -101, 
+  -101, -101, -101, 1271, -101, 1271, 1271, -101, 1271, 1271, 
+  87, 188, -101, -101, 1271, 1271, 1271, -101, -101, -101, 
+  179, 1271, 263, 1271, 1271, 1271, 1271, 456, 1271, 1271, 
+  1271, 1271, 1271, 1271, 321, 1271, 1271, 1271, 128, 114, 
+  120, 193, 181, 172, 321, 321, 446, 395, 405, 1271, 
+  -8, 1271, 76, 2104, 1271, 1271, -101, -101, -101, -101, 
   -101, -101, -101, -101, -101, -101, -101, -101, -101, -101, 
   -101, -101, -101, -101, -101, -101, -101, -101, -101, -101, 
   -101, -101, -101, -101, -101, -101, -101, -101, -101, -101, 
-  100, 1288, -101, -101, 70, 59, -101, 1288, -101, -101, 
-  1288, -101, -101, -101, -101, -101, -101, -101, -101, -101, 
-  -101, -101, -101, -101, 1288, 41, 1288, 1288, 98, 91, 
-  1288, -101, 2031, 1288, 1288, -101, 121, -101, 73, -101, 
-  -101, 39, -101, 385, 180, 78, -101, 391, -101, 64, 
-  2322, -101, -101, -101, -101, -101, 208, -101, -101, 82, 
-  -101, -101, -101, -101, -101, -101, 2322, -101, -101, 538, 
-  -101, 495, 128, 2419, 54, 358, 62, 44, 2613, 67, 
-  1288, -101, 76, 63, 1288, 58, -101, 60, 46, -101, 
-  -101, 309, -101, -101, -101, -101, -101, -101, 86, -101, 
-  -101, -101, -101, 107, -101, -101, -101, -101, -101, -101, 
-  28, 52, 1288, 101, 102, -101, -101, 1472, -101, 83, 
-  75, 79, -101, 287, 84, 80, 585, 69, 89, 321, 
-  177, 482, 1288, 297, 1288, 1288, 1288, 1288, 331, 1288, 
-  1288, 1288, 1288, 1288, 332, 222, 332, 332, 332, 410, 
-  410, 410, 1288, 57, 1288, 72, 1288, -101, 658, 1288, 
-  -101, 1288, 71, 45, 1288, 61, 2419, -101, 1288, 132, 
-  2419, -101, 1288, 47, 1288, 1288, 66, 65, 1288, -101, 
-  68, 112, 81, -101, -101, 1288, -101, 369, 1288, -101, 
-  85, 1288, 74, 2419, -101, 1288, 122, 2419, -101, 77, 
-  294, 16, -29, 2322, -53, -101, 2419, -101, 1288, 127, 
-  2419, -15, 2419, -101, 10, 11, -34, -101, -101, 2419, 
-  -48, 504, 4, 476, 113, 1288, 2419, 2, -28, 420, 
-  6, -21, 719, 7, 87, -101, 1382, -101, -4, -16, 
-  5, 1288, 3, -27, 1288, 9, 1288, -18, -31, 1288, 
-  -101, 2225, -7, -101, -101, -101, -101, -101, -101, 1288, 
-  -101, -101, -101, -101, 246, -101, 1288, -38, -101, 2419, 
-  -101, 88, -101, -101, 2419, -101, 1288, 106, 26, -101, 
-  55, -101, 50, 105, 1288, -101, 48, 38, -101, -8, 
-  -101, 2419, -101, 94, 2419, -101, 238, -101, -101, 104, 
-  2419, 31, -101, 21, 19, -101, 305, 1, 30, -101, 
-  -101, -101, -101, 1288, 136, 2419, -101, 1288, 134, 2419, 
-  -101, 49, -101, 173, -101, -101, 1288, -101, -101, 363, 
-  -101, -101, -101, 137, 1565, -101, -101, 1658, -101, -101, 
-  1844, -101, -101, -101, -101, -101, -101, 95, -101, -101, 
-  -101, -101, -101, -101, -101, -101, 2322, -101, -101, -101, 
-  92, 15, 925, 169, 27, -6, -101, -101, 212, -101, 
-  191, -101, -101, -101, 323, 211, -101, 1288, -101, 214, 
-  -101, -101, 216, 40, 317, 210, 43, 259, 236, -101, 
-  36, -101, 747, 96, -101, 29, 747, -101, -101, 1198, 
-  -101, -101, -101, 1107, -101, -101, 231, -101, 1288, -101, 
-  217, 286, 32, -101, -101, -101, 188, 340, 51, 1288, 
-  175, -101, -101, 171, -101, 179, -101, 56, -11, 351, 
-  181, 336, -101, 110, -101, -101, -101, 1934, 647, -101, 
-  -101, -101, -101, 253, 2516, 1751, -5, 460, 22, 468, 
-  138, 1288, 2419, 24, -2, 412, 23, -3, 836, 20, 
-  87, -101, 1382, -101, 17, -10, 18, 1288, 25, 8, 
-  1288, 33, 1288, 12, 14, 120, -101, -101, 13, -101, 
-  -101, 747, -101, 248, -47, 828, -101, -101, 152, 482, 
-  -101, 150, -101, 123, -101, -101, 398, -101, -101, 117, 
-  -101, -101, -101, -101, -101, -101, 
+  110, 1271, -101, -101, 68, 38, -101, 1271, -101, -101, 
+  1271, -101, -101, -101, -101, -101, -101, -101, -101, -101, 
+  -101, -101, -101, -101, 1271, 32, 1271, 1271, 85, 83, 
+  1271, -101, 2104, 1271, 1271, -101, 108, -101, 53, -101, 
+  -101, 64, -101, 393, 89, 62, -101, 297, -101, 63, 
+  2492, -101, -101, -101, -101, -101, 154, -101, -101, 47, 
+  -101, -101, -101, -101, -101, -101, 2492, -101, -101, 461, 
+  -101, 470, 74, 2395, 59, 393, 92, 67, 2686, 152, 
+  1271, -101, 65, 43, 1271, 41, -101, 39, 34, -101, 
+  -101, 393, -101, -101, -101, -101, -101, -101, 86, -101, 
+  -101, -101, -101, 90, -101, -101, -101, -101, -101, -101, 
+  -11, 50, 1271, 103, 82, -101, -101, 1455, -101, 84, 
+  44, 5, -101, 267, 70, 33, 575, 79, 69, 471, 
+  235, 393, 1271, 275, 1271, 1271, 1271, 1271, 305, 1271, 
+  1271, 1271, 1271, 1271, 229, 201, 225, 202, 321, 355, 
+  374, 380, 1271, 35, 1271, 81, 1271, -101, 641, 1271, 
+  -101, 1271, 61, 1, 1271, 29, 2395, -101, 1271, 133, 
+  2395, -101, 1271, 73, 1271, 1271, 99, 97, 1271, -101, 
+  51, 153, 60, -101, -101, 1271, -101, 393, 1271, -101, 
+  56, 1271, -25, 2395, -101, 1271, 129, 2395, -101, -35, 
+  309, -56, -31, 2492, -39, -101, 2395, -101, 1271, 245, 
+  2395, -5, 2395, -101, 6, 0, -33, -101, -101, 2395, 
+  -43, 543, 7, 488, 112, 1271, 2395, -1, -27, 453, 
+  8, -18, 630, 14, 16, -101, 1365, -101, 12, -19, 
+  3, 1271, 58, -30, 1271, -2, 1271, -29, -36, 1271, 
+  -101, 2298, 18, -101, -101, -101, -101, -101, -101, 1271, 
+  -101, -101, -101, -101, 223, -101, 1271, -10, -101, 2395, 
+  -101, 95, -101, -101, 2395, -101, 1271, 107, 20, -101, 
+  40, -101, 46, 100, 1271, -101, 55, 57, -101, 28, 
+  -101, 2395, -101, 118, 2395, -101, 161, -101, -101, 126, 
+  2395, 37, -101, -12, -4, -101, 393, -34, -6, -101, 
+  -101, -101, -101, 1271, 98, 2395, -101, 1271, 116, 2395, 
+  -101, 19, -101, 186, -101, -101, 1271, -101, -101, 303, 
+  -101, -101, -101, 119, 1638, -101, -101, 1821, -101, -101, 
+  1914, -101, -101, -101, -101, -101, -101, 123, -101, -101, 
+  -101, -101, -101, -101, -101, -101, 2492, -101, -101, -101, 
+  94, -26, 819, 158, -28, 4, -101, -101, 210, -101, 
+  203, -101, -101, -101, 393, 230, -101, 1545, -101, -101, 
+  -101, -101, -101, -101, 234, 2, 393, 232, 17, 393, 
+  163, -101, 10, -101, 908, 125, -101, 13, 908, -101, 
+  -101, 1090, -101, -101, -101, 1181, -101, -101, 214, -101, 
+  1545, -101, 262, 9, -101, -101, 180, 318, 30, 1545, 
+  -101, 238, -101, 236, -101, 26, -32, 315, 183, 288, 
+  -101, 77, -101, -101, -101, 1728, 908, 291, 2589, 2007, 
+  -3, -101, 443, 25, 497, 88, 1271, 2395, 24, 11, 
+  384, 36, 27, 702, 48, 49, -101, 1365, -101, 54, 
+  31, 45, 1271, 58, 15, 1271, 42, 1271, 23, 22, 
+  122, -101, -101, 21, -101, -101, 730, -101, 254, -70, 
+  908, -101, -101, 138, 393, -101, 143, -101, 134, -101, 
+  -101, 268, -101, -101, 124, -101, -101, -101, -101, -101, 
+  -101, 
 
-  -106, 6, -92, 10, 5, 278, -106, -106, -106, -106, 
-  -106, -106, -106, -106, -106, -106, -106, -106, -106, -42, 
-  -106, -106, -106, -106, -106, -106, -106, -106, -106, 109, 
-  -106, -106, -106, -10, -106, -106, -35, 24, 73, 90, 
-  -106, 219, 181, -106, -106, -106, 171, 120, -106, -106, 
-  -106, -106, -106, 174, -106, 170, 167, -106, 175, 163, 
-  -106, -106, -106, -106, 184, 177, 180, -106, -106, -106, 
-  -106, 125, -106, 132, 134, 162, 130, -106, 121, 124, 
-  123, 141, 142, 152, -106, 154, 161, 160, -106, -106, 
-  -106, -106, -106, -106, -106, -106, -106, -106, -106, 139, 
-  -106, 143, -106, 156, 91, 55, -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, 32, -106, -106, -106, -106, -106, 33, -106, -106, 
-  26, -106, -106, -106, -106, -106, -106, -106, -106, -106, 
-  -106, -106, -106, -106, 96, -106, 119, 52, -106, -106, 
-  66, -106, 220, 69, 71, -106, -106, -106, -106, -106, 
-  -106, -106, -106, 25, -106, -106, -106, 64, -106, -106, 
-  -106, -106, -106, -106, -106, -106, -106, -106, -106, -106, 
-  -106, -106, -106, -106, -106, -106, 70, -106, -106, 61, 
-  -106, 41, -106, 39, -106, 37, -106, -106, 42, -106, 
-  79, -106, -106, -106, 81, 72, -106, -106, -106, -106, 
-  -106, -5, -106, -106, -106, -106, -106, -106, -106, -106, 
-  -106, -106, -106, -106, -106, -106, -106, -106, -106, -106, 
-  -106, -106, 21, -106, -106, -106, -106, 112, -106, -106, 
-  -106, -106, -106, -106, -106, -106, -106, -106, -106, -106, 
-  -106, 17, 237, -106, 192, 236, 224, 225, -106, 97, 
-  98, 101, 99, 113, -106, -106, -106, -106, -106, -106, 
-  -106, -106, 204, -106, 223, -106, 235, -106, -106, 239, 
-  -106, 197, -106, -106, 228, -106, 27, -106, 13, -106, 
-  2, -106, 233, -106, 190, 198, -106, -106, 196, -106, 
-  -106, -106, -106, -106, -106, 200, -106, 107, 135, -106, 
-  -106, 186, -106, 84, -106, 80, -106, 76, -106, -106, 
-  89, -106, -106, -49, -106, -106, 47, -106, 40, -106, 
-  44, -106, 68, -106, -106, -106, -106, -106, -106, 53, 
-  -106, 35, -106, 49, -106, 87, 63, -106, -106, 30, 
-  -106, -106, 103, -106, -106, -106, 51, -106, -106, -106, 
-  -106, 86, -106, 67, 114, -106, 74, -106, -106, 65, 
-  -106, 56, -106, -106, -106, -106, -106, -106, -106, 62, 
-  -106, -106, -106, -106, -106, -106, 95, -106, -106, 78, 
-  -106, -106, -106, -106, 75, -106, 88, -106, -106, -106, 
-  -106, -106, -54, -106, 45, -106, -40, -106, -106, -106, 
-  -106, 94, -106, -106, 100, -106, -106, -106, -106, -106, 
-  150, -41, -106, -106, 54, -106, 43, -106, 48, -106, 
-  -106, -106, -106, 59, -106, 57, -106, 60, -106, 58, 
-  -106, -106, -106, -106, -106, -106, 38, -106, -106, 144, 
-  -106, -106, -106, -106, 31, -106, -106, 202, -106, -106, 
-  50, -106, -106, -106, -106, -106, -106, -106, -106, -106, 
-  -106, -106, -106, -106, -106, -106, 77, -106, -106, -106, 
-  -106, -106, 82, -106, -106, -106, -106, -106, -106, -106, 
-  -17, -106, -106, -106, -4, -106, -106, 12, -106, -106, 
-  -106, -106, -106, -106, -14, 46, -106, -13, -106, -106, 
-  -106, -106, 108, -106, -106, -106, 243, -106, -106, 295, 
-  -106, -106, -106, 290, -106, -106, -106, -106, 346, -106, 
-  -106, -106, 16, -106, -106, -106, 22, 23, -106, 34, 
-  -106, -106, -106, -106, -106, 11, -106, -106, -106, 7, 
-  1, 8, -106, -106, -106, -106, -106, 307, 179, -106, 
-  -106, -106, -106, -106, 18, 281, 9, 15, -106, 4, 
-  -106, 83, 29, -106, -106, -2, -106, -106, 85, -106, 
-  -106, -106, 3, -106, -106, -106, -106, 14, -106, 0, 
-  105, -106, 93, -106, -106, -106, -106, -106, -1, -106, 
-  -106, 20, -106, -106, 28, 92, -106, -106, -106, 19, 
-  -106, -106, -106, -106, -106, -106, -12, -106, -106, -106, 
-  -106, -106, -106, -106, -106, -106};
+  -107, 25, -75, 27, 30, 272, -107, -107, -107, -107, 
+  -107, -107, -107, -107, -107, -107, -107, -107, -107, -42, 
+  -107, -107, -107, -107, -107, -107, -107, -107, -107, 95, 
+  -107, -107, -107, 31, -107, -107, 1, 37, 91, 80, 
+  -107, 89, 167, -107, -107, -107, 175, 181, -107, -107, 
+  -107, -107, -107, 137, -107, 130, 129, -107, 144, 152, 
+  -107, -107, -107, -107, 140, 133, 149, -107, -107, -107, 
+  -107, 157, -107, 182, 179, 170, 70, -107, 66, 78, 
+  55, 94, 100, 114, -107, 120, 109, 104, -107, -107, 
+  -107, -107, -107, -107, -107, -107, -107, -107, -107, 172, 
+  -107, 128, -107, 122, 58, 34, -107, -107, -107, -107, 
+  -107, -107, -107, -107, -107, -107, -107, -107, -107, -107, 
+  -107, -107, -107, -107, -107, -107, -107, -107, -107, -107, 
+  -107, -107, -107, -107, -107, -107, -107, -107, -107, -107, 
+  -107, 51, -107, -107, -107, -107, -107, 36, -107, -107, 
+  47, -107, -107, -107, -107, -107, -107, -107, -107, -107, 
+  -107, -107, -107, -107, 154, -107, 158, -35, -107, -107, 
+  13, -107, 248, 42, 115, -107, -107, -107, -107, -107, 
+  -107, -107, -107, 20, -107, -107, -107, 2, -107, -107, 
+  -107, -107, -107, -107, -107, -107, -107, -107, -107, -107, 
+  -107, -107, -107, -107, -107, -107, 61, -107, -107, 67, 
+  -107, 64, -107, 76, -107, 43, -107, -107, 57, -107, 
+  60, -107, -107, -107, 85, 69, -107, -107, -107, -107, 
+  -107, -5, -107, -107, -107, -107, -107, -107, -107, -107, 
+  -107, -107, -107, -107, -107, -107, -107, -107, -107, -107, 
+  -107, -107, 24, -107, -107, -107, -107, 148, -107, -107, 
+  -107, -107, -107, -107, -107, -107, -107, -107, -107, -107, 
+  -107, 9, 186, -107, 196, 221, 220, 212, -107, 102, 
+  98, 96, 116, 118, -107, -107, -107, -107, -107, -107, 
+  -107, -107, 230, -107, 199, -107, 193, -107, -107, 211, 
+  -107, 132, -107, -107, 126, -107, 14, -107, 5, -107, 
+  10, -107, 208, -107, 189, 202, -107, -107, 209, -107, 
+  -107, -107, -107, -107, -107, 200, -107, 103, 121, -107, 
+  -107, 168, -107, 50, -107, 54, -107, 62, -107, -107, 
+  88, -107, -107, -21, -107, -107, 184, -107, 63, -107, 
+  65, -107, 74, -107, -107, -107, -107, -107, -107, 92, 
+  -107, 35, -107, 45, -107, 171, 75, -107, -107, 56, 
+  -107, -107, 166, -107, -107, -107, 90, -107, -107, -107, 
+  -107, 39, -107, 32, 159, -107, 178, -107, -107, -3, 
+  -107, -17, -107, -107, -107, -107, -107, -107, -107, 3, 
+  -107, -107, -107, -107, -107, -107, 68, -107, -107, 79, 
+  -107, -107, -107, -107, 16, -107, 11, -107, -107, -107, 
+  -107, -107, -8, -107, 59, -107, -41, -107, -107, -107, 
+  -107, 99, -107, -107, 160, -107, -107, -107, -107, -107, 
+  93, -7, -107, -107, 77, -107, 40, -107, 46, -107, 
+  -107, -107, -107, 53, -107, 83, -107, 72, -107, 71, 
+  -107, -107, -107, -107, -107, -107, 48, -107, -107, 81, 
+  -107, -107, -107, -107, 38, -107, -107, 173, -107, -107, 
+  33, -107, -107, -107, -107, -107, -107, -107, -107, -107, 
+  -107, -107, -107, -107, -107, -107, 86, -107, -107, -107, 
+  -107, -107, 73, -107, -107, -107, -107, -107, -107, -107, 
+  22, -107, -107, -107, -10, -107, -107, 259, -107, -107, 
+  -107, -107, -107, -107, -107, -107, -6, -15, -107, -2, 
+  -107, -107, -107, -107, 101, -107, -107, -107, 106, -107, 
+  -107, 290, -107, -107, -107, 294, -107, -107, -107, -107, 
+  318, -107, -107, -4, -107, -107, -19, -13, -107, 364, 
+  -107, -107, -107, -26, -107, -107, -107, -11, -20, -12, 
+  -107, -107, -107, -107, -107, 305, 278, -107, 17, 261, 
+  4, -107, 28, -107, 26, -107, 87, 19, -107, -107, 
+  23, -107, -107, 84, -107, -107, -107, 44, -107, -107, 
+  -107, -107, 41, -107, 29, 125, -107, 110, -107, -107, 
+  -107, -107, -107, 15, -107, -107, 12, -107, -107, 18, 
+  97, -107, -107, -107, 7, -107, -107, -107, -107, -107, 
+  -107, 21, -107, -107, -107, -107, -107, -107, -107, -107, 
+  -107};
 
 const short QmlJSGrammar::action_info [] = {
-  399, 352, 345, -101, 343, 457, 440, 403, 257, -112, 
-  -125, -131, -123, 346, -120, 348, -128, 389, 453, 391, 
-  416, 401, 408, 563, -101, -123, 416, -120, 539, -131, 
-  346, -112, -125, 348, 257, 99, 71, 645, 621, 101, 
-  -128, 440, 141, 621, 164, 431, 539, 430, 453, 573, 
-  457, 444, 440, 424, 71, 424, 101, 446, 559, 420, 
-  424, 448, 539, 440, 570, 539, 466, 527, 312, 346, 
-  532, 312, 318, 272, 409, 183, 342, 525, 147, 141, 
-  348, 510, 457, 414, 272, 325, 0, 0, 252, 99, 
-  257, 440, 296, 556, -102, 292, 453, 190, 170, 416, 
-  164, 434, 141, 141, 536, 251, 304, 172, 141, 141, 
-  443, 0, 335, 340, 141, 427, 0, 0, 0, 149, 
-  327, 306, 0, 292, 444, 0, 173, 0, 536, 141, 
-  141, 0, 0, 179, 333, 141, 294, 236, 189, 314, 
-  141, 301, 141, 315, 141, 477, 331, 242, 241, 413, 
-  412, 62, 537, 166, 58, 488, 142, 167, 294, 58, 
-  428, 254, 63, 256, 255, 59, 418, 172, 247, 246, 
-  59, 575, 574, 328, 249, 248, 616, 177, 641, 640, 
-  58, 469, 337, 141, 635, 634, 173, 350, 187, 249, 
-  248, 59, 310, 478, 459, 58, 455, 64, 523, 249, 
-  248, 85, 85, 86, 86, 103, 59, 565, 511, 172, 
-  511, 638, 637, 64, 87, 87, 141, 511, 517, 577, 
-  511, 0, 141, 0, 104, 141, 105, 85, 173, 86, 
-  174, 172, 566, 564, 470, 468, 562, 561, 548, 511, 
-  87, 636, 65, 530, 513, 539, 141, 85, 66, 86, 
-  173, 0, 406, 0, 513, 512, 513, 64, 65, 0, 
-  87, 172, 0, 513, 66, 512, 513, 512, 172, 235, 
-  234, 0, 518, 516, 512, 521, 520, 512, 554, 553, 
-  173, 85, 406, 86, 0, 513, -89, 173, 34, 174, 
-  73, 74, 549, 547, 87, 631, 512, 531, 529, 438, 
-  437, 172, 65, 0, 578, 274, 275, 0, 66, 632, 
-  630, 34, 0, 73, 74, 274, 275, 75, 76, -89, 
-  173, 0, 174, 34, 0, 48, 50, 49, 0, 0, 
-  0, 0, 276, 277, 34, 0, 0, 0, 34, 629, 
-  75, 76, 276, 277, 279, 280, 34, 0, 48, 50, 
-  49, 45, 34, 281, 279, 280, 282, 85, 283, 86, 
-  48, 50, 49, 281, 0, 34, 282, 0, 283, 34, 
-  87, 48, 50, 49, 45, 48, 50, 49, 0, 0, 
-  34, 0, 0, 48, 50, 49, 45, 34, 0, 48, 
-  50, 49, 34, 0, 0, 0, 0, 45, 34, 0, 
-  0, 45, 48, 50, 49, 0, 48, 50, 49, 45, 
-  0, 0, 0, 0, 34, 45, 0, 48, 50, 49, 
-  34, 0, 0, 0, 48, 50, 49, 34, 45, 48, 
-  50, 49, 45, 279, 280, 48, 50, 49, 0, 0, 
-  0, 34, 281, 45, 0, 282, 0, 283, -343, 34, 
-  45, 48, 50, 49, 0, 45, -343, 48, 50, 49, 
-  0, 45, 78, 79, 48, 50, 49, 0, 0, 0, 
-  80, 81, 0, 0, 82, 0, 83, 45, 48, 50, 
-  49, 0, 0, 45, 78, 79, 48, 50, 49, 34, 
-  45, 0, 80, 81, 78, 79, 82, 34, 83, 0, 
-  0, 0, 80, 81, 45, 34, 82, 0, 83, 0, 
-  0, 34, 45, 0, 6, 5, 4, 1, 3, 2, 
-  0, 240, 239, 0, 34, 0, 48, 50, 49, 245, 
-  244, 0, 0, 34, 48, 50, 49, 245, 244, 0, 
-  0, 0, 48, 50, 49, 0, 0, 0, 48, 50, 
-  49, 0, 45, 0, 0, 0, 245, 244, 0, 0, 
-  45, 48, 50, 49, 0, 240, 239, 34, 45, 0, 
-  48, 50, 49, 0, 45, 0, 0, 0, 0, 0, 
-  0, 0, 0, 78, 79, 0, 0, 45, 151, 0, 
-  0, 80, 81, 0, 0, 82, 45, 83, 152, 240, 
-  239, 0, 153, 0, 48, 50, 49, 0, 0, 0, 
-  0, 154, 0, 155, 0, 0, 308, 0, 0, 0, 
-  0, 0, 0, 0, 156, 0, 157, 62, 0, 0, 
-  45, 0, 0, 0, 158, 0, 0, 159, 63, 0, 
-  0, 0, 0, 160, 0, 0, 0, 0, 0, 161, 
-  0, 0, 0, 0, 0, 0, 0, 0, 0, 30, 
-  31, 151, 0, 0, 0, 162, 0, 0, 0, 33, 
-  0, 152, 0, 0, 0, 153, 34, 0, 0, 0, 
-  35, 36, 0, 37, 154, 0, 155, 0, 0, 0, 
-  502, 0, 0, 0, 44, 0, 0, 156, 0, 157, 
-  62, 0, 0, 0, 0, 0, 0, 158, 0, 0, 
-  159, 63, 51, 48, 50, 49, 160, 52, 0, 0, 
-  0, 0, 161, 0, 0, 0, 0, 0, 43, 54, 
-  32, 30, 31, 0, 40, 0, 0, 0, 162, 45, 
-  0, 33, 0, 0, 0, 0, 0, 0, 34, 0, 
-  0, 0, 35, 36, 0, 37, 0, 0, 0, 30, 
-  31, 0, 41, 0, 0, 0, 44, 0, 0, 33, 
-  0, 0, 0, 0, 0, 0, 34, 0, 0, 0, 
-  35, 36, 0, 37, 51, 48, 50, 49, 0, 52, 
-  502, 0, 0, 0, 44, 0, 0, 0, 0, 0, 
-  43, 54, 32, 0, 0, 0, 40, 0, 0, 0, 
-  0, 45, 51, 48, 50, 49, 0, 52, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 43, 54, 
-  32, 0, 0, 0, 40, 0, 0, 0, 0, 45, 
-  30, 31, 0, 0, 0, 0, 0, 0, 30, 31, 
-  33, 0, 0, 0, 0, 0, 0, 34, 33, 0, 
-  0, 35, 36, 0, 37, 34, 0, 0, 0, 35, 
-  36, 502, 37, 0, 0, 44, 0, 0, 0, 41, 
-  0, 0, 0, 44, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 51, 48, 50, 49, 0, 52, 0, 
-  0, 51, 48, 50, 49, 0, 52, 0, 0, 43, 
-  54, 32, 0, 0, 0, 40, 0, 43, 54, 32, 
-  45, 0, 0, 40, 0, 0, 0, 0, 45, 30, 
-  31, 0, 0, 0, 0, 0, 0, 30, 31, 33, 
-  0, 0, 0, 0, 0, 0, 34, 33, 0, 0, 
-  35, 36, 0, 37, 34, 0, 0, 0, 35, 36, 
-  41, 37, 0, 0, 44, 0, 0, 0, 502, 0, 
-  0, 0, 44, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 51, 48, 50, 49, 0, 52, 0, 0, 
-  51, 48, 50, 49, 0, 52, 0, 0, 43, 54, 
-  32, 0, 0, 0, 40, 0, 43, 54, 32, 45, 
-  0, 0, 40, 0, 0, 0, 0, 45, 0, 0, 
-  0, 0, 0, 0, 0, 0, 501, 0, 30, 31, 
-  0, 0, 0, 0, 0, 0, 0, 0, 215, 0, 
-  0, 0, 0, 0, 0, 34, 0, 0, 0, 35, 
-  36, 0, 37, 0, 0, 0, 0, 0, 0, 502, 
-  0, 0, 0, 44, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 51, 503, 505, 504, 0, 52, 0, 0, 0, 
-  0, 226, 0, 0, 0, 0, 0, 43, 54, 32, 
-  210, 0, 0, 40, 0, 0, 0, 0, 45, 0, 
-  0, 0, 0, 0, 0, 0, 0, 501, 0, 30, 
-  31, 0, 0, 0, 0, 0, 0, 0, 0, 215, 
-  0, 0, 0, 0, 0, 0, 34, 0, 0, 0, 
-  35, 36, 0, 37, 0, 0, 0, 0, 0, 0, 
-  502, 0, 0, 0, 44, 0, 0, 0, 0, 0, 
-  0, 0, 544, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 51, 503, 505, 504, 0, 52, 0, 0, 
-  0, 0, 226, 0, 0, 0, 0, 0, 43, 54, 
-  32, 210, 0, 0, 40, 0, 0, 0, 0, 45, 
-  0, 0, 0, 0, 0, 0, 0, 0, 501, 0, 
+  457, 340, 343, 440, 342, -126, -110, 453, 391, 257, 
+  -121, 352, 403, 389, -129, 346, 345, 416, 348, -99, 
+  616, -118, 401, -100, 446, 399, 448, 440, 571, 440, 
+  541, -110, -129, 561, 568, 333, 466, 559, 556, 527, 
+  510, 529, 541, 346, 534, 424, 541, 257, 440, -126, 
+  408, 424, -121, 420, 541, -118, -100, 444, 457, 453, 
+  424, -99, 304, 348, 431, -123, 251, 416, 325, 141, 
+  457, 101, 414, 164, 440, 453, 147, 71, 296, 416, 
+  99, 312, 272, 430, 294, 272, 252, 164, 141, 306, 
+  170, 335, 292, 640, 301, 257, 190, 187, 149, 346, 
+  183, 312, 236, 348, 318, 71, 141, 0, 0, 172, 
+  427, 141, 0, 179, 294, 141, 141, 331, 141, 314, 
+  99, 292, 189, 315, 141, 434, 141, 477, 173, 62, 
+  538, 141, 443, 538, 0, 249, 248, 141, 573, 572, 
+  63, 141, 616, 256, 255, 101, 444, 242, 241, 249, 
+  248, 247, 246, 172, 58, 428, 413, 412, 455, 409, 
+  58, 327, 141, 254, 177, 59, 142, 418, 58, 141, 
+  532, 59, 173, 249, 248, 478, 459, 58, 611, 59, 
+  166, 539, 172, 488, 167, 636, 635, 525, 59, 337, 
+  64, 64, 103, 310, 469, 630, 629, 85, 0, 86, 
+  64, 173, 0, 174, 633, 632, 85, 0, 86, 511, 
+  87, 104, 511, 105, 328, 235, 234, 575, 85, 87, 
+  86, 550, 438, 437, 533, 531, 85, 85, 86, 86, 
+  0, 87, 511, 513, 631, 65, 65, 517, 172, 87, 
+  87, 66, 66, 541, 512, 65, 0, 470, 468, 172, 
+  85, 66, 86, 141, 85, 513, 86, 173, 513, 406, 
+  85, 511, 86, 87, 0, 511, 512, 87, 173, 512, 
+  406, 0, 0, 87, 563, 551, 549, 172, 513, 0, 
+  0, 73, 74, 0, 0, 274, 275, 0, 0, 512, 
+  0, 518, 516, 274, 275, -87, 173, 34, 174, 564, 
+  562, 626, 576, 73, 74, 350, 172, 513, 75, 76, 
+  0, 513, 276, 277, 0, 627, 625, 34, 512, 0, 
+  276, 277, 512, 0, -87, 173, 34, 174, 279, 280, 
+  75, 76, 34, 0, 48, 50, 49, 281, 34, 0, 
+  282, 0, 283, 0, 34, 624, 85, 34, 86, 0, 
+  0, 0, 0, 0, 48, 50, 49, 0, 0, 87, 
+  45, 0, 0, 48, 50, 49, 0, 0, 0, 48, 
+  50, 49, 0, 0, 0, 48, 50, 49, 279, 280, 
+  45, 48, 50, 49, 48, 50, 49, 281, 0, 45, 
+  282, 0, 283, 0, 0, 45, 0, 279, 280, 0, 
+  0, 45, 0, 279, 280, 0, 281, 45, 0, 282, 
+  45, 283, 281, 34, 0, 282, 0, 283, 78, 79, 
+  -341, 0, 34, 0, 0, 0, 80, 81, 78, 79, 
+  82, 0, 83, 0, 0, 0, 80, 81, 0, 0, 
+  82, 0, 83, 6, 5, 4, 1, 3, 2, 0, 
+  48, 50, 49, 0, 78, 79, 0, 0, 0, 48, 
+  50, 49, 80, 81, 0, 0, 82, 0, 83, 78, 
+  79, 0, 34, 0, 0, 0, 45, 80, 81, 78, 
+  79, 82, 34, 83, 0, 45, 0, 80, 81, -341, 
+  34, 82, 0, 83, 279, 280, 0, 0, 0, 34, 
+  0, 0, 0, 281, 240, 239, 282, 0, 283, 48, 
+  50, 49, 0, 0, 0, 0, 0, 34, 0, 48, 
+  50, 49, 240, 239, 0, 0, 34, 48, 50, 49, 
+  0, 245, 244, 0, 0, 45, 48, 50, 49, 0, 
+  0, 0, 0, 0, 0, 45, 0, 0, 0, 245, 
+  244, 0, 0, 45, 48, 50, 49, 0, 245, 244, 
+  0, 0, 45, 48, 50, 49, 0, 0, 0, 0, 
+  0, 0, 34, 0, 0, 0, 0, 0, 151, 0, 
+  45, 0, 0, 0, 0, 0, 0, 0, 152, 45, 
+  0, 0, 153, 0, 0, 0, 0, 0, 0, 0, 
+  0, 154, 0, 155, 240, 239, 308, 0, 0, 48, 
+  50, 49, 0, 0, 156, 0, 157, 62, 0, 0, 
+  0, 0, 0, 0, 158, 0, 0, 159, 63, 0, 
+  0, 0, 0, 160, 0, 45, 0, 0, 0, 161, 
+  0, 0, 30, 31, 151, 0, 0, 0, 0, 0, 
+  0, 0, 33, 0, 152, 162, 0, 0, 153, 34, 
+  0, 0, 0, 35, 36, 0, 37, 154, 0, 155, 
+  0, 0, 0, 41, 0, 0, 0, 44, 0, 0, 
+  156, 0, 157, 62, 0, 0, 0, 0, 0, 0, 
+  158, 0, 0, 159, 63, 51, 48, 50, 49, 160, 
+  52, 0, 0, 0, 0, 161, 0, 0, 0, 0, 
+  0, 43, 54, 32, 30, 31, 0, 40, 0, 0, 
+  0, 162, 45, 0, 33, 0, 0, 0, 0, 0, 
+  0, 34, 0, 0, 0, 35, 36, 0, 37, 0, 
+  0, 0, 30, 31, 0, 41, 0, 0, 0, 44, 
+  0, 0, 33, 0, 0, 0, 0, 0, 0, 34, 
+  0, 0, 0, 35, 36, 0, 37, 51, 48, 50, 
+  49, 0, 52, 502, 0, 0, 0, 44, 0, 0, 
+  0, 0, 0, 43, 54, 32, 0, 0, 0, 40, 
+  0, 0, 0, 0, 45, 51, 48, 50, 49, 0, 
+  52, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
+  0, 43, 54, 32, 0, 0, 0, 40, 0, 0, 
+  0, 0, 45, 30, 31, 0, 0, 0, 0, 0, 
+  0, 30, 31, 33, 0, 0, 0, 0, 0, 0, 
+  34, 33, 0, 0, 35, 36, 0, 37, 34, 0, 
+  0, 0, 35, 36, 41, 37, 0, 0, 44, 0, 
+  0, 0, 502, 0, 0, 0, 44, 0, 0, 0, 
+  0, 0, 0, 0, 0, 0, 51, 48, 50, 49, 
+  0, 52, 0, 0, 51, 48, 50, 49, 0, 52, 
+  0, 0, 43, 54, 32, 0, 0, 0, 40, 0, 
+  43, 54, 32, 45, 0, 0, 40, 0, 0, 0, 
+  0, 45, 0, 0, 0, 0, 0, 0, 0, 0, 
   30, 31, 0, 0, 0, 0, 0, 0, 0, 0, 
-  215, 0, 0, 0, 0, 0, 0, 34, 0, 0, 
+  33, 0, 0, 0, 0, 0, 0, 34, 0, 0, 
   0, 35, 36, 0, 37, 0, 0, 0, 0, 0, 
   0, 502, 0, 0, 0, 44, 0, 0, 0, 0, 
-  0, 0, 0, 541, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 51, 503, 505, 504, 0, 52, 0, 
-  0, 0, 0, 226, 0, 0, 0, 0, 0, 43, 
-  54, 32, 210, 0, 0, 40, 0, 0, 0, 0, 
-  45, 0, 0, 0, 0, 0, 0, 0, 0, 29, 
-  30, 31, 0, 0, 0, 0, 0, 0, 0, 0, 
-  33, 0, 0, 0, 0, 0, 0, 34, 0, 0, 
-  0, 35, 36, 0, 37, 0, 0, 0, 38, 0, 
-  39, 41, 42, 0, 0, 44, 0, 0, 0, 46, 
-  0, 47, 0, 0, 0, 0, 0, 0, 0, 0, 
+  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
   0, 0, 0, 51, 48, 50, 49, 0, 52, 0, 
-  53, 0, 55, 0, 56, 0, 0, 0, 0, 43, 
+  0, 0, 0, 0, 0, 0, 0, 0, 0, 43, 
   54, 32, 0, 0, 0, 40, 0, 0, 0, 0, 
-  45, 0, 0, 0, 0, 0, 0, 0, 0, -121, 
-  0, 0, 0, 29, 30, 31, 0, 0, 0, 0, 
-  0, 0, 0, 0, 33, 0, 0, 0, 0, 0, 
-  0, 34, 0, 0, 0, 35, 36, 0, 37, 0, 
-  0, 0, 38, 0, 39, 41, 42, 0, 0, 44, 
-  0, 0, 0, 46, 0, 47, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 51, 48, 50, 
-  49, 0, 52, 0, 53, 0, 55, 0, 56, 0, 
-  0, 0, 0, 43, 54, 32, 0, 0, 0, 40, 
-  0, 0, 0, 0, 45, 0, 0, 0, 0, 0, 
-  0, 0, 0, 29, 30, 31, 0, 0, 0, 0, 
-  0, 0, 0, 0, 33, 0, 0, 0, 0, 0, 
-  0, 34, 0, 0, 0, 35, 36, 0, 37, 0, 
-  0, 0, 38, 0, 39, 41, 42, 0, 0, 44, 
-  0, 0, 0, 46, 0, 47, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 51, 48, 50, 
-  49, 0, 52, 0, 53, 0, 55, 271, 56, 0, 
-  0, 0, 0, 43, 54, 32, 0, 0, 0, 40, 
-  0, 0, 0, 0, 45, 0, 0, 0, 0, 0, 
-  0, 0, 0, 483, 0, 0, 29, 30, 31, 0, 
+  45, 0, 0, 0, 0, 0, 0, 0, 0, 501, 
+  0, 30, 31, 0, 0, 0, 0, 0, 0, 0, 
+  0, 215, 0, 0, 0, 0, 0, 0, 34, 0, 
+  0, 0, 35, 36, 0, 37, 0, 0, 0, 0, 
+  0, 0, 502, 0, 0, 0, 44, 0, 0, 0, 
+  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
+  0, 0, 0, 0, 51, 503, 505, 504, 0, 52, 
+  0, 0, 0, 0, 226, 0, 0, 0, 0, 0, 
+  43, 54, 32, 210, 0, 0, 40, 0, 0, 0, 
+  0, 45, 0, 0, 0, 0, 0, 0, 0, 0, 
+  501, 0, 30, 31, 0, 0, 0, 0, 0, 0, 
+  0, 0, 215, 0, 0, 0, 0, 0, 0, 34, 
+  0, 0, 0, 35, 36, 0, 37, 0, 0, 0, 
+  0, 0, 0, 502, 0, 0, 0, 44, 0, 0, 
+  0, 0, 0, 0, 0, 543, 0, 0, 0, 0, 
+  0, 0, 0, 0, 0, 51, 503, 505, 504, 0, 
+  52, 0, 0, 0, 0, 226, 0, 0, 0, 0, 
+  0, 43, 54, 32, 210, 0, 0, 40, 0, 0, 
+  0, 0, 45, 0, 0, 0, 0, 0, 0, 0, 
+  0, 501, 0, 30, 31, 0, 0, 0, 0, 0, 
+  0, 0, 0, 215, 0, 0, 0, 0, 0, 0, 
+  34, 0, 0, 0, 35, 36, 0, 37, 0, 0, 
+  0, 0, 0, 0, 502, 0, 0, 0, 44, 0, 
+  0, 0, 0, 0, 0, 0, 546, 0, 0, 0, 
+  0, 0, 0, 0, 0, 0, 51, 503, 505, 504, 
+  0, 52, 0, 0, 0, 0, 226, 0, 0, 0, 
+  0, 0, 43, 54, 32, 210, 0, 0, 40, 0, 
+  0, 0, 0, 45, 0, 0, 0, 0, 0, 0, 
+  0, 0, 29, 30, 31, 0, 0, 0, 0, 0, 
+  0, 0, 0, 33, 0, 0, 0, 0, 0, 0, 
+  34, 0, 0, 0, 35, 36, 0, 37, 0, 0, 
+  0, 38, 0, 39, 41, 42, 0, 0, 44, 0, 
+  0, 0, 46, 0, 47, 0, 0, 0, 0, 0, 
+  0, 0, 0, 0, 0, 0, 51, 48, 50, 49, 
+  0, 52, 0, 53, 0, 55, 0, 56, 0, 0, 
+  0, 0, 43, 54, 32, 0, 0, 0, 40, 0, 
+  0, 0, 0, 45, 0, 0, 0, 0, 0, 0, 
+  0, 0, -119, 0, 0, 0, 29, 30, 31, 0, 
   0, 0, 0, 0, 0, 0, 0, 33, 0, 0, 
   0, 0, 0, 0, 34, 0, 0, 0, 35, 36, 
   0, 37, 0, 0, 0, 38, 0, 39, 41, 42, 
   0, 0, 44, 0, 0, 0, 46, 0, 47, 0, 
-  0, 486, 0, 0, 0, 0, 0, 0, 0, 0, 
+  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
   51, 48, 50, 49, 0, 52, 0, 53, 0, 55, 
   0, 56, 0, 0, 0, 0, 43, 54, 32, 0, 
   0, 0, 40, 0, 0, 0, 0, 45, 0, 0, 
-  0, 0, 0, 0, 0, 0, 475, 0, 0, 29, 
+  0, 0, 0, 0, 0, 0, 29, 30, 31, 0, 
+  0, 0, 0, 0, 0, 0, 0, 33, 0, 0, 
+  0, 0, 0, 0, 34, 0, 0, 0, 35, 36, 
+  0, 37, 0, 0, 0, 38, 0, 39, 41, 42, 
+  0, 0, 44, 0, 0, 0, 46, 0, 47, 0, 
+  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
+  51, 48, 50, 49, 0, 52, 0, 53, 0, 55, 
+  271, 56, 0, 0, 0, 0, 43, 54, 32, 0, 
+  0, 0, 40, 0, 0, 0, 0, 45, 0, 0, 
+  0, 0, 0, 0, 0, 0, 29, 30, 31, 0, 
+  0, 0, 0, 0, 0, 0, 0, 33, 0, 0, 
+  0, 0, 0, 0, 34, 217, 0, 0, 218, 36, 
+  0, 37, 0, 0, 0, 38, 0, 39, 41, 42, 
+  0, 0, 44, 0, 0, 0, 46, 0, 47, 0, 
+  0, 0, 0, 0, 0, 0, 221, 0, 0, 0, 
+  51, 48, 50, 49, 0, 52, 0, 53, 0, 55, 
+  0, 56, 0, 0, 0, 0, 43, 54, 32, 0, 
+  0, 0, 40, 0, 0, 0, 0, 45, 0, 0, 
+  0, 0, 0, 0, 0, 0, 483, 0, 0, 29, 
   30, 31, 0, 0, 0, 0, 0, 0, 0, 0, 
   33, 0, 0, 0, 0, 0, 0, 34, 0, 0, 
   0, 35, 36, 0, 37, 0, 0, 0, 38, 0, 
   39, 41, 42, 0, 0, 44, 0, 0, 0, 46, 
-  0, 47, 0, 0, 481, 0, 0, 0, 0, 0, 
+  0, 47, 0, 0, 486, 0, 0, 0, 0, 0, 
+  0, 0, 0, 51, 48, 50, 49, 0, 52, 0, 
+  53, 0, 55, 0, 56, 0, 0, 0, 0, 43, 
+  54, 32, 0, 0, 0, 40, 0, 0, 0, 0, 
+  45, 0, 0, 0, 0, 0, 0, 0, 0, 29, 
+  30, 31, 0, 0, 0, 0, 0, 0, 0, 0, 
+  33, 0, 0, 0, 0, 0, 0, 34, 217, 0, 
+  0, 578, 579, 0, 37, 0, 0, 0, 38, 0, 
+  39, 41, 42, 0, 0, 44, 0, 0, 0, 46, 
+  0, 47, 0, 0, 0, 0, 0, 0, 0, 221, 
   0, 0, 0, 51, 48, 50, 49, 0, 52, 0, 
   53, 0, 55, 0, 56, 0, 0, 0, 0, 43, 
   54, 32, 0, 0, 0, 40, 0, 0, 0, 0, 
@@ -515,7 +523,7 @@ const short QmlJSGrammar::action_info [] = {
   0, 0, 0, 33, 0, 0, 0, 0, 0, 0, 
   34, 0, 0, 0, 35, 36, 0, 37, 0, 0, 
   0, 38, 0, 39, 41, 42, 0, 0, 44, 0, 
-  0, 0, 46, 0, 47, 0, 0, 476, 0, 0, 
+  0, 0, 46, 0, 47, 0, 0, 481, 0, 0, 
   0, 0, 0, 0, 0, 0, 51, 48, 50, 49, 
   0, 52, 0, 53, 0, 55, 0, 56, 0, 0, 
   0, 0, 43, 54, 32, 0, 0, 0, 40, 0, 
@@ -529,44 +537,54 @@ const short QmlJSGrammar::action_info [] = {
   48, 50, 49, 0, 52, 0, 53, 0, 55, 0, 
   56, 0, 0, 0, 0, 43, 54, 32, 0, 0, 
   0, 40, 0, 0, 0, 0, 45, 0, 0, 0, 
-  0, 0, 0, 0, 0, 29, 30, 31, 0, 0, 
-  0, 0, 0, 0, 0, 0, 33, 0, 0, 0, 
-  0, 0, 0, 34, 217, 0, 0, 584, 585, 0, 
-  37, 0, 0, 0, 38, 0, 39, 41, 42, 0, 
-  0, 44, 0, 0, 0, 46, 0, 47, 0, 0, 
-  0, 0, 0, 0, 0, 221, 0, 0, 0, 51, 
-  48, 50, 49, 0, 52, 0, 53, 0, 55, 0, 
-  56, 0, 0, 0, 0, 43, 54, 32, 0, 0, 
-  0, 40, 0, 0, 0, 0, 45, 0, 0, 0, 
+  0, 0, 0, 0, 0, 475, 0, 0, 29, 30, 
+  31, 0, 0, 0, 0, 0, 0, 0, 0, 33, 
+  0, 0, 0, 0, 0, 0, 34, 0, 0, 0, 
+  35, 36, 0, 37, 0, 0, 0, 38, 0, 39, 
+  41, 42, 0, 0, 44, 0, 0, 0, 46, 0, 
+  47, 0, 0, 476, 0, 0, 0, 0, 0, 0, 
+  0, 0, 51, 48, 50, 49, 0, 52, 0, 53, 
+  0, 55, 0, 56, 0, 0, 0, 0, 43, 54, 
+  32, 0, 0, 0, 40, 0, 0, 0, 0, 45, 
+  0, 0, 0, 0, 0, 0, 0, 0, 109, 110, 
+  111, 0, 0, 113, 115, 116, 0, 0, 117, 0, 
+  118, 0, 0, 0, 120, 121, 122, 0, 0, 0, 
+  0, 0, 0, 34, 123, 124, 125, 0, 0, 0, 
+  0, 0, 0, 0, 0, 0, 0, 126, 0, 0, 
+  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
+  0, 0, 0, 129, 0, 0, 0, 0, 0, 0, 
+  48, 50, 49, 130, 131, 132, 0, 134, 135, 136, 
+  137, 138, 139, 0, 0, 127, 133, 119, 112, 114, 
+  128, 0, 0, 0, 0, 0, 45, 0, 0, 0, 
   0, 0, 0, 0, 0, 109, 110, 111, 0, 0, 
   113, 115, 116, 0, 0, 117, 0, 118, 0, 0, 
   0, 120, 121, 122, 0, 0, 0, 0, 0, 0, 
-  34, 123, 124, 125, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 126, 0, 0, 0, 0, 0, 
+  393, 123, 124, 125, 0, 0, 0, 0, 0, 0, 
+  0, 0, 0, 0, 126, 0, 0, 0, 394, 0, 
   0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-  129, 0, 0, 0, 0, 0, 0, 48, 50, 49, 
+  129, 0, 0, 0, 0, 0, 398, 395, 397, 0, 
   130, 131, 132, 0, 134, 135, 136, 137, 138, 139, 
   0, 0, 127, 133, 119, 112, 114, 128, 0, 0, 
-  0, 0, 0, 45, 0, 0, 0, 0, 0, 0, 
+  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
   0, 0, 109, 110, 111, 0, 0, 113, 115, 116, 
   0, 0, 117, 0, 118, 0, 0, 0, 120, 121, 
   122, 0, 0, 0, 0, 0, 0, 393, 123, 124, 
   125, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
   0, 126, 0, 0, 0, 394, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 129, 0, 0, 
+  0, 0, 0, 396, 0, 0, 0, 129, 0, 0, 
   0, 0, 0, 398, 395, 397, 0, 130, 131, 132, 
   0, 134, 135, 136, 137, 138, 139, 0, 0, 127, 
   133, 119, 112, 114, 128, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 0, 109, 
-  110, 111, 0, 0, 113, 115, 116, 0, 0, 117, 
-  0, 118, 0, 0, 0, 120, 121, 122, 0, 0, 
-  0, 0, 0, 0, 393, 123, 124, 125, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 126, 0, 
-  0, 0, 394, 0, 0, 0, 0, 0, 0, 0, 
-  396, 0, 0, 0, 129, 0, 0, 0, 0, 0, 
-  398, 395, 397, 0, 130, 131, 132, 0, 134, 135, 
-  136, 137, 138, 139, 0, 0, 127, 133, 119, 112, 
-  114, 128, 0, 0, 0, 0, 0, 0, 0, 0, 
+  0, 0, 0, 0, 0, 0, 0, 0, 0, 209, 
+  0, 0, 0, 0, 211, 0, 29, 30, 31, 213, 
+  0, 0, 0, 0, 0, 0, 214, 33, 0, 0, 
+  0, 0, 0, 0, 216, 217, 0, 0, 218, 36, 
+  0, 37, 0, 0, 0, 38, 0, 39, 41, 42, 
+  0, 0, 44, 0, 0, 0, 46, 0, 47, 0, 
+  0, 0, 0, 0, 220, 0, 221, 0, 0, 0, 
+  51, 219, 222, 49, 223, 52, 224, 53, 225, 55, 
+  226, 56, 227, 228, 0, 0, 43, 54, 32, 210, 
+  212, 0, 40, 0, 0, 0, 0, 45, 0, 0, 
   0, 0, 0, 0, 0, 0, 209, 0, 0, 0, 
   0, 211, 0, 29, 30, 31, 213, 0, 0, 0, 
   0, 0, 0, 214, 215, 0, 0, 0, 0, 0, 
@@ -577,248 +595,238 @@ const short QmlJSGrammar::action_info [] = {
   49, 223, 52, 224, 53, 225, 55, 226, 56, 227, 
   228, 0, 0, 43, 54, 32, 210, 212, 0, 40, 
   0, 0, 0, 0, 45, 0, 0, 0, 0, 0, 
-  0, 0, 0, 209, 0, 0, 0, 0, 211, 0, 
-  29, 30, 31, 213, 0, 0, 0, 0, 0, 0, 
-  214, 33, 0, 0, 0, 0, 0, 0, 216, 217, 
-  0, 0, 218, 36, 0, 37, 0, 0, 0, 38, 
-  0, 39, 41, 42, 0, 0, 44, 0, 0, 0, 
-  46, 0, 47, 0, 0, 0, 0, 0, 220, 0, 
-  221, 0, 0, 0, 51, 219, 222, 49, 223, 52, 
-  224, 53, 225, 55, 226, 56, 227, 228, 0, 0, 
-  43, 54, 32, 210, 212, 0, 40, 0, 0, 0, 
+  0, 0, 0, 582, 110, 111, 0, 0, 584, 115, 
+  586, 30, 31, 587, 0, 118, 0, 0, 0, 120, 
+  589, 590, 0, 0, 0, 0, 0, 0, 591, 592, 
+  124, 125, 218, 36, 0, 37, 0, 0, 0, 38, 
+  0, 39, 593, 42, 0, 0, 595, 0, 0, 0, 
+  46, 0, 47, 0, 0, 0, 0, 0, 597, 0, 
+  221, 0, 0, 0, 599, 596, 598, 49, 600, 601, 
+  602, 53, 604, 605, 606, 607, 608, 609, 0, 0, 
+  594, 603, 588, 583, 585, 128, 40, 0, 0, 0, 
   0, 45, 0, 0, 0, 0, 0, 0, 0, 0, 
-  587, 110, 111, 0, 0, 589, 115, 591, 30, 31, 
-  592, 0, 118, 0, 0, 0, 120, 594, 595, 0, 
-  0, 0, 0, 0, 0, 596, 597, 124, 125, 218, 
-  36, 0, 37, 0, 0, 0, 38, 0, 39, 598, 
-  42, 0, 0, 600, 0, 0, 0, 46, 0, 47, 
-  0, 0, 0, 0, 0, 602, 0, 221, 0, 0, 
-  0, 604, 601, 603, 49, 605, 606, 607, 53, 609, 
-  610, 611, 612, 613, 614, 0, 0, 599, 608, 593, 
-  588, 590, 128, 40, 0, 0, 0, 0, 45, 0, 
-  0, 0, 0, 0, 0, 0, 0, 361, 110, 111, 
-  0, 0, 363, 115, 365, 30, 31, 366, 0, 118, 
-  0, 0, 0, 120, 368, 369, 0, 0, 0, 0, 
-  0, 0, 370, 371, 124, 125, 218, 36, 0, 37, 
-  0, 0, 0, 38, 0, 39, 372, 42, 0, 0, 
-  374, 0, 0, 0, 46, 0, 47, 0, -267, 0, 
-  0, 0, 376, 0, 221, 0, 0, 0, 378, 375, 
-  377, 49, 379, 380, 381, 53, 383, 384, 385, 386, 
-  387, 388, 0, 0, 373, 382, 367, 362, 364, 128, 
-  40, 0, 0, 0, 0, 45, 0, 0, 0, 0, 
-  0, 0, 0, 0, 
+  361, 110, 111, 0, 0, 363, 115, 365, 30, 31, 
+  366, 0, 118, 0, 0, 0, 120, 368, 369, 0, 
+  0, 0, 0, 0, 0, 370, 371, 124, 125, 218, 
+  36, 0, 37, 0, 0, 0, 38, 0, 39, 372, 
+  42, 0, 0, 374, 0, 0, 0, 46, 0, 47, 
+  0, -265, 0, 0, 0, 376, 0, 221, 0, 0, 
+  0, 378, 375, 377, 49, 379, 380, 381, 53, 383, 
+  384, 385, 386, 387, 388, 0, 0, 373, 382, 367, 
+  362, 364, 128, 40, 0, 0, 0, 0, 45, 0, 
+  0, 0, 0, 0, 0, 0, 0, 
 
-  472, 546, 528, 639, 311, 182, 302, 498, 514, 16, 
-  461, 515, 496, 182, 497, 519, 309, 436, 619, 243, 
-  358, 439, 576, 572, 253, 150, 571, 487, 617, 307, 
-  238, 250, 320, 628, 633, 555, 569, 560, 558, 642, 
-  186, 250, 425, 349, 358, 182, 351, 557, 433, 347, 
-  238, 344, 339, 429, 302, 402, 243, 445, 447, 456, 
-  460, 163, 454, 458, 243, 250, 485, 143, 148, 449, 
-  353, 526, 176, 467, 237, 450, 238, 415, 338, 188, 
-  410, 237, 302, 336, 436, 482, 334, 169, 439, 436, 
-  146, 417, 392, 439, 140, 522, 358, 400, 404, 0, 
-  390, 171, 358, 0, 186, 500, 146, 0, 643, 0, 
-  0, 178, 0, 0, 0, 0, 404, 60, 60, 489, 
-  452, 500, 320, 0, 534, 0, 405, 60, 0, 180, 
-  146, 60, 0, 180, 60, 407, 490, 60, 302, 452, 
-  60, 60, 60, 60, 405, 60, 284, 285, 287, 60, 
-  286, 451, 358, 60, 165, 180, 266, 60, 60, 461, 
-  451, 270, 288, 60, 60, 60, 493, 60, 60, 60, 
-  84, 106, 92, 91, 60, 432, 60, 72, 60, 168, 
-  98, 435, 77, 60, 96, 60, 60, 60, 341, 302, 
-  93, 94, 500, 108, 329, 100, 60, 102, 60, 618, 
-  302, 95, 88, 330, 60, 60, 60, 60, 90, 89, 
-  70, 60, 97, 452, 60, 60, 451, 492, 60, 60, 
-  494, 60, 61, 68, 60, 60, 69, 491, 60, 471, 
-  67, 302, 404, 480, 60, 106, 60, 479, 0, 270, 
-  298, 270, 298, 278, 298, 270, 0, 270, 60, 270, 
-  0, 316, 0, 270, 332, 0, 500, 108, 175, 538, 
-  405, 293, 319, 0, 317, 303, 326, 60, 60, 60, 
-  0, 0, 270, 270, 270, 290, 291, 60, 295, 298, 
-  60, 60, 270, 298, 270, 270, 270, 289, 270, 0, 
-  273, 500, 313, 0, 551, 545, 305, 534, 508, 615, 
-  542, 297, 0, 500, 0, 300, 499, 509, 500, 0, 
-  508, 0, 0, 0, 0, 508, 472, 0, 499, 509, 
-  583, 0, 0, 499, 509, 0, 0, 586, 579, 580, 
-  581, 582, 0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 0, 550, 
-  0, 0, 0, 0, 0, 0, 0, 0, 0, 551, 
-  0, 0, 0, 0, 0, 0, 552, 0, 0, 0, 
+  567, 169, 558, 570, 574, 515, 569, 557, 309, 548, 
+  461, 528, 311, 530, 417, 555, 307, 188, 415, 358, 
+  392, 250, 628, 612, 320, 623, 150, 253, 16, 637, 
+  496, 497, 498, 390, 614, 186, 634, 472, 182, 400, 
+  487, 243, 436, 238, 436, 176, 182, 302, 514, 171, 
+  238, 439, 334, 429, 439, 447, 454, 336, 339, 358, 
+  243, 140, 433, 302, 338, 237, 349, 351, 449, 482, 
+  146, 182, 148, 460, 485, 458, 353, 250, 250, 243, 
+  344, 410, 238, 163, 467, 456, 524, 143, 436, 425, 
+  237, 439, 445, 302, 402, 358, 461, 404, 0, 450, 
+  60, 358, 404, 186, 146, 92, 0, 0, 0, 407, 
+  500, 60, 0, 638, 500, 60, 84, 536, 320, 500, 
+  0, 98, 540, 60, 302, 60, 405, 490, 91, 302, 
+  0, 405, 60, 0, 180, 302, 60, 106, 489, 60, 
+  60, 60, 180, 60, 93, 60, 286, 60, 285, 60, 
+  94, 146, 284, 90, 60, 60, 178, 452, 89, 60, 
+  108, 60, 358, 60, 95, 60, 287, 471, 288, 88, 
+  60, 302, 451, 60, 60, 60, 452, 451, 60, 404, 
+  68, 432, 60, 102, 494, 60, 347, 67, 341, 60, 
+  330, 329, 61, 266, 60, 305, 69, 60, 270, 60, 
+  70, 303, 60, 60, 60, 480, 451, 0, 405, 479, 
+  72, 0, 60, 165, 491, 60, 60, 60, 180, 168, 
+  60, 97, 492, 60, 60, 452, 60, 60, 493, 100, 
+  96, 60, 0, 77, 60, 0, 270, 332, 298, 270, 
+  273, 60, 435, 270, 60, 298, 270, 298, 278, 270, 
+  270, 316, 270, 60, 298, 295, 298, 60, 270, 270, 
+  297, 270, 270, 106, 291, 60, 60, 326, 313, 317, 
+  270, 270, 290, 289, 552, 60, 319, 536, 300, 610, 
+  270, 519, 520, 521, 522, 500, 108, 175, 293, 0, 
+  0, 500, 508, 0, 0, 544, 0, 472, 613, 547, 
+  0, 499, 509, 500, 0, 0, 0, 500, 0, 0, 
+  508, 0, 0, 0, 508, 0, 0, 0, 577, 499, 
+  509, 0, 0, 499, 509, 580, 581, 519, 520, 521, 
+  522, 552, 0, 0, 0, 0, 0, 0, 553, 554, 
+  519, 520, 521, 522, 0, 0, 0, 0, 0, 0, 
   0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
   0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
   0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
+  0, 0, 0, 0, 0, 560, 519, 520, 521, 522, 
   0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
   0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
   0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
   0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
   0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0};
+  0, 0, 0, 0, 0, 0, 0, 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 short QmlJSGrammar::action_check [] = {
-  7, 16, 55, 7, 33, 36, 33, 55, 36, 7, 
-  7, 7, 7, 7, 7, 36, 7, 7, 36, 8, 
-  36, 55, 60, 29, 7, 7, 36, 7, 33, 7, 
-  7, 7, 7, 36, 36, 48, 1, 0, 90, 79, 
-  7, 33, 8, 90, 2, 7, 33, 55, 36, 60, 
-  36, 20, 33, 5, 1, 5, 79, 36, 7, 33, 
-  5, 60, 33, 33, 8, 33, 17, 24, 2, 7, 
-  34, 2, 7, 1, 7, 36, 60, 37, 8, 8, 
-  36, 66, 36, 7, 1, 17, -1, -1, 36, 48, 
-  36, 33, 8, 66, 7, 48, 36, 33, 7, 36, 
-  2, 7, 8, 8, 8, 77, 61, 15, 8, 8, 
-  6, -1, 31, 36, 8, 10, -1, -1, -1, 60, 
-  8, 60, -1, 48, 20, -1, 34, -1, 8, 8, 
-  8, -1, -1, 60, 60, 8, 79, 55, 60, 50, 
-  8, 61, 8, 54, 8, 8, 61, 61, 62, 61, 
-  62, 42, 56, 50, 40, 60, 56, 54, 79, 40, 
-  55, 60, 53, 61, 62, 51, 60, 15, 61, 62, 
-  51, 61, 62, 61, 61, 62, 56, 56, 61, 62, 
-  40, 8, 60, 8, 61, 62, 34, 60, 8, 61, 
-  62, 51, 60, 56, 60, 40, 60, 12, 29, 61, 
-  62, 25, 25, 27, 27, 15, 51, 36, 29, 15, 
-  29, 61, 62, 12, 38, 38, 8, 29, 7, 7, 
-  29, -1, 8, -1, 34, 8, 36, 25, 34, 27, 
-  36, 15, 61, 62, 61, 62, 61, 62, 7, 29, 
-  38, 91, 57, 7, 75, 33, 8, 25, 63, 27, 
-  34, -1, 36, -1, 75, 86, 75, 12, 57, -1, 
-  38, 15, -1, 75, 63, 86, 75, 86, 15, 61, 
-  62, -1, 61, 62, 86, 61, 62, 86, 61, 62, 
-  34, 25, 36, 27, -1, 75, 33, 34, 29, 36, 
-  18, 19, 61, 62, 38, 47, 86, 61, 62, 61, 
-  62, 15, 57, -1, 92, 18, 19, -1, 63, 61, 
-  62, 29, -1, 18, 19, 18, 19, 45, 46, 33, 
-  34, -1, 36, 29, -1, 66, 67, 68, -1, -1, 
-  -1, -1, 45, 46, 29, -1, -1, -1, 29, 91, 
-  45, 46, 45, 46, 23, 24, 29, -1, 66, 67, 
-  68, 92, 29, 32, 23, 24, 35, 25, 37, 27, 
-  66, 67, 68, 32, -1, 29, 35, -1, 37, 29, 
-  38, 66, 67, 68, 92, 66, 67, 68, -1, -1, 
-  29, -1, -1, 66, 67, 68, 92, 29, -1, 66, 
-  67, 68, 29, -1, -1, -1, -1, 92, 29, -1, 
-  -1, 92, 66, 67, 68, -1, 66, 67, 68, 92, 
-  -1, -1, -1, -1, 29, 92, -1, 66, 67, 68, 
-  29, -1, -1, -1, 66, 67, 68, 29, 92, 66, 
-  67, 68, 92, 23, 24, 66, 67, 68, -1, -1, 
-  -1, 29, 32, 92, -1, 35, -1, 37, 36, 29, 
-  92, 66, 67, 68, -1, 92, 36, 66, 67, 68, 
-  -1, 92, 23, 24, 66, 67, 68, -1, -1, -1, 
-  31, 32, -1, -1, 35, -1, 37, 92, 66, 67, 
-  68, -1, -1, 92, 23, 24, 66, 67, 68, 29, 
-  92, -1, 31, 32, 23, 24, 35, 29, 37, -1, 
-  -1, -1, 31, 32, 92, 29, 35, -1, 37, -1, 
-  -1, 29, 92, -1, 93, 94, 95, 96, 97, 98, 
-  -1, 61, 62, -1, 29, -1, 66, 67, 68, 61, 
-  62, -1, -1, 29, 66, 67, 68, 61, 62, -1, 
-  -1, -1, 66, 67, 68, -1, -1, -1, 66, 67, 
-  68, -1, 92, -1, -1, -1, 61, 62, -1, -1, 
-  92, 66, 67, 68, -1, 61, 62, 29, 92, -1, 
-  66, 67, 68, -1, 92, -1, -1, -1, -1, -1, 
-  -1, -1, -1, 23, 24, -1, -1, 92, 3, -1, 
-  -1, 31, 32, -1, -1, 35, 92, 37, 13, 61, 
-  62, -1, 17, -1, 66, 67, 68, -1, -1, -1, 
-  -1, 26, -1, 28, -1, -1, 31, -1, -1, -1, 
-  -1, -1, -1, -1, 39, -1, 41, 42, -1, -1, 
-  92, -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, 12, 
-  13, 3, -1, -1, -1, 80, -1, -1, -1, 22, 
-  -1, 13, -1, -1, -1, 17, 29, -1, -1, -1, 
-  33, 34, -1, 36, 26, -1, 28, -1, -1, -1, 
-  43, -1, -1, -1, 47, -1, -1, 39, -1, 41, 
-  42, -1, -1, -1, -1, -1, -1, 49, -1, -1, 
-  52, 53, 65, 66, 67, 68, 58, 70, -1, -1, 
-  -1, -1, 64, -1, -1, -1, -1, -1, 81, 82, 
-  83, 12, 13, -1, 87, -1, -1, -1, 80, 92, 
-  -1, 22, -1, -1, -1, -1, -1, -1, 29, -1, 
-  -1, -1, 33, 34, -1, 36, -1, -1, -1, 12, 
-  13, -1, 43, -1, -1, -1, 47, -1, -1, 22, 
-  -1, -1, -1, -1, -1, -1, 29, -1, -1, -1, 
-  33, 34, -1, 36, 65, 66, 67, 68, -1, 70, 
-  43, -1, -1, -1, 47, -1, -1, -1, -1, -1, 
-  81, 82, 83, -1, -1, -1, 87, -1, -1, -1, 
-  -1, 92, 65, 66, 67, 68, -1, 70, -1, -1, 
-  -1, -1, -1, -1, -1, -1, -1, -1, 81, 82, 
-  83, -1, -1, -1, 87, -1, -1, -1, -1, 92, 
-  12, 13, -1, -1, -1, -1, -1, -1, 12, 13, 
-  22, -1, -1, -1, -1, -1, -1, 29, 22, -1, 
-  -1, 33, 34, -1, 36, 29, -1, -1, -1, 33, 
-  34, 43, 36, -1, -1, 47, -1, -1, -1, 43, 
-  -1, -1, -1, 47, -1, -1, -1, -1, -1, -1, 
-  -1, -1, -1, 65, 66, 67, 68, -1, 70, -1, 
-  -1, 65, 66, 67, 68, -1, 70, -1, -1, 81, 
-  82, 83, -1, -1, -1, 87, -1, 81, 82, 83, 
-  92, -1, -1, 87, -1, -1, -1, -1, 92, 12, 
-  13, -1, -1, -1, -1, -1, -1, 12, 13, 22, 
-  -1, -1, -1, -1, -1, -1, 29, 22, -1, -1, 
-  33, 34, -1, 36, 29, -1, -1, -1, 33, 34, 
-  43, 36, -1, -1, 47, -1, -1, -1, 43, -1, 
-  -1, -1, 47, -1, -1, -1, -1, -1, -1, -1, 
-  -1, -1, 65, 66, 67, 68, -1, 70, -1, -1, 
-  65, 66, 67, 68, -1, 70, -1, -1, 81, 82, 
-  83, -1, -1, -1, 87, -1, 81, 82, 83, 92, 
-  -1, -1, 87, -1, -1, -1, -1, 92, -1, -1, 
-  -1, -1, -1, -1, -1, -1, 10, -1, 12, 13, 
-  -1, -1, -1, -1, -1, -1, -1, -1, 22, -1, 
-  -1, -1, -1, -1, -1, 29, -1, -1, -1, 33, 
-  34, -1, 36, -1, -1, -1, -1, -1, -1, 43, 
-  -1, -1, -1, 47, -1, -1, -1, -1, -1, -1, 
-  -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 
-  -1, 65, 66, 67, 68, -1, 70, -1, -1, -1, 
-  -1, 75, -1, -1, -1, -1, -1, 81, 82, 83, 
-  84, -1, -1, 87, -1, -1, -1, -1, 92, -1, 
-  -1, -1, -1, -1, -1, -1, -1, 10, -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, 55, -1, -1, -1, -1, -1, -1, -1, 
-  -1, -1, 65, 66, 67, 68, -1, 70, -1, -1, 
-  -1, -1, 75, -1, -1, -1, -1, -1, 81, 82, 
-  83, 84, -1, -1, 87, -1, -1, -1, -1, 92, 
-  -1, -1, -1, -1, -1, -1, -1, -1, 10, -1, 
+  36, 36, 33, 33, 60, 7, 7, 36, 8, 36, 
+  7, 16, 55, 7, 7, 7, 55, 36, 36, 7, 
+  90, 7, 55, 7, 36, 7, 60, 33, 60, 33, 
+  33, 7, 7, 29, 8, 60, 17, 7, 66, 37, 
+  66, 24, 33, 7, 34, 5, 33, 36, 33, 7, 
+  60, 5, 7, 33, 33, 7, 7, 20, 36, 36, 
+  5, 7, 61, 36, 7, 7, 77, 36, 17, 8, 
+  36, 79, 7, 2, 33, 36, 8, 1, 8, 36, 
+  48, 2, 1, 55, 79, 1, 36, 2, 8, 60, 
+  7, 31, 48, 0, 61, 36, 33, 8, 60, 7, 
+  36, 2, 55, 36, 7, 1, 8, -1, -1, 15, 
+  10, 8, -1, 60, 79, 8, 8, 61, 8, 50, 
+  48, 48, 60, 54, 8, 7, 8, 8, 34, 42, 
+  8, 8, 6, 8, -1, 61, 62, 8, 61, 62, 
+  53, 8, 90, 61, 62, 79, 20, 61, 62, 61, 
+  62, 61, 62, 15, 40, 55, 61, 62, 60, 7, 
+  40, 8, 8, 60, 56, 51, 56, 60, 40, 8, 
+  7, 51, 34, 61, 62, 56, 60, 40, 56, 51, 
+  50, 56, 15, 60, 54, 61, 62, 29, 51, 60, 
+  12, 12, 15, 60, 8, 61, 62, 25, -1, 27, 
+  12, 34, -1, 36, 61, 62, 25, -1, 27, 29, 
+  38, 34, 29, 36, 61, 61, 62, 7, 25, 38, 
+  27, 7, 61, 62, 61, 62, 25, 25, 27, 27, 
+  -1, 38, 29, 75, 91, 57, 57, 7, 15, 38, 
+  38, 63, 63, 33, 86, 57, -1, 61, 62, 15, 
+  25, 63, 27, 8, 25, 75, 27, 34, 75, 36, 
+  25, 29, 27, 38, -1, 29, 86, 38, 34, 86, 
+  36, -1, -1, 38, 36, 61, 62, 15, 75, -1, 
+  -1, 18, 19, -1, -1, 18, 19, -1, -1, 86, 
+  -1, 61, 62, 18, 19, 33, 34, 29, 36, 61, 
+  62, 47, 92, 18, 19, 60, 15, 75, 45, 46, 
+  -1, 75, 45, 46, -1, 61, 62, 29, 86, -1, 
+  45, 46, 86, -1, 33, 34, 29, 36, 23, 24, 
+  45, 46, 29, -1, 66, 67, 68, 32, 29, -1, 
+  35, -1, 37, -1, 29, 91, 25, 29, 27, -1, 
+  -1, -1, -1, -1, 66, 67, 68, -1, -1, 38, 
+  92, -1, -1, 66, 67, 68, -1, -1, -1, 66, 
+  67, 68, -1, -1, -1, 66, 67, 68, 23, 24, 
+  92, 66, 67, 68, 66, 67, 68, 32, -1, 92, 
+  35, -1, 37, -1, -1, 92, -1, 23, 24, -1, 
+  -1, 92, -1, 23, 24, -1, 32, 92, -1, 35, 
+  92, 37, 32, 29, -1, 35, -1, 37, 23, 24, 
+  36, -1, 29, -1, -1, -1, 31, 32, 23, 24, 
+  35, -1, 37, -1, -1, -1, 31, 32, -1, -1, 
+  35, -1, 37, 93, 94, 95, 96, 97, 98, -1, 
+  66, 67, 68, -1, 23, 24, -1, -1, -1, 66, 
+  67, 68, 31, 32, -1, -1, 35, -1, 37, 23, 
+  24, -1, 29, -1, -1, -1, 92, 31, 32, 23, 
+  24, 35, 29, 37, -1, 92, -1, 31, 32, 36, 
+  29, 35, -1, 37, 23, 24, -1, -1, -1, 29, 
+  -1, -1, -1, 32, 61, 62, 35, -1, 37, 66, 
+  67, 68, -1, -1, -1, -1, -1, 29, -1, 66, 
+  67, 68, 61, 62, -1, -1, 29, 66, 67, 68, 
+  -1, 61, 62, -1, -1, 92, 66, 67, 68, -1, 
+  -1, -1, -1, -1, -1, 92, -1, -1, -1, 61, 
+  62, -1, -1, 92, 66, 67, 68, -1, 61, 62, 
+  -1, -1, 92, 66, 67, 68, -1, -1, -1, -1, 
+  -1, -1, 29, -1, -1, -1, -1, -1, 3, -1, 
+  92, -1, -1, -1, -1, -1, -1, -1, 13, 92, 
+  -1, -1, 17, -1, -1, -1, -1, -1, -1, -1, 
+  -1, 26, -1, 28, 61, 62, 31, -1, -1, 66, 
+  67, 68, -1, -1, 39, -1, 41, 42, -1, -1, 
+  -1, -1, -1, -1, 49, -1, -1, 52, 53, -1, 
+  -1, -1, -1, 58, -1, 92, -1, -1, -1, 64, 
+  -1, -1, 12, 13, 3, -1, -1, -1, -1, -1, 
+  -1, -1, 22, -1, 13, 80, -1, -1, 17, 29, 
+  -1, -1, -1, 33, 34, -1, 36, 26, -1, 28, 
+  -1, -1, -1, 43, -1, -1, -1, 47, -1, -1, 
+  39, -1, 41, 42, -1, -1, -1, -1, -1, -1, 
+  49, -1, -1, 52, 53, 65, 66, 67, 68, 58, 
+  70, -1, -1, -1, -1, 64, -1, -1, -1, -1, 
+  -1, 81, 82, 83, 12, 13, -1, 87, -1, -1, 
+  -1, 80, 92, -1, 22, -1, -1, -1, -1, -1, 
+  -1, 29, -1, -1, -1, 33, 34, -1, 36, -1, 
+  -1, -1, 12, 13, -1, 43, -1, -1, -1, 47, 
+  -1, -1, 22, -1, -1, -1, -1, -1, -1, 29, 
+  -1, -1, -1, 33, 34, -1, 36, 65, 66, 67, 
+  68, -1, 70, 43, -1, -1, -1, 47, -1, -1, 
+  -1, -1, -1, 81, 82, 83, -1, -1, -1, 87, 
+  -1, -1, -1, -1, 92, 65, 66, 67, 68, -1, 
+  70, -1, -1, -1, -1, -1, -1, -1, -1, -1, 
+  -1, 81, 82, 83, -1, -1, -1, 87, -1, -1, 
+  -1, -1, 92, 12, 13, -1, -1, -1, -1, -1, 
+  -1, 12, 13, 22, -1, -1, -1, -1, -1, -1, 
+  29, 22, -1, -1, 33, 34, -1, 36, 29, -1, 
+  -1, -1, 33, 34, 43, 36, -1, -1, 47, -1, 
+  -1, -1, 43, -1, -1, -1, 47, -1, -1, -1, 
+  -1, -1, -1, -1, -1, -1, 65, 66, 67, 68, 
+  -1, 70, -1, -1, 65, 66, 67, 68, -1, 70, 
+  -1, -1, 81, 82, 83, -1, -1, -1, 87, -1, 
+  81, 82, 83, 92, -1, -1, 87, -1, -1, -1, 
+  -1, 92, -1, -1, -1, -1, -1, -1, -1, -1, 
   12, 13, -1, -1, -1, -1, -1, -1, -1, -1, 
   22, -1, -1, -1, -1, -1, -1, 29, -1, -1, 
   -1, 33, 34, -1, 36, -1, -1, -1, -1, -1, 
   -1, 43, -1, -1, -1, 47, -1, -1, -1, -1, 
-  -1, -1, -1, 55, -1, -1, -1, -1, -1, -1, 
-  -1, -1, -1, 65, 66, 67, 68, -1, 70, -1, 
-  -1, -1, -1, 75, -1, -1, -1, -1, -1, 81, 
-  82, 83, 84, -1, -1, 87, -1, -1, -1, -1, 
-  92, -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, -1, -1, -1, -1, -1, -1, -1, 
   -1, -1, -1, 65, 66, 67, 68, -1, 70, -1, 
-  72, -1, 74, -1, 76, -1, -1, -1, -1, 81, 
+  -1, -1, -1, -1, -1, -1, -1, -1, -1, 81, 
   82, 83, -1, -1, -1, 87, -1, -1, -1, -1, 
-  92, -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, 
-  68, -1, 70, -1, 72, -1, 74, -1, 76, -1, 
-  -1, -1, -1, 81, 82, 83, -1, -1, -1, 87, 
-  -1, -1, -1, -1, 92, -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, 
-  68, -1, 70, -1, 72, -1, 74, 75, 76, -1, 
-  -1, -1, -1, 81, 82, 83, -1, -1, -1, 87, 
-  -1, -1, -1, -1, 92, -1, -1, -1, -1, -1, 
-  -1, -1, -1, 8, -1, -1, 11, 12, 13, -1, 
+  92, -1, -1, -1, -1, -1, -1, -1, -1, 10, 
+  -1, 12, 13, -1, -1, -1, -1, -1, -1, -1, 
+  -1, 22, -1, -1, -1, -1, -1, -1, 29, -1, 
+  -1, -1, 33, 34, -1, 36, -1, -1, -1, -1, 
+  -1, -1, 43, -1, -1, -1, 47, -1, -1, -1, 
+  -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 
+  -1, -1, -1, -1, 65, 66, 67, 68, -1, 70, 
+  -1, -1, -1, -1, 75, -1, -1, -1, -1, -1, 
+  81, 82, 83, 84, -1, -1, 87, -1, -1, -1, 
+  -1, 92, -1, -1, -1, -1, -1, -1, -1, -1, 
+  10, -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, 55, -1, -1, -1, -1, 
+  -1, -1, -1, -1, -1, 65, 66, 67, 68, -1, 
+  70, -1, -1, -1, -1, 75, -1, -1, -1, -1, 
+  -1, 81, 82, 83, 84, -1, -1, 87, -1, -1, 
+  -1, -1, 92, -1, -1, -1, -1, -1, -1, -1, 
+  -1, 10, -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, 55, -1, -1, -1, 
+  -1, -1, -1, -1, -1, -1, 65, 66, 67, 68, 
+  -1, 70, -1, -1, -1, -1, 75, -1, -1, -1, 
+  -1, -1, 81, 82, 83, 84, -1, -1, 87, -1, 
+  -1, -1, -1, 92, -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, 68, 
+  -1, 70, -1, 72, -1, 74, -1, 76, -1, -1, 
+  -1, -1, 81, 82, 83, -1, -1, -1, 87, -1, 
+  -1, -1, -1, 92, -1, -1, -1, -1, -1, -1, 
+  -1, -1, 7, -1, -1, -1, 11, 12, 13, -1, 
   -1, -1, -1, -1, -1, -1, -1, 22, -1, -1, 
   -1, -1, -1, -1, 29, -1, -1, -1, 33, 34, 
   -1, 36, -1, -1, -1, 40, -1, 42, 43, 44, 
   -1, -1, 47, -1, -1, -1, 51, -1, 53, -1, 
-  -1, 56, -1, -1, -1, -1, -1, -1, -1, -1, 
+  -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 
+  65, 66, 67, 68, -1, 70, -1, 72, -1, 74, 
+  -1, 76, -1, -1, -1, -1, 81, 82, 83, -1, 
+  -1, -1, 87, -1, -1, -1, -1, 92, -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, 68, -1, 70, -1, 72, -1, 74, 
+  75, 76, -1, -1, -1, -1, 81, 82, 83, -1, 
+  -1, -1, 87, -1, -1, -1, -1, 92, -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, 68, -1, 70, -1, 72, -1, 74, 
   -1, 76, -1, -1, -1, -1, 81, 82, 83, -1, 
   -1, -1, 87, -1, -1, -1, -1, 92, -1, -1, 
@@ -831,6 +839,15 @@ const short QmlJSGrammar::action_check [] = {
   -1, -1, -1, 65, 66, 67, 68, -1, 70, -1, 
   72, -1, 74, -1, 76, -1, -1, -1, -1, 81, 
   82, 83, -1, -1, -1, 87, -1, -1, -1, -1, 
+  92, -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, 68, -1, 70, -1, 
+  72, -1, 74, -1, 76, -1, -1, -1, -1, 81, 
+  82, 83, -1, -1, -1, 87, -1, -1, -1, -1, 
   92, -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, 
@@ -850,44 +867,54 @@ const short QmlJSGrammar::action_check [] = {
   66, 67, 68, -1, 70, -1, 72, -1, 74, -1, 
   76, -1, -1, -1, -1, 81, 82, 83, -1, -1, 
   -1, 87, -1, -1, -1, -1, 92, -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, 68, -1, 70, -1, 72, -1, 74, -1, 
-  76, -1, -1, -1, -1, 81, 82, 83, -1, -1, 
-  -1, 87, -1, -1, -1, -1, 92, -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, 68, -1, 70, -1, 72, 
+  -1, 74, -1, 76, -1, -1, -1, -1, 81, 82, 
+  83, -1, -1, -1, 87, -1, -1, -1, -1, 92, 
+  -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, 71, -1, 73, 74, 75, 
+  76, 77, 78, -1, -1, 81, 82, 83, 84, 85, 
+  86, -1, -1, -1, -1, -1, 92, -1, -1, -1, 
   -1, -1, -1, -1, -1, 4, 5, 6, -1, -1, 
   9, 10, 11, -1, -1, 14, -1, 16, -1, -1, 
   -1, 20, 21, 22, -1, -1, -1, -1, -1, -1, 
   29, 30, 31, 32, -1, -1, -1, -1, -1, -1, 
-  -1, -1, -1, -1, 43, -1, -1, -1, -1, -1, 
+  -1, -1, -1, -1, 43, -1, -1, -1, 47, -1, 
   -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 
-  59, -1, -1, -1, -1, -1, -1, 66, 67, 68, 
+  59, -1, -1, -1, -1, -1, 65, 66, 67, -1, 
   69, 70, 71, -1, 73, 74, 75, 76, 77, 78, 
   -1, -1, 81, 82, 83, 84, 85, 86, -1, -1, 
-  -1, -1, -1, 92, -1, -1, -1, -1, -1, -1, 
+  -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 
   -1, -1, 4, 5, 6, -1, -1, 9, 10, 11, 
   -1, -1, 14, -1, 16, -1, -1, -1, 20, 21, 
   22, -1, -1, -1, -1, -1, -1, 29, 30, 31, 
   32, -1, -1, -1, -1, -1, -1, -1, -1, -1, 
   -1, 43, -1, -1, -1, 47, -1, -1, -1, -1, 
-  -1, -1, -1, -1, -1, -1, -1, 59, -1, -1, 
+  -1, -1, -1, 55, -1, -1, -1, 59, -1, -1, 
   -1, -1, -1, 65, 66, 67, -1, 69, 70, 71, 
   -1, 73, 74, 75, 76, 77, 78, -1, -1, 81, 
   82, 83, 84, 85, 86, -1, -1, -1, -1, -1, 
   -1, -1, -1, -1, -1, -1, -1, -1, -1, 4, 
-  5, 6, -1, -1, 9, 10, 11, -1, -1, 14, 
-  -1, 16, -1, -1, -1, 20, 21, 22, -1, -1, 
-  -1, -1, -1, -1, 29, 30, 31, 32, -1, -1, 
-  -1, -1, -1, -1, -1, -1, -1, -1, 43, -1, 
-  -1, -1, 47, -1, -1, -1, -1, -1, -1, -1, 
-  55, -1, -1, -1, 59, -1, -1, -1, -1, -1, 
-  65, 66, 67, -1, 69, 70, 71, -1, 73, 74, 
+  -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, 78, -1, -1, 81, 82, 83, 84, 
-  85, 86, -1, -1, -1, -1, -1, -1, -1, -1, 
+  85, -1, 87, -1, -1, -1, -1, 92, -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, 
@@ -898,74 +925,66 @@ const short QmlJSGrammar::action_check [] = {
   68, 69, 70, 71, 72, 73, 74, 75, 76, 77, 
   78, -1, -1, 81, 82, 83, 84, 85, -1, 87, 
   -1, -1, -1, -1, 92, -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, 
+  -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, 
-  -1, -1, 33, 34, -1, 36, -1, -1, -1, 40, 
+  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, 78, -1, -1, 
-  81, 82, 83, 84, 85, -1, 87, -1, -1, -1, 
+  81, 82, 83, 84, 85, 86, 87, -1, -1, -1, 
   -1, 92, -1, -1, -1, -1, -1, -1, -1, -1, 
   4, 5, 6, -1, -1, 9, 10, 11, 12, 13, 
   14, -1, 16, -1, -1, -1, 20, 21, 22, -1, 
   -1, -1, -1, -1, -1, 29, 30, 31, 32, 33, 
   34, -1, 36, -1, -1, -1, 40, -1, 42, 43, 
   44, -1, -1, 47, -1, -1, -1, 51, -1, 53, 
-  -1, -1, -1, -1, -1, 59, -1, 61, -1, -1, 
+  -1, 55, -1, -1, -1, 59, -1, 61, -1, -1, 
   -1, 65, 66, 67, 68, 69, 70, 71, 72, 73, 
   74, 75, 76, 77, 78, -1, -1, 81, 82, 83, 
   84, 85, 86, 87, -1, -1, -1, -1, 92, -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, 78, -1, -1, 81, 82, 83, 84, 85, 86, 
-  87, -1, -1, -1, -1, 92, -1, -1, -1, -1, 
-  -1, -1, -1, -1, 
+  -1, -1, -1, -1, -1, -1, -1, 
 
-  35, 15, 15, 15, 2, 15, 3, 2, 25, 3, 
-  15, 15, 104, 15, 4, 3, 3, 3, 19, 15, 
-  2, 21, 15, 15, 3, 67, 25, 3, 19, 2, 
-  15, 2, 15, 13, 15, 19, 25, 3, 15, 11, 
-  15, 2, 96, 3, 2, 15, 2, 25, 3, 2, 
-  15, 100, 15, 93, 3, 2, 15, 98, 15, 2, 
-  2, 35, 3, 3, 15, 2, 35, 35, 35, 21, 
-  2, 25, 3, 35, 4, 21, 15, 2, 2, 15, 
-  2, 4, 3, 3, 3, 35, 2, 35, 21, 3, 
-  35, 3, 36, 21, 3, 13, 2, 35, 13, -1, 
-  35, 35, 2, -1, 15, 13, 35, -1, 16, -1, 
-  -1, 40, -1, -1, -1, -1, 13, 44, 44, 46, 
-  46, 13, 15, -1, 16, -1, 41, 44, -1, 46, 
-  35, 44, -1, 46, 44, 40, 46, 44, 3, 46, 
-  44, 44, 44, 44, 41, 44, 49, 49, 49, 44, 
-  49, 46, 2, 44, 58, 46, 44, 44, 44, 15, 
-  46, 49, 49, 44, 44, 44, 46, 44, 44, 44, 
-  49, 15, 49, 49, 44, 81, 44, 52, 44, 60, 
-  50, 81, 50, 44, 50, 44, 44, 44, 99, 3, 
-  49, 49, 13, 37, 87, 56, 44, 54, 44, 20, 
-  3, 49, 48, 68, 44, 44, 44, 44, 48, 48, 
-  47, 44, 50, 46, 44, 44, 46, 46, 44, 44, 
-  46, 44, 47, 46, 44, 44, 46, 46, 44, 85, 
-  46, 3, 13, 31, 44, 15, 44, 35, -1, 49, 
-  44, 49, 44, 51, 44, 49, -1, 49, 44, 49, 
-  -1, 61, -1, 49, 68, -1, 13, 37, 38, 16, 
-  41, 57, 66, -1, 66, 68, 66, 44, 44, 44, 
-  -1, -1, 49, 49, 49, 51, 51, 44, 55, 44, 
-  44, 44, 49, 44, 49, 49, 49, 51, 49, -1, 
-  53, 13, 59, -1, 13, 5, 68, 16, 20, 18, 
-  5, 66, -1, 13, -1, 66, 28, 29, 13, -1, 
-  20, -1, -1, -1, -1, 20, 35, -1, 28, 29, 
-  13, -1, -1, 28, 29, -1, -1, 20, 21, 22, 
-  23, 24, -1, -1, -1, -1, -1, -1, -1, -1, 
-  -1, -1, -1, -1, -1, -1, -1, -1, -1, 3, 
-  -1, -1, -1, -1, -1, -1, -1, -1, -1, 13, 
-  -1, -1, -1, -1, -1, -1, 20, -1, -1, -1, 
+  26, 36, 15, 15, 15, 15, 26, 26, 3, 15, 
+  15, 26, 2, 15, 3, 19, 2, 15, 2, 2, 
+  37, 2, 15, 19, 15, 13, 68, 3, 3, 11, 
+  105, 4, 2, 36, 19, 15, 15, 36, 15, 36, 
+  3, 15, 3, 15, 3, 3, 15, 3, 26, 36, 
+  15, 22, 2, 94, 22, 15, 3, 3, 15, 2, 
+  15, 3, 3, 3, 2, 4, 3, 2, 22, 36, 
+  36, 15, 36, 2, 36, 3, 2, 2, 2, 15, 
+  101, 2, 15, 36, 36, 2, 13, 36, 3, 97, 
+  4, 22, 99, 3, 2, 2, 15, 13, -1, 22, 
+  45, 2, 13, 15, 36, 50, -1, -1, -1, 41, 
+  13, 45, -1, 16, 13, 45, 50, 16, 15, 13, 
+  -1, 51, 16, 45, 3, 45, 42, 47, 50, 3, 
+  -1, 42, 45, -1, 47, 3, 45, 15, 47, 45, 
+  45, 45, 47, 45, 50, 45, 50, 45, 50, 45, 
+  50, 36, 50, 49, 45, 45, 41, 47, 49, 45, 
+  38, 45, 2, 45, 50, 45, 50, 86, 50, 49, 
+  45, 3, 47, 45, 45, 45, 47, 47, 45, 13, 
+  47, 82, 45, 55, 47, 45, 2, 47, 100, 45, 
+  69, 88, 48, 45, 45, 69, 47, 45, 50, 45, 
+  48, 69, 45, 45, 45, 32, 47, -1, 42, 36, 
+  53, -1, 45, 59, 47, 45, 45, 45, 47, 61, 
+  45, 51, 47, 45, 45, 47, 45, 45, 47, 57, 
+  51, 45, -1, 51, 45, -1, 50, 69, 45, 50, 
+  54, 45, 82, 50, 45, 45, 50, 45, 52, 50, 
+  50, 62, 50, 45, 45, 56, 45, 45, 50, 50, 
+  67, 50, 50, 15, 52, 45, 45, 67, 60, 67, 
+  50, 50, 52, 52, 13, 45, 67, 16, 67, 18, 
+  50, 22, 23, 24, 25, 13, 38, 39, 58, -1, 
+  -1, 13, 20, -1, -1, 5, -1, 36, 20, 5, 
+  -1, 29, 30, 13, -1, -1, -1, 13, -1, -1, 
+  20, -1, -1, -1, 20, -1, -1, -1, 13, 29, 
+  30, -1, -1, 29, 30, 20, 21, 22, 23, 24, 
+  25, 13, -1, -1, -1, -1, -1, -1, 20, 21, 
+  22, 23, 24, 25, -1, -1, -1, -1, -1, -1, 
+  -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 
+  -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 
+  -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 
+  -1, -1, -1, -1, -1, 21, 22, 23, 24, 25, 
   -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 
   -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 
   -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 
@@ -974,6 +993,6 @@ const short QmlJSGrammar::action_check [] = {
   -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 
   -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 
   -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 
-  -1, -1};
+  -1};
 
 QT_END_NAMESPACE
diff --git a/src/libs/qmljs/parser/qmljsgrammar_p.h b/src/libs/qmljs/parser/qmljsgrammar_p.h
index a0561878f0..7e55a38b26 100644
--- a/src/libs/qmljs/parser/qmljsgrammar_p.h
+++ b/src/libs/qmljs/parser/qmljsgrammar_p.h
@@ -6,6 +6,7 @@
 **
 ** Contact: Nokia Corporation (info@qt.nokia.com)
 **
+**
 ** GNU Lesser General Public License Usage
 **
 ** This file may be used under the terms of the GNU Lesser General Public
@@ -154,15 +155,15 @@ public:
     T_XOR = 79,
     T_XOR_EQ = 80,
 
-    ACCEPT_STATE = 645,
-    RULE_COUNT = 347,
-    STATE_COUNT = 646,
+    ACCEPT_STATE = 640,
+    RULE_COUNT = 345,
+    STATE_COUNT = 641,
     TERMINAL_COUNT = 101,
-    NON_TERMINAL_COUNT = 106,
+    NON_TERMINAL_COUNT = 107,
 
-    GOTO_INDEX_OFFSET = 646,
-    GOTO_INFO_OFFSET = 2714,
-    GOTO_CHECK_OFFSET = 2714
+    GOTO_INDEX_OFFSET = 641,
+    GOTO_INFO_OFFSET = 2787,
+    GOTO_CHECK_OFFSET = 2787
   };
 
   static const char  *const    spell [];
diff --git a/src/libs/qmljs/parser/qmljslexer.cpp b/src/libs/qmljs/parser/qmljslexer.cpp
index 21f9907319..296de77653 100644
--- a/src/libs/qmljs/parser/qmljslexer.cpp
+++ b/src/libs/qmljs/parser/qmljslexer.cpp
@@ -6,6 +6,7 @@
 **
 ** Contact: Nokia Corporation (info@qt.nokia.com)
 **
+**
 ** GNU Lesser General Public License Usage
 **
 ** This file may be used under the terms of the GNU Lesser General Public
diff --git a/src/libs/qmljs/parser/qmljslexer_p.h b/src/libs/qmljs/parser/qmljslexer_p.h
index ba6fa1dec1..7f081afbec 100644
--- a/src/libs/qmljs/parser/qmljslexer_p.h
+++ b/src/libs/qmljs/parser/qmljslexer_p.h
@@ -6,6 +6,7 @@
 **
 ** Contact: Nokia Corporation (info@qt.nokia.com)
 **
+**
 ** GNU Lesser General Public License Usage
 **
 ** This file may be used under the terms of the GNU Lesser General Public
diff --git a/src/libs/qmljs/parser/qmljsmemorypool_p.h b/src/libs/qmljs/parser/qmljsmemorypool_p.h
index 268dbb4267..a3f1bb9f32 100644
--- a/src/libs/qmljs/parser/qmljsmemorypool_p.h
+++ b/src/libs/qmljs/parser/qmljsmemorypool_p.h
@@ -6,6 +6,7 @@
 **
 ** Contact: Nokia Corporation (info@qt.nokia.com)
 **
+**
 ** GNU Lesser General Public License Usage
 **
 ** This file may be used under the terms of the GNU Lesser General Public
diff --git a/src/libs/qmljs/parser/qmljsnodepool_p.h b/src/libs/qmljs/parser/qmljsnodepool_p.h
index ebdad68717..ce01077df7 100644
--- a/src/libs/qmljs/parser/qmljsnodepool_p.h
+++ b/src/libs/qmljs/parser/qmljsnodepool_p.h
@@ -6,6 +6,7 @@
 **
 ** Contact: Nokia Corporation (info@qt.nokia.com)
 **
+**
 ** GNU Lesser General Public License Usage
 **
 ** This file may be used under the terms of the GNU Lesser General Public
diff --git a/src/libs/qmljs/parser/qmljsparser.cpp b/src/libs/qmljs/parser/qmljsparser.cpp
index 74c4cf27d2..42b94f451e 100644
--- a/src/libs/qmljs/parser/qmljsparser.cpp
+++ b/src/libs/qmljs/parser/qmljsparser.cpp
@@ -6,6 +6,7 @@
 **
 ** Contact: Nokia Corporation (info@qt.nokia.com)
 **
+**
 ** GNU Lesser General Public License Usage
 **
 ** This file may be used under the terms of the GNU Lesser General Public
@@ -351,7 +352,8 @@ case 33: {
     node->hasOnToken = true;
     sym(1).Node = node;
 } break;
-case 34:case 35:case 36:case 37:
+
+case 38:
 {
     AST::UiScriptBinding *node = makeAstNode<AST::UiScriptBinding> (driver->nodePool(),
         sym(1).UiQualifiedId, sym(3).Statement);
@@ -359,35 +361,35 @@ case 34:case 35:case 36:case 37:
     sym(1).Node = node;
 }   break;
 
-case 38:
+case 39:
 
-case 39: {
+case 40: {
     sym(1).sval = driver->intern(lexer->characterBuffer(), lexer->characterCount());
     break;
 }
 
-case 41: {
+case 42: {
   sym(1).Node = 0;
 } break;
 
-case 42: {
+case 43: {
   sym(1).Node = sym(1).UiParameterList->finish ();
 } break;
 
-case 43: {
+case 44: {
   AST::UiParameterList *node = makeAstNode<AST::UiParameterList> (driver->nodePool(), sym(1).sval, sym(2).sval);
   node->identifierToken = loc(2);
   sym(1).Node = node;
 } break;
 
-case 44: {
+case 45: {
   AST::UiParameterList *node = makeAstNode<AST::UiParameterList> (driver->nodePool(), sym(1).UiParameterList, sym(3).sval, sym(4).sval);
   node->commaToken = loc(2);
   node->identifierToken = loc(4);
   sym(1).Node = node;
 } break;
 
-case 46: {
+case 47: {
     AST::UiPublicMember *node = makeAstNode<AST::UiPublicMember> (driver->nodePool(), (NameId *)0, sym(2).sval);
     node->type = AST::UiPublicMember::Signal;
     node->propertyToken = loc(1);
@@ -398,7 +400,7 @@ case 46: {
     sym(1).Node = node;
 }   break;
 
-case 48: {
+case 49: {
     AST::UiPublicMember *node = makeAstNode<AST::UiPublicMember> (driver->nodePool(), (NameId *)0, sym(2).sval);
     node->type = AST::UiPublicMember::Signal;
     node->propertyToken = loc(1);
@@ -408,7 +410,7 @@ case 48: {
     sym(1).Node = node;
 }   break;
 
-case 50: {
+case 51: {
     AST::UiPublicMember *node = makeAstNode<AST::UiPublicMember> (driver->nodePool(), sym(4).sval, sym(6).sval);
     node->typeModifier = sym(2).sval;
     node->propertyToken = loc(1);
@@ -419,7 +421,7 @@ case 50: {
     sym(1).Node = node;
 }   break;
 
-case 52: {
+case 53: {
     AST::UiPublicMember *node = makeAstNode<AST::UiPublicMember> (driver->nodePool(), sym(2).sval, sym(3).sval);
     node->propertyToken = loc(1);
     node->typeToken = loc(2);
@@ -428,7 +430,7 @@ case 52: {
     sym(1).Node = node;
 }   break;
 
-case 54: {
+case 55: {
     AST::UiPublicMember *node = makeAstNode<AST::UiPublicMember> (driver->nodePool(), sym(3).sval, sym(4).sval);
     node->isDefaultMember = true;
     node->defaultToken = loc(1);
@@ -441,42 +443,39 @@ case 54: {
 
 case 56: {
     AST::UiPublicMember *node = makeAstNode<AST::UiPublicMember> (driver->nodePool(), sym(2).sval, sym(3).sval,
-        sym(5).Expression);
+        sym(5).Statement);
     node->propertyToken = loc(1);
     node->typeToken = loc(2);
     node->identifierToken = loc(3);
     node->colonToken = loc(4);
-    node->semicolonToken = loc(6);
     sym(1).Node = node;
 }   break;
 
-case 58: {
+case 57: {
     AST::UiPublicMember *node = makeAstNode<AST::UiPublicMember> (driver->nodePool(), sym(3).sval, sym(4).sval,
-        sym(6).Expression);
+        sym(6).Statement);
     node->isReadonlyMember = true;
     node->readonlyToken = loc(1);
     node->propertyToken = loc(2);
     node->typeToken = loc(3);
     node->identifierToken = loc(4);
     node->colonToken = loc(5);
-    node->semicolonToken = loc(7);
     sym(1).Node = node;
 }   break;
 
-case 60: {
+case 58: {
     AST::UiPublicMember *node = makeAstNode<AST::UiPublicMember> (driver->nodePool(), sym(3).sval, sym(4).sval,
-        sym(6).Expression);
+        sym(6).Statement);
     node->isDefaultMember = true;
     node->defaultToken = loc(1);
     node->propertyToken = loc(2);
     node->typeToken = loc(3);
     node->identifierToken = loc(4);
     node->colonToken = loc(5);
-    node->semicolonToken = loc(7);
     sym(1).Node = node;
 }   break;
 
-case 61: {
+case 59: {
     AST::UiPublicMember *node = makeAstNode<AST::UiPublicMember> (driver->nodePool(), sym(4).sval, sym(6).sval);
     node->typeModifier = sym(2).sval;
     node->propertyToken = loc(1);
@@ -500,7 +499,7 @@ case 61: {
     sym(1).Node = node;
 }   break;
 
-case 62: {
+case 60: {
     AST::UiPublicMember *node = makeAstNode<AST::UiPublicMember> (driver->nodePool(), sym(2).sval, sym(3).sval);
     node->propertyToken = loc(1);
     node->typeToken = loc(2);
@@ -520,81 +519,81 @@ case 62: {
     sym(1).Node = node;
 }   break;
 
-case 63: {
+case 61: {
     sym(1).Node = makeAstNode<AST::UiSourceElement>(driver->nodePool(), sym(1).Node);
 }   break;
 
-case 64: {
+case 62: {
     sym(1).Node = makeAstNode<AST::UiSourceElement>(driver->nodePool(), sym(1).Node);
 }   break;
 
-case 66: {
+case 64: {
     QString s = QLatin1String(QmlJSGrammar::spell[T_PROPERTY]);
     sym(1).sval = driver->intern(s.constData(), s.length());
     break;
 }
 
-case 67: {
+case 65: {
     QString s = QLatin1String(QmlJSGrammar::spell[T_SIGNAL]);
     sym(1).sval = driver->intern(s.constData(), s.length());
     break;
 }
 
-case 68: {
+case 66: {
     QString s = QLatin1String(QmlJSGrammar::spell[T_READONLY]);
     sym(1).sval = driver->intern(s.constData(), s.length());
     break;
 }
 
-case 69: {
+case 67: {
     QString s = QLatin1String(QmlJSGrammar::spell[T_ON]);
     sym(1).sval = driver->intern(s.constData(), s.length());
     break;
 }
 
-case 70: {
+case 68: {
   AST::ThisExpression *node = makeAstNode<AST::ThisExpression> (driver->nodePool());
   node->thisToken = loc(1);
   sym(1).Node = node;
 } break;
 
-case 71: {
+case 69: {
   AST::IdentifierExpression *node = makeAstNode<AST::IdentifierExpression> (driver->nodePool(), sym(1).sval);
   node->identifierToken = loc(1);
   sym(1).Node = node;
 } break;
 
-case 72: {
+case 70: {
   AST::NullExpression *node = makeAstNode<AST::NullExpression> (driver->nodePool());
   node->nullToken = loc(1);
   sym(1).Node = node;
 } break;
 
-case 73: {
+case 71: {
   AST::TrueLiteral *node = makeAstNode<AST::TrueLiteral> (driver->nodePool());
   node->trueToken = loc(1);
   sym(1).Node = node;
 } break;
 
-case 74: {
+case 72: {
   AST::FalseLiteral *node = makeAstNode<AST::FalseLiteral> (driver->nodePool());
   node->falseToken = loc(1);
   sym(1).Node = node;
 } break;
 
-case 75: {
+case 73: {
   AST::NumericLiteral *node = makeAstNode<AST::NumericLiteral> (driver->nodePool(), sym(1).dval);
   node->literalToken = loc(1);
   sym(1).Node = node;
 } break;
-case 76:
-case 77: {
+case 74:
+case 75: {
   AST::StringLiteral *node = makeAstNode<AST::StringLiteral> (driver->nodePool(), sym(1).sval);
   node->literalToken = loc(1);
   sym(1).Node = node;
 } break;
 
-case 78: {
+case 76: {
   bool rx = lexer->scanRegExp(Lexer::NoPrefix);
   if (!rx) {
     diagnostic_messages.append(DiagnosticMessage(DiagnosticMessage::Error, location(lexer), lexer->errorMessage()));
@@ -608,7 +607,7 @@ case 78: {
   sym(1).Node = node;
 } break;
 
-case 79: {
+case 77: {
   bool rx = lexer->scanRegExp(Lexer::EqualPrefix);
   if (!rx) {
     diagnostic_messages.append(DiagnosticMessage(DiagnosticMessage::Error, location(lexer), lexer->errorMessage()));
@@ -622,28 +621,28 @@ case 79: {
   sym(1).Node = node;
 } break;
 
-case 80: {
+case 78: {
   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 81: {
+case 79: {
   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 82: {
+case 80: {
   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 83: {
+case 81: {
   AST::ArrayLiteral *node = makeAstNode<AST::ArrayLiteral> (driver->nodePool(), sym(2).ElementList->finish (),
     (AST::Elision *) 0);
   node->lbracketToken = loc(1);
@@ -652,7 +651,7 @@ case 83: {
   sym(1).Node = node;
 } break;
 
-case 84: {
+case 82: {
   AST::ArrayLiteral *node = makeAstNode<AST::ArrayLiteral> (driver->nodePool(), sym(2).ElementList->finish (),
     sym(4).Elision->finish());
   node->lbracketToken = loc(1);
@@ -661,7 +660,7 @@ case 84: {
   sym(1).Node = node;
 } break;
 
-case 85: {
+case 83: {
   AST::ObjectLiteral *node = 0;
   if (sym(2).Node)
     node = makeAstNode<AST::ObjectLiteral> (driver->nodePool(),
@@ -673,7 +672,7 @@ case 85: {
   sym(1).Node = node;
 } break;
 
-case 86: {
+case 84: {
   AST::ObjectLiteral *node = makeAstNode<AST::ObjectLiteral> (driver->nodePool(),
     sym(2).PropertyNameAndValueList->finish ());
   node->lbraceToken = loc(1);
@@ -681,14 +680,14 @@ case 86: {
   sym(1).Node = node;
 } break;
 
-case 87: {
+case 85: {
   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 88: {
+case 86: {
   if (AST::ArrayMemberExpression *mem = AST::cast<AST::ArrayMemberExpression *>(sym(1).Expression)) {
     diagnostic_messages.append(DiagnosticMessage(DiagnosticMessage::Warning, mem->lbracketToken,
       QLatin1String("Ignored annotation")));
@@ -708,48 +707,48 @@ case 88: {
   }
 } break;
 
-case 89: {
+case 87: {
   sym(1).Node = makeAstNode<AST::ElementList> (driver->nodePool(), (AST::Elision *) 0, sym(1).Expression);
 } break;
 
-case 90: {
+case 88: {
   sym(1).Node = makeAstNode<AST::ElementList> (driver->nodePool(), sym(1).Elision->finish(), sym(2).Expression);
 } break;
 
-case 91: {
+case 89: {
   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 92: {
+case 90: {
   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 93: {
+case 91: {
   AST::Elision *node = makeAstNode<AST::Elision> (driver->nodePool());
   node->commaToken = loc(1);
   sym(1).Node = node;
 } break;
 
-case 94: {
+case 92: {
   AST::Elision *node = makeAstNode<AST::Elision> (driver->nodePool(), sym(1).Elision);
   node->commaToken = loc(2);
   sym(1).Node = node;
 } break;
 
-case 95: {
+case 93: {
   AST::PropertyNameAndValueList *node = makeAstNode<AST::PropertyNameAndValueList> (driver->nodePool(),
       sym(1).PropertyName, sym(3).Expression);
   node->colonToken = loc(2);
   sym(1).Node = node;
 } break;
 
-case 96: {
+case 94: {
   AST::PropertyNameAndValueList *node = makeAstNode<AST::PropertyNameAndValueList> (driver->nodePool(),
       sym(1).PropertyNameAndValueList, sym(3).PropertyName, sym(5).Expression);
   node->commaToken = loc(2);
@@ -757,36 +756,40 @@ case 96: {
   sym(1).Node = node;
 } break;
 
-case 97: {
+case 95: {
   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 96:
+case 97: {
   AST::IdentifierPropertyName *node = makeAstNode<AST::IdentifierPropertyName> (driver->nodePool(), driver->intern(lexer->characterBuffer(), lexer->characterCount()));
   node->propertyNameToken = loc(1);
   sym(1).Node = node;
 } break;
 
-case 100: {
+case 98: {
   AST::StringLiteralPropertyName *node = makeAstNode<AST::StringLiteralPropertyName> (driver->nodePool(), sym(1).sval);
   node->propertyNameToken = loc(1);
   sym(1).Node = node;
 } break;
 
-case 101: {
+case 99: {
   AST::NumericLiteralPropertyName *node = makeAstNode<AST::NumericLiteralPropertyName> (driver->nodePool(), sym(1).dval);
   node->propertyNameToken = loc(1);
   sym(1).Node = node;
 } break;
 
-case 102: {
+case 100: {
   AST::IdentifierPropertyName *node = makeAstNode<AST::IdentifierPropertyName> (driver->nodePool(), sym(1).sval);
   node->propertyNameToken = loc(1);
   sym(1).Node = node;
 } break;
 
+case 101:
+
+case 102:
+
 case 103:
 
 case 104:
@@ -844,29 +847,25 @@ case 129:
 case 130:
 
 case 131:
-
-case 132:
-
-case 133:
 {
   sym(1).sval = driver->intern(lexer->characterBuffer(), lexer->characterCount());
 } break;
 
-case 138: {
+case 136: {
   AST::ArrayMemberExpression *node = makeAstNode<AST::ArrayMemberExpression> (driver->nodePool(), sym(1).Expression, sym(3).Expression);
   node->lbracketToken = loc(2);
   node->rbracketToken = loc(4);
   sym(1).Node = node;
 } break;
 
-case 139: {
+case 137: {
   AST::FieldMemberExpression *node = makeAstNode<AST::FieldMemberExpression> (driver->nodePool(), sym(1).Expression, sym(3).sval);
   node->dotToken = loc(2);
   node->identifierToken = loc(3);
   sym(1).Node = node;
 } break;
 
-case 140: {
+case 138: {
   AST::NewMemberExpression *node = makeAstNode<AST::NewMemberExpression> (driver->nodePool(), sym(2).Expression, sym(4).ArgumentList);
   node->newToken = loc(1);
   node->lparenToken = loc(3);
@@ -874,384 +873,384 @@ case 140: {
   sym(1).Node = node;
 } break;
 
-case 142: {
+case 140: {
   AST::NewExpression *node = makeAstNode<AST::NewExpression> (driver->nodePool(), sym(2).Expression);
   node->newToken = loc(1);
   sym(1).Node = node;
 } break;
 
-case 143: {
+case 141: {
   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 144: {
+case 142: {
   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 145: {
+case 143: {
   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 146: {
+case 144: {
   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 147: {
+case 145: {
   sym(1).Node = 0;
 } break;
 
-case 148: {
+case 146: {
   sym(1).Node = sym(1).ArgumentList->finish();
 } break;
 
-case 149: {
+case 147: {
   sym(1).Node = makeAstNode<AST::ArgumentList> (driver->nodePool(), sym(1).Expression);
 } break;
 
-case 150: {
+case 148: {
   AST::ArgumentList *node = makeAstNode<AST::ArgumentList> (driver->nodePool(), sym(1).ArgumentList, sym(3).Expression);
   node->commaToken = loc(2);
   sym(1).Node = node;
 } break;
 
-case 154: {
+case 152: {
   AST::PostIncrementExpression *node = makeAstNode<AST::PostIncrementExpression> (driver->nodePool(), sym(1).Expression);
   node->incrementToken = loc(2);
   sym(1).Node = node;
 } break;
 
-case 155: {
+case 153: {
   AST::PostDecrementExpression *node = makeAstNode<AST::PostDecrementExpression> (driver->nodePool(), sym(1).Expression);
   node->decrementToken = loc(2);
   sym(1).Node = node;
 } break;
 
-case 157: {
+case 155: {
   AST::DeleteExpression *node = makeAstNode<AST::DeleteExpression> (driver->nodePool(), sym(2).Expression);
   node->deleteToken = loc(1);
   sym(1).Node = node;
 } break;
 
-case 158: {
+case 156: {
   AST::VoidExpression *node = makeAstNode<AST::VoidExpression> (driver->nodePool(), sym(2).Expression);
   node->voidToken = loc(1);
   sym(1).Node = node;
 } break;
 
-case 159: {
+case 157: {
   AST::TypeOfExpression *node = makeAstNode<AST::TypeOfExpression> (driver->nodePool(), sym(2).Expression);
   node->typeofToken = loc(1);
   sym(1).Node = node;
 } break;
 
-case 160: {
+case 158: {
   AST::PreIncrementExpression *node = makeAstNode<AST::PreIncrementExpression> (driver->nodePool(), sym(2).Expression);
   node->incrementToken = loc(1);
   sym(1).Node = node;
 } break;
 
-case 161: {
+case 159: {
   AST::PreDecrementExpression *node = makeAstNode<AST::PreDecrementExpression> (driver->nodePool(), sym(2).Expression);
   node->decrementToken = loc(1);
   sym(1).Node = node;
 } break;
 
-case 162: {
+case 160: {
   AST::UnaryPlusExpression *node = makeAstNode<AST::UnaryPlusExpression> (driver->nodePool(), sym(2).Expression);
   node->plusToken = loc(1);
   sym(1).Node = node;
 } break;
 
-case 163: {
+case 161: {
   AST::UnaryMinusExpression *node = makeAstNode<AST::UnaryMinusExpression> (driver->nodePool(), sym(2).Expression);
   node->minusToken = loc(1);
   sym(1).Node = node;
 } break;
 
-case 164: {
+case 162: {
   AST::TildeExpression *node = makeAstNode<AST::TildeExpression> (driver->nodePool(), sym(2).Expression);
   node->tildeToken = loc(1);
   sym(1).Node = node;
 } break;
 
-case 165: {
+case 163: {
   AST::NotExpression *node = makeAstNode<AST::NotExpression> (driver->nodePool(), sym(2).Expression);
   node->notToken = loc(1);
   sym(1).Node = node;
 } break;
 
-case 167: {
+case 165: {
   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 168: {
+case 166: {
   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 169: {
+case 167: {
   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 171: {
+case 169: {
   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 172: {
+case 170: {
   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 174: {
+case 172: {
   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 175: {
+case 173: {
   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 176: {
+case 174: {
   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 178: {
+case 176: {
   AST::BinaryExpression *node = makeAstNode<AST::BinaryExpression> (driver->nodePool(), sym(1).Expression,
     QSOperator::Lt, sym(3).Expression);
   node->operatorToken = loc(2);
   sym(1).Node = node;
 } break;
 
-case 179: {
+case 177: {
   AST::BinaryExpression *node = makeAstNode<AST::BinaryExpression> (driver->nodePool(), sym(1).Expression,
     QSOperator::Gt, sym(3).Expression);
   node->operatorToken = loc(2);
   sym(1).Node = node;
 } break;
 
-case 180: {
+case 178: {
   AST::BinaryExpression *node = makeAstNode<AST::BinaryExpression> (driver->nodePool(), sym(1).Expression,
     QSOperator::Le, sym(3).Expression);
   node->operatorToken = loc(2);
   sym(1).Node = node;
 } break;
 
-case 181: {
+case 179: {
   AST::BinaryExpression *node = makeAstNode<AST::BinaryExpression> (driver->nodePool(), sym(1).Expression,
     QSOperator::Ge, sym(3).Expression);
   node->operatorToken = loc(2);
   sym(1).Node = node;
 } break;
 
-case 182: {
+case 180: {
   AST::BinaryExpression *node = makeAstNode<AST::BinaryExpression> (driver->nodePool(), sym(1).Expression,
     QSOperator::InstanceOf, sym(3).Expression);
   node->operatorToken = loc(2);
   sym(1).Node = node;
 } break;
 
-case 183: {
+case 181: {
   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 185: {
+case 183: {
   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 186: {
+case 184: {
   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 187: {
+case 185: {
   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 188: {
+case 186: {
   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 189: {
+case 187: {
   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 191: {
+case 189: {
   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 190: {
   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 191: {
   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 192: {
   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 194: {
   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 197: {
+case 195: {
   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 198: {
+case 196: {
   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 199: {
+case 197: {
   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 201: {
+case 199: {
   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 203: {
+case 201: {
   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 205: {
+case 203: {
   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 207: {
+case 205: {
   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 209: {
+case 207: {
   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 211: {
+case 209: {
   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 213: {
+case 211: {
   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 215: {
+case 213: {
   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 217: {
+case 215: {
   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 219: {
+case 217: {
   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 221: {
+case 219: {
   AST::ConditionalExpression *node = makeAstNode<AST::ConditionalExpression> (driver->nodePool(), sym(1).Expression,
     sym(3).Expression, sym(5).Expression);
   node->questionToken = loc(2);
@@ -1259,7 +1258,7 @@ case 221: {
   sym(1).Node = node;
 } break;
 
-case 223: {
+case 221: {
   AST::ConditionalExpression *node = makeAstNode<AST::ConditionalExpression> (driver->nodePool(), sym(1).Expression,
     sym(3).Expression, sym(5).Expression);
   node->questionToken = loc(2);
@@ -1267,112 +1266,112 @@ case 223: {
   sym(1).Node = node;
 } break;
 
-case 225: {
+case 223: {
   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 227: {
+case 225: {
   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 228: {
+case 226: {
   sym(1).ival = QSOperator::Assign;
 } break;
 
-case 229: {
+case 227: {
   sym(1).ival = QSOperator::InplaceMul;
 } break;
 
-case 230: {
+case 228: {
   sym(1).ival = QSOperator::InplaceDiv;
 } break;
 
-case 231: {
+case 229: {
   sym(1).ival = QSOperator::InplaceMod;
 } break;
 
-case 232: {
+case 230: {
   sym(1).ival = QSOperator::InplaceAdd;
 } break;
 
-case 233: {
+case 231: {
   sym(1).ival = QSOperator::InplaceSub;
 } break;
 
-case 234: {
+case 232: {
   sym(1).ival = QSOperator::InplaceLeftShift;
 } break;
 
-case 235: {
+case 233: {
   sym(1).ival = QSOperator::InplaceRightShift;
 } break;
 
-case 236: {
+case 234: {
   sym(1).ival = QSOperator::InplaceURightShift;
 } break;
 
-case 237: {
+case 235: {
   sym(1).ival = QSOperator::InplaceAnd;
 } break;
 
-case 238: {
+case 236: {
   sym(1).ival = QSOperator::InplaceXor;
 } break;
 
-case 239: {
+case 237: {
   sym(1).ival = QSOperator::InplaceOr;
 } break;
 
-case 241: {
+case 239: {
   AST::Expression *node = makeAstNode<AST::Expression> (driver->nodePool(), sym(1).Expression, sym(3).Expression);
   node->commaToken = loc(2);
   sym(1).Node = node;
 } break;
 
-case 242: {
+case 240: {
   sym(1).Node = 0;
 } break;
 
-case 245: {
+case 243: {
   AST::Expression *node = makeAstNode<AST::Expression> (driver->nodePool(), sym(1).Expression, sym(3).Expression);
   node->commaToken = loc(2);
   sym(1).Node = node;
 } break;
 
-case 246: {
+case 244: {
   sym(1).Node = 0;
 } break;
 
-case 263: {
+case 261: {
   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 264: {
+case 262: {
   sym(1).Node = makeAstNode<AST::StatementList> (driver->nodePool(), sym(1).Statement);
 } break;
 
-case 265: {
+case 263: {
   sym(1).Node = makeAstNode<AST::StatementList> (driver->nodePool(), sym(1).StatementList, sym(2).Statement);
 } break;
 
-case 266: {
+case 264: {
   sym(1).Node = 0;
 } break;
 
-case 267: {
+case 265: {
   sym(1).Node = sym(1).StatementList->finish ();
 } break;
 
-case 269: {
+case 267: {
   AST::VariableStatement *node = makeAstNode<AST::VariableStatement> (driver->nodePool(),
      sym(2).VariableDeclarationList->finish (/*readOnly=*/sym(1).ival == T_CONST));
   node->declarationKindToken = loc(1);
@@ -1380,76 +1379,76 @@ case 269: {
   sym(1).Node = node;
 } break;
 
-case 270: {
+case 268: {
   sym(1).ival = T_CONST;
 } break;
 
-case 271: {
+case 269: {
   sym(1).ival = T_VAR;
 } break;
 
-case 272: {
+case 270: {
   sym(1).Node = makeAstNode<AST::VariableDeclarationList> (driver->nodePool(), sym(1).VariableDeclaration);
 } break;
 
-case 273: {
+case 271: {
   AST::VariableDeclarationList *node = makeAstNode<AST::VariableDeclarationList> (driver->nodePool(),
     sym(1).VariableDeclarationList, sym(3).VariableDeclaration);
   node->commaToken = loc(2);
   sym(1).Node = node;
 } break;
 
-case 274: {
+case 272: {
   sym(1).Node = makeAstNode<AST::VariableDeclarationList> (driver->nodePool(), sym(1).VariableDeclaration);
 } break;
 
-case 275: {
+case 273: {
   sym(1).Node = makeAstNode<AST::VariableDeclarationList> (driver->nodePool(), sym(1).VariableDeclarationList, sym(3).VariableDeclaration);
 } break;
 
-case 276: {
+case 274: {
   AST::VariableDeclaration *node = makeAstNode<AST::VariableDeclaration> (driver->nodePool(), sym(1).sval, sym(2).Expression);
   node->identifierToken = loc(1);
   sym(1).Node = node;
 } break;
 
-case 277: {
+case 275: {
   AST::VariableDeclaration *node = makeAstNode<AST::VariableDeclaration> (driver->nodePool(), sym(1).sval, sym(2).Expression);
   node->identifierToken = loc(1);
   sym(1).Node = node;
 } break;
 
-case 278: {
+case 276: {
   // ### TODO: AST for initializer
   sym(1) = sym(2);
 } break;
 
-case 279: {
+case 277: {
   sym(1).Node = 0;
 } break;
 
-case 281: {
+case 279: {
   // ### TODO: AST for initializer
   sym(1) = sym(2);
 } break;
 
-case 282: {
+case 280: {
   sym(1).Node = 0;
 } break;
 
-case 284: {
+case 282: {
   AST::EmptyStatement *node = makeAstNode<AST::EmptyStatement> (driver->nodePool());
   node->semicolonToken = loc(1);
   sym(1).Node = node;
 } break;
 
-case 286: {
+case 284: {
   AST::ExpressionStatement *node = makeAstNode<AST::ExpressionStatement> (driver->nodePool(), sym(1).Expression);
   node->semicolonToken = loc(2);
   sym(1).Node = node;
 } break;
 
-case 287: {
+case 285: {
   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);
@@ -1458,7 +1457,7 @@ case 287: {
   sym(1).Node = node;
 } break;
 
-case 288: {
+case 286: {
   AST::IfStatement *node = makeAstNode<AST::IfStatement> (driver->nodePool(), sym(3).Expression, sym(5).Statement);
   node->ifToken = loc(1);
   node->lparenToken = loc(2);
@@ -1466,7 +1465,7 @@ case 288: {
   sym(1).Node = node;
 } break;
 
-case 290: {
+case 288: {
   AST::DoWhileStatement *node = makeAstNode<AST::DoWhileStatement> (driver->nodePool(), sym(2).Statement, sym(5).Expression);
   node->doToken = loc(1);
   node->whileToken = loc(3);
@@ -1476,7 +1475,7 @@ case 290: {
   sym(1).Node = node;
 } break;
 
-case 291: {
+case 289: {
   AST::WhileStatement *node = makeAstNode<AST::WhileStatement> (driver->nodePool(), sym(3).Expression, sym(5).Statement);
   node->whileToken = loc(1);
   node->lparenToken = loc(2);
@@ -1484,7 +1483,7 @@ case 291: {
   sym(1).Node = node;
 } break;
 
-case 292: {
+case 290: {
   AST::ForStatement *node = makeAstNode<AST::ForStatement> (driver->nodePool(), sym(3).Expression,
     sym(5).Expression, sym(7).Expression, sym(9).Statement);
   node->forToken = loc(1);
@@ -1495,7 +1494,7 @@ case 292: {
   sym(1).Node = node;
 } break;
 
-case 293: {
+case 291: {
   AST::LocalForStatement *node = makeAstNode<AST::LocalForStatement> (driver->nodePool(),
      sym(4).VariableDeclarationList->finish (/*readOnly=*/false), sym(6).Expression,
      sym(8).Expression, sym(10).Statement);
@@ -1508,7 +1507,7 @@ case 293: {
   sym(1).Node = node;
 } break;
 
-case 294: {
+case 292: {
   AST:: ForEachStatement *node = makeAstNode<AST::ForEachStatement> (driver->nodePool(), sym(3).Expression,
     sym(5).Expression, sym(7).Statement);
   node->forToken = loc(1);
@@ -1518,7 +1517,7 @@ case 294: {
   sym(1).Node = node;
 } break;
 
-case 295: {
+case 293: {
   AST::LocalForEachStatement *node = makeAstNode<AST::LocalForEachStatement> (driver->nodePool(),
     sym(4).VariableDeclaration, sym(6).Expression, sym(8).Statement);
   node->forToken = loc(1);
@@ -1529,14 +1528,14 @@ case 295: {
   sym(1).Node = node;
 } break;
 
-case 297: {
+case 295: {
   AST::ContinueStatement *node = makeAstNode<AST::ContinueStatement> (driver->nodePool());
   node->continueToken = loc(1);
   node->semicolonToken = loc(2);
   sym(1).Node = node;
 } break;
 
-case 299: {
+case 297: {
   AST::ContinueStatement *node = makeAstNode<AST::ContinueStatement> (driver->nodePool(), sym(2).sval);
   node->continueToken = loc(1);
   node->identifierToken = loc(2);
@@ -1544,14 +1543,14 @@ case 299: {
   sym(1).Node = node;
 } break;
 
-case 301: {
+case 299: {
   AST::BreakStatement *node = makeAstNode<AST::BreakStatement> (driver->nodePool());
   node->breakToken = loc(1);
   node->semicolonToken = loc(2);
   sym(1).Node = node;
 } break;
 
-case 303: {
+case 301: {
   AST::BreakStatement *node = makeAstNode<AST::BreakStatement> (driver->nodePool(), sym(2).sval);
   node->breakToken = loc(1);
   node->identifierToken = loc(2);
@@ -1559,14 +1558,14 @@ case 303: {
   sym(1).Node = node;
 } break;
 
-case 305: {
+case 303: {
   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 306: {
+case 304: {
   AST::WithStatement *node = makeAstNode<AST::WithStatement> (driver->nodePool(), sym(3).Expression, sym(5).Statement);
   node->withToken = loc(1);
   node->lparenToken = loc(2);
@@ -1574,7 +1573,7 @@ case 306: {
   sym(1).Node = node;
 } break;
 
-case 307: {
+case 305: {
   AST::SwitchStatement *node = makeAstNode<AST::SwitchStatement> (driver->nodePool(), sym(3).Expression, sym(5).CaseBlock);
   node->switchToken = loc(1);
   node->lparenToken = loc(2);
@@ -1582,90 +1581,90 @@ case 307: {
   sym(1).Node = node;
 } break;
 
-case 308: {
+case 306: {
   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 309: {
+case 307: {
   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 310: {
+case 308: {
   sym(1).Node = makeAstNode<AST::CaseClauses> (driver->nodePool(), sym(1).CaseClause);
 } break;
 
-case 311: {
+case 309: {
   sym(1).Node = makeAstNode<AST::CaseClauses> (driver->nodePool(), sym(1).CaseClauses, sym(2).CaseClause);
 } break;
 
-case 312: {
+case 310: {
   sym(1).Node = 0;
 } break;
 
-case 313: {
+case 311: {
   sym(1).Node = sym(1).CaseClauses->finish ();
 } break;
 
-case 314: {
+case 312: {
   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 315: {
+case 313: {
   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 316:
-case 317: {
+case 314:
+case 315: {
   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 318: {
+case 316: {
   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 320: {
+case 318: {
   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 321: {
+case 319: {
   AST::TryStatement *node = makeAstNode<AST::TryStatement> (driver->nodePool(), sym(2).Statement, sym(3).Catch);
   node->tryToken = loc(1);
   sym(1).Node = node;
 } break;
 
-case 322: {
+case 320: {
   AST::TryStatement *node = makeAstNode<AST::TryStatement> (driver->nodePool(), sym(2).Statement, sym(3).Finally);
   node->tryToken = loc(1);
   sym(1).Node = node;
 } break;
 
-case 323: {
+case 321: {
   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 324: {
+case 322: {
   AST::Catch *node = makeAstNode<AST::Catch> (driver->nodePool(), sym(3).sval, sym(5).Block);
   node->catchToken = loc(1);
   node->lparenToken = loc(2);
@@ -1674,20 +1673,20 @@ case 324: {
   sym(1).Node = node;
 } break;
 
-case 325: {
+case 323: {
   AST::Finally *node = makeAstNode<AST::Finally> (driver->nodePool(), sym(2).Block);
   node->finallyToken = loc(1);
   sym(1).Node = node;
 } break;
 
-case 327: {
+case 325: {
   AST::DebuggerStatement *node = makeAstNode<AST::DebuggerStatement> (driver->nodePool());
   node->debuggerToken = loc(1);
   node->semicolonToken = loc(2);
   sym(1).Node = node;
 } break;
 
-case 328: {
+case 326: {
   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);
@@ -1698,7 +1697,7 @@ case 328: {
   sym(1).Node = node;
 } break;
 
-case 329: {
+case 327: {
   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)
@@ -1710,60 +1709,60 @@ case 329: {
   sym(1).Node = node;
 } break;
 
-case 330: {
+case 328: {
   AST::FormalParameterList *node = makeAstNode<AST::FormalParameterList> (driver->nodePool(), sym(1).sval);
   node->identifierToken = loc(1);
   sym(1).Node = node;
 } break;
 
-case 331: {
+case 329: {
   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 332: {
+case 330: {
   sym(1).Node = 0;
 } break;
 
-case 333: {
+case 331: {
   sym(1).Node = sym(1).FormalParameterList->finish ();
 } break;
 
-case 334: {
+case 332: {
   sym(1).Node = 0;
 } break;
 
-case 336: {
+case 334: {
   sym(1).Node = makeAstNode<AST::FunctionBody> (driver->nodePool(), sym(1).SourceElements->finish ());
 } break;
 
-case 337: {
+case 335: {
   sym(1).Node = makeAstNode<AST::Program> (driver->nodePool(), sym(1).SourceElements->finish ());
 } break;
 
-case 338: {
+case 336: {
   sym(1).Node = makeAstNode<AST::SourceElements> (driver->nodePool(), sym(1).SourceElement);
 } break;
 
-case 339: {
+case 337: {
   sym(1).Node = makeAstNode<AST::SourceElements> (driver->nodePool(), sym(1).SourceElements, sym(2).SourceElement);
 } break;
 
-case 340: {
+case 338: {
   sym(1).Node = makeAstNode<AST::StatementSourceElement> (driver->nodePool(), sym(1).Statement);
 } break;
 
-case 341: {
+case 339: {
   sym(1).Node = makeAstNode<AST::FunctionSourceElement> (driver->nodePool(), sym(1).FunctionDeclaration);
 } break;
 
-case 342: {
+case 340: {
   sym(1).sval = 0;
 } break;
 
-case 344: {
+case 342: {
   sym(1).Node = 0;
 } break;
 
diff --git a/src/libs/qmljs/parser/qmljsparser_p.h b/src/libs/qmljs/parser/qmljsparser_p.h
index 55baf4b074..a59790b6df 100644
--- a/src/libs/qmljs/parser/qmljsparser_p.h
+++ b/src/libs/qmljs/parser/qmljsparser_p.h
@@ -6,6 +6,7 @@
 **
 ** Contact: Nokia Corporation (info@qt.nokia.com)
 **
+**
 ** GNU Lesser General Public License Usage
 **
 ** This file may be used under the terms of the GNU Lesser General Public
@@ -225,9 +226,9 @@ protected:
 
 
 
-#define J_SCRIPT_REGEXPLITERAL_RULE1 78
+#define J_SCRIPT_REGEXPLITERAL_RULE1 76
 
-#define J_SCRIPT_REGEXPLITERAL_RULE2 79
+#define J_SCRIPT_REGEXPLITERAL_RULE2 77
 
 QT_QML_END_NAMESPACE
 
diff --git a/src/libs/qmljs/qmljscheck.cpp b/src/libs/qmljs/qmljscheck.cpp
index 0a940a7c3a..01008338cc 100644
--- a/src/libs/qmljs/qmljscheck.cpp
+++ b/src/libs/qmljs/qmljscheck.cpp
@@ -745,6 +745,12 @@ bool Check::visit(ExpressionStatement *ast)
                         break;
                     }
                 }
+                if (UiPublicMember *member = cast<UiPublicMember *>(p)) {
+                    if (!cast<Block *>(member->statement)) {
+                        ok = true;
+                        break;
+                    }
+                }
             }
         }
 
diff --git a/src/libs/qmljs/qmljsinterpreter.cpp b/src/libs/qmljs/qmljsinterpreter.cpp
index f15a218dd7..bc00d68446 100644
--- a/src/libs/qmljs/qmljsinterpreter.cpp
+++ b/src/libs/qmljs/qmljsinterpreter.cpp
@@ -3276,7 +3276,7 @@ bool ASTPropertyReference::getSourceLocation(QString *fileName, int *line, int *
 
 const Value *ASTPropertyReference::value(const Context *context) const
 {
-    if (_ast->expression
+    if (_ast->statement
             && (!_ast->memberType || _ast->memberType->asString() == QLatin1String("variant")
                 || _ast->memberType->asString() == QLatin1String("alias"))) {
 
@@ -3288,11 +3288,11 @@ const Value *ASTPropertyReference::value(const Context *context) const
         QmlJS::ScopeBuilder builder(&localContext, doc);
         builder.initializeRootScope();
 
-        int offset = _ast->expression->firstSourceLocation().begin();
+        int offset = _ast->statement->firstSourceLocation().begin();
         builder.push(ScopeAstPath(doc)(offset));
 
         Evaluate check(&localContext);
-        return check(_ast->expression);
+        return check(_ast->statement);
     }
 
     if (_ast->memberType)
diff --git a/src/libs/qmljs/qmljsrewriter.cpp b/src/libs/qmljs/qmljsrewriter.cpp
index 6f7490c5e1..797d3fc162 100644
--- a/src/libs/qmljs/qmljsrewriter.cpp
+++ b/src/libs/qmljs/qmljsrewriter.cpp
@@ -330,12 +330,12 @@ void Rewriter::replaceMemberValue(UiObjectMember *propertyMember,
         startOffset = arrayBinding->lbracketToken.offset;
         endOffset = arrayBinding->rbracketToken.end();
     } else if (UiPublicMember *publicMember = AST::cast<UiPublicMember*>(propertyMember)) {
-        if (publicMember->expression) {
-            startOffset = publicMember->expression->firstSourceLocation().offset;
+        if (publicMember->statement) {
+            startOffset = publicMember->statement->firstSourceLocation().offset;
             if (publicMember->semicolonToken.isValid())
                 endOffset = publicMember->semicolonToken.end();
             else
-                endOffset = publicMember->expression->lastSourceLocation().offset;
+                endOffset = publicMember->statement->lastSourceLocation().offset;
         } else {
             startOffset = publicMember->lastSourceLocation().end();
             endOffset = startOffset;
diff --git a/src/plugins/qmldesigner/designercore/filemanager/changepropertyvisitor.cpp b/src/plugins/qmldesigner/designercore/filemanager/changepropertyvisitor.cpp
index 75389a14ee..460e49d553 100644
--- a/src/plugins/qmldesigner/designercore/filemanager/changepropertyvisitor.cpp
+++ b/src/plugins/qmldesigner/designercore/filemanager/changepropertyvisitor.cpp
@@ -147,12 +147,12 @@ void ChangePropertyVisitor::replaceMemberValue(UiObjectMember *propertyMember, b
         startOffset = arrayBinding->lbracketToken.offset;
         endOffset = arrayBinding->rbracketToken.end();
     } else if (UiPublicMember *publicMember = AST::cast<UiPublicMember*>(propertyMember)) {
-        if (publicMember->expression) {
-            startOffset = publicMember->expression->firstSourceLocation().offset;
+        if (publicMember->statement) {
+            startOffset = publicMember->statement->firstSourceLocation().offset;
             if (publicMember->semicolonToken.isValid())
                 endOffset = publicMember->semicolonToken.end();
             else
-                endOffset = publicMember->expression->lastSourceLocation().offset;
+                endOffset = publicMember->statement->lastSourceLocation().offset;
         } else {
             startOffset = publicMember->lastSourceLocation().end();
             endOffset = startOffset;
diff --git a/src/plugins/qmldesigner/designercore/model/texttomodelmerger.cpp b/src/plugins/qmldesigner/designercore/model/texttomodelmerger.cpp
index f928ef6abb..dced7561f3 100644
--- a/src/plugins/qmldesigner/designercore/model/texttomodelmerger.cpp
+++ b/src/plugins/qmldesigner/designercore/model/texttomodelmerger.cpp
@@ -202,18 +202,23 @@ static bool isLiteralValue(ExpressionNode *expr)
         return false;
 }
 
-static inline bool isLiteralValue(UiScriptBinding *script)
+static bool isLiteralValue(Statement *stmt)
 {
-    if (!script || !script->statement)
-        return false;
-
-    ExpressionStatement *exprStmt = cast<ExpressionStatement *>(script->statement);
+    ExpressionStatement *exprStmt = cast<ExpressionStatement *>(stmt);
     if (exprStmt)
         return isLiteralValue(exprStmt->expression);
     else
         return false;
 }
 
+static inline bool isLiteralValue(UiScriptBinding *script)
+{
+    if (!script || !script->statement)
+        return false;
+
+    return isLiteralValue(script->statement);
+}
+
 static inline int propertyType(const QString &typeName)
 {
     if (typeName == QLatin1String("bool"))
@@ -852,13 +857,13 @@ void TextToModelMerger::syncNode(ModelNode &modelNode,
 
             const QString astName = property->name->asString();
             QString astValue;
-            if (property->expression)
+            if (property->statement)
                 astValue = textAt(context->doc(),
-                                  property->expression->firstSourceLocation(),
-                                  property->expression->lastSourceLocation());
+                                  property->statement->firstSourceLocation(),
+                                  property->statement->lastSourceLocation());
             const QString astType = property->memberType->asString();
             AbstractProperty modelProperty = modelNode.property(astName);
-            if (!property->expression || isLiteralValue(property->expression)) {
+            if (!property->statement || isLiteralValue(property->statement)) {
                 const QVariant variantValue = convertDynamicPropertyValueToVariant(astValue, astType);
                 syncVariantProperty(modelProperty, variantValue, astType, differenceHandler);
             } else {
diff --git a/src/plugins/qmljseditor/qmljshoverhandler.cpp b/src/plugins/qmljseditor/qmljshoverhandler.cpp
index 780117e9e5..a0a13b7c93 100644
--- a/src/plugins/qmljseditor/qmljshoverhandler.cpp
+++ b/src/plugins/qmljseditor/qmljshoverhandler.cpp
@@ -181,13 +181,13 @@ bool HoverHandler::matchColorItem(const LookupContext::Ptr &lookupContext,
         }
     } else if (const AST::UiPublicMember *publicMember =
                AST::cast<const AST::UiPublicMember *>(member)) {
-        if (publicMember->name && posIsInSource(pos, publicMember->expression)) {
+        if (publicMember->name && posIsInSource(pos, publicMember->statement)) {
             value = lookupContext->context()->lookup(publicMember->name->asString());
             if (const Interpreter::Reference *ref = value->asReference())
                 value = lookupContext->context()->lookupReference(ref);
                 color = textAt(qmlDocument,
-                               publicMember->expression->firstSourceLocation(),
-                               publicMember->expression->lastSourceLocation());
+                               publicMember->statement->firstSourceLocation(),
+                               publicMember->statement->lastSourceLocation());
         }
     }
 
diff --git a/src/plugins/qmljseditor/qmloutlinemodel.cpp b/src/plugins/qmljseditor/qmloutlinemodel.cpp
index 9cfe8783f2..d5ebe22b6d 100644
--- a/src/plugins/qmljseditor/qmloutlinemodel.cpp
+++ b/src/plugins/qmljseditor/qmloutlinemodel.cpp
@@ -523,7 +523,7 @@ QModelIndex QmlOutlineModel::enterPublicMember(AST::UiPublicMember *publicMember
 
     if (publicMember->name)
         objectData.insert(Qt::DisplayRole, publicMember->name->asString());
-    objectData.insert(AnnotationRole, getAnnotation(publicMember->expression));
+    objectData.insert(AnnotationRole, getAnnotation(publicMember->statement));
     objectData.insert(ItemTypeRole, NonElementBindingType);
 
     QmlOutlineItem *item = enterNode(objectData, publicMember, 0, m_icons->publicMemberIcon());