--- parser3/src/main/compile.tab.C 2015/10/26 01:21:57 1.166 +++ parser3/src/main/compile.tab.C 2017/02/07 22:00:40 1.178 @@ -67,13 +67,13 @@ /** @file Parser: compiler(lexical parser and grammar). - Copyright (c) 2001-2015 Art. Lebedev Studio (http://www.artlebedev.com) + Copyright (c) 2001-2017 Art. Lebedev Studio (http://www.artlebedev.com) Author: Alexander Petrosyan (http://design.ru/paf) */ -volatile const char * IDENT_COMPILE_Y = "$Id: compile.tab.C,v 1.166 2015/10/26 01:21:57 moko Exp $"; +volatile const char * IDENT_COMPILE_Y = "$Id: compile.tab.C,v 1.178 2017/02/07 22:00:40 moko Exp $"; /** @todo parser4: @@ -106,11 +106,9 @@ volatile const char * IDENT_COMPILE_Y = // defines +#define CLASS_NAME "CLASS" #define USE_CONTROL_METHOD_NAME "USE" #define OPTIONS_CONTROL_METHOD_NAME "OPTIONS" -#define OPTION_ALL_VARS_LOCAL_NAME "locals" -#define OPTION_PARTIAL_CLASS "partial" -#define REM_OPERATOR_NAME "rem" // forwards @@ -129,14 +127,20 @@ static const VString vempty; #define POOL (*PC.pool) #ifndef DOXYGEN -#define CLASS_ADD if(PC.class_add()){ \ - strncpy(PC.error, PC.cclass->name().cstr(), MAX_STRING/2); \ - strcat(PC.error, " - class is already defined"); \ - YYERROR; \ +#define CLASS_ADD if(PC.class_add()){ \ + strncpy(PC.error, PC.cclass->type(), MAX_STRING/2); \ + strcat(PC.error, " - class is already defined"); \ + YYERROR; \ +} + +#define PC_ERROR(header, value, footer){ \ + strcpy(PC.error, header); \ + strncat(PC.error, value, MAX_STRING/2); \ + strcat(PC.error, footer); \ } -#line 140 "compile.tab.C" /* yacc.c:339 */ +#line 144 "compile.tab.C" /* yacc.c:339 */ # ifndef YY_NULLPTR # if defined __cplusplus && 201103L <= __cplusplus @@ -175,31 +179,30 @@ extern int yydebug; BAD_HEX_LITERAL = 262, BAD_METHOD_DECL_START = 263, BAD_METHOD_PARAMETER_NAME_CHARACTER = 264, - BAD_NONWHITESPACE_CHARACTER_IN_EXPLICIT_RESULT_MODE = 265, - LAND = 266, - LOR = 267, - LXOR = 268, - NXOR = 269, - NLE = 270, - NGE = 271, - NEQ = 272, - NNE = 273, - NSL = 274, - NSR = 275, - SLT = 276, - SGT = 277, - SLE = 278, - SGE = 279, - SEQ = 280, - SNE = 281, - DEF = 282, - IN = 283, - FEXISTS = 284, - DEXISTS = 285, - IS = 286, - LITERAL_TRUE = 287, - LITERAL_FALSE = 288, - NUNARY = 289 + LAND = 265, + LOR = 266, + LXOR = 267, + NXOR = 268, + NLE = 269, + NGE = 270, + NEQ = 271, + NNE = 272, + NSL = 273, + NSR = 274, + SLT = 275, + SGT = 276, + SLE = 277, + SGE = 278, + SEQ = 279, + SNE = 280, + DEF = 281, + IN = 282, + FEXISTS = 283, + DEXISTS = 284, + IS = 285, + LITERAL_TRUE = 286, + LITERAL_FALSE = 287, + NUNARY = 288 }; #endif @@ -218,7 +221,7 @@ int yyparse (Parse_control* pc); /* Copy the second part of user declarations. */ -#line 222 "compile.tab.C" /* yacc.c:358 */ +#line 225 "compile.tab.C" /* yacc.c:358 */ #ifdef short # undef short @@ -460,10 +463,10 @@ union yyalloc /* YYFINAL -- State number of the termination state. */ #define YYFINAL 51 /* YYLAST -- Last index in YYTABLE. */ -#define YYLAST 470 +#define YYLAST 473 /* YYNTOKENS -- Number of terminals. */ -#define YYNTOKENS 62 +#define YYNTOKENS 61 /* YYNNTS -- Number of nonterminals. */ #define YYNNTS 89 /* YYNRULES -- Number of rules. */ @@ -474,7 +477,7 @@ union yyalloc /* YYTRANSLATE[YYX] -- Symbol number corresponding to YYX as returned by yylex, with out-of-bounds checking. */ #define YYUNDEFTOK 2 -#define YYMAXUTOK 289 +#define YYMAXUTOK 288 #define YYTRANSLATE(YYX) \ ((unsigned int) (YYX) <= YYMAXUTOK ? yytranslate[YYX] : YYUNDEFTOK) @@ -484,18 +487,18 @@ union yyalloc static const yytype_uint8 yytranslate[] = { 0, 2, 2, 2, 2, 2, 2, 2, 2, 2, - 48, 2, 2, 2, 2, 2, 2, 2, 2, 2, + 47, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, - 2, 2, 2, 46, 60, 2, 52, 43, 37, 61, - 56, 57, 40, 38, 2, 39, 55, 41, 2, 2, - 2, 2, 2, 2, 2, 2, 2, 2, 59, 51, - 34, 2, 35, 2, 47, 2, 2, 2, 2, 2, + 2, 2, 2, 45, 59, 2, 51, 42, 36, 60, + 55, 56, 39, 37, 2, 38, 54, 40, 2, 2, + 2, 2, 2, 2, 2, 2, 2, 2, 58, 50, + 33, 2, 34, 2, 46, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, - 2, 49, 42, 50, 58, 2, 2, 2, 2, 2, + 2, 48, 41, 49, 57, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, - 2, 2, 2, 53, 36, 54, 45, 2, 2, 2, + 2, 2, 2, 52, 35, 53, 44, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, @@ -511,31 +514,31 @@ static const yytype_uint8 yytranslate[] 2, 2, 2, 2, 2, 2, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, - 25, 26, 27, 28, 29, 30, 31, 32, 33, 44 + 25, 26, 27, 28, 29, 30, 31, 32, 43 }; #if YYDEBUG /* YYRLINE[YYN] -- Source line where rule number YYN was defined. */ static const yytype_uint16 yyrline[] = { - 0, 142, 142, 149, 151, 151, 152, 154, 154, 156, - 268, 268, 269, 269, 270, 271, 271, 273, 273, 321, - 321, 322, 323, 323, 324, 324, 326, 326, 330, 330, - 332, 332, 333, 333, 334, 334, 334, 338, 386, 387, - 387, 388, 390, 391, 392, 445, 446, 446, 450, 463, - 464, 465, 466, 492, 497, 500, 501, 502, 504, 507, - 504, 515, 523, 530, 531, 532, 534, 540, 541, 541, - 545, 558, 561, 558, 610, 626, 626, 628, 629, 630, - 632, 635, 632, 638, 639, 641, 642, 645, 646, 649, - 650, 652, 655, 669, 674, 675, 676, 681, 681, 683, - 683, 684, 685, 697, 706, 709, 710, 711, 712, 714, - 718, 727, 730, 727, 743, 748, 748, 749, 755, 756, - 758, 771, 783, 785, 786, 787, 788, 789, 790, 791, - 792, 794, 795, 796, 797, 798, 799, 800, 801, 803, - 804, 805, 806, 807, 808, 809, 810, 811, 812, 813, - 814, 815, 816, 817, 818, 819, 820, 821, 822, 823, - 824, 825, 826, 827, 828, 829, 832, 837, 858, 863, - 864, 865, 867 + 0, 145, 145, 149, 151, 151, 152, 154, 154, 156, + 243, 243, 244, 244, 245, 246, 246, 248, 248, 295, + 295, 296, 297, 297, 298, 298, 300, 300, 304, 304, + 306, 306, 307, 307, 308, 308, 308, 312, 343, 344, + 344, 345, 347, 348, 349, 398, 399, 399, 403, 416, + 417, 418, 419, 441, 446, 449, 450, 451, 453, 456, + 453, 464, 471, 478, 479, 480, 482, 488, 489, 489, + 493, 504, 507, 504, 556, 572, 572, 574, 575, 576, + 578, 581, 578, 584, 585, 587, 588, 591, 592, 595, + 596, 598, 601, 614, 619, 620, 621, 626, 626, 628, + 628, 629, 630, 642, 651, 654, 655, 656, 657, 659, + 663, 672, 675, 672, 688, 693, 693, 694, 700, 701, + 703, 723, 735, 737, 738, 739, 740, 741, 742, 743, + 744, 746, 747, 748, 749, 750, 751, 752, 753, 755, + 756, 757, 758, 759, 760, 761, 762, 763, 764, 765, + 766, 767, 768, 769, 770, 771, 772, 773, 774, 775, + 776, 777, 778, 779, 780, 781, 784, 789, 810, 815, + 816, 817, 819 }; #endif @@ -546,8 +549,7 @@ static const char *const yytname[] = { "$end", "error", "$undefined", "EON", "STRING", "BOGUS", "BAD_STRING_COMPARISON_OPERATOR", "BAD_HEX_LITERAL", - "BAD_METHOD_DECL_START", "BAD_METHOD_PARAMETER_NAME_CHARACTER", - "BAD_NONWHITESPACE_CHARACTER_IN_EXPLICIT_RESULT_MODE", "\"&&\"", + "BAD_METHOD_DECL_START", "BAD_METHOD_PARAMETER_NAME_CHARACTER", "\"&&\"", "\"||\"", "\"!||\"", "\"!|\"", "\"<=\"", "\">=\"", "\"==\"", "\"!=\"", "\"<<\"", "\">>\"", "\"lt\"", "\"gt\"", "\"le\"", "\"ge\"", "\"eq\"", "\"ne\"", "\"def\"", "\"in\"", "\"-f\"", "\"-d\"", "\"is\"", "\"true\"", @@ -590,10 +592,10 @@ static const yytype_uint16 yytoknum[] = 0, 256, 257, 258, 259, 260, 261, 262, 263, 264, 265, 266, 267, 268, 269, 270, 271, 272, 273, 274, 275, 276, 277, 278, 279, 280, 281, 282, 283, 284, - 285, 286, 287, 288, 60, 62, 124, 38, 43, 45, - 42, 47, 92, 37, 289, 126, 33, 64, 10, 91, - 93, 59, 36, 123, 125, 46, 40, 41, 94, 58, - 34, 39 + 285, 286, 287, 60, 62, 124, 38, 43, 45, 42, + 47, 92, 37, 288, 126, 33, 64, 10, 91, 93, + 59, 36, 123, 125, 46, 40, 41, 94, 58, 34, + 39 }; # endif @@ -611,32 +613,32 @@ static const yytype_uint16 yytoknum[] = STATE-NUM. */ static const yytype_int16 yypact[] = { - 14, -107, 13, 45, -107, 28, -15, -107, -107, -107, - -107, -107, 21, -107, -107, -107, -107, -107, -107, -107, - -107, -107, 73, 19, -107, 50, 6, 44, -107, -107, - 87, -107, -107, -107, -34, -107, -107, -107, -107, 65, - -107, 48, -107, 5, -107, -107, -107, 65, 24, -107, - 6, -107, -107, -107, 88, 109, 74, -107, 50, -107, - 76, -107, 21, -107, -107, 86, 65, 101, 65, 76, - -107, 44, 101, -107, -107, 21, 7, -107, -107, -107, - -107, 18, -107, -107, 5, -107, -107, -107, -107, -107, - -107, -107, -107, 9, -107, 94, 99, -107, 93, 112, - -107, 146, -107, -107, -107, -107, 21, -107, 101, 29, - 110, -107, 7, 7, 7, 7, -107, -107, 7, 7, - 7, 7, 52, 7, 21, 21, -107, -107, 113, 323, - -107, -107, -107, 92, -107, -107, -107, -107, 165, -107, - 144, -107, 147, 149, 21, 80, -107, -107, -107, -107, - -107, -107, 96, 96, 96, 96, -107, -107, -107, -107, - 276, -107, 138, 139, -107, 7, 7, 7, 7, 7, - 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, - 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, - 7, 7, -107, 21, 7, 35, -107, -107, -107, -107, - -107, -107, -107, 21, 154, -107, -107, -107, 419, 389, - 356, 284, 135, 135, 148, 148, 191, 191, 135, 135, - 135, 135, 148, 148, 96, 135, 135, 182, 427, 140, - 140, -107, -107, -107, -107, 37, -107, 31, -107, -30, - -107, -107, -107, -107, 21, -107, 108, -107, 155, -107, - -107, -107, 21, -107, 7, -107, -107, 37, 161, -107, + 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 }; @@ -677,15 +679,15 @@ static const yytype_uint8 yydefact[] = /* YYPGOTO[NTERM-NUM]. */ static const yytype_int16 yypgoto[] = { - -107, -107, -107, -107, 206, -107, -107, -107, 124, -107, - -107, -107, -107, 170, -107, -107, -107, 1, -58, -7, - -106, -107, 0, -107, -107, -6, -107, -107, -21, -107, + -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, 118, -107, -107, -107, 2, -107, -107, -107, -107, - 43, -107, -107, -107, -107, -107, -107, -107, -107, -17, - -13, -16, -107, -18, 4, 41, -107, -23, 3, -107, - -107, -107, -107, -107, 181, -107, 183, 239, -107, -107, - 171, 95, -107, 123, -107, 142, -107, -107, 64 + -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 }; /* YYDEFGOTO[NTERM-NUM]. */ @@ -707,162 +709,162 @@ 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, 39, -103, 70, - 23, 111, 16, 91, 19, 74, 83, 22, 1, 75, - 65, 254, 76, 57, 57, 1, 86, 255, 51, 87, - 72, 71, 2, 143, 112, 113, 114, 115, 242, 116, - 117, 246, 84, 83, 89, 118, 119, 86, 69, 23, - 43, 39, 120, 121, 63, 24, 23, -172, 25, 122, - -102, 2, 16, 123, 19, 4, 3, 124, 125, 81, - 58, 58, 4, 3, 108, 16, 110, 19, 59, 4, - 82, 3, 252, 88, 192, 253, 203, 4, 193, 3, - 73, 194, 91, 24, 24, 4, 25, 25, 26, 53, - 27, 24, 144, 85, 25, 26, 16, 82, 19, 16, - 168, 19, 82, 97, 24, 173, 174, 25, 96, 100, - 103, 54, 55, 55, 16, 16, 19, 19, 58, 145, - -68, -68, 184, 185, 186, 187, 188, 189, 190, 191, - 107, 192, 136, 137, 16, 193, 19, -15, 194, 168, - 139, 145, 171, 172, 173, 174, -102, 135, -95, -95, - 179, 180, 168, 138, 151, 141, 181, 173, 174, 200, - 164, 184, 185, 186, 187, 188, 189, 190, 191, 181, - 188, 189, 190, 191, 184, 185, 186, 187, 188, 189, - 190, 191, 201, 16, 236, 19, 53, 202, 206, -64, - 207, 173, 174, 16, 245, 19, 257, 152, 153, 154, - 155, 262, 52, 156, 157, 158, 159, 134, 160, 185, - 186, 187, 188, 189, 190, 191, 102, 147, 144, 186, - 187, 188, 189, 190, 191, 16, 259, 19, 243, 104, - 261, 260, 47, 105, 16, 256, 19, 128, 163, 0, - 144, 150, 16, 236, 19, 0, 0, 16, 0, 19, + 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, 173, 174, 0, 0, 181, 0, 0, + 178, 179, 180, 168, 0, 0, 0, 181, 173, 174, 182, 183, 184, 185, 186, 187, 188, 189, 190, 191, - 184, 185, 186, 187, 188, 189, 190, 191, 0, 0, - 0, 0, 0, 205, 165, 166, 167, 168, 169, 170, + 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, - 165, 0, 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, 173, 174, 0, 0, - 181, 0, 0, 182, 183, 184, 185, 186, 187, 188, - 189, 190, 191, 0, 0, 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 }; static const yytype_int16 yycheck[] = { - 0, 0, 0, 109, 62, 12, 3, 3, 3, 27, - 4, 4, 12, 4, 12, 49, 39, 4, 4, 53, - 26, 51, 56, 5, 5, 4, 47, 57, 0, 47, - 27, 27, 47, 4, 27, 28, 29, 30, 3, 32, - 33, 4, 39, 66, 50, 38, 39, 68, 4, 4, - 47, 47, 45, 46, 4, 49, 4, 48, 52, 52, - 55, 47, 62, 56, 62, 58, 52, 60, 61, 4, - 52, 52, 58, 52, 71, 75, 75, 75, 59, 58, - 39, 52, 51, 59, 49, 54, 144, 58, 53, 52, - 3, 56, 4, 49, 49, 58, 52, 52, 53, 106, - 55, 49, 109, 55, 52, 53, 106, 66, 106, 109, - 14, 109, 71, 4, 49, 19, 20, 52, 54, 55, - 56, 48, 49, 49, 124, 125, 124, 125, 52, 235, - 50, 51, 36, 37, 38, 39, 40, 41, 42, 43, - 54, 49, 48, 50, 144, 53, 144, 48, 56, 14, - 4, 257, 17, 18, 19, 20, 55, 93, 50, 51, - 25, 26, 14, 51, 54, 101, 31, 19, 20, 4, - 57, 36, 37, 38, 39, 40, 41, 42, 43, 31, - 40, 41, 42, 43, 36, 37, 38, 39, 40, 41, - 42, 43, 48, 193, 193, 193, 203, 50, 60, 50, - 61, 19, 20, 203, 50, 203, 51, 112, 113, 114, - 115, 50, 6, 118, 119, 120, 121, 93, 123, 37, - 38, 39, 40, 41, 42, 43, 56, 109, 235, 38, - 39, 40, 41, 42, 43, 235, 252, 235, 195, 58, - 257, 254, 3, 60, 244, 244, 244, 76, 125, -1, - 257, 109, 252, 252, 252, -1, -1, 257, -1, 257, + 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, 11, 12, 13, - 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, - 24, 25, 26, 19, 20, -1, -1, 31, -1, -1, - 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, - 36, 37, 38, 39, 40, 41, 42, 43, -1, -1, - -1, -1, -1, 57, 11, 12, 13, 14, 15, 16, - 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, - -1, -1, -1, -1, 31, -1, -1, 34, 35, 36, - 37, 38, 39, 40, 41, 42, 43, 11, 12, -1, - 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, - 24, 25, 26, -1, -1, -1, -1, 31, -1, -1, - 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, - 11, -1, -1, 14, 15, 16, 17, 18, 19, 20, - 21, 22, 23, 24, 25, 26, -1, -1, -1, -1, - 31, -1, -1, 34, 35, 36, 37, 38, 39, 40, - 41, 42, 43, 14, 15, 16, 17, 18, 19, 20, - 21, 22, 23, 24, 25, 26, 19, 20, -1, -1, - 31, -1, -1, 34, 35, 36, 37, 38, 39, 40, - 41, 42, 43, -1, -1, 38, 39, 40, 41, 42, - 43 + 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 }; /* YYSTOS[STATE-NUM] -- The (internal number of the) accessing symbol of state STATE-NUM. */ static const yytype_uint8 yystos[] = { - 0, 4, 47, 52, 58, 63, 64, 65, 66, 67, - 72, 79, 80, 81, 82, 83, 84, 91, 106, 107, - 146, 150, 4, 4, 49, 52, 53, 55, 85, 86, - 87, 88, 89, 90, 92, 93, 94, 95, 125, 126, - 127, 128, 129, 130, 131, 132, 133, 139, 140, 141, - 108, 0, 66, 81, 48, 49, 75, 5, 52, 59, - 137, 138, 134, 4, 136, 87, 126, 130, 139, 4, - 125, 126, 130, 3, 49, 53, 56, 96, 97, 100, - 101, 4, 127, 129, 130, 55, 90, 125, 59, 87, - 110, 4, 68, 69, 70, 71, 150, 4, 76, 77, - 150, 74, 75, 150, 136, 138, 80, 54, 130, 98, - 79, 4, 27, 28, 29, 30, 32, 33, 38, 39, - 45, 46, 52, 56, 60, 61, 84, 107, 142, 143, - 144, 148, 149, 109, 70, 150, 48, 50, 51, 4, - 78, 150, 135, 4, 81, 82, 102, 103, 104, 105, - 147, 54, 143, 143, 143, 143, 143, 143, 143, 143, - 143, 79, 145, 145, 57, 11, 12, 13, 14, 15, - 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, - 26, 31, 34, 35, 36, 37, 38, 39, 40, 41, - 42, 43, 49, 53, 56, 111, 112, 113, 116, 117, - 4, 48, 50, 80, 99, 57, 60, 61, 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, 79, 120, 123, 119, - 122, 142, 3, 112, 73, 50, 4, 103, 118, 121, - 124, 147, 51, 54, 51, 57, 79, 51, 115, 123, - 122, 121, 50 + 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 }; /* YYR1[YYN] -- Symbol number of symbol that rule YYN derives. */ static const yytype_uint8 yyr1[] = { - 0, 62, 63, 63, 64, 64, 65, 66, 66, 67, - 68, 68, 69, 69, 70, 71, 71, 73, 72, 74, - 74, 75, 76, 76, 77, 77, 78, 78, 79, 79, - 80, 80, 81, 81, 82, 82, 82, 83, 84, 85, - 85, 86, 87, 87, 88, 89, 90, 90, 91, 92, - 92, 92, 93, 94, 95, 96, 96, 96, 98, 99, - 97, 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, 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 + 0, 61, 62, 62, 63, 63, 64, 65, 65, 66, + 67, 67, 68, 68, 69, 70, 70, 72, 71, 73, + 73, 74, 75, 75, 76, 76, 77, 77, 78, 78, + 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 }; /* YYR2[YYN] -- Number of symbols on the right hand side of rule YYN. */ @@ -1568,15 +1570,12 @@ yyreduce: switch (yyn) { case 2: -#line 142 "compile.y" /* yacc.c:1646 */ +#line 145 "compile.y" /* yacc.c:1646 */ { - 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*/); + 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 1580 "compile.tab.C" /* yacc.c:1646 */ +#line 1579 "compile.tab.C" /* yacc.c:1646 */ break; case 9: @@ -1585,9 +1584,7 @@ yyreduce: const String& command=LA2S(*(yyvsp[-2]))->trim(String::TRIM_END); YYSTYPE strings_code=(yyvsp[0]); if(strings_code->count()<1*OPERATIONS_PER_OPVALUE) { - strcpy(PC.error, "@"); - strcat(PC.error, command.cstr()); - strcat(PC.error, " is empty"); + PC_ERROR("@", command.cstr(), " is empty"); YYERROR; } if(command==CLASS_NAME) { @@ -1596,9 +1593,8 @@ yyreduce: // new class' name const String& name=LA2S(*strings_code)->trim(String::TRIM_END); // creating the class - VStateless_class* cclass=new VClass; + VStateless_class* cclass=new VClass(name.cstr(), PC.request.get_used_filespec(PC.file_no)); PC.cclass_new=cclass; - PC.cclass_new->set_name(name); PC.append=false; } else { strcpy(PC.error, "@" CLASS_NAME " must contain only one line with class name (contains more then one)"); @@ -1607,41 +1603,29 @@ yyreduce: } else if(command==USE_CONTROL_METHOD_NAME) { CLASS_ADD; for(size_t i=0; icount(); i+=OPERATIONS_PER_OPVALUE){ - PC.request.use_file(PC.request.main_class, LA2S(*strings_code, i)->trim(String::TRIM_END), - PC.request.get_used_filename(PC.file_no), strings_code->get(i+1).origin); + PC.request.use_file(LA2S(*strings_code, i)->trim(String::TRIM_END), PC.request.get_used_filespec(PC.file_no), strings_code->get(i+1).origin); } } else if(command==BASE_NAME) { if(PC.append){ - strcpy(PC.error, "can't set base while appending methods to class '"); - strncat(PC.error, PC.cclass->name().cstr(), MAX_STRING/2); - strcat(PC.error, "'"); + PC_ERROR("can't set base while appending methods to class '", PC.cclass->type(), "'"); YYERROR; } CLASS_ADD; if(PC.cclass->base_class()) { // already changed from default? - strcpy(PC.error, "class already have a base '"); - strncat(PC.error, PC.cclass->base_class()->name().cstr(), MAX_STRING/2); - strcat(PC.error, "'"); + PC_ERROR("class already have a base '", PC.cclass->base_class()->type(), "'"); YYERROR; } if(strings_code->count()==1*OPERATIONS_PER_OPVALUE) { const String& base_name=LA2S(*strings_code)->trim(String::TRIM_END); - if(Value* base_class_value=PC.request.get_class(base_name)) { + if(VStateless_class *base_class=PC.request.get_class(base_name)) { // @CLASS == @BASE sanity check - if(VStateless_class *base_class=base_class_value->get_class()) { - if(PC.cclass==base_class) { - strcpy(PC.error, "@" CLASS_NAME " equals @" BASE_NAME); - YYERROR; - } - PC.cclass->get_class()->set_base(base_class); - } else { // they asked to derive from a class without methods ['env' & co] - strcpy(PC.error, base_name.cstr()); - strcat(PC.error, ": you can not derive from this class in @" BASE_NAME); + if(PC.cclass==base_class) { + strcpy(PC.error, "@" CLASS_NAME " equals @" BASE_NAME); YYERROR; } + PC.cclass->get_class()->set_base(base_class); } else { - strcpy(PC.error, base_name.cstr()); - strcat(PC.error, ": undefined class in @" BASE_NAME); + PC_ERROR("'", base_name.cstr(), "': undefined class in @" BASE_NAME); YYERROR; } } else { @@ -1651,15 +1635,13 @@ yyreduce: } else if(command==OPTIONS_CONTROL_METHOD_NAME) { for(size_t i=0; icount(); i+=OPERATIONS_PER_OPVALUE) { const String& option=LA2S(*strings_code, i)->trim(String::TRIM_END); - if(option==OPTION_ALL_VARS_LOCAL_NAME){ + if(option==Symbols::LOCALS_SYMBOL){ PC.set_all_vars_local(); - } else if(option==OPTION_PARTIAL_CLASS){ + } else if(option==Symbols::PARTIAL_SYMBOL){ if(PC.cclass_new){ if(VStateless_class* existed=PC.get_existed_class(PC.cclass_new)){ if(!PC.reuse_existed_class(existed)){ - strcpy(PC.error, "can't append methods to '"); - strncat(PC.error, PC.cclass_new->name().cstr(), MAX_STRING/2); - strcat(PC.error, "' - the class wasn't marked as partial"); + PC_ERROR("can't append methods to '", PC.cclass_new->type(), "' - the class wasn't marked as partial"); YYERROR; } } else { @@ -1667,42 +1649,34 @@ yyreduce: PC.cclass_new->set_partial(); } } else { - strcpy(PC.error, "'" OPTION_PARTIAL_CLASS "' option should be used straight after @" CLASS_NAME); + strcpy(PC.error, "'partial' option should be used straight after @" CLASS_NAME); YYERROR; } - } else if(option==method_call_type_static){ + } else if(option==Symbols::STATIC_SYMBOL){ PC.set_methods_call_type(Method::CT_STATIC); - } else if(option==method_call_type_dynamic){ + } else if(option==Symbols::DYNAMIC_SYMBOL){ PC.set_methods_call_type(Method::CT_DYNAMIC); } else { - strcpy(PC.error, "'"); - strncat(PC.error, option.cstr(), MAX_STRING/2); - strcat(PC.error, "' invalid option. valid options are " - "'" OPTION_PARTIAL_CLASS "', '" OPTION_ALL_VARS_LOCAL_NAME "'" - ", '" METHOD_CALL_TYPE_STATIC "' and '" METHOD_CALL_TYPE_DYNAMIC "'" - ); + PC_ERROR("'", option.cstr(), "' invalid option. valid options are 'partial', 'locals', 'static' and 'dynamic'"); YYERROR; } } } else { - strcpy(PC.error, "'"); - strncat(PC.error, command.cstr(), MAX_STRING/2); - strcat(PC.error, "' invalid special name. valid names are " - "'" CLASS_NAME "', '" USE_CONTROL_METHOD_NAME "', '" BASE_NAME "' and '" OPTIONS_CONTROL_METHOD_NAME "'."); + PC_ERROR("'", command.cstr(), "' invalid special name. valid names are '" CLASS_NAME "', '" USE_CONTROL_METHOD_NAME "', '" BASE_NAME "' and '" OPTIONS_CONTROL_METHOD_NAME "'."); YYERROR; } } -#line 1696 "compile.tab.C" /* yacc.c:1646 */ +#line 1670 "compile.tab.C" /* yacc.c:1646 */ break; case 13: -#line 269 "compile.y" /* yacc.c:1646 */ +#line 244 "compile.y" /* yacc.c:1646 */ { (yyval)=(yyvsp[-1]); P(*(yyval), *(yyvsp[0])); } -#line 1702 "compile.tab.C" /* yacc.c:1646 */ +#line 1676 "compile.tab.C" /* yacc.c:1646 */ break; case 17: -#line 273 "compile.y" /* yacc.c:1646 */ +#line 248 "compile.y" /* yacc.c:1646 */ { CLASS_ADD; PC.explicit_result=false; @@ -1717,21 +1691,20 @@ yyreduce: YYSTYPE locals_names_code=(yyvsp[-2]); ArrayString* locals_names=0; - bool all_vars_local=false; + bool all_vars_local=PC.cclass->is_vars_local(); + if(int size=locals_names_code->count()) { locals_names=new ArrayString; for(int i=0; iis_vars_local()) - all_vars_local=true; Method* method=new Method( //name, @@ -1742,11 +1715,11 @@ yyreduce: *reinterpret_cast(&(yyval))=method; } -#line 1746 "compile.tab.C" /* yacc.c:1646 */ +#line 1719 "compile.tab.C" /* yacc.c:1646 */ break; case 18: -#line 311 "compile.y" /* yacc.c:1646 */ +#line 285 "compile.y" /* yacc.c:1646 */ { Method* method=reinterpret_cast((yyvsp[-1])); // fill in the code @@ -1756,94 +1729,77 @@ yyreduce: const String& name=*LA2S(*(yyvsp[-6])); PC.cclass->set_method(PC.alias_method(name), method); } -#line 1760 "compile.tab.C" /* yacc.c:1646 */ +#line 1733 "compile.tab.C" /* yacc.c:1646 */ break; case 21: -#line 322 "compile.y" /* yacc.c:1646 */ +#line 296 "compile.y" /* yacc.c:1646 */ {(yyval)=(yyvsp[-1]);} -#line 1766 "compile.tab.C" /* yacc.c:1646 */ +#line 1739 "compile.tab.C" /* yacc.c:1646 */ break; case 25: -#line 324 "compile.y" /* yacc.c:1646 */ +#line 298 "compile.y" /* yacc.c:1646 */ { (yyval)=(yyvsp[-2]); P(*(yyval), *(yyvsp[0])); } -#line 1772 "compile.tab.C" /* yacc.c:1646 */ +#line 1745 "compile.tab.C" /* yacc.c:1646 */ break; case 31: -#line 332 "compile.y" /* yacc.c:1646 */ +#line 306 "compile.y" /* yacc.c:1646 */ { (yyval)=(yyvsp[-1]); P(*(yyval), *(yyvsp[0])); } -#line 1778 "compile.tab.C" /* yacc.c:1646 */ +#line 1751 "compile.tab.C" /* yacc.c:1646 */ break; case 37: -#line 338 "compile.y" /* yacc.c:1646 */ +#line 312 "compile.y" /* yacc.c:1646 */ { (yyval)=N(); YYSTYPE code=(yyvsp[0]); size_t count=code->count(); #ifdef OPTIMIZE_BYTECODE_GET_ELEMENT - if( - count!=3 - || !change_first(*code, OP::OP_VALUE__GET_ELEMENT, /*=>*/OP::OP_VALUE__GET_ELEMENT__WRITE) - ) + if(count!=3 || !change_first(*code, OP::OP_VALUE__GET_ELEMENT, /*=>*/OP::OP_VALUE__GET_ELEMENT__WRITE) ) #endif #ifdef OPTIMIZE_BYTECODE_GET_SELF_ELEMENT - if( - count!=3 - || !change_first(*code, OP::OP_WITH_SELF__VALUE__GET_ELEMENT, /*=>*/OP::OP_WITH_SELF__VALUE__GET_ELEMENT__WRITE) - ) + if(count!=3 || !change_first(*code, OP::OP_WITH_SELF__VALUE__GET_ELEMENT, /*=>*/OP::OP_WITH_SELF__VALUE__GET_ELEMENT__WRITE) ) #endif #ifdef OPTIMIZE_BYTECODE_GET_OBJECT_ELEMENT - if( - count!=5 - || !change_first(*code, OP::OP_GET_OBJECT_ELEMENT, /*=>*/OP::OP_GET_OBJECT_ELEMENT__WRITE) - ) + if(count!=5 || !change_first(*code, OP::OP_GET_OBJECT_ELEMENT, /*=>*/OP::OP_GET_OBJECT_ELEMENT__WRITE) ) #endif #ifdef OPTIMIZE_BYTECODE_GET_OBJECT_VAR_ELEMENT - if( - count!=5 - || !change_first(*code, OP::OP_GET_OBJECT_VAR_ELEMENT, /*=>*/OP::OP_GET_OBJECT_VAR_ELEMENT__WRITE) - ) + if(count!=5 || !change_first(*code, OP::OP_GET_OBJECT_VAR_ELEMENT, /*=>*/OP::OP_GET_OBJECT_VAR_ELEMENT__WRITE) ) #endif #ifdef OPTIMIZE_BYTECODE_GET_ELEMENT__SPECIAL - if( - !change(*code, count-1/* last */, OP::OP_GET_ELEMENT__SPECIAL, /*=>*/OP::OP_GET_ELEMENT__SPECIAL__WRITE) - ) + if(!change(*code, count-1/* last */, OP::OP_GET_ELEMENT__SPECIAL, /*=>*/OP::OP_GET_ELEMENT__SPECIAL__WRITE) ) #endif { - change_or_append(*code, count-1 /* last */, - OP::OP_GET_ELEMENT, /*=>*/OP::OP_GET_ELEMENT__WRITE, - /*or */OP::OP_WRITE_VALUE - ); /* value=pop; wcontext.write(value) */ + change_or_append(*code, count-1 /* last */, OP::OP_GET_ELEMENT, /*=>*/OP::OP_GET_ELEMENT__WRITE, /*or */OP::OP_WRITE_VALUE ); /* value=pop; wcontext.write(value) */ } P(*(yyval), *code); } -#line 1831 "compile.tab.C" /* yacc.c:1646 */ +#line 1787 "compile.tab.C" /* yacc.c:1646 */ break; case 38: -#line 386 "compile.y" /* yacc.c:1646 */ +#line 343 "compile.y" /* yacc.c:1646 */ { (yyval)=(yyvsp[0]); } -#line 1837 "compile.tab.C" /* yacc.c:1646 */ +#line 1793 "compile.tab.C" /* yacc.c:1646 */ break; case 41: -#line 388 "compile.y" /* yacc.c:1646 */ +#line 345 "compile.y" /* yacc.c:1646 */ { (yyval)=(yyvsp[-1]); } -#line 1843 "compile.tab.C" /* yacc.c:1646 */ +#line 1799 "compile.tab.C" /* yacc.c:1646 */ break; case 44: -#line 392 "compile.y" /* yacc.c:1646 */ +#line 349 "compile.y" /* yacc.c:1646 */ { (yyval)=N(); YYSTYPE diving_code=(yyvsp[0]); @@ -1866,11 +1822,7 @@ yyreduce: #endif #ifdef OPTIMIZE_BYTECODE_GET_ELEMENT - if( - count>=4 - && (*diving_code)[0].code==OP::OP_VALUE - && (*diving_code)[3].code==OP::OP_GET_ELEMENT - ){ + if(count>=4 && (*diving_code)[0].code==OP::OP_VALUE && (*diving_code)[3].code==OP::OP_GET_ELEMENT ){ // optimization O(*(yyval), (PC.in_call_value && count==4) @@ -1897,23 +1849,23 @@ yyreduce: #endif /* diving code; stack: current context */ } -#line 1901 "compile.tab.C" /* yacc.c:1646 */ +#line 1853 "compile.tab.C" /* yacc.c:1646 */ break; case 45: -#line 445 "compile.y" /* yacc.c:1646 */ +#line 398 "compile.y" /* yacc.c:1646 */ { (yyval)=(yyvsp[-1]); P(*(yyval), *(yyvsp[0])); } -#line 1907 "compile.tab.C" /* yacc.c:1646 */ +#line 1859 "compile.tab.C" /* yacc.c:1646 */ break; case 47: -#line 446 "compile.y" /* yacc.c:1646 */ +#line 399 "compile.y" /* yacc.c:1646 */ { (yyval)=(yyvsp[-1]); P(*(yyval), *(yyvsp[0])); } -#line 1913 "compile.tab.C" /* yacc.c:1646 */ +#line 1865 "compile.tab.C" /* yacc.c:1646 */ break; case 48: -#line 450 "compile.y" /* yacc.c:1646 */ +#line 403 "compile.y" /* yacc.c:1646 */ { (yyval)=N(); #ifdef OPTIMIZE_BYTECODE_CONSTRUCT @@ -1926,11 +1878,11 @@ yyreduce: P(*(yyval), *(yyvsp[0])); /* stack: context,name,constructor_value */ } } -#line 1930 "compile.tab.C" /* yacc.c:1646 */ +#line 1882 "compile.tab.C" /* yacc.c:1646 */ break; case 52: -#line 466 "compile.y" /* yacc.c:1646 */ +#line 419 "compile.y" /* yacc.c:1646 */ { (yyval)=N(); YYSTYPE diving_code=(yyvsp[0]); @@ -1940,11 +1892,7 @@ yyreduce: // $self. } else #ifdef OPTIMIZE_BYTECODE_GET_ELEMENT - if( - count>=4 - && (*diving_code)[0].code==OP::OP_VALUE - && (*diving_code)[3].code==OP::OP_GET_ELEMENT - ){ + if(count>=4 && (*diving_code)[0].code==OP::OP_VALUE && (*diving_code)[3].code==OP::OP_GET_ELEMENT ){ O(*(yyval), OP::OP_WITH_ROOT__VALUE__GET_ELEMENT); P(*(yyval), *diving_code, 1/*offset*/, 2/*limit*/); // copy origin+value if(count>4) @@ -1957,93 +1905,92 @@ yyreduce: } /* diving code; stack: current context */ } -#line 1961 "compile.tab.C" /* yacc.c:1646 */ +#line 1909 "compile.tab.C" /* yacc.c:1646 */ break; case 53: -#line 492 "compile.y" /* yacc.c:1646 */ +#line 441 "compile.y" /* yacc.c:1646 */ { (yyval)=N(); O(*(yyval), OP::OP_WITH_WRITE); /* stack: starting context */ P(*(yyval), *(yyvsp[0])); /* diving code; stack: context,name */ } -#line 1971 "compile.tab.C" /* yacc.c:1646 */ +#line 1919 "compile.tab.C" /* yacc.c:1646 */ break; case 54: -#line 497 "compile.y" /* yacc.c:1646 */ +#line 446 "compile.y" /* yacc.c:1646 */ { (yyval)=(yyvsp[-1]); P(*(yyval), *(yyvsp[0])); } -#line 1977 "compile.tab.C" /* yacc.c:1646 */ +#line 1925 "compile.tab.C" /* yacc.c:1646 */ break; case 58: -#line 504 "compile.y" /* yacc.c:1646 */ +#line 453 "compile.y" /* yacc.c:1646 */ { // allow $result_or_other_variable[ letters here any time ] *reinterpret_cast(&(yyval))=PC.explicit_result; PC.explicit_result=false; } -#line 1986 "compile.tab.C" /* yacc.c:1646 */ +#line 1934 "compile.tab.C" /* yacc.c:1646 */ break; case 59: -#line 507 "compile.y" /* yacc.c:1646 */ +#line 456 "compile.y" /* yacc.c:1646 */ { PC.explicit_result=*reinterpret_cast(&(yyvsp[-1])); } -#line 1994 "compile.tab.C" /* yacc.c:1646 */ +#line 1942 "compile.tab.C" /* yacc.c:1646 */ break; case 60: -#line 509 "compile.y" /* yacc.c:1646 */ +#line 458 "compile.y" /* yacc.c:1646 */ { // 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) */ } -#line 2004 "compile.tab.C" /* yacc.c:1646 */ +#line 1952 "compile.tab.C" /* yacc.c:1646 */ break; case 61: -#line 515 "compile.y" /* yacc.c:1646 */ +#line 464 "compile.y" /* yacc.c:1646 */ { (yyval)=N(); - O(*(yyval), OP::OP_PREPARE_TO_EXPRESSION); // 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 2016 "compile.tab.C" /* yacc.c:1646 */ +#line 1963 "compile.tab.C" /* yacc.c:1646 */ break; case 62: -#line 523 "compile.y" /* yacc.c:1646 */ +#line 471 "compile.y" /* yacc.c:1646 */ { // 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 2026 "compile.tab.C" /* yacc.c:1646 */ +#line 1973 "compile.tab.C" /* yacc.c:1646 */ break; case 66: -#line 534 "compile.y" /* yacc.c:1646 */ +#line 482 "compile.y" /* yacc.c:1646 */ { (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 2037 "compile.tab.C" /* yacc.c:1646 */ +#line 1984 "compile.tab.C" /* yacc.c:1646 */ break; case 69: -#line 541 "compile.y" /* yacc.c:1646 */ +#line 489 "compile.y" /* yacc.c:1646 */ { (yyval)=(yyvsp[-1]); P(*(yyval), *(yyvsp[0])); } -#line 2043 "compile.tab.C" /* yacc.c:1646 */ +#line 1990 "compile.tab.C" /* yacc.c:1646 */ break; case 70: -#line 545 "compile.y" /* yacc.c:1646 */ +#line 493 "compile.y" /* yacc.c:1646 */ { size_t count=(yyvsp[0])->count(); #ifdef OPTIMIZE_BYTECODE_CUT_REM_OPERATOR @@ -2051,33 +1998,31 @@ yyreduce: #endif { (yyval)=(yyvsp[0]); /* stack: value */ - if(!change_first(*(yyval), OP::OP_CONSTRUCT_OBJECT, /*=>*/OP::OP_CONSTRUCT_OBJECT__WRITE)) - 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) */ + if(!change_first(*(yyval), OP::OP_CONSTRUCT_OBJECT, /*=>*/ OP::OP_CONSTRUCT_OBJECT__WRITE)) + 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 2061 "compile.tab.C" /* yacc.c:1646 */ +#line 2006 "compile.tab.C" /* yacc.c:1646 */ break; case 71: -#line 558 "compile.y" /* yacc.c:1646 */ +#line 504 "compile.y" /* yacc.c:1646 */ { - PC.in_call_value=true; - } -#line 2069 "compile.tab.C" /* yacc.c:1646 */ + PC.in_call_value=true; +} +#line 2014 "compile.tab.C" /* yacc.c:1646 */ break; case 72: -#line 561 "compile.y" /* yacc.c:1646 */ +#line 507 "compile.y" /* yacc.c:1646 */ { - PC.in_call_value=false; - } -#line 2077 "compile.tab.C" /* yacc.c:1646 */ + PC.in_call_value=false; +} +#line 2022 "compile.tab.C" /* yacc.c:1646 */ break; case 73: -#line 564 "compile.y" /* yacc.c:1646 */ +#line 510 "compile.y" /* yacc.c:1646 */ { /* ^field.$method{vasya} */ #ifdef OPTIMIZE_BYTECODE_CUT_REM_OPERATOR #ifdef OPTIMIZE_BYTECODE_GET_ELEMENT @@ -2085,7 +2030,7 @@ yyreduce: #else const String* operator_name=LA2S(*(yyvsp[-3]), 1); #endif - if(operator_name && *operator_name==REM_OPERATOR_NAME){ + if(operator_name && SYMBOLS_EQ(*operator_name,REM_SYMBOL)){ (yyval)=N(); } else #endif @@ -2102,7 +2047,7 @@ yyreduce: YYSTYPE var_code=(yyvsp[-3]); if( var_code->count()==8 - && (*var_code)[0].code==OP::OP_VALUE__GET_CLASS + && ( (*var_code)[0].code==OP::OP_VALUE__GET_CLASS || (*var_code)[0].code==OP::OP_VALUE__GET_BASE_CLASS ) && (*var_code)[3].code==OP::OP_PREPARE_TO_CONSTRUCT_OBJECT && (*var_code)[4].code==OP::OP_VALUE #ifdef FEATURE_GET_ELEMENT4CALL @@ -2123,11 +2068,11 @@ yyreduce: } } } -#line 2127 "compile.tab.C" /* yacc.c:1646 */ +#line 2072 "compile.tab.C" /* yacc.c:1646 */ break; case 74: -#line 610 "compile.y" /* yacc.c:1646 */ +#line 556 "compile.y" /* yacc.c:1646 */ { #ifdef FEATURE_GET_ELEMENT4CALL size_t count=(yyvsp[0])->count(); @@ -2143,78 +2088,78 @@ yyreduce: } #endif } -#line 2147 "compile.tab.C" /* yacc.c:1646 */ +#line 2092 "compile.tab.C" /* yacc.c:1646 */ break; case 76: -#line 626 "compile.y" /* yacc.c:1646 */ +#line 572 "compile.y" /* yacc.c:1646 */ { (yyval)=(yyvsp[-1]); P(*(yyval), *(yyvsp[0])); } -#line 2153 "compile.tab.C" /* yacc.c:1646 */ +#line 2098 "compile.tab.C" /* yacc.c:1646 */ break; case 80: -#line 632 "compile.y" /* yacc.c:1646 */ +#line 578 "compile.y" /* yacc.c:1646 */ { // allow ^call[ letters here any time ] *reinterpret_cast(&(yyval))=PC.explicit_result; PC.explicit_result=false; } -#line 2162 "compile.tab.C" /* yacc.c:1646 */ +#line 2107 "compile.tab.C" /* yacc.c:1646 */ break; case 81: -#line 635 "compile.y" /* yacc.c:1646 */ +#line 581 "compile.y" /* yacc.c:1646 */ { PC.explicit_result=*reinterpret_cast(&(yyvsp[-1])); } -#line 2170 "compile.tab.C" /* yacc.c:1646 */ +#line 2115 "compile.tab.C" /* yacc.c:1646 */ break; case 82: -#line 637 "compile.y" /* yacc.c:1646 */ +#line 583 "compile.y" /* yacc.c:1646 */ {(yyval)=(yyvsp[-2]);} -#line 2176 "compile.tab.C" /* yacc.c:1646 */ +#line 2121 "compile.tab.C" /* yacc.c:1646 */ break; case 83: -#line 638 "compile.y" /* yacc.c:1646 */ +#line 584 "compile.y" /* yacc.c:1646 */ {(yyval)=(yyvsp[-1]);} -#line 2182 "compile.tab.C" /* yacc.c:1646 */ +#line 2127 "compile.tab.C" /* yacc.c:1646 */ break; case 84: -#line 639 "compile.y" /* yacc.c:1646 */ +#line 585 "compile.y" /* yacc.c:1646 */ {(yyval)=(yyvsp[-1]);} -#line 2188 "compile.tab.C" /* yacc.c:1646 */ +#line 2133 "compile.tab.C" /* yacc.c:1646 */ break; case 86: -#line 642 "compile.y" /* yacc.c:1646 */ +#line 588 "compile.y" /* yacc.c:1646 */ { (yyval)=(yyvsp[-2]); P(*(yyval), *(yyvsp[0])); } -#line 2194 "compile.tab.C" /* yacc.c:1646 */ +#line 2139 "compile.tab.C" /* yacc.c:1646 */ break; case 88: -#line 646 "compile.y" /* yacc.c:1646 */ +#line 592 "compile.y" /* yacc.c:1646 */ { (yyval)=(yyvsp[-2]); P(*(yyval), *(yyvsp[0])); } -#line 2200 "compile.tab.C" /* yacc.c:1646 */ +#line 2145 "compile.tab.C" /* yacc.c:1646 */ break; case 90: -#line 650 "compile.y" /* yacc.c:1646 */ +#line 596 "compile.y" /* yacc.c:1646 */ { (yyval)=(yyvsp[-2]); P(*(yyval), *(yyvsp[0])); } -#line 2206 "compile.tab.C" /* yacc.c:1646 */ +#line 2151 "compile.tab.C" /* yacc.c:1646 */ break; case 91: -#line 652 "compile.y" /* yacc.c:1646 */ +#line 598 "compile.y" /* yacc.c:1646 */ { (yyval)=(yyvsp[0]); } -#line 2214 "compile.tab.C" /* yacc.c:1646 */ +#line 2159 "compile.tab.C" /* yacc.c:1646 */ break; case 92: -#line 655 "compile.y" /* yacc.c:1646 */ +#line 601 "compile.y" /* yacc.c:1646 */ { YYSTYPE expr_code=(yyvsp[0]); if(expr_code->count()==3 @@ -2222,39 +2167,38 @@ yyreduce: (yyval)=expr_code; } else { YYSTYPE code=N(); - O(*code, OP::OP_PREPARE_TO_EXPRESSION); P(*code, *expr_code); O(*code, OP::OP_WRITE_EXPR_RESULT); (yyval)=N(); OA(*(yyval), OP::OP_EXPR_CODE__STORE_PARAM, code); } } -#line 2233 "compile.tab.C" /* yacc.c:1646 */ +#line 2177 "compile.tab.C" /* yacc.c:1646 */ break; case 93: -#line 669 "compile.y" /* yacc.c:1646 */ +#line 614 "compile.y" /* yacc.c:1646 */ { (yyval)=N(); OA(*(yyval), OP::OP_CURLY_CODE__STORE_PARAM, (yyvsp[0])); } -#line 2242 "compile.tab.C" /* yacc.c:1646 */ +#line 2186 "compile.tab.C" /* yacc.c:1646 */ break; case 98: -#line 681 "compile.y" /* yacc.c:1646 */ +#line 626 "compile.y" /* yacc.c:1646 */ { (yyval)=(yyvsp[-1]); P(*(yyval), *(yyvsp[0])); } -#line 2248 "compile.tab.C" /* yacc.c:1646 */ +#line 2192 "compile.tab.C" /* yacc.c:1646 */ break; case 100: -#line 683 "compile.y" /* yacc.c:1646 */ +#line 628 "compile.y" /* yacc.c:1646 */ { (yyval)=(yyvsp[-1]); P(*(yyval), *(yyvsp[0])); } -#line 2254 "compile.tab.C" /* yacc.c:1646 */ +#line 2198 "compile.tab.C" /* yacc.c:1646 */ break; case 102: -#line 685 "compile.y" /* yacc.c:1646 */ +#line 630 "compile.y" /* yacc.c:1646 */ { // 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 @@ -2267,11 +2211,11 @@ yyreduce: O(*(yyval), OP::OP_GET_ELEMENT); /* name=pop; context=pop; stack: context.get_element(name) */ #endif } -#line 2271 "compile.tab.C" /* yacc.c:1646 */ +#line 2215 "compile.tab.C" /* yacc.c:1646 */ break; case 103: -#line 697 "compile.y" /* yacc.c:1646 */ +#line 642 "compile.y" /* yacc.c:1646 */ { /* stack: context */ (yyval)=(yyvsp[0]); /* stack: context,name */ @@ -2281,20 +2225,20 @@ yyreduce: O(*(yyval), OP::OP_GET_ELEMENT); /* name=pop; context=pop; stack: context.get_element(name) */ #endif } -#line 2285 "compile.tab.C" /* yacc.c:1646 */ +#line 2229 "compile.tab.C" /* yacc.c:1646 */ break; case 109: -#line 714 "compile.y" /* yacc.c:1646 */ +#line 659 "compile.y" /* yacc.c:1646 */ { (yyval)=(yyvsp[0]); O(*(yyval), OP::OP_GET_ELEMENT); } -#line 2294 "compile.tab.C" /* yacc.c:1646 */ +#line 2238 "compile.tab.C" /* yacc.c:1646 */ break; case 110: -#line 718 "compile.y" /* yacc.c:1646 */ +#line 663 "compile.y" /* yacc.c:1646 */ { YYSTYPE code; { @@ -2304,87 +2248,94 @@ yyreduce: (yyval)=N(); OA(*(yyval), OP::OP_STRING_POOL, code); } -#line 2308 "compile.tab.C" /* yacc.c:1646 */ +#line 2252 "compile.tab.C" /* yacc.c:1646 */ break; case 111: -#line 727 "compile.y" /* yacc.c:1646 */ +#line 672 "compile.y" /* yacc.c:1646 */ { // allow $result_or_other_variable[ letters here any time ] *reinterpret_cast(&(yyval))=PC.explicit_result; PC.explicit_result=false; } -#line 2317 "compile.tab.C" /* yacc.c:1646 */ +#line 2261 "compile.tab.C" /* yacc.c:1646 */ break; case 112: -#line 730 "compile.y" /* yacc.c:1646 */ +#line 675 "compile.y" /* yacc.c:1646 */ { PC.explicit_result=*reinterpret_cast(&(yyvsp[-1])); } -#line 2325 "compile.tab.C" /* yacc.c:1646 */ +#line 2269 "compile.tab.C" /* yacc.c:1646 */ break; case 113: -#line 732 "compile.y" /* yacc.c:1646 */ +#line 677 "compile.y" /* yacc.c:1646 */ { (yyval)=N(); #ifdef OPTIMIZE_BYTECODE_GET_ELEMENT__SPECIAL if(!maybe_append_simple_diving_code(*(yyval), *(yyvsp[-2]))) #endif { - OA(*(yyval), OP::OP_OBJECT_POOL, (yyvsp[-2])); /* stack: empty write context */ - /* some code that writes to that context */ - /* context=pop; stack: context.value() */ + 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 2341 "compile.tab.C" /* yacc.c:1646 */ +#line 2285 "compile.tab.C" /* yacc.c:1646 */ break; case 114: -#line 743 "compile.y" /* yacc.c:1646 */ +#line 688 "compile.y" /* yacc.c:1646 */ { (yyval)=N(); O(*(yyval), OP::OP_WITH_READ); P(*(yyval), *(yyvsp[0])); } -#line 2351 "compile.tab.C" /* yacc.c:1646 */ +#line 2295 "compile.tab.C" /* yacc.c:1646 */ break; case 116: -#line 748 "compile.y" /* yacc.c:1646 */ +#line 693 "compile.y" /* yacc.c:1646 */ { (yyval)=(yyvsp[-1]); P(*(yyval), *(yyvsp[0])); } -#line 2357 "compile.tab.C" /* yacc.c:1646 */ +#line 2301 "compile.tab.C" /* yacc.c:1646 */ break; case 117: -#line 749 "compile.y" /* yacc.c:1646 */ +#line 694 "compile.y" /* yacc.c:1646 */ { (yyval)=(yyvsp[0]); O(*(yyval), OP::OP_GET_ELEMENT__WRITE); } -#line 2366 "compile.tab.C" /* yacc.c:1646 */ +#line 2310 "compile.tab.C" /* yacc.c:1646 */ break; case 120: -#line 758 "compile.y" /* yacc.c:1646 */ +#line 703 "compile.y" /* yacc.c:1646 */ { (yyval)=(yyvsp[-1]); // stack: class name string + OP::OPCODE code = OP::OP_VALUE__GET_CLASS; if(*LA2S(*(yyval)) == BASE_NAME) { // pseudo BASE class if(VStateless_class* base=PC.cclass->base_class()) { - change_string_literal_value(*(yyval), base->name()); + change_string_literal_value(*(yyval), *new String(base->type())); } else { strcpy(PC.error, "no base class declared"); YYERROR; } + code = OP::OP_VALUE__GET_BASE_CLASS; + } else { + // can't use get_class because it will call @autouse[] if the class wasn't loaded + VStateless_class* base=PC.request.classes().get(*LA2S(*(yyval))); + if(base && PC.cclass->derived_from(*base)) + code = OP::OP_VALUE__GET_BASE_CLASS; } // optimized OP_VALUE+origin+string+OP_GET_CLASS => OP_VALUE__GET_CLASS+origin+string - change_first(*(yyval), OP::OP_VALUE, OP::OP_VALUE__GET_CLASS); + change_first(*(yyval), OP::OP_VALUE, code); } -#line 2384 "compile.tab.C" /* yacc.c:1646 */ +#line 2335 "compile.tab.C" /* yacc.c:1646 */ break; case 121: -#line 771 "compile.y" /* yacc.c:1646 */ +#line 723 "compile.y" /* yacc.c:1646 */ { (yyval)=(yyvsp[-1]); if(!PC.in_call_value) { @@ -2393,248 +2344,248 @@ yyreduce: } O(*(yyval), OP::OP_PREPARE_TO_CONSTRUCT_OBJECT); } -#line 2397 "compile.tab.C" /* yacc.c:1646 */ +#line 2348 "compile.tab.C" /* yacc.c:1646 */ break; case 128: -#line 790 "compile.y" /* yacc.c:1646 */ +#line 742 "compile.y" /* yacc.c:1646 */ { (yyval) = (yyvsp[-1]); } -#line 2403 "compile.tab.C" /* yacc.c:1646 */ +#line 2354 "compile.tab.C" /* yacc.c:1646 */ break; case 129: -#line 791 "compile.y" /* yacc.c:1646 */ +#line 743 "compile.y" /* yacc.c:1646 */ { (yyval) = (yyvsp[-1]); } -#line 2409 "compile.tab.C" /* yacc.c:1646 */ +#line 2360 "compile.tab.C" /* yacc.c:1646 */ break; case 130: -#line 792 "compile.y" /* yacc.c:1646 */ +#line 744 "compile.y" /* yacc.c:1646 */ { (yyval) = (yyvsp[-1]); } -#line 2415 "compile.tab.C" /* yacc.c:1646 */ +#line 2366 "compile.tab.C" /* yacc.c:1646 */ break; case 131: -#line 794 "compile.y" /* yacc.c:1646 */ +#line 746 "compile.y" /* yacc.c:1646 */ { (yyval)=(yyvsp[0]); O(*(yyval), OP::OP_NEG); } -#line 2421 "compile.tab.C" /* yacc.c:1646 */ +#line 2372 "compile.tab.C" /* yacc.c:1646 */ break; case 132: -#line 795 "compile.y" /* yacc.c:1646 */ +#line 747 "compile.y" /* yacc.c:1646 */ { (yyval)=(yyvsp[0]); } -#line 2427 "compile.tab.C" /* yacc.c:1646 */ +#line 2378 "compile.tab.C" /* yacc.c:1646 */ break; case 133: -#line 796 "compile.y" /* yacc.c:1646 */ +#line 748 "compile.y" /* yacc.c:1646 */ { (yyval)=(yyvsp[0]); O(*(yyval), OP::OP_INV); } -#line 2433 "compile.tab.C" /* yacc.c:1646 */ +#line 2384 "compile.tab.C" /* yacc.c:1646 */ break; case 134: -#line 797 "compile.y" /* yacc.c:1646 */ +#line 749 "compile.y" /* yacc.c:1646 */ { (yyval)=(yyvsp[0]); O(*(yyval), OP::OP_NOT); } -#line 2439 "compile.tab.C" /* yacc.c:1646 */ +#line 2390 "compile.tab.C" /* yacc.c:1646 */ break; case 135: -#line 798 "compile.y" /* yacc.c:1646 */ +#line 750 "compile.y" /* yacc.c:1646 */ { (yyval)=(yyvsp[0]); O(*(yyval), OP::OP_DEF); } -#line 2445 "compile.tab.C" /* yacc.c:1646 */ +#line 2396 "compile.tab.C" /* yacc.c:1646 */ break; case 136: -#line 799 "compile.y" /* yacc.c:1646 */ +#line 751 "compile.y" /* yacc.c:1646 */ { (yyval)=(yyvsp[0]); O(*(yyval), OP::OP_IN); } -#line 2451 "compile.tab.C" /* yacc.c:1646 */ +#line 2402 "compile.tab.C" /* yacc.c:1646 */ break; case 137: -#line 800 "compile.y" /* yacc.c:1646 */ +#line 752 "compile.y" /* yacc.c:1646 */ { (yyval)=(yyvsp[0]); O(*(yyval), OP::OP_FEXISTS); } -#line 2457 "compile.tab.C" /* yacc.c:1646 */ +#line 2408 "compile.tab.C" /* yacc.c:1646 */ break; case 138: -#line 801 "compile.y" /* yacc.c:1646 */ +#line 753 "compile.y" /* yacc.c:1646 */ { (yyval)=(yyvsp[0]); O(*(yyval), OP::OP_DEXISTS); } -#line 2463 "compile.tab.C" /* yacc.c:1646 */ +#line 2414 "compile.tab.C" /* yacc.c:1646 */ break; case 139: -#line 803 "compile.y" /* yacc.c:1646 */ +#line 755 "compile.y" /* yacc.c:1646 */ { (yyval)=(yyvsp[-2]); P(*(yyval), *(yyvsp[0])); O(*(yyval), OP::OP_SUB); } -#line 2469 "compile.tab.C" /* yacc.c:1646 */ +#line 2420 "compile.tab.C" /* yacc.c:1646 */ break; case 140: -#line 804 "compile.y" /* yacc.c:1646 */ +#line 756 "compile.y" /* yacc.c:1646 */ { (yyval)=(yyvsp[-2]); P(*(yyval), *(yyvsp[0])); O(*(yyval), OP::OP_ADD); } -#line 2475 "compile.tab.C" /* yacc.c:1646 */ +#line 2426 "compile.tab.C" /* yacc.c:1646 */ break; case 141: -#line 805 "compile.y" /* yacc.c:1646 */ +#line 757 "compile.y" /* yacc.c:1646 */ { (yyval)=(yyvsp[-2]); P(*(yyval), *(yyvsp[0])); O(*(yyval), OP::OP_MUL); } -#line 2481 "compile.tab.C" /* yacc.c:1646 */ +#line 2432 "compile.tab.C" /* yacc.c:1646 */ break; case 142: -#line 806 "compile.y" /* yacc.c:1646 */ +#line 758 "compile.y" /* yacc.c:1646 */ { (yyval)=(yyvsp[-2]); P(*(yyval), *(yyvsp[0])); O(*(yyval), OP::OP_DIV); } -#line 2487 "compile.tab.C" /* yacc.c:1646 */ +#line 2438 "compile.tab.C" /* yacc.c:1646 */ break; case 143: -#line 807 "compile.y" /* yacc.c:1646 */ +#line 759 "compile.y" /* yacc.c:1646 */ { (yyval)=(yyvsp[-2]); P(*(yyval), *(yyvsp[0])); O(*(yyval), OP::OP_MOD); } -#line 2493 "compile.tab.C" /* yacc.c:1646 */ +#line 2444 "compile.tab.C" /* yacc.c:1646 */ break; case 144: -#line 808 "compile.y" /* yacc.c:1646 */ +#line 760 "compile.y" /* yacc.c:1646 */ { (yyval)=(yyvsp[-2]); P(*(yyval), *(yyvsp[0])); O(*(yyval), OP::OP_INTDIV); } -#line 2499 "compile.tab.C" /* yacc.c:1646 */ +#line 2450 "compile.tab.C" /* yacc.c:1646 */ break; case 145: -#line 809 "compile.y" /* yacc.c:1646 */ +#line 761 "compile.y" /* yacc.c:1646 */ { (yyval)=(yyvsp[-2]); P(*(yyval), *(yyvsp[0])); O(*(yyval), OP::OP_BIN_SL); } -#line 2505 "compile.tab.C" /* yacc.c:1646 */ +#line 2456 "compile.tab.C" /* yacc.c:1646 */ break; case 146: -#line 810 "compile.y" /* yacc.c:1646 */ +#line 762 "compile.y" /* yacc.c:1646 */ { (yyval)=(yyvsp[-2]); P(*(yyval), *(yyvsp[0])); O(*(yyval), OP::OP_BIN_SR); } -#line 2511 "compile.tab.C" /* yacc.c:1646 */ +#line 2462 "compile.tab.C" /* yacc.c:1646 */ break; case 147: -#line 811 "compile.y" /* yacc.c:1646 */ +#line 763 "compile.y" /* yacc.c:1646 */ { (yyval)=(yyvsp[-2]); P(*(yyval), *(yyvsp[0])); O(*(yyval), OP::OP_BIN_AND); } -#line 2517 "compile.tab.C" /* yacc.c:1646 */ +#line 2468 "compile.tab.C" /* yacc.c:1646 */ break; case 148: -#line 812 "compile.y" /* yacc.c:1646 */ +#line 764 "compile.y" /* yacc.c:1646 */ { (yyval)=(yyvsp[-2]); P(*(yyval), *(yyvsp[0])); O(*(yyval), OP::OP_BIN_OR); } -#line 2523 "compile.tab.C" /* yacc.c:1646 */ +#line 2474 "compile.tab.C" /* yacc.c:1646 */ break; case 149: -#line 813 "compile.y" /* yacc.c:1646 */ +#line 765 "compile.y" /* yacc.c:1646 */ { (yyval)=(yyvsp[-2]); P(*(yyval), *(yyvsp[0])); O(*(yyval), OP::OP_BIN_XOR); } -#line 2529 "compile.tab.C" /* yacc.c:1646 */ +#line 2480 "compile.tab.C" /* yacc.c:1646 */ break; case 150: -#line 814 "compile.y" /* yacc.c:1646 */ +#line 766 "compile.y" /* yacc.c:1646 */ { (yyval)=(yyvsp[-2]); OA(*(yyval), OP::OP_NESTED_CODE, (yyvsp[0])); O(*(yyval), OP::OP_LOG_AND); } -#line 2535 "compile.tab.C" /* yacc.c:1646 */ +#line 2486 "compile.tab.C" /* yacc.c:1646 */ break; case 151: -#line 815 "compile.y" /* yacc.c:1646 */ +#line 767 "compile.y" /* yacc.c:1646 */ { (yyval)=(yyvsp[-2]); OA(*(yyval), OP::OP_NESTED_CODE, (yyvsp[0])); O(*(yyval), OP::OP_LOG_OR); } -#line 2541 "compile.tab.C" /* yacc.c:1646 */ +#line 2492 "compile.tab.C" /* yacc.c:1646 */ break; case 152: -#line 816 "compile.y" /* yacc.c:1646 */ +#line 768 "compile.y" /* yacc.c:1646 */ { (yyval)=(yyvsp[-2]); P(*(yyval), *(yyvsp[0])); O(*(yyval), OP::OP_LOG_XOR); } -#line 2547 "compile.tab.C" /* yacc.c:1646 */ +#line 2498 "compile.tab.C" /* yacc.c:1646 */ break; case 153: -#line 817 "compile.y" /* yacc.c:1646 */ +#line 769 "compile.y" /* yacc.c:1646 */ { (yyval)=(yyvsp[-2]); P(*(yyval), *(yyvsp[0])); O(*(yyval), OP::OP_NUM_LT); } -#line 2553 "compile.tab.C" /* yacc.c:1646 */ +#line 2504 "compile.tab.C" /* yacc.c:1646 */ break; case 154: -#line 818 "compile.y" /* yacc.c:1646 */ +#line 770 "compile.y" /* yacc.c:1646 */ { (yyval)=(yyvsp[-2]); P(*(yyval), *(yyvsp[0])); O(*(yyval), OP::OP_NUM_GT); } -#line 2559 "compile.tab.C" /* yacc.c:1646 */ +#line 2510 "compile.tab.C" /* yacc.c:1646 */ break; case 155: -#line 819 "compile.y" /* yacc.c:1646 */ +#line 771 "compile.y" /* yacc.c:1646 */ { (yyval)=(yyvsp[-2]); P(*(yyval), *(yyvsp[0])); O(*(yyval), OP::OP_NUM_LE); } -#line 2565 "compile.tab.C" /* yacc.c:1646 */ +#line 2516 "compile.tab.C" /* yacc.c:1646 */ break; case 156: -#line 820 "compile.y" /* yacc.c:1646 */ +#line 772 "compile.y" /* yacc.c:1646 */ { (yyval)=(yyvsp[-2]); P(*(yyval), *(yyvsp[0])); O(*(yyval), OP::OP_NUM_GE); } -#line 2571 "compile.tab.C" /* yacc.c:1646 */ +#line 2522 "compile.tab.C" /* yacc.c:1646 */ break; case 157: -#line 821 "compile.y" /* yacc.c:1646 */ +#line 773 "compile.y" /* yacc.c:1646 */ { (yyval)=(yyvsp[-2]); P(*(yyval), *(yyvsp[0])); O(*(yyval), OP::OP_NUM_EQ); } -#line 2577 "compile.tab.C" /* yacc.c:1646 */ +#line 2528 "compile.tab.C" /* yacc.c:1646 */ break; case 158: -#line 822 "compile.y" /* yacc.c:1646 */ +#line 774 "compile.y" /* yacc.c:1646 */ { (yyval)=(yyvsp[-2]); P(*(yyval), *(yyvsp[0])); O(*(yyval), OP::OP_NUM_NE); } -#line 2583 "compile.tab.C" /* yacc.c:1646 */ +#line 2534 "compile.tab.C" /* yacc.c:1646 */ break; case 159: -#line 823 "compile.y" /* yacc.c:1646 */ +#line 775 "compile.y" /* yacc.c:1646 */ { (yyval)=(yyvsp[-2]); P(*(yyval), *(yyvsp[0])); O(*(yyval), OP::OP_STR_LT); } -#line 2589 "compile.tab.C" /* yacc.c:1646 */ +#line 2540 "compile.tab.C" /* yacc.c:1646 */ break; case 160: -#line 824 "compile.y" /* yacc.c:1646 */ +#line 776 "compile.y" /* yacc.c:1646 */ { (yyval)=(yyvsp[-2]); P(*(yyval), *(yyvsp[0])); O(*(yyval), OP::OP_STR_GT); } -#line 2595 "compile.tab.C" /* yacc.c:1646 */ +#line 2546 "compile.tab.C" /* yacc.c:1646 */ break; case 161: -#line 825 "compile.y" /* yacc.c:1646 */ +#line 777 "compile.y" /* yacc.c:1646 */ { (yyval)=(yyvsp[-2]); P(*(yyval), *(yyvsp[0])); O(*(yyval), OP::OP_STR_LE); } -#line 2601 "compile.tab.C" /* yacc.c:1646 */ +#line 2552 "compile.tab.C" /* yacc.c:1646 */ break; case 162: -#line 826 "compile.y" /* yacc.c:1646 */ +#line 778 "compile.y" /* yacc.c:1646 */ { (yyval)=(yyvsp[-2]); P(*(yyval), *(yyvsp[0])); O(*(yyval), OP::OP_STR_GE); } -#line 2607 "compile.tab.C" /* yacc.c:1646 */ +#line 2558 "compile.tab.C" /* yacc.c:1646 */ break; case 163: -#line 827 "compile.y" /* yacc.c:1646 */ +#line 779 "compile.y" /* yacc.c:1646 */ { (yyval)=(yyvsp[-2]); P(*(yyval), *(yyvsp[0])); O(*(yyval), OP::OP_STR_EQ); } -#line 2613 "compile.tab.C" /* yacc.c:1646 */ +#line 2564 "compile.tab.C" /* yacc.c:1646 */ break; case 164: -#line 828 "compile.y" /* yacc.c:1646 */ +#line 780 "compile.y" /* yacc.c:1646 */ { (yyval)=(yyvsp[-2]); P(*(yyval), *(yyvsp[0])); O(*(yyval), OP::OP_STR_NE); } -#line 2619 "compile.tab.C" /* yacc.c:1646 */ +#line 2570 "compile.tab.C" /* yacc.c:1646 */ break; case 165: -#line 829 "compile.y" /* yacc.c:1646 */ +#line 781 "compile.y" /* yacc.c:1646 */ { (yyval)=(yyvsp[-2]); P(*(yyval), *(yyvsp[0])); O(*(yyval), OP::OP_IS); } -#line 2625 "compile.tab.C" /* yacc.c:1646 */ +#line 2576 "compile.tab.C" /* yacc.c:1646 */ break; case 166: -#line 832 "compile.y" /* yacc.c:1646 */ +#line 784 "compile.y" /* yacc.c:1646 */ { // optimized OP_STRING => OP_VALUE for doubles maybe_change_string_literal_to_double_literal(*((yyval)=(yyvsp[0]))); } -#line 2634 "compile.tab.C" /* yacc.c:1646 */ +#line 2585 "compile.tab.C" /* yacc.c:1646 */ break; case 167: -#line 837 "compile.y" /* yacc.c:1646 */ +#line 789 "compile.y" /* yacc.c:1646 */ { #ifdef OPTIMIZE_BYTECODE_STRING_POOL // it brakes ^if(" 09 "){...} @@ -2653,44 +2604,44 @@ yyreduce: /* some code that writes to that context */ /* context=pop; stack: context.get_string() */ } -#line 2657 "compile.tab.C" /* yacc.c:1646 */ +#line 2608 "compile.tab.C" /* yacc.c:1646 */ break; case 168: -#line 858 "compile.y" /* yacc.c:1646 */ +#line 810 "compile.y" /* yacc.c:1646 */ { // optimized OP_STRING+OP_WRITE_VALUE => OP_STRING__WRITE change_string_literal_to_write_string_literal(*((yyval)=(yyvsp[0]))); } -#line 2666 "compile.tab.C" /* yacc.c:1646 */ +#line 2617 "compile.tab.C" /* yacc.c:1646 */ break; case 169: -#line 863 "compile.y" /* yacc.c:1646 */ +#line 815 "compile.y" /* yacc.c:1646 */ { (yyval)=VL(/*we know that we will not change it*/const_cast(&vempty), 0, 0, 0); } -#line 2672 "compile.tab.C" /* yacc.c:1646 */ +#line 2623 "compile.tab.C" /* yacc.c:1646 */ break; case 170: -#line 864 "compile.y" /* yacc.c:1646 */ +#line 816 "compile.y" /* yacc.c:1646 */ { (yyval) = VL(/*we know that we will not change it*/const_cast(&vtrue), 0, 0, 0); } -#line 2678 "compile.tab.C" /* yacc.c:1646 */ +#line 2629 "compile.tab.C" /* yacc.c:1646 */ break; case 171: -#line 865 "compile.y" /* yacc.c:1646 */ +#line 817 "compile.y" /* yacc.c:1646 */ { (yyval) = VL(/*we know that we will not change it*/const_cast(&vfalse), 0, 0, 0); } -#line 2684 "compile.tab.C" /* yacc.c:1646 */ +#line 2635 "compile.tab.C" /* yacc.c:1646 */ break; case 172: -#line 867 "compile.y" /* yacc.c:1646 */ +#line 819 "compile.y" /* yacc.c:1646 */ { (yyval)=N(); } -#line 2690 "compile.tab.C" /* yacc.c:1646 */ +#line 2641 "compile.tab.C" /* yacc.c:1646 */ break; -#line 2694 "compile.tab.C" /* yacc.c:1646 */ +#line 2645 "compile.tab.C" /* yacc.c:1646 */ default: break; } /* User semantic actions sometimes alter yychar, and that requires @@ -2918,7 +2869,7 @@ yyreturn: #endif return yyresult; } -#line 869 "compile.y" /* yacc.c:1906 */ +#line 821 "compile.y" /* yacc.c:1906 */ #endif @@ -3117,13 +3068,12 @@ default: } if(pc.explicit_result && c) switch(c) { + default: + pc.string.append(c); case '\n': case ' ': case '\t': begin=pc.source; begin_pos=pc.pos; - continue; // skip it - default: - result=BAD_NONWHITESPACE_CHARACTER_IN_EXPLICIT_RESULT_MODE; - goto break2; + continue; } break; @@ -3650,13 +3600,12 @@ default: } if(pc.explicit_result && c) switch(c) { + default: + pc.string.append(c); case '\n': case ' ': case '\t': begin=pc.source; begin_pos=pc.pos; - continue; // skip it - default: - result=BAD_NONWHITESPACE_CHARACTER_IN_EXPLICIT_RESULT_MODE; - goto break2; + continue; } break; @@ -3665,17 +3614,17 @@ default: pc.ls=LS_METHOD_SQUARE; lexical_brackets_nestage=1; RC; - } + } if(c=='{') {/* ]{ }{ ){ */ pc.ls=LS_METHOD_CURLY; lexical_brackets_nestage=1; RC; - } + } if(c=='(') {/* ]( }( )( */ pc.ls=LS_METHOD_ROUND; lexical_brackets_nestage=1; RC; - } + } pop_LS(pc); pc.ungetc(); result=EON; @@ -3701,9 +3650,12 @@ break2: } if(!pc.string.is_empty()) { // something accumulated? // create STRING value: array of OP_VALUE+origin+vstring - *lvalp=VL( - new VString(*new String(pc.string, String::L_CLEAN)), - pc.file_no, pc.string_start.line, pc.string_start.col); +#ifdef SYMBOLS_CACHING + Value *lookup=symbols->get(pc.string); +#else + Value *lookup=0; +#endif + *lvalp=VL(lookup ? lookup : new VString(*new String(pc.string, String::L_CLEAN)), pc.file_no, pc.string_start.line, pc.string_start.col); // new pieces storage pc.string.clear(); pc.string_start.clear(); @@ -3717,8 +3669,8 @@ break2: } static int real_yyerror(Parse_control *pc, const char *s) { // Called by yyparse on error - strncpy(PC.error, s, MAX_STRING); - return 1; + strncpy(PC.error, s, MAX_STRING); + return 1; } static void yyprint(FILE *file, int type, YYSTYPE value) {