diff options
18 files changed, 899 insertions, 740 deletions
diff --git a/src/qml/compiler/qqmlirbuilder.cpp b/src/qml/compiler/qqmlirbuilder.cpp index b58920d812..a26c80e093 100644 --- a/src/qml/compiler/qqmlirbuilder.cpp +++ b/src/qml/compiler/qqmlirbuilder.cpp @@ -45,6 +45,7 @@ #include <private/qqmljslexer_p.h> #include <QCoreApplication> #include <QCryptographicHash> +#include <cmath> #ifndef V4_BOOTSTRAP #include <private/qqmlglobal_p.h> @@ -740,16 +741,20 @@ bool IRBuilder::visit(QQmlJS::AST::UiEnumDeclaration *node) enumeration->enumValues = New<PoolList<EnumValue>>(); QQmlJS::AST::UiEnumMemberList *e = node->members; - int i = -1; while (e) { EnumValue *enumValue = New<EnumValue>(); QString member = e->member.toString(); enumValue->nameIndex = registerString(member); - enumValue->value = ++i; - if (member.at(0).isLower()) COMPILE_EXCEPTION(e->memberToken, tr("Enum names must begin with an upper case letter")); + double part; + if (std::modf(e->value, &part) != 0.0) + COMPILE_EXCEPTION(e->valueToken, tr("Enum value must be an integer")); + if (e->value > std::numeric_limits<qint32>::max() || e->value < std::numeric_limits<qint32>::min()) + COMPILE_EXCEPTION(e->valueToken, tr("Enum value out of range")); + enumValue->value = e->value; + enumValue->location.line = e->memberToken.startLine; enumValue->location.column = e->memberToken.startColumn; enumeration->enumValues->append(enumValue); diff --git a/src/qml/parser/qqmljs.g b/src/qml/parser/qqmljs.g index 395e62e657..667bcd1801 100644 --- a/src/qml/parser/qqmljs.g +++ b/src/qml/parser/qqmljs.g @@ -1230,6 +1230,17 @@ case $rule_number: { } ./ +EnumMemberList: T_IDENTIFIER T_EQ T_NUMERIC_LITERAL; +/. +case $rule_number: { + AST::UiEnumMemberList *node = new (pool) AST::UiEnumMemberList(stringRef(1), sym(3).dval); + node->memberToken = loc(1); + node->valueToken = loc(3); + sym(1).Node = node; + break; +} +./ + EnumMemberList: EnumMemberList T_COMMA T_IDENTIFIER; /. case $rule_number: { @@ -1240,6 +1251,17 @@ case $rule_number: { } ./ +EnumMemberList: EnumMemberList T_COMMA T_IDENTIFIER T_EQ T_NUMERIC_LITERAL; +/. +case $rule_number: { + AST::UiEnumMemberList *node = new (pool) AST::UiEnumMemberList(sym(1).UiEnumMemberList, stringRef(3), sym(5).dval); + node->memberToken = loc(3); + node->valueToken = loc(5); + sym(1).Node = node; + break; +} +./ + JsIdentifier: T_IDENTIFIER; JsIdentifier: T_PROPERTY ; diff --git a/src/qml/parser/qqmljsast_p.h b/src/qml/parser/qqmljsast_p.h index d458b2cd35..aa48accfe0 100644 --- a/src/qml/parser/qqmljsast_p.h +++ b/src/qml/parser/qqmljsast_p.h @@ -2791,8 +2791,8 @@ class QML_PARSER_EXPORT UiEnumMemberList: public Node { QQMLJS_DECLARE_AST_NODE(UiEnumMemberList) public: - UiEnumMemberList(const QStringRef &member) - : next(this), member(member) + UiEnumMemberList(const QStringRef &member, double v = 0.0) + : next(this), member(member), value(v) { kind = K; } UiEnumMemberList(UiEnumMemberList *previous, const QStringRef &member) @@ -2801,13 +2801,23 @@ public: kind = K; next = previous->next; previous->next = this; + value = previous->value + 1; + } + + UiEnumMemberList(UiEnumMemberList *previous, const QStringRef &member, double v) + : member(member), value(v) + { + kind = K; + next = previous->next; + previous->next = this; } SourceLocation firstSourceLocation() const override { return memberToken; } SourceLocation lastSourceLocation() const override - { return next ? next->lastSourceLocation() : memberToken; } + { return next ? next->lastSourceLocation() : + valueToken.isValid() ? valueToken : memberToken; } void accept0(Visitor *visitor) override; @@ -2821,7 +2831,9 @@ public: // attributes UiEnumMemberList *next; QStringRef member; + double value; SourceLocation memberToken; + SourceLocation valueToken; }; class QML_PARSER_EXPORT UiEnumDeclaration: public UiObjectMember diff --git a/src/qml/parser/qqmljsgrammar.cpp b/src/qml/parser/qqmljsgrammar.cpp index 8e47898e2f..f345990ff9 100644 --- a/src/qml/parser/qqmljsgrammar.cpp +++ b/src/qml/parser/qqmljsgrammar.cpp @@ -64,36 +64,36 @@ const short QQmlJSGrammar::lhs [] = { 132, 132, 132, 132, 132, 132, 132, 113, 140, 140, 140, 140, 141, 141, 142, 142, 113, 113, 113, 113, 113, 113, 113, 113, 113, 113, 113, 113, 113, 113, - 113, 113, 113, 113, 113, 113, 113, 145, 145, 126, - 126, 126, 126, 126, 126, 126, 146, 146, 146, 146, + 113, 113, 113, 113, 113, 113, 113, 145, 145, 145, + 145, 126, 126, 126, 126, 126, 126, 126, 146, 146, 146, 146, 146, 146, 146, 146, 146, 146, 146, 146, - 146, 146, 146, 146, 131, 148, 148, 148, 148, 147, - 147, 152, 152, 152, 150, 150, 153, 153, 153, 153, + 146, 146, 146, 146, 146, 146, 131, 148, 148, 148, + 148, 147, 147, 152, 152, 152, 150, 150, 153, 153, + 153, 153, 156, 156, 156, 156, 156, 156, 156, 156, 156, 156, 156, 156, 156, 156, 156, 156, 156, 156, 156, 156, 156, 156, 156, 156, 156, 156, 156, 156, - 156, 156, 156, 156, 156, 156, 156, 156, 156, 156, - 156, 156, 156, 157, 157, 122, 122, 122, 122, 122, - 160, 160, 161, 161, 161, 161, 159, 159, 162, 162, - 163, 163, 164, 164, 164, 165, 165, 165, 165, 165, - 165, 165, 165, 165, 165, 166, 166, 166, 166, 167, - 167, 167, 168, 168, 168, 168, 169, 169, 169, 169, - 169, 169, 169, 170, 170, 170, 170, 170, 170, 171, - 171, 171, 171, 171, 172, 172, 172, 172, 172, 173, - 173, 174, 174, 175, 175, 176, 176, 177, 177, 178, - 178, 179, 179, 180, 180, 181, 181, 182, 182, 183, - 183, 184, 184, 151, 151, 185, 185, 186, 186, 186, - 186, 186, 186, 186, 186, 186, 186, 186, 186, 111, - 111, 187, 187, 188, 188, 189, 189, 110, 110, 110, + 156, 156, 156, 156, 156, 157, 157, 122, 122, 122, + 122, 122, 160, 160, 161, 161, 161, 161, 159, 159, + 162, 162, 163, 163, 164, 164, 164, 165, 165, 165, + 165, 165, 165, 165, 165, 165, 165, 166, 166, 166, + 166, 167, 167, 167, 168, 168, 168, 168, 169, 169, + 169, 169, 169, 169, 169, 170, 170, 170, 170, 170, + 170, 171, 171, 171, 171, 171, 172, 172, 172, 172, + 172, 173, 173, 174, 174, 175, 175, 176, 176, 177, + 177, 178, 178, 179, 179, 180, 180, 181, 181, 182, + 182, 183, 183, 184, 184, 151, 151, 185, 185, 186, + 186, 186, 186, 186, 186, 186, 186, 186, 186, 186, + 186, 111, 111, 187, 187, 188, 188, 189, 189, 110, 110, 110, 110, 110, 110, 110, 110, 110, 110, 110, - 110, 110, 133, 198, 198, 197, 197, 144, 144, 199, - 199, 199, 200, 200, 202, 202, 201, 203, 206, 204, - 204, 207, 205, 205, 134, 135, 135, 136, 136, 190, - 190, 190, 190, 190, 190, 190, 190, 191, 191, 191, - 191, 192, 192, 192, 192, 193, 193, 137, 138, 208, - 208, 211, 211, 209, 209, 212, 210, 194, 195, 195, - 139, 139, 139, 213, 214, 196, 196, 215, 143, 158, - 158, 216, 216, 155, 155, 154, 154, 217, 114, 114, - 218, 218, 112, 112, 149, 149, 219 + 110, 110, 110, 110, 133, 198, 198, 197, 197, 144, + 144, 199, 199, 199, 200, 200, 202, 202, 201, 203, + 206, 204, 204, 207, 205, 205, 134, 135, 135, 136, + 136, 190, 190, 190, 190, 190, 190, 190, 190, 191, + 191, 191, 191, 192, 192, 192, 192, 193, 193, 137, + 138, 208, 208, 211, 211, 209, 209, 212, 210, 194, + 195, 195, 139, 139, 139, 213, 214, 196, 196, 215, + 143, 158, 158, 216, 216, 155, 155, 154, 154, 217, + 114, 114, 218, 218, 112, 112, 149, 149, 219 }; const short QQmlJSGrammar::rhs [] = { @@ -104,115 +104,116 @@ const short QQmlJSGrammar::rhs [] = { 1, 1, 1, 1, 1, 1, 1, 3, 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, 5, 1, 3, 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, + 6, 10, 6, 7, 1, 1, 5, 1, 3, 3, + 5, 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, 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, + 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, - 5, 1, 5, 1, 3, 1, 3, 1, 1, 1, + 3, 1, 5, 1, 5, 1, 3, 1, 3, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, - 3, 0, 1, 1, 3, 0, 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, 3, 1, 2, 0, 1, 3, 3, 1, - 1, 1, 1, 3, 1, 3, 2, 2, 2, 0, - 1, 2, 0, 1, 1, 2, 2, 7, 5, 7, - 7, 7, 5, 9, 10, 7, 8, 2, 2, 3, - 3, 2, 2, 3, 3, 3, 3, 5, 5, 3, - 5, 1, 2, 0, 1, 4, 3, 3, 3, 3, - 3, 3, 4, 5, 2, 2, 2, 1, 8, 8, - 7, 1, 3, 0, 1, 0, 1, 1, 1, 1, - 1, 2, 1, 1, 0, 1, 2 + 1, 1, 1, 1, 3, 1, 2, 0, 1, 3, + 3, 1, 1, 1, 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, 193, 260, - 224, 232, 228, 172, 244, 220, 3, 157, 88, 173, - 236, 240, 161, 190, 171, 176, 156, 210, 197, 0, - 95, 96, 91, 0, 85, 80, 365, 0, 0, 0, - 0, 93, 0, 0, 89, 92, 84, 0, 0, 81, - 83, 86, 82, 94, 87, 0, 90, 0, 0, 186, - 0, 0, 173, 192, 175, 174, 0, 0, 0, 188, - 189, 187, 191, 0, 221, 0, 0, 0, 0, 211, - 0, 0, 0, 0, 0, 0, 201, 0, 0, 0, - 195, 196, 194, 199, 203, 202, 200, 198, 213, 212, - 214, 0, 229, 0, 225, 0, 0, 167, 154, 166, - 155, 121, 122, 123, 149, 124, 151, 125, 126, 127, - 128, 129, 130, 131, 132, 133, 134, 135, 136, 150, - 137, 138, 152, 139, 140, 141, 142, 143, 144, 145, - 146, 147, 148, 153, 0, 0, 165, 261, 168, 0, - 169, 0, 170, 164, 0, 257, 250, 248, 255, 256, - 254, 253, 259, 252, 251, 249, 258, 245, 0, 233, - 0, 0, 237, 0, 0, 241, 0, 0, 167, 159, - 0, 158, 0, 163, 177, 0, 354, 354, 355, 0, - 352, 0, 353, 0, 356, 268, 275, 274, 282, 270, - 0, 271, 0, 357, 0, 364, 272, 273, 88, 278, - 276, 361, 358, 363, 279, 0, 291, 0, 0, 0, - 0, 348, 0, 365, 290, 262, 305, 0, 0, 0, - 292, 0, 0, 280, 281, 0, 269, 277, 306, 307, - 0, 354, 0, 0, 356, 0, 349, 350, 0, 338, - 362, 0, 322, 323, 324, 325, 0, 318, 319, 320, - 321, 346, 347, 0, 0, 0, 0, 0, 310, 311, - 312, 266, 264, 226, 234, 230, 246, 222, 267, 0, - 173, 238, 242, 215, 204, 0, 0, 223, 0, 0, - 0, 0, 216, 0, 0, 0, 0, 0, 208, 206, - 209, 207, 205, 218, 217, 219, 0, 231, 0, 227, - 0, 265, 173, 0, 247, 262, 263, 0, 262, 0, - 0, 314, 0, 0, 0, 316, 0, 235, 0, 0, - 239, 0, 0, 243, 303, 0, 295, 304, 298, 0, - 302, 0, 262, 296, 0, 262, 0, 0, 315, 0, - 0, 0, 317, 0, 0, 0, 309, 0, 308, 88, - 115, 366, 0, 0, 120, 284, 287, 0, 121, 291, - 124, 151, 126, 127, 91, 132, 133, 85, 134, 290, - 137, 89, 92, 262, 86, 94, 140, 87, 142, 90, - 144, 145, 292, 147, 148, 153, 0, 117, 116, 119, - 103, 118, 102, 0, 112, 285, 283, 0, 0, 0, - 356, 0, 113, 161, 162, 167, 0, 160, 0, 326, - 327, 0, 354, 0, 0, 356, 0, 114, 0, 0, - 0, 329, 334, 332, 335, 0, 0, 333, 334, 0, - 330, 0, 331, 286, 337, 0, 286, 336, 0, 339, - 340, 0, 286, 341, 342, 0, 0, 343, 0, 0, - 0, 344, 345, 179, 178, 0, 0, 0, 313, 0, - 0, 0, 328, 300, 293, 0, 301, 297, 0, 299, - 288, 0, 289, 294, 0, 0, 356, 0, 351, 106, - 0, 0, 110, 97, 0, 99, 108, 0, 100, 109, - 111, 101, 107, 98, 0, 104, 183, 181, 185, 182, - 180, 184, 359, 6, 360, 4, 2, 75, 105, 0, - 0, 0, 81, 83, 82, 37, 5, 0, 76, 0, + 0, 0, 28, 0, 0, 0, 28, 0, 195, 262, + 226, 234, 230, 174, 246, 222, 3, 159, 90, 175, + 238, 242, 163, 192, 173, 178, 158, 212, 199, 0, + 97, 98, 93, 0, 87, 82, 367, 0, 0, 0, + 0, 95, 0, 0, 91, 94, 86, 0, 0, 83, + 85, 88, 84, 96, 89, 0, 92, 0, 0, 188, + 0, 0, 175, 194, 177, 176, 0, 0, 0, 190, + 191, 189, 193, 0, 223, 0, 0, 0, 0, 213, + 0, 0, 0, 0, 0, 0, 203, 0, 0, 0, + 197, 198, 196, 201, 205, 204, 202, 200, 215, 214, + 216, 0, 231, 0, 227, 0, 0, 169, 156, 168, + 157, 123, 124, 125, 151, 126, 153, 127, 128, 129, + 130, 131, 132, 133, 134, 135, 136, 137, 138, 152, + 139, 140, 154, 141, 142, 143, 144, 145, 146, 147, + 148, 149, 150, 155, 0, 0, 167, 263, 170, 0, + 171, 0, 172, 166, 0, 259, 252, 250, 257, 258, + 256, 255, 261, 254, 253, 251, 260, 247, 0, 235, + 0, 0, 239, 0, 0, 243, 0, 0, 169, 161, + 0, 160, 0, 165, 179, 0, 356, 356, 357, 0, + 354, 0, 355, 0, 358, 270, 277, 276, 284, 272, + 0, 273, 0, 359, 0, 366, 274, 275, 90, 280, + 278, 363, 360, 365, 281, 0, 293, 0, 0, 0, + 0, 350, 0, 367, 292, 264, 307, 0, 0, 0, + 294, 0, 0, 282, 283, 0, 271, 279, 308, 309, + 0, 356, 0, 0, 358, 0, 351, 352, 0, 340, + 364, 0, 324, 325, 326, 327, 0, 320, 321, 322, + 323, 348, 349, 0, 0, 0, 0, 0, 312, 313, + 314, 268, 266, 228, 236, 232, 248, 224, 269, 0, + 175, 240, 244, 217, 206, 0, 0, 225, 0, 0, + 0, 0, 218, 0, 0, 0, 0, 0, 210, 208, + 211, 209, 207, 220, 219, 221, 0, 233, 0, 229, + 0, 267, 175, 0, 249, 264, 265, 0, 264, 0, + 0, 316, 0, 0, 0, 318, 0, 237, 0, 0, + 241, 0, 0, 245, 305, 0, 297, 306, 300, 0, + 304, 0, 264, 298, 0, 264, 0, 0, 317, 0, + 0, 0, 319, 0, 0, 0, 311, 0, 310, 90, + 117, 368, 0, 0, 122, 286, 289, 0, 123, 293, + 126, 153, 128, 129, 93, 134, 135, 87, 136, 292, + 139, 91, 94, 264, 88, 96, 142, 89, 144, 92, + 146, 147, 294, 149, 150, 155, 0, 119, 118, 121, + 105, 120, 104, 0, 114, 287, 285, 0, 0, 0, + 358, 0, 115, 163, 164, 169, 0, 162, 0, 328, + 329, 0, 356, 0, 0, 358, 0, 116, 0, 0, + 0, 331, 336, 334, 337, 0, 0, 335, 336, 0, + 332, 0, 333, 288, 339, 0, 288, 338, 0, 341, + 342, 0, 288, 343, 344, 0, 0, 345, 0, 0, + 0, 346, 347, 181, 180, 0, 0, 0, 315, 0, + 0, 0, 330, 302, 295, 0, 303, 299, 0, 301, + 290, 0, 291, 296, 0, 0, 358, 0, 353, 108, + 0, 0, 112, 99, 0, 101, 110, 0, 102, 111, + 113, 103, 109, 100, 0, 106, 185, 183, 187, 184, + 182, 186, 361, 6, 362, 4, 2, 75, 107, 0, + 0, 0, 83, 85, 84, 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, 0, 0, 78, 0, - 77, 79, 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, - 161, 0, 69, 73, 0, 0, 0, 0, 161, 286, - 0, 70, 88, 121, 291, 124, 151, 126, 127, 91, - 132, 133, 134, 290, 137, 89, 92, 262, 94, 140, - 87, 142, 90, 144, 145, 292, 147, 148, 153, 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, 367 + 77, 80, 0, 81, 0, 79, 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, 163, 0, 69, 73, 0, 0, + 0, 0, 163, 288, 0, 70, 90, 123, 293, 126, + 153, 128, 129, 93, 134, 135, 136, 292, 139, 91, + 94, 264, 96, 142, 89, 144, 92, 146, 147, 294, + 149, 150, 155, 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, 369 }; const short QQmlJSGrammar::goto_default [] = { - 7, 663, 213, 200, 211, 526, 513, 658, 671, 512, - 657, 661, 659, 667, 22, 664, 662, 660, 18, 525, - 583, 573, 580, 575, 553, 195, 199, 201, 206, 237, - 214, 234, 564, 635, 634, 205, 236, 557, 26, 491, + 7, 667, 213, 200, 211, 526, 513, 662, 675, 512, + 661, 665, 663, 671, 22, 668, 666, 664, 18, 525, + 587, 577, 584, 579, 553, 195, 199, 201, 206, 237, + 214, 234, 568, 639, 638, 205, 236, 557, 26, 491, 490, 362, 361, 9, 360, 363, 204, 484, 364, 109, 17, 149, 24, 13, 148, 19, 25, 59, 23, 8, 28, 27, 283, 15, 277, 10, 273, 12, 275, 11, @@ -224,243 +225,259 @@ const short QQmlJSGrammar::goto_default [] = { }; const short QQmlJSGrammar::action_index [] = { - 301, 1388, 2901, 2901, 2797, 1095, 106, 97, 99, -108, - 92, 88, 85, 364, -108, 338, 96, -108, -108, 805, - 100, 161, 281, 247, -108, -108, -108, 394, 274, 1388, - -108, -108, -108, 516, -108, -108, 2589, 1786, 1388, 1388, - 1388, -108, 997, 1388, -108, -108, -108, 1388, 1388, -108, - -108, -108, -108, -108, -108, 1388, -108, 1388, 1388, -108, - 1388, 1388, 116, 235, -108, -108, 1388, 1388, 1388, -108, - -108, -108, 220, 1388, 326, 1388, 1388, 1388, 1388, 384, - 1388, 1388, 1388, 1388, 1388, 1388, 193, 1388, 1388, 1388, - 115, 103, 102, 211, 227, 231, 257, 230, 424, 414, - 404, 1388, 85, 1388, 78, 2381, 1388, 1388, -108, -108, + 350, 1528, 3041, 3041, 2937, 1235, 115, 105, 239, -108, + 102, 93, 95, 205, -108, 422, 110, -108, -108, 727, + 92, 118, 265, 256, -108, -108, -108, 507, 247, 1528, + -108, -108, -108, 665, -108, -108, 2729, 1826, 1528, 1528, + 1528, -108, 1041, 1528, -108, -108, -108, 1528, 1528, -108, + -108, -108, -108, -108, -108, 1528, -108, 1528, 1528, -108, + 1528, 1528, 174, 221, -108, -108, 1528, 1528, 1528, -108, + -108, -108, 177, 1528, 422, 1528, 1528, 1528, 1528, 411, + 1528, 1528, 1528, 1528, 1528, 1528, 211, 1528, 1528, 1528, + 142, 148, 154, 217, 223, 226, 227, 231, 507, 385, + 395, 1528, 57, 1528, 83, 2521, 1528, 1528, -108, -108, -108, -108, -108, -108, -108, -108, -108, -108, -108, -108, -108, -108, -108, -108, -108, -108, -108, -108, -108, -108, -108, -108, -108, -108, -108, -108, -108, -108, -108, -108, - -108, -108, -108, -108, 157, 1388, -108, -108, 68, 61, - -108, 1388, -108, -108, 1388, -108, -108, -108, -108, -108, - -108, -108, -108, -108, -108, -108, -108, -108, 1388, 59, - 1388, 1388, 71, 60, 1388, -108, 2381, 1388, 1388, -108, - 271, -108, 54, -108, -108, 53, 428, 434, 58, 51, - -108, 437, -108, 50, 2901, -108, -108, -108, -108, -108, - 232, -108, 528, -108, 48, -108, -108, -108, 55, -108, - -108, -108, 2901, -108, -108, 634, -108, 637, 101, 2797, - 56, 90, 89, 3109, -108, 1388, -108, 86, 1388, 77, - -108, 84, 82, -108, -108, 425, -108, -108, -108, -108, - 81, 346, 75, 66, 2901, 74, -108, -108, 2797, -108, - -108, 121, -108, -108, -108, -108, 117, -108, -108, -108, - -108, -108, -108, 63, 69, 1388, 108, 160, -108, -108, - -108, 1586, -108, 80, 67, 72, -108, 324, 76, 73, - 711, 83, 122, 449, 308, 411, 1388, 331, 1388, 1388, - 1388, 1388, 449, 1388, 1388, 1388, 1388, 1388, 303, 299, - 298, 284, 280, 449, 357, 449, 1388, -20, 1388, 57, - 1388, -108, 805, 1388, -108, 1388, 70, 62, 1388, 64, - 2797, -108, 1388, 204, 2797, -108, 1388, 65, 1388, 1388, - 104, 105, 1388, -108, 91, 136, 171, -108, -108, 1388, - -108, 528, 1388, -108, -6, 1388, 87, 2797, -108, 1388, - 129, 2797, -108, 1388, 125, 2797, 93, 2797, -108, 79, - -108, 22, -36, 20, -108, -108, 2797, -34, 581, 15, - 594, 113, 1388, 2797, 16, -12, 508, 2485, -11, 11, - 997, 21, 24, 1489, 2485, 25, -2, 3, 1388, 94, - -32, 1388, -4, 1388, -30, -29, 2693, -108, -108, -108, - -108, -108, -108, 1388, -108, -108, -108, -19, -9, 37, - 2901, -1, -108, 285, -108, 1388, 5, -108, 134, -108, - -108, 39, 421, 40, 44, 2901, 41, -108, 1388, 141, - 47, -108, 52, -108, 36, 206, 1388, -108, 30, 29, - -108, -16, -108, 2797, -108, 123, 2797, -108, 270, -108, - -108, 132, 2797, 18, -108, 27, 28, -108, 528, -10, - 31, -108, -108, -108, -108, 1388, 133, 2797, -108, 1388, - 124, 2797, -108, 9, -108, 209, -108, -108, 1388, -108, - -108, 445, -108, -108, 0, -17, 2901, -51, -108, -108, - 111, 1986, -108, -108, 1686, -108, -108, 1886, -108, -108, - -108, -108, -108, -108, 120, -108, -108, -108, -108, -108, - -108, -108, -108, -108, 2901, -108, -108, -108, 112, -22, - 23, 901, 216, -26, 13, -108, -108, 218, -108, 210, - 45, -108, -108, 621, 201, -108, 162, 43, 401, -108, - 144, -108, -108, 219, -108, 2277, -108, -108, -108, -108, - -108, -108, -108, -108, -108, -31, 17, 186, -108, 19, - -108, -108, 208, 34, 621, 200, 166, 528, 228, -108, - -5, -108, 901, 190, -108, -13, 794, -108, -108, 1291, - -108, -108, -108, 1193, -108, -108, 212, -108, 2277, -108, - 352, -13, -108, -108, 185, 521, 26, 2083, 319, 3005, - 4, -108, 1, 571, 2, 700, 146, 1388, 2797, -7, - -25, 511, -24, 6, 997, 7, 8, 1489, 46, 38, - 49, 1388, 94, 12, 1388, 42, 1388, 32, 33, -108, - 277, -108, 273, -108, -3, 35, 524, 233, 621, -108, - 98, -108, -108, -108, 2180, 901, 1786, 14, -108, 153, - -108, -108, 10, -108, -108, 901, 901, 110, 901, -108, - 300, -108, 95, -108, -108, 176, 158, -108, -108, -108, - -108, -108, 528, -108, 172, -108, 109, -108, -108, 528, - -108, -108, 126, -108, -108, -108, -108, -108, + -108, -108, -108, -108, 179, 1528, -108, -108, 77, 36, + -108, 1528, -108, -108, 1528, -108, -108, -108, -108, -108, + -108, -108, -108, -108, -108, -108, -108, -108, 1528, 56, + 1528, 1528, 80, 74, 1528, -108, 2521, 1528, 1528, -108, + 125, -108, 55, -108, -108, 53, 410, 418, 72, 52, + -108, 392, -108, 46, 3041, -108, -108, -108, -108, -108, + 273, -108, 396, -108, 44, -108, -108, -108, 76, -108, + -108, -108, 3041, -108, -108, 744, -108, 589, 98, 2937, + 91, 90, 88, 3249, -108, 1528, -108, 86, 1528, 81, + -108, 75, 73, -108, -108, 586, -108, -108, -108, -108, + 71, 491, 69, 65, 3041, 64, -108, -108, 2937, -108, + -108, 139, -108, -108, -108, -108, 134, -108, -108, -108, + -108, -108, -108, 63, 66, 1528, 147, 264, -108, -108, + -108, 1726, -108, 87, 68, 70, -108, 334, 82, 78, + 796, 89, 121, 349, 318, 469, 1528, 330, 1528, 1528, + 1528, 1528, 359, 1528, 1528, 1528, 1528, 1528, 284, 289, + 303, 306, 313, 365, 369, 375, 1528, 58, 1528, 85, + 1528, -108, 849, 1528, -108, 1528, 79, 59, 1528, 61, + 2937, -108, 1528, 146, 2937, -108, 1528, 62, 1528, 1528, + 106, 99, 1528, -108, 96, 176, 171, -108, -108, 1528, + -108, 407, 1528, -108, 97, 1528, -52, 2937, -108, 1528, + 120, 2937, -108, 1528, 123, 2937, 101, 2937, -108, 116, + -108, 84, 45, 0, -108, -108, 2937, -39, 641, -3, + 652, 156, 1528, 2937, -7, -11, 567, 2625, -21, 5, + 945, 2, 94, 1629, 2625, -1, -26, 6, 1528, 10, + -15, 1528, 14, 1528, -25, -12, 2833, -108, -108, -108, + -108, -108, -108, 1528, -108, -108, -108, -14, -58, -13, + 3041, -36, -108, 287, -108, 1528, -46, -108, 153, -108, + -108, -31, 586, -57, -32, 3041, 11, -108, 1528, 168, + 29, -108, 47, -108, 48, 169, 1528, -108, 49, 50, + -108, 9, -108, 2937, -108, 136, 2937, -108, 275, -108, + -108, 126, 2937, 35, -108, 33, 37, -108, 466, -4, + 38, -108, -108, -108, -108, 1528, 130, 2937, -108, 1528, + 117, 2937, -108, 34, -108, 296, -108, -108, 1528, -108, + -108, 404, -108, -108, 12, 40, 3041, 13, -108, -108, + 155, 1926, -108, -108, 2026, -108, -108, 2126, -108, -108, + -108, -108, -108, -108, 144, -108, -108, -108, -108, -108, + -108, -108, -108, -108, 3041, -108, -108, -108, 132, -27, + 15, 1137, 218, -23, 17, -108, -108, 196, -108, 242, + 8, -108, -108, 579, 237, -108, 127, 18, 415, -108, + 103, -108, -108, 236, -108, 2223, -108, -108, -108, -108, + -108, -108, -108, -108, -108, 27, 21, 137, 31, 20, + -108, 23, -5, -108, -9, -108, 332, -10, 571, 201, + 195, 586, 225, -108, 7, -108, 1137, 165, -108, 4, + 1137, -108, -108, 1333, -108, -108, -108, 1431, -108, -108, + 184, -108, 2223, -108, 331, 3, -108, -108, 202, 531, + 26, 2417, 327, 3145, 1, -108, 25, 629, 24, 649, + 124, 1528, 2937, 22, -6, 514, -8, 19, 1041, 16, + 94, 1629, 28, 42, 67, 1528, 60, 43, 1528, 54, + 1528, 41, 39, -108, 234, -108, 228, -108, 51, -2, + 564, 233, 575, -108, 100, -108, -108, -108, 2320, 1137, + 1826, 32, -108, 122, -108, -108, 30, -108, -108, 1137, + 1137, 104, 903, -108, 308, -108, 108, -108, -108, 133, + 119, -108, -108, -108, -108, -108, 451, -108, 164, -108, + 161, -108, -108, 458, -108, -108, 151, -108, -108, -108, + -108, -108, - -112, -3, 65, 88, 78, 292, -4, -112, -112, -112, - -112, -112, -112, -112, -112, -112, -112, -112, -112, -70, - -112, -112, -112, -112, -112, -112, -112, -112, -112, 70, - -112, -112, -112, 10, -112, -112, 2, -24, 15, 96, - 99, -112, 130, 103, -112, -112, -112, 48, 62, -112, - -112, -112, -112, -112, -112, 57, -112, 82, 203, -112, - 187, 181, -112, -112, -112, -112, 169, 177, 178, -112, - -112, -112, -112, 189, -112, 196, 198, 206, 161, -112, - 107, 113, 135, 116, 117, 119, -112, 125, 128, 133, - -112, -112, -112, -112, -112, -112, -112, -112, -112, -112, - -112, 139, -112, 145, -112, 180, 8, -42, -112, -112, + -112, 18, 86, 97, 69, 316, 7, -112, -112, -112, + -112, -112, -112, -112, -112, -112, -112, -112, -112, -64, + -112, -112, -112, -112, -112, -112, -112, -112, -112, 66, + -112, -112, -112, -17, -112, -112, -10, -36, 3, 90, + 95, -112, 149, 74, -112, -112, -112, 67, 13, -112, + -112, -112, -112, -112, -112, 178, -112, 181, 185, -112, + 189, 190, -112, -112, -112, -112, 198, 208, 212, -112, + -112, -112, -112, 209, -112, 201, 164, 111, 113, -112, + 116, 130, 131, 132, 134, 142, -112, 118, 124, 144, -112, -112, -112, -112, -112, -112, -112, -112, -112, -112, + -112, 154, -112, 155, -112, 268, 28, -8, -112, -112, -112, -112, -112, -112, -112, -112, -112, -112, -112, -112, -112, -112, -112, -112, -112, -112, -112, -112, -112, -112, - -112, -112, -112, -112, -112, 5, -112, -112, -112, -112, - -112, 31, -112, -112, 32, -112, -112, -112, -112, -112, - -112, -112, -112, -112, -112, -112, -112, -112, 86, -112, - 77, 17, -112, -112, 28, -112, 273, 37, 79, -112, - -112, -112, -112, -112, -112, -112, 61, 95, -112, -112, - -112, 46, -112, -112, 58, -112, -112, -112, -112, -112, - -112, -112, 45, -112, -112, -112, -112, -112, -112, -112, - -112, -112, 131, -112, -112, 29, -112, 33, -112, 84, - -112, 39, -112, 223, -112, 42, -112, -112, 35, 16, - -112, -112, -112, -112, -112, 49, -112, -112, -112, -112, - -112, 184, -112, -112, 194, -112, -112, -112, 199, -112, -112, -112, -112, -112, -112, -112, -112, -112, -112, -112, + -112, -112, -112, -112, -112, 42, -112, -112, -112, -112, + -112, 47, -112, -112, 50, -112, -112, -112, -112, -112, + -112, -112, -112, -112, -112, -112, -112, -112, 159, -112, + 158, 56, -112, -112, 57, -112, 362, 60, 157, -112, + -112, -112, -112, -112, -112, -112, 20, 151, -112, -112, + -112, 25, -112, -112, 30, -112, -112, -112, -112, -112, + -112, -112, 31, -112, -112, -112, -112, -112, -112, -112, + -112, -112, 233, -112, -112, 34, -112, 35, -112, 225, + -112, 36, -112, 216, -112, 55, -112, -112, 53, 39, -112, -112, -112, -112, -112, 19, -112, -112, -112, -112, - -112, 76, -112, -112, -112, -112, -112, -112, -112, -112, - -112, -112, -112, -112, -112, -11, 214, -112, 215, 221, - 224, 225, -112, 92, 90, 83, 74, 73, -112, -112, - -112, -112, -112, -112, -112, -112, 237, -112, 234, -112, - 243, -112, -112, 254, -112, 67, -112, -112, 85, -112, - 167, -112, 26, -112, 219, -112, 247, -112, 244, 241, - -112, -112, 233, -112, -112, -112, -112, -112, -112, 213, - -112, 108, 183, -112, -112, 193, -112, 202, -112, 106, - -112, 209, -112, 55, -112, 317, -112, 205, -112, -112, - -112, -112, -112, -112, -112, -112, 191, -112, 59, -112, - 60, -112, 134, 179, -112, -112, 44, 160, -112, -112, - 156, -112, -112, 41, 211, -112, -112, -112, 50, -112, - 36, 192, -112, 63, -112, -112, 72, -112, -112, -112, - -112, -112, -112, 23, -112, -112, -112, -112, -112, -112, - 75, -112, -112, -112, -112, 114, -112, -112, -112, -112, - -112, -112, 64, -112, -112, 69, -112, -112, 52, -112, - -112, -112, -112, -112, -50, -112, 56, -112, -45, -112, - -112, -112, -112, 293, -112, -112, 264, -112, -112, -112, - -112, -112, 89, -64, -112, -112, 24, -112, 25, -112, - 27, -112, -112, -112, -112, 34, -112, 122, -112, 47, - -112, 66, -112, -112, -112, -112, -112, -112, 38, -112, - -112, 220, -112, -112, -112, -112, 197, -112, -112, -112, - -112, 30, -112, -112, 120, -112, -112, 3, -112, -112, + -112, 94, -112, -112, 92, -112, -112, -112, 117, -112, -112, -112, -112, -112, -112, -112, -112, -112, -112, -112, - -112, -112, -112, -112, 195, -112, -112, -112, -112, -112, - -112, 51, -112, -112, -112, -112, -112, -112, -112, 40, - -112, -112, -112, -15, -28, -112, -112, -112, -12, -112, - -112, -112, -112, -112, -112, 314, -112, -112, -112, -112, + -112, -112, -112, -112, -112, 33, -112, -112, -112, -112, + -112, 88, -112, -112, -112, -112, -112, -112, -112, -112, + -112, -112, -112, -112, -112, 51, 220, -112, 227, 235, + 236, 244, -112, 21, 17, 102, 91, 89, -112, -112, + -112, -112, -112, -112, -112, -112, 211, -112, 247, -112, + 257, -112, -112, 264, -112, 75, -112, -112, 103, -112, + 112, -112, 29, -112, 73, -112, 263, -112, 255, 254, + -112, -112, 245, -112, -112, -112, -112, -112, -112, 248, + -112, 65, 105, -112, -112, 99, -112, 162, -112, 37, + -112, 115, -112, 44, -112, 135, -112, 137, -112, -112, + -112, -112, -112, -112, -112, -112, 138, -112, 24, -112, + 26, -112, 104, 140, -112, -112, 32, 64, -112, -112, + 174, -112, -112, 48, 87, -112, -112, -112, 54, -112, + 40, 71, -112, 150, -112, -112, 197, -112, -112, -112, + -112, -112, -112, 12, -112, -112, -112, -112, -112, -112, + 206, -112, -112, -112, -112, 207, -112, -112, -112, -112, + -112, -112, 231, -112, -112, 239, -112, -112, 43, -112, + -112, -112, -112, -112, -59, -112, 38, -112, -62, -112, + -112, -112, -112, 258, -112, -112, 259, -112, -112, -112, + -112, -112, 163, -72, -112, -112, 41, -112, 62, -112, + 61, -112, -112, -112, -112, 59, -112, 193, -112, 58, + -112, 204, -112, -112, -112, -112, -112, -112, 52, -112, + -112, 175, -112, -112, -112, -112, 186, -112, -112, -112, + -112, 49, -112, -112, 173, -112, -112, 45, -112, -112, -112, -112, -112, -112, -112, -112, -112, -112, -112, -112, - -112, -112, -112, -112, 7, 0, -112, 21, -112, -112, - -112, -112, 147, -112, -112, -112, 236, -112, -112, 324, - -112, -112, -112, 424, -112, -112, -112, -112, 360, -112, - -112, 13, -112, -112, -1, 12, -112, 338, -112, 212, - 4, -112, -112, 9, -112, -6, -112, 208, 246, -112, - -112, 6, -112, -112, 71, -112, -112, 18, -112, -112, - -112, 14, -112, -10, 53, -112, 43, -112, -112, -112, - -112, -112, -30, -112, -112, -112, -5, -18, -2, -112, - -112, -112, -112, -112, 378, 81, 311, 1, -112, -112, - -112, -112, 11, -112, -112, 20, 22, 207, 80, -112, + -112, -112, -112, -112, 213, -112, -112, -112, -112, -112, + -112, 46, -112, -112, -112, -112, -112, -112, -112, 27, + -112, -112, -112, -18, -9, -112, -112, -112, 15, -112, + -112, -112, -112, -112, -112, 331, -112, -112, -112, -112, -112, -112, -112, -112, -112, -112, -112, -112, -112, -112, - -112, -112, -8, -112, -112, -112, -112, -112, -112, -9, - -112, -112, -112, -112, -112, -112, -112, -112 + -112, -112, -112, -112, -112, -112, -112, -112, 11, -6, + -112, 10, -112, -112, -112, -112, 156, -112, -112, -112, + 240, -112, -112, 330, -112, -112, -112, 332, -112, -112, + -112, -112, 376, -112, -112, 8, -112, -112, -7, 76, + -112, 358, -112, 228, 5, -112, -112, 6, -112, 4, + -112, 79, 221, -112, -112, 2, -112, -112, 174, -112, + -112, 16, -112, -112, -112, 14, -112, -16, 70, -112, + 63, -112, -112, -112, -112, -112, -30, -112, -112, -112, + -15, -28, -13, -112, -112, -112, -112, -112, 460, 93, + 307, -12, -112, -112, -112, -112, -11, -112, -112, -2, + -1, 85, 84, -112, -112, -112, -112, -112, -112, -112, + -112, -112, -112, -112, -112, -112, -3, -112, -112, -112, + -112, -112, -112, 0, -112, -112, -112, -112, -112, -112, + -112, -112 }; const short QQmlJSGrammar::action_info [] = { - -130, 452, 556, -146, 488, 637, 465, 469, 248, -149, - -141, 271, 353, -150, -138, -119, 486, 408, -150, 402, - 579, 406, -149, -130, 271, 353, 478, 403, -138, 572, - 396, -119, -118, 597, 428, 436, 443, 579, 456, 442, - 594, 436, 630, 579, 529, 452, 558, 579, 561, -146, - 460, 409, 555, -118, 412, 345, -141, 436, 286, 308, - 485, 452, 248, 458, 452, 417, 191, 174, 465, 469, - 410, 565, 539, 168, 428, 422, 151, 425, 145, 73, - 432, 286, 534, 194, 310, 326, 248, 0, 0, 187, - 0, 0, 271, 73, 0, 640, 427, 687, 0, 244, - 424, -143, 168, 247, 145, 265, 326, 101, 339, 357, - 452, 193, 332, 306, 183, 306, 145, 241, 469, 494, - 465, 153, 428, 318, 320, 353, 186, 176, 145, 246, - 446, 145, 145, 145, 315, 243, 101, 145, 455, 60, - 264, 145, 60, 60, 341, 0, 177, 347, 0, 145, - 61, 308, 456, 61, 61, 60, 686, 685, 64, 642, - 641, 576, 262, 261, 103, 145, 61, 495, 267, 65, - 678, 677, 328, 176, 262, 261, 329, 537, 260, 259, - 505, 537, 255, 254, 471, 355, 538, 684, 683, 351, - 567, 176, 177, 467, 559, 420, 419, 342, 576, 655, - 656, 430, 349, 655, 656, 542, 541, 262, 261, 650, - 177, 170, 145, 146, 535, 171, 439, 481, 87, 588, - 88, 270, 268, 176, 0, 644, 545, 0, 0, 535, - 535, 89, 66, 681, 680, 570, 87, 0, 88, 530, - 145, 560, 177, 0, 415, 563, 577, 66, 0, 89, - 269, 579, 87, 0, 88, 87, 87, 88, 88, 66, - 532, 440, 535, 0, 324, 89, 0, 679, 89, 89, - 482, 480, 531, 589, 587, 532, 532, 67, 145, 145, - 546, 544, 87, 68, 88, 532, 0, 531, 531, 571, - 569, 532, 67, 239, 238, 89, 176, 531, 68, 87, - 176, 88, 535, 531, 67, 87, 0, 88, 532, 87, - 68, 88, 89, 632, 645, 177, 0, 178, 89, 177, - 531, 415, 89, 87, 87, 88, 88, 181, 87, 0, - 88, 450, 449, 87, 176, 88, 89, 89, 633, 631, - 0, 89, 288, 289, 75, 76, 89, 674, 532, 288, - 289, 0, -105, 177, 0, 178, 75, 76, 0, 0, - 531, 675, 673, 0, 0, 0, 0, 176, 0, 290, - 291, 77, 78, 0, 0, 35, 290, 291, 0, 105, - 293, 294, 0, 77, 78, -105, 177, 0, 178, 295, - 0, 0, 296, 0, 297, 672, 0, 0, 106, 0, - 107, 6, 5, 4, 1, 3, 2, 80, 81, 0, - 0, 0, 49, 52, 50, 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, - 35, 85, 46, 34, 51, 82, 83, 80, 81, 84, - 35, 85, 0, 0, 35, 82, 83, 35, 0, 84, - 0, 85, 0, 35, 0, 0, 35, 49, 52, 50, - 0, 0, 293, 294, 35, 0, 0, 49, 52, 50, - 0, 295, 0, 0, 296, 0, 297, 49, 52, 50, - 0, 49, 52, 50, 49, 52, 50, 46, 34, 51, - 49, 52, 50, 49, 52, 50, 0, 46, 34, 51, - 0, 49, 52, 50, 0, 0, 0, 46, 34, 51, - 0, 46, 34, 51, 46, 34, 51, 0, 0, 0, - 46, 34, 51, 46, 34, 51, 537, 35, 0, 537, - 35, 46, 34, 51, 186, 35, 0, 186, 0, 0, - 35, 0, 186, 35, 0, 0, 0, 35, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 49, 52, 50, 49, 52, 50, - 0, 0, 49, 52, 50, 0, 0, 49, 52, 50, - 49, 52, 50, 0, 49, 52, 50, 0, 0, 0, - 35, 0, 0, 0, 46, 34, 51, 46, 34, 51, - 35, 0, 46, 34, 51, 0, 0, 46, 34, 51, - 46, 34, 51, 35, 46, 34, 51, 0, 0, 0, - 0, 0, 253, 252, 0, 0, 537, 49, 52, 50, - 0, 0, 253, 252, 0, 0, 0, 49, 52, 50, - 35, 0, 0, 0, 0, 258, 257, 0, 0, 0, - 49, 52, 50, 35, 0, 0, 35, 46, 34, 51, + -132, 425, 409, 424, -151, 422, -120, 403, 347, -140, + 428, 465, -152, -143, 417, 353, 406, -145, 452, 412, + 410, -148, 408, -140, 469, 271, -152, 569, 353, -132, + 271, -151, 248, 601, 583, -120, 583, 583, 565, 529, + 562, 576, 563, 598, 555, 534, 634, 539, 564, 561, + 558, 478, 436, 436, 436, 456, 460, 443, 644, 641, + 556, -148, 432, 583, 442, 583, 427, -145, 488, 458, + 452, 452, 485, 486, -143, 469, 452, 465, 428, 194, + 191, 174, 168, 248, 73, 151, 286, 145, 286, 187, + 310, 326, 396, 0, 168, 0, 153, 0, 244, 247, + 402, -121, 265, 73, 101, 691, 332, 241, 326, 469, + 306, 465, 193, 339, 452, 183, 306, 357, 145, 246, + 318, 320, 428, 248, 353, 145, 186, 271, 145, 243, + 580, 145, 455, 145, 176, 0, 103, 308, 145, 315, + 264, 101, 537, 446, 145, 559, 456, 176, 176, 308, + 0, 538, 145, 177, 145, 145, 0, 0, 345, 262, + 261, 646, 645, 494, 542, 541, 177, 177, 170, 690, + 689, 328, 171, 580, 103, 329, 145, 471, 654, 439, + 351, 181, 60, 355, 341, 262, 261, 145, 60, 66, + 467, 592, 560, 61, 60, 260, 259, 659, 660, 61, + 255, 254, 349, 648, 505, 61, 324, 267, 659, 660, + 537, 495, 688, 687, 420, 419, 64, 262, 261, 571, + 105, 581, 682, 681, 440, 685, 684, 65, 430, 583, + 535, 535, 574, 66, 67, 146, 87, 342, 88, 106, + 68, 107, 87, 545, 88, 593, 591, 567, 87, 89, + 88, 87, 87, 88, 88, 89, 87, 535, 88, 683, + 0, 89, 535, 0, 89, 89, 535, 0, 66, 89, + 636, 530, 87, 0, 88, 0, 532, 532, 67, 60, + 176, 145, 0, 145, 68, 89, 575, 573, 531, 531, + 61, 0, 649, 532, 0, 637, 635, 546, 544, 177, + 0, 178, 176, 532, 481, 531, 0, 0, 532, 87, + 0, 88, 532, 67, 87, 531, 88, 532, 0, 68, + 531, 177, 89, 415, 531, 270, 268, 89, 87, 531, + 88, 87, 0, 88, 239, 238, 450, 449, 87, 0, + 88, 89, 176, 87, 89, 88, 176, 176, 288, 289, + 0, 89, 288, 289, 269, 678, 89, 482, 480, 0, + -107, 177, 0, 178, -107, 177, 177, 178, 415, 679, + 677, 0, 293, 294, 0, 290, 291, 0, 0, 290, + 291, 295, 293, 294, 296, 0, 297, 0, 293, 294, + 0, 295, 293, 294, 296, 0, 297, 295, 293, 294, + 296, 295, 297, 676, 296, 0, 297, 295, 80, 81, + 296, 0, 297, 0, 0, 0, 82, 83, 80, 81, + 84, 35, 85, 0, 0, 35, 82, 83, 0, 0, + 84, 0, 85, 35, 80, 81, 35, 0, 0, 35, + 75, 76, 82, 83, 35, 0, 84, 35, 85, 0, + 6, 5, 4, 1, 3, 2, 0, 0, 49, 52, + 50, 0, 49, 52, 50, 0, 0, 77, 78, 0, + 49, 52, 50, 49, 52, 50, 49, 52, 50, 0, + 35, 49, 52, 50, 49, 52, 50, 35, 46, 34, + 51, 0, 46, 34, 51, 35, 0, 0, 35, 0, + 46, 34, 51, 46, 34, 51, 46, 34, 51, 0, + 0, 46, 34, 51, 46, 34, 51, 49, 52, 50, + 35, 0, 0, 0, 49, 52, 50, 0, 0, 0, + 80, 81, 49, 52, 50, 49, 52, 50, 82, 83, + 0, 0, 84, 35, 85, 0, 537, 46, 34, 51, + 186, 0, 0, 0, 46, 34, 51, 49, 52, 50, + 35, 0, 46, 34, 51, 46, 34, 51, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 537, + 49, 52, 50, 0, 0, 0, 537, 46, 34, 51, + 537, 0, 0, 35, 537, 0, 35, 49, 52, 50, + 35, 0, 0, 186, 35, 0, 0, 0, 35, 0, + 46, 34, 51, 0, 0, 35, 0, 0, 35, 0, 0, 0, 0, 0, 0, 0, 0, 46, 34, 51, - 0, 0, 0, 0, 0, 0, 0, 49, 52, 50, - 46, 34, 51, 0, 0, 253, 252, 0, 258, 257, - 49, 52, 50, 49, 52, 50, 0, 0, 0, 0, - 0, 0, 0, 0, 155, 0, 0, 46, 34, 51, - 0, 0, 0, 0, 156, 0, 0, 0, 157, 35, - 46, 34, 51, 46, 34, 51, 0, 158, 0, 159, - 0, 0, 322, 0, 0, 0, 0, 0, 0, 0, - 160, 0, 161, 64, 0, 0, 0, 0, 0, 0, - 162, 258, 257, 163, 65, 0, 49, 52, 50, 164, - 0, 0, 0, 0, 0, 165, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 166, 0, 0, 0, 0, 46, 34, 51, 0, - 0, 0, 0, 0, 0, 0, 30, 31, 155, 0, - 0, 0, 0, 0, 0, 0, 33, 0, 156, 0, - 0, 0, 157, 35, 0, 0, 0, 36, 37, 0, - 38, 158, 0, 159, 0, 0, 0, 521, 0, 0, - 0, 45, 0, 0, 160, 0, 161, 64, 0, 0, - 0, 0, 0, 0, 162, 0, 0, 163, 65, 53, - 49, 52, 50, 164, 54, 0, 0, 0, 0, 165, - 0, 0, 0, 0, 0, 44, 56, 32, 0, 0, - 0, 0, 41, 0, 0, 166, 0, 0, 0, 0, - 46, 34, 51, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 49, 52, 50, 49, 52, 50, 0, 49, 52, 50, + 0, 49, 52, 50, 0, 49, 52, 50, 0, 0, + 258, 257, 49, 52, 50, 49, 52, 50, 35, 0, + 46, 34, 51, 46, 34, 51, 0, 46, 34, 51, + 35, 46, 34, 51, 0, 46, 34, 51, 35, 0, + 0, 35, 46, 34, 51, 46, 34, 51, 0, 0, + 253, 252, 0, 0, 35, 49, 52, 50, 0, 0, + 0, 186, 253, 252, 0, 0, 0, 49, 52, 50, + 258, 257, 0, 258, 257, 49, 52, 50, 49, 52, + 50, 0, 0, 0, 0, 46, 34, 51, 0, 0, + 155, 49, 52, 50, 0, 0, 0, 46, 34, 51, + 156, 0, 0, 0, 157, 46, 34, 51, 46, 34, + 51, 0, 0, 158, 0, 159, 0, 0, 0, 0, + 0, 46, 34, 51, 0, 0, 160, 0, 161, 64, + 0, 0, 0, 35, 0, 0, 162, 0, 0, 163, + 65, 0, 0, 0, 0, 164, 0, 0, 0, 0, + 0, 165, 0, 0, 0, 0, 0, 0, 0, 155, + 0, 0, 0, 0, 0, 253, 252, 166, 0, 156, + 49, 52, 50, 157, 0, 0, 0, 0, 0, 0, + 0, 0, 158, 0, 159, 0, 0, 322, 0, 0, + 0, 0, 0, 0, 0, 160, 0, 161, 64, 0, + 46, 34, 51, 0, 0, 162, 0, 0, 163, 65, + 0, 0, 155, 0, 164, 0, 0, 0, 0, 0, + 165, 0, 156, 0, 0, 0, 157, 0, 0, 0, + 0, 0, 0, 0, 0, 158, 166, 159, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 160, 0, + 161, 64, 0, 0, 0, 0, 0, 0, 162, 0, + 0, 163, 65, 0, 0, 0, 0, 164, 0, 0, + 0, 0, 0, 165, 0, 30, 31, 0, 0, 0, + 0, 0, 0, 0, 0, 33, 0, 0, 0, 166, + 0, 0, 35, 0, 0, 0, 36, 37, 0, 38, + 0, 0, 0, 0, 0, 0, 521, 0, 0, 0, + 45, 0, 0, 0, 0, 0, 0, 30, 31, 0, + 0, 0, 0, 0, 0, 0, 0, 33, 53, 49, + 52, 50, 0, 54, 35, 0, 0, 0, 36, 37, + 0, 38, 0, 0, 44, 56, 32, 0, 42, 0, + 0, 41, 45, 0, 0, 0, 0, 0, 0, 46, + 34, 51, 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, 0, 41, 0, 0, 0, 0, 0, 0, + 0, 46, 34, 51, 0, 0, 0, 0, 0, 0, 0, 0, 0, 30, 31, 0, 0, 0, 0, 0, 0, 0, 0, 33, 0, 0, 0, 0, 0, 0, 35, 0, 0, 0, 36, 37, 0, 38, 0, 0, - 0, 0, 0, 0, 521, 0, 0, 0, 45, 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, @@ -470,7 +487,7 @@ const short QQmlJSGrammar::action_info [] = { 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, + 521, 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, @@ -490,7 +507,7 @@ const short QQmlJSGrammar::action_info [] = { 0, 0, 0, 0, 0, 221, 0, 0, 0, 0, 0, 0, 35, 0, 0, 0, 36, 37, 0, 38, 0, 0, 0, 0, 0, 0, 521, 0, 0, 0, - 45, 0, 0, 0, 0, 0, 0, 0, 584, 0, + 45, 0, 0, 0, 0, 0, 0, 0, 585, 0, 0, 0, 0, 0, 0, 0, 0, 0, 53, 522, 524, 523, 0, 54, 0, 0, 0, 0, 230, 0, 0, 0, 0, 0, 44, 56, 32, 216, 224, 0, @@ -500,7 +517,7 @@ const short QQmlJSGrammar::action_info [] = { 0, 0, 0, 221, 0, 0, 0, 0, 0, 0, 35, 0, 0, 0, 36, 37, 0, 38, 0, 0, 0, 0, 0, 0, 521, 0, 0, 0, 45, 0, - 0, 0, 0, 0, 0, 0, 581, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 588, 0, 0, 0, 0, 0, 0, 0, 0, 0, 53, 522, 524, 523, 0, 54, 0, 0, 0, 0, 230, 0, 0, 0, 0, 0, 44, 56, 32, 216, 224, 0, 0, 41, @@ -515,7 +532,7 @@ const short QQmlJSGrammar::action_info [] = { 55, 0, 57, 0, 58, 0, 0, 0, 0, 44, 56, 32, 0, 0, 0, 0, 41, 0, 0, 0, 0, 0, 0, 0, 46, 34, 51, 0, 0, 0, - 0, 0, 0, 0, 0, 0, -139, 0, 0, 0, + 0, 0, 0, 0, 0, 0, -141, 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, @@ -540,27 +557,27 @@ const short QQmlJSGrammar::action_info [] = { 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, 498, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 493, 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, 0, 41, 0, 0, 0, 0, 0, 0, 0, 46, 34, 51, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 492, 0, 0, 29, 30, 31, + 0, 0, 0, 0, 500, 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, 493, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 503, 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, 0, 41, 0, 0, 0, 0, 0, 0, 0, 46, 34, 51, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 500, 0, 0, 29, 30, 31, + 0, 0, 0, 0, 492, 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, 501, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 498, 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, 0, 41, 0, 0, 0, 0, 0, @@ -570,14 +587,14 @@ const short QQmlJSGrammar::action_info [] = { 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, 503, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 501, 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, 0, 41, 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, 222, 0, 0, 599, 37, 0, 38, + 0, 0, 35, 222, 0, 0, 223, 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, 226, 0, 0, 0, 53, 49, @@ -587,7 +604,7 @@ const short QQmlJSGrammar::action_info [] = { 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, - 222, 0, 0, 599, 646, 0, 38, 0, 0, 0, + 222, 0, 0, 603, 650, 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, 226, 0, 0, 0, 53, 49, 52, 50, 227, @@ -597,7 +614,7 @@ const short QQmlJSGrammar::action_info [] = { 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, 222, 0, 0, - 223, 37, 0, 38, 0, 0, 0, 39, 0, 40, + 603, 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, 226, 0, 0, 0, 53, 49, 52, 50, 227, 54, 0, 55, @@ -666,177 +683,195 @@ const short QQmlJSGrammar::action_info [] = { 227, 54, 228, 55, 229, 57, 230, 58, 231, 232, 0, 0, 44, 56, 32, 216, 224, 218, 0, 41, 0, 0, 0, 0, 0, 0, 0, 46, 34, 51, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 603, - 112, 113, 0, 0, 605, 117, 607, 30, 31, 608, - 0, 120, 0, 0, 0, 123, 610, 611, 0, 0, - 0, 0, 0, 0, 35, 612, 127, 128, 223, 37, - 0, 38, 0, 0, 0, 39, 0, 40, 614, 43, - 0, 0, 616, 0, 0, 0, 47, 0, 48, 0, - 0, 0, 0, 0, 617, 0, 226, 0, 0, 0, - 618, 49, 52, 50, 619, 620, 621, 55, 623, 624, - 625, 626, 627, 628, 0, 0, 615, 622, 609, 604, - 613, 606, 132, 41, 0, 0, 121, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 607, + 112, 113, 0, 0, 609, 117, 611, 30, 31, 612, + 0, 120, 0, 0, 0, 123, 614, 615, 0, 0, + 0, 0, 0, 0, 35, 616, 127, 128, 223, 37, + 0, 38, 0, 0, 0, 39, 0, 40, 618, 43, + 0, 0, 620, 0, 0, 0, 47, 0, 48, 0, + 0, 0, 0, 0, 621, 0, 226, 0, 0, 0, + 622, 49, 52, 50, 623, 624, 625, 55, 627, 628, + 629, 630, 631, 632, 0, 0, 619, 626, 613, 608, + 617, 610, 132, 41, 0, 0, 121, 0, 0, 0, 0, 46, 377, 384, 0, 0, 0, 0, 0, 0, 0, 0, 0, 368, 112, 113, 0, 0, 370, 117, 372, 30, 31, 373, 0, 120, 0, 0, 0, 123, 375, 376, 0, 0, 0, 0, 0, 0, 35, 378, 127, 128, 223, 37, 0, 38, 0, 0, 0, 39, 0, 40, 380, 43, 0, 0, 382, 0, 0, 0, - 47, 0, 48, 0, -286, 0, 0, 0, 383, 0, + 47, 0, 48, 0, -288, 0, 0, 0, 383, 0, 226, 0, 0, 0, 385, 49, 52, 50, 386, 387, 388, 55, 390, 391, 392, 393, 394, 395, 0, 0, 381, 389, 374, 369, 379, 371, 132, 41, 0, 0, 121, 0, 0, 0, 0, 46, 377, 384, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 16, 150, 636, 543, 536, 654, 540, 334, 154, 682, - 676, 144, 256, 643, 638, 451, 639, 448, 504, 489, - 397, 316, 266, 651, 185, 586, 629, 251, 185, 323, - 596, 595, 566, 653, 665, 593, 666, 466, 448, 568, - 180, 451, 457, 459, 316, 316, 499, 251, 147, 462, - 470, 256, 461, 448, 437, 429, 441, 185, 354, 445, - 173, 451, 185, 240, 192, 562, 404, 473, 472, 0, - 316, 175, 533, 502, 152, 167, 208, 251, 256, 190, - 516, 479, 190, 208, 208, 413, 263, 208, 316, 0, - 397, 365, 515, 208, 518, 518, 208, 0, 62, 670, - 464, 0, 208, 62, 652, 509, 208, 208, 62, 350, - 463, 423, 62, 190, 511, 426, 398, 62, 62, 510, - 464, 411, 150, 414, 468, 62, 334, 184, 62, 62, - 182, 280, 62, 302, 301, 250, 284, 62, 62, 463, - 208, 62, 189, 300, 413, 62, 317, 62, 172, 208, - 299, 62, 298, 506, 62, 169, 507, 150, 62, 497, - 508, 518, 62, 496, 319, 416, 574, 86, 62, 321, - 413, 62, 62, 93, 62, 514, 95, 96, 397, 97, - 62, 263, 414, 62, 90, 208, 316, 91, 62, 62, - 62, 184, 92, 405, 62, 94, 316, 208, 108, 250, - 62, 249, 190, 343, 348, 407, 102, 358, 414, 208, - 104, 352, 208, 208, 365, 208, 62, 208, 669, 668, - 208, 325, 100, 208, 62, 365, 69, 208, 110, 397, - 602, 242, 62, 62, 70, 71, 62, 208, 473, 72, - 245, 359, 62, 487, 62, 63, 0, 62, 263, 463, - 518, 62, 74, 62, 0, 578, 421, 79, 62, 98, - 464, 62, 344, 62, 208, 184, 365, 99, 312, 62, - 62, 0, 346, 284, 284, 284, 62, 292, 287, 62, - 62, 284, 208, 303, 284, 284, 304, 305, 312, 62, - 340, 108, 62, 284, 284, 365, 312, 284, 312, 62, - 309, 284, 62, 284, 284, 307, 518, 284, 0, 312, - 333, 208, 0, 483, 284, 527, 330, 327, 331, 356, - 311, 110, 179, 0, 0, 590, 0, 517, 528, 582, - 574, 314, 649, 0, 0, 208, 0, 0, 518, 547, - 548, 549, 550, 554, 551, 552, 0, 527, 0, 0, - 0, 0, 598, 447, 489, 0, 0, 0, 0, 517, - 528, 600, 601, 547, 548, 549, 550, 554, 551, 552, - 0, 0, 0, 0, 590, 0, 0, 0, 0, 0, - 0, 0, 444, 591, 592, 547, 548, 549, 550, 554, - 551, 552, 598, 0, 0, 0, 0, 0, 0, 0, - 0, 647, 648, 547, 548, 549, 550, 554, 551, 552, + 543, 185, 640, 647, 642, 643, 504, 489, 397, 451, + 655, 657, 669, 670, 154, 680, 658, 448, 686, 316, + 185, 16, 256, 536, 251, 599, 570, 633, 572, 590, + 597, 144, 323, 540, 457, 150, 266, 473, 190, 441, + 350, 445, 251, 192, 256, 437, 429, 354, 208, 240, + 185, 316, 251, 256, 185, 404, 448, 448, 316, 533, + 566, 470, 466, 180, 451, 451, 462, 0, 62, 334, + 510, 516, 62, 0, 0, 325, 62, 299, 316, 0, + 459, 298, 397, 334, 0, 147, 461, 208, 499, 0, + 152, 208, 502, 167, 600, 479, 673, 672, 518, 173, + 175, 515, 316, 674, 208, 397, 316, 518, 316, 407, + 208, 0, 190, 0, 321, 208, 656, 352, 62, 249, + 464, 62, 62, 184, 509, 62, 62, 463, 463, 62, + 208, 508, 421, 208, 62, 208, 184, 356, 245, 358, + 405, 242, 263, 280, 62, 62, 62, 506, 284, 302, + 62, 301, 507, 208, 317, 208, 208, 62, 208, 62, + 343, 184, 300, 413, 348, 365, 62, 0, 62, 190, + 518, 62, 99, 62, 100, 578, 86, 90, 346, 62, + 208, 208, 319, 91, 344, 62, 62, 62, 413, 62, + 93, 94, 95, 473, 96, 468, 514, 62, 189, 62, + 150, 414, 97, 92, 208, 62, 472, 464, 182, 62, + 62, 208, 497, 62, 62, 397, 496, 250, 365, 62, + 104, 102, 208, 263, 208, 98, 414, 263, 169, 172, + 365, 208, 487, 62, 359, 511, 62, 250, 463, 208, + 62, 398, 464, 208, 62, 62, 606, 63, 72, 190, + 150, 208, 411, 62, 518, 69, 62, 208, 416, 582, + 365, 365, 79, 62, 62, 70, 62, 62, 483, 71, + 0, 284, 74, 0, 0, 62, 208, 208, 423, 307, + 284, 0, 62, 0, 287, 426, 108, 284, 0, 292, + 62, 62, 0, 0, 0, 284, 284, 303, 304, 62, + 312, 0, 62, 312, 284, 284, 305, 284, 284, 312, + 62, 0, 312, 309, 284, 284, 110, 284, 62, 312, + 0, 594, 333, 284, 284, 340, 578, 330, 653, 0, + 518, 331, 0, 327, 311, 586, 0, 589, 0, 527, + 0, 314, 0, 0, 518, 0, 518, 444, 447, 0, + 489, 517, 528, 527, 0, 527, 547, 548, 549, 550, + 554, 551, 552, 0, 0, 517, 528, 517, 528, 0, + 0, 0, 602, 0, 0, 0, 0, 0, 0, 0, + 108, 604, 605, 547, 548, 549, 550, 554, 551, 552, + 594, 0, 0, 0, 0, 0, 0, 0, 0, 595, + 596, 547, 548, 549, 550, 554, 551, 552, 0, 0, + 110, 179, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 585, - 0, 0, 0, 0, 0, 0, 0, 0, 518, 0, - 0, 0, 0, 0, 0, 0, 0, 527, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 517, - 528, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 602, 0, 0, 0, 0, 0, + 0, 0, 0, 651, 652, 547, 548, 549, 550, 554, + 551, 552, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 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 [] = { - 7, 33, 33, 7, 55, 8, 36, 36, 7, 7, - 7, 36, 36, 7, 7, 7, 33, 36, 7, 55, - 33, 55, 7, 7, 36, 36, 17, 7, 7, 34, - 8, 7, 7, 7, 36, 5, 7, 33, 20, 55, - 66, 5, 29, 33, 66, 33, 29, 33, 29, 7, - 60, 60, 29, 7, 55, 61, 7, 5, 1, 79, - 60, 33, 7, 36, 33, 60, 8, 7, 36, 36, - 33, 37, 29, 2, 36, 36, 8, 33, 8, 1, - 33, 1, 37, 33, 8, 2, 7, -1, -1, 36, - -1, -1, 36, 1, -1, 60, 55, 0, -1, 33, - 60, 7, 2, 55, 8, 36, 2, 48, 17, 16, - 33, 60, 7, 48, 60, 48, 8, 36, 36, 8, - 36, 60, 36, 61, 60, 36, 36, 15, 8, 55, - 7, 8, 8, 8, 61, 60, 48, 8, 6, 40, - 77, 8, 40, 40, 8, -1, 34, 60, -1, 8, - 51, 79, 20, 51, 51, 40, 61, 62, 42, 61, - 62, 8, 61, 62, 79, 8, 51, 56, 60, 53, - 61, 62, 50, 15, 61, 62, 54, 15, 61, 62, - 60, 15, 61, 62, 60, 60, 24, 61, 62, 60, - 24, 15, 34, 60, 8, 61, 62, 61, 8, 93, - 94, 60, 31, 93, 94, 61, 62, 61, 62, 56, - 34, 50, 8, 56, 29, 54, 10, 8, 25, 7, - 27, 61, 62, 15, -1, 7, 7, -1, -1, 29, - 29, 38, 12, 61, 62, 7, 25, -1, 27, 29, - 8, 55, 34, -1, 36, 29, 56, 12, -1, 38, - 90, 33, 25, -1, 27, 25, 25, 27, 27, 12, - 75, 55, 29, -1, 60, 38, -1, 95, 38, 38, - 61, 62, 87, 61, 62, 75, 75, 57, 8, 8, - 61, 62, 25, 63, 27, 75, -1, 87, 87, 61, - 62, 75, 57, 61, 62, 38, 15, 87, 63, 25, - 15, 27, 29, 87, 57, 25, -1, 27, 75, 25, - 63, 27, 38, 36, 96, 34, -1, 36, 38, 34, - 87, 36, 38, 25, 25, 27, 27, 56, 25, -1, - 27, 61, 62, 25, 15, 27, 38, 38, 61, 62, - -1, 38, 18, 19, 18, 19, 38, 47, 75, 18, - 19, -1, 33, 34, -1, 36, 18, 19, -1, -1, - 87, 61, 62, -1, -1, -1, -1, 15, -1, 45, - 46, 45, 46, -1, -1, 29, 45, 46, -1, 15, - 23, 24, -1, 45, 46, 33, 34, -1, 36, 32, - -1, -1, 35, -1, 37, 95, -1, -1, 34, -1, - 36, 100, 101, 102, 103, 104, 105, 23, 24, -1, - -1, -1, 66, 67, 68, 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, - 29, 37, 96, 97, 98, 31, 32, 23, 24, 35, - 29, 37, -1, -1, 29, 31, 32, 29, -1, 35, - -1, 37, -1, 29, -1, -1, 29, 66, 67, 68, - -1, -1, 23, 24, 29, -1, -1, 66, 67, 68, - -1, 32, -1, -1, 35, -1, 37, 66, 67, 68, - -1, 66, 67, 68, 66, 67, 68, 96, 97, 98, - 66, 67, 68, 66, 67, 68, -1, 96, 97, 98, - -1, 66, 67, 68, -1, -1, -1, 96, 97, 98, - -1, 96, 97, 98, 96, 97, 98, -1, -1, -1, - 96, 97, 98, 96, 97, 98, 15, 29, -1, 15, - 29, 96, 97, 98, 36, 29, -1, 36, -1, -1, - 29, -1, 36, 29, -1, -1, -1, 29, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, 66, 67, 68, 66, 67, 68, - -1, -1, 66, 67, 68, -1, -1, 66, 67, 68, - 66, 67, 68, -1, 66, 67, 68, -1, -1, -1, - 29, -1, -1, -1, 96, 97, 98, 96, 97, 98, - 29, -1, 96, 97, 98, -1, -1, 96, 97, 98, - 96, 97, 98, 29, 96, 97, 98, -1, -1, -1, - -1, -1, 61, 62, -1, -1, 15, 66, 67, 68, - -1, -1, 61, 62, -1, -1, -1, 66, 67, 68, - 29, -1, -1, -1, -1, 61, 62, -1, -1, -1, - 66, 67, 68, 29, -1, -1, 29, 96, 97, 98, + 7, 33, 60, 60, 7, 36, 7, 7, 60, 7, + 36, 36, 7, 7, 60, 36, 55, 7, 33, 55, + 33, 7, 36, 7, 36, 36, 7, 37, 36, 7, + 36, 7, 7, 7, 33, 7, 33, 33, 47, 66, + 17, 34, 47, 66, 29, 37, 29, 29, 17, 29, + 29, 17, 5, 5, 5, 20, 60, 7, 60, 8, + 33, 7, 33, 33, 55, 33, 55, 7, 55, 36, + 33, 33, 60, 33, 7, 36, 33, 36, 36, 33, + 8, 7, 2, 7, 1, 8, 1, 8, 1, 36, + 8, 2, 8, -1, 2, -1, 60, -1, 33, 55, + 55, 7, 36, 1, 48, 0, 7, 36, 2, 36, + 48, 36, 60, 17, 33, 60, 48, 16, 8, 55, + 61, 60, 36, 7, 36, 8, 36, 36, 8, 60, + 8, 8, 6, 8, 15, -1, 79, 79, 8, 61, + 77, 48, 15, 7, 8, 8, 20, 15, 15, 79, + -1, 24, 8, 34, 8, 8, -1, -1, 61, 61, + 62, 61, 62, 8, 61, 62, 34, 34, 50, 61, + 62, 50, 54, 8, 79, 54, 8, 60, 56, 10, + 60, 56, 40, 60, 8, 61, 62, 8, 40, 12, + 60, 7, 55, 51, 40, 61, 62, 93, 94, 51, + 61, 62, 31, 7, 60, 51, 60, 60, 93, 94, + 15, 56, 61, 62, 61, 62, 42, 61, 62, 24, + 15, 56, 61, 62, 55, 61, 62, 53, 60, 33, + 29, 29, 7, 12, 57, 56, 25, 61, 27, 34, + 63, 36, 25, 7, 27, 61, 62, 29, 25, 38, + 27, 25, 25, 27, 27, 38, 25, 29, 27, 95, + -1, 38, 29, -1, 38, 38, 29, -1, 12, 38, + 36, 29, 25, -1, 27, -1, 75, 75, 57, 40, + 15, 8, -1, 8, 63, 38, 61, 62, 87, 87, + 51, -1, 96, 75, -1, 61, 62, 61, 62, 34, + -1, 36, 15, 75, 8, 87, -1, -1, 75, 25, + -1, 27, 75, 57, 25, 87, 27, 75, -1, 63, + 87, 34, 38, 36, 87, 61, 62, 38, 25, 87, + 27, 25, -1, 27, 61, 62, 61, 62, 25, -1, + 27, 38, 15, 25, 38, 27, 15, 15, 18, 19, + -1, 38, 18, 19, 90, 47, 38, 61, 62, -1, + 33, 34, -1, 36, 33, 34, 34, 36, 36, 61, + 62, -1, 23, 24, -1, 45, 46, -1, -1, 45, + 46, 32, 23, 24, 35, -1, 37, -1, 23, 24, + -1, 32, 23, 24, 35, -1, 37, 32, 23, 24, + 35, 32, 37, 95, 35, -1, 37, 32, 23, 24, + 35, -1, 37, -1, -1, -1, 31, 32, 23, 24, + 35, 29, 37, -1, -1, 29, 31, 32, -1, -1, + 35, -1, 37, 29, 23, 24, 29, -1, -1, 29, + 18, 19, 31, 32, 29, -1, 35, 29, 37, -1, + 100, 101, 102, 103, 104, 105, -1, -1, 66, 67, + 68, -1, 66, 67, 68, -1, -1, 45, 46, -1, + 66, 67, 68, 66, 67, 68, 66, 67, 68, -1, + 29, 66, 67, 68, 66, 67, 68, 29, 96, 97, + 98, -1, 96, 97, 98, 29, -1, -1, 29, -1, + 96, 97, 98, 96, 97, 98, 96, 97, 98, -1, + -1, 96, 97, 98, 96, 97, 98, 66, 67, 68, + 29, -1, -1, -1, 66, 67, 68, -1, -1, -1, + 23, 24, 66, 67, 68, 66, 67, 68, 31, 32, + -1, -1, 35, 29, 37, -1, 15, 96, 97, 98, + 36, -1, -1, -1, 96, 97, 98, 66, 67, 68, + 29, -1, 96, 97, 98, 96, 97, 98, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, 15, + 66, 67, 68, -1, -1, -1, 15, 96, 97, 98, + 15, -1, -1, 29, 15, -1, 29, 66, 67, 68, + 29, -1, -1, 36, 29, -1, -1, -1, 29, -1, + 96, 97, 98, -1, -1, 29, -1, -1, 29, -1, -1, -1, -1, -1, -1, -1, -1, 96, 97, 98, - -1, -1, -1, -1, -1, -1, -1, 66, 67, 68, - 96, 97, 98, -1, -1, 61, 62, -1, 61, 62, - 66, 67, 68, 66, 67, 68, -1, -1, -1, -1, - -1, -1, -1, -1, 3, -1, -1, 96, 97, 98, - -1, -1, -1, -1, 13, -1, -1, -1, 17, 29, - 96, 97, 98, 96, 97, 98, -1, 26, -1, 28, - -1, -1, 31, -1, -1, -1, -1, -1, -1, -1, - 39, -1, 41, 42, -1, -1, -1, -1, -1, -1, - 49, 61, 62, 52, 53, -1, 66, 67, 68, 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, 96, 97, 98, -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, -1, 88, -1, -1, 80, -1, -1, -1, -1, - 96, 97, 98, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + 66, 67, 68, 66, 67, 68, -1, 66, 67, 68, + -1, 66, 67, 68, -1, 66, 67, 68, -1, -1, + 61, 62, 66, 67, 68, 66, 67, 68, 29, -1, + 96, 97, 98, 96, 97, 98, -1, 96, 97, 98, + 29, 96, 97, 98, -1, 96, 97, 98, 29, -1, + -1, 29, 96, 97, 98, 96, 97, 98, -1, -1, + 61, 62, -1, -1, 29, 66, 67, 68, -1, -1, + -1, 36, 61, 62, -1, -1, -1, 66, 67, 68, + 61, 62, -1, 61, 62, 66, 67, 68, 66, 67, + 68, -1, -1, -1, -1, 96, 97, 98, -1, -1, + 3, 66, 67, 68, -1, -1, -1, 96, 97, 98, + 13, -1, -1, -1, 17, 96, 97, 98, 96, 97, + 98, -1, -1, 26, -1, 28, -1, -1, -1, -1, + -1, 96, 97, 98, -1, -1, 39, -1, 41, 42, + -1, -1, -1, 29, -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, 3, + -1, -1, -1, -1, -1, 61, 62, 80, -1, 13, + 66, 67, 68, 17, -1, -1, -1, -1, -1, -1, + -1, -1, 26, -1, 28, -1, -1, 31, -1, -1, + -1, -1, -1, -1, -1, 39, -1, 41, 42, -1, + 96, 97, 98, -1, -1, 49, -1, -1, 52, 53, + -1, -1, 3, -1, 58, -1, -1, -1, -1, -1, + 64, -1, 13, -1, -1, -1, 17, -1, -1, -1, + -1, -1, -1, -1, -1, 26, 80, 28, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, 39, -1, + 41, 42, -1, -1, -1, -1, -1, -1, 49, -1, + -1, 52, 53, -1, -1, -1, -1, 58, -1, -1, + -1, -1, -1, 64, -1, 12, 13, -1, -1, -1, + -1, -1, -1, -1, -1, 22, -1, -1, -1, 80, + -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, 12, 13, -1, + -1, -1, -1, -1, -1, -1, -1, 22, 65, 66, + 67, 68, -1, 70, 29, -1, -1, -1, 33, 34, + -1, 36, -1, -1, 81, 82, 83, -1, 43, -1, + -1, 88, 47, -1, -1, -1, -1, -1, -1, 96, + 97, 98, -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, -1, 88, -1, -1, -1, -1, -1, -1, + -1, 96, 97, 98, -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, @@ -1069,60 +1104,64 @@ const short QQmlJSGrammar::action_check [] = { 91, -1, -1, -1, -1, 96, 97, 98, -1, -1, -1, -1, -1, -1, -1, -1, -1, - 3, 43, 32, 18, 32, 9, 18, 18, 78, 18, - 18, 3, 18, 18, 32, 25, 18, 3, 3, 43, - 18, 3, 3, 22, 18, 18, 22, 18, 18, 3, - 18, 32, 32, 22, 14, 22, 14, 3, 3, 18, - 3, 25, 106, 18, 3, 3, 43, 18, 43, 25, - 3, 18, 25, 3, 104, 3, 101, 18, 3, 3, - 43, 25, 18, 18, 18, 14, 43, 18, 2, -1, - 3, 43, 32, 43, 43, 43, 18, 18, 18, 18, - 2, 43, 18, 18, 18, 14, 2, 18, 3, -1, - 18, 2, 4, 18, 14, 14, 18, -1, 55, 19, - 57, -1, 18, 55, 23, 57, 18, 18, 55, 3, - 57, 47, 55, 18, 57, 46, 44, 55, 55, 57, - 57, 46, 43, 52, 2, 55, 18, 57, 55, 55, - 51, 55, 55, 60, 60, 4, 60, 55, 55, 57, - 18, 55, 47, 60, 14, 55, 79, 55, 71, 18, - 60, 55, 60, 57, 55, 69, 57, 43, 55, 39, - 57, 14, 55, 43, 79, 51, 19, 60, 55, 2, - 14, 55, 55, 60, 55, 110, 60, 60, 18, 60, - 55, 2, 52, 55, 59, 18, 3, 59, 55, 55, - 55, 57, 59, 2, 55, 60, 3, 18, 18, 4, - 55, 2, 18, 95, 2, 45, 67, 2, 52, 18, - 65, 2, 18, 18, 2, 18, 55, 18, 11, 12, - 18, 2, 61, 18, 55, 2, 57, 18, 48, 18, - 18, 47, 55, 55, 57, 57, 55, 18, 18, 58, - 46, 18, 55, 46, 55, 58, -1, 55, 2, 57, - 14, 55, 63, 55, -1, 19, 45, 61, 55, 61, - 57, 55, 79, 55, 18, 57, 2, 61, 55, 55, - 55, -1, 79, 60, 60, 60, 55, 62, 64, 55, - 55, 60, 18, 62, 60, 60, 62, 62, 55, 55, - 77, 18, 55, 60, 60, 2, 55, 60, 55, 55, - 66, 60, 55, 60, 60, 68, 14, 60, -1, 55, - 77, 18, -1, 93, 60, 23, 72, 70, 77, 2, - 77, 48, 49, -1, -1, 14, -1, 35, 36, 5, - 19, 77, 21, -1, -1, 18, -1, -1, 14, 25, - 26, 27, 28, 29, 30, 31, -1, 23, -1, -1, - -1, -1, 14, 89, 43, -1, -1, -1, -1, 35, - 36, 23, 24, 25, 26, 27, 28, 29, 30, 31, + 18, 18, 32, 18, 32, 18, 3, 43, 18, 25, + 22, 22, 14, 14, 78, 18, 9, 3, 18, 3, + 18, 3, 18, 32, 18, 32, 32, 22, 18, 18, + 22, 3, 3, 18, 106, 43, 3, 18, 18, 101, + 3, 3, 18, 18, 18, 104, 3, 3, 18, 18, + 18, 3, 18, 18, 18, 43, 3, 3, 3, 32, + 14, 3, 3, 3, 25, 25, 25, -1, 55, 18, + 57, 2, 55, -1, -1, 2, 55, 60, 3, -1, + 18, 60, 18, 18, -1, 43, 25, 18, 43, -1, + 43, 18, 43, 43, 18, 43, 11, 12, 14, 43, + 43, 4, 3, 19, 18, 18, 3, 14, 3, 45, + 18, -1, 18, -1, 2, 18, 23, 2, 55, 2, + 57, 55, 55, 57, 57, 55, 55, 57, 57, 55, + 18, 57, 45, 18, 55, 18, 57, 2, 46, 2, + 2, 47, 2, 55, 55, 55, 55, 57, 60, 60, + 55, 60, 57, 18, 79, 18, 18, 55, 18, 55, + 95, 57, 60, 14, 2, 2, 55, -1, 55, 18, + 14, 55, 61, 55, 61, 19, 60, 59, 79, 55, + 18, 18, 79, 59, 79, 55, 55, 55, 14, 55, + 60, 60, 60, 18, 60, 2, 110, 55, 47, 55, + 43, 52, 60, 59, 18, 55, 2, 57, 51, 55, + 55, 18, 39, 55, 55, 18, 43, 4, 2, 55, + 65, 67, 18, 2, 18, 61, 52, 2, 69, 71, + 2, 18, 46, 55, 18, 57, 55, 4, 57, 18, + 55, 44, 57, 18, 55, 55, 18, 58, 58, 18, + 43, 18, 46, 55, 14, 57, 55, 18, 51, 19, + 2, 2, 61, 55, 55, 57, 55, 55, 93, 57, + -1, 60, 63, -1, -1, 55, 18, 18, 47, 68, + 60, -1, 55, -1, 64, 46, 18, 60, -1, 62, + 55, 55, -1, -1, -1, 60, 60, 62, 62, 55, + 55, -1, 55, 55, 60, 60, 62, 60, 60, 55, + 55, -1, 55, 66, 60, 60, 48, 60, 55, 55, + -1, 14, 77, 60, 60, 77, 19, 72, 21, -1, + 14, 77, -1, 70, 77, 5, -1, 5, -1, 23, + -1, 77, -1, -1, 14, -1, 14, 89, 89, -1, + 43, 35, 36, 23, -1, 23, 25, 26, 27, 28, + 29, 30, 31, -1, -1, 35, 36, 35, 36, -1, + -1, -1, 14, -1, -1, -1, -1, -1, -1, -1, + 18, 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, + 48, 49, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 14, -1, -1, -1, -1, -1, - -1, -1, 89, 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, 23, 24, 25, 26, 27, 28, 29, + 30, 31, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, -1, 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, 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 }; QT_END_NAMESPACE diff --git a/src/qml/parser/qqmljsgrammar_p.h b/src/qml/parser/qqmljsgrammar_p.h index aa8450f218..9d028f2191 100644 --- a/src/qml/parser/qqmljsgrammar_p.h +++ b/src/qml/parser/qqmljsgrammar_p.h @@ -169,15 +169,15 @@ public: T_XOR = 79, T_XOR_EQ = 80, - ACCEPT_STATE = 687, - RULE_COUNT = 367, - STATE_COUNT = 688, + ACCEPT_STATE = 691, + RULE_COUNT = 369, + STATE_COUNT = 692, TERMINAL_COUNT = 108, NON_TERMINAL_COUNT = 112, - GOTO_INDEX_OFFSET = 688, - GOTO_INFO_OFFSET = 3217, - GOTO_CHECK_OFFSET = 3217 + GOTO_INDEX_OFFSET = 692, + GOTO_INFO_OFFSET = 3357, + GOTO_CHECK_OFFSET = 3357 }; static const char *const spell[]; diff --git a/src/qml/parser/qqmljsparser.cpp b/src/qml/parser/qqmljsparser.cpp index e176c6e3cf..718ff4d09a 100644 --- a/src/qml/parser/qqmljsparser.cpp +++ b/src/qml/parser/qqmljsparser.cpp @@ -92,7 +92,6 @@ Parser::Parser(Engine *engine): location_stack(0), string_stack(0), program(0), - yylval(0), first_token(0), last_token(0) { @@ -673,55 +672,71 @@ case 77: { } case 78: { + AST::UiEnumMemberList *node = new (pool) AST::UiEnumMemberList(stringRef(1), sym(3).dval); + node->memberToken = loc(1); + node->valueToken = loc(3); + sym(1).Node = node; + break; +} + +case 79: { AST::UiEnumMemberList *node = new (pool) AST::UiEnumMemberList(sym(1).UiEnumMemberList, stringRef(3)); node->memberToken = loc(3); sym(1).Node = node; break; } -case 86: { +case 80: { + AST::UiEnumMemberList *node = new (pool) AST::UiEnumMemberList(sym(1).UiEnumMemberList, stringRef(3), sym(5).dval); + node->memberToken = loc(3); + node->valueToken = loc(5); + sym(1).Node = node; + break; +} + +case 88: { AST::ThisExpression *node = new (pool) AST::ThisExpression(); node->thisToken = loc(1); sym(1).Node = node; } break; -case 87: { +case 89: { AST::IdentifierExpression *node = new (pool) AST::IdentifierExpression(stringRef(1)); node->identifierToken = loc(1); sym(1).Node = node; } break; -case 88: { +case 90: { AST::NullExpression *node = new (pool) AST::NullExpression(); node->nullToken = loc(1); sym(1).Node = node; } break; -case 89: { +case 91: { AST::TrueLiteral *node = new (pool) AST::TrueLiteral(); node->trueToken = loc(1); sym(1).Node = node; } break; -case 90: { +case 92: { AST::FalseLiteral *node = new (pool) AST::FalseLiteral(); node->falseToken = loc(1); sym(1).Node = node; } break; -case 91: { +case 93: { AST::NumericLiteral *node = new (pool) AST::NumericLiteral(sym(1).dval); node->literalToken = loc(1); sym(1).Node = node; } break; -case 92: -case 93: { +case 94: +case 95: { AST::StringLiteral *node = new (pool) AST::StringLiteral(stringRef(1)); node->literalToken = loc(1); sym(1).Node = node; } break; -case 94: { +case 96: { bool rx = lexer->scanRegExp(Lexer::NoPrefix); if (!rx) { diagnostic_messages.append(DiagnosticMessage(DiagnosticMessage::Error, location(lexer), lexer->errorMessage())); @@ -737,7 +752,7 @@ case 94: { sym(1).Node = node; } break; -case 95: { +case 97: { bool rx = lexer->scanRegExp(Lexer::EqualPrefix); if (!rx) { diagnostic_messages.append(DiagnosticMessage(DiagnosticMessage::Error, location(lexer), lexer->errorMessage())); @@ -753,28 +768,28 @@ case 95: { sym(1).Node = node; } break; -case 96: { +case 98: { AST::ArrayLiteral *node = new (pool) AST::ArrayLiteral((AST::Elision *) 0); node->lbracketToken = loc(1); node->rbracketToken = loc(2); sym(1).Node = node; } break; -case 97: { +case 99: { 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 98: { +case 100: { 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 99: { +case 101: { AST::ArrayLiteral *node = new (pool) AST::ArrayLiteral(sym(2).ElementList->finish (), (AST::Elision *) 0); node->lbracketToken = loc(1); @@ -783,7 +798,7 @@ case 99: { sym(1).Node = node; } break; -case 100: { +case 102: { AST::ArrayLiteral *node = new (pool) AST::ArrayLiteral(sym(2).ElementList->finish (), sym(4).Elision->finish()); node->lbracketToken = loc(1); @@ -792,7 +807,7 @@ case 100: { sym(1).Node = node; } break; -case 101: { +case 103: { AST::ObjectLiteral *node = 0; if (sym(2).Node) node = new (pool) AST::ObjectLiteral( @@ -804,7 +819,7 @@ case 101: { sym(1).Node = node; } break; -case 102: { +case 104: { AST::ObjectLiteral *node = new (pool) AST::ObjectLiteral( sym(2).PropertyAssignmentList->finish ()); node->lbraceToken = loc(1); @@ -812,14 +827,14 @@ case 102: { sym(1).Node = node; } break; -case 103: { +case 105: { AST::NestedExpression *node = new (pool) AST::NestedExpression(sym(2).Expression); node->lparenToken = loc(1); node->rparenToken = loc(3); sym(1).Node = node; } break; -case 104: { +case 106: { if (AST::ArrayMemberExpression *mem = AST::cast<AST::ArrayMemberExpression *>(sym(1).Expression)) { diagnostic_messages.append(DiagnosticMessage(DiagnosticMessage::Warning, mem->lbracketToken, QLatin1String("Ignored annotation"))); @@ -839,48 +854,48 @@ case 104: { } } break; -case 105: { +case 107: { sym(1).Node = new (pool) AST::ElementList((AST::Elision *) 0, sym(1).Expression); } break; -case 106: { +case 108: { sym(1).Node = new (pool) AST::ElementList(sym(1).Elision->finish(), sym(2).Expression); } break; -case 107: { +case 109: { 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 108: { +case 110: { 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 109: { +case 111: { AST::Elision *node = new (pool) AST::Elision(); node->commaToken = loc(1); sym(1).Node = node; } break; -case 110: { +case 112: { AST::Elision *node = new (pool) AST::Elision(sym(1).Elision); node->commaToken = loc(2); sym(1).Node = node; } break; -case 111: { +case 113: { AST::PropertyNameAndValue *node = new (pool) AST::PropertyNameAndValue( sym(1).PropertyName, sym(3).Expression); node->colonToken = loc(2); sym(1).Node = node; } break; -case 112: { +case 114: { AST::PropertyGetterSetter *node = new (pool) AST::PropertyGetterSetter( sym(2).PropertyName, sym(6).FunctionBody); node->getSetToken = loc(1); @@ -891,7 +906,7 @@ case 112: { sym(1).Node = node; } break; -case 113: { +case 115: { AST::PropertyGetterSetter *node = new (pool) AST::PropertyGetterSetter( sym(2).PropertyName, sym(4).FormalParameterList, sym(7).FunctionBody); node->getSetToken = loc(1); @@ -902,56 +917,56 @@ case 113: { sym(1).Node = node; } break; -case 114: { +case 116: { sym(1).Node = new (pool) AST::PropertyAssignmentList(sym(1).PropertyAssignment); } break; -case 115: { +case 117: { AST::PropertyAssignmentList *node = new (pool) AST::PropertyAssignmentList( sym(1).PropertyAssignmentList, sym(3).PropertyAssignment); node->commaToken = loc(2); sym(1).Node = node; } break; -case 116: { +case 118: { AST::IdentifierPropertyName *node = new (pool) AST::IdentifierPropertyName(stringRef(1)); node->propertyNameToken = loc(1); sym(1).Node = node; } break; -case 117: { +case 119: { AST::StringLiteralPropertyName *node = new (pool) AST::StringLiteralPropertyName(stringRef(1)); node->propertyNameToken = loc(1); sym(1).Node = node; } break; -case 118: { +case 120: { AST::NumericLiteralPropertyName *node = new (pool) AST::NumericLiteralPropertyName(sym(1).dval); node->propertyNameToken = loc(1); sym(1).Node = node; } break; -case 119: { +case 121: { AST::IdentifierPropertyName *node = new (pool) AST::IdentifierPropertyName(stringRef(1)); node->propertyNameToken = loc(1); sym(1).Node = node; } break; -case 157: { +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 158: { +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 159: { +case 161: { AST::NewMemberExpression *node = new (pool) AST::NewMemberExpression(sym(2).Expression, sym(4).ArgumentList); node->newToken = loc(1); node->lparenToken = loc(3); @@ -959,316 +974,309 @@ case 159: { sym(1).Node = node; } break; -case 161: { +case 163: { AST::NewExpression *node = new (pool) AST::NewExpression(sym(2).Expression); node->newToken = loc(1); sym(1).Node = node; } break; -case 162: { +case 164: { 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 163: { +case 165: { 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 164: { +case 166: { 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 165: { +case 167: { 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 166: { +case 168: { sym(1).Node = 0; } break; -case 167: { +case 169: { sym(1).Node = sym(1).ArgumentList->finish(); } break; -case 168: { +case 170: { sym(1).Node = new (pool) AST::ArgumentList(sym(1).Expression); } break; -case 169: { +case 171: { AST::ArgumentList *node = new (pool) AST::ArgumentList(sym(1).ArgumentList, sym(3).Expression); node->commaToken = loc(2); sym(1).Node = node; } break; -case 173: { +case 175: { AST::PostIncrementExpression *node = new (pool) AST::PostIncrementExpression(sym(1).Expression); node->incrementToken = loc(2); sym(1).Node = node; } break; -case 174: { +case 176: { AST::PostDecrementExpression *node = new (pool) AST::PostDecrementExpression(sym(1).Expression); node->decrementToken = loc(2); sym(1).Node = node; } break; -case 176: { +case 178: { AST::DeleteExpression *node = new (pool) AST::DeleteExpression(sym(2).Expression); node->deleteToken = loc(1); sym(1).Node = node; } break; -case 177: { +case 179: { AST::VoidExpression *node = new (pool) AST::VoidExpression(sym(2).Expression); node->voidToken = loc(1); sym(1).Node = node; } break; -case 178: { +case 180: { AST::TypeOfExpression *node = new (pool) AST::TypeOfExpression(sym(2).Expression); node->typeofToken = loc(1); sym(1).Node = node; } break; -case 179: { +case 181: { AST::PreIncrementExpression *node = new (pool) AST::PreIncrementExpression(sym(2).Expression); node->incrementToken = loc(1); sym(1).Node = node; } break; -case 180: { +case 182: { AST::PreDecrementExpression *node = new (pool) AST::PreDecrementExpression(sym(2).Expression); node->decrementToken = loc(1); sym(1).Node = node; } break; -case 181: { +case 183: { AST::UnaryPlusExpression *node = new (pool) AST::UnaryPlusExpression(sym(2).Expression); node->plusToken = loc(1); sym(1).Node = node; } break; -case 182: { +case 184: { AST::UnaryMinusExpression *node = new (pool) AST::UnaryMinusExpression(sym(2).Expression); node->minusToken = loc(1); sym(1).Node = node; } break; -case 183: { +case 185: { AST::TildeExpression *node = new (pool) AST::TildeExpression(sym(2).Expression); node->tildeToken = loc(1); sym(1).Node = node; } break; -case 184: { +case 186: { AST::NotExpression *node = new (pool) AST::NotExpression(sym(2).Expression); node->notToken = loc(1); sym(1).Node = node; } break; -case 186: { +case 188: { 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 187: { +case 189: { 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 188: { +case 190: { 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 190: { +case 192: { 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 191: { +case 193: { 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 193: { +case 195: { 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 194: { +case 196: { 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 195: { +case 197: { 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 197: { +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 198: { +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 199: { +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 200: { +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 201: { +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 202: { +case 204: { 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 204: { +case 206: { 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 205: { +case 207: { 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 206: { +case 208: { 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 207: { +case 209: { 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 208: { +case 210: { 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 210: { +case 212: { 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 211: { +case 213: { 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 212: { +case 214: { 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 213: { +case 215: { 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 215: { +case 217: { 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 216: { +case 218: { 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 217: { +case 219: { 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 218: { - 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 220: { AST::BinaryExpression *node = new (pool) AST::BinaryExpression(sym(1).Expression, - QSOperator::BitAnd, sym(3).Expression); + QSOperator::StrictNotEqual, sym(3).Expression); node->operatorToken = loc(2); sym(1).Node = node; } break; @@ -1282,7 +1290,7 @@ case 222: { case 224: { AST::BinaryExpression *node = new (pool) AST::BinaryExpression(sym(1).Expression, - QSOperator::BitXor, sym(3).Expression); + QSOperator::BitAnd, sym(3).Expression); node->operatorToken = loc(2); sym(1).Node = node; } break; @@ -1296,7 +1304,7 @@ case 226: { case 228: { AST::BinaryExpression *node = new (pool) AST::BinaryExpression(sym(1).Expression, - QSOperator::BitOr, sym(3).Expression); + QSOperator::BitXor, sym(3).Expression); node->operatorToken = loc(2); sym(1).Node = node; } break; @@ -1310,7 +1318,7 @@ case 230: { case 232: { AST::BinaryExpression *node = new (pool) AST::BinaryExpression(sym(1).Expression, - QSOperator::And, sym(3).Expression); + QSOperator::BitOr, sym(3).Expression); node->operatorToken = loc(2); sym(1).Node = node; } break; @@ -1324,7 +1332,7 @@ case 234: { case 236: { AST::BinaryExpression *node = new (pool) AST::BinaryExpression(sym(1).Expression, - QSOperator::Or, sym(3).Expression); + QSOperator::And, sym(3).Expression); node->operatorToken = loc(2); sym(1).Node = node; } break; @@ -1337,6 +1345,13 @@ case 238: { } break; case 240: { + 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 242: { AST::ConditionalExpression *node = new (pool) AST::ConditionalExpression(sym(1).Expression, sym(3).Expression, sym(5).Expression); node->questionToken = loc(2); @@ -1344,7 +1359,7 @@ case 240: { sym(1).Node = node; } break; -case 242: { +case 244: { AST::ConditionalExpression *node = new (pool) AST::ConditionalExpression(sym(1).Expression, sym(3).Expression, sym(5).Expression); node->questionToken = loc(2); @@ -1352,112 +1367,112 @@ case 242: { sym(1).Node = node; } break; -case 244: { +case 246: { 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 246: { +case 248: { 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 247: { +case 249: { sym(1).ival = QSOperator::Assign; } break; -case 248: { +case 250: { sym(1).ival = QSOperator::InplaceMul; } break; -case 249: { +case 251: { sym(1).ival = QSOperator::InplaceDiv; } break; -case 250: { +case 252: { sym(1).ival = QSOperator::InplaceMod; } break; -case 251: { +case 253: { sym(1).ival = QSOperator::InplaceAdd; } break; -case 252: { +case 254: { sym(1).ival = QSOperator::InplaceSub; } break; -case 253: { +case 255: { sym(1).ival = QSOperator::InplaceLeftShift; } break; -case 254: { +case 256: { sym(1).ival = QSOperator::InplaceRightShift; } break; -case 255: { +case 257: { sym(1).ival = QSOperator::InplaceURightShift; } break; -case 256: { +case 258: { sym(1).ival = QSOperator::InplaceAnd; } break; -case 257: { +case 259: { sym(1).ival = QSOperator::InplaceXor; } break; -case 258: { +case 260: { sym(1).ival = QSOperator::InplaceOr; } break; -case 260: { +case 262: { AST::Expression *node = new (pool) AST::Expression(sym(1).Expression, sym(3).Expression); node->commaToken = loc(2); sym(1).Node = node; } break; -case 261: { +case 263: { sym(1).Node = 0; } break; -case 264: { +case 266: { AST::Expression *node = new (pool) AST::Expression(sym(1).Expression, sym(3).Expression); node->commaToken = loc(2); sym(1).Node = node; } break; -case 265: { +case 267: { sym(1).Node = 0; } break; -case 282: { +case 284: { AST::Block *node = new (pool) AST::Block(sym(2).StatementList); node->lbraceToken = loc(1); node->rbraceToken = loc(3); sym(1).Node = node; } break; -case 283: { +case 285: { sym(1).Node = new (pool) AST::StatementList(sym(1).Statement); } break; -case 284: { +case 286: { sym(1).Node = new (pool) AST::StatementList(sym(1).StatementList, sym(2).Statement); } break; -case 285: { +case 287: { sym(1).Node = 0; } break; -case 286: { +case 288: { sym(1).Node = sym(1).StatementList->finish (); } break; -case 288: { +case 290: { AST::VariableDeclaration::VariableScope s = AST::VariableDeclaration::FunctionScope; if (sym(1).ival == T_LET) s = AST::VariableDeclaration::BlockScope; @@ -1470,82 +1485,82 @@ case 288: { sym(1).Node = node; } break; -case 289: { +case 291: { sym(1).ival = T_LET; } break; -case 290: { +case 292: { sym(1).ival = T_CONST; } break; -case 291: { +case 293: { sym(1).ival = T_VAR; } break; -case 292: { +case 294: { sym(1).Node = new (pool) AST::VariableDeclarationList(sym(1).VariableDeclaration); } break; -case 293: { +case 295: { AST::VariableDeclarationList *node = new (pool) AST::VariableDeclarationList( sym(1).VariableDeclarationList, sym(3).VariableDeclaration); node->commaToken = loc(2); sym(1).Node = node; } break; -case 294: { +case 296: { sym(1).Node = new (pool) AST::VariableDeclarationList(sym(1).VariableDeclaration); } break; -case 295: { +case 297: { sym(1).Node = new (pool) AST::VariableDeclarationList(sym(1).VariableDeclarationList, sym(3).VariableDeclaration); } break; -case 296: { +case 298: { AST::VariableDeclaration::VariableScope s = AST::VariableDeclaration::FunctionScope; AST::VariableDeclaration *node = new (pool) AST::VariableDeclaration(stringRef(1), sym(2).Expression, s); node->identifierToken = loc(1); sym(1).Node = node; } break; -case 297: { +case 299: { AST::VariableDeclaration::VariableScope s = AST::VariableDeclaration::FunctionScope; AST::VariableDeclaration *node = new (pool) AST::VariableDeclaration(stringRef(1), sym(2).Expression, s); node->identifierToken = loc(1); sym(1).Node = node; } break; -case 298: { +case 300: { // ### TODO: AST for initializer sym(1) = sym(2); } break; -case 299: { +case 301: { sym(1).Node = 0; } break; -case 301: { +case 303: { // ### TODO: AST for initializer sym(1) = sym(2); } break; -case 302: { +case 304: { sym(1).Node = 0; } break; -case 304: { +case 306: { AST::EmptyStatement *node = new (pool) AST::EmptyStatement(); node->semicolonToken = loc(1); sym(1).Node = node; } break; -case 306: { +case 308: { AST::ExpressionStatement *node = new (pool) AST::ExpressionStatement(sym(1).Expression); node->semicolonToken = loc(2); sym(1).Node = node; } break; -case 307: { +case 309: { AST::IfStatement *node = new (pool) AST::IfStatement(sym(3).Expression, sym(5).Statement, sym(7).Statement); node->ifToken = loc(1); node->lparenToken = loc(2); @@ -1554,7 +1569,7 @@ case 307: { sym(1).Node = node; } break; -case 308: { +case 310: { AST::IfStatement *node = new (pool) AST::IfStatement(sym(3).Expression, sym(5).Statement); node->ifToken = loc(1); node->lparenToken = loc(2); @@ -1562,7 +1577,7 @@ case 308: { sym(1).Node = node; } break; -case 311: { +case 313: { AST::DoWhileStatement *node = new (pool) AST::DoWhileStatement(sym(2).Statement, sym(5).Expression); node->doToken = loc(1); node->whileToken = loc(3); @@ -1572,7 +1587,7 @@ case 311: { sym(1).Node = node; } break; -case 312: { +case 314: { AST::WhileStatement *node = new (pool) AST::WhileStatement(sym(3).Expression, sym(5).Statement); node->whileToken = loc(1); node->lparenToken = loc(2); @@ -1580,7 +1595,7 @@ case 312: { sym(1).Node = node; } break; -case 313: { +case 315: { AST::ForStatement *node = new (pool) AST::ForStatement(sym(3).Expression, sym(5).Expression, sym(7).Expression, sym(9).Statement); node->forToken = loc(1); @@ -1591,7 +1606,7 @@ case 313: { sym(1).Node = node; } break; -case 314: { +case 316: { AST::VariableDeclaration::VariableScope s = AST::VariableDeclaration::FunctionScope; AST::LocalForStatement *node = new (pool) AST::LocalForStatement( sym(4).VariableDeclarationList->finish(s), sym(6).Expression, @@ -1605,7 +1620,7 @@ case 314: { sym(1).Node = node; } break; -case 315: { +case 317: { AST:: ForEachStatement *node = new (pool) AST::ForEachStatement(sym(3).Expression, sym(5).Expression, sym(7).Statement); node->forToken = loc(1); @@ -1615,7 +1630,7 @@ case 315: { sym(1).Node = node; } break; -case 316: { +case 318: { AST::LocalForEachStatement *node = new (pool) AST::LocalForEachStatement( sym(4).VariableDeclaration, sym(6).Expression, sym(8).Statement); node->forToken = loc(1); @@ -1626,14 +1641,14 @@ case 316: { sym(1).Node = node; } break; -case 318: { +case 320: { AST::ContinueStatement *node = new (pool) AST::ContinueStatement(); node->continueToken = loc(1); node->semicolonToken = loc(2); sym(1).Node = node; } break; -case 320: { +case 322: { AST::ContinueStatement *node = new (pool) AST::ContinueStatement(stringRef(2)); node->continueToken = loc(1); node->identifierToken = loc(2); @@ -1641,14 +1656,14 @@ case 320: { sym(1).Node = node; } break; -case 322: { +case 324: { AST::BreakStatement *node = new (pool) AST::BreakStatement(QStringRef()); node->breakToken = loc(1); node->semicolonToken = loc(2); sym(1).Node = node; } break; -case 324: { +case 326: { AST::BreakStatement *node = new (pool) AST::BreakStatement(stringRef(2)); node->breakToken = loc(1); node->identifierToken = loc(2); @@ -1656,14 +1671,14 @@ case 324: { sym(1).Node = node; } break; -case 326: { +case 328: { AST::ReturnStatement *node = new (pool) AST::ReturnStatement(sym(2).Expression); node->returnToken = loc(1); node->semicolonToken = loc(3); sym(1).Node = node; } break; -case 327: { +case 329: { AST::WithStatement *node = new (pool) AST::WithStatement(sym(3).Expression, sym(5).Statement); node->withToken = loc(1); node->lparenToken = loc(2); @@ -1671,7 +1686,7 @@ case 327: { sym(1).Node = node; } break; -case 328: { +case 330: { AST::SwitchStatement *node = new (pool) AST::SwitchStatement(sym(3).Expression, sym(5).CaseBlock); node->switchToken = loc(1); node->lparenToken = loc(2); @@ -1679,83 +1694,83 @@ case 328: { sym(1).Node = node; } break; -case 329: { +case 331: { AST::CaseBlock *node = new (pool) AST::CaseBlock(sym(2).CaseClauses); node->lbraceToken = loc(1); node->rbraceToken = loc(3); sym(1).Node = node; } break; -case 330: { +case 332: { 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 331: { +case 333: { sym(1).Node = new (pool) AST::CaseClauses(sym(1).CaseClause); } break; -case 332: { +case 334: { sym(1).Node = new (pool) AST::CaseClauses(sym(1).CaseClauses, sym(2).CaseClause); } break; -case 333: { +case 335: { sym(1).Node = 0; } break; -case 334: { +case 336: { sym(1).Node = sym(1).CaseClauses->finish (); } break; -case 335: { +case 337: { 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 336: { +case 338: { AST::DefaultClause *node = new (pool) AST::DefaultClause(sym(3).StatementList); node->defaultToken = loc(1); node->colonToken = loc(2); sym(1).Node = node; } break; -case 337: { +case 339: { 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 339: { +case 341: { AST::ThrowStatement *node = new (pool) AST::ThrowStatement(sym(2).Expression); node->throwToken = loc(1); node->semicolonToken = loc(3); sym(1).Node = node; } break; -case 340: { +case 342: { AST::TryStatement *node = new (pool) AST::TryStatement(sym(2).Statement, sym(3).Catch); node->tryToken = loc(1); sym(1).Node = node; } break; -case 341: { +case 343: { AST::TryStatement *node = new (pool) AST::TryStatement(sym(2).Statement, sym(3).Finally); node->tryToken = loc(1); sym(1).Node = node; } break; -case 342: { +case 344: { 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 343: { +case 345: { AST::Catch *node = new (pool) AST::Catch(stringRef(3), sym(5).Block); node->catchToken = loc(1); node->lparenToken = loc(2); @@ -1764,20 +1779,20 @@ case 343: { sym(1).Node = node; } break; -case 344: { +case 346: { AST::Finally *node = new (pool) AST::Finally(sym(2).Block); node->finallyToken = loc(1); sym(1).Node = node; } break; -case 346: { +case 348: { AST::DebuggerStatement *node = new (pool) AST::DebuggerStatement(); node->debuggerToken = loc(1); node->semicolonToken = loc(2); sym(1).Node = node; } break; -case 348: { +case 350: { AST::FunctionDeclaration *node = new (pool) AST::FunctionDeclaration(stringRef(2), sym(4).FormalParameterList, sym(7).FunctionBody); node->functionToken = loc(1); node->identifierToken = loc(2); @@ -1788,7 +1803,7 @@ case 348: { sym(1).Node = node; } break; -case 349: { +case 351: { AST::FunctionExpression *node = new (pool) AST::FunctionExpression(stringRef(2), sym(4).FormalParameterList, sym(7).FunctionBody); node->functionToken = loc(1); if (! stringRef(2).isNull()) @@ -1800,7 +1815,7 @@ case 349: { sym(1).Node = node; } break; -case 350: { +case 352: { AST::FunctionExpression *node = new (pool) AST::FunctionExpression(QStringRef(), sym(3).FormalParameterList, sym(6).FunctionBody); node->functionToken = loc(1); node->lparenToken = loc(2); @@ -1810,56 +1825,56 @@ case 350: { sym(1).Node = node; } break; -case 351: { +case 353: { AST::FormalParameterList *node = new (pool) AST::FormalParameterList(stringRef(1)); node->identifierToken = loc(1); sym(1).Node = node; } break; -case 352: { +case 354: { 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 353: { +case 355: { sym(1).Node = 0; } break; -case 354: { +case 356: { sym(1).Node = sym(1).FormalParameterList->finish (); } break; -case 355: { +case 357: { sym(1).Node = 0; } break; -case 357: { +case 359: { sym(1).Node = new (pool) AST::FunctionBody(sym(1).SourceElements->finish ()); } break; -case 359: { +case 361: { sym(1).Node = new (pool) AST::Program(sym(1).SourceElements->finish ()); } break; -case 360: { +case 362: { sym(1).Node = new (pool) AST::SourceElements(sym(1).SourceElement); } break; -case 361: { +case 363: { sym(1).Node = new (pool) AST::SourceElements(sym(1).SourceElements, sym(2).SourceElement); } break; -case 362: { +case 364: { sym(1).Node = new (pool) AST::StatementSourceElement(sym(1).Statement); } break; -case 363: { +case 365: { sym(1).Node = new (pool) AST::FunctionSourceElement(sym(1).FunctionDeclaration); } break; -case 364: { +case 366: { sym(1).Node = 0; } break; diff --git a/src/qml/parser/qqmljsparser_p.h b/src/qml/parser/qqmljsparser_p.h index 6273ed48b3..9dfee70f3a 100644 --- a/src/qml/parser/qqmljsparser_p.h +++ b/src/qml/parser/qqmljsparser_p.h @@ -247,9 +247,9 @@ protected: -#define J_SCRIPT_REGEXPLITERAL_RULE1 94 +#define J_SCRIPT_REGEXPLITERAL_RULE1 96 -#define J_SCRIPT_REGEXPLITERAL_RULE2 95 +#define J_SCRIPT_REGEXPLITERAL_RULE2 97 QT_QML_END_NAMESPACE diff --git a/tests/auto/qml/qmlmin/tst_qmlmin.cpp b/tests/auto/qml/qmlmin/tst_qmlmin.cpp index 171c2bda8a..5941385c80 100644 --- a/tests/auto/qml/qmlmin/tst_qmlmin.cpp +++ b/tests/auto/qml/qmlmin/tst_qmlmin.cpp @@ -98,6 +98,8 @@ void tst_qmlmin::initTestCase() invalidFiles << "tests/auto/qml/qqmllanguage/data/insertedSemicolon.1.qml"; invalidFiles << "tests/auto/qml/qqmllanguage/data/nonexistantProperty.5.qml"; invalidFiles << "tests/auto/qml/qqmllanguage/data/invalidRoot.1.qml"; + invalidFiles << "tests/auto/qml/qqmllanguage/data/invalidQmlEnumValue.1.qml"; + invalidFiles << "tests/auto/qml/qqmllanguage/data/invalidQmlEnumValue.2.qml"; invalidFiles << "tests/auto/qml/qquickfolderlistmodel/data/dummy.qml"; invalidFiles << "tests/auto/qml/qqmlecmascript/data/qtbug_22843.js"; invalidFiles << "tests/auto/qml/qqmlecmascript/data/qtbug_22843.library.js"; diff --git a/tests/auto/qml/qqmllanguage/data/TypeWithEnum.qml b/tests/auto/qml/qqmllanguage/data/TypeWithEnum.qml index c89a228bef..c6788f787a 100644 --- a/tests/auto/qml/qqmllanguage/data/TypeWithEnum.qml +++ b/tests/auto/qml/qqmllanguage/data/TypeWithEnum.qml @@ -7,8 +7,22 @@ QtObject { EnumValue3 } + enum MyOtherEnum { + OtherEnumValue1 = 24, + OtherEnumValue2, + OtherEnumValue3 = 24, + OtherEnumValue4, + OtherEnumValue5 = 1 + } + property int enumValue: TypeWithEnum.EnumValue2 property int enumValue2 property int scopedEnumValue: TypeWithEnum.MyEnum.EnumValue2 Component.onCompleted: enumValue2 = TypeWithEnum.EnumValue3 + + property int otherEnumValue1: TypeWithEnum.OtherEnumValue1 + property int otherEnumValue2: TypeWithEnum.OtherEnumValue2 + property int otherEnumValue3: TypeWithEnum.OtherEnumValue3 + property int otherEnumValue4: TypeWithEnum.OtherEnumValue4 + property int otherEnumValue5: TypeWithEnum.OtherEnumValue5 } diff --git a/tests/auto/qml/qqmllanguage/data/invalidQmlEnumValue.1.errors.txt b/tests/auto/qml/qqmllanguage/data/invalidQmlEnumValue.1.errors.txt new file mode 100644 index 0000000000..a96fe376aa --- /dev/null +++ b/tests/auto/qml/qqmllanguage/data/invalidQmlEnumValue.1.errors.txt @@ -0,0 +1 @@ +6:22:Expected token `numeric literal' diff --git a/tests/auto/qml/qqmllanguage/data/invalidQmlEnumValue.1.qml b/tests/auto/qml/qqmllanguage/data/invalidQmlEnumValue.1.qml new file mode 100644 index 0000000000..fef23ecbef --- /dev/null +++ b/tests/auto/qml/qqmllanguage/data/invalidQmlEnumValue.1.qml @@ -0,0 +1,9 @@ +import QtQuick 2.0 + +QtObject { + enum MyEnum { + EnumValue1, + EnumValue2 = "hello", + EnumValue3 + } +} diff --git a/tests/auto/qml/qqmllanguage/data/invalidQmlEnumValue.2.errors.txt b/tests/auto/qml/qqmllanguage/data/invalidQmlEnumValue.2.errors.txt new file mode 100644 index 0000000000..a96fe376aa --- /dev/null +++ b/tests/auto/qml/qqmllanguage/data/invalidQmlEnumValue.2.errors.txt @@ -0,0 +1 @@ +6:22:Expected token `numeric literal' diff --git a/tests/auto/qml/qqmllanguage/data/invalidQmlEnumValue.2.qml b/tests/auto/qml/qqmllanguage/data/invalidQmlEnumValue.2.qml new file mode 100644 index 0000000000..9892fcd19c --- /dev/null +++ b/tests/auto/qml/qqmllanguage/data/invalidQmlEnumValue.2.qml @@ -0,0 +1,9 @@ +import QtQuick 2.0 + +QtObject { + enum MyEnum { + EnumValue1, + EnumValue2 = hello, + EnumValue3 + } +} diff --git a/tests/auto/qml/qqmllanguage/data/invalidQmlEnumValue.3.errors.txt b/tests/auto/qml/qqmllanguage/data/invalidQmlEnumValue.3.errors.txt new file mode 100644 index 0000000000..43465c60ec --- /dev/null +++ b/tests/auto/qml/qqmllanguage/data/invalidQmlEnumValue.3.errors.txt @@ -0,0 +1 @@ +7:22:Enum value out of range diff --git a/tests/auto/qml/qqmllanguage/data/invalidQmlEnumValue.3.qml b/tests/auto/qml/qqmllanguage/data/invalidQmlEnumValue.3.qml new file mode 100644 index 0000000000..654bc0e626 --- /dev/null +++ b/tests/auto/qml/qqmllanguage/data/invalidQmlEnumValue.3.qml @@ -0,0 +1,9 @@ +import QtQuick 2.0 + +QtObject { + enum MyEnum { + EnumValue1, + EnumValue2, + EnumValue3 = 2147483648 + } +} diff --git a/tests/auto/qml/qqmllanguage/data/invalidQmlEnumValue.4.errors.txt b/tests/auto/qml/qqmllanguage/data/invalidQmlEnumValue.4.errors.txt new file mode 100644 index 0000000000..12756dc593 --- /dev/null +++ b/tests/auto/qml/qqmllanguage/data/invalidQmlEnumValue.4.errors.txt @@ -0,0 +1 @@ +7:22:Enum value must be an integer diff --git a/tests/auto/qml/qqmllanguage/data/invalidQmlEnumValue.4.qml b/tests/auto/qml/qqmllanguage/data/invalidQmlEnumValue.4.qml new file mode 100644 index 0000000000..4a0aafba5e --- /dev/null +++ b/tests/auto/qml/qqmllanguage/data/invalidQmlEnumValue.4.qml @@ -0,0 +1,9 @@ +import QtQuick 2.0 + +QtObject { + enum MyEnum { + EnumValue1, + EnumValue2, + EnumValue3 = 17.5 + } +} diff --git a/tests/auto/qml/qqmllanguage/tst_qqmllanguage.cpp b/tests/auto/qml/qqmllanguage/tst_qqmllanguage.cpp index c145c6d737..f09c130e38 100644 --- a/tests/auto/qml/qqmllanguage/tst_qqmllanguage.cpp +++ b/tests/auto/qml/qqmllanguage/tst_qqmllanguage.cpp @@ -549,6 +549,10 @@ void tst_qqmllanguage::errors_data() QTest::newRow("scopedEnumList") << "scopedEnumList.qml" << "scopedEnumList.errors.txt" << false; QTest::newRow("lowercase enum value") << "lowercaseQmlEnum.1.qml" << "lowercaseQmlEnum.1.errors.txt" << false; QTest::newRow("lowercase enum type") << "lowercaseQmlEnum.2.qml" << "lowercaseQmlEnum.2.errors.txt" << false; + QTest::newRow("string enum value") << "invalidQmlEnumValue.1.qml" << "invalidQmlEnumValue.1.errors.txt" << false; + QTest::newRow("identifier enum type") << "invalidQmlEnumValue.2.qml" << "invalidQmlEnumValue.2.errors.txt" << false; + QTest::newRow("enum value too large") << "invalidQmlEnumValue.3.qml" << "invalidQmlEnumValue.3.errors.txt" << false; + QTest::newRow("non-integer enum value") << "invalidQmlEnumValue.4.qml" << "invalidQmlEnumValue.4.errors.txt" << false; const QString expectedError = isCaseSensitiveFileSystem(dataDirectory()) ? QStringLiteral("incorrectCase.errors.sensitive.txt") : @@ -3730,6 +3734,12 @@ void tst_qqmllanguage::qmlEnums() QCOMPARE(o->property("enumValue").toInt(), 1); QCOMPARE(o->property("enumValue2").toInt(), 2); QCOMPARE(o->property("scopedEnumValue").toInt(), 1); + + QCOMPARE(o->property("otherEnumValue1").toInt(), 24); + QCOMPARE(o->property("otherEnumValue2").toInt(), 25); + QCOMPARE(o->property("otherEnumValue3").toInt(), 24); + QCOMPARE(o->property("otherEnumValue4").toInt(), 25); + QCOMPARE(o->property("otherEnumValue5").toInt(), 1); } { |