Update the copy of the Qml parser

The files here are a copy of the parser from the qtdeclarative repository.
This patch combines commit cfff375afcfe63d25b3c1904ff58a90bcd1edb43 and
f876562de8eb978cea39fe72e76c49ae51ff2f97 from the qtdeclarative repository to
fix the license and allow for read-only object property syntax.

Change-Id: Idb58948cede2cd47858e3831785009f8b7ea2169
Reviewed-by: Martin Smith <martin.smith@digia.com>

5 files changed, 1105 insertions, 1078 deletions

diff --git a/src/tools/qdoc/qmlparser/qqmljs.g b/src/tools/qdoc/qmlparser/qqmljs.g
index de4fec4d56..616e3b3166 100644
--- a/src/tools/qdoc/qmlparser/qqmljs.g
+++ b/src/tools/qdoc/qmlparser/qqmljs.g
@@ -1,21 +1,31 @@
 ----------------------------------------------------------------------------
 --
--- Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
+-- Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies).
 -- Contact: http://www.qt-project.org/legal
 --
 -- This file is part of the QtQml module of the Qt Toolkit.
 --
--- $QT_BEGIN_LICENSE:LGPL-ONLY$
+-- $QT_BEGIN_LICENSE:LGPL21$
+-- Commercial License Usage
+-- Licensees holding valid commercial Qt licenses may use this file in
+-- accordance with the commercial license agreement provided with the
+-- Software or, alternatively, in accordance with the terms contained in
+-- a written agreement between you and Digia. For licensing terms and
+-- conditions see http://qt.digia.com/licensing. For further information
+-- use the contact form at http://qt.digia.com/contact-us.
+--
 -- GNU Lesser General Public License Usage
--- 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.
+-- Alternatively, this file may be used under the terms of the GNU Lesser
+-- General Public License version 2.1 or version 3 as published by the Free
+-- Software Foundation and appearing in the file LICENSE.LGPLv21 and
+-- LICENSE.LGPLv3 included in the packaging of this file. Please review the
+-- following information to ensure the GNU Lesser General Public License
+-- requirements will be met: https://www.gnu.org/licenses/lgpl.html and
+-- http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
 --
--- If you have questions regarding the use of this file, please contact
--- us via http://www.qt-project.org/.
+-- In addition, as a special exception, Digia gives you certain additional
+-- rights. These rights are described in the Digia Qt LGPL Exception
+-- version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
 --
 -- $QT_END_LICENSE$
 --
