diff options
author | Aaron Kennedy <aaron.kennedy@nokia.com> | 2009-05-01 07:04:56 (GMT) |
---|---|---|
committer | Aaron Kennedy <aaron.kennedy@nokia.com> | 2009-05-01 07:04:56 (GMT) |
commit | 311ccc09dfe1defd2e51838737fe88d60d1047b4 (patch) | |
tree | 9abc8e5d86eafc7b48eeb377652aa631235353b3 /src | |
parent | 7f6cec754823ebbdc173fc9265e1049ae00649c7 (diff) | |
download | Qt-311ccc09dfe1defd2e51838737fe88d60d1047b4.zip Qt-311ccc09dfe1defd2e51838737fe88d60d1047b4.tar.gz Qt-311ccc09dfe1defd2e51838737fe88d60d1047b4.tar.bz2 |
Add QML signal declaration syntax
Syntax is
signal <signalName>
Currently signal parameters aren't supported
Diffstat (limited to 'src')
-rw-r--r-- | src/declarative/qml/parser/javascript.g | 12 | ||||
-rw-r--r-- | src/declarative/qml/parser/javascriptast_p.h | 5 | ||||
-rw-r--r-- | src/declarative/qml/parser/javascriptgrammar.cpp | 1164 | ||||
-rw-r--r-- | src/declarative/qml/parser/javascriptgrammar_p.h | 12 | ||||
-rw-r--r-- | src/declarative/qml/parser/javascriptlexer.cpp | 2 | ||||
-rw-r--r-- | src/declarative/qml/parser/javascriptparser.cpp | 385 | ||||
-rw-r--r-- | src/declarative/qml/parser/javascriptparser_p.h | 4 | ||||
-rw-r--r-- | src/declarative/qml/qmlscriptparser.cpp | 91 |
8 files changed, 851 insertions, 824 deletions
diff --git a/src/declarative/qml/parser/javascript.g b/src/declarative/qml/parser/javascript.g index a318ccb..350ba9f 100644 --- a/src/declarative/qml/parser/javascript.g +++ b/src/declarative/qml/parser/javascript.g @@ -660,6 +660,18 @@ case $rule_number: { UiPropertyType: T_IDENTIFIER ; +UiObjectMember: T_SIGNAL T_IDENTIFIER ; +/. +case $rule_number: { + AST::UiPublicMember *node = makeAstNode<AST::UiPublicMember> (driver->nodePool(), (JavaScriptNameIdImpl *)0, sym(2).sval); + node->type = AST::UiPublicMember::Signal; + node->propertyToken = loc(1); + node->typeToken = loc(2); + node->identifierToken = loc(3); + sym(1).Node = node; +} break; +./ + UiObjectMember: T_PROPERTY UiPropertyType T_IDENTIFIER ; /. case $rule_number: { diff --git a/src/declarative/qml/parser/javascriptast_p.h b/src/declarative/qml/parser/javascriptast_p.h index f32a48c..3a22fff 100644 --- a/src/declarative/qml/parser/javascriptast_p.h +++ b/src/declarative/qml/parser/javascriptast_p.h @@ -2326,13 +2326,13 @@ public: UiPublicMember(JavaScriptNameIdImpl *memberType, JavaScriptNameIdImpl *name) - : memberType(memberType), name(name), expression(0), isDefaultMember(false) + : type(Property), memberType(memberType), name(name), expression(0), isDefaultMember(false) { kind = K; } UiPublicMember(JavaScriptNameIdImpl *memberType, JavaScriptNameIdImpl *name, ExpressionNode *expression) - : memberType(memberType), name(name), expression(expression), isDefaultMember(false) + : type(Property), memberType(memberType), name(name), expression(expression), isDefaultMember(false) { kind = K; } virtual SourceLocation firstSourceLocation() const @@ -2354,6 +2354,7 @@ public: virtual void accept0(Visitor *visitor); // attributes + enum { Signal, Property } type; JavaScriptNameIdImpl *memberType; JavaScriptNameIdImpl *name; ExpressionNode *expression; diff --git a/src/declarative/qml/parser/javascriptgrammar.cpp b/src/declarative/qml/parser/javascriptgrammar.cpp index 3fac1ed..b42f419 100644 --- a/src/declarative/qml/parser/javascriptgrammar.cpp +++ b/src/declarative/qml/parser/javascriptgrammar.cpp @@ -58,480 +58,478 @@ const int JavaScriptGrammar::lhs [] = { 91, 92, 92, 95, 95, 96, 96, 94, 93, 93, 98, 98, 100, 100, 99, 97, 99, 97, 99, 97, 102, 103, 103, 97, 99, 97, 105, 105, 105, 97, - 97, 97, 97, 97, 97, 101, 101, 109, 109, 109, - 101, 101, 110, 110, 110, 110, 110, 110, 110, 110, - 110, 110, 110, 110, 110, 110, 110, 112, 112, 116, - 116, 111, 111, 114, 114, 117, 117, 117, 117, 117, - 117, 118, 118, 118, 118, 118, 118, 118, 118, 118, + 97, 97, 97, 97, 97, 97, 101, 101, 109, 109, + 109, 101, 101, 110, 110, 110, 110, 110, 110, 110, + 110, 110, 110, 110, 110, 110, 110, 110, 112, 112, + 116, 116, 111, 111, 114, 114, 117, 117, 117, 117, + 117, 117, 118, 118, 118, 118, 118, 118, 118, 118, 118, 118, 118, 118, 118, 118, 118, 118, 118, 118, 118, 118, 118, 118, 118, 118, 118, 118, 118, 118, - 118, 118, 119, 119, 120, 120, 120, 120, 120, 123, - 123, 124, 124, 124, 124, 122, 122, 125, 125, 126, - 126, 127, 127, 127, 128, 128, 128, 128, 128, 128, - 128, 128, 128, 128, 129, 129, 129, 129, 130, 130, - 130, 131, 131, 131, 131, 132, 132, 132, 132, 132, - 132, 132, 133, 133, 133, 133, 133, 133, 134, 134, - 134, 134, 134, 135, 135, 135, 135, 135, 136, 136, - 137, 137, 138, 138, 139, 139, 140, 140, 141, 141, - 142, 142, 143, 143, 144, 144, 145, 145, 146, 146, - 147, 147, 115, 115, 148, 148, 149, 149, 149, 149, - 149, 149, 149, 149, 149, 149, 149, 149, 106, 106, - 150, 150, 151, 151, 152, 152, 104, 104, 104, 104, + 118, 118, 118, 119, 119, 120, 120, 120, 120, 120, + 123, 123, 124, 124, 124, 124, 122, 122, 125, 125, + 126, 126, 127, 127, 127, 128, 128, 128, 128, 128, + 128, 128, 128, 128, 128, 129, 129, 129, 129, 130, + 130, 130, 131, 131, 131, 131, 132, 132, 132, 132, + 132, 132, 132, 133, 133, 133, 133, 133, 133, 134, + 134, 134, 134, 134, 135, 135, 135, 135, 135, 136, + 136, 137, 137, 138, 138, 139, 139, 140, 140, 141, + 141, 142, 142, 143, 143, 144, 144, 145, 145, 146, + 146, 147, 147, 115, 115, 148, 148, 149, 149, 149, + 149, 149, 149, 149, 149, 149, 149, 149, 149, 106, + 106, 150, 150, 151, 151, 152, 152, 104, 104, 104, 104, 104, 104, 104, 104, 104, 104, 104, 104, 104, - 104, 153, 168, 168, 167, 167, 108, 108, 169, 169, - 170, 170, 172, 172, 171, 173, 176, 174, 174, 177, - 175, 175, 154, 155, 155, 156, 156, 157, 157, 157, - 157, 157, 157, 157, 158, 158, 158, 158, 159, 159, - 159, 159, 160, 160, 161, 163, 178, 178, 181, 181, - 179, 179, 182, 180, 162, 162, 162, 164, 164, 165, - 165, 165, 183, 184, 166, 166, 107, 107, 107, 121, - 188, 188, 185, 185, 186, 186, 189, 190, 190, 191, - 191, 187, 187, 113, 113, 192}; + 104, 104, 153, 168, 168, 167, 167, 108, 108, 169, + 169, 170, 170, 172, 172, 171, 173, 176, 174, 174, + 177, 175, 175, 154, 155, 155, 156, 156, 157, 157, + 157, 157, 157, 157, 157, 158, 158, 158, 158, 159, + 159, 159, 159, 160, 160, 161, 163, 178, 178, 181, + 181, 179, 179, 182, 180, 162, 162, 162, 164, 164, + 165, 165, 165, 183, 184, 166, 166, 107, 107, 107, + 121, 188, 188, 185, 185, 186, 186, 189, 190, 190, + 191, 191, 187, 187, 113, 113, 192}; const int JavaScriptGrammar:: rhs[] = { 2, 1, 1, 1, 2, 3, 3, 0, 1, 2, 1, 3, 2, 3, 4, 4, 2, 2, 5, 5, - 1, 2, 2, 3, 3, 3, 1, 1, 1, 3, - 4, 5, 6, 1, 1, 1, 1, 1, 1, 1, - 1, 3, 1, 1, 1, 1, 1, 1, 1, 1, - 1, 3, 3, 5, 3, 4, 3, 2, 4, 1, - 2, 0, 1, 3, 5, 1, 1, 1, 1, 1, + 1, 2, 2, 3, 3, 3, 1, 1, 1, 2, + 3, 4, 5, 6, 1, 1, 1, 1, 1, 1, + 1, 1, 3, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 3, 3, 5, 3, 4, 3, 2, 4, + 1, 2, 0, 1, 3, 5, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, - 1, 1, 1, 1, 1, 1, 4, 3, 5, 1, - 2, 4, 4, 4, 3, 0, 1, 1, 3, 1, - 1, 1, 2, 2, 1, 2, 2, 2, 2, 2, - 2, 2, 2, 2, 1, 3, 3, 3, 1, 3, - 3, 1, 3, 3, 3, 1, 3, 3, 3, 3, - 3, 3, 1, 3, 3, 3, 3, 3, 1, 3, - 3, 3, 3, 1, 3, 3, 3, 3, 1, 3, - 1, 3, 1, 3, 1, 3, 1, 3, 1, 3, - 1, 3, 1, 3, 1, 3, 1, 3, 1, 5, - 1, 5, 1, 3, 1, 3, 1, 1, 1, 1, - 1, 1, 1, 1, 1, 1, 1, 1, 1, 3, - 0, 1, 1, 3, 0, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 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, - 1, 3, 1, 2, 0, 1, 3, 3, 1, 1, - 1, 3, 1, 3, 2, 2, 2, 0, 1, 2, - 0, 1, 1, 2, 2, 7, 5, 7, 7, 5, - 9, 10, 7, 8, 2, 2, 3, 3, 2, 2, - 3, 3, 3, 3, 5, 5, 3, 5, 1, 2, - 0, 1, 4, 3, 3, 3, 3, 3, 3, 3, - 3, 4, 5, 2, 2, 2, 8, 8, 8, 8, - 1, 3, 0, 1, 0, 1, 1, 1, 2, 1, - 1, 0, 1, 0, 1, 2}; + 3, 0, 1, 1, 3, 0, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 3, 1, 2, 0, 1, 3, 3, 1, + 1, 1, 3, 1, 3, 2, 2, 2, 0, 1, + 2, 0, 1, 1, 2, 2, 7, 5, 7, 7, + 5, 9, 10, 7, 8, 2, 2, 3, 3, 2, + 2, 3, 3, 3, 3, 5, 5, 3, 5, 1, + 2, 0, 1, 4, 3, 3, 3, 3, 3, 3, + 3, 3, 4, 5, 2, 2, 2, 8, 8, 8, + 8, 1, 3, 0, 1, 0, 1, 1, 1, 2, + 1, 1, 0, 1, 0, 1, 2}; const int JavaScriptGrammar::action_default [] = { 8, 2, 0, 4, 3, 0, 0, 0, 6, 7, - 5, 34, 41, 239, 0, 0, 38, 39, 36, 37, - 40, 240, 9, 1, 0, 0, 35, 0, 29, 28, - 27, 0, 31, 0, 142, 209, 173, 181, 177, 121, - 193, 169, 33, 106, 44, 122, 185, 189, 110, 139, - 120, 125, 105, 159, 146, 0, 50, 51, 47, 312, - 38, 314, 62, 0, 0, 0, 0, 0, 45, 48, - 0, 0, 39, 49, 43, 0, 46, 0, 0, 135, - 0, 0, 122, 141, 124, 123, 0, 0, 0, 137, - 138, 136, 140, 0, 170, 0, 0, 0, 0, 160, - 0, 0, 0, 0, 0, 0, 150, 0, 0, 0, - 144, 145, 143, 148, 152, 151, 149, 147, 162, 161, - 163, 0, 178, 0, 174, 0, 0, 116, 103, 115, - 104, 72, 73, 74, 99, 75, 100, 76, 77, 78, + 5, 35, 42, 240, 0, 0, 39, 40, 37, 38, + 41, 241, 9, 1, 0, 0, 36, 0, 29, 28, + 27, 0, 32, 0, 143, 210, 174, 182, 178, 122, + 194, 170, 34, 107, 45, 123, 186, 190, 111, 140, + 121, 126, 106, 160, 147, 0, 51, 52, 48, 313, + 39, 315, 63, 0, 0, 0, 0, 0, 46, 49, + 0, 0, 40, 41, 50, 44, 0, 47, 0, 0, + 136, 0, 0, 123, 142, 125, 124, 0, 0, 0, + 138, 139, 137, 141, 0, 171, 0, 0, 0, 0, + 161, 0, 0, 0, 0, 0, 0, 151, 0, 0, + 0, 145, 146, 144, 149, 153, 152, 150, 148, 163, + 162, 164, 0, 179, 0, 175, 0, 0, 117, 104, + 116, 105, 73, 74, 75, 100, 76, 101, 77, 78, 79, 80, 81, 82, 83, 84, 85, 86, 87, 88, - 101, 89, 90, 91, 92, 93, 94, 95, 96, 97, - 98, 102, 0, 0, 114, 210, 117, 0, 118, 0, - 119, 113, 0, 206, 199, 197, 204, 205, 203, 202, - 208, 201, 200, 198, 207, 194, 0, 182, 0, 0, - 186, 0, 0, 190, 0, 0, 116, 108, 0, 107, - 0, 112, 126, 0, 313, 303, 304, 0, 301, 0, - 302, 0, 305, 217, 224, 223, 231, 219, 0, 220, - 306, 0, 311, 221, 222, 227, 225, 308, 307, 310, - 228, 0, 0, 0, 0, 0, 312, 38, 0, 314, - 39, 211, 253, 40, 0, 0, 0, 0, 0, 229, - 230, 218, 226, 254, 255, 300, 309, 0, 269, 270, - 271, 272, 0, 265, 266, 267, 268, 295, 296, 0, - 0, 0, 0, 0, 258, 259, 215, 213, 175, 183, - 179, 195, 171, 216, 0, 122, 187, 191, 164, 153, - 0, 0, 172, 0, 0, 0, 0, 165, 0, 0, - 0, 0, 0, 157, 155, 158, 156, 154, 167, 166, - 168, 0, 180, 0, 176, 0, 214, 122, 0, 196, - 211, 212, 0, 211, 0, 0, 261, 0, 0, 0, - 263, 0, 184, 0, 0, 188, 0, 0, 192, 251, - 0, 243, 252, 246, 0, 250, 0, 211, 244, 0, - 211, 0, 0, 262, 0, 0, 0, 264, 38, 39, - 40, 303, 0, 0, 305, 0, 299, 303, 0, 0, - 305, 0, 298, 303, 0, 0, 305, 0, 297, 0, - 287, 0, 0, 0, 257, 0, 256, 0, 315, 0, - 71, 233, 236, 0, 72, 239, 75, 100, 77, 78, - 47, 82, 83, 38, 84, 87, 45, 48, 39, 211, - 40, 49, 90, 43, 92, 46, 94, 95, 240, 97, - 98, 102, 0, 64, 0, 0, 66, 70, 68, 56, - 67, 69, 0, 65, 55, 234, 232, 110, 111, 116, - 0, 109, 0, 286, 0, 273, 274, 0, 285, 0, - 0, 0, 276, 281, 279, 282, 0, 0, 280, 281, - 0, 277, 0, 278, 235, 284, 0, 235, 283, 0, - 288, 289, 0, 235, 290, 291, 0, 0, 292, 0, - 0, 0, 293, 294, 128, 127, 0, 0, 0, 260, - 0, 0, 0, 275, 0, 63, 0, 60, 62, 53, - 0, 59, 54, 61, 58, 52, 0, 57, 132, 130, - 134, 131, 129, 133, 0, 0, 0, 0, 18, 13, - 0, 14, 10, 0, 30, 0, 32, 0, 0, 26, - 38, 62, 21, 0, 24, 16, 38, 0, 11, 0, - 17, 0, 20, 12, 0, 25, 38, 62, 15, 0, - 19, 22, 23, 42, 248, 241, 0, 249, 245, 0, - 247, 237, 0, 238, 242, 316}; + 89, 102, 90, 91, 92, 93, 94, 95, 96, 97, + 98, 99, 103, 0, 0, 115, 211, 118, 0, 119, + 0, 120, 114, 0, 207, 200, 198, 205, 206, 204, + 203, 209, 202, 201, 199, 208, 195, 0, 183, 0, + 0, 187, 0, 0, 191, 0, 0, 117, 109, 0, + 108, 0, 113, 127, 0, 314, 304, 305, 0, 302, + 0, 303, 0, 306, 218, 225, 224, 232, 220, 0, + 221, 307, 0, 312, 222, 223, 228, 226, 309, 308, + 311, 229, 0, 0, 0, 0, 0, 313, 39, 0, + 315, 40, 212, 254, 41, 0, 0, 0, 0, 0, + 230, 231, 219, 227, 255, 256, 301, 310, 0, 270, + 271, 272, 273, 0, 266, 267, 268, 269, 296, 297, + 0, 0, 0, 0, 0, 259, 260, 216, 214, 176, + 184, 180, 196, 172, 217, 0, 123, 188, 192, 165, + 154, 0, 0, 173, 0, 0, 0, 0, 166, 0, + 0, 0, 0, 0, 158, 156, 159, 157, 155, 168, + 167, 169, 0, 181, 0, 177, 0, 215, 123, 0, + 197, 212, 213, 0, 212, 0, 0, 262, 0, 0, + 0, 264, 0, 185, 0, 0, 189, 0, 0, 193, + 252, 0, 244, 253, 247, 0, 251, 0, 212, 245, + 0, 212, 0, 0, 263, 0, 0, 0, 265, 39, + 40, 41, 304, 0, 0, 306, 0, 300, 304, 0, + 0, 306, 0, 299, 304, 0, 0, 306, 0, 298, + 0, 288, 0, 0, 0, 258, 0, 257, 0, 316, + 0, 72, 234, 237, 0, 73, 240, 76, 101, 78, + 79, 48, 83, 84, 39, 85, 88, 46, 49, 40, + 212, 41, 50, 91, 44, 93, 47, 95, 96, 241, + 98, 99, 103, 0, 65, 0, 0, 67, 71, 69, + 57, 68, 70, 0, 66, 56, 235, 233, 111, 112, + 117, 0, 110, 0, 287, 0, 274, 275, 0, 286, + 0, 0, 0, 277, 282, 280, 283, 0, 0, 281, + 282, 0, 278, 0, 279, 236, 285, 0, 236, 284, + 0, 289, 290, 0, 236, 291, 292, 0, 0, 293, + 0, 0, 0, 294, 295, 129, 128, 0, 0, 0, + 261, 0, 0, 0, 276, 0, 64, 0, 61, 63, + 54, 0, 60, 55, 62, 59, 53, 0, 58, 133, + 131, 135, 132, 130, 134, 0, 0, 0, 0, 18, + 13, 0, 14, 10, 0, 31, 0, 33, 30, 0, + 0, 26, 39, 63, 21, 0, 24, 16, 39, 0, + 11, 0, 17, 0, 20, 12, 0, 25, 39, 63, + 15, 0, 19, 22, 23, 43, 249, 242, 0, 250, + 246, 0, 248, 238, 0, 239, 243, 317}; const int JavaScriptGrammar::goto_default [] = { - 6, 5, 23, 1, 4, 3, 22, 537, 538, 518, - 24, 533, 534, 229, 523, 218, 222, 251, 44, 52, - 496, 494, 389, 388, 35, 495, 387, 390, 129, 48, - 43, 167, 50, 39, 166, 45, 51, 79, 49, 34, - 54, 53, 288, 41, 282, 36, 278, 38, 280, 37, - 279, 46, 286, 47, 287, 40, 281, 277, 318, 444, - 283, 284, 213, 217, 219, 223, 224, 215, 214, 226, - 252, 225, 230, 249, 250, 216, 393, 392, 25, 556, - 555, 340, 341, 558, 343, 557, 342, 452, 456, 459, - 455, 454, 474, 475, 207, 221, 203, 206, 220, 228, - 227, 0}; + 6, 5, 23, 1, 4, 3, 22, 539, 540, 519, + 24, 535, 536, 230, 524, 219, 223, 252, 44, 52, + 497, 495, 390, 389, 35, 496, 388, 391, 130, 48, + 43, 168, 50, 39, 167, 45, 51, 80, 49, 34, + 54, 53, 289, 41, 283, 36, 279, 38, 281, 37, + 280, 46, 287, 47, 288, 40, 282, 278, 319, 445, + 284, 285, 214, 218, 220, 224, 225, 216, 215, 227, + 253, 226, 231, 250, 251, 217, 394, 393, 25, 558, + 557, 341, 342, 560, 344, 559, 343, 453, 457, 460, + 456, 455, 475, 476, 208, 222, 204, 207, 221, 229, + 228, 0}; const int JavaScriptGrammar::action_index [] = { - -12, -91, 60, -91, 63, 378, 95, 113, -91, -91, - -91, -91, -91, -91, 73, 162, 72, 166, -91, -91, - -91, -91, -91, 420, 131, 160, -91, 161, -91, -91, - -91, 44, 75, 700, 129, -91, 87, 52, 49, 182, - -91, 300, 71, -91, -91, 541, 76, 91, 259, 227, - -91, -91, -91, 360, 317, 700, -91, -91, -91, 170, - -91, 1198, 66, 700, 700, 700, 620, 700, -91, -91, - 700, 700, -91, -91, -91, 700, -91, 700, 700, -91, - 700, 700, 106, 175, -91, -91, 700, 700, 700, -91, - -91, -91, 210, 700, 283, 700, 700, 700, 700, 453, - 700, 700, 700, 700, 700, 700, 222, 700, 700, 700, - 96, 83, 82, 244, 317, 176, 241, 238, 453, 453, - 379, 700, 74, 700, 93, 1111, 700, 700, -91, -91, + -13, -91, 64, -91, 63, 406, 96, 108, -91, -91, + -91, -91, -91, -91, 60, 146, 68, 189, -91, -91, + 71, -91, -91, 383, 151, 178, -91, 208, -91, -91, + -91, 44, 62, 686, 101, -91, 81, 41, 10, 261, + -91, 288, 70, -91, -91, 527, 95, 86, 265, 235, + -91, -91, -91, 439, 237, 686, -91, -91, -91, 173, + -91, 1184, 98, 686, 686, 686, 606, 686, -91, -91, + 686, 686, -91, -91, -91, -91, 686, -91, 686, 686, + -91, 686, 686, 74, 147, -91, -91, 686, 686, 686, + -91, -91, -91, 203, 686, 290, 686, 686, 686, 686, + 365, 686, 686, 686, 686, 686, 686, 237, 686, 686, + 686, 82, 79, 77, 303, 231, 198, 197, 237, 439, + 355, 439, 686, 65, 686, 92, 1097, 686, 686, -91, -91, -91, -91, -91, -91, -91, -91, -91, -91, -91, -91, -91, -91, -91, -91, -91, -91, -91, -91, -91, -91, -91, -91, -91, -91, -91, -91, -91, -91, -91, - -91, -91, 153, 700, -91, -91, 84, 69, -91, 700, - -91, -91, 700, -91, -91, -91, -91, -91, -91, -91, - -91, -91, -91, -91, -91, -91, 700, 67, 700, 700, - 64, 65, 700, -91, 1111, 700, 700, -91, 112, -91, - 42, -91, -91, 41, -91, 167, 62, 36, -91, 265, - -91, 57, 1546, -91, -91, -91, -91, -91, 216, -91, - -91, 43, -91, -91, -91, -91, -91, -91, 1546, -91, - -91, 286, 320, 92, 1459, 48, 256, 68, 33, 1720, - 80, 700, -91, 86, 77, 700, 50, 53, 61, -91, - -91, -91, -91, -91, -91, -91, -91, 105, -91, -91, - -91, -91, 121, -91, -91, -91, -91, -91, -91, 56, - 55, 700, 165, 124, -91, -91, 780, -91, 70, 32, - 3, -91, 292, 59, 45, 521, 168, 127, 385, 317, - 191, 700, 294, 700, 700, 700, 700, 385, 700, 700, - 700, 700, 700, 223, 183, 179, 237, 245, 385, 385, - 385, 700, -47, 700, 16, 700, -91, 541, 700, -91, - 700, 11, -43, 700, -44, 1459, -91, 700, 118, 1459, - -91, 700, -35, 700, 700, 19, 15, 700, -91, 10, - 123, -1, -91, -91, 700, -91, 225, 700, -91, -46, - 700, -59, 1459, -91, 700, 171, 1459, -91, -32, -26, - -27, 260, -37, 24, 1546, 30, -91, 267, 8, 31, - 1546, 0, -91, 214, -8, 18, 1546, -18, -91, 1459, - -91, 700, 103, 1459, 22, 1459, -91, 28, 25, -23, - -91, -91, 1459, -15, 312, 47, 301, 94, 700, 1459, - 38, 5, 269, 29, 27, 620, 51, 58, 54, 944, - 46, 1, -29, 4, 700, 79, -9, 700, 21, 700, - -10, -7, 700, -91, 1285, 7, -91, -91, -91, -91, - -91, -91, 700, -91, -91, -91, -91, 177, -91, 700, - -40, -91, 1459, -91, 88, -91, -91, 1459, -91, 700, - 102, -21, -91, 20, -91, -3, 89, 700, -91, -5, - -4, -91, -50, -91, 1459, -91, 109, 1459, -91, 194, - -91, -91, 101, 1459, 40, -91, 14, 23, -91, 186, - 2, 26, -91, -91, -91, -91, 700, 100, 1459, -91, - 700, 104, 1459, -91, 116, 35, 1024, -91, 34, -91, - 860, -91, -91, -91, -91, -91, 111, -91, -91, -91, - -91, -91, -91, -91, -2, 13, 12, 443, -91, -91, - 440, -91, -91, 17, 37, 700, 39, 1633, 258, -91, - 97, 369, -91, 81, -91, -91, 6, 251, -91, 150, - -91, 291, -91, -91, 1372, -91, 107, 346, -91, 120, - -91, -91, -91, -91, -11, -91, 180, -91, -91, 700, - -91, -91, 178, -91, -91, -91, + -91, -91, -91, 124, 686, -91, -91, 171, 61, -91, + 686, -91, -91, 686, -91, -91, -91, -91, -91, -91, + -91, -91, -91, -91, -91, -91, -91, 686, 66, 686, + 686, 97, 91, 686, -91, 1097, 686, 686, -91, 117, + -91, 14, -91, -91, 40, -91, 182, 69, 43, -91, + 236, -91, 47, 1445, -91, -91, -91, -91, -91, 209, + -91, -91, 32, -91, -91, -91, -91, -91, -91, 1445, + -91, -91, 310, 308, 83, 1358, 35, 217, 72, 58, + 1706, 85, 686, -91, 76, 59, 686, 51, 50, 55, + -91, -91, -91, -91, -91, -91, -91, -91, 120, -91, + -91, -91, -91, 125, -91, -91, -91, -91, -91, -91, + 42, 49, 686, 148, 127, -91, -91, 766, -91, 80, + 54, -14, -91, 267, 57, 11, 507, 88, 114, 371, + 303, 164, 686, 271, 686, 686, 686, 686, 371, 686, + 686, 686, 686, 686, 237, 237, 230, 303, 234, 371, + 371, 371, 686, -40, 686, -1, 686, -91, 527, 686, + -91, 686, -4, -51, 686, -57, 1358, -91, 686, 139, + 1358, -91, 686, -39, 686, 686, 88, -2, 686, -91, + 0, 134, -18, -91, -91, 686, -91, 221, 686, -91, + -50, 686, -45, 1358, -91, 686, 149, 1358, -91, -30, + -29, -28, 162, -48, -31, 1445, -54, -91, 176, -42, + 12, 1445, -5, -91, 238, -6, 23, 1445, 3, -91, + 1358, -91, 686, 105, 1358, 33, 1358, -91, 36, 38, + -7, -91, -91, 1358, 7, 285, 56, 292, 93, 686, + 1358, 9, 31, 282, 53, 30, 606, 46, 48, 52, + 930, 37, 17, -10, 21, 686, 20, -8, 686, 16, + 686, -17, -16, 686, -91, 1271, 15, -91, -91, -91, + -91, -91, -91, 686, -91, -91, -91, -91, 156, -91, + 686, 8, -91, 1358, -91, 99, -91, -91, 1358, -91, + 686, 102, 2, -91, 27, -91, 26, 94, 686, -91, + 24, 29, -91, -15, -91, 1358, -91, 100, 1358, -91, + 192, -91, -91, 103, 1358, 19, -91, 5, 4, -91, + 185, -27, 1, -91, -91, -91, -91, 686, 112, 1358, + -91, 686, 123, 1358, -91, 107, 22, 846, -91, 13, + -91, 1010, -91, -91, -91, -91, -91, 116, -91, -91, + -91, -91, -91, -91, -91, 6, 25, 34, 429, -91, + -91, 426, -91, -91, 28, 45, 686, 39, -91, 1619, + 212, -91, 104, 356, -91, 73, -91, -91, 18, 145, + -91, 131, -91, 296, -91, -91, 1532, -91, 141, 332, + -91, 142, -91, -91, -91, -91, -3, -91, 159, -91, + -91, 686, -91, -91, 167, -91, -91, -91, - -102, -102, -102, -102, 93, 197, -102, -102, -102, -102, - -102, -102, -102, -102, -102, -102, -102, -102, -102, -102, - -102, -102, -102, 340, -102, -1, -102, 0, -102, -102, - -102, -102, -102, -2, -102, -102, -102, -102, -102, -102, - -102, -102, -102, -102, -102, -40, -102, -102, -102, -102, - -102, -102, -102, -102, -102, 163, -102, -102, -102, 2, - -102, -102, -102, 15, 146, 149, 170, 155, -102, -102, - 101, 138, -102, -102, -102, 79, -102, 160, 104, -102, - 123, 131, -102, -102, -102, -102, 108, 118, 114, -102, - -102, -102, -102, 105, -102, 115, 119, 130, 129, -102, - 122, 107, 91, 83, 94, 97, -102, 82, 154, 152, + -102, -102, -102, -102, -4, 194, -102, -102, -102, -102, -102, -102, -102, -102, -102, -102, -102, -102, -102, -102, - -102, 133, -102, 132, -102, 244, 44, 37, -102, -102, + -102, -102, -102, 345, -102, 2, -102, 3, -102, -102, + -102, -102, -102, -7, -102, -102, -102, -102, -102, -102, + -102, -102, -102, -102, -102, -49, -102, -102, -102, -102, + -102, -102, -102, -102, -102, 154, -102, -102, -102, 6, + -102, -102, -102, 7, 143, 140, 141, 155, -102, -102, + 97, 101, -102, -102, -102, -102, 79, -102, 83, 108, + -102, 133, 125, -102, -102, -102, -102, 118, 111, 59, + -102, -102, -102, -102, 104, -102, 115, 123, 126, 124, + -102, 122, 102, 89, 82, 95, 165, -102, 80, 146, + 148, -102, -102, -102, -102, -102, -102, -102, -102, -102, + -102, -102, 149, -102, 153, -102, 249, 43, 35, -102, -102, -102, -102, -102, -102, -102, -102, -102, -102, -102, -102, -102, -102, -102, -102, -102, -102, -102, -102, -102, -102, -102, -102, -102, -102, -102, -102, -102, -102, -102, - -102, -102, -102, 16, -102, -102, -102, -102, -102, 22, - -102, -102, 17, -102, -102, -102, -102, -102, -102, -102, - -102, -102, -102, -102, -102, -102, 73, -102, 74, 46, - -102, -102, 48, -102, 214, 49, 80, -102, -102, -102, - -102, -102, -102, -102, -102, 50, -102, -102, -102, 55, + -102, -102, -102, -102, 16, -102, -102, -102, -102, -102, + 21, -102, -102, 17, -102, -102, -102, -102, -102, -102, + -102, -102, -102, -102, -102, -102, -102, 74, -102, 34, + 48, -102, -102, 44, -102, 220, 49, 81, -102, -102, + -102, -102, -102, -102, -102, -102, 55, -102, -102, -102, + 52, -102, -102, -102, -102, -102, -102, -102, -102, -102, + -102, -102, -102, -102, -102, -102, -102, -102, -102, -43, + -102, -102, 56, 20, -102, 15, -102, 57, -102, -102, + 65, -102, 46, -102, -102, -102, 50, -6, -102, -102, -102, -102, -102, -102, -102, -102, -102, -102, -102, -102, - -102, -102, -102, -102, -102, -102, -102, -102, -43, -102, - -102, 58, 21, -102, 18, -102, 56, -102, -102, 54, - -102, 63, -102, -102, -102, 51, 7, -102, -102, -102, -102, -102, -102, -102, -102, -102, -102, -102, -102, -102, + -102, -102, 51, -102, -102, -102, -102, 60, -102, -102, -102, -102, -102, -102, -102, -102, -102, -102, -102, -102, - -102, 60, -102, -102, -102, -102, 59, -102, -102, -102, + -102, 58, 219, -102, 216, 191, 201, 182, -102, 62, + 63, 71, 73, 64, -102, -102, -102, -102, -102, -102, + -102, -102, 181, -102, 199, -102, 200, -102, -102, 192, + -102, 68, -102, -102, 69, -102, 31, -102, 27, -102, + 22, -102, 159, -102, 167, 166, -102, -102, 173, -102, + -102, -102, -102, -102, -102, 180, -102, 72, 67, -102, + -102, 66, -102, 42, -102, 45, -102, 38, -102, -102, + -102, -102, 75, -102, -102, -65, -102, -102, 92, -102, + -102, -62, -102, -102, 103, -102, -102, -61, -102, -102, + 36, -102, 33, -102, 39, -102, 41, -102, -102, -102, + -102, -102, -102, 40, -102, 32, -102, 29, -102, 137, + 18, -102, -102, 19, -102, -102, 147, -102, -102, -102, + 24, -102, -102, -102, -102, 28, -102, -16, 158, -102, + 96, -102, -102, 53, -102, 37, -102, -102, -102, -102, + -102, -102, -102, 47, -102, -102, -102, -102, -102, -102, + 120, -102, -102, 54, -102, -102, -102, -102, -1, -102, + -10, -102, -102, -102, -102, -102, -91, -102, -13, -102, + -77, -102, -102, -102, -102, 76, -102, -102, 127, -102, + -102, -102, -102, -102, 13, -78, -102, -102, -35, -102, + 14, -102, -48, -102, -102, -102, -102, 4, -102, 8, + -102, 1, -102, 0, -102, -102, -102, 12, -102, 5, + -102, -17, -102, -102, -102, -102, -102, -102, -102, -102, + -102, -102, -102, -102, -102, -102, -102, -102, 253, -102, + -102, 345, -102, -102, -102, -102, -9, -102, -102, 10, + 11, -102, 98, 70, -102, -102, -102, -102, 9, -102, + -102, -102, -102, 234, -102, -102, -3, -102, -5, 243, -102, -102, -102, -102, -102, -102, -102, -102, -102, -102, - 61, 220, -102, 185, 203, 184, 195, -102, 72, 52, - 70, 62, 66, -102, -102, -102, -102, -102, -102, -102, - -102, 217, -102, 182, -102, 196, -102, -102, 199, -102, - 69, -102, -102, 71, -102, 31, -102, 28, -102, 29, - -102, 168, -102, 169, 176, -102, -102, 166, -102, -102, - -102, -102, -102, -102, 172, -102, 77, 68, -102, -102, - 65, -102, 43, -102, 45, -102, 38, -102, -102, -102, - -102, 78, -102, -102, -48, -102, -102, 85, -102, -102, - -60, -102, -102, 102, -102, -102, -59, -102, -102, 36, - -102, 33, -102, 40, -102, 42, -102, -102, -102, -102, - -102, -102, 41, -102, 34, -102, 32, -102, 139, 20, - -102, -102, 19, -102, -102, 153, -102, -102, -102, 23, - -102, -102, -102, -102, 30, -102, -28, 160, -102, 98, - -102, -102, 53, -102, 39, -102, -102, -102, -102, -102, - -102, -102, 47, -102, -102, -102, -102, -102, -102, 57, - -102, -102, -6, -102, -102, -102, -102, -3, -102, -10, - -102, -102, -102, -102, -102, -91, -102, -4, -102, -87, - -102, -102, -102, -102, 76, -102, -102, 87, -102, -102, - -102, -102, -102, 13, -66, -102, -102, -33, -102, 14, - -102, -47, -102, -102, -102, -102, 6, -102, 11, -102, - 1, -102, 9, -102, -102, -102, -15, -102, -12, -102, - 4, -102, -102, -102, -102, -102, -102, -102, -102, -102, - -102, -102, -102, -102, -102, -102, -102, 257, -102, -102, - 340, -102, -102, -102, -102, -13, -102, 12, 5, -102, - 3, 75, -102, -102, -102, -102, 10, -102, -102, -102, - -102, 236, -102, -102, -7, -102, -5, 240, -102, -102, - -102, -102, -102, -102, -102, -102, -102, -102, -102, -21, - -102, -102, 64, -102, -102, -102}; + -102, -21, -102, -102, 61, -102, -102, -102}; const int JavaScriptGrammar::action_info [] = { - 457, 352, 457, 464, 361, 463, 559, 449, -69, 373, - 367, -91, 453, 311, 432, 350, 325, 291, 323, 163, - 441, 331, 337, 363, 473, 457, 486, 344, -96, 490, - 354, 313, 434, 424, 361, 422, -66, 378, 385, 517, - 436, 276, 497, 503, 525, -80, 524, 163, 373, 367, - 479, 376, 375, 447, -99, 372, 473, 364, -88, 473, - 477, 442, 481, 381, 370, -70, 186, 315, 369, 381, - 209, 291, 192, 32, 497, 379, 2, 205, 186, 163, - 311, 313, 33, 473, 276, 366, -93, 442, 93, 486, - 212, 271, 169, 447, 93, 565, 211, 490, 255, 460, - 121, 0, 201, 0, 379, 517, 320, 476, 163, 0, - 163, 163, 163, 449, 379, 121, 467, 163, 0, 163, - 163, 477, 80, 80, 498, 7, 163, 123, 541, 171, - 517, 346, 270, 81, 81, 0, 80, 0, 527, 27, - 517, 188, 552, 551, 461, 189, 528, 81, 84, 446, - 445, 2, 123, 268, 267, 268, 267, 544, 0, 85, - 488, 163, 451, 383, 492, 528, 261, 260, 199, 80, - 331, 507, 499, 163, 9, 8, 550, 333, 329, 163, - 81, 334, 266, 265, 347, 275, 274, 86, 562, 60, - 28, 514, 194, 0, 0, 28, 60, 125, 0, 60, - 0, 107, 163, 108, 107, 0, 108, 60, 107, 164, - 108, 195, 0, 439, 109, 60, 126, 109, 127, 0, - 60, 109, 86, 0, 163, 273, 72, 20, 515, 516, - 0, 356, 87, 72, 20, 30, 72, 20, 88, 86, - 30, 563, 561, 60, 72, 20, 29, 107, 107, 108, - 108, 29, 72, 20, 60, 471, 470, 72, 20, 541, - 109, 109, 107, 107, 108, 108, 107, 87, 108, 107, - 107, 108, 108, 88, 194, 109, 109, 254, 253, 109, - 72, 20, 109, 109, 87, 358, 0, 60, 0, 60, - 88, 72, 20, 195, 60, 196, 60, 0, 60, 0, - 0, 95, 96, 0, 0, -312, 0, 542, 0, 0, - 293, 294, 293, 294, 0, 60, 0, 0, 95, 96, - 536, 0, 359, 360, 72, 20, 72, 20, 97, 98, - 60, 72, 20, 72, 20, 72, 20, 295, 296, 295, - 296, 60, 107, 0, 108, 97, 98, 259, 258, 60, - 19, 0, 72, 20, 497, 109, 0, 72, 20, 0, - 0, 0, 264, 263, 0, 0, 0, 72, 20, 0, - 0, 0, 0, 259, 258, 536, 18, 497, 72, 20, - 0, 264, 263, 100, 101, 0, 72, 20, 14, 0, - 0, 102, 103, 0, 0, 104, 0, 105, 536, 0, - 15, 0, 100, 101, 0, 19, 0, 16, 298, 299, - 102, 103, 72, 20, 104, 0, 105, 300, 0, 0, - 301, 0, 302, 0, 0, 0, 0, 0, 19, 0, - 14, 18, 0, 0, 0, 72, 20, 19, 0, 0, - 0, 0, 15, 0, 17, 20, 0, 0, 0, 16, - 14, 0, 21, 14, 18, 0, 0, 0, 0, 0, - 0, 13, 15, 18, 0, 15, 0, 0, 0, 16, - 0, 0, 16, 0, 0, 0, 100, 101, 0, 19, - 0, 0, 0, 0, 102, 103, 17, 20, 104, 0, - 105, 0, 0, 0, 21, 521, 0, 0, 519, 19, - 0, 0, 19, 13, 0, 18, 17, 20, 0, 17, - 20, 0, 0, 0, 21, 0, 0, 21, 0, 0, - 0, 0, 0, 13, 173, 18, 13, 0, 18, 0, - 0, 0, 0, 0, 174, 0, 0, 0, 175, 0, - 0, 0, 0, 0, 173, 0, 0, 176, 0, 177, - 0, 0, 327, 0, 174, 0, 0, 0, 175, 0, - 178, 0, 179, 84, 0, 0, 0, 176, 0, 177, - 180, 0, 0, 181, 85, 0, 0, 0, 0, 182, - 178, 0, 179, 84, 0, 183, 0, 0, 0, 0, - 180, 0, 0, 181, 85, 0, 0, 0, 0, 182, - 184, 0, 0, 0, 0, 183, 0, 0, 0, 0, + 292, 367, 365, 326, 164, 338, 362, 368, 374, 312, + 324, 351, 364, 355, 561, 353, -81, 345, 370, 487, + 491, 498, 433, -97, -70, 474, 450, -94, -92, 458, + 504, 458, 458, 482, 474, 454, 465, 474, 314, 478, + 464, 480, 362, 423, 448, 371, 425, 164, 435, 386, + 373, 518, 526, -89, 376, -71, 377, 525, 379, 443, + -67, 368, 437, -100, 314, 316, 382, 277, 442, 33, + 374, 277, 321, 32, 202, 2, 206, 210, 164, 380, + 213, 292, 94, 448, 474, 272, 487, 256, 124, 122, + 332, 491, 443, 94, 382, 450, 567, 187, 193, 187, + 528, 518, 312, 212, 461, 0, 498, 468, 164, 477, + 164, 380, 0, 164, 122, 499, 85, 81, 271, 81, + 164, 172, 81, 478, 164, 164, 27, 86, 82, 7, + 82, 164, 164, 82, 554, 553, 189, 518, 546, 0, + 190, 81, 347, 124, 269, 268, 530, 164, 380, 462, + 543, 2, 82, 543, 269, 268, 164, 164, 529, 87, + 447, 446, 452, 500, 334, 384, 530, 564, 335, 9, + 8, 195, 489, 200, 518, 515, 508, 0, 0, 170, + 165, 262, 261, 493, 0, 0, 267, 266, 276, 275, + 196, 60, 440, 60, 0, 348, 60, 0, 552, 330, + 164, 544, 60, 0, 88, 60, 0, 60, 274, 357, + 89, 60, 516, 517, 60, 87, 0, 164, 28, 0, + 565, 563, 108, 108, 109, 109, 0, 0, 72, 73, + 72, 73, 0, 72, 73, 110, 110, 28, 0, 72, + 73, 60, 72, 73, 72, 73, 359, 87, 72, 73, + 60, 72, 73, 472, 471, 108, 108, 109, 109, 108, + 88, 109, 108, 30, 109, 60, 89, 60, 110, 110, + 255, 254, 110, 0, 29, 110, 126, 0, 72, 73, + 195, 0, 30, 360, 361, 294, 295, 72, 73, 294, + 295, 0, 88, 29, 0, 127, 0, 128, 89, 196, + 0, 197, 72, 73, 72, 73, 96, 97, 96, 97, + 0, 60, 296, 297, 60, 0, 296, 297, -313, 0, + 0, 60, 0, 0, 0, 538, 0, 0, 108, 0, + 109, 0, 0, 98, 99, 98, 99, 60, 0, 60, + 498, 110, 0, 0, 0, 0, 260, 259, 72, 73, + 0, 72, 73, 265, 264, 19, 0, 0, 72, 73, + 0, 538, 72, 73, 498, 0, 0, 0, 0, 265, + 264, 260, 259, 0, 72, 73, 72, 73, 101, 102, + 0, 18, 0, 0, 0, 538, 103, 104, 101, 102, + 105, 19, 106, 14, 299, 300, 103, 104, 72, 73, + 105, 0, 106, 301, 0, 15, 302, 0, 303, 0, + 0, 0, 16, 0, 0, 19, 14, 18, 0, 0, + 0, 0, 72, 73, 0, 0, 0, 0, 15, 0, + 0, 0, 0, 0, 0, 16, 14, 0, 0, 14, + 0, 18, 19, 0, 0, 0, 0, 0, 15, 17, + 20, 15, 0, 0, 0, 16, 0, 21, 16, 0, + 0, 0, 101, 102, 0, 19, 13, 0, 18, 0, + 103, 104, 17, 20, 105, 0, 106, 0, 0, 0, + 21, 522, 0, 0, 520, 19, 0, 0, 19, 13, + 0, 18, 17, 20, 0, 17, 20, 0, 0, 0, + 21, 0, 0, 21, 0, 0, 0, 0, 0, 13, + 174, 18, 13, 0, 18, 0, 0, 0, 0, 0, + 175, 0, 0, 0, 176, 0, 0, 0, 0, 0, + 174, 0, 0, 177, 0, 178, 0, 0, 328, 0, + 175, 0, 0, 0, 176, 0, 179, 0, 180, 85, + 0, 0, 0, 177, 0, 178, 181, 0, 0, 182, + 86, 0, 0, 0, 0, 183, 179, 0, 180, 85, + 0, 184, 0, 0, 0, 0, 181, 0, 0, 182, + 86, 0, 0, 0, 0, 183, 185, 0, 0, 0, + 0, 184, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 185, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 56, 57, + 0, 0, 0, 0, 0, 0, 0, 0, 59, 0, + 0, 0, 0, 0, 0, 60, 0, 0, 0, 61, + 62, 0, 63, 0, 0, 0, 0, 0, 0, 66, + 0, 0, 0, 69, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 184, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 56, 57, 0, 0, 0, 0, 0, 0, - 0, 0, 59, 0, 0, 0, 0, 0, 0, 60, - 0, 0, 0, 61, 62, 0, 63, 0, 0, 0, - 0, 0, 0, 66, 0, 0, 0, 69, 0, 0, + 0, 74, 72, 73, 0, 75, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 68, 77, 58, 0, + 0, 0, 0, 0, 0, 0, 0, 55, 56, 57, + 0, 0, 0, 0, 0, 0, 0, 0, 59, 0, + 0, 0, 0, 0, 0, 60, 0, 0, 0, 61, + 62, 0, 63, 0, 0, 0, 64, 0, 65, 66, + 67, 0, 0, 69, 0, 0, 0, 70, 0, 71, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 73, 72, 20, 0, 74, + 0, 74, 72, 73, 0, 75, 0, 76, 0, 78, + 0, 79, 0, 0, 0, 0, 68, 77, 58, 0, + 0, 0, 0, 0, 0, 0, 0, 55, 56, 57, + 0, 0, 0, 0, 0, 0, 0, 0, 59, 0, + 0, 0, 0, 0, 0, 60, 0, 0, 0, 61, + 62, 0, 63, 0, 0, 0, 64, 0, 65, 66, + 67, 0, 0, 69, 0, 0, 0, 70, 0, 71, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 68, 76, 58, 0, 0, 0, 0, 0, 0, 0, - 0, 55, 56, 57, 0, 0, 0, 0, 0, 0, - 0, 0, 59, 0, 0, 0, 0, 0, 0, 60, - 0, 0, 0, 61, 62, 0, 63, 0, 0, 0, - 64, 0, 65, 66, 67, 0, 0, 69, 0, 0, - 0, 70, 0, 71, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 73, 72, 20, 0, 74, - 0, 75, 0, 77, 0, 78, 0, 0, 0, 0, - 68, 76, 58, 0, 0, 0, 0, 0, 0, 0, + 0, 74, 72, 73, 0, 75, 0, 76, 0, 78, + 291, 79, 0, 0, 0, 0, 68, 77, 58, 0, + 0, 0, 0, 0, 0, 0, 0, 55, 56, 57, + 0, 0, 0, 0, 0, 0, 0, 0, 59, 0, + 0, 0, 0, 0, 0, 60, 0, 0, 0, 61, + 62, 0, 63, 0, 0, 0, 64, 0, 65, 66, + 67, 0, 0, 69, 0, 0, 0, 70, 0, 71, + 0, 0, 506, 0, 0, 0, 0, 0, 0, 0, + 0, 74, 72, 73, 0, 75, 0, 76, 0, 78, + 0, 79, 0, 0, 0, 0, 68, 77, 58, 0, + 0, 0, 0, 0, 0, 0, 0, -90, 0, 0, 0, 55, 56, 57, 0, 0, 0, 0, 0, 0, 0, 0, 59, 0, 0, 0, 0, 0, 0, 60, 0, 0, 0, 61, 62, 0, 63, 0, 0, 0, 64, 0, 65, 66, 67, 0, 0, 69, 0, 0, 0, 70, 0, 71, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 73, 72, 20, 0, 74, - 0, 75, 0, 77, 290, 78, 0, 0, 0, 0, - 68, 76, 58, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 74, 72, 73, 0, 75, + 0, 76, 0, 78, 0, 79, 0, 0, 0, 0, + 68, 77, 58, 0, 0, 0, 0, 0, 0, 0, 0, 55, 56, 57, 0, 0, 0, 0, 0, 0, 0, 0, 59, 0, 0, 0, 0, 0, 0, 60, 0, 0, 0, 61, 62, 0, 63, 0, 0, 0, 64, 0, 65, 66, 67, 0, 0, 69, 0, 0, - 0, 70, 0, 71, 0, 0, 502, 0, 0, 0, - 0, 0, 0, 0, 0, 73, 72, 20, 0, 74, - 0, 75, 0, 77, 0, 78, 0, 0, 0, 0, - 68, 76, 58, 0, 0, 0, 0, 0, 0, 0, - 0, -89, 0, 0, 0, 55, 56, 57, 0, 0, - 0, 0, 0, 0, 0, 0, 59, 0, 0, 0, - 0, 0, 0, 60, 0, 0, 0, 61, 62, 0, - 63, 0, 0, 0, 64, 0, 65, 66, 67, 0, - 0, 69, 0, 0, 0, 70, 0, 71, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 73, - 72, 20, 0, 74, 0, 75, 0, 77, 0, 78, - 0, 0, 0, 0, 68, 76, 58, 0, 0, 0, - 0, 0, 0, 0, 0, 55, 56, 57, 0, 0, - 0, 0, 0, 0, 0, 0, 59, 0, 0, 0, - 0, 0, 0, 60, 0, 0, 0, 61, 62, 0, - 63, 0, 0, 0, 64, 0, 65, 66, 67, 0, - 0, 69, 0, 0, 0, 70, 0, 71, 0, 0, - 505, 0, 0, 0, 0, 0, 0, 0, 0, 73, - 72, 20, 0, 74, 0, 75, 0, 77, 0, 78, - 0, 0, 0, 0, 68, 76, 58, 0, 0, 0, - 0, 0, 0, 0, 0, 131, 132, 133, 0, 0, - 135, 137, 138, 0, 0, 139, 0, 140, 0, 0, - 0, 142, 143, 144, 0, 0, 0, 0, 0, 0, - 60, 145, 146, 147, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 148, 0, 0, 0, 0, 0, + 0, 70, 0, 71, 0, 0, 503, 0, 0, 0, + 0, 0, 0, 0, 0, 74, 72, 73, 0, 75, + 0, 76, 0, 78, 0, 79, 0, 0, 0, 0, + 68, 77, 58, 0, 0, 0, 0, 0, 0, 0, + 0, 132, 133, 134, 0, 0, 136, 138, 139, 0, + 0, 140, 0, 141, 0, 0, 0, 143, 144, 145, + 0, 0, 0, 0, 0, 0, 60, 146, 147, 148, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 151, 0, 0, 0, 0, 0, 0, 72, 20, 152, - 153, 154, 0, 156, 157, 158, 159, 160, 161, 0, - 0, 149, 155, 141, 134, 136, 150, 0, 0, 0, - 0, 0, 131, 132, 133, 0, 0, 135, 137, 138, - 0, 0, 139, 0, 140, 0, 0, 0, 142, 143, - 144, 0, 0, 0, 0, 0, 0, 426, 145, 146, - 147, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 148, 0, 0, 0, 427, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 151, 0, 0, - 0, 0, 0, 431, 428, 430, 152, 153, 154, 0, - 156, 157, 158, 159, 160, 161, 0, 0, 149, 155, - 141, 134, 136, 150, 0, 0, 0, 0, 0, 131, - 132, 133, 0, 0, 135, 137, 138, 0, 0, 139, - 0, 140, 0, 0, 0, 142, 143, 144, 0, 0, - 0, 0, 0, 0, 426, 145, 146, 147, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 148, 0, - 0, 0, 427, 0, 0, 0, 0, 0, 0, 0, - 429, 0, 0, 0, 151, 0, 0, 0, 0, 0, - 431, 428, 430, 152, 153, 154, 0, 156, 157, 158, - 159, 160, 161, 0, 0, 149, 155, 141, 134, 136, - 150, 0, 0, 0, 0, 0, 231, 0, 0, 0, - 0, 232, 0, 55, 56, 57, 234, 0, 0, 0, - 0, 0, 0, 235, 59, 0, 0, 0, 0, 0, - 0, 546, 238, 0, 0, 239, 547, 0, 63, 0, + 149, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 152, 0, 0, 0, + 0, 0, 0, 72, 73, 153, 154, 155, 0, 157, + 158, 159, 160, 161, 162, 0, 0, 150, 156, 142, + 135, 137, 151, 0, 0, 0, 0, 0, 132, 133, + 134, 0, 0, 136, 138, 139, 0, 0, 140, 0, + 141, 0, 0, 0, 143, 144, 145, 0, 0, 0, + 0, 0, 0, 427, 146, 147, 148, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 149, 0, 0, + 0, 428, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 152, 0, 0, 0, 0, 0, 432, + 429, 431, 153, 154, 155, 0, 157, 158, 159, 160, + 161, 162, 0, 0, 150, 156, 142, 135, 137, 151, + 0, 0, 0, 0, 0, 132, 133, 134, 0, 0, + 136, 138, 139, 0, 0, 140, 0, 141, 0, 0, + 0, 143, 144, 145, 0, 0, 0, 0, 0, 0, + 427, 146, 147, 148, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 149, 0, 0, 0, 428, 0, + 0, 0, 0, 0, 0, 0, 430, 0, 0, 0, + 152, 0, 0, 0, 0, 0, 432, 429, 431, 153, + 154, 155, 0, 157, 158, 159, 160, 161, 162, 0, + 0, 150, 156, 142, 135, 137, 151, 0, 0, 0, + 0, 0, 232, 0, 0, 0, 0, 233, 0, 55, + 56, 57, 235, 0, 0, 0, 0, 0, 0, 236, + 59, 0, 0, 0, 0, 0, 0, 238, 239, 0, + 0, 240, 62, 0, 63, 0, 0, 0, 64, 0, + 65, 66, 67, 0, 0, 69, 0, 0, 0, 70, + 0, 71, 0, 0, 0, 0, 0, 242, 0, 243, + 0, 0, 0, 74, 241, 244, 245, 75, 246, 76, + 247, 78, 21, 79, 248, 249, 0, 0, 68, 77, + 58, 13, 234, 0, 0, 0, 0, 0, 0, 232, + 0, 0, 0, 0, 233, 0, 55, 56, 57, 235, + 0, 0, 0, 0, 0, 0, 236, 237, 0, 0, + 0, 0, 0, 0, 238, 239, 0, 0, 240, 62, + 0, 63, 0, 0, 0, 64, 0, 65, 66, 67, + 0, 0, 69, 0, 0, 0, 70, 0, 71, 0, + 0, 0, 0, 0, 242, 0, 243, 0, 0, 0, + 74, 241, 244, 245, 75, 246, 76, 247, 78, 21, + 79, 248, 249, 0, 0, 68, 77, 58, 13, 234, + 0, 0, 0, 0, 0, 0, 232, 0, 0, 0, + 0, 233, 0, 55, 56, 57, 235, 0, 0, 0, + 0, 0, 0, 236, 59, 0, 0, 0, 0, 0, + 0, 548, 239, 0, 0, 240, 549, 0, 63, 0, 0, 0, 64, 0, 65, 66, 67, 0, 0, 69, 0, 0, 0, 70, 0, 71, 0, 0, 0, 0, - 0, 241, 0, 242, 0, 0, 0, 73, 240, 243, - 244, 74, 245, 75, 246, 77, 21, 78, 247, 248, - 0, 0, 68, 76, 58, 13, 233, 0, 0, 0, - 0, 0, 0, 231, 0, 0, 0, 0, 232, 0, - 55, 56, 57, 234, 0, 0, 0, 0, 0, 0, - 235, 59, 0, 0, 0, 0, 0, 0, 237, 238, - 0, 0, 239, 62, 0, 63, 0, 0, 0, 64, + 0, 242, 0, 243, 0, 0, 0, 74, 241, 244, + 245, 75, 246, 76, 247, 78, 21, 79, 248, 249, + 0, 0, 68, 77, 58, 13, 234, 0, 0, 0, + 0, 0, 0, 232, 0, 0, 0, 0, 233, 0, + 55, 56, 57, 235, 0, 0, 0, 0, 0, 0, + 236, 59, 0, 0, 0, 0, 0, 0, 532, 239, + 0, 0, 240, 533, 0, 63, 0, 0, 0, 64, 0, 65, 66, 67, 0, 0, 69, 0, 0, 0, - 70, 0, 71, 0, 0, 0, 0, 0, 241, 0, - 242, 0, 0, 0, 73, 240, 243, 244, 74, 245, - 75, 246, 77, 21, 78, 247, 248, 0, 0, 68, - 76, 58, 13, 233, 0, 0, 0, 0, 0, 0, - 231, 0, 0, 0, 0, 232, 0, 55, 56, 57, - 234, 0, 0, 0, 0, 0, 0, 235, 236, 0, - 0, 0, 0, 0, 0, 237, 238, 0, 0, 239, - 62, 0, 63, 0, 0, 0, 64, 0, 65, 66, - 67, 0, 0, 69, 0, 0, 0, 70, 0, 71, - 0, 0, 0, 0, 0, 241, 0, 242, 0, 0, - 0, 73, 240, 243, 244, 74, 245, 75, 246, 77, - 21, 78, 247, 248, 0, 0, 68, 76, 58, 13, - 233, 0, 0, 0, 0, 0, 0, 231, 0, 0, - 0, 0, 232, 0, 55, 56, 57, 234, 0, 0, - 0, 0, 0, 0, 235, 59, 0, 0, 0, 0, - 0, 0, 530, 238, 0, 0, 239, 531, 0, 63, - 0, 0, 0, 64, 0, 65, 66, 67, 0, 0, - 69, 0, 0, 0, 70, 0, 71, 0, 0, 0, - 0, 0, 241, 0, 242, 0, 0, 0, 73, 240, - 243, 244, 74, 245, 75, 246, 77, 21, 78, 247, - 248, 0, 0, 68, 76, 58, 13, 233, 0, 532, - 0, 0, 0, 0, 394, 132, 133, 0, 0, 396, - 137, 398, 56, 57, 399, 0, 140, 0, 0, 0, - 142, 401, 402, 0, 0, 0, 0, 0, 0, 403, - 404, 146, 147, 239, 62, 0, 63, 0, 0, 0, - 64, 0, 65, 405, 67, 0, 0, 407, 0, 0, - 0, 70, 0, 71, 0, -235, 0, 0, 0, 409, - 0, 242, 0, 0, 0, 411, 408, 410, 412, 413, - 414, 75, 416, 417, 418, 419, 420, 421, 0, 0, - 406, 415, 400, 395, 397, 150, 0, 0, 0, 0, - 0, + 70, 0, 71, 0, 0, 0, 0, 0, 242, 0, + 243, 0, 0, 0, 74, 241, 244, 245, 75, 246, + 76, 247, 78, 21, 79, 248, 249, 0, 0, 68, + 77, 58, 13, 234, 0, 534, 0, 0, 0, 0, + 395, 133, 134, 0, 0, 397, 138, 399, 56, 57, + 400, 0, 141, 0, 0, 0, 143, 402, 403, 0, + 0, 0, 0, 0, 0, 404, 405, 147, 148, 240, + 62, 0, 63, 0, 0, 0, 64, 0, 65, 406, + 67, 0, 0, 408, 0, 0, 0, 70, 0, 71, + 0, -236, 0, 0, 0, 410, 0, 243, 0, 0, + 0, 412, 409, 411, 413, 414, 415, 76, 417, 418, + 419, 420, 421, 422, 0, 0, 407, 416, 401, 396, + 398, 151, 0, 0, 0, 0, 0, - 458, 462, 526, 560, 548, 450, 545, 443, 500, 504, - 448, 466, 535, 42, 31, 482, 491, 554, 172, 540, - 204, 487, 493, 553, 489, 529, 391, 478, 501, 483, - 506, 269, 480, 269, 472, 371, 377, 204, 321, 262, - 165, 185, 330, 328, 326, 469, 170, 365, 382, 380, - 262, 357, 257, 384, 435, 386, 353, 256, 0, 162, - 355, 168, 0, 0, 198, 425, 469, 391, 208, 472, - 191, 433, 193, 210, 204, 272, 257, 423, 321, 339, - 321, 168, 554, 321, 321, 539, 321, 82, 440, 391, - 0, 0, 304, 12, 285, 339, 208, 82, 10, 289, - 391, 82, 306, 208, 168, 82, 307, 82, 82, 82, - 305, 200, 303, 0, 82, 0, 513, 82, 82, 0, - 208, 110, 187, 115, 351, 190, 82, 349, 322, 82, - 324, 114, 82, 82, 116, 485, 82, 117, 511, 82, - 82, 485, 82, 82, 564, 89, 0, 113, 94, 82, - 82, 91, 465, 82, 82, 90, 99, 82, 82, 348, - 118, 83, 106, 468, 82, 82, 82, 82, 82, 92, - 120, 119, 362, 82, 82, 512, 202, 124, 0, 368, - 122, 82, 437, 508, 82, 438, 509, 82, 0, 82, - 82, 112, 510, 111, 0, 82, 374, 484, 82, 437, - 202, 317, 438, 82, 82, 0, 289, 317, 289, 289, - 0, 317, 289, 11, 26, 12, 289, 82, 332, 82, - 82, 335, 289, 338, 289, 289, 309, 297, 314, 345, - 82, 317, 128, 336, 317, 289, 289, 310, 82, 289, - 0, 130, 197, 289, 543, 308, 539, 549, 0, 0, - 539, 0, 82, 316, 12, 82, 319, 289, 12, 520, - 289, 0, 128, 0, 292, 312, 0, 0, 0, 0, - 0, 130, 0, 11, 26, 12, 0, 0, 0, 0, + 459, 10, 467, 562, 550, 451, 527, 502, 42, 173, + 547, 463, 449, 494, 483, 479, 492, 31, 542, 488, + 556, 490, 507, 531, 205, 501, 392, 484, 270, 555, + 366, 270, 481, 372, 378, 331, 505, 205, 263, 322, + 166, 186, 329, 470, 327, 171, 473, 263, 383, 381, + 258, 358, 385, 436, 387, 354, 473, 257, 163, 169, + 356, 322, 0, 426, 199, 470, 273, 444, 194, 83, + 211, 434, 192, 209, 258, 205, 340, 424, 392, 556, + 541, 322, 322, 322, 322, 191, 0, 0, 12, 392, + 340, 0, 0, 209, 83, 286, 92, 83, 83, 83, + 290, 0, 304, 305, 308, 169, 83, 537, 83, 83, + 209, 306, 201, 307, 83, 83, 514, 83, 83, 111, + 485, 209, 116, 188, 83, 352, 350, 323, 325, 115, + 83, 83, 83, 486, 512, 117, 83, 83, 513, 83, + 392, 566, 114, 83, 169, 486, 83, 95, 91, 0, + 83, 441, 466, 83, 349, 90, 100, 83, 83, 83, + 83, 83, 107, 93, 119, 121, 0, 120, 83, 363, + 438, 84, 83, 439, 203, 83, 438, 510, 83, 439, + 509, 83, 0, 83, 83, 112, 369, 113, 83, 83, + 83, 203, 511, 83, 83, 485, 123, 375, 125, 290, + 83, 318, 83, 469, 0, 118, 290, 290, 318, 333, + 11, 26, 12, 290, 0, 318, 83, 83, 0, 336, + 290, 290, 290, 337, 311, 0, 83, 318, 0, 313, + 339, 290, 290, 309, 83, 318, 83, 346, 129, 290, + 290, 290, 545, 310, 541, 315, 0, 131, 198, 320, + 551, 83, 12, 541, 83, 521, 290, 317, 298, 290, + 0, 12, 0, 293, 0, 0, 0, 129, 0, 11, + 26, 12, 0, 0, 0, 0, 131, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 522, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 11, 26, 12, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 523, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 11, 26, 12, 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, @@ -539,80 +537,103 @@ const int JavaScriptGrammar::action_info [] = { 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 [] = { - 5, 60, 5, 7, 36, 55, 17, 36, 7, 36, - 36, 7, 33, 48, 7, 61, 60, 1, 61, 8, - 60, 2, 7, 60, 33, 5, 36, 17, 7, 36, - 31, 78, 55, 8, 36, 7, 7, 55, 16, 33, - 55, 36, 8, 8, 7, 7, 29, 8, 36, 36, - 36, 33, 60, 7, 7, 55, 33, 33, 7, 33, - 20, 7, 60, 36, 33, 7, 2, 8, 60, 36, - 8, 1, 7, 29, 8, 7, 88, 36, 2, 8, - 48, 78, 7, 33, 36, 55, 7, 7, 1, 36, - 33, 36, 8, 7, 1, 0, 60, 36, 55, 10, - 48, -1, 60, -1, 7, 33, 61, 6, 8, -1, - 8, 8, 8, 36, 7, 48, 7, 8, -1, 8, - 8, 20, 40, 40, 8, 65, 8, 78, 8, 60, - 33, 8, 76, 51, 51, -1, 40, -1, 7, 66, - 33, 50, 61, 62, 55, 54, 15, 51, 42, 61, - 62, 88, 78, 61, 62, 61, 62, 7, -1, 53, - 60, 8, 60, 60, 60, 15, 61, 62, 56, 40, - 2, 60, 56, 8, 61, 62, 56, 50, 60, 8, - 51, 54, 61, 62, 61, 61, 62, 12, 8, 29, - 29, 29, 15, -1, -1, 29, 29, 15, -1, 29, - -1, 25, 8, 27, 25, -1, 27, 29, 25, 56, - 27, 34, -1, 36, 38, 29, 34, 38, 36, -1, - 29, 38, 12, -1, 8, 60, 66, 67, 66, 67, - -1, 60, 57, 66, 67, 74, 66, 67, 63, 12, - 74, 61, 62, 29, 66, 67, 85, 25, 25, 27, - 27, 85, 66, 67, 29, 61, 62, 66, 67, 8, - 38, 38, 25, 25, 27, 27, 25, 57, 27, 25, - 25, 27, 27, 63, 15, 38, 38, 61, 62, 38, - 66, 67, 38, 38, 57, 29, -1, 29, -1, 29, - 63, 66, 67, 34, 29, 36, 29, -1, 29, -1, - -1, 18, 19, -1, -1, 36, -1, 56, -1, -1, - 18, 19, 18, 19, -1, 29, -1, -1, 18, 19, - 29, -1, 66, 67, 66, 67, 66, 67, 45, 46, - 29, 66, 67, 66, 67, 66, 67, 45, 46, 45, - 46, 29, 25, -1, 27, 45, 46, 61, 62, 29, - 59, -1, 66, 67, 8, 38, -1, 66, 67, -1, - -1, -1, 61, 62, -1, -1, -1, 66, 67, -1, - -1, -1, -1, 61, 62, 29, 85, 8, 66, 67, - -1, 61, 62, 23, 24, -1, 66, 67, 10, -1, - -1, 31, 32, -1, -1, 35, -1, 37, 29, -1, - 22, -1, 23, 24, -1, 59, -1, 29, 23, 24, - 31, 32, 66, 67, 35, -1, 37, 32, -1, -1, - 35, -1, 37, -1, -1, -1, -1, -1, 59, -1, - 10, 85, -1, -1, -1, 66, 67, 59, -1, -1, - -1, -1, 22, -1, 66, 67, -1, -1, -1, 29, - 10, -1, 74, 10, 85, -1, -1, -1, -1, -1, - -1, 83, 22, 85, -1, 22, -1, -1, -1, 29, - -1, -1, 29, -1, -1, -1, 23, 24, -1, 59, - -1, -1, -1, -1, 31, 32, 66, 67, 35, -1, - 37, -1, -1, -1, 74, 55, -1, -1, 55, 59, - -1, -1, 59, 83, -1, 85, 66, 67, -1, 66, - 67, -1, -1, -1, 74, -1, -1, 74, -1, -1, - -1, -1, -1, 83, 3, 85, 83, -1, 85, -1, - -1, -1, -1, -1, 13, -1, -1, -1, 17, -1, - -1, -1, -1, -1, 3, -1, -1, 26, -1, 28, - -1, -1, 31, -1, 13, -1, -1, -1, 17, -1, - 39, -1, 41, 42, -1, -1, -1, 26, -1, 28, - 49, -1, -1, 52, 53, -1, -1, -1, -1, 58, - 39, -1, 41, 42, -1, 64, -1, -1, -1, -1, - 49, -1, -1, 52, 53, -1, -1, -1, -1, 58, - 79, -1, -1, -1, -1, 64, -1, -1, -1, -1, + 1, 55, 33, 60, 8, 7, 36, 36, 36, 48, + 61, 61, 60, 31, 17, 60, 7, 17, 60, 36, + 36, 8, 7, 7, 7, 33, 36, 7, 7, 5, + 8, 5, 5, 60, 33, 33, 7, 33, 78, 20, + 55, 36, 36, 7, 7, 33, 8, 8, 55, 16, + 55, 33, 7, 7, 60, 7, 33, 29, 55, 7, + 7, 36, 55, 7, 78, 8, 36, 36, 60, 7, + 36, 36, 61, 29, 60, 88, 36, 8, 8, 7, + 33, 1, 1, 7, 33, 36, 36, 55, 78, 48, + 2, 36, 7, 1, 36, 36, 0, 2, 7, 2, + 29, 33, 48, 60, 10, -1, 8, 7, 8, 6, + 8, 7, -1, 8, 48, 8, 42, 40, 76, 40, + 8, 60, 40, 20, 8, 8, 66, 53, 51, 65, + 51, 8, 8, 51, 61, 62, 50, 33, 7, -1, + 54, 40, 8, 78, 61, 62, 15, 8, 7, 55, + 8, 88, 51, 8, 61, 62, 8, 8, 7, 12, + 61, 62, 60, 56, 50, 60, 15, 8, 54, 61, + 62, 15, 60, 56, 33, 29, 60, -1, -1, 8, + 56, 61, 62, 60, -1, -1, 61, 62, 61, 62, + 34, 29, 36, 29, -1, 61, 29, -1, 56, 60, + 8, 56, 29, -1, 57, 29, -1, 29, 60, 60, + 63, 29, 66, 67, 29, 12, -1, 8, 29, -1, + 61, 62, 25, 25, 27, 27, -1, -1, 66, 67, + 66, 67, -1, 66, 67, 38, 38, 29, -1, 66, + 67, 29, 66, 67, 66, 67, 29, 12, 66, 67, + 29, 66, 67, 61, 62, 25, 25, 27, 27, 25, + 57, 27, 25, 74, 27, 29, 63, 29, 38, 38, + 61, 62, 38, -1, 85, 38, 15, -1, 66, 67, + 15, -1, 74, 66, 67, 18, 19, 66, 67, 18, + 19, -1, 57, 85, -1, 34, -1, 36, 63, 34, + -1, 36, 66, 67, 66, 67, 18, 19, 18, 19, + -1, 29, 45, 46, 29, -1, 45, 46, 36, -1, + -1, 29, -1, -1, -1, 29, -1, -1, 25, -1, + 27, -1, -1, 45, 46, 45, 46, 29, -1, 29, + 8, 38, -1, -1, -1, -1, 61, 62, 66, 67, + -1, 66, 67, 61, 62, 59, -1, -1, 66, 67, + -1, 29, 66, 67, 8, -1, -1, -1, -1, 61, + 62, 61, 62, -1, 66, 67, 66, 67, 23, 24, + -1, 85, -1, -1, -1, 29, 31, 32, 23, 24, + 35, 59, 37, 10, 23, 24, 31, 32, 66, 67, + 35, -1, 37, 32, -1, 22, 35, -1, 37, -1, + -1, -1, 29, -1, -1, 59, 10, 85, -1, -1, + -1, -1, 66, 67, -1, -1, -1, -1, 22, -1, + -1, -1, -1, -1, -1, 29, 10, -1, -1, 10, + -1, 85, 59, -1, -1, -1, -1, -1, 22, 66, + 67, 22, -1, -1, -1, 29, -1, 74, 29, -1, + -1, -1, 23, 24, -1, 59, 83, -1, 85, -1, + 31, 32, 66, 67, 35, -1, 37, -1, -1, -1, + 74, 55, -1, -1, 55, 59, -1, -1, 59, 83, + -1, 85, 66, 67, -1, 66, 67, -1, -1, -1, + 74, -1, -1, 74, -1, -1, -1, -1, -1, 83, + 3, 85, 83, -1, 85, -1, -1, -1, -1, -1, + 13, -1, -1, -1, 17, -1, -1, -1, -1, -1, + 3, -1, -1, 26, -1, 28, -1, -1, 31, -1, + 13, -1, -1, -1, 17, -1, 39, -1, 41, 42, + -1, -1, -1, 26, -1, 28, 49, -1, -1, 52, + 53, -1, -1, -1, -1, 58, 39, -1, 41, 42, + -1, 64, -1, -1, -1, -1, 49, -1, -1, 52, + 53, -1, -1, -1, -1, 58, 79, -1, -1, -1, + -1, 64, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, 79, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, 12, 13, + -1, -1, -1, -1, -1, -1, -1, -1, 22, -1, + -1, -1, -1, -1, -1, 29, -1, -1, -1, 33, + 34, -1, 36, -1, -1, -1, -1, -1, -1, 43, + -1, -1, -1, 47, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - 79, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, 12, 13, -1, -1, -1, -1, -1, -1, - -1, -1, 22, -1, -1, -1, -1, -1, -1, 29, - -1, -1, -1, 33, 34, -1, 36, -1, -1, -1, - -1, -1, -1, 43, -1, -1, -1, 47, -1, -1, + -1, 65, 66, 67, -1, 69, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, 80, 81, 82, -1, + -1, -1, -1, -1, -1, -1, -1, 11, 12, 13, + -1, -1, -1, -1, -1, -1, -1, -1, 22, -1, + -1, -1, -1, -1, -1, 29, -1, -1, -1, 33, + 34, -1, 36, -1, -1, -1, 40, -1, 42, 43, + 44, -1, -1, 47, -1, -1, -1, 51, -1, 53, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, 65, 66, 67, -1, 69, + -1, 65, 66, 67, -1, 69, -1, 71, -1, 73, + -1, 75, -1, -1, -1, -1, 80, 81, 82, -1, + -1, -1, -1, -1, -1, -1, -1, 11, 12, 13, + -1, -1, -1, -1, -1, -1, -1, -1, 22, -1, + -1, -1, -1, -1, -1, 29, -1, -1, -1, 33, + 34, -1, 36, -1, -1, -1, 40, -1, 42, 43, + 44, -1, -1, 47, -1, -1, -1, 51, -1, 53, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - 80, 81, 82, -1, -1, -1, -1, -1, -1, -1, + -1, 65, 66, 67, -1, 69, -1, 71, -1, 73, + 74, 75, -1, -1, -1, -1, 80, 81, 82, -1, + -1, -1, -1, -1, -1, -1, -1, 11, 12, 13, + -1, -1, -1, -1, -1, -1, -1, -1, 22, -1, + -1, -1, -1, -1, -1, 29, -1, -1, -1, 33, + 34, -1, 36, -1, -1, -1, 40, -1, 42, 43, + 44, -1, -1, 47, -1, -1, -1, 51, -1, 53, + -1, -1, 56, -1, -1, -1, -1, -1, -1, -1, + -1, 65, 66, 67, -1, 69, -1, 71, -1, 73, + -1, 75, -1, -1, -1, -1, 80, 81, 82, -1, + -1, -1, -1, -1, -1, -1, -1, 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, @@ -625,61 +646,54 @@ const int JavaScriptGrammar::action_check [] = { -1, -1, 22, -1, -1, -1, -1, -1, -1, 29, -1, -1, -1, 33, 34, -1, 36, -1, -1, -1, 40, -1, 42, 43, 44, -1, -1, 47, -1, -1, - -1, 51, -1, 53, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, 65, 66, 67, -1, 69, - -1, 71, -1, 73, 74, 75, -1, -1, -1, -1, - 80, 81, 82, -1, -1, -1, -1, -1, -1, -1, - -1, 11, 12, 13, -1, -1, -1, -1, -1, -1, - -1, -1, 22, -1, -1, -1, -1, -1, -1, 29, - -1, -1, -1, 33, 34, -1, 36, -1, -1, -1, - 40, -1, 42, 43, 44, -1, -1, 47, -1, -1, -1, 51, -1, 53, -1, -1, 56, -1, -1, -1, -1, -1, -1, -1, -1, 65, 66, 67, -1, 69, -1, 71, -1, 73, -1, 75, -1, -1, -1, -1, 80, 81, 82, -1, -1, -1, -1, -1, -1, -1, - -1, 7, -1, -1, -1, 11, 12, 13, -1, -1, - -1, -1, -1, -1, -1, -1, 22, -1, -1, -1, - -1, -1, -1, 29, -1, -1, -1, 33, 34, -1, - 36, -1, -1, -1, 40, -1, 42, 43, 44, -1, - -1, 47, -1, -1, -1, 51, -1, 53, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, -1, 65, - 66, 67, -1, 69, -1, 71, -1, 73, -1, 75, - -1, -1, -1, -1, 80, 81, 82, -1, -1, -1, - -1, -1, -1, -1, -1, 11, 12, 13, -1, -1, - -1, -1, -1, -1, -1, -1, 22, -1, -1, -1, - -1, -1, -1, 29, -1, -1, -1, 33, 34, -1, - 36, -1, -1, -1, 40, -1, 42, 43, 44, -1, - -1, 47, -1, -1, -1, 51, -1, 53, -1, -1, - 56, -1, -1, -1, -1, -1, -1, -1, -1, 65, - 66, 67, -1, 69, -1, 71, -1, 73, -1, 75, - -1, -1, -1, -1, 80, 81, 82, -1, -1, -1, + -1, 4, 5, 6, -1, -1, 9, 10, 11, -1, + -1, 14, -1, 16, -1, -1, -1, 20, 21, 22, + -1, -1, -1, -1, -1, -1, 29, 30, 31, 32, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + 43, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, 59, -1, -1, -1, + -1, -1, -1, 66, 67, 68, 69, 70, -1, 72, + 73, 74, 75, 76, 77, -1, -1, 80, 81, 82, + 83, 84, 85, -1, -1, -1, -1, -1, 4, 5, + 6, -1, -1, 9, 10, 11, -1, -1, 14, -1, + 16, -1, -1, -1, 20, 21, 22, -1, -1, -1, + -1, -1, -1, 29, 30, 31, 32, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, 43, -1, -1, + -1, 47, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, 59, -1, -1, -1, -1, -1, 65, + 66, 67, 68, 69, 70, -1, 72, 73, 74, 75, + 76, 77, -1, -1, 80, 81, 82, 83, 84, 85, -1, -1, -1, -1, -1, 4, 5, 6, -1, -1, 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, 69, 70, -1, 72, 73, 74, 75, 76, 77, -1, -1, 80, 81, 82, 83, 84, 85, -1, -1, -1, - -1, -1, 4, 5, 6, -1, -1, 9, 10, 11, - -1, -1, 14, -1, 16, -1, -1, -1, 20, 21, - 22, -1, -1, -1, -1, -1, -1, 29, 30, 31, - 32, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, 43, -1, -1, -1, 47, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, 59, -1, -1, - -1, -1, -1, 65, 66, 67, 68, 69, 70, -1, + -1, -1, 4, -1, -1, -1, -1, 9, -1, 11, + 12, 13, 14, -1, -1, -1, -1, -1, -1, 21, + 22, -1, -1, -1, -1, -1, -1, 29, 30, -1, + -1, 33, 34, -1, 36, -1, -1, -1, 40, -1, + 42, 43, 44, -1, -1, 47, -1, -1, -1, 51, + -1, 53, -1, -1, -1, -1, -1, 59, -1, 61, + -1, -1, -1, 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, -1, -1, 80, 81, - 82, 83, 84, 85, -1, -1, -1, -1, -1, 4, - 5, 6, -1, -1, 9, 10, 11, -1, -1, 14, - -1, 16, -1, -1, -1, 20, 21, 22, -1, -1, - -1, -1, -1, -1, 29, 30, 31, 32, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, 43, -1, - -1, -1, 47, -1, -1, -1, -1, -1, -1, -1, - 55, -1, -1, -1, 59, -1, -1, -1, -1, -1, - 65, 66, 67, 68, 69, 70, -1, 72, 73, 74, + 82, 83, 84, -1, -1, -1, -1, -1, -1, 4, + -1, -1, -1, -1, 9, -1, 11, 12, 13, 14, + -1, -1, -1, -1, -1, -1, 21, 22, -1, -1, + -1, -1, -1, -1, 29, 30, -1, -1, 33, 34, + -1, 36, -1, -1, -1, 40, -1, 42, 43, 44, + -1, -1, 47, -1, -1, -1, 51, -1, 53, -1, + -1, -1, -1, -1, 59, -1, 61, -1, -1, -1, + 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, -1, -1, 80, 81, 82, 83, 84, - 85, -1, -1, -1, -1, -1, 4, -1, -1, -1, + -1, -1, -1, -1, -1, -1, 4, -1, -1, -1, -1, 9, -1, 11, 12, 13, 14, -1, -1, -1, -1, -1, -1, 21, 22, -1, -1, -1, -1, -1, -1, 29, 30, -1, -1, 33, 34, -1, 36, -1, @@ -696,72 +710,54 @@ const int JavaScriptGrammar::action_check [] = { 51, -1, 53, -1, -1, -1, -1, -1, 59, -1, 61, -1, -1, -1, 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, -1, -1, 80, - 81, 82, 83, 84, -1, -1, -1, -1, -1, -1, - 4, -1, -1, -1, -1, 9, -1, 11, 12, 13, - 14, -1, -1, -1, -1, -1, -1, 21, 22, -1, - -1, -1, -1, -1, -1, 29, 30, -1, -1, 33, + 81, 82, 83, 84, -1, 86, -1, -1, -1, -1, + 4, 5, 6, -1, -1, 9, 10, 11, 12, 13, + 14, -1, 16, -1, -1, -1, 20, 21, 22, -1, + -1, -1, -1, -1, -1, 29, 30, 31, 32, 33, 34, -1, 36, -1, -1, -1, 40, -1, 42, 43, 44, -1, -1, 47, -1, -1, -1, 51, -1, 53, - -1, -1, -1, -1, -1, 59, -1, 61, -1, -1, + -1, 55, -1, -1, -1, 59, -1, 61, -1, -1, -1, 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, -1, -1, 80, 81, 82, 83, - 84, -1, -1, -1, -1, -1, -1, 4, -1, -1, - -1, -1, 9, -1, 11, 12, 13, 14, -1, -1, - -1, -1, -1, -1, 21, 22, -1, -1, -1, -1, - -1, -1, 29, 30, -1, -1, 33, 34, -1, 36, - -1, -1, -1, 40, -1, 42, 43, 44, -1, -1, - 47, -1, -1, -1, 51, -1, 53, -1, -1, -1, - -1, -1, 59, -1, 61, -1, -1, -1, 65, 66, - 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, - 77, -1, -1, 80, 81, 82, 83, 84, -1, 86, - -1, -1, -1, -1, 4, 5, 6, -1, -1, 9, - 10, 11, 12, 13, 14, -1, 16, -1, -1, -1, - 20, 21, 22, -1, -1, -1, -1, -1, -1, 29, - 30, 31, 32, 33, 34, -1, 36, -1, -1, -1, - 40, -1, 42, 43, 44, -1, -1, 47, -1, -1, - -1, 51, -1, 53, -1, 55, -1, -1, -1, 59, - -1, 61, -1, -1, -1, 65, 66, 67, 68, 69, - 70, 71, 72, 73, 74, 75, 76, 77, -1, -1, - 80, 81, 82, 83, 84, 85, -1, -1, -1, -1, - -1, + 84, 85, -1, -1, -1, -1, -1, - 91, 88, 15, 24, 9, 15, 13, 13, 20, 24, - 13, 15, 9, 15, 14, 62, 15, 18, 58, 9, - 18, 15, 13, 18, 13, 13, 13, 93, 24, 62, - 15, 13, 18, 13, 62, 95, 95, 18, 15, 18, - 24, 24, 13, 15, 13, 15, 24, 95, 15, 13, - 18, 13, 18, 13, 13, 13, 13, 100, -1, 15, - 15, 24, -1, -1, 15, 26, 15, 13, 18, 62, - 24, 24, 24, 18, 18, 15, 18, 24, 15, 18, - 15, 24, 18, 15, 15, 10, 15, 35, 31, 13, - -1, -1, 40, 18, 35, 18, 18, 35, 5, 40, - 13, 35, 40, 18, 24, 35, 40, 35, 35, 35, - 40, 31, 40, -1, 35, -1, 37, 35, 35, -1, - 18, 39, 49, 40, 59, 51, 35, 59, 59, 35, - 59, 40, 35, 35, 40, 37, 35, 40, 37, 35, - 35, 37, 35, 35, 80, 37, -1, 40, 43, 35, - 35, 37, 76, 35, 35, 37, 41, 35, 35, 82, - 41, 38, 40, 76, 35, 35, 35, 35, 35, 38, - 41, 41, 94, 35, 35, 37, 37, 45, -1, 94, - 47, 35, 29, 37, 35, 32, 37, 35, -1, 35, - 35, 39, 37, 39, -1, 35, 94, 37, 35, 29, - 37, 35, 32, 35, 35, -1, 40, 35, 40, 40, - -1, 35, 40, 16, 17, 18, 40, 35, 50, 35, - 35, 52, 40, 57, 40, 40, 42, 42, 46, 57, - 35, 35, 18, 57, 35, 40, 40, 42, 35, 40, - -1, 27, 28, 40, 8, 42, 10, 7, -1, -1, - 10, -1, 35, 57, 18, 35, 57, 40, 18, 2, - 40, -1, 18, -1, 44, 48, -1, -1, -1, -1, - -1, 27, -1, 16, 17, 18, -1, -1, -1, -1, + 91, 5, 15, 24, 9, 15, 15, 24, 15, 58, + 13, 88, 13, 13, 62, 93, 15, 14, 9, 15, + 18, 13, 15, 13, 18, 20, 13, 62, 13, 18, + 95, 13, 18, 95, 95, 13, 24, 18, 18, 15, + 24, 24, 15, 15, 13, 24, 62, 18, 15, 13, + 18, 13, 13, 13, 13, 13, 62, 100, 15, 24, + 15, 15, -1, 26, 15, 15, 15, 13, 24, 35, + 18, 24, 24, 18, 18, 18, 18, 24, 13, 18, + 10, 15, 15, 15, 15, 51, -1, -1, 18, 13, + 18, -1, -1, 18, 35, 35, 37, 35, 35, 35, + 40, -1, 40, 40, 40, 24, 35, 9, 35, 35, + 18, 40, 31, 40, 35, 35, 37, 35, 35, 39, + 37, 18, 40, 49, 35, 59, 59, 59, 59, 40, + 35, 35, 35, 37, 37, 40, 35, 35, 37, 35, + 13, 80, 40, 35, 24, 37, 35, 43, 37, -1, + 35, 31, 76, 35, 82, 37, 41, 35, 35, 35, + 35, 35, 40, 38, 41, 41, -1, 41, 35, 94, + 29, 38, 35, 32, 37, 35, 29, 37, 35, 32, + 37, 35, -1, 35, 35, 39, 94, 39, 35, 35, + 35, 37, 37, 35, 35, 37, 47, 94, 45, 40, + 35, 35, 35, 76, -1, 40, 40, 40, 35, 50, + 16, 17, 18, 40, -1, 35, 35, 35, -1, 52, + 40, 40, 40, 57, 42, -1, 35, 35, -1, 48, + 57, 40, 40, 42, 35, 35, 35, 57, 18, 40, + 40, 40, 8, 42, 10, 46, -1, 27, 28, 57, + 7, 35, 18, 10, 35, 2, 40, 57, 42, 40, + -1, 18, -1, 44, -1, -1, -1, 18, -1, 16, + 17, 18, -1, -1, -1, -1, 27, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, 6, -1, -1, -1, - -1, -1, -1, -1, -1, -1, 16, 17, 18, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, 6, -1, -1, -1, -1, -1, -1, -1, -1, + -1, 16, 17, 18, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, @@ -769,5 +765,5 @@ const int JavaScriptGrammar::action_check [] = { -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -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 5a882e8..58e73f6 100644 --- a/src/declarative/qml/parser/javascriptgrammar_p.h +++ b/src/declarative/qml/parser/javascriptgrammar_p.h @@ -150,15 +150,15 @@ public: T_XOR = 78, T_XOR_EQ = 79, - ACCEPT_STATE = 565, - RULE_COUNT = 316, - STATE_COUNT = 566, + ACCEPT_STATE = 567, + RULE_COUNT = 317, + STATE_COUNT = 568, TERMINAL_COUNT = 91, NON_TERMINAL_COUNT = 102, - GOTO_INDEX_OFFSET = 566, - GOTO_INFO_OFFSET = 1811, - GOTO_CHECK_OFFSET = 1811 + GOTO_INDEX_OFFSET = 568, + GOTO_INFO_OFFSET = 1797, + GOTO_CHECK_OFFSET = 1797 }; static const char *const spell []; diff --git a/src/declarative/qml/parser/javascriptlexer.cpp b/src/declarative/qml/parser/javascriptlexer.cpp index 7bbb4bf..c0a4b63 100644 --- a/src/declarative/qml/parser/javascriptlexer.cpp +++ b/src/declarative/qml/parser/javascriptlexer.cpp @@ -294,7 +294,7 @@ int JavaScript::Lexer::findReservedWord(const QChar *c, int size) const else if (c[0] == QLatin1Char('s') && c[1] == QLatin1Char('i') && c[2] == QLatin1Char('g') && c[3] == QLatin1Char('n') && c[4] == QLatin1Char('a') && c[5] == QLatin1Char('l')) - return JavaScriptGrammar::T_IMPORT; + return JavaScriptGrammar::T_SIGNAL; else if (check_reserved) { if (c[0] == QLatin1Char('e') && c[1] == QLatin1Char('x') && c[2] == QLatin1Char('p') && c[3] == QLatin1Char('o') diff --git a/src/declarative/qml/parser/javascriptparser.cpp b/src/declarative/qml/parser/javascriptparser.cpp index 21dcb0f..601e2a2 100644 --- a/src/declarative/qml/parser/javascriptparser.cpp +++ b/src/declarative/qml/parser/javascriptparser.cpp @@ -279,7 +279,8 @@ case 27: { } case 29: { - AST::UiPublicMember *node = makeAstNode<AST::UiPublicMember> (driver->nodePool(), sym(2).sval, sym(3).sval); + AST::UiPublicMember *node = makeAstNode<AST::UiPublicMember> (driver->nodePool(), (JavaScriptNameIdImpl *)0, sym(2).sval); + node->type = AST::UiPublicMember::Signal; node->propertyToken = loc(1); node->typeToken = loc(2); node->identifierToken = loc(3); @@ -287,6 +288,14 @@ case 29: { } break; case 30: { + AST::UiPublicMember *node = makeAstNode<AST::UiPublicMember> (driver->nodePool(), sym(2).sval, sym(3).sval); + node->propertyToken = loc(1); + node->typeToken = loc(2); + node->identifierToken = loc(3); + sym(1).Node = node; +} break; + +case 31: { AST::UiPublicMember *node = makeAstNode<AST::UiPublicMember> (driver->nodePool(), sym(3).sval, sym(4).sval); node->isDefaultMember = true; node->propertyToken = loc(1); @@ -295,7 +304,7 @@ case 30: { sym(1).Node = node; } break; -case 31: { +case 32: { AST::UiPublicMember *node = makeAstNode<AST::UiPublicMember> (driver->nodePool(), sym(2).sval, sym(3).sval, sym(5).Expression); node->propertyToken = loc(1); @@ -305,7 +314,7 @@ case 31: { sym(1).Node = node; } break; -case 32: { +case 33: { AST::UiPublicMember *node = makeAstNode<AST::UiPublicMember> (driver->nodePool(), sym(3).sval, sym(4).sval, sym(6).Expression); node->isDefaultMember = true; @@ -316,85 +325,85 @@ case 32: { sym(1).Node = node; } break; -case 33: { +case 34: { sym(1).Node = makeAstNode<AST::UiSourceElement>(driver->nodePool(), sym(1).Node); } break; -case 34: { +case 35: { sym(1).Node = makeAstNode<AST::UiSourceElement>(driver->nodePool(), sym(1).Node); } break; -case 35: - case 36: + +case 37: { AST::UiQualifiedId *node = makeAstNode<AST::UiQualifiedId> (driver->nodePool(), driver->intern(lexer->characterBuffer(), lexer->characterCount())); node->identifierToken = loc(1); sym(1).Node = node; } break; -case 38: +case 39: -case 39: { +case 40: { sym(1).sval = driver->intern(lexer->characterBuffer(), lexer->characterCount()); break; } -case 40: { +case 41: { AST::UiQualifiedId *node = makeAstNode<AST::UiQualifiedId> (driver->nodePool(), sym(1).sval); node->identifierToken = loc(1); sym(1).Node = node; } break; -case 41: { +case 42: { AST::UiQualifiedId *node = makeAstNode<AST::UiQualifiedId> (driver->nodePool(), sym(1).UiQualifiedId, sym(3).sval); node->identifierToken = loc(3); sym(1).Node = node; } break; -case 42: { +case 43: { AST::ThisExpression *node = makeAstNode<AST::ThisExpression> (driver->nodePool()); node->thisToken = loc(1); sym(1).Node = node; } break; -case 43: { +case 44: { AST::IdentifierExpression *node = makeAstNode<AST::IdentifierExpression> (driver->nodePool(), sym(1).sval); node->identifierToken = loc(1); sym(1).Node = node; } break; -case 44: { +case 45: { AST::NullExpression *node = makeAstNode<AST::NullExpression> (driver->nodePool()); node->nullToken = loc(1); sym(1).Node = node; } break; -case 45: { +case 46: { AST::TrueLiteral *node = makeAstNode<AST::TrueLiteral> (driver->nodePool()); node->trueToken = loc(1); sym(1).Node = node; } break; -case 46: { +case 47: { AST::FalseLiteral *node = makeAstNode<AST::FalseLiteral> (driver->nodePool()); node->falseToken = loc(1); sym(1).Node = node; } break; -case 47: { +case 48: { AST::NumericLiteral *node = makeAstNode<AST::NumericLiteral> (driver->nodePool(), sym(1).dval); node->literalToken = loc(1); sym(1).Node = node; } break; -case 48: { +case 49: { AST::StringLiteral *node = makeAstNode<AST::StringLiteral> (driver->nodePool(), sym(1).sval); node->literalToken = loc(1); sym(1).Node = node; } break; -case 49: { +case 50: { bool rx = lexer->scanRegExp(Lexer::NoPrefix); if (!rx) { diagnostic_messages.append(DiagnosticMessage(DiagnosticMessage::Error, lexer->startLineNo(), @@ -406,7 +415,7 @@ case 49: { sym(1).Node = node; } break; -case 50: { +case 51: { bool rx = lexer->scanRegExp(Lexer::EqualPrefix); if (!rx) { diagnostic_messages.append(DiagnosticMessage(DiagnosticMessage::Error, lexer->startLineNo(), @@ -418,21 +427,21 @@ case 50: { sym(1).Node = node; } break; -case 51: { +case 52: { 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 52: { +case 53: { 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 53: { +case 54: { AST::ArrayLiteral *node = makeAstNode<AST::ArrayLiteral> (driver->nodePool(), sym(2).ElementList->finish (), sym(4).Elision); node->lbracketToken = loc(1); node->commaToken = loc(3); @@ -440,7 +449,7 @@ case 53: { sym(1).Node = node; } break; -case 54: { +case 55: { AST::ObjectLiteral *node = 0; if (sym(2).Node) node = makeAstNode<AST::ObjectLiteral> (driver->nodePool(), @@ -452,7 +461,7 @@ case 54: { sym(1).Node = node; } break; -case 55: { +case 56: { AST::ObjectLiteral *node = makeAstNode<AST::ObjectLiteral> (driver->nodePool(), sym(2).PropertyNameAndValueList->finish ()); node->lbraceToken = loc(1); @@ -460,51 +469,51 @@ case 55: { sym(1).Node = node; } break; -case 56: { +case 57: { AST::NestedExpression *node = makeAstNode<AST::NestedExpression>(driver->nodePool(), sym(2).Expression); node->lparenToken = loc(1); node->rparenToken = loc(3); sym(1).Node = node; } break; -case 57: { +case 58: { sym(1).Node = makeAstNode<AST::ElementList> (driver->nodePool(), sym(1).Elision, sym(2).Expression); } break; -case 58: { +case 59: { 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 59: { +case 60: { AST::Elision *node = makeAstNode<AST::Elision> (driver->nodePool()); node->commaToken = loc(1); sym(1).Node = node; } break; -case 60: { +case 61: { AST::Elision *node = makeAstNode<AST::Elision> (driver->nodePool(), sym(1).Elision); node->commaToken = loc(2); sym(1).Node = node; } break; -case 61: { +case 62: { sym(1).Node = 0; } break; -case 62: { +case 63: { sym(1).Elision = sym(1).Elision->finish (); } break; -case 63: { +case 64: { AST::PropertyNameAndValueList *node = makeAstNode<AST::PropertyNameAndValueList> (driver->nodePool(), sym(1).PropertyName, sym(3).Expression); node->colonToken = loc(2); sym(1).Node = node; } break; -case 64: { +case 65: { AST::PropertyNameAndValueList *node = makeAstNode<AST::PropertyNameAndValueList> (driver->nodePool(), sym(1).PropertyNameAndValueList, sym(3).PropertyName, sym(5).Expression); node->commaToken = loc(2); @@ -512,38 +521,36 @@ case 64: { sym(1).Node = node; } break; -case 65: { +case 66: { AST::IdentifierPropertyName *node = makeAstNode<AST::IdentifierPropertyName> (driver->nodePool(), sym(1).sval); node->propertyNameToken = loc(1); sym(1).Node = node; } break; -case 67: { +case 68: { AST::IdentifierPropertyName *node = makeAstNode<AST::IdentifierPropertyName> (driver->nodePool(), driver->intern(lexer->characterBuffer(), lexer->characterCount())); node->propertyNameToken = loc(1); sym(1).Node = node; } break; -case 68: { +case 69: { AST::StringLiteralPropertyName *node = makeAstNode<AST::StringLiteralPropertyName> (driver->nodePool(), sym(1).sval); node->propertyNameToken = loc(1); sym(1).Node = node; } break; -case 69: { +case 70: { AST::NumericLiteralPropertyName *node = makeAstNode<AST::NumericLiteralPropertyName> (driver->nodePool(), sym(1).dval); node->propertyNameToken = loc(1); sym(1).Node = node; } break; -case 70: { +case 71: { AST::IdentifierPropertyName *node = makeAstNode<AST::IdentifierPropertyName> (driver->nodePool(), sym(1).sval); node->propertyNameToken = loc(1); sym(1).Node = node; } break; -case 71: - case 72: case 73: @@ -603,25 +610,27 @@ case 99: case 100: case 101: + +case 102: { sym(1).sval = driver->intern(lexer->characterBuffer(), lexer->characterCount()); } break; -case 106: { +case 107: { 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 107: { +case 108: { 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 108: { +case 109: { AST::NewMemberExpression *node = makeAstNode<AST::NewMemberExpression> (driver->nodePool(), sym(2).Expression, sym(4).ArgumentList); node->newToken = loc(1); node->lparenToken = loc(3); @@ -629,384 +638,384 @@ case 108: { sym(1).Node = node; } break; -case 110: { +case 111: { AST::NewExpression *node = makeAstNode<AST::NewExpression> (driver->nodePool(), sym(2).Expression); node->newToken = loc(1); sym(1).Node = node; } break; -case 111: { +case 112: { AST::CallExpression *node = makeAstNode<AST::CallExpression> (driver->nodePool(), sym(1).Expression, sym(3).ArgumentList); node->lparenToken = loc(2); node->rparenToken = loc(4); sym(1).Node = node; } break; -case 112: { +case 113: { AST::CallExpression *node = makeAstNode<AST::CallExpression> (driver->nodePool(), sym(1).Expression, sym(3).ArgumentList); node->lparenToken = loc(2); node->rparenToken = loc(4); sym(1).Node = node; } break; -case 113: { +case 114: { 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 114: { +case 115: { 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 115: { +case 116: { sym(1).Node = 0; } break; -case 116: { +case 117: { sym(1).Node = sym(1).ArgumentList->finish(); } break; -case 117: { +case 118: { sym(1).Node = makeAstNode<AST::ArgumentList> (driver->nodePool(), sym(1).Expression); } break; -case 118: { +case 119: { AST::ArgumentList *node = makeAstNode<AST::ArgumentList> (driver->nodePool(), sym(1).ArgumentList, sym(3).Expression); node->commaToken = loc(2); sym(1).Node = node; } break; -case 122: { +case 123: { AST::PostIncrementExpression *node = makeAstNode<AST::PostIncrementExpression> (driver->nodePool(), sym(1).Expression); node->incrementToken = loc(2); sym(1).Node = node; } break; -case 123: { +case 124: { AST::PostDecrementExpression *node = makeAstNode<AST::PostDecrementExpression> (driver->nodePool(), sym(1).Expression); node->decrementToken = loc(2); sym(1).Node = node; } break; -case 125: { +case 126: { AST::DeleteExpression *node = makeAstNode<AST::DeleteExpression> (driver->nodePool(), sym(2).Expression); node->deleteToken = loc(1); sym(1).Node = node; } break; -case 126: { +case 127: { AST::VoidExpression *node = makeAstNode<AST::VoidExpression> (driver->nodePool(), sym(2).Expression); node->voidToken = loc(1); sym(1).Node = node; } break; -case 127: { +case 128: { AST::TypeOfExpression *node = makeAstNode<AST::TypeOfExpression> (driver->nodePool(), sym(2).Expression); node->typeofToken = loc(1); sym(1).Node = node; } break; -case 128: { +case 129: { AST::PreIncrementExpression *node = makeAstNode<AST::PreIncrementExpression> (driver->nodePool(), sym(2).Expression); node->incrementToken = loc(1); sym(1).Node = node; } break; -case 129: { +case 130: { AST::PreDecrementExpression *node = makeAstNode<AST::PreDecrementExpression> (driver->nodePool(), sym(2).Expression); node->decrementToken = loc(1); sym(1).Node = node; } break; -case 130: { +case 131: { AST::UnaryPlusExpression *node = makeAstNode<AST::UnaryPlusExpression> (driver->nodePool(), sym(2).Expression); node->plusToken = loc(1); sym(1).Node = node; } break; -case 131: { +case 132: { AST::UnaryMinusExpression *node = makeAstNode<AST::UnaryMinusExpression> (driver->nodePool(), sym(2).Expression); node->minusToken = loc(1); sym(1).Node = node; } break; -case 132: { +case 133: { AST::TildeExpression *node = makeAstNode<AST::TildeExpression> (driver->nodePool(), sym(2).Expression); node->tildeToken = loc(1); sym(1).Node = node; } break; -case 133: { +case 134: { AST::NotExpression *node = makeAstNode<AST::NotExpression> (driver->nodePool(), sym(2).Expression); node->notToken = loc(1); sym(1).Node = node; } break; -case 135: { +case 136: { 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 136: { +case 137: { 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 137: { +case 138: { 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 139: { +case 140: { 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 140: { +case 141: { 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 142: { +case 143: { 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 143: { +case 144: { 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 144: { +case 145: { 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 146: { +case 147: { 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 147: { +case 148: { 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 148: { +case 149: { 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 149: { +case 150: { 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 150: { +case 151: { 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 151: { +case 152: { 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 153: { +case 154: { 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 154: { +case 155: { 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 155: { +case 156: { 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 156: { +case 157: { 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 157: { +case 158: { AST::BinaryExpression *node = makeAstNode<AST::BinaryExpression> (driver->nodePool(), sym(1).Expression, QSOperator::InstanceOf, sym(3).Expression); node->operatorToken = loc(2); sym(1).Node = node; } break; -case 159: { +case 160: { 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 160: { +case 161: { 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 161: { +case 162: { 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 162: { +case 163: { 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 164: { +case 165: { 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 165: { +case 166: { 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 166: { +case 167: { 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 167: { +case 168: { AST::BinaryExpression *node = makeAstNode<AST::BinaryExpression> (driver->nodePool(), sym(1).Expression, QSOperator::StrictNotEqual, sym(3).Expression); node->operatorToken = loc(2); sym(1).Node = node; } break; -case 169: { +case 170: { 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 171: { +case 172: { AST::BinaryExpression *node = makeAstNode<AST::BinaryExpression> (driver->nodePool(), sym(1).Expression, QSOperator::BitAnd, sym(3).Expression); node->operatorToken = loc(2); sym(1).Node = node; } break; -case 173: { +case 174: { 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 175: { +case 176: { AST::BinaryExpression *node = makeAstNode<AST::BinaryExpression> (driver->nodePool(), sym(1).Expression, QSOperator::BitXor, sym(3).Expression); node->operatorToken = loc(2); sym(1).Node = node; } break; -case 177: { +case 178: { 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 179: { +case 180: { AST::BinaryExpression *node = makeAstNode<AST::BinaryExpression> (driver->nodePool(), sym(1).Expression, QSOperator::BitOr, sym(3).Expression); node->operatorToken = loc(2); sym(1).Node = node; } break; -case 181: { +case 182: { 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 183: { +case 184: { AST::BinaryExpression *node = makeAstNode<AST::BinaryExpression> (driver->nodePool(), sym(1).Expression, QSOperator::And, sym(3).Expression); node->operatorToken = loc(2); sym(1).Node = node; } break; -case 185: { +case 186: { 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 187: { +case 188: { AST::BinaryExpression *node = makeAstNode<AST::BinaryExpression> (driver->nodePool(), sym(1).Expression, QSOperator::Or, sym(3).Expression); node->operatorToken = loc(2); sym(1).Node = node; } break; -case 189: { +case 190: { AST::ConditionalExpression *node = makeAstNode<AST::ConditionalExpression> (driver->nodePool(), sym(1).Expression, sym(3).Expression, sym(5).Expression); node->questionToken = loc(2); @@ -1014,7 +1023,7 @@ case 189: { sym(1).Node = node; } break; -case 191: { +case 192: { AST::ConditionalExpression *node = makeAstNode<AST::ConditionalExpression> (driver->nodePool(), sym(1).Expression, sym(3).Expression, sym(5).Expression); node->questionToken = loc(2); @@ -1022,112 +1031,112 @@ case 191: { sym(1).Node = node; } break; -case 193: { +case 194: { AST::BinaryExpression *node = makeAstNode<AST::BinaryExpression> (driver->nodePool(), sym(1).Expression, sym(2).ival, sym(3).Expression); node->operatorToken = loc(2); sym(1).Node = node; } break; -case 195: { +case 196: { AST::BinaryExpression *node = makeAstNode<AST::BinaryExpression> (driver->nodePool(), sym(1).Expression, sym(2).ival, sym(3).Expression); node->operatorToken = loc(2); sym(1).Node = node; } break; -case 196: { +case 197: { sym(1).ival = QSOperator::Assign; } break; -case 197: { +case 198: { sym(1).ival = QSOperator::InplaceMul; } break; -case 198: { +case 199: { sym(1).ival = QSOperator::InplaceDiv; } break; -case 199: { +case 200: { sym(1).ival = QSOperator::InplaceMod; } break; -case 200: { +case 201: { sym(1).ival = QSOperator::InplaceAdd; } break; -case 201: { +case 202: { sym(1).ival = QSOperator::InplaceSub; } break; -case 202: { +case 203: { sym(1).ival = QSOperator::InplaceLeftShift; } break; -case 203: { +case 204: { sym(1).ival = QSOperator::InplaceRightShift; } break; -case 204: { +case 205: { sym(1).ival = QSOperator::InplaceURightShift; } break; -case 205: { +case 206: { sym(1).ival = QSOperator::InplaceAnd; } break; -case 206: { +case 207: { sym(1).ival = QSOperator::InplaceXor; } break; -case 207: { +case 208: { sym(1).ival = QSOperator::InplaceOr; } break; -case 209: { +case 210: { AST::Expression *node = makeAstNode<AST::Expression> (driver->nodePool(), sym(1).Expression, sym(3).Expression); node->commaToken = loc(2); sym(1).Node = node; } break; -case 210: { +case 211: { sym(1).Node = 0; } break; -case 213: { +case 214: { AST::Expression *node = makeAstNode<AST::Expression> (driver->nodePool(), sym(1).Expression, sym(3).Expression); node->commaToken = loc(2); sym(1).Node = node; } break; -case 214: { +case 215: { sym(1).Node = 0; } break; -case 231: { +case 232: { 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 232: { +case 233: { sym(1).Node = makeAstNode<AST::StatementList> (driver->nodePool(), sym(1).Statement); } break; -case 233: { +case 234: { sym(1).Node = makeAstNode<AST::StatementList> (driver->nodePool(), sym(1).StatementList, sym(2).Statement); } break; -case 234: { +case 235: { sym(1).Node = 0; } break; -case 235: { +case 236: { sym(1).Node = sym(1).StatementList->finish (); } break; -case 237: { +case 238: { AST::VariableStatement *node = makeAstNode<AST::VariableStatement> (driver->nodePool(), sym(2).VariableDeclarationList->finish (/*readOnly=*/sym(1).ival == T_CONST)); node->declarationKindToken = loc(1); @@ -1135,76 +1144,76 @@ case 237: { sym(1).Node = node; } break; -case 238: { +case 239: { sym(1).ival = T_CONST; } break; -case 239: { +case 240: { sym(1).ival = T_VAR; } break; -case 240: { +case 241: { sym(1).Node = makeAstNode<AST::VariableDeclarationList> (driver->nodePool(), sym(1).VariableDeclaration); } break; -case 241: { +case 242: { AST::VariableDeclarationList *node = makeAstNode<AST::VariableDeclarationList> (driver->nodePool(), sym(1).VariableDeclarationList, sym(3).VariableDeclaration); node->commaToken = loc(2); sym(1).Node = node; } break; -case 242: { +case 243: { sym(1).Node = makeAstNode<AST::VariableDeclarationList> (driver->nodePool(), sym(1).VariableDeclaration); } break; -case 243: { +case 244: { sym(1).Node = makeAstNode<AST::VariableDeclarationList> (driver->nodePool(), sym(1).VariableDeclarationList, sym(3).VariableDeclaration); } break; -case 244: { +case 245: { AST::VariableDeclaration *node = makeAstNode<AST::VariableDeclaration> (driver->nodePool(), sym(1).sval, sym(2).Expression); node->identifierToken = loc(1); sym(1).Node = node; } break; -case 245: { +case 246: { AST::VariableDeclaration *node = makeAstNode<AST::VariableDeclaration> (driver->nodePool(), sym(1).sval, sym(2).Expression); node->identifierToken = loc(1); sym(1).Node = node; } break; -case 246: { +case 247: { // ### TODO: AST for initializer sym(1) = sym(2); } break; -case 247: { +case 248: { sym(1).Node = 0; } break; -case 249: { +case 250: { // ### TODO: AST for initializer sym(1) = sym(2); } break; -case 250: { +case 251: { sym(1).Node = 0; } break; -case 252: { +case 253: { AST::EmptyStatement *node = makeAstNode<AST::EmptyStatement> (driver->nodePool()); node->semicolonToken = loc(1); sym(1).Node = node; } break; -case 254: { +case 255: { AST::ExpressionStatement *node = makeAstNode<AST::ExpressionStatement> (driver->nodePool(), sym(1).Expression); node->semicolonToken = loc(2); sym(1).Node = node; } break; -case 255: { +case 256: { 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); @@ -1213,7 +1222,7 @@ case 255: { sym(1).Node = node; } break; -case 256: { +case 257: { AST::IfStatement *node = makeAstNode<AST::IfStatement> (driver->nodePool(), sym(3).Expression, sym(5).Statement); node->ifToken = loc(1); node->lparenToken = loc(2); @@ -1221,7 +1230,7 @@ case 256: { sym(1).Node = node; } break; -case 258: { +case 259: { AST::DoWhileStatement *node = makeAstNode<AST::DoWhileStatement> (driver->nodePool(), sym(2).Statement, sym(5).Expression); node->doToken = loc(1); node->whileToken = loc(3); @@ -1231,7 +1240,7 @@ case 258: { sym(1).Node = node; } break; -case 259: { +case 260: { AST::WhileStatement *node = makeAstNode<AST::WhileStatement> (driver->nodePool(), sym(3).Expression, sym(5).Statement); node->whileToken = loc(1); node->lparenToken = loc(2); @@ -1239,7 +1248,7 @@ case 259: { sym(1).Node = node; } break; -case 260: { +case 261: { AST::ForStatement *node = makeAstNode<AST::ForStatement> (driver->nodePool(), sym(3).Expression, sym(5).Expression, sym(7).Expression, sym(9).Statement); node->forToken = loc(1); @@ -1250,7 +1259,7 @@ case 260: { sym(1).Node = node; } break; -case 261: { +case 262: { AST::LocalForStatement *node = makeAstNode<AST::LocalForStatement> (driver->nodePool(), sym(4).VariableDeclarationList->finish (/*readOnly=*/false), sym(6).Expression, sym(8).Expression, sym(10).Statement); @@ -1263,7 +1272,7 @@ case 261: { sym(1).Node = node; } break; -case 262: { +case 263: { AST:: ForEachStatement *node = makeAstNode<AST::ForEachStatement> (driver->nodePool(), sym(3).Expression, sym(5).Expression, sym(7).Statement); node->forToken = loc(1); @@ -1273,7 +1282,7 @@ case 262: { sym(1).Node = node; } break; -case 263: { +case 264: { AST::LocalForEachStatement *node = makeAstNode<AST::LocalForEachStatement> (driver->nodePool(), sym(4).VariableDeclaration, sym(6).Expression, sym(8).Statement); node->forToken = loc(1); @@ -1284,14 +1293,14 @@ case 263: { sym(1).Node = node; } break; -case 265: { +case 266: { AST::ContinueStatement *node = makeAstNode<AST::ContinueStatement> (driver->nodePool()); node->continueToken = loc(1); node->semicolonToken = loc(2); sym(1).Node = node; } break; -case 267: { +case 268: { AST::ContinueStatement *node = makeAstNode<AST::ContinueStatement> (driver->nodePool(), sym(2).sval); node->continueToken = loc(1); node->identifierToken = loc(2); @@ -1299,14 +1308,14 @@ case 267: { sym(1).Node = node; } break; -case 269: { +case 270: { AST::BreakStatement *node = makeAstNode<AST::BreakStatement> (driver->nodePool()); node->breakToken = loc(1); node->semicolonToken = loc(2); sym(1).Node = node; } break; -case 271: { +case 272: { AST::BreakStatement *node = makeAstNode<AST::BreakStatement> (driver->nodePool(), sym(2).sval); node->breakToken = loc(1); node->identifierToken = loc(2); @@ -1314,14 +1323,14 @@ case 271: { sym(1).Node = node; } break; -case 273: { +case 274: { 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 274: { +case 275: { AST::WithStatement *node = makeAstNode<AST::WithStatement> (driver->nodePool(), sym(3).Expression, sym(5).Statement); node->withToken = loc(1); node->lparenToken = loc(2); @@ -1329,7 +1338,7 @@ case 274: { sym(1).Node = node; } break; -case 275: { +case 276: { AST::SwitchStatement *node = makeAstNode<AST::SwitchStatement> (driver->nodePool(), sym(3).Expression, sym(5).CaseBlock); node->switchToken = loc(1); node->lparenToken = loc(2); @@ -1337,90 +1346,90 @@ case 275: { sym(1).Node = node; } break; -case 276: { +case 277: { 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 277: { +case 278: { 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 278: { +case 279: { sym(1).Node = makeAstNode<AST::CaseClauses> (driver->nodePool(), sym(1).CaseClause); } break; -case 279: { +case 280: { sym(1).Node = makeAstNode<AST::CaseClauses> (driver->nodePool(), sym(1).CaseClauses, sym(2).CaseClause); } break; -case 280: { +case 281: { sym(1).Node = 0; } break; -case 281: { +case 282: { sym(1).Node = sym(1).CaseClauses->finish (); } break; -case 282: { +case 283: { 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 283: { +case 284: { AST::DefaultClause *node = makeAstNode<AST::DefaultClause> (driver->nodePool(), sym(3).StatementList); node->defaultToken = loc(1); node->colonToken = loc(2); sym(1).Node = node; } break; -case 285: { +case 286: { AST::LabelledStatement *node = makeAstNode<AST::LabelledStatement> (driver->nodePool(), driver->intern(lexer->characterBuffer(), lexer->characterCount()), sym(3).Statement); node->identifierToken = loc(1); node->colonToken = loc(2); sym(1).Node = node; } break; -case 286: { +case 287: { 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 288: { +case 289: { 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 289: { +case 290: { AST::TryStatement *node = makeAstNode<AST::TryStatement> (driver->nodePool(), sym(2).Statement, sym(3).Catch); node->tryToken = loc(1); sym(1).Node = node; } break; -case 290: { +case 291: { AST::TryStatement *node = makeAstNode<AST::TryStatement> (driver->nodePool(), sym(2).Statement, sym(3).Finally); node->tryToken = loc(1); sym(1).Node = node; } break; -case 291: { +case 292: { 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 292: { +case 293: { AST::Catch *node = makeAstNode<AST::Catch> (driver->nodePool(), sym(3).sval, sym(5).Block); node->catchToken = loc(1); node->lparenToken = loc(2); @@ -1429,20 +1438,20 @@ case 292: { sym(1).Node = node; } break; -case 293: { +case 294: { AST::Finally *node = makeAstNode<AST::Finally> (driver->nodePool(), sym(2).Block); node->finallyToken = loc(1); sym(1).Node = node; } break; -case 295: { +case 296: { AST::DebuggerStatement *node = makeAstNode<AST::DebuggerStatement> (driver->nodePool()); node->debuggerToken = loc(1); node->semicolonToken = loc(2); sym(1).Node = node; } break; -case 297: { +case 298: { AST::FunctionDeclaration *node = makeAstNode<AST::FunctionDeclaration> (driver->nodePool(), driver->intern(lexer->characterBuffer(), lexer->characterCount()), sym(4).FormalParameterList, sym(7).FunctionBody); node->functionToken = loc(1); node->identifierToken = loc(2); @@ -1453,7 +1462,7 @@ case 297: { sym(1).Node = node; } break; -case 298: { +case 299: { AST::FunctionDeclaration *node = makeAstNode<AST::FunctionDeclaration> (driver->nodePool(), sym(2).sval, sym(4).FormalParameterList, sym(7).FunctionBody); node->functionToken = loc(1); node->identifierToken = loc(2); @@ -1464,7 +1473,7 @@ case 298: { sym(1).Node = node; } break; -case 299: { +case 300: { AST::FunctionExpression *node = makeAstNode<AST::FunctionExpression> (driver->nodePool(), sym(2).sval, sym(4).FormalParameterList, sym(7).FunctionBody); node->functionToken = loc(1); if (sym(2).sval) @@ -1476,56 +1485,56 @@ case 299: { sym(1).Node = node; } break; -case 300: { +case 301: { AST::FormalParameterList *node = makeAstNode<AST::FormalParameterList> (driver->nodePool(), sym(1).sval); node->identifierToken = loc(1); sym(1).Node = node; } break; -case 301: { +case 302: { AST::FormalParameterList *node = makeAstNode<AST::FormalParameterList> (driver->nodePool(), sym(1).FormalParameterList, sym(3).sval); node->commaToken = loc(2); node->identifierToken = loc(3); sym(1).Node = node; } break; -case 302: { +case 303: { sym(1).Node = 0; } break; -case 303: { +case 304: { sym(1).Node = sym(1).FormalParameterList->finish (); } break; -case 304: { +case 305: { sym(1).Node = 0; } break; -case 306: { +case 307: { sym(1).Node = makeAstNode<AST::FunctionBody> (driver->nodePool(), sym(1).SourceElements->finish ()); } break; -case 307: { +case 308: { sym(1).Node = makeAstNode<AST::SourceElements> (driver->nodePool(), sym(1).SourceElement); } break; -case 308: { +case 309: { sym(1).Node = makeAstNode<AST::SourceElements> (driver->nodePool(), sym(1).SourceElements, sym(2).SourceElement); } break; -case 309: { +case 310: { sym(1).Node = makeAstNode<AST::StatementSourceElement> (driver->nodePool(), sym(1).Statement); } break; -case 310: { +case 311: { sym(1).Node = makeAstNode<AST::FunctionSourceElement> (driver->nodePool(), sym(1).FunctionDeclaration); } break; -case 311: { +case 312: { sym(1).sval = 0; } break; -case 313: { +case 314: { sym(1).Node = 0; } break; diff --git a/src/declarative/qml/parser/javascriptparser_p.h b/src/declarative/qml/parser/javascriptparser_p.h index e1aff9c..497fae8 100644 --- a/src/declarative/qml/parser/javascriptparser_p.h +++ b/src/declarative/qml/parser/javascriptparser_p.h @@ -206,9 +206,9 @@ protected: }; -#define J_SCRIPT_REGEXPLITERAL_RULE1 49 +#define J_SCRIPT_REGEXPLITERAL_RULE1 50 -#define J_SCRIPT_REGEXPLITERAL_RULE2 50 +#define J_SCRIPT_REGEXPLITERAL_RULE2 51 QT_END_NAMESPACE diff --git a/src/declarative/qml/qmlscriptparser.cpp b/src/declarative/qml/qmlscriptparser.cpp index 89cde7b..8039b5c 100644 --- a/src/declarative/qml/qmlscriptparser.cpp +++ b/src/declarative/qml/qmlscriptparser.cpp @@ -334,53 +334,62 @@ bool ProcessAST::visit(AST::UiImport *node) // UiMemberType: "property" | "signal" bool ProcessAST::visit(AST::UiPublicMember *node) { - const QString memberType = node->memberType->asString(); - const QString name = node->name->asString(); + if(node->type == AST::UiPublicMember::Signal) { + const QString name = node->name->asString(); - const struct TypeNameToType { - const char *name; + Object::DynamicSignal signal; + signal.name = name.toUtf8(); + + _stateStack.top().object->dynamicSignals << signal; + } else { + const QString memberType = node->memberType->asString(); + const QString name = node->name->asString(); + + const struct TypeNameToType { + const char *name; + Object::DynamicProperty::Type type; + } propTypeNameToTypes[] = { + { "int", Object::DynamicProperty::Int }, + { "bool", Object::DynamicProperty::Bool }, + { "double", Object::DynamicProperty::Real }, + { "real", Object::DynamicProperty::Real }, + { "string", Object::DynamicProperty::String }, + { "color", Object::DynamicProperty::Color }, + { "date", Object::DynamicProperty::Date }, + { "var", Object::DynamicProperty::Variant }, + { "variant", Object::DynamicProperty::Variant } + }; + const int propTypeNameToTypesCount = sizeof(propTypeNameToTypes) / + sizeof(propTypeNameToTypes[0]); + + bool typeFound = false; Object::DynamicProperty::Type type; - } propTypeNameToTypes[] = { - { "int", Object::DynamicProperty::Int }, - { "bool", Object::DynamicProperty::Bool }, - { "double", Object::DynamicProperty::Real }, - { "real", Object::DynamicProperty::Real }, - { "string", Object::DynamicProperty::String }, - { "color", Object::DynamicProperty::Color }, - { "date", Object::DynamicProperty::Date }, - { "var", Object::DynamicProperty::Variant }, - { "variant", Object::DynamicProperty::Variant } - }; - const int propTypeNameToTypesCount = sizeof(propTypeNameToTypes) / - sizeof(propTypeNameToTypes[0]); - - bool typeFound = false; - Object::DynamicProperty::Type type; - for(int ii = 0; !typeFound && ii < propTypeNameToTypesCount; ++ii) { - if(QLatin1String(propTypeNameToTypes[ii].name) == memberType) { - type = propTypeNameToTypes[ii].type; - typeFound = true; + for(int ii = 0; !typeFound && ii < propTypeNameToTypesCount; ++ii) { + if(QLatin1String(propTypeNameToTypes[ii].name) == memberType) { + type = propTypeNameToTypes[ii].type; + typeFound = true; + } + } + + if(!typeFound) { + qWarning() << "Unknown property type" << memberType; // ### FIXME + return false; } - } - - if(!typeFound) { - qWarning() << "Unknown property type" << memberType; // ### FIXME - return false; - } - Object::DynamicProperty property; - property.isDefaultProperty = node->isDefaultMember; - property.type = type; - property.name = name.toUtf8(); + Object::DynamicProperty property; + property.isDefaultProperty = node->isDefaultMember; + property.type = type; + property.name = name.toUtf8(); - if (node->expression) { // default value - property.defaultValue = new Property; - Value *value = new Value; - value->primitive = getPrimitive("value", node->expression); - property.defaultValue->values << value; - } + if (node->expression) { // default value + property.defaultValue = new Property; + Value *value = new Value; + value->primitive = getPrimitive("value", node->expression); + property.defaultValue->values << value; + } - _stateStack.top().object->dynamicProperties << property; + _stateStack.top().object->dynamicProperties << property; + } return true; } |