Fix support for namespaced types in property/signal declarations

Declarations such as

    property Namespace.Item foo

or

    property list<Namespace.Item> foo

would get rejected by the grammar due to the lack of productions. This
is now encapsulated in the UiPropertyType, which used to be merely an
identifier but is now changed to produce a UiQualifiedId - the same type
that's also used for MyNamespace.Item { ... } object declarations for
example.

Task-number: QTBUG-10822
Change-Id: Ic3ac1adbe17c83b24b67950c2f089e267b73b99b
Reviewed-by: Lars Knoll <lars.knoll@qt.io>

6 files changed, 1187 insertions, 1151 deletions

diff --git a/src/qml/parser/qqmljs.g b/src/qml/parser/qqmljs.g
index a3ca9c44d0..9cd212015e 100644
--- a/src/qml/parser/qqmljs.g
+++ b/src/qml/parser/qqmljs.g
@@ -916,8 +916,40 @@ case $rule_number:
 ./
 
 UiPropertyType: T_VAR ;
+/.
+case $rule_number: {
+  AST::UiQualifiedId *node = new (pool) AST::UiQualifiedId(stringRef(1));
+  node->identifierToken = loc(1);
+  sym(1).Node = node;
+} break;
+./
+
 UiPropertyType: T_RESERVED_WORD ;
+/.
+case $rule_number: {
+  AST::UiQualifiedId *node = new (pool) AST::UiQualifiedId(stringRef(1));
+  node->identifierToken = loc(1);
+  sym(1).Node = node;
+} break;
+./
+
 UiPropertyType: T_IDENTIFIER ;
+/.
+case $rule_number: {
+  AST::UiQualifiedId *node = new (pool) AST::UiQualifiedId(stringRef(1));
+  node->identifierToken = loc(1);
+  sym(1).Node = node;
+} break;
+./
+
+UiPropertyType: UiPropertyType T_DOT T_IDENTIFIER ;
+/.
+case $rule_number: {
+  AST::UiQualifiedId *node = new (pool) AST::UiQualifiedId(sym(1).UiQualifiedId, stringRef(3));
+  node->identifierToken = loc(3);
+  sym(1).Node = node;
+} break;
+./
 
 UiParameterListOpt: ;
 /.
