summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authormae <qt-info@nokia.com>2009-04-20 15:54:26 (GMT)
committerRoberto Raggi <roberto.raggi@nokia.com>2009-04-24 07:52:38 (GMT)
commit411808e3020e4563e5c2e0bcf6ebf2a6b633a8c4 (patch)
treec71dc8e9478fa5f4ec853924930095a67d2b5cf7 /src
parentca1dde886a5613e7f298927d8c1cd61f7fd05b28 (diff)
downloadQt-411808e3020e4563e5c2e0bcf6ebf2a6b633a8c4.zip
Qt-411808e3020e4563e5c2e0bcf6ebf2a6b633a8c4.tar.gz
Qt-411808e3020e4563e5c2e0bcf6ebf2a6b633a8c4.tar.bz2
support comma for lists, better parser error output
Diffstat (limited to 'src')
-rw-r--r--src/declarative/qml/parser/javascript.g18
-rw-r--r--src/declarative/qml/parser/javascriptgrammar.cpp1088
-rw-r--r--src/declarative/qml/parser/javascriptgrammar_p.h12
-rw-r--r--src/declarative/qml/parser/javascriptparser.cpp374
-rw-r--r--src/declarative/qml/parser/javascriptparser_p.h4
-rw-r--r--src/declarative/qml/qmlcomponent.cpp14
-rw-r--r--src/declarative/qml/qmlscriptparser.cpp10
-rw-r--r--src/declarative/qml/qmlscriptparser_p.h2
8 files changed, 770 insertions, 752 deletions
diff --git a/src/declarative/qml/parser/javascript.g b/src/declarative/qml/parser/javascript.g
index c7b26e2..411a8c6 100644
--- a/src/declarative/qml/parser/javascript.g
+++ b/src/declarative/qml/parser/javascript.g
@@ -530,6 +530,22 @@ case $rule_number: {
} break;
./
+UiArrayMemberList: UiObjectMember ;
+/.
+case $rule_number: {
+ sym(1).Node = makeAstNode<AST::UiObjectMemberList> (driver->nodePool(), sym(1).UiObjectMember);
+} break;
+./
+
+UiArrayMemberList: UiArrayMemberList T_COMMA UiObjectMember ;
+/.
+case $rule_number: {
+ AST::UiObjectMemberList *node = makeAstNode<AST:: UiObjectMemberList> (driver->nodePool(),
+ sym(1).UiObjectMemberList, sym(3).UiObjectMember);
+ sym(1).Node = node;
+} break;
+./
+
UiObjectInitializer: T_LBRACE T_RBRACE ;
/.
case $rule_number: {
@@ -571,7 +587,7 @@ case $rule_number: {
} break;
./
-UiObjectMember: UiQualifiedId T_COLON T_LBRACKET UiObjectMemberList T_RBRACKET ;
+UiObjectMember: UiQualifiedId T_COLON T_LBRACKET UiArrayMemberList T_RBRACKET ;
/.
case $rule_number: {
AST::UiArrayBinding *node = makeAstNode<AST::UiArrayBinding> (driver->nodePool(), sym(1).UiQualifiedId->finish(),
diff --git a/src/declarative/qml/parser/javascriptgrammar.cpp b/src/declarative/qml/parser/javascriptgrammar.cpp
index 61d033c..43d4c17 100644
--- a/src/declarative/qml/parser/javascriptgrammar.cpp
+++ b/src/declarative/qml/parser/javascriptgrammar.cpp
@@ -14,523 +14,497 @@ const char *const JavaScriptGrammar::spell [] = {
const int JavaScriptGrammar::lhs [] = {
88, 89, 89, 92, 92, 93, 93, 91, 90, 90,
- 95, 95, 94, 94, 94, 94, 94, 94, 94, 96,
- 96, 99, 99, 99, 99, 99, 99, 99, 99, 99,
- 99, 99, 99, 99, 99, 99, 101, 101, 105, 105,
- 100, 100, 103, 103, 106, 106, 106, 106, 107, 107,
- 107, 107, 107, 107, 107, 107, 107, 107, 107, 107,
- 107, 107, 107, 107, 107, 107, 107, 107, 107, 107,
- 107, 107, 107, 107, 107, 107, 107, 107, 107, 108,
- 108, 109, 109, 109, 109, 109, 112, 112, 113, 113,
- 113, 113, 111, 111, 114, 114, 115, 115, 116, 116,
- 116, 117, 117, 117, 117, 117, 117, 117, 117, 117,
- 117, 118, 118, 118, 118, 119, 119, 119, 120, 120,
- 120, 120, 121, 121, 121, 121, 121, 121, 121, 122,
- 122, 122, 122, 122, 122, 123, 123, 123, 123, 123,
- 124, 124, 124, 124, 124, 125, 125, 126, 126, 127,
+ 95, 95, 96, 96, 94, 94, 94, 94, 94, 94,
+ 94, 97, 97, 100, 100, 100, 100, 100, 100, 100,
+ 100, 100, 100, 100, 100, 100, 100, 100, 102, 102,
+ 106, 106, 101, 101, 104, 104, 107, 107, 107, 107,
+ 108, 108, 108, 108, 108, 108, 108, 108, 108, 108,
+ 108, 108, 108, 108, 108, 108, 108, 108, 108, 108,
+ 108, 108, 108, 108, 108, 108, 108, 108, 108, 108,
+ 108, 109, 109, 110, 110, 110, 110, 110, 113, 113,
+ 114, 114, 114, 114, 112, 112, 115, 115, 116, 116,
+ 117, 117, 117, 118, 118, 118, 118, 118, 118, 118,
+ 118, 118, 118, 119, 119, 119, 119, 120, 120, 120,
+ 121, 121, 121, 121, 122, 122, 122, 122, 122, 122,
+ 122, 123, 123, 123, 123, 123, 123, 124, 124, 124,
+ 124, 124, 125, 125, 125, 125, 125, 126, 126, 127,
127, 128, 128, 129, 129, 130, 130, 131, 131, 132,
- 132, 133, 133, 134, 134, 135, 135, 136, 136, 104,
- 104, 137, 137, 138, 138, 138, 138, 138, 138, 138,
- 138, 138, 138, 138, 138, 98, 98, 139, 139, 140,
- 140, 141, 141, 97, 97, 97, 97, 97, 97, 97,
- 97, 97, 97, 97, 97, 97, 97, 97, 142, 158,
- 158, 157, 157, 143, 143, 159, 159, 160, 160, 162,
- 162, 161, 163, 166, 164, 164, 167, 165, 165, 144,
- 145, 145, 146, 146, 147, 147, 147, 147, 147, 147,
- 147, 148, 148, 148, 148, 149, 149, 149, 149, 150,
- 150, 151, 153, 168, 168, 171, 171, 169, 169, 172,
- 170, 152, 154, 154, 155, 155, 155, 173, 174, 156,
- 156, 175, 110, 179, 179, 176, 176, 177, 177, 180,
- 181, 181, 182, 182, 178, 178, 102, 102, 183};
+ 132, 133, 133, 134, 134, 135, 135, 136, 136, 137,
+ 137, 105, 105, 138, 138, 139, 139, 139, 139, 139,
+ 139, 139, 139, 139, 139, 139, 139, 99, 99, 140,
+ 140, 141, 141, 142, 142, 98, 98, 98, 98, 98,
+ 98, 98, 98, 98, 98, 98, 98, 98, 98, 98,
+ 143, 159, 159, 158, 158, 144, 144, 160, 160, 161,
+ 161, 163, 163, 162, 164, 167, 165, 165, 168, 166,
+ 166, 145, 146, 146, 147, 147, 148, 148, 148, 148,
+ 148, 148, 148, 149, 149, 149, 149, 150, 150, 150,
+ 150, 151, 151, 152, 154, 169, 169, 172, 172, 170,
+ 170, 173, 171, 153, 155, 155, 156, 156, 156, 174,
+ 175, 157, 157, 176, 111, 180, 180, 177, 177, 178,
+ 178, 181, 182, 182, 183, 183, 179, 179, 103, 103,
+ 184};
const int JavaScriptGrammar:: rhs[] = {
2, 1, 1, 1, 2, 3, 3, 0, 1, 2,
- 2, 3, 4, 2, 5, 3, 6, 3, 5, 1,
- 3, 1, 1, 1, 1, 1, 1, 1, 1, 1,
- 3, 3, 5, 3, 4, 3, 2, 4, 1, 2,
- 0, 1, 3, 5, 1, 1, 1, 1, 1, 1,
+ 1, 3, 2, 3, 4, 2, 5, 3, 6, 3,
+ 5, 1, 3, 1, 1, 1, 1, 1, 1, 1,
+ 1, 1, 3, 3, 5, 3, 4, 3, 2, 4,
+ 1, 2, 0, 1, 3, 5, 1, 1, 1, 1,
1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
- 1, 1, 1, 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,
+ 1, 1, 1, 1, 1, 4, 3, 5, 1, 2,
+ 4, 4, 4, 3, 0, 1, 1, 3, 1, 1,
+ 1, 2, 2, 1, 2, 2, 2, 2, 2, 2,
+ 2, 2, 2, 1, 3, 3, 3, 1, 3, 3,
+ 1, 3, 3, 3, 1, 3, 3, 3, 3, 3,
+ 3, 1, 3, 3, 3, 3, 3, 1, 3, 3,
+ 3, 3, 1, 3, 3, 3, 3, 1, 3, 1,
3, 1, 3, 1, 3, 1, 3, 1, 3, 1,
- 3, 1, 3, 1, 3, 1, 5, 1, 5, 1,
- 3, 1, 3, 1, 1, 1, 1, 1, 1, 1,
- 1, 1, 1, 1, 1, 1, 3, 0, 1, 1,
- 3, 0, 1, 1, 1, 1, 1, 1, 1, 1,
- 1, 1, 1, 1, 1, 1, 1, 1, 3, 1,
- 2, 0, 1, 3, 3, 1, 1, 1, 3, 1,
- 3, 2, 2, 2, 0, 1, 2, 0, 1, 1,
- 2, 2, 7, 5, 7, 7, 5, 9, 10, 7,
- 8, 2, 2, 3, 3, 2, 2, 3, 3, 3,
- 3, 5, 5, 3, 5, 1, 2, 0, 1, 4,
- 3, 3, 3, 3, 3, 3, 4, 5, 2, 2,
- 2, 8, 8, 1, 3, 0, 1, 0, 1, 1,
- 1, 2, 1, 1, 0, 1, 0, 1, 2};
+ 3, 1, 3, 1, 3, 1, 3, 1, 5, 1,
+ 5, 1, 3, 1, 3, 1, 1, 1, 1, 1,
+ 1, 1, 1, 1, 1, 1, 1, 1, 3, 0,
+ 1, 1, 3, 0, 1, 1, 1, 1, 1, 1,
+ 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
+ 3, 1, 2, 0, 1, 3, 3, 1, 1, 1,
+ 3, 1, 3, 2, 2, 2, 0, 1, 2, 0,
+ 1, 1, 2, 2, 7, 5, 7, 7, 5, 9,
+ 10, 7, 8, 2, 2, 3, 3, 2, 2, 3,
+ 3, 3, 3, 5, 5, 3, 5, 1, 2, 0,
+ 1, 4, 3, 3, 3, 3, 3, 3, 4, 5,
+ 2, 2, 2, 8, 8, 1, 3, 0, 1, 0,
+ 1, 1, 1, 2, 1, 1, 0, 1, 0, 1,
+ 2};
const int JavaScriptGrammar::action_default [] = {
- 8, 2, 0, 0, 4, 3, 0, 289, 0, 6,
- 7, 5, 20, 0, 9, 1, 0, 0, 14, 11,
- 0, 12, 10, 0, 18, 0, 119, 186, 150, 158,
- 154, 98, 170, 146, 19, 83, 99, 162, 166, 87,
- 116, 97, 102, 82, 136, 123, 0, 29, 30, 26,
- 285, 23, 287, 41, 0, 0, 0, 0, 0, 24,
- 27, 0, 0, 28, 22, 0, 25, 0, 0, 112,
- 0, 0, 99, 118, 101, 100, 0, 0, 0, 114,
- 115, 113, 117, 0, 147, 0, 0, 0, 0, 137,
- 0, 0, 0, 0, 0, 0, 127, 0, 0, 0,
- 121, 122, 120, 125, 129, 128, 126, 124, 139, 138,
- 140, 0, 155, 0, 151, 0, 0, 93, 92, 81,
- 49, 50, 51, 76, 52, 77, 53, 54, 55, 56,
- 57, 58, 59, 60, 80, 61, 62, 63, 64, 65,
- 78, 66, 67, 68, 69, 70, 71, 72, 73, 74,
- 75, 79, 0, 0, 91, 187, 94, 0, 95, 0,
- 96, 90, 17, 0, 183, 176, 174, 181, 182, 180,
- 179, 185, 178, 177, 175, 184, 171, 0, 159, 0,
- 0, 163, 0, 0, 167, 0, 0, 93, 85, 0,
- 84, 0, 89, 103, 0, 286, 276, 277, 0, 274,
- 0, 275, 0, 278, 194, 201, 200, 208, 196, 0,
- 197, 279, 0, 284, 198, 199, 204, 202, 281, 280,
- 283, 205, 0, 216, 0, 0, 0, 0, 285, 23,
- 0, 287, 188, 230, 0, 0, 0, 217, 0, 0,
- 206, 207, 0, 195, 203, 231, 232, 273, 282, 246,
- 0, 247, 248, 249, 242, 0, 243, 244, 245, 270,
- 271, 0, 0, 0, 0, 0, 235, 236, 192, 190,
- 152, 160, 156, 172, 148, 193, 0, 99, 164, 168,
- 141, 130, 0, 0, 149, 0, 0, 0, 0, 142,
- 0, 0, 0, 0, 0, 134, 132, 135, 133, 131,
- 144, 143, 145, 0, 157, 0, 153, 0, 191, 99,
- 0, 173, 188, 189, 0, 188, 0, 0, 238, 0,
- 0, 0, 240, 0, 161, 0, 0, 165, 0, 0,
- 169, 228, 0, 220, 229, 223, 0, 227, 0, 188,
- 221, 0, 188, 0, 0, 239, 0, 0, 0, 241,
- 286, 276, 0, 0, 278, 0, 272, 0, 262, 0,
- 0, 0, 234, 0, 233, 0, 288, 0, 48, 210,
- 213, 0, 49, 76, 52, 77, 54, 55, 26, 59,
- 60, 23, 61, 64, 24, 27, 188, 28, 67, 22,
- 69, 25, 71, 72, 73, 74, 75, 79, 0, 43,
- 0, 0, 45, 47, 35, 46, 0, 44, 34, 211,
- 209, 87, 88, 93, 0, 86, 0, 250, 251, 0,
- 0, 0, 253, 258, 256, 259, 0, 0, 257, 258,
- 0, 254, 0, 255, 212, 261, 0, 212, 260, 0,
- 263, 264, 0, 212, 265, 266, 0, 0, 267, 0,
- 0, 0, 268, 269, 105, 104, 0, 0, 0, 237,
- 0, 0, 0, 252, 225, 218, 0, 226, 222, 0,
- 224, 214, 0, 215, 219, 0, 42, 0, 39, 41,
- 32, 0, 38, 33, 40, 37, 31, 0, 36, 109,
- 107, 111, 108, 106, 110, 0, 0, 16, 23, 41,
- 13, 0, 15, 21};
+ 8, 2, 0, 0, 4, 3, 0, 291, 0, 6,
+ 7, 5, 22, 0, 9, 1, 0, 0, 16, 13,
+ 0, 14, 10, 0, 20, 0, 121, 188, 152, 160,
+ 156, 100, 172, 148, 21, 85, 101, 164, 168, 89,
+ 118, 99, 104, 84, 138, 125, 0, 31, 32, 28,
+ 287, 25, 289, 43, 0, 0, 0, 0, 0, 26,
+ 29, 0, 0, 30, 24, 0, 27, 0, 0, 114,
+ 0, 0, 101, 120, 103, 102, 0, 0, 0, 116,
+ 117, 115, 119, 0, 149, 0, 0, 0, 0, 139,
+ 0, 0, 0, 0, 0, 0, 129, 0, 0, 0,
+ 123, 124, 122, 127, 131, 130, 128, 126, 141, 140,
+ 142, 0, 157, 0, 153, 0, 0, 95, 94, 83,
+ 51, 52, 53, 78, 54, 79, 55, 56, 57, 58,
+ 59, 60, 61, 62, 82, 63, 64, 65, 66, 67,
+ 80, 68, 69, 70, 71, 72, 73, 74, 75, 76,
+ 77, 81, 0, 0, 93, 189, 96, 0, 97, 0,
+ 98, 92, 19, 0, 185, 178, 176, 183, 184, 182,
+ 181, 187, 180, 179, 177, 186, 173, 0, 161, 0,
+ 0, 165, 0, 0, 169, 0, 0, 95, 87, 0,
+ 86, 0, 91, 105, 0, 288, 278, 279, 0, 276,
+ 0, 277, 0, 280, 196, 203, 202, 210, 198, 0,
+ 199, 281, 0, 286, 200, 201, 206, 204, 283, 282,
+ 285, 207, 0, 218, 0, 0, 0, 0, 287, 25,
+ 0, 289, 190, 232, 0, 0, 0, 219, 0, 0,
+ 208, 209, 0, 197, 205, 233, 234, 275, 284, 248,
+ 0, 249, 250, 251, 244, 0, 245, 246, 247, 272,
+ 273, 0, 0, 0, 0, 0, 237, 238, 194, 192,
+ 154, 162, 158, 174, 150, 195, 0, 101, 166, 170,
+ 143, 132, 0, 0, 151, 0, 0, 0, 0, 144,
+ 0, 0, 0, 0, 0, 136, 134, 137, 135, 133,
+ 146, 145, 147, 0, 159, 0, 155, 0, 193, 101,
+ 0, 175, 190, 191, 0, 190, 0, 0, 240, 0,
+ 0, 0, 242, 0, 163, 0, 0, 167, 0, 0,
+ 171, 230, 0, 222, 231, 225, 0, 229, 0, 190,
+ 223, 0, 190, 0, 0, 241, 0, 0, 0, 243,
+ 288, 278, 0, 0, 280, 0, 274, 0, 264, 0,
+ 0, 0, 236, 0, 235, 0, 290, 0, 50, 212,
+ 215, 0, 51, 78, 54, 79, 56, 57, 28, 61,
+ 62, 25, 63, 66, 26, 29, 190, 30, 69, 24,
+ 71, 27, 73, 74, 75, 76, 77, 81, 0, 45,
+ 0, 0, 47, 49, 37, 48, 0, 46, 36, 213,
+ 211, 89, 90, 95, 0, 88, 0, 252, 253, 0,
+ 0, 0, 255, 260, 258, 261, 0, 0, 259, 260,
+ 0, 256, 0, 257, 214, 263, 0, 214, 262, 0,
+ 265, 266, 0, 214, 267, 268, 0, 0, 269, 0,
+ 0, 0, 270, 271, 107, 106, 0, 0, 0, 239,
+ 0, 0, 0, 254, 227, 220, 0, 228, 224, 0,
+ 226, 216, 0, 217, 221, 0, 44, 0, 41, 43,
+ 34, 0, 40, 35, 42, 39, 33, 0, 38, 111,
+ 109, 113, 110, 108, 112, 0, 0, 18, 25, 43,
+ 15, 0, 11, 0, 17, 12, 23};
const int JavaScriptGrammar::goto_default [] = {
- 2, 6, 15, 1, 5, 4, 14, 18, 16, 369,
- 209, 43, 477, 475, 367, 366, 27, 476, 365, 368,
- 118, 39, 35, 157, 41, 31, 156, 36, 42, 69,
- 40, 26, 45, 44, 280, 33, 274, 28, 270, 30,
- 272, 29, 271, 37, 278, 38, 279, 32, 273, 269,
- 310, 416, 275, 276, 204, 243, 208, 210, 214, 215,
- 206, 205, 217, 244, 216, 221, 240, 241, 207, 371,
- 370, 242, 466, 465, 332, 333, 468, 335, 467, 334,
- 422, 426, 429, 425, 424, 444, 445, 213, 198, 212,
- 194, 197, 211, 219, 218, 0};
+ 2, 6, 15, 1, 5, 4, 14, 501, 18, 16,
+ 369, 209, 43, 477, 475, 367, 366, 27, 476, 365,
+ 368, 118, 39, 35, 157, 41, 31, 156, 36, 42,
+ 69, 40, 26, 45, 44, 280, 33, 274, 28, 270,
+ 30, 272, 29, 271, 37, 278, 38, 279, 32, 273,
+ 269, 310, 416, 275, 276, 204, 243, 208, 210, 214,
+ 215, 206, 205, 217, 244, 216, 221, 240, 241, 207,
+ 371, 370, 242, 466, 465, 332, 333, 468, 335, 467,
+ 334, 422, 426, 429, 425, 424, 444, 445, 213, 198,
+ 212, 194, 197, 211, 219, 218, 0};
const int JavaScriptGrammar::action_index [] = {
- -4, -88, 42, -21, -88, -40, 116, -88, 112, -88,
- -88, -88, 16, 19, -88, 85, 102, 174, -88, -88,
- 173, -88, -88, 12, 27, 596, 78, -88, 34, -12,
- -20, 210, -88, 266, 100, -88, 411, 61, 70, 239,
- 169, -88, -88, -88, 333, 152, 596, -88, -88, -88,
- 29, -88, 1076, 21, 596, 596, 596, 443, 596, -88,
- -88, 596, 596, -88, -88, 596, -88, 596, 596, -88,
- 596, 596, 108, 204, -88, -88, 596, 596, 596, -88,
- -88, -88, 155, 596, 252, 596, 596, 596, 596, 343,
- 596, 596, 596, 596, 596, 596, 159, 596, 596, 596,
- 81, 106, 104, 302, 302, 167, 302, 302, 361, 323,
- 313, 596, 40, 596, 71, 992, 596, 596, -88, -88,
+ -12, -88, 80, 40, -88, 15, 70, -88, 107, -88,
+ -88, -88, 63, 38, -88, 122, 142, 214, -88, -88,
+ 160, -88, -88, 64, 88, 581, 73, -88, 9, -39,
+ -59, 193, -88, 254, 120, -88, 381, 1, 86, 227,
+ 197, -88, -88, -88, 307, 161, 581, -88, -88, -88,
+ 11, -88, 1061, 31, 581, 581, 581, 419, 581, -88,
+ -88, 581, 581, -88, -88, 581, -88, 581, 581, -88,
+ 581, 581, 79, 208, -88, -88, 581, 581, 581, -88,
+ -88, -88, 168, 581, 239, 581, 581, 581, 581, 327,
+ 581, 581, 581, 581, 581, 581, 278, 581, 581, 581,
+ 71, 72, 74, 278, 157, 158, 136, 278, 297, 317,
+ 287, 581, 16, 581, 77, 977, 581, 581, -88, -88,
-88, -88, -88, -88, -88, -88, -88, -88, -88, -88,
-88, -88, -88, -88, -88, -88, -88, -88, -88, -88,
-88, -88, -88, -88, -88, -88, -88, -88, -88, -88,
- -88, -88, 114, 596, -88, -88, 31, -32, -88, 596,
- -88, -88, -88, 596, -88, -88, -88, -88, -88, -88,
- -88, -88, -88, -88, -88, -88, -88, 596, 57, 596,
- 596, 166, 77, 596, -88, 992, 596, 596, -88, 120,
- -88, 35, -88, -88, 37, -88, 47, 66, 33, -88,
- 49, -88, 63, 1412, -88, -88, -88, -88, -88, 219,
- -88, -88, 60, -88, -88, -88, -88, -88, -88, 1412,
- -88, -88, 149, -88, 207, 79, 1244, 54, 51, 72,
- 41, 1496, 596, -88, 53, 596, 55, -88, 56, 58,
- -88, -88, 68, -88, -88, -88, -88, -88, -88, -88,
- 76, -88, -88, -88, -88, 73, -88, -88, -88, -88,
- -88, 52, 67, 596, 94, 86, -88, -88, 831, -88,
- 74, 38, 36, -88, 246, 75, 69, 486, 48, 110,
- 270, 195, -26, 596, 264, 596, 596, 596, 596, 367,
- 596, 596, 596, 596, 596, 196, 215, 222, 225, 218,
- 298, 291, 367, 596, -75, 596, -1, 596, -88, 369,
- 596, -88, 596, 5, -47, 596, -41, 1244, -88, 596,
- 157, 1244, -88, 596, -24, 596, 596, 18, 10, 596,
- -88, 1, 92, -15, -88, -88, 596, -88, -8, 596,
- -88, 30, 596, -37, 1244, -88, 596, 131, 1244, -88,
- -6, 4, -35, -7, 1412, -43, -88, 1244, -88, 596,
- 96, 1244, 6, 1244, -88, 8, 0, -53, -88, -88,
- 1244, -51, 137, -22, 153, 101, 596, 1244, 3, -25,
- 113, 2, -30, 519, 80, -2, 754, 20, -5, 46,
- 596, 50, 28, 596, 25, 596, 24, 23, 596, -88,
- 1160, 45, -88, -88, -88, -88, 596, -88, -88, -88,
- -88, 172, -88, 596, 11, -88, 97, -88, -88, 596,
- 144, 32, -88, 62, -88, 65, 88, 596, -88, 64,
- 59, -88, 13, -88, 1244, -88, 99, 1244, -88, 216,
- -88, -88, 105, 1244, 44, -88, 26, 22, -88, 9,
- -23, 7, -88, -88, -88, -88, 596, 91, 1244, -88,
- 596, 123, 1244, -88, 15, -88, 177, -88, -88, 596,
- -88, -88, 17, -88, -88, 119, 39, 908, -88, 43,
- -88, 673, -88, -88, -88, -88, -88, 111, -88, -88,
- -88, -88, -88, -88, -88, 1328, 14, -88, 103, 164,
- -88, 151, -88, -88,
+ -88, -88, 89, 581, -88, -88, 56, 67, -88, 581,
+ -88, -88, -88, 581, -88, -88, -88, -88, -88, -88,
+ -88, -88, -88, -88, -88, -88, -88, 581, 23, 581,
+ 581, 60, 75, 581, -88, 977, 581, 581, -88, 108,
+ -88, 34, -88, -88, 53, -88, 54, 78, 55, -88,
+ 62, -88, 57, 1229, -88, -88, -88, -88, -88, 185,
+ -88, -88, 26, -88, -88, -88, -88, -88, -88, 1229,
+ -88, -88, 171, -88, 173, 68, 1313, 52, 41, 59,
+ 36, 1481, 581, -88, 33, 581, 32, -88, 39, 48,
+ -88, -88, 50, -88, -88, -88, -88, -88, -88, -88,
+ 115, -88, -88, -88, -88, 111, -88, -88, -88, -88,
+ -88, 61, 65, 581, 102, 76, -88, -88, 735, -88,
+ 84, 4, -63, -88, 256, 7, -47, 504, 10, 94,
+ 343, 165, -18, 581, 237, 581, 581, 581, 581, 343,
+ 581, 581, 581, 581, 581, 211, 278, 278, 192, 199,
+ 255, 272, 343, 581, -60, 581, 22, 581, -88, 344,
+ 581, -88, 581, 13, -55, 581, -41, 1313, -88, 581,
+ 144, 1313, -88, 581, -44, 581, 581, 3, -5, 581,
+ -88, 51, 133, -30, -88, -88, 581, -88, -11, 581,
+ -88, -4, 581, -1, 1313, -88, 581, 98, 1313, -88,
+ -10, 18, -14, 21, 1229, 8, -88, 1313, -88, 581,
+ 99, 1313, 42, 1313, -88, 49, 45, 6, -88, -88,
+ 1313, 0, 149, 19, 152, 105, 581, 1313, 37, -3,
+ 97, 28, -2, 419, 25, 24, 893, 20, -6, 29,
+ 581, 35, 12, 581, 14, 581, 5, 2, 581, -88,
+ 1145, 30, -88, -88, -88, -88, 581, -88, -88, -88,
+ -88, 182, -88, 581, -31, -88, 81, -88, -88, 581,
+ 110, 27, -88, 134, -88, 46, 92, 581, -88, 44,
+ 43, -88, -27, -88, 1313, -88, 215, 1313, -88, 190,
+ -88, -88, 140, 1313, -20, -88, -29, -13, -88, -7,
+ -36, -8, -88, -88, -88, -88, 581, 90, 1313, -88,
+ 581, 96, 1313, -88, -9, -88, 179, -88, -88, 581,
+ -88, -88, 47, -88, -88, 123, 69, 812, -88, 66,
+ -88, 658, -88, -88, -88, -88, -88, 95, -88, -88,
+ -88, -88, -88, -88, -88, 1397, 58, -88, 101, 183,
+ -88, 109, -88, 91, -88, -88, -88,
- -96, -96, -96, -96, -96, 85, -96, -96, -96, -96,
- -96, -96, -96, -96, -96, 16, -96, 12, -96, -96,
- 22, -96, -96, -96, -96, 11, -96, -96, -96, -96,
- -96, -96, -96, -96, 26, -96, -19, -96, -96, -96,
- -96, -96, -96, -96, -96, -96, 139, -96, -96, -96,
- -96, -96, -96, -96, -1, 90, 86, 106, 113, -96,
- -96, 114, 110, -96, -96, 107, -96, 58, 104, -96,
- 102, 108, -96, -96, -96, -96, 99, 89, 118, -96,
- -96, -96, -96, 77, -96, 76, 140, 145, 121, -96,
- 119, 130, 131, 137, 93, 68, -96, 55, 62, 57,
- -96, -96, -96, -96, -96, -96, -96, -96, -96, -96,
- -96, 75, -96, 71, -96, 19, 33, 51, -96, -96,
- -96, -96, -96, -96, -96, -96, -96, -96, -96, -96,
- -96, -96, -96, -96, -96, -96, -96, -96, -96, -96,
- -96, -96, -96, -96, -96, -96, -96, -96, -96, -96,
- -96, -96, -96, 36, -96, -96, -96, -96, -96, 35,
- -96, -96, -96, 43, -96, -96, -96, -96, -96, -96,
- -96, -96, -96, -96, -96, -96, -96, 138, -96, 128,
- -3, -96, -96, 14, -96, 61, 13, 154, -96, -96,
- -96, -96, -96, -96, -96, -96, -96, -96, -96, -96,
- -96, -96, -96, 27, -96, -96, -96, -96, -96, -96,
- -96, -96, -96, -96, -96, -96, -96, -96, -96, 66,
- -96, -96, -96, -96, -96, -96, 23, -96, -96, -96,
- -96, -96, 10, -96, -96, 6, -42, -96, -96, -96,
- -96, -96, -96, -96, -96, -96, -96, -96, -96, -96,
- -96, -96, -96, -96, -96, -96, -96, -96, -96, -96,
- -96, -96, -96, 5, -96, -96, -96, -96, 117, -96,
- -96, -96, -96, -96, -96, -96, -96, -96, -96, -96,
- -96, -96, -96, 180, -96, 167, 176, 168, 188, -96,
- 41, 65, 67, 64, 74, -96, -96, -96, -96, -96,
- -96, -96, -96, 158, -96, 148, -96, 191, -96, -96,
- 157, -96, 59, -96, -96, 56, -96, 53, -96, 50,
- -96, 49, -96, 155, -96, 234, 187, -96, -96, 164,
- -96, -96, -96, -96, -96, -96, 177, -96, -26, 54,
- -96, -96, 60, -96, 32, -96, 30, -96, 37, -96,
- -96, -49, -96, -96, 63, -96, -96, 48, -96, 46,
- -96, 45, -96, 44, -96, -96, -96, -96, -96, -96,
- 52, -96, -96, -96, -96, -96, 132, 39, -96, -96,
- -96, -96, -96, 129, -96, -96, 40, -96, -96, -96,
- 34, -96, -12, 95, -96, 94, -96, -96, 31, -96,
- 47, -96, -96, -96, -96, -96, 29, -96, -96, -96,
- -96, -96, -96, 165, -96, -96, -96, -96, -96, 0,
- -96, -96, -96, -96, -96, -79, -96, -7, -96, -80,
- -96, -96, -96, -96, -61, -96, -96, -63, -96, -96,
- -96, -96, -96, -96, -57, -96, -96, -43, -96, -96,
- -96, -27, -96, -96, -96, -96, 25, -96, 28, -96,
- 24, -96, 17, -96, -96, -96, -96, -96, -96, 8,
- -96, -96, -55, -96, -96, -96, -96, 9, -96, 7,
- -96, 1, -96, -96, -96, -96, -96, -96, -96, -96,
- -96, -96, -96, -96, -96, -2, -96, -96, -5, 2,
- -96, -6, -96, -96};
+ -97, -97, -97, -97, -97, 29, -97, -97, -97, -97,
+ -97, -97, -97, -97, -97, 11, -97, 27, -97, -97,
+ 40, -97, -97, -97, -97, 33, -97, -97, -97, -97,
+ -97, -97, -97, -97, 47, -97, -43, -97, -97, -97,
+ -97, -97, -97, -97, -97, -97, 64, -97, -97, -97,
+ -97, -97, -97, -97, 17, 114, 123, 121, 122, -97,
+ -97, 110, 106, -97, -97, 98, -97, 103, 126, -97,
+ 101, 214, -97, -97, -97, -97, 130, 138, 127, -97,
+ -97, -97, -97, 131, -97, 107, 137, 141, 87, -97,
+ 55, 70, 73, 72, 69, 94, -97, 58, 63, 61,
+ -97, -97, -97, -97, -97, -97, -97, -97, -97, -97,
+ -97, 145, -97, 82, -97, -18, 39, 41, -97, -97,
+ -97, -97, -97, -97, -97, -97, -97, -97, -97, -97,
+ -97, -97, -97, -97, -97, -97, -97, -97, -97, -97,
+ -97, -97, -97, -97, -97, -97, -97, -97, -97, -97,
+ -97, -97, -97, 49, -97, -97, -97, -97, -97, 42,
+ -97, -97, -97, 35, -97, -97, -97, -97, -97, -97,
+ -97, -97, -97, -97, -97, -97, -97, 97, -97, 34,
+ 4, -97, -97, 8, -97, 51, -1, 50, -97, -97,
+ -97, -97, -97, -97, -97, -97, -97, -97, -97, -97,
+ -97, -97, -97, 21, -97, -97, -97, -97, -97, -97,
+ -97, -97, -97, -97, -97, -97, -97, -97, -97, 53,
+ -97, -97, -97, -97, -97, -97, 12, -97, -97, -97,
+ -97, -97, -2, -97, -97, 36, -16, -97, -97, -97,
+ -97, -97, -97, -97, -97, -97, -97, -97, -97, -97,
+ -97, -97, -97, -97, -97, -97, -97, -97, -97, -97,
+ -97, -97, -97, 76, -97, -97, -97, -97, 52, -97,
+ -97, -97, -97, -97, -97, -97, -97, -97, -97, -97,
+ -97, -97, -97, 180, -97, 183, 168, 169, 172, -97,
+ 90, 91, 83, 80, 79, -97, -97, -97, -97, -97,
+ -97, -97, -97, 146, -97, 160, -97, 144, -97, -97,
+ 181, -97, 62, -97, -97, 65, -97, 13, -97, 15,
+ -97, -7, -97, 148, -97, 150, 156, -97, -97, 182,
+ -97, -97, -97, -97, -97, -97, 191, -97, -44, 57,
+ -97, -97, 93, -97, 38, -97, 46, -97, -3, -97,
+ -97, -40, -97, -97, 59, -97, -97, 10, -97, 3,
+ -97, -9, -97, -10, -97, -97, -97, -97, -97, -97,
+ 23, -97, -97, -97, -97, -97, 54, 31, -97, -97,
+ -97, -97, -97, 74, -97, -97, 24, -97, -97, -97,
+ 26, -97, 5, 133, -97, 134, -97, -97, 48, -97,
+ 32, -97, -97, -97, -97, -97, 37, -97, -97, -97,
+ -97, -97, -97, 113, -97, -97, -97, -97, -97, -5,
+ -97, -97, -97, -97, -97, -81, -97, 7, -97, -63,
+ -97, -97, -97, -97, -46, -97, -97, -54, -97, -97,
+ -97, -97, -97, -97, -42, -97, -97, -28, -97, -97,
+ -97, -50, -97, -97, -97, -97, 2, -97, 1, -97,
+ 45, -97, 43, -97, -97, -97, -97, -97, -97, 19,
+ -97, -97, -34, -97, -97, -97, -97, 25, -97, 30,
+ -97, 44, -97, -97, -97, -97, -97, -97, -97, -97,
+ -97, -97, -97, -97, -97, 28, -97, -97, 22, 6,
+ -97, -97, -97, 9, -97, -97, -97};
const int JavaScriptGrammar::action_info [] = {
- 283, 305, 408, 331, 410, -47, 359, -216, 400, -45,
- -57, 268, 356, 153, 315, 398, 346, 329, 336, 317,
- 323, 331, 363, 344, 303, 353, 354, -46, 161, 478,
- 351, 419, 469, 199, 25, 83, 111, 451, 450, 159,
- 443, 24, 7, 503, 8, 3, 464, 484, 23, 17,
- 323, 478, 406, -68, -217, 443, 113, -70, 195, 460,
- 456, 443, 449, 177, 447, 423, 434, 427, 433, 427,
- 427, 415, 83, 196, 200, 283, 199, 359, 201, 357,
- 350, 3, 0, 307, 183, 0, 303, -65, 443, 419,
- 268, 342, 456, 202, 460, 192, 203, 464, 430, 153,
- 338, 0, 153, 263, 153, 111, 437, 153, 153, 495,
- 357, 446, 305, 0, 12, 247, 113, 496, 70, 153,
- 179, 70, 153, 0, 180, 447, 262, 479, 153, 71,
- 312, 153, 71, 17, 258, 257, 17, 253, 252, 153,
- 260, 259, 195, 431, 70, 12, 70, 267, 266, -285,
- 74, 458, 153, 339, 265, 71, 361, 71, 418, 417,
- 325, 75, 260, 259, 326, 153, 250, 76, 177, 13,
- 154, 488, 478, 10, 9, 480, 190, 97, 250, 98,
- 12, 76, 255, 462, 97, 472, 98, 185, 0, 0,
- 99, 348, 97, 12, 98, 0, 0, 99, 251, 249,
- 13, 0, 12, 12, 421, 99, 186, 502, 413, 0,
- 251, 249, 77, 0, 256, 254, 76, 321, 78, 0,
- 97, 97, 98, 98, 153, 115, 77, 153, 21, 19,
- 0, 0, 78, 99, 99, 13, 255, 0, 473, 471,
- 97, 0, 98, 97, 116, 98, 117, 97, 13, 98,
- 97, 0, 98, 99, 185, 0, 99, 13, 13, 0,
- 99, 77, 0, 99, 285, 286, 0, 78, 256, 254,
- 85, 86, 0, 186, 0, 187, 0, 441, 440, 0,
- 246, 245, 285, 286, 85, 86, 0, 0, 0, 0,
- 0, 287, 288, 290, 291, 0, 0, 87, 88, 0,
- 0, 0, 292, 0, 0, 293, 0, 294, 0, 287,
- 288, 87, 88, 0, 290, 291, 0, 0, 0, 0,
- 0, 290, 291, 292, 0, 0, 293, 97, 294, 98,
- 292, 0, 0, 293, 0, 294, 90, 91, 0, 0,
- 99, 0, 0, 0, 92, 93, 90, 91, 94, 0,
- 95, 0, 0, 0, 92, 93, 90, 91, 94, 0,
- 95, 0, 0, 0, 92, 93, 90, 91, 94, 0,
- 95, 0, 164, 0, 92, 93, 0, 0, 94, 0,
- 95, 0, 165, 0, 90, 91, 166, 0, 0, 0,
- 290, 291, 92, 93, 0, 167, 94, 168, 95, 292,
- 0, 0, 293, 0, 294, 0, 0, 0, 169, 0,
- 170, 74, 0, 0, 164, 0, 0, 0, 171, 0,
- 0, 172, 75, 0, 165, 0, 0, 173, 166, 0,
- 0, 0, 0, 174, 0, 0, 0, 167, 0, 168,
- 0, 0, 0, 0, 0, 0, 175, 0, 0, 0,
- 169, 0, 170, 74, 0, 47, 48, 0, 0, 0,
- 171, 0, 0, 172, 75, 50, 0, 0, 0, 173,
- 0, 0, 51, 0, 0, 174, 52, 53, 0, 54,
- 0, 0, 0, 0, 0, 0, 57, 0, 175, 164,
- 60, 0, 0, 0, 0, 0, 0, 0, 0, 165,
- 0, 0, 0, 166, 0, 0, 0, 0, 63, 0,
- 64, 0, 167, 0, 168, 0, 0, 319, 0, 0,
- 0, 59, 66, 49, 0, 169, 0, 170, 74, 0,
- 0, 47, 48, 0, 0, 171, 0, 0, 172, 75,
- 0, 50, 0, 0, 173, 0, 0, 0, 51, 0,
- 174, 0, 52, 53, 0, 54, 0, 0, 0, 0,
- 0, 0, 57, 175, 0, 0, 60, 0, 0, 0,
+ 447, 346, 329, 177, 303, 323, 315, 449, 469, 111,
+ 83, 331, 323, 305, 312, 307, 305, 113, 331, 317,
+ 443, 153, 450, 283, 451, 443, 351, -48, 433, 415,
+ 419, -49, -67, 268, 359, -47, -70, 406, 460, 478,
+ 195, 456, -72, -219, -59, 443, 353, 199, -218, 427,
+ 434, 427, 303, 400, 354, 410, 398, 342, 363, 344,
+ 423, 408, 177, 356, 159, 443, 357, 23, 336, 419,
+ 350, 111, 359, 3, 478, 456, 464, 484, 83, 464,
+ 7, 247, 183, 199, 460, 283, 200, 506, 268, 196,
+ 203, 201, 113, 24, 192, 25, 17, 153, 153, 12,
+ 3, 263, 430, 153, 153, 8, 153, 153, 357, 0,
+ 153, 70, 70, 70, 70, 202, 153, 503, 153, 0,
+ 12, 74, 71, 71, 71, 71, 195, 161, 153, 260,
+ 259, 479, 75, -287, 17, 262, 179, 267, 266, 427,
+ 180, 338, 418, 417, 325, 154, 446, 431, 326, 495,
+ 458, 12, 153, 17, 13, 488, 462, 496, 348, 361,
+ 447, 97, 265, 98, 190, 504, 260, 259, 10, 9,
+ 421, 0, 258, 257, 99, 13, 253, 252, 250, 480,
+ 76, 255, 97, 97, 98, 98, 97, 472, 98, 12,
+ 97, 478, 98, 153, 339, 99, 99, 185, 153, 99,
+ 250, 0, 255, 99, 321, 0, 13, 0, 115, 76,
+ 251, 249, 12, 256, 254, 21, 186, 97, 413, 98,
+ 76, 0, 437, 153, 97, 77, 98, 116, 0, 117,
+ 99, 78, 251, 249, 256, 254, 97, 99, 98, 0,
+ 473, 471, 185, 12, 13, 0, 246, 245, 0, 99,
+ 0, 441, 440, 0, 77, 285, 286, 85, 86, 0,
+ 78, 186, 0, 187, 0, 77, 0, 13, 0, 19,
+ 0, 78, 85, 86, 285, 286, 0, 0, 290, 291,
+ 0, 0, 287, 288, 87, 88, 0, 292, 0, 0,
+ 293, 0, 294, 0, 0, 290, 291, 0, 13, 87,
+ 88, 287, 288, 97, 292, 98, 0, 293, 0, 294,
+ 90, 91, 0, 0, 0, 0, 99, 0, 92, 93,
+ 90, 91, 94, 0, 95, 0, 0, 0, 92, 93,
+ 90, 91, 94, 0, 95, 0, 0, 0, 92, 93,
+ 90, 91, 94, 0, 95, 0, 0, 164, 92, 93,
+ 90, 91, 94, 0, 95, 0, 0, 165, 92, 93,
+ 0, 166, 94, 0, 95, 0, 290, 291, 0, 0,
+ 167, 0, 168, 0, 0, 292, 0, 0, 293, 0,
+ 294, 0, 0, 169, 164, 170, 74, 0, 0, 0,
+ 0, 0, 0, 171, 165, 0, 172, 75, 166, 0,
+ 0, 0, 173, 0, 0, 0, 0, 167, 174, 168,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 169, 175, 170, 74, 0, 0, 0, 0, 0, 0,
+ 171, 47, 48, 172, 75, 0, 0, 0, 0, 173,
+ 0, 50, 0, 0, 0, 174, 0, 0, 51, 0,
+ 0, 0, 52, 53, 0, 54, 0, 0, 175, 0,
+ 0, 0, 57, 0, 0, 0, 60, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 63, 0, 64, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 59, 66, 49,
- 0, 0, 0, 0, 0, 0, 0, 46, 47, 48,
- 0, 0, 0, 0, 0, 0, 0, 0, 50, 0,
- 0, 0, 0, 0, 0, 51, 0, 0, 0, 52,
- 53, 0, 54, 0, 0, 0, 55, 0, 56, 57,
- 58, 0, 0, 60, 0, 0, 0, 61, 0, 62,
+ 0, 0, 0, 0, 0, 0, 0, 164, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 165, 0, 0,
+ 0, 166, 0, 0, 0, 0, 0, 0, 0, 0,
+ 167, 0, 168, 0, 0, 319, 0, 0, 0, 0,
+ 0, 0, 0, 169, 0, 170, 74, 0, 0, 0,
+ 0, 0, 0, 171, 0, 0, 172, 75, 0, 0,
+ 0, 0, 173, 0, 0, 0, 0, 0, 174, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 63, 0, 64, 0, 65, 0, 67, 0, 68,
- 0, 0, 0, 0, 59, 66, 49, 0, 0, 0,
- 0, 0, 0, 0, 46, 47, 48, 0, 0, 0,
- 0, 0, 0, 0, 0, 50, 0, 0, 0, 0,
- 0, 0, 51, 0, 0, 0, 52, 53, 0, 54,
- 0, 0, 0, 55, 0, 56, 57, 58, 0, 0,
- 60, 0, 0, 0, 61, 0, 62, 0, 0, 483,
- 0, 0, 0, 0, 0, 0, 0, 0, 63, 0,
- 64, 0, 65, 0, 67, 0, 68, 0, 0, 0,
- 0, 59, 66, 49, 0, 0, 0, 0, 0, 0,
- 0, -66, 0, 0, 0, 46, 47, 48, 0, 0,
- 0, 0, 0, 0, 0, 0, 50, 0, 0, 0,
- 0, 0, 0, 51, 0, 0, 0, 52, 53, 0,
- 54, 0, 0, 0, 55, 0, 56, 57, 58, 0,
- 0, 60, 0, 0, 0, 61, 0, 62, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 63,
- 0, 64, 0, 65, 0, 67, 0, 68, 0, 0,
- 0, 0, 59, 66, 49, 0, 0, 0, 0, 0,
+ 0, 175, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 46, 47, 48, 0, 0, 0, 0, 0,
0, 0, 0, 50, 0, 0, 0, 0, 0, 0,
51, 0, 0, 0, 52, 53, 0, 54, 0, 0,
0, 55, 0, 56, 57, 58, 0, 0, 60, 0,
0, 0, 61, 0, 62, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 63, 0, 64, 0,
- 65, 0, 67, 282, 68, 0, 0, 0, 0, 59,
+ 65, 0, 67, 0, 68, 0, 0, 0, 0, 59,
66, 49, 0, 0, 0, 0, 0, 0, 0, 46,
47, 48, 0, 0, 0, 0, 0, 0, 0, 0,
50, 0, 0, 0, 0, 0, 0, 51, 0, 0,
0, 52, 53, 0, 54, 0, 0, 0, 55, 0,
56, 57, 58, 0, 0, 60, 0, 0, 0, 61,
- 0, 62, 0, 0, 486, 0, 0, 0, 0, 0,
+ 0, 62, 0, 0, 483, 0, 0, 0, 0, 0,
0, 0, 0, 63, 0, 64, 0, 65, 0, 67,
0, 68, 0, 0, 0, 0, 59, 66, 49, 0,
- 0, 0, 0, 0, 0, 0, 120, 121, 122, 0,
- 0, 124, 126, 127, 0, 0, 128, 0, 129, 0,
- 0, 0, 131, 132, 133, 0, 0, 0, 0, 0,
- 0, 134, 135, 136, 137, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 138, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 46, 47, 48, 0,
+ 0, 0, 0, 0, 0, 0, 0, 50, 0, 0,
+ 0, 0, 0, 0, 51, 0, 0, 0, 52, 53,
+ 0, 54, 0, 0, 0, 55, 0, 56, 57, 58,
+ 0, 0, 60, 0, 0, 0, 61, 0, 62, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 141, 0, 0, 0, 0, 0, 0, 142, 143,
- 144, 0, 146, 147, 148, 149, 150, 151, 0, 0,
- 139, 145, 130, 123, 125, 140, 0, 0, 0, 0,
- 120, 121, 122, 0, 0, 124, 126, 127, 0, 0,
- 128, 0, 129, 0, 0, 0, 131, 132, 133, 0,
- 0, 0, 0, 0, 0, 402, 135, 136, 137, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 138,
- 0, 0, 0, 403, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 141, 0, 0, 0, 0,
- 0, 405, 142, 143, 144, 0, 146, 147, 148, 149,
- 150, 151, 0, 0, 139, 145, 130, 123, 125, 140,
- 0, 0, 0, 0, 120, 121, 122, 0, 0, 124,
- 126, 127, 0, 0, 128, 0, 129, 0, 0, 0,
- 131, 132, 133, 0, 0, 0, 0, 0, 0, 402,
- 135, 136, 137, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 138, 0, 0, 0, 403, 0, 0,
- 0, 0, 0, 0, 0, 404, 0, 0, 0, 141,
- 0, 0, 0, 0, 0, 405, 142, 143, 144, 0,
- 146, 147, 148, 149, 150, 151, 0, 0, 139, 145,
- 130, 123, 125, 140, 0, 0, 0, 0, 222, 0,
- 0, 0, 0, 224, 0, 46, 47, 48, 226, 0,
- 0, 0, 0, 0, 0, 227, 50, 0, 0, 0,
- 0, 0, 0, 229, 230, 0, 0, 231, 53, 0,
- 54, 0, 0, 0, 55, 0, 56, 57, 58, 0,
- 0, 60, 0, 0, 0, 61, 0, 62, 0, 0,
- 0, 0, 0, 232, 0, 233, 0, 0, 0, 63,
- 234, 64, 235, 65, 236, 67, 237, 68, 238, 239,
- 0, 0, 59, 66, 49, 223, 225, 0, 0, 0,
- 0, 0, 222, 0, 0, 0, 0, 224, 0, 46,
- 47, 48, 226, 0, 0, 0, 0, 0, 0, 227,
- 50, 0, 0, 0, 0, 0, 0, 498, 230, 0,
- 0, 231, 499, 0, 54, 0, 0, 0, 55, 0,
- 56, 57, 58, 0, 0, 60, 0, 0, 0, 61,
- 0, 62, 0, 0, 0, 0, 0, 232, 0, 233,
- 0, 0, 0, 63, 234, 64, 235, 65, 236, 67,
- 237, 68, 238, 239, 0, 0, 59, 66, 49, 223,
- 225, 0, 0, 0, 0, 0, 222, 0, 0, 0,
- 0, 224, 0, 46, 47, 48, 226, 0, 0, 0,
- 0, 0, 0, 227, 228, 0, 0, 0, 0, 0,
- 0, 229, 230, 0, 0, 231, 53, 0, 54, 0,
+ 63, 0, 64, 0, 65, 0, 67, 282, 68, 0,
+ 0, 0, 0, 59, 66, 49, 0, 0, 0, 0,
+ 0, 0, 0, 46, 47, 48, 0, 0, 0, 0,
+ 0, 0, 0, 0, 50, 0, 0, 0, 0, 0,
+ 0, 51, 0, 0, 0, 52, 53, 0, 54, 0,
0, 0, 55, 0, 56, 57, 58, 0, 0, 60,
- 0, 0, 0, 61, 0, 62, 0, 0, 0, 0,
- 0, 232, 0, 233, 0, 0, 0, 63, 234, 64,
- 235, 65, 236, 67, 237, 68, 238, 239, 0, 0,
- 59, 66, 49, 223, 225, 0, 0, 0, 0, 0,
- 372, 121, 122, 0, 0, 374, 126, 376, 47, 48,
- 377, 0, 129, 0, 0, 0, 131, 379, 380, 0,
- 0, 0, 0, 0, 0, 381, 382, 136, 137, 231,
- 53, 0, 54, 0, 0, 0, 55, 0, 56, 383,
- 58, 0, 0, 385, 0, 0, 0, 61, 0, 62,
- 0, -212, 0, 0, 0, 386, 0, 233, 0, 0,
- 0, 387, 388, 389, 390, 65, 392, 393, 394, 395,
- 396, 397, 0, 0, 384, 391, 378, 373, 375, 140,
- 0, 0, 0, 0,
+ 0, 0, 0, 61, 0, 62, 0, 0, 486, 0,
+ 0, 0, 0, 0, 0, 0, 0, 63, 0, 64,
+ 0, 65, 0, 67, 0, 68, 0, 0, 0, 0,
+ 59, 66, 49, 0, 0, 0, 0, 0, 0, 0,
+ -68, 0, 0, 0, 46, 47, 48, 0, 0, 0,
+ 0, 0, 0, 0, 0, 50, 0, 0, 0, 0,
+ 0, 0, 51, 0, 0, 0, 52, 53, 0, 54,
+ 0, 0, 0, 55, 0, 56, 57, 58, 0, 0,
+ 60, 0, 0, 0, 61, 0, 62, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 63, 0,
+ 64, 0, 65, 0, 67, 0, 68, 0, 0, 0,
+ 0, 59, 66, 49, 0, 0, 0, 0, 0, 0,
+ 0, 120, 121, 122, 0, 0, 124, 126, 127, 0,
+ 0, 128, 0, 129, 0, 0, 0, 131, 132, 133,
+ 0, 0, 0, 0, 0, 0, 134, 135, 136, 137,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 138, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 141, 0, 0, 0,
+ 0, 0, 0, 142, 143, 144, 0, 146, 147, 148,
+ 149, 150, 151, 0, 0, 139, 145, 130, 123, 125,
+ 140, 0, 0, 0, 0, 120, 121, 122, 0, 0,
+ 124, 126, 127, 0, 0, 128, 0, 129, 0, 0,
+ 0, 131, 132, 133, 0, 0, 0, 0, 0, 0,
+ 402, 135, 136, 137, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 138, 0, 0, 0, 403, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 141, 0, 0, 0, 0, 0, 405, 142, 143, 144,
+ 0, 146, 147, 148, 149, 150, 151, 0, 0, 139,
+ 145, 130, 123, 125, 140, 0, 0, 0, 0, 120,
+ 121, 122, 0, 0, 124, 126, 127, 0, 0, 128,
+ 0, 129, 0, 0, 0, 131, 132, 133, 0, 0,
+ 0, 0, 0, 0, 402, 135, 136, 137, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 138, 0,
+ 0, 0, 403, 0, 0, 0, 0, 0, 0, 0,
+ 404, 0, 0, 0, 141, 0, 0, 0, 0, 0,
+ 405, 142, 143, 144, 0, 146, 147, 148, 149, 150,
+ 151, 0, 0, 139, 145, 130, 123, 125, 140, 0,
+ 0, 0, 0, 222, 0, 0, 0, 0, 224, 0,
+ 46, 47, 48, 226, 0, 0, 0, 0, 0, 0,
+ 227, 228, 0, 0, 0, 0, 0, 0, 229, 230,
+ 0, 0, 231, 53, 0, 54, 0, 0, 0, 55,
+ 0, 56, 57, 58, 0, 0, 60, 0, 0, 0,
+ 61, 0, 62, 0, 0, 0, 0, 0, 232, 0,
+ 233, 0, 0, 0, 63, 234, 64, 235, 65, 236,
+ 67, 237, 68, 238, 239, 0, 0, 59, 66, 49,
+ 223, 225, 0, 0, 0, 0, 0, 222, 0, 0,
+ 0, 0, 224, 0, 46, 47, 48, 226, 0, 0,
+ 0, 0, 0, 0, 227, 50, 0, 0, 0, 0,
+ 0, 0, 229, 230, 0, 0, 231, 53, 0, 54,
+ 0, 0, 0, 55, 0, 56, 57, 58, 0, 0,
+ 60, 0, 0, 0, 61, 0, 62, 0, 0, 0,
+ 0, 0, 232, 0, 233, 0, 0, 0, 63, 234,
+ 64, 235, 65, 236, 67, 237, 68, 238, 239, 0,
+ 0, 59, 66, 49, 223, 225, 0, 0, 0, 0,
+ 0, 222, 0, 0, 0, 0, 224, 0, 46, 47,
+ 48, 226, 0, 0, 0, 0, 0, 0, 227, 50,
+ 0, 0, 0, 0, 0, 0, 498, 230, 0, 0,
+ 231, 499, 0, 54, 0, 0, 0, 55, 0, 56,
+ 57, 58, 0, 0, 60, 0, 0, 0, 61, 0,
+ 62, 0, 0, 0, 0, 0, 232, 0, 233, 0,
+ 0, 0, 63, 234, 64, 235, 65, 236, 67, 237,
+ 68, 238, 239, 0, 0, 59, 66, 49, 223, 225,
+ 0, 0, 0, 0, 0, 372, 121, 122, 0, 0,
+ 374, 126, 376, 47, 48, 377, 0, 129, 0, 0,
+ 0, 131, 379, 380, 0, 0, 0, 0, 0, 0,
+ 381, 382, 136, 137, 231, 53, 0, 54, 0, 0,
+ 0, 55, 0, 56, 383, 58, 0, 0, 385, 0,
+ 0, 0, 61, 0, 62, 0, -214, 0, 0, 0,
+ 386, 0, 233, 0, 0, 0, 387, 388, 389, 390,
+ 65, 392, 393, 394, 395, 396, 397, 0, 0, 384,
+ 391, 378, 373, 375, 140, 0, 0, 0, 0,
- 22, 432, 500, 436, 501, 428, 438, 497, 435, 487,
- 420, 453, 442, 182, 20, 264, 439, 482, 474, 481,
- 313, 34, 22, 189, 470, 485, 463, 452, 22, 448,
- 184, 163, 261, 162, 461, 457, 220, 459, 119, 352,
- 347, 345, 442, 152, 439, 407, 349, 399, 261, 340,
- 313, 160, 155, 364, 362, 0, 360, 358, 322, 176,
- 320, 409, 318, 0, 313, 401, 313, 158, 72, 313,
- 313, 0, 220, 295, 0, 220, 0, 0, 0, 0,
- 119, 188, 72, 0, 72, 72, 100, 454, 102, 72,
- 11, 72, 72, 101, 72, 72, 298, 296, 72, 297,
- 107, 72, 72, 72, 72, 341, 299, 316, 114, 89,
- 314, 343, 84, 72, 112, 490, 72, 72, 80, 489,
- 72, 72, 72, 455, 454, 106, 72, 411, 79, 72,
- 412, 72, 73, 455, 72, 72, 494, 72, 82, 493,
- 72, 72, 491, 492, 277, 72, 72, 81, 72, 281,
- 411, 96, 355, 412, 110, 72, 0, 72, 72, 72,
- 248, 193, 103, 104, 72, 72, 72, 72, 193, 105,
- 158, 181, 72, 108, 0, 72, 0, 191, 109, 178,
- 281, 158, 72, 0, 309, 72, 306, 281, 414, 281,
- 281, 309, 0, 0, 72, 72, 281, 324, 304, 281,
- 281, 289, 301, 72, 309, 0, 311, 72, 281, 281,
- 300, 0, 281, 330, 309, 72, 284, 0, 309, 281,
- 281, 0, 302, 281, 0, 0, 337, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 328, 0, 0, 0,
- 308, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 364, 362, 119, 322, 428, 452, 420, 349, 163, 313,
+ 189, 459, 502, 457, 360, 505, 438, 22, 436, 432,
+ 358, 182, 261, 318, 435, 184, 320, 453, 487, 20,
+ 500, 220, 340, 409, 11, 313, 470, 439, 497, 442,
+ 474, 261, 485, 481, 34, 448, 22, 439, 345, 352,
+ 152, 401, 176, 463, 407, 162, 461, 347, 158, 160,
+ 442, 482, 72, 220, 0, 399, 155, 158, 313, 220,
+ 0, 119, 188, 313, 191, 0, 313, 0, 181, 0,
+ 277, 0, 72, 72, 193, 281, 72, 264, 96, 72,
+ 100, 72, 72, 102, 193, 101, 411, 72, 72, 412,
+ 72, 72, 106, 103, 313, 105, 104, 72, 72, 341,
+ 72, 72, 299, 298, 314, 72, 297, 316, 72, 72,
+ 114, 110, 72, 295, 296, 72, 72, 107, 494, 72,
+ 158, 72, 73, 454, 72, 72, 493, 414, 72, 178,
+ 492, 89, 72, 411, 489, 343, 412, 0, 248, 355,
+ 72, 72, 491, 490, 72, 72, 455, 81, 72, 72,
+ 79, 72, 72, 454, 455, 72, 72, 84, 80, 72,
+ 0, 108, 309, 72, 72, 109, 72, 281, 72, 281,
+ 0, 281, 0, 281, 309, 112, 0, 304, 72, 281,
+ 0, 324, 0, 281, 308, 327, 72, 72, 0, 306,
+ 72, 281, 281, 300, 301, 281, 328, 302, 72, 309,
+ 309, 72, 0, 281, 281, 281, 281, 284, 289, 309,
+ 0, 0, 0, 0, 281, 0, 0, 0, 0, 0,
+ 0, 311, 330, 0, 0, 0, 0, 0, 0, 0,
+ 0, 337, 72, 0, 0, 82, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 72, 0, 0, 0, 0, 281, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 327, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0};
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0};
const int JavaScriptGrammar::action_check [] = {
- 1, 76, 55, 29, 55, 7, 36, 29, 8, 7,
- 7, 36, 55, 8, 61, 7, 31, 7, 17, 60,
- 2, 29, 16, 60, 48, 60, 33, 7, 60, 8,
- 36, 36, 17, 29, 7, 1, 48, 60, 29, 8,
- 33, 29, 0, 29, 65, 85, 29, 8, 29, 33,
- 2, 8, 7, 7, 29, 33, 76, 7, 29, 36,
- 36, 33, 36, 2, 20, 33, 7, 5, 55, 5,
- 5, 60, 1, 36, 8, 1, 29, 36, 29, 7,
- 29, 85, -1, 8, 7, -1, 48, 7, 33, 36,
- 36, 61, 36, 60, 36, 60, 33, 29, 10, 8,
- 8, -1, 8, 36, 8, 48, 7, 8, 8, 7,
- 7, 6, 76, -1, 29, 55, 76, 15, 40, 8,
- 50, 40, 8, -1, 54, 20, 74, 8, 8, 51,
- 61, 8, 51, 33, 61, 62, 33, 61, 62, 8,
- 61, 62, 29, 55, 40, 29, 40, 61, 62, 36,
- 42, 60, 8, 61, 60, 51, 60, 51, 61, 62,
- 50, 53, 61, 62, 54, 8, 29, 12, 2, 84,
- 56, 60, 8, 61, 62, 56, 56, 25, 29, 27,
- 29, 12, 29, 60, 25, 8, 27, 15, -1, -1,
- 38, 60, 25, 29, 27, -1, -1, 38, 61, 62,
- 84, -1, 29, 29, 60, 38, 34, 56, 36, -1,
- 61, 62, 57, -1, 61, 62, 12, 60, 63, -1,
- 25, 25, 27, 27, 8, 15, 57, 8, 55, 55,
- -1, -1, 63, 38, 38, 84, 29, -1, 61, 62,
- 25, -1, 27, 25, 34, 27, 36, 25, 84, 27,
- 25, -1, 27, 38, 15, -1, 38, 84, 84, -1,
- 38, 57, -1, 38, 18, 19, -1, 63, 61, 62,
- 18, 19, -1, 34, -1, 36, -1, 61, 62, -1,
- 61, 62, 18, 19, 18, 19, -1, -1, -1, -1,
- -1, 45, 46, 23, 24, -1, -1, 45, 46, -1,
- -1, -1, 32, -1, -1, 35, -1, 37, -1, 45,
- 46, 45, 46, -1, 23, 24, -1, -1, -1, -1,
- -1, 23, 24, 32, -1, -1, 35, 25, 37, 27,
- 32, -1, -1, 35, -1, 37, 23, 24, -1, -1,
- 38, -1, -1, -1, 31, 32, 23, 24, 35, -1,
- 37, -1, -1, -1, 31, 32, 23, 24, 35, -1,
- 37, -1, -1, -1, 31, 32, 23, 24, 35, -1,
- 37, -1, 3, -1, 31, 32, -1, -1, 35, -1,
- 37, -1, 13, -1, 23, 24, 17, -1, -1, -1,
- 23, 24, 31, 32, -1, 26, 35, 28, 37, 32,
- -1, -1, 35, -1, 37, -1, -1, -1, 39, -1,
- 41, 42, -1, -1, 3, -1, -1, -1, 49, -1,
- -1, 52, 53, -1, 13, -1, -1, 58, 17, -1,
- -1, -1, -1, 64, -1, -1, -1, 26, -1, 28,
- -1, -1, -1, -1, -1, -1, 77, -1, -1, -1,
- 39, -1, 41, 42, -1, 12, 13, -1, -1, -1,
- 49, -1, -1, 52, 53, 22, -1, -1, -1, 58,
- -1, -1, 29, -1, -1, 64, 33, 34, -1, 36,
- -1, -1, -1, -1, -1, -1, 43, -1, 77, 3,
- 47, -1, -1, -1, -1, -1, -1, -1, -1, 13,
- -1, -1, -1, 17, -1, -1, -1, -1, 65, -1,
- 67, -1, 26, -1, 28, -1, -1, 31, -1, -1,
- -1, 78, 79, 80, -1, 39, -1, 41, 42, -1,
- -1, 12, 13, -1, -1, 49, -1, -1, 52, 53,
- -1, 22, -1, -1, 58, -1, -1, -1, 29, -1,
- 64, -1, 33, 34, -1, 36, -1, -1, -1, -1,
- -1, -1, 43, 77, -1, -1, 47, -1, -1, -1,
+ 20, 31, 7, 2, 48, 2, 61, 36, 17, 48,
+ 1, 29, 2, 76, 61, 8, 76, 76, 29, 60,
+ 33, 8, 29, 1, 60, 33, 36, 7, 55, 60,
+ 36, 7, 7, 36, 36, 7, 7, 7, 36, 8,
+ 29, 36, 7, 29, 7, 33, 60, 29, 29, 5,
+ 7, 5, 48, 8, 33, 55, 7, 61, 16, 60,
+ 33, 55, 2, 55, 8, 33, 7, 29, 17, 36,
+ 29, 48, 36, 85, 8, 36, 29, 8, 1, 29,
+ 0, 55, 7, 29, 36, 1, 8, 29, 36, 36,
+ 33, 29, 76, 29, 60, 7, 33, 8, 8, 29,
+ 85, 36, 10, 8, 8, 65, 8, 8, 7, -1,
+ 8, 40, 40, 40, 40, 60, 8, 8, 8, -1,
+ 29, 42, 51, 51, 51, 51, 29, 60, 8, 61,
+ 62, 8, 53, 36, 33, 74, 50, 61, 62, 5,
+ 54, 8, 61, 62, 50, 56, 6, 55, 54, 7,
+ 60, 29, 8, 33, 84, 60, 60, 15, 60, 60,
+ 20, 25, 60, 27, 56, 56, 61, 62, 61, 62,
+ 60, -1, 61, 62, 38, 84, 61, 62, 29, 56,
+ 12, 29, 25, 25, 27, 27, 25, 8, 27, 29,
+ 25, 8, 27, 8, 61, 38, 38, 15, 8, 38,
+ 29, -1, 29, 38, 60, -1, 84, -1, 15, 12,
+ 61, 62, 29, 61, 62, 55, 34, 25, 36, 27,
+ 12, -1, 7, 8, 25, 57, 27, 34, -1, 36,
+ 38, 63, 61, 62, 61, 62, 25, 38, 27, -1,
+ 61, 62, 15, 29, 84, -1, 61, 62, -1, 38,
+ -1, 61, 62, -1, 57, 18, 19, 18, 19, -1,
+ 63, 34, -1, 36, -1, 57, -1, 84, -1, 55,
+ -1, 63, 18, 19, 18, 19, -1, -1, 23, 24,
+ -1, -1, 45, 46, 45, 46, -1, 32, -1, -1,
+ 35, -1, 37, -1, -1, 23, 24, -1, 84, 45,
+ 46, 45, 46, 25, 32, 27, -1, 35, -1, 37,
+ 23, 24, -1, -1, -1, -1, 38, -1, 31, 32,
+ 23, 24, 35, -1, 37, -1, -1, -1, 31, 32,
+ 23, 24, 35, -1, 37, -1, -1, -1, 31, 32,
+ 23, 24, 35, -1, 37, -1, -1, 3, 31, 32,
+ 23, 24, 35, -1, 37, -1, -1, 13, 31, 32,
+ -1, 17, 35, -1, 37, -1, 23, 24, -1, -1,
+ 26, -1, 28, -1, -1, 32, -1, -1, 35, -1,
+ 37, -1, -1, 39, 3, 41, 42, -1, -1, -1,
+ -1, -1, -1, 49, 13, -1, 52, 53, 17, -1,
+ -1, -1, 58, -1, -1, -1, -1, 26, 64, 28,
+ -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
+ 39, 77, 41, 42, -1, -1, -1, -1, -1, -1,
+ 49, 12, 13, 52, 53, -1, -1, -1, -1, 58,
+ -1, 22, -1, -1, -1, 64, -1, -1, 29, -1,
+ -1, -1, 33, 34, -1, 36, -1, -1, 77, -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, -1, 67, -1, -1, -1,
-1, -1, -1, -1, -1, -1, -1, 78, 79, 80,
- -1, -1, -1, -1, -1, -1, -1, 11, 12, 13,
- -1, -1, -1, -1, -1, -1, -1, -1, 22, -1,
- -1, -1, -1, -1, -1, 29, -1, -1, -1, 33,
- 34, -1, 36, -1, -1, -1, 40, -1, 42, 43,
- 44, -1, -1, 47, -1, -1, -1, 51, -1, 53,
+ -1, -1, -1, -1, -1, -1, -1, 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,
+ -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, 65, -1, 67, -1, 69, -1, 71, -1, 73,
- -1, -1, -1, -1, 78, 79, 80, -1, -1, -1,
- -1, -1, -1, -1, 11, 12, 13, -1, -1, -1,
- -1, -1, -1, -1, -1, 22, -1, -1, -1, -1,
- -1, -1, 29, -1, -1, -1, 33, 34, -1, 36,
- -1, -1, -1, 40, -1, 42, 43, 44, -1, -1,
- 47, -1, -1, -1, 51, -1, 53, -1, -1, 56,
- -1, -1, -1, -1, -1, -1, -1, -1, 65, -1,
- 67, -1, 69, -1, 71, -1, 73, -1, -1, -1,
- -1, 78, 79, 80, -1, -1, -1, -1, -1, -1,
- -1, 7, -1, -1, -1, 11, 12, 13, -1, -1,
- -1, -1, -1, -1, -1, -1, 22, -1, -1, -1,
- -1, -1, -1, 29, -1, -1, -1, 33, 34, -1,
- 36, -1, -1, -1, 40, -1, 42, 43, 44, -1,
- -1, 47, -1, -1, -1, 51, -1, 53, -1, -1,
- -1, -1, -1, -1, -1, -1, -1, -1, -1, 65,
- -1, 67, -1, 69, -1, 71, -1, 73, -1, -1,
- -1, -1, 78, 79, 80, -1, -1, -1, -1, -1,
+ -1, 77, -1, -1, -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, -1, 67, -1,
- 69, -1, 71, 72, 73, -1, -1, -1, -1, 78,
+ 69, -1, 71, -1, 73, -1, -1, -1, -1, 78,
79, 80, -1, -1, -1, -1, -1, -1, -1, 11,
12, 13, -1, -1, -1, -1, -1, -1, -1, -1,
22, -1, -1, -1, -1, -1, -1, 29, -1, -1,
@@ -539,98 +513,120 @@ const int JavaScriptGrammar::action_check [] = {
-1, 53, -1, -1, 56, -1, -1, -1, -1, -1,
-1, -1, -1, 65, -1, 67, -1, 69, -1, 71,
-1, 73, -1, -1, -1, -1, 78, 79, 80, -1,
- -1, -1, -1, -1, -1, -1, 4, 5, 6, -1,
- -1, 9, 10, 11, -1, -1, 14, -1, 16, -1,
- -1, -1, 20, 21, 22, -1, -1, -1, -1, -1,
- -1, 29, 30, 31, 32, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, 43, -1, -1, -1, -1,
+ -1, -1, -1, -1, -1, -1, 11, 12, 13, -1,
+ -1, -1, -1, -1, -1, -1, -1, 22, -1, -1,
+ -1, -1, -1, -1, 29, -1, -1, -1, 33, 34,
+ -1, 36, -1, -1, -1, 40, -1, 42, 43, 44,
+ -1, -1, 47, -1, -1, -1, 51, -1, 53, -1,
-1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- -1, 59, -1, -1, -1, -1, -1, -1, 66, 67,
- 68, -1, 70, 71, 72, 73, 74, 75, -1, -1,
- 78, 79, 80, 81, 82, 83, -1, -1, -1, -1,
- 4, 5, 6, -1, -1, 9, 10, 11, -1, -1,
- 14, -1, 16, -1, -1, -1, 20, 21, 22, -1,
- -1, -1, -1, -1, -1, 29, 30, 31, 32, -1,
- -1, -1, -1, -1, -1, -1, -1, -1, -1, 43,
- -1, -1, -1, 47, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, 59, -1, -1, -1, -1,
- -1, 65, 66, 67, 68, -1, 70, 71, 72, 73,
- 74, 75, -1, -1, 78, 79, 80, 81, 82, 83,
- -1, -1, -1, -1, 4, 5, 6, -1, -1, 9,
- 10, 11, -1, -1, 14, -1, 16, -1, -1, -1,
- 20, 21, 22, -1, -1, -1, -1, -1, -1, 29,
- 30, 31, 32, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, 43, -1, -1, -1, 47, -1, -1,
- -1, -1, -1, -1, -1, 55, -1, -1, -1, 59,
- -1, -1, -1, -1, -1, 65, 66, 67, 68, -1,
- 70, 71, 72, 73, 74, 75, -1, -1, 78, 79,
- 80, 81, 82, 83, -1, -1, -1, -1, 4, -1,
- -1, -1, -1, 9, -1, 11, 12, 13, 14, -1,
- -1, -1, -1, -1, -1, 21, 22, -1, -1, -1,
- -1, -1, -1, 29, 30, -1, -1, 33, 34, -1,
- 36, -1, -1, -1, 40, -1, 42, 43, 44, -1,
- -1, 47, -1, -1, -1, 51, -1, 53, -1, -1,
- -1, -1, -1, 59, -1, 61, -1, -1, -1, 65,
- 66, 67, 68, 69, 70, 71, 72, 73, 74, 75,
- -1, -1, 78, 79, 80, 81, 82, -1, -1, -1,
- -1, -1, 4, -1, -1, -1, -1, 9, -1, 11,
- 12, 13, 14, -1, -1, -1, -1, -1, -1, 21,
- 22, -1, -1, -1, -1, -1, -1, 29, 30, -1,
- -1, 33, 34, -1, 36, -1, -1, -1, 40, -1,
- 42, 43, 44, -1, -1, 47, -1, -1, -1, 51,
- -1, 53, -1, -1, -1, -1, -1, 59, -1, 61,
- -1, -1, -1, 65, 66, 67, 68, 69, 70, 71,
- 72, 73, 74, 75, -1, -1, 78, 79, 80, 81,
- 82, -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,
+ 65, -1, 67, -1, 69, -1, 71, 72, 73, -1,
+ -1, -1, -1, 78, 79, 80, -1, -1, -1, -1,
+ -1, -1, -1, 11, 12, 13, -1, -1, -1, -1,
+ -1, -1, -1, -1, 22, -1, -1, -1, -1, -1,
+ -1, 29, -1, -1, -1, 33, 34, -1, 36, -1,
-1, -1, 40, -1, 42, 43, 44, -1, -1, 47,
- -1, -1, -1, 51, -1, 53, -1, -1, -1, -1,
- -1, 59, -1, 61, -1, -1, -1, 65, 66, 67,
- 68, 69, 70, 71, 72, 73, 74, 75, -1, -1,
- 78, 79, 80, 81, 82, -1, -1, -1, -1, -1,
- 4, 5, 6, -1, -1, 9, 10, 11, 12, 13,
- 14, -1, 16, -1, -1, -1, 20, 21, 22, -1,
- -1, -1, -1, -1, -1, 29, 30, 31, 32, 33,
- 34, -1, 36, -1, -1, -1, 40, -1, 42, 43,
- 44, -1, -1, 47, -1, -1, -1, 51, -1, 53,
- -1, 55, -1, -1, -1, 59, -1, 61, -1, -1,
- -1, 65, 66, 67, 68, 69, 70, 71, 72, 73,
- 74, 75, -1, -1, 78, 79, 80, 81, 82, 83,
- -1, -1, -1, -1,
+ -1, -1, -1, 51, -1, 53, -1, -1, 56, -1,
+ -1, -1, -1, -1, -1, -1, -1, 65, -1, 67,
+ -1, 69, -1, 71, -1, 73, -1, -1, -1, -1,
+ 78, 79, 80, -1, -1, -1, -1, -1, -1, -1,
+ 7, -1, -1, -1, 11, 12, 13, -1, -1, -1,
+ -1, -1, -1, -1, -1, 22, -1, -1, -1, -1,
+ -1, -1, 29, -1, -1, -1, 33, 34, -1, 36,
+ -1, -1, -1, 40, -1, 42, 43, 44, -1, -1,
+ 47, -1, -1, -1, 51, -1, 53, -1, -1, -1,
+ -1, -1, -1, -1, -1, -1, -1, -1, 65, -1,
+ 67, -1, 69, -1, 71, -1, 73, -1, -1, -1,
+ -1, 78, 79, 80, -1, -1, -1, -1, -1, -1,
+ -1, 4, 5, 6, -1, -1, 9, 10, 11, -1,
+ -1, 14, -1, 16, -1, -1, -1, 20, 21, 22,
+ -1, -1, -1, -1, -1, -1, 29, 30, 31, 32,
+ -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
+ 43, -1, -1, -1, -1, -1, -1, -1, -1, -1,
+ -1, -1, -1, -1, -1, -1, 59, -1, -1, -1,
+ -1, -1, -1, 66, 67, 68, -1, 70, 71, 72,
+ 73, 74, 75, -1, -1, 78, 79, 80, 81, 82,
+ 83, -1, -1, -1, -1, 4, 5, 6, -1, -1,
+ 9, 10, 11, -1, -1, 14, -1, 16, -1, -1,
+ -1, 20, 21, 22, -1, -1, -1, -1, -1, -1,
+ 29, 30, 31, 32, -1, -1, -1, -1, -1, -1,
+ -1, -1, -1, -1, 43, -1, -1, -1, 47, -1,
+ -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
+ 59, -1, -1, -1, -1, -1, 65, 66, 67, 68,
+ -1, 70, 71, 72, 73, 74, 75, -1, -1, 78,
+ 79, 80, 81, 82, 83, -1, -1, -1, -1, 4,
+ 5, 6, -1, -1, 9, 10, 11, -1, -1, 14,
+ -1, 16, -1, -1, -1, 20, 21, 22, -1, -1,
+ -1, -1, -1, -1, 29, 30, 31, 32, -1, -1,
+ -1, -1, -1, -1, -1, -1, -1, -1, 43, -1,
+ -1, -1, 47, -1, -1, -1, -1, -1, -1, -1,
+ 55, -1, -1, -1, 59, -1, -1, -1, -1, -1,
+ 65, 66, 67, 68, -1, 70, 71, 72, 73, 74,
+ 75, -1, -1, 78, 79, 80, 81, 82, 83, -1,
+ -1, -1, -1, 4, -1, -1, -1, -1, 9, -1,
+ 11, 12, 13, 14, -1, -1, -1, -1, -1, -1,
+ 21, 22, -1, -1, -1, -1, -1, -1, 29, 30,
+ -1, -1, 33, 34, -1, 36, -1, -1, -1, 40,
+ -1, 42, 43, 44, -1, -1, 47, -1, -1, -1,
+ 51, -1, 53, -1, -1, -1, -1, -1, 59, -1,
+ 61, -1, -1, -1, 65, 66, 67, 68, 69, 70,
+ 71, 72, 73, 74, 75, -1, -1, 78, 79, 80,
+ 81, 82, -1, -1, -1, -1, -1, 4, -1, -1,
+ -1, -1, 9, -1, 11, 12, 13, 14, -1, -1,
+ -1, -1, -1, -1, 21, 22, -1, -1, -1, -1,
+ -1, -1, 29, 30, -1, -1, 33, 34, -1, 36,
+ -1, -1, -1, 40, -1, 42, 43, 44, -1, -1,
+ 47, -1, -1, -1, 51, -1, 53, -1, -1, -1,
+ -1, -1, 59, -1, 61, -1, -1, -1, 65, 66,
+ 67, 68, 69, 70, 71, 72, 73, 74, 75, -1,
+ -1, 78, 79, 80, 81, 82, -1, -1, -1, -1,
+ -1, 4, -1, -1, -1, -1, 9, -1, 11, 12,
+ 13, 14, -1, -1, -1, -1, -1, -1, 21, 22,
+ -1, -1, -1, -1, -1, -1, 29, 30, -1, -1,
+ 33, 34, -1, 36, -1, -1, -1, 40, -1, 42,
+ 43, 44, -1, -1, 47, -1, -1, -1, 51, -1,
+ 53, -1, -1, -1, -1, -1, 59, -1, 61, -1,
+ -1, -1, 65, 66, 67, 68, 69, 70, 71, 72,
+ 73, 74, 75, -1, -1, 78, 79, 80, 81, 82,
+ -1, -1, -1, -1, -1, 4, 5, 6, -1, -1,
+ 9, 10, 11, 12, 13, 14, -1, 16, -1, -1,
+ -1, 20, 21, 22, -1, -1, -1, -1, -1, -1,
+ 29, 30, 31, 32, 33, 34, -1, 36, -1, -1,
+ -1, 40, -1, 42, 43, 44, -1, -1, 47, -1,
+ -1, -1, 51, -1, 53, -1, 55, -1, -1, -1,
+ 59, -1, 61, -1, -1, -1, 65, 66, 67, 68,
+ 69, 70, 71, 72, 73, 74, 75, -1, -1, 78,
+ 79, 80, 81, 82, 83, -1, -1, -1, -1,
- 6, 81, 7, 10, 2, 84, 69, 9, 69, 10,
- 10, 54, 54, 16, 2, 10, 10, 16, 73, 12,
- 10, 10, 6, 10, 16, 16, 9, 54, 6, 86,
- 16, 50, 9, 7, 10, 10, 9, 9, 19, 88,
- 10, 9, 54, 10, 10, 16, 9, 16, 9, 75,
- 10, 16, 16, 9, 9, -1, 10, 9, 9, 16,
- 10, 9, 9, -1, 10, 18, 10, 16, 27, 10,
- 10, -1, 9, 32, -1, 9, -1, -1, -1, -1,
- 19, 20, 27, -1, 27, 27, 31, 29, 31, 27,
- 5, 27, 27, 31, 27, 27, 32, 32, 27, 32,
- 32, 27, 27, 27, 27, 51, 32, 51, 37, 33,
- 51, 51, 35, 27, 39, 29, 27, 27, 29, 29,
- 27, 27, 27, 29, 29, 32, 27, 21, 29, 27,
- 24, 27, 30, 29, 27, 27, 29, 27, 30, 29,
- 27, 27, 29, 29, 27, 27, 27, 29, 27, 32,
- 21, 32, 89, 24, 33, 27, -1, 27, 27, 27,
- 94, 29, 32, 32, 27, 27, 27, 27, 29, 32,
- 16, 43, 27, 33, -1, 27, -1, 23, 33, 41,
- 32, 16, 27, -1, 27, 27, 38, 32, 23, 32,
- 32, 27, -1, -1, 27, 27, 32, 42, 40, 32,
- 32, 34, 34, 27, 27, -1, 49, 27, 32, 32,
- 34, -1, 32, 49, 27, 27, 36, -1, 27, 32,
- 32, -1, 34, 32, -1, -1, 49, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, 49, -1, -1, -1,
- 49, -1, -1, -1, -1, -1, -1, -1, -1, -1,
+ 10, 10, 20, 10, 85, 55, 11, 10, 51, 11,
+ 11, 10, 6, 11, 11, 6, 70, 6, 11, 82,
+ 10, 17, 10, 10, 70, 17, 11, 55, 11, 2,
+ 8, 10, 76, 10, 5, 11, 17, 11, 10, 55,
+ 74, 10, 17, 13, 11, 87, 6, 11, 10, 89,
+ 11, 19, 17, 10, 17, 8, 11, 11, 17, 17,
+ 55, 17, 28, 10, -1, 17, 17, 17, 11, 10,
+ -1, 20, 21, 11, 24, -1, 11, -1, 44, -1,
+ 28, -1, 28, 28, 30, 33, 28, 11, 33, 28,
+ 32, 28, 28, 32, 30, 32, 22, 28, 28, 25,
+ 28, 28, 33, 33, 11, 33, 33, 28, 28, 52,
+ 28, 28, 33, 33, 52, 28, 33, 52, 28, 28,
+ 38, 34, 28, 33, 33, 28, 28, 33, 30, 28,
+ 17, 28, 31, 30, 28, 28, 30, 24, 28, 42,
+ 30, 34, 28, 22, 30, 52, 25, -1, 95, 90,
+ 28, 28, 30, 30, 28, 28, 30, 30, 28, 28,
+ 30, 28, 28, 30, 30, 28, 28, 36, 30, 28,
+ -1, 34, 28, 28, 28, 34, 28, 33, 28, 33,
+ -1, 33, -1, 33, 28, 40, -1, 41, 28, 33,
+ -1, 43, -1, 33, 50, 45, 28, 28, -1, 39,
+ 28, 33, 33, 35, 35, 33, 50, 35, 28, 28,
+ 28, 28, -1, 33, 33, 33, 33, 37, 35, 28,
+ -1, -1, -1, -1, 33, -1, -1, -1, -1, -1,
+ -1, 50, 50, -1, -1, -1, -1, -1, -1, -1,
+ -1, 50, 28, -1, -1, 31, -1, -1, -1, -1,
+ -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- -1, 27, -1, -1, -1, -1, 32, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, -1, -1, 44, -1,
-1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, -1, -1, -1, -1};
+ -1};
diff --git a/src/declarative/qml/parser/javascriptgrammar_p.h b/src/declarative/qml/parser/javascriptgrammar_p.h
index 12c2566..10f0313 100644
--- a/src/declarative/qml/parser/javascriptgrammar_p.h
+++ b/src/declarative/qml/parser/javascriptgrammar_p.h
@@ -96,14 +96,14 @@ public:
T_XOR_EQ = 77,
ACCEPT_STATE = 7,
- RULE_COUNT = 289,
- STATE_COUNT = 504,
+ RULE_COUNT = 291,
+ STATE_COUNT = 507,
TERMINAL_COUNT = 88,
- NON_TERMINAL_COUNT = 96,
+ NON_TERMINAL_COUNT = 97,
- GOTO_INDEX_OFFSET = 504,
- GOTO_INFO_OFFSET = 1584,
- GOTO_CHECK_OFFSET = 1584
+ GOTO_INDEX_OFFSET = 507,
+ GOTO_INFO_OFFSET = 1569,
+ GOTO_CHECK_OFFSET = 1569
};
static const char *const spell [];
diff --git a/src/declarative/qml/parser/javascriptparser.cpp b/src/declarative/qml/parser/javascriptparser.cpp
index b91ff5b..a399c36 100644
--- a/src/declarative/qml/parser/javascriptparser.cpp
+++ b/src/declarative/qml/parser/javascriptparser.cpp
@@ -202,20 +202,30 @@ case 9: {
} break;
case 10: {
+ sym(1).Node = makeAstNode<AST::UiObjectMemberList> (driver->nodePool(), sym(1).UiObjectMember);
+} break;
+
+case 11: {
+ AST::UiObjectMemberList *node = makeAstNode<AST:: UiObjectMemberList> (driver->nodePool(),
+ sym(1).UiObjectMemberList, sym(3).UiObjectMember);
+ sym(1).Node = node;
+} break;
+
+case 12: {
AST::UiObjectInitializer *node = makeAstNode<AST::UiObjectInitializer> (driver->nodePool(), (AST::UiObjectMemberList*)0);
node->lbraceToken = loc(1);
node->rbraceToken = loc(2);
sym(1).Node = node;
} break;
-case 11: {
+case 13: {
AST::UiObjectInitializer *node = makeAstNode<AST::UiObjectInitializer> (driver->nodePool(), sym(2).UiObjectMemberList->finish());
node->lbraceToken = loc(1);
node->rbraceToken = loc(3);
sym(1).Node = node;
} break;
-case 12: {
+case 14: {
AST::UiObjectBinding *node = makeAstNode<AST::UiObjectBinding> (driver->nodePool(), sym(1).UiQualifiedId->finish(),
sym(3).sval, sym(4).UiObjectInitializer);
node->colonToken = loc(2);
@@ -223,14 +233,14 @@ case 12: {
sym(1).Node = node;
} break;
-case 13: {
+case 15: {
AST::UiObjectDefinition *node = makeAstNode<AST::UiObjectDefinition> (driver->nodePool(), sym(1).sval,
sym(2).UiObjectInitializer);
node->identifierToken = loc(1);
sym(1).Node = node;
} break;
-case 14: {
+case 16: {
AST::UiArrayBinding *node = makeAstNode<AST::UiArrayBinding> (driver->nodePool(), sym(1).UiQualifiedId->finish(),
sym(4).UiObjectMemberList->finish());
node->colonToken = loc(2);
@@ -239,14 +249,14 @@ case 14: {
sym(1).Node = node;
} break;
-case 15: {
+case 17: {
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 16: {
+case 18: {
AST::UiPublicMember *node = makeAstNode<AST::UiPublicMember> (driver->nodePool(), sym(2).sval, sym(3).sval,
sym(5).Expression, sym(6).UiObjectInitializer);
node->publicToken = loc(1);
@@ -256,7 +266,7 @@ case 16: {
sym(1).Node = node;
} break;
-case 17: {
+case 19: {
AST::UiPublicMember *node = makeAstNode<AST::UiPublicMember> (driver->nodePool(), sym(2).sval, sym(3).sval);
node->publicToken = loc(1);
node->attributeTypeToken = loc(2);
@@ -264,7 +274,7 @@ case 17: {
sym(1).Node = node;
} break;
-case 18: {
+case 20: {
AST::UiPublicMember *node = makeAstNode<AST::UiPublicMember> (driver->nodePool(), sym(2).sval, sym(3).sval,
sym(5).Expression, static_cast<AST::UiObjectInitializer *>(0));
node->publicToken = loc(1);
@@ -274,61 +284,61 @@ case 18: {
sym(1).Node = node;
} break;
-case 19: {
+case 21: {
AST::UiQualifiedId *node = makeAstNode<AST::UiQualifiedId> (driver->nodePool(), sym(1).sval);
node->identifierToken = loc(1);
sym(1).Node = node;
} break;
-case 20: {
+case 22: {
AST::UiQualifiedId *node = makeAstNode<AST::UiQualifiedId> (driver->nodePool(), sym(1).UiQualifiedId, sym(3).sval);
node->identifierToken = loc(3);
sym(1).Node = node;
} break;
-case 21: {
+case 23: {
AST::ThisExpression *node = makeAstNode<AST::ThisExpression> (driver->nodePool());
node->thisToken = loc(1);
sym(1).Node = node;
} break;
-case 22: {
+case 24: {
AST::IdentifierExpression *node = makeAstNode<AST::IdentifierExpression> (driver->nodePool(), sym(1).sval);
node->identifierToken = loc(1);
sym(1).Node = node;
} break;
-case 23: {
+case 25: {
AST::NullExpression *node = makeAstNode<AST::NullExpression> (driver->nodePool());
node->nullToken = loc(1);
sym(1).Node = node;
} break;
-case 24: {
+case 26: {
AST::TrueLiteral *node = makeAstNode<AST::TrueLiteral> (driver->nodePool());
node->trueToken = loc(1);
sym(1).Node = node;
} break;
-case 25: {
+case 27: {
AST::FalseLiteral *node = makeAstNode<AST::FalseLiteral> (driver->nodePool());
node->falseToken = loc(1);
sym(1).Node = node;
} break;
-case 26: {
+case 28: {
AST::NumericLiteral *node = makeAstNode<AST::NumericLiteral> (driver->nodePool(), sym(1).dval);
node->literalToken = loc(1);
sym(1).Node = node;
} break;
-case 27: {
+case 29: {
AST::StringLiteral *node = makeAstNode<AST::StringLiteral> (driver->nodePool(), sym(1).sval);
node->literalToken = loc(1);
sym(1).Node = node;
} break;
-case 28: {
+case 30: {
bool rx = lexer->scanRegExp(Lexer::NoPrefix);
if (!rx) {
diagnostic_messages.append(DiagnosticMessage(DiagnosticMessage::Error, lexer->startLineNo(),
@@ -340,7 +350,7 @@ case 28: {
sym(1).Node = node;
} break;
-case 29: {
+case 31: {
bool rx = lexer->scanRegExp(Lexer::EqualPrefix);
if (!rx) {
diagnostic_messages.append(DiagnosticMessage(DiagnosticMessage::Error, lexer->startLineNo(),
@@ -352,85 +362,81 @@ case 29: {
sym(1).Node = node;
} break;
-case 30: {
+case 32: {
sym(1).Node = makeAstNode<AST::ArrayLiteral> (driver->nodePool(), sym(2).Elision);
} break;
-case 31: {
+case 33: {
sym(1).Node = makeAstNode<AST::ArrayLiteral> (driver->nodePool(), sym(2).ElementList->finish ());
} break;
-case 32: {
+case 34: {
sym(1).Node = makeAstNode<AST::ArrayLiteral> (driver->nodePool(), sym(2).ElementList->finish (), sym(4).Elision);
} break;
-case 33: {
+case 35: {
if (sym(2).Node)
sym(1).Node = makeAstNode<AST::ObjectLiteral> (driver->nodePool(), sym(2).PropertyNameAndValueList->finish ());
else
sym(1).Node = makeAstNode<AST::ObjectLiteral> (driver->nodePool());
} break;
-case 34: {
+case 36: {
sym(1).Node = makeAstNode<AST::ObjectLiteral> (driver->nodePool(), sym(2).PropertyNameAndValueList->finish ());
} break;
-case 35: {
+case 37: {
sym(1) = sym(2);
} break;
-case 36: {
+case 38: {
sym(1).Node = makeAstNode<AST::ElementList> (driver->nodePool(), sym(1).Elision, sym(2).Expression);
} break;
-case 37: {
+case 39: {
sym(1).Node = makeAstNode<AST::ElementList> (driver->nodePool(), sym(1).ElementList, sym(3).Elision, sym(4).Expression);
} break;
-case 38: {
+case 40: {
sym(1).Node = makeAstNode<AST::Elision> (driver->nodePool());
} break;
-case 39: {
+case 41: {
sym(1).Node = makeAstNode<AST::Elision> (driver->nodePool(), sym(1).Elision);
} break;
-case 40: {
+case 42: {
sym(1).Node = 0;
} break;
-case 41: {
+case 43: {
sym(1).Elision = sym(1).Elision->finish ();
} break;
-case 42: {
+case 44: {
sym(1).Node = makeAstNode<AST::PropertyNameAndValueList> (driver->nodePool(), sym(1).PropertyName, sym(3).Expression);
} break;
-case 43: {
+case 45: {
sym(1).Node = makeAstNode<AST::PropertyNameAndValueList> (driver->nodePool(), sym(1).PropertyNameAndValueList, sym(3).PropertyName, sym(5).Expression);
} break;
-case 44: {
+case 46: {
sym(1).Node = makeAstNode<AST::IdentifierPropertyName> (driver->nodePool(), sym(1).sval);
} break;
-case 45: {
+case 47: {
sym(1).Node = makeAstNode<AST::StringLiteralPropertyName> (driver->nodePool(), sym(1).sval);
} break;
-case 46: {
+case 48: {
sym(1).Node = makeAstNode<AST::NumericLiteralPropertyName> (driver->nodePool(), sym(1).dval);
} break;
-case 47: {
+case 49: {
sym(1).Node = makeAstNode<AST::IdentifierPropertyName> (driver->nodePool(), sym(1).sval);
} break;
-case 48:
-
-case 49:
-
case 50:
case 51:
@@ -488,22 +494,26 @@ case 76:
case 77:
case 78:
+
+case 79:
+
+case 80:
{
sym(1).sval = driver->intern(lexer->characterBuffer(), lexer->characterCount());
} break;
-case 83: {
+case 85: {
sym(1).Node = makeAstNode<AST::ArrayMemberExpression> (driver->nodePool(), sym(1).Expression, sym(3).Expression);
} break;
-case 84: {
+case 86: {
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 85: {
+case 87: {
AST::NewMemberExpression *node = makeAstNode<AST::NewMemberExpression> (driver->nodePool(), sym(2).Expression, sym(4).ArgumentList);
node->newToken = loc(1);
node->lparenToken = loc(3);
@@ -511,209 +521,205 @@ case 85: {
sym(1).Node = node;
} break;
-case 87: {
+case 89: {
AST::NewExpression *node = makeAstNode<AST::NewExpression> (driver->nodePool(), sym(2).Expression);
node->newToken = loc(1);
sym(1).Node = node;
} break;
-case 88: {
+case 90: {
AST::CallExpression *node = makeAstNode<AST::CallExpression> (driver->nodePool(), sym(1).Expression, sym(3).ArgumentList);
node->lparenToken = loc(2);
node->rparenToken = loc(4);
sym(1).Node = node;
} break;
-case 89: {
+case 91: {
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 90: {
+case 92: {
sym(1).Node = makeAstNode<AST::ArrayMemberExpression> (driver->nodePool(), sym(1).Expression, sym(3).Expression);
} break;
-case 91: {
+case 93: {
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 92: {
+case 94: {
sym(1).Node = 0;
} break;
-case 93: {
+case 95: {
sym(1).Node = sym(1).ArgumentList->finish();
} break;
-case 94: {
+case 96: {
sym(1).Node = makeAstNode<AST::ArgumentList> (driver->nodePool(), sym(1).Expression);
} break;
-case 95: {
+case 97: {
AST::ArgumentList *node = makeAstNode<AST::ArgumentList> (driver->nodePool(), sym(1).ArgumentList, sym(3).Expression);
node->commaToken = loc(2);
sym(1).Node = node;
} break;
-case 99: {
+case 101: {
sym(1).Node = makeAstNode<AST::PostIncrementExpression> (driver->nodePool(), sym(1).Expression);
} break;
-case 100: {
+case 102: {
sym(1).Node = makeAstNode<AST::PostDecrementExpression> (driver->nodePool(), sym(1).Expression);
} break;
-case 102: {
+case 104: {
sym(1).Node = makeAstNode<AST::DeleteExpression> (driver->nodePool(), sym(2).Expression);
} break;
-case 103: {
+case 105: {
sym(1).Node = makeAstNode<AST::VoidExpression> (driver->nodePool(), sym(2).Expression);
} break;
-case 104: {
+case 106: {
sym(1).Node = makeAstNode<AST::TypeOfExpression> (driver->nodePool(), sym(2).Expression);
} break;
-case 105: {
+case 107: {
sym(1).Node = makeAstNode<AST::PreIncrementExpression> (driver->nodePool(), sym(2).Expression);
} break;
-case 106: {
+case 108: {
sym(1).Node = makeAstNode<AST::PreDecrementExpression> (driver->nodePool(), sym(2).Expression);
} break;
-case 107: {
+case 109: {
sym(1).Node = makeAstNode<AST::UnaryPlusExpression> (driver->nodePool(), sym(2).Expression);
} break;
-case 108: {
+case 110: {
sym(1).Node = makeAstNode<AST::UnaryMinusExpression> (driver->nodePool(), sym(2).Expression);
} break;
-case 109: {
+case 111: {
sym(1).Node = makeAstNode<AST::TildeExpression> (driver->nodePool(), sym(2).Expression);
} break;
-case 110: {
+case 112: {
sym(1).Node = makeAstNode<AST::NotExpression> (driver->nodePool(), sym(2).Expression);
} break;
-case 112: {
+case 114: {
sym(1).Node = makeAstNode<AST::BinaryExpression> (driver->nodePool(), sym(1).Expression, QSOperator::Mul, sym(3).Expression);
} break;
-case 113: {
+case 115: {
sym(1).Node = makeAstNode<AST::BinaryExpression> (driver->nodePool(), sym(1).Expression, QSOperator::Div, sym(3).Expression);
} break;
-case 114: {
+case 116: {
sym(1).Node = makeAstNode<AST::BinaryExpression> (driver->nodePool(), sym(1).Expression, QSOperator::Mod, sym(3).Expression);
} break;
-case 116: {
+case 118: {
sym(1).Node = makeAstNode<AST::BinaryExpression> (driver->nodePool(), sym(1).Expression, QSOperator::Add, sym(3).Expression);
} break;
-case 117: {
+case 119: {
sym(1).Node = makeAstNode<AST::BinaryExpression> (driver->nodePool(), sym(1).Expression, QSOperator::Sub, sym(3).Expression);
} break;
-case 119: {
+case 121: {
sym(1).Node = makeAstNode<AST::BinaryExpression> (driver->nodePool(), sym(1).Expression, QSOperator::LShift, sym(3).Expression);
} break;
-case 120: {
+case 122: {
sym(1).Node = makeAstNode<AST::BinaryExpression> (driver->nodePool(), sym(1).Expression, QSOperator::RShift, sym(3).Expression);
} break;
-case 121: {
+case 123: {
sym(1).Node = makeAstNode<AST::BinaryExpression> (driver->nodePool(), sym(1).Expression, QSOperator::URShift, sym(3).Expression);
} break;
-case 123: {
+case 125: {
sym(1).Node = makeAstNode<AST::BinaryExpression> (driver->nodePool(), sym(1).Expression, QSOperator::Lt, sym(3).Expression);
} break;
-case 124: {
+case 126: {
sym(1).Node = makeAstNode<AST::BinaryExpression> (driver->nodePool(), sym(1).Expression, QSOperator::Gt, sym(3).Expression);
} break;
-case 125: {
+case 127: {
sym(1).Node = makeAstNode<AST::BinaryExpression> (driver->nodePool(), sym(1).Expression, QSOperator::Le, sym(3).Expression);
} break;
-case 126: {
+case 128: {
sym(1).Node = makeAstNode<AST::BinaryExpression> (driver->nodePool(), sym(1).Expression, QSOperator::Ge, sym(3).Expression);
} break;
-case 127: {
+case 129: {
sym(1).Node = makeAstNode<AST::BinaryExpression> (driver->nodePool(), sym(1).Expression, QSOperator::InstanceOf, sym(3).Expression);
} break;
-case 128: {
+case 130: {
sym(1).Node = makeAstNode<AST::BinaryExpression> (driver->nodePool(), sym(1).Expression, QSOperator::In, sym(3).Expression);
} break;
-case 130: {
+case 132: {
sym(1).Node = makeAstNode<AST::BinaryExpression> (driver->nodePool(), sym(1).Expression, QSOperator::Lt, sym(3).Expression);
} break;
-case 131: {
+case 133: {
sym(1).Node = makeAstNode<AST::BinaryExpression> (driver->nodePool(), sym(1).Expression, QSOperator::Gt, sym(3).Expression);
} break;
-case 132: {
+case 134: {
sym(1).Node = makeAstNode<AST::BinaryExpression> (driver->nodePool(), sym(1).Expression, QSOperator::Le, sym(3).Expression);
} break;
-case 133: {
+case 135: {
sym(1).Node = makeAstNode<AST::BinaryExpression> (driver->nodePool(), sym(1).Expression, QSOperator::Ge, sym(3).Expression);
} break;
-case 134: {
+case 136: {
sym(1).Node = makeAstNode<AST::BinaryExpression> (driver->nodePool(), sym(1).Expression, QSOperator::InstanceOf, sym(3).Expression);
} break;
-case 136: {
+case 138: {
sym(1).Node = makeAstNode<AST::BinaryExpression> (driver->nodePool(), sym(1).Expression, QSOperator::Equal, sym(3).Expression);
} break;
-case 137: {
+case 139: {
sym(1).Node = makeAstNode<AST::BinaryExpression> (driver->nodePool(), sym(1).Expression, QSOperator::NotEqual, sym(3).Expression);
} break;
-case 138: {
+case 140: {
sym(1).Node = makeAstNode<AST::BinaryExpression> (driver->nodePool(), sym(1).Expression, QSOperator::StrictEqual, sym(3).Expression);
} break;
-case 139: {
+case 141: {
sym(1).Node = makeAstNode<AST::BinaryExpression> (driver->nodePool(), sym(1).Expression, QSOperator::StrictNotEqual, sym(3).Expression);
} break;
-case 141: {
+case 143: {
sym(1).Node = makeAstNode<AST::BinaryExpression> (driver->nodePool(), sym(1).Expression, QSOperator::Equal, sym(3).Expression);
} break;
-case 142: {
+case 144: {
sym(1).Node = makeAstNode<AST::BinaryExpression> (driver->nodePool(), sym(1).Expression, QSOperator::NotEqual, sym(3).Expression);
} break;
-case 143: {
+case 145: {
sym(1).Node = makeAstNode<AST::BinaryExpression> (driver->nodePool(), sym(1).Expression, QSOperator::StrictEqual, sym(3).Expression);
} break;
-case 144: {
- sym(1).Node = makeAstNode<AST::BinaryExpression> (driver->nodePool(), sym(1).Expression, QSOperator::StrictNotEqual, sym(3).Expression);
-} break;
-
case 146: {
- sym(1).Node = makeAstNode<AST::BinaryExpression> (driver->nodePool(), sym(1).Expression, QSOperator::BitAnd, sym(3).Expression);
+ sym(1).Node = makeAstNode<AST::BinaryExpression> (driver->nodePool(), sym(1).Expression, QSOperator::StrictNotEqual, sym(3).Expression);
} break;
case 148: {
@@ -721,7 +727,7 @@ case 148: {
} break;
case 150: {
- sym(1).Node = makeAstNode<AST::BinaryExpression> (driver->nodePool(), sym(1).Expression, QSOperator::BitXor, sym(3).Expression);
+ sym(1).Node = makeAstNode<AST::BinaryExpression> (driver->nodePool(), sym(1).Expression, QSOperator::BitAnd, sym(3).Expression);
} break;
case 152: {
@@ -729,7 +735,7 @@ case 152: {
} break;
case 154: {
- sym(1).Node = makeAstNode<AST::BinaryExpression> (driver->nodePool(), sym(1).Expression, QSOperator::BitOr, sym(3).Expression);
+ sym(1).Node = makeAstNode<AST::BinaryExpression> (driver->nodePool(), sym(1).Expression, QSOperator::BitXor, sym(3).Expression);
} break;
case 156: {
@@ -737,7 +743,7 @@ case 156: {
} break;
case 158: {
- sym(1).Node = makeAstNode<AST::BinaryExpression> (driver->nodePool(), sym(1).Expression, QSOperator::And, sym(3).Expression);
+ sym(1).Node = makeAstNode<AST::BinaryExpression> (driver->nodePool(), sym(1).Expression, QSOperator::BitOr, sym(3).Expression);
} break;
case 160: {
@@ -745,7 +751,7 @@ case 160: {
} break;
case 162: {
- sym(1).Node = makeAstNode<AST::BinaryExpression> (driver->nodePool(), sym(1).Expression, QSOperator::Or, sym(3).Expression);
+ sym(1).Node = makeAstNode<AST::BinaryExpression> (driver->nodePool(), sym(1).Expression, QSOperator::And, sym(3).Expression);
} break;
case 164: {
@@ -753,7 +759,7 @@ case 164: {
} break;
case 166: {
- sym(1).Node = makeAstNode<AST::ConditionalExpression> (driver->nodePool(), sym(1).Expression, sym(3).Expression, sym(5).Expression);
+ sym(1).Node = makeAstNode<AST::BinaryExpression> (driver->nodePool(), sym(1).Expression, QSOperator::Or, sym(3).Expression);
} break;
case 168: {
@@ -761,291 +767,295 @@ case 168: {
} break;
case 170: {
- sym(1).Node = makeAstNode<AST::BinaryExpression> (driver->nodePool(), sym(1).Expression, sym(2).ival, sym(3).Expression);
+ sym(1).Node = makeAstNode<AST::ConditionalExpression> (driver->nodePool(), sym(1).Expression, sym(3).Expression, sym(5).Expression);
} break;
case 172: {
sym(1).Node = makeAstNode<AST::BinaryExpression> (driver->nodePool(), sym(1).Expression, sym(2).ival, sym(3).Expression);
} break;
-case 173: {
+case 174: {
+ sym(1).Node = makeAstNode<AST::BinaryExpression> (driver->nodePool(), sym(1).Expression, sym(2).ival, sym(3).Expression);
+} break;
+
+case 175: {
sym(1).ival = QSOperator::Assign;
} break;
-case 174: {
+case 176: {
sym(1).ival = QSOperator::InplaceMul;
} break;
-case 175: {
+case 177: {
sym(1).ival = QSOperator::InplaceDiv;
} break;
-case 176: {
+case 178: {
sym(1).ival = QSOperator::InplaceMod;
} break;
-case 177: {
+case 179: {
sym(1).ival = QSOperator::InplaceAdd;
} break;
-case 178: {
+case 180: {
sym(1).ival = QSOperator::InplaceSub;
} break;
-case 179: {
+case 181: {
sym(1).ival = QSOperator::InplaceLeftShift;
} break;
-case 180: {
+case 182: {
sym(1).ival = QSOperator::InplaceRightShift;
} break;
-case 181: {
+case 183: {
sym(1).ival = QSOperator::InplaceURightShift;
} break;
-case 182: {
+case 184: {
sym(1).ival = QSOperator::InplaceAnd;
} break;
-case 183: {
+case 185: {
sym(1).ival = QSOperator::InplaceXor;
} break;
-case 184: {
+case 186: {
sym(1).ival = QSOperator::InplaceOr;
} break;
-case 186: {
+case 188: {
sym(1).Node = makeAstNode<AST::Expression> (driver->nodePool(), sym(1).Expression, sym(3).Expression);
} break;
-case 187: {
+case 189: {
sym(1).Node = 0;
} break;
-case 190: {
+case 192: {
sym(1).Node = makeAstNode<AST::Expression> (driver->nodePool(), sym(1).Expression, sym(3).Expression);
} break;
-case 191: {
+case 193: {
sym(1).Node = 0;
} break;
-case 208: {
+case 210: {
sym(1).Node = makeAstNode<AST::Block> (driver->nodePool(), sym(2).StatementList);
} break;
-case 209: {
+case 211: {
sym(1).Node = makeAstNode<AST::StatementList> (driver->nodePool(), sym(1).Statement);
} break;
-case 210: {
+case 212: {
sym(1).Node = makeAstNode<AST::StatementList> (driver->nodePool(), sym(1).StatementList, sym(2).Statement);
} break;
-case 211: {
+case 213: {
sym(1).Node = 0;
} break;
-case 212: {
+case 214: {
sym(1).Node = sym(1).StatementList->finish ();
} break;
-case 214: {
+case 216: {
AST::VariableStatement *node = makeAstNode<AST::VariableStatement> (driver->nodePool(), sym(2).VariableDeclarationList->finish (/*readOnly=*/sym(1).ival == T_CONST));
node->declarationKindToken = loc(1);
node->semicolonToken = loc(3);
sym(1).Node = node;
} break;
-case 215: {
+case 217: {
sym(1).ival = T_CONST;
} break;
-case 216: {
+case 218: {
sym(1).ival = T_VAR;
} break;
-case 217: {
+case 219: {
sym(1).Node = makeAstNode<AST::VariableDeclarationList> (driver->nodePool(), sym(1).VariableDeclaration);
} break;
-case 218: {
+case 220: {
sym(1).Node = makeAstNode<AST::VariableDeclarationList> (driver->nodePool(), sym(1).VariableDeclarationList, sym(3).VariableDeclaration);
} break;
-case 219: {
+case 221: {
sym(1).Node = makeAstNode<AST::VariableDeclarationList> (driver->nodePool(), sym(1).VariableDeclaration);
} break;
-case 220: {
+case 222: {
sym(1).Node = makeAstNode<AST::VariableDeclarationList> (driver->nodePool(), sym(1).VariableDeclarationList, sym(3).VariableDeclaration);
} break;
-case 221: {
+case 223: {
AST::VariableDeclaration *node = makeAstNode<AST::VariableDeclaration> (driver->nodePool(), sym(1).sval, sym(2).Expression);
node->identifierToken = loc(1);
sym(1).Node = node;
} break;
-case 222: {
+case 224: {
AST::VariableDeclaration *node = makeAstNode<AST::VariableDeclaration> (driver->nodePool(), sym(1).sval, sym(2).Expression);
node->identifierToken = loc(1);
sym(1).Node = node;
} break;
-case 223: {
+case 225: {
sym(1) = sym(2);
} break;
-case 224: {
+case 226: {
sym(1).Node = 0;
} break;
-case 226: {
+case 228: {
sym(1) = sym(2);
} break;
-case 227: {
+case 229: {
sym(1).Node = 0;
} break;
-case 229: {
+case 231: {
sym(1).Node = makeAstNode<AST::EmptyStatement> (driver->nodePool());
} break;
-case 231: {
+case 233: {
AST::ExpressionStatement *node = makeAstNode<AST::ExpressionStatement> (driver->nodePool(), sym(1).Expression);
node->semicolonToken = loc(2);
sym(1).Node = node;
} break;
-case 232: {
+case 234: {
sym(1).Node = makeAstNode<AST::IfStatement> (driver->nodePool(), sym(3).Expression, sym(5).Statement, sym(7).Statement);
} break;
-case 233: {
+case 235: {
sym(1).Node = makeAstNode<AST::IfStatement> (driver->nodePool(), sym(3).Expression, sym(5).Statement);
} break;
-case 235: {
+case 237: {
sym(1).Node = makeAstNode<AST::DoWhileStatement> (driver->nodePool(), sym(2).Statement, sym(5).Expression);
} break;
-case 236: {
+case 238: {
sym(1).Node = makeAstNode<AST::WhileStatement> (driver->nodePool(), sym(3).Expression, sym(5).Statement);
} break;
-case 237: {
+case 239: {
sym(1).Node = makeAstNode<AST::ForStatement> (driver->nodePool(), sym(3).Expression, sym(5).Expression, sym(7).Expression, sym(9).Statement);
} break;
-case 238: {
+case 240: {
sym(1).Node = makeAstNode<AST::LocalForStatement> (driver->nodePool(), sym(4).VariableDeclarationList->finish (/*readOnly=*/false), sym(6).Expression, sym(8).Expression, sym(10).Statement);
} break;
-case 239: {
+case 241: {
sym(1).Node = makeAstNode<AST::ForEachStatement> (driver->nodePool(), sym(3).Expression, sym(5).Expression, sym(7).Statement);
} break;
-case 240: {
+case 242: {
sym(1).Node = makeAstNode<AST::LocalForEachStatement> (driver->nodePool(), sym(4).VariableDeclaration, sym(6).Expression, sym(8).Statement);
} break;
-case 242: {
+case 244: {
sym(1).Node = makeAstNode<AST::ContinueStatement> (driver->nodePool());
} break;
-case 244: {
+case 246: {
sym(1).Node = makeAstNode<AST::ContinueStatement> (driver->nodePool(), sym(2).sval);
} break;
-case 246: {
+case 248: {
sym(1).Node = makeAstNode<AST::BreakStatement> (driver->nodePool());
} break;
-case 248: {
+case 250: {
sym(1).Node = makeAstNode<AST::BreakStatement> (driver->nodePool(), sym(2).sval);
} break;
-case 250: {
+case 252: {
sym(1).Node = makeAstNode<AST::ReturnStatement> (driver->nodePool(), sym(2).Expression);
} break;
-case 251: {
+case 253: {
sym(1).Node = makeAstNode<AST::WithStatement> (driver->nodePool(), sym(3).Expression, sym(5).Statement);
} break;
-case 252: {
+case 254: {
sym(1).Node = makeAstNode<AST::SwitchStatement> (driver->nodePool(), sym(3).Expression, sym(5).CaseBlock);
} break;
-case 253: {
+case 255: {
sym(1).Node = makeAstNode<AST::CaseBlock> (driver->nodePool(), sym(2).CaseClauses);
} break;
-case 254: {
+case 256: {
sym(1).Node = makeAstNode<AST::CaseBlock> (driver->nodePool(), sym(2).CaseClauses, sym(3).DefaultClause, sym(4).CaseClauses);
} break;
-case 255: {
+case 257: {
sym(1).Node = makeAstNode<AST::CaseClauses> (driver->nodePool(), sym(1).CaseClause);
} break;
-case 256: {
+case 258: {
sym(1).Node = makeAstNode<AST::CaseClauses> (driver->nodePool(), sym(1).CaseClauses, sym(2).CaseClause);
} break;
-case 257: {
+case 259: {
sym(1).Node = 0;
} break;
-case 258: {
+case 260: {
sym(1).Node = sym(1).CaseClauses->finish ();
} break;
-case 259: {
+case 261: {
sym(1).Node = makeAstNode<AST::CaseClause> (driver->nodePool(), sym(2).Expression, sym(4).StatementList);
} break;
-case 260: {
+case 262: {
sym(1).Node = makeAstNode<AST::DefaultClause> (driver->nodePool(), sym(3).StatementList);
} break;
-case 261: {
+case 263: {
sym(1).Node = makeAstNode<AST::LabelledStatement> (driver->nodePool(), sym(1).sval, sym(3).Statement);
} break;
-case 263: {
+case 265: {
sym(1).Node = makeAstNode<AST::ThrowStatement> (driver->nodePool(), sym(2).Expression);
} break;
-case 264: {
+case 266: {
sym(1).Node = makeAstNode<AST::TryStatement> (driver->nodePool(), sym(2).Statement, sym(3).Catch);
} break;
-case 265: {
+case 267: {
sym(1).Node = makeAstNode<AST::TryStatement> (driver->nodePool(), sym(2).Statement, sym(3).Finally);
} break;
-case 266: {
+case 268: {
sym(1).Node = makeAstNode<AST::TryStatement> (driver->nodePool(), sym(2).Statement, sym(3).Catch, sym(4).Finally);
} break;
-case 267: {
+case 269: {
sym(1).Node = makeAstNode<AST::Catch> (driver->nodePool(), sym(3).sval, sym(5).Statement);
} break;
-case 268: {
+case 270: {
sym(1).Node = makeAstNode<AST::Finally> (driver->nodePool(), sym(2).Statement);
} break;
-case 270: {
+case 272: {
sym(1).Node = makeAstNode<AST::DebuggerStatement> (driver->nodePool());
} break;
-case 271: {
+case 273: {
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);
@@ -1056,7 +1066,7 @@ case 271: {
sym(1).Node = node;
} break;
-case 272: {
+case 274: {
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)
@@ -1068,56 +1078,56 @@ case 272: {
sym(1).Node = node;
} break;
-case 273: {
+case 275: {
AST::FormalParameterList *node = makeAstNode<AST::FormalParameterList> (driver->nodePool(), sym(1).sval);
node->identifierToken = loc(1);
sym(1).Node = node;
} break;
-case 274: {
+case 276: {
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 275: {
+case 277: {
sym(1).Node = 0;
} break;
-case 276: {
+case 278: {
sym(1).Node = sym(1).FormalParameterList->finish ();
} break;
-case 277: {
+case 279: {
sym(1).Node = 0;
} break;
-case 279: {
+case 281: {
sym(1).Node = makeAstNode<AST::FunctionBody> (driver->nodePool(), sym(1).SourceElements->finish ());
} break;
-case 280: {
+case 282: {
sym(1).Node = makeAstNode<AST::SourceElements> (driver->nodePool(), sym(1).SourceElement);
} break;
-case 281: {
+case 283: {
sym(1).Node = makeAstNode<AST::SourceElements> (driver->nodePool(), sym(1).SourceElements, sym(2).SourceElement);
} break;
-case 282: {
+case 284: {
sym(1).Node = makeAstNode<AST::StatementSourceElement> (driver->nodePool(), sym(1).Statement);
} break;
-case 283: {
+case 285: {
sym(1).Node = makeAstNode<AST::FunctionSourceElement> (driver->nodePool(), sym(1).FunctionDeclaration);
} break;
-case 284: {
+case 286: {
sym(1).sval = 0;
} break;
-case 286: {
+case 288: {
sym(1).Node = 0;
} break;
diff --git a/src/declarative/qml/parser/javascriptparser_p.h b/src/declarative/qml/parser/javascriptparser_p.h
index abebf4f..e982985 100644
--- a/src/declarative/qml/parser/javascriptparser_p.h
+++ b/src/declarative/qml/parser/javascriptparser_p.h
@@ -203,9 +203,9 @@ protected:
};
-#define J_SCRIPT_REGEXPLITERAL_RULE1 28
+#define J_SCRIPT_REGEXPLITERAL_RULE1 30
-#define J_SCRIPT_REGEXPLITERAL_RULE2 29
+#define J_SCRIPT_REGEXPLITERAL_RULE2 31
QT_END_NAMESPACE
diff --git a/src/declarative/qml/qmlcomponent.cpp b/src/declarative/qml/qmlcomponent.cpp
index 4a3f9b0..ca849ad 100644
--- a/src/declarative/qml/qmlcomponent.cpp
+++ b/src/declarative/qml/qmlcomponent.cpp
@@ -345,20 +345,6 @@ void QmlComponent::loadUrl(const QUrl &url)
d->fromTypeData(data);
-<<<<<<< HEAD:src/declarative/qml/qmlcomponent.cpp
-=======
- // Compile data
- QmlCompiler compiler;
- if(!compiler.compile(d->engine, parser, d->cc)) {
- qWarning().nospace()
-#ifdef QML_VERBOSEERRORS_ENABLED
- << "QmlComponent: "
-#endif
- << compiler.errorDescription().toLatin1().constData() << " @"
- << d->name.toLatin1().constData() << ":"
- << compiler.errorLine();
- }
->>>>>>> support both *.qml and *.whatever with autodetection. Some debug output, some fixes.:src/declarative/qml/qmlcomponent.cpp
}
emit statusChanged(status());
diff --git a/src/declarative/qml/qmlscriptparser.cpp b/src/declarative/qml/qmlscriptparser.cpp
index 8167c24..ddd473a 100644
--- a/src/declarative/qml/qmlscriptparser.cpp
+++ b/src/declarative/qml/qmlscriptparser.cpp
@@ -389,7 +389,9 @@ bool ProcessAST::visit(AST::UiScriptBinding *node)
primitive = getPrimitive(prop->name, stmt->expression);
} else {
+ out << '{';
pp(node->statement);
+ out << '}';
}
Value *v = new Value;
@@ -425,7 +427,7 @@ bool ProcessAST::visit(AST::UiArrayBinding *node)
QmlScriptParser::QmlScriptParser()
- : root(0)
+ : root(0), _errorLine(-1)
{
}
@@ -450,6 +452,7 @@ bool QmlScriptParser::parse(const QByteArray &data, const QUrl &url)
if (! parser.parse(&driver)) {
_error = parser.errorMessage();
+ _errorLine = parser.errorLineNumber();
return false;
}
@@ -464,6 +467,11 @@ QString QmlScriptParser::errorDescription() const
return _error;
}
+int QmlScriptParser::errorLine() const
+{
+ return _errorLine;
+}
+
QMap<QString,QString> QmlScriptParser::nameSpacePaths() const
{
qWarning() << Q_FUNC_INFO << "not implemented";
diff --git a/src/declarative/qml/qmlscriptparser_p.h b/src/declarative/qml/qmlscriptparser_p.h
index d9a557f..b24662e 100644
--- a/src/declarative/qml/qmlscriptparser_p.h
+++ b/src/declarative/qml/qmlscriptparser_p.h
@@ -20,6 +20,7 @@ public:
bool parse(const QByteArray &data, const QUrl &url = QUrl());
QString errorDescription() const;
+ int errorLine() const;
QMap<QString,QString> nameSpacePaths() const;
QStringList types() const;
@@ -35,6 +36,7 @@ private:
QmlParser::Object *root;
QStringList _typeNames;
QString _error;
+ int _errorLine;
};
QT_END_NAMESPACE
generated by cgit v0.12 at 2024-11-22 02:11:57 (GMT)