diff --git a/src/libs/qmljs/parser/grammar.patch b/src/libs/qmljs/parser/grammar.patch
index e8d82fc67b2..5de98e83f65 100644
--- a/src/libs/qmljs/parser/grammar.patch
+++ b/src/libs/qmljs/parser/grammar.patch
@@ -1,8 +1,10 @@
 diff --git a/src/libs/qmljs/parser/qmldirparser.cpp b/src/libs/qmljs/parser/qmldirparser.cpp
-index 747d2010f3..e9d22624ef 100644
+index 49b7ee9d0c..690d1ef557 100644
 --- a/src/libs/qmljs/parser/qmldirparser.cpp
 +++ b/src/libs/qmljs/parser/qmldirparser.cpp
-@@ -25,14 +25,10 @@
+@@ -1,72 +1,42 @@
+ // Copyright (C) 2021 The Qt Company Ltd.
+ // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0+ OR GPL-3.0 WITH Qt-GPL-exception-1.0
  
  #include "qmldirparser_p.h"
  
@@ -17,7 +19,19 @@ index 747d2010f3..e9d22624ef 100644
  static int parseInt(QStringView str, bool *ok)
  {
      int pos = 0;
-@@ -50,45 +46,19 @@ static int parseInt(QStringView str, bool *ok)
+     int number = 0;
+-    while (pos < str.length() && str.at(pos).isDigit()) {
++    while (pos < str.size() && str.at(pos).isDigit()) {
+         if (pos != 0)
+             number *= 10;
+         number += str.at(pos).unicode() - '0';
+         ++pos;
+     }
+-    if (pos != str.length())
++    if (pos != str.size())
+         *ok = false;
+     else
+         *ok = true;
      return number;
  }
  
@@ -32,7 +46,13 @@ index 747d2010f3..e9d22624ef 100644
 -            *minor = parseInt(QStringView(str.constData() + dotIndex + 1, str.length() - dotIndex - 1),
 -                              &ok);
 -        return ok;
--    }
++        const int major = parseInt(QStringView(str).left(dotIndex), &ok);
++        if (!ok)
++            return QTypeRevision();
++        const int minor = parseInt(QStringView(str).mid(dotIndex + 1, str.size() - dotIndex - 1),
++                                   &ok);
++        return ok ? QTypeRevision::fromVersion(major, minor) : QTypeRevision();
+     }
 -    return false;
 -}
 -
@@ -59,19 +79,13 @@ index 747d2010f3..e9d22624ef 100644
 -        major = parseInt(QStringView(str.constData(), str.length()),
 -                         &ok);
 -        minor = ComponentVersion::MaxVersion;
-+        const int major = parseInt(QStringView(str).left(dotIndex), &ok);
-+        if (!ok)
-+            return QTypeRevision();
-+        const int minor = parseInt(QStringView(str).mid(dotIndex + 1, str.length() - dotIndex - 1),
-+                                   &ok);
-+        return ok ? QTypeRevision::fromVersion(major, minor) : QTypeRevision();
-     }
+-    }
 -    return ComponentVersion(major, minor);
 +    return QTypeRevision();
  }
  
  void QmlDirParser::clear()
-@@ -132,12 +102,12 @@ bool QmlDirParser::parse(const QString &source)
+@@ -110,12 +80,12 @@ bool QmlDirParser::parse(const QString &source)
      auto readImport = [&](const QString *sections, int sectionCount, Import::Flags flags) {
          Import import;
          if (sectionCount == 2) {
@@ -87,7 +101,7 @@ index 747d2010f3..e9d22624ef 100644
                  if (version.isValid()) {
                      import = Import(sections[1], version, flags);
                  } else {
-@@ -275,7 +245,7 @@ bool QmlDirParser::parse(const QString &source)
+@@ -253,7 +243,7 @@ bool QmlDirParser::parse(const QString &source)
                              QStringLiteral("internal types require 2 arguments, but %1 were provided").arg(sectionCount - 1));
                  continue;
              }
@@ -96,7 +110,7 @@ index 747d2010f3..e9d22624ef 100644
              entry.internal = true;
              _components.insert(entry.typeName, entry);
          } else if (sections[0] == QLatin1String("singleton")) {
-@@ -286,16 +256,16 @@ bool QmlDirParser::parse(const QString &source)
+@@ -264,16 +254,16 @@ bool QmlDirParser::parse(const QString &source)
              } else if (sectionCount == 3) {
                  // handle qmldir directory listing case where singleton is defined in the following pattern:
                  // singleton TestSingletonType TestSingletonType.qml
@@ -117,7 +131,7 @@ index 747d2010f3..e9d22624ef 100644
                      entry.singleton = true;
                      _components.insert(entry.typeName, entry);
                  } else {
-@@ -361,19 +331,19 @@ bool QmlDirParser::parse(const QString &source)
+@@ -339,19 +339,19 @@ bool QmlDirParser::parse(const QString &source)
              _linkTarget = sections[1];
          } else if (sectionCount == 2) {
              // No version specified (should only be used for relative qmldir files)
@@ -142,7 +156,7 @@ index 747d2010f3..e9d22624ef 100644
                      _components.insert(entry.typeName, entry);
                  }
              } else {
-@@ -420,15 +390,19 @@ QList<QmlJS::DiagnosticMessage> QmlDirParser::errors(const QString &uri) const
+@@ -398,15 +398,19 @@ QList<QmlJS::DiagnosticMessage> QmlDirParser::errors(const QString &uri) const
  
  QDebug &operator<< (QDebug &debug, const QmlDirParser::Component &component)
  {
@@ -167,10 +181,16 @@ index 747d2010f3..e9d22624ef 100644
  }
  
 diff --git a/src/libs/qmljs/parser/qmldirparser_p.h b/src/libs/qmljs/parser/qmldirparser_p.h
-index d5a0aabfd0..c1869b7cc8 100644
+index 3d4ba5fdc0..9712ab2a6e 100644
 --- a/src/libs/qmljs/parser/qmldirparser_p.h
 +++ b/src/libs/qmljs/parser/qmldirparser_p.h
-@@ -36,15 +36,12 @@
+@@ -1,5 +1,5 @@
+ // Copyright (C) 2021 The Qt Company Ltd.
+ // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0+ OR GPL-3.0 WITH Qt-GPL-exception-1.0
+ 
+ #pragma once
+ 
+@@ -14,20 +14,17 @@
  // We mean it.
  //
  
@@ -191,7 +211,13 @@ index d5a0aabfd0..c1869b7cc8 100644
  
  QT_QML_BEGIN_NAMESPACE
  
-@@ -90,17 +87,19 @@ public:
+ class QmlEngine;
+-class QML_PARSER_EXPORT QmlDirParser
++class Q_QML_COMPILER_PRIVATE_EXPORT QmlDirParser
+ {
+ public:
+     void clear();
+@@ -68,17 +65,19 @@ public:
      {
          Component() = default;
  
@@ -216,7 +242,7 @@ index d5a0aabfd0..c1869b7cc8 100644
          bool internal = false;
          bool singleton = false;
      };
-@@ -109,16 +108,17 @@ public:
+@@ -87,43 +86,46 @@ public:
      {
          Script() = default;
  
@@ -238,7 +264,14 @@ index d5a0aabfd0..c1869b7cc8 100644
      };
  
      struct Import
-@@ -131,13 +131,15 @@ public:
+     {
+         enum Flag {
+             Default = 0x0,
+             Auto = 0x1,     // forward the version of the importing module
+             Optional = 0x2, // is not automatically imported but only a tooling hint
+             OptionalDefault
+             = 0x4, // tooling hint only, denotes this entry should be imported by tooling
+         };
          Q_DECLARE_FLAGS(Flags, Flag)
  
          Import() = default;
@@ -255,13 +288,37 @@ index d5a0aabfd0..c1869b7cc8 100644
 -        LanguageUtils::ComponentVersion version;     // invalid version is latest version, unless Flag::Auto
 +        QTypeRevision version; // invalid version is latest version, unless Flag::Auto
          Flags flags;
+ 
+         friend bool operator==(const Import &a, const Import &b)
+         {
+             return a.module == b.module && a.version == b.version && a.flags == b.flags;
+         }
      };
  
+     QMultiHash<QString,Component> components() const { return _components; }
 diff --git a/src/libs/qmljs/parser/qmlimportresolver.cpp b/src/libs/qmljs/parser/qmlimportresolver.cpp
-index e74c5840c1..e7416ef7f0 100644
+index 1d9582f76a..0c1c79860e 100644
 --- a/src/libs/qmljs/parser/qmlimportresolver.cpp
 +++ b/src/libs/qmljs/parser/qmlimportresolver.cpp
-@@ -40,20 +40,20 @@ enum ImportVersion { FullyVersioned, PartiallyVersioned, Unversioned };
+@@ -1,16 +1,13 @@
+ // Copyright (C) 2021 The Qt Company Ltd.
+ // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0+ OR GPL-3.0 WITH Qt-GPL-exception-1.0
+ 
+ #include "qmlimportresolver_p.h"
+-#include <QtCore/QList>
+-#include <QtCore/QStringList>
+-#include <QtCore/QStringView>
+ 
+ QT_QML_BEGIN_NAMESPACE
+ 
+ enum ImportVersion { FullyVersioned, PartiallyVersioned, Unversioned };
+ 
+-/*!
++/*
+     Forms complete paths to a module, from a list of base paths,
+     a module URI and version specification.
+ 
+@@ -21,20 +18,20 @@ enum ImportVersion { FullyVersioned, PartiallyVersioned, Unversioned };
      - base/QtQml.2/Models
      - base/QtQml/Models
  */
@@ -279,7 +336,8 @@ index e74c5840c1..e7416ef7f0 100644
  
      QStringList importPaths;
      // fully & partially versioned parts + 1 unversioned for each base path
-     importPaths.reserve(2 * parts.count() + 1);
+-    importPaths.reserve(2 * parts.count() + 1);
++    importPaths.reserve(2 * parts.size() + 1);
  
 -    auto versionString = [](LanguageUtils::ComponentVersion version, ImportVersion mode)
 -    {
@@ -287,7 +345,7 @@ index e74c5840c1..e7416ef7f0 100644
          if (mode == FullyVersioned) {
              // extension with fully encoded version number (eg. MyModule.3.2)
              return QString::fromLatin1(".%1.%2").arg(version.majorVersion())
-@@ -67,7 +67,7 @@ QStringList qQmlResolveImportPaths(QStringView uri, const QStringList &basePaths
+@@ -48,7 +45,7 @@ QStringList qQmlResolveImportPaths(QStringView uri, const QStringList &basePaths
          return QString();
      };
  
@@ -296,7 +354,7 @@ index e74c5840c1..e7416ef7f0 100644
          QString str;
          for (auto it = refs.cbegin(); it != refs.cend(); ++it) {
              if (it != refs.cbegin())
-@@ -77,9 +77,10 @@ QStringList qQmlResolveImportPaths(QStringView uri, const QStringList &basePaths
+@@ -58,9 +55,10 @@ QStringList qQmlResolveImportPaths(QStringView uri, const QStringList &basePaths
          return str;
      };
  
@@ -310,11 +368,26 @@ index e74c5840c1..e7416ef7f0 100644
      for (int mode = initial; mode <= Unversioned; ++mode) {
          const QString ver = versionString(version, ImportVersion(mode));
  
+@@ -74,7 +72,7 @@ QStringList qQmlResolveImportPaths(QStringView uri, const QStringList &basePaths
+ 
+             if (mode != Unversioned) {
+                 // insert in the middle
+-                for (int index = parts.count() - 2; index >= 0; --index) {
++                for (int index = parts.size() - 2; index >= 0; --index) {
+                     importPaths += dir + joinStringRefs(parts.mid(0, index + 1), Slash)
+                             + ver + Slash
+                             + joinStringRefs(parts.mid(index + 1), Slash);
 diff --git a/src/libs/qmljs/parser/qmlimportresolver_p.h b/src/libs/qmljs/parser/qmlimportresolver_p.h
-index 68c052d408..8f18de3d0b 100644
+index 4c9ed68d11..0a36cd3c9b 100644
 --- a/src/libs/qmljs/parser/qmlimportresolver_p.h
 +++ b/src/libs/qmljs/parser/qmlimportresolver_p.h
-@@ -40,11 +40,12 @@
+@@ -1,5 +1,5 @@
+ // Copyright (C) 2021 The Qt Company Ltd.
+ // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0+ OR GPL-3.0 WITH Qt-GPL-exception-1.0
+ 
+ #pragma once
+ 
+@@ -18,11 +18,12 @@
  
  #include "qmljsglobal_p.h"
  #include <QtCore/qstring.h>
@@ -325,72 +398,35 @@ index 68c052d408..8f18de3d0b 100644
  
 -QML_PARSER_EXPORT QStringList qQmlResolveImportPaths(QStringView uri, const QStringList &basePaths,
 -                                   LanguageUtils::ComponentVersion version);
-+QML_PARSER_EXPORT QStringList qQmlResolveImportPaths(QStringView uri,
-+                                                     const QStringList &basePaths,
-+                                                     QTypeRevision version);
++Q_QML_COMPILER_PRIVATE_EXPORT QStringList qQmlResolveImportPaths(QStringView uri,
++                                                                 const QStringList &basePaths,
++                                                                 QTypeRevision version);
  
  QT_QML_END_NAMESPACE
-diff --git a/src/libs/qmljs/parser/qmljs.g b/src/libs/qmljs/parser/qmljs.g
-index 5f62edf4d1..19f4e200e5 100644
---- a/src/libs/qmljs/parser/qmljs.g
-+++ b/src/libs/qmljs/parser/qmljs.g
-@@ -381,7 +381,7 @@ public:
-     inline DiagnosticMessage diagnosticMessage() const
-     {
-         for (const DiagnosticMessage &d : diagnostic_messages) {
--            if (d.kind != Severity::Warning)
-+            if (d.type != QtWarningMsg)
-                 return d;
-         }
- 
-@@ -425,7 +425,7 @@ protected:
-         DiagnosticMessage error;
-         error.loc = location;
-         error.message = message;
--        error.kind = DiagnosticMessage::qtMsgTypeToKind(kind);
-+        error.type = kind;
-         return error;
-     }
- 
-@@ -446,8 +446,8 @@ protected:
-     Value *sym_stack = nullptr;
-     int *state_stack = nullptr;
-     SourceLocation *location_stack = nullptr;
--    QVector<QStringView> string_stack;
--    QVector<QStringView> rawString_stack;
-+    QList<QStringView> string_stack;
-+    QList<QStringView> rawString_stack;
- 
-     AST::Node *program = nullptr;
- 
-@@ -849,7 +849,7 @@ UiVersionSpecifier: T_VERSION_NUMBER T_DOT T_VERSION_NUMBER;
-     case $rule_number: {
-         const int major = sym(1).dval;
-         const int minor = sym(3).dval;
--        if (major < 0  || major >= 255 || minor < 0 || minor >= 255) {
-+        if (!QTypeRevision::isValidSegment(major) || !QTypeRevision::isValidSegment(minor)) {
-             diagnostic_messages.append(
-                     compileError(loc(1),
-                     QLatin1String("Invalid version. Version numbers must be >= 0 and < 255.")));
-@@ -862,11 +862,12 @@ UiVersionSpecifier: T_VERSION_NUMBER T_DOT T_VERSION_NUMBER;
-     } break;
- ./
- 
-+
- UiVersionSpecifier: T_VERSION_NUMBER;
- /.
-     case $rule_number: {
-         const int major = sym(1).dval;
--        if (major < 0 || major >= 255) {
-+        if (!QTypeRevision::isValidSegment(major)) {
-             diagnostic_messages.append(
-                     compileError(loc(1),
-                     QLatin1String("Invalid major version. Version numbers must be >= 0 and < 255.")));
 diff --git a/src/libs/qmljs/parser/qmljsast_p.h b/src/libs/qmljs/parser/qmljsast_p.h
-index 78b9f4b080..dcbcb5fd0d 100644
+index ba5cc3a719..b7280b1f56 100644
 --- a/src/libs/qmljs/parser/qmljsast_p.h
 +++ b/src/libs/qmljs/parser/qmljsast_p.h
-@@ -654,12 +654,14 @@ class QML_PARSER_EXPORT UiVersionSpecifier : public Node
+@@ -19,16 +19,15 @@
+ 
+ #include "qmljs/parser/qmljsmemorypool_p.h"
+ 
+ #include <QtCore/qtaggedpointer.h>
+ #include <QtCore/qversionnumber.h>
+ 
+-QT_BEGIN_NAMESPACE
+-class QString;
+-QT_END_NAMESPACE
+ #include <type_traits>
+ 
+ QT_QML_BEGIN_NAMESPACE
+ 
++class QString;
++
+ namespace QmlJS {
+ class Parser;
+ }
+@@ -634,12 +614,14 @@ class QML_PARSER_EXPORT UiVersionSpecifier : public Node
  public:
      QMLJS_DECLARE_AST_NODE(UiVersionSpecifier)
  
@@ -407,7 +443,7 @@ index 78b9f4b080..dcbcb5fd0d 100644
      {
          kind = K;
      }
-@@ -674,8 +676,7 @@ public:
+@@ -654,8 +636,7 @@ public:
      }
  
      // attributes:
@@ -417,38 +453,34 @@ index 78b9f4b080..dcbcb5fd0d 100644
      SourceLocation majorToken;
      SourceLocation minorToken;
  };
-@@ -881,14 +882,14 @@ struct QML_PARSER_EXPORT BoundName
-     };
+@@ -3418,19 +3403,19 @@ public:
  
-     QString id;
--    TypeAnnotation *typeAnnotation;
--    Type typeAnnotationType;
-+    QTaggedPointer<TypeAnnotation, Type> typeAnnotation;
-     BoundName(const QString &id, TypeAnnotation *typeAnnotation, Type type = Declared)
--    : id(id), typeAnnotation(typeAnnotation), typeAnnotationType(type)
-+        : id(id)
-+        , typeAnnotation(typeAnnotation, type)
-     {}
-     BoundName() = default;
-     QString typeName() const { return typeAnnotation ? typeAnnotation->type->toString() : QString(); }
--    bool isInjected() const { return typeAnnotation && typeAnnotationType == Injected; }
-+    bool isInjected() const { return typeAnnotation.tag() == Injected; }
- };
+     SourceLocation defaultToken() const
+     {
+-        return hasAttributes ? m_attributes->defaultToken() : SourceLocation{};
++      return hasAttributes ? m_attributes->defaultToken() : SourceLocation{};
+     }
+     bool isDefaultMember() const { return defaultToken().isValid(); }
+ 
+     SourceLocation requiredToken() const
+     {
+-        return hasAttributes ? m_attributes->requiredToken() : SourceLocation{};
++      return hasAttributes ? m_attributes->requiredToken() : SourceLocation{};
+     }
+     bool isRequired() const { return requiredToken().isValid(); }
+ 
+     SourceLocation readonlyToken() const
+     {
+-        return hasAttributes ? m_attributes->readonlyToken() : SourceLocation{};
++      return hasAttributes ? m_attributes->readonlyToken() : SourceLocation{};
+     }
+     bool isReadonly() const { return readonlyToken().isValid(); }
  
- struct BoundNames : public QVector<BoundName>
-@@ -3486,7 +3487,6 @@ public:
-     SourceLocation identifierToken;
-     SourceLocation colonToken;
-     SourceLocation semicolonToken;
--
- private:
-     union {
-         SourceLocation m_propertyToken = SourceLocation{};
 diff --git a/src/libs/qmljs/parser/qmljslexer.cpp b/src/libs/qmljs/parser/qmljslexer.cpp
-index 6c4eb70744..90f567d19c 100644
+index 248f1f92f3..4f8eefa4c6 100644
 --- a/src/libs/qmljs/parser/qmljslexer.cpp
 +++ b/src/libs/qmljs/parser/qmljslexer.cpp
-@@ -27,6 +27,7 @@
+@@ -5,6 +5,7 @@
  #include "qmljsengine_p.h"
  #include "qmljskeywords_p.h"
  
@@ -456,26 +488,29 @@ index 6c4eb70744..90f567d19c 100644
  #include "qmljs/parser/qmljsdiagnosticmessage_p.h"
  #include "qmljs/parser/qmljsmemorypool_p.h"
  
-@@ -35,14 +36,6 @@
+@@ -13,11 +14,9 @@
  #include <QtCore/qdebug.h>
  #include <QtCore/QScopedValueRollback>
  
 -QT_BEGIN_NAMESPACE
--#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0)
--Q_CORE_EXPORT double qstrntod(const char *s00, int len, char const **se, bool *ok);
--#else
 -Q_CORE_EXPORT double qstrntod(const char *s00, qsizetype len, char const **se, bool *ok);
--#endif
 -QT_END_NAMESPACE
--
+ #include <optional>
+ 
++QT_QML_BEGIN_NAMESPACE
  using namespace QmlJS;
  
  static inline int regExpFlagFromChar(const QChar &ch)
 diff --git a/src/libs/qmljs/parser/qmljslexer_p.h b/src/libs/qmljs/parser/qmljslexer_p.h
-index a442748d74..dc7f7f7308 100644
+index c34636f2ba..73a853a6d1 100644
 --- a/src/libs/qmljs/parser/qmljslexer_p.h
 +++ b/src/libs/qmljs/parser/qmljslexer_p.h
-@@ -47,7 +47,7 @@ QT_QML_BEGIN_NAMESPACE
+@@ -22,12 +22,12 @@
+ 
+ QT_QML_BEGIN_NAMESPACE
+ 
+ class QDebug;
+ 
  namespace QmlJS {
  
  class Engine;
@@ -484,11 +519,33 @@ index a442748d74..dc7f7f7308 100644
  class Directives;
  
  class QML_PARSER_EXPORT Lexer: public QmlJSGrammar
+diff --git a/src/libs/qmljs/parser/qmljsmemorypool_p.h b/src/libs/qmljs/parser/qmljsmemorypool_p.h
+index b13e795be5..8d0321af27 100644
+--- a/src/libs/qmljs/parser/qmljsmemorypool_p.h
++++ b/src/libs/qmljs/parser/qmljsmemorypool_p.h
+@@ -14,7 +14,7 @@
+ // We mean it.
+ //
+ 
+-#include "qmljsglobal_p.h"
++#include <QtCore/private/qglobal_p.h>
+ #include <QtCore/qstring.h>
+ #include <QtCore/qvector.h>
+ 
 diff --git a/src/libs/qmljs/parser/qmljssourcelocation_p.h b/src/libs/qmljs/parser/qmljssourcelocation_p.h
-index 29be90fd9b..865c008f19 100644
+index 8713cad548..8f9148d079 100644
 --- a/src/libs/qmljs/parser/qmljssourcelocation_p.h
 +++ b/src/libs/qmljs/parser/qmljssourcelocation_p.h
-@@ -95,8 +95,11 @@ public:
+@@ -3,7 +3,7 @@
+ 
+ #pragma once
+ 
+-#include "qmljsglobal_p.h"
++#include <QtCore/private/qglobal_p.h>
+ #include <QtCore/qhashfunctions.h>
+ 
+ //
+@@ -73,8 +73,11 @@ public:
  
      friend size_t qHash(const SourceLocation &location, size_t seed = 0)
      {
@@ -502,3 +559,25 @@ index 29be90fd9b..865c008f19 100644
      }
  
      friend bool operator==(const SourceLocation &a, const SourceLocation &b)
+diff --git a/src/libs/qmljs/parser/qmljs.g b/src/libs/qmljs/parser/qmljs.g
+index 6789f6e673..fdd31500a3 100644
+--- a/src/libs/qmljs/parser/qmljs.g
++++ b/src/libs/qmljs/parser/qmljs.g
+@@ -286,7 +286,7 @@ public:
+     inline DiagnosticMessage diagnosticMessage() const
+     {
+         for (const DiagnosticMessage &d : diagnostic_messages) {
++            if (d.type != QtWarningMsg)
+-            if (d.isWarning())
+                 return d;
+         }
+
+@@ -330,7 +330,7 @@ protected:
+         DiagnosticMessage error;
+         error.loc = location;
+         error.message = message;
++        error.type = kind;
+-        error.kind = DiagnosticMessage::qtMsgTypeToKind(kind);
+         return error;
+     }
+
diff --git a/src/libs/qmljs/parser/parser.patch b/src/libs/qmljs/parser/parser.patch
index 0a594a8083d..778ac573393 100644
--- a/src/libs/qmljs/parser/parser.patch
+++ b/src/libs/qmljs/parser/parser.patch
@@ -1,33 +1,17 @@
-diff --git a/src/libs/qmljs/parser/qmljsgrammar.cpp b/src/libs/qmljs/parser/qmljsgrammar.cpp
-index 0413edb006..373f42747d 100644
---- a/src/libs/qmljs/parser/qmljsgrammar.cpp
-+++ b/src/libs/qmljs/parser/qmljsgrammar.cpp
-@@ -22,6 +22,7 @@
- ** be met: https://www.gnu.org/licenses/gpl-3.0.html.
- **
- ***************************************************************************/
--// This file was generated by qlalr - DO NOT EDIT!
-+        / This file was generated by qlalr
-+    - DO NOT EDIT !
- #include "qmljsgrammar_p.h"
-
 diff --git a/src/libs/qmljs/parser/qmljsgrammar_p.h b/src/libs/qmljs/parser/qmljsgrammar_p.h
-index 2e7172b41d..6a057768d4 100644
+index d1c6545896..74a98634f9 100644
 --- a/src/libs/qmljs/parser/qmljsgrammar_p.h
 +++ b/src/libs/qmljs/parser/qmljsgrammar_p.h
-@@ -22,12 +22,12 @@
- ** be met: https://www.gnu.org/licenses/gpl-3.0.html.
- **
- ***************************************************************************/
+@@ -1,11 +1,9 @@
+ // Copyright (C) 2021 The Qt Company Ltd.
+ // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0+ OR GPL-3.0 WITH Qt-GPL-exception-1.0
 -// This file was generated by qlalr - DO NOT EDIT!
-+        / This file was generated by qlalr
-+    - DO NOT EDIT !
  #ifndef QMLJSGRAMMAR_P_H
  #define QMLJSGRAMMAR_P_H
 -#include "qmljsglobal_p.h"
-
+ 
 -class QML_PARSER_EXPORT QmlJSGrammar
-+    class QmlJSGrammar
++class QmlJSGrammar
  {
  public:
      enum VariousConstants {
diff --git a/src/libs/qmljs/parser/qmldirparser.cpp b/src/libs/qmljs/parser/qmldirparser.cpp
index 49b7ee9d0c4..b37b016dc06 100644
--- a/src/libs/qmljs/parser/qmldirparser.cpp
+++ b/src/libs/qmljs/parser/qmldirparser.cpp
@@ -1,5 +1,5 @@
 // Copyright (C) 2021 The Qt Company Ltd.
-// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0 WITH Qt-GPL-exception-1.0
+// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0+ OR GPL-3.0 WITH Qt-GPL-exception-1.0
 
 #include "qmldirparser_p.h"
 
@@ -237,6 +237,26 @@ bool QmlDirParser::parse(const QString &source)
                                                           "not %1.").arg(sections[1]));
                 continue;
             }
+        } else if (sections[0] == QLatin1String("default")) {
+            if (sectionCount < 2) {
+                reportError(lineNumber,
+                            0,
+                            QStringLiteral("default directive requires further "
+                                           "arguments, but none were provided."));
+                continue;
+            }
+            if (sections[1] == QLatin1String("import")) {
+                if (!readImport(sections + 1,
+                                sectionCount - 1,
+                                Import::Flags({Import::Optional, Import::OptionalDefault})))
+                    continue;
+            } else {
+                reportError(lineNumber,
+                            0,
+                            QStringLiteral("only optional imports can have a a defaultl, "
+                                           "not %1.")
+                                .arg(sections[1]));
+            }
         } else if (sections[0] == QLatin1String("classname")) {
             if (sectionCount < 2) {
                 reportError(lineNumber, 0,
@@ -292,6 +312,16 @@ bool QmlDirParser::parse(const QString &source)
                 reportError(lineNumber, 0, QStringLiteral("designersupported does not expect any argument"));
             else
                 _designerSupported = true;
+        } else if (sections[0] == QLatin1String("static")) {
+            if (sectionCount != 1)
+                reportError(lineNumber, 0, QStringLiteral("static does not expect any argument"));
+            else
+                _isStaticModule = true;
+        } else if (sections[0] == QLatin1String("system")) {
+            if (sectionCount != 1)
+                reportError(lineNumber, 0, QStringLiteral("system does not expect any argument"));
+            else
+                _isSystemModule = true;
         } else if (sections[0] == QLatin1String("import")
                    || sections[0] == QLatin1String("depends")) {
             if (!readImport(sections, sectionCount, Import::Default))
diff --git a/src/libs/qmljs/parser/qmldirparser_p.h b/src/libs/qmljs/parser/qmldirparser_p.h
index 3d4ba5fdc06..c0423b7899d 100644
--- a/src/libs/qmljs/parser/qmldirparser_p.h
+++ b/src/libs/qmljs/parser/qmldirparser_p.h
@@ -1,5 +1,5 @@
 // Copyright (C) 2021 The Qt Company Ltd.
-// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0 WITH Qt-GPL-exception-1.0
+// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0+ OR GPL-3.0 WITH Qt-GPL-exception-1.0
 
 #pragma once
 
@@ -102,9 +102,11 @@ public:
     struct Import
     {
         enum Flag {
-            Default  = 0x0,
-            Auto     = 0x1, // forward the version of the importing module
-            Optional = 0x2  // is not automatically imported but only a tooling hint
+            Default = 0x0,
+            Auto = 0x1,     // forward the version of the importing module
+            Optional = 0x2, // is not automatically imported but only a tooling hint
+            OptionalDefault
+            = 0x4, // tooling hint only, denotes this entry should be imported by tooling
         };
         Q_DECLARE_FLAGS(Flags, Flag)
 
@@ -117,6 +119,11 @@ public:
         QString module;
         LanguageUtils::ComponentVersion version;     // invalid version is latest version, unless Flag::Auto
         Flags flags;
+
+        friend bool operator==(const Import &a, const Import &b)
+        {
+            return a.module == b.module && a.version == b.version && a.flags == b.flags;
+        }
     };
 
     QMultiHash<QString,Component> components() const { return _components; }
@@ -125,6 +132,8 @@ public:
     QList<Script> scripts() const { return _scripts; }
     QList<Plugin> plugins() const { return _plugins; }
     bool designerSupported() const { return _designerSupported; }
+    bool isStaticModule() const { return _isStaticModule; }
+    bool isSystemModule() const { return _isSystemModule; }
 
     QStringList typeInfos() const { return _typeInfos; }
     QStringList classNames() const { return _classNames; }
@@ -145,6 +154,8 @@ private:
     QList<Script> _scripts;
     QList<Plugin> _plugins;
     bool _designerSupported = false;
+    bool _isStaticModule = false;
+    bool _isSystemModule = false;
     QStringList _typeInfos;
     QStringList _classNames;
     QString _linkTarget;
diff --git a/src/libs/qmljs/parser/qmlimportresolver.cpp b/src/libs/qmljs/parser/qmlimportresolver.cpp
index 1d9582f76a1..922003efa51 100644
--- a/src/libs/qmljs/parser/qmlimportresolver.cpp
+++ b/src/libs/qmljs/parser/qmlimportresolver.cpp
@@ -1,5 +1,5 @@
 // Copyright (C) 2021 The Qt Company Ltd.
-// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0 WITH Qt-GPL-exception-1.0
+// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0+ OR GPL-3.0 WITH Qt-GPL-exception-1.0
 
 #include "qmlimportresolver_p.h"
 #include <QtCore/QList>
diff --git a/src/libs/qmljs/parser/qmlimportresolver_p.h b/src/libs/qmljs/parser/qmlimportresolver_p.h
index 4c9ed68d111..c6d3c51708e 100644
--- a/src/libs/qmljs/parser/qmlimportresolver_p.h
+++ b/src/libs/qmljs/parser/qmlimportresolver_p.h
@@ -1,5 +1,5 @@
 // Copyright (C) 2021 The Qt Company Ltd.
-// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0 WITH Qt-GPL-exception-1.0
+// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0+ OR GPL-3.0 WITH Qt-GPL-exception-1.0
 
 #pragma once
 
diff --git a/src/libs/qmljs/parser/qmljs.g b/src/libs/qmljs/parser/qmljs.g
index d276090a194..cbc17d32f58 100644
--- a/src/libs/qmljs/parser/qmljs.g
+++ b/src/libs/qmljs/parser/qmljs.g
@@ -1,5 +1,5 @@
 -- Copyright (C) 2016 The Qt Company Ltd.
--- SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0+ OR LGPL-3.0
+-- SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only
 
 %parser         QmlJSGrammar
 %decl           qmljsparser_p.h
@@ -73,8 +73,19 @@
 %token T_GET "get"
 %token T_SET "set"
 
+-- token representing no token
+%token T_NONE
+
 %token T_ERROR
 
+-- states for line by line parsing
+%token T_EOL
+%token T_PARTIAL_COMMENT "non closed multiline comment"
+%token T_PARTIAL_SINGLE_QUOTE_STRING_LITERAL "multiline single quote string literal"
+%token T_PARTIAL_DOUBLE_QUOTE_STRING_LITERAL "multiline double quote string literal"
+%token T_PARTIAL_TEMPLATE_HEAD "(template head)"
+%token T_PARTIAL_TEMPLATE_MIDDLE "(template middle)"
+
 --- feed tokens
 %token T_FEED_UI_PROGRAM
 %token T_FEED_UI_OBJECT_MEMBER
@@ -96,44 +107,9 @@
 
 %start TopLevel
 
-/./****************************************************************************
-**
-** Copyright (C) 2016 The Qt Company Ltd.
-** Contact: https://www.qt.io/licensing/
-**
-** This file is part of the QtQml module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** 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 The Qt Company. For licensing terms
-** and conditions see https://www.qt.io/terms-conditions. For further
-** information use the contact form at https://www.qt.io/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 3 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL3 included in the
-** packaging of this file. Please review the following information to
-** ensure the GNU Lesser General Public License version 3 requirements
-** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 2.0 or (at your option) the GNU General
-** Public license version 3 or any later version approved by the KDE Free
-** Qt Foundation. The licenses are as published by the Free Software
-** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
-** included in the packaging of this file. Please review the following
-** information to ensure the GNU General Public License requirements will
-** be met: https://www.gnu.org/licenses/gpl-2.0.html and
-** https://www.gnu.org/licenses/gpl-3.0.html.
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
+/.// Copyright (C) 2016 The Qt Company Ltd.
+// Contact: https://www.qt.io/licensing/
+// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only
 
 #include "qmljs/parser/qmljsengine_p.h"
 #include "qmljs/parser/qmljslexer_p.h"
@@ -147,44 +123,9 @@
 
 ./
 
-/:/****************************************************************************
-**
-** Copyright (C) 2016 The Qt Company Ltd.
-** Contact: https://www.qt.io/licensing/
-**
-** This file is part of the QtQml module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** 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 The Qt Company. For licensing terms
-** and conditions see https://www.qt.io/terms-conditions. For further
-** information use the contact form at https://www.qt.io/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 3 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL3 included in the
-** packaging of this file. Please review the following information to
-** ensure the GNU Lesser General Public License version 3 requirements
-** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 2.0 or (at your option) the GNU General
-** Public license version 3 or any later version approved by the KDE Free
-** Qt Foundation. The licenses are as published by the Free Software
-** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
-** included in the packaging of this file. Please review the following
-** information to ensure the GNU General Public License requirements will
-** be met: https://www.gnu.org/licenses/gpl-2.0.html and
-** https://www.gnu.org/licenses/gpl-3.0.html.
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
+/:// Copyright (C) 2016 The Qt Company Ltd.
+// Contact: https://www.qt.io/licensing/
+// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only
 
 
 //
@@ -271,7 +212,7 @@ public:
       AST::ExportClause *ExportClause;
       AST::ExportDeclaration *ExportDeclaration;
       AST::TypeAnnotation *TypeAnnotation;
-      AST::TypeArgumentList *TypeArgumentList;
+      AST::TypeArgument *TypeArgument;
       AST::Type *Type;
 
       AST::UiProgram *UiProgram;
@@ -345,7 +286,7 @@ public:
     inline DiagnosticMessage diagnosticMessage() const
     {
         for (const DiagnosticMessage &d : diagnostic_messages) {
-            if (d.kind != Severity::Warning)
+            if (d.isWarning())
                 return d;
         }
 
@@ -438,6 +379,7 @@ protected:
     SavedToken *last_token = nullptr;
 
     int functionNestingLevel = 0;
+    int classNestingLevel = 0;
 
     enum CoverExpressionType {
         CE_Invalid,
@@ -813,7 +755,7 @@ UiVersionSpecifier: T_VERSION_NUMBER T_DOT T_VERSION_NUMBER;
     case $rule_number: {
         const int major = sym(1).dval;
         const int minor = sym(3).dval;
-        if (major < 0  || major >= 255 || minor < 0 || minor >= 255) {
+        if (!QTypeRevision::isValidSegment(major) || !QTypeRevision::isValidSegment(minor)) {
             diagnostic_messages.append(
                     compileError(loc(1),
                     QLatin1String("Invalid version. Version numbers must be >= 0 and < 255.")));
@@ -826,11 +768,12 @@ UiVersionSpecifier: T_VERSION_NUMBER T_DOT T_VERSION_NUMBER;
     } break;
 ./
 
+
 UiVersionSpecifier: T_VERSION_NUMBER;
 /.
     case $rule_number: {
         const int major = sym(1).dval;
-        if (major < 0 || major >= 255) {
+        if (!QTypeRevision::isValidSegment(major)) {
             diagnostic_messages.append(
                     compileError(loc(1),
                     QLatin1String("Invalid major version. Version numbers must be >= 0 and < 255.")));
@@ -1188,10 +1131,10 @@ UiParameterListOpt: UiParameterList;
     } break;
 ./
 
-UiParameterList: QmlIdentifier T_COLON UiPropertyType;
+UiParameterList: QmlIdentifier T_COLON Type;
 /.
     case $rule_number: {
-        AST::UiParameterList *node = new (pool) AST::UiParameterList(sym(3).UiQualifiedId->finish(), stringRef(1));
+        AST::UiParameterList *node = new (pool) AST::UiParameterList(sym(3).Type, stringRef(1));
         node->identifierToken = loc(1);
         node->colonToken = loc(2);
         node->propertyTypeToken = loc(3);
@@ -1199,20 +1142,20 @@ UiParameterList: QmlIdentifier T_COLON UiPropertyType;
     } break;
 ./
 
-UiParameterList: UiPropertyType QmlIdentifier;
+UiParameterList: Type QmlIdentifier;
 /.
     case $rule_number: {
-        AST::UiParameterList *node = new (pool) AST::UiParameterList(sym(1).UiQualifiedId->finish(), stringRef(2));
+        AST::UiParameterList *node = new (pool) AST::UiParameterList(sym(1).Type, stringRef(2));
         node->propertyTypeToken = loc(1);
         node->identifierToken = loc(2);
         sym(1).Node = node;
     } break;
 ./
 
-UiParameterList: UiParameterList T_COMMA QmlIdentifier T_COLON UiPropertyType;
+UiParameterList: UiParameterList T_COMMA QmlIdentifier T_COLON Type;
 /.
     case $rule_number: {
-        AST::UiParameterList *node = new (pool) AST::UiParameterList(sym(1).UiParameterList, sym(5).UiQualifiedId->finish(), stringRef(3));
+        AST::UiParameterList *node = new (pool) AST::UiParameterList(sym(1).UiParameterList, sym(5).Type, stringRef(3));
         node->propertyTypeToken = loc(5);
         node->commaToken = loc(2);
         node->identifierToken = loc(3);
@@ -1221,10 +1164,10 @@ UiParameterList: UiParameterList T_COMMA QmlIdentifier T_COLON UiPropertyType;
     } break;
 ./
 
-UiParameterList: UiParameterList T_COMMA UiPropertyType QmlIdentifier;
+UiParameterList: UiParameterList T_COMMA Type QmlIdentifier;
 /.
     case $rule_number: {
-        AST::UiParameterList *node = new (pool) AST::UiParameterList(sym(1).UiParameterList, sym(3).UiQualifiedId->finish(), stringRef(4));
+        AST::UiParameterList *node = new (pool) AST::UiParameterList(sym(1).UiParameterList, sym(3).Type, stringRef(4));
         node->propertyTypeToken = loc(3);
         node->commaToken = loc(2);
         node->identifierToken = loc(4);
@@ -1384,9 +1327,26 @@ UiObjectMemberWithScriptStatement: UiPropertyAttributes UiPropertyType QmlIdenti
     } break;
 ./
 
+UiObjectMemberWithScriptStatement: UiPropertyAttributes T_IDENTIFIER T_LT UiPropertyType T_GT QmlIdentifier T_COLON UiScriptStatement OptionalSemicolon;
+/.
+    case $rule_number: {
+        AST::UiPublicMember *node = new (pool) AST::UiPublicMember(sym(4).UiQualifiedId->finish(), stringRef(6), sym(8).Statement);
+        node->typeModifier = stringRef(2);
+        auto attributes = sym(1).UiPropertyAttributes;
+        if (attributes->isRequired())
+            diagnostic_messages.append(compileError(attributes->requiredToken(), QLatin1String("Required properties with initializer do not make sense."), QtCriticalMsg));
+        node->setAttributes(attributes);
+        node->typeModifierToken = loc(2);
+        node->typeToken = loc(4);
+        node->identifierToken = loc(6);
+        node->colonToken = loc(7);
+        sym(1).Node = node;
+    } break;
+./
+
 UiObjectMember: UiObjectMemberWithScriptStatement;
 
-UiObjectMemberWithArray: UiPropertyAttributes T_IDENTIFIER T_LT UiPropertyType T_GT QmlIdentifier T_COLON T_LBRACKET UiArrayMemberList T_RBRACKET Semicolon;
+UiObjectMemberWithArray: UiPropertyAttributes T_IDENTIFIER T_LT UiPropertyType T_GT QmlIdentifier T_COLON ExpressionStatementLookahead T_LBRACKET UiArrayMemberList T_RBRACKET Semicolon;
 /.
     case $rule_number: {
         AST::UiPublicMember *node = new (pool) AST::UiPublicMember(sym(4).UiQualifiedId->finish(), stringRef(6));
@@ -1404,10 +1364,10 @@ UiObjectMemberWithArray: UiPropertyAttributes T_IDENTIFIER T_LT UiPropertyType T
         propertyName->identifierToken = loc(6);
         propertyName->next = nullptr;
 
-        AST::UiArrayBinding *binding = new (pool) AST::UiArrayBinding(propertyName, sym(9).UiArrayMemberList->finish());
+        AST::UiArrayBinding *binding = new (pool) AST::UiArrayBinding(propertyName, sym(10).UiArrayMemberList->finish());
         binding->colonToken = loc(7);
-        binding->lbracketToken = loc(8);
-        binding->rbracketToken = loc(10);
+        binding->lbracketToken = loc(9);
+        binding->rbracketToken = loc(11);
 
         node->binding = binding;
 
@@ -1495,6 +1455,8 @@ UiObjectMember: T_ENUM T_IDENTIFIER T_LBRACE EnumMemberList T_RBRACE;
     case $rule_number: {
         AST::UiEnumDeclaration *enumDeclaration = new (pool) AST::UiEnumDeclaration(stringRef(2), sym(4).UiEnumMemberList->finish());
         enumDeclaration->enumToken = loc(1);
+        enumDeclaration->identifierToken = loc(2);
+        enumDeclaration->lbraceToken = loc(3);
         enumDeclaration->rbraceToken = loc(5);
         sym(1).Node = enumDeclaration;
         break;
@@ -1535,6 +1497,18 @@ EnumMemberList: T_IDENTIFIER T_EQ T_NUMERIC_LITERAL;
     }
 ./
 
+
+EnumMemberList: T_IDENTIFIER T_EQ T_MINUS T_NUMERIC_LITERAL;
+/.
+    case $rule_number: {
+        AST::UiEnumMemberList *node = new (pool) AST::UiEnumMemberList(stringRef(1), -sym(4).dval);
+        node->memberToken = loc(1);
+        node->valueToken = combine(loc(3), loc(4));
+        sym(1).Node = node;
+        break;
+    }
+./
+
 EnumMemberList: EnumMemberList T_COMMA T_IDENTIFIER;
 /.
     case $rule_number: {
@@ -1556,6 +1530,18 @@ EnumMemberList: EnumMemberList T_COMMA T_IDENTIFIER T_EQ T_NUMERIC_LITERAL;
     }
 ./
 
+
+EnumMemberList: EnumMemberList T_COMMA T_IDENTIFIER T_EQ T_MINUS T_NUMERIC_LITERAL;
+/.
+    case $rule_number: {
+        AST::UiEnumMemberList *node = new (pool) AST::UiEnumMemberList(sym(1).UiEnumMemberList, stringRef(3), -sym(6).dval);
+        node->memberToken = loc(3);
+        node->valueToken = combine(loc(5), loc(6));
+        sym(1).Node = node;
+        break;
+    }
+./
+
 QmlIdentifier: T_IDENTIFIER
              | T_PROPERTY
              | T_SIGNAL
@@ -1589,28 +1575,16 @@ BindingIdentifier: IdentifierReference;
 -- Types
 --------------------------------------------------------------------------------------------------------
 
-TypeArguments: Type;
+Type: UiQualifiedId T_LT SimpleType T_GT;
 /.
     case $rule_number: {
-        sym(1).TypeArgumentList = new (pool) AST::TypeArgumentList(sym(1).Type);
+        sym(1).Type = new (pool) AST::Type(sym(1).UiQualifiedId, sym(3).Type);
     } break;
 ./
 
-TypeArguments: TypeArguments T_COMMA Type;
-/.
-    case $rule_number: {
-        sym(1).TypeArgumentList = new (pool) AST::TypeArgumentList(sym(1).TypeArgumentList, sym(3).Type);
-    } break;
-./
+Type: SimpleType;
 
-Type: UiQualifiedId T_LT TypeArguments T_GT;
-/.
-    case $rule_number: {
-        sym(1).Type = new (pool) AST::Type(sym(1).UiQualifiedId, sym(3).TypeArgumentList->finish());
-    } break;
-./
-
-Type: T_RESERVED_WORD;
+SimpleType: T_RESERVED_WORD;
 /.
     case $rule_number: {
         AST::UiQualifiedId *id = new (pool) AST::UiQualifiedId(stringRef(1));
@@ -1619,13 +1593,25 @@ Type: T_RESERVED_WORD;
     } break;
 ./
 
-Type: UiQualifiedId;
+SimpleType: UiQualifiedId;
 /.
     case $rule_number: {
         sym(1).Type = new (pool) AST::Type(sym(1).UiQualifiedId);
     } break;
 ./
 
+SimpleType: T_VAR;
+/.  case $rule_number: Q_FALLTHROUGH(); ./
+
+SimpleType: T_VOID;
+/.
+    case $rule_number: {
+        AST::UiQualifiedId *id = new (pool) AST::UiQualifiedId(stringRef(1));
+        id->identifierToken = loc(1);
+        sym(1).Type = new (pool) AST::Type(id->finish());
+    } break;
+./
+
 TypeAnnotation: T_COLON Type;
 /.
     case $rule_number: {
@@ -4318,16 +4304,16 @@ ClassDeclaration_Default: ClassDeclaration;
 ClassLBrace: T_LBRACE;
 /.
     case $rule_number: {
-        lexer->setStaticIsKeyword(true);
+        if (++classNestingLevel == 1)
+            lexer->setStaticIsKeyword(true);
     } break;
 ./
 
 ClassRBrace: T_RBRACE;
-/. case $rule_number: ./
-ClassStaticQualifier: T_STATIC;
 /.
     case $rule_number: {
-        lexer->setStaticIsKeyword(false);
+        if (--classNestingLevel == 0)
+            lexer->setStaticIsKeyword(false);
     } break;
 ./
 
@@ -4382,10 +4368,9 @@ ClassElement: MethodDefinition;
     } break;
 ./
 
-ClassElement: ClassStaticQualifier MethodDefinition;
+ClassElement: T_STATIC MethodDefinition;
 /.
     case $rule_number: {
-        lexer->setStaticIsKeyword(true);
         AST::ClassElementList *node = new (pool) AST::ClassElementList(sym(2).PatternProperty, true);
         sym(1).Node = node;
     } break;
diff --git a/src/libs/qmljs/parser/qmljsast.cpp b/src/libs/qmljs/parser/qmljsast.cpp
index 8e508e84994..4a002eb00d4 100644
--- a/src/libs/qmljs/parser/qmljsast.cpp
+++ b/src/libs/qmljs/parser/qmljsast.cpp
@@ -1311,17 +1311,7 @@ void Type::accept0(BaseVisitor *visitor)
 {
     if (visitor->visit(this)) {
         accept(typeId, visitor);
-        accept(typeArguments, visitor);
-    }
-
-    visitor->endVisit(this);
-}
-
-void TypeArgumentList::accept0(BaseVisitor *visitor)
-{
-    if (visitor->visit(this)) {
-        for (TypeArgumentList *it = this; it; it = it->next)
-            accept(it->typeId, visitor);
+        accept(typeArgument, visitor);
     }
 
     visitor->endVisit(this);
@@ -1563,17 +1553,11 @@ QString Type::toString() const
 
 void Type::toString(QString *out) const
 {
-    for (QmlJS::AST::UiQualifiedId *it = typeId; it; it = it->next) {
-        out->append(it->name);
+    typeId->toString(out);
 
-        if (it->next)
-            out->append(QLatin1Char('.'));
-    }
-
-    if (typeArguments) {
+    if (typeArgument) {
         out->append(QLatin1Char('<'));
-        if (auto subType = static_cast<TypeArgumentList*>(typeArguments)->typeId)
-            subType->toString(out);
+        typeArgument->toString(out);
         out->append(QLatin1Char('>'));
     };
 }
diff --git a/src/libs/qmljs/parser/qmljsast_p.h b/src/libs/qmljs/parser/qmljsast_p.h
index ba5cc3a7197..a25f99b557d 100644
--- a/src/libs/qmljs/parser/qmljsast_p.h
+++ b/src/libs/qmljs/parser/qmljsast_p.h
@@ -19,11 +19,13 @@
 
 #include "qmljs/parser/qmljsmemorypool_p.h"
 
+#include <QtCore/qtaggedpointer.h>
 #include <QtCore/qversionnumber.h>
 
 QT_BEGIN_NAMESPACE
 class QString;
 QT_END_NAMESPACE
+#include <type_traits>
 
 QT_QML_BEGIN_NAMESPACE
 
@@ -96,10 +98,10 @@ enum class VariableScope {
 template <typename T1, typename T2>
 T1 cast(T2 *ast)
 {
-    if (ast && ast->kind == static_cast<T1>(0)->K)
+    if (ast && ast->kind == std::remove_pointer_t<T1>::K)
         return static_cast<T1>(ast);
 
-    return 0;
+    return nullptr;
 }
 
 FunctionExpression *asAnonymousFunctionDefinition(AST::Node *n);
@@ -209,7 +211,7 @@ public:
         Kind_PatternProperty,
         Kind_PatternPropertyList,
         Kind_Type,
-        Kind_TypeArgumentList,
+        Kind_TypeArgument,
         Kind_TypeAnnotation,
 
         Kind_UiArrayBinding,
@@ -327,6 +329,22 @@ public:
     SourceLocation lastSourceLocation() const override
     { return lastListElement(this)->identifierToken; }
 
+    QString toString() const
+    {
+        QString result;
+        toString(&result);
+        return result;
+    }
+
+    void toString(QString *out) const
+    {
+        for (const UiQualifiedId *it = this; it; it = it->next) {
+            out->append(it->name);
+            if (it->next)
+                out->append(QLatin1Char('.'));
+        }
+    }
+
 // attributes
     UiQualifiedId *next;
     QStringView name;
@@ -338,9 +356,9 @@ class QML_PARSER_EXPORT Type: public Node
 public:
     QMLJS_DECLARE_AST_NODE(Type)
 
-    Type(UiQualifiedId *typeId, Node *typeArguments = nullptr)
+    Type(UiQualifiedId *typeId, Type *typeArgument = nullptr)
         : typeId(typeId)
-        , typeArguments(typeArguments)
+        , typeArgument(typeArgument ? typeArgument->typeId : nullptr)
     { kind = K; }
 
     void accept0(BaseVisitor *visitor) override;
@@ -349,53 +367,16 @@ public:
     { return typeId->firstSourceLocation(); }
 
     SourceLocation lastSourceLocation() const override
-    { return typeArguments ? typeArguments->lastSourceLocation() : typeId->lastSourceLocation(); }
+    {
+        return typeArgument ? typeArgument->lastSourceLocation() : typeId->lastSourceLocation();
+    }
 
     QString toString() const;
     void toString(QString *out) const;
 
 // attributes
     UiQualifiedId *typeId;
-    Node *typeArguments; // TypeArgumentList
-};
-
-
-class QML_PARSER_EXPORT TypeArgumentList: public Node
-{
-public:
-    QMLJS_DECLARE_AST_NODE(TypeArgumentList)
-
-    TypeArgumentList(Type *typeId)
-        : typeId(typeId)
-        , next(nullptr)
-    { kind = K; }
-
-    TypeArgumentList(TypeArgumentList *previous, Type *typeId)
-        : typeId(typeId)
-    {
-        kind = K;
-        next = previous->next;
-        previous->next = this;
-    }
-
-    void accept0(BaseVisitor *visitor) override;
-
-    SourceLocation firstSourceLocation() const override
-    { return typeId->firstSourceLocation(); }
-
-    SourceLocation lastSourceLocation() const override
-    { return lastListElement(this)->typeId->lastSourceLocation(); }
-
-    inline TypeArgumentList *finish()
-    {
-        TypeArgumentList *front = next;
-        next = nullptr;
-        return front;
-    }
-
-// attributes
-    Type *typeId;
-    TypeArgumentList *next;
+    UiQualifiedId *typeArgument;
 };
 
 class QML_PARSER_EXPORT TypeAnnotation: public Node
@@ -861,14 +842,14 @@ struct QML_PARSER_EXPORT BoundName
     };
 
     QString id;
-    TypeAnnotation *typeAnnotation;
-    Type typeAnnotationType;
+    QTaggedPointer<TypeAnnotation, Type> typeAnnotation;
     BoundName(const QString &id, TypeAnnotation *typeAnnotation, Type type = Declared)
-    : id(id), typeAnnotation(typeAnnotation), typeAnnotationType(type)
+        : id(id)
+        , typeAnnotation(typeAnnotation, type)
     {}
     BoundName() = default;
-    QString typeName() const { return typeAnnotation ? typeAnnotation->type->toString() : QString(); }
-    bool isInjected() const { return typeAnnotation && typeAnnotationType == Injected; }
+
+    bool isInjected() const { return typeAnnotation.tag() == Injected; }
 };
 
 struct BoundNames : public QVector<BoundName>
@@ -3293,12 +3274,17 @@ class QML_PARSER_EXPORT UiParameterList: public Node
 public:
     QMLJS_DECLARE_AST_NODE(UiParameterList)
 
-    UiParameterList(UiQualifiedId *t, QStringView n):
-        type (t), name (n), next (this)
-        { kind = K; }
+    UiParameterList(Type *t, QStringView n)
+        : type(t)
+        , name(n)
+        , next(this)
+    {
+        kind = K;
+    }
 
-    UiParameterList(UiParameterList *previous, UiQualifiedId *t, QStringView n):
-        type (t), name (n)
+    UiParameterList(UiParameterList *previous, Type *t, QStringView n)
+        : type(t)
+        , name(n)
     {
         kind = K;
         next = previous->next;
@@ -3324,7 +3310,7 @@ public:
     }
 
 // attributes
-    UiQualifiedId *type;
+    Type *type;
     QStringView name;
     UiParameterList *next;
     SourceLocation commaToken;
@@ -3716,6 +3702,8 @@ public:
 
 // attributes
     SourceLocation enumToken;
+    SourceLocation identifierToken;
+    SourceLocation lbraceToken;
     SourceLocation rbraceToken;
     QStringView name;
     UiEnumMemberList *members;
diff --git a/src/libs/qmljs/parser/qmljsastfwd_p.h b/src/libs/qmljs/parser/qmljsastfwd_p.h
index 2bb883a13c3..cd40ed887af 100644
--- a/src/libs/qmljs/parser/qmljsastfwd_p.h
+++ b/src/libs/qmljs/parser/qmljsastfwd_p.h
@@ -3,7 +3,6 @@
 
 #pragma once
 
-#include "qmljsglobal_p.h"
 #include "qmljs/parser/qmljssourcelocation_p.h"
 
 #include "qmljsglobal_p.h"
@@ -122,7 +121,7 @@ class NestedExpression;
 class ClassExpression;
 class ClassDeclaration;
 class ClassElementList;
-class TypeArgumentList;
+class TypeArgument;
 class Type;
 class TypeAnnotation;
 
diff --git a/src/libs/qmljs/parser/qmljsastvisitor_p.h b/src/libs/qmljs/parser/qmljsastvisitor_p.h
index 9170c0c51c2..dcd338998e5 100644
--- a/src/libs/qmljs/parser/qmljsastvisitor_p.h
+++ b/src/libs/qmljs/parser/qmljsastvisitor_p.h
@@ -377,8 +377,8 @@ public:
     virtual bool visit(Type *) = 0;
     virtual void endVisit(Type *) = 0;
 
-    virtual bool visit(TypeArgumentList *) = 0;
-    virtual void endVisit(TypeArgumentList *) = 0;
+    virtual bool visit(TypeArgument *) = 0;
+    virtual void endVisit(TypeArgument *) = 0;
 
     virtual bool visit(TypeAnnotation *) = 0;
     virtual void endVisit(TypeAnnotation *) = 0;
@@ -721,8 +721,8 @@ public:
     bool visit(Type *) override { return true; }
     void endVisit(Type *) override {}
 
-    bool visit(TypeArgumentList *) override { return true; }
-    void endVisit(TypeArgumentList *) override {}
+    bool visit(TypeArgument *) override { return true; }
+    void endVisit(TypeArgument *) override {}
 
     bool visit(TypeAnnotation *) override { return true; }
     void endVisit(TypeAnnotation *) override {}
diff --git a/src/libs/qmljs/parser/qmljsgrammar.cpp b/src/libs/qmljs/parser/qmljsgrammar.cpp
index bd03ef2b325..258591aaf51 100644
--- a/src/libs/qmljs/parser/qmljsgrammar.cpp
+++ b/src/libs/qmljs/parser/qmljsgrammar.cpp
@@ -1,553 +1,559 @@
 // Copyright (C) 2021 The Qt Company Ltd.
 // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0+ OR GPL-3.0 WITH Qt-GPL-exception-1.0
-// This file was generated by qlalr - DO NOT EDIT!
 #include "qmljsgrammar_p.h"
 
-    const char *const QmlJSGrammar::spell[]
-    = {"end of file",
-       "&",
-       "&&",
-       "&=",
-       "break",
-       "case",
-       "catch",
-       ":",
-       ",",
-       "continue",
-       "default",
-       "delete",
-       "/",
-       "/=",
-       "do",
-       ".",
-       "else",
-       "=",
-       "==",
-       "===",
-       "finally",
-       "for",
-       "function *",
-       "function",
-       ">=",
-       ">",
-       ">>",
-       ">>=",
-       ">>>",
-       ">>>=",
-       "identifier",
-       "if",
-       "in",
-       "instanceof",
-       "{",
-       "[",
-       "<=",
-       "(",
-       "<",
-       "<<",
-       "<<=",
-       "-",
-       "-=",
-       "--",
-       "new",
-       "!",
-       "!=",
-       "!==",
-       "numeric literal",
-       "|",
-       "version number",
-       "|=",
-       "||",
-       "+",
-       "+=",
-       "++",
-       "?",
-       "}",
-       "]",
-       "%",
-       "%=",
-       "return",
-       ")",
-       ";",
-       0,
-       "*",
-       "**",
-       "**=",
-       "*=",
-       "string literal",
-       "property",
-       "signal",
-       "readonly",
-       "switch",
-       "this",
-       "throw",
-       "~",
-       "try",
-       "typeof",
-       "var",
-       "void",
-       "while",
-       "with",
-       "^",
-       "^=",
-       "null",
-       "true",
-       "false",
-       "const",
-       "let",
-       "@",
-       "debugger",
-       "reserved word",
-       "multiline string literal",
-       "comment",
-       0,
-       "=>",
-       "??",
-       "?.",
-       "enum",
-       "...",
-       "yield",
-       "super",
-       "class",
-       "extends",
-       "static",
-       "export",
-       "from",
-       "required",
-       "component",
-       "(no subst template)",
-       "(template head)",
-       "(template middle)",
-       "(template tail)",
-       "public",
-       "import",
-       "pragma",
-       "as",
-       "of",
-       "get",
-       "set",
-       0,
-       0,
-       0,
-       0,
-       0,
-       0,
-       0,
-       "(force decl)",
-       "(force block)",
-       "(for lookahead ok)",
-       0,
-       0,
-       0,
-       0,
+const char *const QmlJSGrammar::spell[] = {"end of file",
+                                           "&",
+                                           "&&",
+                                           "&=",
+                                           "break",
+                                           "case",
+                                           "catch",
+                                           ":",
+                                           ",",
+                                           "continue",
+                                           "default",
+                                           "delete",
+                                           "/",
+                                           "/=",
+                                           "do",
+                                           ".",
+                                           "else",
+                                           "=",
+                                           "==",
+                                           "===",
+                                           "finally",
+                                           "for",
+                                           "function *",
+                                           "function",
+                                           ">=",
+                                           ">",
+                                           ">>",
+                                           ">>=",
+                                           ">>>",
+                                           ">>>=",
+                                           "identifier",
+                                           "if",
+                                           "in",
+                                           "instanceof",
+                                           "{",
+                                           "[",
+                                           "<=",
+                                           "(",
+                                           "<",
+                                           "<<",
+                                           "<<=",
+                                           "-",
+                                           "-=",
+                                           "--",
+                                           "new",
+                                           "!",
+                                           "!=",
+                                           "!==",
+                                           "numeric literal",
+                                           "|",
+                                           "version number",
+                                           "|=",
+                                           "||",
+                                           "+",
+                                           "+=",
+                                           "++",
+                                           "?",
+                                           "}",
+                                           "]",
+                                           "%",
+                                           "%=",
+                                           "return",
+                                           ")",
+                                           ";",
+                                           0,
+                                           "*",
+                                           "**",
+                                           "**=",
+                                           "*=",
+                                           "string literal",
+                                           "property",
+                                           "signal",
+                                           "readonly",
+                                           "switch",
+                                           "this",
+                                           "throw",
+                                           "~",
+                                           "try",
+                                           "typeof",
+                                           "var",
+                                           "void",
+                                           "while",
+                                           "with",
+                                           "^",
+                                           "^=",
+                                           "null",
+                                           "true",
+                                           "false",
+                                           "const",
+                                           "let",
+                                           "@",
+                                           "debugger",
+                                           "reserved word",
+                                           "multiline string literal",
+                                           "comment",
+                                           0,
+                                           "=>",
+                                           "??",
+                                           "?.",
+                                           "enum",
+                                           "...",
+                                           "yield",
+                                           "super",
+                                           "class",
+                                           "extends",
+                                           "static",
+                                           "export",
+                                           "from",
+                                           "required",
+                                           "component",
+                                           "(no subst template)",
+                                           "(template head)",
+                                           "(template middle)",
+                                           "(template tail)",
+                                           "public",
+                                           "import",
+                                           "pragma",
+                                           "as",
+                                           "of",
+                                           "get",
+                                           "set",
+                                           0,
+                                           0,
+                                           0,
+                                           "non closed multiline comment",
+                                           "multiline single quote string literal",
+                                           "multiline double quote string literal",
+                                           "(template head)",
+                                           "(template middle)",
+                                           0,
+                                           0,
+                                           0,
+                                           0,
+                                           0,
+                                           0,
+                                           "(force decl)",
+                                           "(force block)",
+                                           "(for lookahead ok)",
+                                           0,
+                                           0,
+                                           0,
+                                           0,
 #ifndef QLALR_NO_QMLJSGRAMMAR_DEBUG_INFO
-       "TopLevel",
-       "UiProgram",
-       "Statement",
-       "Expression",
-       "UiAnnotatedObjectMember",
-       "Script",
-       "Module",
-       "UiHeaderItemListOpt",
-       "UiRootMember",
-       "Empty",
-       "UiHeaderItemList",
-       "UiPragma",
-       "UiImport",
-       "PragmaId",
-       "JsIdentifier",
-       "Semicolon",
-       "ImportId",
-       "MemberExpression",
-       "UiImportHead",
-       "UiVersionSpecifier",
-       "QmlIdentifier",
-       "UiAnnotatedObject",
-       "UiSimpleQualifiedId",
-       "UiAnnotationObjectDefinition",
-       "UiObjectInitializer",
-       "UiAnnotation",
-       "UiAnnotationList",
-       "UiObjectDefinition",
-       "UiObjectMemberList",
-       "UiArrayMemberList",
-       "UiQualifiedId",
-       "UiObjectMember",
-       "ExpressionStatementLookahead",
-       "UiObjectLiteral",
-       "UiPropertyDefinitionList",
-       "UiScriptStatement",
-       "ExpressionStatement",
-       "Block",
-       "EmptyStatement",
-       "IfStatement",
-       "WithStatement",
-       "SwitchStatement",
-       "TryStatement",
-       "UiPropertyType",
-       "UiParameterListOpt",
-       "UiParameterList",
-       "AttrRequired",
-       "AttrReadonly",
-       "AttrDefault",
-       "UiPropertyAttributes",
-       "UiObjectMemberListPropertyNoInitialiser",
-       "UiObjectMemberPropertyNoInitialiser",
-       "OptionalSemicolon",
-       "UiRequired",
-       "UiObjectMemberWithScriptStatement",
-       "UiObjectMemberWithArray",
-       "UiObjectMemberExpressionStatementLookahead",
-       "GeneratorDeclaration",
-       "FunctionDeclarationWithTypes",
-       "VariableStatement",
-       "EnumMemberList",
-       "IdentifierReference",
-       "BindingIdentifier",
-       "TypeArguments",
-       "Type",
-       "TypeAnnotation",
-       "TypeAnnotationOpt",
-       "PrimaryExpression",
-       "Literal",
-       "ArrayLiteral",
-       "ObjectLiteral",
-       "FunctionExpression",
-       "ClassExpression",
-       "GeneratorExpression",
-       "RegularExpressionLiteral",
-       "TemplateLiteral",
-       "CoverParenthesizedExpressionAndArrowParameterList",
-       "Expression_In",
-       "BindingRestElement",
-       "BindingRestElementOpt",
-       "ElisionOpt",
-       "ElementList",
-       "AssignmentExpression_In",
-       "Elision",
-       "SpreadElement",
-       "AssignmentExpression",
-       "PropertyDefinitionList",
-       "UiPropertyDefinition",
-       "PropertyDefinition",
-       "CoverInitializedName",
-       "Initializer_In",
-       "UiPropertyName",
-       "PropertyName",
-       "MethodDefinition",
-       "LiteralPropertyName",
-       "ComputedPropertyName",
-       "IdentifierName",
-       "ReservedIdentifier",
-       "Initializer",
-       "InitializerOpt",
-       "InitializerOpt_In",
-       "TemplateSpans",
-       "Super",
-       "NewTarget",
-       "MetaProperty",
-       "Arguments",
-       "NewExpression",
-       "CallExpression",
-       "ArgumentList",
-       "LeftHandSideExpression",
-       "UpdateExpression",
-       "UnaryExpression",
-       "ExponentiationExpression",
-       "MultiplicativeExpression",
-       "MultiplicativeOperator",
-       "AdditiveExpression",
-       "ShiftExpression",
-       "RelationalExpression_In",
-       "RelationalExpression",
-       "RelationalOperator",
-       "EqualityExpression_In",
-       "EqualityExpression",
-       "EqualityOperator",
-       "BitwiseANDExpression",
-       "BitwiseANDExpression_In",
-       "BitwiseXORExpression",
-       "BitwiseXORExpression_In",
-       "BitwiseORExpression",
-       "BitwiseORExpression_In",
-       "LogicalANDExpression",
-       "LogicalANDExpression_In",
-       "LogicalORExpression",
-       "LogicalORExpression_In",
-       "CoalesceExpression",
-       "CoalesceExpression_In",
-       "ConditionalExpression",
-       "ConditionalExpression_In",
-       "YieldExpression",
-       "YieldExpression_In",
-       "ArrowFunction",
-       "ArrowFunction_In",
-       "AssignmentOperator",
-       "ExpressionOpt",
-       "ExpressionOpt_In",
-       "BlockStatement",
-       "BreakableStatement",
-       "ContinueStatement",
-       "BreakStatement",
-       "ReturnStatement",
-       "LabelledStatement",
-       "ThrowStatement",
-       "DebuggerStatement",
-       "Declaration",
-       "HoistableDeclaration",
-       "ClassDeclaration",
-       "LexicalDeclaration_In",
-       "FunctionDeclaration",
-       "HoistableDeclaration_Default",
-       "FunctionDeclaration_Default",
-       "GeneratorDeclaration_Default",
-       "IterationStatement",
-       "StatementListOpt",
-       "StatementList",
-       "StatementListItem",
-       "LetOrConst",
-       "Var",
-       "LexicalDeclaration",
-       "BindingList",
-       "BindingList_In",
-       "VarDeclaration",
-       "VariableDeclarationList",
-       "VarDeclaration_In",
-       "VariableDeclarationList_In",
-       "LexicalBinding_In",
-       "VariableDeclaration",
-       "VariableDeclaration_In",
-       "LexicalBinding",
-       "BindingPattern",
-       "ObjectBindingPattern",
-       "ArrayBindingPattern",
-       "BindingPropertyList",
-       "BindingElementList",
-       "BindingProperty",
-       "BindingElisionElement",
-       "BindingElement",
-       "InOrOf",
-       "ForDeclaration",
-       "CaseBlock",
-       "CaseClausesOpt",
-       "DefaultClause",
-       "CaseClauses",
-       "CaseClause",
-       "LabelledItem",
-       "Catch",
-       "Finally",
-       "CatchParameter",
-       "Function",
-       "FormalParameters",
-       "FunctionLBrace",
-       "FunctionBody",
-       "FunctionRBrace",
-       "StrictFormalParameters",
-       "FormalParameterList",
-       "FormalParameter",
-       "ArrowParameters",
-       "ConciseBodyLookahead",
-       "GeneratorLParen",
-       "GeneratorBody",
-       "GeneratorRBrace",
-       "PropertySetParameterList",
-       "FunctionStar",
-       "ClassHeritageOpt",
-       "ClassLBrace",
-       "ClassBodyOpt",
-       "ClassRBrace",
-       "ClassDeclaration_Default",
-       "ClassStaticQualifier",
-       "ClassElementList",
-       "ClassElement",
-       "ScriptBody",
-       "ModuleBodyOpt",
-       "ModuleBody",
-       "ModuleItemList",
-       "ModuleItem",
-       "ImportDeclaration",
-       "ExportDeclaration",
-       "ImportClause",
-       "FromClause",
-       "ModuleSpecifier",
-       "ImportedDefaultBinding",
-       "NameSpaceImport",
-       "NamedImports",
-       "ImportedBinding",
-       "ImportsList",
-       "ImportSpecifier",
-       "ExportDeclarationLookahead",
-       "ExportClause",
-       "ExportsList",
-       "ExportSpecifier",
-       "$accept"
+                                           "TopLevel",
+                                           "UiProgram",
+                                           "Statement",
+                                           "Expression",
+                                           "UiAnnotatedObjectMember",
+                                           "Script",
+                                           "Module",
+                                           "UiHeaderItemListOpt",
+                                           "UiRootMember",
+                                           "Empty",
+                                           "UiHeaderItemList",
+                                           "UiPragma",
+                                           "UiImport",
+                                           "PragmaId",
+                                           "JsIdentifier",
+                                           "Semicolon",
+                                           "ImportId",
+                                           "MemberExpression",
+                                           "UiImportHead",
+                                           "UiVersionSpecifier",
+                                           "QmlIdentifier",
+                                           "UiAnnotatedObject",
+                                           "UiSimpleQualifiedId",
+                                           "UiAnnotationObjectDefinition",
+                                           "UiObjectInitializer",
+                                           "UiAnnotation",
+                                           "UiAnnotationList",
+                                           "UiObjectDefinition",
+                                           "UiObjectMemberList",
+                                           "UiArrayMemberList",
+                                           "UiQualifiedId",
+                                           "UiObjectMember",
+                                           "ExpressionStatementLookahead",
+                                           "UiObjectLiteral",
+                                           "UiPropertyDefinitionList",
+                                           "UiScriptStatement",
+                                           "ExpressionStatement",
+                                           "Block",
+                                           "EmptyStatement",
+                                           "IfStatement",
+                                           "WithStatement",
+                                           "SwitchStatement",
+                                           "TryStatement",
+                                           "UiPropertyType",
+                                           "UiParameterListOpt",
+                                           "UiParameterList",
+                                           "Type",
+                                           "AttrRequired",
+                                           "AttrReadonly",
+                                           "AttrDefault",
+                                           "UiPropertyAttributes",
+                                           "UiObjectMemberListPropertyNoInitialiser",
+                                           "UiObjectMemberPropertyNoInitialiser",
+                                           "OptionalSemicolon",
+                                           "UiRequired",
+                                           "UiObjectMemberWithScriptStatement",
+                                           "UiObjectMemberWithArray",
+                                           "UiObjectMemberExpressionStatementLookahead",
+                                           "GeneratorDeclaration",
+                                           "FunctionDeclarationWithTypes",
+                                           "VariableStatement",
+                                           "EnumMemberList",
+                                           "IdentifierReference",
+                                           "BindingIdentifier",
+                                           "SimpleType",
+                                           "TypeAnnotation",
+                                           "TypeAnnotationOpt",
+                                           "PrimaryExpression",
+                                           "Literal",
+                                           "ArrayLiteral",
+                                           "ObjectLiteral",
+                                           "FunctionExpression",
+                                           "ClassExpression",
+                                           "GeneratorExpression",
+                                           "RegularExpressionLiteral",
+                                           "TemplateLiteral",
+                                           "CoverParenthesizedExpressionAndArrowParameterList",
+                                           "Expression_In",
+                                           "BindingRestElement",
+                                           "BindingRestElementOpt",
+                                           "ElisionOpt",
+                                           "ElementList",
+                                           "AssignmentExpression_In",
+                                           "Elision",
+                                           "SpreadElement",
+                                           "AssignmentExpression",
+                                           "PropertyDefinitionList",
+                                           "UiPropertyDefinition",
+                                           "PropertyDefinition",
+                                           "CoverInitializedName",
+                                           "Initializer_In",
+                                           "UiPropertyName",
+                                           "PropertyName",
+                                           "MethodDefinition",
+                                           "LiteralPropertyName",
+                                           "ComputedPropertyName",
+                                           "IdentifierName",
+                                           "ReservedIdentifier",
+                                           "Initializer",
+                                           "InitializerOpt",
+                                           "InitializerOpt_In",
+                                           "TemplateSpans",
+                                           "Super",
+                                           "NewTarget",
+                                           "MetaProperty",
+                                           "Arguments",
+                                           "NewExpression",
+                                           "CallExpression",
+                                           "ArgumentList",
+                                           "LeftHandSideExpression",
+                                           "UpdateExpression",
+                                           "UnaryExpression",
+                                           "ExponentiationExpression",
+                                           "MultiplicativeExpression",
+                                           "MultiplicativeOperator",
+                                           "AdditiveExpression",
+                                           "ShiftExpression",
+                                           "RelationalExpression_In",
+                                           "RelationalExpression",
+                                           "RelationalOperator",
+                                           "EqualityExpression_In",
+                                           "EqualityExpression",
+                                           "EqualityOperator",
+                                           "BitwiseANDExpression",
+                                           "BitwiseANDExpression_In",
+                                           "BitwiseXORExpression",
+                                           "BitwiseXORExpression_In",
+                                           "BitwiseORExpression",
+                                           "BitwiseORExpression_In",
+                                           "LogicalANDExpression",
+                                           "LogicalANDExpression_In",
+                                           "LogicalORExpression",
+                                           "LogicalORExpression_In",
+                                           "CoalesceExpression",
+                                           "CoalesceExpression_In",
+                                           "ConditionalExpression",
+                                           "ConditionalExpression_In",
+                                           "YieldExpression",
+                                           "YieldExpression_In",
+                                           "ArrowFunction",
+                                           "ArrowFunction_In",
+                                           "AssignmentOperator",
+                                           "ExpressionOpt",
+                                           "ExpressionOpt_In",
+                                           "BlockStatement",
+                                           "BreakableStatement",
+                                           "ContinueStatement",
+                                           "BreakStatement",
+                                           "ReturnStatement",
+                                           "LabelledStatement",
+                                           "ThrowStatement",
+                                           "DebuggerStatement",
+                                           "Declaration",
+                                           "HoistableDeclaration",
+                                           "ClassDeclaration",
+                                           "LexicalDeclaration_In",
+                                           "FunctionDeclaration",
+                                           "HoistableDeclaration_Default",
+                                           "FunctionDeclaration_Default",
+                                           "GeneratorDeclaration_Default",
+                                           "IterationStatement",
+                                           "StatementListOpt",
+                                           "StatementList",
+                                           "StatementListItem",
+                                           "LetOrConst",
+                                           "Var",
+                                           "LexicalDeclaration",
+                                           "BindingList",
+                                           "BindingList_In",
+                                           "VarDeclaration",
+                                           "VariableDeclarationList",
+                                           "VarDeclaration_In",
+                                           "VariableDeclarationList_In",
+                                           "LexicalBinding_In",
+                                           "VariableDeclaration",
+                                           "VariableDeclaration_In",
+                                           "LexicalBinding",
+                                           "BindingPattern",
+                                           "ObjectBindingPattern",
+                                           "ArrayBindingPattern",
+                                           "BindingPropertyList",
+                                           "BindingElementList",
+                                           "BindingProperty",
+                                           "BindingElisionElement",
+                                           "BindingElement",
+                                           "InOrOf",
+                                           "ForDeclaration",
+                                           "CaseBlock",
+                                           "CaseClausesOpt",
+                                           "DefaultClause",
+                                           "CaseClauses",
+                                           "CaseClause",
+                                           "LabelledItem",
+                                           "Catch",
+                                           "Finally",
+                                           "CatchParameter",
+                                           "Function",
+                                           "FormalParameters",
+                                           "FunctionLBrace",
+                                           "FunctionBody",
+                                           "FunctionRBrace",
+                                           "StrictFormalParameters",
+                                           "FormalParameterList",
+                                           "FormalParameter",
+                                           "ArrowParameters",
+                                           "ConciseBodyLookahead",
+                                           "GeneratorLParen",
+                                           "GeneratorBody",
+                                           "GeneratorRBrace",
+                                           "PropertySetParameterList",
+                                           "FunctionStar",
+                                           "ClassHeritageOpt",
+                                           "ClassLBrace",
+                                           "ClassBodyOpt",
+                                           "ClassRBrace",
+                                           "ClassDeclaration_Default",
+                                           "ClassElementList",
+                                           "ClassElement",
+                                           "ScriptBody",
+                                           "ModuleBodyOpt",
+                                           "ModuleBody",
+                                           "ModuleItemList",
+                                           "ModuleItem",
+                                           "ImportDeclaration",
+                                           "ExportDeclaration",
+                                           "ImportClause",
+                                           "FromClause",
+                                           "ModuleSpecifier",
+                                           "ImportedDefaultBinding",
+                                           "NameSpaceImport",
+                                           "NamedImports",
+                                           "ImportedBinding",
+                                           "ImportsList",
+                                           "ImportSpecifier",
+                                           "ExportDeclarationLookahead",
+                                           "ExportClause",
+                                           "ExportsList",
+                                           "ExportSpecifier",
+                                           "$accept"
 #endif // QLALR_NO_QMLJSGRAMMAR_DEBUG_INFO
 
 };
 
 const short QmlJSGrammar::lhs[]
-    = {135, 135, 135, 135, 135, 135, 136, 142, 142, 145, 145, 145, 145, 148, 150, 150, 146, 146,
-       151, 147, 154, 154, 147, 147, 147, 153, 144, 143, 157, 157, 158, 160, 161, 161, 156, 156,
-       163, 163, 164, 164, 159, 159, 162, 139, 139, 166, 166, 166, 166, 168, 168, 170, 170, 170,
-       170, 170, 170, 170, 170, 170, 166, 178, 178, 178, 178, 179, 179, 180, 180, 180, 180, 166,
-       166, 181, 182, 183, 184, 184, 184, 184, 185, 166, 186, 166, 187, 187, 188, 166, 189, 166,
-       190, 166, 191, 166, 166, 166, 166, 165, 166, 166, 195, 195, 195, 195, 155, 155, 155, 155,
-       155, 155, 155, 155, 155, 155, 155, 149, 149, 149, 149, 149, 149, 149, 149, 149, 149, 149,
-       149, 149, 196, 197, 198, 198, 199, 199, 199, 200, 201, 201, 202, 202, 202, 202, 202, 202,
-       202, 202, 202, 202, 202, 211, 211, 211, 211, 203, 203, 203, 203, 203, 203, 209, 209, 204,
-       204, 204, 216, 216, 216, 216, 216, 218, 218, 215, 215, 219, 205, 205, 205, 169, 221, 169,
-       221, 223, 223, 224, 222, 223, 223, 227, 227, 229, 226, 229, 226, 229, 231, 231, 232, 232,
-       232, 232, 232, 232, 232, 232, 232, 232, 232, 232, 232, 232, 232, 232, 232, 232, 232, 232,
-       232, 232, 232, 232, 232, 232, 232, 232, 232, 232, 232, 232, 232, 232, 232, 232, 232, 232,
-       230, 233, 225, 234, 235, 234, 235, 210, 236, 236, 210, 152, 237, 152, 152, 152, 238, 152,
-       152, 152, 152, 152, 239, 241, 241, 242, 152, 242, 242, 242, 242, 242, 242, 242, 242, 242,
-       240, 240, 240, 243, 243, 243, 243, 244, 244, 245, 245, 245, 245, 245, 246, 246, 246, 246,
-       246, 246, 246, 246, 247, 247, 248, 248, 249, 249, 249, 250, 250, 250, 251, 251, 251, 251,
-       252, 253, 252, 253, 254, 254, 254, 254, 254, 254, 252, 255, 256, 255, 256, 257, 257, 257,
-       257, 258, 259, 258, 259, 260, 261, 260, 261, 262, 263, 262, 263, 264, 265, 264, 265, 266,
-       267, 266, 267, 268, 269, 268, 269, 270, 271, 270, 271, 220, 217, 220, 217, 220, 217, 220,
-       217, 220, 217, 276, 276, 276, 276, 276, 276, 276, 276, 276, 276, 276, 276, 138, 212, 138,
-       212, 277, 278, 277, 278, 137, 137, 137, 137, 137, 137, 137, 137, 137, 137, 137, 137, 137,
-       137, 287, 287, 287, 288, 288, 292, 292, 280, 280, 279, 172, 297, 297, 298, 298, 296, 296,
-       299, 299, 300, 301, 290, 304, 306, 194, 302, 303, 305, 307, 302, 303, 305, 307, 311, 308,
-       309, 310, 311, 308, 309, 310, 312, 312, 313, 313, 313, 314, 314, 314, 315, 315, 316, 316,
-       318, 317, 317, 317, 319, 319, 213, 213, 214, 214, 173, 167, 171, 174, 174, 295, 295, 295,
-       295, 295, 295, 320, 320, 295, 295, 321, 321, 321, 321, 281, 281, 282, 282, 283, 175, 176,
-       322, 322, 325, 325, 323, 323, 326, 324, 284, 327, 327, 285, 177, 177, 177, 328, 329, 330,
-       330, 286, 331, 291, 193, 293, 293, 206, 206, 336, 332, 332, 332, 332, 332, 337, 337, 338,
-       333, 335, 334, 274, 275, 274, 275, 339, 339, 340, 228, 228, 228, 228, 344, 341, 343, 345,
-       192, 294, 294, 208, 208, 342, 272, 273, 272, 273, 272, 273, 289, 207, 350, 207, 350, 347,
-       349, 351, 346, 346, 348, 348, 352, 352, 353, 353, 353, 140, 140, 354, 141, 356, 355, 355,
-       357, 357, 358, 358, 358, 359, 359, 361, 361, 361, 361, 361, 364, 365, 366, 366, 366, 362,
-       368, 368, 369, 369, 363, 367, 370, 360, 360, 360, 360, 360, 360, 360, 360, 371, 371, 371,
-       372, 372, 373, 373, 374};
+    = {142, 142, 142, 142, 142, 142, 143, 149, 149, 152, 152, 152, 152, 155, 157, 157, 153, 153,
+       158, 154, 161, 161, 154, 154, 154, 160, 151, 150, 164, 164, 165, 167, 168, 168, 163, 163,
+       170, 170, 171, 171, 166, 166, 169, 146, 146, 173, 173, 173, 173, 175, 175, 177, 177, 177,
+       177, 177, 177, 177, 177, 177, 173, 185, 185, 185, 185, 186, 186, 187, 187, 187, 187, 173,
+       173, 189, 190, 191, 192, 192, 192, 192, 193, 173, 194, 173, 195, 195, 196, 173, 197, 197,
+       173, 198, 173, 199, 173, 173, 173, 173, 172, 173, 173, 203, 203, 203, 203, 203, 203, 162,
+       162, 162, 162, 162, 162, 162, 162, 162, 162, 162, 156, 156, 156, 156, 156, 156, 156, 156,
+       156, 156, 156, 156, 156, 204, 205, 188, 188, 206, 206, 206, 206, 207, 208, 208, 209, 209,
+       209, 209, 209, 209, 209, 209, 209, 209, 209, 218, 218, 218, 218, 210, 210, 210, 210, 210,
+       210, 216, 216, 211, 211, 211, 223, 223, 223, 223, 223, 225, 225, 222, 222, 226, 212, 212,
+       212, 176, 228, 176, 228, 230, 230, 231, 229, 230, 230, 234, 234, 236, 233, 236, 233, 236,
+       238, 238, 239, 239, 239, 239, 239, 239, 239, 239, 239, 239, 239, 239, 239, 239, 239, 239,
+       239, 239, 239, 239, 239, 239, 239, 239, 239, 239, 239, 239, 239, 239, 239, 239, 239, 239,
+       239, 239, 239, 239, 237, 240, 232, 241, 242, 241, 242, 217, 243, 243, 217, 159, 244, 159,
+       159, 159, 245, 159, 159, 159, 159, 159, 246, 248, 248, 249, 159, 249, 249, 249, 249, 249,
+       249, 249, 249, 249, 247, 247, 247, 250, 250, 250, 250, 251, 251, 252, 252, 252, 252, 252,
+       253, 253, 253, 253, 253, 253, 253, 253, 254, 254, 255, 255, 256, 256, 256, 257, 257, 257,
+       258, 258, 258, 258, 259, 260, 259, 260, 261, 261, 261, 261, 261, 261, 259, 262, 263, 262,
+       263, 264, 264, 264, 264, 265, 266, 265, 266, 267, 268, 267, 268, 269, 270, 269, 270, 271,
+       272, 271, 272, 273, 274, 273, 274, 275, 276, 275, 276, 277, 278, 277, 278, 227, 224, 227,
+       224, 227, 224, 227, 224, 227, 224, 283, 283, 283, 283, 283, 283, 283, 283, 283, 283, 283,
+       283, 145, 219, 145, 219, 284, 285, 284, 285, 144, 144, 144, 144, 144, 144, 144, 144, 144,
+       144, 144, 144, 144, 144, 294, 294, 294, 295, 295, 299, 299, 287, 287, 286, 179, 304, 304,
+       305, 305, 303, 303, 306, 306, 307, 308, 297, 311, 313, 202, 309, 310, 312, 314, 309, 310,
+       312, 314, 318, 315, 316, 317, 318, 315, 316, 317, 319, 319, 320, 320, 320, 321, 321, 321,
+       322, 322, 323, 323, 325, 324, 324, 324, 326, 326, 220, 220, 221, 221, 180, 174, 178, 181,
+       181, 302, 302, 302, 302, 302, 302, 327, 327, 302, 302, 328, 328, 328, 328, 288, 288, 289,
+       289, 290, 182, 183, 329, 329, 332, 332, 330, 330, 333, 331, 291, 334, 334, 292, 184, 184,
+       184, 335, 336, 337, 337, 293, 338, 298, 201, 300, 300, 213, 213, 343, 339, 339, 339, 339,
+       339, 344, 344, 345, 340, 342, 341, 281, 282, 281, 282, 346, 346, 347, 235, 235, 235, 235,
+       351, 348, 350, 352, 200, 301, 301, 215, 215, 349, 279, 280, 279, 280, 279, 280, 296, 214,
+       357, 214, 357, 354, 356, 353, 353, 355, 355, 358, 358, 359, 359, 359, 147, 147, 360, 148,
+       362, 361, 361, 363, 363, 364, 364, 364, 365, 365, 367, 367, 367, 367, 367, 370, 371, 372,
+       372, 372, 368, 374, 374, 375, 375, 369, 373, 376, 366, 366, 366, 366, 366, 366, 366, 366,
+       377, 377, 377, 378, 378, 379, 379, 380};
 
 const short QmlJSGrammar::rhs[]
-    = {2, 2, 2, 2, 2, 2, 2, 1, 1, 1, 1, 2, 2, 1, 1, 1, 3, 5, 1, 2, 3, 1, 3, 5, 4, 2, 0, 1, 1,  3, 2,
-       2, 1, 2, 2, 1, 1, 2, 1, 3, 2, 3, 2, 2, 1, 1, 6, 5, 4, 5, 6, 3, 3, 3, 2, 2, 2, 2, 2, 2,  3, 1,
-       1, 1, 3, 0, 1, 3, 2, 5, 4, 6, 3, 1, 1, 1, 2, 2, 2, 1, 7, 1, 4, 1, 0, 1, 3, 1, 6, 1, 11, 1, 8,
-       1, 1, 1, 1, 1, 5, 4, 1, 3, 3, 5, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,  1, 1,
-       1, 1, 1, 1, 1, 1, 1, 3, 4, 1, 1, 2, 1, 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 3, 2, 3, 5,  1, 1,
-       1, 1, 1, 1, 1, 1, 3, 3, 5, 1, 2, 2, 4, 4, 1, 2, 0, 1, 2, 2, 3, 4, 1, 1, 3, 3, 1, 1, 2,  3, 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, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 3, 2, 2, 0, 0, 1, 1, 1, 1, 3, 3, 1,  1, 4,
-       4, 5, 3, 3, 3, 3, 1, 5, 1, 1, 2, 2, 2, 4, 5, 4, 4, 5, 4, 5, 3, 3, 0, 1, 2, 1, 2, 3, 4,  1, 1,
-       1, 2, 2, 2, 2, 1, 2, 2, 2, 2, 2, 2, 2, 1, 3, 1, 3, 1, 1, 1, 1, 3, 3, 1, 3, 3, 3, 1, 1,  3, 3,
-       1, 1, 1, 1, 1, 1, 3, 1, 1, 3, 3, 1, 1, 1, 1, 1, 1, 3, 3, 1, 1, 3, 3, 1, 1, 3, 3, 1, 1,  3, 3,
-       1, 1, 3, 3, 1, 1, 3, 3, 1, 1, 5, 5, 1, 1, 1, 1, 1, 1, 3, 3, 3, 3, 1, 1, 1, 1, 1, 1, 1,  1, 1,
-       1, 1, 1, 1, 1, 3, 3, 0, 0, 1, 1, 3, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 1, 1, 1, 1,  1, 1,
-       1, 1, 1, 1, 3, 1, 2, 1, 4, 1, 1, 1, 1, 1, 2, 2, 2, 2, 2, 1, 1, 1, 1, 3, 3, 3, 3, 3, 3,  3, 3,
-       2, 2, 2, 2, 3, 3, 0, 1, 2, 2, 1, 4, 1, 3, 1, 3, 2, 2, 4, 4, 3, 2, 2, 2, 0, 1, 1, 0, 2,  7, 5,
-       7, 7, 5, 9, 9, 9, 1, 1, 7, 7, 3, 3, 2, 2, 2, 3, 2, 3, 3, 5, 5, 3, 5, 1, 2, 0, 1, 4, 3,  3, 1,
-       3, 3, 3, 3, 4, 5, 2, 1, 1, 2, 1, 9, 9, 1, 8, 9, 8, 1, 0, 1, 1, 2, 3, 1, 3, 1, 1, 1, 1,  4, 4,
-       7, 7, 1, 1, 0, 8, 9, 8, 9, 1, 1, 1, 1, 8, 1, 7, 8, 7, 1, 1, 1, 3, 3, 2, 2, 6, 6, 5, 5,  1, 1,
-       1, 1, 0, 2, 0, 1, 1, 2, 1, 2, 1, 0, 1, 1, 1, 1, 0, 1, 1, 2, 2, 2, 1, 3, 2, 1, 1, 1, 3,  3, 1,
-       3, 2, 3, 4, 2, 1, 3, 1, 3, 1, 1, 0, 3, 3, 2, 2, 2, 5, 5, 4, 2, 3, 4, 1, 3, 1, 3, 2};
+    = {2, 2,  2, 2, 2, 2, 2, 1, 1, 1, 1, 2, 2, 1, 1, 1, 3, 5, 1, 2, 3, 1, 3, 5, 4, 2, 0, 1, 1, 3,
+       2, 2,  1, 2, 2, 1, 1, 2, 1, 3, 2, 3, 2, 2, 1, 1, 6, 5, 4, 5, 6, 3, 3, 3, 2, 2, 2, 2, 2, 2,
+       3, 1,  1, 1, 3, 0, 1, 3, 2, 5, 4, 6, 3, 1, 1, 1, 2, 2, 2, 1, 7, 1, 4, 1, 0, 1, 3, 1, 6, 9,
+       1, 12, 1, 8, 1, 1, 1, 1, 1, 5, 4, 1, 3, 4, 3, 5, 6, 1, 1, 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, 1, 1, 1, 1, 1, 2, 1, 0, 1, 1, 1, 1, 1, 1, 1, 1,
+       1, 1,  1, 3, 2, 3, 5, 1, 1, 1, 1, 1, 1, 1, 1, 3, 3, 5, 1, 2, 2, 4, 4, 1, 2, 0, 1, 2, 2, 3,
+       4, 1,  1, 3, 3, 1, 1, 2, 3, 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, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 3, 2,
+       2, 0,  0, 1, 1, 1, 1, 3, 3, 1, 1, 4, 4, 5, 3, 3, 3, 3, 1, 5, 1, 1, 2, 2, 2, 4, 5, 4, 4, 5,
+       4, 5,  3, 3, 0, 1, 2, 1, 2, 3, 4, 1, 1, 1, 2, 2, 2, 2, 1, 2, 2, 2, 2, 2, 2, 2, 1, 3, 1, 3,
+       1, 1,  1, 1, 3, 3, 1, 3, 3, 3, 1, 1, 3, 3, 1, 1, 1, 1, 1, 1, 3, 1, 1, 3, 3, 1, 1, 1, 1, 1,
+       1, 3,  3, 1, 1, 3, 3, 1, 1, 3, 3, 1, 1, 3, 3, 1, 1, 3, 3, 1, 1, 3, 3, 1, 1, 5, 5, 1, 1, 1,
+       1, 1,  1, 3, 3, 3, 3, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 3, 3, 0, 0, 1, 1, 3, 2, 2,
+       2, 2,  2, 2, 2, 2, 2, 2, 2, 2, 2, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 3, 1, 2, 1, 4, 1, 1, 1, 1,
+       1, 2,  2, 2, 2, 2, 1, 1, 1, 1, 3, 3, 3, 3, 3, 3, 3, 3, 2, 2, 2, 2, 3, 3, 0, 1, 2, 2, 1, 4,
+       1, 3,  1, 3, 2, 2, 4, 4, 3, 2, 2, 2, 0, 1, 1, 0, 2, 7, 5, 7, 7, 5, 9, 9, 9, 1, 1, 7, 7, 3,
+       3, 2,  2, 2, 3, 2, 3, 3, 5, 5, 3, 5, 1, 2, 0, 1, 4, 3, 3, 1, 3, 3, 3, 3, 4, 5, 2, 1, 1, 2,
+       1, 9,  9, 1, 8, 9, 8, 1, 0, 1, 1, 2, 3, 1, 3, 1, 1, 1, 1, 4, 4, 7, 7, 1, 1, 0, 8, 9, 8, 9,
+       1, 1,  1, 1, 8, 1, 7, 8, 7, 1, 1, 1, 3, 3, 2, 2, 6, 6, 5, 5, 1, 1, 1, 0, 2, 0, 1, 1, 2, 1,
+       2, 1,  0, 1, 1, 1, 1, 0, 1, 1, 2, 2, 2, 1, 3, 2, 1, 1, 1, 3, 3, 1, 3, 2, 3, 4, 2, 1, 3, 1,
+       3, 1,  1, 0, 3, 3, 2, 2, 2, 5, 5, 4, 2, 3, 4, 1, 3, 1, 3, 2};
 
 #ifndef QLALR_NO_QMLJSGRAMMAR_DEBUG_INFO
 const int QmlJSGrammar::rule_info[] = {
-    135, 122, 136, 135, 124, 137, 135, 125, 138, 135, 123, 139, 135, 126, 140, 135, 127, 141, 136,
-    142, 143, 142, 144, 142, 145, 145, 146, 145, 147, 145, 145, 146, 145, 145, 147, 148, 149, 150,
-    64,  150, 63,  146, 116, 148, 150, 146, 116, 148, 7,   149, 150, 151, 152, 147, 153, 150, 154,
-    50,  15,  50,  154, 50,  147, 153, 154, 150, 147, 153, 154, 117, 155, 150, 147, 153, 117, 155,
-    150, 153, 115, 151, 144, 143, 156, 157, 30,  157, 157, 15,  30,  158, 157, 159, 160, 90,  158,
-    161, 160, 161, 161, 160, 156, 161, 162, 156, 162, 163, 139, 163, 163, 139, 164, 162, 164, 164,
-    8,   162, 159, 34,  57,  159, 34,  163, 57,  162, 165, 159, 139, 161, 166, 139, 166, 166, 162,
-    166, 165, 7,   167, 35,  164, 58,  166, 165, 7,   167, 165, 159, 166, 165, 131, 165, 159, 168,
-    34,  167, 169, 57,  150, 168, 34,  167, 169, 8,   57,  150, 170, 167, 128, 171, 170, 167, 129,
-    172, 170, 167, 129, 168, 170, 167, 173, 170, 167, 171, 170, 167, 174, 170, 167, 175, 170, 167,
-    176, 170, 167, 177, 166, 165, 7,   170, 178, 79,  178, 92,  178, 30,  178, 178, 15,  30,  179,
-    179, 180, 180, 155, 7,   178, 180, 178, 155, 180, 180, 8,   155, 7,   178, 180, 180, 8,   178,
-    155, 166, 71,  30,  37,  179, 62,  150, 166, 71,  30,  150, 181, 108, 182, 72,  183, 10,  184,
-    181, 184, 184, 183, 184, 184, 182, 184, 184, 70,  185, 184, 30,  38,  178, 25,  155, 150, 166,
-    185, 186, 184, 178, 155, 150, 166, 186, 187, 187, 150, 188, 108, 155, 150, 166, 188, 189, 184,
-    178, 155, 7,   170, 187, 166, 189, 190, 184, 30,  38,  178, 25,  155, 7,   35,  164, 58,  150,
-    166, 190, 191, 184, 178, 155, 7,   167, 165, 159, 150, 166, 191, 166, 192, 166, 193, 166, 194,
-    165, 152, 166, 99,  30,  34,  195, 57,  166, 109, 30,  7,   162, 195, 30,  195, 30,  17,  48,
-    195, 195, 8,   30,  195, 195, 8,   30,  17,  48,  155, 30,  155, 70,  155, 71,  155, 72,  155,
-    131, 155, 119, 155, 120, 155, 107, 155, 118, 155, 108, 155, 109, 149, 30,  149, 70,  149, 71,
-    149, 72,  149, 131, 149, 119, 149, 120, 149, 107, 149, 105, 149, 118, 149, 117, 149, 108, 149,
-    109, 196, 149, 197, 196, 198, 199, 198, 198, 8,   199, 199, 165, 38,  198, 25,  199, 92,  199,
-    165, 200, 7,   199, 201, 200, 201, 202, 74,  202, 196, 202, 203, 202, 204, 202, 205, 202, 206,
-    202, 207, 202, 208, 202, 209, 202, 210, 202, 211, 211, 37,  212, 62,  211, 37,  62,  211, 37,
-    213, 62,  211, 37,  212, 8,   214, 62,  203, 85,  203, 86,  203, 87,  203, 48,  203, 93,  203,
-    69,  209, 12,  209, 13,  204, 35,  215, 58,  204, 35,  216, 58,  204, 35,  216, 8,   215, 58,
-    216, 217, 216, 218, 217, 216, 215, 219, 216, 216, 8,   215, 217, 216, 216, 8,   215, 219, 218,
-    8,   218, 218, 8,   215, 215, 218, 219, 100, 220, 205, 34,  57,  205, 34,  221, 57,  205, 34,
-    221, 8,   57,  169, 222, 221, 223, 169, 169, 8,   222, 221, 221, 8,   223, 223, 196, 223, 224,
-    224, 196, 225, 222, 226, 7,   217, 223, 227, 7,   217, 223, 228, 227, 229, 227, 230, 229, 231,
-    226, 69,  229, 69,  226, 48,  229, 48,  231, 196, 231, 232, 232, 4,   232, 5,   232, 6,   232,
-    9,   232, 10,  232, 11,  232, 14,  232, 16,  232, 99,  232, 87,  232, 20,  232, 21,  232, 23,
-    232, 31,  232, 32,  232, 33,  232, 44,  232, 85,  232, 61,  232, 73,  232, 74,  232, 75,  232,
-    86,  232, 77,  232, 78,  232, 79,  232, 80,  232, 81,  232, 88,  232, 89,  232, 91,  232, 92,
-    232, 102, 232, 82,  232, 103, 232, 104, 232, 106, 232, 115, 230, 35,  217, 58,  233, 17,  220,
-    225, 17,  217, 234, 235, 234, 233, 235, 225, 210, 110, 236, 113, 236, 112, 138, 236, 210, 111,
-    138, 236, 152, 202, 237, 102, 152, 237, 35,  212, 58,  152, 152, 35,  212, 58,  152, 152, 98,
-    35,  212, 58,  238, 44,  15,  30,  152, 237, 15,  231, 152, 152, 15,  231, 152, 152, 98,  231,
-    152, 239, 152, 44,  152, 37,  240, 62,  239, 238, 241, 152, 241, 44,  241, 242, 242, 210, 152,
-    152, 210, 242, 152, 37,  240, 62,  242, 152, 98,  37,  240, 62,  242, 237, 37,  240, 62,  242,
-    242, 37,  240, 62,  242, 242, 98,  37,  240, 62,  242, 242, 35,  212, 58,  242, 242, 98,  35,
-    212, 58,  242, 242, 15,  231, 242, 242, 98,  231, 240, 240, 243, 240, 243, 8,   243, 217, 243,
-    100, 217, 243, 243, 8,   217, 243, 243, 8,   100, 217, 244, 241, 244, 242, 245, 244, 245, 244,
-    55,  245, 244, 43,  245, 55,  246, 245, 43,  246, 246, 245, 246, 11,  246, 246, 80,  246, 246,
-    78,  246, 246, 53,  246, 246, 41,  246, 246, 76,  246, 246, 45,  246, 247, 246, 247, 245, 66,
-    247, 248, 247, 248, 248, 249, 247, 249, 65,  249, 12,  249, 59,  250, 248, 250, 250, 53,  248,
-    250, 250, 41,  248, 251, 250, 251, 251, 39,  250, 251, 251, 26,  250, 251, 251, 28,  250, 252,
-    251, 253, 251, 252, 252, 254, 251, 253, 253, 254, 251, 254, 38,  254, 25,  254, 36,  254, 24,
-    254, 33,  254, 117, 252, 252, 32,  251, 255, 252, 256, 253, 255, 255, 257, 252, 256, 256, 257,
-    253, 257, 18,  257, 46,  257, 19,  257, 47,  258, 256, 259, 255, 258, 258, 1,   256, 259, 259,
-    1,   255, 260, 258, 261, 259, 260, 260, 83,  258, 261, 261, 83,  259, 262, 260, 263, 261, 262,
-    262, 49,  260, 263, 263, 49,  261, 264, 262, 265, 263, 264, 264, 2,   262, 265, 265, 2,   263,
-    266, 264, 267, 265, 266, 266, 52,  264, 267, 267, 52,  265, 268, 266, 269, 267, 268, 268, 97,
-    266, 269, 269, 97,  267, 270, 268, 271, 269, 270, 268, 56,  217, 7,   220, 271, 269, 56,  217,
-    7,   217, 220, 270, 217, 271, 220, 272, 217, 273, 220, 274, 217, 275, 220, 244, 17,  220, 217,
-    244, 17,  217, 220, 244, 276, 220, 217, 244, 276, 217, 276, 68,  276, 67,  276, 13,  276, 60,
-    276, 54,  276, 42,  276, 40,  276, 27,  276, 29,  276, 3,   276, 84,  276, 51,  138, 220, 212,
-    217, 138, 138, 8,   220, 212, 212, 8,   217, 277, 278, 277, 138, 278, 212, 137, 167, 129, 279,
-    137, 167, 194, 137, 167, 173, 137, 167, 171, 137, 167, 174, 137, 167, 280, 137, 167, 281, 137,
-    167, 282, 137, 167, 283, 137, 167, 175, 137, 167, 284, 137, 167, 285, 137, 167, 177, 137, 167,
-    286, 287, 288, 287, 289, 287, 290, 288, 291, 288, 192, 292, 293, 292, 294, 280, 295, 280, 176,
-    279, 172, 172, 34,  296, 57,  297, 298, 297, 297, 298, 298, 137, 298, 167, 128, 287, 150, 296,
-    167, 296, 297, 299, 89,  299, 88,  300, 79,  301, 299, 302, 290, 299, 303, 304, 300, 305, 306,
-    300, 307, 194, 306, 150, 302, 308, 303, 308, 305, 309, 307, 310, 302, 302, 8,   311, 303, 303,
-    8,   308, 305, 305, 8,   309, 307, 307, 8,   310, 311, 197, 201, 234, 308, 197, 201, 235, 309,
-    197, 201, 234, 310, 197, 201, 235, 311, 312, 233, 308, 312, 225, 309, 312, 233, 310, 312, 225,
-    312, 34,  313, 57,  312, 35,  314, 58,  313, 313, 315, 313, 315, 8,   314, 215, 214, 314, 316,
-    314, 316, 8,   215, 214, 315, 317, 315, 315, 8,   317, 316, 318, 316, 316, 8,   318, 318, 215,
-    319, 317, 197, 235, 317, 227, 7,   197, 235, 317, 227, 7,   312, 235, 319, 197, 201, 235, 319,
-    312, 235, 213, 100, 197, 213, 100, 312, 214, 214, 213, 173, 63,  167, 171, 212, 150, 174, 31,
-    37,  212, 62,  137, 16,  137, 174, 31,  37,  212, 62,  137, 295, 14,  137, 81,  37,  212, 62,
-    95,  295, 14,  137, 81,  37,  212, 62,  150, 295, 81,  37,  212, 62,  137, 295, 21,  37,  277,
-    63,  278, 63,  278, 62,  137, 295, 21,  37,  304, 63,  278, 63,  278, 62,  137, 295, 21,  37,
-    301, 63,  278, 63,  278, 62,  137, 320, 32,  320, 118, 295, 21,  37,  244, 320, 212, 62,  137,
-    295, 21,  37,  321, 320, 212, 62,  137, 321, 299, 197, 201, 321, 300, 197, 201, 321, 299, 312,
-    321, 300, 312, 281, 9,   150, 281, 9,   196, 150, 282, 4,   150, 282, 4,   196, 150, 283, 61,
-    278, 150, 175, 82,  37,  212, 62,  137, 176, 73,  37,  212, 62,  322, 322, 34,  323, 57,  322,
-    34,  323, 324, 323, 57,  325, 326, 325, 325, 326, 323, 323, 325, 326, 5,   212, 7,   296, 324,
-    10,  7,   296, 284, 196, 7,   327, 327, 137, 327, 167, 128, 291, 285, 75,  212, 150, 177, 77,
-    172, 328, 177, 77,  172, 329, 177, 77,  172, 328, 329, 328, 6,   37,  330, 62,  172, 329, 20,
-    172, 330, 197, 330, 312, 286, 91,  150, 331, 23,  291, 331, 197, 37,  332, 62,  201, 333, 334,
-    335, 193, 331, 197, 37,  332, 62,  201, 333, 334, 335, 293, 291, 293, 331, 37,  332, 62,  201,
-    333, 334, 335, 206, 23,  197, 37,  332, 62,  201, 333, 334, 335, 206, 23,  37,  332, 62,  201,
-    333, 334, 335, 336, 332, 332, 332, 213, 332, 337, 332, 337, 8,   332, 337, 8,   213, 337, 319,
-    337, 337, 8,   319, 338, 319, 333, 34,  335, 57,  334, 296, 274, 339, 96,  340, 220, 275, 339,
-    96,  340, 217, 274, 339, 96,  340, 129, 333, 334, 335, 275, 339, 96,  340, 129, 333, 334, 335,
-    339, 197, 339, 211, 340, 228, 227, 37,  336, 62,  201, 333, 334, 335, 228, 65,  227, 341, 336,
-    62,  201, 333, 342, 343, 228, 119, 227, 37,  62,  201, 333, 334, 335, 228, 120, 227, 37,  344,
-    62,  201, 333, 334, 335, 344, 338, 341, 37,  343, 57,  345, 22,  192, 345, 197, 341, 332, 62,
-    333, 342, 343, 294, 192, 294, 345, 341, 332, 62,  333, 342, 343, 208, 22,  197, 341, 332, 62,
-    333, 342, 343, 208, 22,  341, 332, 62,  333, 342, 343, 342, 334, 272, 101, 273, 101, 272, 101,
-    65,  220, 273, 101, 65,  217, 272, 101, 220, 273, 101, 217, 289, 103, 197, 346, 347, 348, 349,
-    207, 103, 197, 346, 347, 348, 349, 350, 103, 346, 347, 348, 349, 207, 103, 346, 347, 348, 349,
-    350, 289, 347, 34,  349, 57,  351, 105, 346, 346, 104, 244, 348, 348, 352, 352, 353, 352, 352,
-    353, 353, 228, 353, 351, 228, 353, 63,  140, 140, 354, 354, 297, 141, 355, 356, 357, 355, 355,
-    356, 357, 358, 357, 357, 358, 358, 359, 150, 358, 360, 150, 358, 298, 359, 115, 361, 362, 359,
-    115, 363, 361, 364, 361, 365, 361, 366, 361, 364, 8,   365, 361, 364, 8,   366, 364, 367, 365,
-    65,  117, 367, 366, 34,  57,  366, 34,  368, 57,  366, 34,  368, 8,   57,  362, 107, 363, 368,
-    369, 368, 368, 8,   369, 369, 367, 369, 231, 117, 367, 363, 69,  367, 197, 370, 360, 106, 65,
-    362, 360, 106, 371, 362, 360, 106, 371, 360, 106, 194, 360, 106, 287, 360, 106, 10,  370, 128,
-    292, 360, 106, 10,  370, 128, 350, 360, 106, 10,  370, 217, 371, 34,  57,  371, 34,  372, 57,
-    371, 34,  372, 8,   57,  372, 373, 372, 372, 8,   373, 373, 231, 373, 231, 117, 231, 374, 135,
-    0};
+    142, 129, 143, 142, 131, 144, 142, 132, 145, 142, 130, 146, 142, 133, 147, 142, 134, 148, 143,
+    149, 150, 149, 151, 149, 152, 152, 153, 152, 154, 152, 152, 153, 152, 152, 154, 155, 156, 157,
+    64,  157, 63,  153, 116, 155, 157, 153, 116, 155, 7,   156, 157, 158, 159, 154, 160, 157, 161,
+    50,  15,  50,  161, 50,  154, 160, 161, 157, 154, 160, 161, 117, 162, 157, 154, 160, 117, 162,
+    157, 160, 115, 158, 151, 150, 163, 164, 30,  164, 164, 15,  30,  165, 164, 166, 167, 90,  165,
+    168, 167, 168, 168, 167, 163, 168, 169, 163, 169, 170, 146, 170, 170, 146, 171, 169, 171, 171,
+    8,   169, 166, 34,  57,  166, 34,  170, 57,  169, 172, 166, 146, 168, 173, 146, 173, 173, 169,
+    173, 172, 7,   174, 35,  171, 58,  173, 172, 7,   174, 172, 166, 173, 172, 138, 172, 166, 175,
+    34,  174, 176, 57,  157, 175, 34,  174, 176, 8,   57,  157, 177, 174, 135, 178, 177, 174, 136,
+    179, 177, 174, 136, 175, 177, 174, 180, 177, 174, 178, 177, 174, 181, 177, 174, 182, 177, 174,
+    183, 177, 174, 184, 173, 172, 7,   177, 185, 79,  185, 92,  185, 30,  185, 185, 15,  30,  186,
+    186, 187, 187, 162, 7,   188, 187, 188, 162, 187, 187, 8,   162, 7,   188, 187, 187, 8,   188,
+    162, 173, 71,  30,  37,  186, 62,  157, 173, 71,  30,  157, 189, 108, 190, 72,  191, 10,  192,
+    189, 192, 192, 191, 192, 192, 190, 192, 192, 70,  193, 192, 30,  38,  185, 25,  162, 157, 173,
+    193, 194, 192, 185, 162, 157, 173, 194, 195, 195, 157, 196, 108, 162, 157, 173, 196, 197, 192,
+    185, 162, 7,   177, 195, 197, 192, 30,  38,  185, 25,  162, 7,   177, 195, 173, 197, 198, 192,
+    30,  38,  185, 25,  162, 7,   174, 35,  171, 58,  157, 173, 198, 199, 192, 185, 162, 7,   174,
+    172, 166, 157, 173, 199, 173, 200, 173, 201, 173, 202, 172, 159, 173, 99,  30,  34,  203, 57,
+    173, 109, 30,  7,   169, 203, 30,  203, 30,  17,  48,  203, 30,  17,  41,  48,  203, 203, 8,
+    30,  203, 203, 8,   30,  17,  48,  203, 203, 8,   30,  17,  41,  48,  162, 30,  162, 70,  162,
+    71,  162, 72,  162, 138, 162, 119, 162, 120, 162, 107, 162, 118, 162, 108, 162, 109, 156, 30,
+    156, 70,  156, 71,  156, 72,  156, 138, 156, 119, 156, 120, 156, 107, 156, 105, 156, 118, 156,
+    117, 156, 108, 156, 109, 204, 156, 205, 204, 188, 172, 38,  206, 25,  188, 206, 206, 92,  206,
+    172, 206, 79,  206, 80,  207, 7,   188, 208, 207, 208, 209, 74,  209, 204, 209, 210, 209, 211,
+    209, 212, 209, 213, 209, 214, 209, 215, 209, 216, 209, 217, 209, 218, 218, 37,  219, 62,  218,
+    37,  62,  218, 37,  220, 62,  218, 37,  219, 8,   221, 62,  210, 85,  210, 86,  210, 87,  210,
+    48,  210, 93,  210, 69,  216, 12,  216, 13,  211, 35,  222, 58,  211, 35,  223, 58,  211, 35,
+    223, 8,   222, 58,  223, 224, 223, 225, 224, 223, 222, 226, 223, 223, 8,   222, 224, 223, 223,
+    8,   222, 226, 225, 8,   225, 225, 8,   222, 222, 225, 226, 100, 227, 212, 34,  57,  212, 34,
+    228, 57,  212, 34,  228, 8,   57,  176, 229, 228, 230, 176, 176, 8,   229, 228, 228, 8,   230,
+    230, 204, 230, 231, 231, 204, 232, 229, 233, 7,   224, 230, 234, 7,   224, 230, 235, 234, 236,
+    234, 237, 236, 238, 233, 69,  236, 69,  233, 48,  236, 48,  238, 204, 238, 239, 239, 4,   239,
+    5,   239, 6,   239, 9,   239, 10,  239, 11,  239, 14,  239, 16,  239, 99,  239, 87,  239, 20,
+    239, 21,  239, 23,  239, 31,  239, 32,  239, 33,  239, 44,  239, 85,  239, 61,  239, 73,  239,
+    74,  239, 75,  239, 86,  239, 77,  239, 78,  239, 79,  239, 80,  239, 81,  239, 88,  239, 89,
+    239, 91,  239, 92,  239, 102, 239, 82,  239, 103, 239, 104, 239, 106, 239, 115, 237, 35,  224,
+    58,  240, 17,  227, 232, 17,  224, 241, 242, 241, 240, 242, 232, 217, 110, 243, 113, 243, 112,
+    145, 243, 217, 111, 145, 243, 159, 209, 244, 102, 159, 244, 35,  219, 58,  159, 159, 35,  219,
+    58,  159, 159, 98,  35,  219, 58,  245, 44,  15,  30,  159, 244, 15,  238, 159, 159, 15,  238,
+    159, 159, 98,  238, 159, 246, 159, 44,  159, 37,  247, 62,  246, 245, 248, 159, 248, 44,  248,
+    249, 249, 217, 159, 159, 217, 249, 159, 37,  247, 62,  249, 159, 98,  37,  247, 62,  249, 244,
+    37,  247, 62,  249, 249, 37,  247, 62,  249, 249, 98,  37,  247, 62,  249, 249, 35,  219, 58,
+    249, 249, 98,  35,  219, 58,  249, 249, 15,  238, 249, 249, 98,  238, 247, 247, 250, 247, 250,
+    8,   250, 224, 250, 100, 224, 250, 250, 8,   224, 250, 250, 8,   100, 224, 251, 248, 251, 249,
+    252, 251, 252, 251, 55,  252, 251, 43,  252, 55,  253, 252, 43,  253, 253, 252, 253, 11,  253,
+    253, 80,  253, 253, 78,  253, 253, 53,  253, 253, 41,  253, 253, 76,  253, 253, 45,  253, 254,
+    253, 254, 252, 66,  254, 255, 254, 255, 255, 256, 254, 256, 65,  256, 12,  256, 59,  257, 255,
+    257, 257, 53,  255, 257, 257, 41,  255, 258, 257, 258, 258, 39,  257, 258, 258, 26,  257, 258,
+    258, 28,  257, 259, 258, 260, 258, 259, 259, 261, 258, 260, 260, 261, 258, 261, 38,  261, 25,
+    261, 36,  261, 24,  261, 33,  261, 117, 259, 259, 32,  258, 262, 259, 263, 260, 262, 262, 264,
+    259, 263, 263, 264, 260, 264, 18,  264, 46,  264, 19,  264, 47,  265, 263, 266, 262, 265, 265,
+    1,   263, 266, 266, 1,   262, 267, 265, 268, 266, 267, 267, 83,  265, 268, 268, 83,  266, 269,
+    267, 270, 268, 269, 269, 49,  267, 270, 270, 49,  268, 271, 269, 272, 270, 271, 271, 2,   269,
+    272, 272, 2,   270, 273, 271, 274, 272, 273, 273, 52,  271, 274, 274, 52,  272, 275, 273, 276,
+    274, 275, 275, 97,  273, 276, 276, 97,  274, 277, 275, 278, 276, 277, 275, 56,  224, 7,   227,
+    278, 276, 56,  224, 7,   224, 227, 277, 224, 278, 227, 279, 224, 280, 227, 281, 224, 282, 227,
+    251, 17,  227, 224, 251, 17,  224, 227, 251, 283, 227, 224, 251, 283, 224, 283, 68,  283, 67,
+    283, 13,  283, 60,  283, 54,  283, 42,  283, 40,  283, 27,  283, 29,  283, 3,   283, 84,  283,
+    51,  145, 227, 219, 224, 145, 145, 8,   227, 219, 219, 8,   224, 284, 285, 284, 145, 285, 219,
+    144, 174, 136, 286, 144, 174, 202, 144, 174, 180, 144, 174, 178, 144, 174, 181, 144, 174, 287,
+    144, 174, 288, 144, 174, 289, 144, 174, 290, 144, 174, 182, 144, 174, 291, 144, 174, 292, 144,
+    174, 184, 144, 174, 293, 294, 295, 294, 296, 294, 297, 295, 298, 295, 200, 299, 300, 299, 301,
+    287, 302, 287, 183, 286, 179, 179, 34,  303, 57,  304, 305, 304, 304, 305, 305, 144, 305, 174,
+    135, 294, 157, 303, 174, 303, 304, 306, 89,  306, 88,  307, 79,  308, 306, 309, 297, 306, 310,
+    311, 307, 312, 313, 307, 314, 202, 313, 157, 309, 315, 310, 315, 312, 316, 314, 317, 309, 309,
+    8,   318, 310, 310, 8,   315, 312, 312, 8,   316, 314, 314, 8,   317, 318, 205, 208, 241, 315,
+    205, 208, 242, 316, 205, 208, 241, 317, 205, 208, 242, 318, 319, 240, 315, 319, 232, 316, 319,
+    240, 317, 319, 232, 319, 34,  320, 57,  319, 35,  321, 58,  320, 320, 322, 320, 322, 8,   321,
+    222, 221, 321, 323, 321, 323, 8,   222, 221, 322, 324, 322, 322, 8,   324, 323, 325, 323, 323,
+    8,   325, 325, 222, 326, 324, 205, 242, 324, 234, 7,   205, 242, 324, 234, 7,   319, 242, 326,
+    205, 208, 242, 326, 319, 242, 220, 100, 205, 220, 100, 319, 221, 221, 220, 180, 63,  174, 178,
+    219, 157, 181, 31,  37,  219, 62,  144, 16,  144, 181, 31,  37,  219, 62,  144, 302, 14,  144,
+    81,  37,  219, 62,  95,  302, 14,  144, 81,  37,  219, 62,  157, 302, 81,  37,  219, 62,  144,
+    302, 21,  37,  284, 63,  285, 63,  285, 62,  144, 302, 21,  37,  311, 63,  285, 63,  285, 62,
+    144, 302, 21,  37,  308, 63,  285, 63,  285, 62,  144, 327, 32,  327, 118, 302, 21,  37,  251,
+    327, 219, 62,  144, 302, 21,  37,  328, 327, 219, 62,  144, 328, 306, 205, 208, 328, 307, 205,
+    208, 328, 306, 319, 328, 307, 319, 288, 9,   157, 288, 9,   204, 157, 289, 4,   157, 289, 4,
+    204, 157, 290, 61,  285, 157, 182, 82,  37,  219, 62,  144, 183, 73,  37,  219, 62,  329, 329,
+    34,  330, 57,  329, 34,  330, 331, 330, 57,  332, 333, 332, 332, 333, 330, 330, 332, 333, 5,
+    219, 7,   303, 331, 10,  7,   303, 291, 204, 7,   334, 334, 144, 334, 174, 135, 298, 292, 75,
+    219, 157, 184, 77,  179, 335, 184, 77,  179, 336, 184, 77,  179, 335, 336, 335, 6,   37,  337,
+    62,  179, 336, 20,  179, 337, 205, 337, 319, 293, 91,  157, 338, 23,  298, 338, 205, 37,  339,
+    62,  208, 340, 341, 342, 201, 338, 205, 37,  339, 62,  208, 340, 341, 342, 300, 298, 300, 338,
+    37,  339, 62,  208, 340, 341, 342, 213, 23,  205, 37,  339, 62,  208, 340, 341, 342, 213, 23,
+    37,  339, 62,  208, 340, 341, 342, 343, 339, 339, 339, 220, 339, 344, 339, 344, 8,   339, 344,
+    8,   220, 344, 326, 344, 344, 8,   326, 345, 326, 340, 34,  342, 57,  341, 303, 281, 346, 96,
+    347, 227, 282, 346, 96,  347, 224, 281, 346, 96,  347, 136, 340, 341, 342, 282, 346, 96,  347,
+    136, 340, 341, 342, 346, 205, 346, 218, 347, 235, 234, 37,  343, 62,  208, 340, 341, 342, 235,
+    65,  234, 348, 343, 62,  208, 340, 349, 350, 235, 119, 234, 37,  62,  208, 340, 341, 342, 235,
+    120, 234, 37,  351, 62,  208, 340, 341, 342, 351, 345, 348, 37,  350, 57,  352, 22,  200, 352,
+    205, 348, 339, 62,  340, 349, 350, 301, 200, 301, 352, 348, 339, 62,  340, 349, 350, 215, 22,
+    205, 348, 339, 62,  340, 349, 350, 215, 22,  348, 339, 62,  340, 349, 350, 349, 341, 279, 101,
+    280, 101, 279, 101, 65,  227, 280, 101, 65,  224, 279, 101, 227, 280, 101, 224, 296, 103, 205,
+    353, 354, 355, 356, 214, 103, 205, 353, 354, 355, 356, 357, 103, 353, 354, 355, 356, 214, 103,
+    353, 354, 355, 356, 357, 296, 354, 34,  356, 57,  353, 353, 104, 251, 355, 355, 358, 358, 359,
+    358, 358, 359, 359, 235, 359, 105, 235, 359, 63,  147, 147, 360, 360, 304, 148, 361, 362, 363,
+    361, 361, 362, 363, 364, 363, 363, 364, 364, 365, 157, 364, 366, 157, 364, 305, 365, 115, 367,
+    368, 365, 115, 369, 367, 370, 367, 371, 367, 372, 367, 370, 8,   371, 367, 370, 8,   372, 370,
+    373, 371, 65,  117, 373, 372, 34,  57,  372, 34,  374, 57,  372, 34,  374, 8,   57,  368, 107,
+    369, 374, 375, 374, 374, 8,   375, 375, 373, 375, 238, 117, 373, 369, 69,  373, 205, 376, 366,
+    106, 65,  368, 366, 106, 377, 368, 366, 106, 377, 366, 106, 202, 366, 106, 294, 366, 106, 10,
+    376, 135, 299, 366, 106, 10,  376, 135, 357, 366, 106, 10,  376, 224, 377, 34,  57,  377, 34,
+    378, 57,  377, 34,  378, 8,   57,  378, 379, 378, 378, 8,   379, 379, 238, 379, 238, 117, 238,
+    380, 142, 0};
 
 const int QmlJSGrammar::rule_index[]
     = {0,    3,    6,    9,    12,   15,   18,   21,   23,   25,   27,   29,   32,   35,   37,
@@ -556,391 +562,411 @@ const int QmlJSGrammar::rule_index[]
        131,  133,  140,  146,  151,  157,  164,  168,  172,  176,  179,  182,  185,  188,  191,
        194,  198,  200,  202,  204,  208,  209,  211,  215,  218,  224,  229,  236,  240,  242,
        244,  246,  249,  252,  255,  257,  265,  267,  272,  274,  275,  277,  281,  283,  290,
-       292,  304,  306,  315,  317,  319,  321,  323,  325,  331,  336,  338,  342,  346,  352,
-       354,  356,  358,  360,  362,  364,  366,  368,  370,  372,  374,  376,  378,  380,  382,
-       384,  386,  388,  390,  392,  394,  396,  398,  400,  402,  404,  406,  410,  415,  417,
-       419,  422,  424,  425,  427,  429,  431,  433,  435,  437,  439,  441,  443,  445,  447,
-       451,  454,  458,  464,  466,  468,  470,  472,  474,  476,  478,  480,  484,  488,  494,
-       496,  499,  502,  507,  512,  514,  517,  518,  520,  523,  526,  530,  535,  537,  539,
-       543,  547,  549,  551,  554,  558,  562,  564,  566,  568,  570,  572,  574,  576,  578,
-       580,  582,  584,  586,  588,  590,  592,  594,  596,  598,  600,  602,  604,  606,  608,
-       610,  612,  614,  616,  618,  620,  622,  624,  626,  628,  630,  632,  634,  636,  638,
-       640,  642,  644,  646,  648,  650,  652,  654,  656,  658,  662,  665,  668,  669,  670,
-       672,  674,  676,  678,  682,  686,  688,  690,  695,  700,  706,  710,  714,  718,  722,
-       724,  730,  732,  734,  737,  740,  743,  748,  754,  759,  764,  770,  775,  781,  785,
-       789,  790,  792,  795,  797,  800,  804,  809,  811,  813,  815,  818,  821,  824,  827,
-       829,  832,  835,  838,  841,  844,  847,  850,  852,  856,  858,  862,  864,  866,  868,
-       870,  874,  878,  880,  884,  888,  892,  894,  896,  900,  904,  906,  908,  910,  912,
-       914,  916,  920,  922,  924,  928,  932,  934,  936,  938,  940,  942,  944,  948,  952,
-       954,  956,  960,  964,  966,  968,  972,  976,  978,  980,  984,  988,  990,  992,  996,
-       1000, 1002, 1004, 1008, 1012, 1014, 1016, 1022, 1028, 1030, 1032, 1034, 1036, 1038, 1040,
-       1044, 1048, 1052, 1056, 1058, 1060, 1062, 1064, 1066, 1068, 1070, 1072, 1074, 1076, 1078,
-       1080, 1082, 1084, 1088, 1092, 1093, 1094, 1096, 1098, 1102, 1105, 1108, 1111, 1114, 1117,
-       1120, 1123, 1126, 1129, 1132, 1135, 1138, 1141, 1143, 1145, 1147, 1149, 1151, 1153, 1155,
-       1157, 1159, 1161, 1165, 1167, 1170, 1172, 1177, 1179, 1181, 1183, 1185, 1187, 1190, 1193,
-       1196, 1199, 1202, 1204, 1206, 1208, 1210, 1214, 1218, 1222, 1226, 1230, 1234, 1238, 1242,
-       1245, 1248, 1251, 1254, 1258, 1262, 1263, 1265, 1268, 1271, 1273, 1278, 1280, 1284, 1286,
-       1290, 1293, 1296, 1301, 1306, 1310, 1313, 1316, 1319, 1320, 1322, 1324, 1325, 1328, 1336,
-       1342, 1350, 1358, 1364, 1374, 1384, 1394, 1396, 1398, 1406, 1414, 1418, 1422, 1425, 1428,
-       1431, 1435, 1438, 1442, 1446, 1452, 1458, 1462, 1468, 1470, 1473, 1474, 1476, 1481, 1485,
-       1489, 1491, 1495, 1499, 1503, 1507, 1512, 1518, 1521, 1523, 1525, 1528, 1530, 1540, 1550,
-       1552, 1561, 1571, 1580, 1582, 1583, 1585, 1587, 1590, 1594, 1596, 1600, 1602, 1604, 1606,
-       1608, 1613, 1618, 1626, 1634, 1636, 1638, 1639, 1648, 1658, 1667, 1677, 1679, 1681, 1683,
-       1685, 1694, 1696, 1704, 1713, 1721, 1723, 1725, 1727, 1731, 1735, 1738, 1741, 1748, 1755,
-       1761, 1767, 1769, 1771, 1773, 1775, 1776, 1779, 1780, 1782, 1784, 1787, 1789, 1792, 1794,
-       1795, 1797, 1799, 1801, 1803, 1804, 1806, 1808, 1811, 1814, 1817, 1819, 1823, 1826, 1828,
-       1830, 1832, 1836, 1840, 1842, 1846, 1849, 1853, 1858, 1861, 1863, 1867, 1869, 1873, 1875,
-       1877, 1878, 1882, 1886, 1889, 1892, 1895, 1901, 1907, 1912, 1915, 1919, 1924, 1926, 1930,
-       1932, 1936};
+       300,  302,  315,  317,  326,  328,  330,  332,  334,  336,  342,  347,  349,  353,  358,
+       362,  368,  375,  377,  379,  381,  383,  385,  387,  389,  391,  393,  395,  397,  399,
+       401,  403,  405,  407,  409,  411,  413,  415,  417,  419,  421,  423,  425,  427,  432,
+       434,  436,  438,  440,  442,  445,  447,  448,  450,  452,  454,  456,  458,  460,  462,
+       464,  466,  468,  470,  474,  477,  481,  487,  489,  491,  493,  495,  497,  499,  501,
+       503,  507,  511,  517,  519,  522,  525,  530,  535,  537,  540,  541,  543,  546,  549,
+       553,  558,  560,  562,  566,  570,  572,  574,  577,  581,  585,  587,  589,  591,  593,
+       595,  597,  599,  601,  603,  605,  607,  609,  611,  613,  615,  617,  619,  621,  623,
+       625,  627,  629,  631,  633,  635,  637,  639,  641,  643,  645,  647,  649,  651,  653,
+       655,  657,  659,  661,  663,  665,  667,  669,  671,  673,  675,  677,  679,  681,  685,
+       688,  691,  692,  693,  695,  697,  699,  701,  705,  709,  711,  713,  718,  723,  729,
+       733,  737,  741,  745,  747,  753,  755,  757,  760,  763,  766,  771,  777,  782,  787,
+       793,  798,  804,  808,  812,  813,  815,  818,  820,  823,  827,  832,  834,  836,  838,
+       841,  844,  847,  850,  852,  855,  858,  861,  864,  867,  870,  873,  875,  879,  881,
+       885,  887,  889,  891,  893,  897,  901,  903,  907,  911,  915,  917,  919,  923,  927,
+       929,  931,  933,  935,  937,  939,  943,  945,  947,  951,  955,  957,  959,  961,  963,
+       965,  967,  971,  975,  977,  979,  983,  987,  989,  991,  995,  999,  1001, 1003, 1007,
+       1011, 1013, 1015, 1019, 1023, 1025, 1027, 1031, 1035, 1037, 1039, 1045, 1051, 1053, 1055,
+       1057, 1059, 1061, 1063, 1067, 1071, 1075, 1079, 1081, 1083, 1085, 1087, 1089, 1091, 1093,
+       1095, 1097, 1099, 1101, 1103, 1105, 1107, 1111, 1115, 1116, 1117, 1119, 1121, 1125, 1128,
+       1131, 1134, 1137, 1140, 1143, 1146, 1149, 1152, 1155, 1158, 1161, 1164, 1166, 1168, 1170,
+       1172, 1174, 1176, 1178, 1180, 1182, 1184, 1188, 1190, 1193, 1195, 1200, 1202, 1204, 1206,
+       1208, 1210, 1213, 1216, 1219, 1222, 1225, 1227, 1229, 1231, 1233, 1237, 1241, 1245, 1249,
+       1253, 1257, 1261, 1265, 1268, 1271, 1274, 1277, 1281, 1285, 1286, 1288, 1291, 1294, 1296,
+       1301, 1303, 1307, 1309, 1313, 1316, 1319, 1324, 1329, 1333, 1336, 1339, 1342, 1343, 1345,
+       1347, 1348, 1351, 1359, 1365, 1373, 1381, 1387, 1397, 1407, 1417, 1419, 1421, 1429, 1437,
+       1441, 1445, 1448, 1451, 1454, 1458, 1461, 1465, 1469, 1475, 1481, 1485, 1491, 1493, 1496,
+       1497, 1499, 1504, 1508, 1512, 1514, 1518, 1522, 1526, 1530, 1535, 1541, 1544, 1546, 1548,
+       1551, 1553, 1563, 1573, 1575, 1584, 1594, 1603, 1605, 1606, 1608, 1610, 1613, 1617, 1619,
+       1623, 1625, 1627, 1629, 1631, 1636, 1641, 1649, 1657, 1659, 1661, 1662, 1671, 1681, 1690,
+       1700, 1702, 1704, 1706, 1708, 1717, 1719, 1727, 1736, 1744, 1746, 1748, 1750, 1754, 1758,
+       1761, 1764, 1771, 1778, 1784, 1790, 1792, 1794, 1796, 1797, 1800, 1801, 1803, 1805, 1808,
+       1810, 1813, 1815, 1816, 1818, 1820, 1822, 1824, 1825, 1827, 1829, 1832, 1835, 1838, 1840,
+       1844, 1847, 1849, 1851, 1853, 1857, 1861, 1863, 1867, 1870, 1874, 1879, 1882, 1884, 1888,
+       1890, 1894, 1896, 1898, 1899, 1903, 1907, 1910, 1913, 1916, 1922, 1928, 1933, 1936, 1940,
+       1945, 1947, 1951, 1953, 1957};
 #endif // QLALR_NO_QMLJSGRAMMAR_DEBUG_INFO
 
 const short QmlJSGrammar::action_default[]
-    = {0,   0,   462, 462, 462, 0,   27,  0,   303, 142, 358, 0,   376, 530, 330, 338, 334, 279,
-       145, 350, 354, 149, 326, 295, 3,   144, 146, 140, 129, 280, 141, 342, 346, 258, 255, 300,
-       278, 257, 143, 246, 147, 319, 308, 0,   126, 561, 128, 0,   160, 161, 156, 123, 0,   0,
-       121, 116, 0,   172, 0,   0,   0,   158, 0,   0,   242, 154, 157, 125, 120, 0,   0,   117,
-       119, 127, 122, 118, 124, 159, 247, 0,   139, 0,   155, 0,   0,   547, 148, 293, 285, 356,
-       0,   0,   149, 140, 280, 302, 282, 281, 0,   298, 299, 297, 296, 301, 532, 0,   526, 0,
-       462, 523, 413, 0,   411, 462, 409, 525, 359, 0,   377, 331, 339, 335, 391, 389, 351, 355,
-       390, 397, 386, 327, 387, 0,   140, 388, 405, 394, 280, 343, 347, 318, 392, 307, 406, 0,
-       0,   0,   462, 0,   0,   0,   0,   381, 461, 0,   0,   0,   417, 0,   0,   548, 395, 396,
-       0,   0,   385, 393, 357, 532, 0,   527, 0,   462, 0,   529, 524, 0,   329, 0,   322, 324,
-       323, 325, 320, 0,   316, 314, 312, 0,   315, 313, 311, 309, 0,   0,   0,   305, 306, 304,
-       317, 0,   337, 0,   333, 0,   0,   0,   0,   353, 349, 0,   345, 0,   341, 463, 15,  0,
-       16,  379, 462, 0,   495, 496, 0,   0,   497, 507, 0,   130, 515, 520, 138, 239, 516, 517,
-       0,   0,   441, 172, 0,   137, 239, 98,  0,   0,   134, 136, 135, 0,   0,   0,   261, 253,
-       195, 196, 197, 198, 199, 231, 225, 200, 227, 201, 202, 203, 204, 205, 233, 232, 206, 207,
-       208, 209, 210, 234, 211, 212, 226, 213, 214, 228, 215, 229, 216, 217, 218, 219, 220, 221,
-       222, 223, 224, 230, 0,   249, 254, 0,   0,   250, 0,   0,   252, 0,   248, 0,   0,   271,
-       272, 0,   274, 0,   273, 276, 0,   277, 256, 275, 251, 0,   131, 0,   0,   133, 132, 455,
-       241, 0,   237, 456, 518, 521, 519, 138, 0,   462, 0,   508, 457, 458, 239, 447, 442, 189,
-       190, 130, 188, 0,   0,   0,   194, 192, 452, 443, 448, 439, 0,   239, 239, 453, 454, 0,
-       235, 0,   445, 449, 173, 459, 170, 440, 172, 450, 459, 451, 460, 446, 171, 444, 0,   373,
-       366, 0,   371, 372, 370, 369, 375, 368, 367, 364, 365, 374, 363, 361, 0,   482, 483, 0,
-       480, 481, 506, 0,   0,   0,   0,   0,   0,   467, 466, 380, 382, 0,   0,   280, 0,   0,
-       416, 415, 0,   0,   0,   378, 381, 0,   383, 381, 0,   462, 469, 0,   472, 473, 0,   462,
-       475, 0,   0,   0,   362, 0,   462, 474, 360, 138, 418, 478, 423, 476, 432, 0,   138, 0,
-       427, 238, 240, 431, 0,   236, 435, 436, 381, 0,   381, 0,   462, 471, 138, 479, 425, 420,
-       477, 433, 437, 0,   138, 0,   429, 238, 381, 0,   381, 0,   462, 470, 407, 384, 462, 0,
-       408, 399, 0,   401, 0,   402, 398, 0,   400, 0,   540, 412, 0,   515, 538, 0,   0,   462,
-       546, 0,   541, 539, 138, 419, 0,   424, 239, 0,   428, 561, 0,   0,   563, 558, 0,   565,
-       564, 0,   567, 0,   121, 569, 122, 0,   560, 553, 559, 566, 568, 515, 514, 0,   138, 0,
-       462, 0,   533, 0,   0,   138, 0,   462, 0,   535, 0,   0,   522, 537, 0,   138, 0,   462,
-       0,   536, 0,   515, 0,   138, 0,   462, 0,   534, 562, 0,   0,   462, 465, 462, 464, 0,
-       484, 0,   0,   0,   486, 491, 489, 492, 0,   0,   490, 491, 0,   487, 0,   488, 462, 494,
-       0,   462, 493, 0,   498, 0,   499, 500, 0,   0,   501, 0,   504, 505, 0,   0,   502, 503,
-       0,   0,   462, 468, 0,   0,   462, 485, 552, 0,   550, 138, 0,   421, 426, 239, 434, 438,
-       0,   430, 422, 528, 0,   410, 0,   328, 0,   321, 0,   310, 0,   336, 0,   332, 0,   0,
-       271, 0,   260, 269, 0,   267, 0,   265, 270, 0,   271, 0,   268, 0,   266, 0,   0,   0,
-       0,   352, 348, 0,   344, 0,   340, 271, 0,   0,   262, 271, 0,   263, 271, 0,   264, 561,
-       0,   0,   563, 0,   554, 563, 0,   556, 286, 285, 0,   515, 515, 0,   138, 0,   462, 0,
-       512, 0,   138, 0,   462, 0,   513, 0,   515, 515, 0,   0,   462, 0,   544, 0,   0,   462,
-       0,   545, 183, 182, 187, 179, 0,   0,   175, 184, 0,   176, 181, 177, 0,   186, 165, 0,
-       173, 0,   172, 163, 0,   168, 169, 0,   164, 174, 166, 167, 162, 0,   0,   151, 152, 459,
-       150, 0,   153, 290, 284, 258, 259, 292, 289, 283, 0,   0,   243, 245, 0,   244, 291, 288,
-       287, 551, 0,   549, 0,   294, 0,   0,   6,   576, 573, 577, 462, 581, 0,   0,   580, 579,
-       578, 606, 604, 601, 0,   0,   605, 603, 0,   594, 599, 0,   609, 0,   557, 608, 0,   510,
-       403, 0,   542, 404, 607, 561, 515, 0,   138, 0,   462, 0,   511, 515, 0,   0,   462, 0,
-       543, 0,   563, 0,   555, 613, 0,   615, 610, 0,   611, 614, 612, 0,   616, 602, 600, 0,
-       589, 584, 583, 585, 586, 0,   0,   582, 0,   587, 588, 0,   595, 597, 0,   591, 0,   598,
-       0,   592, 596, 593, 0,   590, 5,   571, 462, 2,   0,   0,   0,   0,   96,  95,  0,   128,
-       76,  0,   507, 540, 117, 119, 127, 118, 4,   33,  0,   46,  45,  94,  82,  84,  92,  90,
-       0,   0,   88,  97,  80,  75,  74,  78,  79,  77,  0,   515, 0,   138, 0,   462, 0,   509,
-       29,  32,  0,   0,   0,   31,  30,  41,  37,  0,   42,  38,  0,   0,   100, 0,   43,  0,
-       0,   0,   101, 0,   99,  103, 0,   104, 0,   102, 0,   115, 112, 110, 105, 113, 109, 106,
-       108, 114, 111, 107, 87,  0,   73,  66,  0,   64,  63,  62,  67,  0,   0,   0,   64,  68,
-       0,   65,  0,   0,   0,   0,   70,  71,  0,   72,  69,  34,  44,  64,  0,   0,   0,   0,
-       0,   81,  0,   0,   0,   39,  0,   0,   40,  91,  0,   83,  462, 0,   85,  55,  56,  57,
-       258, 59,  0,   0,   60,  0,   58,  53,  462, 54,  413, 157, 159, 178, 0,   0,   0,   0,
-       193, 0,   191, 180, 51,  50,  0,   185, 52,  0,   93,  89,  86,  462, 0,   0,   61,  258,
-       172, 0,   0,   47,  48,  0,   49,  8,   0,   0,   9,   0,   11,  0,   10,  1,   26,  19,
-       14,  0,   17,  0,   0,   18,  13,  12,  28,  0,   36,  7,   35,  20,  0,   22,  0,   0,
-       25,  0,   21,  23,  0,   0,   24,  617};
+    = {0,   0,   466, 466, 466, 0,   27,  0,   307, 146, 362, 0,   380, 534, 334, 342, 338, 283,
+       149, 354, 358, 153, 330, 299, 3,   148, 150, 144, 132, 284, 145, 346, 350, 262, 259, 304,
+       282, 261, 147, 250, 151, 323, 312, 0,   129, 564, 131, 0,   164, 165, 160, 126, 0,   0,
+       124, 119, 0,   176, 0,   0,   0,   162, 0,   0,   246, 158, 161, 128, 123, 0,   0,   120,
+       122, 130, 125, 121, 127, 163, 251, 0,   143, 0,   159, 0,   0,   551, 152, 297, 289, 360,
+       0,   0,   153, 144, 284, 306, 286, 285, 0,   302, 303, 301, 300, 305, 536, 0,   530, 0,
+       466, 527, 417, 0,   415, 466, 413, 529, 363, 0,   381, 335, 343, 339, 395, 393, 355, 359,
+       394, 401, 390, 331, 391, 0,   144, 392, 409, 398, 284, 347, 351, 322, 396, 311, 410, 0,
+       0,   0,   466, 0,   0,   0,   0,   385, 465, 0,   0,   0,   421, 0,   0,   552, 399, 400,
+       0,   0,   389, 397, 361, 536, 0,   531, 0,   466, 0,   533, 528, 0,   333, 0,   326, 328,
+       327, 329, 324, 0,   320, 318, 316, 0,   319, 317, 315, 313, 0,   0,   0,   309, 310, 308,
+       321, 0,   341, 0,   337, 0,   0,   0,   0,   357, 353, 0,   349, 0,   345, 467, 15,  0,
+       16,  383, 466, 0,   499, 500, 0,   0,   501, 511, 0,   133, 519, 524, 142, 243, 520, 521,
+       0,   0,   445, 176, 0,   141, 243, 99,  135, 0,   0,   136, 138, 139, 140, 137, 0,   0,
+       0,   265, 257, 199, 200, 201, 202, 203, 235, 229, 204, 231, 205, 206, 207, 208, 209, 237,
+       236, 210, 211, 212, 213, 214, 238, 215, 216, 230, 217, 218, 232, 219, 233, 220, 221, 222,
+       223, 224, 225, 226, 227, 228, 234, 0,   253, 258, 0,   0,   254, 0,   0,   256, 0,   252,
+       0,   0,   275, 276, 0,   278, 0,   277, 280, 0,   281, 260, 279, 255, 0,   0,   137, 134,
+       459, 245, 0,   241, 460, 522, 525, 523, 142, 0,   466, 0,   512, 461, 462, 243, 451, 446,
+       193, 194, 133, 192, 0,   0,   0,   198, 196, 456, 447, 452, 443, 0,   243, 243, 457, 458,
+       0,   239, 0,   449, 453, 177, 463, 174, 444, 176, 454, 463, 455, 464, 450, 175, 448, 0,
+       377, 370, 0,   375, 376, 374, 373, 379, 372, 371, 368, 369, 378, 367, 365, 0,   486, 487,
+       0,   484, 485, 510, 0,   0,   0,   0,   0,   0,   471, 470, 384, 386, 0,   0,   284, 0,
+       0,   420, 419, 0,   0,   0,   382, 385, 0,   387, 385, 0,   466, 473, 0,   476, 477, 0,
+       466, 479, 0,   0,   0,   366, 0,   466, 478, 364, 142, 422, 482, 427, 480, 436, 0,   142,
+       0,   431, 242, 244, 435, 0,   240, 439, 440, 385, 0,   385, 0,   466, 475, 142, 483, 429,
+       424, 481, 437, 441, 0,   142, 0,   433, 242, 385, 0,   385, 0,   466, 474, 411, 388, 466,
+       0,   412, 403, 0,   405, 0,   406, 402, 0,   404, 0,   544, 416, 0,   519, 542, 0,   0,
+       466, 550, 0,   545, 543, 142, 423, 0,   428, 243, 0,   432, 564, 0,   0,   566, 562, 0,
+       568, 567, 570, 0,   124, 572, 125, 0,   127, 557, 563, 569, 519, 518, 0,   142, 0,   466,
+       0,   537, 0,   0,   142, 0,   466, 0,   539, 0,   0,   526, 541, 0,   142, 0,   466, 0,
+       540, 0,   519, 0,   142, 0,   466, 0,   538, 571, 565, 0,   0,   466, 469, 466, 468, 0,
+       488, 0,   0,   0,   490, 495, 493, 496, 0,   0,   494, 495, 0,   491, 0,   492, 466, 498,
+       0,   466, 497, 0,   502, 0,   503, 504, 0,   0,   505, 0,   508, 509, 0,   0,   506, 507,
+       0,   0,   466, 472, 0,   0,   466, 489, 556, 0,   554, 142, 0,   425, 430, 243, 438, 442,
+       0,   434, 426, 532, 0,   414, 0,   332, 0,   325, 0,   314, 0,   340, 0,   336, 0,   0,
+       275, 0,   264, 273, 0,   271, 0,   269, 274, 0,   275, 0,   272, 0,   270, 0,   0,   0,
+       0,   356, 352, 0,   348, 0,   344, 275, 0,   0,   266, 275, 0,   267, 275, 0,   268, 564,
+       0,   0,   566, 0,   558, 566, 0,   560, 290, 289, 0,   519, 519, 0,   142, 0,   466, 0,
+       516, 0,   142, 0,   466, 0,   517, 0,   519, 519, 0,   0,   466, 0,   548, 0,   0,   466,
+       0,   549, 187, 186, 191, 183, 0,   0,   179, 188, 0,   180, 185, 181, 0,   190, 169, 0,
+       177, 0,   176, 167, 0,   172, 173, 0,   168, 178, 170, 171, 166, 0,   0,   155, 156, 463,
+       154, 0,   157, 294, 288, 262, 263, 296, 293, 287, 0,   0,   247, 249, 0,   248, 295, 292,
+       291, 555, 0,   553, 0,   298, 0,   0,   6,   579, 576, 580, 466, 584, 0,   0,   583, 582,
+       581, 609, 607, 604, 0,   0,   608, 606, 0,   597, 602, 0,   612, 0,   561, 611, 0,   514,
+       407, 0,   546, 408, 610, 564, 519, 0,   142, 0,   466, 0,   515, 519, 0,   0,   466, 0,
+       547, 0,   566, 0,   559, 616, 0,   618, 613, 0,   614, 617, 615, 0,   619, 605, 603, 0,
+       592, 587, 586, 588, 589, 0,   0,   585, 0,   590, 591, 0,   598, 600, 0,   594, 0,   601,
+       0,   595, 599, 596, 0,   593, 5,   574, 466, 2,   0,   0,   0,   0,   97,  96,  0,   131,
+       76,  0,   511, 544, 120, 122, 130, 121, 4,   33,  0,   46,  45,  95,  82,  84,  93,  91,
+       0,   0,   88,  98,  80,  75,  74,  78,  79,  77,  0,   519, 0,   142, 0,   466, 0,   513,
+       29,  32,  0,   0,   0,   31,  30,  41,  37,  0,   42,  38,  0,   0,   101, 0,   43,  0,
+       0,   0,   102, 0,   100, 105, 0,   0,   106, 107, 0,   0,   103, 104, 0,   118, 115, 113,
+       108, 116, 112, 109, 111, 117, 114, 110, 87,  0,   73,  66,  0,   131, 126, 124, 119, 128,
+       123, 120, 122, 130, 125, 121, 0,   67,  0,   0,   68,  69,  0,   0,   0,   0,   70,  71,
+       0,   72,  34,  44,  64,  63,  62,  0,   0,   64,  0,   0,   0,   65,  0,   81,  466, 0,
+       85,  55,  56,  57,  59,  0,   0,   176, 60,  58,  53,  466, 54,  417, 161, 163, 182, 0,
+       0,   0,   0,   197, 0,   195, 184, 51,  50,  0,   189, 52,  262, 0,   39,  0,   0,   40,
+       92,  90,  86,  0,   83,  466, 0,   85,  0,   0,   94,  89,  466, 0,   0,   61,  262, 176,
+       0,   0,   47,  48,  0,   49,  8,   0,   0,   9,   0,   11,  0,   10,  1,   26,  19,  14,
+       0,   17,  0,   0,   18,  13,  12,  28,  0,   36,  7,   35,  20,  0,   22,  0,   0,   25,
+       0,   21,  23,  0,   0,   24,  620};
 
 const short QmlJSGrammar::goto_default[]
-    = {7,    1059, 112,  24,   890,  870,  782, 1055, 1073, 1051, 1054, 1058, 1056, 1063, 28,  213,
-       1060, 33,   1057, 1078, 946,  1070, 920, 919,  934,  891,  892,  893,  927,  994,  933, 894,
-       110,  1017, 1022, 1004, 130,  482,  128, 133,  165,  142,  161,  986,  967,  966,  876, 875,
-       874,  900,  896,  897,  1037, 902,  899, 898,  895,  879,  878,  164,  937,  27,   13,  319,
-       245,  239,  240,  39,   30,   9,    38,  25,   18,   26,   40,   86,   21,   131,  232, 375,
-       739,  737,  118,  364,  749,  12,   726, 1021, 725,  722,  324,  1023, 525,  524,  344, 341,
-       342,  253,  452,  469,  446,  769,  43,  37,   34,   307,  36,   17,   306,  136,  88,  87,
-       23,   35,   98,   8,    141,  139,  41,  183,  129,  22,   177,  14,   119,  16,   121, 15,
-       120,  31,   137,  32,   138,  19,   124, 20,   125,  89,   166,  10,   116,  433,  409, 575,
-       483,  123,  126,  122,  140,  135,  160, 127,  488,  492,  487,  494,  489,  814,  810, 813,
-       134,  115,  113,  114,  493,  162,  413, 442,  509,  417,  467,  163,  625,  444,  466, 626,
-       450,  231,  345,  361,  340,  362,  339, 363,  229,  427,  410,  580,  584,  587,  583, 582,
-       220,  600,  601,  608,  877,  536,  108, 504,  633,  537,  233,  553,  117,  105,  710, 505,
-       506,  554,  490,  684,  518,  520,  531, 807,  523,  522,  521,  871,  784,  783,  786, 785,
-       781,  780,  845,  799,  848,  847,  849, 850,  859,  860,  858,  803,  794,  834,  833, 0};
+    = {7,    1076, 112,  24,   890, 870,  782, 1072, 1090, 1068, 1071, 1075, 1073, 1080, 28,  1046,
+       1077, 33,   1074, 1095, 950, 1087, 920, 919,  934,  891,  892,  893,  927,  1039, 933, 894,
+       110,  1020, 1025, 1008, 130, 483,  128, 133,  165,  142,  161,  997,  980,  979,  248, 876,
+       875,  874,  900,  896,  897, 1045, 902, 899,  898,  895,  879,  878,  164,  937,  27,  13,
+       242,  239,  240,  39,   30,  9,    38,  25,   18,   26,   40,   86,   21,   131,  232, 376,
+       739,  737,  118,  365,  749, 12,   726, 1024, 725,  722,  325,  1026, 525,  524,  345, 342,
+       343,  256,  453,  470,  447, 769,  43,  37,   34,   310,  36,   17,   309,  136,  88,  87,
+       23,   35,   98,   8,    141, 139,  41,  183,  129,  22,   177,  14,   119,  16,   121, 15,
+       120,  31,   137,  32,   138, 19,   124, 20,   125,  89,   166,  10,   116,  434,  410, 575,
+       484,  123,  126,  122,  140, 135,  160, 127,  489,  493,  488,  495,  490,  814,  810, 813,
+       134,  115,  113,  114,  494, 162,  414, 443,  510,  418,  468,  163,  625,  445,  467, 626,
+       451,  231,  346,  362,  341, 363,  340, 364,  229,  428,  411,  580,  584,  587,  583, 582,
+       220,  600,  601,  608,  877, 535,  108, 505,  633,  536,  233,  552,  117,  105,  710, 506,
+       507,  553,  491,  684,  519, 521,  531, 807,  523,  522,  871,  784,  783,  786,  785, 781,
+       780,  845,  799,  848,  847, 849,  850, 859,  860,  858,  803,  794,  834,  833,  0};
 
 const short QmlJSGrammar::action_index[] = {
-    423,  3006, 379,  18,   -135, 2508, 212,  33,   284,  -135, -135, -54,  -135, -135, 175,  11,
-    -18,  480,  -135, 210,  -135, -16,  547,  -135, 82,   -135, -135, -2,   -135, 1107, -135, 95,
-    51,   486,  -135, 376,  -135, -135, -135, -135, -135, 466,  321,  346,  -135, 988,  -135, 2882,
-    -135, -135, -135, -135, 914,  957,  -135, -135, 6568, 3877, 4624, 2882, 2882, -135, 2014, 2882,
-    -135, -135, -135, -135, -135, 2882, 2882, -135, -135, -135, -135, -135, -135, -135, -135, 3006,
-    -135, 2882, -135, 2882, 2882, 3626, -135, -135, 85,   -135, 2882, 2882, -135, -135, 209,  399,
-    -135, -135, 2882, -135, -135, -135, -135, 396,  -135, 4125, -135, 149,  -135, -135, 6961, 154,
-    -135, 385,  -135, -135, -135, 177,  -135, 211,  142,  83,   -135, -135, 183,  -135, -135, -135,
-    -135, 547,  -135, 336,  220,  -135, -135, -135, 1139, 105,  43,   658,  -135, 320,  -135, 1155,
-    1173, 250,  -135, 40,   7,    425,  27,   3130, -135, 159,  3130, 129,  -135, 116,  108,  4001,
-    -135, -135, 1198, 235,  -135, -135, -135, -135, 3750, -135, 65,   -135, 17,   -135, -135, 2882,
-    547,  2882, -135, -135, -135, -135, 531,  2882, -135, -135, -135, 2882, -135, -135, -135, 325,
-    2882, 2882, 2882, 288,  285,  265,  370,  2882, -17,  2882, 90,   3130, 2882, 91,   3130, -135,
-    56,   2882, 113,  2882, 87,   -135, -135, 3130, -135, -135, -135, 7223, -135, -135, 150,  883,
-    -135, -135, 141,  -135, 1408, -135, 178,  171,  -135, 195,  181,  1303, 6175, 156,  2260, -135,
-    102,  408,  254,  2137, -135, -135, 29,   5127, 3130, 5651, -135, -135, -135, -135, -135, -135,
-    -135, -135, -135, -135, -135, -135, -135, -135, -135, -135, -135, -135, -135, -135, -135, -135,
-    -135, -135, -135, -135, -135, -135, -135, -135, -135, -135, -135, -135, -135, -135, -135, -135,
-    -135, -135, -135, -135, 296,  -135, -135, 3130, 294,  -135, 5127, 3130, -135, 277,  -135, 507,
-    46,   3378, 88,   50,   -135, 3130, 3502, -135, 3130, -135, -135, -135, -135, 2260, -135, 228,
-    2260, -135, -135, -135, -135, 3130, -135, -135, 1408, -135, -135, 147,  133,  -135, 114,  -135,
-    -135, -135, 152,  -135, 166,  -135, -135, 213,  -135, 144,  174,  3130, -135, -135, -135, 6175,
-    -135, -135, 1198, 170,  173,  -135, -135, 164,  -135, 179,  199,  -135, 197,  1513, -135, -135,
-    302,  -135, 1513, -135, -135, -135, -135, -135, 3130, -135, -135, 3130, -135, -135, -135, -135,
-    -135, -135, -135, -135, -135, -135, -135, -135, 182,  -135, -135, 184,  -135, -135, -135, 6830,
-    160,  163,  3130, 206,  279,  -135, -135, 4748, 176,  153,  187,  1645, 1198, 146,  -135, -135,
-    1198, 143,  3006, -135, 3130, 139,  162,  3130, 135,  -135, -135, 3130, -135, -135, 224,  -135,
-    -135, 3006, 3130, 3006, -135, 225,  -135, -135, -135, 140,  131,  120,  -135, 393,  -135, 1198,
-    125,  103,  -135, 96,   -135, -135, 3006, -135, -135, -135, 3130, 53,   3130, 48,   -135, -135,
-    99,   75,   -135, 81,   367,  -135, -135, 1198, 78,   69,   -135, 66,   3130, 9,    3130, 8,
-    -135, -135, -135, -135, -135, 16,   -135, -135, 248,  -135, 883,  -135, -135, 1198, -135, 883,
-    -135, -135, 24,   1354, -135, -3,   20,   -135, -135, -4,   -135, -135, 44,   42,   31,   -135,
-    30,   1198, -135, -60,  6,    1768, 6437, -135, -22,  -135, 6437, 6306, -135, -11,  6175, -135,
-    6175, 6175, -23,  -135, -135, -135, -135, 1513, -135, -53,  -1,   -30,  -135, -57,  -135, 41,
-    -61,  -5,   -31,  -135, -52,  -135, -29,  982,  -135, -135, -51,  5,    -21,  -135, -42,  -135,
-    -20,  1513, -43,  13,   -13,  -135, -34,  -135, -135, 3130, 316,  -135, 14,   -135, -135, 268,
-    -135, 3130, 301,  2,    -135, 32,   -135, 34,   305,  3130, -135, 38,   39,   -135, -12,  -135,
-    -135, -135, 430,  -135, -135, 381,  -135, 297,  36,   -135, 21,   23,   -135, 1198, -135, -135,
-    1,    35,   -135, -135, 3130, 283,  -135, -135, 3130, 246,  -135, -135, -135, 3130, -135, 68,
-    64,   74,   -135, 67,   -135, -135, 1198, -135, -135, -135, 6961, -135, 2882, 547,  2882, 505,
-    2882, 341,  2882, 19,   2882, 175,  5127, 3130, 3378, 6044, -135, -135, 234,  -135, 52,   -135,
-    -135, 3130, 3378, 230,  -135, 59,   -135, 3130, 2882, 111,  3006, -135, 72,   2882, 123,  2882,
-    79,   3378, 5913, 73,   -135, 3378, 76,   -135, 3378, 80,   -135, 26,   107,  109,  6437, 89,
-    -135, 6437, 93,   -135, -135, -135, 112,  1513, 1513, 94,   145,  121,  -135, 100,  -135, 98,
-    151,  128,  -135, 104,  -135, 122,  1513, 1513, 117,  134,  -135, 132,  -135, 136,  138,  -135,
-    137,  -135, -135, 387,  -135, -135, 221,  219,  -135, -135, 6699, -135, -135, -135, 3130, -135,
-    -135, 207,  4252, 193,  302,  -135, 4500, -135, -135, 3006, -135, -135, -135, -135, -135, 161,
-    205,  -135, -135, 3254, -135, 169,  -135, -135, -135, 497,  -135, -135, -135, -135, 365,  3006,
-    -135, -135, 363,  -135, -135, -135, -135, -135, 3006, -135, 2882, -135, 194,  196,  -135, -135,
-    -135, -135, 368,  -135, 564,  1379, -135, -135, -135, -135, 22,   -135, 5258, 10,   -135, -135,
-    54,   -135, -135, 4376, -135, 343,  -135, -135, 1093, -135, -135, 1009, -135, -135, -135, 988,
-    1249, -7,   45,   15,   -135, -19,  -135, 1408, -33,  -6,   -135, -26,  -135, -9,   6437, -25,
-    -135, -135, 262,  -49,  -135, 5520, -135, -135, -135, 5127, -135, -135, -135, 86,   -135, 200,
-    -135, -135, -135, 5782, 157,  -135, 190,  -135, -135, 60,   -135, -135, 222,  -135, 713,  -135,
-    5389, -135, -135, -135, 858,  -135, -135, -135, 101,  -135, 417,  416,  412,  681,  -135, -135,
-    70,   63,   -135, 58,   239,  240,  328,  395,  542,  49,   -135, -135, 2508, -135, -135, -135,
-    -135, -135, -135, -135, 340,  348,  -135, -135, -135, -135, -135, -135, -135, -135, -27,  1513,
-    -46,  55,   37,   -135, 47,   -135, -135, -135, 229,  97,   2758, -135, -135, -135, -135, 2633,
-    -135, -135, 168,  1891, -135, 165,  -135, 158,  118,  227,  92,   57,   -135, -10,  -24,  -135,
-    -14,  -135, 257,  -135, -135, -135, -135, -135, -135, -135, -135, -135, -135, -135, -135, 313,
-    -135, 840,  115,  124,  -135, -135, 172,  155,  778,  342,  -135, 189,  180,  -135, 783,  188,
-    627,  357,  167,  -135, 186,  -135, -135, -135, -135, 148,  601,  361,  203,  569,  329,  -135,
-    130,  1891, 217,  -135, 1891, 198,  -135, -135, 407,  -135, -135, 4872, 208,  -135, -135, -135,
-    536,  -135, 110,  3130, -135, 106,  -135, -135, -135, -135, 7092, 127,  126,  -135, 226,  119,
-    349,  218,  -135, 231,  -135, -135, -135, -135, 3130, -135, -135, 233,  -135, -135, -135, -135,
-    1891, 4996, -135, 525,  3877, 77,   232,  -135, -135, 71,   -135, -135, 1891, 697,  185,  2383,
-    -135, 409,  -135, -135, -135, 398,  -135, 405,  -135, 764,  259,  -135, -135, -135, -135, 2383,
-    -135, -135, -135, -135, 594,  12,   322,  270,  -135, -28,  -135, -135, 598,  276,  -135, -135,
+    408,  3303, 354,  23,   -142, 2646, 187,  34,   220,  -142, -142, -54,  -142, -142, 44,   2,
+    -34,  486,  -142, 244,  -142, -33,  438,  -142, 66,   -142, -142, -15,  -142, 1129, -142, 81,
+    36,   494,  -142, 340,  -142, -142, -142, -142, -142, 525,  332,  346,  -142, 879,  -142, 3041,
+    -142, -142, -142, -142, 836,  852,  -142, -142, 7199, 3964, 4750, 3041, 3041, -142, 2254, 3041,
+    -142, -142, -142, -142, -142, 3041, 3041, -142, -142, -142, -142, -142, -142, -142, -142, 3303,
+    -142, 3041, -142, 3041, 3041, 4619, -142, -142, 62,   -142, 3041, 3041, -142, -142, 266,  350,
+    -142, -142, 3041, -142, -142, -142, -142, 378,  -142, 4488, -142, 96,   -142, -142, 7475, 121,
+    -142, 387,  -142, -142, -142, 128,  -142, 159,  142,  143,  -142, -142, 209,  -142, -142, -142,
+    -142, 407,  -142, 415,  216,  -142, -142, -142, 1202, 212,  179,  543,  -142, 380,  -142, 1130,
+    1188, 188,  -142, 175,  166,  427,  152,  3172, -142, 150,  3172, 139,  -142, 140,  122,  4095,
+    -142, -142, 1268, 270,  -142, -142, -142, -142, 4357, -142, 68,   -142, 40,   -142, -142, 3041,
+    444,  3041, -142, -142, -142, -142, 693,  3041, -142, -142, -142, 3041, -142, -142, -142, 349,
+    3041, 3041, 3041, 246,  242,  221,  385,  3041, -48,  3041, 25,   3172, 3041, 12,   3172, -142,
+    -44,  3041, 31,   3041, -9,   -142, -142, 3172, -142, -142, -142, 7613, -142, -142, 24,   793,
+    -142, -142, 11,   -142, 1492, -142, 51,   42,   -142, 54,   7,    1156, 6647, 70,   2384, -142,
+    67,   462,  -142, 334,  2124, -142, -142, -142, -142, 57,   5543, 3172, 5681, -142, -142, -142,
+    -142, -142, -142, -142, -142, -142, -142, -142, -142, -142, -142, -142, -142, -142, -142, -142,
+    -142, -142, -142, -142, -142, -142, -142, -142, -142, -142, -142, -142, -142, -142, -142, -142,
+    -142, -142, -142, -142, -142, -142, -142, 327,  -142, -142, 3172, 312,  -142, 5543, 3172, -142,
+    272,  -142, 467,  101,  3434, 148,  131,  -142, 3172, 3830, -142, 3172, -142, -142, -142, -142,
+    2384, 149,  -142, -142, -142, -142, 3172, -142, -142, 1492, -142, -142, 162,  161,  -142, 170,
+    -142, -142, -142, 180,  -142, 190,  -142, -142, 210,  -142, 173,  206,  3172, -142, -142, -142,
+    6647, -142, -142, 1268, 215,  205,  -142, -142, 178,  -142, 176,  202,  -142, 201,  1604, -142,
+    -142, 200,  -142, 1604, -142, -142, -142, -142, -142, 3172, -142, -142, 3172, -142, -142, -142,
+    -142, -142, -142, -142, -142, -142, -142, -142, -142, 193,  -142, -142, 203,  -142, -142, -142,
+    7337, 172,  169,  3172, 227,  353,  -142, -142, 5012, 171,  165,  211,  1600, 1268, 155,  -142,
+    -142, 1103, 153,  3303, -142, 3172, 144,  154,  3172, 141,  -142, -142, 3172, -142, -142, 234,
+    -142, -142, 3303, 3172, 3303, -142, 252,  -142, -142, -142, 147,  145,  130,  -142, 383,  -142,
+    1156, 134,  117,  -142, 115,  -142, -142, 3303, -142, -142, -142, 3172, 86,   3172, 75,   -142,
+    -142, 107,  93,   -142, 100,  370,  -142, -142, 1001, 91,   84,   -142, 83,   3172, 19,   3172,
+    17,   -142, -142, -142, -142, -142, 20,   -142, -142, 276,  -142, 932,  -142, -142, 1268, -142,
+    750,  -142, -142, 35,   1492, -142, 6,    33,   -142, -142, 3,    -142, -142, 50,   182,  38,
+    -142, 37,   1380, -142, -58,  10,   1734, 6923, -142, -16,  -142, 6923, -142, 1,    6647, -142,
+    6647, 6647, 6785, -142, -142, -142, 1492, -142, -40,  13,   -17,  -142, -42,  -142, -21,  -49,
+    0,    -29,  -142, -56,  -142, 48,   1380, -142, -142, -60,  -4,   -30,  -142, -51,  -142, -28,
+    1327, -52,  4,    -22,  -142, -43,  -142, -142, -142, 3172, 207,  -142, 5,    -142, -142, 191,
+    -142, 3172, 230,  -5,   -142, 26,   -142, 27,   231,  3172, -142, 32,   29,   -142, -18,  -142,
+    -142, -142, 251,  -142, -142, 339,  -142, 264,  30,   -142, 16,   18,   -142, 1268, -142, -142,
+    -1,   22,   -142, -142, 3172, 260,  -142, -142, 3172, 320,  -142, -142, -142, 3172, -142, 59,
+    56,   63,   -142, 58,   -142, -142, 1268, -142, -142, -142, 7475, -142, 3041, 575,  3041, 521,
+    3041, 329,  3041, 9,    3041, 90,   5543, 3172, 3434, 6509, -142, -142, 328,  -142, 41,   -142,
+    -142, 3172, 3434, 307,  -142, 47,   -142, 3172, 3041, 105,  3303, -142, 72,   3041, 116,  3041,
+    76,   3434, 6371, 74,   -142, 3434, 78,   -142, 3434, 80,   -142, 46,   88,   92,   6923, 89,
+    -142, 6923, 95,   -142, -142, -142, 98,   1460, 1604, 102,  132,  111,  -142, 106,  -142, 108,
+    137,  114,  -142, 119,  -142, 120,  1604, 1604, 123,  124,  -142, 125,  -142, 126,  127,  -142,
+    129,  -142, -142, 397,  -142, -142, 240,  257,  -142, -142, 7061, -142, -142, -142, 3172, -142,
+    -142, 232,  3699, 217,  160,  -142, 4881, -142, -142, 3303, -142, -142, -142, -142, -142, 163,
+    229,  -142, -142, 3565, -142, 167,  -142, -142, -142, 491,  -142, -142, -142, -142, 399,  3303,
+    -142, -142, 355,  -142, -142, -142, -142, -142, 3303, -142, 3041, -142, 183,  181,  -142, -142,
+    -142, -142, 359,  -142, 589,  1436, -142, -142, -142, -142, 156,  -142, 6233, 156,  -142, -142,
+    151,  -142, -142, 4226, -142, 372,  -142, -142, 905,  -142, -142, 1044, -142, -142, -142, 949,
+    1284, 118,  136,  104,  -142, 94,   -142, 1300, 61,   79,   -142, -57,  -142, 77,   6923, 60,
+    -142, -142, 315,  -11,  -142, 5819, -142, -142, -142, 5543, -142, -142, -142, -14,  -142, 82,
+    -142, -142, -142, 6095, -37,  -142, 311,  -142, -142, -53,  -142, -142, 451,  -142, 932,  -142,
+    5957, -142, -142, -142, 767,  -142, -142, -142, 43,   -142, 435,  426,  417,  724,  -142, -142,
+    -2,   -3,   -142, -6,   196,  184,  343,  448,  580,  -12,  -142, -142, 2646, -142, -142, -142,
+    -142, -142, -142, -142, 402,  394,  -142, -142, -142, -142, -142, -142, -142, -142, 28,   1492,
+    8,    69,   52,   -142, 39,   -142, -142, -142, 333,  64,   2778, -142, -142, -142, -142, 2910,
+    -142, -142, 97,   1864, -142, 71,   -142, 73,   85,   299,  110,  99,   -142, 138,  238,  135,
+    -142, -142, 237,  146,  -142, -142, 213,  -142, -142, -142, -142, -142, -142, -142, -142, -142,
+    -142, -142, -142, 316,  -142, 2514, 204,  198,  197,  195,  194,  192,  189,  185,  317,  177,
+    174,  168,  601,  164,  157,  2384, -142, -142, 2514, 158,  666,  2384, -142, -142, 218,  -142,
+    -142, -142, 133,  -142, -142, 820,  363,  -142, 283,  103,  681,  -142, 377,  -142, -142, 5405,
+    241,  -142, -142, -142, -142, 87,   3172, 3964, -142, -142, -142, -142, -142, 7751, 113,  112,
+    -142, 285,  109,  341,  255,  -142, 262,  -142, -142, -142, -142, 3172, -142, -142, 572,  308,
+    -142, 1864, 268,  -142, -142, -142, -142, 367,  -142, -142, 5143, 274,  65,   280,  -142, -142,
+    -142, 1864, 5274, -142, 551,  3964, 55,   338,  -142, -142, 53,   -142, -142, 1864, 932,  235,
+    1994, -142, 436,  -142, -142, -142, 437,  -142, 357,  -142, 698,  247,  -142, -142, -142, -142,
+    1994, -142, -142, -142, -142, 594,  15,   375,  208,  -142, -25,  -142, -142, 586,  186,  -142,
+    -142,
 
-    -240, 214,  166,  169,  183,  775,  -240, -240, -240, -240, -240, -240, -240, -240, -240, -240,
-    -240, -56,  -240, -240, -240, -240, -98,  -240, -240, -240, -240, -240, -240, -240, -240, -240,
-    -240, -48,  -240, -240, -240, -240, -240, -240, -240, -94,  -240, -240, -240, 151,  -240, 664,
-    -240, -240, -240, -240, 155,  157,  -240, -240, 298,  140,  148,  602,  586,  -240, 547,  556,
-    -240, -240, -240, -240, -240, 545,  607,  -240, -240, -240, -240, -240, -240, -240, -240, 467,
-    -240, 623,  -240, 633,  670,  446,  -240, -240, -240, -240, 482,  472,  -240, -240, -240, -240,
-    -240, -240, 465,  -240, -240, -240, -240, -240, -240, 423,  -240, -240, -154, -240, -13,  -240,
-    -240, 220,  -240, -240, -240, -240, -240, -240, -240, -240, -240, -240, -240, -240, -240, -240,
-    -240, -240, -240, -240, -240, -240, -240, -240, -92,  -240, -240, -240, -240, -240, -240, 243,
-    248,  39,   262,  -240, -240, 210,  -240, -21,  -240, -240, -15,  24,   -240, -240, -240, -12,
-    -240, -240, 341,  57,   -240, -240, -240, -124, 8,    -240, -106, -101, -97,  -240, -240, 377,
-    -240, 502,  -240, -240, -240, -240, -240, 496,  -240, -240, -240, 452,  -240, -240, -240, -240,
-    445,  435,  356,  -240, -240, -240, -240, 352,  -240, 355,  -240, 48,   375,  -240, 52,   -240,
-    -240, 333,  -240, 372,  -240, -240, -240, 53,   -240, -240, 287,  77,   -240, -240, 121,  223,
-    -240, -240, -240, -240, 325,  -240, -240, 44,   -240, -240, -240, 335,  331,  65,   585,  -240,
-    54,   74,   -240, 391,  -240, -240, -240, 199,  73,   196,  -240, -240, -240, -240, -240, -240,
-    -240, -240, -240, -240, -240, -240, -240, -240, -240, -240, -240, -240, -240, -240, -240, -240,
-    -240, -240, -240, -240, -240, -240, -240, -240, -240, -240, -240, -240, -240, -240, -240, -240,
-    -240, -240, -240, -240, -240, -240, -240, 80,   -240, -240, 192,  82,   -240, -240, -240, 83,
-    -240, 71,   -240, -240, -240, 84,   86,   -240, 87,   -240, -240, -240, -240, 771,  -240, -240,
-    747,  -240, -240, -240, -240, 88,   -240, -240, 474,  -240, -240, 101,  -26,  -28,  -25,  -240,
-    -240, -240, 91,   -240, -240, -240, -240, -240, -240, -240, -240, 96,   -240, -240, -240, 537,
-    -240, -240, 303,  100,  104,  -240, -240, -240, -240, -240, -240, -240, -240, 692,  -240, -240,
-    130,  -240, 642,  -240, -240, -240, -240, -240, 105,  -240, -240, 112,  -240, -240, -240, -240,
-    -240, -240, -240, -240, -240, -240, -240, -240, 158,  -240, -240, 164,  -240, -240, -240, 119,
-    -240, -240, 120,  -240, 168,  -240, -240, 703,  -240, -240, -240, 4,    280,  -240, -240, -240,
-    282,  -240, 471,  -240, 125,  -240, -240, 126,  -240, 197,  -240, 118,  -240, -240, -240, 182,
-    -240, 484,  109,  485,  -240, -240, 205,  -240, -240, 110,  -240, 102,  -240, -240, -240, 299,
-    108,  92,   -240, 94,   -240, -240, 466,  -240, -240, -240, 131,  -240, 159,  -240, 230,  -240,
-    99,   66,   -240, -240, -240, -240, -240, 412,  97,   64,   -240, -240, 171,  -240, 172,  -240,
-    249,  -240, -240, -240, -9,   -240, -240, -240, 136,  -240, 194,  -240, -240, 365,  -240, 209,
-    -240, -240, -58,  327,  -240, -240, -57,  -240, -240, -240, -240, -240, 81,   -240, 56,   -240,
-    -240, 343,  -240, -72,  -240, 301,  79,   -240, -240, -240, 226,  240,  -240, -240, 242,  -240,
-    245,  257,  -240, -240, -240, -240, -240, 250,  -240, -240, 63,   -70,  -73,  -75,  -240, -240,
-    -240, 55,   -79,  -77,  -80,  -240, -240, 285,  -240, -240, -240, 51,   -82,  -91,  -89,  -240,
-    -105, 309,  -240, 41,   -99,  -111, -113, -240, -240, 20,   -240, 284,  -240, 276,  -240, 76,
-    -240, 12,   -240, -240, -240, -240, -240, -103, -240, 9,    -240, -104, -240, -240, -240, -240,
-    -78,  -240, -240, -81,  -240, 61,   -240, -240, -120, -240, -240, 42,   -240, 337,  -240, -240,
-    -240, 40,   -240, -240, -6,   -240, 513,  -240, -10,  -240, 273,  -240, -240, -14,  -240, 0,
-    -27,  -240, -240, -42,  -240, -240, 350,  -240, -240, -240, -2,   -240, 639,  -65,  653,  -66,
-    373,  -240, 674,  -240, 675,  -240, 184,  -30,  160,  180,  -240, -240, -240, -240, -240, -240,
-    -240, -34,  156,  -240, -240, -240, -240, -41,  647,  -240, 494,  -240, -240, 548,  -240, 565,
-    -240, 149,  163,  -240, -240, 139,  -240, -240, 138,  -240, -240, -180, -182, -184, 145,  -191,
-    -240, 135,  -194, -240, -240, -240, -240, 293,  291,  -240, -50,  -183, -185, -187, -240, -240,
-    -55,  -188, -190, -192, -240, -200, 265,  263,  -240, -197, -207, -175, -240, -240, -196, -204,
-    -203, -240, -240, -83,  -240, -240, -240, -240, -240, -240, 411,  -240, -240, -240, -64,  -240,
-    -240, -240, -60,  -240, -54,  -240, 127,  -240, -240, 481,  -240, -240, -240, -240, -240, -240,
-    -240, -240, -240, 290,  -240, -240, -240, -240, -240, -29,  -240, -240, -240, -240, -240, 421,
-    -240, -240, -46,  -240, -240, -240, -240, -240, 330,  -240, 346,  -240, 49,   275,  -240, -240,
-    -240, -240, 278,  -240, 323,  339,  -240, -240, -240, -240, -240, -240, 211,  -145, -240, -240,
-    -143, -240, -240, 5,    -240, 483,  -240, -240, 221,  -240, -240, 277,  -240, -240, -240, 312,
-    259,  -240, 43,   -96,  -95,  -90,  -240, 305,  -240, -86,  -93,  -102, -240, -88,  232,  -87,
-    -240, -240, -240, -240, -240, 267,  -240, -240, -240, 239,  -240, -240, -240, -85,  -240, -240,
-    -240, -240, -240, 289,  -240, -240, 67,   -240, -240, -240, -240, -240, -240, -240, 317,  -240,
-    358,  -240, -240, -240, 314,  -240, -240, -240, 218,  -240, 106,  107,  111,  185,  -240, -240,
-    -240, -240, -240, -240, 178,  173,  -240, -240, -240, -240, -240, -240, 867,  -240, -240, -240,
-    -240, -240, -240, -240, -240, -240, -240, -240, -240, -240, -240, -240, -240, -240, -240, 295,
-    -240, 122,  7,    -17,  -19,  -240, -240, -240, 153,  -240, 798,  -240, -240, -240, -240, 810,
-    -240, -240, -240, 663,  -240, -240, -240, -240, -240, -240, -240, -240, -240, -240, -240, -240,
-    -240, -240, 146,  -240, -240, -240, -240, -240, -240, -240, -240, -240, -240, -240, -240, 128,
-    -240, 253,  -240, -240, -240, -240, -240, -240, 117,  93,   -240, -240, -240, -240, 279,  -240,
-    113,  89,   -240, -240, 116,  -240, -240, -240, -240, -240, 103,  75,   -240, 95,   98,   -240,
-    -240, 711,  -240, -240, 625,  90,   -240, -240, 85,   -240, 62,   849,  78,   -240, -240, -240,
-    3,    -240, 38,   37,   -240, 45,   -240, -240, 234,  -240, -1,   -240, -240, -240, -240, -240,
-    -35,  36,   -240, 35,   -240, -240, -240, -240, -38,  -240, -240, 27,   -240, -240, -240, 198,
-    728,  822,  -240, -37,  915,  16,   -240, -240, -240, 15,   -240, -240, 512,  23,   216,  780,
-    -240, 21,   -240, -240, -240, -40,  -240, 19,   -240, 18,   14,   -240, -240, -240, -240, 768,
-    -240, -240, -240, -240, 1,    -240, 2,    -3,   -240, -240, -240, -240, -16,  50,   -240, -240};
+    -239, 204,  163,  168,  199,  745,  -239, -239, -239, -239, -239, -239, -239, -239, -239, -239,
+    -239, -64,  -239, -239, -239, -239, -99,  -239, -239, -239, -239, -239, -239, -239, -239, -239,
+    -239, -50,  -239, -239, -239, -239, -239, -239, -239, -92,  -239, -239, -239, 144,  -239, 683,
+    -239, -239, -239, -239, 147,  149,  -239, -239, 263,  131,  142,  622,  609,  -239, 621,  757,
+    -239, -239, -239, -239, -239, 569,  540,  -239, -239, -239, -239, -239, -239, -239, -239, 492,
+    -239, 533,  -239, 543,  559,  470,  -239, -239, -239, -239, 469,  463,  -239, -239, -239, -239,
+    -239, -239, 447,  -239, -239, -239, -239, -239, -239, 326,  -239, -239, -150, -239, -10,  -239,
+    -239, 209,  -239, -239, -239, -239, -239, -239, -239, -239, -239, -239, -239, -239, -239, -239,
+    -239, -239, -239, 40,   -239, -239, -239, -239, -85,  -239, -239, -239, -239, -239, -239, 233,
+    235,  43,   259,  -239, -239, 218,  -239, -17,  -239, -239, -13,  38,   -239, -239, -239, -5,
+    -239, -239, 335,  57,   -239, -239, -239, -126, -2,   -239, -114, -113, -106, -239, -239, 350,
+    -239, 374,  -239, -239, -239, -239, -239, 417,  -239, -239, -239, 432,  -239, -239, -239, -239,
+    452,  476,  387,  -239, -239, -239, -239, 381,  -239, 356,  -239, 37,   337,  -239, 45,   -239,
+    -239, 343,  -239, 344,  -239, -239, -239, 50,   -239, -239, 296,  73,   -239, -239, 151,  227,
+    -239, -239, -239, -239, 325,  -239, -239, 41,   -239, -239, -239, 333,  318,  60,   694,  -239,
+    42,   64,   -239, -239, 354,  -239, -239, -239, -239, -239, 212,  66,   208,  -239, -239, -239,
+    -239, -239, -239, -239, -239, -239, -239, -239, -239, -239, -239, -239, -239, -239, -239, -239,
+    -239, -239, -239, -239, -239, -239, -239, -239, -239, -239, -239, -239, -239, -239, -239, -239,
+    -239, -239, -239, -239, -239, -239, -239, -239, -239, -239, 71,   -239, -239, 205,  74,   -239,
+    -239, -239, 75,   -239, 79,   -239, -239, -239, 80,   81,   -239, 82,   -239, -239, -239, -239,
+    979,  -239, -239, -239, -239, -239, 83,   -239, -239, 382,  -239, -239, 91,   -39,  -33,  -32,
+    -239, -239, -239, 72,   -239, -239, -239, -239, -239, -239, -239, -239, 88,   -239, -239, -239,
+    511,  -239, -239, 299,  89,   92,   -239, -239, -239, -239, -239, -239, -239, -239, 506,  -239,
+    -239, 138,  -239, 638,  -239, -239, -239, -239, -239, 98,   -239, -239, 101,  -239, -239, -239,
+    -239, -239, -239, -239, -239, -239, -239, -239, -239, 164,  -239, -239, 166,  -239, -239, -239,
+    124,  -239, -239, 114,  -239, 173,  -239, -239, 644,  -239, -239, -239, 9,    290,  -239, -239,
+    -239, 256,  -239, 444,  -239, 122,  -239, -239, 121,  -239, 203,  -239, 116,  -239, -239, -239,
+    206,  -239, 366,  110,  455,  -239, -239, 213,  -239, -239, 111,  -239, 100,  -239, -239, -239,
+    297,  108,  99,   -239, 97,   -239, -239, 478,  -239, -239, -239, 145,  -239, 150,  -239, 222,
+    -239, 105,  84,   -239, -239, -239, -239, -239, 443,  103,  69,   -239, -239, 153,  -239, 156,
+    -239, 234,  -239, -239, -239, -1,   -239, -239, -239, 143,  -239, 184,  -239, -239, 377,  -239,
+    190,  -239, -239, -51,  306,  -239, -239, -42,  -239, -239, -239, -239, -239, 87,   -239, 62,
+    -239, -239, 359,  -239, -57,  -239, 308,  85,   -239, -239, -239, 211,  -239, -239, 217,  -239,
+    219,  220,  230,  -239, -239, -239, 240,  -239, -239, 65,   -62,  -65,  -67,  -239, -239, -239,
+    59,   -69,  -73,  -72,  -239, -239, 253,  -239, -239, -239, 54,   -75,  -83,  -82,  -239, -89,
+    276,  -239, 49,   -84,  -94,  -96,  -239, -239, -239, 34,   -239, 292,  -239, 282,  -239, 86,
+    -239, 29,   -239, -239, -239, -239, -239, -87,  -239, 28,   -239, -88,  -239, -239, -239, -239,
+    -63,  -239, -239, -68,  -239, 76,   -239, -239, -107, -239, -239, 48,   -239, 327,  -239, -239,
+    -239, 44,   -239, -239, 6,    -239, 278,  -239, 1,    -239, 273,  -239, -239, -6,   -239, 5,
+    -16,  -239, -239, -31,  -239, -239, 341,  -239, -239, -239, 3,    -239, 551,  -59,  630,  -58,
+    339,  -239, 673,  -239, 674,  -239, 181,  -24,  167,  172,  -239, -239, -239, -239, -239, -239,
+    -239, -30,  155,  -239, -239, -239, -239, -38,  645,  -239, 472,  -239, -239, 579,  -239, 513,
+    -239, 146,  161,  -239, -239, 139,  -239, -239, 135,  -239, -239, -175, -177, -182, 154,  -185,
+    -239, 141,  -188, -239, -239, -239, -239, 281,  274,  -239, -44,  -179, -178, -180, -239, -239,
+    -48,  -181, -183, -186, -239, -193, 303,  301,  -239, -191, -201, -203, -239, -239, -195, -205,
+    -207, -239, -239, -90,  -239, -239, -239, -239, -239, -239, 396,  -239, -239, -239, -78,  -239,
+    -239, -239, -74,  -239, -70,  -239, 120,  -239, -239, 338,  -239, -239, -239, -239, -239, -239,
+    -239, -239, -239, 267,  -239, -239, -239, -239, -239, -43,  -239, -239, -239, -239, -239, 428,
+    -239, -239, -61,  -239, -239, -239, -239, -239, 442,  -239, 437,  -239, 35,   36,   -239, -239,
+    -239, -239, 239,  -239, 369,  316,  -239, -239, -239, -239, -239, -239, 221,  -159, -239, -239,
+    -157, -239, -239, -9,   -239, 519,  -239, -239, 223,  -239, -239, 329,  -239, -239, -239, 323,
+    320,  -239, 23,   -110, -109, -108, -239, 314,  -239, -103, -111, -105, -239, -115, 225,  -112,
+    -239, -239, -239, -239, -239, 244,  -239, -239, -239, 238,  -239, -239, -239, -104, -239, -239,
+    -239, -239, -239, 279,  -239, -239, 102,  -239, -239, -239, -239, -239, -239, -239, 288,  -239,
+    424,  -239, -239, -239, 331,  -239, -239, -239, 237,  -239, 94,   95,   96,   200,  -239, -239,
+    -239, -239, -239, -239, 196,  193,  -239, -239, -239, -239, -239, -239, 858,  -239, -239, -239,
+    -239, -239, -239, -239, -239, -239, -239, -239, -239, -239, -239, -239, -239, -239, -239, 295,
+    -239, 109,  -22,  -21,  -15,  -239, -239, -239, 160,  -239, 782,  -239, -239, -239, -239, 834,
+    -239, -239, -239, 664,  -239, -239, -239, -239, -239, -239, -239, -239, -239, -239, -239, -239,
+    -239, -239, -239, -239, -239, -239, 158,  -239, -239, -239, -239, -239, -239, -239, -239, -239,
+    -239, -239, -239, 358,  -239, 815,  -239, -239, -239, -239, -239, -239, -239, -239, -239, -239,
+    -239, -239, 118,  -239, -239, 774,  -239, -239, 835,  -239, 117,  755,  -239, -239, 115,  -239,
+    -239, -239, -239, -239, -239, 104,  78,   -239, -239, -239, 90,   -239, 93,   -239, 77,   787,
+    -239, -239, -239, -239, -239, 70,   63,   580,  -239, -239, -239, 246,  -239, 20,   -239, -239,
+    -239, -239, -239, -19,  51,   -239, 47,   -239, -239, -239, -239, -23,  -239, -239, -18,  -239,
+    -239, 711,  39,   -239, -239, -239, -239, 33,   -239, 207,  889,  -7,   21,   27,   -239, -239,
+    197,  682,  862,  -239, -34,  660,  19,   -239, -239, -239, 15,   -239, -239, 563,  24,   214,
+    754,  -239, 22,   -239, -239, -239, -41,  -239, 18,   -239, 17,   13,   -239, -239, -239, -239,
+    738,  -239, -239, -239, -239, 4,    -239, 0,    -3,   -239, -239, -239, -239, -11,  134,  -239,
+    -239};
 
 const short QmlJSGrammar::action_info[] = {
-    174,  545,  238,  109,  109,  174,  238,  942,  551,  538,  911,  555,  238,  109,  -124, 174,
-    913,  500,  -570, 563,  238,  109,  1082, 507,  943,  519,  535,  1081, 109,  825,  573,  507,
-    532,  1087, 945,  532,  581,  585,  174,  585,  519,  484,  104,  585,  517,  591,  592,  325,
-    325,  109,  513,  238,  238,  507,  109,  818,  603,  484,  605,  502,  642,  500,  238,  609,
-    569,  644,  201,  317,  841,  484,  480,  109,  478,  486,  174,  238,  316,  407,  544,  959,
-    -531, 325,  630,  454,  325,  238,  454,  941,  935,  471,  418,  175,  454,  930,  -130, 209,
-    310,  671,  206,  109,  918,  -572, 644,  669,  174,  922,  238,  211,  209,  944,  462,  922,
-    314,  454,  655,  211,  460,  800,  666,  325,  454,  662,  969,  802,  669,  671,  1032, 924,
-    642,  800,  517,  -105, 238,  -191, -193, 676,  199,  325,  679,  447,  922,  519,  682,  519,
-    1016, 616,  532,  238,  938,  696,  532,  778,  238,  612,  238,  109,  698,  174,  238,  500,
-    704,  174,  109,  484,  366,  993,  201,  109,  109,  325,  215,  174,  109,  225,  351,  931,
-    636,  862,  228,  713,  974,  354,  972,  109,  418,  238,  987,  325,  325,  507,  325,  199,
-    936,  800,  507,  977,  577,  425,  718,  922,  402,  353,  423,  328,  972,  374,  476,  368,
-    854,  458,  973,  174,  175,  755,  215,  740,  420,  980,  972,  428,  -195, 0,    360,  754,
-    851,  996,  734,  218,  989,  730,  864,  758,  215,  215,  1024, 939,  320,  367,  215,  203,
-    996,  401,  215,  331,  921,  216,  214,  216,  214,  216,  214,  750,  96,   321,  215,  852,
-    535,  216,  214,  216,  214,  216,  214,  922,  97,   741,  663,  756,  404,  298,  837,  216,
-    214,  167,  868,  997,  695,  500,  731,  865,  204,  216,  214,  1025, 940,  215,  431,  438,
-    660,  299,  1047, 215,  653,  745,  216,  214,  216,  214,  216,  214,  1052, 1053, 215,  602,
-    215,  429,  90,   664,  618,  215,  366,  216,  214,  216,  214,  588,  -130, 603,  91,   838,
-    216,  214,  216,  214,  215,  90,   90,   1052, 1053, 90,   -195, 216,  214,  216,  214,  302,
-    992,  91,   91,   216,  214,  91,   216,  214,  215,  614,  192,  192,  193,  193,  961,  192,
-    297,  193,  293,  1039, 44,   44,   -80,  194,  194,  298,  589,  579,  194,  496,  225,  192,
-    -574, 193,  985,  418,  970,  418,  406,  -238, 216,  214,  571,  -575, 194,  299,  922,  680,
-    454,  216,  214,  970,  99,   215,  -414, 970,  216,  214,  -195, -414, 192,  1026, 193,  216,
-    214,  -239, 0,    0,    325,  -75,  1027, -80,  99,   194,  325,  99,   1065, 247,  1002, 0,
-    0,    0,    1028, 965,  -80,  965,  882,  247,  -195, 0,    882,  882,  0,    0,    -238, 0,
-    964,  248,  964,  100,  965,  595,  215,  1084, 965,  101,  -414, 248,  216,  214,  815,  496,
-    225,  964,  0,    0,    0,    964,  0,    100,  -239, 0,    100,  1077, 0,    101,  0,    0,
-    101,  -75,  0,    -75,  216,  214,  216,  214,  216,  214,  788,  767,  768,  767,  768,  1040,
-    0,    0,    904,  789,  905,  788,  904,  904,  905,  905,  185,  186,  0,    0,    789,  646,
-    249,  0,    0,    188,  0,    247,  189,  -75,  190,  0,    249,  0,    64,   79,   0,    0,
-    247,  414,  415,  647,  0,    648,  64,   79,   906,  248,  247,  673,  906,  906,  1076, 0,
-    495,  185,  186,  0,    248,  0,    305,  0,    0,    0,    188,  0,    247,  189,  248,  190,
-    305,  6,    5,    4,    1,    3,    2,    247,  -74,  0,    0,    185,  186,  0,    0,    -98,
-    248,  0,    673,  187,  188,  178,  179,  189,  0,    190,  -98,  248,  950,  673,  795,  0,
-    0,    0,    649,  0,    0,    0,    0,    184,  674,  0,    496,  225,  0,    0,    64,   79,
-    0,    180,  181,  249,  64,   79,   796,  950,  0,    0,    0,    0,    0,    249,  0,    64,
-    79,   0,    0,    0,    -74,  957,  -74,  0,    972,  64,   79,   0,    0,    0,    184,  674,
-    950,  0,    0,    0,    950,  797,  0,    950,  0,    0,    674,  64,   79,   0,    0,    953,
-    957,  954,  972,  156,  0,    0,    64,   79,   184,  948,  -74,  947,  414,  415,  0,    0,
-    0,    950,  0,    0,    951,  949,  956,  0,    953,  957,  954,  495,  953,  957,  954,  953,
-    957,  954,  0,    0,    948,  955,  947,  0,    0,    0,    185,  186,  0,    0,    0,    951,
-    949,  956,  187,  188,  0,    0,    189,  0,    190,  953,  957,  954,  952,  948,  955,  947,
-    0,    948,  955,  947,  948,  955,  947,  55,   951,  949,  956,  0,    951,  949,  956,  951,
-    949,  956,  0,    0,    0,    952,  0,    55,   0,    952,  0,    0,    952,  0,    948,  955,
-    947,  0,    0,    0,    0,    0,    0,    55,   0,    951,  949,  956,  0,    0,    0,    71,
-    75,   72,   0,    0,    0,    0,    952,  0,    0,    0,    0,    0,    0,    0,    0,    71,
-    75,   72,   0,    0,    0,    0,    0,    184,  0,    0,    0,    0,    0,    0,    0,    71,
-    75,   72,   76,   0,    51,   73,   46,   0,    0,    972,  55,   0,    0,    0,    44,   67,
-    54,   74,   76,   0,    51,   73,   46,   0,    950,  0,    0,    0,    68,   963,  44,   67,
-    54,   74,   76,   0,    51,   73,   46,   0,    0,    0,    0,    0,    68,   0,    44,   67,
-    54,   74,   71,   75,   72,   0,    0,    0,    0,    0,    0,    0,    68,   0,    0,    0,
-    953,  957,  954,  0,    0,    953,  957,  954,  0,    0,    0,    0,    0,    0,    965,  0,
-    0,    0,    0,    0,    0,    76,   963,  51,   73,   46,   0,    964,  0,    0,    0,    0,
-    0,    44,   67,   54,   74,   948,  955,  947,  55,   0,    948,  955,  947,  0,    0,    68,
-    951,  949,  956,  0,    0,    951,  949,  956,  0,    0,    0,    0,    0,    952,  953,  957,
-    954,  55,   952,  0,    0,    0,    0,    965,  0,    0,    0,    0,    0,    0,    0,    0,
-    71,   75,   72,   0,    964,  0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-    55,   0,    0,    948,  955,  947,  0,    695,  0,    71,   75,   72,   0,    0,    951,  949,
-    956,  0,    0,    76,   0,    51,   73,   46,   0,    0,    0,    952,  0,    0,    0,    44,
-    67,   54,   74,   0,    0,    0,    0,    0,    71,   75,   72,   55,   76,   68,   51,   73,
-    46,   0,    500,  0,    0,    0,    0,    0,    44,   67,   54,   74,   0,    0,    0,    0,
-    0,    0,    0,    0,    55,   0,    68,   0,    236,  237,  55,   76,   0,    51,   73,   46,
-    0,    0,    0,    71,   75,   72,   0,    44,   67,   54,   74,   0,    0,    0,    0,    55,
-    0,    0,    0,    0,    0,    68,   500,  0,    0,    0,    0,    0,    71,   75,   72,   0,
-    0,    0,    71,   75,   72,   0,    76,   0,    51,   73,   46,   0,    0,    0,    0,    0,
-    0,    0,    44,   67,   54,   74,   0,    71,   75,   72,   0,    0,    0,    0,    0,    76,
-    68,   51,   73,   46,   517,  76,   0,    51,   73,   46,   0,    44,   67,   54,   74,   0,
-    0,    44,   67,   54,   74,   0,    377,  0,    0,    68,   76,   0,    51,   73,   46,   68,
-    378,  0,    0,    55,   435,  0,    44,   67,   54,   74,   816,  0,    0,    0,    380,  0,
-    381,  0,    0,    0,    68,   0,    377,  0,    0,    0,    0,    382,  0,    383,  96,   0,
-    378,  0,    0,    0,    379,  0,    384,  0,    0,    385,  97,   71,   75,   72,   380,  386,
-    381,  0,    0,    0,    0,    0,    388,  387,  0,    0,    0,    382,  0,    383,  96,   0,
-    0,    55,   0,    0,    0,    0,    384,  389,  0,    385,  97,   0,    0,    0,    76,   386,
-    51,   73,   46,   55,   0,    0,    388,  387,  0,    0,    44,   67,   54,   74,   0,    0,
-    0,    0,    216,  214,  0,    0,    0,    389,  68,   71,   75,   72,   55,   0,    0,    0,
-    236,  237,  0,    0,    216,  214,  0,    0,    0,    0,    0,    71,   75,   72,   0,    0,
-    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    76,   0,    51,   73,
-    46,   0,    0,    0,    71,   75,   72,   0,    44,   67,   54,   74,   0,    0,    76,   55,
-    51,   73,   46,   236,  237,  0,    68,   0,    0,    0,    44,   67,   54,   74,   0,    0,
-    0,    0,    0,    0,    0,    0,    0,    76,   68,   51,   73,   46,   0,    0,    0,    0,
-    0,    0,    0,    44,   67,   54,   74,   71,   75,   72,   0,    0,    0,    0,    0,    0,
-    0,    68,   0,    0,    0,    55,   0,    0,    0,    236,  237,  0,    0,    0,    0,    0,
-    0,    0,    0,    0,    0,    235,  0,    0,    0,    0,    76,   0,    51,   73,   46,   0,
-    0,    0,    0,    0,    0,    0,    44,   67,   54,   74,   0,    0,    0,    71,   75,   72,
-    0,    0,    0,    0,    68,   0,    0,    0,    55,   0,    0,    0,    236,  237,  0,    0,
+    508,  174,  554,  238,  109,  109,  174,  238,  209,  501,  562,  238,  109,  544,  508,  174,
+    543,  109,  963,  206,  238,  573,  537,  -573, 935,  1099, 175,  930,  918,  581,  1098, 585,
+    585,  211,  1104, 201,  592,  585,  534,  591,  199,  532,  104,  -575, 520,  636,  518,  225,
+    228,  644,  603,  642,  485,  605,  326,  326,  485,  238,  238,  326,  508,  609,  329,  -535,
+    862,  911,  238,  109,  503,  332,  913,  630,  501,  326,  419,  326,  238,  487,  367,  481,
+    868,  -133, 479,  671,  326,  550,  109,  922,  669,  922,  854,  636,  644,  800,  924,  320,
+    174,  174,  238,  922,  455,  455,  109,  655,  931,  922,  841,  936,  472,  662,  455,  520,
+    666,  109,  238,  938,  1035, 532,  671,  -195, -197, 1019, 520,  825,  669,  642,  520,  946,
+    778,  941,  109,  319,  455,  1003, 455,  696,  676,  463,  109,  238,  679,  238,  682,  238,
+    238,  109,  532,  326,  109,  461,  518,  174,  532,  448,  238,  942,  313,  501,  109,  616,
+    175,  109,  215,  174,  698,  987,  0,    0,    367,  238,  704,  998,  984,  485,  323,  -110,
+    174,  612,  174,  419,  818,  -114, 508,  945,  -117, 713,  508,  577,  718,  569,  514,  199,
+    -109, 317,  949,  109,  -112, 326,  352,  -116, 485,  -108, -113, 426,  -115, -118, 403,  424,
+    367,  375,  369,  981,  408,  355,  211,  215,  477,  -199, 459,  990,  802,  501,  326,  218,
+    167,  754,  201,  174,  421,  758,  354,  209,  326,  695,  368,  215,  361,  755,  215,  0,
+    740,  588,  215,  429,  216,  214,  216,  214,  730,  216,  214,  216,  214,  402,  216,  214,
+    216,  214,  595,  215,  215,  90,   90,   800,  734,  203,  216,  214,  215,  571,  602,  216,
+    214,  91,   91,   750,  216,  214,  947,  943,  215,  216,  214,  90,   603,  948,  944,  90,
+    589,  405,  741,  756,  579,  1027, 534,  91,   432,  731,  1001, 91,   663,  44,   1069, 1070,
+    216,  214,  204,  939,  1002, 96,   216,  214,  -133, 44,   439,  215,  1041, 745,  216,  214,
+    215,  97,   614,  837,  -111, 216,  214,  -199, 215,  430,  305,  216,  214,  216,  214,  215,
+    215,  216,  214,  216,  214,  664,  1028, 216,  214,  851,  1041, 215,  921,  301,  1069, 1070,
+    99,   965,  -578, 192,  940,  193,  192,  -577, 193,  301,  99,   419,  1082, 660,  1042, 922,
+    194,  302,  300,  194,  838,  -80,  1049, 192,  852,  193,  -242, 216,  214,  302,  618,  680,
+    1006, 296,  653,  455,  194,  1029, 99,   -243, -418, 999,  497,  225,  1064, -418, 1030, 100,
+    326,  1056, 216,  214,  -199, 101,  192,  419,  193,  100,  1031, 192,  0,    193,  326,  101,
+    216,  214,  0,    194,  216,  214,  -80,  215,  194,  178,  179,  882,  922,  0,    216,  214,
+    994,  -242, -199, -80,  882,  100,  216,  214,  216,  214,  996,  101,  -418, 882,  -243, 0,
+    407,  497,  225,  0,    250,  180,  181,  995,  178,  179,  -75,  864,  788,  0,    178,  179,
+    0,    788,  0,    767,  768,  789,  0,    0,    251,  0,    789,  815,  0,    250,  216,  214,
+    0,    996,  250,  0,    180,  181,  1094, 904,  0,    905,  180,  181,  1101, 0,    995,  0,
+    904,  251,  905,  216,  214,  646,  251,  0,    308,  904,  250,  905,  865,  250,  0,    767,
+    768,  0,    0,    415,  416,  0,    -75,  0,    -75,  647,  0,    648,  0,    906,  251,  0,
+    308,  251,  496,  673,  1057, 0,    906,  252,  0,    6,    5,    4,    1,    3,    2,    906,
+    0,    185,  186,  64,   79,   185,  186,  0,    0,    1093, 188,  0,    -75,  189,  188,  190,
+    252,  189,  0,    190,  0,    252,  250,  185,  186,  0,    0,    0,    64,   79,   0,    187,
+    188,  64,   79,   189,  0,    190,  0,    0,    649,  -99,  251,  250,  673,  252,  -74,  0,
+    674,  178,  179,  0,    64,   79,   0,    795,  0,    64,   79,   0,    64,   79,   -99,  251,
+    0,    673,  954,  497,  225,  0,    0,    0,    954,  0,    0,    0,    0,    180,  181,  796,
+    954,  0,    0,    0,    0,    0,    0,    954,  0,    0,    0,    0,    0,    0,    184,  0,
+    0,    0,    184,  0,    0,    0,    0,    0,    0,    674,  -74,  961,  -74,  0,    797,  0,
+    957,  961,  958,  0,    184,  64,   79,   0,    957,  961,  958,  0,    156,  0,    674,  957,
+    961,  958,  0,    0,    0,    415,  416,  0,    0,    0,    64,   79,   0,    0,    0,    952,
+    -74,  951,  0,    0,    496,  952,  959,  951,  954,  0,    955,  953,  960,  952,  959,  951,
+    955,  953,  960,  0,    952,  959,  951,  954,  955,  953,  960,  0,    0,    185,  186,  955,
+    953,  960,  0,    0,    956,  187,  188,  0,    55,   189,  0,    190,  956,  0,    0,    0,
+    957,  961,  958,  956,  0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    957,
+    961,  958,  55,   0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
+    71,   75,   72,   0,    0,    952,  959,  951,  0,    0,    0,    0,    55,   0,    0,    0,
+    955,  953,  960,  0,    952,  959,  951,  0,    0,    0,    71,   75,   72,   55,   0,    955,
+    953,  960,  0,    76,   956,  51,   73,   46,   0,    0,    184,  0,    0,    0,    0,    44,
+    67,   54,   74,   956,  71,   75,   72,   55,   0,    0,    0,    0,    0,    76,   0,    51,
+    73,   46,   0,    1001, 68,   71,   75,   72,   0,    44,   67,   54,   74,   0,    0,    0,
+    0,    0,    954,  0,    0,    0,    0,    76,   0,    51,   73,   46,   0,    0,    68,   71,
+    75,   72,   55,   44,   67,   54,   74,   0,    76,   695,  51,   73,   46,   0,    0,    0,
+    0,    0,    55,   0,    44,   67,   54,   74,   68,   501,  957,  961,  958,  0,    0,    0,
+    0,    0,    76,   0,    51,   73,   46,   0,    0,    68,   71,   75,   72,   55,   44,   67,
+    54,   74,   0,    0,    0,    0,    0,    0,    0,    0,    71,   75,   72,   0,    0,    952,
+    959,  951,  0,    68,   0,    0,    0,    55,   0,    0,    955,  953,  960,  76,   816,  51,
+    73,   46,   0,    0,    0,    71,   75,   72,   0,    44,   67,   54,   74,   76,   956,  51,
+    73,   46,   55,   0,    0,    0,    0,    0,    0,    44,   67,   54,   74,   0,    68,   71,
+    75,   72,   0,    55,   0,    0,    0,    518,  76,   0,    51,   73,   46,   0,    68,   0,
+    0,    0,    0,    0,    44,   67,   54,   74,   0,    0,    71,   75,   72,   0,    0,    0,
+    0,    0,    76,   0,    51,   73,   46,   0,    0,    68,   0,    71,   75,   72,   44,   67,
+    54,   74,   0,    0,    0,    0,    0,    55,   0,    0,    0,    236,  237,  76,   0,    51,
+    73,   46,   0,    68,   0,    0,    0,    0,    0,    44,   67,   54,   74,   518,  76,   0,
+    51,   73,   46,   0,    0,    0,    0,    0,    0,    0,    44,   67,   54,   74,   68,   71,
+    75,   72,   55,   0,    0,    0,    0,    0,    0,    501,  0,    0,    0,    0,    0,    68,
     0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-    76,   55,   51,   73,   46,   851,  0,    0,    0,    0,    0,    0,    44,   67,   54,   74,
-    71,   75,   72,   0,    0,    0,    0,    0,    0,    0,    68,   0,    0,    0,    55,   0,
-    0,    0,    236,  237,  852,  0,    0,    0,    802,  71,   75,   72,   0,    0,    235,  0,
-    0,    0,    0,    76,   0,    51,   73,   46,   0,    0,    0,    0,    0,    0,    0,    44,
-    67,   54,   74,   0,    0,    0,    71,   75,   72,   0,    0,    0,    76,   68,   51,   73,
-    46,   0,    0,    0,    0,    0,    0,    0,    44,   67,   54,   74,   0,    0,    0,    0,
-    0,    0,    0,    0,    235,  0,    68,   0,    0,    76,   0,    51,   73,   46,   0,    0,
-    0,    0,    0,    0,    0,    44,   67,   54,   74,   0,    0,    0,    0,    0,    0,    0,
-    0,    0,    0,    68,   0,    0,    0,    55,   0,    0,    0,    236,  237,  0,    0,    0,
+    0,    0,    76,   0,    51,   73,   46,   0,    0,    0,    71,   75,   72,   0,    44,   67,
+    54,   74,   0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    378,  55,   0,    0,
+    0,    236,  237,  68,   0,    0,    379,  0,    0,    0,    436,  0,    0,    76,   0,    51,
+    73,   46,   0,    0,    381,  0,    382,  0,    55,   44,   67,   54,   74,   0,    0,    0,
+    0,    383,  0,    384,  96,   71,   75,   72,   0,    0,    0,    0,    385,  0,    68,   386,
+    97,   0,    55,   0,    0,    387,  236,  237,  0,    216,  214,  0,    389,  388,  0,    0,
+    71,   75,   72,   0,    0,    378,  0,    0,    76,   0,    51,   73,   46,   390,  0,    379,
+    0,    0,    55,   380,  44,   67,   54,   74,   0,    0,    71,   75,   72,   381,  0,    382,
+    0,    0,    0,    76,   0,    51,   73,   46,   0,    68,   383,  0,    384,  96,   0,    44,
+    67,   54,   74,   216,  214,  385,  0,    0,    386,  97,   71,   75,   72,   76,   387,  51,
+    73,   46,   0,    0,    68,   389,  388,  0,    0,    44,   67,   54,   74,   0,    0,    0,
+    0,    0,    0,    0,    0,    0,    390,  0,    0,    0,    0,    0,    0,    76,   68,   51,
+    73,   46,   55,   0,    0,    0,    236,  237,  0,    44,   67,   54,   74,   0,    0,    0,
+    0,    0,    55,   0,    0,    0,    236,  237,  0,    0,    0,    0,    0,    0,    68,   0,
+    0,    0,    55,   0,    0,    0,    236,  237,  0,    0,    71,   75,   72,   0,    0,    0,
+    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    71,   75,   72,   55,   0,    0,
+    0,    236,  237,  0,    0,    0,    0,    0,    0,    0,    71,   75,   72,   76,   0,    51,
+    73,   46,   0,    0,    0,    0,    0,    0,    235,  44,   67,   54,   74,   76,   0,    51,
+    73,   46,   0,    0,    0,    71,   75,   72,   235,  44,   67,   54,   74,   76,   68,   51,
+    73,   46,   55,   0,    0,    0,    236,  237,  0,    44,   67,   54,   74,   0,    68,   0,
+    0,    0,    0,    235,  0,    0,    0,    0,    76,   0,    51,   73,   46,   0,    68,   0,
+    0,    0,    0,    0,    44,   67,   54,   74,   0,    0,    71,   75,   72,   0,    0,    0,
+    0,    0,    0,    0,    0,    0,    0,    0,    0,    68,   55,   0,    0,    0,    851,  0,
+    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    76,   0,    51,
+    73,   46,   55,   0,    0,    0,    236,  237,  0,    44,   67,   54,   74,   852,  0,    0,
+    0,    802,  71,   75,   72,   0,    0,    0,    0,    0,    0,    0,    0,    0,    68,   0,
+    0,    0,    55,   0,    0,    0,    236,  237,  0,    0,    71,   75,   72,   0,    0,    0,
+    0,    0,    0,    0,    0,    76,   0,    51,   73,   46,   0,    0,    0,    0,    0,    0,
+    0,    44,   67,   54,   74,   0,    0,    0,    235,  0,    71,   75,   72,   76,   0,    51,
+    73,   46,   0,    0,    0,    0,    68,   0,    0,    44,   67,   54,   74,   0,    0,    0,
+    0,    0,    0,    0,    0,    0,    0,    0,    235,  0,    0,    0,    0,    76,   68,   51,
+    73,   46,   0,    378,  0,    0,    0,    0,    0,    44,   67,   54,   74,   379,  0,    0,
+    0,    436,  0,    0,    0,    0,    0,    0,    0,    0,    0,    381,  0,    382,  68,   0,
+    429,  0,    55,   0,    0,    0,    236,  237,  383,  0,    384,  96,   0,    0,    0,    0,
+    0,    0,    0,    385,  0,    0,    386,  97,   0,    0,    0,    0,    387,  0,    0,    0,
+    0,    0,    0,    389,  388,  0,    0,    0,    0,    0,    71,   75,   72,   0,    0,    0,
+    0,    0,    0,    0,    390,  0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
+    0,    0,    0,    0,    0,    0,    0,    0,    235,  0,    0,    0,    0,    76,   0,    51,
+    73,   46,   0,    0,    0,    0,    430,  0,    0,    44,   67,   54,   74,   0,    0,    0,
+    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    68,   0,
+    0,    0,    48,   49,   0,    0,    0,    0,    0,    0,    0,    0,    53,   52,   0,    0,
+    0,    0,    0,    0,    55,   0,    0,    0,    56,   57,   0,    58,   0,    0,    0,    0,
+    0,    0,    62,   0,    0,    0,    66,   0,    0,    0,    0,    0,    0,    0,    0,    0,
+    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    77,   71,   75,   72,   0,
+    80,   0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    65,   82,   50,   0,    0,
+    0,    0,    0,    61,   0,    0,    0,    0,    0,    0,    0,    0,    78,   45,   0,    76,
+    0,    51,   73,   46,   64,   79,   0,    0,    0,    0,    0,    44,   67,   54,   74,   0,
     0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    71,
-    75,   72,   0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    235,  0,    0,
-    0,    0,    76,   0,    51,   73,   46,   0,    0,    0,    0,    0,    0,    0,    44,   67,
-    54,   74,   0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    68,   0,    0,    0,
-    377,  0,    0,    0,    0,    0,    0,    0,    0,    0,    378,  0,    0,    0,    435,  0,
-    0,    0,    0,    0,    0,    0,    0,    0,    380,  0,    381,  0,    0,    428,  0,    0,
-    0,    0,    0,    0,    0,    382,  0,    383,  96,   0,    0,    0,    0,    0,    0,    0,
-    384,  0,    0,    385,  97,   0,    0,    0,    0,    386,  0,    0,    0,    0,    0,    0,
-    388,  387,  0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-    0,    389,  0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-    0,    0,    0,    429,  0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-    0,    0,    0,    0,    48,   49,   0,    0,    0,    0,    0,    0,    0,    0,    53,   52,
+    68,   0,    0,    0,    48,   49,   0,    0,    0,    0,    0,    0,    0,    0,    53,   52,
     0,    0,    0,    0,    0,    0,    55,   0,    0,    0,    56,   57,   0,    58,   0,    0,
-    0,    0,    0,    0,    62,   0,    0,    0,    66,   0,    0,    0,    0,    0,    0,    0,
+    0,    0,    0,    0,    244,  0,    0,    0,    66,   0,    0,    0,    0,    0,    0,    0,
     0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    77,   71,   75,
     72,   0,    80,   0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    65,   82,   50,
     0,    0,    0,    0,    0,    61,   0,    0,    0,    0,    0,    0,    0,    0,    78,   45,
     0,    76,   0,    51,   73,   46,   64,   79,   0,    0,    0,    0,    0,    44,   67,   54,
-    74,   0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    68,   0,    0,    0,    48,
-    49,   0,    0,    0,    0,    0,    0,    0,    0,    53,   52,   0,    0,    0,    0,    0,
-    0,    55,   0,    0,    0,    56,   57,   0,    58,   0,    0,    0,    0,    0,    0,    243,
-    0,    0,    0,    66,   0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-    0,    0,    0,    0,    0,    0,    0,    0,    77,   71,   75,   72,   0,    80,   0,    0,
-    0,    0,    0,    0,    0,    0,    0,    0,    65,   82,   50,   0,    0,    0,    0,    0,
-    61,   0,    0,    0,    0,    0,    0,    0,    0,    78,   45,   0,    76,   0,    51,   73,
-    46,   64,   79,   0,    0,    0,    0,    0,    44,   67,   54,   74,   0,    0,    0,    0,
-    0,    0,    0,    0,    0,    0,    68,   0,    0,    0,    48,   49,   0,    304,  0,    0,
+    74,   0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
+    0,    0,    68,   0,    0,    0,    48,   49,   0,    0,    0,    0,    0,    0,    0,    0,
+    53,   52,   0,    0,    0,    0,    0,    0,    55,   0,    0,    0,    56,   57,   0,    58,
+    0,    0,    0,    0,    0,    0,    244,  0,    0,    0,    66,   0,    0,    0,    0,    0,
+    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    77,
+    71,   75,   72,   0,    80,   0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    65,
+    82,   50,   0,    0,    880,  0,    0,    61,   0,    0,    0,    0,    0,    0,    0,    0,
+    78,   45,   0,    76,   0,    51,   73,   46,   64,   79,   0,    0,    0,    0,    0,    44,
+    67,   54,   74,   0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
+    0,    0,    0,    0,    68,   0,    0,    0,    48,   49,   0,    307,  0,    0,    0,    0,
+    0,    0,    53,   52,   0,    0,    0,    0,    0,    0,    55,   0,    0,    0,    56,   57,
+    0,    58,   0,    0,    0,    0,    0,    0,    244,  0,    0,    0,    66,   0,    0,    0,
+    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
+    0,    77,   71,   75,   72,   0,    80,   0,    0,    0,    0,    0,    0,    0,    0,    0,
+    0,    65,   82,   50,   0,    0,    0,    0,    0,    61,   0,    0,    0,    0,    0,    0,
+    0,    0,    78,   45,   0,    76,   0,    51,   73,   46,   64,   79,   0,    0,    0,    0,
+    0,    44,   67,   54,   74,   0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
+    0,    0,    0,    0,    0,    0,    68,   0,    0,    0,    48,   49,   0,    307,  0,    0,
     0,    0,    0,    0,    53,   52,   0,    0,    0,    0,    0,    0,    55,   0,    0,    0,
     56,   57,   0,    58,   0,    0,    0,    0,    0,    0,    62,   0,    0,    0,    66,   0,
     0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
@@ -948,115 +974,130 @@ const short QmlJSGrammar::action_info[] = {
     0,    0,    0,    65,   82,   50,   0,    0,    0,    0,    0,    61,   0,    0,    0,    0,
     0,    0,    0,    0,    78,   45,   0,    76,   0,    51,   73,   46,   64,   79,   0,    0,
     0,    0,    0,    44,   67,   54,   74,   0,    0,    0,    0,    0,    0,    0,    0,    0,
-    0,    68,   0,    0,    0,    48,   49,   0,    304,  0,    0,    0,    0,    0,    0,    53,
-    52,   0,    0,    0,    0,    0,    0,    55,   0,    0,    0,    56,   57,   0,    58,   0,
-    0,    0,    0,    0,    0,    243,  0,    0,    0,    66,   0,    0,    0,    0,    0,    0,
-    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    77,   71,
-    75,   72,   0,    80,   0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    65,   82,
-    50,   0,    0,    0,    0,    0,    61,   0,    0,    0,    0,    0,    0,    0,    0,    78,
-    45,   0,    76,   0,    51,   73,   46,   64,   79,   0,    0,    0,    0,    0,    44,   67,
-    54,   74,   0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    68,   0,    0,    0,
-    48,   49,   0,    0,    0,    0,    0,    0,    0,    0,    53,   52,   0,    0,    0,    0,
-    0,    0,    55,   0,    0,    0,    56,   57,   0,    58,   0,    0,    0,    0,    0,    0,
-    243,  0,    0,    0,    66,   0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-    0,    0,    0,    0,    0,    0,    0,    0,    0,    77,   71,   75,   72,   0,    80,   0,
-    0,    0,    0,    0,    0,    0,    0,    0,    0,    65,   82,   50,   0,    0,    0,    0,
-    244,  61,   0,    0,    0,    0,    0,    0,    0,    0,    78,   45,   0,    76,   0,    51,
-    73,   46,   64,   79,   0,    0,    0,    0,    0,    44,   67,   54,   74,   0,    0,    0,
-    0,    0,    0,    0,    0,    0,    0,    68,   0,    0,    0,    48,   49,   0,    0,    0,
-    0,    0,    0,    0,    0,    53,   52,   0,    0,    0,    0,    0,    0,    55,   0,    0,
-    0,    56,   57,   0,    58,   0,    0,    0,    0,    0,    0,    243,  0,    0,    0,    66,
-    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-    0,    0,    0,    0,    77,   71,   75,   72,   0,    80,   0,    0,    0,    0,    0,    0,
-    0,    0,    0,    0,    65,   82,   50,   0,    0,    880,  0,    0,    61,   0,    0,    0,
-    0,    0,    0,    0,    0,    78,   45,   0,    76,   0,    51,   73,   46,   64,   79,   0,
-    0,    0,    0,    0,    44,   67,   54,   74,   0,    0,    0,    0,    0,    0,    0,    0,
-    0,    0,    68,   0,    0,    0,    882,  0,    48,   49,   0,    0,    0,    0,    0,    0,
-    0,    0,    885,  884,  0,    0,    0,    0,    0,    0,    55,   0,    0,    0,    56,   57,
-    0,    58,   0,    0,    0,    0,    0,    0,    243,  0,    0,    0,    66,   0,    0,    0,
-    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-    0,    77,   886,  889,  887,  0,    80,   0,    0,    0,    0,    156,  0,    0,    0,    0,
-    0,    65,   82,   50,   0,    0,    880,  0,    0,    61,   0,    0,    0,    0,    0,    883,
-    0,    0,    78,   45,   0,    76,   0,    51,   888,  881,  64,   79,   0,    0,    0,    0,
-    0,    44,   67,   54,   74,   0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    68,
-    0,    0,    0,    882,  0,    48,   49,   0,    0,    0,    0,    0,    0,    0,    0,    885,
-    884,  0,    0,    0,    0,    0,    0,    55,   0,    0,    0,    56,   57,   0,    58,   0,
-    0,    0,    0,    0,    0,    243,  0,    0,    0,    66,   0,    0,    0,    0,    0,    0,
-    0,    0,    928,  0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    77,   886,
-    889,  887,  0,    80,   0,    0,    0,    0,    156,  0,    0,    0,    0,    0,    65,   82,
-    50,   0,    0,    880,  0,    0,    61,   0,    0,    0,    0,    0,    883,  0,    0,    78,
-    45,   0,    76,   0,    51,   888,  881,  64,   79,   0,    0,    0,    0,    0,    44,   67,
-    54,   74,   0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    68,   0,    0,    0,
+    0,    0,    0,    0,    0,    0,    0,    0,    68,   0,    0,    0,    48,   49,   0,    0,
+    0,    0,    0,    0,    0,    0,    53,   52,   0,    0,    0,    0,    0,    0,    55,   0,
+    0,    0,    56,   57,   0,    58,   0,    0,    0,    0,    0,    0,    244,  0,    0,    0,
+    66,   0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
+    0,    0,    0,    0,    0,    77,   71,   75,   72,   0,    80,   0,    0,    0,    0,    246,
+    247,  0,    0,    0,    0,    65,   82,   50,   0,    0,    0,    0,    245,  61,   0,    0,
+    0,    0,    0,    0,    0,    0,    78,   45,   0,    76,   0,    51,   73,   46,   64,   79,
+    0,    0,    0,    0,    0,    44,   67,   54,   74,   0,    0,    0,    0,    0,    0,    0,
+    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    68,   0,    0,    0,    48,   49,
+    0,    0,    0,    0,    0,    0,    0,    0,    53,   52,   0,    0,    0,    0,    0,    0,
+    970,  0,    0,    0,    56,   57,   0,    58,   0,    0,    0,    0,    0,    0,    244,  0,
+    0,    0,    66,   0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
+    0,    0,    0,    0,    0,    0,    0,    77,   973,  977,  974,  0,    80,   0,    0,    0,
+    0,    246,  247,  0,    0,    0,    0,    65,   82,   50,   0,    0,    0,    0,    245,  61,
+    0,    0,    0,    0,    0,    0,    0,    0,    78,   45,   0,    76,   0,    968,  975,  967,
+    64,   79,   0,    0,    0,    0,    0,    44,   971,  969,  976,  0,    0,    0,    0,    0,
+    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    972,  0,    0,    0,
     882,  0,    48,   49,   0,    0,    0,    0,    0,    0,    0,    0,    885,  884,  0,    0,
     0,    0,    0,    0,    55,   0,    0,    0,    56,   57,   0,    58,   0,    0,    0,    0,
-    0,    0,    243,  0,    0,    0,    66,   0,    0,    0,    0,    0,    0,    0,    0,    925,
+    0,    0,    244,  0,    0,    0,    66,   0,    0,    0,    0,    0,    0,    0,    0,    0,
     0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    77,   886,  889,  887,  0,
     80,   0,    0,    0,    0,    156,  0,    0,    0,    0,    0,    65,   82,   50,   0,    0,
     880,  0,    0,    61,   0,    0,    0,    0,    0,    883,  0,    0,    78,   45,   0,    76,
     0,    51,   888,  881,  64,   79,   0,    0,    0,    0,    0,    44,   67,   54,   74,   0,
-    0,    0,    0,    0,    0,    0,    0,    0,    0,    68,   0,    0,    0,    47,   48,   49,
-    0,    0,    0,    0,    0,    0,    0,    0,    53,   52,   0,    0,    0,    0,    0,    0,
-    55,   0,    0,    0,    56,   57,   0,    58,   0,    0,    0,    59,   0,    60,   62,   63,
-    0,    0,    66,   0,    0,    0,    0,    69,   0,    70,   0,    0,    0,    0,    0,    0,
-    0,    0,    0,    0,    0,    0,    0,    77,   71,   75,   72,   0,    80,   0,    81,   0,
-    83,   0,    84,   0,    0,    0,    0,    65,   82,   50,   0,    0,    0,    0,    0,    61,
-    0,    0,    0,    0,    0,    0,    0,    0,    78,   45,   0,    76,   0,    51,   73,   46,
-    64,   79,   0,    0,    0,    0,    0,    44,   67,   54,   74,   0,    0,    0,    0,    0,
-    0,    0,    0,    0,    0,    68,   0,    0,    0,    47,   48,   49,   0,    0,    0,    0,
-    0,    0,    0,    0,    53,   52,   0,    0,    0,    0,    0,    0,    55,   0,    0,    0,
-    56,   57,   0,    58,   0,    0,    0,    59,   0,    60,   62,   63,   0,    0,    66,   0,
-    0,    0,    0,    69,   0,    70,   0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-    0,    0,    0,    77,   71,   75,   72,   0,    80,   0,    81,   0,    83,   0,    84,   0,
-    0,    0,    0,    65,   82,   50,   0,    0,    0,    0,    0,    61,   0,    0,    0,    0,
-    0,    0,    0,    85,   78,   45,   0,    76,   0,    51,   73,   46,   64,   79,   0,    0,
+    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
+    68,   0,    0,    0,    882,  0,    48,   49,   0,    0,    0,    0,    0,    0,    0,    0,
+    885,  884,  0,    0,    0,    0,    0,    0,    55,   0,    0,    0,    56,   57,   0,    58,
+    0,    0,    0,    0,    0,    0,    244,  0,    0,    0,    66,   0,    0,    0,    0,    0,
+    0,    0,    0,    925,  0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    77,
+    886,  889,  887,  0,    80,   0,    0,    0,    0,    156,  0,    0,    0,    0,    0,    65,
+    82,   50,   0,    0,    880,  0,    0,    61,   0,    0,    0,    0,    0,    883,  0,    0,
+    78,   45,   0,    76,   0,    51,   888,  881,  64,   79,   0,    0,    0,    0,    0,    44,
+    67,   54,   74,   0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
+    0,    0,    0,    0,    68,   0,    0,    0,    882,  0,    48,   49,   0,    0,    0,    0,
+    0,    0,    0,    0,    885,  884,  0,    0,    0,    0,    0,    0,    55,   0,    0,    0,
+    56,   57,   0,    58,   0,    0,    0,    0,    0,    0,    244,  0,    0,    0,    66,   0,
+    0,    0,    0,    0,    0,    0,    0,    928,  0,    0,    0,    0,    0,    0,    0,    0,
+    0,    0,    0,    77,   886,  889,  887,  0,    80,   0,    0,    0,    0,    156,  0,    0,
+    0,    0,    0,    65,   82,   50,   0,    0,    880,  0,    0,    61,   0,    0,    0,    0,
+    0,    883,  0,    0,    78,   45,   0,    76,   0,    51,   888,  881,  64,   79,   0,    0,
     0,    0,    0,    44,   67,   54,   74,   0,    0,    0,    0,    0,    0,    0,    0,    0,
+    0,    0,    0,    0,    0,    0,    0,    0,    68,   0,    0,    0,    47,   48,   49,   0,
+    0,    0,    0,    0,    0,    0,    0,    53,   52,   0,    0,    0,    0,    0,    0,    55,
+    0,    0,    0,    56,   57,   0,    58,   0,    0,    0,    59,   0,    60,   62,   63,   0,
+    0,    66,   0,    0,    0,    0,    69,   0,    70,   0,    0,    0,    0,    0,    0,    0,
+    0,    0,    0,    0,    0,    0,    77,   71,   75,   72,   0,    80,   0,    81,   0,    83,
+    0,    84,   0,    0,    0,    0,    65,   82,   50,   0,    0,    0,    0,    0,    61,   0,
+    0,    0,    0,    0,    0,    0,    0,    78,   45,   0,    76,   0,    51,   73,   46,   64,
+    79,   0,    0,    0,    0,    0,    44,   67,   54,   74,   0,    0,    0,    0,    0,    0,
+    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    68,   0,    0,    0,    47,
+    48,   49,   0,    0,    0,    0,    0,    0,    0,    0,    53,   52,   0,    0,    0,    0,
+    0,    0,    55,   0,    0,    0,    56,   57,   0,    58,   0,    0,    0,    59,   0,    60,
+    62,   63,   0,    0,    66,   0,    0,    0,    0,    69,   0,    70,   0,    0,    0,    0,
+    0,    0,    0,    0,    0,    0,    0,    0,    0,    77,   71,   75,   72,   0,    80,   0,
+    81,   0,    83,   0,    84,   0,    0,    0,    0,    65,   82,   50,   0,    0,    0,    0,
+    0,    61,   0,    0,    0,    0,    0,    0,    0,    159,  78,   45,   0,    76,   0,    51,
+    73,   46,   64,   79,   0,    0,    0,    0,    0,    44,   67,   54,   74,   0,    0,    0,
+    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    68,   0,
+    0,    0,    47,   48,   49,   0,    0,    0,    0,    0,    0,    0,    0,    53,   52,   0,
+    0,    0,    0,    0,    0,    55,   0,    0,    0,    56,   57,   0,    58,   0,    0,    0,
+    59,   0,    60,   62,   63,   0,    0,    66,   0,    0,    0,    0,    69,   0,    70,   0,
+    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    77,   71,   75,   72,
+    0,    80,   0,    81,   0,    83,   0,    84,   0,    0,    0,    0,    65,   82,   50,   0,
+    0,    0,    0,    0,    61,   0,    0,    0,    0,    0,    0,    0,    85,   78,   45,   0,
+    76,   0,    51,   73,   46,   64,   79,   0,    0,    0,    0,    0,    44,   67,   54,   74,
+    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
     0,    68,   0,    0,    0,    47,   48,   49,   0,    0,    0,    0,    0,    0,    0,    0,
     53,   52,   0,    0,    0,    0,    0,    0,    55,   0,    0,    0,    56,   57,   0,    58,
     0,    0,    0,    59,   0,    60,   62,   63,   0,    0,    66,   0,    0,    0,    0,    69,
     0,    70,   0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    77,
     71,   75,   72,   0,    80,   0,    81,   0,    83,   0,    84,   0,    0,    0,    0,    65,
-    82,   50,   0,    0,    0,    0,    0,    61,   0,    0,    0,    0,    0,    0,    0,    159,
+    82,   50,   0,    0,    0,    0,    0,    61,   0,    0,    0,    0,    0,    0,    312,  159,
     78,   45,   0,    76,   0,    51,   73,   46,   64,   79,   0,    0,    0,    0,    0,    44,
-    67,   54,   74,   0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    68,   0,    0,
+    67,   54,   74,   0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
+    0,    0,    0,    0,    68,   0,    0,    0,    47,   48,   49,   0,    0,    0,    0,    0,
+    0,    0,    0,    53,   52,   0,    0,    0,    0,    0,    0,    55,   0,    0,    0,    56,
+    57,   0,    58,   0,    0,    0,    59,   0,    60,   62,   63,   0,    0,    66,   0,    0,
+    0,    0,    69,   0,    70,   0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
+    0,    0,    77,   71,   75,   72,   0,    80,   0,    81,   0,    83,   0,    84,   0,    0,
+    0,    0,    65,   82,   50,   0,    0,    0,    0,    0,    61,   0,    0,    0,    0,    0,
+    0,    235,  159,  78,   45,   0,    76,   0,    51,   73,   46,   64,   79,   0,    0,    0,
+    0,    0,    44,   67,   54,   74,   0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
+    0,    0,    0,    0,    0,    0,    0,    68,   0,    0,    0,    375,  0,    0,    47,   48,
+    49,   0,    0,    0,    0,    0,    0,    0,    0,    53,   52,   0,    0,    0,    0,    0,
+    0,    55,   0,    0,    0,    56,   57,   0,    58,   0,    0,    0,    59,   0,    60,   62,
+    63,   0,    0,    66,   0,    0,    0,    0,    69,   0,    70,   0,    0,    0,    0,    0,
+    0,    0,    0,    0,    0,    0,    0,    0,    77,   71,   75,   72,   0,    80,   0,    81,
+    0,    83,   0,    84,   0,    0,    0,    0,    65,   82,   50,   0,    0,    0,    0,    0,
+    61,   0,    0,    0,    0,    0,    0,    0,    159,  78,   45,   0,    76,   0,    51,   73,
+    46,   64,   79,   0,    0,    0,    0,    0,    44,   67,   54,   74,   0,    0,    0,    0,
+    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    68,   0,    0,
     0,    47,   48,   49,   0,    0,    0,    0,    0,    0,    0,    0,    53,   52,   0,    0,
     0,    0,    0,    0,    55,   0,    0,    0,    56,   57,   0,    58,   0,    0,    0,    59,
     0,    60,   62,   63,   0,    0,    66,   0,    0,    0,    0,    69,   0,    70,   0,    0,
     0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    77,   71,   75,   72,   0,
     80,   0,    81,   0,    83,   0,    84,   0,    0,    0,    0,    65,   82,   50,   0,    0,
-    0,    0,    0,    61,   0,    0,    0,    0,    0,    0,    235,  159,  78,   45,   0,    76,
+    0,    0,    0,    61,   0,    0,    0,    0,    0,    0,    315,  159,  78,   45,   0,    76,
     0,    51,   73,   46,   64,   79,   0,    0,    0,    0,    0,    44,   67,   54,   74,   0,
+    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
+    68,   0,    0,    0,    367,  0,    0,    47,   48,   49,   0,    0,    0,    0,    0,    0,
+    0,    0,    53,   52,   0,    0,    0,    0,    0,    0,    55,   0,    0,    0,    56,   57,
+    0,    58,   0,    0,    0,    59,   0,    60,   62,   63,   0,    0,    66,   0,    0,    0,
+    0,    69,   0,    70,   0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
+    0,    77,   71,   75,   72,   0,    80,   0,    81,   0,    83,   0,    84,   0,    0,    0,
+    0,    65,   82,   50,   0,    0,    0,    0,    0,    61,   0,    0,    0,    0,    0,    0,
+    0,    159,  78,   45,   0,    76,   0,    51,   73,   46,   64,   79,   0,    0,    0,    0,
+    0,    44,   67,   54,   74,   0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
+    0,    0,    0,    0,    0,    0,    68,   0,    0,    0,    47,   48,   49,   0,    0,    0,
+    0,    0,    0,    0,    0,    53,   52,   0,    0,    0,    0,    0,    0,    55,   0,    0,
+    0,    56,   57,   0,    58,   0,    0,    0,    59,   0,    60,   62,   63,   0,    0,    66,
+    0,    0,    0,    0,    69,   0,    70,   0,    0,    0,    0,    0,    0,    0,    0,    0,
+    621,  0,    0,    0,    77,   71,   75,   72,   0,    80,   0,    81,   0,    83,   0,    84,
+    0,    0,    0,    0,    65,   82,   50,   0,    0,    0,    0,    0,    61,   0,    0,    0,
+    0,    0,    0,    0,    159,  78,   45,   0,    76,   0,    51,   73,   46,   64,   79,   0,
+    0,    0,    0,    0,    44,   67,   54,   74,   0,    0,    0,    0,    0,    0,    0,    0,
     0,    0,    0,    0,    0,    0,    0,    0,    0,    68,   0,    0,    0,    47,   48,   49,
     0,    0,    0,    0,    0,    0,    0,    0,    53,   52,   0,    0,    0,    0,    0,    0,
     55,   0,    0,    0,    56,   57,   0,    58,   0,    0,    0,    59,   0,    60,   62,   63,
     0,    0,    66,   0,    0,    0,    0,    69,   0,    70,   0,    0,    0,    0,    0,    0,
     0,    0,    0,    0,    0,    0,    0,    77,   71,   75,   72,   0,    80,   0,    81,   0,
     83,   0,    84,   0,    0,    0,    0,    65,   82,   50,   0,    0,    0,    0,    0,    61,
-    0,    0,    0,    0,    0,    0,    309,  159,  78,   45,   0,    76,   0,    51,   73,   46,
+    0,    0,    0,    0,    0,    0,    0,    159,  78,   45,   0,    76,   0,    51,   73,   46,
     64,   79,   0,    0,    0,    0,    0,    44,   67,   54,   74,   0,    0,    0,    0,    0,
-    0,    0,    0,    0,    0,    68,   0,    0,    0,    47,   48,   49,   0,    0,    0,    0,
-    0,    0,    0,    0,    53,   52,   0,    0,    0,    0,    0,    0,    55,   0,    0,    0,
-    56,   57,   0,    58,   0,    0,    0,    59,   0,    60,   62,   63,   0,    0,    66,   0,
-    0,    0,    0,    69,   0,    70,   0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-    0,    0,    0,    77,   71,   75,   72,   0,    80,   0,    81,   0,    83,   0,    84,   0,
-    0,    0,    0,    65,   82,   50,   0,    0,    0,    0,    0,    61,   0,    0,    0,    0,
-    0,    0,    312,  159,  78,   45,   0,    76,   0,    51,   73,   46,   64,   79,   0,    0,
-    0,    0,    0,    44,   67,   54,   74,   0,    0,    0,    0,    0,    0,    0,    0,    0,
-    0,    68,   0,    0,    0,    47,   48,   49,   0,    0,    0,    0,    0,    0,    0,    0,
-    53,   52,   0,    0,    0,    0,    0,    0,    55,   0,    0,    0,    56,   57,   0,    58,
-    0,    0,    0,    59,   0,    60,   62,   63,   0,    0,    66,   0,    0,    0,    0,    69,
-    0,    70,   0,    0,    0,    0,    0,    0,    0,    0,    0,    776,  0,    0,    0,    77,
-    71,   75,   72,   0,    80,   0,    81,   0,    83,   0,    84,   0,    0,    0,    0,    65,
-    82,   50,   0,    0,    0,    0,    0,    61,   0,    0,    0,    0,    0,    0,    0,    85,
-    78,   45,   0,    76,   0,    51,   73,   46,   64,   79,   0,    0,    0,    0,    0,    44,
-    67,   54,   74,   0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    68,   0,    0,
-    0,    47,   48,   49,   0,    0,    0,    0,    0,    0,    0,    0,    53,   52,   0,    0,
-    0,    0,    0,    0,    55,   0,    0,    0,    56,   57,   0,    58,   0,    0,    0,    59,
-    0,    60,   62,   63,   0,    0,    66,   0,    0,    0,    0,    69,   0,    70,   0,    0,
-    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    77,   71,   75,   72,   0,
-    80,   0,    81,   0,    83,   0,    84,   0,    0,    0,    0,    65,   82,   50,   0,    0,
-    0,    0,    0,    61,   0,    0,    0,    0,    0,    0,    0,    159,  78,   45,   0,    76,
-    0,    51,   73,   46,   64,   79,   0,    0,    0,    0,    0,    44,   67,   54,   74,   0,
-    0,    0,    0,    0,    0,    0,    0,    170,  0,    68,   0,    0,    0,    366,  0,    0,
+    0,    0,    0,    0,    0,    0,    0,    0,    0,    805,  0,    0,    68,   0,    0,    0,
     47,   48,   49,   0,    0,    0,    0,    0,    0,    0,    0,    53,   52,   0,    0,    0,
     0,    0,    0,    55,   0,    0,    0,    56,   57,   0,    58,   0,    0,    0,    59,   0,
     60,   62,   63,   0,    0,    66,   0,    0,    0,    0,    69,   0,    70,   0,    0,    0,
@@ -1064,280 +1105,289 @@ const short QmlJSGrammar::action_info[] = {
     0,    81,   0,    83,   0,    84,   0,    0,    0,    0,    65,   82,   50,   0,    0,    0,
     0,    0,    61,   0,    0,    0,    0,    0,    0,    0,    159,  78,   45,   0,    76,   0,
     51,   73,   46,   64,   79,   0,    0,    0,    0,    0,    44,   67,   54,   74,   0,    0,
-    0,    0,    0,    0,    0,    0,    0,    0,    68,   0,    0,    0,    47,   48,   49,   0,
-    0,    0,    0,    0,    0,    0,    0,    53,   52,   0,    0,    0,    0,    0,    0,    55,
-    0,    0,    0,    56,   57,   0,    58,   0,    0,    0,    59,   0,    60,   62,   63,   0,
-    0,    66,   0,    0,    0,    0,    69,   0,    70,   0,    0,    0,    0,    0,    0,    0,
-    0,    0,    621,  0,    0,    0,    77,   71,   75,   72,   0,    80,   0,    81,   0,    83,
-    0,    84,   0,    0,    0,    0,    65,   82,   50,   0,    0,    0,    0,    0,    61,   0,
-    0,    0,    0,    0,    0,    0,    159,  78,   45,   0,    76,   0,    51,   73,   46,   64,
-    79,   0,    0,    0,    0,    0,    44,   67,   54,   74,   0,    0,    0,    0,    0,    0,
-    0,    0,    0,    0,    68,   0,    0,    0,    47,   48,   49,   0,    0,    0,    0,    0,
-    0,    0,    0,    53,   52,   0,    0,    0,    0,    0,    0,    55,   0,    0,    0,    56,
-    57,   0,    58,   0,    0,    0,    59,   0,    60,   62,   63,   0,    0,    66,   0,    0,
-    0,    0,    69,   0,    70,   0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-    0,    0,    77,   71,   75,   72,   0,    80,   0,    81,   0,    83,   0,    84,   0,    0,
-    0,    0,    65,   82,   50,   0,    0,    0,    0,    0,    61,   0,    0,    0,    0,    0,
-    0,    0,    85,   78,   45,   0,    76,   0,    51,   73,   46,   64,   79,   0,    0,    0,
-    0,    0,    44,   67,   54,   74,   0,    0,    0,    0,    0,    0,    0,    0,    107,  0,
-    68,   0,    0,    0,    374,  0,    0,    47,   48,   49,   0,    0,    0,    0,    0,    0,
-    0,    0,    53,   52,   0,    0,    0,    0,    0,    0,    55,   0,    0,    0,    56,   57,
-    0,    58,   0,    0,    0,    59,   0,    60,   62,   63,   0,    0,    66,   0,    0,    0,
-    0,    69,   0,    70,   0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-    0,    77,   71,   75,   72,   0,    80,   0,    81,   0,    83,   0,    84,   0,    0,    0,
-    0,    65,   82,   50,   0,    0,    0,    0,    0,    61,   0,    0,    0,    0,    0,    0,
-    0,    159,  78,   45,   0,    76,   0,    51,   73,   46,   64,   79,   0,    0,    0,    0,
-    0,    44,   67,   54,   74,   0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    68,
+    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    170,  0,    68,
     0,    0,    0,    47,   48,   49,   0,    0,    0,    0,    0,    0,    0,    0,    53,   52,
     0,    0,    0,    0,    0,    0,    55,   0,    0,    0,    56,   57,   0,    58,   0,    0,
     0,    59,   0,    60,   62,   63,   0,    0,    66,   0,    0,    0,    0,    69,   0,    70,
     0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    77,   71,   75,
     72,   0,    80,   0,    81,   0,    83,   0,    84,   0,    0,    0,    0,    65,   82,   50,
-    0,    0,    0,    0,    0,    61,   0,    0,    0,    0,    0,    0,    0,    159,  78,   45,
+    0,    0,    0,    0,    0,    61,   0,    0,    0,    0,    0,    0,    0,    85,   78,   45,
     0,    76,   0,    51,   73,   46,   64,   79,   0,    0,    0,    0,    0,    44,   67,   54,
-    74,   0,    0,    0,    0,    0,    0,    0,    805,  0,    0,    68,   0,    0,    0,    47,
+    74,   0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
+    107,  0,    68,   0,    0,    0,    47,   48,   49,   0,    0,    0,    0,    0,    0,    0,
+    0,    53,   52,   0,    0,    0,    0,    0,    0,    55,   0,    0,    0,    56,   57,   0,
+    58,   0,    0,    0,    59,   0,    60,   62,   63,   0,    0,    66,   0,    0,    0,    0,
+    69,   0,    70,   0,    0,    0,    0,    0,    0,    0,    0,    0,    776,  0,    0,    0,
+    77,   71,   75,   72,   0,    80,   0,    81,   0,    83,   0,    84,   0,    0,    0,    0,
+    65,   82,   50,   0,    0,    0,    0,    0,    61,   0,    0,    0,    0,    0,    0,    0,
+    85,   78,   45,   0,    76,   0,    51,   73,   46,   64,   79,   0,    0,    0,    0,    0,
+    44,   67,   54,   74,   0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
+    0,    0,    0,    0,    0,    68,   0,    0,    0,    47,   48,   49,   0,    0,    0,    0,
+    0,    0,    0,    0,    53,   52,   0,    0,    0,    0,    0,    0,    55,   0,    0,    0,
+    56,   57,   0,    58,   0,    0,    0,    59,   0,    60,   62,   63,   0,    0,    66,   0,
+    0,    0,    0,    69,   0,    70,   0,    0,    0,    0,    0,    0,    753,  0,    0,    0,
+    0,    0,    0,    77,   71,   75,   72,   0,    80,   0,    81,   0,    83,   0,    84,   0,
+    0,    0,    0,    65,   82,   50,   0,    0,    0,    0,    0,    61,   0,    0,    0,    0,
+    0,    0,    235,  159,  78,   45,   0,    76,   0,    51,   73,   46,   64,   79,   0,    0,
+    0,    0,    0,    44,   67,   54,   74,   0,    0,    0,    0,    0,    0,    0,    0,    0,
+    0,    0,    0,    0,    0,    0,    0,    0,    68,   0,    0,    0,    47,   48,   49,   0,
+    0,    0,    0,    0,    0,    0,    0,    53,   52,   0,    0,    0,    0,    0,    0,    55,
+    0,    0,    0,    56,   57,   0,    58,   0,    0,    0,    59,   0,    60,   62,   63,   0,
+    0,    66,   0,    0,    0,    0,    69,   0,    70,   0,    0,    746,  0,    0,    0,    0,
+    0,    0,    0,    0,    0,    0,    77,   71,   75,   72,   0,    80,   0,    81,   0,    83,
+    0,    84,   0,    0,    0,    0,    65,   82,   50,   0,    0,    0,    0,    0,    61,   0,
+    0,    0,    0,    0,    0,    745,  159,  78,   45,   0,    76,   0,    51,   73,   46,   64,
+    79,   0,    0,    0,    0,    0,    44,   67,   54,   74,   0,    0,    0,    0,    0,    0,
+    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    68,   0,    0,    0,    47,
     48,   49,   0,    0,    0,    0,    0,    0,    0,    0,    53,   52,   0,    0,    0,    0,
     0,    0,    55,   0,    0,    0,    56,   57,   0,    58,   0,    0,    0,    59,   0,    60,
-    62,   63,   0,    0,    66,   0,    0,    0,    0,    69,   0,    70,   0,    0,    746,  0,
-    0,    0,    0,    0,    0,    0,    0,    0,    0,    77,   71,   75,   72,   0,    80,   0,
-    81,   0,    83,   0,    84,   0,    0,    0,    0,    65,   82,   50,   0,    0,    0,    0,
-    0,    61,   0,    0,    0,    0,    0,    0,    745,  159,  78,   45,   0,    76,   0,    51,
-    73,   46,   64,   79,   0,    0,    0,    0,    0,    44,   67,   54,   74,   0,    0,    0,
-    0,    0,    0,    0,    0,    0,    0,    68,   0,    0,    0,    47,   48,   49,   0,    0,
-    0,    0,    0,    0,    0,    0,    53,   52,   0,    0,    0,    0,    0,    0,    55,   0,
-    0,    0,    56,   57,   0,    58,   0,    0,    0,    59,   0,    60,   62,   63,   0,    0,
-    66,   0,    0,    0,    0,    69,   0,    70,   0,    0,    0,    0,    0,    0,    753,  0,
-    0,    0,    0,    0,    0,    77,   71,   75,   72,   0,    80,   0,    81,   0,    83,   0,
-    84,   0,    0,    0,    0,    65,   82,   50,   0,    0,    0,    0,    0,    61,   0,    0,
-    0,    0,    0,    0,    235,  159,  78,   45,   0,    76,   0,    51,   73,   46,   64,   79,
-    0,    0,    0,    0,    0,    44,   67,   54,   74,   0,    0,    0,    0,    0,    0,    0,
-    0,    0,    0,    68,   0,    0,    0,    47,   48,   49,   0,    0,    0,    0,    0,    0,
-    0,    0,    53,   52,   0,    0,    0,    0,    0,    0,    55,   0,    0,    0,    56,   57,
-    0,    58,   0,    0,    0,    59,   0,    60,   62,   63,   0,    0,    66,   0,    0,    0,
-    0,    69,   0,    70,   0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-    0,    77,   71,   75,   72,   0,    80,   0,    81,   0,    83,   156,  84,   0,    0,    0,
-    0,    65,   82,   50,   414,  415,  0,    0,    0,    61,   0,    0,    0,    0,    0,    0,
-    0,    85,   78,   45,   0,    76,   0,    51,   73,   46,   64,   79,   0,    0,    0,    0,
-    0,    44,   67,   54,   74,   0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    68,
-    0,    0,    0,    47,   48,   49,   0,    0,    0,    0,    0,    0,    0,    0,    53,   52,
-    0,    0,    0,    0,    0,    0,    55,   150,  0,    0,    56,   57,   0,    58,   0,    0,
-    0,    59,   0,    60,   62,   63,   0,    0,    66,   0,    0,    0,    0,    69,   0,    70,
-    0,    0,    0,    0,    0,    0,    0,    152,  0,    0,    0,    0,    0,    77,   71,   75,
-    72,   153,  80,   0,    81,   155,  83,   0,    84,   0,    158,  0,    0,    65,   82,   50,
-    0,    0,    0,    0,    0,    61,   0,    0,    0,    0,    0,    0,    0,    159,  78,   45,
-    0,    76,   0,    51,   73,   46,   64,   79,   0,    0,    0,    0,    0,    44,   67,   54,
-    74,   0,    0,    0,    0,    0,    0,    0,    1011, 1010, 0,    68,   0,    0,    0,    47,
-    48,   49,   0,    0,    0,    0,    0,    0,    0,    0,    53,   52,   0,    0,    0,    0,
-    0,    0,    55,   150,  0,    0,    56,   1044, 0,    58,   0,    0,    0,    59,   0,    60,
     62,   63,   0,    0,    66,   0,    0,    0,    0,    69,   0,    70,   0,    0,    0,    0,
-    0,    0,    0,    152,  0,    0,    0,    0,    0,    77,   71,   75,   72,   153,  80,   0,
-    81,   155,  83,   0,    84,   0,    158,  0,    0,    65,   82,   50,   0,    0,    0,    0,
-    0,    61,   0,    0,    0,    0,    0,    0,    0,    159,  78,   45,   0,    76,   0,    51,
+    0,    0,    0,    0,    0,    0,    0,    0,    0,    77,   71,   75,   72,   0,    80,   0,
+    81,   0,    83,   156,  84,   0,    0,    0,    0,    65,   82,   50,   415,  416,  0,    0,
+    0,    61,   0,    0,    0,    0,    0,    0,    0,    85,   78,   45,   0,    76,   0,    51,
     73,   46,   64,   79,   0,    0,    0,    0,    0,    44,   67,   54,   74,   0,    0,    0,
-    0,    0,    0,    0,    1011, 1010, 0,    68,   0,    0,    0,    254,  255,  256,  0,    0,
-    259,  261,  262,  0,    0,    263,  0,    264,  0,    0,    0,    269,  270,  0,    271,  0,
-    0,    0,    0,    0,    0,    55,   272,  274,  275,  0,    0,    0,    0,    0,    0,    0,
-    0,    0,    0,    277,  0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-    0,    0,    0,    0,    280,  0,    0,    0,    0,    0,    0,    0,    0,    71,   75,   72,
-    282,  283,  284,  0,    286,  287,  288,  289,  290,  291,  0,    0,    278,  285,  268,  258,
-    276,  0,    260,  279,  0,    0,    0,    0,    0,    0,    265,  0,    0,    281,  257,  267,
-    76,   266,  51,   73,   46,   0,    0,    0,    0,    0,    273,  0,    44,   67,   54,   74,
-    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    68,   0,    0,    0,    254,  255,
-    256,  0,    0,    259,  261,  262,  0,    0,    263,  0,    264,  0,    0,    0,    269,  270,
-    0,    271,  0,    0,    0,    0,    0,    0,    55,   272,  274,  275,  0,    0,    0,    0,
-    0,    0,    0,    0,    0,    0,    277,  0,    0,    0,    0,    0,    0,    0,    0,    0,
-    0,    0,    0,    836,  0,    0,    0,    280,  0,    0,    0,    0,    0,    0,    0,    0,
-    71,   75,   72,   282,  283,  284,  0,    286,  287,  288,  289,  290,  291,  0,    0,    278,
-    285,  268,  258,  276,  0,    260,  279,  0,    0,    0,    0,    0,    0,    265,  0,    0,
-    281,  257,  267,  76,   266,  51,   73,   46,   0,    0,    0,    0,    0,    273,  0,    44,
-    67,   54,   74,   0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    68,   0,    0,
-    0,    254,  255,  256,  0,    0,    259,  261,  262,  0,    0,    263,  0,    264,  0,    0,
-    0,    269,  270,  0,    271,  0,    0,    0,    0,    0,    0,    55,   272,  274,  275,  0,
-    0,    0,    0,    0,    0,    0,    0,    0,    0,    277,  0,    0,    0,    0,    0,    0,
-    0,    0,    0,    0,    0,    0,    867,  0,    0,    0,    280,  0,    0,    0,    0,    0,
-    0,    0,    0,    71,   75,   72,   282,  283,  284,  0,    286,  287,  288,  289,  290,  291,
-    0,    0,    278,  285,  268,  258,  276,  0,    260,  279,  0,    0,    0,    0,    0,    0,
-    265,  0,    0,    281,  257,  267,  76,   266,  51,   73,   46,   0,    0,    0,    0,    0,
-    273,  0,    44,   67,   54,   74,   0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-    68,   0,    0,    0,    254,  255,  256,  0,    0,    259,  261,  262,  0,    0,    263,  0,
-    264,  0,    0,    0,    269,  270,  0,    271,  0,    0,    0,    0,    0,    0,    55,   272,
-    274,  275,  0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    277,  0,    0,    0,
-    0,    0,    0,    0,    0,    0,    0,    0,    0,    840,  0,    0,    0,    280,  0,    0,
-    0,    0,    0,    0,    0,    0,    71,   75,   72,   282,  283,  284,  0,    286,  287,  288,
-    289,  290,  291,  0,    0,    278,  285,  268,  258,  276,  0,    260,  279,  0,    0,    0,
-    0,    0,    0,    265,  0,    0,    281,  257,  267,  76,   266,  51,   73,   46,   0,    0,
-    0,    0,    0,    273,  0,    44,   67,   54,   74,   0,    0,    0,    0,    0,    0,    0,
-    0,    0,    0,    68,   0,    0,    0,    254,  255,  256,  0,    0,    259,  261,  262,  0,
-    0,    263,  0,    264,  0,    0,    0,    269,  270,  0,    271,  0,    0,    0,    0,    0,
-    0,    55,   272,  274,  275,  0,    295,  0,    0,    0,    0,    0,    0,    0,    0,    277,
-    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-    280,  0,    0,    0,    0,    0,    0,    0,    0,    71,   75,   72,   282,  283,  284,  0,
-    286,  287,  288,  289,  290,  291,  0,    0,    278,  285,  268,  258,  276,  0,    260,  279,
-    0,    0,    0,    0,    0,    0,    265,  0,    0,    281,  257,  267,  76,   266,  51,   73,
-    46,   0,    0,    0,    0,    0,    273,  0,    44,   67,   54,   74,   0,    0,    0,    0,
-    0,    0,    0,    0,    0,    0,    68,   0,    0,    0,    254,  255,  256,  0,    0,    259,
-    261,  262,  0,    0,    263,  0,    264,  0,    0,    0,    269,  270,  0,    271,  0,    0,
-    0,    0,    0,    0,    55,   272,  274,  275,  0,    0,    0,    0,    0,    0,    0,    0,
-    0,    0,    277,  0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    861,
-    0,    0,    0,    280,  0,    0,    0,    0,    0,    0,    0,    0,    71,   75,   72,   282,
-    283,  284,  0,    286,  287,  288,  289,  290,  291,  0,    0,    278,  285,  268,  258,  276,
-    0,    260,  279,  0,    0,    0,    0,    0,    0,    265,  0,    0,    281,  257,  267,  76,
-    266,  51,   73,   46,   0,    0,    0,    0,    0,    273,  0,    44,   67,   54,   74,   0,
-    0,    0,    0,    0,    0,    0,    0,    0,    0,    68,   0,    0,    0,    254,  255,  256,
-    0,    0,    259,  261,  262,  0,    0,    263,  0,    264,  0,    0,    0,    269,  270,  0,
-    271,  0,    0,    0,    0,    0,    0,    55,   272,  274,  275,  0,    295,  0,    677,  0,
-    0,    0,    0,    0,    0,    277,  0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-    0,    0,    0,    0,    0,    0,    280,  0,    0,    0,    0,    0,    0,    0,    0,    71,
-    75,   72,   282,  283,  284,  0,    286,  287,  288,  289,  290,  291,  0,    0,    278,  285,
-    268,  258,  276,  0,    260,  279,  0,    0,    0,    0,    0,    0,    265,  0,    0,    281,
-    257,  267,  76,   266,  51,   73,   46,   0,    0,    0,    0,    0,    273,  0,    44,   67,
-    54,   74,   0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    68,   0,    0,    0,
-    254,  255,  256,  0,    0,    259,  261,  262,  0,    0,    263,  0,    264,  0,    0,    0,
-    269,  270,  0,    271,  0,    0,    0,    0,    0,    0,    55,   272,  274,  275,  0,    657,
-    0,    658,  0,    0,    0,    0,    0,    0,    277,  0,    0,    0,    0,    0,    0,    0,
-    0,    0,    0,    0,    0,    0,    0,    0,    0,    280,  0,    0,    0,    0,    0,    0,
-    0,    0,    71,   75,   72,   282,  283,  284,  0,    286,  287,  288,  289,  290,  291,  0,
-    0,    278,  285,  268,  258,  276,  0,    260,  279,  0,    0,    0,    0,    0,    0,    265,
-    0,    0,    281,  257,  267,  76,   266,  51,   73,   46,   0,    0,    0,    0,    0,    273,
-    0,    44,   67,   54,   74,   0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    68,
-    0,    0,    0,    254,  255,  256,  0,    0,    259,  261,  262,  0,    0,    263,  0,    264,
-    0,    0,    0,    269,  270,  0,    271,  0,    0,    0,    0,    0,    0,    55,   272,  274,
-    275,  0,    347,  0,    0,    0,    0,    0,    0,    0,    0,    277,  0,    0,    0,    348,
-    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    280,  0,    0,    0,
-    0,    0,    0,    0,    349,  71,   75,   72,   282,  283,  284,  0,    286,  287,  288,  289,
-    290,  291,  0,    0,    278,  285,  268,  258,  276,  0,    260,  279,  0,    0,    0,    0,
-    0,    0,    265,  0,    0,    281,  257,  267,  76,   266,  51,   73,   46,   0,    0,    0,
-    0,    0,    273,  0,    44,   67,   54,   74,   0,    0,    0,    0,    0,    0,    0,    0,
-    0,    0,    68,   0,    0,    0,    254,  255,  256,  0,    0,    259,  261,  262,  0,    0,
-    263,  0,    264,  0,    0,    0,    269,  270,  0,    271,  0,    0,    0,    0,    0,    0,
-    55,   272,  274,  275,  0,    347,  0,    0,    0,    0,    0,    0,    0,    0,    277,  0,
-    0,    0,    348,  0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    280,
-    0,    0,    0,    529,  0,    0,    0,    349,  71,   75,   72,   282,  283,  284,  0,    286,
-    287,  288,  289,  290,  291,  0,    0,    278,  285,  268,  258,  276,  0,    260,  279,  0,
-    0,    0,    0,    0,    0,    265,  0,    0,    281,  257,  267,  76,   266,  51,   73,   46,
-    0,    0,    0,    0,    0,    273,  0,    44,   67,   526,  528,  0,    0,    0,    0,    0,
-    0,    0,    0,    0,    0,    68,   0,    0,    0,    254,  255,  256,  0,    0,    259,  261,
-    262,  0,    0,    263,  0,    264,  0,    0,    0,    269,  270,  0,    271,  0,    0,    0,
-    0,    0,    0,    55,   272,  274,  275,  0,    347,  0,    0,    0,    0,    0,    0,    0,
-    0,    277,  0,    0,    0,    348,  0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-    0,    0,    280,  0,    527,  0,    529,  0,    0,    0,    349,  71,   75,   72,   282,  283,
-    284,  0,    286,  287,  288,  289,  290,  291,  0,    0,    278,  285,  268,  258,  276,  0,
-    260,  279,  0,    0,    0,    0,    0,    0,    265,  0,    0,    281,  257,  267,  530,  266,
-    51,   73,   46,   0,    0,    0,    0,    0,    273,  0,    44,   67,   526,  528,  0,    0,
-    0,    0,    0,    0,    0,    0,    0,    0,    68,   0,    0,    0,    254,  255,  256,  0,
-    0,    259,  261,  262,  0,    0,    263,  0,    264,  0,    0,    0,    269,  270,  0,    271,
-    0,    0,    0,    0,    0,    0,    55,   272,  274,  275,  0,    347,  0,    0,    0,    0,
-    0,    0,    0,    0,    277,  0,    0,    0,    348,  0,    0,    0,    0,    0,    0,    0,
-    0,    728,  0,    0,    0,    280,  0,    0,    0,    529,  0,    0,    0,    349,  71,   75,
-    72,   282,  283,  284,  0,    286,  287,  288,  289,  290,  291,  0,    0,    278,  285,  268,
-    258,  276,  0,    260,  279,  0,    0,    0,    0,    0,    0,    265,  0,    0,    281,  257,
-    267,  76,   266,  51,   73,   46,   0,    0,    0,    0,    0,    273,  0,    44,   67,   526,
-    528,  0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    68,   0,    0,    0,    254,
-    255,  256,  0,    0,    259,  261,  262,  0,    0,    263,  0,    264,  0,    0,    0,    269,
-    270,  0,    271,  0,    0,    0,    0,    0,    0,    55,   272,  274,  275,  0,    347,  0,
-    0,    0,    0,    0,    0,    0,    0,    277,  0,    0,    0,    348,  0,    0,    0,    0,
-    0,    0,    0,    0,    733,  0,    0,    0,    280,  0,    0,    0,    529,  0,    0,    0,
-    349,  71,   75,   72,   282,  283,  284,  0,    286,  287,  288,  289,  290,  291,  0,    0,
-    278,  285,  268,  258,  276,  0,    260,  279,  0,    0,    0,    0,    0,    0,    265,  0,
-    0,    281,  257,  267,  76,   266,  51,   73,   46,   0,    0,    0,    0,    0,    273,  0,
-    44,   67,   526,  528,  0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    68,   0,
-    0,    0,    143,  0,    0,    0,    0,    144,  0,    47,   48,   49,   146,  0,    0,    0,
-    0,    0,    0,    147,  53,   52,   0,    0,    0,    0,    0,    0,    55,   150,  0,    0,
-    56,   57,   0,    58,   0,    0,    0,    59,   0,    60,   62,   63,   0,    0,    66,   0,
-    0,    0,    0,    69,   0,    70,   0,    0,    0,    0,    0,    151,  0,    152,  0,    0,
-    0,    0,    0,    77,   71,   75,   72,   153,  80,   154,  81,   155,  83,   156,  84,   157,
-    158,  0,    0,    65,   82,   50,   0,    0,    0,    145,  0,    61,   0,    0,    0,    0,
-    0,    0,    0,    159,  78,   45,   0,    76,   0,    51,   73,   46,   64,   79,   0,    0,
-    0,    0,    0,    44,   67,   54,   74,   0,    0,    0,    0,    0,    0,    0,    0,    148,
-    0,    68,   0,    0,    0,    143,  0,    0,    0,    0,    144,  0,    47,   48,   49,   146,
-    0,    0,    0,    0,    0,    0,    147,  53,   52,   0,    0,    0,    0,    0,    0,    55,
-    150,  0,    0,    56,   57,   0,    58,   0,    0,    0,    59,   0,    60,   62,   63,   0,
-    0,    66,   0,    0,    0,    0,    69,   0,    70,   0,    0,    0,    0,    0,    151,  0,
-    152,  0,    0,    0,    0,    0,    77,   71,   75,   72,   153,  80,   154,  81,   155,  83,
-    156,  84,   157,  158,  0,    0,    65,   82,   50,   0,    0,    0,    145,  0,    61,   0,
-    0,    0,    0,    0,    0,    0,    159,  78,   45,   0,    76,   0,    51,   73,   46,   64,
-    79,   0,    0,    0,    0,    0,    44,   67,   54,   74,   0,    0,    0,    0,    0,    0,
-    0,    149,  148,  0,    68,   0,    0,    0,    143,  0,    0,    0,    0,    144,  0,    47,
-    48,   49,   146,  0,    0,    0,    0,    0,    0,    147,  53,   52,   0,    0,    0,    0,
-    0,    0,    55,   150,  0,    0,    56,   57,   0,    58,   0,    0,    0,    59,   0,    60,
-    62,   63,   0,    0,    1019, 0,    0,    0,    0,    69,   0,    70,   0,    0,    0,    0,
-    0,    151,  0,    152,  0,    0,    0,    0,    0,    1020, 71,   75,   72,   153,  80,   154,
-    81,   155,  83,   156,  84,   157,  158,  0,    0,    65,   82,   50,   0,    0,    0,    145,
-    0,    61,   0,    0,    0,    0,    0,    0,    0,    159,  78,   45,   0,    76,   0,    51,
-    73,   46,   64,   79,   0,    0,    0,    0,    0,    44,   67,   54,   74,   0,    0,    0,
-    0,    0,    0,    0,    149,  148,  0,    68,   0,    0,    0,    143,  0,    0,    0,    0,
-    144,  0,    47,   48,   49,   146,  0,    0,    0,    0,    0,    0,    147,  53,   52,   0,
+    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    68,   0,
+    0,    0,    47,   48,   49,   0,    0,    0,    0,    0,    0,    0,    0,    53,   52,   0,
     0,    0,    0,    0,    0,    55,   150,  0,    0,    56,   57,   0,    58,   0,    0,    0,
     59,   0,    60,   62,   63,   0,    0,    66,   0,    0,    0,    0,    69,   0,    70,   0,
-    0,    0,    0,    0,    151,  0,    152,  0,    0,    0,    0,    0,    77,   71,   75,   72,
+    0,    0,    0,    0,    0,    0,    152,  0,    0,    0,    0,    0,    77,   71,   75,   72,
+    153,  80,   0,    81,   155,  83,   0,    84,   0,    158,  0,    0,    65,   82,   50,   0,
+    0,    0,    0,    0,    61,   0,    0,    0,    0,    0,    0,    0,    159,  78,   45,   0,
+    76,   0,    51,   73,   46,   64,   79,   0,    0,    0,    0,    0,    44,   67,   54,   74,
+    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    1014, 1013,
+    0,    68,   0,    0,    0,    47,   48,   49,   0,    0,    0,    0,    0,    0,    0,    0,
+    53,   52,   0,    0,    0,    0,    0,    0,    55,   150,  0,    0,    56,   1061, 0,    58,
+    0,    0,    0,    59,   0,    60,   62,   63,   0,    0,    66,   0,    0,    0,    0,    69,
+    0,    70,   0,    0,    0,    0,    0,    0,    0,    152,  0,    0,    0,    0,    0,    77,
+    71,   75,   72,   153,  80,   0,    81,   155,  83,   0,    84,   0,    158,  0,    0,    65,
+    82,   50,   0,    0,    0,    0,    0,    61,   0,    0,    0,    0,    0,    0,    0,    159,
+    78,   45,   0,    76,   0,    51,   73,   46,   64,   79,   0,    0,    0,    0,    0,    44,
+    67,   54,   74,   0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
+    0,    1014, 1013, 0,    68,   0,    0,    0,    47,   48,   49,   0,    0,    0,    0,    0,
+    0,    0,    0,    53,   52,   0,    0,    0,    0,    0,    0,    55,   150,  0,    0,    56,
+    1015, 0,    58,   0,    0,    0,    59,   0,    60,   62,   63,   0,    0,    66,   0,    0,
+    0,    0,    69,   0,    70,   0,    0,    0,    0,    0,    0,    0,    152,  0,    0,    0,
+    0,    0,    77,   71,   75,   72,   153,  80,   0,    81,   155,  83,   0,    84,   0,    158,
+    0,    0,    65,   82,   50,   0,    0,    0,    0,    0,    61,   0,    0,    0,    0,    0,
+    0,    0,    159,  78,   45,   0,    76,   0,    51,   73,   46,   64,   79,   0,    0,    0,
+    0,    0,    44,   67,   54,   74,   0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
+    0,    0,    0,    0,    1014, 1013, 0,    68,   0,    0,    0,    257,  258,  259,  0,    0,
+    262,  264,  265,  0,    0,    266,  0,    267,  0,    0,    0,    272,  273,  0,    274,  0,
+    0,    0,    0,    0,    0,    55,   275,  277,  278,  0,    0,    0,    0,    0,    0,    0,
+    0,    0,    0,    280,  0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
+    0,    0,    0,    0,    283,  0,    0,    0,    0,    0,    0,    0,    0,    71,   75,   72,
+    285,  286,  287,  0,    289,  290,  291,  292,  293,  294,  0,    0,    281,  288,  271,  261,
+    279,  0,    263,  282,  0,    0,    0,    0,    0,    0,    268,  0,    0,    284,  260,  270,
+    76,   269,  51,   73,   46,   0,    0,    0,    0,    0,    276,  0,    44,   67,   54,   74,
+    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
+    0,    68,   0,    0,    0,    257,  258,  259,  0,    0,    262,  264,  265,  0,    0,    266,
+    0,    267,  0,    0,    0,    272,  273,  0,    274,  0,    0,    0,    0,    0,    0,    55,
+    275,  277,  278,  0,    298,  0,    0,    0,    0,    0,    0,    0,    0,    280,  0,    0,
+    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    283,  0,
+    0,    0,    0,    0,    0,    0,    0,    71,   75,   72,   285,  286,  287,  0,    289,  290,
+    291,  292,  293,  294,  0,    0,    281,  288,  271,  261,  279,  0,    263,  282,  0,    0,
+    0,    0,    0,    0,    268,  0,    0,    284,  260,  270,  76,   269,  51,   73,   46,   0,
+    0,    0,    0,    0,    276,  0,    44,   67,   54,   74,   0,    0,    0,    0,    0,    0,
+    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    68,   0,    0,    0,    257,
+    258,  259,  0,    0,    262,  264,  265,  0,    0,    266,  0,    267,  0,    0,    0,    272,
+    273,  0,    274,  0,    0,    0,    0,    0,    0,    55,   275,  277,  278,  0,    0,    0,
+    0,    0,    0,    0,    0,    0,    0,    280,  0,    0,    0,    0,    0,    0,    0,    0,
+    0,    0,    0,    0,    840,  0,    0,    0,    283,  0,    0,    0,    0,    0,    0,    0,
+    0,    71,   75,   72,   285,  286,  287,  0,    289,  290,  291,  292,  293,  294,  0,    0,
+    281,  288,  271,  261,  279,  0,    263,  282,  0,    0,    0,    0,    0,    0,    268,  0,
+    0,    284,  260,  270,  76,   269,  51,   73,   46,   0,    0,    0,    0,    0,    276,  0,
+    44,   67,   54,   74,   0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
+    0,    0,    0,    0,    0,    68,   0,    0,    0,    257,  258,  259,  0,    0,    262,  264,
+    265,  0,    0,    266,  0,    267,  0,    0,    0,    272,  273,  0,    274,  0,    0,    0,
+    0,    0,    0,    55,   275,  277,  278,  0,    0,    0,    0,    0,    0,    0,    0,    0,
+    0,    280,  0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    867,  0,
+    0,    0,    283,  0,    0,    0,    0,    0,    0,    0,    0,    71,   75,   72,   285,  286,
+    287,  0,    289,  290,  291,  292,  293,  294,  0,    0,    281,  288,  271,  261,  279,  0,
+    263,  282,  0,    0,    0,    0,    0,    0,    268,  0,    0,    284,  260,  270,  76,   269,
+    51,   73,   46,   0,    0,    0,    0,    0,    276,  0,    44,   67,   54,   74,   0,    0,
+    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    68,
+    0,    0,    0,    257,  258,  259,  0,    0,    262,  264,  265,  0,    0,    266,  0,    267,
+    0,    0,    0,    272,  273,  0,    274,  0,    0,    0,    0,    0,    0,    55,   275,  277,
+    278,  0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    280,  0,    0,    0,    0,
+    0,    0,    0,    0,    0,    0,    0,    0,    861,  0,    0,    0,    283,  0,    0,    0,
+    0,    0,    0,    0,    0,    71,   75,   72,   285,  286,  287,  0,    289,  290,  291,  292,
+    293,  294,  0,    0,    281,  288,  271,  261,  279,  0,    263,  282,  0,    0,    0,    0,
+    0,    0,    268,  0,    0,    284,  260,  270,  76,   269,  51,   73,   46,   0,    0,    0,
+    0,    0,    276,  0,    44,   67,   54,   74,   0,    0,    0,    0,    0,    0,    0,    0,
+    0,    0,    0,    0,    0,    0,    0,    0,    0,    68,   0,    0,    0,    257,  258,  259,
+    0,    0,    262,  264,  265,  0,    0,    266,  0,    267,  0,    0,    0,    272,  273,  0,
+    274,  0,    0,    0,    0,    0,    0,    55,   275,  277,  278,  0,    0,    0,    0,    0,
+    0,    0,    0,    0,    0,    280,  0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
+    0,    0,    836,  0,    0,    0,    283,  0,    0,    0,    0,    0,    0,    0,    0,    71,
+    75,   72,   285,  286,  287,  0,    289,  290,  291,  292,  293,  294,  0,    0,    281,  288,
+    271,  261,  279,  0,    263,  282,  0,    0,    0,    0,    0,    0,    268,  0,    0,    284,
+    260,  270,  76,   269,  51,   73,   46,   0,    0,    0,    0,    0,    276,  0,    44,   67,
+    54,   74,   0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
+    0,    0,    0,    68,   0,    0,    0,    257,  258,  259,  0,    0,    262,  264,  265,  0,
+    0,    266,  0,    267,  0,    0,    0,    272,  273,  0,    274,  0,    0,    0,    0,    0,
+    0,    55,   275,  277,  278,  0,    298,  0,    677,  0,    0,    0,    0,    0,    0,    280,
+    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
+    283,  0,    0,    0,    0,    0,    0,    0,    0,    71,   75,   72,   285,  286,  287,  0,
+    289,  290,  291,  292,  293,  294,  0,    0,    281,  288,  271,  261,  279,  0,    263,  282,
+    0,    0,    0,    0,    0,    0,    268,  0,    0,    284,  260,  270,  76,   269,  51,   73,
+    46,   0,    0,    0,    0,    0,    276,  0,    44,   67,   54,   74,   0,    0,    0,    0,
+    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    68,   0,    0,
+    0,    257,  258,  259,  0,    0,    262,  264,  265,  0,    0,    266,  0,    267,  0,    0,
+    0,    272,  273,  0,    274,  0,    0,    0,    0,    0,    0,    55,   275,  277,  278,  0,
+    657,  0,    658,  0,    0,    0,    0,    0,    0,    280,  0,    0,    0,    0,    0,    0,
+    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    283,  0,    0,    0,    0,    0,
+    0,    0,    0,    71,   75,   72,   285,  286,  287,  0,    289,  290,  291,  292,  293,  294,
+    0,    0,    281,  288,  271,  261,  279,  0,    263,  282,  0,    0,    0,    0,    0,    0,
+    268,  0,    0,    284,  260,  270,  76,   269,  51,   73,   46,   0,    0,    0,    0,    0,
+    276,  0,    44,   67,   54,   74,   0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
+    0,    0,    0,    0,    0,    0,    0,    68,   0,    0,    0,    257,  258,  259,  0,    0,
+    262,  264,  265,  0,    0,    266,  0,    267,  0,    0,    0,    272,  273,  0,    274,  0,
+    0,    0,    0,    0,    0,    55,   275,  277,  278,  0,    348,  0,    0,    0,    0,    0,
+    0,    0,    0,    280,  0,    0,    0,    349,  0,    0,    0,    0,    0,    0,    0,    0,
+    0,    0,    0,    0,    283,  0,    0,    0,    0,    0,    0,    0,    350,  71,   75,   72,
+    285,  286,  287,  0,    289,  290,  291,  292,  293,  294,  0,    0,    281,  288,  271,  261,
+    279,  0,    263,  282,  0,    0,    0,    0,    0,    0,    268,  0,    0,    284,  260,  270,
+    76,   269,  51,   73,   46,   0,    0,    0,    0,    0,    276,  0,    44,   67,   54,   74,
+    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
+    0,    68,   0,    0,    0,    257,  258,  259,  0,    0,    262,  264,  265,  0,    0,    266,
+    0,    267,  0,    0,    0,    272,  273,  0,    274,  0,    0,    0,    0,    0,    0,    55,
+    275,  277,  278,  0,    348,  0,    0,    0,    0,    0,    0,    0,    0,    280,  0,    0,
+    0,    349,  0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    283,  0,
+    0,    0,    529,  0,    0,    0,    350,  71,   75,   72,   285,  286,  287,  0,    289,  290,
+    291,  292,  293,  294,  0,    0,    281,  288,  271,  261,  279,  0,    263,  282,  0,    0,
+    0,    0,    0,    0,    268,  0,    0,    284,  260,  270,  76,   269,  51,   73,   46,   0,
+    0,    0,    0,    0,    276,  0,    44,   67,   526,  528,  0,    0,    0,    0,    0,    0,
+    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    68,   0,    0,    0,    257,
+    258,  259,  0,    0,    262,  264,  265,  0,    0,    266,  0,    267,  0,    0,    0,    272,
+    273,  0,    274,  0,    0,    0,    0,    0,    0,    55,   275,  277,  278,  0,    348,  0,
+    0,    0,    0,    0,    0,    0,    0,    280,  0,    0,    0,    349,  0,    0,    0,    0,
+    0,    0,    0,    0,    0,    0,    0,    0,    283,  0,    527,  0,    529,  0,    0,    0,
+    350,  71,   75,   72,   285,  286,  287,  0,    289,  290,  291,  292,  293,  294,  0,    0,
+    281,  288,  271,  261,  279,  0,    263,  282,  0,    0,    0,    0,    0,    0,    268,  0,
+    0,    284,  260,  270,  530,  269,  51,   73,   46,   0,    0,    0,    0,    0,    276,  0,
+    44,   67,   526,  528,  0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
+    0,    0,    0,    0,    0,    68,   0,    0,    0,    257,  258,  259,  0,    0,    262,  264,
+    265,  0,    0,    266,  0,    267,  0,    0,    0,    272,  273,  0,    274,  0,    0,    0,
+    0,    0,    0,    55,   275,  277,  278,  0,    348,  0,    0,    0,    0,    0,    0,    0,
+    0,    280,  0,    0,    0,    349,  0,    0,    0,    0,    0,    0,    0,    0,    733,  0,
+    0,    0,    283,  0,    0,    0,    529,  0,    0,    0,    350,  71,   75,   72,   285,  286,
+    287,  0,    289,  290,  291,  292,  293,  294,  0,    0,    281,  288,  271,  261,  279,  0,
+    263,  282,  0,    0,    0,    0,    0,    0,    268,  0,    0,    284,  260,  270,  76,   269,
+    51,   73,   46,   0,    0,    0,    0,    0,    276,  0,    44,   67,   526,  528,  0,    0,
+    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    68,
+    0,    0,    0,    257,  258,  259,  0,    0,    262,  264,  265,  0,    0,    266,  0,    267,
+    0,    0,    0,    272,  273,  0,    274,  0,    0,    0,    0,    0,    0,    55,   275,  277,
+    278,  0,    348,  0,    0,    0,    0,    0,    0,    0,    0,    280,  0,    0,    0,    349,
+    0,    0,    0,    0,    0,    0,    0,    0,    728,  0,    0,    0,    283,  0,    0,    0,
+    529,  0,    0,    0,    350,  71,   75,   72,   285,  286,  287,  0,    289,  290,  291,  292,
+    293,  294,  0,    0,    281,  288,  271,  261,  279,  0,    263,  282,  0,    0,    0,    0,
+    0,    0,    268,  0,    0,    284,  260,  270,  76,   269,  51,   73,   46,   0,    0,    0,
+    0,    0,    276,  0,    44,   67,   526,  528,  0,    0,    0,    0,    0,    0,    0,    0,
+    0,    0,    0,    0,    0,    0,    0,    0,    0,    68,   0,    0,    0,    143,  0,    0,
+    0,    0,    144,  0,    47,   48,   49,   146,  0,    0,    0,    0,    0,    0,    147,  53,
+    52,   0,    0,    0,    0,    0,    0,    55,   150,  0,    0,    56,   57,   0,    58,   0,
+    0,    0,    59,   0,    60,   62,   63,   0,    0,    66,   0,    0,    0,    0,    69,   0,
+    70,   0,    0,    0,    0,    0,    151,  0,    152,  0,    0,    0,    0,    0,    77,   71,
+    75,   72,   153,  80,   154,  81,   155,  83,   156,  84,   157,  158,  0,    0,    65,   82,
+    50,   0,    0,    0,    145,  0,    61,   0,    0,    0,    0,    0,    0,    0,    159,  78,
+    45,   0,    76,   0,    51,   73,   46,   64,   79,   0,    0,    0,    0,    0,    44,   67,
+    54,   74,   0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
+    0,    148,  0,    68,   0,    0,    0,    143,  0,    0,    0,    0,    144,  0,    47,   48,
+    49,   146,  0,    0,    0,    0,    0,    0,    147,  53,   52,   0,    0,    0,    0,    0,
+    0,    55,   150,  0,    0,    56,   57,   0,    58,   0,    0,    0,    59,   0,    60,   62,
+    63,   0,    0,    66,   0,    0,    0,    0,    69,   0,    70,   0,    0,    0,    0,    0,
+    151,  0,    152,  0,    0,    0,    0,    0,    77,   71,   75,   72,   153,  80,   154,  81,
+    155,  83,   156,  84,   157,  158,  0,    0,    65,   82,   50,   0,    0,    0,    145,  0,
+    61,   0,    0,    0,    0,    0,    0,    0,    159,  78,   45,   0,    76,   0,    51,   73,
+    46,   64,   79,   0,    0,    0,    0,    0,    44,   67,   54,   74,   0,    0,    0,    0,
+    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    149,  148,  0,    68,   0,    0,
+    0,    143,  0,    0,    0,    0,    144,  0,    47,   48,   49,   146,  0,    0,    0,    0,
+    0,    0,    147,  53,   52,   0,    0,    0,    0,    0,    0,    55,   150,  0,    0,    56,
+    57,   0,    58,   0,    0,    0,    59,   0,    60,   62,   63,   0,    0,    66,   0,    0,
+    0,    0,    69,   0,    70,   0,    0,    0,    0,    0,    151,  0,    152,  0,    0,    0,
+    0,    0,    77,   71,   75,   72,   153,  80,   154,  81,   155,  83,   156,  84,   157,  158,
+    0,    0,    65,   82,   50,   0,    0,    0,    145,  0,    61,   0,    0,    0,    0,    0,
+    0,    0,    159,  78,   45,   0,    76,   0,    51,   73,   46,   64,   79,   0,    0,    0,
+    0,    0,    44,   67,   54,   74,   0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
+    0,    0,    0,    0,    222,  148,  0,    68,   0,    0,    0,    143,  0,    0,    0,    0,
+    144,  0,    47,   48,   49,   146,  0,    0,    0,    0,    0,    0,    147,  53,   52,   0,
+    0,    0,    0,    0,    0,    55,   150,  0,    0,    56,   57,   0,    58,   0,    0,    0,
+    59,   0,    60,   62,   63,   0,    0,    1022, 0,    0,    0,    0,    69,   0,    70,   0,
+    0,    0,    0,    0,    151,  0,    152,  0,    0,    0,    0,    0,    1023, 71,   75,   72,
     153,  80,   154,  81,   155,  83,   156,  84,   157,  158,  0,    0,    65,   82,   50,   0,
     0,    0,    145,  0,    61,   0,    0,    0,    0,    0,    0,    0,    159,  78,   45,   0,
     76,   0,    51,   73,   46,   64,   79,   0,    0,    0,    0,    0,    44,   67,   54,   74,
-    0,    0,    0,    0,    0,    0,    0,    222,  148,  0,    68,   0,    0,    0,
+    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    149,  148,
+    0,    68,   0,    0,    0,
 
-    715,  714,  719,  720,  1085, 721,  711,  729,  708,  707,  706,  705,  1080, 702,  701,  700,
-    699,  1083, 735,  650,  691,  1079, 748,  688,  638,  640,  742,  250,  686,  1067, 689,  685,
-    1066, 716,  1064, 250,  1075, 1062, 250,  1050, 1048, 665,  1036, 659,  1033, 111,  250,  652,
-    132,  376,  1030, 1031, 1029, 640,  398,  771,  422,  638,  628,  132,  132,  599,  597,  629,
-    790,  1086, 627,  617,  622,  1035, 620,  613,  632,  1034, 604,  1015, 598,  610,  250,  611,
-    596,  168,  843,  593,  590,  801,  594,  804,  586,  578,  169,  576,  171,  1038, 1003, 567,
-    566,  570,  172,  565,  1001, 561,  820,  173,  821,  999,  828,  564,  558,  819,  822,  559,
-    826,  991,  827,  990,  557,  556,  988,  547,  549,  546,  548,  1000, 830,  542,  541,  832,
-    540,  539,  205,  981,  978,  979,  207,  217,  971,  982,  132,  516,  252,  503,  853,  960,
-    327,  365,  457,  512,  499,  250,  292,  497,  485,  308,  323,  907,  908,  296,  250,  301,
-    909,  958,  470,  475,  470,  468,  315,  332,  311,  313,  326,  334,  333,  394,  451,  335,
-    445,  923,  359,  397,  132,  917,  916,  405,  432,  873,  437,  390,  914,  434,  456,  350,
-    457,  453,  391,  430,  252,  403,  634,  426,  357,  634,  422,  422,  358,  915,  252,  439,
-    422,  743,  370,  744,  227,  683,  399,  399,  227,  694,  227,  709,  308,  308,  736,  738,
-    252,  752,  751,  1069, 1068, 399,  1041, 308,  463,  1042, 227,  709,  422,  399,  308,  227,
-    694,  252,  308,  681,  678,  252,  227,  910,  422,  422,  634,  481,  634,  252,  675,  227,
-    498,  252,  393,  294,  252,  661,  399,  396,  400,  654,  1018, 491,  421,  424,  227,  515,
-    252,  962,  459,  619,  656,  224,  574,  0,    651,  399,  227,  226,  227,  226,  572,  252,
-    300,  221,  791,  0,    294,  252,  399,  251,  968,  855,  856,  975,  252,  252,  461,  252,
-    392,  399,  252,  835,  399,  395,  634,  227,  230,  369,  477,  479,  399,  223,  252,  219,
-    227,  230,  976,  29,   227,  230,  227,  230,  252,  787,  42,   872,  0,    534,  543,  842,
-    0,    550,  227,  498,  0,    227,  441,  227,  464,  0,    227,  230,  690,  560,  343,  844,
-    227,  230,  227,  230,  227,  230,  687,  723,  227,  448,  93,   835,  227,  355,  227,  230,
-    372,  757,  227,  230,  217,  227,  515,  227,  844,  92,   227,  844,  491,  635,  798,  635,
-    0,    857,  227,  230,  227,  230,  727,  724,  343,  338,  93,   485,  227,  336,  227,  606,
-    227,  844,  227,  623,  227,  508,  223,  93,   303,  92,   568,  227,  623,  93,   0,    777,
-    93,   93,   11,   343,  844,  0,    92,   346,  770,  0,    227,  508,  92,   0,    0,    92,
-    92,   93,   93,   0,    93,   0,    93,   29,   0,    787,  94,   0,    533,  831,  42,   0,
-    92,   92,   0,    92,   93,   92,   857,  94,   817,  443,  779,  465,  712,  94,   717,  210,
-    94,   94,   0,    92,   0,    552,  766,  197,  723,  227,  472,  793,  449,  0,    200,  202,
-    356,  94,   94,   823,  94,   0,    94,   0,    697,  641,  703,  0,    912,  242,  0,    0,
-    93,   176,  0,    732,  212,  792,  824,  727,  724,  839,  93,   208,  106,  0,    562,  92,
-    337,  93,   607,  615,  514,  0,    624,  223,  510,  92,   234,  829,  501,  631,  93,   624,
-    92,   1061, 29,   775,  29,   93,   11,   227,  230,  42,   511,  42,   812,  92,   510,  93,
-    94,   399,  869,  0,    92,   863,  196,  455,  330,  0,    94,   29,   419,  93,   92,   0,
-    195,  94,   42,   93,   761,  0,    747,  0,    198,  436,  440,  846,  92,   93,   94,   29,
-    29,   102,  92,   667,  29,   94,   42,   42,   0,    103,  474,  42,   92,   473,  29,   94,
-    866,  29,   29,   95,   0,    42,   343,  338,  42,   42,   241,  29,   0,    94,   93,   0,
-    93,   93,   42,   94,   191,  0,    242,  246,  0,    93,   0,    182,  0,    92,   0,    92,
-    92,   11,   93,   11,   0,    346,  0,    0,    92,   0,    0,    0,    0,    806,  0,    809,
-    0,    92,   241,  0,    0,    0,    93,   93,   0,    242,  11,   0,    998,  762,  94,   693,
-    764,  94,   329,  0,    0,    92,   92,   93,   42,   94,   693,  763,  93,   0,    11,   11,
-    0,    0,    94,   11,   0,    670,  92,   808,  241,  42,   0,    92,   93,   11,   93,   242,
-    11,   11,   932,  0,    672,  811,  93,   94,   693,  760,  11,   92,   93,   92,   0,    227,
-    230,  0,    408,  0,    93,   92,   0,    94,   693,  759,  93,   92,   94,   693,  765,  352,
-    372,  373,  0,    92,   93,   93,   0,    242,  241,  92,   0,    93,   94,   693,  772,  93,
-    93,   0,    995,  92,   92,   0,    94,   693,  773,  241,  92,   0,    94,   0,    92,   92,
-    0,    227,  230,  42,   94,   0,    1049, 0,    637,  0,    94,   42,   241,  242,  0,    0,
-    0,    42,   372,  639,  93,   94,   693,  692,  0,    246,  668,  94,   693,  774,  0,    94,
-    94,   241,  0,    92,   241,  93,   42,   42,   241,  983,  0,    1074, 0,    241,  645,  643,
-    0,    246,  926,  0,    92,   901,  1071, 1072, 93,   0,    0,    322,  411,  242,  929,  241,
-    0,    0,    0,    42,   0,    0,    0,    92,   0,    0,    371,  241,  901,  93,   242,  0,
-    93,   0,    903,  318,  93,   0,    0,    1043, 901,  93,   0,    0,    92,   0,    0,    92,
-    0,    242,  0,    92,   1045, 0,    0,    0,    92,   903,  1006, 93,   1005, 1007, 1014, 1009,
-    1012, 0,    1008, 412,  416,  903,  242,  93,   0,    242,  92,   0,    371,  242,  0,    1013,
-    0,    0,    242,  0,    241,  1006, 92,   1005, 1007, 1014, 1009, 1012, 983,  0,    0,    0,
-    0,    901,  984,  0,    242,  0,    0,    0,    0,    0,    0,    11,   0,    0,    0,    0,
-    242,  0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    903,  0,
-    93,   0,    0,    0,    1008, 0,    0,    0,    0,    0,    0,    0,    0,    0,    995,  92,
-    1046, 0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-    0,    0,    0,    0,    0,    0,    0,    0,    0,    242,  0,    0,    0,    0,    0,    0,
+    729,  721,  720,  719,  735,  716,  715,  714,  748,  1102, 742,  650,  1097, 711,  708,  1100,
+    707,  706,  705,  700,  702,  701,  699,  638,  1096, 253,  691,  640,  1084, 688,  686,  1083,
+    253,  1081, 253,  689,  685,  1092, 1079, 1067, 771,  253,  1054, 1065, 665,  1053, 1055, 659,
+    1048, 111,  790,  791,  132,  652,  1044, 213,  377,  253,  399,  1036, 423,  640,  1033, 638,
+    597,  132,  1034, 843,  1032, 628,  801,  627,  632,  804,  629,  599,  622,  620,  617,  168,
+    169,  610,  132,  613,  171,  611,  172,  604,  820,  819,  821,  598,  822,  596,  173,  826,
+    827,  830,  593,  1037, 590,  576,  832,  828,  586,  594,  578,  1018, 1005, 1007, 1004, 570,
+    566,  565,  564,  563,  557,  560,  558,  205,  555,  1000, 853,  556,  1047, 545,  547,  207,
+    548,  546,  991,  538,  217,  541,  540,  132,  539,  989,  983,  253,  366,  328,  324,  295,
+    907,  908,  909,  255,  299,  1103, 253,  304,  458,  513,  517,  500,  504,  333,  498,  334,
+    486,  311,  318,  314,  316,  327,  335,  471,  336,  476,  360,  469,  351,  962,  452,  914,
+    915,  446,  916,  395,  391,  398,  471,  392,  923,  917,  132,  438,  406,  358,  458,  404,
+    359,  431,  435,  634,  454,  457,  423,  423,  634,  873,  743,  255,  744,  427,  227,  683,
+    433,  227,  694,  227,  709,  736,  738,  440,  255,  311,  371,  752,  751,  311,  423,  255,
+    464,  1086, 1085, 423,  311,  1058, 423,  400,  1059, 423,  255,  400,  482,  311,  400,  1050,
+    681,  634,  1051, 255,  678,  400,  227,  499,  394,  311,  397,  675,  227,  516,  400,  227,
+    709,  297,  227,  694,  661,  401,  227,  910,  425,  422,  400,  255,  656,  634,  255,  634,
+    654,  255,  255,  619,  492,  651,  1021, 255,  615,  255,  255,  255,  574,  227,  226,  255,
+    460,  227,  226,  400,  255,  462,  572,  393,  478,  396,  221,  480,  255,  303,  227,  230,
+    297,  400,  255,  224,  254,  542,  400,  549,  559,  29,   400,  227,  230,  835,  227,  465,
+    42,   370,  0,    567,  400,  723,  787,  0,    219,  0,    872,  855,  856,  0,    842,  0,
+    227,  230,  227,  230,  835,  344,  844,  227,  230,  373,  757,  223,  0,    217,  227,  844,
+    227,  442,  690,  727,  724,  227,  230,  227,  449,  227,  356,  227,  230,  227,  230,  687,
+    227,  230,  93,   306,  635,  964,  0,    857,  227,  230,  227,  844,  344,  339,  227,  230,
+    92,   227,  516,  227,  230,  227,  606,  227,  499,  227,  844,  227,  337,  227,  623,  93,
+    635,  93,   787,  227,  623,  93,   93,   486,  11,   0,    347,  106,  93,   92,   223,  92,
+    93,   568,  93,   92,   92,   227,  509,  747,  0,    0,    92,   492,  533,  798,  92,   770,
+    92,   466,  0,    29,   93,   551,  831,  227,  509,  0,    42,   93,   227,  230,  94,   29,
+    94,   93,   92,   437,  94,   94,   42,   641,  243,  92,   723,  94,   331,  792,  0,    92,
+    0,    94,   0,    444,  0,    208,  176,  697,  212,  210,  450,  29,   357,  561,  703,  93,
+    202,  839,  42,   94,   732,  0,    344,  844,  727,  724,  94,   182,  912,  92,   93,   766,
+    94,   0,    712,  93,   717,  0,    197,  502,  607,  227,  473,  200,  92,   93,   338,  824,
+    624,  92,   93,   0,    631,  817,  624,  863,  857,  793,  234,  92,   0,    93,   94,   777,
+    92,   420,  11,   93,   515,  191,  829,  823,  511,  29,   93,   92,   441,  94,   11,   0,
+    42,   92,   94,   846,  198,  779,  512,  29,   92,   29,   511,  775,  94,   667,  42,   102,
+    42,   94,   869,  456,  29,   223,  330,  195,  227,  230,  11,   42,   94,   344,  339,  93,
+    103,  812,  94,   29,   1078, 29,   95,   0,    373,  94,   42,   29,   42,   92,   0,    196,
+    0,    0,    42,   93,   0,    1038, 0,    0,    0,    29,   93,   347,  0,    93,   0,    1040,
+    42,   92,   0,    0,    0,    93,   0,    0,    92,   475,  0,    92,   474,  93,   94,   0,
+    0,    93,   0,    92,   0,    42,   0,    93,   11,   0,    0,    92,   0,    0,    761,  92,
+    672,  93,   94,   693,  772,  92,   11,   409,  11,   94,   693,  765,  94,   693,  773,  92,
+    0,    866,  0,    11,   94,   0,    736,  738,  0,    243,  0,    42,   94,   693,  774,  93,
+    637,  806,  11,   809,  11,   1038, 94,   693,  764,  241,  11,   93,   93,   92,   0,    1040,
+    94,   1063, 372,  932,  93,   353,  0,    42,   11,   92,   92,   241,  227,  230,  0,    0,
+    0,    0,    92,   93,   670,  0,    0,    241,  1066, 0,    0,    808,  373,  374,  94,   693,
+    760,  92,   0,    243,  249,  0,    93,   762,  241,  811,  0,    94,   693,  759,  0,    93,
+    93,   0,    1043, 94,   92,   0,    736,  738,  93,   93,   42,   0,    639,  92,   92,   0,
+    0,    412,  94,   241,  93,   0,    92,   92,   42,   42,   241,  992,  0,    1091, 243,  0,
+    0,    0,    92,   241,  241,  93,   0,    901,  668,  0,    0,    0,    1088, 1089, 94,   94,
+    243,  249,  926,  92,   0,    42,   42,   241,  94,   693,  692,  0,    243,  645,  643,  241,
+    93,   988,  0,    0,    249,  903,  0,    93,   413,  417,  0,    0,    901,  243,  92,   0,
+    93,   93,   0,    93,   982,  92,   372,  1010, 0,    1009, 1011, 1017, 1012, 1016, 92,   92,
+    241,  92,   0,    966,  93,   0,    929,  0,    243,  0,    903,  0,    93,   249,  0,    243,
+    11,   0,    92,   241,  241,  0,    0,    985,  243,  243,  92,   0,    0,    978,  0,    0,
+    901,  249,  94,   693,  763,  0,    0,    0,    0,    0,    0,    241,  243,  93,   0,    1060,
+    0,    986,  0,    992,  243,  0,    0,    0,    901,  993,  0,    92,   1062, 0,    903,  0,
+    93,   93,   1010, 0,    1009, 1011, 1017, 1012, 1016, 0,    1038, 0,    0,    0,    92,   92,
+    0,    0,    0,    0,    0,    243,  903,  1052, 93,   0,    0,    0,    0,    1010, 0,    1009,
+    1011, 1017, 1012, 1016, 0,    0,    92,   0,    243,  243,  0,    0,    0,    0,    0,    0,
     0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-    0,    0,    0,    0,    0,    736,  738,  0,    0,    0,    0,    0,    0,    0,    0,    0,
+    243,  0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
+    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
+    0,    0,    0,    0,    241,  0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
+    0,    322,  0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
+    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
+    0,    93,   0,    321,  0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    92,
+    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
+    0,    0,    0,    0,    0,    0,    0,    0,    0,    243,  0,    0,    0,    0,    0,    0,
     0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
     0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
     0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
@@ -1346,452 +1396,483 @@ const short QmlJSGrammar::action_info[] = {
     0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
     0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
     0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-    0,    0,    0};
+    0,    0};
 
 const short QmlJSGrammar::action_check[] = {
-    57,  62,  7,   34,  34,  57,  7,   17,  37,  62,  37,  62,  7,   34,  37,  57,  62,  37,  0,
-    62,  7,   34,  50,  57,  48,  34,  37,  15,  34,  62,  16,  57,  57,  0,   48,  57,  34,  5,
-    57,  5,   34,  34,  96,  5,   104, 57,  7,   17,  17,  34,  8,   7,   7,   57,  34,  62,  20,
-    34,  37,  62,  49,  37,  7,   62,  37,  83,  83,  38,  117, 34,  62,  34,  63,  57,  57,  7,
-    30,  37,  37,  30,  96,  17,  8,   17,  17,  7,   17,  30,  30,  8,   8,   1,   17,  30,  96,
-    52,  8,   2,   7,   34,  30,  0,   83,  52,  57,  34,  7,   2,   52,  17,  62,  34,  62,  17,
-    62,  2,   63,  107, 7,   17,  17,  62,  7,   69,  52,  2,   7,   30,  49,  107, 104, 7,   7,
-    7,   7,   62,  49,  17,  62,  8,   34,  34,  62,  34,  34,  37,  57,  7,   30,  37,  57,  66,
-    7,   37,  7,   34,  62,  57,  7,   37,  62,  57,  34,  34,  8,   35,  83,  34,  34,  17,  8,
-    57,  34,  23,  8,   7,   1,   117, 37,  62,  8,   7,   15,  34,  8,   7,   38,  17,  17,  57,
-    17,  49,  34,  107, 57,  7,   37,  62,  62,  34,  37,  57,  63,  8,   15,  8,   63,  8,   8,
-    63,  30,  57,  1,   8,   8,   8,   63,  62,  15,  32,  7,   -1,  58,  62,  34,  8,   7,   7,
-    25,  8,   8,   62,  8,   8,   8,   8,   8,   58,  8,   56,  8,   81,  8,   62,  15,  63,  64,
-    63,  64,  63,  64,  58,  43,  25,  8,   65,  37,  63,  64,  63,  64,  63,  64,  34,  55,  58,
-    56,  62,  62,  15,  8,   63,  64,  96,  117, 58,  37,  37,  57,  57,  97,  63,  64,  57,  57,
-    8,   62,  62,  58,  35,  58,  8,   58,  100, 63,  64,  63,  64,  63,  64,  115, 116, 8,   6,
-    8,   118, 41,  97,  62,  8,   8,   63,  64,  63,  64,  10,  96,  20,  53,  57,  63,  64,  63,
-    64,  8,   41,  41,  115, 116, 41,  117, 63,  64,  63,  64,  58,  7,   53,  53,  63,  64,  53,
-    63,  64,  8,   62,  26,  26,  28,  28,  37,  26,  58,  28,  58,  7,   117, 117, 30,  39,  39,
-    15,  57,  62,  39,  22,  23,  26,  0,   28,  30,  8,   30,  8,   95,  8,   63,  64,  62,  0,
-    39,  35,  34,  37,  17,  63,  64,  30,  12,  8,   5,   30,  63,  64,  7,   10,  26,  48,  28,
-    63,  64,  8,   -1,  -1,  17,  10,  57,  79,  12,  39,  17,  12,  7,   15,  7,   -1,  -1,  -1,
-    69,  79,  92,  79,  10,  15,  37,  -1,  10,  10,  -1,  -1,  63,  -1,  92,  35,  92,  59,  79,
-    7,   8,   117, 79,  65,  57,  35,  63,  64,  103, 22,  23,  92,  -1,  -1,  -1,  92,  -1,  59,
-    63,  -1,  59,  50,  -1,  65,  -1,  -1,  65,  70,  -1,  72,  63,  64,  63,  64,  63,  64,  106,
-    112, 113, 112, 113, 131, -1,  -1,  70,  115, 72,  106, 70,  70,  72,  72,  24,  25,  -1,  -1,
-    115, 15,  98,  -1,  -1,  33,  -1,  15,  36,  108, 38,  -1,  98,  -1,  110, 111, -1,  -1,  15,
-    88,  89,  35,  -1,  37,  110, 111, 108, 35,  15,  37,  108, 108, 117, -1,  103, 24,  25,  -1,
-    35,  -1,  37,  -1,  -1,  -1,  33,  -1,  15,  36,  35,  38,  37,  122, 123, 124, 125, 126, 127,
-    15,  10,  -1,  -1,  24,  25,  -1,  -1,  34,  35,  -1,  37,  32,  33,  18,  19,  36,  -1,  38,
-    34,  35,  30,  37,  10,  -1,  -1,  -1,  98,  -1,  -1,  -1,  -1,  117, 98,  -1,  22,  23,  -1,
-    -1,  110, 111, -1,  46,  47,  98,  110, 111, 34,  30,  -1,  -1,  -1,  -1,  -1,  98,  -1,  110,
-    111, -1,  -1,  -1,  70,  71,  72,  -1,  15,  110, 111, -1,  -1,  -1,  117, 98,  30,  -1,  -1,
-    -1,  30,  65,  -1,  30,  -1,  -1,  98,  110, 111, -1,  -1,  70,  71,  72,  15,  79,  -1,  -1,
-    110, 111, 117, 107, 108, 109, 88,  89,  -1,  -1,  -1,  30,  -1,  -1,  118, 119, 120, -1,  70,
-    71,  72,  103, 70,  71,  72,  70,  71,  72,  -1,  -1,  107, 108, 109, -1,  -1,  -1,  24,  25,
-    -1,  -1,  -1,  118, 119, 120, 32,  33,  -1,  -1,  36,  -1,  38,  70,  71,  72,  131, 107, 108,
-    109, -1,  107, 108, 109, 107, 108, 109, 30,  118, 119, 120, -1,  118, 119, 120, 118, 119, 120,
-    -1,  -1,  -1,  131, -1,  30,  -1,  131, -1,  -1,  131, -1,  107, 108, 109, -1,  -1,  -1,  -1,
-    -1,  -1,  30,  -1,  118, 119, 120, -1,  -1,  -1,  70,  71,  72,  -1,  -1,  -1,  -1,  131, -1,
-    -1,  -1,  -1,  -1,  -1,  -1,  -1,  70,  71,  72,  -1,  -1,  -1,  -1,  -1,  117, -1,  -1,  -1,
-    -1,  -1,  -1,  -1,  70,  71,  72,  105, -1,  107, 108, 109, -1,  -1,  15,  30,  -1,  -1,  -1,
-    117, 118, 119, 120, 105, -1,  107, 108, 109, -1,  30,  -1,  -1,  -1,  131, 30,  117, 118, 119,
-    120, 105, -1,  107, 108, 109, -1,  -1,  -1,  -1,  -1,  131, -1,  117, 118, 119, 120, 70,  71,
-    72,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  131, -1,  -1,  -1,  70,  71,  72,  -1,  -1,  70,  71,
-    72,  -1,  -1,  -1,  -1,  -1,  -1,  79,  -1,  -1,  -1,  -1,  -1,  -1,  105, 30,  107, 108, 109,
-    -1,  92,  -1,  -1,  -1,  -1,  -1,  117, 118, 119, 120, 107, 108, 109, 30,  -1,  107, 108, 109,
-    -1,  -1,  131, 118, 119, 120, -1,  -1,  118, 119, 120, -1,  -1,  -1,  -1,  -1,  131, 70,  71,
-    72,  30,  131, -1,  -1,  -1,  -1,  79,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  70,  71,  72,
-    -1,  92,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  30,  -1,  -1,  107, 108, 109,
-    -1,  37,  -1,  70,  71,  72,  -1,  -1,  118, 119, 120, -1,  -1,  105, -1,  107, 108, 109, -1,
-    -1,  -1,  131, -1,  -1,  -1,  117, 118, 119, 120, -1,  -1,  -1,  -1,  -1,  70,  71,  72,  30,
-    105, 131, 107, 108, 109, -1,  37,  -1,  -1,  -1,  -1,  -1,  117, 118, 119, 120, -1,  -1,  -1,
-    -1,  -1,  -1,  -1,  -1,  30,  -1,  131, -1,  34,  35,  30,  105, -1,  107, 108, 109, -1,  -1,
-    -1,  70,  71,  72,  -1,  117, 118, 119, 120, -1,  -1,  -1,  -1,  30,  -1,  -1,  -1,  -1,  -1,
-    131, 37,  -1,  -1,  -1,  -1,  -1,  70,  71,  72,  -1,  -1,  -1,  70,  71,  72,  -1,  105, -1,
-    107, 108, 109, -1,  -1,  -1,  -1,  -1,  -1,  -1,  117, 118, 119, 120, -1,  70,  71,  72,  -1,
-    -1,  -1,  -1,  -1,  105, 131, 107, 108, 109, 104, 105, -1,  107, 108, 109, -1,  117, 118, 119,
-    120, -1,  -1,  117, 118, 119, 120, -1,  3,   -1,  -1,  131, 105, -1,  107, 108, 109, 131, 13,
-    -1,  -1,  30,  17,  -1,  117, 118, 119, 120, 37,  -1,  -1,  -1,  27,  -1,  29,  -1,  -1,  -1,
-    131, -1,  3,   -1,  -1,  -1,  -1,  40,  -1,  42,  43,  -1,  13,  -1,  -1,  -1,  17,  -1,  51,
-    -1,  -1,  54,  55,  70,  71,  72,  27,  60,  29,  -1,  -1,  -1,  -1,  -1,  67,  68,  -1,  -1,
-    -1,  40,  -1,  42,  43,  -1,  -1,  30,  -1,  -1,  -1,  -1,  51,  84,  -1,  54,  55,  -1,  -1,
-    -1,  105, 60,  107, 108, 109, 30,  -1,  -1,  67,  68,  -1,  -1,  117, 118, 119, 120, -1,  -1,
-    -1,  -1,  63,  64,  -1,  -1,  -1,  84,  131, 70,  71,  72,  30,  -1,  -1,  -1,  34,  35,  -1,
-    -1,  63,  64,  -1,  -1,  -1,  -1,  -1,  70,  71,  72,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,
-    -1,  -1,  -1,  -1,  -1,  -1,  105, -1,  107, 108, 109, -1,  -1,  -1,  70,  71,  72,  -1,  117,
-    118, 119, 120, -1,  -1,  105, 30,  107, 108, 109, 34,  35,  -1,  131, -1,  -1,  -1,  117, 118,
-    119, 120, -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  105, 131, 107, 108, 109, -1,  -1,  -1,
-    -1,  -1,  -1,  -1,  117, 118, 119, 120, 70,  71,  72,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  131,
-    -1,  -1,  -1,  30,  -1,  -1,  -1,  34,  35,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,
-    100, -1,  -1,  -1,  -1,  105, -1,  107, 108, 109, -1,  -1,  -1,  -1,  -1,  -1,  -1,  117, 118,
-    119, 120, -1,  -1,  -1,  70,  71,  72,  -1,  -1,  -1,  -1,  131, -1,  -1,  -1,  30,  -1,  -1,
-    -1,  34,  35,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,
-    -1,  -1,  105, 30,  107, 108, 109, 34,  -1,  -1,  -1,  -1,  -1,  -1,  117, 118, 119, 120, 70,
-    71,  72,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  131, -1,  -1,  -1,  30,  -1,  -1,  -1,  34,  35,
-    65,  -1,  -1,  -1,  69,  70,  71,  72,  -1,  -1,  100, -1,  -1,  -1,  -1,  105, -1,  107, 108,
-    109, -1,  -1,  -1,  -1,  -1,  -1,  -1,  117, 118, 119, 120, -1,  -1,  -1,  70,  71,  72,  -1,
-    -1,  -1,  105, 131, 107, 108, 109, -1,  -1,  -1,  -1,  -1,  -1,  -1,  117, 118, 119, 120, -1,
-    -1,  -1,  -1,  -1,  -1,  -1,  -1,  100, -1,  131, -1,  -1,  105, -1,  107, 108, 109, -1,  -1,
+    57,  57,  62,  7,   34,  34,  57,  7,   52,  37,  62,  7,   34,  62,  57,  57,  37,  34,  30,
+    7,   7,   16,  62,  0,   30,  50,  1,   30,  30,  34,  15,  5,   5,   2,   0,   83,  7,   5,
+    37,  57,  49,  57,  96,  0,   34,  1,   104, 23,  37,  83,  20,  49,  34,  37,  17,  17,  34,
+    7,   7,   17,  57,  62,  8,   96,  117, 37,  7,   34,  62,  62,  62,  8,   37,  17,  8,   17,
+    7,   57,  8,   62,  117, 96,  63,  2,   17,  37,  34,  34,  52,  34,  8,   1,   83,  107, 30,
+    38,  57,  57,  7,   34,  17,  17,  34,  62,  7,   34,  117, 34,  8,   62,  17,  34,  7,   34,
+    7,   30,  7,   57,  2,   7,   7,   34,  34,  62,  52,  49,  34,  17,  66,  30,  34,  30,  17,
+    30,  17,  37,  62,  62,  34,  7,   62,  7,   62,  7,   7,   34,  57,  17,  34,  63,  104, 57,
+    57,  8,   7,   17,  8,   37,  34,  37,  1,   34,  8,   57,  62,  7,   -1,  -1,  8,   7,   62,
+    38,  8,   34,  25,  7,   57,  37,  57,  8,   62,  7,   57,  48,  7,   62,  57,  37,  62,  37,
+    8,   49,  7,   62,  48,  34,  7,   17,  8,   7,   34,  7,   7,   62,  7,   7,   37,  63,  8,
+    8,   8,   7,   37,  7,   2,   8,   63,  7,   63,  62,  69,  37,  17,  7,   96,  62,  83,  57,
+    63,  62,  57,  52,  17,  37,  58,  8,   58,  8,   8,   -1,  8,   10,  8,   32,  63,  64,  63,
+    64,  8,   63,  64,  63,  64,  81,  63,  64,  63,  64,  7,   8,   8,   41,  41,  107, 7,   56,
+    63,  64,  8,   62,  6,   63,  64,  53,  53,  58,  63,  64,  41,  41,  8,   63,  64,  41,  20,
+    48,  48,  41,  57,  62,  58,  62,  62,  8,   37,  53,  62,  57,  15,  53,  56,  117, 115, 116,
+    63,  64,  97,  8,   25,  43,  63,  64,  96,  117, 62,  8,   8,   100, 63,  64,  8,   55,  62,
+    8,   7,   63,  64,  117, 8,   118, 58,  63,  64,  63,  64,  8,   8,   63,  64,  63,  64,  97,
+    57,  63,  64,  34,  8,   8,   15,  15,  115, 116, 12,  37,  0,   26,  57,  28,  26,  0,   28,
+    15,  12,  8,   7,   58,  58,  34,  39,  35,  58,  39,  57,  30,  7,   26,  65,  28,  8,   63,
+    64,  35,  62,  37,  7,   58,  58,  17,  39,  48,  12,  8,   5,   30,  22,  23,  58,  10,  57,
+    59,  17,  7,   63,  64,  7,   65,  26,  8,   28,  59,  69,  26,  -1,  28,  17,  65,  63,  64,
+    -1,  39,  63,  64,  79,  8,   39,  18,  19,  10,  34,  -1,  63,  64,  30,  63,  37,  92,  10,
+    59,  63,  64,  63,  64,  79,  65,  57,  10,  63,  -1,  95,  22,  23,  -1,  15,  46,  47,  92,
+    18,  19,  10,  8,   106, -1,  18,  19,  -1,  106, -1,  112, 113, 115, -1,  -1,  35,  -1,  115,
+    103, -1,  15,  63,  64,  -1,  79,  15,  -1,  46,  47,  50,  70,  -1,  72,  46,  47,  117, -1,
+    92,  -1,  70,  35,  72,  63,  64,  15,  35,  -1,  37,  70,  15,  72,  57,  15,  -1,  112, 113,
+    -1,  -1,  88,  89,  -1,  70,  -1,  72,  35,  -1,  37,  -1,  108, 35,  -1,  37,  35,  103, 37,
+    138, -1,  108, 98,  -1,  129, 130, 131, 132, 133, 134, 108, -1,  24,  25,  110, 111, 24,  25,
+    -1,  -1,  117, 33,  -1,  108, 36,  33,  38,  98,  36,  -1,  38,  -1,  98,  15,  24,  25,  -1,
+    -1,  -1,  110, 111, -1,  32,  33,  110, 111, 36,  -1,  38,  -1,  -1,  98,  34,  35,  15,  37,
+    98,  10,  -1,  98,  18,  19,  -1,  110, 111, -1,  10,  -1,  110, 111, -1,  110, 111, 34,  35,
+    -1,  37,  30,  22,  23,  -1,  -1,  -1,  30,  -1,  -1,  -1,  -1,  46,  47,  34,  30,  -1,  -1,
+    -1,  -1,  -1,  -1,  30,  -1,  -1,  -1,  -1,  -1,  -1,  117, -1,  -1,  -1,  117, -1,  -1,  -1,
+    -1,  -1,  -1,  98,  70,  71,  72,  -1,  65,  -1,  70,  71,  72,  -1,  117, 110, 111, -1,  70,
+    71,  72,  -1,  79,  -1,  98,  70,  71,  72,  -1,  -1,  -1,  88,  89,  -1,  -1,  -1,  110, 111,
+    -1,  -1,  -1,  107, 108, 109, -1,  -1,  103, 107, 108, 109, 30,  -1,  118, 119, 120, 107, 108,
+    109, 118, 119, 120, -1,  107, 108, 109, 30,  118, 119, 120, -1,  -1,  24,  25,  118, 119, 120,
+    -1,  -1,  138, 32,  33,  -1,  30,  36,  -1,  38,  138, -1,  -1,  -1,  70,  71,  72,  138, -1,
+    -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  70,  71,  72,  30,  -1,  -1,  -1,  -1,  -1,
+    -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  70,  71,  72,  -1,  -1,  107, 108, 109, -1,  -1,  -1,
+    -1,  30,  -1,  -1,  -1,  118, 119, 120, -1,  107, 108, 109, -1,  -1,  -1,  70,  71,  72,  30,
+    -1,  118, 119, 120, -1,  105, 138, 107, 108, 109, -1,  -1,  117, -1,  -1,  -1,  -1,  117, 118,
+    119, 120, 138, 70,  71,  72,  30,  -1,  -1,  -1,  -1,  -1,  105, -1,  107, 108, 109, -1,  15,
+    138, 70,  71,  72,  -1,  117, 118, 119, 120, -1,  -1,  -1,  -1,  -1,  30,  -1,  -1,  -1,  -1,
+    105, -1,  107, 108, 109, -1,  -1,  138, 70,  71,  72,  30,  117, 118, 119, 120, -1,  105, 37,
+    107, 108, 109, -1,  -1,  -1,  -1,  -1,  30,  -1,  117, 118, 119, 120, 138, 37,  70,  71,  72,
+    -1,  -1,  -1,  -1,  -1,  105, -1,  107, 108, 109, -1,  -1,  138, 70,  71,  72,  30,  117, 118,
+    119, 120, -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  70,  71,  72,  -1,  -1,  107, 108, 109, -1,
+    138, -1,  -1,  -1,  30,  -1,  -1,  118, 119, 120, 105, 37,  107, 108, 109, -1,  -1,  -1,  70,
+    71,  72,  -1,  117, 118, 119, 120, 105, 138, 107, 108, 109, 30,  -1,  -1,  -1,  -1,  -1,  -1,
+    117, 118, 119, 120, -1,  138, 70,  71,  72,  -1,  30,  -1,  -1,  -1,  104, 105, -1,  107, 108,
+    109, -1,  138, -1,  -1,  -1,  -1,  -1,  117, 118, 119, 120, -1,  -1,  70,  71,  72,  -1,  -1,
+    -1,  -1,  -1,  105, -1,  107, 108, 109, -1,  -1,  138, -1,  70,  71,  72,  117, 118, 119, 120,
+    -1,  -1,  -1,  -1,  -1,  30,  -1,  -1,  -1,  34,  35,  105, -1,  107, 108, 109, -1,  138, -1,
+    -1,  -1,  -1,  -1,  117, 118, 119, 120, 104, 105, -1,  107, 108, 109, -1,  -1,  -1,  -1,  -1,
+    -1,  -1,  117, 118, 119, 120, 138, 70,  71,  72,  30,  -1,  -1,  -1,  -1,  -1,  -1,  37,  -1,
+    -1,  -1,  -1,  -1,  138, -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,
+    -1,  -1,  -1,  -1,  105, -1,  107, 108, 109, -1,  -1,  -1,  70,  71,  72,  -1,  117, 118, 119,
+    120, -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  3,   30,  -1,  -1,  -1,  34,  35,  138,
+    -1,  -1,  13,  -1,  -1,  -1,  17,  -1,  -1,  105, -1,  107, 108, 109, -1,  -1,  27,  -1,  29,
+    -1,  30,  117, 118, 119, 120, -1,  -1,  -1,  -1,  40,  -1,  42,  43,  70,  71,  72,  -1,  -1,
+    -1,  -1,  51,  -1,  138, 54,  55,  -1,  30,  -1,  -1,  60,  34,  35,  -1,  63,  64,  -1,  67,
+    68,  -1,  -1,  70,  71,  72,  -1,  -1,  3,   -1,  -1,  105, -1,  107, 108, 109, 84,  -1,  13,
+    -1,  -1,  30,  17,  117, 118, 119, 120, -1,  -1,  70,  71,  72,  27,  -1,  29,  -1,  -1,  -1,
+    105, -1,  107, 108, 109, -1,  138, 40,  -1,  42,  43,  -1,  117, 118, 119, 120, 63,  64,  51,
+    -1,  -1,  54,  55,  70,  71,  72,  105, 60,  107, 108, 109, -1,  -1,  138, 67,  68,  -1,  -1,
+    117, 118, 119, 120, -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  84,  -1,  -1,  -1,  -1,  -1,
+    -1,  105, 138, 107, 108, 109, 30,  -1,  -1,  -1,  34,  35,  -1,  117, 118, 119, 120, -1,  -1,
+    -1,  -1,  -1,  30,  -1,  -1,  -1,  34,  35,  -1,  -1,  -1,  -1,  -1,  -1,  138, -1,  -1,  -1,
+    30,  -1,  -1,  -1,  34,  35,  -1,  -1,  70,  71,  72,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,
+    -1,  -1,  -1,  -1,  -1,  70,  71,  72,  30,  -1,  -1,  -1,  34,  35,  -1,  -1,  -1,  -1,  -1,
+    -1,  -1,  70,  71,  72,  105, -1,  107, 108, 109, -1,  -1,  -1,  -1,  -1,  -1,  100, 117, 118,
+    119, 120, 105, -1,  107, 108, 109, -1,  -1,  -1,  70,  71,  72,  100, 117, 118, 119, 120, 105,
+    138, 107, 108, 109, 30,  -1,  -1,  -1,  34,  35,  -1,  117, 118, 119, 120, -1,  138, -1,  -1,
+    -1,  -1,  100, -1,  -1,  -1,  -1,  105, -1,  107, 108, 109, -1,  138, -1,  -1,  -1,  -1,  -1,
+    117, 118, 119, 120, -1,  -1,  70,  71,  72,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,
+    -1,  -1,  138, 30,  -1,  -1,  -1,  34,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,
+    -1,  -1,  -1,  105, -1,  107, 108, 109, 30,  -1,  -1,  -1,  34,  35,  -1,  117, 118, 119, 120,
+    65,  -1,  -1,  -1,  69,  70,  71,  72,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  138, -1,
+    -1,  -1,  30,  -1,  -1,  -1,  34,  35,  -1,  -1,  70,  71,  72,  -1,  -1,  -1,  -1,  -1,  -1,
+    -1,  -1,  105, -1,  107, 108, 109, -1,  -1,  -1,  -1,  -1,  -1,  -1,  117, 118, 119, 120, -1,
+    -1,  -1,  100, -1,  70,  71,  72,  105, -1,  107, 108, 109, -1,  -1,  -1,  -1,  138, -1,  -1,
+    117, 118, 119, 120, -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  100, -1,  -1,  -1,
+    -1,  105, 138, 107, 108, 109, -1,  3,   -1,  -1,  -1,  -1,  -1,  117, 118, 119, 120, 13,  -1,
+    -1,  -1,  17,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  27,  -1,  29,  138, -1,  32,  -1,
+    30,  -1,  -1,  -1,  34,  35,  40,  -1,  42,  43,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  51,  -1,
+    -1,  54,  55,  -1,  -1,  -1,  -1,  60,  -1,  -1,  -1,  -1,  -1,  -1,  67,  68,  -1,  -1,  -1,
+    -1,  -1,  70,  71,  72,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  84,  -1,  -1,  -1,  -1,  -1,  -1,
+    -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  100, -1,  -1,  -1,  -1,  105,
+    -1,  107, 108, 109, -1,  -1,  -1,  -1,  118, -1,  -1,  117, 118, 119, 120, -1,  -1,  -1,  -1,
+    -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  138, -1,  -1,  -1,  12,  13,
+    -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  22,  23,  -1,  -1,  -1,  -1,  -1,  -1,  30,  -1,  -1,
+    -1,  34,  35,  -1,  37,  -1,  -1,  -1,  -1,  -1,  -1,  44,  -1,  -1,  -1,  48,  -1,  -1,  -1,
+    -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  69,  70,
+    71,  72,  -1,  74,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  85,  86,  87,  -1,  -1,
+    -1,  -1,  -1,  93,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  102, 103, -1,  105, -1,  107, 108,
+    109, 110, 111, -1,  -1,  -1,  -1,  -1,  117, 118, 119, 120, -1,  -1,  -1,  -1,  -1,  -1,  -1,
+    -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  138, -1,  -1,  -1,  12,  13,  -1,  -1,  -1,
+    -1,  -1,  -1,  -1,  -1,  22,  23,  -1,  -1,  -1,  -1,  -1,  -1,  30,  -1,  -1,  -1,  34,  35,
+    -1,  37,  -1,  -1,  -1,  -1,  -1,  -1,  44,  -1,  -1,  -1,  48,  -1,  -1,  -1,  -1,  -1,  -1,
+    -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  69,  70,  71,  72,  -1,
+    74,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  85,  86,  87,  -1,  -1,  -1,  -1,  -1,
+    93,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  102, 103, -1,  105, -1,  107, 108, 109, 110, 111,
     -1,  -1,  -1,  -1,  -1,  117, 118, 119, 120, -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,
-    131, -1,  -1,  -1,  30,  -1,  -1,  -1,  34,  35,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,
-    -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,
-    -1,  -1,  -1,  -1,  -1,  -1,  70,  71,  72,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,
-    -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  100, -1,
-    -1,  -1,  -1,  105, -1,  107, 108, 109, -1,  -1,  -1,  -1,  -1,  -1,  -1,  117, 118, 119, 120,
-    -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  131, -1,  -1,  -1,  3,   -1,  -1,  -1,  -1,
-    -1,  -1,  -1,  -1,  -1,  13,  -1,  -1,  -1,  17,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,
-    27,  -1,  29,  -1,  -1,  32,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  40,  -1,  42,  43,  -1,  -1,
-    -1,  -1,  -1,  -1,  -1,  51,  -1,  -1,  54,  55,  -1,  -1,  -1,  -1,  60,  -1,  -1,  -1,  -1,
-    -1,  -1,  67,  68,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,
-    84,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,
-    -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  118, -1,  -1,  -1,
-    -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  12,  13,  -1,  -1,  -1,  -1,
-    -1,  -1,  -1,  -1,  22,  23,  -1,  -1,  -1,  -1,  -1,  -1,  30,  -1,  -1,  -1,  34,  35,  -1,
-    37,  -1,  -1,  -1,  -1,  -1,  -1,  44,  -1,  -1,  -1,  48,  -1,  -1,  -1,  -1,  -1,  -1,  -1,
-    -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  69,  70,  71,  72,  -1,  74,
-    -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  85,  86,  87,  -1,  -1,  -1,  -1,  -1,  93,
-    -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  102, 103, -1,  105, -1,  107, 108, 109, 110, 111, -1,
-    -1,  -1,  -1,  -1,  117, 118, 119, 120, -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  131,
-    -1,  -1,  -1,  12,  13,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  22,  23,  -1,  -1,  -1,  -1,
-    -1,  -1,  30,  -1,  -1,  -1,  34,  35,  -1,  37,  -1,  -1,  -1,  -1,  -1,  -1,  44,  -1,  -1,
-    -1,  48,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,
-    -1,  -1,  -1,  69,  70,  71,  72,  -1,  74,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,
-    85,  86,  87,  -1,  -1,  -1,  -1,  -1,  93,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  102, 103,
-    -1,  105, -1,  107, 108, 109, 110, 111, -1,  -1,  -1,  -1,  -1,  117, 118, 119, 120, -1,  -1,
-    -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  131, -1,  -1,  -1,  12,  13,  -1,  15,  -1,  -1,  -1,
-    -1,  -1,  -1,  22,  23,  -1,  -1,  -1,  -1,  -1,  -1,  30,  -1,  -1,  -1,  34,  35,  -1,  37,
-    -1,  -1,  -1,  -1,  -1,  -1,  44,  -1,  -1,  -1,  48,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,
-    -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  69,  70,  71,  72,  -1,  74,  -1,
-    -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  85,  86,  87,  -1,  -1,  -1,  -1,  -1,  93,  -1,
-    -1,  -1,  -1,  -1,  -1,  -1,  -1,  102, 103, -1,  105, -1,  107, 108, 109, 110, 111, -1,  -1,
-    -1,  -1,  -1,  117, 118, 119, 120, -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  131, -1,
-    -1,  -1,  12,  13,  -1,  15,  -1,  -1,  -1,  -1,  -1,  -1,  22,  23,  -1,  -1,  -1,  -1,  -1,
-    -1,  30,  -1,  -1,  -1,  34,  35,  -1,  37,  -1,  -1,  -1,  -1,  -1,  -1,  44,  -1,  -1,  -1,
-    48,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,
-    -1,  -1,  69,  70,  71,  72,  -1,  74,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  85,
-    86,  87,  -1,  -1,  -1,  -1,  -1,  93,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  102, 103, -1,
-    105, -1,  107, 108, 109, 110, 111, -1,  -1,  -1,  -1,  -1,  117, 118, 119, 120, -1,  -1,  -1,
-    -1,  -1,  -1,  -1,  -1,  -1,  -1,  131, -1,  -1,  -1,  12,  13,  -1,  -1,  -1,  -1,  -1,  -1,
+    -1,  -1,  -1,  -1,  -1,  -1,  -1,  138, -1,  -1,  -1,  12,  13,  -1,  -1,  -1,  -1,  -1,  -1,
     -1,  -1,  22,  23,  -1,  -1,  -1,  -1,  -1,  -1,  30,  -1,  -1,  -1,  34,  35,  -1,  37,  -1,
     -1,  -1,  -1,  -1,  -1,  44,  -1,  -1,  -1,  48,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,
     -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  69,  70,  71,  72,  -1,  74,  -1,  -1,
-    -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  85,  86,  87,  -1,  -1,  -1,  -1,  92,  93,  -1,  -1,
+    -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  85,  86,  87,  -1,  -1,  90,  -1,  -1,  93,  -1,  -1,
     -1,  -1,  -1,  -1,  -1,  -1,  102, 103, -1,  105, -1,  107, 108, 109, 110, 111, -1,  -1,  -1,
-    -1,  -1,  117, 118, 119, 120, -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  131, -1,  -1,
-    -1,  12,  13,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  22,  23,  -1,  -1,  -1,  -1,  -1,  -1,
-    30,  -1,  -1,  -1,  34,  35,  -1,  37,  -1,  -1,  -1,  -1,  -1,  -1,  44,  -1,  -1,  -1,  48,
-    -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,
-    -1,  69,  70,  71,  72,  -1,  74,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  85,  86,
-    87,  -1,  -1,  90,  -1,  -1,  93,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  102, 103, -1,  105,
-    -1,  107, 108, 109, 110, 111, -1,  -1,  -1,  -1,  -1,  117, 118, 119, 120, -1,  -1,  -1,  -1,
-    -1,  -1,  -1,  -1,  -1,  -1,  131, -1,  -1,  -1,  10,  -1,  12,  13,  -1,  -1,  -1,  -1,  -1,
-    -1,  -1,  -1,  22,  23,  -1,  -1,  -1,  -1,  -1,  -1,  30,  -1,  -1,  -1,  34,  35,  -1,  37,
-    -1,  -1,  -1,  -1,  -1,  -1,  44,  -1,  -1,  -1,  48,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,
-    -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  69,  70,  71,  72,  -1,  74,  -1,
-    -1,  -1,  -1,  79,  -1,  -1,  -1,  -1,  -1,  85,  86,  87,  -1,  -1,  90,  -1,  -1,  93,  -1,
-    -1,  -1,  -1,  -1,  99,  -1,  -1,  102, 103, -1,  105, -1,  107, 108, 109, 110, 111, -1,  -1,
-    -1,  -1,  -1,  117, 118, 119, 120, -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  131, -1,
-    -1,  -1,  10,  -1,  12,  13,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  22,  23,  -1,  -1,  -1,
-    -1,  -1,  -1,  30,  -1,  -1,  -1,  34,  35,  -1,  37,  -1,  -1,  -1,  -1,  -1,  -1,  44,  -1,
-    -1,  -1,  48,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  57,  -1,  -1,  -1,  -1,  -1,  -1,  -1,
-    -1,  -1,  -1,  -1,  69,  70,  71,  72,  -1,  74,  -1,  -1,  -1,  -1,  79,  -1,  -1,  -1,  -1,
-    -1,  85,  86,  87,  -1,  -1,  90,  -1,  -1,  93,  -1,  -1,  -1,  -1,  -1,  99,  -1,  -1,  102,
-    103, -1,  105, -1,  107, 108, 109, 110, 111, -1,  -1,  -1,  -1,  -1,  117, 118, 119, 120, -1,
-    -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  131, -1,  -1,  -1,  10,  -1,  12,  13,  -1,  -1,
+    -1,  -1,  117, 118, 119, 120, -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,
+    -1,  -1,  -1,  -1,  138, -1,  -1,  -1,  12,  13,  -1,  15,  -1,  -1,  -1,  -1,  -1,  -1,  22,
+    23,  -1,  -1,  -1,  -1,  -1,  -1,  30,  -1,  -1,  -1,  34,  35,  -1,  37,  -1,  -1,  -1,  -1,
+    -1,  -1,  44,  -1,  -1,  -1,  48,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,
+    -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  69,  70,  71,  72,  -1,  74,  -1,  -1,  -1,  -1,  -1,
+    -1,  -1,  -1,  -1,  -1,  85,  86,  87,  -1,  -1,  -1,  -1,  -1,  93,  -1,  -1,  -1,  -1,  -1,
+    -1,  -1,  -1,  102, 103, -1,  105, -1,  107, 108, 109, 110, 111, -1,  -1,  -1,  -1,  -1,  117,
+    118, 119, 120, -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,
+    -1,  138, -1,  -1,  -1,  12,  13,  -1,  15,  -1,  -1,  -1,  -1,  -1,  -1,  22,  23,  -1,  -1,
+    -1,  -1,  -1,  -1,  30,  -1,  -1,  -1,  34,  35,  -1,  37,  -1,  -1,  -1,  -1,  -1,  -1,  44,
+    -1,  -1,  -1,  48,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,
+    -1,  -1,  -1,  -1,  -1,  69,  70,  71,  72,  -1,  74,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,
+    -1,  -1,  85,  86,  87,  -1,  -1,  -1,  -1,  -1,  93,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,
+    102, 103, -1,  105, -1,  107, 108, 109, 110, 111, -1,  -1,  -1,  -1,  -1,  117, 118, 119, 120,
+    -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  138, -1,
+    -1,  -1,  12,  13,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  22,  23,  -1,  -1,  -1,  -1,  -1,
+    -1,  30,  -1,  -1,  -1,  34,  35,  -1,  37,  -1,  -1,  -1,  -1,  -1,  -1,  44,  -1,  -1,  -1,
+    48,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,
+    -1,  -1,  69,  70,  71,  72,  -1,  74,  -1,  -1,  -1,  -1,  79,  80,  -1,  -1,  -1,  -1,  85,
+    86,  87,  -1,  -1,  -1,  -1,  92,  93,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  102, 103, -1,
+    105, -1,  107, 108, 109, 110, 111, -1,  -1,  -1,  -1,  -1,  117, 118, 119, 120, -1,  -1,  -1,
+    -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  138, -1,  -1,  -1,  12,
+    13,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  22,  23,  -1,  -1,  -1,  -1,  -1,  -1,  30,  -1,
+    -1,  -1,  34,  35,  -1,  37,  -1,  -1,  -1,  -1,  -1,  -1,  44,  -1,  -1,  -1,  48,  -1,  -1,
+    -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  69,
+    70,  71,  72,  -1,  74,  -1,  -1,  -1,  -1,  79,  80,  -1,  -1,  -1,  -1,  85,  86,  87,  -1,
+    -1,  -1,  -1,  92,  93,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  102, 103, -1,  105, -1,  107,
+    108, 109, 110, 111, -1,  -1,  -1,  -1,  -1,  117, 118, 119, 120, -1,  -1,  -1,  -1,  -1,  -1,
+    -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  138, -1,  -1,  -1,  10,  -1,  12,  13,
+    -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  22,  23,  -1,  -1,  -1,  -1,  -1,  -1,  30,  -1,  -1,
+    -1,  34,  35,  -1,  37,  -1,  -1,  -1,  -1,  -1,  -1,  44,  -1,  -1,  -1,  48,  -1,  -1,  -1,
+    -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  69,  70,
+    71,  72,  -1,  74,  -1,  -1,  -1,  -1,  79,  -1,  -1,  -1,  -1,  -1,  85,  86,  87,  -1,  -1,
+    90,  -1,  -1,  93,  -1,  -1,  -1,  -1,  -1,  99,  -1,  -1,  102, 103, -1,  105, -1,  107, 108,
+    109, 110, 111, -1,  -1,  -1,  -1,  -1,  117, 118, 119, 120, -1,  -1,  -1,  -1,  -1,  -1,  -1,
+    -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  138, -1,  -1,  -1,  10,  -1,  12,  13,  -1,
+    -1,  -1,  -1,  -1,  -1,  -1,  -1,  22,  23,  -1,  -1,  -1,  -1,  -1,  -1,  30,  -1,  -1,  -1,
+    34,  35,  -1,  37,  -1,  -1,  -1,  -1,  -1,  -1,  44,  -1,  -1,  -1,  48,  -1,  -1,  -1,  -1,
+    -1,  -1,  -1,  -1,  57,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  69,  70,  71,
+    72,  -1,  74,  -1,  -1,  -1,  -1,  79,  -1,  -1,  -1,  -1,  -1,  85,  86,  87,  -1,  -1,  90,
+    -1,  -1,  93,  -1,  -1,  -1,  -1,  -1,  99,  -1,  -1,  102, 103, -1,  105, -1,  107, 108, 109,
+    110, 111, -1,  -1,  -1,  -1,  -1,  117, 118, 119, 120, -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,
+    -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  138, -1,  -1,  -1,  10,  -1,  12,  13,  -1,  -1,
     -1,  -1,  -1,  -1,  -1,  -1,  22,  23,  -1,  -1,  -1,  -1,  -1,  -1,  30,  -1,  -1,  -1,  34,
     35,  -1,  37,  -1,  -1,  -1,  -1,  -1,  -1,  44,  -1,  -1,  -1,  48,  -1,  -1,  -1,  -1,  -1,
     -1,  -1,  -1,  57,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  69,  70,  71,  72,
     -1,  74,  -1,  -1,  -1,  -1,  79,  -1,  -1,  -1,  -1,  -1,  85,  86,  87,  -1,  -1,  90,  -1,
     -1,  93,  -1,  -1,  -1,  -1,  -1,  99,  -1,  -1,  102, 103, -1,  105, -1,  107, 108, 109, 110,
     111, -1,  -1,  -1,  -1,  -1,  117, 118, 119, 120, -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,
-    -1,  131, -1,  -1,  -1,  11,  12,  13,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  22,  23,  -1,
-    -1,  -1,  -1,  -1,  -1,  30,  -1,  -1,  -1,  34,  35,  -1,  37,  -1,  -1,  -1,  41,  -1,  43,
-    44,  45,  -1,  -1,  48,  -1,  -1,  -1,  -1,  53,  -1,  55,  -1,  -1,  -1,  -1,  -1,  -1,  -1,
-    -1,  -1,  -1,  -1,  -1,  -1,  69,  70,  71,  72,  -1,  74,  -1,  76,  -1,  78,  -1,  80,  -1,
-    -1,  -1,  -1,  85,  86,  87,  -1,  -1,  -1,  -1,  -1,  93,  -1,  -1,  -1,  -1,  -1,  -1,  -1,
-    -1,  102, 103, -1,  105, -1,  107, 108, 109, 110, 111, -1,  -1,  -1,  -1,  -1,  117, 118, 119,
-    120, -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  131, -1,  -1,  -1,  11,  12,  13,  -1,
-    -1,  -1,  -1,  -1,  -1,  -1,  -1,  22,  23,  -1,  -1,  -1,  -1,  -1,  -1,  30,  -1,  -1,  -1,
-    34,  35,  -1,  37,  -1,  -1,  -1,  41,  -1,  43,  44,  45,  -1,  -1,  48,  -1,  -1,  -1,  -1,
-    53,  -1,  55,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  69,  70,  71,
-    72,  -1,  74,  -1,  76,  -1,  78,  -1,  80,  -1,  -1,  -1,  -1,  85,  86,  87,  -1,  -1,  -1,
-    -1,  -1,  93,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  101, 102, 103, -1,  105, -1,  107, 108, 109,
-    110, 111, -1,  -1,  -1,  -1,  -1,  117, 118, 119, 120, -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,
-    -1,  -1,  131, -1,  -1,  -1,  11,  12,  13,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  22,  23,
-    -1,  -1,  -1,  -1,  -1,  -1,  30,  -1,  -1,  -1,  34,  35,  -1,  37,  -1,  -1,  -1,  41,  -1,
-    43,  44,  45,  -1,  -1,  48,  -1,  -1,  -1,  -1,  53,  -1,  55,  -1,  -1,  -1,  -1,  -1,  -1,
-    -1,  -1,  -1,  -1,  -1,  -1,  -1,  69,  70,  71,  72,  -1,  74,  -1,  76,  -1,  78,  -1,  80,
-    -1,  -1,  -1,  -1,  85,  86,  87,  -1,  -1,  -1,  -1,  -1,  93,  -1,  -1,  -1,  -1,  -1,  -1,
-    -1,  101, 102, 103, -1,  105, -1,  107, 108, 109, 110, 111, -1,  -1,  -1,  -1,  -1,  117, 118,
-    119, 120, -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  131, -1,  -1,  -1,  11,  12,  13,
-    -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  22,  23,  -1,  -1,  -1,  -1,  -1,  -1,  30,  -1,  -1,
-    -1,  34,  35,  -1,  37,  -1,  -1,  -1,  41,  -1,  43,  44,  45,  -1,  -1,  48,  -1,  -1,  -1,
-    -1,  53,  -1,  55,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  69,  70,
-    71,  72,  -1,  74,  -1,  76,  -1,  78,  -1,  80,  -1,  -1,  -1,  -1,  85,  86,  87,  -1,  -1,
-    -1,  -1,  -1,  93,  -1,  -1,  -1,  -1,  -1,  -1,  100, 101, 102, 103, -1,  105, -1,  107, 108,
-    109, 110, 111, -1,  -1,  -1,  -1,  -1,  117, 118, 119, 120, -1,  -1,  -1,  -1,  -1,  -1,  -1,
-    -1,  -1,  -1,  131, -1,  -1,  -1,  11,  12,  13,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  22,
-    23,  -1,  -1,  -1,  -1,  -1,  -1,  30,  -1,  -1,  -1,  34,  35,  -1,  37,  -1,  -1,  -1,  41,
-    -1,  43,  44,  45,  -1,  -1,  48,  -1,  -1,  -1,  -1,  53,  -1,  55,  -1,  -1,  -1,  -1,  -1,
-    -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  69,  70,  71,  72,  -1,  74,  -1,  76,  -1,  78,  -1,
-    80,  -1,  -1,  -1,  -1,  85,  86,  87,  -1,  -1,  -1,  -1,  -1,  93,  -1,  -1,  -1,  -1,  -1,
-    -1,  100, 101, 102, 103, -1,  105, -1,  107, 108, 109, 110, 111, -1,  -1,  -1,  -1,  -1,  117,
-    118, 119, 120, -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  131, -1,  -1,  -1,  11,  12,
-    13,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  22,  23,  -1,  -1,  -1,  -1,  -1,  -1,  30,  -1,
-    -1,  -1,  34,  35,  -1,  37,  -1,  -1,  -1,  41,  -1,  43,  44,  45,  -1,  -1,  48,  -1,  -1,
-    -1,  -1,  53,  -1,  55,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  69,
-    70,  71,  72,  -1,  74,  -1,  76,  -1,  78,  -1,  80,  -1,  -1,  -1,  -1,  85,  86,  87,  -1,
-    -1,  -1,  -1,  -1,  93,  -1,  -1,  -1,  -1,  -1,  -1,  100, 101, 102, 103, -1,  105, -1,  107,
-    108, 109, 110, 111, -1,  -1,  -1,  -1,  -1,  117, 118, 119, 120, -1,  -1,  -1,  -1,  -1,  -1,
-    -1,  -1,  -1,  -1,  131, -1,  -1,  -1,  11,  12,  13,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,
-    22,  23,  -1,  -1,  -1,  -1,  -1,  -1,  30,  -1,  -1,  -1,  34,  35,  -1,  37,  -1,  -1,  -1,
-    41,  -1,  43,  44,  45,  -1,  -1,  48,  -1,  -1,  -1,  -1,  53,  -1,  55,  -1,  -1,  -1,  -1,
-    -1,  -1,  -1,  -1,  -1,  65,  -1,  -1,  -1,  69,  70,  71,  72,  -1,  74,  -1,  76,  -1,  78,
-    -1,  80,  -1,  -1,  -1,  -1,  85,  86,  87,  -1,  -1,  -1,  -1,  -1,  93,  -1,  -1,  -1,  -1,
-    -1,  -1,  -1,  101, 102, 103, -1,  105, -1,  107, 108, 109, 110, 111, -1,  -1,  -1,  -1,  -1,
-    117, 118, 119, 120, -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  131, -1,  -1,  -1,  11,
-    12,  13,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  22,  23,  -1,  -1,  -1,  -1,  -1,  -1,  30,
-    -1,  -1,  -1,  34,  35,  -1,  37,  -1,  -1,  -1,  41,  -1,  43,  44,  45,  -1,  -1,  48,  -1,
-    -1,  -1,  -1,  53,  -1,  55,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,
-    69,  70,  71,  72,  -1,  74,  -1,  76,  -1,  78,  -1,  80,  -1,  -1,  -1,  -1,  85,  86,  87,
-    -1,  -1,  -1,  -1,  -1,  93,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  101, 102, 103, -1,  105, -1,
-    107, 108, 109, 110, 111, -1,  -1,  -1,  -1,  -1,  117, 118, 119, 120, -1,  -1,  -1,  -1,  -1,
-    -1,  -1,  -1,  129, -1,  131, -1,  -1,  -1,  8,   -1,  -1,  11,  12,  13,  -1,  -1,  -1,  -1,
+    -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  138, -1,  -1,  -1,  11,  12,  13,  -1,  -1,  -1,  -1,
     -1,  -1,  -1,  -1,  22,  23,  -1,  -1,  -1,  -1,  -1,  -1,  30,  -1,  -1,  -1,  34,  35,  -1,
     37,  -1,  -1,  -1,  41,  -1,  43,  44,  45,  -1,  -1,  48,  -1,  -1,  -1,  -1,  53,  -1,  55,
     -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  69,  70,  71,  72,  -1,  74,
     -1,  76,  -1,  78,  -1,  80,  -1,  -1,  -1,  -1,  85,  86,  87,  -1,  -1,  -1,  -1,  -1,  93,
-    -1,  -1,  -1,  -1,  -1,  -1,  -1,  101, 102, 103, -1,  105, -1,  107, 108, 109, 110, 111, -1,
-    -1,  -1,  -1,  -1,  117, 118, 119, 120, -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  131,
+    -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  102, 103, -1,  105, -1,  107, 108, 109, 110, 111, -1,
+    -1,  -1,  -1,  -1,  117, 118, 119, 120, -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,
+    -1,  -1,  -1,  -1,  -1,  -1,  138, -1,  -1,  -1,  11,  12,  13,  -1,  -1,  -1,  -1,  -1,  -1,
+    -1,  -1,  22,  23,  -1,  -1,  -1,  -1,  -1,  -1,  30,  -1,  -1,  -1,  34,  35,  -1,  37,  -1,
+    -1,  -1,  41,  -1,  43,  44,  45,  -1,  -1,  48,  -1,  -1,  -1,  -1,  53,  -1,  55,  -1,  -1,
+    -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  69,  70,  71,  72,  -1,  74,  -1,  76,
+    -1,  78,  -1,  80,  -1,  -1,  -1,  -1,  85,  86,  87,  -1,  -1,  -1,  -1,  -1,  93,  -1,  -1,
+    -1,  -1,  -1,  -1,  -1,  101, 102, 103, -1,  105, -1,  107, 108, 109, 110, 111, -1,  -1,  -1,
+    -1,  -1,  117, 118, 119, 120, -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,
+    -1,  -1,  -1,  -1,  138, -1,  -1,  -1,  11,  12,  13,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,
+    22,  23,  -1,  -1,  -1,  -1,  -1,  -1,  30,  -1,  -1,  -1,  34,  35,  -1,  37,  -1,  -1,  -1,
+    41,  -1,  43,  44,  45,  -1,  -1,  48,  -1,  -1,  -1,  -1,  53,  -1,  55,  -1,  -1,  -1,  -1,
+    -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  69,  70,  71,  72,  -1,  74,  -1,  76,  -1,  78,
+    -1,  80,  -1,  -1,  -1,  -1,  85,  86,  87,  -1,  -1,  -1,  -1,  -1,  93,  -1,  -1,  -1,  -1,
+    -1,  -1,  -1,  101, 102, 103, -1,  105, -1,  107, 108, 109, 110, 111, -1,  -1,  -1,  -1,  -1,
+    117, 118, 119, 120, -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,
+    -1,  -1,  138, -1,  -1,  -1,  11,  12,  13,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  22,  23,
+    -1,  -1,  -1,  -1,  -1,  -1,  30,  -1,  -1,  -1,  34,  35,  -1,  37,  -1,  -1,  -1,  41,  -1,
+    43,  44,  45,  -1,  -1,  48,  -1,  -1,  -1,  -1,  53,  -1,  55,  -1,  -1,  -1,  -1,  -1,  -1,
+    -1,  -1,  -1,  -1,  -1,  -1,  -1,  69,  70,  71,  72,  -1,  74,  -1,  76,  -1,  78,  -1,  80,
+    -1,  -1,  -1,  -1,  85,  86,  87,  -1,  -1,  -1,  -1,  -1,  93,  -1,  -1,  -1,  -1,  -1,  -1,
+    100, 101, 102, 103, -1,  105, -1,  107, 108, 109, 110, 111, -1,  -1,  -1,  -1,  -1,  117, 118,
+    119, 120, -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,
+    138, -1,  -1,  -1,  11,  12,  13,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  22,  23,  -1,  -1,
+    -1,  -1,  -1,  -1,  30,  -1,  -1,  -1,  34,  35,  -1,  37,  -1,  -1,  -1,  41,  -1,  43,  44,
+    45,  -1,  -1,  48,  -1,  -1,  -1,  -1,  53,  -1,  55,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,
+    -1,  -1,  -1,  -1,  -1,  69,  70,  71,  72,  -1,  74,  -1,  76,  -1,  78,  -1,  80,  -1,  -1,
+    -1,  -1,  85,  86,  87,  -1,  -1,  -1,  -1,  -1,  93,  -1,  -1,  -1,  -1,  -1,  -1,  100, 101,
+    102, 103, -1,  105, -1,  107, 108, 109, 110, 111, -1,  -1,  -1,  -1,  -1,  117, 118, 119, 120,
+    -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  138, -1,
+    -1,  -1,  8,   -1,  -1,  11,  12,  13,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  22,  23,  -1,
+    -1,  -1,  -1,  -1,  -1,  30,  -1,  -1,  -1,  34,  35,  -1,  37,  -1,  -1,  -1,  41,  -1,  43,
+    44,  45,  -1,  -1,  48,  -1,  -1,  -1,  -1,  53,  -1,  55,  -1,  -1,  -1,  -1,  -1,  -1,  -1,
+    -1,  -1,  -1,  -1,  -1,  -1,  69,  70,  71,  72,  -1,  74,  -1,  76,  -1,  78,  -1,  80,  -1,
+    -1,  -1,  -1,  85,  86,  87,  -1,  -1,  -1,  -1,  -1,  93,  -1,  -1,  -1,  -1,  -1,  -1,  -1,
+    101, 102, 103, -1,  105, -1,  107, 108, 109, 110, 111, -1,  -1,  -1,  -1,  -1,  117, 118, 119,
+    120, -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  138,
     -1,  -1,  -1,  11,  12,  13,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  22,  23,  -1,  -1,  -1,
     -1,  -1,  -1,  30,  -1,  -1,  -1,  34,  35,  -1,  37,  -1,  -1,  -1,  41,  -1,  43,  44,  45,
     -1,  -1,  48,  -1,  -1,  -1,  -1,  53,  -1,  55,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,
-    65,  -1,  -1,  -1,  69,  70,  71,  72,  -1,  74,  -1,  76,  -1,  78,  -1,  80,  -1,  -1,  -1,
-    -1,  85,  86,  87,  -1,  -1,  -1,  -1,  -1,  93,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  101, 102,
+    -1,  -1,  -1,  -1,  69,  70,  71,  72,  -1,  74,  -1,  76,  -1,  78,  -1,  80,  -1,  -1,  -1,
+    -1,  85,  86,  87,  -1,  -1,  -1,  -1,  -1,  93,  -1,  -1,  -1,  -1,  -1,  -1,  100, 101, 102,
     103, -1,  105, -1,  107, 108, 109, 110, 111, -1,  -1,  -1,  -1,  -1,  117, 118, 119, 120, -1,
-    -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  131, -1,  -1,  -1,  11,  12,  13,  -1,  -1,  -1,
-    -1,  -1,  -1,  -1,  -1,  22,  23,  -1,  -1,  -1,  -1,  -1,  -1,  30,  -1,  -1,  -1,  34,  35,
-    -1,  37,  -1,  -1,  -1,  41,  -1,  43,  44,  45,  -1,  -1,  48,  -1,  -1,  -1,  -1,  53,  -1,
-    55,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  69,  70,  71,  72,  -1,
-    74,  -1,  76,  -1,  78,  -1,  80,  -1,  -1,  -1,  -1,  85,  86,  87,  -1,  -1,  -1,  -1,  -1,
-    93,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  101, 102, 103, -1,  105, -1,  107, 108, 109, 110, 111,
-    -1,  -1,  -1,  -1,  -1,  117, 118, 119, 120, -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  129, -1,
-    131, -1,  -1,  -1,  8,   -1,  -1,  11,  12,  13,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  22,
-    23,  -1,  -1,  -1,  -1,  -1,  -1,  30,  -1,  -1,  -1,  34,  35,  -1,  37,  -1,  -1,  -1,  41,
-    -1,  43,  44,  45,  -1,  -1,  48,  -1,  -1,  -1,  -1,  53,  -1,  55,  -1,  -1,  -1,  -1,  -1,
-    -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  69,  70,  71,  72,  -1,  74,  -1,  76,  -1,  78,  -1,
-    80,  -1,  -1,  -1,  -1,  85,  86,  87,  -1,  -1,  -1,  -1,  -1,  93,  -1,  -1,  -1,  -1,  -1,
-    -1,  -1,  101, 102, 103, -1,  105, -1,  107, 108, 109, 110, 111, -1,  -1,  -1,  -1,  -1,  117,
-    118, 119, 120, -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  131, -1,  -1,  -1,  11,  12,
+    -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  138, -1,  -1,
+    -1,  8,   -1,  -1,  11,  12,  13,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  22,  23,  -1,  -1,
+    -1,  -1,  -1,  -1,  30,  -1,  -1,  -1,  34,  35,  -1,  37,  -1,  -1,  -1,  41,  -1,  43,  44,
+    45,  -1,  -1,  48,  -1,  -1,  -1,  -1,  53,  -1,  55,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,
+    -1,  -1,  -1,  -1,  -1,  69,  70,  71,  72,  -1,  74,  -1,  76,  -1,  78,  -1,  80,  -1,  -1,
+    -1,  -1,  85,  86,  87,  -1,  -1,  -1,  -1,  -1,  93,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  101,
+    102, 103, -1,  105, -1,  107, 108, 109, 110, 111, -1,  -1,  -1,  -1,  -1,  117, 118, 119, 120,
+    -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  138, -1,
+    -1,  -1,  11,  12,  13,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  22,  23,  -1,  -1,  -1,  -1,
+    -1,  -1,  30,  -1,  -1,  -1,  34,  35,  -1,  37,  -1,  -1,  -1,  41,  -1,  43,  44,  45,  -1,
+    -1,  48,  -1,  -1,  -1,  -1,  53,  -1,  55,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  65,
+    -1,  -1,  -1,  69,  70,  71,  72,  -1,  74,  -1,  76,  -1,  78,  -1,  80,  -1,  -1,  -1,  -1,
+    85,  86,  87,  -1,  -1,  -1,  -1,  -1,  93,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  101, 102, 103,
+    -1,  105, -1,  107, 108, 109, 110, 111, -1,  -1,  -1,  -1,  -1,  117, 118, 119, 120, -1,  -1,
+    -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  138, -1,  -1,  -1,
+    11,  12,  13,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  22,  23,  -1,  -1,  -1,  -1,  -1,  -1,
+    30,  -1,  -1,  -1,  34,  35,  -1,  37,  -1,  -1,  -1,  41,  -1,  43,  44,  45,  -1,  -1,  48,
+    -1,  -1,  -1,  -1,  53,  -1,  55,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,
+    -1,  69,  70,  71,  72,  -1,  74,  -1,  76,  -1,  78,  -1,  80,  -1,  -1,  -1,  -1,  85,  86,
+    87,  -1,  -1,  -1,  -1,  -1,  93,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  101, 102, 103, -1,  105,
+    -1,  107, 108, 109, 110, 111, -1,  -1,  -1,  -1,  -1,  117, 118, 119, 120, -1,  -1,  -1,  -1,
+    -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  135, -1,  -1,  138, -1,  -1,  -1,  11,  12,
     13,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  22,  23,  -1,  -1,  -1,  -1,  -1,  -1,  30,  -1,
     -1,  -1,  34,  35,  -1,  37,  -1,  -1,  -1,  41,  -1,  43,  44,  45,  -1,  -1,  48,  -1,  -1,
     -1,  -1,  53,  -1,  55,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  69,
     70,  71,  72,  -1,  74,  -1,  76,  -1,  78,  -1,  80,  -1,  -1,  -1,  -1,  85,  86,  87,  -1,
     -1,  -1,  -1,  -1,  93,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  101, 102, 103, -1,  105, -1,  107,
     108, 109, 110, 111, -1,  -1,  -1,  -1,  -1,  117, 118, 119, 120, -1,  -1,  -1,  -1,  -1,  -1,
-    -1,  128, -1,  -1,  131, -1,  -1,  -1,  11,  12,  13,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,
-    22,  23,  -1,  -1,  -1,  -1,  -1,  -1,  30,  -1,  -1,  -1,  34,  35,  -1,  37,  -1,  -1,  -1,
-    41,  -1,  43,  44,  45,  -1,  -1,  48,  -1,  -1,  -1,  -1,  53,  -1,  55,  -1,  -1,  58,  -1,
-    -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  69,  70,  71,  72,  -1,  74,  -1,  76,  -1,  78,
-    -1,  80,  -1,  -1,  -1,  -1,  85,  86,  87,  -1,  -1,  -1,  -1,  -1,  93,  -1,  -1,  -1,  -1,
-    -1,  -1,  100, 101, 102, 103, -1,  105, -1,  107, 108, 109, 110, 111, -1,  -1,  -1,  -1,  -1,
-    117, 118, 119, 120, -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  131, -1,  -1,  -1,  11,
-    12,  13,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  22,  23,  -1,  -1,  -1,  -1,  -1,  -1,  30,
-    -1,  -1,  -1,  34,  35,  -1,  37,  -1,  -1,  -1,  41,  -1,  43,  44,  45,  -1,  -1,  48,  -1,
-    -1,  -1,  -1,  53,  -1,  55,  -1,  -1,  -1,  -1,  -1,  -1,  62,  -1,  -1,  -1,  -1,  -1,  -1,
-    69,  70,  71,  72,  -1,  74,  -1,  76,  -1,  78,  -1,  80,  -1,  -1,  -1,  -1,  85,  86,  87,
-    -1,  -1,  -1,  -1,  -1,  93,  -1,  -1,  -1,  -1,  -1,  -1,  100, 101, 102, 103, -1,  105, -1,
-    107, 108, 109, 110, 111, -1,  -1,  -1,  -1,  -1,  117, 118, 119, 120, -1,  -1,  -1,  -1,  -1,
-    -1,  -1,  -1,  -1,  -1,  131, -1,  -1,  -1,  11,  12,  13,  -1,  -1,  -1,  -1,  -1,  -1,  -1,
+    -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  136, -1,  138, -1,  -1,  -1,  11,  12,  13,  -1,
+    -1,  -1,  -1,  -1,  -1,  -1,  -1,  22,  23,  -1,  -1,  -1,  -1,  -1,  -1,  30,  -1,  -1,  -1,
+    34,  35,  -1,  37,  -1,  -1,  -1,  41,  -1,  43,  44,  45,  -1,  -1,  48,  -1,  -1,  -1,  -1,
+    53,  -1,  55,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  69,  70,  71,
+    72,  -1,  74,  -1,  76,  -1,  78,  -1,  80,  -1,  -1,  -1,  -1,  85,  86,  87,  -1,  -1,  -1,
+    -1,  -1,  93,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  101, 102, 103, -1,  105, -1,  107, 108, 109,
+    110, 111, -1,  -1,  -1,  -1,  -1,  117, 118, 119, 120, -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,
+    -1,  -1,  -1,  -1,  -1,  -1,  -1,  136, -1,  138, -1,  -1,  -1,  11,  12,  13,  -1,  -1,  -1,
+    -1,  -1,  -1,  -1,  -1,  22,  23,  -1,  -1,  -1,  -1,  -1,  -1,  30,  -1,  -1,  -1,  34,  35,
+    -1,  37,  -1,  -1,  -1,  41,  -1,  43,  44,  45,  -1,  -1,  48,  -1,  -1,  -1,  -1,  53,  -1,
+    55,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  65,  -1,  -1,  -1,  69,  70,  71,  72,  -1,
+    74,  -1,  76,  -1,  78,  -1,  80,  -1,  -1,  -1,  -1,  85,  86,  87,  -1,  -1,  -1,  -1,  -1,
+    93,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  101, 102, 103, -1,  105, -1,  107, 108, 109, 110, 111,
+    -1,  -1,  -1,  -1,  -1,  117, 118, 119, 120, -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,
+    -1,  -1,  -1,  -1,  -1,  -1,  -1,  138, -1,  -1,  -1,  11,  12,  13,  -1,  -1,  -1,  -1,  -1,
+    -1,  -1,  -1,  22,  23,  -1,  -1,  -1,  -1,  -1,  -1,  30,  -1,  -1,  -1,  34,  35,  -1,  37,
+    -1,  -1,  -1,  41,  -1,  43,  44,  45,  -1,  -1,  48,  -1,  -1,  -1,  -1,  53,  -1,  55,  -1,
+    -1,  -1,  -1,  -1,  -1,  62,  -1,  -1,  -1,  -1,  -1,  -1,  69,  70,  71,  72,  -1,  74,  -1,
+    76,  -1,  78,  -1,  80,  -1,  -1,  -1,  -1,  85,  86,  87,  -1,  -1,  -1,  -1,  -1,  93,  -1,
+    -1,  -1,  -1,  -1,  -1,  100, 101, 102, 103, -1,  105, -1,  107, 108, 109, 110, 111, -1,  -1,
+    -1,  -1,  -1,  117, 118, 119, 120, -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,
+    -1,  -1,  -1,  -1,  -1,  138, -1,  -1,  -1,  11,  12,  13,  -1,  -1,  -1,  -1,  -1,  -1,  -1,
     -1,  22,  23,  -1,  -1,  -1,  -1,  -1,  -1,  30,  -1,  -1,  -1,  34,  35,  -1,  37,  -1,  -1,
-    -1,  41,  -1,  43,  44,  45,  -1,  -1,  48,  -1,  -1,  -1,  -1,  53,  -1,  55,  -1,  -1,  -1,
+    -1,  41,  -1,  43,  44,  45,  -1,  -1,  48,  -1,  -1,  -1,  -1,  53,  -1,  55,  -1,  -1,  58,
     -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  69,  70,  71,  72,  -1,  74,  -1,  76,  -1,
-    78,  79,  80,  -1,  -1,  -1,  -1,  85,  86,  87,  88,  89,  -1,  -1,  -1,  93,  -1,  -1,  -1,
-    -1,  -1,  -1,  -1,  101, 102, 103, -1,  105, -1,  107, 108, 109, 110, 111, -1,  -1,  -1,  -1,
-    -1,  117, 118, 119, 120, -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  131, -1,  -1,  -1,
-    11,  12,  13,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  22,  23,  -1,  -1,  -1,  -1,  -1,  -1,
-    30,  31,  -1,  -1,  34,  35,  -1,  37,  -1,  -1,  -1,  41,  -1,  43,  44,  45,  -1,  -1,  48,
-    -1,  -1,  -1,  -1,  53,  -1,  55,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  63,  -1,  -1,  -1,  -1,
-    -1,  69,  70,  71,  72,  73,  74,  -1,  76,  77,  78,  -1,  80,  -1,  82,  -1,  -1,  85,  86,
-    87,  -1,  -1,  -1,  -1,  -1,  93,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  101, 102, 103, -1,  105,
-    -1,  107, 108, 109, 110, 111, -1,  -1,  -1,  -1,  -1,  117, 118, 119, 120, -1,  -1,  -1,  -1,
-    -1,  -1,  -1,  128, 129, -1,  131, -1,  -1,  -1,  11,  12,  13,  -1,  -1,  -1,  -1,  -1,  -1,
-    -1,  -1,  22,  23,  -1,  -1,  -1,  -1,  -1,  -1,  30,  31,  -1,  -1,  34,  35,  -1,  37,  -1,
-    -1,  -1,  41,  -1,  43,  44,  45,  -1,  -1,  48,  -1,  -1,  -1,  -1,  53,  -1,  55,  -1,  -1,
-    -1,  -1,  -1,  -1,  -1,  63,  -1,  -1,  -1,  -1,  -1,  69,  70,  71,  72,  73,  74,  -1,  76,
-    77,  78,  -1,  80,  -1,  82,  -1,  -1,  85,  86,  87,  -1,  -1,  -1,  -1,  -1,  93,  -1,  -1,
-    -1,  -1,  -1,  -1,  -1,  101, 102, 103, -1,  105, -1,  107, 108, 109, 110, 111, -1,  -1,  -1,
-    -1,  -1,  117, 118, 119, 120, -1,  -1,  -1,  -1,  -1,  -1,  -1,  128, 129, -1,  131, -1,  -1,
-    -1,  4,   5,   6,   -1,  -1,  9,   10,  11,  -1,  -1,  14,  -1,  16,  -1,  -1,  -1,  20,  21,
-    -1,  23,  -1,  -1,  -1,  -1,  -1,  -1,  30,  31,  32,  33,  -1,  -1,  -1,  -1,  -1,  -1,  -1,
-    -1,  -1,  -1,  44,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,
-    -1,  61,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  70,  71,  72,  73,  74,  75,  -1,  77,  78,
-    79,  80,  81,  82,  -1,  -1,  85,  86,  87,  88,  89,  -1,  91,  92,  -1,  -1,  -1,  -1,  -1,
-    -1,  99,  -1,  -1,  102, 103, 104, 105, 106, 107, 108, 109, -1,  -1,  -1,  -1,  -1,  115, -1,
-    117, 118, 119, 120, -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  131, -1,  -1,  -1,  4,
+    78,  -1,  80,  -1,  -1,  -1,  -1,  85,  86,  87,  -1,  -1,  -1,  -1,  -1,  93,  -1,  -1,  -1,
+    -1,  -1,  -1,  100, 101, 102, 103, -1,  105, -1,  107, 108, 109, 110, 111, -1,  -1,  -1,  -1,
+    -1,  117, 118, 119, 120, -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,
+    -1,  -1,  -1,  138, -1,  -1,  -1,  11,  12,  13,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  22,
+    23,  -1,  -1,  -1,  -1,  -1,  -1,  30,  -1,  -1,  -1,  34,  35,  -1,  37,  -1,  -1,  -1,  41,
+    -1,  43,  44,  45,  -1,  -1,  48,  -1,  -1,  -1,  -1,  53,  -1,  55,  -1,  -1,  -1,  -1,  -1,
+    -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  69,  70,  71,  72,  -1,  74,  -1,  76,  -1,  78,  79,
+    80,  -1,  -1,  -1,  -1,  85,  86,  87,  88,  89,  -1,  -1,  -1,  93,  -1,  -1,  -1,  -1,  -1,
+    -1,  -1,  101, 102, 103, -1,  105, -1,  107, 108, 109, 110, 111, -1,  -1,  -1,  -1,  -1,  117,
+    118, 119, 120, -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,
+    -1,  138, -1,  -1,  -1,  11,  12,  13,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  22,  23,  -1,
+    -1,  -1,  -1,  -1,  -1,  30,  31,  -1,  -1,  34,  35,  -1,  37,  -1,  -1,  -1,  41,  -1,  43,
+    44,  45,  -1,  -1,  48,  -1,  -1,  -1,  -1,  53,  -1,  55,  -1,  -1,  -1,  -1,  -1,  -1,  -1,
+    63,  -1,  -1,  -1,  -1,  -1,  69,  70,  71,  72,  73,  74,  -1,  76,  77,  78,  -1,  80,  -1,
+    82,  -1,  -1,  85,  86,  87,  -1,  -1,  -1,  -1,  -1,  93,  -1,  -1,  -1,  -1,  -1,  -1,  -1,
+    101, 102, 103, -1,  105, -1,  107, 108, 109, 110, 111, -1,  -1,  -1,  -1,  -1,  117, 118, 119,
+    120, -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  135, 136, -1,  138,
+    -1,  -1,  -1,  11,  12,  13,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  22,  23,  -1,  -1,  -1,
+    -1,  -1,  -1,  30,  31,  -1,  -1,  34,  35,  -1,  37,  -1,  -1,  -1,  41,  -1,  43,  44,  45,
+    -1,  -1,  48,  -1,  -1,  -1,  -1,  53,  -1,  55,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  63,  -1,
+    -1,  -1,  -1,  -1,  69,  70,  71,  72,  73,  74,  -1,  76,  77,  78,  -1,  80,  -1,  82,  -1,
+    -1,  85,  86,  87,  -1,  -1,  -1,  -1,  -1,  93,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  101, 102,
+    103, -1,  105, -1,  107, 108, 109, 110, 111, -1,  -1,  -1,  -1,  -1,  117, 118, 119, 120, -1,
+    -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  135, 136, -1,  138, -1,  -1,
+    -1,  11,  12,  13,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  22,  23,  -1,  -1,  -1,  -1,  -1,
+    -1,  30,  31,  -1,  -1,  34,  35,  -1,  37,  -1,  -1,  -1,  41,  -1,  43,  44,  45,  -1,  -1,
+    48,  -1,  -1,  -1,  -1,  53,  -1,  55,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  63,  -1,  -1,  -1,
+    -1,  -1,  69,  70,  71,  72,  73,  74,  -1,  76,  77,  78,  -1,  80,  -1,  82,  -1,  -1,  85,
+    86,  87,  -1,  -1,  -1,  -1,  -1,  93,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  101, 102, 103, -1,
+    105, -1,  107, 108, 109, 110, 111, -1,  -1,  -1,  -1,  -1,  117, 118, 119, 120, -1,  -1,  -1,
+    -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  135, 136, -1,  138, -1,  -1,  -1,  4,
     5,   6,   -1,  -1,  9,   10,  11,  -1,  -1,  14,  -1,  16,  -1,  -1,  -1,  20,  21,  -1,  23,
     -1,  -1,  -1,  -1,  -1,  -1,  30,  31,  32,  33,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,
-    -1,  44,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  57,  -1,  -1,  -1,  61,
+    -1,  44,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  61,
     -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  70,  71,  72,  73,  74,  75,  -1,  77,  78,  79,  80,
     81,  82,  -1,  -1,  85,  86,  87,  88,  89,  -1,  91,  92,  -1,  -1,  -1,  -1,  -1,  -1,  99,
     -1,  -1,  102, 103, 104, 105, 106, 107, 108, 109, -1,  -1,  -1,  -1,  -1,  115, -1,  117, 118,
-    119, 120, -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  131, -1,  -1,  -1,  4,   5,   6,
-    -1,  -1,  9,   10,  11,  -1,  -1,  14,  -1,  16,  -1,  -1,  -1,  20,  21,  -1,  23,  -1,  -1,
-    -1,  -1,  -1,  -1,  30,  31,  32,  33,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  44,
-    -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  57,  -1,  -1,  -1,  61,  -1,  -1,
-    -1,  -1,  -1,  -1,  -1,  -1,  70,  71,  72,  73,  74,  75,  -1,  77,  78,  79,  80,  81,  82,
-    -1,  -1,  85,  86,  87,  88,  89,  -1,  91,  92,  -1,  -1,  -1,  -1,  -1,  -1,  99,  -1,  -1,
-    102, 103, 104, 105, 106, 107, 108, 109, -1,  -1,  -1,  -1,  -1,  115, -1,  117, 118, 119, 120,
-    -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  131, -1,  -1,  -1,  4,   5,   6,   -1,  -1,
+    119, 120, -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,
+    138, -1,  -1,  -1,  4,   5,   6,   -1,  -1,  9,   10,  11,  -1,  -1,  14,  -1,  16,  -1,  -1,
+    -1,  20,  21,  -1,  23,  -1,  -1,  -1,  -1,  -1,  -1,  30,  31,  32,  33,  -1,  35,  -1,  -1,
+    -1,  -1,  -1,  -1,  -1,  -1,  44,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,
+    -1,  -1,  -1,  -1,  61,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  70,  71,  72,  73,  74,  75,
+    -1,  77,  78,  79,  80,  81,  82,  -1,  -1,  85,  86,  87,  88,  89,  -1,  91,  92,  -1,  -1,
+    -1,  -1,  -1,  -1,  99,  -1,  -1,  102, 103, 104, 105, 106, 107, 108, 109, -1,  -1,  -1,  -1,
+    -1,  115, -1,  117, 118, 119, 120, -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,
+    -1,  -1,  -1,  -1,  -1,  138, -1,  -1,  -1,  4,   5,   6,   -1,  -1,  9,   10,  11,  -1,  -1,
+    14,  -1,  16,  -1,  -1,  -1,  20,  21,  -1,  23,  -1,  -1,  -1,  -1,  -1,  -1,  30,  31,  32,
+    33,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  44,  -1,  -1,  -1,  -1,  -1,  -1,  -1,
+    -1,  -1,  -1,  -1,  -1,  57,  -1,  -1,  -1,  61,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  70,
+    71,  72,  73,  74,  75,  -1,  77,  78,  79,  80,  81,  82,  -1,  -1,  85,  86,  87,  88,  89,
+    -1,  91,  92,  -1,  -1,  -1,  -1,  -1,  -1,  99,  -1,  -1,  102, 103, 104, 105, 106, 107, 108,
+    109, -1,  -1,  -1,  -1,  -1,  115, -1,  117, 118, 119, 120, -1,  -1,  -1,  -1,  -1,  -1,  -1,
+    -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  138, -1,  -1,  -1,  4,   5,   6,   -1,  -1,
     9,   10,  11,  -1,  -1,  14,  -1,  16,  -1,  -1,  -1,  20,  21,  -1,  23,  -1,  -1,  -1,  -1,
     -1,  -1,  30,  31,  32,  33,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  44,  -1,  -1,
     -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  57,  -1,  -1,  -1,  61,  -1,  -1,  -1,  -1,
     -1,  -1,  -1,  -1,  70,  71,  72,  73,  74,  75,  -1,  77,  78,  79,  80,  81,  82,  -1,  -1,
     85,  86,  87,  88,  89,  -1,  91,  92,  -1,  -1,  -1,  -1,  -1,  -1,  99,  -1,  -1,  102, 103,
     104, 105, 106, 107, 108, 109, -1,  -1,  -1,  -1,  -1,  115, -1,  117, 118, 119, 120, -1,  -1,
-    -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  131, -1,  -1,  -1,  4,   5,   6,   -1,  -1,  9,   10,
-    11,  -1,  -1,  14,  -1,  16,  -1,  -1,  -1,  20,  21,  -1,  23,  -1,  -1,  -1,  -1,  -1,  -1,
-    30,  31,  32,  33,  -1,  35,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  44,  -1,  -1,  -1,  -1,
-    -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  61,  -1,  -1,  -1,  -1,  -1,  -1,
-    -1,  -1,  70,  71,  72,  73,  74,  75,  -1,  77,  78,  79,  80,  81,  82,  -1,  -1,  85,  86,
-    87,  88,  89,  -1,  91,  92,  -1,  -1,  -1,  -1,  -1,  -1,  99,  -1,  -1,  102, 103, 104, 105,
-    106, 107, 108, 109, -1,  -1,  -1,  -1,  -1,  115, -1,  117, 118, 119, 120, -1,  -1,  -1,  -1,
-    -1,  -1,  -1,  -1,  -1,  -1,  131, -1,  -1,  -1,  4,   5,   6,   -1,  -1,  9,   10,  11,  -1,
+    -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  138, -1,  -1,  -1,
+    4,   5,   6,   -1,  -1,  9,   10,  11,  -1,  -1,  14,  -1,  16,  -1,  -1,  -1,  20,  21,  -1,
+    23,  -1,  -1,  -1,  -1,  -1,  -1,  30,  31,  32,  33,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,
+    -1,  -1,  44,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  57,  -1,  -1,  -1,
+    61,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  70,  71,  72,  73,  74,  75,  -1,  77,  78,  79,
+    80,  81,  82,  -1,  -1,  85,  86,  87,  88,  89,  -1,  91,  92,  -1,  -1,  -1,  -1,  -1,  -1,
+    99,  -1,  -1,  102, 103, 104, 105, 106, 107, 108, 109, -1,  -1,  -1,  -1,  -1,  115, -1,  117,
+    118, 119, 120, -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,
+    -1,  138, -1,  -1,  -1,  4,   5,   6,   -1,  -1,  9,   10,  11,  -1,  -1,  14,  -1,  16,  -1,
+    -1,  -1,  20,  21,  -1,  23,  -1,  -1,  -1,  -1,  -1,  -1,  30,  31,  32,  33,  -1,  -1,  -1,
+    -1,  -1,  -1,  -1,  -1,  -1,  -1,  44,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,
+    -1,  57,  -1,  -1,  -1,  61,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  70,  71,  72,  73,  74,
+    75,  -1,  77,  78,  79,  80,  81,  82,  -1,  -1,  85,  86,  87,  88,  89,  -1,  91,  92,  -1,
+    -1,  -1,  -1,  -1,  -1,  99,  -1,  -1,  102, 103, 104, 105, 106, 107, 108, 109, -1,  -1,  -1,
+    -1,  -1,  115, -1,  117, 118, 119, 120, -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,
+    -1,  -1,  -1,  -1,  -1,  -1,  138, -1,  -1,  -1,  4,   5,   6,   -1,  -1,  9,   10,  11,  -1,
     -1,  14,  -1,  16,  -1,  -1,  -1,  20,  21,  -1,  23,  -1,  -1,  -1,  -1,  -1,  -1,  30,  31,
-    32,  33,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  44,  -1,  -1,  -1,  -1,  -1,  -1,
-    -1,  -1,  -1,  -1,  -1,  -1,  57,  -1,  -1,  -1,  61,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,
+    32,  33,  -1,  35,  -1,  37,  -1,  -1,  -1,  -1,  -1,  -1,  44,  -1,  -1,  -1,  -1,  -1,  -1,
+    -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  61,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,
     70,  71,  72,  73,  74,  75,  -1,  77,  78,  79,  80,  81,  82,  -1,  -1,  85,  86,  87,  88,
     89,  -1,  91,  92,  -1,  -1,  -1,  -1,  -1,  -1,  99,  -1,  -1,  102, 103, 104, 105, 106, 107,
     108, 109, -1,  -1,  -1,  -1,  -1,  115, -1,  117, 118, 119, 120, -1,  -1,  -1,  -1,  -1,  -1,
-    -1,  -1,  -1,  -1,  131, -1,  -1,  -1,  4,   5,   6,   -1,  -1,  9,   10,  11,  -1,  -1,  14,
-    -1,  16,  -1,  -1,  -1,  20,  21,  -1,  23,  -1,  -1,  -1,  -1,  -1,  -1,  30,  31,  32,  33,
-    -1,  35,  -1,  37,  -1,  -1,  -1,  -1,  -1,  -1,  44,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,
-    -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  61,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  70,  71,
-    72,  73,  74,  75,  -1,  77,  78,  79,  80,  81,  82,  -1,  -1,  85,  86,  87,  88,  89,  -1,
-    91,  92,  -1,  -1,  -1,  -1,  -1,  -1,  99,  -1,  -1,  102, 103, 104, 105, 106, 107, 108, 109,
-    -1,  -1,  -1,  -1,  -1,  115, -1,  117, 118, 119, 120, -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,
-    -1,  -1,  131, -1,  -1,  -1,  4,   5,   6,   -1,  -1,  9,   10,  11,  -1,  -1,  14,  -1,  16,
+    -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  138, -1,  -1,  -1,  4,   5,   6,   -1,
+    -1,  9,   10,  11,  -1,  -1,  14,  -1,  16,  -1,  -1,  -1,  20,  21,  -1,  23,  -1,  -1,  -1,
+    -1,  -1,  -1,  30,  31,  32,  33,  -1,  35,  -1,  37,  -1,  -1,  -1,  -1,  -1,  -1,  44,  -1,
+    -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  61,  -1,  -1,  -1,
+    -1,  -1,  -1,  -1,  -1,  70,  71,  72,  73,  74,  75,  -1,  77,  78,  79,  80,  81,  82,  -1,
+    -1,  85,  86,  87,  88,  89,  -1,  91,  92,  -1,  -1,  -1,  -1,  -1,  -1,  99,  -1,  -1,  102,
+    103, 104, 105, 106, 107, 108, 109, -1,  -1,  -1,  -1,  -1,  115, -1,  117, 118, 119, 120, -1,
+    -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  138, -1,  -1,
+    -1,  4,   5,   6,   -1,  -1,  9,   10,  11,  -1,  -1,  14,  -1,  16,  -1,  -1,  -1,  20,  21,
+    -1,  23,  -1,  -1,  -1,  -1,  -1,  -1,  30,  31,  32,  33,  -1,  35,  -1,  -1,  -1,  -1,  -1,
+    -1,  -1,  -1,  44,  -1,  -1,  -1,  48,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,
+    -1,  61,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  69,  70,  71,  72,  73,  74,  75,  -1,  77,  78,
+    79,  80,  81,  82,  -1,  -1,  85,  86,  87,  88,  89,  -1,  91,  92,  -1,  -1,  -1,  -1,  -1,
+    -1,  99,  -1,  -1,  102, 103, 104, 105, 106, 107, 108, 109, -1,  -1,  -1,  -1,  -1,  115, -1,
+    117, 118, 119, 120, -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,
+    -1,  -1,  138, -1,  -1,  -1,  4,   5,   6,   -1,  -1,  9,   10,  11,  -1,  -1,  14,  -1,  16,
     -1,  -1,  -1,  20,  21,  -1,  23,  -1,  -1,  -1,  -1,  -1,  -1,  30,  31,  32,  33,  -1,  35,
-    -1,  37,  -1,  -1,  -1,  -1,  -1,  -1,  44,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,
-    -1,  -1,  -1,  -1,  -1,  -1,  61,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  70,  71,  72,  73,
+    -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  44,  -1,  -1,  -1,  48,  -1,  -1,  -1,  -1,  -1,  -1,
+    -1,  -1,  -1,  -1,  -1,  -1,  61,  -1,  -1,  -1,  65,  -1,  -1,  -1,  69,  70,  71,  72,  73,
     74,  75,  -1,  77,  78,  79,  80,  81,  82,  -1,  -1,  85,  86,  87,  88,  89,  -1,  91,  92,
     -1,  -1,  -1,  -1,  -1,  -1,  99,  -1,  -1,  102, 103, 104, 105, 106, 107, 108, 109, -1,  -1,
     -1,  -1,  -1,  115, -1,  117, 118, 119, 120, -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,
-    131, -1,  -1,  -1,  4,   5,   6,   -1,  -1,  9,   10,  11,  -1,  -1,  14,  -1,  16,  -1,  -1,
-    -1,  20,  21,  -1,  23,  -1,  -1,  -1,  -1,  -1,  -1,  30,  31,  32,  33,  -1,  35,  -1,  -1,
-    -1,  -1,  -1,  -1,  -1,  -1,  44,  -1,  -1,  -1,  48,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,
-    -1,  -1,  -1,  -1,  61,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  69,  70,  71,  72,  73,  74,  75,
-    -1,  77,  78,  79,  80,  81,  82,  -1,  -1,  85,  86,  87,  88,  89,  -1,  91,  92,  -1,  -1,
-    -1,  -1,  -1,  -1,  99,  -1,  -1,  102, 103, 104, 105, 106, 107, 108, 109, -1,  -1,  -1,  -1,
-    -1,  115, -1,  117, 118, 119, 120, -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  131, -1,
+    -1,  -1,  -1,  -1,  -1,  -1,  -1,  138, -1,  -1,  -1,  4,   5,   6,   -1,  -1,  9,   10,  11,
+    -1,  -1,  14,  -1,  16,  -1,  -1,  -1,  20,  21,  -1,  23,  -1,  -1,  -1,  -1,  -1,  -1,  30,
+    31,  32,  33,  -1,  35,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  44,  -1,  -1,  -1,  48,  -1,
+    -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  61,  -1,  63,  -1,  65,  -1,  -1,  -1,
+    69,  70,  71,  72,  73,  74,  75,  -1,  77,  78,  79,  80,  81,  82,  -1,  -1,  85,  86,  87,
+    88,  89,  -1,  91,  92,  -1,  -1,  -1,  -1,  -1,  -1,  99,  -1,  -1,  102, 103, 104, 105, 106,
+    107, 108, 109, -1,  -1,  -1,  -1,  -1,  115, -1,  117, 118, 119, 120, -1,  -1,  -1,  -1,  -1,
+    -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  138, -1,  -1,  -1,  4,   5,   6,
+    -1,  -1,  9,   10,  11,  -1,  -1,  14,  -1,  16,  -1,  -1,  -1,  20,  21,  -1,  23,  -1,  -1,
+    -1,  -1,  -1,  -1,  30,  31,  32,  33,  -1,  35,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  44,
+    -1,  -1,  -1,  48,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  57,  -1,  -1,  -1,  61,  -1,  -1,
+    -1,  65,  -1,  -1,  -1,  69,  70,  71,  72,  73,  74,  75,  -1,  77,  78,  79,  80,  81,  82,
+    -1,  -1,  85,  86,  87,  88,  89,  -1,  91,  92,  -1,  -1,  -1,  -1,  -1,  -1,  99,  -1,  -1,
+    102, 103, 104, 105, 106, 107, 108, 109, -1,  -1,  -1,  -1,  -1,  115, -1,  117, 118, 119, 120,
+    -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  138, -1,
     -1,  -1,  4,   5,   6,   -1,  -1,  9,   10,  11,  -1,  -1,  14,  -1,  16,  -1,  -1,  -1,  20,
     21,  -1,  23,  -1,  -1,  -1,  -1,  -1,  -1,  30,  31,  32,  33,  -1,  35,  -1,  -1,  -1,  -1,
-    -1,  -1,  -1,  -1,  44,  -1,  -1,  -1,  48,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,
+    -1,  -1,  -1,  -1,  44,  -1,  -1,  -1,  48,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  57,  -1,
     -1,  -1,  61,  -1,  -1,  -1,  65,  -1,  -1,  -1,  69,  70,  71,  72,  73,  74,  75,  -1,  77,
     78,  79,  80,  81,  82,  -1,  -1,  85,  86,  87,  88,  89,  -1,  91,  92,  -1,  -1,  -1,  -1,
     -1,  -1,  99,  -1,  -1,  102, 103, 104, 105, 106, 107, 108, 109, -1,  -1,  -1,  -1,  -1,  115,
-    -1,  117, 118, 119, 120, -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  131, -1,  -1,  -1,
-    4,   5,   6,   -1,  -1,  9,   10,  11,  -1,  -1,  14,  -1,  16,  -1,  -1,  -1,  20,  21,  -1,
-    23,  -1,  -1,  -1,  -1,  -1,  -1,  30,  31,  32,  33,  -1,  35,  -1,  -1,  -1,  -1,  -1,  -1,
-    -1,  -1,  44,  -1,  -1,  -1,  48,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,
-    61,  -1,  63,  -1,  65,  -1,  -1,  -1,  69,  70,  71,  72,  73,  74,  75,  -1,  77,  78,  79,
-    80,  81,  82,  -1,  -1,  85,  86,  87,  88,  89,  -1,  91,  92,  -1,  -1,  -1,  -1,  -1,  -1,
-    99,  -1,  -1,  102, 103, 104, 105, 106, 107, 108, 109, -1,  -1,  -1,  -1,  -1,  115, -1,  117,
-    118, 119, 120, -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  131, -1,  -1,  -1,  4,   5,
-    6,   -1,  -1,  9,   10,  11,  -1,  -1,  14,  -1,  16,  -1,  -1,  -1,  20,  21,  -1,  23,  -1,
-    -1,  -1,  -1,  -1,  -1,  30,  31,  32,  33,  -1,  35,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,
-    44,  -1,  -1,  -1,  48,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  57,  -1,  -1,  -1,  61,  -1,
-    -1,  -1,  65,  -1,  -1,  -1,  69,  70,  71,  72,  73,  74,  75,  -1,  77,  78,  79,  80,  81,
-    82,  -1,  -1,  85,  86,  87,  88,  89,  -1,  91,  92,  -1,  -1,  -1,  -1,  -1,  -1,  99,  -1,
-    -1,  102, 103, 104, 105, 106, 107, 108, 109, -1,  -1,  -1,  -1,  -1,  115, -1,  117, 118, 119,
-    120, -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  131, -1,  -1,  -1,  4,   5,   6,   -1,
-    -1,  9,   10,  11,  -1,  -1,  14,  -1,  16,  -1,  -1,  -1,  20,  21,  -1,  23,  -1,  -1,  -1,
-    -1,  -1,  -1,  30,  31,  32,  33,  -1,  35,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  44,  -1,
-    -1,  -1,  48,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  57,  -1,  -1,  -1,  61,  -1,  -1,  -1,
-    65,  -1,  -1,  -1,  69,  70,  71,  72,  73,  74,  75,  -1,  77,  78,  79,  80,  81,  82,  -1,
-    -1,  85,  86,  87,  88,  89,  -1,  91,  92,  -1,  -1,  -1,  -1,  -1,  -1,  99,  -1,  -1,  102,
-    103, 104, 105, 106, 107, 108, 109, -1,  -1,  -1,  -1,  -1,  115, -1,  117, 118, 119, 120, -1,
-    -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  131, -1,  -1,  -1,  4,   -1,  -1,  -1,  -1,  9,
-    -1,  11,  12,  13,  14,  -1,  -1,  -1,  -1,  -1,  -1,  21,  22,  23,  -1,  -1,  -1,  -1,  -1,
-    -1,  30,  31,  -1,  -1,  34,  35,  -1,  37,  -1,  -1,  -1,  41,  -1,  43,  44,  45,  -1,  -1,
-    48,  -1,  -1,  -1,  -1,  53,  -1,  55,  -1,  -1,  -1,  -1,  -1,  61,  -1,  63,  -1,  -1,  -1,
-    -1,  -1,  69,  70,  71,  72,  73,  74,  75,  76,  77,  78,  79,  80,  81,  82,  -1,  -1,  85,
-    86,  87,  -1,  -1,  -1,  91,  -1,  93,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  101, 102, 103, -1,
-    105, -1,  107, 108, 109, 110, 111, -1,  -1,  -1,  -1,  -1,  117, 118, 119, 120, -1,  -1,  -1,
-    -1,  -1,  -1,  -1,  -1,  129, -1,  131, -1,  -1,  -1,  4,   -1,  -1,  -1,  -1,  9,   -1,  11,
-    12,  13,  14,  -1,  -1,  -1,  -1,  -1,  -1,  21,  22,  23,  -1,  -1,  -1,  -1,  -1,  -1,  30,
-    31,  -1,  -1,  34,  35,  -1,  37,  -1,  -1,  -1,  41,  -1,  43,  44,  45,  -1,  -1,  48,  -1,
-    -1,  -1,  -1,  53,  -1,  55,  -1,  -1,  -1,  -1,  -1,  61,  -1,  63,  -1,  -1,  -1,  -1,  -1,
-    69,  70,  71,  72,  73,  74,  75,  76,  77,  78,  79,  80,  81,  82,  -1,  -1,  85,  86,  87,
-    -1,  -1,  -1,  91,  -1,  93,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  101, 102, 103, -1,  105, -1,
-    107, 108, 109, 110, 111, -1,  -1,  -1,  -1,  -1,  117, 118, 119, 120, -1,  -1,  -1,  -1,  -1,
-    -1,  -1,  128, 129, -1,  131, -1,  -1,  -1,  4,   -1,  -1,  -1,  -1,  9,   -1,  11,  12,  13,
-    14,  -1,  -1,  -1,  -1,  -1,  -1,  21,  22,  23,  -1,  -1,  -1,  -1,  -1,  -1,  30,  31,  -1,
-    -1,  34,  35,  -1,  37,  -1,  -1,  -1,  41,  -1,  43,  44,  45,  -1,  -1,  48,  -1,  -1,  -1,
-    -1,  53,  -1,  55,  -1,  -1,  -1,  -1,  -1,  61,  -1,  63,  -1,  -1,  -1,  -1,  -1,  69,  70,
-    71,  72,  73,  74,  75,  76,  77,  78,  79,  80,  81,  82,  -1,  -1,  85,  86,  87,  -1,  -1,
-    -1,  91,  -1,  93,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  101, 102, 103, -1,  105, -1,  107, 108,
-    109, 110, 111, -1,  -1,  -1,  -1,  -1,  117, 118, 119, 120, -1,  -1,  -1,  -1,  -1,  -1,  -1,
-    128, 129, -1,  131, -1,  -1,  -1,  4,   -1,  -1,  -1,  -1,  9,   -1,  11,  12,  13,  14,  -1,
+    -1,  117, 118, 119, 120, -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,
+    -1,  -1,  -1,  138, -1,  -1,  -1,  4,   -1,  -1,  -1,  -1,  9,   -1,  11,  12,  13,  14,  -1,
     -1,  -1,  -1,  -1,  -1,  21,  22,  23,  -1,  -1,  -1,  -1,  -1,  -1,  30,  31,  -1,  -1,  34,
     35,  -1,  37,  -1,  -1,  -1,  41,  -1,  43,  44,  45,  -1,  -1,  48,  -1,  -1,  -1,  -1,  53,
     -1,  55,  -1,  -1,  -1,  -1,  -1,  61,  -1,  63,  -1,  -1,  -1,  -1,  -1,  69,  70,  71,  72,
     73,  74,  75,  76,  77,  78,  79,  80,  81,  82,  -1,  -1,  85,  86,  87,  -1,  -1,  -1,  91,
     -1,  93,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  101, 102, 103, -1,  105, -1,  107, 108, 109, 110,
-    111, -1,  -1,  -1,  -1,  -1,  117, 118, 119, 120, -1,  -1,  -1,  -1,  -1,  -1,  -1,  128, 129,
-    -1,  131, -1,  -1,  -1,
+    111, -1,  -1,  -1,  -1,  -1,  117, 118, 119, 120, -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,
+    -1,  -1,  -1,  -1,  -1,  -1,  136, -1,  138, -1,  -1,  -1,  4,   -1,  -1,  -1,  -1,  9,   -1,
+    11,  12,  13,  14,  -1,  -1,  -1,  -1,  -1,  -1,  21,  22,  23,  -1,  -1,  -1,  -1,  -1,  -1,
+    30,  31,  -1,  -1,  34,  35,  -1,  37,  -1,  -1,  -1,  41,  -1,  43,  44,  45,  -1,  -1,  48,
+    -1,  -1,  -1,  -1,  53,  -1,  55,  -1,  -1,  -1,  -1,  -1,  61,  -1,  63,  -1,  -1,  -1,  -1,
+    -1,  69,  70,  71,  72,  73,  74,  75,  76,  77,  78,  79,  80,  81,  82,  -1,  -1,  85,  86,
+    87,  -1,  -1,  -1,  91,  -1,  93,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  101, 102, 103, -1,  105,
+    -1,  107, 108, 109, 110, 111, -1,  -1,  -1,  -1,  -1,  117, 118, 119, 120, -1,  -1,  -1,  -1,
+    -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  135, 136, -1,  138, -1,  -1,  -1,  4,   -1,
+    -1,  -1,  -1,  9,   -1,  11,  12,  13,  14,  -1,  -1,  -1,  -1,  -1,  -1,  21,  22,  23,  -1,
+    -1,  -1,  -1,  -1,  -1,  30,  31,  -1,  -1,  34,  35,  -1,  37,  -1,  -1,  -1,  41,  -1,  43,
+    44,  45,  -1,  -1,  48,  -1,  -1,  -1,  -1,  53,  -1,  55,  -1,  -1,  -1,  -1,  -1,  61,  -1,
+    63,  -1,  -1,  -1,  -1,  -1,  69,  70,  71,  72,  73,  74,  75,  76,  77,  78,  79,  80,  81,
+    82,  -1,  -1,  85,  86,  87,  -1,  -1,  -1,  91,  -1,  93,  -1,  -1,  -1,  -1,  -1,  -1,  -1,
+    101, 102, 103, -1,  105, -1,  107, 108, 109, 110, 111, -1,  -1,  -1,  -1,  -1,  117, 118, 119,
+    120, -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  135, 136, -1,  138,
+    -1,  -1,  -1,  4,   -1,  -1,  -1,  -1,  9,   -1,  11,  12,  13,  14,  -1,  -1,  -1,  -1,  -1,
+    -1,  21,  22,  23,  -1,  -1,  -1,  -1,  -1,  -1,  30,  31,  -1,  -1,  34,  35,  -1,  37,  -1,
+    -1,  -1,  41,  -1,  43,  44,  45,  -1,  -1,  48,  -1,  -1,  -1,  -1,  53,  -1,  55,  -1,  -1,
+    -1,  -1,  -1,  61,  -1,  63,  -1,  -1,  -1,  -1,  -1,  69,  70,  71,  72,  73,  74,  75,  76,
+    77,  78,  79,  80,  81,  82,  -1,  -1,  85,  86,  87,  -1,  -1,  -1,  91,  -1,  93,  -1,  -1,
+    -1,  -1,  -1,  -1,  -1,  101, 102, 103, -1,  105, -1,  107, 108, 109, 110, 111, -1,  -1,  -1,
+    -1,  -1,  117, 118, 119, 120, -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,
+    -1,  135, 136, -1,  138, -1,  -1,  -1,
 
-    207, 198, 198, 207, 20,  208, 206, 90,  200, 199, 198, 66,  15,  200, 199, 198, 66,  15,  82,
-    75,  214, 20,  82,  214, 122, 119, 80,  75,  212, 15,  212, 211, 14,  208, 15,  75,  15,  14,
-    75,  24,  24,  82,  15,  77,  82,  199, 75,  77,  61,  141, 15,  15,  87,  119, 15,  101, 77,
-    122, 100, 61,  61,  37,  77,  90,  15,  15,  66,  77,  82,  24,  82,  77,  15,  36,  194, 37,
-    15,  37,  75,  37,  161, 205, 227, 161, 188, 228, 77,  82,  191, 77,  82,  15,  198, 15,  32,
-    208, 207, 77,  199, 198, 15,  206, 198, 200, 199, 15,  208, 66,  199, 66,  200, 200, 198, 15,
-    207, 20,  198, 66,  43,  198, 200, 66,  199, 20,  212, 200, 199, 214, 198, 66,  82,  15,  43,
-    20,  82,  82,  43,  20,  61,  211, 61,  198, 227, 15,  100, 80,  90,  66,  206, 75,  77,  15,
-    161, 82,  100, 49,  49,  77,  75,  77,  49,  15,  98,  66,  98,  66,  82,  66,  82,  82,  82,
-    199, 198, 15,  66,  200, 66,  24,  82,  15,  61,  200, 199, 15,  2,   2,   77,  82,  66,  185,
-    98,  100, 90,  99,  82,  77,  61,  77,  32,  2,   100, 32,  77,  77,  100, 198, 61,  2,   77,
-    82,  80,  84,  61,  62,  32,  32,  61,  62,  61,  62,  82,  82,  82,  83,  61,  77,  78,  11,
-    12,  32,  32,  82,  2,   35,  61,  62,  77,  32,  82,  61,  62,  61,  82,  105, 105, 61,  61,
-    62,  77,  77,  32,  2,   32,  61,  105, 61,  62,  61,  15,  96,  61,  105, 32,  15,  2,   105,
-    32,  57,  143, 143, 61,  62,  61,  20,  143, 2,   96,  156, 2,   -1,  96,  32,  61,  62,  61,
-    62,  2,   61,  96,  2,   15,  -1,  96,  61,  32,  96,  43,  230, 231, 20,  61,  61,  143, 61,
-    61,  32,  61,  96,  32,  61,  32,  61,  62,  183, 143, 143, 32,  196, 61,  32,  61,  62,  43,
-    109, 61,  62,  61,  62,  61,  163, 116, 162, -1,  93,  92,  96,  -1,  92,  61,  62,  -1,  61,
-    62,  61,  62,  -1,  61,  62,  213, 92,  61,  62,  61,  62,  61,  62,  61,  62,  213, 61,  61,
-    62,  61,  96,  61,  62,  61,  62,  78,  79,  61,  62,  82,  61,  62,  61,  62,  76,  61,  62,
-    57,  163, 59,  163, -1,  96,  61,  62,  61,  62,  92,  93,  61,  62,  61,  161, 61,  62,  61,
-    62,  61,  62,  61,  62,  61,  62,  196, 61,  17,  76,  109, 61,  62,  61,  -1,  85,  61,  61,
-    204, 61,  62,  -1,  76,  92,  3,   -1,  61,  62,  76,  -1,  -1,  76,  76,  61,  61,  -1,  61,
-    -1,  61,  109, -1,  163, 109, -1,  218, 213, 116, -1,  76,  76,  -1,  76,  61,  76,  96,  109,
-    197, 177, 112, 177, 197, 109, 197, 130, 109, 109, -1,  76,  -1,  184, 3,   115, 61,  61,  62,
-    152, 177, -1,  126, 124, 177, 109, 109, 206, 109, -1,  109, -1,  197, 116, 197, -1,  197, 102,
-    -1,  -1,  61,  120, -1,  88,  128, 223, 197, 92,  93,  238, 61,  132, 85,  -1,  201, 76,  177,
-    61,  177, 2,   173, -1,  177, 196, 177, 76,  197, 211, 197, 175, 61,  177, 76,  17,  109, 85,
-    109, 61,  204, 61,  62,  116, 173, 116, 57,  76,  177, 61,  109, 32,  232, -1,  76,  232, 115,
-    85,  78,  -1,  109, 109, 85,  61,  76,  -1,  115, 109, 116, 61,  17,  -1,  85,  -1,  116, 85,
-    85,  232, 76,  61,  109, 109, 109, 112, 76,  85,  109, 109, 116, 116, -1,  113, 174, 116, 76,
-    177, 109, 109, 234, 109, 109, 113, -1,  116, 61,  62,  116, 116, 17,  109, -1,  109, 61,  -1,
-    61,  61,  116, 109, 116, -1,  102, 30,  -1,  61,  -1,  117, -1,  76,  -1,  76,  76,  204, 61,
-    204, -1,  92,  -1,  -1,  76,  -1,  -1,  -1,  -1,  154, -1,  156, -1,  76,  17,  -1,  -1,  -1,
-    61,  61,  -1,  102, 204, -1,  27,  106, 109, 110, 111, 109, 184, -1,  -1,  76,  76,  61,  116,
-    109, 110, 111, 61,  -1,  204, 204, -1,  -1,  109, 204, -1,  129, 76,  196, 17,  116, -1,  76,
-    61,  204, 61,  102, 204, 204, 27,  -1,  127, 210, 61,  109, 110, 111, 204, 76,  61,  76,  -1,
-    61,  62,  -1,  3,   -1,  61,  76,  -1,  109, 110, 111, 61,  76,  109, 110, 111, 182, 78,  79,
-    -1,  76,  61,  61,  -1,  102, 17,  76,  -1,  61,  109, 110, 111, 61,  61,  -1,  27,  76,  76,
-    -1,  109, 110, 111, 17,  76,  -1,  109, -1,  76,  76,  -1,  61,  62,  116, 109, -1,  30,  -1,
-    121, -1,  109, 116, 17,  102, -1,  -1,  -1,  116, 78,  118, 61,  109, 110, 111, -1,  30,  131,
-    109, 110, 111, -1,  109, 109, 17,  -1,  76,  17,  61,  116, 116, 17,  25,  -1,  27,  -1,  17,
-    123, 125, -1,  30,  4,   -1,  76,  30,  26,  27,  61,  -1,  -1,  64,  109, 102, 4,   17,  -1,
-    -1,  -1,  116, -1,  -1,  -1,  76,  -1,  -1,  184, 17,  30,  61,  102, -1,  61,  -1,  59,  64,
-    61,  -1,  -1,  17,  30,  61,  -1,  -1,  76,  -1,  -1,  76,  -1,  102, -1,  76,  30,  -1,  -1,
-    -1,  76,  59,  36,  61,  38,  39,  40,  41,  42,  -1,  17,  164, 165, 59,  102, 61,  -1,  102,
-    76,  -1,  184, 102, -1,  30,  -1,  -1,  102, -1,  17,  36,  76,  38,  39,  40,  41,  42,  25,
-    -1,  -1,  -1,  -1,  30,  31,  -1,  102, -1,  -1,  -1,  -1,  -1,  -1,  204, -1,  -1,  -1,  -1,
-    102, -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  59,  -1,  61,  -1,  -1,
-    -1,  17,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  27,  76,  29,  -1,  -1,  -1,  -1,  -1,
+    90,  208, 207, 198, 82,  208, 207, 198, 82,  20,  80,  75,  15,  206, 200, 15,  199, 198, 66,
+    198, 200, 199, 66,  122, 20,  75,  214, 119, 15,  214, 212, 14,  75,  15,  75,  212, 211, 15,
+    14,  24,  101, 75,  15,  24,  82,  24,  53,  77,  15,  199, 15,  15,  62,  77,  15,  15,  141,
+    75,  15,  82,  77,  119, 15,  122, 77,  62,  15,  226, 87,  100, 227, 66,  15,  82,  90,  37,
+    82,  82,  77,  205, 82,  37,  62,  77,  198, 37,  199, 194, 198, 66,  199, 15,  200, 161, 200,
+    198, 207, 212, 161, 36,  188, 15,  214, 208, 191, 77,  77,  37,  15,  32,  20,  77,  208, 207,
+    198, 66,  199, 206, 200, 82,  66,  43,  226, 198, 20,  66,  199, 82,  200, 198, 15,  66,  82,
+    200, 199, 62,  198, 20,  20,  75,  80,  100, 100, 77,  50,  50,  50,  62,  77,  15,  75,  77,
+    90,  66,  211, 206, 198, 66,  15,  198, 161, 82,  82,  82,  82,  82,  199, 98,  200, 66,  82,
+    66,  100, 15,  66,  66,  198, 66,  199, 15,  82,  15,  98,  82,  24,  200, 62,  77,  15,  100,
+    90,  77,  100, 77,  185, 32,  99,  98,  77,  77,  32,  2,   82,  62,  84,  2,   62,  63,  2,
+    62,  63,  62,  63,  82,  83,  2,   62,  82,  80,  77,  78,  82,  77,  62,  2,   11,  12,  77,
+    82,  32,  77,  32,  35,  77,  62,  32,  2,   82,  32,  32,  105, 32,  35,  62,  105, 32,  62,
+    63,  15,  82,  15,  105, 62,  63,  32,  62,  63,  96,  62,  63,  105, 2,   62,  63,  143, 143,
+    32,  62,  96,  32,  62,  32,  105, 62,  62,  2,   58,  96,  32,  62,  2,   62,  62,  62,  2,
+    62,  63,  62,  143, 62,  63,  32,  62,  143, 2,   62,  143, 62,  2,   143, 62,  96,  62,  63,
+    96,  32,  62,  156, 96,  92,  32,  92,  92,  109, 32,  62,  63,  96,  62,  63,  116, 183, -1,
+    93,  32,  62,  163, -1,  32,  -1,  162, 229, 230, -1,  96,  -1,  62,  63,  62,  63,  96,  62,
+    63,  62,  63,  78,  79,  196, -1,  82,  62,  63,  62,  63,  213, 92,  93,  62,  63,  62,  63,
+    62,  63,  62,  63,  62,  63,  213, 62,  63,  62,  17,  163, 15,  -1,  96,  62,  63,  62,  63,
+    62,  63,  62,  63,  76,  62,  63,  62,  63,  62,  63,  62,  63,  62,  63,  62,  63,  62,  63,
+    62,  163, 62,  163, 62,  63,  62,  62,  161, 204, -1,  92,  85,  62,  76,  196, 76,  62,  109,
+    62,  76,  76,  62,  63,  85,  -1,  -1,  76,  58,  217, 60,  76,  3,   76,  177, -1,  109, 62,
+    184, 213, 62,  63,  -1,  116, 62,  62,  63,  109, 109, 109, 62,  76,  85,  109, 109, 116, 116,
+    102, 76,  62,  109, 78,  222, -1,  76,  -1,  109, -1,  177, -1,  132, 120, 197, 128, 130, 177,
+    109, 177, 201, 197, 62,  124, 237, 116, 109, 88,  -1,  62,  63,  92,  93,  109, 117, 197, 76,
+    62,  3,   109, -1,  197, 62,  197, -1,  115, 197, 177, 62,  63,  126, 76,  62,  177, 197, 177,
+    76,  62,  -1,  175, 197, 177, 231, 96,  152, 197, 76,  -1,  62,  109, 85,  76,  85,  204, 62,
+    173, 116, 211, 206, 177, 109, 62,  76,  85,  109, 204, -1,  116, 76,  109, 231, 116, 112, 173,
+    109, 76,  109, 177, 85,  109, 85,  116, 112, 116, 109, 231, 85,  109, 196, 184, 115, 62,  63,
+    204, 116, 109, 62,  63,  62,  113, 58,  109, 109, 17,  109, 113, -1,  78,  109, 116, 109, 116,
+    76,  -1,  115, -1,  -1,  116, 62,  -1,  17,  -1,  -1,  -1,  109, 62,  92,  -1,  62,  -1,  27,
+    116, 76,  -1,  -1,  -1,  62,  -1,  -1,  76,  174, -1,  76,  177, 62,  109, -1,  -1,  62,  -1,
+    76,  -1,  116, -1,  62,  204, -1,  -1,  76,  -1,  -1,  17,  76,  127, 62,  109, 110, 111, 76,
+    204, 3,   204, 109, 110, 111, 109, 110, 111, 76,  -1,  233, -1,  204, 109, -1,  82,  83,  -1,
+    102, -1,  116, 109, 110, 111, 62,  121, 154, 204, 156, 204, 17,  109, 110, 111, 17,  204, 62,
+    62,  76,  -1,  27,  109, 29,  184, 27,  62,  182, -1,  116, 204, 76,  76,  17,  62,  63,  -1,
+    -1,  -1,  -1,  76,  62,  129, -1,  -1,  17,  30,  -1,  -1,  196, 78,  79,  109, 110, 111, 76,
+    -1,  102, 30,  -1,  62,  106, 17,  210, -1,  109, 110, 111, -1,  62,  62,  -1,  27,  109, 76,
+    -1,  82,  83,  62,  62,  116, -1,  118, 76,  76,  -1,  -1,  109, 109, 17,  62,  -1,  76,  76,
+    116, 116, 17,  25,  -1,  27,  102, -1,  -1,  -1,  76,  17,  17,  62,  -1,  30,  131, -1,  -1,
+    -1,  26,  27,  109, 109, 102, 30,  4,   76,  -1,  116, 116, 17,  109, 110, 111, -1,  102, 123,
+    125, 17,  62,  46,  -1,  -1,  30,  60,  -1,  62,  164, 165, -1,  -1,  30,  102, 76,  -1,  62,
+    62,  -1,  62,  46,  76,  184, 36,  -1,  38,  39,  40,  41,  42,  76,  76,  17,  76,  -1,  20,
+    62,  -1,  4,   -1,  102, -1,  60,  -1,  62,  30,  -1,  102, 204, -1,  76,  17,  17,  -1,  -1,
+    20,  102, 102, 76,  -1,  -1,  46,  -1,  -1,  30,  30,  109, 110, 111, -1,  -1,  -1,  -1,  -1,
+    -1,  17,  102, 62,  -1,  17,  -1,  46,  -1,  25,  102, -1,  -1,  -1,  30,  31,  -1,  76,  30,
+    -1,  60,  -1,  62,  62,  36,  -1,  38,  39,  40,  41,  42,  -1,  17,  -1,  -1,  -1,  76,  76,
+    -1,  -1,  -1,  -1,  -1,  102, 60,  30,  62,  -1,  -1,  -1,  -1,  36,  -1,  38,  39,  40,  41,
+    42,  -1,  -1,  76,  -1,  102, 102, -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,
+    -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  102, -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,
     -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,
-    102, -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,
-    -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  82,  83,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,
+    -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  17,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,
+    -1,  -1,  30,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,
+    -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  62,  -1,  64,  -1,
+    -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  76,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,
+    -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  102, -1,
     -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,
     -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,
     -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,
@@ -1799,4 +1880,4 @@ const short QmlJSGrammar::action_check[] = {
     -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,
     -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,
     -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,
-    -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1};
+    -1,  -1};
diff --git a/src/libs/qmljs/parser/qmljsgrammar_p.h b/src/libs/qmljs/parser/qmljsgrammar_p.h
index d1c65458962..0ca3a8d8d43 100644
--- a/src/libs/qmljs/parser/qmljsgrammar_p.h
+++ b/src/libs/qmljs/parser/qmljsgrammar_p.h
@@ -10,7 +10,7 @@ class QML_PARSER_EXPORT QmlJSGrammar
 public:
     enum VariousConstants {
         EOF_SYMBOL = 0,
-        REDUCE_HERE = 132,
+        REDUCE_HERE = 139,
         T_AND = 1,
         T_AND_AND = 2,
         T_AND_EQ = 3,
@@ -39,24 +39,25 @@ public:
         T_ELLIPSIS = 100,
         T_ELSE = 16,
         T_ENUM = 99,
+        T_EOL = 123,
         T_EQ = 17,
         T_EQ_EQ = 18,
         T_EQ_EQ_EQ = 19,
-        T_ERROR = 121,
+        T_ERROR = 122,
         T_EXPORT = 106,
         T_EXTENDS = 104,
         T_FALSE = 87,
-        T_FEED_JS_EXPRESSION = 125,
-        T_FEED_JS_MODULE = 127,
-        T_FEED_JS_SCRIPT = 126,
-        T_FEED_JS_STATEMENT = 124,
-        T_FEED_UI_OBJECT_MEMBER = 123,
-        T_FEED_UI_PROGRAM = 122,
+        T_FEED_JS_EXPRESSION = 132,
+        T_FEED_JS_MODULE = 134,
+        T_FEED_JS_SCRIPT = 133,
+        T_FEED_JS_STATEMENT = 131,
+        T_FEED_UI_OBJECT_MEMBER = 130,
+        T_FEED_UI_PROGRAM = 129,
         T_FINALLY = 20,
         T_FOR = 21,
-        T_FORCE_BLOCK = 129,
-        T_FORCE_DECLARATION = 128,
-        T_FOR_LOOKAHEAD_OK = 130,
+        T_FORCE_BLOCK = 136,
+        T_FORCE_DECLARATION = 135,
+        T_FOR_LOOKAHEAD_OK = 137,
         T_FROM = 107,
         T_FUNCTION = 23,
         T_FUNCTION_STAR = 22,
@@ -85,6 +86,7 @@ public:
         T_MINUS_MINUS = 43,
         T_MULTILINE_STRING_LITERAL = 93,
         T_NEW = 44,
+        T_NONE = 121,
         T_NOT = 45,
         T_NOT_EQ = 46,
         T_NOT_EQ_EQ = 47,
@@ -92,10 +94,15 @@ public:
         T_NULL = 85,
         T_NUMERIC_LITERAL = 48,
         T_OF = 118,
-        T_ON = 131,
+        T_ON = 138,
         T_OR = 49,
         T_OR_EQ = 51,
         T_OR_OR = 52,
+        T_PARTIAL_COMMENT = 124,
+        T_PARTIAL_DOUBLE_QUOTE_STRING_LITERAL = 126,
+        T_PARTIAL_SINGLE_QUOTE_STRING_LITERAL = 125,
+        T_PARTIAL_TEMPLATE_HEAD = 127,
+        T_PARTIAL_TEMPLATE_MIDDLE = 128,
         T_PLUS = 53,
         T_PLUS_EQ = 54,
         T_PLUS_PLUS = 55,
@@ -128,7 +135,7 @@ public:
         T_TEMPLATE_HEAD = 111,
         T_TEMPLATE_MIDDLE = 112,
         T_TEMPLATE_TAIL = 113,
-        T_THEN = 133,
+        T_THEN = 140,
         T_THIS = 74,
         T_THROW = 75,
         T_TILDE = 76,
@@ -140,20 +147,20 @@ public:
         T_VOID = 80,
         T_WHILE = 81,
         T_WITH = 82,
-        T_WITHOUTAS = 134,
+        T_WITHOUTAS = 141,
         T_XOR = 83,
         T_XOR_EQ = 84,
         T_YIELD = 101,
 
-        ACCEPT_STATE = 1087,
-        RULE_COUNT = 617,
-        STATE_COUNT = 1088,
-        TERMINAL_COUNT = 135,
-        NON_TERMINAL_COUNT = 240,
+        ACCEPT_STATE = 1104,
+        RULE_COUNT = 620,
+        STATE_COUNT = 1105,
+        TERMINAL_COUNT = 142,
+        NON_TERMINAL_COUNT = 239,
 
-        GOTO_INDEX_OFFSET = 1088,
-        GOTO_INFO_OFFSET = 7358,
-        GOTO_CHECK_OFFSET = 7358
+        GOTO_INDEX_OFFSET = 1105,
+        GOTO_INFO_OFFSET = 7893,
+        GOTO_CHECK_OFFSET = 7893
     };
 
     static const char *const     spell[];
diff --git a/src/libs/qmljs/parser/qmljslexer.cpp b/src/libs/qmljs/parser/qmljslexer.cpp
index 248f1f92f30..ce1b9bd835d 100644
--- a/src/libs/qmljs/parser/qmljslexer.cpp
+++ b/src/libs/qmljs/parser/qmljslexer.cpp
@@ -16,6 +16,7 @@
 QT_BEGIN_NAMESPACE
 Q_CORE_EXPORT double qstrntod(const char *s00, qsizetype len, char const **se, bool *ok);
 QT_END_NAMESPACE
+#include <optional>
 
 using namespace QmlJS;
 
@@ -46,30 +47,10 @@ static inline QChar convertHex(QChar c1, QChar c2)
     return QChar((convertHex(c1.unicode()) << 4) + convertHex(c2.unicode()));
 }
 
-Lexer::Lexer(Engine *engine)
+Lexer::Lexer(Engine *engine, LexMode lexMode)
     : _engine(engine)
-    , _codePtr(nullptr)
+    , _lexMode(lexMode)
     , _endPtr(nullptr)
-    , _tokenStartPtr(nullptr)
-    , _char(u'\n')
-    , _errorCode(NoError)
-    , _currentLineNumber(0)
-    , _currentColumnNumber(0)
-    , _tokenValue(0)
-    , _parenthesesState(IgnoreParentheses)
-    , _parenthesesCount(0)
-    , _stackToken(-1)
-    , _patternFlags(0)
-    , _tokenKind(0)
-    , _tokenLength(0)
-    , _tokenLine(0)
-    , _tokenColumn(0)
-    , _validTokenText(false)
-    , _prohibitAutomaticSemicolon(false)
-    , _restrictedKeyword(false)
-    , _terminator(false)
-    , _followsClosingBrace(false)
-    , _delimited(true)
     , _qmlMode(true)
 {
     if (engine)
@@ -86,13 +67,22 @@ QString Lexer::code() const
     return _code;
 }
 
-void Lexer::setCode(const QString &code, int lineno, bool qmlMode)
+void Lexer::setCode(const QString &code,
+                    int lineno,
+                    bool qmlMode,
+                    Lexer::CodeContinuation codeContinuation)
 {
+    if (codeContinuation == Lexer::CodeContinuation::Continue)
+        _currentOffset += _code.size();
+    else
+        _currentOffset = 0;
     if (_engine)
         _engine->setCode(code);
 
     _qmlMode = qmlMode;
     _code = code;
+    _skipLinefeed = false;
+
     _tokenText.clear();
     _tokenText.reserve(1024);
     _errorMessage.clear();
@@ -100,33 +90,18 @@ void Lexer::setCode(const QString &code, int lineno, bool qmlMode)
     _rawString = QStringView();
 
     _codePtr = code.unicode();
-    _endPtr = _codePtr + code.length();
+    _endPtr = _codePtr + code.size();
     _tokenStartPtr = _codePtr;
 
-    _char = u'\n';
-    _errorCode = NoError;
-
-    _currentLineNumber = lineno;
+    if (lineno >= 0)
+        _currentLineNumber = lineno;
     _currentColumnNumber = 0;
-    _tokenValue = 0;
-
-    // parentheses state
-    _parenthesesState = IgnoreParentheses;
-    _parenthesesCount = 0;
-
-    _stackToken = -1;
-
-    _patternFlags = 0;
-    _tokenLength = 0;
-    _tokenLine = lineno;
+    _tokenLine = _currentLineNumber;
     _tokenColumn = 0;
+    _tokenLength = 0;
 
-    _validTokenText = false;
-    _prohibitAutomaticSemicolon = false;
-    _restrictedKeyword = false;
-    _terminator = false;
-    _followsClosingBrace = false;
-    _delimited = true;
+    if (codeContinuation == Lexer::CodeContinuation::Reset)
+        _state = State{};
 }
 
 void Lexer::scanChar()
@@ -136,14 +111,14 @@ void Lexer::scanChar()
         ++_codePtr;
         _skipLinefeed = false;
     }
-    _char = *_codePtr++;
+    _state.currentChar = *_codePtr++;
     ++_currentColumnNumber;
 
     if (isLineTerminator()) {
-        if (_char == u'\r') {
+        if (_state.currentChar == u'\r') {
             if (_codePtr < _endPtr && *_codePtr == u'\n')
                 _skipLinefeed = true;
-            _char = u'\n';
+            _state.currentChar = u'\n';
         }
         ++_currentLineNumber;
         _currentColumnNumber = 0;
@@ -225,59 +200,136 @@ int octalDigit(QChar c)
 
 int Lexer::lex()
 {
-    const int previousTokenKind = _tokenKind;
+    const int previousTokenKind = _state.tokenKind;
+    int tokenKind;
+    bool firstPass = true;
 
   again:
+    tokenKind = T_ERROR;
     _tokenSpell = QStringView();
     _rawString = QStringView();
-    _tokenKind = scanToken();
-    _tokenLength = _codePtr - _tokenStartPtr - 1;
+    if (firstPass && _state.stackToken == -1) {
+        firstPass = false;
+        if (_codePtr > _endPtr && _lexMode == LexMode::LineByLine && !_code.isEmpty())
+            return T_EOL;
 
-    _delimited = false;
-    _restrictedKeyword = false;
-    _followsClosingBrace = (previousTokenKind == T_RBRACE);
+        if (_state.comments == CommentState::InMultilineComment) {
+            scanChar();
+            _tokenStartPtr = _codePtr - 1;
+            _tokenLine = _currentLineNumber;
+            _tokenColumn = _currentColumnNumber;
+            while (_codePtr <= _endPtr) {
+                if (_state.currentChar == u'*') {
+                    scanChar();
+                    if (_state.currentChar == u'/') {
+                        scanChar();
+                        if (_engine) {
+                            _engine->addComment(tokenOffset() + 2,
+                                                _codePtr - _tokenStartPtr - 1 - 4,
+                                                tokenStartLine(),
+                                                tokenStartColumn() + 2);
+                        }
+                        tokenKind = T_COMMENT;
+                        break;
+                    }
+                } else {
+                    scanChar();
+                }
+            }
+            if (tokenKind == T_ERROR)
+                tokenKind = T_PARTIAL_COMMENT;
+        } else {
+            // handle multiline continuation
+            std::optional<ScanStringMode> scanMode;
+            switch (previousTokenKind) {
+            case T_PARTIAL_SINGLE_QUOTE_STRING_LITERAL:
+                scanMode = ScanStringMode::SingleQuote;
+                break;
+            case T_PARTIAL_DOUBLE_QUOTE_STRING_LITERAL:
+                scanMode = ScanStringMode::DoubleQuote;
+                break;
+            case T_PARTIAL_TEMPLATE_HEAD:
+                scanMode = ScanStringMode::TemplateHead;
+                break;
+            case T_PARTIAL_TEMPLATE_MIDDLE:
+                scanMode = ScanStringMode::TemplateContinuation;
+                break;
+            default:
+                break;
+            }
+            if (scanMode) {
+                scanChar();
+                _tokenStartPtr = _codePtr - 1;
+                _tokenLine = _currentLineNumber;
+                _tokenColumn = _currentColumnNumber;
+                tokenKind = scanString(*scanMode);
+            }
+        }
+    }
+    if (tokenKind == T_ERROR)
+        tokenKind = scanToken();
+    _tokenLength = _codePtr - _tokenStartPtr - 1;
+    switch (tokenKind) {
+    // end of line and comments should not "overwrite" the old token type...
+    case T_EOL:
+        return tokenKind;
+    case T_COMMENT:
+        _state.comments = CommentState::HadComment;
+        return tokenKind;
+    case T_PARTIAL_COMMENT:
+        _state.comments = CommentState::InMultilineComment;
+        return tokenKind;
+    default:
+        _state.comments = CommentState::NoComment;
+        break;
+    }
+    _state.tokenKind = tokenKind;
+
+    _state.delimited = false;
+    _state.restrictedKeyword = false;
+    _state.followsClosingBrace = (previousTokenKind == T_RBRACE);
 
     // update the flags
-    switch (_tokenKind) {
+    switch (_state.tokenKind) {
     case T_LBRACE:
-        if (_bracesCount > 0)
-            ++_bracesCount;
+        if (_state.bracesCount > 0)
+            ++_state.bracesCount;
         Q_FALLTHROUGH();
     case T_SEMICOLON:
-        _importState = ImportState::NoQmlImport;
+        _state.importState = ImportState::NoQmlImport;
         Q_FALLTHROUGH();
     case T_QUESTION:
     case T_COLON:
     case T_TILDE:
-        _delimited = true;
+        _state.delimited = true;
         break;
     case T_AUTOMATIC_SEMICOLON:
     case T_AS:
-        _importState = ImportState::NoQmlImport;
+        _state.importState = ImportState::NoQmlImport;
         Q_FALLTHROUGH();
     default:
-        if (isBinop(_tokenKind))
-            _delimited = true;
+        if (isBinop(_state.tokenKind))
+            _state.delimited = true;
         break;
 
     case T_IMPORT:
-        if (qmlMode() || (_handlingDirectives && previousTokenKind == T_DOT))
-            _importState = ImportState::SawImport;
-        if (isBinop(_tokenKind))
-            _delimited = true;
+        if (qmlMode() || (_state.handlingDirectives && previousTokenKind == T_DOT))
+            _state.importState = ImportState::SawImport;
+        if (isBinop(_state.tokenKind))
+            _state.delimited = true;
         break;
 
     case T_IF:
     case T_FOR:
     case T_WHILE:
     case T_WITH:
-        _parenthesesState = CountParentheses;
-        _parenthesesCount = 0;
+        _state.parenthesesState = CountParentheses;
+        _state.parenthesesCount = 0;
         break;
 
     case T_ELSE:
     case T_DO:
-        _parenthesesState = BalancedParentheses;
+        _state.parenthesesState = BalancedParentheses;
         break;
 
     case T_CONTINUE:
@@ -285,47 +337,47 @@ int Lexer::lex()
     case T_RETURN:
     case T_YIELD:
     case T_THROW:
-        _restrictedKeyword = true;
+        _state.restrictedKeyword = true;
         break;
     case T_RBRACE:
-        if (_bracesCount > 0)
-            --_bracesCount;
-        if (_bracesCount == 0)
+        if (_state.bracesCount > 0)
+            --_state.bracesCount;
+        if (_state.bracesCount == 0)
             goto again;
     } // switch
 
     // update the parentheses state
-    switch (_parenthesesState) {
+    switch (_state.parenthesesState) {
     case IgnoreParentheses:
         break;
 
     case CountParentheses:
-        if (_tokenKind == T_RPAREN) {
-            --_parenthesesCount;
-            if (_parenthesesCount == 0)
-                _parenthesesState = BalancedParentheses;
-        } else if (_tokenKind == T_LPAREN) {
-            ++_parenthesesCount;
+        if (_state.tokenKind == T_RPAREN) {
+            --_state.parenthesesCount;
+            if (_state.parenthesesCount == 0)
+                _state.parenthesesState = BalancedParentheses;
+        } else if (_state.tokenKind == T_LPAREN) {
+            ++_state.parenthesesCount;
         }
         break;
 
     case BalancedParentheses:
-        if (_tokenKind != T_DO && _tokenKind != T_ELSE)
-            _parenthesesState = IgnoreParentheses;
+        if (_state.tokenKind != T_DO && _state.tokenKind != T_ELSE)
+            _state.parenthesesState = IgnoreParentheses;
         break;
     } // switch
 
-    return _tokenKind;
+    return _state.tokenKind;
 }
 
 uint Lexer::decodeUnicodeEscapeCharacter(bool *ok)
 {
-    Q_ASSERT(_char == u'u');
+    Q_ASSERT(_state.currentChar == u'u');
     scanChar(); // skip u
-    if (_codePtr + 4 <= _endPtr && isHexDigit(_char)) {
+    if (_codePtr + 4 <= _endPtr && isHexDigit(_state.currentChar)) {
         uint codePoint = 0;
         for (int i = 0; i < 4; ++i) {
-            int digit = hexDigit(_char);
+            int digit = hexDigit(_state.currentChar);
             if (digit < 0)
                 goto error;
             codePoint *= 16;
@@ -335,15 +387,15 @@ uint Lexer::decodeUnicodeEscapeCharacter(bool *ok)
 
         *ok = true;
         return codePoint;
-    } else if (_codePtr < _endPtr && _char == u'{') {
+    } else if (_codePtr < _endPtr && _state.currentChar == u'{') {
         scanChar(); // skip '{'
         uint codePoint = 0;
-        if (!isHexDigit(_char))
+        if (!isHexDigit(_state.currentChar))
             // need at least one hex digit
             goto error;
 
         while (_codePtr <= _endPtr) {
-            int digit = hexDigit(_char);
+            int digit = hexDigit(_state.currentChar);
             if (digit < 0)
                 break;
             codePoint *= 16;
@@ -353,7 +405,7 @@ uint Lexer::decodeUnicodeEscapeCharacter(bool *ok)
             scanChar();
         }
 
-        if (_char != u'}')
+        if (_state.currentChar != u'}')
             goto error;
 
         scanChar(); // skip '}'
@@ -363,8 +415,8 @@ uint Lexer::decodeUnicodeEscapeCharacter(bool *ok)
         return codePoint;
     }
 
-  error:
-    _errorCode = IllegalUnicodeEscapeSequence;
+error:
+    _state.errorCode = IllegalUnicodeEscapeSequence;
     _errorMessage = QCoreApplication::translate("QmlParser", "Illegal unicode escape sequence");
 
     *ok = false;
@@ -376,10 +428,10 @@ QChar Lexer::decodeHexEscapeCharacter(bool *ok)
     if (isHexDigit(_codePtr[0]) && isHexDigit(_codePtr[1])) {
         scanChar();
 
-        const QChar c1 = _char;
+        const QChar c1 = _state.currentChar;
         scanChar();
 
-        const QChar c2 = _char;
+        const QChar c2 = _state.currentChar;
         scanChar();
 
         if (ok)
@@ -392,6 +444,40 @@ QChar Lexer::decodeHexEscapeCharacter(bool *ok)
     return QChar();
 }
 
+namespace QmlJS {
+QDebug operator<<(QDebug dbg, const Lexer &l)
+{
+    dbg << "{\n"
+        << "  engine:" << qsizetype(l._engine) << ",\n"
+        << "  lexMode:" << int(l._lexMode) << ",\n"
+        << "  code.size:" << qsizetype(l._code.unicode()) << "+" << l._code.size() << ",\n"
+        << "  endPtr: codePtr + " << (l._endPtr - l._codePtr) << ",\n"
+        << "  qmlMode:" << l._qmlMode << ",\n"
+        << "  staticIsKeyword:" << l._staticIsKeyword << ",\n"
+        << "  currentLineNumber:" << l._currentLineNumber << ",\n"
+        << "  currentColumnNumber:" << l._currentColumnNumber << ",\n"
+        << "  currentOffset:" << l._currentOffset << ",\n"
+        << "  tokenLength:" << l._tokenLength << ",\n"
+        << "  tokenLine:" << l._tokenLine << ",\n"
+        << "  tokenColumn:" << l._tokenColumn << ",\n"
+        << "  tokenText:" << l._tokenText << ",\n"
+        << "  skipLinefeed:" << l._skipLinefeed << ",\n"
+        << "  errorMessage:" << l._errorMessage << ",\n"
+        << "  tokenSpell:" << l._tokenSpell << ",\n"
+        << "  rawString:" << l._rawString << ",\n";
+    if (l._codePtr)
+        dbg << "  codePtr: code.unicode()+" << (l._codePtr - l._code.unicode()) << ",\n";
+    else
+        dbg << "  codePtr: *null*,\n";
+    if (l._tokenStartPtr)
+        dbg << "  tokenStartPtr: codePtr " << (l._tokenStartPtr - l._codePtr) << ",\n";
+    else
+        dbg << "  tokenStartPtr: *null*,\n";
+    dbg << "  state:" << l._state << "\n}";
+    return dbg;
+}
+} // namespace QmlJS
+
 static inline bool isIdentifierStart(uint ch)
 {
     // fast path for ascii
@@ -447,71 +533,36 @@ static bool isIdentifierPart(uint ch)
 
 int Lexer::scanToken()
 {
-    if (_stackToken != -1) {
-        int tk = _stackToken;
-        _stackToken = -1;
+    if (_state.stackToken != -1) {
+        int tk = _state.stackToken;
+        _state.stackToken = -1;
         return tk;
     }
 
-    if (_bracesCount == 0) {
+    if (_state.bracesCount == 0) {
         // we're inside a Template string
         return scanString(TemplateContinuation);
     }
 
-
-    _terminator = false;
+    if (_state.comments == CommentState::NoComment)
+        _state.terminator = false;
 
 again:
-    _validTokenText = false;
+    _state.validTokenText = false;
 
-    // handle comment can be called after a '/' has been read
-    // and returns true if it actually encountered a comment
-    auto handleComment = [this] {
-        if (_char == u'*') {
-            scanChar();
-            while (_codePtr <= _endPtr) {
-                if (_char == u'*') {
-                    scanChar();
-                    if (_char == u'/') {
-                        scanChar();
-
-                        if (_engine) {
-                            _engine->addComment(tokenOffset() + 2, _codePtr - _tokenStartPtr - 1 - 4,
-                                                tokenStartLine(), tokenStartColumn() + 2);
-                        }
-
-                        return true;
-                    }
-                } else {
-                    scanChar();
-                }
-            }
-        } else if (_char == u'/') {
-            while (_codePtr <= _endPtr && !isLineTerminator()) {
-                scanChar();
-            }
-            if (_engine) {
-                _engine->addComment(tokenOffset() + 2, _codePtr - _tokenStartPtr - 1 - 2,
-                                    tokenStartLine(), tokenStartColumn() + 2);
-            }
-            return true;
-        }
-        return false;
-    };
-
-
-    while (_char.isSpace()) {
+    while (_state.currentChar.isSpace()) {
         if (isLineTerminator()) {
-            if (_restrictedKeyword) {
+            bool isAtEnd = (_codePtr + (_skipLinefeed ? 1 : 0)) == _endPtr;
+            if (_state.restrictedKeyword) {
                 // automatic semicolon insertion
                 _tokenLine = _currentLineNumber;
                 _tokenColumn = _currentColumnNumber;
                 _tokenStartPtr = _codePtr - 1;
                 return T_SEMICOLON;
-            } else {
-                _terminator = true;
+            } else if (_lexMode == LexMode::WholeCode || !isAtEnd) {
+                _state.terminator = true;
                 syncProhibitAutomaticSemicolon();
-            }
+            } // else we will do the previous things at the start of next line...
         }
 
         scanChar();
@@ -521,10 +572,20 @@ again:
     _tokenLine = _currentLineNumber;
     _tokenColumn = _currentColumnNumber;
 
-    if (_codePtr > _endPtr)
-        return EOF_SYMBOL;
+    if (_codePtr >= _endPtr) {
+        if (_lexMode == LexMode::LineByLine) {
+            if (!_code.isEmpty()) {
+                _state.currentChar = *(_codePtr - 2);
+                return T_EOL;
+            } else {
+                return EOF_SYMBOL;
+            }
+        } else if (_codePtr > _endPtr) {
+            return EOF_SYMBOL;
+        }
+    }
 
-    const QChar ch = _char;
+    const QChar ch = _state.currentChar;
     scanChar();
 
     switch (ch.unicode()) {
@@ -532,10 +593,10 @@ again:
     case u'}': return T_RBRACE;
 
     case u'|':
-        if (_char == u'|') {
+        if (_state.currentChar == u'|') {
             scanChar();
             return T_OR_OR;
-        } else if (_char == u'=') {
+        } else if (_state.currentChar == u'=') {
             scanChar();
             return T_OR_EQ;
         }
@@ -544,7 +605,7 @@ again:
     case u'{': return T_LBRACE;
 
     case u'^':
-        if (_char == u'=') {
+        if (_state.currentChar == u'=') {
             scanChar();
             return T_XOR_EQ;
         }
@@ -553,11 +614,11 @@ again:
     case u']': return T_RBRACKET;
     case u'[': return T_LBRACKET;
     case u'?': {
-        if (_char == u'?') {
+        if (_state.currentChar == u'?') {
             scanChar();
             return T_QUESTION_QUESTION;
         }
-        if (_char == u'.' && !peekChar().isDigit()) {
+        if (_state.currentChar == u'.' && !peekChar().isDigit()) {
             scanChar();
             return T_QUESTION_DOT;
         }
@@ -566,47 +627,47 @@ again:
     }
 
     case u'>':
-        if (_char == u'>') {
+        if (_state.currentChar == u'>') {
             scanChar();
-            if (_char == u'>') {
+            if (_state.currentChar == u'>') {
                 scanChar();
-                if (_char == u'=') {
+                if (_state.currentChar == u'=') {
                     scanChar();
                     return T_GT_GT_GT_EQ;
                 }
                 return T_GT_GT_GT;
-            } else if (_char == u'=') {
+            } else if (_state.currentChar == u'=') {
                 scanChar();
                 return T_GT_GT_EQ;
             }
             return T_GT_GT;
-        } else if (_char == u'=') {
+        } else if (_state.currentChar == u'=') {
             scanChar();
             return T_GE;
         }
         return T_GT;
 
     case u'=':
-        if (_char == u'=') {
+        if (_state.currentChar == u'=') {
             scanChar();
-            if (_char == u'=') {
+            if (_state.currentChar == u'=') {
                 scanChar();
                 return T_EQ_EQ_EQ;
             }
             return T_EQ_EQ;
-        } else if (_char == u'>') {
+        } else if (_state.currentChar == u'>') {
             scanChar();
             return T_ARROW;
         }
         return T_EQ;
 
     case u'<':
-        if (_char == u'=') {
+        if (_state.currentChar == u'=') {
             scanChar();
             return T_LE;
-        } else if (_char == u'<') {
+        } else if (_state.currentChar == u'<') {
             scanChar();
-            if (_char == u'=') {
+            if (_state.currentChar == u'=') {
                 scanChar();
                 return T_LT_LT_EQ;
             }
@@ -618,26 +679,65 @@ again:
     case u':': return T_COLON;
 
     case u'/':
-        if (handleComment())
-            goto again;
-        else if (_char == u'=') {
+        switch (_state.currentChar.unicode()) {
+        case u'*':
+            scanChar();
+            while (_codePtr <= _endPtr) {
+                if (_state.currentChar == u'*') {
+                    scanChar();
+                    if (_state.currentChar == u'/') {
+                        scanChar();
+                        if (_engine) {
+                            _engine->addComment(tokenOffset() + 2,
+                                                _codePtr - _tokenStartPtr - 1 - 4,
+                                                tokenStartLine(),
+                                                tokenStartColumn() + 2);
+                        }
+                        if (_lexMode == LexMode::LineByLine)
+                            return T_COMMENT;
+                        else
+                            goto again;
+                    }
+                } else {
+                    scanChar();
+                }
+            }
+            if (_lexMode == LexMode::LineByLine)
+                return T_PARTIAL_COMMENT;
+            else
+                goto again;
+        case u'/':
+            while (_codePtr <= _endPtr && !isLineTerminator()) {
+                scanChar();
+            }
+            if (_engine) {
+                _engine->addComment(tokenOffset() + 2,
+                                    _codePtr - _tokenStartPtr - 1 - 2,
+                                    tokenStartLine(),
+                                    tokenStartColumn() + 2);
+            }
+            if (_lexMode == LexMode::LineByLine)
+                return T_COMMENT;
+            else
+                goto again;
+        case u'=':
             scanChar();
             return T_DIVIDE_EQ;
+        default:
+            return T_DIVIDE_;
         }
-        return T_DIVIDE_;
-
     case u'.':
-        if (_importState == ImportState::SawImport)
+        if (_state.importState == ImportState::SawImport)
             return T_DOT;
-        if (isDecimalDigit(_char.unicode()))
+        if (isDecimalDigit(_state.currentChar.unicode()))
             return scanNumber(ch);
-        if (_char == u'.') {
+        if (_state.currentChar == u'.') {
             scanChar();
-            if (_char == u'.') {
+            if (_state.currentChar == u'.') {
                 scanChar();
                 return T_ELLIPSIS;
             } else {
-                _errorCode = IllegalCharacter;
+                _state.errorCode = IllegalCharacter;
                 _errorMessage = QCoreApplication::translate("QmlParser", "Unexpected token '.'");
                 return T_ERROR;
             }
@@ -645,14 +745,15 @@ again:
         return T_DOT;
 
     case u'-':
-        if (_char == u'=') {
+        if (_state.currentChar == u'=') {
             scanChar();
             return T_MINUS_EQ;
-        } else if (_char == u'-') {
+        } else if (_state.currentChar == u'-') {
             scanChar();
 
-            if (_terminator && !_delimited && !_prohibitAutomaticSemicolon && _tokenKind != T_LPAREN) {
-                _stackToken = T_MINUS_MINUS;
+            if (_state.terminator && !_state.delimited && !_state.prohibitAutomaticSemicolon
+                && _state.tokenKind != T_LPAREN) {
+                _state.stackToken = T_MINUS_MINUS;
                 return T_SEMICOLON;
             }
 
@@ -663,14 +764,15 @@ again:
     case u',': return T_COMMA;
 
     case u'+':
-        if (_char == u'=') {
+        if (_state.currentChar == u'=') {
             scanChar();
             return T_PLUS_EQ;
-        } else if (_char == u'+') {
+        } else if (_state.currentChar == u'+') {
             scanChar();
 
-            if (_terminator && !_delimited && !_prohibitAutomaticSemicolon && _tokenKind != T_LPAREN) {
-                _stackToken = T_PLUS_PLUS;
+            if (_state.terminator && !_state.delimited && !_state.prohibitAutomaticSemicolon
+                && _state.tokenKind != T_LPAREN) {
+                _state.stackToken = T_PLUS_PLUS;
                 return T_SEMICOLON;
             }
 
@@ -679,12 +781,12 @@ again:
         return T_PLUS;
 
     case u'*':
-        if (_char == u'=') {
+        if (_state.currentChar == u'=') {
             scanChar();
             return T_STAR_EQ;
-        } else if (_char == u'*') {
+        } else if (_state.currentChar == u'*') {
             scanChar();
-            if (_char == u'=') {
+            if (_state.currentChar == u'=') {
                 scanChar();
                 return T_STAR_STAR_EQ;
             }
@@ -698,26 +800,26 @@ again:
     case u'@': return T_AT;
 
     case u'&':
-        if (_char == u'=') {
+        if (_state.currentChar == u'=') {
             scanChar();
             return T_AND_EQ;
-        } else if (_char == u'&') {
+        } else if (_state.currentChar == u'&') {
             scanChar();
             return T_AND_AND;
         }
         return T_AND;
 
     case u'%':
-        if (_char == u'=') {
+        if (_state.currentChar == u'=') {
             scanChar();
             return T_REMAINDER_EQ;
         }
         return T_REMAINDER;
 
     case u'!':
-        if (_char == u'=') {
+        if (_state.currentChar == u'=') {
             scanChar();
-            if (_char == u'=') {
+            if (_state.currentChar == u'=') {
                 scanChar();
                 return T_NOT_EQ_EQ;
             }
@@ -726,7 +828,7 @@ again:
         return T_NOT;
 
     case u'`':
-        _outerTemplateBraceCount.push(_bracesCount);
+        _state.outerTemplateBraceCount.push(_state.bracesCount);
         Q_FALLTHROUGH();
     case u'\'':
     case u'"':
@@ -741,7 +843,7 @@ again:
     case u'7':
     case u'8':
     case u'9':
-        if (_importState == ImportState::SawImport)
+        if (_state.importState == ImportState::SawImport)
             return scanVersionNumber(ch);
         else
             return scanNumber(ch);
@@ -753,20 +855,25 @@ again:
                 scanChar();
             }
             if (_engine) {
-                _engine->addComment(tokenOffset(), _codePtr - _tokenStartPtr - 1,
-                                    tokenStartLine(), tokenStartColumn());
+                _engine->addComment(tokenOffset(),
+                                    _codePtr - _tokenStartPtr - 1,
+                                    tokenStartLine(),
+                                    tokenStartColumn());
             }
-            goto again;
+            if (_lexMode == LexMode::LineByLine)
+                return T_COMMENT;
+            else
+                goto again;
         }
         Q_FALLTHROUGH();
 
     default: {
         uint c = ch.unicode();
         bool identifierWithEscapeChars = false;
-        if (QChar::isHighSurrogate(c) && QChar::isLowSurrogate(_char.unicode())) {
-            c = QChar::surrogateToUcs4(ushort(c), _char.unicode());
+        if (QChar::isHighSurrogate(c) && QChar::isLowSurrogate(_state.currentChar.unicode())) {
+            c = QChar::surrogateToUcs4(ushort(c), _state.currentChar.unicode());
             scanChar();
-        } else if (c == '\\' && _char == u'u') {
+        } else if (c == '\\' && _state.currentChar == u'u') {
             identifierWithEscapeChars = true;
             bool ok = false;
             c = decodeUnicodeEscapeCharacter(&ok);
@@ -782,19 +889,19 @@ again:
                 } else {
                     _tokenText += QChar(c);
                 }
-                _validTokenText = true;
+                _state.validTokenText = true;
             }
             while (_codePtr <= _endPtr) {
-                c = _char.unicode();
+                c = _state.currentChar.unicode();
                 if (QChar::isHighSurrogate(c) && QChar::isLowSurrogate(_codePtr->unicode())) {
                     scanChar();
-                    c = QChar::surrogateToUcs4(ushort(c), _char.unicode());
-                } else if (_char == u'\\' && _codePtr[0] == u'u') {
+                    c = QChar::surrogateToUcs4(ushort(c), _state.currentChar.unicode());
+                } else if (_state.currentChar == u'\\' && _codePtr[0] == u'u') {
                     if (!identifierWithEscapeChars) {
                         identifierWithEscapeChars = true;
                         _tokenText.resize(0);
                         _tokenText.insert(0, _tokenStartPtr, _codePtr - _tokenStartPtr - 1);
-                        _validTokenText = true;
+                        _state.validTokenText = true;
                     }
 
                     scanChar(); // skip '\\'
@@ -838,16 +945,57 @@ again:
 
             if (kind == T_FUNCTION) {
                 continue_skipping:
-                while (_codePtr < _endPtr && _char.isSpace())
+                while (_codePtr < _endPtr && _state.currentChar.isSpace())
                     scanChar();
-                if (_char == u'*') {
+                if (_state.currentChar == u'*') {
                     _tokenLength = _codePtr - _tokenStartPtr - 1;
                     kind = T_FUNCTION_STAR;
                     scanChar();
-                } else if (_char == u'/') {
+                } else if (_state.currentChar == u'/') {
                     scanChar();
-                    if (handleComment())
-                        goto continue_skipping;
+                    switch (_state.currentChar.unicode()) {
+                    case u'*':
+                        scanChar();
+                        while (_codePtr <= _endPtr) {
+                            if (_state.currentChar == u'*') {
+                                scanChar();
+                                if (_state.currentChar == u'/') {
+                                    scanChar();
+                                    if (_engine) {
+                                        _engine->addComment(tokenOffset() + 2,
+                                                            _codePtr - _tokenStartPtr - 1 - 4,
+                                                            tokenStartLine(),
+                                                            tokenStartColumn() + 2);
+                                    }
+                                    if (_lexMode == LexMode::LineByLine)
+                                        return T_COMMENT;
+                                    goto continue_skipping;
+                                }
+                            } else {
+                                scanChar();
+                            }
+                        }
+                        if (_lexMode == LexMode::LineByLine)
+                            return T_PARTIAL_COMMENT;
+                        else
+                            goto continue_skipping;
+                    case u'/':
+                        while (_codePtr <= _endPtr && !isLineTerminator()) {
+                            scanChar();
+                        }
+                        if (_engine) {
+                            _engine->addComment(tokenOffset() + 2,
+                                                _codePtr - _tokenStartPtr - 1 - 2,
+                                                tokenStartLine(),
+                                                tokenStartColumn() + 2);
+                        }
+                        if (_lexMode == LexMode::LineByLine)
+                            return T_COMMENT;
+                        else
+                            goto continue_skipping;
+                    default:
+                        break;
+                    }
                 }
             }
 
@@ -871,6 +1019,11 @@ again:
 int Lexer::scanString(ScanStringMode mode)
 {
     QChar quote = (mode == TemplateContinuation) ? QChar(TemplateHead) : QChar(mode);
+    // we actually use T_STRING_LITERAL also for multiline strings, should we want to
+    // change that we should set it to:
+    //     _state.tokenKind == T_PARTIAL_SINGLE_QUOTE_STRING_LITERAL ||
+    //     _state.tokenKind == T_PARTIAL_DOUBLE_QUOTE_STRING_LITERAL
+    // here and uncomment the multilineStringLiteral = true below.
     bool multilineStringLiteral = false;
 
     const QChar *startCode = _codePtr - 1;
@@ -887,30 +1040,32 @@ int Lexer::scanString(ScanStringMode mode)
                         --_currentLineNumber; // will be read again in scanChar()
                     break;
                 }
-                _errorCode = IllegalCharacter;
-                _errorMessage = QCoreApplication::translate("QmlParser", "Stray newline in string literal");
+                _state.errorCode = IllegalCharacter;
+                _errorMessage = QCoreApplication::translate("QmlParser",
+                                                            "Stray newline in string literal");
                 return T_ERROR;
-            } else if (_char == u'\\') {
+            } else if (_state.currentChar == u'\\') {
                 break;
-            } else if (_char == u'$' && quote == u'`') {
+            } else if (_state.currentChar == u'$' && quote == u'`') {
                 break;
-            } else if (_char == quote) {
+            } else if (_state.currentChar == quote) {
                 _tokenSpell = _engine->midRef(startCode - _code.unicode(), _codePtr - startCode - 1);
                 _rawString = _tokenSpell;
                 scanChar();
 
                 if (quote == u'`')
-                    _bracesCount = _outerTemplateBraceCount.pop();
-
+                    _state.bracesCount = _state.outerTemplateBraceCount.pop();
                 if (mode == TemplateHead)
                     return T_NO_SUBSTITUTION_TEMPLATE;
                 else if (mode == TemplateContinuation)
                     return T_TEMPLATE_TAIL;
+                else if (multilineStringLiteral)
+                    return T_MULTILINE_STRING_LITERAL;
                 else
                     return T_STRING_LITERAL;
             }
             // don't use scanChar() here, that would transform \r sequences and the midRef() call would create the wrong result
-            _char = *_codePtr++;
+            _state.currentChar = *_codePtr++;
             ++_currentColumnNumber;
             first = false;
         }
@@ -920,7 +1075,7 @@ int Lexer::scanString(ScanStringMode mode)
     --_codePtr;
     --_currentColumnNumber;
 
-    _validTokenText = true;
+    _state.validTokenText = true;
     _tokenText = QString(startCode, _codePtr - startCode);
 
     auto setRawString = [&](const QChar *end) {
@@ -933,7 +1088,7 @@ int Lexer::scanString(ScanStringMode mode)
     scanChar();
 
     while (_codePtr <= _endPtr) {
-        if (_char == quote) {
+        if (_state.currentChar == quote) {
             scanChar();
 
             if (_engine) {
@@ -943,7 +1098,7 @@ int Lexer::scanString(ScanStringMode mode)
             }
 
             if (quote == u'`')
-                _bracesCount = _outerTemplateBraceCount.pop();
+                _state.bracesCount = _state.outerTemplateBraceCount.pop();
 
             if (mode == TemplateContinuation)
                 return T_TEMPLATE_TAIL;
@@ -951,27 +1106,29 @@ int Lexer::scanString(ScanStringMode mode)
                 return T_NO_SUBSTITUTION_TEMPLATE;
 
             return multilineStringLiteral ? T_MULTILINE_STRING_LITERAL : T_STRING_LITERAL;
-        } else if (quote == u'`' && _char == u'$' && *_codePtr == u'{') {
+        } else if (quote == u'`' && _state.currentChar == u'$' && *_codePtr == u'{') {
             scanChar();
             scanChar();
-            _bracesCount = 1;
+            _state.bracesCount = 1;
             if (_engine) {
                 _tokenSpell = _engine->newStringRef(_tokenText);
                 setRawString(_codePtr - 2);
             }
 
             return (mode == TemplateHead ? T_TEMPLATE_HEAD : T_TEMPLATE_MIDDLE);
-        } else if (_char == u'\\') {
+        } else if (_state.currentChar == u'\\') {
             scanChar();
             if (_codePtr > _endPtr) {
-                _errorCode = IllegalEscapeSequence;
-                _errorMessage = QCoreApplication::translate("QmlParser", "End of file reached at escape sequence");
+                _state.errorCode = IllegalEscapeSequence;
+                _errorMessage
+                    = QCoreApplication::translate("QmlParser",
+                                                  "End of file reached at escape sequence");
                 return T_ERROR;
             }
 
             QChar u;
 
-            switch (_char.unicode()) {
+            switch (_state.currentChar.unicode()) {
             // unicode escape sequence
             case u'u': {
                 bool ok = false;
@@ -992,8 +1149,10 @@ int Lexer::scanString(ScanStringMode mode)
                 bool ok = false;
                 u = decodeHexEscapeCharacter(&ok);
                 if (!ok) {
-                    _errorCode = IllegalHexadecimalEscapeSequence;
-                    _errorMessage = QCoreApplication::translate("QmlParser", "Illegal hexadecimal escape sequence");
+                    _state.errorCode = IllegalHexadecimalEscapeSequence;
+                    _errorMessage
+                        = QCoreApplication::translate("QmlParser",
+                                                      "Illegal hexadecimal escape sequence");
                     return T_ERROR;
                 }
             } break;
@@ -1010,7 +1169,7 @@ int Lexer::scanString(ScanStringMode mode)
             case u'v':  u = u'\v'; scanChar(); break;
 
             case u'0':
-                if (! _codePtr->isDigit()) {
+                if (!_codePtr->isDigit()) {
                     scanChar();
                     u = u'\0';
                     break;
@@ -1025,31 +1184,43 @@ int Lexer::scanString(ScanStringMode mode)
             case u'7':
             case u'8':
             case u'9':
-                _errorCode = IllegalEscapeSequence;
-                _errorMessage = QCoreApplication::translate("QmlParser", "Octal escape sequences are not allowed");
+                _state.errorCode = IllegalEscapeSequence;
+                _errorMessage
+                    = QCoreApplication::translate("QmlParser",
+                                                  "Octal escape sequences are not allowed");
                 return T_ERROR;
 
             case u'\r':
             case u'\n':
             case 0x2028u:
             case 0x2029u:
+                // uncomment the following to use T_MULTILINE_STRING_LITERAL
+                // multilineStringLiteral = true;
                 scanChar();
                 continue;
 
             default:
                 // non escape character
-                u = _char;
+                u = _state.currentChar;
                 scanChar();
             }
 
             _tokenText += u;
         } else {
-            _tokenText += _char;
+            _tokenText += _state.currentChar;
             scanChar();
         }
     }
-
-    _errorCode = UnclosedStringLiteral;
+    if (_lexMode == LexMode::LineByLine && !_code.isEmpty()) {
+        if (mode == TemplateContinuation)
+            return T_PARTIAL_TEMPLATE_MIDDLE;
+        else if (mode == TemplateHead)
+            return T_PARTIAL_TEMPLATE_HEAD;
+        else if (mode == SingleQuote)
+            return T_PARTIAL_SINGLE_QUOTE_STRING_LITERAL;
+        return T_PARTIAL_DOUBLE_QUOTE_STRING_LITERAL;
+    }
+    _state.errorCode = UnclosedStringLiteral;
     _errorMessage = QCoreApplication::translate("QmlParser", "Unclosed string at end of line");
     return T_ERROR;
 }
@@ -1057,21 +1228,24 @@ int Lexer::scanString(ScanStringMode mode)
 int Lexer::scanNumber(QChar ch)
 {
     if (ch == u'0') {
-        if (_char == u'x' || _char == u'X') {
-            ch = _char; // remember the x or X to use it in the error message below.
+        if (_state.currentChar == u'x' || _state.currentChar == u'X') {
+            ch = _state.currentChar; // remember the x or X to use it in the error message below.
 
             // parse hex integer literal
             scanChar(); // consume 'x'
 
-            if (!isHexDigit(_char)) {
-                _errorCode = IllegalNumber;
-                _errorMessage = QCoreApplication::translate("QmlParser", "At least one hexadecimal digit is required after '0%1'").arg(ch);
+            if (!isHexDigit(_state.currentChar)) {
+                _state.errorCode = IllegalNumber;
+                _errorMessage = QCoreApplication::translate(
+                                    "QmlParser",
+                                    "At least one hexadecimal digit is required after '0%1'")
+                                    .arg(ch);
                 return T_ERROR;
             }
 
             double d = 0.;
             while (1) {
-                int digit = ::hexDigit(_char);
+                int digit = ::hexDigit(_state.currentChar);
                 if (digit < 0)
                     break;
                 d *= 16;
@@ -1079,23 +1253,25 @@ int Lexer::scanNumber(QChar ch)
                 scanChar();
             }
 
-            _tokenValue = d;
+            _state.tokenValue = d;
             return T_NUMERIC_LITERAL;
-        } else if (_char == u'o' || _char == u'O') {
-            ch = _char; // remember the o or O to use it in the error message below.
+        } else if (_state.currentChar == u'o' || _state.currentChar == u'O') {
+            ch = _state.currentChar; // remember the o or O to use it in the error message below.
 
             // parse octal integer literal
             scanChar(); // consume 'o'
 
-            if (!isOctalDigit(_char.unicode())) {
-                _errorCode = IllegalNumber;
-                _errorMessage = QCoreApplication::translate("QmlParser", "At least one octal digit is required after '0%1'").arg(ch);
+            if (!isOctalDigit(_state.currentChar.unicode())) {
+                _state.errorCode = IllegalNumber;
+                _errorMessage = QCoreApplication::translate(
+                                    "QmlParser", "At least one octal digit is required after '0%1'")
+                                    .arg(ch);
                 return T_ERROR;
             }
 
             double d = 0.;
             while (1) {
-                int digit = ::octalDigit(_char);
+                int digit = ::octalDigit(_state.currentChar);
                 if (digit < 0)
                     break;
                 d *= 8;
@@ -1103,37 +1279,40 @@ int Lexer::scanNumber(QChar ch)
                 scanChar();
             }
 
-            _tokenValue = d;
+            _state.tokenValue = d;
             return T_NUMERIC_LITERAL;
-        } else if (_char == u'b' || _char == u'B') {
-            ch = _char; // remember the b or B to use it in the error message below.
+        } else if (_state.currentChar == u'b' || _state.currentChar == u'B') {
+            ch = _state.currentChar; // remember the b or B to use it in the error message below.
 
             // parse binary integer literal
             scanChar(); // consume 'b'
 
-            if (_char.unicode() != u'0' && _char.unicode() != u'1') {
-                _errorCode = IllegalNumber;
-                _errorMessage = QCoreApplication::translate("QmlParser", "At least one binary digit is required after '0%1'").arg(ch);
+            if (_state.currentChar.unicode() != u'0' && _state.currentChar.unicode() != u'1') {
+                _state.errorCode = IllegalNumber;
+                _errorMessage = QCoreApplication::translate(
+                                    "QmlParser", "At least one binary digit is required after '0%1'")
+                                    .arg(ch);
                 return T_ERROR;
             }
 
             double d = 0.;
             while (1) {
                 int digit = 0;
-                if (_char.unicode() == u'1')
+                if (_state.currentChar.unicode() == u'1')
                     digit = 1;
-                else if (_char.unicode() != u'0')
+                else if (_state.currentChar.unicode() != u'0')
                     break;
                 d *= 2;
                 d += digit;
                 scanChar();
             }
 
-            _tokenValue = d;
+            _state.tokenValue = d;
             return T_NUMERIC_LITERAL;
-        } else if (_char.isDigit() && !qmlMode()) {
-            _errorCode = IllegalCharacter;
-            _errorMessage = QCoreApplication::translate("QmlParser", "Decimal numbers can't start with '0'");
+        } else if (_state.currentChar.isDigit() && !qmlMode()) {
+            _state.errorCode = IllegalCharacter;
+            _errorMessage = QCoreApplication::translate("QmlParser",
+                                                        "Decimal numbers can't start with '0'");
             return T_ERROR;
         }
     }
@@ -1143,36 +1322,35 @@ int Lexer::scanNumber(QChar ch)
     chars.append(ch.unicode());
 
     if (ch != u'.') {
-        while (_char.isDigit()) {
-            chars.append(_char.unicode());
+        while (_state.currentChar.isDigit()) {
+            chars.append(_state.currentChar.unicode());
             scanChar(); // consume the digit
         }
 
-        if (_char == u'.') {
-            chars.append(_char.unicode());
+        if (_state.currentChar == u'.') {
+            chars.append(_state.currentChar.unicode());
             scanChar(); // consume `.'
         }
     }
 
-    while (_char.isDigit()) {
-        chars.append(_char.unicode());
+    while (_state.currentChar.isDigit()) {
+        chars.append(_state.currentChar.unicode());
         scanChar();
     }
 
-    if (_char == u'e' || _char == u'E') {
-        if (_codePtr[0].isDigit() || ((_codePtr[0] == u'+' || _codePtr[0] == u'-') &&
-                                      _codePtr[1].isDigit())) {
-
-            chars.append(_char.unicode());
+    if (_state.currentChar == u'e' || _state.currentChar == u'E') {
+        if (_codePtr[0].isDigit()
+            || ((_codePtr[0] == u'+' || _codePtr[0] == u'-') && _codePtr[1].isDigit())) {
+            chars.append(_state.currentChar.unicode());
             scanChar(); // consume `e'
 
-            if (_char == u'+' || _char == u'-') {
-                chars.append(_char.unicode());
+            if (_state.currentChar == u'+' || _state.currentChar == u'-') {
+                chars.append(_state.currentChar.unicode());
                 scanChar(); // consume the sign
             }
 
-            while (_char.isDigit()) {
-                chars.append(_char.unicode());
+            while (_state.currentChar.isDigit()) {
+                chars.append(_state.currentChar.unicode());
                 scanChar();
             }
         }
@@ -1182,11 +1360,12 @@ int Lexer::scanNumber(QChar ch)
     const char *end = nullptr;
     bool ok = false;
 
-    _tokenValue = qstrntod(begin, chars.size(), &end, &ok);
+    _state.tokenValue = qstrntod(begin, chars.size(), &end, &ok);
 
     if (end - begin != chars.size()) {
-        _errorCode = IllegalExponentIndicator;
-        _errorMessage = QCoreApplication::translate("QmlParser", "Illegal syntax for exponential number");
+        _state.errorCode = IllegalExponentIndicator;
+        _errorMessage = QCoreApplication::translate("QmlParser",
+                                                    "Illegal syntax for exponential number");
         return T_ERROR;
     }
 
@@ -1196,47 +1375,49 @@ int Lexer::scanNumber(QChar ch)
 int Lexer::scanVersionNumber(QChar ch)
 {
     if (ch == u'0') {
-        _tokenValue = 0;
+        _state.tokenValue = 0;
         return T_VERSION_NUMBER;
     }
 
     int acc = 0;
     acc += ch.digitValue();
 
-    while (_char.isDigit()) {
+    while (_state.currentChar.isDigit()) {
         acc *= 10;
-        acc += _char.digitValue();
+        acc += _state.currentChar.digitValue();
         scanChar(); // consume the digit
     }
 
-    _tokenValue = acc;
+    _state.tokenValue = acc;
     return T_VERSION_NUMBER;
 }
 
 bool Lexer::scanRegExp(RegExpBodyPrefix prefix)
 {
     _tokenText.resize(0);
-    _validTokenText = true;
-    _patternFlags = 0;
+    _state.validTokenText = true;
+    _state.patternFlags = 0;
 
     if (prefix == EqualPrefix)
         _tokenText += u'=';
 
     while (true) {
-        switch (_char.unicode()) {
+        switch (_state.currentChar.unicode()) {
         case u'/':
             scanChar();
 
             // scan the flags
-            _patternFlags = 0;
-            while (isIdentLetter(_char)) {
-                int flag = regExpFlagFromChar(_char);
-                if (flag == 0 || _patternFlags & flag) {
-                    _errorMessage = QCoreApplication::translate("QmlParser", "Invalid regular expression flag '%0'")
-                             .arg(QChar(_char));
+            _state.patternFlags = 0;
+            while (isIdentLetter(_state.currentChar)) {
+                int flag = regExpFlagFromChar(_state.currentChar);
+                if (flag == 0 || _state.patternFlags & flag) {
+                    _errorMessage
+                        = QCoreApplication::translate("QmlParser",
+                                                      "Invalid regular expression flag '%0'")
+                              .arg(QChar(_state.currentChar));
                     return false;
                 }
-                _patternFlags |= flag;
+                _state.patternFlags |= flag;
                 scanChar();
             }
 
@@ -1245,59 +1426,65 @@ bool Lexer::scanRegExp(RegExpBodyPrefix prefix)
 
         case u'\\':
             // regular expression backslash sequence
-            _tokenText += _char;
+            _tokenText += _state.currentChar;
             scanChar();
 
             if (_codePtr > _endPtr || isLineTerminator()) {
-                _errorMessage = QCoreApplication::translate("QmlParser", "Unterminated regular expression backslash sequence");
+                _errorMessage = QCoreApplication::translate(
+                    "QmlParser", "Unterminated regular expression backslash sequence");
                 return false;
             }
 
-            _tokenText += _char;
+            _tokenText += _state.currentChar;
             scanChar();
             break;
 
         case u'[':
             // regular expression class
-            _tokenText += _char;
+            _tokenText += _state.currentChar;
             scanChar();
 
-            while (_codePtr <= _endPtr && ! isLineTerminator()) {
-                if (_char == u']')
+            while (_codePtr <= _endPtr && !isLineTerminator()) {
+                if (_state.currentChar == u']')
                     break;
-                else if (_char == u'\\') {
+                else if (_state.currentChar == u'\\') {
                     // regular expression backslash sequence
-                    _tokenText += _char;
+                    _tokenText += _state.currentChar;
                     scanChar();
 
                     if (_codePtr > _endPtr || isLineTerminator()) {
-                        _errorMessage = QCoreApplication::translate("QmlParser", "Unterminated regular expression backslash sequence");
+                        _errorMessage = QCoreApplication::translate(
+                            "QmlParser", "Unterminated regular expression backslash sequence");
                         return false;
                     }
 
-                    _tokenText += _char;
+                    _tokenText += _state.currentChar;
                     scanChar();
                 } else {
-                    _tokenText += _char;
+                    _tokenText += _state.currentChar;
                     scanChar();
                 }
             }
 
-            if (_char != u']') {
-                _errorMessage = QCoreApplication::translate("QmlParser", "Unterminated regular expression class");
+            if (_state.currentChar != u']') {
+                _errorMessage
+                    = QCoreApplication::translate("QmlParser",
+                                                  "Unterminated regular expression class");
                 return false;
             }
 
-            _tokenText += _char;
+            _tokenText += _state.currentChar;
             scanChar(); // skip ]
             break;
 
         default:
             if (_codePtr > _endPtr || isLineTerminator()) {
-                _errorMessage = QCoreApplication::translate("QmlParser", "Unterminated regular expression literal");
+                _errorMessage
+                    = QCoreApplication::translate("QmlParser",
+                                                  "Unterminated regular expression literal");
                 return false;
             } else {
-                _tokenText += _char;
+                _tokenText += _state.currentChar;
                 scanChar();
             }
         } // switch
@@ -1308,7 +1495,7 @@ bool Lexer::scanRegExp(RegExpBodyPrefix prefix)
 
 bool Lexer::isLineTerminator() const
 {
-    const ushort unicode = _char.unicode();
+    const ushort unicode = _state.currentChar.unicode();
     return unicode == 0x000Au
             || unicode == 0x000Du
             || unicode == 0x2028u
@@ -1317,7 +1504,7 @@ bool Lexer::isLineTerminator() const
 
 unsigned Lexer::isLineTerminatorSequence() const
 {
-    switch (_char.unicode()) {
+    switch (_state.currentChar.unicode()) {
     case 0x000Au:
     case 0x2028u:
     case 0x2029u:
@@ -1364,10 +1551,10 @@ bool Lexer::isOctalDigit(ushort c)
 
 QString Lexer::tokenText() const
 {
-    if (_validTokenText)
+    if (_state.validTokenText)
         return _tokenText;
 
-    if (_tokenKind == T_STRING_LITERAL)
+    if (_state.tokenKind == T_STRING_LITERAL)
         return QString(_tokenStartPtr + 1, _tokenLength - 2);
 
     return QString(_tokenStartPtr, _tokenLength);
@@ -1375,7 +1562,7 @@ QString Lexer::tokenText() const
 
 Lexer::Error Lexer::errorCode() const
 {
-    return _errorCode;
+    return _state.errorCode;
 }
 
 QString Lexer::errorMessage() const
@@ -1385,33 +1572,31 @@ QString Lexer::errorMessage() const
 
 void Lexer::syncProhibitAutomaticSemicolon()
 {
-    if (_parenthesesState == BalancedParentheses) {
+    if (_state.parenthesesState == BalancedParentheses) {
         // we have seen something like "if (foo)", which means we should
         // never insert an automatic semicolon at this point, since it would
         // then be expanded into an empty statement (ECMA-262 7.9.1)
-        _prohibitAutomaticSemicolon = true;
-        _parenthesesState = IgnoreParentheses;
+        _state.prohibitAutomaticSemicolon = true;
+        _state.parenthesesState = IgnoreParentheses;
     } else {
-        _prohibitAutomaticSemicolon = false;
+        _state.prohibitAutomaticSemicolon = false;
     }
 }
 
 bool Lexer::prevTerminator() const
 {
-    return _terminator;
+    return _state.terminator;
 }
 
 bool Lexer::followsClosingBrace() const
 {
-    return _followsClosingBrace;
+    return _state.followsClosingBrace;
 }
 
 bool Lexer::canInsertAutomaticSemicolon(int token) const
 {
-    return token == T_RBRACE
-            || token == EOF_SYMBOL
-            || _terminator
-            || _followsClosingBrace;
+    return token == T_RBRACE || token == EOF_SYMBOL || _state.terminator
+           || _state.followsClosingBrace;
 }
 
 static const int uriTokens[] = {
@@ -1475,12 +1660,12 @@ bool Lexer::scanDirectives(Directives *directives, DiagnosticMessage *error)
         error->loc.startColumn = tokenStartColumn();
     };
 
-    QScopedValueRollback<bool> directivesGuard(_handlingDirectives, true);
+    QScopedValueRollback<bool> directivesGuard(_state.handlingDirectives, true);
     Q_ASSERT(!_qmlMode);
 
     lex(); // fetch the first token
 
-    if (_tokenKind != T_DOT)
+    if (_state.tokenKind != T_DOT)
         return true;
 
     do {
@@ -1489,7 +1674,7 @@ bool Lexer::scanDirectives(Directives *directives, DiagnosticMessage *error)
 
         lex(); // skip T_DOT
 
-        if (! (_tokenKind == T_IDENTIFIER || _tokenKind == T_IMPORT))
+        if (!(_state.tokenKind == T_IDENTIFIER || _state.tokenKind == T_IMPORT))
             return true; // expected a valid QML/JS directive
 
         const QString directiveName = tokenText();
@@ -1519,7 +1704,7 @@ bool Lexer::scanDirectives(Directives *directives, DiagnosticMessage *error)
             QString version;
             bool fileImport = false; // file or uri import
 
-            if (_tokenKind == T_STRING_LITERAL) {
+            if (_state.tokenKind == T_STRING_LITERAL) {
                 // .import T_STRING_LITERAL as T_IDENTIFIER
 
                 fileImport = true;
@@ -1531,10 +1716,10 @@ bool Lexer::scanDirectives(Directives *directives, DiagnosticMessage *error)
                 }
                 lex();
 
-            } else if (_tokenKind == T_IDENTIFIER) {
+            } else if (_state.tokenKind == T_IDENTIFIER) {
                 // .import T_IDENTIFIER (. T_IDENTIFIER)* (T_VERSION_NUMBER (. T_VERSION_NUMBER)?)? as T_IDENTIFIER
                 while (true) {
-                    if (!isUriToken(_tokenKind)) {
+                    if (!isUriToken(_state.tokenKind)) {
                         setError(QCoreApplication::translate("QmlParser","Invalid module URI"));
                         return false;
                     }
@@ -1546,7 +1731,7 @@ bool Lexer::scanDirectives(Directives *directives, DiagnosticMessage *error)
                         setError(QCoreApplication::translate("QmlParser","Invalid module URI"));
                         return false;
                     }
-                    if (_tokenKind != QmlJSGrammar::T_DOT)
+                    if (_state.tokenKind != QmlJSGrammar::T_DOT)
                         break;
 
                     pathOrUri.append(u'.');
@@ -1558,13 +1743,13 @@ bool Lexer::scanDirectives(Directives *directives, DiagnosticMessage *error)
                     }
                 }
 
-                if (_tokenKind == T_VERSION_NUMBER) {
+                if (_state.tokenKind == T_VERSION_NUMBER) {
                     version = tokenText();
                     lex();
-                    if (_tokenKind == T_DOT) {
+                    if (_state.tokenKind == T_DOT) {
                         version += u'.';
                         lex();
-                        if (_tokenKind != T_VERSION_NUMBER) {
+                        if (_state.tokenKind != T_VERSION_NUMBER) {
                             setError(QCoreApplication::translate(
                                          "QmlParser", "Incomplete version number (dot but no minor)"));
                             return false; // expected the module version number
@@ -1578,7 +1763,7 @@ bool Lexer::scanDirectives(Directives *directives, DiagnosticMessage *error)
             //
             // recognize the mandatory `as' followed by the module name
             //
-            if (! (_tokenKind == T_AS && tokenStartLine() == lineNumber)) {
+            if (!(_state.tokenKind == T_AS && tokenStartLine() == lineNumber)) {
                 if (fileImport)
                     setError(QCoreApplication::translate("QmlParser", "File import requires a qualifier"));
                 else
@@ -1617,7 +1802,45 @@ bool Lexer::scanDirectives(Directives *directives, DiagnosticMessage *error)
 
         // fetch the first token after the .pragma/.import directive
         lex();
-    } while (_tokenKind == T_DOT);
+    } while (_state.tokenKind == T_DOT);
 
     return true;
 }
+
+const Lexer::State &Lexer::state() const
+{
+    return _state;
+}
+void Lexer::setState(const Lexer::State &state)
+{
+    _state = state;
+}
+
+namespace QmlJS {
+QDebug operator<<(QDebug dbg, const Lexer::State &s)
+{
+    dbg << "{\n"
+        << "   errorCode:" << int(s.errorCode) << ",\n"
+        << "   currentChar:" << s.currentChar << ",\n"
+        << "   tokenValue:" << s.tokenValue << ",\n"
+        << "   parenthesesState:" << s.parenthesesState << ",\n"
+        << "   parenthesesCount:" << s.parenthesesCount << ",\n"
+        << "   outerTemplateBraceCount:" << s.outerTemplateBraceCount << ",\n"
+        << "   bracesCount:" << s.bracesCount << ",\n"
+        << "   stackToken:" << s.stackToken << ",\n"
+        << "   patternFlags:" << s.patternFlags << ",\n"
+        << "   tokenKind:" << s.tokenKind << ",\n"
+        << "   importState:" << int(s.importState) << ",\n"
+        << "   validTokenText:" << s.validTokenText << ",\n"
+        << "   prohibitAutomaticSemicolon:" << s.prohibitAutomaticSemicolon << ",\n"
+        << "   restrictedKeyword:" << s.restrictedKeyword << ",\n"
+        << "   terminator:" << s.terminator << ",\n"
+        << "   followsClosingBrace:" << s.followsClosingBrace << ",\n"
+        << "   delimited:" << s.delimited << ",\n"
+        << "   handlingDirectives:" << s.handlingDirectives << ",\n"
+        << "   generatorLevel:" << s.generatorLevel << "\n}";
+    return dbg;
+}
+} // namespace QmlJS
+
+QT_QML_END_NAMESPACE
diff --git a/src/libs/qmljs/parser/qmljslexer_p.h b/src/libs/qmljs/parser/qmljslexer_p.h
index c34636f2ba0..b4b62368d6c 100644
--- a/src/libs/qmljs/parser/qmljslexer_p.h
+++ b/src/libs/qmljs/parser/qmljslexer_p.h
@@ -22,6 +22,8 @@
 
 QT_QML_BEGIN_NAMESPACE
 
+class QDebug;
+
 namespace QmlJS {
 
 class Engine;
@@ -92,8 +94,12 @@ public:
         NoQmlImport
     };
 
+    enum class LexMode { WholeCode, LineByLine };
+
+    enum class CodeContinuation { Reset, Continue };
+
 public:
-    Lexer(Engine *engine);
+    Lexer(Engine *engine, LexMode lexMode = LexMode::WholeCode);
 
     int parseModeFlags() const {
         int flags = 0;
@@ -107,22 +113,25 @@ public:
     }
 
     bool qmlMode() const;
-    bool yieldIsKeyWord() const { return _generatorLevel != 0; }
+    bool yieldIsKeyWord() const { return _state.generatorLevel != 0; }
     void setStaticIsKeyword(bool b) { _staticIsKeyword = b; }
 
     QString code() const;
-    void setCode(const QString &code, int lineno, bool qmlMode = true);
+    void setCode(const QString &code,
+                 int lineno,
+                 bool qmlMode = true,
+                 CodeContinuation codeContinuation = CodeContinuation::Reset);
 
     int lex();
 
     bool scanRegExp(RegExpBodyPrefix prefix = NoPrefix);
     bool scanDirectives(Directives *directives, DiagnosticMessage *error);
 
-    int regExpFlags() const { return _patternFlags; }
+    int regExpFlags() const { return _state.patternFlags; }
     QString regExpPattern() const { return _tokenText; }
 
-    int tokenKind() const { return _tokenKind; }
-    int tokenOffset() const { return _tokenStartPtr - _code.unicode(); }
+    int tokenKind() const { return _state.tokenKind; }
+    int tokenOffset() const { return _currentOffset + _tokenStartPtr - _code.unicode(); }
     int tokenLength() const { return _tokenLength; }
 
     int tokenStartLine() const { return _tokenLine; }
@@ -130,7 +139,7 @@ public:
 
     inline QStringView tokenSpell() const { return _tokenSpell; }
     inline QStringView rawString() const { return _rawString; }
-    double tokenValue() const { return _tokenValue; }
+    double tokenValue() const { return _state.tokenValue; }
     QString tokenText() const;
 
     Error errorCode() const;
@@ -146,8 +155,92 @@ public:
         BalancedParentheses
     };
 
-    void enterGeneratorBody() { ++_generatorLevel; }
-    void leaveGeneratorBody() { --_generatorLevel; }
+    enum class CommentState { NoComment, HadComment, InMultilineComment };
+
+    void enterGeneratorBody() { ++_state.generatorLevel; }
+    void leaveGeneratorBody() { --_state.generatorLevel; }
+
+    struct State
+    {
+        Error errorCode = NoError;
+
+        QChar currentChar = u'\n';
+        double tokenValue = 0;
+
+        // parentheses state
+        ParenthesesState parenthesesState = IgnoreParentheses;
+        int parenthesesCount = 0;
+
+        // template string stack
+        QStack<int> outerTemplateBraceCount;
+        int bracesCount = -1;
+
+        int stackToken = -1;
+
+        int patternFlags = 0;
+        int tokenKind = 0;
+        ImportState importState = ImportState::NoQmlImport;
+
+        bool validTokenText = false;
+        bool prohibitAutomaticSemicolon = false;
+        bool restrictedKeyword = false;
+        bool terminator = false;
+        bool followsClosingBrace = false;
+        bool delimited = true;
+        bool handlingDirectives = false;
+        CommentState comments = CommentState::NoComment;
+        int generatorLevel = 0;
+
+        friend bool operator==(State const &s1, State const &s2)
+        {
+            if (s1.errorCode != s2.errorCode)
+                return false;
+            if (s1.currentChar != s2.currentChar)
+                return false;
+            if (s1.tokenValue != s2.tokenValue)
+                return false;
+            if (s1.parenthesesState != s2.parenthesesState)
+                return false;
+            if (s1.parenthesesCount != s2.parenthesesCount)
+                return false;
+            if (s1.outerTemplateBraceCount != s2.outerTemplateBraceCount)
+                return false;
+            if (s1.bracesCount != s2.bracesCount)
+                return false;
+            if (s1.stackToken != s2.stackToken)
+                return false;
+            if (s1.patternFlags != s2.patternFlags)
+                return false;
+            if (s1.tokenKind != s2.tokenKind)
+                return false;
+            if (s1.importState != s2.importState)
+                return false;
+            if (s1.validTokenText != s2.validTokenText)
+                return false;
+            if (s1.prohibitAutomaticSemicolon != s2.prohibitAutomaticSemicolon)
+                return false;
+            if (s1.restrictedKeyword != s2.restrictedKeyword)
+                return false;
+            if (s1.terminator != s2.terminator)
+                return false;
+            if (s1.followsClosingBrace != s2.followsClosingBrace)
+                return false;
+            if (s1.delimited != s2.delimited)
+                return false;
+            if (s1.handlingDirectives != s2.handlingDirectives)
+                return false;
+            if (s1.generatorLevel != s2.generatorLevel)
+                return false;
+            return true;
+        }
+
+        friend bool operator!=(State const &s1, State const &s2) { return !(s1 == s2); }
+
+        friend QML_PARSER_EXPORT QDebug operator<<(QDebug dbg, State const &s);
+    };
+
+    const State &state() const;
+    void setState(const State &state);
 
 protected:
     static int classify(const QChar *s, int n, int parseModeFlags);
@@ -177,54 +270,36 @@ private:
     uint decodeUnicodeEscapeCharacter(bool *ok);
     QChar decodeHexEscapeCharacter(bool *ok);
 
+    friend QML_PARSER_EXPORT QDebug operator<<(QDebug dbg, const Lexer &l);
+
 private:
     Engine *_engine;
 
+    LexMode _lexMode = LexMode::WholeCode;
     QString _code;
+    const QChar *_endPtr;
+    bool _qmlMode;
+    bool _staticIsKeyword = false;
+
+    bool _skipLinefeed = false;
+
+    int _currentLineNumber = 0;
+    int _currentColumnNumber = 0;
+    int _currentOffset = 0;
+
+    int _tokenLength = 0;
+    int _tokenLine = 0;
+    int _tokenColumn = 0;
+
     QString _tokenText;
     QString _errorMessage;
     QStringView _tokenSpell;
     QStringView _rawString;
 
-    const QChar *_codePtr;
-    const QChar *_endPtr;
-    const QChar *_tokenStartPtr;
+    const QChar *_codePtr = nullptr;
+    const QChar *_tokenStartPtr = nullptr;
 
-    QChar _char;
-    Error _errorCode;
-
-    int _currentLineNumber;
-    int _currentColumnNumber;
-    double _tokenValue;
-
-    // parentheses state
-    ParenthesesState _parenthesesState;
-    int _parenthesesCount;
-
-    // template string stack
-    QStack<int> _outerTemplateBraceCount;
-    int _bracesCount = -1;
-
-    int _stackToken;
-
-    int _patternFlags;
-    int _tokenKind;
-    int _tokenLength;
-    int _tokenLine;
-    int _tokenColumn;
-    ImportState _importState = ImportState::NoQmlImport;
-
-    bool _validTokenText;
-    bool _prohibitAutomaticSemicolon;
-    bool _restrictedKeyword;
-    bool _terminator;
-    bool _followsClosingBrace;
-    bool _delimited;
-    bool _qmlMode;
-    bool _skipLinefeed = false;
-    int _generatorLevel = 0;
-    bool _staticIsKeyword = false;
-    bool _handlingDirectives = false;
+    State _state;
 };
 
 } // end of namespace QmlJS
diff --git a/src/libs/qmljs/parser/qmljsparser.cpp b/src/libs/qmljs/parser/qmljsparser.cpp
index e5027d2a475..d7020fa70e3 100644
--- a/src/libs/qmljs/parser/qmljsparser.cpp
+++ b/src/libs/qmljs/parser/qmljsparser.cpp
@@ -1,3 +1,5 @@
+
+#line 110 "qmljs.g"
 // Copyright (C) 2021 The Qt Company Ltd.
 // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0+ OR GPL-3.0 WITH Qt-GPL-exception-1.0
 
@@ -11,7 +13,7 @@
 
 #include <string.h>
 
-#line 495 "qmljs.g"
+#line 401 "qmljs.g"
 
 #include "qmljsparser_p.h"
 
@@ -231,88 +233,88 @@ bool Parser::parse(int startToken)
 #endif
 
           switch (r) {
-#line 722 "qmljs.g"
+#line 628 "qmljs.g"
 
           case 0: {
               sym(1).Node = sym(2).Node;
               program = sym(1).Node;
           } break;
 
-#line 730 "qmljs.g"
+#line 636 "qmljs.g"
 
           case 1: {
               sym(1).Node = sym(2).Node;
               program = sym(1).Node;
           } break;
 
-#line 738 "qmljs.g"
+#line 644 "qmljs.g"
 
           case 2: {
               sym(1).Node = sym(2).Node;
               program = sym(1).Node;
           } break;
 
-#line 746 "qmljs.g"
+#line 652 "qmljs.g"
 
           case 3: {
               sym(1).Node = sym(2).Node;
               program = sym(1).Node;
           } break;
 
-#line 754 "qmljs.g"
+#line 660 "qmljs.g"
 
           case 4: {
               sym(1).Node = sym(2).Node;
               program = sym(1).Node;
           } break;
 
-#line 762 "qmljs.g"
+#line 668 "qmljs.g"
 
           case 5: {
               sym(1).Node = sym(2).Node;
               program = sym(1).Node;
           } break;
 
-#line 771 "qmljs.g"
+#line 677 "qmljs.g"
 
           case 6: {
               sym(1).UiProgram = new (pool)
                   AST::UiProgram(sym(1).UiHeaderItemList, sym(2).UiObjectMemberList->finish());
           } break;
 
-#line 779 "qmljs.g"
+#line 685 "qmljs.g"
 
           case 8: {
               sym(1).Node = sym(1).UiHeaderItemList->finish();
           } break;
 
-#line 786 "qmljs.g"
+#line 692 "qmljs.g"
 
           case 9: {
               sym(1).Node = new (pool) AST::UiHeaderItemList(sym(1).UiPragma);
           } break;
 
-#line 793 "qmljs.g"
+#line 699 "qmljs.g"
 
           case 10: {
               sym(1).Node = new (pool) AST::UiHeaderItemList(sym(1).UiImport);
           } break;
 
-#line 800 "qmljs.g"
+#line 706 "qmljs.g"
 
           case 11: {
               sym(1).Node = new (pool)
                   AST::UiHeaderItemList(sym(1).UiHeaderItemList, sym(2).UiPragma);
           } break;
 
-#line 807 "qmljs.g"
+#line 713 "qmljs.g"
 
           case 12: {
               sym(1).Node = new (pool)
                   AST::UiHeaderItemList(sym(1).UiHeaderItemList, sym(2).UiImport);
           } break;
 
-#line 819 "qmljs.g"
+#line 725 "qmljs.g"
 
           case 16: {
               AST::UiPragma *pragma = new (pool) AST::UiPragma(stringRef(2));
@@ -321,7 +323,7 @@ bool Parser::parse(int startToken)
               sym(1).Node = pragma;
           } break;
 
-#line 829 "qmljs.g"
+#line 735 "qmljs.g"
 
           case 17: {
               AST::UiPragma *pragma = new (pool) AST::UiPragma(stringRef(2), stringRef(4));
@@ -330,22 +332,22 @@ bool Parser::parse(int startToken)
               sym(1).Node = pragma;
           } break;
 
-#line 841 "qmljs.g"
+#line 747 "qmljs.g"
 
           case 19: {
               sym(1).UiImport->semicolonToken = loc(2);
           } break;
 
-#line 848 "qmljs.g"
+#line 754 "qmljs.g"
 
           case 20: {
               const int major = sym(1).dval;
               const int minor = sym(3).dval;
-              if (major < 0 || major >= 255 || minor < 0 || minor >= 255) {
-                  diagnostic_messages.append(compileError(
-                      loc(1),
-                      QLatin1String("Invalid version. Version numbers must be >= 0 and < 255.")));
-                  return false;
+              if (!QTypeRevision::isValidSegment(major) || !QTypeRevision::isValidSegment(minor)) {
+                    diagnostic_messages.append(compileError(
+                        loc(1),
+                        QLatin1String("Invalid version. Version numbers must be >= 0 and < 255.")));
+                    return false;
               }
               auto version = new (pool) AST::UiVersionSpecifier(major, minor);
               version->majorToken = loc(1);
@@ -353,30 +355,30 @@ bool Parser::parse(int startToken)
               sym(1).UiVersionSpecifier = version;
           } break;
 
-#line 866 "qmljs.g"
+#line 773 "qmljs.g"
 
           case 21: {
               const int major = sym(1).dval;
-              if (major < 0 || major >= 255) {
-                  diagnostic_messages.append(compileError(
-                      loc(1),
-                      QLatin1String(
-                          "Invalid major version. Version numbers must be >= 0 and < 255.")));
-                  return false;
+              if (!QTypeRevision::isValidSegment(major)) {
+                    diagnostic_messages.append(compileError(
+                        loc(1),
+                        QLatin1String(
+                            "Invalid major version. Version numbers must be >= 0 and < 255.")));
+                    return false;
               }
               auto version = new (pool) AST::UiVersionSpecifier(sym(1).dval);
               version->majorToken = loc(1);
               sym(1).UiVersionSpecifier = version;
           } break;
 
-#line 882 "qmljs.g"
+#line 789 "qmljs.g"
 
           case 22: {
               sym(1).UiImport->version = sym(2).UiVersionSpecifier;
               sym(1).UiImport->semicolonToken = loc(3);
           } break;
 
-#line 890 "qmljs.g"
+#line 797 "qmljs.g"
 
           case 23: {
               sym(1).UiImport->version = sym(2).UiVersionSpecifier;
@@ -386,7 +388,7 @@ bool Parser::parse(int startToken)
               sym(1).UiImport->semicolonToken = loc(5);
           } break;
 
-#line 901 "qmljs.g"
+#line 808 "qmljs.g"
 
           case 24: {
               sym(1).UiImport->asToken = loc(2);
@@ -395,47 +397,47 @@ bool Parser::parse(int startToken)
               sym(1).UiImport->semicolonToken = loc(4);
           } break;
 
-#line 911 "qmljs.g"
+#line 818 "qmljs.g"
 
           case 25: {
               AST::UiImport *node = 0;
 
               if (AST::StringLiteral *importIdLiteral = AST::cast<AST::StringLiteral *>(
                       sym(2).Expression)) {
-                  node = new (pool) AST::UiImport(importIdLiteral->value);
-                  node->fileNameToken = loc(2);
+                    node = new (pool) AST::UiImport(importIdLiteral->value);
+                    node->fileNameToken = loc(2);
               } else if (AST::UiQualifiedId *qualifiedId = reparseAsQualifiedId(sym(2).Expression)) {
-                  node = new (pool) AST::UiImport(qualifiedId);
-                  node->fileNameToken = loc(2);
+                    node = new (pool) AST::UiImport(qualifiedId);
+                    node->fileNameToken = loc(2);
               }
 
               sym(1).Node = node;
 
               if (node) {
-                  node->importToken = loc(1);
+                    node->importToken = loc(1);
               } else {
-                  diagnostic_messages.append(
-                      compileError(loc(1),
-                                   QLatin1String(
-                                       "Expected a qualified name id or a string literal")));
+                    diagnostic_messages.append(
+                        compileError(loc(1),
+                                     QLatin1String(
+                                         "Expected a qualified name id or a string literal")));
 
-                  return false; // ### remove me
+                    return false; // ### remove me
               }
           } break;
 
-#line 937 "qmljs.g"
+#line 844 "qmljs.g"
 
           case 26: {
               sym(1).Node = nullptr;
           } break;
 
-#line 944 "qmljs.g"
+#line 851 "qmljs.g"
 
           case 27: {
               sym(1).Node = new (pool) AST::UiObjectMemberList(sym(1).UiObjectMember);
           } break;
 
-#line 951 "qmljs.g"
+#line 858 "qmljs.g"
 
           case 28: {
               AST::IdentifierExpression *node = new (pool) AST::IdentifierExpression(stringRef(1));
@@ -443,7 +445,7 @@ bool Parser::parse(int startToken)
               sym(1).Node = node;
           } break;
 
-#line 960 "qmljs.g"
+#line 867 "qmljs.g"
 
           case 29: {
               AST::FieldMemberExpression *node = new (pool)
@@ -453,37 +455,37 @@ bool Parser::parse(int startToken)
               sym(1).Node = node;
           } break;
 
-#line 970 "qmljs.g"
+#line 877 "qmljs.g"
 
           case 30: {
               if (AST::UiQualifiedId *qualifiedId = reparseAsQualifiedId(sym(1).Expression)) {
-                  sym(1).UiQualifiedId = qualifiedId;
+                    sym(1).UiQualifiedId = qualifiedId;
               } else {
-                  sym(1).UiQualifiedId = 0;
+                    sym(1).UiQualifiedId = 0;
 
-                  diagnostic_messages.append(
-                      compileError(loc(1), QLatin1String("Expected a qualified name id")));
+                    diagnostic_messages.append(
+                        compileError(loc(1), QLatin1String("Expected a qualified name id")));
 
-                  return false;
+                    return false;
               }
               AST::UiAnnotation *node = new (pool)
                   AST::UiAnnotation(sym(1).UiQualifiedId, sym(2).UiObjectInitializer);
               sym(1).Node = node;
           } break;
 
-#line 988 "qmljs.g"
+#line 895 "qmljs.g"
 
           case 31: {
               sym(1).Node = sym(2).Node;
           } break;
 
-#line 996 "qmljs.g"
+#line 903 "qmljs.g"
 
           case 32: {
               sym(1).Node = new (pool) AST::UiAnnotationList(sym(1).UiAnnotation);
           } break;
 
-#line 1003 "qmljs.g"
+#line 910 "qmljs.g"
 
           case 33: {
               AST::UiAnnotationList *node = new (pool)
@@ -491,7 +493,7 @@ bool Parser::parse(int startToken)
               sym(1).Node = node;
           } break;
 
-#line 1011 "qmljs.g"
+#line 918 "qmljs.g"
 
           case 34: {
               AST::UiObjectDefinition *node = sym(2).UiObjectDefinition;
@@ -499,13 +501,13 @@ bool Parser::parse(int startToken)
               sym(1).Node = node;
           } break;
 
-#line 1022 "qmljs.g"
+#line 929 "qmljs.g"
 
           case 36: {
               sym(1).Node = new (pool) AST::UiObjectMemberList(sym(1).UiObjectMember);
           } break;
 
-#line 1029 "qmljs.g"
+#line 936 "qmljs.g"
 
           case 37: {
               AST::UiObjectMemberList *node = new (pool)
@@ -513,13 +515,13 @@ bool Parser::parse(int startToken)
               sym(1).Node = node;
           } break;
 
-#line 1037 "qmljs.g"
+#line 944 "qmljs.g"
 
           case 38: {
               sym(1).Node = new (pool) AST::UiArrayMemberList(sym(1).UiObjectMember);
           } break;
 
-#line 1044 "qmljs.g"
+#line 951 "qmljs.g"
 
           case 39: {
               AST::UiArrayMemberList *node = new (pool)
@@ -528,7 +530,7 @@ bool Parser::parse(int startToken)
               sym(1).Node = node;
           } break;
 
-#line 1053 "qmljs.g"
+#line 960 "qmljs.g"
 
           case 40: {
               AST::UiObjectInitializer *node = new (pool)
@@ -538,7 +540,7 @@ bool Parser::parse(int startToken)
               sym(1).Node = node;
           } break;
 
-#line 1063 "qmljs.g"
+#line 970 "qmljs.g"
 
           case 41: {
               AST::UiObjectInitializer *node = new (pool)
@@ -548,7 +550,7 @@ bool Parser::parse(int startToken)
               sym(1).Node = node;
           } break;
 
-#line 1073 "qmljs.g"
+#line 980 "qmljs.g"
 
           case 42: {
               AST::UiObjectDefinition *node = new (pool)
@@ -556,7 +558,7 @@ bool Parser::parse(int startToken)
               sym(1).Node = node;
           } break;
 
-#line 1081 "qmljs.g"
+#line 988 "qmljs.g"
 
           case 43: {
               AST::UiObjectMember *node = sym(2).UiObjectMember;
@@ -564,7 +566,7 @@ bool Parser::parse(int startToken)
               sym(1).Node = sym(2).Node;
           } break;
 
-#line 1094 "qmljs.g"
+#line 1001 "qmljs.g"
 
           case 46: {
               AST::UiArrayBinding *node = new (pool)
@@ -575,7 +577,7 @@ bool Parser::parse(int startToken)
               sym(1).Node = node;
           } break;
 
-#line 1105 "qmljs.g"
+#line 1012 "qmljs.g"
 
           case 47: {
               AST::UiObjectBinding *node = new (pool)
@@ -586,7 +588,7 @@ bool Parser::parse(int startToken)
               sym(1).Node = node;
           } break;
 
-#line 1115 "qmljs.g"
+#line 1022 "qmljs.g"
 
           case 48: {
               AST::UiObjectBinding *node = new (pool)
@@ -598,7 +600,7 @@ bool Parser::parse(int startToken)
               sym(1).Node = node;
           } break;
 
-#line 1127 "qmljs.g"
+#line 1034 "qmljs.g"
 
           case 49: {
               AST::ObjectPattern *l = new (pool)
@@ -610,7 +612,7 @@ bool Parser::parse(int startToken)
               sym(1).Node = node;
           } break;
 
-#line 1140 "qmljs.g"
+#line 1047 "qmljs.g"
 
           case 50: {
               AST::ObjectPattern *l = new (pool)
@@ -622,40 +624,40 @@ bool Parser::parse(int startToken)
               sym(1).Node = node;
           } break;
 
-#line 1153 "qmljs.g"
+#line 1060 "qmljs.g"
           case 51:
               Q_FALLTHROUGH();
-#line 1155 "qmljs.g"
+#line 1062 "qmljs.g"
           case 52:
               Q_FALLTHROUGH();
-#line 1157 "qmljs.g"
+#line 1064 "qmljs.g"
 
           case 53: {
               sym(1).Node = sym(3).Node;
           } break;
 
-#line 1165 "qmljs.g"
+#line 1072 "qmljs.g"
           case 54:
               Q_FALLTHROUGH();
-#line 1167 "qmljs.g"
+#line 1074 "qmljs.g"
           case 55:
               Q_FALLTHROUGH();
-#line 1169 "qmljs.g"
+#line 1076 "qmljs.g"
           case 56:
               Q_FALLTHROUGH();
-#line 1171 "qmljs.g"
+#line 1078 "qmljs.g"
           case 57:
               Q_FALLTHROUGH();
-#line 1173 "qmljs.g"
+#line 1080 "qmljs.g"
           case 58:
               Q_FALLTHROUGH();
-#line 1175 "qmljs.g"
+#line 1082 "qmljs.g"
 
           case 59: {
               sym(1).Node = sym(2).Node;
           } break;
 
-#line 1182 "qmljs.g"
+#line 1089 "qmljs.g"
 
           case 60: {
               AST::UiScriptBinding *node = new (pool)
@@ -664,13 +666,13 @@ bool Parser::parse(int startToken)
               sym(1).Node = node;
           } break;
 
-#line 1192 "qmljs.g"
+#line 1099 "qmljs.g"
           case 61:
               Q_FALLTHROUGH();
-#line 1194 "qmljs.g"
+#line 1101 "qmljs.g"
           case 62:
               Q_FALLTHROUGH();
-#line 1196 "qmljs.g"
+#line 1103 "qmljs.g"
 
           case 63: {
               AST::UiQualifiedId *node = new (pool) AST::UiQualifiedId(stringRef(1));
@@ -678,7 +680,7 @@ bool Parser::parse(int startToken)
               sym(1).Node = node;
           } break;
 
-#line 1205 "qmljs.g"
+#line 1112 "qmljs.g"
 
           case 64: {
               AST::UiQualifiedId *node = new (pool)
@@ -687,46 +689,44 @@ bool Parser::parse(int startToken)
               sym(1).Node = node;
           } break;
 
-#line 1214 "qmljs.g"
+#line 1121 "qmljs.g"
 
           case 65: {
               sym(1).Node = nullptr;
           } break;
 
-#line 1221 "qmljs.g"
+#line 1128 "qmljs.g"
 
           case 66: {
               sym(1).Node = sym(1).UiParameterList->finish();
           } break;
 
-#line 1228 "qmljs.g"
+#line 1135 "qmljs.g"
 
           case 67: {
               AST::UiParameterList *node = new (pool)
-                  AST::UiParameterList(sym(3).UiQualifiedId->finish(), stringRef(1));
+                  AST::UiParameterList(sym(3).Type, stringRef(1));
               node->identifierToken = loc(1);
               node->colonToken = loc(2);
               node->propertyTypeToken = loc(3);
               sym(1).Node = node;
           } break;
 
-#line 1239 "qmljs.g"
+#line 1146 "qmljs.g"
 
           case 68: {
               AST::UiParameterList *node = new (pool)
-                  AST::UiParameterList(sym(1).UiQualifiedId->finish(), stringRef(2));
+                  AST::UiParameterList(sym(1).Type, stringRef(2));
               node->propertyTypeToken = loc(1);
               node->identifierToken = loc(2);
               sym(1).Node = node;
           } break;
 
-#line 1249 "qmljs.g"
+#line 1156 "qmljs.g"
 
           case 69: {
               AST::UiParameterList *node = new (pool)
-                  AST::UiParameterList(sym(1).UiParameterList,
-                                       sym(5).UiQualifiedId->finish(),
-                                       stringRef(3));
+                  AST::UiParameterList(sym(1).UiParameterList, sym(5).Type, stringRef(3));
               node->propertyTypeToken = loc(5);
               node->commaToken = loc(2);
               node->identifierToken = loc(3);
@@ -734,20 +734,18 @@ bool Parser::parse(int startToken)
               sym(1).Node = node;
           } break;
 
-#line 1261 "qmljs.g"
+#line 1168 "qmljs.g"
 
           case 70: {
               AST::UiParameterList *node = new (pool)
-                  AST::UiParameterList(sym(1).UiParameterList,
-                                       sym(3).UiQualifiedId->finish(),
-                                       stringRef(4));
+                  AST::UiParameterList(sym(1).UiParameterList, sym(3).Type, stringRef(4));
               node->propertyTypeToken = loc(3);
               node->commaToken = loc(2);
               node->identifierToken = loc(4);
               sym(1).Node = node;
           } break;
 
-#line 1272 "qmljs.g"
+#line 1179 "qmljs.g"
 
           case 71: {
               AST::UiPublicMember *node = new (pool) AST::UiPublicMember(nullptr, stringRef(2));
@@ -760,7 +758,7 @@ bool Parser::parse(int startToken)
               sym(1).Node = node;
           } break;
 
-#line 1286 "qmljs.g"
+#line 1193 "qmljs.g"
 
           case 72: {
               AST::UiPublicMember *node = new (pool) AST::UiPublicMember(nullptr, stringRef(2));
@@ -772,46 +770,49 @@ bool Parser::parse(int startToken)
               sym(1).Node = node;
           } break;
 
-#line 1312 "qmljs.g"
+#line 1219 "qmljs.g"
 
           case 76: {
               AST::UiPropertyAttributes *node = sym(2).UiPropertyAttributes;
               if (node->isRequired())
-                  diagnostic_messages.append(
-                      compileError(node->requiredToken(),
-                                   QLatin1String("Duplicated 'required' attribute is not allowed."),
-                                   QtCriticalMsg));
+                    diagnostic_messages.append(
+                        compileError(node->requiredToken(),
+                                     QLatin1String(
+                                         "Duplicated 'required' attribute is not allowed."),
+                                     QtCriticalMsg));
               node->m_requiredToken = loc(1);
               sym(1).UiPropertyAttributes = node;
           } break;
 
-#line 1323 "qmljs.g"
+#line 1230 "qmljs.g"
 
           case 77: {
               AST::UiPropertyAttributes *node = sym(2).UiPropertyAttributes;
               if (node->isDefaultMember())
-                  diagnostic_messages.append(
-                      compileError(node->requiredToken(),
-                                   QLatin1String("Duplicated 'default' attribute is not allowed."),
-                                   QtCriticalMsg));
+                    diagnostic_messages.append(
+                        compileError(node->requiredToken(),
+                                     QLatin1String(
+                                         "Duplicated 'default' attribute is not allowed."),
+                                     QtCriticalMsg));
               node->m_defaultToken = loc(1);
               sym(1).UiPropertyAttributes = node;
           } break;
 
-#line 1334 "qmljs.g"
+#line 1241 "qmljs.g"
 
           case 78: {
               AST::UiPropertyAttributes *node = sym(2).UiPropertyAttributes;
               if (node->isReadonly())
-                  diagnostic_messages.append(
-                      compileError(node->requiredToken(),
-                                   QLatin1String("Duplicated 'readonly' attribute is not allowed."),
-                                   QtCriticalMsg));
+                    diagnostic_messages.append(
+                        compileError(node->requiredToken(),
+                                     QLatin1String(
+                                         "Duplicated 'readonly' attribute is not allowed."),
+                                     QtCriticalMsg));
               node->m_readonlyToken = loc(1);
               sym(1).UiPropertyAttributes = node;
           } break;
 
-#line 1345 "qmljs.g"
+#line 1252 "qmljs.g"
 
           case 79: {
               AST::UiPropertyAttributes *node = new (pool) AST::UiPropertyAttributes();
@@ -819,7 +820,7 @@ bool Parser::parse(int startToken)
               sym(1).UiPropertyAttributes = node;
           } break;
 
-#line 1354 "qmljs.g"
+#line 1261 "qmljs.g"
 
           case 80: {
               AST::UiPublicMember *node = new (pool)
@@ -827,10 +828,10 @@ bool Parser::parse(int startToken)
               auto attributes = sym(1).UiPropertyAttributes;
               node->setAttributes(attributes);
               if (attributes->isReadonly())
-                  diagnostic_messages.append(
-                      compileError(attributes->readonlyToken(),
-                                   QLatin1String("Read-only properties require an initializer."),
-                                   QtWarningMsg));
+                    diagnostic_messages.append(
+                        compileError(attributes->readonlyToken(),
+                                     QLatin1String("Read-only properties require an initializer."),
+                                     QtWarningMsg));
               node->typeModifier = stringRef(2);
               node->typeModifierToken = loc(2);
               node->typeToken = loc(4);
@@ -839,17 +840,17 @@ bool Parser::parse(int startToken)
               sym(1).Node = node;
           } break;
 
-#line 1373 "qmljs.g"
+#line 1280 "qmljs.g"
 
           case 82: {
               AST::UiPublicMember *node = new (pool)
                   AST::UiPublicMember(sym(2).UiQualifiedId->finish(), stringRef(3));
               auto attributes = sym(1).UiPropertyAttributes;
               if (attributes->isReadonly())
-                  diagnostic_messages.append(
-                      compileError(attributes->readonlyToken(),
-                                   QLatin1String("Read-only properties require an initializer."),
-                                   QtCriticalMsg));
+                    diagnostic_messages.append(
+                        compileError(attributes->readonlyToken(),
+                                     QLatin1String("Read-only properties require an initializer."),
+                                     QtCriticalMsg));
               node->setAttributes(attributes);
               node->typeToken = loc(2);
               node->identifierToken = loc(3);
@@ -857,12 +858,12 @@ bool Parser::parse(int startToken)
               sym(1).Node = node;
           } break;
 
-#line 1391 "qmljs.g"
+#line 1298 "qmljs.g"
 
           /* we need OptionalSemicolon because UiScriptStatement might already parse the last semicolon
   and then we would miss a semicolon (see tests/auto/quick/qquickvisualdatamodel/data/objectlist.qml)*/
 
-#line 1397 "qmljs.g"
+#line 1304 "qmljs.g"
 
           case 86: {
               AST::UiRequired *node = new (pool) AST::UiRequired(stringRef(2));
@@ -871,7 +872,7 @@ bool Parser::parse(int startToken)
               sym(1).Node = node;
           } break;
 
-#line 1409 "qmljs.g"
+#line 1316 "qmljs.g"
 
           case 88: {
               AST::UiPublicMember *node = new (pool)
@@ -880,11 +881,11 @@ bool Parser::parse(int startToken)
                                       sym(5).Statement);
               auto attributes = sym(1).UiPropertyAttributes;
               if (attributes->isRequired())
-                  diagnostic_messages.append(
-                      compileError(attributes->requiredToken(),
-                                   QLatin1String(
-                                       "Required properties with initializer do not make sense."),
-                                   QtCriticalMsg));
+                    diagnostic_messages.append(
+                        compileError(attributes->requiredToken(),
+                                     QLatin1String(
+                                         "Required properties with initializer do not make sense."),
+                                     QtCriticalMsg));
               node->setAttributes(attributes);
               node->typeToken = loc(2);
               node->identifierToken = loc(3);
@@ -892,18 +893,41 @@ bool Parser::parse(int startToken)
               sym(1).Node = node;
           } break;
 
-#line 1426 "qmljs.g"
+#line 1331 "qmljs.g"
 
-          case 90: {
+          case 89: {
+              AST::UiPublicMember *node = new (pool)
+                  AST::UiPublicMember(sym(4).UiQualifiedId->finish(),
+                                      stringRef(6),
+                                      sym(8).Statement);
+              node->typeModifier = stringRef(2);
+              auto attributes = sym(1).UiPropertyAttributes;
+              if (attributes->isRequired())
+                    diagnostic_messages.append(
+                        compileError(attributes->requiredToken(),
+                                     QLatin1String(
+                                         "Required properties with initializer do not make sense."),
+                                     QtCriticalMsg));
+              node->setAttributes(attributes);
+              node->typeModifierToken = loc(2);
+              node->typeToken = loc(4);
+              node->identifierToken = loc(6);
+              node->colonToken = loc(7);
+              sym(1).Node = node;
+          } break;
+
+#line 1350 "qmljs.g"
+
+          case 91: {
               AST::UiPublicMember *node = new (pool)
                   AST::UiPublicMember(sym(4).UiQualifiedId->finish(), stringRef(6));
               auto attributes = sym(1).UiPropertyAttributes;
               if (attributes->isRequired())
-                  diagnostic_messages.append(
-                      compileError(attributes->requiredToken(),
-                                   QLatin1String(
-                                       "Required properties with initializer do not make sense."),
-                                   QtCriticalMsg));
+                    diagnostic_messages.append(
+                        compileError(attributes->requiredToken(),
+                                     QLatin1String(
+                                         "Required properties with initializer do not make sense."),
+                                     QtCriticalMsg));
               node->setAttributes(attributes);
               node->typeModifier = stringRef(2);
               node->typeModifierToken = loc(2);
@@ -916,28 +940,28 @@ bool Parser::parse(int startToken)
               propertyName->next = nullptr;
 
               AST::UiArrayBinding *binding = new (pool)
-                  AST::UiArrayBinding(propertyName, sym(9).UiArrayMemberList->finish());
+                  AST::UiArrayBinding(propertyName, sym(10).UiArrayMemberList->finish());
               binding->colonToken = loc(7);
-              binding->lbracketToken = loc(8);
-              binding->rbracketToken = loc(10);
+              binding->lbracketToken = loc(9);
+              binding->rbracketToken = loc(11);
 
               node->binding = binding;
 
               sym(1).Node = node;
           } break;
 
-#line 1457 "qmljs.g"
+#line 1381 "qmljs.g"
 
-          case 92: {
+          case 93: {
               AST::UiPublicMember *node = new (pool)
                   AST::UiPublicMember(sym(2).UiQualifiedId->finish(), stringRef(3));
               auto attributes = sym(1).UiPropertyAttributes;
               if (attributes->isRequired())
-                  diagnostic_messages.append(
-                      compileError(attributes->requiredToken(),
-                                   QLatin1String(
-                                       "Required properties with initializer do not make sense."),
-                                   QtWarningMsg));
+                    diagnostic_messages.append(
+                        compileError(attributes->requiredToken(),
+                                     QLatin1String(
+                                         "Required properties with initializer do not make sense."),
+                                     QtWarningMsg));
               node->setAttributes(attributes);
               node->typeToken = loc(2);
               node->identifierToken = loc(3);
@@ -958,68 +982,70 @@ bool Parser::parse(int startToken)
               sym(1).Node = node;
           } break;
 
-#line 1485 "qmljs.g"
+#line 1409 "qmljs.g"
 
-          case 94: {
+          case 95: {
               auto node = new (pool) AST::UiSourceElement(sym(1).Node);
               sym(1).Node = node;
           } break;
 
-#line 1493 "qmljs.g"
-
-          case 95: {
-              sym(1).Node = new (pool) AST::UiSourceElement(sym(1).Node);
-          } break;
-
-#line 1500 "qmljs.g"
+#line 1417 "qmljs.g"
 
           case 96: {
               sym(1).Node = new (pool) AST::UiSourceElement(sym(1).Node);
           } break;
 
-#line 1507 "qmljs.g"
+#line 1424 "qmljs.g"
 
           case 97: {
+              sym(1).Node = new (pool) AST::UiSourceElement(sym(1).Node);
+          } break;
+
+#line 1431 "qmljs.g"
+
+          case 98: {
               if (AST::ArrayMemberExpression *mem = AST::cast<AST::ArrayMemberExpression *>(
                       sym(1).Expression)) {
-                  diagnostic_messages.append(compileError(mem->lbracketToken,
-                                                          QLatin1String("Ignored annotation"),
-                                                          QtWarningMsg));
+                    diagnostic_messages.append(compileError(mem->lbracketToken,
+                                                            QLatin1String("Ignored annotation"),
+                                                            QtWarningMsg));
 
-                  sym(1).Expression = mem->base;
+                    sym(1).Expression = mem->base;
               }
 
               if (AST::UiQualifiedId *qualifiedId = reparseAsQualifiedId(sym(1).Expression)) {
-                  sym(1).UiQualifiedId = qualifiedId;
+                    sym(1).UiQualifiedId = qualifiedId;
               } else {
-                  sym(1).UiQualifiedId = 0;
+                    sym(1).UiQualifiedId = 0;
 
-                  diagnostic_messages.append(
-                      compileError(loc(1), QLatin1String("Expected a qualified name id")));
+                    diagnostic_messages.append(
+                        compileError(loc(1), QLatin1String("Expected a qualified name id")));
 
-                  return false; // ### recover
+                    return false; // ### recover
               }
           } break;
 
-#line 1530 "qmljs.g"
+#line 1454 "qmljs.g"
 
-          case 98: {
+          case 99: {
               AST::UiEnumDeclaration *enumDeclaration = new (pool)
                   AST::UiEnumDeclaration(stringRef(2), sym(4).UiEnumMemberList->finish());
               enumDeclaration->enumToken = loc(1);
+              enumDeclaration->identifierToken = loc(2);
+              enumDeclaration->lbraceToken = loc(3);
               enumDeclaration->rbraceToken = loc(5);
               sym(1).Node = enumDeclaration;
               break;
           }
 
-#line 1541 "qmljs.g"
+#line 1467 "qmljs.g"
 
-          case 99: {
+          case 100: {
               if (!stringRef(2).front().isUpper()) {
-                  diagnostic_messages.append(
-                      compileError(loc(2),
-                                   QLatin1String("Type name must be upper case"),
-                                   QtWarningMsg));
+                    diagnostic_messages.append(
+                        compileError(loc(2),
+                                     QLatin1String("Type name must be upper case"),
+                                     QtWarningMsg));
               }
               auto inlineComponent = new (pool)
                   AST::UiInlineComponent(stringRef(2), sym(4).UiObjectDefinition);
@@ -1027,18 +1053,18 @@ bool Parser::parse(int startToken)
               sym(1).Node = inlineComponent;
           } break;
 
-#line 1554 "qmljs.g"
+#line 1480 "qmljs.g"
 
-          case 100: {
+          case 101: {
               AST::UiEnumMemberList *node = new (pool) AST::UiEnumMemberList(stringRef(1));
               node->memberToken = loc(1);
               sym(1).Node = node;
               break;
           }
 
-#line 1564 "qmljs.g"
+#line 1490 "qmljs.g"
 
-          case 101: {
+          case 102: {
               AST::UiEnumMemberList *node = new (pool)
                   AST::UiEnumMemberList(stringRef(1), sym(3).dval);
               node->memberToken = loc(1);
@@ -1047,9 +1073,20 @@ bool Parser::parse(int startToken)
               break;
           }
 
-#line 1575 "qmljs.g"
+#line 1502 "qmljs.g"
 
-          case 102: {
+          case 103: {
+              AST::UiEnumMemberList *node = new (pool)
+                  AST::UiEnumMemberList(stringRef(1), -sym(4).dval);
+              node->memberToken = loc(1);
+              node->valueToken = combine(loc(3), loc(4));
+              sym(1).Node = node;
+              break;
+          }
+
+#line 1513 "qmljs.g"
+
+          case 104: {
               AST::UiEnumMemberList *node = new (pool)
                   AST::UiEnumMemberList(sym(1).UiEnumMemberList, stringRef(3));
               node->memberToken = loc(3);
@@ -1057,9 +1094,9 @@ bool Parser::parse(int startToken)
               break;
           }
 
-#line 1585 "qmljs.g"
+#line 1523 "qmljs.g"
 
-          case 103: {
+          case 105: {
               AST::UiEnumMemberList *node = new (pool)
                   AST::UiEnumMemberList(sym(1).UiEnumMemberList, stringRef(3), sym(5).dval);
               node->memberToken = loc(3);
@@ -1068,81 +1105,89 @@ bool Parser::parse(int startToken)
               break;
           }
 
-#line 1629 "qmljs.g"
+#line 1535 "qmljs.g"
 
-          case 130: {
-              sym(1).TypeArgumentList = new (pool) AST::TypeArgumentList(sym(1).Type);
-          } break;
+          case 106: {
+              AST::UiEnumMemberList *node = new (pool)
+                  AST::UiEnumMemberList(sym(1).UiEnumMemberList, stringRef(3), -sym(6).dval);
+              node->memberToken = loc(3);
+              node->valueToken = combine(loc(5), loc(6));
+              sym(1).Node = node;
+              break;
+          }
 
-#line 1636 "qmljs.g"
-
-          case 131: {
-              sym(1).TypeArgumentList = new (pool)
-                  AST::TypeArgumentList(sym(1).TypeArgumentList, sym(3).Type);
-          } break;
-
-#line 1643 "qmljs.g"
-
-          case 132: {
-              sym(1).Type = new (pool)
-                  AST::Type(sym(1).UiQualifiedId, sym(3).TypeArgumentList->finish());
-          } break;
-
-#line 1650 "qmljs.g"
+#line 1579 "qmljs.g"
 
           case 133: {
+              sym(1).Type = new (pool) AST::Type(sym(1).UiQualifiedId, sym(3).Type);
+          } break;
+
+#line 1588 "qmljs.g"
+
+          case 135: {
               AST::UiQualifiedId *id = new (pool) AST::UiQualifiedId(stringRef(1));
               id->identifierToken = loc(1);
               sym(1).Type = new (pool) AST::Type(id->finish());
           } break;
 
-#line 1659 "qmljs.g"
+#line 1597 "qmljs.g"
 
-          case 134: {
+          case 136: {
               sym(1).Type = new (pool) AST::Type(sym(1).UiQualifiedId);
           } break;
 
-#line 1666 "qmljs.g"
+#line 1604 "qmljs.g"
+          case 137:
+              Q_FALLTHROUGH();
+#line 1607 "qmljs.g"
 
-          case 135: {
+          case 138: {
+              AST::UiQualifiedId *id = new (pool) AST::UiQualifiedId(stringRef(1));
+              id->identifierToken = loc(1);
+              sym(1).Type = new (pool) AST::Type(id->finish());
+          } break;
+
+#line 1616 "qmljs.g"
+
+          case 139: {
               sym(1).TypeAnnotation = new (pool) AST::TypeAnnotation(sym(2).Type);
               sym(1).TypeAnnotation->colonToken = loc(1);
           } break;
 
-#line 1675 "qmljs.g"
+#line 1625 "qmljs.g"
 
-          case 137: {
+          case 141: {
               sym(1).TypeAnnotation = nullptr;
           } break;
 
-#line 1686 "qmljs.g"
+#line 1636 "qmljs.g"
 
-          case 138: {
+          case 142: {
               AST::ThisExpression *node = new (pool) AST::ThisExpression();
               node->thisToken = loc(1);
               sym(1).Node = node;
           } break;
 
-#line 1695 "qmljs.g"
+#line 1645 "qmljs.g"
 
-          case 139: {
+          case 143: {
               AST::IdentifierExpression *node = new (pool) AST::IdentifierExpression(stringRef(1));
               node->identifierToken = loc(1);
               sym(1).Node = node;
           } break;
 
-#line 1713 "qmljs.g"
+#line 1663 "qmljs.g"
 
-          case 148: {
+          case 152: {
               if (coverExpressionType != CE_ParenthesizedExpression) {
-                  syntaxError(coverExpressionErrorLocation, "Expected token ')'.");
-                  return false;
+                    syntaxError(coverExpressionErrorLocation, "Expected token ')'.");
+                    return false;
               }
           } break;
 
-#line 1724 "qmljs.g"
+#line 1674 "qmljs.g"
 
-          case 149: {
+          case 153: {
               AST::NestedExpression *node = new (pool) AST::NestedExpression(sym(2).Expression);
               node->lparenToken = loc(1);
               node->rparenToken = loc(3);
@@ -1150,17 +1195,17 @@ bool Parser::parse(int startToken)
               coverExpressionType = CE_ParenthesizedExpression;
           } break;
 
-#line 1735 "qmljs.g"
+#line 1685 "qmljs.g"
 
-          case 150: {
+          case 154: {
               sym(1).Node = nullptr;
               coverExpressionErrorLocation = loc(2);
               coverExpressionType = CE_FormalParameterList;
           } break;
 
-#line 1744 "qmljs.g"
+#line 1694 "qmljs.g"
 
-          case 151: {
+          case 155: {
               AST::FormalParameterList *node = (new (pool)
                                                     AST::FormalParameterList(nullptr,
                                                                              sym(2).PatternElement))
@@ -1170,113 +1215,113 @@ bool Parser::parse(int startToken)
               coverExpressionType = CE_FormalParameterList;
           } break;
 
-#line 1754 "qmljs.g"
+#line 1704 "qmljs.g"
 
-          case 152: {
+          case 156: {
               AST::FormalParameterList *list = sym(2).Expression->reparseAsFormalParameterList(pool);
               if (!list) {
-                  syntaxError(loc(1), "Invalid Arrow parameter list.");
-                  return false;
+                    syntaxError(loc(1), "Invalid Arrow parameter list.");
+                    return false;
               }
               if (sym(4).Node) {
-                  list = new (pool) AST::FormalParameterList(list, sym(4).PatternElement);
+                    list = new (pool) AST::FormalParameterList(list, sym(4).PatternElement);
               }
               coverExpressionErrorLocation = loc(4);
               coverExpressionType = CE_FormalParameterList;
               sym(1).Node = list->finish(pool);
           } break;
 
-#line 1771 "qmljs.g"
+#line 1721 "qmljs.g"
 
-          case 153: {
+          case 157: {
               AST::NullExpression *node = new (pool) AST::NullExpression();
               node->nullToken = loc(1);
               sym(1).Node = node;
           } break;
 
-#line 1780 "qmljs.g"
+#line 1730 "qmljs.g"
 
-          case 154: {
+          case 158: {
               AST::TrueLiteral *node = new (pool) AST::TrueLiteral();
               node->trueToken = loc(1);
               sym(1).Node = node;
           } break;
 
-#line 1789 "qmljs.g"
+#line 1739 "qmljs.g"
 
-          case 155: {
+          case 159: {
               AST::FalseLiteral *node = new (pool) AST::FalseLiteral();
               node->falseToken = loc(1);
               sym(1).Node = node;
           } break;
 
-#line 1798 "qmljs.g"
+#line 1748 "qmljs.g"
 
-          case 156: {
+          case 160: {
               AST::NumericLiteral *node = new (pool) AST::NumericLiteral(sym(1).dval);
               node->literalToken = loc(1);
               sym(1).Node = node;
           } break;
 
-#line 1807 "qmljs.g"
-          case 157:
+#line 1757 "qmljs.g"
+          case 161:
               Q_FALLTHROUGH();
-#line 1810 "qmljs.g"
+#line 1760 "qmljs.g"
 
-          case 158: {
+          case 162: {
               AST::StringLiteral *node = new (pool) AST::StringLiteral(stringRef(1));
               node->literalToken = loc(1);
               sym(1).Node = node;
           } break;
 
-#line 1822 "qmljs.g"
+#line 1772 "qmljs.g"
 
               {
-                  Lexer::RegExpBodyPrefix prefix;
-              case 159:
-                  prefix = Lexer::NoPrefix;
-                  goto scan_regexp;
+                    Lexer::RegExpBodyPrefix prefix;
+              case 163:
+                    prefix = Lexer::NoPrefix;
+                    goto scan_regexp;
 
-#line 1834 "qmljs.g"
+#line 1784 "qmljs.g"
 
-              case 160:
-                  prefix = Lexer::EqualPrefix;
-                  goto scan_regexp;
+              case 164:
+                    prefix = Lexer::EqualPrefix;
+                    goto scan_regexp;
 
               scan_regexp : {
-                  bool rx = lexer->scanRegExp(prefix);
-                  if (!rx) {
-                      diagnostic_messages.append(
-                          compileError(location(lexer), lexer->errorMessage()));
-                      return false;
-                  }
+                    bool rx = lexer->scanRegExp(prefix);
+                    if (!rx) {
+                        diagnostic_messages.append(
+                            compileError(location(lexer), lexer->errorMessage()));
+                        return false;
+                    }
 
-                  loc(1).length = lexer->tokenLength();
-                  yylloc = loc(1); // adjust the location of the current token
+                    loc(1).length = lexer->tokenLength();
+                    yylloc = loc(1); // adjust the location of the current token
 
-                  AST::RegExpLiteral *node = new (pool)
-                      AST::RegExpLiteral(driver->newStringRef(lexer->regExpPattern()),
-                                         lexer->regExpFlags());
-                  node->literalToken = loc(1);
-                  sym(1).Node = node;
+                    AST::RegExpLiteral *node = new (pool)
+                        AST::RegExpLiteral(driver->newStringRef(lexer->regExpPattern()),
+                                           lexer->regExpFlags());
+                    node->literalToken = loc(1);
+                    sym(1).Node = node;
               } break;
               }
 
-#line 1858 "qmljs.g"
+#line 1808 "qmljs.g"
 
-          case 161: {
+          case 165: {
               AST::PatternElementList *list = nullptr;
               if (sym(2).Elision)
-                  list = (new (pool) AST::PatternElementList(sym(2).Elision, nullptr))->finish();
+                    list = (new (pool) AST::PatternElementList(sym(2).Elision, nullptr))->finish();
               AST::ArrayPattern *node = new (pool) AST::ArrayPattern(list);
               node->lbracketToken = loc(1);
               node->rbracketToken = loc(3);
               sym(1).Node = node;
           } break;
 
-#line 1871 "qmljs.g"
+#line 1821 "qmljs.g"
 
-          case 162: {
+          case 166: {
               AST::ArrayPattern *node = new (pool)
                   AST::ArrayPattern(sym(2).PatternElementList->finish());
               node->lbracketToken = loc(1);
@@ -1284,14 +1329,14 @@ bool Parser::parse(int startToken)
               sym(1).Node = node;
           } break;
 
-#line 1881 "qmljs.g"
+#line 1831 "qmljs.g"
 
-          case 163: {
+          case 167: {
               auto *list = sym(2).PatternElementList;
               if (sym(4).Elision) {
-                  AST::PatternElementList *l = new (pool)
-                      AST::PatternElementList(sym(4).Elision, nullptr);
-                  list = list->append(l);
+                    AST::PatternElementList *l = new (pool)
+                        AST::PatternElementList(sym(4).Elision, nullptr);
+                    list = list->append(l);
               }
               AST::ArrayPattern *node = new (pool) AST::ArrayPattern(list->finish());
               node->lbracketToken = loc(1);
@@ -1301,92 +1346,92 @@ bool Parser::parse(int startToken)
               Q_ASSERT(node->isValidArrayLiteral());
           } break;
 
-#line 1898 "qmljs.g"
+#line 1848 "qmljs.g"
 
-          case 164: {
+          case 168: {
               AST::PatternElement *e = new (pool) AST::PatternElement(sym(1).Expression);
               sym(1).Node = new (pool) AST::PatternElementList(nullptr, e);
           } break;
 
-#line 1906 "qmljs.g"
+#line 1856 "qmljs.g"
 
-          case 165: {
+          case 169: {
               AST::PatternElement *e = new (pool) AST::PatternElement(sym(2).Expression);
               sym(1).Node = new (pool) AST::PatternElementList(sym(1).Elision->finish(), e);
           } break;
 
-#line 1914 "qmljs.g"
+#line 1864 "qmljs.g"
 
-          case 166: {
+          case 170: {
               AST::PatternElementList *node = new (pool)
                   AST::PatternElementList(sym(1).Elision, sym(2).PatternElement);
               sym(1).Node = node;
           } break;
 
-#line 1922 "qmljs.g"
+#line 1872 "qmljs.g"
 
-          case 167: {
+          case 171: {
               AST::PatternElement *e = new (pool) AST::PatternElement(sym(4).Expression);
               AST::PatternElementList *node = new (pool) AST::PatternElementList(sym(3).Elision, e);
               sym(1).Node = sym(1).PatternElementList->append(node);
           } break;
 
-#line 1931 "qmljs.g"
+#line 1881 "qmljs.g"
 
-          case 168: {
+          case 172: {
               AST::PatternElementList *node = new (pool)
                   AST::PatternElementList(sym(3).Elision, sym(4).PatternElement);
               sym(1).Node = sym(1).PatternElementList->append(node);
           } break;
 
-#line 1939 "qmljs.g"
+#line 1889 "qmljs.g"
 
-          case 169: {
+          case 173: {
               AST::Elision *node = new (pool) AST::Elision();
               node->commaToken = loc(1);
               sym(1).Node = node;
           } break;
 
-#line 1948 "qmljs.g"
+#line 1898 "qmljs.g"
 
-          case 170: {
+          case 174: {
               AST::Elision *node = new (pool) AST::Elision(sym(1).Elision);
               node->commaToken = loc(2);
               sym(1).Node = node;
           } break;
 
-#line 1957 "qmljs.g"
+#line 1907 "qmljs.g"
 
-          case 171: {
+          case 175: {
               sym(1).Node = nullptr;
           } break;
 
-#line 1964 "qmljs.g"
+#line 1914 "qmljs.g"
 
-          case 172: {
+          case 176: {
               sym(1).Node = sym(1).Elision->finish();
           } break;
 
-#line 1971 "qmljs.g"
+#line 1921 "qmljs.g"
 
-          case 173: {
+          case 177: {
               AST::PatternElement *node = new (pool)
                   AST::PatternElement(sym(2).Expression, AST::PatternElement::SpreadElement);
               sym(1).Node = node;
           } break;
 
-#line 1979 "qmljs.g"
+#line 1929 "qmljs.g"
 
-          case 174: {
+          case 178: {
               AST::ObjectPattern *node = new (pool) AST::ObjectPattern();
               node->lbraceToken = loc(1);
               node->rbraceToken = loc(2);
               sym(1).Node = node;
           } break;
 
-#line 1989 "qmljs.g"
+#line 1939 "qmljs.g"
 
-          case 175: {
+          case 179: {
               AST::ObjectPattern *node = new (pool)
                   AST::ObjectPattern(sym(2).PatternPropertyList->finish());
               node->lbraceToken = loc(1);
@@ -1394,9 +1439,9 @@ bool Parser::parse(int startToken)
               sym(1).Node = node;
           } break;
 
-#line 1999 "qmljs.g"
+#line 1949 "qmljs.g"
 
-          case 176: {
+          case 180: {
               AST::ObjectPattern *node = new (pool)
                   AST::ObjectPattern(sym(2).PatternPropertyList->finish());
               node->lbraceToken = loc(1);
@@ -1404,29 +1449,29 @@ bool Parser::parse(int startToken)
               sym(1).Node = node;
           } break;
 
-#line 2010 "qmljs.g"
-          case 177:
+#line 1960 "qmljs.g"
+          case 181:
               Q_FALLTHROUGH();
-#line 2012 "qmljs.g"
+#line 1962 "qmljs.g"
 
-          case 178: {
+          case 182: {
               sym(1).Node = new (pool) AST::PatternPropertyList(sym(1).PatternProperty);
           } break;
 
-#line 2019 "qmljs.g"
-          case 179:
+#line 1969 "qmljs.g"
+          case 183:
               Q_FALLTHROUGH();
-#line 2021 "qmljs.g"
+#line 1971 "qmljs.g"
 
-          case 180: {
+          case 184: {
               AST::PatternPropertyList *node = new (pool)
                   AST::PatternPropertyList(sym(1).PatternPropertyList, sym(3).PatternProperty);
               sym(1).Node = node;
           } break;
 
-#line 2029 "qmljs.g"
+#line 1979 "qmljs.g"
 
-          case 181: {
+          case 185: {
               AST::IdentifierPropertyName *name = new (pool)
                   AST::IdentifierPropertyName(stringRef(1));
               name->propertyNameToken = loc(1);
@@ -1437,9 +1482,9 @@ bool Parser::parse(int startToken)
               sym(1).Node = node;
           } break;
 
-#line 2045 "qmljs.g"
+#line 1995 "qmljs.g"
 
-          case 183: {
+          case 187: {
               AST::IdentifierPropertyName *name = new (pool)
                   AST::IdentifierPropertyName(stringRef(1));
               name->propertyNameToken = loc(1);
@@ -1447,9 +1492,9 @@ bool Parser::parse(int startToken)
               left->identifierToken = loc(1);
               // if initializer is an anonymous function expression, we need to assign identifierref as it's name
               if (auto *f = asAnonymousFunctionDefinition(sym(2).Expression))
-                  f->name = stringRef(1);
+                    f->name = stringRef(1);
               if (auto *c = asAnonymousClassDefinition(sym(2).Expression))
-                  c->name = stringRef(1);
+                    c->name = stringRef(1);
               AST::BinaryExpression *assignment = new (pool)
                   AST::BinaryExpression(left, QSOperator::Assign, sym(2).Expression);
               assignment->operatorToken = loc(2);
@@ -1459,85 +1504,85 @@ bool Parser::parse(int startToken)
 
           } break;
 
-#line 2066 "qmljs.g"
-          case 184:
+#line 2016 "qmljs.g"
+          case 188:
               Q_FALLTHROUGH();
-#line 2068 "qmljs.g"
+#line 2018 "qmljs.g"
 
-          case 185: {
+          case 189: {
               AST::PatternProperty *node = new (pool)
                   AST::PatternProperty(sym(1).PropertyName, sym(3).Expression);
               if (auto *c = asAnonymousClassDefinition(sym(3).Expression)) {
-                  if (!AST::cast<AST::ComputedPropertyName *>(sym(1).PropertyName))
-                      c->name = driver->newStringRef(sym(1).PropertyName->asString());
+                    if (!AST::cast<AST::ComputedPropertyName *>(sym(1).PropertyName))
+                        c->name = driver->newStringRef(sym(1).PropertyName->asString());
               }
               node->colonToken = loc(2);
               sym(1).Node = node;
           } break;
 
-#line 2086 "qmljs.g"
+#line 2036 "qmljs.g"
 
-          case 189: {
+          case 193: {
               AST::IdentifierPropertyName *node = new (pool)
                   AST::IdentifierPropertyName(stringRef(1));
               node->propertyNameToken = loc(1);
               sym(1).Node = node;
           } break;
 
-#line 2095 "qmljs.g"
-          case 190:
+#line 2045 "qmljs.g"
+          case 194:
               Q_FALLTHROUGH();
-#line 2097 "qmljs.g"
+#line 2047 "qmljs.g"
 
-          case 191: {
+          case 195: {
               AST::StringLiteralPropertyName *node = new (pool)
                   AST::StringLiteralPropertyName(stringRef(1));
               node->propertyNameToken = loc(1);
               sym(1).Node = node;
           } break;
 
-#line 2106 "qmljs.g"
-          case 192:
+#line 2056 "qmljs.g"
+          case 196:
               Q_FALLTHROUGH();
-#line 2108 "qmljs.g"
+#line 2058 "qmljs.g"
 
-          case 193: {
+          case 197: {
               AST::NumericLiteralPropertyName *node = new (pool)
                   AST::NumericLiteralPropertyName(sym(1).dval);
               node->propertyNameToken = loc(1);
               sym(1).Node = node;
           } break;
 
-#line 2159 "qmljs.g"
+#line 2109 "qmljs.g"
 
-          case 234: {
+          case 238: {
               AST::ComputedPropertyName *node = new (pool)
                   AST::ComputedPropertyName(sym(2).Expression);
               node->propertyNameToken = loc(1);
               sym(1).Node = node;
           } break;
 
-#line 2168 "qmljs.g"
-          case 235:
+#line 2118 "qmljs.g"
+          case 239:
               Q_FALLTHROUGH();
-#line 2170 "qmljs.g"
+#line 2120 "qmljs.g"
 
-          case 236: {
+          case 240: {
               sym(1) = sym(2);
           } break;
 
-#line 2178 "qmljs.g"
-          case 237:
+#line 2128 "qmljs.g"
+          case 241:
               Q_FALLTHROUGH();
-#line 2180 "qmljs.g"
+#line 2130 "qmljs.g"
 
-          case 238: {
+          case 242: {
               sym(1).Node = nullptr;
           } break;
 
-#line 2190 "qmljs.g"
+#line 2140 "qmljs.g"
 
-          case 241: {
+          case 245: {
               AST::TemplateLiteral *node = new (pool)
                   AST::TemplateLiteral(stringRef(1), rawStringRef(1), nullptr);
               node->literalToken = loc(1);
@@ -1545,21 +1590,21 @@ bool Parser::parse(int startToken)
               sym(1).Node = node;
           } break;
 
-#line 2200 "qmljs.g"
+#line 2150 "qmljs.g"
 
-          case 242: {
+          case 246: {
               AST::TemplateLiteral *node = new (pool)
                   AST::TemplateLiteral(stringRef(1), rawStringRef(1), nullptr);
               node->literalToken = loc(1);
               sym(1).Node = node;
           } break;
 
-#line 2209 "qmljs.g"
-          case 243:
+#line 2159 "qmljs.g"
+          case 247:
               Q_FALLTHROUGH();
-#line 2212 "qmljs.g"
+#line 2162 "qmljs.g"
 
-          case 244: {
+          case 248: {
               AST::TemplateLiteral *node = new (pool)
                   AST::TemplateLiteral(stringRef(1), rawStringRef(1), sym(2).Expression);
               node->next = sym(3).Template;
@@ -1567,20 +1612,20 @@ bool Parser::parse(int startToken)
               sym(1).Node = node;
           } break;
 
-#line 2225 "qmljs.g"
+#line 2175 "qmljs.g"
 
-          case 246: {
+          case 250: {
               AST::SuperLiteral *node = new (pool) AST::SuperLiteral();
               node->superToken = loc(1);
               sym(1).Node = node;
           } break;
 
-#line 2235 "qmljs.g"
-          case 247:
+#line 2185 "qmljs.g"
+          case 251:
               Q_FALLTHROUGH();
-#line 2237 "qmljs.g"
+#line 2187 "qmljs.g"
 
-          case 248: {
+          case 252: {
               AST::ArrayMemberExpression *node = new (pool)
                   AST::ArrayMemberExpression(sym(1).Expression, sym(3).Expression);
               node->lbracketToken = loc(2);
@@ -1588,9 +1633,9 @@ bool Parser::parse(int startToken)
               sym(1).Node = node;
           } break;
 
-#line 2246 "qmljs.g"
+#line 2196 "qmljs.g"
 
-          case 249: {
+          case 253: {
               AST::ArrayMemberExpression *node = new (pool)
                   AST::ArrayMemberExpression(sym(1).Expression, sym(4).Expression);
               node->lbracketToken = loc(3);
@@ -1599,20 +1644,20 @@ bool Parser::parse(int startToken)
               sym(1).Node = node;
           } break;
 
-#line 2258 "qmljs.g"
-          case 250: {
+#line 2208 "qmljs.g"
+          case 254: {
               AST::IdentifierExpression *node = new (pool) AST::IdentifierExpression(stringRef(1));
               node->identifierToken = loc(1);
               sym(1).Node = node;
           }
               Q_FALLTHROUGH();
 
-#line 2266 "qmljs.g"
-          case 251:
+#line 2216 "qmljs.g"
+          case 255:
               Q_FALLTHROUGH();
-#line 2268 "qmljs.g"
+#line 2218 "qmljs.g"
 
-          case 252: {
+          case 256: {
               AST::FieldMemberExpression *node = new (pool)
                   AST::FieldMemberExpression(sym(1).Expression, stringRef(3));
               node->dotToken = loc(2);
@@ -1620,9 +1665,9 @@ bool Parser::parse(int startToken)
               sym(1).Node = node;
           } break;
 
-#line 2278 "qmljs.g"
+#line 2228 "qmljs.g"
 
-          case 253: {
+          case 257: {
               AST::FieldMemberExpression *node = new (pool)
                   AST::FieldMemberExpression(sym(1).Expression, stringRef(3));
               node->dotToken = loc(2);
@@ -1631,9 +1676,9 @@ bool Parser::parse(int startToken)
               sym(1).Node = node;
           } break;
 
-#line 2291 "qmljs.g"
+#line 2241 "qmljs.g"
 
-          case 255: {
+          case 259: {
               AST::NewMemberExpression *node = new (pool)
                   AST::NewMemberExpression(sym(2).Expression, sym(4).ArgumentList);
               node->newToken = loc(1);
@@ -1642,62 +1687,38 @@ bool Parser::parse(int startToken)
               sym(1).Node = node;
           } break;
 
-#line 2307 "qmljs.g"
+#line 2257 "qmljs.g"
 
-          case 258: {
+          case 262: {
               AST::NewExpression *node = new (pool) AST::NewExpression(sym(2).Expression);
               node->newToken = loc(1);
               sym(1).Node = node;
           } break;
 
-#line 2317 "qmljs.g"
-          case 259:
+#line 2267 "qmljs.g"
+          case 263:
               Q_FALLTHROUGH();
-#line 2319 "qmljs.g"
+#line 2269 "qmljs.g"
 
-          case 260: {
+          case 264: {
               AST::TaggedTemplate *node = new (pool)
                   AST::TaggedTemplate(sym(1).Expression, sym(2).Template);
               sym(1).Node = node;
           } break;
 
-#line 2327 "qmljs.g"
-
-          case 261: {
-              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;
-
-#line 2337 "qmljs.g"
-
-          case 262: {
-              AST::CallExpression *node = new (pool)
-                  AST::CallExpression(sym(1).Expression, sym(4).ArgumentList);
-              node->lparenToken = loc(3);
-              node->rparenToken = loc(5);
-              node->isOptional = true;
-              sym(1).Node = node;
-          } break;
-
-#line 2348 "qmljs.g"
-          case 263:
-              Q_FALLTHROUGH();
-#line 2350 "qmljs.g"
-
-          case 264: {
-              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;
-
-#line 2360 "qmljs.g"
+#line 2277 "qmljs.g"
 
           case 265: {
+              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;
+
+#line 2287 "qmljs.g"
+
+          case 266: {
               AST::CallExpression *node = new (pool)
                   AST::CallExpression(sym(1).Expression, sym(4).ArgumentList);
               node->lparenToken = loc(3);
@@ -1706,9 +1727,33 @@ bool Parser::parse(int startToken)
               sym(1).Node = node;
           } break;
 
-#line 2372 "qmljs.g"
+#line 2298 "qmljs.g"
+          case 267:
+              Q_FALLTHROUGH();
+#line 2300 "qmljs.g"
 
-          case 266: {
+          case 268: {
+              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;
+
+#line 2310 "qmljs.g"
+
+          case 269: {
+              AST::CallExpression *node = new (pool)
+                  AST::CallExpression(sym(1).Expression, sym(4).ArgumentList);
+              node->lparenToken = loc(3);
+              node->rparenToken = loc(5);
+              node->isOptional = true;
+              sym(1).Node = node;
+          } break;
+
+#line 2322 "qmljs.g"
+
+          case 270: {
               AST::ArrayMemberExpression *node = new (pool)
                   AST::ArrayMemberExpression(sym(1).Expression, sym(3).Expression);
               node->lbracketToken = loc(2);
@@ -1716,9 +1761,9 @@ bool Parser::parse(int startToken)
               sym(1).Node = node;
           } break;
 
-#line 2382 "qmljs.g"
+#line 2332 "qmljs.g"
 
-          case 267: {
+          case 271: {
               AST::ArrayMemberExpression *node = new (pool)
                   AST::ArrayMemberExpression(sym(1).Expression, sym(4).Expression);
               node->lbracketToken = loc(3);
@@ -1727,9 +1772,9 @@ bool Parser::parse(int startToken)
               sym(1).Node = node;
           } break;
 
-#line 2393 "qmljs.g"
+#line 2343 "qmljs.g"
 
-          case 268: {
+          case 272: {
               AST::FieldMemberExpression *node = new (pool)
                   AST::FieldMemberExpression(sym(1).Expression, stringRef(3));
               node->dotToken = loc(2);
@@ -1737,9 +1782,9 @@ bool Parser::parse(int startToken)
               sym(1).Node = node;
           } break;
 
-#line 2403 "qmljs.g"
+#line 2353 "qmljs.g"
 
-          case 269: {
+          case 273: {
               AST::FieldMemberExpression *node = new (pool)
                   AST::FieldMemberExpression(sym(1).Expression, stringRef(3));
               node->dotToken = loc(2);
@@ -1748,47 +1793,47 @@ bool Parser::parse(int startToken)
               sym(1).Node = node;
           } break;
 
-#line 2414 "qmljs.g"
+#line 2364 "qmljs.g"
 
-          case 270: {
+          case 274: {
               sym(1).Node = nullptr;
           } break;
 
-#line 2421 "qmljs.g"
-          case 271:
+#line 2371 "qmljs.g"
+          case 275:
               Q_FALLTHROUGH();
-#line 2423 "qmljs.g"
+#line 2373 "qmljs.g"
 
-          case 272: {
+          case 276: {
               sym(1).Node = sym(1).ArgumentList->finish();
           } break;
 
-#line 2430 "qmljs.g"
+#line 2380 "qmljs.g"
 
-          case 273: {
+          case 277: {
               sym(1).Node = new (pool) AST::ArgumentList(sym(1).Expression);
           } break;
 
-#line 2437 "qmljs.g"
+#line 2387 "qmljs.g"
 
-          case 274: {
+          case 278: {
               AST::ArgumentList *node = new (pool) AST::ArgumentList(sym(2).Expression);
               node->isSpreadElement = true;
               sym(1).Node = node;
           } break;
 
-#line 2446 "qmljs.g"
+#line 2396 "qmljs.g"
 
-          case 275: {
+          case 279: {
               AST::ArgumentList *node = new (pool)
                   AST::ArgumentList(sym(1).ArgumentList, sym(3).Expression);
               node->commaToken = loc(2);
               sym(1).Node = node;
           } break;
 
-#line 2455 "qmljs.g"
+#line 2405 "qmljs.g"
 
-          case 276: {
+          case 280: {
               AST::ArgumentList *node = new (pool)
                   AST::ArgumentList(sym(1).ArgumentList, sym(4).Expression);
               node->commaToken = loc(2);
@@ -1796,361 +1841,361 @@ bool Parser::parse(int startToken)
               sym(1).Node = node;
           } break;
 
-#line 2470 "qmljs.g"
+#line 2420 "qmljs.g"
 
-          case 280: {
+          case 284: {
               AST::PostIncrementExpression *node = new (pool)
                   AST::PostIncrementExpression(sym(1).Expression);
               node->incrementToken = loc(2);
               sym(1).Node = node;
           } break;
 
-#line 2479 "qmljs.g"
+#line 2429 "qmljs.g"
 
-          case 281: {
+          case 285: {
               AST::PostDecrementExpression *node = new (pool)
                   AST::PostDecrementExpression(sym(1).Expression);
               node->decrementToken = loc(2);
               sym(1).Node = node;
           } break;
 
-#line 2488 "qmljs.g"
+#line 2438 "qmljs.g"
 
-          case 282: {
+          case 286: {
               AST::PreIncrementExpression *node = new (pool)
                   AST::PreIncrementExpression(sym(2).Expression);
               node->incrementToken = loc(1);
               sym(1).Node = node;
           } break;
 
-#line 2497 "qmljs.g"
+#line 2447 "qmljs.g"
 
-          case 283: {
+          case 287: {
               AST::PreDecrementExpression *node = new (pool)
                   AST::PreDecrementExpression(sym(2).Expression);
               node->decrementToken = loc(1);
               sym(1).Node = node;
           } break;
 
-#line 2508 "qmljs.g"
+#line 2458 "qmljs.g"
 
-          case 285: {
+          case 289: {
               AST::DeleteExpression *node = new (pool) AST::DeleteExpression(sym(2).Expression);
               node->deleteToken = loc(1);
               sym(1).Node = node;
           } break;
 
-#line 2517 "qmljs.g"
+#line 2467 "qmljs.g"
 
-          case 286: {
+          case 290: {
               AST::VoidExpression *node = new (pool) AST::VoidExpression(sym(2).Expression);
               node->voidToken = loc(1);
               sym(1).Node = node;
           } break;
 
-#line 2526 "qmljs.g"
+#line 2476 "qmljs.g"
 
-          case 287: {
+          case 291: {
               AST::TypeOfExpression *node = new (pool) AST::TypeOfExpression(sym(2).Expression);
               node->typeofToken = loc(1);
               sym(1).Node = node;
           } break;
 
-#line 2535 "qmljs.g"
+#line 2485 "qmljs.g"
 
-          case 288: {
+          case 292: {
               AST::UnaryPlusExpression *node = new (pool)
                   AST::UnaryPlusExpression(sym(2).Expression);
               node->plusToken = loc(1);
               sym(1).Node = node;
           } break;
 
-#line 2544 "qmljs.g"
+#line 2494 "qmljs.g"
 
-          case 289: {
+          case 293: {
               AST::UnaryMinusExpression *node = new (pool)
                   AST::UnaryMinusExpression(sym(2).Expression);
               node->minusToken = loc(1);
               sym(1).Node = node;
           } break;
 
-#line 2553 "qmljs.g"
+#line 2503 "qmljs.g"
 
-          case 290: {
+          case 294: {
               AST::TildeExpression *node = new (pool) AST::TildeExpression(sym(2).Expression);
               node->tildeToken = loc(1);
               sym(1).Node = node;
           } break;
 
-#line 2562 "qmljs.g"
+#line 2512 "qmljs.g"
 
-          case 291: {
+          case 295: {
               AST::NotExpression *node = new (pool) AST::NotExpression(sym(2).Expression);
               node->notToken = loc(1);
               sym(1).Node = node;
           } break;
 
-#line 2573 "qmljs.g"
+#line 2523 "qmljs.g"
 
-          case 293: {
+          case 297: {
               AST::BinaryExpression *node = new (pool)
                   AST::BinaryExpression(sym(1).Expression, QSOperator::Exp, sym(3).Expression);
               node->operatorToken = loc(2);
               sym(1).Node = node;
           } break;
 
-#line 2584 "qmljs.g"
+#line 2534 "qmljs.g"
 
-          case 295: {
+          case 299: {
               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;
 
-#line 2593 "qmljs.g"
+#line 2543 "qmljs.g"
 
-          case 296: {
+          case 300: {
               sym(1).ival = QSOperator::Mul;
           } break;
 
-#line 2600 "qmljs.g"
+#line 2550 "qmljs.g"
 
-          case 297: {
+          case 301: {
               sym(1).ival = QSOperator::Div;
           } break;
 
-#line 2607 "qmljs.g"
+#line 2557 "qmljs.g"
 
-          case 298: {
+          case 302: {
               sym(1).ival = QSOperator::Mod;
           } break;
 
-#line 2616 "qmljs.g"
+#line 2566 "qmljs.g"
 
-          case 300: {
+          case 304: {
               AST::BinaryExpression *node = new (pool)
                   AST::BinaryExpression(sym(1).Expression, QSOperator::Add, sym(3).Expression);
               node->operatorToken = loc(2);
               sym(1).Node = node;
           } break;
 
-#line 2625 "qmljs.g"
+#line 2575 "qmljs.g"
 
-          case 301: {
+          case 305: {
               AST::BinaryExpression *node = new (pool)
                   AST::BinaryExpression(sym(1).Expression, QSOperator::Sub, sym(3).Expression);
               node->operatorToken = loc(2);
               sym(1).Node = node;
           } break;
 
-#line 2636 "qmljs.g"
+#line 2586 "qmljs.g"
 
-          case 303: {
+          case 307: {
               AST::BinaryExpression *node = new (pool)
                   AST::BinaryExpression(sym(1).Expression, QSOperator::LShift, sym(3).Expression);
               node->operatorToken = loc(2);
               sym(1).Node = node;
           } break;
 
-#line 2645 "qmljs.g"
+#line 2595 "qmljs.g"
 
-          case 304: {
+          case 308: {
               AST::BinaryExpression *node = new (pool)
                   AST::BinaryExpression(sym(1).Expression, QSOperator::RShift, sym(3).Expression);
               node->operatorToken = loc(2);
               sym(1).Node = node;
           } break;
 
-#line 2654 "qmljs.g"
+#line 2604 "qmljs.g"
 
-          case 305: {
+          case 309: {
               AST::BinaryExpression *node = new (pool)
                   AST::BinaryExpression(sym(1).Expression, QSOperator::URShift, sym(3).Expression);
               node->operatorToken = loc(2);
               sym(1).Node = node;
           } break;
 
-#line 2666 "qmljs.g"
-          case 308:
+#line 2616 "qmljs.g"
+          case 312:
               Q_FALLTHROUGH();
-#line 2668 "qmljs.g"
+#line 2618 "qmljs.g"
 
-          case 309: {
+          case 313: {
               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;
 
-#line 2677 "qmljs.g"
+#line 2627 "qmljs.g"
 
-          case 310: {
+          case 314: {
               sym(1).ival = QSOperator::Lt;
           } break;
 
-#line 2683 "qmljs.g"
+#line 2633 "qmljs.g"
 
-          case 311: {
+          case 315: {
               sym(1).ival = QSOperator::Gt;
           } break;
 
-#line 2689 "qmljs.g"
+#line 2639 "qmljs.g"
 
-          case 312: {
+          case 316: {
               sym(1).ival = QSOperator::Le;
           } break;
 
-#line 2695 "qmljs.g"
+#line 2645 "qmljs.g"
 
-          case 313: {
+          case 317: {
               sym(1).ival = QSOperator::Ge;
           } break;
 
-#line 2701 "qmljs.g"
+#line 2651 "qmljs.g"
 
-          case 314: {
+          case 318: {
               sym(1).ival = QSOperator::InstanceOf;
           } break;
 
-#line 2707 "qmljs.g"
+#line 2657 "qmljs.g"
 
-          case 315: {
+          case 319: {
               sym(1).ival = QSOperator::As;
           } break;
 
-#line 2714 "qmljs.g"
+#line 2664 "qmljs.g"
 
-          case 316: {
+          case 320: {
               AST::BinaryExpression *node = new (pool)
                   AST::BinaryExpression(sym(1).Expression, QSOperator::In, sym(3).Expression);
               node->operatorToken = loc(2);
               sym(1).Node = node;
           } break;
 
-#line 2726 "qmljs.g"
-          case 319:
+#line 2676 "qmljs.g"
+          case 323:
               Q_FALLTHROUGH();
-#line 2728 "qmljs.g"
+#line 2678 "qmljs.g"
 
-          case 320: {
+          case 324: {
               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;
 
-#line 2737 "qmljs.g"
+#line 2687 "qmljs.g"
 
-          case 321: {
+          case 325: {
               sym(1).ival = QSOperator::Equal;
           } break;
 
-#line 2743 "qmljs.g"
+#line 2693 "qmljs.g"
 
-          case 322: {
+          case 326: {
               sym(1).ival = QSOperator::NotEqual;
           } break;
 
-#line 2749 "qmljs.g"
+#line 2699 "qmljs.g"
 
-          case 323: {
+          case 327: {
               sym(1).ival = QSOperator::StrictEqual;
           } break;
 
-#line 2755 "qmljs.g"
+#line 2705 "qmljs.g"
 
-          case 324: {
+          case 328: {
               sym(1).ival = QSOperator::StrictNotEqual;
           } break;
 
-#line 2766 "qmljs.g"
-          case 327:
+#line 2716 "qmljs.g"
+          case 331:
               Q_FALLTHROUGH();
-#line 2768 "qmljs.g"
+#line 2718 "qmljs.g"
 
-          case 328: {
+          case 332: {
               AST::BinaryExpression *node = new (pool)
                   AST::BinaryExpression(sym(1).Expression, QSOperator::BitAnd, sym(3).Expression);
               node->operatorToken = loc(2);
               sym(1).Node = node;
           } break;
 
-#line 2781 "qmljs.g"
-          case 331:
+#line 2731 "qmljs.g"
+          case 335:
               Q_FALLTHROUGH();
-#line 2783 "qmljs.g"
+#line 2733 "qmljs.g"
 
-          case 332: {
+          case 336: {
               AST::BinaryExpression *node = new (pool)
                   AST::BinaryExpression(sym(1).Expression, QSOperator::BitXor, sym(3).Expression);
               node->operatorToken = loc(2);
               sym(1).Node = node;
           } break;
 
-#line 2795 "qmljs.g"
-          case 335:
+#line 2745 "qmljs.g"
+          case 339:
               Q_FALLTHROUGH();
-#line 2797 "qmljs.g"
+#line 2747 "qmljs.g"
 
-          case 336: {
+          case 340: {
               AST::BinaryExpression *node = new (pool)
                   AST::BinaryExpression(sym(1).Expression, QSOperator::BitOr, sym(3).Expression);
               node->operatorToken = loc(2);
               sym(1).Node = node;
           } break;
 
-#line 2809 "qmljs.g"
-          case 339:
+#line 2759 "qmljs.g"
+          case 343:
               Q_FALLTHROUGH();
-#line 2811 "qmljs.g"
+#line 2761 "qmljs.g"
 
-          case 340: {
+          case 344: {
               AST::BinaryExpression *node = new (pool)
                   AST::BinaryExpression(sym(1).Expression, QSOperator::And, sym(3).Expression);
               node->operatorToken = loc(2);
               sym(1).Node = node;
           } break;
 
-#line 2823 "qmljs.g"
-          case 343:
+#line 2773 "qmljs.g"
+          case 347:
               Q_FALLTHROUGH();
-#line 2825 "qmljs.g"
+#line 2775 "qmljs.g"
 
-          case 344: {
+          case 348: {
               AST::BinaryExpression *node = new (pool)
                   AST::BinaryExpression(sym(1).Expression, QSOperator::Or, sym(3).Expression);
               node->operatorToken = loc(2);
               sym(1).Node = node;
           } break;
 
-#line 2837 "qmljs.g"
-          case 347:
+#line 2787 "qmljs.g"
+          case 351:
               Q_FALLTHROUGH();
-#line 2839 "qmljs.g"
+#line 2789 "qmljs.g"
 
-          case 348: {
+          case 352: {
               auto *lhs = sym(1).Expression;
               auto *rhs = sym(3).Expression;
 
               // Check if lhs or rhs contain || or &&
 
               if (lhs->binaryExpressionCast() != nullptr) {
-                  auto *binaryExpr = lhs->binaryExpressionCast();
-                  if (binaryExpr->op == QSOperator::And || binaryExpr->op == QSOperator::Or) {
-                      syntaxError(binaryExpr->operatorToken,
-                                  "Left-hand side may not contain || or &&");
-                      return false;
-                  }
+                    auto *binaryExpr = lhs->binaryExpressionCast();
+                    if (binaryExpr->op == QSOperator::And || binaryExpr->op == QSOperator::Or) {
+                        syntaxError(binaryExpr->operatorToken,
+                                    "Left-hand side may not contain || or &&");
+                        return false;
+                    }
               }
 
               if (rhs->binaryExpressionCast() != nullptr) {
-                  auto *binaryExpr = rhs->binaryExpressionCast();
-                  if (binaryExpr->op == QSOperator::And || binaryExpr->op == QSOperator::Or) {
-                      syntaxError(binaryExpr->operatorToken,
-                                  "Right-hand side may not contain || or &&");
-                      return false;
-                  }
+                    auto *binaryExpr = rhs->binaryExpressionCast();
+                    if (binaryExpr->op == QSOperator::And || binaryExpr->op == QSOperator::Or) {
+                        syntaxError(binaryExpr->operatorToken,
+                                    "Right-hand side may not contain || or &&");
+                        return false;
+                    }
               }
 
               AST::BinaryExpression *node = new (pool)
@@ -2159,12 +2204,12 @@ bool Parser::parse(int startToken)
               sym(1).Node = node;
           } break;
 
-#line 2873 "qmljs.g"
-          case 351:
+#line 2823 "qmljs.g"
+          case 355:
               Q_FALLTHROUGH();
-#line 2875 "qmljs.g"
+#line 2825 "qmljs.g"
 
-          case 352: {
+          case 356: {
               AST::ConditionalExpression *node = new (pool)
                   AST::ConditionalExpression(sym(1).Expression,
                                              sym(3).Expression,
@@ -2174,34 +2219,34 @@ bool Parser::parse(int startToken)
               sym(1).Node = node;
           } break;
 
-#line 2894 "qmljs.g"
-          case 359:
+#line 2844 "qmljs.g"
+          case 363:
               Q_FALLTHROUGH();
-#line 2896 "qmljs.g"
+#line 2846 "qmljs.g"
 
-          case 360: {
+          case 364: {
               if (sym(1).Expression->containsOptionalChain()) {
-                  syntaxError(loc(1),
-                              QStringLiteral("Optional chains are not permitted on the "
-                                             "left-hand-side in assignments"));
+                    syntaxError(loc(1),
+                                QStringLiteral("Optional chains are not permitted on the "
+                                               "left-hand-side in assignments"));
               }
               // need to convert the LHS to an AssignmentPattern if it was an Array/ObjectLiteral
               if (AST::Pattern *p = sym(1).Expression->patternCast()) {
-                  SourceLocation errorLoc;
-                  QString errorMsg;
-                  if (!p->convertLiteralToAssignmentPattern(pool, &errorLoc, &errorMsg)) {
-                      syntaxError(errorLoc, errorMsg);
-                      return false;
-                  }
+                    SourceLocation errorLoc;
+                    QString errorMsg;
+                    if (!p->convertLiteralToAssignmentPattern(pool, &errorLoc, &errorMsg)) {
+                        syntaxError(errorLoc, errorMsg);
+                        return false;
+                    }
               }
               // if lhs is an identifier expression and rhs is an anonymous function expression, we need to assign the name of lhs to the function
               if (auto *f = asAnonymousFunctionDefinition(sym(3).Expression)) {
-                  if (auto *id = AST::cast<AST::IdentifierExpression *>(sym(1).Expression))
-                      f->name = id->name;
+                    if (auto *id = AST::cast<AST::IdentifierExpression *>(sym(1).Expression))
+                        f->name = id->name;
               }
               if (auto *c = asAnonymousClassDefinition(sym(3).Expression)) {
-                  if (auto *id = AST::cast<AST::IdentifierExpression *>(sym(1).Expression))
-                      c->name = id->name;
+                    if (auto *id = AST::cast<AST::IdentifierExpression *>(sym(1).Expression))
+                        c->name = id->name;
               }
 
               AST::BinaryExpression *node = new (pool)
@@ -2210,16 +2255,16 @@ bool Parser::parse(int startToken)
               sym(1).Node = node;
           } break;
 
-#line 2927 "qmljs.g"
-          case 361:
+#line 2877 "qmljs.g"
+          case 365:
               Q_FALLTHROUGH();
-#line 2929 "qmljs.g"
+#line 2879 "qmljs.g"
 
-          case 362: {
+          case 366: {
               if (sym(1).Expression->containsOptionalChain()) {
-                  syntaxError(loc(1),
-                              QStringLiteral("Optional chains are not permitted on the "
-                                             "left-hand-side in assignments"));
+                    syntaxError(loc(1),
+                                QStringLiteral("Optional chains are not permitted on the "
+                                               "left-hand-side in assignments"));
               }
               AST::BinaryExpression *node = new (pool)
                   AST::BinaryExpression(sym(1).Expression, sym(2).ival, sym(3).Expression);
@@ -2227,257 +2272,257 @@ bool Parser::parse(int startToken)
               sym(1).Node = node;
           } break;
 
-#line 2941 "qmljs.g"
+#line 2891 "qmljs.g"
 
-          case 363: {
+          case 367: {
               sym(1).ival = QSOperator::InplaceMul;
           } break;
 
-#line 2948 "qmljs.g"
+#line 2898 "qmljs.g"
 
-          case 364: {
+          case 368: {
               sym(1).ival = QSOperator::InplaceExp;
           } break;
 
-#line 2955 "qmljs.g"
+#line 2905 "qmljs.g"
 
-          case 365: {
+          case 369: {
               sym(1).ival = QSOperator::InplaceDiv;
           } break;
 
-#line 2962 "qmljs.g"
+#line 2912 "qmljs.g"
 
-          case 366: {
+          case 370: {
               sym(1).ival = QSOperator::InplaceMod;
           } break;
 
-#line 2969 "qmljs.g"
+#line 2919 "qmljs.g"
 
-          case 367: {
+          case 371: {
               sym(1).ival = QSOperator::InplaceAdd;
           } break;
 
-#line 2976 "qmljs.g"
+#line 2926 "qmljs.g"
 
-          case 368: {
+          case 372: {
               sym(1).ival = QSOperator::InplaceSub;
           } break;
 
-#line 2983 "qmljs.g"
+#line 2933 "qmljs.g"
 
-          case 369: {
+          case 373: {
               sym(1).ival = QSOperator::InplaceLeftShift;
           } break;
 
-#line 2990 "qmljs.g"
+#line 2940 "qmljs.g"
 
-          case 370: {
+          case 374: {
               sym(1).ival = QSOperator::InplaceRightShift;
           } break;
 
-#line 2997 "qmljs.g"
+#line 2947 "qmljs.g"
 
-          case 371: {
+          case 375: {
               sym(1).ival = QSOperator::InplaceURightShift;
           } break;
 
-#line 3004 "qmljs.g"
+#line 2954 "qmljs.g"
 
-          case 372: {
+          case 376: {
               sym(1).ival = QSOperator::InplaceAnd;
           } break;
 
-#line 3011 "qmljs.g"
+#line 2961 "qmljs.g"
 
-          case 373: {
+          case 377: {
               sym(1).ival = QSOperator::InplaceXor;
           } break;
 
-#line 3018 "qmljs.g"
+#line 2968 "qmljs.g"
 
-          case 374: {
+          case 378: {
               sym(1).ival = QSOperator::InplaceOr;
           } break;
 
-#line 3028 "qmljs.g"
-          case 377:
+#line 2978 "qmljs.g"
+          case 381:
               Q_FALLTHROUGH();
-#line 3030 "qmljs.g"
+#line 2980 "qmljs.g"
 
-          case 378: {
+          case 382: {
               AST::Expression *node = new (pool)
                   AST::Expression(sym(1).Expression, sym(3).Expression);
               node->commaToken = loc(2);
               sym(1).Node = node;
           } break;
 
-#line 3039 "qmljs.g"
-          case 379:
+#line 2989 "qmljs.g"
+          case 383:
               Q_FALLTHROUGH();
-#line 3041 "qmljs.g"
+#line 2991 "qmljs.g"
 
-          case 380: {
+          case 384: {
               sym(1).Node = nullptr;
           } break;
 
-#line 3053 "qmljs.g"
+#line 3003 "qmljs.g"
 
-          case 383: {
+          case 387: {
               sym(1).Node = sym(3).Node;
           } break;
 
-#line 3060 "qmljs.g"
-          case 384:
-              Q_FALLTHROUGH();
-#line 3062 "qmljs.g"
-          case 385:
-              Q_FALLTHROUGH();
-#line 3064 "qmljs.g"
-          case 386:
-              Q_FALLTHROUGH();
-#line 3066 "qmljs.g"
-          case 387:
-              Q_FALLTHROUGH();
-#line 3068 "qmljs.g"
+#line 3010 "qmljs.g"
           case 388:
               Q_FALLTHROUGH();
-#line 3070 "qmljs.g"
+#line 3012 "qmljs.g"
           case 389:
               Q_FALLTHROUGH();
-#line 3072 "qmljs.g"
+#line 3014 "qmljs.g"
           case 390:
               Q_FALLTHROUGH();
-#line 3074 "qmljs.g"
+#line 3016 "qmljs.g"
           case 391:
               Q_FALLTHROUGH();
-#line 3076 "qmljs.g"
+#line 3018 "qmljs.g"
           case 392:
               Q_FALLTHROUGH();
-#line 3078 "qmljs.g"
+#line 3020 "qmljs.g"
           case 393:
               Q_FALLTHROUGH();
-#line 3080 "qmljs.g"
+#line 3022 "qmljs.g"
           case 394:
               Q_FALLTHROUGH();
-#line 3082 "qmljs.g"
+#line 3024 "qmljs.g"
           case 395:
               Q_FALLTHROUGH();
-#line 3084 "qmljs.g"
+#line 3026 "qmljs.g"
+          case 396:
+              Q_FALLTHROUGH();
+#line 3028 "qmljs.g"
+          case 397:
+              Q_FALLTHROUGH();
+#line 3030 "qmljs.g"
+          case 398:
+              Q_FALLTHROUGH();
+#line 3032 "qmljs.g"
+          case 399:
+              Q_FALLTHROUGH();
+#line 3034 "qmljs.g"
 
-          case 396: {
+          case 400: {
               sym(1).Node = sym(2).Node;
           } break;
 
-#line 3106 "qmljs.g"
+#line 3056 "qmljs.g"
 
-          case 407: {
+          case 411: {
               AST::Block *node = new (pool) AST::Block(sym(2).StatementList);
               node->lbraceToken = loc(1);
               node->rbraceToken = loc(3);
               sym(1).Node = node;
           } break;
 
-#line 3118 "qmljs.g"
+#line 3068 "qmljs.g"
 
-          case 409: {
+          case 413: {
               sym(1).StatementList = sym(1).StatementList->append(sym(2).StatementList);
           } break;
 
-#line 3125 "qmljs.g"
+#line 3075 "qmljs.g"
 
-          case 410: {
+          case 414: {
               sym(1).StatementList = new (pool) AST::StatementList(sym(1).Statement);
           } break;
 
-#line 3132 "qmljs.g"
+#line 3082 "qmljs.g"
 
-          case 411: {
+          case 415: {
               sym(1).Node = new (pool) AST::StatementList(sym(3).FunctionDeclaration);
           } break;
 
-#line 3139 "qmljs.g"
+#line 3089 "qmljs.g"
 
-          case 412: {
+          case 416: {
               sym(1).Node = nullptr;
           } break;
 
-#line 3146 "qmljs.g"
+#line 3096 "qmljs.g"
 
-          case 413: {
+          case 417: {
               sym(1).Node = sym(1).StatementList->finish();
           } break;
 
-#line 3153 "qmljs.g"
+#line 3103 "qmljs.g"
 
-          case 414: {
+          case 418: {
               sym(1).scope = AST::VariableScope::Let;
           } break;
 
-#line 3159 "qmljs.g"
+#line 3109 "qmljs.g"
 
-          case 415: {
+          case 419: {
               sym(1).scope = AST::VariableScope::Const;
           } break;
 
-#line 3166 "qmljs.g"
+#line 3116 "qmljs.g"
 
-          case 416: {
+          case 420: {
               sym(1).scope = AST::VariableScope::Var;
           } break;
 
-#line 3173 "qmljs.g"
-          case 417:
+#line 3123 "qmljs.g"
+          case 421:
               Q_FALLTHROUGH();
-#line 3175 "qmljs.g"
-          case 418:
+#line 3125 "qmljs.g"
+          case 422:
               Q_FALLTHROUGH();
-#line 3177 "qmljs.g"
-          case 419:
+#line 3127 "qmljs.g"
+          case 423:
               Q_FALLTHROUGH();
-#line 3179 "qmljs.g"
+#line 3129 "qmljs.g"
 
-          case 420: {
+          case 424: {
               AST::VariableDeclarationList *declarations = sym(2).VariableDeclarationList->finish(
                   sym(1).scope);
               for (auto it = declarations; it; it = it->next) {
-                  if (it->declaration && it->declaration->typeAnnotation) {
-                      syntaxError(it->declaration->typeAnnotation->firstSourceLocation(),
-                                  "Type annotations are not permitted in variable declarations");
-                      return false;
-                  }
+                    if (it->declaration && it->declaration->typeAnnotation) {
+                        syntaxError(it->declaration->typeAnnotation->firstSourceLocation(),
+                                    "Type annotations are not permitted in variable declarations");
+                        return false;
+                    }
               }
               AST::VariableStatement *node = new (pool) AST::VariableStatement(declarations);
               node->declarationKindToken = loc(1);
               sym(1).Node = node;
           } break;
 
-#line 3197 "qmljs.g"
-          case 422:
+#line 3147 "qmljs.g"
+          case 426:
               Q_FALLTHROUGH();
-#line 3199 "qmljs.g"
-          case 423:
+#line 3149 "qmljs.g"
+          case 427:
               Q_FALLTHROUGH();
-#line 3201 "qmljs.g"
-          case 424:
+#line 3151 "qmljs.g"
+          case 428:
               Q_FALLTHROUGH();
-#line 3203 "qmljs.g"
+#line 3153 "qmljs.g"
 
-          case 425: {
+          case 429: {
               sym(1).Node = new (pool) AST::VariableDeclarationList(sym(1).PatternElement);
           } break;
 
-#line 3210 "qmljs.g"
-          case 426:
+#line 3160 "qmljs.g"
+          case 430:
               Q_FALLTHROUGH();
-#line 3212 "qmljs.g"
-          case 427:
+#line 3162 "qmljs.g"
+          case 431:
               Q_FALLTHROUGH();
-#line 3214 "qmljs.g"
-          case 428:
+#line 3164 "qmljs.g"
+          case 432:
               Q_FALLTHROUGH();
-#line 3216 "qmljs.g"
+#line 3166 "qmljs.g"
 
-          case 429: {
+          case 433: {
               AST::VariableDeclarationList *node = new (pool)
                   AST::VariableDeclarationList(sym(1).VariableDeclarationList,
                                                sym(3).PatternElement);
@@ -2485,49 +2530,49 @@ bool Parser::parse(int startToken)
               sym(1).Node = node;
           } break;
 
-#line 3225 "qmljs.g"
-          case 430:
+#line 3175 "qmljs.g"
+          case 434:
               Q_FALLTHROUGH();
-#line 3227 "qmljs.g"
-          case 431:
+#line 3177 "qmljs.g"
+          case 435:
               Q_FALLTHROUGH();
-#line 3229 "qmljs.g"
-          case 432:
+#line 3179 "qmljs.g"
+          case 436:
               Q_FALLTHROUGH();
-#line 3231 "qmljs.g"
+#line 3181 "qmljs.g"
 
-          case 433: {
+          case 437: {
               auto *node = new (pool)
                   AST::PatternElement(stringRef(1), sym(2).TypeAnnotation, sym(3).Expression);
               node->identifierToken = loc(1);
               sym(1).Node = node;
               // if initializer is an anonymous function expression, we need to assign identifierref as it's name
               if (auto *f = asAnonymousFunctionDefinition(sym(3).Expression))
-                  f->name = stringRef(1);
+                    f->name = stringRef(1);
               if (auto *c = asAnonymousClassDefinition(sym(3).Expression))
-                  c->name = stringRef(1);
+                    c->name = stringRef(1);
           } break;
 
-#line 3245 "qmljs.g"
-          case 434:
+#line 3195 "qmljs.g"
+          case 438:
               Q_FALLTHROUGH();
-#line 3247 "qmljs.g"
-          case 435:
+#line 3197 "qmljs.g"
+          case 439:
               Q_FALLTHROUGH();
-#line 3249 "qmljs.g"
-          case 436:
+#line 3199 "qmljs.g"
+          case 440:
               Q_FALLTHROUGH();
-#line 3251 "qmljs.g"
+#line 3201 "qmljs.g"
 
-          case 437: {
+          case 441: {
               auto *node = new (pool) AST::PatternElement(sym(1).Pattern, sym(2).Expression);
               node->identifierToken = loc(1);
               sym(1).Node = node;
           } break;
 
-#line 3260 "qmljs.g"
+#line 3210 "qmljs.g"
 
-          case 438: {
+          case 442: {
               auto *node = new (pool) AST::ObjectPattern(sym(2).PatternPropertyList);
               node->lbraceToken = loc(1);
               node->rbraceToken = loc(3);
@@ -2535,9 +2580,9 @@ bool Parser::parse(int startToken)
               sym(1).Node = node;
           } break;
 
-#line 3271 "qmljs.g"
+#line 3221 "qmljs.g"
 
-          case 439: {
+          case 443: {
               auto *node = new (pool) AST::ArrayPattern(sym(2).PatternElementList);
               node->lbracketToken = loc(1);
               node->rbracketToken = loc(3);
@@ -2545,132 +2590,132 @@ bool Parser::parse(int startToken)
               sym(1).Node = node;
           } break;
 
-#line 3282 "qmljs.g"
+#line 3232 "qmljs.g"
 
-          case 440: {
+          case 444: {
               sym(1).Node = nullptr;
           } break;
 
-#line 3289 "qmljs.g"
-          case 441:
-#line 3291 "qmljs.g"
+#line 3239 "qmljs.g"
+          case 445:
+#line 3241 "qmljs.g"
 
-          case 442: {
+          case 446: {
               sym(1).Node = sym(1).PatternPropertyList->finish();
           } break;
 
-#line 3298 "qmljs.g"
+#line 3248 "qmljs.g"
 
-          case 443: {
+          case 447: {
               if (sym(1).Elision || sym(2).Node) {
-                  auto *l = new (pool)
-                      AST::PatternElementList(sym(1).Elision, sym(2).PatternElement);
-                  sym(1).Node = l->finish();
+                    auto *l = new (pool)
+                        AST::PatternElementList(sym(1).Elision, sym(2).PatternElement);
+                    sym(1).Node = l->finish();
               } else {
-                  sym(1).Node = nullptr;
+                    sym(1).Node = nullptr;
               }
           } break;
 
-#line 3310 "qmljs.g"
+#line 3260 "qmljs.g"
 
-          case 444: {
+          case 448: {
               sym(1).Node = sym(1).PatternElementList->finish();
           } break;
 
-#line 3317 "qmljs.g"
+#line 3267 "qmljs.g"
 
-          case 445: {
+          case 449: {
               if (sym(3).Elision || sym(4).Node) {
-                  auto *l = new (pool)
-                      AST::PatternElementList(sym(3).Elision, sym(4).PatternElement);
-                  l = sym(1).PatternElementList->append(l);
-                  sym(1).Node = l;
+                    auto *l = new (pool)
+                        AST::PatternElementList(sym(3).Elision, sym(4).PatternElement);
+                    l = sym(1).PatternElementList->append(l);
+                    sym(1).Node = l;
               }
               sym(1).Node = sym(1).PatternElementList->finish();
           } break;
 
-#line 3329 "qmljs.g"
+#line 3279 "qmljs.g"
 
-          case 446: {
+          case 450: {
               sym(1).Node = new (pool) AST::PatternPropertyList(sym(1).PatternProperty);
           } break;
 
-#line 3336 "qmljs.g"
+#line 3286 "qmljs.g"
 
-          case 447: {
+          case 451: {
               sym(1).Node = new (pool)
                   AST::PatternPropertyList(sym(1).PatternPropertyList, sym(3).PatternProperty);
           } break;
 
-#line 3345 "qmljs.g"
+#line 3295 "qmljs.g"
 
-          case 449: {
+          case 453: {
               sym(1).PatternElementList = sym(1).PatternElementList->append(
                   sym(3).PatternElementList);
           } break;
 
-#line 3352 "qmljs.g"
+#line 3302 "qmljs.g"
 
-          case 450: {
+          case 454: {
               sym(1).Node = new (pool)
                   AST::PatternElementList(sym(1).Elision, sym(2).PatternElement);
           } break;
 
-#line 3360 "qmljs.g"
+#line 3310 "qmljs.g"
 
-          case 451: {
+          case 455: {
               AST::StringLiteralPropertyName *name = new (pool)
                   AST::StringLiteralPropertyName(stringRef(1));
               name->propertyNameToken = loc(1);
               // if initializer is an anonymous function expression, we need to assign identifierref as it's name
               if (auto *f = asAnonymousFunctionDefinition(sym(2).Expression))
-                  f->name = stringRef(1);
+                    f->name = stringRef(1);
               if (auto *c = asAnonymousClassDefinition(sym(2).Expression))
-                  c->name = stringRef(1);
+                    c->name = stringRef(1);
               sym(1).Node = new (pool) AST::PatternProperty(name, stringRef(1), sym(2).Expression);
           } break;
 
-#line 3374 "qmljs.g"
+#line 3324 "qmljs.g"
 
-          case 452: {
+          case 456: {
               AST::PatternProperty *node = new (pool)
                   AST::PatternProperty(sym(1).PropertyName, stringRef(3), sym(4).Expression);
               sym(1).Node = node;
           } break;
 
-#line 3382 "qmljs.g"
+#line 3332 "qmljs.g"
 
-          case 453: {
+          case 457: {
               AST::PatternProperty *node = new (pool)
                   AST::PatternProperty(sym(1).PropertyName, sym(3).Pattern, sym(4).Expression);
               sym(1).Node = node;
           } break;
 
-#line 3390 "qmljs.g"
+#line 3340 "qmljs.g"
 
-          case 454: {
+          case 458: {
               AST::PatternElement *node = new (pool)
                   AST::PatternElement(stringRef(1), sym(2).TypeAnnotation, sym(3).Expression);
               node->identifierToken = loc(1);
               // if initializer is an anonymous function expression, we need to assign identifierref as it's name
               if (auto *f = asAnonymousFunctionDefinition(sym(3).Expression))
-                  f->name = stringRef(1);
+                    f->name = stringRef(1);
               if (auto *c = asAnonymousClassDefinition(sym(3).Expression))
-                  c->name = stringRef(1);
+                    c->name = stringRef(1);
               sym(1).Node = node;
           } break;
 
-#line 3404 "qmljs.g"
+#line 3354 "qmljs.g"
 
-          case 455: {
+          case 459: {
               AST::PatternElement *node = new (pool)
                   AST::PatternElement(sym(1).Pattern, sym(2).Expression);
               sym(1).Node = node;
           } break;
 
-#line 3412 "qmljs.g"
+#line 3362 "qmljs.g"
 
-          case 456: {
+          case 460: {
               AST::PatternElement *node = new (pool)
                   AST::PatternElement(stringRef(2),
                                       /*type annotation*/ nullptr,
@@ -2680,51 +2725,51 @@ bool Parser::parse(int startToken)
               sym(1).Node = node;
           } break;
 
-#line 3421 "qmljs.g"
+#line 3371 "qmljs.g"
 
-          case 457: {
+          case 461: {
               AST::PatternElement *node = new (pool)
                   AST::PatternElement(sym(2).Pattern, nullptr, AST::PatternElement::RestElement);
               sym(1).Node = node;
           } break;
 
-#line 3429 "qmljs.g"
+#line 3379 "qmljs.g"
 
-          case 458: {
+          case 462: {
               sym(1).Node = nullptr;
           } break;
 
-#line 3439 "qmljs.g"
+#line 3389 "qmljs.g"
 
-          case 460: {
+          case 464: {
               AST::EmptyStatement *node = new (pool) AST::EmptyStatement();
               node->semicolonToken = loc(1);
               sym(1).Node = node;
           } break;
 
-#line 3454 "qmljs.g"
+#line 3404 "qmljs.g"
 
-          case 461: {
+          case 465: {
               int token = lookaheadToken(lexer);
               if (token == T_LBRACE)
-                  pushToken(T_FORCE_BLOCK);
+                    pushToken(T_FORCE_BLOCK);
               else if (token == T_FUNCTION || token == T_FUNCTION_STAR || token == T_CLASS
                        || token == T_LET || token == T_CONST)
-                  pushToken(T_FORCE_DECLARATION);
+                    pushToken(T_FORCE_DECLARATION);
           } break;
 
-#line 3465 "qmljs.g"
+#line 3415 "qmljs.g"
 
-          case 462: {
+          case 466: {
               AST::ExpressionStatement *node = new (pool)
                   AST::ExpressionStatement(sym(1).Expression);
               node->semicolonToken = loc(2);
               sym(1).Node = node;
           } break;
 
-#line 3474 "qmljs.g"
+#line 3424 "qmljs.g"
 
-          case 463: {
+          case 467: {
               AST::IfStatement *node = new (pool)
                   AST::IfStatement(sym(3).Expression, sym(5).Statement, sym(7).Statement);
               node->ifToken = loc(1);
@@ -2734,9 +2779,9 @@ bool Parser::parse(int startToken)
               sym(1).Node = node;
           } break;
 
-#line 3486 "qmljs.g"
+#line 3436 "qmljs.g"
 
-          case 464: {
+          case 468: {
               AST::IfStatement *node = new (pool)
                   AST::IfStatement(sym(3).Expression, sym(5).Statement);
               node->ifToken = loc(1);
@@ -2745,9 +2790,9 @@ bool Parser::parse(int startToken)
               sym(1).Node = node;
           } break;
 
-#line 3499 "qmljs.g"
+#line 3449 "qmljs.g"
 
-          case 466: {
+          case 470: {
               AST::DoWhileStatement *node = new (pool)
                   AST::DoWhileStatement(sym(2).Statement, sym(5).Expression);
               node->doToken = loc(1);
@@ -2758,9 +2803,9 @@ bool Parser::parse(int startToken)
               sym(1).Node = node;
           } break;
 
-#line 3512 "qmljs.g"
+#line 3462 "qmljs.g"
 
-          case 467: {
+          case 471: {
               AST::WhileStatement *node = new (pool)
                   AST::WhileStatement(sym(3).Expression, sym(5).Statement);
               node->whileToken = loc(1);
@@ -2769,9 +2814,9 @@ bool Parser::parse(int startToken)
               sym(1).Node = node;
           } break;
 
-#line 3523 "qmljs.g"
+#line 3473 "qmljs.g"
 
-          case 468: {
+          case 472: {
               AST::ForStatement *node = new (pool) AST::ForStatement(sym(3).Expression,
                                                                      sym(5).Expression,
                                                                      sym(7).Expression,
@@ -2784,12 +2829,12 @@ bool Parser::parse(int startToken)
               sym(1).Node = node;
           } break;
 
-#line 3536 "qmljs.g"
-          case 469:
+#line 3486 "qmljs.g"
+          case 473:
               Q_FALLTHROUGH();
-#line 3538 "qmljs.g"
+#line 3488 "qmljs.g"
 
-          case 470: {
+          case 474: {
               // ### get rid of the static_cast!
               AST::ForStatement *node = new (pool)
                   AST::ForStatement(static_cast<AST::VariableStatement *>(sym(3).Node)->declarations,
@@ -2804,29 +2849,29 @@ bool Parser::parse(int startToken)
               sym(1).Node = node;
           } break;
 
-#line 3554 "qmljs.g"
+#line 3504 "qmljs.g"
 
-          case 471: {
+          case 475: {
               sym(1).forEachType = AST::ForEachType::In;
           } break;
 
-#line 3561 "qmljs.g"
+#line 3511 "qmljs.g"
 
-          case 472: {
+          case 476: {
               sym(1).forEachType = AST::ForEachType::Of;
           } break;
 
-#line 3568 "qmljs.g"
+#line 3518 "qmljs.g"
 
-          case 473: {
+          case 477: {
               // need to convert the LHS to an AssignmentPattern if it was an Array/ObjectLiteral
               if (AST::Pattern *p = sym(3).Expression->patternCast()) {
-                  SourceLocation errorLoc;
-                  QString errorMsg;
-                  if (!p->convertLiteralToAssignmentPattern(pool, &errorLoc, &errorMsg)) {
-                      syntaxError(errorLoc, errorMsg);
-                      return false;
-                  }
+                    SourceLocation errorLoc;
+                    QString errorMsg;
+                    if (!p->convertLiteralToAssignmentPattern(pool, &errorLoc, &errorMsg)) {
+                        syntaxError(errorLoc, errorMsg);
+                        return false;
+                    }
               }
               AST::ForEachStatement *node = new (pool)
                   AST::ForEachStatement(sym(3).Expression, sym(5).Expression, sym(7).Statement);
@@ -2838,9 +2883,9 @@ bool Parser::parse(int startToken)
               sym(1).Node = node;
           } break;
 
-#line 3590 "qmljs.g"
+#line 3540 "qmljs.g"
 
-          case 474: {
+          case 478: {
               AST::ForEachStatement *node = new (pool)
                   AST::ForEachStatement(sym(3).PatternElement, sym(5).Expression, sym(7).Statement);
               node->forToken = loc(1);
@@ -2851,16 +2896,16 @@ bool Parser::parse(int startToken)
               sym(1).Node = node;
           } break;
 
-#line 3603 "qmljs.g"
-          case 475:
+#line 3553 "qmljs.g"
+          case 479:
               Q_FALLTHROUGH();
-#line 3605 "qmljs.g"
+#line 3555 "qmljs.g"
 
-          case 476: {
+          case 480: {
               if (auto typeAnnotation = sym(3).TypeAnnotation) {
-                  syntaxError(typeAnnotation->firstSourceLocation(),
-                              "Type annotations are not permitted in variable declarations");
-                  return false;
+                    syntaxError(typeAnnotation->firstSourceLocation(),
+                                "Type annotations are not permitted in variable declarations");
+                    return false;
               }
               auto *node = new (pool)
                   AST::PatternElement(stringRef(2), sym(3).TypeAnnotation, nullptr);
@@ -2870,30 +2915,30 @@ bool Parser::parse(int startToken)
               sym(1).Node = node;
           } break;
 
-#line 3620 "qmljs.g"
-          case 477:
+#line 3570 "qmljs.g"
+          case 481:
               Q_FALLTHROUGH();
-#line 3622 "qmljs.g"
+#line 3572 "qmljs.g"
 
-          case 478: {
+          case 482: {
               auto *node = new (pool) AST::PatternElement(sym(2).Pattern, nullptr);
               node->scope = sym(1).scope;
               node->isForDeclaration = true;
               sym(1).Node = node;
           } break;
 
-#line 3632 "qmljs.g"
+#line 3582 "qmljs.g"
 
-          case 479: {
+          case 483: {
               AST::ContinueStatement *node = new (pool) AST::ContinueStatement();
               node->continueToken = loc(1);
               node->semicolonToken = loc(2);
               sym(1).Node = node;
           } break;
 
-#line 3642 "qmljs.g"
+#line 3592 "qmljs.g"
 
-          case 480: {
+          case 484: {
               AST::ContinueStatement *node = new (pool) AST::ContinueStatement(stringRef(2));
               node->continueToken = loc(1);
               node->identifierToken = loc(2);
@@ -2901,18 +2946,18 @@ bool Parser::parse(int startToken)
               sym(1).Node = node;
           } break;
 
-#line 3653 "qmljs.g"
+#line 3603 "qmljs.g"
 
-          case 481: {
+          case 485: {
               AST::BreakStatement *node = new (pool) AST::BreakStatement(QStringView());
               node->breakToken = loc(1);
               node->semicolonToken = loc(2);
               sym(1).Node = node;
           } break;
 
-#line 3663 "qmljs.g"
+#line 3613 "qmljs.g"
 
-          case 482: {
+          case 486: {
               AST::BreakStatement *node = new (pool) AST::BreakStatement(stringRef(2));
               node->breakToken = loc(1);
               node->identifierToken = loc(2);
@@ -2920,13 +2965,13 @@ bool Parser::parse(int startToken)
               sym(1).Node = node;
           } break;
 
-#line 3674 "qmljs.g"
+#line 3624 "qmljs.g"
 
-          case 483: {
+          case 487: {
               if (!functionNestingLevel) {
-                  syntaxError(loc(1),
-                              "Return statement not allowed outside of Function declaration.");
-                  return false;
+                    syntaxError(loc(1),
+                                "Return statement not allowed outside of Function declaration.");
+                    return false;
               }
               AST::ReturnStatement *node = new (pool) AST::ReturnStatement(sym(2).Expression);
               node->returnToken = loc(1);
@@ -2934,9 +2979,9 @@ bool Parser::parse(int startToken)
               sym(1).Node = node;
           } break;
 
-#line 3688 "qmljs.g"
+#line 3638 "qmljs.g"
 
-          case 484: {
+          case 488: {
               AST::WithStatement *node = new (pool)
                   AST::WithStatement(sym(3).Expression, sym(5).Statement);
               node->withToken = loc(1);
@@ -2945,9 +2990,9 @@ bool Parser::parse(int startToken)
               sym(1).Node = node;
           } break;
 
-#line 3699 "qmljs.g"
+#line 3649 "qmljs.g"
 
-          case 485: {
+          case 489: {
               AST::SwitchStatement *node = new (pool)
                   AST::SwitchStatement(sym(3).Expression, sym(5).CaseBlock);
               node->switchToken = loc(1);
@@ -2956,18 +3001,18 @@ bool Parser::parse(int startToken)
               sym(1).Node = node;
           } break;
 
-#line 3710 "qmljs.g"
+#line 3660 "qmljs.g"
 
-          case 486: {
+          case 490: {
               AST::CaseBlock *node = new (pool) AST::CaseBlock(sym(2).CaseClauses);
               node->lbraceToken = loc(1);
               node->rbraceToken = loc(3);
               sym(1).Node = node;
           } break;
 
-#line 3720 "qmljs.g"
+#line 3670 "qmljs.g"
 
-          case 487: {
+          case 491: {
               AST::CaseBlock *node = new (pool)
                   AST::CaseBlock(sym(2).CaseClauses, sym(3).DefaultClause, sym(4).CaseClauses);
               node->lbraceToken = loc(1);
@@ -2975,33 +3020,33 @@ bool Parser::parse(int startToken)
               sym(1).Node = node;
           } break;
 
-#line 3730 "qmljs.g"
+#line 3680 "qmljs.g"
 
-          case 488: {
+          case 492: {
               sym(1).Node = new (pool) AST::CaseClauses(sym(1).CaseClause);
           } break;
 
-#line 3737 "qmljs.g"
+#line 3687 "qmljs.g"
 
-          case 489: {
+          case 493: {
               sym(1).Node = new (pool) AST::CaseClauses(sym(1).CaseClauses, sym(2).CaseClause);
           } break;
 
-#line 3744 "qmljs.g"
+#line 3694 "qmljs.g"
 
-          case 490: {
+          case 494: {
               sym(1).Node = nullptr;
           } break;
 
-#line 3751 "qmljs.g"
+#line 3701 "qmljs.g"
 
-          case 491: {
+          case 495: {
               sym(1).Node = sym(1).CaseClauses->finish();
           } break;
 
-#line 3758 "qmljs.g"
+#line 3708 "qmljs.g"
 
-          case 492: {
+          case 496: {
               AST::CaseClause *node = new (pool)
                   AST::CaseClause(sym(2).Expression, sym(4).StatementList);
               node->caseToken = loc(1);
@@ -3009,18 +3054,18 @@ bool Parser::parse(int startToken)
               sym(1).Node = node;
           } break;
 
-#line 3768 "qmljs.g"
+#line 3718 "qmljs.g"
 
-          case 493: {
+          case 497: {
               AST::DefaultClause *node = new (pool) AST::DefaultClause(sym(3).StatementList);
               node->defaultToken = loc(1);
               node->colonToken = loc(2);
               sym(1).Node = node;
           } break;
 
-#line 3778 "qmljs.g"
+#line 3728 "qmljs.g"
 
-          case 494: {
+          case 498: {
               AST::LabelledStatement *node = new (pool)
                   AST::LabelledStatement(stringRef(1), sym(3).Statement);
               node->identifierToken = loc(1);
@@ -3028,52 +3073,52 @@ bool Parser::parse(int startToken)
               sym(1).Node = node;
           } break;
 
-#line 3790 "qmljs.g"
+#line 3740 "qmljs.g"
 
-          case 496: {
+          case 500: {
               syntaxError(loc(3), "FunctionDeclarations are not allowed after a label.");
               return false;
           } break;
 
-#line 3798 "qmljs.g"
+#line 3748 "qmljs.g"
 
-          case 497: {
+          case 501: {
               AST::ThrowStatement *node = new (pool) AST::ThrowStatement(sym(2).Expression);
               node->throwToken = loc(1);
               node->semicolonToken = loc(3);
               sym(1).Node = node;
           } break;
 
-#line 3808 "qmljs.g"
+#line 3758 "qmljs.g"
 
-          case 498: {
+          case 502: {
               AST::TryStatement *node = new (pool)
                   AST::TryStatement(sym(2).Statement, sym(3).Catch);
               node->tryToken = loc(1);
               sym(1).Node = node;
           } break;
 
-#line 3817 "qmljs.g"
+#line 3767 "qmljs.g"
 
-          case 499: {
+          case 503: {
               AST::TryStatement *node = new (pool)
                   AST::TryStatement(sym(2).Statement, sym(3).Finally);
               node->tryToken = loc(1);
               sym(1).Node = node;
           } break;
 
-#line 3826 "qmljs.g"
+#line 3776 "qmljs.g"
 
-          case 500: {
+          case 504: {
               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;
 
-#line 3835 "qmljs.g"
+#line 3785 "qmljs.g"
 
-          case 501: {
+          case 505: {
               AST::Catch *node = new (pool) AST::Catch(sym(3).PatternElement, sym(5).Block);
               node->catchToken = loc(1);
               node->lparenToken = loc(2);
@@ -3082,46 +3127,46 @@ bool Parser::parse(int startToken)
               sym(1).Node = node;
           } break;
 
-#line 3847 "qmljs.g"
+#line 3797 "qmljs.g"
 
-          case 502: {
+          case 506: {
               AST::Finally *node = new (pool) AST::Finally(sym(2).Block);
               node->finallyToken = loc(1);
               sym(1).Node = node;
           } break;
 
-#line 3856 "qmljs.g"
+#line 3806 "qmljs.g"
 
-          case 503: {
+          case 507: {
               AST::PatternElement *node = new (pool) AST::PatternElement(stringRef(1));
               node->identifierToken = loc(1);
               node->scope = AST::VariableScope::Let;
               sym(1).Node = node;
           } break;
 
-#line 3866 "qmljs.g"
+#line 3816 "qmljs.g"
 
-          case 504: {
+          case 508: {
               AST::PatternElement *node = new (pool) AST::PatternElement(sym(1).Pattern);
               node->scope = AST::VariableScope::Let;
               sym(1).Node = node;
           } break;
 
-#line 3875 "qmljs.g"
+#line 3825 "qmljs.g"
 
-          case 505: {
+          case 509: {
               AST::DebuggerStatement *node = new (pool) AST::DebuggerStatement();
               node->debuggerToken = loc(1);
               node->semicolonToken = loc(2);
               sym(1).Node = node;
           } break;
 
-#line 3892 "qmljs.g"
+#line 3842 "qmljs.g"
 
-          case 507: {
+          case 511: {
               if (!ensureNoFunctionTypeAnnotations(sym(6).TypeAnnotation,
                                                    sym(4).FormalParameterList))
-                  return false;
+                    return false;
               AST::FunctionDeclaration *node = new (pool)
                   AST::FunctionDeclaration(stringRef(2),
                                            sym(4).FormalParameterList,
@@ -3136,9 +3181,9 @@ bool Parser::parse(int startToken)
               sym(1).Node = node;
           } break;
 
-#line 3909 "qmljs.g"
+#line 3859 "qmljs.g"
 
-          case 508: {
+          case 512: {
               AST::FunctionDeclaration *node = new (pool)
                   AST::FunctionDeclaration(stringRef(2),
                                            sym(4).FormalParameterList,
@@ -3153,12 +3198,12 @@ bool Parser::parse(int startToken)
               sym(1).Node = node;
           } break;
 
-#line 3925 "qmljs.g"
+#line 3875 "qmljs.g"
 
-          case 510: {
+          case 514: {
               if (!ensureNoFunctionTypeAnnotations(sym(5).TypeAnnotation,
                                                    sym(3).FormalParameterList))
-                  return false;
+                    return false;
               AST::FunctionDeclaration *node = new (pool)
                   AST::FunctionDeclaration(QStringView(),
                                            sym(3).FormalParameterList,
@@ -3172,12 +3217,12 @@ bool Parser::parse(int startToken)
               sym(1).Node = node;
           } break;
 
-#line 3941 "qmljs.g"
+#line 3891 "qmljs.g"
 
-          case 511: {
+          case 515: {
               if (!ensureNoFunctionTypeAnnotations(sym(6).TypeAnnotation,
                                                    sym(4).FormalParameterList))
-                  return false;
+                    return false;
               AST::FunctionExpression *node = new (pool)
                   AST::FunctionExpression(stringRef(2),
                                           sym(4).FormalParameterList,
@@ -3185,7 +3230,7 @@ bool Parser::parse(int startToken)
                                           /*type annotation*/ nullptr);
               node->functionToken = loc(1);
               if (!stringRef(2).isNull())
-                  node->identifierToken = loc(2);
+                    node->identifierToken = loc(2);
               node->lparenToken = loc(3);
               node->rparenToken = loc(5);
               node->lbraceToken = loc(7);
@@ -3193,12 +3238,12 @@ bool Parser::parse(int startToken)
               sym(1).Node = node;
           } break;
 
-#line 3959 "qmljs.g"
+#line 3909 "qmljs.g"
 
-          case 512: {
+          case 516: {
               if (!ensureNoFunctionTypeAnnotations(sym(5).TypeAnnotation,
                                                    sym(3).FormalParameterList))
-                  return false;
+                    return false;
               AST::FunctionExpression *node = new (pool)
                   AST::FunctionExpression(QStringView(),
                                           sym(3).FormalParameterList,
@@ -3212,15 +3257,15 @@ bool Parser::parse(int startToken)
               sym(1).Node = node;
           } break;
 
-#line 3977 "qmljs.g"
+#line 3927 "qmljs.g"
 
-          case 514: {
+          case 518: {
               sym(1).Node = nullptr;
           } break;
 
-#line 3984 "qmljs.g"
+#line 3934 "qmljs.g"
 
-          case 515: {
+          case 519: {
               AST::FormalParameterList *node = (new (pool)
                                                     AST::FormalParameterList(nullptr,
                                                                              sym(1).PatternElement))
@@ -3228,17 +3273,17 @@ bool Parser::parse(int startToken)
               sym(1).Node = node;
           } break;
 
-#line 3992 "qmljs.g"
-          case 516:
-#line 3994 "qmljs.g"
+#line 3942 "qmljs.g"
+          case 520:
+#line 3944 "qmljs.g"
 
-          case 517: {
+          case 521: {
               sym(1).Node = sym(1).FormalParameterList->finish(pool);
           } break;
 
-#line 4001 "qmljs.g"
+#line 3951 "qmljs.g"
 
-          case 518: {
+          case 522: {
               AST::FormalParameterList *node
                   = (new (pool) AST::FormalParameterList(sym(1).FormalParameterList,
                                                          sym(3).PatternElement))
@@ -3246,40 +3291,40 @@ bool Parser::parse(int startToken)
               sym(1).Node = node;
           } break;
 
-#line 4009 "qmljs.g"
+#line 3959 "qmljs.g"
 
-          case 519: {
+          case 523: {
               AST::FormalParameterList *node = new (pool)
                   AST::FormalParameterList(nullptr, sym(1).PatternElement);
               sym(1).Node = node;
           } break;
 
-#line 4018 "qmljs.g"
+#line 3968 "qmljs.g"
 
-          case 520: {
+          case 524: {
               AST::FormalParameterList *node = new (pool)
                   AST::FormalParameterList(sym(1).FormalParameterList, sym(3).PatternElement);
               sym(1).Node = node;
           } break;
 
-#line 4028 "qmljs.g"
+#line 3978 "qmljs.g"
 
-          case 522: {
+          case 526: {
               ++functionNestingLevel;
           } break;
 
-#line 4035 "qmljs.g"
+#line 3985 "qmljs.g"
 
-          case 523: {
+          case 527: {
               --functionNestingLevel;
           } break;
 
-#line 4045 "qmljs.g"
-          case 525:
+#line 3995 "qmljs.g"
+          case 529:
               Q_FALLTHROUGH();
-#line 4047 "qmljs.g"
+#line 3997 "qmljs.g"
 
-          case 526: {
+          case 530: {
               AST::ReturnStatement *ret = new (pool) AST::ReturnStatement(sym(4).Expression);
               ret->returnToken = sym(4).Node->firstSourceLocation().startZeroLengthLocation();
               ret->semicolonToken = sym(4).Node->lastSourceLocation().endZeroLengthLocation(
@@ -3297,12 +3342,12 @@ bool Parser::parse(int startToken)
               sym(1).Node = f;
           } break;
 
-#line 4063 "qmljs.g"
-          case 527:
+#line 4013 "qmljs.g"
+          case 531:
               Q_FALLTHROUGH();
-#line 4065 "qmljs.g"
+#line 4015 "qmljs.g"
 
-          case 528: {
+          case 532: {
               AST::FunctionExpression *f = new (pool)
                   AST::FunctionExpression(QStringView(),
                                           sym(1).FormalParameterList,
@@ -3316,9 +3361,9 @@ bool Parser::parse(int startToken)
               sym(1).Node = f;
           } break;
 
-#line 4077 "qmljs.g"
+#line 4027 "qmljs.g"
 
-          case 529: {
+          case 533: {
               AST::PatternElement *e = new (pool) AST::PatternElement(stringRef(1),
                                                                       /*type annotation*/ nullptr,
                                                                       nullptr,
@@ -3328,34 +3373,34 @@ bool Parser::parse(int startToken)
                                                ->finish(pool);
           } break;
 
-#line 4088 "qmljs.g"
+#line 4038 "qmljs.g"
 
-          case 530: {
+          case 534: {
               if (coverExpressionType != CE_FormalParameterList) {
-                  AST::NestedExpression *ne = static_cast<AST::NestedExpression *>(sym(1).Node);
-                  AST::FormalParameterList *list = ne->expression->reparseAsFormalParameterList(
-                      pool);
-                  if (!list) {
-                      syntaxError(loc(1), "Invalid Arrow parameter list.");
-                      return false;
-                  }
-                  sym(1).Node = list->finish(pool);
+                    AST::NestedExpression *ne = static_cast<AST::NestedExpression *>(sym(1).Node);
+                    AST::FormalParameterList *list = ne->expression->reparseAsFormalParameterList(
+                        pool);
+                    if (!list) {
+                        syntaxError(loc(1), "Invalid Arrow parameter list.");
+                        return false;
+                    }
+                    sym(1).Node = list->finish(pool);
               }
           } break;
 
-#line 4106 "qmljs.g"
+#line 4056 "qmljs.g"
 
-          case 531: {
+          case 535: {
               if (lookaheadToken(lexer) == T_LBRACE)
-                  pushToken(T_FORCE_BLOCK);
+                    pushToken(T_FORCE_BLOCK);
           } break;
 
-#line 4114 "qmljs.g"
+#line 4064 "qmljs.g"
 
-          case 532: {
+          case 536: {
               if (!ensureNoFunctionTypeAnnotations(sym(5).TypeAnnotation,
                                                    sym(3).FormalParameterList))
-                  return false;
+                    return false;
               AST::FunctionExpression *f = new (pool)
                   AST::FunctionExpression(stringRef(1),
                                           sym(3).FormalParameterList,
@@ -3371,12 +3416,12 @@ bool Parser::parse(int startToken)
               sym(1).Node = node;
           } break;
 
-#line 4131 "qmljs.g"
+#line 4081 "qmljs.g"
 
-          case 533: {
+          case 537: {
               if (!ensureNoFunctionTypeAnnotations(sym(6).TypeAnnotation,
                                                    sym(4).FormalParameterList))
-                  return false;
+                    return false;
               AST::FunctionExpression *f = new (pool)
                   AST::FunctionExpression(stringRef(2),
                                           sym(4).FormalParameterList,
@@ -3393,11 +3438,11 @@ bool Parser::parse(int startToken)
               sym(1).Node = node;
           } break;
 
-#line 4150 "qmljs.g"
+#line 4100 "qmljs.g"
 
-          case 534: {
+          case 538: {
               if (!ensureNoFunctionTypeAnnotations(sym(5).TypeAnnotation, /*formals*/ nullptr))
-                  return false;
+                    return false;
               AST::FunctionExpression *f = new (pool)
                   AST::FunctionExpression(stringRef(2), nullptr, sym(7).StatementList);
               f->functionToken = sym(2).PropertyName->firstSourceLocation();
@@ -3411,12 +3456,12 @@ bool Parser::parse(int startToken)
               sym(1).Node = node;
           } break;
 
-#line 4167 "qmljs.g"
+#line 4117 "qmljs.g"
 
-          case 535: {
+          case 539: {
               if (!ensureNoFunctionTypeAnnotations(sym(6).TypeAnnotation,
                                                    sym(4).FormalParameterList))
-                  return false;
+                    return false;
               AST::FunctionExpression *f = new (pool)
                   AST::FunctionExpression(stringRef(2),
                                           sym(4).FormalParameterList,
@@ -3432,9 +3477,9 @@ bool Parser::parse(int startToken)
               sym(1).Node = node;
           } break;
 
-#line 4185 "qmljs.g"
+#line 4135 "qmljs.g"
 
-          case 536: {
+          case 540: {
               AST::FormalParameterList *node = (new (pool)
                                                     AST::FormalParameterList(nullptr,
                                                                              sym(1).PatternElement))
@@ -3442,22 +3487,22 @@ bool Parser::parse(int startToken)
               sym(1).Node = node;
           } break;
 
-#line 4193 "qmljs.g"
+#line 4143 "qmljs.g"
 
-          case 537: {
+          case 541: {
               lexer->enterGeneratorBody();
           } break;
 
-#line 4200 "qmljs.g"
+#line 4150 "qmljs.g"
 
-          case 538: {
+          case 542: {
               --functionNestingLevel;
               lexer->leaveGeneratorBody();
           } break;
 
-#line 4210 "qmljs.g"
+#line 4160 "qmljs.g"
 
-          case 540: {
+          case 544: {
               AST::FunctionDeclaration *node = new (pool)
                   AST::FunctionDeclaration(stringRef(2),
                                            sym(4).FormalParameterList,
@@ -3472,9 +3517,9 @@ bool Parser::parse(int startToken)
               sym(1).Node = node;
           } break;
 
-#line 4226 "qmljs.g"
+#line 4176 "qmljs.g"
 
-          case 542: {
+          case 546: {
               AST::FunctionDeclaration *node = new (pool)
                   AST::FunctionDeclaration(QStringView(),
                                            sym(3).FormalParameterList,
@@ -3488,16 +3533,16 @@ bool Parser::parse(int startToken)
               sym(1).Node = node;
           } break;
 
-#line 4240 "qmljs.g"
+#line 4190 "qmljs.g"
 
-          case 543: {
+          case 547: {
               AST::FunctionExpression *node = new (pool)
                   AST::FunctionExpression(stringRef(2),
                                           sym(4).FormalParameterList,
                                           sym(7).StatementList);
               node->functionToken = loc(1);
               if (!stringRef(2).isNull())
-                  node->identifierToken = loc(2);
+                    node->identifierToken = loc(2);
               node->lparenToken = loc(3);
               node->rparenToken = loc(5);
               node->lbraceToken = loc(6);
@@ -3506,9 +3551,9 @@ bool Parser::parse(int startToken)
               sym(1).Node = node;
           } break;
 
-#line 4256 "qmljs.g"
+#line 4206 "qmljs.g"
 
-          case 544: {
+          case 548: {
               AST::FunctionExpression *node = new (pool)
                   AST::FunctionExpression(QStringView(),
                                           sym(3).FormalParameterList,
@@ -3522,43 +3567,43 @@ bool Parser::parse(int startToken)
               sym(1).Node = node;
           } break;
 
-#line 4272 "qmljs.g"
-          case 546:
+#line 4222 "qmljs.g"
+          case 550:
               Q_FALLTHROUGH();
-#line 4274 "qmljs.g"
+#line 4224 "qmljs.g"
 
-          case 547: {
+          case 551: {
               AST::YieldExpression *node = new (pool) AST::YieldExpression();
               node->yieldToken = loc(1);
               sym(1).Node = node;
           } break;
 
-#line 4283 "qmljs.g"
-          case 548:
+#line 4233 "qmljs.g"
+          case 552:
               Q_FALLTHROUGH();
-#line 4285 "qmljs.g"
+#line 4235 "qmljs.g"
 
-          case 549: {
+          case 553: {
               AST::YieldExpression *node = new (pool) AST::YieldExpression(sym(3).Expression);
               node->yieldToken = loc(1);
               node->isYieldStar = true;
               sym(1).Node = node;
           } break;
 
-#line 4295 "qmljs.g"
-          case 550:
+#line 4245 "qmljs.g"
+          case 554:
               Q_FALLTHROUGH();
-#line 4297 "qmljs.g"
+#line 4247 "qmljs.g"
 
-          case 551: {
+          case 555: {
               AST::YieldExpression *node = new (pool) AST::YieldExpression(sym(2).Expression);
               node->yieldToken = loc(1);
               sym(1).Node = node;
           } break;
 
-#line 4307 "qmljs.g"
+#line 4257 "qmljs.g"
 
-          case 552: {
+          case 556: {
               AST::ClassDeclaration *node = new (pool)
                   AST::ClassDeclaration(stringRef(2), sym(3).Expression, sym(5).ClassElementList);
               node->classToken = loc(1);
@@ -3568,9 +3613,9 @@ bool Parser::parse(int startToken)
               sym(1).Node = node;
           } break;
 
-#line 4319 "qmljs.g"
+#line 4269 "qmljs.g"
 
-          case 553: {
+          case 557: {
               AST::ClassExpression *node = new (pool)
                   AST::ClassExpression(stringRef(2), sym(3).Expression, sym(5).ClassElementList);
               node->classToken = loc(1);
@@ -3580,9 +3625,9 @@ bool Parser::parse(int startToken)
               sym(1).Node = node;
           } break;
 
-#line 4331 "qmljs.g"
+#line 4281 "qmljs.g"
 
-          case 554: {
+          case 558: {
               AST::ClassDeclaration *node = new (pool)
                   AST::ClassDeclaration(QStringView(), sym(2).Expression, sym(4).ClassElementList);
               node->classToken = loc(1);
@@ -3591,9 +3636,9 @@ bool Parser::parse(int startToken)
               sym(1).Node = node;
           } break;
 
-#line 4342 "qmljs.g"
+#line 4292 "qmljs.g"
 
-          case 555: {
+          case 559: {
               AST::ClassExpression *node = new (pool)
                   AST::ClassExpression(QStringView(), sym(2).Expression, sym(4).ClassElementList);
               node->classToken = loc(1);
@@ -3602,323 +3647,322 @@ bool Parser::parse(int startToken)
               sym(1).Node = node;
           } break;
 
-#line 4355 "qmljs.g"
+#line 4305 "qmljs.g"
 
-          case 557: {
-              lexer->setStaticIsKeyword(true);
+          case 561: {
+              if (++classNestingLevel == 1)
+                    lexer->setStaticIsKeyword(true);
           } break;
 
-#line 4362 "qmljs.g"
-          case 558:
-#line 4364 "qmljs.g"
+#line 4313 "qmljs.g"
 
-          case 559: {
-              lexer->setStaticIsKeyword(false);
+          case 562: {
+              if (--classNestingLevel == 0)
+                    lexer->setStaticIsKeyword(false);
           } break;
 
-#line 4371 "qmljs.g"
+#line 4321 "qmljs.g"
 
-          case 560: {
+          case 563: {
               sym(1).Node = nullptr;
           } break;
 
-#line 4378 "qmljs.g"
+#line 4328 "qmljs.g"
 
-          case 561: {
+          case 564: {
               sym(1).Node = sym(2).Node;
           } break;
 
-#line 4385 "qmljs.g"
+#line 4335 "qmljs.g"
 
-          case 562: {
+          case 565: {
               sym(1).Node = nullptr;
           } break;
 
-#line 4392 "qmljs.g"
+#line 4342 "qmljs.g"
 
-          case 563: {
+          case 566: {
               if (sym(1).Node)
-                  sym(1).Node = sym(1).ClassElementList->finish();
+                    sym(1).Node = sym(1).ClassElementList->finish();
           } break;
 
-#line 4402 "qmljs.g"
+#line 4352 "qmljs.g"
 
-          case 565: {
+          case 568: {
               if (sym(1).Node) {
-                  if (sym(2).Node)
-                      sym(1).ClassElementList = sym(1).ClassElementList->append(
-                          sym(2).ClassElementList);
+                    if (sym(2).Node)
+                        sym(1).ClassElementList = sym(1).ClassElementList->append(
+                            sym(2).ClassElementList);
               } else if (sym(2).Node) {
-                  sym(1).Node = sym(2).Node;
+                    sym(1).Node = sym(2).Node;
               }
           } break;
 
-#line 4414 "qmljs.g"
+#line 4364 "qmljs.g"
 
-          case 566: {
+          case 569: {
               AST::ClassElementList *node = new (pool)
                   AST::ClassElementList(sym(1).PatternProperty, false);
               sym(1).Node = node;
           } break;
 
-#line 4422 "qmljs.g"
+#line 4372 "qmljs.g"
 
-          case 567: {
-              lexer->setStaticIsKeyword(true);
+          case 570: {
               AST::ClassElementList *node = new (pool)
                   AST::ClassElementList(sym(2).PatternProperty, true);
               sym(1).Node = node;
           } break;
 
-#line 4431 "qmljs.g"
-
-          case 568: {
-              sym(1).Node = nullptr;
-          } break;
-
-#line 4440 "qmljs.g"
-
-          case 569: {
-              sym(1).Node = nullptr;
-          } break;
-
-#line 4449 "qmljs.g"
+#line 4380 "qmljs.g"
 
           case 571: {
+              sym(1).Node = nullptr;
+          } break;
+
+#line 4389 "qmljs.g"
+
+          case 572: {
+              sym(1).Node = nullptr;
+          } break;
+
+#line 4398 "qmljs.g"
+
+          case 574: {
               sym(1).Node = new (pool) AST::Program(sym(1).StatementList->finish());
           } break;
 
-#line 4456 "qmljs.g"
-          case 572: {
+#line 4405 "qmljs.g"
+          case 575: {
               sym(1).Node = new (pool) AST::ESModule(sym(1).StatementList);
           } break;
 
-#line 4462 "qmljs.g"
+#line 4411 "qmljs.g"
 
-          case 573: {
+          case 576: {
               sym(1).StatementList = sym(1).StatementList->finish();
           } break;
 
-#line 4469 "qmljs.g"
+#line 4418 "qmljs.g"
 
-          case 574: {
+          case 577: {
               sym(1).StatementList = nullptr;
           } break;
 
-#line 4479 "qmljs.g"
+#line 4428 "qmljs.g"
 
-          case 577: {
+          case 580: {
               sym(1).StatementList = sym(1).StatementList->append(sym(2).StatementList);
           } break;
 
-#line 4487 "qmljs.g"
-          case 578:
+#line 4436 "qmljs.g"
+          case 581:
               Q_FALLTHROUGH();
-#line 4489 "qmljs.g"
+#line 4438 "qmljs.g"
 
-          case 579: {
+          case 582: {
               sym(1).StatementList = new (pool) AST::StatementList(sym(1).Node);
           } break;
 
-#line 4498 "qmljs.g"
+#line 4447 "qmljs.g"
 
-          case 581: {
+          case 584: {
               auto decl = new (pool) AST::ImportDeclaration(sym(2).ImportClause, sym(3).FromClause);
               decl->importToken = loc(1);
               sym(1).Node = decl;
           } break;
 
-#line 4506 "qmljs.g"
+#line 4455 "qmljs.g"
 
-          case 582: {
+          case 585: {
               auto decl = new (pool) AST::ImportDeclaration(stringRef(2));
               decl->importToken = loc(1);
               decl->moduleSpecifierToken = loc(2);
               sym(1).Node = decl;
           } break;
 
-#line 4516 "qmljs.g"
+#line 4465 "qmljs.g"
 
-          case 583: {
+          case 586: {
               auto clause = new (pool) AST::ImportClause(stringRef(1));
               clause->importedDefaultBindingToken = loc(1);
               sym(1).ImportClause = clause;
           } break;
 
-#line 4524 "qmljs.g"
+#line 4473 "qmljs.g"
 
-          case 584: {
+          case 587: {
               sym(1).ImportClause = new (pool) AST::ImportClause(sym(1).NameSpaceImport);
           } break;
 
-#line 4530 "qmljs.g"
+#line 4479 "qmljs.g"
 
-          case 585: {
+          case 588: {
               sym(1).ImportClause = new (pool) AST::ImportClause(sym(1).NamedImports);
           } break;
 
-#line 4536 "qmljs.g"
+#line 4485 "qmljs.g"
 
-          case 586: {
+          case 589: {
               auto importClause = new (pool)
                   AST::ImportClause(stringRef(1), sym(3).NameSpaceImport);
               importClause->importedDefaultBindingToken = loc(1);
               sym(1).ImportClause = importClause;
           } break;
 
-#line 4544 "qmljs.g"
+#line 4493 "qmljs.g"
 
-          case 587: {
+          case 590: {
               auto importClause = new (pool) AST::ImportClause(stringRef(1), sym(3).NamedImports);
               importClause->importedDefaultBindingToken = loc(1);
               sym(1).ImportClause = importClause;
           } break;
 
-#line 4555 "qmljs.g"
+#line 4504 "qmljs.g"
 
-          case 589: {
+          case 592: {
               auto import = new (pool) AST::NameSpaceImport(stringRef(3));
               import->starToken = loc(1);
               import->importedBindingToken = loc(3);
               sym(1).NameSpaceImport = import;
           } break;
 
-#line 4565 "qmljs.g"
+#line 4514 "qmljs.g"
 
-          case 590: {
+          case 593: {
               auto namedImports = new (pool) AST::NamedImports();
               namedImports->leftBraceToken = loc(1);
               namedImports->rightBraceToken = loc(2);
               sym(1).NamedImports = namedImports;
           } break;
 
-#line 4574 "qmljs.g"
+#line 4523 "qmljs.g"
 
-          case 591: {
+          case 594: {
               auto namedImports = new (pool) AST::NamedImports(sym(2).ImportsList->finish());
               namedImports->leftBraceToken = loc(1);
               namedImports->rightBraceToken = loc(3);
               sym(1).NamedImports = namedImports;
           } break;
 
-#line 4583 "qmljs.g"
+#line 4532 "qmljs.g"
 
-          case 592: {
+          case 595: {
               auto namedImports = new (pool) AST::NamedImports(sym(2).ImportsList->finish());
               namedImports->leftBraceToken = loc(1);
               namedImports->rightBraceToken = loc(4);
               sym(1).NamedImports = namedImports;
           } break;
 
-#line 4593 "qmljs.g"
+#line 4542 "qmljs.g"
 
-          case 593: {
+          case 596: {
               auto clause = new (pool) AST::FromClause(stringRef(2));
               clause->fromToken = loc(1);
               clause->moduleSpecifierToken = loc(2);
               sym(1).FromClause = clause;
           } break;
 
-#line 4603 "qmljs.g"
+#line 4552 "qmljs.g"
 
-          case 594: {
+          case 597: {
               auto importsList = new (pool) AST::ImportsList(sym(1).ImportSpecifier);
               importsList->importSpecifierToken = loc(1);
               sym(1).ImportsList = importsList;
           } break;
 
-#line 4611 "qmljs.g"
+#line 4560 "qmljs.g"
 
-          case 595: {
+          case 598: {
               auto importsList = new (pool)
                   AST::ImportsList(sym(1).ImportsList, sym(3).ImportSpecifier);
               importsList->importSpecifierToken = loc(3);
               sym(1).ImportsList = importsList;
           } break;
 
-#line 4623 "qmljs.g"
+#line 4572 "qmljs.g"
 
-          case 596: {
+          case 599: {
               auto importSpecifier = new (pool) AST::ImportSpecifier(stringRef(1));
               importSpecifier->importedBindingToken = loc(1);
               sym(1).ImportSpecifier = importSpecifier;
           } break;
 
-#line 4631 "qmljs.g"
+#line 4580 "qmljs.g"
 
-          case 597: {
+          case 600: {
               auto importSpecifier = new (pool) AST::ImportSpecifier(stringRef(1), stringRef(3));
               importSpecifier->identifierToken = loc(1);
               importSpecifier->importedBindingToken = loc(3);
               sym(1).ImportSpecifier = importSpecifier;
           } break;
 
-#line 4648 "qmljs.g"
+#line 4597 "qmljs.g"
 
-          case 600: {
+          case 603: {
               int token = lookaheadToken(lexer);
               if (token == T_FUNCTION || token == T_FUNCTION_STAR || token == T_CLASS)
-                  pushToken(T_FORCE_DECLARATION);
+                    pushToken(T_FORCE_DECLARATION);
           } break;
 
-#line 4657 "qmljs.g"
+#line 4606 "qmljs.g"
 
-          case 601: {
+          case 604: {
               auto exportDeclaration = new (pool) AST::ExportDeclaration(sym(3).FromClause);
               exportDeclaration->exportToken = loc(1);
               sym(1).ExportDeclaration = exportDeclaration;
           } break;
 
-#line 4665 "qmljs.g"
+#line 4614 "qmljs.g"
 
-          case 602: {
+          case 605: {
               auto exportDeclaration = new (pool)
                   AST::ExportDeclaration(sym(2).ExportClause, sym(3).FromClause);
               exportDeclaration->exportToken = loc(1);
               sym(1).ExportDeclaration = exportDeclaration;
           } break;
 
-#line 4673 "qmljs.g"
+#line 4622 "qmljs.g"
 
-          case 603: {
+          case 606: {
               auto exportDeclaration = new (pool) AST::ExportDeclaration(sym(2).ExportClause);
               exportDeclaration->exportToken = loc(1);
               sym(1).ExportDeclaration = exportDeclaration;
           } break;
 
-#line 4681 "qmljs.g"
-          case 604:
+#line 4630 "qmljs.g"
+          case 607:
               Q_FALLTHROUGH();
-#line 4683 "qmljs.g"
+#line 4632 "qmljs.g"
 
-          case 605: {
+          case 608: {
               auto exportDeclaration = new (pool)
                   AST::ExportDeclaration(/*exportDefault=*/false, sym(2).Node);
               exportDeclaration->exportToken = loc(1);
               sym(1).ExportDeclaration = exportDeclaration;
           } break;
 
-#line 4691 "qmljs.g"
+#line 4640 "qmljs.g"
 
-          case 606: {
+          case 609: {
               if (auto *f = AST::cast<AST::FunctionDeclaration *>(sym(5).Node)) {
-                  if (f->name.isEmpty()) {
-                      f->name = stringRef(2);
-                      f->identifierToken = loc(2);
-                  }
+                    if (f->name.isEmpty()) {
+                        f->name = stringRef(2);
+                        f->identifierToken = loc(2);
+                    }
               }
           }
               Q_FALLTHROUGH();
 
-#line 4702 "qmljs.g"
+#line 4651 "qmljs.g"
 
-          case 607: {
+          case 610: {
               // Emulate 15.2.3.11
               if (auto *cls = AST::cast<AST::ClassDeclaration *>(sym(5).Node)) {
-                  if (cls->name.isEmpty()) {
-                      cls->name = stringRef(2);
-                      cls->identifierToken = loc(2);
-                  }
+                    if (cls->name.isEmpty()) {
+                        cls->name = stringRef(2);
+                        cls->identifierToken = loc(2);
+                    }
               }
 
               auto exportDeclaration = new (pool)
@@ -3927,15 +3971,15 @@ bool Parser::parse(int startToken)
               sym(1).ExportDeclaration = exportDeclaration;
           } break;
 
-#line 4718 "qmljs.g"
+#line 4667 "qmljs.g"
 
-          case 608: {
+          case 611: {
               // if lhs is an identifier expression and rhs is an anonymous function expression, we need to assign the name of lhs to the function
               if (auto *f = asAnonymousFunctionDefinition(sym(4).Node)) {
-                  f->name = stringRef(2);
+                    f->name = stringRef(2);
               }
               if (auto *c = asAnonymousClassDefinition(sym(4).Expression)) {
-                  c->name = stringRef(2);
+                    c->name = stringRef(2);
               }
 
               auto exportDeclaration = new (pool)
@@ -3944,64 +3988,64 @@ bool Parser::parse(int startToken)
               sym(1).ExportDeclaration = exportDeclaration;
           } break;
 
-#line 4735 "qmljs.g"
+#line 4684 "qmljs.g"
 
-          case 609: {
+          case 612: {
               auto exportClause = new (pool) AST::ExportClause();
               exportClause->leftBraceToken = loc(1);
               exportClause->rightBraceToken = loc(2);
               sym(1).ExportClause = exportClause;
           } break;
 
-#line 4744 "qmljs.g"
+#line 4693 "qmljs.g"
 
-          case 610: {
+          case 613: {
               auto exportClause = new (pool) AST::ExportClause(sym(2).ExportsList->finish());
               exportClause->leftBraceToken = loc(1);
               exportClause->rightBraceToken = loc(3);
               sym(1).ExportClause = exportClause;
           } break;
 
-#line 4753 "qmljs.g"
+#line 4702 "qmljs.g"
 
-          case 611: {
+          case 614: {
               auto exportClause = new (pool) AST::ExportClause(sym(2).ExportsList->finish());
               exportClause->leftBraceToken = loc(1);
               exportClause->rightBraceToken = loc(4);
               sym(1).ExportClause = exportClause;
           } break;
 
-#line 4763 "qmljs.g"
+#line 4712 "qmljs.g"
 
-          case 612: {
+          case 615: {
               sym(1).ExportsList = new (pool) AST::ExportsList(sym(1).ExportSpecifier);
           } break;
 
-#line 4769 "qmljs.g"
+#line 4718 "qmljs.g"
 
-          case 613: {
+          case 616: {
               sym(1).ExportsList = new (pool)
                   AST::ExportsList(sym(1).ExportsList, sym(3).ExportSpecifier);
           } break;
 
-#line 4776 "qmljs.g"
+#line 4725 "qmljs.g"
 
-          case 614: {
+          case 617: {
               auto exportSpecifier = new (pool) AST::ExportSpecifier(stringRef(1));
               exportSpecifier->identifierToken = loc(1);
               sym(1).ExportSpecifier = exportSpecifier;
           } break;
 
-#line 4784 "qmljs.g"
+#line 4733 "qmljs.g"
 
-          case 615: {
+          case 618: {
               auto exportSpecifier = new (pool) AST::ExportSpecifier(stringRef(1), stringRef(3));
               exportSpecifier->identifierToken = loc(1);
               exportSpecifier->exportedIdentifierToken = loc(3);
               sym(1).ExportSpecifier = exportSpecifier;
           } break;
 
-#line 4795 "qmljs.g"
+#line 4744 "qmljs.g"
 
               // ------------ end of switch statement
           } // switch
diff --git a/src/libs/qmljs/parser/qmljsparser_p.h b/src/libs/qmljs/parser/qmljsparser_p.h
index 540ead7550a..17a52b0ae46 100644
--- a/src/libs/qmljs/parser/qmljsparser_p.h
+++ b/src/libs/qmljs/parser/qmljsparser_p.h
@@ -1,3 +1,5 @@
+
+#line 126 "qmljs.g"
 // Copyright (C) 2021 The Qt Company Ltd.
 // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0+ OR GPL-3.0 WITH Qt-GPL-exception-1.0
 
@@ -86,7 +88,7 @@ public:
       AST::ExportClause *ExportClause;
       AST::ExportDeclaration *ExportDeclaration;
       AST::TypeAnnotation *TypeAnnotation;
-      AST::TypeArgumentList *TypeArgumentList;
+      AST::TypeArgument *TypeArgument;
       AST::Type *Type;
 
       AST::UiProgram *UiProgram;
@@ -160,7 +162,7 @@ public:
     inline DiagnosticMessage diagnosticMessage() const
     {
         for (const DiagnosticMessage &d : diagnostic_messages) {
-            if (d.kind != Severity::Warning)
+            if (d.isWarning())
                 return d;
         }
 
@@ -253,6 +255,7 @@ protected:
     SavedToken *last_token = nullptr;
 
     int functionNestingLevel = 0;
+    int classNestingLevel = 0;
 
     enum CoverExpressionType {
         CE_Invalid,
@@ -267,27 +270,27 @@ protected:
 
 } // end of namespace QmlJS
 
-#line 1819 "qmljs.g"
+#line 1769 "qmljs.g"
 
-#define J_SCRIPT_REGEXPLITERAL_RULE1 159
+#define J_SCRIPT_REGEXPLITERAL_RULE1 163
 
-#line 1831 "qmljs.g"
+#line 1781 "qmljs.g"
 
-#define J_SCRIPT_REGEXPLITERAL_RULE2 160
+#define J_SCRIPT_REGEXPLITERAL_RULE2 164
 
-#line 3451 "qmljs.g"
+#line 3401 "qmljs.g"
 
-#define J_SCRIPT_EXPRESSIONSTATEMENTLOOKAHEAD_RULE 461
+#define J_SCRIPT_EXPRESSIONSTATEMENTLOOKAHEAD_RULE 465
 
-#line 4103 "qmljs.g"
+#line 4053 "qmljs.g"
 
-#define J_SCRIPT_CONCISEBODYLOOKAHEAD_RULE 531
+#define J_SCRIPT_CONCISEBODYLOOKAHEAD_RULE 535
 
-#line 4645 "qmljs.g"
+#line 4594 "qmljs.g"
 
-#define J_SCRIPT_EXPORTDECLARATIONLOOKAHEAD_RULE 600
+#define J_SCRIPT_EXPORTDECLARATIONLOOKAHEAD_RULE 603
 
-#line 4929 "qmljs.g"
+#line 4878 "qmljs.g"
 
 QT_QML_END_NAMESPACE
 
diff --git a/src/libs/qmljs/qmljsinterpreter.cpp b/src/libs/qmljs/qmljsinterpreter.cpp
index d7198a26d1c..75aedc9e46f 100644
--- a/src/libs/qmljs/qmljsinterpreter.cpp
+++ b/src/libs/qmljs/qmljsinterpreter.cpp
@@ -2100,9 +2100,9 @@ bool ASTPropertyReference::getSourceLocation(Utils::FilePath *fileName, int *lin
 const Value *ASTPropertyReference::value(ReferenceContext *referenceContext) const
 {
     if (m_ast->statement
-            && (m_ast->memberType->name == QLatin1String("variant")
-                || m_ast->memberType->name == QLatin1String("var")
-                || m_ast->memberType->name == QLatin1String("alias"))) {
+            && (m_ast->memberType->toString() == QLatin1String("variant")
+                || m_ast->memberType->toString() == QLatin1String("var")
+                || m_ast->memberType->toString() == QLatin1String("alias"))) {
 
         // Adjust the context for the current location - expensive!
         // ### Improve efficiency by caching the 'use chain' constructed in ScopeBuilder.
@@ -2118,7 +2118,7 @@ const Value *ASTPropertyReference::value(ReferenceContext *referenceContext) con
         return evaluator(m_ast->statement);
     }
 
-    const QString memberType = m_ast->memberType->name.toString();
+    const QString memberType = m_ast->memberType->toString();
 
     const Value *builtin = valueOwner()->defaultValueForBuiltinType(memberType);
     if (!builtin->asUndefinedValue())
@@ -2142,7 +2142,7 @@ ASTSignal::ASTSignal(UiPublicMember *ast, const Document *doc, ValueOwner *value
     ObjectValue *v = valueOwner->newObject(/*prototype=*/nullptr);
     for (UiParameterList *it = ast->parameters; it; it = it->next) {
         if (!it->name.isEmpty())
-            v->setMember(it->name.toString(), valueOwner->defaultValueForBuiltinType(it->type->name.toString()));
+            v->setMember(it->name.toString(), valueOwner->defaultValueForBuiltinType(it->type->toString()));
     }
     m_bodyScope = v;
 }
@@ -2169,9 +2169,9 @@ const Value *ASTSignal::argument(int index) const
     UiParameterList *param = m_ast->parameters;
     for (int i = 0; param && i < index; ++i)
         param = param->next;
-    if (!param || param->type->name.isEmpty())
+    if (!param || param->type->toString().isEmpty())
         return valueOwner()->unknownValue();
-    return valueOwner()->defaultValueForBuiltinType(param->type->name.toString());
+    return valueOwner()->defaultValueForBuiltinType(param->type->toString());
 }
 
 QString ASTSignal::argumentName(int index) const