summaryrefslogtreecommitdiffstats
path: root/src/declarative/qml/parser
diff options
context:
space:
mode:
Diffstat (limited to 'src/declarative/qml/parser')
-rw-r--r--src/declarative/qml/parser/javascript.g59
-rw-r--r--src/declarative/qml/parser/javascriptgrammar.cpp1222
-rw-r--r--src/declarative/qml/parser/javascriptgrammar_p.h14
-rw-r--r--src/declarative/qml/parser/javascriptparser.cpp448
-rw-r--r--src/declarative/qml/parser/javascriptparser_p.h17
5 files changed, 883 insertions, 877 deletions
diff --git a/src/declarative/qml/parser/javascript.g b/src/declarative/qml/parser/javascript.g
index ec81a7a..d66266f 100644
--- a/src/declarative/qml/parser/javascript.g
+++ b/src/declarative/qml/parser/javascript.g
@@ -264,10 +264,10 @@ public:
enum Kind { Warning, Error };
DiagnosticMessage()
- : kind(Error), line(0), column(0) {}
+ : kind(Error) {}
- DiagnosticMessage(Kind kind, int line, int column, const QString &message)
- : kind(kind), line(line), column(column), message(message) {}
+ DiagnosticMessage(Kind kind, const JavaScript::AST::SourceLocation &loc, const QString &message)
+ : kind(kind), loc(loc), message(message) {}
bool isWarning() const
{ return kind == Warning; }
@@ -276,8 +276,7 @@ public:
{ return kind == Error; }
Kind kind;
- int line;
- int column;
+ JavaScript::AST::SourceLocation loc;
QString message;
};
@@ -307,10 +306,10 @@ public:
{ return diagnosticMessage().message; }
inline int errorLineNumber() const
- { return diagnosticMessage().line; }
+ { return diagnosticMessage().loc.startLine; }
inline int errorColumnNumber() const
- { return diagnosticMessage().column; }
+ { return diagnosticMessage().loc.startColumn; }
protected:
void reallocateStack();
@@ -471,7 +470,7 @@ bool JavaScriptParser::parse(JavaScriptEnginePrivate *driver)
-- Declarative UI
--------------------------------------------------------------------------------------------------------
-UiProgram: UiImportListOpt UiObjectMemberList ;
+UiProgram: UiImportListOpt UiRootMember ;
/.
case $rule_number: {
program = makeAstNode<AST::UiProgram> (driver->nodePool(), sym(1).UiImportList,
@@ -522,6 +521,13 @@ case $rule_number: {
} break;
./
+UiRootMember: UiObjectDefinition ;
+/.
+case $rule_number: {
+ sym(1).Node = makeAstNode<AST::UiObjectMemberList> (driver->nodePool(), sym(1).UiObjectMember);
+} break;
+./
+
UiObjectMemberList: UiObjectMember ;
/.
case $rule_number: {
@@ -587,9 +593,7 @@ case $rule_number: {
} break;
./
-UiArrayObjectMember: T_IDENTIFIER UiObjectInitializer ;
-/. case $rule_number: ./
-UiObjectMember: T_IDENTIFIER UiObjectInitializer ;
+UiObjectDefinition: T_IDENTIFIER UiObjectInitializer ;
/.
case $rule_number: {
AST::UiObjectDefinition *node = makeAstNode<AST::UiObjectDefinition> (driver->nodePool(), sym(1).sval,
@@ -599,6 +603,9 @@ case $rule_number: {
} break;
./
+UiArrayObjectMember: UiObjectDefinition ;
+UiObjectMember: UiObjectDefinition ;
+
UiArrayObjectMember: UiQualifiedId T_COLON T_LBRACKET UiArrayMemberList T_RBRACKET ;
/. case $rule_number: ./
UiObjectMember: UiQualifiedId T_COLON T_LBRACKET UiArrayMemberList T_RBRACKET ;
@@ -865,9 +872,8 @@ PrimaryExpression: T_DIVIDE_ ;
case $rule_number: {
bool rx = lexer->scanRegExp(Lexer::NoPrefix);
if (!rx) {
- diagnostic_messages.append(DiagnosticMessage(DiagnosticMessage::Error, lexer->startLineNo(),
- lexer->startColumnNo(), lexer->errorMessage()));
- return false;
+ diagnostic_messages.append(DiagnosticMessage(DiagnosticMessage::Error, location(lexer), lexer->errorMessage()));
+ return false; // ### remove me
}
AST::RegExpLiteral *node = makeAstNode<AST::RegExpLiteral> (driver->nodePool(), lexer->pattern, lexer->flags);
node->literalToken = loc(1);
@@ -883,9 +889,8 @@ PrimaryExpression: T_DIVIDE_EQ ;
case $rule_number: {
bool rx = lexer->scanRegExp(Lexer::EqualPrefix);
if (!rx) {
- diagnostic_messages.append(DiagnosticMessage(DiagnosticMessage::Error, lexer->startLineNo(),
- lexer->startColumnNo(), lexer->errorMessage()));
- return false;
+ diagnostic_messages.append(DiagnosticMessage(DiagnosticMessage::Error, location(lexer), lexer->errorMessage()));
+ return false;
}
AST::RegExpLiteral *node = makeAstNode<AST::RegExpLiteral> (driver->nodePool(), lexer->pattern, lexer->flags);
node->literalToken = loc(1);
@@ -2695,10 +2700,8 @@ PropertyNameAndValueListOpt: PropertyNameAndValueList ;
yylloc.startColumn += yylloc.length;
yylloc.length = 0;
- const QString msg = QString::fromUtf8("Missing `;'");
-
- diagnostic_messages.append(DiagnosticMessage(DiagnosticMessage::Warning,
- yylloc.startLine, yylloc.startColumn, msg));
+ //const QString msg = QString::fromUtf8("Missing `;'");
+ //diagnostic_messages.append(DiagnosticMessage(DiagnosticMessage::Warning, yylloc, msg));
first_token = &token_buffer[0];
last_token = &token_buffer[1];
@@ -2723,9 +2726,7 @@ PropertyNameAndValueListOpt: PropertyNameAndValueList ;
if (t_action(errorState, yytoken)) {
const QString msg = QString::fromUtf8("Unexpected 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));
+ diagnostic_messages.append(DiagnosticMessage(DiagnosticMessage::Error, token_buffer[0].loc, msg));
action = errorState;
goto _Lcheck_token;
@@ -2753,9 +2754,7 @@ PropertyNameAndValueListOpt: PropertyNameAndValueList ;
int a = t_action(errorState, *tk);
if (a > 0 && t_action(a, yytoken)) {
const QString msg = QString::fromUtf8("Expected token `%1'").arg(QLatin1String(spell[*tk]));
-
- diagnostic_messages.append(DiagnosticMessage(DiagnosticMessage::Error,
- token_buffer[0].loc.startLine, token_buffer[0].loc.startColumn, msg));
+ diagnostic_messages.append(DiagnosticMessage(DiagnosticMessage::Error, token_buffer[0].loc, msg));
yytoken = *tk;
yylval = 0;
@@ -2777,8 +2776,7 @@ PropertyNameAndValueListOpt: PropertyNameAndValueList ;
int a = t_action(errorState, tk);
if (a > 0 && t_action(a, yytoken)) {
const QString msg = QString::fromUtf8("Expected token `%1'").arg(QLatin1String(spell[tk]));
- diagnostic_messages.append(DiagnosticMessage(DiagnosticMessage::Error,
- token_buffer[0].loc.startLine, token_buffer[0].loc.startColumn, msg));
+ diagnostic_messages.append(DiagnosticMessage(DiagnosticMessage::Error, token_buffer[0].loc, msg));
yytoken = tk;
yylval = 0;
@@ -2791,8 +2789,7 @@ PropertyNameAndValueListOpt: PropertyNameAndValueList ;
}
const QString msg = QString::fromUtf8("Syntax error");
- diagnostic_messages.append(DiagnosticMessage(DiagnosticMessage::Error,
- token_buffer[0].loc.startLine, token_buffer[0].loc.startColumn, msg));
+ diagnostic_messages.append(DiagnosticMessage(DiagnosticMessage::Error, token_buffer[0].loc, msg));
}
return false;
diff --git a/src/declarative/qml/parser/javascriptgrammar.cpp b/src/declarative/qml/parser/javascriptgrammar.cpp
index a33f343..cb98c36 100644
--- a/src/declarative/qml/parser/javascriptgrammar.cpp
+++ b/src/declarative/qml/parser/javascriptgrammar.cpp
@@ -55,622 +55,625 @@ const char *const JavaScriptGrammar::spell [] = {
0};
const int JavaScriptGrammar::lhs [] = {
- 91, 92, 92, 95, 95, 96, 96, 94, 93, 93,
- 98, 98, 100, 100, 99, 97, 99, 97, 99, 97,
- 102, 103, 103, 97, 99, 97, 105, 105, 105, 97,
- 97, 97, 97, 97, 97, 97, 101, 101, 109, 109,
- 109, 101, 101, 110, 110, 110, 110, 110, 110, 110,
- 110, 110, 110, 110, 110, 110, 110, 110, 112, 112,
- 116, 116, 111, 111, 114, 114, 117, 117, 117, 117,
- 117, 117, 118, 118, 118, 118, 118, 118, 118, 118,
- 118, 118, 118, 118, 118, 118, 118, 118, 118, 118,
- 118, 118, 118, 118, 118, 118, 118, 118, 118, 118,
- 118, 118, 118, 119, 119, 120, 120, 120, 120, 120,
- 123, 123, 124, 124, 124, 124, 122, 122, 125, 125,
- 126, 126, 127, 127, 127, 128, 128, 128, 128, 128,
- 128, 128, 128, 128, 128, 129, 129, 129, 129, 130,
- 130, 130, 131, 131, 131, 131, 132, 132, 132, 132,
- 132, 132, 132, 133, 133, 133, 133, 133, 133, 134,
- 134, 134, 134, 134, 135, 135, 135, 135, 135, 136,
- 136, 137, 137, 138, 138, 139, 139, 140, 140, 141,
- 141, 142, 142, 143, 143, 144, 144, 145, 145, 146,
- 146, 147, 147, 115, 115, 148, 148, 149, 149, 149,
- 149, 149, 149, 149, 149, 149, 149, 149, 149, 106,
- 106, 150, 150, 151, 151, 152, 152, 104, 104, 104,
- 104, 104, 104, 104, 104, 104, 104, 104, 104, 104,
- 104, 104, 153, 168, 168, 167, 167, 108, 108, 169,
- 169, 170, 170, 172, 172, 171, 173, 176, 174, 174,
- 177, 175, 175, 154, 155, 155, 156, 156, 157, 157,
- 157, 157, 157, 157, 157, 158, 158, 158, 158, 159,
- 159, 159, 159, 160, 160, 161, 163, 178, 178, 181,
- 181, 179, 179, 182, 180, 162, 162, 162, 164, 164,
- 165, 165, 165, 183, 184, 166, 166, 107, 121, 188,
- 188, 185, 185, 186, 186, 189, 190, 190, 191, 191,
- 187, 187, 113, 113, 192};
+ 91, 92, 92, 95, 95, 96, 96, 94, 93, 98,
+ 98, 100, 100, 102, 102, 101, 99, 97, 101, 99,
+ 101, 99, 104, 105, 105, 99, 101, 99, 107, 107,
+ 107, 99, 99, 99, 99, 99, 99, 99, 103, 103,
+ 111, 111, 111, 103, 103, 112, 112, 112, 112, 112,
+ 112, 112, 112, 112, 112, 112, 112, 112, 112, 112,
+ 114, 114, 118, 118, 113, 113, 116, 116, 119, 119,
+ 119, 119, 119, 119, 120, 120, 120, 120, 120, 120,
+ 120, 120, 120, 120, 120, 120, 120, 120, 120, 120,
+ 120, 120, 120, 120, 120, 120, 120, 120, 120, 120,
+ 120, 120, 120, 120, 120, 121, 121, 122, 122, 122,
+ 122, 122, 125, 125, 126, 126, 126, 126, 124, 124,
+ 127, 127, 128, 128, 129, 129, 129, 130, 130, 130,
+ 130, 130, 130, 130, 130, 130, 130, 131, 131, 131,
+ 131, 132, 132, 132, 133, 133, 133, 133, 134, 134,
+ 134, 134, 134, 134, 134, 135, 135, 135, 135, 135,
+ 135, 136, 136, 136, 136, 136, 137, 137, 137, 137,
+ 137, 138, 138, 139, 139, 140, 140, 141, 141, 142,
+ 142, 143, 143, 144, 144, 145, 145, 146, 146, 147,
+ 147, 148, 148, 149, 149, 117, 117, 150, 150, 151,
+ 151, 151, 151, 151, 151, 151, 151, 151, 151, 151,
+ 151, 108, 108, 152, 152, 153, 153, 154, 154, 106,
+ 106, 106, 106, 106, 106, 106, 106, 106, 106, 106,
+ 106, 106, 106, 106, 155, 170, 170, 169, 169, 110,
+ 110, 171, 171, 172, 172, 174, 174, 173, 175, 178,
+ 176, 176, 179, 177, 177, 156, 157, 157, 158, 158,
+ 159, 159, 159, 159, 159, 159, 159, 160, 160, 160,
+ 160, 161, 161, 161, 161, 162, 162, 163, 165, 180,
+ 180, 183, 183, 181, 181, 184, 182, 164, 164, 164,
+ 166, 166, 167, 167, 167, 185, 186, 168, 168, 109,
+ 123, 190, 190, 187, 187, 188, 188, 191, 192, 192,
+ 193, 193, 189, 189, 115, 115, 194};
const int JavaScriptGrammar:: rhs[] = {
- 2, 1, 1, 1, 2, 3, 3, 0, 1, 2,
- 1, 3, 2, 3, 4, 4, 2, 2, 5, 5,
- 1, 2, 2, 3, 3, 3, 1, 1, 1, 2,
- 3, 4, 5, 6, 1, 1, 1, 1, 1, 1,
- 1, 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,
+ 2, 1, 1, 1, 2, 3, 3, 0, 1, 1,
+ 2, 1, 3, 2, 3, 4, 4, 2, 1, 1,
+ 5, 5, 1, 2, 2, 3, 3, 3, 1, 1,
+ 1, 2, 3, 4, 5, 6, 1, 1, 1, 1,
+ 1, 1, 1, 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, 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, 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,
- 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, 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, 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, 4, 3, 0, 0, 0, 6, 7,
- 5, 35, 42, 240, 0, 0, 39, 40, 37, 38,
- 41, 241, 9, 1, 0, 0, 36, 0, 29, 28,
- 27, 0, 32, 0, 143, 210, 174, 182, 178, 122,
- 194, 170, 34, 107, 45, 123, 186, 190, 111, 140,
- 121, 126, 106, 160, 147, 0, 51, 52, 48, 311,
- 39, 313, 63, 0, 0, 0, 0, 0, 46, 49,
- 0, 0, 40, 41, 50, 44, 0, 47, 0, 0,
- 136, 0, 0, 123, 142, 125, 124, 0, 0, 0,
- 138, 139, 137, 141, 0, 171, 0, 0, 0, 0,
- 161, 0, 0, 0, 0, 0, 0, 151, 0, 0,
- 0, 145, 146, 144, 149, 153, 152, 150, 148, 163,
- 162, 164, 0, 179, 0, 175, 0, 0, 117, 104,
- 116, 105, 73, 74, 75, 100, 76, 101, 77, 78,
- 79, 80, 81, 82, 83, 84, 85, 86, 87, 88,
- 89, 102, 90, 91, 92, 93, 94, 95, 96, 97,
- 98, 99, 103, 0, 0, 115, 211, 118, 0, 119,
- 0, 120, 114, 0, 207, 200, 198, 205, 206, 204,
- 203, 209, 202, 201, 199, 208, 195, 0, 183, 0,
- 0, 187, 0, 0, 191, 0, 0, 117, 109, 0,
- 108, 0, 113, 127, 0, 312, 302, 303, 0, 300,
- 0, 301, 0, 304, 218, 225, 224, 232, 220, 0,
- 221, 305, 0, 310, 222, 223, 228, 226, 307, 306,
- 309, 229, 0, 0, 0, 0, 0, 311, 39, 0,
- 313, 40, 212, 254, 41, 0, 0, 0, 0, 0,
- 230, 231, 219, 227, 255, 256, 299, 308, 0, 270,
- 271, 272, 273, 0, 266, 267, 268, 269, 296, 297,
- 0, 0, 0, 0, 0, 259, 260, 216, 214, 176,
- 184, 180, 196, 172, 217, 0, 123, 188, 192, 165,
- 154, 0, 0, 173, 0, 0, 0, 0, 166, 0,
- 0, 0, 0, 0, 158, 156, 159, 157, 155, 168,
- 167, 169, 0, 181, 0, 177, 0, 215, 123, 0,
- 197, 212, 213, 0, 212, 0, 0, 262, 0, 0,
- 0, 264, 0, 185, 0, 0, 189, 0, 0, 193,
- 252, 0, 244, 253, 247, 0, 251, 0, 212, 245,
- 0, 212, 0, 0, 263, 0, 0, 0, 265, 312,
- 302, 0, 0, 304, 0, 298, 0, 288, 0, 0,
- 0, 258, 0, 257, 0, 314, 0, 72, 234, 237,
- 0, 73, 240, 76, 101, 78, 79, 48, 83, 84,
- 39, 85, 88, 46, 49, 40, 212, 41, 50, 91,
- 44, 93, 47, 95, 96, 241, 98, 99, 103, 0,
- 65, 0, 0, 67, 71, 69, 57, 68, 70, 0,
- 66, 56, 235, 233, 111, 112, 117, 0, 110, 0,
- 287, 0, 274, 275, 0, 286, 0, 0, 0, 277,
- 282, 280, 283, 0, 0, 281, 282, 0, 278, 0,
- 279, 236, 285, 0, 236, 284, 0, 289, 290, 0,
- 236, 291, 292, 0, 0, 293, 0, 0, 0, 294,
- 295, 129, 128, 0, 0, 0, 261, 0, 0, 0,
- 276, 0, 64, 0, 61, 63, 54, 0, 60, 55,
- 62, 59, 53, 0, 58, 133, 131, 135, 132, 130,
- 134, 0, 0, 18, 13, 0, 14, 10, 0, 31,
- 0, 33, 30, 0, 0, 26, 39, 63, 21, 0,
- 24, 16, 39, 0, 11, 0, 17, 0, 20, 12,
- 0, 25, 39, 63, 15, 0, 19, 22, 23, 43,
- 249, 242, 0, 250, 246, 0, 248, 238, 0, 239,
- 243, 315};
+ 5, 0, 9, 1, 0, 18, 37, 44, 242, 0,
+ 0, 41, 42, 14, 39, 40, 43, 243, 20, 10,
+ 0, 0, 0, 38, 0, 31, 30, 29, 0, 34,
+ 0, 145, 212, 176, 184, 180, 124, 196, 172, 36,
+ 109, 47, 125, 188, 192, 113, 142, 123, 128, 108,
+ 162, 149, 0, 53, 54, 50, 313, 41, 315, 65,
+ 0, 0, 0, 0, 0, 48, 51, 0, 0, 42,
+ 43, 52, 46, 0, 49, 0, 0, 138, 0, 0,
+ 125, 144, 127, 126, 0, 0, 0, 140, 141, 139,
+ 143, 0, 173, 0, 0, 0, 0, 163, 0, 0,
+ 0, 0, 0, 0, 153, 0, 0, 0, 147, 148,
+ 146, 151, 155, 154, 152, 150, 165, 164, 166, 0,
+ 181, 0, 177, 0, 0, 119, 106, 118, 107, 75,
+ 76, 77, 102, 78, 103, 79, 80, 81, 82, 83,
+ 84, 85, 86, 87, 88, 89, 90, 91, 104, 92,
+ 93, 94, 95, 96, 97, 98, 99, 100, 101, 105,
+ 0, 0, 117, 213, 120, 0, 121, 0, 122, 116,
+ 0, 209, 202, 200, 207, 208, 206, 205, 211, 204,
+ 203, 201, 210, 197, 0, 185, 0, 0, 189, 0,
+ 0, 193, 0, 0, 119, 111, 0, 110, 0, 115,
+ 129, 0, 314, 304, 305, 0, 302, 0, 303, 0,
+ 306, 220, 227, 226, 234, 222, 0, 223, 307, 0,
+ 312, 224, 225, 230, 228, 309, 308, 311, 231, 0,
+ 0, 0, 0, 0, 313, 41, 0, 315, 42, 214,
+ 256, 43, 0, 0, 0, 0, 0, 232, 233, 221,
+ 229, 257, 258, 301, 310, 0, 272, 273, 274, 275,
+ 0, 268, 269, 270, 271, 298, 299, 0, 0, 0,
+ 0, 0, 261, 262, 218, 216, 178, 186, 182, 198,
+ 174, 219, 0, 125, 190, 194, 167, 156, 0, 0,
+ 175, 0, 0, 0, 0, 168, 0, 0, 0, 0,
+ 0, 160, 158, 161, 159, 157, 170, 169, 171, 0,
+ 183, 0, 179, 0, 217, 125, 0, 199, 214, 215,
+ 0, 214, 0, 0, 264, 0, 0, 0, 266, 0,
+ 187, 0, 0, 191, 0, 0, 195, 254, 0, 246,
+ 255, 249, 0, 253, 0, 214, 247, 0, 214, 0,
+ 0, 265, 0, 0, 0, 267, 314, 304, 0, 0,
+ 306, 0, 300, 0, 290, 0, 0, 0, 260, 0,
+ 259, 0, 316, 0, 74, 236, 239, 0, 75, 242,
+ 78, 103, 80, 81, 50, 85, 86, 41, 87, 90,
+ 48, 51, 42, 214, 43, 52, 93, 46, 95, 49,
+ 97, 98, 243, 100, 101, 105, 0, 67, 0, 0,
+ 69, 73, 71, 59, 70, 72, 0, 68, 58, 237,
+ 235, 113, 114, 119, 0, 112, 0, 289, 0, 276,
+ 277, 0, 288, 0, 0, 0, 279, 284, 282, 285,
+ 0, 0, 283, 284, 0, 280, 0, 281, 238, 287,
+ 0, 238, 286, 0, 291, 292, 0, 238, 293, 294,
+ 0, 0, 295, 0, 0, 0, 296, 297, 131, 130,
+ 0, 0, 0, 263, 0, 0, 0, 278, 0, 66,
+ 0, 63, 65, 56, 0, 62, 57, 64, 61, 55,
+ 0, 60, 135, 133, 137, 134, 132, 136, 0, 0,
+ 33, 0, 35, 32, 15, 11, 0, 0, 28, 41,
+ 65, 23, 0, 26, 17, 0, 12, 19, 0, 0,
+ 22, 13, 0, 27, 41, 65, 16, 0, 21, 24,
+ 25, 45, 251, 244, 0, 252, 248, 0, 250, 240,
+ 0, 241, 245, 317};
const int JavaScriptGrammar::goto_default [] = {
- 6, 5, 23, 1, 4, 3, 22, 523, 524, 503,
- 24, 519, 520, 378, 508, 219, 11, 252, 44, 52,
- 483, 481, 376, 375, 35, 482, 374, 377, 130, 48,
- 43, 168, 50, 39, 167, 45, 51, 80, 49, 34,
- 54, 53, 289, 41, 283, 36, 279, 38, 281, 37,
- 280, 46, 287, 47, 288, 40, 282, 278, 319, 431,
- 284, 285, 214, 218, 220, 224, 225, 216, 215, 227,
- 253, 226, 231, 250, 251, 217, 380, 379, 25, 542,
- 541, 341, 342, 544, 344, 543, 343, 439, 443, 446,
- 442, 441, 461, 462, 208, 222, 204, 207, 221, 229,
- 228, 0};
+ 6, 5, 13, 1, 4, 3, 527, 30, 29, 525,
+ 526, 15, 528, 522, 523, 385, 509, 226, 230, 259,
+ 51, 59, 490, 488, 383, 382, 42, 489, 381, 384,
+ 137, 55, 50, 175, 57, 46, 174, 52, 58, 87,
+ 56, 41, 61, 60, 296, 48, 290, 43, 286, 45,
+ 288, 44, 287, 53, 294, 54, 295, 47, 289, 285,
+ 326, 438, 291, 292, 221, 225, 227, 231, 232, 223,
+ 222, 234, 260, 233, 238, 257, 258, 224, 387, 386,
+ 32, 544, 543, 348, 349, 546, 351, 545, 350, 446,
+ 450, 453, 449, 448, 468, 469, 215, 229, 211, 214,
+ 228, 236, 235, 0};
const int JavaScriptGrammar::action_index [] = {
- 62, -91, -18, -91, -40, 362, 44, 117, -91, -91,
- -91, -91, -91, -91, -12, 144, 20, 130, -91, -91,
- 14, -91, -91, 356, 127, 195, -91, 158, -91, -91,
- -91, 11, 34, 678, 125, -91, 41, -9, -27, 204,
- -91, 263, 58, -91, -91, 519, 61, 63, 220, 131,
- -91, -91, -91, 330, 159, 678, -91, -91, -91, 154,
- -91, 1176, 53, 678, 678, 678, 598, 678, -91, -91,
- 678, 678, -91, -91, -91, -91, 678, -91, 678, 678,
- -91, 678, 678, 118, 221, -91, -91, 678, 678, 678,
- -91, -91, -91, 217, 678, 269, 678, 678, 678, 678,
- 311, 678, 678, 678, 678, 678, 678, 228, 678, 678,
- 678, 104, 65, 64, 187, 164, 214, 295, 295, 431,
- 431, 345, 678, -7, 678, 90, 1089, 678, 678, -91,
+ -27, -91, 56, -91, -22, 60, 62, 109, -91, -91,
+ -91, 54, -91, -91, 438, -91, -91, -91, -91, 49,
+ 220, 53, 172, -91, -91, -91, 50, -91, -91, -91,
+ 415, 84, 207, -91, 226, -91, -91, -91, 61, 63,
+ 725, 80, -91, 68, 69, 59, 217, -91, 342, 74,
+ -91, -91, 566, 66, 72, 144, 140, -91, -91, -91,
+ 395, 160, 725, -91, -91, -91, 176, -91, 1223, 64,
+ 725, 725, 725, 645, 725, -91, -91, 725, 725, -91,
+ -91, -91, -91, 725, -91, 725, 725, -91, 725, 725,
+ 107, 178, -91, -91, 725, 725, 725, -91, -91, -91,
+ 187, 725, 342, 725, 725, 725, 725, 385, 725, 725,
+ 725, 725, 725, 725, 269, 725, 725, 725, 132, 113,
+ 79, 193, 269, 196, 199, 200, 370, 478, 478, 725,
+ 59, 725, 73, 1136, 725, 725, -91, -91, -91, -91,
-91, -91, -91, -91, -91, -91, -91, -91, -91, -91,
-91, -91, -91, -91, -91, -91, -91, -91, -91, -91,
-91, -91, -91, -91, -91, -91, -91, -91, -91, -91,
- -91, -91, -91, 113, 678, -91, -91, 42, -8, -91,
- 678, -91, -91, 678, -91, -91, -91, -91, -91, -91,
- -91, -91, -91, -91, -91, -91, -91, 678, 22, 678,
- 678, 29, 5, 678, -91, 1089, 678, 678, -91, 110,
- -91, 51, -91, -91, 36, -91, 184, 85, 60, -91,
- 151, -91, 56, 1437, -91, -91, -91, -91, -91, 166,
- -91, -91, 28, -91, -91, -91, -91, -91, -91, 1437,
- -91, -91, 290, 244, 102, 1350, 49, 178, 73, 39,
- 1698, 70, 678, -91, 72, 46, 678, 43, 37, 38,
- -91, -91, -91, -91, -91, -91, -91, -91, 68, -91,
- -91, -91, -91, 71, -91, -91, -91, -91, -91, -91,
- 50, 54, 678, 88, 66, -91, -91, 842, -91, 87,
- 47, 45, -91, 257, 59, 26, 486, 84, 146, 363,
- 295, 205, 678, 249, 678, 678, 678, 678, 363, 678,
- 678, 678, 678, 678, 295, 295, 295, 295, 295, 293,
- 363, 363, 678, -21, 678, 18, 678, -91, 519, 678,
- -91, 678, 13, -37, 678, -38, 1350, -91, 678, 98,
- 1350, -91, 678, -28, 678, 678, 16, 8, 678, -91,
- 0, 229, -15, -91, -91, 678, -91, 219, 678, -91,
- -34, 678, -32, 1350, -91, 678, 89, 1350, -91, -6,
- 197, -24, 1, 1437, -23, -91, 1350, -91, 678, 94,
- 1350, 17, 1350, -91, 6, 15, -26, -91, -91, 1350,
- -30, 231, 7, 278, 76, 678, 1350, -5, -36, 260,
- -3, -29, 598, -4, -1, -91, 762, -91, 3, 19,
- 4, 678, -2, -25, 678, 2, 678, -35, -10, 678,
- -91, 1263, 52, -91, -91, -91, -91, -91, -91, 678,
- -91, -91, -91, -91, 167, -91, 678, 21, -91, 1350,
- -91, 74, -91, -91, 1350, -91, 678, 91, 25, -91,
- 105, -91, 105, 97, 678, -91, 105, 55, -91, 23,
- -91, 1350, -91, 101, 1350, -91, 208, -91, -91, 92,
- 1350, 40, -91, 33, 35, -91, 180, 24, 31, -91,
- -91, -91, -91, 678, 86, 1350, -91, 678, 93, 1350,
- -91, 106, 57, 922, -91, 48, -91, 1002, -91, -91,
- -91, -91, -91, 132, -91, -91, -91, -91, -91, -91,
- -91, 10, 424, -91, -91, 421, -91, -91, 9, 30,
- 678, 27, -91, 1611, 156, -91, 134, 342, -91, 95,
- -91, -91, 12, 116, -91, 124, -91, 270, -91, -91,
- 1524, -91, 112, 352, -91, 114, -91, -91, -91, -91,
- 32, -91, 169, -91, -91, 678, -91, -91, 139, -91,
- -91, -91,
+ 94, 725, -91, -91, 65, 47, -91, 725, -91, -91,
+ 725, -91, -91, -91, -91, -91, -91, -91, -91, -91,
+ -91, -91, -91, -91, 725, 46, 725, 725, 55, 51,
+ 725, -91, 1136, 725, 725, -91, 95, -91, 38, -91,
+ -91, 35, -91, 210, 48, 32, -91, 223, -91, 34,
+ 1484, -91, -91, -91, -91, -91, 240, -91, -91, 33,
+ -91, -91, -91, -91, -91, -91, 1484, -91, -91, 281,
+ 266, 71, 1397, 39, 216, 52, 45, 1745, 58, 725,
+ -91, 57, 44, 725, 43, 41, 42, -91, -91, -91,
+ -91, -91, -91, -91, -91, 104, -91, -91, -91, -91,
+ 106, -91, -91, -91, -91, -91, -91, -28, 27, 725,
+ 117, 100, -91, -91, 805, -91, 83, 70, 67, -91,
+ 260, 77, -56, 503, 12, 119, 289, 231, 204, 725,
+ 285, 725, 725, 725, 725, 333, 725, 725, 725, 725,
+ 725, 181, 157, 169, 177, 269, 410, 339, 317, 725,
+ -65, 725, 15, 725, -91, 566, 725, -91, 725, 9,
+ -42, 725, -38, 1397, -91, 725, 116, 1397, -91, 725,
+ -48, 725, 725, 5, 120, 725, -91, 25, 203, 13,
+ -91, -91, 725, -91, 218, 725, -91, -1, 725, -8,
+ 1397, -91, 725, 103, 1397, -91, 19, 225, -19, 4,
+ 1484, -25, -91, 1397, -91, 725, 97, 1397, 24, 1397,
+ -91, 26, 31, -23, -91, -91, 1397, -24, 337, 22,
+ 324, 81, 725, 1397, 40, 10, 252, -3, -33, 645,
+ 2, 1, -91, 889, -91, 11, -13, 3, 725, 8,
+ 18, 725, 21, 725, -2, -10, 725, -91, 1310, 29,
+ -91, -91, -91, -91, -91, -91, 725, -91, -91, -91,
+ -91, 194, -91, 725, -6, -91, 1397, -91, 78, -91,
+ -91, 1397, -91, 725, 128, -12, -91, 6, -91, 7,
+ 91, 725, -91, -4, 36, -91, -53, -91, 1397, -91,
+ 105, 1397, -91, 130, -91, -91, 108, 1397, 0, -91,
+ 14, 16, -91, 150, 23, 20, -91, -91, -91, -91,
+ 725, 121, 1397, -91, 725, 126, 1397, -91, 85, 30,
+ 1049, -91, 37, -91, 969, -91, -91, -91, -91, -91,
+ 96, -91, -91, -91, -91, -91, -91, -91, -9, -5,
+ 28, 725, 17, -91, -91, -91, 1658, 146, -91, 102,
+ 406, -91, 86, -91, -91, 98, -91, -91, 93, 279,
+ -91, -91, 1571, -91, 90, 384, -91, 88, -91, -91,
+ -91, -91, -11, -91, 206, -91, -91, 725, -91, -91,
+ 232, -91, -91, -91,
- -102, -102, -102, -102, 34, 63, -102, -102, -102, -102,
- -102, -102, -102, -102, -102, 53, -102, -102, -102, -102,
- -102, -102, -102, 235, -102, 9, -102, 4, -102, -102,
- -102, -102, -102, -5, -102, -102, -102, -102, -102, -102,
- -102, -102, -102, -102, -102, -51, -102, -102, -102, -102,
- -102, -102, -102, -102, -102, 156, -102, -102, -102, 18,
- -102, -102, -102, -11, 95, 88, 90, 79, -102, -102,
- 80, 100, -102, -102, -102, -102, 114, -102, 101, 107,
- -102, 73, 131, -102, -102, -102, -102, 108, 111, 115,
- -102, -102, -102, -102, 165, -102, 83, 85, 118, 71,
- -102, 120, 144, 145, 143, 147, 159, -102, 122, 129,
- 66, -102, -102, -102, -102, -102, -102, -102, -102, -102,
- -102, -102, 41, -102, 65, -102, 77, 26, 19, -102,
- -102, -102, -102, -102, -102, -102, -102, -102, -102, -102,
- -102, -102, -102, -102, -102, -102, -102, -102, -102, -102,
- -102, -102, -102, -102, -102, -102, -102, -102, -102, -102,
- -102, -102, -102, -102, 27, -102, -102, -102, -102, -102,
- 28, -102, -102, 42, -102, -102, -102, -102, -102, -102,
- -102, -102, -102, -102, -102, -102, -102, 139, -102, 138,
- -1, -102, -102, 1, -102, 230, -10, 55, -102, -102,
- -102, -102, -102, -102, -102, -102, -3, -102, -102, -102,
- -4, -102, -102, 86, -102, -102, -102, -102, -102, -102,
- -102, -102, -102, -102, -102, -102, -102, -102, -102, 254,
- -102, -102, 56, 50, -102, 46, -102, -6, -102, -102,
- -102, -102, -2, -102, -102, -102, 17, -28, -102, -102,
- -102, -102, -102, -102, -102, -102, -102, -102, -102, -102,
- -102, -102, -102, -102, -102, -102, -102, -102, -102, -102,
- -102, -102, 5, -102, -102, -102, -102, 146, -102, -102,
- -102, -102, -102, -102, -102, -102, -102, -102, -102, -102,
- -102, 43, 225, -102, 237, 226, 197, 196, -102, 127,
- 136, 137, 135, 93, -102, -102, -102, -102, -102, -102,
- -102, -102, 174, -102, 180, -102, 170, -102, -102, 183,
- -102, 68, -102, -102, 70, -102, 49, -102, 48, -102,
- 47, -102, 193, -102, 161, 219, -102, -102, 189, -102,
- -102, -102, -102, -102, -102, 190, -102, 59, 72, -102,
- -102, 75, -102, 57, -102, 58, -102, 51, -102, -102,
- 64, -102, -102, 203, -102, -102, 44, -102, 32, -102,
- 31, -102, 29, -102, -102, -102, -102, -102, -102, 40,
- -102, 37, -102, 38, -102, 61, 36, -102, -102, 30,
- -102, -102, 62, -102, -102, -102, 35, -102, -102, -102,
- -102, 39, -102, 3, 128, -102, 155, -102, -102, 22,
- -102, 14, -102, -102, -102, -102, -102, -102, -102, 13,
- -102, -102, -102, -102, -102, -102, 123, -102, -102, 45,
- -102, -102, -102, -102, 25, -102, 52, -102, -102, -102,
- -102, -102, -80, -102, 54, -102, -72, -102, -102, -102,
- -102, -73, -102, -102, -76, -102, -102, -102, -102, -102,
- -102, -87, -102, -102, -45, -102, 12, -102, -31, -102,
- -102, -102, -102, 20, -102, 15, -102, 98, -102, 6,
- -102, -102, -102, 0, -102, 2, -102, -16, -102, -102,
- -102, -102, -102, -102, -102, -102, -102, -102, -102, -102,
- -102, -102, 232, -102, -102, 238, -102, -102, -102, -102,
- 11, -102, -102, 16, -9, -102, -7, 74, -102, -102,
- -102, -102, 24, -102, -102, -102, -102, 194, -102, -102,
- 8, -102, -8, 188, -102, -102, -102, -102, -102, -102,
- -102, -102, -102, -102, -102, 21, -102, -102, 60, -102,
- -102, -102};
+ -104, -104, -104, -104, -3, 5, -104, -104, -104, -104,
+ -104, -104, -104, -104, 241, -104, -104, -104, -104, -104,
+ 4, -104, -104, -104, -104, -104, -104, -104, -104, -104,
+ 246, -104, 2, -104, 3, -104, -104, -104, -104, -104,
+ 15, -104, -104, -104, -104, -104, -104, -104, -104, -104,
+ -104, -104, -45, -104, -104, -104, -104, -104, -104, -104,
+ -104, -104, 104, -104, -104, -104, -6, -104, -104, -104,
+ -14, 124, 119, 97, 113, -104, -104, 108, 112, -104,
+ -104, -104, -104, 127, -104, 120, 116, -104, 96, 85,
+ -104, -104, -104, -104, 128, 109, 105, -104, -104, -104,
+ -104, 89, -104, 146, 158, 143, 84, -104, 142, 136,
+ 135, 154, 145, 76, -104, 71, 134, 42, -104, -104,
+ -104, -104, -104, -104, -104, -104, -104, -104, -104, 70,
+ -104, 73, -104, 80, 37, 31, -104, -104, -104, -104,
+ -104, -104, -104, -104, -104, -104, -104, -104, -104, -104,
+ -104, -104, -104, -104, -104, -104, -104, -104, -104, -104,
+ -104, -104, -104, -104, -104, -104, -104, -104, -104, -104,
+ -104, 34, -104, -104, -104, -104, -104, 27, -104, -104,
+ -18, -104, -104, -104, -104, -104, -104, -104, -104, -104,
+ -104, -104, -104, -104, 123, -104, 132, 22, -104, -104,
+ 24, -104, 180, 23, 90, -104, -104, -104, -104, -104,
+ -104, -104, -104, 7, -104, -104, -104, -2, -104, -104,
+ 26, -104, -104, -104, -104, -104, -104, -104, -104, -104,
+ -104, -104, -104, -104, -104, -104, 74, -104, -104, -8,
+ 19, -104, 28, -104, 1, -104, -104, -104, -104, 8,
+ -104, -104, -104, 17, -41, -104, -104, -104, -104, -104,
+ -104, -104, -104, -104, -104, -104, -104, -104, -104, -104,
+ -104, -104, -104, -104, -104, -104, -104, -104, -104, 67,
+ -104, -104, -104, -104, 93, -104, -104, -104, -104, -104,
+ -104, -104, -104, -104, -104, -104, -104, -104, 32, 202,
+ -104, 198, 188, 192, 189, -104, 151, 201, 45, 60,
+ 69, -104, -104, -104, -104, -104, -104, -104, -104, 169,
+ -104, 176, -104, 204, -104, -104, 268, -104, 77, -104,
+ -104, 68, -104, 55, -104, 57, -104, 56, -104, 170,
+ -104, 160, 161, -104, -104, 162, -104, -104, -104, -104,
+ -104, -104, 186, -104, 53, 78, -104, -104, 79, -104,
+ 62, -104, 51, -104, 50, -104, -104, 94, -104, -104,
+ 65, -104, -104, 48, -104, 49, -104, 47, -104, 44,
+ -104, -104, -104, -104, -104, -104, 43, -104, 36, -104,
+ 41, -104, 66, 63, -104, -104, 52, -104, -104, 59,
+ -104, -104, -104, 64, -104, -104, -104, -104, 30, -104,
+ -29, 131, -104, 155, -104, -104, 38, -104, 39, -104,
+ -104, -104, -104, -104, -104, -104, 29, -104, -104, -104,
+ -104, -104, -104, 91, -104, -104, 61, -104, -104, -104,
+ -104, 54, -104, 58, -104, -104, -104, -104, -104, -57,
+ -104, -11, -104, -83, -104, -104, -104, -104, -73, -104,
+ -104, -68, -104, -104, -104, -104, -104, -104, -86, -104,
+ -104, -60, -104, -20, -104, -63, -104, -104, -104, -104,
+ 0, -104, 18, -104, 21, -104, 16, -104, -104, -104,
+ 11, -104, 20, -104, 25, -104, -104, -104, -104, -104,
+ -104, -104, -104, -104, -104, -104, -104, -104, -104, -104,
+ -104, -1, -104, -104, -104, -104, 13, 10, -104, 9,
+ 6, -104, -104, -104, -104, -104, -104, -104, -104, 81,
+ -104, -104, 14, -104, 33, 95, -104, -104, -104, -104,
+ -104, -104, -104, -104, -104, -104, -104, -13, -104, -104,
+ 72, -104, -104, -104};
const int JavaScriptGrammar::action_info [] = {
- 277, 473, -81, -89, -67, -94, -71, 368, 460, -97,
- -70, -92, 193, 409, -100, 338, 355, 345, 332, 292,
- 312, 164, 326, 411, 324, 423, 477, 351, 353, 421,
- 360, 187, 365, 372, 363, 164, 362, 510, 509, 122,
- 32, 33, 94, 512, 551, 502, 360, 7, 2, 545,
- 170, 124, 172, 502, 27, 436, 484, 314, 440, 419,
- 464, 484, 451, 187, 460, 490, 164, 316, 460, 466,
- 122, 124, 206, 473, 477, 368, 460, 429, 450, 434,
- 366, 428, 436, 256, 468, 277, 332, 321, 292, 213,
- 272, 94, 0, 210, 164, 312, 164, 164, 463, 164,
- 0, 164, 164, 0, 81, 81, 164, 447, 454, 164,
- 444, 202, 464, 189, 485, 82, 82, 190, 164, 366,
- 212, 164, 527, 314, 527, 0, 271, 276, 275, 262,
- 261, 530, 267, 266, 513, 433, 432, 269, 268, 514,
- 164, 366, 514, 87, 81, 502, 475, 0, 274, 357,
- 2, 438, 448, 479, 370, 82, 538, 537, 330, 28,
- 85, 0, 486, 269, 268, 81, 200, 502, 60, 165,
- 536, 86, 528, 60, 164, 0, 82, 548, 9, 8,
- 60, 0, 195, 60, 108, 60, 109, 28, 88, 108,
- 0, 109, 494, 0, 89, 0, 334, 110, 0, 0,
- 335, 196, 110, 426, 30, 72, 73, 60, 0, 60,
- 72, 73, 108, 60, 109, 29, 164, 72, 73, 126,
- 72, 73, 72, 73, 60, 110, 60, 255, 254, 87,
- 549, 547, 30, 87, 60, 195, 0, 347, 127, 108,
- 128, 109, 0, 29, 72, 73, 72, 73, 60, 0,
- 72, 73, 110, 108, 196, 109, 197, 0, 0, 0,
- 60, 72, 73, 72, 73, 0, 110, 294, 295, 458,
- 457, 72, 73, 60, 88, 294, 295, 0, 88, 0,
- 89, 96, 97, 0, 89, 72, 73, 96, 97, 60,
- 348, 0, 260, 259, 296, 297, -311, 72, 73, 522,
- 0, 0, 296, 297, 0, 265, 264, 60, 98, 99,
- 72, 73, 0, 0, 98, 99, 299, 300, 0, 60,
- 108, 0, 109, 0, 0, 301, 72, 73, 302, 19,
- 303, 0, 0, 110, 101, 102, 72, 73, 0, 265,
- 264, 0, 103, 104, 72, 73, 105, 0, 106, 0,
- 484, 260, 259, 101, 102, 18, 72, 73, 0, 0,
- 484, 103, 104, 0, 0, 105, 14, 106, 101, 102,
- 0, 522, 14, 0, 0, 0, 103, 104, 15, 0,
- 105, 522, 106, 0, 15, 16, 299, 300, 0, 0,
- 0, 16, 0, 0, 0, 301, 0, 0, 302, 0,
- 303, 19, 0, 0, 0, 0, 0, 0, 72, 73,
- 0, 19, 0, 0, 0, 19, 0, 0, 72, 73,
- 0, 19, 17, 20, 0, 0, 0, 18, 17, 20,
- 21, 14, 0, 0, 14, 0, 21, 18, 0, 13,
- 0, 18, 0, 15, 0, 13, 15, 18, 0, 0,
- 16, 0, 0, 16, 101, 102, 0, 0, 0, 0,
- 0, 0, 103, 104, 0, 0, 105, 0, 106, 0,
- 0, 0, 0, 0, 0, 0, 506, 0, 0, 504,
- 19, 0, 0, 19, 0, 0, 0, 17, 20, 174,
- 17, 20, 0, 0, 0, 21, 0, 0, 21, 175,
- 0, 0, 0, 176, 13, 0, 18, 13, 0, 18,
- 0, 0, 177, 0, 178, 0, 0, 328, 0, 0,
- 0, 0, 174, 0, 0, 179, 0, 180, 85, 0,
- 0, 0, 175, 0, 0, 181, 176, 0, 182, 86,
- 0, 0, 0, 0, 183, 177, 0, 178, 0, 0,
- 184, 0, 0, 0, 0, 0, 0, 0, 179, 0,
- 180, 85, 0, 0, 0, 185, 0, 0, 181, 0,
- 0, 182, 86, 0, 0, 0, 0, 183, 0, 0,
- 0, 0, 0, 184, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 185, 0,
+ 319, 451, 457, 375, -69, 328, 547, 339, -73, -91,
+ -94, 451, 451, 321, 339, -96, 299, 171, -72, 331,
+ 471, 447, 333, 443, 510, 171, 484, 367, -99, -102,
+ 372, 430, 428, 416, 480, 511, 426, 370, 497, 418,
+ 379, 369, 352, 458, 362, 491, 284, -83, 278, 467,
+ 473, 467, 360, 467, 435, 367, 217, 194, 200, 373,
+ 358, 2, 553, 279, 441, 436, 2, 220, 194, 101,
+ 40, 213, 491, 177, 101, 284, 467, 480, 484, 513,
+ 443, 375, 171, 475, 299, 323, 14, 14, 263, 11,
+ 39, 516, 219, 492, 129, 0, 529, 373, 209, 517,
+ 532, 454, 171, 171, 171, 171, 529, 179, 517, 373,
+ 0, 171, 461, 171, 470, 34, 0, 129, 319, 88,
+ 88, 7, 196, 14, 171, 171, 197, 345, 471, 171,
+ 89, 89, 276, 275, 171, 14, 171, 131, 171, 440,
+ 439, 493, 276, 275, 538, 321, 455, 540, 539, 92,
+ 172, 207, 94, 88, 530, 0, 501, 377, 0, 202,
+ 93, 283, 282, 364, 89, 269, 268, 274, 273, 341,
+ 9, 8, 88, 342, 0, 67, 337, 281, 203, 67,
+ 204, 482, 115, 89, 116, 115, 486, 116, 445, 0,
+ 94, 465, 464, 0, 115, 117, 116, 95, 117, 94,
+ 0, 35, 115, 96, 116, 67, 115, 117, 116, 202,
+ 0, 354, 79, 80, 550, 117, 79, 80, 115, 117,
+ 116, 115, 0, 116, 115, 115, 116, 116, 203, 0,
+ 433, 117, 133, 67, 117, 95, 67, 117, 117, 67,
+ 0, 96, 79, 80, 95, 67, 37, 67, 171, 67,
+ 96, 134, 67, 135, 67, 35, 115, 36, 116, 0,
+ 0, 67, 0, 0, 355, 0, 0, 551, 549, 117,
+ 79, 80, 0, 79, 80, 0, 79, 80, 301, 302,
+ 0, 67, 79, 80, 79, 80, 79, 80, -313, 79,
+ 80, 79, 80, 0, 115, 67, 116, 0, 79, 80,
+ 37, 262, 261, 301, 302, 303, 304, 117, 21, 0,
+ 67, 36, 306, 307, 0, 0, 0, 0, 79, 80,
+ 0, 308, 0, 0, 309, 0, 310, 272, 271, 0,
+ 303, 304, 79, 80, 0, 0, 0, 0, 25, 0,
+ 306, 307, 267, 266, 0, 79, 80, 79, 80, 308,
+ 0, 0, 309, 67, 310, 0, 306, 307, 0, 0,
+ 103, 104, 306, 307, 24, 308, 67, 0, 309, 0,
+ 310, 308, 0, 0, 309, 0, 310, 0, 0, 0,
+ 0, 0, 0, 0, 0, 272, 271, 105, 106, 0,
+ 79, 80, 491, 108, 109, 0, 0, 0, 267, 266,
+ 0, 110, 111, 79, 80, 112, 0, 113, 108, 109,
+ 0, 0, 0, 21, 491, 0, 110, 111, 108, 109,
+ 112, 0, 113, 0, 0, 19, 110, 111, 0, 0,
+ 112, 0, 113, 306, 307, 21, 0, 20, 0, 0,
+ 0, 0, 308, 25, 21, 309, 0, 310, 19, 0,
+ 79, 80, 0, 0, 0, 0, 0, 0, 0, 0,
+ 20, 0, 0, 0, 0, 25, 0, 21, 0, 24,
+ 514, 0, 79, 80, 25, 0, 0, 0, 0, 0,
+ 0, 22, 26, 0, 0, 0, 0, 0, 0, 27,
+ 0, 24, 0, 23, 0, 0, 0, 25, 18, 0,
+ 24, 108, 109, 0, 22, 26, 181, 0, 0, 110,
+ 111, 0, 27, 112, 0, 113, 182, 0, 0, 0,
+ 183, 18, 0, 24, 0, 0, 0, 0, 0, 184,
+ 0, 185, 0, 0, 335, 0, 0, 0, 0, 0,
+ 0, 0, 186, 0, 187, 92, 0, 0, 0, 0,
+ 0, 0, 188, 0, 0, 189, 93, 0, 0, 0,
+ 0, 190, 0, 0, 0, 0, 0, 191, 0, 181,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 182,
+ 0, 0, 192, 183, 0, 0, 0, 0, 0, 0,
+ 0, 0, 184, 0, 185, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 186, 0, 187, 92, 0,
+ 0, 0, 0, 0, 0, 188, 0, 0, 189, 93,
+ 0, 0, 0, 0, 190, 0, 0, 0, 0, 0,
+ 191, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 192, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 63, 64, 0,
+ 0, 0, 0, 0, 0, 0, 0, 66, 0, 0,
+ 0, 0, 0, 0, 67, 0, 0, 0, 68, 69,
+ 0, 70, 0, 0, 0, 0, 0, 0, 73, 0,
+ 0, 0, 76, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 56, 57, 0, 0, 0, 0, 0, 0, 0, 0,
- 59, 0, 0, 0, 0, 0, 0, 60, 0, 0,
- 0, 61, 62, 0, 63, 0, 0, 0, 0, 0,
- 0, 66, 0, 0, 0, 69, 0, 0, 0, 0,
+ 81, 79, 80, 0, 82, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 75, 84, 65, 0, 0,
+ 0, 0, 0, 0, 0, 0, 62, 63, 64, 0,
+ 0, 0, 0, 0, 0, 0, 0, 66, 0, 0,
+ 0, 0, 0, 0, 67, 0, 0, 0, 68, 69,
+ 0, 70, 0, 0, 0, 71, 0, 72, 73, 74,
+ 0, 0, 76, 0, 0, 0, 77, 0, 78, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 74, 72, 73, 0, 75, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 68, 77,
- 58, 0, 0, 0, 0, 0, 0, 0, 0, 55,
- 56, 57, 0, 0, 0, 0, 0, 0, 0, 0,
- 59, 0, 0, 0, 0, 0, 0, 60, 0, 0,
- 0, 61, 62, 0, 63, 0, 0, 0, 64, 0,
- 65, 66, 67, 0, 0, 69, 0, 0, 0, 70,
- 0, 71, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 74, 72, 73, 0, 75, 0, 76,
- 0, 78, 0, 79, 0, 0, 0, 0, 68, 77,
- 58, 0, 0, 0, 0, 0, 0, 0, 0, -90,
- 0, 0, 0, 55, 56, 57, 0, 0, 0, 0,
- 0, 0, 0, 0, 59, 0, 0, 0, 0, 0,
- 0, 60, 0, 0, 0, 61, 62, 0, 63, 0,
- 0, 0, 64, 0, 65, 66, 67, 0, 0, 69,
- 0, 0, 0, 70, 0, 71, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 74, 72, 73,
- 0, 75, 0, 76, 0, 78, 0, 79, 0, 0,
- 0, 0, 68, 77, 58, 0, 0, 0, 0, 0,
- 0, 0, 0, 55, 56, 57, 0, 0, 0, 0,
- 0, 0, 0, 0, 59, 0, 0, 0, 0, 0,
- 0, 60, 0, 0, 0, 61, 62, 0, 63, 0,
- 0, 0, 64, 0, 65, 66, 67, 0, 0, 69,
- 0, 0, 0, 70, 0, 71, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 74, 72, 73,
- 0, 75, 0, 76, 0, 78, 291, 79, 0, 0,
- 0, 0, 68, 77, 58, 0, 0, 0, 0, 0,
- 0, 0, 0, 55, 56, 57, 0, 0, 0, 0,
- 0, 0, 0, 0, 59, 0, 0, 0, 0, 0,
- 0, 60, 0, 0, 0, 61, 62, 0, 63, 0,
- 0, 0, 64, 0, 65, 66, 67, 0, 0, 69,
- 0, 0, 0, 70, 0, 71, 0, 0, 492, 0,
- 0, 0, 0, 0, 0, 0, 0, 74, 72, 73,
- 0, 75, 0, 76, 0, 78, 0, 79, 0, 0,
- 0, 0, 68, 77, 58, 0, 0, 0, 0, 0,
- 0, 0, 0, 55, 56, 57, 0, 0, 0, 0,
- 0, 0, 0, 0, 59, 0, 0, 0, 0, 0,
- 0, 60, 0, 0, 0, 61, 62, 0, 63, 0,
- 0, 0, 64, 0, 65, 66, 67, 0, 0, 69,
- 0, 0, 0, 70, 0, 71, 0, 0, 489, 0,
- 0, 0, 0, 0, 0, 0, 0, 74, 72, 73,
- 0, 75, 0, 76, 0, 78, 0, 79, 0, 0,
- 0, 0, 68, 77, 58, 0, 0, 0, 0, 0,
- 0, 0, 0, 132, 133, 134, 0, 0, 136, 138,
- 139, 0, 0, 140, 0, 141, 0, 0, 0, 143,
- 144, 145, 0, 0, 0, 0, 0, 0, 60, 146,
- 147, 148, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 149, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 152, 0,
- 0, 0, 0, 0, 0, 72, 73, 153, 154, 155,
- 0, 157, 158, 159, 160, 161, 162, 0, 0, 150,
- 156, 142, 135, 137, 151, 0, 0, 0, 0, 0,
- 132, 133, 134, 0, 0, 136, 138, 139, 0, 0,
- 140, 0, 141, 0, 0, 0, 143, 144, 145, 0,
- 0, 0, 0, 0, 0, 413, 146, 147, 148, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 149,
- 0, 0, 0, 414, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 152, 0, 0, 0, 0,
- 0, 418, 415, 417, 153, 154, 155, 0, 157, 158,
- 159, 160, 161, 162, 0, 0, 150, 156, 142, 135,
- 137, 151, 0, 0, 0, 0, 0, 132, 133, 134,
- 0, 0, 136, 138, 139, 0, 0, 140, 0, 141,
- 0, 0, 0, 143, 144, 145, 0, 0, 0, 0,
- 0, 0, 413, 146, 147, 148, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 149, 0, 0, 0,
- 414, 0, 0, 0, 0, 0, 0, 0, 416, 0,
- 0, 0, 152, 0, 0, 0, 0, 0, 418, 415,
- 417, 153, 154, 155, 0, 157, 158, 159, 160, 161,
- 162, 0, 0, 150, 156, 142, 135, 137, 151, 0,
- 0, 0, 0, 0, 232, 0, 0, 0, 0, 233,
- 0, 55, 56, 57, 235, 0, 0, 0, 0, 0,
- 0, 236, 59, 0, 0, 0, 0, 0, 0, 238,
- 239, 0, 0, 240, 62, 0, 63, 0, 0, 0,
- 64, 0, 65, 66, 67, 0, 0, 69, 0, 0,
- 0, 70, 0, 71, 0, 0, 0, 0, 0, 242,
- 0, 243, 0, 0, 0, 74, 241, 244, 245, 75,
- 246, 76, 247, 78, 21, 79, 248, 249, 0, 0,
- 68, 77, 58, 13, 234, 0, 0, 0, 0, 0,
- 0, 232, 0, 0, 0, 0, 233, 0, 55, 56,
- 57, 235, 0, 0, 0, 0, 0, 0, 236, 237,
- 0, 0, 0, 0, 0, 0, 238, 239, 0, 0,
- 240, 62, 0, 63, 0, 0, 0, 64, 0, 65,
- 66, 67, 0, 0, 69, 0, 0, 0, 70, 0,
- 71, 0, 0, 0, 0, 0, 242, 0, 243, 0,
- 0, 0, 74, 241, 244, 245, 75, 246, 76, 247,
- 78, 21, 79, 248, 249, 0, 0, 68, 77, 58,
- 13, 234, 0, 0, 0, 0, 0, 0, 232, 0,
- 0, 0, 0, 233, 0, 55, 56, 57, 235, 0,
- 0, 0, 0, 0, 0, 236, 59, 0, 0, 0,
- 0, 0, 0, 532, 239, 0, 0, 240, 533, 0,
- 63, 0, 0, 0, 64, 0, 65, 66, 67, 0,
- 0, 69, 0, 0, 0, 70, 0, 71, 0, 0,
- 0, 0, 0, 242, 0, 243, 0, 0, 0, 74,
- 241, 244, 245, 75, 246, 76, 247, 78, 21, 79,
- 248, 249, 0, 0, 68, 77, 58, 13, 234, 0,
- 0, 0, 0, 0, 0, 232, 0, 0, 0, 0,
- 233, 0, 55, 56, 57, 235, 0, 0, 0, 0,
- 0, 0, 236, 59, 0, 0, 0, 0, 0, 0,
- 516, 239, 0, 0, 240, 517, 0, 63, 0, 0,
- 0, 64, 0, 65, 66, 67, 0, 0, 69, 0,
- 0, 0, 70, 0, 71, 0, 0, 0, 0, 0,
- 242, 0, 243, 0, 0, 0, 74, 241, 244, 245,
- 75, 246, 76, 247, 78, 21, 79, 248, 249, 0,
- 0, 68, 77, 58, 13, 234, 0, 518, 0, 0,
- 0, 0, 381, 133, 134, 0, 0, 383, 138, 385,
- 56, 57, 386, 0, 141, 0, 0, 0, 143, 388,
- 389, 0, 0, 0, 0, 0, 0, 390, 391, 147,
- 148, 240, 62, 0, 63, 0, 0, 0, 64, 0,
- 65, 392, 67, 0, 0, 394, 0, 0, 0, 70,
- 0, 71, 0, -236, 0, 0, 0, 396, 0, 243,
- 0, 0, 0, 398, 395, 397, 399, 400, 401, 76,
- 403, 404, 405, 406, 407, 408, 0, 0, 393, 402,
- 387, 382, 384, 151, 0, 0, 0, 0, 0,
+ 81, 79, 80, 0, 82, 0, 83, 0, 85, 0,
+ 86, 0, 0, 0, 0, 75, 84, 65, 0, 0,
+ 0, 0, 0, 0, 0, 0, 62, 63, 64, 0,
+ 0, 0, 0, 0, 0, 0, 0, 66, 0, 0,
+ 0, 0, 0, 0, 67, 0, 0, 0, 68, 69,
+ 0, 70, 0, 0, 0, 71, 0, 72, 73, 74,
+ 0, 0, 76, 0, 0, 0, 77, 0, 78, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 81, 79, 80, 0, 82, 0, 83, 0, 85, 298,
+ 86, 0, 0, 0, 0, 75, 84, 65, 0, 0,
+ 0, 0, 0, 0, 0, 0, -92, 0, 0, 0,
+ 62, 63, 64, 0, 0, 0, 0, 0, 0, 0,
+ 0, 66, 0, 0, 0, 0, 0, 0, 67, 0,
+ 0, 0, 68, 69, 0, 70, 0, 0, 0, 71,
+ 0, 72, 73, 74, 0, 0, 76, 0, 0, 0,
+ 77, 0, 78, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 81, 79, 80, 0, 82, 0,
+ 83, 0, 85, 0, 86, 0, 0, 0, 0, 75,
+ 84, 65, 0, 0, 0, 0, 0, 0, 0, 0,
+ 62, 63, 64, 0, 0, 0, 0, 0, 0, 0,
+ 0, 66, 0, 0, 0, 0, 0, 0, 67, 0,
+ 0, 0, 68, 69, 0, 70, 0, 0, 0, 71,
+ 0, 72, 73, 74, 0, 0, 76, 0, 0, 0,
+ 77, 0, 78, 0, 0, 496, 0, 0, 0, 0,
+ 0, 0, 0, 0, 81, 79, 80, 0, 82, 0,
+ 83, 0, 85, 0, 86, 0, 0, 0, 0, 75,
+ 84, 65, 0, 0, 0, 0, 0, 0, 0, 0,
+ 62, 63, 64, 0, 0, 0, 0, 0, 0, 0,
+ 0, 66, 0, 0, 0, 0, 0, 0, 67, 0,
+ 0, 0, 68, 69, 0, 70, 0, 0, 0, 71,
+ 0, 72, 73, 74, 0, 0, 76, 0, 0, 0,
+ 77, 0, 78, 0, 0, 499, 0, 0, 0, 0,
+ 0, 0, 0, 0, 81, 79, 80, 0, 82, 0,
+ 83, 0, 85, 0, 86, 0, 0, 0, 0, 75,
+ 84, 65, 0, 0, 0, 0, 0, 0, 0, 0,
+ 139, 140, 141, 0, 0, 143, 145, 146, 0, 0,
+ 147, 0, 148, 0, 0, 0, 150, 151, 152, 0,
+ 0, 0, 0, 0, 0, 67, 153, 154, 155, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 156,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 159, 0, 0, 0, 0,
+ 0, 0, 79, 80, 160, 161, 162, 0, 164, 165,
+ 166, 167, 168, 169, 0, 0, 157, 163, 149, 142,
+ 144, 158, 0, 0, 0, 0, 0, 139, 140, 141,
+ 0, 0, 143, 145, 146, 0, 0, 147, 0, 148,
+ 0, 0, 0, 150, 151, 152, 0, 0, 0, 0,
+ 0, 0, 420, 153, 154, 155, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 156, 0, 0, 0,
+ 421, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 159, 0, 0, 0, 0, 0, 425, 422,
+ 424, 160, 161, 162, 0, 164, 165, 166, 167, 168,
+ 169, 0, 0, 157, 163, 149, 142, 144, 158, 0,
+ 0, 0, 0, 0, 139, 140, 141, 0, 0, 143,
+ 145, 146, 0, 0, 147, 0, 148, 0, 0, 0,
+ 150, 151, 152, 0, 0, 0, 0, 0, 0, 420,
+ 153, 154, 155, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 156, 0, 0, 0, 421, 0, 0,
+ 0, 0, 0, 0, 0, 423, 0, 0, 0, 159,
+ 0, 0, 0, 0, 0, 425, 422, 424, 160, 161,
+ 162, 0, 164, 165, 166, 167, 168, 169, 0, 0,
+ 157, 163, 149, 142, 144, 158, 0, 0, 0, 0,
+ 0, 239, 0, 0, 0, 0, 240, 0, 62, 63,
+ 64, 242, 0, 0, 0, 0, 0, 0, 243, 66,
+ 0, 0, 0, 0, 0, 0, 245, 246, 0, 0,
+ 247, 69, 0, 70, 0, 0, 0, 71, 0, 72,
+ 73, 74, 0, 0, 76, 0, 0, 0, 77, 0,
+ 78, 0, 0, 0, 0, 0, 249, 0, 250, 0,
+ 0, 0, 81, 248, 251, 252, 82, 253, 83, 254,
+ 85, 27, 86, 255, 256, 0, 0, 75, 84, 65,
+ 18, 241, 0, 0, 0, 0, 0, 0, 239, 0,
+ 0, 0, 0, 240, 0, 62, 63, 64, 242, 0,
+ 0, 0, 0, 0, 0, 243, 244, 0, 0, 0,
+ 0, 0, 0, 245, 246, 0, 0, 247, 69, 0,
+ 70, 0, 0, 0, 71, 0, 72, 73, 74, 0,
+ 0, 76, 0, 0, 0, 77, 0, 78, 0, 0,
+ 0, 0, 0, 249, 0, 250, 0, 0, 0, 81,
+ 248, 251, 252, 82, 253, 83, 254, 85, 27, 86,
+ 255, 256, 0, 0, 75, 84, 65, 18, 241, 0,
+ 0, 0, 0, 0, 0, 239, 0, 0, 0, 0,
+ 240, 0, 62, 63, 64, 242, 0, 0, 0, 0,
+ 0, 0, 243, 66, 0, 0, 0, 0, 0, 0,
+ 534, 246, 0, 0, 247, 535, 0, 70, 0, 0,
+ 0, 71, 0, 72, 73, 74, 0, 0, 76, 0,
+ 0, 0, 77, 0, 78, 0, 0, 0, 0, 0,
+ 249, 0, 250, 0, 0, 0, 81, 248, 251, 252,
+ 82, 253, 83, 254, 85, 27, 86, 255, 256, 0,
+ 0, 75, 84, 65, 18, 241, 0, 0, 0, 0,
+ 0, 0, 239, 0, 0, 0, 0, 240, 0, 62,
+ 63, 64, 242, 0, 0, 0, 0, 0, 0, 243,
+ 66, 0, 0, 0, 0, 0, 0, 519, 246, 0,
+ 0, 247, 520, 0, 70, 0, 0, 0, 71, 0,
+ 72, 73, 74, 0, 0, 76, 0, 0, 0, 77,
+ 0, 78, 0, 0, 0, 0, 0, 249, 0, 250,
+ 0, 0, 0, 81, 248, 251, 252, 82, 253, 83,
+ 254, 85, 27, 86, 255, 256, 0, 0, 75, 84,
+ 65, 18, 241, 0, 521, 0, 0, 0, 0, 388,
+ 140, 141, 0, 0, 390, 145, 392, 63, 64, 393,
+ 0, 148, 0, 0, 0, 150, 395, 396, 0, 0,
+ 0, 0, 0, 0, 397, 398, 154, 155, 247, 69,
+ 0, 70, 0, 0, 0, 71, 0, 72, 399, 74,
+ 0, 0, 401, 0, 0, 0, 77, 0, 78, 0,
+ -238, 0, 0, 0, 403, 0, 250, 0, 0, 0,
+ 405, 402, 404, 406, 407, 408, 83, 410, 411, 412,
+ 413, 414, 415, 0, 0, 400, 409, 394, 389, 391,
+ 158, 0, 0, 0, 0, 0,
- 455, 534, 521, 452, 493, 199, 465, 173, 488, 539,
- 42, 445, 359, 322, 211, 209, 449, 470, 31, 480,
- 273, 531, 487, 192, 491, 194, 511, 540, 476, 515,
- 467, 469, 456, 526, 459, 474, 205, 420, 435, 10,
- 412, 163, 373, 169, 371, 546, 410, 369, 205, 270,
- 322, 166, 171, 422, 456, 258, 263, 367, 430, 270,
- 331, 340, 327, 329, 358, 459, 186, 437, 263, 453,
- 354, 501, 0, 356, 258, 0, 83, 340, 540, 169,
- 26, 12, 209, 322, 525, 322, 201, 322, 123, 0,
- 322, 424, 12, 0, 425, 129, 83, 0, 203, 230,
- 83, 83, 223, 0, 131, 113, 83, 0, 83, 0,
- 125, 84, 121, 478, 83, 83, 497, 498, 83, 424,
- 83, 0, 425, 83, 100, 496, 119, 323, 83, 325,
- 83, 350, 495, 308, 352, 83, 83, 499, 471, 0,
- 550, 349, 83, 83, 472, 90, 83, 169, 91, 83,
- 83, 500, 92, 83, 427, 83, 0, 83, 361, 120,
- 107, 111, 83, 83, 83, 471, 83, 304, 112, 93,
- 83, 83, 83, 83, 83, 307, 305, 306, 83, 83,
- 83, 286, 83, 116, 114, 115, 290, 117, 188, 191,
- 83, 83, 472, 203, 83, 535, 83, 0, 525, 118,
- 83, 290, 529, 0, 525, 318, 12, 0, 95, 83,
- 290, 0, 12, 336, 290, 83, 230, 0, 318, 223,
- 290, 0, 313, 290, 318, 318, 315, 317, 83, 290,
- 290, 83, 83, 290, 505, 0, 290, 290, 311, 310,
- 320, 507, 0, 333, 507, 0, 339, 346, 129, 26,
- 12, 0, 26, 12, 318, 26, 12, 131, 198, 290,
- 83, 83, 0, 0, 0, 290, 290, 230, 309, 293,
- 223, 0, 83, 0, 0, 0, 337, 290, 0, 298,
+ 474, 476, 10, 500, 477, 459, 460, 456, 193, 472,
+ 462, 12, 265, 548, 212, 180, 512, 481, 218, 38,
+ 524, 366, 542, 466, 508, 329, 17, 216, 518, 533,
+ 541, 487, 49, 483, 463, 466, 452, 498, 485, 270,
+ 206, 237, 494, 277, 536, 0, 0, 463, 199, 0,
+ 201, 495, 347, 178, 170, 427, 265, 176, 429, 380,
+ 173, 270, 378, 374, 417, 365, 376, 419, 363, 442,
+ 334, 338, 212, 347, 336, 444, 437, 361, 277, 90,
+ 237, 329, 90, 120, 280, 329, 0, 313, 0, 237,
+ 431, 531, 542, 432, 329, 329, 329, 90, 0, 0,
+ 136, 17, 314, 90, 537, 210, 90, 90, 90, 138,
+ 90, 315, 118, 90, 216, 17, 176, 176, 125, 130,
+ 132, 90, 90, 208, 434, 100, 90, 128, 431, 332,
+ 293, 432, 0, 90, 102, 297, 91, 356, 330, 357,
+ 359, 90, 90, 210, 99, 90, 90, 505, 98, 90,
+ 90, 506, 504, 90, 552, 479, 90, 90, 503, 478,
+ 90, 90, 371, 502, 90, 90, 507, 97, 90, 90,
+ 478, 90, 90, 90, 195, 119, 264, 122, 121, 90,
+ 90, 0, 90, 90, 114, 198, 127, 124, 90, 107,
+ 368, 90, 90, 311, 479, 90, 123, 90, 325, 325,
+ 136, 126, 297, 297, 297, 0, 90, 90, 0, 138,
+ 205, 297, 297, 90, 343, 0, 0, 0, 297, 320,
+ 344, 346, 340, 325, 322, 90, 90, 0, 297, 90,
+ 297, 297, 316, 318, 297, 90, 317, 0, 90, 90,
+ 297, 325, 305, 312, 297, 353, 297, 28, 300, 0,
+ 0, 0, 28, 31, 515, 0, 0, 0, 31, 16,
+ 33, 17, 0, 324, 16, 33, 17, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 364, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 325, 0, 0, 0, 0,
+ 297, 0, 0, 0, 0, 0, 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, 257, 0};
+ 0, 0};
const int JavaScriptGrammar::action_check [] = {
- 36, 36, 7, 7, 7, 7, 7, 36, 33, 7,
- 7, 7, 7, 7, 7, 7, 31, 17, 2, 1,
- 48, 8, 60, 8, 61, 55, 36, 61, 60, 55,
- 36, 2, 55, 16, 33, 8, 60, 7, 29, 48,
- 29, 7, 1, 29, 0, 33, 36, 65, 88, 17,
- 8, 78, 60, 33, 66, 36, 8, 78, 33, 7,
- 20, 8, 7, 2, 33, 8, 8, 8, 33, 36,
- 48, 78, 36, 36, 36, 36, 33, 7, 55, 7,
- 7, 60, 36, 55, 60, 36, 2, 61, 1, 33,
- 36, 1, -1, 8, 8, 48, 8, 8, 6, 8,
- -1, 8, 8, -1, 40, 40, 8, 10, 7, 8,
- 5, 60, 20, 50, 8, 51, 51, 54, 8, 7,
- 60, 8, 8, 78, 8, -1, 76, 61, 62, 61,
- 62, 7, 61, 62, 7, 61, 62, 61, 62, 15,
- 8, 7, 15, 12, 40, 33, 60, -1, 60, 60,
- 88, 60, 55, 60, 60, 51, 61, 62, 60, 29,
- 42, -1, 56, 61, 62, 40, 56, 33, 29, 56,
- 56, 53, 56, 29, 8, -1, 51, 8, 61, 62,
- 29, -1, 15, 29, 25, 29, 27, 29, 57, 25,
- -1, 27, 60, -1, 63, -1, 50, 38, -1, -1,
- 54, 34, 38, 36, 74, 66, 67, 29, -1, 29,
- 66, 67, 25, 29, 27, 85, 8, 66, 67, 15,
- 66, 67, 66, 67, 29, 38, 29, 61, 62, 12,
- 61, 62, 74, 12, 29, 15, -1, 8, 34, 25,
- 36, 27, -1, 85, 66, 67, 66, 67, 29, -1,
- 66, 67, 38, 25, 34, 27, 36, -1, -1, -1,
- 29, 66, 67, 66, 67, -1, 38, 18, 19, 61,
- 62, 66, 67, 29, 57, 18, 19, -1, 57, -1,
- 63, 18, 19, -1, 63, 66, 67, 18, 19, 29,
- 61, -1, 61, 62, 45, 46, 36, 66, 67, 29,
- -1, -1, 45, 46, -1, 61, 62, 29, 45, 46,
- 66, 67, -1, -1, 45, 46, 23, 24, -1, 29,
- 25, -1, 27, -1, -1, 32, 66, 67, 35, 59,
- 37, -1, -1, 38, 23, 24, 66, 67, -1, 61,
- 62, -1, 31, 32, 66, 67, 35, -1, 37, -1,
- 8, 61, 62, 23, 24, 85, 66, 67, -1, -1,
- 8, 31, 32, -1, -1, 35, 10, 37, 23, 24,
- -1, 29, 10, -1, -1, -1, 31, 32, 22, -1,
- 35, 29, 37, -1, 22, 29, 23, 24, -1, -1,
- -1, 29, -1, -1, -1, 32, -1, -1, 35, -1,
- 37, 59, -1, -1, -1, -1, -1, -1, 66, 67,
- -1, 59, -1, -1, -1, 59, -1, -1, 66, 67,
- -1, 59, 66, 67, -1, -1, -1, 85, 66, 67,
- 74, 10, -1, -1, 10, -1, 74, 85, -1, 83,
- -1, 85, -1, 22, -1, 83, 22, 85, -1, -1,
- 29, -1, -1, 29, 23, 24, -1, -1, -1, -1,
- -1, -1, 31, 32, -1, -1, 35, -1, 37, -1,
- -1, -1, -1, -1, -1, -1, 55, -1, -1, 55,
- 59, -1, -1, 59, -1, -1, -1, 66, 67, 3,
- 66, 67, -1, -1, -1, 74, -1, -1, 74, 13,
- -1, -1, -1, 17, 83, -1, 85, 83, -1, 85,
- -1, -1, 26, -1, 28, -1, -1, 31, -1, -1,
- -1, -1, 3, -1, -1, 39, -1, 41, 42, -1,
- -1, -1, 13, -1, -1, 49, 17, -1, 52, 53,
- -1, -1, -1, -1, 58, 26, -1, 28, -1, -1,
- 64, -1, -1, -1, -1, -1, -1, -1, 39, -1,
- 41, 42, -1, -1, -1, 79, -1, -1, 49, -1,
- -1, 52, 53, -1, -1, -1, -1, 58, -1, -1,
- -1, -1, -1, 64, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, -1, -1, 79, -1,
+ 48, 5, 55, 36, 7, 61, 17, 2, 7, 7,
+ 7, 5, 5, 78, 2, 7, 1, 8, 7, 61,
+ 20, 33, 60, 36, 29, 8, 36, 36, 7, 7,
+ 55, 55, 55, 7, 36, 7, 7, 33, 8, 8,
+ 16, 60, 17, 7, 31, 8, 36, 7, 76, 33,
+ 36, 33, 60, 33, 60, 36, 8, 2, 7, 7,
+ 61, 88, 0, 36, 7, 7, 88, 33, 2, 1,
+ 7, 36, 8, 8, 1, 36, 33, 36, 36, 29,
+ 36, 36, 8, 60, 1, 8, 33, 33, 55, 29,
+ 29, 7, 60, 8, 48, -1, 8, 7, 60, 15,
+ 7, 10, 8, 8, 8, 8, 8, 60, 15, 7,
+ -1, 8, 7, 8, 6, 66, -1, 48, 48, 40,
+ 40, 65, 50, 33, 8, 8, 54, 7, 20, 8,
+ 51, 51, 61, 62, 8, 33, 8, 78, 8, 61,
+ 62, 56, 61, 62, 56, 78, 55, 61, 62, 42,
+ 56, 56, 12, 40, 56, -1, 60, 60, -1, 15,
+ 53, 61, 62, 60, 51, 61, 62, 61, 62, 50,
+ 61, 62, 40, 54, -1, 29, 60, 60, 34, 29,
+ 36, 60, 25, 51, 27, 25, 60, 27, 60, -1,
+ 12, 61, 62, -1, 25, 38, 27, 57, 38, 12,
+ -1, 29, 25, 63, 27, 29, 25, 38, 27, 15,
+ -1, 8, 66, 67, 8, 38, 66, 67, 25, 38,
+ 27, 25, -1, 27, 25, 25, 27, 27, 34, -1,
+ 36, 38, 15, 29, 38, 57, 29, 38, 38, 29,
+ -1, 63, 66, 67, 57, 29, 74, 29, 8, 29,
+ 63, 34, 29, 36, 29, 29, 25, 85, 27, -1,
+ -1, 29, -1, -1, 61, -1, -1, 61, 62, 38,
+ 66, 67, -1, 66, 67, -1, 66, 67, 18, 19,
+ -1, 29, 66, 67, 66, 67, 66, 67, 36, 66,
+ 67, 66, 67, -1, 25, 29, 27, -1, 66, 67,
+ 74, 61, 62, 18, 19, 45, 46, 38, 29, -1,
+ 29, 85, 23, 24, -1, -1, -1, -1, 66, 67,
+ -1, 32, -1, -1, 35, -1, 37, 61, 62, -1,
+ 45, 46, 66, 67, -1, -1, -1, -1, 59, -1,
+ 23, 24, 61, 62, -1, 66, 67, 66, 67, 32,
+ -1, -1, 35, 29, 37, -1, 23, 24, -1, -1,
+ 18, 19, 23, 24, 85, 32, 29, -1, 35, -1,
+ 37, 32, -1, -1, 35, -1, 37, -1, -1, -1,
+ -1, -1, -1, -1, -1, 61, 62, 45, 46, -1,
+ 66, 67, 8, 23, 24, -1, -1, -1, 61, 62,
+ -1, 31, 32, 66, 67, 35, -1, 37, 23, 24,
+ -1, -1, -1, 29, 8, -1, 31, 32, 23, 24,
+ 35, -1, 37, -1, -1, 10, 31, 32, -1, -1,
+ 35, -1, 37, 23, 24, 29, -1, 22, -1, -1,
+ -1, -1, 32, 59, 29, 35, -1, 37, 10, -1,
+ 66, 67, -1, -1, -1, -1, -1, -1, -1, -1,
+ 22, -1, -1, -1, -1, 59, -1, 29, -1, 85,
+ 55, -1, 66, 67, 59, -1, -1, -1, -1, -1,
+ -1, 66, 67, -1, -1, -1, -1, -1, -1, 74,
+ -1, 85, -1, 55, -1, -1, -1, 59, 83, -1,
+ 85, 23, 24, -1, 66, 67, 3, -1, -1, 31,
+ 32, -1, 74, 35, -1, 37, 13, -1, -1, -1,
+ 17, 83, -1, 85, -1, -1, -1, -1, -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, -1, -1, 52, 53, -1, -1, -1,
+ -1, 58, -1, -1, -1, -1, -1, 64, -1, 3,
+ -1, -1, -1, -1, -1, -1, -1, -1, -1, 13,
+ -1, -1, 79, 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, -1, -1, 79, -1, -1, -1, -1,
+ -1, -1, -1, -1, -1, -1, -1, 12, 13, -1,
+ -1, -1, -1, -1, -1, -1, -1, 22, -1, -1,
+ -1, -1, -1, -1, 29, -1, -1, -1, 33, 34,
+ -1, 36, -1, -1, -1, -1, -1, -1, 43, -1,
+ -1, -1, 47, -1, -1, -1, -1, -1, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- 12, 13, -1, -1, -1, -1, -1, -1, -1, -1,
- 22, -1, -1, -1, -1, -1, -1, 29, -1, -1,
- -1, 33, 34, -1, 36, -1, -1, -1, -1, -1,
- -1, 43, -1, -1, -1, 47, -1, -1, -1, -1,
+ 65, 66, 67, -1, 69, -1, -1, -1, -1, -1,
+ -1, -1, -1, -1, -1, 80, 81, 82, -1, -1,
+ -1, -1, -1, -1, -1, -1, 11, 12, 13, -1,
+ -1, -1, -1, -1, -1, -1, -1, 22, -1, -1,
+ -1, -1, -1, -1, 29, -1, -1, -1, 33, 34,
+ -1, 36, -1, -1, -1, 40, -1, 42, 43, 44,
+ -1, -1, 47, -1, -1, -1, 51, -1, 53, -1,
-1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, 65, 66, 67, -1, 69, -1, -1,
- -1, -1, -1, -1, -1, -1, -1, -1, 80, 81,
- 82, -1, -1, -1, -1, -1, -1, -1, -1, 11,
- 12, 13, -1, -1, -1, -1, -1, -1, -1, -1,
- 22, -1, -1, -1, -1, -1, -1, 29, -1, -1,
- -1, 33, 34, -1, 36, -1, -1, -1, 40, -1,
- 42, 43, 44, -1, -1, 47, -1, -1, -1, 51,
- -1, 53, -1, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, 65, 66, 67, -1, 69, -1, 71,
- -1, 73, -1, 75, -1, -1, -1, -1, 80, 81,
- 82, -1, -1, -1, -1, -1, -1, -1, -1, 7,
- -1, -1, -1, 11, 12, 13, -1, -1, -1, -1,
- -1, -1, -1, -1, 22, -1, -1, -1, -1, -1,
- -1, 29, -1, -1, -1, 33, 34, -1, 36, -1,
- -1, -1, 40, -1, 42, 43, 44, -1, -1, 47,
- -1, -1, -1, 51, -1, 53, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, -1, 65, 66, 67,
- -1, 69, -1, 71, -1, 73, -1, 75, -1, -1,
- -1, -1, 80, 81, 82, -1, -1, -1, -1, -1,
- -1, -1, -1, 11, 12, 13, -1, -1, -1, -1,
- -1, -1, -1, -1, 22, -1, -1, -1, -1, -1,
- -1, 29, -1, -1, -1, 33, 34, -1, 36, -1,
- -1, -1, 40, -1, 42, 43, 44, -1, -1, 47,
- -1, -1, -1, 51, -1, 53, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, -1, 65, 66, 67,
- -1, 69, -1, 71, -1, 73, 74, 75, -1, -1,
- -1, -1, 80, 81, 82, -1, -1, -1, -1, -1,
- -1, -1, -1, 11, 12, 13, -1, -1, -1, -1,
- -1, -1, -1, -1, 22, -1, -1, -1, -1, -1,
- -1, 29, -1, -1, -1, 33, 34, -1, 36, -1,
- -1, -1, 40, -1, 42, 43, 44, -1, -1, 47,
- -1, -1, -1, 51, -1, 53, -1, -1, 56, -1,
- -1, -1, -1, -1, -1, -1, -1, 65, 66, 67,
- -1, 69, -1, 71, -1, 73, -1, 75, -1, -1,
- -1, -1, 80, 81, 82, -1, -1, -1, -1, -1,
- -1, -1, -1, 11, 12, 13, -1, -1, -1, -1,
- -1, -1, -1, -1, 22, -1, -1, -1, -1, -1,
- -1, 29, -1, -1, -1, 33, 34, -1, 36, -1,
- -1, -1, 40, -1, 42, 43, 44, -1, -1, 47,
- -1, -1, -1, 51, -1, 53, -1, -1, 56, -1,
- -1, -1, -1, -1, -1, -1, -1, 65, 66, 67,
- -1, 69, -1, 71, -1, 73, -1, 75, -1, -1,
- -1, -1, 80, 81, 82, -1, -1, -1, -1, -1,
- -1, -1, -1, 4, 5, 6, -1, -1, 9, 10,
- 11, -1, -1, 14, -1, 16, -1, -1, -1, 20,
- 21, 22, -1, -1, -1, -1, -1, -1, 29, 30,
- 31, 32, -1, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, 43, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, -1, -1, 59, -1,
- -1, -1, -1, -1, -1, 66, 67, 68, 69, 70,
- -1, 72, 73, 74, 75, 76, 77, -1, -1, 80,
- 81, 82, 83, 84, 85, -1, -1, -1, -1, -1,
+ 65, 66, 67, -1, 69, -1, 71, -1, 73, -1,
+ 75, -1, -1, -1, -1, 80, 81, 82, -1, -1,
+ -1, -1, -1, -1, -1, -1, 11, 12, 13, -1,
+ -1, -1, -1, -1, -1, -1, -1, 22, -1, -1,
+ -1, -1, -1, -1, 29, -1, -1, -1, 33, 34,
+ -1, 36, -1, -1, -1, 40, -1, 42, 43, 44,
+ -1, -1, 47, -1, -1, -1, 51, -1, 53, -1,
+ -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
+ 65, 66, 67, -1, 69, -1, 71, -1, 73, 74,
+ 75, -1, -1, -1, -1, 80, 81, 82, -1, -1,
+ -1, -1, -1, -1, -1, -1, 7, -1, -1, -1,
+ 11, 12, 13, -1, -1, -1, -1, -1, -1, -1,
+ -1, 22, -1, -1, -1, -1, -1, -1, 29, -1,
+ -1, -1, 33, 34, -1, 36, -1, -1, -1, 40,
+ -1, 42, 43, 44, -1, -1, 47, -1, -1, -1,
+ 51, -1, 53, -1, -1, -1, -1, -1, -1, -1,
+ -1, -1, -1, -1, 65, 66, 67, -1, 69, -1,
+ 71, -1, 73, -1, 75, -1, -1, -1, -1, 80,
+ 81, 82, -1, -1, -1, -1, -1, -1, -1, -1,
+ 11, 12, 13, -1, -1, -1, -1, -1, -1, -1,
+ -1, 22, -1, -1, -1, -1, -1, -1, 29, -1,
+ -1, -1, 33, 34, -1, 36, -1, -1, -1, 40,
+ -1, 42, 43, 44, -1, -1, 47, -1, -1, -1,
+ 51, -1, 53, -1, -1, 56, -1, -1, -1, -1,
+ -1, -1, -1, -1, 65, 66, 67, -1, 69, -1,
+ 71, -1, 73, -1, 75, -1, -1, -1, -1, 80,
+ 81, 82, -1, -1, -1, -1, -1, -1, -1, -1,
+ 11, 12, 13, -1, -1, -1, -1, -1, -1, -1,
+ -1, 22, -1, -1, -1, -1, -1, -1, 29, -1,
+ -1, -1, 33, 34, -1, 36, -1, -1, -1, 40,
+ -1, 42, 43, 44, -1, -1, 47, -1, -1, -1,
+ 51, -1, 53, -1, -1, 56, -1, -1, -1, -1,
+ -1, -1, -1, -1, 65, 66, 67, -1, 69, -1,
+ 71, -1, 73, -1, 75, -1, -1, -1, -1, 80,
+ 81, 82, -1, -1, -1, -1, -1, -1, -1, -1,
4, 5, 6, -1, -1, 9, 10, 11, -1, -1,
14, -1, 16, -1, -1, -1, 20, 21, 22, -1,
-1, -1, -1, -1, -1, 29, 30, 31, 32, -1,
-1, -1, -1, -1, -1, -1, -1, -1, -1, 43,
- -1, -1, -1, 47, -1, -1, -1, -1, -1, -1,
+ -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
-1, -1, -1, -1, -1, 59, -1, -1, -1, -1,
- -1, 65, 66, 67, 68, 69, 70, -1, 72, 73,
+ -1, -1, 66, 67, 68, 69, 70, -1, 72, 73,
74, 75, 76, 77, -1, -1, 80, 81, 82, 83,
84, 85, -1, -1, -1, -1, -1, 4, 5, 6,
-1, -1, 9, 10, 11, -1, -1, 14, -1, 16,
-1, -1, -1, 20, 21, 22, -1, -1, -1, -1,
-1, -1, 29, 30, 31, 32, -1, -1, -1, -1,
-1, -1, -1, -1, -1, -1, 43, -1, -1, -1,
- 47, -1, -1, -1, -1, -1, -1, -1, 55, -1,
+ 47, -1, -1, -1, -1, -1, -1, -1, -1, -1,
-1, -1, 59, -1, -1, -1, -1, -1, 65, 66,
67, 68, 69, 70, -1, 72, 73, 74, 75, 76,
77, -1, -1, 80, 81, 82, 83, 84, 85, -1,
- -1, -1, -1, -1, 4, -1, -1, -1, -1, 9,
- -1, 11, 12, 13, 14, -1, -1, -1, -1, -1,
- -1, 21, 22, -1, -1, -1, -1, -1, -1, 29,
- 30, -1, -1, 33, 34, -1, 36, -1, -1, -1,
- 40, -1, 42, 43, 44, -1, -1, 47, -1, -1,
- -1, 51, -1, 53, -1, -1, -1, -1, -1, 59,
- -1, 61, -1, -1, -1, 65, 66, 67, 68, 69,
- 70, 71, 72, 73, 74, 75, 76, 77, -1, -1,
- 80, 81, 82, 83, 84, -1, -1, -1, -1, -1,
+ -1, -1, -1, -1, 4, 5, 6, -1, -1, 9,
+ 10, 11, -1, -1, 14, -1, 16, -1, -1, -1,
+ 20, 21, 22, -1, -1, -1, -1, -1, -1, 29,
+ 30, 31, 32, -1, -1, -1, -1, -1, -1, -1,
+ -1, -1, -1, 43, -1, -1, -1, 47, -1, -1,
+ -1, -1, -1, -1, -1, 55, -1, -1, -1, 59,
+ -1, -1, -1, -1, -1, 65, 66, 67, 68, 69,
+ 70, -1, 72, 73, 74, 75, 76, 77, -1, -1,
+ 80, 81, 82, 83, 84, 85, -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,
@@ -696,51 +699,62 @@ const int JavaScriptGrammar::action_check [] = {
-1, -1, 51, -1, 53, -1, -1, -1, -1, -1,
59, -1, 61, -1, -1, -1, 65, 66, 67, 68,
69, 70, 71, 72, 73, 74, 75, 76, 77, -1,
- -1, 80, 81, 82, 83, 84, -1, 86, -1, -1,
- -1, -1, 4, 5, 6, -1, -1, 9, 10, 11,
- 12, 13, 14, -1, 16, -1, -1, -1, 20, 21,
- 22, -1, -1, -1, -1, -1, -1, 29, 30, 31,
- 32, 33, 34, -1, 36, -1, -1, -1, 40, -1,
+ -1, 80, 81, 82, 83, 84, -1, -1, -1, -1,
+ -1, -1, 4, -1, -1, -1, -1, 9, -1, 11,
+ 12, 13, 14, -1, -1, -1, -1, -1, -1, 21,
+ 22, -1, -1, -1, -1, -1, -1, 29, 30, -1,
+ -1, 33, 34, -1, 36, -1, -1, -1, 40, -1,
42, 43, 44, -1, -1, 47, -1, -1, -1, 51,
- -1, 53, -1, 55, -1, -1, -1, 59, -1, 61,
+ -1, 53, -1, -1, -1, -1, -1, 59, -1, 61,
-1, -1, -1, 65, 66, 67, 68, 69, 70, 71,
72, 73, 74, 75, 76, 77, -1, -1, 80, 81,
- 82, 83, 84, 85, -1, -1, -1, -1, -1,
+ 82, 83, 84, -1, 86, -1, -1, -1, -1, 4,
+ 5, 6, -1, -1, 9, 10, 11, 12, 13, 14,
+ -1, 16, -1, -1, -1, 20, 21, 22, -1, -1,
+ -1, -1, -1, -1, 29, 30, 31, 32, 33, 34,
+ -1, 36, -1, -1, -1, 40, -1, 42, 43, 44,
+ -1, -1, 47, -1, -1, -1, 51, -1, 53, -1,
+ 55, -1, -1, -1, 59, -1, 61, -1, -1, -1,
+ 65, 66, 67, 68, 69, 70, 71, 72, 73, 74,
+ 75, 76, 77, -1, -1, 80, 81, 82, 83, 84,
+ 85, -1, -1, -1, -1, -1,
- 76, 9, 9, 76, 15, 15, 93, 58, 24, 18,
- 15, 91, 18, 15, 18, 18, 88, 62, 14, 13,
- 15, 13, 20, 24, 24, 24, 15, 18, 13, 13,
- 18, 62, 15, 9, 62, 15, 18, 24, 13, 5,
- 26, 15, 13, 24, 13, 24, 24, 15, 18, 13,
- 15, 24, 24, 13, 15, 18, 18, 13, 13, 13,
- 13, 18, 13, 15, 13, 62, 24, 15, 18, 15,
- 13, 18, -1, 15, 18, -1, 35, 18, 18, 24,
- 17, 18, 18, 15, 10, 15, 31, 15, 47, -1,
- 15, 29, 18, -1, 32, 18, 35, -1, 37, 13,
- 35, 35, 16, -1, 27, 39, 35, -1, 35, -1,
- 45, 38, 41, 15, 35, 35, 37, 37, 35, 29,
- 35, -1, 32, 35, 41, 37, 41, 59, 35, 59,
- 35, 59, 37, 40, 59, 35, 35, 37, 37, -1,
- 80, 82, 35, 35, 37, 37, 35, 24, 37, 35,
- 35, 37, 37, 35, 31, 35, -1, 35, 94, 41,
- 40, 39, 35, 35, 35, 37, 35, 40, 39, 38,
- 35, 35, 35, 35, 35, 40, 40, 40, 35, 35,
- 35, 35, 35, 40, 40, 40, 40, 40, 49, 51,
- 35, 35, 37, 37, 35, 7, 35, -1, 10, 40,
- 35, 40, 8, -1, 10, 35, 18, -1, 43, 35,
- 40, -1, 18, 52, 40, 35, 13, -1, 35, 16,
- 40, -1, 48, 40, 35, 35, 46, 57, 35, 40,
- 40, 35, 35, 40, 2, -1, 40, 40, 42, 42,
- 57, 6, -1, 50, 6, -1, 57, 57, 18, 17,
- 18, -1, 17, 18, 35, 17, 18, 27, 28, 40,
- 35, 35, -1, -1, -1, 40, 40, 13, 42, 44,
- 16, -1, 35, -1, -1, -1, 57, 40, -1, 42,
+ 20, 64, 5, 17, 64, 78, 17, 90, 26, 95,
+ 78, 6, 20, 26, 20, 60, 17, 17, 20, 16,
+ 11, 20, 20, 64, 20, 17, 20, 20, 15, 15,
+ 20, 15, 17, 15, 17, 64, 93, 26, 17, 20,
+ 17, 15, 22, 15, 11, -1, -1, 17, 26, -1,
+ 26, 26, 20, 26, 17, 26, 20, 26, 15, 15,
+ 26, 20, 15, 15, 26, 15, 17, 28, 17, 15,
+ 15, 15, 20, 20, 17, 17, 15, 15, 15, 37,
+ 15, 17, 37, 41, 17, 17, -1, 42, -1, 15,
+ 31, 10, 20, 34, 17, 17, 17, 37, -1, -1,
+ 20, 20, 42, 37, 9, 39, 37, 37, 37, 29,
+ 37, 42, 41, 37, 20, 20, 26, 26, 42, 49,
+ 47, 37, 37, 33, 33, 40, 37, 43, 31, 61,
+ 37, 34, -1, 37, 45, 42, 40, 84, 61, 61,
+ 61, 37, 37, 39, 39, 37, 37, 39, 39, 37,
+ 37, 39, 39, 37, 82, 39, 37, 37, 39, 39,
+ 37, 37, 97, 39, 37, 37, 39, 39, 37, 37,
+ 39, 37, 37, 37, 51, 41, 102, 42, 42, 37,
+ 37, -1, 37, 37, 42, 53, 43, 42, 37, 43,
+ 96, 37, 37, 42, 39, 37, 42, 37, 37, 37,
+ 20, 43, 42, 42, 42, -1, 37, 37, -1, 29,
+ 30, 42, 42, 37, 54, -1, -1, -1, 42, 50,
+ 59, 59, 52, 37, 48, 37, 37, -1, 42, 37,
+ 42, 42, 44, 44, 42, 37, 44, -1, 37, 37,
+ 42, 37, 44, 42, 42, 59, 42, 6, 46, -1,
+ -1, -1, 6, 12, 8, -1, -1, -1, 12, 18,
+ 19, 20, -1, 59, 18, 19, 20, -1, -1, -1,
+ -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, -1, -1, 95, -1,
-1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
+ -1, -1, -1, -1, -1, 37, -1, -1, -1, -1,
+ 42, -1, -1, -1, -1, -1, -1, -1, -1, -1,
+ -1, -1, -1, -1, -1, -1, -1, 59, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, 100, -1};
+ -1, -1};
diff --git a/src/declarative/qml/parser/javascriptgrammar_p.h b/src/declarative/qml/parser/javascriptgrammar_p.h
index c01d1cc..3b98238 100644
--- a/src/declarative/qml/parser/javascriptgrammar_p.h
+++ b/src/declarative/qml/parser/javascriptgrammar_p.h
@@ -150,15 +150,15 @@ public:
T_XOR = 78,
T_XOR_EQ = 79,
- ACCEPT_STATE = 551,
- RULE_COUNT = 315,
- STATE_COUNT = 552,
+ ACCEPT_STATE = 553,
+ RULE_COUNT = 317,
+ STATE_COUNT = 554,
TERMINAL_COUNT = 91,
- NON_TERMINAL_COUNT = 102,
+ NON_TERMINAL_COUNT = 104,
- GOTO_INDEX_OFFSET = 552,
- GOTO_INFO_OFFSET = 1789,
- GOTO_CHECK_OFFSET = 1789
+ GOTO_INDEX_OFFSET = 554,
+ GOTO_INFO_OFFSET = 1836,
+ GOTO_CHECK_OFFSET = 1836
};
static const char *const spell [];
diff --git a/src/declarative/qml/parser/javascriptparser.cpp b/src/declarative/qml/parser/javascriptparser.cpp
index 897f0ce..0857eef 100644
--- a/src/declarative/qml/parser/javascriptparser.cpp
+++ b/src/declarative/qml/parser/javascriptparser.cpp
@@ -199,51 +199,55 @@ case 8: {
} break;
case 9: {
+ sym(1).Node = makeAstNode<AST::UiObjectMemberList> (driver->nodePool(), sym(1).UiObjectMember);
+} break;
+
+case 10: {
AST::UiObjectMemberList *node = makeAstNode<AST:: UiObjectMemberList> (driver->nodePool(),
sym(1).UiObjectMemberList, sym(2).UiObjectMember);
sym(1).Node = node;
} break;
-case 10: {
+case 11: {
sym(1).Node = makeAstNode<AST::UiObjectMemberList> (driver->nodePool(), sym(1).UiObjectMember);
} break;
-case 11: {
+case 12: {
AST::UiObjectMemberList *node = makeAstNode<AST:: UiObjectMemberList> (driver->nodePool(),
sym(1).UiObjectMemberList, sym(3).UiObjectMember);
sym(1).Node = node;
} break;
-case 12: {
+case 13: {
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 13: {
+case 14: {
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 14:
-case 15: {
+ case 15:
+case 16: {
AST::UiObjectBinding *node = makeAstNode<AST::UiObjectBinding> (driver->nodePool(), sym(1).UiQualifiedId->finish(),
sym(3).sval, sym(4).UiObjectInitializer);
node->colonToken = loc(2);
node->identifierToken = loc(3);
sym(1).Node = node;
} break;
- case 16:
+
case 17: {
AST::UiObjectDefinition *node = makeAstNode<AST::UiObjectDefinition> (driver->nodePool(), sym(1).sval,
sym(2).UiObjectInitializer);
node->identifierToken = loc(1);
sym(1).Node = node;
} break;
- case 18:
-case 19: {
+ case 20:
+case 21: {
AST::UiArrayBinding *node = makeAstNode<AST::UiArrayBinding> (driver->nodePool(), sym(1).UiQualifiedId->finish(),
sym(4).UiObjectMemberList->finish());
node->colonToken = loc(2);
@@ -252,33 +256,33 @@ case 19: {
sym(1).Node = node;
} break;
-case 20: {
+case 22: {
AST::StringLiteral *node = makeAstNode<AST::StringLiteral> (driver->nodePool(), sym(1).sval);
node->literalToken = loc(1);
sym(1).Node = node;
} break;
-case 22: {
+case 24: {
AST::ExpressionStatement *node = makeAstNode<AST::ExpressionStatement> (driver->nodePool(), sym(1).Expression);
node->semicolonToken = loc(2);
sym(1).Node = node;
} break;
- case 23: case 24:
-case 25: {
+ case 25: case 26:
+case 27: {
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 26:
+case 28:
-case 27: {
+case 29: {
sym(1).sval = driver->intern(lexer->characterBuffer(), lexer->characterCount());
break;
}
-case 29: {
+case 31: {
AST::UiPublicMember *node = makeAstNode<AST::UiPublicMember> (driver->nodePool(), (JavaScriptNameIdImpl *)0, sym(2).sval);
node->type = AST::UiPublicMember::Signal;
node->propertyToken = loc(1);
@@ -287,7 +291,7 @@ case 29: {
sym(1).Node = node;
} break;
-case 30: {
+case 32: {
AST::UiPublicMember *node = makeAstNode<AST::UiPublicMember> (driver->nodePool(), sym(2).sval, sym(3).sval);
node->propertyToken = loc(1);
node->typeToken = loc(2);
@@ -295,7 +299,7 @@ case 30: {
sym(1).Node = node;
} break;
-case 31: {
+case 33: {
AST::UiPublicMember *node = makeAstNode<AST::UiPublicMember> (driver->nodePool(), sym(3).sval, sym(4).sval);
node->isDefaultMember = true;
node->defaultToken = loc(1);
@@ -305,7 +309,7 @@ case 31: {
sym(1).Node = node;
} break;
-case 32: {
+case 34: {
AST::UiPublicMember *node = makeAstNode<AST::UiPublicMember> (driver->nodePool(), sym(2).sval, sym(3).sval,
sym(5).Expression);
node->propertyToken = loc(1);
@@ -315,7 +319,7 @@ case 32: {
sym(1).Node = node;
} break;
-case 33: {
+case 35: {
AST::UiPublicMember *node = makeAstNode<AST::UiPublicMember> (driver->nodePool(), sym(3).sval, sym(4).sval,
sym(6).Expression);
node->isDefaultMember = true;
@@ -327,126 +331,124 @@ case 33: {
sym(1).Node = node;
} break;
-case 34: {
+case 36: {
sym(1).Node = makeAstNode<AST::UiSourceElement>(driver->nodePool(), sym(1).Node);
} break;
-case 35: {
+case 37: {
sym(1).Node = makeAstNode<AST::UiSourceElement>(driver->nodePool(), sym(1).Node);
} break;
-case 36:
-case 37:
+case 38:
+case 39:
{
AST::UiQualifiedId *node = makeAstNode<AST::UiQualifiedId> (driver->nodePool(), driver->intern(lexer->characterBuffer(), lexer->characterCount()));
node->identifierToken = loc(1);
sym(1).Node = node;
} break;
-case 39: {
+case 41: {
QString s = QLatin1String(JavaScriptGrammar::spell[T_PROPERTY]);
sym(1).sval = driver->intern(s.constData(), s.length());
break;
}
-case 40: {
+case 42: {
QString s = QLatin1String(JavaScriptGrammar::spell[T_SIGNAL]);
sym(1).sval = driver->intern(s.constData(), s.length());
break;
}
-case 41: {
+case 43: {
AST::UiQualifiedId *node = makeAstNode<AST::UiQualifiedId> (driver->nodePool(), sym(1).sval);
node->identifierToken = loc(1);
sym(1).Node = node;
} break;
-case 42: {
+case 44: {
AST::UiQualifiedId *node = makeAstNode<AST::UiQualifiedId> (driver->nodePool(), sym(1).UiQualifiedId, sym(3).sval);
node->identifierToken = loc(3);
sym(1).Node = node;
} break;
-case 43: {
+case 45: {
AST::ThisExpression *node = makeAstNode<AST::ThisExpression> (driver->nodePool());
node->thisToken = loc(1);
sym(1).Node = node;
} break;
-case 44: {
+case 46: {
AST::IdentifierExpression *node = makeAstNode<AST::IdentifierExpression> (driver->nodePool(), sym(1).sval);
node->identifierToken = loc(1);
sym(1).Node = node;
} break;
-case 45: {
+case 47: {
AST::NullExpression *node = makeAstNode<AST::NullExpression> (driver->nodePool());
node->nullToken = loc(1);
sym(1).Node = node;
} break;
-case 46: {
+case 48: {
AST::TrueLiteral *node = makeAstNode<AST::TrueLiteral> (driver->nodePool());
node->trueToken = loc(1);
sym(1).Node = node;
} break;
-case 47: {
+case 49: {
AST::FalseLiteral *node = makeAstNode<AST::FalseLiteral> (driver->nodePool());
node->falseToken = loc(1);
sym(1).Node = node;
} break;
-case 48: {
+case 50: {
AST::NumericLiteral *node = makeAstNode<AST::NumericLiteral> (driver->nodePool(), sym(1).dval);
node->literalToken = loc(1);
sym(1).Node = node;
} break;
-case 49: {
+case 51: {
AST::StringLiteral *node = makeAstNode<AST::StringLiteral> (driver->nodePool(), sym(1).sval);
node->literalToken = loc(1);
sym(1).Node = node;
} break;
-case 50: {
+case 52: {
bool rx = lexer->scanRegExp(Lexer::NoPrefix);
if (!rx) {
- diagnostic_messages.append(DiagnosticMessage(DiagnosticMessage::Error, lexer->startLineNo(),
- lexer->startColumnNo(), lexer->errorMessage()));
- return false;
+ diagnostic_messages.append(DiagnosticMessage(DiagnosticMessage::Error, location(lexer), lexer->errorMessage()));
+ return false; // ### remove me
}
AST::RegExpLiteral *node = makeAstNode<AST::RegExpLiteral> (driver->nodePool(), lexer->pattern, lexer->flags);
node->literalToken = loc(1);
sym(1).Node = node;
} break;
-case 51: {
+case 53: {
bool rx = lexer->scanRegExp(Lexer::EqualPrefix);
if (!rx) {
- diagnostic_messages.append(DiagnosticMessage(DiagnosticMessage::Error, lexer->startLineNo(),
- lexer->startColumnNo(), lexer->errorMessage()));
- return false;
+ diagnostic_messages.append(DiagnosticMessage(DiagnosticMessage::Error, location(lexer), lexer->errorMessage()));
+ return false;
}
AST::RegExpLiteral *node = makeAstNode<AST::RegExpLiteral> (driver->nodePool(), lexer->pattern, lexer->flags);
node->literalToken = loc(1);
sym(1).Node = node;
} break;
-case 52: {
+case 54: {
AST::ArrayLiteral *node = makeAstNode<AST::ArrayLiteral> (driver->nodePool(), sym(2).Elision);
node->lbracketToken = loc(1);
node->rbracketToken = loc(3);
sym(1).Node = node;
} break;
-case 53: {
+case 55: {
AST::ArrayLiteral *node = makeAstNode<AST::ArrayLiteral> (driver->nodePool(), sym(2).ElementList->finish ());
node->lbracketToken = loc(1);
node->rbracketToken = loc(3);
sym(1).Node = node;
} break;
-case 54: {
+case 56: {
AST::ArrayLiteral *node = makeAstNode<AST::ArrayLiteral> (driver->nodePool(), sym(2).ElementList->finish (), sym(4).Elision);
node->lbracketToken = loc(1);
node->commaToken = loc(3);
@@ -454,7 +456,7 @@ case 54: {
sym(1).Node = node;
} break;
-case 55: {
+case 57: {
AST::ObjectLiteral *node = 0;
if (sym(2).Node)
node = makeAstNode<AST::ObjectLiteral> (driver->nodePool(),
@@ -466,7 +468,7 @@ case 55: {
sym(1).Node = node;
} break;
-case 56: {
+case 58: {
AST::ObjectLiteral *node = makeAstNode<AST::ObjectLiteral> (driver->nodePool(),
sym(2).PropertyNameAndValueList->finish ());
node->lbraceToken = loc(1);
@@ -474,51 +476,51 @@ case 56: {
sym(1).Node = node;
} break;
-case 57: {
+case 59: {
AST::NestedExpression *node = makeAstNode<AST::NestedExpression>(driver->nodePool(), sym(2).Expression);
node->lparenToken = loc(1);
node->rparenToken = loc(3);
sym(1).Node = node;
} break;
-case 58: {
+case 60: {
sym(1).Node = makeAstNode<AST::ElementList> (driver->nodePool(), sym(1).Elision, sym(2).Expression);
} break;
-case 59: {
+case 61: {
AST::ElementList *node = makeAstNode<AST::ElementList> (driver->nodePool(), sym(1).ElementList, sym(3).Elision, sym(4).Expression);
node->commaToken = loc(2);
sym(1).Node = node;
} break;
-case 60: {
+case 62: {
AST::Elision *node = makeAstNode<AST::Elision> (driver->nodePool());
node->commaToken = loc(1);
sym(1).Node = node;
} break;
-case 61: {
+case 63: {
AST::Elision *node = makeAstNode<AST::Elision> (driver->nodePool(), sym(1).Elision);
node->commaToken = loc(2);
sym(1).Node = node;
} break;
-case 62: {
+case 64: {
sym(1).Node = 0;
} break;
-case 63: {
+case 65: {
sym(1).Elision = sym(1).Elision->finish ();
} break;
-case 64: {
+case 66: {
AST::PropertyNameAndValueList *node = makeAstNode<AST::PropertyNameAndValueList> (driver->nodePool(),
sym(1).PropertyName, sym(3).Expression);
node->colonToken = loc(2);
sym(1).Node = node;
} break;
-case 65: {
+case 67: {
AST::PropertyNameAndValueList *node = makeAstNode<AST::PropertyNameAndValueList> (driver->nodePool(),
sym(1).PropertyNameAndValueList, sym(3).PropertyName, sym(5).Expression);
node->commaToken = loc(2);
@@ -526,40 +528,36 @@ case 65: {
sym(1).Node = node;
} break;
-case 66: {
+case 68: {
AST::IdentifierPropertyName *node = makeAstNode<AST::IdentifierPropertyName> (driver->nodePool(), sym(1).sval);
node->propertyNameToken = loc(1);
sym(1).Node = node;
} break;
-case 67:
-case 68: {
+case 69:
+case 70: {
AST::IdentifierPropertyName *node = makeAstNode<AST::IdentifierPropertyName> (driver->nodePool(), driver->intern(lexer->characterBuffer(), lexer->characterCount()));
node->propertyNameToken = loc(1);
sym(1).Node = node;
} break;
-case 69: {
+case 71: {
AST::StringLiteralPropertyName *node = makeAstNode<AST::StringLiteralPropertyName> (driver->nodePool(), sym(1).sval);
node->propertyNameToken = loc(1);
sym(1).Node = node;
} break;
-case 70: {
+case 72: {
AST::NumericLiteralPropertyName *node = makeAstNode<AST::NumericLiteralPropertyName> (driver->nodePool(), sym(1).dval);
node->propertyNameToken = loc(1);
sym(1).Node = node;
} break;
-case 71: {
+case 73: {
AST::IdentifierPropertyName *node = makeAstNode<AST::IdentifierPropertyName> (driver->nodePool(), sym(1).sval);
node->propertyNameToken = loc(1);
sym(1).Node = node;
} break;
-case 72:
-
-case 73:
-
case 74:
case 75:
@@ -617,25 +615,29 @@ case 100:
case 101:
case 102:
+
+case 103:
+
+case 104:
{
sym(1).sval = driver->intern(lexer->characterBuffer(), lexer->characterCount());
} break;
-case 107: {
+case 109: {
AST::ArrayMemberExpression *node = makeAstNode<AST::ArrayMemberExpression> (driver->nodePool(), sym(1).Expression, sym(3).Expression);
node->lbracketToken = loc(2);
node->rbracketToken = loc(4);
sym(1).Node = node;
} break;
-case 108: {
+case 110: {
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 109: {
+case 111: {
AST::NewMemberExpression *node = makeAstNode<AST::NewMemberExpression> (driver->nodePool(), sym(2).Expression, sym(4).ArgumentList);
node->newToken = loc(1);
node->lparenToken = loc(3);
@@ -643,316 +645,309 @@ case 109: {
sym(1).Node = node;
} break;
-case 111: {
+case 113: {
AST::NewExpression *node = makeAstNode<AST::NewExpression> (driver->nodePool(), sym(2).Expression);
node->newToken = loc(1);
sym(1).Node = node;
} break;
-case 112: {
+case 114: {
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 113: {
+case 115: {
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 114: {
+case 116: {
AST::ArrayMemberExpression *node = makeAstNode<AST::ArrayMemberExpression> (driver->nodePool(), sym(1).Expression, sym(3).Expression);
node->lbracketToken = loc(2);
node->rbracketToken = loc(4);
sym(1).Node = node;
} break;
-case 115: {
+case 117: {
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 116: {
+case 118: {
sym(1).Node = 0;
} break;
-case 117: {
+case 119: {
sym(1).Node = sym(1).ArgumentList->finish();
} break;
-case 118: {
+case 120: {
sym(1).Node = makeAstNode<AST::ArgumentList> (driver->nodePool(), sym(1).Expression);
} break;
-case 119: {
+case 121: {
AST::ArgumentList *node = makeAstNode<AST::ArgumentList> (driver->nodePool(), sym(1).ArgumentList, sym(3).Expression);
node->commaToken = loc(2);
sym(1).Node = node;
} break;
-case 123: {
+case 125: {
AST::PostIncrementExpression *node = makeAstNode<AST::PostIncrementExpression> (driver->nodePool(), sym(1).Expression);
node->incrementToken = loc(2);
sym(1).Node = node;
} break;
-case 124: {
+case 126: {
AST::PostDecrementExpression *node = makeAstNode<AST::PostDecrementExpression> (driver->nodePool(), sym(1).Expression);
node->decrementToken = loc(2);
sym(1).Node = node;
} break;
-case 126: {
+case 128: {
AST::DeleteExpression *node = makeAstNode<AST::DeleteExpression> (driver->nodePool(), sym(2).Expression);
node->deleteToken = loc(1);
sym(1).Node = node;
} break;
-case 127: {
+case 129: {
AST::VoidExpression *node = makeAstNode<AST::VoidExpression> (driver->nodePool(), sym(2).Expression);
node->voidToken = loc(1);
sym(1).Node = node;
} break;
-case 128: {
+case 130: {
AST::TypeOfExpression *node = makeAstNode<AST::TypeOfExpression> (driver->nodePool(), sym(2).Expression);
node->typeofToken = loc(1);
sym(1).Node = node;
} break;
-case 129: {
+case 131: {
AST::PreIncrementExpression *node = makeAstNode<AST::PreIncrementExpression> (driver->nodePool(), sym(2).Expression);
node->incrementToken = loc(1);
sym(1).Node = node;
} break;
-case 130: {
+case 132: {
AST::PreDecrementExpression *node = makeAstNode<AST::PreDecrementExpression> (driver->nodePool(), sym(2).Expression);
node->decrementToken = loc(1);
sym(1).Node = node;
} break;
-case 131: {
+case 133: {
AST::UnaryPlusExpression *node = makeAstNode<AST::UnaryPlusExpression> (driver->nodePool(), sym(2).Expression);
node->plusToken = loc(1);
sym(1).Node = node;
} break;
-case 132: {
+case 134: {
AST::UnaryMinusExpression *node = makeAstNode<AST::UnaryMinusExpression> (driver->nodePool(), sym(2).Expression);
node->minusToken = loc(1);
sym(1).Node = node;
} break;
-case 133: {
+case 135: {
AST::TildeExpression *node = makeAstNode<AST::TildeExpression> (driver->nodePool(), sym(2).Expression);
node->tildeToken = loc(1);
sym(1).Node = node;
} break;
-case 134: {
+case 136: {
AST::NotExpression *node = makeAstNode<AST::NotExpression> (driver->nodePool(), sym(2).Expression);
node->notToken = loc(1);
sym(1).Node = node;
} break;
-case 136: {
+case 138: {
AST::BinaryExpression *node = makeAstNode<AST::BinaryExpression> (driver->nodePool(), sym(1).Expression,
QSOperator::Mul, sym(3).Expression);
node->operatorToken = loc(2);
sym(1).Node = node;
} break;
-case 137: {
+case 139: {
AST::BinaryExpression *node = makeAstNode<AST::BinaryExpression> (driver->nodePool(), sym(1).Expression,
QSOperator::Div, sym(3).Expression);
node->operatorToken = loc(2);
sym(1).Node = node;
} break;
-case 138: {
+case 140: {
AST::BinaryExpression *node = makeAstNode<AST::BinaryExpression> (driver->nodePool(), sym(1).Expression,
QSOperator::Mod, sym(3).Expression);
node->operatorToken = loc(2);
sym(1).Node = node;
} break;
-case 140: {
+case 142: {
AST::BinaryExpression *node = makeAstNode<AST::BinaryExpression> (driver->nodePool(), sym(1).Expression,
QSOperator::Add, sym(3).Expression);
node->operatorToken = loc(2);
sym(1).Node = node;
} break;
-case 141: {
+case 143: {
AST::BinaryExpression *node = makeAstNode<AST::BinaryExpression> (driver->nodePool(), sym(1).Expression,
QSOperator::Sub, sym(3).Expression);
node->operatorToken = loc(2);
sym(1).Node = node;
} break;
-case 143: {
+case 145: {
AST::BinaryExpression *node = makeAstNode<AST::BinaryExpression> (driver->nodePool(), sym(1).Expression,
QSOperator::LShift, sym(3).Expression);
node->operatorToken = loc(2);
sym(1).Node = node;
} break;
-case 144: {
+case 146: {
AST::BinaryExpression *node = makeAstNode<AST::BinaryExpression> (driver->nodePool(), sym(1).Expression,
QSOperator::RShift, sym(3).Expression);
node->operatorToken = loc(2);
sym(1).Node = node;
} break;
-case 145: {
+case 147: {
AST::BinaryExpression *node = makeAstNode<AST::BinaryExpression> (driver->nodePool(), sym(1).Expression,
QSOperator::URShift, sym(3).Expression);
node->operatorToken = loc(2);
sym(1).Node = node;
} break;
-case 147: {
+case 149: {
AST::BinaryExpression *node = makeAstNode<AST::BinaryExpression> (driver->nodePool(), sym(1).Expression,
QSOperator::Lt, sym(3).Expression);
node->operatorToken = loc(2);
sym(1).Node = node;
} break;
-case 148: {
+case 150: {
AST::BinaryExpression *node = makeAstNode<AST::BinaryExpression> (driver->nodePool(), sym(1).Expression,
QSOperator::Gt, sym(3).Expression);
node->operatorToken = loc(2);
sym(1).Node = node;
} break;
-case 149: {
+case 151: {
AST::BinaryExpression *node = makeAstNode<AST::BinaryExpression> (driver->nodePool(), sym(1).Expression,
QSOperator::Le, sym(3).Expression);
node->operatorToken = loc(2);
sym(1).Node = node;
} break;
-case 150: {
+case 152: {
AST::BinaryExpression *node = makeAstNode<AST::BinaryExpression> (driver->nodePool(), sym(1).Expression,
QSOperator::Ge, sym(3).Expression);
node->operatorToken = loc(2);
sym(1).Node = node;
} break;
-case 151: {
+case 153: {
AST::BinaryExpression *node = makeAstNode<AST::BinaryExpression> (driver->nodePool(), sym(1).Expression,
QSOperator::InstanceOf, sym(3).Expression);
node->operatorToken = loc(2);
sym(1).Node = node;
} break;
-case 152: {
+case 154: {
AST::BinaryExpression *node = makeAstNode<AST::BinaryExpression> (driver->nodePool(), sym(1).Expression,
QSOperator::In, sym(3).Expression);
node->operatorToken = loc(2);
sym(1).Node = node;
} break;
-case 154: {
+case 156: {
AST::BinaryExpression *node = makeAstNode<AST::BinaryExpression> (driver->nodePool(), sym(1).Expression,
QSOperator::Lt, sym(3).Expression);
node->operatorToken = loc(2);
sym(1).Node = node;
} break;
-case 155: {
+case 157: {
AST::BinaryExpression *node = makeAstNode<AST::BinaryExpression> (driver->nodePool(), sym(1).Expression,
QSOperator::Gt, sym(3).Expression);
node->operatorToken = loc(2);
sym(1).Node = node;
} break;
-case 156: {
+case 158: {
AST::BinaryExpression *node = makeAstNode<AST::BinaryExpression> (driver->nodePool(), sym(1).Expression,
QSOperator::Le, sym(3).Expression);
node->operatorToken = loc(2);
sym(1).Node = node;
} break;
-case 157: {
+case 159: {
AST::BinaryExpression *node = makeAstNode<AST::BinaryExpression> (driver->nodePool(), sym(1).Expression,
QSOperator::Ge, sym(3).Expression);
node->operatorToken = loc(2);
sym(1).Node = node;
} break;
-case 158: {
+case 160: {
AST::BinaryExpression *node = makeAstNode<AST::BinaryExpression> (driver->nodePool(), sym(1).Expression,
QSOperator::InstanceOf, sym(3).Expression);
node->operatorToken = loc(2);
sym(1).Node = node;
} break;
-case 160: {
+case 162: {
AST::BinaryExpression *node = makeAstNode<AST::BinaryExpression> (driver->nodePool(), sym(1).Expression,
QSOperator::Equal, sym(3).Expression);
node->operatorToken = loc(2);
sym(1).Node = node;
} break;
-case 161: {
+case 163: {
AST::BinaryExpression *node = makeAstNode<AST::BinaryExpression> (driver->nodePool(), sym(1).Expression,
QSOperator::NotEqual, sym(3).Expression);
node->operatorToken = loc(2);
sym(1).Node = node;
} break;
-case 162: {
+case 164: {
AST::BinaryExpression *node = makeAstNode<AST::BinaryExpression> (driver->nodePool(), sym(1).Expression,
QSOperator::StrictEqual, sym(3).Expression);
node->operatorToken = loc(2);
sym(1).Node = node;
} break;
-case 163: {
+case 165: {
AST::BinaryExpression *node = makeAstNode<AST::BinaryExpression> (driver->nodePool(), sym(1).Expression,
QSOperator::StrictNotEqual, sym(3).Expression);
node->operatorToken = loc(2);
sym(1).Node = node;
} break;
-case 165: {
+case 167: {
AST::BinaryExpression *node = makeAstNode<AST::BinaryExpression> (driver->nodePool(), sym(1).Expression,
QSOperator::Equal, sym(3).Expression);
node->operatorToken = loc(2);
sym(1).Node = node;
} break;
-case 166: {
+case 168: {
AST::BinaryExpression *node = makeAstNode<AST::BinaryExpression> (driver->nodePool(), sym(1).Expression,
QSOperator::NotEqual, sym(3).Expression);
node->operatorToken = loc(2);
sym(1).Node = node;
} break;
-case 167: {
+case 169: {
AST::BinaryExpression *node = makeAstNode<AST::BinaryExpression> (driver->nodePool(), sym(1).Expression,
QSOperator::StrictEqual, sym(3).Expression);
node->operatorToken = loc(2);
sym(1).Node = node;
} break;
-case 168: {
- AST::BinaryExpression *node = makeAstNode<AST::BinaryExpression> (driver->nodePool(), sym(1).Expression,
- QSOperator::StrictNotEqual, sym(3).Expression);
- node->operatorToken = loc(2);
- sym(1).Node = node;
-} break;
-
case 170: {
AST::BinaryExpression *node = makeAstNode<AST::BinaryExpression> (driver->nodePool(), sym(1).Expression,
- QSOperator::BitAnd, sym(3).Expression);
+ QSOperator::StrictNotEqual, sym(3).Expression);
node->operatorToken = loc(2);
sym(1).Node = node;
} break;
@@ -966,7 +961,7 @@ case 172: {
case 174: {
AST::BinaryExpression *node = makeAstNode<AST::BinaryExpression> (driver->nodePool(), sym(1).Expression,
- QSOperator::BitXor, sym(3).Expression);
+ QSOperator::BitAnd, sym(3).Expression);
node->operatorToken = loc(2);
sym(1).Node = node;
} break;
@@ -980,7 +975,7 @@ case 176: {
case 178: {
AST::BinaryExpression *node = makeAstNode<AST::BinaryExpression> (driver->nodePool(), sym(1).Expression,
- QSOperator::BitOr, sym(3).Expression);
+ QSOperator::BitXor, sym(3).Expression);
node->operatorToken = loc(2);
sym(1).Node = node;
} break;
@@ -994,7 +989,7 @@ case 180: {
case 182: {
AST::BinaryExpression *node = makeAstNode<AST::BinaryExpression> (driver->nodePool(), sym(1).Expression,
- QSOperator::And, sym(3).Expression);
+ QSOperator::BitOr, sym(3).Expression);
node->operatorToken = loc(2);
sym(1).Node = node;
} break;
@@ -1008,7 +1003,7 @@ case 184: {
case 186: {
AST::BinaryExpression *node = makeAstNode<AST::BinaryExpression> (driver->nodePool(), sym(1).Expression,
- QSOperator::Or, sym(3).Expression);
+ QSOperator::And, sym(3).Expression);
node->operatorToken = loc(2);
sym(1).Node = node;
} break;
@@ -1021,6 +1016,13 @@ case 188: {
} break;
case 190: {
+ AST::BinaryExpression *node = makeAstNode<AST::BinaryExpression> (driver->nodePool(), sym(1).Expression,
+ QSOperator::Or, sym(3).Expression);
+ node->operatorToken = loc(2);
+ sym(1).Node = node;
+} break;
+
+case 192: {
AST::ConditionalExpression *node = makeAstNode<AST::ConditionalExpression> (driver->nodePool(), sym(1).Expression,
sym(3).Expression, sym(5).Expression);
node->questionToken = loc(2);
@@ -1028,7 +1030,7 @@ case 190: {
sym(1).Node = node;
} break;
-case 192: {
+case 194: {
AST::ConditionalExpression *node = makeAstNode<AST::ConditionalExpression> (driver->nodePool(), sym(1).Expression,
sym(3).Expression, sym(5).Expression);
node->questionToken = loc(2);
@@ -1036,112 +1038,112 @@ case 192: {
sym(1).Node = node;
} break;
-case 194: {
+case 196: {
AST::BinaryExpression *node = makeAstNode<AST::BinaryExpression> (driver->nodePool(), sym(1).Expression,
sym(2).ival, sym(3).Expression);
node->operatorToken = loc(2);
sym(1).Node = node;
} break;
-case 196: {
+case 198: {
AST::BinaryExpression *node = makeAstNode<AST::BinaryExpression> (driver->nodePool(), sym(1).Expression,
sym(2).ival, sym(3).Expression);
node->operatorToken = loc(2);
sym(1).Node = node;
} break;
-case 197: {
+case 199: {
sym(1).ival = QSOperator::Assign;
} break;
-case 198: {
+case 200: {
sym(1).ival = QSOperator::InplaceMul;
} break;
-case 199: {
+case 201: {
sym(1).ival = QSOperator::InplaceDiv;
} break;
-case 200: {
+case 202: {
sym(1).ival = QSOperator::InplaceMod;
} break;
-case 201: {
+case 203: {
sym(1).ival = QSOperator::InplaceAdd;
} break;
-case 202: {
+case 204: {
sym(1).ival = QSOperator::InplaceSub;
} break;
-case 203: {
+case 205: {
sym(1).ival = QSOperator::InplaceLeftShift;
} break;
-case 204: {
+case 206: {
sym(1).ival = QSOperator::InplaceRightShift;
} break;
-case 205: {
+case 207: {
sym(1).ival = QSOperator::InplaceURightShift;
} break;
-case 206: {
+case 208: {
sym(1).ival = QSOperator::InplaceAnd;
} break;
-case 207: {
+case 209: {
sym(1).ival = QSOperator::InplaceXor;
} break;
-case 208: {
+case 210: {
sym(1).ival = QSOperator::InplaceOr;
} break;
-case 210: {
+case 212: {
AST::Expression *node = makeAstNode<AST::Expression> (driver->nodePool(), sym(1).Expression, sym(3).Expression);
node->commaToken = loc(2);
sym(1).Node = node;
} break;
-case 211: {
+case 213: {
sym(1).Node = 0;
} break;
-case 214: {
+case 216: {
AST::Expression *node = makeAstNode<AST::Expression> (driver->nodePool(), sym(1).Expression, sym(3).Expression);
node->commaToken = loc(2);
sym(1).Node = node;
} break;
-case 215: {
+case 217: {
sym(1).Node = 0;
} break;
-case 232: {
+case 234: {
AST::Block *node = makeAstNode<AST::Block> (driver->nodePool(), sym(2).StatementList);
node->lbraceToken = loc(1);
node->rbraceToken = loc(3);
sym(1).Node = node;
} break;
-case 233: {
+case 235: {
sym(1).Node = makeAstNode<AST::StatementList> (driver->nodePool(), sym(1).Statement);
} break;
-case 234: {
+case 236: {
sym(1).Node = makeAstNode<AST::StatementList> (driver->nodePool(), sym(1).StatementList, sym(2).Statement);
} break;
-case 235: {
+case 237: {
sym(1).Node = 0;
} break;
-case 236: {
+case 238: {
sym(1).Node = sym(1).StatementList->finish ();
} break;
-case 238: {
+case 240: {
AST::VariableStatement *node = makeAstNode<AST::VariableStatement> (driver->nodePool(),
sym(2).VariableDeclarationList->finish (/*readOnly=*/sym(1).ival == T_CONST));
node->declarationKindToken = loc(1);
@@ -1149,76 +1151,76 @@ case 238: {
sym(1).Node = node;
} break;
-case 239: {
+case 241: {
sym(1).ival = T_CONST;
} break;
-case 240: {
+case 242: {
sym(1).ival = T_VAR;
} break;
-case 241: {
+case 243: {
sym(1).Node = makeAstNode<AST::VariableDeclarationList> (driver->nodePool(), sym(1).VariableDeclaration);
} break;
-case 242: {
+case 244: {
AST::VariableDeclarationList *node = makeAstNode<AST::VariableDeclarationList> (driver->nodePool(),
sym(1).VariableDeclarationList, sym(3).VariableDeclaration);
node->commaToken = loc(2);
sym(1).Node = node;
} break;
-case 243: {
+case 245: {
sym(1).Node = makeAstNode<AST::VariableDeclarationList> (driver->nodePool(), sym(1).VariableDeclaration);
} break;
-case 244: {
+case 246: {
sym(1).Node = makeAstNode<AST::VariableDeclarationList> (driver->nodePool(), sym(1).VariableDeclarationList, sym(3).VariableDeclaration);
} break;
-case 245: {
+case 247: {
AST::VariableDeclaration *node = makeAstNode<AST::VariableDeclaration> (driver->nodePool(), sym(1).sval, sym(2).Expression);
node->identifierToken = loc(1);
sym(1).Node = node;
} break;
-case 246: {
+case 248: {
AST::VariableDeclaration *node = makeAstNode<AST::VariableDeclaration> (driver->nodePool(), sym(1).sval, sym(2).Expression);
node->identifierToken = loc(1);
sym(1).Node = node;
} break;
-case 247: {
+case 249: {
// ### TODO: AST for initializer
sym(1) = sym(2);
} break;
-case 248: {
+case 250: {
sym(1).Node = 0;
} break;
-case 250: {
+case 252: {
// ### TODO: AST for initializer
sym(1) = sym(2);
} break;
-case 251: {
+case 253: {
sym(1).Node = 0;
} break;
-case 253: {
+case 255: {
AST::EmptyStatement *node = makeAstNode<AST::EmptyStatement> (driver->nodePool());
node->semicolonToken = loc(1);
sym(1).Node = node;
} break;
-case 255: {
+case 257: {
AST::ExpressionStatement *node = makeAstNode<AST::ExpressionStatement> (driver->nodePool(), sym(1).Expression);
node->semicolonToken = loc(2);
sym(1).Node = node;
} break;
-case 256: {
+case 258: {
AST::IfStatement *node = makeAstNode<AST::IfStatement> (driver->nodePool(), sym(3).Expression, sym(5).Statement, sym(7).Statement);
node->ifToken = loc(1);
node->lparenToken = loc(2);
@@ -1227,7 +1229,7 @@ case 256: {
sym(1).Node = node;
} break;
-case 257: {
+case 259: {
AST::IfStatement *node = makeAstNode<AST::IfStatement> (driver->nodePool(), sym(3).Expression, sym(5).Statement);
node->ifToken = loc(1);
node->lparenToken = loc(2);
@@ -1235,7 +1237,7 @@ case 257: {
sym(1).Node = node;
} break;
-case 259: {
+case 261: {
AST::DoWhileStatement *node = makeAstNode<AST::DoWhileStatement> (driver->nodePool(), sym(2).Statement, sym(5).Expression);
node->doToken = loc(1);
node->whileToken = loc(3);
@@ -1245,7 +1247,7 @@ case 259: {
sym(1).Node = node;
} break;
-case 260: {
+case 262: {
AST::WhileStatement *node = makeAstNode<AST::WhileStatement> (driver->nodePool(), sym(3).Expression, sym(5).Statement);
node->whileToken = loc(1);
node->lparenToken = loc(2);
@@ -1253,7 +1255,7 @@ case 260: {
sym(1).Node = node;
} break;
-case 261: {
+case 263: {
AST::ForStatement *node = makeAstNode<AST::ForStatement> (driver->nodePool(), sym(3).Expression,
sym(5).Expression, sym(7).Expression, sym(9).Statement);
node->forToken = loc(1);
@@ -1264,7 +1266,7 @@ case 261: {
sym(1).Node = node;
} break;
-case 262: {
+case 264: {
AST::LocalForStatement *node = makeAstNode<AST::LocalForStatement> (driver->nodePool(),
sym(4).VariableDeclarationList->finish (/*readOnly=*/false), sym(6).Expression,
sym(8).Expression, sym(10).Statement);
@@ -1277,7 +1279,7 @@ case 262: {
sym(1).Node = node;
} break;
-case 263: {
+case 265: {
AST:: ForEachStatement *node = makeAstNode<AST::ForEachStatement> (driver->nodePool(), sym(3).Expression,
sym(5).Expression, sym(7).Statement);
node->forToken = loc(1);
@@ -1287,7 +1289,7 @@ case 263: {
sym(1).Node = node;
} break;
-case 264: {
+case 266: {
AST::LocalForEachStatement *node = makeAstNode<AST::LocalForEachStatement> (driver->nodePool(),
sym(4).VariableDeclaration, sym(6).Expression, sym(8).Statement);
node->forToken = loc(1);
@@ -1298,14 +1300,14 @@ case 264: {
sym(1).Node = node;
} break;
-case 266: {
+case 268: {
AST::ContinueStatement *node = makeAstNode<AST::ContinueStatement> (driver->nodePool());
node->continueToken = loc(1);
node->semicolonToken = loc(2);
sym(1).Node = node;
} break;
-case 268: {
+case 270: {
AST::ContinueStatement *node = makeAstNode<AST::ContinueStatement> (driver->nodePool(), sym(2).sval);
node->continueToken = loc(1);
node->identifierToken = loc(2);
@@ -1313,14 +1315,14 @@ case 268: {
sym(1).Node = node;
} break;
-case 270: {
+case 272: {
AST::BreakStatement *node = makeAstNode<AST::BreakStatement> (driver->nodePool());
node->breakToken = loc(1);
node->semicolonToken = loc(2);
sym(1).Node = node;
} break;
-case 272: {
+case 274: {
AST::BreakStatement *node = makeAstNode<AST::BreakStatement> (driver->nodePool(), sym(2).sval);
node->breakToken = loc(1);
node->identifierToken = loc(2);
@@ -1328,14 +1330,14 @@ case 272: {
sym(1).Node = node;
} break;
-case 274: {
+case 276: {
AST::ReturnStatement *node = makeAstNode<AST::ReturnStatement> (driver->nodePool(), sym(2).Expression);
node->returnToken = loc(1);
node->semicolonToken = loc(3);
sym(1).Node = node;
} break;
-case 275: {
+case 277: {
AST::WithStatement *node = makeAstNode<AST::WithStatement> (driver->nodePool(), sym(3).Expression, sym(5).Statement);
node->withToken = loc(1);
node->lparenToken = loc(2);
@@ -1343,7 +1345,7 @@ case 275: {
sym(1).Node = node;
} break;
-case 276: {
+case 278: {
AST::SwitchStatement *node = makeAstNode<AST::SwitchStatement> (driver->nodePool(), sym(3).Expression, sym(5).CaseBlock);
node->switchToken = loc(1);
node->lparenToken = loc(2);
@@ -1351,90 +1353,90 @@ case 276: {
sym(1).Node = node;
} break;
-case 277: {
+case 279: {
AST::CaseBlock *node = makeAstNode<AST::CaseBlock> (driver->nodePool(), sym(2).CaseClauses);
node->lbraceToken = loc(1);
node->rbraceToken = loc(3);
sym(1).Node = node;
} break;
-case 278: {
+case 280: {
AST::CaseBlock *node = makeAstNode<AST::CaseBlock> (driver->nodePool(), sym(2).CaseClauses, sym(3).DefaultClause, sym(4).CaseClauses);
node->lbraceToken = loc(1);
node->rbraceToken = loc(5);
sym(1).Node = node;
} break;
-case 279: {
+case 281: {
sym(1).Node = makeAstNode<AST::CaseClauses> (driver->nodePool(), sym(1).CaseClause);
} break;
-case 280: {
+case 282: {
sym(1).Node = makeAstNode<AST::CaseClauses> (driver->nodePool(), sym(1).CaseClauses, sym(2).CaseClause);
} break;
-case 281: {
+case 283: {
sym(1).Node = 0;
} break;
-case 282: {
+case 284: {
sym(1).Node = sym(1).CaseClauses->finish ();
} break;
-case 283: {
+case 285: {
AST::CaseClause *node = makeAstNode<AST::CaseClause> (driver->nodePool(), sym(2).Expression, sym(4).StatementList);
node->caseToken = loc(1);
node->colonToken = loc(3);
sym(1).Node = node;
} break;
-case 284: {
+case 286: {
AST::DefaultClause *node = makeAstNode<AST::DefaultClause> (driver->nodePool(), sym(3).StatementList);
node->defaultToken = loc(1);
node->colonToken = loc(2);
sym(1).Node = node;
} break;
-case 285:
-case 286: {
+case 287:
+case 288: {
AST::LabelledStatement *node = makeAstNode<AST::LabelledStatement> (driver->nodePool(), driver->intern(lexer->characterBuffer(), lexer->characterCount()), sym(3).Statement);
node->identifierToken = loc(1);
node->colonToken = loc(2);
sym(1).Node = node;
} break;
-case 287: {
+case 289: {
AST::LabelledStatement *node = makeAstNode<AST::LabelledStatement> (driver->nodePool(), sym(1).sval, sym(3).Statement);
node->identifierToken = loc(1);
node->colonToken = loc(2);
sym(1).Node = node;
} break;
-case 289: {
+case 291: {
AST::ThrowStatement *node = makeAstNode<AST::ThrowStatement> (driver->nodePool(), sym(2).Expression);
node->throwToken = loc(1);
node->semicolonToken = loc(3);
sym(1).Node = node;
} break;
-case 290: {
+case 292: {
AST::TryStatement *node = makeAstNode<AST::TryStatement> (driver->nodePool(), sym(2).Statement, sym(3).Catch);
node->tryToken = loc(1);
sym(1).Node = node;
} break;
-case 291: {
+case 293: {
AST::TryStatement *node = makeAstNode<AST::TryStatement> (driver->nodePool(), sym(2).Statement, sym(3).Finally);
node->tryToken = loc(1);
sym(1).Node = node;
} break;
-case 292: {
+case 294: {
AST::TryStatement *node = makeAstNode<AST::TryStatement> (driver->nodePool(), sym(2).Statement, sym(3).Catch, sym(4).Finally);
node->tryToken = loc(1);
sym(1).Node = node;
} break;
-case 293: {
+case 295: {
AST::Catch *node = makeAstNode<AST::Catch> (driver->nodePool(), sym(3).sval, sym(5).Block);
node->catchToken = loc(1);
node->lparenToken = loc(2);
@@ -1443,20 +1445,20 @@ case 293: {
sym(1).Node = node;
} break;
-case 294: {
+case 296: {
AST::Finally *node = makeAstNode<AST::Finally> (driver->nodePool(), sym(2).Block);
node->finallyToken = loc(1);
sym(1).Node = node;
} break;
-case 296: {
+case 298: {
AST::DebuggerStatement *node = makeAstNode<AST::DebuggerStatement> (driver->nodePool());
node->debuggerToken = loc(1);
node->semicolonToken = loc(2);
sym(1).Node = node;
} break;
-case 297: {
+case 299: {
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);
@@ -1467,7 +1469,7 @@ case 297: {
sym(1).Node = node;
} break;
-case 298: {
+case 300: {
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)
@@ -1479,56 +1481,56 @@ case 298: {
sym(1).Node = node;
} break;
-case 299: {
+case 301: {
AST::FormalParameterList *node = makeAstNode<AST::FormalParameterList> (driver->nodePool(), sym(1).sval);
node->identifierToken = loc(1);
sym(1).Node = node;
} break;
-case 300: {
+case 302: {
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 301: {
+case 303: {
sym(1).Node = 0;
} break;
-case 302: {
+case 304: {
sym(1).Node = sym(1).FormalParameterList->finish ();
} break;
-case 303: {
+case 305: {
sym(1).Node = 0;
} break;
-case 305: {
+case 307: {
sym(1).Node = makeAstNode<AST::FunctionBody> (driver->nodePool(), sym(1).SourceElements->finish ());
} break;
-case 306: {
+case 308: {
sym(1).Node = makeAstNode<AST::SourceElements> (driver->nodePool(), sym(1).SourceElement);
} break;
-case 307: {
+case 309: {
sym(1).Node = makeAstNode<AST::SourceElements> (driver->nodePool(), sym(1).SourceElements, sym(2).SourceElement);
} break;
-case 308: {
+case 310: {
sym(1).Node = makeAstNode<AST::StatementSourceElement> (driver->nodePool(), sym(1).Statement);
} break;
-case 309: {
+case 311: {
sym(1).Node = makeAstNode<AST::FunctionSourceElement> (driver->nodePool(), sym(1).FunctionDeclaration);
} break;
-case 310: {
+case 312: {
sym(1).sval = 0;
} break;
-case 312: {
+case 314: {
sym(1).Node = 0;
} break;
@@ -1552,10 +1554,8 @@ case 312: {
yylloc.startColumn += yylloc.length;
yylloc.length = 0;
- const QString msg = QString::fromUtf8("Missing `;'");
-
- diagnostic_messages.append(DiagnosticMessage(DiagnosticMessage::Warning,
- yylloc.startLine, yylloc.startColumn, msg));
+ //const QString msg = QString::fromUtf8("Missing `;'");
+ //diagnostic_messages.append(DiagnosticMessage(DiagnosticMessage::Warning, yylloc, msg));
first_token = &token_buffer[0];
last_token = &token_buffer[1];
@@ -1581,8 +1581,7 @@ case 312: {
if (t_action(errorState, yytoken)) {
const QString msg = QString::fromUtf8("Unexpected 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));
+ diagnostic_messages.append(DiagnosticMessage(DiagnosticMessage::Error, token_buffer[0].loc, msg));
action = errorState;
goto _Lcheck_token;
@@ -1611,8 +1610,7 @@ case 312: {
if (a > 0 && t_action(a, yytoken)) {
const QString msg = QString::fromUtf8("Expected token `%1'").arg(QLatin1String(spell[*tk]));
- diagnostic_messages.append(DiagnosticMessage(DiagnosticMessage::Error,
- token_buffer[0].loc.startLine, token_buffer[0].loc.startColumn, msg));
+ diagnostic_messages.append(DiagnosticMessage(DiagnosticMessage::Error, token_buffer[0].loc, msg));
yytoken = *tk;
yylval = 0;
@@ -1634,8 +1632,7 @@ case 312: {
int a = t_action(errorState, tk);
if (a > 0 && t_action(a, yytoken)) {
const QString msg = QString::fromUtf8("Expected token `%1'").arg(QLatin1String(spell[tk]));
- diagnostic_messages.append(DiagnosticMessage(DiagnosticMessage::Error,
- token_buffer[0].loc.startLine, token_buffer[0].loc.startColumn, msg));
+ diagnostic_messages.append(DiagnosticMessage(DiagnosticMessage::Error, token_buffer[0].loc, msg));
yytoken = tk;
yylval = 0;
@@ -1648,8 +1645,7 @@ case 312: {
}
const QString msg = QString::fromUtf8("Syntax error");
- diagnostic_messages.append(DiagnosticMessage(DiagnosticMessage::Error,
- token_buffer[0].loc.startLine, token_buffer[0].loc.startColumn, msg));
+ diagnostic_messages.append(DiagnosticMessage(DiagnosticMessage::Error, token_buffer[0].loc, msg));
}
return false;
diff --git a/src/declarative/qml/parser/javascriptparser_p.h b/src/declarative/qml/parser/javascriptparser_p.h
index 497fae8..5e68fe7 100644
--- a/src/declarative/qml/parser/javascriptparser_p.h
+++ b/src/declarative/qml/parser/javascriptparser_p.h
@@ -119,10 +119,10 @@ public:
enum Kind { Warning, Error };
DiagnosticMessage()
- : kind(Error), line(0), column(0) {}
+ : kind(Error) {}
- DiagnosticMessage(Kind kind, int line, int column, const QString &message)
- : kind(kind), line(line), column(column), message(message) {}
+ DiagnosticMessage(Kind kind, const JavaScript::AST::SourceLocation &loc, const QString &message)
+ : kind(kind), loc(loc), message(message) {}
bool isWarning() const
{ return kind == Warning; }
@@ -131,8 +131,7 @@ public:
{ return kind == Error; }
Kind kind;
- int line;
- int column;
+ JavaScript::AST::SourceLocation loc;
QString message;
};
@@ -162,10 +161,10 @@ public:
{ return diagnosticMessage().message; }
inline int errorLineNumber() const
- { return diagnosticMessage().line; }
+ { return diagnosticMessage().loc.startLine; }
inline int errorColumnNumber() const
- { return diagnosticMessage().column; }
+ { return diagnosticMessage().loc.startColumn; }
protected:
void reallocateStack();
@@ -206,9 +205,9 @@ protected:
};
-#define J_SCRIPT_REGEXPLITERAL_RULE1 50
+#define J_SCRIPT_REGEXPLITERAL_RULE1 52
-#define J_SCRIPT_REGEXPLITERAL_RULE2 51
+#define J_SCRIPT_REGEXPLITERAL_RULE2 53
QT_END_NAMESPACE
generated by cgit v0.12 at 2025-02-10 21:43:23 (GMT)