summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRoberto Raggi <roberto.raggi@nokia.com>2009-04-22 14:17:39 (GMT)
committerRoberto Raggi <roberto.raggi@nokia.com>2009-04-24 08:05:54 (GMT)
commitc9c559b606664681af5e87c6a2128c8c0b1979d0 (patch)
tree0a4eb1e576a1b17ad3f5c9e541fd23f46d9e0cfe
parent6cff4b9dcc3095cb2dfc1dc9653a7bf958fe91d3 (diff)
downloadQt-c9c559b606664681af5e87c6a2128c8c0b1979d0.zip
Qt-c9c559b606664681af5e87c6a2128c8c0b1979d0.tar.gz
Qt-c9c559b606664681af5e87c6a2128c8c0b1979d0.tar.bz2
Removed the UiObjectInitialized from UiPublicMember.
Diffstat
-rw-r--r--src/declarative/qml/parser/javascript.g15
-rw-r--r--src/declarative/qml/parser/javascriptast.cpp1
-rw-r--r--src/declarative/qml/parser/javascriptast_p.h15
-rw-r--r--src/declarative/qml/parser/javascriptgrammar.cpp1052
-rw-r--r--src/declarative/qml/parser/javascriptgrammar_p.h34
-rw-r--r--src/declarative/qml/parser/javascriptparser.cpp370
-rw-r--r--src/declarative/qml/parser/javascriptparser_p.h4
-rw-r--r--src/declarative/qml/qmlscriptparser.cpp13
8 files changed, 755 insertions, 749 deletions
diff --git a/src/declarative/qml/parser/javascript.g b/src/declarative/qml/parser/javascript.g
index 219610e..3686aac 100644
--- a/src/declarative/qml/parser/javascript.g
+++ b/src/declarative/qml/parser/javascript.g
@@ -618,19 +618,6 @@ case $rule_number: {
} break;
./
-UiObjectMember: T_PUBLIC T_IDENTIFIER T_IDENTIFIER T_COLON Expression UiObjectInitializer ;
-/.
-case $rule_number: {
- AST::UiPublicMember *node = makeAstNode<AST::UiPublicMember> (driver->nodePool(), sym(2).sval, sym(3).sval,
- sym(5).Expression, sym(6).UiObjectInitializer);
- node->publicToken = loc(1);
- node->attributeTypeToken = loc(2);
- node->identifierToken = loc(3);
- node->colonToken = loc(4);
- sym(1).Node = node;
-} break;
-./
-
UiObjectMember: T_PUBLIC T_IDENTIFIER T_IDENTIFIER ;
/.
case $rule_number: {
@@ -646,7 +633,7 @@ UiObjectMember: T_PUBLIC T_IDENTIFIER T_IDENTIFIER T_COLON Expression ;
/.
case $rule_number: {
AST::UiPublicMember *node = makeAstNode<AST::UiPublicMember> (driver->nodePool(), sym(2).sval, sym(3).sval,
- sym(5).Expression, static_cast<AST::UiObjectInitializer *>(0));
+ sym(5).Expression);
node->publicToken = loc(1);
node->attributeTypeToken = loc(2);
node->identifierToken = loc(3);
diff --git a/src/declarative/qml/parser/javascriptast.cpp b/src/declarative/qml/parser/javascriptast.cpp
index 35563ac..f9ef71d 100644
--- a/src/declarative/qml/parser/javascriptast.cpp
+++ b/src/declarative/qml/parser/javascriptast.cpp
@@ -797,7 +797,6 @@ void UiPublicMember::accept0(Visitor *visitor)
{
if (visitor->visit(this)) {
acceptChild(expression, visitor);
- acceptChild(initializer, visitor);
}
visitor->endVisit(this);
diff --git a/src/declarative/qml/parser/javascriptast_p.h b/src/declarative/qml/parser/javascriptast_p.h
index 56b2ec6..5176726 100644
--- a/src/declarative/qml/parser/javascriptast_p.h
+++ b/src/declarative/qml/parser/javascriptast_p.h
@@ -1891,26 +1891,23 @@ class UiPublicMember: public UiObjectMember
public:
JAVASCRIPT_DECLARE_AST_NODE(UiPublicMember)
- UiPublicMember(JavaScriptNameIdImpl *type,
+ UiPublicMember(JavaScriptNameIdImpl *memberType,
JavaScriptNameIdImpl *name)
- : type(type), name(name), expression(0), initializer(0)
+ : memberType(memberType), name(name), expression(0)
{ kind = K; }
- UiPublicMember(JavaScriptNameIdImpl *type,
+ UiPublicMember(JavaScriptNameIdImpl *memberType,
JavaScriptNameIdImpl *name,
- ExpressionNode *expression,
- UiObjectInitializer *initializer)
- : type(type), name(name),
- expression(expression), initializer(initializer)
+ ExpressionNode *expression)
+ : memberType(memberType), name(name), expression(expression)
{ kind = K; }
virtual void accept0(Visitor *visitor);
// attributes
- JavaScriptNameIdImpl *type;
+ JavaScriptNameIdImpl *memberType;
JavaScriptNameIdImpl *name;
ExpressionNode *expression;
- UiObjectInitializer *initializer;
SourceLocation publicToken;
SourceLocation attributeTypeToken;
SourceLocation identifierToken;
diff --git a/src/declarative/qml/parser/javascriptgrammar.cpp b/src/declarative/qml/parser/javascriptgrammar.cpp
index 0b25807..dfa0c69 100644
--- a/src/declarative/qml/parser/javascriptgrammar.cpp
+++ b/src/declarative/qml/parser/javascriptgrammar.cpp
@@ -1,4 +1,17 @@
// This file was generated by qlalr - DO NOT EDIT!
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+**
+** This file is part of the $MODULE$ of the Qt Toolkit.
+**
+** $TROLLTECH_DUAL_LICENSE$
+**
+** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
+** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
+**
+****************************************************************************/
+
#include "javascriptgrammar_p.h"
const char *const JavaScriptGrammar::spell [] = {
@@ -15,439 +28,434 @@ const char *const JavaScriptGrammar::spell [] = {
const int JavaScriptGrammar::lhs [] = {
88, 89, 89, 92, 92, 93, 93, 91, 90, 90,
95, 95, 97, 97, 96, 94, 96, 94, 96, 94,
- 96, 94, 94, 94, 94, 94, 94, 98, 98, 103,
+ 96, 94, 94, 94, 94, 94, 98, 98, 103, 103,
103, 103, 103, 103, 103, 103, 103, 103, 103, 103,
- 103, 103, 103, 103, 105, 105, 109, 109, 104, 104,
- 107, 107, 110, 110, 110, 110, 111, 111, 111, 111,
+ 103, 103, 103, 105, 105, 109, 109, 104, 104, 107,
+ 107, 110, 110, 110, 110, 111, 111, 111, 111, 111,
111, 111, 111, 111, 111, 111, 111, 111, 111, 111,
111, 111, 111, 111, 111, 111, 111, 111, 111, 111,
- 111, 111, 111, 111, 111, 111, 111, 112, 112, 113,
- 113, 113, 113, 113, 116, 116, 117, 117, 117, 117,
- 115, 115, 118, 118, 119, 119, 120, 120, 120, 121,
- 121, 121, 121, 121, 121, 121, 121, 121, 121, 122,
- 122, 122, 122, 123, 123, 123, 124, 124, 124, 124,
- 125, 125, 125, 125, 125, 125, 125, 126, 126, 126,
- 126, 126, 126, 127, 127, 127, 127, 127, 128, 128,
- 128, 128, 128, 129, 129, 130, 130, 131, 131, 132,
- 132, 133, 133, 134, 134, 135, 135, 136, 136, 137,
- 137, 138, 138, 139, 139, 140, 140, 108, 108, 141,
- 141, 142, 142, 142, 142, 142, 142, 142, 142, 142,
- 142, 142, 142, 100, 100, 143, 143, 144, 144, 145,
- 145, 99, 99, 99, 99, 99, 99, 99, 99, 99,
- 99, 99, 99, 99, 99, 99, 146, 161, 161, 160,
- 160, 102, 102, 162, 162, 163, 163, 165, 165, 164,
- 166, 169, 167, 167, 170, 168, 168, 147, 148, 148,
- 149, 149, 150, 150, 150, 150, 150, 150, 150, 151,
- 151, 151, 151, 152, 152, 152, 152, 153, 153, 154,
- 156, 171, 171, 174, 174, 172, 172, 175, 173, 155,
- 157, 157, 158, 158, 158, 176, 177, 159, 159, 101,
- 114, 181, 181, 178, 178, 179, 179, 182, 183, 183,
- 184, 184, 180, 180, 106, 106, 185};
+ 111, 111, 111, 111, 111, 111, 112, 112, 113, 113,
+ 113, 113, 113, 116, 116, 117, 117, 117, 117, 115,
+ 115, 118, 118, 119, 119, 120, 120, 120, 121, 121,
+ 121, 121, 121, 121, 121, 121, 121, 121, 122, 122,
+ 122, 122, 123, 123, 123, 124, 124, 124, 124, 125,
+ 125, 125, 125, 125, 125, 125, 126, 126, 126, 126,
+ 126, 126, 127, 127, 127, 127, 127, 128, 128, 128,
+ 128, 128, 129, 129, 130, 130, 131, 131, 132, 132,
+ 133, 133, 134, 134, 135, 135, 136, 136, 137, 137,
+ 138, 138, 139, 139, 140, 140, 108, 108, 141, 141,
+ 142, 142, 142, 142, 142, 142, 142, 142, 142, 142,
+ 142, 142, 100, 100, 143, 143, 144, 144, 145, 145,
+ 99, 99, 99, 99, 99, 99, 99, 99, 99, 99,
+ 99, 99, 99, 99, 99, 146, 161, 161, 160, 160,
+ 102, 102, 162, 162, 163, 163, 165, 165, 164, 166,
+ 169, 167, 167, 170, 168, 168, 147, 148, 148, 149,
+ 149, 150, 150, 150, 150, 150, 150, 150, 151, 151,
+ 151, 151, 152, 152, 152, 152, 153, 153, 154, 156,
+ 171, 171, 174, 174, 172, 172, 175, 173, 155, 157,
+ 157, 158, 158, 158, 176, 177, 159, 159, 101, 114,
+ 181, 181, 178, 178, 179, 179, 182, 183, 183, 184,
+ 184, 180, 180, 106, 106, 185};
const int JavaScriptGrammar:: rhs[] = {
2, 1, 1, 1, 2, 3, 3, 0, 1, 2,
1, 3, 2, 3, 4, 4, 2, 2, 5, 5,
- 3, 3, 6, 3, 5, 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,
+ 3, 3, 3, 5, 1, 1, 1, 3, 1, 1,
+ 1, 1, 1, 1, 1, 1, 1, 3, 3, 5,
+ 3, 4, 3, 2, 4, 1, 2, 0, 1, 3,
+ 5, 1, 1, 1, 1, 1, 1, 1, 1, 1,
+ 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
+ 4, 3, 5, 1, 2, 4, 4, 4, 3, 0,
+ 1, 1, 3, 1, 1, 1, 2, 2, 1, 2,
+ 2, 2, 2, 2, 2, 2, 2, 2, 1, 3,
+ 3, 3, 1, 3, 3, 1, 3, 3, 3, 1,
+ 3, 3, 3, 3, 3, 3, 1, 3, 3, 3,
+ 3, 3, 1, 3, 3, 3, 3, 1, 3, 3,
+ 3, 3, 1, 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, 4, 3, 5, 1, 2, 4, 4, 4, 3,
- 0, 1, 1, 3, 1, 1, 1, 2, 2, 1,
- 2, 2, 2, 2, 2, 2, 2, 2, 2, 1,
- 3, 3, 3, 1, 3, 3, 1, 3, 3, 3,
- 1, 3, 3, 3, 3, 3, 3, 1, 3, 3,
- 3, 3, 3, 1, 3, 3, 3, 3, 1, 3,
- 3, 3, 3, 1, 3, 1, 3, 1, 3, 1,
- 3, 1, 3, 1, 3, 1, 3, 1, 3, 1,
- 3, 1, 3, 1, 5, 1, 5, 1, 3, 1,
- 3, 1, 1, 1, 1, 1, 1, 1, 1, 1,
- 1, 1, 1, 1, 3, 0, 1, 1, 3, 0,
+ 1, 1, 1, 3, 0, 1, 1, 3, 0, 1,
1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
- 1, 1, 1, 1, 1, 1, 3, 1, 2, 0,
- 1, 3, 3, 1, 1, 1, 3, 1, 3, 2,
- 2, 2, 0, 1, 2, 0, 1, 1, 2, 2,
- 7, 5, 7, 7, 5, 9, 10, 7, 8, 2,
- 2, 3, 3, 2, 2, 3, 3, 3, 3, 5,
- 5, 3, 5, 1, 2, 0, 1, 4, 3, 3,
- 3, 3, 3, 3, 4, 5, 2, 2, 2, 8,
- 8, 1, 3, 0, 1, 0, 1, 1, 1, 2,
- 1, 1, 0, 1, 0, 1, 2};
+ 1, 1, 1, 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, 297, 0, 6,
- 7, 5, 26, 224, 0, 28, 0, 225, 9, 1,
- 0, 0, 27, 0, 284, 285, 0, 282, 0, 283,
- 0, 286, 127, 194, 158, 166, 162, 202, 209, 106,
- 178, 208, 216, 204, 154, 0, 205, 287, 0, 292,
- 91, 206, 207, 212, 107, 170, 174, 95, 124, 105,
- 110, 90, 144, 210, 131, 289, 288, 291, 213, 0,
- 0, 0, 0, 37, 38, 0, 34, 0, 293, 31,
- 0, 295, 49, 0, 0, 0, 0, 0, 32, 35,
- 0, 0, 196, 238, 36, 0, 30, 0, 0, 33,
- 0, 0, 0, 0, 0, 214, 215, 120, 203, 211,
- 0, 0, 107, 126, 293, 31, 295, 109, 108, 0,
- 0, 0, 122, 123, 121, 0, 294, 284, 0, 0,
- 286, 0, 281, 0, 296, 0, 56, 57, 58, 59,
- 84, 60, 85, 61, 62, 63, 64, 65, 66, 67,
- 68, 53, 69, 70, 71, 72, 73, 55, 86, 74,
- 54, 75, 76, 77, 78, 79, 80, 81, 82, 83,
- 87, 0, 51, 0, 0, 43, 0, 52, 42, 125,
- 0, 155, 0, 0, 0, 0, 145, 0, 0, 0,
- 0, 0, 0, 135, 0, 0, 0, 129, 130, 128,
- 133, 137, 136, 134, 132, 147, 146, 148, 0, 163,
- 0, 159, 0, 0, 101, 100, 89, 88, 0, 0,
- 99, 195, 102, 0, 103, 0, 104, 98, 239, 240,
- 280, 0, 191, 184, 182, 189, 190, 188, 187, 193,
- 186, 185, 183, 192, 179, 0, 167, 0, 0, 171,
- 0, 0, 175, 0, 0, 101, 93, 0, 92, 0,
- 97, 290, 254, 0, 255, 256, 257, 250, 0, 251,
- 252, 253, 278, 279, 111, 0, 0, 0, 0, 0,
- 243, 244, 200, 198, 160, 168, 164, 180, 156, 201,
- 0, 107, 172, 176, 149, 138, 0, 0, 157, 0,
- 0, 0, 0, 150, 0, 0, 0, 0, 0, 142,
- 140, 143, 141, 139, 152, 151, 153, 0, 165, 0,
- 161, 0, 199, 107, 0, 181, 196, 197, 0, 196,
- 0, 0, 246, 0, 0, 0, 248, 0, 169, 0,
- 0, 173, 0, 0, 177, 236, 0, 228, 237, 231,
- 0, 235, 0, 196, 229, 0, 196, 0, 0, 247,
- 0, 0, 0, 249, 294, 0, 270, 0, 0, 0,
- 242, 0, 241, 218, 221, 0, 57, 84, 60, 85,
- 62, 63, 34, 67, 68, 31, 69, 72, 32, 35,
- 196, 36, 75, 30, 77, 33, 79, 80, 81, 82,
- 83, 87, 219, 217, 95, 96, 101, 0, 94, 0,
- 258, 259, 0, 0, 0, 261, 266, 264, 267, 0,
- 0, 265, 266, 0, 262, 0, 263, 220, 269, 0,
- 220, 268, 0, 271, 272, 0, 220, 273, 274, 0,
- 0, 275, 0, 0, 0, 276, 277, 113, 112, 0,
- 0, 0, 245, 0, 0, 0, 260, 0, 50, 0,
- 47, 49, 40, 0, 46, 41, 48, 45, 39, 0,
- 44, 117, 115, 119, 116, 114, 118, 0, 18, 13,
- 0, 14, 10, 0, 24, 0, 25, 23, 0, 0,
- 22, 31, 49, 16, 28, 0, 11, 0, 17, 0,
- 20, 12, 0, 21, 31, 49, 15, 0, 19, 29,
- 233, 226, 0, 234, 230, 0, 232, 222, 0, 223,
- 227};
+ 8, 2, 0, 0, 4, 3, 0, 296, 0, 6,
+ 7, 5, 25, 223, 0, 27, 0, 224, 9, 1,
+ 0, 0, 26, 0, 283, 284, 0, 281, 0, 282,
+ 0, 285, 126, 193, 157, 165, 161, 201, 208, 105,
+ 177, 207, 215, 203, 153, 0, 204, 286, 0, 291,
+ 90, 205, 206, 211, 106, 169, 173, 94, 123, 104,
+ 109, 89, 143, 209, 130, 288, 287, 290, 212, 0,
+ 0, 0, 0, 36, 37, 0, 33, 0, 292, 30,
+ 0, 294, 48, 0, 0, 0, 0, 0, 31, 34,
+ 0, 0, 195, 237, 35, 0, 29, 0, 0, 32,
+ 0, 0, 0, 0, 0, 213, 214, 119, 202, 210,
+ 0, 0, 106, 125, 292, 30, 294, 108, 107, 0,
+ 0, 0, 121, 122, 120, 0, 293, 283, 0, 0,
+ 285, 0, 280, 0, 295, 0, 55, 56, 57, 58,
+ 83, 59, 84, 60, 61, 62, 63, 64, 65, 66,
+ 67, 52, 68, 69, 70, 71, 72, 54, 85, 73,
+ 53, 74, 75, 76, 77, 78, 79, 80, 81, 82,
+ 86, 0, 50, 0, 0, 42, 0, 51, 41, 124,
+ 0, 154, 0, 0, 0, 0, 144, 0, 0, 0,
+ 0, 0, 0, 134, 0, 0, 0, 128, 129, 127,
+ 132, 136, 135, 133, 131, 146, 145, 147, 0, 162,
+ 0, 158, 0, 0, 100, 99, 88, 87, 0, 0,
+ 98, 194, 101, 0, 102, 0, 103, 97, 238, 239,
+ 279, 0, 190, 183, 181, 188, 189, 187, 186, 192,
+ 185, 184, 182, 191, 178, 0, 166, 0, 0, 170,
+ 0, 0, 174, 0, 0, 100, 92, 0, 91, 0,
+ 96, 289, 253, 0, 254, 255, 256, 249, 0, 250,
+ 251, 252, 277, 278, 110, 0, 0, 0, 0, 0,
+ 242, 243, 199, 197, 159, 167, 163, 179, 155, 200,
+ 0, 106, 171, 175, 148, 137, 0, 0, 156, 0,
+ 0, 0, 0, 149, 0, 0, 0, 0, 0, 141,
+ 139, 142, 140, 138, 151, 150, 152, 0, 164, 0,
+ 160, 0, 198, 106, 0, 180, 195, 196, 0, 195,
+ 0, 0, 245, 0, 0, 0, 247, 0, 168, 0,
+ 0, 172, 0, 0, 176, 235, 0, 227, 236, 230,
+ 0, 234, 0, 195, 228, 0, 195, 0, 0, 246,
+ 0, 0, 0, 248, 293, 0, 269, 0, 0, 0,
+ 241, 0, 240, 217, 220, 0, 56, 83, 59, 84,
+ 61, 62, 33, 66, 67, 30, 68, 71, 31, 34,
+ 195, 35, 74, 29, 76, 32, 78, 79, 80, 81,
+ 82, 86, 218, 216, 94, 95, 100, 0, 93, 0,
+ 257, 258, 0, 0, 0, 260, 265, 263, 266, 0,
+ 0, 264, 265, 0, 261, 0, 262, 219, 268, 0,
+ 219, 267, 0, 270, 271, 0, 219, 272, 273, 0,
+ 0, 274, 0, 0, 0, 275, 276, 112, 111, 0,
+ 0, 0, 244, 0, 0, 0, 259, 0, 49, 0,
+ 46, 48, 39, 0, 45, 40, 47, 44, 38, 0,
+ 43, 116, 114, 118, 115, 113, 117, 0, 18, 13,
+ 0, 14, 10, 0, 23, 0, 24, 0, 0, 22,
+ 30, 48, 16, 27, 0, 11, 0, 17, 0, 20,
+ 12, 0, 21, 30, 48, 15, 0, 19, 28, 232,
+ 225, 0, 233, 229, 0, 231, 221, 0, 222, 226};
const int JavaScriptGrammar::goto_default [] = {
- 2, 6, 19, 1, 5, 4, 18, 495, 496, 478,
+ 2, 6, 19, 1, 5, 4, 18, 494, 495, 478,
20, 373, 45, 12, 108, 61, 459, 457, 135, 134,
33, 458, 133, 136, 215, 57, 50, 223, 59, 39,
222, 54, 60, 107, 58, 32, 64, 62, 294, 44,
288, 34, 284, 36, 286, 35, 285, 55, 292, 56,
293, 40, 287, 283, 324, 409, 289, 290, 37, 43,
46, 51, 52, 41, 38, 63, 109, 53, 68, 105,
- 106, 42, 375, 374, 21, 512, 511, 346, 347, 514,
- 349, 513, 348, 415, 419, 422, 418, 417, 437, 438,
+ 106, 42, 375, 374, 21, 511, 510, 346, 347, 513,
+ 349, 512, 348, 415, 419, 422, 418, 417, 437, 438,
26, 48, 125, 25, 47, 66, 65, 0};
const int JavaScriptGrammar::action_index [] = {
- -19, -88, 70, 4, -88, -6, 252, -88, 75, -88,
- -88, -88, -88, -88, 46, 50, 52, -88, -88, 241,
- 100, 65, -88, -17, -12, 16, -30, -88, -1, -88,
- -7, 1307, 114, -88, 14, -44, -75, -88, -88, 199,
- -88, -88, -88, -88, 250, 228, -88, -88, -22, -88,
- -88, -88, -88, -88, 498, 140, 96, 172, 195, -88,
- -88, -88, 311, -88, 216, -88, 1307, -88, -88, 194,
- 198, 99, 575, -88, -88, 1223, -88, 72, 67, 92,
- 64, 1559, 90, 575, 575, 575, 374, 575, -88, -88,
- 575, 575, 575, -88, -88, 48, -88, 575, 575, -88,
- 55, 575, 575, 51, 59, -88, -88, -88, -88, -88,
- 575, 575, 77, 168, 60, -88, 1055, -88, -88, 575,
- 575, 575, -88, -88, -88, 24, -88, -18, -55, 43,
- 1307, -26, -88, 84, 85, 63, -88, -88, -88, -88,
+ -25, -88, 89, 70, -88, -15, 251, -88, 85, -88,
+ -88, -88, -88, -88, 56, 48, 46, -88, -88, 262,
+ 127, 72, -88, -17, -9, 20, -29, -88, -3, -88,
+ -6, 1289, 112, -88, 13, -44, -76, -88, -88, 212,
+ -88, -88, -88, -88, 253, 228, -88, -88, -10, -88,
+ -88, -88, -88, -88, 347, 53, 87, 154, 274, -88,
+ -88, -88, 287, -88, 191, -88, 1289, -88, -88, 199,
+ 194, 115, 557, -88, -88, 1205, -88, 66, 71, 77,
+ 63, 1541, 79, 557, 557, 557, 480, 557, -88, -88,
+ 557, 557, 557, -88, -88, 60, -88, 557, 557, -88,
+ 41, 557, 557, 42, 44, -88, -88, -88, -88, -88,
+ 557, 557, 83, 177, -24, -88, 1037, -88, -88, 557,
+ 557, 557, -88, -88, -88, 25, -88, -18, -58, -8,
+ 1289, -26, -88, 58, 64, 67, -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,
- -88, 575, -88, 1139, 30, -88, 575, -88, -88, 208,
- 575, 232, 575, 575, 575, 575, 321, 575, 575, 575,
- 575, 575, 575, 219, 575, 575, 575, 127, 134, 122,
- 154, 159, 174, 166, 173, 413, 413, 295, 575, -3,
- 575, 71, 971, 575, 575, -88, -88, -88, 97, 575,
- -88, -88, 69, 62, -88, 575, -88, -88, -88, -88,
- -88, 575, -88, -88, -88, -88, -88, -88, -88, -88,
- -88, -88, -88, -88, -88, 575, 49, 575, 575, 140,
- 58, 575, -88, 971, 575, 575, -88, 126, -88, 11,
- -88, -88, -88, 86, -88, -88, -88, -88, 78, -88,
- -88, -88, -88, -88, -88, 28, 68, 575, 149, 66,
- -88, -88, 887, -88, 54, -28, -58, -88, 254, 8,
- -47, 429, 19, 79, 280, 192, -4, 575, 248, 575,
- 575, 575, 575, 348, 575, 575, 575, 575, 575, 188,
- 283, 191, 207, 215, 348, 348, 274, 575, -74, 575,
- 54, 575, -88, 498, 575, -88, 575, -5, -61, 575,
- -33, 1223, -88, 575, 220, 1223, -88, 575, -38, 575,
- 575, 7, 0, 575, -88, -9, 98, 1, -88, -88,
- 575, -88, 21, 575, -88, 3, 575, 2, 1223, -88,
- 575, 112, 1223, -88, 27, 1223, -88, 575, 106, 1223,
- 41, 1223, -88, -88, 1223, -16, 141, 9, 176, 82,
- 575, 1223, 33, 10, 74, 38, 12, 355, 40, 37,
- 656, 35, -2, 34, 575, 29, 20, 575, 32, 575,
- 31, 42, -88, -88, 160, -88, 575, -8, -88, 94,
- -88, -88, 575, 150, 25, -88, 17, -88, 44, 113,
- 575, -88, 26, 36, -88, -20, -88, 1223, -88, 105,
- 1223, -88, 214, -88, -88, 115, 1223, 39, -88, 18,
- 23, -88, 22, -54, -21, -88, -88, -88, -88, 575,
- 161, 1223, -88, 575, 130, 1223, -88, 133, 5, 810,
- -88, 15, -88, 733, -88, -88, -88, -88, -88, 123,
- -88, -88, -88, -88, -88, -88, -88, 285, -88, -88,
- 309, -88, -88, 45, 61, 575, 155, -88, 1391, 53,
- -88, 119, 103, -88, 47, 93, -88, 102, -88, 56,
- -88, -88, 1475, -88, 118, 116, -88, 108, -88, -88,
- 73, -88, 187, -88, -88, 575, -88, -88, 57, -88,
- -88,
+ -88, 557, -88, 1121, 55, -88, 557, -88, -88, 175,
+ 557, 250, 557, 557, 557, 557, 404, 557, 557, 557,
+ 557, 557, 557, 158, 557, 557, 557, 80, 73, 81,
+ 197, 238, 220, 159, 167, 277, 404, 317, 557, 14,
+ 557, 90, 953, 557, 557, -88, -88, -88, 108, 557,
+ -88, -88, 65, 49, -88, 557, -88, -88, -88, -88,
+ -88, 557, -88, -88, -88, -88, -88, -88, -88, -88,
+ -88, -88, -88, -88, -88, 557, 45, 557, 557, 75,
+ 69, 557, -88, 953, 557, 557, -88, 153, -88, 6,
+ -88, -88, -88, 105, -88, -88, -88, -88, 111, -88,
+ -88, -88, -88, -88, -88, 21, 62, 557, 122, 95,
+ -88, -88, 634, -88, 39, -30, -59, -88, 259, 8,
+ -46, 417, 19, 125, 339, 188, -7, 557, 248, 557,
+ 557, 557, 557, 339, 557, 557, 557, 557, 557, 187,
+ 166, 192, 206, 232, 339, 339, 339, 557, -59, 557,
+ 39, 557, -88, 380, 557, -88, 557, -5, -60, 557,
+ -48, 1205, -88, 557, 142, 1205, -88, 557, -38, 557,
+ 557, 7, 0, 557, -88, 17, 84, 22, -88, -88,
+ 557, -88, 27, 557, -88, -13, 557, 52, 1205, -88,
+ 557, 102, 1205, -88, 28, 1205, -88, 557, 100, 1205,
+ 34, 1205, -88, -88, 1205, -19, 139, 9, 149, 82,
+ 557, 1205, 23, 1, 119, 36, 10, 480, 40, 120,
+ 869, 35, 5, 26, 557, 37, -1, 557, 29, 557,
+ 31, 33, -88, -88, 205, -88, 557, -11, -88, 78,
+ -88, -88, 557, 98, 38, -88, 47, -88, 54, 198,
+ 557, -88, 30, 32, -88, -4, -88, 1205, -88, 107,
+ 1205, -88, 213, -88, -88, 113, 1205, 43, -88, 18,
+ 24, -88, -21, -54, -20, -88, -88, -88, -88, 557,
+ 143, 1205, -88, 557, 110, 1205, -88, 118, 16, 788,
+ -88, 15, -88, 711, -88, -88, -88, -88, -88, 121,
+ -88, -88, -88, -88, -88, -88, -88, 298, -88, -88,
+ 284, -88, -88, 59, 76, 557, 74, 1373, 57, -88,
+ 147, 130, -88, 61, 97, -88, 96, -88, 50, -88,
+ -88, 1457, -88, 116, 99, -88, 109, -88, -88, 51,
+ -88, 190, -88, -88, 557, -88, -88, 68, -88, -88,
- -98, -98, -98, -98, -98, 31, 17, -98, -98, -98,
- -98, -98, -98, -98, -98, -98, -98, -98, -98, 67,
+ -98, -98, -98, -98, -98, 30, 13, -98, -98, -98,
+ -98, -98, -98, -98, -98, -98, -98, -98, -98, 87,
-98, -98, -98, -98, -98, -98, -98, -98, -98, -98,
- -98, 63, -98, -98, -98, -98, -98, -98, -98, -98,
+ -98, 83, -98, -98, -98, -98, -98, -98, -98, -98,
-98, -98, -98, -98, -98, -98, -98, -98, -98, -98,
- -98, -98, -98, -98, -45, -98, -98, -98, -98, -98,
- -98, -98, -98, -98, -98, -98, 186, -98, -98, -98,
- -98, -98, 113, -98, -98, -11, -98, -98, -98, -98,
- -98, -98, -98, 43, 116, 112, 134, 147, -98, -98,
- 153, 152, 42, -98, -98, -98, -98, 37, 87, -98,
- -15, 90, 84, -98, -98, -98, -98, -98, -98, -98,
- 78, 94, -98, -98, -98, -98, -98, -98, -98, 103,
- 102, 96, -98, -98, -98, -98, -98, -49, -98, -98,
+ -98, -98, -98, -98, -43, -98, -98, -98, -98, -98,
+ -98, -98, -98, -98, -98, -98, 184, -98, -98, -98,
+ -98, -98, 113, -98, -98, -9, -98, -98, -98, -98,
+ -98, -98, -98, 42, 116, 112, 127, 146, -98, -98,
+ 151, 147, 40, -98, -98, -98, -98, 37, 89, -98,
+ -10, 90, 86, -98, -98, -98, -98, -98, -98, -98,
+ 77, 94, -98, -98, -98, -98, -98, -98, -98, 106,
+ 103, 98, -98, -98, -98, -98, -98, -47, -98, -98,
253, -98, -98, -98, -98, -98, -98, -98, -98, -98,
-98, -98, -98, -98, -98, -98, -98, -98, -98, -98,
-98, -98, -98, -98, -98, -98, -98, -98, -98, -98,
-98, -98, -98, -98, -98, -98, -98, -98, -98, -98,
- -98, 1, -98, -17, -98, -98, -7, -98, -98, -98,
- 133, -98, 119, 123, 130, 132, -98, 121, 34, 46,
- 33, 61, 59, -98, 68, 48, 40, -98, -98, -98,
- -98, -98, -98, -98, -98, -98, -98, -98, 57, -98,
- 55, -98, 28, 32, 22, -98, -98, -98, -98, 25,
+ -98, -7, -98, 0, -98, -98, -3, -98, -98, -98,
+ 136, -98, 117, 119, 132, 134, -98, 130, 49, 36,
+ 35, 61, 64, -98, 47, 46, 38, -98, -98, -98,
+ -98, -98, -98, -98, -98, -98, -98, -98, 59, -98,
+ 58, -98, 24, 32, 17, -98, -98, -98, -98, 21,
-98, -98, -98, -98, -98, 8, -98, -98, -98, -98,
- -98, 7, -98, -98, -98, -98, -98, -98, -98, -98,
- -98, -98, -98, -98, -98, 60, -98, 54, -18, -98,
- -98, -10, -98, 117, -8, 131, -98, -98, -98, -98,
+ -98, 4, -98, -98, -98, -98, -98, -98, -98, -98,
+ -98, -98, -98, -98, -98, 60, -98, 57, -19, -98,
+ -98, -17, -98, 118, 44, 133, -98, -98, -98, -98,
-98, -98, -98, -98, -98, -98, -98, -98, -98, -98,
- -98, -98, -98, -98, -98, -98, -98, 5, -98, -98,
- -98, -98, 62, -98, -98, -98, -98, -98, -98, -98,
- -98, -98, -98, -98, -98, -98, -98, 188, -98, 198,
- 185, 179, 189, -98, 83, 77, 80, 95, 106, -98,
- -98, -98, -98, -98, -98, -98, -98, 170, -98, 160,
- -98, 158, -98, -98, 177, -98, 98, -98, -98, 120,
- -98, 26, -98, 27, -98, 29, -98, 157, -98, 156,
- 159, -98, -98, 169, -98, -98, -98, -98, -98, -98,
- 195, -98, -52, 126, -98, -98, 127, -98, 18, -98,
- 20, -98, 23, -98, -98, 24, -98, 21, -98, 19,
- -98, 47, -98, -98, 50, -98, -98, -98, -98, -98,
- 91, 52, -98, -98, -98, -98, -98, 79, -98, -98,
- 36, -98, -98, -98, 44, -98, -34, 135, -98, 146,
- -98, -98, -98, -98, -98, -98, 128, -98, -98, -98,
- -98, -98, 75, -98, -98, -98, -98, -98, -80, -98,
- 6, -98, -65, -98, -98, -98, -98, -57, -98, -98,
- -58, -98, -98, -98, -98, -98, -98, -69, -98, -98,
- -42, -98, -98, -98, -46, -98, -98, -98, -98, 10,
- -98, 12, -98, -1, -98, -5, -98, -98, -98, -19,
- -98, -13, -98, -12, -98, -98, -98, -98, -98, -98,
- -98, -98, -98, -98, -98, -98, -98, 92, -98, -98,
- 66, -98, -98, -98, -98, 45, 38, -98, 41, -98,
- -98, 53, 49, -98, 51, -98, -98, -98, -98, 58,
- -98, -98, 35, -98, 16, 166, -98, -98, -98, -98,
- -98, -98, -98, -98, -98, 30, -98, -98, -38, -98,
- -98};
+ -98, -98, -98, -98, -98, -98, -98, 3, -98, -98,
+ -98, -98, 67, -98, -98, -98, -98, -98, -98, -98,
+ -98, -98, -98, -98, -98, -98, -98, 186, -98, 196,
+ 183, 177, 187, -98, 82, 76, 79, 96, 99, -98,
+ -98, -98, -98, -98, -98, -98, -98, 168, -98, 158,
+ -98, 156, -98, -98, 175, -98, 102, -98, -98, 104,
+ -98, 25, -98, 27, -98, 29, -98, 155, -98, 154,
+ 157, -98, -98, 167, -98, -98, -98, -98, -98, -98,
+ 193, -98, -48, 126, -98, -98, 128, -98, 15, -98,
+ 19, -98, 22, -98, -98, 23, -98, 20, -98, 18,
+ -98, 34, -98, -98, 53, -98, -98, -98, -98, -98,
+ 93, 52, -98, -98, -98, -98, -98, 81, -98, -98,
+ 45, -98, -98, -98, 43, -98, -35, 137, -98, 141,
+ -98, -98, -98, -98, -98, -98, 131, -98, -98, -98,
+ -98, -98, -8, -98, -98, -98, -98, -98, -77, -98,
+ 6, -98, -76, -98, -98, -98, -98, -52, -98, -98,
+ -51, -98, -98, -98, -98, -98, -98, -75, -98, -98,
+ -46, -98, -98, -98, -49, -98, -98, -98, -98, 7,
+ -98, 5, -98, -12, -98, 75, -98, -98, -98, -14,
+ -98, -11, -98, -13, -98, -98, -98, -98, -98, -98,
+ -98, -98, -98, -98, -98, -98, -98, 73, -98, -98,
+ 56, -98, -98, -98, -98, 41, -98, 39, -98, -98,
+ 50, 48, -98, 51, -98, -98, -98, -98, 66, -98,
+ -98, 31, -98, 16, 166, -98, -98, -98, -98, -98,
+ -98, -98, -98, -98, 26, -98, -98, -38, -98, -98};
const int JavaScriptGrammar::action_info [] = {
- 329, 210, 319, 219, 208, 129, 444, 343, 350, 337,
- 317, 27, 436, 466, 326, 180, 321, 27, 319, 24,
- 317, 337, 420, 460, 28, 345, 31, 331, 29, 132,
- 30, 420, 360, 230, 412, 426, -78, 176, -224, 403,
- -65, -76, -54, 427, -55, -53, 282, -73, 367, 420,
- 345, 443, 408, 436, 442, 297, 436, 371, 416, 440,
- 127, -225, 358, 24, 356, 251, 3, 449, 485, 8,
- 7, 260, 180, 210, 484, 23, 130, 225, 453, 3,
- 477, 483, 509, 477, 412, 494, 510, 449, 436, 126,
- 515, 171, 0, 173, 510, 453, 364, 208, 460, 365,
- 367, 499, 276, 126, 277, 219, 352, 488, 282, 502,
- -293, 460, 430, 219, 219, 489, 499, 489, 178, 117,
- 219, 439, 227, 423, 460, 365, 365, 281, 280, 339,
- 118, 219, 494, 340, 219, 440, 10, 9, 219, 271,
- 270, 461, 245, 273, 272, 494, 247, 266, 265, 500,
- 248, 477, 477, 220, 110, 411, 410, 219, 219, 353,
- 273, 272, 110, 219, 508, 111, 369, 110, 424, 219,
- 263, 0, 362, 111, 110, 253, 0, 0, 111, 194,
- 119, 195, 258, 470, 194, 111, 195, 253, 477, 462,
- 455, 194, 196, 195, 254, 518, 406, 196, 194, 194,
- 195, 195, 264, 262, 196, 268, 254, 119, 255, 279,
- 414, 196, 196, 194, 212, 195, 194, 194, 195, 195,
- 119, 451, 219, 263, 0, 120, 196, 268, 219, 196,
- 196, 121, 194, 213, 195, 214, 219, 269, 267, 0,
- 194, 194, 195, 195, 194, 196, 195, 0, 519, 517,
- 182, 183, 120, 196, 196, 264, 262, 196, 121, 269,
- 267, 0, 0, 14, 0, 120, 299, 300, 182, 183,
- 15, 121, 299, 300, 14, 434, 433, 184, 185, 0,
- 335, 15, 0, 0, 0, 0, 0, 0, 0, 229,
- 228, 0, 0, 301, 302, 184, 185, 304, 305, 301,
- 302, 0, 0, 304, 305, 0, 306, 14, 194, 307,
- 195, 308, 306, 17, 15, 307, 0, 308, 187, 188,
- 0, 196, 13, 0, 17, 16, 189, 190, 0, 0,
- 191, 14, 192, 13, 187, 188, 16, 0, 15, 0,
- 479, 0, 189, 190, 187, 188, 191, 0, 192, 0,
- 0, 0, 189, 190, 0, 0, 191, 17, 192, 0,
- 0, 0, 0, 0, 481, 0, 13, 73, 74, 16,
- 0, 304, 305, 0, 0, 0, 0, 114, 0, 0,
- 306, 17, 0, 307, 115, 308, 73, 74, 116, 82,
- 13, 83, 0, 16, 0, 0, 114, 0, 86, 0,
- 0, 0, 89, 115, 0, 0, 0, 116, 82, 0,
- 83, 0, 0, 0, 0, 0, 0, 86, 0, 0,
- 94, 89, 96, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 232, 88, 99, 76, 187, 188, 0, 94,
- 0, 96, 233, 0, 189, 190, 234, 0, 191, 0,
- 192, 0, 88, 99, 76, 235, 0, 236, 0, 0,
- 333, 0, 0, 0, 0, 0, 0, 0, 237, 0,
- 238, 117, 0, 0, 0, 0, 0, 0, 239, 0,
- 0, 240, 118, 0, 0, 0, 0, 241, 0, 0,
- 0, 0, 0, 242, 0, 0, 0, 0, 0, 0,
- 0, 232, 0, 0, 0, 0, 243, 0, 0, 0,
- 0, 233, 0, 0, 0, 234, 0, 0, 0, 0,
- 0, 0, 0, 0, 235, 0, 236, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 237, 0, 238,
- 117, 0, 0, 0, 0, 0, 0, 239, 0, 0,
- 240, 118, 0, 0, 0, 0, 241, 0, 0, 0,
- 0, 0, 242, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 243, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 72, 73, 74, 0,
- 0, 0, 0, 0, 0, 0, 0, 114, 0, 0,
- 0, 0, 0, 0, 115, 0, 0, 0, 116, 82,
- 0, 83, 0, 0, 0, 84, 0, 85, 86, 87,
- 0, 0, 89, 0, 0, 0, 90, 0, 91, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 94, 0, 96, 0, 98, 0, 101, 0, 102, 0,
- 0, 0, 0, 88, 99, 76, 0, 0, 0, 0,
- 0, 0, 0, -74, 0, 0, 0, 72, 73, 74,
- 0, 0, 0, 0, 0, 0, 0, 0, 114, 0,
- 0, 0, 0, 0, 0, 115, 0, 0, 0, 116,
- 82, 0, 83, 0, 0, 0, 84, 0, 85, 86,
- 87, 0, 0, 89, 0, 0, 0, 90, 0, 91,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 94, 0, 96, 0, 98, 0, 101, 0, 102,
- 0, 0, 0, 0, 88, 99, 76, 0, 0, 0,
- 0, 0, 0, 0, 72, 73, 74, 0, 0, 0,
- 0, 0, 0, 0, 0, 114, 0, 0, 0, 0,
- 0, 0, 115, 0, 0, 0, 116, 82, 0, 83,
- 0, 0, 0, 84, 0, 85, 86, 87, 0, 0,
- 89, 0, 0, 0, 90, 0, 91, 0, 0, 465,
- 0, 0, 0, 0, 0, 0, 0, 0, 94, 0,
- 96, 0, 98, 0, 101, 0, 102, 0, 0, 0,
- 0, 88, 99, 76, 0, 0, 0, 0, 0, 0,
- 0, 72, 73, 74, 0, 0, 0, 0, 0, 0,
+ 210, 329, 129, 219, 208, 126, 444, 343, 443, 337,
+ 317, 27, 331, 436, 180, 326, 321, 319, 317, 24,
+ 27, 337, 345, 460, 466, 130, 29, 31, 28, 132,
+ -64, 30, 436, -75, 350, 420, 403, 282, -223, 427,
+ 297, 412, -53, -52, -77, 230, 367, -72, 356, 408,
+ 371, 426, 420, 360, 442, 245, 345, 436, -224, 420,
+ 3, 127, 176, 440, 24, 171, 260, 449, 514, 453,
+ 3, 416, 173, 225, 436, 483, 251, 245, 449, 493,
+ 453, 477, 219, 485, 365, 23, 508, 460, 484, 7,
+ 210, 180, 352, 208, 477, 276, 412, 509, 277, 367,
+ 364, 509, 282, 501, 0, 498, 219, 460, 219, 227,
+ 219, 488, 358, 110, 430, 219, 219, 498, 219, 439,
+ 110, 110, 178, 365, 111, 117, 461, -54, 493, 219,
+ 219, 111, 111, 440, 487, 8, 118, 247, 460, 411,
+ 410, 248, 488, 273, 272, 353, 10, 9, 126, 477,
+ 219, 219, 110, 499, 365, -292, 281, 280, 414, 493,
+ 369, 219, 362, 111, 220, 507, 266, 265, 263, 253,
+ 455, 0, 271, 270, 462, 339, 273, 272, 268, 340,
+ 477, 470, 279, 194, 194, 195, 195, 119, 254, 119,
+ 255, 194, 194, 195, 195, 0, 196, 196, 517, 0,
+ 264, 262, 335, 451, 196, 196, 0, 0, 423, 258,
+ 269, 267, 194, 194, 195, 195, 194, 194, 195, 195,
+ 253, 219, 194, 268, 195, 196, 196, 212, 263, 196,
+ 196, 194, 120, 195, 120, 196, 219, 0, 121, 254,
+ 121, 406, 0, 0, 196, 194, 213, 195, 214, 0,
+ 0, 518, 516, 424, 0, 269, 267, 194, 196, 195,
+ 264, 262, 0, 194, 0, 195, 299, 300, 182, 183,
+ 196, 182, 183, 14, 434, 433, 196, 299, 300, 0,
+ 15, 0, 0, 0, 14, 0, 119, 0, 0, 229,
+ 228, 15, 0, 301, 302, 184, 185, 0, 184, 185,
+ 187, 188, 0, 0, 301, 302, 14, 0, 189, 190,
+ 187, 188, 191, 15, 192, 0, 0, 0, 189, 190,
+ 14, 0, 191, 17, 192, 0, 0, 15, 0, 0,
+ 0, 120, 13, 0, 17, 16, 0, 121, 0, 481,
+ 187, 188, 0, 13, 0, 0, 16, 0, 189, 190,
+ 232, 0, 191, 479, 192, 0, 17, 0, 0, 0,
+ 233, 0, 304, 305, 234, 13, 0, 0, 16, 0,
+ 17, 306, 0, 235, 307, 236, 308, 0, 0, 13,
+ 0, 0, 16, 232, 0, 0, 237, 0, 238, 117,
+ 0, 0, 0, 233, 0, 0, 239, 234, 0, 240,
+ 118, 0, 0, 0, 0, 241, 235, 0, 236, 0,
+ 0, 242, 0, 0, 0, 0, 0, 0, 0, 237,
+ 232, 238, 117, 0, 243, 0, 0, 187, 188, 239,
+ 233, 0, 240, 118, 234, 189, 190, 0, 241, 191,
+ 0, 192, 0, 235, 242, 236, 0, 0, 333, 0,
+ 0, 0, 0, 0, 0, 0, 237, 243, 238, 117,
+ 0, 0, 0, 0, 0, 0, 239, 0, 0, 240,
+ 118, 0, 0, 0, 0, 241, 0, 0, 0, 0,
+ 0, 242, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 73, 74, 243, 0, 0, 0, 0, 0,
0, 0, 114, 0, 0, 0, 0, 0, 0, 115,
0, 0, 0, 116, 82, 0, 83, 0, 0, 0,
- 84, 0, 85, 86, 87, 0, 0, 89, 0, 0,
- 0, 90, 0, 91, 0, 0, 468, 0, 0, 0,
- 0, 0, 0, 0, 0, 94, 0, 96, 0, 98,
- 0, 101, 0, 102, 0, 0, 0, 0, 88, 99,
+ 0, 0, 0, 86, 0, 0, 0, 89, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 94, 0, 96, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 88, 99,
76, 0, 0, 0, 0, 0, 0, 0, 72, 73,
74, 0, 0, 0, 0, 0, 0, 0, 0, 114,
0, 0, 0, 0, 0, 0, 115, 0, 0, 0,
116, 82, 0, 83, 0, 0, 0, 84, 0, 85,
86, 87, 0, 0, 89, 0, 0, 0, 90, 0,
91, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 94, 0, 96, 0, 98, 0, 101, 296,
+ 0, 0, 94, 0, 96, 0, 98, 0, 101, 0,
102, 0, 0, 0, 0, 88, 99, 76, 0, 0,
- 0, 0, 0, 0, 0, 137, 138, 139, 0, 0,
+ 0, 0, 0, 0, 0, 72, 73, 74, 0, 0,
+ 0, 0, 0, 0, 0, 0, 114, 0, 0, 0,
+ 0, 0, 0, 115, 0, 0, 0, 116, 82, 0,
+ 83, 0, 0, 0, 84, 0, 85, 86, 87, 0,
+ 0, 89, 0, 0, 0, 90, 0, 91, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 94,
+ 0, 96, 0, 98, 0, 101, 296, 102, 0, 0,
+ 0, 0, 88, 99, 76, 0, 0, 0, 0, 0,
+ 0, 0, 72, 73, 74, 0, 0, 0, 0, 0,
+ 0, 0, 0, 114, 0, 0, 0, 0, 0, 0,
+ 115, 0, 0, 0, 116, 82, 0, 83, 0, 0,
+ 0, 84, 0, 85, 86, 87, 0, 0, 89, 0,
+ 0, 0, 90, 0, 91, 0, 0, 465, 0, 0,
+ 0, 0, 0, 0, 0, 0, 94, 0, 96, 0,
+ 98, 0, 101, 0, 102, 0, 0, 0, 0, 88,
+ 99, 76, 0, 0, 0, 0, 0, 0, 0, 72,
+ 73, 74, 0, 0, 0, 0, 0, 0, 0, 0,
+ 114, 0, 0, 0, 0, 0, 0, 115, 0, 0,
+ 0, 116, 82, 0, 83, 0, 0, 0, 84, 0,
+ 85, 86, 87, 0, 0, 89, 0, 0, 0, 90,
+ 0, 91, 0, 0, 468, 0, 0, 0, 0, 0,
+ 0, 0, 0, 94, 0, 96, 0, 98, 0, 101,
+ 0, 102, 0, 0, 0, 0, 88, 99, 76, 0,
+ 0, 0, 0, 0, 0, 0, -73, 0, 0, 0,
+ 72, 73, 74, 0, 0, 0, 0, 0, 0, 0,
+ 0, 114, 0, 0, 0, 0, 0, 0, 115, 0,
+ 0, 0, 116, 82, 0, 83, 0, 0, 0, 84,
+ 0, 85, 86, 87, 0, 0, 89, 0, 0, 0,
+ 90, 0, 91, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 94, 0, 96, 0, 98, 0,
+ 101, 0, 102, 0, 0, 0, 0, 88, 99, 76,
+ 0, 0, 0, 0, 0, 0, 0, 137, 138, 139,
+ 0, 0, 141, 143, 144, 0, 0, 145, 0, 146,
+ 0, 0, 0, 148, 149, 150, 0, 0, 0, 0,
+ 0, 0, 217, 152, 153, 154, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 155, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 159, 0, 0, 0, 0, 0, 0, 161,
+ 162, 163, 0, 165, 166, 167, 168, 169, 170, 0,
+ 0, 156, 164, 147, 140, 142, 158, 0, 0, 0,
+ 0, 137, 138, 139, 0, 0, 141, 143, 144, 0,
+ 0, 145, 0, 146, 0, 0, 0, 148, 149, 150,
+ 0, 0, 0, 0, 0, 0, 151, 152, 153, 154,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 155, 0, 0, 0, 157, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 159, 0, 0, 0,
+ 0, 0, 160, 161, 162, 163, 0, 165, 166, 167,
+ 168, 169, 170, 0, 0, 156, 164, 147, 140, 142,
+ 158, 0, 0, 0, 0, 137, 138, 139, 0, 0,
141, 143, 144, 0, 0, 145, 0, 146, 0, 0,
0, 148, 149, 150, 0, 0, 0, 0, 0, 0,
- 217, 152, 153, 154, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 155, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 159, 0, 0, 0, 0, 0, 0, 161, 162, 163,
+ 151, 152, 153, 154, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 155, 0, 0, 0, 157, 0,
+ 0, 0, 0, 0, 0, 0, 175, 0, 0, 0,
+ 159, 0, 0, 0, 0, 0, 160, 161, 162, 163,
0, 165, 166, 167, 168, 169, 170, 0, 0, 156,
- 164, 147, 140, 142, 158, 0, 0, 0, 0, 137,
- 138, 139, 0, 0, 141, 143, 144, 0, 0, 145,
- 0, 146, 0, 0, 0, 148, 149, 150, 0, 0,
- 0, 0, 0, 0, 151, 152, 153, 154, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 155, 0,
- 0, 0, 157, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 159, 0, 0, 0, 0, 0,
- 160, 161, 162, 163, 0, 165, 166, 167, 168, 169,
- 170, 0, 0, 156, 164, 147, 140, 142, 158, 0,
- 0, 0, 0, 137, 138, 139, 0, 0, 141, 143,
- 144, 0, 0, 145, 0, 146, 0, 0, 0, 148,
- 149, 150, 0, 0, 0, 0, 0, 0, 151, 152,
- 153, 154, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 155, 0, 0, 0, 157, 0, 0, 0,
- 0, 0, 0, 0, 175, 0, 0, 0, 159, 0,
- 0, 0, 0, 0, 160, 161, 162, 163, 0, 165,
- 166, 167, 168, 169, 170, 0, 0, 156, 164, 147,
- 140, 142, 158, 0, 0, 0, 0, 69, 0, 0,
+ 164, 147, 140, 142, 158, 0, 0, 0, 0, 69,
+ 0, 0, 0, 0, 70, 0, 72, 73, 74, 75,
+ 0, 0, 0, 0, 0, 0, 77, 114, 0, 0,
+ 0, 0, 0, 0, 79, 80, 0, 0, 81, 82,
+ 0, 83, 0, 0, 0, 84, 0, 85, 86, 87,
+ 0, 0, 89, 0, 0, 0, 90, 0, 91, 0,
+ 0, 0, 0, 0, 92, 0, 93, 0, 0, 0,
+ 94, 95, 96, 97, 98, 100, 101, 17, 102, 103,
+ 104, 0, 0, 88, 99, 76, 13, 71, 0, 0,
+ 0, 0, 0, 69, 0, 0, 0, 0, 70, 0,
+ 72, 73, 74, 75, 0, 0, 0, 0, 0, 0,
+ 77, 78, 0, 0, 0, 0, 0, 0, 79, 80,
+ 0, 0, 81, 82, 0, 83, 0, 0, 0, 84,
+ 0, 85, 86, 87, 0, 0, 89, 0, 0, 0,
+ 90, 0, 91, 0, 0, 0, 0, 0, 92, 0,
+ 93, 0, 0, 0, 94, 95, 96, 97, 98, 100,
+ 101, 17, 102, 103, 104, 0, 0, 88, 99, 76,
+ 13, 71, 0, 0, 0, 0, 0, 69, 0, 0,
0, 0, 70, 0, 72, 73, 74, 75, 0, 0,
0, 0, 0, 0, 77, 114, 0, 0, 0, 0,
- 0, 0, 79, 80, 0, 0, 81, 82, 0, 83,
+ 0, 0, 490, 80, 0, 0, 81, 491, 0, 83,
0, 0, 0, 84, 0, 85, 86, 87, 0, 0,
89, 0, 0, 0, 90, 0, 91, 0, 0, 0,
0, 0, 92, 0, 93, 0, 0, 0, 94, 95,
96, 97, 98, 100, 101, 17, 102, 103, 104, 0,
0, 88, 99, 76, 13, 71, 0, 0, 0, 0,
0, 69, 0, 0, 0, 0, 70, 0, 72, 73,
- 74, 75, 0, 0, 0, 0, 0, 0, 77, 78,
- 0, 0, 0, 0, 0, 0, 79, 80, 0, 0,
- 81, 82, 0, 83, 0, 0, 0, 84, 0, 85,
+ 74, 75, 0, 0, 0, 0, 0, 0, 77, 114,
+ 0, 0, 0, 0, 0, 0, 503, 80, 0, 0,
+ 81, 504, 0, 83, 0, 0, 0, 84, 0, 85,
86, 87, 0, 0, 89, 0, 0, 0, 90, 0,
91, 0, 0, 0, 0, 0, 92, 0, 93, 0,
0, 0, 94, 95, 96, 97, 98, 100, 101, 17,
102, 103, 104, 0, 0, 88, 99, 76, 13, 71,
- 0, 0, 0, 0, 0, 69, 0, 0, 0, 0,
- 70, 0, 72, 73, 74, 75, 0, 0, 0, 0,
- 0, 0, 77, 114, 0, 0, 0, 0, 0, 0,
- 491, 80, 0, 0, 81, 492, 0, 83, 0, 0,
- 0, 84, 0, 85, 86, 87, 0, 0, 89, 0,
- 0, 0, 90, 0, 91, 0, 0, 0, 0, 0,
- 92, 0, 93, 0, 0, 0, 94, 95, 96, 97,
- 98, 100, 101, 17, 102, 103, 104, 0, 0, 88,
- 99, 76, 13, 71, 0, 0, 0, 0, 0, 69,
- 0, 0, 0, 0, 70, 0, 72, 73, 74, 75,
- 0, 0, 0, 0, 0, 0, 77, 114, 0, 0,
- 0, 0, 0, 0, 504, 80, 0, 0, 81, 505,
- 0, 83, 0, 0, 0, 84, 0, 85, 86, 87,
- 0, 0, 89, 0, 0, 0, 90, 0, 91, 0,
- 0, 0, 0, 0, 92, 0, 93, 0, 0, 0,
- 94, 95, 96, 97, 98, 100, 101, 17, 102, 103,
- 104, 0, 0, 88, 99, 76, 13, 71, 0, 0,
- 0, 0, 0, 376, 138, 139, 0, 0, 378, 143,
- 380, 73, 74, 381, 0, 146, 0, 0, 0, 148,
- 383, 384, 0, 0, 0, 0, 0, 0, 385, 386,
- 153, 154, 81, 82, 0, 83, 0, 0, 0, 84,
- 0, 85, 387, 87, 0, 0, 389, 0, 0, 0,
- 90, 0, 91, 0, -220, 0, 0, 0, 390, 0,
- 93, 0, 0, 0, 391, 392, 393, 394, 98, 396,
- 397, 398, 399, 400, 401, 0, 0, 388, 395, 382,
- 377, 379, 158, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 376, 138, 139, 0, 0,
+ 378, 143, 380, 73, 74, 381, 0, 146, 0, 0,
+ 0, 148, 383, 384, 0, 0, 0, 0, 0, 0,
+ 385, 386, 153, 154, 81, 82, 0, 83, 0, 0,
+ 0, 84, 0, 85, 387, 87, 0, 0, 389, 0,
+ 0, 0, 90, 0, 91, 0, -219, 0, 0, 0,
+ 390, 0, 93, 0, 0, 0, 391, 392, 393, 394,
+ 98, 396, 397, 398, 399, 400, 401, 0, 0, 388,
+ 395, 382, 377, 379, 158, 0, 0, 0, 0,
- 275, 467, 250, 463, 257, 174, 456, 421, 464, 231,
- 252, 454, 445, 177, 431, 428, 446, 278, 429, 425,
- 441, 172, 450, 452, 435, 506, 354, 244, 226, 359,
- 370, 22, 361, 368, 363, 366, 11, 332, 520, 334,
- 336, 128, 224, 435, 218, 221, 503, 487, 327, 432,
- 516, 216, 490, 0, 327, 469, 432, 486, 372, 497,
- 498, 402, 493, 275, 112, 112, 501, 0, 497, 202,
- 200, 112, 482, 482, 67, 199, 49, 112, 0, 112,
- 22, 22, 201, 198, 0, 112, 112, 413, 112, 0,
- 112, 112, 112, 291, 480, 204, 211, 203, 295, 112,
- 209, 249, 0, 197, 404, 246, 22, 405, 112, 112,
- 327, 112, 113, 310, 112, 112, 311, 448, 112, 309,
- 476, 112, 112, 447, 274, 112, 112, 112, 179, 124,
- 0, 312, 327, 112, 112, 123, 122, 112, 327, 327,
- 216, 256, 313, 112, 112, 472, 274, 112, 224, 471,
- 112, 224, 112, 328, 112, 407, 186, 193, 259, 404,
- 205, 112, 405, 112, 112, 0, 112, 206, 447, 207,
- 0, 0, 181, 507, 0, 330, 497, 112, 112, 448,
- 473, 355, 357, 112, 112, 475, 474, 112, 112, 323,
- 323, 112, 295, 295, 295, 295, 295, 67, 0, 49,
- 323, 112, 320, 338, 341, 295, 295, 0, 323, 0,
- 112, 322, 342, 295, 318, 295, 112, 315, 0, 112,
- 112, 295, 344, 314, 295, 295, 323, 316, 298, 112,
- 325, 295, 0, 0, 295, 0, 303, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 351, 0,
+ 454, 250, 275, 252, 413, 463, 467, 464, 425, 445,
+ 421, 231, 446, 172, 441, 278, 452, 177, 429, 450,
+ 428, 431, 174, 435, 244, 505, 359, 22, 226, 370,
+ 354, 361, 368, 363, 366, 11, 332, 224, 519, 334,
+ 336, 221, 502, 128, 218, 372, 515, 216, 435, 432,
+ 489, 0, 327, 486, 469, 432, 257, 327, 496, 492,
+ 497, 0, 482, 275, 402, 0, 112, 112, 0, 112,
+ 22, 202, 201, 199, 500, 480, 496, 112, 112, 0,
+ 112, 198, 197, 0, 0, 200, 456, 22, 112, 112,
+ 112, 112, 112, 482, 67, 112, 49, 203, 291, 211,
+ 204, 22, 209, 295, 249, 246, 404, 112, 112, 405,
+ 112, 113, 310, 112, 327, 311, 327, 112, 309, 448,
+ 112, 112, 476, 447, 112, 112, 274, 112, 179, 112,
+ 112, 124, 312, 0, 112, 313, 123, 112, 327, 122,
+ 327, 216, 256, 112, 112, 472, 274, 112, 112, 471,
+ 112, 224, 404, 224, 186, 405, 205, 328, 407, 330,
+ 259, 112, 0, 112, 0, 112, 193, 112, 112, 206,
+ 447, 207, 112, 506, 448, 181, 496, 112, 112, 473,
+ 475, 355, 112, 357, 474, 112, 112, 323, 323, 112,
+ 295, 295, 295, 295, 295, 67, 0, 49, 323, 112,
+ 320, 338, 341, 295, 295, 0, 323, 0, 112, 322,
+ 342, 295, 318, 295, 112, 315, 0, 112, 112, 295,
+ 344, 314, 295, 295, 323, 316, 298, 112, 325, 295,
+ 0, 0, 295, 0, 303, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 351, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 67, 0, 49, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 261, 0, 0, 0, 0, 0, 0, 0,
+ 261, 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,
@@ -457,129 +465,144 @@ const int JavaScriptGrammar::action_info [] = {
0};
const int JavaScriptGrammar::action_check [] = {
- 61, 76, 76, 8, 48, 60, 60, 7, 17, 2,
- 48, 29, 33, 8, 61, 1, 8, 29, 76, 36,
- 48, 2, 5, 8, 8, 29, 33, 60, 29, 55,
- 60, 5, 31, 55, 36, 55, 7, 7, 29, 55,
- 7, 7, 7, 7, 7, 7, 36, 7, 36, 5,
- 29, 29, 60, 33, 36, 1, 33, 16, 33, 20,
- 36, 29, 60, 36, 61, 7, 85, 36, 7, 65,
- 0, 60, 1, 76, 29, 29, 33, 8, 36, 85,
- 33, 29, 29, 33, 36, 29, 29, 36, 33, 29,
- 17, 7, -1, 8, 29, 36, 29, 48, 8, 7,
- 36, 8, 74, 29, 36, 8, 8, 7, 36, 7,
- 36, 8, 7, 8, 8, 15, 8, 15, 55, 42,
- 8, 6, 60, 10, 8, 7, 7, 61, 62, 50,
- 53, 8, 29, 54, 8, 20, 61, 62, 8, 61,
- 62, 8, 2, 61, 62, 29, 50, 61, 62, 56,
- 54, 33, 33, 56, 40, 61, 62, 8, 8, 61,
- 61, 62, 40, 8, 56, 51, 60, 40, 55, 8,
- 29, -1, 60, 51, 40, 15, -1, -1, 51, 25,
- 12, 27, 56, 60, 25, 51, 27, 15, 33, 56,
- 60, 25, 38, 27, 34, 8, 36, 38, 25, 25,
- 27, 27, 61, 62, 38, 29, 34, 12, 36, 60,
- 60, 38, 38, 25, 15, 27, 25, 25, 27, 27,
- 12, 60, 8, 29, -1, 57, 38, 29, 8, 38,
- 38, 63, 25, 34, 27, 36, 8, 61, 62, -1,
- 25, 25, 27, 27, 25, 38, 27, -1, 61, 62,
- 18, 19, 57, 38, 38, 61, 62, 38, 63, 61,
- 62, -1, -1, 22, -1, 57, 18, 19, 18, 19,
- 29, 63, 18, 19, 22, 61, 62, 45, 46, -1,
- 60, 29, -1, -1, -1, -1, -1, -1, -1, 61,
- 62, -1, -1, 45, 46, 45, 46, 23, 24, 45,
- 46, -1, -1, 23, 24, -1, 32, 22, 25, 35,
- 27, 37, 32, 72, 29, 35, -1, 37, 23, 24,
- -1, 38, 81, -1, 72, 84, 31, 32, -1, -1,
- 35, 22, 37, 81, 23, 24, 84, -1, 29, -1,
- 55, -1, 31, 32, 23, 24, 35, -1, 37, -1,
- -1, -1, 31, 32, -1, -1, 35, 72, 37, -1,
- -1, -1, -1, -1, 55, -1, 81, 12, 13, 84,
- -1, 23, 24, -1, -1, -1, -1, 22, -1, -1,
- 32, 72, -1, 35, 29, 37, 12, 13, 33, 34,
- 81, 36, -1, 84, -1, -1, 22, -1, 43, -1,
- -1, -1, 47, 29, -1, -1, -1, 33, 34, -1,
- 36, -1, -1, -1, -1, -1, -1, 43, -1, -1,
- 65, 47, 67, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, 3, 78, 79, 80, 23, 24, -1, 65,
- -1, 67, 13, -1, 31, 32, 17, -1, 35, -1,
- 37, -1, 78, 79, 80, 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, 3, -1, -1, -1, -1, 77, -1, -1, -1,
- -1, 13, -1, -1, -1, 17, -1, -1, -1, -1,
- -1, -1, -1, -1, 26, -1, 28, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, -1, 39, -1, 41,
- 42, -1, -1, -1, -1, -1, -1, 49, -1, -1,
- 52, 53, -1, -1, -1, -1, 58, -1, -1, -1,
- -1, -1, 64, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, 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, -1, 73, -1,
- -1, -1, -1, 78, 79, 80, -1, -1, -1, -1,
- -1, -1, -1, 7, -1, -1, -1, 11, 12, 13,
- -1, -1, -1, -1, -1, -1, -1, -1, 22, -1,
- -1, -1, -1, -1, -1, 29, -1, -1, -1, 33,
- 34, -1, 36, -1, -1, -1, 40, -1, 42, 43,
- 44, -1, -1, 47, -1, -1, -1, 51, -1, 53,
- -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- -1, 65, -1, 67, -1, 69, -1, 71, -1, 73,
- -1, -1, -1, -1, 78, 79, 80, -1, -1, -1,
- -1, -1, -1, -1, 11, 12, 13, -1, -1, -1,
- -1, -1, -1, -1, -1, 22, -1, -1, -1, -1,
- -1, -1, 29, -1, -1, -1, 33, 34, -1, 36,
- -1, -1, -1, 40, -1, 42, 43, 44, -1, -1,
- 47, -1, -1, -1, 51, -1, 53, -1, -1, 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, 11, 12, 13, -1, -1, -1, -1, -1, -1,
+ 76, 61, 60, 8, 48, 29, 60, 7, 29, 2,
+ 48, 29, 60, 33, 1, 61, 8, 76, 48, 36,
+ 29, 2, 29, 8, 8, 33, 29, 33, 8, 55,
+ 7, 60, 33, 7, 17, 5, 55, 36, 29, 7,
+ 1, 36, 7, 7, 7, 55, 36, 7, 61, 60,
+ 16, 55, 5, 31, 36, 2, 29, 33, 29, 5,
+ 85, 36, 7, 20, 36, 7, 60, 36, 17, 36,
+ 85, 33, 8, 8, 33, 29, 7, 2, 36, 29,
+ 36, 33, 8, 7, 7, 29, 29, 8, 29, 0,
+ 76, 1, 8, 48, 33, 74, 36, 29, 36, 36,
+ 29, 29, 36, 7, -1, 8, 8, 8, 8, 60,
+ 8, 15, 60, 40, 7, 8, 8, 8, 8, 6,
+ 40, 40, 55, 7, 51, 42, 8, 7, 29, 8,
+ 8, 51, 51, 20, 7, 65, 53, 50, 8, 61,
+ 62, 54, 15, 61, 62, 61, 61, 62, 29, 33,
+ 8, 8, 40, 56, 7, 36, 61, 62, 60, 29,
+ 60, 8, 60, 51, 56, 56, 61, 62, 29, 15,
+ 60, -1, 61, 62, 56, 50, 61, 62, 29, 54,
+ 33, 60, 60, 25, 25, 27, 27, 12, 34, 12,
+ 36, 25, 25, 27, 27, -1, 38, 38, 8, -1,
+ 61, 62, 60, 60, 38, 38, -1, -1, 10, 56,
+ 61, 62, 25, 25, 27, 27, 25, 25, 27, 27,
+ 15, 8, 25, 29, 27, 38, 38, 15, 29, 38,
+ 38, 25, 57, 27, 57, 38, 8, -1, 63, 34,
+ 63, 36, -1, -1, 38, 25, 34, 27, 36, -1,
+ -1, 61, 62, 55, -1, 61, 62, 25, 38, 27,
+ 61, 62, -1, 25, -1, 27, 18, 19, 18, 19,
+ 38, 18, 19, 22, 61, 62, 38, 18, 19, -1,
+ 29, -1, -1, -1, 22, -1, 12, -1, -1, 61,
+ 62, 29, -1, 45, 46, 45, 46, -1, 45, 46,
+ 23, 24, -1, -1, 45, 46, 22, -1, 31, 32,
+ 23, 24, 35, 29, 37, -1, -1, -1, 31, 32,
+ 22, -1, 35, 72, 37, -1, -1, 29, -1, -1,
+ -1, 57, 81, -1, 72, 84, -1, 63, -1, 55,
+ 23, 24, -1, 81, -1, -1, 84, -1, 31, 32,
+ 3, -1, 35, 55, 37, -1, 72, -1, -1, -1,
+ 13, -1, 23, 24, 17, 81, -1, -1, 84, -1,
+ 72, 32, -1, 26, 35, 28, 37, -1, -1, 81,
+ -1, -1, 84, 3, -1, -1, 39, -1, 41, 42,
+ -1, -1, -1, 13, -1, -1, 49, 17, -1, 52,
+ 53, -1, -1, -1, -1, 58, 26, -1, 28, -1,
+ -1, 64, -1, -1, -1, -1, -1, -1, -1, 39,
+ 3, 41, 42, -1, 77, -1, -1, 23, 24, 49,
+ 13, -1, 52, 53, 17, 31, 32, -1, 58, 35,
+ -1, 37, -1, 26, 64, 28, -1, -1, 31, -1,
+ -1, -1, -1, -1, -1, -1, 39, 77, 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, 12, 13, 77, -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,
+ -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, -1, -1,
- -1, -1, 65, -1, 67, -1, 69, -1, 71, 72,
+ -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,
+ -1, -1, -1, -1, -1, 11, 12, 13, -1, -1,
+ -1, -1, -1, -1, -1, -1, 22, -1, -1, -1,
+ -1, -1, -1, 29, -1, -1, -1, 33, 34, -1,
+ 36, -1, -1, -1, 40, -1, 42, 43, 44, -1,
+ -1, 47, -1, -1, -1, 51, -1, 53, -1, -1,
+ -1, -1, -1, -1, -1, -1, -1, -1, -1, 65,
+ -1, 67, -1, 69, -1, 71, 72, 73, -1, -1,
+ -1, -1, 78, 79, 80, -1, -1, -1, -1, -1,
+ -1, -1, 11, 12, 13, -1, -1, -1, -1, -1,
+ -1, -1, -1, 22, -1, -1, -1, -1, -1, -1,
+ 29, -1, -1, -1, 33, 34, -1, 36, -1, -1,
+ -1, 40, -1, 42, 43, 44, -1, -1, 47, -1,
+ -1, -1, 51, -1, 53, -1, -1, 56, -1, -1,
+ -1, -1, -1, -1, -1, -1, 65, -1, 67, -1,
+ 69, -1, 71, -1, 73, -1, -1, -1, -1, 78,
+ 79, 80, -1, -1, -1, -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, -1, 4, 5, 6,
+ -1, -1, 9, 10, 11, -1, -1, 14, -1, 16,
+ -1, -1, -1, 20, 21, 22, -1, -1, -1, -1,
+ -1, -1, 29, 30, 31, 32, -1, -1, -1, -1,
+ -1, -1, -1, -1, -1, -1, 43, -1, -1, -1,
+ -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
+ -1, -1, 59, -1, -1, -1, -1, -1, -1, 66,
+ 67, 68, -1, 70, 71, 72, 73, 74, 75, -1,
+ -1, 78, 79, 80, 81, 82, 83, -1, -1, -1,
+ -1, 4, 5, 6, -1, -1, 9, 10, 11, -1,
+ -1, 14, -1, 16, -1, -1, -1, 20, 21, 22,
+ -1, -1, -1, -1, -1, -1, 29, 30, 31, 32,
+ -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
+ 43, -1, -1, -1, 47, -1, -1, -1, -1, -1,
+ -1, -1, -1, -1, -1, -1, 59, -1, -1, -1,
+ -1, -1, 65, 66, 67, 68, -1, 70, 71, 72,
+ 73, 74, 75, -1, -1, 78, 79, 80, 81, 82,
+ 83, -1, -1, -1, -1, 4, 5, 6, -1, -1,
9, 10, 11, -1, -1, 14, -1, 16, -1, -1,
-1, 20, 21, 22, -1, -1, -1, -1, -1, -1,
29, 30, 31, 32, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, 43, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- 59, -1, -1, -1, -1, -1, -1, 66, 67, 68,
+ -1, -1, -1, -1, 43, -1, -1, -1, 47, -1,
+ -1, -1, -1, -1, -1, -1, 55, -1, -1, -1,
+ 59, -1, -1, -1, -1, -1, 65, 66, 67, 68,
-1, 70, 71, 72, 73, 74, 75, -1, -1, 78,
79, 80, 81, 82, 83, -1, -1, -1, -1, 4,
- 5, 6, -1, -1, 9, 10, 11, -1, -1, 14,
- -1, 16, -1, -1, -1, 20, 21, 22, -1, -1,
- -1, -1, -1, -1, 29, 30, 31, 32, -1, -1,
- -1, -1, -1, -1, -1, -1, -1, -1, 43, -1,
- -1, -1, 47, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, 59, -1, -1, -1, -1, -1,
- 65, 66, 67, 68, -1, 70, 71, 72, 73, 74,
- 75, -1, -1, 78, 79, 80, 81, 82, 83, -1,
- -1, -1, -1, 4, 5, 6, -1, -1, 9, 10,
- 11, -1, -1, 14, -1, 16, -1, -1, -1, 20,
+ -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,
- 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,
+ -1, -1, 33, 34, -1, 36, -1, -1, -1, 40,
+ -1, 42, 43, 44, -1, -1, 47, -1, -1, -1,
+ 51, -1, 53, -1, -1, -1, -1, -1, 59, -1,
+ 61, -1, -1, -1, 65, 66, 67, 68, 69, 70,
71, 72, 73, 74, 75, -1, -1, 78, 79, 80,
- 81, 82, 83, -1, -1, -1, -1, 4, -1, -1,
+ 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,
@@ -596,62 +619,45 @@ const int JavaScriptGrammar::action_check [] = {
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, -1, -1, -1, -1, 4, 5, 6, -1, -1,
+ 9, 10, 11, 12, 13, 14, -1, 16, -1, -1,
+ -1, 20, 21, 22, -1, -1, -1, -1, -1, -1,
+ 29, 30, 31, 32, 33, 34, -1, 36, -1, -1,
-1, 40, -1, 42, 43, 44, -1, -1, 47, -1,
- -1, -1, 51, -1, 53, -1, -1, -1, -1, -1,
+ -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, -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,
+ 79, 80, 81, 82, 83, -1, -1, -1, -1,
- 11, 20, 20, 16, 12, 22, 11, 87, 20, 54,
- 20, 12, 58, 20, 72, 72, 58, 12, 12, 84,
- 89, 20, 12, 11, 58, 9, 78, 20, 20, 11,
- 11, 14, 12, 12, 11, 11, 5, 11, 76, 12,
- 11, 90, 20, 58, 12, 20, 11, 9, 12, 12,
- 20, 23, 11, -1, 12, 12, 12, 12, 11, 10,
- 9, 11, 9, 11, 31, 31, 8, -1, 10, 36,
- 36, 31, 6, 6, 11, 35, 13, 31, -1, 31,
- 14, 14, 36, 35, -1, 31, 31, 12, 31, -1,
- 31, 31, 31, 31, 2, 36, 41, 36, 36, 31,
- 43, 47, -1, 35, 25, 45, 14, 28, 31, 31,
- 12, 31, 34, 36, 31, 31, 36, 33, 31, 36,
- 33, 31, 31, 33, 33, 31, 31, 31, 34, 33,
- -1, 36, 12, 31, 31, 33, 33, 31, 12, 12,
- 23, 24, 36, 31, 31, 33, 33, 31, 20, 33,
- 31, 20, 31, 55, 31, 27, 37, 36, 27, 25,
- 37, 31, 28, 31, 31, -1, 31, 37, 33, 37,
- -1, -1, 39, 7, -1, 55, 10, 31, 31, 33,
- 33, 55, 55, 31, 31, 33, 33, 31, 31, 31,
- 31, 31, 36, 36, 36, 36, 36, 11, -1, 13,
- 31, 31, 42, 46, 48, 36, 36, -1, 31, -1,
- 31, 53, 53, 36, 44, 36, 31, 38, -1, 31,
- 31, 36, 53, 38, 36, 36, 31, 38, 40, 31,
- 53, 36, -1, -1, 36, -1, 38, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, -1, -1, 53, -1,
+ 12, 20, 11, 20, 12, 16, 20, 20, 84, 58,
+ 87, 54, 58, 20, 89, 12, 11, 20, 12, 12,
+ 72, 72, 22, 58, 20, 9, 11, 14, 20, 11,
+ 78, 12, 12, 11, 11, 5, 11, 20, 76, 12,
+ 11, 20, 11, 90, 12, 11, 20, 23, 58, 12,
+ 11, -1, 12, 12, 12, 12, 12, 12, 10, 9,
+ 9, -1, 6, 11, 11, -1, 31, 31, -1, 31,
+ 14, 36, 36, 35, 8, 2, 10, 31, 31, -1,
+ 31, 35, 35, -1, -1, 36, 11, 14, 31, 31,
+ 31, 31, 31, 6, 11, 31, 13, 36, 31, 41,
+ 36, 14, 43, 36, 47, 45, 25, 31, 31, 28,
+ 31, 34, 36, 31, 12, 36, 12, 31, 36, 33,
+ 31, 31, 33, 33, 31, 31, 33, 31, 34, 31,
+ 31, 33, 36, -1, 31, 36, 33, 31, 12, 33,
+ 12, 23, 24, 31, 31, 33, 33, 31, 31, 33,
+ 31, 20, 25, 20, 37, 28, 37, 55, 27, 55,
+ 27, 31, -1, 31, -1, 31, 36, 31, 31, 37,
+ 33, 37, 31, 7, 33, 39, 10, 31, 31, 33,
+ 33, 55, 31, 55, 33, 31, 31, 31, 31, 31,
+ 36, 36, 36, 36, 36, 11, -1, 13, 31, 31,
+ 42, 46, 48, 36, 36, -1, 31, -1, 31, 53,
+ 53, 36, 44, 36, 31, 38, -1, 31, 31, 36,
+ 53, 38, 36, 36, 31, 38, 40, 31, 53, 36,
+ -1, -1, 36, -1, 38, -1, -1, -1, -1, -1,
+ -1, -1, -1, -1, -1, -1, 53, -1, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
-1, -1, -1, -1, 11, -1, 13, -1, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, 96, -1, -1, -1, -1, -1, -1, -1,
+ 96, -1, -1, -1, -1, -1, -1, -1, -1, -1,
-1, -1, -1, -1, -1, -1, -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 aac4c7e..4792cec 100644
--- a/src/declarative/qml/parser/javascriptgrammar_p.h
+++ b/src/declarative/qml/parser/javascriptgrammar_p.h
@@ -1,4 +1,28 @@
// This file was generated by qlalr - DO NOT EDIT!
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+**
+** This file is part of the $MODULE$ of the Qt Toolkit.
+**
+** $TROLLTECH_DUAL_LICENSE$
+**
+** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
+** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
+**
+****************************************************************************/
+
+//
+// W A R N I N G
+// -------------
+//
+// This file is not part of the Qt API. It exists for the convenience
+// of other Qt classes. This header file may change from version to
+// version without notice, or even be removed.
+//
+// We mean it.
+//
+
#ifndef JAVASCRIPTGRAMMAR_P_H
#define JAVASCRIPTGRAMMAR_P_H
@@ -96,14 +120,14 @@ public:
T_XOR_EQ = 77,
ACCEPT_STATE = 7,
- RULE_COUNT = 297,
- STATE_COUNT = 521,
+ RULE_COUNT = 296,
+ STATE_COUNT = 520,
TERMINAL_COUNT = 88,
NON_TERMINAL_COUNT = 98,
- GOTO_INDEX_OFFSET = 521,
- GOTO_INFO_OFFSET = 1647,
- GOTO_CHECK_OFFSET = 1647
+ GOTO_INDEX_OFFSET = 520,
+ GOTO_INFO_OFFSET = 1629,
+ GOTO_CHECK_OFFSET = 1629
};
static const char *const spell [];
diff --git a/src/declarative/qml/parser/javascriptparser.cpp b/src/declarative/qml/parser/javascriptparser.cpp
index 8708516..ea65267 100644
--- a/src/declarative/qml/parser/javascriptparser.cpp
+++ b/src/declarative/qml/parser/javascriptparser.cpp
@@ -258,16 +258,6 @@ case 21: {
} break;
case 22: {
- AST::UiPublicMember *node = makeAstNode<AST::UiPublicMember> (driver->nodePool(), sym(2).sval, sym(3).sval,
- sym(5).Expression, sym(6).UiObjectInitializer);
- node->publicToken = loc(1);
- node->attributeTypeToken = loc(2);
- node->identifierToken = loc(3);
- node->colonToken = loc(4);
- sym(1).Node = node;
-} break;
-
-case 23: {
AST::UiPublicMember *node = makeAstNode<AST::UiPublicMember> (driver->nodePool(), sym(2).sval, sym(3).sval);
node->publicToken = loc(1);
node->attributeTypeToken = loc(2);
@@ -275,9 +265,9 @@ case 23: {
sym(1).Node = node;
} break;
-case 24: {
+case 23: {
AST::UiPublicMember *node = makeAstNode<AST::UiPublicMember> (driver->nodePool(), sym(2).sval, sym(3).sval,
- sym(5).Expression, static_cast<AST::UiObjectInitializer *>(0));
+ sym(5).Expression);
node->publicToken = loc(1);
node->attributeTypeToken = loc(2);
node->identifierToken = loc(3);
@@ -285,69 +275,69 @@ case 24: {
sym(1).Node = node;
} break;
-case 25: {
+case 24: {
sym(1).Node = makeAstNode<AST::UiSourceElement>(driver->nodePool(), sym(1).Statement);
} break;
-case 26: {
+case 25: {
sym(1).Node = makeAstNode<AST::UiSourceElement>(driver->nodePool(), sym(1).Statement);
} break;
-case 27: {
+case 26: {
AST::UiQualifiedId *node = makeAstNode<AST::UiQualifiedId> (driver->nodePool(), sym(1).sval);
node->identifierToken = loc(1);
sym(1).Node = node;
} break;
-case 28: {
+case 27: {
AST::UiQualifiedId *node = makeAstNode<AST::UiQualifiedId> (driver->nodePool(), sym(1).UiQualifiedId, sym(3).sval);
node->identifierToken = loc(3);
sym(1).Node = node;
} break;
-case 29: {
+case 28: {
AST::ThisExpression *node = makeAstNode<AST::ThisExpression> (driver->nodePool());
node->thisToken = loc(1);
sym(1).Node = node;
} break;
-case 30: {
+case 29: {
AST::IdentifierExpression *node = makeAstNode<AST::IdentifierExpression> (driver->nodePool(), sym(1).sval);
node->identifierToken = loc(1);
sym(1).Node = node;
} break;
-case 31: {
+case 30: {
AST::NullExpression *node = makeAstNode<AST::NullExpression> (driver->nodePool());
node->nullToken = loc(1);
sym(1).Node = node;
} break;
-case 32: {
+case 31: {
AST::TrueLiteral *node = makeAstNode<AST::TrueLiteral> (driver->nodePool());
node->trueToken = loc(1);
sym(1).Node = node;
} break;
-case 33: {
+case 32: {
AST::FalseLiteral *node = makeAstNode<AST::FalseLiteral> (driver->nodePool());
node->falseToken = loc(1);
sym(1).Node = node;
} break;
-case 34: {
+case 33: {
AST::NumericLiteral *node = makeAstNode<AST::NumericLiteral> (driver->nodePool(), sym(1).dval);
node->literalToken = loc(1);
sym(1).Node = node;
} break;
-case 35: {
+case 34: {
AST::StringLiteral *node = makeAstNode<AST::StringLiteral> (driver->nodePool(), sym(1).sval);
node->literalToken = loc(1);
sym(1).Node = node;
} break;
-case 36: {
+case 35: {
bool rx = lexer->scanRegExp(Lexer::NoPrefix);
if (!rx) {
diagnostic_messages.append(DiagnosticMessage(DiagnosticMessage::Error, lexer->startLineNo(),
@@ -359,7 +349,7 @@ case 36: {
sym(1).Node = node;
} break;
-case 37: {
+case 36: {
bool rx = lexer->scanRegExp(Lexer::EqualPrefix);
if (!rx) {
diagnostic_messages.append(DiagnosticMessage(DiagnosticMessage::Error, lexer->startLineNo(),
@@ -371,21 +361,21 @@ case 37: {
sym(1).Node = node;
} break;
-case 38: {
+case 37: {
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 39: {
+case 38: {
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 40: {
+case 39: {
AST::ArrayLiteral *node = makeAstNode<AST::ArrayLiteral> (driver->nodePool(), sym(2).ElementList->finish (), sym(4).Elision);
node->lbracketToken = loc(1);
node->commaToken = loc(3);
@@ -393,59 +383,59 @@ case 40: {
sym(1).Node = node;
} break;
-case 41: {
+case 40: {
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 42: {
+case 41: {
sym(1).Node = makeAstNode<AST::ObjectLiteral> (driver->nodePool(), sym(2).PropertyNameAndValueList->finish ());
} break;
-case 43: {
+case 42: {
sym(1) = sym(2);
} break;
-case 44: {
+case 43: {
sym(1).Node = makeAstNode<AST::ElementList> (driver->nodePool(), sym(1).Elision, sym(2).Expression);
} break;
-case 45: {
+case 44: {
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 46: {
+case 45: {
AST::Elision *node = makeAstNode<AST::Elision> (driver->nodePool());
node->commaToken = loc(1);
sym(1).Node = node;
} break;
-case 47: {
+case 46: {
AST::Elision *node = makeAstNode<AST::Elision> (driver->nodePool(), sym(1).Elision);
node->commaToken = loc(2);
sym(1).Node = node;
} break;
-case 48: {
+case 47: {
sym(1).Node = 0;
} break;
-case 49: {
+case 48: {
sym(1).Elision = sym(1).Elision->finish ();
} break;
-case 50: {
+case 49: {
AST::PropertyNameAndValueList *node = makeAstNode<AST::PropertyNameAndValueList> (driver->nodePool(),
sym(1).PropertyName, sym(3).Expression);
node->colonToken = loc(2);
sym(1).Node = node;
} break;
-case 51: {
+case 50: {
AST::PropertyNameAndValueList *node = makeAstNode<AST::PropertyNameAndValueList> (driver->nodePool(),
sym(1).PropertyNameAndValueList, sym(3).PropertyName, sym(5).Expression);
node->commaToken = loc(2);
@@ -453,30 +443,32 @@ case 51: {
sym(1).Node = node;
} break;
-case 52: {
+case 51: {
AST::IdentifierPropertyName *node = makeAstNode<AST::IdentifierPropertyName> (driver->nodePool(), sym(1).sval);
node->propertyNameToken = loc(1);
sym(1).Node = node;
} break;
-case 53: {
+case 52: {
AST::StringLiteralPropertyName *node = makeAstNode<AST::StringLiteralPropertyName> (driver->nodePool(), sym(1).sval);
node->propertyNameToken = loc(1);
sym(1).Node = node;
} break;
-case 54: {
+case 53: {
AST::NumericLiteralPropertyName *node = makeAstNode<AST::NumericLiteralPropertyName> (driver->nodePool(), sym(1).dval);
node->propertyNameToken = loc(1);
sym(1).Node = node;
} break;
-case 55: {
+case 54: {
AST::IdentifierPropertyName *node = makeAstNode<AST::IdentifierPropertyName> (driver->nodePool(), sym(1).sval);
node->propertyNameToken = loc(1);
sym(1).Node = node;
} break;
+case 55:
+
case 56:
case 57:
@@ -536,27 +528,25 @@ case 83:
case 84:
case 85:
-
-case 86:
{
sym(1).sval = driver->intern(lexer->characterBuffer(), lexer->characterCount());
} break;
-case 91: {
+case 90: {
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 92: {
+case 91: {
AST::FieldMemberExpression *node = makeAstNode<AST::FieldMemberExpression> (driver->nodePool(), sym(1).Expression, sym(3).sval);
node->dotToken = loc(2);
node->identifierToken = loc(3);
sym(1).Node = node;
} break;
-case 93: {
+case 92: {
AST::NewMemberExpression *node = makeAstNode<AST::NewMemberExpression> (driver->nodePool(), sym(2).Expression, sym(4).ArgumentList);
node->newToken = loc(1);
node->lparenToken = loc(3);
@@ -564,384 +554,384 @@ case 93: {
sym(1).Node = node;
} break;
-case 95: {
+case 94: {
AST::NewExpression *node = makeAstNode<AST::NewExpression> (driver->nodePool(), sym(2).Expression);
node->newToken = loc(1);
sym(1).Node = node;
} break;
-case 96: {
+case 95: {
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 97: {
+case 96: {
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 98: {
+case 97: {
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 99: {
+case 98: {
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 100: {
+case 99: {
sym(1).Node = 0;
} break;
-case 101: {
+case 100: {
sym(1).Node = sym(1).ArgumentList->finish();
} break;
-case 102: {
+case 101: {
sym(1).Node = makeAstNode<AST::ArgumentList> (driver->nodePool(), sym(1).Expression);
} break;
-case 103: {
+case 102: {
AST::ArgumentList *node = makeAstNode<AST::ArgumentList> (driver->nodePool(), sym(1).ArgumentList, sym(3).Expression);
node->commaToken = loc(2);
sym(1).Node = node;
} break;
-case 107: {
+case 106: {
AST::PostIncrementExpression *node = makeAstNode<AST::PostIncrementExpression> (driver->nodePool(), sym(1).Expression);
node->incrementToken = loc(2);
sym(1).Node = node;
} break;
-case 108: {
+case 107: {
AST::PostDecrementExpression *node = makeAstNode<AST::PostDecrementExpression> (driver->nodePool(), sym(1).Expression);
node->decrementToken = loc(2);
sym(1).Node = node;
} break;
-case 110: {
+case 109: {
AST::DeleteExpression *node = makeAstNode<AST::DeleteExpression> (driver->nodePool(), sym(2).Expression);
node->deleteToken = loc(1);
sym(1).Node = node;
} break;
-case 111: {
+case 110: {
AST::VoidExpression *node = makeAstNode<AST::VoidExpression> (driver->nodePool(), sym(2).Expression);
node->voidToken = loc(1);
sym(1).Node = node;
} break;
-case 112: {
+case 111: {
AST::TypeOfExpression *node = makeAstNode<AST::TypeOfExpression> (driver->nodePool(), sym(2).Expression);
node->typeofToken = loc(1);
sym(1).Node = node;
} break;
-case 113: {
+case 112: {
AST::PreIncrementExpression *node = makeAstNode<AST::PreIncrementExpression> (driver->nodePool(), sym(2).Expression);
node->incrementToken = loc(1);
sym(1).Node = node;
} break;
-case 114: {
+case 113: {
AST::PreDecrementExpression *node = makeAstNode<AST::PreDecrementExpression> (driver->nodePool(), sym(2).Expression);
node->decrementToken = loc(1);
sym(1).Node = node;
} break;
-case 115: {
+case 114: {
AST::UnaryPlusExpression *node = makeAstNode<AST::UnaryPlusExpression> (driver->nodePool(), sym(2).Expression);
node->plusToken = loc(1);
sym(1).Node = node;
} break;
-case 116: {
+case 115: {
AST::UnaryMinusExpression *node = makeAstNode<AST::UnaryMinusExpression> (driver->nodePool(), sym(2).Expression);
node->minusToken = loc(1);
sym(1).Node = node;
} break;
-case 117: {
+case 116: {
AST::TildeExpression *node = makeAstNode<AST::TildeExpression> (driver->nodePool(), sym(2).Expression);
node->tildeToken = loc(1);
sym(1).Node = node;
} break;
-case 118: {
+case 117: {
AST::NotExpression *node = makeAstNode<AST::NotExpression> (driver->nodePool(), sym(2).Expression);
node->notToken = loc(1);
sym(1).Node = node;
} break;
-case 120: {
+case 119: {
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 121: {
+case 120: {
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 122: {
+case 121: {
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 124: {
+case 123: {
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 125: {
+case 124: {
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 127: {
+case 126: {
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 128: {
+case 127: {
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 129: {
+case 128: {
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 131: {
+case 130: {
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 132: {
+case 131: {
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 133: {
+case 132: {
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 134: {
+case 133: {
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 135: {
+case 134: {
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 136: {
+case 135: {
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 138: {
+case 137: {
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 139: {
+case 138: {
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 140: {
+case 139: {
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 141: {
+case 140: {
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 142: {
+case 141: {
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 144: {
+case 143: {
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 145: {
+case 144: {
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 146: {
+case 145: {
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 147: {
+case 146: {
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 149: {
+case 148: {
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 150: {
+case 149: {
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 151: {
+case 150: {
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 152: {
+case 151: {
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 154: {
+case 153: {
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 156: {
+case 155: {
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 158: {
+case 157: {
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 160: {
+case 159: {
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 162: {
+case 161: {
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 164: {
+case 163: {
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 166: {
+case 165: {
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 168: {
+case 167: {
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 170: {
+case 169: {
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 172: {
+case 171: {
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 174: {
+case 173: {
AST::ConditionalExpression *node = makeAstNode<AST::ConditionalExpression> (driver->nodePool(), sym(1).Expression,
sym(3).Expression, sym(5).Expression);
node->questionToken = loc(2);
@@ -949,7 +939,7 @@ case 174: {
sym(1).Node = node;
} break;
-case 176: {
+case 175: {
AST::ConditionalExpression *node = makeAstNode<AST::ConditionalExpression> (driver->nodePool(), sym(1).Expression,
sym(3).Expression, sym(5).Expression);
node->questionToken = loc(2);
@@ -957,112 +947,112 @@ case 176: {
sym(1).Node = node;
} break;
-case 178: {
+case 177: {
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 180: {
+case 179: {
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 181: {
+case 180: {
sym(1).ival = QSOperator::Assign;
} break;
-case 182: {
+case 181: {
sym(1).ival = QSOperator::InplaceMul;
} break;
-case 183: {
+case 182: {
sym(1).ival = QSOperator::InplaceDiv;
} break;
-case 184: {
+case 183: {
sym(1).ival = QSOperator::InplaceMod;
} break;
-case 185: {
+case 184: {
sym(1).ival = QSOperator::InplaceAdd;
} break;
-case 186: {
+case 185: {
sym(1).ival = QSOperator::InplaceSub;
} break;
-case 187: {
+case 186: {
sym(1).ival = QSOperator::InplaceLeftShift;
} break;
-case 188: {
+case 187: {
sym(1).ival = QSOperator::InplaceRightShift;
} break;
-case 189: {
+case 188: {
sym(1).ival = QSOperator::InplaceURightShift;
} break;
-case 190: {
+case 189: {
sym(1).ival = QSOperator::InplaceAnd;
} break;
-case 191: {
+case 190: {
sym(1).ival = QSOperator::InplaceXor;
} break;
-case 192: {
+case 191: {
sym(1).ival = QSOperator::InplaceOr;
} break;
-case 194: {
+case 193: {
AST::Expression *node = makeAstNode<AST::Expression> (driver->nodePool(), sym(1).Expression, sym(3).Expression);
node->commaToken = loc(2);
sym(1).Node = node;
} break;
-case 195: {
+case 194: {
sym(1).Node = 0;
} break;
-case 198: {
+case 197: {
AST::Expression *node = makeAstNode<AST::Expression> (driver->nodePool(), sym(1).Expression, sym(3).Expression);
node->commaToken = loc(2);
sym(1).Node = node;
} break;
-case 199: {
+case 198: {
sym(1).Node = 0;
} break;
-case 216: {
+case 215: {
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 217: {
+case 216: {
sym(1).Node = makeAstNode<AST::StatementList> (driver->nodePool(), sym(1).Statement);
} break;
-case 218: {
+case 217: {
sym(1).Node = makeAstNode<AST::StatementList> (driver->nodePool(), sym(1).StatementList, sym(2).Statement);
} break;
-case 219: {
+case 218: {
sym(1).Node = 0;
} break;
-case 220: {
+case 219: {
sym(1).Node = sym(1).StatementList->finish ();
} break;
-case 222: {
+case 221: {
AST::VariableStatement *node = makeAstNode<AST::VariableStatement> (driver->nodePool(),
sym(2).VariableDeclarationList->finish (/*readOnly=*/sym(1).ival == T_CONST));
node->declarationKindToken = loc(1);
@@ -1070,76 +1060,76 @@ case 222: {
sym(1).Node = node;
} break;
-case 223: {
+case 222: {
sym(1).ival = T_CONST;
} break;
-case 224: {
+case 223: {
sym(1).ival = T_VAR;
} break;
-case 225: {
+case 224: {
sym(1).Node = makeAstNode<AST::VariableDeclarationList> (driver->nodePool(), sym(1).VariableDeclaration);
} break;
-case 226: {
+case 225: {
AST::VariableDeclarationList *node = makeAstNode<AST::VariableDeclarationList> (driver->nodePool(),
sym(1).VariableDeclarationList, sym(3).VariableDeclaration);
node->commaToken = loc(2);
sym(1).Node = node;
} break;
-case 227: {
+case 226: {
sym(1).Node = makeAstNode<AST::VariableDeclarationList> (driver->nodePool(), sym(1).VariableDeclaration);
} break;
-case 228: {
+case 227: {
sym(1).Node = makeAstNode<AST::VariableDeclarationList> (driver->nodePool(), sym(1).VariableDeclarationList, sym(3).VariableDeclaration);
} break;
-case 229: {
+case 228: {
AST::VariableDeclaration *node = makeAstNode<AST::VariableDeclaration> (driver->nodePool(), sym(1).sval, sym(2).Expression);
node->identifierToken = loc(1);
sym(1).Node = node;
} break;
-case 230: {
+case 229: {
AST::VariableDeclaration *node = makeAstNode<AST::VariableDeclaration> (driver->nodePool(), sym(1).sval, sym(2).Expression);
node->identifierToken = loc(1);
sym(1).Node = node;
} break;
-case 231: {
+case 230: {
// ### TODO: AST for initializer
sym(1) = sym(2);
} break;
-case 232: {
+case 231: {
sym(1).Node = 0;
} break;
-case 234: {
+case 233: {
// ### TODO: AST for initializer
sym(1) = sym(2);
} break;
-case 235: {
+case 234: {
sym(1).Node = 0;
} break;
-case 237: {
+case 236: {
AST::EmptyStatement *node = makeAstNode<AST::EmptyStatement> (driver->nodePool());
node->semicolonToken = loc(1);
sym(1).Node = node;
} break;
-case 239: {
+case 238: {
AST::ExpressionStatement *node = makeAstNode<AST::ExpressionStatement> (driver->nodePool(), sym(1).Expression);
node->semicolonToken = loc(2);
sym(1).Node = node;
} break;
-case 240: {
+case 239: {
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);
@@ -1148,7 +1138,7 @@ case 240: {
sym(1).Node = node;
} break;
-case 241: {
+case 240: {
AST::IfStatement *node = makeAstNode<AST::IfStatement> (driver->nodePool(), sym(3).Expression, sym(5).Statement);
node->ifToken = loc(1);
node->lparenToken = loc(2);
@@ -1156,7 +1146,7 @@ case 241: {
sym(1).Node = node;
} break;
-case 243: {
+case 242: {
AST::DoWhileStatement *node = makeAstNode<AST::DoWhileStatement> (driver->nodePool(), sym(2).Statement, sym(5).Expression);
node->doToken = loc(1);
node->whileToken = loc(3);
@@ -1166,7 +1156,7 @@ case 243: {
sym(1).Node = node;
} break;
-case 244: {
+case 243: {
AST::WhileStatement *node = makeAstNode<AST::WhileStatement> (driver->nodePool(), sym(3).Expression, sym(5).Statement);
node->whileToken = loc(1);
node->lparenToken = loc(2);
@@ -1174,7 +1164,7 @@ case 244: {
sym(1).Node = node;
} break;
-case 245: {
+case 244: {
AST::ForStatement *node = makeAstNode<AST::ForStatement> (driver->nodePool(), sym(3).Expression,
sym(5).Expression, sym(7).Expression, sym(9).Statement);
node->forToken = loc(1);
@@ -1185,7 +1175,7 @@ case 245: {
sym(1).Node = node;
} break;
-case 246: {
+case 245: {
AST::LocalForStatement *node = makeAstNode<AST::LocalForStatement> (driver->nodePool(),
sym(4).VariableDeclarationList->finish (/*readOnly=*/false), sym(6).Expression,
sym(8).Expression, sym(10).Statement);
@@ -1198,7 +1188,7 @@ case 246: {
sym(1).Node = node;
} break;
-case 247: {
+case 246: {
AST:: ForEachStatement *node = makeAstNode<AST::ForEachStatement> (driver->nodePool(), sym(3).Expression,
sym(5).Expression, sym(7).Statement);
node->forToken = loc(1);
@@ -1208,7 +1198,7 @@ case 247: {
sym(1).Node = node;
} break;
-case 248: {
+case 247: {
AST::LocalForEachStatement *node = makeAstNode<AST::LocalForEachStatement> (driver->nodePool(),
sym(4).VariableDeclaration, sym(6).Expression, sym(8).Statement);
node->forToken = loc(1);
@@ -1219,14 +1209,14 @@ case 248: {
sym(1).Node = node;
} break;
-case 250: {
+case 249: {
AST::ContinueStatement *node = makeAstNode<AST::ContinueStatement> (driver->nodePool());
node->continueToken = loc(1);
node->semicolonToken = loc(2);
sym(1).Node = node;
} break;
-case 252: {
+case 251: {
AST::ContinueStatement *node = makeAstNode<AST::ContinueStatement> (driver->nodePool(), sym(2).sval);
node->continueToken = loc(1);
node->identifierToken = loc(2);
@@ -1234,14 +1224,14 @@ case 252: {
sym(1).Node = node;
} break;
-case 254: {
+case 253: {
AST::BreakStatement *node = makeAstNode<AST::BreakStatement> (driver->nodePool());
node->breakToken = loc(1);
node->semicolonToken = loc(2);
sym(1).Node = node;
} break;
-case 256: {
+case 255: {
AST::BreakStatement *node = makeAstNode<AST::BreakStatement> (driver->nodePool(), sym(2).sval);
node->breakToken = loc(1);
node->identifierToken = loc(2);
@@ -1249,14 +1239,14 @@ case 256: {
sym(1).Node = node;
} break;
-case 258: {
+case 257: {
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 259: {
+case 258: {
AST::WithStatement *node = makeAstNode<AST::WithStatement> (driver->nodePool(), sym(3).Expression, sym(5).Statement);
node->withToken = loc(1);
node->lparenToken = loc(2);
@@ -1264,7 +1254,7 @@ case 259: {
sym(1).Node = node;
} break;
-case 260: {
+case 259: {
AST::SwitchStatement *node = makeAstNode<AST::SwitchStatement> (driver->nodePool(), sym(3).Expression, sym(5).CaseBlock);
node->switchToken = loc(1);
node->lparenToken = loc(2);
@@ -1272,83 +1262,83 @@ case 260: {
sym(1).Node = node;
} break;
-case 261: {
+case 260: {
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 262: {
+case 261: {
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 263: {
+case 262: {
sym(1).Node = makeAstNode<AST::CaseClauses> (driver->nodePool(), sym(1).CaseClause);
} break;
-case 264: {
+case 263: {
sym(1).Node = makeAstNode<AST::CaseClauses> (driver->nodePool(), sym(1).CaseClauses, sym(2).CaseClause);
} break;
-case 265: {
+case 264: {
sym(1).Node = 0;
} break;
-case 266: {
+case 265: {
sym(1).Node = sym(1).CaseClauses->finish ();
} break;
-case 267: {
+case 266: {
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 268: {
+case 267: {
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 269: {
+case 268: {
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 271: {
+case 270: {
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 272: {
+case 271: {
AST::TryStatement *node = makeAstNode<AST::TryStatement> (driver->nodePool(), sym(2).Statement, sym(3).Catch);
node->tryToken = loc(1);
sym(1).Node = node;
} break;
-case 273: {
+case 272: {
AST::TryStatement *node = makeAstNode<AST::TryStatement> (driver->nodePool(), sym(2).Statement, sym(3).Finally);
node->tryToken = loc(1);
sym(1).Node = node;
} break;
-case 274: {
+case 273: {
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 275: {
+case 274: {
AST::Catch *node = makeAstNode<AST::Catch> (driver->nodePool(), sym(3).sval, sym(5).Statement);
node->catchToken = loc(1);
node->lparenToken = loc(2);
@@ -1357,20 +1347,20 @@ case 275: {
sym(1).Node = node;
} break;
-case 276: {
+case 275: {
AST::Finally *node = makeAstNode<AST::Finally> (driver->nodePool(), sym(2).Statement);
node->finallyToken = loc(1);
sym(1).Node = node;
} break;
-case 278: {
+case 277: {
AST::DebuggerStatement *node = makeAstNode<AST::DebuggerStatement> (driver->nodePool());
node->debuggerToken = loc(1);
node->semicolonToken = loc(2);
sym(1).Node = node;
} break;
-case 279: {
+case 278: {
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);
@@ -1381,7 +1371,7 @@ case 279: {
sym(1).Node = node;
} break;
-case 280: {
+case 279: {
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)
@@ -1393,56 +1383,56 @@ case 280: {
sym(1).Node = node;
} break;
-case 281: {
+case 280: {
AST::FormalParameterList *node = makeAstNode<AST::FormalParameterList> (driver->nodePool(), sym(1).sval);
node->identifierToken = loc(1);
sym(1).Node = node;
} break;
-case 282: {
+case 281: {
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 283: {
+case 282: {
sym(1).Node = 0;
} break;
-case 284: {
+case 283: {
sym(1).Node = sym(1).FormalParameterList->finish ();
} break;
-case 285: {
+case 284: {
sym(1).Node = 0;
} break;
-case 287: {
+case 286: {
sym(1).Node = makeAstNode<AST::FunctionBody> (driver->nodePool(), sym(1).SourceElements->finish ());
} break;
-case 288: {
+case 287: {
sym(1).Node = makeAstNode<AST::SourceElements> (driver->nodePool(), sym(1).SourceElement);
} break;
-case 289: {
+case 288: {
sym(1).Node = makeAstNode<AST::SourceElements> (driver->nodePool(), sym(1).SourceElements, sym(2).SourceElement);
} break;
-case 290: {
+case 289: {
sym(1).Node = makeAstNode<AST::StatementSourceElement> (driver->nodePool(), sym(1).Statement);
} break;
-case 291: {
+case 290: {
sym(1).Node = makeAstNode<AST::FunctionSourceElement> (driver->nodePool(), sym(1).FunctionDeclaration);
} break;
-case 292: {
+case 291: {
sym(1).sval = 0;
} break;
-case 294: {
+case 293: {
sym(1).Node = 0;
} break;
diff --git a/src/declarative/qml/parser/javascriptparser_p.h b/src/declarative/qml/parser/javascriptparser_p.h
index ee9adf6..d31597b 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 36
+#define J_SCRIPT_REGEXPLITERAL_RULE1 35
-#define J_SCRIPT_REGEXPLITERAL_RULE2 37
+#define J_SCRIPT_REGEXPLITERAL_RULE2 36
QT_END_NAMESPACE
diff --git a/src/declarative/qml/qmlscriptparser.cpp b/src/declarative/qml/qmlscriptparser.cpp
index 03e6165..41d2534 100644
--- a/src/declarative/qml/qmlscriptparser.cpp
+++ b/src/declarative/qml/qmlscriptparser.cpp
@@ -438,13 +438,16 @@ bool ProcessAST::visit(AST::UiImport *node)
return false;
}
-// UiObjectMember: T_PUBLIC T_IDENTIFIER T_IDENTIFIER T_COLON Expression UiObjectInitializer ;
+// UiObjectMember: T_PUBLIC UiMemberType T_IDENTIFIER T_COLON Expression
+// UiObjectMember: T_PUBLIC UiMemberType T_IDENTIFIER
+//
+// UiMemberType: "property" | "signal"
bool ProcessAST::visit(AST::UiPublicMember *node)
{
- const QString type = node->type->asString();
+ const QString memberType = node->memberType->asString();
const QString name = node->name->asString();
- if (type == QLatin1String("property")) {
+ if (memberType == QLatin1String("property")) {
_stateStack.pushProperty(QLatin1String("properties"), node->publicToken.startLine);
Object *obj = defineObjectBinding(node->identifierToken.startLine,
@@ -460,7 +463,7 @@ bool ProcessAST::visit(AST::UiPublicMember *node)
_stateStack.pop(); // object
_stateStack.pop(); // properties
- } else if (type == QLatin1String("signal")) {
+ } else if (memberType == QLatin1String("signal")) {
_stateStack.pushProperty(QLatin1String("signals"), node->publicToken.startLine);
Object *obj = defineObjectBinding(node->identifierToken.startLine,
@@ -474,7 +477,7 @@ bool ProcessAST::visit(AST::UiPublicMember *node)
_stateStack.pop(); // object
_stateStack.pop(); // signals
} else {
- qWarning() << "bad public identifier" << type; // ### FIXME
+ qWarning() << "bad public identifier" << memberType; // ### FIXME
}
generated by cgit v0.12 at 2024-10-22 08:53:11 (GMT)