summaryrefslogtreecommitdiffstats
path: root/src/declarative/qml/parser
diff options
context:
space:
mode:
authorRoberto Raggi <roberto.raggi@nokia.com>2009-05-11 13:02:34 (GMT)
committerRoberto Raggi <roberto.raggi@nokia.com>2009-05-11 13:02:34 (GMT)
commit70cd26cfaf24455ceea6cb698a88be694728030c (patch)
treeaf0534ca642a2e1a91ca8e74b3d25468d47f7419 /src/declarative/qml/parser
parentec23f2eb4ff31e415e81c8fb09ff3022e9bc3c95 (diff)
downloadQt-70cd26cfaf24455ceea6cb698a88be694728030c.zip
Qt-70cd26cfaf24455ceea6cb698a88be694728030c.tar.gz
Qt-70cd26cfaf24455ceea6cb698a88be694728030c.tar.bz2
Automatic semicolon insertion for property and signal definitions.
Diffstat (limited to 'src/declarative/qml/parser')
-rw-r--r--src/declarative/qml/parser/javascript.g16
-rw-r--r--src/declarative/qml/parser/javascriptast_p.h11
-rw-r--r--src/declarative/qml/parser/javascriptgrammar.cpp1029
-rw-r--r--src/declarative/qml/parser/javascriptgrammar_p.h12
-rw-r--r--src/declarative/qml/parser/javascriptparser.cpp396
-rw-r--r--src/declarative/qml/parser/javascriptparser_p.h4
6 files changed, 728 insertions, 740 deletions
diff --git a/src/declarative/qml/parser/javascript.g b/src/declarative/qml/parser/javascript.g
index 474fbb3..48e8244 100644
--- a/src/declarative/qml/parser/javascript.g
+++ b/src/declarative/qml/parser/javascript.g
@@ -672,18 +672,21 @@ case $rule_number: {
} break;
./
-UiObjectMember: T_PROPERTY UiPropertyType T_IDENTIFIER ;
+UiObjectMember: T_PROPERTY UiPropertyType T_IDENTIFIER T_AUTOMATIC_SEMICOLON ;
+UiObjectMember: T_PROPERTY UiPropertyType T_IDENTIFIER T_SEMICOLON ;
/.
case $rule_number: {
AST::UiPublicMember *node = makeAstNode<AST::UiPublicMember> (driver->nodePool(), sym(2).sval, sym(3).sval);
node->propertyToken = loc(1);
node->typeToken = loc(2);
node->identifierToken = loc(3);
+ node->semicolonToken = loc(4);
sym(1).Node = node;
} break;
./
-UiObjectMember: T_DEFAULT T_PROPERTY UiPropertyType T_IDENTIFIER ;
+UiObjectMember: T_DEFAULT T_PROPERTY UiPropertyType T_IDENTIFIER T_AUTOMATIC_SEMICOLON ;
+UiObjectMember: T_DEFAULT T_PROPERTY UiPropertyType T_IDENTIFIER T_SEMICOLON ;
/.
case $rule_number: {
AST::UiPublicMember *node = makeAstNode<AST::UiPublicMember> (driver->nodePool(), sym(3).sval, sym(4).sval);
@@ -692,11 +695,13 @@ case $rule_number: {
node->propertyToken = loc(2);
node->typeToken = loc(3);
node->identifierToken = loc(4);
+ node->semicolonToken = loc(5);
sym(1).Node = node;
} break;
./
-UiObjectMember: T_PROPERTY UiPropertyType T_IDENTIFIER T_COLON Expression ;
+UiObjectMember: T_PROPERTY UiPropertyType T_IDENTIFIER T_COLON Expression T_AUTOMATIC_SEMICOLON ;
+UiObjectMember: T_PROPERTY UiPropertyType T_IDENTIFIER T_COLON Expression T_SEMICOLON ;
/.
case $rule_number: {
AST::UiPublicMember *node = makeAstNode<AST::UiPublicMember> (driver->nodePool(), sym(2).sval, sym(3).sval,
@@ -705,11 +710,13 @@ case $rule_number: {
node->typeToken = loc(2);
node->identifierToken = loc(3);
node->colonToken = loc(4);
+ node->semicolonToken = loc(6);
sym(1).Node = node;
} break;
./
-UiObjectMember: T_DEFAULT T_PROPERTY UiPropertyType T_IDENTIFIER T_COLON Expression ;
+UiObjectMember: T_DEFAULT T_PROPERTY UiPropertyType T_IDENTIFIER T_COLON Expression T_AUTOMATIC_SEMICOLON ;
+UiObjectMember: T_DEFAULT T_PROPERTY UiPropertyType T_IDENTIFIER T_COLON Expression T_SEMICOLON ;
/.
case $rule_number: {
AST::UiPublicMember *node = makeAstNode<AST::UiPublicMember> (driver->nodePool(), sym(3).sval, sym(4).sval,
@@ -720,6 +727,7 @@ case $rule_number: {
node->typeToken = loc(3);
node->identifierToken = loc(4);
node->colonToken = loc(5);
+ node->semicolonToken = loc(7);
sym(1).Node = node;
} break;
./
diff --git a/src/declarative/qml/parser/javascriptast_p.h b/src/declarative/qml/parser/javascriptast_p.h
index ad317e8..cd47e42 100644
--- a/src/declarative/qml/parser/javascriptast_p.h
+++ b/src/declarative/qml/parser/javascriptast_p.h
@@ -2345,15 +2345,7 @@ public:
virtual SourceLocation lastSourceLocation() const
{
- if (expression)
- return expression->lastSourceLocation();
- else if (colonToken.isValid())
- return colonToken;
- else if (identifierToken.isValid())
- return identifierToken;
- else if (typeToken.isValid())
- return typeToken;
- return propertyToken;
+ return semicolonToken;
}
virtual void accept0(Visitor *visitor);
@@ -2369,6 +2361,7 @@ public:
SourceLocation typeToken;
SourceLocation identifierToken;
SourceLocation colonToken;
+ SourceLocation semicolonToken;
};
class UiObjectDefinition: public UiObjectMember
diff --git a/src/declarative/qml/parser/javascriptgrammar.cpp b/src/declarative/qml/parser/javascriptgrammar.cpp
index 43422c6..abe3f1c 100644
--- a/src/declarative/qml/parser/javascriptgrammar.cpp
+++ b/src/declarative/qml/parser/javascriptgrammar.cpp
@@ -58,535 +58,525 @@ 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, 99, 99, 106, 106, 106, 99, 99, 99,
- 99, 99, 99, 99, 102, 102, 110, 110, 110, 102,
- 102, 111, 111, 111, 111, 111, 111, 111, 111, 111,
- 111, 111, 111, 111, 111, 111, 113, 113, 117, 117,
- 112, 112, 115, 115, 118, 118, 118, 118, 118, 118,
+ 99, 99, 99, 99, 99, 99, 99, 99, 102, 102,
+ 110, 110, 110, 102, 102, 111, 111, 111, 111, 111,
+ 111, 111, 111, 111, 111, 111, 111, 111, 111, 111,
+ 113, 113, 117, 117, 112, 112, 115, 115, 118, 118,
+ 118, 118, 118, 118, 119, 119, 119, 119, 119, 119,
119, 119, 119, 119, 119, 119, 119, 119, 119, 119,
119, 119, 119, 119, 119, 119, 119, 119, 119, 119,
- 119, 119, 119, 119, 119, 119, 119, 119, 119, 119,
- 119, 120, 120, 121, 121, 121, 121, 121, 124, 124,
- 125, 125, 125, 125, 123, 123, 126, 126, 127, 127,
- 128, 128, 128, 129, 129, 129, 129, 129, 129, 129,
- 129, 129, 129, 130, 130, 130, 130, 131, 131, 131,
- 132, 132, 132, 132, 133, 133, 133, 133, 133, 133,
- 133, 134, 134, 134, 134, 134, 134, 135, 135, 135,
- 135, 135, 136, 136, 136, 136, 136, 137, 137, 138,
- 138, 139, 139, 140, 140, 141, 141, 142, 142, 143,
- 143, 144, 144, 145, 145, 146, 146, 147, 147, 148,
- 148, 116, 116, 149, 149, 150, 150, 150, 150, 150,
- 150, 150, 150, 150, 150, 150, 150, 107, 107, 151,
- 151, 152, 152, 153, 153, 105, 105, 105, 105, 105,
+ 119, 119, 119, 119, 119, 120, 120, 121, 121, 121,
+ 121, 121, 124, 124, 125, 125, 125, 125, 123, 123,
+ 126, 126, 127, 127, 128, 128, 128, 129, 129, 129,
+ 129, 129, 129, 129, 129, 129, 129, 130, 130, 130,
+ 130, 131, 131, 131, 132, 132, 132, 132, 133, 133,
+ 133, 133, 133, 133, 133, 134, 134, 134, 134, 134,
+ 134, 135, 135, 135, 135, 135, 136, 136, 136, 136,
+ 136, 137, 137, 138, 138, 139, 139, 140, 140, 141,
+ 141, 142, 142, 143, 143, 144, 144, 145, 145, 146,
+ 146, 147, 147, 148, 148, 116, 116, 149, 149, 150,
+ 150, 150, 150, 150, 150, 150, 150, 150, 150, 150,
+ 150, 107, 107, 151, 151, 152, 152, 153, 153, 105,
105, 105, 105, 105, 105, 105, 105, 105, 105, 105,
- 154, 169, 169, 168, 168, 109, 109, 170, 170, 171,
- 171, 173, 173, 172, 174, 177, 175, 175, 178, 176,
- 176, 155, 156, 156, 157, 157, 158, 158, 158, 158,
- 158, 158, 158, 159, 159, 159, 159, 160, 160, 160,
- 160, 161, 161, 162, 164, 179, 179, 182, 182, 180,
- 180, 183, 181, 163, 163, 163, 165, 165, 166, 166,
- 166, 184, 185, 167, 167, 108, 122, 189, 189, 186,
- 186, 187, 187, 190, 191, 191, 192, 192, 188, 188,
- 114, 114, 193};
+ 105, 105, 105, 105, 154, 169, 169, 168, 168, 109,
+ 109, 170, 170, 171, 171, 173, 173, 172, 174, 177,
+ 175, 175, 178, 176, 176, 155, 156, 156, 157, 157,
+ 158, 158, 158, 158, 158, 158, 158, 159, 159, 159,
+ 159, 160, 160, 160, 160, 161, 161, 162, 164, 179,
+ 179, 182, 182, 180, 180, 183, 181, 163, 163, 163,
+ 165, 165, 166, 166, 166, 184, 185, 167, 167, 108,
+ 122, 189, 189, 186, 186, 187, 187, 190, 191, 191,
+ 192, 192, 188, 188, 114, 114, 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, 3, 3, 1, 1, 1, 2, 3, 4,
- 5, 6, 1, 1, 1, 1, 1, 1, 1, 1,
- 3, 1, 1, 1, 1, 1, 1, 1, 1, 1,
- 3, 3, 5, 3, 4, 3, 2, 4, 1, 2,
- 0, 1, 3, 5, 1, 1, 1, 1, 1, 1,
+ 2, 2, 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, 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,
+ 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, 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,
+ 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,
- 3, 1, 2, 0, 1, 3, 3, 1, 1, 1,
- 3, 1, 3, 2, 2, 2, 0, 1, 2, 0,
- 1, 1, 2, 2, 7, 5, 7, 7, 5, 9,
- 10, 7, 8, 2, 2, 3, 3, 2, 2, 3,
- 3, 3, 3, 5, 5, 3, 5, 1, 2, 0,
- 1, 4, 3, 3, 3, 3, 3, 3, 3, 3,
- 4, 5, 2, 2, 2, 8, 8, 1, 3, 0,
- 1, 0, 1, 1, 1, 2, 1, 1, 0, 1,
- 0, 1, 2};
+ 1, 1, 1, 1, 3, 1, 2, 0, 1, 3,
+ 3, 1, 1, 1, 3, 1, 3, 2, 2, 2,
+ 0, 1, 2, 0, 1, 1, 2, 2, 7, 5,
+ 7, 7, 5, 9, 10, 7, 8, 2, 2, 3,
+ 3, 2, 2, 3, 3, 3, 3, 5, 5, 3,
+ 5, 1, 2, 0, 1, 4, 3, 3, 3, 3,
+ 3, 3, 3, 3, 4, 5, 2, 2, 2, 8,
+ 8, 1, 3, 0, 1, 0, 1, 1, 1, 2,
+ 1, 1, 0, 1, 0, 1, 2};
const int JavaScriptGrammar::action_default [] = {
8, 2, 0, 4, 3, 0, 0, 0, 6, 7,
- 5, 0, 9, 1, 0, 17, 33, 40, 238, 0,
- 0, 37, 38, 14, 35, 36, 39, 239, 18, 10,
- 0, 0, 0, 34, 0, 27, 26, 25, 0, 30,
- 0, 141, 208, 172, 180, 176, 120, 192, 168, 32,
- 105, 43, 121, 184, 188, 109, 138, 119, 124, 104,
- 158, 145, 0, 49, 50, 46, 309, 37, 311, 61,
- 0, 0, 0, 0, 0, 44, 47, 0, 0, 38,
- 39, 48, 42, 0, 45, 0, 0, 134, 0, 0,
- 121, 140, 123, 122, 0, 0, 0, 136, 137, 135,
- 139, 0, 169, 0, 0, 0, 0, 159, 0, 0,
- 0, 0, 0, 0, 149, 0, 0, 0, 143, 144,
- 142, 147, 151, 150, 148, 146, 161, 160, 162, 0,
- 177, 0, 173, 0, 0, 115, 102, 114, 103, 71,
- 72, 73, 98, 74, 99, 75, 76, 77, 78, 79,
- 80, 81, 82, 83, 84, 85, 86, 87, 100, 88,
- 89, 90, 91, 92, 93, 94, 95, 96, 97, 101,
- 0, 0, 113, 209, 116, 0, 117, 0, 118, 112,
- 0, 205, 198, 196, 203, 204, 202, 201, 207, 200,
- 199, 197, 206, 193, 0, 181, 0, 0, 185, 0,
- 0, 189, 0, 0, 115, 107, 0, 106, 0, 111,
- 125, 0, 310, 300, 301, 0, 298, 0, 299, 0,
- 302, 216, 223, 222, 230, 218, 0, 219, 303, 0,
- 308, 220, 221, 226, 224, 305, 304, 307, 227, 0,
- 0, 0, 0, 0, 309, 37, 0, 311, 38, 210,
- 252, 39, 0, 0, 0, 0, 0, 228, 229, 217,
- 225, 253, 254, 297, 306, 0, 268, 269, 270, 271,
- 0, 264, 265, 266, 267, 294, 295, 0, 0, 0,
- 0, 0, 257, 258, 214, 212, 174, 182, 178, 194,
- 170, 215, 0, 121, 186, 190, 163, 152, 0, 0,
- 171, 0, 0, 0, 0, 164, 0, 0, 0, 0,
- 0, 156, 154, 157, 155, 153, 166, 165, 167, 0,
- 179, 0, 175, 0, 213, 121, 0, 195, 210, 211,
- 0, 210, 0, 0, 260, 0, 0, 0, 262, 0,
- 183, 0, 0, 187, 0, 0, 191, 250, 0, 242,
- 251, 245, 0, 249, 0, 210, 243, 0, 210, 0,
- 0, 261, 0, 0, 0, 263, 310, 300, 0, 0,
- 302, 0, 296, 0, 286, 0, 0, 0, 256, 0,
- 255, 0, 312, 0, 70, 232, 235, 0, 71, 238,
- 74, 99, 76, 77, 46, 81, 82, 37, 83, 86,
- 44, 47, 38, 210, 39, 48, 89, 42, 91, 45,
- 93, 94, 239, 96, 97, 101, 0, 63, 0, 0,
- 65, 69, 67, 55, 66, 68, 0, 64, 54, 233,
- 231, 109, 110, 115, 0, 108, 0, 285, 0, 272,
- 273, 0, 284, 0, 0, 0, 275, 280, 278, 281,
- 0, 0, 279, 280, 0, 276, 0, 277, 234, 283,
- 0, 234, 282, 0, 287, 288, 0, 234, 289, 290,
- 0, 0, 291, 0, 0, 0, 292, 293, 127, 126,
- 0, 0, 0, 259, 0, 0, 0, 274, 0, 62,
- 0, 59, 61, 52, 0, 58, 53, 60, 57, 51,
- 0, 56, 131, 129, 133, 130, 128, 132, 0, 0,
- 29, 0, 31, 28, 15, 11, 0, 0, 24, 37,
- 61, 20, 0, 23, 16, 0, 12, 0, 19, 13,
- 21, 22, 41, 247, 240, 0, 248, 244, 0, 246,
- 236, 0, 237, 241, 313};
+ 5, 0, 9, 1, 0, 17, 37, 44, 242, 0,
+ 0, 41, 42, 14, 39, 40, 43, 243, 18, 10,
+ 0, 0, 0, 38, 0, 27, 26, 25, 0, 0,
+ 31, 0, 32, 145, 212, 176, 184, 180, 124, 196,
+ 172, 0, 109, 47, 125, 188, 192, 113, 142, 123,
+ 128, 108, 162, 149, 0, 53, 54, 50, 313, 41,
+ 315, 65, 0, 0, 0, 0, 0, 48, 51, 0,
+ 0, 42, 43, 52, 46, 0, 49, 0, 0, 138,
+ 0, 0, 125, 144, 127, 126, 0, 0, 0, 140,
+ 141, 139, 143, 0, 173, 0, 0, 0, 0, 163,
+ 0, 0, 0, 0, 0, 0, 153, 0, 0, 0,
+ 147, 148, 146, 151, 155, 154, 152, 150, 165, 164,
+ 166, 0, 181, 0, 177, 0, 0, 119, 106, 118,
+ 107, 75, 76, 77, 102, 78, 103, 79, 80, 81,
+ 82, 83, 84, 85, 86, 87, 88, 89, 90, 91,
+ 104, 92, 93, 94, 95, 96, 97, 98, 99, 100,
+ 101, 105, 0, 0, 117, 213, 120, 0, 121, 0,
+ 122, 116, 35, 36, 0, 209, 202, 200, 207, 208,
+ 206, 205, 211, 204, 203, 201, 210, 197, 0, 185,
+ 0, 0, 189, 0, 0, 193, 0, 0, 119, 111,
+ 0, 110, 0, 115, 129, 0, 314, 304, 305, 0,
+ 302, 0, 303, 0, 306, 220, 227, 226, 234, 222,
+ 0, 223, 307, 0, 312, 224, 225, 230, 228, 309,
+ 308, 311, 231, 0, 0, 0, 0, 0, 313, 41,
+ 0, 315, 42, 214, 256, 43, 0, 0, 0, 0,
+ 0, 232, 233, 221, 229, 257, 258, 301, 310, 0,
+ 272, 273, 274, 275, 0, 268, 269, 270, 271, 298,
+ 299, 0, 0, 0, 0, 0, 261, 262, 218, 216,
+ 178, 186, 182, 198, 174, 219, 0, 125, 190, 194,
+ 167, 156, 0, 0, 175, 0, 0, 0, 0, 168,
+ 0, 0, 0, 0, 0, 160, 158, 161, 159, 157,
+ 170, 169, 171, 0, 183, 0, 179, 0, 217, 125,
+ 0, 199, 214, 215, 0, 214, 0, 0, 264, 0,
+ 0, 0, 266, 0, 187, 0, 0, 191, 0, 0,
+ 195, 254, 0, 246, 255, 249, 0, 253, 0, 214,
+ 247, 0, 214, 0, 0, 265, 0, 0, 0, 267,
+ 314, 304, 0, 0, 306, 0, 300, 0, 290, 0,
+ 0, 0, 260, 0, 259, 0, 316, 0, 74, 236,
+ 239, 0, 75, 242, 78, 103, 80, 81, 50, 85,
+ 86, 41, 87, 90, 48, 51, 42, 214, 43, 52,
+ 93, 46, 95, 49, 97, 98, 243, 100, 101, 105,
+ 0, 67, 0, 0, 69, 73, 71, 59, 70, 72,
+ 0, 68, 58, 237, 235, 113, 114, 119, 0, 112,
+ 0, 289, 0, 276, 277, 0, 288, 0, 0, 0,
+ 279, 284, 282, 285, 0, 0, 283, 284, 0, 280,
+ 0, 281, 238, 287, 0, 238, 286, 0, 291, 292,
+ 0, 238, 293, 294, 0, 0, 295, 0, 0, 0,
+ 296, 297, 131, 130, 0, 0, 0, 263, 0, 0,
+ 0, 278, 0, 66, 0, 63, 65, 56, 0, 62,
+ 57, 64, 61, 55, 0, 60, 135, 133, 137, 134,
+ 132, 136, 0, 0, 0, 29, 0, 30, 0, 33,
+ 34, 28, 15, 11, 0, 0, 24, 41, 65, 20,
+ 0, 23, 16, 0, 12, 0, 19, 13, 21, 22,
+ 45, 251, 244, 0, 252, 248, 0, 250, 240, 0,
+ 241, 245, 317};
const int JavaScriptGrammar::goto_default [] = {
- 6, 5, 13, 1, 4, 3, 28, 30, 29, 525,
- 15, 31, 522, 523, 385, 509, 226, 230, 259, 51,
- 59, 490, 488, 383, 382, 42, 489, 381, 384, 137,
- 55, 50, 175, 57, 46, 174, 52, 58, 87, 56,
- 41, 61, 60, 296, 48, 290, 43, 286, 45, 288,
- 44, 287, 53, 294, 54, 295, 47, 289, 285, 326,
- 438, 291, 292, 221, 225, 227, 231, 232, 223, 222,
- 234, 260, 233, 238, 257, 258, 224, 387, 386, 32,
- 535, 534, 348, 349, 537, 351, 536, 350, 446, 450,
- 453, 449, 448, 468, 469, 215, 229, 211, 214, 228,
- 236, 235, 0};
+ 6, 5, 13, 1, 4, 3, 28, 30, 29, 533,
+ 15, 31, 530, 531, 389, 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, 225, 229, 231, 235, 236, 227, 226,
+ 238, 264, 237, 242, 261, 262, 228, 391, 390, 32,
+ 543, 542, 352, 353, 545, 355, 544, 354, 450, 454,
+ 457, 453, 452, 472, 473, 219, 233, 215, 218, 232,
+ 240, 239, 0};
const int JavaScriptGrammar::action_index [] = {
- -10, -91, -42, -91, -1, 36, 71, 73, -91, -91,
- -91, -17, -91, -91, 393, -91, -91, -91, -91, 17,
- 208, 51, 197, -91, -91, -91, 30, -91, -91, -91,
- 476, 102, 194, -91, 159, -91, -91, -91, 68, 82,
- 723, 81, -91, 80, 60, 28, 175, -91, 327, 14,
- -91, -91, 474, 18, 74, 165, 153, -91, -91, -91,
- 353, 170, 723, -91, -91, -91, 158, -91, 1221, 5,
- 723, 723, 723, 643, 723, -91, -91, 723, 723, -91,
- -91, -91, -91, 723, -91, 723, 723, -91, 723, 723,
- 111, 143, -91, -91, 723, 723, 723, -91, -91, -91,
- 206, 723, 327, 723, 723, 723, 723, 373, 723, 723,
- 723, 723, 723, 723, 207, 723, 723, 723, 91, 117,
- 103, 254, 254, 254, 254, 254, 389, 343, 363, 723,
- 21, 723, 0, 1134, 723, 723, -91, -91, -91, -91,
+ -23, -91, 10, -91, -19, 50, 77, 56, -91, -91,
+ -91, 67, -91, -91, 383, -91, -91, -91, -91, -4,
+ 213, 20, 186, -91, -91, -91, -18, -91, -91, -91,
+ 370, 129, 203, -91, 204, -91, -91, -91, -17, 192,
+ -91, 693, -91, 87, -91, 42, 9, -20, 191, -91,
+ 310, 140, -91, -91, 534, 17, 114, 160, 125, -91,
+ -91, -91, 344, 162, 693, -91, -91, -91, 157, -91,
+ 1191, 34, 693, 693, 693, 613, 693, -91, -91, 693,
+ 693, -91, -91, -91, -91, 693, -91, 693, 693, -91,
+ 693, 693, 119, 227, -91, -91, 693, 693, 693, -91,
+ -91, -91, 193, 693, 310, 693, 693, 693, 693, 446,
+ 693, 693, 693, 693, 693, 693, 237, 693, 693, 693,
+ 88, 106, 107, 237, 237, 166, 237, 237, 354, 372,
+ 334, 693, -11, 693, 19, 1104, 693, 693, -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,
- 96, 723, -91, -91, 61, -2, -91, 723, -91, -91,
- 723, -91, -91, -91, -91, -91, -91, -91, -91, -91,
- -91, -91, -91, -91, 723, -14, 723, 723, 34, 33,
- 723, -91, 1134, 723, 723, -91, 133, -91, -57, -91,
- -91, -15, -91, 192, 49, 16, -91, 183, -91, 40,
- 1482, -91, -91, -91, -91, -91, 205, -91, -91, 20,
- -91, -91, -91, -91, -91, -91, 1482, -91, -91, 260,
- 302, 100, 1395, 52, 198, 67, 41, 1656, 53, 723,
- -91, 54, 27, 723, 29, 31, 32, -91, -91, -91,
- -91, -91, -91, -91, -91, 108, -91, -91, -91, -91,
- 89, -91, -91, -91, -91, -91, -91, 62, 59, 723,
- 125, 116, -91, -91, 1047, -91, 84, 43, -52, -91,
- 267, 48, -44, 564, 10, 113, 320, 254, 169, 723,
- 269, 723, 723, 723, 723, 293, 723, 723, 723, 723,
- 723, 166, 120, 146, 154, 254, 395, 324, 274, 723,
- -73, 723, 24, 723, -91, 430, 723, -91, 723, 42,
- -7, 723, -19, 1395, -91, 723, 122, 1395, -91, 723,
- -20, 723, 723, 25, 26, 723, -91, 22, 115, 7,
- -91, -91, 723, -91, 224, 723, -91, 55, 723, -28,
- 1395, -91, 723, 86, 1395, -91, 6, 233, -25, 4,
- 1482, -26, -91, 1395, -91, 723, 114, 1395, 15, 1395,
- -91, 23, 35, -6, -91, -91, 1395, -4, 272, 45,
- 275, 87, 723, 1395, 46, 12, 241, 37, 11, 643,
- 38, 39, -91, 807, -91, 1, -29, 2, 723, 3,
- -27, 723, -3, 723, -36, 19, 723, -91, 1308, -5,
- -91, -91, -91, -91, -91, -91, 723, -91, -91, -91,
- -91, 171, -91, 723, -41, -91, 1395, -91, 78, -91,
- -91, 1395, -91, 723, 112, -9, -91, 105, -91, 13,
- 101, 723, -91, 9, 8, -91, 47, -91, 1395, -91,
- 93, 1395, -91, 167, -91, -91, 107, 1395, 66, -91,
- 57, 70, -91, 173, 69, 72, -91, -91, -91, -91,
- 723, 106, 1395, -91, 723, 99, 1395, -91, 104, 56,
- 967, -91, 58, -91, 887, -91, -91, -91, -91, -91,
- 188, -91, -91, -91, -91, -91, -91, -91, 44, 50,
- 63, 723, 64, -91, -91, -91, 1569, 217, -91, 85,
- 90, -91, 75, -91, -91, 88, -91, -18, -91, -91,
- -91, -91, -91, 65, -91, 195, -91, -91, 723, -91,
- -91, 185, -91, -91, -91,
+ -91, -91, 98, 693, -91, -91, 0, -43, -91, 693,
+ -91, -91, -91, -91, 693, -91, -91, -91, -91, -91,
+ -91, -91, -91, -91, -91, -91, -91, -91, 693, 6,
+ 693, 693, -2, 82, 693, -91, 1104, 693, 693, -91,
+ 96, -91, 8, -91, -91, 61, -91, 147, 80, 33,
+ -91, 154, -91, 63, 1452, -91, -91, -91, -91, -91,
+ 169, -91, -91, 23, -91, -91, -91, -91, -91, -91,
+ 1452, -91, -91, 285, 287, 68, 1365, 55, 112, 79,
+ 46, 1626, 66, 693, -91, 65, 47, 693, 52, 58,
+ 59, -91, -91, -91, -91, -91, -91, -91, -91, 64,
+ -91, -91, -91, -91, 73, -91, -91, -91, -91, -91,
+ -91, -5, 45, 693, 137, 81, -91, -91, 1017, -91,
+ 69, 28, 14, -91, 240, 76, 53, 476, 171, 120,
+ 308, 237, 180, 693, 264, 693, 693, 693, 693, 298,
+ 693, 693, 693, 693, 693, 230, 237, 237, 237, 237,
+ 288, 268, 378, 693, -68, 693, 12, 693, -91, 445,
+ 693, -91, 693, 7, -47, 693, -44, 1365, -91, 693,
+ 100, 1365, -91, 693, -25, 693, 693, 22, 15, 693,
+ -91, -8, 108, -13, -91, -91, 693, -91, 178, 693,
+ -91, -60, 693, -58, 1365, -91, 693, 99, 1365, -91,
+ -33, 199, -53, -27, 1452, -26, -91, 1365, -91, 693,
+ 95, 1365, 32, 1365, -91, 43, 41, 4, -91, -91,
+ 1365, 5, 232, 54, 275, 70, 693, 1365, 49, 27,
+ 252, 48, 30, 613, 40, 39, -91, 777, -91, 25,
+ -1, 26, 693, 24, -3, 693, 21, 693, 1, 2,
+ 693, -91, 1278, 37, -91, -91, -91, -91, -91, -91,
+ 693, -91, -91, -91, -91, 156, -91, 693, -21, -91,
+ 1365, -91, 60, -91, -91, 1365, -91, 693, 102, 3,
+ -91, 29, -91, 35, 101, 693, -91, 36, 38, -91,
+ -30, -91, 1365, -91, 94, 1365, -91, 176, -91, -91,
+ 143, 1365, 44, -91, 16, -6, -91, 207, -9, -29,
+ -91, -91, -91, -91, 693, 90, 1365, -91, 693, 91,
+ 1365, -91, 111, 13, 857, -91, 18, -91, 937, -91,
+ -91, -91, -91, -91, 105, -91, -91, -91, -91, -91,
+ -91, -91, -33, -24, 215, -91, 693, -91, 187, -91,
+ -91, -91, -91, -91, 1539, 174, -91, 133, 104, -91,
+ 62, -91, -91, 97, -91, 51, -91, -91, -91, -91,
+ -91, 57, -91, 173, -91, -91, 693, -91, -91, 151,
+ -91, -91, -91,
- -103, -103, -103, -103, 34, 37, -103, -103, -103, -103,
- -103, -103, -103, -103, 202, -103, -103, -103, -103, -103,
- 39, -103, -103, -103, -103, -103, -103, -103, -103, -103,
- 319, -103, 4, -103, 33, -103, -103, -103, -103, -103,
- 44, -103, -103, -103, -103, -103, -103, -103, -103, -103,
- -103, -103, -58, -103, -103, -103, -103, -103, -103, -103,
- -103, -103, 157, -103, -103, -103, -2, -103, -103, -103,
- -3, 132, 136, 150, 137, -103, -103, 140, 15, -103,
- -103, -103, -103, 112, -103, 120, 125, -103, 123, 145,
- -103, -103, -103, -103, 116, 149, 163, -103, -103, -103,
- -103, 146, -103, 152, 155, 65, 82, -103, 86, 85,
- 108, 84, 58, 67, -103, 76, 74, 75, -103, -103,
- -103, -103, -103, -103, -103, -103, -103, -103, -103, 98,
- -103, 95, -103, 68, 36, 29, -103, -103, -103, -103,
+ -103, -103, -103, -103, 15, 16, -103, -103, -103, -103,
+ -103, -103, -103, -103, 208, -103, -103, -103, -103, -103,
+ -1, -103, -103, -103, -103, -103, -103, -103, -103, -103,
+ 237, -103, 26, -103, 31, -103, -103, -103, -103, -103,
+ -103, 28, -103, -103, -103, -103, -103, -103, -103, -103,
+ -103, -103, -103, -103, -46, -103, -103, -103, -103, -103,
+ -103, -103, -103, -103, 98, -103, -103, -103, 7, -103,
+ -103, -103, -10, 118, 111, 67, 112, -103, -103, 119,
+ 123, -103, -103, -103, -103, 124, -103, 115, 97, -103,
+ 32, 106, -103, -103, -103, -103, 128, 171, 101, -103,
+ -103, -103, -103, 156, -103, 157, 159, 81, 131, -103,
+ 127, 136, 145, 139, 102, 91, -103, 59, 50, 72,
+ -103, -103, -103, -103, -103, -103, -103, -103, -103, -103,
+ -103, 70, -103, 80, -103, 85, 61, 51, -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, 54, -103, -103, -103, -103, -103, -24,
+ -103, -103, -103, -103, -23, -103, -103, -103, -103, -103,
+ -103, -103, -103, -103, -103, -103, -103, -103, 134, -103,
+ 138, 17, -103, -103, 23, -103, 255, -4, 73, -103,
+ -103, -103, -103, -103, -103, -103, -103, 11, -103, -103,
+ -103, 8, -103, -103, 9, -103, -103, -103, -103, -103,
-103, -103, -103, -103, -103, -103, -103, -103, -103, -103,
+ 77, -103, -103, 10, 2, -103, 5, -103, -3, -103,
+ -103, -103, -103, 19, -103, -103, -103, 27, -31, -103,
-103, -103, -103, -103, -103, -103, -103, -103, -103, -103,
- -103, 1, -103, -103, -103, -103, -103, -9, -103, -103,
- -20, -103, -103, -103, -103, -103, -103, -103, -103, -103,
- -103, -103, -103, -103, 56, -103, 57, -17, -103, -103,
- 46, -103, 222, 40, 59, -103, -103, -103, -103, -103,
- -103, -103, -103, 51, -103, -103, -103, 38, -103, -103,
- 32, -103, -103, -103, -103, -103, -103, -103, -103, -103,
- -103, -103, -103, -103, -103, -103, 66, -103, -103, 19,
- 11, -103, 18, -103, 16, -103, -103, -103, -103, 63,
- -103, -103, -103, 60, -13, -103, -103, -103, -103, -103,
-103, -103, -103, -103, -103, -103, -103, -103, -103, -103,
- -103, -103, -103, -103, -103, -103, -103, -103, -103, -10,
- -103, -103, -103, -103, 119, -103, -103, -103, -103, -103,
- -103, -103, -103, -103, -103, -103, -103, -103, 14, 211,
- -103, 203, 189, 199, 195, -103, 87, 94, 96, 102,
- 106, -103, -103, -103, -103, -103, -103, -103, -103, 188,
- -103, 166, -103, 170, -103, -103, 176, -103, 79, -103,
- -103, 117, -103, 41, -103, 25, -103, 28, -103, 167,
- -103, 174, 168, -103, -103, 164, -103, -103, -103, -103,
- -103, -103, 207, -103, 70, 97, -103, -103, 69, -103,
- 35, -103, 31, -103, 26, -103, -103, 71, -103, -103,
- 83, -103, -103, 13, -103, 9, -103, 17, -103, 23,
- -103, -103, -103, -103, -103, -103, 45, -103, 54, -103,
- 55, -103, 81, 53, -103, -103, 50, -103, -103, 72,
- -103, -103, -103, 62, -103, -103, -103, -103, 49, -103,
- -19, 224, -103, 160, -103, -103, 43, -103, 48, -103,
- -103, -103, -103, -103, -103, -103, -23, -103, -103, -103,
- -103, -103, -103, 139, -103, -103, -5, -103, -103, -103,
- -103, 7, -103, -6, -103, -103, -103, -103, -103, -78,
- -103, -4, -103, -71, -103, -103, -103, -103, -77, -103,
- -103, -55, -103, -103, -103, -103, -103, -103, -83, -103,
- -103, -43, -103, 0, -103, -59, -103, -103, -103, -103,
- -1, -103, 90, -103, 8, -103, -7, -103, -103, -103,
- -22, -103, 42, -103, 47, -103, -103, -103, -103, -103,
+ -103, -103, -103, -5, -103, -103, -103, -103, 105, -103,
-103, -103, -103, -103, -103, -103, -103, -103, -103, -103,
- -103, 61, -103, -103, -103, -103, 52, 10, -103, 24,
- 30, -103, -103, -103, -103, -103, -103, 22, -103, -103,
- -103, -103, -103, -103, -103, -103, -103, -103, 20, -103,
- -103, 64, -103, -103, -103};
+ -103, -103, 34, 205, -103, 193, 169, 181, 201, -103,
+ 147, 66, 78, 79, 89, -103, -103, -103, -103, -103,
+ -103, -103, -103, 202, -103, 192, -103, 212, -103, -103,
+ 182, -103, 68, -103, -103, 62, -103, 56, -103, 33,
+ -103, 55, -103, 170, -103, 161, 162, -103, -103, 172,
+ -103, -103, -103, -103, -103, -103, 211, -103, 69, 71,
+ -103, -103, 64, -103, 60, -103, 41, -103, 42, -103,
+ -103, 74, -103, -103, 75, -103, -103, 38, -103, 35,
+ -103, 36, -103, 44, -103, -103, -103, -103, -103, -103,
+ 52, -103, 45, -103, 43, -103, 65, 46, -103, -103,
+ 40, -103, -103, 146, -103, -103, -103, 49, -103, -103,
+ -103, -103, 47, -103, -22, 149, -103, 153, -103, -103,
+ 30, -103, 48, -103, -103, -103, -103, -103, -103, -103,
+ 29, -103, -103, -103, -103, -103, -103, 133, -103, -103,
+ 53, -103, -103, -103, -103, 58, -103, 57, -103, -103,
+ -103, -103, -103, -56, -103, -6, -103, -82, -103, -103,
+ -103, -103, -77, -103, -103, -68, -103, -103, -103, -103,
+ -103, -103, -90, -103, -103, -58, -103, -11, -103, -60,
+ -103, -103, -103, -103, 21, -103, 25, -103, 22, -103,
+ 20, -103, -103, -103, 6, -103, 12, -103, 3, -103,
+ -103, -103, -103, -103, -103, -103, -103, -103, -103, -103,
+ -103, -103, -103, -103, -103, -103, 24, -103, -103, -103,
+ -103, -103, -103, -103, 1, -2, -103, 4, 104, -103,
+ -103, -103, -103, -103, -103, 18, -103, -103, -103, -103,
+ -103, -103, -103, -103, -103, -103, 0, -103, -103, 63,
+ -103, -103, -103};
const int JavaScriptGrammar::action_info [] = {
- 480, 101, 426, 209, -95, 321, 467, 443, -68, -90,
- -92, 11, 339, 491, 451, 458, 14, 328, 451, 435,
- 194, 213, 171, 7, 447, 299, 321, 339, 319, 372,
- 416, 379, 360, 345, 129, 369, 194, 370, 362, 352,
- 200, 333, 367, 418, -65, -87, -69, 375, 284, 428,
- 171, 430, -98, -79, 331, 484, 323, 217, 179, 513,
- 436, 441, 467, 443, 497, 11, 491, 480, 484, 177,
- 511, 544, 171, 220, 373, 263, 219, 375, 2, 510,
- 367, 101, 538, 34, 14, 299, 471, 2, 284, 40,
- 0, 319, 373, 473, 171, 279, 527, 39, 491, 131,
- 461, 171, 457, 467, 171, 467, 131, 171, 129, 516,
- 451, 454, 492, 470, 171, 0, 358, 517, 14, 11,
- 171, 88, 171, 354, 196, 0, 0, 471, 197, 475,
- 171, 88, 89, 171, 9, 8, 531, 530, 278, 440,
- 439, 171, 89, 88, 528, 115, 364, 116, 276, 275,
- 274, 273, 172, 92, 89, 94, 455, 88, 117, 486,
- 493, 276, 275, 341, 93, 94, 482, 342, 89, 269,
- 268, 115, 445, 116, 377, 171, 355, 283, 282, 115,
- 202, 116, 337, 0, 117, 281, 202, 67, 35, 207,
- 133, 115, 117, 116, 0, 115, 171, 116, 67, 203,
- 95, 204, 67, 541, 117, 203, 96, 433, 117, 134,
- 95, 135, 67, 171, 67, 0, 96, 0, 94, 0,
- 0, 67, 0, 67, 79, 80, 35, 67, 465, 464,
- 0, 0, 115, 37, 116, 79, 80, 67, 0, 79,
- 80, 0, 0, 0, 36, 117, 67, 0, 501, 79,
- 80, 79, 80, 67, 0, 0, 542, 540, 79, 80,
- 79, 80, 67, 95, 79, 80, 262, 261, 0, 96,
- 67, 37, 0, 0, 79, 80, 0, -309, 0, 115,
- 0, 116, 36, 79, 80, 301, 302, 301, 302, 67,
- 79, 80, 117, 0, 0, 0, 0, 306, 307, 79,
- 80, 67, 0, 0, 67, 0, 308, 79, 80, 309,
- 0, 310, 303, 304, 303, 304, 306, 307, 0, 0,
- 0, 267, 266, 0, 0, 308, 79, 80, 309, 0,
- 310, 67, 0, 267, 266, 0, 272, 271, 79, 80,
- 0, 79, 80, 306, 307, 103, 104, 306, 307, 0,
- 0, 0, 308, 0, 0, 309, 308, 310, 0, 309,
- 0, 310, 0, 272, 271, 0, 108, 109, 79, 80,
- 0, 0, 105, 106, 110, 111, 108, 109, 112, 0,
- 113, 0, 0, 0, 110, 111, 108, 109, 112, 0,
- 113, 0, 0, 0, 110, 111, 108, 109, 112, 0,
- 113, 0, 0, 19, 110, 111, 0, 0, 112, 0,
- 113, 0, 108, 109, 0, 20, 0, 0, 306, 307,
- 110, 111, 21, 0, 112, 0, 113, 308, 0, 0,
- 309, 0, 310, 181, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 182, 0, 0, 0, 183, 23, 0,
- 0, 0, 25, 0, 0, 0, 184, 0, 185, 22,
- 26, 0, 0, 0, 0, 0, 0, 27, 0, 186,
- 0, 187, 92, 0, 0, 0, 18, 181, 24, 188,
- 0, 0, 189, 93, 0, 0, 19, 182, 190, 0,
- 0, 183, 0, 0, 191, 0, 0, 0, 20, 0,
- 184, 0, 185, 0, 0, 21, 0, 0, 0, 192,
- 0, 0, 0, 186, 0, 187, 92, 0, 0, 0,
- 0, 0, 0, 188, 0, 0, 189, 93, 0, 0,
- 0, 514, 190, 0, 0, 25, 0, 0, 191, 0,
- 0, 0, 22, 26, 0, 0, 0, 0, 0, 0,
- 27, 0, 0, 192, 0, 0, 0, 0, 0, 18,
- 0, 24, 0, 0, 0, 0, 0, 181, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 182, 0, 0,
- 0, 183, 0, 0, 0, 0, 0, 0, 0, 0,
- 184, 0, 185, 0, 0, 335, 0, 0, 0, 0,
- 0, 0, 0, 186, 0, 187, 92, 0, 0, 0,
- 0, 0, 0, 188, 0, 0, 189, 93, 0, 0,
- 0, 0, 190, 0, 0, 0, 0, 0, 191, 0,
+ 198, 362, 364, 371, 471, 514, 374, 373, 179, 356,
+ 325, 521, 39, 303, 335, 173, 337, 181, 366, 198,
+ 103, 501, 349, 323, 343, 461, 495, 471, -99, 376,
+ 471, -96, -72, -94, 455, 447, 451, 484, 488, 439,
+ 455, 455, 495, 103, 430, 462, -73, -91, 383, 422,
+ 420, 479, 477, 14, 131, -69, -83, 131, 133, 432,
+ 434, -102, 34, 288, 475, 2, 379, 133, 213, 2,
+ 303, 282, 445, 440, 546, 7, 323, 552, 267, 11,
+ 11, 283, 379, 447, 327, 471, 377, 0, 221, 204,
+ 0, 288, 325, 223, 484, 488, 224, 217, 173, 173,
+ 14, 465, 173, 173, 173, 535, 173, 173, 173, 0,
+ 173, 458, 495, 173, 332, 0, 358, 9, 8, 496,
+ 0, 444, 443, 539, 538, 273, 272, 90, 90, 280,
+ 279, 280, 279, 11, 278, 277, 524, 96, 91, 91,
+ 377, 69, 287, 286, 525, 173, 90, 90, 173, 474,
+ 486, 490, 211, 536, 174, 381, 459, 91, 91, 368,
+ 341, 94, 449, 475, 200, 505, 14, 497, 201, 359,
+ 345, 206, 95, 343, 346, 206, 69, 173, 81, 82,
+ 69, 549, 97, 69, 173, 0, 69, 117, 98, 118,
+ 207, 117, 437, 118, 207, 173, 208, 285, 0, 41,
+ 119, 183, 182, 69, 119, 96, 135, 69, 0, 69,
+ 0, 0, 0, 81, 82, 35, 0, 81, 82, 0,
+ 81, 82, 516, 81, 82, 136, 0, 137, 69, 0,
+ 266, 265, 69, 35, 550, 548, 69, 469, 468, 96,
+ 81, 82, 69, 0, 81, 82, 81, 82, 520, 519,
+ 97, 0, 0, 42, 40, 117, 98, 118, 305, 306,
+ 37, 69, 117, 0, 118, 81, 82, 0, 119, 81,
+ 82, 36, 0, 81, 82, 119, 517, 515, 37, 81,
+ 82, 69, 305, 306, 97, 307, 308, 0, -313, 36,
+ 98, 310, 311, 271, 270, 0, 0, 0, 81, 82,
+ 312, 0, 0, 313, 69, 314, 0, 0, 0, 307,
+ 308, 310, 311, 0, 69, 0, 69, 0, 81, 82,
+ 312, 310, 311, 313, 0, 314, 0, 0, 105, 106,
+ 312, 310, 311, 313, 0, 314, 276, 275, 0, 0,
+ 312, 81, 82, 313, 0, 314, 271, 270, 276, 275,
+ 0, 81, 82, 81, 82, 107, 108, 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, 0, 110, 111, 0, 0, 21,
+ 0, 310, 311, 112, 113, 20, 0, 114, 0, 115,
+ 312, 0, 21, 313, 0, 314, 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, 185, 22,
+ 26, 0, 0, 18, 0, 24, 0, 27, 186, 0,
+ 0, 0, 187, 0, 0, 0, 18, 0, 24, 110,
+ 111, 188, 0, 189, 0, 0, 0, 112, 113, 185,
+ 0, 114, 0, 115, 190, 0, 191, 94, 0, 186,
+ 0, 0, 0, 187, 192, 0, 0, 193, 95, 0,
+ 0, 0, 188, 194, 189, 0, 0, 339, 0, 195,
+ 0, 0, 0, 0, 0, 190, 0, 191, 94, 0,
+ 0, 0, 0, 0, 196, 192, 0, 0, 193, 95,
+ 0, 0, 0, 0, 194, 0, 0, 185, 0, 0,
+ 195, 0, 0, 0, 0, 0, 0, 186, 0, 0,
+ 0, 187, 0, 0, 0, 196, 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, 192, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 63, 64, 0, 0, 0,
- 0, 0, 0, 0, 0, 66, 0, 0, 0, 0,
- 0, 0, 67, 0, 0, 0, 68, 69, 0, 70,
- 0, 0, 0, 0, 0, 0, 73, 0, 0, 0,
- 76, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 81, 79,
- 80, 0, 82, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 75, 84, 65, 0, 0, 0, 0,
- 0, 0, 0, 0, 62, 63, 64, 0, 0, 0,
- 0, 0, 0, 0, 0, 66, 0, 0, 0, 0,
- 0, 0, 67, 0, 0, 0, 68, 69, 0, 70,
- 0, 0, 0, 71, 0, 72, 73, 74, 0, 0,
- 76, 0, 0, 0, 77, 0, 78, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 81, 79,
- 80, 0, 82, 0, 83, 0, 85, 0, 86, 0,
- 0, 0, 0, 75, 84, 65, 0, 0, 0, 0,
- 0, 0, 0, 0, -88, 0, 0, 0, 62, 63,
- 64, 0, 0, 0, 0, 0, 0, 0, 0, 66,
- 0, 0, 0, 0, 0, 0, 67, 0, 0, 0,
- 68, 69, 0, 70, 0, 0, 0, 71, 0, 72,
- 73, 74, 0, 0, 76, 0, 0, 0, 77, 0,
- 78, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 81, 79, 80, 0, 82, 0, 83, 0,
- 85, 0, 86, 0, 0, 0, 0, 75, 84, 65,
- 0, 0, 0, 0, 0, 0, 0, 0, 62, 63,
- 64, 0, 0, 0, 0, 0, 0, 0, 0, 66,
- 0, 0, 0, 0, 0, 0, 67, 0, 0, 0,
- 68, 69, 0, 70, 0, 0, 0, 71, 0, 72,
- 73, 74, 0, 0, 76, 0, 0, 0, 77, 0,
- 78, 0, 0, 496, 0, 0, 0, 0, 0, 0,
- 0, 0, 81, 79, 80, 0, 82, 0, 83, 0,
- 85, 0, 86, 0, 0, 0, 0, 75, 84, 65,
- 0, 0, 0, 0, 0, 0, 0, 0, 62, 63,
- 64, 0, 0, 0, 0, 0, 0, 0, 0, 66,
- 0, 0, 0, 0, 0, 0, 67, 0, 0, 0,
- 68, 69, 0, 70, 0, 0, 0, 71, 0, 72,
- 73, 74, 0, 0, 76, 0, 0, 0, 77, 0,
- 78, 0, 0, 499, 0, 0, 0, 0, 0, 0,
- 0, 0, 81, 79, 80, 0, 82, 0, 83, 0,
- 85, 0, 86, 0, 0, 0, 0, 75, 84, 65,
- 0, 0, 0, 0, 0, 0, 0, 0, 62, 63,
- 64, 0, 0, 0, 0, 0, 0, 0, 0, 66,
- 0, 0, 0, 0, 0, 0, 67, 0, 0, 0,
- 68, 69, 0, 70, 0, 0, 0, 71, 0, 72,
- 73, 74, 0, 0, 76, 0, 0, 0, 77, 0,
+ 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, 81, 79, 80, 0, 82, 0, 83, 0,
- 85, 298, 86, 0, 0, 0, 0, 75, 84, 65,
- 0, 0, 0, 0, 0, 0, 0, 0, 139, 140,
- 141, 0, 0, 143, 145, 146, 0, 0, 147, 0,
- 148, 0, 0, 0, 150, 151, 152, 0, 0, 0,
- 0, 0, 0, 67, 153, 154, 155, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 156, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 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, -92, 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, 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, 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, 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, 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, 159, 0, 0, 0, 0, 0, 0,
- 79, 80, 160, 161, 162, 0, 164, 165, 166, 167,
- 168, 169, 0, 0, 157, 163, 149, 142, 144, 158,
- 0, 0, 0, 0, 0, 139, 140, 141, 0, 0,
- 143, 145, 146, 0, 0, 147, 0, 148, 0, 0,
- 0, 150, 151, 152, 0, 0, 0, 0, 0, 0,
- 420, 153, 154, 155, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 156, 0, 0, 0, 421, 0,
+ 0, 0, 0, 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,
- 159, 0, 0, 0, 0, 0, 425, 422, 424, 160,
- 161, 162, 0, 164, 165, 166, 167, 168, 169, 0,
- 0, 157, 163, 149, 142, 144, 158, 0, 0, 0,
- 0, 0, 139, 140, 141, 0, 0, 143, 145, 146,
- 0, 0, 147, 0, 148, 0, 0, 0, 150, 151,
- 152, 0, 0, 0, 0, 0, 0, 420, 153, 154,
- 155, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 156, 0, 0, 0, 421, 0, 0, 0, 0,
- 0, 0, 0, 423, 0, 0, 0, 159, 0, 0,
- 0, 0, 0, 425, 422, 424, 160, 161, 162, 0,
- 164, 165, 166, 167, 168, 169, 0, 0, 157, 163,
- 149, 142, 144, 158, 0, 0, 0, 0, 0, 239,
- 0, 0, 0, 0, 240, 0, 62, 63, 64, 242,
- 0, 0, 0, 0, 0, 0, 243, 66, 0, 0,
- 0, 0, 0, 0, 245, 246, 0, 0, 247, 69,
- 0, 70, 0, 0, 0, 71, 0, 72, 73, 74,
- 0, 0, 76, 0, 0, 0, 77, 0, 78, 0,
- 0, 0, 0, 0, 249, 0, 250, 0, 0, 0,
- 81, 248, 251, 252, 82, 253, 83, 254, 85, 27,
- 86, 255, 256, 0, 0, 75, 84, 65, 18, 241,
- 0, 0, 0, 0, 0, 0, 239, 0, 0, 0,
- 0, 240, 0, 62, 63, 64, 242, 0, 0, 0,
- 0, 0, 0, 243, 244, 0, 0, 0, 0, 0,
- 0, 245, 246, 0, 0, 247, 69, 0, 70, 0,
- 0, 0, 71, 0, 72, 73, 74, 0, 0, 76,
- 0, 0, 0, 77, 0, 78, 0, 0, 0, 0,
- 0, 249, 0, 250, 0, 0, 0, 81, 248, 251,
- 252, 82, 253, 83, 254, 85, 27, 86, 255, 256,
- 0, 0, 75, 84, 65, 18, 241, 0, 0, 0,
- 0, 0, 0, 239, 0, 0, 0, 0, 240, 0,
- 62, 63, 64, 242, 0, 0, 0, 0, 0, 0,
- 243, 66, 0, 0, 0, 0, 0, 0, 519, 246,
- 0, 0, 247, 520, 0, 70, 0, 0, 0, 71,
- 0, 72, 73, 74, 0, 0, 76, 0, 0, 0,
- 77, 0, 78, 0, 0, 0, 0, 0, 249, 0,
- 250, 0, 0, 0, 81, 248, 251, 252, 82, 253,
- 83, 254, 85, 27, 86, 255, 256, 0, 0, 75,
- 84, 65, 18, 241, 0, 521, 0, 0, 0, 0,
- 388, 140, 141, 0, 0, 390, 145, 392, 63, 64,
- 393, 0, 148, 0, 0, 0, 150, 395, 396, 0,
- 0, 0, 0, 0, 0, 397, 398, 154, 155, 247,
- 69, 0, 70, 0, 0, 0, 71, 0, 72, 399,
- 74, 0, 0, 401, 0, 0, 0, 77, 0, 78,
- 0, -234, 0, 0, 0, 403, 0, 250, 0, 0,
- 0, 405, 402, 404, 406, 407, 408, 83, 410, 411,
- 412, 413, 414, 415, 0, 0, 400, 409, 394, 389,
- 391, 158, 0, 0, 0, 0, 0,
+ 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, 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, 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, 527, 250,
+ 0, 0, 251, 528, 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, 529, 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, -238, 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,
- 459, 180, 427, 498, 476, 193, 280, 487, 199, 437,
- 444, 472, 460, 500, 452, 481, 178, 212, 456, 474,
- 477, 442, 462, 533, 485, 376, 173, 374, 529, 532,
- 270, 378, 277, 347, 524, 366, 526, 380, 265, 10,
- 365, 336, 338, 12, 466, 539, 237, 363, 38, 361,
- 466, 90, 170, 506, 176, 334, 206, 218, 508, 429,
- 49, 0, 0, 494, 0, 463, 518, 277, 417, 212,
- 216, 201, 495, 265, 270, 419, 463, 512, 329, 329,
- 237, 0, 0, 533, 176, 329, 0, 136, 0, 347,
- 216, 208, 90, 90, 90, 329, 138, 237, 0, 124,
- 0, 90, 431, 90, 483, 432, 195, 127, 125, 198,
- 90, 90, 90, 329, 119, 120, 118, 90, 90, 210,
- 90, 90, 90, 90, 128, 123, 121, 114, 311, 359,
- 90, 90, 90, 329, 90, 312, 0, 313, 90, 330,
- 0, 132, 90, 314, 90, 543, 130, 315, 90, 122,
- 507, 0, 90, 356, 97, 293, 90, 357, 478, 90,
- 297, 90, 91, 479, 176, 0, 368, 264, 90, 0,
- 502, 434, 90, 90, 503, 504, 90, 332, 505, 371,
- 431, 90, 90, 432, 100, 90, 0, 98, 90, 0,
- 102, 90, 0, 90, 107, 210, 90, 126, 479, 90,
- 325, 99, 90, 90, 325, 297, 325, 297, 297, 297,
- 90, 297, 325, 322, 0, 297, 0, 297, 340, 16,
- 33, 17, 346, 0, 90, 90, 344, 343, 324, 297,
- 297, 90, 316, 0, 327, 90, 297, 320, 318, 90,
- 297, 136, 317, 325, 297, 0, 305, 90, 297, 0,
- 138, 205, 297, 0, 0, 0, 300, 0, 0, 0,
- 90, 0, 478, 0, 0, 353, 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,
+ 463, 180, 197, 480, 476, 481, 504, 460, 478, 466,
+ 464, 284, 210, 184, 532, 526, 370, 540, 512, 281,
+ 10, 274, 12, 241, 537, 547, 216, 222, 499, 269,
+ 220, 502, 470, 498, 491, 333, 456, 485, 489, 487,
+ 518, 470, 203, 467, 51, 541, 38, 0, 205, 340,
+ 382, 380, 378, 351, 431, 421, 369, 367, 384, 216,
+ 281, 0, 274, 467, 269, 333, 433, 441, 92, 342,
+ 338, 93, 446, 448, 365, 423, 178, 172, 333, 175,
+ 333, 0, 541, 0, 333, 0, 92, 333, 351, 241,
+ 121, 241, 0, 220, 0, 92, 0, 435, 178, 120,
+ 436, 92, 92, 214, 138, 212, 92, 316, 92, 0,
+ 534, 0, 122, 140, 92, 92, 92, 92, 132, 317,
+ 318, 0, 336, 129, 363, 92, 134, 92, 334, 0,
+ 319, 361, 127, 92, 92, 483, 214, 92, 92, 101,
+ 0, 297, 92, 126, 551, 102, 301, 92, 92, 507,
+ 508, 92, 360, 482, 92, 92, 506, 509, 178, 92,
+ 92, 510, 511, 92, 92, 438, 99, 92, 116, 372,
+ 92, 375, 92, 130, 92, 92, 435, 123, 268, 436,
+ 125, 92, 0, 92, 199, 92, 124, 482, 315, 92,
+ 202, 483, 92, 92, 0, 92, 0, 92, 329, 109,
+ 104, 128, 301, 301, 0, 92, 92, 92, 329, 100,
+ 301, 301, 320, 301, 347, 0, 0, 92, 329, 0,
+ 348, 344, 301, 301, 321, 16, 33, 17, 92, 92,
+ 350, 0, 0, 301, 301, 0, 309, 92, 92, 326,
+ 331, 92, 301, 301, 322, 523, 301, 329, 329, 0,
+ 304, 324, 301, 301, 16, 33, 17, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 357,
+ 328, 0, 0, 0, 138, 0, 0, 0, 0, 0,
+ 0, 0, 0, 140, 209, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 515, 0, 0,
- 0, 0, 0, 0, 0, 0, 16, 33, 17, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0};
+ 0, 0, 0, 0, 0, 0, 0, 0};
const int JavaScriptGrammar::action_check [] = {
- 36, 1, 7, 60, 7, 78, 33, 36, 7, 7,
- 7, 29, 2, 8, 5, 7, 33, 61, 5, 60,
- 2, 36, 8, 65, 33, 1, 78, 2, 48, 55,
- 7, 16, 60, 7, 48, 60, 2, 33, 31, 17,
- 7, 60, 36, 8, 7, 7, 7, 36, 36, 55,
- 8, 55, 7, 7, 61, 36, 8, 8, 60, 29,
- 7, 7, 33, 36, 8, 29, 8, 36, 36, 8,
- 7, 0, 8, 33, 7, 55, 60, 36, 88, 29,
- 36, 1, 17, 66, 33, 1, 20, 88, 36, 7,
- -1, 48, 7, 36, 8, 36, 8, 29, 8, 78,
- 7, 8, 55, 33, 8, 33, 78, 8, 48, 7,
- 5, 10, 8, 6, 8, -1, 61, 15, 33, 29,
- 8, 40, 8, 8, 50, -1, -1, 20, 54, 60,
- 8, 40, 51, 8, 61, 62, 61, 62, 76, 61,
- 62, 8, 51, 40, 56, 25, 60, 27, 61, 62,
- 61, 62, 56, 42, 51, 12, 55, 40, 38, 60,
- 56, 61, 62, 50, 53, 12, 60, 54, 51, 61,
- 62, 25, 60, 27, 60, 8, 61, 61, 62, 25,
- 15, 27, 60, -1, 38, 60, 15, 29, 29, 56,
- 15, 25, 38, 27, -1, 25, 8, 27, 29, 34,
- 57, 36, 29, 8, 38, 34, 63, 36, 38, 34,
- 57, 36, 29, 8, 29, -1, 63, -1, 12, -1,
- -1, 29, -1, 29, 66, 67, 29, 29, 61, 62,
- -1, -1, 25, 74, 27, 66, 67, 29, -1, 66,
- 67, -1, -1, -1, 85, 38, 29, -1, 60, 66,
- 67, 66, 67, 29, -1, -1, 61, 62, 66, 67,
- 66, 67, 29, 57, 66, 67, 61, 62, -1, 63,
- 29, 74, -1, -1, 66, 67, -1, 36, -1, 25,
- -1, 27, 85, 66, 67, 18, 19, 18, 19, 29,
- 66, 67, 38, -1, -1, -1, -1, 23, 24, 66,
- 67, 29, -1, -1, 29, -1, 32, 66, 67, 35,
- -1, 37, 45, 46, 45, 46, 23, 24, -1, -1,
- -1, 61, 62, -1, -1, 32, 66, 67, 35, -1,
- 37, 29, -1, 61, 62, -1, 61, 62, 66, 67,
- -1, 66, 67, 23, 24, 18, 19, 23, 24, -1,
- -1, -1, 32, -1, -1, 35, 32, 37, -1, 35,
- -1, 37, -1, 61, 62, -1, 23, 24, 66, 67,
- -1, -1, 45, 46, 31, 32, 23, 24, 35, -1,
- 37, -1, -1, -1, 31, 32, 23, 24, 35, -1,
- 37, -1, -1, -1, 31, 32, 23, 24, 35, -1,
- 37, -1, -1, 10, 31, 32, -1, -1, 35, -1,
- 37, -1, 23, 24, -1, 22, -1, -1, 23, 24,
- 31, 32, 29, -1, 35, -1, 37, 32, -1, -1,
- 35, -1, 37, 3, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, 13, -1, -1, -1, 17, 55, -1,
- -1, -1, 59, -1, -1, -1, 26, -1, 28, 66,
- 67, -1, -1, -1, -1, -1, -1, 74, -1, 39,
- -1, 41, 42, -1, -1, -1, 83, 3, 85, 49,
- -1, -1, 52, 53, -1, -1, 10, 13, 58, -1,
- -1, 17, -1, -1, 64, -1, -1, -1, 22, -1,
- 26, -1, 28, -1, -1, 29, -1, -1, -1, 79,
- -1, -1, -1, 39, -1, 41, 42, -1, -1, -1,
- -1, -1, -1, 49, -1, -1, 52, 53, -1, -1,
- -1, 55, 58, -1, -1, 59, -1, -1, 64, -1,
- -1, -1, 66, 67, -1, -1, -1, -1, -1, -1,
- 74, -1, -1, 79, -1, -1, -1, -1, -1, 83,
- -1, 85, -1, -1, -1, -1, -1, 3, -1, -1,
- -1, -1, -1, -1, -1, -1, -1, 13, -1, -1,
- -1, 17, -1, -1, -1, -1, -1, -1, -1, -1,
- 26, -1, 28, -1, -1, 31, -1, -1, -1, -1,
+ 2, 61, 60, 36, 33, 29, 33, 60, 8, 17,
+ 78, 29, 29, 1, 61, 8, 60, 60, 31, 2,
+ 1, 8, 7, 48, 2, 55, 8, 33, 7, 55,
+ 33, 7, 7, 7, 5, 36, 33, 36, 36, 60,
+ 5, 5, 8, 1, 7, 7, 7, 7, 16, 8,
+ 7, 60, 36, 33, 48, 7, 7, 48, 78, 55,
+ 55, 7, 66, 36, 20, 88, 36, 78, 60, 88,
+ 1, 76, 7, 7, 17, 65, 48, 0, 55, 29,
+ 29, 36, 36, 36, 8, 33, 7, -1, 8, 7,
+ -1, 36, 78, 60, 36, 36, 33, 36, 8, 8,
+ 33, 7, 8, 8, 8, 8, 8, 8, 8, -1,
+ 8, 10, 8, 8, 61, -1, 8, 61, 62, 8,
+ -1, 61, 62, 61, 62, 61, 62, 40, 40, 61,
+ 62, 61, 62, 29, 61, 62, 7, 12, 51, 51,
+ 7, 29, 61, 62, 15, 8, 40, 40, 8, 6,
+ 60, 60, 56, 56, 56, 60, 55, 51, 51, 60,
+ 60, 42, 60, 20, 50, 60, 33, 56, 54, 61,
+ 50, 15, 53, 2, 54, 15, 29, 8, 66, 67,
+ 29, 8, 57, 29, 8, -1, 29, 25, 63, 27,
+ 34, 25, 36, 27, 34, 8, 36, 60, -1, 7,
+ 38, 61, 62, 29, 38, 12, 15, 29, -1, 29,
+ -1, -1, -1, 66, 67, 29, -1, 66, 67, -1,
+ 66, 67, 7, 66, 67, 34, -1, 36, 29, -1,
+ 61, 62, 29, 29, 61, 62, 29, 61, 62, 12,
+ 66, 67, 29, -1, 66, 67, 66, 67, 61, 62,
+ 57, -1, -1, 61, 62, 25, 63, 27, 18, 19,
+ 74, 29, 25, -1, 27, 66, 67, -1, 38, 66,
+ 67, 85, -1, 66, 67, 38, 61, 62, 74, 66,
+ 67, 29, 18, 19, 57, 45, 46, -1, 36, 85,
+ 63, 23, 24, 61, 62, -1, -1, -1, 66, 67,
+ 32, -1, -1, 35, 29, 37, -1, -1, -1, 45,
+ 46, 23, 24, -1, 29, -1, 29, -1, 66, 67,
+ 32, 23, 24, 35, -1, 37, -1, -1, 18, 19,
+ 32, 23, 24, 35, -1, 37, 61, 62, -1, -1,
+ 32, 66, 67, 35, -1, 37, 61, 62, 61, 62,
+ -1, 66, 67, 66, 67, 45, 46, 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, -1, 23, 24, -1, -1, 29,
+ -1, 23, 24, 31, 32, 22, -1, 35, -1, 37,
+ 32, -1, 29, 35, -1, 37, -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, 3, 66,
+ 67, -1, -1, 83, -1, 85, -1, 74, 13, -1,
+ -1, -1, 17, -1, -1, -1, 83, -1, 85, 23,
+ 24, 26, -1, 28, -1, -1, -1, 31, 32, 3,
+ -1, 35, -1, 37, 39, -1, 41, 42, -1, 13,
+ -1, -1, -1, 17, 49, -1, -1, 52, 53, -1,
+ -1, -1, 26, 58, 28, -1, -1, 31, -1, 64,
+ -1, -1, -1, -1, -1, 39, -1, 41, 42, -1,
+ -1, -1, -1, -1, 79, 49, -1, -1, 52, 53,
+ -1, -1, -1, -1, 58, -1, -1, 3, -1, -1,
+ 64, -1, -1, -1, -1, -1, -1, 13, -1, -1,
+ -1, 17, -1, -1, -1, 79, -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,
@@ -703,47 +693,40 @@ const int JavaScriptGrammar::action_check [] = {
74, 75, 76, 77, -1, -1, 80, 81, 82, 83,
84, 85, -1, -1, -1, -1, -1,
- 77, 59, 25, 25, 63, 25, 16, 14, 25, 14,
- 16, 94, 16, 16, 92, 16, 25, 19, 89, 19,
- 63, 14, 77, 19, 16, 16, 25, 14, 6, 19,
- 19, 14, 14, 19, 10, 19, 6, 14, 19, 5,
- 14, 16, 14, 6, 63, 25, 14, 16, 15, 14,
- 63, 36, 16, 38, 25, 14, 16, 19, 19, 14,
- 16, -1, -1, 21, -1, 16, 14, 14, 25, 19,
- 19, 25, 25, 19, 19, 27, 16, 16, 16, 16,
- 14, -1, -1, 19, 25, 16, -1, 19, -1, 19,
- 19, 32, 36, 36, 36, 16, 28, 14, -1, 41,
- -1, 36, 30, 36, 14, 33, 50, 42, 41, 52,
- 36, 36, 36, 16, 40, 40, 40, 36, 36, 38,
- 36, 36, 36, 36, 42, 41, 41, 41, 41, 60,
- 36, 36, 36, 16, 36, 41, -1, 41, 36, 60,
- -1, 46, 36, 41, 36, 81, 48, 41, 36, 41,
- 38, -1, 36, 83, 38, 36, 36, 60, 38, 36,
- 41, 36, 39, 38, 25, -1, 95, 101, 36, -1,
- 38, 32, 36, 36, 38, 38, 36, 60, 38, 96,
- 30, 36, 36, 33, 39, 36, -1, 38, 36, -1,
- 44, 36, -1, 36, 42, 38, 36, 42, 38, 36,
- 36, 38, 36, 36, 36, 41, 36, 41, 41, 41,
- 36, 41, 36, 47, -1, 41, -1, 41, 51, 17,
- 18, 19, 58, -1, 36, 36, 58, 53, 58, 41,
- 41, 36, 43, -1, 58, 36, 41, 49, 43, 36,
- 41, 19, 43, 36, 41, -1, 43, 36, 41, -1,
- 28, 29, 41, -1, -1, -1, 45, -1, -1, -1,
- 36, -1, 38, -1, -1, 58, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, -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, 17, 18, 19, -1,
- -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
+ 77, 25, 25, 63, 94, 63, 16, 89, 19, 77,
+ 16, 16, 16, 59, 10, 14, 19, 19, 19, 14,
+ 5, 19, 6, 14, 6, 25, 19, 19, 25, 19,
+ 19, 25, 63, 21, 14, 16, 92, 16, 16, 14,
+ 16, 63, 25, 16, 16, 19, 15, -1, 25, 16,
+ 14, 16, 14, 19, 25, 25, 14, 16, 14, 19,
+ 14, -1, 19, 16, 19, 16, 14, 14, 36, 14,
+ 14, 39, 14, 16, 14, 27, 25, 16, 16, 25,
+ 16, -1, 19, -1, 16, -1, 36, 16, 19, 14,
+ 40, 14, -1, 19, -1, 36, -1, 30, 25, 40,
+ 33, 36, 36, 38, 19, 32, 36, 41, 36, -1,
+ 6, -1, 40, 28, 36, 36, 36, 36, 48, 41,
+ 41, -1, 60, 42, 60, 36, 46, 36, 60, -1,
+ 41, 60, 41, 36, 36, 38, 38, 36, 36, 38,
+ -1, 36, 36, 41, 81, 39, 41, 36, 36, 38,
+ 38, 36, 83, 38, 36, 36, 38, 38, 25, 36,
+ 36, 38, 38, 36, 36, 32, 38, 36, 41, 95,
+ 36, 96, 36, 42, 36, 36, 30, 41, 101, 33,
+ 41, 36, -1, 36, 50, 36, 41, 38, 41, 36,
+ 52, 38, 36, 36, -1, 36, -1, 36, 36, 42,
+ 44, 42, 41, 41, -1, 36, 36, 36, 36, 38,
+ 41, 41, 43, 41, 53, -1, -1, 36, 36, -1,
+ 58, 51, 41, 41, 43, 17, 18, 19, 36, 36,
+ 58, -1, -1, 41, 41, -1, 43, 36, 36, 47,
+ 58, 36, 41, 41, 43, 8, 41, 36, 36, -1,
+ 45, 49, 41, 41, 17, 18, 19, -1, -1, -1,
+ -1, -1, -1, -1, -1, -1, -1, -1, -1, 58,
+ 58, -1, -1, -1, 19, -1, -1, -1, -1, -1,
+ -1, -1, -1, 28, 29, -1, -1, -1, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
-1, -1, -1, -1, -1, -1, -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 84f1a64..70c9766 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 = 544,
- RULE_COUNT = 313,
- STATE_COUNT = 545,
+ ACCEPT_STATE = 552,
+ RULE_COUNT = 317,
+ STATE_COUNT = 553,
TERMINAL_COUNT = 91,
NON_TERMINAL_COUNT = 103,
- GOTO_INDEX_OFFSET = 545,
- GOTO_INFO_OFFSET = 1747,
- GOTO_CHECK_OFFSET = 1747
+ GOTO_INDEX_OFFSET = 553,
+ GOTO_INFO_OFFSET = 1717,
+ GOTO_CHECK_OFFSET = 1717
};
static const char *const spell [];
diff --git a/src/declarative/qml/parser/javascriptparser.cpp b/src/declarative/qml/parser/javascriptparser.cpp
index f9615c0..ed791c8 100644
--- a/src/declarative/qml/parser/javascriptparser.cpp
+++ b/src/declarative/qml/parser/javascriptparser.cpp
@@ -291,35 +291,38 @@ case 27: {
sym(1).Node = node;
} break;
-case 28: {
+case 29: {
AST::UiPublicMember *node = makeAstNode<AST::UiPublicMember> (driver->nodePool(), sym(2).sval, sym(3).sval);
node->propertyToken = loc(1);
node->typeToken = loc(2);
node->identifierToken = loc(3);
+ node->semicolonToken = loc(4);
sym(1).Node = node;
} break;
-case 29: {
+case 31: {
AST::UiPublicMember *node = makeAstNode<AST::UiPublicMember> (driver->nodePool(), sym(3).sval, sym(4).sval);
node->isDefaultMember = true;
node->defaultToken = loc(1);
node->propertyToken = loc(2);
node->typeToken = loc(3);
node->identifierToken = loc(4);
+ node->semicolonToken = loc(5);
sym(1).Node = node;
} break;
-case 30: {
+case 33: {
AST::UiPublicMember *node = makeAstNode<AST::UiPublicMember> (driver->nodePool(), sym(2).sval, sym(3).sval,
sym(5).Expression);
node->propertyToken = loc(1);
node->typeToken = loc(2);
node->identifierToken = loc(3);
node->colonToken = loc(4);
+ node->semicolonToken = loc(6);
sym(1).Node = node;
} break;
-case 31: {
+case 35: {
AST::UiPublicMember *node = makeAstNode<AST::UiPublicMember> (driver->nodePool(), sym(3).sval, sym(4).sval,
sym(6).Expression);
node->isDefaultMember = true;
@@ -328,91 +331,92 @@ case 31: {
node->typeToken = loc(3);
node->identifierToken = loc(4);
node->colonToken = loc(5);
+ node->semicolonToken = loc(7);
sym(1).Node = node;
} break;
-case 32: {
+case 36: {
sym(1).Node = makeAstNode<AST::UiSourceElement>(driver->nodePool(), sym(1).Node);
} break;
-case 33: {
+case 37: {
sym(1).Node = makeAstNode<AST::UiSourceElement>(driver->nodePool(), sym(1).Node);
} break;
-case 34:
-case 35:
+case 38:
+case 39:
{
AST::UiQualifiedId *node = makeAstNode<AST::UiQualifiedId> (driver->nodePool(), driver->intern(lexer->characterBuffer(), lexer->characterCount()));
node->identifierToken = loc(1);
sym(1).Node = node;
} break;
-case 37: {
+case 41: {
QString s = QLatin1String(JavaScriptGrammar::spell[T_PROPERTY]);
sym(1).sval = driver->intern(s.constData(), s.length());
break;
}
-case 38: {
+case 42: {
QString s = QLatin1String(JavaScriptGrammar::spell[T_SIGNAL]);
sym(1).sval = driver->intern(s.constData(), s.length());
break;
}
-case 39: {
+case 43: {
AST::UiQualifiedId *node = makeAstNode<AST::UiQualifiedId> (driver->nodePool(), sym(1).sval);
node->identifierToken = loc(1);
sym(1).Node = node;
} break;
-case 40: {
+case 44: {
AST::UiQualifiedId *node = makeAstNode<AST::UiQualifiedId> (driver->nodePool(), sym(1).UiQualifiedId, sym(3).sval);
node->identifierToken = loc(3);
sym(1).Node = node;
} break;
-case 41: {
+case 45: {
AST::ThisExpression *node = makeAstNode<AST::ThisExpression> (driver->nodePool());
node->thisToken = loc(1);
sym(1).Node = node;
} break;
-case 42: {
+case 46: {
AST::IdentifierExpression *node = makeAstNode<AST::IdentifierExpression> (driver->nodePool(), sym(1).sval);
node->identifierToken = loc(1);
sym(1).Node = node;
} break;
-case 43: {
+case 47: {
AST::NullExpression *node = makeAstNode<AST::NullExpression> (driver->nodePool());
node->nullToken = loc(1);
sym(1).Node = node;
} break;
-case 44: {
+case 48: {
AST::TrueLiteral *node = makeAstNode<AST::TrueLiteral> (driver->nodePool());
node->trueToken = loc(1);
sym(1).Node = node;
} break;
-case 45: {
+case 49: {
AST::FalseLiteral *node = makeAstNode<AST::FalseLiteral> (driver->nodePool());
node->falseToken = loc(1);
sym(1).Node = node;
} break;
-case 46: {
+case 50: {
AST::NumericLiteral *node = makeAstNode<AST::NumericLiteral> (driver->nodePool(), sym(1).dval);
node->literalToken = loc(1);
sym(1).Node = node;
} break;
-case 47: {
+case 51: {
AST::StringLiteral *node = makeAstNode<AST::StringLiteral> (driver->nodePool(), sym(1).sval);
node->literalToken = loc(1);
sym(1).Node = node;
} break;
-case 48: {
+case 52: {
bool rx = lexer->scanRegExp(Lexer::NoPrefix);
if (!rx) {
diagnostic_messages.append(DiagnosticMessage(DiagnosticMessage::Error, location(lexer), lexer->errorMessage()));
@@ -423,7 +427,7 @@ case 48: {
sym(1).Node = node;
} break;
-case 49: {
+case 53: {
bool rx = lexer->scanRegExp(Lexer::EqualPrefix);
if (!rx) {
diagnostic_messages.append(DiagnosticMessage(DiagnosticMessage::Error, location(lexer), lexer->errorMessage()));
@@ -434,21 +438,21 @@ case 49: {
sym(1).Node = node;
} break;
-case 50: {
+case 54: {
AST::ArrayLiteral *node = makeAstNode<AST::ArrayLiteral> (driver->nodePool(), sym(2).Elision);
node->lbracketToken = loc(1);
node->rbracketToken = loc(3);
sym(1).Node = node;
} break;
-case 51: {
+case 55: {
AST::ArrayLiteral *node = makeAstNode<AST::ArrayLiteral> (driver->nodePool(), sym(2).ElementList->finish ());
node->lbracketToken = loc(1);
node->rbracketToken = loc(3);
sym(1).Node = node;
} break;
-case 52: {
+case 56: {
AST::ArrayLiteral *node = makeAstNode<AST::ArrayLiteral> (driver->nodePool(), sym(2).ElementList->finish (), sym(4).Elision);
node->lbracketToken = loc(1);
node->commaToken = loc(3);
@@ -456,7 +460,7 @@ case 52: {
sym(1).Node = node;
} break;
-case 53: {
+case 57: {
AST::ObjectLiteral *node = 0;
if (sym(2).Node)
node = makeAstNode<AST::ObjectLiteral> (driver->nodePool(),
@@ -468,7 +472,7 @@ case 53: {
sym(1).Node = node;
} break;
-case 54: {
+case 58: {
AST::ObjectLiteral *node = makeAstNode<AST::ObjectLiteral> (driver->nodePool(),
sym(2).PropertyNameAndValueList->finish ());
node->lbraceToken = loc(1);
@@ -476,51 +480,51 @@ case 54: {
sym(1).Node = node;
} break;
-case 55: {
+case 59: {
AST::NestedExpression *node = makeAstNode<AST::NestedExpression>(driver->nodePool(), sym(2).Expression);
node->lparenToken = loc(1);
node->rparenToken = loc(3);
sym(1).Node = node;
} break;
-case 56: {
+case 60: {
sym(1).Node = makeAstNode<AST::ElementList> (driver->nodePool(), sym(1).Elision, sym(2).Expression);
} break;
-case 57: {
+case 61: {
AST::ElementList *node = makeAstNode<AST::ElementList> (driver->nodePool(), sym(1).ElementList, sym(3).Elision, sym(4).Expression);
node->commaToken = loc(2);
sym(1).Node = node;
} break;
-case 58: {
+case 62: {
AST::Elision *node = makeAstNode<AST::Elision> (driver->nodePool());
node->commaToken = loc(1);
sym(1).Node = node;
} break;
-case 59: {
+case 63: {
AST::Elision *node = makeAstNode<AST::Elision> (driver->nodePool(), sym(1).Elision);
node->commaToken = loc(2);
sym(1).Node = node;
} break;
-case 60: {
+case 64: {
sym(1).Node = 0;
} break;
-case 61: {
+case 65: {
sym(1).Elision = sym(1).Elision->finish ();
} break;
-case 62: {
+case 66: {
AST::PropertyNameAndValueList *node = makeAstNode<AST::PropertyNameAndValueList> (driver->nodePool(),
sym(1).PropertyName, sym(3).Expression);
node->colonToken = loc(2);
sym(1).Node = node;
} break;
-case 63: {
+case 67: {
AST::PropertyNameAndValueList *node = makeAstNode<AST::PropertyNameAndValueList> (driver->nodePool(),
sym(1).PropertyNameAndValueList, sym(3).PropertyName, sym(5).Expression);
node->commaToken = loc(2);
@@ -528,44 +532,36 @@ case 63: {
sym(1).Node = node;
} break;
-case 64: {
+case 68: {
AST::IdentifierPropertyName *node = makeAstNode<AST::IdentifierPropertyName> (driver->nodePool(), sym(1).sval);
node->propertyNameToken = loc(1);
sym(1).Node = node;
} break;
-case 65:
-case 66: {
+case 69:
+case 70: {
AST::IdentifierPropertyName *node = makeAstNode<AST::IdentifierPropertyName> (driver->nodePool(), driver->intern(lexer->characterBuffer(), lexer->characterCount()));
node->propertyNameToken = loc(1);
sym(1).Node = node;
} break;
-case 67: {
+case 71: {
AST::StringLiteralPropertyName *node = makeAstNode<AST::StringLiteralPropertyName> (driver->nodePool(), sym(1).sval);
node->propertyNameToken = loc(1);
sym(1).Node = node;
} break;
-case 68: {
+case 72: {
AST::NumericLiteralPropertyName *node = makeAstNode<AST::NumericLiteralPropertyName> (driver->nodePool(), sym(1).dval);
node->propertyNameToken = loc(1);
sym(1).Node = node;
} break;
-case 69: {
+case 73: {
AST::IdentifierPropertyName *node = makeAstNode<AST::IdentifierPropertyName> (driver->nodePool(), sym(1).sval);
node->propertyNameToken = loc(1);
sym(1).Node = node;
} break;
-case 70:
-
-case 71:
-
-case 72:
-
-case 73:
-
case 74:
case 75:
@@ -619,25 +615,33 @@ case 98:
case 99:
case 100:
+
+case 101:
+
+case 102:
+
+case 103:
+
+case 104:
{
sym(1).sval = driver->intern(lexer->characterBuffer(), lexer->characterCount());
} break;
-case 105: {
+case 109: {
AST::ArrayMemberExpression *node = makeAstNode<AST::ArrayMemberExpression> (driver->nodePool(), sym(1).Expression, sym(3).Expression);
node->lbracketToken = loc(2);
node->rbracketToken = loc(4);
sym(1).Node = node;
} break;
-case 106: {
+case 110: {
AST::FieldMemberExpression *node = makeAstNode<AST::FieldMemberExpression> (driver->nodePool(), sym(1).Expression, sym(3).sval);
node->dotToken = loc(2);
node->identifierToken = loc(3);
sym(1).Node = node;
} break;
-case 107: {
+case 111: {
AST::NewMemberExpression *node = makeAstNode<AST::NewMemberExpression> (driver->nodePool(), sym(2).Expression, sym(4).ArgumentList);
node->newToken = loc(1);
node->lparenToken = loc(3);
@@ -645,384 +649,384 @@ case 107: {
sym(1).Node = node;
} break;
-case 109: {
+case 113: {
AST::NewExpression *node = makeAstNode<AST::NewExpression> (driver->nodePool(), sym(2).Expression);
node->newToken = loc(1);
sym(1).Node = node;
} break;
-case 110: {
+case 114: {
AST::CallExpression *node = makeAstNode<AST::CallExpression> (driver->nodePool(), sym(1).Expression, sym(3).ArgumentList);
node->lparenToken = loc(2);
node->rparenToken = loc(4);
sym(1).Node = node;
} break;
-case 111: {
+case 115: {
AST::CallExpression *node = makeAstNode<AST::CallExpression> (driver->nodePool(), sym(1).Expression, sym(3).ArgumentList);
node->lparenToken = loc(2);
node->rparenToken = loc(4);
sym(1).Node = node;
} break;
-case 112: {
+case 116: {
AST::ArrayMemberExpression *node = makeAstNode<AST::ArrayMemberExpression> (driver->nodePool(), sym(1).Expression, sym(3).Expression);
node->lbracketToken = loc(2);
node->rbracketToken = loc(4);
sym(1).Node = node;
} break;
-case 113: {
+case 117: {
AST::FieldMemberExpression *node = makeAstNode<AST::FieldMemberExpression> (driver->nodePool(), sym(1).Expression, sym(3).sval);
node->dotToken = loc(2);
node->identifierToken = loc(3);
sym(1).Node = node;
} break;
-case 114: {
+case 118: {
sym(1).Node = 0;
} break;
-case 115: {
+case 119: {
sym(1).Node = sym(1).ArgumentList->finish();
} break;
-case 116: {
+case 120: {
sym(1).Node = makeAstNode<AST::ArgumentList> (driver->nodePool(), sym(1).Expression);
} break;
-case 117: {
+case 121: {
AST::ArgumentList *node = makeAstNode<AST::ArgumentList> (driver->nodePool(), sym(1).ArgumentList, sym(3).Expression);
node->commaToken = loc(2);
sym(1).Node = node;
} break;
-case 121: {
+case 125: {
AST::PostIncrementExpression *node = makeAstNode<AST::PostIncrementExpression> (driver->nodePool(), sym(1).Expression);
node->incrementToken = loc(2);
sym(1).Node = node;
} break;
-case 122: {
+case 126: {
AST::PostDecrementExpression *node = makeAstNode<AST::PostDecrementExpression> (driver->nodePool(), sym(1).Expression);
node->decrementToken = loc(2);
sym(1).Node = node;
} break;
-case 124: {
+case 128: {
AST::DeleteExpression *node = makeAstNode<AST::DeleteExpression> (driver->nodePool(), sym(2).Expression);
node->deleteToken = loc(1);
sym(1).Node = node;
} break;
-case 125: {
+case 129: {
AST::VoidExpression *node = makeAstNode<AST::VoidExpression> (driver->nodePool(), sym(2).Expression);
node->voidToken = loc(1);
sym(1).Node = node;
} break;
-case 126: {
+case 130: {
AST::TypeOfExpression *node = makeAstNode<AST::TypeOfExpression> (driver->nodePool(), sym(2).Expression);
node->typeofToken = loc(1);
sym(1).Node = node;
} break;
-case 127: {
+case 131: {
AST::PreIncrementExpression *node = makeAstNode<AST::PreIncrementExpression> (driver->nodePool(), sym(2).Expression);
node->incrementToken = loc(1);
sym(1).Node = node;
} break;
-case 128: {
+case 132: {
AST::PreDecrementExpression *node = makeAstNode<AST::PreDecrementExpression> (driver->nodePool(), sym(2).Expression);
node->decrementToken = loc(1);
sym(1).Node = node;
} break;
-case 129: {
+case 133: {
AST::UnaryPlusExpression *node = makeAstNode<AST::UnaryPlusExpression> (driver->nodePool(), sym(2).Expression);
node->plusToken = loc(1);
sym(1).Node = node;
} break;
-case 130: {
+case 134: {
AST::UnaryMinusExpression *node = makeAstNode<AST::UnaryMinusExpression> (driver->nodePool(), sym(2).Expression);
node->minusToken = loc(1);
sym(1).Node = node;
} break;
-case 131: {
+case 135: {
AST::TildeExpression *node = makeAstNode<AST::TildeExpression> (driver->nodePool(), sym(2).Expression);
node->tildeToken = loc(1);
sym(1).Node = node;
} break;
-case 132: {
+case 136: {
AST::NotExpression *node = makeAstNode<AST::NotExpression> (driver->nodePool(), sym(2).Expression);
node->notToken = loc(1);
sym(1).Node = node;
} break;
-case 134: {
+case 138: {
AST::BinaryExpression *node = makeAstNode<AST::BinaryExpression> (driver->nodePool(), sym(1).Expression,
QSOperator::Mul, sym(3).Expression);
node->operatorToken = loc(2);
sym(1).Node = node;
} break;
-case 135: {
+case 139: {
AST::BinaryExpression *node = makeAstNode<AST::BinaryExpression> (driver->nodePool(), sym(1).Expression,
QSOperator::Div, sym(3).Expression);
node->operatorToken = loc(2);
sym(1).Node = node;
} break;
-case 136: {
+case 140: {
AST::BinaryExpression *node = makeAstNode<AST::BinaryExpression> (driver->nodePool(), sym(1).Expression,
QSOperator::Mod, sym(3).Expression);
node->operatorToken = loc(2);
sym(1).Node = node;
} break;
-case 138: {
+case 142: {
AST::BinaryExpression *node = makeAstNode<AST::BinaryExpression> (driver->nodePool(), sym(1).Expression,
QSOperator::Add, sym(3).Expression);
node->operatorToken = loc(2);
sym(1).Node = node;
} break;
-case 139: {
+case 143: {
AST::BinaryExpression *node = makeAstNode<AST::BinaryExpression> (driver->nodePool(), sym(1).Expression,
QSOperator::Sub, sym(3).Expression);
node->operatorToken = loc(2);
sym(1).Node = node;
} break;
-case 141: {
+case 145: {
AST::BinaryExpression *node = makeAstNode<AST::BinaryExpression> (driver->nodePool(), sym(1).Expression,
QSOperator::LShift, sym(3).Expression);
node->operatorToken = loc(2);
sym(1).Node = node;
} break;
-case 142: {
+case 146: {
AST::BinaryExpression *node = makeAstNode<AST::BinaryExpression> (driver->nodePool(), sym(1).Expression,
QSOperator::RShift, sym(3).Expression);
node->operatorToken = loc(2);
sym(1).Node = node;
} break;
-case 143: {
+case 147: {
AST::BinaryExpression *node = makeAstNode<AST::BinaryExpression> (driver->nodePool(), sym(1).Expression,
QSOperator::URShift, sym(3).Expression);
node->operatorToken = loc(2);
sym(1).Node = node;
} break;
-case 145: {
+case 149: {
AST::BinaryExpression *node = makeAstNode<AST::BinaryExpression> (driver->nodePool(), sym(1).Expression,
QSOperator::Lt, sym(3).Expression);
node->operatorToken = loc(2);
sym(1).Node = node;
} break;
-case 146: {
+case 150: {
AST::BinaryExpression *node = makeAstNode<AST::BinaryExpression> (driver->nodePool(), sym(1).Expression,
QSOperator::Gt, sym(3).Expression);
node->operatorToken = loc(2);
sym(1).Node = node;
} break;
-case 147: {
+case 151: {
AST::BinaryExpression *node = makeAstNode<AST::BinaryExpression> (driver->nodePool(), sym(1).Expression,
QSOperator::Le, sym(3).Expression);
node->operatorToken = loc(2);
sym(1).Node = node;
} break;
-case 148: {
+case 152: {
AST::BinaryExpression *node = makeAstNode<AST::BinaryExpression> (driver->nodePool(), sym(1).Expression,
QSOperator::Ge, sym(3).Expression);
node->operatorToken = loc(2);
sym(1).Node = node;
} break;
-case 149: {
+case 153: {
AST::BinaryExpression *node = makeAstNode<AST::BinaryExpression> (driver->nodePool(), sym(1).Expression,
QSOperator::InstanceOf, sym(3).Expression);
node->operatorToken = loc(2);
sym(1).Node = node;
} break;
-case 150: {
+case 154: {
AST::BinaryExpression *node = makeAstNode<AST::BinaryExpression> (driver->nodePool(), sym(1).Expression,
QSOperator::In, sym(3).Expression);
node->operatorToken = loc(2);
sym(1).Node = node;
} break;
-case 152: {
+case 156: {
AST::BinaryExpression *node = makeAstNode<AST::BinaryExpression> (driver->nodePool(), sym(1).Expression,
QSOperator::Lt, sym(3).Expression);
node->operatorToken = loc(2);
sym(1).Node = node;
} break;
-case 153: {
+case 157: {
AST::BinaryExpression *node = makeAstNode<AST::BinaryExpression> (driver->nodePool(), sym(1).Expression,
QSOperator::Gt, sym(3).Expression);
node->operatorToken = loc(2);
sym(1).Node = node;
} break;
-case 154: {
+case 158: {
AST::BinaryExpression *node = makeAstNode<AST::BinaryExpression> (driver->nodePool(), sym(1).Expression,
QSOperator::Le, sym(3).Expression);
node->operatorToken = loc(2);
sym(1).Node = node;
} break;
-case 155: {
+case 159: {
AST::BinaryExpression *node = makeAstNode<AST::BinaryExpression> (driver->nodePool(), sym(1).Expression,
QSOperator::Ge, sym(3).Expression);
node->operatorToken = loc(2);
sym(1).Node = node;
} break;
-case 156: {
+case 160: {
AST::BinaryExpression *node = makeAstNode<AST::BinaryExpression> (driver->nodePool(), sym(1).Expression,
QSOperator::InstanceOf, sym(3).Expression);
node->operatorToken = loc(2);
sym(1).Node = node;
} break;
-case 158: {
+case 162: {
AST::BinaryExpression *node = makeAstNode<AST::BinaryExpression> (driver->nodePool(), sym(1).Expression,
QSOperator::Equal, sym(3).Expression);
node->operatorToken = loc(2);
sym(1).Node = node;
} break;
-case 159: {
+case 163: {
AST::BinaryExpression *node = makeAstNode<AST::BinaryExpression> (driver->nodePool(), sym(1).Expression,
QSOperator::NotEqual, sym(3).Expression);
node->operatorToken = loc(2);
sym(1).Node = node;
} break;
-case 160: {
+case 164: {
AST::BinaryExpression *node = makeAstNode<AST::BinaryExpression> (driver->nodePool(), sym(1).Expression,
QSOperator::StrictEqual, sym(3).Expression);
node->operatorToken = loc(2);
sym(1).Node = node;
} break;
-case 161: {
+case 165: {
AST::BinaryExpression *node = makeAstNode<AST::BinaryExpression> (driver->nodePool(), sym(1).Expression,
QSOperator::StrictNotEqual, sym(3).Expression);
node->operatorToken = loc(2);
sym(1).Node = node;
} break;
-case 163: {
+case 167: {
AST::BinaryExpression *node = makeAstNode<AST::BinaryExpression> (driver->nodePool(), sym(1).Expression,
QSOperator::Equal, sym(3).Expression);
node->operatorToken = loc(2);
sym(1).Node = node;
} break;
-case 164: {
+case 168: {
AST::BinaryExpression *node = makeAstNode<AST::BinaryExpression> (driver->nodePool(), sym(1).Expression,
QSOperator::NotEqual, sym(3).Expression);
node->operatorToken = loc(2);
sym(1).Node = node;
} break;
-case 165: {
+case 169: {
AST::BinaryExpression *node = makeAstNode<AST::BinaryExpression> (driver->nodePool(), sym(1).Expression,
QSOperator::StrictEqual, sym(3).Expression);
node->operatorToken = loc(2);
sym(1).Node = node;
} break;
-case 166: {
+case 170: {
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 168: {
+case 172: {
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 170: {
+case 174: {
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 172: {
+case 176: {
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 174: {
+case 178: {
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 176: {
+case 180: {
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 178: {
+case 182: {
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 180: {
+case 184: {
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 182: {
+case 186: {
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 184: {
+case 188: {
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 186: {
+case 190: {
AST::BinaryExpression *node = makeAstNode<AST::BinaryExpression> (driver->nodePool(), sym(1).Expression,
QSOperator::Or, sym(3).Expression);
node->operatorToken = loc(2);
sym(1).Node = node;
} break;
-case 188: {
+case 192: {
AST::ConditionalExpression *node = makeAstNode<AST::ConditionalExpression> (driver->nodePool(), sym(1).Expression,
sym(3).Expression, sym(5).Expression);
node->questionToken = loc(2);
@@ -1030,7 +1034,7 @@ case 188: {
sym(1).Node = node;
} break;
-case 190: {
+case 194: {
AST::ConditionalExpression *node = makeAstNode<AST::ConditionalExpression> (driver->nodePool(), sym(1).Expression,
sym(3).Expression, sym(5).Expression);
node->questionToken = loc(2);
@@ -1038,112 +1042,112 @@ case 190: {
sym(1).Node = node;
} break;
-case 192: {
+case 196: {
AST::BinaryExpression *node = makeAstNode<AST::BinaryExpression> (driver->nodePool(), sym(1).Expression,
sym(2).ival, sym(3).Expression);
node->operatorToken = loc(2);
sym(1).Node = node;
} break;
-case 194: {
+case 198: {
AST::BinaryExpression *node = makeAstNode<AST::BinaryExpression> (driver->nodePool(), sym(1).Expression,
sym(2).ival, sym(3).Expression);
node->operatorToken = loc(2);
sym(1).Node = node;
} break;
-case 195: {
+case 199: {
sym(1).ival = QSOperator::Assign;
} break;
-case 196: {
+case 200: {
sym(1).ival = QSOperator::InplaceMul;
} break;
-case 197: {
+case 201: {
sym(1).ival = QSOperator::InplaceDiv;
} break;
-case 198: {
+case 202: {
sym(1).ival = QSOperator::InplaceMod;
} break;
-case 199: {
+case 203: {
sym(1).ival = QSOperator::InplaceAdd;
} break;
-case 200: {
+case 204: {
sym(1).ival = QSOperator::InplaceSub;
} break;
-case 201: {
+case 205: {
sym(1).ival = QSOperator::InplaceLeftShift;
} break;
-case 202: {
+case 206: {
sym(1).ival = QSOperator::InplaceRightShift;
} break;
-case 203: {
+case 207: {
sym(1).ival = QSOperator::InplaceURightShift;
} break;
-case 204: {
+case 208: {
sym(1).ival = QSOperator::InplaceAnd;
} break;
-case 205: {
+case 209: {
sym(1).ival = QSOperator::InplaceXor;
} break;
-case 206: {
+case 210: {
sym(1).ival = QSOperator::InplaceOr;
} break;
-case 208: {
+case 212: {
AST::Expression *node = makeAstNode<AST::Expression> (driver->nodePool(), sym(1).Expression, sym(3).Expression);
node->commaToken = loc(2);
sym(1).Node = node;
} break;
-case 209: {
+case 213: {
sym(1).Node = 0;
} break;
-case 212: {
+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 213: {
+case 217: {
sym(1).Node = 0;
} break;
-case 230: {
+case 234: {
AST::Block *node = makeAstNode<AST::Block> (driver->nodePool(), sym(2).StatementList);
node->lbraceToken = loc(1);
node->rbraceToken = loc(3);
sym(1).Node = node;
} break;
-case 231: {
+case 235: {
sym(1).Node = makeAstNode<AST::StatementList> (driver->nodePool(), sym(1).Statement);
} break;
-case 232: {
+case 236: {
sym(1).Node = makeAstNode<AST::StatementList> (driver->nodePool(), sym(1).StatementList, sym(2).Statement);
} break;
-case 233: {
+case 237: {
sym(1).Node = 0;
} break;
-case 234: {
+case 238: {
sym(1).Node = sym(1).StatementList->finish ();
} break;
-case 236: {
+case 240: {
AST::VariableStatement *node = makeAstNode<AST::VariableStatement> (driver->nodePool(),
sym(2).VariableDeclarationList->finish (/*readOnly=*/sym(1).ival == T_CONST));
node->declarationKindToken = loc(1);
@@ -1151,76 +1155,76 @@ case 236: {
sym(1).Node = node;
} break;
-case 237: {
+case 241: {
sym(1).ival = T_CONST;
} break;
-case 238: {
+case 242: {
sym(1).ival = T_VAR;
} break;
-case 239: {
+case 243: {
sym(1).Node = makeAstNode<AST::VariableDeclarationList> (driver->nodePool(), sym(1).VariableDeclaration);
} break;
-case 240: {
+case 244: {
AST::VariableDeclarationList *node = makeAstNode<AST::VariableDeclarationList> (driver->nodePool(),
sym(1).VariableDeclarationList, sym(3).VariableDeclaration);
node->commaToken = loc(2);
sym(1).Node = node;
} break;
-case 241: {
+case 245: {
sym(1).Node = makeAstNode<AST::VariableDeclarationList> (driver->nodePool(), sym(1).VariableDeclaration);
} break;
-case 242: {
+case 246: {
sym(1).Node = makeAstNode<AST::VariableDeclarationList> (driver->nodePool(), sym(1).VariableDeclarationList, sym(3).VariableDeclaration);
} break;
-case 243: {
+case 247: {
AST::VariableDeclaration *node = makeAstNode<AST::VariableDeclaration> (driver->nodePool(), sym(1).sval, sym(2).Expression);
node->identifierToken = loc(1);
sym(1).Node = node;
} break;
-case 244: {
+case 248: {
AST::VariableDeclaration *node = makeAstNode<AST::VariableDeclaration> (driver->nodePool(), sym(1).sval, sym(2).Expression);
node->identifierToken = loc(1);
sym(1).Node = node;
} break;
-case 245: {
+case 249: {
// ### TODO: AST for initializer
sym(1) = sym(2);
} break;
-case 246: {
+case 250: {
sym(1).Node = 0;
} break;
-case 248: {
+case 252: {
// ### TODO: AST for initializer
sym(1) = sym(2);
} break;
-case 249: {
+case 253: {
sym(1).Node = 0;
} break;
-case 251: {
+case 255: {
AST::EmptyStatement *node = makeAstNode<AST::EmptyStatement> (driver->nodePool());
node->semicolonToken = loc(1);
sym(1).Node = node;
} break;
-case 253: {
+case 257: {
AST::ExpressionStatement *node = makeAstNode<AST::ExpressionStatement> (driver->nodePool(), sym(1).Expression);
node->semicolonToken = loc(2);
sym(1).Node = node;
} break;
-case 254: {
+case 258: {
AST::IfStatement *node = makeAstNode<AST::IfStatement> (driver->nodePool(), sym(3).Expression, sym(5).Statement, sym(7).Statement);
node->ifToken = loc(1);
node->lparenToken = loc(2);
@@ -1229,7 +1233,7 @@ case 254: {
sym(1).Node = node;
} break;
-case 255: {
+case 259: {
AST::IfStatement *node = makeAstNode<AST::IfStatement> (driver->nodePool(), sym(3).Expression, sym(5).Statement);
node->ifToken = loc(1);
node->lparenToken = loc(2);
@@ -1237,7 +1241,7 @@ case 255: {
sym(1).Node = node;
} break;
-case 257: {
+case 261: {
AST::DoWhileStatement *node = makeAstNode<AST::DoWhileStatement> (driver->nodePool(), sym(2).Statement, sym(5).Expression);
node->doToken = loc(1);
node->whileToken = loc(3);
@@ -1247,7 +1251,7 @@ case 257: {
sym(1).Node = node;
} break;
-case 258: {
+case 262: {
AST::WhileStatement *node = makeAstNode<AST::WhileStatement> (driver->nodePool(), sym(3).Expression, sym(5).Statement);
node->whileToken = loc(1);
node->lparenToken = loc(2);
@@ -1255,7 +1259,7 @@ case 258: {
sym(1).Node = node;
} break;
-case 259: {
+case 263: {
AST::ForStatement *node = makeAstNode<AST::ForStatement> (driver->nodePool(), sym(3).Expression,
sym(5).Expression, sym(7).Expression, sym(9).Statement);
node->forToken = loc(1);
@@ -1266,7 +1270,7 @@ case 259: {
sym(1).Node = node;
} break;
-case 260: {
+case 264: {
AST::LocalForStatement *node = makeAstNode<AST::LocalForStatement> (driver->nodePool(),
sym(4).VariableDeclarationList->finish (/*readOnly=*/false), sym(6).Expression,
sym(8).Expression, sym(10).Statement);
@@ -1279,7 +1283,7 @@ case 260: {
sym(1).Node = node;
} break;
-case 261: {
+case 265: {
AST:: ForEachStatement *node = makeAstNode<AST::ForEachStatement> (driver->nodePool(), sym(3).Expression,
sym(5).Expression, sym(7).Statement);
node->forToken = loc(1);
@@ -1289,7 +1293,7 @@ case 261: {
sym(1).Node = node;
} break;
-case 262: {
+case 266: {
AST::LocalForEachStatement *node = makeAstNode<AST::LocalForEachStatement> (driver->nodePool(),
sym(4).VariableDeclaration, sym(6).Expression, sym(8).Statement);
node->forToken = loc(1);
@@ -1300,14 +1304,14 @@ case 262: {
sym(1).Node = node;
} break;
-case 264: {
+case 268: {
AST::ContinueStatement *node = makeAstNode<AST::ContinueStatement> (driver->nodePool());
node->continueToken = loc(1);
node->semicolonToken = loc(2);
sym(1).Node = node;
} break;
-case 266: {
+case 270: {
AST::ContinueStatement *node = makeAstNode<AST::ContinueStatement> (driver->nodePool(), sym(2).sval);
node->continueToken = loc(1);
node->identifierToken = loc(2);
@@ -1315,14 +1319,14 @@ case 266: {
sym(1).Node = node;
} break;
-case 268: {
+case 272: {
AST::BreakStatement *node = makeAstNode<AST::BreakStatement> (driver->nodePool());
node->breakToken = loc(1);
node->semicolonToken = loc(2);
sym(1).Node = node;
} break;
-case 270: {
+case 274: {
AST::BreakStatement *node = makeAstNode<AST::BreakStatement> (driver->nodePool(), sym(2).sval);
node->breakToken = loc(1);
node->identifierToken = loc(2);
@@ -1330,14 +1334,14 @@ case 270: {
sym(1).Node = node;
} break;
-case 272: {
+case 276: {
AST::ReturnStatement *node = makeAstNode<AST::ReturnStatement> (driver->nodePool(), sym(2).Expression);
node->returnToken = loc(1);
node->semicolonToken = loc(3);
sym(1).Node = node;
} break;
-case 273: {
+case 277: {
AST::WithStatement *node = makeAstNode<AST::WithStatement> (driver->nodePool(), sym(3).Expression, sym(5).Statement);
node->withToken = loc(1);
node->lparenToken = loc(2);
@@ -1345,7 +1349,7 @@ case 273: {
sym(1).Node = node;
} break;
-case 274: {
+case 278: {
AST::SwitchStatement *node = makeAstNode<AST::SwitchStatement> (driver->nodePool(), sym(3).Expression, sym(5).CaseBlock);
node->switchToken = loc(1);
node->lparenToken = loc(2);
@@ -1353,90 +1357,90 @@ case 274: {
sym(1).Node = node;
} break;
-case 275: {
+case 279: {
AST::CaseBlock *node = makeAstNode<AST::CaseBlock> (driver->nodePool(), sym(2).CaseClauses);
node->lbraceToken = loc(1);
node->rbraceToken = loc(3);
sym(1).Node = node;
} break;
-case 276: {
+case 280: {
AST::CaseBlock *node = makeAstNode<AST::CaseBlock> (driver->nodePool(), sym(2).CaseClauses, sym(3).DefaultClause, sym(4).CaseClauses);
node->lbraceToken = loc(1);
node->rbraceToken = loc(5);
sym(1).Node = node;
} break;
-case 277: {
+case 281: {
sym(1).Node = makeAstNode<AST::CaseClauses> (driver->nodePool(), sym(1).CaseClause);
} break;
-case 278: {
+case 282: {
sym(1).Node = makeAstNode<AST::CaseClauses> (driver->nodePool(), sym(1).CaseClauses, sym(2).CaseClause);
} break;
-case 279: {
+case 283: {
sym(1).Node = 0;
} break;
-case 280: {
+case 284: {
sym(1).Node = sym(1).CaseClauses->finish ();
} break;
-case 281: {
+case 285: {
AST::CaseClause *node = makeAstNode<AST::CaseClause> (driver->nodePool(), sym(2).Expression, sym(4).StatementList);
node->caseToken = loc(1);
node->colonToken = loc(3);
sym(1).Node = node;
} break;
-case 282: {
+case 286: {
AST::DefaultClause *node = makeAstNode<AST::DefaultClause> (driver->nodePool(), sym(3).StatementList);
node->defaultToken = loc(1);
node->colonToken = loc(2);
sym(1).Node = node;
} break;
-case 283:
-case 284: {
+case 287:
+case 288: {
AST::LabelledStatement *node = makeAstNode<AST::LabelledStatement> (driver->nodePool(), driver->intern(lexer->characterBuffer(), lexer->characterCount()), sym(3).Statement);
node->identifierToken = loc(1);
node->colonToken = loc(2);
sym(1).Node = node;
} break;
-case 285: {
+case 289: {
AST::LabelledStatement *node = makeAstNode<AST::LabelledStatement> (driver->nodePool(), sym(1).sval, sym(3).Statement);
node->identifierToken = loc(1);
node->colonToken = loc(2);
sym(1).Node = node;
} break;
-case 287: {
+case 291: {
AST::ThrowStatement *node = makeAstNode<AST::ThrowStatement> (driver->nodePool(), sym(2).Expression);
node->throwToken = loc(1);
node->semicolonToken = loc(3);
sym(1).Node = node;
} break;
-case 288: {
+case 292: {
AST::TryStatement *node = makeAstNode<AST::TryStatement> (driver->nodePool(), sym(2).Statement, sym(3).Catch);
node->tryToken = loc(1);
sym(1).Node = node;
} break;
-case 289: {
+case 293: {
AST::TryStatement *node = makeAstNode<AST::TryStatement> (driver->nodePool(), sym(2).Statement, sym(3).Finally);
node->tryToken = loc(1);
sym(1).Node = node;
} break;
-case 290: {
+case 294: {
AST::TryStatement *node = makeAstNode<AST::TryStatement> (driver->nodePool(), sym(2).Statement, sym(3).Catch, sym(4).Finally);
node->tryToken = loc(1);
sym(1).Node = node;
} break;
-case 291: {
+case 295: {
AST::Catch *node = makeAstNode<AST::Catch> (driver->nodePool(), sym(3).sval, sym(5).Block);
node->catchToken = loc(1);
node->lparenToken = loc(2);
@@ -1445,20 +1449,20 @@ case 291: {
sym(1).Node = node;
} break;
-case 292: {
+case 296: {
AST::Finally *node = makeAstNode<AST::Finally> (driver->nodePool(), sym(2).Block);
node->finallyToken = loc(1);
sym(1).Node = node;
} break;
-case 294: {
+case 298: {
AST::DebuggerStatement *node = makeAstNode<AST::DebuggerStatement> (driver->nodePool());
node->debuggerToken = loc(1);
node->semicolonToken = loc(2);
sym(1).Node = node;
} break;
-case 295: {
+case 299: {
AST::FunctionDeclaration *node = makeAstNode<AST::FunctionDeclaration> (driver->nodePool(), sym(2).sval, sym(4).FormalParameterList, sym(7).FunctionBody);
node->functionToken = loc(1);
node->identifierToken = loc(2);
@@ -1469,7 +1473,7 @@ case 295: {
sym(1).Node = node;
} break;
-case 296: {
+case 300: {
AST::FunctionExpression *node = makeAstNode<AST::FunctionExpression> (driver->nodePool(), sym(2).sval, sym(4).FormalParameterList, sym(7).FunctionBody);
node->functionToken = loc(1);
if (sym(2).sval)
@@ -1481,56 +1485,56 @@ case 296: {
sym(1).Node = node;
} break;
-case 297: {
+case 301: {
AST::FormalParameterList *node = makeAstNode<AST::FormalParameterList> (driver->nodePool(), sym(1).sval);
node->identifierToken = loc(1);
sym(1).Node = node;
} break;
-case 298: {
+case 302: {
AST::FormalParameterList *node = makeAstNode<AST::FormalParameterList> (driver->nodePool(), sym(1).FormalParameterList, sym(3).sval);
node->commaToken = loc(2);
node->identifierToken = loc(3);
sym(1).Node = node;
} break;
-case 299: {
+case 303: {
sym(1).Node = 0;
} break;
-case 300: {
+case 304: {
sym(1).Node = sym(1).FormalParameterList->finish ();
} break;
-case 301: {
+case 305: {
sym(1).Node = 0;
} break;
-case 303: {
+case 307: {
sym(1).Node = makeAstNode<AST::FunctionBody> (driver->nodePool(), sym(1).SourceElements->finish ());
} break;
-case 304: {
+case 308: {
sym(1).Node = makeAstNode<AST::SourceElements> (driver->nodePool(), sym(1).SourceElement);
} break;
-case 305: {
+case 309: {
sym(1).Node = makeAstNode<AST::SourceElements> (driver->nodePool(), sym(1).SourceElements, sym(2).SourceElement);
} break;
-case 306: {
+case 310: {
sym(1).Node = makeAstNode<AST::StatementSourceElement> (driver->nodePool(), sym(1).Statement);
} break;
-case 307: {
+case 311: {
sym(1).Node = makeAstNode<AST::FunctionSourceElement> (driver->nodePool(), sym(1).FunctionDeclaration);
} break;
-case 308: {
+case 312: {
sym(1).sval = 0;
} break;
-case 310: {
+case 314: {
sym(1).Node = 0;
} break;
diff --git a/src/declarative/qml/parser/javascriptparser_p.h b/src/declarative/qml/parser/javascriptparser_p.h
index f7b51e0..5e68fe7 100644
--- a/src/declarative/qml/parser/javascriptparser_p.h
+++ b/src/declarative/qml/parser/javascriptparser_p.h
@@ -205,9 +205,9 @@ protected:
};
-#define J_SCRIPT_REGEXPLITERAL_RULE1 48
+#define J_SCRIPT_REGEXPLITERAL_RULE1 52
-#define J_SCRIPT_REGEXPLITERAL_RULE2 49
+#define J_SCRIPT_REGEXPLITERAL_RULE2 53
QT_END_NAMESPACE
generated by cgit v0.12 at 2024-12-02 05:27:46 (GMT)