From 2fc27769b122b97e8546441960dcab0169dde05c Mon Sep 17 00:00:00 2001
From: Erik Verbruggen <erik.verbruggen@nokia.com>
Date: Fri, 15 Jan 2010 16:03:03 +0100
Subject: [PATCH] Copied over the new QML grammar & parser from the
 QtDeclarative module.

This covers the following changes in the kinetic-declarativeui
repository:
    - e3a49db846fb5c59173256a3b758a2c00a3476b9
    - ef6533a54146c7d027f8604aee9e7d4df51b3a90
    - cf599d4578205bf2e934ca75042a85f45d4a22f4
    - 20dd0ee74d288e0630b5522231e5118153693e0f
---
 src/shared/qmljs/parser/qmljs.g             |  125 +-
 src/shared/qmljs/parser/qmljsast.cpp        |    1 +
 src/shared/qmljs/parser/qmljsast_p.h        |    1 +
 src/shared/qmljs/parser/qmljsastfwd_p.h     |    3 +-
 src/shared/qmljs/parser/qmljsengine_p.cpp   |    4 +-
 src/shared/qmljs/parser/qmljsengine_p.h     |    6 +-
 src/shared/qmljs/parser/qmljsgrammar.cpp    | 1647 +++++++++----------
 src/shared/qmljs/parser/qmljsgrammar_p.h    |   53 +-
 src/shared/qmljs/parser/qmljslexer.cpp      |   25 +-
 src/shared/qmljs/parser/qmljslexer_p.h      |    4 +-
 src/shared/qmljs/parser/qmljsmemorypool_p.h |    5 +-
 src/shared/qmljs/parser/qmljsnodepool_p.h   |    6 +-
 src/shared/qmljs/parser/qmljsparser.cpp     |  454 ++---
 src/shared/qmljs/parser/qmljsparser_p.h     |   10 +-
 14 files changed, 1166 insertions(+), 1178 deletions(-)

diff --git a/src/shared/qmljs/parser/qmljs.g b/src/shared/qmljs/parser/qmljs.g
index 70cf06a2f6b..49590e8ea2e 100644
--- a/src/shared/qmljs/parser/qmljs.g
+++ b/src/shared/qmljs/parser/qmljs.g
@@ -1,45 +1,24 @@
 ----------------------------------------------------------------------------
 --
--- Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
--- Contact: Qt Software Information (qt-info@nokia.com)
+-- Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+-- All rights reserved.
+-- Contact: Nokia Corporation (qt-info@nokia.com)
 --
 -- This file is part of the QtDeclarative module of the Qt Toolkit.
 --
--- $QT_BEGIN_LICENSE:LGPL$
--- No Commercial Usage
--- This file contains pre-release code and may not be distributed.
--- You may use this file in accordance with the terms and conditions
--- contained in the either Technology Preview License Agreement or the
--- Beta Release License Agreement.
---
+-- $QT_BEGIN_LICENSE:LGPL-ONLY$
 -- GNU Lesser General Public License Usage
--- Alternatively, this file may be used under the terms of the GNU Lesser
+-- This file may be used under the terms of the GNU Lesser
 -- General Public License version 2.1 as published by the Free Software
 -- Foundation and appearing in the file LICENSE.LGPL included in the
 -- packaging of this file.  Please review the following information to
 -- ensure the GNU Lesser General Public License version 2.1 requirements
 -- will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
 --
--- In addition, as a special exception, Nokia gives you certain
--- additional rights. These rights are described in the Nokia Qt LGPL
--- Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
--- package.
---
--- GNU General Public License Usage
--- Alternatively, this file may be used under the terms of the GNU
--- General Public License version 3.0 as published by the Free Software
--- Foundation and appearing in the file LICENSE.GPL included in the
--- packaging of this file.  Please review the following information to
--- ensure the GNU General Public License version 3.0 requirements will be
--- met: http://www.gnu.org/copyleft/gpl.html.
---
--- If you are unsure which license is appropriate for your use, please
--- contact the sales department at qt-sales@nokia.com.
+-- If you have questions regarding the use of this file, please contact
+-- Nokia at qt-info@nokia.com.
 -- $QT_END_LICENSE$
 --
--- This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
--- WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
---
 ----------------------------------------------------------------------------
 
 %parser         QmlJSGrammar
@@ -92,6 +71,7 @@
 %token T_FEED_UI_OBJECT_MEMBER
 %token T_FEED_JS_STATEMENT
 %token T_FEED_JS_EXPRESSION
+%token T_FEED_JS_SOURCE_ELEMENT
 
 %nonassoc SHIFT_THERE
 %nonassoc T_IDENTIFIER T_COLON T_SIGNAL T_PROPERTY T_READONLY
@@ -99,11 +79,11 @@
 
 %start TopLevel
 
-/.
-/****************************************************************************
+/./****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
-** Contact: Qt Software Information (qt-info@nokia.com)
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
 **
 ** This file is part of the QtDeclarative module of the Qt Toolkit.
 **
@@ -111,8 +91,8 @@
 ** No Commercial Usage
 ** This file contains pre-release code and may not be distributed.
 ** You may use this file in accordance with the terms and conditions
-** contained in the either Technology Preview License Agreement or the
-** Beta Release License Agreement.
+** contained in the Technology Preview License Agreement accompanying
+** this package.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -122,21 +102,20 @@
 ** ensure the GNU Lesser General Public License version 2.1 requirements
 ** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
 **
-** In addition, as a special exception, Nokia gives you certain
-** additional rights. These rights are described in the Nokia Qt LGPL
-** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
-** package.
+** In addition, as a special exception, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
+**
+**
+**
+**
+**
+**
 **
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 3.0 as published by the Free Software
-** Foundation and appearing in the file LICENSE.GPL included in the
-** packaging of this file.  Please review the following information to
-** ensure the GNU General Public License version 3.0 requirements will be
-** met: http://www.gnu.org/copyleft/gpl.html.
 **
-** If you are unsure which license is appropriate for your use, please
-** contact the sales department at qt-sales@nokia.com.
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
@@ -153,11 +132,11 @@
 
 ./
 
-/:
-/****************************************************************************
+/:/****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
-** Contact: Qt Software Information (qt-info@nokia.com)
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
 **
 ** This file is part of the QtDeclarative module of the Qt Toolkit.
 **
@@ -165,8 +144,8 @@
 ** No Commercial Usage
 ** This file contains pre-release code and may not be distributed.
 ** You may use this file in accordance with the terms and conditions
-** contained in the either Technology Preview License Agreement or the
-** Beta Release License Agreement.
+** contained in the Technology Preview License Agreement accompanying
+** this package.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -176,25 +155,25 @@
 ** ensure the GNU Lesser General Public License version 2.1 requirements
 ** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
 **
-** In addition, as a special exception, Nokia gives you certain
-** additional rights. These rights are described in the Nokia Qt LGPL
-** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
-** package.
+** In addition, as a special exception, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
+**
+**
+**
+**
+**
+**
 **
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 3.0 as published by the Free Software
-** Foundation and appearing in the file LICENSE.GPL included in the
-** packaging of this file.  Please review the following information to
-** ensure the GNU General Public License version 3.0 requirements will be
-** met: http://www.gnu.org/copyleft/gpl.html.
 **
-** If you are unsure which license is appropriate for your use, please
-** contact the sales department at qt-sales@nokia.com.
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
 
+
 //
 //  W A R N I N G
 //  -------------
@@ -229,7 +208,7 @@ namespace QmlJS {
 class Engine;
 class NameId;
 
-class Parser: protected $table
+class QML_PARSER_EXPORT Parser: protected $table
 {
 public:
     union Value {
@@ -287,6 +266,7 @@ public:
     bool parse() { return parse(T_FEED_UI_PROGRAM); }
     bool parseStatement() { return parse(T_FEED_JS_STATEMENT); }
     bool parseExpression() { return parse(T_FEED_JS_EXPRESSION); }
+    bool parseSourceElement() { return parse(T_FEED_JS_SOURCE_ELEMENT); }
     bool parseUiObjectMember() { return parse(T_FEED_UI_OBJECT_MEMBER); }
 
     AST::UiProgram *ast() const
@@ -561,6 +541,14 @@ case $rule_number: {
 } break;
 ./
 
+TopLevel: T_FEED_JS_SOURCE_ELEMENT Expression ;
+/.
+case $rule_number: {
+  sym(1).Node = sym(2).Node;
+  program = sym(1).Node;
+} break;
+./
+
 TopLevel: T_FEED_UI_OBJECT_MEMBER UiObjectMember ;
 /.
 case $rule_number: {
@@ -3031,7 +3019,8 @@ PropertyNameAndValueListOpt: PropertyNameAndValueList ;
 
         for (int tk = 1; tk < TERMINAL_COUNT; ++tk) {
             if (tk == T_AUTOMATIC_SEMICOLON || tk == T_FEED_UI_PROGRAM    ||
-                tk == T_FEED_JS_STATEMENT   || tk == T_FEED_JS_EXPRESSION)
+                tk == T_FEED_JS_STATEMENT   || tk == T_FEED_JS_EXPRESSION ||
+                tk == T_FEED_JS_SOURCE_ELEMENT)
                continue;
 
             int a = t_action(errorState, tk);
diff --git a/src/shared/qmljs/parser/qmljsast.cpp b/src/shared/qmljs/parser/qmljsast.cpp
index 6986bd2fabe..2a39aae9477 100644
--- a/src/shared/qmljs/parser/qmljsast.cpp
+++ b/src/shared/qmljs/parser/qmljsast.cpp
@@ -40,6 +40,7 @@
 ****************************************************************************/
 
 #include "qmljsast_p.h"
+
 #include "qmljsastvisitor_p.h"
 
 QT_QML_BEGIN_NAMESPACE
diff --git a/src/shared/qmljs/parser/qmljsast_p.h b/src/shared/qmljs/parser/qmljsast_p.h
index e2bf4176d96..032fbb189a6 100644
--- a/src/shared/qmljs/parser/qmljsast_p.h
+++ b/src/shared/qmljs/parser/qmljsast_p.h
@@ -55,6 +55,7 @@
 
 #include "qmljsastvisitor_p.h"
 #include "qmljsglobal_p.h"
+
 #include <QtCore/QString>
 
 QT_QML_BEGIN_NAMESPACE
diff --git a/src/shared/qmljs/parser/qmljsastfwd_p.h b/src/shared/qmljs/parser/qmljsastfwd_p.h
index b558a23ddb3..f571a2e68a3 100644
--- a/src/shared/qmljs/parser/qmljsastfwd_p.h
+++ b/src/shared/qmljs/parser/qmljsastfwd_p.h
@@ -42,9 +42,10 @@
 #ifndef QMLJSAST_FWD_P_H
 #define QMLJSAST_FWD_P_H
 
-#include <QtCore/qglobal.h>
 #include "qmljsglobal_p.h"
 
+#include <QtCore/qglobal.h>
+
 //
 //  W A R N I N G
 //  -------------
diff --git a/src/shared/qmljs/parser/qmljsengine_p.cpp b/src/shared/qmljs/parser/qmljsengine_p.cpp
index cee90a3b819..b8ecd188441 100644
--- a/src/shared/qmljs/parser/qmljsengine_p.cpp
+++ b/src/shared/qmljs/parser/qmljsengine_p.cpp
@@ -39,9 +39,11 @@
 **
 ****************************************************************************/
 
-#include "qmljsglobal_p.h"
 #include "qmljsengine_p.h"
+
+#include "qmljsglobal_p.h"
 #include "qmljsnodepool_p.h"
+
 #include <qnumeric.h>
 #include <QHash>
 
diff --git a/src/shared/qmljs/parser/qmljsengine_p.h b/src/shared/qmljs/parser/qmljsengine_p.h
index 46beabb3eda..2c15af33d8f 100644
--- a/src/shared/qmljs/parser/qmljsengine_p.h
+++ b/src/shared/qmljs/parser/qmljsengine_p.h
@@ -53,12 +53,12 @@
 // We mean it.
 //
 
-#include <QString>
-#include <QSet>
-
 #include "qmljsglobal_p.h"
 #include "qmljsastfwd_p.h"
 
