--- parser3/src/main/compile.tab.C 2023/09/26 20:49:09 1.183 +++ parser3/src/main/compile.tab.C 2026/04/23 18:50:33 1.191 @@ -71,13 +71,13 @@ /** @file Parser: compiler(lexical parser and grammar). - Copyright (c) 2001-2023 Art. Lebedev Studio (http://www.artlebedev.com) + Copyright (c) 2001-2024 Art. Lebedev Studio (http://www.artlebedev.com) Authors: Konstantin Morshnev , Alexandr Petrosian */ -volatile const char * IDENT_COMPILE_Y = "$Id: compile.tab.C,v 1.183 2023/09/26 20:49:09 moko Exp $"; +volatile const char * IDENT_COMPILE_Y = "$Id: compile.tab.C,v 1.191 2026/04/23 18:50:33 moko Exp $"; /** @todo parser4: @@ -131,7 +131,7 @@ static const VString vempty; #define POOL (*PC.pool) #ifndef DOXYGEN -#define CLASS_ADD if(PC.class_add()){ \ +#define CLASS_ADD if(!PC.class_add()){ \ PC.error=pa_strcat(PC.cclass->type(), " - class is already defined"); \ YYERROR; \ } @@ -460,18 +460,18 @@ union yyalloc #endif /* !YYCOPY_NEEDED */ /* YYFINAL -- State number of the termination state. */ -#define YYFINAL 51 +#define YYFINAL 53 /* YYLAST -- Last index in YYTABLE. */ -#define YYLAST 473 +#define YYLAST 560 /* YYNTOKENS -- Number of terminals. */ #define YYNTOKENS 61 /* YYNNTS -- Number of nonterminals. */ -#define YYNNTS 89 +#define YYNNTS 91 /* YYNRULES -- Number of rules. */ -#define YYNRULES 172 +#define YYNRULES 176 /* YYNSTATES -- Number of states. */ -#define YYNSTATES 263 +#define YYNSTATES 270 #define YYUNDEFTOK 2 #define YYMAXUTOK 288 @@ -525,19 +525,19 @@ static const yytype_uint16 yyrline[] = 282, 283, 284, 284, 285, 285, 287, 287, 291, 291, 293, 293, 294, 294, 295, 295, 295, 299, 330, 331, 331, 332, 334, 335, 336, 385, 386, 386, 390, 403, - 404, 405, 406, 428, 433, 436, 437, 438, 440, 443, - 440, 451, 458, 465, 466, 467, 469, 475, 476, 476, - 480, 491, 494, 491, 543, 559, 559, 561, 562, 563, - 565, 568, 565, 571, 572, 574, 575, 578, 579, 582, - 583, 585, 588, 601, 606, 607, 608, 613, 613, 615, - 615, 616, 617, 629, 638, 641, 642, 643, 644, 646, - 650, 659, 662, 659, 675, 680, 680, 681, 687, 688, - 690, 709, 719, 721, 722, 723, 724, 725, 726, 727, - 728, 730, 731, 732, 733, 734, 735, 736, 737, 739, - 740, 741, 742, 743, 744, 745, 746, 747, 748, 749, - 750, 751, 752, 753, 754, 755, 756, 757, 758, 759, - 760, 761, 762, 763, 764, 765, 768, 773, 794, 799, - 800, 801, 803 + 404, 405, 406, 428, 433, 436, 437, 438, 440, 444, + 440, 459, 460, 462, 469, 476, 477, 478, 480, 486, + 487, 487, 491, 502, 505, 502, 554, 570, 570, 572, + 573, 574, 576, 579, 576, 582, 583, 585, 586, 589, + 590, 593, 594, 596, 599, 612, 617, 618, 619, 624, + 624, 626, 626, 627, 628, 640, 649, 652, 653, 654, + 655, 656, 658, 662, 671, 674, 671, 684, 688, 693, + 693, 694, 700, 701, 703, 722, 732, 734, 735, 736, + 737, 738, 739, 740, 741, 743, 744, 745, 746, 747, + 748, 749, 750, 752, 753, 754, 755, 756, 757, 758, + 759, 760, 761, 762, 763, 764, 765, 766, 767, 768, + 769, 770, 771, 772, 773, 774, 775, 776, 777, 778, + 781, 786, 807, 812, 813, 814, 816 }; #endif @@ -565,21 +565,22 @@ static const char *const yytname[] = "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", "@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", + "any_constructor_code_values", "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", "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", "empty_value", "true_value", "false_value", "empty", YY_NULLPTR + "name_round_expr_value", "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", "empty_value", + "true_value", "false_value", "empty", YY_NULLPTR }; #endif @@ -598,12 +599,12 @@ static const yytype_uint16 yytoknum[] = }; # endif -#define YYPACT_NINF -107 +#define YYPACT_NINF -220 #define yypact_value_is_default(Yystate) \ - (!!((Yystate) == (-107))) + (!!((Yystate) == (-220))) -#define YYTABLE_NINF -173 +#define YYTABLE_NINF -177 #define yytable_value_is_error(Yytable_value) \ 0 @@ -612,33 +613,33 @@ static const yytype_uint16 yytoknum[] = STATE-NUM. */ static const yytype_int16 yypact[] = { - 12, -107, 9, 41, -107, 23, -21, -107, -107, -107, - -107, -107, 27, -107, -107, -107, -107, -107, -107, -107, - -107, -107, 34, 10, -107, 37, 106, 108, -107, -107, - 24, -107, -107, -107, -31, -107, -107, -107, -107, 110, - -107, -6, -107, 16, -107, -107, -107, 110, 42, -107, - 106, -107, -107, -107, 63, 103, 65, -107, 37, -107, - 77, -107, 27, -107, -107, 88, 110, 76, 110, 77, - -107, 108, 76, -107, -107, 27, 28, -107, -107, -107, - -107, 29, -107, -107, 16, -107, -107, -107, -107, -107, - -107, -107, -107, 4, -107, 96, 100, -107, 104, 102, - -107, 141, -107, -107, -107, -107, 27, -107, 76, 39, - 109, -107, 28, 28, 28, 28, -107, -107, 28, 28, - 28, 28, 67, 28, 27, 27, -107, -107, 120, 324, - -107, -107, -107, -26, -107, -107, -107, -107, 151, -107, - 130, -107, 129, 132, 27, 82, -107, -107, -107, -107, - -107, -107, 425, 425, 425, 425, -107, -107, -107, -107, - 277, -107, 123, 119, -107, 28, 28, 28, 28, 28, - 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, - 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, - 28, 28, -107, 27, 28, 46, -107, -107, -107, -107, - -107, -107, -107, 27, 148, -107, -107, -107, 387, 150, - 357, 98, 417, 417, 290, 290, 192, 192, 417, 417, - 417, 417, 290, 290, 425, 417, 417, 183, 431, 81, - 81, -107, -107, -107, -107, 40, -107, -14, -107, -10, - -107, -107, -107, -107, 27, -107, 99, -107, 149, -107, - -107, -107, 27, -107, 28, -107, -107, 40, 155, -107, - -107, -107, -107 + 9, -220, 29, 50, -220, 37, 16, -220, -220, -220, + -220, -220, 10, -220, -220, -220, -220, -220, -220, -220, + -220, -220, -6, 14, -220, 45, 91, 92, 248, -220, + -220, 47, -220, -220, -220, -24, -220, -220, -220, -220, + 93, -220, -3, -220, 5, -220, -220, -220, -220, 93, + -1, -220, 91, -220, -220, -220, 80, 82, 43, -220, + 45, -220, 66, -220, 10, -220, -220, 58, 93, 68, + 93, 66, -220, 92, 68, -220, 248, 248, 248, 248, + -220, -220, 248, 248, 248, 248, 77, 248, 10, 10, + -220, -220, 70, 346, -220, -220, -220, -220, -220, 10, + 248, -220, -220, -220, -220, 12, -220, -220, 5, -220, + -220, -220, -220, -220, -220, -220, -220, 11, -220, 84, + 90, -220, 75, 83, -220, 123, -220, -220, -220, -220, + 10, -220, 68, 480, 480, 480, 480, -220, -220, -220, + -220, 299, -220, 101, 85, -220, 248, 248, 248, 248, + 248, 248, 248, 248, 248, 248, 248, 248, 248, 248, + 248, 248, 248, 248, 248, 248, 248, 248, 248, 248, + 248, 248, 248, 22, 108, 106, -16, -220, -220, -220, + -220, 159, -220, 117, -220, 116, -220, -220, -220, 442, + 412, 379, 505, 472, 472, 312, 312, 112, 112, 472, + 472, 472, 472, 312, 312, 480, 472, 472, 512, 518, + 67, 67, -220, -220, -220, -220, 86, 10, 107, 118, + -220, -220, -220, -220, -220, -220, -220, -220, 10, 248, + 35, -220, -220, -220, -220, -220, -220, -220, 10, 22, + 120, 23, -220, 32, -220, 60, -220, -220, -220, -220, + 10, -220, -220, 109, -220, 121, -220, -220, -220, 10, + -220, 248, -220, -220, 23, 125, -220, -220, -220, -220 }; /* YYDEFACT[STATE-NUM] -- Default reduction number in state STATE-NUM. @@ -646,61 +647,63 @@ static const yytype_int16 yypact[] = means the default is an error. */ static const yytype_uint8 yydefact[] = { - 172, 168, 0, 0, 71, 0, 3, 2, 4, 7, - 8, 6, 29, 30, 33, 34, 37, 35, 36, 70, - 32, 28, 0, 105, 111, 0, 0, 0, 38, 40, - 0, 42, 43, 44, 0, 49, 50, 51, 52, 0, - 99, 0, 46, 97, 106, 107, 108, 0, 118, 119, - 0, 1, 5, 31, 172, 172, 172, 104, 0, 120, - 110, 115, 0, 114, 109, 0, 0, 103, 0, 105, - 53, 0, 97, 39, 58, 172, 0, 48, 55, 56, - 57, 105, 100, 47, 98, 101, 45, 54, 121, 74, - 72, 16, 9, 11, 12, 0, 10, 24, 0, 23, - 22, 172, 20, 19, 117, 116, 112, 41, 98, 169, - 0, 166, 0, 0, 0, 0, 170, 171, 0, 0, - 0, 0, 0, 0, 172, 172, 126, 127, 0, 122, - 123, 124, 125, 0, 13, 15, 14, 21, 0, 27, - 0, 26, 0, 168, 0, 33, 59, 65, 66, 67, - 63, 62, 135, 136, 137, 138, 132, 131, 133, 134, - 0, 167, 0, 0, 61, 0, 0, 0, 0, 0, + 176, 172, 0, 0, 73, 0, 3, 2, 4, 7, + 8, 6, 29, 30, 33, 34, 37, 35, 36, 72, + 32, 28, 0, 107, 114, 0, 0, 0, 0, 38, + 40, 0, 42, 43, 44, 0, 49, 50, 51, 52, + 0, 101, 0, 46, 99, 108, 109, 110, 111, 0, + 122, 123, 0, 1, 5, 31, 176, 176, 176, 106, + 0, 124, 113, 119, 0, 118, 112, 0, 0, 105, + 0, 107, 53, 0, 99, 170, 0, 0, 0, 0, + 174, 175, 0, 0, 0, 0, 0, 0, 176, 176, + 130, 131, 0, 126, 127, 128, 129, 39, 58, 176, + 0, 48, 55, 56, 57, 107, 102, 47, 100, 103, + 45, 54, 125, 76, 74, 16, 9, 11, 12, 0, + 10, 24, 0, 23, 22, 176, 20, 19, 121, 120, + 115, 41, 100, 139, 140, 141, 142, 136, 135, 137, + 138, 0, 171, 0, 0, 117, 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, 80, 172, 0, 0, 75, 77, 78, 79, - 25, 17, 113, 69, 0, 130, 128, 129, 150, 151, - 152, 149, 155, 156, 157, 158, 145, 146, 159, 160, - 161, 162, 163, 164, 165, 153, 154, 148, 147, 140, - 139, 141, 142, 144, 143, 169, 93, 0, 89, 0, - 87, 92, 73, 76, 172, 60, 168, 96, 81, 85, - 91, 94, 172, 84, 0, 83, 18, 169, 0, 90, - 88, 86, 82 + 0, 0, 0, 173, 0, 0, 0, 13, 15, 14, + 21, 0, 27, 0, 26, 0, 134, 132, 133, 154, + 155, 156, 153, 159, 160, 161, 162, 149, 150, 163, + 164, 165, 166, 167, 168, 169, 157, 158, 152, 151, + 144, 143, 145, 146, 148, 147, 172, 0, 33, 59, + 61, 67, 68, 69, 65, 64, 63, 82, 176, 0, + 0, 77, 79, 80, 81, 25, 17, 116, 71, 173, + 0, 173, 95, 0, 91, 0, 89, 94, 75, 78, + 176, 62, 60, 172, 98, 83, 87, 93, 96, 176, + 86, 0, 85, 18, 173, 0, 92, 90, 88, 84 }; /* YYPGOTO[NTERM-NUM]. */ static const yytype_int16 yypgoto[] = { - -107, -107, -107, -107, 194, -107, -107, -107, 105, -107, - -107, -107, -107, 156, -107, -107, -107, 1, -58, -7, - -106, -107, 0, -107, -107, -15, -107, -107, -40, -107, - -107, -107, -107, -107, -107, -107, -107, -107, -107, -107, - -107, 97, -107, -107, -107, 2, -107, -107, -107, -107, - 22, -107, -107, -107, -107, -107, -107, -107, -107, -46, - -28, -25, -107, -9, 6, -19, -107, -29, 3, -107, - -107, -107, -107, -107, 178, -107, 179, 235, -107, -107, - 164, 95, -107, 116, -107, 133, -107, -107, 49 + -220, -220, -220, -220, 160, -220, -220, -220, 53, -220, + -220, -220, -220, 114, -220, -220, -220, 1, -62, 8, + -170, -220, 0, -220, -220, -5, -220, -220, -26, -220, + -220, -220, -220, -220, -220, -220, -220, -220, -220, -220, + -220, -72, -219, -220, -220, -220, 4, -220, -220, -220, + -220, -55, -220, -220, -220, -220, -220, -220, -220, -220, + -88, -83, -80, -220, 7, 26, -33, -220, -22, 3, + -220, -220, -220, -220, -220, -220, 149, -220, 148, 177, + -220, -220, -23, 36, -220, 122, -220, -216, -220, -220, + -47 }; /* YYDEFGOTO[NTERM-NUM]. */ static const yytype_int16 yydefgoto[] = { - -1, 5, 6, 7, 8, 9, 92, 93, 94, 95, - 10, 244, 101, 56, 98, 99, 140, 161, 12, 13, - 14, 15, 126, 28, 29, 30, 31, 32, 33, 17, - 34, 35, 36, 37, 77, 78, 109, 204, 79, 80, - 146, 247, 148, 149, 18, 127, 50, 133, 90, 195, - 196, 197, 235, 258, 198, 199, 248, 239, 237, 249, - 240, 238, 250, 38, 66, 40, 41, 42, 67, 44, - 45, 46, 62, 142, 64, 60, 61, 68, 48, 49, - 241, 129, 130, 162, 20, 251, 131, 132, 21 + -1, 5, 6, 7, 8, 9, 116, 117, 118, 119, + 10, 250, 125, 58, 122, 123, 183, 142, 12, 13, + 14, 15, 90, 29, 30, 31, 32, 33, 34, 17, + 35, 36, 37, 38, 101, 102, 173, 240, 219, 103, + 104, 220, 221, 222, 223, 18, 91, 52, 176, 114, + 230, 231, 232, 241, 265, 233, 234, 255, 245, 243, + 256, 246, 244, 257, 39, 68, 41, 42, 43, 69, + 45, 46, 47, 64, 185, 48, 66, 62, 63, 70, + 50, 51, 247, 93, 94, 143, 20, 224, 95, 96, + 21 }; /* YYTABLE[YYPACT[STATE-NUM]] -- What to do in state STATE-NUM. If @@ -708,106 +711,124 @@ static const yytype_int16 yydefgoto[] = number is the opposite. If YYTABLE_NINF, syntax error. */ static const yytype_int16 yytable[] = { - 16, 11, 19, 145, 106, 53, 43, 86, 91, 39, - 83, 65, 16, 22, 19, 57, 1, 74, 70, -103, - 82, 75, 192, 51, 76, 2, 193, 73, 86, 194, - 72, 1, 111, 71, 57, 89, 252, 83, 87, 253, - 254, 63, 84, 143, 246, 23, 255, 82, 85, 242, - 43, -172, 82, 39, 112, 113, 114, 115, 2, 116, - 117, 58, 16, 3, 19, 118, 119, 91, 59, 4, - -102, 23, 120, 121, 108, 16, 110, 19, 3, 122, - 58, 54, 55, 123, 4, 4, 203, 124, 125, 24, - 3, 3, 25, 26, 192, 27, 4, 4, 193, 53, - 88, 194, 144, 96, 100, 103, 16, 97, 19, 16, - 23, 19, 69, 55, 81, 24, 173, 174, 25, 26, - 188, 189, 190, 191, 16, 16, 19, 19, 58, 145, - -102, -68, -68, 184, 185, 186, 187, 188, 189, 190, - 191, 107, 135, 136, 16, 139, 19, -15, -95, -95, - 141, 145, 138, 137, 24, 200, 24, 25, 24, 25, - 165, 25, 151, 168, 169, 170, 171, 172, 173, 174, - 175, 176, 177, 178, 179, 180, 164, 201, 202, 207, - 181, -64, 206, 182, 183, 184, 185, 186, 187, 188, - 189, 190, 191, 16, 236, 19, 53, 245, 134, 257, - 52, 173, 174, 16, 262, 19, 147, 152, 153, 154, - 155, 261, 102, 156, 157, 158, 159, 243, 160, 185, - 186, 187, 188, 189, 190, 191, 260, 259, 144, 186, - 187, 188, 189, 190, 191, 16, 104, 19, 47, 105, - 128, 163, 150, 0, 16, 256, 19, 0, 0, 0, - 144, 0, 16, 236, 19, 0, 0, 16, 0, 19, - 208, 209, 210, 211, 212, 213, 214, 215, 216, 217, - 218, 219, 220, 221, 222, 223, 224, 225, 226, 227, - 228, 229, 230, 231, 232, 233, 234, 165, 166, 167, - 168, 169, 170, 171, 172, 173, 174, 175, 176, 177, - 178, 179, 180, 168, 0, 0, 0, 181, 173, 174, - 182, 183, 184, 185, 186, 187, 188, 189, 190, 191, - 181, 0, 0, 0, 0, 184, 185, 186, 187, 188, - 189, 190, 191, 205, 165, 166, 167, 168, 169, 170, - 171, 172, 173, 174, 175, 176, 177, 178, 179, 180, - 0, 0, 0, 0, 181, 0, 0, 182, 183, 184, - 185, 186, 187, 188, 189, 190, 191, 165, 166, 0, - 168, 169, 170, 171, 172, 173, 174, 175, 176, 177, - 178, 179, 180, 0, 0, 0, 0, 181, 0, 0, - 182, 183, 184, 185, 186, 187, 188, 189, 190, 191, - 168, 169, 170, 171, 172, 173, 174, 175, 176, 177, - 178, 179, 180, 0, 0, 0, 0, 181, 0, 0, - 182, 183, 184, 185, 186, 187, 188, 189, 190, 191, - 168, 0, 0, 171, 172, 173, 174, 0, 168, 0, - 0, 179, 180, 173, 174, 0, 0, 181, 0, 173, - 174, 0, 184, 185, 186, 187, 188, 189, 190, 191, - 184, 185, 186, 187, 188, 189, 190, 191, 186, 187, - 188, 189, 190, 191 + 16, 11, 130, 218, 19, 92, 44, 106, -105, 120, + 124, 127, 16, 1, 1, 115, 19, 59, 107, 59, + 55, 67, 254, 110, 98, 258, 216, 253, 99, 40, + 74, 100, 227, 22, 72, 106, 228, 53, 248, 229, + 106, 56, 57, 108, 110, 254, 107, 113, 258, 65, + 97, 109, 44, 73, 23, 2, 111, 112, -176, -104, + 3, 3, 2, 60, 16, 60, 4, 4, 19, 218, + 178, 218, 61, 3, 3, 40, 132, 175, 184, 4, + 4, 23, 259, 227, 115, 260, 121, 228, 16, 16, + 229, 57, 19, 19, 218, 23, 71, 105, 24, 16, + 174, 25, 26, 19, 27, 28, 169, 170, 171, 172, + 261, 131, 133, 134, 135, 136, 262, 60, 137, 138, + 139, 140, -104, 141, 180, 24, 145, 182, 25, 26, + 16, 179, 28, 181, 19, -66, -66, -15, 55, 24, + 24, 24, 25, 25, 25, 188, 28, 28, 28, 167, + 168, 169, 170, 171, 172, 238, -70, -70, -97, -97, + 187, 225, 226, 235, 236, 237, 54, 251, 239, 252, + 177, 264, 126, 16, 269, 249, 268, 19, 267, 266, + 49, 217, 189, 190, 191, 192, 193, 194, 195, 196, + 197, 198, 199, 200, 201, 202, 203, 204, 205, 206, + 207, 208, 209, 210, 211, 212, 213, 214, 215, 128, + 129, 144, 0, 0, 0, 0, 0, 16, 0, 0, + 0, 19, 0, 0, 0, 0, 0, 0, 16, 242, + 0, 0, 19, 0, 0, 0, 0, 0, 16, 16, + 0, 16, 19, 19, 0, 19, 55, 217, 0, 217, + 16, 263, 75, 0, 19, 0, 0, 0, 0, 16, + 242, 0, 0, 19, 16, 0, 0, 0, 19, 0, + 0, 0, 217, 0, 76, 77, 78, 79, 0, 80, + 81, 0, 0, 0, 0, 82, 83, 0, 0, 0, + 0, 0, 84, 85, 0, 0, 0, 0, 0, 86, + 0, 0, 0, 87, 0, 4, 0, 88, 89, 146, + 147, 148, 149, 150, 151, 152, 153, 154, 155, 156, + 157, 158, 159, 160, 161, 149, 0, 0, 0, 162, + 154, 155, 163, 164, 165, 166, 167, 168, 169, 170, + 171, 172, 162, 0, 0, 0, 0, 165, 166, 167, + 168, 169, 170, 171, 172, 186, 146, 147, 148, 149, + 150, 151, 152, 153, 154, 155, 156, 157, 158, 159, + 160, 161, 0, 0, 0, 0, 162, 0, 0, 163, + 164, 165, 166, 167, 168, 169, 170, 171, 172, 146, + 147, 0, 149, 150, 151, 152, 153, 154, 155, 156, + 157, 158, 159, 160, 161, 0, 0, 0, 0, 162, + 0, 0, 163, 164, 165, 166, 167, 168, 169, 170, + 171, 172, 146, 0, 0, 149, 150, 151, 152, 153, + 154, 155, 156, 157, 158, 159, 160, 161, 0, 0, + 0, 0, 162, 0, 0, 163, 164, 165, 166, 167, + 168, 169, 170, 171, 172, 149, 150, 151, 152, 153, + 154, 155, 156, 157, 158, 159, 160, 161, 0, 0, + 0, 0, 162, 0, 0, 163, 164, 165, 166, 167, + 168, 169, 170, 171, 172, 149, 0, 0, 152, 153, + 154, 155, 0, 149, 0, 0, 160, 161, 154, 155, + 0, 0, 162, 0, 0, 0, 0, 165, 166, 167, + 168, 169, 170, 171, 172, 165, 166, 167, 168, 169, + 170, 171, 172, 154, 155, 0, 0, 0, 0, 0, + 154, 155, 0, 0, 0, 0, 154, 155, 0, 0, + 165, 166, 167, 168, 169, 170, 171, 172, 166, 167, + 168, 169, 170, 171, 172, 167, 168, 169, 170, 171, + 172 }; static const yytype_int16 yycheck[] = { - 0, 0, 0, 109, 62, 12, 3, 47, 4, 3, - 39, 26, 12, 4, 12, 5, 4, 48, 27, 3, - 39, 52, 48, 0, 55, 46, 52, 3, 68, 55, - 27, 4, 4, 27, 5, 50, 50, 66, 47, 53, - 50, 4, 39, 4, 4, 4, 56, 66, 54, 3, - 47, 47, 71, 47, 26, 27, 28, 29, 46, 31, - 32, 51, 62, 51, 62, 37, 38, 4, 58, 57, - 54, 4, 44, 45, 71, 75, 75, 75, 51, 51, - 51, 47, 48, 55, 57, 57, 144, 59, 60, 48, - 51, 51, 51, 52, 48, 54, 57, 57, 52, 106, - 58, 55, 109, 54, 55, 56, 106, 4, 106, 109, - 4, 109, 4, 48, 4, 48, 18, 19, 51, 52, - 39, 40, 41, 42, 124, 125, 124, 125, 51, 235, - 54, 49, 50, 35, 36, 37, 38, 39, 40, 41, - 42, 53, 93, 47, 144, 4, 144, 47, 49, 50, - 101, 257, 50, 49, 48, 4, 48, 51, 48, 51, - 10, 51, 53, 13, 14, 15, 16, 17, 18, 19, - 20, 21, 22, 23, 24, 25, 56, 47, 49, 60, - 30, 49, 59, 33, 34, 35, 36, 37, 38, 39, - 40, 41, 42, 193, 193, 193, 203, 49, 93, 50, - 6, 18, 19, 203, 49, 203, 109, 112, 113, 114, - 115, 257, 56, 118, 119, 120, 121, 195, 123, 36, - 37, 38, 39, 40, 41, 42, 254, 252, 235, 37, - 38, 39, 40, 41, 42, 235, 58, 235, 3, 60, - 76, 125, 109, -1, 244, 244, 244, -1, -1, -1, - 257, -1, 252, 252, 252, -1, -1, 257, -1, 257, - 165, 166, 167, 168, 169, 170, 171, 172, 173, 174, - 175, 176, 177, 178, 179, 180, 181, 182, 183, 184, - 185, 186, 187, 188, 189, 190, 191, 10, 11, 12, - 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, - 23, 24, 25, 13, -1, -1, -1, 30, 18, 19, - 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, - 30, -1, -1, -1, -1, 35, 36, 37, 38, 39, - 40, 41, 42, 56, 10, 11, 12, 13, 14, 15, - 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, - -1, -1, -1, -1, 30, -1, -1, 33, 34, 35, - 36, 37, 38, 39, 40, 41, 42, 10, 11, -1, - 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, - 23, 24, 25, -1, -1, -1, -1, 30, -1, -1, - 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, - 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, - 23, 24, 25, -1, -1, -1, -1, 30, -1, -1, - 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, - 13, -1, -1, 16, 17, 18, 19, -1, 13, -1, - -1, 24, 25, 18, 19, -1, -1, 30, -1, 18, - 19, -1, 35, 36, 37, 38, 39, 40, 41, 42, - 35, 36, 37, 38, 39, 40, 41, 42, 37, 38, - 39, 40, 41, 42 + 0, 0, 64, 173, 0, 28, 3, 40, 3, 56, + 57, 58, 12, 4, 4, 4, 12, 5, 40, 5, + 12, 26, 241, 49, 48, 241, 4, 4, 52, 3, + 27, 55, 48, 4, 27, 68, 52, 0, 3, 55, + 73, 47, 48, 40, 70, 264, 68, 52, 264, 4, + 3, 54, 49, 27, 4, 46, 49, 58, 47, 54, + 51, 51, 46, 51, 64, 51, 57, 57, 64, 239, + 117, 241, 58, 51, 51, 49, 73, 100, 125, 57, + 57, 4, 50, 48, 4, 53, 4, 52, 88, 89, + 55, 48, 88, 89, 264, 4, 4, 4, 48, 99, + 99, 51, 52, 99, 54, 55, 39, 40, 41, 42, + 50, 53, 76, 77, 78, 79, 56, 51, 82, 83, + 84, 85, 54, 87, 49, 48, 56, 4, 51, 52, + 130, 47, 55, 50, 130, 49, 50, 47, 130, 48, + 48, 48, 51, 51, 51, 60, 55, 55, 55, 37, + 38, 39, 40, 41, 42, 217, 49, 50, 49, 50, + 59, 53, 56, 4, 47, 49, 6, 239, 50, 49, + 117, 50, 58, 173, 49, 230, 264, 173, 261, 259, + 3, 173, 146, 147, 148, 149, 150, 151, 152, 153, + 154, 155, 156, 157, 158, 159, 160, 161, 162, 163, + 164, 165, 166, 167, 168, 169, 170, 171, 172, 60, + 62, 89, -1, -1, -1, -1, -1, 217, -1, -1, + -1, 217, -1, -1, -1, -1, -1, -1, 228, 228, + -1, -1, 228, -1, -1, -1, -1, -1, 238, 239, + -1, 241, 238, 239, -1, 241, 238, 239, -1, 241, + 250, 250, 4, -1, 250, -1, -1, -1, -1, 259, + 259, -1, -1, 259, 264, -1, -1, -1, 264, -1, + -1, -1, 264, -1, 26, 27, 28, 29, -1, 31, + 32, -1, -1, -1, -1, 37, 38, -1, -1, -1, + -1, -1, 44, 45, -1, -1, -1, -1, -1, 51, + -1, -1, -1, 55, -1, 57, -1, 59, 60, 10, + 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, + 21, 22, 23, 24, 25, 13, -1, -1, -1, 30, + 18, 19, 33, 34, 35, 36, 37, 38, 39, 40, + 41, 42, 30, -1, -1, -1, -1, 35, 36, 37, + 38, 39, 40, 41, 42, 56, 10, 11, 12, 13, + 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, + 24, 25, -1, -1, -1, -1, 30, -1, -1, 33, + 34, 35, 36, 37, 38, 39, 40, 41, 42, 10, + 11, -1, 13, 14, 15, 16, 17, 18, 19, 20, + 21, 22, 23, 24, 25, -1, -1, -1, -1, 30, + -1, -1, 33, 34, 35, 36, 37, 38, 39, 40, + 41, 42, 10, -1, -1, 13, 14, 15, 16, 17, + 18, 19, 20, 21, 22, 23, 24, 25, -1, -1, + -1, -1, 30, -1, -1, 33, 34, 35, 36, 37, + 38, 39, 40, 41, 42, 13, 14, 15, 16, 17, + 18, 19, 20, 21, 22, 23, 24, 25, -1, -1, + -1, -1, 30, -1, -1, 33, 34, 35, 36, 37, + 38, 39, 40, 41, 42, 13, -1, -1, 16, 17, + 18, 19, -1, 13, -1, -1, 24, 25, 18, 19, + -1, -1, 30, -1, -1, -1, -1, 35, 36, 37, + 38, 39, 40, 41, 42, 35, 36, 37, 38, 39, + 40, 41, 42, 18, 19, -1, -1, -1, -1, -1, + 18, 19, -1, -1, -1, -1, 18, 19, -1, -1, + 35, 36, 37, 38, 39, 40, 41, 42, 36, 37, + 38, 39, 40, 41, 42, 37, 38, 39, 40, 41, + 42 }; /* YYSTOS[STATE-NUM] -- The (internal number of the) accessing @@ -815,32 +836,32 @@ static const yytype_int16 yycheck[] = static const yytype_uint8 yystos[] = { 0, 4, 46, 51, 57, 62, 63, 64, 65, 66, - 71, 78, 79, 80, 81, 82, 83, 90, 105, 106, - 145, 149, 4, 4, 48, 51, 52, 54, 84, 85, - 86, 87, 88, 89, 91, 92, 93, 94, 124, 125, - 126, 127, 128, 129, 130, 131, 132, 138, 139, 140, - 107, 0, 65, 80, 47, 48, 74, 5, 51, 58, - 136, 137, 133, 4, 135, 86, 125, 129, 138, 4, - 124, 125, 129, 3, 48, 52, 55, 95, 96, 99, - 100, 4, 126, 128, 129, 54, 89, 124, 58, 86, - 109, 4, 67, 68, 69, 70, 149, 4, 75, 76, - 149, 73, 74, 149, 135, 137, 79, 53, 129, 97, - 78, 4, 26, 27, 28, 29, 31, 32, 37, 38, - 44, 45, 51, 55, 59, 60, 83, 106, 141, 142, - 143, 147, 148, 108, 69, 149, 47, 49, 50, 4, - 77, 149, 134, 4, 80, 81, 101, 102, 103, 104, - 146, 53, 142, 142, 142, 142, 142, 142, 142, 142, - 142, 78, 144, 144, 56, 10, 11, 12, 13, 14, - 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, - 25, 30, 33, 34, 35, 36, 37, 38, 39, 40, - 41, 42, 48, 52, 55, 110, 111, 112, 115, 116, - 4, 47, 49, 79, 98, 56, 59, 60, 142, 142, - 142, 142, 142, 142, 142, 142, 142, 142, 142, 142, - 142, 142, 142, 142, 142, 142, 142, 142, 142, 142, - 142, 142, 142, 142, 142, 113, 78, 119, 122, 118, - 121, 141, 3, 111, 72, 49, 4, 102, 117, 120, - 123, 146, 50, 53, 50, 56, 78, 50, 114, 122, - 121, 120, 49 + 71, 78, 79, 80, 81, 82, 83, 90, 106, 107, + 147, 151, 4, 4, 48, 51, 52, 54, 55, 84, + 85, 86, 87, 88, 89, 91, 92, 93, 94, 125, + 126, 127, 128, 129, 130, 131, 132, 133, 136, 140, + 141, 142, 108, 0, 65, 80, 47, 48, 74, 5, + 51, 58, 138, 139, 134, 4, 137, 86, 126, 130, + 140, 4, 125, 126, 130, 4, 26, 27, 28, 29, + 31, 32, 37, 38, 44, 45, 51, 55, 59, 60, + 83, 107, 143, 144, 145, 149, 150, 3, 48, 52, + 55, 95, 96, 100, 101, 4, 127, 129, 130, 54, + 89, 125, 58, 86, 110, 4, 67, 68, 69, 70, + 151, 4, 75, 76, 151, 73, 74, 151, 137, 139, + 79, 53, 130, 144, 144, 144, 144, 144, 144, 144, + 144, 144, 78, 146, 146, 56, 10, 11, 12, 13, + 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, + 24, 25, 30, 33, 34, 35, 36, 37, 38, 39, + 40, 41, 42, 97, 78, 143, 109, 69, 151, 47, + 49, 50, 4, 77, 151, 135, 56, 59, 60, 144, + 144, 144, 144, 144, 144, 144, 144, 144, 144, 144, + 144, 144, 144, 144, 144, 144, 144, 144, 144, 144, + 144, 144, 144, 144, 144, 144, 4, 80, 81, 99, + 102, 103, 104, 105, 148, 53, 56, 48, 52, 55, + 111, 112, 113, 116, 117, 4, 47, 49, 79, 50, + 98, 114, 78, 120, 123, 119, 122, 143, 3, 112, + 72, 102, 49, 4, 103, 118, 121, 124, 148, 50, + 53, 50, 56, 78, 50, 115, 123, 122, 121, 49 }; /* YYR1[YYN] -- Symbol number of symbol that rule YYN derives. */ @@ -852,18 +873,18 @@ static const yytype_uint8 yyr1[] = 79, 79, 80, 80, 81, 81, 81, 82, 83, 84, 84, 85, 86, 86, 87, 88, 89, 89, 90, 91, 91, 91, 92, 93, 94, 95, 95, 95, 97, 98, - 96, 99, 100, 101, 101, 101, 102, 103, 104, 104, - 105, 107, 108, 106, 109, 110, 110, 111, 111, 111, - 113, 114, 112, 115, 116, 117, 117, 118, 118, 119, - 119, 120, 121, 122, 123, 123, 123, 124, 124, 125, - 125, 126, 127, 128, 128, 129, 129, 129, 129, 130, - 131, 133, 134, 132, 135, 136, 136, 137, 138, 138, - 139, 140, 141, 142, 142, 142, 142, 142, 142, 142, - 142, 142, 142, 142, 142, 142, 142, 142, 142, 142, - 142, 142, 142, 142, 142, 142, 142, 142, 142, 142, - 142, 142, 142, 142, 142, 142, 142, 142, 142, 142, - 142, 142, 142, 142, 142, 142, 143, 144, 145, 146, - 147, 148, 149 + 96, 99, 99, 100, 101, 102, 102, 102, 103, 104, + 105, 105, 106, 108, 109, 107, 110, 111, 111, 112, + 112, 112, 114, 115, 113, 116, 117, 118, 118, 119, + 119, 120, 120, 121, 122, 123, 124, 124, 124, 125, + 125, 126, 126, 127, 128, 129, 129, 130, 130, 130, + 130, 130, 131, 132, 134, 135, 133, 136, 137, 138, + 138, 139, 140, 140, 141, 142, 143, 144, 144, 144, + 144, 144, 144, 144, 144, 144, 144, 144, 144, 144, + 144, 144, 144, 144, 144, 144, 144, 144, 144, 144, + 144, 144, 144, 144, 144, 144, 144, 144, 144, 144, + 144, 144, 144, 144, 144, 144, 144, 144, 144, 144, + 145, 146, 147, 148, 149, 150, 151 }; /* YYR2[YYN] -- Number of symbols on the right hand side of rule YYN. */ @@ -875,18 +896,18 @@ static const yytype_uint8 yyr2[] = 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, 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, 1, 1, 3, 3, - 3, 2, 2, 2, 2, 2, 2, 2, 2, 3, + 5, 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, + 2, 1, 2, 2, 1, 1, 2, 1, 1, 1, + 1, 1, 2, 2, 0, 0, 5, 3, 1, 1, + 2, 2, 1, 1, 2, 2, 1, 1, 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, 3, 3, 1, 1, 1, 0, - 1, 1, 0 + 1, 1, 1, 0, 1, 1, 0 }; @@ -1583,7 +1604,7 @@ yyreduce: Method* method=new Method(Method::CT_ANY, 0, 0 /*min, max numbered_params_count*/, 0 /*param_names*/, 0 /*local_names*/, yyvsp[0] /*parser_code*/, 0 /*native_code*/, PC.cclass->is_vars_local()); PC.cclass->set_method(PC.alias_method(main_method_name), method); } -#line 1587 "compile.tab.C" /* yacc.c:1652 */ +#line 1608 "compile.tab.C" /* yacc.c:1652 */ break; case 9: @@ -1603,7 +1624,7 @@ yyreduce: PC.cclass_new=cclass; PC.append=false; } else { - YYERROR1("@" CLASS_NAME " must contain only one line with class name (contains more then one)"); + YYERROR1("@" CLASS_NAME " must contain only one line with class name (contains more than one)"); } } else if(command==USE_CONTROL_METHOD_NAME) { CLASS_ADD; @@ -1658,13 +1679,13 @@ yyreduce: YYERROR3("'", command.cstr(), "' invalid special name. valid names are '" CLASS_NAME "', '" USE_CONTROL_METHOD_NAME "', '" BASE_NAME "' and '" OPTIONS_CONTROL_METHOD_NAME "'."); } } -#line 1662 "compile.tab.C" /* yacc.c:1652 */ +#line 1683 "compile.tab.C" /* yacc.c:1652 */ break; case 13: #line 231 "compile.y" /* yacc.c:1652 */ { yyval=yyvsp[-1]; P(*yyval, *yyvsp[0]); } -#line 1668 "compile.tab.C" /* yacc.c:1652 */ +#line 1689 "compile.tab.C" /* yacc.c:1652 */ break; case 17: @@ -1707,7 +1728,7 @@ yyreduce: *reinterpret_cast(&yyval)=method; } -#line 1711 "compile.tab.C" /* yacc.c:1652 */ +#line 1732 "compile.tab.C" /* yacc.c:1652 */ break; case 18: @@ -1721,25 +1742,25 @@ yyreduce: const String& name=*LA2S(*yyvsp[-6]); PC.cclass->set_method(PC.alias_method(name), method); } -#line 1725 "compile.tab.C" /* yacc.c:1652 */ +#line 1746 "compile.tab.C" /* yacc.c:1652 */ break; case 21: #line 283 "compile.y" /* yacc.c:1652 */ {yyval=yyvsp[-1];} -#line 1731 "compile.tab.C" /* yacc.c:1652 */ +#line 1752 "compile.tab.C" /* yacc.c:1652 */ break; case 25: #line 285 "compile.y" /* yacc.c:1652 */ { yyval=yyvsp[-2]; P(*yyval, *yyvsp[0]); } -#line 1737 "compile.tab.C" /* yacc.c:1652 */ +#line 1758 "compile.tab.C" /* yacc.c:1652 */ break; case 31: #line 293 "compile.y" /* yacc.c:1652 */ { yyval=yyvsp[-1]; P(*yyval, *yyvsp[0]); } -#line 1743 "compile.tab.C" /* yacc.c:1652 */ +#line 1764 "compile.tab.C" /* yacc.c:1652 */ break; case 37: @@ -1775,19 +1796,19 @@ yyreduce: P(*yyval, *code); } -#line 1779 "compile.tab.C" /* yacc.c:1652 */ +#line 1800 "compile.tab.C" /* yacc.c:1652 */ break; case 38: #line 330 "compile.y" /* yacc.c:1652 */ { yyval=yyvsp[0]; } -#line 1785 "compile.tab.C" /* yacc.c:1652 */ +#line 1806 "compile.tab.C" /* yacc.c:1652 */ break; case 41: #line 332 "compile.y" /* yacc.c:1652 */ { yyval=yyvsp[-1]; } -#line 1791 "compile.tab.C" /* yacc.c:1652 */ +#line 1812 "compile.tab.C" /* yacc.c:1652 */ break; case 44: @@ -1841,19 +1862,19 @@ yyreduce: #endif /* diving code; stack: current context */ } -#line 1845 "compile.tab.C" /* yacc.c:1652 */ +#line 1866 "compile.tab.C" /* yacc.c:1652 */ break; case 45: #line 385 "compile.y" /* yacc.c:1652 */ { yyval=yyvsp[-1]; P(*yyval, *yyvsp[0]); } -#line 1851 "compile.tab.C" /* yacc.c:1652 */ +#line 1872 "compile.tab.C" /* yacc.c:1652 */ break; case 47: #line 386 "compile.y" /* yacc.c:1652 */ { yyval=yyvsp[-1]; P(*yyval, *yyvsp[0]); } -#line 1857 "compile.tab.C" /* yacc.c:1652 */ +#line 1878 "compile.tab.C" /* yacc.c:1652 */ break; case 48: @@ -1870,7 +1891,7 @@ yyreduce: P(*yyval, *yyvsp[0]); /* stack: context,name,constructor_value */ } } -#line 1874 "compile.tab.C" /* yacc.c:1652 */ +#line 1895 "compile.tab.C" /* yacc.c:1652 */ break; case 52: @@ -1897,7 +1918,7 @@ yyreduce: } /* diving code; stack: current context */ } -#line 1901 "compile.tab.C" /* yacc.c:1652 */ +#line 1922 "compile.tab.C" /* yacc.c:1652 */ break; case 53: @@ -1907,13 +1928,13 @@ yyreduce: O(*yyval, OP::OP_WITH_WRITE); /* stack: starting context */ P(*yyval, *yyvsp[0]); /* diving code; stack: context,name */ } -#line 1911 "compile.tab.C" /* yacc.c:1652 */ +#line 1932 "compile.tab.C" /* yacc.c:1652 */ break; case 54: #line 433 "compile.y" /* yacc.c:1652 */ { yyval=yyvsp[-1]; P(*yyval, *yyvsp[0]); } -#line 1917 "compile.tab.C" /* yacc.c:1652 */ +#line 1938 "compile.tab.C" /* yacc.c:1652 */ break; case 58: @@ -1921,68 +1942,87 @@ yyreduce: { // allow $result_or_other_variable[ letters here any time ] *reinterpret_cast(&yyval)=PC.explicit_result; PC.explicit_result=false; + PC.array=false; // no need to save current value as if() is right after PC.array=true; } -#line 1926 "compile.tab.C" /* yacc.c:1652 */ +#line 1948 "compile.tab.C" /* yacc.c:1652 */ break; case 59: -#line 443 "compile.y" /* yacc.c:1652 */ +#line 444 "compile.y" /* yacc.c:1652 */ { PC.explicit_result=*reinterpret_cast(&yyvsp[-1]); } -#line 1934 "compile.tab.C" /* yacc.c:1652 */ +#line 1956 "compile.tab.C" /* yacc.c:1652 */ break; case 60: -#line 445 "compile.y" /* yacc.c:1652 */ +#line 446 "compile.y" /* yacc.c:1652 */ { // stack: context, name - yyval=yyvsp[-2]; // stack: context, name, value - O(*yyval, OP::OP_CONSTRUCT_VALUE); /* value=pop; name=pop; context=pop; construct(context,name,value) */ + if(!PC.array){ + yyval=yyvsp[-2]; // stack: context, name, value + O(*yyval, OP::OP_CONSTRUCT_VALUE); /* value=pop; name=pop; context=pop; construct(context,name,value) */ + } else { + yyval = N(); + OA(*yyval, OP::OP_CONSTRUCT_ARRAY, yyvsp[-2]); + PC.array=false; + } } -#line 1944 "compile.tab.C" /* yacc.c:1652 */ +#line 1972 "compile.tab.C" /* yacc.c:1652 */ break; case 61: -#line 451 "compile.y" /* yacc.c:1652 */ +#line 459 "compile.y" /* yacc.c:1652 */ + { yyval = yyvsp[0]; } +#line 1978 "compile.tab.C" /* yacc.c:1652 */ + break; + + case 62: +#line 460 "compile.y" /* yacc.c:1652 */ + { yyval = yyvsp[-2]; P(*yyval, *yyvsp[0]); PC.array=true; } +#line 1984 "compile.tab.C" /* yacc.c:1652 */ + break; + + case 63: +#line 462 "compile.y" /* yacc.c:1652 */ { yyval=N(); // stack: context, name P(*yyval, *yyvsp[-1]); // stack: context, name, value O(*yyval, OP::OP_CONSTRUCT_EXPR); /* value=pop->as_expr_result; name=pop; context=pop; construct(context,name,value) */ } -#line 1955 "compile.tab.C" /* yacc.c:1652 */ +#line 1995 "compile.tab.C" /* yacc.c:1652 */ break; - case 62: -#line 458 "compile.y" /* yacc.c:1652 */ + case 64: +#line 469 "compile.y" /* yacc.c:1652 */ { // stack: context, name yyval=N(); OA(*yyval, OP::OP_CURLY_CODE__CONSTRUCT, yyvsp[-1]); /* code=pop; name=pop; context=pop; construct(context,name,junction(code)) */ } -#line 1965 "compile.tab.C" /* yacc.c:1652 */ +#line 2005 "compile.tab.C" /* yacc.c:1652 */ break; - case 66: -#line 469 "compile.y" /* yacc.c:1652 */ + case 68: +#line 480 "compile.y" /* yacc.c:1652 */ { yyval=N(); OA(*yyval, OP::OP_OBJECT_POOL, yyvsp[0]); /* stack: empty write context */ /* some code that writes to that context */ /* context=pop; stack: context.value() */ } -#line 1976 "compile.tab.C" /* yacc.c:1652 */ +#line 2016 "compile.tab.C" /* yacc.c:1652 */ break; - case 69: -#line 476 "compile.y" /* yacc.c:1652 */ + case 71: +#line 487 "compile.y" /* yacc.c:1652 */ { yyval=yyvsp[-1]; P(*yyval, *yyvsp[0]); } -#line 1982 "compile.tab.C" /* yacc.c:1652 */ +#line 2022 "compile.tab.C" /* yacc.c:1652 */ break; - case 70: -#line 480 "compile.y" /* yacc.c:1652 */ + case 72: +#line 491 "compile.y" /* yacc.c:1652 */ { size_t count=yyvsp[0]->count(); #ifdef OPTIMIZE_BYTECODE_CUT_REM_OPERATOR @@ -1994,27 +2034,27 @@ yyreduce: change_or_append(*yyval, count-2 /* second last */, OP::OP_CALL, /*=>*/ OP::OP_CALL__WRITE, /*or */ OP::OP_WRITE_VALUE); /* value=pop; wcontext.write(value) */ } } -#line 1998 "compile.tab.C" /* yacc.c:1652 */ +#line 2038 "compile.tab.C" /* yacc.c:1652 */ break; - case 71: -#line 491 "compile.y" /* yacc.c:1652 */ + case 73: +#line 502 "compile.y" /* yacc.c:1652 */ { PC.in_call_value=true; } -#line 2006 "compile.tab.C" /* yacc.c:1652 */ +#line 2046 "compile.tab.C" /* yacc.c:1652 */ break; - case 72: -#line 494 "compile.y" /* yacc.c:1652 */ + case 74: +#line 505 "compile.y" /* yacc.c:1652 */ { PC.in_call_value=false; } -#line 2014 "compile.tab.C" /* yacc.c:1652 */ +#line 2054 "compile.tab.C" /* yacc.c:1652 */ break; - case 73: -#line 497 "compile.y" /* yacc.c:1652 */ + case 75: +#line 508 "compile.y" /* yacc.c:1652 */ { /* ^field.$method{vasya} */ #ifdef OPTIMIZE_BYTECODE_CUT_REM_OPERATOR #ifdef OPTIMIZE_BYTECODE_GET_ELEMENT @@ -2060,11 +2100,11 @@ yyreduce: } } } -#line 2064 "compile.tab.C" /* yacc.c:1652 */ +#line 2104 "compile.tab.C" /* yacc.c:1652 */ break; - case 74: -#line 543 "compile.y" /* yacc.c:1652 */ + case 76: +#line 554 "compile.y" /* yacc.c:1652 */ { #ifdef FEATURE_GET_ELEMENT4CALL size_t count=yyvsp[0]->count(); @@ -2080,78 +2120,78 @@ yyreduce: } #endif } -#line 2084 "compile.tab.C" /* yacc.c:1652 */ +#line 2124 "compile.tab.C" /* yacc.c:1652 */ break; - case 76: -#line 559 "compile.y" /* yacc.c:1652 */ + case 78: +#line 570 "compile.y" /* yacc.c:1652 */ { yyval=yyvsp[-1]; P(*yyval, *yyvsp[0]); } -#line 2090 "compile.tab.C" /* yacc.c:1652 */ +#line 2130 "compile.tab.C" /* yacc.c:1652 */ break; - case 80: -#line 565 "compile.y" /* yacc.c:1652 */ + case 82: +#line 576 "compile.y" /* yacc.c:1652 */ { // allow ^call[ letters here any time ] *reinterpret_cast(&yyval)=PC.explicit_result; PC.explicit_result=false; } -#line 2099 "compile.tab.C" /* yacc.c:1652 */ +#line 2139 "compile.tab.C" /* yacc.c:1652 */ break; - case 81: -#line 568 "compile.y" /* yacc.c:1652 */ + case 83: +#line 579 "compile.y" /* yacc.c:1652 */ { PC.explicit_result=*reinterpret_cast(&yyvsp[-1]); } -#line 2107 "compile.tab.C" /* yacc.c:1652 */ +#line 2147 "compile.tab.C" /* yacc.c:1652 */ break; - case 82: -#line 570 "compile.y" /* yacc.c:1652 */ + case 84: +#line 581 "compile.y" /* yacc.c:1652 */ {yyval=yyvsp[-2];} -#line 2113 "compile.tab.C" /* yacc.c:1652 */ +#line 2153 "compile.tab.C" /* yacc.c:1652 */ break; - case 83: -#line 571 "compile.y" /* yacc.c:1652 */ + case 85: +#line 582 "compile.y" /* yacc.c:1652 */ {yyval=yyvsp[-1];} -#line 2119 "compile.tab.C" /* yacc.c:1652 */ +#line 2159 "compile.tab.C" /* yacc.c:1652 */ break; - case 84: -#line 572 "compile.y" /* yacc.c:1652 */ + case 86: +#line 583 "compile.y" /* yacc.c:1652 */ {yyval=yyvsp[-1];} -#line 2125 "compile.tab.C" /* yacc.c:1652 */ +#line 2165 "compile.tab.C" /* yacc.c:1652 */ break; - case 86: -#line 575 "compile.y" /* yacc.c:1652 */ + case 88: +#line 586 "compile.y" /* yacc.c:1652 */ { yyval=yyvsp[-2]; P(*yyval, *yyvsp[0]); } -#line 2131 "compile.tab.C" /* yacc.c:1652 */ +#line 2171 "compile.tab.C" /* yacc.c:1652 */ break; - case 88: -#line 579 "compile.y" /* yacc.c:1652 */ + case 90: +#line 590 "compile.y" /* yacc.c:1652 */ { yyval=yyvsp[-2]; P(*yyval, *yyvsp[0]); } -#line 2137 "compile.tab.C" /* yacc.c:1652 */ +#line 2177 "compile.tab.C" /* yacc.c:1652 */ break; - case 90: -#line 583 "compile.y" /* yacc.c:1652 */ + case 92: +#line 594 "compile.y" /* yacc.c:1652 */ { yyval=yyvsp[-2]; P(*yyval, *yyvsp[0]); } -#line 2143 "compile.tab.C" /* yacc.c:1652 */ +#line 2183 "compile.tab.C" /* yacc.c:1652 */ break; - case 91: -#line 585 "compile.y" /* yacc.c:1652 */ + case 93: +#line 596 "compile.y" /* yacc.c:1652 */ { yyval=yyvsp[0]; } -#line 2151 "compile.tab.C" /* yacc.c:1652 */ +#line 2191 "compile.tab.C" /* yacc.c:1652 */ break; - case 92: -#line 588 "compile.y" /* yacc.c:1652 */ + case 94: +#line 599 "compile.y" /* yacc.c:1652 */ { YYSTYPE expr_code=yyvsp[0]; if(expr_code->count()==3 @@ -2165,32 +2205,32 @@ yyreduce: OA(*yyval, OP::OP_EXPR_CODE__STORE_PARAM, code); } } -#line 2169 "compile.tab.C" /* yacc.c:1652 */ +#line 2209 "compile.tab.C" /* yacc.c:1652 */ break; - case 93: -#line 601 "compile.y" /* yacc.c:1652 */ + case 95: +#line 612 "compile.y" /* yacc.c:1652 */ { yyval=N(); OA(*yyval, OP::OP_CURLY_CODE__STORE_PARAM, yyvsp[0]); } -#line 2178 "compile.tab.C" /* yacc.c:1652 */ +#line 2218 "compile.tab.C" /* yacc.c:1652 */ break; - case 98: -#line 613 "compile.y" /* yacc.c:1652 */ + case 100: +#line 624 "compile.y" /* yacc.c:1652 */ { yyval=yyvsp[-1]; P(*yyval, *yyvsp[0]); } -#line 2184 "compile.tab.C" /* yacc.c:1652 */ +#line 2224 "compile.tab.C" /* yacc.c:1652 */ break; - case 100: -#line 615 "compile.y" /* yacc.c:1652 */ + case 102: +#line 626 "compile.y" /* yacc.c:1652 */ { yyval=yyvsp[-1]; P(*yyval, *yyvsp[0]); } -#line 2190 "compile.tab.C" /* yacc.c:1652 */ +#line 2230 "compile.tab.C" /* yacc.c:1652 */ break; - case 102: -#line 617 "compile.y" /* yacc.c:1652 */ + case 104: +#line 628 "compile.y" /* yacc.c:1652 */ { // 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 @@ -2203,11 +2243,11 @@ yyreduce: O(*yyval, OP::OP_GET_ELEMENT); /* name=pop; context=pop; stack: context.get_element(name) */ #endif } -#line 2207 "compile.tab.C" /* yacc.c:1652 */ +#line 2247 "compile.tab.C" /* yacc.c:1652 */ break; - case 103: -#line 629 "compile.y" /* yacc.c:1652 */ + case 105: +#line 640 "compile.y" /* yacc.c:1652 */ { /* stack: context */ yyval=yyvsp[0]; /* stack: context,name */ @@ -2217,20 +2257,20 @@ yyreduce: O(*yyval, OP::OP_GET_ELEMENT); /* name=pop; context=pop; stack: context.get_element(name) */ #endif } -#line 2221 "compile.tab.C" /* yacc.c:1652 */ +#line 2261 "compile.tab.C" /* yacc.c:1652 */ break; - case 109: -#line 646 "compile.y" /* yacc.c:1652 */ + case 112: +#line 658 "compile.y" /* yacc.c:1652 */ { yyval=yyvsp[0]; O(*yyval, OP::OP_GET_ELEMENT); } -#line 2230 "compile.tab.C" /* yacc.c:1652 */ +#line 2270 "compile.tab.C" /* yacc.c:1652 */ break; - case 110: -#line 650 "compile.y" /* yacc.c:1652 */ + case 113: +#line 662 "compile.y" /* yacc.c:1652 */ { YYSTYPE code; { @@ -2240,69 +2280,75 @@ yyreduce: yyval=N(); OA(*yyval, OP::OP_STRING_POOL, code); } -#line 2244 "compile.tab.C" /* yacc.c:1652 */ +#line 2284 "compile.tab.C" /* yacc.c:1652 */ break; - case 111: -#line 659 "compile.y" /* yacc.c:1652 */ + case 114: +#line 671 "compile.y" /* yacc.c:1652 */ { // allow $result_or_other_variable[ letters here any time ] *reinterpret_cast(&yyval)=PC.explicit_result; PC.explicit_result=false; } -#line 2253 "compile.tab.C" /* yacc.c:1652 */ +#line 2293 "compile.tab.C" /* yacc.c:1652 */ break; - case 112: -#line 662 "compile.y" /* yacc.c:1652 */ + case 115: +#line 674 "compile.y" /* yacc.c:1652 */ { PC.explicit_result=*reinterpret_cast(&yyvsp[-1]); } -#line 2261 "compile.tab.C" /* yacc.c:1652 */ +#line 2301 "compile.tab.C" /* yacc.c:1652 */ break; - case 113: -#line 664 "compile.y" /* yacc.c:1652 */ + case 116: +#line 676 "compile.y" /* yacc.c:1652 */ { - yyval=N(); -#ifdef OPTIMIZE_BYTECODE_GET_ELEMENT__SPECIAL - if(!maybe_append_simple_diving_code(*yyval, *yyvsp[-2])) -#endif - { + yyval=N(); + if(!maybe_append_simple_diving_code(*yyval, *yyvsp[-2])) { OA(*yyval, OP::OP_OBJECT_POOL, yyvsp[-2]); /* stack: empty write context */ /* some code that writes to that context */ /* context=pop; stack: context.value() */ } } -#line 2277 "compile.tab.C" /* yacc.c:1652 */ +#line 2314 "compile.tab.C" /* yacc.c:1652 */ break; - case 114: -#line 675 "compile.y" /* yacc.c:1652 */ + case 117: +#line 684 "compile.y" /* yacc.c:1652 */ + { + yyval = N(); + P(*yyval, *yyvsp[-1]); +} +#line 2323 "compile.tab.C" /* yacc.c:1652 */ + break; + + case 118: +#line 688 "compile.y" /* yacc.c:1652 */ { yyval=N(); O(*yyval, OP::OP_WITH_READ); P(*yyval, *yyvsp[0]); } -#line 2287 "compile.tab.C" /* yacc.c:1652 */ +#line 2333 "compile.tab.C" /* yacc.c:1652 */ break; - case 116: -#line 680 "compile.y" /* yacc.c:1652 */ + case 120: +#line 693 "compile.y" /* yacc.c:1652 */ { yyval=yyvsp[-1]; P(*yyval, *yyvsp[0]); } -#line 2293 "compile.tab.C" /* yacc.c:1652 */ +#line 2339 "compile.tab.C" /* yacc.c:1652 */ break; - case 117: -#line 681 "compile.y" /* yacc.c:1652 */ + case 121: +#line 694 "compile.y" /* yacc.c:1652 */ { yyval=yyvsp[0]; O(*yyval, OP::OP_GET_ELEMENT__WRITE); } -#line 2302 "compile.tab.C" /* yacc.c:1652 */ +#line 2348 "compile.tab.C" /* yacc.c:1652 */ break; - case 120: -#line 690 "compile.y" /* yacc.c:1652 */ + case 124: +#line 703 "compile.y" /* yacc.c:1652 */ { yyval=yyvsp[-1]; // stack: class name string OP::OPCODE code = OP::OP_VALUE__GET_CLASS; @@ -2322,259 +2368,259 @@ yyreduce: // optimized OP_VALUE+origin+string+OP_GET_CLASS => OP_VALUE__GET_CLASS+origin+string change_first(*yyval, OP::OP_VALUE, code); } -#line 2326 "compile.tab.C" /* yacc.c:1652 */ +#line 2372 "compile.tab.C" /* yacc.c:1652 */ break; - case 121: -#line 709 "compile.y" /* yacc.c:1652 */ + case 125: +#line 722 "compile.y" /* yacc.c:1652 */ { yyval=yyvsp[-1]; if(!PC.in_call_value) YYERROR1(":: not allowed here"); O(*yyval, OP::OP_PREPARE_TO_CONSTRUCT_OBJECT); } -#line 2337 "compile.tab.C" /* yacc.c:1652 */ +#line 2383 "compile.tab.C" /* yacc.c:1652 */ break; - case 128: -#line 726 "compile.y" /* yacc.c:1652 */ + case 132: +#line 739 "compile.y" /* yacc.c:1652 */ { yyval = yyvsp[-1]; } -#line 2343 "compile.tab.C" /* yacc.c:1652 */ +#line 2389 "compile.tab.C" /* yacc.c:1652 */ break; - case 129: -#line 727 "compile.y" /* yacc.c:1652 */ + case 133: +#line 740 "compile.y" /* yacc.c:1652 */ { yyval = yyvsp[-1]; } -#line 2349 "compile.tab.C" /* yacc.c:1652 */ +#line 2395 "compile.tab.C" /* yacc.c:1652 */ break; - case 130: -#line 728 "compile.y" /* yacc.c:1652 */ + case 134: +#line 741 "compile.y" /* yacc.c:1652 */ { yyval = yyvsp[-1]; } -#line 2355 "compile.tab.C" /* yacc.c:1652 */ +#line 2401 "compile.tab.C" /* yacc.c:1652 */ break; - case 131: -#line 730 "compile.y" /* yacc.c:1652 */ + case 135: +#line 743 "compile.y" /* yacc.c:1652 */ { yyval=yyvsp[0]; O(*yyval, OP::OP_NEG); } -#line 2361 "compile.tab.C" /* yacc.c:1652 */ +#line 2407 "compile.tab.C" /* yacc.c:1652 */ break; - case 132: -#line 731 "compile.y" /* yacc.c:1652 */ + case 136: +#line 744 "compile.y" /* yacc.c:1652 */ { yyval=yyvsp[0]; } -#line 2367 "compile.tab.C" /* yacc.c:1652 */ +#line 2413 "compile.tab.C" /* yacc.c:1652 */ break; - case 133: -#line 732 "compile.y" /* yacc.c:1652 */ + case 137: +#line 745 "compile.y" /* yacc.c:1652 */ { yyval=yyvsp[0]; O(*yyval, OP::OP_INV); } -#line 2373 "compile.tab.C" /* yacc.c:1652 */ +#line 2419 "compile.tab.C" /* yacc.c:1652 */ break; - case 134: -#line 733 "compile.y" /* yacc.c:1652 */ + case 138: +#line 746 "compile.y" /* yacc.c:1652 */ { yyval=yyvsp[0]; O(*yyval, OP::OP_NOT); } -#line 2379 "compile.tab.C" /* yacc.c:1652 */ +#line 2425 "compile.tab.C" /* yacc.c:1652 */ break; - case 135: -#line 734 "compile.y" /* yacc.c:1652 */ + case 139: +#line 747 "compile.y" /* yacc.c:1652 */ { yyval=yyvsp[0]; O(*yyval, OP::OP_DEF); } -#line 2385 "compile.tab.C" /* yacc.c:1652 */ +#line 2431 "compile.tab.C" /* yacc.c:1652 */ break; - case 136: -#line 735 "compile.y" /* yacc.c:1652 */ + case 140: +#line 748 "compile.y" /* yacc.c:1652 */ { yyval=yyvsp[0]; O(*yyval, OP::OP_IN); } -#line 2391 "compile.tab.C" /* yacc.c:1652 */ +#line 2437 "compile.tab.C" /* yacc.c:1652 */ break; - case 137: -#line 736 "compile.y" /* yacc.c:1652 */ + case 141: +#line 749 "compile.y" /* yacc.c:1652 */ { yyval=yyvsp[0]; O(*yyval, OP::OP_FEXISTS); } -#line 2397 "compile.tab.C" /* yacc.c:1652 */ +#line 2443 "compile.tab.C" /* yacc.c:1652 */ break; - case 138: -#line 737 "compile.y" /* yacc.c:1652 */ + case 142: +#line 750 "compile.y" /* yacc.c:1652 */ { yyval=yyvsp[0]; O(*yyval, OP::OP_DEXISTS); } -#line 2403 "compile.tab.C" /* yacc.c:1652 */ +#line 2449 "compile.tab.C" /* yacc.c:1652 */ break; - case 139: -#line 739 "compile.y" /* yacc.c:1652 */ + case 143: +#line 752 "compile.y" /* yacc.c:1652 */ { yyval=yyvsp[-2]; P(*yyval, *yyvsp[0]); O(*yyval, OP::OP_SUB); } -#line 2409 "compile.tab.C" /* yacc.c:1652 */ +#line 2455 "compile.tab.C" /* yacc.c:1652 */ break; - case 140: -#line 740 "compile.y" /* yacc.c:1652 */ + case 144: +#line 753 "compile.y" /* yacc.c:1652 */ { yyval=yyvsp[-2]; P(*yyval, *yyvsp[0]); O(*yyval, OP::OP_ADD); } -#line 2415 "compile.tab.C" /* yacc.c:1652 */ +#line 2461 "compile.tab.C" /* yacc.c:1652 */ break; - case 141: -#line 741 "compile.y" /* yacc.c:1652 */ + case 145: +#line 754 "compile.y" /* yacc.c:1652 */ { yyval=yyvsp[-2]; P(*yyval, *yyvsp[0]); O(*yyval, OP::OP_MUL); } -#line 2421 "compile.tab.C" /* yacc.c:1652 */ +#line 2467 "compile.tab.C" /* yacc.c:1652 */ break; - case 142: -#line 742 "compile.y" /* yacc.c:1652 */ + case 146: +#line 755 "compile.y" /* yacc.c:1652 */ { yyval=yyvsp[-2]; P(*yyval, *yyvsp[0]); O(*yyval, OP::OP_DIV); } -#line 2427 "compile.tab.C" /* yacc.c:1652 */ +#line 2473 "compile.tab.C" /* yacc.c:1652 */ break; - case 143: -#line 743 "compile.y" /* yacc.c:1652 */ + case 147: +#line 756 "compile.y" /* yacc.c:1652 */ { yyval=yyvsp[-2]; P(*yyval, *yyvsp[0]); O(*yyval, OP::OP_MOD); } -#line 2433 "compile.tab.C" /* yacc.c:1652 */ +#line 2479 "compile.tab.C" /* yacc.c:1652 */ break; - case 144: -#line 744 "compile.y" /* yacc.c:1652 */ + case 148: +#line 757 "compile.y" /* yacc.c:1652 */ { yyval=yyvsp[-2]; P(*yyval, *yyvsp[0]); O(*yyval, OP::OP_INTDIV); } -#line 2439 "compile.tab.C" /* yacc.c:1652 */ +#line 2485 "compile.tab.C" /* yacc.c:1652 */ break; - case 145: -#line 745 "compile.y" /* yacc.c:1652 */ + case 149: +#line 758 "compile.y" /* yacc.c:1652 */ { yyval=yyvsp[-2]; P(*yyval, *yyvsp[0]); O(*yyval, OP::OP_BIN_SL); } -#line 2445 "compile.tab.C" /* yacc.c:1652 */ +#line 2491 "compile.tab.C" /* yacc.c:1652 */ break; - case 146: -#line 746 "compile.y" /* yacc.c:1652 */ + case 150: +#line 759 "compile.y" /* yacc.c:1652 */ { yyval=yyvsp[-2]; P(*yyval, *yyvsp[0]); O(*yyval, OP::OP_BIN_SR); } -#line 2451 "compile.tab.C" /* yacc.c:1652 */ +#line 2497 "compile.tab.C" /* yacc.c:1652 */ break; - case 147: -#line 747 "compile.y" /* yacc.c:1652 */ + case 151: +#line 760 "compile.y" /* yacc.c:1652 */ { yyval=yyvsp[-2]; P(*yyval, *yyvsp[0]); O(*yyval, OP::OP_BIN_AND); } -#line 2457 "compile.tab.C" /* yacc.c:1652 */ +#line 2503 "compile.tab.C" /* yacc.c:1652 */ break; - case 148: -#line 748 "compile.y" /* yacc.c:1652 */ + case 152: +#line 761 "compile.y" /* yacc.c:1652 */ { yyval=yyvsp[-2]; P(*yyval, *yyvsp[0]); O(*yyval, OP::OP_BIN_OR); } -#line 2463 "compile.tab.C" /* yacc.c:1652 */ +#line 2509 "compile.tab.C" /* yacc.c:1652 */ break; - case 149: -#line 749 "compile.y" /* yacc.c:1652 */ + case 153: +#line 762 "compile.y" /* yacc.c:1652 */ { yyval=yyvsp[-2]; P(*yyval, *yyvsp[0]); O(*yyval, OP::OP_BIN_XOR); } -#line 2469 "compile.tab.C" /* yacc.c:1652 */ +#line 2515 "compile.tab.C" /* yacc.c:1652 */ break; - case 150: -#line 750 "compile.y" /* yacc.c:1652 */ + case 154: +#line 763 "compile.y" /* yacc.c:1652 */ { yyval=yyvsp[-2]; OA(*yyval, OP::OP_NESTED_CODE, yyvsp[0]); O(*yyval, OP::OP_LOG_AND); } -#line 2475 "compile.tab.C" /* yacc.c:1652 */ +#line 2521 "compile.tab.C" /* yacc.c:1652 */ break; - case 151: -#line 751 "compile.y" /* yacc.c:1652 */ + case 155: +#line 764 "compile.y" /* yacc.c:1652 */ { yyval=yyvsp[-2]; OA(*yyval, OP::OP_NESTED_CODE, yyvsp[0]); O(*yyval, OP::OP_LOG_OR); } -#line 2481 "compile.tab.C" /* yacc.c:1652 */ +#line 2527 "compile.tab.C" /* yacc.c:1652 */ break; - case 152: -#line 752 "compile.y" /* yacc.c:1652 */ + case 156: +#line 765 "compile.y" /* yacc.c:1652 */ { yyval=yyvsp[-2]; P(*yyval, *yyvsp[0]); O(*yyval, OP::OP_LOG_XOR); } -#line 2487 "compile.tab.C" /* yacc.c:1652 */ +#line 2533 "compile.tab.C" /* yacc.c:1652 */ break; - case 153: -#line 753 "compile.y" /* yacc.c:1652 */ + case 157: +#line 766 "compile.y" /* yacc.c:1652 */ { yyval=yyvsp[-2]; P(*yyval, *yyvsp[0]); O(*yyval, OP::OP_NUM_LT); } -#line 2493 "compile.tab.C" /* yacc.c:1652 */ +#line 2539 "compile.tab.C" /* yacc.c:1652 */ break; - case 154: -#line 754 "compile.y" /* yacc.c:1652 */ + case 158: +#line 767 "compile.y" /* yacc.c:1652 */ { yyval=yyvsp[-2]; P(*yyval, *yyvsp[0]); O(*yyval, OP::OP_NUM_GT); } -#line 2499 "compile.tab.C" /* yacc.c:1652 */ +#line 2545 "compile.tab.C" /* yacc.c:1652 */ break; - case 155: -#line 755 "compile.y" /* yacc.c:1652 */ + case 159: +#line 768 "compile.y" /* yacc.c:1652 */ { yyval=yyvsp[-2]; P(*yyval, *yyvsp[0]); O(*yyval, OP::OP_NUM_LE); } -#line 2505 "compile.tab.C" /* yacc.c:1652 */ +#line 2551 "compile.tab.C" /* yacc.c:1652 */ break; - case 156: -#line 756 "compile.y" /* yacc.c:1652 */ + case 160: +#line 769 "compile.y" /* yacc.c:1652 */ { yyval=yyvsp[-2]; P(*yyval, *yyvsp[0]); O(*yyval, OP::OP_NUM_GE); } -#line 2511 "compile.tab.C" /* yacc.c:1652 */ +#line 2557 "compile.tab.C" /* yacc.c:1652 */ break; - case 157: -#line 757 "compile.y" /* yacc.c:1652 */ + case 161: +#line 770 "compile.y" /* yacc.c:1652 */ { yyval=yyvsp[-2]; P(*yyval, *yyvsp[0]); O(*yyval, OP::OP_NUM_EQ); } -#line 2517 "compile.tab.C" /* yacc.c:1652 */ +#line 2563 "compile.tab.C" /* yacc.c:1652 */ break; - case 158: -#line 758 "compile.y" /* yacc.c:1652 */ + case 162: +#line 771 "compile.y" /* yacc.c:1652 */ { yyval=yyvsp[-2]; P(*yyval, *yyvsp[0]); O(*yyval, OP::OP_NUM_NE); } -#line 2523 "compile.tab.C" /* yacc.c:1652 */ +#line 2569 "compile.tab.C" /* yacc.c:1652 */ break; - case 159: -#line 759 "compile.y" /* yacc.c:1652 */ + case 163: +#line 772 "compile.y" /* yacc.c:1652 */ { yyval=yyvsp[-2]; P(*yyval, *yyvsp[0]); O(*yyval, OP::OP_STR_LT); } -#line 2529 "compile.tab.C" /* yacc.c:1652 */ +#line 2575 "compile.tab.C" /* yacc.c:1652 */ break; - case 160: -#line 760 "compile.y" /* yacc.c:1652 */ + case 164: +#line 773 "compile.y" /* yacc.c:1652 */ { yyval=yyvsp[-2]; P(*yyval, *yyvsp[0]); O(*yyval, OP::OP_STR_GT); } -#line 2535 "compile.tab.C" /* yacc.c:1652 */ +#line 2581 "compile.tab.C" /* yacc.c:1652 */ break; - case 161: -#line 761 "compile.y" /* yacc.c:1652 */ + case 165: +#line 774 "compile.y" /* yacc.c:1652 */ { yyval=yyvsp[-2]; P(*yyval, *yyvsp[0]); O(*yyval, OP::OP_STR_LE); } -#line 2541 "compile.tab.C" /* yacc.c:1652 */ +#line 2587 "compile.tab.C" /* yacc.c:1652 */ break; - case 162: -#line 762 "compile.y" /* yacc.c:1652 */ + case 166: +#line 775 "compile.y" /* yacc.c:1652 */ { yyval=yyvsp[-2]; P(*yyval, *yyvsp[0]); O(*yyval, OP::OP_STR_GE); } -#line 2547 "compile.tab.C" /* yacc.c:1652 */ +#line 2593 "compile.tab.C" /* yacc.c:1652 */ break; - case 163: -#line 763 "compile.y" /* yacc.c:1652 */ + case 167: +#line 776 "compile.y" /* yacc.c:1652 */ { yyval=yyvsp[-2]; P(*yyval, *yyvsp[0]); O(*yyval, OP::OP_STR_EQ); } -#line 2553 "compile.tab.C" /* yacc.c:1652 */ +#line 2599 "compile.tab.C" /* yacc.c:1652 */ break; - case 164: -#line 764 "compile.y" /* yacc.c:1652 */ + case 168: +#line 777 "compile.y" /* yacc.c:1652 */ { yyval=yyvsp[-2]; P(*yyval, *yyvsp[0]); O(*yyval, OP::OP_STR_NE); } -#line 2559 "compile.tab.C" /* yacc.c:1652 */ +#line 2605 "compile.tab.C" /* yacc.c:1652 */ break; - case 165: -#line 765 "compile.y" /* yacc.c:1652 */ + case 169: +#line 778 "compile.y" /* yacc.c:1652 */ { yyval=yyvsp[-2]; P(*yyval, *yyvsp[0]); O(*yyval, OP::OP_IS); } -#line 2565 "compile.tab.C" /* yacc.c:1652 */ +#line 2611 "compile.tab.C" /* yacc.c:1652 */ break; - case 166: -#line 768 "compile.y" /* yacc.c:1652 */ + case 170: +#line 781 "compile.y" /* yacc.c:1652 */ { // optimized OP_STRING => OP_VALUE for doubles maybe_change_string_literal_to_double_literal(*(yyval=yyvsp[0])); } -#line 2574 "compile.tab.C" /* yacc.c:1652 */ +#line 2620 "compile.tab.C" /* yacc.c:1652 */ break; - case 167: -#line 773 "compile.y" /* yacc.c:1652 */ + case 171: +#line 786 "compile.y" /* yacc.c:1652 */ { #ifdef OPTIMIZE_BYTECODE_STRING_POOL // it brakes ^if(" 09 "){...} @@ -2593,44 +2639,44 @@ yyreduce: /* some code that writes to that context */ /* context=pop; stack: context.get_string() */ } -#line 2597 "compile.tab.C" /* yacc.c:1652 */ +#line 2643 "compile.tab.C" /* yacc.c:1652 */ break; - case 168: -#line 794 "compile.y" /* yacc.c:1652 */ + case 172: +#line 807 "compile.y" /* yacc.c:1652 */ { // optimized OP_STRING+OP_WRITE_VALUE => OP_STRING__WRITE change_string_literal_to_write_string_literal(*(yyval=yyvsp[0])); } -#line 2606 "compile.tab.C" /* yacc.c:1652 */ +#line 2652 "compile.tab.C" /* yacc.c:1652 */ break; - case 169: -#line 799 "compile.y" /* yacc.c:1652 */ + case 173: +#line 812 "compile.y" /* yacc.c:1652 */ { yyval=VL(/*we know that we will not change it*/const_cast(&vempty), 0, 0, 0); } -#line 2612 "compile.tab.C" /* yacc.c:1652 */ +#line 2658 "compile.tab.C" /* yacc.c:1652 */ break; - case 170: -#line 800 "compile.y" /* yacc.c:1652 */ + case 174: +#line 813 "compile.y" /* yacc.c:1652 */ { yyval = VL(/*we know that we will not change it*/const_cast(&vtrue), 0, 0, 0); } -#line 2618 "compile.tab.C" /* yacc.c:1652 */ +#line 2664 "compile.tab.C" /* yacc.c:1652 */ break; - case 171: -#line 801 "compile.y" /* yacc.c:1652 */ + case 175: +#line 814 "compile.y" /* yacc.c:1652 */ { yyval = VL(/*we know that we will not change it*/const_cast(&vfalse), 0, 0, 0); } -#line 2624 "compile.tab.C" /* yacc.c:1652 */ +#line 2670 "compile.tab.C" /* yacc.c:1652 */ break; - case 172: -#line 803 "compile.y" /* yacc.c:1652 */ + case 176: +#line 816 "compile.y" /* yacc.c:1652 */ { yyval=N(); } -#line 2630 "compile.tab.C" /* yacc.c:1652 */ +#line 2676 "compile.tab.C" /* yacc.c:1652 */ break; -#line 2634 "compile.tab.C" /* yacc.c:1652 */ +#line 2680 "compile.tab.C" /* yacc.c:1652 */ default: break; } /* User semantic actions sometimes alter yychar, and that requires @@ -2861,7 +2907,7 @@ yyreturn: #endif return yyresult; } -#line 805 "compile.y" /* yacc.c:1918 */ +#line 818 "compile.y" /* yacc.c:1918 */ #endif @@ -2890,12 +2936,12 @@ inline void ungetc(Parse_control& pc, ui } static int yylex(YYSTYPE *lvalp, void *apc) { - register Parse_control& pc=*static_cast(apc); + Parse_control& pc=*static_cast(apc); #define lexical_brackets_nestage pc.brackets_nestages[pc.ls_sp] #define RC {result=c; goto break2; } - register int c; + int c; int result; if(pc.pending_state) { @@ -3416,11 +3462,10 @@ default: goto break2; case '[': // $name.<[>code] - if(pc.pos.col>1/*not first column*/ && ( - end[-1]=='$'/*was start of get*/ || - end[-1]==':'/*was class name delim */ || - end[-1]=='.'/*was name delim */ - )) { + if( end[-1]=='$' /* was start of get */ || + end[-1]==':' /* was class name delim */ || + end[-1]=='.' /* was name delim */ + ) { push_LS(pc, LS_NAME_SQUARE_PART); lexical_brackets_nestage=1; RC; @@ -3429,7 +3474,7 @@ default: lexical_brackets_nestage=1; RC; case '{': - if(begin==end) { // ${name}, no need of EON, switching LS + if(end[-1]=='$') { // ${name}, no need of EON, switching LS, not begin==end as $[a]{$b} will fit pc.ls=LS_VAR_NAME_CURLY; } else { pc.ls=LS_VAR_CURLY; @@ -3438,6 +3483,15 @@ default: RC; case '(': + // $name.<(>expr) + if( // end[-1]=='$' /* $() excluded */ || + end[-1]==':' /* was class name delim */ || + end[-1]=='.' /* was name delim */ + ) { + push_LS(pc, LS_VAR_ROUND); + lexical_brackets_nestage=1; + RC; + } pc.ls=LS_VAR_ROUND; lexical_brackets_nestage=1; RC; @@ -3461,6 +3515,11 @@ default: push_LS(pc, LS_NAME_SQUARE_PART); lexical_brackets_nestage=1; RC; + case '(': + // ${name.<(>expr)} + push_LS(pc, LS_VAR_ROUND); + lexical_brackets_nestage=1; + RC; case '}': // ${name} finished, restoring LS pop_LS(pc); RC; @@ -3517,12 +3576,11 @@ default: case LS_METHOD_NAME: switch(c) { case '[': - // ^name.<[>code].xxx - if(pc.pos.col>1/*not first column*/ && ( - end[-1]=='^'/*was start of call*/ || // never, ^[ is literal... - end[-1]==':'/*was class name delim */ || - end[-1]=='.'/*was name delim */ - )) { + // ^name.<[>code] + if( // end[-1]=='^' /* never, ^[ is literal */ || + end[-1]==':' /* was class name delim */ || + end[-1]=='.' /* was name delim */ + ) { push_LS(pc, LS_NAME_SQUARE_PART); lexical_brackets_nestage=1; RC; @@ -3535,6 +3593,15 @@ default: lexical_brackets_nestage=1; RC; case '(': + // ^name.<(>expr) + if( // end[-1]=='^' /* never, ^( is literal */ || + end[-1]==':' /* was class name delim */ || + end[-1]=='.' /* was name delim */ + ) { + push_LS(pc, LS_VAR_ROUND); + lexical_brackets_nestage=1; + RC; + } pc.ls=LS_METHOD_ROUND; lexical_brackets_nestage=1; RC;