--- parser3/src/main/compile.tab.C 2004/04/06 14:08:41 1.98 +++ parser3/src/main/compile.tab.C 2005/08/08 13:30:45 1.104 @@ -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.98 2004/04/06 14:08:41 paf Exp $ + $Id: compile.tab.C,v 1.104 2005/08/08 13:30:45 paf Exp $ */ /** @@ -105,11 +105,11 @@ static int yylex(YYSTYPE* lvalp, void* p -#define YYFINAL 255 +#define YYFINAL 259 #define YYFLAG -32768 #define YYNTBASE 60 -#define YYTRANSLATE(x) ((unsigned)(x) <= 286 ? yytranslate[x] : 142) +#define YYTRANSLATE(x) ((unsigned)(x) <= 286 ? yytranslate[x] : 146) static const char yytranslate[] = { 0, 2, 2, 2, 2, 2, 2, 2, 2, 2, 46, @@ -150,67 +150,68 @@ static const short yyprhs[] = { 0, 54, 56, 58, 60, 64, 66, 68, 70, 72, 74, 77, 79, 81, 83, 85, 87, 89, 92, 95, 97, 101, 103, 105, 107, 110, 112, 115, 119, 121, 123, - 125, 127, 130, 133, 135, 137, 139, 143, 147, 151, - 153, 155, 157, 159, 161, 163, 166, 168, 169, 170, - 177, 179, 181, 184, 186, 188, 190, 191, 192, 198, - 202, 206, 208, 212, 214, 218, 220, 224, 226, 228, - 230, 232, 234, 236, 238, 240, 243, 245, 248, 251, - 253, 255, 258, 260, 262, 264, 266, 269, 272, 276, - 278, 280, 283, 286, 288, 290, 293, 296, 298, 300, - 302, 304, 308, 312, 316, 319, 322, 325, 328, 331, - 334, 337, 340, 344, 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, - 450, 452, 453 + 125, 127, 130, 133, 135, 137, 139, 140, 141, 147, + 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, 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, 141, + 64, 0, 69, 0, 45, 4, 46, 65, 0, 145, 0, 66, 0, 67, 0, 66, 67, 0, 68, 46, - 0, 141, 0, 4, 0, 0, 45, 4, 72, 71, - 75, 46, 70, 76, 0, 141, 0, 72, 0, 47, - 73, 48, 0, 141, 0, 74, 0, 4, 0, 74, - 49, 4, 0, 141, 0, 4, 0, 141, 0, 77, - 0, 78, 0, 77, 78, 0, 139, 0, 79, 0, - 80, 0, 88, 0, 101, 0, 81, 0, 50, 82, + 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, 133, 87, 0, 125, - 0, 122, 125, 0, 50, 89, 93, 0, 90, 0, - 91, 0, 92, 0, 121, 0, 53, 121, 0, 133, - 121, 0, 94, 0, 95, 0, 96, 0, 47, 97, - 48, 0, 54, 136, 55, 0, 51, 76, 52, 0, - 140, 0, 4, 0, 98, 0, 99, 0, 100, 0, - 79, 0, 78, 77, 0, 102, 0, 0, 0, 56, - 103, 105, 104, 106, 3, 0, 84, 0, 107, 0, - 106, 107, 0, 108, 0, 111, 0, 112, 0, 0, - 0, 47, 109, 113, 110, 48, 0, 54, 114, 55, - 0, 51, 115, 52, 0, 116, 0, 113, 49, 116, - 0, 117, 0, 114, 49, 117, 0, 118, 0, 115, - 49, 118, 0, 119, 0, 120, 0, 76, 0, 140, - 0, 4, 0, 98, 0, 136, 0, 126, 0, 122, - 126, 0, 123, 0, 122, 123, 0, 124, 53, 0, - 126, 0, 126, 0, 4, 5, 0, 4, 0, 127, - 0, 128, 0, 129, 0, 50, 130, 0, 4, 131, - 0, 47, 77, 48, 0, 4, 0, 132, 0, 131, - 132, 0, 50, 130, 0, 134, 0, 135, 0, 4, - 57, 0, 134, 57, 0, 137, 0, 4, 0, 81, - 0, 102, 0, 58, 138, 58, 0, 59, 138, 59, - 0, 54, 137, 55, 0, 37, 137, 0, 36, 137, - 0, 43, 137, 0, 44, 137, 0, 27, 137, 0, - 28, 137, 0, 29, 137, 0, 30, 137, 0, 137, - 37, 137, 0, 137, 36, 137, 0, 137, 38, 137, - 0, 137, 39, 137, 0, 137, 41, 137, 0, 137, - 40, 137, 0, 137, 19, 137, 0, 137, 20, 137, - 0, 137, 35, 137, 0, 137, 34, 137, 0, 137, - 14, 137, 0, 137, 11, 137, 0, 137, 12, 137, - 0, 137, 13, 137, 0, 137, 32, 137, 0, 137, - 33, 137, 0, 137, 15, 137, 0, 137, 16, 137, - 0, 137, 17, 137, 0, 137, 18, 137, 0, 137, - 21, 137, 0, 137, 22, 137, 0, 137, 23, 137, - 0, 137, 24, 137, 0, 137, 25, 137, 0, 137, - 26, 137, 0, 137, 31, 137, 0, 76, 0, 4, - 0, 0, 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, 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 @@ -222,18 +223,18 @@ static const short yyrline[] = { 0, 254, 254, 255, 255, 257, 257, 261, 261, 263, 263, 264, 264, 265, 265, 265, 269, 276, 277, 277, 278, 279, 281, 282, 304, 305, 305, 309, 313, 315, 316, - 317, 334, 339, 341, 343, 344, 346, 352, 360, 366, - 368, 369, 371, 377, 378, 378, 382, 388, 391, 394, - 407, 409, 409, 410, 412, 413, 415, 418, 420, 421, - 422, 423, 425, 427, 429, 431, 433, 435, 439, 443, - 447, 449, 450, 452, 461, 461, 463, 463, 464, 465, - 473, 478, 480, 482, 483, 484, 486, 490, 499, 505, - 510, 510, 511, 516, 518, 520, 532, 544, 549, 551, - 552, 553, 554, 555, 557, 558, 559, 560, 561, 562, - 563, 564, 566, 567, 568, 569, 570, 571, 572, 573, - 574, 575, 576, 577, 578, 579, 580, 581, 582, 583, - 584, 585, 586, 587, 588, 589, 590, 591, 592, 595, - 604, 609, 610 + 317, 334, 339, 341, 343, 344, 346, 349, 351, 357, + 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, 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 @@ -254,16 +255,17 @@ static const char * const yytname[] = { "get","get_value","get_name_value","name_in_curly_rdive","name_without_curly_rdive", "name_without_curly_rdive_read","name_without_curly_rdive_class","name_without_curly_rdive_code", "put","name_expr_wdive","name_expr_wdive_root","name_expr_wdive_write","name_expr_wdive_class", -"construct","construct_square","construct_round","construct_curly","any_constructor_code_value", -"constructor_code_value","constructor_code","codes__excluding_sole_str_literal", -"call","call_value","@2","@3","call_name","store_params","store_param","store_square_param", -"@4","@5","store_round_param","store_curly_param","store_code_param_parts","store_expr_param_parts", +"construct","construct_square","@2","@3","construct_round","construct_curly", +"any_constructor_code_value","constructor_code_value","constructor_code","codes__excluding_sole_str_literal", +"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", -"name_square_code_value","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 +"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", +"void_value","empty", NULL }; #endif @@ -273,18 +275,18 @@ static const short yyr1[] = { 0, 73, 73, 74, 74, 75, 75, 76, 76, 77, 77, 78, 78, 79, 79, 79, 80, 81, 82, 82, 83, 84, 84, 85, 86, 87, 87, 88, 89, 89, 89, - 90, 91, 92, 93, 93, 93, 94, 95, 96, 97, - 97, 97, 98, 99, 100, 100, 101, 103, 104, 102, - 105, 106, 106, 107, 107, 107, 109, 110, 108, 111, - 112, 113, 113, 114, 114, 115, 115, 116, 117, 118, - 119, 119, 119, 120, 121, 121, 122, 122, 123, 124, - 125, 125, 126, 126, 126, 126, 127, 128, 129, 130, - 131, 131, 132, 133, 133, 134, 135, 136, 137, 137, - 137, 137, 137, 137, 137, 137, 137, 137, 137, 137, - 137, 137, 137, 137, 137, 137, 137, 137, 137, 137, - 137, 137, 137, 137, 137, 137, 137, 137, 137, 137, - 137, 137, 137, 137, 137, 137, 137, 137, 137, 138, - 139, 140, 141 + 90, 91, 92, 93, 93, 93, 95, 96, 94, 97, + 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, 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, @@ -293,212 +295,208 @@ static const short yyr2[] = { 0, 1, 1, 1, 3, 1, 1, 1, 1, 1, 2, 1, 1, 1, 1, 1, 1, 2, 2, 1, 3, 1, 1, 1, 2, 1, 2, 3, 1, 1, 1, - 1, 2, 2, 1, 1, 1, 3, 3, 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, 3, 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, + 1, 2, 2, 1, 1, 1, 0, 0, 5, 3, + 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, 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, 1, - 1, 0, 0 + 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, + 3, 3, 1, 1, 1, 0, 0 }; -static const short yydefact[] = { 163, - 161, 0, 0, 68, 2, 1, 3, 6, 7, 5, - 28, 29, 32, 33, 36, 34, 35, 67, 31, 27, - 0, 103, 0, 0, 0, 0, 37, 39, 0, 41, - 42, 43, 0, 48, 49, 50, 51, 0, 97, 0, - 45, 95, 104, 105, 106, 0, 114, 115, 0, 4, - 30, 163, 163, 163, 102, 0, 116, 108, 111, 0, - 110, 107, 0, 0, 101, 0, 103, 52, 0, 95, - 38, 162, 163, 0, 47, 54, 55, 56, 103, 98, - 46, 96, 99, 44, 53, 117, 71, 69, 15, 8, - 10, 11, 0, 9, 23, 0, 22, 21, 163, 19, - 18, 113, 112, 109, 40, 96, 161, 0, 32, 0, - 62, 63, 64, 60, 0, 119, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 163, 163, 120, 121, - 0, 118, 0, 12, 14, 13, 20, 0, 26, 0, - 25, 66, 57, 59, 129, 130, 131, 132, 126, 125, - 127, 128, 0, 160, 0, 0, 58, 0, 0, 0, +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, 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, 77, 163, 0, 0, 72, 74, - 75, 76, 24, 16, 124, 122, 123, 144, 145, 146, - 143, 149, 150, 151, 152, 139, 140, 153, 154, 155, - 156, 157, 158, 159, 147, 148, 142, 141, 134, 133, - 135, 136, 138, 137, 162, 90, 0, 86, 0, 84, - 89, 94, 70, 73, 163, 161, 93, 78, 82, 88, - 91, 163, 81, 0, 80, 17, 162, 0, 87, 85, - 83, 79, 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[] = { 253, - 5, 6, 7, 8, 90, 91, 92, 93, 9, 235, - 99, 54, 96, 97, 140, 154, 11, 12, 13, 14, - 129, 27, 28, 29, 30, 31, 32, 16, 33, 34, - 35, 36, 75, 76, 77, 78, 110, 237, 112, 113, - 17, 130, 49, 133, 88, 188, 189, 190, 225, 248, - 191, 192, 238, 229, 227, 239, 230, 228, 240, 231, - 37, 64, 39, 40, 41, 65, 43, 44, 45, 62, - 58, 59, 66, 47, 48, 232, 132, 155, 19, 241, - 20 +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, 241, + 142, 143, 17, 123, 49, 127, 88, 189, 190, 191, + 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[] = { 11, --32768, 35, 73,-32768, -1,-32768,-32768,-32768,-32768,-32768, - 13,-32768,-32768,-32768,-32768,-32768,-32768,-32768,-32768,-32768, - -16, 1, 13, 44, 91, 100,-32768,-32768, 47,-32768, --32768,-32768, -27,-32768,-32768,-32768,-32768, 108,-32768, 36, --32768, 4,-32768,-32768,-32768, 108, 40,-32768, 91,-32768, --32768, 50, 97, 59,-32768, 44,-32768, 57,-32768, 38, --32768,-32768, 65, 108, 72, 108, 57,-32768, 100, 72, --32768, 14, 13, 55,-32768,-32768,-32768,-32768, 16,-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, - 22,-32768, 75, 85,-32768, 70, 83,-32768, 129,-32768, --32768,-32768,-32768,-32768,-32768, 72, 86, 13, -11, 88, --32768,-32768,-32768,-32768, 94,-32768, 55, 55, 55, 55, - 55, 55, 55, 55, 98, 55, 13, 13,-32768,-32768, - 82, 312, 68,-32768,-32768,-32768,-32768, 136,-32768, 105, --32768, 13,-32768,-32768, 438, 438, 438, 438,-32768,-32768, --32768,-32768, 267,-32768, 95, 84,-32768, 55, 55, 55, - 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, - 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, - 55, 55, 55, 55,-32768, 13, 55, 49,-32768,-32768, --32768,-32768,-32768,-32768,-32768,-32768,-32768, 402, 374, 343, - 275, 143, 143, 430, 430, 154, 154, 143, 143, 143, - 143, 430, 430, 438, 143, 143, 461, 467, 126, 126, --32768,-32768,-32768,-32768, 37,-32768, -3,-32768, -33,-32768, --32768,-32768,-32768,-32768, 13, 32,-32768, 103,-32768,-32768, --32768, 13,-32768, 55,-32768,-32768, 37, 122,-32768,-32768, --32768,-32768, 156, 171,-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, 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, 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, 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, 167,-32768,-32768,-32768, 96,-32768,-32768,-32768, --32768, 119,-32768,-32768,-32768, 3, -18, -7, -71,-32768, - 0,-32768,-32768, -6,-32768,-32768, -38,-32768,-32768,-32768, --32768,-32768,-32768,-32768,-32768,-32768,-32768, 124,-32768,-32768, --32768, 2,-32768,-32768,-32768,-32768, -13,-32768,-32768,-32768, --32768,-32768,-32768,-32768,-32768, -62, -47, -44,-32768,-32768, - -17, 113, -24,-32768, -28, 9,-32768,-32768,-32768, 144, --32768, 141, 198,-32768,-32768, 128, 93, 76,-32768, 131, - -20 +-32768,-32768, 219,-32768,-32768,-32768, 134,-32768,-32768,-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, 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 508 +#define YYLAST 484 static const short yytable[] = { 15, - 109, 18, 10, 51, 60, 55, -101, 84, 68, 81, - 15, 42, 18, 80, 1, 244, 1, 107, 63, 72, - 55, 245, 15, 73, 18, 89, 74, 84, 85, 52, - 53, 94, 98, 101, 70, 81, -65, -65, 21, 80, - 236, 1, 87, 2, 80, 242, 82, 61, 243, 71, - 56, 233, 51, 89, 42, 2, -100, 57, 116, 15, - 3, 18, 3, 3, 108, 56, 4, -163, 4, 4, - 135, 15, 15, 18, 18, 115, 22, 106, 141, -92, - -92, 117, 118, 119, 120, 104, 3, 3, 83, 142, - 121, 122, 4, 4, 22, 185, 86, 123, 124, 186, - 95, 22, 187, 67, 125, 53, 56, 15, 126, 18, - 4, 79, 127, 128, 185, 38, 105, 137, 186, 23, - 136, 187, 24, 25, -100, 26, 15, 15, 18, 18, - -14, 138, 139, -61, 51, 143, 157, 23, 69, 193, - 24, 15, 197, 18, 23, 144, 23, 24, 25, 24, - 194, 247, 196, 109, 23, 254, 161, 24, 38, 164, - 165, 166, 167, 181, 182, 183, 184, 172, 173, 252, - 255, 50, 100, 174, 234, 109, 177, 178, 179, 180, - 181, 182, 183, 184, 251, 15, 134, 18, 226, 179, - 180, 181, 182, 183, 184, 111, 250, 249, 103, 102, - 46, 131, 114, 156, 0, 0, 0, 0, 0, 145, - 146, 147, 148, 149, 150, 151, 152, 108, 153, 0, - 0, 0, 0, 0, 15, 0, 18, 0, 0, 0, - 0, 0, 0, 0, 15, 0, 18, 246, 0, 108, - 0, 15, 0, 18, 226, 0, 15, 0, 18, 0, - 198, 199, 200, 201, 202, 203, 204, 205, 206, 207, - 208, 209, 210, 211, 212, 213, 214, 215, 216, 217, - 218, 219, 220, 221, 222, 223, 224, 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, 195, 158, 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, 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, + 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, -101, 3, 56, 15, + 4, 18, 3, 4, 3, 57, 23, 56, 4, 24, + 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, + -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, -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, - 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, 0, 0, 166, 167, - 0, 161, 0, 0, 0, 0, 166, 167, 0, 0, - 174, 0, 0, 177, 178, 179, 180, 181, 182, 183, - 184, 177, 178, 179, 180, 181, 182, 183, 184, 166, - 167, 0, 0, 0, 0, 166, 167, 0, 0, 0, - 0, 0, 0, 0, 0, 178, 179, 180, 181, 182, - 183, 184, 179, 180, 181, 182, 183, 184 + 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, 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, - 72, 0, 0, 11, 23, 5, 3, 46, 26, 38, - 11, 3, 11, 38, 4, 49, 4, 4, 25, 47, - 5, 55, 23, 51, 23, 4, 54, 66, 46, 46, - 47, 52, 53, 54, 26, 64, 48, 49, 4, 64, - 4, 4, 49, 45, 69, 49, 38, 4, 52, 3, - 50, 3, 60, 4, 46, 45, 53, 57, 4, 60, - 50, 60, 50, 50, 72, 50, 56, 46, 56, 56, - 91, 72, 73, 72, 73, 73, 4, 69, 99, 48, - 49, 27, 28, 29, 30, 48, 50, 50, 53, 108, - 36, 37, 56, 56, 4, 47, 57, 43, 44, 51, - 4, 4, 54, 4, 50, 47, 50, 108, 54, 108, - 56, 4, 58, 59, 47, 3, 52, 48, 51, 47, - 46, 54, 50, 51, 53, 53, 127, 128, 127, 128, - 46, 49, 4, 48, 142, 48, 55, 47, 26, 4, - 50, 142, 59, 142, 47, 52, 47, 50, 51, 50, - 46, 49, 58, 225, 47, 0, 14, 50, 46, 17, - 18, 19, 20, 38, 39, 40, 41, 25, 26, 48, - 0, 5, 54, 31, 188, 247, 34, 35, 36, 37, - 38, 39, 40, 41, 247, 186, 91, 186, 186, 36, - 37, 38, 39, 40, 41, 72, 244, 242, 58, 56, - 3, 74, 72, 128, -1, -1, -1, -1, -1, 117, - 118, 119, 120, 121, 122, 123, 124, 225, 126, -1, - -1, -1, -1, -1, 225, -1, 225, -1, -1, -1, - -1, -1, -1, -1, 235, -1, 235, 235, -1, 247, - -1, 242, -1, 242, 242, -1, 247, -1, 247, -1, - 158, 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, 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, 14, 15, 16, + 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, 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, 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, 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, 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, -1, -1, 19, 20, - -1, 14, -1, -1, -1, -1, 19, 20, -1, -1, - 31, -1, -1, 34, 35, 36, 37, 38, 39, 40, - 41, 34, 35, 36, 37, 38, 39, 40, 41, 19, - 20, -1, -1, -1, -1, 19, 20, -1, -1, -1, - -1, -1, -1, -1, -1, 35, 36, 37, 38, 39, - 40, 41, 36, 37, 38, 39, 40, 41 + 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 @@ -1284,13 +1282,26 @@ case 53: case 57: #line 346 "compile.y" { + // allow $result_or_other_variable[ letters here any time ] + *reinterpret_cast(&yyval)=PC.explicit_result; PC.explicit_result=false; +; + break;} +case 58: +#line 349 "compile.y" +{ + PC.explicit_result=*reinterpret_cast(&yyvsp[-1]); +; + break;} +case 59: +#line 351 "compile.y" +{ // stack: context, name - yyval=yyvsp[-1]; // stack: context, name, value + yyval=yyvsp[-2]; // stack: context, name, value O(*yyval, OP_CONSTRUCT_VALUE); /* value=pop; name=pop; context=pop; construct(context,name,value) */ ; break;} -case 58: -#line 352 "compile.y" +case 60: +#line 357 "compile.y" { yyval=N(); O(*yyval, OP_PREPARE_TO_EXPRESSION); @@ -1299,16 +1310,16 @@ case 58: O(*yyval, OP_CONSTRUCT_EXPR); /* value=pop->as_expr_result; name=pop; context=pop; construct(context,name,value) */ ; break;} -case 59: -#line 360 "compile.y" +case 61: +#line 365 "compile.y" { // stack: context, name yyval=N(); OA(*yyval, OP_CURLY_CODE__CONSTRUCT, yyvsp[-1]); /* code=pop; name=pop; context=pop; construct(context,name,junction(code)) */ ; break;} -case 63: -#line 371 "compile.y" +case 65: +#line 376 "compile.y" { yyval=N(); OA(*yyval, OP_OBJECT_POOL, yyvsp[0]); /* stack: empty write context */ @@ -1316,12 +1327,12 @@ case 63: /* context=pop; stack: context.value() */ ; break;} -case 66: -#line 378 "compile.y" +case 68: +#line 383 "compile.y" { yyval=yyvsp[-1]; P(*yyval, *yyvsp[0]) ; break;} -case 67: -#line 382 "compile.y" +case 69: +#line 387 "compile.y" { yyval=yyvsp[0]; /* stack: value */ changetail_or_append(*yyval, @@ -1329,20 +1340,20 @@ case 67: /*or */OP_WRITE_VALUE); /* value=pop; wcontext.write(value) */ ; break;} -case 68: -#line 388 "compile.y" +case 70: +#line 393 "compile.y" { PC.in_call_value=true; ; break;} -case 69: -#line 391 "compile.y" +case 71: +#line 396 "compile.y" { PC.in_call_value=false; ; break;} -case 70: -#line 394 "compile.y" +case 72: +#line 399 "compile.y" { /* ^field.$method{vasya} */ yyval=yyvsp[-3]; /* with_xxx,diving code; stack: context,method_junction */ @@ -1356,87 +1367,88 @@ case 70: OA(*yyval, OP_CALL, params_code); // method_frame=make frame(pop junction); ncontext=pop; call(ncontext,method_frame) stack: value ; break;} -case 73: -#line 409 "compile.y" +case 75: +#line 414 "compile.y" { yyval=yyvsp[-1]; P(*yyval, *yyvsp[0]) ; break;} -case 77: -#line 415 "compile.y" +case 79: +#line 420 "compile.y" { - // allow ^call[ whitespace here any time ] + // allow ^call[ letters here any time ] *reinterpret_cast(&yyval)=PC.explicit_result; PC.explicit_result=false; ; break;} -case 78: -#line 418 "compile.y" +case 80: +#line 423 "compile.y" { - PC.explicit_result=reinterpret_cast(yyvsp[-1]); + PC.explicit_result=*reinterpret_cast(&yyvsp[-1]); ; break;} -case 79: -#line 420 "compile.y" +case 81: +#line 425 "compile.y" {yyval=yyvsp[-2]; break;} -case 80: -#line 421 "compile.y" -{yyval=yyvsp[-1]; - break;} -case 81: -#line 422 "compile.y" +case 82: +#line 426 "compile.y" {yyval=yyvsp[-1]; break;} case 83: -#line 425 "compile.y" -{ yyval=yyvsp[-2]; P(*yyval, *yyvsp[0]) ; +#line 427 "compile.y" +{yyval=yyvsp[-1]; break;} case 85: -#line 429 "compile.y" +#line 430 "compile.y" { yyval=yyvsp[-2]; P(*yyval, *yyvsp[0]) ; break;} case 87: -#line 433 "compile.y" +#line 434 "compile.y" +{ yyval=yyvsp[-2]; P(*yyval, *yyvsp[0]) ; + break;} +case 89: +#line 438 "compile.y" { yyval=yyvsp[-2]; P(*yyval, *yyvsp[0]) ; break;} -case 88: -#line 435 "compile.y" +case 90: +#line 440 "compile.y" { yyval=yyvsp[0]; O(*yyval, OP_STORE_PARAM); ; break;} -case 89: -#line 439 "compile.y" +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 90: -#line 443 "compile.y" +case 92: +#line 458 "compile.y" { yyval=N(); OA(*yyval, OP_CURLY_CODE__STORE_PARAM, yyvsp[0]); ; break;} -case 94: -#line 452 "compile.y" -{ - yyval=N(); - O(*yyval, OP_PREPARE_TO_EXPRESSION); - P(*yyval, *yyvsp[0]); - O(*yyval, OP_WRITE_EXPR_RESULT); -; - break;} -case 96: -#line 461 "compile.y" +case 97: +#line 470 "compile.y" { yyval=yyvsp[-1]; P(*yyval, *yyvsp[0]) ; break;} -case 98: -#line 463 "compile.y" +case 99: +#line 472 "compile.y" { yyval=yyvsp[-1]; P(*yyval, *yyvsp[0]) ; break;} -case 100: -#line 465 "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 @@ -1446,23 +1458,23 @@ case 100: O(*yyval, OP_GET_ELEMENT); /* name=pop; context=pop; stack: context.get_element(name) */ ; break;} -case 101: -#line 473 "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 107: -#line 486 "compile.y" +case 108: +#line 495 "compile.y" { yyval=yyvsp[0]; O(*yyval, OP_GET_ELEMENT); ; break;} -case 108: -#line 490 "compile.y" +case 109: +#line 499 "compile.y" { ArrayOperation* code; { @@ -1473,36 +1485,49 @@ case 108: OA(*yyval, OP_STRING_POOL, code); ; break;} -case 109: -#line 499 "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 111: +#line 511 "compile.y" +{ + PC.explicit_result=*reinterpret_cast(&yyvsp[-1]); +; + break;} +case 112: +#line 513 "compile.y" { yyval=N(); - OA(*yyval, OP_OBJECT_POOL, yyvsp[-1]); /* stack: empty write context */ + OA(*yyval, OP_OBJECT_POOL, yyvsp[-2]); /* stack: empty write context */ /* some code that writes to that context */ /* context=pop; stack: context.value() */ ; break;} -case 110: -#line 505 "compile.y" +case 113: +#line 519 "compile.y" { yyval=N(); O(*yyval, OP_WITH_READ); P(*yyval, *yyvsp[0]); ; break;} -case 112: -#line 510 "compile.y" +case 115: +#line 524 "compile.y" { yyval=yyvsp[-1]; P(*yyval, *yyvsp[0]) ; break;} -case 113: -#line 511 "compile.y" +case 116: +#line 525 "compile.y" { yyval=yyvsp[0]; O(*yyval, OP_GET_ELEMENT__WRITE); ; break;} -case 116: -#line 520 "compile.y" +case 119: +#line 534 "compile.y" { yyval=yyvsp[-1]; // stack: class name string if(*LA2S(*yyval) == BASE_NAME) { // pseudo BASE class @@ -1516,8 +1541,8 @@ case 116: O(*yyval, OP_GET_CLASS); ; break;} -case 117: -#line 532 "compile.y" +case 120: +#line 546 "compile.y" { yyval=yyvsp[-1]; if(!PC.in_call_value) { @@ -1527,168 +1552,167 @@ case 117: O(*yyval, OP_PREPARE_TO_CONSTRUCT_OBJECT); ; break;} -case 118: -#line 544 "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 122: -#line 553 "compile.y" +case 125: +#line 563 "compile.y" { yyval = yyvsp[-1]; ; break;} -case 123: -#line 554 "compile.y" +case 126: +#line 564 "compile.y" { yyval = yyvsp[-1]; ; break;} -case 124: -#line 555 "compile.y" +case 127: +#line 565 "compile.y" { yyval = yyvsp[-1]; ; break;} -case 125: -#line 557 "compile.y" +case 128: +#line 567 "compile.y" { yyval=yyvsp[0]; O(*yyval, OP_NEG) ; break;} -case 126: -#line 558 "compile.y" +case 129: +#line 568 "compile.y" { yyval=yyvsp[0] ; break;} -case 127: -#line 559 "compile.y" +case 130: +#line 569 "compile.y" { yyval=yyvsp[0]; O(*yyval, OP_INV) ; break;} -case 128: -#line 560 "compile.y" +case 131: +#line 570 "compile.y" { yyval=yyvsp[0]; O(*yyval, OP_NOT) ; break;} -case 129: -#line 561 "compile.y" +case 132: +#line 571 "compile.y" { yyval=yyvsp[0]; O(*yyval, OP_DEF) ; break;} -case 130: -#line 562 "compile.y" +case 133: +#line 572 "compile.y" { yyval=yyvsp[0]; O(*yyval, OP_IN) ; break;} -case 131: -#line 563 "compile.y" +case 134: +#line 573 "compile.y" { yyval=yyvsp[0]; O(*yyval, OP_FEXISTS) ; break;} -case 132: -#line 564 "compile.y" +case 135: +#line 574 "compile.y" { yyval=yyvsp[0]; O(*yyval, OP_DEXISTS) ; break;} -case 133: -#line 566 "compile.y" +case 136: +#line 576 "compile.y" { yyval=yyvsp[-2]; P(*yyval, *yyvsp[0]); O(*yyval, OP_SUB) ; break;} -case 134: -#line 567 "compile.y" +case 137: +#line 577 "compile.y" { yyval=yyvsp[-2]; P(*yyval, *yyvsp[0]); O(*yyval, OP_ADD) ; break;} -case 135: -#line 568 "compile.y" +case 138: +#line 578 "compile.y" { yyval=yyvsp[-2]; P(*yyval, *yyvsp[0]); O(*yyval, OP_MUL) ; break;} -case 136: -#line 569 "compile.y" +case 139: +#line 579 "compile.y" { yyval=yyvsp[-2]; P(*yyval, *yyvsp[0]); O(*yyval, OP_DIV) ; break;} -case 137: -#line 570 "compile.y" +case 140: +#line 580 "compile.y" { yyval=yyvsp[-2]; P(*yyval, *yyvsp[0]); O(*yyval, OP_MOD) ; break;} -case 138: -#line 571 "compile.y" +case 141: +#line 581 "compile.y" { yyval=yyvsp[-2]; P(*yyval, *yyvsp[0]); O(*yyval, OP_INTDIV) ; break;} -case 139: -#line 572 "compile.y" +case 142: +#line 582 "compile.y" { yyval=yyvsp[-2]; P(*yyval, *yyvsp[0]); O(*yyval, OP_BIN_SL) ; break;} -case 140: -#line 573 "compile.y" +case 143: +#line 583 "compile.y" { yyval=yyvsp[-2]; P(*yyval, *yyvsp[0]); O(*yyval, OP_BIN_SR) ; break;} -case 141: -#line 574 "compile.y" +case 144: +#line 584 "compile.y" { yyval=yyvsp[-2]; P(*yyval, *yyvsp[0]); O(*yyval, OP_BIN_AND) ; break;} -case 142: -#line 575 "compile.y" +case 145: +#line 585 "compile.y" { yyval=yyvsp[-2]; P(*yyval, *yyvsp[0]); O(*yyval, OP_BIN_OR) ; break;} -case 143: -#line 576 "compile.y" +case 146: +#line 586 "compile.y" { yyval=yyvsp[-2]; P(*yyval, *yyvsp[0]); O(*yyval, OP_BIN_XOR) ; break;} -case 144: -#line 577 "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 145: -#line 578 "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 146: -#line 579 "compile.y" +case 149: +#line 589 "compile.y" { yyval=yyvsp[-2]; P(*yyval, *yyvsp[0]); O(*yyval, OP_LOG_XOR) ; break;} -case 147: -#line 580 "compile.y" +case 150: +#line 590 "compile.y" { yyval=yyvsp[-2]; P(*yyval, *yyvsp[0]); O(*yyval, OP_NUM_LT) ; break;} -case 148: -#line 581 "compile.y" +case 151: +#line 591 "compile.y" { yyval=yyvsp[-2]; P(*yyval, *yyvsp[0]); O(*yyval, OP_NUM_GT) ; break;} -case 149: -#line 582 "compile.y" +case 152: +#line 592 "compile.y" { yyval=yyvsp[-2]; P(*yyval, *yyvsp[0]); O(*yyval, OP_NUM_LE) ; break;} -case 150: -#line 583 "compile.y" +case 153: +#line 593 "compile.y" { yyval=yyvsp[-2]; P(*yyval, *yyvsp[0]); O(*yyval, OP_NUM_GE) ; break;} -case 151: -#line 584 "compile.y" +case 154: +#line 594 "compile.y" { yyval=yyvsp[-2]; P(*yyval, *yyvsp[0]); O(*yyval, OP_NUM_EQ) ; break;} -case 152: -#line 585 "compile.y" +case 155: +#line 595 "compile.y" { yyval=yyvsp[-2]; P(*yyval, *yyvsp[0]); O(*yyval, OP_NUM_NE) ; break;} -case 153: -#line 586 "compile.y" +case 156: +#line 596 "compile.y" { yyval=yyvsp[-2]; P(*yyval, *yyvsp[0]); O(*yyval, OP_STR_LT) ; break;} -case 154: -#line 587 "compile.y" +case 157: +#line 597 "compile.y" { yyval=yyvsp[-2]; P(*yyval, *yyvsp[0]); O(*yyval, OP_STR_GT) ; break;} -case 155: -#line 588 "compile.y" +case 158: +#line 598 "compile.y" { yyval=yyvsp[-2]; P(*yyval, *yyvsp[0]); O(*yyval, OP_STR_LE) ; break;} -case 156: -#line 589 "compile.y" +case 159: +#line 599 "compile.y" { yyval=yyvsp[-2]; P(*yyval, *yyvsp[0]); O(*yyval, OP_STR_GE) ; break;} -case 157: -#line 590 "compile.y" +case 160: +#line 600 "compile.y" { yyval=yyvsp[-2]; P(*yyval, *yyvsp[0]); O(*yyval, OP_STR_EQ) ; break;} -case 158: -#line 591 "compile.y" +case 161: +#line 601 "compile.y" { yyval=yyvsp[-2]; P(*yyval, *yyvsp[0]); O(*yyval, OP_STR_NE) ; break;} -case 159: -#line 592 "compile.y" +case 162: +#line 602 "compile.y" { yyval=yyvsp[-2]; P(*yyval, *yyvsp[0]); O(*yyval, OP_IS) ; break;} -case 160: -#line 595 "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 164: +#line 610 "compile.y" { yyval=N(); OA(*yyval, OP_STRING_POOL, yyvsp[0]); /* stack: empty write context */ @@ -1696,19 +1720,19 @@ case 160: /* context=pop; stack: context.get_string() */ ; break;} -case 161: -#line 604 "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 162: -#line 609 "compile.y" +case 166: +#line 624 "compile.y" { yyval=VL(new VVoid(), 0, 0, 0) ; break;} -case 163: -#line 610 "compile.y" +case 167: +#line 625 "compile.y" { yyval=N() ; break;} } @@ -1933,7 +1957,7 @@ yyerrhandle: } return 1; } -#line 612 "compile.y" +#line 627 "compile.y" #endif