--- parser3/src/main/compile.tab.C 2004/06/18 15:55:47 1.103 +++ parser3/src/main/compile.tab.C 2005/08/05 13:01:16 1.103.8.1 @@ -43,7 +43,7 @@ Copyright (c) 2001, 2003 ArtLebedev Group (http://www.artlebedev.com) Author: Alexander Petrosyan (http://design.ru/paf) - $Id: compile.tab.C,v 1.103 2004/06/18 15:55:47 paf Exp $ + $Id: compile.tab.C,v 1.103.8.1 2005/08/05 13:01:16 paf Exp $ */ /** @@ -105,11 +105,11 @@ static int yylex(YYSTYPE* lvalp, void* p -#define YYFINAL 259 +#define YYFINAL 260 #define YYFLAG -32768 #define YYNTBASE 60 -#define YYTRANSLATE(x) ((unsigned)(x) <= 286 ? yytranslate[x] : 146) +#define YYTRANSLATE(x) ((unsigned)(x) <= 286 ? yytranslate[x] : 147) static const char yytranslate[] = { 0, 2, 2, 2, 2, 2, 2, 2, 2, 2, 46, @@ -161,18 +161,18 @@ static const short yyprhs[] = { 0, 330, 333, 336, 339, 342, 345, 348, 352, 356, 360, 364, 368, 372, 376, 380, 384, 388, 392, 396, 400, 404, 408, 412, 416, 420, 424, 428, 432, 436, 440, - 444, 448, 452, 456, 458, 460, 461 + 444, 448, 452, 456, 458, 460, 462, 463 }; static const short yyrhs[] = { 62, 0, 61, 0, 63, 0, 61, 63, 0, 76, 0, - 64, 0, 69, 0, 45, 4, 46, 65, 0, 145, + 64, 0, 69, 0, 45, 4, 46, 65, 0, 146, 0, 66, 0, 67, 0, 66, 67, 0, 68, 46, - 0, 145, 0, 4, 0, 0, 45, 4, 72, 71, - 75, 46, 70, 76, 0, 145, 0, 72, 0, 47, - 73, 48, 0, 145, 0, 74, 0, 4, 0, 74, - 49, 4, 0, 145, 0, 4, 0, 145, 0, 77, - 0, 78, 0, 77, 78, 0, 143, 0, 79, 0, + 0, 146, 0, 4, 0, 0, 45, 4, 72, 71, + 75, 46, 70, 76, 0, 146, 0, 72, 0, 47, + 73, 48, 0, 146, 0, 74, 0, 4, 0, 74, + 49, 4, 0, 146, 0, 4, 0, 146, 0, 77, + 0, 78, 0, 77, 78, 0, 144, 0, 79, 0, 80, 0, 88, 0, 103, 0, 81, 0, 50, 82, 0, 84, 3, 0, 83, 0, 51, 84, 52, 0, 85, 0, 86, 0, 87, 0, 137, 87, 0, 127, @@ -180,7 +180,7 @@ static const short yyrhs[] = { 62, 91, 0, 92, 0, 123, 0, 53, 123, 0, 137, 123, 0, 94, 0, 97, 0, 98, 0, 0, 0, 47, 95, 99, 96, 48, 0, 54, 140, 55, 0, - 51, 76, 52, 0, 144, 0, 4, 0, 100, 0, + 51, 76, 52, 0, 145, 0, 4, 0, 100, 0, 101, 0, 102, 0, 79, 0, 78, 77, 0, 104, 0, 0, 0, 56, 105, 107, 106, 108, 3, 0, 84, 0, 109, 0, 108, 109, 0, 110, 0, 113, @@ -188,15 +188,15 @@ static const short yyrhs[] = { 62, 0, 54, 116, 55, 0, 51, 117, 52, 0, 118, 0, 115, 49, 118, 0, 119, 0, 116, 49, 119, 0, 120, 0, 117, 49, 120, 0, 121, 0, 122, - 0, 76, 0, 144, 0, 4, 0, 100, 0, 140, + 0, 76, 0, 145, 0, 4, 0, 100, 0, 140, 0, 128, 0, 124, 128, 0, 125, 0, 124, 125, 0, 126, 53, 0, 128, 0, 128, 0, 4, 5, 0, 4, 0, 129, 0, 130, 0, 131, 0, 50, 134, 0, 4, 135, 0, 0, 0, 47, 132, 77, 133, 48, 0, 4, 0, 136, 0, 135, 136, 0, 50, 134, 0, 138, 0, 139, 0, 4, 57, 0, - 138, 57, 0, 141, 0, 4, 0, 81, 0, 104, - 0, 58, 142, 58, 0, 59, 142, 59, 0, 54, + 138, 57, 0, 141, 0, 142, 0, 81, 0, 104, + 0, 58, 143, 58, 0, 59, 143, 59, 0, 54, 141, 55, 0, 37, 141, 0, 36, 141, 0, 43, 141, 0, 44, 141, 0, 27, 141, 0, 28, 141, 0, 29, 141, 0, 30, 141, 0, 141, 37, 141, @@ -210,8 +210,8 @@ static const short yyrhs[] = { 62, 17, 141, 0, 141, 18, 141, 0, 141, 21, 141, 0, 141, 22, 141, 0, 141, 23, 141, 0, 141, 24, 141, 0, 141, 25, 141, 0, 141, 26, 141, - 0, 141, 31, 141, 0, 76, 0, 4, 0, 0, - 0 + 0, 141, 31, 141, 0, 4, 0, 76, 0, 4, + 0, 0, 0 }; #endif @@ -230,11 +230,11 @@ static const short yyrline[] = { 0, 444, 448, 452, 454, 455, 457, 466, 466, 468, 468, 469, 470, 478, 483, 485, 487, 488, 489, 491, 495, 504, 507, 509, 515, 520, 520, 521, 526, 528, 530, - 542, 554, 559, 561, 562, 563, 564, 565, 567, 568, - 569, 570, 571, 572, 573, 574, 576, 577, 578, 579, - 580, 581, 582, 583, 584, 585, 586, 587, 588, 589, - 590, 591, 592, 593, 594, 595, 596, 597, 598, 599, - 600, 601, 602, 605, 614, 619, 620 + 542, 554, 555, 557, 558, 559, 560, 561, 563, 564, + 565, 566, 567, 568, 569, 570, 572, 573, 574, 575, + 576, 577, 578, 579, 580, 581, 582, 583, 584, 585, + 586, 587, 588, 589, 590, 591, 592, 593, 594, 595, + 596, 597, 598, 601, 606, 615, 620, 621 }; #endif @@ -264,8 +264,8 @@ static const char * const yytname[] = { "name_advance1","name_advance2","name_expr_value","name_expr_subvar_value","name_expr_with_subvar_value", "name_square_code_value","@8","@9","subvar_ref_name_rdive","subvar_get_writes", "subvar__get_write","class_prefix","class_static_prefix","class_constructor_prefix", -"expr_value","expr","string_inside_quotes_value","write_string","void_value", -"empty", NULL +"expr_value","expr","double_or_STRING","string_inside_quotes_value","write_string", +"void_value","empty", NULL }; #endif @@ -286,7 +286,7 @@ static const short yyr1[] = { 0, 141, 141, 141, 141, 141, 141, 141, 141, 141, 141, 141, 141, 141, 141, 141, 141, 141, 141, 141, 141, 141, 141, 141, 141, 141, 141, 141, 141, 141, 141, - 141, 141, 141, 142, 143, 144, 145 + 141, 141, 141, 142, 143, 144, 145, 146 }; static const short yyr2[] = { 0, @@ -306,197 +306,197 @@ static const short yyr2[] = { 0, 2, 2, 2, 2, 2, 2, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, - 3, 3, 3, 1, 1, 0, 0 + 3, 3, 3, 1, 1, 1, 0, 0 }; -static const short yydefact[] = { 167, - 165, 0, 0, 70, 2, 1, 3, 6, 7, 5, +static const short yydefact[] = { 168, + 166, 0, 0, 70, 2, 1, 3, 6, 7, 5, 28, 29, 32, 33, 36, 34, 35, 69, 31, 27, 0, 105, 111, 0, 0, 0, 37, 39, 0, 41, 42, 43, 0, 48, 49, 50, 51, 0, 99, 0, 45, 97, 106, 107, 108, 0, 118, 119, 0, 4, - 30, 167, 167, 167, 104, 0, 120, 110, 115, 0, + 30, 168, 168, 168, 104, 0, 120, 110, 115, 0, 114, 109, 0, 0, 103, 0, 105, 52, 0, 97, - 38, 57, 167, 0, 47, 54, 55, 56, 105, 100, + 38, 57, 168, 0, 47, 54, 55, 56, 105, 100, 46, 98, 101, 44, 53, 121, 73, 71, 15, 8, - 10, 11, 0, 9, 23, 0, 22, 21, 167, 19, - 18, 117, 116, 112, 40, 98, 166, 0, 123, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 167, - 167, 124, 125, 0, 122, 0, 12, 14, 13, 20, - 0, 26, 0, 25, 0, 165, 0, 32, 58, 64, - 65, 66, 62, 61, 133, 134, 135, 136, 130, 129, - 131, 132, 0, 164, 0, 0, 60, 0, 0, 0, + 10, 11, 0, 9, 23, 0, 22, 21, 168, 19, + 18, 117, 116, 112, 40, 98, 167, 0, 164, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 168, + 168, 124, 125, 0, 122, 123, 0, 12, 14, 13, + 20, 0, 26, 0, 25, 0, 166, 0, 32, 58, + 64, 65, 66, 62, 61, 133, 134, 135, 136, 130, + 129, 131, 132, 0, 165, 0, 0, 60, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 79, 167, 0, 0, 74, 76, - 77, 78, 24, 16, 113, 68, 0, 128, 126, 127, - 148, 149, 150, 147, 153, 154, 155, 156, 143, 144, - 157, 158, 159, 160, 161, 162, 163, 151, 152, 146, - 145, 138, 137, 139, 140, 142, 141, 166, 92, 0, - 88, 0, 86, 91, 96, 72, 75, 167, 59, 165, - 95, 80, 84, 90, 93, 167, 83, 0, 82, 17, - 166, 0, 89, 87, 85, 81, 0, 0, 0 + 0, 0, 0, 0, 0, 79, 168, 0, 0, 74, + 76, 77, 78, 24, 16, 113, 68, 0, 128, 126, + 127, 148, 149, 150, 147, 153, 154, 155, 156, 143, + 144, 157, 158, 159, 160, 161, 162, 163, 151, 152, + 146, 145, 138, 137, 139, 140, 142, 141, 167, 92, + 0, 88, 0, 86, 91, 96, 72, 75, 168, 59, + 166, 95, 80, 84, 90, 93, 168, 83, 0, 82, + 17, 167, 0, 89, 87, 85, 81, 0, 0, 0 }; -static const short yydefgoto[] = { 257, - 5, 6, 7, 8, 90, 91, 92, 93, 9, 238, - 99, 54, 96, 97, 133, 154, 11, 12, 13, 14, +static const short yydefgoto[] = { 258, + 5, 6, 7, 8, 90, 91, 92, 93, 9, 239, + 99, 54, 96, 97, 134, 155, 11, 12, 13, 14, 122, 27, 28, 29, 30, 31, 32, 16, 33, 34, - 35, 36, 75, 76, 107, 197, 77, 78, 139, 241, - 141, 142, 17, 123, 49, 126, 88, 188, 189, 190, - 228, 252, 191, 192, 242, 232, 230, 243, 233, 231, - 244, 234, 37, 64, 39, 40, 41, 65, 43, 44, - 45, 60, 135, 62, 58, 59, 66, 47, 48, 235, - 125, 155, 19, 245, 20 + 35, 36, 75, 76, 107, 198, 77, 78, 140, 242, + 142, 143, 17, 123, 49, 127, 88, 189, 190, 191, + 229, 253, 192, 193, 243, 233, 231, 244, 234, 232, + 245, 235, 37, 64, 39, 40, 41, 65, 43, 44, + 45, 60, 136, 62, 58, 59, 66, 47, 48, 236, + 125, 126, 156, 19, 246, 20 }; -static const short yypact[] = { 34, --32768, 16, 61,-32768, -19,-32768,-32768,-32768,-32768,-32768, - 11,-32768,-32768,-32768,-32768,-32768,-32768,-32768,-32768,-32768, - -14, 9,-32768, 30, 94, 106,-32768,-32768, 44,-32768, --32768,-32768, -26,-32768,-32768,-32768,-32768, 111,-32768, -2, --32768, 5,-32768,-32768,-32768, 111, -4,-32768, 94,-32768, --32768, 65, 72, 31,-32768, 30,-32768, 41,-32768, 11, --32768,-32768, 28, 111, 40, 111, 41,-32768, 106, 40, --32768,-32768, 11, 27,-32768,-32768,-32768,-32768, 18,-32768, --32768, 5,-32768,-32768,-32768,-32768,-32768,-32768,-32768,-32768, - 6,-32768, 59, 67,-32768, 70, 77,-32768, 115,-32768, --32768,-32768,-32768, 11,-32768, 40, 38, 75,-32768, 27, - 27, 27, 27, 27, 27, 27, 27, 83, 27, 11, - 11,-32768,-32768, 73, 315, 78,-32768,-32768,-32768,-32768, - 127,-32768, 89,-32768, 88, 90, 11, -3,-32768,-32768, --32768,-32768,-32768,-32768, 140, 140, 140, 140,-32768,-32768, --32768,-32768, 270,-32768, 84, 87,-32768, 27, 27, 27, - 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, - 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, - 27, 27, 27, 27,-32768, 11, 27, 45,-32768,-32768, --32768,-32768,-32768,-32768,-32768, 11, 95,-32768,-32768,-32768, - 405, 377, 346, 278, 433, 433, 131, 131, 154, 154, - 433, 433, 433, 433, 131, 131, 140, 433, 433, 164, - 441, 178, 178,-32768,-32768,-32768,-32768, 39,-32768, -25, --32768, -33,-32768,-32768,-32768,-32768,-32768, 11,-32768, 68, --32768, 100,-32768,-32768,-32768, 11,-32768, 27,-32768,-32768, - 39, 104,-32768,-32768,-32768,-32768, 155, 157,-32768 +static const short yypact[] = { 5, +-32768, 22, 35,-32768, -13,-32768,-32768,-32768,-32768,-32768, + 8,-32768,-32768,-32768,-32768,-32768,-32768,-32768,-32768,-32768, + -9, 9,-32768, 36, 20, 44,-32768,-32768, 40,-32768, +-32768,-32768, -29,-32768,-32768,-32768,-32768, 52,-32768, -8, +-32768, 4,-32768,-32768,-32768, 52, -3,-32768, 20,-32768, +-32768, 72, 120, 90,-32768, 36,-32768, 89,-32768, 8, +-32768,-32768, 92, 52, 88, 52, 89,-32768, 44, 88, +-32768,-32768, 8, 99,-32768,-32768,-32768,-32768, 18,-32768, +-32768, 4,-32768,-32768,-32768,-32768,-32768,-32768,-32768,-32768, + 32,-32768, 100, 101,-32768, 97, 102,-32768, 146,-32768, +-32768,-32768,-32768, 8,-32768, 88, 13, 121,-32768, 99, + 99, 99, 99, 99, 99, 99, 99, 42, 99, 8, + 8,-32768,-32768, 117, 316,-32768, 54,-32768,-32768,-32768, +-32768, 148,-32768, 108,-32768, 150, 166, 8, 31,-32768, +-32768,-32768,-32768,-32768,-32768, 444, 444, 444, 444,-32768, +-32768,-32768,-32768, 271,-32768, 158, 159,-32768, 99, 99, + 99, 99, 99, 99, 99, 99, 99, 99, 99, 99, + 99, 99, 99, 99, 99, 99, 99, 99, 99, 99, + 99, 99, 99, 99, 99,-32768, 8, 99, 30,-32768, +-32768,-32768,-32768,-32768,-32768,-32768, 8, 169,-32768,-32768, +-32768, 375, 145, 347, 279, 403, 403, 416, 416, 164, + 164, 403, 403, 403, 403, 416, 416, 444, 403, 403, + 76, 155, 93, 93,-32768,-32768,-32768,-32768, 15,-32768, + -21,-32768, -28,-32768,-32768,-32768,-32768,-32768, 8,-32768, + 70,-32768, 170,-32768,-32768,-32768, 8,-32768, 99,-32768, +-32768, 15, 172,-32768,-32768,-32768,-32768, 221, 223,-32768 }; static const short yypgoto[] = {-32768, --32768,-32768, 158,-32768,-32768,-32768, 82,-32768,-32768,-32768, --32768, 110,-32768,-32768,-32768, 1, -55, -7, -104,-32768, - 0,-32768,-32768, -13,-32768,-32768, -27,-32768,-32768,-32768, --32768,-32768,-32768,-32768,-32768,-32768,-32768,-32768,-32768, 107, --32768,-32768,-32768, 2,-32768,-32768,-32768,-32768, -6,-32768, --32768,-32768,-32768,-32768,-32768,-32768,-32768, -66, -51, -24, --32768,-32768, -9, 4, -29,-32768, -20, 3,-32768,-32768, --32768,-32768,-32768, 167,-32768, 162, 221,-32768,-32768, 151, - 96, 105,-32768, 120, 49 +-32768,-32768, 219,-32768,-32768,-32768, 134,-32768,-32768,-32768, +-32768, 173,-32768,-32768,-32768, 1, -55, -7, -104,-32768, + 0,-32768,-32768, -5,-32768,-32768, -36,-32768,-32768,-32768, +-32768,-32768,-32768,-32768,-32768,-32768,-32768,-32768,-32768, 119, +-32768,-32768,-32768, 2,-32768,-32768,-32768,-32768, 39,-32768, +-32768,-32768,-32768,-32768,-32768,-32768,-32768, -20, -19, -14, +-32768,-32768, -11, 84, -22,-32768, -30, 3,-32768,-32768, +-32768,-32768,-32768, 178,-32768, 177, 233,-32768,-32768, 163, + 96,-32768, 122,-32768, 131, -1 }; -#define YYLAST 482 +#define YYLAST 485 static const short yytable[] = { 15, - 10, 18, 138, 51, 104, 42, 38, -103, 80, 89, - 15, 63, 18, 55, 1, 248, 68, 81, 84, 21, - 72, 249, 55, 246, 73, 2, 247, 74, 70, 69, - 109, 52, 53, 61, 80, 87, 85, 1, 84, 80, - 82, 136, 240, 81, -67, -67, 71, 236, 42, 38, - 83, -167, 86, 110, 111, 112, 113, -102, 56, 15, - 3, 18, 114, 115, 22, 57, 4, 56, 89, 116, - 117, 106, 15, 108, 18, 95, 118, 53, 2, 105, - 119, 196, 4, 3, 120, 121, 22, 3, 3, 4, - 56, 185, -102, 4, 4, 186, 51, 22, 187, 137, - 94, 98, 101, 15, 129, 18, 15, 23, 18, 67, - 24, 25, -14, 26, 79, -94, -94, 130, 132, 15, - 15, 18, 18, 138, 185, 131, 144, 157, 186, 23, - 193, 187, 24, 25, 194, 195, 15, -63, 18, 128, - 23, 199, 239, 24, 161, 200, 138, 134, 251, 166, - 167, 256, 23, 161, 258, 24, 259, 23, 166, 167, - 24, 174, 50, 100, 177, 178, 179, 180, 181, 182, - 183, 184, 127, 177, 178, 179, 180, 181, 182, 183, - 184, 237, 166, 167, 255, 15, 229, 18, 51, 179, - 180, 181, 182, 183, 184, 15, 254, 18, 178, 179, - 180, 181, 182, 183, 184, 145, 146, 147, 148, 149, - 150, 151, 152, 140, 153, 181, 182, 183, 184, 103, - 137, 253, 102, 46, 124, 156, 143, 15, 0, 18, - 0, 0, 0, 0, 0, 0, 0, 15, 250, 18, - 0, 0, 0, 137, 0, 15, 229, 18, 0, 0, - 15, 0, 18, 201, 202, 203, 204, 205, 206, 207, + 10, 18, 139, 51, 104, 42, -103, 81, 1, 84, + 15, 1, 18, 55, 68, 80, 137, 72, 241, 63, + 249, 73, 55, 22, 74, 21, 250, 247, 70, 84, + 248, 2, 237, 81, 85, 89, 52, 53, 22, 61, + 82, 80, 71, 87, 83, 22, 80, 67, 42, 2, + 94, 98, 101, 86, 3, 79, -102, 3, 56, 15, + 4, 18, 3, 4, 3, 57, 23, 56, 4, 24, + 4, 106, 15, 108, 18, 89, 186, -168, -67, -67, + 187, 23, 197, 188, 24, 25, 38, 26, 23, 129, + 23, 24, 25, 24, 167, 168, 51, 135, 23, 138, + 186, 24, 109, 15, 187, 18, 15, 188, 18, 69, + 179, 180, 181, 182, 183, 184, 185, -94, -94, 15, + 15, 18, 18, 95, 139, 110, 111, 112, 113, 38, + 182, 183, 184, 185, 114, 115, 53, 15, 56, 18, + -102, 116, 117, 105, 131, 130, -14, 139, 118, 133, + 132, 194, 119, 195, 4, 159, 120, 121, 162, 163, + 164, 165, 166, 167, 168, 169, 170, 171, 172, 173, + 174, 158, 145, 167, 168, 175, 176, 177, 178, 179, + 180, 181, 182, 183, 184, 185, 15, 230, 18, 51, + 180, 181, 182, 183, 184, 185, 15, 196, 18, 180, + 181, 182, 183, 184, 185, 146, 147, 148, 149, 150, + 151, 152, 153, -63, 154, 200, 240, 201, 252, 257, + 259, 138, 260, 50, 128, 141, 100, 238, 15, 255, + 18, 256, 254, 102, 103, 46, 124, 144, 15, 251, + 18, 0, 157, 0, 138, 0, 15, 230, 18, 0, + 0, 15, 0, 18, 202, 203, 204, 205, 206, 207, 208, 209, 210, 211, 212, 213, 214, 215, 216, 217, 218, 219, 220, 221, 222, 223, 224, 225, 226, 227, - 158, 159, 160, 161, 162, 163, 164, 165, 166, 167, - 168, 169, 170, 171, 172, 173, 166, 167, 0, 0, - 174, 175, 176, 177, 178, 179, 180, 181, 182, 183, - 184, 177, 178, 179, 180, 181, 182, 183, 184, 0, - 0, 0, 0, 0, 198, 158, 159, 160, 161, 162, + 228, 159, 160, 161, 162, 163, 164, 165, 166, 167, + 168, 169, 170, 171, 172, 173, 174, 167, 168, 0, + 0, 175, 176, 177, 178, 179, 180, 181, 182, 183, + 184, 185, 178, 179, 180, 181, 182, 183, 184, 185, + 0, 0, 0, 0, 0, 199, 159, 160, 161, 162, 163, 164, 165, 166, 167, 168, 169, 170, 171, 172, - 173, 0, 0, 0, 0, 174, 175, 176, 177, 178, - 179, 180, 181, 182, 183, 184, 158, 159, 0, 161, + 173, 174, 0, 0, 0, 0, 175, 176, 177, 178, + 179, 180, 181, 182, 183, 184, 185, 159, 160, 0, 162, 163, 164, 165, 166, 167, 168, 169, 170, 171, - 172, 173, 0, 0, 0, 0, 174, 175, 176, 177, - 178, 179, 180, 181, 182, 183, 184, 158, 0, 0, - 161, 162, 163, 164, 165, 166, 167, 168, 169, 170, - 171, 172, 173, 0, 0, 0, 0, 174, 175, 176, - 177, 178, 179, 180, 181, 182, 183, 184, 161, 162, - 163, 164, 165, 166, 167, 168, 169, 170, 171, 172, - 173, 0, 0, 0, 0, 174, 175, 176, 177, 178, - 179, 180, 181, 182, 183, 184, 161, 0, 0, 164, - 165, 166, 167, 0, 0, 0, 0, 172, 173, 166, - 167, 0, 0, 174, 0, 0, 177, 178, 179, 180, - 181, 182, 183, 184, 0, 0, 179, 180, 181, 182, - 183, 184 + 172, 173, 174, 0, 0, 0, 0, 175, 176, 177, + 178, 179, 180, 181, 182, 183, 184, 185, 162, 163, + 164, 165, 166, 167, 168, 169, 170, 171, 172, 173, + 174, 0, 0, 0, 0, 175, 176, 177, 178, 179, + 180, 181, 182, 183, 184, 185, 162, 0, 0, 165, + 166, 167, 168, 0, 0, 0, 0, 173, 174, 162, + 0, 0, 0, 175, 167, 168, 178, 179, 180, 181, + 182, 183, 184, 185, 0, 0, 175, 0, 0, 178, + 179, 180, 181, 182, 183, 184, 185, 162, 0, 0, + 0, 0, 167, 168, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 178, 179, 180, + 181, 182, 183, 184, 185 }; static const short yycheck[] = { 0, - 0, 0, 107, 11, 60, 3, 3, 3, 38, 4, - 11, 25, 11, 5, 4, 49, 26, 38, 46, 4, - 47, 55, 5, 49, 51, 45, 52, 54, 26, 26, - 4, 46, 47, 4, 64, 49, 46, 4, 66, 69, - 38, 4, 4, 64, 48, 49, 3, 3, 46, 46, - 53, 46, 57, 27, 28, 29, 30, 53, 50, 60, - 50, 60, 36, 37, 4, 57, 56, 50, 4, 43, - 44, 69, 73, 73, 73, 4, 50, 47, 45, 52, - 54, 137, 56, 50, 58, 59, 4, 50, 50, 56, - 50, 47, 53, 56, 56, 51, 104, 4, 54, 107, - 52, 53, 54, 104, 46, 104, 107, 47, 107, 4, - 50, 51, 46, 53, 4, 48, 49, 48, 4, 120, - 121, 120, 121, 228, 47, 49, 52, 55, 51, 47, - 4, 54, 50, 51, 46, 48, 137, 48, 137, 91, - 47, 58, 48, 50, 14, 59, 251, 99, 49, 19, - 20, 48, 47, 14, 0, 50, 0, 47, 19, 20, - 50, 31, 5, 54, 34, 35, 36, 37, 38, 39, - 40, 41, 91, 34, 35, 36, 37, 38, 39, 40, - 41, 188, 19, 20, 251, 186, 186, 186, 196, 36, - 37, 38, 39, 40, 41, 196, 248, 196, 35, 36, + 0, 0, 107, 11, 60, 3, 3, 38, 4, 46, + 11, 4, 11, 5, 26, 38, 4, 47, 4, 25, + 49, 51, 5, 4, 54, 4, 55, 49, 26, 66, + 52, 45, 3, 64, 46, 4, 46, 47, 4, 4, + 38, 64, 3, 49, 53, 4, 69, 4, 46, 45, + 52, 53, 54, 57, 50, 4, 53, 50, 50, 60, + 56, 60, 50, 56, 50, 57, 47, 50, 56, 50, + 56, 69, 73, 73, 73, 4, 47, 46, 48, 49, + 51, 47, 138, 54, 50, 51, 3, 53, 47, 91, + 47, 50, 51, 50, 19, 20, 104, 99, 47, 107, + 47, 50, 4, 104, 51, 104, 107, 54, 107, 26, + 35, 36, 37, 38, 39, 40, 41, 48, 49, 120, + 121, 120, 121, 4, 229, 27, 28, 29, 30, 46, + 38, 39, 40, 41, 36, 37, 47, 138, 50, 138, + 53, 43, 44, 52, 48, 46, 46, 252, 50, 4, + 49, 4, 54, 46, 56, 11, 58, 59, 14, 15, + 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, + 26, 55, 52, 19, 20, 31, 32, 33, 34, 35, + 36, 37, 38, 39, 40, 41, 187, 187, 187, 197, + 36, 37, 38, 39, 40, 41, 197, 48, 197, 36, 37, 38, 39, 40, 41, 110, 111, 112, 113, 114, - 115, 116, 117, 107, 119, 38, 39, 40, 41, 58, - 228, 246, 56, 3, 74, 121, 107, 228, -1, 228, - -1, -1, -1, -1, -1, -1, -1, 238, 238, 238, - -1, -1, -1, 251, -1, 246, 246, 246, -1, -1, - 251, -1, 251, 158, 159, 160, 161, 162, 163, 164, + 115, 116, 117, 48, 119, 58, 48, 59, 49, 48, + 0, 229, 0, 5, 91, 107, 54, 189, 229, 249, + 229, 252, 247, 56, 58, 3, 74, 107, 239, 239, + 239, -1, 121, -1, 252, -1, 247, 247, 247, -1, + -1, 252, -1, 252, 159, 160, 161, 162, 163, 164, 165, 166, 167, 168, 169, 170, 171, 172, 173, 174, 175, 176, 177, 178, 179, 180, 181, 182, 183, 184, - 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, - 21, 22, 23, 24, 25, 26, 19, 20, -1, -1, - 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, - 41, 34, 35, 36, 37, 38, 39, 40, 41, -1, - -1, -1, -1, -1, 55, 11, 12, 13, 14, 15, - 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, - 26, -1, -1, -1, -1, 31, 32, 33, 34, 35, - 36, 37, 38, 39, 40, 41, 11, 12, -1, 14, + 185, 11, 12, 13, 14, 15, 16, 17, 18, 19, + 20, 21, 22, 23, 24, 25, 26, 19, 20, -1, + -1, 31, 32, 33, 34, 35, 36, 37, 38, 39, + 40, 41, 34, 35, 36, 37, 38, 39, 40, 41, + -1, -1, -1, -1, -1, 55, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, -1, -1, -1, -1, 31, 32, 33, 34, - 35, 36, 37, 38, 39, 40, 41, 11, -1, -1, + 35, 36, 37, 38, 39, 40, 41, 11, 12, -1, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, -1, -1, -1, -1, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, -1, -1, -1, -1, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 14, -1, -1, 17, - 18, 19, 20, -1, -1, -1, -1, 25, 26, 19, - 20, -1, -1, 31, -1, -1, 34, 35, 36, 37, - 38, 39, 40, 41, -1, -1, 36, 37, 38, 39, - 40, 41 + 18, 19, 20, -1, -1, -1, -1, 25, 26, 14, + -1, -1, -1, 31, 19, 20, 34, 35, 36, 37, + 38, 39, 40, 41, -1, -1, 31, -1, -1, 34, + 35, 36, 37, 38, 39, 40, 41, 14, -1, -1, + -1, -1, 19, 20, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, 34, 35, 36, + 37, 38, 39, 40, 41 }; #define YYPURE 1 @@ -1551,168 +1551,167 @@ case 121: O(*yyval, OP_PREPARE_TO_CONSTRUCT_OBJECT); ; break;} -case 122: -#line 554 "compile.y" -{ - // see OP_PREPARE_TO_EXPRESSION!! - if((yyval=yyvsp[0])->count()==2) // only one string literal in there? - change_string_literal_to_double_literal(*yyval); // make that string literal Double -; - break;} case 126: -#line 563 "compile.y" +#line 559 "compile.y" { yyval = yyvsp[-1]; ; break;} case 127: -#line 564 "compile.y" +#line 560 "compile.y" { yyval = yyvsp[-1]; ; break;} case 128: -#line 565 "compile.y" +#line 561 "compile.y" { yyval = yyvsp[-1]; ; break;} case 129: -#line 567 "compile.y" +#line 563 "compile.y" { yyval=yyvsp[0]; O(*yyval, OP_NEG) ; break;} case 130: -#line 568 "compile.y" +#line 564 "compile.y" { yyval=yyvsp[0] ; break;} case 131: -#line 569 "compile.y" +#line 565 "compile.y" { yyval=yyvsp[0]; O(*yyval, OP_INV) ; break;} case 132: -#line 570 "compile.y" +#line 566 "compile.y" { yyval=yyvsp[0]; O(*yyval, OP_NOT) ; break;} case 133: -#line 571 "compile.y" +#line 567 "compile.y" { yyval=yyvsp[0]; O(*yyval, OP_DEF) ; break;} case 134: -#line 572 "compile.y" +#line 568 "compile.y" { yyval=yyvsp[0]; O(*yyval, OP_IN) ; break;} case 135: -#line 573 "compile.y" +#line 569 "compile.y" { yyval=yyvsp[0]; O(*yyval, OP_FEXISTS) ; break;} case 136: -#line 574 "compile.y" +#line 570 "compile.y" { yyval=yyvsp[0]; O(*yyval, OP_DEXISTS) ; break;} case 137: -#line 576 "compile.y" +#line 572 "compile.y" { yyval=yyvsp[-2]; P(*yyval, *yyvsp[0]); O(*yyval, OP_SUB) ; break;} case 138: -#line 577 "compile.y" +#line 573 "compile.y" { yyval=yyvsp[-2]; P(*yyval, *yyvsp[0]); O(*yyval, OP_ADD) ; break;} case 139: -#line 578 "compile.y" +#line 574 "compile.y" { yyval=yyvsp[-2]; P(*yyval, *yyvsp[0]); O(*yyval, OP_MUL) ; break;} case 140: -#line 579 "compile.y" +#line 575 "compile.y" { yyval=yyvsp[-2]; P(*yyval, *yyvsp[0]); O(*yyval, OP_DIV) ; break;} case 141: -#line 580 "compile.y" +#line 576 "compile.y" { yyval=yyvsp[-2]; P(*yyval, *yyvsp[0]); O(*yyval, OP_MOD) ; break;} case 142: -#line 581 "compile.y" +#line 577 "compile.y" { yyval=yyvsp[-2]; P(*yyval, *yyvsp[0]); O(*yyval, OP_INTDIV) ; break;} case 143: -#line 582 "compile.y" +#line 578 "compile.y" { yyval=yyvsp[-2]; P(*yyval, *yyvsp[0]); O(*yyval, OP_BIN_SL) ; break;} case 144: -#line 583 "compile.y" +#line 579 "compile.y" { yyval=yyvsp[-2]; P(*yyval, *yyvsp[0]); O(*yyval, OP_BIN_SR) ; break;} case 145: -#line 584 "compile.y" +#line 580 "compile.y" { yyval=yyvsp[-2]; P(*yyval, *yyvsp[0]); O(*yyval, OP_BIN_AND) ; break;} case 146: -#line 585 "compile.y" +#line 581 "compile.y" { yyval=yyvsp[-2]; P(*yyval, *yyvsp[0]); O(*yyval, OP_BIN_OR) ; break;} case 147: -#line 586 "compile.y" +#line 582 "compile.y" { yyval=yyvsp[-2]; P(*yyval, *yyvsp[0]); O(*yyval, OP_BIN_XOR) ; break;} case 148: -#line 587 "compile.y" +#line 583 "compile.y" { yyval=yyvsp[-2]; OA(*yyval, OP_NESTED_CODE, yyvsp[0]); O(*yyval, OP_LOG_AND) ; break;} case 149: -#line 588 "compile.y" +#line 584 "compile.y" { yyval=yyvsp[-2]; OA(*yyval, OP_NESTED_CODE, yyvsp[0]); O(*yyval, OP_LOG_OR) ; break;} case 150: -#line 589 "compile.y" +#line 585 "compile.y" { yyval=yyvsp[-2]; P(*yyval, *yyvsp[0]); O(*yyval, OP_LOG_XOR) ; break;} case 151: -#line 590 "compile.y" +#line 586 "compile.y" { yyval=yyvsp[-2]; P(*yyval, *yyvsp[0]); O(*yyval, OP_NUM_LT) ; break;} case 152: -#line 591 "compile.y" +#line 587 "compile.y" { yyval=yyvsp[-2]; P(*yyval, *yyvsp[0]); O(*yyval, OP_NUM_GT) ; break;} case 153: -#line 592 "compile.y" +#line 588 "compile.y" { yyval=yyvsp[-2]; P(*yyval, *yyvsp[0]); O(*yyval, OP_NUM_LE) ; break;} case 154: -#line 593 "compile.y" +#line 589 "compile.y" { yyval=yyvsp[-2]; P(*yyval, *yyvsp[0]); O(*yyval, OP_NUM_GE) ; break;} case 155: -#line 594 "compile.y" +#line 590 "compile.y" { yyval=yyvsp[-2]; P(*yyval, *yyvsp[0]); O(*yyval, OP_NUM_EQ) ; break;} case 156: -#line 595 "compile.y" +#line 591 "compile.y" { yyval=yyvsp[-2]; P(*yyval, *yyvsp[0]); O(*yyval, OP_NUM_NE) ; break;} case 157: -#line 596 "compile.y" +#line 592 "compile.y" { yyval=yyvsp[-2]; P(*yyval, *yyvsp[0]); O(*yyval, OP_STR_LT) ; break;} case 158: -#line 597 "compile.y" +#line 593 "compile.y" { yyval=yyvsp[-2]; P(*yyval, *yyvsp[0]); O(*yyval, OP_STR_GT) ; break;} case 159: -#line 598 "compile.y" +#line 594 "compile.y" { yyval=yyvsp[-2]; P(*yyval, *yyvsp[0]); O(*yyval, OP_STR_LE) ; break;} case 160: -#line 599 "compile.y" +#line 595 "compile.y" { yyval=yyvsp[-2]; P(*yyval, *yyvsp[0]); O(*yyval, OP_STR_GE) ; break;} case 161: -#line 600 "compile.y" +#line 596 "compile.y" { yyval=yyvsp[-2]; P(*yyval, *yyvsp[0]); O(*yyval, OP_STR_EQ) ; break;} case 162: -#line 601 "compile.y" +#line 597 "compile.y" { yyval=yyvsp[-2]; P(*yyval, *yyvsp[0]); O(*yyval, OP_STR_NE) ; break;} case 163: -#line 602 "compile.y" +#line 598 "compile.y" { yyval=yyvsp[-2]; P(*yyval, *yyvsp[0]); O(*yyval, OP_IS) ; break;} case 164: -#line 605 "compile.y" +#line 601 "compile.y" +{ + // optimized from OP_STRING->OP_VALUE for doubles + maybe_change_string_literal_to_double_literal(*(yyval=yyvsp[0])); +; + break;} +case 165: +#line 606 "compile.y" { yyval=N(); OA(*yyval, OP_STRING_POOL, yyvsp[0]); /* stack: empty write context */ @@ -1720,19 +1719,19 @@ case 164: /* context=pop; stack: context.get_string() */ ; break;} -case 165: -#line 614 "compile.y" +case 166: +#line 615 "compile.y" { // optimized from OP_STRING+OP_WRITE_VALUE to OP_STRING__WRITE change_string_literal_to_write_string_literal(*(yyval=yyvsp[0])) ; break;} -case 166: -#line 619 "compile.y" -{ yyval=VL(new VVoid(), 0, 0, 0) ; - break;} case 167: #line 620 "compile.y" +{ yyval=VL(new VVoid(), 0, 0, 0) ; + break;} +case 168: +#line 621 "compile.y" { yyval=N() ; break;} } @@ -1957,7 +1956,7 @@ yyerrhandle: } return 1; } -#line 622 "compile.y" +#line 623 "compile.y" #endif