--- parser3/src/main/compile.tab.C 2005/08/05 13:01:16 1.103.8.1 +++ parser3/src/main/compile.tab.C 2005/08/05 14:13:41 1.103.8.2 @@ -40,10 +40,10 @@ /** @file Parser: compiler(lexical parser and grammar). - Copyright (c) 2001, 2003 ArtLebedev Group (http://www.artlebedev.com) + Copyright (c) 2001-2005 ArtLebedev Group (http://www.artlebedev.com) Author: Alexander Petrosyan (http://design.ru/paf) - $Id: compile.tab.C,v 1.103.8.1 2005/08/05 13:01:16 paf Exp $ + $Id: compile.tab.C,v 1.103.8.2 2005/08/05 14:13:41 paf Exp $ */ /** @@ -105,11 +105,11 @@ static int yylex(YYSTYPE* lvalp, void* p -#define YYFINAL 260 +#define YYFINAL 259 #define YYFLAG -32768 #define YYNTBASE 60 -#define YYTRANSLATE(x) ((unsigned)(x) <= 286 ? yytranslate[x] : 147) +#define YYTRANSLATE(x) ((unsigned)(x) <= 286 ? yytranslate[x] : 146) static const char yytranslate[] = { 0, 2, 2, 2, 2, 2, 2, 2, 2, 2, 46, @@ -154,64 +154,64 @@ static const short yyprhs[] = { 0, 151, 155, 157, 159, 161, 163, 165, 167, 170, 172, 173, 174, 181, 183, 185, 188, 190, 192, 194, 195, 196, 202, 206, 210, 212, 216, 218, 222, 224, 228, - 230, 232, 234, 236, 238, 240, 242, 244, 247, 249, - 252, 255, 257, 259, 262, 264, 266, 268, 270, 273, - 276, 277, 278, 284, 286, 288, 291, 294, 296, 298, - 301, 304, 306, 308, 310, 312, 316, 320, 324, 327, - 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, 462, 463 + 230, 232, 234, 236, 238, 240, 242, 245, 247, 250, + 253, 255, 257, 260, 262, 264, 266, 268, 271, 274, + 275, 276, 282, 284, 286, 289, 292, 294, 296, 299, + 302, 304, 306, 308, 310, 314, 318, 322, 325, 328, + 331, 334, 337, 340, 343, 346, 350, 354, 358, 362, + 366, 370, 374, 378, 382, 386, 390, 394, 398, 402, + 406, 410, 414, 418, 422, 426, 430, 434, 438, 442, + 446, 450, 454, 456, 458, 460, 461 }; static const short yyrhs[] = { 62, 0, 61, 0, 63, 0, 61, 63, 0, 76, 0, - 64, 0, 69, 0, 45, 4, 46, 65, 0, 146, + 64, 0, 69, 0, 45, 4, 46, 65, 0, 145, 0, 66, 0, 67, 0, 66, 67, 0, 68, 46, - 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, + 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, 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, - 0, 124, 127, 0, 50, 89, 93, 0, 90, 0, - 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, 145, 0, 4, 0, 100, 0, + 85, 0, 86, 0, 87, 0, 136, 87, 0, 126, + 0, 123, 126, 0, 50, 89, 93, 0, 90, 0, + 91, 0, 92, 0, 122, 0, 53, 122, 0, 136, + 122, 0, 94, 0, 97, 0, 98, 0, 0, 0, + 47, 95, 99, 96, 48, 0, 54, 139, 55, 0, + 51, 76, 52, 0, 144, 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, 0, 114, 0, 0, 0, 47, 111, 115, 112, 48, 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, 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, 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, - 0, 141, 36, 141, 0, 141, 38, 141, 0, 141, - 39, 141, 0, 141, 41, 141, 0, 141, 40, 141, - 0, 141, 19, 141, 0, 141, 20, 141, 0, 141, - 35, 141, 0, 141, 34, 141, 0, 141, 14, 141, - 0, 141, 11, 141, 0, 141, 12, 141, 0, 141, - 13, 141, 0, 141, 32, 141, 0, 141, 33, 141, - 0, 141, 15, 141, 0, 141, 16, 141, 0, 141, - 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, 4, 0, 76, 0, 4, - 0, 0, 0 + 0, 120, 0, 117, 49, 120, 0, 121, 0, 139, + 0, 76, 0, 144, 0, 4, 0, 100, 0, 127, + 0, 123, 127, 0, 124, 0, 123, 124, 0, 125, + 53, 0, 127, 0, 127, 0, 4, 5, 0, 4, + 0, 128, 0, 129, 0, 130, 0, 50, 133, 0, + 4, 134, 0, 0, 0, 47, 131, 77, 132, 48, + 0, 4, 0, 135, 0, 134, 135, 0, 50, 133, + 0, 137, 0, 138, 0, 4, 57, 0, 137, 57, + 0, 140, 0, 141, 0, 81, 0, 104, 0, 58, + 142, 58, 0, 59, 142, 59, 0, 54, 140, 55, + 0, 37, 140, 0, 36, 140, 0, 43, 140, 0, + 44, 140, 0, 27, 140, 0, 28, 140, 0, 29, + 140, 0, 30, 140, 0, 140, 37, 140, 0, 140, + 36, 140, 0, 140, 38, 140, 0, 140, 39, 140, + 0, 140, 41, 140, 0, 140, 40, 140, 0, 140, + 19, 140, 0, 140, 20, 140, 0, 140, 35, 140, + 0, 140, 34, 140, 0, 140, 14, 140, 0, 140, + 11, 140, 0, 140, 12, 140, 0, 140, 13, 140, + 0, 140, 32, 140, 0, 140, 33, 140, 0, 140, + 15, 140, 0, 140, 16, 140, 0, 140, 17, 140, + 0, 140, 18, 140, 0, 140, 21, 140, 0, 140, + 22, 140, 0, 140, 23, 140, 0, 140, 24, 140, + 0, 140, 25, 140, 0, 140, 26, 140, 0, 140, + 31, 140, 0, 4, 0, 76, 0, 4, 0, 0, + 0 }; #endif @@ -227,14 +227,14 @@ static const short yyrline[] = { 0, 365, 371, 373, 374, 376, 382, 383, 383, 387, 393, 396, 399, 412, 414, 414, 415, 417, 418, 420, 423, 425, 426, 427, 428, 430, 432, 434, 436, 438, 440, - 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, 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 + 444, 458, 462, 464, 465, 470, 470, 472, 472, 473, + 474, 482, 487, 489, 491, 492, 493, 495, 499, 508, + 511, 513, 519, 524, 524, 525, 530, 532, 534, 546, + 558, 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, 610, 619, 624, 625 }; #endif @@ -260,8 +260,8 @@ static const char * const yytname[] = { "call","call_value","@4","@5","call_name","store_params","store_param","store_square_param", "@6","@7","store_round_param","store_curly_param","store_code_param_parts","store_expr_param_parts", "store_curly_param_parts","store_code_param_part","store_expr_param_part","store_curly_param_part", -"code_param_value","write_expr_value","name_expr_dive_code","name_path","name_step", -"name_advance1","name_advance2","name_expr_value","name_expr_subvar_value","name_expr_with_subvar_value", +"code_param_value","name_expr_dive_code","name_path","name_step","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","double_or_STRING","string_inside_quotes_value","write_string", @@ -279,14 +279,14 @@ static const short yyr1[] = { 0, 98, 99, 99, 99, 100, 101, 102, 102, 103, 105, 106, 104, 107, 108, 108, 109, 109, 109, 111, 112, 110, 113, 114, 115, 115, 116, 116, 117, 117, 118, - 119, 120, 121, 121, 121, 122, 123, 123, 124, 124, - 125, 126, 127, 127, 128, 128, 128, 128, 129, 130, - 132, 133, 131, 134, 135, 135, 136, 137, 137, 138, - 139, 140, 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, 141, 141, 141, 141, 141, - 141, 141, 141, 142, 143, 144, 145, 146 + 119, 120, 121, 121, 121, 122, 122, 123, 123, 124, + 125, 126, 126, 127, 127, 127, 127, 128, 129, 131, + 132, 130, 133, 134, 134, 135, 136, 136, 137, 138, + 139, 140, 140, 140, 140, 140, 140, 140, 140, 140, + 140, 140, 140, 140, 140, 140, 140, 140, 140, 140, + 140, 140, 140, 140, 140, 140, 140, 140, 140, 140, + 140, 140, 140, 140, 140, 140, 140, 140, 140, 140, + 140, 140, 141, 142, 143, 144, 145 }; static const short yyr2[] = { 0, @@ -299,55 +299,55 @@ static const short yyr2[] = { 0, 3, 1, 1, 1, 1, 1, 1, 2, 1, 0, 0, 6, 1, 1, 2, 1, 1, 1, 0, 0, 5, 3, 3, 1, 3, 1, 3, 1, 3, 1, - 1, 1, 1, 1, 1, 1, 1, 2, 1, 2, - 2, 1, 1, 2, 1, 1, 1, 1, 2, 2, - 0, 0, 5, 1, 1, 2, 2, 1, 1, 2, - 2, 1, 1, 1, 1, 3, 3, 3, 2, 2, - 2, 2, 2, 2, 2, 2, 3, 3, 3, 3, + 1, 1, 1, 1, 1, 1, 2, 1, 2, 2, + 1, 1, 2, 1, 1, 1, 1, 2, 2, 0, + 0, 5, 1, 1, 2, 2, 1, 1, 2, 2, + 1, 1, 1, 1, 3, 3, 3, 2, 2, 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, 3, 1, 1, 1, 0, 0 + 3, 3, 1, 1, 1, 0, 0 }; -static const short yydefact[] = { 168, - 166, 0, 0, 70, 2, 1, 3, 6, 7, 5, +static const short yydefact[] = { 167, + 165, 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, 168, 168, 168, 104, 0, 120, 110, 115, 0, - 114, 109, 0, 0, 103, 0, 105, 52, 0, 97, - 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, 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, 104, 110, 0, 0, 0, 37, 39, 0, 41, + 42, 43, 0, 48, 49, 50, 51, 0, 98, 0, + 45, 96, 105, 106, 107, 0, 117, 118, 0, 4, + 30, 167, 167, 167, 103, 0, 119, 109, 114, 0, + 113, 108, 0, 0, 102, 0, 104, 52, 0, 96, + 38, 57, 167, 0, 47, 54, 55, 56, 104, 99, + 46, 97, 100, 44, 53, 120, 73, 71, 15, 8, + 10, 11, 0, 9, 23, 0, 22, 21, 167, 19, + 18, 116, 115, 111, 40, 97, 166, 0, 163, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 167, + 167, 123, 124, 0, 121, 122, 0, 12, 14, 13, + 20, 0, 26, 0, 25, 0, 165, 0, 32, 58, + 64, 65, 66, 62, 61, 132, 133, 134, 135, 129, + 128, 130, 131, 0, 164, 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, 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 + 0, 0, 0, 0, 0, 79, 167, 0, 0, 74, + 76, 77, 78, 24, 16, 112, 68, 0, 127, 125, + 126, 147, 148, 149, 146, 152, 153, 154, 155, 142, + 143, 156, 157, 158, 159, 160, 161, 162, 150, 151, + 145, 144, 137, 136, 138, 139, 141, 140, 166, 92, + 0, 88, 0, 86, 91, 72, 75, 167, 59, 165, + 95, 80, 84, 90, 93, 167, 83, 0, 82, 17, + 166, 0, 89, 87, 85, 81, 0, 0, 0 }; -static const short yydefgoto[] = { 258, - 5, 6, 7, 8, 90, 91, 92, 93, 9, 239, +static const short yydefgoto[] = { 257, + 5, 6, 7, 8, 90, 91, 92, 93, 9, 238, 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, 198, 77, 78, 140, 242, + 35, 36, 75, 76, 107, 198, 77, 78, 140, 241, 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 + 229, 252, 192, 193, 242, 233, 231, 243, 234, 232, + 244, 37, 64, 39, 40, 41, 65, 43, 44, 45, + 60, 136, 62, 58, 59, 66, 47, 48, 235, 125, + 126, 156, 19, 245, 20 }; static const short yypact[] = { 5, @@ -360,91 +360,91 @@ static const short yypact[] = { 5, -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, + 32,-32768, 100, 102,-32768, 97, 101,-32768, 147,-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, + 8,-32768,-32768, 117, 315,-32768, 54,-32768,-32768,-32768, +-32768, 148,-32768, 108,-32768, 150, 152, 8, 31,-32768, +-32768,-32768,-32768,-32768,-32768, 443, 443, 443, 443,-32768, +-32768,-32768,-32768, 270,-32768, 143, 144,-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, +-32768,-32768,-32768,-32768,-32768,-32768, 8, 154,-32768,-32768, +-32768, 374, 145, 346, 278, 402, 402, 415, 415, 179, + 179, 402, 402, 402, 402, 415, 415, 443, 402, 402, 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 + -21,-32768, -28,-32768,-32768,-32768,-32768, 8,-32768, 70, +-32768, 164,-32768,-32768,-32768, 8,-32768, 99,-32768,-32768, + 15, 156,-32768,-32768,-32768,-32768, 221, 223,-32768 }; static const short yypgoto[] = {-32768, -32768,-32768, 219,-32768,-32768,-32768, 134,-32768,-32768,-32768, --32768, 173,-32768,-32768,-32768, 1, -55, -7, -104,-32768, +-32768, 172,-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 +-32768,-32768,-32768,-32768,-32768,-32768,-32768,-32768,-32768, 123, +-32768,-32768,-32768, 2,-32768,-32768,-32768,-32768, 38,-32768, +-32768,-32768,-32768,-32768,-32768,-32768,-32768, -23, -16, -12, +-32768, -11, 84, -22,-32768, -30, 3,-32768,-32768,-32768, +-32768,-32768, 177,-32768, 178, 232,-32768,-32768, 163, 95, +-32768, 122,-32768, 135, -1 }; -#define YYLAST 485 +#define YYLAST 484 static const short yytable[] = { 15, - 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, + 10, 18, 139, 51, 104, 42, -102, 81, 1, 84, + 15, 1, 18, 55, 68, 80, 137, 72, 240, 63, + 248, 73, 55, 22, 74, 21, 249, 246, 70, 84, + 247, 2, 236, 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, + 94, 98, 101, 86, 3, 79, -101, 3, 56, 15, 4, 18, 3, 4, 3, 57, 23, 56, 4, 24, - 4, 106, 15, 108, 18, 89, 186, -168, -67, -67, + 4, 106, 15, 108, 18, 89, 186, -167, -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, + -101, 116, 117, 105, 131, 130, 139, -14, 118, 132, + 133, 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, - 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, 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, 174, 0, 0, 0, 0, 175, 176, 177, - 178, 179, 180, 181, 182, 183, 184, 185, 162, 163, + 180, 181, 182, 183, 184, 185, 15, 196, 18, -63, + 200, 239, 201, 256, 146, 147, 148, 149, 150, 151, + 152, 153, 251, 154, 180, 181, 182, 183, 184, 185, + 258, 138, 259, 50, 128, 100, 237, 255, 15, 141, + 18, 254, 102, 253, 46, 103, 124, 15, 250, 18, + 0, 144, 157, 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, 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, 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 + 180, 181, 182, 183, 184, 185, 159, 160, 0, 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, 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, @@ -462,41 +462,41 @@ static const short yycheck[] = { 0, 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, + 53, 43, 44, 52, 48, 46, 251, 46, 50, 49, + 4, 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, 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, - 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, 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, + 36, 37, 38, 39, 40, 41, 197, 48, 197, 48, + 58, 48, 59, 48, 110, 111, 112, 113, 114, 115, + 116, 117, 49, 119, 36, 37, 38, 39, 40, 41, + 0, 229, 0, 5, 91, 54, 189, 251, 229, 107, + 229, 248, 56, 246, 3, 58, 74, 238, 238, 238, + -1, 107, 121, 251, -1, 246, 246, 246, -1, -1, + 251, -1, 251, 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, 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, 14, -1, -1, 17, - 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 + 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, 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 @@ -1418,36 +1418,37 @@ case 90: case 91: #line 444 "compile.y" { - yyval=N(); - OA(*yyval, OP_EXPR_CODE__STORE_PARAM, yyvsp[0]); + YYSTYPE expr_code=yyvsp[0]; + if(expr_code->count()==3) { // optimizing (double) case. [OP_VALUE+origin+Double] + yyval=expr_code; + O(*yyval, OP_STORE_PARAM); // no evaluating + } else { + ArrayOperation* code=N(); + O(*code, OP_PREPARE_TO_EXPRESSION); + P(*code, *expr_code); + O(*code, OP_WRITE_EXPR_RESULT); + yyval=N(); + OA(*yyval, OP_EXPR_CODE__STORE_PARAM, code); + } ; break;} case 92: -#line 448 "compile.y" +#line 458 "compile.y" { yyval=N(); OA(*yyval, OP_CURLY_CODE__STORE_PARAM, yyvsp[0]); ; break;} -case 96: -#line 457 "compile.y" -{ - yyval=N(); - O(*yyval, OP_PREPARE_TO_EXPRESSION); - P(*yyval, *yyvsp[0]); - O(*yyval, OP_WRITE_EXPR_RESULT); -; - break;} -case 98: -#line 466 "compile.y" +case 97: +#line 470 "compile.y" { yyval=yyvsp[-1]; P(*yyval, *yyvsp[0]) ; break;} -case 100: -#line 468 "compile.y" +case 99: +#line 472 "compile.y" { yyval=yyvsp[-1]; P(*yyval, *yyvsp[0]) ; break;} -case 102: -#line 470 "compile.y" +case 101: +#line 474 "compile.y" { // we know that name_advance1 not called from ^xxx context // so we'll not check for operator call possibility as we do in name_advance2 @@ -1457,23 +1458,23 @@ case 102: O(*yyval, OP_GET_ELEMENT); /* name=pop; context=pop; stack: context.get_element(name) */ ; break;} -case 103: -#line 478 "compile.y" +case 102: +#line 482 "compile.y" { /* stack: context */ yyval=yyvsp[0]; /* stack: context,name */ O(*yyval, OP_GET_ELEMENT); /* name=pop; context=pop; stack: context.get_element(name) */ ; break;} -case 109: -#line 491 "compile.y" +case 108: +#line 495 "compile.y" { yyval=yyvsp[0]; O(*yyval, OP_GET_ELEMENT); ; break;} -case 110: -#line 495 "compile.y" +case 109: +#line 499 "compile.y" { ArrayOperation* code; { @@ -1484,21 +1485,21 @@ case 110: OA(*yyval, OP_STRING_POOL, code); ; break;} -case 111: -#line 504 "compile.y" +case 110: +#line 508 "compile.y" { // allow $result_or_other_variable[ letters here any time ] *reinterpret_cast(&yyval)=PC.explicit_result; PC.explicit_result=false; ; break;} -case 112: -#line 507 "compile.y" +case 111: +#line 511 "compile.y" { PC.explicit_result=*reinterpret_cast(&yyvsp[-1]); ; break;} -case 113: -#line 509 "compile.y" +case 112: +#line 513 "compile.y" { yyval=N(); OA(*yyval, OP_OBJECT_POOL, yyvsp[-2]); /* stack: empty write context */ @@ -1506,27 +1507,27 @@ case 113: /* context=pop; stack: context.value() */ ; break;} -case 114: -#line 515 "compile.y" +case 113: +#line 519 "compile.y" { yyval=N(); O(*yyval, OP_WITH_READ); P(*yyval, *yyvsp[0]); ; break;} -case 116: -#line 520 "compile.y" +case 115: +#line 524 "compile.y" { yyval=yyvsp[-1]; P(*yyval, *yyvsp[0]) ; break;} -case 117: -#line 521 "compile.y" +case 116: +#line 525 "compile.y" { yyval=yyvsp[0]; O(*yyval, OP_GET_ELEMENT__WRITE); ; break;} -case 120: -#line 530 "compile.y" +case 119: +#line 534 "compile.y" { yyval=yyvsp[-1]; // stack: class name string if(*LA2S(*yyval) == BASE_NAME) { // pseudo BASE class @@ -1540,8 +1541,8 @@ case 120: O(*yyval, OP_GET_CLASS); ; break;} -case 121: -#line 542 "compile.y" +case 120: +#line 546 "compile.y" { yyval=yyvsp[-1]; if(!PC.in_call_value) { @@ -1551,167 +1552,167 @@ case 121: O(*yyval, OP_PREPARE_TO_CONSTRUCT_OBJECT); ; break;} +case 125: +#line 563 "compile.y" +{ yyval = yyvsp[-1]; ; + break;} case 126: -#line 559 "compile.y" +#line 564 "compile.y" { yyval = yyvsp[-1]; ; break;} case 127: -#line 560 "compile.y" +#line 565 "compile.y" { yyval = yyvsp[-1]; ; break;} case 128: -#line 561 "compile.y" -{ yyval = yyvsp[-1]; ; - break;} -case 129: -#line 563 "compile.y" +#line 567 "compile.y" { yyval=yyvsp[0]; O(*yyval, OP_NEG) ; break;} -case 130: -#line 564 "compile.y" +case 129: +#line 568 "compile.y" { yyval=yyvsp[0] ; break;} -case 131: -#line 565 "compile.y" +case 130: +#line 569 "compile.y" { yyval=yyvsp[0]; O(*yyval, OP_INV) ; break;} -case 132: -#line 566 "compile.y" +case 131: +#line 570 "compile.y" { yyval=yyvsp[0]; O(*yyval, OP_NOT) ; break;} -case 133: -#line 567 "compile.y" +case 132: +#line 571 "compile.y" { yyval=yyvsp[0]; O(*yyval, OP_DEF) ; break;} -case 134: -#line 568 "compile.y" +case 133: +#line 572 "compile.y" { yyval=yyvsp[0]; O(*yyval, OP_IN) ; break;} -case 135: -#line 569 "compile.y" +case 134: +#line 573 "compile.y" { yyval=yyvsp[0]; O(*yyval, OP_FEXISTS) ; break;} -case 136: -#line 570 "compile.y" +case 135: +#line 574 "compile.y" { yyval=yyvsp[0]; O(*yyval, OP_DEXISTS) ; break;} -case 137: -#line 572 "compile.y" +case 136: +#line 576 "compile.y" { yyval=yyvsp[-2]; P(*yyval, *yyvsp[0]); O(*yyval, OP_SUB) ; break;} -case 138: -#line 573 "compile.y" +case 137: +#line 577 "compile.y" { yyval=yyvsp[-2]; P(*yyval, *yyvsp[0]); O(*yyval, OP_ADD) ; break;} -case 139: -#line 574 "compile.y" +case 138: +#line 578 "compile.y" { yyval=yyvsp[-2]; P(*yyval, *yyvsp[0]); O(*yyval, OP_MUL) ; break;} -case 140: -#line 575 "compile.y" +case 139: +#line 579 "compile.y" { yyval=yyvsp[-2]; P(*yyval, *yyvsp[0]); O(*yyval, OP_DIV) ; break;} -case 141: -#line 576 "compile.y" +case 140: +#line 580 "compile.y" { yyval=yyvsp[-2]; P(*yyval, *yyvsp[0]); O(*yyval, OP_MOD) ; break;} -case 142: -#line 577 "compile.y" +case 141: +#line 581 "compile.y" { yyval=yyvsp[-2]; P(*yyval, *yyvsp[0]); O(*yyval, OP_INTDIV) ; break;} -case 143: -#line 578 "compile.y" +case 142: +#line 582 "compile.y" { yyval=yyvsp[-2]; P(*yyval, *yyvsp[0]); O(*yyval, OP_BIN_SL) ; break;} -case 144: -#line 579 "compile.y" +case 143: +#line 583 "compile.y" { yyval=yyvsp[-2]; P(*yyval, *yyvsp[0]); O(*yyval, OP_BIN_SR) ; break;} -case 145: -#line 580 "compile.y" +case 144: +#line 584 "compile.y" { yyval=yyvsp[-2]; P(*yyval, *yyvsp[0]); O(*yyval, OP_BIN_AND) ; break;} -case 146: -#line 581 "compile.y" +case 145: +#line 585 "compile.y" { yyval=yyvsp[-2]; P(*yyval, *yyvsp[0]); O(*yyval, OP_BIN_OR) ; break;} -case 147: -#line 582 "compile.y" +case 146: +#line 586 "compile.y" { yyval=yyvsp[-2]; P(*yyval, *yyvsp[0]); O(*yyval, OP_BIN_XOR) ; break;} -case 148: -#line 583 "compile.y" +case 147: +#line 587 "compile.y" { yyval=yyvsp[-2]; OA(*yyval, OP_NESTED_CODE, yyvsp[0]); O(*yyval, OP_LOG_AND) ; break;} -case 149: -#line 584 "compile.y" +case 148: +#line 588 "compile.y" { yyval=yyvsp[-2]; OA(*yyval, OP_NESTED_CODE, yyvsp[0]); O(*yyval, OP_LOG_OR) ; break;} -case 150: -#line 585 "compile.y" +case 149: +#line 589 "compile.y" { yyval=yyvsp[-2]; P(*yyval, *yyvsp[0]); O(*yyval, OP_LOG_XOR) ; break;} -case 151: -#line 586 "compile.y" +case 150: +#line 590 "compile.y" { yyval=yyvsp[-2]; P(*yyval, *yyvsp[0]); O(*yyval, OP_NUM_LT) ; break;} -case 152: -#line 587 "compile.y" +case 151: +#line 591 "compile.y" { yyval=yyvsp[-2]; P(*yyval, *yyvsp[0]); O(*yyval, OP_NUM_GT) ; break;} -case 153: -#line 588 "compile.y" +case 152: +#line 592 "compile.y" { yyval=yyvsp[-2]; P(*yyval, *yyvsp[0]); O(*yyval, OP_NUM_LE) ; break;} -case 154: -#line 589 "compile.y" +case 153: +#line 593 "compile.y" { yyval=yyvsp[-2]; P(*yyval, *yyvsp[0]); O(*yyval, OP_NUM_GE) ; break;} -case 155: -#line 590 "compile.y" +case 154: +#line 594 "compile.y" { yyval=yyvsp[-2]; P(*yyval, *yyvsp[0]); O(*yyval, OP_NUM_EQ) ; break;} -case 156: -#line 591 "compile.y" +case 155: +#line 595 "compile.y" { yyval=yyvsp[-2]; P(*yyval, *yyvsp[0]); O(*yyval, OP_NUM_NE) ; break;} -case 157: -#line 592 "compile.y" +case 156: +#line 596 "compile.y" { yyval=yyvsp[-2]; P(*yyval, *yyvsp[0]); O(*yyval, OP_STR_LT) ; break;} -case 158: -#line 593 "compile.y" +case 157: +#line 597 "compile.y" { yyval=yyvsp[-2]; P(*yyval, *yyvsp[0]); O(*yyval, OP_STR_GT) ; break;} -case 159: -#line 594 "compile.y" +case 158: +#line 598 "compile.y" { yyval=yyvsp[-2]; P(*yyval, *yyvsp[0]); O(*yyval, OP_STR_LE) ; break;} -case 160: -#line 595 "compile.y" +case 159: +#line 599 "compile.y" { yyval=yyvsp[-2]; P(*yyval, *yyvsp[0]); O(*yyval, OP_STR_GE) ; break;} -case 161: -#line 596 "compile.y" +case 160: +#line 600 "compile.y" { yyval=yyvsp[-2]; P(*yyval, *yyvsp[0]); O(*yyval, OP_STR_EQ) ; break;} -case 162: -#line 597 "compile.y" +case 161: +#line 601 "compile.y" { yyval=yyvsp[-2]; P(*yyval, *yyvsp[0]); O(*yyval, OP_STR_NE) ; break;} -case 163: -#line 598 "compile.y" +case 162: +#line 602 "compile.y" { yyval=yyvsp[-2]; P(*yyval, *yyvsp[0]); O(*yyval, OP_IS) ; break;} -case 164: -#line 601 "compile.y" +case 163: +#line 605 "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" +case 164: +#line 610 "compile.y" { yyval=N(); OA(*yyval, OP_STRING_POOL, yyvsp[0]); /* stack: empty write context */ @@ -1719,19 +1720,19 @@ case 165: /* context=pop; stack: context.get_string() */ ; break;} -case 166: -#line 615 "compile.y" +case 165: +#line 619 "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 167: -#line 620 "compile.y" +case 166: +#line 624 "compile.y" { yyval=VL(new VVoid(), 0, 0, 0) ; break;} -case 168: -#line 621 "compile.y" +case 167: +#line 625 "compile.y" { yyval=N() ; break;} } @@ -1956,7 +1957,7 @@ yyerrhandle: } return 1; } -#line 623 "compile.y" +#line 627 "compile.y" #endif