@@ -89,41 +99,33 @@
 
 /./****************************************************************************
 **
-** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
+** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies).
 ** Contact: http://www.qt-project.org/legal
 **
 ** This file is part of the QtQml module of the Qt Toolkit.
 **
-** $QT_BEGIN_LICENSE:LGPL$
+** $QT_BEGIN_LICENSE:LGPL21$
 ** Commercial License Usage
 ** Licensees holding valid commercial Qt licenses may use this file in
 ** accordance with the commercial license agreement provided with the
 ** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and Digia.  For licensing terms and
-** conditions see http://qt.digia.com/licensing.  For further information
+** a written agreement between you and Digia. For licensing terms and
+** conditions see http://qt.digia.com/licensing. For further information
 ** use the contact form at http://qt.digia.com/contact-us.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 2.1 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL included in the
-** packaging of this file.  Please review the following information to
-** ensure the GNU Lesser General Public License version 2.1 requirements
-** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+** General Public License version 2.1 or version 3 as published by the Free
+** Software Foundation and appearing in the file LICENSE.LGPLv21 and
+** LICENSE.LGPLv3 included in the packaging of this file. Please review the
+** following information to ensure the GNU Lesser General Public License
+** requirements will be met: https://www.gnu.org/licenses/lgpl.html and
+** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
 **
 ** In addition, as a special exception, Digia gives you certain additional
-** rights.  These rights are described in the Digia Qt LGPL Exception
+** rights. These rights are described in the Digia Qt LGPL Exception
 ** version 1.1, 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.
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
@@ -142,41 +144,33 @@
 
 /:/****************************************************************************
 **
-** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
+** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies).
 ** Contact: http://www.qt-project.org/legal
 **
 ** This file is part of the QtQml module of the Qt Toolkit.
 **
-** $QT_BEGIN_LICENSE:LGPL$
+** $QT_BEGIN_LICENSE:LGPL21$
 ** Commercial License Usage
 ** Licensees holding valid commercial Qt licenses may use this file in
 ** accordance with the commercial license agreement provided with the
 ** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and Digia.  For licensing terms and
-** conditions see http://qt.digia.com/licensing.  For further information
+** a written agreement between you and Digia. For licensing terms and
+** conditions see http://qt.digia.com/licensing. For further information
 ** use the contact form at http://qt.digia.com/contact-us.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 2.1 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL included in the
-** packaging of this file.  Please review the following information to
-** ensure the GNU Lesser General Public License version 2.1 requirements
-** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+** General Public License version 2.1 or version 3 as published by the Free
+** Software Foundation and appearing in the file LICENSE.LGPLv21 and
+** LICENSE.LGPLv3 included in the packaging of this file. Please review the
+** following information to ensure the GNU Lesser General Public License
+** requirements will be met: https://www.gnu.org/licenses/lgpl.html and
+** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
 **
 ** In addition, as a special exception, Digia gives you certain additional
-** rights.  These rights are described in the Digia Qt LGPL Exception
+** rights. These rights are described in the Digia Qt LGPL Exception
 ** version 1.1, 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.
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
@@ -1090,6 +1084,31 @@ case $rule_number: {
 }   break;
 ./
 
+UiObjectMember: T_READONLY T_PROPERTY UiPropertyType JsIdentifier T_COLON UiQualifiedId UiObjectInitializer ;
+/.
+case $rule_number: {
+    AST::UiPublicMember *node = new (pool) AST::UiPublicMember(stringRef(3), stringRef(4));
+    node->isReadonlyMember = true;
+    node->readonlyToken = loc(1);
+    node->propertyToken = loc(2);
+    node->typeToken = loc(3);
+    node->identifierToken = loc(4);
+    node->semicolonToken = loc(5); // insert a fake ';' before ':'
+
+    AST::UiQualifiedId *propertyName = new (pool) AST::UiQualifiedId(stringRef(4));
+    propertyName->identifierToken = loc(4);
+    propertyName->next = 0;
+
+    AST::UiObjectBinding *binding = new (pool) AST::UiObjectBinding(
+      propertyName, sym(6).UiQualifiedId, sym(7).UiObjectInitializer);
+    binding->colonToken = loc(5);
+
+    node->binding = binding;
+
+    sym(1).Node = node;
+}   break;
+./
+
 UiObjectMember: FunctionDeclaration ;
 /.
 case $rule_number: {
diff --git a/src/tools/qdoc/qmlparser/qqmljsgrammar.cpp b/src/tools/qdoc/qmlparser/qqmljsgrammar.cpp
index d3fb3f8d1f..2600a5e14c 100644
--- a/src/tools/qdoc/qmlparser/qqmljsgrammar.cpp
+++ b/src/tools/qdoc/qmlparser/qqmljsgrammar.cpp
@@ -57,35 +57,35 @@ const short QQmlJSGrammar::lhs [] = {
   130, 130, 130, 130, 130, 130, 130, 111, 138, 138, 
   138, 139, 139, 140, 140, 111, 111, 111, 111, 111, 
   111, 111, 111, 111, 111, 111, 111, 111, 111, 111, 
-  111, 111, 124, 124, 124, 124, 124, 124, 124, 143, 
+  111, 111, 111, 124, 124, 124, 124, 124, 124, 124, 
   143, 143, 143, 143, 143, 143, 143, 143, 143, 143, 
-  143, 143, 143, 143, 143, 143, 143, 129, 145, 145, 
-  145, 145, 144, 144, 149, 149, 149, 147, 147, 150, 
-  150, 150, 150, 153, 153, 153, 153, 153, 153, 153, 
+  143, 143, 143, 143, 143, 143, 143, 143, 129, 145, 
+  145, 145, 145, 144, 144, 149, 149, 149, 147, 147, 
+  150, 150, 150, 150, 153, 153, 153, 153, 153, 153, 
   153, 153, 153, 153, 153, 153, 153, 153, 153, 153, 
   153, 153, 153, 153, 153, 153, 153, 153, 153, 153, 
-  153, 153, 153, 153, 154, 154, 120, 120, 120, 120, 
-  120, 157, 157, 158, 158, 158, 158, 156, 156, 159, 
-  159, 160, 160, 161, 161, 161, 162, 162, 162, 162, 
-  162, 162, 162, 162, 162, 162, 163, 163, 163, 163, 
-  164, 164, 164, 165, 165, 165, 165, 166, 166, 166, 
-  166, 166, 166, 166, 167, 167, 167, 167, 167, 167, 
-  168, 168, 168, 168, 168, 169, 169, 169, 169, 169, 
-  170, 170, 171, 171, 172, 172, 173, 173, 174, 174, 
-  175, 175, 176, 176, 177, 177, 178, 178, 179, 179, 
-  180, 180, 181, 181, 148, 148, 182, 182, 183, 183, 
+  153, 153, 153, 153, 153, 154, 154, 120, 120, 120, 
+  120, 120, 157, 157, 158, 158, 158, 158, 156, 156, 
+  159, 159, 160, 160, 161, 161, 161, 162, 162, 162, 
+  162, 162, 162, 162, 162, 162, 162, 163, 163, 163, 
+  163, 164, 164, 164, 165, 165, 165, 165, 166, 166, 
+  166, 166, 166, 166, 166, 167, 167, 167, 167, 167, 
+  167, 168, 168, 168, 168, 168, 169, 169, 169, 169, 
+  169, 170, 170, 171, 171, 172, 172, 173, 173, 174, 
+  174, 175, 175, 176, 176, 177, 177, 178, 178, 179, 
+  179, 180, 180, 181, 181, 148, 148, 182, 182, 183, 
   183, 183, 183, 183, 183, 183, 183, 183, 183, 183, 
-  109, 109, 184, 184, 185, 185, 186, 186, 108, 108, 
+  183, 109, 109, 184, 184, 185, 185, 186, 186, 108, 
   108, 108, 108, 108, 108, 108, 108, 108, 108, 108, 
-  108, 108, 108, 131, 195, 195, 194, 194, 142, 142, 
-  196, 196, 197, 197, 199, 199, 198, 200, 203, 201, 
-  201, 204, 202, 202, 132, 133, 133, 134, 134, 187, 
-  187, 187, 187, 187, 187, 187, 187, 188, 188, 188, 
-  188, 189, 189, 189, 189, 190, 190, 135, 136, 205, 
-  205, 208, 208, 206, 206, 209, 207, 191, 192, 192, 
-  137, 137, 137, 210, 211, 193, 193, 212, 141, 155, 
-  155, 213, 213, 152, 152, 151, 151, 214, 112, 112, 
-  215, 215, 110, 110, 146, 146, 216};
+  108, 108, 108, 108, 131, 195, 195, 194, 194, 142, 
+  142, 196, 196, 197, 197, 199, 199, 198, 200, 203, 
+  201, 201, 204, 202, 202, 132, 133, 133, 134, 134, 
+  187, 187, 187, 187, 187, 187, 187, 187, 188, 188, 
+  188, 188, 189, 189, 189, 189, 190, 190, 135, 136, 
+  205, 205, 208, 208, 206, 206, 209, 207, 191, 192, 
+  192, 137, 137, 137, 210, 211, 193, 193, 212, 141, 
+  155, 155, 213, 213, 152, 152, 151, 151, 214, 112, 
+  112, 215, 215, 110, 110, 146, 146, 216};
 
 const short QQmlJSGrammar::rhs [] = {
   2, 2, 2, 2, 2, 2, 2, 1, 1, 1, 
@@ -95,110 +95,110 @@ const short QQmlJSGrammar::rhs [] = {
   1, 1, 1, 1, 1, 1, 1, 3, 1, 1, 
   1, 0, 1, 2, 4, 6, 6, 3, 3, 7, 
   7, 4, 4, 5, 5, 5, 6, 6, 10, 6, 
+  7, 1, 1, 1, 1, 1, 1, 1, 1, 1, 
   1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 
-  1, 1, 1, 1, 1, 1, 1, 1, 1, 2, 
-  3, 3, 4, 5, 3, 4, 3, 1, 1, 2, 
-  3, 4, 1, 2, 3, 7, 8, 1, 3, 1, 
+  2, 3, 3, 4, 5, 3, 4, 3, 1, 1, 
+  2, 3, 4, 1, 2, 3, 7, 8, 1, 3, 
   1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 
   1, 1, 1, 1, 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, 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, 3, 0, 1, 1, 3, 0, 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, 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, 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, 4, 5, 2, 2, 2, 1, 8, 8, 
-  7, 1, 3, 0, 1, 0, 1, 1, 1, 1, 
-  1, 2, 1, 1, 0, 1, 2};
+  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, 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, 4, 5, 2, 2, 2, 1, 8, 
+  8, 7, 1, 3, 0, 1, 0, 1, 1, 1, 
+  1, 1, 2, 1, 1, 0, 1, 2};
 
 const short QQmlJSGrammar::action_default [] = {
-  0, 0, 28, 0, 0, 0, 28, 0, 184, 251, 
-  215, 223, 219, 163, 235, 211, 3, 148, 81, 164, 
-  227, 231, 152, 181, 162, 167, 147, 201, 188, 0, 
-  88, 89, 84, 0, 78, 73, 355, 0, 0, 0, 
-  0, 86, 0, 0, 82, 85, 77, 0, 0, 74, 
-  76, 79, 75, 87, 80, 0, 83, 0, 0, 177, 
-  0, 0, 164, 183, 166, 165, 0, 0, 0, 179, 
-  180, 178, 182, 0, 212, 0, 0, 0, 0, 202, 
-  0, 0, 0, 0, 0, 0, 192, 0, 0, 0, 
-  186, 187, 185, 190, 194, 193, 191, 189, 204, 203, 
-  205, 0, 220, 0, 216, 0, 0, 158, 145, 157, 
-  146, 114, 115, 116, 141, 117, 142, 118, 119, 120, 
-  121, 122, 123, 124, 125, 126, 127, 128, 129, 130, 
-  143, 131, 132, 133, 134, 135, 136, 137, 138, 139, 
-  140, 144, 0, 0, 156, 252, 159, 0, 160, 0, 
-  161, 155, 0, 248, 241, 239, 246, 247, 245, 244, 
-  250, 243, 242, 240, 249, 236, 0, 224, 0, 0, 
-  228, 0, 0, 232, 0, 0, 158, 150, 0, 149, 
-  0, 154, 168, 0, 344, 344, 345, 0, 342, 0, 
-  343, 0, 346, 259, 266, 265, 273, 261, 0, 262, 
-  0, 347, 0, 354, 263, 264, 81, 269, 267, 351, 
-  348, 353, 270, 0, 281, 0, 0, 0, 0, 338, 
-  0, 355, 253, 295, 0, 0, 0, 282, 0, 0, 
-  271, 272, 0, 260, 268, 296, 297, 0, 344, 0, 
-  0, 346, 0, 339, 340, 0, 328, 352, 0, 312, 
-  313, 314, 315, 0, 308, 309, 310, 311, 336, 337, 
-  0, 0, 0, 0, 0, 300, 301, 302, 257, 255, 
-  217, 225, 221, 237, 213, 258, 0, 164, 229, 233, 
-  206, 195, 0, 0, 214, 0, 0, 0, 0, 207, 
-  0, 0, 0, 0, 0, 199, 197, 200, 198, 196, 
-  209, 208, 210, 0, 222, 0, 218, 0, 256, 164, 
-  0, 238, 253, 254, 0, 253, 0, 0, 304, 0, 
-  0, 0, 306, 0, 226, 0, 0, 230, 0, 0, 
-  234, 293, 0, 285, 294, 288, 0, 292, 0, 253, 
-  286, 0, 253, 0, 0, 305, 0, 0, 0, 307, 
-  0, 0, 0, 299, 0, 298, 81, 108, 356, 0, 
-  0, 113, 275, 278, 0, 114, 281, 117, 142, 119, 
-  120, 84, 124, 125, 78, 126, 129, 82, 85, 253, 
-  79, 87, 132, 80, 134, 83, 136, 137, 282, 139, 
-  140, 144, 0, 110, 109, 112, 96, 111, 95, 0, 
-  105, 276, 274, 0, 0, 0, 346, 0, 106, 152, 
-  153, 158, 0, 151, 0, 316, 317, 0, 344, 0, 
-  0, 346, 0, 107, 0, 0, 0, 319, 324, 322, 
-  325, 0, 0, 323, 324, 0, 320, 0, 321, 277, 
-  327, 0, 277, 326, 0, 329, 330, 0, 277, 331, 
-  332, 0, 0, 333, 0, 0, 0, 334, 335, 170, 
-  169, 0, 0, 0, 303, 0, 0, 0, 318, 290, 
-  283, 0, 291, 287, 0, 289, 279, 0, 280, 284, 
-  0, 0, 346, 0, 341, 99, 0, 0, 103, 90, 
-  0, 92, 101, 0, 93, 102, 104, 94, 100, 91, 
-  0, 97, 174, 172, 176, 173, 171, 175, 349, 6, 
-  350, 4, 2, 71, 98, 0, 0, 74, 76, 75, 
-  37, 5, 0, 72, 0, 51, 50, 49, 0, 0, 
+  0, 0, 28, 0, 0, 0, 28, 0, 185, 252, 
+  216, 224, 220, 164, 236, 212, 3, 149, 82, 165, 
+  228, 232, 153, 182, 163, 168, 148, 202, 189, 0, 
+  89, 90, 85, 0, 79, 74, 356, 0, 0, 0, 
+  0, 87, 0, 0, 83, 86, 78, 0, 0, 75, 
+  77, 80, 76, 88, 81, 0, 84, 0, 0, 178, 
+  0, 0, 165, 184, 167, 166, 0, 0, 0, 180, 
+  181, 179, 183, 0, 213, 0, 0, 0, 0, 203, 
+  0, 0, 0, 0, 0, 0, 193, 0, 0, 0, 
+  187, 188, 186, 191, 195, 194, 192, 190, 205, 204, 
+  206, 0, 221, 0, 217, 0, 0, 159, 146, 158, 
+  147, 115, 116, 117, 142, 118, 143, 119, 120, 121, 
+  122, 123, 124, 125, 126, 127, 128, 129, 130, 131, 
+  144, 132, 133, 134, 135, 136, 137, 138, 139, 140, 
+  141, 145, 0, 0, 157, 253, 160, 0, 161, 0, 
+  162, 156, 0, 249, 242, 240, 247, 248, 246, 245, 
+  251, 244, 243, 241, 250, 237, 0, 225, 0, 0, 
+  229, 0, 0, 233, 0, 0, 159, 151, 0, 150, 
+  0, 155, 169, 0, 345, 345, 346, 0, 343, 0, 
+  344, 0, 347, 260, 267, 266, 274, 262, 0, 263, 
+  0, 348, 0, 355, 264, 265, 82, 270, 268, 352, 
+  349, 354, 271, 0, 282, 0, 0, 0, 0, 339, 
+  0, 356, 254, 296, 0, 0, 0, 283, 0, 0, 
+  272, 273, 0, 261, 269, 297, 298, 0, 345, 0, 
+  0, 347, 0, 340, 341, 0, 329, 353, 0, 313, 
+  314, 315, 316, 0, 309, 310, 311, 312, 337, 338, 
+  0, 0, 0, 0, 0, 301, 302, 303, 258, 256, 
+  218, 226, 222, 238, 214, 259, 0, 165, 230, 234, 
+  207, 196, 0, 0, 215, 0, 0, 0, 0, 208, 
+  0, 0, 0, 0, 0, 200, 198, 201, 199, 197, 
+  210, 209, 211, 0, 223, 0, 219, 0, 257, 165, 
+  0, 239, 254, 255, 0, 254, 0, 0, 305, 0, 
+  0, 0, 307, 0, 227, 0, 0, 231, 0, 0, 
+  235, 294, 0, 286, 295, 289, 0, 293, 0, 254, 
+  287, 0, 254, 0, 0, 306, 0, 0, 0, 308, 
+  0, 0, 0, 300, 0, 299, 82, 109, 357, 0, 
+  0, 114, 276, 279, 0, 115, 282, 118, 143, 120, 
+  121, 85, 125, 126, 79, 127, 130, 83, 86, 254, 
+  80, 88, 133, 81, 135, 84, 137, 138, 283, 140, 
+  141, 145, 0, 111, 110, 113, 97, 112, 96, 0, 
+  106, 277, 275, 0, 0, 0, 347, 0, 107, 153, 
+  154, 159, 0, 152, 0, 317, 318, 0, 345, 0, 
+  0, 347, 0, 108, 0, 0, 0, 320, 325, 323, 
+  326, 0, 0, 324, 325, 0, 321, 0, 322, 278, 
+  328, 0, 278, 327, 0, 330, 331, 0, 278, 332, 
+  333, 0, 0, 334, 0, 0, 0, 335, 336, 171, 
+  170, 0, 0, 0, 304, 0, 0, 0, 319, 291, 
+  284, 0, 292, 288, 0, 290, 280, 0, 281, 285, 
+  0, 0, 347, 0, 342, 100, 0, 0, 104, 91, 
+  0, 93, 102, 0, 94, 103, 105, 95, 101, 92, 
+  0, 98, 175, 173, 177, 174, 172, 176, 350, 6, 
+  351, 4, 2, 72, 99, 0, 0, 75, 77, 76, 
+  37, 5, 0, 73, 0, 51, 50, 49, 0, 0, 
   64, 0, 65, 41, 42, 43, 44, 46, 47, 68, 
   45, 0, 51, 0, 0, 0, 0, 0, 60, 0, 
   61, 0, 0, 32, 0, 0, 69, 33, 0, 36, 
-  34, 30, 0, 35, 31, 0, 62, 0, 63, 152, 
-  0, 66, 70, 0, 0, 0, 0, 67, 0, 58, 
+  34, 30, 0, 35, 31, 0, 62, 0, 63, 153, 
+  0, 66, 70, 0, 0, 0, 0, 153, 278, 0, 
+  67, 82, 115, 282, 118, 143, 120, 121, 85, 125, 
+  126, 127, 130, 83, 86, 254, 88, 133, 81, 135, 
+  84, 137, 138, 283, 140, 141, 145, 71, 0, 58, 
   52, 59, 53, 0, 0, 0, 0, 55, 0, 56, 
-  57, 54, 0, 0, 152, 277, 0, 0, 48, 81, 
-  114, 281, 117, 142, 119, 120, 84, 124, 125, 126, 
-  129, 82, 85, 253, 87, 132, 80, 134, 83, 136, 
-  137, 282, 139, 140, 144, 0, 38, 39, 0, 40, 
-  8, 0, 0, 9, 0, 11, 0, 10, 0, 1, 
-  27, 15, 14, 26, 13, 12, 29, 7, 0, 18, 
-  0, 19, 0, 24, 25, 0, 20, 21, 0, 22, 
-  23, 16, 17, 357};
+  57, 54, 0, 0, 0, 0, 48, 0, 38, 39, 
+  0, 40, 8, 0, 0, 9, 0, 11, 0, 10, 
+  0, 1, 27, 15, 14, 26, 13, 12, 29, 7, 
+  0, 18, 0, 19, 0, 24, 25, 0, 20, 21, 
+  0, 22, 23, 16, 17, 358};
 
 const short QQmlJSGrammar::goto_default [] = {
-  7, 639, 211, 198, 209, 521, 509, 634, 647, 508, 
-  633, 637, 635, 643, 22, 640, 638, 636, 18, 520, 
+  7, 641, 211, 198, 209, 521, 509, 636, 649, 508, 
+  635, 639, 637, 645, 22, 642, 640, 638, 18, 520, 
   562, 552, 559, 554, 539, 193, 197, 199, 204, 234, 
-  212, 231, 543, 583, 582, 203, 233, 26, 487, 486, 
+  212, 231, 543, 613, 612, 203, 233, 26, 487, 486, 
   359, 358, 9, 357, 360, 202, 480, 361, 109, 17, 
   147, 24, 13, 146, 19, 25, 59, 23, 8, 28, 
   27, 280, 15, 274, 10, 270, 12, 272, 11, 271, 
@@ -209,295 +209,267 @@ const short QQmlJSGrammar::goto_default [] = {
   0};
 
 const short QQmlJSGrammar::action_index [] = {
-  239, 1406, 2692, 2692, 2794, 1119, 115, 29, 168, -106, 
-  26, -23, -60, 225, -106, 306, 33, -106, -106, 732, 
-  -2, 145, 243, 223, -106, -106, -106, 379, 227, 1406, 
-  -106, -106, -106, 539, -106, -106, 2488, 1698, 1406, 1406, 
-  1406, -106, 1023, 1406, -106, -106, -106, 1406, 1406, -106, 
-  -106, -106, -106, -106, -106, 1406, -106, 1406, 1406, -106, 
-  1406, 1406, 114, 206, -106, -106, 1406, 1406, 1406, -106, 
-  -106, -106, 211, 1406, 302, 1406, 1406, 1406, 1406, 369, 
-  1406, 1406, 1406, 1406, 1406, 1406, 226, 1406, 1406, 1406, 
-  135, 151, 110, 257, 279, 276, 256, 222, 475, 475, 
-  475, 1406, 7, 1406, 57, 2284, 1406, 1406, -106, -106, 
+  264, 1225, 2708, 2708, 2606, 938, 94, 104, 119, -106, 
+  92, 79, 81, 262, -106, 263, 78, -106, -106, 654, 
+  89, 125, 259, 229, -106, -106, -106, 322, 314, 1225, 
+  -106, -106, -106, 412, -106, -106, 2300, 1713, 1225, 1225, 
+  1225, -106, 842, 1225, -106, -106, -106, 1225, 1225, -106, 
+  -106, -106, -106, -106, -106, 1225, -106, 1225, 1225, -106, 
+  1225, 1225, 141, 216, -106, -106, 1225, 1225, 1225, -106, 
+  -106, -106, 209, 1225, 281, 1225, 1225, 1225, 1225, 367, 
+  1225, 1225, 1225, 1225, 1225, 1225, 219, 1225, 1225, 1225, 
+  101, 102, 115, 314, 314, 314, 314, 314, 357, 347, 
+  337, 1225, 71, 1225, 70, 2198, 1225, 1225, -106, -106, 
   -106, -106, -106, -106, -106, -106, -106, -106, -106, -106, 
   -106, -106, -106, -106, -106, -106, -106, -106, -106, -106, 
   -106, -106, -106, -106, -106, -106, -106, -106, -106, -106, 
-  -106, -106, 136, 1406, -106, -106, 30, -24, -106, 1406, 
-  -106, -106, 1406, -106, -106, -106, -106, -106, -106, -106, 
-  -106, -106, -106, -106, -106, -106, 1406, 2, 1406, 1406, 
-  10, 97, 1406, -106, 2284, 1406, 1406, -106, 141, -106, 
-  -45, -106, -106, 4, 457, 386, 89, 79, -106, 448, 
-  -106, 74, 2692, -106, -106, -106, -106, -106, 164, -106, 
-  460, -106, 85, -106, -106, -106, 96, -106, -106, -106, 
-  2692, -106, -106, 547, -106, 629, 143, 2794, 62, 54, 
-  43, 2998, 1406, -106, 51, 1406, 52, -106, 47, 45, 
-  -106, -106, 454, -106, -106, -106, -106, 64, 352, 31, 
-  61, 2692, 27, -106, -106, 2794, -106, -106, 139, -106, 
-  -106, -106, -106, 126, -106, -106, -106, -106, -106, -106, 
-  -6, 25, 1406, 130, 159, -106, -106, -106, 1600, -106, 
-  68, 65, 5, -106, 308, 60, 3, 835, 99, 105, 
-  337, 207, 408, 1406, 317, 1406, 1406, 1406, 1406, 353, 
-  1406, 1406, 1406, 1406, 1406, 186, 203, 204, 212, 219, 
-  333, 343, 359, 1406, 20, 1406, 202, 1406, -106, 732, 
-  1406, -106, 1406, 81, 72, 1406, 77, 2794, -106, 1406, 
-  149, 2794, -106, 1406, 80, 1406, 1406, 94, 88, 1406, 
-  -106, -8, 128, -25, -106, -106, 1406, -106, 471, 1406, 
-  -106, -53, 1406, -56, 2794, -106, 1406, 134, 2794, -106, 
-  1406, 138, 2794, -5, 2794, -106, -4, -106, 9, -9, 
-  37, -106, -106, 2794, -12, 555, 32, 629, 123, 1406, 
-  2794, 41, 18, 504, 2386, 21, 1023, 49, 46, 1505, 
-  2386, 42, 16, 44, 1406, 24, -10, 1406, 17, 1406, 
-  -15, -18, 2590, -106, -106, -106, -106, -106, -106, 1406, 
-  -106, -106, -106, -1, -26, -3, 2692, -27, -106, 277, 
-  -106, 1406, -28, -106, 90, -106, -106, 1, 552, -40, 
-  -11, 2692, -29, -106, 1406, 117, 14, -106, 50, -106, 
-  40, 119, 1406, -106, 11, 35, -106, -54, -106, 2794, 
-  -106, 116, 2794, -106, 267, -106, -106, 121, 2794, -7, 
-  -106, -31, -19, -106, 376, 6, 78, -106, -106, -106, 
-  -106, 1406, 98, 2794, -106, 1406, 106, 2794, -106, 76, 
-  -106, 254, -106, -106, 1406, -106, -106, 552, -106, -106, 
-  71, 75, 2692, 67, -106, -106, 122, 1992, -106, -106, 
-  1796, -106, -106, 1894, -106, -106, -106, -106, -106, -106, 
-  113, -106, -106, -106, -106, -106, -106, -106, -106, -106, 
-  2692, -106, -106, -106, 111, 22, 929, 152, 39, 48, 
-  -106, -106, 301, -106, 147, -106, -106, -106, 468, 155, 
-  -106, 2182, -106, -106, -106, -106, -106, -106, -106, -106, 
-  -106, 178, -30, 463, 181, -14, 400, 229, -106, -32, 
-  -106, 929, 104, -106, 0, 929, -106, -106, 1311, -106, 
-  -106, -106, 1215, -106, -106, 248, -106, 2182, -106, 392, 
-  59, -106, -106, 244, 552, 73, 2182, -106, 236, -106, 
-  237, -106, 70, 15, 368, 214, 355, -106, 103, -106, 
-  -106, -106, 2087, 721, 392, 2896, 1698, 34, -106, 56, 
-  598, 55, 629, 107, 1406, 2794, 53, 23, 544, 36, 
-  1023, 58, 66, 1505, 69, 38, 63, 1406, 95, 84, 
-  1406, 102, 1406, 83, 82, 124, -106, -106, 87, -106, 
-  -106, 929, 813, 91, 929, -106, 271, -106, 86, -106, 
-  -106, 100, 101, -106, -106, -106, -106, -106, 552, -106, 
-  209, -106, 109, -106, -106, 552, -106, -106, 92, -106, 
-  -106, -106, -106, -106, 
+  -106, -106, 98, 1225, -106, -106, 66, 65, -106, 1225, 
+  -106, -106, 1225, -106, -106, -106, -106, -106, -106, -106, 
+  -106, -106, -106, -106, -106, -106, 1225, 44, 1225, 1225, 
+  64, 57, 1225, -106, 2198, 1225, 1225, -106, 137, -106, 
+  49, -106, -106, 93, 344, 474, 95, 86, -106, 390, 
+  -106, 85, 2708, -106, -106, -106, -106, -106, 189, -106, 
+  474, -106, 80, -106, -106, -106, 83, -106, -106, -106, 
+  2708, -106, -106, 490, -106, 551, 130, 2606, 46, 51, 
+  52, 2912, 1225, -106, 63, 1225, 56, -106, 58, 60, 
+  -106, -106, 474, -106, -106, -106, -106, 61, 474, 62, 
+  67, 2708, 68, -106, -106, 2606, -106, -106, 87, -106, 
+  -106, -106, -106, 110, -106, -106, -106, -106, -106, -106, 
+  -24, 69, 1225, 122, 143, -106, -106, -106, 1419, -106, 
+  74, 76, 77, -106, 269, 73, 72, 611, 75, 114, 
+  397, 314, 474, 1225, 287, 1225, 1225, 1225, 1225, 397, 
+  1225, 1225, 1225, 1225, 1225, 218, 215, 198, 192, 182, 
+  397, 397, 312, 1225, 55, 1225, 59, 1225, -106, 654, 
+  1225, -106, 1225, 54, 53, 1225, 50, 2606, -106, 1225, 
+  124, 2606, -106, 1225, 90, 1225, 1225, 105, 88, 1225, 
+  -106, 84, 157, -27, -106, -106, 1225, -106, 474, 1225, 
+  -106, 82, 1225, 91, 2606, -106, 1225, 120, 2606, -106, 
+  1225, 103, 2606, -9, 2606, -106, -2, -106, 11, -30, 
+  17, -106, -106, 2606, -37, 469, 15, 551, 138, 1225, 
+  2606, 14, -16, 433, 2402, -20, 842, 6, 5, 1324, 
+  2402, 4, -36, 2, 1225, 7, -18, 1225, 10, 1225, 
+  -26, -13, 2504, -106, -106, -106, -106, -106, -106, 1225, 
+  -106, -106, -106, -33, -59, -25, 2708, 23, -106, 197, 
+  -106, 1225, -12, -106, 140, -106, -106, 22, 474, -4, 
+  26, 2708, 12, -106, 1225, 113, 30, -106, 142, -106, 
+  142, 121, 1225, -106, -3, 45, -106, -5, -106, 2606, 
+  -106, 108, 2606, -106, 207, -106, -106, 106, 2606, 37, 
+  -106, 25, 36, -106, 474, 38, 40, -106, -106, -106, 
+  -106, 1225, 136, 2606, -106, 1225, 166, 2606, -106, 13, 
+  -106, 200, -106, -106, 1225, -106, -106, 474, -106, -106, 
+  -17, 16, 2708, -11, -106, -106, 131, 1811, -106, -106, 
+  1615, -106, -106, 1517, -106, -106, -106, -106, -106, -106, 
+  109, -106, -106, -106, -106, -106, -106, -106, -106, -106, 
+  2708, -106, -106, -106, 233, -19, 748, 152, -60, 41, 
+  -106, -106, 191, -106, 177, -106, -106, -106, 387, 203, 
+  -106, 1906, -106, -106, -106, -106, -106, -106, -106, -106, 
+  -106, 180, 43, 376, 174, 48, 474, 240, -106, 8, 
+  -106, 748, 111, -106, -1, 748, -106, -106, 1130, -106, 
+  -106, -106, 1034, -106, -106, 228, -106, 1906, -106, 295, 
+  21, -106, -106, 184, 379, 39, 2001, 288, 2810, 18, 
+  -106, 34, 482, 33, 551, 138, 1225, 2606, 31, 9, 
+  399, 3, 643, 19, 29, 1324, 28, 1, 27, 1225, 
+  24, 0, 1225, 20, 1225, -7, -8, -106, 193, -106, 
+  205, -106, 47, 42, 329, 208, 319, -106, 128, -106, 
+  -106, -106, 2096, 748, 1713, 35, -106, 132, -106, -106, 
+  32, -106, -106, 748, 748, 94, 748, -106, 250, -106, 
+  116, -106, -106, 233, 233, -106, -106, -106, -106, -106, 
+  393, -106, 214, -106, 100, -106, -106, 474, -106, -106, 
+  96, -106, -106, -106, -106, -106, 
 
-  -111, 43, 59, 70, 71, 369, 40, -111, -111, -111, 
-  -111, -111, -111, -111, -111, -111, -111, -111, -111, 21, 
-  -111, -111, -111, -111, -111, -111, -111, -111, -111, 79, 
-  -111, -111, -111, -16, -111, -111, 5, -26, 23, 73, 
-  91, -111, 83, 61, -111, -111, -111, 88, 87, -111, 
-  -111, -111, -111, -111, -111, 29, -111, 66, 39, -111, 
-  97, 193, -111, -111, -111, -111, 160, 180, 183, -111, 
-  -111, -111, -111, 176, -111, 167, 151, 155, 152, -111, 
-  148, 187, 195, 197, 199, 201, -111, 186, 92, 194, 
+  -111, 15, 71, 87, 80, 305, -6, -111, -111, -111, 
+  -111, -111, -111, -111, -111, -111, -111, -111, -111, -42, 
+  -111, -111, -111, -111, -111, -111, -111, -111, -111, 95, 
+  -111, -111, -111, 3, -111, -111, -5, -11, 9, 109, 
+  91, -111, 62, 45, -111, -111, -111, 50, 63, -111, 
+  -111, -111, -111, -111, -111, 32, -111, 203, 197, -111, 
+  189, 178, -111, -111, -111, -111, 182, 185, 188, -111, 
+  -111, -111, -111, 193, -111, 198, 168, 113, 114, -111, 
+  133, 116, 123, 129, 130, 132, -111, 136, 139, 142, 
   -111, -111, -111, -111, -111, -111, -111, -111, -111, -111, 
-  -111, 103, -111, 108, -111, 181, -2, -42, -111, -111, 
+  -111, 148, -111, 151, -111, 186, 6, -37, -111, -111, 
   -111, -111, -111, -111, -111, -111, -111, -111, -111, -111, 
   -111, -111, -111, -111, -111, -111, -111, -111, -111, -111, 
   -111, -111, -111, -111, -111, -111, -111, -111, -111, -111, 
-  -111, -111, -111, 34, -111, -111, -111, -111, -111, 3, 
-  -111, -111, 10, -111, -111, -111, -111, -111, -111, -111, 
-  -111, -111, -111, -111, -111, -111, 127, -111, 109, 15, 
-  -111, -111, 16, -111, 225, 44, 128, -111, -111, -111, 
-  -111, -111, -111, -111, 25, 157, -111, -111, -111, 26, 
-  -111, -111, 24, -111, -111, -111, -111, -111, -111, -111, 
-  22, -111, -111, -111, -111, -111, -111, -111, -111, -111, 
-  179, -111, -111, 45, -111, 46, -111, 107, -111, 48, 
-  -111, 106, 62, -111, -111, 163, -3, -111, -111, -111, 
-  -111, -111, -14, -111, -111, -111, -111, -111, 57, -111, 
-  -111, 224, -111, -111, -111, 227, -111, -111, -111, -111, 
+  -111, -111, -111, 42, -111, -111, -111, -111, -111, 22, 
+  -111, -111, 2, -111, -111, -111, -111, -111, -111, -111, 
+  -111, -111, -111, -111, -111, -111, 96, -111, 66, 21, 
+  -111, -111, 0, -111, 274, 35, 88, -111, -111, -111, 
+  -111, -111, -111, -111, 41, 75, -111, -111, -111, 49, 
+  -111, -111, 48, -111, -111, -111, -111, -111, -111, -111, 
+  57, -111, -111, -111, -111, -111, -111, -111, -111, -111, 
+  77, -111, -111, 54, -111, 27, -111, 243, -111, 25, 
+  -111, 160, 36, -111, -111, 169, 40, -111, -111, -111, 
+  -111, -111, 56, -111, -111, -111, -111, -111, 180, -111, 
+  -111, 163, -111, -111, -111, 246, -111, -111, -111, -111, 
   -111, -111, -111, -111, -111, -111, -111, -111, -111, -111, 
-  -111, -111, 35, -111, -111, -111, -111, -111, 72, -111, 
+  -111, -111, 8, -111, -111, -111, -111, -111, 69, -111, 
   -111, -111, -111, -111, -111, -111, -111, -111, -111, -111, 
-  -111, -111, 12, 264, -111, 258, 246, 254, 209, -111, 
-  60, 51, 52, 27, 53, -111, -111, -111, -111, -111, 
-  -111, -111, -111, 244, -111, 255, -111, 203, -111, -111, 
-  207, -111, 217, -111, -111, 198, -111, 208, -111, 8, 
-  -111, 215, -111, 232, -111, 233, 234, -111, -111, 223, 
-  -111, -111, -111, -111, -111, -111, 230, -111, 95, 113, 
-  -111, -111, 153, -111, 156, -111, 2, -111, 147, -111, 
-  58, -111, 137, -111, 100, -111, -111, -111, -111, -111, 
-  -111, -111, -111, 135, -111, 41, -111, 54, -111, 117, 
-  162, -111, -111, 50, 169, -111, 174, -111, -111, 32, 
-  178, -111, -111, -111, 31, -111, 7, 144, -111, 130, 
-  -111, -111, 142, -111, -111, -111, -111, -111, -111, 11, 
-  -111, -111, -111, -111, -111, -111, 214, -111, -111, -111, 
-  -111, 140, -111, -111, -111, -111, -111, -111, 158, -111, 
-  -111, 149, -111, -111, 47, -111, -111, -111, -111, -111, 
-  -55, -111, 38, -111, -67, -111, -111, -111, -111, 263, 
-  -111, -111, 262, -111, -111, -111, -111, -111, 190, -76, 
-  -111, -111, 30, -111, 19, -111, 14, -111, -111, -111, 
-  -111, 33, -111, 272, -111, 64, -111, 175, -111, -111, 
-  -111, -111, -111, -111, 18, -111, -111, 69, -111, -111, 
-  -111, -111, 114, -111, -111, -111, -111, 20, -111, -111, 
-  110, -111, -111, 28, -111, -111, -111, -111, -111, -111, 
+  -111, -111, 61, 211, -111, 272, 257, 256, 236, -111, 
+  81, 83, 85, 68, 94, -111, -111, -111, -111, -111, 
+  -111, -111, -111, 235, -111, 218, -111, 209, -111, -111, 
+  244, -111, 227, -111, -111, 228, -111, 238, -111, 33, 
+  -111, 167, -111, 245, -111, 253, 254, -111, -111, 225, 
+  -111, -111, -111, -111, -111, -111, 217, -111, 194, 213, 
+  -111, -111, 208, -111, 207, -111, 52, -111, 205, -111, 
+  55, -111, 201, -111, 199, -111, -111, -111, -111, -111, 
+  -111, -111, -111, 278, -111, 39, -111, 34, -111, 173, 
+  219, -111, -111, 53, 231, -111, 73, -111, -111, 44, 
+  59, -111, -111, -111, 47, -111, 24, 102, -111, 101, 
+  -111, -111, 111, -111, -111, -111, -111, -111, -111, 26, 
+  -111, -111, -111, -111, -111, -111, 65, -111, -111, -111, 
+  -111, 76, -111, -111, -111, -111, -111, -111, 79, -111, 
+  -111, 89, -111, -111, 51, -111, -111, -111, -111, -111, 
+  -62, -111, 37, -111, -63, -111, -111, -111, -111, 387, 
+  -111, -111, 264, -111, -111, -111, -111, -111, 158, -54, 
+  -111, -111, 28, -111, 38, -111, 23, -111, -111, -111, 
+  -111, 43, -111, 78, -111, 58, -111, 67, -111, -111, 
+  -111, -111, -111, -111, 18, -111, -111, 195, -111, -111, 
+  -111, -111, 161, -111, -111, -111, -111, 20, -111, -111, 
+  157, -111, -111, 31, -111, -111, -111, -111, -111, -111, 
   -111, -111, -111, -111, -111, -111, -111, -111, -111, -111, 
-  86, -111, -111, -111, -111, -111, 55, -111, -111, -111, 
-  -111, -111, -111, -111, -7, -111, -111, -111, 1, -111, 
-  -111, 329, -111, -111, -111, -111, -111, -111, -111, -111, 
-  -111, -111, -111, 0, -11, -111, -10, -111, -111, -111, 
-  -111, 204, -111, -111, -111, 205, -111, -111, 317, -111, 
-  -111, -111, 311, -111, -111, -111, -111, 370, -111, -111, 
-  -9, -111, -111, -4, -12, -111, 337, -111, -111, -111, 
-  -18, -111, -111, -111, -1, -17, -6, -111, -111, -111, 
-  -111, -111, 466, 78, -111, 82, 307, -13, -111, -111, 
-  -8, -111, 6, -111, 74, 76, -111, -111, 9, -111, 
-  85, -111, -111, 17, -111, -111, -111, 4, -111, -22, 
-  84, -111, 67, -111, -111, -111, -111, -111, 49, -111, 
-  -111, 37, 42, 68, 77, -111, -111, -111, -111, -111, 
-  -111, -111, -111, -111, -111, -111, -111, -111, 13, -111, 
-  -111, -111, -111, -111, -111, 36, -111, -111, -111, -111, 
-  -111, -111, -111, -111};
+  206, -111, -111, -111, -111, -111, -7, -111, -111, -111, 
+  -111, -111, -111, -111, -24, -111, -111, -111, -12, -111, 
+  -111, 342, -111, -111, -111, -111, -111, -111, -111, -111, 
+  -111, -111, -111, -16, -32, -111, 5, -111, -111, -111, 
+  -111, 152, -111, -111, -111, 248, -111, -111, 330, -111, 
+  -111, -111, 324, -111, -111, -111, -111, 385, -111, -111, 
+  -21, -111, -111, 1, 14, -111, 367, -111, 232, 12, 
+  -111, -111, 11, -111, 10, -111, 164, 141, -111, -111, 
+  7, -111, 64, -111, -111, 19, -111, -111, -111, 17, 
+  -111, -1, 60, -111, 46, -111, -111, -111, -111, -111, 
+  -15, -111, -111, -111, -2, -17, -4, -111, -111, -111, 
+  -111, -111, 484, 138, 313, -3, -111, -111, -111, -111, 
+  4, -111, -111, 13, 16, 97, 127, -111, -111, -111, 
+  -111, -111, -111, -111, -111, -111, -111, -111, -111, -111, 
+  -14, -111, -111, -111, -111, -111, -111, -8, -111, -111, 
+  -111, -111, -111, -111, -111, -111};
 
 const short QQmlJSGrammar::action_info [] = {
-  166, 438, 551, 245, 344, 454, 346, 544, 342, 336, 
-  546, 354, 166, 452, 448, 181, 432, 392, 465, 103, 
-  420, 461, 421, 448, -138, 101, 423, 73, 408, 663, 
-  406, -135, 413, 558, 405, 404, 151, 418, 149, -141, 
-  185, 143, 439, 402, 399, 432, 398, 428, -122, -111, 
-  101, -133, 424, -112, 268, 432, -130, 350, 73, 268, 
-  -122, 262, -141, 245, 312, -130, 456, 558, 307, 283, 
-  -133, 261, 350, -112, 424, 588, -111, 578, 585, 350, 
-  576, 465, 243, 461, 305, 448, 103, 424, 524, 143, 
-  184, 240, 558, 474, 241, 329, 323, 189, 268, 305, 
-  238, 323, -135, 245, 172, 573, 143, 192, 482, -138, 
-  0, 448, 555, 303, 143, 174, 174, 448, 465, 461, 
-  558, 143, 484, 442, 143, 143, 174, 451, 303, 435, 
-  490, 481, 555, 315, 175, 175, 338, 317, 143, 191, 
-  244, 452, 143, 0, 143, 175, 143, 662, 661, 143, 
-  60, 416, 415, 660, 659, 325, 64, 143, 463, 326, 
-  556, 61, 531, 0, 590, 589, 467, 65, 259, 258, 
-  654, 653, 143, 501, 436, 60, 525, 426, 491, 0, 
-  626, 542, 631, 632, 259, 258, 61, 257, 256, 339, 
-  264, 60, 144, 174, 348, 168, 0, 179, 352, 169, 
-  252, 251, 61, 283, 259, 258, 631, 632, 60, 321, 
-  525, 87, 175, 88, 411, 0, 532, 530, 66, 61, 
-  267, 265, 527, 66, 89, 236, 235, 527, 87, 87, 
-  88, 88, 87, 526, 88, 66, 549, 87, 526, 88, 
-  105, 89, 89, 525, 87, 89, 88, 87, 266, 88, 
-  89, 87, 87, 88, 88, 567, 527, 89, 174, 106, 
-  89, 107, 477, 67, 89, 89, 525, 526, 67, 68, 
-  657, 656, 580, 525, 68, 143, 0, 175, 0, 176, 
-  67, 87, 87, 88, 88, 0, 68, 0, 0, 527, 
-  550, 548, 174, 0, 89, 89, 0, 581, 579, 0, 
-  526, 87, 655, 88, 87, 0, 88, 0, 592, 568, 
-  566, 175, 527, 411, 89, 478, 476, 89, 650, 527, 
-  75, 76, 0, 526, 75, 76, 285, 286, 446, 445, 
-  526, 0, 651, 649, 558, 285, 286, 6, 5, 4, 
-  1, 3, 2, 0, 0, 0, 0, 77, 78, 0, 
-  0, 77, 78, 287, 288, 0, 290, 291, 0, 0, 
-  290, 291, 287, 288, 648, 292, 290, 291, 293, 292, 
-  294, 0, 293, 0, 294, 292, 290, 291, 293, 0, 
-  294, 35, 290, 291, 35, 292, 0, 0, 293, 0, 
-  294, 292, 80, 81, 293, 593, 294, 35, 0, 0, 
-  82, 83, 80, 81, 84, 35, 85, 174, 0, 0, 
-  82, 83, 0, 0, 84, 35, 85, 0, 49, 52, 
-  50, 49, 52, 50, 0, -98, 175, 0, 176, 35, 
-  0, 0, 0, 0, 49, 52, 50, 35, 0, 0, 
-  0, 0, 49, 52, 50, 0, 46, 34, 51, 46, 
-  34, 51, 49, 52, 50, 0, 0, 0, 0, 0, 
-  0, 0, 46, 34, 51, 0, 49, 52, 50, 0, 
-  46, 34, 51, 0, 49, 52, 50, 35, 0, 0, 
-  46, 34, 51, 35, 0, 0, 35, 0, 0, 35, 
-  0, 0, 35, 0, 46, 34, 51, 35, 80, 81, 
-  35, 0, 46, 34, 51, 0, 82, 83, 0, 0, 
-  84, 0, 85, 0, 49, 52, 50, 0, 0, 0, 
-  49, 52, 50, 49, 52, 50, 49, 52, 50, 49, 
-  52, 50, 0, 35, 49, 52, 50, 49, 52, 50, 
-  184, 0, 46, 34, 51, 0, 0, 0, 46, 34, 
-  51, 46, 34, 51, 46, 34, 51, 46, 34, 51, 
-  0, 0, 46, 34, 51, 46, 34, 51, 35, 0, 
-  49, 52, 50, 35, 0, 184, 35, 0, 0, 0, 
-  184, 35, 0, 0, 35, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 46, 34, 
-  51, 0, 0, 0, 0, 49, 52, 50, 250, 249, 
-  49, 52, 50, 49, 52, 50, 250, 249, 49, 52, 
-  50, 49, 52, 50, 0, 0, 0, 35, 0, 0, 
+  424, 405, 432, 404, 346, 245, 573, 354, 406, -134, 
+  461, -112, -113, -131, -136, 448, 350, -139, 402, 392, 
+  268, -123, -142, 465, 399, 398, -131, -139, 465, 461, 
+  474, -136, 558, 448, -134, -112, -113, 424, -123, 350, 
+  -142, 245, 551, 481, 484, 268, 576, 524, 413, 482, 
+  438, 558, 439, 261, 558, 615, 420, 452, 418, 421, 
+  283, 454, 143, 428, 172, 558, 166, 423, 558, 448, 
+  608, 73, 546, 448, 149, 283, 0, 323, 408, 0, 
+  544, 307, 268, 0, 0, 0, 143, 184, 350, 448, 
+  245, 166, 101, 73, 461, 329, 465, 238, 456, 424, 
+  241, 336, 618, 189, 665, 262, 143, 323, 0, 181, 
+  317, 143, 451, 0, 315, 442, 143, 143, 192, 555, 
+  0, 143, 240, 243, 303, 151, 452, 101, 143, 185, 
+  143, 435, 143, 312, 305, 244, 0, 0, 303, 490, 
+  555, 60, 60, 342, 143, 143, 191, 432, 252, 251, 
+  103, 344, 61, 61, 144, 60, 305, 662, 661, 60, 
+  103, 656, 655, 352, 325, 338, 61, 556, 326, 501, 
+  61, 257, 256, 426, 143, 168, 436, 664, 663, 169, 
+  348, 542, 264, 64, 321, 633, 634, 491, 628, 620, 
+  619, 259, 258, 179, 65, 174, 463, 143, 622, 259, 
+  258, 416, 415, 525, 267, 265, 525, 87, 477, 88, 
+  531, 0, 174, 525, 175, 143, 411, 87, 339, 88, 
+  89, 66, 0, 87, 558, 88, 467, 527, 66, 610, 
+  89, 175, 266, 411, 525, 567, 89, 525, 526, 0, 
+  87, 66, 88, 87, 87, 88, 88, 549, 174, 527, 
+  236, 235, 527, 89, 611, 609, 89, 89, 0, 527, 
+  526, 478, 476, 526, 532, 530, 67, 175, 446, 445, 
+  526, 0, 68, 67, 174, 659, 658, 105, 0, 68, 
+  527, 75, 76, 527, 0, 623, 67, 285, 286, 568, 
+  566, 526, 68, 175, 526, 176, 106, 652, 107, 75, 
+  76, 550, 548, 174, 0, 285, 286, 657, 77, 78, 
+  174, 653, 651, 0, 287, 288, 0, 0, 0, 0, 
+  0, -99, 175, 0, 176, 0, 77, 78, -99, 175, 
+  0, 176, 287, 288, 0, 290, 291, 0, 0, 87, 
+  0, 88, 0, 650, 292, 80, 81, 293, 35, 294, 
+  0, 0, 89, 82, 83, 0, 0, 84, 35, 85, 
+  80, 81, 6, 5, 4, 1, 3, 2, 82, 83, 
+  80, 81, 84, 35, 85, 0, 0, 0, 82, 83, 
+  80, 81, 84, 0, 85, 49, 52, 50, 82, 83, 
+  80, 81, 84, 0, 85, 49, 52, 50, 82, 83, 
+  0, 0, 84, 0, 85, 35, 0, 0, 35, 0, 
+  49, 52, 50, 46, 34, 51, 35, 0, 0, 35, 
+  290, 291, 35, 46, 34, 51, 0, 0, 35, 292, 
+  0, 0, 293, 0, 294, 184, 0, 0, 46, 34, 
+  51, 35, 49, 52, 50, 49, 52, 50, 184, 0, 
+  0, 0, 0, 49, 52, 50, 49, 52, 50, 49, 
+  52, 50, 35, 0, 0, 49, 52, 50, 0, 184, 
+  46, 34, 51, 46, 34, 51, 0, 0, 49, 52, 
+  50, 46, 34, 51, 46, 34, 51, 46, 34, 51, 
+  0, 0, 0, 46, 34, 51, 0, 0, 35, 49, 
+  52, 50, 0, 35, 0, 0, 46, 34, 51, 0, 
+  0, 35, 0, 0, 0, 0, 0, 0, 0, 35, 
+  0, 0, 0, 0, 0, 0, 0, 46, 34, 51, 
+  250, 249, 0, 0, 0, 49, 52, 50, 0, 0, 
+  49, 52, 50, 250, 249, 0, 0, 0, 49, 52, 
+  50, 250, 249, 0, 0, 0, 49, 52, 50, 0, 
   0, 0, 0, 46, 34, 51, 0, 0, 46, 34, 
-  51, 46, 34, 51, 0, 0, 46, 34, 51, 46, 
-  34, 51, 0, 0, 0, 0, 0, 0, 35, 250, 
-  249, 0, 0, 0, 49, 52, 50, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-  255, 254, 46, 34, 51, 49, 52, 50, 0, 0, 
+  51, 0, 0, 0, 0, 0, 46, 34, 51, 0, 
+  35, 0, 0, 0, 46, 34, 51, 0, 0, 0, 
   0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
   0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 46, 34, 51, 0, 0, 0, 0, 
-  0, 0, 0, 30, 31, 153, 0, 0, 0, 0, 
-  0, 0, 0, 33, 0, 154, 0, 0, 0, 155, 
-  35, 0, 0, 0, 36, 37, 0, 38, 156, 0, 
-  157, 0, 0, 0, 516, 0, 0, 0, 45, 0, 
-  0, 158, 0, 159, 64, 0, 0, 0, 0, 0, 
-  0, 160, 0, 0, 161, 65, 53, 49, 52, 50, 
-  162, 54, 0, 0, 0, 0, 163, 0, 0, 0, 
-  0, 0, 44, 56, 32, 0, 0, 0, 41, 0, 
-  0, 0, 164, 0, 0, 46, 34, 51, 0, 0, 
-  0, 0, 0, 0, 0, 30, 31, 0, 0, 0, 
-  0, 0, 0, 0, 0, 33, 0, 0, 153, 0, 
-  0, 0, 35, 0, 0, 0, 36, 37, 154, 38, 
-  0, 0, 155, 0, 0, 0, 516, 0, 0, 0, 
-  45, 156, 0, 157, 0, 0, 319, 0, 0, 0, 
-  0, 0, 0, 0, 158, 0, 159, 64, 53, 49, 
-  52, 50, 0, 54, 160, 0, 0, 161, 65, 0, 
-  0, 0, 0, 162, 44, 56, 32, 0, 0, 163, 
-  41, 0, 0, 0, 0, 0, 0, 46, 34, 51, 
-  0, 0, 0, 0, 0, 164, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
+  0, 0, 255, 254, 153, 0, 0, 49, 52, 50, 
+  0, 0, 0, 0, 154, 0, 0, 0, 155, 0, 
+  0, 0, 0, 0, 0, 0, 0, 156, 0, 157, 
+  0, 0, 319, 0, 0, 46, 34, 51, 0, 0, 
+  158, 0, 159, 64, 0, 30, 31, 153, 0, 0, 
+  160, 0, 0, 161, 65, 33, 0, 154, 0, 162, 
+  0, 155, 35, 0, 0, 163, 36, 37, 0, 38, 
+  156, 0, 157, 0, 0, 0, 42, 0, 0, 0, 
+  45, 164, 0, 158, 0, 159, 64, 0, 0, 0, 
+  0, 0, 0, 160, 0, 0, 161, 65, 53, 49, 
+  52, 50, 162, 54, 0, 0, 0, 0, 163, 0, 
+  0, 0, 0, 0, 44, 56, 32, 0, 0, 0, 
+  41, 0, 0, 0, 164, 0, 0, 46, 34, 51, 
   0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 30, 31, 0, 0, 0, 0, 0, 0, 0, 
-  0, 33, 0, 0, 0, 0, 0, 0, 35, 0, 
-  0, 0, 36, 37, 0, 38, 0, 0, 0, 0, 
-  0, 0, 516, 0, 0, 0, 45, 0, 0, 0, 
   0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 53, 49, 52, 50, 0, 54, 
+  30, 31, 0, 0, 0, 0, 0, 0, 0, 0, 
+  33, 0, 0, 0, 0, 0, 0, 35, 0, 0, 
+  0, 36, 37, 0, 38, 0, 0, 0, 0, 0, 
+  0, 516, 0, 0, 0, 45, 0, 0, 0, 0, 
   0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-  44, 56, 32, 0, 0, 0, 41, 0, 0, 0, 
-  0, 0, 0, 46, 34, 51, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 30, 31, 0, 0, 0, 
-  0, 0, 0, 0, 0, 33, 0, 0, 0, 0, 
-  0, 0, 35, 0, 0, 0, 36, 37, 0, 38, 
-  0, 0, 0, 0, 0, 0, 42, 0, 0, 0, 
-  45, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 53, 49, 
-  52, 50, 0, 54, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 44, 56, 32, 0, 0, 0, 
-  41, 0, 0, 0, 0, 0, 0, 46, 34, 51, 
-  0, 0, 0, 0, 0, 0, 0, 0, 0, 515, 
-  0, 30, 31, 0, 0, 0, 0, 0, 0, 0, 
-  0, 219, 0, 0, 0, 0, 0, 0, 35, 0, 
-  0, 0, 36, 37, 0, 38, 0, 0, 0, 0, 
-  0, 0, 516, 0, 0, 0, 45, 0, 0, 0, 
+  0, 0, 0, 53, 49, 52, 50, 0, 54, 0, 
+  0, 0, 0, 0, 0, 0, 0, 0, 0, 44, 
+  56, 32, 0, 0, 0, 41, 0, 0, 0, 0, 
+  0, 0, 46, 34, 51, 0, 0, 0, 0, 0, 
+  0, 0, 0, 0, 30, 31, 0, 0, 0, 0, 
+  0, 0, 0, 0, 33, 0, 0, 0, 0, 0, 
+  0, 35, 0, 0, 0, 36, 37, 0, 38, 0, 
+  0, 0, 0, 0, 0, 42, 0, 0, 0, 45, 
   0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 53, 517, 519, 518, 0, 54, 
-  0, 0, 0, 0, 227, 0, 0, 0, 0, 0, 
-  44, 56, 32, 214, 0, 0, 41, 0, 0, 0, 
-  0, 0, 0, 46, 34, 51, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 515, 0, 30, 31, 0, 
-  0, 0, 0, 0, 0, 0, 0, 219, 0, 0, 
-  0, 0, 0, 0, 35, 0, 0, 0, 36, 37, 
-  0, 38, 0, 0, 0, 0, 0, 0, 516, 0, 
-  0, 0, 45, 0, 0, 0, 0, 0, 0, 0, 
-  563, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-  53, 517, 519, 518, 0, 54, 0, 0, 0, 0, 
-  227, 0, 0, 0, 0, 0, 44, 56, 32, 214, 
-  0, 0, 41, 0, 0, 0, 0, 0, 0, 46, 
-  34, 51, 0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 515, 0, 30, 31, 0, 0, 0, 0, 0, 
-  0, 0, 0, 219, 0, 0, 0, 0, 0, 0, 
-  35, 0, 0, 0, 36, 37, 0, 38, 0, 0, 
-  0, 0, 0, 0, 516, 0, 0, 0, 45, 0, 
-  0, 0, 0, 0, 0, 0, 560, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 53, 517, 519, 518, 
-  0, 54, 0, 0, 0, 0, 227, 0, 0, 0, 
-  0, 0, 44, 56, 32, 214, 0, 0, 41, 0, 
-  0, 0, 0, 0, 0, 46, 34, 51, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 29, 30, 31, 
-  0, 0, 0, 0, 0, 0, 0, 0, 33, 0, 
-  0, 0, 0, 0, 0, 35, 0, 0, 0, 36, 
-  37, 0, 38, 0, 0, 0, 39, 0, 40, 42, 
-  43, 0, 0, 45, 0, 0, 0, 47, 0, 48, 
+  0, 0, 0, 0, 0, 0, 0, 53, 49, 52, 
+  50, 0, 54, 0, 0, 0, 0, 0, 0, 0, 
+  0, 0, 0, 44, 56, 32, 0, 0, 0, 41, 
+  0, 0, 0, 0, 0, 0, 46, 34, 51, 0, 
+  0, 0, 0, 0, 0, 0, 0, 0, 515, 0, 
+  30, 31, 0, 0, 0, 0, 0, 0, 0, 0, 
+  219, 0, 0, 0, 0, 0, 0, 35, 0, 0, 
+  0, 36, 37, 0, 38, 0, 0, 0, 0, 0, 
+  0, 516, 0, 0, 0, 45, 0, 0, 0, 0, 
   0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 53, 49, 52, 50, 0, 54, 0, 55, 0, 
-  57, 0, 58, 0, 0, 0, 0, 44, 56, 32, 
-  0, 0, 0, 41, 0, 0, 0, 0, 0, 0, 
-  46, 34, 51, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, -131, 0, 0, 0, 29, 30, 31, 0, 
+  0, 0, 0, 53, 517, 519, 518, 0, 54, 0, 
+  0, 0, 0, 227, 0, 0, 0, 0, 0, 44, 
+  56, 32, 214, 0, 0, 41, 0, 0, 0, 0, 
+  0, 0, 46, 34, 51, 0, 0, 0, 0, 0, 
+  0, 0, 0, 0, 515, 0, 30, 31, 0, 0, 
+  0, 0, 0, 0, 0, 0, 219, 0, 0, 0, 
+  0, 0, 0, 35, 0, 0, 0, 36, 37, 0, 
+  38, 0, 0, 0, 0, 0, 0, 516, 0, 0, 
+  0, 45, 0, 0, 0, 0, 0, 0, 0, 563, 
+  0, 0, 0, 0, 0, 0, 0, 0, 0, 53, 
+  517, 519, 518, 0, 54, 0, 0, 0, 0, 227, 
+  0, 0, 0, 0, 0, 44, 56, 32, 214, 0, 
+  0, 41, 0, 0, 0, 0, 0, 0, 46, 34, 
+  51, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
+  515, 0, 30, 31, 0, 0, 0, 0, 0, 0, 
+  0, 0, 219, 0, 0, 0, 0, 0, 0, 35, 
+  0, 0, 0, 36, 37, 0, 38, 0, 0, 0, 
+  0, 0, 0, 516, 0, 0, 0, 45, 0, 0, 
+  0, 0, 0, 0, 0, 560, 0, 0, 0, 0, 
+  0, 0, 0, 0, 0, 53, 517, 519, 518, 0, 
+  54, 0, 0, 0, 0, 227, 0, 0, 0, 0, 
+  0, 44, 56, 32, 214, 0, 0, 41, 0, 0, 
+  0, 0, 0, 0, 46, 34, 51, 0, 0, 0, 
+  0, 0, 0, 0, 0, 0, 29, 30, 31, 0, 
   0, 0, 0, 0, 0, 0, 0, 33, 0, 0, 
   0, 0, 0, 0, 35, 0, 0, 0, 36, 37, 
   0, 38, 0, 0, 0, 39, 0, 40, 42, 43, 
@@ -507,369 +479,362 @@ const short QQmlJSGrammar::action_info [] = {
   0, 58, 0, 0, 0, 0, 44, 56, 32, 0, 
   0, 0, 41, 0, 0, 0, 0, 0, 0, 46, 
   34, 51, 0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 29, 30, 31, 0, 0, 0, 0, 0, 0, 
-  0, 0, 33, 0, 0, 0, 0, 0, 0, 35, 
-  0, 0, 0, 36, 37, 0, 38, 0, 0, 0, 
-  39, 0, 40, 42, 43, 0, 0, 45, 0, 0, 
-  0, 47, 0, 48, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 53, 49, 52, 50, 0, 
-  54, 0, 55, 0, 57, 282, 58, 0, 0, 0, 
-  0, 44, 56, 32, 0, 0, 0, 41, 0, 0, 
-  0, 0, 0, 0, 46, 34, 51, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 488, 0, 0, 29, 
-  30, 31, 0, 0, 0, 0, 0, 0, 0, 0, 
-  33, 0, 0, 0, 0, 0, 0, 35, 0, 0, 
-  0, 36, 37, 0, 38, 0, 0, 0, 39, 0, 
-  40, 42, 43, 0, 0, 45, 0, 0, 0, 47, 
-  0, 48, 0, 0, 489, 0, 0, 0, 0, 0, 
-  0, 0, 0, 53, 49, 52, 50, 0, 54, 0, 
-  55, 0, 57, 0, 58, 0, 0, 0, 0, 44, 
-  56, 32, 0, 0, 0, 41, 0, 0, 0, 0, 
-  0, 0, 46, 34, 51, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 488, 0, 0, 29, 30, 31, 
-  0, 0, 0, 0, 0, 0, 0, 0, 33, 0, 
-  0, 0, 0, 0, 0, 35, 0, 0, 0, 36, 
-  37, 0, 38, 0, 0, 0, 39, 0, 40, 42, 
-  43, 0, 0, 45, 0, 0, 0, 47, 0, 48, 
-  0, 0, 494, 0, 0, 0, 0, 0, 0, 0, 
-  0, 53, 49, 52, 50, 0, 54, 0, 55, 0, 
-  57, 0, 58, 0, 0, 0, 0, 44, 56, 32, 
-  0, 0, 0, 41, 0, 0, 0, 0, 0, 0, 
-  46, 34, 51, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 496, 0, 0, 29, 30, 31, 0, 0, 
+  0, -132, 0, 0, 0, 29, 30, 31, 0, 0, 
   0, 0, 0, 0, 0, 0, 33, 0, 0, 0, 
   0, 0, 0, 35, 0, 0, 0, 36, 37, 0, 
   38, 0, 0, 0, 39, 0, 40, 42, 43, 0, 
   0, 45, 0, 0, 0, 47, 0, 48, 0, 0, 
-  497, 0, 0, 0, 0, 0, 0, 0, 0, 53, 
+  0, 0, 0, 0, 0, 0, 0, 0, 0, 53, 
   49, 52, 50, 0, 54, 0, 55, 0, 57, 0, 
   58, 0, 0, 0, 0, 44, 56, 32, 0, 0, 
   0, 41, 0, 0, 0, 0, 0, 0, 46, 34, 
   51, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-  496, 0, 0, 29, 30, 31, 0, 0, 0, 0, 
-  0, 0, 0, 0, 33, 0, 0, 0, 0, 0, 
-  0, 35, 0, 0, 0, 36, 37, 0, 38, 0, 
-  0, 0, 39, 0, 40, 42, 43, 0, 0, 45, 
-  0, 0, 0, 47, 0, 48, 0, 0, 499, 0, 
-  0, 0, 0, 0, 0, 0, 0, 53, 49, 52, 
-  50, 0, 54, 0, 55, 0, 57, 0, 58, 0, 
-  0, 0, 0, 44, 56, 32, 0, 0, 0, 41, 
-  0, 0, 0, 0, 0, 0, 46, 34, 51, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 29, 30, 
+  29, 30, 31, 0, 0, 0, 0, 0, 0, 0, 
+  0, 33, 0, 0, 0, 0, 0, 0, 35, 0, 
+  0, 0, 36, 37, 0, 38, 0, 0, 0, 39, 
+  0, 40, 42, 43, 0, 0, 45, 0, 0, 0, 
+  47, 0, 48, 0, 0, 0, 0, 0, 0, 0, 
+  0, 0, 0, 0, 53, 49, 52, 50, 0, 54, 
+  0, 55, 0, 57, 282, 58, 0, 0, 0, 0, 
+  44, 56, 32, 0, 0, 0, 41, 0, 0, 0, 
+  0, 0, 0, 46, 34, 51, 0, 0, 0, 0, 
+  0, 0, 0, 0, 0, 496, 0, 0, 29, 30, 
   31, 0, 0, 0, 0, 0, 0, 0, 0, 33, 
-  0, 0, 0, 0, 0, 0, 35, 220, 0, 0, 
-  595, 596, 0, 38, 0, 0, 0, 39, 0, 40, 
+  0, 0, 0, 0, 0, 0, 35, 0, 0, 0, 
+  36, 37, 0, 38, 0, 0, 0, 39, 0, 40, 
   42, 43, 0, 0, 45, 0, 0, 0, 47, 0, 
-  48, 0, 0, 0, 0, 0, 0, 0, 223, 0, 
-  0, 0, 53, 49, 52, 50, 224, 54, 0, 55, 
-  226, 57, 0, 58, 0, 229, 0, 0, 44, 56, 
+  48, 0, 0, 497, 0, 0, 0, 0, 0, 0, 
+  0, 0, 53, 49, 52, 50, 0, 54, 0, 55, 
+  0, 57, 0, 58, 0, 0, 0, 0, 44, 56, 
   32, 0, 0, 0, 41, 0, 0, 0, 0, 0, 
   0, 46, 34, 51, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 29, 30, 31, 0, 0, 0, 0, 
-  0, 0, 0, 0, 33, 0, 0, 0, 0, 0, 
-  0, 35, 220, 0, 0, 221, 37, 0, 38, 0, 
-  0, 0, 39, 0, 40, 42, 43, 0, 0, 45, 
-  0, 0, 0, 47, 0, 48, 0, 0, 0, 0, 
-  0, 0, 0, 223, 0, 0, 0, 53, 49, 52, 
-  50, 224, 54, 0, 55, 226, 57, 0, 58, 0, 
-  229, 0, 0, 44, 56, 32, 0, 0, 0, 41, 
-  0, 0, 0, 0, 0, 0, 46, 34, 51, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 111, 112, 
-  113, 0, 0, 115, 117, 118, 0, 0, 119, 0, 
-  120, 0, 0, 0, 122, 123, 124, 0, 0, 0, 
-  0, 0, 0, 35, 125, 126, 127, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 128, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 131, 0, 0, 0, 0, 0, 0, 
-  49, 52, 50, 132, 133, 134, 0, 136, 137, 138, 
-  139, 140, 141, 0, 0, 129, 135, 121, 114, 116, 
-  130, 0, 0, 0, 0, 0, 0, 0, 46, 34, 
-  51, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-  111, 112, 113, 0, 0, 115, 117, 118, 0, 0, 
-  119, 0, 120, 0, 0, 0, 122, 123, 124, 0, 
-  0, 0, 0, 0, 0, 35, 125, 126, 127, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 0, 128, 
-  0, 0, 0, 395, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 131, 0, 0, 0, 0, 
-  0, 397, 49, 52, 50, 132, 133, 134, 0, 136, 
-  137, 138, 139, 140, 141, 0, 0, 129, 135, 121, 
-  114, 116, 130, 0, 0, 0, 0, 0, 0, 0, 
+  0, 0, 0, 488, 0, 0, 29, 30, 31, 0, 
+  0, 0, 0, 0, 0, 0, 0, 33, 0, 0, 
+  0, 0, 0, 0, 35, 0, 0, 0, 36, 37, 
+  0, 38, 0, 0, 0, 39, 0, 40, 42, 43, 
+  0, 0, 45, 0, 0, 0, 47, 0, 48, 0, 
+  0, 494, 0, 0, 0, 0, 0, 0, 0, 0, 
+  53, 49, 52, 50, 0, 54, 0, 55, 0, 57, 
+  0, 58, 0, 0, 0, 0, 44, 56, 32, 0, 
+  0, 0, 41, 0, 0, 0, 0, 0, 0, 46, 
+  34, 51, 0, 0, 0, 0, 0, 0, 0, 0, 
+  0, 488, 0, 0, 29, 30, 31, 0, 0, 0, 
+  0, 0, 0, 0, 0, 33, 0, 0, 0, 0, 
+  0, 0, 35, 0, 0, 0, 36, 37, 0, 38, 
+  0, 0, 0, 39, 0, 40, 42, 43, 0, 0, 
+  45, 0, 0, 0, 47, 0, 48, 0, 0, 489, 
+  0, 0, 0, 0, 0, 0, 0, 0, 53, 49, 
+  52, 50, 0, 54, 0, 55, 0, 57, 0, 58, 
+  0, 0, 0, 0, 44, 56, 32, 0, 0, 0, 
+  41, 0, 0, 0, 0, 0, 0, 46, 34, 51, 
+  0, 0, 0, 0, 0, 0, 0, 0, 0, 496, 
+  0, 0, 29, 30, 31, 0, 0, 0, 0, 0, 
+  0, 0, 0, 33, 0, 0, 0, 0, 0, 0, 
+  35, 0, 0, 0, 36, 37, 0, 38, 0, 0, 
+  0, 39, 0, 40, 42, 43, 0, 0, 45, 0, 
+  0, 0, 47, 0, 48, 0, 0, 499, 0, 0, 
+  0, 0, 0, 0, 0, 0, 53, 49, 52, 50, 
+  0, 54, 0, 55, 0, 57, 0, 58, 0, 0, 
+  0, 0, 44, 56, 32, 0, 0, 0, 41, 0, 
+  0, 0, 0, 0, 0, 46, 34, 51, 0, 0, 
+  0, 0, 0, 0, 0, 0, 0, 29, 30, 31, 
+  0, 0, 0, 0, 0, 0, 0, 0, 33, 0, 
+  0, 0, 0, 0, 0, 35, 220, 0, 0, 221, 
+  37, 0, 38, 0, 0, 0, 39, 0, 40, 42, 
+  43, 0, 0, 45, 0, 0, 0, 47, 0, 48, 
+  0, 0, 0, 0, 0, 0, 0, 223, 0, 0, 
+  0, 53, 49, 52, 50, 224, 54, 0, 55, 226, 
+  57, 0, 58, 0, 229, 0, 0, 44, 56, 32, 
+  0, 0, 0, 41, 0, 0, 0, 0, 0, 0, 
+  46, 34, 51, 0, 0, 0, 0, 0, 0, 0, 
+  0, 0, 29, 30, 31, 0, 0, 0, 0, 0, 
+  0, 0, 0, 33, 0, 0, 0, 0, 0, 0, 
+  35, 220, 0, 0, 578, 37, 0, 38, 0, 0, 
+  0, 39, 0, 40, 42, 43, 0, 0, 45, 0, 
+  0, 0, 47, 0, 48, 0, 0, 0, 0, 0, 
+  0, 0, 223, 0, 0, 0, 53, 49, 52, 50, 
+  224, 54, 0, 55, 226, 57, 0, 58, 0, 229, 
+  0, 0, 44, 56, 32, 0, 0, 0, 41, 0, 
+  0, 0, 0, 0, 0, 46, 34, 51, 0, 0, 
+  0, 0, 0, 0, 0, 0, 0, 29, 30, 31, 
+  0, 0, 0, 0, 0, 0, 0, 0, 33, 0, 
+  0, 0, 0, 0, 0, 35, 220, 0, 0, 578, 
+  624, 0, 38, 0, 0, 0, 39, 0, 40, 42, 
+  43, 0, 0, 45, 0, 0, 0, 47, 0, 48, 
+  0, 0, 0, 0, 0, 0, 0, 223, 0, 0, 
+  0, 53, 49, 52, 50, 224, 54, 0, 55, 226, 
+  57, 0, 58, 0, 229, 0, 0, 44, 56, 32, 
+  0, 0, 0, 41, 0, 0, 0, 0, 0, 0, 
   46, 34, 51, 0, 0, 0, 0, 0, 0, 0, 
   0, 0, 111, 112, 113, 0, 0, 115, 117, 118, 
   0, 0, 119, 0, 120, 0, 0, 0, 122, 123, 
   124, 0, 0, 0, 0, 0, 0, 35, 125, 126, 
   127, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 128, 0, 0, 0, 395, 0, 0, 0, 0, 
+  0, 128, 0, 0, 0, 0, 0, 0, 0, 0, 
   0, 0, 0, 0, 0, 0, 0, 131, 0, 0, 
-  0, 0, 0, 397, 49, 52, 50, 132, 133, 134, 
+  0, 0, 0, 0, 49, 52, 50, 132, 133, 134, 
   0, 136, 137, 138, 139, 140, 141, 0, 0, 129, 
   135, 121, 114, 116, 130, 0, 0, 0, 0, 0, 
-  0, 0, 46, 374, 380, 0, 0, 0, 0, 0, 
+  0, 0, 46, 34, 51, 0, 0, 0, 0, 0, 
   0, 0, 0, 0, 111, 112, 113, 0, 0, 115, 
   117, 118, 0, 0, 119, 0, 120, 0, 0, 0, 
   122, 123, 124, 0, 0, 0, 0, 0, 0, 35, 
   125, 126, 127, 0, 0, 0, 0, 0, 0, 0, 
   0, 0, 0, 128, 0, 0, 0, 395, 0, 0, 
-  0, 0, 0, 0, 0, 396, 0, 0, 0, 131, 
+  0, 0, 0, 0, 0, 0, 0, 0, 0, 131, 
   0, 0, 0, 0, 0, 397, 49, 52, 50, 132, 
   133, 134, 0, 136, 137, 138, 139, 140, 141, 0, 
   0, 129, 135, 121, 114, 116, 130, 0, 0, 0, 
   0, 0, 0, 0, 46, 374, 380, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 213, 0, 0, 0, 
-  0, 215, 0, 29, 30, 31, 217, 0, 0, 0, 
-  0, 0, 0, 218, 219, 0, 0, 0, 0, 0, 
-  0, 35, 220, 0, 0, 221, 37, 0, 38, 0, 
-  0, 0, 39, 0, 40, 42, 43, 0, 0, 45, 
-  0, 0, 0, 47, 0, 48, 0, 0, 0, 0, 
-  0, 222, 0, 223, 0, 0, 0, 53, 49, 52, 
-  50, 224, 54, 225, 55, 226, 57, 227, 58, 228, 
-  229, 0, 0, 44, 56, 32, 214, 216, 0, 41, 
+  0, 0, 0, 0, 0, 0, 111, 112, 113, 0, 
+  0, 115, 117, 118, 0, 0, 119, 0, 120, 0, 
+  0, 0, 122, 123, 124, 0, 0, 0, 0, 0, 
+  0, 35, 125, 126, 127, 0, 0, 0, 0, 0, 
+  0, 0, 0, 0, 0, 128, 0, 0, 0, 395, 
+  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
+  0, 131, 0, 0, 0, 0, 0, 397, 49, 52, 
+  50, 132, 133, 134, 0, 136, 137, 138, 139, 140, 
+  141, 0, 0, 129, 135, 121, 114, 116, 130, 0, 
   0, 0, 0, 0, 0, 0, 46, 34, 51, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 213, 0, 
-  0, 0, 0, 215, 0, 29, 30, 31, 217, 0, 
-  0, 0, 0, 0, 0, 218, 33, 0, 0, 0, 
-  0, 0, 0, 35, 220, 0, 0, 221, 37, 0, 
-  38, 0, 0, 0, 39, 0, 40, 42, 43, 0, 
-  0, 45, 0, 0, 0, 47, 0, 48, 0, 0, 
-  0, 0, 0, 222, 0, 223, 0, 0, 0, 53, 
-  49, 52, 50, 224, 54, 225, 55, 226, 57, 227, 
-  58, 228, 229, 0, 0, 44, 56, 32, 214, 216, 
-  0, 41, 0, 0, 0, 0, 0, 0, 46, 34, 
-  51, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-  600, 112, 113, 0, 0, 602, 117, 604, 30, 31, 
-  605, 0, 120, 0, 0, 0, 122, 607, 608, 0, 
-  0, 0, 0, 0, 0, 35, 609, 126, 127, 221, 
-  37, 0, 38, 0, 0, 0, 39, 0, 40, 610, 
-  43, 0, 0, 612, 0, 0, 0, 47, 0, 48, 
-  0, 0, 0, 0, 0, 613, 0, 223, 0, 0, 
-  0, 614, 49, 52, 50, 615, 616, 617, 55, 619, 
-  620, 621, 622, 623, 624, 0, 0, 611, 618, 606, 
-  601, 603, 130, 41, 0, 0, 0, 0, 0, 0, 
-  46, 374, 380, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 365, 112, 113, 0, 0, 367, 117, 369, 
-  30, 31, 370, 0, 120, 0, 0, 0, 122, 372, 
-  373, 0, 0, 0, 0, 0, 0, 35, 375, 126, 
-  127, 221, 37, 0, 38, 0, 0, 0, 39, 0, 
-  40, 376, 43, 0, 0, 378, 0, 0, 0, 47, 
-  0, 48, 0, -277, 0, 0, 0, 379, 0, 223, 
-  0, 0, 0, 381, 49, 52, 50, 382, 383, 384, 
-  55, 386, 387, 388, 389, 390, 391, 0, 0, 377, 
-  385, 371, 366, 368, 130, 41, 0, 0, 0, 0, 
-  0, 0, 46, 374, 380, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 
+  0, 0, 0, 0, 0, 0, 0, 0, 111, 112, 
+  113, 0, 0, 115, 117, 118, 0, 0, 119, 0, 
+  120, 0, 0, 0, 122, 123, 124, 0, 0, 0, 
+  0, 0, 0, 35, 125, 126, 127, 0, 0, 0, 
+  0, 0, 0, 0, 0, 0, 0, 128, 0, 0, 
+  0, 395, 0, 0, 0, 0, 0, 0, 0, 396, 
+  0, 0, 0, 131, 0, 0, 0, 0, 0, 397, 
+  49, 52, 50, 132, 133, 134, 0, 136, 137, 138, 
+  139, 140, 141, 0, 0, 129, 135, 121, 114, 116, 
+  130, 0, 0, 0, 0, 0, 0, 0, 46, 374, 
+  380, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
+  213, 0, 0, 0, 0, 215, 0, 29, 30, 31, 
+  217, 0, 0, 0, 0, 0, 0, 218, 33, 0, 
+  0, 0, 0, 0, 0, 35, 220, 0, 0, 221, 
+  37, 0, 38, 0, 0, 0, 39, 0, 40, 42, 
+  43, 0, 0, 45, 0, 0, 0, 47, 0, 48, 
+  0, 0, 0, 0, 0, 222, 0, 223, 0, 0, 
+  0, 53, 49, 52, 50, 224, 54, 225, 55, 226, 
+  57, 227, 58, 228, 229, 0, 0, 44, 56, 32, 
+  214, 216, 0, 41, 0, 0, 0, 0, 0, 0, 
+  46, 34, 51, 0, 0, 0, 0, 0, 0, 0, 
+  0, 0, 213, 0, 0, 0, 0, 215, 0, 29, 
+  30, 31, 217, 0, 0, 0, 0, 0, 0, 218, 
+  219, 0, 0, 0, 0, 0, 0, 35, 220, 0, 
+  0, 221, 37, 0, 38, 0, 0, 0, 39, 0, 
+  40, 42, 43, 0, 0, 45, 0, 0, 0, 47, 
+  0, 48, 0, 0, 0, 0, 0, 222, 0, 223, 
+  0, 0, 0, 53, 49, 52, 50, 224, 54, 225, 
+  55, 226, 57, 227, 58, 228, 229, 0, 0, 44, 
+  56, 32, 214, 216, 0, 41, 0, 0, 0, 0, 
+  0, 0, 46, 34, 51, 0, 0, 0, 0, 0, 
+  0, 0, 0, 0, 582, 112, 113, 0, 0, 584, 
+  117, 586, 30, 31, 587, 0, 120, 0, 0, 0, 
+  122, 589, 590, 0, 0, 0, 0, 0, 0, 35, 
+  591, 126, 127, 221, 37, 0, 38, 0, 0, 0, 
+  39, 0, 40, 592, 43, 0, 0, 594, 0, 0, 
+  0, 47, 0, 48, 0, 0, 0, 0, 0, 595, 
+  0, 223, 0, 0, 0, 596, 49, 52, 50, 597, 
+  598, 599, 55, 601, 602, 603, 604, 605, 606, 0, 
+  0, 593, 600, 588, 583, 585, 130, 41, 0, 0, 
+  0, 0, 0, 0, 46, 374, 380, 0, 0, 0, 
+  0, 0, 0, 0, 0, 0, 365, 112, 113, 0, 
+  0, 367, 117, 369, 30, 31, 370, 0, 120, 0, 
+  0, 0, 122, 372, 373, 0, 0, 0, 0, 0, 
+  0, 35, 375, 126, 127, 221, 37, 0, 38, 0, 
+  0, 0, 39, 0, 40, 376, 43, 0, 0, 378, 
+  0, 0, 0, 47, 0, 48, 0, -278, 0, 0, 
+  0, 379, 0, 223, 0, 0, 0, 381, 49, 52, 
+  50, 382, 383, 384, 55, 386, 387, 388, 389, 390, 
+  391, 0, 0, 377, 385, 371, 366, 368, 130, 41, 
+  0, 0, 0, 0, 0, 0, 46, 374, 380, 0, 
+  0, 0, 0, 0, 0, 0, 0, 0, 
 
-  148, 142, 183, 447, 469, 347, 575, 444, 547, 627, 
-  248, 320, 587, 572, 584, 586, 485, 591, 565, 529, 
-  313, 545, 447, 393, 253, 528, 500, 183, 574, 453, 
-  331, 652, 447, 437, 444, 313, 462, 455, 263, 457, 
-  237, 441, 206, 188, 190, 150, 16, 178, 433, 630, 
-  425, 641, 165, 400, 658, 458, 642, 171, 173, 248, 
-  475, 351, 498, 248, 253, 313, 183, 466, 183, 541, 
-  495, 629, 253, 512, 511, 188, 145, 206, 260, 645, 
-  644, 62, 0, 62, 362, 507, 298, 469, 206, 206, 
-  247, 514, 514, 62, 206, 460, 646, 409, 152, 409, 
-  599, 628, 355, 239, 206, 62, 62, 62, 362, 260, 
-  296, 297, 299, 331, 62, 62, 313, 504, 206, 295, 
-  62, 62, 459, 460, 356, 206, 277, 62, 62, 502, 
-  182, 281, 206, 62, 410, 182, 410, 401, 62, 353, 
-  459, 62, 62, 506, 505, 62, 62, 503, 493, 349, 
-  91, 62, 492, 206, 63, 206, 313, 62, 345, 483, 
-  393, 479, 62, 62, 260, 206, 444, 206, 510, 102, 
-  148, 62, 104, 182, 206, 188, 188, 468, 180, 170, 
-  206, 62, 148, 247, 62, 394, 460, 393, 409, 340, 
-  412, 341, 362, 206, 422, 167, 393, 206, 62, 108, 
-  459, 313, 62, 187, 419, 62, 62, 86, 206, 62, 
-  318, 98, 100, 403, 62, 99, 69, 322, 514, 514, 
-  313, 62, 417, 553, 557, 410, 206, 79, 110, 246, 
-  62, 343, 206, 206, 62, 0, 70, 62, 74, 71, 
-  62, 62, 206, 108, 90, 206, 93, 62, 62, 62, 
-  72, 62, 92, 62, 94, 62, 95, 309, 96, 407, 
-  97, 309, 281, 62, 362, 362, 281, 0, 281, 242, 
-  302, 0, 110, 177, 464, 0, 316, 309, 0, 308, 
-  206, 206, 281, 311, 309, 0, 62, 62, 309, 281, 
-  206, 281, 281, 281, 0, 314, 0, 0, 62, 330, 
-  62, 324, 0, 281, 327, 281, 337, 300, 62, 62, 
-  328, 304, 62, 281, 281, 301, 564, 281, 62, 289, 
-  306, 569, 561, 281, 0, 514, 553, 284, 625, 0, 
-  0, 514, 0, 0, 522, 0, 0, 0, 0, 0, 
-  522, 0, 0, 0, 0, 0, 513, 523, 0, 485, 
-  443, 440, 513, 523, 533, 534, 535, 536, 540, 537, 
-  538, 577, 533, 534, 535, 536, 540, 537, 538, 0, 
+  545, 572, 565, 632, 654, 148, 529, 541, 528, 142, 
+  660, 263, 500, 393, 617, 616, 621, 614, 16, 629, 
+  444, 183, 313, 547, 447, 183, 631, 643, 253, 248, 
+  644, 485, 575, 574, 607, 152, 320, 437, 178, 313, 
+  441, 433, 173, 183, 165, 253, 462, 313, 457, 447, 
+  444, 453, 253, 458, 425, 347, 455, 248, 351, 188, 
+  475, 466, 498, 171, 150, 447, 206, 190, 400, 468, 
+  0, 183, 248, 495, 469, 237, 409, 393, 409, 331, 
+  464, 247, 512, 206, 145, 206, 62, 409, 507, 206, 
+  0, 511, 0, 188, 0, 206, 206, 188, 206, 62, 
+  62, 504, 460, 417, 62, 206, 505, 206, 647, 646, 
+  407, 0, 0, 410, 62, 410, 459, 62, 148, 506, 
+  62, 187, 62, 277, 410, 419, 412, 298, 281, 393, 
+  148, 0, 0, 0, 422, 62, 170, 62, 180, 62, 
+  295, 514, 296, 260, 297, 62, 648, 503, 62, 62, 
+  62, 182, 514, 299, 394, 62, 62, 460, 459, 206, 
+  362, 630, 362, 62, 167, 502, 514, 62, 62, 322, 
+  62, 553, 444, 99, 100, 93, 206, 62, 356, 206, 
+  510, 206, 94, 62, 62, 206, 62, 62, 95, 96, 
+  62, 97, 86, 62, 90, 493, 62, 91, 188, 492, 
+  92, 355, 62, 353, 108, 62, 483, 349, 242, 345, 
+  247, 313, 331, 469, 102, 104, 313, 206, 62, 206, 
+  182, 260, 62, 206, 206, 206, 239, 62, 98, 182, 
+  313, 313, 62, 110, 362, 72, 62, 206, 69, 62, 
+  318, 70, 62, 62, 71, 260, 63, 62, 246, 393, 
+  581, 62, 62, 460, 0, 74, 206, 62, 79, 459, 
+  0, 206, 514, 309, 206, 62, 362, 557, 281, 0, 
+  281, 309, 62, 0, 284, 403, 281, 281, 0, 309, 
+  401, 0, 206, 306, 281, 308, 343, 479, 340, 62, 
+  62, 341, 108, 337, 281, 281, 206, 302, 309, 62, 
+  0, 330, 304, 281, 281, 314, 316, 62, 309, 0, 
+  62, 62, 281, 281, 324, 281, 281, 301, 300, 514, 
+  311, 110, 177, 0, 327, 0, 62, 569, 522, 564, 
+  328, 281, 553, 289, 627, 561, 0, 0, 514, 0, 
+  513, 523, 0, 0, 514, 0, 0, 522, 0, 0, 
+  0, 0, 443, 522, 0, 485, 0, 0, 0, 513, 
+  523, 0, 0, 0, 0, 513, 523, 533, 534, 535, 
+  536, 540, 537, 538, 0, 0, 0, 0, 0, 0, 
+  0, 577, 0, 0, 0, 0, 0, 0, 0, 362, 
+  579, 580, 533, 534, 535, 536, 540, 537, 538, 569, 
+  0, 0, 0, 0, 0, 206, 0, 0, 570, 571, 
+  533, 534, 535, 536, 540, 537, 538, 0, 0, 0, 
   0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 514, 569, 0, 0, 0, 0, 0, 
-  0, 0, 522, 570, 571, 533, 534, 535, 536, 540, 
-  537, 538, 0, 0, 513, 523, 0, 0, 0, 0, 
   0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
   0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
   0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
   0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
+  0, 0, 0, 0, 0, 440, 0, 0, 0, 0, 
   0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
+  0, 0, 0, 0, 0, 0, 0, 0, 577, 0, 
+  0, 0, 0, 0, 0, 0, 0, 625, 626, 533, 
+  534, 535, 536, 540, 537, 538, 0, 0, 0, 0, 
   0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
   0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-  594, 0, 0, 0, 0, 0, 0, 0, 0, 597, 
-  598, 533, 534, 535, 536, 540, 537, 538, 0, 0, 
   0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
   0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
   0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
   0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
   0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0};
+  0, 0, 0, 0, 0};
 
 const short QQmlJSGrammar::action_check [] = {
-  2, 55, 34, 7, 60, 36, 31, 37, 61, 17, 
-  24, 16, 2, 20, 33, 60, 5, 8, 36, 79, 
-  60, 36, 33, 33, 7, 48, 55, 1, 55, 0, 
-  33, 7, 60, 33, 60, 36, 60, 36, 8, 7, 
-  36, 8, 7, 55, 7, 5, 55, 33, 7, 7, 
-  48, 7, 36, 7, 36, 5, 7, 36, 1, 36, 
-  7, 36, 7, 7, 61, 7, 60, 33, 8, 1, 
-  7, 77, 36, 7, 36, 60, 7, 29, 8, 36, 
-  7, 36, 55, 36, 79, 33, 79, 36, 66, 8, 
-  36, 60, 33, 17, 33, 7, 2, 8, 36, 79, 
-  36, 2, 7, 7, 7, 66, 8, 33, 33, 7, 
-  -1, 33, 8, 48, 8, 15, 15, 33, 36, 36, 
-  33, 8, 55, 7, 8, 8, 15, 6, 48, 10, 
-  8, 60, 8, 61, 34, 34, 8, 60, 8, 60, 
-  55, 20, 8, -1, 8, 34, 8, 61, 62, 8, 
-  40, 61, 62, 61, 62, 50, 42, 8, 60, 54, 
-  56, 51, 7, -1, 61, 62, 60, 53, 61, 62, 
-  61, 62, 8, 60, 55, 40, 29, 60, 56, -1, 
-  56, 29, 91, 92, 61, 62, 51, 61, 62, 61, 
-  60, 40, 56, 15, 60, 50, -1, 56, 60, 54, 
-  61, 62, 51, 1, 61, 62, 91, 92, 40, 60, 
-  29, 25, 34, 27, 36, -1, 61, 62, 12, 51, 
-  61, 62, 75, 12, 38, 61, 62, 75, 25, 25, 
-  27, 27, 25, 86, 27, 12, 7, 25, 86, 27, 
-  15, 38, 38, 29, 25, 38, 27, 25, 89, 27, 
-  38, 25, 25, 27, 27, 7, 75, 38, 15, 34, 
-  38, 36, 8, 57, 38, 38, 29, 86, 57, 63, 
-  61, 62, 36, 29, 63, 8, -1, 34, -1, 36, 
-  57, 25, 25, 27, 27, -1, 63, -1, -1, 75, 
-  61, 62, 15, -1, 38, 38, -1, 61, 62, -1, 
-  86, 25, 93, 27, 25, -1, 27, -1, 7, 61, 
-  62, 34, 75, 36, 38, 61, 62, 38, 47, 75, 
-  18, 19, -1, 86, 18, 19, 18, 19, 61, 62, 
-  86, -1, 61, 62, 33, 18, 19, 98, 99, 100, 
-  101, 102, 103, -1, -1, -1, -1, 45, 46, -1, 
-  -1, 45, 46, 45, 46, -1, 23, 24, -1, -1, 
-  23, 24, 45, 46, 93, 32, 23, 24, 35, 32, 
-  37, -1, 35, -1, 37, 32, 23, 24, 35, -1, 
-  37, 29, 23, 24, 29, 32, -1, -1, 35, -1, 
-  37, 32, 23, 24, 35, 94, 37, 29, -1, -1, 
-  31, 32, 23, 24, 35, 29, 37, 15, -1, -1, 
-  31, 32, -1, -1, 35, 29, 37, -1, 66, 67, 
-  68, 66, 67, 68, -1, 33, 34, -1, 36, 29, 
-  -1, -1, -1, -1, 66, 67, 68, 29, -1, -1, 
-  -1, -1, 66, 67, 68, -1, 94, 95, 96, 94, 
-  95, 96, 66, 67, 68, -1, -1, -1, -1, -1, 
-  -1, -1, 94, 95, 96, -1, 66, 67, 68, -1, 
-  94, 95, 96, -1, 66, 67, 68, 29, -1, -1, 
-  94, 95, 96, 29, -1, -1, 29, -1, -1, 29, 
-  -1, -1, 29, -1, 94, 95, 96, 29, 23, 24, 
-  29, -1, 94, 95, 96, -1, 31, 32, -1, -1, 
-  35, -1, 37, -1, 66, 67, 68, -1, -1, -1, 
-  66, 67, 68, 66, 67, 68, 66, 67, 68, 66, 
-  67, 68, -1, 29, 66, 67, 68, 66, 67, 68, 
-  36, -1, 94, 95, 96, -1, -1, -1, 94, 95, 
-  96, 94, 95, 96, 94, 95, 96, 94, 95, 96, 
-  -1, -1, 94, 95, 96, 94, 95, 96, 29, -1, 
-  66, 67, 68, 29, -1, 36, 29, -1, -1, -1, 
-  36, 29, -1, -1, 29, -1, -1, -1, -1, -1, 
-  -1, -1, -1, -1, -1, -1, -1, -1, 94, 95, 
-  96, -1, -1, -1, -1, 66, 67, 68, 61, 62, 
-  66, 67, 68, 66, 67, 68, 61, 62, 66, 67, 
-  68, 66, 67, 68, -1, -1, -1, 29, -1, -1, 
+  36, 60, 5, 36, 31, 7, 66, 16, 33, 7, 
+  36, 7, 7, 7, 7, 33, 36, 7, 55, 8, 
+  36, 7, 7, 36, 7, 55, 7, 7, 36, 36, 
+  17, 7, 33, 33, 7, 7, 7, 36, 7, 36, 
+  7, 7, 34, 60, 55, 36, 7, 66, 60, 33, 
+  55, 33, 7, 77, 33, 8, 60, 20, 36, 33, 
+  1, 36, 8, 33, 7, 33, 2, 55, 33, 33, 
+  29, 1, 24, 33, 8, 1, -1, 2, 55, -1, 
+  37, 8, 36, -1, -1, -1, 8, 36, 36, 33, 
+  7, 2, 48, 1, 36, 7, 36, 36, 60, 36, 
+  33, 17, 60, 8, 0, 36, 8, 2, -1, 60, 
+  60, 8, 6, -1, 61, 7, 8, 8, 33, 8, 
+  -1, 8, 60, 55, 48, 60, 20, 48, 8, 36, 
+  8, 10, 8, 61, 79, 55, -1, -1, 48, 8, 
+  8, 40, 40, 61, 8, 8, 60, 5, 61, 62, 
+  79, 60, 51, 51, 56, 40, 79, 61, 62, 40, 
+  79, 61, 62, 60, 50, 8, 51, 56, 54, 60, 
+  51, 61, 62, 60, 8, 50, 55, 61, 62, 54, 
+  60, 29, 60, 42, 60, 91, 92, 56, 56, 61, 
+  62, 61, 62, 56, 53, 15, 60, 8, 7, 61, 
+  62, 61, 62, 29, 61, 62, 29, 25, 8, 27, 
+  7, -1, 15, 29, 34, 8, 36, 25, 61, 27, 
+  38, 12, -1, 25, 33, 27, 60, 75, 12, 36, 
+  38, 34, 89, 36, 29, 7, 38, 29, 86, -1, 
+  25, 12, 27, 25, 25, 27, 27, 7, 15, 75, 
+  61, 62, 75, 38, 61, 62, 38, 38, -1, 75, 
+  86, 61, 62, 86, 61, 62, 57, 34, 61, 62, 
+  86, -1, 63, 57, 15, 61, 62, 15, -1, 63, 
+  75, 18, 19, 75, -1, 94, 57, 18, 19, 61, 
+  62, 86, 63, 34, 86, 36, 34, 47, 36, 18, 
+  19, 61, 62, 15, -1, 18, 19, 93, 45, 46, 
+  15, 61, 62, -1, 45, 46, -1, -1, -1, -1, 
+  -1, 33, 34, -1, 36, -1, 45, 46, 33, 34, 
+  -1, 36, 45, 46, -1, 23, 24, -1, -1, 25, 
+  -1, 27, -1, 93, 32, 23, 24, 35, 29, 37, 
+  -1, -1, 38, 31, 32, -1, -1, 35, 29, 37, 
+  23, 24, 98, 99, 100, 101, 102, 103, 31, 32, 
+  23, 24, 35, 29, 37, -1, -1, -1, 31, 32, 
+  23, 24, 35, -1, 37, 66, 67, 68, 31, 32, 
+  23, 24, 35, -1, 37, 66, 67, 68, 31, 32, 
+  -1, -1, 35, -1, 37, 29, -1, -1, 29, -1, 
+  66, 67, 68, 94, 95, 96, 29, -1, -1, 29, 
+  23, 24, 29, 94, 95, 96, -1, -1, 29, 32, 
+  -1, -1, 35, -1, 37, 36, -1, -1, 94, 95, 
+  96, 29, 66, 67, 68, 66, 67, 68, 36, -1, 
+  -1, -1, -1, 66, 67, 68, 66, 67, 68, 66, 
+  67, 68, 29, -1, -1, 66, 67, 68, -1, 36, 
+  94, 95, 96, 94, 95, 96, -1, -1, 66, 67, 
+  68, 94, 95, 96, 94, 95, 96, 94, 95, 96, 
+  -1, -1, -1, 94, 95, 96, -1, -1, 29, 66, 
+  67, 68, -1, 29, -1, -1, 94, 95, 96, -1, 
+  -1, 29, -1, -1, -1, -1, -1, -1, -1, 29, 
+  -1, -1, -1, -1, -1, -1, -1, 94, 95, 96, 
+  61, 62, -1, -1, -1, 66, 67, 68, -1, -1, 
+  66, 67, 68, 61, 62, -1, -1, -1, 66, 67, 
+  68, 61, 62, -1, -1, -1, 66, 67, 68, -1, 
   -1, -1, -1, 94, 95, 96, -1, -1, 94, 95, 
-  96, 94, 95, 96, -1, -1, 94, 95, 96, 94, 
-  95, 96, -1, -1, -1, -1, -1, -1, 29, 61, 
-  62, -1, -1, -1, 66, 67, 68, -1, -1, -1, 
-  -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 
+  96, -1, -1, -1, -1, -1, 94, 95, 96, -1, 
+  29, -1, -1, -1, 94, 95, 96, -1, -1, -1, 
   -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 
-  61, 62, 94, 95, 96, 66, 67, 68, -1, -1, 
-  -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 
-  -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 
-  -1, -1, -1, 94, 95, 96, -1, -1, -1, -1, 
-  -1, -1, -1, 12, 13, 3, -1, -1, -1, -1, 
-  -1, -1, -1, 22, -1, 13, -1, -1, -1, 17, 
-  29, -1, -1, -1, 33, 34, -1, 36, 26, -1, 
-  28, -1, -1, -1, 43, -1, -1, -1, 47, -1, 
-  -1, 39, -1, 41, 42, -1, -1, -1, -1, -1, 
-  -1, 49, -1, -1, 52, 53, 65, 66, 67, 68, 
-  58, 70, -1, -1, -1, -1, 64, -1, -1, -1, 
-  -1, -1, 81, 82, 83, -1, -1, -1, 87, -1, 
-  -1, -1, 80, -1, -1, 94, 95, 96, -1, -1, 
-  -1, -1, -1, -1, -1, 12, 13, -1, -1, -1, 
-  -1, -1, -1, -1, -1, 22, -1, -1, 3, -1, 
-  -1, -1, 29, -1, -1, -1, 33, 34, 13, 36, 
-  -1, -1, 17, -1, -1, -1, 43, -1, -1, -1, 
-  47, 26, -1, 28, -1, -1, 31, -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, -1, 94, 95, 96, 
-  -1, -1, -1, -1, -1, 80, -1, -1, -1, -1, 
   -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 
+  -1, -1, 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, 31, -1, -1, 94, 95, 96, -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, 94, 95, 96, 
   -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 
-  -1, 12, 13, -1, -1, -1, -1, -1, -1, -1, 
-  -1, 22, -1, -1, -1, -1, -1, -1, 29, -1, 
-  -1, -1, 33, 34, -1, 36, -1, -1, -1, -1, 
-  -1, -1, 43, -1, -1, -1, 47, -1, -1, -1, 
   -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 
-  -1, -1, -1, -1, 65, 66, 67, 68, -1, 70, 
+  12, 13, -1, -1, -1, -1, -1, -1, -1, -1, 
+  22, -1, -1, -1, -1, -1, -1, 29, -1, -1, 
+  -1, 33, 34, -1, 36, -1, -1, -1, -1, -1, 
+  -1, 43, -1, -1, -1, 47, -1, -1, -1, -1, 
   -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 
-  81, 82, 83, -1, -1, -1, 87, -1, -1, -1, 
-  -1, -1, -1, 94, 95, 96, -1, -1, -1, -1, 
-  -1, -1, -1, -1, -1, 12, 13, -1, -1, -1, 
-  -1, -1, -1, -1, -1, 22, -1, -1, -1, -1, 
-  -1, -1, 29, -1, -1, -1, 33, 34, -1, 36, 
-  -1, -1, -1, -1, -1, -1, 43, -1, -1, -1, 
-  47, -1, -1, -1, -1, -1, -1, -1, -1, -1, 
-  -1, -1, -1, -1, -1, -1, -1, -1, 65, 66, 
-  67, 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, 94, 95, 96, 
-  -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, 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, 94, 95, 96, -1, -1, -1, -1, -1, 
+  -1, -1, -1, -1, 12, 13, -1, -1, -1, -1, 
+  -1, -1, -1, -1, 22, -1, -1, -1, -1, -1, 
+  -1, 29, -1, -1, -1, 33, 34, -1, 36, -1, 
+  -1, -1, -1, -1, -1, 43, -1, -1, -1, 47, 
   -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 
-  -1, -1, -1, -1, 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, 94, 95, 96, -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, 94, 
-  95, 96, -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, 94, 95, 96, -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, 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, 94, 95, 96, -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, -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, 
-  94, 95, 96, -1, -1, -1, -1, -1, -1, -1, 
-  -1, -1, 7, -1, -1, -1, 11, 12, 13, -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, 94, 95, 96, -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, 94, 95, 
+  96, -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, 94, 95, 96, -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, 
@@ -879,101 +844,100 @@ const short QQmlJSGrammar::action_check [] = {
   -1, 76, -1, -1, -1, -1, 81, 82, 83, -1, 
   -1, -1, 87, -1, -1, -1, -1, -1, -1, 94, 
   95, 96, -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, 94, 95, 96, -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, 94, 95, 96, -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, 
-  94, 95, 96, -1, -1, -1, -1, -1, -1, -1, 
-  -1, -1, 8, -1, -1, 11, 12, 13, -1, -1, 
+  -1, 7, -1, -1, -1, 11, 12, 13, -1, -1, 
   -1, -1, -1, -1, -1, -1, 22, -1, -1, -1, 
   -1, -1, -1, 29, -1, -1, -1, 33, 34, -1, 
   36, -1, -1, -1, 40, -1, 42, 43, 44, -1, 
   -1, 47, -1, -1, -1, 51, -1, 53, -1, -1, 
-  56, -1, -1, -1, -1, -1, -1, -1, -1, 65, 
+  -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, 94, 95, 
   96, -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, 94, 95, 96, -1, 
-  -1, -1, -1, -1, -1, -1, -1, -1, 11, 12, 
+  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, 94, 95, 96, -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, 30, -1, -1, 
+  -1, -1, -1, -1, -1, -1, 29, -1, -1, -1, 
   33, 34, -1, 36, -1, -1, -1, 40, -1, 42, 
   43, 44, -1, -1, 47, -1, -1, -1, 51, -1, 
-  53, -1, -1, -1, -1, -1, -1, -1, 61, -1, 
-  -1, -1, 65, 66, 67, 68, 69, 70, -1, 72, 
-  73, 74, -1, 76, -1, 78, -1, -1, 81, 82, 
+  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, 94, 95, 96, -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, 69, 70, -1, 72, 73, 74, -1, 76, -1, 
-  78, -1, -1, 81, 82, 83, -1, -1, -1, 87, 
-  -1, -1, -1, -1, -1, -1, 94, 95, 96, -1, 
-  -1, -1, -1, -1, -1, -1, -1, -1, 4, 5, 
-  6, -1, -1, 9, 10, 11, -1, -1, 14, -1, 
-  16, -1, -1, -1, 20, 21, 22, -1, -1, -1, 
-  -1, -1, -1, 29, 30, 31, 32, -1, -1, -1, 
-  -1, -1, -1, -1, -1, -1, -1, 43, -1, -1, 
-  -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 
-  -1, -1, -1, 59, -1, -1, -1, -1, -1, -1, 
-  66, 67, 68, 69, 70, 71, -1, 73, 74, 75, 
-  76, 77, 78, -1, -1, 81, 82, 83, 84, 85, 
-  86, -1, -1, -1, -1, -1, -1, -1, 94, 95, 
-  96, -1, -1, -1, -1, -1, -1, -1, -1, -1, 
-  4, 5, 6, -1, -1, 9, 10, 11, -1, -1, 
-  14, -1, 16, -1, -1, -1, 20, 21, 22, -1, 
-  -1, -1, -1, -1, -1, 29, 30, 31, 32, -1, 
-  -1, -1, -1, -1, -1, -1, -1, -1, -1, 43, 
-  -1, -1, -1, 47, -1, -1, -1, -1, -1, -1, 
-  -1, -1, -1, -1, -1, 59, -1, -1, -1, -1, 
-  -1, 65, 66, 67, 68, 69, 70, 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, 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, 94, 
+  95, 96, -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, 94, 95, 96, 
+  -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, 94, 95, 96, -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, 69, 70, -1, 72, 73, 
+  74, -1, 76, -1, 78, -1, -1, 81, 82, 83, 
+  -1, -1, -1, 87, -1, -1, -1, -1, -1, -1, 
+  94, 95, 96, -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, 
+  69, 70, -1, 72, 73, 74, -1, 76, -1, 78, 
+  -1, -1, 81, 82, 83, -1, -1, -1, 87, -1, 
+  -1, -1, -1, -1, -1, 94, 95, 96, -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, 69, 70, -1, 72, 73, 
+  74, -1, 76, -1, 78, -1, -1, 81, 82, 83, 
+  -1, -1, -1, 87, -1, -1, -1, -1, -1, -1, 
   94, 95, 96, -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, 43, -1, -1, -1, -1, -1, -1, -1, -1, 
   -1, -1, -1, -1, -1, -1, -1, 59, -1, -1, 
-  -1, -1, -1, 65, 66, 67, 68, 69, 70, 71, 
+  -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, 94, 95, 96, -1, -1, -1, -1, -1, 
@@ -982,104 +946,126 @@ const short QQmlJSGrammar::action_check [] = {
   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, -1, -1, -1, -1, 59, 
   -1, -1, -1, -1, -1, 65, 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, 94, 95, 96, -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, 4, 5, 6, -1, 
+  -1, 9, 10, 11, -1, -1, 14, -1, 16, -1, 
+  -1, -1, 20, 21, 22, -1, -1, -1, -1, -1, 
+  -1, 29, 30, 31, 32, -1, -1, -1, -1, -1, 
+  -1, -1, -1, -1, -1, 43, -1, -1, -1, 47, 
+  -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 
+  -1, 59, -1, -1, -1, -1, -1, 65, 66, 67, 
+  68, 69, 70, 71, -1, 73, 74, 75, 76, 77, 
+  78, -1, -1, 81, 82, 83, 84, 85, 86, -1, 
   -1, -1, -1, -1, -1, -1, 94, 95, 96, -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, 
+  -1, -1, -1, -1, -1, -1, -1, -1, 4, 5, 
+  6, -1, -1, 9, 10, 11, -1, -1, 14, -1, 
+  16, -1, -1, -1, 20, 21, 22, -1, -1, -1, 
+  -1, -1, -1, 29, 30, 31, 32, -1, -1, -1, 
+  -1, -1, -1, -1, -1, -1, -1, 43, -1, -1, 
+  -1, 47, -1, -1, -1, -1, -1, -1, -1, 55, 
+  -1, -1, -1, 59, -1, -1, -1, -1, -1, 65, 
+  66, 67, 68, 69, 70, 71, -1, 73, 74, 75, 
   76, 77, 78, -1, -1, 81, 82, 83, 84, 85, 
-  -1, 87, -1, -1, -1, -1, -1, -1, 94, 95, 
+  86, -1, -1, -1, -1, -1, -1, -1, 94, 95, 
   96, -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, 
+  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, 86, 87, -1, -1, -1, -1, -1, -1, 
+  84, 85, -1, 87, -1, -1, -1, -1, -1, -1, 
   94, 95, 96, -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, 
+  -1, -1, 4, -1, -1, -1, -1, 9, -1, 11, 
+  12, 13, 14, -1, -1, -1, -1, -1, -1, 21, 
+  22, -1, -1, -1, -1, -1, -1, 29, 30, -1, 
+  -1, 33, 34, -1, 36, -1, -1, -1, 40, -1, 
   42, 43, 44, -1, -1, 47, -1, -1, -1, 51, 
-  -1, 53, -1, 55, -1, -1, -1, 59, -1, 61, 
+  -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, 
+  82, 83, 84, 85, -1, 87, -1, -1, -1, -1, 
   -1, -1, 94, 95, 96, -1, -1, -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, 94, 95, 96, -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, 94, 95, 96, -1, 
+  -1, -1, -1, -1, -1, -1, -1, -1, 
 
-  42, 3, 18, 25, 18, 3, 18, 3, 18, 22, 
-  18, 3, 18, 22, 32, 32, 42, 18, 18, 18, 
-  3, 32, 25, 18, 18, 32, 3, 18, 32, 105, 
-  18, 18, 25, 100, 3, 3, 3, 18, 3, 25, 
-  18, 3, 18, 18, 18, 42, 3, 3, 103, 9, 
-  3, 14, 42, 42, 18, 25, 14, 42, 42, 18, 
-  42, 3, 42, 18, 18, 3, 18, 3, 18, 14, 
-  42, 22, 18, 2, 4, 18, 42, 18, 2, 11, 
-  12, 54, -1, 54, 2, 56, 59, 18, 18, 18, 
-  4, 14, 14, 54, 18, 56, 19, 14, 77, 14, 
-  18, 23, 2, 46, 18, 54, 54, 54, 2, 2, 
-  59, 59, 59, 18, 54, 54, 3, 56, 18, 59, 
-  54, 54, 56, 56, 18, 18, 54, 54, 54, 56, 
-  56, 59, 18, 54, 51, 56, 51, 2, 54, 2, 
-  56, 54, 54, 56, 56, 54, 54, 56, 38, 2, 
-  58, 54, 42, 18, 57, 18, 3, 54, 2, 45, 
-  18, 92, 54, 54, 2, 18, 3, 18, 109, 66, 
-  42, 54, 64, 56, 18, 18, 18, 2, 50, 70, 
-  18, 54, 42, 4, 54, 43, 56, 18, 14, 94, 
-  50, 78, 2, 18, 45, 68, 18, 18, 54, 18, 
-  56, 3, 54, 46, 46, 54, 54, 59, 18, 54, 
-  2, 60, 60, 44, 54, 60, 56, 2, 14, 14, 
-  3, 54, 44, 19, 19, 51, 18, 60, 47, 2, 
-  54, 78, 18, 18, 54, -1, 56, 54, 62, 56, 
-  54, 54, 18, 18, 58, 18, 59, 54, 54, 54, 
-  57, 54, 58, 54, 59, 54, 59, 54, 59, 45, 
-  59, 54, 59, 54, 2, 2, 59, -1, 59, 45, 
-  61, -1, 47, 48, 2, -1, 78, 54, -1, 76, 
-  18, 18, 59, 76, 54, -1, 54, 54, 54, 59, 
-  18, 59, 59, 59, -1, 78, -1, -1, 54, 76, 
-  54, 69, -1, 59, 71, 59, 76, 61, 54, 54, 
-  76, 67, 54, 59, 59, 61, 5, 59, 54, 61, 
-  65, 14, 5, 59, -1, 14, 19, 63, 21, -1, 
-  -1, 14, -1, -1, 23, -1, -1, -1, -1, -1, 
-  23, -1, -1, -1, -1, -1, 35, 36, -1, 42, 
-  88, 88, 35, 36, 25, 26, 27, 28, 29, 30, 
-  31, 24, 25, 26, 27, 28, 29, 30, 31, -1, 
-  -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 
-  -1, -1, -1, 14, 14, -1, -1, -1, -1, -1, 
-  -1, -1, 23, 23, 24, 25, 26, 27, 28, 29, 
-  30, 31, -1, -1, 35, 36, -1, -1, -1, -1, 
-  -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 
+  32, 22, 18, 9, 18, 42, 18, 14, 32, 3, 
+  18, 3, 3, 18, 18, 32, 18, 32, 3, 22, 
+  3, 18, 3, 18, 25, 18, 22, 14, 18, 18, 
+  14, 42, 18, 32, 22, 77, 3, 100, 3, 3, 
+  3, 103, 42, 18, 42, 18, 3, 3, 25, 25, 
+  3, 105, 18, 25, 3, 3, 18, 18, 3, 18, 
+  42, 3, 42, 42, 42, 25, 18, 18, 42, 2, 
+  -1, 18, 18, 42, 18, 18, 14, 18, 14, 18, 
+  2, 4, 2, 18, 42, 18, 54, 14, 56, 18, 
+  -1, 4, -1, 18, -1, 18, 18, 18, 18, 54, 
+  54, 56, 56, 44, 54, 18, 56, 18, 11, 12, 
+  45, -1, -1, 51, 54, 51, 56, 54, 42, 56, 
+  54, 46, 54, 54, 51, 46, 50, 59, 59, 18, 
+  42, -1, -1, -1, 45, 54, 70, 54, 50, 54, 
+  59, 14, 59, 2, 59, 54, 19, 56, 54, 54, 
+  54, 56, 14, 59, 43, 54, 54, 56, 56, 18, 
+  2, 23, 2, 54, 68, 56, 14, 54, 54, 2, 
+  54, 19, 3, 60, 60, 59, 18, 54, 18, 18, 
+  109, 18, 59, 54, 54, 18, 54, 54, 59, 59, 
+  54, 59, 59, 54, 58, 38, 54, 58, 18, 42, 
+  58, 2, 54, 2, 18, 54, 45, 2, 45, 2, 
+  4, 3, 18, 18, 66, 64, 3, 18, 54, 18, 
+  56, 2, 54, 18, 18, 18, 46, 54, 60, 56, 
+  3, 3, 54, 47, 2, 57, 54, 18, 56, 54, 
+  2, 56, 54, 54, 56, 2, 57, 54, 2, 18, 
+  18, 54, 54, 56, -1, 62, 18, 54, 60, 56, 
+  -1, 18, 14, 54, 18, 54, 2, 19, 59, -1, 
+  59, 54, 54, -1, 63, 44, 59, 59, -1, 54, 
+  2, -1, 18, 65, 59, 76, 78, 92, 94, 54, 
+  54, 78, 18, 76, 59, 59, 18, 61, 54, 54, 
+  -1, 76, 67, 59, 59, 78, 78, 54, 54, -1, 
+  54, 54, 59, 59, 69, 59, 59, 61, 61, 14, 
+  76, 47, 48, -1, 71, -1, 54, 14, 23, 5, 
+  76, 59, 19, 61, 21, 5, -1, -1, 14, -1, 
+  35, 36, -1, -1, 14, -1, -1, 23, -1, -1, 
+  -1, -1, 88, 23, -1, 42, -1, -1, -1, 35, 
+  36, -1, -1, -1, -1, 35, 36, 25, 26, 27, 
+  28, 29, 30, 31, -1, -1, -1, -1, -1, -1, 
+  -1, 14, -1, -1, -1, -1, -1, -1, -1, 2, 
+  23, 24, 25, 26, 27, 28, 29, 30, 31, 14, 
+  -1, -1, -1, -1, -1, 18, -1, -1, 23, 24, 
+  25, 26, 27, 28, 29, 30, 31, -1, -1, -1, 
   -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 
   -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 
   -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 
   -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 
   -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 
+  -1, -1, -1, -1, -1, 88, -1, -1, -1, -1, 
   -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 
-  14, -1, -1, -1, -1, -1, -1, -1, -1, 23, 
-  24, 25, 26, 27, 28, 29, 30, 31, -1, -1, 
+  -1, -1, -1, -1, -1, -1, -1, -1, 14, -1, 
+  -1, -1, -1, -1, -1, -1, -1, 23, 24, 25, 
+  26, 27, 28, 29, 30, 31, -1, -1, -1, -1, 
   -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 
   -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 
   -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 
@@ -1087,6 +1073,6 @@ const short QQmlJSGrammar::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, -1};
 
 QT_END_NAMESPACE
diff --git a/src/tools/qdoc/qmlparser/qqmljsgrammar_p.h b/src/tools/qdoc/qmlparser/qqmljsgrammar_p.h
index 6b3d1c8013..7a369be194 100644
--- a/src/tools/qdoc/qmlparser/qqmljsgrammar_p.h
+++ b/src/tools/qdoc/qmlparser/qqmljsgrammar_p.h
@@ -161,15 +161,15 @@ public:
     T_XOR = 79,
     T_XOR_EQ = 80,
 
-    ACCEPT_STATE = 663,
-    RULE_COUNT = 357,
-    STATE_COUNT = 664,
+    ACCEPT_STATE = 665,
+    RULE_COUNT = 358,
+    STATE_COUNT = 666,
     TERMINAL_COUNT = 106,
     NON_TERMINAL_COUNT = 111,
 
-    GOTO_INDEX_OFFSET = 664,
-    GOTO_INFO_OFFSET = 3104,
-    GOTO_CHECK_OFFSET = 3104
+    GOTO_INDEX_OFFSET = 666,
+    GOTO_INFO_OFFSET = 3018,
+    GOTO_CHECK_OFFSET = 3018
   };
 
   static const char  *const    spell [];
diff --git a/src/tools/qdoc/qmlparser/qqmljsparser.cpp b/src/tools/qdoc/qmlparser/qqmljsparser.cpp
index 262043b3b8..762e60c827 100644
--- a/src/tools/qdoc/qmlparser/qqmljsparser.cpp
+++ b/src/tools/qdoc/qmlparser/qqmljsparser.cpp
@@ -567,56 +567,78 @@ case 69: {
 }   break;
 
 case 70: {
-    sym(1).Node = new (pool) AST::UiSourceElement(sym(1).Node);
+    AST::UiPublicMember *node = new (pool) AST::UiPublicMember(stringRef(3), stringRef(4));
+    node->isReadonlyMember = true;
+    node->readonlyToken = loc(1);
+    node->propertyToken = loc(2);
+    node->typeToken = loc(3);
+    node->identifierToken = loc(4);
+    node->semicolonToken = loc(5); // insert a fake ';' before ':'
+
+    AST::UiQualifiedId *propertyName = new (pool) AST::UiQualifiedId(stringRef(4));
+    propertyName->identifierToken = loc(4);
+    propertyName->next = 0;
+
+    AST::UiObjectBinding *binding = new (pool) AST::UiObjectBinding(
+      propertyName, sym(6).UiQualifiedId, sym(7).UiObjectInitializer);
+    binding->colonToken = loc(5);
+
+    node->binding = binding;
+
+    sym(1).Node = node;
 }   break;
 
 case 71: {
     sym(1).Node = new (pool) AST::UiSourceElement(sym(1).Node);
 }   break;
 
-case 79: {
+case 72: {
+    sym(1).Node = new (pool) AST::UiSourceElement(sym(1).Node);
+}   break;
+
+case 80: {
   AST::ThisExpression *node = new (pool) AST::ThisExpression();
   node->thisToken = loc(1);
   sym(1).Node = node;
 } break;
 
-case 80: {
+case 81: {
   AST::IdentifierExpression *node = new (pool) AST::IdentifierExpression(stringRef(1));
   node->identifierToken = loc(1);
   sym(1).Node = node;
 } break;
 
-case 81: {
+case 82: {
   AST::NullExpression *node = new (pool) AST::NullExpression();
   node->nullToken = loc(1);
   sym(1).Node = node;
 } break;
 
-case 82: {
+case 83: {
   AST::TrueLiteral *node = new (pool) AST::TrueLiteral();
   node->trueToken = loc(1);
   sym(1).Node = node;
 } break;
 
-case 83: {
+case 84: {
   AST::FalseLiteral *node = new (pool) AST::FalseLiteral();
   node->falseToken = loc(1);
   sym(1).Node = node;
 } break;
 
-case 84: {
+case 85: {
   AST::NumericLiteral *node = new (pool) AST::NumericLiteral(sym(1).dval);
   node->literalToken = loc(1);
   sym(1).Node = node;
 } break;
-case 85:
-case 86: {
+case 86:
+case 87: {
   AST::StringLiteral *node = new (pool) AST::StringLiteral(stringRef(1));
   node->literalToken = loc(1);
   sym(1).Node = node;
 } break;
 
-case 87: {
+case 88: {
   bool rx = lexer->scanRegExp(Lexer::NoPrefix);
   if (!rx) {
     diagnostic_messages.append(DiagnosticMessage(DiagnosticMessage::Error, location(lexer), lexer->errorMessage()));
@@ -632,7 +654,7 @@ case 87: {
   sym(1).Node = node;
 } break;
 
-case 88: {
+case 89: {
   bool rx = lexer->scanRegExp(Lexer::EqualPrefix);
   if (!rx) {
     diagnostic_messages.append(DiagnosticMessage(DiagnosticMessage::Error, location(lexer), lexer->errorMessage()));
@@ -648,28 +670,28 @@ case 88: {
   sym(1).Node = node;
 } break;
 
-case 89: {
+case 90: {
   AST::ArrayLiteral *node = new (pool) AST::ArrayLiteral((AST::Elision *) 0);
   node->lbracketToken = loc(1);
   node->rbracketToken = loc(2);
   sym(1).Node = node;
 } break;
 
-case 90: {
+case 91: {
   AST::ArrayLiteral *node = new (pool) AST::ArrayLiteral(sym(2).Elision->finish());
   node->lbracketToken = loc(1);
   node->rbracketToken = loc(3);
   sym(1).Node = node;
 } break;
 
-case 91: {
+case 92: {
   AST::ArrayLiteral *node = new (pool) AST::ArrayLiteral(sym(2).ElementList->finish ());
   node->lbracketToken = loc(1);
   node->rbracketToken = loc(3);
   sym(1).Node = node;
 } break;
 
-case 92: {
+case 93: {
   AST::ArrayLiteral *node = new (pool) AST::ArrayLiteral(sym(2).ElementList->finish (),
     (AST::Elision *) 0);
   node->lbracketToken = loc(1);
@@ -678,7 +700,7 @@ case 92: {
   sym(1).Node = node;
 } break;
 
-case 93: {
+case 94: {
   AST::ArrayLiteral *node = new (pool) AST::ArrayLiteral(sym(2).ElementList->finish (),
     sym(4).Elision->finish());
   node->lbracketToken = loc(1);
@@ -687,7 +709,7 @@ case 93: {
   sym(1).Node = node;
 } break;
 
-case 94: {
+case 95: {
   AST::ObjectLiteral *node = 0;
   if (sym(2).Node)
     node = new (pool) AST::ObjectLiteral(
@@ -699,7 +721,7 @@ case 94: {
   sym(1).Node = node;
 } break;
 
-case 95: {
+case 96: {
   AST::ObjectLiteral *node = new (pool) AST::ObjectLiteral(
     sym(2).PropertyAssignmentList->finish ());
   node->lbraceToken = loc(1);
@@ -707,14 +729,14 @@ case 95: {
   sym(1).Node = node;
 } break;
 
-case 96: {
+case 97: {
   AST::NestedExpression *node = new (pool) AST::NestedExpression(sym(2).Expression);
   node->lparenToken = loc(1);
   node->rparenToken = loc(3);
   sym(1).Node = node;
 } break;
 
-case 97: {
+case 98: {
   if (AST::ArrayMemberExpression *mem = AST::cast<AST::ArrayMemberExpression *>(sym(1).Expression)) {
     diagnostic_messages.append(DiagnosticMessage(DiagnosticMessage::Warning, mem->lbracketToken,
       QLatin1String("Ignored annotation")));
@@ -734,48 +756,48 @@ case 97: {
   }
 } break;
 
-case 98: {
+case 99: {
   sym(1).Node = new (pool) AST::ElementList((AST::Elision *) 0, sym(1).Expression);
 } break;
 
-case 99: {
+case 100: {
   sym(1).Node = new (pool) AST::ElementList(sym(1).Elision->finish(), sym(2).Expression);
 } break;
 
-case 100: {
+case 101: {
   AST::ElementList *node = new (pool) AST::ElementList(sym(1).ElementList,
     (AST::Elision *) 0, sym(3).Expression);
   node->commaToken = loc(2);
   sym(1).Node = node;
 } break;
 
-case 101: {
+case 102: {
   AST::ElementList *node = new (pool) AST::ElementList(sym(1).ElementList, sym(3).Elision->finish(),
     sym(4).Expression);
   node->commaToken = loc(2);
   sym(1).Node = node;
 } break;
 
-case 102: {
+case 103: {
   AST::Elision *node = new (pool) AST::Elision();
   node->commaToken = loc(1);
   sym(1).Node = node;
 } break;
 
-case 103: {
+case 104: {
   AST::Elision *node = new (pool) AST::Elision(sym(1).Elision);
   node->commaToken = loc(2);
   sym(1).Node = node;
 } break;
 
-case 104: {
+case 105: {
   AST::PropertyNameAndValue *node = new (pool) AST::PropertyNameAndValue(
       sym(1).PropertyName, sym(3).Expression);
   node->colonToken = loc(2);
   sym(1).Node = node;
 } break;
 
-case 105: {
+case 106: {
   AST::PropertyGetterSetter *node = new (pool) AST::PropertyGetterSetter(
       sym(2).PropertyName, sym(6).FunctionBody);
   node->getSetToken = loc(1);
@@ -786,7 +808,7 @@ case 105: {
   sym(1).Node = node;
 } break;
 
-case 106: {
+case 107: {
   AST::PropertyGetterSetter *node = new (pool) AST::PropertyGetterSetter(
       sym(2).PropertyName, sym(4).FormalParameterList, sym(7).FunctionBody);
   node->getSetToken = loc(1);
@@ -797,56 +819,56 @@ case 106: {
   sym(1).Node = node;
 } break;
 
-case 107: {
+case 108: {
   sym(1).Node = new (pool) AST::PropertyAssignmentList(sym(1).PropertyAssignment);
 } break;
 
-case 108: {
+case 109: {
   AST::PropertyAssignmentList *node = new (pool) AST::PropertyAssignmentList(
     sym(1).PropertyAssignmentList, sym(3).PropertyAssignment);
   node->commaToken = loc(2);
   sym(1).Node = node;
 } break;
 
-case 109: {
+case 110: {
   AST::IdentifierPropertyName *node = new (pool) AST::IdentifierPropertyName(stringRef(1));
   node->propertyNameToken = loc(1);
   sym(1).Node = node;
 } break;
 
-case 110: {
+case 111: {
   AST::StringLiteralPropertyName *node = new (pool) AST::StringLiteralPropertyName(stringRef(1));
   node->propertyNameToken = loc(1);
   sym(1).Node = node;
 } break;
 
-case 111: {
+case 112: {
   AST::NumericLiteralPropertyName *node = new (pool) AST::NumericLiteralPropertyName(sym(1).dval);
   node->propertyNameToken = loc(1);
   sym(1).Node = node;
 } break;
 
-case 112: {
+case 113: {
   AST::IdentifierPropertyName *node = new (pool) AST::IdentifierPropertyName(stringRef(1));
   node->propertyNameToken = loc(1);
   sym(1).Node = node;
 } break;
 
-case 148: {
+case 149: {
   AST::ArrayMemberExpression *node = new (pool) AST::ArrayMemberExpression(sym(1).Expression, sym(3).Expression);
   node->lbracketToken = loc(2);
   node->rbracketToken = loc(4);
   sym(1).Node = node;
 } break;
 
-case 149: {
+case 150: {
   AST::FieldMemberExpression *node = new (pool) AST::FieldMemberExpression(sym(1).Expression, stringRef(3));
   node->dotToken = loc(2);
   node->identifierToken = loc(3);
   sym(1).Node = node;
 } break;
 
-case 150: {
+case 151: {
   AST::NewMemberExpression *node = new (pool) AST::NewMemberExpression(sym(2).Expression, sym(4).ArgumentList);
   node->newToken = loc(1);
   node->lparenToken = loc(3);
@@ -854,384 +876,384 @@ case 150: {
   sym(1).Node = node;
 } break;
 
-case 152: {
+case 153: {
   AST::NewExpression *node = new (pool) AST::NewExpression(sym(2).Expression);
   node->newToken = loc(1);
   sym(1).Node = node;
 } break;
 
-case 153: {
+case 154: {
   AST::CallExpression *node = new (pool) AST::CallExpression(sym(1).Expression, sym(3).ArgumentList);
   node->lparenToken = loc(2);
   node->rparenToken = loc(4);
   sym(1).Node = node;
 } break;
 
-case 154: {
+case 155: {
   AST::CallExpression *node = new (pool) AST::CallExpression(sym(1).Expression, sym(3).ArgumentList);
   node->lparenToken = loc(2);
   node->rparenToken = loc(4);
   sym(1).Node = node;
 } break;
 
-case 155: {
+case 156: {
   AST::ArrayMemberExpression *node = new (pool) AST::ArrayMemberExpression(sym(1).Expression, sym(3).Expression);
   node->lbracketToken = loc(2);
   node->rbracketToken = loc(4);
   sym(1).Node = node;
 } break;
 
-case 156: {
+case 157: {
   AST::FieldMemberExpression *node = new (pool) AST::FieldMemberExpression(sym(1).Expression, stringRef(3));
   node->dotToken = loc(2);
   node->identifierToken = loc(3);
   sym(1).Node = node;
 } break;
 
-case 157: {
+case 158: {
   sym(1).Node = 0;
 } break;
 
-case 158: {
+case 159: {
   sym(1).Node = sym(1).ArgumentList->finish();
 } break;
 
-case 159: {
+case 160: {
   sym(1).Node = new (pool) AST::ArgumentList(sym(1).Expression);
 } break;
 
-case 160: {
+case 161: {
   AST::ArgumentList *node = new (pool) AST::ArgumentList(sym(1).ArgumentList, sym(3).Expression);
   node->commaToken = loc(2);
   sym(1).Node = node;
 } break;
 
-case 164: {
+case 165: {
   AST::PostIncrementExpression *node = new (pool) AST::PostIncrementExpression(sym(1).Expression);
   node->incrementToken = loc(2);
   sym(1).Node = node;
 } break;
 
-case 165: {
+case 166: {
   AST::PostDecrementExpression *node = new (pool) AST::PostDecrementExpression(sym(1).Expression);
   node->decrementToken = loc(2);
   sym(1).Node = node;
 } break;
 
-case 167: {
+case 168: {
   AST::DeleteExpression *node = new (pool) AST::DeleteExpression(sym(2).Expression);
   node->deleteToken = loc(1);
   sym(1).Node = node;
 } break;
 
-case 168: {
+case 169: {
   AST::VoidExpression *node = new (pool) AST::VoidExpression(sym(2).Expression);
   node->voidToken = loc(1);
   sym(1).Node = node;
 } break;
 
-case 169: {
+case 170: {
   AST::TypeOfExpression *node = new (pool) AST::TypeOfExpression(sym(2).Expression);
   node->typeofToken = loc(1);
   sym(1).Node = node;
 } break;
 
-case 170: {
+case 171: {
   AST::PreIncrementExpression *node = new (pool) AST::PreIncrementExpression(sym(2).Expression);
   node->incrementToken = loc(1);
   sym(1).Node = node;
 } break;
 
-case 171: {
+case 172: {
   AST::PreDecrementExpression *node = new (pool) AST::PreDecrementExpression(sym(2).Expression);
   node->decrementToken = loc(1);
   sym(1).Node = node;
 } break;
 
-case 172: {
+case 173: {
   AST::UnaryPlusExpression *node = new (pool) AST::UnaryPlusExpression(sym(2).Expression);
   node->plusToken = loc(1);
   sym(1).Node = node;
 } break;
 
-case 173: {
+case 174: {
   AST::UnaryMinusExpression *node = new (pool) AST::UnaryMinusExpression(sym(2).Expression);
   node->minusToken = loc(1);
   sym(1).Node = node;
 } break;
 
-case 174: {
+case 175: {
   AST::TildeExpression *node = new (pool) AST::TildeExpression(sym(2).Expression);
   node->tildeToken = loc(1);
   sym(1).Node = node;
 } break;
 
-case 175: {
+case 176: {
   AST::NotExpression *node = new (pool) AST::NotExpression(sym(2).Expression);
   node->notToken = loc(1);
   sym(1).Node = node;
 } break;
 
-case 177: {
+case 178: {
   AST::BinaryExpression *node = new (pool) AST::BinaryExpression(sym(1).Expression,
     QSOperator::Mul, sym(3).Expression);
   node->operatorToken = loc(2);
   sym(1).Node = node;
 } break;
 
-case 178: {
+case 179: {
   AST::BinaryExpression *node = new (pool) AST::BinaryExpression(sym(1).Expression,
     QSOperator::Div, sym(3).Expression);
   node->operatorToken = loc(2);
   sym(1).Node = node;
 } break;
 
-case 179: {
+case 180: {
   AST::BinaryExpression *node = new (pool) AST::BinaryExpression(sym(1).Expression,
     QSOperator::Mod, sym(3).Expression);
   node->operatorToken = loc(2);
   sym(1).Node = node;
 } break;
 
-case 181: {
+case 182: {
   AST::BinaryExpression *node = new (pool) AST::BinaryExpression(sym(1).Expression,
     QSOperator::Add, sym(3).Expression);
   node->operatorToken = loc(2);
   sym(1).Node = node;
 } break;
 
-case 182: {
+case 183: {
   AST::BinaryExpression *node = new (pool) AST::BinaryExpression(sym(1).Expression,
     QSOperator::Sub, sym(3).Expression);
   node->operatorToken = loc(2);
   sym(1).Node = node;
 } break;
 
-case 184: {
+case 185: {
   AST::BinaryExpression *node = new (pool) AST::BinaryExpression(sym(1).Expression,
     QSOperator::LShift, sym(3).Expression);
   node->operatorToken = loc(2);
   sym(1).Node = node;
 } break;
 
-case 185: {
+case 186: {
   AST::BinaryExpression *node = new (pool) AST::BinaryExpression(sym(1).Expression,
     QSOperator::RShift, sym(3).Expression);
   node->operatorToken = loc(2);
   sym(1).Node = node;
 } break;
 
-case 186: {
+case 187: {
   AST::BinaryExpression *node = new (pool) AST::BinaryExpression(sym(1).Expression,
     QSOperator::URShift, sym(3).Expression);
   node->operatorToken = loc(2);
   sym(1).Node = node;
 } break;
 
-case 188: {
+case 189: {
   AST::BinaryExpression *node = new (pool) AST::BinaryExpression(sym(1).Expression,
     QSOperator::Lt, sym(3).Expression);
   node->operatorToken = loc(2);
   sym(1).Node = node;
 } break;
 
-case 189: {
+case 190: {
   AST::BinaryExpression *node = new (pool) AST::BinaryExpression(sym(1).Expression,
     QSOperator::Gt, sym(3).Expression);
   node->operatorToken = loc(2);
   sym(1).Node = node;
 } break;
 
-case 190: {
+case 191: {
   AST::BinaryExpression *node = new (pool) AST::BinaryExpression(sym(1).Expression,
     QSOperator::Le, sym(3).Expression);
   node->operatorToken = loc(2);
   sym(1).Node = node;
 } break;
 
-case 191: {
+case 192: {
   AST::BinaryExpression *node = new (pool) AST::BinaryExpression(sym(1).Expression,
     QSOperator::Ge, sym(3).Expression);
   node->operatorToken = loc(2);
   sym(1).Node = node;
 } break;
 
-case 192: {
+case 193: {
   AST::BinaryExpression *node = new (pool) AST::BinaryExpression(sym(1).Expression,
     QSOperator::InstanceOf, sym(3).Expression);
   node->operatorToken = loc(2);
   sym(1).Node = node;
 } break;
 
-case 193: {
+case 194: {
   AST::BinaryExpression *node = new (pool) AST::BinaryExpression(sym(1).Expression,
     QSOperator::In, sym(3).Expression);
   node->operatorToken = loc(2);
   sym(1).Node = node;
 } break;
 
-case 195: {
+case 196: {
   AST::BinaryExpression *node = new (pool) AST::BinaryExpression(sym(1).Expression,
     QSOperator::Lt, sym(3).Expression);
   node->operatorToken = loc(2);
   sym(1).Node = node;
 } break;
 
-case 196: {
+case 197: {
   AST::BinaryExpression *node = new (pool) AST::BinaryExpression(sym(1).Expression,
     QSOperator::Gt, sym(3).Expression);
   node->operatorToken = loc(2);
   sym(1).Node = node;
 } break;
 
-case 197: {
+case 198: {
   AST::BinaryExpression *node = new (pool) AST::BinaryExpression(sym(1).Expression,
     QSOperator::Le, sym(3).Expression);
   node->operatorToken = loc(2);
   sym(1).Node = node;
 } break;
 
-case 198: {
+case 199: {
   AST::BinaryExpression *node = new (pool) AST::BinaryExpression(sym(1).Expression,
    QSOperator::Ge, sym(3).Expression);
   node->operatorToken = loc(2);
   sym(1).Node = node;
 } break;
 
-case 199: {
+case 200: {
   AST::BinaryExpression *node = new (pool) AST::BinaryExpression(sym(1).Expression,
     QSOperator::InstanceOf, sym(3).Expression);
   node->operatorToken = loc(2);
   sym(1).Node = node;
 } break;
 
-case 201: {
+case 202: {
   AST::BinaryExpression *node = new (pool) AST::BinaryExpression(sym(1).Expression,
     QSOperator::Equal, sym(3).Expression);
   node->operatorToken = loc(2);
   sym(1).Node = node;
 } break;
 
-case 202: {
+case 203: {
   AST::BinaryExpression *node = new (pool) AST::BinaryExpression(sym(1).Expression,
     QSOperator::NotEqual, sym(3).Expression);
   node->operatorToken = loc(2);
   sym(1).Node = node;
 } break;
 
-case 203: {
+case 204: {
   AST::BinaryExpression *node = new (pool) AST::BinaryExpression(sym(1).Expression,
     QSOperator::StrictEqual, sym(3).Expression);
   node->operatorToken = loc(2);
   sym(1).Node = node;
 } break;
 
-case 204: {
+case 205: {
   AST::BinaryExpression *node = new (pool) AST::BinaryExpression(sym(1).Expression,
     QSOperator::StrictNotEqual, sym(3).Expression);
   node->operatorToken = loc(2);
   sym(1).Node = node;
 } break;
 
-case 206: {
+case 207: {
   AST::BinaryExpression *node = new (pool) AST::BinaryExpression(sym(1).Expression,
     QSOperator::Equal, sym(3).Expression);
   node->operatorToken = loc(2);
   sym(1).Node = node;
 } break;
 
-case 207: {
+case 208: {
   AST::BinaryExpression *node = new (pool) AST::BinaryExpression(sym(1).Expression,
     QSOperator::NotEqual, sym(3).Expression);
   node->operatorToken = loc(2);
   sym(1).Node = node;
 } break;
 
-case 208: {
+case 209: {
   AST::BinaryExpression *node = new (pool) AST::BinaryExpression(sym(1).Expression,
     QSOperator::StrictEqual, sym(3).Expression);
   node->operatorToken = loc(2);
   sym(1).Node = node;
 } break;
 
-case 209: {
+case 210: {
   AST::BinaryExpression *node = new (pool) AST::BinaryExpression(sym(1).Expression,
     QSOperator::StrictNotEqual, sym(3).Expression);
   node->operatorToken = loc(2);
   sym(1).Node = node;
 } break;
 
-case 211: {
+case 212: {
   AST::BinaryExpression *node = new (pool) AST::BinaryExpression(sym(1).Expression,
     QSOperator::BitAnd, sym(3).Expression);
   node->operatorToken = loc(2);
   sym(1).Node = node;
 } break;
 
-case 213: {
+case 214: {
   AST::BinaryExpression *node = new (pool) AST::BinaryExpression(sym(1).Expression,
     QSOperator::BitAnd, sym(3).Expression);
   node->operatorToken = loc(2);
   sym(1).Node = node;
 } break;
 
-case 215: {
+case 216: {
   AST::BinaryExpression *node = new (pool) AST::BinaryExpression(sym(1).Expression,
     QSOperator::BitXor, sym(3).Expression);
   node->operatorToken = loc(2);
   sym(1).Node = node;
 } break;
 
-case 217: {
+case 218: {
   AST::BinaryExpression *node = new (pool) AST::BinaryExpression(sym(1).Expression,
     QSOperator::BitXor, sym(3).Expression);
   node->operatorToken = loc(2);
   sym(1).Node = node;
 } break;
 
-case 219: {
+case 220: {
   AST::BinaryExpression *node = new (pool) AST::BinaryExpression(sym(1).Expression,
     QSOperator::BitOr, sym(3).Expression);
   node->operatorToken = loc(2);
   sym(1).Node = node;
 } break;
 
-case 221: {
+case 222: {
   AST::BinaryExpression *node = new (pool) AST::BinaryExpression(sym(1).Expression,
     QSOperator::BitOr, sym(3).Expression);
   node->operatorToken = loc(2);
   sym(1).Node = node;
 } break;
 
-case 223: {
+case 224: {
   AST::BinaryExpression *node = new (pool) AST::BinaryExpression(sym(1).Expression,
     QSOperator::And, sym(3).Expression);
   node->operatorToken = loc(2);
   sym(1).Node = node;
 } break;
 
-case 225: {
+case 226: {
   AST::BinaryExpression *node = new (pool) AST::BinaryExpression(sym(1).Expression,
     QSOperator::And, sym(3).Expression);
   node->operatorToken = loc(2);
   sym(1).Node = node;
 } break;
 
-case 227: {
+case 228: {
   AST::BinaryExpression *node = new (pool) AST::BinaryExpression(sym(1).Expression,
     QSOperator::Or, sym(3).Expression);
   node->operatorToken = loc(2);
   sym(1).Node = node;
 } break;
 
-case 229: {
+case 230: {
   AST::BinaryExpression *node = new (pool) AST::BinaryExpression(sym(1).Expression,
     QSOperator::Or, sym(3).Expression);
   node->operatorToken = loc(2);
   sym(1).Node = node;
 } break;
 
-case 231: {
+case 232: {
   AST::ConditionalExpression *node = new (pool) AST::ConditionalExpression(sym(1).Expression,
     sym(3).Expression, sym(5).Expression);
   node->questionToken = loc(2);
@@ -1239,7 +1261,7 @@ case 231: {
   sym(1).Node = node;
 } break;
 
-case 233: {
+case 234: {
   AST::ConditionalExpression *node = new (pool) AST::ConditionalExpression(sym(1).Expression,
     sym(3).Expression, sym(5).Expression);
   node->questionToken = loc(2);
@@ -1247,112 +1269,112 @@ case 233: {
   sym(1).Node = node;
 } break;
 
-case 235: {
+case 236: {
   AST::BinaryExpression *node = new (pool) AST::BinaryExpression(sym(1).Expression,
     sym(2).ival, sym(3).Expression);
   node->operatorToken = loc(2);
   sym(1).Node = node;
 } break;
 
-case 237: {
+case 238: {
   AST::BinaryExpression *node = new (pool) AST::BinaryExpression(sym(1).Expression,
     sym(2).ival, sym(3).Expression);
   node->operatorToken = loc(2);
   sym(1).Node = node;
 } break;
 
-case 238: {
+case 239: {
   sym(1).ival = QSOperator::Assign;
 } break;
 
-case 239: {
+case 240: {
   sym(1).ival = QSOperator::InplaceMul;
 } break;
 
-case 240: {
+case 241: {
   sym(1).ival = QSOperator::InplaceDiv;
 } break;
 
-case 241: {
+case 242: {
   sym(1).ival = QSOperator::InplaceMod;
 } break;
 
-case 242: {
+case 243: {
   sym(1).ival = QSOperator::InplaceAdd;
 } break;
 
-case 243: {
+case 244: {
   sym(1).ival = QSOperator::InplaceSub;
 } break;
 
-case 244: {
+case 245: {
   sym(1).ival = QSOperator::InplaceLeftShift;
 } break;
 
-case 245: {
+case 246: {
   sym(1).ival = QSOperator::InplaceRightShift;
 } break;
 
-case 246: {
+case 247: {
   sym(1).ival = QSOperator::InplaceURightShift;
 } break;
 
-case 247: {
+case 248: {
   sym(1).ival = QSOperator::InplaceAnd;
 } break;
 
-case 248: {
+case 249: {
   sym(1).ival = QSOperator::InplaceXor;
 } break;
 
-case 249: {
+case 250: {
   sym(1).ival = QSOperator::InplaceOr;
 } break;
 
-case 251: {
+case 252: {
   AST::Expression *node = new (pool) AST::Expression(sym(1).Expression, sym(3).Expression);
   node->commaToken = loc(2);
   sym(1).Node = node;
 } break;
 
-case 252: {
+case 253: {
   sym(1).Node = 0;
 } break;
 
-case 255: {
+case 256: {
   AST::Expression *node = new (pool) AST::Expression(sym(1).Expression, sym(3).Expression);
   node->commaToken = loc(2);
   sym(1).Node = node;
 } break;
 
-case 256: {
+case 257: {
   sym(1).Node = 0;
 } break;
 
-case 273: {
+case 274: {
   AST::Block *node = new (pool) AST::Block(sym(2).StatementList);
   node->lbraceToken = loc(1);
   node->rbraceToken = loc(3);
   sym(1).Node = node;
 } break;
 
-case 274: {
+case 275: {
   sym(1).Node = new (pool) AST::StatementList(sym(1).Statement);
 } break;
 
-case 275: {
+case 276: {
   sym(1).Node = new (pool) AST::StatementList(sym(1).StatementList, sym(2).Statement);
 } break;
 
-case 276: {
+case 277: {
   sym(1).Node = 0;
 } break;
 
-case 277: {
+case 278: {
   sym(1).Node = sym(1).StatementList->finish ();
 } break;
 
-case 279: {
+case 280: {
   AST::VariableStatement *node = new (pool) AST::VariableStatement(
      sym(2).VariableDeclarationList->finish (/*readOnly=*/sym(1).ival == T_CONST));
   node->declarationKindToken = loc(1);