+#include <QString>
+#include <QSet>
+
 QT_QML_BEGIN_NAMESPACE
 
 namespace QmlJS {
diff --git a/src/shared/qmljs/parser/qmljsgrammar.cpp b/src/shared/qmljs/parser/qmljsgrammar.cpp
index b8c656020ee..5d6eb022898 100644
--- a/src/shared/qmljs/parser/qmljsgrammar.cpp
+++ b/src/shared/qmljs/parser/qmljsgrammar.cpp
@@ -1,4 +1,3 @@
-// This file was generated by qlalr - DO NOT EDIT!
 /****************************************************************************
 **
 ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
@@ -40,8 +39,11 @@
 **
 ****************************************************************************/
 
+// This file was generated by qlalr - DO NOT EDIT!
 #include "qmljsgrammar_p.h"
 
+QT_BEGIN_NAMESPACE
+
 const char *const QmlJSGrammar::spell [] = {
   "end of file", "&", "&&", "&=", "break", "case", "catch", ":", ";", "continue", 
   "default", "delete", "/", "/=", "do", ".", "else", "=", "==", "===", 
@@ -52,591 +54,585 @@ const char *const QmlJSGrammar::spell [] = {
   ")", ";", 0, "*", "*=", "string literal", "property", "signal", "readonly", "switch", 
   "this", "throw", "~", "try", "typeof", "var", "void", "while", "with", "^", 
   "^=", "null", "true", "false", "const", "debugger", "reserved word", "multiline string literal", "comment", "public", 
-  "import", "as", 0, 0, 0, 0, 0, 0};
+  "import", "as", 0, 0, 0, 0, 0, 0, 0};
 
-const int QmlJSGrammar::lhs [] = {
-  98, 98, 98, 98, 99, 103, 103, 106, 106, 108, 
-  107, 107, 107, 107, 107, 107, 107, 107, 110, 105, 
-  104, 113, 113, 114, 114, 115, 115, 112, 102, 102, 
-  102, 102, 102, 102, 102, 121, 121, 121, 122, 122, 
-  123, 123, 102, 102, 102, 102, 102, 102, 102, 102, 
-  102, 102, 102, 102, 102, 102, 102, 102, 102, 102, 
-  111, 111, 111, 111, 126, 126, 126, 126, 126, 126, 
-  126, 126, 126, 126, 126, 126, 126, 126, 126, 126, 
-  126, 126, 116, 128, 128, 128, 128, 127, 127, 130, 
-  130, 132, 132, 132, 132, 132, 132, 133, 133, 133, 
-  133, 133, 133, 133, 133, 133, 133, 133, 133, 133, 
-  133, 133, 133, 133, 133, 133, 133, 133, 133, 133, 
-  133, 133, 133, 133, 133, 133, 133, 133, 134, 134, 
-  109, 109, 109, 109, 109, 137, 137, 138, 138, 138, 
-  138, 136, 136, 139, 139, 140, 140, 141, 141, 141, 
-  142, 142, 142, 142, 142, 142, 142, 142, 142, 142, 
-  143, 143, 143, 143, 144, 144, 144, 145, 145, 145, 
-  145, 146, 146, 146, 146, 146, 146, 146, 147, 147, 
-  147, 147, 147, 147, 148, 148, 148, 148, 148, 149, 
-  149, 149, 149, 149, 150, 150, 151, 151, 152, 152, 
-  153, 153, 154, 154, 155, 155, 156, 156, 157, 157, 
-  158, 158, 159, 159, 160, 160, 161, 161, 131, 131, 
-  162, 162, 163, 163, 163, 163, 163, 163, 163, 163, 
-  163, 163, 163, 163, 101, 101, 164, 164, 165, 165, 
-  166, 166, 100, 100, 100, 100, 100, 100, 100, 100, 
-  100, 100, 100, 100, 100, 100, 100, 117, 178, 178, 
-  177, 177, 125, 125, 179, 179, 180, 180, 182, 182, 
-  181, 183, 186, 184, 184, 187, 185, 185, 118, 119, 
-  119, 120, 120, 167, 167, 167, 167, 167, 167, 167, 
-  168, 168, 168, 168, 169, 169, 169, 169, 170, 170, 
-  171, 173, 188, 188, 191, 191, 189, 189, 192, 190, 
-  172, 172, 172, 174, 174, 175, 175, 175, 193, 194, 
-  176, 176, 124, 135, 198, 198, 195, 195, 196, 196, 
-  199, 200, 200, 201, 201, 197, 197, 129, 129, 202};
+const short QmlJSGrammar::lhs [] = {
+  99, 99, 99, 99, 99, 100, 104, 104, 107, 107, 
+  109, 108, 108, 108, 108, 108, 108, 108, 108, 111, 
+  106, 105, 114, 114, 115, 115, 116, 116, 113, 103, 
+  103, 103, 103, 103, 103, 103, 122, 122, 122, 123, 
+  123, 124, 124, 103, 103, 103, 103, 103, 103, 103, 
+  103, 103, 103, 103, 103, 103, 103, 103, 103, 103, 
+  103, 112, 112, 112, 112, 127, 127, 127, 127, 127, 
+  127, 127, 127, 127, 127, 127, 127, 127, 127, 127, 
+  127, 127, 127, 117, 129, 129, 129, 129, 128, 128, 
+  131, 131, 133, 133, 133, 133, 133, 133, 134, 134, 
+  134, 134, 134, 134, 134, 134, 134, 134, 134, 134, 
+  134, 134, 134, 134, 134, 134, 134, 134, 134, 134, 
+  134, 134, 134, 134, 134, 134, 134, 134, 134, 135, 
+  135, 110, 110, 110, 110, 110, 138, 138, 139, 139, 
+  139, 139, 137, 137, 140, 140, 141, 141, 142, 142, 
+  142, 143, 143, 143, 143, 143, 143, 143, 143, 143, 
+  143, 144, 144, 144, 144, 145, 145, 145, 146, 146, 
+  146, 146, 147, 147, 147, 147, 147, 147, 147, 148, 
+  148, 148, 148, 148, 148, 149, 149, 149, 149, 149, 
+  150, 150, 150, 150, 150, 151, 151, 152, 152, 153, 
+  153, 154, 154, 155, 155, 156, 156, 157, 157, 158, 
+  158, 159, 159, 160, 160, 161, 161, 162, 162, 132, 
+  132, 163, 163, 164, 164, 164, 164, 164, 164, 164, 
+  164, 164, 164, 164, 164, 102, 102, 165, 165, 166, 
+  166, 167, 167, 101, 101, 101, 101, 101, 101, 101, 
+  101, 101, 101, 101, 101, 101, 101, 101, 118, 179, 
+  179, 178, 178, 126, 126, 180, 180, 181, 181, 183, 
+  183, 182, 184, 187, 185, 185, 188, 186, 186, 119, 
+  120, 120, 121, 121, 168, 168, 168, 168, 168, 168, 
+  168, 169, 169, 169, 169, 170, 170, 170, 170, 171, 
+  171, 172, 174, 189, 189, 192, 192, 190, 190, 193, 
+  191, 173, 173, 173, 175, 175, 176, 176, 176, 194, 
+  195, 177, 177, 125, 136, 199, 199, 196, 196, 197, 
+  197, 200, 201, 201, 202, 202, 198, 198, 130, 130, 
+  203};
 
-const int QmlJSGrammar:: rhs[] = {
-  2, 2, 2, 2, 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, 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, 1, 1, 
+const short QmlJSGrammar::rhs [] = {
+  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, 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, 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, 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, 4, 3, 5, 1, 2, 4, 4, 4, 
-  3, 0, 1, 1, 3, 1, 1, 1, 2, 2, 
-  1, 2, 2, 2, 2, 2, 2, 2, 2, 2, 
-  1, 3, 3, 3, 1, 3, 3, 1, 3, 3, 
-  3, 1, 3, 3, 3, 3, 3, 3, 1, 3, 
-  3, 3, 3, 3, 1, 3, 3, 3, 3, 1, 
-  3, 3, 3, 3, 1, 3, 1, 3, 1, 3, 
-  1, 3, 1, 3, 1, 3, 1, 3, 1, 3, 
-  1, 3, 1, 3, 1, 5, 1, 5, 1, 3, 
-  1, 3, 1, 1, 1, 1, 1, 1, 1, 1, 
-  1, 1, 1, 1, 1, 3, 0, 1, 1, 3, 
-  0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 
-  1, 1, 1, 1, 1, 1, 1, 3, 1, 2, 
-  0, 1, 3, 3, 1, 1, 1, 3, 1, 3, 
-  2, 2, 2, 0, 1, 2, 0, 1, 1, 2, 
-  2, 7, 5, 7, 7, 5, 9, 10, 7, 8, 
-  2, 2, 3, 3, 2, 2, 3, 3, 3, 3, 
-  5, 5, 3, 5, 1, 2, 0, 1, 4, 3, 
-  3, 3, 3, 3, 3, 3, 3, 4, 5, 2, 
-  2, 2, 8, 8, 1, 3, 0, 1, 0, 1, 
-  1, 1, 2, 1, 1, 0, 1, 0, 1, 2};
+  1, 1, 1, 4, 3, 5, 1, 2, 4, 4, 
+  4, 3, 0, 1, 1, 3, 1, 1, 1, 2, 
+  2, 1, 2, 2, 2, 2, 2, 2, 2, 2, 
+  2, 1, 3, 3, 3, 1, 3, 3, 1, 3, 
+  3, 3, 1, 3, 3, 3, 3, 3, 3, 1, 
+  3, 3, 3, 3, 3, 1, 3, 3, 3, 3, 
+  1, 3, 3, 3, 3, 1, 3, 1, 3, 1, 
+  3, 1, 3, 1, 3, 1, 3, 1, 3, 1, 
+  3, 1, 3, 1, 3, 1, 5, 1, 5, 1, 
+  3, 1, 3, 1, 1, 1, 1, 1, 1, 1, 
+  1, 1, 1, 1, 1, 1, 3, 0, 1, 1, 
+  3, 0, 1, 1, 1, 1, 1, 1, 1, 1, 
+  1, 1, 1, 1, 1, 1, 1, 1, 3, 1, 
+  2, 0, 1, 3, 3, 1, 1, 1, 3, 1, 
+  3, 2, 2, 2, 0, 1, 2, 0, 1, 1, 
+  2, 2, 7, 5, 7, 7, 5, 9, 10, 7, 
+  8, 2, 2, 3, 3, 2, 2, 3, 3, 3, 
+  3, 5, 5, 3, 5, 1, 2, 0, 1, 4, 
+  3, 3, 3, 3, 3, 3, 3, 3, 4, 5, 
+  2, 2, 2, 8, 8, 1, 3, 0, 1, 0, 
+  1, 1, 1, 2, 1, 1, 0, 1, 0, 1, 
+  2};
 
-const int QmlJSGrammar::action_default [] = {
-  0, 0, 0, 0, 20, 0, 168, 235, 199, 207, 
-  203, 147, 219, 195, 3, 132, 66, 148, 211, 215, 
-  136, 165, 146, 151, 131, 185, 172, 0, 73, 74, 
-  69, 336, 61, 338, 0, 0, 0, 0, 71, 0, 
-  0, 67, 70, 0, 0, 62, 64, 63, 72, 65, 
-  0, 68, 0, 0, 161, 0, 0, 148, 167, 150, 
-  149, 0, 0, 0, 163, 164, 162, 166, 0, 196, 
-  0, 0, 0, 0, 186, 0, 0, 0, 0, 0, 
-  0, 176, 0, 0, 0, 170, 171, 169, 174, 178, 
-  177, 175, 173, 188, 187, 189, 0, 204, 0, 200, 
-  0, 0, 142, 129, 141, 130, 98, 99, 100, 125, 
-  101, 126, 102, 103, 104, 105, 106, 107, 108, 109, 
-  110, 111, 112, 113, 114, 127, 115, 116, 117, 118, 
-  119, 120, 121, 122, 123, 124, 128, 0, 0, 140, 
-  236, 143, 0, 144, 0, 145, 139, 0, 232, 225, 
-  223, 230, 231, 229, 228, 234, 227, 226, 224, 233, 
-  220, 0, 208, 0, 0, 212, 0, 0, 216, 0, 
-  0, 142, 134, 0, 133, 0, 138, 152, 0, 337, 
-  327, 328, 0, 325, 0, 326, 0, 329, 243, 250, 
-  249, 257, 245, 0, 246, 330, 0, 335, 247, 248, 
-  253, 251, 332, 331, 334, 254, 0, 265, 0, 0, 
-  0, 0, 336, 61, 0, 338, 62, 237, 279, 63, 
-  0, 0, 0, 266, 0, 0, 255, 256, 0, 244, 
-  252, 280, 281, 324, 333, 0, 295, 296, 297, 298, 
-  0, 291, 292, 293, 294, 321, 322, 0, 0, 0, 
-  0, 0, 284, 285, 241, 239, 201, 209, 205, 221, 
-  197, 242, 0, 148, 213, 217, 190, 179, 0, 0, 
-  198, 0, 0, 0, 0, 191, 0, 0, 0, 0, 
-  0, 183, 181, 184, 182, 180, 193, 192, 194, 0, 
-  206, 0, 202, 0, 240, 148, 0, 222, 237, 238, 
-  0, 237, 0, 0, 287, 0, 0, 0, 289, 0, 
-  210, 0, 0, 214, 0, 0, 218, 277, 0, 269, 
-  278, 272, 0, 276, 0, 237, 270, 0, 237, 0, 
-  0, 288, 0, 0, 0, 290, 337, 327, 0, 0, 
-  329, 0, 323, 0, 313, 0, 0, 0, 283, 0, 
-  282, 0, 339, 0, 97, 259, 262, 0, 98, 265, 
-  101, 126, 103, 104, 69, 108, 109, 61, 110, 113, 
-  67, 70, 62, 237, 63, 72, 116, 65, 118, 68, 
-  120, 121, 266, 123, 124, 128, 0, 90, 0, 0, 
-  92, 96, 94, 81, 93, 95, 0, 91, 80, 260, 
-  258, 136, 137, 142, 0, 135, 0, 312, 0, 299, 
-  300, 0, 311, 0, 0, 0, 302, 307, 305, 308, 
-  0, 0, 306, 307, 0, 303, 0, 304, 261, 310, 
-  0, 261, 309, 0, 314, 315, 0, 261, 316, 317, 
-  0, 0, 318, 0, 0, 0, 319, 320, 154, 153, 
-  0, 0, 0, 286, 0, 0, 0, 301, 274, 267, 
-  0, 275, 271, 0, 273, 263, 0, 264, 268, 84, 
-  0, 0, 88, 75, 0, 77, 86, 0, 78, 87, 
-  89, 79, 85, 76, 0, 82, 158, 156, 160, 157, 
-  155, 159, 2, 59, 83, 0, 0, 62, 64, 63, 
-  29, 4, 0, 60, 0, 38, 37, 36, 0, 0, 
-  51, 0, 52, 0, 57, 58, 0, 38, 0, 0, 
-  0, 0, 0, 47, 48, 0, 49, 0, 50, 0, 
-  53, 54, 0, 0, 0, 0, 0, 55, 56, 0, 
-  45, 39, 46, 40, 0, 0, 0, 0, 42, 0, 
-  43, 44, 41, 0, 0, 28, 32, 33, 34, 35, 
-  136, 261, 0, 0, 98, 265, 101, 126, 103, 104, 
-  69, 108, 109, 61, 110, 113, 67, 70, 62, 237, 
-  63, 72, 116, 65, 118, 68, 120, 121, 266, 123, 
-  124, 128, 136, 0, 24, 0, 0, 30, 25, 31, 
-  26, 22, 0, 27, 23, 6, 0, 8, 0, 7, 
-  0, 1, 19, 10, 0, 11, 0, 12, 0, 17, 
-  18, 0, 13, 14, 0, 15, 16, 9, 21, 5, 
-  340};
+const short QmlJSGrammar::action_default [] = {
+  0, 0, 0, 0, 0, 21, 0, 169, 236, 200, 
+  208, 204, 148, 220, 196, 3, 133, 67, 149, 212, 
+  216, 137, 166, 147, 152, 132, 186, 173, 0, 74, 
+  75, 70, 337, 62, 339, 0, 0, 0, 0, 72, 
+  0, 0, 68, 71, 0, 0, 63, 65, 64, 73, 
+  66, 0, 69, 0, 0, 162, 0, 0, 149, 168, 
+  151, 150, 0, 0, 0, 164, 165, 163, 167, 0, 
+  197, 0, 0, 0, 0, 187, 0, 0, 0, 0, 
+  0, 0, 177, 0, 0, 0, 171, 172, 170, 175, 
+  179, 178, 176, 174, 189, 188, 190, 0, 205, 0, 
+  201, 0, 0, 143, 130, 142, 131, 99, 100, 101, 
+  126, 102, 127, 103, 104, 105, 106, 107, 108, 109, 
+  110, 111, 112, 113, 114, 115, 128, 116, 117, 118, 
+  119, 120, 121, 122, 123, 124, 125, 129, 0, 0, 
+  141, 237, 144, 0, 145, 0, 146, 140, 0, 233, 
+  226, 224, 231, 232, 230, 229, 235, 228, 227, 225, 
+  234, 221, 0, 209, 0, 0, 213, 0, 0, 217, 
+  0, 0, 143, 135, 0, 134, 0, 139, 153, 0, 
+  338, 328, 329, 0, 326, 0, 327, 0, 330, 244, 
+  251, 250, 258, 246, 0, 247, 331, 0, 336, 248, 
+  249, 254, 252, 333, 332, 335, 255, 0, 266, 0, 
+  0, 0, 0, 337, 62, 0, 339, 63, 238, 280, 
+  64, 0, 0, 0, 267, 0, 0, 256, 257, 0, 
+  245, 253, 281, 282, 325, 334, 0, 296, 297, 298, 
+  299, 0, 292, 293, 294, 295, 322, 323, 0, 0, 
+  0, 0, 0, 285, 286, 242, 240, 202, 210, 206, 
+  222, 198, 243, 0, 149, 214, 218, 191, 180, 0, 
+  0, 199, 0, 0, 0, 0, 192, 0, 0, 0, 
+  0, 0, 184, 182, 185, 183, 181, 194, 193, 195, 
+  0, 207, 0, 203, 0, 241, 149, 0, 223, 238, 
+  239, 0, 238, 0, 0, 288, 0, 0, 0, 290, 
+  0, 211, 0, 0, 215, 0, 0, 219, 278, 0, 
+  270, 279, 273, 0, 277, 0, 238, 271, 0, 238, 
+  0, 0, 289, 0, 0, 0, 291, 338, 328, 0, 
+  0, 330, 0, 324, 0, 314, 0, 0, 0, 284, 
+  0, 283, 0, 340, 0, 98, 260, 263, 0, 99, 
+  266, 102, 127, 104, 105, 70, 109, 110, 62, 111, 
+  114, 68, 71, 63, 238, 64, 73, 117, 66, 119, 
+  69, 121, 122, 267, 124, 125, 129, 0, 91, 0, 
+  0, 93, 97, 95, 82, 94, 96, 0, 92, 81, 
+  261, 259, 137, 138, 143, 0, 136, 0, 313, 0, 
+  300, 301, 0, 312, 0, 0, 0, 303, 308, 306, 
+  309, 0, 0, 307, 308, 0, 304, 0, 305, 262, 
+  311, 0, 262, 310, 0, 315, 316, 0, 262, 317, 
+  318, 0, 0, 319, 0, 0, 0, 320, 321, 155, 
+  154, 0, 0, 0, 287, 0, 0, 0, 302, 275, 
+  268, 0, 276, 272, 0, 274, 264, 0, 265, 269, 
+  85, 0, 0, 89, 76, 0, 78, 87, 0, 79, 
+  88, 90, 80, 86, 77, 0, 83, 159, 157, 161, 
+  158, 156, 160, 4, 2, 60, 84, 0, 0, 63, 
+  65, 64, 30, 5, 0, 61, 0, 39, 38, 37, 
+  0, 0, 52, 0, 53, 0, 58, 59, 0, 39, 
+  0, 0, 0, 0, 0, 48, 49, 0, 50, 0, 
+  51, 0, 54, 55, 0, 0, 0, 0, 0, 56, 
+  57, 0, 46, 40, 47, 41, 0, 0, 0, 0, 
+  43, 0, 44, 45, 42, 0, 0, 29, 33, 34, 
+  35, 36, 137, 262, 0, 0, 99, 266, 102, 127, 
+  104, 105, 70, 109, 110, 62, 111, 114, 68, 71, 
+  63, 238, 64, 73, 117, 66, 119, 69, 121, 122, 
+  267, 124, 125, 129, 137, 0, 25, 0, 0, 31, 
+  26, 32, 27, 23, 0, 28, 24, 7, 0, 9, 
+  0, 8, 0, 1, 20, 11, 0, 12, 0, 13, 
+  0, 18, 19, 0, 14, 15, 0, 16, 17, 10, 
+  22, 6, 341};
 
-const int QmlJSGrammar::goto_default [] = {
-  5, 611, 355, 193, 501, 610, 629, 605, 609, 607, 
-  612, 20, 608, 16, 500, 602, 593, 555, 502, 188, 
-  192, 194, 198, 518, 544, 543, 197, 229, 24, 471, 
-  470, 353, 352, 7, 351, 354, 104, 15, 142, 22, 
-  11, 141, 17, 23, 54, 21, 6, 26, 25, 266, 
-  13, 260, 8, 256, 10, 258, 9, 257, 18, 264, 
-  19, 265, 12, 259, 255, 296, 408, 261, 262, 199, 
-  190, 189, 201, 230, 200, 205, 226, 227, 191, 357, 
-  356, 228, 460, 459, 318, 319, 462, 321, 461, 320, 
-  416, 420, 423, 419, 418, 438, 439, 182, 196, 178, 
-  181, 195, 203, 202, 0};
+const short QmlJSGrammar::goto_default [] = {
+  6, 613, 356, 194, 503, 612, 631, 607, 611, 609, 
+  614, 21, 610, 17, 502, 604, 595, 557, 504, 189, 
+  193, 195, 199, 520, 546, 545, 198, 230, 25, 472, 
+  471, 354, 353, 8, 352, 355, 105, 16, 143, 23, 
+  12, 142, 18, 24, 55, 22, 7, 27, 26, 267, 
+  14, 261, 9, 257, 11, 259, 10, 258, 19, 265, 
+  20, 266, 13, 260, 256, 297, 409, 262, 263, 200, 
+  191, 190, 202, 231, 201, 206, 227, 228, 192, 358, 
+  357, 229, 461, 460, 319, 320, 463, 322, 462, 321, 
+  417, 421, 424, 420, 419, 439, 440, 183, 197, 179, 
+  182, 196, 204, 203, 0};
 
-const int QmlJSGrammar::action_index [] = {
-  251, 1237, 2238, 974, -45, 51, 122, -98, 52, -11, 
-  -39, 182, -98, 389, 36, -98, -98, 628, 58, 75, 
-  246, 228, -98, -98, -98, 438, 309, 1237, -98, -98, 
-  -98, 348, -98, 2050, 1772, 1237, 1237, 1237, -98, 800, 
-  1237, -98, -98, 1237, 1237, -98, -98, -98, -98, -98, 
-  1237, -98, 1237, 1237, -98, 1237, 1237, 97, 226, -98, 
-  -98, 1237, 1237, 1237, -98, -98, -98, 200, 1237, 389, 
-  1237, 1237, 1237, 1237, 418, 1237, 1237, 1237, 1237, 1237, 
-  1237, 212, 1237, 1237, 1237, 144, 121, 71, 309, 309, 
-  164, 156, 179, 448, 428, 408, 1237, -51, 1237, 101, 
-  1956, 1237, 1237, -98, -98, -98, -98, -98, -98, -98, 
-  -98, -98, -98, -98, -98, -98, -98, -98, -98, -98, 
-  -98, -98, -98, -98, -98, -98, -98, -98, -98, -98, 
-  -98, -98, -98, -98, -98, -98, -98, 236, 1237, -98, 
-  -98, 31, 16, -98, 1237, -98, -98, 1237, -98, -98, 
-  -98, -98, -98, -98, -98, -98, -98, -98, -98, -98, 
-  -98, 1237, 2, 1237, 1237, 41, 35, 1237, -98, 1956, 
-  1237, 1237, -98, 102, -98, 6, -98, -98, 20, -98, 
-  299, 53, 14, -98, 321, -98, -22, 2332, -98, -98, 
-  -98, -98, -98, 216, -98, -98, -28, -98, -98, -98, 
-  -98, -98, -98, 2332, -98, -98, 469, -98, 533, 115, 
-  2238, -2, 335, -3, -36, 2520, 50, 1237, -98, 64, 
-  33, 1237, 21, -98, 5, -14, -98, -98, 306, -98, 
-  -98, -98, -98, -98, -98, 74, -98, -98, -98, -98, 
-  117, -98, -98, -98, -98, -98, -98, -57, -18, 1237, 
-  140, 109, -98, -98, 1324, -98, 104, 67, 27, -98, 
-  330, 84, 29, 585, 80, 92, 464, 171, 295, 1237, 
-  314, 1237, 1237, 1237, 1237, 346, 1237, 1237, 1237, 1237, 
-  1237, 309, 309, 309, 309, 309, 386, 464, 464, 1237, 
-  27, 1237, 87, 1237, -98, 529, 1237, -98, 1237, 83, 
-  38, 1237, 48, 2238, -98, 1237, 143, 2238, -98, 1237, 
-  30, 1237, 1237, 81, 77, 1237, -98, 56, 126, 90, 
-  -98, -98, 1237, -98, 290, 1237, -98, 42, 1237, 44, 
-  2238, -98, 1237, 133, 2238, -98, 22, 285, -37, -9, 
-  2332, -30, -98, 2238, -98, 1237, 141, 2238, 10, 2238, 
-  -98, 26, 24, -24, -98, -98, 2238, 25, 453, 23, 
-  533, 106, 1237, 2238, 9, -29, 361, -4, -31, 800, 
-  -6, 55, -98, 1415, -98, -1, -23, 8, 1237, 7, 
-  -21, 1237, 1, 1237, -27, -19, 1237, -98, 2144, 28, 
-  -98, -98, -98, -98, -98, -98, 1237, -98, -98, -98, 
-  -98, 211, -98, 1237, 17, -98, 2238, -98, 98, -98, 
-  -98, 2238, -98, 1237, 105, 37, -98, 63, -98, 62, 
-  99, 1237, -98, 60, 57, -98, 4, -98, 2238, -98, 
-  116, 2238, -98, 180, -98, -98, 112, 2238, 18, -98, 
-  11, 13, -98, 325, 3, 19, -98, -98, -98, -98, 
-  1237, 132, 2238, -98, 1237, 139, 2238, -98, 32, -98, 
-  174, -98, -98, 1237, -98, -98, 229, -98, -98, -98, 
-  108, 1682, -98, -98, 1862, -98, -98, 1505, -98, -98, 
-  -98, -98, -98, -98, 125, -98, -98, -98, -98, -98, 
-  -98, -98, -98, -98, 111, 46, 792, 184, 34, 85, 
-  -98, -98, 136, -98, 185, -98, -98, -98, 65, 204, 
-  -98, 1237, -98, 207, -98, -98, 193, 61, 43, 225, 
-  73, 88, 66, -98, -98, 214, -98, 1237, -98, 158, 
-  -98, -98, 181, 91, 72, 1237, 172, -98, -98, 187, 
-  -98, 157, -98, 47, -50, 274, 178, 250, -98, 113, 
-  -98, -98, -98, 1592, 1062, -98, -98, -98, -98, -98, 
-  271, 2426, 1772, 15, 461, 146, 445, 76, 1237, 2238, 
-  -5, 0, 370, 12, -15, 706, 89, 78, -98, 1415, 
-  -98, 100, 59, 82, 1237, 86, 54, 1237, 79, 1237, 
-  45, 39, 279, 149, -98, 68, 617, -98, -98, -98, 
-  -98, -98, 1150, -98, -98, -98, 886, -98, 240, -61, 
-  714, -98, -98, 129, 259, -98, 190, -98, 69, -98, 
-  -98, 255, -98, -98, 94, -98, -98, -98, -98, -98, 
-  -98, 
+const short QmlJSGrammar::action_index [] = {
+  316, 1136, 1136, 2148, 870, -77, 22, 108, -99, 54, 
+  18, -20, 166, -99, 307, 40, -99, -99, 510, 30, 
+  84, 184, 270, -99, -99, -99, 511, 171, 1136, -99, 
+  -99, -99, 269, -99, 1958, 1407, 1136, 1136, 1136, -99, 
+  585, 1136, -99, -99, 1136, 1136, -99, -99, -99, -99, 
+  -99, 1136, -99, 1136, 1136, -99, 1136, 1136, 122, 270, 
+  -99, -99, 1136, 1136, 1136, -99, -99, -99, 270, 1136, 
+  302, 1136, 1136, 1136, 1136, 511, 1136, 1136, 1136, 1136, 
+  1136, 1136, 176, 1136, 1136, 1136, 93, 95, 92, 208, 
+  217, 236, 242, 241, 511, 511, 511, 1136, -5, 1136, 
+  86, 1863, 1136, 1136, -99, -99, -99, -99, -99, -99, 
+  -99, -99, -99, -99, -99, -99, -99, -99, -99, -99, 
+  -99, -99, -99, -99, -99, -99, -99, -99, -99, -99, 
+  -99, -99, -99, -99, -99, -99, -99, -99, 132, 1136, 
+  -99, -99, 53, 8, -99, 1136, -99, -99, 1136, -99, 
+  -99, -99, -99, -99, -99, -99, -99, -99, -99, -99, 
+  -99, -99, 1136, -24, 1136, 1136, 27, 37, 1136, -99, 
+  1863, 1136, 1136, -99, 110, -99, -25, -99, -99, -2, 
+  -99, 339, 52, 4, -99, 325, -99, 29, 2243, -99, 
+  -99, -99, -99, -99, 196, -99, -99, -39, -99, -99, 
+  -99, -99, -99, -99, 2243, -99, -99, 416, -99, 405, 
+  91, 2148, 60, 335, 76, 41, 2433, 73, 1136, -99, 
+  74, 58, 1136, 49, -99, 57, 31, -99, -99, 272, 
+  -99, -99, -99, -99, -99, -99, 129, -99, -99, -99, 
+  -99, 118, -99, -99, -99, -99, -99, -99, 38, 62, 
+  1136, 109, 101, -99, -99, 1316, -99, 183, 36, 35, 
+  -99, 304, 61, 25, 547, 63, 111, 394, 262, 299, 
+  1136, 435, 1136, 1136, 1136, 1136, 398, 1136, 1136, 1136, 
+  1136, 1136, 209, 202, 186, 214, 218, 423, 404, 433, 
+  1136, -3, 1136, 70, 1136, -99, 607, 1136, -99, 1136, 
+  64, 12, 1136, 50, 2148, -99, 1136, 146, 2148, -99, 
+  1136, 43, 1136, 1136, 97, 98, 1136, -99, 89, 128, 
+  78, -99, -99, 1136, -99, 275, 1136, -99, 34, 1136, 
+  -40, 2148, -99, 1136, 133, 2148, -99, -17, 305, -43, 
+  -18, 2243, -41, -99, 2148, -99, 1136, 114, 2148, 11, 
+  2148, -99, 19, 20, -30, -99, -99, 2148, -45, 430, 
+  85, 450, 96, 1136, 2148, -7, -31, 384, 5, -27, 
+  773, 0, -1, -99, 1228, -99, 1, -32, 16, 1136, 
+  23, 24, 1136, 47, 1136, 17, 15, 1136, -99, 2053, 
+  51, -99, -99, -99, -99, -99, -99, 1136, -99, -99, 
+  -99, -99, 256, -99, 1136, -10, -99, 2148, -99, 68, 
+  -99, -99, 2148, -99, 1136, 117, 3, -99, 28, -99, 
+  26, 113, 1136, -99, 32, 33, -99, -8, -99, 2148, 
+  -99, 120, 2148, -99, 170, -99, -99, 106, 2148, 21, 
+  -99, 7, 6, -99, 295, -15, 9, -99, -99, -99, 
+  -99, 1136, 134, 2148, -99, 1136, 152, 2148, -99, -16, 
+  -99, 189, -99, -99, 1136, -99, -99, 290, -99, -99, 
+  -99, 131, 1498, -99, -99, 1680, -99, -99, 1589, -99, 
+  -99, -99, -99, -99, -99, 116, -99, -99, -99, -99, 
+  -99, -99, -99, 48, -99, -99, 136, -55, 781, 142, 
+  -64, -26, -99, -99, 112, -99, 243, -99, -99, -99, 
+  -11, 160, -99, 1136, -99, 164, -99, -99, 263, 66, 
+  75, 187, 87, 79, 88, -99, -99, 198, -99, 1136, 
+  -99, 215, -99, -99, 179, 56, 71, 1136, 222, -99, 
+  -99, 234, -99, 219, -99, 55, 10, 246, 178, 315, 
+  -99, 124, -99, -99, -99, 1768, 1048, -99, -99, -99, 
+  -99, -99, 354, 2338, 1407, 13, 458, 85, 440, 121, 
+  1136, 2148, 14, 2, 348, 42, 65, 666, 82, 81, 
+  -99, 1228, -99, 83, 39, 72, 1136, 90, 67, 1136, 
+  100, 1136, 80, 77, 273, 139, -99, 69, 694, -99, 
+  -99, -99, -99, -99, 959, -99, -99, -99, 781, -99, 
+  255, -38, 694, -99, -99, 158, 330, -99, 224, -99, 
+  59, -99, -99, 264, -99, -99, 94, -99, -99, -99, 
+  -99, -99, -99, 
 
-  -105, 23, 25, 216, -105, -105, -105, -105, -105, -105, 
-  -105, -105, -105, -105, -105, -105, -105, -44, -105, -105, 
-  -105, -105, -105, -105, -105, -105, -105, 70, -105, -105, 
-  -105, 28, -105, -105, 20, 39, 97, 163, -105, 178, 
-  159, -105, -105, 156, 164, -105, -105, -105, -105, -105, 
-  132, -105, 153, 135, -105, 139, 140, -105, -105, -105, 
-  -105, 103, 92, 144, -105, -105, -105, -105, 125, -105, 
-  154, 162, 83, 84, -105, 88, 82, 81, 75, 66, 
-  122, -105, 116, 98, 104, -105, -105, -105, -105, -105, 
-  -105, -105, -105, -105, -105, -105, 106, -105, 113, -105, 
-  86, 80, 52, -105, -105, -105, -105, -105, -105, -105, 
+  -105, 12, 13, 16, 226, -105, -105, -105, -105, -105, 
+  -105, -105, -105, -105, -105, -105, -105, -105, -57, -105, 
+  -105, -105, -105, -105, -105, -105, -105, -105, 68, -105, 
+  -105, -105, -2, -105, -105, -14, 25, 80, 84, -105, 
+  136, 178, -105, -105, 173, 170, -105, -105, -105, -105, 
+  -105, 139, -105, 165, 132, -105, 128, 124, -105, -105, 
+  -105, -105, 146, 142, 145, -105, -105, -105, -105, 143, 
+  -105, 149, 153, 158, 150, -105, 135, 118, 177, 157, 
+  161, 179, -105, 85, 73, 117, -105, -105, -105, -105, 
+  -105, -105, -105, -105, -105, -105, -105, 94, -105, 97, 
+  -105, 183, 79, 64, -105, -105, -105, -105, -105, -105, 
+  -105, -105, -105, -105, -105, -105, -105, -105, -105, -105, 
   -105, -105, -105, -105, -105, -105, -105, -105, -105, -105, 
+  -105, -105, -105, -105, -105, -105, -105, -105, -105, 56, 
+  -105, -105, -105, -105, -105, 15, -105, -105, 37, -105, 
   -105, -105, -105, -105, -105, -105, -105, -105, -105, -105, 
-  -105, -105, -105, -105, -105, -105, -105, -105, 34, -105, 
-  -105, -105, -105, -105, 38, -105, -105, 43, -105, -105, 
+  -105, -105, 65, -105, 67, 53, -105, -105, 40, -105, 
+  212, 52, 172, -105, -105, -105, -105, -105, -105, -105, 
+  -105, -11, -105, -105, -105, 46, -105, -105, 55, -105, 
   -105, -105, -105, -105, -105, -105, -105, -105, -105, -105, 
-  -105, 136, -105, 91, -29, -105, -105, 3, -105, 225, 
-  37, 71, -105, -105, -105, -105, -105, -105, -105, -105, 
-  -3, -105, -105, -105, 18, -105, -105, 27, -105, -105, 
+  -105, -105, -105, -105, 99, -105, -105, 38, -105, 36, 
+  -105, 42, -105, 71, -105, -105, -105, -105, 74, -105, 
+  -105, -105, 72, 57, -105, -105, -105, -105, -105, -8, 
   -105, -105, -105, -105, -105, -105, -105, -105, -105, -105, 
-  -105, -105, -105, 87, -105, -105, 62, -105, 56, -105, 
-  50, -105, 31, -105, -105, -105, -105, 59, -105, -105, 
-  -105, 47, 69, -105, -105, -105, -105, -105, 67, -105, 
   -105, -105, -105, -105, -105, -105, -105, -105, -105, -105, 
-  -105, -105, -105, -105, -105, -105, -105, -105, -105, 30, 
-  -105, -105, -105, -105, 96, -105, -105, -105, -105, -105, 
-  -105, -105, -105, -105, -105, -105, -105, -105, 10, 184, 
-  -105, 222, 226, 232, 202, -105, 124, 114, 112, 110, 
-  95, -105, -105, -105, -105, -105, -105, -105, -105, 212, 
-  -105, 192, -105, 177, -105, -105, 208, -105, 107, -105, 
-  -105, 255, -105, 11, -105, 13, -105, 44, -105, 206, 
-  -105, 169, 176, -105, -105, 183, -105, -105, -105, -105, 
-  -105, -105, 173, -105, 167, 117, -105, -105, 191, -105, 
-  54, -105, 55, -105, 58, -105, -105, 102, -105, -105, 
-  89, -105, -105, 57, -105, 46, -105, 45, -105, 49, 
-  -105, -105, -105, -105, -105, -105, 77, -105, 64, -105, 
-  51, -105, 109, 61, -105, -105, 48, -105, -105, 152, 
-  -105, -105, -105, 79, -105, -105, -105, -105, 4, -105, 
-  -16, 153, -105, 74, -105, -105, -11, -105, 0, -105, 
-  -105, -105, -105, -105, -105, -105, -5, -105, -105, -105, 
-  -105, -105, -105, 68, -105, -105, 41, -105, -105, -105, 
-  -105, 90, -105, -1, -105, -105, -105, -105, -105, -93, 
-  -105, 32, -105, -4, -105, -105, -105, -105, -22, -105, 
-  -105, -14, -105, -105, -105, -105, -105, -105, -26, -105, 
-  -105, -2, -105, 60, -105, 53, -105, -105, -105, -105, 
-  65, -105, 76, -105, 78, -105, 72, -105, -105, -105, 
-  -105, -105, -105, 21, -105, -105, 85, -105, -105, -105, 
-  -105, 22, -105, -105, 180, -105, -105, 33, -105, -105, 
+  10, -105, -105, -105, -105, 109, -105, -105, -105, -105, 
+  -105, -105, -105, -105, -105, -105, -105, -105, -105, 8, 
+  185, -105, 231, 241, 250, 242, -105, 115, 87, 108, 
+  98, 95, -105, -105, -105, -105, -105, -105, -105, -105, 
+  196, -105, 188, -105, 215, -105, -105, 218, -105, 113, 
+  -105, -105, 114, -105, 23, -105, 6, -105, 100, -105, 
+  219, -105, 187, 207, -105, -105, 208, -105, -105, -105, 
+  -105, -105, -105, 181, -105, 83, 92, -105, -105, 101, 
+  -105, 76, -105, 77, -105, 70, -105, -105, 75, -105, 
+  -105, 96, -105, -105, 69, -105, 82, -105, 28, -105, 
+  43, -105, -105, -105, -105, -105, -105, 51, -105, 34, 
+  -105, 29, -105, 169, 35, -105, -105, 45, -105, -105, 
+  81, -105, -105, -105, 59, -105, -105, -105, -105, 66, 
+  -105, 48, 110, -105, 102, -105, -105, 41, -105, 47, 
+  -105, -105, -105, -105, -105, -105, -105, 50, -105, -105, 
+  -105, -105, -105, -105, 105, -105, -105, 54, -105, -105, 
+  -105, -105, 58, -105, 62, -105, -105, -105, -105, -105, 
+  -26, -105, 63, -105, -27, -105, -105, -105, -105, -16, 
+  -105, -105, -18, -105, -105, -105, -105, -105, -105, -58, 
+  -105, -105, 31, -105, 30, -105, 20, -105, -105, -105, 
+  -105, 33, -105, 39, -105, 49, -105, 44, -105, -105, 
+  -105, -105, -105, -105, 21, -105, -105, 78, -105, -105, 
+  -105, -105, 61, -105, -105, 248, -105, -105, 60, -105, 
   -105, -105, -105, -105, -105, -105, -105, -105, -105, -105, 
-  -105, -105, -105, -105, -105, -105, 73, -105, -105, -105, 
-  -105, -105, -105, -105, 63, -105, -105, -105, -105, -105, 
-  -105, 12, -105, -105, -105, -105, -105, -105, -105, -12, 
-  -105, -105, -105, -105, -105, -105, -105, 6, -105, -105, 
-  -105, -105, -15, -105, -105, 9, -105, -105, -105, -105, 
-  -105, -9, -105, -105, -105, -7, -18, -13, -105, -105, 
-  -105, -105, -105, 277, 266, -105, -105, -105, -105, -105, 
-  -105, -105, 269, 2, 26, -105, 24, -105, 170, 16, 
-  -105, -105, 19, -105, -105, 182, -105, -105, -105, 35, 
-  -105, -105, -105, -105, 42, -105, 29, 153, -105, 128, 
-  -105, -105, -105, -105, -105, -105, 349, -105, -105, -105, 
-  -105, -105, 274, -105, -105, -105, 14, -105, -105, 15, 
-  218, -105, -105, -105, 7, -105, -105, -105, -105, -105, 
-  -105, 17, -105, -105, -105, -105, -105, -105, -105, -105, 
-  -105};
+  -105, -105, -105, -105, -105, -105, -105, -105, 22, -105, 
+  -105, -105, -105, -105, -105, -105, -22, -105, -105, -105, 
+  -105, -105, -105, 32, -105, -105, -105, -105, -105, -105, 
+  -105, -19, -105, -105, -105, -105, -105, -105, -105, 3, 
+  -105, -105, -105, -105, -20, -105, -105, -3, -105, -105, 
+  -105, -105, -105, 9, -105, -105, -105, 14, 0, 11, 
+  -105, -105, -105, -105, -105, 293, 282, -105, -105, -105, 
+  -105, -105, -105, -105, 284, 17, 18, -105, -6, -105, 
+  169, 24, -105, -105, 27, -105, -105, 205, -105, -105, 
+  -105, 26, -105, -105, -105, -105, 19, -105, -7, 88, 
+  -105, 91, -105, -105, -105, -105, -105, -105, 245, -105, 
+  -105, -105, -105, -105, 292, -105, -105, -105, -1, -105, 
+  -105, 5, 342, -105, -105, -105, 4, -105, -105, -105, 
+  -105, -105, -105, 7, -105, -105, -105, -105, -105, -105, 
+  -105, -105, -105};
 
-const int QmlJSGrammar::action_info [] = {
-  345, -114, -106, -92, 343, 345, -95, 254, -122, 450, 
-  549, 187, 437, 413, -119, -117, -106, 454, 249, -92, 
-  248, 345, 454, 339, 340, 342, 349, 233, 98, 606, 
-  -125, 398, 388, 386, 254, 396, 254, 96, 441, 144, 
-  98, 450, 167, 161, 138, 606, 437, 443, 554, 463, 
-  96, 630, 437, 68, 437, 546, 180, 406, 337, 427, 
-  161, 184, -96, 445, 428, 421, 176, 421, 421, 413, 
-  417, 411, 525, 322, 186, 454, 146, 405, 289, 535, 
-  400, 450, 309, 309, 315, -96, -122, 437, 269, -117, 
-  298, 138, 293, -119, 509, 413, -114, 521, 519, 301, 
-  532, 554, 68, 328, 330, 269, 291, -95, 303, 424, 
-  138, 55, 504, 138, 539, 289, 474, 522, 440, 0, 
-  534, 332, 56, 431, 138, 163, 169, 524, 523, 164, 
-  620, 619, 441, 138, 324, 239, 238, 246, 245, 59, 
-  138, 138, 311, 553, 169, 170, 312, 138, 138, 138, 
-  60, 138, 0, -125, 425, 626, 625, 596, 174, 410, 
-  409, 55, 55, 170, 475, 415, 138, 246, 245, 554, 
-  253, 252, 56, 56, 551, 550, 246, 245, 244, 243, 
-  138, 82, 466, 83, 55, 485, 505, 325, 138, 82, 
-  0, 83, 452, 334, 84, 56, 82, 100, 83, 456, 
-  251, 347, 84, 307, 82, 597, 83, 505, 169, 84, 
-  505, 511, 61, 517, 505, 138, 101, 84, 102, 531, 
-  530, 527, 0, 541, 138, 0, 169, 170, 0, 403, 
-  0, 0, 507, 538, 537, 467, 465, 82, 61, 83, 
-  61, 435, 434, 506, 138, 170, 0, 403, 542, 540, 
-  84, 623, 622, 507, 505, 0, 507, 62, 32, 507, 
-  507, 169, 0, 63, 506, 512, 510, 506, 515, 514, 
-  506, 506, 0, 0, 0, 528, 526, 232, 231, 32, 
-  170, 621, 171, 62, 32, 62, 169, 616, 32, 63, 
-  0, 63, 139, 0, 169, 45, 47, 46, 0, 0, 
-  507, 617, 615, 32, -83, 170, 0, 171, 0, 0, 
-  0, 506, -83, 170, 32, 171, 45, 47, 46, 32, 
-  0, 45, 47, 46, 32, 45, 47, 46, 32, 0, 
-  0, 614, 271, 272, 82, 32, 83, 0, 0, 0, 
-  45, 47, 46, 4, 3, 2, 1, 84, 271, 272, 
-  32, 45, 47, 46, 32, 0, 45, 47, 46, 273, 
-  274, 45, 47, 46, 32, 45, 47, 46, 0, 276, 
-  277, 0, 45, 47, 46, 273, 274, 32, 278, 0, 
-  0, 279, 0, 280, 0, 0, 0, 45, 47, 46, 
-  32, 45, 47, 46, 0, 0, 0, -336, 0, 32, 
-  0, 45, 47, 46, 0, 0, -336, 70, 71, 276, 
-  277, 0, 0, 0, 45, 47, 46, 0, 278, 0, 
-  0, 279, 0, 280, 0, 0, 0, 45, 47, 46, 
-  0, 75, 76, 0, 72, 73, 45, 47, 46, 77, 
-  78, 75, 76, 79, 0, 80, 0, 0, 0, 77, 
-  78, 75, 76, 79, 0, 80, 0, 0, 0, 77, 
-  78, 75, 76, 79, 0, 80, 0, 0, 0, 77, 
-  78, 75, 76, 79, 32, 80, 0, 0, 0, 77, 
-  78, 0, 32, 79, 0, 80, 0, 276, 277, 0, 
-  32, 0, 0, 0, 0, 0, 278, 0, 32, 279, 
-  0, 280, 0, 0, 0, 0, 242, 241, 0, 0, 
-  0, 45, 47, 46, 237, 236, 0, 0, 0, 45, 
-  47, 46, 237, 236, 0, 0, 0, 45, 47, 46, 
-  237, 236, 148, 0, 0, 45, 47, 46, 0, 0, 
-  0, 0, 149, 0, 0, 0, 150, 0, 0, 0, 
-  0, 0, 0, 0, 0, 151, 0, 152, 0, 0, 
-  0, 0, 32, 0, 0, 0, 0, 0, 153, 0, 
-  154, 59, 0, 0, 0, 0, 0, 0, 155, 0, 
-  0, 156, 60, 0, 0, 0, 0, 157, 148, 0, 
-  0, 0, 0, 158, 242, 241, 0, 0, 149, 45, 
-  47, 46, 150, 0, 0, 0, 0, 0, 0, 159, 
-  0, 151, 0, 152, 0, 0, 305, 0, 0, 0, 
-  0, 0, 0, 0, 153, 0, 154, 59, 0, 28, 
-  29, 148, 0, 0, 155, 0, 0, 156, 60, 31, 
-  0, 149, 0, 157, 0, 150, 32, 0, 0, 158, 
-  33, 34, 0, 35, 151, 0, 152, 0, 0, 0, 
-  496, 0, 0, 0, 42, 159, 0, 153, 0, 154, 
-  59, 0, 0, 0, 0, 0, 0, 155, 0, 0, 
-  156, 60, 48, 45, 47, 46, 157, 49, 0, 0, 
-  0, 0, 158, 0, 0, 0, 0, 0, 41, 51, 
-  30, 0, 0, 0, 38, 0, 0, 0, 159, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 28, 29, 
-  0, 0, 0, 0, 0, 0, 28, 29, 31, 0, 
-  0, 0, 0, 0, 0, 32, 31, 0, 0, 33, 
-  34, 0, 35, 32, 0, 0, 0, 33, 34, 39, 
-  35, 0, 0, 42, 0, 0, 0, 496, 0, 0, 
-  0, 42, 0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 48, 45, 47, 46, 0, 49, 0, 0, 48, 
-  45, 47, 46, 0, 49, 0, 0, 41, 51, 30, 
-  0, 0, 0, 38, 0, 41, 51, 30, 0, 0, 
-  0, 38, 0, 0, 28, 29, 0, 0, 0, 0, 
-  0, 0, 28, 29, 31, 0, 0, 0, 0, 0, 
-  0, 32, 31, 0, 0, 33, 34, 0, 35, 32, 
-  0, 0, 0, 33, 34, 496, 35, 0, 0, 42, 
-  0, 0, 0, 39, 0, 0, 0, 42, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 48, 45, 47, 
-  46, 0, 49, 0, 0, 48, 45, 47, 46, 0, 
-  49, 0, 0, 41, 51, 30, 0, 0, 0, 38, 
-  0, 41, 51, 30, 0, 0, 0, 38, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 28, 29, 
-  0, 0, 0, 0, 0, 0, 0, 0, 31, 0, 
-  0, 0, 0, 0, 0, 32, 0, 0, 0, 33, 
-  34, 0, 35, 0, 0, 0, 0, 0, 0, 496, 
-  0, 0, 0, 42, 0, 0, 0, 0, 0, 0, 
+const short QmlJSGrammar::action_info [] = {
+  -107, 464, 534, 541, 414, 255, -97, -115, -96, 346, 
+  401, 506, -93, 608, 343, 341, 234, 340, 511, 338, 
+  331, -107, 632, -118, 97, 399, 387, 350, 389, 162, 
+  -120, 422, 162, 422, 181, 177, 418, 422, 255, 438, 
+  429, 442, 438, 444, 168, 446, 556, 428, 139, -93, 
+  406, 455, 608, 451, -123, 69, 139, 438, 397, 99, 
+  185, 145, 188, 548, 187, 310, 97, 455, 147, 294, 
+  551, 270, 139, 302, 99, 414, 292, 346, 537, -118, 
+  407, 412, 438, 344, 290, 536, 299, 69, -97, -115, 
+  -96, 290, -126, 451, 414, 329, 255, -120, 250, 310, 
+  438, 346, 556, 521, 527, 316, 323, -123, 524, 333, 
+  304, 523, 441, 455, 292, 249, 451, 139, 139, 555, 
+  622, 621, 139, 425, 139, 139, 442, 432, 139, 411, 
+  410, 0, 56, 56, 164, 56, 325, 0, 165, 475, 
+  139, 139, 139, 57, 57, 556, 57, 598, 56, 526, 
+  525, 170, 247, 246, 139, 628, 627, 247, 246, 57, 
+  139, 312, 254, 253, 60, 313, 175, 513, 426, 252, 
+  171, 519, 139, 170, 348, 61, 486, 416, 139, 245, 
+  244, 101, 247, 246, 270, 553, 552, 476, 140, 326, 
+  240, 239, 171, 335, 453, 599, 83, 467, 84, 170, 
+  102, 83, 103, 84, 139, 529, 308, 507, 507, 85, 
+  0, 83, 457, 84, 85, 0, 507, 509, 171, 0, 
+  172, 514, 512, 139, 85, 517, 516, 83, 508, 84, 
+  139, 436, 435, 83, 83, 84, 84, 0, 0, 83, 
+  85, 84, 83, 83, 84, 84, 85, 85, 507, 0, 
+  468, 466, 85, 509, 509, 85, 85, 233, 232, 530, 
+  528, 83, 509, 84, 508, 508, 83, 83, 84, 84, 
+  543, 170, 507, 508, 85, 33, 533, 532, 170, 85, 
+  85, 0, 62, 540, 539, 625, 624, 83, 170, 84, 
+  171, 0, 404, 33, 509, 544, 542, 171, 33, 404, 
+  85, 33, 618, 0, 33, 508, -84, 171, 0, 172, 
+  0, 0, 46, 48, 47, 623, 619, 617, 509, 33, 
+  71, 72, 272, 273, 33, 71, 72, 63, 33, 508, 
+  46, 48, 47, 64, 33, 46, 48, 47, 46, 48, 
+  47, 46, 48, 47, 33, 0, 616, 73, 74, 274, 
+  275, 0, 73, 74, 33, 0, 46, 48, 47, 33, 
+  0, 46, 48, 47, 33, 46, 48, 47, 33, 170, 
+  0, 46, 48, 47, 0, 0, 0, 33, 0, 0, 
+  0, 46, 48, 47, -337, 0, 0, -84, 171, 0, 
+  172, 46, 48, 47, 0, 0, 46, 48, 47, 0, 
+  0, 46, 48, 47, 0, 46, 48, 47, 5, 4, 
+  3, 1, 2, 33, 46, 48, 47, 277, 278, 0, 
+  -337, 277, 278, 0, 0, 0, 279, 277, 278, 280, 
+  279, 281, 0, 280, 33, 281, 279, 0, 0, 280, 
+  0, 281, 0, 0, 0, 33, 277, 278, 0, 0, 
+  46, 48, 47, 272, 273, 279, 277, 278, 280, 33, 
+  281, 0, 0, 0, 0, 279, 243, 242, 280, 33, 
+  281, 46, 48, 47, 0, 0, 0, 238, 237, 33, 
+  274, 275, 46, 48, 47, 0, 0, 33, 0, 0, 
+  0, 238, 237, 0, 0, 0, 46, 48, 47, 0, 
+  0, 243, 242, 0, 0, 0, 46, 48, 47, 0, 
+  0, 243, 242, 149, 0, 0, 46, 48, 47, 238, 
+  237, 0, 0, 150, 46, 48, 47, 151, 0, 0, 
+  0, 0, 0, 0, 76, 77, 152, 0, 153, 0, 
+  0, 0, 78, 79, 0, 0, 80, 0, 81, 154, 
+  149, 155, 60, 0, 0, 0, 0, 0, 0, 156, 
+  150, 0, 157, 61, 151, 0, 0, 0, 158, 0, 
+  0, 0, 0, 152, 159, 153, 0, 0, 306, 0, 
+  0, 0, 0, 0, 0, 0, 154, 0, 155, 60, 
+  160, 0, 0, 0, 0, 0, 156, 29, 30, 157, 
+  61, 0, 0, 0, 0, 158, 0, 32, 0, 0, 
+  149, 159, 0, 0, 33, 0, 0, 0, 34, 35, 
+  150, 36, 0, 0, 151, 0, 0, 160, 40, 0, 
+  0, 0, 43, 152, 0, 153, 0, 0, 0, 0, 
+  0, 0, 0, 0, 0, 0, 154, 0, 155, 60, 
+  49, 46, 48, 47, 0, 50, 156, 0, 0, 157, 
+  61, 0, 0, 0, 0, 158, 42, 52, 31, 0, 
+  0, 159, 39, 0, 0, 0, 0, 0, 29, 30, 
+  0, 0, 0, 0, 0, 0, 0, 160, 32, 0, 
+  0, 0, 0, 0, 0, 33, 0, 0, 0, 34, 
+  35, 0, 36, 0, 0, 0, 29, 30, 0, 40, 
+  0, 0, 0, 43, 0, 0, 32, 0, 0, 0, 
+  0, 0, 0, 33, 0, 0, 0, 34, 35, 0, 
+  36, 49, 46, 48, 47, 0, 50, 498, 0, 0, 
+  0, 43, 0, 0, 0, 0, 0, 42, 52, 31, 
+  0, 0, 0, 39, 0, 0, 0, 0, 0, 49, 
+  46, 48, 47, 0, 50, 0, 0, 0, 0, 0, 
+  0, 0, 0, 0, 0, 42, 52, 31, 0, 0, 
+  0, 39, 0, 0, 0, 29, 30, 0, 0, 0, 
+  0, 0, 0, 29, 30, 32, 0, 0, 0, 0, 
+  0, 0, 33, 32, 0, 0, 34, 35, 0, 36, 
+  33, 0, 0, 0, 34, 35, 40, 36, 0, 0, 
+  43, 0, 0, 0, 498, 0, 0, 0, 43, 0, 
+  0, 0, 0, 0, 0, 0, 0, 0, 49, 46, 
+  48, 47, 0, 50, 0, 0, 49, 46, 48, 47, 
+  0, 50, 0, 0, 42, 52, 31, 0, 0, 0, 
+  39, 0, 42, 52, 31, 0, 0, 0, 39, 0, 
   0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 48, 45, 47, 46, 0, 49, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 41, 51, 30, 
-  0, 0, 0, 38, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 495, 0, 28, 29, 0, 0, 
-  0, 0, 0, 0, 0, 0, 212, 0, 0, 0, 
-  0, 0, 0, 32, 0, 0, 0, 33, 34, 0, 
-  35, 0, 0, 0, 0, 0, 0, 496, 0, 0, 
-  0, 42, 0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 0, 48, 
-  497, 499, 498, 0, 49, 0, 0, 0, 0, 223, 
-  0, 0, 0, 0, 0, 41, 51, 30, 207, 0, 
-  0, 38, 0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 495, 0, 28, 29, 0, 0, 0, 0, 
-  0, 0, 0, 0, 212, 0, 0, 0, 0, 0, 
-  0, 32, 0, 0, 0, 33, 34, 0, 35, 0, 
-  0, 0, 0, 0, 0, 496, 0, 0, 0, 42, 
-  0, 0, 0, 0, 0, 0, 0, 600, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 48, 497, 499, 
-  498, 0, 49, 0, 0, 0, 0, 223, 0, 0, 
-  0, 0, 0, 41, 51, 30, 207, 0, 0, 38, 
+  497, 0, 29, 30, 0, 0, 0, 0, 0, 0, 
+  0, 0, 213, 0, 0, 0, 0, 0, 0, 33, 
+  0, 0, 0, 34, 35, 0, 36, 0, 0, 0, 
+  0, 0, 0, 498, 0, 0, 0, 43, 0, 0, 
   0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-  495, 0, 28, 29, 0, 0, 0, 0, 0, 0, 
-  0, 0, 212, 0, 0, 0, 0, 0, 0, 32, 
-  0, 0, 0, 33, 34, 0, 35, 0, 0, 0, 
-  0, 0, 0, 496, 0, 0, 0, 42, 0, 0, 
-  0, 0, 0, 0, 0, 603, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 48, 497, 499, 498, 0, 
-  49, 0, 0, 0, 0, 223, 0, 0, 0, 0, 
-  0, 41, 51, 30, 207, 0, 0, 38, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 27, 28, 
-  29, 0, 0, 0, 0, 0, 0, 0, 0, 31, 
-  0, 0, 0, 0, 0, 0, 32, 0, 0, 0, 
-  33, 34, 0, 35, 0, 0, 0, 36, 0, 37, 
-  39, 40, 0, 0, 42, 0, 0, 0, 43, 0, 
-  44, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 48, 45, 47, 46, 0, 49, 0, 50, 
-  0, 52, 0, 53, 0, 0, 0, 0, 41, 51, 
-  30, 0, 0, 0, 38, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 27, 28, 29, 0, 0, 
-  0, 0, 0, 0, 0, 0, 31, 0, 0, 0, 
-  0, 0, 0, 32, 0, 0, 0, 33, 34, 0, 
-  35, 0, 0, 0, 36, 0, 37, 39, 40, 0, 
-  0, 42, 0, 0, 0, 43, 0, 44, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 0, 48, 
-  45, 47, 46, 0, 49, 0, 50, 0, 52, 268, 
-  53, 0, 0, 0, 0, 41, 51, 30, 0, 0, 
-  0, 38, 0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, -115, 0, 0, 0, 27, 28, 29, 0, 
-  0, 0, 0, 0, 0, 0, 0, 31, 0, 0, 
-  0, 0, 0, 0, 32, 0, 0, 0, 33, 34, 
-  0, 35, 0, 0, 0, 36, 0, 37, 39, 40, 
-  0, 0, 42, 0, 0, 0, 43, 0, 44, 0, 
+  0, 0, 0, 0, 0, 49, 499, 501, 500, 0, 
+  50, 0, 0, 0, 0, 224, 0, 0, 0, 0, 
+  0, 42, 52, 31, 208, 0, 0, 39, 0, 0, 
+  0, 0, 0, 0, 0, 0, 0, 0, 0, 497, 
+  0, 29, 30, 0, 0, 0, 0, 0, 0, 0, 
+  0, 213, 0, 0, 0, 0, 0, 0, 33, 0, 
+  0, 0, 34, 35, 0, 36, 0, 0, 0, 0, 
+  0, 0, 498, 0, 0, 0, 43, 0, 0, 0, 
+  0, 0, 0, 0, 605, 0, 0, 0, 0, 0, 
+  0, 0, 0, 0, 49, 499, 501, 500, 0, 50, 
+  0, 0, 0, 0, 224, 0, 0, 0, 0, 0, 
+  42, 52, 31, 208, 0, 0, 39, 0, 0, 0, 
+  0, 0, 0, 0, 0, 0, 0, 0, 497, 0, 
+  29, 30, 0, 0, 0, 0, 0, 0, 0, 0, 
+  213, 0, 0, 0, 0, 0, 0, 33, 0, 0, 
+  0, 34, 35, 0, 36, 0, 0, 0, 0, 0, 
+  0, 498, 0, 0, 0, 43, 0, 0, 0, 0, 
+  0, 0, 0, 602, 0, 0, 0, 0, 0, 0, 
+  0, 0, 0, 49, 499, 501, 500, 0, 50, 0, 
+  0, 0, 0, 224, 0, 0, 0, 0, 0, 42, 
+  52, 31, 208, 0, 0, 39, 0, 0, 0, 0, 
+  0, 0, 0, 0, 0, 0, 0, 28, 29, 30, 
+  0, 0, 0, 0, 0, 0, 0, 0, 32, 0, 
+  0, 0, 0, 0, 0, 33, 0, 0, 0, 34, 
+  35, 0, 36, 0, 0, 0, 37, 0, 38, 40, 
+  41, 0, 0, 43, 0, 0, 0, 44, 0, 45, 
   0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-  48, 45, 47, 46, 0, 49, 0, 50, 0, 52, 
-  0, 53, 0, 0, 0, 0, 41, 51, 30, 0, 
-  0, 0, 38, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 480, 0, 0, 27, 28, 29, 0, 
-  0, 0, 0, 0, 0, 0, 0, 31, 0, 0, 
-  0, 0, 0, 0, 32, 0, 0, 0, 33, 34, 
-  0, 35, 0, 0, 0, 36, 0, 37, 39, 40, 
-  0, 0, 42, 0, 0, 0, 43, 0, 44, 0, 
-  0, 481, 0, 0, 0, 0, 0, 0, 0, 0, 
-  48, 45, 47, 46, 0, 49, 0, 50, 0, 52, 
-  0, 53, 0, 0, 0, 0, 41, 51, 30, 0, 
-  0, 0, 38, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 27, 28, 29, 0, 0, 0, 0, 
-  0, 0, 0, 0, 31, 0, 0, 0, 0, 0, 
-  0, 32, 214, 0, 0, 561, 562, 0, 35, 0, 
-  0, 0, 36, 0, 37, 39, 40, 0, 0, 42, 
-  0, 0, 0, 43, 0, 44, 0, 0, 0, 0, 
-  0, 0, 0, 218, 0, 0, 0, 48, 45, 47, 
-  46, 0, 49, 0, 50, 0, 52, 0, 53, 0, 
-  0, 0, 0, 41, 51, 30, 0, 0, 0, 38, 
+  0, 49, 46, 48, 47, 0, 50, 0, 51, 0, 
+  53, 0, 54, 0, 0, 0, 0, 42, 52, 31, 
+  0, 0, 0, 39, 0, 0, 0, 0, 0, 0, 
+  0, 0, 0, 0, 0, -116, 0, 0, 0, 28, 
+  29, 30, 0, 0, 0, 0, 0, 0, 0, 0, 
+  32, 0, 0, 0, 0, 0, 0, 33, 0, 0, 
+  0, 34, 35, 0, 36, 0, 0, 0, 37, 0, 
+  38, 40, 41, 0, 0, 43, 0, 0, 0, 44, 
+  0, 45, 0, 0, 0, 0, 0, 0, 0, 0, 
+  0, 0, 0, 49, 46, 48, 47, 0, 50, 0, 
+  51, 0, 53, 0, 54, 0, 0, 0, 0, 42, 
+  52, 31, 0, 0, 0, 39, 0, 0, 0, 0, 
+  0, 0, 0, 0, 0, 0, 0, 28, 29, 30, 
+  0, 0, 0, 0, 0, 0, 0, 0, 32, 0, 
+  0, 0, 0, 0, 0, 33, 0, 0, 0, 34, 
+  35, 0, 36, 0, 0, 0, 37, 0, 38, 40, 
+  41, 0, 0, 43, 0, 0, 0, 44, 0, 45, 
   0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-  480, 0, 0, 27, 28, 29, 0, 0, 0, 0, 
-  0, 0, 0, 0, 31, 0, 0, 0, 0, 0, 
-  0, 32, 0, 0, 0, 33, 34, 0, 35, 0, 
-  0, 0, 36, 0, 37, 39, 40, 0, 0, 42, 
-  0, 0, 0, 43, 0, 44, 0, 0, 483, 0, 
-  0, 0, 0, 0, 0, 0, 0, 48, 45, 47, 
-  46, 0, 49, 0, 50, 0, 52, 0, 53, 0, 
-  0, 0, 0, 41, 51, 30, 0, 0, 0, 38, 
+  0, 49, 46, 48, 47, 0, 50, 0, 51, 0, 
+  53, 269, 54, 0, 0, 0, 0, 42, 52, 31, 
+  0, 0, 0, 39, 0, 0, 0, 0, 0, 0, 
+  0, 0, 0, 0, 0, 473, 0, 0, 28, 29, 
+  30, 0, 0, 0, 0, 0, 0, 0, 0, 32, 
+  0, 0, 0, 0, 0, 0, 33, 0, 0, 0, 
+  34, 35, 0, 36, 0, 0, 0, 37, 0, 38, 
+  40, 41, 0, 0, 43, 0, 0, 0, 44, 0, 
+  45, 0, 0, 474, 0, 0, 0, 0, 0, 0, 
+  0, 0, 49, 46, 48, 47, 0, 50, 0, 51, 
+  0, 53, 0, 54, 0, 0, 0, 0, 42, 52, 
+  31, 0, 0, 0, 39, 0, 0, 0, 0, 0, 
+  0, 0, 0, 0, 0, 0, 481, 0, 0, 28, 
+  29, 30, 0, 0, 0, 0, 0, 0, 0, 0, 
+  32, 0, 0, 0, 0, 0, 0, 33, 0, 0, 
+  0, 34, 35, 0, 36, 0, 0, 0, 37, 0, 
+  38, 40, 41, 0, 0, 43, 0, 0, 0, 44, 
+  0, 45, 0, 0, 484, 0, 0, 0, 0, 0, 
+  0, 0, 0, 49, 46, 48, 47, 0, 50, 0, 
+  51, 0, 53, 0, 54, 0, 0, 0, 0, 42, 
+  52, 31, 0, 0, 0, 39, 0, 0, 0, 0, 
+  0, 0, 0, 0, 0, 0, 0, 481, 0, 0, 
+  28, 29, 30, 0, 0, 0, 0, 0, 0, 0, 
+  0, 32, 0, 0, 0, 0, 0, 0, 33, 0, 
+  0, 0, 34, 35, 0, 36, 0, 0, 0, 37, 
+  0, 38, 40, 41, 0, 0, 43, 0, 0, 0, 
+  44, 0, 45, 0, 0, 482, 0, 0, 0, 0, 
+  0, 0, 0, 0, 49, 46, 48, 47, 0, 50, 
+  0, 51, 0, 53, 0, 54, 0, 0, 0, 0, 
+  42, 52, 31, 0, 0, 0, 39, 0, 0, 0, 
+  0, 0, 0, 0, 0, 0, 0, 0, 473, 0, 
+  0, 28, 29, 30, 0, 0, 0, 0, 0, 0, 
+  0, 0, 32, 0, 0, 0, 0, 0, 0, 33, 
+  0, 0, 0, 34, 35, 0, 36, 0, 0, 0, 
+  37, 0, 38, 40, 41, 0, 0, 43, 0, 0, 
+  0, 44, 0, 45, 0, 0, 479, 0, 0, 0, 
+  0, 0, 0, 0, 0, 49, 46, 48, 47, 0, 
+  50, 0, 51, 0, 53, 0, 54, 0, 0, 0, 
+  0, 42, 52, 31, 0, 0, 0, 39, 0, 0, 
+  0, 0, 0, 0, 0, 0, 0, 0, 0, 28, 
+  29, 30, 0, 0, 0, 0, 0, 0, 0, 0, 
+  32, 0, 0, 0, 0, 0, 0, 33, 215, 0, 
+  0, 563, 564, 0, 36, 0, 0, 0, 37, 0, 
+  38, 40, 41, 0, 0, 43, 0, 0, 0, 44, 
+  0, 45, 0, 0, 0, 0, 0, 0, 0, 219, 
+  0, 0, 0, 49, 46, 48, 47, 0, 50, 0, 
+  51, 0, 53, 0, 54, 0, 0, 0, 0, 42, 
+  52, 31, 0, 0, 0, 39, 0, 0, 0, 0, 
+  0, 0, 0, 0, 0, 0, 0, 107, 108, 109, 
+  0, 0, 111, 113, 114, 0, 0, 115, 0, 116, 
+  0, 0, 0, 118, 119, 120, 0, 0, 0, 0, 
+  0, 0, 33, 121, 122, 123, 0, 0, 0, 0, 
+  0, 0, 0, 0, 0, 0, 124, 0, 0, 0, 
   0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-  472, 0, 0, 27, 28, 29, 0, 0, 0, 0, 
-  0, 0, 0, 0, 31, 0, 0, 0, 0, 0, 
-  0, 32, 0, 0, 0, 33, 34, 0, 35, 0, 
-  0, 0, 36, 0, 37, 39, 40, 0, 0, 42, 
-  0, 0, 0, 43, 0, 44, 0, 0, 473, 0, 
-  0, 0, 0, 0, 0, 0, 0, 48, 45, 47, 
-  46, 0, 49, 0, 50, 0, 52, 0, 53, 0, 
-  0, 0, 0, 41, 51, 30, 0, 0, 0, 38, 
+  0, 0, 127, 0, 0, 0, 0, 0, 0, 46, 
+  48, 47, 128, 129, 130, 0, 132, 133, 134, 135, 
+  136, 137, 0, 0, 125, 131, 117, 110, 112, 126, 
   0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-  472, 0, 0, 27, 28, 29, 0, 0, 0, 0, 
-  0, 0, 0, 0, 31, 0, 0, 0, 0, 0, 
-  0, 32, 0, 0, 0, 33, 34, 0, 35, 0, 
-  0, 0, 36, 0, 37, 39, 40, 0, 0, 42, 
-  0, 0, 0, 43, 0, 44, 0, 0, 478, 0, 
-  0, 0, 0, 0, 0, 0, 0, 48, 45, 47, 
-  46, 0, 49, 0, 50, 0, 52, 0, 53, 0, 
-  0, 0, 0, 41, 51, 30, 0, 0, 0, 38, 
+  0, 0, 107, 108, 109, 0, 0, 111, 113, 114, 
+  0, 0, 115, 0, 116, 0, 0, 0, 118, 119, 
+  120, 0, 0, 0, 0, 0, 0, 391, 121, 122, 
+  123, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
+  0, 124, 0, 0, 0, 392, 0, 0, 0, 0, 
+  0, 0, 0, 0, 0, 0, 0, 127, 0, 0, 
+  0, 0, 0, 396, 393, 395, 0, 128, 129, 130, 
+  0, 132, 133, 134, 135, 136, 137, 0, 0, 125, 
+  131, 117, 110, 112, 126, 0, 0, 0, 0, 0, 
+  0, 0, 0, 0, 0, 0, 0, 107, 108, 109, 
+  0, 0, 111, 113, 114, 0, 0, 115, 0, 116, 
+  0, 0, 0, 118, 119, 120, 0, 0, 0, 0, 
+  0, 0, 391, 121, 122, 123, 0, 0, 0, 0, 
+  0, 0, 0, 0, 0, 0, 124, 0, 0, 0, 
+  392, 0, 0, 0, 0, 0, 0, 0, 394, 0, 
+  0, 0, 127, 0, 0, 0, 0, 0, 396, 393, 
+  395, 0, 128, 129, 130, 0, 132, 133, 134, 135, 
+  136, 137, 0, 0, 125, 131, 117, 110, 112, 126, 
   0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-  106, 107, 108, 0, 0, 110, 112, 113, 0, 0, 
-  114, 0, 115, 0, 0, 0, 117, 118, 119, 0, 
-  0, 0, 0, 0, 0, 32, 120, 121, 122, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 0, 123, 
-  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 126, 0, 0, 0, 0, 
-  0, 0, 45, 47, 46, 127, 128, 129, 0, 131, 
-  132, 133, 134, 135, 136, 0, 0, 124, 130, 116, 
-  109, 111, 125, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 106, 107, 108, 0, 0, 110, 
-  112, 113, 0, 0, 114, 0, 115, 0, 0, 0, 
-  117, 118, 119, 0, 0, 0, 0, 0, 0, 390, 
-  120, 121, 122, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 123, 0, 0, 0, 391, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 0, 126, 
-  0, 0, 0, 0, 0, 395, 392, 394, 0, 127, 
-  128, 129, 0, 131, 132, 133, 134, 135, 136, 0, 
-  0, 124, 130, 116, 109, 111, 125, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 106, 107, 
-  108, 0, 0, 110, 112, 113, 0, 0, 114, 0, 
-  115, 0, 0, 0, 117, 118, 119, 0, 0, 0, 
-  0, 0, 0, 390, 120, 121, 122, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 123, 0, 0, 
-  0, 391, 0, 0, 0, 0, 0, 0, 0, 393, 
-  0, 0, 0, 126, 0, 0, 0, 0, 0, 395, 
-  392, 394, 0, 127, 128, 129, 0, 131, 132, 133, 
-  134, 135, 136, 0, 0, 124, 130, 116, 109, 111, 
-  125, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 206, 0, 0, 0, 0, 208, 0, 27, 
-  28, 29, 210, 0, 0, 0, 0, 0, 0, 211, 
-  31, 0, 0, 0, 0, 0, 0, 213, 214, 0, 
-  0, 215, 34, 0, 35, 0, 0, 0, 36, 0, 
-  37, 39, 40, 0, 0, 42, 0, 0, 0, 43, 
-  0, 44, 0, 0, 0, 0, 0, 217, 0, 218, 
-  0, 0, 0, 48, 216, 219, 46, 220, 49, 221, 
-  50, 222, 52, 223, 53, 224, 225, 0, 0, 41, 
-  51, 30, 207, 209, 0, 38, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 206, 0, 0, 0, 
-  0, 208, 0, 27, 28, 29, 210, 0, 0, 0, 
-  0, 0, 0, 211, 212, 0, 0, 0, 0, 0, 
-  0, 213, 214, 0, 0, 215, 34, 0, 35, 0, 
-  0, 0, 36, 0, 37, 39, 40, 0, 0, 42, 
-  0, 0, 0, 43, 0, 44, 0, 0, 0, 0, 
-  0, 217, 0, 218, 0, 0, 0, 48, 216, 219, 
-  46, 220, 49, 221, 50, 222, 52, 223, 53, 224, 
-  225, 0, 0, 41, 51, 30, 207, 209, 0, 38, 
-  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-  564, 107, 108, 0, 0, 566, 112, 568, 28, 29, 
-  569, 0, 115, 0, 0, 0, 117, 571, 572, 0, 
-  0, 0, 0, 0, 0, 573, 574, 121, 122, 215, 
-  34, 0, 35, 0, 0, 0, 36, 0, 37, 575, 
-  40, 0, 0, 577, 0, 0, 0, 43, 0, 44, 
-  0, 0, 0, 0, 0, 579, 0, 218, 0, 0, 
-  0, 581, 578, 580, 46, 582, 583, 584, 50, 586, 
-  587, 588, 589, 590, 591, 0, 0, 576, 585, 570, 
-  565, 567, 125, 38, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 358, 107, 108, 0, 0, 360, 
-  112, 362, 28, 29, 363, 0, 115, 0, 0, 0, 
-  117, 365, 366, 0, 0, 0, 0, 0, 0, 367, 
-  368, 121, 122, 215, 34, 0, 35, 0, 0, 0, 
-  36, 0, 37, 369, 40, 0, 0, 371, 0, 0, 
-  0, 43, 0, 44, 0, -261, 0, 0, 0, 373, 
-  0, 218, 0, 0, 0, 375, 372, 374, 46, 376, 
-  377, 378, 50, 380, 381, 382, 383, 384, 385, 0, 
-  0, 370, 379, 364, 359, 361, 125, 38, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
+  0, 0, 207, 0, 0, 0, 0, 209, 0, 28, 
+  29, 30, 211, 0, 0, 0, 0, 0, 0, 212, 
+  32, 0, 0, 0, 0, 0, 0, 214, 215, 0, 
+  0, 216, 35, 0, 36, 0, 0, 0, 37, 0, 
+  38, 40, 41, 0, 0, 43, 0, 0, 0, 44, 
+  0, 45, 0, 0, 0, 0, 0, 218, 0, 219, 
+  0, 0, 0, 49, 217, 220, 47, 221, 50, 222, 
+  51, 223, 53, 224, 54, 225, 226, 0, 0, 42, 
+  52, 31, 208, 210, 0, 39, 0, 0, 0, 0, 
+  0, 0, 0, 0, 0, 0, 0, 207, 0, 0, 
+  0, 0, 209, 0, 28, 29, 30, 211, 0, 0, 
+  0, 0, 0, 0, 212, 213, 0, 0, 0, 0, 
+  0, 0, 214, 215, 0, 0, 216, 35, 0, 36, 
+  0, 0, 0, 37, 0, 38, 40, 41, 0, 0, 
+  43, 0, 0, 0, 44, 0, 45, 0, 0, 0, 
+  0, 0, 218, 0, 219, 0, 0, 0, 49, 217, 
+  220, 47, 221, 50, 222, 51, 223, 53, 224, 54, 
+  225, 226, 0, 0, 42, 52, 31, 208, 210, 0, 
+  39, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
+  0, 0, 566, 108, 109, 0, 0, 568, 113, 570, 
+  29, 30, 571, 0, 116, 0, 0, 0, 118, 573, 
+  574, 0, 0, 0, 0, 0, 0, 575, 576, 122, 
+  123, 216, 35, 0, 36, 0, 0, 0, 37, 0, 
+  38, 577, 41, 0, 0, 579, 0, 0, 0, 44, 
+  0, 45, 0, 0, 0, 0, 0, 581, 0, 219, 
+  0, 0, 0, 583, 580, 582, 47, 584, 585, 586, 
+  51, 588, 589, 590, 591, 592, 593, 0, 0, 578, 
+  587, 572, 567, 569, 126, 39, 0, 0, 0, 0, 
+  0, 0, 0, 0, 0, 0, 0, 359, 108, 109, 
+  0, 0, 361, 113, 363, 29, 30, 364, 0, 116, 
+  0, 0, 0, 118, 366, 367, 0, 0, 0, 0, 
+  0, 0, 368, 369, 122, 123, 216, 35, 0, 36, 
+  0, 0, 0, 37, 0, 38, 370, 41, 0, 0, 
+  372, 0, 0, 0, 44, 0, 45, 0, -262, 0, 
+  0, 0, 374, 0, 219, 0, 0, 0, 376, 373, 
+  375, 47, 377, 378, 379, 51, 381, 382, 383, 384, 
+  385, 386, 0, 0, 371, 380, 365, 360, 362, 126, 
+  39, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
+  0, 0, 
 
-  548, 422, 414, 436, 166, 547, 552, 433, 533, 529, 
-  183, 520, 536, 304, 545, 513, 306, 447, 247, 599, 
-  618, 147, 387, 317, 627, 613, 14, 492, 397, 204, 
-  624, 185, 179, 250, 389, 430, 168, 240, 299, 235, 
-  173, 179, 484, 407, 336, 433, 308, 348, 436, 346, 
-  433, 350, 247, 469, 464, 482, 331, 429, 333, 344, 
-  335, 179, 299, 247, 240, 432, 479, 140, 451, 240, 
-  442, 145, 446, 444, 457, 235, 160, 235, 453, 399, 
-  458, 455, 299, 137, 516, 143, 508, 426, 436, 204, 
-  0, 204, 412, 0, 0, 0, 0, 0, 458, 103, 
-  0, 143, 0, 0, 143, 0, 404, 0, 57, 175, 
-  299, 0, 57, 91, 177, 183, 57, 57, 449, 0, 
-  299, 105, 90, 57, 57, 57, 57, 0, 89, 88, 
-  57, 94, 95, 57, 57, 81, 65, 57, 263, 57, 
-  57, 486, 285, 267, 86, 57, 57, 64, 57, 165, 
-  87, 57, 57, 177, 57, 57, 57, 284, 57, 283, 
-  97, 282, 85, 401, 57, 99, 57, 57, 468, 92, 
-  57, 281, 449, 300, 57, 69, 491, 57, 57, 449, 
-  317, 57, 57, 327, 58, 67, 57, 341, 66, 401, 
-  234, 402, 162, 401, 299, 57, 57, 448, 57, 338, 
-  489, 57, 74, 488, 57, 57, 57, 487, 490, 477, 
-  93, 57, 57, 476, 177, 295, 267, 402, 295, 295, 
-  267, 402, 0, 267, 267, 295, 57, 494, 313, 494, 
-  267, 267, 628, 0, 57, 270, 595, 323, 103, 267, 
-  314, 294, 493, 503, 57, 292, 0, 316, 57, 267, 
-  295, 288, 326, 267, 57, 267, 0, 329, 299, 267, 
-  105, 172, 0, 310, 57, 0, 0, 290, 57, 267, 
-  601, 275, 297, 267, 57, 286, 0, 494, 604, 267, 
-  592, 287, 0, 594, 0, 494, 0, 595, 560, 0, 
-  0, 0, 493, 503, 0, 563, 556, 557, 558, 559, 
-  493, 503, 469, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 302, 0, 0, 0, 0, 0, 0, 0, 0, 
+  538, 510, 184, 535, 522, 459, 531, 241, 148, 307, 
+  615, 180, 437, 251, 629, 15, 493, 620, 494, 470, 
+  626, 318, 434, 549, 550, 305, 248, 554, 485, 300, 
+  349, 236, 547, 518, 601, 515, 452, 248, 443, 447, 
+  180, 454, 241, 445, 248, 351, 458, 236, 146, 241, 
+  448, 236, 456, 400, 465, 174, 408, 205, 180, 186, 
+  413, 433, 300, 430, 427, 415, 431, 437, 423, 434, 
+  161, 345, 336, 169, 388, 434, 437, 300, 332, 0, 
+  334, 390, 138, 398, 337, 347, 167, 0, 184, 141, 
+  0, 459, 402, 480, 483, 300, 318, 144, 205, 0, 
+  0, 205, 309, 0, 300, 0, 0, 58, 0, 58, 
+  58, 0, 178, 0, 0, 58, 300, 300, 0, 87, 
+  403, 163, 58, 0, 487, 166, 58, 58, 488, 58, 
+  58, 86, 449, 58, 283, 450, 58, 58, 144, 58, 
+  58, 0, 286, 405, 58, 285, 450, 402, 98, 100, 
+  58, 264, 58, 0, 449, 284, 268, 58, 328, 58, 
+  58, 469, 282, 88, 0, 89, 58, 330, 327, 68, 
+  58, 0, 339, 59, 58, 403, 450, 58, 0, 301, 
+  303, 58, 82, 492, 58, 58, 66, 58, 58, 67, 
+  65, 58, 58, 70, 342, 58, 104, 75, 96, 58, 
+  58, 94, 235, 58, 91, 144, 95, 58, 92, 449, 
+  176, 58, 58, 178, 491, 58, 402, 490, 106, 58, 
+  58, 58, 489, 296, 90, 104, 93, 58, 268, 58, 
+  58, 0, 268, 0, 268, 268, 271, 496, 58, 0, 
+  0, 293, 0, 268, 403, 324, 314, 106, 173, 296, 
+  296, 291, 495, 505, 268, 268, 496, 296, 0, 600, 
+  296, 58, 268, 597, 0, 268, 268, 0, 0, 0, 
+  0, 315, 317, 58, 0, 0, 311, 478, 268, 295, 
+  276, 477, 298, 58, 58, 0, 603, 0, 268, 268, 
+  287, 289, 58, 496, 0, 594, 606, 268, 596, 288, 
+  0, 0, 597, 496, 562, 0, 0, 0, 495, 505, 
+  0, 565, 558, 559, 560, 561, 0, 470, 495, 505, 
   0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
   0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
   0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-  494, 0, 0, 598, 0, 0, 0, 595, 0, 0, 
+  0, 0, 0, 496, 0, 0, 630, 0, 0, 0, 
+  597, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
   0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
   0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
   0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
@@ -644,234 +640,224 @@ const int QmlJSGrammar::action_info [] = {
   0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
   0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
   0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0};
+  0, 0, 0, 0, 0, 0, 0};
 
-const int QmlJSGrammar::action_check [] = {
-  36, 7, 7, 7, 7, 36, 7, 36, 7, 36, 
-  60, 33, 33, 36, 7, 7, 7, 36, 36, 7, 
-  77, 36, 36, 60, 33, 55, 16, 55, 79, 90, 
-  7, 55, 8, 7, 36, 7, 36, 48, 20, 8, 
-  79, 36, 7, 2, 8, 90, 33, 36, 33, 17, 
-  48, 0, 33, 1, 33, 8, 36, 7, 36, 55, 
-  2, 8, 7, 60, 7, 5, 60, 5, 5, 36, 
-  33, 7, 29, 17, 60, 36, 60, 60, 48, 7, 
-  55, 36, 2, 2, 7, 7, 7, 33, 1, 7, 
-  61, 8, 8, 7, 29, 36, 7, 24, 37, 61, 
-  66, 33, 1, 61, 60, 1, 79, 7, 60, 10, 
-  8, 40, 66, 8, 29, 48, 8, 29, 6, -1, 
-  29, 31, 51, 7, 8, 50, 15, 61, 62, 54, 
-  61, 62, 20, 8, 8, 61, 62, 61, 62, 42, 
-  8, 8, 50, 7, 15, 34, 54, 8, 8, 8, 
-  53, 8, -1, 7, 55, 61, 62, 8, 56, 61, 
-  62, 40, 40, 34, 56, 60, 8, 61, 62, 33, 
-  61, 62, 51, 51, 61, 62, 61, 62, 61, 62, 
-  8, 25, 8, 27, 40, 60, 29, 61, 8, 25, 
-  -1, 27, 60, 60, 38, 51, 25, 15, 27, 60, 
-  60, 60, 38, 60, 25, 56, 27, 29, 15, 38, 
-  29, 7, 12, 29, 29, 8, 34, 38, 36, 61, 
-  62, 7, -1, 36, 8, -1, 15, 34, -1, 36, 
-  -1, -1, 75, 61, 62, 61, 62, 25, 12, 27, 
-  12, 61, 62, 86, 8, 34, -1, 36, 61, 62, 
-  38, 61, 62, 75, 29, -1, 75, 57, 29, 75, 
-  75, 15, -1, 63, 86, 61, 62, 86, 61, 62, 
-  86, 86, -1, -1, -1, 61, 62, 61, 62, 29, 
-  34, 91, 36, 57, 29, 57, 15, 47, 29, 63, 
-  -1, 63, 56, -1, 15, 66, 67, 68, -1, -1, 
-  75, 61, 62, 29, 33, 34, -1, 36, -1, -1, 
-  -1, 86, 33, 34, 29, 36, 66, 67, 68, 29, 
-  -1, 66, 67, 68, 29, 66, 67, 68, 29, -1, 
-  -1, 91, 18, 19, 25, 29, 27, -1, -1, -1, 
-  66, 67, 68, 92, 93, 94, 95, 38, 18, 19, 
-  29, 66, 67, 68, 29, -1, 66, 67, 68, 45, 
-  46, 66, 67, 68, 29, 66, 67, 68, -1, 23, 
-  24, -1, 66, 67, 68, 45, 46, 29, 32, -1, 
-  -1, 35, -1, 37, -1, -1, -1, 66, 67, 68, 
-  29, 66, 67, 68, -1, -1, -1, 36, -1, 29, 
-  -1, 66, 67, 68, -1, -1, 36, 18, 19, 23, 
-  24, -1, -1, -1, 66, 67, 68, -1, 32, -1, 
-  -1, 35, -1, 37, -1, -1, -1, 66, 67, 68, 
-  -1, 23, 24, -1, 45, 46, 66, 67, 68, 31, 
-  32, 23, 24, 35, -1, 37, -1, -1, -1, 31, 
-  32, 23, 24, 35, -1, 37, -1, -1, -1, 31, 
-  32, 23, 24, 35, -1, 37, -1, -1, -1, 31, 
-  32, 23, 24, 35, 29, 37, -1, -1, -1, 31, 
-  32, -1, 29, 35, -1, 37, -1, 23, 24, -1, 
-  29, -1, -1, -1, -1, -1, 32, -1, 29, 35, 
-  -1, 37, -1, -1, -1, -1, 61, 62, -1, -1, 
-  -1, 66, 67, 68, 61, 62, -1, -1, -1, 66, 
-  67, 68, 61, 62, -1, -1, -1, 66, 67, 68, 
-  61, 62, 3, -1, -1, 66, 67, 68, -1, -1, 
-  -1, -1, 13, -1, -1, -1, 17, -1, -1, -1, 
-  -1, -1, -1, -1, -1, 26, -1, 28, -1, -1, 
-  -1, -1, 29, -1, -1, -1, -1, -1, 39, -1, 
-  41, 42, -1, -1, -1, -1, -1, -1, 49, -1, 
-  -1, 52, 53, -1, -1, -1, -1, 58, 3, -1, 
-  -1, -1, -1, 64, 61, 62, -1, -1, 13, 66, 
-  67, 68, 17, -1, -1, -1, -1, -1, -1, 80, 
-  -1, 26, -1, 28, -1, -1, 31, -1, -1, -1, 
-  -1, -1, -1, -1, 39, -1, 41, 42, -1, 12, 
-  13, 3, -1, -1, 49, -1, -1, 52, 53, 22, 
-  -1, 13, -1, 58, -1, 17, 29, -1, -1, 64, 
-  33, 34, -1, 36, 26, -1, 28, -1, -1, -1, 
-  43, -1, -1, -1, 47, 80, -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, -1, -1, -1, 87, -1, -1, -1, 80, -1, 
-  -1, -1, -1, -1, -1, -1, -1, -1, 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, -1, -1, 
-  -1, 87, -1, -1, 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, -1, -1, -1, 87, -1, -1, 
-  -1, -1, -1, -1, -1, -1, -1, -1, 12, 13, 
-  -1, -1, -1, -1, -1, -1, -1, -1, 22, -1, 
+const short QmlJSGrammar::action_check [] = {
+  7, 17, 66, 29, 36, 36, 7, 7, 7, 36, 
+  55, 66, 7, 90, 55, 33, 55, 60, 29, 36, 
+  60, 7, 0, 7, 48, 55, 7, 16, 8, 2, 
+  7, 5, 2, 5, 36, 60, 33, 5, 36, 33, 
+  7, 20, 33, 36, 7, 60, 33, 55, 8, 7, 
+  60, 36, 90, 36, 7, 1, 8, 33, 7, 79, 
+  8, 8, 33, 8, 60, 2, 48, 36, 60, 8, 
+  60, 1, 8, 61, 79, 36, 79, 36, 7, 7, 
+  7, 7, 33, 7, 48, 29, 61, 1, 7, 7, 
+  7, 48, 7, 36, 36, 61, 36, 7, 36, 2, 
+  33, 36, 33, 37, 29, 7, 17, 7, 29, 31, 
+  60, 24, 6, 36, 79, 77, 36, 8, 8, 7, 
+  61, 62, 8, 10, 8, 8, 20, 7, 8, 61, 
+  62, -1, 40, 40, 50, 40, 8, -1, 54, 8, 
+  8, 8, 8, 51, 51, 33, 51, 8, 40, 61, 
+  62, 15, 61, 62, 8, 61, 62, 61, 62, 51, 
+  8, 50, 61, 62, 42, 54, 56, 7, 55, 60, 
+  34, 29, 8, 15, 60, 53, 60, 60, 8, 61, 
+  62, 15, 61, 62, 1, 61, 62, 56, 56, 61, 
+  61, 62, 34, 60, 60, 56, 25, 8, 27, 15, 
+  34, 25, 36, 27, 8, 7, 60, 29, 29, 38, 
+  -1, 25, 60, 27, 38, -1, 29, 75, 34, -1, 
+  36, 61, 62, 8, 38, 61, 62, 25, 86, 27, 
+  8, 61, 62, 25, 25, 27, 27, -1, -1, 25, 
+  38, 27, 25, 25, 27, 27, 38, 38, 29, -1, 
+  61, 62, 38, 75, 75, 38, 38, 61, 62, 61, 
+  62, 25, 75, 27, 86, 86, 25, 25, 27, 27, 
+  36, 15, 29, 86, 38, 29, 61, 62, 15, 38, 
+  38, -1, 12, 61, 62, 61, 62, 25, 15, 27, 
+  34, -1, 36, 29, 75, 61, 62, 34, 29, 36, 
+  38, 29, 47, -1, 29, 86, 33, 34, -1, 36, 
+  -1, -1, 66, 67, 68, 91, 61, 62, 75, 29, 
+  18, 19, 18, 19, 29, 18, 19, 57, 29, 86, 
+  66, 67, 68, 63, 29, 66, 67, 68, 66, 67, 
+  68, 66, 67, 68, 29, -1, 91, 45, 46, 45, 
+  46, -1, 45, 46, 29, -1, 66, 67, 68, 29, 
+  -1, 66, 67, 68, 29, 66, 67, 68, 29, 15, 
+  -1, 66, 67, 68, -1, -1, -1, 29, -1, -1, 
+  -1, 66, 67, 68, 36, -1, -1, 33, 34, -1, 
+  36, 66, 67, 68, -1, -1, 66, 67, 68, -1, 
+  -1, 66, 67, 68, -1, 66, 67, 68, 92, 93, 
+  94, 95, 96, 29, 66, 67, 68, 23, 24, -1, 
+  36, 23, 24, -1, -1, -1, 32, 23, 24, 35, 
+  32, 37, -1, 35, 29, 37, 32, -1, -1, 35, 
+  -1, 37, -1, -1, -1, 29, 23, 24, -1, -1, 
+  66, 67, 68, 18, 19, 32, 23, 24, 35, 29, 
+  37, -1, -1, -1, -1, 32, 61, 62, 35, 29, 
+  37, 66, 67, 68, -1, -1, -1, 61, 62, 29, 
+  45, 46, 66, 67, 68, -1, -1, 29, -1, -1, 
+  -1, 61, 62, -1, -1, -1, 66, 67, 68, -1, 
+  -1, 61, 62, -1, -1, -1, 66, 67, 68, -1, 
+  -1, 61, 62, 3, -1, -1, 66, 67, 68, 61, 
+  62, -1, -1, 13, 66, 67, 68, 17, -1, -1, 
+  -1, -1, -1, -1, 23, 24, 26, -1, 28, -1, 
+  -1, -1, 31, 32, -1, -1, 35, -1, 37, 39, 
+  3, 41, 42, -1, -1, -1, -1, -1, -1, 49, 
+  13, -1, 52, 53, 17, -1, -1, -1, 58, -1, 
+  -1, -1, -1, 26, 64, 28, -1, -1, 31, -1, 
+  -1, -1, -1, -1, -1, -1, 39, -1, 41, 42, 
+  80, -1, -1, -1, -1, -1, 49, 12, 13, 52, 
+  53, -1, -1, -1, -1, 58, -1, 22, -1, -1, 
+  3, 64, -1, -1, 29, -1, -1, -1, 33, 34, 
+  13, 36, -1, -1, 17, -1, -1, 80, 43, -1, 
+  -1, -1, 47, 26, -1, 28, -1, -1, -1, -1, 
+  -1, -1, -1, -1, -1, -1, 39, -1, 41, 42, 
+  65, 66, 67, 68, -1, 70, 49, -1, -1, 52, 
+  53, -1, -1, -1, -1, 58, 81, 82, 83, -1, 
+  -1, 64, 87, -1, -1, -1, -1, -1, 12, 13, 
+  -1, -1, -1, -1, -1, -1, -1, 80, 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, -1, -1, -1, -1, -1, -1, 81, 82, 83, 
-  -1, -1, -1, 87, -1, -1, -1, -1, -1, -1, 
-  -1, -1, -1, -1, 10, -1, 12, 13, -1, -1, 
-  -1, -1, -1, -1, -1, -1, 22, -1, -1, -1, 
+  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, -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, -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, 
+  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, -1, 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, 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, -1, -1, -1, 87, -1, 
   -1, -1, -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, -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, -1, -1, -1, -1, -1, -1, 11, 12, 
+  -1, -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, -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, 
+  -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, -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, 
+  -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, -1, -1, 
+  -1, -1, -1, -1, -1, 8, -1, -1, 11, 12, 
   13, -1, -1, -1, -1, -1, -1, -1, -1, 22, 
   -1, -1, -1, -1, -1, -1, 29, -1, -1, -1, 
   33, 34, -1, 36, -1, -1, -1, 40, -1, 42, 
   43, 44, -1, -1, 47, -1, -1, -1, 51, -1, 
-  53, -1, -1, -1, -1, -1, -1, -1, -1, -1, 
+  53, -1, -1, 56, -1, -1, -1, -1, -1, -1, 
   -1, -1, 65, 66, 67, 68, -1, 70, -1, 72, 
   -1, 74, -1, 76, -1, -1, -1, -1, 81, 82, 
   83, -1, -1, -1, 87, -1, -1, -1, -1, -1, 
-  -1, -1, -1, -1, -1, 11, 12, 13, -1, -1, 
-  -1, -1, -1, -1, -1, -1, 22, -1, -1, -1, 
-  -1, -1, -1, 29, -1, -1, -1, 33, 34, -1, 
-  36, -1, -1, -1, 40, -1, 42, 43, 44, -1, 
-  -1, 47, -1, -1, -1, 51, -1, 53, -1, -1, 
-  -1, -1, -1, -1, -1, -1, -1, -1, -1, 65, 
-  66, 67, 68, -1, 70, -1, 72, -1, 74, 75, 
-  76, -1, -1, -1, -1, 81, 82, 83, -1, -1, 
-  -1, 87, -1, -1, -1, -1, -1, -1, -1, -1, 
-  -1, -1, 7, -1, -1, -1, 11, 12, 13, -1, 
-  -1, -1, -1, -1, -1, -1, -1, 22, -1, -1, 
-  -1, -1, -1, -1, 29, -1, -1, -1, 33, 34, 
-  -1, 36, -1, -1, -1, 40, -1, 42, 43, 44, 
-  -1, -1, 47, -1, -1, -1, 51, -1, 53, -1, 
-  -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 
-  65, 66, 67, 68, -1, 70, -1, 72, -1, 74, 
-  -1, 76, -1, -1, -1, -1, 81, 82, 83, -1, 
-  -1, -1, 87, -1, -1, -1, -1, -1, -1, -1, 
-  -1, -1, -1, 8, -1, -1, 11, 12, 13, -1, 
-  -1, -1, -1, -1, -1, -1, -1, 22, -1, -1, 
-  -1, -1, -1, -1, 29, -1, -1, -1, 33, 34, 
-  -1, 36, -1, -1, -1, 40, -1, 42, 43, 44, 
-  -1, -1, 47, -1, -1, -1, 51, -1, 53, -1, 
-  -1, 56, -1, -1, -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, -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, -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, -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, -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, 
+  -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, -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, -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, 
+  -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, 
-  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, 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, -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, 4, 5, 6, -1, -1, 9, 10, 11, 
+  -1, -1, 14, -1, 16, -1, -1, -1, 20, 21, 
+  22, -1, -1, -1, -1, -1, -1, 29, 30, 31, 
+  32, -1, -1, -1, -1, -1, -1, -1, -1, -1, 
+  -1, 43, -1, -1, -1, 47, -1, -1, -1, -1, 
+  -1, -1, -1, -1, -1, -1, -1, 59, -1, -1, 
+  -1, -1, -1, 65, 66, 67, -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, 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, 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, -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, -1, -1, 
-  -1, -1, -1, -1, 4, 5, 6, -1, -1, 9, 
-  10, 11, -1, -1, 14, -1, 16, -1, -1, -1, 
-  20, 21, 22, -1, -1, -1, -1, -1, -1, 29, 
-  30, 31, 32, -1, -1, -1, -1, -1, -1, -1, 
-  -1, -1, -1, 43, -1, -1, -1, 47, -1, -1, 
-  -1, -1, -1, -1, -1, -1, -1, -1, -1, 59, 
-  -1, -1, -1, -1, -1, 65, 66, 67, -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, 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, 75, 
-  76, 77, 78, -1, -1, 81, 82, 83, 84, 85, 
-  86, -1, -1, -1, -1, -1, -1, -1, -1, -1, 
   -1, -1, 4, -1, -1, -1, -1, 9, -1, 11, 
   12, 13, 14, -1, -1, -1, -1, -1, -1, 21, 
   22, -1, -1, -1, -1, -1, -1, 29, 30, -1, 
@@ -881,74 +867,74 @@ const int QmlJSGrammar::action_check [] = {
   -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, -1, 
-  -1, -1, -1, -1, -1, -1, 4, -1, -1, -1, 
-  -1, 9, -1, 11, 12, 13, 14, -1, -1, -1, 
-  -1, -1, -1, 21, 22, -1, -1, -1, -1, -1, 
-  -1, 29, 30, -1, -1, 33, 34, -1, 36, -1, 
-  -1, -1, 40, -1, 42, 43, 44, -1, -1, 47, 
-  -1, -1, -1, 51, -1, 53, -1, -1, -1, -1, 
-  -1, 59, -1, 61, -1, -1, -1, 65, 66, 67, 
-  68, 69, 70, 71, 72, 73, 74, 75, 76, 77, 
-  78, -1, -1, 81, 82, 83, 84, 85, -1, 87, 
-  -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 
-  4, 5, 6, -1, -1, 9, 10, 11, 12, 13, 
-  14, -1, 16, -1, -1, -1, 20, 21, 22, -1, 
-  -1, -1, -1, -1, -1, 29, 30, 31, 32, 33, 
-  34, -1, 36, -1, -1, -1, 40, -1, 42, 43, 
-  44, -1, -1, 47, -1, -1, -1, 51, -1, 53, 
-  -1, -1, -1, -1, -1, 59, -1, 61, -1, -1, 
-  -1, 65, 66, 67, 68, 69, 70, 71, 72, 73, 
-  74, 75, 76, 77, 78, -1, -1, 81, 82, 83, 
-  84, 85, 86, 87, -1, -1, -1, -1, -1, -1, 
-  -1, -1, -1, -1, 4, 5, 6, -1, -1, 9, 
-  10, 11, 12, 13, 14, -1, 16, -1, -1, -1, 
-  20, 21, 22, -1, -1, -1, -1, -1, -1, 29, 
-  30, 31, 32, 33, 34, -1, 36, -1, -1, -1, 
-  40, -1, 42, 43, 44, -1, -1, 47, -1, -1, 
-  -1, 51, -1, 53, -1, 55, -1, -1, -1, 59, 
-  -1, 61, -1, -1, -1, 65, 66, 67, 68, 69, 
-  70, 71, 72, 73, 74, 75, 76, 77, 78, -1, 
-  -1, 81, 82, 83, 84, 85, 86, 87, -1, -1, 
-  -1, -1, -1, -1, -1, -1, -1, -1, 
+  -1, -1, -1, -1, -1, -1, -1, 4, -1, -1, 
+  -1, -1, 9, -1, 11, 12, 13, 14, -1, -1, 
+  -1, -1, -1, -1, 21, 22, -1, -1, -1, -1, 
+  -1, -1, 29, 30, -1, -1, 33, 34, -1, 36, 
+  -1, -1, -1, 40, -1, 42, 43, 44, -1, -1, 
+  47, -1, -1, -1, 51, -1, 53, -1, -1, -1, 
+  -1, -1, 59, -1, 61, -1, -1, -1, 65, 66, 
+  67, 68, 69, 70, 71, 72, 73, 74, 75, 76, 
+  77, 78, -1, -1, 81, 82, 83, 84, 85, -1, 
+  87, -1, -1, -1, -1, -1, -1, -1, -1, -1, 
+  -1, -1, 4, 5, 6, -1, -1, 9, 10, 11, 
+  12, 13, 14, -1, 16, -1, -1, -1, 20, 21, 
+  22, -1, -1, -1, -1, -1, -1, 29, 30, 31, 
+  32, 33, 34, -1, 36, -1, -1, -1, 40, -1, 
+  42, 43, 44, -1, -1, 47, -1, -1, -1, 51, 
+  -1, 53, -1, -1, -1, -1, -1, 59, -1, 61, 
+  -1, -1, -1, 65, 66, 67, 68, 69, 70, 71, 
+  72, 73, 74, 75, 76, 77, 78, -1, -1, 81, 
+  82, 83, 84, 85, 86, 87, -1, -1, -1, -1, 
+  -1, -1, -1, -1, -1, -1, -1, 4, 5, 6, 
+  -1, -1, 9, 10, 11, 12, 13, 14, -1, 16, 
+  -1, -1, -1, 20, 21, 22, -1, -1, -1, -1, 
+  -1, -1, 29, 30, 31, 32, 33, 34, -1, 36, 
+  -1, -1, -1, 40, -1, 42, 43, 44, -1, -1, 
+  47, -1, -1, -1, 51, -1, 53, -1, 55, -1, 
+  -1, -1, 59, -1, 61, -1, -1, -1, 65, 66, 
+  67, 68, 69, 70, 71, 72, 73, 74, 75, 76, 
+  77, 78, -1, -1, 81, 82, 83, 84, 85, 86, 
+  87, -1, -1, -1, -1, -1, -1, -1, -1, -1, 
+  -1, -1, 
 
-  13, 94, 3, 19, 33, 23, 13, 3, 23, 3, 
-  13, 23, 3, 2, 23, 3, 3, 19, 2, 17, 
-  13, 65, 33, 13, 9, 11, 3, 2, 33, 2, 
-  13, 13, 13, 3, 34, 3, 33, 13, 3, 13, 
-  3, 13, 3, 2, 13, 3, 2, 2, 19, 3, 
-  3, 2, 2, 33, 33, 33, 2, 79, 3, 2, 
-  2, 13, 3, 2, 13, 79, 33, 33, 3, 13, 
-  96, 33, 19, 13, 2, 13, 33, 13, 2, 2, 
-  13, 3, 3, 3, 11, 33, 23, 91, 19, 2, 
-  -1, 2, 2, -1, -1, -1, -1, -1, 13, 13, 
-  -1, 33, -1, -1, 33, -1, 38, -1, 42, 38, 
-  3, -1, 42, 47, 44, 13, 42, 42, 44, -1, 
-  3, 35, 47, 42, 42, 42, 42, -1, 47, 47, 
-  42, 48, 48, 42, 42, 47, 44, 42, 42, 42, 
-  42, 44, 47, 47, 46, 42, 42, 44, 42, 58, 
-  46, 42, 42, 44, 42, 42, 42, 47, 42, 47, 
-  54, 47, 46, 11, 42, 52, 42, 42, 83, 47, 
-  42, 47, 44, 66, 42, 50, 44, 42, 42, 44, 
-  13, 42, 42, 66, 45, 45, 42, 98, 44, 11, 
-  103, 39, 56, 11, 3, 42, 42, 44, 42, 97, 
-  44, 42, 48, 44, 42, 42, 42, 44, 44, 29, 
-  48, 42, 42, 33, 44, 42, 47, 39, 42, 42, 
-  47, 39, -1, 47, 47, 42, 42, 11, 59, 11, 
-  47, 47, 14, -1, 42, 51, 18, 64, 13, 47, 
-  64, 64, 26, 27, 42, 53, -1, 64, 42, 47, 
-  42, 49, 85, 47, 42, 47, -1, 66, 3, 47, 
-  35, 36, -1, 57, 42, -1, -1, 55, 42, 47, 
-  4, 49, 64, 47, 42, 49, -1, 11, 4, 47, 
-  11, 49, -1, 14, -1, 11, -1, 18, 11, -1, 
-  -1, -1, 26, 27, -1, 18, 19, 20, 21, 22, 
-  26, 27, 33, -1, -1, -1, -1, -1, -1, -1, 
-  -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 
-  -1, 66, -1, -1, -1, -1, -1, -1, -1, -1, 
-  -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 
+  3, 23, 13, 23, 23, 13, 3, 13, 65, 3, 
+  11, 13, 19, 3, 9, 3, 3, 13, 2, 33, 
+  13, 13, 3, 23, 13, 2, 2, 13, 3, 3, 
+  2, 13, 23, 11, 17, 3, 3, 2, 96, 19, 
+  13, 2, 13, 13, 2, 2, 2, 13, 33, 13, 
+  19, 13, 3, 2, 33, 3, 2, 2, 13, 13, 
+  2, 79, 3, 79, 91, 3, 3, 19, 94, 3, 
+  33, 2, 2, 33, 33, 3, 19, 3, 2, -1, 
+  3, 34, 3, 33, 13, 3, 33, -1, 13, 33, 
+  -1, 13, 11, 33, 33, 3, 13, 33, 2, -1, 
+  -1, 2, 2, -1, 3, -1, -1, 42, -1, 42, 
+  42, -1, 44, -1, -1, 42, 3, 3, -1, 46, 
+  39, 56, 42, -1, 44, 58, 42, 42, 44, 42, 
+  42, 46, 44, 42, 47, 44, 42, 42, 33, 42, 
+  42, -1, 47, 38, 42, 47, 44, 11, 54, 52, 
+  42, 42, 42, -1, 44, 47, 47, 42, 66, 42, 
+  42, 83, 47, 46, -1, 47, 42, 66, 85, 45, 
+  42, -1, 97, 45, 42, 39, 44, 42, -1, 66, 
+  66, 42, 47, 44, 42, 42, 44, 42, 42, 44, 
+  44, 42, 42, 50, 98, 42, 13, 48, 48, 42, 
+  42, 48, 103, 42, 47, 33, 48, 42, 47, 44, 
+  38, 42, 42, 44, 44, 42, 11, 44, 35, 42, 
+  42, 42, 44, 42, 47, 13, 47, 42, 47, 42, 
+  42, -1, 47, -1, 47, 47, 51, 11, 42, -1, 
+  -1, 53, -1, 47, 39, 64, 59, 35, 36, 42, 
+  42, 55, 26, 27, 47, 47, 11, 42, -1, 14, 
+  42, 42, 47, 18, -1, 47, 47, -1, -1, -1, 
+  -1, 64, 64, 42, -1, -1, 57, 29, 47, 64, 
+  49, 33, 64, 42, 42, -1, 4, -1, 47, 47, 
+  49, 49, 42, 11, -1, 11, 4, 47, 14, 49, 
+  -1, -1, 18, 11, 11, -1, -1, -1, 26, 27, 
+  -1, 18, 19, 20, 21, 22, -1, 33, 26, 27, 
   -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 
   -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 
-  11, -1, -1, 14, -1, -1, -1, 18, -1, -1, 
   -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 
+  -1, -1, -1, 11, -1, -1, 14, -1, -1, -1, 
+  18, -1, -1, -1, -1, -1, -1, -1, -1, -1, 
   -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 
   -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 
   -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 
@@ -956,5 +942,6 @@ const int 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, -1};
+  -1, -1, -1, -1, -1, -1, -1};
 
+QT_END_NAMESPACE
diff --git a/src/shared/qmljs/parser/qmljsgrammar_p.h b/src/shared/qmljs/parser/qmljsgrammar_p.h
index d607e8ddf33..469ed92f6e9 100644
--- a/src/shared/qmljs/parser/qmljsgrammar_p.h
+++ b/src/shared/qmljs/parser/qmljsgrammar_p.h
@@ -1,4 +1,3 @@
-// This file was generated by qlalr - DO NOT EDIT!
 /****************************************************************************
 **
 ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
@@ -51,16 +50,21 @@
 // We mean it.
 //
 
+// This file was generated by qlalr - DO NOT EDIT!
 #ifndef QMLJSGRAMMAR_P_H
 #define QMLJSGRAMMAR_P_H
 
+#include <QtCore/qglobal.h>
+
+QT_BEGIN_NAMESPACE
+
 class QmlJSGrammar
 {
 public:
   enum {
     EOF_SYMBOL = 0,
-    REDUCE_HERE = 97,
-    SHIFT_THERE = 96,
+    REDUCE_HERE = 98,
+    SHIFT_THERE = 97,
     T_AND = 1,
     T_AND_AND = 2,
     T_AND_EQ = 3,
@@ -87,6 +91,7 @@ public:
     T_EQ_EQ_EQ = 19,
     T_FALSE = 83,
     T_FEED_JS_EXPRESSION = 95,
+    T_FEED_JS_SOURCE_ELEMENT = 96,
     T_FEED_JS_STATEMENT = 94,
     T_FEED_UI_OBJECT_MEMBER = 93,
     T_FEED_UI_PROGRAM = 92,
@@ -157,38 +162,33 @@ public:
     T_XOR = 79,
     T_XOR_EQ = 80,
 
-    ACCEPT_STATE = 630,
-    RULE_COUNT = 340,
-    STATE_COUNT = 631,
-    TERMINAL_COUNT = 98,
+    ACCEPT_STATE = 632,
+    RULE_COUNT = 341,
+    STATE_COUNT = 633,
+    TERMINAL_COUNT = 99,
     NON_TERMINAL_COUNT = 105,
 
-    GOTO_INDEX_OFFSET = 631,
-    GOTO_INFO_OFFSET = 2618,
-    GOTO_CHECK_OFFSET = 2618
+    GOTO_INDEX_OFFSET = 633,
+    GOTO_INFO_OFFSET = 2532,
+    GOTO_CHECK_OFFSET = 2532
   };
 
-  static const char  *const spell [];
-  static const int            lhs [];
-  static const int            rhs [];
-  static const int   goto_default [];
-  static const int action_default [];
-  static const int   action_index [];
-  static const int    action_info [];
-  static const int   action_check [];
+  static const char  *const    spell [];
+  static const short             lhs [];
+  static const short             rhs [];
+  static const short    goto_default [];
+  static const short  action_default [];
+  static const short    action_index [];
+  static const short     action_info [];
+  static const short    action_check [];
 
   static inline int nt_action (int state, int nt)
   {
-    const int *const goto_index = &action_index [GOTO_INDEX_OFFSET];
-    const int *const goto_check = &action_check [GOTO_CHECK_OFFSET];
-
-    const int yyn = goto_index [state] + nt;
-
-    if (yyn < 0 || goto_check [yyn] != nt)
+    const int yyn = action_index [GOTO_INDEX_OFFSET + state] + nt;
+    if (yyn < 0 || action_check [GOTO_CHECK_OFFSET + yyn] != nt)
       return goto_default [nt];
 
-    const int *const goto_info = &action_info [GOTO_INFO_OFFSET];
-    return goto_info [yyn];
+    return action_info [GOTO_INFO_OFFSET + yyn];
   }
 
   static inline int t_action (int state, int token)
@@ -203,5 +203,6 @@ public:
 };
 
 
+QT_END_NAMESPACE
 #endif // QMLJSGRAMMAR_P_H
 
diff --git a/src/shared/qmljs/parser/qmljslexer.cpp b/src/shared/qmljs/parser/qmljslexer.cpp
index d316f93bda3..cf3ed34c1e0 100644
--- a/src/shared/qmljs/parser/qmljslexer.cpp
+++ b/src/shared/qmljs/parser/qmljslexer.cpp
@@ -40,15 +40,16 @@
 ****************************************************************************/
 
 #ifdef HAVE_CONFIG_H
-#include "config.h"
+#include <config.h>
 #endif
 
+#include "qmljslexer_p.h"
+
 #include "qmljsglobal_p.h"
 #include "qmljsengine_p.h"
-#include "qmljslexer_p.h"
 #include "qmljsgrammar_p.h"
 
-#include <QtGui/qapplication.h>
+#include <QtCore/qcoreapplication.h>
 
 #include <ctype.h>
 #include <stdlib.h>
@@ -550,7 +551,7 @@ int Lexer::lex()
                 else {
                     setDone(Bad);
                     err = IllegalCharacter;
-                    errmsg = qApp->translate("QmlParser", "Illegal character");
+                    errmsg = QCoreApplication::translate("QmlParser", "Illegal character");
                 }
             }
             break;
@@ -564,7 +565,7 @@ int Lexer::lex()
             } else if (current == 0 || isLineTerminator()) {
                 setDone(Bad);
                 err = UnclosedStringLiteral;
-                errmsg = qApp->translate("QmlParser", "Unclosed string at end of line");
+                errmsg = QCoreApplication::translate("QmlParser", "Unclosed string at end of line");
             } else if (current == '\\') {
                 state = InEscapeSequence;
             } else {
@@ -590,7 +591,7 @@ int Lexer::lex()
                 } else {
                     setDone(Bad);
                     err = IllegalEscapeSequence;
-                    errmsg = qApp->translate("QmlParser", "Illegal escape squence");
+                    errmsg = QCoreApplication::translate("QmlParser", "Illegal escape squence");
                 }
             } else if (current == 'x')
                 state = InHexEscape;