@@ -936,7 +968,7 @@ case $rule_number: {
 UiParameterList: UiPropertyType JsIdentifier ;
 /.
 case $rule_number: {
-  AST::UiParameterList *node = new (pool) AST::UiParameterList(stringRef(1), stringRef(2));
+  AST::UiParameterList *node = new (pool) AST::UiParameterList(sym(1).UiQualifiedId->finish(), stringRef(2));
   node->propertyTypeToken = loc(1);
   node->identifierToken = loc(2);
   sym(1).Node = node;
@@ -946,7 +978,7 @@ case $rule_number: {
 UiParameterList: UiParameterList T_COMMA UiPropertyType JsIdentifier ;
 /.
 case $rule_number: {
-  AST::UiParameterList *node = new (pool) AST::UiParameterList(sym(1).UiParameterList, stringRef(3), stringRef(4));
+  AST::UiParameterList *node = new (pool) AST::UiParameterList(sym(1).UiParameterList, sym(3).UiQualifiedId->finish(), stringRef(4));
   node->propertyTypeToken = loc(3);
   node->commaToken = loc(2);
   node->identifierToken = loc(4);
@@ -958,7 +990,7 @@ UiObjectMember: T_SIGNAL T_IDENTIFIER T_LPAREN UiParameterListOpt T_RPAREN T_AUT
 UiObjectMember: T_SIGNAL T_IDENTIFIER T_LPAREN UiParameterListOpt T_RPAREN T_SEMICOLON ;
 /.
 case $rule_number: {
-    AST::UiPublicMember *node = new (pool) AST::UiPublicMember(QStringRef(), stringRef(2));
+    AST::UiPublicMember *node = new (pool) AST::UiPublicMember(nullptr, stringRef(2));
     node->type = AST::UiPublicMember::Signal;
     node->propertyToken = loc(1);
     node->typeToken = loc(2);
@@ -973,7 +1005,7 @@ UiObjectMember: T_SIGNAL T_IDENTIFIER T_AUTOMATIC_SEMICOLON ;
 UiObjectMember: T_SIGNAL T_IDENTIFIER T_SEMICOLON ;
 /.
 case $rule_number: {
-    AST::UiPublicMember *node = new (pool) AST::UiPublicMember(QStringRef(), stringRef(2));
+    AST::UiPublicMember *node = new (pool) AST::UiPublicMember(nullptr, stringRef(2));
     node->type = AST::UiPublicMember::Signal;
     node->propertyToken = loc(1);
     node->typeToken = loc(2);
@@ -987,7 +1019,7 @@ UiObjectMember: T_PROPERTY T_IDENTIFIER T_LT UiPropertyType T_GT JsIdentifier T_
 UiObjectMember: T_PROPERTY T_IDENTIFIER T_LT UiPropertyType T_GT JsIdentifier T_SEMICOLON ;
 /.
 case $rule_number: {
-    AST::UiPublicMember *node = new (pool) AST::UiPublicMember(stringRef(4), stringRef(6));
+    AST::UiPublicMember *node = new (pool) AST::UiPublicMember(sym(4).UiQualifiedId->finish(), stringRef(6));
     node->typeModifier = stringRef(2);
     node->propertyToken = loc(1);
     node->typeModifierToken = loc(2);
@@ -1002,7 +1034,7 @@ UiObjectMember: T_PROPERTY UiPropertyType JsIdentifier T_AUTOMATIC_SEMICOLON ;
 UiObjectMember: T_PROPERTY UiPropertyType JsIdentifier T_SEMICOLON ;
 /.
 case $rule_number: {
-    AST::UiPublicMember *node = new (pool) AST::UiPublicMember(stringRef(2), stringRef(3));
+    AST::UiPublicMember *node = new (pool) AST::UiPublicMember(sym(2).UiQualifiedId->finish(), stringRef(3));
     node->propertyToken = loc(1);
     node->typeToken = loc(2);
     node->identifierToken = loc(3);
@@ -1015,7 +1047,7 @@ UiObjectMember: T_DEFAULT T_PROPERTY UiPropertyType JsIdentifier T_AUTOMATIC_SEM
 UiObjectMember: T_DEFAULT T_PROPERTY UiPropertyType JsIdentifier T_SEMICOLON ;
 /.
 case $rule_number: {
-    AST::UiPublicMember *node = new (pool) AST::UiPublicMember(stringRef(3), stringRef(4));
+    AST::UiPublicMember *node = new (pool) AST::UiPublicMember(sym(3).UiQualifiedId->finish(), stringRef(4));
     node->isDefaultMember = true;
     node->defaultToken = loc(1);
     node->propertyToken = loc(2);
@@ -1030,7 +1062,7 @@ UiObjectMember: T_DEFAULT T_PROPERTY T_IDENTIFIER T_LT UiPropertyType T_GT JsIde
 UiObjectMember: T_DEFAULT T_PROPERTY T_IDENTIFIER T_LT UiPropertyType T_GT JsIdentifier T_SEMICOLON ;
 /.
 case $rule_number: {
-    AST::UiPublicMember *node = new (pool) AST::UiPublicMember(stringRef(5), stringRef(7));
+    AST::UiPublicMember *node = new (pool) AST::UiPublicMember(sym(5).UiQualifiedId->finish(), stringRef(7));
     node->isDefaultMember = true;
     node->defaultToken = loc(1);
     node->typeModifier = stringRef(3);
@@ -1046,7 +1078,7 @@ case $rule_number: {
 UiObjectMember: T_PROPERTY UiPropertyType JsIdentifier T_COLON UiScriptStatement ;
 /.
 case $rule_number: {
-    AST::UiPublicMember *node = new (pool) AST::UiPublicMember(stringRef(2), stringRef(3),
+    AST::UiPublicMember *node = new (pool) AST::UiPublicMember(sym(2).UiQualifiedId->finish(), stringRef(3),
         sym(5).Statement);
     node->propertyToken = loc(1);
     node->typeToken = loc(2);
@@ -1059,7 +1091,7 @@ case $rule_number: {
 UiObjectMember: T_READONLY T_PROPERTY UiPropertyType JsIdentifier T_COLON UiScriptStatement ;
 /.
 case $rule_number: {
-    AST::UiPublicMember *node = new (pool) AST::UiPublicMember(stringRef(3), stringRef(4),
+    AST::UiPublicMember *node = new (pool) AST::UiPublicMember(sym(3).UiQualifiedId->finish(), stringRef(4),
         sym(6).Statement);
     node->isReadonlyMember = true;
     node->readonlyToken = loc(1);
@@ -1074,7 +1106,7 @@ case $rule_number: {
 UiObjectMember: T_DEFAULT T_PROPERTY UiPropertyType JsIdentifier T_COLON UiScriptStatement ;
 /.
 case $rule_number: {
-    AST::UiPublicMember *node = new (pool) AST::UiPublicMember(stringRef(3), stringRef(4),
+    AST::UiPublicMember *node = new (pool) AST::UiPublicMember(sym(3).UiQualifiedId->finish(), stringRef(4),
         sym(6).Statement);
     node->isDefaultMember = true;
     node->defaultToken = loc(1);
@@ -1089,7 +1121,7 @@ case $rule_number: {
 UiObjectMember: T_PROPERTY T_IDENTIFIER T_LT UiPropertyType T_GT JsIdentifier T_COLON T_LBRACKET UiArrayMemberList T_RBRACKET ;
 /.
 case $rule_number: {
-    AST::UiPublicMember *node = new (pool) AST::UiPublicMember(stringRef(4), stringRef(6));
+    AST::UiPublicMember *node = new (pool) AST::UiPublicMember(sym(4).UiQualifiedId->finish(), stringRef(6));
     node->typeModifier = stringRef(2);
     node->propertyToken = loc(1);
     node->typeModifierToken = loc(2);
@@ -1116,7 +1148,7 @@ case $rule_number: {
 UiObjectMember: T_PROPERTY UiPropertyType JsIdentifier T_COLON UiQualifiedId UiObjectInitializer ;
 /.
 case $rule_number: {
-    AST::UiPublicMember *node = new (pool) AST::UiPublicMember(stringRef(2), stringRef(3));
+    AST::UiPublicMember *node = new (pool) AST::UiPublicMember(sym(2).UiQualifiedId->finish(), stringRef(3));
     node->propertyToken = loc(1);
     node->typeToken = loc(2);
     node->identifierToken = loc(3);
@@ -1139,7 +1171,7 @@ case $rule_number: {
 UiObjectMember: T_READONLY T_PROPERTY UiPropertyType JsIdentifier T_COLON UiQualifiedId UiObjectInitializer ;
 /.
 case $rule_number: {
-    AST::UiPublicMember *node = new (pool) AST::UiPublicMember(stringRef(3), stringRef(4));
+    AST::UiPublicMember *node = new (pool) AST::UiPublicMember(sym(3).UiQualifiedId->finish(), stringRef(4));
     node->isReadonlyMember = true;
     node->readonlyToken = loc(1);
     node->propertyToken = loc(2);
diff --git a/src/qml/parser/qqmljsast_p.h b/src/qml/parser/qqmljsast_p.h
index 2ca4e883d6..adb87c6c4e 100644
--- a/src/qml/parser/qqmljsast_p.h
+++ b/src/qml/parser/qqmljsast_p.h
@@ -2537,11 +2537,11 @@ class QML_PARSER_EXPORT UiParameterList: public Node
 public:
     QQMLJS_DECLARE_AST_NODE(UiParameterList)
 
-    UiParameterList(const QStringRef &t, const QStringRef &n):
+    UiParameterList(UiQualifiedId *t, const QStringRef &n):
         type (t), name (n), next (this)
         { kind = K; }
 
-    UiParameterList(UiParameterList *previous, const QStringRef &t, const QStringRef &n):
+    UiParameterList(UiParameterList *previous, UiQualifiedId *t, const QStringRef &n):
         type (t), name (n)
     {
         kind = K;
@@ -2565,7 +2565,7 @@ public:
     }
 
 // attributes
-    QStringRef type;
+    UiQualifiedId *type;
     QStringRef name;
     UiParameterList *next;
     SourceLocation commaToken;
@@ -2578,12 +2578,12 @@ class QML_PARSER_EXPORT UiPublicMember: public UiObjectMember
 public:
     QQMLJS_DECLARE_AST_NODE(UiPublicMember)
 
-    UiPublicMember(const QStringRef &memberType,
+    UiPublicMember(UiQualifiedId *memberType,
                    const QStringRef &name)
         : type(Property), memberType(memberType), name(name), statement(0), binding(0), isDefaultMember(false), isReadonlyMember(false), parameters(0)
     { kind = K; }
 
-    UiPublicMember(const QStringRef &memberType,
+    UiPublicMember(UiQualifiedId *memberType,
                    const QStringRef &name,
                    Statement *statement)
         : type(Property), memberType(memberType), name(name), statement(statement), binding(0), isDefaultMember(false), isReadonlyMember(false), parameters(0)
@@ -2614,7 +2614,7 @@ public:
 // attributes
     enum { Signal, Property } type;
     QStringRef typeModifier;
-    QStringRef memberType;
+    UiQualifiedId *memberType;
     QStringRef name;
     Statement *statement; // initialized with a JS expression
     UiObjectMember *binding; // initialized with a QML object or array.
diff --git a/src/qml/parser/qqmljsgrammar.cpp b/src/qml/parser/qqmljsgrammar.cpp
index fdcd94b472..b27f4af080 100644
--- a/src/qml/parser/qqmljsgrammar.cpp
+++ b/src/qml/parser/qqmljsgrammar.cpp
@@ -61,37 +61,38 @@ const short QQmlJSGrammar::lhs [] = {
   118, 118, 118, 118, 118, 122, 123, 115, 114, 126, 
   126, 127, 127, 128, 128, 125, 111, 111, 111, 111, 
   130, 130, 130, 130, 130, 130, 130, 111, 138, 138, 
-  138, 139, 139, 140, 140, 111, 111, 111, 111, 111, 
+  138, 138, 139, 139, 140, 140, 111, 111, 111, 111, 
   111, 111, 111, 111, 111, 111, 111, 111, 111, 111, 
-  111, 111, 111, 111, 111, 124, 124, 124, 124, 124, 
-  124, 124, 143, 143, 143, 143, 143, 143, 143, 143, 
+  111, 111, 111, 111, 111, 111, 124, 124, 124, 124, 
+  124, 124, 124, 143, 143, 143, 143, 143, 143, 143, 
   143, 143, 143, 143, 143, 143, 143, 143, 143, 143, 
-  129, 145, 145, 145, 145, 144, 144, 149, 149, 149, 
-  147, 147, 150, 150, 150, 150, 153, 153, 153, 153, 
+  143, 129, 145, 145, 145, 145, 144, 144, 149, 149, 
+  149, 147, 147, 150, 150, 150, 150, 153, 153, 153, 
   153, 153, 153, 153, 153, 153, 153, 153, 153, 153, 
   153, 153, 153, 153, 153, 153, 153, 153, 153, 153, 
-  153, 153, 153, 153, 153, 153, 153, 154, 154, 120, 
-  120, 120, 120, 120, 157, 157, 158, 158, 158, 158, 
-  156, 156, 159, 159, 160, 160, 161, 161, 161, 162, 
-  162, 162, 162, 162, 162, 162, 162, 162, 162, 163, 
-  163, 163, 163, 164, 164, 164, 165, 165, 165, 165, 
-  166, 166, 166, 166, 166, 166, 166, 167, 167, 167, 
-  167, 167, 167, 168, 168, 168, 168, 168, 169, 169, 
-  169, 169, 169, 170, 170, 171, 171, 172, 172, 173, 
-  173, 174, 174, 175, 175, 176, 176, 177, 177, 178, 
-  178, 179, 179, 180, 180, 181, 181, 148, 148, 182, 
-  182, 183, 183, 183, 183, 183, 183, 183, 183, 183, 
-  183, 183, 183, 109, 109, 184, 184, 185, 185, 186, 
-  186, 108, 108, 108, 108, 108, 108, 108, 108, 108, 
-  108, 108, 108, 108, 108, 108, 131, 195, 195, 194, 
-  194, 142, 142, 196, 196, 197, 197, 199, 199, 198, 
-  200, 203, 201, 201, 204, 202, 202, 132, 133, 133, 
-  134, 134, 187, 187, 187, 187, 187, 187, 187, 187, 
-  188, 188, 188, 188, 189, 189, 189, 189, 190, 190, 
-  135, 136, 205, 205, 208, 208, 206, 206, 209, 207, 
-  191, 192, 192, 137, 137, 137, 210, 211, 193, 193, 
-  212, 141, 155, 155, 213, 213, 152, 152, 151, 151, 
-  214, 112, 112, 215, 215, 110, 110, 146, 146, 216};
+  153, 153, 153, 153, 153, 153, 153, 153, 154, 154, 
+  120, 120, 120, 120, 120, 157, 157, 158, 158, 158, 
+  158, 156, 156, 159, 159, 160, 160, 161, 161, 161, 
+  162, 162, 162, 162, 162, 162, 162, 162, 162, 162, 
+  163, 163, 163, 163, 164, 164, 164, 165, 165, 165, 
+  165, 166, 166, 166, 166, 166, 166, 166, 167, 167, 
+  167, 167, 167, 167, 168, 168, 168, 168, 168, 169, 
+  169, 169, 169, 169, 170, 170, 171, 171, 172, 172, 
+  173, 173, 174, 174, 175, 175, 176, 176, 177, 177, 
+  178, 178, 179, 179, 180, 180, 181, 181, 148, 148, 
+  182, 182, 183, 183, 183, 183, 183, 183, 183, 183, 
+  183, 183, 183, 183, 109, 109, 184, 184, 185, 185, 
+  186, 186, 108, 108, 108, 108, 108, 108, 108, 108, 
+  108, 108, 108, 108, 108, 108, 108, 131, 195, 195, 
+  194, 194, 142, 142, 196, 196, 197, 197, 199, 199, 
+  198, 200, 203, 201, 201, 204, 202, 202, 132, 133, 
+  133, 134, 134, 187, 187, 187, 187, 187, 187, 187, 
+  187, 188, 188, 188, 188, 189, 189, 189, 189, 190, 
+  190, 135, 136, 205, 205, 208, 208, 206, 206, 209, 
+  207, 191, 192, 192, 137, 137, 137, 210, 211, 193, 
+  193, 212, 141, 155, 155, 213, 213, 152, 152, 151, 
+  151, 214, 112, 112, 215, 215, 110, 110, 146, 146, 
+  216};
 
 const short QQmlJSGrammar::rhs [] = {
   2, 2, 2, 2, 2, 2, 2, 1, 1, 1, 
@@ -99,113 +100,114 @@ const short QQmlJSGrammar::rhs [] = {
   3, 5, 5, 4, 4, 2, 2, 0, 1, 1, 
   2, 1, 3, 2, 3, 2, 1, 5, 4, 4, 
   1, 1, 1, 1, 1, 1, 1, 3, 1, 1, 
-  1, 0, 1, 2, 4, 6, 6, 3, 3, 7, 
-  7, 4, 4, 5, 5, 8, 8, 5, 6, 6, 
-  10, 6, 7, 1, 1, 1, 1, 1, 1, 1, 
-  1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 
-  1, 1, 2, 3, 3, 4, 5, 3, 4, 3, 
-  1, 1, 2, 3, 4, 1, 2, 3, 7, 8, 
-  1, 3, 1, 1, 1, 1, 1, 1, 1, 1, 
+  1, 3, 0, 1, 2, 4, 6, 6, 3, 3, 
+  7, 7, 4, 4, 5, 5, 8, 8, 5, 6, 
+  6, 10, 6, 7, 1, 1, 1, 1, 1, 1, 
   1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 
+  1, 1, 1, 2, 3, 3, 4, 5, 3, 4, 
+  3, 1, 1, 2, 3, 4, 1, 2, 3, 7, 
+  8, 1, 3, 1, 1, 1, 1, 1, 1, 1, 
   1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 
   1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 
-  1, 4, 3, 5, 1, 2, 4, 4, 4, 3, 
-  0, 1, 1, 3, 1, 1, 1, 2, 2, 1, 
-  2, 2, 2, 2, 2, 2, 2, 2, 2, 1, 
-  3, 3, 3, 1, 3, 3, 1, 3, 3, 3, 
-  1, 3, 3, 3, 3, 3, 3, 1, 3, 3, 
-  3, 3, 3, 1, 3, 3, 3, 3, 1, 3, 
-  3, 3, 3, 1, 3, 1, 3, 1, 3, 1, 
-  3, 1, 3, 1, 3, 1, 3, 1, 3, 1, 
-  3, 1, 3, 1, 5, 1, 5, 1, 3, 1, 
-  3, 1, 1, 1, 1, 1, 1, 1, 1, 1, 
-  1, 1, 1, 1, 3, 0, 1, 1, 3, 0, 
   1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 
-  1, 1, 1, 1, 1, 1, 3, 1, 2, 0, 
-  1, 3, 3, 1, 1, 1, 3, 1, 3, 2, 
-  2, 2, 0, 1, 2, 0, 1, 1, 2, 2, 
-  7, 5, 7, 7, 7, 5, 9, 10, 7, 8, 
-  2, 2, 3, 3, 2, 2, 3, 3, 3, 3, 
-  5, 5, 3, 5, 1, 2, 0, 1, 4, 3, 
-  3, 3, 3, 3, 3, 4, 5, 2, 2, 2, 
-  1, 8, 8, 7, 1, 3, 0, 1, 0, 1, 
-  1, 1, 1, 1, 2, 1, 1, 0, 1, 2};
+  1, 1, 4, 3, 5, 1, 2, 4, 4, 4, 
+  3, 0, 1, 1, 3, 1, 1, 1, 2, 2, 
+  1, 2, 2, 2, 2, 2, 2, 2, 2, 2, 
+  1, 3, 3, 3, 1, 3, 3, 1, 3, 3, 
+  3, 1, 3, 3, 3, 3, 3, 3, 1, 3, 
+  3, 3, 3, 3, 1, 3, 3, 3, 3, 1, 
+  3, 3, 3, 3, 1, 3, 1, 3, 1, 3, 
+  1, 3, 1, 3, 1, 3, 1, 3, 1, 3, 
+  1, 3, 1, 3, 1, 5, 1, 5, 1, 3, 
+  1, 3, 1, 1, 1, 1, 1, 1, 1, 1, 
+  1, 1, 1, 1, 1, 3, 0, 1, 1, 3, 
+  0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 
+  1, 1, 1, 1, 1, 1, 1, 3, 1, 2, 
+  0, 1, 3, 3, 1, 1, 1, 3, 1, 3, 
+  2, 2, 2, 0, 1, 2, 0, 1, 1, 2, 
+  2, 7, 5, 7, 7, 7, 5, 9, 10, 7, 
+  8, 2, 2, 3, 3, 2, 2, 3, 3, 3, 
+  3, 5, 5, 3, 5, 1, 2, 0, 1, 4, 
+  3, 3, 3, 3, 3, 3, 4, 5, 2, 2, 
+  2, 1, 8, 8, 7, 1, 3, 0, 1, 0, 
+  1, 1, 1, 1, 1, 2, 1, 1, 0, 1, 
+  2};
 
 const short QQmlJSGrammar::action_default [] = {
-  0, 0, 28, 0, 0, 0, 28, 0, 187, 254, 
-  218, 226, 222, 166, 238, 214, 3, 151, 84, 167, 
-  230, 234, 155, 184, 165, 170, 150, 204, 191, 0, 
-  91, 92, 87, 0, 81, 76, 358, 0, 0, 0, 
-  0, 89, 0, 0, 85, 88, 80, 0, 0, 77, 
-  79, 82, 78, 90, 83, 0, 86, 0, 0, 180, 
-  0, 0, 167, 186, 169, 168, 0, 0, 0, 182, 
-  183, 181, 185, 0, 215, 0, 0, 0, 0, 205, 
-  0, 0, 0, 0, 0, 0, 195, 0, 0, 0, 
-  189, 190, 188, 193, 197, 196, 194, 192, 207, 206, 
-  208, 0, 223, 0, 219, 0, 0, 161, 148, 160, 
-  149, 117, 118, 119, 144, 120, 145, 121, 122, 123, 
-  124, 125, 126, 127, 128, 129, 130, 131, 132, 133, 
-  146, 134, 135, 136, 137, 138, 139, 140, 141, 142, 
-  143, 147, 0, 0, 159, 255, 162, 0, 163, 0, 
-  164, 158, 0, 251, 244, 242, 249, 250, 248, 247, 
-  253, 246, 245, 243, 252, 239, 0, 227, 0, 0, 
-  231, 0, 0, 235, 0, 0, 161, 153, 0, 152, 
-  0, 157, 171, 0, 347, 347, 348, 0, 345, 0, 
-  346, 0, 349, 262, 269, 268, 276, 264, 0, 265, 
-  0, 350, 0, 357, 266, 267, 84, 272, 270, 354, 
-  351, 356, 273, 0, 284, 0, 0, 0, 0, 341, 
-  0, 358, 256, 298, 0, 0, 0, 285, 0, 0, 
-  274, 275, 0, 263, 271, 299, 300, 0, 347, 0, 
-  0, 349, 0, 342, 343, 0, 331, 355, 0, 315, 
-  316, 317, 318, 0, 311, 312, 313, 314, 339, 340, 
-  0, 0, 0, 0, 0, 303, 304, 305, 260, 258, 
-  220, 228, 224, 240, 216, 261, 0, 167, 232, 236, 
-  209, 198, 0, 0, 217, 0, 0, 0, 0, 210, 
-  0, 0, 0, 0, 0, 202, 200, 203, 201, 199, 
-  212, 211, 213, 0, 225, 0, 221, 0, 259, 167, 
-  0, 241, 256, 257, 0, 256, 0, 0, 307, 0, 
-  0, 0, 309, 0, 229, 0, 0, 233, 0, 0, 
-  237, 296, 0, 288, 297, 291, 0, 295, 0, 256, 
-  289, 0, 256, 0, 0, 308, 0, 0, 0, 310, 
-  0, 0, 0, 302, 0, 301, 84, 111, 359, 0, 
-  0, 116, 278, 281, 0, 117, 284, 120, 145, 122, 
-  123, 87, 127, 128, 81, 129, 132, 85, 88, 256, 
-  82, 90, 135, 83, 137, 86, 139, 140, 285, 142, 
-  143, 147, 0, 113, 112, 115, 99, 114, 98, 0, 
-  108, 279, 277, 0, 0, 0, 349, 0, 109, 155, 
-  156, 161, 0, 154, 0, 319, 320, 0, 347, 0, 
-  0, 349, 0, 110, 0, 0, 0, 322, 327, 325, 
-  328, 0, 0, 326, 327, 0, 323, 0, 324, 280, 
-  330, 0, 280, 329, 0, 332, 333, 0, 280, 334, 
-  335, 0, 0, 336, 0, 0, 0, 337, 338, 173, 
-  172, 0, 0, 0, 306, 0, 0, 0, 321, 293, 
-  286, 0, 294, 290, 0, 292, 282, 0, 283, 287, 
-  0, 0, 349, 0, 344, 102, 0, 0, 106, 93, 
-  0, 95, 104, 0, 96, 105, 107, 97, 103, 94, 
-  0, 100, 177, 175, 179, 176, 174, 178, 352, 6, 
-  353, 4, 2, 74, 101, 0, 0, 77, 79, 78, 
-  37, 5, 0, 75, 0, 51, 50, 49, 0, 0, 
-  51, 0, 0, 0, 66, 67, 0, 64, 0, 65, 
-  41, 42, 43, 44, 46, 47, 70, 45, 0, 51, 
-  0, 0, 0, 0, 0, 60, 0, 61, 0, 0, 
-  32, 0, 0, 71, 33, 0, 36, 34, 30, 0, 
-  35, 31, 0, 62, 0, 63, 155, 0, 68, 72, 
-  0, 0, 0, 0, 155, 280, 0, 69, 84, 117, 
-  284, 120, 145, 122, 123, 87, 127, 128, 129, 132, 
-  85, 88, 256, 90, 135, 83, 137, 86, 139, 140, 
-  285, 142, 143, 147, 73, 0, 58, 52, 59, 53, 
-  0, 0, 0, 0, 55, 0, 56, 57, 54, 0, 
-  0, 0, 0, 48, 0, 38, 39, 0, 40, 8, 
-  0, 0, 9, 0, 11, 0, 10, 0, 1, 27, 
-  15, 14, 26, 13, 12, 29, 7, 0, 18, 0, 
-  19, 0, 24, 25, 0, 20, 21, 0, 22, 23, 
-  16, 17, 360};
+  0, 0, 28, 0, 0, 0, 28, 0, 188, 255, 
+  219, 227, 223, 167, 239, 215, 3, 152, 85, 168, 
+  231, 235, 156, 185, 166, 171, 151, 205, 192, 0, 
+  92, 93, 88, 0, 82, 77, 359, 0, 0, 0, 
+  0, 90, 0, 0, 86, 89, 81, 0, 0, 78, 
+  80, 83, 79, 91, 84, 0, 87, 0, 0, 181, 
+  0, 0, 168, 187, 170, 169, 0, 0, 0, 183, 
+  184, 182, 186, 0, 216, 0, 0, 0, 0, 206, 
+  0, 0, 0, 0, 0, 0, 196, 0, 0, 0, 
+  190, 191, 189, 194, 198, 197, 195, 193, 208, 207, 
+  209, 0, 224, 0, 220, 0, 0, 162, 149, 161, 
+  150, 118, 119, 120, 145, 121, 146, 122, 123, 124, 
+  125, 126, 127, 128, 129, 130, 131, 132, 133, 134, 
+  147, 135, 136, 137, 138, 139, 140, 141, 142, 143, 
+  144, 148, 0, 0, 160, 256, 163, 0, 164, 0, 
+  165, 159, 0, 252, 245, 243, 250, 251, 249, 248, 
+  254, 247, 246, 244, 253, 240, 0, 228, 0, 0, 
+  232, 0, 0, 236, 0, 0, 162, 154, 0, 153, 
+  0, 158, 172, 0, 348, 348, 349, 0, 346, 0, 
+  347, 0, 350, 263, 270, 269, 277, 265, 0, 266, 
+  0, 351, 0, 358, 267, 268, 85, 273, 271, 355, 
+  352, 357, 274, 0, 285, 0, 0, 0, 0, 342, 
+  0, 359, 257, 299, 0, 0, 0, 286, 0, 0, 
+  275, 276, 0, 264, 272, 300, 301, 0, 348, 0, 
+  0, 350, 0, 343, 344, 0, 332, 356, 0, 316, 
+  317, 318, 319, 0, 312, 313, 314, 315, 340, 341, 
+  0, 0, 0, 0, 0, 304, 305, 306, 261, 259, 
+  221, 229, 225, 241, 217, 262, 0, 168, 233, 237, 
+  210, 199, 0, 0, 218, 0, 0, 0, 0, 211, 
+  0, 0, 0, 0, 0, 203, 201, 204, 202, 200, 
+  213, 212, 214, 0, 226, 0, 222, 0, 260, 168, 
+  0, 242, 257, 258, 0, 257, 0, 0, 308, 0, 
+  0, 0, 310, 0, 230, 0, 0, 234, 0, 0, 
+  238, 297, 0, 289, 298, 292, 0, 296, 0, 257, 
+  290, 0, 257, 0, 0, 309, 0, 0, 0, 311, 
+  0, 0, 0, 303, 0, 302, 85, 112, 360, 0, 
+  0, 117, 279, 282, 0, 118, 285, 121, 146, 123, 
+  124, 88, 128, 129, 82, 130, 133, 86, 89, 257, 
+  83, 91, 136, 84, 138, 87, 140, 141, 286, 143, 
+  144, 148, 0, 114, 113, 116, 100, 115, 99, 0, 
+  109, 280, 278, 0, 0, 0, 350, 0, 110, 156, 
+  157, 162, 0, 155, 0, 320, 321, 0, 348, 0, 
+  0, 350, 0, 111, 0, 0, 0, 323, 328, 326, 
+  329, 0, 0, 327, 328, 0, 324, 0, 325, 281, 
+  331, 0, 281, 330, 0, 333, 334, 0, 281, 335, 
+  336, 0, 0, 337, 0, 0, 0, 338, 339, 174, 
+  173, 0, 0, 0, 307, 0, 0, 0, 322, 294, 
+  287, 0, 295, 291, 0, 293, 283, 0, 284, 288, 
+  0, 0, 350, 0, 345, 103, 0, 0, 107, 94, 
+  0, 96, 105, 0, 97, 106, 108, 98, 104, 95, 
+  0, 101, 178, 176, 180, 177, 175, 179, 353, 6, 
+  354, 4, 2, 75, 102, 0, 0, 78, 80, 79, 
+  37, 5, 0, 76, 0, 51, 50, 49, 0, 0, 
+  51, 0, 0, 0, 52, 0, 67, 68, 0, 65, 
+  0, 66, 41, 42, 43, 44, 46, 47, 71, 45, 
+  0, 51, 0, 0, 0, 0, 0, 61, 0, 62, 
+  0, 0, 32, 0, 0, 72, 33, 0, 36, 34, 
+  30, 0, 35, 31, 0, 63, 0, 64, 156, 0, 
+  69, 73, 0, 0, 0, 0, 156, 281, 0, 70, 
+  85, 118, 285, 121, 146, 123, 124, 88, 128, 129, 
+  130, 133, 86, 89, 257, 91, 136, 84, 138, 87, 
+  140, 141, 286, 143, 144, 148, 74, 0, 59, 53, 
+  60, 54, 0, 0, 0, 0, 56, 0, 57, 58, 
+  55, 0, 0, 0, 0, 48, 0, 38, 39, 0, 
+  40, 8, 0, 0, 9, 0, 11, 0, 10, 0, 
+  1, 27, 15, 14, 26, 13, 12, 29, 7, 0, 
+  18, 0, 19, 0, 24, 25, 0, 20, 21, 0, 
+  22, 23, 16, 17, 361};
 
 const short QQmlJSGrammar::goto_default [] = {
-  7, 648, 211, 198, 209, 521, 509, 643, 656, 508, 
-  642, 646, 644, 652, 22, 649, 647, 645, 18, 520, 
-  569, 559, 566, 561, 546, 193, 197, 199, 204, 234, 
-  212, 231, 550, 620, 619, 203, 233, 26, 487, 486, 
+  7, 650, 211, 198, 209, 521, 509, 645, 658, 508, 
+  644, 648, 646, 654, 22, 651, 649, 647, 18, 520, 
+  571, 561, 568, 563, 548, 193, 197, 199, 204, 234, 
+  212, 231, 552, 622, 621, 203, 233, 26, 487, 486, 
   359, 358, 9, 357, 360, 202, 480, 361, 109, 17, 
   147, 24, 13, 146, 19, 25, 59, 23, 8, 28, 
   27, 280, 15, 274, 10, 270, 12, 272, 11, 271, 
@@ -216,896 +218,874 @@ const short QQmlJSGrammar::goto_default [] = {
   0};
 
 const short QQmlJSGrammar::action_index [] = {
-  282, 1392, 2773, 2773, 2875, 1105, 102, 105, 129, -106, 
-  -1, 23, -23, 224, -106, 378, 26, -106, -106, 718, 
-  39, 87, 207, 222, -106, -106, -106, 342, 290, 1392, 
-  -106, -106, -106, 502, -106, -106, 2569, 1880, 1392, 1392, 
-  1392, -106, 1009, 1392, -106, -106, -106, 1392, 1392, -106, 
-  -106, -106, -106, -106, -106, 1392, -106, 1392, 1392, -106, 
-  1392, 1392, 97, 236, -106, -106, 1392, 1392, 1392, -106, 
-  -106, -106, 233, 1392, 378, 1392, 1392, 1392, 1392, 461, 
-  1392, 1392, 1392, 1392, 1392, 1392, 290, 1392, 1392, 1392, 
-  144, 124, 115, 290, 290, 290, 290, 290, 461, 461, 
-  363, 1392, -78, 1392, 81, 2365, 1392, 1392, -106, -106, 
+  246, 1285, 2768, 2768, 2666, 998, 98, 198, 86, -106, 
+  26, -15, -39, 234, -106, 314, 54, -106, -106, 714, 
+  89, 151, 212, 219, -106, -106, -106, 412, 279, 1285, 
+  -106, -106, -106, 525, -106, -106, 2360, 1675, 1285, 1285, 
+  1285, -106, 902, 1285, -106, -106, -106, 1285, 1285, -106, 
+  -106, -106, -106, -106, -106, 1285, -106, 1285, 1285, -106, 
+  1285, 1285, 103, 197, -106, -106, 1285, 1285, 1285, -106, 
+  -106, -106, 214, 1285, 297, 1285, 1285, 1285, 1285, 392, 
+  1285, 1285, 1285, 1285, 1285, 1285, 213, 1285, 1285, 1285, 
+  96, 100, 101, 279, 279, 195, 190, 181, 402, 372, 
+  382, 1285, -10, 1285, 106, 2258, 1285, 1285, -106, -106, 
   -106, -106, -106, -106, -106, -106, -106, -106, -106, -106, 
   -106, -106, -106, -106, -106, -106, -106, -106, -106, -106, 
   -106, -106, -106, -106, -106, -106, -106, -106, -106, -106, 
-  -106, -106, 143, 1392, -106, -106, 78, 60, -106, 1392, 
-  -106, -106, 1392, -106, -106, -106, -106, -106, -106, -106, 
-  -106, -106, -106, -106, -106, -106, 1392, -25, 1392, 1392, 
-  92, 85, 1392, -106, 2365, 1392, 1392, -106, 146, -106, 
-  46, -106, -106, 52, 359, 362, 104, 86, -106, 438, 
-  -106, 56, 2773, -106, -106, -106, -106, -106, 164, -106, 
-  393, -106, 41, -106, -106, -106, 53, -106, -106, -106, 
-  2773, -106, -106, 600, -106, 597, 147, 2875, 64, 82, 
-  48, 3079, 1392, -106, 90, 1392, 66, -106, 33, 68, 
-  -106, -106, 538, -106, -106, -106, -106, 88, 538, 35, 
-  40, 2773, 47, -106, -106, 2875, -106, -106, 151, -106, 
-  -106, -106, -106, 145, -106, -106, -106, -106, -106, -106, 
-  72, 65, 1392, 107, 155, -106, -106, -106, 1586, -106, 
-  58, 59, 50, -106, 279, 75, 62, 821, 89, 93, 
-  295, 234, 447, 1392, 291, 1392, 1392, 1392, 1392, 316, 
-  1392, 1392, 1392, 1392, 1392, 290, 290, 290, 290, 290, 
-  322, 326, 332, 1392, 50, 1392, 74, 1392, -106, 718, 
-  1392, -106, 1392, 55, 42, 1392, 38, 2875, -106, 1392, 
-  132, 2875, -106, 1392, 84, 1392, 1392, 209, 106, 1392, 
-  -106, 80, 130, 77, -106, -106, 1392, -106, 407, 1392, 
-  -106, -48, 1392, -43, 2875, -106, 1392, 126, 2875, -106, 
-  1392, 128, 2875, 3, 2875, -106, 8, -106, 6, -34, 
-  15, -106, -106, 2875, -31, 615, 18, 546, 100, 1392, 
-  2875, 19, -8, 493, 2467, -16, 707, 5, 4, 1491, 
-  2467, 2, -28, 0, 1392, -2, -30, 1392, -5, 1392, 
-  -32, -26, 2671, -106, -106, -106, -106, -106, -106, 1392, 
-  -106, -106, -106, 21, -17, 22, 2773, -6, -106, 206, 
-  -106, 1392, -10, -106, 91, -106, -106, 17, 538, 30, 
-  31, 2773, -3, -106, 1392, 111, 34, -106, 24, -106, 
-  25, 101, 1392, -106, 27, 28, -106, -22, -106, 2875, 
-  -106, 120, 2875, -106, 227, -106, -106, 125, 2875, 16, 
-  -106, 12, 13, -106, 453, -20, 14, -106, -106, -106, 
-  -106, 1392, 160, 2875, -106, 1392, 113, 2875, -106, 37, 
-  -106, 171, -106, -106, 1392, -106, -106, 441, -106, -106, 
-  -33, -27, 2773, -4, -106, -106, 109, 1684, -106, -106, 
-  1978, -106, -106, 1782, -106, -106, -106, -106, -106, -106, 
-  127, -106, -106, -106, -106, -106, -106, -106, -106, -106, 
-  2773, -106, -106, -106, 148, -24, 915, 176, -29, 10, 
-  -106, -106, 240, -106, 208, 1, -106, -106, 349, 195, 
-  -106, 20, 339, 135, -106, -106, 191, -106, 2073, -106, 
-  -106, -106, -106, -106, -106, -106, -106, -106, 221, 29, 
-  538, 152, 7, 538, 167, -106, 11, -106, 915, 114, 
-  -106, 32, 915, -106, -106, 1201, -106, -106, -106, 1297, 
-  -106, -106, 169, -106, 2073, -106, 280, -15, -106, -106, 
-  181, 457, 9, 2263, 271, 2977, 83, -106, 103, 615, 
-  67, 557, 116, 1392, 2875, 61, 43, 526, 45, 1009, 
-  51, 73, 1491, 71, 49, 69, 1392, 63, 44, 1392, 
-  54, 1392, 36, 57, -106, 213, -106, 217, -106, 79, 
-  70, 343, 194, 346, -106, 96, -106, -106, -106, 2168, 
-  799, 1880, 76, -106, 134, -106, -106, -15, -106, -106, 
-  915, 915, 112, 915, -106, 259, -106, 153, -106, -106, 
-  110, 99, -106, -106, -106, -106, -106, 450, -106, 157, 
-  -106, 98, -106, -106, 538, -106, -106, 139, -106, -106, 
-  -106, -106, -106, 
+  -106, -106, 136, 1285, -106, -106, 65, 29, -106, 1285, 
+  -106, -106, 1285, -106, -106, -106, -106, -106, -106, -106, 
+  -106, -106, -106, -106, -106, -106, 1285, -46, 1285, 1285, 
+  30, 27, 1285, -106, 2258, 1285, 1285, -106, 130, -106, 
+  -31, -106, -106, -16, 520, 520, 71, 21, -106, 421, 
+  -106, 38, 2768, -106, -106, -106, -106, -106, 237, -106, 
+  520, -106, -52, -106, -106, -106, 23, -106, -106, -106, 
+  2768, -106, -106, 596, -106, 588, 141, 2666, 2, 1, 
+  -1, 2972, 1285, -106, 13, 1285, 28, -106, -28, -30, 
+  -106, -106, 435, -106, -106, -106, -106, 60, 520, 52, 
+  67, 2768, 64, -106, -106, 2666, -106, -106, 126, -106, 
+  -106, -106, -106, 73, -106, -106, -106, -106, -106, -106, 
+  -18, 34, 1285, 156, 168, -106, -106, -106, 1479, -106, 
+  79, 40, 48, -106, 312, 75, 42, 672, 80, 143, 
+  331, 279, 442, 1285, 316, 1285, 1285, 1285, 1285, 341, 
+  1285, 1285, 1285, 1285, 1285, 279, 360, 360, 196, 225, 
+  443, 357, 351, 1285, -4, 1285, 63, 1285, -106, 714, 
+  1285, -106, 1285, 102, 68, 1285, 62, 2666, -106, 1285, 
+  147, 2666, -106, 1285, 56, 1285, 1285, 91, 87, 1285, 
+  -106, 81, 149, 74, -106, -106, 1285, -106, 439, 1285, 
+  -106, -44, 1285, -42, 2666, -106, 1285, 153, 2666, -106, 
+  1285, 154, 2666, 10, 2666, -106, 0, -106, 15, -54, 
+  92, -106, -106, 2666, -50, 539, -7, 536, 121, 1285, 
+  2666, 5, -8, 445, 2462, 24, 902, 51, 50, 1384, 
+  2462, 47, 20, 46, 1285, 44, 19, 1285, 41, 1285, 
+  3, -5, 2564, -106, -106, -106, -106, -106, -106, 1285, 
+  -106, -106, -106, 6, -17, 11, 2768, -9, -106, 249, 
+  -106, 1285, -13, -106, 105, -106, -106, -12, 520, -41, 
+  -20, 2768, -45, -106, 1285, 115, 12, -106, 36, -106, 
+  31, 122, 1285, -106, 58, 4, -106, -51, -106, 2666, 
+  -106, 146, 2666, -106, 235, -106, -106, 140, 2666, 93, 
+  -106, 84, 76, -106, 520, 17, 33, -106, -106, -106, 
+  -106, 1285, 134, 2666, -106, 1285, 125, 2666, -106, 55, 
+  -106, 163, -106, -106, 1285, -106, -106, 520, -106, -106, 
+  7, 45, 2768, 32, -106, -106, 120, 1773, -106, -106, 
+  1577, -106, -106, 1871, -106, -106, -106, -106, -106, -106, 
+  113, -106, -106, -106, -106, -106, -106, -106, -106, -106, 
+  2768, -106, -106, -106, 109, 35, 808, 206, 49, 61, 
+  -106, -106, 229, -106, 203, 37, -106, -106, 611, 183, 
+  -106, 124, 39, 389, -106, 97, -106, -106, 252, -106, 
+  2061, -106, -106, -106, -106, -106, -106, -106, -106, -106, 
+  269, -23, 611, 243, 180, 424, 232, -106, 16, -106, 
+  808, 162, -106, 22, 808, -106, -106, 1190, -106, -106, 
+  -106, 1094, -106, -106, 248, -106, 2061, -106, 305, -24, 
+  -106, -106, 215, 457, 18, 2156, 292, 2870, -11, -106, 
+  14, 599, 9, 528, 119, 1285, 2666, 8, 70, 514, 
+  72, 902, 95, 90, 1384, 85, 59, 77, 1285, 110, 
+  83, 1285, 104, 1285, 82, 78, -106, 205, -106, 236, 
+  -106, 57, 25, 611, 167, 517, -106, 107, -106, -106, 
+  -106, 1966, 808, 1675, 43, -106, 155, -106, -106, 53, 
+  -106, -106, 808, 808, 108, 808, -106, 289, -106, 117, 
+  -106, -106, 150, 157, -106, -106, -106, -106, -106, 364, 
+  -106, 226, -106, 69, -106, -106, 432, -106, -106, 88, 
+  -106, -106, -106, -106, -106, 
 
-  -111, 6, 66, 84, 80, 306, 43, -111, -111, -111, 
-  -111, -111, -111, -111, -111, -111, -111, -111, -111, -23, 
+  -111, 8, 65, 83, 84, 317, 1, -111, -111, -111, 
+  -111, -111, -111, -111, -111, -111, -111, -111, -111, -77, 
   -111, -111, -111, -111, -111, -111, -111, -111, -111, 96, 
-  -111, -111, -111, 51, -111, -111, 60, 35, 61, 95, 
-  92, -111, 93, 72, -111, -111, -111, 86, 85, -111, 
-  -111, -111, -111, -111, -111, 82, -111, 81, 136, -111, 
-  77, 76, -111, -111, -111, -111, 73, 89, 127, -111, 
-  -111, -111, -111, 125, -111, 124, 54, 120, 99, -111, 
-  113, 111, 110, 109, 107, 103, -111, 102, 100, 119, 
-  -111, -111, -111, -111, -111, -111, -111, -111, -111, -111, 
-  -111, 52, -111, 49, -111, 62, 44, 28, -111, -111, 
+  -111, -111, -111, 2, -111, -111, -5, -28, 12, 106, 
+  95, -111, 61, 55, -111, -111, -111, 63, 70, -111, 
+  -111, -111, -111, -111, -111, 54, -111, 172, 177, -111, 
+  180, 191, -111, -111, -111, -111, 197, 202, 203, -111, 
+  -111, -111, -111, 210, -111, 209, 195, 109, 116, -111, 
+  146, 125, 126, 127, 135, 138, -111, 141, 144, 110, 
   -111, -111, -111, -111, -111, -111, -111, -111, -111, -111, 
+  -111, 150, -111, 155, -111, 192, 4, -33, -111, -111, 
   -111, -111, -111, -111, -111, -111, -111, -111, -111, -111, 
   -111, -111, -111, -111, -111, -111, -111, -111, -111, -111, 
-  -111, -111, -111, 25, -111, -111, -111, -111, -111, 18, 
-  -111, -111, 16, -111, -111, -111, -111, -111, -111, -111, 
-  -111, -111, -111, -111, -111, -111, 57, -111, 40, 13, 
-  -111, -111, 4, -111, 269, 42, 70, -111, -111, -111, 
-  -111, -111, -111, -111, 26, 69, -111, -111, -111, 22, 
-  -111, -111, 15, -111, -111, -111, -111, -111, -111, -111, 
-  14, -111, -111, -111, -111, -111, -111, -111, -111, -111, 
-  75, -111, -111, 10, -111, 32, -111, 74, -111, 24, 
-  -111, 225, 46, -111, -111, 50, 41, -111, -111, -111, 
-  -111, -111, 47, -111, -111, -111, -111, -111, 214, -111, 
-  -111, 224, -111, -111, -111, 246, -111, -111, -111, -111, 
   -111, -111, -111, -111, -111, -111, -111, -111, -111, -111, 
-  -111, -111, 27, -111, -111, -111, -111, -111, 117, -111, 
+  -111, -111, -111, -9, -111, -111, -111, -111, -111, 7, 
+  -111, -111, 40, -111, -111, -111, -111, -111, -111, -111, 
+  -111, -111, -111, -111, -111, -111, 99, -111, 52, 31, 
+  -111, -111, 30, -111, 253, 44, 87, -111, -111, -111, 
+  -111, -111, -111, -111, 45, 86, -111, -111, -111, 41, 
+  -111, -111, 5, -111, -111, -111, -111, -111, -111, -111, 
+  50, -111, -111, -111, -111, -111, -111, -111, -111, -111, 
+  154, -111, -111, 26, -111, 49, -111, 330, -111, 28, 
+  -111, 248, 27, -111, -111, 124, 51, -111, -111, -111, 
+  -111, -111, 46, -111, -111, -111, -111, -111, 196, -111, 
+  -111, 185, -111, -111, -111, 194, -111, -111, -111, -111, 
   -111, -111, -111, -111, -111, -111, -111, -111, -111, -111, 
-  -111, -111, 17, 236, -111, 239, 242, 250, 254, -111, 
-  199, 171, 200, 202, 203, -111, -111, -111, -111, -111, 
-  -111, -111, -111, 264, -111, 265, -111, 213, -111, -111, 
-  267, -111, 260, -111, -111, 262, -111, 253, -111, 45, 
-  -111, 83, -111, 222, -111, 223, 226, -111, -111, 229, 
-  -111, -111, -111, -111, -111, -111, 238, -111, 105, 118, 
-  -111, -111, 129, -111, 87, -111, 36, -111, 183, -111, 
-  34, -111, 187, -111, 192, -111, -111, -111, -111, -111, 
-  -111, -111, -111, 193, -111, 9, -111, 23, -111, 144, 
-  195, -111, -111, 20, 184, -111, 189, -111, -111, 31, 
-  164, -111, -111, -111, 21, -111, 11, 158, -111, 161, 
-  -111, -111, 188, -111, -111, -111, -111, -111, -111, 33, 
-  -111, -111, -111, -111, -111, -111, 191, -111, -111, -111, 
-  -111, 176, -111, -111, -111, -111, -111, -111, 198, -111, 
-  -111, 201, -111, -111, 65, -111, -111, -111, -111, -111, 
-  -29, -111, 58, -111, -27, -111, -111, -111, -111, 268, 
-  -111, -111, 266, -111, -111, -111, -111, -111, 219, -46, 
-  -111, -111, 38, -111, 39, -111, 37, -111, -111, -111, 
-  -111, 53, -111, 220, -111, 48, -111, 221, -111, -111, 
-  -111, -111, -111, -111, 30, -111, -111, 137, -111, -111, 
-  -111, -111, 206, -111, -111, -111, -111, 29, -111, -111, 
-  207, -111, -111, 1, -111, -111, -111, -111, -111, -111, 
+  -111, -111, 15, -111, -111, -111, -111, -111, 74, -111, 
   -111, -111, -111, -111, -111, -111, -111, -111, -111, -111, 
-  216, -111, -111, -111, -111, -111, 0, -111, -111, -111, 
-  -111, -111, -111, -111, -30, -111, -111, -111, -11, -13, 
-  -111, -111, 5, -111, -111, -111, -111, -111, 336, -111, 
+  -111, -111, -16, 230, -111, 233, 269, 251, 265, -111, 
+  80, 81, 82, 88, 89, -111, -111, -111, -111, -111, 
+  -111, -111, -111, 216, -111, 255, -111, 259, -111, -111, 
+  223, -111, 68, -111, -111, 217, -111, 236, -111, 24, 
+  -111, 244, -111, 227, -111, 226, 257, -111, -111, 263, 
+  -111, -111, -111, -111, -111, -111, 249, -111, 113, 163, 
+  -111, -111, 212, -111, 173, -111, 48, -111, 211, -111, 
+  53, -111, 206, -111, 204, -111, -111, -111, -111, -111, 
+  -111, -111, -111, 199, -111, 23, -111, 25, -111, 134, 
+  175, -111, -111, 37, 200, -111, 222, -111, -111, 57, 
+  56, -111, -111, -111, 124, -111, 32, 43, -111, 105, 
+  -111, -111, 139, -111, -111, -111, -111, -111, -111, 38, 
+  -111, -111, -111, -111, -111, -111, 75, -111, -111, -111, 
+  -111, 71, -111, -111, -111, -111, -111, -111, 72, -111, 
+  -111, 85, -111, -111, 59, -111, -111, -111, -111, -111, 
+  -37, -111, 62, -111, -58, -111, -111, -111, -111, 286, 
+  -111, -111, 250, -111, -111, -111, -111, -111, 153, -57, 
+  -111, -111, 33, -111, 34, -111, 36, -111, -111, -111, 
+  -111, 47, -111, 77, -111, 29, -111, 67, -111, -111, 
+  -111, -111, -111, -111, 42, -111, -111, 214, -111, -111, 
+  -111, -111, 229, -111, -111, -111, -111, 35, -111, -111, 
+  145, -111, -111, 3, -111, -111, -111, -111, -111, -111, 
   -111, -111, -111, -111, -111, -111, -111, -111, -111, -111, 
-  7, -3, -111, -8, -111, -111, -111, -111, 174, -111, 
-  -111, -111, 172, -111, -111, 323, -111, -111, -111, 334, 
-  -111, -111, -111, -111, 372, -111, -111, -5, -111, -111, 
-  -24, -7, -111, 439, -111, 248, -9, -111, -111, 8, 
-  -111, -17, -111, 179, 342, -111, -111, 2, -111, 190, 
-  -111, -111, 19, -111, -111, -111, 12, -111, -20, 68, 
-  -111, 63, -111, -111, -111, -111, -111, -26, -111, -111, 
-  -111, 3, -1, 79, -111, -111, -111, -111, -111, 354, 
-  67, 313, -4, -111, -111, -111, -111, -19, -111, -111, 
-  -14, -10, 88, 233, -111, -111, -111, -111, -111, -111, 
-  -111, -111, -111, -111, -111, -111, -111, -6, -111, -111, 
-  -111, -111, -111, -111, -2, -111, -111, -111, -111, -111, 
-  -111, -111, -111};
+  207, -111, -111, -111, -111, -111, 39, -111, -111, -111, 
+  -111, -111, -111, -111, -24, -111, -111, -111, -12, -27, 
+  -111, -111, -111, -14, -111, -111, -111, -111, -111, -111, 
+  333, -111, -111, -111, -111, -111, -111, -111, -111, -111, 
+  -111, -111, 6, 22, -111, 20, -111, -111, -111, -111, 
+  159, -111, -111, -111, 246, -111, -111, 332, -111, -111, 
+  -111, 436, -111, -111, -111, -111, 388, -111, -111, 18, 
+  -111, -111, -6, 19, -111, 352, -111, 225, 14, -111, 
+  -111, 13, -111, 11, -111, 167, 136, -111, -111, 10, 
+  -111, 64, -111, -111, 9, -111, -111, -111, 124, -111, 
+  0, 69, -111, 60, -111, -111, -111, -111, -111, -10, 
+  -111, -111, -111, -1, -11, -2, -111, -111, -111, -111, 
+  -111, 370, 142, 315, -3, -111, -111, -111, -111, 17, 
+  -111, -111, -13, 21, 133, 221, -111, -111, -111, -111, 
+  -111, -111, -111, -111, -111, -111, -111, -111, -111, 16, 
+  -111, -111, -111, -111, -111, -111, -15, -111, -111, -111, 
+  -111, -111, -111, -111, -111};
 
 const short QQmlJSGrammar::action_info [] = {
-  73, 103, -141, 448, 461, -138, 482, -136, 424, -114, 
-  465, -115, -133, 342, 392, 245, 583, 344, 565, 354, 
-  350, 398, 399, 101, 402, -144, -125, 481, 268, 432, 
-  432, 553, 432, 438, 143, 439, 452, 580, 529, 615, 
-  456, 166, 524, 405, 532, 558, 448, 448, 454, 408, 
-  413, 484, 423, 418, 474, 406, 103, 404, -133, 283, 
-  245, -141, 0, 143, 421, 565, 551, 428, -125, 461, 
-  -138, 101, 461, 241, -144, 283, -136, 448, -114, 268, 
-  -115, 350, 73, 307, 350, 424, 149, 622, 185, 192, 
-  420, 323, 172, 465, 166, 240, 244, 336, 317, 448, 
-  268, 262, 243, 315, 465, 672, 181, 303, 346, 565, 
-  245, 435, 189, 329, 174, 143, 565, 490, 184, 143, 
-  151, 143, 562, 312, 238, 174, 424, 442, 143, 305, 
-  625, 451, 303, 175, 143, 143, 143, 168, 338, 64, 
-  143, 169, 562, 325, 175, 452, 191, 326, 0, 261, 
-  65, 143, 416, 415, 143, 60, 436, 627, 626, 663, 
-  662, 259, 258, 174, 60, 491, 61, 264, 143, 60, 
-  563, 426, 143, 467, 556, 61, 574, 259, 258, 477, 
-  61, 530, 175, 0, 60, 0, 348, 501, 352, 0, 
-  635, 339, 321, 640, 641, 61, 535, 534, 538, 144, 
-  669, 668, 179, 640, 641, 549, 257, 256, 259, 258, 
-  530, 323, 252, 251, 671, 670, 267, 265, 666, 665, 
-  463, 174, 174, 530, 530, 236, 235, 527, 557, 555, 
-  575, 573, 478, 476, 66, 143, 174, 525, 526, 105, 
-  175, 175, 411, 176, 266, 66, 530, 629, 66, 617, 
-  664, 527, 539, 537, 0, 175, 527, 411, 106, 87, 
-  107, 88, 526, 0, 0, 0, 0, 526, 0, 527, 
-  527, 0, 89, 565, 618, 616, 0, 0, 0, 67, 
-  526, 526, 0, 527, 0, 68, 174, 0, 446, 445, 
-  67, 0, 527, 67, 526, 174, 68, 285, 286, 68, 
-  0, 0, 0, 526, -101, 175, 659, 176, 0, 285, 
-  286, 0, 0, -101, 175, 87, 176, 88, 290, 291, 
-  660, 658, 0, 0, 287, 288, 0, 292, 89, 0, 
-  293, 0, 294, 0, 630, 0, 287, 288, 0, 290, 
-  291, 0, 0, 0, 0, 290, 291, 0, 292, 290, 
-  291, 293, 657, 294, 292, 290, 291, 293, 292, 294, 
-  0, 293, 0, 294, 292, 80, 81, 293, 35, 294, 
-  0, 0, 35, 82, 83, 35, 0, 84, 35, 85, 
-  6, 5, 4, 1, 3, 2, 80, 81, 35, 0, 
-  0, 35, 0, 0, 82, 83, 75, 76, 84, 0, 
-  85, 0, 0, 0, 0, 49, 52, 50, 0, 49, 
-  52, 50, 49, 52, 50, 49, 52, 50, 0, 0, 
-  0, 0, 35, 77, 78, 49, 52, 50, 49, 52, 
-  50, 0, 0, 46, 34, 51, 35, 46, 34, 51, 
+  -145, 398, 101, 244, 438, 402, 465, 245, 461, 567, 
+  423, 439, -126, 421, 553, -126, -145, 342, 344, 420, 
+  185, 245, 567, 392, 418, 585, 354, 73, 268, 181, 
+  245, 465, 166, 101, 172, 350, 432, 184, 268, 461, 
+  103, 432, 404, 405, 406, 428, 408, 413, -142, 424, 
+  560, -139, 448, -137, -115, 567, 424, -116, -134, 261, 
+  350, 448, 143, 432, 283, 624, 448, 481, 534, 103, 
+  262, 192, 474, 149, 529, 305, 567, 456, 482, 189, 
+  283, 191, 323, 307, -137, 627, 567, 484, 303, 151, 
+  617, 166, -115, 323, 329, 424, 238, -116, 336, 399, 
+  241, 524, -134, 312, 303, 346, 268, 73, 350, 448, 
+  143, -142, 240, 452, 465, 582, 448, -139, 461, 243, 
+  454, 143, 317, 143, 174, 0, 60, 305, 490, 315, 
+  665, 664, 435, 143, 257, 256, 60, 61, 143, 532, 
+  60, 60, 143, 175, 143, 64, 451, 61, 533, 671, 
+  670, 61, 61, 442, 143, 143, 65, 338, 537, 536, 
+  452, 143, 143, 564, 143, 174, 416, 415, 629, 628, 
+  564, 477, 174, 501, 0, 426, 491, 436, 673, 672, 
+  259, 258, 259, 258, 175, 467, 179, 252, 251, 642, 
+  643, 175, 144, 325, 463, 532, 530, 326, 674, 642, 
+  643, 168, 259, 258, 555, 169, 87, 321, 88, 66, 
+  339, 637, 530, 348, 352, 87, 264, 88, 565, 89, 
+  87, 87, 88, 88, 478, 476, 66, 174, 89, 267, 
+  265, 66, 525, 89, 89, 551, 631, 0, 87, 558, 
+  88, 619, 527, 143, 530, 143, 175, 0, 176, 105, 
+  87, 89, 88, 526, 67, 576, 0, 266, 527, 540, 
+  68, 0, 567, 89, 174, 530, 620, 618, 106, 526, 
+  107, 67, 530, 0, 0, 0, 67, 68, 527, 0, 
+  0, 527, 68, 175, 174, 411, 0, 668, 667, 526, 
+  527, 0, 526, 559, 557, 0, 446, 445, 236, 235, 
+  0, 526, 0, 175, 87, 411, 88, 174, 0, 577, 
+  575, 527, 0, 541, 539, 75, 76, 89, 527, 666, 
+  174, 0, 526, 632, 0, -102, 175, 0, 176, 526, 
+  285, 286, 75, 76, 285, 286, 661, 0, -102, 175, 
+  0, 176, 77, 78, 6, 5, 4, 1, 3, 2, 
+  662, 660, 0, 0, 290, 291, 0, 287, 288, 77, 
+  78, 287, 288, 292, 290, 291, 293, 0, 294, 0, 
+  0, 0, 0, 292, 290, 291, 293, 0, 294, 0, 
+  290, 291, 659, 292, 0, 87, 293, 88, 294, 292, 
+  0, 0, 293, 35, 294, 80, 81, 0, 89, 0, 
+  0, 0, 0, 82, 83, 80, 81, 84, 0, 85, 
+  0, 0, 0, 82, 83, 80, 81, 84, 35, 85, 
+  0, 0, 0, 82, 83, 80, 81, 84, 0, 85, 
+  49, 52, 50, 82, 83, 80, 81, 84, 0, 85, 
+  0, 0, 0, 82, 83, 0, 0, 84, 0, 85, 
+  35, 0, 0, 35, 0, 49, 52, 50, 46, 34, 
+  51, 35, 0, 0, 35, 0, 290, 291, 35, 0, 
+  0, 35, 532, 0, 35, 292, 0, 0, 293, 0, 
+  294, 184, 0, 46, 34, 51, 35, 49, 52, 50, 
+  49, 52, 50, 0, 0, 0, 0, 0, 49, 52, 
+  50, 49, 52, 50, 0, 49, 52, 50, 49, 52, 
+  50, 49, 52, 50, 0, 46, 34, 51, 46, 34, 
+  51, 0, 0, 49, 52, 50, 46, 34, 51, 46, 
+  34, 51, 532, 46, 34, 51, 46, 34, 51, 46, 
+  34, 51, 0, 35, 0, 0, 35, 0, 0, 35, 
+  184, 46, 34, 51, 35, 0, 0, 35, 0, 0, 
+  0, 184, 0, 0, 0, 35, 0, 0, 35, 0, 
+  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
+  49, 52, 50, 49, 52, 50, 49, 52, 50, 255, 
+  254, 49, 52, 50, 49, 52, 50, 255, 254, 0, 
+  250, 249, 49, 52, 50, 49, 52, 50, 46, 34, 
+  51, 46, 34, 51, 46, 34, 51, 35, 0, 46, 
+  34, 51, 46, 34, 51, 35, 532, 0, 35, 0, 
   46, 34, 51, 46, 34, 51, 0, 0, 0, 0, 
-  0, 0, 0, 46, 34, 51, 46, 34, 51, 49, 
-  52, 50, 0, 0, 0, 0, 0, 35, 0, 0, 
-  35, 0, 0, 49, 52, 50, 35, 0, 0, 35, 
-  0, 0, 35, 0, 80, 81, 35, 46, 34, 51, 
-  0, 0, 82, 83, 0, 0, 84, 0, 85, 0, 
-  0, 46, 34, 51, 49, 52, 50, 49, 52, 50, 
-  0, 0, 0, 49, 52, 50, 49, 52, 50, 49, 
-  52, 50, 35, 49, 52, 50, 0, 0, 0, 184, 
-  0, 35, 46, 34, 51, 46, 34, 51, 184, 0, 
-  0, 46, 34, 51, 46, 34, 51, 46, 34, 51, 
-  0, 46, 34, 51, 0, 35, 0, 0, 0, 49, 
-  52, 50, 184, 0, 0, 0, 0, 35, 49, 52, 
-  50, 0, 0, 0, 0, 35, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 35, 46, 34, 51, 
-  0, 0, 49, 52, 50, 0, 46, 34, 51, 0, 
-  0, 0, 0, 0, 49, 52, 50, 255, 254, 0, 
-  0, 0, 49, 52, 50, 0, 0, 0, 255, 254, 
-  46, 34, 51, 49, 52, 50, 35, 0, 0, 35, 
+  35, 0, 0, 0, 0, 0, 0, 0, 0, 255, 
+  254, 0, 0, 0, 49, 52, 50, 250, 249, 0, 
+  250, 249, 49, 52, 50, 49, 52, 50, 0, 0, 
+  0, 0, 0, 0, 0, 153, 0, 49, 52, 50, 
+  0, 0, 46, 34, 51, 154, 0, 0, 0, 155, 
+  46, 34, 51, 46, 34, 51, 0, 0, 156, 0, 
+  157, 0, 0, 319, 0, 46, 34, 51, 0, 0, 
+  0, 158, 0, 159, 64, 0, 0, 153, 0, 0, 
+  0, 160, 0, 0, 161, 65, 0, 154, 0, 0, 
+  162, 155, 0, 0, 0, 0, 163, 0, 0, 0, 
+  156, 0, 157, 0, 0, 0, 0, 0, 0, 0, 
+  0, 0, 164, 158, 0, 159, 64, 0, 0, 0, 
+  0, 0, 0, 160, 0, 0, 161, 65, 0, 0, 
+  0, 0, 162, 0, 0, 0, 0, 0, 163, 0, 
+  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
+  0, 0, 0, 0, 164, 0, 0, 0, 0, 0, 
+  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
+  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
+  30, 31, 0, 0, 0, 0, 0, 0, 0, 0, 
+  33, 0, 0, 0, 0, 0, 0, 35, 0, 0, 
+  0, 36, 37, 0, 38, 0, 0, 0, 0, 0, 
+  0, 516, 0, 0, 0, 45, 0, 0, 0, 0, 
+  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
+  0, 0, 0, 53, 49, 52, 50, 0, 54, 0, 
+  0, 0, 0, 0, 0, 0, 0, 0, 0, 44, 
+  56, 32, 0, 0, 0, 41, 0, 0, 0, 0, 
   0, 0, 46, 34, 51, 0, 0, 0, 0, 0, 
-  46, 34, 51, 0, 35, 0, 0, 0, 0, 0, 
-  0, 46, 34, 51, 0, 0, 0, 0, 255, 254, 
-  0, 250, 249, 49, 52, 50, 49, 52, 50, 0, 
-  0, 0, 0, 0, 0, 0, 250, 249, 0, 0, 
-  0, 49, 52, 50, 0, 0, 0, 0, 0, 0, 
-  0, 46, 34, 51, 46, 34, 51, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 0, 46, 
-  34, 51, 0, 0, 0, 0, 0, 0, 0, 30, 
-  31, 153, 0, 0, 0, 0, 0, 0, 0, 33, 
-  0, 154, 0, 0, 0, 155, 35, 0, 0, 0, 
-  36, 37, 0, 38, 156, 0, 157, 0, 0, 0, 
-  42, 0, 0, 0, 45, 0, 0, 158, 0, 159, 
-  64, 0, 0, 0, 0, 0, 0, 160, 0, 0, 
-  161, 65, 53, 49, 52, 50, 162, 54, 0, 0, 
-  0, 0, 163, 0, 0, 0, 0, 0, 44, 56, 
-  32, 0, 0, 0, 41, 0, 0, 0, 164, 0, 
-  0, 46, 34, 51, 0, 0, 0, 0, 0, 0, 
-  0, 30, 31, 0, 0, 0, 0, 0, 0, 0, 
-  0, 33, 0, 0, 153, 0, 0, 0, 35, 0, 
-  0, 0, 36, 37, 154, 38, 0, 0, 155, 0, 
-  0, 0, 516, 0, 0, 0, 45, 156, 0, 157, 
-  0, 0, 319, 0, 0, 0, 0, 0, 0, 0, 
-  158, 0, 159, 64, 53, 49, 52, 50, 0, 54, 
-  160, 0, 0, 161, 65, 0, 0, 0, 0, 162, 
-  44, 56, 32, 0, 0, 163, 41, 0, 0, 0, 
-  0, 0, 0, 46, 34, 51, 0, 0, 0, 0, 
-  0, 164, 0, 0, 0, 0, 0, 0, 0, 0, 
+  0, 0, 0, 0, 30, 31, 0, 0, 0, 0, 
+  0, 0, 0, 0, 33, 0, 0, 0, 0, 0, 
+  0, 35, 0, 0, 0, 36, 37, 0, 38, 0, 
+  0, 0, 0, 0, 0, 42, 0, 0, 0, 45, 
+  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
+  0, 0, 0, 0, 0, 0, 0, 53, 49, 52, 
+  50, 0, 54, 0, 0, 0, 0, 0, 0, 0, 
+  0, 0, 0, 44, 56, 32, 0, 0, 0, 41, 
+  0, 0, 0, 0, 0, 0, 46, 34, 51, 0, 
+  0, 0, 0, 0, 0, 0, 0, 0, 515, 0, 
+  30, 31, 0, 0, 0, 0, 0, 0, 0, 0, 
+  219, 0, 0, 0, 0, 0, 0, 35, 0, 0, 
+  0, 36, 37, 0, 38, 0, 0, 0, 0, 0, 
+  0, 516, 0, 0, 0, 45, 0, 0, 0, 0, 
   0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 30, 31, 0, 
+  0, 0, 0, 53, 517, 519, 518, 0, 54, 0, 
+  0, 0, 0, 227, 0, 0, 0, 0, 0, 44, 
+  56, 32, 214, 0, 0, 41, 0, 0, 0, 0, 
+  0, 0, 46, 34, 51, 0, 0, 0, 0, 0, 
+  0, 0, 0, 0, 515, 0, 30, 31, 0, 0, 
+  0, 0, 0, 0, 0, 0, 219, 0, 0, 0, 
+  0, 0, 0, 35, 0, 0, 0, 36, 37, 0, 
+  38, 0, 0, 0, 0, 0, 0, 516, 0, 0, 
+  0, 45, 0, 0, 0, 0, 0, 0, 0, 572, 
+  0, 0, 0, 0, 0, 0, 0, 0, 0, 53, 
+  517, 519, 518, 0, 54, 0, 0, 0, 0, 227, 
+  0, 0, 0, 0, 0, 44, 56, 32, 214, 0, 
+  0, 41, 0, 0, 0, 0, 0, 0, 46, 34, 
+  51, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
+  515, 0, 30, 31, 0, 0, 0, 0, 0, 0, 
+  0, 0, 219, 0, 0, 0, 0, 0, 0, 35, 
+  0, 0, 0, 36, 37, 0, 38, 0, 0, 0, 
+  0, 0, 0, 516, 0, 0, 0, 45, 0, 0, 
+  0, 0, 0, 0, 0, 569, 0, 0, 0, 0, 
+  0, 0, 0, 0, 0, 53, 517, 519, 518, 0, 
+  54, 0, 0, 0, 0, 227, 0, 0, 0, 0, 
+  0, 44, 56, 32, 214, 0, 0, 41, 0, 0, 
+  0, 0, 0, 0, 46, 34, 51, 0, 0, 0, 
+  0, 0, 0, 0, 0, 0, 29, 30, 31, 0, 
   0, 0, 0, 0, 0, 0, 0, 33, 0, 0, 
   0, 0, 0, 0, 35, 0, 0, 0, 36, 37, 
-  0, 38, 0, 0, 0, 0, 0, 0, 516, 0, 
-  0, 0, 45, 0, 0, 0, 0, 0, 0, 0, 
+  0, 38, 0, 0, 0, 39, 0, 40, 42, 43, 
+  0, 0, 45, 0, 0, 0, 47, 0, 48, 0, 
   0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-  53, 49, 52, 50, 0, 54, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 44, 56, 32, 0, 
+  53, 49, 52, 50, 0, 54, 0, 55, 0, 57, 
+  0, 58, 0, 0, 0, 0, 44, 56, 32, 0, 
   0, 0, 41, 0, 0, 0, 0, 0, 0, 46, 
   34, 51, 0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 30, 31, 0, 0, 0, 0, 0, 0, 0, 
+  0, -135, 0, 0, 0, 29, 30, 31, 0, 0, 
+  0, 0, 0, 0, 0, 0, 33, 0, 0, 0, 
+  0, 0, 0, 35, 0, 0, 0, 36, 37, 0, 
+  38, 0, 0, 0, 39, 0, 40, 42, 43, 0, 
+  0, 45, 0, 0, 0, 47, 0, 48, 0, 0, 
+  0, 0, 0, 0, 0, 0, 0, 0, 0, 53, 
+  49, 52, 50, 0, 54, 0, 55, 0, 57, 0, 
+  58, 0, 0, 0, 0, 44, 56, 32, 0, 0, 
+  0, 41, 0, 0, 0, 0, 0, 0, 46, 34, 
+  51, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
+  29, 30, 31, 0, 0, 0, 0, 0, 0, 0, 
   0, 33, 0, 0, 0, 0, 0, 0, 35, 0, 
-  0, 0, 36, 37, 0, 38, 0, 0, 0, 0, 
-  0, 0, 42, 0, 0, 0, 45, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
+  0, 0, 36, 37, 0, 38, 0, 0, 0, 39, 
+  0, 40, 42, 43, 0, 0, 45, 0, 0, 0, 
+  47, 0, 48, 0, 0, 0, 0, 0, 0, 0, 
   0, 0, 0, 0, 53, 49, 52, 50, 0, 54, 
-  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
+  0, 55, 0, 57, 282, 58, 0, 0, 0, 0, 
   44, 56, 32, 0, 0, 0, 41, 0, 0, 0, 
   0, 0, 0, 46, 34, 51, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 515, 0, 30, 31, 0, 
-  0, 0, 0, 0, 0, 0, 0, 219, 0, 0, 
+  0, 0, 0, 0, 0, 488, 0, 0, 29, 30, 
+  31, 0, 0, 0, 0, 0, 0, 0, 0, 33, 
+  0, 0, 0, 0, 0, 0, 35, 0, 0, 0, 
+  36, 37, 0, 38, 0, 0, 0, 39, 0, 40, 
+  42, 43, 0, 0, 45, 0, 0, 0, 47, 0, 
+  48, 0, 0, 494, 0, 0, 0, 0, 0, 0, 
+  0, 0, 53, 49, 52, 50, 0, 54, 0, 55, 
+  0, 57, 0, 58, 0, 0, 0, 0, 44, 56, 
+  32, 0, 0, 0, 41, 0, 0, 0, 0, 0, 
+  0, 46, 34, 51, 0, 0, 0, 0, 0, 0, 
+  0, 0, 0, 488, 0, 0, 29, 30, 31, 0, 
+  0, 0, 0, 0, 0, 0, 0, 33, 0, 0, 
   0, 0, 0, 0, 35, 0, 0, 0, 36, 37, 
-  0, 38, 0, 0, 0, 0, 0, 0, 516, 0, 
-  0, 0, 45, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-  53, 517, 519, 518, 0, 54, 0, 0, 0, 0, 
-  227, 0, 0, 0, 0, 0, 44, 56, 32, 214, 
+  0, 38, 0, 0, 0, 39, 0, 40, 42, 43, 
+  0, 0, 45, 0, 0, 0, 47, 0, 48, 0, 
+  0, 489, 0, 0, 0, 0, 0, 0, 0, 0, 
+  53, 49, 52, 50, 0, 54, 0, 55, 0, 57, 
+  0, 58, 0, 0, 0, 0, 44, 56, 32, 0, 
   0, 0, 41, 0, 0, 0, 0, 0, 0, 46, 
   34, 51, 0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 515, 0, 30, 31, 0, 0, 0, 0, 0, 
-  0, 0, 0, 219, 0, 0, 0, 0, 0, 0, 
-  35, 0, 0, 0, 36, 37, 0, 38, 0, 0, 
-  0, 0, 0, 0, 516, 0, 0, 0, 45, 0, 
-  0, 0, 0, 0, 0, 0, 567, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 53, 517, 519, 518, 
-  0, 54, 0, 0, 0, 0, 227, 0, 0, 0, 
-  0, 0, 44, 56, 32, 214, 0, 0, 41, 0, 
-  0, 0, 0, 0, 0, 46, 34, 51, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 515, 0, 30, 
-  31, 0, 0, 0, 0, 0, 0, 0, 0, 219, 
-  0, 0, 0, 0, 0, 0, 35, 0, 0, 0, 
-  36, 37, 0, 38, 0, 0, 0, 0, 0, 0, 
-  516, 0, 0, 0, 45, 0, 0, 0, 0, 0, 
-  0, 0, 570, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 53, 517, 519, 518, 0, 54, 0, 0, 
-  0, 0, 227, 0, 0, 0, 0, 0, 44, 56, 
-  32, 214, 0, 0, 41, 0, 0, 0, 0, 0, 
-  0, 46, 34, 51, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 29, 30, 31, 0, 0, 0, 0, 
-  0, 0, 0, 0, 33, 0, 0, 0, 0, 0, 
-  0, 35, 0, 0, 0, 36, 37, 0, 38, 0, 
-  0, 0, 39, 0, 40, 42, 43, 0, 0, 45, 
-  0, 0, 0, 47, 0, 48, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 53, 49, 52, 
-  50, 0, 54, 0, 55, 0, 57, 0, 58, 0, 
-  0, 0, 0, 44, 56, 32, 0, 0, 0, 41, 
-  0, 0, 0, 0, 0, 0, 46, 34, 51, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, -134, 0, 
+  0, 496, 0, 0, 29, 30, 31, 0, 0, 0, 
+  0, 0, 0, 0, 0, 33, 0, 0, 0, 0, 
+  0, 0, 35, 0, 0, 0, 36, 37, 0, 38, 
+  0, 0, 0, 39, 0, 40, 42, 43, 0, 0, 
+  45, 0, 0, 0, 47, 0, 48, 0, 0, 499, 
+  0, 0, 0, 0, 0, 0, 0, 0, 53, 49, 
+  52, 50, 0, 54, 0, 55, 0, 57, 0, 58, 
+  0, 0, 0, 0, 44, 56, 32, 0, 0, 0, 
+  41, 0, 0, 0, 0, 0, 0, 46, 34, 51, 
+  0, 0, 0, 0, 0, 0, 0, 0, 0, 496, 
   0, 0, 29, 30, 31, 0, 0, 0, 0, 0, 
   0, 0, 0, 33, 0, 0, 0, 0, 0, 0, 
   35, 0, 0, 0, 36, 37, 0, 38, 0, 0, 
   0, 39, 0, 40, 42, 43, 0, 0, 45, 0, 
-  0, 0, 47, 0, 48, 0, 0, 0, 0, 0, 
+  0, 0, 47, 0, 48, 0, 0, 497, 0, 0, 
   0, 0, 0, 0, 0, 0, 53, 49, 52, 50, 
   0, 54, 0, 55, 0, 57, 0, 58, 0, 0, 
   0, 0, 44, 56, 32, 0, 0, 0, 41, 0, 
   0, 0, 0, 0, 0, 46, 34, 51, 0, 0, 
   0, 0, 0, 0, 0, 0, 0, 29, 30, 31, 
   0, 0, 0, 0, 0, 0, 0, 0, 33, 0, 
-  0, 0, 0, 0, 0, 35, 0, 0, 0, 36, 
+  0, 0, 0, 0, 0, 35, 220, 0, 0, 587, 
+  633, 0, 38, 0, 0, 0, 39, 0, 40, 42, 
+  43, 0, 0, 45, 0, 0, 0, 47, 0, 48, 
+  0, 0, 0, 0, 0, 0, 0, 223, 0, 0, 
+  0, 53, 49, 52, 50, 224, 54, 0, 55, 226, 
+  57, 0, 58, 0, 229, 0, 0, 44, 56, 32, 
+  0, 0, 0, 41, 0, 0, 0, 0, 0, 0, 
+  46, 34, 51, 0, 0, 0, 0, 0, 0, 0, 
+  0, 0, 29, 30, 31, 0, 0, 0, 0, 0, 
+  0, 0, 0, 33, 0, 0, 0, 0, 0, 0, 
+  35, 220, 0, 0, 221, 37, 0, 38, 0, 0, 
+  0, 39, 0, 40, 42, 43, 0, 0, 45, 0, 
+  0, 0, 47, 0, 48, 0, 0, 0, 0, 0, 
+  0, 0, 223, 0, 0, 0, 53, 49, 52, 50, 
+  224, 54, 0, 55, 226, 57, 0, 58, 0, 229, 
+  0, 0, 44, 56, 32, 0, 0, 0, 41, 0, 
+  0, 0, 0, 0, 0, 46, 34, 51, 0, 0, 
+  0, 0, 0, 0, 0, 0, 0, 29, 30, 31, 
+  0, 0, 0, 0, 0, 0, 0, 0, 33, 0, 
+  0, 0, 0, 0, 0, 35, 220, 0, 0, 587, 
   37, 0, 38, 0, 0, 0, 39, 0, 40, 42, 
   43, 0, 0, 45, 0, 0, 0, 47, 0, 48, 
-  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 53, 49, 52, 50, 0, 54, 0, 55, 0, 
-  57, 282, 58, 0, 0, 0, 0, 44, 56, 32, 
+  0, 0, 0, 0, 0, 0, 0, 223, 0, 0, 
+  0, 53, 49, 52, 50, 224, 54, 0, 55, 226, 
+  57, 0, 58, 0, 229, 0, 0, 44, 56, 32, 
   0, 0, 0, 41, 0, 0, 0, 0, 0, 0, 
   46, 34, 51, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 496, 0, 0, 29, 30, 31, 0, 0, 
-  0, 0, 0, 0, 0, 0, 33, 0, 0, 0, 
-  0, 0, 0, 35, 0, 0, 0, 36, 37, 0, 
-  38, 0, 0, 0, 39, 0, 40, 42, 43, 0, 
-  0, 45, 0, 0, 0, 47, 0, 48, 0, 0, 
-  499, 0, 0, 0, 0, 0, 0, 0, 0, 53, 
-  49, 52, 50, 0, 54, 0, 55, 0, 57, 0, 
-  58, 0, 0, 0, 0, 44, 56, 32, 0, 0, 
-  0, 41, 0, 0, 0, 0, 0, 0, 46, 34, 
-  51, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-  496, 0, 0, 29, 30, 31, 0, 0, 0, 0, 
-  0, 0, 0, 0, 33, 0, 0, 0, 0, 0, 
-  0, 35, 0, 0, 0, 36, 37, 0, 38, 0, 
-  0, 0, 39, 0, 40, 42, 43, 0, 0, 45, 
-  0, 0, 0, 47, 0, 48, 0, 0, 497, 0, 
-  0, 0, 0, 0, 0, 0, 0, 53, 49, 52, 
-  50, 0, 54, 0, 55, 0, 57, 0, 58, 0, 
-  0, 0, 0, 44, 56, 32, 0, 0, 0, 41, 
-  0, 0, 0, 0, 0, 0, 46, 34, 51, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 488, 0, 
-  0, 29, 30, 31, 0, 0, 0, 0, 0, 0, 
-  0, 0, 33, 0, 0, 0, 0, 0, 0, 35, 
-  0, 0, 0, 36, 37, 0, 38, 0, 0, 0, 
-  39, 0, 40, 42, 43, 0, 0, 45, 0, 0, 
-  0, 47, 0, 48, 0, 0, 489, 0, 0, 0, 
-  0, 0, 0, 0, 0, 53, 49, 52, 50, 0, 
-  54, 0, 55, 0, 57, 0, 58, 0, 0, 0, 
-  0, 44, 56, 32, 0, 0, 0, 41, 0, 0, 
-  0, 0, 0, 0, 46, 34, 51, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 488, 0, 0, 29, 
-  30, 31, 0, 0, 0, 0, 0, 0, 0, 0, 
-  33, 0, 0, 0, 0, 0, 0, 35, 0, 0, 
-  0, 36, 37, 0, 38, 0, 0, 0, 39, 0, 
-  40, 42, 43, 0, 0, 45, 0, 0, 0, 47, 
-  0, 48, 0, 0, 494, 0, 0, 0, 0, 0, 
-  0, 0, 0, 53, 49, 52, 50, 0, 54, 0, 
-  55, 0, 57, 0, 58, 0, 0, 0, 0, 44, 
-  56, 32, 0, 0, 0, 41, 0, 0, 0, 0, 
+  0, 0, 111, 112, 113, 0, 0, 115, 117, 118, 
+  0, 0, 119, 0, 120, 0, 0, 0, 122, 123, 
+  124, 0, 0, 0, 0, 0, 0, 35, 125, 126, 
+  127, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
+  0, 128, 0, 0, 0, 0, 0, 0, 0, 0, 
+  0, 0, 0, 0, 0, 0, 0, 131, 0, 0, 
+  0, 0, 0, 0, 49, 52, 50, 132, 133, 134, 
+  0, 136, 137, 138, 139, 140, 141, 0, 0, 129, 
+  135, 121, 114, 116, 130, 0, 0, 0, 0, 0, 
   0, 0, 46, 34, 51, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 29, 30, 31, 0, 0, 0, 
-  0, 0, 0, 0, 0, 33, 0, 0, 0, 0, 
-  0, 0, 35, 220, 0, 0, 221, 37, 0, 38, 
-  0, 0, 0, 39, 0, 40, 42, 43, 0, 0, 
-  45, 0, 0, 0, 47, 0, 48, 0, 0, 0, 
-  0, 0, 0, 0, 223, 0, 0, 0, 53, 49, 
-  52, 50, 224, 54, 0, 55, 226, 57, 0, 58, 
-  0, 229, 0, 0, 44, 56, 32, 0, 0, 0, 
-  41, 0, 0, 0, 0, 0, 0, 46, 34, 51, 
-  0, 0, 0, 0, 0, 0, 0, 0, 0, 29, 
-  30, 31, 0, 0, 0, 0, 0, 0, 0, 0, 
-  33, 0, 0, 0, 0, 0, 0, 35, 220, 0, 
-  0, 585, 631, 0, 38, 0, 0, 0, 39, 0, 
+  0, 0, 0, 0, 111, 112, 113, 0, 0, 115, 
+  117, 118, 0, 0, 119, 0, 120, 0, 0, 0, 
+  122, 123, 124, 0, 0, 0, 0, 0, 0, 35, 
+  125, 126, 127, 0, 0, 0, 0, 0, 0, 0, 
+  0, 0, 0, 128, 0, 0, 0, 395, 0, 0, 
+  0, 0, 0, 0, 0, 0, 0, 0, 0, 131, 
+  0, 0, 0, 0, 0, 397, 49, 52, 50, 132, 
+  133, 134, 0, 136, 137, 138, 139, 140, 141, 0, 
+  0, 129, 135, 121, 114, 116, 130, 0, 0, 0, 
+  0, 0, 0, 0, 46, 374, 380, 0, 0, 0, 
+  0, 0, 0, 0, 0, 0, 111, 112, 113, 0, 
+  0, 115, 117, 118, 0, 0, 119, 0, 120, 0, 
+  0, 0, 122, 123, 124, 0, 0, 0, 0, 0, 
+  0, 35, 125, 126, 127, 0, 0, 0, 0, 0, 
+  0, 0, 0, 0, 0, 128, 0, 0, 0, 395, 
+  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
+  0, 131, 0, 0, 0, 0, 0, 397, 49, 52, 
+  50, 132, 133, 134, 0, 136, 137, 138, 139, 140, 
+  141, 0, 0, 129, 135, 121, 114, 116, 130, 0, 
+  0, 0, 0, 0, 0, 0, 46, 34, 51, 0, 
+  0, 0, 0, 0, 0, 0, 0, 0, 111, 112, 
+  113, 0, 0, 115, 117, 118, 0, 0, 119, 0, 
+  120, 0, 0, 0, 122, 123, 124, 0, 0, 0, 
+  0, 0, 0, 35, 125, 126, 127, 0, 0, 0, 
+  0, 0, 0, 0, 0, 0, 0, 128, 0, 0, 
+  0, 395, 0, 0, 0, 0, 0, 0, 0, 396, 
+  0, 0, 0, 131, 0, 0, 0, 0, 0, 397, 
+  49, 52, 50, 132, 133, 134, 0, 136, 137, 138, 
+  139, 140, 141, 0, 0, 129, 135, 121, 114, 116, 
+  130, 0, 0, 0, 0, 0, 0, 0, 46, 374, 
+  380, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
+  213, 0, 0, 0, 0, 215, 0, 29, 30, 31, 
+  217, 0, 0, 0, 0, 0, 0, 218, 33, 0, 
+  0, 0, 0, 0, 0, 35, 220, 0, 0, 221, 
+  37, 0, 38, 0, 0, 0, 39, 0, 40, 42, 
+  43, 0, 0, 45, 0, 0, 0, 47, 0, 48, 
+  0, 0, 0, 0, 0, 222, 0, 223, 0, 0, 
+  0, 53, 49, 52, 50, 224, 54, 225, 55, 226, 
+  57, 227, 58, 228, 229, 0, 0, 44, 56, 32, 
+  214, 216, 0, 41, 0, 0, 0, 0, 0, 0, 
+  46, 34, 51, 0, 0, 0, 0, 0, 0, 0, 
+  0, 0, 213, 0, 0, 0, 0, 215, 0, 29, 
+  30, 31, 217, 0, 0, 0, 0, 0, 0, 218, 
+  219, 0, 0, 0, 0, 0, 0, 35, 220, 0, 
+  0, 221, 37, 0, 38, 0, 0, 0, 39, 0, 
   40, 42, 43, 0, 0, 45, 0, 0, 0, 47, 
-  0, 48, 0, 0, 0, 0, 0, 0, 0, 223, 
-  0, 0, 0, 53, 49, 52, 50, 224, 54, 0, 
-  55, 226, 57, 0, 58, 0, 229, 0, 0, 44, 
-  56, 32, 0, 0, 0, 41, 0, 0, 0, 0, 
+  0, 48, 0, 0, 0, 0, 0, 222, 0, 223, 
+  0, 0, 0, 53, 49, 52, 50, 224, 54, 225, 
+  55, 226, 57, 227, 58, 228, 229, 0, 0, 44, 
+  56, 32, 214, 216, 0, 41, 0, 0, 0, 0, 
   0, 0, 46, 34, 51, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 29, 30, 31, 0, 0, 0, 
-  0, 0, 0, 0, 0, 33, 0, 0, 0, 0, 
-  0, 0, 35, 220, 0, 0, 585, 37, 0, 38, 
-  0, 0, 0, 39, 0, 40, 42, 43, 0, 0, 
-  45, 0, 0, 0, 47, 0, 48, 0, 0, 0, 
-  0, 0, 0, 0, 223, 0, 0, 0, 53, 49, 
-  52, 50, 224, 54, 0, 55, 226, 57, 0, 58, 
-  0, 229, 0, 0, 44, 56, 32, 0, 0, 0, 
-  41, 0, 0, 0, 0, 0, 0, 46, 34, 51, 
-  0, 0, 0, 0, 0, 0, 0, 0, 0, 111, 
-  112, 113, 0, 0, 115, 117, 118, 0, 0, 119, 
-  0, 120, 0, 0, 0, 122, 123, 124, 0, 0, 
-  0, 0, 0, 0, 35, 125, 126, 127, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 128, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 131, 0, 0, 0, 0, 0, 
-  0, 49, 52, 50, 132, 133, 134, 0, 136, 137, 
-  138, 139, 140, 141, 0, 0, 129, 135, 121, 114, 
-  116, 130, 0, 0, 0, 0, 0, 0, 0, 46, 
-  34, 51, 0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 111, 112, 113, 0, 0, 115, 117, 118, 0, 
-  0, 119, 0, 120, 0, 0, 0, 122, 123, 124, 
-  0, 0, 0, 0, 0, 0, 35, 125, 126, 127, 
-  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-  128, 0, 0, 0, 395, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 131, 0, 0, 0, 
-  0, 0, 397, 49, 52, 50, 132, 133, 134, 0, 
-  136, 137, 138, 139, 140, 141, 0, 0, 129, 135, 
-  121, 114, 116, 130, 0, 0, 0, 0, 0, 0, 
-  0, 46, 34, 51, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 111, 112, 113, 0, 0, 115, 117, 
-  118, 0, 0, 119, 0, 120, 0, 0, 0, 122, 
-  123, 124, 0, 0, 0, 0, 0, 0, 35, 125, 
-  126, 127, 0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 128, 0, 0, 0, 395, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 131, 0, 
-  0, 0, 0, 0, 397, 49, 52, 50, 132, 133, 
-  134, 0, 136, 137, 138, 139, 140, 141, 0, 0, 
-  129, 135, 121, 114, 116, 130, 0, 0, 0, 0, 
-  0, 0, 0, 46, 374, 380, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 111, 112, 113, 0, 0, 
-  115, 117, 118, 0, 0, 119, 0, 120, 0, 0, 
-  0, 122, 123, 124, 0, 0, 0, 0, 0, 0, 
-  35, 125, 126, 127, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 128, 0, 0, 0, 395, 0, 
-  0, 0, 0, 0, 0, 0, 396, 0, 0, 0, 
-  131, 0, 0, 0, 0, 0, 397, 49, 52, 50, 
-  132, 133, 134, 0, 136, 137, 138, 139, 140, 141, 
-  0, 0, 129, 135, 121, 114, 116, 130, 0, 0, 
-  0, 0, 0, 0, 0, 46, 374, 380, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 213, 0, 0, 
-  0, 0, 215, 0, 29, 30, 31, 217, 0, 0, 
-  0, 0, 0, 0, 218, 219, 0, 0, 0, 0, 
-  0, 0, 35, 220, 0, 0, 221, 37, 0, 38, 
-  0, 0, 0, 39, 0, 40, 42, 43, 0, 0, 
-  45, 0, 0, 0, 47, 0, 48, 0, 0, 0, 
-  0, 0, 222, 0, 223, 0, 0, 0, 53, 49, 
-  52, 50, 224, 54, 225, 55, 226, 57, 227, 58, 
-  228, 229, 0, 0, 44, 56, 32, 214, 216, 0, 
-  41, 0, 0, 0, 0, 0, 0, 46, 34, 51, 
-  0, 0, 0, 0, 0, 0, 0, 0, 0, 213, 
-  0, 0, 0, 0, 215, 0, 29, 30, 31, 217, 
-  0, 0, 0, 0, 0, 0, 218, 33, 0, 0, 
-  0, 0, 0, 0, 35, 220, 0, 0, 221, 37, 
-  0, 38, 0, 0, 0, 39, 0, 40, 42, 43, 
-  0, 0, 45, 0, 0, 0, 47, 0, 48, 0, 
-  0, 0, 0, 0, 222, 0, 223, 0, 0, 0, 
-  53, 49, 52, 50, 224, 54, 225, 55, 226, 57, 
-  227, 58, 228, 229, 0, 0, 44, 56, 32, 214, 
-  216, 0, 41, 0, 0, 0, 0, 0, 0, 46, 
-  34, 51, 0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 589, 112, 113, 0, 0, 591, 117, 593, 30, 
-  31, 594, 0, 120, 0, 0, 0, 122, 596, 597, 
-  0, 0, 0, 0, 0, 0, 35, 598, 126, 127, 
-  221, 37, 0, 38, 0, 0, 0, 39, 0, 40, 
-  599, 43, 0, 0, 601, 0, 0, 0, 47, 0, 
-  48, 0, 0, 0, 0, 0, 602, 0, 223, 0, 
-  0, 0, 603, 49, 52, 50, 604, 605, 606, 55, 
-  608, 609, 610, 611, 612, 613, 0, 0, 600, 607, 
-  595, 590, 592, 130, 41, 0, 0, 0, 0, 0, 
-  0, 46, 374, 380, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 365, 112, 113, 0, 0, 367, 117, 
-  369, 30, 31, 370, 0, 120, 0, 0, 0, 122, 
-  372, 373, 0, 0, 0, 0, 0, 0, 35, 375, 
-  126, 127, 221, 37, 0, 38, 0, 0, 0, 39, 
-  0, 40, 376, 43, 0, 0, 378, 0, 0, 0, 
-  47, 0, 48, 0, -280, 0, 0, 0, 379, 0, 
-  223, 0, 0, 0, 381, 49, 52, 50, 382, 383, 
-  384, 55, 386, 387, 388, 389, 390, 391, 0, 0, 
-  377, 385, 371, 366, 368, 130, 41, 0, 0, 0, 
-  0, 0, 0, 46, 374, 380, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 
+  0, 0, 0, 0, 591, 112, 113, 0, 0, 593, 
+  117, 595, 30, 31, 596, 0, 120, 0, 0, 0, 
+  122, 598, 599, 0, 0, 0, 0, 0, 0, 35, 
+  600, 126, 127, 221, 37, 0, 38, 0, 0, 0, 
+  39, 0, 40, 601, 43, 0, 0, 603, 0, 0, 
+  0, 47, 0, 48, 0, 0, 0, 0, 0, 604, 
+  0, 223, 0, 0, 0, 605, 49, 52, 50, 606, 
+  607, 608, 55, 610, 611, 612, 613, 614, 615, 0, 
+  0, 602, 609, 597, 592, 594, 130, 41, 0, 0, 
+  0, 0, 0, 0, 46, 374, 380, 0, 0, 0, 
+  0, 0, 0, 0, 0, 0, 365, 112, 113, 0, 
+  0, 367, 117, 369, 30, 31, 370, 0, 120, 0, 
+  0, 0, 122, 372, 373, 0, 0, 0, 0, 0, 
+  0, 35, 375, 126, 127, 221, 37, 0, 38, 0, 
+  0, 0, 39, 0, 40, 376, 43, 0, 0, 378, 
+  0, 0, 0, 47, 0, 48, 0, -281, 0, 0, 
+  0, 379, 0, 223, 0, 0, 0, 381, 49, 52, 
+  50, 382, 383, 384, 55, 386, 387, 388, 389, 390, 
+  391, 0, 0, 377, 385, 371, 366, 368, 130, 41, 
+  0, 0, 0, 0, 0, 0, 46, 374, 380, 0, 
+  0, 0, 0, 0, 0, 0, 0, 0, 
 
-  650, 253, 528, 638, 651, 447, 621, 536, 581, 16, 
-  554, 582, 661, 614, 548, 444, 667, 579, 636, 531, 
-  183, 628, 313, 533, 444, 572, 248, 248, 248, 552, 
-  263, 623, 237, 206, 313, 331, 447, 351, 183, 347, 
-  190, 253, 183, 495, 188, 178, 173, 142, 320, 313, 
-  253, 466, 639, 444, 152, 171, 462, 455, 165, 453, 
-  150, 441, 457, 458, 500, 469, 447, 145, 425, 183, 
-  148, 498, 475, 437, 433, 400, 260, 485, 393, 247, 
-  108, 514, 512, 0, 206, 322, 0, 188, 511, 345, 
-  637, 0, 206, 206, 62, 0, 0, 624, 206, 654, 
-  653, 206, 206, 62, 0, 206, 62, 409, 62, 110, 
-  170, 62, 148, 104, 98, 187, 0, 62, 102, 460, 
-  180, 313, 62, 331, 459, 167, 62, 62, 504, 69, 
-  62, 62, 313, 72, 63, 62, 62, 459, 507, 62, 
-  62, 506, 505, 62, 410, 70, 62, 0, 503, 62, 
-  62, 502, 182, 62, 62, 469, 62, 62, 91, 100, 
-  90, 62, 97, 62, 62, 62, 96, 62, 95, 94, 
-  93, 277, 86, 62, 62, 510, 281, 92, 62, 62, 
-  99, 62, 393, 71, 79, 349, 514, 74, 514, 353, 
-  62, 564, 460, 560, 355, 401, 341, 260, 62, 340, 
-  182, 206, 393, 409, 409, 206, 393, 343, 417, 206, 
-  206, 206, 62, 206, 459, 62, 188, 460, 148, 206, 
-  247, 362, 464, 468, 206, 62, 412, 362, 403, 479, 
-  296, 394, 188, 62, 206, 182, 407, 206, 206, 206, 
-  410, 410, 206, 356, 419, 493, 422, 514, 246, 492, 
-  362, 483, 655, 62, 62, 318, 62, 62, 295, 297, 
-  239, 298, 299, 313, 206, 313, 588, 309, 362, 242, 
-  362, 206, 281, 0, 0, 0, 62, 62, 0, 0, 
-  309, 281, 281, 309, 206, 281, 206, 108, 281, 308, 
-  62, 324, 309, 62, 327, 281, 62, 281, 281, 284, 
-  289, 281, 328, 300, 62, 330, 0, 0, 62, 281, 
-  0, 301, 0, 281, 337, 302, 110, 177, 62, 62, 
-  514, 309, 0, 281, 281, 0, 281, 576, 568, 522, 
-  306, 304, 560, 0, 634, 0, 0, 514, 314, 571, 
-  316, 513, 523, 311, 260, 0, 522, 0, 514, 0, 
-  0, 0, 0, 0, 443, 485, 440, 522, 513, 523, 
-  206, 540, 541, 542, 543, 547, 544, 545, 584, 513, 
-  523, 0, 0, 0, 0, 0, 0, 632, 633, 540, 
-  541, 542, 543, 547, 544, 545, 576, 0, 0, 0, 
-  0, 0, 0, 0, 0, 577, 578, 540, 541, 542, 
-  543, 547, 544, 545, 0, 0, 0, 0, 0, 0, 
+  152, 652, 331, 669, 535, 531, 538, 142, 528, 148, 
+  641, 16, 313, 393, 485, 500, 626, 630, 263, 638, 
+  183, 625, 623, 206, 574, 447, 583, 320, 183, 253, 
+  313, 248, 466, 145, 663, 653, 616, 584, 556, 640, 
+  581, 248, 437, 253, 248, 495, 183, 178, 453, 150, 
+  462, 347, 455, 550, 554, 183, 351, 447, 458, 190, 
+  313, 457, 425, 188, 469, 441, 433, 253, 237, 468, 
+  0, 313, 173, 171, 393, 409, 447, 498, 409, 464, 
+  400, 0, 165, 206, 475, 206, 512, 511, 0, 0, 
+  188, 0, 0, 206, 0, 206, 0, 62, 0, 459, 
+  417, 206, 206, 206, 188, 0, 62, 0, 62, 62, 
+  507, 504, 410, 148, 62, 410, 460, 62, 419, 505, 
+  407, 412, 170, 62, 62, 459, 506, 444, 277, 148, 
+  422, 331, 187, 281, 62, 62, 62, 180, 260, 295, 
+  296, 297, 62, 62, 656, 655, 314, 298, 299, 62, 
+  62, 503, 182, 62, 206, 362, 514, 393, 247, 62, 
+  62, 460, 502, 62, 62, 639, 313, 167, 92, 99, 
+  62, 206, 206, 514, 510, 345, 100, 260, 562, 62, 
+  62, 62, 394, 493, 93, 94, 95, 492, 62, 62, 
+  182, 206, 62, 206, 96, 62, 246, 97, 62, 90, 
+  62, 401, 91, 206, 62, 86, 355, 340, 353, 62, 
+  108, 247, 206, 349, 188, 313, 102, 206, 393, 104, 
+  313, 62, 206, 182, 206, 206, 62, 362, 459, 206, 
+  242, 62, 469, 460, 62, 514, 409, 63, 318, 110, 
+  657, 341, 239, 590, 403, 62, 322, 206, 72, 62, 
+  362, 62, 362, 69, 206, 98, 62, 62, 70, 71, 
+  514, 0, 206, 62, 62, 566, 356, 0, 206, 79, 
+  62, 108, 74, 410, 483, 281, 0, 309, 0, 0, 
+  62, 62, 281, 304, 62, 281, 281, 62, 362, 281, 
+  343, 0, 281, 284, 289, 316, 324, 327, 0, 311, 
+  110, 177, 0, 309, 206, 62, 479, 0, 281, 62, 
+  281, 309, 301, 309, 281, 0, 281, 309, 281, 62, 
+  306, 0, 281, 62, 281, 337, 302, 0, 281, 578, 
+  300, 514, 260, 328, 562, 308, 636, 570, 443, 330, 
+  522, 0, 0, 0, 0, 0, 514, 0, 206, 0, 
+  0, 0, 513, 523, 0, 522, 0, 485, 542, 543, 
+  544, 545, 549, 546, 547, 0, 586, 513, 523, 0, 
+  0, 0, 0, 0, 440, 588, 589, 542, 543, 544, 
+  545, 549, 546, 547, 586, 0, 0, 0, 0, 0, 
+  0, 0, 0, 634, 635, 542, 543, 544, 545, 549, 
+  546, 547, 578, 0, 0, 0, 0, 0, 0, 0, 
+  0, 579, 580, 542, 543, 544, 545, 549, 546, 547, 
   0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
   0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
+  0, 573, 0, 0, 0, 0, 0, 0, 0, 0, 
+  514, 0, 0, 0, 0, 0, 0, 0, 0, 522, 
   0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
+  0, 513, 523, 0, 0, 0, 0, 0, 0, 0, 
   0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 584, 0, 0, 0, 0, 0, 0, 
-  0, 0, 586, 587, 540, 541, 542, 543, 547, 544, 
-  545, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
   0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
   0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
   0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
   0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
   0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 0, 0};
+  0, 0, 0, 0, 0, 0, 0};
 
 const short QQmlJSGrammar::action_check [] = {
-  1, 79, 7, 33, 36, 7, 33, 7, 36, 7, 
-  36, 7, 7, 61, 8, 7, 7, 60, 33, 16, 
-  36, 55, 7, 48, 55, 7, 7, 60, 36, 5, 
-  5, 24, 5, 55, 8, 7, 20, 66, 37, 29, 
-  60, 2, 66, 60, 24, 34, 33, 33, 36, 55, 
-  60, 55, 55, 36, 17, 33, 79, 36, 7, 1, 
-  7, 7, -1, 8, 33, 33, 37, 33, 7, 36, 
-  7, 48, 36, 33, 7, 1, 7, 33, 7, 36, 
-  7, 36, 1, 8, 36, 36, 8, 8, 36, 33, 
-  60, 2, 7, 36, 2, 60, 55, 17, 60, 33, 
-  36, 36, 55, 61, 36, 0, 60, 48, 31, 33, 
-  7, 10, 8, 7, 15, 8, 33, 8, 36, 8, 
-  60, 8, 8, 61, 36, 15, 36, 7, 8, 79, 
-  60, 6, 48, 34, 8, 8, 8, 50, 8, 42, 
-  8, 54, 8, 50, 34, 20, 60, 54, -1, 77, 
-  53, 8, 61, 62, 8, 40, 55, 61, 62, 61, 
-  62, 61, 62, 15, 40, 56, 51, 60, 8, 40, 
-  56, 60, 8, 60, 7, 51, 7, 61, 62, 8, 
-  51, 29, 34, -1, 40, -1, 60, 60, 60, -1, 
-  56, 61, 60, 91, 92, 51, 61, 62, 7, 56, 
-  61, 62, 56, 91, 92, 29, 61, 62, 61, 62, 
-  29, 2, 61, 62, 61, 62, 61, 62, 61, 62, 
-  60, 15, 15, 29, 29, 61, 62, 75, 61, 62, 
-  61, 62, 61, 62, 12, 8, 15, 29, 86, 15, 
-  34, 34, 36, 36, 89, 12, 29, 7, 12, 36, 
-  93, 75, 61, 62, -1, 34, 75, 36, 34, 25, 
-  36, 27, 86, -1, -1, -1, -1, 86, -1, 75, 
-  75, -1, 38, 33, 61, 62, -1, -1, -1, 57, 
-  86, 86, -1, 75, -1, 63, 15, -1, 61, 62, 
-  57, -1, 75, 57, 86, 15, 63, 18, 19, 63, 
-  -1, -1, -1, 86, 33, 34, 47, 36, -1, 18, 
-  19, -1, -1, 33, 34, 25, 36, 27, 23, 24, 
-  61, 62, -1, -1, 45, 46, -1, 32, 38, -1, 
-  35, -1, 37, -1, 94, -1, 45, 46, -1, 23, 
-  24, -1, -1, -1, -1, 23, 24, -1, 32, 23, 
-  24, 35, 93, 37, 32, 23, 24, 35, 32, 37, 
-  -1, 35, -1, 37, 32, 23, 24, 35, 29, 37, 
-  -1, -1, 29, 31, 32, 29, -1, 35, 29, 37, 
-  98, 99, 100, 101, 102, 103, 23, 24, 29, -1, 
-  -1, 29, -1, -1, 31, 32, 18, 19, 35, -1, 
-  37, -1, -1, -1, -1, 66, 67, 68, -1, 66, 
-  67, 68, 66, 67, 68, 66, 67, 68, -1, -1, 
-  -1, -1, 29, 45, 46, 66, 67, 68, 66, 67, 
-  68, -1, -1, 94, 95, 96, 29, 94, 95, 96, 
+  7, 55, 48, 55, 55, 55, 36, 7, 36, 33, 
+  55, 7, 7, 33, 37, 7, 7, 61, 60, 60, 
+  36, 7, 33, 8, 36, 7, 16, 1, 36, 60, 
+  7, 36, 2, 48, 7, 36, 5, 36, 36, 36, 
+  79, 5, 36, 60, 33, 33, 55, 60, 7, 36, 
+  34, 7, 33, 7, 7, 33, 36, 7, 7, 77, 
+  36, 33, 8, 5, 1, 8, 33, 60, 29, 79, 
+  36, 33, 17, 8, 37, 79, 33, 60, 33, 8, 
+  1, 60, 2, 8, 7, 60, 33, 55, 48, 60, 
+  29, 2, 7, 2, 7, 36, 36, 7, 17, 7, 
+  33, 66, 7, 61, 48, 31, 36, 1, 36, 33, 
+  8, 7, 60, 20, 36, 66, 33, 7, 36, 55, 
+  36, 8, 60, 8, 15, -1, 40, 79, 8, 61, 
+  61, 62, 10, 8, 61, 62, 40, 51, 8, 15, 
+  40, 40, 8, 34, 8, 42, 6, 51, 24, 61, 
+  62, 51, 51, 7, 8, 8, 53, 8, 61, 62, 
+  20, 8, 8, 8, 8, 15, 61, 62, 61, 62, 
+  8, 8, 15, 60, -1, 60, 56, 55, 61, 62, 
+  61, 62, 61, 62, 34, 60, 56, 61, 62, 91, 
+  92, 34, 56, 50, 60, 15, 29, 54, 0, 91, 
+  92, 50, 61, 62, 24, 54, 25, 60, 27, 12, 
+  61, 56, 29, 60, 60, 25, 60, 27, 56, 38, 
+  25, 25, 27, 27, 61, 62, 12, 15, 38, 61, 
+  62, 12, 29, 38, 38, 29, 7, -1, 25, 7, 
+  27, 36, 75, 8, 29, 8, 34, -1, 36, 15, 
+  25, 38, 27, 86, 57, 7, -1, 89, 75, 7, 
+  63, -1, 33, 38, 15, 29, 61, 62, 34, 86, 
+  36, 57, 29, -1, -1, -1, 57, 63, 75, -1, 
+  -1, 75, 63, 34, 15, 36, -1, 61, 62, 86, 
+  75, -1, 86, 61, 62, -1, 61, 62, 61, 62, 
+  -1, 86, -1, 34, 25, 36, 27, 15, -1, 61, 
+  62, 75, -1, 61, 62, 18, 19, 38, 75, 93, 
+  15, -1, 86, 94, -1, 33, 34, -1, 36, 86, 
+  18, 19, 18, 19, 18, 19, 47, -1, 33, 34, 
+  -1, 36, 45, 46, 98, 99, 100, 101, 102, 103, 
+  61, 62, -1, -1, 23, 24, -1, 45, 46, 45, 
+  46, 45, 46, 32, 23, 24, 35, -1, 37, -1, 
+  -1, -1, -1, 32, 23, 24, 35, -1, 37, -1, 
+  23, 24, 93, 32, -1, 25, 35, 27, 37, 32, 
+  -1, -1, 35, 29, 37, 23, 24, -1, 38, -1, 
+  -1, -1, -1, 31, 32, 23, 24, 35, -1, 37, 
+  -1, -1, -1, 31, 32, 23, 24, 35, 29, 37, 
+  -1, -1, -1, 31, 32, 23, 24, 35, -1, 37, 
+  66, 67, 68, 31, 32, 23, 24, 35, -1, 37, 
+  -1, -1, -1, 31, 32, -1, -1, 35, -1, 37, 
+  29, -1, -1, 29, -1, 66, 67, 68, 94, 95, 
+  96, 29, -1, -1, 29, -1, 23, 24, 29, -1, 
+  -1, 29, 15, -1, 29, 32, -1, -1, 35, -1, 
+  37, 36, -1, 94, 95, 96, 29, 66, 67, 68, 
+  66, 67, 68, -1, -1, -1, -1, -1, 66, 67, 
+  68, 66, 67, 68, -1, 66, 67, 68, 66, 67, 
+  68, 66, 67, 68, -1, 94, 95, 96, 94, 95, 
+  96, -1, -1, 66, 67, 68, 94, 95, 96, 94, 
+  95, 96, 15, 94, 95, 96, 94, 95, 96, 94, 
+  95, 96, -1, 29, -1, -1, 29, -1, -1, 29, 
+  36, 94, 95, 96, 29, -1, -1, 29, -1, -1, 
+  -1, 36, -1, -1, -1, 29, -1, -1, 29, -1, 
+  -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 
+  66, 67, 68, 66, 67, 68, 66, 67, 68, 61, 
+  62, 66, 67, 68, 66, 67, 68, 61, 62, -1, 
+  61, 62, 66, 67, 68, 66, 67, 68, 94, 95, 
+  96, 94, 95, 96, 94, 95, 96, 29, -1, 94, 
+  95, 96, 94, 95, 96, 29, 15, -1, 29, -1, 
   94, 95, 96, 94, 95, 96, -1, -1, -1, -1, 
-  -1, -1, -1, 94, 95, 96, 94, 95, 96, 66, 
-  67, 68, -1, -1, -1, -1, -1, 29, -1, -1, 
-  29, -1, -1, 66, 67, 68, 29, -1, -1, 29, 
-  -1, -1, 29, -1, 23, 24, 29, 94, 95, 96, 
-  -1, -1, 31, 32, -1, -1, 35, -1, 37, -1, 
-  -1, 94, 95, 96, 66, 67, 68, 66, 67, 68, 
-  -1, -1, -1, 66, 67, 68, 66, 67, 68, 66, 
-  67, 68, 29, 66, 67, 68, -1, -1, -1, 36, 
-  -1, 29, 94, 95, 96, 94, 95, 96, 36, -1, 
-  -1, 94, 95, 96, 94, 95, 96, 94, 95, 96, 
-  -1, 94, 95, 96, -1, 29, -1, -1, -1, 66, 
-  67, 68, 36, -1, -1, -1, -1, 29, 66, 67, 
-  68, -1, -1, -1, -1, 29, -1, -1, -1, -1, 
-  -1, -1, -1, -1, -1, -1, 29, 94, 95, 96, 
-  -1, -1, 66, 67, 68, -1, 94, 95, 96, -1, 
-  -1, -1, -1, -1, 66, 67, 68, 61, 62, -1, 
-  -1, -1, 66, 67, 68, -1, -1, -1, 61, 62, 
-  94, 95, 96, 66, 67, 68, 29, -1, -1, 29, 
+  29, -1, -1, -1, -1, -1, -1, -1, -1, 61, 
+  62, -1, -1, -1, 66, 67, 68, 61, 62, -1, 
+  61, 62, 66, 67, 68, 66, 67, 68, -1, -1, 
+  -1, -1, -1, -1, -1, 3, -1, 66, 67, 68, 
+  -1, -1, 94, 95, 96, 13, -1, -1, -1, 17, 
+  94, 95, 96, 94, 95, 96, -1, -1, 26, -1, 
+  28, -1, -1, 31, -1, 94, 95, 96, -1, -1, 
+  -1, 39, -1, 41, 42, -1, -1, 3, -1, -1, 
+  -1, 49, -1, -1, 52, 53, -1, 13, -1, -1, 
+  58, 17, -1, -1, -1, -1, 64, -1, -1, -1, 
+  26, -1, 28, -1, -1, -1, -1, -1, -1, -1, 
+  -1, -1, 80, 39, -1, 41, 42, -1, -1, -1, 
+  -1, -1, -1, 49, -1, -1, 52, 53, -1, -1, 
+  -1, -1, 58, -1, -1, -1, -1, -1, 64, -1, 
+  -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 
+  -1, -1, -1, -1, 80, -1, -1, -1, -1, -1, 
+  -1, -1, -1, -1, -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, -1, -1, -1, -1, -1, -1, 29, -1, -1, 
+  -1, 33, 34, -1, 36, -1, -1, -1, -1, -1, 
+  -1, 43, -1, -1, -1, 47, -1, -1, -1, -1, 
+  -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 
+  -1, -1, -1, 65, 66, 67, 68, -1, 70, -1, 
+  -1, -1, -1, -1, -1, -1, -1, -1, -1, 81, 
+  82, 83, -1, -1, -1, 87, -1, -1, -1, -1, 
   -1, -1, 94, 95, 96, -1, -1, -1, -1, -1, 
-  94, 95, 96, -1, 29, -1, -1, -1, -1, -1, 
-  -1, 94, 95, 96, -1, -1, -1, -1, 61, 62, 
-  -1, 61, 62, 66, 67, 68, 66, 67, 68, -1, 
-  -1, -1, -1, -1, -1, -1, 61, 62, -1, -1, 
-  -1, 66, 67, 68, -1, -1, -1, -1, -1, -1, 
-  -1, 94, 95, 96, 94, 95, 96, -1, -1, -1, 
-  -1, -1, -1, -1, -1, -1, -1, -1, -1, 94, 
-  95, 96, -1, -1, -1, -1, -1, -1, -1, 12, 
-  13, 3, -1, -1, -1, -1, -1, -1, -1, 22, 
-  -1, 13, -1, -1, -1, 17, 29, -1, -1, -1, 
-  33, 34, -1, 36, 26, -1, 28, -1, -1, -1, 
-  43, -1, -1, -1, 47, -1, -1, 39, -1, 41, 
-  42, -1, -1, -1, -1, -1, -1, 49, -1, -1, 
-  52, 53, 65, 66, 67, 68, 58, 70, -1, -1, 
-  -1, -1, 64, -1, -1, -1, -1, -1, 81, 82, 
-  83, -1, -1, -1, 87, -1, -1, -1, 80, -1, 
-  -1, 94, 95, 96, -1, -1, -1, -1, -1, -1, 
-  -1, 12, 13, -1, -1, -1, -1, -1, -1, -1, 
-  -1, 22, -1, -1, 3, -1, -1, -1, 29, -1, 
-  -1, -1, 33, 34, 13, 36, -1, -1, 17, -1, 
-  -1, -1, 43, -1, -1, -1, 47, 26, -1, 28, 
-  -1, -1, 31, -1, -1, -1, -1, -1, -1, -1, 
-  39, -1, 41, 42, 65, 66, 67, 68, -1, 70, 
-  49, -1, -1, 52, 53, -1, -1, -1, -1, 58, 
-  81, 82, 83, -1, -1, 64, 87, -1, -1, -1, 
-  -1, -1, -1, 94, 95, 96, -1, -1, -1, -1, 
-  -1, 80, -1, -1, -1, -1, -1, -1, -1, -1, 
+  -1, -1, -1, -1, 12, 13, -1, -1, -1, -1, 
+  -1, -1, -1, -1, 22, -1, -1, -1, -1, -1, 
+  -1, 29, -1, -1, -1, 33, 34, -1, 36, -1, 
+  -1, -1, -1, -1, -1, 43, -1, -1, -1, 47, 
+  -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 
+  -1, -1, -1, -1, -1, -1, -1, 65, 66, 67, 
+  68, -1, 70, -1, -1, -1, -1, -1, -1, -1, 
+  -1, -1, -1, 81, 82, 83, -1, -1, -1, 87, 
+  -1, -1, -1, -1, -1, -1, 94, 95, 96, -1, 
+  -1, -1, -1, -1, -1, -1, -1, -1, 10, -1, 
+  12, 13, -1, -1, -1, -1, -1, -1, -1, -1, 
+  22, -1, -1, -1, -1, -1, -1, 29, -1, -1, 
+  -1, 33, 34, -1, 36, -1, -1, -1, -1, -1, 
+  -1, 43, -1, -1, -1, 47, -1, -1, -1, -1, 
   -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 
-  -1, -1, -1, -1, -1, -1, -1, 12, 13, -1, 
+  -1, -1, -1, 65, 66, 67, 68, -1, 70, -1, 
+  -1, -1, -1, 75, -1, -1, -1, -1, -1, 81, 
+  82, 83, 84, -1, -1, 87, -1, -1, -1, -1, 
+  -1, -1, 94, 95, 96, -1, -1, -1, -1, -1, 
+  -1, -1, -1, -1, 10, -1, 12, 13, -1, -1, 
+  -1, -1, -1, -1, -1, -1, 22, -1, -1, -1, 
+  -1, -1, -1, 29, -1, -1, -1, 33, 34, -1, 
+  36, -1, -1, -1, -1, -1, -1, 43, -1, -1, 
+  -1, 47, -1, -1, -1, -1, -1, -1, -1, 55, 
+  -1, -1, -1, -1, -1, -1, -1, -1, -1, 65, 
+  66, 67, 68, -1, 70, -1, -1, -1, -1, 75, 
+  -1, -1, -1, -1, -1, 81, 82, 83, 84, -1, 
+  -1, 87, -1, -1, -1, -1, -1, -1, 94, 95, 
+  96, -1, -1, -1, -1, -1, -1, -1, -1, -1, 
+  10, -1, 12, 13, -1, -1, -1, -1, -1, -1, 
+  -1, -1, 22, -1, -1, -1, -1, -1, -1, 29, 
+  -1, -1, -1, 33, 34, -1, 36, -1, -1, -1, 
+  -1, -1, -1, 43, -1, -1, -1, 47, -1, -1, 
+  -1, -1, -1, -1, -1, 55, -1, -1, -1, -1, 
+  -1, -1, -1, -1, -1, 65, 66, 67, 68, -1, 
+  70, -1, -1, -1, -1, 75, -1, -1, -1, -1, 
+  -1, 81, 82, 83, 84, -1, -1, 87, -1, -1, 
+  -1, -1, -1, -1, 94, 95, 96, -1, -1, -1, 
+  -1, -1, -1, -1, -1, -1, 11, 12, 13, -1, 
   -1, -1, -1, -1, -1, -1, -1, 22, -1, -1, 
   -1, -1, -1, -1, 29, -1, -1, -1, 33, 34, 
-  -1, 36, -1, -1, -1, -1, -1, -1, 43, -1, 
-  -1, -1, 47, -1, -1, -1, -1, -1, -1, -1, 
+  -1, 36, -1, -1, -1, 40, -1, 42, 43, 44, 
+  -1, -1, 47, -1, -1, -1, 51, -1, 53, -1, 
   -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 
-  65, 66, 67, 68, -1, 70, -1, -1, -1, -1, 
-  -1, -1, -1, -1, -1, -1, 81, 82, 83, -1, 
+  65, 66, 67, 68, -1, 70, -1, 72, -1, 74, 
+  -1, 76, -1, -1, -1, -1, 81, 82, 83, -1, 
   -1, -1, 87, -1, -1, -1, -1, -1, -1, 94, 
   95, 96, -1, -1, -1, -1, -1, -1, -1, -1, 
-  -1, 12, 13, -1, -1, -1, -1, -1, -1, -1, 
+  -1, 7, -1, -1, -1, 11, 12, 13, -1, -1, 
+  -1, -1, -1, -1, -1, -1, 22, -1, -1, -1, 
+  -1, -1, -1, 29, -1, -1, -1, 33, 34, -1, 
+  36, -1, -1, -1, 40, -1, 42, 43, 44, -1, 
+  -1, 47, -1, -1, -1, 51, -1, 53, -1, -1, 
+  -1, -1, -1, -1, -1, -1, -1, -1, -1, 65, 
+  66, 67, 68, -1, 70, -1, 72, -1, 74, -1, 
+  76, -1, -1, -1, -1, 81, 82, 83, -1, -1, 
+  -1, 87, -1, -1, -1, -1, -1, -1, 94, 95, 
+  96, -1, -1, -1, -1, -1, -1, -1, -1, -1, 
+  11, 12, 13, -1, -1, -1, -1, -1, -1, -1, 
   -1, 22, -1, -1, -1, -1, -1, -1, 29, -1, 
-  -1, -1, 33, 34, -1, 36, -1, -1, -1, -1, 
-  -1, -1, 43, -1, -1, -1, 47, -1, -1, -1, 
-  -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 
+  -1, -1, 33, 34, -1, 36, -1, -1, -1, 40, 
+  -1, 42, 43, 44, -1, -1, 47, -1, -1, -1, 
+  51, -1, 53, -1, -1, -1, -1, -1, -1, -1, 
   -1, -1, -1, -1, 65, 66, 67, 68, -1, 70, 
-  -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 
+  -1, 72, -1, 74, 75, 76, -1, -1, -1, -1, 
   81, 82, 83, -1, -1, -1, 87, -1, -1, -1, 
   -1, -1, -1, 94, 95, 96, -1, -1, -1, -1, 
-  -1, -1, -1, -1, -1, 10, -1, 12, 13, -1, 
+  -1, -1, -1, -1, -1, 8, -1, -1, 11, 12, 
+  13, -1, -1, -1, -1, -1, -1, -1, -1, 22, 
+  -1, -1, -1, -1, -1, -1, 29, -1, -1, -1, 
+  33, 34, -1, 36, -1, -1, -1, 40, -1, 42, 
+  43, 44, -1, -1, 47, -1, -1, -1, 51, -1, 
+  53, -1, -1, 56, -1, -1, -1, -1, -1, -1, 
+  -1, -1, 65, 66, 67, 68, -1, 70, -1, 72, 
+  -1, 74, -1, 76, -1, -1, -1, -1, 81, 82, 
+  83, -1, -1, -1, 87, -1, -1, -1, -1, -1, 
+  -1, 94, 95, 96, -1, -1, -1, -1, -1, -1, 
+  -1, -1, -1, 8, -1, -1, 11, 12, 13, -1, 
   -1, -1, -1, -1, -1, -1, -1, 22, -1, -1, 
   -1, -1, -1, -1, 29, -1, -1, -1, 33, 34, 
-  -1, 36, -1, -1, -1, -1, -1, -1, 43, -1, 
-  -1, -1, 47, -1, -1, -1, -1, -1, -1, -1, 
-  -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 
-  65, 66, 67, 68, -1, 70, -1, -1, -1, -1, 
-  75, -1, -1, -1, -1, -1, 81, 82, 83, 84, 
+  -1, 36, -1, -1, -1, 40, -1, 42, 43, 44, 
+  -1, -1, 47, -1, -1, -1, 51, -1, 53, -1, 
+  -1, 56, -1, -1, -1, -1, -1, -1, -1, -1, 
+  65, 66, 67, 68, -1, 70, -1, 72, -1, 74, 
+  -1, 76, -1, -1, -1, -1, 81, 82, 83, -1, 
   -1, -1, 87, -1, -1, -1, -1, -1, -1, 94, 
   95, 96, -1, -1, -1, -1, -1, -1, -1, -1, 
-  -1, 10, -1, 12, 13, -1, -1, -1, -1, -1, 
+  -1, 8, -1, -1, 11, 12, 13, -1, -1, -1, 
+  -1, -1, -1, -1, -1, 22, -1, -1, -1, -1, 
+  -1, -1, 29, -1, -1, -1, 33, 34, -1, 36, 
+  -1, -1, -1, 40, -1, 42, 43, 44, -1, -1, 
+  47, -1, -1, -1, 51, -1, 53, -1, -1, 56, 
+  -1, -1, -1, -1, -1, -1, -1, -1, 65, 66, 
+  67, 68, -1, 70, -1, 72, -1, 74, -1, 76, 
+  -1, -1, -1, -1, 81, 82, 83, -1, -1, -1, 
+  87, -1, -1, -1, -1, -1, -1, 94, 95, 96, 
+  -1, -1, -1, -1, -1, -1, -1, -1, -1, 8, 
+  -1, -1, 11, 12, 13, -1, -1, -1, -1, -1, 
   -1, -1, -1, 22, -1, -1, -1, -1, -1, -1, 
   29, -1, -1, -1, 33, 34, -1, 36, -1, -1, 
-  -1, -1, -1, -1, 43, -1, -1, -1, 47, -1, 
-  -1, -1, -1, -1, -1, -1, 55, -1, -1, -1, 
+  -1, 40, -1, 42, 43, 44, -1, -1, 47, -1, 
+  -1, -1, 51, -1, 53, -1, -1, 56, -1, -1, 
   -1, -1, -1, -1, -1, -1, 65, 66, 67, 68, 
-  -1, 70, -1, -1, -1, -1, 75, -1, -1, -1, 
-  -1, -1, 81, 82, 83, 84, -1, -1, 87, -1, 
+  -1, 70, -1, 72, -1, 74, -1, 76, -1, -1, 
+  -1, -1, 81, 82, 83, -1, -1, -1, 87, -1, 
   -1, -1, -1, -1, -1, 94, 95, 96, -1, -1, 
-  -1, -1, -1, -1, -1, -1, -1, 10, -1, 12, 
-  13, -1, -1, -1, -1, -1, -1, -1, -1, 22, 
-  -1, -1, -1, -1, -1, -1, 29, -1, -1, -1, 
-  33, 34, -1, 36, -1, -1, -1, -1, -1, -1, 
-  43, -1, -1, -1, 47, -1, -1, -1, -1, -1, 
-  -1, -1, 55, -1, -1, -1, -1, -1, -1, -1, 
-  -1, -1, 65, 66, 67, 68, -1, 70, -1, -1, 
-  -1, -1, 75, -1, -1, -1, -1, -1, 81, 82, 
-  83, 84, -1, -1, 87, -1, -1, -1, -1, -1, 
-  -1, 94, 95, 96, -1, -1, -1, -1, -1, -1, 
-  -1, -1, -1, 11, 12, 13, -1, -1, -1, -1, 
-  -1, -1, -1, -1, 22, -1, -1, -1, -1, -1, 
-  -1, 29, -1, -1, -1, 33, 34, -1, 36, -1, 
-  -1, -1, 40, -1, 42, 43, 44, -1, -1, 47, 
-  -1, -1, -1, 51, -1, 53, -1, -1, -1, -1, 
-  -1, -1, -1, -1, -1, -1, -1, 65, 66, 67, 
-  68, -1, 70, -1, 72, -1, 74, -1, 76, -1, 
-  -1, -1, -1, 81, 82, 83, -1, -1, -1, 87, 
-  -1, -1, -1, -1, -1, -1, 94, 95, 96, -1, 
-  -1, -1, -1, -1, -1, -1, -1, -1, 7, -1, 
+  -1, -1, -1, -1, -1, -1, -1, 11, 12, 13, 
+  -1, -1, -1, -1, -1, -1, -1, -1, 22, -1, 
+  -1, -1, -1, -1, -1, 29, 30, -1, -1, 33, 
+  34, -1, 36, -1, -1, -1, 40, -1, 42, 43, 
+  44, -1, -1, 47, -1, -1, -1, 51, -1, 53, 
+  -1, -1, -1, -1, -1, -1, -1, 61, -1, -1, 
+  -1, 65, 66, 67, 68, 69, 70, -1, 72, 73, 
+  74, -1, 76, -1, 78, -1, -1, 81, 82, 83, 
+  -1, -1, -1, 87, -1, -1, -1, -1, -1, -1, 
+  94, 95, 96, -1, -1, -1, -1, -1, -1, -1, 
   -1, -1, 11, 12, 13, -1, -1, -1, -1, -1, 
   -1, -1, -1, 22, -1, -1, -1, -1, -1, -1, 
-  29, -1, -1, -1, 33, 34, -1, 36, -1, -1, 
+  29, 30, -1, -1, 33, 34, -1, 36, -1, -1, 
   -1, 40, -1, 42, 43, 44, -1, -1, 47, -1, 
   -1, -1, 51, -1, 53, -1, -1, -1, -1, -1, 
-  -1, -1, -1, -1, -1, -1, 65, 66, 67, 68, 
-  -1, 70, -1, 72, -1, 74, -1, 76, -1, -1, 
+  -1, -1, 61, -1, -1, -1, 65, 66, 67, 68, 
+  69, 70, -1, 72, 73, 74, -1, 76, -1, 78, 
   -1, -1, 81, 82, 83, -1, -1, -1, 87, -1, 
   -1, -1, -1, -1, -1, 94, 95, 96, -1, -1, 
   -1, -1, -1, -1, -1, -1, -1, 11, 12, 13, 
   -1, -1, -1, -1, -1, -1, -1, -1, 22, -1, 
-  -1, -1, -1, -1, -1, 29, -1, -1, -1, 33, 
+  -1, -1, -1, -1, -1, 29, 30, -1, -1, 33, 
   34, -1, 36, -1, -1, -1, 40, -1, 42, 43, 
   44, -1, -1, 47, -1, -1, -1, 51, -1, 53, 
-  -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 
-  -1, 65, 66, 67, 68, -1, 70, -1, 72, -1, 
-  74, 75, 76, -1, -1, -1, -1, 81, 82, 83, 
+  -1, -1, -1, -1, -1, -1, -1, 61, -1, -1, 
+  -1, 65, 66, 67, 68, 69, 70, -1, 72, 73, 
+  74, -1, 76, -1, 78, -1, -1, 81, 82, 83, 
   -1, -1, -1, 87, -1, -1, -1, -1, -1, -1, 
   94, 95, 96, -1, -1, -1, -1, -1, -1, -1, 
-  -1, -1, 8, -1, -1, 11, 12, 13, -1, -1, 
-  -1, -1, -1, -1, -1, -1, 22, -1, -1, -1, 
-  -1, -1, -1, 29, -1, -1, -1, 33, 34, -1, 
-  36, -1, -1, -1, 40, -1, 42, 43, 44, -1, 
-  -1, 47, -1, -1, -1, 51, -1, 53, -1, -1, 
-  56, -1, -1, -1, -1, -1, -1, -1, -1, 65, 
-  66, 67, 68, -1, 70, -1, 72, -1, 74, -1, 
-  76, -1, -1, -1, -1, 81, 82, 83, -1, -1, 
-  -1, 87, -1, -1, -1, -1, -1, -1, 94, 95, 
-  96, -1, -1, -1, -1, -1, -1, -1, -1, -1, 
-  8, -1, -1, 11, 12, 13, -1, -1, -1, -1, 
-  -1, -1, -1, -1, 22, -1, -1, -1, -1, -1, 
-  -1, 29, -1, -1, -1, 33, 34, -1, 36, -1, 
-  -1, -1, 40, -1, 42, 43, 44, -1, -1, 47, 
-  -1, -1, -1, 51, -1, 53, -1, -1, 56, -1, 
-  -1, -1, -1, -1, -1, -1, -1, 65, 66, 67, 
-  68, -1, 70, -1, 72, -1, 74, -1, 76, -1, 
-  -1, -1, -1, 81, 82, 83, -1, -1, -1, 87, 
-  -1, -1, -1, -1, -1, -1, 94, 95, 96, -1, 
-  -1, -1, -1, -1, -1, -1, -1, -1, 8, -1, 
-  -1, 11, 12, 13, -1, -1, -1, -1, -1, -1, 
-  -1, -1, 22, -1, -1, -1, -1, -1, -1, 29, 
-  -1, -1, -1, 33, 34, -1, 36, -1, -1, -1, 
-  40, -1, 42, 43, 44, -1, -1, 47, -1, -1, 
-  -1, 51, -1, 53, -1, -1, 56, -1, -1, -1, 
-  -1, -1, -1, -1, -1, 65, 66, 67, 68, -1, 
-  70, -1, 72, -1, 74, -1, 76, -1, -1, -1, 
-  -1, 81, 82, 83, -1, -1, -1, 87, -1, -1, 
-  -1, -1, -1, -1, 94, 95, 96, -1, -1, -1, 
-  -1, -1, -1, -1, -1, -1, 8, -1, -1, 11, 
-  12, 13, -1, -1, -1, -1, -1, -1, -1, -1, 
-  22, -1, -1, -1, -1, -1, -1, 29, -1, -1, 
-  -1, 33, 34, -1, 36, -1, -1, -1, 40, -1, 
-  42, 43, 44, -1, -1, 47, -1, -1, -1, 51, 
-  -1, 53, -1, -1, 56, -1, -1, -1, -1, -1, 
-  -1, -1, -1, 65, 66, 67, 68, -1, 70, -1, 
-  72, -1, 74, -1, 76, -1, -1, -1, -1, 81, 
-  82, 83, -1, -1, -1, 87, -1, -1, -1, -1, 
+  -1, -1, 4, 5, 6, -1, -1, 9, 10, 11, 
+  -1, -1, 14, -1, 16, -1, -1, -1, 20, 21, 
+  22, -1, -1, -1, -1, -1, -1, 29, 30, 31, 
+  32, -1, -1, -1, -1, -1, -1, -1, -1, -1, 
+  -1, 43, -1, -1, -1, -1, -1, -1, -1, -1, 
+  -1, -1, -1, -1, -1, -1, -1, 59, -1, -1, 
+  -1, -1, -1, -1, 66, 67, 68, 69, 70, 71, 
+  -1, 73, 74, 75, 76, 77, 78, -1, -1, 81, 
+  82, 83, 84, 85, 86, -1, -1, -1, -1, -1, 
   -1, -1, 94, 95, 96, -1, -1, -1, -1, -1, 
-  -1, -1, -1, -1, 11, 12, 13, -1, -1, -1, 
-  -1, -1, -1, -1, -1, 22, -1, -1, -1, -1, 
-  -1, -1, 29, 30, -1, -1, 33, 34, -1, 36, 
-  -1, -1, -1, 40, -1, 42, 43, 44, -1, -1, 
-  47, -1, -1, -1, 51, -1, 53, -1, -1, -1, 
-  -1, -1, -1, -1, 61, -1, -1, -1, 65, 66, 
-  67, 68, 69, 70, -1, 72, 73, 74, -1, 76, 
-  -1, 78, -1, -1, 81, 82, 83, -1, -1, -1, 
-  87, -1, -1, -1, -1, -1, -1, 94, 95, 96, 
-  -1, -1, -1, -1, -1, -1, -1, -1, -1, 11, 
-  12, 13, -1, -1, -1, -1, -1, -1, -1, -1, 
+  -1, -1, -1, -1, 4, 5, 6, -1, -1, 9, 
+  10, 11, -1, -1, 14, -1, 16, -1, -1, -1, 
+  20, 21, 22, -1, -1, -1, -1, -1, -1, 29, 
+  30, 31, 32, -1, -1, -1, -1, -1, -1, -1, 
+  -1, -1, -1, 43, -1, -1, -1, 47, -1, -1, 
+  -1, -1, -1, -1, -1, -1, -1, -1, -1, 59, 
+  -1, -1, -1, -1, -1, 65, 66, 67, 68, 69, 
+  70, 71, -1, 73, 74, 75, 76, 77, 78, -1, 
+  -1, 81, 82, 83, 84, 85, 86, -1, -1, -1, 
+  -1, -1, -1, -1, 94, 95, 96, -1, -1, -1, 
+  -1, -1, -1, -1, -1, -1, 4, 5, 6, -1, 
+  -1, 9, 10, 11, -1, -1, 14, -1, 16, -1, 
+  -1, -1, 20, 21, 22, -1, -1, -1, -1, -1, 
+  -1, 29, 30, 31, 32, -1, -1, -1, -1, -1, 
+  -1, -1, -1, -1, -1, 43, -1, -1, -1, 47, 
+  -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 
+  -1, 59, -1, -1, -1, -1, -1, 65, 66, 67, 
+  68, 69, 70, 71, -1, 73, 74, 75, 76, 77, 
+  78, -1, -1, 81, 82, 83, 84, 85, 86, -1, 
+  -1, -1, -1, -1, -1, -1, 94, 95, 96, -1, 
+  -1, -1, -1, -1, -1, -1, -1, -1, 4, 5, 
+  6, -1, -1, 9, 10, 11, -1, -1, 14, -1, 
+  16, -1, -1, -1, 20, 21, 22, -1, -1, -1, 
+  -1, -1, -1, 29, 30, 31, 32, -1, -1, -1, 
+  -1, -1, -1, -1, -1, -1, -1, 43, -1, -1, 
+  -1, 47, -1, -1, -1, -1, -1, -1, -1, 55, 
+  -1, -1, -1, 59, -1, -1, -1, -1, -1, 65, 
+  66, 67, 68, 69, 70, 71, -1, 73, 74, 75, 
+  76, 77, 78, -1, -1, 81, 82, 83, 84, 85, 
+  86, -1, -1, -1, -1, -1, -1, -1, 94, 95, 
+  96, -1, -1, -1, -1, -1, -1, -1, -1, -1, 
+  4, -1, -1, -1, -1, 9, -1, 11, 12, 13, 
+  14, -1, -1, -1, -1, -1, -1, 21, 22, -1, 
+  -1, -1, -1, -1, -1, 29, 30, -1, -1, 33, 
+  34, -1, 36, -1, -1, -1, 40, -1, 42, 43, 
+  44, -1, -1, 47, -1, -1, -1, 51, -1, 53, 
+  -1, -1, -1, -1, -1, 59, -1, 61, -1, -1, 
+  -1, 65, 66, 67, 68, 69, 70, 71, 72, 73, 
+  74, 75, 76, 77, 78, -1, -1, 81, 82, 83, 
+  84, 85, -1, 87, -1, -1, -1, -1, -1, -1, 
+  94, 95, 96, -1, -1, -1, -1, -1, -1, -1, 
+  -1, -1, 4, -1, -1, -1, -1, 9, -1, 11, 
+  12, 13, 14, -1, -1, -1, -1, -1, -1, 21, 
   22, -1, -1, -1, -1, -1, -1, 29, 30, -1, 
   -1, 33, 34, -1, 36, -1, -1, -1, 40, -1, 
   42, 43, 44, -1, -1, 47, -1, -1, -1, 51, 
-  -1, 53, -1, -1, -1, -1, -1, -1, -1, 61, 
-  -1, -1, -1, 65, 66, 67, 68, 69, 70, -1, 
-  72, 73, 74, -1, 76, -1, 78, -1, -1, 81, 
-  82, 83, -1, -1, -1, 87, -1, -1, -1, -1, 
+  -1, 53, -1, -1, -1, -1, -1, 59, -1, 61, 
+  -1, -1, -1, 65, 66, 67, 68, 69, 70, 71, 
+  72, 73, 74, 75, 76, 77, 78, -1, -1, 81, 
+  82, 83, 84, 85, -1, 87, -1, -1, -1, -1, 
   -1, -1, 94, 95, 96, -1, -1, -1, -1, -1, 
-  -1, -1, -1, -1, 11, 12, 13, -1, -1, -1, 
-  -1, -1, -1, -1, -1, 22, -1, -1, -1, -1, 
-  -1, -1, 29, 30, -1, -1, 33, 34, -1, 36, 
-  -1, -1, -1, 40, -1, 42, 43, 44, -1, -1, 
-  47, -1, -1, -1, 51, -1, 53, -1, -1, -1, 
-  -1, -1, -1, -1, 61, -1, -1, -1, 65, 66, 
-  67, 68, 69, 70, -1, 72, 73, 74, -1, 76, 
-  -1, 78, -1, -1, 81, 82, 83, -1, -1, -1, 
-  87, -1, -1, -1, -1, -1, -1, 94, 95, 96, 
-  -1, -1, -1, -1, -1, -1, -1, -1, -1, 4, 
-  5, 6, -1, -1, 9, 10, 11, -1, -1, 14, 
-  -1, 16, -1, -1, -1, 20, 21, 22, -1, -1, 
-  -1, -1, -1, -1, 29, 30, 31, 32, -1, -1, 
-  -1, -1, -1, -1, -1, -1, -1, -1, 43, -1, 
-  -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 
-  -1, -1, -1, -1, 59, -1, -1, -1, -1, -1, 
-  -1, 66, 67, 68, 69, 70, 71, -1, 73, 74, 
-  75, 76, 77, 78, -1, -1, 81, 82, 83, 84, 
-  85, 86, -1, -1, -1, -1, -1, -1, -1, 94, 
-  95, 96, -1, -1, -1, -1, -1, -1, -1, -1, 
-  -1, 4, 5, 6, -1, -1, 9, 10, 11, -1, 
-  -1, 14, -1, 16, -1, -1, -1, 20, 21, 22, 
-  -1, -1, -1, -1, -1, -1, 29, 30, 31, 32, 
-  -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 
-  43, -1, -1, -1, 47, -1, -1, -1, -1, -1, 
-  -1, -1, -1, -1, -1, -1, 59, -1, -1, -1, 
-  -1, -1, 65, 66, 67, 68, 69, 70, 71, -1, 
-  73, 74, 75, 76, 77, 78, -1, -1, 81, 82, 
-  83, 84, 85, 86, -1, -1, -1, -1, -1, -1, 
-  -1, 94, 95, 96, -1, -1, -1, -1, -1, -1, 
-  -1, -1, -1, 4, 5, 6, -1, -1, 9, 10, 
-  11, -1, -1, 14, -1, 16, -1, -1, -1, 20, 
-  21, 22, -1, -1, -1, -1, -1, -1, 29, 30, 
-  31, 32, -1, -1, -1, -1, -1, -1, -1, -1, 
-  -1, -1, 43, -1, -1, -1, 47, -1, -1, -1, 
-  -1, -1, -1, -1, -1, -1, -1, -1, 59, -1, 
-  -1, -1, -1, -1, 65, 66, 67, 68, 69, 70, 
-  71, -1, 73, 74, 75, 76, 77, 78, -1, -1, 
-  81, 82, 83, 84, 85, 86, -1, -1, -1, -1, 
-  -1, -1, -1, 94, 95, 96, -1, -1, -1, -1, 
-  -1, -1, -1, -1, -1, 4, 5, 6, -1, -1, 
-  9, 10, 11, -1, -1, 14, -1, 16, -1, -1, 
-  -1, 20, 21, 22, -1, -1, -1, -1, -1, -1, 
-  29, 30, 31, 32, -1, -1, -1, -1, -1, -1, 
-  -1, -1, -1, -1, 43, -1, -1, -1, 47, -1, 
-  -1, -1, -1, -1, -1, -1, 55, -1, -1, -1, 
-  59, -1, -1, -1, -1, -1, 65, 66, 67, 68, 
-  69, 70, 71, -1, 73, 74, 75, 76, 77, 78, 
-  -1, -1, 81, 82, 83, 84, 85, 86, -1, -1, 
-  -1, -1, -1, -1, -1, 94, 95, 96, -1, -1, 
-  -1, -1, -1, -1, -1, -1, -1, 4, -1, -1, 
-  -1, -1, 9, -1, 11, 12, 13, 14, -1, -1, 
-  -1, -1, -1, -1, 21, 22, -1, -1, -1, -1, 
-  -1, -1, 29, 30, -1, -1, 33, 34, -1, 36, 
-  -1, -1, -1, 40, -1, 42, 43, 44, -1, -1, 
-  47, -1, -1, -1, 51, -1, 53, -1, -1, -1, 
-  -1, -1, 59, -1, 61, -1, -1, -1, 65, 66, 
-  67, 68, 69, 70, 71, 72, 73, 74, 75, 76, 
-  77, 78, -1, -1, 81, 82, 83, 84, 85, -1, 
-  87, -1, -1, -1, -1, -1, -1, 94, 95, 96, 
-  -1, -1, -1, -1, -1, -1, -1, -1, -1, 4, 
-  -1, -1, -1, -1, 9, -1, 11, 12, 13, 14, 
-  -1, -1, -1, -1, -1, -1, 21, 22, -1, -1, 
-  -1, -1, -1, -1, 29, 30, -1, -1, 33, 34, 
-  -1, 36, -1, -1, -1, 40, -1, 42, 43, 44, 
-  -1, -1, 47, -1, -1, -1, 51, -1, 53, -1, 
-  -1, -1, -1, -1, 59, -1, 61, -1, -1, -1, 
-  65, 66, 67, 68, 69, 70, 71, 72, 73, 74, 
-  75, 76, 77, 78, -1, -1, 81, 82, 83, 84, 
-  85, -1, 87, -1, -1, -1, -1, -1, -1, 94, 
-  95, 96, -1, -1, -1, -1, -1, -1, -1, -1, 
-  -1, 4, 5, 6, -1, -1, 9, 10, 11, 12, 
-  13, 14, -1, 16, -1, -1, -1, 20, 21, 22, 
-  -1, -1, -1, -1, -1, -1, 29, 30, 31, 32, 
-  33, 34, -1, 36, -1, -1, -1, 40, -1, 42, 
-  43, 44, -1, -1, 47, -1, -1, -1, 51, -1, 
-  53, -1, -1, -1, -1, -1, 59, -1, 61, -1, 
-  -1, -1, 65, 66, 67, 68, 69, 70, 71, 72, 
-  73, 74, 75, 76, 77, 78, -1, -1, 81, 82, 
-  83, 84, 85, 86, 87, -1, -1, -1, -1, -1, 
-  -1, 94, 95, 96, -1, -1, -1, -1, -1, -1, 
-  -1, -1, -1, 4, 5, 6, -1, -1, 9, 10, 
-  11, 12, 13, 14, -1, 16, -1, -1, -1, 20, 
-  21, 22, -1, -1, -1, -1, -1, -1, 29, 30, 
-  31, 32, 33, 34, -1, 36, -1, -1, -1, 40, 
-  -1, 42, 43, 44, -1, -1, 47, -1, -1, -1, 
-  51, -1, 53, -1, 55, -1, -1, -1, 59, -1, 
-  61, -1, -1, -1, 65, 66, 67, 68, 69, 70, 
-  71, 72, 73, 74, 75, 76, 77, 78, -1, -1, 
-  81, 82, 83, 84, 85, 86, 87, -1, -1, -1, 
-  -1, -1, -1, 94, 95, 96, -1, -1, -1, -1, 
-  -1, -1, -1, -1, -1, 
+  -1, -1, -1, -1, 4, 5, 6, -1, -1, 9, 
+  10, 11, 12, 13, 14, -1, 16, -1, -1, -1, 
+  20, 21, 22, -1, -1, -1, -1, -1, -1, 29, 
+  30, 31, 32, 33, 34, -1, 36, -1, -1, -1, 
+  40, -1, 42, 43, 44, -1, -1, 47, -1, -1, 
+  -1, 51, -1, 53, -1, -1, -1, -1, -1, 59, 
+  -1, 61, -1, -1, -1, 65, 66, 67, 68, 69, 
+  70, 71, 72, 73, 74, 75, 76, 77, 78, -1, 
+  -1, 81, 82, 83, 84, 85, 86, 87, -1, -1, 
+  -1, -1, -1, -1, 94, 95, 96, -1, -1, -1, 
+  -1, -1, -1, -1, -1, -1, 4, 5, 6, -1, 
+  -1, 9, 10, 11, 12, 13, 14, -1, 16, -1, 
+  -1, -1, 20, 21, 22, -1, -1, -1, -1, -1, 
+  -1, 29, 30, 31, 32, 33, 34, -1, 36, -1, 
+  -1, -1, 40, -1, 42, 43, 44, -1, -1, 47, 
+  -1, -1, -1, 51, -1, 53, -1, 55, -1, -1, 
+  -1, 59, -1, 61, -1, -1, -1, 65, 66, 67, 
+  68, 69, 70, 71, 72, 73, 74, 75, 76, 77, 
+  78, -1, -1, 81, 82, 83, 84, 85, 86, 87, 
+  -1, -1, -1, -1, -1, -1, 94, 95, 96, -1, 
+  -1, -1, -1, -1, -1, -1, -1, -1, 
 
-  14, 18, 32, 22, 14, 25, 32, 18, 32, 3, 
-  18, 18, 18, 22, 14, 3, 18, 22, 22, 32, 
-  18, 18, 3, 18, 3, 18, 18, 18, 18, 32, 
-  3, 32, 18, 18, 3, 18, 25, 3, 18, 3, 
-  18, 18, 18, 42, 18, 3, 42, 3, 3, 3, 
-  18, 3, 9, 3, 77, 42, 3, 18, 42, 105, 
-  42, 3, 25, 25, 3, 18, 25, 42, 3, 18, 
-  42, 42, 42, 100, 103, 42, 2, 42, 18, 4, 
-  18, 14, 2, -1, 18, 2, -1, 18, 4, 2, 
-  23, -1, 18, 18, 54, -1, -1, 18, 18, 11, 
-  12, 18, 18, 54, -1, 18, 54, 14, 54, 47, 
-  70, 54, 42, 64, 60, 46, -1, 54, 66, 56, 
-  50, 3, 54, 18, 56, 68, 54, 54, 56, 56, 
-  54, 54, 3, 57, 57, 54, 54, 56, 56, 54, 
-  54, 56, 56, 54, 51, 56, 54, -1, 56, 54, 
-  54, 56, 56, 54, 54, 18, 54, 54, 58, 60, 
-  58, 54, 59, 54, 54, 54, 59, 54, 59, 59, 
-  59, 54, 59, 54, 54, 109, 59, 58, 54, 54, 
-  60, 54, 18, 56, 60, 2, 14, 62, 14, 2, 
-  54, 19, 56, 19, 2, 2, 78, 2, 54, 94, 
-  56, 18, 18, 14, 14, 18, 18, 78, 44, 18, 
-  18, 18, 54, 18, 56, 54, 18, 56, 42, 18, 
-  4, 2, 2, 2, 18, 54, 50, 2, 44, 92, 
-  59, 43, 18, 54, 18, 56, 45, 18, 18, 18, 
-  51, 51, 18, 18, 46, 38, 45, 14, 2, 42, 
-  2, 45, 19, 54, 54, 2, 54, 54, 59, 59, 
-  46, 59, 59, 3, 18, 3, 18, 54, 2, 45, 
-  2, 18, 59, -1, -1, -1, 54, 54, -1, -1, 
-  54, 59, 59, 54, 18, 59, 18, 18, 59, 76, 
-  54, 69, 54, 54, 71, 59, 54, 59, 59, 63, 
-  61, 59, 76, 61, 54, 76, -1, -1, 54, 59, 
-  -1, 61, -1, 59, 76, 61, 47, 48, 54, 54, 
-  14, 54, -1, 59, 59, -1, 59, 14, 5, 23, 
-  65, 67, 19, -1, 21, -1, -1, 14, 78, 5, 
-  78, 35, 36, 76, 2, -1, 23, -1, 14, -1, 
-  -1, -1, -1, -1, 88, 42, 88, 23, 35, 36, 
-  18, 25, 26, 27, 28, 29, 30, 31, 14, 35, 
-  36, -1, -1, -1, -1, -1, -1, 23, 24, 25, 
-  26, 27, 28, 29, 30, 31, 14, -1, -1, -1, 
-  -1, -1, -1, -1, -1, 23, 24, 25, 26, 27, 
-  28, 29, 30, 31, -1, -1, -1, -1, -1, -1, 
-  -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 
+  77, 14, 18, 18, 18, 32, 18, 3, 32, 42, 
+  9, 3, 3, 18, 42, 3, 18, 18, 3, 22, 
+  18, 32, 32, 18, 18, 25, 32, 3, 18, 18, 
+  3, 18, 3, 42, 18, 14, 22, 18, 18, 22, 
+  22, 18, 100, 18, 18, 42, 18, 3, 105, 42, 
+  3, 3, 18, 14, 32, 18, 3, 25, 25, 18, 
+  3, 25, 3, 18, 18, 3, 103, 18, 18, 2, 
+  -1, 3, 42, 42, 18, 14, 25, 42, 14, 2, 
+  42, -1, 42, 18, 42, 18, 2, 4, -1, -1, 
+  18, -1, -1, 18, -1, 18, -1, 54, -1, 56, 
+  44, 18, 18, 18, 18, -1, 54, -1, 54, 54, 
+  56, 56, 51, 42, 54, 51, 56, 54, 46, 56, 
+  45, 50, 70, 54, 54, 56, 56, 3, 54, 42, 
+  45, 18, 46, 59, 54, 54, 54, 50, 2, 59, 
+  59, 59, 54, 54, 11, 12, 78, 59, 59, 54, 
+  54, 56, 56, 54, 18, 2, 14, 18, 4, 54, 
+  54, 56, 56, 54, 54, 23, 3, 68, 58, 60, 
+  54, 18, 18, 14, 109, 2, 60, 2, 19, 54, 
+  54, 54, 43, 38, 59, 59, 59, 42, 54, 54, 
+  56, 18, 54, 18, 59, 54, 2, 59, 54, 58, 
+  54, 2, 58, 18, 54, 59, 2, 94, 2, 54, 
+  18, 4, 18, 2, 18, 3, 66, 18, 18, 64, 
+  3, 54, 18, 56, 18, 18, 54, 2, 56, 18, 
+  45, 54, 18, 56, 54, 14, 14, 57, 2, 47, 
+  19, 78, 46, 18, 44, 54, 2, 18, 57, 54, 
+  2, 54, 2, 56, 18, 60, 54, 54, 56, 56, 
+  14, -1, 18, 54, 54, 19, 18, -1, 18, 60, 
+  54, 18, 62, 51, 45, 59, -1, 54, -1, -1, 
+  54, 54, 59, 67, 54, 59, 59, 54, 2, 59, 
+  78, -1, 59, 63, 61, 78, 69, 71, -1, 76, 
+  47, 48, -1, 54, 18, 54, 92, -1, 59, 54, 
+  59, 54, 61, 54, 59, -1, 59, 54, 59, 54, 
+  65, -1, 59, 54, 59, 76, 61, -1, 59, 14, 
+  61, 14, 2, 76, 19, 76, 21, 5, 88, 76, 
+  23, -1, -1, -1, -1, -1, 14, -1, 18, -1, 
+  -1, -1, 35, 36, -1, 23, -1, 42, 25, 26, 
+  27, 28, 29, 30, 31, -1, 14, 35, 36, -1, 
+  -1, -1, -1, -1, 88, 23, 24, 25, 26, 27, 
+  28, 29, 30, 31, 14, -1, -1, -1, -1, -1, 
+  -1, -1, -1, 23, 24, 25, 26, 27, 28, 29, 
+  30, 31, 14, -1, -1, -1, -1, -1, -1, -1, 
+  -1, 23, 24, 25, 26, 27, 28, 29, 30, 31, 
   -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 
   -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 
+  -1, 5, -1, -1, -1, -1, -1, -1, -1, -1, 
+  14, -1, -1, -1, -1, -1, -1, -1, -1, 23, 
   -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 
-  -1, -1, -1, 14, -1, -1, -1, -1, -1, -1, 
-  -1, -1, 23, 24, 25, 26, 27, 28, 29, 30, 
-  31, -1, -1, -1, -1, -1, -1, -1, -1, -1, 
+  -1, 35, 36, -1, -1, -1, -1, -1, -1, -1, 
   -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 
   -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 
   -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 
   -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 
   -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 
   -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 
-  -1, -1, -1, -1, -1, -1, -1, -1, -1, -1};
+  -1, -1, -1, -1, -1, -1, -1};
 
 QT_END_NAMESPACE
diff --git a/src/qml/parser/qqmljsgrammar_p.h b/src/qml/parser/qqmljsgrammar_p.h
index 244a807f24..050ef6c288 100644
--- a/src/qml/parser/qqmljsgrammar_p.h
+++ b/src/qml/parser/qqmljsgrammar_p.h
@@ -167,15 +167,15 @@ public:
     T_XOR = 79,
     T_XOR_EQ = 80,
 
-    ACCEPT_STATE = 672,
-    RULE_COUNT = 360,
-    STATE_COUNT = 673,
+    ACCEPT_STATE = 674,
+    RULE_COUNT = 361,
+    STATE_COUNT = 675,
     TERMINAL_COUNT = 106,
     NON_TERMINAL_COUNT = 111,
 
-    GOTO_INDEX_OFFSET = 673,
-    GOTO_INFO_OFFSET = 3185,
-    GOTO_CHECK_OFFSET = 3185
+    GOTO_INDEX_OFFSET = 675,
+    GOTO_INFO_OFFSET = 3078,
+    GOTO_CHECK_OFFSET = 3078
   };
 
   static const char  *const    spell [];
diff --git a/src/qml/parser/qqmljsparser.cpp b/src/qml/parser/qqmljsparser.cpp
index ca5a09d22d..50518a92ee 100644
--- a/src/qml/parser/qqmljsparser.cpp
+++ b/src/qml/parser/qqmljsparser.cpp
@@ -436,31 +436,55 @@ case 47:
     sym(1).Node = node;
 }   break;
 
+case 48: {
+  AST::UiQualifiedId *node = new (pool) AST::UiQualifiedId(stringRef(1));
+  node->identifierToken = loc(1);
+  sym(1).Node = node;
+} break;
+
+case 49: {
+  AST::UiQualifiedId *node = new (pool) AST::UiQualifiedId(stringRef(1));
+  node->identifierToken = loc(1);
+  sym(1).Node = node;
+} break;
+
+case 50: {
+  AST::UiQualifiedId *node = new (pool) AST::UiQualifiedId(stringRef(1));
+  node->identifierToken = loc(1);
+  sym(1).Node = node;
+} break;
+
 case 51: {
-  sym(1).Node = 0;
+  AST::UiQualifiedId *node = new (pool) AST::UiQualifiedId(sym(1).UiQualifiedId, stringRef(3));
+  node->identifierToken = loc(3);
+  sym(1).Node = node;
 } break;
 
 case 52: {
-  sym(1).Node = sym(1).UiParameterList->finish ();
+  sym(1).Node = 0;
 } break;
 
 case 53: {
-  AST::UiParameterList *node = new (pool) AST::UiParameterList(stringRef(1), stringRef(2));
+  sym(1).Node = sym(1).UiParameterList->finish ();
+} break;
+
+case 54: {
+  AST::UiParameterList *node = new (pool) AST::UiParameterList(sym(1).UiQualifiedId->finish(), stringRef(2));
   node->propertyTypeToken = loc(1);
   node->identifierToken = loc(2);
   sym(1).Node = node;
 } break;
 
-case 54: {
-  AST::UiParameterList *node = new (pool) AST::UiParameterList(sym(1).UiParameterList, stringRef(3), stringRef(4));
+case 55: {
+  AST::UiParameterList *node = new (pool) AST::UiParameterList(sym(1).UiParameterList, sym(3).UiQualifiedId->finish(), stringRef(4));
   node->propertyTypeToken = loc(3);
   node->commaToken = loc(2);
   node->identifierToken = loc(4);
   sym(1).Node = node;
 } break;
 
-case 56: {
-    AST::UiPublicMember *node = new (pool) AST::UiPublicMember(QStringRef(), stringRef(2));
+case 57: {
+    AST::UiPublicMember *node = new (pool) AST::UiPublicMember(nullptr, stringRef(2));
     node->type = AST::UiPublicMember::Signal;
     node->propertyToken = loc(1);
     node->typeToken = loc(2);
@@ -470,8 +494,8 @@ case 56: {
     sym(1).Node = node;
 }   break;
 
-case 58: {
-    AST::UiPublicMember *node = new (pool) AST::UiPublicMember(QStringRef(), stringRef(2));
+case 59: {
+    AST::UiPublicMember *node = new (pool) AST::UiPublicMember(nullptr, stringRef(2));
     node->type = AST::UiPublicMember::Signal;
     node->propertyToken = loc(1);
     node->typeToken = loc(2);
@@ -480,8 +504,8 @@ case 58: {
     sym(1).Node = node;
 }   break;
 
-case 60: {
-    AST::UiPublicMember *node = new (pool) AST::UiPublicMember(stringRef(4), stringRef(6));
+case 61: {
+    AST::UiPublicMember *node = new (pool) AST::UiPublicMember(sym(4).UiQualifiedId->finish(), stringRef(6));
     node->typeModifier = stringRef(2);
     node->propertyToken = loc(1);
     node->typeModifierToken = loc(2);
@@ -491,8 +515,8 @@ case 60: {
     sym(1).Node = node;
 }   break;
 
-case 62: {
-    AST::UiPublicMember *node = new (pool) AST::UiPublicMember(stringRef(2), stringRef(3));
+case 63: {
+    AST::UiPublicMember *node = new (pool) AST::UiPublicMember(sym(2).UiQualifiedId->finish(), stringRef(3));
     node->propertyToken = loc(1);
     node->typeToken = loc(2);
     node->identifierToken = loc(3);
@@ -500,8 +524,8 @@ case 62: {
     sym(1).Node = node;
 }   break;
 
-case 64: {
-    AST::UiPublicMember *node = new (pool) AST::UiPublicMember(stringRef(3), stringRef(4));
+case 65: {
+    AST::UiPublicMember *node = new (pool) AST::UiPublicMember(sym(3).UiQualifiedId->finish(), stringRef(4));
     node->isDefaultMember = true;
     node->defaultToken = loc(1);
     node->propertyToken = loc(2);
@@ -511,8 +535,8 @@ case 64: {
     sym(1).Node = node;
 }   break;
 
-case 66: {
-    AST::UiPublicMember *node = new (pool) AST::UiPublicMember(stringRef(5), stringRef(7));
+case 67: {
+    AST::UiPublicMember *node = new (pool) AST::UiPublicMember(sym(5).UiQualifiedId->finish(), stringRef(7));
     node->isDefaultMember = true;
     node->defaultToken = loc(1);
     node->typeModifier = stringRef(3);
@@ -524,8 +548,8 @@ case 66: {
     sym(1).Node = node;
 }   break;
 
-case 67: {
-    AST::UiPublicMember *node = new (pool) AST::UiPublicMember(stringRef(2), stringRef(3),
+case 68: {
+    AST::UiPublicMember *node = new (pool) AST::UiPublicMember(sym(2).UiQualifiedId->finish(), stringRef(3),
         sym(5).Statement);
     node->propertyToken = loc(1);
     node->typeToken = loc(2);
@@ -534,8 +558,8 @@ case 67: {
     sym(1).Node = node;
 }   break;
 
-case 68: {
-    AST::UiPublicMember *node = new (pool) AST::UiPublicMember(stringRef(3), stringRef(4),
+case 69: {
+    AST::UiPublicMember *node = new (pool) AST::UiPublicMember(sym(3).UiQualifiedId->finish(), stringRef(4),
         sym(6).Statement);
     node->isReadonlyMember = true;
     node->readonlyToken = loc(1);
@@ -546,8 +570,8 @@ case 68: {
     sym(1).Node = node;
 }   break;
 
-case 69: {
-    AST::UiPublicMember *node = new (pool) AST::UiPublicMember(stringRef(3), stringRef(4),
+case 70: {
+    AST::UiPublicMember *node = new (pool) AST::UiPublicMember(sym(3).UiQualifiedId->finish(), stringRef(4),
         sym(6).Statement);
     node->isDefaultMember = true;
     node->defaultToken = loc(1);
@@ -558,8 +582,8 @@ case 69: {
     sym(1).Node = node;
 }   break;
 
-case 70: {
-    AST::UiPublicMember *node = new (pool) AST::UiPublicMember(stringRef(4), stringRef(6));
+case 71: {
+    AST::UiPublicMember *node = new (pool) AST::UiPublicMember(sym(4).UiQualifiedId->finish(), stringRef(6));
     node->typeModifier = stringRef(2);
     node->propertyToken = loc(1);
     node->typeModifierToken = loc(2);
@@ -582,8 +606,8 @@ case 70: {
     sym(1).Node = node;
 }   break;
 
-case 71: {
-    AST::UiPublicMember *node = new (pool) AST::UiPublicMember(stringRef(2), stringRef(3));
+case 72: {
+    AST::UiPublicMember *node = new (pool) AST::UiPublicMember(sym(2).UiQualifiedId->finish(), stringRef(3));
     node->propertyToken = loc(1);
     node->typeToken = loc(2);
     node->identifierToken = loc(3);
@@ -602,8 +626,8 @@ case 71: {
     sym(1).Node = node;
 }   break;
 
-case 72: {
-    AST::UiPublicMember *node = new (pool) AST::UiPublicMember(stringRef(3), stringRef(4));
+case 73: {
+    AST::UiPublicMember *node = new (pool) AST::UiPublicMember(sym(3).UiQualifiedId->finish(), stringRef(4));
     node->isReadonlyMember = true;
     node->readonlyToken = loc(1);
     node->propertyToken = loc(2);
@@ -624,57 +648,57 @@ case 72: {
     sym(1).Node = node;
 }   break;
 
-case 73: {
+case 74: {
     sym(1).Node = new (pool) AST::UiSourceElement(sym(1).Node);
 }   break;
 
-case 74: {
+case 75: {
     sym(1).Node = new (pool) AST::UiSourceElement(sym(1).Node);
 }   break;
 
-case 82: {
+case 83: {
   AST::ThisExpression *node = new (pool) AST::ThisExpression();
   node->thisToken = loc(1);
   sym(1).Node = node;
 } break;
 
-case 83: {
+case 84: {
   AST::IdentifierExpression *node = new (pool) AST::IdentifierExpression(stringRef(1));
   node->identifierToken = loc(1);
   sym(1).Node = node;
 } break;
 
-case 84: {
+case 85: {
   AST::NullExpression *node = new (pool) AST::NullExpression();
   node->nullToken = loc(1);
   sym(1).Node = node;
 } break;
 
-case 85: {
+case 86: {
   AST::TrueLiteral *node = new (pool) AST::TrueLiteral();
   node->trueToken = loc(1);
   sym(1).Node = node;
 } break;
 
-case 86: {
+case 87: {
   AST::FalseLiteral *node = new (pool) AST::FalseLiteral();
   node->falseToken = loc(1);
   sym(1).Node = node;
 } break;
 
-case 87: {
+case 88: {
   AST::NumericLiteral *node = new (pool) AST::NumericLiteral(sym(1).dval);
   node->literalToken = loc(1);
   sym(1).Node = node;
 } break;
-case 88:
-case 89: {
+case 89:
+case 90: {
   AST::StringLiteral *node = new (pool) AST::StringLiteral(stringRef(1));
   node->literalToken = loc(1);
   sym(1).Node = node;
 } break;
 
-case 90: {
+case 91: {
   bool rx = lexer->scanRegExp(Lexer::NoPrefix);
   if (!rx) {
     diagnostic_messages.append(DiagnosticMessage(DiagnosticMessage::Error, location(lexer), lexer->errorMessage()));
@@ -690,7 +714,7 @@ case 90: {
   sym(1).Node = node;
 } break;
 
-case 91: {
+case 92: {
   bool rx = lexer->scanRegExp(Lexer::EqualPrefix);
   if (!rx) {
     diagnostic_messages.append(DiagnosticMessage(DiagnosticMessage::Error, location(lexer), lexer->errorMessage()));
@@ -706,28 +730,28 @@ case 91: {
   sym(1).Node = node;
 } break;
 
-case 92: {
+case 93: {
   AST::ArrayLiteral *node = new (pool) AST::ArrayLiteral((AST::Elision *) 0);
   node->lbracketToken = loc(1);
   node->rbracketToken = loc(2);
   sym(1).Node = node;
 } break;
 
-case 93: {
+case 94: {
   AST::ArrayLiteral *node = new (pool) AST::ArrayLiteral(sym(2).Elision->finish());
   node->lbracketToken = loc(1);
   node->rbracketToken = loc(3);
   sym(1).Node = node;
 } break;
 
-case 94: {
+case 95: {
   AST::ArrayLiteral *node = new (pool) AST::ArrayLiteral(sym(2).ElementList->finish ());
   node->lbracketToken = loc(1);
   node->rbracketToken = loc(3);
   sym(1).Node = node;
 } break;
 
-case 95: {
+case 96: {
   AST::ArrayLiteral *node = new (pool) AST::ArrayLiteral(sym(2).ElementList->finish (),
     (AST::Elision *) 0);
   node->lbracketToken = loc(1);
@@ -736,7 +760,7 @@ case 95: {
   sym(1).Node = node;
 } break;
 
-case 96: {
+case 97: {
   AST::ArrayLiteral *node = new (pool) AST::ArrayLiteral(sym(2).ElementList->finish (),
     sym(4).Elision->finish());
   node->lbracketToken = loc(1);
@@ -745,7 +769,7 @@ case 96: {
   sym(1).Node = node;
 } break;
 
-case 97: {
+case 98: {
   AST::ObjectLiteral *node = 0;
   if (sym(2).Node)
     node = new (pool) AST::ObjectLiteral(
@@ -757,7 +781,7 @@ case 97: {
   sym(1).Node = node;
 } break;
 
-case 98: {
+case 99: {
   AST::ObjectLiteral *node = new (pool) AST::ObjectLiteral(
     sym(2).PropertyAssignmentList->finish ());
   node->lbraceToken = loc(1);
@@ -765,14 +789,14 @@ case 98: {
   sym(1).Node = node;
 } break;
 
-case 99: {
+case 100: {
   AST::NestedExpression *node = new (pool) AST::NestedExpression(sym(2).Expression);
   node->lparenToken = loc(1);
   node->rparenToken = loc(3);
   sym(1).Node = node;
 } break;
 
-case 100: {
+case 101: {
   if (AST::ArrayMemberExpression *mem = AST::cast<AST::ArrayMemberExpression *>(sym(1).Expression)) {
     diagnostic_messages.append(DiagnosticMessage(DiagnosticMessage::Warning, mem->lbracketToken,
       QLatin1String("Ignored annotation")));
@@ -792,48 +816,48 @@ case 100: {
   }
 } break;
 
-case 101: {
+case 102: {
   sym(1).Node = new (pool) AST::ElementList((AST::Elision *) 0, sym(1).Expression);
 } break;
 
-case 102: {
+case 103: {
   sym(1).Node = new (pool) AST::ElementList(sym(1).Elision->finish(), sym(2).Expression);
 } break;
 
-case 103: {
+case 104: {
   AST::ElementList *node = new (pool) AST::ElementList(sym(1).ElementList,
     (AST::Elision *) 0, sym(3).Expression);
   node->commaToken = loc(2);
   sym(1).Node = node;
 } break;
 
-case 104: {
+case 105: {
   AST::ElementList *node = new (pool) AST::ElementList(sym(1).ElementList, sym(3).Elision->finish(),
     sym(4).Expression);
   node->commaToken = loc(2);
   sym(1).Node = node;
 } break;
 
-case 105: {
+case 106: {
   AST::Elision *node = new (pool) AST::Elision();
   node->commaToken = loc(1);
   sym(1).Node = node;
 } break;
 
-case 106: {
+case 107: {
   AST::Elision *node = new (pool) AST::Elision(sym(1).Elision);
   node->commaToken = loc(2);
   sym(1).Node = node;
 } break;
 
-case 107: {
+case 108: {
   AST::PropertyNameAndValue *node = new (pool) AST::PropertyNameAndValue(
       sym(1).PropertyName, sym(3).Expression);
   node->colonToken = loc(2);
   sym(1).Node = node;
 } break;
 
-case 108: {
+case 109: {
   AST::PropertyGetterSetter *node = new (pool) AST::PropertyGetterSetter(
       sym(2).PropertyName, sym(6).FunctionBody);
   node->getSetToken = loc(1);
@@ -844,7 +868,7 @@ case 108: {
   sym(1).Node = node;
 } break;
 
-case 109: {
+case 110: {
   AST::PropertyGetterSetter *node = new (pool) AST::PropertyGetterSetter(
       sym(2).PropertyName, sym(4).FormalParameterList, sym(7).FunctionBody);
   node->getSetToken = loc(1);
@@ -855,56 +879,56 @@ case 109: {
   sym(1).Node = node;
 } break;
 
-case 110: {
+case 111: {
   sym(1).Node = new (pool) AST::PropertyAssignmentList(sym(1).PropertyAssignment);
 } break;
 
-case 111: {
+case 112: {
   AST::PropertyAssignmentList *node = new (pool) AST::PropertyAssignmentList(
     sym(1).PropertyAssignmentList, sym(3).PropertyAssignment);
   node->commaToken = loc(2);
   sym(1).Node = node;
 } break;
 
-case 112: {
+case 113: {
   AST::IdentifierPropertyName *node = new (pool) AST::IdentifierPropertyName(stringRef(1));
   node->propertyNameToken = loc(1);
   sym(1).Node = node;
 } break;
 
-case 113: {
+case 114: {
   AST::StringLiteralPropertyName *node = new (pool) AST::StringLiteralPropertyName(stringRef(1));
   node->propertyNameToken = loc(1);
   sym(1).Node = node;
 } break;
 
-case 114: {
+case 115: {
   AST::NumericLiteralPropertyName *node = new (pool) AST::NumericLiteralPropertyName(sym(1).dval);
   node->propertyNameToken = loc(1);
   sym(1).Node = node;
 } break;
 
-case 115: {
+case 116: {
   AST::IdentifierPropertyName *node = new (pool) AST::IdentifierPropertyName(stringRef(1));
   node->propertyNameToken = loc(1);
   sym(1).Node = node;
 } break;
 
-case 151: {
+case 152: {
   AST::ArrayMemberExpression *node = new (pool) AST::ArrayMemberExpression(sym(1).Expression, sym(3).Expression);
   node->lbracketToken = loc(2);
   node->rbracketToken = loc(4);
   sym(1).Node = node;
 } break;
 
-case 152: {
+case 153: {
   AST::FieldMemberExpression *node = new (pool) AST::FieldMemberExpression(sym(1).Expression, stringRef(3));
   node->dotToken = loc(2);
   node->identifierToken = loc(3);
   sym(1).Node = node;
 } break;
 
-case 153: {
+case 154: {
   AST::NewMemberExpression *node = new (pool) AST::NewMemberExpression(sym(2).Expression, sym(4).ArgumentList);
   node->newToken = loc(1);
   node->lparenToken = loc(3);
@@ -912,384 +936,384 @@ case 153: {
   sym(1).Node = node;
 } break;
 
-case 155: {
+case 156: {
   AST::NewExpression *node = new (pool) AST::NewExpression(sym(2).Expression);
   node->newToken = loc(1);
   sym(1).Node = node;
 } break;
 
-case 156: {
+case 157: {
   AST::CallExpression *node = new (pool) AST::CallExpression(sym(1).Expression, sym(3).ArgumentList);
   node->lparenToken = loc(2);
   node->rparenToken = loc(4);
   sym(1).Node = node;
 } break;
 
-case 157: {
+case 158: {
   AST::CallExpression *node = new (pool) AST::CallExpression(sym(1).Expression, sym(3).ArgumentList);
   node->lparenToken = loc(2);
   node->rparenToken = loc(4);
   sym(1).Node = node;
 } break;
 
-case 158: {
+case 159: {
   AST::ArrayMemberExpression *node = new (pool) AST::ArrayMemberExpression(sym(1).Expression, sym(3).Expression);
   node->lbracketToken = loc(2);
   node->rbracketToken = loc(4);
   sym(1).Node = node;
 } break;
 
-case 159: {
+case 160: {
   AST::FieldMemberExpression *node = new (pool) AST::FieldMemberExpression(sym(1).Expression, stringRef(3));
   node->dotToken = loc(2);
   node->identifierToken = loc(3);
   sym(1).Node = node;
 } break;
 
-case 160: {
+case 161: {
   sym(1).Node = 0;
 } break;
 
-case 161: {
+case 162: {
   sym(1).Node = sym(1).ArgumentList->finish();
 } break;
 
-case 162: {
+case 163: {
   sym(1).Node = new (pool) AST::ArgumentList(sym(1).Expression);
 } break;
 
-case 163: {
+case 164: {
   AST::ArgumentList *node = new (pool) AST::ArgumentList(sym(1).ArgumentList, sym(3).Expression);
   node->commaToken = loc(2);
   sym(1).Node = node;
 } break;
 
-case 167: {
+case 168: {
   AST::PostIncrementExpression *node = new (pool) AST::PostIncrementExpression(sym(1).Expression);
   node->incrementToken = loc(2);
   sym(1).Node = node;
 } break;
 
-case 168: {
+case 169: {
   AST::PostDecrementExpression *node = new (pool) AST::PostDecrementExpression(sym(1).Expression);
   node->decrementToken = loc(2);
   sym(1).Node = node;
 } break;
 
-case 170: {
+case 171: {
   AST::DeleteExpression *node = new (pool) AST::DeleteExpression(sym(2).Expression);
   node->deleteToken = loc(1);
   sym(1).Node = node;
 } break;
 
-case 171: {
+case 172: {
   AST::VoidExpression *node = new (pool) AST::VoidExpression(sym(2).Expression);
   node->voidToken = loc(1);
   sym(1).Node = node;
 } break;
 
-case 172: {
+case 173: {
   AST::TypeOfExpression *node = new (pool) AST::TypeOfExpression(sym(2).Expression);
   node->typeofToken = loc(1);
   sym(1).Node = node;
 } break;
 
-case 173: {
+case 174: {
   AST::PreIncrementExpression *node = new (pool) AST::PreIncrementExpression(sym(2).Expression);
   node->incrementToken = loc(1);
   sym(1).Node = node;
 } break;
 
-case 174: {
+case 175: {
   AST::PreDecrementExpression *node = new (pool) AST::PreDecrementExpression(sym(2).Expression);
   node->decrementToken = loc(1);
   sym(1).Node = node;
 } break;
 
-case 175: {
+case 176: {
   AST::UnaryPlusExpression *node = new (pool) AST::UnaryPlusExpression(sym(2).Expression);
   node->plusToken = loc(1);
   sym(1).Node = node;
 } break;
 
-case 176: {
+case 177: {
   AST::UnaryMinusExpression *node = new (pool) AST::UnaryMinusExpression(sym(2).Expression);
   node->minusToken = loc(1);
   sym(1).Node = node;
 } break;
 
-case 177: {
+case 178: {
   AST::TildeExpression *node = new (pool) AST::TildeExpression(sym(2).Expression);
   node->tildeToken = loc(1);
   sym(1).Node = node;
 } break;
 
-case 178: {
+case 179: {
   AST::NotExpression *node = new (pool) AST::NotExpression(sym(2).Expression);
   node->notToken = loc(1);
   sym(1).Node = node;
 } break;
 
-case 180: {
+case 181: {
   AST::BinaryExpression *node = new (pool) AST::BinaryExpression(sym(1).Expression,
     QSOperator::Mul, sym(3).Expression);
   node->operatorToken = loc(2);
   sym(1).Node = node;
 } break;
 
-case 181: {
+case 182: {
   AST::BinaryExpression *node = new (pool) AST::BinaryExpression(sym(1).Expression,
     QSOperator::Div, sym(3).Expression);
   node->operatorToken = loc(2);
   sym(1).Node = node;
 } break;
 
-case 182: {
+case 183: {
   AST::BinaryExpression *node = new (pool) AST::BinaryExpression(sym(1).Expression,
     QSOperator::Mod, sym(3).Expression);
   node->operatorToken = loc(2);
   sym(1).Node = node;
 } break;
 
-case 184: {
+case 185: {
   AST::BinaryExpression *node = new (pool) AST::BinaryExpression(sym(1).Expression,
     QSOperator::Add, sym(3).Expression);
   node->operatorToken = loc(2);
   sym(1).Node = node;
 } break;
 
-case 185: {
+case 186: {
   AST::BinaryExpression *node = new (pool) AST::BinaryExpression(sym(1).Expression,
     QSOperator::Sub, sym(3).Expression);
   node->operatorToken = loc(2);
   sym(1).Node = node;
 } break;
 
-case 187: {
+case 188: {
   AST::BinaryExpression *node = new (pool) AST::BinaryExpression(sym(1).Expression,
     QSOperator::LShift, sym(3).Expression);
   node->operatorToken = loc(2);
   sym(1).Node = node;
 } break;
 
-case 188: {
+case 189: {
   AST::BinaryExpression *node = new (pool) AST::BinaryExpression(sym(1).Expression,
     QSOperator::RShift, sym(3).Expression);
   node->operatorToken = loc(2);
   sym(1).Node = node;
 } break;
 
-case 189: {
+case 190: {
   AST::BinaryExpression *node = new (pool) AST::BinaryExpression(sym(1).Expression,
     QSOperator::URShift, sym(3).Expression);
   node->operatorToken = loc(2);
   sym(1).Node = node;
 } break;
 
-case 191: {
+case 192: {
   AST::BinaryExpression *node = new (pool) AST::BinaryExpression(sym(1).Expression,
     QSOperator::Lt, sym(3).Expression);
   node->operatorToken = loc(2);
   sym(1).Node = node;
 } break;
 
-case 192: {
+case 193: {
   AST::BinaryExpression *node = new (pool) AST::BinaryExpression(sym(1).Expression,
     QSOperator::Gt, sym(3).Expression);
   node->operatorToken = loc(2);
   sym(1).Node = node;
 } break;
 
-case 193: {
+case 194: {
   AST::BinaryExpression *node = new (pool) AST::BinaryExpression(sym(1).Expression,
     QSOperator::Le, sym(3).Expression);
   node->operatorToken = loc(2);
   sym(1).Node = node;
 } break;
 
-case 194: {
+case 195: {
   AST::BinaryExpression *node = new (pool) AST::BinaryExpression(sym(1).Expression,
     QSOperator::Ge, sym(3).Expression);
   node->operatorToken = loc(2);
   sym(1).Node = node;
 } break;
 
-case 195: {
+case 196: {
   AST::BinaryExpression *node = new (pool) AST::BinaryExpression(sym(1).Expression,
     QSOperator::InstanceOf, sym(3).Expression);
   node->operatorToken = loc(2);
   sym(1).Node = node;
 } break;
 
-case 196: {
+case 197: {
   AST::BinaryExpression *node = new (pool) AST::BinaryExpression(sym(1).Expression,
     QSOperator::In, sym(3).Expression);
   node->operatorToken = loc(2);
   sym(1).Node = node;
 } break;
 
-case 198: {
+case 199: {
   AST::BinaryExpression *node = new (pool) AST::BinaryExpression(sym(1).Expression,
     QSOperator::Lt, sym(3).Expression);
   node->operatorToken = loc(2);
   sym(1).Node = node;
 } break;
 
-case 199: {
+case 200: {
   AST::BinaryExpression *node = new (pool) AST::BinaryExpression(sym(1).Expression,
     QSOperator::Gt, sym(3).Expression);
   node->operatorToken = loc(2);
   sym(1).Node = node;
 } break;
 
-case 200: {
+case 201: {
   AST::BinaryExpression *node = new (pool) AST::BinaryExpression(sym(1).Expression,
     QSOperator::Le, sym(3).Expression);
   node->operatorToken = loc(2);
   sym(1).Node = node;
 } break;
 
-case 201: {
+case 202: {
   AST::BinaryExpression *node = new (pool) AST::BinaryExpression(sym(1).Expression,
    QSOperator::Ge, sym(3).Expression);
   node->operatorToken = loc(2);
   sym(1).Node = node;
 } break;
 
-case 202: {
+case 203: {
   AST::BinaryExpression *node = new (pool) AST::BinaryExpression(sym(1).Expression,
     QSOperator::InstanceOf, sym(3).Expression);
   node->operatorToken = loc(2);
   sym(1).Node = node;
 } break;
 
-case 204: {
+case 205: {
   AST::BinaryExpression *node = new (pool) AST::BinaryExpression(sym(1).Expression,
     QSOperator::Equal, sym(3).Expression);
   node->operatorToken = loc(2);
   sym(1).Node = node;
 } break;
 
-case 205: {
+case 206: {
   AST::BinaryExpression *node = new (pool) AST::BinaryExpression(sym(1).Expression,
     QSOperator::NotEqual, sym(3).Expression);
   node->operatorToken = loc(2);
   sym(1).Node = node;
 } break;
 
-case 206: {
+case 207: {
   AST::BinaryExpression *node = new (pool) AST::BinaryExpression(sym(1).Expression,
     QSOperator::StrictEqual, sym(3).Expression);
   node->operatorToken = loc(2);
   sym(1).Node = node;
 } break;
 
-case 207: {
+case 208: {
   AST::BinaryExpression *node = new (pool) AST::BinaryExpression(sym(1).Expression,
     QSOperator::StrictNotEqual, sym(3).Expression);
   node->operatorToken = loc(2);
   sym(1).Node = node;
 } break;
 
-case 209: {
+case 210: {
   AST::BinaryExpression *node = new (pool) AST::BinaryExpression(sym(1).Expression,
     QSOperator::Equal, sym(3).Expression);
   node->operatorToken = loc(2);
   sym(1).Node = node;
 } break;
 
-case 210: {
+case 211: {
   AST::BinaryExpression *node = new (pool) AST::BinaryExpression(sym(1).Expression,
     QSOperator::NotEqual, sym(3).Expression);
   node->operatorToken = loc(2);
   sym(1).Node = node;
 } break;
 
-case 211: {
+case 212: {
   AST::BinaryExpression *node = new (pool) AST::BinaryExpression(sym(1).Expression,
     QSOperator::StrictEqual, sym(3).Expression);
   node->operatorToken = loc(2);
   sym(1).Node = node;
 } break;
 
-case 212: {
+case 213: {
   AST::BinaryExpression *node = new (pool) AST::BinaryExpression(sym(1).Expression,
     QSOperator::StrictNotEqual, sym(3).Expression);
   node->operatorToken = loc(2);
   sym(1).Node = node;
 } break;
 
-case 214: {
+case 215: {
   AST::BinaryExpression *node = new (pool) AST::BinaryExpression(sym(1).Expression,
     QSOperator::BitAnd, sym(3).Expression);
   node->operatorToken = loc(2);
   sym(1).Node = node;
 } break;
 
-case 216: {
+case 217: {
   AST::BinaryExpression *node = new (pool) AST::BinaryExpression(sym(1).Expression,
     QSOperator::BitAnd, sym(3).Expression);
   node->operatorToken = loc(2);
   sym(1).Node = node;
 } break;
 
-case 218: {
+case 219: {
   AST::BinaryExpression *node = new (pool) AST::BinaryExpression(sym(1).Expression,
     QSOperator::BitXor, sym(3).Expression);
   node->operatorToken = loc(2);
   sym(1).Node = node;
 } break;
 
-case 220: {
+case 221: {
   AST::BinaryExpression *node = new (pool) AST::BinaryExpression(sym(1).Expression,
     QSOperator::BitXor, sym(3).Expression);
   node->operatorToken = loc(2);
   sym(1).Node = node;
 } break;
 
-case 222: {
+case 223: {
   AST::BinaryExpression *node = new (pool) AST::BinaryExpression(sym(1).Expression,
     QSOperator::BitOr, sym(3).Expression);
   node->operatorToken = loc(2);
   sym(1).Node = node;
 } break;
 
-case 224: {
+case 225: {
   AST::BinaryExpression *node = new (pool) AST::BinaryExpression(sym(1).Expression,
     QSOperator::BitOr, sym(3).Expression);
   node->operatorToken = loc(2);
   sym(1).Node = node;
 } break;
 
-case 226: {
+case 227: {
   AST::BinaryExpression *node = new (pool) AST::BinaryExpression(sym(1).Expression,
     QSOperator::And, sym(3).Expression);
   node->operatorToken = loc(2);
   sym(1).Node = node;
 } break;
 
-case 228: {
+case 229: {
   AST::BinaryExpression *node = new (pool) AST::BinaryExpression(sym(1).Expression,
     QSOperator::And, sym(3).Expression);
   node->operatorToken = loc(2);
   sym(1).Node = node;
 } break;
 
-case 230: {
+case 231: {
   AST::BinaryExpression *node = new (pool) AST::BinaryExpression(sym(1).Expression,
     QSOperator::Or, sym(3).Expression);
   node->operatorToken = loc(2);
   sym(1).Node = node;
 } break;
 
-case 232: {
+case 233: {
   AST::BinaryExpression *node = new (pool) AST::BinaryExpression(sym(1).Expression,
     QSOperator::Or, sym(3).Expression);
   node->operatorToken = loc(2);
   sym(1).Node = node;
 } break;
 
-case 234: {
+case 235: {
   AST::ConditionalExpression *node = new (pool) AST::ConditionalExpression(sym(1).Expression,
     sym(3).Expression, sym(5).Expression);
   node->questionToken = loc(2);
@@ -1297,7 +1321,7 @@ case 234: {
   sym(1).Node = node;
 } break;
 
-case 236: {
+case 237: {
   AST::ConditionalExpression *node = new (pool) AST::ConditionalExpression(sym(1).Expression,
     sym(3).Expression, sym(5).Expression);
   node->questionToken = loc(2);
@@ -1305,112 +1329,112 @@ case 236: {
   sym(1).Node = node;
 } break;
 
-case 238: {
+case 239: {
   AST::BinaryExpression *node = new (pool) AST::BinaryExpression(sym(1).Expression,
     sym(2).ival, sym(3).Expression);
   node->operatorToken = loc(2);
   sym(1).Node = node;
 } break;
 
-case 240: {
+case 241: {
   AST::BinaryExpression *node = new (pool) AST::BinaryExpression(sym(1).Expression,
     sym(2).ival, sym(3).Expression);
   node->operatorToken = loc(2);
   sym(1).Node = node;
 } break;
 
-case 241: {
+case 242: {
   sym(1).ival = QSOperator::Assign;
 } break;
 
-case 242: {
+case 243: {
   sym(1).ival = QSOperator::InplaceMul;
 } break;
 
-case 243: {
+case 244: {
   sym(1).ival = QSOperator::InplaceDiv;
 } break;
 
-case 244: {
+case 245: {
   sym(1).ival = QSOperator::InplaceMod;
 } break;
 
-case 245: {
+case 246: {
   sym(1).ival = QSOperator::InplaceAdd;
 } break;
 
-case 246: {
+case 247: {
   sym(1).ival = QSOperator::InplaceSub;
 } break;
 
-case 247: {
+case 248: {
   sym(1).ival = QSOperator::InplaceLeftShift;
 } break;
 
-case 248: {
+case 249: {
   sym(1).ival = QSOperator::InplaceRightShift;
 } break;
 
-case 249: {
+case 250: {
   sym(1).ival = QSOperator::InplaceURightShift;
 } break;
 
-case 250: {
+case 251: {
   sym(1).ival = QSOperator::InplaceAnd;
 } break;
 
-case 251: {
+case 252: {
   sym(1).ival = QSOperator::InplaceXor;
 } break;
 
-case 252: {
+case 253: {
   sym(1).ival = QSOperator::InplaceOr;
 } break;
 
-case 254: {
+case 255: {
   AST::Expression *node = new (pool) AST::Expression(sym(1).Expression, sym(3).Expression);
   node->commaToken = loc(2);
   sym(1).Node = node;
 } break;
 
-case 255: {
+case 256: {
   sym(1).Node = 0;
 } break;
 
-case 258: {
+case 259: {
   AST::Expression *node = new (pool) AST::Expression(sym(1).Expression, sym(3).Expression);
   node->commaToken = loc(2);
   sym(1).Node = node;
 } break;
 
-case 259: {
+case 260: {
   sym(1).Node = 0;
 } break;
 
-case 276: {
+case 277: {
   AST::Block *node = new (pool) AST::Block(sym(2).StatementList);
   node->lbraceToken = loc(1);
   node->rbraceToken = loc(3);
   sym(1).Node = node;
 } break;
 
-case 277: {
+case 278: {
   sym(1).Node = new (pool) AST::StatementList(sym(1).Statement);
 } break;
 
-case 278: {
+case 279: {
   sym(1).Node = new (pool) AST::StatementList(sym(1).StatementList, sym(2).Statement);
 } break;
 
-case 279: {
+case 280: {
   sym(1).Node = 0;
 } break;
 
-case 280: {
+case 281: {
   sym(1).Node = sym(1).StatementList->finish ();
 } break;
 
-case 282: {
+case 283: {
   AST::VariableStatement *node = new (pool) AST::VariableStatement(
      sym(2).VariableDeclarationList->finish (/*readOnly=*/sym(1).ival == T_CONST));
   node->declarationKindToken = loc(1);
@@ -1418,76 +1442,76 @@ case 282: {
   sym(1).Node = node;
 } break;
 
-case 283: {
+case 284: {
   sym(1).ival = T_CONST;
 } break;
 
-case 284: {
+case 285: {
   sym(1).ival = T_VAR;
 } break;
 
-case 285: {
+case 286: {
   sym(1).Node = new (pool) AST::VariableDeclarationList(sym(1).VariableDeclaration);
 } break;
 
-case 286: {
+case 287: {
   AST::VariableDeclarationList *node = new (pool) AST::VariableDeclarationList(
     sym(1).VariableDeclarationList, sym(3).VariableDeclaration);
   node->commaToken = loc(2);
   sym(1).Node = node;
 } break;
 
-case 287: {
+case 288: {
   sym(1).Node = new (pool) AST::VariableDeclarationList(sym(1).VariableDeclaration);
 } break;
 
-case 288: {
+case 289: {
   sym(1).Node = new (pool) AST::VariableDeclarationList(sym(1).VariableDeclarationList, sym(3).VariableDeclaration);
 } break;
 
-case 289: {
+case 290: {
   AST::VariableDeclaration *node = new (pool) AST::VariableDeclaration(stringRef(1), sym(2).Expression);
   node->identifierToken = loc(1);
   sym(1).Node = node;
 } break;
 
-case 290: {
+case 291: {
   AST::VariableDeclaration *node = new (pool) AST::VariableDeclaration(stringRef(1), sym(2).Expression);
   node->identifierToken = loc(1);
   sym(1).Node = node;
 } break;
 
-case 291: {
+case 292: {
   // ### TODO: AST for initializer
   sym(1) = sym(2);
 } break;
 
-case 292: {
+case 293: {
   sym(1).Node = 0;
 } break;
 
-case 294: {
+case 295: {
   // ### TODO: AST for initializer
   sym(1) = sym(2);
 } break;
 
-case 295: {
+case 296: {
   sym(1).Node = 0;
 } break;
 
-case 297: {
+case 298: {
   AST::EmptyStatement *node = new (pool) AST::EmptyStatement();
   node->semicolonToken = loc(1);
   sym(1).Node = node;
 } break;
 
-case 299: {
+case 300: {
   AST::ExpressionStatement *node = new (pool) AST::ExpressionStatement(sym(1).Expression);
   node->semicolonToken = loc(2);
   sym(1).Node = node;
 } break;
 
-case 300: {
+case 301: {
   AST::IfStatement *node = new (pool) AST::IfStatement(sym(3).Expression, sym(5).Statement, sym(7).Statement);
   node->ifToken = loc(1);
   node->lparenToken = loc(2);
@@ -1496,7 +1520,7 @@ case 300: {
   sym(1).Node = node;
 } break;
 
-case 301: {
+case 302: {
   AST::IfStatement *node = new (pool) AST::IfStatement(sym(3).Expression, sym(5).Statement);
   node->ifToken = loc(1);
   node->lparenToken = loc(2);
@@ -1504,7 +1528,7 @@ case 301: {
   sym(1).Node = node;
 } break;
 
-case 304: {
+case 305: {
   AST::DoWhileStatement *node = new (pool) AST::DoWhileStatement(sym(2).Statement, sym(5).Expression);
   node->doToken = loc(1);
   node->whileToken = loc(3);
@@ -1514,7 +1538,7 @@ case 304: {
   sym(1).Node = node;
 } break;
 
-case 305: {
+case 306: {
   AST::WhileStatement *node = new (pool) AST::WhileStatement(sym(3).Expression, sym(5).Statement);
   node->whileToken = loc(1);
   node->lparenToken = loc(2);
@@ -1522,7 +1546,7 @@ case 305: {
   sym(1).Node = node;
 } break;
 
-case 306: {
+case 307: {
   AST::ForStatement *node = new (pool) AST::ForStatement(sym(3).Expression,
     sym(5).Expression, sym(7).Expression, sym(9).Statement);
   node->forToken = loc(1);
@@ -1533,7 +1557,7 @@ case 306: {
   sym(1).Node = node;
 } break;
 
-case 307: {
+case 308: {
   AST::LocalForStatement *node = new (pool) AST::LocalForStatement(
      sym(4).VariableDeclarationList->finish (/*readOnly=*/false), sym(6).Expression,
      sym(8).Expression, sym(10).Statement);
@@ -1546,7 +1570,7 @@ case 307: {
   sym(1).Node = node;
 } break;
 
-case 308: {
+case 309: {
   AST:: ForEachStatement *node = new (pool) AST::ForEachStatement(sym(3).Expression,
     sym(5).Expression, sym(7).Statement);
   node->forToken = loc(1);
@@ -1556,7 +1580,7 @@ case 308: {
   sym(1).Node = node;
 } break;
 
-case 309: {
+case 310: {
   AST::LocalForEachStatement *node = new (pool) AST::LocalForEachStatement(
     sym(4).VariableDeclaration, sym(6).Expression, sym(8).Statement);
   node->forToken = loc(1);
@@ -1567,14 +1591,14 @@ case 309: {
   sym(1).Node = node;
 } break;
 
-case 311: {
+case 312: {
   AST::ContinueStatement *node = new (pool) AST::ContinueStatement();
   node->continueToken = loc(1);
   node->semicolonToken = loc(2);
   sym(1).Node = node;
 } break;
 
-case 313: {
+case 314: {
   AST::ContinueStatement *node = new (pool) AST::ContinueStatement(stringRef(2));
   node->continueToken = loc(1);
   node->identifierToken = loc(2);
@@ -1582,14 +1606,14 @@ case 313: {
   sym(1).Node = node;
 } break;
 
-case 315: {
+case 316: {
   AST::BreakStatement *node = new (pool) AST::BreakStatement(QStringRef());
   node->breakToken = loc(1);
   node->semicolonToken = loc(2);
   sym(1).Node = node;
 } break;
 
-case 317: {
+case 318: {
   AST::BreakStatement *node = new (pool) AST::BreakStatement(stringRef(2));
   node->breakToken = loc(1);
   node->identifierToken = loc(2);
@@ -1597,14 +1621,14 @@ case 317: {
   sym(1).Node = node;
 } break;
 
-case 319: {
+case 320: {
   AST::ReturnStatement *node = new (pool) AST::ReturnStatement(sym(2).Expression);
   node->returnToken = loc(1);
   node->semicolonToken = loc(3);
   sym(1).Node = node;
 } break;
 
-case 320: {
+case 321: {
   AST::WithStatement *node = new (pool) AST::WithStatement(sym(3).Expression, sym(5).Statement);
   node->withToken = loc(1);
   node->lparenToken = loc(2);
@@ -1612,7 +1636,7 @@ case 320: {
   sym(1).Node = node;
 } break;
 
-case 321: {
+case 322: {
   AST::SwitchStatement *node = new (pool) AST::SwitchStatement(sym(3).Expression, sym(5).CaseBlock);
   node->switchToken = loc(1);
   node->lparenToken = loc(2);
@@ -1620,83 +1644,83 @@ case 321: {
   sym(1).Node = node;
 } break;
 
-case 322: {
+case 323: {
   AST::CaseBlock *node = new (pool) AST::CaseBlock(sym(2).CaseClauses);
   node->lbraceToken = loc(1);
   node->rbraceToken = loc(3);
   sym(1).Node = node;
 } break;
 
-case 323: {
+case 324: {
   AST::CaseBlock *node = new (pool) AST::CaseBlock(sym(2).CaseClauses, sym(3).DefaultClause, sym(4).CaseClauses);
   node->lbraceToken = loc(1);
   node->rbraceToken = loc(5);
   sym(1).Node = node;
 } break;
 
-case 324: {
+case 325: {
   sym(1).Node = new (pool) AST::CaseClauses(sym(1).CaseClause);
 } break;
 
-case 325: {
+case 326: {
   sym(1).Node = new (pool) AST::CaseClauses(sym(1).CaseClauses, sym(2).CaseClause);
 } break;
 
-case 326: {
+case 327: {
   sym(1).Node = 0;
 } break;
 
-case 327: {
+case 328: {
   sym(1).Node = sym(1).CaseClauses->finish ();
 } break;
 
-case 328: {
+case 329: {
   AST::CaseClause *node = new (pool) AST::CaseClause(sym(2).Expression, sym(4).StatementList);
   node->caseToken = loc(1);
   node->colonToken = loc(3);
   sym(1).Node = node;
 } break;
 
-case 329: {
+case 330: {
   AST::DefaultClause *node = new (pool) AST::DefaultClause(sym(3).StatementList);
   node->defaultToken = loc(1);
   node->colonToken = loc(2);
   sym(1).Node = node;
 } break;
 
-case 330: {
+case 331: {
   AST::LabelledStatement *node = new (pool) AST::LabelledStatement(stringRef(1), sym(3).Statement);
   node->identifierToken = loc(1);
   node->colonToken = loc(2);
   sym(1).Node = node;
 } break;
 
-case 332: {
+case 333: {
   AST::ThrowStatement *node = new (pool) AST::ThrowStatement(sym(2).Expression);
   node->throwToken = loc(1);
   node->semicolonToken = loc(3);
   sym(1).Node = node;
 } break;
 
-case 333: {
+case 334: {
   AST::TryStatement *node = new (pool) AST::TryStatement(sym(2).Statement, sym(3).Catch);
   node->tryToken = loc(1);
   sym(1).Node = node;
 } break;
 
-case 334: {
+case 335: {
   AST::TryStatement *node = new (pool) AST::TryStatement(sym(2).Statement, sym(3).Finally);
   node->tryToken = loc(1);
   sym(1).Node = node;
 } break;
 
-case 335: {
+case 336: {
   AST::TryStatement *node = new (pool) AST::TryStatement(sym(2).Statement, sym(3).Catch, sym(4).Finally);
   node->tryToken = loc(1);
   sym(1).Node = node;
 } break;
 
-case 336: {
+case 337: {
   AST::Catch *node = new (pool) AST::Catch(stringRef(3), sym(5).Block);
   node->catchToken = loc(1);
   node->lparenToken = loc(2);
@@ -1705,20 +1729,20 @@ case 336: {
   sym(1).Node = node;
 } break;
 
-case 337: {
+case 338: {
   AST::Finally *node = new (pool) AST::Finally(sym(2).Block);
   node->finallyToken = loc(1);
   sym(1).Node = node;
 } break;
 
-case 339: {
+case 340: {
   AST::DebuggerStatement *node = new (pool) AST::DebuggerStatement();
   node->debuggerToken = loc(1);
   node->semicolonToken = loc(2);
   sym(1).Node = node;
 } break;
 
-case 341: {
+case 342: {
   AST::FunctionDeclaration *node = new (pool) AST::FunctionDeclaration(stringRef(2), sym(4).FormalParameterList, sym(7).FunctionBody);
   node->functionToken = loc(1);
   node->identifierToken = loc(2);
@@ -1729,7 +1753,7 @@ case 341: {
   sym(1).Node = node;
 } break;
 
-case 342: {
+case 343: {
   AST::FunctionExpression *node = new (pool) AST::FunctionExpression(stringRef(2), sym(4).FormalParameterList, sym(7).FunctionBody);
   node->functionToken = loc(1);
   if (! stringRef(2).isNull())
@@ -1741,7 +1765,7 @@ case 342: {
   sym(1).Node = node;
 } break;
 
-case 343: {
+case 344: {
   AST::FunctionExpression *node = new (pool) AST::FunctionExpression(QStringRef(), sym(3).FormalParameterList, sym(6).FunctionBody);
   node->functionToken = loc(1);
   node->lparenToken = loc(2);
@@ -1751,56 +1775,56 @@ case 343: {
   sym(1).Node = node;
 } break;
 
-case 344: {
+case 345: {
   AST::FormalParameterList *node = new (pool) AST::FormalParameterList(stringRef(1));
   node->identifierToken = loc(1);
   sym(1).Node = node;
 } break;
 
-case 345: {
+case 346: {
   AST::FormalParameterList *node = new (pool) AST::FormalParameterList(sym(1).FormalParameterList, stringRef(3));
   node->commaToken = loc(2);
   node->identifierToken = loc(3);
   sym(1).Node = node;
 } break;
 
-case 346: {
+case 347: {
   sym(1).Node = 0;
 } break;
 
-case 347: {
+case 348: {
   sym(1).Node = sym(1).FormalParameterList->finish ();
 } break;
 
-case 348: {
+case 349: {
   sym(1).Node = 0;
 } break;
 
-case 350: {
+case 351: {
   sym(1).Node = new (pool) AST::FunctionBody(sym(1).SourceElements->finish ());
 } break;
 
-case 352: {
+case 353: {
   sym(1).Node = new (pool) AST::Program(sym(1).SourceElements->finish ());
 } break;
 
-case 353: {
+case 354: {
   sym(1).Node = new (pool) AST::SourceElements(sym(1).SourceElement);
 } break;
 
-case 354: {
+case 355: {
   sym(1).Node = new (pool) AST::SourceElements(sym(1).SourceElements, sym(2).SourceElement);
 } break;
 
-case 355: {
+case 356: {
   sym(1).Node = new (pool) AST::StatementSourceElement(sym(1).Statement);
 } break;
 
-case 356: {
+case 357: {
   sym(1).Node = new (pool) AST::FunctionSourceElement(sym(1).FunctionDeclaration);
 } break;
 
-case 357: {
+case 358: {
   sym(1).Node = 0;
 } break;
 
diff --git a/src/qml/parser/qqmljsparser_p.h b/src/qml/parser/qqmljsparser_p.h
index 7533750a53..f382cd7563 100644
--- a/src/qml/parser/qqmljsparser_p.h
+++ b/src/qml/parser/qqmljsparser_p.h
@@ -246,9 +246,9 @@ protected:
 
 
 
-#define J_SCRIPT_REGEXPLITERAL_RULE1 90
+#define J_SCRIPT_REGEXPLITERAL_RULE1 91
 
-#define J_SCRIPT_REGEXPLITERAL_RULE2 91
+#define J_SCRIPT_REGEXPLITERAL_RULE2 92
 
 QT_QML_END_NAMESPACE