@@ -1360,76 +1382,76 @@ case 279: {
   sym(1).Node = node;
 } break;
 
-case 280: {
+case 281: {
   sym(1).ival = T_CONST;
 } break;
 
-case 281: {
+case 282: {
   sym(1).ival = T_VAR;
 } break;
 
-case 282: {
+case 283: {
   sym(1).Node = new (pool) AST::VariableDeclarationList(sym(1).VariableDeclaration);
 } break;
 
-case 283: {
+case 284: {
   AST::VariableDeclarationList *node = new (pool) AST::VariableDeclarationList(
     sym(1).VariableDeclarationList, sym(3).VariableDeclaration);
   node->commaToken = loc(2);
   sym(1).Node = node;
 } break;
 
-case 284: {
+case 285: {
   sym(1).Node = new (pool) AST::VariableDeclarationList(sym(1).VariableDeclaration);
 } break;
 
-case 285: {
+case 286: {
   sym(1).Node = new (pool) AST::VariableDeclarationList(sym(1).VariableDeclarationList, sym(3).VariableDeclaration);
 } break;
 
-case 286: {
+case 287: {
   AST::VariableDeclaration *node = new (pool) AST::VariableDeclaration(stringRef(1), sym(2).Expression);
   node->identifierToken = loc(1);
   sym(1).Node = node;
 } break;
 
-case 287: {
+case 288: {
   AST::VariableDeclaration *node = new (pool) AST::VariableDeclaration(stringRef(1), sym(2).Expression);
   node->identifierToken = loc(1);
   sym(1).Node = node;
 } break;
 
-case 288: {
+case 289: {
   // ### TODO: AST for initializer
   sym(1) = sym(2);
 } break;
 
-case 289: {
+case 290: {
   sym(1).Node = 0;
 } break;
 
-case 291: {
+case 292: {
   // ### TODO: AST for initializer
   sym(1) = sym(2);
 } break;
 
-case 292: {
+case 293: {
   sym(1).Node = 0;
 } break;
 
-case 294: {
+case 295: {
   AST::EmptyStatement *node = new (pool) AST::EmptyStatement();
   node->semicolonToken = loc(1);
   sym(1).Node = node;
 } break;
 
-case 296: {
+case 297: {
   AST::ExpressionStatement *node = new (pool) AST::ExpressionStatement(sym(1).Expression);
   node->semicolonToken = loc(2);
   sym(1).Node = node;
 } break;
 
-case 297: {
+case 298: {
   AST::IfStatement *node = new (pool) AST::IfStatement(sym(3).Expression, sym(5).Statement, sym(7).Statement);
   node->ifToken = loc(1);
   node->lparenToken = loc(2);
@@ -1438,7 +1460,7 @@ case 297: {
   sym(1).Node = node;
 } break;
 
-case 298: {
+case 299: {
   AST::IfStatement *node = new (pool) AST::IfStatement(sym(3).Expression, sym(5).Statement);
   node->ifToken = loc(1);
   node->lparenToken = loc(2);
@@ -1446,7 +1468,7 @@ case 298: {
   sym(1).Node = node;
 } break;
 
-case 301: {
+case 302: {
   AST::DoWhileStatement *node = new (pool) AST::DoWhileStatement(sym(2).Statement, sym(5).Expression);
   node->doToken = loc(1);
   node->whileToken = loc(3);
@@ -1456,7 +1478,7 @@ case 301: {
   sym(1).Node = node;
 } break;
 
-case 302: {
+case 303: {
   AST::WhileStatement *node = new (pool) AST::WhileStatement(sym(3).Expression, sym(5).Statement);
   node->whileToken = loc(1);
   node->lparenToken = loc(2);
@@ -1464,7 +1486,7 @@ case 302: {
   sym(1).Node = node;
 } break;
 
-case 303: {
+case 304: {
   AST::ForStatement *node = new (pool) AST::ForStatement(sym(3).Expression,
     sym(5).Expression, sym(7).Expression, sym(9).Statement);
   node->forToken = loc(1);
@@ -1475,7 +1497,7 @@ case 303: {
   sym(1).Node = node;
 } break;
 
-case 304: {
+case 305: {
   AST::LocalForStatement *node = new (pool) AST::LocalForStatement(
      sym(4).VariableDeclarationList->finish (/*readOnly=*/false), sym(6).Expression,
      sym(8).Expression, sym(10).Statement);
@@ -1488,7 +1510,7 @@ case 304: {
   sym(1).Node = node;
 } break;
 
-case 305: {
+case 306: {
   AST:: ForEachStatement *node = new (pool) AST::ForEachStatement(sym(3).Expression,
     sym(5).Expression, sym(7).Statement);
   node->forToken = loc(1);
@@ -1498,7 +1520,7 @@ case 305: {
   sym(1).Node = node;
 } break;
 
-case 306: {
+case 307: {
   AST::LocalForEachStatement *node = new (pool) AST::LocalForEachStatement(
     sym(4).VariableDeclaration, sym(6).Expression, sym(8).Statement);
   node->forToken = loc(1);
@@ -1509,14 +1531,14 @@ case 306: {
   sym(1).Node = node;
 } break;
 
-case 308: {
+case 309: {
   AST::ContinueStatement *node = new (pool) AST::ContinueStatement();
   node->continueToken = loc(1);
   node->semicolonToken = loc(2);
   sym(1).Node = node;
 } break;
 
-case 310: {
+case 311: {
   AST::ContinueStatement *node = new (pool) AST::ContinueStatement(stringRef(2));
   node->continueToken = loc(1);
   node->identifierToken = loc(2);
@@ -1524,14 +1546,14 @@ case 310: {
   sym(1).Node = node;
 } break;
 
-case 312: {
+case 313: {
   AST::BreakStatement *node = new (pool) AST::BreakStatement(QStringRef());
   node->breakToken = loc(1);
   node->semicolonToken = loc(2);
   sym(1).Node = node;
 } break;
 
-case 314: {
+case 315: {
   AST::BreakStatement *node = new (pool) AST::BreakStatement(stringRef(2));
   node->breakToken = loc(1);
   node->identifierToken = loc(2);
@@ -1539,14 +1561,14 @@ case 314: {
   sym(1).Node = node;
 } break;
 
-case 316: {
+case 317: {
   AST::ReturnStatement *node = new (pool) AST::ReturnStatement(sym(2).Expression);
   node->returnToken = loc(1);
   node->semicolonToken = loc(3);
   sym(1).Node = node;
 } break;
 
-case 317: {
+case 318: {
   AST::WithStatement *node = new (pool) AST::WithStatement(sym(3).Expression, sym(5).Statement);
   node->withToken = loc(1);
   node->lparenToken = loc(2);
@@ -1554,7 +1576,7 @@ case 317: {
   sym(1).Node = node;
 } break;
 
-case 318: {
+case 319: {
   AST::SwitchStatement *node = new (pool) AST::SwitchStatement(sym(3).Expression, sym(5).CaseBlock);
   node->switchToken = loc(1);
   node->lparenToken = loc(2);
@@ -1562,83 +1584,83 @@ case 318: {
   sym(1).Node = node;
 } break;
 
-case 319: {
+case 320: {
   AST::CaseBlock *node = new (pool) AST::CaseBlock(sym(2).CaseClauses);
   node->lbraceToken = loc(1);
   node->rbraceToken = loc(3);
   sym(1).Node = node;
 } break;
 
-case 320: {
+case 321: {
   AST::CaseBlock *node = new (pool) AST::CaseBlock(sym(2).CaseClauses, sym(3).DefaultClause, sym(4).CaseClauses);
   node->lbraceToken = loc(1);
   node->rbraceToken = loc(5);
   sym(1).Node = node;
 } break;
 
-case 321: {
+case 322: {
   sym(1).Node = new (pool) AST::CaseClauses(sym(1).CaseClause);
 } break;
 
-case 322: {
+case 323: {
   sym(1).Node = new (pool) AST::CaseClauses(sym(1).CaseClauses, sym(2).CaseClause);
 } break;
 
-case 323: {
+case 324: {
   sym(1).Node = 0;
 } break;
 
-case 324: {
+case 325: {
   sym(1).Node = sym(1).CaseClauses->finish ();
 } break;
 
-case 325: {
+case 326: {
   AST::CaseClause *node = new (pool) AST::CaseClause(sym(2).Expression, sym(4).StatementList);
   node->caseToken = loc(1);
   node->colonToken = loc(3);
   sym(1).Node = node;
 } break;
 
-case 326: {
+case 327: {
   AST::DefaultClause *node = new (pool) AST::DefaultClause(sym(3).StatementList);
   node->defaultToken = loc(1);
   node->colonToken = loc(2);
   sym(1).Node = node;
 } break;
 
-case 327: {
+case 328: {
   AST::LabelledStatement *node = new (pool) AST::LabelledStatement(stringRef(1), sym(3).Statement);
   node->identifierToken = loc(1);
   node->colonToken = loc(2);
   sym(1).Node = node;
 } break;
 
-case 329: {
+case 330: {
   AST::ThrowStatement *node = new (pool) AST::ThrowStatement(sym(2).Expression);
   node->throwToken = loc(1);
   node->semicolonToken = loc(3);
   sym(1).Node = node;
 } break;
 
-case 330: {
+case 331: {
   AST::TryStatement *node = new (pool) AST::TryStatement(sym(2).Statement, sym(3).Catch);
   node->tryToken = loc(1);
   sym(1).Node = node;
 } break;
 
-case 331: {
+case 332: {
   AST::TryStatement *node = new (pool) AST::TryStatement(sym(2).Statement, sym(3).Finally);
   node->tryToken = loc(1);
   sym(1).Node = node;
 } break;
 
-case 332: {
+case 333: {
   AST::TryStatement *node = new (pool) AST::TryStatement(sym(2).Statement, sym(3).Catch, sym(4).Finally);
   node->tryToken = loc(1);
   sym(1).Node = node;
 } break;
 
-case 333: {
+case 334: {
   AST::Catch *node = new (pool) AST::Catch(stringRef(3), sym(5).Block);
   node->catchToken = loc(1);
   node->lparenToken = loc(2);
@@ -1647,20 +1669,20 @@ case 333: {
   sym(1).Node = node;
 } break;
 
-case 334: {
+case 335: {
   AST::Finally *node = new (pool) AST::Finally(sym(2).Block);
   node->finallyToken = loc(1);
   sym(1).Node = node;
 } break;
 
-case 336: {
+case 337: {
   AST::DebuggerStatement *node = new (pool) AST::DebuggerStatement();
   node->debuggerToken = loc(1);
   node->semicolonToken = loc(2);
   sym(1).Node = node;
 } break;
 
-case 338: {
+case 339: {
   AST::FunctionDeclaration *node = new (pool) AST::FunctionDeclaration(stringRef(2), sym(4).FormalParameterList, sym(7).FunctionBody);
   node->functionToken = loc(1);
   node->identifierToken = loc(2);
@@ -1671,7 +1693,7 @@ case 338: {
   sym(1).Node = node;
 } break;
 
-case 339: {
+case 340: {
   AST::FunctionExpression *node = new (pool) AST::FunctionExpression(stringRef(2), sym(4).FormalParameterList, sym(7).FunctionBody);
   node->functionToken = loc(1);
   if (! stringRef(2).isNull())
@@ -1683,7 +1705,7 @@ case 339: {
   sym(1).Node = node;
 } break;
 
-case 340: {
+case 341: {
   AST::FunctionExpression *node = new (pool) AST::FunctionExpression(QStringRef(), sym(3).FormalParameterList, sym(6).FunctionBody);
   node->functionToken = loc(1);
   node->lparenToken = loc(2);
@@ -1693,56 +1715,56 @@ case 340: {
   sym(1).Node = node;
 } break;
 
-case 341: {
+case 342: {
   AST::FormalParameterList *node = new (pool) AST::FormalParameterList(stringRef(1));
   node->identifierToken = loc(1);
   sym(1).Node = node;
 } break;
 
-case 342: {
+case 343: {
   AST::FormalParameterList *node = new (pool) AST::FormalParameterList(sym(1).FormalParameterList, stringRef(3));
   node->commaToken = loc(2);
   node->identifierToken = loc(3);
   sym(1).Node = node;
 } break;
 
-case 343: {
+case 344: {
   sym(1).Node = 0;
 } break;
 
-case 344: {
+case 345: {
   sym(1).Node = sym(1).FormalParameterList->finish ();
 } break;
 
-case 345: {
+case 346: {
   sym(1).Node = 0;
 } break;
 
-case 347: {
+case 348: {
   sym(1).Node = new (pool) AST::FunctionBody(sym(1).SourceElements->finish ());
 } break;
 
-case 349: {
+case 350: {
   sym(1).Node = new (pool) AST::Program(sym(1).SourceElements->finish ());
 } break;
 
-case 350: {
+case 351: {
   sym(1).Node = new (pool) AST::SourceElements(sym(1).SourceElement);
 } break;
 
-case 351: {
+case 352: {
   sym(1).Node = new (pool) AST::SourceElements(sym(1).SourceElements, sym(2).SourceElement);
 } break;
 
-case 352: {
+case 353: {
   sym(1).Node = new (pool) AST::StatementSourceElement(sym(1).Statement);
 } break;
 
-case 353: {
+case 354: {
   sym(1).Node = new (pool) AST::FunctionSourceElement(sym(1).FunctionDeclaration);
 } break;
 
-case 354: {
+case 355: {
   sym(1).Node = 0;
 } break;
 
diff --git a/src/tools/qdoc/qmlparser/qqmljsparser_p.h b/src/tools/qdoc/qmlparser/qqmljsparser_p.h
index b0abf06b25..cf9f641fbc 100644
--- a/src/tools/qdoc/qmlparser/qqmljsparser_p.h
+++ b/src/tools/qdoc/qmlparser/qqmljsparser_p.h
@@ -240,9 +240,9 @@ protected:
 
 
 
-#define J_SCRIPT_REGEXPLITERAL_RULE1 87
+#define J_SCRIPT_REGEXPLITERAL_RULE1 88
 
-#define J_SCRIPT_REGEXPLITERAL_RULE2 88
+#define J_SCRIPT_REGEXPLITERAL_RULE2 89
 
 QT_QML_END_NAMESPACE