--- parser3/src/main/compile.tab.C 2004/04/06 09:01:20 1.97 +++ 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.97 2004/04/06 09:01:20 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 253 +#define YYFINAL 260 #define YYFLAG -32768 #define YYNTBASE 60 -#define YYTRANSLATE(x) ((unsigned)(x) <= 286 ? yytranslate[x] : 140) +#define YYTRANSLATE(x) ((unsigned)(x) <= 286 ? yytranslate[x] : 147) static const char yytranslate[] = { 0, 2, 2, 2, 2, 2, 2, 2, 2, 2, 46, @@ -150,66 +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, 194, 198, 202, - 204, 208, 210, 214, 216, 220, 222, 224, 226, 228, - 230, 232, 234, 236, 239, 241, 244, 247, 249, 251, - 254, 256, 258, 260, 262, 265, 268, 272, 274, 276, - 279, 282, 284, 286, 289, 292, 294, 296, 298, 300, - 304, 308, 312, 315, 318, 321, 324, 327, 330, 333, - 336, 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, 446, 448, - 449 + 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, 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 }; static const short yyrhs[] = { 62, 0, 61, 0, 63, 0, 61, 63, 0, 76, 0, - 64, 0, 69, 0, 45, 4, 46, 65, 0, 139, + 64, 0, 69, 0, 45, 4, 46, 65, 0, 146, 0, 66, 0, 67, 0, 66, 67, 0, 68, 46, - 0, 139, 0, 4, 0, 0, 45, 4, 72, 71, - 75, 46, 70, 76, 0, 139, 0, 72, 0, 47, - 73, 48, 0, 139, 0, 74, 0, 4, 0, 74, - 49, 4, 0, 139, 0, 4, 0, 139, 0, 77, - 0, 78, 0, 77, 78, 0, 137, 0, 79, 0, - 80, 0, 88, 0, 101, 0, 81, 0, 50, 82, + 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, 131, 87, 0, 123, - 0, 120, 123, 0, 50, 89, 93, 0, 90, 0, - 91, 0, 92, 0, 119, 0, 53, 119, 0, 131, - 119, 0, 94, 0, 95, 0, 96, 0, 47, 97, - 48, 0, 54, 134, 55, 0, 51, 76, 52, 0, - 138, 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, 109, 0, 110, 0, 47, - 111, 48, 0, 54, 112, 55, 0, 51, 113, 52, - 0, 114, 0, 111, 49, 114, 0, 115, 0, 112, - 49, 115, 0, 116, 0, 113, 49, 116, 0, 117, - 0, 118, 0, 76, 0, 138, 0, 4, 0, 98, - 0, 134, 0, 124, 0, 120, 124, 0, 121, 0, - 120, 121, 0, 122, 53, 0, 124, 0, 124, 0, - 4, 5, 0, 4, 0, 125, 0, 126, 0, 127, - 0, 50, 128, 0, 4, 129, 0, 47, 77, 48, - 0, 4, 0, 130, 0, 129, 130, 0, 50, 128, - 0, 132, 0, 133, 0, 4, 57, 0, 132, 57, - 0, 135, 0, 4, 0, 81, 0, 102, 0, 58, - 136, 58, 0, 59, 136, 59, 0, 54, 135, 55, - 0, 37, 135, 0, 36, 135, 0, 43, 135, 0, - 44, 135, 0, 27, 135, 0, 28, 135, 0, 29, - 135, 0, 30, 135, 0, 135, 37, 135, 0, 135, - 36, 135, 0, 135, 38, 135, 0, 135, 39, 135, - 0, 135, 41, 135, 0, 135, 40, 135, 0, 135, - 19, 135, 0, 135, 20, 135, 0, 135, 35, 135, - 0, 135, 34, 135, 0, 135, 14, 135, 0, 135, - 11, 135, 0, 135, 12, 135, 0, 135, 13, 135, - 0, 135, 32, 135, 0, 135, 33, 135, 0, 135, - 15, 135, 0, 135, 16, 135, 0, 135, 17, 135, - 0, 135, 18, 135, 0, 135, 21, 135, 0, 135, - 22, 135, 0, 135, 23, 135, 0, 135, 24, 135, - 0, 135, 25, 135, 0, 135, 26, 135, 0, 135, - 31, 135, 0, 76, 0, 4, 0, 0, 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, + 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 }; #endif @@ -221,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, 416, 417, 418, - 420, 422, 424, 426, 428, 430, 434, 438, 442, 444, - 445, 447, 456, 456, 458, 458, 459, 460, 468, 473, - 475, 477, 478, 479, 481, 485, 494, 500, 505, 505, - 506, 511, 513, 515, 527, 539, 544, 546, 547, 548, - 549, 550, 552, 553, 554, 555, 556, 557, 558, 559, - 561, 562, 563, 564, 565, 566, 567, 568, 569, 570, - 571, 572, 573, 574, 575, 576, 577, 578, 579, 580, - 581, 582, 583, 584, 585, 586, 587, 590, 599, 604, - 605 + 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, 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 }; #endif @@ -253,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", -"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 +"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 @@ -272,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, 108, 109, 110, 111, - 111, 112, 112, 113, 113, 114, 115, 116, 117, 117, - 117, 118, 119, 119, 120, 120, 121, 122, 123, 123, - 124, 124, 124, 124, 125, 126, 127, 128, 129, 129, - 130, 131, 131, 132, 133, 134, 135, 135, 135, 135, - 135, 135, 135, 135, 135, 135, 135, 135, 135, 135, - 135, 135, 135, 135, 135, 135, 135, 135, 135, 135, - 135, 135, 135, 135, 135, 135, 135, 135, 135, 135, - 135, 135, 135, 135, 135, 135, 135, 136, 137, 138, - 139 + 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, 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 }; static const short yyr2[] = { 0, @@ -292,206 +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, 3, 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, + 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, 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, 3, 3, 3, 1, 1, 0, - 0 + 3, 3, 3, 1, 1, 1, 0, 0 }; -static const short yydefact[] = { 161, - 159, 0, 0, 68, 2, 1, 3, 6, 7, 5, - 28, 29, 32, 33, 36, 34, 35, 67, 31, 27, - 0, 101, 0, 0, 0, 0, 37, 39, 0, 41, - 42, 43, 0, 48, 49, 50, 51, 0, 95, 0, - 45, 93, 102, 103, 104, 0, 112, 113, 0, 4, - 30, 161, 161, 161, 100, 0, 114, 106, 109, 0, - 108, 105, 0, 0, 99, 0, 101, 52, 0, 93, - 38, 160, 161, 0, 47, 54, 55, 56, 101, 96, - 46, 94, 97, 44, 53, 115, 71, 69, 15, 8, - 10, 11, 0, 9, 23, 0, 22, 21, 161, 19, - 18, 111, 110, 107, 40, 94, 159, 0, 32, 0, - 62, 63, 64, 60, 0, 117, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 161, 161, 118, 119, - 0, 116, 0, 12, 14, 13, 20, 0, 26, 0, - 25, 66, 57, 59, 127, 128, 129, 130, 124, 123, - 125, 126, 0, 158, 0, 0, 58, 0, 0, 0, +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, 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, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 160, 161, 0, 0, 72, 74, - 75, 76, 24, 16, 122, 120, 121, 142, 143, 144, - 141, 147, 148, 149, 150, 137, 138, 151, 152, 153, - 154, 155, 156, 157, 145, 146, 140, 139, 132, 131, - 133, 134, 136, 135, 159, 91, 0, 80, 86, 89, - 88, 0, 84, 0, 82, 87, 92, 70, 73, 161, - 77, 160, 161, 79, 0, 78, 17, 81, 85, 83, - 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[] = { 251, - 5, 6, 7, 8, 90, 91, 92, 93, 9, 240, - 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, 226, 112, 113, - 17, 130, 49, 133, 88, 188, 189, 190, 191, 192, - 227, 234, 232, 228, 235, 233, 229, 236, 37, 64, - 39, 40, 41, 65, 43, 44, 45, 62, 58, 59, - 66, 47, 48, 237, 132, 155, 19, 230, 20 +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, 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[] = { 9, --32768, 16, 43,-32768, -35,-32768,-32768,-32768,-32768,-32768, - 24,-32768,-32768,-32768,-32768,-32768,-32768,-32768,-32768,-32768, - 64, 32, 24, 80, 3, 79,-32768,-32768, 83,-32768, --32768,-32768, -33,-32768,-32768,-32768,-32768, 91,-32768, 54, --32768, 14,-32768,-32768,-32768, 91, 56,-32768, 3,-32768, --32768, 119, 121, 92,-32768, 80,-32768, 90,-32768, 31, --32768,-32768, 78, 91, 96, 91, 90,-32768, 79, 96, --32768, 41, 24, 12,-32768,-32768,-32768,-32768, 19,-32768, --32768, 14,-32768,-32768,-32768,-32768,-32768,-32768,-32768,-32768, - 15,-32768, 97, 104,-32768, 113, 115,-32768, 141,-32768, --32768,-32768,-32768,-32768,-32768, 96, 117, 24, 86, 118, --32768,-32768,-32768,-32768, 116,-32768, 12, 12, 12, 12, - 12, 12, 12, 12, 53, 12, 24, 24,-32768,-32768, - 114, 283, -25,-32768,-32768,-32768,-32768, 166,-32768, 126, --32768, 24,-32768,-32768, 442, 442, 442, 442,-32768,-32768, --32768,-32768, 238,-32768, 129, 167,-32768, 12, 12, 12, - 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, - 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, - 12, 12, 12, 12, 42, 24, 12, 55,-32768,-32768, --32768,-32768,-32768,-32768,-32768,-32768,-32768, 373, 345, 314, - 143, 401, 401, 414, 414, 183, 183, 401, 401, 401, - 401, 414, 414, 442, 401, 401, 246, 427, 77, 77, --32768,-32768,-32768,-32768, 88,-32768, 99,-32768,-32768,-32768, --32768, -16,-32768, -24,-32768,-32768,-32768,-32768,-32768, 24, --32768, 42, 24,-32768, 12,-32768,-32768,-32768,-32768,-32768, - 173, 174,-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, 170,-32768,-32768,-32768, 134,-32768,-32768,-32768, --32768, 175,-32768,-32768,-32768, 5, -20, -9, -71,-32768, - 0,-32768,-32768, -19,-32768,-32768, 39,-32768,-32768,-32768, --32768,-32768,-32768,-32768,-32768,-32768,-32768, 155,-32768,-32768, --32768, 4,-32768,-32768,-32768,-32768, 40,-32768,-32768,-32768, --32768,-32768,-32768, -54, -15, -12,-32768,-32768, 73, 98, - -26,-32768, -30, 6,-32768,-32768,-32768, 176,-32768, 177, - 231,-32768,-32768, 162, 34, 109,-32768, 169, 68 +-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 483 +#define YYLAST 485 static const short yytable[] = { 15, - 109, 51, 60, 18, 10, 63, 22, 81, 42, 2, - 15, 80, 1, 72, 18, 116, -99, 73, 89, 21, - 74, 185, 15, 55, 245, 186, 18, 1, 187, 87, - 246, 70, 243, 81, 1, 244, 55, 80, 117, 118, - 119, 120, 80, 82, 107, 225, 22, 121, 122, 23, - 51, 42, 24, 2, 123, 124, 22, 238, 3, 15, - -161, 125, 108, 18, 4, 126, -98, 4, 56, 127, - 128, 15, 15, 3, 106, 18, 18, 115, 104, 4, - 3, 56, 67, 61, 84, 71, 4, 142, 57, 23, - 3, 3, 24, 25, 79, 26, 4, 4, 68, 23, - 38, 185, 24, 25, 84, 186, 83, 15, 187, 52, - 53, 18, 86, 109, 181, 182, 183, 184, 85, 94, - 98, 101, 89, 69, 95, 23, 15, 15, 24, 105, - 18, 18, 51, -65, -65, -90, -90, 23, 53, 56, - 24, 15, 136, 38, 139, 18, 241, 242, -98, -14, - 145, 146, 147, 148, 149, 150, 151, 152, 135, 153, - 137, 166, 167, 138, -61, 143, 141, 144, 157, 193, - 109, 194, 252, 253, 50, 108, 177, 178, 179, 180, - 181, 182, 183, 184, 15, 15, 196, 248, 18, 18, - 231, 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, 179, 180, - 181, 182, 183, 184, 134, 197, 111, 239, 100, 250, - 249, 102, 108, 46, 103, 131, 156, 0, 0, 15, - 114, 15, 15, 18, 247, 18, 18, 231, 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, 0, - 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, + 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, - 0, 0, 0, 0, 174, 175, 176, 177, 178, 179, - 180, 181, 182, 183, 184, 158, 0, 0, 161, 162, + 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, 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, 161, 0, 0, - 0, 174, 166, 167, 177, 178, 179, 180, 181, 182, - 183, 184, 0, 0, 174, 166, 167, 177, 178, 179, - 180, 181, 182, 183, 184, 161, 0, 0, 0, 0, - 166, 167, 179, 180, 181, 182, 183, 184, 0, 0, - 0, 0, 0, 0, 0, 177, 178, 179, 180, 181, - 182, 183, 184 + 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, + 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, 11, 23, 0, 0, 25, 4, 38, 3, 45, - 11, 38, 4, 47, 11, 4, 3, 51, 4, 4, - 54, 47, 23, 5, 49, 51, 23, 4, 54, 49, - 55, 26, 49, 64, 4, 52, 5, 64, 27, 28, - 29, 30, 69, 38, 4, 4, 4, 36, 37, 47, - 60, 46, 50, 45, 43, 44, 4, 3, 50, 60, - 46, 50, 72, 60, 56, 54, 53, 56, 50, 58, - 59, 72, 73, 50, 69, 72, 73, 73, 48, 56, - 50, 50, 4, 4, 46, 3, 56, 108, 57, 47, - 50, 50, 50, 51, 4, 53, 56, 56, 26, 47, - 3, 47, 50, 51, 66, 51, 53, 108, 54, 46, - 47, 108, 57, 185, 38, 39, 40, 41, 46, 52, - 53, 54, 4, 26, 4, 47, 127, 128, 50, 52, - 127, 128, 142, 48, 49, 48, 49, 47, 47, 50, - 50, 142, 46, 46, 4, 142, 48, 49, 53, 46, - 117, 118, 119, 120, 121, 122, 123, 124, 91, 126, - 48, 19, 20, 49, 48, 48, 99, 52, 55, 4, - 242, 46, 0, 0, 5, 185, 34, 35, 36, 37, - 38, 39, 40, 41, 185, 186, 58, 242, 185, 186, - 186, 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, 36, 37, - 38, 39, 40, 41, 91, 59, 72, 188, 54, 245, - 243, 56, 242, 3, 58, 74, 128, -1, -1, 240, - 72, 242, 243, 240, 240, 242, 243, 243, 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, -1, - 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, + 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, 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, 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, 19, 20, 34, 35, 36, - 37, 38, 39, 40, 41, 14, -1, -1, -1, -1, - 19, 20, 36, 37, 38, 39, 40, 41, -1, -1, - -1, -1, -1, -1, -1, 34, 35, 36, 37, 38, - 39, 40, 41 + 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 @@ -1277,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); @@ -1292,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 */ @@ -1309,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, @@ -1322,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 */ @@ -1349,57 +1367,70 @@ 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" -{yyval=yyvsp[-1]; +case 79: +#line 420 "compile.y" +{ + // allow ^call[ letters here any time ] + *reinterpret_cast(&yyval)=PC.explicit_result; PC.explicit_result=false; +; break;} -case 78: -#line 416 "compile.y" +case 80: +#line 423 "compile.y" +{ + PC.explicit_result=*reinterpret_cast(&yyvsp[-1]); +; + break;} +case 81: +#line 425 "compile.y" +{yyval=yyvsp[-2]; + break;} +case 82: +#line 426 "compile.y" {yyval=yyvsp[-1]; break;} -case 79: -#line 417 "compile.y" +case 83: +#line 427 "compile.y" {yyval=yyvsp[-1]; break;} -case 81: -#line 420 "compile.y" +case 85: +#line 430 "compile.y" { yyval=yyvsp[-2]; P(*yyval, *yyvsp[0]) ; break;} -case 83: -#line 424 "compile.y" +case 87: +#line 434 "compile.y" { yyval=yyvsp[-2]; P(*yyval, *yyvsp[0]) ; break;} -case 85: -#line 428 "compile.y" +case 89: +#line 438 "compile.y" { yyval=yyvsp[-2]; P(*yyval, *yyvsp[0]) ; break;} -case 86: -#line 430 "compile.y" +case 90: +#line 440 "compile.y" { yyval=yyvsp[0]; O(*yyval, OP_STORE_PARAM); ; break;} -case 87: -#line 434 "compile.y" +case 91: +#line 444 "compile.y" { yyval=N(); OA(*yyval, OP_EXPR_CODE__STORE_PARAM, yyvsp[0]); ; break;} -case 88: -#line 438 "compile.y" +case 92: +#line 448 "compile.y" { yyval=N(); OA(*yyval, OP_CURLY_CODE__STORE_PARAM, yyvsp[0]); ; break;} -case 92: -#line 447 "compile.y" +case 96: +#line 457 "compile.y" { yyval=N(); O(*yyval, OP_PREPARE_TO_EXPRESSION); @@ -1407,16 +1438,16 @@ case 92: O(*yyval, OP_WRITE_EXPR_RESULT); ; break;} -case 94: -#line 456 "compile.y" +case 98: +#line 466 "compile.y" { yyval=yyvsp[-1]; P(*yyval, *yyvsp[0]) ; break;} -case 96: -#line 458 "compile.y" +case 100: +#line 468 "compile.y" { yyval=yyvsp[-1]; P(*yyval, *yyvsp[0]) ; break;} -case 98: -#line 460 "compile.y" +case 102: +#line 470 "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 @@ -1426,23 +1457,23 @@ case 98: O(*yyval, OP_GET_ELEMENT); /* name=pop; context=pop; stack: context.get_element(name) */ ; break;} -case 99: -#line 468 "compile.y" +case 103: +#line 478 "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 105: -#line 481 "compile.y" +case 109: +#line 491 "compile.y" { yyval=yyvsp[0]; O(*yyval, OP_GET_ELEMENT); ; break;} -case 106: -#line 485 "compile.y" +case 110: +#line 495 "compile.y" { ArrayOperation* code; { @@ -1453,36 +1484,49 @@ case 106: OA(*yyval, OP_STRING_POOL, code); ; break;} -case 107: -#line 494 "compile.y" +case 111: +#line 504 "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" +{ + PC.explicit_result=*reinterpret_cast(&yyvsp[-1]); +; + break;} +case 113: +#line 509 "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 108: -#line 500 "compile.y" +case 114: +#line 515 "compile.y" { yyval=N(); O(*yyval, OP_WITH_READ); P(*yyval, *yyvsp[0]); ; break;} -case 110: -#line 505 "compile.y" +case 116: +#line 520 "compile.y" { yyval=yyvsp[-1]; P(*yyval, *yyvsp[0]) ; break;} -case 111: -#line 506 "compile.y" +case 117: +#line 521 "compile.y" { yyval=yyvsp[0]; O(*yyval, OP_GET_ELEMENT__WRITE); ; break;} -case 114: -#line 515 "compile.y" +case 120: +#line 530 "compile.y" { yyval=yyvsp[-1]; // stack: class name string if(*LA2S(*yyval) == BASE_NAME) { // pseudo BASE class @@ -1496,8 +1540,8 @@ case 114: O(*yyval, OP_GET_CLASS); ; break;} -case 115: -#line 527 "compile.y" +case 121: +#line 542 "compile.y" { yyval=yyvsp[-1]; if(!PC.in_call_value) { @@ -1507,168 +1551,167 @@ case 115: O(*yyval, OP_PREPARE_TO_CONSTRUCT_OBJECT); ; break;} -case 116: -#line 539 "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 120: -#line 548 "compile.y" +case 126: +#line 559 "compile.y" { yyval = yyvsp[-1]; ; break;} -case 121: -#line 549 "compile.y" +case 127: +#line 560 "compile.y" { yyval = yyvsp[-1]; ; break;} -case 122: -#line 550 "compile.y" +case 128: +#line 561 "compile.y" { yyval = yyvsp[-1]; ; break;} -case 123: -#line 552 "compile.y" +case 129: +#line 563 "compile.y" { yyval=yyvsp[0]; O(*yyval, OP_NEG) ; break;} -case 124: -#line 553 "compile.y" +case 130: +#line 564 "compile.y" { yyval=yyvsp[0] ; break;} -case 125: -#line 554 "compile.y" +case 131: +#line 565 "compile.y" { yyval=yyvsp[0]; O(*yyval, OP_INV) ; break;} -case 126: -#line 555 "compile.y" +case 132: +#line 566 "compile.y" { yyval=yyvsp[0]; O(*yyval, OP_NOT) ; break;} -case 127: -#line 556 "compile.y" +case 133: +#line 567 "compile.y" { yyval=yyvsp[0]; O(*yyval, OP_DEF) ; break;} -case 128: -#line 557 "compile.y" +case 134: +#line 568 "compile.y" { yyval=yyvsp[0]; O(*yyval, OP_IN) ; break;} -case 129: -#line 558 "compile.y" +case 135: +#line 569 "compile.y" { yyval=yyvsp[0]; O(*yyval, OP_FEXISTS) ; break;} -case 130: -#line 559 "compile.y" +case 136: +#line 570 "compile.y" { yyval=yyvsp[0]; O(*yyval, OP_DEXISTS) ; break;} -case 131: -#line 561 "compile.y" +case 137: +#line 572 "compile.y" { yyval=yyvsp[-2]; P(*yyval, *yyvsp[0]); O(*yyval, OP_SUB) ; break;} -case 132: -#line 562 "compile.y" +case 138: +#line 573 "compile.y" { yyval=yyvsp[-2]; P(*yyval, *yyvsp[0]); O(*yyval, OP_ADD) ; break;} -case 133: -#line 563 "compile.y" +case 139: +#line 574 "compile.y" { yyval=yyvsp[-2]; P(*yyval, *yyvsp[0]); O(*yyval, OP_MUL) ; break;} -case 134: -#line 564 "compile.y" +case 140: +#line 575 "compile.y" { yyval=yyvsp[-2]; P(*yyval, *yyvsp[0]); O(*yyval, OP_DIV) ; break;} -case 135: -#line 565 "compile.y" +case 141: +#line 576 "compile.y" { yyval=yyvsp[-2]; P(*yyval, *yyvsp[0]); O(*yyval, OP_MOD) ; break;} -case 136: -#line 566 "compile.y" +case 142: +#line 577 "compile.y" { yyval=yyvsp[-2]; P(*yyval, *yyvsp[0]); O(*yyval, OP_INTDIV) ; break;} -case 137: -#line 567 "compile.y" +case 143: +#line 578 "compile.y" { yyval=yyvsp[-2]; P(*yyval, *yyvsp[0]); O(*yyval, OP_BIN_SL) ; break;} -case 138: -#line 568 "compile.y" +case 144: +#line 579 "compile.y" { yyval=yyvsp[-2]; P(*yyval, *yyvsp[0]); O(*yyval, OP_BIN_SR) ; break;} -case 139: -#line 569 "compile.y" +case 145: +#line 580 "compile.y" { yyval=yyvsp[-2]; P(*yyval, *yyvsp[0]); O(*yyval, OP_BIN_AND) ; break;} -case 140: -#line 570 "compile.y" +case 146: +#line 581 "compile.y" { yyval=yyvsp[-2]; P(*yyval, *yyvsp[0]); O(*yyval, OP_BIN_OR) ; break;} -case 141: -#line 571 "compile.y" +case 147: +#line 582 "compile.y" { yyval=yyvsp[-2]; P(*yyval, *yyvsp[0]); O(*yyval, OP_BIN_XOR) ; break;} -case 142: -#line 572 "compile.y" +case 148: +#line 583 "compile.y" { yyval=yyvsp[-2]; OA(*yyval, OP_NESTED_CODE, yyvsp[0]); O(*yyval, OP_LOG_AND) ; break;} -case 143: -#line 573 "compile.y" +case 149: +#line 584 "compile.y" { yyval=yyvsp[-2]; OA(*yyval, OP_NESTED_CODE, yyvsp[0]); O(*yyval, OP_LOG_OR) ; break;} -case 144: -#line 574 "compile.y" +case 150: +#line 585 "compile.y" { yyval=yyvsp[-2]; P(*yyval, *yyvsp[0]); O(*yyval, OP_LOG_XOR) ; break;} -case 145: -#line 575 "compile.y" +case 151: +#line 586 "compile.y" { yyval=yyvsp[-2]; P(*yyval, *yyvsp[0]); O(*yyval, OP_NUM_LT) ; break;} -case 146: -#line 576 "compile.y" +case 152: +#line 587 "compile.y" { yyval=yyvsp[-2]; P(*yyval, *yyvsp[0]); O(*yyval, OP_NUM_GT) ; break;} -case 147: -#line 577 "compile.y" +case 153: +#line 588 "compile.y" { yyval=yyvsp[-2]; P(*yyval, *yyvsp[0]); O(*yyval, OP_NUM_LE) ; break;} -case 148: -#line 578 "compile.y" +case 154: +#line 589 "compile.y" { yyval=yyvsp[-2]; P(*yyval, *yyvsp[0]); O(*yyval, OP_NUM_GE) ; break;} -case 149: -#line 579 "compile.y" +case 155: +#line 590 "compile.y" { yyval=yyvsp[-2]; P(*yyval, *yyvsp[0]); O(*yyval, OP_NUM_EQ) ; break;} -case 150: -#line 580 "compile.y" +case 156: +#line 591 "compile.y" { yyval=yyvsp[-2]; P(*yyval, *yyvsp[0]); O(*yyval, OP_NUM_NE) ; break;} -case 151: -#line 581 "compile.y" +case 157: +#line 592 "compile.y" { yyval=yyvsp[-2]; P(*yyval, *yyvsp[0]); O(*yyval, OP_STR_LT) ; break;} -case 152: -#line 582 "compile.y" +case 158: +#line 593 "compile.y" { yyval=yyvsp[-2]; P(*yyval, *yyvsp[0]); O(*yyval, OP_STR_GT) ; break;} -case 153: -#line 583 "compile.y" +case 159: +#line 594 "compile.y" { yyval=yyvsp[-2]; P(*yyval, *yyvsp[0]); O(*yyval, OP_STR_LE) ; break;} -case 154: -#line 584 "compile.y" +case 160: +#line 595 "compile.y" { yyval=yyvsp[-2]; P(*yyval, *yyvsp[0]); O(*yyval, OP_STR_GE) ; break;} -case 155: -#line 585 "compile.y" +case 161: +#line 596 "compile.y" { yyval=yyvsp[-2]; P(*yyval, *yyvsp[0]); O(*yyval, OP_STR_EQ) ; break;} -case 156: -#line 586 "compile.y" +case 162: +#line 597 "compile.y" { yyval=yyvsp[-2]; P(*yyval, *yyvsp[0]); O(*yyval, OP_STR_NE) ; break;} -case 157: -#line 587 "compile.y" +case 163: +#line 598 "compile.y" { yyval=yyvsp[-2]; P(*yyval, *yyvsp[0]); O(*yyval, OP_IS) ; break;} -case 158: -#line 590 "compile.y" +case 164: +#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 */ @@ -1676,19 +1719,19 @@ case 158: /* context=pop; stack: context.get_string() */ ; break;} -case 159: -#line 599 "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 160: -#line 604 "compile.y" +case 167: +#line 620 "compile.y" { yyval=VL(new VVoid(), 0, 0, 0) ; break;} -case 161: -#line 605 "compile.y" +case 168: +#line 621 "compile.y" { yyval=N() ; break;} } @@ -1913,7 +1956,7 @@ yyerrhandle: } return 1; } -#line 607 "compile.y" +#line 623 "compile.y" #endif