@@ -636,7 +637,7 @@ int Lexer::lex()
             } else {
                 setDone(Bad);
                 err = IllegalUnicodeEscapeSequence;
-                errmsg = qApp->translate("QmlParser", "Illegal unicode escape sequence");
+                errmsg = QCoreApplication::translate("QmlParser", "Illegal unicode escape sequence");
             }
             break;
         case InSingleLineComment:
@@ -662,7 +663,7 @@ int Lexer::lex()
             if (current == 0) {
                 setDone(Bad);
                 err = UnclosedComment;
-                errmsg = qApp->translate("QmlParser", "Unclosed comment at end of file");
+                errmsg = QCoreApplication::translate("QmlParser", "Unclosed comment at end of file");
                 driver->addComment(startpos, tokenLength(), startlineno, startcolumn);
             } else if (isLineTerminator()) {
                 shiftWindowsLineBreak();
@@ -749,7 +750,7 @@ int Lexer::lex()
             } else {
                 setDone(Bad);
                 err = IllegalExponentIndicator;
-                errmsg = qApp->translate("QmlParser", "Illegal syntax for exponential number");
+                errmsg = QCoreApplication::translate("QmlParser", "Illegal syntax for exponential number");
             }
             break;
         case InExponent:
@@ -775,7 +776,7 @@ int Lexer::lex()
          && isIdentLetter(current)) {
         state = Bad;
         err = IllegalIdentifier;
-        errmsg = qApp->translate("QmlParser", "Identifier cannot start with numeric literal");
+        errmsg = QCoreApplication::translate("QmlParser", "Identifier cannot start with numeric literal");
     }
 
     // terminate string
