diff options
Diffstat (limited to 'src/declarative/qml')
| -rw-r--r-- | src/declarative/qml/parser/qmljs.g | 12 | ||||
| -rw-r--r-- | src/declarative/qml/parser/qmljsgrammar.cpp | 1353 | ||||
| -rw-r--r-- | src/declarative/qml/parser/qmljsgrammar_p.h | 12 | ||||
| -rw-r--r-- | src/declarative/qml/parser/qmljsparser.cpp | 400 | ||||
| -rw-r--r-- | src/declarative/qml/parser/qmljsparser_p.h | 4 |
5 files changed, 903 insertions, 878 deletions
diff --git a/src/declarative/qml/parser/qmljs.g b/src/declarative/qml/parser/qmljs.g index 5f0fe8f..d8d67c3 100644 --- a/src/declarative/qml/parser/qmljs.g +++ b/src/declarative/qml/parser/qmljs.g @@ -837,27 +837,31 @@ case $rule_number: { } break; ./ -UiObjectMember: T_SIGNAL T_IDENTIFIER T_LPAREN UiParameterListOpt T_RPAREN ; +UiObjectMember: T_SIGNAL T_IDENTIFIER T_LPAREN UiParameterListOpt T_RPAREN T_AUTOMATIC_SEMICOLON ; +UiObjectMember: T_SIGNAL T_IDENTIFIER T_LPAREN UiParameterListOpt T_RPAREN T_SEMICOLON ; /. case $rule_number: { AST::UiPublicMember *node = makeAstNode<AST::UiPublicMember> (driver->nodePool(), (NameId *)0, sym(2).sval); node->type = AST::UiPublicMember::Signal; node->propertyToken = loc(1); node->typeToken = loc(2); - node->identifierToken = loc(3); + node->identifierToken = loc(2); node->parameters = sym(4).UiParameterList; + node->semicolonToken = loc(6); sym(1).Node = node; } break; ./ -UiObjectMember: T_SIGNAL T_IDENTIFIER ; +UiObjectMember: T_SIGNAL T_IDENTIFIER T_AUTOMATIC_SEMICOLON ; +UiObjectMember: T_SIGNAL T_IDENTIFIER T_SEMICOLON ; /. case $rule_number: { AST::UiPublicMember *node = makeAstNode<AST::UiPublicMember> (driver->nodePool(), (NameId *)0, sym(2).sval); node->type = AST::UiPublicMember::Signal; node->propertyToken = loc(1); node->typeToken = loc(2); - node->identifierToken = loc(3); + node->identifierToken = loc(2); + node->semicolonToken = loc(3); sym(1).Node = node; } break; ./ diff --git a/src/declarative/qml/parser/qmljsgrammar.cpp b/src/declarative/qml/parser/qmljsgrammar.cpp index 1b23be6..873307f 100644 --- a/src/declarative/qml/parser/qmljsgrammar.cpp +++ b/src/declarative/qml/parser/qmljsgrammar.cpp @@ -60,140 +60,141 @@ const int QmlJSGrammar::lhs [] = { 101, 100, 107, 107, 109, 109, 110, 110, 106, 108, 108, 108, 108, 108, 108, 108, 115, 115, 115, 116, 116, 117, 117, 108, 108, 108, 108, 108, 108, 108, - 108, 108, 108, 108, 108, 105, 105, 104, 104, 104, + 108, 108, 108, 108, 108, 108, 108, 105, 105, 104, + 104, 104, 120, 120, 120, 120, 120, 120, 120, 120, 120, 120, 120, 120, 120, 120, 120, 120, 120, 120, - 120, 120, 120, 120, 120, 120, 120, 120, 105, 105, - 122, 122, 122, 122, 121, 121, 124, 124, 126, 126, - 126, 126, 126, 126, 127, 127, 127, 127, 127, 127, + 105, 105, 122, 122, 122, 122, 121, 121, 124, 124, + 126, 126, 126, 126, 126, 126, 127, 127, 127, 127, 127, 127, 127, 127, 127, 127, 127, 127, 127, 127, 127, 127, 127, 127, 127, 127, 127, 127, 127, 127, - 127, 127, 127, 127, 127, 128, 128, 129, 129, 129, - 129, 129, 132, 132, 133, 133, 133, 133, 131, 131, - 134, 134, 135, 135, 136, 136, 136, 137, 137, 137, - 137, 137, 137, 137, 137, 137, 137, 138, 138, 138, - 138, 139, 139, 139, 140, 140, 140, 140, 141, 141, - 141, 141, 141, 141, 141, 142, 142, 142, 142, 142, - 142, 143, 143, 143, 143, 143, 144, 144, 144, 144, - 144, 145, 145, 146, 146, 147, 147, 148, 148, 149, - 149, 150, 150, 151, 151, 152, 152, 153, 153, 154, - 154, 155, 155, 156, 156, 125, 125, 157, 157, 158, - 158, 158, 158, 158, 158, 158, 158, 158, 158, 158, - 158, 98, 98, 159, 159, 160, 160, 161, 161, 97, - 97, 97, 97, 97, 97, 97, 97, 97, 97, 97, - 97, 97, 97, 97, 111, 173, 173, 172, 172, 119, - 119, 174, 174, 175, 175, 177, 177, 176, 178, 181, - 179, 179, 182, 180, 180, 112, 113, 113, 114, 114, - 162, 162, 162, 162, 162, 162, 162, 163, 163, 163, - 163, 164, 164, 164, 164, 165, 165, 166, 168, 183, - 183, 186, 186, 184, 184, 187, 185, 167, 167, 167, - 169, 169, 170, 170, 170, 188, 189, 171, 171, 118, - 130, 193, 193, 190, 190, 191, 191, 194, 195, 195, - 196, 196, 192, 192, 123, 123, 197}; + 127, 127, 127, 127, 127, 127, 127, 128, 128, 129, + 129, 129, 129, 129, 132, 132, 133, 133, 133, 133, + 131, 131, 134, 134, 135, 135, 136, 136, 136, 137, + 137, 137, 137, 137, 137, 137, 137, 137, 137, 138, + 138, 138, 138, 139, 139, 139, 140, 140, 140, 140, + 141, 141, 141, 141, 141, 141, 141, 142, 142, 142, + 142, 142, 142, 143, 143, 143, 143, 143, 144, 144, + 144, 144, 144, 145, 145, 146, 146, 147, 147, 148, + 148, 149, 149, 150, 150, 151, 151, 152, 152, 153, + 153, 154, 154, 155, 155, 156, 156, 125, 125, 157, + 157, 158, 158, 158, 158, 158, 158, 158, 158, 158, + 158, 158, 158, 98, 98, 159, 159, 160, 160, 161, + 161, 97, 97, 97, 97, 97, 97, 97, 97, 97, + 97, 97, 97, 97, 97, 97, 111, 173, 173, 172, + 172, 119, 119, 174, 174, 175, 175, 177, 177, 176, + 178, 181, 179, 179, 182, 180, 180, 112, 113, 113, + 114, 114, 162, 162, 162, 162, 162, 162, 162, 163, + 163, 163, 163, 164, 164, 164, 164, 165, 165, 166, + 168, 183, 183, 186, 186, 184, 184, 187, 185, 167, + 167, 167, 169, 169, 170, 170, 170, 188, 189, 171, + 171, 118, 130, 193, 193, 190, 190, 191, 191, 194, + 195, 195, 196, 196, 192, 192, 123, 123, 197}; const int QmlJSGrammar:: rhs[] = { 2, 2, 2, 2, 1, 1, 1, 2, 3, 3, 5, 5, 3, 3, 4, 4, 6, 6, 5, 5, 0, 1, 1, 2, 1, 3, 2, 3, 2, 1, 5, 4, 3, 3, 3, 3, 1, 1, 1, 0, - 1, 2, 4, 5, 2, 4, 4, 5, 5, 6, - 6, 7, 7, 1, 1, 1, 1, 1, 1, 1, + 1, 2, 4, 6, 6, 3, 3, 4, 4, 5, + 5, 6, 6, 7, 7, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, - 2, 3, 3, 4, 5, 3, 4, 3, 1, 3, - 1, 2, 3, 4, 1, 2, 3, 5, 1, 1, + 1, 1, 2, 3, 3, 4, 5, 3, 4, 3, + 1, 3, 1, 2, 3, 4, 1, 2, 3, 5, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, - 1, 1, 1, 1, 1, 1, 1, 1, 1, 4, - 3, 5, 1, 2, 4, 4, 4, 3, 0, 1, - 1, 3, 1, 1, 1, 2, 2, 1, 2, 2, - 2, 2, 2, 2, 2, 2, 2, 1, 3, 3, - 3, 1, 3, 3, 1, 3, 3, 3, 1, 3, - 3, 3, 3, 3, 3, 1, 3, 3, 3, 3, - 3, 1, 3, 3, 3, 3, 1, 3, 3, 3, - 3, 1, 3, 1, 3, 1, 3, 1, 3, 1, - 3, 1, 3, 1, 3, 1, 3, 1, 3, 1, - 3, 1, 5, 1, 5, 1, 3, 1, 3, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, - 1, 1, 3, 0, 1, 1, 3, 0, 1, 1, + 1, 4, 3, 5, 1, 2, 4, 4, 4, 3, + 0, 1, 1, 3, 1, 1, 1, 2, 2, 1, + 2, 2, 2, 2, 2, 2, 2, 2, 2, 1, + 3, 3, 3, 1, 3, 3, 1, 3, 3, 3, + 1, 3, 3, 3, 3, 3, 3, 1, 3, 3, + 3, 3, 3, 1, 3, 3, 3, 3, 1, 3, + 3, 3, 3, 1, 3, 1, 3, 1, 3, 1, + 3, 1, 3, 1, 3, 1, 3, 1, 3, 1, + 3, 1, 3, 1, 5, 1, 5, 1, 3, 1, + 3, 1, 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 3, 0, 1, 1, 3, 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, - 1, 1, 1, 1, 3, 1, 2, 0, 1, 3, - 3, 1, 1, 1, 3, 1, 3, 2, 2, 2, - 0, 1, 2, 0, 1, 1, 2, 2, 7, 5, - 7, 7, 5, 9, 10, 7, 8, 2, 2, 3, - 3, 2, 2, 3, 3, 3, 3, 5, 5, 3, - 5, 1, 2, 0, 1, 4, 3, 3, 3, 3, - 3, 3, 3, 3, 4, 5, 2, 2, 2, 8, - 8, 1, 3, 0, 1, 0, 1, 1, 1, 2, - 1, 1, 0, 1, 0, 1, 2}; + 1, 1, 1, 1, 1, 1, 3, 1, 2, 0, + 1, 3, 3, 1, 1, 1, 3, 1, 3, 2, + 2, 2, 0, 1, 2, 0, 1, 1, 2, 2, + 7, 5, 7, 7, 5, 9, 10, 7, 8, 2, + 2, 3, 3, 2, 2, 3, 3, 3, 3, 5, + 5, 3, 5, 1, 2, 0, 1, 4, 3, 3, + 3, 3, 3, 3, 3, 3, 4, 5, 2, 2, + 2, 8, 8, 1, 3, 0, 1, 0, 1, 1, + 1, 2, 1, 1, 0, 1, 0, 1, 2}; const int QmlJSGrammar::action_default [] = { - 0, 0, 0, 21, 0, 165, 232, 196, 204, 200, - 144, 216, 192, 3, 129, 62, 145, 208, 212, 133, - 162, 143, 148, 128, 182, 169, 0, 69, 70, 65, - 333, 58, 335, 0, 0, 0, 0, 67, 0, 0, - 63, 66, 0, 0, 59, 60, 68, 61, 0, 64, - 0, 0, 158, 0, 0, 145, 164, 147, 146, 0, - 0, 0, 160, 161, 159, 163, 0, 193, 0, 0, - 0, 0, 183, 0, 0, 0, 0, 0, 0, 173, - 0, 0, 0, 167, 168, 166, 171, 175, 174, 172, - 170, 185, 184, 186, 0, 201, 0, 197, 0, 0, - 139, 126, 138, 127, 95, 96, 97, 122, 98, 123, - 99, 100, 101, 102, 103, 104, 105, 106, 107, 108, - 109, 110, 111, 124, 112, 113, 114, 115, 116, 117, - 118, 119, 120, 121, 125, 0, 0, 137, 233, 140, - 0, 141, 0, 142, 136, 0, 229, 222, 220, 227, - 228, 226, 225, 231, 224, 223, 221, 230, 217, 0, - 205, 0, 0, 209, 0, 0, 213, 0, 0, 139, - 131, 0, 130, 0, 135, 149, 0, 334, 324, 325, - 0, 322, 0, 323, 0, 326, 240, 247, 246, 254, - 242, 0, 243, 327, 0, 332, 244, 245, 250, 248, - 329, 328, 331, 251, 0, 262, 0, 0, 0, 0, - 333, 58, 0, 335, 59, 234, 276, 60, 0, 0, - 0, 263, 0, 0, 252, 253, 0, 241, 249, 277, - 278, 321, 330, 0, 292, 293, 294, 295, 0, 288, - 289, 290, 291, 318, 319, 0, 0, 0, 0, 0, - 281, 282, 238, 236, 198, 206, 202, 218, 194, 239, - 0, 145, 210, 214, 187, 176, 0, 0, 195, 0, - 0, 0, 0, 188, 0, 0, 0, 0, 0, 180, - 178, 181, 179, 177, 190, 189, 191, 0, 203, 0, - 199, 0, 237, 145, 0, 219, 234, 235, 0, 234, - 0, 0, 284, 0, 0, 0, 286, 0, 207, 0, - 0, 211, 0, 0, 215, 274, 0, 266, 275, 269, - 0, 273, 0, 234, 267, 0, 234, 0, 0, 285, - 0, 0, 0, 287, 334, 324, 0, 0, 326, 0, - 320, 0, 310, 0, 0, 0, 280, 0, 279, 0, - 336, 0, 94, 256, 259, 0, 95, 262, 98, 123, - 100, 101, 65, 105, 106, 58, 107, 110, 63, 66, - 59, 234, 60, 68, 113, 61, 115, 64, 117, 118, - 263, 120, 121, 125, 0, 87, 0, 0, 89, 93, - 91, 77, 90, 92, 0, 88, 76, 257, 255, 133, - 134, 139, 0, 132, 0, 309, 0, 296, 297, 0, - 308, 0, 0, 0, 299, 304, 302, 305, 0, 0, - 303, 304, 0, 300, 0, 301, 258, 307, 0, 258, - 306, 0, 311, 312, 0, 258, 313, 314, 0, 0, - 315, 0, 0, 0, 316, 317, 151, 150, 0, 0, - 0, 283, 0, 0, 0, 298, 271, 264, 0, 272, - 268, 0, 270, 260, 0, 261, 265, 81, 0, 0, - 85, 71, 0, 73, 83, 0, 74, 84, 86, 75, - 82, 72, 0, 78, 155, 153, 157, 154, 152, 156, - 2, 5, 0, 7, 6, 0, 1, 79, 56, 57, + 0, 0, 0, 21, 0, 167, 234, 198, 206, 202, + 146, 218, 194, 3, 131, 64, 147, 210, 214, 135, + 164, 145, 150, 130, 184, 171, 0, 71, 72, 67, + 335, 60, 337, 0, 0, 0, 0, 69, 0, 0, + 65, 68, 0, 0, 61, 62, 70, 63, 0, 66, + 0, 0, 160, 0, 0, 147, 166, 149, 148, 0, + 0, 0, 162, 163, 161, 165, 0, 195, 0, 0, + 0, 0, 185, 0, 0, 0, 0, 0, 0, 175, + 0, 0, 0, 169, 170, 168, 173, 177, 176, 174, + 172, 187, 186, 188, 0, 203, 0, 199, 0, 0, + 141, 128, 140, 129, 97, 98, 99, 124, 100, 125, + 101, 102, 103, 104, 105, 106, 107, 108, 109, 110, + 111, 112, 113, 126, 114, 115, 116, 117, 118, 119, + 120, 121, 122, 123, 127, 0, 0, 139, 235, 142, + 0, 143, 0, 144, 138, 0, 231, 224, 222, 229, + 230, 228, 227, 233, 226, 225, 223, 232, 219, 0, + 207, 0, 0, 211, 0, 0, 215, 0, 0, 141, + 133, 0, 132, 0, 137, 151, 0, 336, 326, 327, + 0, 324, 0, 325, 0, 328, 242, 249, 248, 256, + 244, 0, 245, 329, 0, 334, 246, 247, 252, 250, + 331, 330, 333, 253, 0, 264, 0, 0, 0, 0, + 335, 60, 0, 337, 61, 236, 278, 62, 0, 0, + 0, 265, 0, 0, 254, 255, 0, 243, 251, 279, + 280, 323, 332, 0, 294, 295, 296, 297, 0, 290, + 291, 292, 293, 320, 321, 0, 0, 0, 0, 0, + 283, 284, 240, 238, 200, 208, 204, 220, 196, 241, + 0, 147, 212, 216, 189, 178, 0, 0, 197, 0, + 0, 0, 0, 190, 0, 0, 0, 0, 0, 182, + 180, 183, 181, 179, 192, 191, 193, 0, 205, 0, + 201, 0, 239, 147, 0, 221, 236, 237, 0, 236, + 0, 0, 286, 0, 0, 0, 288, 0, 209, 0, + 0, 213, 0, 0, 217, 276, 0, 268, 277, 271, + 0, 275, 0, 236, 269, 0, 236, 0, 0, 287, + 0, 0, 0, 289, 336, 326, 0, 0, 328, 0, + 322, 0, 312, 0, 0, 0, 282, 0, 281, 0, + 338, 0, 96, 258, 261, 0, 97, 264, 100, 125, + 102, 103, 67, 107, 108, 60, 109, 112, 65, 68, + 61, 236, 62, 70, 115, 63, 117, 66, 119, 120, + 265, 122, 123, 127, 0, 89, 0, 0, 91, 95, + 93, 79, 92, 94, 0, 90, 78, 259, 257, 135, + 136, 141, 0, 134, 0, 311, 0, 298, 299, 0, + 310, 0, 0, 0, 301, 306, 304, 307, 0, 0, + 305, 306, 0, 302, 0, 303, 260, 309, 0, 260, + 308, 0, 313, 314, 0, 260, 315, 316, 0, 0, + 317, 0, 0, 0, 318, 319, 153, 152, 0, 0, + 0, 285, 0, 0, 0, 300, 273, 266, 0, 274, + 270, 0, 272, 262, 0, 263, 267, 83, 0, 0, + 87, 73, 0, 75, 85, 0, 76, 86, 88, 77, + 84, 74, 0, 80, 157, 155, 159, 156, 154, 158, + 2, 5, 0, 7, 6, 0, 1, 81, 58, 59, 0, 0, 0, 9, 10, 0, 11, 12, 0, 13, - 0, 0, 14, 0, 19, 20, 80, 0, 15, 16, - 0, 17, 18, 8, 22, 0, 4, 0, 29, 54, - 0, 0, 59, 27, 60, 30, 23, 0, 0, 55, - 0, 39, 38, 37, 0, 0, 48, 0, 49, 0, - 52, 53, 0, 0, 0, 46, 0, 47, 0, 50, - 51, 45, 40, 41, 0, 0, 0, 0, 43, 44, - 42, 28, 24, 0, 33, 34, 0, 35, 36, 258, - 0, 32, 95, 262, 98, 123, 100, 101, 65, 105, - 106, 58, 107, 110, 63, 66, 59, 234, 60, 68, - 113, 61, 115, 64, 117, 118, 263, 120, 121, 125, - 62, 0, 25, 0, 31, 26, 337}; + 0, 0, 14, 0, 19, 20, 82, 0, 15, 16, + 0, 17, 18, 8, 22, 0, 4, 0, 29, 56, + 0, 0, 61, 27, 62, 30, 23, 0, 0, 57, + 0, 39, 38, 37, 0, 0, 50, 0, 51, 0, + 54, 55, 0, 0, 0, 48, 0, 49, 0, 52, + 53, 0, 46, 40, 47, 41, 0, 0, 0, 0, + 43, 0, 44, 45, 42, 28, 24, 0, 33, 34, + 0, 35, 36, 260, 0, 32, 97, 264, 100, 125, + 102, 103, 67, 107, 108, 60, 109, 112, 65, 68, + 61, 236, 62, 70, 115, 63, 117, 66, 119, 120, + 265, 122, 123, 127, 64, 0, 25, 0, 31, 26, + 339}; const int QmlJSGrammar::goto_default [] = { 4, 496, 353, 191, 495, 526, 491, 494, 493, 15, - 525, 535, 537, 536, 611, 528, 186, 190, 192, 196, - 553, 564, 563, 195, 227, 23, 469, 468, 351, 350, + 525, 535, 537, 536, 615, 528, 186, 190, 192, 196, + 553, 566, 565, 195, 227, 23, 469, 468, 351, 350, 6, 349, 352, 102, 19, 14, 140, 21, 10, 139, 16, 22, 52, 20, 5, 25, 24, 264, 12, 258, 7, 254, 9, 256, 8, 255, 17, 262, 18, 263, @@ -204,222 +205,221 @@ const int QmlJSGrammar::goto_default [] = { 201, 200, 0}; const int QmlJSGrammar::action_index [] = { - 208, 808, 1863, 61, 100, 76, -95, 95, 59, 54, - 261, -95, 405, 86, -95, -95, 641, 91, 67, 187, - 200, -95, -95, -95, 446, 206, 808, -95, -95, -95, - 188, -95, 1681, 1412, 808, 808, 808, -95, 724, 808, - -95, -95, 808, 808, -95, -95, -95, -95, 808, -95, - 808, 808, -95, 808, 808, 131, 212, -95, -95, 808, - 808, 808, -95, -95, -95, 157, 808, 405, 808, 808, - 808, 808, 471, 808, 808, 808, 808, 808, 808, 161, - 808, 808, 808, 112, 119, 117, 154, 178, 173, 234, - 233, 456, 549, 409, 808, 9, 808, 72, 1590, 808, - 808, -95, -95, -95, -95, -95, -95, -95, -95, -95, + 175, 862, 1917, -50, 39, 89, -95, 32, -14, -52, + 374, -95, 341, 21, -95, -95, 577, 42, 84, 198, + 250, -95, -95, -95, 473, 252, 862, -95, -95, -95, + 259, -95, 1735, 1208, 862, 862, 862, -95, 638, 862, + -95, -95, 862, 862, -95, -95, -95, -95, 862, -95, + 862, 862, -95, 862, 862, 93, 300, -95, -95, 862, + 862, 862, -95, -95, -95, 287, 862, 324, 862, 862, + 862, 862, 453, 862, 862, 862, 862, 862, 862, 307, + 862, 862, 862, 118, 102, 127, 308, 293, 326, 251, + 255, 463, 488, 508, 862, 23, 862, 82, 1644, 862, + 862, -95, -95, -95, -95, -95, -95, -95, -95, -95, -95, -95, -95, -95, -95, -95, -95, -95, -95, -95, -95, -95, -95, -95, -95, -95, -95, -95, -95, -95, - -95, -95, -95, -95, -95, 139, 808, -95, -95, 66, - 23, -95, 808, -95, -95, 808, -95, -95, -95, -95, - -95, -95, -95, -95, -95, -95, -95, -95, -95, 808, - 33, 808, 808, 69, 57, 808, -95, 1590, 808, 808, - -95, 126, -95, 8, -95, -95, 29, -95, 186, 62, - 60, -95, 207, -95, 36, 1954, -95, -95, -95, -95, - -95, 205, -95, -95, 35, -95, -95, -95, -95, -95, - -95, 1954, -95, -95, 386, -95, 398, 77, 1863, 50, - 162, 78, 42, 2136, 73, 808, -95, 85, 48, 808, - 56, -95, 43, 39, -95, -95, 328, -95, -95, -95, - -95, -95, -95, 75, -95, -95, -95, -95, 84, -95, - -95, -95, -95, -95, -95, 38, 55, 808, 102, 79, - -95, -95, 892, -95, 175, 47, 34, -95, 324, 74, - 16, 551, 65, 68, 477, 278, 328, 808, 292, 808, - 808, 808, 808, 402, 808, 808, 808, 808, 808, 302, - 306, 303, 282, 307, 385, 477, 477, 808, -2, 808, - 71, 808, -95, 641, 808, -95, 808, 58, 63, 808, - 51, 1863, -95, 808, 147, 1863, -95, 808, 14, 808, - 808, 96, 92, 808, -95, 80, 105, 70, -95, -95, - 808, -95, 255, 808, -95, -58, 808, -39, 1863, -95, - 808, 120, 1863, -95, -20, 259, -47, -21, 1954, -36, - -95, 1863, -95, 808, 101, 1863, 11, 1863, -95, 15, - 3, -45, -95, -95, 1863, -54, 401, 2, 337, 116, - 808, 1863, 0, -32, 318, -1, -28, 724, 81, -5, - -95, 980, -95, 45, 19, 46, 808, 44, 17, 808, - 41, 808, 13, -8, 808, -95, 1772, 49, -95, -95, - -95, -95, -95, -95, 808, -95, -95, -95, -95, 272, - -95, 808, -13, -95, 1863, -95, 64, -95, -95, 1863, - -95, 808, 98, 4, -95, 25, -95, 31, 93, 808, - -95, 40, 37, -95, -12, -95, 1863, -95, 123, 1863, - -95, 288, -95, -95, 109, 1863, 20, -95, -4, 1, - -95, 328, -14, 21, -95, -95, -95, -95, 808, 115, - 1863, -95, 808, 125, 1863, -95, 12, -95, 185, -95, - -95, 808, -95, -95, 252, -95, -95, -95, 97, 1154, - -95, -95, 1067, -95, -95, 1241, -95, -95, -95, -95, - -95, -95, 94, -95, -95, -95, -95, -95, -95, -95, - -95, -95, 407, -95, -73, 376, -95, -95, -95, -95, - 179, 321, 198, -95, -95, 110, -95, -95, 227, -95, - 248, 228, -95, 89, -95, -95, -95, 219, -95, -95, - 103, -95, -95, -95, -95, 127, -95, 475, -95, -95, - -46, 168, 165, -95, -6, -95, -95, 500, 189, -95, - 158, -95, -95, -95, 32, 176, -95, 808, -95, 262, - -95, -95, 6, 10, 128, -95, 808, -95, 148, -95, - -95, 5, 145, 30, -3, 213, 177, 216, -95, -95, - -95, -95, -95, 1325, -95, -95, 327, -95, -95, 2045, - 1499, -95, 345, 26, 330, 82, 808, 1863, 28, 22, - 310, 52, 27, 584, 81, 53, -95, 980, -95, 24, - -31, -7, 808, 7, -9, 808, 18, 808, -10, -19, - -15, 111, -95, 334, -95, -95, -95, + -95, -95, -95, -95, -95, 119, 862, -95, -95, 88, + 63, -95, 862, -95, -95, 862, -95, -95, -95, -95, + -95, -95, -95, -95, -95, -95, -95, -95, -95, 862, + 3, 862, 862, 28, 24, 862, -95, 1644, 862, 862, + -95, 131, -95, -41, -95, -95, -25, -95, 208, -5, + -11, -95, 202, -95, 61, 2008, -95, -95, -95, -95, + -95, 222, -95, -95, 65, -95, -95, -95, -95, -95, + -95, 2008, -95, -95, 376, -95, 405, 75, 1917, 56, + 274, 79, 54, 2190, 71, 862, -95, 74, 49, 862, + 51, -95, 43, 67, -95, -95, 281, -95, -95, -95, + -95, -95, -95, 90, -95, -95, -95, -95, 83, -95, + -95, -95, -95, -95, -95, 35, 55, 862, 94, 70, + -95, -95, 946, -95, 76, 34, -10, -95, 336, 59, + 10, 695, 73, 138, 356, 277, 262, 862, 178, 862, + 862, 862, 862, 446, 862, 862, 862, 862, 862, 267, + 273, 292, 270, 311, 446, 518, 446, 862, 19, 862, + 72, 862, -95, 543, 862, -95, 862, 58, 69, 862, + 68, 1917, -95, 862, 116, 1917, -95, 862, 57, 862, + 862, 96, 92, 862, -95, 78, 98, 62, -95, -95, + 862, -95, 256, 862, -95, 64, 862, 9, 1917, -95, + 862, 101, 1917, -95, -36, 220, -53, -13, 2008, -33, + -95, 1917, -95, 862, 100, 1917, -2, 1917, -95, 6, + 1, -40, -95, -95, 1917, -45, 390, 52, 388, 122, + 862, 1917, -6, -34, 337, -1, -28, 778, 18, 45, + -95, 1034, -95, 46, 14, 17, 862, 40, 15, 862, + 48, 862, 26, 29, 862, -95, 1826, 140, -95, -95, + -95, -95, -95, -95, 862, -95, -95, -95, -95, 322, + -95, 862, -32, -95, 1917, -95, 95, -95, -95, 1917, + -95, 862, 106, 8, -95, 38, -95, 37, 107, 862, + -95, 31, 33, -95, -18, -95, 1917, -95, 105, 1917, + -95, 181, -95, -95, 113, 1917, 7, -95, -4, 12, + -95, 162, 4, 13, -95, -95, -95, -95, 862, 133, + 1917, -95, 862, 135, 1917, -95, 0, -95, 196, -95, + -95, 862, -95, -95, 206, -95, -95, -95, 108, 1121, + -95, -95, 1379, -95, -95, 1466, -95, -95, -95, -95, + -95, -95, 114, -95, -95, -95, -95, -95, -95, -95, + -95, -95, 450, -95, -12, 361, -95, -95, -95, -95, + 159, 350, 197, -95, -95, 111, -95, -95, 180, -95, + 150, 149, -95, 124, -95, -95, -95, 189, -95, -95, + 109, -95, -95, -95, -95, 85, -95, 603, -95, -95, + 44, 136, 165, -95, 27, -95, -95, 492, 294, -95, + 185, -95, -95, -95, 60, 183, -95, 862, -95, 190, + -95, -95, 36, 41, 192, -95, 862, -95, 199, -95, + -95, 179, -95, 148, -95, 66, 20, 134, 151, 139, + -95, 120, -95, -95, -95, -95, -95, 1292, -95, -95, + 306, -95, -95, 2099, 1553, -95, 397, 81, 333, 87, + 862, 1917, 80, -15, 347, 11, -20, 778, 5, 16, + -95, 1034, -95, -3, -31, 47, 862, 53, 30, 862, + 50, 862, 25, 22, 2, 99, -95, 363, -95, -95, + -95, - -103, 37, 13, -103, -103, -103, -103, -103, -103, -103, - -103, -103, -103, -103, -103, -103, -55, -103, -103, -103, - -103, -103, -103, -103, -103, -103, 89, -103, -103, -103, - 24, -103, -103, 6, 15, 92, 100, -103, 154, 66, - -103, -103, 86, 143, -103, -103, -103, -103, 152, -103, - 144, 140, -103, 134, 135, -103, -103, -103, -103, 161, - 170, 176, -103, -103, -103, -103, 174, -103, 169, 153, - 162, 167, -103, 128, 126, 112, 116, 119, 113, -103, - 111, 104, 110, -103, -103, -103, -103, -103, -103, -103, - -103, -103, -103, -103, 63, -103, 120, -103, 88, 77, - 57, -103, -103, -103, -103, -103, -103, -103, -103, -103, + -103, 0, 3, -103, -103, -103, -103, -103, -103, -103, + -103, -103, -103, -103, -103, -103, -44, -103, -103, -103, + -103, -103, -103, -103, -103, -103, 44, -103, -103, -103, + 20, -103, -103, -16, 13, 110, 121, -103, 165, 156, + -103, -103, 167, 155, -103, -103, -103, -103, 170, -103, + 171, 211, -103, 126, 125, -103, -103, -103, -103, 130, + 136, 142, -103, -103, -103, -103, 131, -103, 134, 137, + 141, 145, -103, 113, 115, 119, 117, 161, 149, -103, + 160, 83, 45, -103, -103, -103, -103, -103, -103, -103, + -103, -103, -103, -103, 91, -103, 80, -103, 106, 5, + 51, -103, -103, -103, -103, -103, -103, -103, -103, -103, -103, -103, -103, -103, -103, -103, -103, -103, -103, -103, -103, -103, -103, -103, -103, -103, -103, -103, -103, -103, - -103, -103, -103, -103, -103, -103, 28, -103, -103, -103, - -103, -103, 31, -103, -103, 36, -103, -103, -103, -103, - -103, -103, -103, -103, -103, -103, -103, -103, -103, 157, - -103, 125, -24, -103, -103, -14, -103, 210, 27, 160, - -103, -103, -103, -103, -103, -103, -103, -103, 8, -103, - -103, -103, -5, -103, -103, 74, -103, -103, -103, -103, + -103, -103, -103, -103, -103, -103, 23, -103, -103, -103, + -103, -103, 27, -103, -103, 36, -103, -103, -103, -103, + -103, -103, -103, -103, -103, -103, -103, -103, -103, 94, + -103, 86, 41, -103, -103, 37, -103, 196, 57, 73, + -103, -103, -103, -103, -103, -103, -103, -103, 54, -103, + -103, -103, 50, -103, -103, 70, -103, -103, -103, -103, -103, -103, -103, -103, -103, -103, -103, -103, -103, -103, - -103, 94, -103, -103, 44, -103, 35, -103, 81, -103, - 61, -103, -103, -103, -103, 75, -103, -103, -103, 4, - -7, -103, -103, -103, -103, -103, 26, -103, -103, -103, + -103, 114, -103, -103, 34, -103, 26, -103, 81, -103, + 67, -103, -103, -103, -103, 79, -103, -103, -103, 4, + -10, -103, -103, -103, -103, -103, -5, -103, -103, -103, -103, -103, -103, -103, -103, -103, -103, -103, -103, -103, - -103, -103, -103, -103, -103, -103, -103, 68, -103, -103, - -103, -103, 90, -103, -103, -103, -103, -103, -103, -103, - -103, -103, -103, -103, -103, -103, 70, 220, -103, 208, - 231, 230, 234, -103, 101, 82, 60, 76, 79, -103, - -103, -103, -103, -103, -103, -103, -103, 211, -103, 194, - -103, 192, -103, -103, 204, -103, 166, -103, -103, 197, - -103, 23, -103, -1, -103, 9, -103, 180, -103, 181, - 223, -103, -103, 227, -103, -103, -103, -103, -103, -103, - 184, -103, 93, 98, -103, -103, 108, -103, 83, -103, - 78, -103, 40, -103, -103, 109, -103, -103, 102, -103, - -103, 41, -103, 43, -103, 52, -103, 62, -103, -103, - -103, -103, -103, -103, 55, -103, 50, -103, 51, -103, - 107, 49, -103, -103, 73, -103, -103, 154, -103, -103, - -103, 64, -103, -103, -103, -103, 16, -103, 12, 147, - -103, 103, -103, -103, -4, -103, 0, -103, -103, -103, - -103, -103, -103, -103, 7, -103, -103, -103, -103, -103, - -103, 187, -103, -103, 25, -103, -103, -103, -103, 71, - -103, 65, -103, -103, -103, -103, -103, -44, -103, 46, - -103, -34, -103, -103, -103, -103, -21, -103, -103, -45, - -103, -103, -103, -103, -103, -103, -32, -103, -103, 53, - -103, 56, -103, 47, -103, -103, -103, -103, 42, -103, - 45, -103, 38, -103, 48, -103, -103, -103, -103, -103, - -103, 22, -103, -103, 124, -103, -103, -103, -103, 59, - -103, -103, 137, -103, -103, 54, -103, -103, -103, -103, + -103, -103, -103, -103, -103, -103, -103, 19, -103, -103, + -103, -103, 66, -103, -103, -103, -103, -103, -103, -103, + -103, -103, -103, -103, -103, -103, 18, 209, -103, 210, + 274, 228, 219, -103, 99, 101, 109, 95, 88, -103, + -103, -103, -103, -103, -103, -103, -103, 180, -103, 192, + -103, 194, -103, -103, 200, -103, 111, -103, -103, 129, + -103, 9, -103, 25, -103, 7, -103, 181, -103, 178, + 182, -103, -103, 207, -103, -103, -103, -103, -103, -103, + 201, -103, 120, 92, -103, -103, 87, -103, 76, -103, + 77, -103, 75, -103, -103, 78, -103, -103, 135, -103, + -103, 42, -103, 43, -103, 46, -103, 52, -103, -103, + -103, -103, -103, -103, 32, -103, 30, -103, 33, -103, + 68, 53, -103, -103, 56, -103, -103, 65, -103, -103, + -103, 71, -103, -103, -103, -103, 55, -103, 40, 177, + -103, 211, -103, -103, 39, -103, 2, -103, -103, -103, + -103, -103, -103, -103, 38, -103, -103, -103, -103, -103, + -103, 89, -103, -103, 59, -103, -103, -103, -103, 60, + -103, 72, -103, -103, -103, -103, -103, -22, -103, 61, + -103, -38, -103, -103, -103, -103, -32, -103, -103, -40, + -103, -103, -103, -103, -103, -103, -58, -103, -103, 24, + -103, 64, -103, 31, -103, -103, -103, -103, 35, -103, + 48, -103, 49, -103, 47, -103, -103, -103, -103, -103, + -103, 63, -103, -103, 127, -103, -103, -103, -103, 58, + -103, -103, 74, -103, -103, 62, -103, -103, -103, -103, -103, -103, -103, -103, -103, -103, -103, -103, -103, -103, - -103, -103, 248, -103, -3, 114, -103, -103, -103, -103, - -103, -103, 5, -103, -103, -103, -103, -103, -8, -103, - 85, -103, -103, -103, -103, -103, -103, 11, -103, -103, - -103, -103, -103, -103, -103, -103, -103, 342, -103, -103, - -103, 29, -103, -103, -103, -103, -103, 273, -103, -103, - 3, -103, -103, -103, -103, -103, -103, 18, -103, -103, - -103, -103, -103, -103, -103, -103, 21, -103, -103, -103, - -103, -103, 2, -103, -103, 20, 14, 30, -103, -103, - -103, -103, -103, 284, -103, -103, -2, -103, -103, -103, - 222, -103, -9, -103, -6, -103, 96, 10, -103, -103, - 1, -103, -103, 80, -103, -103, -103, 72, -103, -103, - -103, -103, 69, -103, 58, 67, -103, 97, -103, -103, - -103, -103, -103, 84, -103, -103, -103}; + -103, -103, 103, -103, -7, 96, -103, -103, -103, -103, + -103, -103, 1, -103, -103, -103, -103, -103, -9, -103, + 85, -103, -103, -103, -103, -103, -103, 6, -103, -103, + -103, -103, -103, -103, -103, -103, -103, 261, -103, -103, + -103, 16, -103, -103, -103, -103, -103, 267, -103, -103, + 21, -103, -103, -103, -103, -103, -103, 17, -103, -103, + -103, -103, -103, -103, -103, -103, 10, -103, -103, -103, + -103, -103, -103, -8, -103, -103, -103, 12, -2, 14, + -103, -103, -103, -103, -103, -103, -103, 374, -103, -103, + 11, -103, -103, -103, 256, -103, 8, -103, 15, -103, + 105, 28, -103, -103, 22, -103, -103, 84, -103, -103, + -103, 29, -103, -103, -103, -103, -1, -103, -10, 148, + -103, 82, -103, -103, -103, -103, -103, 205, -103, -103, + -103}; const int QmlJSGrammar::action_info [] = { - -114, 398, -93, 326, 252, 411, -89, -103, 343, -122, - 396, 386, 338, 337, -116, 492, 335, 452, -79, 340, - 540, 328, 384, 561, 435, -119, 448, 347, 452, 461, - 419, -92, 441, -122, 435, -103, 419, 415, 566, 554, - 439, 562, 335, 425, 426, 419, 443, 403, -119, 448, - 435, -116, -92, -114, 435, 411, 394, 569, 252, -89, - -93, 545, 287, 343, 165, 178, 136, 307, 174, 185, - 182, 159, 267, 66, 142, 452, 289, 296, 343, 448, - 404, 94, 291, 144, 411, 341, 252, 96, -111, 435, - 231, 247, 409, 159, 136, 287, 66, 320, 307, 313, - 616, 330, 136, 422, 0, 472, 136, 94, 0, 136, - 136, 301, 289, 322, 246, 438, 53, 161, 309, 613, - 184, 162, 310, 136, 299, 408, 407, 54, 136, 439, - 429, 136, 96, 136, 136, 556, 237, 236, 244, 243, - 251, 250, 510, 244, 243, 242, 241, 136, 423, 492, - 515, 514, 53, 473, 483, 136, 136, 53, 413, 53, - 527, 345, 249, 54, 522, 521, 323, 614, 54, 59, - 54, 507, 506, 57, 541, 450, 267, 244, 243, 80, - 332, 81, 172, 547, 58, 454, 80, 541, 81, 557, - 555, 31, 82, 464, 541, 137, 573, 31, 80, 82, - 81, 0, 167, 80, 510, 81, 541, 305, 0, 560, - 559, 82, 59, 136, 60, 31, 82, 31, 0, 543, - 61, 168, 527, 169, 59, 0, 0, 31, 44, 45, - 542, 80, 543, 81, 44, 45, 31, 548, 546, 543, - 504, 503, 31, 542, 82, 31, 465, 463, 31, 0, - 542, 543, 44, 45, 44, 45, 31, 60, 80, 80, - 81, 81, 542, 61, 44, 45, 230, 229, 502, 60, - 136, 82, 82, 44, 45, 61, 98, 31, 0, 44, - 45, 31, 44, 45, 31, 44, 45, 167, 31, 519, - 518, 0, 0, 44, 45, 99, 136, 100, 3, 2, - 1, 0, 0, 80, 0, 81, 168, 80, 401, 81, - 269, 270, 0, 0, 44, 45, 82, 517, 44, 45, - 82, 44, 45, 551, 550, 44, 45, 80, 80, 81, - 81, 80, 80, 81, 81, 136, 510, 271, 272, 31, - 82, 82, 269, 270, 82, 82, -333, 31, 0, 433, - 432, 0, 0, 0, -333, 0, 0, 31, 0, 31, - 527, 0, 0, 31, 0, 0, 31, 0, 511, 271, - 272, 0, 0, 0, 31, 0, 44, 45, 0, 0, - 0, 0, 512, 509, 44, 45, 0, 0, 230, 229, - 0, 240, 239, 499, 44, 45, 44, 45, 240, 239, - 44, 45, 0, 44, 45, 31, 235, 234, 274, 275, - 508, 44, 45, 0, 0, 31, 0, 276, 0, 498, - 277, 0, 278, 68, 69, 274, 275, 31, 0, 0, - 31, 0, 73, 74, 276, 499, 31, 277, 0, 278, - 75, 76, 44, 45, 77, 0, 78, 235, 234, 0, - 70, 71, 44, 45, 0, 0, 0, 0, 0, 240, - 239, 498, 235, 234, 44, 45, 499, 44, 45, 73, - 74, 0, 500, 44, 45, 0, 0, 75, 76, 73, - 74, 77, 0, 78, 0, 530, 0, 75, 76, 0, - 0, 77, 498, 78, 73, 74, 0, 531, 0, 0, - 274, 275, 75, 76, 31, 0, 77, 0, 78, 276, - 530, 0, 277, 0, 278, 0, 0, 0, 0, 0, - 0, 0, 531, 0, 0, 0, 0, 0, 0, 31, - 533, 0, 0, 0, 499, 0, 0, 0, 0, 0, - 0, 532, 534, 0, 0, 0, 0, 0, 0, 221, - 0, 0, 0, 0, 146, 571, 0, 0, 205, 499, - 498, 0, 0, 0, 147, 0, 532, 534, 148, 0, - 0, 0, 73, 74, 221, 0, 0, 149, 0, 150, - 75, 76, 303, 205, 77, 498, 78, 0, 0, 0, - 151, 0, 152, 57, 0, 0, 27, 28, 0, 0, - 153, 0, 0, 154, 58, 0, 30, 0, 0, 155, - 0, 0, 0, 31, 0, 156, 0, 32, 33, 0, - 34, 0, 0, 0, 0, 0, 0, 38, 0, 0, - 157, 41, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 146, 0, 0, 0, 0, 46, - 44, 45, 0, 47, 147, 0, 0, 0, 148, 0, - 0, 0, 0, 0, 40, 49, 29, 149, 0, 150, - 37, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 151, 0, 152, 57, 0, 0, 0, 0, 0, 0, - 153, 0, 0, 154, 58, 0, 0, 0, 0, 155, - 0, 0, 0, 0, 0, 156, 0, 0, 0, 0, + 335, -105, 252, 182, -94, 411, -91, 337, 343, 386, + 398, 178, -113, 384, 347, 396, 343, 461, -91, 174, + 338, 252, 340, -95, -116, -113, 96, 439, 403, 136, + 159, 165, 441, 66, 94, -81, 419, 425, 492, 620, + 426, 415, 419, 419, 159, 435, 435, -118, 435, 184, + 411, 94, -95, -94, -116, -121, 561, -121, 452, -124, + -118, 448, 448, 435, 443, 452, 136, 291, 289, 328, + 554, 296, 335, 267, 568, 307, 492, 267, 404, 448, + 571, 409, 287, 66, 435, 411, 341, -105, -124, 545, + 343, 247, 252, 330, 185, 320, 142, 289, 307, 313, + 510, 96, 136, 452, 0, 287, 322, 617, 136, 136, + 540, 246, 429, 136, 136, 0, 472, 422, 527, 438, + 231, 0, 136, 144, 136, 326, 0, 136, 301, 53, + 299, 251, 250, 439, 161, 57, 244, 243, 162, 136, + 54, 136, 53, 136, 242, 241, 58, 394, 244, 243, + 0, 237, 236, 54, 249, 618, 408, 407, 53, 323, + 345, 332, 423, 31, 473, 31, 413, 53, 31, 54, + 522, 521, 507, 506, 483, 137, 305, 541, 54, 31, + 541, 573, 572, 244, 243, 515, 514, 172, 309, 136, + 547, 31, 310, 450, 541, 454, 269, 270, 136, 556, + 44, 45, 44, 45, 464, 44, 45, 136, 0, 31, + 519, 518, 0, 167, 541, 563, 44, 45, 31, 0, + 504, 503, 543, 271, 272, 543, 31, 0, 44, 45, + 136, 31, 168, 542, 169, 31, 542, 31, 517, 543, + 564, 562, 433, 432, 548, 546, 44, 45, 502, 31, + 542, 551, 550, 557, 555, 44, 45, 465, 463, 543, + 560, 559, 59, 44, 45, 3, 2, 1, 44, 45, + 542, 0, 44, 45, 44, 45, 80, 80, 81, 81, + 80, 0, 81, 230, 229, 31, 44, 45, 31, 82, + 82, 31, 80, 82, 81, 80, 0, 81, 80, 59, + 81, 577, 80, 31, 81, 82, 0, 60, 82, 510, + 31, 82, 59, 61, 136, 82, 0, 80, 80, 81, + 81, 0, 44, 45, 0, 44, 45, 527, 44, 45, + 82, 82, 80, 80, 81, 81, 80, 167, 81, 527, + 44, 45, 68, 69, 60, 82, 82, 44, 45, 82, + 61, 80, 0, 81, 269, 270, 168, 60, 401, 68, + 69, 0, 31, 61, 82, 510, 31, 230, 229, 70, + 71, 0, 0, -335, 0, 0, 31, 0, 0, 274, + 275, 271, 272, -335, 0, 0, 70, 71, 276, 98, + 31, 277, 31, 278, 240, 239, 0, 511, 0, 44, + 45, 0, 0, 44, 45, 31, 0, 0, 99, 0, + 100, 512, 509, 44, 45, 0, 0, 31, 0, 31, + 499, 0, 499, 0, 0, 0, 31, 44, 45, 44, + 45, 0, 0, 0, 31, 0, 0, 235, 234, 508, + 0, 0, 44, 45, 0, 0, 498, 0, 498, 240, + 239, 235, 234, 0, 44, 45, 44, 45, 235, 234, + 0, 0, 0, 44, 45, 0, 240, 239, 0, 274, + 275, 44, 45, 0, 0, 0, 73, 74, 276, 31, + 0, 277, 0, 278, 75, 76, 73, 74, 77, 0, + 78, 0, 0, 0, 75, 76, 73, 74, 77, 0, + 78, 0, 530, 0, 75, 76, 0, 0, 77, 499, + 78, 73, 74, 0, 531, 500, 44, 45, 0, 75, + 76, 31, 0, 77, 0, 78, 0, 0, 0, 0, + 0, 73, 74, 0, 0, 498, 0, 0, 0, 75, + 76, 274, 275, 77, 0, 78, 146, 575, 0, 0, + 276, 499, 0, 277, 0, 278, 147, 0, 532, 534, + 148, 0, 0, 0, 0, 0, 221, 0, 0, 149, + 0, 150, 0, 0, 0, 205, 0, 498, 0, 0, + 146, 0, 151, 0, 152, 57, 0, 0, 0, 0, + 147, 0, 153, 0, 148, 154, 58, 0, 0, 0, + 0, 155, 0, 149, 0, 150, 0, 156, 0, 0, + 0, 0, 0, 530, 0, 0, 151, 0, 152, 57, + 0, 0, 157, 0, 0, 531, 153, 0, 0, 154, + 58, 0, 31, 0, 0, 155, 0, 0, 0, 0, + 0, 156, 0, 0, 0, 0, 0, 0, 0, 0, + 27, 28, 0, 0, 0, 0, 157, 0, 533, 0, + 30, 0, 499, 0, 0, 0, 0, 31, 0, 532, + 534, 32, 33, 0, 34, 0, 0, 221, 0, 0, + 0, 38, 0, 0, 0, 41, 205, 0, 498, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 146, 0, + 0, 0, 0, 46, 44, 45, 0, 47, 147, 0, + 0, 0, 148, 0, 0, 0, 0, 0, 40, 49, + 29, 149, 0, 150, 37, 0, 303, 0, 0, 0, + 0, 0, 0, 0, 151, 0, 152, 57, 0, 0, + 0, 0, 0, 0, 153, 0, 0, 154, 58, 0, + 0, 0, 0, 155, 0, 0, 0, 0, 0, 156, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 157, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 157, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 27, 28, 0, 0, - 0, 0, 0, 0, 0, 0, 30, 0, 0, 0, - 0, 0, 0, 31, 0, 0, 0, 32, 33, 0, - 34, 0, 0, 0, 0, 0, 0, 38, 0, 0, - 0, 41, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 46, - 44, 45, 0, 47, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 40, 49, 29, 0, 0, 0, - 37, 0, 0, 0, 0, 0, 0, 0, 0, 26, 27, 28, 0, 0, 0, 0, 0, 0, 0, 0, 30, 0, 0, 0, 0, 0, 0, 31, 0, 0, - 0, 32, 33, 0, 34, 0, 0, 0, 35, 0, - 36, 38, 39, 0, 0, 41, 0, 0, 0, 42, - 0, 43, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 46, 44, 45, 0, 47, 0, 48, - 0, 50, 0, 51, 0, 0, 0, 0, 40, 49, + 0, 32, 33, 0, 34, 0, 0, 0, 0, 0, + 0, 38, 0, 0, 0, 41, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 46, 44, 45, 0, 47, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 40, 49, 29, 0, 0, 0, 37, 0, 0, 0, 0, 0, 0, 0, 0, 26, 27, 28, 0, 0, 0, 0, 0, 0, 0, 0, 30, 0, 0, 0, 0, 0, @@ -427,32 +427,23 @@ const int QmlJSGrammar::action_info [] = { 0, 0, 35, 0, 36, 38, 39, 0, 0, 41, 0, 0, 0, 42, 0, 43, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 46, 44, 45, - 0, 47, 0, 48, 0, 50, 266, 51, 0, 0, + 0, 47, 0, 48, 0, 50, 0, 51, 0, 0, 0, 0, 40, 49, 29, 0, 0, 0, 37, 0, - 0, 0, 0, 0, 0, 0, 0, -112, 0, 0, - 0, 26, 27, 28, 0, 0, 0, 0, 0, 0, - 0, 0, 30, 0, 0, 0, 0, 0, 0, 31, - 0, 0, 0, 32, 33, 0, 34, 0, 0, 0, - 35, 0, 36, 38, 39, 0, 0, 41, 0, 0, - 0, 42, 0, 43, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 46, 44, 45, 0, 47, - 0, 48, 0, 50, 0, 51, 0, 0, 0, 0, - 40, 49, 29, 0, 0, 0, 37, 0, 0, 0, - 0, 0, 0, 0, 0, 470, 0, 0, 26, 27, - 28, 0, 0, 0, 0, 0, 0, 0, 0, 30, - 0, 0, 0, 0, 0, 0, 31, 0, 0, 0, - 32, 33, 0, 34, 0, 0, 0, 35, 0, 36, - 38, 39, 0, 0, 41, 0, 0, 0, 42, 0, - 43, 0, 0, 476, 0, 0, 0, 0, 0, 0, - 0, 0, 46, 44, 45, 0, 47, 0, 48, 0, - 50, 0, 51, 0, 0, 0, 0, 40, 49, 29, - 0, 0, 0, 37, 0, 0, 0, 0, 0, 0, - 0, 0, 478, 0, 0, 26, 27, 28, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 26, 27, 28, + 0, 0, 0, 0, 0, 0, 0, 0, 30, 0, + 0, 0, 0, 0, 0, 31, 0, 0, 0, 32, + 33, 0, 34, 0, 0, 0, 35, 0, 36, 38, + 39, 0, 0, 41, 0, 0, 0, 42, 0, 43, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 46, 44, 45, 0, 47, 0, 48, 0, 50, + 266, 51, 0, 0, 0, 0, 40, 49, 29, 0, + 0, 0, 37, 0, 0, 0, 0, 0, 0, 0, + 0, -114, 0, 0, 0, 26, 27, 28, 0, 0, 0, 0, 0, 0, 0, 0, 30, 0, 0, 0, 0, 0, 0, 31, 0, 0, 0, 32, 33, 0, 34, 0, 0, 0, 35, 0, 36, 38, 39, 0, 0, 41, 0, 0, 0, 42, 0, 43, 0, 0, - 481, 0, 0, 0, 0, 0, 0, 0, 0, 46, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 46, 44, 45, 0, 47, 0, 48, 0, 50, 0, 51, 0, 0, 0, 0, 40, 49, 29, 0, 0, 0, 37, 0, 0, 0, 0, 0, 0, 0, 0, 478, @@ -460,25 +451,25 @@ const int QmlJSGrammar::action_info [] = { 0, 0, 0, 30, 0, 0, 0, 0, 0, 0, 31, 0, 0, 0, 32, 33, 0, 34, 0, 0, 0, 35, 0, 36, 38, 39, 0, 0, 41, 0, - 0, 0, 42, 0, 43, 0, 0, 479, 0, 0, + 0, 0, 42, 0, 43, 0, 0, 481, 0, 0, 0, 0, 0, 0, 0, 0, 46, 44, 45, 0, 47, 0, 48, 0, 50, 0, 51, 0, 0, 0, 0, 40, 49, 29, 0, 0, 0, 37, 0, 0, - 0, 0, 0, 0, 0, 0, 26, 27, 28, 0, - 0, 0, 0, 0, 0, 0, 0, 30, 0, 0, - 0, 0, 0, 0, 31, 212, 0, 0, 579, 580, - 0, 34, 0, 0, 0, 35, 0, 36, 38, 39, - 0, 0, 41, 0, 0, 0, 42, 0, 43, 0, - 0, 0, 0, 0, 0, 0, 216, 0, 0, 0, - 46, 44, 45, 0, 47, 0, 48, 0, 50, 0, - 51, 0, 0, 0, 0, 40, 49, 29, 0, 0, - 0, 37, 0, 0, 0, 0, 0, 0, 0, 0, - 470, 0, 0, 26, 27, 28, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 470, 0, 0, 26, + 27, 28, 0, 0, 0, 0, 0, 0, 0, 0, + 30, 0, 0, 0, 0, 0, 0, 31, 0, 0, + 0, 32, 33, 0, 34, 0, 0, 0, 35, 0, + 36, 38, 39, 0, 0, 41, 0, 0, 0, 42, + 0, 43, 0, 0, 471, 0, 0, 0, 0, 0, + 0, 0, 0, 46, 44, 45, 0, 47, 0, 48, + 0, 50, 0, 51, 0, 0, 0, 0, 40, 49, + 29, 0, 0, 0, 37, 0, 0, 0, 0, 0, + 0, 0, 0, 26, 27, 28, 0, 0, 0, 0, 0, 0, 0, 0, 30, 0, 0, 0, 0, 0, - 0, 31, 0, 0, 0, 32, 33, 0, 34, 0, + 0, 31, 212, 0, 0, 583, 584, 0, 34, 0, 0, 0, 35, 0, 36, 38, 39, 0, 0, 41, - 0, 0, 0, 42, 0, 43, 0, 0, 471, 0, - 0, 0, 0, 0, 0, 0, 0, 46, 44, 45, + 0, 0, 0, 42, 0, 43, 0, 0, 0, 0, + 0, 0, 0, 216, 0, 0, 0, 46, 44, 45, 0, 47, 0, 48, 0, 50, 0, 51, 0, 0, 0, 0, 40, 49, 29, 0, 0, 0, 37, 0, 0, 0, 0, 0, 0, 0, 0, 470, 0, 0, @@ -486,212 +477,229 @@ const int QmlJSGrammar::action_info [] = { 0, 30, 0, 0, 0, 0, 0, 0, 31, 0, 0, 0, 32, 33, 0, 34, 0, 0, 0, 35, 0, 36, 38, 39, 0, 0, 41, 0, 0, 0, - 42, 0, 43, 0, 0, 471, 0, 0, 499, 0, + 42, 0, 43, 0, 0, 476, 0, 0, 0, 0, 0, 0, 0, 0, 46, 44, 45, 0, 47, 0, 48, 0, 50, 0, 51, 0, 0, 0, 0, 40, - 49, 29, 0, 0, 498, 37, 0, 0, 0, 0, - 0, 0, 0, 0, 104, 105, 106, 0, 0, 108, - 110, 111, 0, 0, 112, 0, 113, 0, 0, 0, - 115, 116, 117, 0, 0, 0, 0, 0, 0, 31, - 118, 119, 120, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 121, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 124, - 0, 0, 0, 0, 0, 0, 44, 45, 125, 126, - 127, 0, 129, 130, 131, 132, 133, 134, 0, 0, - 122, 128, 114, 107, 109, 123, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 104, 105, 106, 0, 0, - 108, 110, 111, 0, 0, 112, 0, 113, 0, 0, - 0, 115, 116, 117, 0, 0, 0, 0, 0, 0, - 388, 118, 119, 120, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 121, 0, 0, 0, 389, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 124, 0, 0, 0, 0, 0, 393, 390, 392, 125, - 126, 127, 0, 129, 130, 131, 132, 133, 134, 0, - 0, 122, 128, 114, 107, 109, 123, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 104, 105, 106, 0, - 0, 108, 110, 111, 0, 0, 112, 0, 113, 0, - 0, 0, 115, 116, 117, 0, 0, 0, 0, 0, - 0, 388, 118, 119, 120, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 121, 0, 0, 0, 389, - 0, 0, 0, 0, 0, 0, 0, 391, 0, 0, - 0, 124, 0, 0, 0, 0, 0, 393, 390, 392, - 125, 126, 127, 0, 129, 130, 131, 132, 133, 134, - 0, 0, 122, 128, 114, 107, 109, 123, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 204, 0, 0, - 0, 0, 206, 0, 26, 27, 28, 208, 0, 0, - 0, 0, 0, 0, 209, 30, 0, 0, 0, 0, - 0, 0, 211, 212, 0, 0, 213, 33, 0, 34, + 49, 29, 0, 0, 0, 37, 0, 0, 0, 0, + 0, 0, 0, 0, 478, 0, 0, 26, 27, 28, + 0, 0, 0, 0, 0, 0, 0, 0, 30, 0, + 0, 0, 0, 0, 0, 31, 0, 0, 0, 32, + 33, 0, 34, 0, 0, 0, 35, 0, 36, 38, + 39, 0, 0, 41, 0, 0, 0, 42, 0, 43, + 0, 0, 479, 0, 0, 0, 0, 0, 0, 0, + 0, 46, 44, 45, 0, 47, 0, 48, 0, 50, + 0, 51, 0, 0, 0, 0, 40, 49, 29, 0, + 0, 0, 37, 0, 0, 0, 0, 0, 0, 0, + 0, 470, 0, 0, 26, 27, 28, 0, 0, 0, + 0, 0, 0, 0, 0, 30, 0, 0, 0, 0, + 0, 0, 31, 0, 0, 0, 32, 33, 0, 34, 0, 0, 0, 35, 0, 36, 38, 39, 0, 0, - 41, 0, 0, 0, 42, 0, 43, 0, 0, 0, - 0, 0, 215, 0, 216, 0, 0, 0, 46, 214, - 217, 218, 47, 219, 48, 220, 50, 221, 51, 222, - 223, 0, 0, 40, 49, 29, 205, 207, 0, 37, - 0, 0, 0, 0, 0, 0, 0, 0, 204, 0, - 0, 0, 0, 206, 0, 26, 27, 28, 208, 0, - 0, 0, 0, 0, 0, 209, 210, 0, 0, 0, - 0, 0, 0, 211, 212, 0, 0, 213, 33, 0, - 34, 0, 0, 0, 35, 0, 36, 38, 39, 0, - 0, 41, 0, 0, 0, 42, 0, 43, 0, 0, - 0, 0, 0, 215, 0, 216, 0, 0, 0, 46, - 214, 217, 218, 47, 219, 48, 220, 50, 221, 51, - 222, 223, 0, 0, 40, 49, 29, 205, 207, 0, - 37, 0, 0, 0, 0, 0, 0, 0, 0, 582, - 105, 106, 0, 0, 584, 110, 586, 27, 28, 587, - 0, 113, 0, 0, 0, 115, 589, 590, 0, 0, - 0, 0, 0, 0, 591, 592, 119, 120, 213, 33, - 0, 34, 0, 0, 0, 35, 0, 36, 593, 39, - 0, 0, 595, 0, 0, 0, 42, 0, 43, 0, - 0, 0, 0, 0, 597, 0, 216, 0, 0, 0, - 599, 596, 598, 600, 601, 602, 48, 604, 605, 606, - 607, 608, 609, 0, 0, 594, 603, 588, 583, 585, - 123, 37, 0, 0, 0, 0, 0, 0, 0, 0, - 356, 105, 106, 0, 0, 358, 110, 360, 27, 28, - 361, 0, 113, 0, 0, 0, 115, 363, 364, 0, - 0, 0, 0, 0, 0, 365, 366, 119, 120, 213, - 33, 0, 34, 0, 0, 0, 35, 0, 36, 367, - 39, 0, 0, 369, 0, 0, 0, 42, 0, 43, - 0, -258, 0, 0, 0, 371, 0, 216, 0, 0, - 0, 373, 370, 372, 374, 375, 376, 48, 378, 379, - 380, 381, 382, 383, 0, 0, 368, 377, 362, 357, - 359, 123, 37, 0, 0, 0, 0, 0, 0, 0, - 0, + 41, 0, 0, 0, 42, 0, 43, 0, 0, 471, + 0, 0, 499, 0, 0, 0, 0, 0, 46, 44, + 45, 0, 47, 0, 48, 0, 50, 0, 51, 0, + 0, 0, 0, 40, 49, 29, 0, 0, 498, 37, + 0, 0, 0, 0, 0, 0, 0, 0, 104, 105, + 106, 0, 0, 108, 110, 111, 0, 0, 112, 0, + 113, 0, 0, 0, 115, 116, 117, 0, 0, 0, + 0, 0, 0, 31, 118, 119, 120, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 121, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 124, 0, 0, 0, 0, 0, 0, + 44, 45, 125, 126, 127, 0, 129, 130, 131, 132, + 133, 134, 0, 0, 122, 128, 114, 107, 109, 123, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 104, + 105, 106, 0, 0, 108, 110, 111, 0, 0, 112, + 0, 113, 0, 0, 0, 115, 116, 117, 0, 0, + 0, 0, 0, 0, 388, 118, 119, 120, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 121, 0, + 0, 0, 389, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 124, 0, 0, 0, 0, 0, + 393, 390, 392, 125, 126, 127, 0, 129, 130, 131, + 132, 133, 134, 0, 0, 122, 128, 114, 107, 109, + 123, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 104, 105, 106, 0, 0, 108, 110, 111, 0, 0, + 112, 0, 113, 0, 0, 0, 115, 116, 117, 0, + 0, 0, 0, 0, 0, 388, 118, 119, 120, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 121, + 0, 0, 0, 389, 0, 0, 0, 0, 0, 0, + 0, 391, 0, 0, 0, 124, 0, 0, 0, 0, + 0, 393, 390, 392, 125, 126, 127, 0, 129, 130, + 131, 132, 133, 134, 0, 0, 122, 128, 114, 107, + 109, 123, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 204, 0, 0, 0, 0, 206, 0, 26, 27, + 28, 208, 0, 0, 0, 0, 0, 0, 209, 30, + 0, 0, 0, 0, 0, 0, 211, 212, 0, 0, + 213, 33, 0, 34, 0, 0, 0, 35, 0, 36, + 38, 39, 0, 0, 41, 0, 0, 0, 42, 0, + 43, 0, 0, 0, 0, 0, 215, 0, 216, 0, + 0, 0, 46, 214, 217, 218, 47, 219, 48, 220, + 50, 221, 51, 222, 223, 0, 0, 40, 49, 29, + 205, 207, 0, 37, 0, 0, 0, 0, 0, 0, + 0, 0, 204, 0, 0, 0, 0, 206, 0, 26, + 27, 28, 208, 0, 0, 0, 0, 0, 0, 209, + 210, 0, 0, 0, 0, 0, 0, 211, 212, 0, + 0, 213, 33, 0, 34, 0, 0, 0, 35, 0, + 36, 38, 39, 0, 0, 41, 0, 0, 0, 42, + 0, 43, 0, 0, 0, 0, 0, 215, 0, 216, + 0, 0, 0, 46, 214, 217, 218, 47, 219, 48, + 220, 50, 221, 51, 222, 223, 0, 0, 40, 49, + 29, 205, 207, 0, 37, 0, 0, 0, 0, 0, + 0, 0, 0, 586, 105, 106, 0, 0, 588, 110, + 590, 27, 28, 591, 0, 113, 0, 0, 0, 115, + 593, 594, 0, 0, 0, 0, 0, 0, 595, 596, + 119, 120, 213, 33, 0, 34, 0, 0, 0, 35, + 0, 36, 597, 39, 0, 0, 599, 0, 0, 0, + 42, 0, 43, 0, 0, 0, 0, 0, 601, 0, + 216, 0, 0, 0, 603, 600, 602, 604, 605, 606, + 48, 608, 609, 610, 611, 612, 613, 0, 0, 598, + 607, 592, 587, 589, 123, 37, 0, 0, 0, 0, + 0, 0, 0, 0, 356, 105, 106, 0, 0, 358, + 110, 360, 27, 28, 361, 0, 113, 0, 0, 0, + 115, 363, 364, 0, 0, 0, 0, 0, 0, 365, + 366, 119, 120, 213, 33, 0, 34, 0, 0, 0, + 35, 0, 36, 367, 39, 0, 0, 369, 0, 0, + 0, 42, 0, 43, 0, -260, 0, 0, 0, 371, + 0, 216, 0, 0, 0, 373, 370, 372, 374, 375, + 376, 48, 378, 379, 380, 381, 382, 383, 0, 0, + 368, 377, 362, 357, 359, 123, 37, 0, 0, 0, + 0, 0, 0, 0, 0, - 233, 513, 304, 238, 183, 523, 164, 431, 145, 434, - 177, 306, 245, 581, 505, 490, 166, 181, 482, 431, - 520, 549, 565, 544, 558, 302, 385, 405, 434, 570, - 171, 387, 430, 177, 567, 456, 467, 395, 552, 568, - 13, 453, 333, 342, 238, 449, 344, 451, 420, 428, - 455, 245, 462, 233, 346, 424, 427, 397, 138, 233, - 238, 143, 440, 444, 348, 442, 158, 297, 412, 445, - 334, 248, 431, 410, 434, 297, 202, 0, 297, 315, - 135, 331, 177, 245, 477, 329, 0, 141, 0, 480, - 0, 0, 0, 497, 516, 615, 202, 101, 0, 0, - 55, 297, 315, 55, 202, 281, 55, 55, 486, 446, - 0, 297, 0, 0, 399, 95, 55, 400, 181, 55, - 103, 282, 55, 497, 283, 524, 55, 280, 487, 55, - 261, 175, 55, 456, 484, 265, 55, 55, 175, 447, - 55, 55, 485, 55, 55, 447, 279, 55, 84, 175, - 55, 55, 55, 55, 85, 83, 55, 87, 90, 55, - 55, 88, 325, 475, 89, 55, 55, 474, 55, 297, - 97, 86, 327, 79, 55, 55, 324, 56, 65, 0, - 55, 163, 447, 55, 55, 488, 446, 55, 399, 446, - 141, 400, 55, 55, 489, 232, 173, 55, 339, 91, - 297, 55, 55, 62, 336, 466, 0, 55, 92, 55, - 55, 160, 63, 93, 55, 72, 55, 141, 64, 101, - 55, 55, 67, 402, 293, 265, 265, 0, 0, 265, - 298, 610, 293, 612, 55, 308, 0, 265, 311, 265, - 0, 0, 103, 170, 293, 290, 321, 0, 55, 265, - 0, 55, 467, 265, 292, 273, 265, 497, 501, 0, - 55, 300, 0, 293, 288, 265, 295, 293, 265, 268, - 55, 55, 265, 0, 55, 265, 265, 285, 284, 265, - 0, 286, 497, 538, 0, 312, 572, 576, 0, 314, - 0, 0, 0, 0, 0, 0, 529, 539, 0, 0, - 574, 575, 577, 578, 0, 0, 0, 0, 0, 0, + 513, 523, 431, 13, 456, 490, 434, 431, 135, 306, + 505, 302, 567, 558, 467, 520, 482, 233, 569, 145, + 549, 574, 248, 570, 238, 552, 585, 315, 304, 177, + 245, 177, 297, 387, 397, 238, 440, 430, 449, 233, + 445, 544, 238, 233, 342, 427, 344, 444, 346, 455, + 451, 424, 453, 138, 348, 245, 434, 143, 431, 183, + 171, 405, 410, 181, 428, 177, 158, 166, 395, 385, + 420, 164, 202, 442, 297, 412, 334, 333, 329, 0, + 331, 141, 297, 245, 55, 55, 175, 181, 480, 85, + 297, 0, 477, 462, 516, 297, 0, 0, 0, 399, + 475, 0, 400, 141, 474, 497, 261, 524, 55, 173, + 175, 265, 497, 501, 297, 101, 202, 0, 399, 141, + 55, 400, 55, 55, 447, 402, 55, 84, 55, 315, + 97, 55, 297, 283, 55, 55, 456, 202, 103, 55, + 282, 55, 163, 95, 279, 55, 280, 175, 160, 55, + 55, 327, 484, 55, 281, 55, 325, 55, 79, 55, + 86, 55, 88, 485, 87, 55, 55, 0, 65, 56, + 55, 55, 62, 336, 55, 298, 55, 55, 63, 67, + 72, 55, 55, 91, 64, 55, 0, 92, 55, 55, + 446, 93, 0, 300, 90, 55, 55, 488, 486, 399, + 55, 55, 400, 324, 83, 101, 89, 55, 466, 487, + 55, 55, 489, 446, 497, 232, 619, 55, 55, 446, + 55, 55, 293, 265, 0, 265, 265, 265, 103, 170, + 0, 339, 55, 288, 293, 311, 308, 265, 0, 265, + 293, 293, 0, 290, 312, 265, 265, 293, 0, 55, + 55, 55, 265, 447, 265, 265, 292, 273, 268, 55, + 0, 0, 295, 321, 265, 614, 286, 616, 55, 314, + 497, 538, 0, 265, 0, 285, 497, 538, 0, 0, + 576, 0, 0, 0, 529, 539, 467, 0, 0, 0, + 529, 539, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 55, 0, 0, 0, 0, 265, + 0, 284, 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, 497, 538, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 529, 539, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 580, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 578, 579, 581, 582, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0}; + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0}; const int QmlJSGrammar::action_check [] = { - 7, 55, 7, 61, 36, 36, 7, 7, 36, 7, - 55, 8, 33, 60, 7, 88, 36, 36, 33, 55, - 66, 60, 7, 29, 33, 7, 36, 16, 36, 17, - 5, 7, 36, 7, 33, 7, 5, 33, 8, 29, - 20, 36, 36, 55, 7, 5, 60, 60, 7, 36, - 33, 7, 7, 7, 33, 36, 7, 60, 36, 7, - 7, 29, 48, 36, 7, 36, 8, 2, 60, 33, - 8, 2, 1, 1, 8, 36, 78, 61, 36, 36, - 7, 48, 8, 60, 36, 7, 36, 78, 7, 33, - 55, 36, 7, 2, 8, 48, 1, 17, 2, 7, - 0, 31, 8, 10, -1, 8, 8, 48, -1, 8, - 8, 60, 78, 8, 76, 6, 40, 50, 50, 8, - 60, 54, 54, 8, 61, 61, 62, 51, 8, 20, - 7, 8, 78, 8, 8, 7, 61, 62, 61, 62, - 61, 62, 15, 61, 62, 61, 62, 8, 55, 88, - 61, 62, 40, 56, 60, 8, 8, 40, 60, 40, - 33, 60, 60, 51, 61, 62, 61, 56, 51, 12, - 51, 61, 62, 42, 29, 60, 1, 61, 62, 25, - 60, 27, 56, 7, 53, 60, 25, 29, 27, 61, - 62, 29, 38, 8, 29, 56, 7, 29, 25, 38, - 27, -1, 15, 25, 15, 27, 29, 60, -1, 61, - 62, 38, 12, 8, 57, 29, 38, 29, -1, 74, - 63, 34, 33, 36, 12, -1, -1, 29, 66, 67, - 85, 25, 74, 27, 66, 67, 29, 61, 62, 74, - 61, 62, 29, 85, 38, 29, 61, 62, 29, -1, - 85, 74, 66, 67, 66, 67, 29, 57, 25, 25, - 27, 27, 85, 63, 66, 67, 61, 62, 89, 57, - 8, 38, 38, 66, 67, 63, 15, 29, -1, 66, - 67, 29, 66, 67, 29, 66, 67, 15, 29, 61, - 62, -1, -1, 66, 67, 34, 8, 36, 90, 91, - 92, -1, -1, 25, -1, 27, 34, 25, 36, 27, - 18, 19, -1, -1, 66, 67, 38, 89, 66, 67, - 38, 66, 67, 61, 62, 66, 67, 25, 25, 27, - 27, 25, 25, 27, 27, 8, 15, 45, 46, 29, - 38, 38, 18, 19, 38, 38, 36, 29, -1, 61, - 62, -1, -1, -1, 36, -1, -1, 29, -1, 29, - 33, -1, -1, 29, -1, -1, 29, -1, 47, 45, - 46, -1, -1, -1, 29, -1, 66, 67, -1, -1, - -1, -1, 61, 62, 66, 67, -1, -1, 61, 62, - -1, 61, 62, 59, 66, 67, 66, 67, 61, 62, - 66, 67, -1, 66, 67, 29, 61, 62, 23, 24, - 89, 66, 67, -1, -1, 29, -1, 32, -1, 85, - 35, -1, 37, 18, 19, 23, 24, 29, -1, -1, - 29, -1, 23, 24, 32, 59, 29, 35, -1, 37, - 31, 32, 66, 67, 35, -1, 37, 61, 62, -1, - 45, 46, 66, 67, -1, -1, -1, -1, -1, 61, - 62, 85, 61, 62, 66, 67, 59, 66, 67, 23, - 24, -1, 65, 66, 67, -1, -1, 31, 32, 23, - 24, 35, -1, 37, -1, 10, -1, 31, 32, -1, - -1, 35, 85, 37, 23, 24, -1, 22, -1, -1, - 23, 24, 31, 32, 29, -1, 35, -1, 37, 32, - 10, -1, 35, -1, 37, -1, -1, -1, -1, -1, - -1, -1, 22, -1, -1, -1, -1, -1, -1, 29, - 55, -1, -1, -1, 59, -1, -1, -1, -1, -1, - -1, 66, 67, -1, -1, -1, -1, -1, -1, 74, - -1, -1, -1, -1, 3, 55, -1, -1, 83, 59, - 85, -1, -1, -1, 13, -1, 66, 67, 17, -1, - -1, -1, 23, 24, 74, -1, -1, 26, -1, 28, - 31, 32, 31, 83, 35, 85, 37, -1, -1, -1, - 39, -1, 41, 42, -1, -1, 12, 13, -1, -1, - 49, -1, -1, 52, 53, -1, 22, -1, -1, 58, - -1, -1, -1, 29, -1, 64, -1, 33, 34, -1, - 36, -1, -1, -1, -1, -1, -1, 43, -1, -1, - 79, 47, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, 3, -1, -1, -1, -1, 65, - 66, 67, -1, 69, 13, -1, -1, -1, 17, -1, - -1, -1, -1, -1, 80, 81, 82, 26, -1, 28, - 86, -1, -1, -1, -1, -1, -1, -1, -1, -1, - 39, -1, 41, 42, -1, -1, -1, -1, -1, -1, - 49, -1, -1, 52, 53, -1, -1, -1, -1, 58, - -1, -1, -1, -1, -1, 64, -1, -1, -1, -1, + 36, 7, 36, 8, 7, 36, 7, 60, 36, 8, + 55, 36, 7, 7, 16, 55, 36, 17, 7, 60, + 33, 36, 55, 7, 7, 7, 78, 20, 60, 8, + 2, 7, 36, 1, 48, 33, 5, 55, 88, 0, + 7, 33, 5, 5, 2, 33, 33, 7, 33, 60, + 36, 48, 7, 7, 7, 7, 29, 7, 36, 7, + 7, 36, 36, 33, 60, 36, 8, 8, 78, 60, + 29, 61, 36, 1, 8, 2, 88, 1, 7, 36, + 60, 7, 48, 1, 33, 36, 7, 7, 7, 29, + 36, 36, 36, 31, 33, 17, 8, 78, 2, 7, + 15, 78, 8, 36, -1, 48, 8, 8, 8, 8, + 66, 76, 7, 8, 8, -1, 8, 10, 33, 6, + 55, -1, 8, 60, 8, 61, -1, 8, 60, 40, + 61, 61, 62, 20, 50, 42, 61, 62, 54, 8, + 51, 8, 40, 8, 61, 62, 53, 7, 61, 62, + -1, 61, 62, 51, 60, 56, 61, 62, 40, 61, + 60, 60, 55, 29, 56, 29, 60, 40, 29, 51, + 61, 62, 61, 62, 60, 56, 60, 29, 51, 29, + 29, 61, 62, 61, 62, 61, 62, 56, 50, 8, + 7, 29, 54, 60, 29, 60, 18, 19, 8, 7, + 66, 67, 66, 67, 8, 66, 67, 8, -1, 29, + 61, 62, -1, 15, 29, 36, 66, 67, 29, -1, + 61, 62, 74, 45, 46, 74, 29, -1, 66, 67, + 8, 29, 34, 85, 36, 29, 85, 29, 89, 74, + 61, 62, 61, 62, 61, 62, 66, 67, 89, 29, + 85, 61, 62, 61, 62, 66, 67, 61, 62, 74, + 61, 62, 12, 66, 67, 90, 91, 92, 66, 67, + 85, -1, 66, 67, 66, 67, 25, 25, 27, 27, + 25, -1, 27, 61, 62, 29, 66, 67, 29, 38, + 38, 29, 25, 38, 27, 25, -1, 27, 25, 12, + 27, 7, 25, 29, 27, 38, -1, 57, 38, 15, + 29, 38, 12, 63, 8, 38, -1, 25, 25, 27, + 27, -1, 66, 67, -1, 66, 67, 33, 66, 67, + 38, 38, 25, 25, 27, 27, 25, 15, 27, 33, + 66, 67, 18, 19, 57, 38, 38, 66, 67, 38, + 63, 25, -1, 27, 18, 19, 34, 57, 36, 18, + 19, -1, 29, 63, 38, 15, 29, 61, 62, 45, + 46, -1, -1, 36, -1, -1, 29, -1, -1, 23, + 24, 45, 46, 36, -1, -1, 45, 46, 32, 15, + 29, 35, 29, 37, 61, 62, -1, 47, -1, 66, + 67, -1, -1, 66, 67, 29, -1, -1, 34, -1, + 36, 61, 62, 66, 67, -1, -1, 29, -1, 29, + 59, -1, 59, -1, -1, -1, 29, 66, 67, 66, + 67, -1, -1, -1, 29, -1, -1, 61, 62, 89, + -1, -1, 66, 67, -1, -1, 85, -1, 85, 61, + 62, 61, 62, -1, 66, 67, 66, 67, 61, 62, + -1, -1, -1, 66, 67, -1, 61, 62, -1, 23, + 24, 66, 67, -1, -1, -1, 23, 24, 32, 29, + -1, 35, -1, 37, 31, 32, 23, 24, 35, -1, + 37, -1, -1, -1, 31, 32, 23, 24, 35, -1, + 37, -1, 10, -1, 31, 32, -1, -1, 35, 59, + 37, 23, 24, -1, 22, 65, 66, 67, -1, 31, + 32, 29, -1, 35, -1, 37, -1, -1, -1, -1, + -1, 23, 24, -1, -1, 85, -1, -1, -1, 31, + 32, 23, 24, 35, -1, 37, 3, 55, -1, -1, + 32, 59, -1, 35, -1, 37, 13, -1, 66, 67, + 17, -1, -1, -1, -1, -1, 74, -1, -1, 26, + -1, 28, -1, -1, -1, 83, -1, 85, -1, -1, + 3, -1, 39, -1, 41, 42, -1, -1, -1, -1, + 13, -1, 49, -1, 17, 52, 53, -1, -1, -1, + -1, 58, -1, 26, -1, 28, -1, 64, -1, -1, + -1, -1, -1, 10, -1, -1, 39, -1, 41, 42, + -1, -1, 79, -1, -1, 22, 49, -1, -1, 52, + 53, -1, 29, -1, -1, 58, -1, -1, -1, -1, + -1, 64, -1, -1, -1, -1, -1, -1, -1, -1, + 12, 13, -1, -1, -1, -1, 79, -1, 55, -1, + 22, -1, 59, -1, -1, -1, -1, 29, -1, 66, + 67, 33, 34, -1, 36, -1, -1, 74, -1, -1, + -1, 43, -1, -1, -1, 47, 83, -1, 85, -1, + -1, -1, -1, -1, -1, -1, -1, -1, 3, -1, + -1, -1, -1, 65, 66, 67, -1, 69, 13, -1, + -1, -1, 17, -1, -1, -1, -1, -1, 80, 81, + 82, 26, -1, 28, 86, -1, 31, -1, -1, -1, + -1, -1, -1, -1, 39, -1, 41, 42, -1, -1, + -1, -1, -1, -1, 49, -1, -1, 52, 53, -1, + -1, -1, -1, 58, -1, -1, -1, -1, -1, 64, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, 79, -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, -1, -1, -1, -1, 12, 13, -1, -1, - -1, -1, -1, -1, -1, -1, 22, -1, -1, -1, - -1, -1, -1, 29, -1, -1, -1, 33, 34, -1, - 36, -1, -1, -1, -1, -1, -1, 43, -1, -1, - -1, 47, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, -1, 65, - 66, 67, -1, 69, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, 80, 81, 82, -1, -1, -1, - 86, -1, -1, -1, -1, -1, -1, -1, -1, 11, 12, 13, -1, -1, -1, -1, -1, -1, -1, -1, 22, -1, -1, -1, -1, -1, -1, 29, -1, -1, - -1, 33, 34, -1, 36, -1, -1, -1, 40, -1, - 42, 43, 44, -1, -1, 47, -1, -1, -1, 51, - -1, 53, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, 65, 66, 67, -1, 69, -1, 71, - -1, 73, -1, 75, -1, -1, -1, -1, 80, 81, + -1, 33, 34, -1, 36, -1, -1, -1, -1, -1, + -1, 43, -1, -1, -1, 47, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, 65, 66, 67, -1, 69, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, 80, 81, 82, -1, -1, -1, 86, -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, @@ -699,32 +707,23 @@ const int QmlJSGrammar::action_check [] = { -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, 69, -1, 71, -1, 73, -1, 75, -1, -1, -1, -1, 80, 81, 82, -1, -1, -1, 86, -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, 86, -1, -1, -1, - -1, -1, -1, -1, -1, 8, -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, 86, -1, -1, -1, -1, -1, -1, - -1, -1, 8, -1, -1, 11, 12, 13, -1, -1, + -1, -1, -1, -1, -1, -1, -1, 11, 12, 13, + -1, -1, -1, -1, -1, -1, -1, -1, 22, -1, + -1, -1, -1, -1, -1, 29, -1, -1, -1, 33, + 34, -1, 36, -1, -1, -1, 40, -1, 42, 43, + 44, -1, -1, 47, -1, -1, -1, 51, -1, 53, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, 65, 66, 67, -1, 69, -1, 71, -1, 73, + 74, 75, -1, -1, -1, -1, 80, 81, 82, -1, + -1, -1, 86, -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, - 56, -1, -1, -1, -1, -1, -1, -1, -1, 65, + -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, 86, -1, -1, -1, -1, -1, -1, -1, -1, 8, @@ -736,21 +735,21 @@ const int QmlJSGrammar::action_check [] = { -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, 86, -1, -1, - -1, -1, -1, -1, -1, -1, 11, 12, 13, -1, - -1, -1, -1, -1, -1, -1, -1, 22, -1, -1, - -1, -1, -1, -1, 29, 30, -1, -1, 33, 34, - -1, 36, -1, -1, -1, 40, -1, 42, 43, 44, - -1, -1, 47, -1, -1, -1, 51, -1, 53, -1, - -1, -1, -1, -1, -1, -1, 61, -1, -1, -1, - 65, 66, 67, -1, 69, -1, 71, -1, 73, -1, - 75, -1, -1, -1, -1, 80, 81, 82, -1, -1, - -1, 86, -1, -1, -1, -1, -1, -1, -1, -1, - 8, -1, -1, 11, 12, 13, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, 8, -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, 86, -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, 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, 56, -1, - -1, -1, -1, -1, -1, -1, -1, 65, 66, 67, + -1, -1, -1, 51, -1, 53, -1, -1, -1, -1, + -1, -1, -1, 61, -1, -1, -1, 65, 66, 67, -1, 69, -1, 71, -1, 73, -1, 75, -1, -1, -1, -1, 80, 81, 82, -1, -1, -1, 86, -1, -1, -1, -1, -1, -1, -1, -1, 8, -1, -1, @@ -758,113 +757,133 @@ const int QmlJSGrammar::action_check [] = { -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, 59, -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, 85, 86, -1, -1, -1, -1, - -1, -1, -1, -1, 4, 5, 6, -1, -1, 9, - 10, 11, -1, -1, 14, -1, 16, -1, -1, -1, - 20, 21, 22, -1, -1, -1, -1, -1, -1, 29, - 30, 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, -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, -1, -1, -1, -1, 4, 5, 6, -1, - -1, 9, 10, 11, -1, -1, 14, -1, 16, -1, - -1, -1, 20, 21, 22, -1, -1, -1, -1, -1, - -1, 29, 30, 31, 32, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, 43, -1, -1, -1, 47, - -1, -1, -1, -1, -1, -1, -1, 55, -1, -1, - -1, 59, -1, -1, -1, -1, -1, 65, 66, 67, - 68, 69, 70, -1, 72, 73, 74, 75, 76, 77, - -1, -1, 80, 81, 82, 83, 84, 85, -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, + 81, 82, -1, -1, -1, 86, -1, -1, -1, -1, + -1, -1, -1, -1, 8, -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, 86, -1, -1, -1, -1, -1, -1, -1, + -1, 8, -1, -1, 11, 12, 13, -1, -1, -1, + -1, -1, -1, -1, -1, 22, -1, -1, -1, -1, + -1, -1, 29, -1, -1, -1, 33, 34, -1, 36, -1, -1, -1, 40, -1, 42, 43, 44, -1, -1, - 47, -1, -1, -1, 51, -1, 53, -1, -1, -1, - -1, -1, 59, -1, 61, -1, -1, -1, 65, 66, - 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, - 77, -1, -1, 80, 81, 82, 83, 84, -1, 86, - -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, -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, -1, -1, -1, -1, 4, - 5, 6, -1, -1, 9, 10, 11, 12, 13, 14, + 47, -1, -1, -1, 51, -1, 53, -1, -1, 56, + -1, -1, 59, -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, 85, 86, + -1, -1, -1, -1, -1, -1, -1, -1, 4, 5, + 6, -1, -1, 9, 10, 11, -1, -1, 14, -1, + 16, -1, -1, -1, 20, 21, 22, -1, -1, -1, + -1, -1, -1, 29, 30, 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, -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, 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, + -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, 86, -1, -1, -1, -1, -1, -1, -1, -1, - 4, 5, 6, -1, -1, 9, 10, 11, 12, 13, + 85, -1, -1, -1, -1, -1, -1, -1, -1, -1, + 4, 5, 6, -1, -1, 9, 10, 11, -1, -1, 14, -1, 16, -1, -1, -1, 20, 21, 22, -1, - -1, -1, -1, -1, -1, 29, 30, 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, + -1, -1, -1, -1, -1, 29, 30, 31, 32, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, 43, + -1, -1, -1, 47, -1, -1, -1, -1, -1, -1, + -1, 55, -1, -1, -1, 59, -1, -1, -1, -1, + -1, 65, 66, 67, 68, 69, 70, -1, 72, 73, 74, 75, 76, 77, -1, -1, 80, 81, 82, 83, - 84, 85, 86, -1, -1, -1, -1, -1, -1, -1, - -1, + 84, 85, -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, -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, -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, -1, + -1, -1, -1, 4, 5, 6, -1, -1, 9, 10, + 11, 12, 13, 14, -1, 16, -1, -1, -1, 20, + 21, 22, -1, -1, -1, -1, -1, -1, 29, 30, + 31, 32, 33, 34, -1, 36, -1, -1, -1, 40, + -1, 42, 43, 44, -1, -1, 47, -1, -1, -1, + 51, -1, 53, -1, -1, -1, -1, -1, 59, -1, + 61, -1, -1, -1, 65, 66, 67, 68, 69, 70, + 71, 72, 73, 74, 75, 76, 77, -1, -1, 80, + 81, 82, 83, 84, 85, 86, -1, -1, -1, -1, + -1, -1, -1, -1, 4, 5, 6, -1, -1, 9, + 10, 11, 12, 13, 14, -1, 16, -1, -1, -1, + 20, 21, 22, -1, -1, -1, -1, -1, -1, 29, + 30, 31, 32, 33, 34, -1, 36, -1, -1, -1, + 40, -1, 42, 43, 44, -1, -1, 47, -1, -1, + -1, 51, -1, 53, -1, 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, 86, -1, -1, -1, + -1, -1, -1, -1, -1, - 9, 9, 3, 9, 9, 8, 30, 3, 63, 16, - 9, 2, 2, 15, 9, 2, 30, 9, 3, 3, - 9, 3, 20, 20, 3, 2, 30, 2, 16, 9, - 3, 31, 77, 9, 20, 9, 30, 30, 9, 9, - 3, 3, 2, 2, 9, 3, 3, 2, 92, 3, - 2, 2, 30, 9, 2, 89, 77, 2, 30, 9, - 9, 30, 94, 16, 2, 9, 30, 3, 3, 16, - 9, 3, 3, 2, 16, 3, 2, -1, 3, 9, - 3, 3, 9, 2, 30, 2, -1, 30, -1, 30, - -1, -1, -1, 9, 9, 11, 2, 9, -1, -1, - 40, 3, 9, 40, 2, 45, 40, 40, 42, 42, - -1, 3, -1, -1, 34, 52, 40, 37, 9, 40, - 32, 45, 40, 9, 45, 11, 40, 45, 42, 40, - 40, 42, 40, 9, 42, 45, 40, 40, 42, 42, - 40, 40, 42, 40, 40, 42, 45, 40, 44, 42, - 40, 40, 40, 40, 44, 44, 40, 45, 45, 40, - 40, 45, 64, 26, 45, 40, 40, 30, 40, 3, - 50, 45, 64, 45, 40, 40, 83, 43, 43, -1, - 40, 56, 42, 40, 40, 42, 42, 40, 34, 42, - 30, 37, 40, 40, 42, 101, 36, 40, 96, 46, - 3, 40, 40, 42, 95, 81, -1, 40, 46, 40, - 40, 54, 42, 46, 40, 46, 40, 30, 42, 9, - 40, 40, 48, 36, 40, 45, 45, -1, -1, 45, - 64, 9, 40, 11, 40, 55, -1, 45, 57, 45, - -1, -1, 32, 33, 40, 51, 62, -1, 40, 45, - -1, 40, 30, 45, 62, 47, 45, 9, 10, -1, - 40, 64, -1, 40, 53, 45, 62, 40, 45, 49, - 40, 40, 45, -1, 40, 45, 45, 47, 47, 45, - -1, 47, 9, 10, -1, 62, 13, 3, -1, 62, - -1, -1, -1, -1, -1, -1, 23, 24, -1, -1, - 16, 17, 18, 19, -1, -1, -1, -1, -1, -1, + 9, 8, 3, 3, 9, 2, 16, 3, 3, 2, + 9, 2, 20, 3, 30, 9, 3, 9, 20, 63, + 3, 9, 3, 9, 9, 9, 15, 9, 3, 9, + 2, 9, 3, 31, 2, 9, 94, 77, 3, 9, + 16, 20, 9, 9, 2, 77, 3, 16, 2, 2, + 2, 89, 3, 30, 2, 2, 16, 30, 3, 9, + 3, 2, 2, 9, 3, 9, 30, 30, 30, 30, + 92, 30, 2, 9, 3, 3, 9, 2, 2, -1, + 3, 30, 3, 2, 40, 40, 42, 9, 30, 44, + 3, -1, 30, 30, 9, 3, -1, -1, -1, 34, + 26, -1, 37, 30, 30, 9, 40, 11, 40, 36, + 42, 45, 9, 10, 3, 9, 2, -1, 34, 30, + 40, 37, 40, 40, 42, 36, 40, 44, 40, 9, + 50, 40, 3, 45, 40, 40, 9, 2, 32, 40, + 45, 40, 56, 52, 45, 40, 45, 42, 54, 40, + 40, 64, 42, 40, 45, 40, 64, 40, 45, 40, + 45, 40, 45, 42, 45, 40, 40, -1, 43, 43, + 40, 40, 42, 95, 40, 64, 40, 40, 42, 48, + 46, 40, 40, 46, 42, 40, -1, 46, 40, 40, + 42, 46, -1, 64, 45, 40, 40, 42, 42, 34, + 40, 40, 37, 83, 44, 9, 45, 40, 81, 42, + 40, 40, 42, 42, 9, 101, 11, 40, 40, 42, + 40, 40, 40, 45, -1, 45, 45, 45, 32, 33, + -1, 96, 40, 53, 40, 57, 55, 45, -1, 45, + 40, 40, -1, 51, 62, 45, 45, 40, -1, 40, + 40, 40, 45, 42, 45, 45, 62, 47, 49, 40, + -1, -1, 62, 62, 45, 9, 47, 11, 40, 62, + 9, 10, -1, 45, -1, 47, 9, 10, -1, -1, + 13, -1, -1, -1, 23, 24, 30, -1, -1, -1, + 23, 24, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, 40, -1, -1, -1, -1, 45, + -1, 47, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, 9, 10, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, 23, 24, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, 3, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + 16, 17, 18, 19, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, @@ -872,5 +891,5 @@ const int QmlJSGrammar::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, -1, -1, -1}; diff --git a/src/declarative/qml/parser/qmljsgrammar_p.h b/src/declarative/qml/parser/qmljsgrammar_p.h index c760564..1101e69 100644 --- a/src/declarative/qml/parser/qmljsgrammar_p.h +++ b/src/declarative/qml/parser/qmljsgrammar_p.h @@ -154,15 +154,15 @@ public: T_XOR = 78, T_XOR_EQ = 79, - ACCEPT_STATE = 616, - RULE_COUNT = 337, - STATE_COUNT = 617, + ACCEPT_STATE = 620, + RULE_COUNT = 339, + STATE_COUNT = 621, TERMINAL_COUNT = 95, NON_TERMINAL_COUNT = 103, - GOTO_INDEX_OFFSET = 617, - GOTO_INFO_OFFSET = 2231, - GOTO_CHECK_OFFSET = 2231 + GOTO_INDEX_OFFSET = 621, + GOTO_INFO_OFFSET = 2285, + GOTO_CHECK_OFFSET = 2285 }; static const char *const spell []; diff --git a/src/declarative/qml/parser/qmljsparser.cpp b/src/declarative/qml/parser/qmljsparser.cpp index e64774e..7469381 100644 --- a/src/declarative/qml/parser/qmljsparser.cpp +++ b/src/declarative/qml/parser/qmljsparser.cpp @@ -396,26 +396,28 @@ case 42: { sym(1).Node = node; } break; -case 43: { +case 44: { AST::UiPublicMember *node = makeAstNode<AST::UiPublicMember> (driver->nodePool(), (NameId *)0, sym(2).sval); node->type = AST::UiPublicMember::Signal; node->propertyToken = loc(1); node->typeToken = loc(2); - node->identifierToken = loc(3); + node->identifierToken = loc(2); node->parameters = sym(4).UiParameterList; + node->semicolonToken = loc(6); sym(1).Node = node; } break; -case 44: { +case 46: { AST::UiPublicMember *node = makeAstNode<AST::UiPublicMember> (driver->nodePool(), (NameId *)0, sym(2).sval); node->type = AST::UiPublicMember::Signal; node->propertyToken = loc(1); node->typeToken = loc(2); - node->identifierToken = loc(3); + node->identifierToken = loc(2); + node->semicolonToken = loc(3); sym(1).Node = node; } break; -case 46: { +case 48: { AST::UiPublicMember *node = makeAstNode<AST::UiPublicMember> (driver->nodePool(), sym(2).sval, sym(3).sval); node->propertyToken = loc(1); node->typeToken = loc(2); @@ -424,7 +426,7 @@ case 46: { sym(1).Node = node; } break; -case 48: { +case 50: { AST::UiPublicMember *node = makeAstNode<AST::UiPublicMember> (driver->nodePool(), sym(3).sval, sym(4).sval); node->isDefaultMember = true; node->defaultToken = loc(1); @@ -435,7 +437,7 @@ case 48: { sym(1).Node = node; } break; -case 50: { +case 52: { AST::UiPublicMember *node = makeAstNode<AST::UiPublicMember> (driver->nodePool(), sym(2).sval, sym(3).sval, sym(5).Expression); node->propertyToken = loc(1); @@ -446,7 +448,7 @@ case 50: { sym(1).Node = node; } break; -case 52: { +case 54: { AST::UiPublicMember *node = makeAstNode<AST::UiPublicMember> (driver->nodePool(), sym(3).sval, sym(4).sval, sym(6).Expression); node->isDefaultMember = true; @@ -459,76 +461,76 @@ case 52: { sym(1).Node = node; } break; -case 53: { +case 55: { sym(1).Node = makeAstNode<AST::UiSourceElement>(driver->nodePool(), sym(1).Node); } break; -case 54: { +case 56: { sym(1).Node = makeAstNode<AST::UiSourceElement>(driver->nodePool(), sym(1).Node); } break; -case 55: -case 56: +case 57: +case 58: { AST::UiQualifiedId *node = makeAstNode<AST::UiQualifiedId> (driver->nodePool(), driver->intern(lexer->characterBuffer(), lexer->characterCount())); node->identifierToken = loc(1); sym(1).Node = node; } break; -case 58: { +case 60: { QString s = QLatin1String(QmlJSGrammar::spell[T_PROPERTY]); sym(1).sval = driver->intern(s.constData(), s.length()); break; } -case 59: { +case 61: { QString s = QLatin1String(QmlJSGrammar::spell[T_SIGNAL]); sym(1).sval = driver->intern(s.constData(), s.length()); break; } -case 60: { +case 62: { AST::ThisExpression *node = makeAstNode<AST::ThisExpression> (driver->nodePool()); node->thisToken = loc(1); sym(1).Node = node; } break; -case 61: { +case 63: { AST::IdentifierExpression *node = makeAstNode<AST::IdentifierExpression> (driver->nodePool(), sym(1).sval); node->identifierToken = loc(1); sym(1).Node = node; } break; -case 62: { +case 64: { AST::NullExpression *node = makeAstNode<AST::NullExpression> (driver->nodePool()); node->nullToken = loc(1); sym(1).Node = node; } break; -case 63: { +case 65: { AST::TrueLiteral *node = makeAstNode<AST::TrueLiteral> (driver->nodePool()); node->trueToken = loc(1); sym(1).Node = node; } break; -case 64: { +case 66: { AST::FalseLiteral *node = makeAstNode<AST::FalseLiteral> (driver->nodePool()); node->falseToken = loc(1); sym(1).Node = node; } break; -case 65: { +case 67: { AST::NumericLiteral *node = makeAstNode<AST::NumericLiteral> (driver->nodePool(), sym(1).dval); node->literalToken = loc(1); sym(1).Node = node; } break; -case 66: -case 67: { +case 68: +case 69: { AST::StringLiteral *node = makeAstNode<AST::StringLiteral> (driver->nodePool(), sym(1).sval); node->literalToken = loc(1); sym(1).Node = node; } break; -case 68: { +case 70: { bool rx = lexer->scanRegExp(Lexer::NoPrefix); if (!rx) { diagnostic_messages.append(DiagnosticMessage(DiagnosticMessage::Error, location(lexer), lexer->errorMessage())); @@ -539,7 +541,7 @@ case 68: { sym(1).Node = node; } break; -case 69: { +case 71: { bool rx = lexer->scanRegExp(Lexer::EqualPrefix); if (!rx) { diagnostic_messages.append(DiagnosticMessage(DiagnosticMessage::Error, location(lexer), lexer->errorMessage())); @@ -550,28 +552,28 @@ case 69: { sym(1).Node = node; } break; -case 70: { +case 72: { AST::ArrayLiteral *node = makeAstNode<AST::ArrayLiteral> (driver->nodePool(), (AST::Elision *) 0); node->lbracketToken = loc(1); node->rbracketToken = loc(2); sym(1).Node = node; } break; -case 71: { +case 73: { AST::ArrayLiteral *node = makeAstNode<AST::ArrayLiteral> (driver->nodePool(), sym(2).Elision->finish()); node->lbracketToken = loc(1); node->rbracketToken = loc(3); sym(1).Node = node; } break; -case 72: { +case 74: { 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 73: { +case 75: { AST::ArrayLiteral *node = makeAstNode<AST::ArrayLiteral> (driver->nodePool(), sym(2).ElementList->finish (), (AST::Elision *) 0); node->lbracketToken = loc(1); @@ -580,7 +582,7 @@ case 73: { sym(1).Node = node; } break; -case 74: { +case 76: { AST::ArrayLiteral *node = makeAstNode<AST::ArrayLiteral> (driver->nodePool(), sym(2).ElementList->finish (), sym(4).Elision->finish()); node->lbracketToken = loc(1); @@ -589,7 +591,7 @@ case 74: { sym(1).Node = node; } break; -case 75: { +case 77: { AST::ObjectLiteral *node = 0; if (sym(2).Node) node = makeAstNode<AST::ObjectLiteral> (driver->nodePool(), @@ -601,7 +603,7 @@ case 75: { sym(1).Node = node; } break; -case 76: { +case 78: { AST::ObjectLiteral *node = makeAstNode<AST::ObjectLiteral> (driver->nodePool(), sym(2).PropertyNameAndValueList->finish ()); node->lbraceToken = loc(1); @@ -609,67 +611,67 @@ case 76: { sym(1).Node = node; } break; -case 77: { +case 79: { 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 78: { +case 80: { AST::UiQualifiedId *node = makeAstNode<AST::UiQualifiedId> (driver->nodePool(), sym(1).sval); node->identifierToken = loc(1); sym(1).Node = node; } break; -case 79: { +case 81: { AST::UiQualifiedId *node = makeAstNode<AST::UiQualifiedId> (driver->nodePool(), sym(1).UiQualifiedId, sym(3).sval); node->identifierToken = loc(3); sym(1).Node = node; } break; -case 80: { +case 82: { sym(1).Node = makeAstNode<AST::ElementList> (driver->nodePool(), (AST::Elision *) 0, sym(1).Expression); } break; -case 81: { +case 83: { sym(1).Node = makeAstNode<AST::ElementList> (driver->nodePool(), sym(1).Elision->finish(), sym(2).Expression); } break; -case 82: { +case 84: { AST::ElementList *node = makeAstNode<AST::ElementList> (driver->nodePool(), sym(1).ElementList, (AST::Elision *) 0, sym(3).Expression); node->commaToken = loc(2); sym(1).Node = node; } break; -case 83: { +case 85: { AST::ElementList *node = makeAstNode<AST::ElementList> (driver->nodePool(), sym(1).ElementList, sym(3).Elision->finish(), sym(4).Expression); node->commaToken = loc(2); sym(1).Node = node; } break; -case 84: { +case 86: { AST::Elision *node = makeAstNode<AST::Elision> (driver->nodePool()); node->commaToken = loc(1); sym(1).Node = node; } break; -case 85: { +case 87: { AST::Elision *node = makeAstNode<AST::Elision> (driver->nodePool(), sym(1).Elision); node->commaToken = loc(2); sym(1).Node = node; } break; -case 86: { +case 88: { AST::PropertyNameAndValueList *node = makeAstNode<AST::PropertyNameAndValueList> (driver->nodePool(), sym(1).PropertyName, sym(3).Expression); node->colonToken = loc(2); sym(1).Node = node; } break; -case 87: { +case 89: { AST::PropertyNameAndValueList *node = makeAstNode<AST::PropertyNameAndValueList> (driver->nodePool(), sym(1).PropertyNameAndValueList, sym(3).PropertyName, sym(5).Expression); node->commaToken = loc(2); @@ -677,40 +679,36 @@ case 87: { sym(1).Node = node; } break; -case 88: { +case 90: { AST::IdentifierPropertyName *node = makeAstNode<AST::IdentifierPropertyName> (driver->nodePool(), sym(1).sval); node->propertyNameToken = loc(1); sym(1).Node = node; } break; -case 89: -case 90: { +case 91: +case 92: { AST::IdentifierPropertyName *node = makeAstNode<AST::IdentifierPropertyName> (driver->nodePool(), driver->intern(lexer->characterBuffer(), lexer->characterCount())); node->propertyNameToken = loc(1); sym(1).Node = node; } break; -case 91: { +case 93: { AST::StringLiteralPropertyName *node = makeAstNode<AST::StringLiteralPropertyName> (driver->nodePool(), sym(1).sval); node->propertyNameToken = loc(1); sym(1).Node = node; } break; -case 92: { +case 94: { AST::NumericLiteralPropertyName *node = makeAstNode<AST::NumericLiteralPropertyName> (driver->nodePool(), sym(1).dval); node->propertyNameToken = loc(1); sym(1).Node = node; } break; -case 93: { +case 95: { AST::IdentifierPropertyName *node = makeAstNode<AST::IdentifierPropertyName> (driver->nodePool(), sym(1).sval); node->propertyNameToken = loc(1); sym(1).Node = node; } break; -case 94: - -case 95: - case 96: case 97: @@ -768,25 +766,29 @@ case 122: case 123: case 124: + +case 125: + +case 126: { sym(1).sval = driver->intern(lexer->characterBuffer(), lexer->characterCount()); } break; -case 129: { +case 131: { 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 130: { +case 132: { 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 131: { +case 133: { AST::NewMemberExpression *node = makeAstNode<AST::NewMemberExpression> (driver->nodePool(), sym(2).Expression, sym(4).ArgumentList); node->newToken = loc(1); node->lparenToken = loc(3); @@ -794,316 +796,309 @@ case 131: { sym(1).Node = node; } break; -case 133: { +case 135: { AST::NewExpression *node = makeAstNode<AST::NewExpression> (driver->nodePool(), sym(2).Expression); node->newToken = loc(1); sym(1).Node = node; } break; -case 134: { +case 136: { 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 135: { +case 137: { 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 136: { +case 138: { 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 137: { +case 139: { 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 138: { +case 140: { sym(1).Node = 0; } break; -case 139: { +case 141: { sym(1).Node = sym(1).ArgumentList->finish(); } break; -case 140: { +case 142: { sym(1).Node = makeAstNode<AST::ArgumentList> (driver->nodePool(), sym(1).Expression); } break; -case 141: { +case 143: { AST::ArgumentList *node = makeAstNode<AST::ArgumentList> (driver->nodePool(), sym(1).ArgumentList, sym(3).Expression); node->commaToken = loc(2); sym(1).Node = node; } break; -case 145: { +case 147: { AST::PostIncrementExpression *node = makeAstNode<AST::PostIncrementExpression> (driver->nodePool(), sym(1).Expression); node->incrementToken = loc(2); sym(1).Node = node; } break; -case 146: { +case 148: { AST::PostDecrementExpression *node = makeAstNode<AST::PostDecrementExpression> (driver->nodePool(), sym(1).Expression); node->decrementToken = loc(2); sym(1).Node = node; } break; -case 148: { +case 150: { AST::DeleteExpression *node = makeAstNode<AST::DeleteExpression> (driver->nodePool(), sym(2).Expression); node->deleteToken = loc(1); sym(1).Node = node; } break; -case 149: { +case 151: { AST::VoidExpression *node = makeAstNode<AST::VoidExpression> (driver->nodePool(), sym(2).Expression); node->voidToken = loc(1); sym(1).Node = node; } break; -case 150: { +case 152: { AST::TypeOfExpression *node = makeAstNode<AST::TypeOfExpression> (driver->nodePool(), sym(2).Expression); node->typeofToken = loc(1); sym(1).Node = node; } break; -case 151: { +case 153: { AST::PreIncrementExpression *node = makeAstNode<AST::PreIncrementExpression> (driver->nodePool(), sym(2).Expression); node->incrementToken = loc(1); sym(1).Node = node; } break; -case 152: { +case 154: { AST::PreDecrementExpression *node = makeAstNode<AST::PreDecrementExpression> (driver->nodePool(), sym(2).Expression); node->decrementToken = loc(1); sym(1).Node = node; } break; -case 153: { +case 155: { AST::UnaryPlusExpression *node = makeAstNode<AST::UnaryPlusExpression> (driver->nodePool(), sym(2).Expression); node->plusToken = loc(1); sym(1).Node = node; } break; -case 154: { +case 156: { AST::UnaryMinusExpression *node = makeAstNode<AST::UnaryMinusExpression> (driver->nodePool(), sym(2).Expression); node->minusToken = loc(1); sym(1).Node = node; } break; -case 155: { +case 157: { AST::TildeExpression *node = makeAstNode<AST::TildeExpression> (driver->nodePool(), sym(2).Expression); node->tildeToken = loc(1); sym(1).Node = node; } break; -case 156: { +case 158: { AST::NotExpression *node = makeAstNode<AST::NotExpression> (driver->nodePool(), sym(2).Expression); node->notToken = loc(1); sym(1).Node = node; } break; -case 158: { +case 160: { 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 159: { +case 161: { 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 160: { +case 162: { 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 162: { +case 164: { 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 163: { +case 165: { 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 165: { +case 167: { 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 166: { +case 168: { 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 167: { +case 169: { 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 169: { +case 171: { 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 170: { +case 172: { 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 171: { +case 173: { 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 172: { +case 174: { 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 173: { +case 175: { 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 174: { +case 176: { 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 176: { +case 178: { 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 177: { +case 179: { 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 178: { +case 180: { 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 179: { +case 181: { 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 180: { +case 182: { 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 182: { +case 184: { 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 183: { +case 185: { 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 184: { +case 186: { 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 185: { +case 187: { 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 187: { +case 189: { 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 188: { +case 190: { 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 189: { +case 191: { 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 190: { - 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 192: { AST::BinaryExpression *node = makeAstNode<AST::BinaryExpression> (driver->nodePool(), sym(1).Expression, - QSOperator::BitAnd, sym(3).Expression); + QSOperator::StrictNotEqual, sym(3).Expression); node->operatorToken = loc(2); sym(1).Node = node; } break; @@ -1117,7 +1112,7 @@ case 194: { case 196: { AST::BinaryExpression *node = makeAstNode<AST::BinaryExpression> (driver->nodePool(), sym(1).Expression, - QSOperator::BitXor, sym(3).Expression); + QSOperator::BitAnd, sym(3).Expression); node->operatorToken = loc(2); sym(1).Node = node; } break; @@ -1131,7 +1126,7 @@ case 198: { case 200: { AST::BinaryExpression *node = makeAstNode<AST::BinaryExpression> (driver->nodePool(), sym(1).Expression, - QSOperator::BitOr, sym(3).Expression); + QSOperator::BitXor, sym(3).Expression); node->operatorToken = loc(2); sym(1).Node = node; } break; @@ -1145,7 +1140,7 @@ case 202: { case 204: { AST::BinaryExpression *node = makeAstNode<AST::BinaryExpression> (driver->nodePool(), sym(1).Expression, - QSOperator::And, sym(3).Expression); + QSOperator::BitOr, sym(3).Expression); node->operatorToken = loc(2); sym(1).Node = node; } break; @@ -1159,7 +1154,7 @@ case 206: { case 208: { AST::BinaryExpression *node = makeAstNode<AST::BinaryExpression> (driver->nodePool(), sym(1).Expression, - QSOperator::Or, sym(3).Expression); + QSOperator::And, sym(3).Expression); node->operatorToken = loc(2); sym(1).Node = node; } break; @@ -1172,6 +1167,13 @@ case 210: { } break; case 212: { + 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 214: { AST::ConditionalExpression *node = makeAstNode<AST::ConditionalExpression> (driver->nodePool(), sym(1).Expression, sym(3).Expression, sym(5).Expression); node->questionToken = loc(2); @@ -1179,7 +1181,7 @@ case 212: { sym(1).Node = node; } break; -case 214: { +case 216: { AST::ConditionalExpression *node = makeAstNode<AST::ConditionalExpression> (driver->nodePool(), sym(1).Expression, sym(3).Expression, sym(5).Expression); node->questionToken = loc(2); @@ -1187,112 +1189,112 @@ case 214: { sym(1).Node = node; } break; -case 216: { +case 218: { 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 218: { +case 220: { 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 219: { +case 221: { sym(1).ival = QSOperator::Assign; } break; -case 220: { +case 222: { sym(1).ival = QSOperator::InplaceMul; } break; -case 221: { +case 223: { sym(1).ival = QSOperator::InplaceDiv; } break; -case 222: { +case 224: { sym(1).ival = QSOperator::InplaceMod; } break; -case 223: { +case 225: { sym(1).ival = QSOperator::InplaceAdd; } break; -case 224: { +case 226: { sym(1).ival = QSOperator::InplaceSub; } break; -case 225: { +case 227: { sym(1).ival = QSOperator::InplaceLeftShift; } break; -case 226: { +case 228: { sym(1).ival = QSOperator::InplaceRightShift; } break; -case 227: { +case 229: { sym(1).ival = QSOperator::InplaceURightShift; } break; -case 228: { +case 230: { sym(1).ival = QSOperator::InplaceAnd; } break; -case 229: { +case 231: { sym(1).ival = QSOperator::InplaceXor; } break; -case 230: { +case 232: { sym(1).ival = QSOperator::InplaceOr; } break; -case 232: { +case 234: { AST::Expression *node = makeAstNode<AST::Expression> (driver->nodePool(), sym(1).Expression, sym(3).Expression); node->commaToken = loc(2); sym(1).Node = node; } break; -case 233: { +case 235: { sym(1).Node = 0; } break; -case 236: { +case 238: { AST::Expression *node = makeAstNode<AST::Expression> (driver->nodePool(), sym(1).Expression, sym(3).Expression); node->commaToken = loc(2); sym(1).Node = node; } break; -case 237: { +case 239: { sym(1).Node = 0; } break; -case 254: { +case 256: { 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 255: { +case 257: { sym(1).Node = makeAstNode<AST::StatementList> (driver->nodePool(), sym(1).Statement); } break; -case 256: { +case 258: { sym(1).Node = makeAstNode<AST::StatementList> (driver->nodePool(), sym(1).StatementList, sym(2).Statement); } break; -case 257: { +case 259: { sym(1).Node = 0; } break; -case 258: { +case 260: { sym(1).Node = sym(1).StatementList->finish (); } break; -case 260: { +case 262: { AST::VariableStatement *node = makeAstNode<AST::VariableStatement> (driver->nodePool(), sym(2).VariableDeclarationList->finish (/*readOnly=*/sym(1).ival == T_CONST)); node->declarationKindToken = loc(1); @@ -1300,76 +1302,76 @@ case 260: { sym(1).Node = node; } break; -case 261: { +case 263: { sym(1).ival = T_CONST; } break; -case 262: { +case 264: { sym(1).ival = T_VAR; } break; -case 263: { +case 265: { sym(1).Node = makeAstNode<AST::VariableDeclarationList> (driver->nodePool(), sym(1).VariableDeclaration); } break; -case 264: { +case 266: { AST::VariableDeclarationList *node = makeAstNode<AST::VariableDeclarationList> (driver->nodePool(), sym(1).VariableDeclarationList, sym(3).VariableDeclaration); node->commaToken = loc(2); sym(1).Node = node; } break; -case 265: { +case 267: { sym(1).Node = makeAstNode<AST::VariableDeclarationList> (driver->nodePool(), sym(1).VariableDeclaration); } break; -case 266: { +case 268: { sym(1).Node = makeAstNode<AST::VariableDeclarationList> (driver->nodePool(), sym(1).VariableDeclarationList, sym(3).VariableDeclaration); } break; -case 267: { +case 269: { AST::VariableDeclaration *node = makeAstNode<AST::VariableDeclaration> (driver->nodePool(), sym(1).sval, sym(2).Expression); node->identifierToken = loc(1); sym(1).Node = node; } break; -case 268: { +case 270: { AST::VariableDeclaration *node = makeAstNode<AST::VariableDeclaration> (driver->nodePool(), sym(1).sval, sym(2).Expression); node->identifierToken = loc(1); sym(1).Node = node; } break; -case 269: { +case 271: { // ### TODO: AST for initializer sym(1) = sym(2); } break; -case 270: { +case 272: { sym(1).Node = 0; } break; -case 272: { +case 274: { // ### TODO: AST for initializer sym(1) = sym(2); } break; -case 273: { +case 275: { sym(1).Node = 0; } break; -case 275: { +case 277: { AST::EmptyStatement *node = makeAstNode<AST::EmptyStatement> (driver->nodePool()); node->semicolonToken = loc(1); sym(1).Node = node; } break; -case 277: { +case 279: { AST::ExpressionStatement *node = makeAstNode<AST::ExpressionStatement> (driver->nodePool(), sym(1).Expression); node->semicolonToken = loc(2); sym(1).Node = node; } break; -case 278: { +case 280: { 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); @@ -1378,7 +1380,7 @@ case 278: { sym(1).Node = node; } break; -case 279: { +case 281: { AST::IfStatement *node = makeAstNode<AST::IfStatement> (driver->nodePool(), sym(3).Expression, sym(5).Statement); node->ifToken = loc(1); node->lparenToken = loc(2); @@ -1386,7 +1388,7 @@ case 279: { sym(1).Node = node; } break; -case 281: { +case 283: { AST::DoWhileStatement *node = makeAstNode<AST::DoWhileStatement> (driver->nodePool(), sym(2).Statement, sym(5).Expression); node->doToken = loc(1); node->whileToken = loc(3); @@ -1396,7 +1398,7 @@ case 281: { sym(1).Node = node; } break; -case 282: { +case 284: { AST::WhileStatement *node = makeAstNode<AST::WhileStatement> (driver->nodePool(), sym(3).Expression, sym(5).Statement); node->whileToken = loc(1); node->lparenToken = loc(2); @@ -1404,7 +1406,7 @@ case 282: { sym(1).Node = node; } break; -case 283: { +case 285: { AST::ForStatement *node = makeAstNode<AST::ForStatement> (driver->nodePool(), sym(3).Expression, sym(5).Expression, sym(7).Expression, sym(9).Statement); node->forToken = loc(1); @@ -1415,7 +1417,7 @@ case 283: { sym(1).Node = node; } break; -case 284: { +case 286: { AST::LocalForStatement *node = makeAstNode<AST::LocalForStatement> (driver->nodePool(), sym(4).VariableDeclarationList->finish (/*readOnly=*/false), sym(6).Expression, sym(8).Expression, sym(10).Statement); @@ -1428,7 +1430,7 @@ case 284: { sym(1).Node = node; } break; -case 285: { +case 287: { AST:: ForEachStatement *node = makeAstNode<AST::ForEachStatement> (driver->nodePool(), sym(3).Expression, sym(5).Expression, sym(7).Statement); node->forToken = loc(1); @@ -1438,7 +1440,7 @@ case 285: { sym(1).Node = node; } break; -case 286: { +case 288: { AST::LocalForEachStatement *node = makeAstNode<AST::LocalForEachStatement> (driver->nodePool(), sym(4).VariableDeclaration, sym(6).Expression, sym(8).Statement); node->forToken = loc(1); @@ -1449,14 +1451,14 @@ case 286: { sym(1).Node = node; } break; -case 288: { +case 290: { AST::ContinueStatement *node = makeAstNode<AST::ContinueStatement> (driver->nodePool()); node->continueToken = loc(1); node->semicolonToken = loc(2); sym(1).Node = node; } break; -case 290: { +case 292: { AST::ContinueStatement *node = makeAstNode<AST::ContinueStatement> (driver->nodePool(), sym(2).sval); node->continueToken = loc(1); node->identifierToken = loc(2); @@ -1464,14 +1466,14 @@ case 290: { sym(1).Node = node; } break; -case 292: { +case 294: { AST::BreakStatement *node = makeAstNode<AST::BreakStatement> (driver->nodePool()); node->breakToken = loc(1); node->semicolonToken = loc(2); sym(1).Node = node; } break; -case 294: { +case 296: { AST::BreakStatement *node = makeAstNode<AST::BreakStatement> (driver->nodePool(), sym(2).sval); node->breakToken = loc(1); node->identifierToken = loc(2); @@ -1479,14 +1481,14 @@ case 294: { sym(1).Node = node; } break; -case 296: { +case 298: { 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 297: { +case 299: { AST::WithStatement *node = makeAstNode<AST::WithStatement> (driver->nodePool(), sym(3).Expression, sym(5).Statement); node->withToken = loc(1); node->lparenToken = loc(2); @@ -1494,7 +1496,7 @@ case 297: { sym(1).Node = node; } break; -case 298: { +case 300: { AST::SwitchStatement *node = makeAstNode<AST::SwitchStatement> (driver->nodePool(), sym(3).Expression, sym(5).CaseBlock); node->switchToken = loc(1); node->lparenToken = loc(2); @@ -1502,90 +1504,90 @@ case 298: { sym(1).Node = node; } break; -case 299: { +case 301: { 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 300: { +case 302: { 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 301: { +case 303: { sym(1).Node = makeAstNode<AST::CaseClauses> (driver->nodePool(), sym(1).CaseClause); } break; -case 302: { +case 304: { sym(1).Node = makeAstNode<AST::CaseClauses> (driver->nodePool(), sym(1).CaseClauses, sym(2).CaseClause); } break; -case 303: { +case 305: { sym(1).Node = 0; } break; -case 304: { +case 306: { sym(1).Node = sym(1).CaseClauses->finish (); } break; -case 305: { +case 307: { 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 306: { +case 308: { 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 307: -case 308: { +case 309: +case 310: { 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 309: { +case 311: { 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 311: { +case 313: { 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 312: { +case 314: { AST::TryStatement *node = makeAstNode<AST::TryStatement> (driver->nodePool(), sym(2).Statement, sym(3).Catch); node->tryToken = loc(1); sym(1).Node = node; } break; -case 313: { +case 315: { AST::TryStatement *node = makeAstNode<AST::TryStatement> (driver->nodePool(), sym(2).Statement, sym(3).Finally); node->tryToken = loc(1); sym(1).Node = node; } break; -case 314: { +case 316: { 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 315: { +case 317: { AST::Catch *node = makeAstNode<AST::Catch> (driver->nodePool(), sym(3).sval, sym(5).Block); node->catchToken = loc(1); node->lparenToken = loc(2); @@ -1594,20 +1596,20 @@ case 315: { sym(1).Node = node; } break; -case 316: { +case 318: { AST::Finally *node = makeAstNode<AST::Finally> (driver->nodePool(), sym(2).Block); node->finallyToken = loc(1); sym(1).Node = node; } break; -case 318: { +case 320: { AST::DebuggerStatement *node = makeAstNode<AST::DebuggerStatement> (driver->nodePool()); node->debuggerToken = loc(1); node->semicolonToken = loc(2); sym(1).Node = node; } break; -case 319: { +case 321: { 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); @@ -1618,7 +1620,7 @@ case 319: { sym(1).Node = node; } break; -case 320: { +case 322: { 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) @@ -1630,56 +1632,56 @@ case 320: { sym(1).Node = node; } break; -case 321: { +case 323: { AST::FormalParameterList *node = makeAstNode<AST::FormalParameterList> (driver->nodePool(), sym(1).sval); node->identifierToken = loc(1); sym(1).Node = node; } break; -case 322: { +case 324: { 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 323: { +case 325: { sym(1).Node = 0; } break; -case 324: { +case 326: { sym(1).Node = sym(1).FormalParameterList->finish (); } break; -case 325: { +case 327: { sym(1).Node = 0; } break; -case 327: { +case 329: { sym(1).Node = makeAstNode<AST::FunctionBody> (driver->nodePool(), sym(1).SourceElements->finish ()); } break; -case 328: { +case 330: { sym(1).Node = makeAstNode<AST::SourceElements> (driver->nodePool(), sym(1).SourceElement); } break; -case 329: { +case 331: { sym(1).Node = makeAstNode<AST::SourceElements> (driver->nodePool(), sym(1).SourceElements, sym(2).SourceElement); } break; -case 330: { +case 332: { sym(1).Node = makeAstNode<AST::StatementSourceElement> (driver->nodePool(), sym(1).Statement); } break; -case 331: { +case 333: { sym(1).Node = makeAstNode<AST::FunctionSourceElement> (driver->nodePool(), sym(1).FunctionDeclaration); } break; -case 332: { +case 334: { sym(1).sval = 0; } break; -case 334: { +case 336: { sym(1).Node = 0; } break; diff --git a/src/declarative/qml/parser/qmljsparser_p.h b/src/declarative/qml/parser/qmljsparser_p.h index 6f36484..17f33d6 100644 --- a/src/declarative/qml/parser/qmljsparser_p.h +++ b/src/declarative/qml/parser/qmljsparser_p.h @@ -219,9 +219,9 @@ protected: -#define J_SCRIPT_REGEXPLITERAL_RULE1 68 +#define J_SCRIPT_REGEXPLITERAL_RULE1 70 -#define J_SCRIPT_REGEXPLITERAL_RULE2 69 +#define J_SCRIPT_REGEXPLITERAL_RULE2 71 QT_END_NAMESPACE |