summaryrefslogtreecommitdiffstats
path: root/src/declarative
diff options
context:
space:
mode:
Diffstat (limited to 'src/declarative')
-rw-r--r--src/declarative/qml/parser/javascript.g93
-rw-r--r--src/declarative/qml/parser/javascriptast.cpp2
-rw-r--r--src/declarative/qml/parser/javascriptast_p.h23
-rw-r--r--src/declarative/qml/parser/javascriptgrammar.cpp1235
-rw-r--r--src/declarative/qml/parser/javascriptgrammar_p.h14
-rw-r--r--src/declarative/qml/parser/javascriptparser.cpp450
-rw-r--r--src/declarative/qml/parser/javascriptparser_p.h6
-rw-r--r--src/declarative/qml/qmlmetatype.cpp15
-rw-r--r--src/declarative/qml/qmlmetatype.h6
-rw-r--r--src/declarative/qml/qmlscriptparser.cpp64
10 files changed, 1006 insertions, 902 deletions
diff --git a/src/declarative/qml/parser/javascript.g b/src/declarative/qml/parser/javascript.g
index af4fb74..33847f2 100644
--- a/src/declarative/qml/parser/javascript.g
+++ b/src/declarative/qml/parser/javascript.g
@@ -46,7 +46,7 @@
%decl javascriptparser_p.h
%impl javascriptparser.cpp
%expect 2
-%expect-rr 1
+%expect-rr 2
%token T_AND "&" T_AND_AND "&&" T_AND_EQ "&="
%token T_BREAK "break" T_CASE "case" T_CATCH "catch"
@@ -305,6 +305,8 @@ protected:
inline AST::SourceLocation &loc(int index)
{ return location_stack [tos + index - 1]; }
+ AST::UiQualifiedId *reparseAsQualifiedId(AST::ExpressionNode *expr);
+
protected:
Engine *driver;
int tos;
@@ -344,6 +346,7 @@ protected:
/.
#include "javascriptparser_p.h"
+#include <QVarLengthArray>
//
// This file is automatically generated from javascript.g.
@@ -405,6 +408,34 @@ static inline AST::SourceLocation location(Lexer *lexer)
return loc;
}
+AST::UiQualifiedId *Parser::reparseAsQualifiedId(AST::ExpressionNode *expr)
+{
+ QVarLengthArray<NameId *, 4> nameIds;
+ QVarLengthArray<AST::SourceLocation, 4> locations;
+
+ AST::ExpressionNode *it = expr;
+ while (AST::FieldMemberExpression *m = AST::cast<AST::FieldMemberExpression *>(it)) {
+ nameIds.append(m->name);
+ locations.append(m->identifierToken);
+ it = m->base;
+ }
+
+ if (AST::IdentifierExpression *idExpr = AST::cast<AST::IdentifierExpression *>(it)) {
+ AST::UiQualifiedId *q = makeAstNode<AST::UiQualifiedId>(driver->nodePool(), idExpr->name);
+ q->identifierToken = idExpr->identifierToken;
+
+ AST::UiQualifiedId *currentId = q;
+ for (int i = nameIds.size() - 1; i != -1; --i) {
+ currentId = makeAstNode<AST::UiQualifiedId>(driver->nodePool(), currentId, nameIds[i]);
+ currentId->identifierToken = locations[i];
+ }
+
+ return currentId->finish();
+ }
+
+ return 0;
+}
+
bool Parser::parse()
{
Lexer *lexer = driver->lexer();
@@ -570,23 +601,11 @@ case $rule_number: {
} break;
./
-UiObjectMember: UiQualifiedId T_COLON T_IDENTIFIER UiObjectInitializer ;
+UiObjectDefinition: UiQualifiedId UiObjectInitializer ;
/.
case $rule_number: {
- 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;
-./
-
-UiObjectDefinition: T_IDENTIFIER UiObjectInitializer ;
-/.
-case $rule_number: {
- AST::UiObjectDefinition *node = makeAstNode<AST::UiObjectDefinition> (driver->nodePool(), sym(1).sval,
+ AST::UiObjectDefinition *node = makeAstNode<AST::UiObjectDefinition> (driver->nodePool(), sym(1).UiQualifiedId->finish(),
sym(2).UiObjectInitializer);
- node->identifierToken = loc(1);
sym(1).Node = node;
} break;
./
@@ -625,17 +644,45 @@ case $rule_number: {
./
-UiStatement: Block ;
-UiStatement: EmptyStatement ;
-UiStatement: ExpressionStatement ;
-UiStatement: DebuggerStatement ;
-UiStatement: UiMultilineStringStatement ;
-UiStatement: IfStatement ; --- ### do we really want if statement in a binding?
+UiObjectMember: UiQualifiedId T_COLON Expression UiObjectInitializer ;
+/.
+case $rule_number: {
+ if (AST::UiQualifiedId *qualifiedId = reparseAsQualifiedId(sym(3).Expression)) {
+ AST::UiObjectBinding *node = makeAstNode<AST::UiObjectBinding> (driver->nodePool(),
+ sym(1).UiQualifiedId->finish(), qualifiedId, sym(4).UiObjectInitializer);
+ node->colonToken = loc(2);
+ sym(1).Node = node;
+ } else {
+ sym(1).Node = 0;
+ diagnostic_messages.append(DiagnosticMessage(DiagnosticMessage::Error, loc(2),
+ QLatin1String("Expected a type name after token `:'")));
+
+ return false; // ### recover
+ }
+} break;
+./
+
+UiObjectMember: UiQualifiedId T_COLON Block ;
+/.case $rule_number:./
+
+UiObjectMember: UiQualifiedId T_COLON EmptyStatement ;
+/.case $rule_number:./
+
+UiObjectMember: UiQualifiedId T_COLON ExpressionStatement ;
+/.case $rule_number:./
+
+UiObjectMember: UiQualifiedId T_COLON DebuggerStatement ;
+/.case $rule_number:./
+
+UiObjectMember: UiQualifiedId T_COLON UiMultilineStringStatement ;
+/.case $rule_number:./
+
+UiObjectMember: UiQualifiedId T_COLON IfStatement ; --- ### do we really want if statement in a binding?
+/.case $rule_number:./
-UiObjectMember: UiQualifiedId T_COLON UiStatement ;
/.
-case $rule_number: {
+{
AST::UiScriptBinding *node = makeAstNode<AST::UiScriptBinding> (driver->nodePool(), sym(1).UiQualifiedId->finish(),
sym(3).Statement);
node->colonToken = loc(2);
diff --git a/src/declarative/qml/parser/javascriptast.cpp b/src/declarative/qml/parser/javascriptast.cpp
index 8a10650..083dd28 100644
--- a/src/declarative/qml/parser/javascriptast.cpp
+++ b/src/declarative/qml/parser/javascriptast.cpp
@@ -813,6 +813,7 @@ void UiPublicMember::accept0(Visitor *visitor)
void UiObjectDefinition::accept0(Visitor *visitor)
{
if (visitor->visit(this)) {
+ acceptChild(qualifiedTypeNameId, visitor);
acceptChild(initializer, visitor);
}
@@ -833,6 +834,7 @@ void UiObjectBinding::accept0(Visitor *visitor)
{
if (visitor->visit(this)) {
acceptChild(qualifiedId, visitor);
+ acceptChild(qualifiedTypeNameId, visitor);
acceptChild(initializer, visitor);
}
diff --git a/src/declarative/qml/parser/javascriptast_p.h b/src/declarative/qml/parser/javascriptast_p.h
index 571fdff..134f3cc 100644
--- a/src/declarative/qml/parser/javascriptast_p.h
+++ b/src/declarative/qml/parser/javascriptast_p.h
@@ -2345,28 +2345,22 @@ class UiObjectDefinition: public UiObjectMember
public:
JAVASCRIPT_DECLARE_AST_NODE(UiObjectDefinition)
- UiObjectDefinition(NameId *name,
+ UiObjectDefinition(UiQualifiedId *qualifiedTypeNameId,
UiObjectInitializer *initializer)
- : name(name), initializer(initializer)
+ : qualifiedTypeNameId(qualifiedTypeNameId), initializer(initializer)
{ kind = K; }
virtual SourceLocation firstSourceLocation() const
- { return identifierToken; }
+ { return qualifiedTypeNameId->identifierToken; }
virtual SourceLocation lastSourceLocation() const
- {
- if (initializer)
- return initializer->rbraceToken;
-
- return identifierToken;
- }
+ { return initializer->rbraceToken; }
virtual void accept0(Visitor *visitor);
// attributes
- NameId *name;
+ UiQualifiedId *qualifiedTypeNameId;
UiObjectInitializer *initializer;
- SourceLocation identifierToken;
};
class UiSourceElement: public UiObjectMember
@@ -2411,10 +2405,10 @@ public:
JAVASCRIPT_DECLARE_AST_NODE(UiObjectBinding)
UiObjectBinding(UiQualifiedId *qualifiedId,
- NameId *name,
+ UiQualifiedId *qualifiedTypeNameId,
UiObjectInitializer *initializer)
: qualifiedId(qualifiedId),
- name(name),
+ qualifiedTypeNameId(qualifiedTypeNameId),
initializer(initializer)
{ kind = K; }
@@ -2428,10 +2422,9 @@ public:
// attributes
UiQualifiedId *qualifiedId;
- NameId *name;
+ UiQualifiedId *qualifiedTypeNameId;
UiObjectInitializer *initializer;
SourceLocation colonToken;
- SourceLocation identifierToken;
};
class UiScriptBinding: public UiObjectMember
diff --git a/src/declarative/qml/parser/javascriptgrammar.cpp b/src/declarative/qml/parser/javascriptgrammar.cpp
index 2d50da8..db34464 100644
--- a/src/declarative/qml/parser/javascriptgrammar.cpp
+++ b/src/declarative/qml/parser/javascriptgrammar.cpp
@@ -56,558 +56,566 @@ const char *const JavaScriptGrammar::spell [] = {
const int JavaScriptGrammar::lhs [] = {
91, 92, 92, 95, 95, 96, 96, 94, 93, 98,
- 98, 100, 100, 101, 101, 99, 97, 99, 99, 103,
- 104, 104, 105, 105, 105, 105, 105, 105, 99, 111,
- 111, 111, 99, 99, 99, 99, 99, 99, 99, 99,
- 99, 99, 99, 102, 102, 115, 115, 115, 102, 102,
- 116, 116, 116, 116, 116, 116, 116, 116, 116, 116,
- 116, 116, 116, 116, 116, 118, 118, 122, 122, 117,
- 117, 120, 120, 123, 123, 123, 123, 123, 123, 124,
- 124, 124, 124, 124, 124, 124, 124, 124, 124, 124,
- 124, 124, 124, 124, 124, 124, 124, 124, 124, 124,
- 124, 124, 124, 124, 124, 124, 124, 124, 124, 124,
- 125, 125, 126, 126, 126, 126, 126, 129, 129, 130,
- 130, 130, 130, 128, 128, 131, 131, 132, 132, 133,
- 133, 133, 134, 134, 134, 134, 134, 134, 134, 134,
- 134, 134, 135, 135, 135, 135, 136, 136, 136, 137,
- 137, 137, 137, 138, 138, 138, 138, 138, 138, 138,
- 139, 139, 139, 139, 139, 139, 140, 140, 140, 140,
- 140, 141, 141, 141, 141, 141, 142, 142, 143, 143,
- 144, 144, 145, 145, 146, 146, 147, 147, 148, 148,
- 149, 149, 150, 150, 151, 151, 152, 152, 153, 153,
- 121, 121, 154, 154, 155, 155, 155, 155, 155, 155,
- 155, 155, 155, 155, 155, 155, 112, 112, 156, 156,
- 157, 157, 158, 158, 159, 159, 159, 159, 159, 159,
- 159, 159, 159, 159, 159, 159, 159, 159, 159, 106,
- 170, 170, 169, 169, 114, 114, 171, 171, 172, 172,
- 174, 174, 173, 175, 178, 176, 176, 179, 177, 177,
- 107, 108, 108, 110, 110, 160, 160, 160, 160, 160,
- 160, 160, 161, 161, 161, 161, 162, 162, 162, 162,
- 163, 163, 164, 166, 180, 180, 183, 183, 181, 181,
- 184, 182, 165, 165, 165, 167, 167, 168, 168, 168,
- 185, 186, 109, 109, 113, 127, 190, 190, 187, 187,
- 188, 188, 191, 192, 192, 193, 193, 189, 189, 119,
- 119, 194};
+ 98, 100, 100, 101, 101, 97, 99, 99, 103, 104,
+ 104, 99, 99, 99, 99, 99, 99, 99, 111, 111,
+ 111, 99, 99, 99, 99, 99, 99, 99, 99, 99,
+ 99, 99, 102, 102, 114, 114, 114, 102, 102, 115,
+ 115, 115, 115, 115, 115, 115, 115, 115, 115, 115,
+ 115, 115, 115, 115, 117, 117, 121, 121, 116, 116,
+ 119, 119, 122, 122, 122, 122, 122, 122, 123, 123,
+ 123, 123, 123, 123, 123, 123, 123, 123, 123, 123,
+ 123, 123, 123, 123, 123, 123, 123, 123, 123, 123,
+ 123, 123, 123, 123, 123, 123, 123, 123, 123, 124,
+ 124, 125, 125, 125, 125, 125, 128, 128, 129, 129,
+ 129, 129, 127, 127, 130, 130, 131, 131, 132, 132,
+ 132, 133, 133, 133, 133, 133, 133, 133, 133, 133,
+ 133, 134, 134, 134, 134, 135, 135, 135, 136, 136,
+ 136, 136, 137, 137, 137, 137, 137, 137, 137, 138,
+ 138, 138, 138, 138, 138, 139, 139, 139, 139, 139,
+ 140, 140, 140, 140, 140, 141, 141, 142, 142, 143,
+ 143, 144, 144, 145, 145, 146, 146, 147, 147, 148,
+ 148, 149, 149, 150, 150, 151, 151, 152, 152, 120,
+ 120, 153, 153, 154, 154, 154, 154, 154, 154, 154,
+ 154, 154, 154, 154, 154, 105, 105, 155, 155, 156,
+ 156, 157, 157, 158, 158, 158, 158, 158, 158, 158,
+ 158, 158, 158, 158, 158, 158, 158, 158, 106, 169,
+ 169, 168, 168, 113, 113, 170, 170, 171, 171, 173,
+ 173, 172, 174, 177, 175, 175, 178, 176, 176, 107,
+ 108, 108, 110, 110, 159, 159, 159, 159, 159, 159,
+ 159, 160, 160, 160, 160, 161, 161, 161, 161, 162,
+ 162, 163, 165, 179, 179, 182, 182, 180, 180, 183,
+ 181, 164, 164, 164, 166, 166, 167, 167, 167, 184,
+ 185, 109, 109, 112, 126, 189, 189, 186, 186, 187,
+ 187, 190, 191, 191, 192, 192, 188, 188, 118, 118,
+ 193};
const int JavaScriptGrammar:: rhs[] = {
2, 1, 1, 1, 2, 3, 3, 0, 1, 1,
- 2, 1, 3, 2, 3, 4, 2, 1, 5, 1,
- 2, 2, 1, 1, 1, 1, 1, 1, 3, 1,
- 1, 1, 2, 4, 4, 5, 5, 6, 6, 7,
- 7, 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,
+ 2, 1, 3, 2, 3, 2, 1, 5, 1, 2,
+ 2, 4, 3, 3, 3, 3, 3, 3, 1, 1,
+ 1, 2, 4, 4, 5, 5, 6, 6, 7, 7,
+ 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, 1, 1, 1, 4, 3, 5, 1, 2, 4,
- 4, 4, 3, 0, 1, 1, 3, 1, 1, 1,
- 2, 2, 1, 2, 2, 2, 2, 2, 2, 2,
- 2, 2, 1, 3, 3, 3, 1, 3, 3, 1,
- 3, 3, 3, 1, 3, 3, 3, 3, 3, 3,
- 1, 3, 3, 3, 3, 3, 1, 3, 3, 3,
- 3, 1, 3, 3, 3, 3, 1, 3, 1, 3,
- 1, 3, 1, 3, 1, 3, 1, 3, 1, 3,
- 1, 3, 1, 3, 1, 3, 1, 5, 1, 5,
- 1, 3, 1, 3, 1, 1, 1, 1, 1, 1,
- 1, 1, 1, 1, 1, 1, 1, 3, 0, 1,
- 1, 3, 0, 1, 1, 1, 1, 1, 1, 1,
- 1, 1, 1, 1, 1, 1, 1, 1, 1, 3,
- 1, 2, 0, 1, 3, 3, 1, 1, 1, 3,
- 1, 3, 2, 2, 2, 0, 1, 2, 0, 1,
- 1, 2, 2, 7, 5, 7, 7, 5, 9, 10,
- 7, 8, 2, 2, 3, 3, 2, 2, 3, 3,
- 3, 3, 5, 5, 3, 5, 1, 2, 0, 1,
- 4, 3, 3, 3, 3, 3, 3, 3, 3, 4,
- 5, 2, 2, 2, 8, 8, 1, 3, 0, 1,
- 0, 1, 1, 1, 2, 1, 1, 0, 1, 0,
- 1, 2};
+ 1, 1, 1, 4, 3, 5, 1, 2, 4, 4,
+ 4, 3, 0, 1, 1, 3, 1, 1, 1, 2,
+ 2, 1, 2, 2, 2, 2, 2, 2, 2, 2,
+ 2, 1, 3, 3, 3, 1, 3, 3, 1, 3,
+ 3, 3, 1, 3, 3, 3, 3, 3, 3, 1,
+ 3, 3, 3, 3, 3, 1, 3, 3, 3, 3,
+ 1, 3, 3, 3, 3, 1, 3, 1, 3, 1,
+ 3, 1, 3, 1, 3, 1, 3, 1, 3, 1,
+ 3, 1, 3, 1, 3, 1, 5, 1, 5, 1,
+ 3, 1, 3, 1, 1, 1, 1, 1, 1, 1,
+ 1, 1, 1, 1, 1, 1, 3, 0, 1, 1,
+ 3, 0, 1, 1, 1, 1, 1, 1, 1, 1,
+ 1, 1, 1, 1, 1, 1, 1, 1, 3, 1,
+ 2, 0, 1, 3, 3, 1, 1, 1, 3, 1,
+ 3, 2, 2, 2, 0, 1, 2, 0, 1, 1,
+ 2, 2, 7, 5, 7, 7, 5, 9, 10, 7,
+ 8, 2, 2, 3, 3, 2, 2, 3, 3, 3,
+ 3, 5, 5, 3, 5, 1, 2, 0, 1, 4,
+ 3, 3, 3, 3, 3, 3, 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, 0, 9, 1, 0, 17, 42, 49, 247, 0,
- 0, 46, 47, 14, 44, 45, 48, 248, 18, 10,
- 0, 0, 0, 43, 0, 32, 31, 30, 0, 0,
- 36, 0, 37, 150, 217, 181, 189, 185, 129, 201,
- 177, 0, 114, 52, 130, 193, 197, 118, 147, 128,
- 133, 113, 167, 154, 0, 58, 59, 55, 318, 46,
- 320, 70, 0, 0, 0, 0, 0, 53, 56, 0,
- 0, 47, 48, 57, 51, 0, 54, 0, 0, 143,
- 0, 0, 130, 149, 132, 131, 0, 0, 0, 145,
- 146, 144, 148, 0, 178, 0, 0, 0, 0, 168,
- 0, 0, 0, 0, 0, 0, 158, 0, 0, 0,
- 152, 153, 151, 156, 160, 159, 157, 155, 170, 169,
- 171, 0, 186, 0, 182, 0, 0, 124, 111, 123,
- 112, 80, 81, 82, 107, 83, 108, 84, 85, 86,
- 87, 88, 89, 90, 91, 92, 93, 94, 95, 96,
- 109, 97, 98, 99, 100, 101, 102, 103, 104, 105,
- 106, 110, 0, 0, 122, 218, 125, 0, 126, 0,
- 127, 121, 40, 41, 0, 214, 207, 205, 212, 213,
- 211, 210, 216, 209, 208, 206, 215, 202, 0, 190,
- 0, 0, 194, 0, 0, 198, 0, 0, 124, 116,
- 0, 115, 0, 120, 134, 0, 319, 309, 310, 0,
- 307, 0, 308, 0, 311, 225, 232, 231, 239, 227,
- 0, 228, 312, 0, 317, 229, 230, 235, 233, 314,
- 313, 316, 236, 0, 0, 0, 0, 0, 318, 46,
- 0, 320, 47, 219, 261, 48, 0, 0, 0, 0,
- 0, 237, 238, 226, 234, 262, 263, 306, 315, 0,
- 277, 278, 279, 280, 0, 273, 274, 275, 276, 303,
- 304, 0, 0, 0, 0, 0, 266, 267, 223, 221,
- 183, 191, 187, 203, 179, 224, 0, 130, 195, 199,
- 172, 161, 0, 0, 180, 0, 0, 0, 0, 173,
- 0, 0, 0, 0, 0, 165, 163, 166, 164, 162,
- 175, 174, 176, 0, 188, 0, 184, 0, 222, 130,
- 0, 204, 219, 220, 0, 219, 0, 0, 269, 0,
- 0, 0, 271, 0, 192, 0, 0, 196, 0, 0,
- 200, 259, 0, 251, 260, 254, 0, 258, 0, 219,
- 252, 0, 219, 0, 0, 270, 0, 0, 0, 272,
- 319, 309, 0, 0, 311, 0, 305, 0, 295, 0,
- 0, 0, 265, 0, 264, 0, 321, 0, 79, 241,
- 244, 0, 80, 247, 83, 108, 85, 86, 55, 90,
- 91, 46, 92, 95, 53, 56, 47, 219, 48, 57,
- 98, 51, 100, 54, 102, 103, 248, 105, 106, 110,
- 0, 72, 0, 0, 74, 78, 76, 64, 75, 77,
- 0, 73, 63, 242, 240, 118, 119, 124, 0, 117,
- 0, 294, 0, 281, 282, 0, 293, 0, 0, 0,
- 284, 289, 287, 290, 0, 0, 288, 289, 0, 285,
- 0, 286, 243, 292, 0, 243, 291, 0, 296, 297,
- 0, 243, 298, 299, 0, 0, 300, 0, 0, 0,
- 301, 302, 136, 135, 0, 0, 0, 268, 0, 0,
- 0, 283, 0, 71, 0, 68, 70, 61, 0, 67,
- 62, 69, 66, 60, 0, 65, 140, 138, 142, 139,
- 137, 141, 0, 0, 0, 34, 0, 35, 0, 38,
- 39, 33, 15, 11, 0, 0, 23, 26, 24, 25,
- 28, 46, 70, 20, 0, 27, 29, 16, 0, 12,
- 0, 19, 13, 21, 22, 50, 256, 249, 0, 257,
- 253, 0, 255, 245, 0, 246, 250, 322};
+ 5, 48, 45, 46, 43, 44, 47, 9, 0, 1,
+ 0, 0, 16, 49, 41, 246, 0, 0, 46, 14,
+ 47, 247, 17, 10, 0, 0, 0, 42, 0, 31,
+ 30, 29, 0, 0, 35, 0, 36, 149, 216, 180,
+ 188, 184, 128, 200, 176, 0, 113, 51, 129, 192,
+ 196, 117, 146, 127, 132, 112, 166, 153, 0, 57,
+ 58, 54, 317, 319, 69, 0, 0, 0, 0, 0,
+ 52, 55, 0, 0, 56, 50, 0, 53, 0, 0,
+ 142, 0, 0, 129, 148, 131, 130, 0, 0, 0,
+ 144, 145, 143, 147, 0, 177, 0, 0, 0, 0,
+ 167, 0, 0, 0, 0, 0, 0, 157, 0, 0,
+ 0, 151, 152, 150, 155, 159, 158, 156, 154, 169,
+ 168, 170, 0, 185, 0, 181, 0, 0, 123, 110,
+ 122, 111, 79, 80, 81, 106, 82, 107, 83, 84,
+ 85, 86, 87, 88, 89, 90, 91, 92, 93, 94,
+ 95, 108, 96, 97, 98, 99, 100, 101, 102, 103,
+ 104, 105, 109, 0, 0, 121, 217, 124, 0, 125,
+ 0, 126, 120, 39, 40, 0, 213, 206, 204, 211,
+ 212, 210, 209, 215, 208, 207, 205, 214, 201, 0,
+ 189, 0, 0, 193, 0, 0, 197, 0, 0, 123,
+ 115, 0, 114, 0, 119, 133, 0, 318, 308, 309,
+ 0, 306, 0, 307, 0, 310, 224, 231, 230, 238,
+ 226, 0, 227, 311, 0, 316, 228, 229, 234, 232,
+ 313, 312, 315, 235, 0, 0, 0, 0, 0, 317,
+ 45, 0, 319, 46, 218, 260, 47, 0, 0, 0,
+ 0, 0, 236, 237, 225, 233, 261, 262, 305, 314,
+ 0, 276, 277, 278, 279, 0, 272, 273, 274, 275,
+ 302, 303, 0, 0, 0, 0, 0, 265, 266, 222,
+ 220, 182, 190, 186, 202, 178, 223, 0, 129, 194,
+ 198, 171, 160, 0, 0, 179, 0, 0, 0, 0,
+ 172, 0, 0, 0, 0, 0, 164, 162, 165, 163,
+ 161, 174, 173, 175, 0, 187, 0, 183, 0, 221,
+ 129, 0, 203, 218, 219, 0, 218, 0, 0, 268,
+ 0, 0, 0, 270, 0, 191, 0, 0, 195, 0,
+ 0, 199, 258, 0, 250, 259, 253, 0, 257, 0,
+ 218, 251, 0, 218, 0, 0, 269, 0, 0, 0,
+ 271, 318, 308, 0, 0, 310, 0, 304, 0, 294,
+ 0, 0, 0, 264, 0, 263, 0, 320, 0, 78,
+ 240, 243, 0, 79, 246, 82, 107, 84, 85, 54,
+ 89, 90, 45, 91, 94, 52, 55, 46, 218, 47,
+ 56, 97, 50, 99, 53, 101, 102, 247, 104, 105,
+ 109, 0, 71, 0, 0, 73, 77, 75, 63, 74,
+ 76, 0, 72, 62, 241, 239, 117, 118, 123, 0,
+ 116, 0, 293, 0, 280, 281, 0, 292, 0, 0,
+ 0, 283, 288, 286, 289, 0, 0, 287, 288, 0,
+ 284, 0, 285, 242, 291, 0, 242, 290, 0, 295,
+ 296, 0, 242, 297, 298, 0, 0, 299, 0, 0,
+ 0, 300, 301, 135, 134, 0, 0, 0, 267, 0,
+ 0, 0, 282, 0, 70, 0, 67, 69, 60, 0,
+ 66, 61, 68, 65, 59, 0, 64, 139, 137, 141,
+ 138, 136, 140, 0, 0, 0, 33, 0, 34, 0,
+ 37, 38, 32, 15, 11, 0, 23, 26, 24, 0,
+ 25, 28, 242, 69, 19, 0, 27, 22, 79, 246,
+ 82, 107, 84, 85, 54, 89, 90, 45, 91, 94,
+ 52, 55, 46, 218, 47, 56, 97, 50, 99, 53,
+ 101, 102, 247, 104, 105, 109, 0, 12, 0, 18,
+ 13, 20, 21, 255, 248, 0, 256, 252, 0, 254,
+ 244, 0, 245, 249, 321};
const int JavaScriptGrammar::goto_default [] = {
- 6, 5, 13, 1, 4, 3, 28, 30, 29, 538,
- 15, 31, 534, 535, 536, 225, 229, 231, 228, 235,
- 513, 230, 234, 263, 53, 61, 494, 492, 387, 386,
- 44, 493, 385, 388, 139, 57, 52, 177, 59, 48,
- 176, 54, 60, 89, 58, 43, 63, 62, 300, 50,
- 294, 45, 290, 47, 292, 46, 291, 55, 298, 56,
- 299, 49, 293, 289, 330, 442, 295, 296, 389, 236,
- 227, 226, 238, 264, 237, 242, 261, 262, 391, 390,
- 32, 548, 547, 352, 353, 550, 355, 549, 354, 450,
- 454, 457, 453, 452, 472, 473, 219, 233, 215, 218,
- 232, 240, 239, 0};
+ 6, 5, 19, 1, 4, 3, 32, 34, 33, 566,
+ 22, 18, 535, 536, 231, 226, 230, 232, 229, 236,
+ 514, 235, 264, 57, 65, 495, 493, 388, 387, 48,
+ 494, 386, 389, 140, 61, 56, 178, 63, 52, 177,
+ 58, 64, 90, 62, 47, 67, 66, 301, 54, 295,
+ 49, 291, 51, 293, 50, 292, 59, 299, 60, 300,
+ 53, 294, 290, 331, 443, 296, 297, 390, 237, 228,
+ 227, 239, 265, 238, 243, 262, 263, 392, 391, 36,
+ 575, 574, 353, 354, 577, 356, 576, 355, 451, 455,
+ 458, 454, 453, 473, 474, 220, 234, 216, 219, 233,
+ 241, 240, 0};
const int JavaScriptGrammar::action_index [] = {
- 60, -91, -21, -91, -47, 22, 43, 76, -91, -91,
- -91, 20, -91, -91, 394, -91, -91, -91, -91, -31,
- 199, 6, 185, -91, -91, -91, 11, -91, -91, -91,
- 381, 157, 180, -91, 182, -91, -91, -91, 19, 183,
- -91, 697, -91, 66, -91, 54, 32, -19, 174, -91,
- 257, 211, -91, -91, 538, 63, 69, 248, 170, -91,
- -91, -91, 345, 154, 697, -91, -91, -91, 158, -91,
- 1275, 55, 697, 697, 697, 617, 697, -91, -91, 697,
- 697, -91, -91, -91, -91, 697, -91, 697, 697, -91,
- 697, 697, 100, 217, -91, -91, 697, 697, 697, -91,
- -91, -91, 131, 697, 267, 697, 697, 697, 697, 355,
- 697, 697, 697, 697, 697, 697, 188, 697, 697, 697,
- 101, 118, 105, 314, 224, 210, 205, 153, 450, 365,
- 450, 697, -8, 697, 172, 1188, 697, 697, -91, -91,
+ 7, -91, 35, -91, 7, 304, 96, 111, -91, -91,
+ -91, -91, -91, -91, -91, -91, -91, -91, 120, -91,
+ 136, 417, -91, -91, -91, -91, 64, 161, 160, -91,
+ 73, -91, -91, -91, 385, 262, 259, -91, 229, -91,
+ -91, -91, 65, 237, -91, 721, -91, 115, -91, 79,
+ 41, 3, 338, -91, 303, 228, -91, -91, 562, 68,
+ 77, 260, 243, -91, -91, -91, 400, 158, 721, -91,
+ -91, -91, 159, 1299, 93, 721, 721, 721, 515, 721,
+ -91, -91, 721, 721, -91, -91, 721, -91, 721, 721,
+ -91, 721, 721, 110, 150, -91, -91, 721, 721, 721,
+ -91, -91, -91, 175, 721, 310, 721, 721, 721, 721,
+ 474, 721, 721, 721, 721, 721, 721, 179, 721, 721,
+ 721, 70, 74, 78, 246, 253, 249, 241, 227, 474,
+ 474, 474, 721, 61, 721, 178, 1212, 721, 721, -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, 103, 697, -91, -91, 42, -22, -91, 697,
- -91, -91, -91, -91, 697, -91, -91, -91, -91, -91,
- -91, -91, -91, -91, -91, -91, -91, -91, 697, 25,
- 697, 697, -2, 82, 697, -91, 1188, 697, 697, -91,
- 119, -91, 44, -91, -91, -9, -91, 132, 73, 50,
- -91, 134, -91, 62, 1449, -91, -91, -91, -91, -91,
- 122, -91, -91, 37, -91, -91, -91, -91, -91, -91,
- 1449, -91, -91, 298, 300, 109, 1536, 41, 194, 75,
- 47, 1623, 68, 697, -91, 65, 49, 697, 45, 40,
- 38, -91, -91, -91, -91, -91, -91, -91, -91, 72,
- -91, -91, -91, -91, 115, -91, -91, -91, -91, -91,
- -91, 56, 58, 697, 95, 67, -91, -91, 1021, -91,
- 86, 59, -12, -91, 259, 61, 39, 467, 77, 70,
- 382, 314, 223, 697, 276, 697, 697, 697, 697, 274,
- 697, 697, 697, 697, 697, 314, 314, 314, 168, 314,
- 382, 291, 301, 697, -20, 697, 17, 697, -91, 538,
- 697, -91, 697, 12, -37, 697, -39, 1536, -91, 697,
- 106, 1536, -91, 697, -25, 697, 697, 15, 8, 697,
- -91, 2, 113, -15, -91, -91, 697, -91, 225, 697,
- -91, -36, 697, -38, 1536, -91, 697, 80, 1536, -91,
- -7, 202, -23, 3, 1449, -42, -91, 1536, -91, 697,
- 97, 1536, 14, 1536, -91, 21, 18, 36, -91, -91,
- 1536, -24, 288, 7, 281, 74, 697, 1536, -5, -32,
- 264, -4, -26, 617, 0, -1, -91, 781, -91, 5,
- -27, 1, 697, 4, -28, 697, -6, 697, -3, 9,
- 697, -91, 1362, 53, -91, -91, -91, -91, -91, -91,
- 697, -91, -91, -91, -91, 171, -91, 697, 24, -91,
- 1536, -91, 64, -91, -91, 1536, -91, 697, 91, 28,
- -91, 51, -91, 52, 99, 697, -91, 27, 57, -91,
- 31, -91, 1536, -91, 94, 1536, -91, 226, -91, -91,
- 102, 1536, 48, -91, 35, 34, -91, 175, 33, 29,
- -91, -91, -91, -91, 697, 90, 1536, -91, 697, 89,
- 1536, -91, 88, 46, 941, -91, 26, -91, 861, -91,
- -91, -91, -91, -91, 107, -91, -91, -91, -91, -91,
- -91, -91, 10, 13, 155, -91, 697, -91, 177, -91,
- -91, -91, -91, -91, 1101, 191, -91, -91, -91, -91,
- -91, 16, 110, -91, 85, -91, -91, -91, 104, -91,
- 23, -91, -91, -91, -91, -91, 30, -91, 160, -91,
- -91, 697, -91, -91, 136, -91, -91, -91,
+ -91, -91, -91, 104, 721, -91, -91, 84, 56, -91,
+ 721, -91, -91, -91, -91, 721, -91, -91, -91, -91,
+ -91, -91, -91, -91, -91, -91, -91, -91, -91, 721,
+ 69, 721, 721, 95, 92, 721, -91, 1212, 721, 721,
+ -91, 112, -91, 14, -91, -91, 36, -91, 155, 67,
+ 53, -91, 176, -91, 43, 1560, -91, -91, -91, -91,
+ -91, 254, -91, -91, 33, -91, -91, -91, -91, -91,
+ -91, 1560, -91, -91, 339, 332, 85, 1473, 62, 252,
+ 66, 32, 1734, 71, 721, -91, 72, 55, 721, 60,
+ 50, 46, -91, -91, -91, -91, -91, -91, -91, -91,
+ 75, -91, -91, -91, -91, 80, -91, -91, -91, -91,
+ -91, -91, 1, 49, 721, 118, 119, -91, -91, 961,
+ -91, 86, 21, 6, -91, 305, 63, 22, 482, 88,
+ 121, 406, 282, 157, 721, 312, 721, 721, 721, 721,
+ 406, 721, 721, 721, 721, 721, 212, 208, 222, 226,
+ 234, 406, 406, 406, 721, -39, 721, -1, 721, -91,
+ 562, 721, -91, 721, -3, -57, 721, -54, 1473, -91,
+ 721, 116, 1473, -91, 721, -45, 721, 721, 88, -6,
+ 721, -91, -10, 130, -21, -91, -91, 721, -91, 238,
+ 721, -91, -44, 721, -46, 1473, -91, 721, 132, 1473,
+ -91, -23, 219, -49, -24, 1560, -47, -91, 1473, -91,
+ 721, 99, 1473, -4, 1473, -91, 40, 42, 2, -91,
+ -91, 1473, -2, 325, 39, 314, 108, 721, 1473, 34,
+ 12, 272, 38, 13, 641, 45, 48, -91, 1045, -91,
+ 57, 26, 47, 721, 8, 11, 721, 16, 721, -11,
+ -7, 721, -91, 1386, 17, -91, -91, -91, -91, -91,
+ -91, 721, -91, -91, -91, -91, 182, -91, 721, -41,
+ -91, 1473, -91, 89, -91, -91, 1473, -91, 721, 114,
+ -5, -91, 28, -91, 37, 109, 721, -91, 29, 25,
+ -91, -25, -91, 1473, -91, 125, 1473, -91, 221, -91,
+ -91, 103, 1473, 18, -91, 0, 4, -91, 164, -20,
+ 10, -91, -91, -91, -91, 721, 97, 1473, -91, 721,
+ 98, 1473, -91, 100, 27, 801, -91, 23, -91, 881,
+ -91, -91, -91, -91, -91, 107, -91, -91, -91, -91,
+ -91, -91, -91, -16, -8, 147, -91, 721, -91, 153,
+ -91, -91, -91, -91, -91, 1125, -91, -91, -91, 284,
+ -91, -91, 1647, 388, -91, 82, -91, -91, 359, 9,
+ 349, 87, 721, 1473, 15, -9, 298, 19, 24, 641,
+ 52, 51, -91, 1045, -91, 54, 31, 58, 721, 59,
+ 30, 721, 44, 721, 20, -18, 126, -91, 318, -91,
+ -91, -91, -91, -15, -91, 137, -91, -91, 721, -91,
+ -91, 190, -91, -91, -91,
- -104, -104, -104, -104, 98, 6, -104, -104, -104, -104,
- -104, -104, -104, -104, 212, -104, -104, -104, -104, -104,
- 0, -104, -104, -104, -104, -104, -104, -104, -104, -104,
- 320, -104, 3, -104, -3, -104, -104, -104, -104, -104,
- -104, 11, -104, -104, -104, -104, -104, -104, -104, -104,
- -104, -104, -104, -104, -43, -104, -104, -104, -104, -104,
- -104, -104, -104, -104, 108, -104, -104, -104, -16, -104,
- -104, -104, -11, 116, 103, 79, 92, -104, -104, 48,
- 143, -104, -104, -104, -104, 112, -104, 99, 93, -104,
- 161, 106, -104, -104, -104, -104, 81, 87, 96, -104,
- -104, -104, -104, 77, -104, 147, 134, 148, 121, -104,
- 124, 132, 136, 130, 75, 44, -104, 43, 35, 53,
- -104, -104, -104, -104, -104, -104, -104, -104, -104, -104,
- -104, 55, -104, 64, -104, 73, 21, 23, -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, 24, -104, -104, -104, -104, -104, 22,
- -104, -104, -104, -104, -26, -104, -104, -104, -104, -104,
- -104, -104, -104, -104, -104, -104, -104, -104, 119, -104,
- 123, 19, -104, -104, 17, -104, 214, 9, 56, -104,
- -104, -104, -104, -104, -104, -104, -104, 1, -104, -104,
- -104, -4, -104, -104, -37, -104, -104, -104, -104, -104,
- -104, -104, -104, -104, -104, -104, -104, -104, -104, -104,
- 52, -104, -104, 12, 10, -104, -35, -104, -2, -104,
- -104, -104, -104, 5, -104, -104, -104, 7, 14, -104,
- -104, -104, -104, -104, -104, -104, -104, -104, -104, -104,
- -104, -104, -104, -104, -104, -104, -104, -104, -104, -104,
- -104, -104, -104, -20, -104, -104, -104, -104, 97, -104,
- -104, -104, -104, -104, -104, -104, -104, -104, -104, -104,
- -104, -104, 41, 191, -104, 203, 162, 185, 182, -104,
- 117, 146, 120, 61, 63, -104, -104, -104, -104, -104,
- -104, -104, -104, 170, -104, 168, -104, 176, -104, -104,
- 166, -104, 58, -104, -104, 66, -104, 32, -104, 45,
- -104, 33, -104, 224, -104, 160, 152, -104, -104, 158,
- -104, -104, -104, -104, -104, -104, 150, -104, 88, 54,
- -104, -104, 60, -104, 42, -104, 47, -104, 31, -104,
- -104, 49, -104, -104, 59, -104, -104, -22, -104, 34,
- -104, -27, -104, -28, -104, -104, -104, -104, -104, -104,
- -30, -104, 38, -104, 40, -104, 70, -24, -104, -104,
- 39, -104, -104, 57, -104, -104, -104, 36, -104, -104,
- -104, -104, 37, -104, 28, 126, -104, 142, -104, -104,
- 30, -104, 27, -104, -104, -104, -104, -104, -104, -104,
- 26, -104, -104, -104, -104, -104, -104, 111, -104, -104,
- 4, -104, -104, -104, -104, -7, -104, 46, -104, -104,
- -104, -104, -104, -48, -104, -5, -104, -90, -104, -104,
- -104, -104, -73, -104, -104, -75, -104, -104, -104, -104,
- -104, -104, -84, -104, -104, -6, -104, -18, -104, -1,
- -104, -104, -104, -104, -19, -104, -53, -104, 16, -104,
- -55, -104, -104, -104, 18, -104, 25, -104, 20, -104,
- -104, -104, -104, -104, -104, -104, -104, -104, -104, -104,
- -104, -104, -104, -104, -104, -104, 2, -104, -104, -104,
- -104, -104, -104, -104, 237, 15, -104, -104, -104, -104,
- -104, 8, 13, -104, -104, -104, -104, -104, -104, -104,
- 29, -104, -104, -104, -104, -104, -104, -104, -104, -104,
- -104, -23, -104, -104, 50, -104, -104, -104};
+ -103, -103, -103, -103, 7, 70, -103, -103, -103, -103,
+ -103, -103, -103, -103, -103, -103, -103, -103, -103, -103,
+ 20, 240, -103, -103, -103, -103, -103, 45, -103, -103,
+ -103, -103, -103, -103, 256, -103, -15, -103, -13, -103,
+ -103, -103, -103, -103, -103, -14, -103, -103, -103, -103,
+ -103, -103, -103, -103, -103, -103, -103, -103, -42, -103,
+ -103, -103, -103, -103, -103, -103, -103, -103, 142, -103,
+ -103, -103, 9, -103, -103, 0, 143, 132, 136, 114,
+ -103, -103, 146, 62, -103, -103, 129, -103, 125, 119,
+ -103, 151, 164, -103, -103, -103, -103, 157, 160, 122,
+ -103, -103, -103, -103, 65, -103, 77, 78, 89, 109,
+ -103, 82, 86, 80, 69, 47, 66, -103, 75, 72,
+ 137, -103, -103, -103, -103, -103, -103, -103, -103, -103,
+ -103, -103, 101, -103, 107, -103, 120, 34, 17, -103,
+ -103, -103, -103, -103, -103, -103, -103, -103, -103, -103,
+ -103, -103, -103, -103, -103, -103, -103, -103, -103, -103,
+ -103, -103, -103, -103, -103, -103, -103, -103, -103, -103,
+ -103, -103, -103, -103, 13, -103, -103, -103, -103, -103,
+ 28, -103, -103, -103, -103, 46, -103, -103, -103, -103,
+ -103, -103, -103, -103, -103, -103, -103, -103, -103, 135,
+ -103, 110, -5, -103, -103, -10, -103, 209, 6, 50,
+ -103, -103, -103, -103, -103, -103, -103, -103, -19, -103,
+ -103, -103, 39, -103, -103, 33, -103, -103, -103, -103,
+ -103, -103, -103, -103, -103, -103, -103, -103, -103, -103,
+ -103, 79, -103, -103, -6, 4, -103, -38, -103, 29,
+ -103, -103, -103, -103, 36, -103, -103, -103, 40, 25,
+ -103, -103, -103, -103, -103, -103, -103, -103, -103, -103,
+ -103, -103, -103, -103, -103, -103, -103, -103, -103, -103,
+ -103, -103, -103, -103, 8, -103, -103, -103, -103, 200,
+ -103, -103, -103, -103, -103, -103, -103, -103, -103, -103,
+ -103, -103, -103, 11, 169, -103, 212, 203, 263, 179,
+ -103, 165, 147, 150, 156, 163, -103, -103, -103, -103,
+ -103, -103, -103, -103, 182, -103, 204, -103, 185, -103,
+ -103, 194, -103, 134, -103, -103, 96, -103, 30, -103,
+ 59, -103, 2, -103, 191, -103, 172, 175, -103, -103,
+ 176, -103, -103, -103, -103, -103, -103, 166, -103, 85,
+ 76, -103, -103, 81, -103, -51, -103, 16, -103, -41,
+ -103, -103, 84, -103, -103, 67, -103, -103, -61, -103,
+ 53, -103, 3, -103, -3, -103, -103, -103, -103, -103,
+ -103, -31, -103, 21, -103, 15, -103, 102, -9, -103,
+ -103, 26, -103, -103, 99, -103, -103, -103, 37, -103,
+ -103, -103, -103, 31, -103, 38, 97, -103, 90, -103,
+ -103, 27, -103, 10, -103, -103, -103, -103, -103, -103,
+ -103, 18, -103, -103, -103, -103, -103, -103, 92, -103,
+ -103, 5, -103, -103, -103, -103, 32, -103, 52, -103,
+ -103, -103, -103, -103, -33, -103, 49, -103, -28, -103,
+ -103, -103, -103, -76, -103, -103, -72, -103, -103, -103,
+ -103, -103, -103, -84, -103, -103, -12, -103, -21, -103,
+ 74, -103, -103, -103, -103, 14, -103, -54, -103, 19,
+ -103, -36, -103, -103, -103, -4, -103, -2, -103, -11,
+ -103, -103, -103, -103, -103, -103, -103, -103, -103, -103,
+ -103, -103, -103, -103, -103, -103, -103, 1, -103, -103,
+ -103, -103, -103, -103, -103, 254, -103, -103, -103, -1,
+ -103, -103, -103, 68, -103, -103, -103, -103, 12, -103,
+ 42, -103, 61, -7, -103, -103, 48, -103, -103, 44,
+ -103, -103, -103, 41, -103, -103, -103, -103, 23, -103,
+ 24, 56, -103, 43, -103, -103, -103, -103, 71, -103,
+ -103, -103, -103, -103, -103, -103, -103, -103, -18, -103,
+ -103, 57, -103, -103, -103};
const int JavaScriptGrammar::action_info [] = {
- 198, -104, -88, -74, 288, 471, -78, -96, -99, 447,
- 379, -101, -77, 376, -107, 349, 366, 343, 303, 356,
- 173, 337, 364, 323, 335, 362, 422, 217, 420, 371,
- 383, 434, 455, 484, 495, 34, 374, 373, 181, 14,
- 521, 2, 514, 557, 7, 488, 371, 551, 39, 14,
- 179, 11, 11, 14, 501, 103, 455, 455, 325, 133,
- 430, 451, 471, 495, 462, 198, 325, 471, 475, 327,
- 133, 477, 445, 131, 488, 440, 484, 288, 471, 343,
- 131, 221, 377, 379, 439, 447, 461, 303, 173, 204,
- 0, 432, 267, 479, 283, 224, 496, 173, 173, 173,
- 332, 465, 173, 173, 213, 173, 90, 323, 474, 458,
- 223, 173, 540, 0, 173, 173, 0, 91, 495, 200,
- 345, 358, 475, 201, 346, 444, 443, 173, 287, 286,
- 173, 0, 282, 273, 272, 280, 279, 9, 8, 11,
- 368, 90, 94, 96, 497, 90, 544, 543, 2, 490,
- 486, 449, 91, 95, 459, 285, 91, 381, 90, 174,
- 541, 69, 516, 69, 524, 69, 341, 505, 554, 91,
- 280, 279, 525, 103, 359, 211, 278, 277, 117, 117,
- 118, 118, 96, 266, 265, 173, 206, 69, 97, 135,
- 41, 119, 119, 117, 98, 118, 0, 0, 81, 82,
- 81, 82, 81, 82, 69, 207, 119, 437, 136, 69,
- 137, 35, 0, 117, 35, 118, 517, 515, 0, 173,
- 69, 555, 553, 69, 81, 82, 119, 97, 69, 96,
- 117, 69, 118, 98, 173, 117, 0, 118, 520, 519,
- 0, 81, 82, 119, 42, 40, 81, 82, 119, 117,
- 0, 118, 69, 0, 69, 0, 37, 81, 82, 37,
- 81, 82, 119, 206, 0, 81, 82, 36, 81, 82,
- 36, 0, 183, 182, 97, 105, 106, 305, 306, 0,
- 98, 0, 207, 0, 208, 105, 106, 469, 468, 81,
- 82, 81, 82, 69, 305, 306, 0, 310, 311, 0,
- -318, 0, 107, 108, 307, 308, 312, 0, 0, 313,
- 69, 314, 107, 108, 310, 311, 0, 69, 0, 0,
- 0, 307, 308, 312, 310, 311, 313, 69, 314, 69,
- 81, 82, 0, 312, 0, 0, 313, 0, 314, 117,
- 0, 118, 276, 275, 0, 0, 0, 81, 82, 271,
- 270, 0, 119, 0, 81, 82, 0, 0, 0, 271,
- 270, 276, 275, 0, 81, 82, 81, 82, 110, 111,
- 0, 0, 0, 0, 0, 0, 112, 113, 110, 111,
- 114, 0, 115, 0, 0, 0, 112, 113, 110, 111,
- 114, 19, 115, 0, 0, 0, 112, 113, 0, 0,
- 114, 0, 115, 20, 19, 310, 311, 0, 0, 0,
- 21, 0, 0, 0, 312, 0, 20, 313, 0, 314,
- 0, 0, 0, 21, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 522, 0, 0, 0,
- 25, 0, 0, 0, 0, 0, 0, 22, 26, 23,
- 0, 0, 0, 25, 0, 27, 0, 0, 0, 0,
- 22, 26, 0, 0, 18, 0, 24, 0, 27, 0,
- 185, 0, 0, 110, 111, 0, 0, 18, 0, 24,
- 186, 112, 113, 0, 187, 114, 0, 115, 0, 0,
- 0, 0, 0, 188, 0, 189, 0, 0, 339, 0,
- 0, 0, 0, 0, 0, 0, 190, 0, 191, 94,
- 0, 0, 0, 0, 0, 0, 192, 0, 0, 193,
- 95, 0, 0, 0, 0, 194, 0, 0, 0, 0,
- 0, 195, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 185, 0, 0, 0, 0, 196, 0, 0, 0,
- 0, 186, 0, 0, 0, 187, 0, 0, 0, 0,
- 0, 0, 0, 0, 188, 0, 189, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 190, 0, 191,
- 94, 0, 0, 0, 0, 0, 0, 192, 0, 0,
- 193, 95, 0, 0, 0, 0, 194, 0, 0, 0,
- 0, 0, 195, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 196, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 65,
- 66, 0, 0, 0, 0, 0, 0, 0, 0, 68,
- 0, 0, 0, 0, 0, 0, 69, 0, 0, 0,
- 70, 71, 0, 72, 0, 0, 0, 0, 0, 0,
- 75, 0, 0, 0, 78, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 83, 81, 82, 0, 84, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 77, 86, 67,
- 0, 0, 0, 0, 0, 0, 0, 0, 64, 65,
- 66, 0, 0, 0, 0, 0, 0, 0, 0, 68,
- 0, 0, 0, 0, 0, 0, 69, 0, 0, 0,
- 70, 71, 0, 72, 0, 0, 0, 73, 0, 74,
- 75, 76, 0, 0, 78, 0, 0, 0, 79, 0,
- 80, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 83, 81, 82, 0, 84, 0, 85, 0,
- 87, 0, 88, 0, 0, 0, 0, 77, 86, 67,
- 0, 0, 0, 0, 0, 0, 0, 0, -97, 0,
- 0, 0, 64, 65, 66, 0, 0, 0, 0, 0,
- 0, 0, 0, 68, 0, 0, 0, 0, 0, 0,
- 69, 0, 0, 0, 70, 71, 0, 72, 0, 0,
- 0, 73, 0, 74, 75, 76, 0, 0, 78, 0,
- 0, 0, 79, 0, 80, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 83, 81, 82, 0,
- 84, 0, 85, 0, 87, 0, 88, 0, 0, 0,
- 0, 77, 86, 67, 0, 0, 0, 0, 0, 0,
- 0, 0, 64, 65, 66, 0, 0, 0, 0, 0,
- 0, 0, 0, 68, 0, 0, 0, 0, 0, 0,
- 69, 0, 0, 0, 70, 71, 0, 72, 0, 0,
- 0, 73, 0, 74, 75, 76, 0, 0, 78, 0,
- 0, 0, 79, 0, 80, 0, 0, 500, 0, 0,
- 0, 0, 0, 0, 0, 0, 83, 81, 82, 0,
- 84, 0, 85, 0, 87, 0, 88, 0, 0, 0,
- 0, 77, 86, 67, 0, 0, 0, 0, 0, 0,
- 0, 0, 64, 65, 66, 0, 0, 0, 0, 0,
- 0, 0, 0, 68, 0, 0, 0, 0, 0, 0,
- 69, 0, 0, 0, 70, 71, 0, 72, 0, 0,
- 0, 73, 0, 74, 75, 76, 0, 0, 78, 0,
- 0, 0, 79, 0, 80, 0, 0, 503, 0, 0,
- 0, 0, 0, 0, 0, 0, 83, 81, 82, 0,
- 84, 0, 85, 0, 87, 0, 88, 0, 0, 0,
- 0, 77, 86, 67, 0, 0, 0, 0, 0, 0,
- 0, 0, 64, 65, 66, 0, 0, 0, 0, 0,
- 0, 0, 0, 68, 0, 0, 0, 0, 0, 0,
- 69, 0, 0, 0, 70, 71, 0, 72, 0, 0,
- 0, 73, 0, 74, 75, 76, 0, 0, 78, 0,
- 0, 0, 79, 0, 80, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 83, 81, 82, 0,
- 84, 0, 85, 0, 87, 302, 88, 0, 0, 0,
- 0, 77, 86, 67, 0, 0, 0, 0, 0, 0,
- 0, 0, 64, 65, 66, 0, 0, 0, 0, 0,
- 0, 0, 0, 68, 0, 0, 0, 0, 0, 0,
- 531, 250, 0, 0, 251, 532, 0, 72, 0, 0,
- 0, 73, 0, 74, 75, 76, 0, 0, 78, 0,
- 0, 0, 79, 0, 80, 0, 0, 0, 0, 0,
- 0, 0, 254, 0, 0, 0, 83, 81, 82, 0,
- 84, 0, 85, 0, 87, 0, 88, 0, 0, 0,
- 0, 77, 86, 67, 0, 245, 0, 533, 0, 0,
- 0, 0, 141, 142, 143, 0, 0, 145, 147, 148,
- 0, 0, 149, 0, 150, 0, 0, 0, 152, 153,
- 154, 0, 0, 0, 0, 0, 0, 69, 155, 156,
- 157, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 158, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 161, 0, 0,
- 0, 0, 0, 0, 81, 82, 162, 163, 164, 0,
- 166, 167, 168, 169, 170, 171, 0, 0, 159, 165,
- 151, 144, 146, 160, 0, 0, 0, 0, 0, 141,
- 142, 143, 0, 0, 145, 147, 148, 0, 0, 149,
- 0, 150, 0, 0, 0, 152, 153, 154, 0, 0,
- 0, 0, 0, 0, 424, 155, 156, 157, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 158, 0,
- 0, 0, 425, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 161, 0, 0, 0, 0, 0,
- 429, 426, 428, 162, 163, 164, 0, 166, 167, 168,
- 169, 170, 171, 0, 0, 159, 165, 151, 144, 146,
- 160, 0, 0, 0, 0, 0, 141, 142, 143, 0,
- 0, 145, 147, 148, 0, 0, 149, 0, 150, 0,
- 0, 0, 152, 153, 154, 0, 0, 0, 0, 0,
- 0, 424, 155, 156, 157, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 158, 0, 0, 0, 425,
- 0, 0, 0, 0, 0, 0, 0, 427, 0, 0,
- 0, 161, 0, 0, 0, 0, 0, 429, 426, 428,
- 162, 163, 164, 0, 166, 167, 168, 169, 170, 171,
- 0, 0, 159, 165, 151, 144, 146, 160, 0, 0,
- 0, 0, 0, 243, 0, 0, 0, 0, 244, 0,
- 64, 65, 66, 246, 0, 0, 0, 0, 0, 0,
- 247, 248, 0, 0, 0, 0, 0, 0, 249, 250,
- 0, 0, 251, 71, 0, 72, 0, 0, 0, 73,
- 0, 74, 75, 76, 0, 0, 78, 0, 0, 0,
- 79, 0, 80, 0, 0, 0, 0, 0, 253, 0,
- 254, 0, 0, 0, 83, 252, 255, 256, 84, 257,
- 85, 258, 87, 27, 88, 259, 260, 0, 0, 77,
- 86, 67, 18, 245, 0, 0, 0, 0, 0, 0,
- 243, 0, 0, 0, 0, 244, 0, 64, 65, 66,
- 246, 0, 0, 0, 0, 0, 0, 247, 68, 0,
- 0, 0, 0, 0, 0, 249, 250, 0, 0, 251,
- 71, 0, 72, 0, 0, 0, 73, 0, 74, 75,
- 76, 0, 0, 78, 0, 0, 0, 79, 0, 80,
- 0, 0, 0, 0, 0, 253, 0, 254, 0, 0,
- 0, 83, 252, 255, 256, 84, 257, 85, 258, 87,
- 27, 88, 259, 260, 0, 0, 77, 86, 67, 18,
- 245, 0, 0, 0, 0, 0, 0, 392, 142, 143,
- 0, 0, 394, 147, 396, 65, 66, 397, 0, 150,
- 0, 0, 0, 152, 399, 400, 0, 0, 0, 0,
- 0, 0, 401, 402, 156, 157, 251, 71, 0, 72,
- 0, 0, 0, 73, 0, 74, 403, 76, 0, 0,
- 405, 0, 0, 0, 79, 0, 80, 0, -243, 0,
- 0, 0, 407, 0, 254, 0, 0, 0, 409, 406,
- 408, 410, 411, 412, 85, 414, 415, 416, 417, 418,
- 419, 0, 0, 404, 413, 398, 393, 395, 160, 0,
- 0, 0, 0, 0,
-
- 460, 284, 485, 466, 197, 463, 478, 552, 216, 481,
- 504, 476, 12, 491, 480, 487, 464, 38, 537, 539,
- 222, 184, 370, 518, 512, 220, 333, 546, 467, 470,
- 210, 241, 51, 281, 274, 542, 269, 489, 433, 545,
- 384, 382, 172, 470, 281, 456, 378, 205, 502, 203,
- 499, 498, 180, 178, 175, 380, 431, 333, 467, 423,
- 421, 446, 269, 216, 274, 351, 340, 448, 367, 0,
- 0, 0, 441, 220, 546, 333, 92, 0, 0, 333,
- 121, 333, 0, 0, 92, 92, 178, 333, 120, 92,
- 127, 509, 435, 212, 92, 436, 92, 138, 122, 369,
- 338, 342, 92, 10, 92, 92, 140, 318, 132, 319,
- 365, 92, 351, 214, 435, 134, 92, 436, 92, 361,
- 241, 126, 92, 334, 99, 363, 104, 241, 92, 0,
- 100, 336, 556, 92, 92, 508, 483, 92, 297, 101,
- 92, 178, 482, 301, 92, 372, 507, 92, 438, 92,
- 102, 214, 0, 92, 268, 511, 375, 92, 92, 506,
- 92, 92, 92, 315, 92, 92, 317, 92, 130, 482,
- 116, 92, 360, 92, 199, 92, 125, 92, 123, 0,
- 202, 128, 124, 92, 92, 483, 510, 92, 92, 92,
- 0, 329, 316, 329, 109, 129, 301, 0, 301, 329,
- 0, 92, 92, 92, 301, 93, 301, 329, 301, 92,
- 320, 92, 301, 357, 301, 348, 301, 329, 347, 0,
- 326, 350, 301, 92, 324, 0, 92, 0, 301, 331,
- 322, 301, 92, 321, 16, 33, 17, 301, 138, 328,
- 0, 304, 0, 0, 92, 0, 0, 140, 209, 301,
- 0, 309, 526, 528, 529, 527, 530, 0, 0, 0,
- 0, 0, 0, 0, 0, 92, 0, 0, 0, 0,
- 301, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 344, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 304, 350, 578, 324, 336, 174, 338, 357, 377, 375,
+ 367, 374, 384, 372, 365, -100, -106, 363, 489, 440,
+ 372, 515, -87, -103, 431, 485, -73, 289, 452, 489,
+ 462, 496, 463, 456, 456, 502, 478, 472, 476, 326,
+ 480, -87, 456, 472, 472, -73, -106, 421, 289, 380,
+ 423, -103, -95, 435, -98, -77, 485, 433, -77, -95,
+ 380, -76, 448, 472, -76, -98, -100, 448, 380, 324,
+ 199, 328, 218, 378, 214, 222, 225, 283, 441, 446,
+ 104, 134, 489, 333, 326, 284, 485, 304, 268, 132,
+ 344, 448, 180, 472, 43, 2, 584, 199, 289, 205,
+ 7, 496, 522, 0, 0, 174, 174, 174, 497, 475,
+ 91, 0, 174, 224, 91, 174, 182, 132, 91, 459,
+ 174, 92, 174, 476, 174, 92, 174, 201, 0, 92,
+ 38, 202, 466, 174, 568, 20, 274, 273, 359, 134,
+ 174, 279, 278, 572, 571, 581, 281, 280, 281, 280,
+ 445, 444, 95, 21, 517, 91, 498, 487, 491, 382,
+ 175, 174, 97, 96, 460, 12, 92, 506, 212, 281,
+ 280, 346, 9, 8, 450, 347, 342, 0, 286, 104,
+ 288, 287, 569, 118, 12, 119, 12, 97, 12, 39,
+ 12, 360, 369, 12, 0, 0, 120, 207, 582, 580,
+ 0, 0, 13, 16, 118, 12, 119, 98, 518, 516,
+ 0, 0, 0, 99, 521, 520, 208, 120, 438, 12,
+ 0, 13, 16, 13, 16, 13, 16, 13, 16, 174,
+ 13, 16, 98, 118, 41, 119, 174, 118, 99, 119,
+ 0, 0, 13, 16, 45, 40, 120, 118, 12, 119,
+ 120, 118, 118, 119, 119, 97, 13, 16, 39, 118,
+ 120, 119, 174, 0, 120, 120, 118, 12, 119, 525,
+ 0, 118, 120, 119, 118, 207, 119, 20, 118, 120,
+ 119, 12, 470, 469, 120, 13, 16, 120, 12, 184,
+ 183, 120, 174, 0, 208, 21, 209, 0, 46, 44,
+ 98, 12, 0, 41, 13, 16, 99, 118, -317, 119,
+ 0, 0, 0, 0, 40, 267, 266, 21, 13, 16,
+ 120, 106, 107, 306, 307, 13, 16, 12, 106, 107,
+ 306, 307, 0, 12, -317, 0, 0, 0, 13, 16,
+ 0, 0, 0, 12, 0, 267, 266, 12, 108, 109,
+ 308, 309, 0, 136, 12, 108, 109, 308, 309, 0,
+ 0, 12, 0, 15, 13, 16, 0, 0, 12, 0,
+ 13, 16, 137, 0, 138, 277, 276, 15, 12, 0,
+ 13, 16, 0, 0, 13, 16, 272, 271, 12, 14,
+ 0, 13, 16, 277, 276, 26, 496, 0, 13, 16,
+ 272, 271, 0, 14, 0, 13, 16, 27, 0, 0,
+ 277, 276, 0, 0, 12, 13, 16, 12, 0, 0,
+ 272, 271, 0, 111, 112, 13, 16, 26, 0, 311,
+ 312, 113, 114, 0, 0, 115, 0, 116, 313, 27,
+ 523, 314, 0, 315, 15, 0, 12, 15, 0, 0,
+ 0, 28, 30, 0, 13, 16, 0, 0, 0, 31,
+ 0, 0, 0, 0, 0, 0, 0, 0, 25, 0,
+ 14, 0, 29, 14, 0, 0, 15, 0, 0, 0,
+ 0, 0, 0, 28, 30, 186, 0, 0, 0, 0,
+ 0, 31, 0, 0, 0, 187, 0, 111, 112, 188,
+ 25, 0, 14, 0, 0, 113, 114, 0, 189, 115,
+ 190, 116, 0, 340, 0, 0, 0, 0, 0, 0,
+ 0, 191, 0, 192, 95, 0, 0, 69, 70, 0,
+ 0, 193, 0, 0, 194, 96, 0, 72, 0, 0,
+ 195, 0, 0, 0, 12, 0, 196, 0, 73, 74,
+ 0, 75, 0, 0, 0, 0, 0, 0, 78, 0,
+ 0, 197, 81, 0, 0, 186, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 187, 0, 0, 0, 188,
+ 84, 13, 16, 0, 85, 0, 0, 0, 189, 0,
+ 190, 0, 0, 0, 0, 80, 87, 71, 0, 0,
+ 0, 191, 0, 192, 95, 0, 0, 0, 0, 0,
+ 0, 193, 0, 0, 194, 96, 0, 0, 0, 0,
+ 195, 0, 0, 0, 0, 0, 196, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 197, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 69, 70, 0, 0, 0, 0, 0,
+ 0, 0, 0, 72, 0, 0, 0, 0, 0, 0,
+ 12, 0, 0, 0, 73, 74, 0, 75, 0, 0,
+ 0, 0, 0, 0, 78, 0, 0, 0, 81, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 84, 13, 16, 0,
+ 85, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 80, 87, 71, 0, 0, 0, 0, 0, 0,
+ 0, 0, 68, 69, 70, 0, 0, 0, 0, 0,
+ 0, 0, 0, 72, 0, 0, 0, 0, 0, 0,
+ 12, 0, 0, 0, 73, 74, 0, 75, 0, 0,
+ 0, 76, 0, 77, 78, 79, 0, 0, 81, 0,
+ 0, 0, 82, 0, 83, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 84, 13, 16, 0,
+ 85, 0, 86, 0, 88, 0, 89, 0, 0, 0,
+ 0, 80, 87, 71, 0, 0, 0, 0, 0, 0,
+ 0, 0, 68, 69, 70, 0, 0, 0, 0, 0,
+ 0, 0, 0, 72, 0, 0, 0, 0, 0, 0,
+ 12, 0, 0, 0, 73, 74, 0, 75, 0, 0,
+ 0, 76, 0, 77, 78, 79, 0, 0, 81, 0,
+ 0, 0, 82, 0, 83, 0, 0, 504, 0, 0,
+ 0, 0, 0, 0, 0, 0, 84, 13, 16, 0,
+ 85, 0, 86, 0, 88, 0, 89, 0, 0, 0,
+ 0, 80, 87, 71, 0, 0, 0, 0, 0, 0,
+ 0, 0, 68, 69, 70, 0, 0, 0, 0, 0,
+ 0, 0, 0, 72, 0, 0, 0, 0, 0, 0,
+ 12, 0, 0, 0, 73, 74, 0, 75, 0, 0,
+ 0, 76, 0, 77, 78, 79, 0, 0, 81, 0,
+ 0, 0, 82, 0, 83, 0, 0, 501, 0, 0,
+ 0, 0, 0, 0, 0, 0, 84, 13, 16, 0,
+ 85, 0, 86, 0, 88, 0, 89, 0, 0, 0,
+ 0, 80, 87, 71, 0, 0, 0, 0, 0, 0,
+ 0, 0, 68, 69, 70, 0, 0, 0, 0, 0,
+ 0, 0, 0, 72, 0, 0, 0, 0, 0, 0,
+ 12, 0, 0, 0, 73, 74, 0, 75, 0, 0,
+ 0, 76, 0, 77, 78, 79, 0, 0, 81, 0,
+ 0, 0, 82, 0, 83, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 84, 13, 16, 0,
+ 85, 0, 86, 0, 88, 303, 89, 0, 0, 0,
+ 0, 80, 87, 71, 0, 0, 0, 0, 0, 0,
+ 0, 0, -96, 0, 0, 0, 68, 69, 70, 0,
+ 0, 0, 0, 0, 0, 0, 0, 72, 0, 0,
+ 0, 0, 0, 0, 12, 0, 0, 0, 73, 74,
+ 0, 75, 0, 0, 0, 76, 0, 77, 78, 79,
+ 0, 0, 81, 0, 0, 0, 82, 0, 83, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 523, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 16, 33, 17, 0, 0, 0, 0, 0,
+ 84, 13, 16, 0, 85, 0, 86, 0, 88, 0,
+ 89, 0, 0, 0, 0, 80, 87, 71, 0, 0,
+ 0, 0, 0, 0, 0, 0, 68, 69, 70, 0,
+ 0, 0, 0, 0, 0, 0, 0, 72, 0, 0,
+ 0, 0, 0, 0, 12, 251, 0, 0, 532, 533,
+ 0, 75, 0, 0, 0, 76, 0, 77, 78, 79,
+ 0, 0, 81, 0, 0, 0, 82, 0, 83, 0,
+ 0, 0, 0, 0, 0, 0, 255, 0, 0, 0,
+ 84, 13, 16, 0, 85, 0, 86, 0, 88, 0,
+ 89, 0, 0, 0, 0, 80, 87, 71, 0, 246,
+ 0, 534, 0, 0, 0, 0, 142, 143, 144, 0,
+ 0, 146, 148, 149, 0, 0, 150, 0, 151, 0,
+ 0, 0, 153, 154, 155, 0, 0, 0, 0, 0,
+ 0, 12, 156, 157, 158, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 159, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 162, 0, 0, 0, 0, 0, 0, 13, 16,
+ 163, 164, 165, 0, 167, 168, 169, 170, 171, 172,
+ 0, 0, 160, 166, 152, 145, 147, 161, 0, 0,
+ 0, 0, 0, 142, 143, 144, 0, 0, 146, 148,
+ 149, 0, 0, 150, 0, 151, 0, 0, 0, 153,
+ 154, 155, 0, 0, 0, 0, 0, 0, 425, 156,
+ 157, 158, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 159, 0, 0, 0, 426, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 162, 0,
+ 0, 0, 0, 0, 430, 427, 429, 163, 164, 165,
+ 0, 167, 168, 169, 170, 171, 172, 0, 0, 160,
+ 166, 152, 145, 147, 161, 0, 0, 0, 0, 0,
+ 142, 143, 144, 0, 0, 146, 148, 149, 0, 0,
+ 150, 0, 151, 0, 0, 0, 153, 154, 155, 0,
+ 0, 0, 0, 0, 0, 425, 156, 157, 158, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 159,
+ 0, 0, 0, 426, 0, 0, 0, 0, 0, 0,
+ 0, 428, 0, 0, 0, 162, 0, 0, 0, 0,
+ 0, 430, 427, 429, 163, 164, 165, 0, 167, 168,
+ 169, 170, 171, 172, 0, 0, 160, 166, 152, 145,
+ 147, 161, 0, 0, 0, 0, 0, 244, 0, 0,
+ 0, 0, 245, 0, 68, 69, 70, 247, 0, 0,
+ 0, 0, 0, 0, 248, 72, 0, 0, 0, 0,
+ 0, 0, 250, 251, 0, 0, 252, 74, 0, 75,
+ 0, 0, 0, 76, 0, 77, 78, 79, 0, 0,
+ 81, 0, 0, 0, 82, 0, 83, 0, 0, 0,
+ 0, 0, 254, 0, 255, 0, 0, 0, 84, 253,
+ 256, 257, 85, 258, 86, 259, 88, 31, 89, 260,
+ 261, 0, 0, 80, 87, 71, 25, 246, 0, 0,
+ 0, 0, 0, 0, 244, 0, 0, 0, 0, 245,
+ 0, 68, 69, 70, 247, 0, 0, 0, 0, 0,
+ 0, 248, 249, 0, 0, 0, 0, 0, 0, 250,
+ 251, 0, 0, 252, 74, 0, 75, 0, 0, 0,
+ 76, 0, 77, 78, 79, 0, 0, 81, 0, 0,
+ 0, 82, 0, 83, 0, 0, 0, 0, 0, 254,
+ 0, 255, 0, 0, 0, 84, 253, 256, 257, 85,
+ 258, 86, 259, 88, 31, 89, 260, 261, 0, 0,
+ 80, 87, 71, 25, 246, 0, 0, 0, 0, 0,
+ 0, 538, 143, 144, 0, 0, 540, 148, 542, 69,
+ 70, 543, 0, 151, 0, 0, 0, 153, 545, 546,
+ 0, 0, 0, 0, 0, 0, 547, 548, 157, 158,
+ 252, 74, 0, 75, 0, 0, 0, 76, 0, 77,
+ 549, 79, 0, 0, 551, 0, 0, 0, 82, 0,
+ 83, 0, 0, 0, 0, 0, 553, 0, 255, 0,
+ 0, 0, 555, 552, 554, 556, 557, 558, 86, 560,
+ 561, 562, 563, 564, 565, 0, 0, 550, 559, 544,
+ 539, 541, 161, 0, 0, 0, 0, 0, 393, 143,
+ 144, 0, 0, 395, 148, 397, 69, 70, 398, 0,
+ 151, 0, 0, 0, 153, 400, 401, 0, 0, 0,
+ 0, 0, 0, 402, 403, 157, 158, 252, 74, 0,
+ 75, 0, 0, 0, 76, 0, 77, 404, 79, 0,
+ 0, 406, 0, 0, 0, 82, 0, 83, 0, -242,
+ 0, 0, 0, 408, 0, 255, 0, 0, 0, 410,
+ 407, 409, 411, 412, 413, 86, 415, 416, 417, 418,
+ 419, 420, 0, 0, 405, 414, 399, 394, 396, 161,
+ 0, 0, 0, 0, 0,
+
+ 55, 464, 479, 482, 221, 467, 379, 42, 573, 537,
+ 477, 579, 10, 488, 505, 519, 366, 270, 500, 206,
+ 211, 185, 285, 499, 204, 503, 370, 275, 486, 282,
+ 368, 492, 217, 490, 352, 270, 434, 468, 275, 471,
+ 471, 424, 176, 23, 270, 468, 179, 432, 173, 217,
+ 334, 334, 371, 471, 468, 334, 422, 181, 282, 457,
+ 282, 461, 223, 465, 385, 275, 449, 381, 513, 343,
+ 383, 217, 442, 341, 567, 198, 17, 570, 436, 179,
+ 573, 437, 0, 93, 0, 484, 213, 93, 0, 481,
+ 334, 11, 127, 11, 11, 334, 93, 339, 483, 447,
+ 242, 93, 93, 215, 511, 93, 93, 221, 352, 93,
+ 334, 128, 93, 105, 126, 93, 122, 93, 93, 121,
+ 93, 179, 93, 110, 129, 125, 93, 117, 439, 93,
+ 93, 124, 484, 436, 242, 130, 437, 93, 583, 483,
+ 362, 93, 93, 139, 215, 364, 242, 93, 334, 93,
+ 93, 0, 141, 133, 93, 131, 509, 135, 0, 93,
+ 337, 484, 93, 376, 102, 93, 203, 483, 361, 93,
+ 436, 512, 93, 437, 508, 93, 0, 93, 0, 373,
+ 269, 123, 93, 93, 215, 507, 93, 93, 510, 200,
+ 93, 93, 317, 0, 94, 318, 93, 93, 335, 100,
+ 93, 319, 101, 93, 93, 93, 330, 103, 320, 93,
+ 316, 302, 93, 0, 302, 330, 330, 302, 305, 93,
+ 302, 302, 93, 0, 302, 330, 323, 302, 358, 348,
+ 302, 93, 139, 0, 330, 325, 302, 349, 351, 302,
+ 298, 141, 210, 93, 93, 302, 345, 329, 302, 302,
+ 321, 35, 93, 0, 0, 327, 332, 302, 0, 310,
+ 0, 24, 37, 11, 524, 0, 0, 35, 529, 526,
+ 528, 530, 527, 531, 0, 0, 0, 24, 37, 11,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 93, 0, 0, 0, 0, 302, 0,
+ 322, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0};
+ 0, 0, 0, 0, 0, 0};
const int JavaScriptGrammar::action_check [] = {
- 2, 7, 7, 7, 36, 33, 7, 7, 7, 36,
- 36, 7, 7, 55, 7, 7, 31, 2, 1, 17,
- 8, 60, 60, 48, 61, 61, 8, 36, 7, 36,
- 16, 55, 5, 36, 8, 66, 33, 60, 60, 33,
- 29, 88, 29, 0, 65, 36, 36, 17, 29, 33,
- 8, 29, 29, 33, 8, 1, 5, 5, 78, 78,
- 7, 33, 33, 8, 7, 2, 78, 33, 20, 8,
- 78, 36, 7, 48, 36, 7, 36, 36, 33, 2,
- 48, 8, 7, 36, 60, 36, 55, 1, 8, 7,
- -1, 55, 55, 60, 36, 33, 8, 8, 8, 8,
- 61, 7, 8, 8, 60, 8, 40, 48, 6, 10,
- 60, 8, 8, -1, 8, 8, -1, 51, 8, 50,
- 50, 8, 20, 54, 54, 61, 62, 8, 61, 62,
- 8, -1, 76, 61, 62, 61, 62, 61, 62, 29,
- 60, 40, 42, 12, 56, 40, 61, 62, 88, 60,
- 60, 60, 51, 53, 55, 60, 51, 60, 40, 56,
- 56, 29, 7, 29, 7, 29, 60, 60, 8, 51,
- 61, 62, 15, 1, 61, 56, 61, 62, 25, 25,
- 27, 27, 12, 61, 62, 8, 15, 29, 57, 15,
- 7, 38, 38, 25, 63, 27, -1, -1, 66, 67,
- 66, 67, 66, 67, 29, 34, 38, 36, 34, 29,
- 36, 29, -1, 25, 29, 27, 61, 62, -1, 8,
- 29, 61, 62, 29, 66, 67, 38, 57, 29, 12,
- 25, 29, 27, 63, 8, 25, -1, 27, 61, 62,
- -1, 66, 67, 38, 61, 62, 66, 67, 38, 25,
- -1, 27, 29, -1, 29, -1, 74, 66, 67, 74,
- 66, 67, 38, 15, -1, 66, 67, 85, 66, 67,
- 85, -1, 61, 62, 57, 18, 19, 18, 19, -1,
- 63, -1, 34, -1, 36, 18, 19, 61, 62, 66,
- 67, 66, 67, 29, 18, 19, -1, 23, 24, -1,
- 36, -1, 45, 46, 45, 46, 32, -1, -1, 35,
- 29, 37, 45, 46, 23, 24, -1, 29, -1, -1,
- -1, 45, 46, 32, 23, 24, 35, 29, 37, 29,
- 66, 67, -1, 32, -1, -1, 35, -1, 37, 25,
- -1, 27, 61, 62, -1, -1, -1, 66, 67, 61,
- 62, -1, 38, -1, 66, 67, -1, -1, -1, 61,
- 62, 61, 62, -1, 66, 67, 66, 67, 23, 24,
- -1, -1, -1, -1, -1, -1, 31, 32, 23, 24,
- 35, -1, 37, -1, -1, -1, 31, 32, 23, 24,
- 35, 10, 37, -1, -1, -1, 31, 32, -1, -1,
- 35, -1, 37, 22, 10, 23, 24, -1, -1, -1,
- 29, -1, -1, -1, 32, -1, 22, 35, -1, 37,
- -1, -1, -1, 29, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, 55, -1, -1, -1,
- 59, -1, -1, -1, -1, -1, -1, 66, 67, 55,
- -1, -1, -1, 59, -1, 74, -1, -1, -1, -1,
- 66, 67, -1, -1, 83, -1, 85, -1, 74, -1,
- 3, -1, -1, 23, 24, -1, -1, 83, -1, 85,
- 13, 31, 32, -1, 17, 35, -1, 37, -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, -1, -1, -1, -1, -1, -1, -1,
- -1, 3, -1, -1, -1, -1, 79, -1, -1, -1,
- -1, 13, -1, -1, -1, 17, -1, -1, -1, -1,
- -1, -1, -1, -1, 26, -1, 28, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, -1, 39, -1, 41,
- 42, -1, -1, -1, -1, -1, -1, 49, -1, -1,
- 52, 53, -1, -1, -1, -1, 58, -1, -1, -1,
- -1, -1, 64, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, -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, 7, 17, 48, 61, 8, 60, 17, 55, 33,
+ 31, 60, 16, 36, 60, 7, 7, 61, 36, 60,
+ 36, 29, 7, 7, 7, 36, 7, 36, 33, 36,
+ 55, 8, 7, 5, 5, 8, 36, 33, 20, 78,
+ 60, 7, 5, 33, 33, 7, 7, 7, 36, 36,
+ 8, 7, 7, 55, 7, 7, 36, 55, 7, 7,
+ 36, 7, 36, 33, 7, 7, 7, 36, 36, 48,
+ 2, 8, 36, 7, 60, 8, 33, 76, 7, 7,
+ 1, 78, 36, 61, 78, 36, 36, 1, 55, 48,
+ 2, 36, 8, 33, 29, 88, 0, 2, 36, 7,
+ 65, 8, 29, -1, -1, 8, 8, 8, 8, 6,
+ 40, -1, 8, 60, 40, 8, 60, 48, 40, 10,
+ 8, 51, 8, 20, 8, 51, 8, 50, -1, 51,
+ 66, 54, 7, 8, 8, 15, 61, 62, 8, 78,
+ 8, 61, 62, 61, 62, 8, 61, 62, 61, 62,
+ 61, 62, 42, 33, 7, 40, 56, 60, 60, 60,
+ 56, 8, 12, 53, 55, 29, 51, 60, 56, 61,
+ 62, 50, 61, 62, 60, 54, 60, -1, 60, 1,
+ 61, 62, 56, 25, 29, 27, 29, 12, 29, 29,
+ 29, 61, 60, 29, -1, -1, 38, 15, 61, 62,
+ -1, -1, 66, 67, 25, 29, 27, 57, 61, 62,
+ -1, -1, -1, 63, 61, 62, 34, 38, 36, 29,
+ -1, 66, 67, 66, 67, 66, 67, 66, 67, 8,
+ 66, 67, 57, 25, 74, 27, 8, 25, 63, 27,
+ -1, -1, 66, 67, 7, 85, 38, 25, 29, 27,
+ 38, 25, 25, 27, 27, 12, 66, 67, 29, 25,
+ 38, 27, 8, -1, 38, 38, 25, 29, 27, 7,
+ -1, 25, 38, 27, 25, 15, 27, 15, 25, 38,
+ 27, 29, 61, 62, 38, 66, 67, 38, 29, 61,
+ 62, 38, 8, -1, 34, 33, 36, -1, 61, 62,
+ 57, 29, -1, 74, 66, 67, 63, 25, 36, 27,
+ -1, -1, -1, -1, 85, 61, 62, 33, 66, 67,
+ 38, 18, 19, 18, 19, 66, 67, 29, 18, 19,
+ 18, 19, -1, 29, 36, -1, -1, -1, 66, 67,
+ -1, -1, -1, 29, -1, 61, 62, 29, 45, 46,
+ 45, 46, -1, 15, 29, 45, 46, 45, 46, -1,
+ -1, 29, -1, 59, 66, 67, -1, -1, 29, -1,
+ 66, 67, 34, -1, 36, 61, 62, 59, 29, -1,
+ 66, 67, -1, -1, 66, 67, 61, 62, 29, 85,
+ -1, 66, 67, 61, 62, 10, 8, -1, 66, 67,
+ 61, 62, -1, 85, -1, 66, 67, 22, -1, -1,
+ 61, 62, -1, -1, 29, 66, 67, 29, -1, -1,
+ 61, 62, -1, 23, 24, 66, 67, 10, -1, 23,
+ 24, 31, 32, -1, -1, 35, -1, 37, 32, 22,
+ 55, 35, -1, 37, 59, -1, 29, 59, -1, -1,
+ -1, 66, 67, -1, 66, 67, -1, -1, -1, 74,
+ -1, -1, -1, -1, -1, -1, -1, -1, 83, -1,
+ 85, -1, 55, 85, -1, -1, 59, -1, -1, -1,
+ -1, -1, -1, 66, 67, 3, -1, -1, -1, -1,
+ -1, 74, -1, -1, -1, 13, -1, 23, 24, 17,
+ 83, -1, 85, -1, -1, 31, 32, -1, 26, 35,
+ 28, 37, -1, 31, -1, -1, -1, -1, -1, -1,
+ -1, 39, -1, 41, 42, -1, -1, 12, 13, -1,
+ -1, 49, -1, -1, 52, 53, -1, 22, -1, -1,
+ 58, -1, -1, -1, 29, -1, 64, -1, 33, 34,
+ -1, 36, -1, -1, -1, -1, -1, -1, 43, -1,
+ -1, 79, 47, -1, -1, 3, -1, -1, -1, -1,
+ -1, -1, -1, -1, -1, 13, -1, -1, -1, 17,
+ 65, 66, 67, -1, 69, -1, -1, -1, 26, -1,
+ 28, -1, -1, -1, -1, 80, 81, 82, -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, -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, 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, 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,
@@ -640,109 +648,120 @@ const int JavaScriptGrammar::action_check [] = {
-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, 30, -1, -1, 33, 34, -1, 36, -1, -1,
- -1, 40, -1, 42, 43, 44, -1, -1, 47, -1,
- -1, -1, 51, -1, 53, -1, -1, -1, -1, -1,
- -1, -1, 61, -1, -1, -1, 65, 66, 67, -1,
- 69, -1, 71, -1, 73, -1, 75, -1, -1, -1,
- -1, 80, 81, 82, -1, 84, -1, 86, -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, 4,
- 5, 6, -1, -1, 9, 10, 11, -1, -1, 14,
- -1, 16, -1, -1, -1, 20, 21, 22, -1, -1,
- -1, -1, -1, -1, 29, 30, 31, 32, -1, -1,
- -1, -1, -1, -1, -1, -1, -1, -1, 43, -1,
- -1, -1, 47, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, 59, -1, -1, -1, -1, -1,
- 65, 66, 67, 68, 69, 70, -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, -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, 30, -1, -1, 33, 34,
+ -1, 36, -1, -1, -1, 40, -1, 42, 43, 44,
+ -1, -1, 47, -1, -1, -1, 51, -1, 53, -1,
+ -1, -1, -1, -1, -1, -1, 61, -1, -1, -1,
+ 65, 66, 67, -1, 69, -1, 71, -1, 73, -1,
+ 75, -1, -1, -1, -1, 80, 81, 82, -1, 84,
+ -1, 86, -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,
+ -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, 4, -1, -1, -1, -1, 9, -1,
- 11, 12, 13, 14, -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,
- -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,
- 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,
+ 31, 32, -1, -1, -1, -1, -1, -1, -1, -1,
+ -1, -1, 43, -1, -1, -1, 47, -1, -1, -1,
+ -1, -1, -1, -1, -1, -1, -1, -1, 59, -1,
+ -1, -1, -1, -1, 65, 66, 67, 68, 69, 70,
+ -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, -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, -1, -1, -1, -1, -1, -1, 4, 5, 6,
- -1, -1, 9, 10, 11, 12, 13, 14, -1, 16,
- -1, -1, -1, 20, 21, 22, -1, -1, -1, -1,
- -1, -1, 29, 30, 31, 32, 33, 34, -1, 36,
+ 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, 55, -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, 85, -1,
- -1, -1, -1, -1,
+ 77, -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, -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, 4, 5, 6, -1, -1, 9, 10, 11, 12,
+ 13, 14, -1, 16, -1, -1, -1, 20, 21, 22,
+ -1, -1, -1, -1, -1, -1, 29, 30, 31, 32,
+ 33, 34, -1, 36, -1, -1, -1, 40, -1, 42,
+ 43, 44, -1, -1, 47, -1, -1, -1, 51, -1,
+ 53, -1, -1, -1, -1, -1, 59, -1, 61, -1,
+ -1, -1, 65, 66, 67, 68, 69, 70, 71, 72,
+ 73, 74, 75, 76, 77, -1, -1, 80, 81, 82,
+ 83, 84, 85, -1, -1, -1, -1, -1, 4, 5,
+ 6, -1, -1, 9, 10, 11, 12, 13, 14, -1,
+ 16, -1, -1, -1, 20, 21, 22, -1, -1, -1,
+ -1, -1, -1, 29, 30, 31, 32, 33, 34, -1,
+ 36, -1, -1, -1, 40, -1, 42, 43, 44, -1,
+ -1, 47, -1, -1, -1, 51, -1, 53, -1, 55,
+ -1, -1, -1, 59, -1, 61, -1, -1, -1, 65,
+ 66, 67, 68, 69, 70, 71, 72, 73, 74, 75,
+ 76, 77, -1, -1, 80, 81, 82, 83, 84, 85,
+ -1, -1, -1, -1, -1,
- 90, 21, 21, 78, 30, 78, 24, 30, 24, 15,
- 21, 95, 6, 68, 15, 68, 21, 20, 10, 6,
- 24, 64, 24, 21, 24, 24, 21, 24, 21, 15,
- 21, 68, 21, 68, 24, 6, 24, 21, 68, 24,
- 68, 68, 21, 15, 68, 93, 68, 30, 30, 30,
- 30, 26, 30, 30, 30, 21, 30, 21, 21, 32,
- 30, 68, 24, 24, 24, 24, 21, 21, 21, -1,
- -1, -1, 68, 24, 24, 21, 41, -1, -1, 21,
- 45, 21, -1, -1, 41, 41, 30, 21, 45, 41,
- 46, 43, 35, 37, 41, 38, 41, 24, 45, 68,
- 68, 68, 41, 5, 41, 41, 33, 46, 53, 46,
- 68, 41, 24, 43, 35, 51, 41, 38, 41, 65,
- 68, 46, 41, 65, 43, 65, 49, 68, 41, -1,
- 43, 65, 82, 41, 41, 43, 43, 41, 41, 43,
- 41, 30, 43, 46, 41, 96, 43, 41, 37, 41,
- 44, 43, -1, 41, 102, 43, 97, 41, 41, 43,
- 41, 41, 41, 46, 41, 41, 46, 41, 47, 43,
- 46, 41, 84, 41, 55, 41, 46, 41, 46, -1,
- 57, 47, 46, 41, 41, 43, 43, 41, 41, 41,
- -1, 41, 46, 41, 47, 47, 46, -1, 46, 41,
- -1, 41, 41, 41, 46, 44, 46, 41, 46, 41,
- 48, 41, 46, 63, 46, 63, 46, 41, 58, -1,
- 52, 63, 46, 41, 54, -1, 41, -1, 46, 63,
- 48, 46, 41, 48, 22, 23, 24, 46, 24, 63,
- -1, 50, -1, -1, 41, -1, -1, 33, 34, 46,
- -1, 48, 15, 16, 17, 18, 19, -1, -1, -1,
- -1, -1, -1, -1, -1, 41, -1, -1, -1, -1,
- 46, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- 56, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, -1, -1, 8, -1,
- -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, 22, 23, 24, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
+ 14, 77, 23, 15, 23, 77, 67, 20, 23, 10,
+ 94, 29, 5, 67, 14, 14, 67, 23, 29, 29,
+ 14, 63, 14, 25, 29, 29, 67, 23, 14, 67,
+ 14, 67, 23, 14, 23, 23, 67, 14, 23, 15,
+ 15, 31, 29, 23, 23, 14, 29, 29, 14, 23,
+ 14, 14, 23, 15, 14, 14, 29, 29, 67, 92,
+ 67, 89, 23, 14, 67, 23, 14, 14, 23, 67,
+ 67, 23, 67, 14, 6, 29, 6, 6, 34, 29,
+ 23, 37, -1, 40, -1, 42, 36, 40, -1, 15,
+ 14, 23, 45, 23, 23, 14, 40, 67, 42, 67,
+ 67, 40, 40, 42, 42, 40, 40, 23, 23, 40,
+ 14, 45, 40, 48, 45, 40, 44, 40, 40, 44,
+ 40, 29, 40, 46, 46, 45, 40, 45, 36, 40,
+ 40, 45, 42, 34, 67, 46, 37, 40, 81, 42,
+ 64, 40, 40, 23, 42, 64, 67, 40, 14, 40,
+ 40, -1, 32, 52, 40, 46, 42, 50, -1, 40,
+ 64, 42, 40, 96, 42, 40, 56, 42, 83, 40,
+ 34, 42, 40, 37, 42, 40, -1, 40, -1, 95,
+ 101, 44, 40, 40, 42, 42, 40, 40, 42, 54,
+ 40, 40, 45, -1, 43, 45, 40, 40, 64, 42,
+ 40, 45, 42, 40, 40, 40, 40, 43, 45, 40,
+ 45, 45, 40, -1, 45, 40, 40, 45, 49, 40,
+ 45, 45, 40, -1, 45, 40, 47, 45, 62, 57,
+ 45, 40, 23, -1, 40, 53, 45, 62, 62, 45,
+ 40, 32, 33, 40, 40, 45, 55, 62, 45, 45,
+ 47, 11, 40, -1, -1, 51, 62, 45, -1, 47,
+ -1, 21, 22, 23, 8, -1, -1, 11, 14, 15,
+ 16, 17, 18, 19, -1, -1, -1, 21, 22, 23,
-1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
+ -1, -1, -1, 40, -1, -1, -1, -1, 45, -1,
+ 47, -1, -1, -1, -1, -1, -1, -1, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, -1};
+ -1, -1, -1, -1, -1, -1};
diff --git a/src/declarative/qml/parser/javascriptgrammar_p.h b/src/declarative/qml/parser/javascriptgrammar_p.h
index 2e78a77..de83cd0 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 = 557,
- RULE_COUNT = 322,
- STATE_COUNT = 558,
+ ACCEPT_STATE = 584,
+ RULE_COUNT = 321,
+ STATE_COUNT = 585,
TERMINAL_COUNT = 91,
- NON_TERMINAL_COUNT = 104,
+ NON_TERMINAL_COUNT = 103,
- GOTO_INDEX_OFFSET = 558,
- GOTO_INFO_OFFSET = 1714,
- GOTO_CHECK_OFFSET = 1714
+ GOTO_INDEX_OFFSET = 585,
+ GOTO_INFO_OFFSET = 1825,
+ GOTO_CHECK_OFFSET = 1825
};
static const char *const spell [];
diff --git a/src/declarative/qml/parser/javascriptparser.cpp b/src/declarative/qml/parser/javascriptparser.cpp
index 4369771..5d456c7 100644
--- a/src/declarative/qml/parser/javascriptparser.cpp
+++ b/src/declarative/qml/parser/javascriptparser.cpp
@@ -53,6 +53,7 @@
#include "javascriptparser_p.h"
+#include <QVarLengthArray>
//
// This file is automatically generated from javascript.g.
@@ -114,6 +115,34 @@ static inline AST::SourceLocation location(Lexer *lexer)
return loc;
}
+AST::UiQualifiedId *Parser::reparseAsQualifiedId(AST::ExpressionNode *expr)
+{
+ QVarLengthArray<NameId *, 4> nameIds;
+ QVarLengthArray<AST::SourceLocation, 4> locations;
+
+ AST::ExpressionNode *it = expr;
+ while (AST::FieldMemberExpression *m = AST::cast<AST::FieldMemberExpression *>(it)) {
+ nameIds.append(m->name);
+ locations.append(m->identifierToken);
+ it = m->base;
+ }
+
+ if (AST::IdentifierExpression *idExpr = AST::cast<AST::IdentifierExpression *>(it)) {
+ AST::UiQualifiedId *q = makeAstNode<AST::UiQualifiedId>(driver->nodePool(), idExpr->name);
+ q->identifierToken = idExpr->identifierToken;
+
+ AST::UiQualifiedId *currentId = q;
+ for (int i = nameIds.size() - 1; i != -1; --i) {
+ currentId = makeAstNode<AST::UiQualifiedId>(driver->nodePool(), currentId, nameIds[i]);
+ currentId->identifierToken = locations[i];
+ }
+
+ return currentId->finish();
+ }
+
+ return 0;
+}
+
bool Parser::parse()
{
Lexer *lexer = driver->lexer();
@@ -234,21 +263,12 @@ case 14: {
} break;
case 15: {
- 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: {
- AST::UiObjectDefinition *node = makeAstNode<AST::UiObjectDefinition> (driver->nodePool(), sym(1).sval,
+ AST::UiObjectDefinition *node = makeAstNode<AST::UiObjectDefinition> (driver->nodePool(), sym(1).UiQualifiedId->finish(),
sym(2).UiObjectInitializer);
- node->identifierToken = loc(1);
sym(1).Node = node;
} break;
-case 18: {
+case 17: {
AST::UiArrayBinding *node = makeAstNode<AST::UiArrayBinding> (driver->nodePool(), sym(1).UiQualifiedId->finish(),
sym(4).UiObjectMemberList->finish());
node->colonToken = loc(2);
@@ -257,33 +277,49 @@ case 18: {
sym(1).Node = node;
} break;
-case 19: {
+case 18: {
AST::StringLiteral *node = makeAstNode<AST::StringLiteral> (driver->nodePool(), sym(1).sval);
node->literalToken = loc(1);
sym(1).Node = node;
} break;
-case 21: {
+case 20: {
AST::ExpressionStatement *node = makeAstNode<AST::ExpressionStatement> (driver->nodePool(), sym(1).Expression);
node->semicolonToken = loc(2);
sym(1).Node = node;
} break;
-case 28: {
+case 21: {
+ if (AST::UiQualifiedId *qualifiedId = reparseAsQualifiedId(sym(3).Expression)) {
+ AST::UiObjectBinding *node = makeAstNode<AST::UiObjectBinding> (driver->nodePool(),
+ sym(1).UiQualifiedId->finish(), qualifiedId, sym(4).UiObjectInitializer);
+ node->colonToken = loc(2);
+ sym(1).Node = node;
+ } else {
+ sym(1).Node = 0;
+
+ diagnostic_messages.append(DiagnosticMessage(DiagnosticMessage::Error, loc(2),
+ QLatin1String("Expected a type name after token `:'")));
+
+ return false; // ### recover
+ }
+} break;
+case 22:case 23:case 24: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 29:
+case 28:
-case 30: {
+case 29: {
sym(1).sval = driver->intern(lexer->characterBuffer(), lexer->characterCount());
break;
}
-case 32: {
+case 31: {
AST::UiPublicMember *node = makeAstNode<AST::UiPublicMember> (driver->nodePool(), (NameId *)0, sym(2).sval);
node->type = AST::UiPublicMember::Signal;
node->propertyToken = loc(1);
@@ -292,7 +328,7 @@ case 32: {
sym(1).Node = node;
} break;
-case 34: {
+case 33: {
AST::UiPublicMember *node = makeAstNode<AST::UiPublicMember> (driver->nodePool(), sym(2).sval, sym(3).sval);
node->propertyToken = loc(1);
node->typeToken = loc(2);
@@ -301,7 +337,7 @@ case 34: {
sym(1).Node = node;
} break;
-case 36: {
+case 35: {
AST::UiPublicMember *node = makeAstNode<AST::UiPublicMember> (driver->nodePool(), sym(3).sval, sym(4).sval);
node->isDefaultMember = true;
node->defaultToken = loc(1);
@@ -312,7 +348,7 @@ case 36: {
sym(1).Node = node;
} break;
-case 38: {
+case 37: {
AST::UiPublicMember *node = makeAstNode<AST::UiPublicMember> (driver->nodePool(), sym(2).sval, sym(3).sval,
sym(5).Expression);
node->propertyToken = loc(1);
@@ -323,7 +359,7 @@ case 38: {
sym(1).Node = node;
} break;
-case 40: {
+case 39: {
AST::UiPublicMember *node = makeAstNode<AST::UiPublicMember> (driver->nodePool(), sym(3).sval, sym(4).sval,
sym(6).Expression);
node->isDefaultMember = true;
@@ -336,88 +372,88 @@ case 40: {
sym(1).Node = node;
} break;
-case 41: {
+case 40: {
sym(1).Node = makeAstNode<AST::UiSourceElement>(driver->nodePool(), sym(1).Node);
} break;
-case 42: {
+case 41: {
sym(1).Node = makeAstNode<AST::UiSourceElement>(driver->nodePool(), sym(1).Node);
} break;
-case 43:
-case 44:
+case 42:
+case 43:
{
AST::UiQualifiedId *node = makeAstNode<AST::UiQualifiedId> (driver->nodePool(), driver->intern(lexer->characterBuffer(), lexer->characterCount()));
node->identifierToken = loc(1);
sym(1).Node = node;
} break;
-case 46: {
+case 45: {
QString s = QLatin1String(JavaScriptGrammar::spell[T_PROPERTY]);
sym(1).sval = driver->intern(s.constData(), s.length());
break;
}
-case 47: {
+case 46: {
QString s = QLatin1String(JavaScriptGrammar::spell[T_SIGNAL]);
sym(1).sval = driver->intern(s.constData(), s.length());
break;
}
-case 48: {
+case 47: {
AST::UiQualifiedId *node = makeAstNode<AST::UiQualifiedId> (driver->nodePool(), sym(1).sval);
node->identifierToken = loc(1);
sym(1).Node = node;
} break;
-case 49: {
+case 48: {
AST::UiQualifiedId *node = makeAstNode<AST::UiQualifiedId> (driver->nodePool(), sym(1).UiQualifiedId, sym(3).sval);
node->identifierToken = loc(3);
sym(1).Node = node;
} break;
-case 50: {
+case 49: {
AST::ThisExpression *node = makeAstNode<AST::ThisExpression> (driver->nodePool());
node->thisToken = loc(1);
sym(1).Node = node;
} break;
-case 51: {
+case 50: {
AST::IdentifierExpression *node = makeAstNode<AST::IdentifierExpression> (driver->nodePool(), sym(1).sval);
node->identifierToken = loc(1);
sym(1).Node = node;
} break;
-case 52: {
+case 51: {
AST::NullExpression *node = makeAstNode<AST::NullExpression> (driver->nodePool());
node->nullToken = loc(1);
sym(1).Node = node;
} break;
-case 53: {
+case 52: {
AST::TrueLiteral *node = makeAstNode<AST::TrueLiteral> (driver->nodePool());
node->trueToken = loc(1);
sym(1).Node = node;
} break;
-case 54: {
+case 53: {
AST::FalseLiteral *node = makeAstNode<AST::FalseLiteral> (driver->nodePool());
node->falseToken = loc(1);
sym(1).Node = node;
} break;
-case 55: {
+case 54: {
AST::NumericLiteral *node = makeAstNode<AST::NumericLiteral> (driver->nodePool(), sym(1).dval);
node->literalToken = loc(1);
sym(1).Node = node;
} break;
-case 56: {
+case 55: {
AST::StringLiteral *node = makeAstNode<AST::StringLiteral> (driver->nodePool(), sym(1).sval);
node->literalToken = loc(1);
sym(1).Node = node;
} break;
-case 57: {
+case 56: {
bool rx = lexer->scanRegExp(Lexer::NoPrefix);
if (!rx) {
diagnostic_messages.append(DiagnosticMessage(DiagnosticMessage::Error, location(lexer), lexer->errorMessage()));
@@ -428,7 +464,7 @@ case 57: {
sym(1).Node = node;
} break;
-case 58: {
+case 57: {
bool rx = lexer->scanRegExp(Lexer::EqualPrefix);
if (!rx) {
diagnostic_messages.append(DiagnosticMessage(DiagnosticMessage::Error, location(lexer), lexer->errorMessage()));
@@ -439,21 +475,21 @@ case 58: {
sym(1).Node = node;
} break;
-case 59: {
+case 58: {
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 60: {
+case 59: {
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 61: {
+case 60: {
AST::ArrayLiteral *node = makeAstNode<AST::ArrayLiteral> (driver->nodePool(), sym(2).ElementList->finish (), sym(4).Elision);
node->lbracketToken = loc(1);
node->commaToken = loc(3);
@@ -461,7 +497,7 @@ case 61: {
sym(1).Node = node;
} break;
-case 62: {
+case 61: {
AST::ObjectLiteral *node = 0;
if (sym(2).Node)
node = makeAstNode<AST::ObjectLiteral> (driver->nodePool(),
@@ -473,7 +509,7 @@ case 62: {
sym(1).Node = node;
} break;
-case 63: {
+case 62: {
AST::ObjectLiteral *node = makeAstNode<AST::ObjectLiteral> (driver->nodePool(),
sym(2).PropertyNameAndValueList->finish ());
node->lbraceToken = loc(1);
@@ -481,51 +517,51 @@ case 63: {
sym(1).Node = node;
} break;
-case 64: {
+case 63: {
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 65: {
+case 64: {
sym(1).Node = makeAstNode<AST::ElementList> (driver->nodePool(), sym(1).Elision, sym(2).Expression);
} break;
-case 66: {
+case 65: {
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 67: {
+case 66: {
AST::Elision *node = makeAstNode<AST::Elision> (driver->nodePool());
node->commaToken = loc(1);
sym(1).Node = node;
} break;
-case 68: {
+case 67: {
AST::Elision *node = makeAstNode<AST::Elision> (driver->nodePool(), sym(1).Elision);
node->commaToken = loc(2);
sym(1).Node = node;
} break;
-case 69: {
+case 68: {
sym(1).Node = 0;
} break;
-case 70: {
+case 69: {
sym(1).Elision = sym(1).Elision->finish ();
} break;
-case 71: {
+case 70: {
AST::PropertyNameAndValueList *node = makeAstNode<AST::PropertyNameAndValueList> (driver->nodePool(),
sym(1).PropertyName, sym(3).Expression);
node->colonToken = loc(2);
sym(1).Node = node;
} break;
-case 72: {
+case 71: {
AST::PropertyNameAndValueList *node = makeAstNode<AST::PropertyNameAndValueList> (driver->nodePool(),
sym(1).PropertyNameAndValueList, sym(3).PropertyName, sym(5).Expression);
node->commaToken = loc(2);
@@ -533,36 +569,38 @@ case 72: {
sym(1).Node = node;
} break;
-case 73: {
+case 72: {
AST::IdentifierPropertyName *node = makeAstNode<AST::IdentifierPropertyName> (driver->nodePool(), sym(1).sval);
node->propertyNameToken = loc(1);
sym(1).Node = node;
} break;
-case 74:
-case 75: {
+case 73:
+case 74: {
AST::IdentifierPropertyName *node = makeAstNode<AST::IdentifierPropertyName> (driver->nodePool(), driver->intern(lexer->characterBuffer(), lexer->characterCount()));
node->propertyNameToken = loc(1);
sym(1).Node = node;
} break;
-case 76: {
+case 75: {
AST::StringLiteralPropertyName *node = makeAstNode<AST::StringLiteralPropertyName> (driver->nodePool(), sym(1).sval);
node->propertyNameToken = loc(1);
sym(1).Node = node;
} break;
-case 77: {
+case 76: {
AST::NumericLiteralPropertyName *node = makeAstNode<AST::NumericLiteralPropertyName> (driver->nodePool(), sym(1).dval);
node->propertyNameToken = loc(1);
sym(1).Node = node;
} break;
-case 78: {
+case 77: {
AST::IdentifierPropertyName *node = makeAstNode<AST::IdentifierPropertyName> (driver->nodePool(), sym(1).sval);
node->propertyNameToken = loc(1);
sym(1).Node = node;
} break;
+case 78:
+
case 79:
case 80:
@@ -622,27 +660,25 @@ case 106:
case 107:
case 108:
-
-case 109:
{
sym(1).sval = driver->intern(lexer->characterBuffer(), lexer->characterCount());
} break;
-case 114: {
+case 113: {
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 114: {
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 115: {
AST::NewMemberExpression *node = makeAstNode<AST::NewMemberExpression> (driver->nodePool(), sym(2).Expression, sym(4).ArgumentList);
node->newToken = loc(1);
node->lparenToken = loc(3);
@@ -650,384 +686,384 @@ case 116: {
sym(1).Node = node;
} break;
-case 118: {
+case 117: {
AST::NewExpression *node = makeAstNode<AST::NewExpression> (driver->nodePool(), sym(2).Expression);
node->newToken = loc(1);
sym(1).Node = node;
} break;
-case 119: {
+case 118: {
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 120: {
+case 119: {
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 121: {
+case 120: {
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 122: {
+case 121: {
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 123: {
+case 122: {
sym(1).Node = 0;
} break;
-case 124: {
+case 123: {
sym(1).Node = sym(1).ArgumentList->finish();
} break;
-case 125: {
+case 124: {
sym(1).Node = makeAstNode<AST::ArgumentList> (driver->nodePool(), sym(1).Expression);
} break;
-case 126: {
+case 125: {
AST::ArgumentList *node = makeAstNode<AST::ArgumentList> (driver->nodePool(), sym(1).ArgumentList, sym(3).Expression);
node->commaToken = loc(2);
sym(1).Node = node;
} break;
-case 130: {
+case 129: {
AST::PostIncrementExpression *node = makeAstNode<AST::PostIncrementExpression> (driver->nodePool(), sym(1).Expression);
node->incrementToken = loc(2);
sym(1).Node = node;
} break;
-case 131: {
+case 130: {
AST::PostDecrementExpression *node = makeAstNode<AST::PostDecrementExpression> (driver->nodePool(), sym(1).Expression);
node->decrementToken = loc(2);
sym(1).Node = node;
} break;
-case 133: {
+case 132: {
AST::DeleteExpression *node = makeAstNode<AST::DeleteExpression> (driver->nodePool(), sym(2).Expression);
node->deleteToken = loc(1);
sym(1).Node = node;
} break;
-case 134: {
+case 133: {
AST::VoidExpression *node = makeAstNode<AST::VoidExpression> (driver->nodePool(), sym(2).Expression);
node->voidToken = loc(1);
sym(1).Node = node;
} break;
-case 135: {
+case 134: {
AST::TypeOfExpression *node = makeAstNode<AST::TypeOfExpression> (driver->nodePool(), sym(2).Expression);
node->typeofToken = loc(1);
sym(1).Node = node;
} break;
-case 136: {
+case 135: {
AST::PreIncrementExpression *node = makeAstNode<AST::PreIncrementExpression> (driver->nodePool(), sym(2).Expression);
node->incrementToken = loc(1);
sym(1).Node = node;
} break;
-case 137: {
+case 136: {
AST::PreDecrementExpression *node = makeAstNode<AST::PreDecrementExpression> (driver->nodePool(), sym(2).Expression);
node->decrementToken = loc(1);
sym(1).Node = node;
} break;
-case 138: {
+case 137: {
AST::UnaryPlusExpression *node = makeAstNode<AST::UnaryPlusExpression> (driver->nodePool(), sym(2).Expression);
node->plusToken = loc(1);
sym(1).Node = node;
} break;
-case 139: {
+case 138: {
AST::UnaryMinusExpression *node = makeAstNode<AST::UnaryMinusExpression> (driver->nodePool(), sym(2).Expression);
node->minusToken = loc(1);
sym(1).Node = node;
} break;
-case 140: {
+case 139: {
AST::TildeExpression *node = makeAstNode<AST::TildeExpression> (driver->nodePool(), sym(2).Expression);
node->tildeToken = loc(1);
sym(1).Node = node;
} break;
-case 141: {
+case 140: {
AST::NotExpression *node = makeAstNode<AST::NotExpression> (driver->nodePool(), sym(2).Expression);
node->notToken = loc(1);
sym(1).Node = node;
} break;
-case 143: {
+case 142: {
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 144: {
+case 143: {
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 145: {
+case 144: {
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 147: {
+case 146: {
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 148: {
+case 147: {
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 150: {
+case 149: {
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 151: {
+case 150: {
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 152: {
+case 151: {
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 154: {
+case 153: {
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 154: {
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 155: {
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 156: {
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 157: {
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 159: {
+case 158: {
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 161: {
+case 160: {
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 162: {
+case 161: {
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 163: {
+case 162: {
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 164: {
+case 163: {
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 165: {
+case 164: {
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 167: {
+case 166: {
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 168: {
+case 167: {
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 169: {
+case 168: {
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 170: {
+case 169: {
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 172: {
+case 171: {
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 173: {
+case 172: {
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 174: {
+case 173: {
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 175: {
+case 174: {
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 177: {
+case 176: {
AST::BinaryExpression *node = makeAstNode<AST::BinaryExpression> (driver->nodePool(), sym(1).Expression,
QSOperator::BitAnd, sym(3).Expression);
node->operatorToken = loc(2);
sym(1).Node = node;
} break;
-case 179: {
+case 178: {
AST::BinaryExpression *node = makeAstNode<AST::BinaryExpression> (driver->nodePool(), sym(1).Expression,
QSOperator::BitAnd, sym(3).Expression);
node->operatorToken = loc(2);
sym(1).Node = node;
} break;
-case 181: {
+case 180: {
AST::BinaryExpression *node = makeAstNode<AST::BinaryExpression> (driver->nodePool(), sym(1).Expression,
QSOperator::BitXor, sym(3).Expression);
node->operatorToken = loc(2);
sym(1).Node = node;
} break;
-case 183: {
+case 182: {
AST::BinaryExpression *node = makeAstNode<AST::BinaryExpression> (driver->nodePool(), sym(1).Expression,
QSOperator::BitXor, sym(3).Expression);
node->operatorToken = loc(2);
sym(1).Node = node;
} break;
-case 185: {
+case 184: {
AST::BinaryExpression *node = makeAstNode<AST::BinaryExpression> (driver->nodePool(), sym(1).Expression,
QSOperator::BitOr, sym(3).Expression);
node->operatorToken = loc(2);
sym(1).Node = node;
} break;
-case 187: {
+case 186: {
AST::BinaryExpression *node = makeAstNode<AST::BinaryExpression> (driver->nodePool(), sym(1).Expression,
QSOperator::BitOr, sym(3).Expression);
node->operatorToken = loc(2);
sym(1).Node = node;
} break;
-case 189: {
+case 188: {
AST::BinaryExpression *node = makeAstNode<AST::BinaryExpression> (driver->nodePool(), sym(1).Expression,
QSOperator::And, sym(3).Expression);
node->operatorToken = loc(2);
sym(1).Node = node;
} break;
-case 191: {
+case 190: {
AST::BinaryExpression *node = makeAstNode<AST::BinaryExpression> (driver->nodePool(), sym(1).Expression,
QSOperator::And, sym(3).Expression);
node->operatorToken = loc(2);
sym(1).Node = node;
} break;
-case 193: {
+case 192: {
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 195: {
+case 194: {
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 197: {
+case 196: {
AST::ConditionalExpression *node = makeAstNode<AST::ConditionalExpression> (driver->nodePool(), sym(1).Expression,
sym(3).Expression, sym(5).Expression);
node->questionToken = loc(2);
@@ -1035,7 +1071,7 @@ case 197: {
sym(1).Node = node;
} break;
-case 199: {
+case 198: {
AST::ConditionalExpression *node = makeAstNode<AST::ConditionalExpression> (driver->nodePool(), sym(1).Expression,
sym(3).Expression, sym(5).Expression);
node->questionToken = loc(2);
@@ -1043,112 +1079,112 @@ case 199: {
sym(1).Node = node;
} break;
-case 201: {
+case 200: {
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 203: {
+case 202: {
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 204: {
+case 203: {
sym(1).ival = QSOperator::Assign;
} break;
-case 205: {
+case 204: {
sym(1).ival = QSOperator::InplaceMul;
} break;
-case 206: {
+case 205: {
sym(1).ival = QSOperator::InplaceDiv;
} break;
-case 207: {
+case 206: {
sym(1).ival = QSOperator::InplaceMod;
} break;
-case 208: {
+case 207: {
sym(1).ival = QSOperator::InplaceAdd;
} break;
-case 209: {
+case 208: {
sym(1).ival = QSOperator::InplaceSub;
} break;
-case 210: {
+case 209: {
sym(1).ival = QSOperator::InplaceLeftShift;
} break;
-case 211: {
+case 210: {
sym(1).ival = QSOperator::InplaceRightShift;
} break;
-case 212: {
+case 211: {
sym(1).ival = QSOperator::InplaceURightShift;
} break;
-case 213: {
+case 212: {
sym(1).ival = QSOperator::InplaceAnd;
} break;
-case 214: {
+case 213: {
sym(1).ival = QSOperator::InplaceXor;
} break;
-case 215: {
+case 214: {
sym(1).ival = QSOperator::InplaceOr;
} break;
-case 217: {
+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 218: {
+case 217: {
sym(1).Node = 0;
} break;
-case 221: {
+case 220: {
AST::Expression *node = makeAstNode<AST::Expression> (driver->nodePool(), sym(1).Expression, sym(3).Expression);
node->commaToken = loc(2);
sym(1).Node = node;
} break;
-case 222: {
+case 221: {
sym(1).Node = 0;
} break;
-case 239: {
+case 238: {
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 240: {
+case 239: {
sym(1).Node = makeAstNode<AST::StatementList> (driver->nodePool(), sym(1).Statement);
} break;
-case 241: {
+case 240: {
sym(1).Node = makeAstNode<AST::StatementList> (driver->nodePool(), sym(1).StatementList, sym(2).Statement);
} break;
-case 242: {
+case 241: {
sym(1).Node = 0;
} break;
-case 243: {
+case 242: {
sym(1).Node = sym(1).StatementList->finish ();
} break;
-case 245: {
+case 244: {
AST::VariableStatement *node = makeAstNode<AST::VariableStatement> (driver->nodePool(),
sym(2).VariableDeclarationList->finish (/*readOnly=*/sym(1).ival == T_CONST));
node->declarationKindToken = loc(1);
@@ -1156,76 +1192,76 @@ case 245: {
sym(1).Node = node;
} break;
-case 246: {
+case 245: {
sym(1).ival = T_CONST;
} break;
-case 247: {
+case 246: {
sym(1).ival = T_VAR;
} break;
-case 248: {
+case 247: {
sym(1).Node = makeAstNode<AST::VariableDeclarationList> (driver->nodePool(), sym(1).VariableDeclaration);
} break;
-case 249: {
+case 248: {
AST::VariableDeclarationList *node = makeAstNode<AST::VariableDeclarationList> (driver->nodePool(),
sym(1).VariableDeclarationList, sym(3).VariableDeclaration);
node->commaToken = loc(2);
sym(1).Node = node;
} break;
-case 250: {
+case 249: {
sym(1).Node = makeAstNode<AST::VariableDeclarationList> (driver->nodePool(), sym(1).VariableDeclaration);
} break;
-case 251: {
+case 250: {
sym(1).Node = makeAstNode<AST::VariableDeclarationList> (driver->nodePool(), sym(1).VariableDeclarationList, sym(3).VariableDeclaration);
} break;
-case 252: {
+case 251: {
AST::VariableDeclaration *node = makeAstNode<AST::VariableDeclaration> (driver->nodePool(), sym(1).sval, sym(2).Expression);
node->identifierToken = loc(1);
sym(1).Node = node;
} break;
-case 253: {
+case 252: {
AST::VariableDeclaration *node = makeAstNode<AST::VariableDeclaration> (driver->nodePool(), sym(1).sval, sym(2).Expression);
node->identifierToken = loc(1);
sym(1).Node = node;
} break;
-case 254: {
+case 253: {
// ### TODO: AST for initializer
sym(1) = sym(2);
} break;
-case 255: {
+case 254: {
sym(1).Node = 0;
} break;
-case 257: {
+case 256: {
// ### TODO: AST for initializer
sym(1) = sym(2);
} break;
-case 258: {
+case 257: {
sym(1).Node = 0;
} break;
-case 260: {
+case 259: {
AST::EmptyStatement *node = makeAstNode<AST::EmptyStatement> (driver->nodePool());
node->semicolonToken = loc(1);
sym(1).Node = node;
} break;
-case 262: {
+case 261: {
AST::ExpressionStatement *node = makeAstNode<AST::ExpressionStatement> (driver->nodePool(), sym(1).Expression);
node->semicolonToken = loc(2);
sym(1).Node = node;
} break;
-case 263: {
+case 262: {
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);
@@ -1234,7 +1270,7 @@ case 263: {
sym(1).Node = node;
} break;
-case 264: {
+case 263: {
AST::IfStatement *node = makeAstNode<AST::IfStatement> (driver->nodePool(), sym(3).Expression, sym(5).Statement);
node->ifToken = loc(1);
node->lparenToken = loc(2);
@@ -1242,7 +1278,7 @@ case 264: {
sym(1).Node = node;
} break;
-case 266: {
+case 265: {
AST::DoWhileStatement *node = makeAstNode<AST::DoWhileStatement> (driver->nodePool(), sym(2).Statement, sym(5).Expression);
node->doToken = loc(1);
node->whileToken = loc(3);
@@ -1252,7 +1288,7 @@ case 266: {
sym(1).Node = node;
} break;
-case 267: {
+case 266: {
AST::WhileStatement *node = makeAstNode<AST::WhileStatement> (driver->nodePool(), sym(3).Expression, sym(5).Statement);
node->whileToken = loc(1);
node->lparenToken = loc(2);
@@ -1260,7 +1296,7 @@ case 267: {
sym(1).Node = node;
} break;
-case 268: {
+case 267: {
AST::ForStatement *node = makeAstNode<AST::ForStatement> (driver->nodePool(), sym(3).Expression,
sym(5).Expression, sym(7).Expression, sym(9).Statement);
node->forToken = loc(1);
@@ -1271,7 +1307,7 @@ case 268: {
sym(1).Node = node;
} break;
-case 269: {
+case 268: {
AST::LocalForStatement *node = makeAstNode<AST::LocalForStatement> (driver->nodePool(),
sym(4).VariableDeclarationList->finish (/*readOnly=*/false), sym(6).Expression,
sym(8).Expression, sym(10).Statement);
@@ -1284,7 +1320,7 @@ case 269: {
sym(1).Node = node;
} break;
-case 270: {
+case 269: {
AST:: ForEachStatement *node = makeAstNode<AST::ForEachStatement> (driver->nodePool(), sym(3).Expression,
sym(5).Expression, sym(7).Statement);
node->forToken = loc(1);
@@ -1294,7 +1330,7 @@ case 270: {
sym(1).Node = node;
} break;
-case 271: {
+case 270: {
AST::LocalForEachStatement *node = makeAstNode<AST::LocalForEachStatement> (driver->nodePool(),
sym(4).VariableDeclaration, sym(6).Expression, sym(8).Statement);
node->forToken = loc(1);
@@ -1305,14 +1341,14 @@ case 271: {
sym(1).Node = node;
} break;
-case 273: {
+case 272: {
AST::ContinueStatement *node = makeAstNode<AST::ContinueStatement> (driver->nodePool());
node->continueToken = loc(1);
node->semicolonToken = loc(2);
sym(1).Node = node;
} break;
-case 275: {
+case 274: {
AST::ContinueStatement *node = makeAstNode<AST::ContinueStatement> (driver->nodePool(), sym(2).sval);
node->continueToken = loc(1);
node->identifierToken = loc(2);
@@ -1320,14 +1356,14 @@ case 275: {
sym(1).Node = node;
} break;
-case 277: {
+case 276: {
AST::BreakStatement *node = makeAstNode<AST::BreakStatement> (driver->nodePool());
node->breakToken = loc(1);
node->semicolonToken = loc(2);
sym(1).Node = node;
} break;
-case 279: {
+case 278: {
AST::BreakStatement *node = makeAstNode<AST::BreakStatement> (driver->nodePool(), sym(2).sval);
node->breakToken = loc(1);
node->identifierToken = loc(2);
@@ -1335,14 +1371,14 @@ case 279: {
sym(1).Node = node;
} break;
-case 281: {
+case 280: {
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 282: {
+case 281: {
AST::WithStatement *node = makeAstNode<AST::WithStatement> (driver->nodePool(), sym(3).Expression, sym(5).Statement);
node->withToken = loc(1);
node->lparenToken = loc(2);
@@ -1350,7 +1386,7 @@ case 282: {
sym(1).Node = node;
} break;
-case 283: {
+case 282: {
AST::SwitchStatement *node = makeAstNode<AST::SwitchStatement> (driver->nodePool(), sym(3).Expression, sym(5).CaseBlock);
node->switchToken = loc(1);
node->lparenToken = loc(2);
@@ -1358,90 +1394,90 @@ case 283: {
sym(1).Node = node;
} break;
-case 284: {
+case 283: {
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 285: {
+case 284: {
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 286: {
+case 285: {
sym(1).Node = makeAstNode<AST::CaseClauses> (driver->nodePool(), sym(1).CaseClause);
} break;
-case 287: {
+case 286: {
sym(1).Node = makeAstNode<AST::CaseClauses> (driver->nodePool(), sym(1).CaseClauses, sym(2).CaseClause);
} break;
-case 288: {
+case 287: {
sym(1).Node = 0;
} break;
-case 289: {
+case 288: {
sym(1).Node = sym(1).CaseClauses->finish ();
} break;
-case 290: {
+case 289: {
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 291: {
+case 290: {
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 292:
-case 293: {
+case 291:
+case 292: {
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 294: {
+case 293: {
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 296: {
+case 295: {
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 297: {
+case 296: {
AST::TryStatement *node = makeAstNode<AST::TryStatement> (driver->nodePool(), sym(2).Statement, sym(3).Catch);
node->tryToken = loc(1);
sym(1).Node = node;
} break;
-case 298: {
+case 297: {
AST::TryStatement *node = makeAstNode<AST::TryStatement> (driver->nodePool(), sym(2).Statement, sym(3).Finally);
node->tryToken = loc(1);
sym(1).Node = node;
} break;
-case 299: {
+case 298: {
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 300: {
+case 299: {
AST::Catch *node = makeAstNode<AST::Catch> (driver->nodePool(), sym(3).sval, sym(5).Block);
node->catchToken = loc(1);
node->lparenToken = loc(2);
@@ -1450,20 +1486,20 @@ case 300: {
sym(1).Node = node;
} break;
-case 301: {
+case 300: {
AST::Finally *node = makeAstNode<AST::Finally> (driver->nodePool(), sym(2).Block);
node->finallyToken = loc(1);
sym(1).Node = node;
} break;
-case 303: {
+case 302: {
AST::DebuggerStatement *node = makeAstNode<AST::DebuggerStatement> (driver->nodePool());
node->debuggerToken = loc(1);
node->semicolonToken = loc(2);
sym(1).Node = node;
} break;
-case 304: {
+case 303: {
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);
@@ -1474,7 +1510,7 @@ case 304: {
sym(1).Node = node;
} break;
-case 305: {
+case 304: {
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)
@@ -1486,56 +1522,56 @@ case 305: {
sym(1).Node = node;
} break;
-case 306: {
+case 305: {
AST::FormalParameterList *node = makeAstNode<AST::FormalParameterList> (driver->nodePool(), sym(1).sval);
node->identifierToken = loc(1);
sym(1).Node = node;
} break;
-case 307: {
+case 306: {
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 308: {
+case 307: {
sym(1).Node = 0;
} break;
-case 309: {
+case 308: {
sym(1).Node = sym(1).FormalParameterList->finish ();
} break;
-case 310: {
+case 309: {
sym(1).Node = 0;
} break;
-case 312: {
+case 311: {
sym(1).Node = makeAstNode<AST::FunctionBody> (driver->nodePool(), sym(1).SourceElements->finish ());
} break;
-case 313: {
+case 312: {
sym(1).Node = makeAstNode<AST::SourceElements> (driver->nodePool(), sym(1).SourceElement);
} break;
-case 314: {
+case 313: {
sym(1).Node = makeAstNode<AST::SourceElements> (driver->nodePool(), sym(1).SourceElements, sym(2).SourceElement);
} break;
-case 315: {
+case 314: {
sym(1).Node = makeAstNode<AST::StatementSourceElement> (driver->nodePool(), sym(1).Statement);
} break;
-case 316: {
+case 315: {
sym(1).Node = makeAstNode<AST::FunctionSourceElement> (driver->nodePool(), sym(1).FunctionDeclaration);
} break;
-case 317: {
+case 316: {
sym(1).sval = 0;
} break;
-case 319: {
+case 318: {
sym(1).Node = 0;
} break;
diff --git a/src/declarative/qml/parser/javascriptparser_p.h b/src/declarative/qml/parser/javascriptparser_p.h
index aa29ff3..4c5fef1 100644
--- a/src/declarative/qml/parser/javascriptparser_p.h
+++ b/src/declarative/qml/parser/javascriptparser_p.h
@@ -160,6 +160,8 @@ protected:
inline AST::SourceLocation &loc(int index)
{ return location_stack [tos + index - 1]; }
+ AST::UiQualifiedId *reparseAsQualifiedId(AST::ExpressionNode *expr);
+
protected:
Engine *driver;
int tos;
@@ -194,9 +196,9 @@ protected:
-#define J_SCRIPT_REGEXPLITERAL_RULE1 57
+#define J_SCRIPT_REGEXPLITERAL_RULE1 56
-#define J_SCRIPT_REGEXPLITERAL_RULE2 58
+#define J_SCRIPT_REGEXPLITERAL_RULE2 57
QT_END_NAMESPACE
diff --git a/src/declarative/qml/qmlmetatype.cpp b/src/declarative/qml/qmlmetatype.cpp
index 7825e5c..2e490a4 100644
--- a/src/declarative/qml/qmlmetatype.cpp
+++ b/src/declarative/qml/qmlmetatype.cpp
@@ -95,8 +95,8 @@ struct QmlMetaTypeData
QBitArray qmllists;
QBitArray lists;
};
-Q_GLOBAL_STATIC(QmlMetaTypeData, metaTypeData);
-Q_GLOBAL_STATIC(QReadWriteLock, metaTypeDataLock);
+Q_GLOBAL_STATIC(QmlMetaTypeData, metaTypeData)
+Q_GLOBAL_STATIC(QReadWriteLock, metaTypeDataLock)
class QmlTypePrivate
{
@@ -388,7 +388,8 @@ int QmlMetaType::registerInterface(const QmlPrivate::MetaTypeIds &id,
data->idToType.insert(type->typeId(), type);
data->idToType.insert(type->qListTypeId(), type);
data->idToType.insert(type->qmlListTypeId(), type);
- data->nameToType.insert(type->qmlTypeName(), type);
+ if (!type->qmlTypeName().isEmpty())
+ data->nameToType.insert(type->qmlTypeName(), type);
if (data->interfaces.size() < id.typeId)
data->interfaces.resize(id.typeId + 16);
@@ -864,6 +865,14 @@ QmlType *QmlMetaType::qmlType(const QByteArray &name)
return data->nameToType.value(name);
}
+QmlType *QmlMetaType::qmlType(const QMetaObject *metaObject)
+{
+ QReadLocker lock(metaTypeDataLock());
+ QmlMetaTypeData *data = metaTypeData();
+
+ return data->metaObjectToType.value(metaObject);
+}
+
QList<QByteArray> QmlMetaType::qmlTypeNames()
{
QReadLocker lock(metaTypeDataLock());
diff --git a/src/declarative/qml/qmlmetatype.h b/src/declarative/qml/qmlmetatype.h
index 7ab01a5..cc3887c 100644
--- a/src/declarative/qml/qmlmetatype.h
+++ b/src/declarative/qml/qmlmetatype.h
@@ -64,9 +64,11 @@ public:
static bool copy(int type, void *data, const void *copy = 0);
- static QmlType *qmlType(const QByteArray &);
static QList<QByteArray> qmlTypeNames();
+ static QmlType *qmlType(const QByteArray &);
+ static QmlType *qmlType(const QMetaObject *);
+
static QMetaProperty defaultProperty(const QMetaObject *);
static QMetaProperty defaultProperty(QObject *);
static QMetaMethod defaultMethod(const QMetaObject *);
@@ -108,7 +110,7 @@ public:
};
class QmlTypePrivate;
-class QmlType
+class Q_DECLARATIVE_EXPORT QmlType
{
public:
QByteArray typeName() const;
diff --git a/src/declarative/qml/qmlscriptparser.cpp b/src/declarative/qml/qmlscriptparser.cpp
index 9d6b018..ead7ee5 100644
--- a/src/declarative/qml/qmlscriptparser.cpp
+++ b/src/declarative/qml/qmlscriptparser.cpp
@@ -62,18 +62,16 @@ public:
void operator()(const QString &code, AST::Node *node);
protected:
- Object *defineObjectBinding(int line,
- AST::UiQualifiedId *propertyName,
- const QString &objectType,
- AST::SourceLocation typeLocation,
- LocationSpan location,
- AST::UiObjectInitializer *initializer = 0);
- Object *defineObjectBinding_helper(int line,
- AST::UiQualifiedId *propertyName,
- const QString &objectType,
- AST::SourceLocation typeLocation,
- LocationSpan location,
- AST::UiObjectInitializer *initializer = 0);
+ Object *defineObjectBinding(AST::UiQualifiedId *propertyName,
+ AST::UiQualifiedId *objectTypeName,
+ LocationSpan location,
+ AST::UiObjectInitializer *initializer = 0);
+
+ Object *defineObjectBinding_helper(AST::UiQualifiedId *propertyName,
+ const QString &objectType,
+ AST::SourceLocation typeLocation,
+ LocationSpan location,
+ AST::UiObjectInitializer *initializer = 0);
QmlParser::Variant getVariant(AST::ExpressionNode *expr);
@@ -199,8 +197,7 @@ QString ProcessAST::asString(AST::UiQualifiedId *node) const
}
Object *
-ProcessAST::defineObjectBinding_helper(int line,
- AST::UiQualifiedId *propertyName,
+ProcessAST::defineObjectBinding_helper(AST::UiQualifiedId *propertyName,
const QString &objectType,
AST::SourceLocation typeLocation,
LocationSpan location,
@@ -283,16 +280,17 @@ ProcessAST::defineObjectBinding_helper(int line,
}
}
-Object *ProcessAST::defineObjectBinding(int line,
- AST::UiQualifiedId *qualifiedId,
- const QString &objectType,
- AST::SourceLocation typeLocation,
- LocationSpan location,
- AST::UiObjectInitializer *initializer)
+Object *ProcessAST::defineObjectBinding(AST::UiQualifiedId *qualifiedId,
+ AST::UiQualifiedId *objectTypeName,
+ LocationSpan location,
+ AST::UiObjectInitializer *initializer)
{
+ const QString objectType = asString(objectTypeName);
+ const AST::SourceLocation typeLocation = objectTypeName->identifierToken;
+
if (objectType == QLatin1String("Connection")) {
- Object *obj = defineObjectBinding_helper(line, 0, objectType, typeLocation, location);
+ Object *obj = defineObjectBinding_helper(/*propertyName = */0, objectType, typeLocation, location);
_stateStack.pushObject(obj);
@@ -331,7 +329,7 @@ Object *ProcessAST::defineObjectBinding(int line,
return obj;
}
- return defineObjectBinding_helper(line, qualifiedId, objectType, typeLocation, location, initializer);
+ return defineObjectBinding_helper(qualifiedId, objectType, typeLocation, location, initializer);
}
LocationSpan ProcessAST::location(AST::UiQualifiedId *id)
@@ -446,16 +444,14 @@ bool ProcessAST::visit(AST::UiPublicMember *node)
}
-// UiObjectMember: T_IDENTIFIER UiObjectInitializer ;
+// UiObjectMember: UiQualifiedId UiObjectInitializer ;
bool ProcessAST::visit(AST::UiObjectDefinition *node)
{
LocationSpan l = location(node->firstSourceLocation(),
- node->lastSourceLocation());;
+ node->lastSourceLocation());
- defineObjectBinding(node->identifierToken.startLine,
- 0,
- node->name->asString(),
- node->identifierToken,
+ defineObjectBinding(/*propertyName = */ 0,
+ node->qualifiedTypeNameId,
l,
node->initializer);
@@ -463,16 +459,14 @@ bool ProcessAST::visit(AST::UiObjectDefinition *node)
}
-// UiObjectMember: UiQualifiedId T_COLON T_IDENTIFIER UiObjectInitializer ;
+// UiObjectMember: UiQualifiedId T_COLON UiQualifiedId UiObjectInitializer ;
bool ProcessAST::visit(AST::UiObjectBinding *node)
{
- LocationSpan l;
- l = location(node->identifierToken, node->initializer->rbraceToken);
+ LocationSpan l = location(node->qualifiedTypeNameId->identifierToken,
+ node->initializer->rbraceToken);
- defineObjectBinding(node->identifierToken.startLine,
- node->qualifiedId,
- node->name->asString(),
- node->identifierToken,
+ defineObjectBinding(node->qualifiedId,
+ node->qualifiedTypeNameId,
l,
node->initializer);
generated by cgit v0.12 at 2024-11-15 11:19:36 (GMT)