@@ -1106,7 +1107,7 @@ bool Lexer::scanRegExp(RegExpBodyPrefix prefix)
 
     while (1) {
         if (isLineTerminator() || current == 0) {
-            errmsg = qApp->translate("QmlParser", "Unterminated regular expression literal");
+            errmsg = QCoreApplication::translate("QmlParser", "Unterminated regular expression literal");
             return false;
         }
         else if (current != '/' || lastWasEscape == true)
@@ -1130,7 +1131,7 @@ bool Lexer::scanRegExp(RegExpBodyPrefix prefix)
     while (isIdentLetter(current)) {
         int flag = Ecma::RegExp::flagFromChar(current);
         if (flag == 0) {
-            errmsg = qApp->translate("QmlParser", "Invalid regular expression flag '%0'")
+            errmsg = QCoreApplication::translate("QmlParser", "Invalid regular expression flag '%0'")
                      .arg(QChar(current));
             return false;
         }
diff --git a/src/shared/qmljs/parser/qmljslexer_p.h b/src/shared/qmljs/parser/qmljslexer_p.h
index 3ff2ec95200..b8300716fec 100644
--- a/src/shared/qmljs/parser/qmljslexer_p.h
+++ b/src/shared/qmljs/parser/qmljslexer_p.h
@@ -53,10 +53,10 @@
 // We mean it.
 //
 
-#include <QtCore/QString>
-
 #include "qmljsglobal_p.h"
 
+#include <QtCore/QString>
+
 QT_QML_BEGIN_NAMESPACE
 
 namespace QmlJS {
diff --git a/src/shared/qmljs/parser/qmljsmemorypool_p.h b/src/shared/qmljs/parser/qmljsmemorypool_p.h
index de8d09753f0..3da2678ab9a 100644
--- a/src/shared/qmljs/parser/qmljsmemorypool_p.h
+++ b/src/shared/qmljs/parser/qmljsmemorypool_p.h
@@ -53,11 +53,12 @@
 // We mean it.
 //
 
+#include "qmljsglobal_p.h"
+
 #include <QtCore/qglobal.h>
 #include <QtCore/qshareddata.h>
-#include <string.h>
 
-#include "qmljsglobal_p.h"
+#include <string.h>
 
 QT_QML_BEGIN_NAMESPACE
 
diff --git a/src/shared/qmljs/parser/qmljsnodepool_p.h b/src/shared/qmljs/parser/qmljsnodepool_p.h
index e685be3c945..abe4cc8f852 100644
--- a/src/shared/qmljs/parser/qmljsnodepool_p.h
+++ b/src/shared/qmljs/parser/qmljsnodepool_p.h
@@ -53,12 +53,12 @@
 // We mean it.
 //
 
-#include <QtCore/QHash>
-#include <QtCore/QString>
-
 #include "qmljsglobal_p.h"
 #include "qmljsmemorypool_p.h"
 
+#include <QtCore/QHash>
+#include <QtCore/QString>
+
 QT_QML_BEGIN_NAMESPACE
 
 namespace QmlJS {
diff --git a/src/shared/qmljs/parser/qmljsparser.cpp b/src/shared/qmljs/parser/qmljsparser.cpp
index 453503bd0b2..e38f3177591 100644
--- a/src/shared/qmljs/parser/qmljsparser.cpp
+++ b/src/shared/qmljs/parser/qmljsparser.cpp
@@ -1,8 +1,6 @@
-// This file was generated by qlalr - DO NOT EDIT!
-
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
@@ -217,33 +215,38 @@ case 3: {
 } break;
 
 case 4: {
+  sym(1).Node = sym(2).Node;
+  program = sym(1).Node;
+} break;
+
+case 5: {
   sym(1).UiProgram = makeAstNode<AST::UiProgram> (driver->nodePool(), sym(1).UiImportList,
         sym(2).UiObjectMemberList->finish());
 } break;
 
-case 6: {
+case 7: {
     sym(1).Node = sym(1).UiImportList->finish();
 } break;
 
-case 7: {
+case 8: {
     sym(1).Node = makeAstNode<AST::UiImportList> (driver->nodePool(), sym(1).UiImport);
 } break;
 
-case 8: {
+case 9: {
     sym(1).Node = makeAstNode<AST::UiImportList> (driver->nodePool(),
         sym(1).UiImportList, sym(2).UiImport);
 } break;
 
-case 11: {
+case 12: {
     sym(1).UiImport->semicolonToken = loc(2);
 } break;
 
-case 13: {
+case 14: {
     sym(1).UiImport->versionToken = loc(2);
     sym(1).UiImport->semicolonToken = loc(3);
 } break;
 
-case 15: {
+case 16: {
     sym(1).UiImport->versionToken = loc(2);
     sym(1).UiImport->asToken = loc(3);
     sym(1).UiImport->importIdToken = loc(4);
@@ -251,14 +254,14 @@ case 15: {
     sym(1).UiImport->semicolonToken = loc(5);
 } break;
 
-case 17: {
+case 18: {
     sym(1).UiImport->asToken = loc(2);
     sym(1).UiImport->importIdToken = loc(3);
     sym(1).UiImport->importId = sym(3).sval;
     sym(1).UiImport->semicolonToken = loc(4);
 } break;
 
-case 18: {
+case 19: {
     AST::UiImport *node = 0;
 
     if (AST::StringLiteral *importIdLiteral = AST::cast<AST::StringLiteral *>(sym(2).Expression)) {
@@ -284,56 +287,56 @@ case 18: {
     }
 } break;
 
-case 19: {
+case 20: {
     sym(1).Node = 0;
 } break;
 
-case 20: {
+case 21: {
     sym(1).Node = makeAstNode<AST::UiObjectMemberList> (driver->nodePool(), sym(1).UiObjectMember);
 } break;
 
-case 21: {
+case 22: {
     sym(1).Node = makeAstNode<AST::UiObjectMemberList> (driver->nodePool(), sym(1).UiObjectMember);
 } break;
 
-case 22: {
+case 23: {
     AST::UiObjectMemberList *node = makeAstNode<AST:: UiObjectMemberList> (driver->nodePool(),
         sym(1).UiObjectMemberList, sym(2).UiObjectMember);
     sym(1).Node = node;
 } break;
 
-case 23: {
+case 24: {
     sym(1).Node = makeAstNode<AST::UiArrayMemberList> (driver->nodePool(), sym(1).UiObjectMember);
 } break;
 
-case 24: {
+case 25: {
     AST::UiArrayMemberList *node = makeAstNode<AST::UiArrayMemberList> (driver->nodePool(),
         sym(1).UiArrayMemberList, sym(3).UiObjectMember);
     node->commaToken = loc(2);
     sym(1).Node = node;
 } break;
 
-case 25: {
+case 26: {
     AST::UiObjectInitializer *node = makeAstNode<AST::UiObjectInitializer> (driver->nodePool(), (AST::UiObjectMemberList*)0);
     node->lbraceToken = loc(1);
     node->rbraceToken = loc(2);
     sym(1).Node = node;
 }   break;
 
-case 26: {
+case 27: {
     AST::UiObjectInitializer *node = makeAstNode<AST::UiObjectInitializer> (driver->nodePool(), sym(2).UiObjectMemberList->finish());
     node->lbraceToken = loc(1);
     node->rbraceToken = loc(3);
     sym(1).Node = node;
 }   break;
 
-case 27: {
+case 28: {
     AST::UiObjectDefinition *node = makeAstNode<AST::UiObjectDefinition> (driver->nodePool(), sym(1).UiQualifiedId,
         sym(2).UiObjectInitializer);
     sym(1).Node = node;
 }   break;
 
-case 29: {
+case 30: {
     AST::UiArrayBinding *node = makeAstNode<AST::UiArrayBinding> (driver->nodePool(),
         sym(1).UiQualifiedId, sym(4).UiArrayMemberList->finish());
     node->colonToken = loc(2);
@@ -342,13 +345,13 @@ case 29: {
     sym(1).Node = node;
 }   break;
 
-case 30: {
+case 31: {
     AST::UiObjectBinding *node = makeAstNode<AST::UiObjectBinding> (driver->nodePool(),
       sym(1).UiQualifiedId, sym(3).UiQualifiedId, sym(4).UiObjectInitializer);
     node->colonToken = loc(2);
     sym(1).Node = node;
 } break;
-case 31:case 32:case 33:case 34:
+case 32:case 33:case 34:case 35:
 {
     AST::UiScriptBinding *node = makeAstNode<AST::UiScriptBinding> (driver->nodePool(),
         sym(1).UiQualifiedId, sym(3).Statement);
@@ -356,35 +359,35 @@ case 31:case 32:case 33:case 34:
     sym(1).Node = node;
 }   break;
 
-case 35:
+case 36:
 
-case 36: {
+case 37: {
     sym(1).sval = driver->intern(lexer->characterBuffer(), lexer->characterCount());
     break;
 }
 
-case 38: {
+case 39: {
   sym(1).Node = 0;
 } break;
 
-case 39: {
+case 40: {
   sym(1).Node = sym(1).UiParameterList->finish ();
 } break;
 
-case 40: {
+case 41: {
   AST::UiParameterList *node = makeAstNode<AST::UiParameterList> (driver->nodePool(), sym(1).sval, sym(2).sval);
   node->identifierToken = loc(2);
   sym(1).Node = node;
 } break;
 
-case 41: {
+case 42: {
   AST::UiParameterList *node = makeAstNode<AST::UiParameterList> (driver->nodePool(), sym(1).UiParameterList, sym(3).sval, sym(4).sval);
   node->commaToken = loc(2);
   node->identifierToken = loc(4);
   sym(1).Node = node;
 } break;
 
-case 43: {
+case 44: {
     AST::UiPublicMember *node = makeAstNode<AST::UiPublicMember> (driver->nodePool(), (NameId *)0, sym(2).sval);
     node->type = AST::UiPublicMember::Signal;
     node->propertyToken = loc(1);
@@ -395,7 +398,7 @@ case 43: {
     sym(1).Node = node;
 }   break;
 
-case 45: {
+case 46: {
     AST::UiPublicMember *node = makeAstNode<AST::UiPublicMember> (driver->nodePool(), (NameId *)0, sym(2).sval);
     node->type = AST::UiPublicMember::Signal;
     node->propertyToken = loc(1);
@@ -405,7 +408,7 @@ case 45: {
     sym(1).Node = node;
 }   break;
 
-case 47: {
+case 48: {
     AST::UiPublicMember *node = makeAstNode<AST::UiPublicMember> (driver->nodePool(), sym(4).sval, sym(6).sval);
     node->typeModifier = sym(2).sval;
     node->propertyToken = loc(1);
@@ -416,7 +419,7 @@ case 47: {
     sym(1).Node = node;
 }   break;
 
-case 49: {
+case 50: {
     AST::UiPublicMember *node = makeAstNode<AST::UiPublicMember> (driver->nodePool(), sym(2).sval, sym(3).sval);
     node->propertyToken = loc(1);
     node->typeToken = loc(2);
@@ -425,7 +428,7 @@ case 49: {
     sym(1).Node = node;
 }   break;
 
-case 51: {
+case 52: {
     AST::UiPublicMember *node = makeAstNode<AST::UiPublicMember> (driver->nodePool(), sym(3).sval, sym(4).sval);
     node->isDefaultMember = true;
     node->defaultToken = loc(1);
@@ -436,7 +439,7 @@ case 51: {
     sym(1).Node = node;
 }   break;
 
-case 53: {
+case 54: {
     AST::UiPublicMember *node = makeAstNode<AST::UiPublicMember> (driver->nodePool(), sym(2).sval, sym(3).sval,
         sym(5).Expression);
     node->propertyToken = loc(1);
@@ -447,7 +450,7 @@ case 53: {
     sym(1).Node = node;
 }   break;
 
-case 55: {
+case 56: {
     AST::UiPublicMember *node = makeAstNode<AST::UiPublicMember> (driver->nodePool(), sym(3).sval, sym(4).sval,
         sym(6).Expression);
     node->isReadonlyMember = true;
@@ -460,7 +463,7 @@ case 55: {
     sym(1).Node = node;
 }   break;
 
-case 57: {
+case 58: {
     AST::UiPublicMember *node = makeAstNode<AST::UiPublicMember> (driver->nodePool(), sym(3).sval, sym(4).sval,
         sym(6).Expression);
     node->isDefaultMember = true;
@@ -473,75 +476,75 @@ case 57: {
     sym(1).Node = node;
 }   break;
 
-case 58: {
+case 59: {
     sym(1).Node = makeAstNode<AST::UiSourceElement>(driver->nodePool(), sym(1).Node);
 }   break;
 
-case 59: {
+case 60: {
     sym(1).Node = makeAstNode<AST::UiSourceElement>(driver->nodePool(), sym(1).Node);
 }   break;
 
-case 61: {
+case 62: {
     QString s = QLatin1String(QmlJSGrammar::spell[T_PROPERTY]);
     sym(1).sval = driver->intern(s.constData(), s.length());
     break;
 }
 
-case 62: {
+case 63: {
     QString s = QLatin1String(QmlJSGrammar::spell[T_SIGNAL]);
     sym(1).sval = driver->intern(s.constData(), s.length());
     break;
 }
 
-case 63: {
+case 64: {
     QString s = QLatin1String(QmlJSGrammar::spell[T_READONLY]);
     sym(1).sval = driver->intern(s.constData(), s.length());
     break;
 }
 
-case 64: {
+case 65: {
   AST::ThisExpression *node = makeAstNode<AST::ThisExpression> (driver->nodePool());
   node->thisToken = loc(1);
   sym(1).Node = node;
 } break;
 
-case 65: {
+case 66: {
   AST::IdentifierExpression *node = makeAstNode<AST::IdentifierExpression> (driver->nodePool(), sym(1).sval);
   node->identifierToken = loc(1);
   sym(1).Node = node;
 } break;
 
-case 66: {
+case 67: {
   AST::NullExpression *node = makeAstNode<AST::NullExpression> (driver->nodePool());
   node->nullToken = loc(1);
   sym(1).Node = node;
 } break;
 
-case 67: {
+case 68: {
   AST::TrueLiteral *node = makeAstNode<AST::TrueLiteral> (driver->nodePool());
   node->trueToken = loc(1);
   sym(1).Node = node;
 } break;
 
-case 68: {
+case 69: {
   AST::FalseLiteral *node = makeAstNode<AST::FalseLiteral> (driver->nodePool());
   node->falseToken = loc(1);
   sym(1).Node = node;
 } break;
 
-case 69: {
+case 70: {
   AST::NumericLiteral *node = makeAstNode<AST::NumericLiteral> (driver->nodePool(), sym(1).dval);
   node->literalToken = loc(1);
   sym(1).Node = node;
 } break;
-case 70:
-case 71: {
+case 71:
+case 72: {
   AST::StringLiteral *node = makeAstNode<AST::StringLiteral> (driver->nodePool(), sym(1).sval);
   node->literalToken = loc(1);
   sym(1).Node = node;
 } break;
 
-case 72: {
+case 73: {
   bool rx = lexer->scanRegExp(Lexer::NoPrefix);
   if (!rx) {
     diagnostic_messages.append(DiagnosticMessage(DiagnosticMessage::Error, location(lexer), lexer->errorMessage()));
@@ -552,7 +555,7 @@ case 72: {
   sym(1).Node = node;
 } break;
 
-case 73: {
+case 74: {
   bool rx = lexer->scanRegExp(Lexer::EqualPrefix);
   if (!rx) {
     diagnostic_messages.append(DiagnosticMessage(DiagnosticMessage::Error, location(lexer), lexer->errorMessage()));
@@ -563,28 +566,28 @@ case 73: {
   sym(1).Node = node;
 } break;
 
-case 74: {
+case 75: {
   AST::ArrayLiteral *node = makeAstNode<AST::ArrayLiteral> (driver->nodePool(), (AST::Elision *) 0);
   node->lbracketToken = loc(1);
   node->rbracketToken = loc(2);
   sym(1).Node = node;
 } break;
 
-case 75: {
+case 76: {
   AST::ArrayLiteral *node = makeAstNode<AST::ArrayLiteral> (driver->nodePool(), sym(2).Elision->finish());
   node->lbracketToken = loc(1);
   node->rbracketToken = loc(3);
   sym(1).Node = node;
 } break;
 
-case 76: {
+case 77: {
   AST::ArrayLiteral *node = makeAstNode<AST::ArrayLiteral> (driver->nodePool(), sym(2).ElementList->finish ());
   node->lbracketToken = loc(1);
   node->rbracketToken = loc(3);
   sym(1).Node = node;
 } break;
 
-case 77: {
+case 78: {
   AST::ArrayLiteral *node = makeAstNode<AST::ArrayLiteral> (driver->nodePool(), sym(2).ElementList->finish (),
     (AST::Elision *) 0);
   node->lbracketToken = loc(1);
@@ -593,7 +596,7 @@ case 77: {
   sym(1).Node = node;
 } break;
 
-case 78: {
+case 79: {
   AST::ArrayLiteral *node = makeAstNode<AST::ArrayLiteral> (driver->nodePool(), sym(2).ElementList->finish (),
     sym(4).Elision->finish());
   node->lbracketToken = loc(1);
@@ -602,7 +605,7 @@ case 78: {
   sym(1).Node = node;
 } break;
 
-case 79: {
+case 80: {
   AST::ObjectLiteral *node = 0;
   if (sym(2).Node)
     node = makeAstNode<AST::ObjectLiteral> (driver->nodePool(),
@@ -614,7 +617,7 @@ case 79: {
   sym(1).Node = node;
 } break;
 
-case 80: {
+case 81: {
   AST::ObjectLiteral *node = makeAstNode<AST::ObjectLiteral> (driver->nodePool(),
     sym(2).PropertyNameAndValueList->finish ());
   node->lbraceToken = loc(1);
@@ -622,14 +625,14 @@ case 80: {
   sym(1).Node = node;
 } break;
 
-case 81: {
+case 82: {
   AST::NestedExpression *node = makeAstNode<AST::NestedExpression>(driver->nodePool(), sym(2).Expression);
   node->lparenToken = loc(1);
   node->rparenToken = loc(3);
   sym(1).Node = node;
 } break;
 
-case 82: {
+case 83: {
   if (AST::ArrayMemberExpression *mem = AST::cast<AST::ArrayMemberExpression *>(sym(1).Expression)) {
     diagnostic_messages.append(DiagnosticMessage(DiagnosticMessage::Warning, mem->lbracketToken,
       QLatin1String("Ignored annotation")));
@@ -649,48 +652,48 @@ case 82: {
   }
 } break;
 
-case 83: {
+case 84: {
   sym(1).Node = makeAstNode<AST::ElementList> (driver->nodePool(), (AST::Elision *) 0, sym(1).Expression);
 } break;
 
-case 84: {
+case 85: {
   sym(1).Node = makeAstNode<AST::ElementList> (driver->nodePool(), sym(1).Elision->finish(), sym(2).Expression);
 } break;
 
-case 85: {
+case 86: {
   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 86: {
+case 87: {
   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 87: {
+case 88: {
   AST::Elision *node = makeAstNode<AST::Elision> (driver->nodePool());
   node->commaToken = loc(1);
   sym(1).Node = node;
 } break;
 
-case 88: {
+case 89: {
   AST::Elision *node = makeAstNode<AST::Elision> (driver->nodePool(), sym(1).Elision);
   node->commaToken = loc(2);
   sym(1).Node = node;
 } break;
 
-case 89: {
+case 90: {
   AST::PropertyNameAndValueList *node = makeAstNode<AST::PropertyNameAndValueList> (driver->nodePool(),
       sym(1).PropertyName, sym(3).Expression);
   node->colonToken = loc(2);
   sym(1).Node = node;
 } break;
 
-case 90: {
+case 91: {
   AST::PropertyNameAndValueList *node = makeAstNode<AST::PropertyNameAndValueList> (driver->nodePool(),
       sym(1).PropertyNameAndValueList, sym(3).PropertyName, sym(5).Expression);
   node->commaToken = loc(2);
@@ -698,38 +701,36 @@ case 90: {
   sym(1).Node = node;
 } break;
 
-case 91: {
+case 92: {
   AST::IdentifierPropertyName *node = makeAstNode<AST::IdentifierPropertyName> (driver->nodePool(), sym(1).sval);
   node->propertyNameToken = loc(1);
   sym(1).Node = node;
 } break;
-case 92:
-case 93: {
+case 93:
+case 94: {
   AST::IdentifierPropertyName *node = makeAstNode<AST::IdentifierPropertyName> (driver->nodePool(), driver->intern(lexer->characterBuffer(), lexer->characterCount()));
   node->propertyNameToken = loc(1);
   sym(1).Node = node;
 } break;
 
-case 94: {
+case 95: {
   AST::StringLiteralPropertyName *node = makeAstNode<AST::StringLiteralPropertyName> (driver->nodePool(), sym(1).sval);
   node->propertyNameToken = loc(1);
   sym(1).Node = node;
 } break;
 
-case 95: {
+case 96: {
   AST::NumericLiteralPropertyName *node = makeAstNode<AST::NumericLiteralPropertyName> (driver->nodePool(), sym(1).dval);
   node->propertyNameToken = loc(1);
   sym(1).Node = node;
 } break;
 
-case 96: {
+case 97: {
   AST::IdentifierPropertyName *node = makeAstNode<AST::IdentifierPropertyName> (driver->nodePool(), sym(1).sval);
   node->propertyNameToken = loc(1);
   sym(1).Node = node;
 } break;
 
-case 97:
-
 case 98:
 
 case 99:
@@ -789,25 +790,27 @@ case 125:
 case 126:
 
 case 127:
+
+case 128:
 {
   sym(1).sval = driver->intern(lexer->characterBuffer(), lexer->characterCount());
 } break;
 
-case 132: {
+case 133: {
   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 133: {
+case 134: {
   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 134: {
+case 135: {
   AST::NewMemberExpression *node = makeAstNode<AST::NewMemberExpression> (driver->nodePool(), sym(2).Expression, sym(4).ArgumentList);
   node->newToken = loc(1);
   node->lparenToken = loc(3);
@@ -815,384 +818,384 @@ case 134: {
   sym(1).Node = node;
 } break;
 
-case 136: {
+case 137: {
   AST::NewExpression *node = makeAstNode<AST::NewExpression> (driver->nodePool(), sym(2).Expression);
   node->newToken = loc(1);
   sym(1).Node = node;
 } break;
 
-case 137: {
+case 138: {
   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 138: {
+case 139: {
   AST::CallExpression *node = makeAstNode<AST::CallExpression> (driver->nodePool(), sym(1).Expression, sym(3).ArgumentList);
   node->lparenToken = loc(2);
   node->rparenToken = loc(4);
   sym(1).Node = node;
 } break;
 
-case 139: {
+case 140: {
   AST::ArrayMemberExpression *node = makeAstNode<AST::ArrayMemberExpression> (driver->nodePool(), sym(1).Expression, sym(3).Expression);
   node->lbracketToken = loc(2);
   node->rbracketToken = loc(4);
   sym(1).Node = node;
 } break;
 
-case 140: {
+case 141: {
   AST::FieldMemberExpression *node = makeAstNode<AST::FieldMemberExpression> (driver->nodePool(), sym(1).Expression, sym(3).sval);
   node->dotToken = loc(2);
   node->identifierToken = loc(3);
   sym(1).Node = node;
 } break;
 
-case 141: {
+case 142: {
   sym(1).Node = 0;
 } break;
 
-case 142: {
+case 143: {
   sym(1).Node = sym(1).ArgumentList->finish();
 } break;
 
-case 143: {
+case 144: {
   sym(1).Node = makeAstNode<AST::ArgumentList> (driver->nodePool(), sym(1).Expression);
 } break;
 
-case 144: {
+case 145: {
   AST::ArgumentList *node = makeAstNode<AST::ArgumentList> (driver->nodePool(), sym(1).ArgumentList, sym(3).Expression);
   node->commaToken = loc(2);
   sym(1).Node = node;
 } break;
 
-case 148: {
+case 149: {
   AST::PostIncrementExpression *node = makeAstNode<AST::PostIncrementExpression> (driver->nodePool(), sym(1).Expression);
   node->incrementToken = loc(2);
   sym(1).Node = node;
 } break;
 
-case 149: {
+case 150: {
   AST::PostDecrementExpression *node = makeAstNode<AST::PostDecrementExpression> (driver->nodePool(), sym(1).Expression);
   node->decrementToken = loc(2);
   sym(1).Node = node;
 } break;
 
-case 151: {
+case 152: {
   AST::DeleteExpression *node = makeAstNode<AST::DeleteExpression> (driver->nodePool(), sym(2).Expression);
   node->deleteToken = loc(1);
   sym(1).Node = node;
 } break;
 
-case 152: {
+case 153: {
   AST::VoidExpression *node = makeAstNode<AST::VoidExpression> (driver->nodePool(), sym(2).Expression);
   node->voidToken = loc(1);
   sym(1).Node = node;
 } break;
 
-case 153: {
+case 154: {
   AST::TypeOfExpression *node = makeAstNode<AST::TypeOfExpression> (driver->nodePool(), sym(2).Expression);
   node->typeofToken = loc(1);
   sym(1).Node = node;
 } break;
 
-case 154: {
+case 155: {
   AST::PreIncrementExpression *node = makeAstNode<AST::PreIncrementExpression> (driver->nodePool(), sym(2).Expression);
   node->incrementToken = loc(1);
   sym(1).Node = node;
 } break;
 
-case 155: {
+case 156: {
   AST::PreDecrementExpression *node = makeAstNode<AST::PreDecrementExpression> (driver->nodePool(), sym(2).Expression);
   node->decrementToken = loc(1);
   sym(1).Node = node;
 } break;
 
-case 156: {
+case 157: {
   AST::UnaryPlusExpression *node = makeAstNode<AST::UnaryPlusExpression> (driver->nodePool(), sym(2).Expression);
   node->plusToken = loc(1);
   sym(1).Node = node;
 } break;
 
-case 157: {
+case 158: {
   AST::UnaryMinusExpression *node = makeAstNode<AST::UnaryMinusExpression> (driver->nodePool(), sym(2).Expression);
   node->minusToken = loc(1);
   sym(1).Node = node;
 } break;
 
-case 158: {
+case 159: {
   AST::TildeExpression *node = makeAstNode<AST::TildeExpression> (driver->nodePool(), sym(2).Expression);
   node->tildeToken = loc(1);
   sym(1).Node = node;
 } break;
 
-case 159: {
+case 160: {
   AST::NotExpression *node = makeAstNode<AST::NotExpression> (driver->nodePool(), sym(2).Expression);
   node->notToken = loc(1);
   sym(1).Node = node;
 } break;
 
-case 161: {
+case 162: {
   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 162: {
+case 163: {
   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 163: {
+case 164: {
   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 165: {
+case 166: {
   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 166: {
+case 167: {
   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 168: {
+case 169: {
   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 169: {
+case 170: {
   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 170: {
+case 171: {
   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 172: {
+case 173: {
   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 173: {
+case 174: {
   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 174: {
+case 175: {
   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 175: {
+case 176: {
   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 176: {
+case 177: {
   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 177: {
+case 178: {
   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 179: {
+case 180: {
   AST::BinaryExpression *node = makeAstNode<AST::BinaryExpression> (driver->nodePool(), sym(1).Expression,
     QSOperator::Lt, sym(3).Expression);
   node->operatorToken = loc(2);
   sym(1).Node = node;
 } break;
 
-case 180: {
+case 181: {
   AST::BinaryExpression *node = makeAstNode<AST::BinaryExpression> (driver->nodePool(), sym(1).Expression,
     QSOperator::Gt, sym(3).Expression);
   node->operatorToken = loc(2);
   sym(1).Node = node;
 } break;
 
-case 181: {
+case 182: {
   AST::BinaryExpression *node = makeAstNode<AST::BinaryExpression> (driver->nodePool(), sym(1).Expression,
     QSOperator::Le, sym(3).Expression);
   node->operatorToken = loc(2);
   sym(1).Node = node;
 } break;
 
-case 182: {
+case 183: {
   AST::BinaryExpression *node = makeAstNode<AST::BinaryExpression> (driver->nodePool(), sym(1).Expression,
    QSOperator::Ge, sym(3).Expression);
   node->operatorToken = loc(2);
   sym(1).Node = node;
 } break;
 
-case 183: {
+case 184: {
   AST::BinaryExpression *node = makeAstNode<AST::BinaryExpression> (driver->nodePool(), sym(1).Expression,
     QSOperator::InstanceOf, sym(3).Expression);
   node->operatorToken = loc(2);
   sym(1).Node = node;
 } break;
 
-case 185: {
+case 186: {
   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 186: {
+case 187: {
   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 187: {
+case 188: {
   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 188: {
+case 189: {
   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 190: {
+case 191: {
   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 191: {
+case 192: {
   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 192: {
+case 193: {
   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 193: {
+case 194: {
   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 195: {
+case 196: {
   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 197: {
+case 198: {
   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 199: {
+case 200: {
   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 201: {
+case 202: {
   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 203: {
+case 204: {
   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 205: {
+case 206: {
   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 207: {
+case 208: {
   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 209: {
+case 210: {
   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 211: {
+case 212: {
   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 213: {
+case 214: {
   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 215: {
+case 216: {
   AST::ConditionalExpression *node = makeAstNode<AST::ConditionalExpression> (driver->nodePool(), sym(1).Expression,
     sym(3).Expression, sym(5).Expression);
   node->questionToken = loc(2);
@@ -1200,7 +1203,7 @@ case 215: {
   sym(1).Node = node;
 } break;
 
-case 217: {
+case 218: {
   AST::ConditionalExpression *node = makeAstNode<AST::ConditionalExpression> (driver->nodePool(), sym(1).Expression,
     sym(3).Expression, sym(5).Expression);
   node->questionToken = loc(2);
@@ -1208,112 +1211,112 @@ case 217: {
   sym(1).Node = node;
 } break;
 
-case 219: {
+case 220: {
   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 221: {
+case 222: {
   AST::BinaryExpression *node = makeAstNode<AST::BinaryExpression> (driver->nodePool(), sym(1).Expression,
     sym(2).ival, sym(3).Expression);
   node->operatorToken = loc(2);
   sym(1).Node = node;
 } break;
 
-case 222: {
+case 223: {
   sym(1).ival = QSOperator::Assign;
 } break;
 
-case 223: {
+case 224: {
   sym(1).ival = QSOperator::InplaceMul;
 } break;
 
-case 224: {
+case 225: {
   sym(1).ival = QSOperator::InplaceDiv;
 } break;
 
-case 225: {
+case 226: {
   sym(1).ival = QSOperator::InplaceMod;
 } break;
 
-case 226: {
+case 227: {
   sym(1).ival = QSOperator::InplaceAdd;
 } break;
 
-case 227: {
+case 228: {
   sym(1).ival = QSOperator::InplaceSub;
 } break;
 
-case 228: {
+case 229: {
   sym(1).ival = QSOperator::InplaceLeftShift;
 } break;
 
-case 229: {
+case 230: {
   sym(1).ival = QSOperator::InplaceRightShift;
 } break;
 
-case 230: {
+case 231: {
   sym(1).ival = QSOperator::InplaceURightShift;
 } break;
 
-case 231: {
+case 232: {
   sym(1).ival = QSOperator::InplaceAnd;
 } break;
 
-case 232: {
+case 233: {
   sym(1).ival = QSOperator::InplaceXor;
 } break;
 
-case 233: {
+case 234: {
   sym(1).ival = QSOperator::InplaceOr;
 } break;
 
-case 235: {
+case 236: {
   AST::Expression *node = makeAstNode<AST::Expression> (driver->nodePool(), sym(1).Expression, sym(3).Expression);
   node->commaToken = loc(2);
   sym(1).Node = node;
 } break;
 
-case 236: {
+case 237: {
   sym(1).Node = 0;
 } break;
 
-case 239: {
+case 240: {
   AST::Expression *node = makeAstNode<AST::Expression> (driver->nodePool(), sym(1).Expression, sym(3).Expression);
   node->commaToken = loc(2);
   sym(1).Node = node;
 } break;
 
-case 240: {
+case 241: {
   sym(1).Node = 0;
 } break;
 
-case 257: {
+case 258: {
   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 258: {
+case 259: {
   sym(1).Node = makeAstNode<AST::StatementList> (driver->nodePool(), sym(1).Statement);
 } break;
 
-case 259: {
+case 260: {
   sym(1).Node = makeAstNode<AST::StatementList> (driver->nodePool(), sym(1).StatementList, sym(2).Statement);
 } break;
 
-case 260: {
+case 261: {
   sym(1).Node = 0;
 } break;
 
-case 261: {
+case 262: {
   sym(1).Node = sym(1).StatementList->finish ();
 } break;
 
-case 263: {
+case 264: {
   AST::VariableStatement *node = makeAstNode<AST::VariableStatement> (driver->nodePool(),
      sym(2).VariableDeclarationList->finish (/*readOnly=*/sym(1).ival == T_CONST));
   node->declarationKindToken = loc(1);
@@ -1321,76 +1324,76 @@ case 263: {
   sym(1).Node = node;
 } break;
 
-case 264: {
+case 265: {
   sym(1).ival = T_CONST;
 } break;
 
-case 265: {
+case 266: {
   sym(1).ival = T_VAR;
 } break;
 
-case 266: {
+case 267: {
   sym(1).Node = makeAstNode<AST::VariableDeclarationList> (driver->nodePool(), sym(1).VariableDeclaration);
 } break;
 
-case 267: {
+case 268: {
   AST::VariableDeclarationList *node = makeAstNode<AST::VariableDeclarationList> (driver->nodePool(),
     sym(1).VariableDeclarationList, sym(3).VariableDeclaration);
   node->commaToken = loc(2);
   sym(1).Node = node;
 } break;
 
-case 268: {
+case 269: {
   sym(1).Node = makeAstNode<AST::VariableDeclarationList> (driver->nodePool(), sym(1).VariableDeclaration);
 } break;
 
-case 269: {
+case 270: {
   sym(1).Node = makeAstNode<AST::VariableDeclarationList> (driver->nodePool(), sym(1).VariableDeclarationList, sym(3).VariableDeclaration);
 } break;
 
-case 270: {
+case 271: {
   AST::VariableDeclaration *node = makeAstNode<AST::VariableDeclaration> (driver->nodePool(), sym(1).sval, sym(2).Expression);
   node->identifierToken = loc(1);
   sym(1).Node = node;
 } break;
 
-case 271: {
+case 272: {
   AST::VariableDeclaration *node = makeAstNode<AST::VariableDeclaration> (driver->nodePool(), sym(1).sval, sym(2).Expression);
   node->identifierToken = loc(1);
   sym(1).Node = node;
 } break;
 
-case 272: {
+case 273: {
   // ### TODO: AST for initializer
   sym(1) = sym(2);
 } break;
 
-case 273: {
+case 274: {
   sym(1).Node = 0;
 } break;
 
-case 275: {
+case 276: {
   // ### TODO: AST for initializer
   sym(1) = sym(2);
 } break;
 
-case 276: {
+case 277: {
   sym(1).Node = 0;
 } break;
 
-case 278: {
+case 279: {
   AST::EmptyStatement *node = makeAstNode<AST::EmptyStatement> (driver->nodePool());
   node->semicolonToken = loc(1);
   sym(1).Node = node;
 } break;
 
-case 280: {
+case 281: {
   AST::ExpressionStatement *node = makeAstNode<AST::ExpressionStatement> (driver->nodePool(), sym(1).Expression);
   node->semicolonToken = loc(2);
   sym(1).Node = node;
 } break;
 
-case 281: {
+case 282: {
   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);
@@ -1399,7 +1402,7 @@ case 281: {
   sym(1).Node = node;
 } break;
 
-case 282: {
+case 283: {
   AST::IfStatement *node = makeAstNode<AST::IfStatement> (driver->nodePool(), sym(3).Expression, sym(5).Statement);
   node->ifToken = loc(1);
   node->lparenToken = loc(2);
@@ -1407,7 +1410,7 @@ case 282: {
   sym(1).Node = node;
 } break;
 
-case 284: {
+case 285: {
   AST::DoWhileStatement *node = makeAstNode<AST::DoWhileStatement> (driver->nodePool(), sym(2).Statement, sym(5).Expression);
   node->doToken = loc(1);
   node->whileToken = loc(3);
@@ -1417,7 +1420,7 @@ case 284: {
   sym(1).Node = node;
 } break;
 
-case 285: {
+case 286: {
   AST::WhileStatement *node = makeAstNode<AST::WhileStatement> (driver->nodePool(), sym(3).Expression, sym(5).Statement);
   node->whileToken = loc(1);
   node->lparenToken = loc(2);
@@ -1425,7 +1428,7 @@ case 285: {
   sym(1).Node = node;
 } break;
 
-case 286: {
+case 287: {
   AST::ForStatement *node = makeAstNode<AST::ForStatement> (driver->nodePool(), sym(3).Expression,
     sym(5).Expression, sym(7).Expression, sym(9).Statement);
   node->forToken = loc(1);
@@ -1436,7 +1439,7 @@ case 286: {
   sym(1).Node = node;
 } break;
 
-case 287: {
+case 288: {
   AST::LocalForStatement *node = makeAstNode<AST::LocalForStatement> (driver->nodePool(),
      sym(4).VariableDeclarationList->finish (/*readOnly=*/false), sym(6).Expression,
      sym(8).Expression, sym(10).Statement);
@@ -1449,7 +1452,7 @@ case 287: {
   sym(1).Node = node;
 } break;
 
-case 288: {
+case 289: {
   AST:: ForEachStatement *node = makeAstNode<AST::ForEachStatement> (driver->nodePool(), sym(3).Expression,
     sym(5).Expression, sym(7).Statement);
   node->forToken = loc(1);
@@ -1459,7 +1462,7 @@ case 288: {
   sym(1).Node = node;
 } break;
 
-case 289: {
+case 290: {
   AST::LocalForEachStatement *node = makeAstNode<AST::LocalForEachStatement> (driver->nodePool(),
     sym(4).VariableDeclaration, sym(6).Expression, sym(8).Statement);
   node->forToken = loc(1);
@@ -1470,14 +1473,14 @@ case 289: {
   sym(1).Node = node;
 } break;
 
-case 291: {
+case 292: {
   AST::ContinueStatement *node = makeAstNode<AST::ContinueStatement> (driver->nodePool());
   node->continueToken = loc(1);
   node->semicolonToken = loc(2);
   sym(1).Node = node;
 } break;
 
-case 293: {
+case 294: {
   AST::ContinueStatement *node = makeAstNode<AST::ContinueStatement> (driver->nodePool(), sym(2).sval);
   node->continueToken = loc(1);
   node->identifierToken = loc(2);
@@ -1485,14 +1488,14 @@ case 293: {
   sym(1).Node = node;
 } break;
 
-case 295: {
+case 296: {
   AST::BreakStatement *node = makeAstNode<AST::BreakStatement> (driver->nodePool());
   node->breakToken = loc(1);
   node->semicolonToken = loc(2);
   sym(1).Node = node;
 } break;
 
-case 297: {
+case 298: {
   AST::BreakStatement *node = makeAstNode<AST::BreakStatement> (driver->nodePool(), sym(2).sval);
   node->breakToken = loc(1);
   node->identifierToken = loc(2);
@@ -1500,14 +1503,14 @@ case 297: {
   sym(1).Node = node;
 } break;
 
-case 299: {
+case 300: {
   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 300: {
+case 301: {
   AST::WithStatement *node = makeAstNode<AST::WithStatement> (driver->nodePool(), sym(3).Expression, sym(5).Statement);
   node->withToken = loc(1);
   node->lparenToken = loc(2);
@@ -1515,7 +1518,7 @@ case 300: {
   sym(1).Node = node;
 } break;
 
-case 301: {
+case 302: {
   AST::SwitchStatement *node = makeAstNode<AST::SwitchStatement> (driver->nodePool(), sym(3).Expression, sym(5).CaseBlock);
   node->switchToken = loc(1);
   node->lparenToken = loc(2);
@@ -1523,90 +1526,90 @@ case 301: {
   sym(1).Node = node;
 } break;
 
-case 302: {
+case 303: {
   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 303: {
+case 304: {
   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 304: {
+case 305: {
   sym(1).Node = makeAstNode<AST::CaseClauses> (driver->nodePool(), sym(1).CaseClause);
 } break;
 
-case 305: {
+case 306: {
   sym(1).Node = makeAstNode<AST::CaseClauses> (driver->nodePool(), sym(1).CaseClauses, sym(2).CaseClause);
 } break;
 
-case 306: {
+case 307: {
   sym(1).Node = 0;
 } break;
 
-case 307: {
+case 308: {
   sym(1).Node = sym(1).CaseClauses->finish ();
 } break;
 
-case 308: {
+case 309: {
   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 309: {
+case 310: {
   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 310:
-case 311: {
+case 311:
+case 312: {
   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 312: {
+case 313: {
   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 314: {
+case 315: {
   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 315: {
+case 316: {
   AST::TryStatement *node = makeAstNode<AST::TryStatement> (driver->nodePool(), sym(2).Statement, sym(3).Catch);
   node->tryToken = loc(1);
   sym(1).Node = node;
 } break;
 
-case 316: {
+case 317: {
   AST::TryStatement *node = makeAstNode<AST::TryStatement> (driver->nodePool(), sym(2).Statement, sym(3).Finally);
   node->tryToken = loc(1);
   sym(1).Node = node;
 } break;
 
-case 317: {
+case 318: {
   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 318: {
+case 319: {
   AST::Catch *node = makeAstNode<AST::Catch> (driver->nodePool(), sym(3).sval, sym(5).Block);
   node->catchToken = loc(1);
   node->lparenToken = loc(2);
@@ -1615,20 +1618,20 @@ case 318: {
   sym(1).Node = node;
 } break;
 
-case 319: {
+case 320: {
   AST::Finally *node = makeAstNode<AST::Finally> (driver->nodePool(), sym(2).Block);
   node->finallyToken = loc(1);
   sym(1).Node = node;
 } break;
 
-case 321: {
+case 322: {
   AST::DebuggerStatement *node = makeAstNode<AST::DebuggerStatement> (driver->nodePool());
   node->debuggerToken = loc(1);
   node->semicolonToken = loc(2);
   sym(1).Node = node;
 } break;
 
-case 322: {
+case 323: {
   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);
@@ -1639,7 +1642,7 @@ case 322: {
   sym(1).Node = node;
 } break;
 
-case 323: {
+case 324: {
   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)
@@ -1651,56 +1654,56 @@ case 323: {
   sym(1).Node = node;
 } break;
 
-case 324: {
+case 325: {
   AST::FormalParameterList *node = makeAstNode<AST::FormalParameterList> (driver->nodePool(), sym(1).sval);
   node->identifierToken = loc(1);
   sym(1).Node = node;
 } break;
 
-case 325: {
+case 326: {
   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 326: {
+case 327: {
   sym(1).Node = 0;
 } break;
 
-case 327: {
+case 328: {
   sym(1).Node = sym(1).FormalParameterList->finish ();
 } break;
 
-case 328: {
+case 329: {
   sym(1).Node = 0;
 } break;
 
-case 330: {
+case 331: {
   sym(1).Node = makeAstNode<AST::FunctionBody> (driver->nodePool(), sym(1).SourceElements->finish ());
 } break;
 
-case 331: {
+case 332: {
   sym(1).Node = makeAstNode<AST::SourceElements> (driver->nodePool(), sym(1).SourceElement);
 } break;
 
-case 332: {
+case 333: {
   sym(1).Node = makeAstNode<AST::SourceElements> (driver->nodePool(), sym(1).SourceElements, sym(2).SourceElement);
 } break;
 
-case 333: {
+case 334: {
   sym(1).Node = makeAstNode<AST::StatementSourceElement> (driver->nodePool(), sym(1).Statement);
 } break;
 
-case 334: {
+case 335: {
   sym(1).Node = makeAstNode<AST::FunctionSourceElement> (driver->nodePool(), sym(1).FunctionDeclaration);
 } break;
 
-case 335: {
+case 336: {
   sym(1).sval = 0;
 } break;
 
-case 337: {
+case 338: {
   sym(1).Node = 0;
 } break;
 
@@ -1795,7 +1798,8 @@ case 337: {
 
         for (int tk = 1; tk < TERMINAL_COUNT; ++tk) {
             if (tk == T_AUTOMATIC_SEMICOLON || tk == T_FEED_UI_PROGRAM    ||
-                tk == T_FEED_JS_STATEMENT   || tk == T_FEED_JS_EXPRESSION)
+                tk == T_FEED_JS_STATEMENT   || tk == T_FEED_JS_EXPRESSION ||
+                tk == T_FEED_JS_SOURCE_ELEMENT)
                continue;
 
             int a = t_action(errorState, tk);
diff --git a/src/shared/qmljs/parser/qmljsparser_p.h b/src/shared/qmljs/parser/qmljsparser_p.h
index 2cefb5cd164..2a09a633cc7 100644
--- a/src/shared/qmljs/parser/qmljsparser_p.h
+++ b/src/shared/qmljs/parser/qmljsparser_p.h
@@ -1,8 +1,6 @@
-// This file was generated by qlalr - DO NOT EDIT!
-
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
@@ -41,6 +39,7 @@
 **
 ****************************************************************************/
 
+
 //
 //  W A R N I N G
 //  -------------
@@ -133,6 +132,7 @@ public:
     bool parse() { return parse(T_FEED_UI_PROGRAM); }
     bool parseStatement() { return parse(T_FEED_JS_STATEMENT); }
     bool parseExpression() { return parse(T_FEED_JS_EXPRESSION); }
+    bool parseSourceElement() { return parse(T_FEED_JS_SOURCE_ELEMENT); }
     bool parseUiObjectMember() { return parse(T_FEED_UI_OBJECT_MEMBER); }
 
     AST::UiProgram *ast() const
@@ -231,9 +231,9 @@ protected:
 
 
 
-#define J_SCRIPT_REGEXPLITERAL_RULE1 72
+#define J_SCRIPT_REGEXPLITERAL_RULE1 73
 
-#define J_SCRIPT_REGEXPLITERAL_RULE2 73
+#define J_SCRIPT_REGEXPLITERAL_RULE2 74
 
 QT_QML_END_NAMESPACE
 
-- 
GitLab