diff options
| author | mae <qt-info@nokia.com> | 2009-04-20 13:53:01 (GMT) |
|---|---|---|
| committer | Roberto Raggi <roberto.raggi@nokia.com> | 2009-04-24 07:52:36 (GMT) |
| commit | 73db0bebbf27f07faea3b8f71dccecd46cc4bbb7 (patch) | |
| tree | 3275484f460952759f7171056d1e41f6d7fa6f9d | |
| parent | 765166f9aca829391bc2f4ee60b6ea4b5f7ff683 (diff) | |
| download | Qt-73db0bebbf27f07faea3b8f71dccecd46cc4bbb7.zip Qt-73db0bebbf27f07faea3b8f71dccecd46cc4bbb7.tar.gz Qt-73db0bebbf27f07faea3b8f71dccecd46cc4bbb7.tar.bz2 | |
support public property definitions
| -rw-r--r-- | src/declarative/qml/parser/javascript.g | 16 | ||||
| -rw-r--r-- | src/declarative/qml/parser/javascriptgrammar.cpp | 1078 | ||||
| -rw-r--r-- | src/declarative/qml/parser/javascriptgrammar_p.h | 10 | ||||
| -rw-r--r-- | src/declarative/qml/parser/javascriptparser.cpp | 379 | ||||
| -rw-r--r-- | src/declarative/qml/parser/javascriptparser_p.h | 4 | ||||
| -rw-r--r-- | src/declarative/qml/qmlparser.cpp | 5 | ||||
| -rw-r--r-- | src/declarative/qml/qmlscriptparser.cpp | 123 |
7 files changed, 840 insertions, 775 deletions
diff --git a/src/declarative/qml/parser/javascript.g b/src/declarative/qml/parser/javascript.g index db6d898..c7b26e2 100644 --- a/src/declarative/qml/parser/javascript.g +++ b/src/declarative/qml/parser/javascript.g @@ -530,6 +530,16 @@ case $rule_number: { } break; ./ +UiObjectInitializer: T_LBRACE T_RBRACE ; +/. +case $rule_number: { + AST::UiObjectInitializer *node = makeAstNode<AST::UiObjectInitializer> (driver->nodePool(), (AST::UiObjectMemberList*)0); + node->lbraceToken = loc(1); + node->rbraceToken = loc(2); + sym(1).Node = node; +} break; +./ + UiObjectInitializer: T_LBRACE UiObjectMemberList T_RBRACE ; /. case $rule_number: { @@ -2223,7 +2233,7 @@ PropertyNameAndValueListOpt: PropertyNameAndValueList ; token_buffer[1].loc = yylloc = location(lexer); if (t_action(errorState, yytoken)) { - const QString msg = QString::fromUtf8("Removed token: `%1'").arg(spell[token_buffer[0].token]); + const QString msg = QString::fromUtf8("Removed token: `%1'").arg(QLatin1String(spell[token_buffer[0].token])); diagnostic_messages.append(DiagnosticMessage(DiagnosticMessage::Error, token_buffer[0].loc.startLine, token_buffer[0].loc.startColumn, msg)); @@ -2253,7 +2263,7 @@ PropertyNameAndValueListOpt: PropertyNameAndValueList ; for (int *tk = tokens; *tk != EOF_SYMBOL; ++tk) { int a = t_action(errorState, *tk); if (a > 0 && t_action(a, yytoken)) { - const QString msg = QString::fromUtf8("Inserted token: `%1'").arg(spell[*tk]); + const QString msg = QString::fromUtf8("Inserted token: `%1'").arg(QLatin1String(spell[*tk])); diagnostic_messages.append(DiagnosticMessage(DiagnosticMessage::Error, token_buffer[0].loc.startLine, token_buffer[0].loc.startColumn, msg)); @@ -2273,7 +2283,7 @@ PropertyNameAndValueListOpt: PropertyNameAndValueList ; for (int tk = 1; tk < TERMINAL_COUNT; ++tk) { int a = t_action(errorState, tk); if (a > 0 && t_action(a, yytoken)) { - const QString msg = QString::fromUtf8("Inserted token: `%1'").arg(spell[tk]); + const QString msg = QString::fromUtf8("Inserted token: `%1'").arg(QLatin1String(spell[tk])); diagnostic_messages.append(DiagnosticMessage(DiagnosticMessage::Error, token_buffer[0].loc.startLine, token_buffer[0].loc.startColumn, msg)); diff --git a/src/declarative/qml/parser/javascriptgrammar.cpp b/src/declarative/qml/parser/javascriptgrammar.cpp index 51ec48e..61d033c 100644 --- a/src/declarative/qml/parser/javascriptgrammar.cpp +++ b/src/declarative/qml/parser/javascriptgrammar.cpp @@ -14,479 +14,509 @@ const char *const JavaScriptGrammar::spell [] = { const int JavaScriptGrammar::lhs [] = { 88, 89, 89, 92, 92, 93, 93, 91, 90, 90, - 95, 94, 94, 94, 94, 94, 94, 94, 96, 96, - 99, 99, 99, 99, 99, 99, 99, 99, 99, 99, - 99, 99, 99, 99, 99, 101, 101, 105, 105, 100, - 100, 103, 103, 106, 106, 106, 106, 107, 107, 107, + 95, 95, 94, 94, 94, 94, 94, 94, 94, 96, + 96, 99, 99, 99, 99, 99, 99, 99, 99, 99, + 99, 99, 99, 99, 99, 99, 101, 101, 105, 105, + 100, 100, 103, 103, 106, 106, 106, 106, 107, 107, 107, 107, 107, 107, 107, 107, 107, 107, 107, 107, 107, 107, 107, 107, 107, 107, 107, 107, 107, 107, - 107, 107, 107, 107, 107, 107, 107, 107, 108, 108, - 109, 109, 109, 109, 109, 112, 112, 113, 113, 113, - 113, 111, 111, 114, 114, 115, 115, 116, 116, 116, - 117, 117, 117, 117, 117, 117, 117, 117, 117, 117, - 118, 118, 118, 118, 119, 119, 119, 120, 120, 120, - 120, 121, 121, 121, 121, 121, 121, 121, 122, 122, - 122, 122, 122, 122, 123, 123, 123, 123, 123, 124, - 124, 124, 124, 124, 125, 125, 126, 126, 127, 127, - 128, 128, 129, 129, 130, 130, 131, 131, 132, 132, - 133, 133, 134, 134, 135, 135, 136, 136, 104, 104, - 137, 137, 138, 138, 138, 138, 138, 138, 138, 138, - 138, 138, 138, 138, 98, 98, 139, 139, 140, 140, - 141, 141, 97, 97, 97, 97, 97, 97, 97, 97, - 97, 97, 97, 97, 97, 97, 97, 142, 158, 158, - 157, 157, 143, 143, 159, 159, 160, 160, 162, 162, - 161, 163, 166, 164, 164, 167, 165, 165, 144, 145, - 145, 146, 146, 147, 147, 147, 147, 147, 147, 147, - 148, 148, 148, 148, 149, 149, 149, 149, 150, 150, - 151, 153, 168, 168, 171, 171, 169, 169, 172, 170, - 152, 154, 154, 155, 155, 155, 173, 174, 156, 156, - 175, 110, 179, 179, 176, 176, 177, 177, 180, 181, - 181, 182, 182, 178, 178, 102, 102, 183}; + 107, 107, 107, 107, 107, 107, 107, 107, 107, 108, + 108, 109, 109, 109, 109, 109, 112, 112, 113, 113, + 113, 113, 111, 111, 114, 114, 115, 115, 116, 116, + 116, 117, 117, 117, 117, 117, 117, 117, 117, 117, + 117, 118, 118, 118, 118, 119, 119, 119, 120, 120, + 120, 120, 121, 121, 121, 121, 121, 121, 121, 122, + 122, 122, 122, 122, 122, 123, 123, 123, 123, 123, + 124, 124, 124, 124, 124, 125, 125, 126, 126, 127, + 127, 128, 128, 129, 129, 130, 130, 131, 131, 132, + 132, 133, 133, 134, 134, 135, 135, 136, 136, 104, + 104, 137, 137, 138, 138, 138, 138, 138, 138, 138, + 138, 138, 138, 138, 138, 98, 98, 139, 139, 140, + 140, 141, 141, 97, 97, 97, 97, 97, 97, 97, + 97, 97, 97, 97, 97, 97, 97, 97, 142, 158, + 158, 157, 157, 143, 143, 159, 159, 160, 160, 162, + 162, 161, 163, 166, 164, 164, 167, 165, 165, 144, + 145, 145, 146, 146, 147, 147, 147, 147, 147, 147, + 147, 148, 148, 148, 148, 149, 149, 149, 149, 150, + 150, 151, 153, 168, 168, 171, 171, 169, 169, 172, + 170, 152, 154, 154, 155, 155, 155, 173, 174, 156, + 156, 175, 110, 179, 179, 176, 176, 177, 177, 180, + 181, 181, 182, 182, 178, 178, 102, 102, 183}; const int JavaScriptGrammar:: rhs[] = { 2, 1, 1, 1, 2, 3, 3, 0, 1, 2, - 3, 4, 2, 5, 3, 6, 3, 5, 1, 3, - 1, 1, 1, 1, 1, 1, 1, 1, 1, 3, - 3, 5, 3, 4, 3, 2, 4, 1, 2, 0, - 1, 3, 5, 1, 1, 1, 1, 1, 1, 1, + 2, 3, 4, 2, 5, 3, 6, 3, 5, 1, + 3, 1, 1, 1, 1, 1, 1, 1, 1, 1, + 3, 3, 5, 3, 4, 3, 2, 4, 1, 2, + 0, 1, 3, 5, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, - 1, 1, 4, 3, 5, 1, 2, 4, 4, 4, - 3, 0, 1, 1, 3, 1, 1, 1, 2, 2, - 1, 2, 2, 2, 2, 2, 2, 2, 2, 2, - 1, 3, 3, 3, 1, 3, 3, 1, 3, 3, - 3, 1, 3, 3, 3, 3, 3, 3, 1, 3, - 3, 3, 3, 3, 1, 3, 3, 3, 3, 1, - 3, 3, 3, 3, 1, 3, 1, 3, 1, 3, - 1, 3, 1, 3, 1, 3, 1, 3, 1, 3, - 1, 3, 1, 3, 1, 5, 1, 5, 1, 3, - 1, 3, 1, 1, 1, 1, 1, 1, 1, 1, - 1, 1, 1, 1, 1, 3, 0, 1, 1, 3, - 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, - 1, 1, 1, 1, 1, 1, 1, 3, 1, 2, - 0, 1, 3, 3, 1, 1, 1, 3, 1, 3, - 2, 2, 2, 0, 1, 2, 0, 1, 1, 2, - 2, 7, 5, 7, 7, 5, 9, 10, 7, 8, - 2, 2, 3, 3, 2, 2, 3, 3, 3, 3, - 5, 5, 3, 5, 1, 2, 0, 1, 4, 3, - 3, 3, 3, 3, 3, 4, 5, 2, 2, 2, - 8, 8, 1, 3, 0, 1, 0, 1, 1, 1, - 2, 1, 1, 0, 1, 0, 1, 2}; + 1, 1, 1, 4, 3, 5, 1, 2, 4, 4, + 4, 3, 0, 1, 1, 3, 1, 1, 1, 2, + 2, 1, 2, 2, 2, 2, 2, 2, 2, 2, + 2, 1, 3, 3, 3, 1, 3, 3, 1, 3, + 3, 3, 1, 3, 3, 3, 3, 3, 3, 1, + 3, 3, 3, 3, 3, 1, 3, 3, 3, 3, + 1, 3, 3, 3, 3, 1, 3, 1, 3, 1, + 3, 1, 3, 1, 3, 1, 3, 1, 3, 1, + 3, 1, 3, 1, 3, 1, 5, 1, 5, 1, + 3, 1, 3, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 3, 0, 1, 1, + 3, 0, 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, 3, 1, + 2, 0, 1, 3, 3, 1, 1, 1, 3, 1, + 3, 2, 2, 2, 0, 1, 2, 0, 1, 1, + 2, 2, 7, 5, 7, 7, 5, 9, 10, 7, + 8, 2, 2, 3, 3, 2, 2, 3, 3, 3, + 3, 5, 5, 3, 5, 1, 2, 0, 1, 4, + 3, 3, 3, 3, 3, 3, 4, 5, 2, 2, + 2, 8, 8, 1, 3, 0, 1, 0, 1, 1, + 1, 2, 1, 1, 0, 1, 0, 1, 2}; const int JavaScriptGrammar::action_default [] = { - 8, 2, 0, 0, 4, 3, 0, 288, 0, 6, - 7, 5, 19, 0, 9, 1, 0, 0, 13, 0, - 11, 10, 0, 17, 0, 118, 185, 149, 157, 153, - 97, 169, 145, 18, 82, 98, 161, 165, 86, 115, - 96, 101, 81, 135, 122, 0, 28, 29, 25, 284, - 22, 286, 40, 0, 0, 0, 0, 0, 23, 26, - 0, 0, 27, 21, 0, 24, 0, 0, 111, 0, - 0, 98, 117, 100, 99, 0, 0, 0, 113, 114, - 112, 116, 0, 146, 0, 0, 0, 0, 136, 0, - 0, 0, 0, 0, 0, 126, 0, 0, 0, 120, - 121, 119, 124, 128, 127, 125, 123, 138, 137, 139, - 0, 154, 0, 150, 0, 0, 92, 91, 80, 48, - 49, 50, 75, 51, 76, 52, 53, 54, 55, 56, - 57, 58, 59, 79, 60, 61, 62, 63, 64, 77, - 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, - 78, 0, 0, 90, 186, 93, 0, 94, 0, 95, - 89, 16, 0, 182, 175, 173, 180, 181, 179, 178, - 184, 177, 176, 174, 183, 170, 0, 158, 0, 0, - 162, 0, 0, 166, 0, 0, 92, 84, 0, 83, - 0, 88, 102, 0, 285, 275, 276, 0, 273, 0, - 274, 0, 277, 193, 200, 199, 207, 195, 0, 196, - 278, 0, 283, 197, 198, 203, 201, 280, 279, 282, - 204, 0, 215, 0, 0, 0, 0, 284, 22, 0, - 286, 187, 229, 0, 0, 0, 216, 0, 0, 205, - 206, 0, 194, 202, 230, 231, 272, 281, 245, 0, - 246, 247, 248, 241, 0, 242, 243, 244, 269, 270, - 0, 0, 0, 0, 0, 234, 235, 191, 189, 151, - 159, 155, 171, 147, 192, 0, 98, 163, 167, 140, - 129, 0, 0, 148, 0, 0, 0, 0, 141, 0, - 0, 0, 0, 0, 133, 131, 134, 132, 130, 143, - 142, 144, 0, 156, 0, 152, 0, 190, 98, 0, - 172, 187, 188, 0, 187, 0, 0, 237, 0, 0, - 0, 239, 0, 160, 0, 0, 164, 0, 0, 168, - 227, 0, 219, 228, 222, 0, 226, 0, 187, 220, - 0, 187, 0, 0, 238, 0, 0, 0, 240, 285, - 275, 0, 0, 277, 0, 271, 0, 261, 0, 0, - 0, 233, 0, 232, 0, 287, 0, 47, 209, 212, - 0, 48, 75, 51, 76, 53, 54, 25, 58, 59, - 22, 60, 63, 23, 26, 187, 27, 66, 21, 68, - 24, 70, 71, 72, 73, 74, 78, 0, 42, 0, - 0, 44, 46, 34, 45, 0, 43, 33, 210, 208, - 86, 87, 92, 0, 85, 0, 249, 250, 0, 0, - 0, 252, 257, 255, 258, 0, 0, 256, 257, 0, - 253, 0, 254, 211, 260, 0, 211, 259, 0, 262, - 263, 0, 211, 264, 265, 0, 0, 266, 0, 0, - 0, 267, 268, 104, 103, 0, 0, 0, 236, 0, - 0, 0, 251, 224, 217, 0, 225, 221, 0, 223, - 213, 0, 214, 218, 0, 41, 0, 38, 40, 31, - 0, 37, 32, 39, 36, 30, 0, 35, 108, 106, - 110, 107, 105, 109, 0, 0, 15, 22, 40, 12, - 0, 14, 20}; + 8, 2, 0, 0, 4, 3, 0, 289, 0, 6, + 7, 5, 20, 0, 9, 1, 0, 0, 14, 11, + 0, 12, 10, 0, 18, 0, 119, 186, 150, 158, + 154, 98, 170, 146, 19, 83, 99, 162, 166, 87, + 116, 97, 102, 82, 136, 123, 0, 29, 30, 26, + 285, 23, 287, 41, 0, 0, 0, 0, 0, 24, + 27, 0, 0, 28, 22, 0, 25, 0, 0, 112, + 0, 0, 99, 118, 101, 100, 0, 0, 0, 114, + 115, 113, 117, 0, 147, 0, 0, 0, 0, 137, + 0, 0, 0, 0, 0, 0, 127, 0, 0, 0, + 121, 122, 120, 125, 129, 128, 126, 124, 139, 138, + 140, 0, 155, 0, 151, 0, 0, 93, 92, 81, + 49, 50, 51, 76, 52, 77, 53, 54, 55, 56, + 57, 58, 59, 60, 80, 61, 62, 63, 64, 65, + 78, 66, 67, 68, 69, 70, 71, 72, 73, 74, + 75, 79, 0, 0, 91, 187, 94, 0, 95, 0, + 96, 90, 17, 0, 183, 176, 174, 181, 182, 180, + 179, 185, 178, 177, 175, 184, 171, 0, 159, 0, + 0, 163, 0, 0, 167, 0, 0, 93, 85, 0, + 84, 0, 89, 103, 0, 286, 276, 277, 0, 274, + 0, 275, 0, 278, 194, 201, 200, 208, 196, 0, + 197, 279, 0, 284, 198, 199, 204, 202, 281, 280, + 283, 205, 0, 216, 0, 0, 0, 0, 285, 23, + 0, 287, 188, 230, 0, 0, 0, 217, 0, 0, + 206, 207, 0, 195, 203, 231, 232, 273, 282, 246, + 0, 247, 248, 249, 242, 0, 243, 244, 245, 270, + 271, 0, 0, 0, 0, 0, 235, 236, 192, 190, + 152, 160, 156, 172, 148, 193, 0, 99, 164, 168, + 141, 130, 0, 0, 149, 0, 0, 0, 0, 142, + 0, 0, 0, 0, 0, 134, 132, 135, 133, 131, + 144, 143, 145, 0, 157, 0, 153, 0, 191, 99, + 0, 173, 188, 189, 0, 188, 0, 0, 238, 0, + 0, 0, 240, 0, 161, 0, 0, 165, 0, 0, + 169, 228, 0, 220, 229, 223, 0, 227, 0, 188, + 221, 0, 188, 0, 0, 239, 0, 0, 0, 241, + 286, 276, 0, 0, 278, 0, 272, 0, 262, 0, + 0, 0, 234, 0, 233, 0, 288, 0, 48, 210, + 213, 0, 49, 76, 52, 77, 54, 55, 26, 59, + 60, 23, 61, 64, 24, 27, 188, 28, 67, 22, + 69, 25, 71, 72, 73, 74, 75, 79, 0, 43, + 0, 0, 45, 47, 35, 46, 0, 44, 34, 211, + 209, 87, 88, 93, 0, 86, 0, 250, 251, 0, + 0, 0, 253, 258, 256, 259, 0, 0, 257, 258, + 0, 254, 0, 255, 212, 261, 0, 212, 260, 0, + 263, 264, 0, 212, 265, 266, 0, 0, 267, 0, + 0, 0, 268, 269, 105, 104, 0, 0, 0, 237, + 0, 0, 0, 252, 225, 218, 0, 226, 222, 0, + 224, 214, 0, 215, 219, 0, 42, 0, 39, 41, + 32, 0, 38, 33, 40, 37, 31, 0, 36, 109, + 107, 111, 108, 106, 110, 0, 0, 16, 23, 41, + 13, 0, 15, 21}; const int JavaScriptGrammar::goto_default [] = { - 2, 6, 15, 1, 5, 4, 14, 18, 16, 368, - 208, 42, 476, 474, 366, 365, 26, 475, 364, 367, - 117, 38, 34, 156, 40, 30, 155, 35, 41, 68, - 39, 25, 44, 43, 279, 32, 273, 27, 269, 29, - 271, 28, 270, 36, 277, 37, 278, 31, 272, 268, - 309, 415, 274, 275, 203, 242, 207, 209, 213, 214, - 205, 204, 216, 243, 215, 220, 239, 240, 206, 370, - 369, 241, 465, 464, 331, 332, 467, 334, 466, 333, - 421, 425, 428, 424, 423, 443, 444, 212, 197, 211, - 193, 196, 210, 218, 217, 0}; + 2, 6, 15, 1, 5, 4, 14, 18, 16, 369, + 209, 43, 477, 475, 367, 366, 27, 476, 365, 368, + 118, 39, 35, 157, 41, 31, 156, 36, 42, 69, + 40, 26, 45, 44, 280, 33, 274, 28, 270, 30, + 272, 29, 271, 37, 278, 38, 279, 32, 273, 269, + 310, 416, 275, 276, 204, 243, 208, 210, 214, 215, + 206, 205, 217, 244, 216, 221, 240, 241, 207, 371, + 370, 242, 466, 465, 332, 333, 468, 335, 467, 334, + 422, 426, 429, 425, 424, 444, 445, 213, 198, 212, + 194, 197, 211, 219, 218, 0}; const int JavaScriptGrammar::action_index [] = { - -7, -88, 41, -25, -88, -43, 87, -88, 102, -88, - -88, -88, 12, 18, -88, 124, 113, 92, -88, 186, - -88, -88, 9, 29, 534, 122, -88, 28, -16, -41, - 213, -88, 307, 91, -88, 457, 60, 82, 237, 156, - -88, -88, -88, 372, 157, 534, -88, -88, -88, 32, - -88, 1014, 43, 534, 534, 534, 321, 534, -88, -88, - 534, 534, -88, -88, 534, -88, 534, 534, -88, 534, - 534, 103, 148, -88, -88, 534, 534, 534, -88, -88, - -88, 225, 534, 307, 534, 534, 534, 534, 372, 534, - 534, 534, 534, 534, 534, 158, 534, 534, 534, 101, - 100, 74, 229, 189, 193, 207, 208, 372, 372, 372, - 534, 0, 534, 71, 930, 534, 534, -88, -88, -88, + -4, -88, 42, -21, -88, -40, 116, -88, 112, -88, + -88, -88, 16, 19, -88, 85, 102, 174, -88, -88, + 173, -88, -88, 12, 27, 596, 78, -88, 34, -12, + -20, 210, -88, 266, 100, -88, 411, 61, 70, 239, + 169, -88, -88, -88, 333, 152, 596, -88, -88, -88, + 29, -88, 1076, 21, 596, 596, 596, 443, 596, -88, + -88, 596, 596, -88, -88, 596, -88, 596, 596, -88, + 596, 596, 108, 204, -88, -88, 596, 596, 596, -88, + -88, -88, 155, 596, 252, 596, 596, 596, 596, 343, + 596, 596, 596, 596, 596, 596, 159, 596, 596, 596, + 81, 106, 104, 302, 302, 167, 302, 302, 361, 323, + 313, 596, 40, 596, 71, 992, 596, 596, -88, -88, -88, -88, -88, -88, -88, -88, -88, -88, -88, -88, -88, -88, -88, -88, -88, -88, -88, -88, -88, -88, -88, -88, -88, -88, -88, -88, -88, -88, -88, -88, - -88, 147, 534, -88, -88, 23, 7, -88, 534, -88, - -88, -88, 534, -88, -88, -88, -88, -88, -88, -88, - -88, -88, -88, -88, -88, -88, 534, 57, 534, 534, - 80, 78, 534, -88, 930, 534, 534, -88, 136, -88, - 31, -88, -88, 37, -88, 42, 66, 33, -88, 46, - -88, 67, 1350, -88, -88, -88, -88, -88, 218, -88, - -88, 56, -88, -88, -88, -88, -88, -88, 1350, -88, - -88, 132, -88, 168, 81, 1266, 53, 52, 72, 54, - 1434, 534, -88, 58, 534, 47, -88, 61, 62, -88, - -88, 55, -88, -88, -88, -88, -88, -88, -88, 73, - -88, -88, -88, -88, 69, -88, -88, -88, -88, -88, - 39, 51, 534, 94, 104, -88, -88, 769, -88, 76, - 35, 34, -88, 244, 164, 68, 389, 48, 83, 260, - 179, 4, 534, 240, 534, 534, 534, 534, 276, 534, - 534, 534, 534, 534, 223, 217, 153, 152, 185, 286, - 270, 292, 534, -75, 534, 1, 534, -88, 457, 534, - -88, 534, 11, -48, 534, -42, 1266, -88, 534, 114, - 1266, -88, 534, -31, 534, 534, 19, 8, 534, -88, - -1, 96, -19, -88, -88, 534, -88, 4, 534, -88, - 27, 534, -36, 1266, -88, 534, 109, 1266, -88, -11, - -6, -38, -22, 1350, -35, -88, 1266, -88, 534, 98, - 1266, -2, 1266, -88, -4, 84, -49, -88, -88, 1266, - -55, 160, -24, 138, 77, 534, 1266, 2, -28, 90, - 3, -29, 347, -3, 20, 692, 21, 24, 49, 534, - 50, 26, 534, 25, 534, 22, -10, 534, -88, 1098, - 45, -88, -88, -88, -88, 534, -88, -88, -88, -88, - 173, -88, 534, -5, -88, 85, -88, -88, 534, 99, - 30, -88, 63, -88, 65, 93, 534, -88, 64, 59, - -88, 10, -88, 1266, -88, 88, 1266, -88, 178, -88, - -88, 95, 1266, 44, -88, 17, 16, -88, 5, -23, - 6, -88, -88, -88, -88, 534, 142, 1266, -88, 534, - 141, 1266, -88, 13, -88, 216, -88, -88, 534, -88, - -88, 15, -88, -88, 119, 38, 846, -88, 40, -88, - 611, -88, -88, -88, -88, -88, 110, -88, -88, -88, - -88, -88, -88, -88, 1182, 14, -88, 79, 228, -88, - 169, -88, -88, + -88, -88, 114, 596, -88, -88, 31, -32, -88, 596, + -88, -88, -88, 596, -88, -88, -88, -88, -88, -88, + -88, -88, -88, -88, -88, -88, -88, 596, 57, 596, + 596, 166, 77, 596, -88, 992, 596, 596, -88, 120, + -88, 35, -88, -88, 37, -88, 47, 66, 33, -88, + 49, -88, 63, 1412, -88, -88, -88, -88, -88, 219, + -88, -88, 60, -88, -88, -88, -88, -88, -88, 1412, + -88, -88, 149, -88, 207, 79, 1244, 54, 51, 72, + 41, 1496, 596, -88, 53, 596, 55, -88, 56, 58, + -88, -88, 68, -88, -88, -88, -88, -88, -88, -88, + 76, -88, -88, -88, -88, 73, -88, -88, -88, -88, + -88, 52, 67, 596, 94, 86, -88, -88, 831, -88, + 74, 38, 36, -88, 246, 75, 69, 486, 48, 110, + 270, 195, -26, 596, 264, 596, 596, 596, 596, 367, + 596, 596, 596, 596, 596, 196, 215, 222, 225, 218, + 298, 291, 367, 596, -75, 596, -1, 596, -88, 369, + 596, -88, 596, 5, -47, 596, -41, 1244, -88, 596, + 157, 1244, -88, 596, -24, 596, 596, 18, 10, 596, + -88, 1, 92, -15, -88, -88, 596, -88, -8, 596, + -88, 30, 596, -37, 1244, -88, 596, 131, 1244, -88, + -6, 4, -35, -7, 1412, -43, -88, 1244, -88, 596, + 96, 1244, 6, 1244, -88, 8, 0, -53, -88, -88, + 1244, -51, 137, -22, 153, 101, 596, 1244, 3, -25, + 113, 2, -30, 519, 80, -2, 754, 20, -5, 46, + 596, 50, 28, 596, 25, 596, 24, 23, 596, -88, + 1160, 45, -88, -88, -88, -88, 596, -88, -88, -88, + -88, 172, -88, 596, 11, -88, 97, -88, -88, 596, + 144, 32, -88, 62, -88, 65, 88, 596, -88, 64, + 59, -88, 13, -88, 1244, -88, 99, 1244, -88, 216, + -88, -88, 105, 1244, 44, -88, 26, 22, -88, 9, + -23, 7, -88, -88, -88, -88, 596, 91, 1244, -88, + 596, 123, 1244, -88, 15, -88, 177, -88, -88, 596, + -88, -88, 17, -88, -88, 119, 39, 908, -88, 43, + -88, 673, -88, -88, -88, -88, -88, 111, -88, -88, + -88, -88, -88, -88, -88, 1328, 14, -88, 103, 164, + -88, 151, -88, -88, - -96, -96, -96, -96, -96, 24, -96, -96, -96, -96, - -96, -96, -96, -96, -96, 10, -96, 9, -96, 22, - -96, -96, -96, -96, 12, -96, -96, -96, -96, -96, - -96, -96, -96, 27, -96, -17, -96, -96, -96, -96, - -96, -96, -96, -96, -96, 140, -96, -96, -96, -96, - -96, -96, -96, -1, 96, 122, 72, 82, -96, -96, - 116, 119, -96, -96, 109, -96, 106, 49, -96, 104, - 110, -96, -96, -96, -96, 101, 100, 86, -96, -96, - -96, -96, 79, -96, 147, 139, 149, 128, -96, 127, - 138, 130, 136, 90, 70, -96, 41, 77, 54, -96, + -96, -96, -96, -96, -96, 85, -96, -96, -96, -96, + -96, -96, -96, -96, -96, 16, -96, 12, -96, -96, + 22, -96, -96, -96, -96, 11, -96, -96, -96, -96, + -96, -96, -96, -96, 26, -96, -19, -96, -96, -96, + -96, -96, -96, -96, -96, -96, 139, -96, -96, -96, + -96, -96, -96, -96, -1, 90, 86, 106, 113, -96, + -96, 114, 110, -96, -96, 107, -96, 58, 104, -96, + 102, 108, -96, -96, -96, -96, 99, 89, 118, -96, + -96, -96, -96, 77, -96, 76, 140, 145, 121, -96, + 119, 130, 131, 137, 93, 68, -96, 55, 62, 57, -96, -96, -96, -96, -96, -96, -96, -96, -96, -96, - 59, -96, 64, -96, 19, 33, 44, -96, -96, -96, + -96, 75, -96, 71, -96, 19, 33, 51, -96, -96, -96, -96, -96, -96, -96, -96, -96, -96, -96, -96, -96, -96, -96, -96, -96, -96, -96, -96, -96, -96, -96, -96, -96, -96, -96, -96, -96, -96, -96, -96, - -96, -96, 47, -96, -96, -96, -96, -96, 37, -96, - -96, -96, 31, -96, -96, -96, -96, -96, -96, -96, - -96, -96, -96, -96, -96, -96, 91, -96, 146, -14, - -96, -96, -4, -96, 209, 21, 148, -96, -96, -96, + -96, -96, -96, 36, -96, -96, -96, -96, -96, 35, + -96, -96, -96, 43, -96, -96, -96, -96, -96, -96, + -96, -96, -96, -96, -96, -96, -96, 138, -96, 128, + -3, -96, -96, 14, -96, 61, 13, 154, -96, -96, -96, -96, -96, -96, -96, -96, -96, -96, -96, -96, - -96, -96, 23, -96, -96, -96, -96, -96, -96, -96, - -96, -96, -96, -96, -96, -96, -96, -96, 58, -96, - -96, -96, -96, -96, -96, 17, -96, -96, -96, -96, - -96, 11, -96, -96, 5, -41, -96, -96, -96, -96, + -96, -96, -96, 27, -96, -96, -96, -96, -96, -96, + -96, -96, -96, -96, -96, -96, -96, -96, -96, 66, + -96, -96, -96, -96, -96, -96, 23, -96, -96, -96, + -96, -96, 10, -96, -96, 6, -42, -96, -96, -96, -96, -96, -96, -96, -96, -96, -96, -96, -96, -96, -96, -96, -96, -96, -96, -96, -96, -96, -96, -96, - -96, -96, -5, -96, -96, -96, -96, 115, -96, -96, + -96, -96, -96, 5, -96, -96, -96, -96, 117, -96, -96, -96, -96, -96, -96, -96, -96, -96, -96, -96, - -96, -96, 161, -96, 177, 167, 151, 178, -96, 73, - 67, 63, 57, 60, -96, -96, -96, -96, -96, -96, - -96, -96, 160, -96, 152, -96, 189, -96, -96, 154, - -96, 56, -96, -96, 61, -96, 43, -96, 46, -96, - 48, -96, 164, -96, 187, 188, -96, -96, 181, -96, - -96, -96, -96, -96, -96, 175, -96, -20, 65, -96, - -96, 69, -96, 32, -96, 36, -96, 42, -96, -96, - -49, -96, -96, 55, -96, -96, 35, -96, 30, -96, - 52, -96, 53, -96, -96, -96, -96, -96, -96, 50, - -96, -96, -96, -96, -96, 131, 132, -96, -96, -96, - -96, -96, 129, -96, -96, 38, -96, -96, -96, 39, - -96, -12, 92, -96, 97, -96, -96, 34, -96, 40, - -96, -96, -96, -96, -96, 29, -96, -96, -96, -96, - -96, -96, 87, -96, -96, -96, -96, -96, -7, -96, - -96, -96, -96, -96, -77, -96, 0, -96, -73, -96, - -96, -96, -96, -42, -96, -96, -69, -96, -96, -96, - -96, -96, -96, -72, -96, -96, -24, -96, -96, -96, - -29, -96, -96, -96, -96, 26, -96, 28, -96, 25, - -96, 14, -96, -96, -96, -96, -96, -96, 8, -96, - -96, -53, -96, -96, -96, -96, 2, -96, 7, -96, - 1, -96, -96, -96, -96, -96, -96, -96, -96, -96, - -96, -96, -96, -96, 45, -96, -96, -6, 4, -96, - -2, -96, -96}; + -96, -96, -96, 180, -96, 167, 176, 168, 188, -96, + 41, 65, 67, 64, 74, -96, -96, -96, -96, -96, + -96, -96, -96, 158, -96, 148, -96, 191, -96, -96, + 157, -96, 59, -96, -96, 56, -96, 53, -96, 50, + -96, 49, -96, 155, -96, 234, 187, -96, -96, 164, + -96, -96, -96, -96, -96, -96, 177, -96, -26, 54, + -96, -96, 60, -96, 32, -96, 30, -96, 37, -96, + -96, -49, -96, -96, 63, -96, -96, 48, -96, 46, + -96, 45, -96, 44, -96, -96, -96, -96, -96, -96, + 52, -96, -96, -96, -96, -96, 132, 39, -96, -96, + -96, -96, -96, 129, -96, -96, 40, -96, -96, -96, + 34, -96, -12, 95, -96, 94, -96, -96, 31, -96, + 47, -96, -96, -96, -96, -96, 29, -96, -96, -96, + -96, -96, -96, 165, -96, -96, -96, -96, -96, 0, + -96, -96, -96, -96, -96, -79, -96, -7, -96, -80, + -96, -96, -96, -96, -61, -96, -96, -63, -96, -96, + -96, -96, -96, -96, -57, -96, -96, -43, -96, -96, + -96, -27, -96, -96, -96, -96, 25, -96, 28, -96, + 24, -96, 17, -96, -96, -96, -96, -96, -96, 8, + -96, -96, -55, -96, -96, -96, -96, 9, -96, 7, + -96, 1, -96, -96, -96, -96, -96, -96, -96, -96, + -96, -96, -96, -96, -96, -2, -96, -96, -5, 2, + -96, -6, -96, -96}; const int JavaScriptGrammar::action_info [] = { - 409, 304, 282, 397, -64, -215, 407, 358, 267, -56, - -44, 353, 345, 314, 362, 328, 335, 302, 316, 152, - 355, 322, 352, 198, 343, 350, 459, -46, -45, 82, - 468, 158, 110, 330, 449, 112, 24, 450, 23, 442, - 8, 7, 3, 502, 463, 17, 483, 22, 477, 442, - 322, 477, 405, 448, -216, 414, -67, -69, 455, 442, - 418, 194, 176, 422, 446, 432, 433, 160, 426, 426, - 426, 198, 82, 195, 199, 200, 112, 282, 3, 356, - 442, 349, 176, 302, 463, 182, 356, 262, 341, 267, - 358, 191, 399, 201, 418, 436, 152, 455, 459, 152, - 202, 445, 152, 429, 337, 110, 152, 152, 0, 0, - 304, 246, 17, 261, 69, 446, 12, 152, 152, 194, - 494, 12, 152, 0, 17, 70, -284, 478, 495, 311, - 257, 256, 178, 324, 252, 251, 179, 325, 259, 258, - 69, 69, 259, 258, 152, 73, 417, 416, 430, 152, - 152, 70, 70, 12, 264, 152, 74, 338, 360, 420, - 75, 249, 69, 10, 9, 266, 265, 254, 75, 347, - 487, 13, 306, 70, 320, 479, 13, 96, 96, 97, - 97, 0, 96, 96, 97, 97, 152, 0, 184, 249, - 98, 98, 189, 250, 248, 98, 98, 254, 12, 255, - 253, 461, 457, 153, 96, 76, 97, 185, 13, 412, - 96, 77, 97, 76, 96, 12, 97, 98, 96, 77, - 97, 250, 248, 98, 471, 501, 152, 98, 114, 255, - 253, 98, 96, 96, 97, 97, 477, 75, 0, 440, - 439, 20, 96, 0, 97, 98, 98, 115, 96, 116, - 97, 0, 184, 13, 96, 98, 97, 12, 284, 285, - 0, 98, 284, 285, 0, 0, 0, 98, 0, 0, - 13, 185, 0, 186, 0, 0, 0, 472, 470, 245, - 244, 0, 76, 289, 290, 286, 287, 0, 77, 286, - 287, 0, 291, 289, 290, 292, 0, 293, 0, 289, - 290, 0, 291, 0, 0, 292, 0, 293, 291, 289, - 290, 292, 13, 293, 0, 289, 290, 0, 291, 0, - 0, 292, 0, 293, 291, 84, 85, 292, 0, 293, - 0, 0, 0, 46, 47, 0, 0, 0, 0, 0, - 0, 0, 0, 49, 0, 0, 0, 0, 0, 0, - 50, 0, 86, 87, 51, 52, 0, 53, 0, 46, - 47, 0, 0, 0, 56, 0, 0, 0, 59, 49, + 283, 305, 408, 331, 410, -47, 359, -216, 400, -45, + -57, 268, 356, 153, 315, 398, 346, 329, 336, 317, + 323, 331, 363, 344, 303, 353, 354, -46, 161, 478, + 351, 419, 469, 199, 25, 83, 111, 451, 450, 159, + 443, 24, 7, 503, 8, 3, 464, 484, 23, 17, + 323, 478, 406, -68, -217, 443, 113, -70, 195, 460, + 456, 443, 449, 177, 447, 423, 434, 427, 433, 427, + 427, 415, 83, 196, 200, 283, 199, 359, 201, 357, + 350, 3, 0, 307, 183, 0, 303, -65, 443, 419, + 268, 342, 456, 202, 460, 192, 203, 464, 430, 153, + 338, 0, 153, 263, 153, 111, 437, 153, 153, 495, + 357, 446, 305, 0, 12, 247, 113, 496, 70, 153, + 179, 70, 153, 0, 180, 447, 262, 479, 153, 71, + 312, 153, 71, 17, 258, 257, 17, 253, 252, 153, + 260, 259, 195, 431, 70, 12, 70, 267, 266, -285, + 74, 458, 153, 339, 265, 71, 361, 71, 418, 417, + 325, 75, 260, 259, 326, 153, 250, 76, 177, 13, + 154, 488, 478, 10, 9, 480, 190, 97, 250, 98, + 12, 76, 255, 462, 97, 472, 98, 185, 0, 0, + 99, 348, 97, 12, 98, 0, 0, 99, 251, 249, + 13, 0, 12, 12, 421, 99, 186, 502, 413, 0, + 251, 249, 77, 0, 256, 254, 76, 321, 78, 0, + 97, 97, 98, 98, 153, 115, 77, 153, 21, 19, + 0, 0, 78, 99, 99, 13, 255, 0, 473, 471, + 97, 0, 98, 97, 116, 98, 117, 97, 13, 98, + 97, 0, 98, 99, 185, 0, 99, 13, 13, 0, + 99, 77, 0, 99, 285, 286, 0, 78, 256, 254, + 85, 86, 0, 186, 0, 187, 0, 441, 440, 0, + 246, 245, 285, 286, 85, 86, 0, 0, 0, 0, + 0, 287, 288, 290, 291, 0, 0, 87, 88, 0, + 0, 0, 292, 0, 0, 293, 0, 294, 0, 287, + 288, 87, 88, 0, 290, 291, 0, 0, 0, 0, + 0, 290, 291, 292, 0, 0, 293, 97, 294, 98, + 292, 0, 0, 293, 0, 294, 90, 91, 0, 0, + 99, 0, 0, 0, 92, 93, 90, 91, 94, 0, + 95, 0, 0, 0, 92, 93, 90, 91, 94, 0, + 95, 0, 0, 0, 92, 93, 90, 91, 94, 0, + 95, 0, 164, 0, 92, 93, 0, 0, 94, 0, + 95, 0, 165, 0, 90, 91, 166, 0, 0, 0, + 290, 291, 92, 93, 0, 167, 94, 168, 95, 292, + 0, 0, 293, 0, 294, 0, 0, 0, 169, 0, + 170, 74, 0, 0, 164, 0, 0, 0, 171, 0, + 0, 172, 75, 0, 165, 0, 0, 173, 166, 0, + 0, 0, 0, 174, 0, 0, 0, 167, 0, 168, + 0, 0, 0, 0, 0, 0, 175, 0, 0, 0, + 169, 0, 170, 74, 0, 47, 48, 0, 0, 0, + 171, 0, 0, 172, 75, 50, 0, 0, 0, 173, + 0, 0, 51, 0, 0, 174, 52, 53, 0, 54, + 0, 0, 0, 0, 0, 0, 57, 0, 175, 164, + 60, 0, 0, 0, 0, 0, 0, 0, 0, 165, + 0, 0, 0, 166, 0, 0, 0, 0, 63, 0, + 64, 0, 167, 0, 168, 0, 0, 319, 0, 0, + 0, 59, 66, 49, 0, 169, 0, 170, 74, 0, + 0, 47, 48, 0, 0, 171, 0, 0, 172, 75, + 0, 50, 0, 0, 173, 0, 0, 0, 51, 0, + 174, 0, 52, 53, 0, 54, 0, 0, 0, 0, + 0, 0, 57, 175, 0, 0, 60, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 63, 0, 64, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 59, 66, 49, + 0, 0, 0, 0, 0, 0, 0, 46, 47, 48, + 0, 0, 0, 0, 0, 0, 0, 0, 50, 0, + 0, 0, 0, 0, 0, 51, 0, 0, 0, 52, + 53, 0, 54, 0, 0, 0, 55, 0, 56, 57, + 58, 0, 0, 60, 0, 0, 0, 61, 0, 62, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 63, 0, 64, 0, 65, 0, 67, 0, 68, + 0, 0, 0, 0, 59, 66, 49, 0, 0, 0, + 0, 0, 0, 0, 46, 47, 48, 0, 0, 0, + 0, 0, 0, 0, 0, 50, 0, 0, 0, 0, + 0, 0, 51, 0, 0, 0, 52, 53, 0, 54, + 0, 0, 0, 55, 0, 56, 57, 58, 0, 0, + 60, 0, 0, 0, 61, 0, 62, 0, 0, 483, + 0, 0, 0, 0, 0, 0, 0, 0, 63, 0, + 64, 0, 65, 0, 67, 0, 68, 0, 0, 0, + 0, 59, 66, 49, 0, 0, 0, 0, 0, 0, + 0, -66, 0, 0, 0, 46, 47, 48, 0, 0, 0, 0, 0, 0, 0, 0, 50, 0, 0, 0, - 51, 52, 0, 53, 0, 0, 62, 0, 63, 0, - 56, 0, 163, 0, 59, 89, 90, 0, 0, 58, - 65, 48, 164, 91, 92, 0, 165, 93, 0, 94, - 0, 0, 62, 0, 63, 166, 0, 167, 0, 0, - 318, 0, 0, 0, 0, 58, 65, 48, 168, 0, - 169, 73, 0, 0, 0, 0, 0, 0, 170, 0, - 0, 171, 74, 0, 0, 0, 0, 172, 0, 0, - 0, 0, 0, 173, 0, 0, 0, 0, 0, 0, - 163, 0, 0, 0, 0, 0, 174, 0, 0, 0, - 164, 0, 0, 0, 165, 0, 0, 0, 0, 0, - 0, 0, 0, 166, 0, 167, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 168, 0, 169, 73, - 0, 0, 0, 0, 0, 0, 170, 0, 0, 171, - 74, 0, 0, 0, 0, 172, 0, 0, 0, 0, - 0, 173, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 174, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 45, 46, 47, 0, 0, - 0, 0, 0, 0, 0, 0, 49, 0, 0, 0, - 0, 0, 0, 50, 0, 0, 0, 51, 52, 0, - 53, 0, 0, 0, 54, 0, 55, 56, 57, 0, - 0, 59, 0, 0, 0, 60, 0, 61, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 62, - 0, 63, 0, 64, 0, 66, 0, 67, 0, 0, - 0, 0, 58, 65, 48, 0, 0, 0, 0, 0, - 0, 0, 45, 46, 47, 0, 0, 0, 0, 0, - 0, 0, 0, 49, 0, 0, 0, 0, 0, 0, - 50, 0, 0, 0, 51, 52, 0, 53, 0, 0, - 0, 54, 0, 55, 56, 57, 0, 0, 59, 0, - 0, 0, 60, 0, 61, 0, 0, 482, 0, 0, - 0, 0, 0, 0, 0, 0, 62, 0, 63, 0, - 64, 0, 66, 0, 67, 0, 0, 0, 0, 58, - 65, 48, 0, 0, 0, 0, 0, 0, 0, -65, - 0, 0, 0, 45, 46, 47, 0, 0, 0, 0, - 0, 0, 0, 0, 49, 0, 0, 0, 0, 0, - 0, 50, 0, 0, 0, 51, 52, 0, 53, 0, - 0, 0, 54, 0, 55, 56, 57, 0, 0, 59, - 0, 0, 0, 60, 0, 61, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 62, 0, 63, - 0, 64, 0, 66, 0, 67, 0, 0, 0, 0, - 58, 65, 48, 0, 0, 0, 0, 0, 0, 0, - 45, 46, 47, 0, 0, 0, 0, 0, 0, 0, - 0, 49, 0, 0, 0, 0, 0, 0, 50, 0, - 0, 0, 51, 52, 0, 53, 0, 0, 0, 54, - 0, 55, 56, 57, 0, 0, 59, 0, 0, 0, - 60, 0, 61, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 62, 0, 63, 0, 64, 0, - 66, 281, 67, 0, 0, 0, 0, 58, 65, 48, - 0, 0, 0, 0, 0, 0, 0, 45, 46, 47, - 0, 0, 0, 0, 0, 0, 0, 0, 49, 0, - 0, 0, 0, 0, 0, 50, 0, 0, 0, 51, - 52, 0, 53, 0, 0, 0, 54, 0, 55, 56, - 57, 0, 0, 59, 0, 0, 0, 60, 0, 61, - 0, 0, 485, 0, 0, 0, 0, 0, 0, 0, - 0, 62, 0, 63, 0, 64, 0, 66, 0, 67, - 0, 0, 0, 0, 58, 65, 48, 0, 0, 0, - 0, 0, 0, 0, 119, 120, 121, 0, 0, 123, - 125, 126, 0, 0, 127, 0, 128, 0, 0, 0, - 130, 131, 132, 0, 0, 0, 0, 0, 0, 133, - 134, 135, 136, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 137, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 140, - 0, 0, 0, 0, 0, 0, 141, 142, 143, 0, - 145, 146, 147, 148, 149, 150, 0, 0, 138, 144, - 129, 122, 124, 139, 0, 0, 0, 0, 119, 120, - 121, 0, 0, 123, 125, 126, 0, 0, 127, 0, - 128, 0, 0, 0, 130, 131, 132, 0, 0, 0, - 0, 0, 0, 401, 134, 135, 136, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 137, 0, 0, - 0, 402, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 140, 0, 0, 0, 0, 0, 404, - 141, 142, 143, 0, 145, 146, 147, 148, 149, 150, - 0, 0, 138, 144, 129, 122, 124, 139, 0, 0, - 0, 0, 119, 120, 121, 0, 0, 123, 125, 126, - 0, 0, 127, 0, 128, 0, 0, 0, 130, 131, - 132, 0, 0, 0, 0, 0, 0, 401, 134, 135, - 136, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 137, 0, 0, 0, 402, 0, 0, 0, 0, - 0, 0, 0, 403, 0, 0, 0, 140, 0, 0, - 0, 0, 0, 404, 141, 142, 143, 0, 145, 146, - 147, 148, 149, 150, 0, 0, 138, 144, 129, 122, - 124, 139, 0, 0, 0, 0, 221, 0, 0, 0, - 0, 223, 0, 45, 46, 47, 225, 0, 0, 0, - 0, 0, 0, 226, 49, 0, 0, 0, 0, 0, - 0, 497, 229, 0, 0, 230, 498, 0, 53, 0, - 0, 0, 54, 0, 55, 56, 57, 0, 0, 59, - 0, 0, 0, 60, 0, 61, 0, 0, 0, 0, - 0, 231, 0, 232, 0, 0, 0, 62, 233, 63, - 234, 64, 235, 66, 236, 67, 237, 238, 0, 0, - 58, 65, 48, 222, 224, 0, 0, 0, 0, 0, - 221, 0, 0, 0, 0, 223, 0, 45, 46, 47, - 225, 0, 0, 0, 0, 0, 0, 226, 49, 0, - 0, 0, 0, 0, 0, 228, 229, 0, 0, 230, - 52, 0, 53, 0, 0, 0, 54, 0, 55, 56, - 57, 0, 0, 59, 0, 0, 0, 60, 0, 61, - 0, 0, 0, 0, 0, 231, 0, 232, 0, 0, - 0, 62, 233, 63, 234, 64, 235, 66, 236, 67, - 237, 238, 0, 0, 58, 65, 48, 222, 224, 0, - 0, 0, 0, 0, 221, 0, 0, 0, 0, 223, - 0, 45, 46, 47, 225, 0, 0, 0, 0, 0, - 0, 226, 227, 0, 0, 0, 0, 0, 0, 228, - 229, 0, 0, 230, 52, 0, 53, 0, 0, 0, - 54, 0, 55, 56, 57, 0, 0, 59, 0, 0, - 0, 60, 0, 61, 0, 0, 0, 0, 0, 231, - 0, 232, 0, 0, 0, 62, 233, 63, 234, 64, - 235, 66, 236, 67, 237, 238, 0, 0, 58, 65, - 48, 222, 224, 0, 0, 0, 0, 0, 371, 120, - 121, 0, 0, 373, 125, 375, 46, 47, 376, 0, - 128, 0, 0, 0, 130, 378, 379, 0, 0, 0, - 0, 0, 0, 380, 381, 135, 136, 230, 52, 0, - 53, 0, 0, 0, 54, 0, 55, 382, 57, 0, - 0, 384, 0, 0, 0, 60, 0, 61, 0, -211, - 0, 0, 0, 385, 0, 232, 0, 0, 0, 386, - 387, 388, 389, 64, 391, 392, 393, 394, 395, 396, - 0, 0, 383, 390, 377, 372, 374, 139, 0, 0, - 0, 0, - - 437, 499, 181, 419, 21, 263, 500, 427, 431, 486, - 435, 19, 183, 441, 447, 438, 21, 481, 484, 480, - 473, 312, 33, 462, 469, 451, 260, 434, 21, 11, - 452, 188, 219, 162, 161, 460, 456, 458, 118, 351, - 359, 344, 441, 151, 357, 406, 346, 175, 312, 438, - 398, 348, 317, 159, 496, 339, 319, 321, 400, 408, - 157, 361, 363, 154, 219, 0, 312, 219, 71, 0, - 0, 312, 99, 0, 0, 312, 71, 0, 454, 312, - 0, 71, 0, 0, 71, 101, 71, 71, 0, 297, - 71, 71, 298, 410, 71, 296, 411, 71, 111, 295, - 71, 113, 106, 157, 71, 294, 71, 313, 100, 71, - 413, 490, 315, 71, 83, 80, 340, 71, 71, 71, - 342, 453, 105, 71, 71, 488, 454, 71, 71, 79, - 78, 71, 177, 71, 72, 453, 71, 71, 493, 0, - 81, 260, 276, 71, 354, 491, 71, 280, 492, 71, - 410, 489, 247, 411, 71, 71, 0, 71, 71, 95, - 192, 109, 103, 71, 157, 71, 71, 71, 104, 192, - 102, 190, 107, 71, 71, 0, 71, 0, 71, 71, - 88, 308, 108, 280, 280, 300, 280, 71, 71, 180, - 305, 71, 280, 280, 71, 0, 280, 283, 0, 280, - 303, 299, 308, 310, 71, 71, 323, 280, 308, 280, - 280, 288, 301, 280, 71, 308, 308, 0, 0, 280, - 280, 280, 0, 0, 336, 0, 0, 0, 118, 187, - 329, 326, 0, 0, 0, 0, 0, 327, 307, 0, + 0, 0, 0, 51, 0, 0, 0, 52, 53, 0, + 54, 0, 0, 0, 55, 0, 56, 57, 58, 0, + 0, 60, 0, 0, 0, 61, 0, 62, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 63, + 0, 64, 0, 65, 0, 67, 0, 68, 0, 0, + 0, 0, 59, 66, 49, 0, 0, 0, 0, 0, + 0, 0, 46, 47, 48, 0, 0, 0, 0, 0, + 0, 0, 0, 50, 0, 0, 0, 0, 0, 0, + 51, 0, 0, 0, 52, 53, 0, 54, 0, 0, + 0, 55, 0, 56, 57, 58, 0, 0, 60, 0, + 0, 0, 61, 0, 62, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 63, 0, 64, 0, + 65, 0, 67, 282, 68, 0, 0, 0, 0, 59, + 66, 49, 0, 0, 0, 0, 0, 0, 0, 46, + 47, 48, 0, 0, 0, 0, 0, 0, 0, 0, + 50, 0, 0, 0, 0, 0, 0, 51, 0, 0, + 0, 52, 53, 0, 54, 0, 0, 0, 55, 0, + 56, 57, 58, 0, 0, 60, 0, 0, 0, 61, + 0, 62, 0, 0, 486, 0, 0, 0, 0, 0, + 0, 0, 0, 63, 0, 64, 0, 65, 0, 67, + 0, 68, 0, 0, 0, 0, 59, 66, 49, 0, + 0, 0, 0, 0, 0, 0, 120, 121, 122, 0, + 0, 124, 126, 127, 0, 0, 128, 0, 129, 0, + 0, 0, 131, 132, 133, 0, 0, 0, 0, 0, + 0, 134, 135, 136, 137, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 138, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 141, 0, 0, 0, 0, 0, 0, 142, 143, + 144, 0, 146, 147, 148, 149, 150, 151, 0, 0, + 139, 145, 130, 123, 125, 140, 0, 0, 0, 0, + 120, 121, 122, 0, 0, 124, 126, 127, 0, 0, + 128, 0, 129, 0, 0, 0, 131, 132, 133, 0, + 0, 0, 0, 0, 0, 402, 135, 136, 137, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 138, + 0, 0, 0, 403, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 141, 0, 0, 0, 0, + 0, 405, 142, 143, 144, 0, 146, 147, 148, 149, + 150, 151, 0, 0, 139, 145, 130, 123, 125, 140, + 0, 0, 0, 0, 120, 121, 122, 0, 0, 124, + 126, 127, 0, 0, 128, 0, 129, 0, 0, 0, + 131, 132, 133, 0, 0, 0, 0, 0, 0, 402, + 135, 136, 137, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 138, 0, 0, 0, 403, 0, 0, + 0, 0, 0, 0, 0, 404, 0, 0, 0, 141, + 0, 0, 0, 0, 0, 405, 142, 143, 144, 0, + 146, 147, 148, 149, 150, 151, 0, 0, 139, 145, + 130, 123, 125, 140, 0, 0, 0, 0, 222, 0, + 0, 0, 0, 224, 0, 46, 47, 48, 226, 0, + 0, 0, 0, 0, 0, 227, 50, 0, 0, 0, + 0, 0, 0, 229, 230, 0, 0, 231, 53, 0, + 54, 0, 0, 0, 55, 0, 56, 57, 58, 0, + 0, 60, 0, 0, 0, 61, 0, 62, 0, 0, + 0, 0, 0, 232, 0, 233, 0, 0, 0, 63, + 234, 64, 235, 65, 236, 67, 237, 68, 238, 239, + 0, 0, 59, 66, 49, 223, 225, 0, 0, 0, + 0, 0, 222, 0, 0, 0, 0, 224, 0, 46, + 47, 48, 226, 0, 0, 0, 0, 0, 0, 227, + 50, 0, 0, 0, 0, 0, 0, 498, 230, 0, + 0, 231, 499, 0, 54, 0, 0, 0, 55, 0, + 56, 57, 58, 0, 0, 60, 0, 0, 0, 61, + 0, 62, 0, 0, 0, 0, 0, 232, 0, 233, + 0, 0, 0, 63, 234, 64, 235, 65, 236, 67, + 237, 68, 238, 239, 0, 0, 59, 66, 49, 223, + 225, 0, 0, 0, 0, 0, 222, 0, 0, 0, + 0, 224, 0, 46, 47, 48, 226, 0, 0, 0, + 0, 0, 0, 227, 228, 0, 0, 0, 0, 0, + 0, 229, 230, 0, 0, 231, 53, 0, 54, 0, + 0, 0, 55, 0, 56, 57, 58, 0, 0, 60, + 0, 0, 0, 61, 0, 62, 0, 0, 0, 0, + 0, 232, 0, 233, 0, 0, 0, 63, 234, 64, + 235, 65, 236, 67, 237, 68, 238, 239, 0, 0, + 59, 66, 49, 223, 225, 0, 0, 0, 0, 0, + 372, 121, 122, 0, 0, 374, 126, 376, 47, 48, + 377, 0, 129, 0, 0, 0, 131, 379, 380, 0, + 0, 0, 0, 0, 0, 381, 382, 136, 137, 231, + 53, 0, 54, 0, 0, 0, 55, 0, 56, 383, + 58, 0, 0, 385, 0, 0, 0, 61, 0, 62, + 0, -212, 0, 0, 0, 386, 0, 233, 0, 0, + 0, 387, 388, 389, 390, 65, 392, 393, 394, 395, + 396, 397, 0, 0, 384, 391, 378, 373, 375, 140, + 0, 0, 0, 0, + + 22, 432, 500, 436, 501, 428, 438, 497, 435, 487, + 420, 453, 442, 182, 20, 264, 439, 482, 474, 481, + 313, 34, 22, 189, 470, 485, 463, 452, 22, 448, + 184, 163, 261, 162, 461, 457, 220, 459, 119, 352, + 347, 345, 442, 152, 439, 407, 349, 399, 261, 340, + 313, 160, 155, 364, 362, 0, 360, 358, 322, 176, + 320, 409, 318, 0, 313, 401, 313, 158, 72, 313, + 313, 0, 220, 295, 0, 220, 0, 0, 0, 0, + 119, 188, 72, 0, 72, 72, 100, 454, 102, 72, + 11, 72, 72, 101, 72, 72, 298, 296, 72, 297, + 107, 72, 72, 72, 72, 341, 299, 316, 114, 89, + 314, 343, 84, 72, 112, 490, 72, 72, 80, 489, + 72, 72, 72, 455, 454, 106, 72, 411, 79, 72, + 412, 72, 73, 455, 72, 72, 494, 72, 82, 493, + 72, 72, 491, 492, 277, 72, 72, 81, 72, 281, + 411, 96, 355, 412, 110, 72, 0, 72, 72, 72, + 248, 193, 103, 104, 72, 72, 72, 72, 193, 105, + 158, 181, 72, 108, 0, 72, 0, 191, 109, 178, + 281, 158, 72, 0, 309, 72, 306, 281, 414, 281, + 281, 309, 0, 0, 72, 72, 281, 324, 304, 281, + 281, 289, 301, 72, 309, 0, 311, 72, 281, 281, + 300, 0, 281, 330, 309, 72, 284, 0, 309, 281, + 281, 0, 302, 281, 0, 0, 337, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 328, 0, 0, 0, + 308, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 72, 0, 0, 0, 0, 281, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 327, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0}; + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0}; const int JavaScriptGrammar::action_check [] = { - 55, 76, 1, 7, 7, 29, 55, 36, 36, 7, - 7, 33, 31, 61, 16, 7, 17, 48, 60, 8, - 55, 2, 60, 29, 60, 36, 36, 7, 7, 1, - 17, 8, 48, 29, 29, 76, 7, 60, 29, 33, - 65, 0, 85, 29, 29, 33, 8, 29, 8, 33, - 2, 8, 7, 36, 29, 60, 7, 7, 36, 33, - 36, 29, 2, 33, 20, 55, 7, 60, 5, 5, - 5, 29, 1, 36, 8, 29, 76, 1, 85, 7, - 33, 29, 2, 48, 29, 7, 7, 36, 61, 36, - 36, 60, 8, 60, 36, 7, 8, 36, 36, 8, - 33, 6, 8, 10, 8, 48, 8, 8, -1, -1, - 76, 55, 33, 74, 40, 20, 29, 8, 8, 29, - 7, 29, 8, -1, 33, 51, 36, 8, 15, 61, - 61, 62, 50, 50, 61, 62, 54, 54, 61, 62, - 40, 40, 61, 62, 8, 42, 61, 62, 55, 8, - 8, 51, 51, 29, 60, 8, 53, 61, 60, 60, - 12, 29, 40, 61, 62, 61, 62, 29, 12, 60, - 60, 84, 8, 51, 60, 56, 84, 25, 25, 27, - 27, -1, 25, 25, 27, 27, 8, -1, 15, 29, - 38, 38, 56, 61, 62, 38, 38, 29, 29, 61, - 62, 60, 60, 56, 25, 57, 27, 34, 84, 36, - 25, 63, 27, 57, 25, 29, 27, 38, 25, 63, - 27, 61, 62, 38, 8, 56, 8, 38, 15, 61, - 62, 38, 25, 25, 27, 27, 8, 12, -1, 61, - 62, 55, 25, -1, 27, 38, 38, 34, 25, 36, - 27, -1, 15, 84, 25, 38, 27, 29, 18, 19, - -1, 38, 18, 19, -1, -1, -1, 38, -1, -1, - 84, 34, -1, 36, -1, -1, -1, 61, 62, 61, - 62, -1, 57, 23, 24, 45, 46, -1, 63, 45, - 46, -1, 32, 23, 24, 35, -1, 37, -1, 23, - 24, -1, 32, -1, -1, 35, -1, 37, 32, 23, - 24, 35, 84, 37, -1, 23, 24, -1, 32, -1, - -1, 35, -1, 37, 32, 18, 19, 35, -1, 37, - -1, -1, -1, 12, 13, -1, -1, -1, -1, -1, - -1, -1, -1, 22, -1, -1, -1, -1, -1, -1, - 29, -1, 45, 46, 33, 34, -1, 36, -1, 12, - 13, -1, -1, -1, 43, -1, -1, -1, 47, 22, - -1, -1, -1, -1, -1, -1, 29, -1, -1, -1, - 33, 34, -1, 36, -1, -1, 65, -1, 67, -1, - 43, -1, 3, -1, 47, 23, 24, -1, -1, 78, - 79, 80, 13, 31, 32, -1, 17, 35, -1, 37, - -1, -1, 65, -1, 67, 26, -1, 28, -1, -1, - 31, -1, -1, -1, -1, 78, 79, 80, 39, -1, - 41, 42, -1, -1, -1, -1, -1, -1, 49, -1, - -1, 52, 53, -1, -1, -1, -1, 58, -1, -1, - -1, -1, -1, 64, -1, -1, -1, -1, -1, -1, - 3, -1, -1, -1, -1, -1, 77, -1, -1, -1, - 13, -1, -1, -1, 17, -1, -1, -1, -1, -1, - -1, -1, -1, 26, -1, 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, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, 77, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, 11, 12, 13, -1, -1, + 1, 76, 55, 29, 55, 7, 36, 29, 8, 7, + 7, 36, 55, 8, 61, 7, 31, 7, 17, 60, + 2, 29, 16, 60, 48, 60, 33, 7, 60, 8, + 36, 36, 17, 29, 7, 1, 48, 60, 29, 8, + 33, 29, 0, 29, 65, 85, 29, 8, 29, 33, + 2, 8, 7, 7, 29, 33, 76, 7, 29, 36, + 36, 33, 36, 2, 20, 33, 7, 5, 55, 5, + 5, 60, 1, 36, 8, 1, 29, 36, 29, 7, + 29, 85, -1, 8, 7, -1, 48, 7, 33, 36, + 36, 61, 36, 60, 36, 60, 33, 29, 10, 8, + 8, -1, 8, 36, 8, 48, 7, 8, 8, 7, + 7, 6, 76, -1, 29, 55, 76, 15, 40, 8, + 50, 40, 8, -1, 54, 20, 74, 8, 8, 51, + 61, 8, 51, 33, 61, 62, 33, 61, 62, 8, + 61, 62, 29, 55, 40, 29, 40, 61, 62, 36, + 42, 60, 8, 61, 60, 51, 60, 51, 61, 62, + 50, 53, 61, 62, 54, 8, 29, 12, 2, 84, + 56, 60, 8, 61, 62, 56, 56, 25, 29, 27, + 29, 12, 29, 60, 25, 8, 27, 15, -1, -1, + 38, 60, 25, 29, 27, -1, -1, 38, 61, 62, + 84, -1, 29, 29, 60, 38, 34, 56, 36, -1, + 61, 62, 57, -1, 61, 62, 12, 60, 63, -1, + 25, 25, 27, 27, 8, 15, 57, 8, 55, 55, + -1, -1, 63, 38, 38, 84, 29, -1, 61, 62, + 25, -1, 27, 25, 34, 27, 36, 25, 84, 27, + 25, -1, 27, 38, 15, -1, 38, 84, 84, -1, + 38, 57, -1, 38, 18, 19, -1, 63, 61, 62, + 18, 19, -1, 34, -1, 36, -1, 61, 62, -1, + 61, 62, 18, 19, 18, 19, -1, -1, -1, -1, + -1, 45, 46, 23, 24, -1, -1, 45, 46, -1, + -1, -1, 32, -1, -1, 35, -1, 37, -1, 45, + 46, 45, 46, -1, 23, 24, -1, -1, -1, -1, + -1, 23, 24, 32, -1, -1, 35, 25, 37, 27, + 32, -1, -1, 35, -1, 37, 23, 24, -1, -1, + 38, -1, -1, -1, 31, 32, 23, 24, 35, -1, + 37, -1, -1, -1, 31, 32, 23, 24, 35, -1, + 37, -1, -1, -1, 31, 32, 23, 24, 35, -1, + 37, -1, 3, -1, 31, 32, -1, -1, 35, -1, + 37, -1, 13, -1, 23, 24, 17, -1, -1, -1, + 23, 24, 31, 32, -1, 26, 35, 28, 37, 32, + -1, -1, 35, -1, 37, -1, -1, -1, 39, -1, + 41, 42, -1, -1, 3, -1, -1, -1, 49, -1, + -1, 52, 53, -1, 13, -1, -1, 58, 17, -1, + -1, -1, -1, 64, -1, -1, -1, 26, -1, 28, + -1, -1, -1, -1, -1, -1, 77, -1, -1, -1, + 39, -1, 41, 42, -1, 12, 13, -1, -1, -1, + 49, -1, -1, 52, 53, 22, -1, -1, -1, 58, + -1, -1, 29, -1, -1, 64, 33, 34, -1, 36, + -1, -1, -1, -1, -1, -1, 43, -1, 77, 3, + 47, -1, -1, -1, -1, -1, -1, -1, -1, 13, + -1, -1, -1, 17, -1, -1, -1, -1, 65, -1, + 67, -1, 26, -1, 28, -1, -1, 31, -1, -1, + -1, 78, 79, 80, -1, 39, -1, 41, 42, -1, + -1, 12, 13, -1, -1, 49, -1, -1, 52, 53, + -1, 22, -1, -1, 58, -1, -1, -1, 29, -1, + 64, -1, 33, 34, -1, 36, -1, -1, -1, -1, + -1, -1, 43, 77, -1, -1, 47, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, 65, -1, 67, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, 78, 79, 80, + -1, -1, -1, -1, -1, -1, -1, 11, 12, 13, + -1, -1, -1, -1, -1, -1, -1, -1, 22, -1, + -1, -1, -1, -1, -1, 29, -1, -1, -1, 33, + 34, -1, 36, -1, -1, -1, 40, -1, 42, 43, + 44, -1, -1, 47, -1, -1, -1, 51, -1, 53, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, 65, -1, 67, -1, 69, -1, 71, -1, 73, + -1, -1, -1, -1, 78, 79, 80, -1, -1, -1, + -1, -1, -1, -1, 11, 12, 13, -1, -1, -1, + -1, -1, -1, -1, -1, 22, -1, -1, -1, -1, + -1, -1, 29, -1, -1, -1, 33, 34, -1, 36, + -1, -1, -1, 40, -1, 42, 43, 44, -1, -1, + 47, -1, -1, -1, 51, -1, 53, -1, -1, 56, + -1, -1, -1, -1, -1, -1, -1, -1, 65, -1, + 67, -1, 69, -1, 71, -1, 73, -1, -1, -1, + -1, 78, 79, 80, -1, -1, -1, -1, -1, -1, + -1, 7, -1, -1, -1, 11, 12, 13, -1, -1, -1, -1, -1, -1, -1, -1, 22, -1, -1, -1, -1, -1, -1, 29, -1, -1, -1, 33, 34, -1, 36, -1, -1, -1, 40, -1, 42, 43, 44, -1, @@ -498,59 +528,60 @@ const int JavaScriptGrammar::action_check [] = { -1, -1, -1, 22, -1, -1, -1, -1, -1, -1, 29, -1, -1, -1, 33, 34, -1, 36, -1, -1, -1, 40, -1, 42, 43, 44, -1, -1, 47, -1, - -1, -1, 51, -1, 53, -1, -1, 56, -1, -1, + -1, -1, 51, -1, 53, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 65, -1, 67, -1, - 69, -1, 71, -1, 73, -1, -1, -1, -1, 78, - 79, 80, -1, -1, -1, -1, -1, -1, -1, 7, - -1, -1, -1, 11, 12, 13, -1, -1, -1, -1, - -1, -1, -1, -1, 22, -1, -1, -1, -1, -1, - -1, 29, -1, -1, -1, 33, 34, -1, 36, -1, - -1, -1, 40, -1, 42, 43, 44, -1, -1, 47, - -1, -1, -1, 51, -1, 53, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, 65, -1, 67, - -1, 69, -1, 71, -1, 73, -1, -1, -1, -1, - 78, 79, 80, -1, -1, -1, -1, -1, -1, -1, - 11, 12, 13, -1, -1, -1, -1, -1, -1, -1, - -1, 22, -1, -1, -1, -1, -1, -1, 29, -1, - -1, -1, 33, 34, -1, 36, -1, -1, -1, 40, - -1, 42, 43, 44, -1, -1, 47, -1, -1, -1, - 51, -1, 53, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, 65, -1, 67, -1, 69, -1, - 71, 72, 73, -1, -1, -1, -1, 78, 79, 80, - -1, -1, -1, -1, -1, -1, -1, 11, 12, 13, - -1, -1, -1, -1, -1, -1, -1, -1, 22, -1, - -1, -1, -1, -1, -1, 29, -1, -1, -1, 33, - 34, -1, 36, -1, -1, -1, 40, -1, 42, 43, - 44, -1, -1, 47, -1, -1, -1, 51, -1, 53, - -1, -1, 56, -1, -1, -1, -1, -1, -1, -1, - -1, 65, -1, 67, -1, 69, -1, 71, -1, 73, - -1, -1, -1, -1, 78, 79, 80, -1, -1, -1, + 69, -1, 71, 72, 73, -1, -1, -1, -1, 78, + 79, 80, -1, -1, -1, -1, -1, -1, -1, 11, + 12, 13, -1, -1, -1, -1, -1, -1, -1, -1, + 22, -1, -1, -1, -1, -1, -1, 29, -1, -1, + -1, 33, 34, -1, 36, -1, -1, -1, 40, -1, + 42, 43, 44, -1, -1, 47, -1, -1, -1, 51, + -1, 53, -1, -1, 56, -1, -1, -1, -1, -1, + -1, -1, -1, 65, -1, 67, -1, 69, -1, 71, + -1, 73, -1, -1, -1, -1, 78, 79, 80, -1, + -1, -1, -1, -1, -1, -1, 4, 5, 6, -1, + -1, 9, 10, 11, -1, -1, 14, -1, 16, -1, + -1, -1, 20, 21, 22, -1, -1, -1, -1, -1, + -1, 29, 30, 31, 32, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, 43, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, 59, -1, -1, -1, -1, -1, -1, 66, 67, + 68, -1, 70, 71, 72, 73, 74, 75, -1, -1, + 78, 79, 80, 81, 82, 83, -1, -1, -1, -1, + 4, 5, 6, -1, -1, 9, 10, 11, -1, -1, + 14, -1, 16, -1, -1, -1, 20, 21, 22, -1, + -1, -1, -1, -1, -1, 29, 30, 31, 32, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, 43, + -1, -1, -1, 47, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, 59, -1, -1, -1, -1, + -1, 65, 66, 67, 68, -1, 70, 71, 72, 73, + 74, 75, -1, -1, 78, 79, 80, 81, 82, 83, -1, -1, -1, -1, 4, 5, 6, -1, -1, 9, 10, 11, -1, -1, 14, -1, 16, -1, -1, -1, 20, 21, 22, -1, -1, -1, -1, -1, -1, 29, 30, 31, 32, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, 43, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, -1, 59, - -1, -1, -1, -1, -1, -1, 66, 67, 68, -1, + -1, -1, -1, 43, -1, -1, -1, 47, -1, -1, + -1, -1, -1, -1, -1, 55, -1, -1, -1, 59, + -1, -1, -1, -1, -1, 65, 66, 67, 68, -1, 70, 71, 72, 73, 74, 75, -1, -1, 78, 79, - 80, 81, 82, 83, -1, -1, -1, -1, 4, 5, - 6, -1, -1, 9, 10, 11, -1, -1, 14, -1, - 16, -1, -1, -1, 20, 21, 22, -1, -1, -1, - -1, -1, -1, 29, 30, 31, 32, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, 43, -1, -1, - -1, 47, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, 59, -1, -1, -1, -1, -1, 65, - 66, 67, 68, -1, 70, 71, 72, 73, 74, 75, - -1, -1, 78, 79, 80, 81, 82, 83, -1, -1, - -1, -1, 4, 5, 6, -1, -1, 9, 10, 11, - -1, -1, 14, -1, 16, -1, -1, -1, 20, 21, - 22, -1, -1, -1, -1, -1, -1, 29, 30, 31, - 32, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, 43, -1, -1, -1, 47, -1, -1, -1, -1, - -1, -1, -1, 55, -1, -1, -1, 59, -1, -1, - -1, -1, -1, 65, 66, 67, 68, -1, 70, 71, + 80, 81, 82, 83, -1, -1, -1, -1, 4, -1, + -1, -1, -1, 9, -1, 11, 12, 13, 14, -1, + -1, -1, -1, -1, -1, 21, 22, -1, -1, -1, + -1, -1, -1, 29, 30, -1, -1, 33, 34, -1, + 36, -1, -1, -1, 40, -1, 42, 43, 44, -1, + -1, 47, -1, -1, -1, 51, -1, 53, -1, -1, + -1, -1, -1, 59, -1, 61, -1, -1, -1, 65, + 66, 67, 68, 69, 70, 71, 72, 73, 74, 75, + -1, -1, 78, 79, 80, 81, 82, -1, -1, -1, + -1, -1, 4, -1, -1, -1, -1, 9, -1, 11, + 12, 13, 14, -1, -1, -1, -1, -1, -1, 21, + 22, -1, -1, -1, -1, -1, -1, 29, 30, -1, + -1, 33, 34, -1, 36, -1, -1, -1, 40, -1, + 42, 43, 44, -1, -1, 47, -1, -1, -1, 51, + -1, 53, -1, -1, -1, -1, -1, 59, -1, 61, + -1, -1, -1, 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, 75, -1, -1, 78, 79, 80, 81, - 82, 83, -1, -1, -1, -1, 4, -1, -1, -1, + 82, -1, -1, -1, -1, -1, 4, -1, -1, -1, -1, 9, -1, 11, 12, 13, 14, -1, -1, -1, -1, -1, -1, 21, 22, -1, -1, -1, -1, -1, -1, 29, 30, -1, -1, 33, 34, -1, 36, -1, @@ -559,62 +590,47 @@ const int JavaScriptGrammar::action_check [] = { -1, 59, -1, 61, -1, -1, -1, 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, 75, -1, -1, 78, 79, 80, 81, 82, -1, -1, -1, -1, -1, - 4, -1, -1, -1, -1, 9, -1, 11, 12, 13, - 14, -1, -1, -1, -1, -1, -1, 21, 22, -1, - -1, -1, -1, -1, -1, 29, 30, -1, -1, 33, + 4, 5, 6, -1, -1, 9, 10, 11, 12, 13, + 14, -1, 16, -1, -1, -1, 20, 21, 22, -1, + -1, -1, -1, -1, -1, 29, 30, 31, 32, 33, 34, -1, 36, -1, -1, -1, 40, -1, 42, 43, 44, -1, -1, 47, -1, -1, -1, 51, -1, 53, - -1, -1, -1, -1, -1, 59, -1, 61, -1, -1, + -1, 55, -1, -1, -1, 59, -1, 61, -1, -1, -1, 65, 66, 67, 68, 69, 70, 71, 72, 73, - 74, 75, -1, -1, 78, 79, 80, 81, 82, -1, - -1, -1, -1, -1, 4, -1, -1, -1, -1, 9, - -1, 11, 12, 13, 14, -1, -1, -1, -1, -1, - -1, 21, 22, -1, -1, -1, -1, -1, -1, 29, - 30, -1, -1, 33, 34, -1, 36, -1, -1, -1, - 40, -1, 42, 43, 44, -1, -1, 47, -1, -1, - -1, 51, -1, 53, -1, -1, -1, -1, -1, 59, - -1, 61, -1, -1, -1, 65, 66, 67, 68, 69, - 70, 71, 72, 73, 74, 75, -1, -1, 78, 79, - 80, 81, 82, -1, -1, -1, -1, -1, 4, 5, - 6, -1, -1, 9, 10, 11, 12, 13, 14, -1, - 16, -1, -1, -1, 20, 21, 22, -1, -1, -1, - -1, -1, -1, 29, 30, 31, 32, 33, 34, -1, - 36, -1, -1, -1, 40, -1, 42, 43, 44, -1, - -1, 47, -1, -1, -1, 51, -1, 53, -1, 55, - -1, -1, -1, 59, -1, 61, -1, -1, -1, 65, - 66, 67, 68, 69, 70, 71, 72, 73, 74, 75, - -1, -1, 78, 79, 80, 81, 82, 83, -1, -1, - -1, -1, + 74, 75, -1, -1, 78, 79, 80, 81, 82, 83, + -1, -1, -1, -1, - 69, 7, 16, 10, 6, 10, 2, 84, 81, 10, - 10, 2, 16, 54, 86, 10, 6, 16, 16, 12, - 73, 10, 10, 9, 16, 54, 9, 69, 6, 5, - 54, 10, 9, 50, 7, 10, 10, 9, 19, 88, - 10, 9, 54, 10, 9, 16, 10, 16, 10, 10, - 16, 9, 9, 16, 9, 75, 10, 9, 18, 9, - 16, 9, 9, 16, 9, -1, 10, 9, 27, -1, - -1, 10, 31, -1, -1, 10, 27, -1, 29, 10, - -1, 27, -1, -1, 27, 31, 27, 27, -1, 32, - 27, 27, 32, 21, 27, 32, 24, 27, 39, 32, - 27, 37, 32, 16, 27, 32, 27, 51, 31, 27, - 23, 29, 51, 27, 35, 29, 51, 27, 27, 27, - 51, 29, 32, 27, 27, 29, 29, 27, 27, 29, - 29, 27, 41, 27, 30, 29, 27, 27, 29, -1, - 30, 9, 27, 27, 89, 29, 27, 32, 29, 27, - 21, 29, 94, 24, 27, 27, -1, 27, 27, 32, - 29, 33, 32, 27, 16, 27, 27, 27, 32, 29, - 32, 23, 33, 27, 27, -1, 27, -1, 27, 27, - 33, 27, 33, 32, 32, 34, 32, 27, 27, 43, - 38, 27, 32, 32, 27, -1, 32, 36, -1, 32, - 40, 34, 27, 49, 27, 27, 42, 32, 27, 32, - 32, 34, 34, 32, 27, 27, 27, -1, -1, 32, - 32, 32, -1, -1, 49, -1, -1, -1, 19, 20, - 49, 44, -1, -1, -1, -1, -1, 49, 49, -1, - -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + 6, 81, 7, 10, 2, 84, 69, 9, 69, 10, + 10, 54, 54, 16, 2, 10, 10, 16, 73, 12, + 10, 10, 6, 10, 16, 16, 9, 54, 6, 86, + 16, 50, 9, 7, 10, 10, 9, 9, 19, 88, + 10, 9, 54, 10, 10, 16, 9, 16, 9, 75, + 10, 16, 16, 9, 9, -1, 10, 9, 9, 16, + 10, 9, 9, -1, 10, 18, 10, 16, 27, 10, + 10, -1, 9, 32, -1, 9, -1, -1, -1, -1, + 19, 20, 27, -1, 27, 27, 31, 29, 31, 27, + 5, 27, 27, 31, 27, 27, 32, 32, 27, 32, + 32, 27, 27, 27, 27, 51, 32, 51, 37, 33, + 51, 51, 35, 27, 39, 29, 27, 27, 29, 29, + 27, 27, 27, 29, 29, 32, 27, 21, 29, 27, + 24, 27, 30, 29, 27, 27, 29, 27, 30, 29, + 27, 27, 29, 29, 27, 27, 27, 29, 27, 32, + 21, 32, 89, 24, 33, 27, -1, 27, 27, 27, + 94, 29, 32, 32, 27, 27, 27, 27, 29, 32, + 16, 43, 27, 33, -1, 27, -1, 23, 33, 41, + 32, 16, 27, -1, 27, 27, 38, 32, 23, 32, + 32, 27, -1, -1, 27, 27, 32, 42, 40, 32, + 32, 34, 34, 27, 27, -1, 49, 27, 32, 32, + 34, -1, 32, 49, 27, 27, 36, -1, 27, 32, + 32, -1, 34, 32, -1, -1, 49, -1, -1, -1, + -1, -1, -1, -1, -1, -1, 49, -1, -1, -1, + 49, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, 27, -1, -1, -1, -1, 32, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, 44, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1}; + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1}; diff --git a/src/declarative/qml/parser/javascriptgrammar_p.h b/src/declarative/qml/parser/javascriptgrammar_p.h index 6f2debf..12c2566 100644 --- a/src/declarative/qml/parser/javascriptgrammar_p.h +++ b/src/declarative/qml/parser/javascriptgrammar_p.h @@ -96,14 +96,14 @@ public: T_XOR_EQ = 77, ACCEPT_STATE = 7, - RULE_COUNT = 288, - STATE_COUNT = 503, + RULE_COUNT = 289, + STATE_COUNT = 504, TERMINAL_COUNT = 88, NON_TERMINAL_COUNT = 96, - GOTO_INDEX_OFFSET = 503, - GOTO_INFO_OFFSET = 1522, - GOTO_CHECK_OFFSET = 1522 + GOTO_INDEX_OFFSET = 504, + GOTO_INFO_OFFSET = 1584, + GOTO_CHECK_OFFSET = 1584 }; static const char *const spell []; diff --git a/src/declarative/qml/parser/javascriptparser.cpp b/src/declarative/qml/parser/javascriptparser.cpp index adcd8a3..b91ff5b 100644 --- a/src/declarative/qml/parser/javascriptparser.cpp +++ b/src/declarative/qml/parser/javascriptparser.cpp @@ -202,13 +202,20 @@ case 9: { } break; case 10: { + AST::UiObjectInitializer *node = makeAstNode<AST::UiObjectInitializer> (driver->nodePool(), (AST::UiObjectMemberList*)0); + node->lbraceToken = loc(1); + node->rbraceToken = loc(2); + sym(1).Node = node; +} break; + +case 11: { AST::UiObjectInitializer *node = makeAstNode<AST::UiObjectInitializer> (driver->nodePool(), sym(2).UiObjectMemberList->finish()); node->lbraceToken = loc(1); node->rbraceToken = loc(3); sym(1).Node = node; } break; -case 11: { +case 12: { AST::UiObjectBinding *node = makeAstNode<AST::UiObjectBinding> (driver->nodePool(), sym(1).UiQualifiedId->finish(), sym(3).sval, sym(4).UiObjectInitializer); node->colonToken = loc(2); @@ -216,14 +223,14 @@ case 11: { sym(1).Node = node; } break; -case 12: { +case 13: { AST::UiObjectDefinition *node = makeAstNode<AST::UiObjectDefinition> (driver->nodePool(), sym(1).sval, sym(2).UiObjectInitializer); node->identifierToken = loc(1); sym(1).Node = node; } break; -case 13: { +case 14: { AST::UiArrayBinding *node = makeAstNode<AST::UiArrayBinding> (driver->nodePool(), sym(1).UiQualifiedId->finish(), sym(4).UiObjectMemberList->finish()); node->colonToken = loc(2); @@ -232,14 +239,14 @@ case 13: { sym(1).Node = node; } break; -case 14: { +case 15: { AST::UiScriptBinding *node = makeAstNode<AST::UiScriptBinding> (driver->nodePool(), sym(1).UiQualifiedId->finish(), sym(3).Statement); node->colonToken = loc(2); sym(1).Node = node; } break; -case 15: { +case 16: { AST::UiPublicMember *node = makeAstNode<AST::UiPublicMember> (driver->nodePool(), sym(2).sval, sym(3).sval, sym(5).Expression, sym(6).UiObjectInitializer); node->publicToken = loc(1); @@ -249,7 +256,7 @@ case 15: { sym(1).Node = node; } break; -case 16: { +case 17: { AST::UiPublicMember *node = makeAstNode<AST::UiPublicMember> (driver->nodePool(), sym(2).sval, sym(3).sval); node->publicToken = loc(1); node->attributeTypeToken = loc(2); @@ -257,7 +264,7 @@ case 16: { sym(1).Node = node; } break; -case 17: { +case 18: { AST::UiPublicMember *node = makeAstNode<AST::UiPublicMember> (driver->nodePool(), sym(2).sval, sym(3).sval, sym(5).Expression, static_cast<AST::UiObjectInitializer *>(0)); node->publicToken = loc(1); @@ -267,61 +274,61 @@ case 17: { sym(1).Node = node; } break; -case 18: { +case 19: { AST::UiQualifiedId *node = makeAstNode<AST::UiQualifiedId> (driver->nodePool(), sym(1).sval); node->identifierToken = loc(1); sym(1).Node = node; } break; -case 19: { +case 20: { AST::UiQualifiedId *node = makeAstNode<AST::UiQualifiedId> (driver->nodePool(), sym(1).UiQualifiedId, sym(3).sval); node->identifierToken = loc(3); sym(1).Node = node; } break; -case 20: { +case 21: { AST::ThisExpression *node = makeAstNode<AST::ThisExpression> (driver->nodePool()); node->thisToken = loc(1); sym(1).Node = node; } break; -case 21: { +case 22: { AST::IdentifierExpression *node = makeAstNode<AST::IdentifierExpression> (driver->nodePool(), sym(1).sval); node->identifierToken = loc(1); sym(1).Node = node; } break; -case 22: { +case 23: { AST::NullExpression *node = makeAstNode<AST::NullExpression> (driver->nodePool()); node->nullToken = loc(1); sym(1).Node = node; } break; -case 23: { +case 24: { AST::TrueLiteral *node = makeAstNode<AST::TrueLiteral> (driver->nodePool()); node->trueToken = loc(1); sym(1).Node = node; } break; -case 24: { +case 25: { AST::FalseLiteral *node = makeAstNode<AST::FalseLiteral> (driver->nodePool()); node->falseToken = loc(1); sym(1).Node = node; } break; -case 25: { +case 26: { AST::NumericLiteral *node = makeAstNode<AST::NumericLiteral> (driver->nodePool(), sym(1).dval); node->literalToken = loc(1); sym(1).Node = node; } break; -case 26: { +case 27: { AST::StringLiteral *node = makeAstNode<AST::StringLiteral> (driver->nodePool(), sym(1).sval); node->literalToken = loc(1); sym(1).Node = node; } break; -case 27: { +case 28: { bool rx = lexer->scanRegExp(Lexer::NoPrefix); if (!rx) { diagnostic_messages.append(DiagnosticMessage(DiagnosticMessage::Error, lexer->startLineNo(), @@ -333,7 +340,7 @@ case 27: { sym(1).Node = node; } break; -case 28: { +case 29: { bool rx = lexer->scanRegExp(Lexer::EqualPrefix); if (!rx) { diagnostic_messages.append(DiagnosticMessage(DiagnosticMessage::Error, lexer->startLineNo(), @@ -345,83 +352,81 @@ case 28: { sym(1).Node = node; } break; -case 29: { +case 30: { sym(1).Node = makeAstNode<AST::ArrayLiteral> (driver->nodePool(), sym(2).Elision); } break; -case 30: { +case 31: { sym(1).Node = makeAstNode<AST::ArrayLiteral> (driver->nodePool(), sym(2).ElementList->finish ()); } break; -case 31: { +case 32: { sym(1).Node = makeAstNode<AST::ArrayLiteral> (driver->nodePool(), sym(2).ElementList->finish (), sym(4).Elision); } break; -case 32: { +case 33: { if (sym(2).Node) sym(1).Node = makeAstNode<AST::ObjectLiteral> (driver->nodePool(), sym(2).PropertyNameAndValueList->finish ()); else sym(1).Node = makeAstNode<AST::ObjectLiteral> (driver->nodePool()); } break; -case 33: { +case 34: { sym(1).Node = makeAstNode<AST::ObjectLiteral> (driver->nodePool(), sym(2).PropertyNameAndValueList->finish ()); } break; -case 34: { +case 35: { sym(1) = sym(2); } break; -case 35: { +case 36: { sym(1).Node = makeAstNode<AST::ElementList> (driver->nodePool(), sym(1).Elision, sym(2).Expression); } break; -case 36: { +case 37: { sym(1).Node = makeAstNode<AST::ElementList> (driver->nodePool(), sym(1).ElementList, sym(3).Elision, sym(4).Expression); } break; -case 37: { +case 38: { sym(1).Node = makeAstNode<AST::Elision> (driver->nodePool()); } break; -case 38: { +case 39: { sym(1).Node = makeAstNode<AST::Elision> (driver->nodePool(), sym(1).Elision); } break; -case 39: { +case 40: { sym(1).Node = 0; } break; -case 40: { +case 41: { sym(1).Elision = sym(1).Elision->finish (); } break; -case 41: { +case 42: { sym(1).Node = makeAstNode<AST::PropertyNameAndValueList> (driver->nodePool(), sym(1).PropertyName, sym(3).Expression); } break; -case 42: { +case 43: { sym(1).Node = makeAstNode<AST::PropertyNameAndValueList> (driver->nodePool(), sym(1).PropertyNameAndValueList, sym(3).PropertyName, sym(5).Expression); } break; -case 43: { +case 44: { sym(1).Node = makeAstNode<AST::IdentifierPropertyName> (driver->nodePool(), sym(1).sval); } break; -case 44: { +case 45: { sym(1).Node = makeAstNode<AST::StringLiteralPropertyName> (driver->nodePool(), sym(1).sval); } break; -case 45: { +case 46: { sym(1).Node = makeAstNode<AST::NumericLiteralPropertyName> (driver->nodePool(), sym(1).dval); } break; -case 46: { +case 47: { sym(1).Node = makeAstNode<AST::IdentifierPropertyName> (driver->nodePool(), sym(1).sval); } break; -case 47: - case 48: case 49: @@ -481,22 +486,24 @@ case 75: case 76: case 77: + +case 78: { sym(1).sval = driver->intern(lexer->characterBuffer(), lexer->characterCount()); } break; -case 82: { +case 83: { sym(1).Node = makeAstNode<AST::ArrayMemberExpression> (driver->nodePool(), sym(1).Expression, sym(3).Expression); } break; -case 83: { +case 84: { AST::FieldMemberExpression *node = makeAstNode<AST::FieldMemberExpression> (driver->nodePool(), sym(1).Expression, sym(3).sval); node->dotToken = loc(2); node->identifierToken = loc(3); sym(1).Node = node; } break; -case 84: { +case 85: { AST::NewMemberExpression *node = makeAstNode<AST::NewMemberExpression> (driver->nodePool(), sym(2).Expression, sym(4).ArgumentList); node->newToken = loc(1); node->lparenToken = loc(3); @@ -504,541 +511,541 @@ case 84: { sym(1).Node = node; } break; -case 86: { +case 87: { AST::NewExpression *node = makeAstNode<AST::NewExpression> (driver->nodePool(), sym(2).Expression); node->newToken = loc(1); sym(1).Node = node; } break; -case 87: { +case 88: { AST::CallExpression *node = makeAstNode<AST::CallExpression> (driver->nodePool(), sym(1).Expression, sym(3).ArgumentList); node->lparenToken = loc(2); node->rparenToken = loc(4); sym(1).Node = node; } break; -case 88: { +case 89: { AST::CallExpression *node = makeAstNode<AST::CallExpression> (driver->nodePool(), sym(1).Expression, sym(3).ArgumentList); node->lparenToken = loc(2); node->rparenToken = loc(4); sym(1).Node = node; } break; -case 89: { +case 90: { sym(1).Node = makeAstNode<AST::ArrayMemberExpression> (driver->nodePool(), sym(1).Expression, sym(3).Expression); } break; -case 90: { +case 91: { AST::FieldMemberExpression *node = makeAstNode<AST::FieldMemberExpression> (driver->nodePool(), sym(1).Expression, sym(3).sval); node->dotToken = loc(2); node->identifierToken = loc(3); sym(1).Node = node; } break; -case 91: { +case 92: { sym(1).Node = 0; } break; -case 92: { +case 93: { sym(1).Node = sym(1).ArgumentList->finish(); } break; -case 93: { +case 94: { sym(1).Node = makeAstNode<AST::ArgumentList> (driver->nodePool(), sym(1).Expression); } break; -case 94: { +case 95: { AST::ArgumentList *node = makeAstNode<AST::ArgumentList> (driver->nodePool(), sym(1).ArgumentList, sym(3).Expression); node->commaToken = loc(2); sym(1).Node = node; } break; -case 98: { +case 99: { sym(1).Node = makeAstNode<AST::PostIncrementExpression> (driver->nodePool(), sym(1).Expression); } break; -case 99: { +case 100: { sym(1).Node = makeAstNode<AST::PostDecrementExpression> (driver->nodePool(), sym(1).Expression); } break; -case 101: { +case 102: { sym(1).Node = makeAstNode<AST::DeleteExpression> (driver->nodePool(), sym(2).Expression); } break; -case 102: { +case 103: { sym(1).Node = makeAstNode<AST::VoidExpression> (driver->nodePool(), sym(2).Expression); } break; -case 103: { +case 104: { sym(1).Node = makeAstNode<AST::TypeOfExpression> (driver->nodePool(), sym(2).Expression); } break; -case 104: { +case 105: { sym(1).Node = makeAstNode<AST::PreIncrementExpression> (driver->nodePool(), sym(2).Expression); } break; -case 105: { +case 106: { sym(1).Node = makeAstNode<AST::PreDecrementExpression> (driver->nodePool(), sym(2).Expression); } break; -case 106: { +case 107: { sym(1).Node = makeAstNode<AST::UnaryPlusExpression> (driver->nodePool(), sym(2).Expression); } break; -case 107: { +case 108: { sym(1).Node = makeAstNode<AST::UnaryMinusExpression> (driver->nodePool(), sym(2).Expression); } break; -case 108: { +case 109: { sym(1).Node = makeAstNode<AST::TildeExpression> (driver->nodePool(), sym(2).Expression); } break; -case 109: { +case 110: { sym(1).Node = makeAstNode<AST::NotExpression> (driver->nodePool(), sym(2).Expression); } break; -case 111: { +case 112: { sym(1).Node = makeAstNode<AST::BinaryExpression> (driver->nodePool(), sym(1).Expression, QSOperator::Mul, sym(3).Expression); } break; -case 112: { +case 113: { sym(1).Node = makeAstNode<AST::BinaryExpression> (driver->nodePool(), sym(1).Expression, QSOperator::Div, sym(3).Expression); } break; -case 113: { +case 114: { sym(1).Node = makeAstNode<AST::BinaryExpression> (driver->nodePool(), sym(1).Expression, QSOperator::Mod, sym(3).Expression); } break; -case 115: { +case 116: { sym(1).Node = makeAstNode<AST::BinaryExpression> (driver->nodePool(), sym(1).Expression, QSOperator::Add, sym(3).Expression); } break; -case 116: { +case 117: { sym(1).Node = makeAstNode<AST::BinaryExpression> (driver->nodePool(), sym(1).Expression, QSOperator::Sub, sym(3).Expression); } break; -case 118: { +case 119: { sym(1).Node = makeAstNode<AST::BinaryExpression> (driver->nodePool(), sym(1).Expression, QSOperator::LShift, sym(3).Expression); } break; -case 119: { +case 120: { sym(1).Node = makeAstNode<AST::BinaryExpression> (driver->nodePool(), sym(1).Expression, QSOperator::RShift, sym(3).Expression); } break; -case 120: { +case 121: { sym(1).Node = makeAstNode<AST::BinaryExpression> (driver->nodePool(), sym(1).Expression, QSOperator::URShift, sym(3).Expression); } break; -case 122: { +case 123: { sym(1).Node = makeAstNode<AST::BinaryExpression> (driver->nodePool(), sym(1).Expression, QSOperator::Lt, sym(3).Expression); } break; -case 123: { +case 124: { sym(1).Node = makeAstNode<AST::BinaryExpression> (driver->nodePool(), sym(1).Expression, QSOperator::Gt, sym(3).Expression); } break; -case 124: { +case 125: { sym(1).Node = makeAstNode<AST::BinaryExpression> (driver->nodePool(), sym(1).Expression, QSOperator::Le, sym(3).Expression); } break; -case 125: { +case 126: { sym(1).Node = makeAstNode<AST::BinaryExpression> (driver->nodePool(), sym(1).Expression, QSOperator::Ge, sym(3).Expression); } break; -case 126: { +case 127: { sym(1).Node = makeAstNode<AST::BinaryExpression> (driver->nodePool(), sym(1).Expression, QSOperator::InstanceOf, sym(3).Expression); } break; -case 127: { +case 128: { sym(1).Node = makeAstNode<AST::BinaryExpression> (driver->nodePool(), sym(1).Expression, QSOperator::In, sym(3).Expression); } break; -case 129: { +case 130: { sym(1).Node = makeAstNode<AST::BinaryExpression> (driver->nodePool(), sym(1).Expression, QSOperator::Lt, sym(3).Expression); } break; -case 130: { +case 131: { sym(1).Node = makeAstNode<AST::BinaryExpression> (driver->nodePool(), sym(1).Expression, QSOperator::Gt, sym(3).Expression); } break; -case 131: { +case 132: { sym(1).Node = makeAstNode<AST::BinaryExpression> (driver->nodePool(), sym(1).Expression, QSOperator::Le, sym(3).Expression); } break; -case 132: { +case 133: { sym(1).Node = makeAstNode<AST::BinaryExpression> (driver->nodePool(), sym(1).Expression, QSOperator::Ge, sym(3).Expression); } break; -case 133: { +case 134: { sym(1).Node = makeAstNode<AST::BinaryExpression> (driver->nodePool(), sym(1).Expression, QSOperator::InstanceOf, sym(3).Expression); } break; -case 135: { +case 136: { sym(1).Node = makeAstNode<AST::BinaryExpression> (driver->nodePool(), sym(1).Expression, QSOperator::Equal, sym(3).Expression); } break; -case 136: { +case 137: { sym(1).Node = makeAstNode<AST::BinaryExpression> (driver->nodePool(), sym(1).Expression, QSOperator::NotEqual, sym(3).Expression); } break; -case 137: { +case 138: { sym(1).Node = makeAstNode<AST::BinaryExpression> (driver->nodePool(), sym(1).Expression, QSOperator::StrictEqual, sym(3).Expression); } break; -case 138: { +case 139: { sym(1).Node = makeAstNode<AST::BinaryExpression> (driver->nodePool(), sym(1).Expression, QSOperator::StrictNotEqual, sym(3).Expression); } break; -case 140: { +case 141: { sym(1).Node = makeAstNode<AST::BinaryExpression> (driver->nodePool(), sym(1).Expression, QSOperator::Equal, sym(3).Expression); } break; -case 141: { +case 142: { sym(1).Node = makeAstNode<AST::BinaryExpression> (driver->nodePool(), sym(1).Expression, QSOperator::NotEqual, sym(3).Expression); } break; -case 142: { +case 143: { sym(1).Node = makeAstNode<AST::BinaryExpression> (driver->nodePool(), sym(1).Expression, QSOperator::StrictEqual, sym(3).Expression); } break; -case 143: { +case 144: { sym(1).Node = makeAstNode<AST::BinaryExpression> (driver->nodePool(), sym(1).Expression, QSOperator::StrictNotEqual, sym(3).Expression); } break; -case 145: { +case 146: { sym(1).Node = makeAstNode<AST::BinaryExpression> (driver->nodePool(), sym(1).Expression, QSOperator::BitAnd, sym(3).Expression); } break; -case 147: { +case 148: { sym(1).Node = makeAstNode<AST::BinaryExpression> (driver->nodePool(), sym(1).Expression, QSOperator::BitAnd, sym(3).Expression); } break; -case 149: { +case 150: { sym(1).Node = makeAstNode<AST::BinaryExpression> (driver->nodePool(), sym(1).Expression, QSOperator::BitXor, sym(3).Expression); } break; -case 151: { +case 152: { sym(1).Node = makeAstNode<AST::BinaryExpression> (driver->nodePool(), sym(1).Expression, QSOperator::BitXor, sym(3).Expression); } break; -case 153: { +case 154: { sym(1).Node = makeAstNode<AST::BinaryExpression> (driver->nodePool(), sym(1).Expression, QSOperator::BitOr, sym(3).Expression); } break; -case 155: { +case 156: { sym(1).Node = makeAstNode<AST::BinaryExpression> (driver->nodePool(), sym(1).Expression, QSOperator::BitOr, sym(3).Expression); } break; -case 157: { +case 158: { sym(1).Node = makeAstNode<AST::BinaryExpression> (driver->nodePool(), sym(1).Expression, QSOperator::And, sym(3).Expression); } break; -case 159: { +case 160: { sym(1).Node = makeAstNode<AST::BinaryExpression> (driver->nodePool(), sym(1).Expression, QSOperator::And, sym(3).Expression); } break; -case 161: { +case 162: { sym(1).Node = makeAstNode<AST::BinaryExpression> (driver->nodePool(), sym(1).Expression, QSOperator::Or, sym(3).Expression); } break; -case 163: { +case 164: { sym(1).Node = makeAstNode<AST::BinaryExpression> (driver->nodePool(), sym(1).Expression, QSOperator::Or, sym(3).Expression); } break; -case 165: { +case 166: { sym(1).Node = makeAstNode<AST::ConditionalExpression> (driver->nodePool(), sym(1).Expression, sym(3).Expression, sym(5).Expression); } break; -case 167: { +case 168: { sym(1).Node = makeAstNode<AST::ConditionalExpression> (driver->nodePool(), sym(1).Expression, sym(3).Expression, sym(5).Expression); } break; -case 169: { +case 170: { sym(1).Node = makeAstNode<AST::BinaryExpression> (driver->nodePool(), sym(1).Expression, sym(2).ival, sym(3).Expression); } break; -case 171: { +case 172: { sym(1).Node = makeAstNode<AST::BinaryExpression> (driver->nodePool(), sym(1).Expression, sym(2).ival, sym(3).Expression); } break; -case 172: { +case 173: { sym(1).ival = QSOperator::Assign; } break; -case 173: { +case 174: { sym(1).ival = QSOperator::InplaceMul; } break; -case 174: { +case 175: { sym(1).ival = QSOperator::InplaceDiv; } break; -case 175: { +case 176: { sym(1).ival = QSOperator::InplaceMod; } break; -case 176: { +case 177: { sym(1).ival = QSOperator::InplaceAdd; } break; -case 177: { +case 178: { sym(1).ival = QSOperator::InplaceSub; } break; -case 178: { +case 179: { sym(1).ival = QSOperator::InplaceLeftShift; } break; -case 179: { +case 180: { sym(1).ival = QSOperator::InplaceRightShift; } break; -case 180: { +case 181: { sym(1).ival = QSOperator::InplaceURightShift; } break; -case 181: { +case 182: { sym(1).ival = QSOperator::InplaceAnd; } break; -case 182: { +case 183: { sym(1).ival = QSOperator::InplaceXor; } break; -case 183: { +case 184: { sym(1).ival = QSOperator::InplaceOr; } break; -case 185: { +case 186: { sym(1).Node = makeAstNode<AST::Expression> (driver->nodePool(), sym(1).Expression, sym(3).Expression); } break; -case 186: { +case 187: { sym(1).Node = 0; } break; -case 189: { +case 190: { sym(1).Node = makeAstNode<AST::Expression> (driver->nodePool(), sym(1).Expression, sym(3).Expression); } break; -case 190: { +case 191: { sym(1).Node = 0; } break; -case 207: { +case 208: { sym(1).Node = makeAstNode<AST::Block> (driver->nodePool(), sym(2).StatementList); } break; -case 208: { +case 209: { sym(1).Node = makeAstNode<AST::StatementList> (driver->nodePool(), sym(1).Statement); } break; -case 209: { +case 210: { sym(1).Node = makeAstNode<AST::StatementList> (driver->nodePool(), sym(1).StatementList, sym(2).Statement); } break; -case 210: { +case 211: { sym(1).Node = 0; } break; -case 211: { +case 212: { sym(1).Node = sym(1).StatementList->finish (); } break; -case 213: { +case 214: { AST::VariableStatement *node = makeAstNode<AST::VariableStatement> (driver->nodePool(), sym(2).VariableDeclarationList->finish (/*readOnly=*/sym(1).ival == T_CONST)); node->declarationKindToken = loc(1); node->semicolonToken = loc(3); sym(1).Node = node; } break; -case 214: { +case 215: { sym(1).ival = T_CONST; } break; -case 215: { +case 216: { sym(1).ival = T_VAR; } break; -case 216: { +case 217: { sym(1).Node = makeAstNode<AST::VariableDeclarationList> (driver->nodePool(), sym(1).VariableDeclaration); } break; -case 217: { +case 218: { sym(1).Node = makeAstNode<AST::VariableDeclarationList> (driver->nodePool(), sym(1).VariableDeclarationList, sym(3).VariableDeclaration); } break; -case 218: { +case 219: { sym(1).Node = makeAstNode<AST::VariableDeclarationList> (driver->nodePool(), sym(1).VariableDeclaration); } break; -case 219: { +case 220: { sym(1).Node = makeAstNode<AST::VariableDeclarationList> (driver->nodePool(), sym(1).VariableDeclarationList, sym(3).VariableDeclaration); } break; -case 220: { +case 221: { AST::VariableDeclaration *node = makeAstNode<AST::VariableDeclaration> (driver->nodePool(), sym(1).sval, sym(2).Expression); node->identifierToken = loc(1); sym(1).Node = node; } break; -case 221: { +case 222: { AST::VariableDeclaration *node = makeAstNode<AST::VariableDeclaration> (driver->nodePool(), sym(1).sval, sym(2).Expression); node->identifierToken = loc(1); sym(1).Node = node; } break; -case 222: { +case 223: { sym(1) = sym(2); } break; -case 223: { +case 224: { sym(1).Node = 0; } break; -case 225: { +case 226: { sym(1) = sym(2); } break; -case 226: { +case 227: { sym(1).Node = 0; } break; -case 228: { +case 229: { sym(1).Node = makeAstNode<AST::EmptyStatement> (driver->nodePool()); } break; -case 230: { +case 231: { AST::ExpressionStatement *node = makeAstNode<AST::ExpressionStatement> (driver->nodePool(), sym(1).Expression); node->semicolonToken = loc(2); sym(1).Node = node; } break; -case 231: { +case 232: { sym(1).Node = makeAstNode<AST::IfStatement> (driver->nodePool(), sym(3).Expression, sym(5).Statement, sym(7).Statement); } break; -case 232: { +case 233: { sym(1).Node = makeAstNode<AST::IfStatement> (driver->nodePool(), sym(3).Expression, sym(5).Statement); } break; -case 234: { +case 235: { sym(1).Node = makeAstNode<AST::DoWhileStatement> (driver->nodePool(), sym(2).Statement, sym(5).Expression); } break; -case 235: { +case 236: { sym(1).Node = makeAstNode<AST::WhileStatement> (driver->nodePool(), sym(3).Expression, sym(5).Statement); } break; -case 236: { +case 237: { sym(1).Node = makeAstNode<AST::ForStatement> (driver->nodePool(), sym(3).Expression, sym(5).Expression, sym(7).Expression, sym(9).Statement); } break; -case 237: { +case 238: { sym(1).Node = makeAstNode<AST::LocalForStatement> (driver->nodePool(), sym(4).VariableDeclarationList->finish (/*readOnly=*/false), sym(6).Expression, sym(8).Expression, sym(10).Statement); } break; -case 238: { +case 239: { sym(1).Node = makeAstNode<AST::ForEachStatement> (driver->nodePool(), sym(3).Expression, sym(5).Expression, sym(7).Statement); } break; -case 239: { +case 240: { sym(1).Node = makeAstNode<AST::LocalForEachStatement> (driver->nodePool(), sym(4).VariableDeclaration, sym(6).Expression, sym(8).Statement); } break; -case 241: { +case 242: { sym(1).Node = makeAstNode<AST::ContinueStatement> (driver->nodePool()); } break; -case 243: { +case 244: { sym(1).Node = makeAstNode<AST::ContinueStatement> (driver->nodePool(), sym(2).sval); } break; -case 245: { +case 246: { sym(1).Node = makeAstNode<AST::BreakStatement> (driver->nodePool()); } break; -case 247: { +case 248: { sym(1).Node = makeAstNode<AST::BreakStatement> (driver->nodePool(), sym(2).sval); } break; -case 249: { +case 250: { sym(1).Node = makeAstNode<AST::ReturnStatement> (driver->nodePool(), sym(2).Expression); } break; -case 250: { +case 251: { sym(1).Node = makeAstNode<AST::WithStatement> (driver->nodePool(), sym(3).Expression, sym(5).Statement); } break; -case 251: { +case 252: { sym(1).Node = makeAstNode<AST::SwitchStatement> (driver->nodePool(), sym(3).Expression, sym(5).CaseBlock); } break; -case 252: { +case 253: { sym(1).Node = makeAstNode<AST::CaseBlock> (driver->nodePool(), sym(2).CaseClauses); } break; -case 253: { +case 254: { sym(1).Node = makeAstNode<AST::CaseBlock> (driver->nodePool(), sym(2).CaseClauses, sym(3).DefaultClause, sym(4).CaseClauses); } break; -case 254: { +case 255: { sym(1).Node = makeAstNode<AST::CaseClauses> (driver->nodePool(), sym(1).CaseClause); } break; -case 255: { +case 256: { sym(1).Node = makeAstNode<AST::CaseClauses> (driver->nodePool(), sym(1).CaseClauses, sym(2).CaseClause); } break; -case 256: { +case 257: { sym(1).Node = 0; } break; -case 257: { +case 258: { sym(1).Node = sym(1).CaseClauses->finish (); } break; -case 258: { +case 259: { sym(1).Node = makeAstNode<AST::CaseClause> (driver->nodePool(), sym(2).Expression, sym(4).StatementList); } break; -case 259: { +case 260: { sym(1).Node = makeAstNode<AST::DefaultClause> (driver->nodePool(), sym(3).StatementList); } break; -case 260: { +case 261: { sym(1).Node = makeAstNode<AST::LabelledStatement> (driver->nodePool(), sym(1).sval, sym(3).Statement); } break; -case 262: { +case 263: { sym(1).Node = makeAstNode<AST::ThrowStatement> (driver->nodePool(), sym(2).Expression); } break; -case 263: { +case 264: { sym(1).Node = makeAstNode<AST::TryStatement> (driver->nodePool(), sym(2).Statement, sym(3).Catch); } break; -case 264: { +case 265: { sym(1).Node = makeAstNode<AST::TryStatement> (driver->nodePool(), sym(2).Statement, sym(3).Finally); } break; -case 265: { +case 266: { sym(1).Node = makeAstNode<AST::TryStatement> (driver->nodePool(), sym(2).Statement, sym(3).Catch, sym(4).Finally); } break; -case 266: { +case 267: { sym(1).Node = makeAstNode<AST::Catch> (driver->nodePool(), sym(3).sval, sym(5).Statement); } break; -case 267: { +case 268: { sym(1).Node = makeAstNode<AST::Finally> (driver->nodePool(), sym(2).Statement); } break; -case 269: { +case 270: { sym(1).Node = makeAstNode<AST::DebuggerStatement> (driver->nodePool()); } break; -case 270: { +case 271: { AST::FunctionDeclaration *node = makeAstNode<AST::FunctionDeclaration> (driver->nodePool(), sym(2).sval, sym(4).FormalParameterList, sym(7).FunctionBody); node->functionToken = loc(1); node->identifierToken = loc(2); @@ -1049,7 +1056,7 @@ case 270: { sym(1).Node = node; } break; -case 271: { +case 272: { AST::FunctionExpression *node = makeAstNode<AST::FunctionExpression> (driver->nodePool(), sym(2).sval, sym(4).FormalParameterList, sym(7).FunctionBody); node->functionToken = loc(1); if (sym(2).sval) @@ -1061,56 +1068,56 @@ case 271: { sym(1).Node = node; } break; -case 272: { +case 273: { AST::FormalParameterList *node = makeAstNode<AST::FormalParameterList> (driver->nodePool(), sym(1).sval); node->identifierToken = loc(1); sym(1).Node = node; } break; -case 273: { +case 274: { AST::FormalParameterList *node = makeAstNode<AST::FormalParameterList> (driver->nodePool(), sym(1).FormalParameterList, sym(3).sval); node->commaToken = loc(2); node->identifierToken = loc(3); sym(1).Node = node; } break; -case 274: { +case 275: { sym(1).Node = 0; } break; -case 275: { +case 276: { sym(1).Node = sym(1).FormalParameterList->finish (); } break; -case 276: { +case 277: { sym(1).Node = 0; } break; -case 278: { +case 279: { sym(1).Node = makeAstNode<AST::FunctionBody> (driver->nodePool(), sym(1).SourceElements->finish ()); } break; -case 279: { +case 280: { sym(1).Node = makeAstNode<AST::SourceElements> (driver->nodePool(), sym(1).SourceElement); } break; -case 280: { +case 281: { sym(1).Node = makeAstNode<AST::SourceElements> (driver->nodePool(), sym(1).SourceElements, sym(2).SourceElement); } break; -case 281: { +case 282: { sym(1).Node = makeAstNode<AST::StatementSourceElement> (driver->nodePool(), sym(1).Statement); } break; -case 282: { +case 283: { sym(1).Node = makeAstNode<AST::FunctionSourceElement> (driver->nodePool(), sym(1).FunctionDeclaration); } break; -case 283: { +case 284: { sym(1).sval = 0; } break; -case 285: { +case 286: { sym(1).Node = 0; } break; @@ -1156,7 +1163,7 @@ case 285: { token_buffer[1].loc = yylloc = location(lexer); if (t_action(errorState, yytoken)) { - const QString msg = QString::fromUtf8("Removed token: `%1'").arg(spell[token_buffer[0].token]); + const QString msg = QString::fromUtf8("Removed token: `%1'").arg(QLatin1String(spell[token_buffer[0].token])); diagnostic_messages.append(DiagnosticMessage(DiagnosticMessage::Error, token_buffer[0].loc.startLine, token_buffer[0].loc.startColumn, msg)); @@ -1186,7 +1193,7 @@ case 285: { for (int *tk = tokens; *tk != EOF_SYMBOL; ++tk) { int a = t_action(errorState, *tk); if (a > 0 && t_action(a, yytoken)) { - const QString msg = QString::fromUtf8("Inserted token: `%1'").arg(spell[*tk]); + const QString msg = QString::fromUtf8("Inserted token: `%1'").arg(QLatin1String(spell[*tk])); diagnostic_messages.append(DiagnosticMessage(DiagnosticMessage::Error, token_buffer[0].loc.startLine, token_buffer[0].loc.startColumn, msg)); @@ -1206,7 +1213,7 @@ case 285: { for (int tk = 1; tk < TERMINAL_COUNT; ++tk) { int a = t_action(errorState, tk); if (a > 0 && t_action(a, yytoken)) { - const QString msg = QString::fromUtf8("Inserted token: `%1'").arg(spell[tk]); + const QString msg = QString::fromUtf8("Inserted token: `%1'").arg(QLatin1String(spell[tk])); diagnostic_messages.append(DiagnosticMessage(DiagnosticMessage::Error, token_buffer[0].loc.startLine, token_buffer[0].loc.startColumn, msg)); diff --git a/src/declarative/qml/parser/javascriptparser_p.h b/src/declarative/qml/parser/javascriptparser_p.h index 071da1f..abebf4f 100644 --- a/src/declarative/qml/parser/javascriptparser_p.h +++ b/src/declarative/qml/parser/javascriptparser_p.h @@ -203,9 +203,9 @@ protected: }; -#define J_SCRIPT_REGEXPLITERAL_RULE1 27 +#define J_SCRIPT_REGEXPLITERAL_RULE1 28 -#define J_SCRIPT_REGEXPLITERAL_RULE2 28 +#define J_SCRIPT_REGEXPLITERAL_RULE2 29 QT_END_NAMESPACE diff --git a/src/declarative/qml/qmlparser.cpp b/src/declarative/qml/qmlparser.cpp index 6c71a97..9bcd53d 100644 --- a/src/declarative/qml/qmlparser.cpp +++ b/src/declarative/qml/qmlparser.cpp @@ -152,7 +152,10 @@ Object *QmlParser::Property::getValue() void QmlParser::Property::addValue(Value *v) { - qDebug() << "Property" << name << "addValue" << v->primitive; + if (v->object) + qDebug() << "Property" << name << "addValue Object(" << v->object->typeName << ")"; + else + qDebug() << "Property" << name << "addValue" << v->primitive; values << v; } diff --git a/src/declarative/qml/qmlscriptparser.cpp b/src/declarative/qml/qmlscriptparser.cpp index 42cd812..981f3ad 100644 --- a/src/declarative/qml/qmlscriptparser.cpp +++ b/src/declarative/qml/qmlscriptparser.cpp @@ -65,6 +65,7 @@ protected: const QString &propertyName, const QString &objectType, AST::UiObjectInitializer *initializer = 0); + QString getPrimitive(const QByteArray &propertyName, AST::ExpressionNode *expr); using AST::Visitor::visit; using AST::Visitor::endVisit; @@ -177,7 +178,8 @@ Object *ProcessAST::defineObjectBinding(int line, _scope.removeLast(); obj->line = line; - if (Property *prop = currentProperty()) { + if (!str.isEmpty()) { + Property *prop = currentProperty(); Value *v = new Value; v->object = obj; v->line = line; @@ -213,34 +215,50 @@ Object *ProcessAST::defineObjectBinding(int line, // UiObjectMember: T_PUBLIC T_IDENTIFIER T_IDENTIFIER T_COLON Expression UiObjectInitializer ; bool ProcessAST::visit(AST::UiPublicMember *node) { -#if 0 const QString type = node->type->asString(); const QString name = node->name->asString(); + qDebug() << Q_FUNC_INFO << name; + if (type == QLatin1String("property")) { - Object *properties = defineObjectBinding(node->publicToken.startLine, - QLatin1String("properties"), - Q - property = QLatin1("properties"); _stateStack.pushProperty(QLatin1String("properties"), node->publicToken.startLine); - const int typeId = _parser->findOrCreateTypeId(QLatin1String("Property")); - int line = node->identifierToken.startLine; + Object *obj = defineObjectBinding(node->identifierToken.startLine, + QString(), + QLatin1String("Property")); + + qDebug() << "MIDDLE"; + _stateStack.pushObject(obj); + + _stateStack.pushProperty(QLatin1String("name"), node->identifierToken.startLine); + Value *value = new Value; + value->primitive = name; + value->line = node->identifierToken.startLine; + currentProperty()->addValue(value); + _stateStack.pop(); // name property + + if (node->expression) { // default value + _stateStack.pushProperty(QLatin1String("value"), node->identifierToken.startLine); + Value *value = new Value; + value->primitive = getPrimitive("value", node->expression); + value->line = node->identifierToken.startLine; + currentProperty()->addValue(value); + _stateStack.pop(); // value property + } - Object *obj = new Object; - obj->type = typeId; - obj->typeName = qualifiedNameId().toLatin1(); - obj->line = line; - accept(node->initializer); - _stateStack.pop(); + _stateStack.pop(); // object + + _stateStack.pop(); // properties } else { - qWarning << "bad public identifier" << type; // ### FIXME + qWarning() << "bad public identifier" << type; // ### FIXME } -#endif + + qDebug() << Q_FUNC_INFO << name << "DONE!!!"; + return false; } @@ -266,6 +284,47 @@ bool ProcessAST::visit(AST::UiObjectBinding *node) return false; } +QString ProcessAST::getPrimitive(const QByteArray &propertyName, AST::ExpressionNode *expr) +{ + QString primitive; + QTextStream out(&primitive); + PrettyPretty pp(out); + + if(propertyName.length() >= 3 && propertyName.startsWith("on") && + ('A' <= propertyName.at(2) && 'Z' >= propertyName.at(2))) { + pp(expr); + + // here comes a cruel hack until we support functions properly with arguments for signal properties + if (primitive.startsWith(QLatin1String("function("))) { + int brace = 0; + for (;brace < primitive.size(); ++brace) + if (primitive.at(brace) == QLatin1Char('{')) + break; + primitive = primitive.mid(brace + 1, primitive.size() - brace - 2); + } + //end of hack + + } else if (propertyName == "id" && expr && expr->kind == AST::Node::Kind_IdentifierExpression) { + primitive = static_cast<AST::IdentifierExpression *>(expr)->name->asString(); + } else if (expr->kind == AST::Node::Kind_StringLiteral) { + // hack: emulate weird XML feature that string literals are not quoted. + //This needs to be fixed in the qmlcompiler once xml goes away. + primitive = static_cast<AST::StringLiteral *>(expr)->value->asString(); + } else if (expr->kind == AST::Node::Kind_TrueLiteral + || expr->kind == AST::Node::Kind_FalseLiteral + || expr->kind == AST::Node::Kind_NumericLiteral + ) { + pp(expr); + } else { + // create a binding + out << "{"; + pp(expr); + out << "}"; + } + return primitive; +} + + // UiObjectMember: UiQualifiedId T_COLON Statement ; bool ProcessAST::visit(AST::UiScriptBinding *node) { @@ -286,38 +345,8 @@ bool ProcessAST::visit(AST::UiScriptBinding *node) if (node->statement->kind == AST::Node::Kind_ExpressionStatement) { AST::ExpressionStatement *stmt = static_cast<AST::ExpressionStatement *>(node->statement); + primitive = getPrimitive(prop->name, stmt->expression); - if(prop->name.length() >= 3 && prop->name.startsWith("on") && - ('A' <= prop->name.at(2) && 'Z' >= prop->name.at(2))) { - pp(stmt->expression); - - // here comes a cruel hack until we support functions properly with arguments for signal properties - if (primitive.startsWith(QLatin1String("function("))) { - int brace = 0; - for (;brace < primitive.size(); ++brace) - if (primitive.at(brace) == QLatin1Char('{')) - break; - primitive = primitive.mid(brace + 1, primitive.size() - brace - 2); - } - //end of hack - - } else if (prop->name == "id" && stmt->expression && stmt->expression->kind == AST::Node::Kind_IdentifierExpression) { - primitive = static_cast<AST::IdentifierExpression *>(stmt->expression)->name->asString(); - } else if (stmt->expression->kind == AST::Node::Kind_StringLiteral) { - // hack: emulate weird XML feature that string literals are not quoted. - //This needs to be fixed in the qmlcompiler once xml goes away. - primitive = static_cast<AST::StringLiteral *>(stmt->expression)->value->asString(); - } else if (stmt->expression->kind == AST::Node::Kind_TrueLiteral - || stmt->expression->kind == AST::Node::Kind_FalseLiteral - || stmt->expression->kind == AST::Node::Kind_NumericLiteral - ) { - pp(stmt->expression); - } else { - // create a binding - out << "{"; - pp(stmt->expression); - out << "}"; - } } else { pp(node->statement); } |