--- parser3/src/main/compile.tab.C 2024/09/18 22:31:34 1.186 +++ parser3/src/main/compile.tab.C 2026/09/19 22:45:10 1.194 @@ -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-2026 Art. Lebedev Studio (https://www.artlebedev.com) Authors: Konstantin Morshnev , Alexandr Petrosian */ -volatile const char * IDENT_COMPILE_Y = "$Id: compile.tab.C,v 1.186 2024/09/18 22:31:34 moko Exp $"; +volatile const char * IDENT_COMPILE_Y = "$Id: compile.tab.C,v 1.194 2026/09/19 22:45:10 moko Exp $"; /** @todo parser4: @@ -98,6 +98,11 @@ volatile const char * IDENT_COMPILE_Y = #define YYMALLOC pa_malloc #define YYFREE pa_free +// Windows headers define IN +#ifdef IN +#undef IN +#endif + // includes #include "compile_tools.h" @@ -460,18 +465,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 510 +#define YYLAST 560 /* YYNTOKENS -- Number of terminals. */ #define YYNTOKENS 61 /* YYNNTS -- Number of nonterminals. */ -#define YYNNTS 90 +#define YYNNTS 91 /* YYNRULES -- Number of rules. */ -#define YYNRULES 174 +#define YYNRULES 176 /* YYNSTATES -- Number of states. */ -#define YYNSTATES 266 +#define YYNSTATES 270 #define YYUNDEFTOK 2 #define YYMAXUTOK 288 @@ -531,13 +536,13 @@ static const yytype_uint16 yyrline[] = 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, 657, 661, 670, 673, 670, 686, 691, 691, 692, - 698, 699, 701, 720, 730, 732, 733, 734, 735, 736, - 737, 738, 739, 741, 742, 743, 744, 745, 746, 747, - 748, 750, 751, 752, 753, 754, 755, 756, 757, 758, + 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, 779, 784, - 805, 810, 811, 812, 814 + 769, 770, 771, 772, 773, 774, 775, 776, 777, 778, + 781, 786, 807, 812, 813, 814, 816 }; #endif @@ -576,10 +581,11 @@ static const char *const yytname[] = "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 +604,12 @@ static const yytype_uint16 yytoknum[] = }; # endif -#define YYPACT_NINF -215 +#define YYPACT_NINF -220 #define yypact_value_is_default(Yystate) \ - (!!((Yystate) == (-215))) + (!!((Yystate) == (-220))) -#define YYTABLE_NINF -175 +#define YYTABLE_NINF -177 #define yytable_value_is_error(Yytable_value) \ 0 @@ -612,33 +618,33 @@ static const yytype_uint16 yytoknum[] = STATE-NUM. */ static const yytype_int16 yypact[] = { - 6, -215, 20, 36, -215, 29, -10, -215, -215, -215, - -215, -215, 4, -215, -215, -215, -215, -215, -215, -215, - -215, -215, -21, 8, -215, 34, 5, 43, -215, -215, - 38, -215, -215, -215, 49, -215, -215, -215, -215, 47, - -215, -6, -215, 18, -215, -215, -215, 47, 54, -215, - 5, -215, -215, -215, 101, 118, 83, -215, 34, -215, - 92, -215, 4, -215, -215, 94, 47, 91, 47, 92, - -215, 43, 91, -215, -215, 4, 125, -215, -215, -215, - -215, 17, -215, -215, 18, -215, -215, -215, -215, -215, - -215, -215, -215, 7, -215, 102, 103, -215, 99, 108, - -215, 155, -215, -215, -215, -215, 4, -215, 91, 14, - 107, -215, 125, 125, 125, 125, -215, -215, 125, 125, - 125, 125, 41, 125, 4, 4, -215, -215, 105, 327, - -215, -215, -215, 55, -215, -215, -215, -215, 160, -215, - 119, -215, 116, 32, 4, 71, 121, -215, -215, -215, - -215, -215, -215, 293, 293, 293, 293, -215, -215, -215, - -215, 280, -215, 113, 114, -215, 125, 125, 125, 125, - 125, 125, 125, 125, 125, 125, 125, 125, 125, 125, - 125, 125, 125, 125, 125, 125, 125, 125, 125, 125, - 125, 125, 125, -215, 4, 125, 31, -215, -215, -215, - -215, -215, -215, -215, 4, 14, 124, -215, -215, -215, - 423, 393, 360, 461, 453, 453, 100, 100, 184, 184, - 453, 453, 453, 453, 100, 100, 293, 453, 453, 468, - 149, 75, 75, -215, -215, -215, -215, 16, -215, -34, - -215, -13, -215, -215, -215, -215, 4, -215, -215, 84, - -215, 127, -215, -215, -215, 4, -215, 125, -215, -215, - 16, 126, -215, -215, -215, -215 + 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 +652,63 @@ static const yytype_int16 yypact[] = means the default is an error. */ static const yytype_uint8 yydefact[] = { - 174, 170, 0, 0, 73, 0, 3, 2, 4, 7, + 176, 172, 0, 0, 73, 0, 3, 2, 4, 7, 8, 6, 29, 30, 33, 34, 37, 35, 36, 72, - 32, 28, 0, 107, 113, 0, 0, 0, 38, 40, - 0, 42, 43, 44, 0, 49, 50, 51, 52, 0, - 101, 0, 46, 99, 108, 109, 110, 0, 120, 121, - 0, 1, 5, 31, 174, 174, 174, 106, 0, 122, - 112, 117, 0, 116, 111, 0, 0, 105, 0, 107, - 53, 0, 99, 39, 58, 174, 0, 48, 55, 56, - 57, 107, 102, 47, 100, 103, 45, 54, 123, 76, - 74, 16, 9, 11, 12, 0, 10, 24, 0, 23, - 22, 174, 20, 19, 119, 118, 114, 41, 100, 171, - 0, 168, 0, 0, 0, 0, 172, 173, 0, 0, - 0, 0, 0, 0, 174, 174, 128, 129, 0, 124, - 125, 126, 127, 0, 13, 15, 14, 21, 0, 27, - 0, 26, 0, 170, 0, 33, 59, 61, 67, 68, - 69, 65, 64, 137, 138, 139, 140, 134, 133, 135, - 136, 0, 169, 0, 0, 63, 0, 0, 0, 0, + 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, 0, 82, 174, 0, 0, 77, 79, 80, - 81, 25, 17, 115, 71, 171, 0, 132, 130, 131, - 152, 153, 154, 151, 157, 158, 159, 160, 147, 148, - 161, 162, 163, 164, 165, 166, 167, 155, 156, 150, - 149, 142, 141, 143, 144, 146, 145, 171, 95, 0, - 91, 0, 89, 94, 75, 78, 174, 62, 60, 170, - 98, 83, 87, 93, 96, 174, 86, 0, 85, 18, - 171, 0, 92, 90, 88, 84 + 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[] = { - -215, -215, -215, -215, 172, -215, -215, -215, 86, -215, - -215, -215, -215, 136, -215, -215, -215, 1, -59, -7, - -105, -215, 0, -215, -215, -11, -215, -215, -40, -215, - -215, -215, -215, -215, -215, -215, -215, -215, -215, -215, - -215, -24, -214, -215, -215, -215, 2, -215, -215, -215, - -215, -3, -215, -215, -215, -215, -215, -215, -215, -215, - -77, -58, -55, -215, 33, 22, 57, -215, -22, 3, - -215, -215, -215, -215, -215, 143, -215, 142, 200, -215, - -215, 132, 97, -215, 88, -215, -202, -215, -215, -23 + -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, 246, 101, 56, 98, 99, 140, 162, 12, 13, - 14, 15, 126, 28, 29, 30, 31, 32, 33, 17, - 34, 35, 36, 37, 77, 78, 109, 206, 146, 79, - 80, 147, 148, 149, 150, 18, 127, 50, 133, 90, - 196, 197, 198, 237, 261, 199, 200, 251, 241, 239, - 252, 242, 240, 253, 38, 66, 40, 41, 42, 67, - 44, 45, 46, 62, 142, 64, 60, 61, 68, 48, - 49, 243, 129, 130, 163, 20, 151, 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,113 +716,123 @@ static const yytype_int16 yydefgoto[] = number is the opposite. If YYTABLE_NINF, syntax error. */ static const yytype_int16 yytable[] = { - 16, 11, 19, 106, 145, 53, 43, 86, 1, 23, - 1, 91, 16, 57, 19, 65, 255, 83, 143, 256, - 249, -105, 57, 250, 22, 39, 54, 55, 86, 51, - 72, 96, 100, 103, 244, 254, 2, 257, 63, 89, - 23, 73, 84, 258, 83, 23, 250, 69, 85, 71, - 43, 81, 2, 24, -174, 3, 25, 3, 254, 58, - 70, 4, 16, 4, 19, 3, 59, 3, 58, 39, - 135, 4, -104, 4, 108, 16, 110, 19, 141, 193, - 87, -66, -66, 194, 24, 204, 195, 25, 26, 24, - 27, 24, 25, 26, 25, 24, 82, 74, 25, 53, - 145, 75, 144, 193, 76, 91, 16, 194, 19, 16, - 195, 19, 88, 169, 189, 190, 191, 192, 174, 175, - -70, -70, 97, 82, 16, 16, 19, 19, 82, 111, - 182, 55, 145, -97, -97, 185, 186, 187, 188, 189, - 190, 191, 192, 58, 16, -104, 19, 107, 137, 136, - -15, 112, 113, 114, 115, 145, 116, 117, 138, 139, - 152, 165, 118, 119, 201, 203, 202, 174, 175, 120, - 121, 205, 208, 248, 209, 265, 122, 260, 52, 134, - 123, 247, 4, 264, 124, 125, 187, 188, 189, 190, - 191, 192, 102, 245, 16, 238, 19, 53, 144, 263, - 262, 104, 105, 47, 16, 16, 19, 19, 128, 153, - 154, 155, 156, 164, 0, 157, 158, 159, 160, 0, - 161, 187, 188, 189, 190, 191, 192, 0, 0, 0, - 144, 0, 0, 0, 0, 0, 0, 16, 0, 19, - 0, 0, 0, 0, 0, 0, 16, 259, 19, 0, - 0, 0, 0, 144, 0, 16, 238, 19, 0, 0, - 16, 0, 19, 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, 235, 236, - 166, 167, 168, 169, 170, 171, 172, 173, 174, 175, - 176, 177, 178, 179, 180, 181, 169, 0, 0, 0, - 182, 174, 175, 183, 184, 185, 186, 187, 188, 189, - 190, 191, 192, 0, 0, 0, 0, 0, 185, 186, - 187, 188, 189, 190, 191, 192, 207, 166, 167, 168, - 169, 170, 171, 172, 173, 174, 175, 176, 177, 178, - 179, 180, 181, 0, 0, 0, 0, 182, 0, 0, - 183, 184, 185, 186, 187, 188, 189, 190, 191, 192, - 166, 167, 0, 169, 170, 171, 172, 173, 174, 175, - 176, 177, 178, 179, 180, 181, 0, 0, 0, 0, - 182, 0, 0, 183, 184, 185, 186, 187, 188, 189, - 190, 191, 192, 166, 0, 0, 169, 170, 171, 172, - 173, 174, 175, 176, 177, 178, 179, 180, 181, 0, - 0, 0, 0, 182, 0, 0, 183, 184, 185, 186, - 187, 188, 189, 190, 191, 192, 169, 170, 171, 172, - 173, 174, 175, 176, 177, 178, 179, 180, 181, 0, - 0, 0, 0, 182, 0, 0, 183, 184, 185, 186, - 187, 188, 189, 190, 191, 192, 169, 0, 0, 172, - 173, 174, 175, 0, 0, 0, 0, 180, 181, 174, - 175, 0, 0, 182, 0, 0, 174, 175, 185, 186, - 187, 188, 189, 190, 191, 192, 185, 186, 187, 188, - 189, 190, 191, 192, 186, 187, 188, 189, 190, 191, - 192 + 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, 62, 109, 12, 3, 47, 4, 4, - 4, 4, 12, 5, 12, 26, 50, 39, 4, 53, - 4, 3, 5, 237, 4, 3, 47, 48, 68, 0, - 27, 54, 55, 56, 3, 237, 46, 50, 4, 50, - 4, 3, 39, 56, 66, 4, 260, 4, 54, 27, - 47, 4, 46, 48, 47, 51, 51, 51, 260, 51, - 27, 57, 62, 57, 62, 51, 58, 51, 51, 47, - 93, 57, 54, 57, 71, 75, 75, 75, 101, 48, - 47, 49, 50, 52, 48, 144, 55, 51, 52, 48, - 54, 48, 51, 52, 51, 48, 39, 48, 51, 106, - 205, 52, 109, 48, 55, 4, 106, 52, 106, 109, - 55, 109, 58, 13, 39, 40, 41, 42, 18, 19, - 49, 50, 4, 66, 124, 125, 124, 125, 71, 4, - 30, 48, 237, 49, 50, 35, 36, 37, 38, 39, - 40, 41, 42, 51, 144, 54, 144, 53, 49, 47, - 47, 26, 27, 28, 29, 260, 31, 32, 50, 4, - 53, 56, 37, 38, 4, 49, 47, 18, 19, 44, - 45, 50, 59, 49, 60, 49, 51, 50, 6, 93, - 55, 205, 57, 260, 59, 60, 37, 38, 39, 40, - 41, 42, 56, 196, 194, 194, 194, 204, 205, 257, - 255, 58, 60, 3, 204, 205, 204, 205, 76, 112, - 113, 114, 115, 125, -1, 118, 119, 120, 121, -1, - 123, 37, 38, 39, 40, 41, 42, -1, -1, -1, - 237, -1, -1, -1, -1, -1, -1, 237, -1, 237, - -1, -1, -1, -1, -1, -1, 246, 246, 246, -1, - -1, -1, -1, 260, -1, 255, 255, 255, -1, -1, - 260, -1, 260, 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, 192, - 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, -1, -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, -1, -1, -1, 24, 25, 18, - 19, -1, -1, 30, -1, -1, 18, 19, 35, 36, - 37, 38, 39, 40, 41, 42, 35, 36, 37, 38, - 39, 40, 41, 42, 36, 37, 38, 39, 40, 41, + 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 }; @@ -824,31 +842,31 @@ static const yytype_uint8 yystos[] = { 0, 4, 46, 51, 57, 62, 63, 64, 65, 66, 71, 78, 79, 80, 81, 82, 83, 90, 106, 107, - 146, 150, 4, 4, 48, 51, 52, 54, 84, 85, - 86, 87, 88, 89, 91, 92, 93, 94, 125, 126, - 127, 128, 129, 130, 131, 132, 133, 139, 140, 141, - 108, 0, 65, 80, 47, 48, 74, 5, 51, 58, - 137, 138, 134, 4, 136, 86, 126, 130, 139, 4, - 125, 126, 130, 3, 48, 52, 55, 95, 96, 100, - 101, 4, 127, 129, 130, 54, 89, 125, 58, 86, - 110, 4, 67, 68, 69, 70, 150, 4, 75, 76, - 150, 73, 74, 150, 136, 138, 79, 53, 130, 97, - 78, 4, 26, 27, 28, 29, 31, 32, 37, 38, - 44, 45, 51, 55, 59, 60, 83, 107, 142, 143, - 144, 148, 149, 109, 69, 150, 47, 49, 50, 4, - 77, 150, 135, 4, 80, 81, 99, 102, 103, 104, - 105, 147, 53, 143, 143, 143, 143, 143, 143, 143, - 143, 143, 78, 145, 145, 56, 10, 11, 12, 13, + 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, 48, 52, 55, 111, 112, 113, 116, - 117, 4, 47, 49, 79, 50, 98, 56, 59, 60, - 143, 143, 143, 143, 143, 143, 143, 143, 143, 143, - 143, 143, 143, 143, 143, 143, 143, 143, 143, 143, - 143, 143, 143, 143, 143, 143, 143, 114, 78, 120, - 123, 119, 122, 142, 3, 112, 72, 102, 49, 4, - 103, 118, 121, 124, 147, 50, 53, 50, 56, 78, - 50, 115, 123, 122, 121, 49 + 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. */ @@ -865,13 +883,13 @@ static const yytype_uint8 yyr1[] = 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, 131, 132, 134, 135, 133, 136, 137, 137, 138, - 139, 139, 140, 141, 142, 143, 143, 143, 143, 143, - 143, 143, 143, 143, 143, 143, 143, 143, 143, 143, - 143, 143, 143, 143, 143, 143, 143, 143, 143, 143, - 143, 143, 143, 143, 143, 143, 143, 143, 143, 143, - 143, 143, 143, 143, 143, 143, 143, 143, 144, 145, - 146, 147, 148, 149, 150 + 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. */ @@ -888,13 +906,13 @@ static const yytype_uint8 yyr2[] = 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, 3, 3, 3, 3, 3, 3, 3, 3, + 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, 1, 1, - 1, 0, 1, 1, 0 + 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, + 1, 1, 1, 0, 1, 1, 0 }; @@ -1591,7 +1609,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 1595 "compile.tab.C" /* yacc.c:1652 */ +#line 1608 "compile.tab.C" /* yacc.c:1652 */ break; case 9: @@ -1611,7 +1629,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; @@ -1666,13 +1684,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 1670 "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 1676 "compile.tab.C" /* yacc.c:1652 */ +#line 1689 "compile.tab.C" /* yacc.c:1652 */ break; case 17: @@ -1715,7 +1733,7 @@ yyreduce: *reinterpret_cast(&yyval)=method; } -#line 1719 "compile.tab.C" /* yacc.c:1652 */ +#line 1732 "compile.tab.C" /* yacc.c:1652 */ break; case 18: @@ -1729,25 +1747,25 @@ yyreduce: const String& name=*LA2S(*yyvsp[-6]); PC.cclass->set_method(PC.alias_method(name), method); } -#line 1733 "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 1739 "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 1745 "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 1751 "compile.tab.C" /* yacc.c:1652 */ +#line 1764 "compile.tab.C" /* yacc.c:1652 */ break; case 37: @@ -1783,19 +1801,19 @@ yyreduce: P(*yyval, *code); } -#line 1787 "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 1793 "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 1799 "compile.tab.C" /* yacc.c:1652 */ +#line 1812 "compile.tab.C" /* yacc.c:1652 */ break; case 44: @@ -1849,19 +1867,19 @@ yyreduce: #endif /* diving code; stack: current context */ } -#line 1853 "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 1859 "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 1865 "compile.tab.C" /* yacc.c:1652 */ +#line 1878 "compile.tab.C" /* yacc.c:1652 */ break; case 48: @@ -1878,7 +1896,7 @@ yyreduce: P(*yyval, *yyvsp[0]); /* stack: context,name,constructor_value */ } } -#line 1882 "compile.tab.C" /* yacc.c:1652 */ +#line 1895 "compile.tab.C" /* yacc.c:1652 */ break; case 52: @@ -1905,7 +1923,7 @@ yyreduce: } /* diving code; stack: current context */ } -#line 1909 "compile.tab.C" /* yacc.c:1652 */ +#line 1922 "compile.tab.C" /* yacc.c:1652 */ break; case 53: @@ -1915,13 +1933,13 @@ yyreduce: O(*yyval, OP::OP_WITH_WRITE); /* stack: starting context */ P(*yyval, *yyvsp[0]); /* diving code; stack: context,name */ } -#line 1919 "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 1925 "compile.tab.C" /* yacc.c:1652 */ +#line 1938 "compile.tab.C" /* yacc.c:1652 */ break; case 58: @@ -1931,7 +1949,7 @@ yyreduce: *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 1935 "compile.tab.C" /* yacc.c:1652 */ +#line 1948 "compile.tab.C" /* yacc.c:1652 */ break; case 59: @@ -1939,7 +1957,7 @@ yyreduce: { PC.explicit_result=*reinterpret_cast(&yyvsp[-1]); } -#line 1943 "compile.tab.C" /* yacc.c:1652 */ +#line 1956 "compile.tab.C" /* yacc.c:1652 */ break; case 60: @@ -1955,19 +1973,19 @@ yyreduce: PC.array=false; } } -#line 1959 "compile.tab.C" /* yacc.c:1652 */ +#line 1972 "compile.tab.C" /* yacc.c:1652 */ break; case 61: #line 459 "compile.y" /* yacc.c:1652 */ { yyval = yyvsp[0]; } -#line 1965 "compile.tab.C" /* yacc.c:1652 */ +#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 1971 "compile.tab.C" /* yacc.c:1652 */ +#line 1984 "compile.tab.C" /* yacc.c:1652 */ break; case 63: @@ -1978,7 +1996,7 @@ yyreduce: 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 1982 "compile.tab.C" /* yacc.c:1652 */ +#line 1995 "compile.tab.C" /* yacc.c:1652 */ break; case 64: @@ -1988,7 +2006,7 @@ yyreduce: yyval=N(); OA(*yyval, OP::OP_CURLY_CODE__CONSTRUCT, yyvsp[-1]); /* code=pop; name=pop; context=pop; construct(context,name,junction(code)) */ } -#line 1992 "compile.tab.C" /* yacc.c:1652 */ +#line 2005 "compile.tab.C" /* yacc.c:1652 */ break; case 68: @@ -1999,13 +2017,13 @@ yyreduce: /* some code that writes to that context */ /* context=pop; stack: context.value() */ } -#line 2003 "compile.tab.C" /* yacc.c:1652 */ +#line 2016 "compile.tab.C" /* yacc.c:1652 */ break; case 71: #line 487 "compile.y" /* yacc.c:1652 */ { yyval=yyvsp[-1]; P(*yyval, *yyvsp[0]); } -#line 2009 "compile.tab.C" /* yacc.c:1652 */ +#line 2022 "compile.tab.C" /* yacc.c:1652 */ break; case 72: @@ -2021,7 +2039,7 @@ 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 2025 "compile.tab.C" /* yacc.c:1652 */ +#line 2038 "compile.tab.C" /* yacc.c:1652 */ break; case 73: @@ -2029,7 +2047,7 @@ yyreduce: { PC.in_call_value=true; } -#line 2033 "compile.tab.C" /* yacc.c:1652 */ +#line 2046 "compile.tab.C" /* yacc.c:1652 */ break; case 74: @@ -2037,7 +2055,7 @@ yyreduce: { PC.in_call_value=false; } -#line 2041 "compile.tab.C" /* yacc.c:1652 */ +#line 2054 "compile.tab.C" /* yacc.c:1652 */ break; case 75: @@ -2087,7 +2105,7 @@ yyreduce: } } } -#line 2091 "compile.tab.C" /* yacc.c:1652 */ +#line 2104 "compile.tab.C" /* yacc.c:1652 */ break; case 76: @@ -2107,13 +2125,13 @@ yyreduce: } #endif } -#line 2111 "compile.tab.C" /* yacc.c:1652 */ +#line 2124 "compile.tab.C" /* yacc.c:1652 */ break; case 78: #line 570 "compile.y" /* yacc.c:1652 */ { yyval=yyvsp[-1]; P(*yyval, *yyvsp[0]); } -#line 2117 "compile.tab.C" /* yacc.c:1652 */ +#line 2130 "compile.tab.C" /* yacc.c:1652 */ break; case 82: @@ -2122,7 +2140,7 @@ yyreduce: // allow ^call[ letters here any time ] *reinterpret_cast(&yyval)=PC.explicit_result; PC.explicit_result=false; } -#line 2126 "compile.tab.C" /* yacc.c:1652 */ +#line 2139 "compile.tab.C" /* yacc.c:1652 */ break; case 83: @@ -2130,43 +2148,43 @@ yyreduce: { PC.explicit_result=*reinterpret_cast(&yyvsp[-1]); } -#line 2134 "compile.tab.C" /* yacc.c:1652 */ +#line 2147 "compile.tab.C" /* yacc.c:1652 */ break; case 84: #line 581 "compile.y" /* yacc.c:1652 */ {yyval=yyvsp[-2];} -#line 2140 "compile.tab.C" /* yacc.c:1652 */ +#line 2153 "compile.tab.C" /* yacc.c:1652 */ break; case 85: #line 582 "compile.y" /* yacc.c:1652 */ {yyval=yyvsp[-1];} -#line 2146 "compile.tab.C" /* yacc.c:1652 */ +#line 2159 "compile.tab.C" /* yacc.c:1652 */ break; case 86: #line 583 "compile.y" /* yacc.c:1652 */ {yyval=yyvsp[-1];} -#line 2152 "compile.tab.C" /* yacc.c:1652 */ +#line 2165 "compile.tab.C" /* yacc.c:1652 */ break; case 88: #line 586 "compile.y" /* yacc.c:1652 */ { yyval=yyvsp[-2]; P(*yyval, *yyvsp[0]); } -#line 2158 "compile.tab.C" /* yacc.c:1652 */ +#line 2171 "compile.tab.C" /* yacc.c:1652 */ break; case 90: #line 590 "compile.y" /* yacc.c:1652 */ { yyval=yyvsp[-2]; P(*yyval, *yyvsp[0]); } -#line 2164 "compile.tab.C" /* yacc.c:1652 */ +#line 2177 "compile.tab.C" /* yacc.c:1652 */ break; case 92: #line 594 "compile.y" /* yacc.c:1652 */ { yyval=yyvsp[-2]; P(*yyval, *yyvsp[0]); } -#line 2170 "compile.tab.C" /* yacc.c:1652 */ +#line 2183 "compile.tab.C" /* yacc.c:1652 */ break; case 93: @@ -2174,7 +2192,7 @@ yyreduce: { yyval=yyvsp[0]; } -#line 2178 "compile.tab.C" /* yacc.c:1652 */ +#line 2191 "compile.tab.C" /* yacc.c:1652 */ break; case 94: @@ -2192,7 +2210,7 @@ yyreduce: OA(*yyval, OP::OP_EXPR_CODE__STORE_PARAM, code); } } -#line 2196 "compile.tab.C" /* yacc.c:1652 */ +#line 2209 "compile.tab.C" /* yacc.c:1652 */ break; case 95: @@ -2201,19 +2219,19 @@ yyreduce: yyval=N(); OA(*yyval, OP::OP_CURLY_CODE__STORE_PARAM, yyvsp[0]); } -#line 2205 "compile.tab.C" /* yacc.c:1652 */ +#line 2218 "compile.tab.C" /* yacc.c:1652 */ break; case 100: #line 624 "compile.y" /* yacc.c:1652 */ { yyval=yyvsp[-1]; P(*yyval, *yyvsp[0]); } -#line 2211 "compile.tab.C" /* yacc.c:1652 */ +#line 2224 "compile.tab.C" /* yacc.c:1652 */ break; case 102: #line 626 "compile.y" /* yacc.c:1652 */ { yyval=yyvsp[-1]; P(*yyval, *yyvsp[0]); } -#line 2217 "compile.tab.C" /* yacc.c:1652 */ +#line 2230 "compile.tab.C" /* yacc.c:1652 */ break; case 104: @@ -2230,7 +2248,7 @@ yyreduce: O(*yyval, OP::OP_GET_ELEMENT); /* name=pop; context=pop; stack: context.get_element(name) */ #endif } -#line 2234 "compile.tab.C" /* yacc.c:1652 */ +#line 2247 "compile.tab.C" /* yacc.c:1652 */ break; case 105: @@ -2244,20 +2262,20 @@ yyreduce: O(*yyval, OP::OP_GET_ELEMENT); /* name=pop; context=pop; stack: context.get_element(name) */ #endif } -#line 2248 "compile.tab.C" /* yacc.c:1652 */ +#line 2261 "compile.tab.C" /* yacc.c:1652 */ break; - case 111: -#line 657 "compile.y" /* yacc.c:1652 */ + case 112: +#line 658 "compile.y" /* yacc.c:1652 */ { yyval=yyvsp[0]; O(*yyval, OP::OP_GET_ELEMENT); } -#line 2257 "compile.tab.C" /* yacc.c:1652 */ +#line 2270 "compile.tab.C" /* yacc.c:1652 */ break; - case 112: -#line 661 "compile.y" /* yacc.c:1652 */ + case 113: +#line 662 "compile.y" /* yacc.c:1652 */ { YYSTYPE code; { @@ -2267,69 +2285,75 @@ yyreduce: yyval=N(); OA(*yyval, OP::OP_STRING_POOL, code); } -#line 2271 "compile.tab.C" /* yacc.c:1652 */ +#line 2284 "compile.tab.C" /* yacc.c:1652 */ break; - case 113: -#line 670 "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 2280 "compile.tab.C" /* yacc.c:1652 */ +#line 2293 "compile.tab.C" /* yacc.c:1652 */ break; - case 114: -#line 673 "compile.y" /* yacc.c:1652 */ + case 115: +#line 674 "compile.y" /* yacc.c:1652 */ { PC.explicit_result=*reinterpret_cast(&yyvsp[-1]); } -#line 2288 "compile.tab.C" /* yacc.c:1652 */ +#line 2301 "compile.tab.C" /* yacc.c:1652 */ break; - case 115: -#line 675 "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 2304 "compile.tab.C" /* yacc.c:1652 */ +#line 2314 "compile.tab.C" /* yacc.c:1652 */ break; - case 116: -#line 686 "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 2314 "compile.tab.C" /* yacc.c:1652 */ +#line 2333 "compile.tab.C" /* yacc.c:1652 */ break; - case 118: -#line 691 "compile.y" /* yacc.c:1652 */ + case 120: +#line 693 "compile.y" /* yacc.c:1652 */ { yyval=yyvsp[-1]; P(*yyval, *yyvsp[0]); } -#line 2320 "compile.tab.C" /* yacc.c:1652 */ +#line 2339 "compile.tab.C" /* yacc.c:1652 */ break; - case 119: -#line 692 "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 2329 "compile.tab.C" /* yacc.c:1652 */ +#line 2348 "compile.tab.C" /* yacc.c:1652 */ break; - case 122: -#line 701 "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; @@ -2349,259 +2373,259 @@ yyreduce: // optimized OP_VALUE+origin+string+OP_GET_CLASS => OP_VALUE__GET_CLASS+origin+string change_first(*yyval, OP::OP_VALUE, code); } -#line 2353 "compile.tab.C" /* yacc.c:1652 */ +#line 2372 "compile.tab.C" /* yacc.c:1652 */ break; - case 123: -#line 720 "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 2364 "compile.tab.C" /* yacc.c:1652 */ - break; - - case 130: -#line 737 "compile.y" /* yacc.c:1652 */ - { yyval = yyvsp[-1]; } -#line 2370 "compile.tab.C" /* yacc.c:1652 */ - break; - - case 131: -#line 738 "compile.y" /* yacc.c:1652 */ - { yyval = yyvsp[-1]; } -#line 2376 "compile.tab.C" /* yacc.c:1652 */ +#line 2383 "compile.tab.C" /* yacc.c:1652 */ break; case 132: #line 739 "compile.y" /* yacc.c:1652 */ { yyval = yyvsp[-1]; } -#line 2382 "compile.tab.C" /* yacc.c:1652 */ +#line 2389 "compile.tab.C" /* yacc.c:1652 */ break; case 133: -#line 741 "compile.y" /* yacc.c:1652 */ - { yyval=yyvsp[0]; O(*yyval, OP::OP_NEG); } -#line 2388 "compile.tab.C" /* yacc.c:1652 */ +#line 740 "compile.y" /* yacc.c:1652 */ + { yyval = yyvsp[-1]; } +#line 2395 "compile.tab.C" /* yacc.c:1652 */ break; case 134: -#line 742 "compile.y" /* yacc.c:1652 */ - { yyval=yyvsp[0]; } -#line 2394 "compile.tab.C" /* yacc.c:1652 */ +#line 741 "compile.y" /* yacc.c:1652 */ + { yyval = yyvsp[-1]; } +#line 2401 "compile.tab.C" /* yacc.c:1652 */ break; case 135: #line 743 "compile.y" /* yacc.c:1652 */ - { yyval=yyvsp[0]; O(*yyval, OP::OP_INV); } -#line 2400 "compile.tab.C" /* yacc.c:1652 */ + { yyval=yyvsp[0]; O(*yyval, OP::OP_NEG); } +#line 2407 "compile.tab.C" /* yacc.c:1652 */ break; case 136: #line 744 "compile.y" /* yacc.c:1652 */ - { yyval=yyvsp[0]; O(*yyval, OP::OP_NOT); } -#line 2406 "compile.tab.C" /* yacc.c:1652 */ + { yyval=yyvsp[0]; } +#line 2413 "compile.tab.C" /* yacc.c:1652 */ break; case 137: #line 745 "compile.y" /* yacc.c:1652 */ - { yyval=yyvsp[0]; O(*yyval, OP::OP_DEF); } -#line 2412 "compile.tab.C" /* yacc.c:1652 */ + { yyval=yyvsp[0]; O(*yyval, OP::OP_INV); } +#line 2419 "compile.tab.C" /* yacc.c:1652 */ break; case 138: #line 746 "compile.y" /* yacc.c:1652 */ - { yyval=yyvsp[0]; O(*yyval, OP::OP_IN); } -#line 2418 "compile.tab.C" /* yacc.c:1652 */ + { yyval=yyvsp[0]; O(*yyval, OP::OP_NOT); } +#line 2425 "compile.tab.C" /* yacc.c:1652 */ break; case 139: #line 747 "compile.y" /* yacc.c:1652 */ - { yyval=yyvsp[0]; O(*yyval, OP::OP_FEXISTS); } -#line 2424 "compile.tab.C" /* yacc.c:1652 */ + { yyval=yyvsp[0]; O(*yyval, OP::OP_DEF); } +#line 2431 "compile.tab.C" /* yacc.c:1652 */ break; case 140: #line 748 "compile.y" /* yacc.c:1652 */ - { yyval=yyvsp[0]; O(*yyval, OP::OP_DEXISTS); } -#line 2430 "compile.tab.C" /* yacc.c:1652 */ + { yyval=yyvsp[0]; O(*yyval, OP::OP_IN); } +#line 2437 "compile.tab.C" /* yacc.c:1652 */ break; case 141: -#line 750 "compile.y" /* yacc.c:1652 */ - { yyval=yyvsp[-2]; P(*yyval, *yyvsp[0]); O(*yyval, OP::OP_SUB); } -#line 2436 "compile.tab.C" /* yacc.c:1652 */ +#line 749 "compile.y" /* yacc.c:1652 */ + { yyval=yyvsp[0]; O(*yyval, OP::OP_FEXISTS); } +#line 2443 "compile.tab.C" /* yacc.c:1652 */ break; case 142: -#line 751 "compile.y" /* yacc.c:1652 */ - { yyval=yyvsp[-2]; P(*yyval, *yyvsp[0]); O(*yyval, OP::OP_ADD); } -#line 2442 "compile.tab.C" /* yacc.c:1652 */ +#line 750 "compile.y" /* yacc.c:1652 */ + { yyval=yyvsp[0]; O(*yyval, OP::OP_DEXISTS); } +#line 2449 "compile.tab.C" /* yacc.c:1652 */ break; case 143: #line 752 "compile.y" /* yacc.c:1652 */ - { yyval=yyvsp[-2]; P(*yyval, *yyvsp[0]); O(*yyval, OP::OP_MUL); } -#line 2448 "compile.tab.C" /* yacc.c:1652 */ + { yyval=yyvsp[-2]; P(*yyval, *yyvsp[0]); O(*yyval, OP::OP_SUB); } +#line 2455 "compile.tab.C" /* yacc.c:1652 */ break; case 144: #line 753 "compile.y" /* yacc.c:1652 */ - { yyval=yyvsp[-2]; P(*yyval, *yyvsp[0]); O(*yyval, OP::OP_DIV); } -#line 2454 "compile.tab.C" /* yacc.c:1652 */ + { yyval=yyvsp[-2]; P(*yyval, *yyvsp[0]); O(*yyval, OP::OP_ADD); } +#line 2461 "compile.tab.C" /* yacc.c:1652 */ break; case 145: #line 754 "compile.y" /* yacc.c:1652 */ - { yyval=yyvsp[-2]; P(*yyval, *yyvsp[0]); O(*yyval, OP::OP_MOD); } -#line 2460 "compile.tab.C" /* yacc.c:1652 */ + { yyval=yyvsp[-2]; P(*yyval, *yyvsp[0]); O(*yyval, OP::OP_MUL); } +#line 2467 "compile.tab.C" /* yacc.c:1652 */ break; case 146: #line 755 "compile.y" /* yacc.c:1652 */ - { yyval=yyvsp[-2]; P(*yyval, *yyvsp[0]); O(*yyval, OP::OP_INTDIV); } -#line 2466 "compile.tab.C" /* yacc.c:1652 */ + { yyval=yyvsp[-2]; P(*yyval, *yyvsp[0]); O(*yyval, OP::OP_DIV); } +#line 2473 "compile.tab.C" /* yacc.c:1652 */ break; case 147: #line 756 "compile.y" /* yacc.c:1652 */ - { yyval=yyvsp[-2]; P(*yyval, *yyvsp[0]); O(*yyval, OP::OP_BIN_SL); } -#line 2472 "compile.tab.C" /* yacc.c:1652 */ + { yyval=yyvsp[-2]; P(*yyval, *yyvsp[0]); O(*yyval, OP::OP_MOD); } +#line 2479 "compile.tab.C" /* yacc.c:1652 */ break; case 148: #line 757 "compile.y" /* yacc.c:1652 */ - { yyval=yyvsp[-2]; P(*yyval, *yyvsp[0]); O(*yyval, OP::OP_BIN_SR); } -#line 2478 "compile.tab.C" /* yacc.c:1652 */ + { yyval=yyvsp[-2]; P(*yyval, *yyvsp[0]); O(*yyval, OP::OP_INTDIV); } +#line 2485 "compile.tab.C" /* yacc.c:1652 */ break; case 149: #line 758 "compile.y" /* yacc.c:1652 */ - { yyval=yyvsp[-2]; P(*yyval, *yyvsp[0]); O(*yyval, OP::OP_BIN_AND); } -#line 2484 "compile.tab.C" /* yacc.c:1652 */ + { yyval=yyvsp[-2]; P(*yyval, *yyvsp[0]); O(*yyval, OP::OP_BIN_SL); } +#line 2491 "compile.tab.C" /* yacc.c:1652 */ break; case 150: #line 759 "compile.y" /* yacc.c:1652 */ - { yyval=yyvsp[-2]; P(*yyval, *yyvsp[0]); O(*yyval, OP::OP_BIN_OR); } -#line 2490 "compile.tab.C" /* yacc.c:1652 */ + { yyval=yyvsp[-2]; P(*yyval, *yyvsp[0]); O(*yyval, OP::OP_BIN_SR); } +#line 2497 "compile.tab.C" /* yacc.c:1652 */ break; case 151: #line 760 "compile.y" /* yacc.c:1652 */ - { yyval=yyvsp[-2]; P(*yyval, *yyvsp[0]); O(*yyval, OP::OP_BIN_XOR); } -#line 2496 "compile.tab.C" /* yacc.c:1652 */ + { yyval=yyvsp[-2]; P(*yyval, *yyvsp[0]); O(*yyval, OP::OP_BIN_AND); } +#line 2503 "compile.tab.C" /* yacc.c:1652 */ break; case 152: #line 761 "compile.y" /* yacc.c:1652 */ - { yyval=yyvsp[-2]; OA(*yyval, OP::OP_NESTED_CODE, yyvsp[0]); O(*yyval, OP::OP_LOG_AND); } -#line 2502 "compile.tab.C" /* yacc.c:1652 */ + { yyval=yyvsp[-2]; P(*yyval, *yyvsp[0]); O(*yyval, OP::OP_BIN_OR); } +#line 2509 "compile.tab.C" /* yacc.c:1652 */ break; case 153: #line 762 "compile.y" /* yacc.c:1652 */ - { yyval=yyvsp[-2]; OA(*yyval, OP::OP_NESTED_CODE, yyvsp[0]); O(*yyval, OP::OP_LOG_OR); } -#line 2508 "compile.tab.C" /* yacc.c:1652 */ + { yyval=yyvsp[-2]; P(*yyval, *yyvsp[0]); O(*yyval, OP::OP_BIN_XOR); } +#line 2515 "compile.tab.C" /* yacc.c:1652 */ break; case 154: #line 763 "compile.y" /* yacc.c:1652 */ - { yyval=yyvsp[-2]; P(*yyval, *yyvsp[0]); O(*yyval, OP::OP_LOG_XOR); } -#line 2514 "compile.tab.C" /* yacc.c:1652 */ + { yyval=yyvsp[-2]; OA(*yyval, OP::OP_NESTED_CODE, yyvsp[0]); O(*yyval, OP::OP_LOG_AND); } +#line 2521 "compile.tab.C" /* yacc.c:1652 */ break; case 155: #line 764 "compile.y" /* yacc.c:1652 */ - { yyval=yyvsp[-2]; P(*yyval, *yyvsp[0]); O(*yyval, OP::OP_NUM_LT); } -#line 2520 "compile.tab.C" /* yacc.c:1652 */ + { yyval=yyvsp[-2]; OA(*yyval, OP::OP_NESTED_CODE, yyvsp[0]); O(*yyval, OP::OP_LOG_OR); } +#line 2527 "compile.tab.C" /* yacc.c:1652 */ break; case 156: #line 765 "compile.y" /* yacc.c:1652 */ - { yyval=yyvsp[-2]; P(*yyval, *yyvsp[0]); O(*yyval, OP::OP_NUM_GT); } -#line 2526 "compile.tab.C" /* yacc.c:1652 */ + { yyval=yyvsp[-2]; P(*yyval, *yyvsp[0]); O(*yyval, OP::OP_LOG_XOR); } +#line 2533 "compile.tab.C" /* yacc.c:1652 */ break; case 157: #line 766 "compile.y" /* yacc.c:1652 */ - { yyval=yyvsp[-2]; P(*yyval, *yyvsp[0]); O(*yyval, OP::OP_NUM_LE); } -#line 2532 "compile.tab.C" /* yacc.c:1652 */ + { yyval=yyvsp[-2]; P(*yyval, *yyvsp[0]); O(*yyval, OP::OP_NUM_LT); } +#line 2539 "compile.tab.C" /* yacc.c:1652 */ break; case 158: #line 767 "compile.y" /* yacc.c:1652 */ - { yyval=yyvsp[-2]; P(*yyval, *yyvsp[0]); O(*yyval, OP::OP_NUM_GE); } -#line 2538 "compile.tab.C" /* yacc.c:1652 */ + { yyval=yyvsp[-2]; P(*yyval, *yyvsp[0]); O(*yyval, OP::OP_NUM_GT); } +#line 2545 "compile.tab.C" /* yacc.c:1652 */ break; case 159: #line 768 "compile.y" /* yacc.c:1652 */ - { yyval=yyvsp[-2]; P(*yyval, *yyvsp[0]); O(*yyval, OP::OP_NUM_EQ); } -#line 2544 "compile.tab.C" /* yacc.c:1652 */ + { yyval=yyvsp[-2]; P(*yyval, *yyvsp[0]); O(*yyval, OP::OP_NUM_LE); } +#line 2551 "compile.tab.C" /* yacc.c:1652 */ break; case 160: #line 769 "compile.y" /* yacc.c:1652 */ - { yyval=yyvsp[-2]; P(*yyval, *yyvsp[0]); O(*yyval, OP::OP_NUM_NE); } -#line 2550 "compile.tab.C" /* yacc.c:1652 */ + { yyval=yyvsp[-2]; P(*yyval, *yyvsp[0]); O(*yyval, OP::OP_NUM_GE); } +#line 2557 "compile.tab.C" /* yacc.c:1652 */ break; case 161: #line 770 "compile.y" /* yacc.c:1652 */ - { yyval=yyvsp[-2]; P(*yyval, *yyvsp[0]); O(*yyval, OP::OP_STR_LT); } -#line 2556 "compile.tab.C" /* yacc.c:1652 */ + { yyval=yyvsp[-2]; P(*yyval, *yyvsp[0]); O(*yyval, OP::OP_NUM_EQ); } +#line 2563 "compile.tab.C" /* yacc.c:1652 */ break; case 162: #line 771 "compile.y" /* yacc.c:1652 */ - { yyval=yyvsp[-2]; P(*yyval, *yyvsp[0]); O(*yyval, OP::OP_STR_GT); } -#line 2562 "compile.tab.C" /* yacc.c:1652 */ + { yyval=yyvsp[-2]; P(*yyval, *yyvsp[0]); O(*yyval, OP::OP_NUM_NE); } +#line 2569 "compile.tab.C" /* yacc.c:1652 */ break; case 163: #line 772 "compile.y" /* yacc.c:1652 */ - { yyval=yyvsp[-2]; P(*yyval, *yyvsp[0]); O(*yyval, OP::OP_STR_LE); } -#line 2568 "compile.tab.C" /* yacc.c:1652 */ + { yyval=yyvsp[-2]; P(*yyval, *yyvsp[0]); O(*yyval, OP::OP_STR_LT); } +#line 2575 "compile.tab.C" /* yacc.c:1652 */ break; case 164: #line 773 "compile.y" /* yacc.c:1652 */ - { yyval=yyvsp[-2]; P(*yyval, *yyvsp[0]); O(*yyval, OP::OP_STR_GE); } -#line 2574 "compile.tab.C" /* yacc.c:1652 */ + { yyval=yyvsp[-2]; P(*yyval, *yyvsp[0]); O(*yyval, OP::OP_STR_GT); } +#line 2581 "compile.tab.C" /* yacc.c:1652 */ break; case 165: #line 774 "compile.y" /* yacc.c:1652 */ - { yyval=yyvsp[-2]; P(*yyval, *yyvsp[0]); O(*yyval, OP::OP_STR_EQ); } -#line 2580 "compile.tab.C" /* yacc.c:1652 */ + { yyval=yyvsp[-2]; P(*yyval, *yyvsp[0]); O(*yyval, OP::OP_STR_LE); } +#line 2587 "compile.tab.C" /* yacc.c:1652 */ break; case 166: #line 775 "compile.y" /* yacc.c:1652 */ - { yyval=yyvsp[-2]; P(*yyval, *yyvsp[0]); O(*yyval, OP::OP_STR_NE); } -#line 2586 "compile.tab.C" /* yacc.c:1652 */ + { yyval=yyvsp[-2]; P(*yyval, *yyvsp[0]); O(*yyval, OP::OP_STR_GE); } +#line 2593 "compile.tab.C" /* yacc.c:1652 */ break; case 167: #line 776 "compile.y" /* yacc.c:1652 */ - { yyval=yyvsp[-2]; P(*yyval, *yyvsp[0]); O(*yyval, OP::OP_IS); } -#line 2592 "compile.tab.C" /* yacc.c:1652 */ + { yyval=yyvsp[-2]; P(*yyval, *yyvsp[0]); O(*yyval, OP::OP_STR_EQ); } +#line 2599 "compile.tab.C" /* yacc.c:1652 */ break; case 168: -#line 779 "compile.y" /* yacc.c:1652 */ +#line 777 "compile.y" /* yacc.c:1652 */ + { yyval=yyvsp[-2]; P(*yyval, *yyvsp[0]); O(*yyval, OP::OP_STR_NE); } +#line 2605 "compile.tab.C" /* yacc.c:1652 */ + break; + + case 169: +#line 778 "compile.y" /* yacc.c:1652 */ + { yyval=yyvsp[-2]; P(*yyval, *yyvsp[0]); O(*yyval, OP::OP_IS); } +#line 2611 "compile.tab.C" /* yacc.c:1652 */ + break; + + 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 2601 "compile.tab.C" /* yacc.c:1652 */ +#line 2620 "compile.tab.C" /* yacc.c:1652 */ break; - case 169: -#line 784 "compile.y" /* yacc.c:1652 */ + case 171: +#line 786 "compile.y" /* yacc.c:1652 */ { #ifdef OPTIMIZE_BYTECODE_STRING_POOL // it brakes ^if(" 09 "){...} @@ -2620,44 +2644,44 @@ yyreduce: /* some code that writes to that context */ /* context=pop; stack: context.get_string() */ } -#line 2624 "compile.tab.C" /* yacc.c:1652 */ +#line 2643 "compile.tab.C" /* yacc.c:1652 */ break; - case 170: -#line 805 "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 2633 "compile.tab.C" /* yacc.c:1652 */ +#line 2652 "compile.tab.C" /* yacc.c:1652 */ break; - case 171: -#line 810 "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 2639 "compile.tab.C" /* yacc.c:1652 */ +#line 2658 "compile.tab.C" /* yacc.c:1652 */ break; - case 172: -#line 811 "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 2645 "compile.tab.C" /* yacc.c:1652 */ +#line 2664 "compile.tab.C" /* yacc.c:1652 */ break; - case 173: -#line 812 "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 2651 "compile.tab.C" /* yacc.c:1652 */ +#line 2670 "compile.tab.C" /* yacc.c:1652 */ break; - case 174: -#line 814 "compile.y" /* yacc.c:1652 */ + case 176: +#line 816 "compile.y" /* yacc.c:1652 */ { yyval=N(); } -#line 2657 "compile.tab.C" /* yacc.c:1652 */ +#line 2676 "compile.tab.C" /* yacc.c:1652 */ break; -#line 2661 "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 @@ -2888,7 +2912,7 @@ yyreturn: #endif return yyresult; } -#line 816 "compile.y" /* yacc.c:1918 */ +#line 818 "compile.y" /* yacc.c:1918 */ #endif @@ -3443,11 +3467,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; @@ -3456,7 +3479,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; @@ -3465,6 +3488,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; @@ -3488,6 +3520,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; @@ -3544,12 +3581,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; @@ -3562,6 +3598,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;