--- parser3/src/main/compile.tab.C 2005/11/03 10:17:22 1.105 +++ parser3/src/main/compile.tab.C 2009/06/13 07:20:40 1.142 @@ -1,7 +1,7 @@ -/* A Bison parser, made by GNU Bison 1.875. */ +/* A Bison parser, made by GNU Bison 1.875d. */ /* Skeleton parser for Yacc-like parsing with Bison, - Copyright (C) 1984, 1989, 1990, 2000, 2001, 2002 Free Software Foundation, Inc. + Copyright (C) 1984, 1989, 1990, 2000, 2001, 2002, 2003, 2004 Free Software Foundation, Inc. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -82,7 +82,9 @@ FEXISTS = 284, DEXISTS = 285, IS = 286, - NUNARY = 287 + LITERAL_TRUE = 287, + LITERAL_FALSE = 288, + NUNARY = 289 }; #endif #define EON 258 @@ -114,7 +116,9 @@ #define FEXISTS 284 #define DEXISTS 285 #define IS 286 -#define NUNARY 287 +#define LITERAL_TRUE 287 +#define LITERAL_FALSE 288 +#define NUNARY 289 @@ -125,10 +129,10 @@ /** @file Parser: compiler(lexical parser and grammar). - Copyright (c) 2001, 2003 ArtLebedev Group (http://www.artlebedev.com) + Copyright (c) 2001-2009 ArtLebedev Group (http://www.artlebedev.com) Author: Alexander Petrosyan (http://design.ru/paf) - $Id: compile.tab.C,v 1.105 2005/11/03 10:17:22 paf Exp $ + $Id: compile.tab.C,v 1.142 2009/06/13 07:20:40 misha Exp $ */ /** @@ -164,6 +168,10 @@ // defines #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 @@ -171,6 +179,10 @@ static int real_yyerror(Parse_control* p static void yyprint(FILE* file, int type, YYSTYPE value); static int yylex(YYSTYPE* lvalp, void* pc); +static const VBool vfalse(false); +static const VBool vtrue(true); +static const VVoid vvoid; + // local convinient inplace typecast & var #undef PC #define PC (*(Parse_control *)pc) @@ -205,22 +217,29 @@ typedef int YYSTYPE; /* Line 214 of yacc.c. */ -#line 208 "compile.tab.C" +#line 221 "compile.tab.C" #if ! defined (yyoverflow) || YYERROR_VERBOSE +# ifndef YYFREE +# define YYFREE free +# endif +# ifndef YYMALLOC +# define YYMALLOC malloc +# endif + /* The parser invokes alloca or malloc; define the necessary symbols. */ -# if YYSTACK_USE_ALLOCA -# define YYSTACK_ALLOC alloca +# ifdef YYSTACK_USE_ALLOCA +# if YYSTACK_USE_ALLOCA +# define YYSTACK_ALLOC alloca +# endif # else -# ifndef YYSTACK_USE_ALLOCA -# if defined (alloca) || defined (_ALLOCA_H) -# define YYSTACK_ALLOC alloca -# else -# ifdef __GNUC__ -# define YYSTACK_ALLOC __builtin_alloca -# endif +# if defined (alloca) || defined (_ALLOCA_H) +# define YYSTACK_ALLOC alloca +# else +# ifdef __GNUC__ +# define YYSTACK_ALLOC __builtin_alloca # endif # endif # endif @@ -233,20 +252,20 @@ typedef int YYSTYPE; # include /* INFRINGES ON USER NAME SPACE */ # define YYSIZE_T size_t # endif -# define YYSTACK_ALLOC malloc -# define YYSTACK_FREE free +# define YYSTACK_ALLOC YYMALLOC +# define YYSTACK_FREE YYFREE # endif #endif /* ! defined (yyoverflow) || YYERROR_VERBOSE */ #if (! defined (yyoverflow) \ && (! defined (__cplusplus) \ - || (YYSTYPE_IS_TRIVIAL))) + || (defined (YYSTYPE_IS_TRIVIAL) && YYSTYPE_IS_TRIVIAL))) /* A type that is properly aligned for any stack member. */ union yyalloc { - short yyss; + short int yyss; YYSTYPE yyvs; }; @@ -256,13 +275,13 @@ union yyalloc /* The size of an array large to enough to hold all stacks, each with N elements. */ # define YYSTACK_BYTES(N) \ - ((N) * (sizeof (short) + sizeof (YYSTYPE)) \ + ((N) * (sizeof (short int) + sizeof (YYSTYPE)) \ + YYSTACK_GAP_MAXIMUM) /* Copy COUNT objects from FROM to TO. The source and destination do not overlap. */ # ifndef YYCOPY -# if 1 < __GNUC__ +# if defined (__GNUC__) && 1 < __GNUC__ # define YYCOPY(To, From, Count) \ __builtin_memcpy (To, From, (Count) * sizeof (*(From))) # else @@ -298,26 +317,26 @@ union yyalloc #if defined (__STDC__) || defined (__cplusplus) typedef signed char yysigned_char; #else - typedef short yysigned_char; + typedef short int yysigned_char; #endif /* YYFINAL -- State number of the termination state. */ #define YYFINAL 51 /* YYLAST -- Last index in YYTABLE. */ -#define YYLAST 479 +#define YYLAST 470 /* YYNTOKENS -- Number of terminals. */ -#define YYNTOKENS 60 +#define YYNTOKENS 62 /* YYNNTS -- Number of nonterminals. */ -#define YYNNTS 87 +#define YYNNTS 89 /* YYNRULES -- Number of rules. */ -#define YYNRULES 168 +#define YYNRULES 172 /* YYNRULES -- Number of states. */ -#define YYNSTATES 259 +#define YYNSTATES 263 /* YYTRANSLATE(YYLEX) -- Bison symbol number corresponding to YYLEX. */ #define YYUNDEFTOK 2 -#define YYMAXUTOK 287 +#define YYMAXUTOK 289 #define YYTRANSLATE(YYX) \ ((unsigned int) (YYX) <= YYMAXUTOK ? yytranslate[YYX] : YYUNDEFTOK) @@ -326,18 +345,18 @@ union yyalloc static const unsigned char yytranslate[] = { 0, 2, 2, 2, 2, 2, 2, 2, 2, 2, - 46, 2, 2, 2, 2, 2, 2, 2, 2, 2, + 48, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, - 2, 2, 2, 44, 58, 2, 50, 41, 35, 59, - 54, 55, 38, 36, 2, 37, 53, 39, 2, 2, - 2, 2, 2, 2, 2, 2, 2, 2, 57, 49, - 32, 2, 33, 2, 45, 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, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, - 2, 47, 40, 48, 56, 2, 2, 2, 2, 2, + 2, 49, 42, 50, 58, 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, 51, 34, 52, 43, 2, 2, 2, + 2, 2, 2, 53, 36, 54, 45, 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, @@ -353,13 +372,13 @@ static const unsigned char 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, 42 + 25, 26, 27, 28, 29, 30, 31, 32, 33, 44 }; #if YYDEBUG /* YYPRHS[YYN] -- Index of the first RHS symbol of rule number YYN in YYRHS. */ -static const unsigned short yyprhs[] = +static const unsigned short int yyprhs[] = { 0, 0, 3, 5, 7, 9, 12, 14, 16, 18, 23, 25, 27, 29, 32, 35, 37, 39, 40, 49, @@ -373,85 +392,88 @@ static const unsigned short yyprhs[] = 227, 231, 233, 235, 237, 239, 241, 243, 245, 248, 250, 253, 256, 258, 260, 263, 265, 267, 269, 271, 274, 277, 278, 279, 285, 287, 289, 292, 295, 297, - 299, 302, 305, 307, 309, 311, 313, 317, 321, 325, - 328, 331, 334, 337, 340, 343, 346, 349, 353, 357, - 361, 365, 369, 373, 377, 381, 385, 389, 393, 397, - 401, 405, 409, 413, 417, 421, 425, 429, 433, 437, - 441, 445, 449, 453, 457, 459, 461, 463, 464 + 299, 302, 305, 307, 309, 311, 313, 315, 317, 321, + 325, 329, 332, 335, 338, 341, 344, 347, 350, 353, + 357, 361, 365, 369, 373, 377, 381, 385, 389, 393, + 397, 401, 405, 409, 413, 417, 421, 425, 429, 433, + 437, 441, 445, 449, 453, 457, 461, 463, 465, 467, + 468, 470, 472 }; /* YYRHS -- A `-1'-separated list of the rules' RHS. */ -static const short yyrhs[] = +static const short int yyrhs[] = { - 61, 0, -1, 63, -1, 62, -1, 64, -1, 62, - 64, -1, 77, -1, 65, -1, 70, -1, 45, 4, - 46, 66, -1, 146, -1, 67, -1, 68, -1, 67, - 68, -1, 69, 46, -1, 146, -1, 4, -1, -1, - 45, 4, 73, 72, 76, 46, 71, 77, -1, 146, - -1, 73, -1, 47, 74, 48, -1, 146, -1, 75, - -1, 4, -1, 75, 49, 4, -1, 146, -1, 4, - -1, 146, -1, 78, -1, 79, -1, 78, 79, -1, - 144, -1, 80, -1, 81, -1, 89, -1, 104, -1, - 82, -1, 50, 83, -1, 85, 3, -1, 84, -1, - 51, 85, 52, -1, 86, -1, 87, -1, 88, -1, - 137, 88, -1, 127, -1, 124, 127, -1, 50, 90, - 94, -1, 91, -1, 92, -1, 93, -1, 123, -1, - 53, 123, -1, 137, 123, -1, 95, -1, 98, -1, - 99, -1, -1, -1, 47, 96, 100, 97, 48, -1, - 54, 140, 55, -1, 51, 77, 52, -1, 145, -1, - 4, -1, 101, -1, 102, -1, 103, -1, 80, -1, - 79, 78, -1, 105, -1, -1, -1, 56, 106, 108, - 107, 109, 3, -1, 85, -1, 110, -1, 109, 110, - -1, 111, -1, 114, -1, 115, -1, -1, -1, 47, - 112, 116, 113, 48, -1, 54, 117, 55, -1, 51, - 118, 52, -1, 119, -1, 116, 49, 119, -1, 120, - -1, 117, 49, 120, -1, 121, -1, 118, 49, 121, - -1, 122, -1, 140, -1, 77, -1, 145, -1, 4, - -1, 101, -1, 128, -1, 124, 128, -1, 125, -1, - 124, 125, -1, 126, 53, -1, 128, -1, 128, -1, - 4, 5, -1, 4, -1, 129, -1, 130, -1, 131, - -1, 50, 134, -1, 4, 135, -1, -1, -1, 47, - 132, 78, 133, 48, -1, 4, -1, 136, -1, 135, - 136, -1, 50, 134, -1, 138, -1, 139, -1, 4, - 57, -1, 138, 57, -1, 141, -1, 142, -1, 82, - -1, 105, -1, 58, 143, 58, -1, 59, 143, 59, - -1, 54, 141, 55, -1, 37, 141, -1, 36, 141, - -1, 43, 141, -1, 44, 141, -1, 27, 141, -1, - 28, 141, -1, 29, 141, -1, 30, 141, -1, 141, - 37, 141, -1, 141, 36, 141, -1, 141, 38, 141, - -1, 141, 39, 141, -1, 141, 41, 141, -1, 141, - 40, 141, -1, 141, 19, 141, -1, 141, 20, 141, - -1, 141, 35, 141, -1, 141, 34, 141, -1, 141, - 14, 141, -1, 141, 11, 141, -1, 141, 12, 141, - -1, 141, 13, 141, -1, 141, 32, 141, -1, 141, - 33, 141, -1, 141, 15, 141, -1, 141, 16, 141, - -1, 141, 17, 141, -1, 141, 18, 141, -1, 141, - 21, 141, -1, 141, 22, 141, -1, 141, 23, 141, - -1, 141, 24, 141, -1, 141, 25, 141, -1, 141, - 26, 141, -1, 141, 31, 141, -1, 4, -1, 77, - -1, 4, -1, -1, -1 + 63, 0, -1, 65, -1, 64, -1, 66, -1, 64, + 66, -1, 79, -1, 67, -1, 72, -1, 47, 4, + 48, 68, -1, 150, -1, 69, -1, 70, -1, 69, + 70, -1, 71, 48, -1, 150, -1, 4, -1, -1, + 47, 4, 75, 74, 78, 48, 73, 79, -1, 150, + -1, 75, -1, 49, 76, 50, -1, 150, -1, 77, + -1, 4, -1, 77, 51, 4, -1, 150, -1, 4, + -1, 150, -1, 80, -1, 81, -1, 80, 81, -1, + 146, -1, 82, -1, 83, -1, 91, -1, 106, -1, + 84, -1, 52, 85, -1, 87, 3, -1, 86, -1, + 53, 87, 54, -1, 88, -1, 89, -1, 90, -1, + 139, 90, -1, 129, -1, 126, 129, -1, 52, 92, + 96, -1, 93, -1, 94, -1, 95, -1, 125, -1, + 55, 125, -1, 139, 125, -1, 97, -1, 100, -1, + 101, -1, -1, -1, 49, 98, 102, 99, 50, -1, + 56, 142, 57, -1, 53, 79, 54, -1, 147, -1, + 4, -1, 103, -1, 104, -1, 105, -1, 82, -1, + 81, 80, -1, 107, -1, -1, -1, 58, 108, 110, + 109, 111, 3, -1, 87, -1, 112, -1, 111, 112, + -1, 113, -1, 116, -1, 117, -1, -1, -1, 49, + 114, 118, 115, 50, -1, 56, 119, 57, -1, 53, + 120, 54, -1, 121, -1, 118, 51, 121, -1, 122, + -1, 119, 51, 122, -1, 123, -1, 120, 51, 123, + -1, 124, -1, 142, -1, 79, -1, 147, -1, 4, + -1, 103, -1, 130, -1, 126, 130, -1, 127, -1, + 126, 127, -1, 128, 55, -1, 130, -1, 130, -1, + 4, 5, -1, 4, -1, 131, -1, 132, -1, 133, + -1, 52, 136, -1, 4, 137, -1, -1, -1, 49, + 134, 80, 135, 50, -1, 4, -1, 138, -1, 137, + 138, -1, 52, 136, -1, 140, -1, 141, -1, 4, + 59, -1, 140, 59, -1, 143, -1, 144, -1, 148, + -1, 149, -1, 84, -1, 107, -1, 60, 145, 60, + -1, 61, 145, 61, -1, 56, 143, 57, -1, 39, + 143, -1, 38, 143, -1, 45, 143, -1, 46, 143, + -1, 27, 143, -1, 28, 143, -1, 29, 143, -1, + 30, 143, -1, 143, 39, 143, -1, 143, 38, 143, + -1, 143, 40, 143, -1, 143, 41, 143, -1, 143, + 43, 143, -1, 143, 42, 143, -1, 143, 19, 143, + -1, 143, 20, 143, -1, 143, 37, 143, -1, 143, + 36, 143, -1, 143, 14, 143, -1, 143, 11, 143, + -1, 143, 12, 143, -1, 143, 13, 143, -1, 143, + 34, 143, -1, 143, 35, 143, -1, 143, 15, 143, + -1, 143, 16, 143, -1, 143, 17, 143, -1, 143, + 18, 143, -1, 143, 21, 143, -1, 143, 22, 143, + -1, 143, 23, 143, -1, 143, 24, 143, -1, 143, + 25, 143, -1, 143, 26, 143, -1, 143, 31, 143, + -1, 4, -1, 79, -1, 4, -1, -1, 32, -1, + 33, -1, -1 }; /* YYRLINE[YYN] -- source line where rule number YYN was defined. */ -static const unsigned short yyrline[] = +static const unsigned short int yyrline[] = { - 0, 121, 121, 128, 130, 130, 131, 133, 133, 135, - 207, 207, 208, 208, 209, 210, 210, 212, 212, 252, - 252, 253, 254, 254, 255, 255, 257, 257, 261, 261, - 263, 263, 264, 264, 265, 265, 265, 269, 276, 277, - 277, 278, 280, 281, 282, 304, 305, 305, 309, 314, - 315, 316, 317, 334, 339, 342, 343, 344, 346, 349, - 346, 357, 365, 372, 373, 374, 376, 382, 383, 383, - 387, 393, 396, 393, 412, 414, 414, 416, 417, 418, - 420, 423, 420, 426, 427, 429, 430, 433, 434, 437, - 438, 440, 444, 458, 463, 464, 465, 470, 470, 472, - 472, 473, 474, 482, 487, 490, 491, 492, 493, 495, - 499, 508, 511, 508, 519, 524, 524, 525, 531, 532, - 534, 546, 558, 560, 561, 562, 563, 564, 565, 567, - 568, 569, 570, 571, 572, 573, 574, 576, 577, 578, - 579, 580, 581, 582, 583, 584, 585, 586, 587, 588, - 589, 590, 591, 592, 593, 594, 595, 596, 597, 598, - 599, 600, 601, 602, 605, 610, 619, 624, 625 + 0, 132, 132, 139, 141, 141, 142, 144, 144, 146, + 247, 247, 248, 248, 249, 250, 250, 252, 252, 302, + 302, 303, 304, 304, 305, 305, 307, 307, 311, 311, + 313, 313, 314, 314, 315, 315, 315, 319, 360, 361, + 361, 362, 364, 365, 366, 419, 420, 420, 424, 437, + 438, 439, 440, 466, 471, 474, 475, 476, 478, 481, + 478, 489, 497, 504, 505, 506, 508, 514, 515, 515, + 519, 533, 536, 533, 582, 584, 584, 586, 587, 588, + 590, 593, 590, 596, 597, 599, 600, 603, 604, 607, + 608, 610, 613, 627, 632, 633, 634, 639, 639, 641, + 641, 642, 643, 651, 656, 659, 660, 661, 662, 664, + 668, 677, 680, 677, 688, 693, 693, 694, 700, 701, + 703, 720, 732, 734, 735, 736, 737, 738, 739, 740, + 741, 743, 744, 745, 746, 747, 748, 749, 750, 752, + 753, 754, 755, 756, 757, 758, 759, 760, 761, 762, + 763, 764, 765, 766, 767, 768, 769, 770, 771, 772, + 773, 774, 775, 776, 777, 778, 781, 786, 807, 812, + 813, 814, 816 }; #endif @@ -460,78 +482,80 @@ static const unsigned short yyrline[] = First, the terminals, then, starting at YYNTOKENS, nonterminals. */ 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", "\"&&\"", - "\"||\"", "\"!||\"", "\"!|\"", "\"<=\"", "\">=\"", "\"==\"", "\"!=\"", - "\"<<\"", "\">>\"", "\"lt\"", "\"gt\"", "\"le\"", "\"ge\"", "\"eq\"", - "\"ne\"", "\"def\"", "\"in\"", "\"-f\"", "\"-d\"", "\"is\"", "'<'", - "'>'", "'|'", "'&'", "'+'", "'-'", "'*'", "'/'", "'\\\\'", "'%'", - "NUNARY", "'~'", "'!'", "'@'", "'\\n'", "'['", "']'", "';'", "'$'", - "'{'", "'}'", "'.'", "'('", "')'", "'^'", "':'", "'\"'", "'''", - "$accept", "all", "methods", "one_big_piece", "method", - "control_method", "maybe_control_strings", "control_strings", - "control_string", "maybe_string", "code_method", "@1", - "maybe_bracketed_strings", "bracketed_maybe_strings", "maybe_strings", - "strings", "maybe_comment", "maybe_codes", "codes", "code", "action", - "get", "get_value", "get_name_value", "name_in_curly_rdive", - "name_without_curly_rdive", "name_without_curly_rdive_read", - "name_without_curly_rdive_class", "name_without_curly_rdive_code", - "put", "name_expr_wdive", "name_expr_wdive_root", - "name_expr_wdive_write", "name_expr_wdive_class", "construct", - "construct_square", "@2", "@3", "construct_round", "construct_curly", - "any_constructor_code_value", "constructor_code_value", - "constructor_code", "codes__excluding_sole_str_literal", "call", - "call_value", "@4", "@5", "call_name", "store_params", "store_param", - "store_square_param", "@6", "@7", "store_round_param", - "store_curly_param", "store_code_param_parts", "store_expr_param_parts", - "store_curly_param_parts", "store_code_param_part", - "store_expr_param_part", "store_curly_param_part", "code_param_value", - "name_expr_dive_code", "name_path", "name_step", "name_advance1", - "name_advance2", "name_expr_value", "name_expr_subvar_value", - "name_expr_with_subvar_value", "name_square_code_value", "@8", "@9", - "subvar_ref_name_rdive", "subvar_get_writes", "subvar__get_write", - "class_prefix", "class_static_prefix", "class_constructor_prefix", - "expr_value", "expr", "double_or_STRING", "string_inside_quotes_value", - "write_string", "void_value", "empty", 0 + "$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", "\"&&\"", + "\"||\"", "\"!||\"", "\"!|\"", "\"<=\"", "\">=\"", "\"==\"", "\"!=\"", + "\"<<\"", "\">>\"", "\"lt\"", "\"gt\"", "\"le\"", "\"ge\"", "\"eq\"", + "\"ne\"", "\"def\"", "\"in\"", "\"-f\"", "\"-d\"", "\"is\"", "\"true\"", + "\"false\"", "'<'", "'>'", "'|'", "'&'", "'+'", "'-'", "'*'", "'/'", + "'\\\\'", "'%'", "NUNARY", "'~'", "'!'", "'@'", "'\\n'", "'['", "']'", + "';'", "'$'", "'{'", "'}'", "'.'", "'('", "')'", "'^'", "':'", "'\"'", + "'''", "$accept", "all", "methods", "one_big_piece", "method", + "control_method", "maybe_control_strings", "control_strings", + "control_string", "maybe_string", "code_method", "@1", + "maybe_bracketed_strings", "bracketed_maybe_strings", "maybe_strings", + "strings", "maybe_comment", "maybe_codes", "codes", "code", "action", + "get", "get_value", "get_name_value", "name_in_curly_rdive", + "name_without_curly_rdive", "name_without_curly_rdive_read", + "name_without_curly_rdive_class", "name_without_curly_rdive_code", "put", + "name_expr_wdive", "name_expr_wdive_root", "name_expr_wdive_write", + "name_expr_wdive_class", "construct", "construct_square", "@2", "@3", + "construct_round", "construct_curly", "any_constructor_code_value", + "constructor_code_value", "constructor_code", + "codes__excluding_sole_str_literal", "call", "call_value", "@4", "@5", + "call_name", "store_params", "store_param", "store_square_param", "@6", + "@7", "store_round_param", "store_curly_param", "store_code_param_parts", + "store_expr_param_parts", "store_curly_param_parts", + "store_code_param_part", "store_expr_param_part", + "store_curly_param_part", "code_param_value", "name_expr_dive_code", + "name_path", "name_step", "name_advance1", "name_advance2", + "name_expr_value", "name_expr_subvar_value", + "name_expr_with_subvar_value", "name_square_code_value", "@8", "@9", + "subvar_ref_name_rdive", "subvar_get_writes", "subvar__get_write", + "class_prefix", "class_static_prefix", "class_constructor_prefix", + "expr_value", "expr", "double_or_STRING", "string_inside_quotes_value", + "write_string", "void_value", "true_value", "false_value", "empty", 0 }; #endif # ifdef YYPRINT /* YYTOKNUM[YYLEX-NUM] -- Internal token number corresponding to token YYLEX-NUM. */ -static const unsigned short yytoknum[] = +static const unsigned short int 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, 60, 62, 124, 38, 43, 45, 42, 47, - 92, 37, 287, 126, 33, 64, 10, 91, 93, 59, - 36, 123, 125, 46, 40, 41, 94, 58, 34, 39 + 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 }; # endif /* YYR1[YYN] -- Symbol number of symbol that rule YYN derives. */ static const unsigned char yyr1[] = { - 0, 60, 61, 61, 62, 62, 63, 64, 64, 65, - 66, 66, 67, 67, 68, 69, 69, 71, 70, 72, - 72, 73, 74, 74, 75, 75, 76, 76, 77, 77, - 78, 78, 79, 79, 80, 80, 80, 81, 82, 83, - 83, 84, 85, 85, 86, 87, 88, 88, 89, 90, - 90, 90, 91, 92, 93, 94, 94, 94, 96, 97, - 95, 98, 99, 100, 100, 100, 101, 102, 103, 103, - 104, 106, 107, 105, 108, 109, 109, 110, 110, 110, - 112, 113, 111, 114, 115, 116, 116, 117, 117, 118, - 118, 119, 120, 121, 122, 122, 122, 123, 123, 124, - 124, 125, 126, 127, 127, 128, 128, 128, 128, 129, - 130, 132, 133, 131, 134, 135, 135, 136, 137, 137, - 138, 139, 140, 141, 141, 141, 141, 141, 141, 141, - 141, 141, 141, 141, 141, 141, 141, 141, 141, 141, - 141, 141, 141, 141, 141, 141, 141, 141, 141, 141, - 141, 141, 141, 141, 141, 141, 141, 141, 141, 141, - 141, 141, 141, 141, 142, 143, 144, 145, 146 + 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 }; /* YYR2[YYN] -- Number of symbols composing right hand side of rule YYN. */ @@ -549,11 +573,12 @@ static const unsigned char yyr2[] = 3, 1, 1, 1, 1, 1, 1, 1, 2, 1, 2, 2, 1, 1, 2, 1, 1, 1, 1, 2, 2, 0, 0, 5, 1, 1, 2, 2, 1, 1, - 2, 2, 1, 1, 1, 1, 3, 3, 3, 2, - 2, 2, 2, 2, 2, 2, 2, 3, 3, 3, + 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, 0 + 3, 3, 3, 3, 3, 3, 1, 1, 1, 0, + 1, 1, 0 }; /* YYDEFACT[STATE-NAME] -- Default rule to reduce with in state @@ -561,234 +586,237 @@ static const unsigned char yyr2[] = means the default is an error. */ static const unsigned char yydefact[] = { - 168, 166, 0, 0, 71, 0, 3, 2, 4, 7, + 172, 168, 0, 0, 71, 0, 3, 2, 4, 7, 8, 6, 29, 30, 33, 34, 37, 35, 36, 70, 32, 28, 0, 105, 111, 0, 0, 0, 38, 40, 0, 42, 43, 44, 0, 49, 50, 51, 52, 0, 99, 0, 46, 97, 106, 107, 108, 0, 118, 119, - 0, 1, 5, 31, 168, 168, 168, 104, 0, 120, + 0, 1, 5, 31, 172, 172, 172, 104, 0, 120, 110, 115, 0, 114, 109, 0, 0, 103, 0, 105, - 53, 0, 97, 39, 58, 168, 0, 48, 55, 56, + 53, 0, 97, 39, 58, 172, 0, 48, 55, 56, 57, 105, 100, 47, 98, 101, 45, 54, 121, 74, 72, 16, 9, 11, 12, 0, 10, 24, 0, 23, - 22, 168, 20, 19, 117, 116, 112, 41, 98, 167, - 0, 164, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 168, 168, 124, 125, 0, 122, 123, 0, - 13, 15, 14, 21, 0, 27, 0, 26, 0, 166, - 0, 33, 59, 65, 66, 67, 63, 62, 133, 134, - 135, 136, 130, 129, 131, 132, 0, 165, 0, 0, - 61, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 22, 172, 20, 19, 117, 116, 112, 41, 98, 169, + 0, 166, 0, 0, 0, 0, 170, 171, 0, 0, + 0, 0, 0, 0, 172, 172, 126, 127, 0, 122, + 123, 124, 125, 0, 13, 15, 14, 21, 0, 27, + 0, 26, 0, 168, 0, 33, 59, 65, 66, 67, + 63, 62, 135, 136, 137, 138, 132, 131, 133, 134, + 0, 167, 0, 0, 61, 0, 0, 0, 0, 0, + 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, 0, 80, 168, - 0, 0, 75, 77, 78, 79, 25, 17, 113, 69, - 0, 128, 126, 127, 148, 149, 150, 147, 153, 154, - 155, 156, 143, 144, 157, 158, 159, 160, 161, 162, - 163, 151, 152, 146, 145, 138, 137, 139, 140, 142, - 141, 167, 93, 0, 89, 0, 87, 92, 73, 76, - 168, 60, 166, 96, 81, 85, 91, 94, 168, 84, - 0, 83, 18, 167, 0, 90, 88, 86, 82 + 0, 0, 80, 172, 0, 0, 75, 77, 78, 79, + 25, 17, 113, 69, 0, 130, 128, 129, 150, 151, + 152, 149, 155, 156, 157, 158, 145, 146, 159, 160, + 161, 162, 163, 164, 165, 153, 154, 148, 147, 140, + 139, 141, 142, 144, 143, 169, 93, 0, 89, 0, + 87, 92, 73, 76, 172, 60, 168, 96, 81, 85, + 91, 94, 172, 84, 0, 83, 18, 169, 0, 90, + 88, 86, 82 }; /* YYDEFGOTO[NTERM-NUM]. */ -static const short yydefgoto[] = +static const short int yydefgoto[] = { -1, 5, 6, 7, 8, 9, 92, 93, 94, 95, - 10, 240, 101, 56, 98, 99, 136, 157, 12, 13, - 14, 15, 124, 28, 29, 30, 31, 32, 33, 17, - 34, 35, 36, 37, 77, 78, 109, 200, 79, 80, - 142, 243, 144, 145, 18, 125, 50, 129, 90, 191, - 192, 193, 231, 254, 194, 195, 244, 235, 233, 245, - 236, 234, 246, 38, 66, 40, 41, 42, 67, 44, - 45, 46, 62, 138, 64, 60, 61, 68, 48, 49, - 237, 127, 128, 158, 20, 247, 21 + 10, 244, 101, 56, 98, 99, 140, 161, 12, 13, + 14, 15, 126, 28, 29, 30, 31, 32, 33, 17, + 34, 35, 36, 37, 77, 78, 109, 204, 79, 80, + 146, 247, 148, 149, 18, 127, 50, 133, 90, 195, + 196, 197, 235, 258, 198, 199, 248, 239, 237, 249, + 240, 238, 250, 38, 66, 40, 41, 42, 67, 44, + 45, 46, 62, 142, 64, 60, 61, 68, 48, 49, + 241, 129, 130, 162, 20, 251, 131, 132, 21 }; /* YYPACT[STATE-NUM] -- Index in YYTABLE of the portion describing STATE-NUM. */ -#define YYPACT_NINF -106 -static const short yypact[] = +#define YYPACT_NINF -107 +static const short int yypact[] = { - 4, -106, 15, 39, -106, 28, -13, -106, -106, -106, - -106, -106, 5, -106, -106, -106, -106, -106, -106, -106, - -106, -106, 51, 16, -106, 43, 65, 67, -106, -106, - 77, -106, -106, -106, -29, -106, -106, -106, -106, 89, - -106, 34, -106, 17, -106, -106, -106, 89, 25, -106, - 65, -106, -106, -106, 97, 106, 69, -106, 43, -106, - 63, -106, 5, -106, -106, 82, 89, 85, 89, 63, - -106, 67, 85, -106, -106, 5, 9, -106, -106, -106, - -106, 6, -106, -106, 17, -106, -106, -106, -106, -106, - -106, -106, -106, 12, -106, 98, 99, -106, 87, 94, - -106, 142, -106, -106, -106, -106, 5, -106, 85, 22, - 115, -106, 9, 9, 9, 9, 9, 9, 9, 9, - 53, 9, 5, 5, -106, -106, 92, 272, -106, -3, - -106, -106, -106, -106, 164, -106, 148, -106, 140, 147, - 5, 70, -106, -106, -106, -106, -106, -106, 431, 431, - 431, 431, -106, -106, -106, -106, 138, -106, 139, 137, - -106, 9, 9, 9, 9, 9, 9, 9, 9, 9, - 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, - 9, 9, 9, 9, 9, 9, 9, 9, -106, 5, - 9, 37, -106, -106, -106, -106, -106, -106, -106, 5, - 150, -106, -106, -106, 362, 334, 303, 146, 390, 390, - 403, 403, 189, 189, 390, 390, 390, 390, 403, 403, - 431, 390, 390, 438, 198, 90, 90, -106, -106, -106, - -106, 29, -106, -25, -106, -26, -106, -106, -106, -106, - 5, -106, 72, -106, 151, -106, -106, -106, 5, -106, - 9, -106, -106, 29, 154, -106, -106, -106, -106 + 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, + -107, -107, -107 }; /* YYPGOTO[NTERM-NUM]. */ -static const short yypgoto[] = +static const short int yypgoto[] = { - -106, -106, -106, -106, 197, -106, -106, -106, 111, -106, - -106, -106, -106, 149, -106, -106, -106, 1, -59, -7, - -105, -106, 0, -106, -106, -9, -106, -106, -37, -106, - -106, -106, -106, -106, -106, -106, -106, -106, -106, -106, - -106, 110, -106, -106, -106, 2, -106, -106, -106, -106, - 24, -106, -106, -106, -106, -106, -106, -106, -106, -47, - -30, -27, -106, -12, 80, 66, -106, -32, 3, -106, - -106, -106, -106, -106, 165, -106, 162, 229, -106, -106, - 167, 95, -106, 121, -106, 136, 40 + -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, -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 }; /* YYTABLE[YYPACT[STATE-NUM]]. What to do in state STATE-NUM. If positive, shift that token. If negative, reduce the rule which number is the opposite. If zero, do what YYDEFACT says. If YYTABLE_NINF, syntax error. */ -#define YYTABLE_NINF -169 -static const short yytable[] = +#define YYTABLE_NINF -173 +static const short int yytable[] = { - 16, 11, 19, 106, 141, 53, 43, 83, 1, 1, - 86, 57, 16, 111, 19, 70, 91, 65, 74, 22, - -103, 57, 75, 250, 248, 76, 139, 249, 51, 251, - 72, 86, 2, 242, 83, 87, 112, 113, 114, 115, - 238, 89, 84, 23, 188, 116, 117, 63, 189, 2, - 43, 190, 118, 119, 3, 3, 58, 23, -168, 120, - 4, 4, 16, 121, 19, 4, 58, 122, 123, 23, - -102, 69, 3, 59, 108, 16, 110, 19, 4, 3, - 73, 199, 88, 39, 188, 4, 24, 85, 189, 25, - 26, 190, 27, 81, 96, 100, 103, 54, 55, 53, - 24, 91, 140, 25, 26, 82, 16, 71, 19, 16, - 97, 19, 24, 58, 24, 25, 55, 25, -68, -68, - -95, -95, 16, 16, 19, 19, 141, 39, 184, 185, - 186, 187, 82, 131, 107, 133, 24, 82, -102, 25, - 16, 137, 19, 134, 132, -15, 135, 160, 141, 161, - 162, 163, 164, 165, 166, 167, 168, 169, 170, 171, - 172, 173, 174, 175, 176, 169, 170, 147, 196, 177, - 178, 179, 180, 181, 182, 183, 184, 185, 186, 187, - 180, 181, 182, 183, 184, 185, 186, 187, 198, 16, - 232, 19, 53, 201, 197, -64, 203, 202, 241, 16, - 253, 19, 258, 52, 130, 102, 257, 148, 149, 150, - 151, 152, 153, 154, 155, 239, 156, 169, 170, 143, - 256, 255, 105, 104, 140, 182, 183, 184, 185, 186, - 187, 16, 47, 19, 182, 183, 184, 185, 186, 187, - 16, 252, 19, 126, 159, 146, 140, 0, 16, 232, - 19, 0, 0, 16, 0, 19, 204, 205, 206, 207, + 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, 208, 209, 210, 211, 212, 213, 214, 215, 216, 217, 218, 219, 220, 221, 222, 223, 224, 225, 226, 227, - 228, 229, 230, 161, 162, 163, 164, 165, 166, 167, - 168, 169, 170, 171, 172, 173, 174, 175, 176, 0, - 0, 0, 0, 177, 178, 179, 180, 181, 182, 183, - 184, 185, 186, 187, 161, 162, 0, 164, 165, 166, - 167, 168, 169, 170, 171, 172, 173, 174, 175, 176, - 0, 0, 0, 0, 177, 178, 179, 180, 181, 182, - 183, 184, 185, 186, 187, 161, 0, 0, 164, 165, - 166, 167, 168, 169, 170, 171, 172, 173, 174, 175, - 176, 0, 0, 0, 0, 177, 178, 179, 180, 181, - 182, 183, 184, 185, 186, 187, 164, 165, 166, 167, - 168, 169, 170, 171, 172, 173, 174, 175, 176, 0, - 0, 0, 0, 177, 178, 179, 180, 181, 182, 183, - 184, 185, 186, 187, 164, 0, 0, 167, 168, 169, - 170, 0, 0, 0, 0, 175, 176, 164, 0, 0, - 0, 177, 169, 170, 180, 181, 182, 183, 184, 185, - 186, 187, 0, 0, 177, 0, 0, 180, 181, 182, - 183, 184, 185, 186, 187, 164, 0, 0, 0, 0, - 169, 170, 0, 0, 0, 0, 0, 169, 170, 0, - 0, 0, 0, 0, 0, 180, 181, 182, 183, 184, - 185, 186, 187, 181, 182, 183, 184, 185, 186, 187 + 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, + 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, + 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 }; -static const short yycheck[] = +static const short int yycheck[] = { - 0, 0, 0, 62, 109, 12, 3, 39, 4, 4, - 47, 5, 12, 4, 12, 27, 4, 26, 47, 4, - 3, 5, 51, 49, 49, 54, 4, 52, 0, 55, - 27, 68, 45, 4, 66, 47, 27, 28, 29, 30, - 3, 50, 39, 4, 47, 36, 37, 4, 51, 45, - 47, 54, 43, 44, 50, 50, 50, 4, 46, 50, - 56, 56, 62, 54, 62, 56, 50, 58, 59, 4, - 53, 4, 50, 57, 71, 75, 75, 75, 56, 50, - 3, 140, 57, 3, 47, 56, 47, 53, 51, 50, - 51, 54, 53, 4, 54, 55, 56, 46, 47, 106, - 47, 4, 109, 50, 51, 39, 106, 27, 106, 109, - 4, 109, 47, 50, 47, 50, 47, 50, 48, 49, - 48, 49, 122, 123, 122, 123, 231, 47, 38, 39, - 40, 41, 66, 93, 52, 48, 47, 71, 53, 50, - 140, 101, 140, 49, 46, 46, 4, 55, 253, 11, - 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, - 22, 23, 24, 25, 26, 19, 20, 52, 4, 31, - 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, - 34, 35, 36, 37, 38, 39, 40, 41, 48, 189, - 189, 189, 199, 55, 46, 48, 59, 58, 48, 199, - 49, 199, 48, 6, 93, 56, 253, 112, 113, 114, - 115, 116, 117, 118, 119, 191, 121, 19, 20, 109, - 250, 248, 60, 58, 231, 36, 37, 38, 39, 40, - 41, 231, 3, 231, 36, 37, 38, 39, 40, 41, - 240, 240, 240, 76, 123, 109, 253, -1, 248, 248, - 248, -1, -1, 253, -1, 253, 161, 162, 163, 164, + 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, 165, 166, 167, 168, 169, 170, 171, 172, 173, 174, 175, 176, 177, 178, 179, 180, 181, 182, 183, 184, - 185, 186, 187, 11, 12, 13, 14, 15, 16, 17, - 18, 19, 20, 21, 22, 23, 24, 25, 26, -1, - -1, -1, -1, 31, 32, 33, 34, 35, 36, 37, - 38, 39, 40, 41, 11, 12, -1, 14, 15, 16, + 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, 32, 33, 34, 35, 36, - 37, 38, 39, 40, 41, 11, -1, -1, 14, 15, - 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, - 26, -1, -1, -1, -1, 31, 32, 33, 34, 35, - 36, 37, 38, 39, 40, 41, 14, 15, 16, 17, - 18, 19, 20, 21, 22, 23, 24, 25, 26, -1, - -1, -1, -1, 31, 32, 33, 34, 35, 36, 37, - 38, 39, 40, 41, 14, -1, -1, 17, 18, 19, - 20, -1, -1, -1, -1, 25, 26, 14, -1, -1, - -1, 31, 19, 20, 34, 35, 36, 37, 38, 39, - 40, 41, -1, -1, 31, -1, -1, 34, 35, 36, - 37, 38, 39, 40, 41, 14, -1, -1, -1, -1, - 19, 20, -1, -1, -1, -1, -1, 19, 20, -1, - -1, -1, -1, -1, -1, 34, 35, 36, 37, 38, - 39, 40, 41, 35, 36, 37, 38, 39, 40, 41 + -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 }; /* YYSTOS[STATE-NUM] -- The (internal number of the) accessing symbol of state STATE-NUM. */ static const unsigned char yystos[] = { - 0, 4, 45, 50, 56, 61, 62, 63, 64, 65, - 70, 77, 78, 79, 80, 81, 82, 89, 104, 105, - 144, 146, 4, 4, 47, 50, 51, 53, 83, 84, - 85, 86, 87, 88, 90, 91, 92, 93, 123, 124, - 125, 126, 127, 128, 129, 130, 131, 137, 138, 139, - 106, 0, 64, 79, 46, 47, 73, 5, 50, 57, - 135, 136, 132, 4, 134, 85, 124, 128, 137, 4, - 123, 124, 128, 3, 47, 51, 54, 94, 95, 98, - 99, 4, 125, 127, 128, 53, 88, 123, 57, 85, - 108, 4, 66, 67, 68, 69, 146, 4, 74, 75, - 146, 72, 73, 146, 134, 136, 78, 52, 128, 96, - 77, 4, 27, 28, 29, 30, 36, 37, 43, 44, - 50, 54, 58, 59, 82, 105, 140, 141, 142, 107, - 68, 146, 46, 48, 49, 4, 76, 146, 133, 4, - 79, 80, 100, 101, 102, 103, 145, 52, 141, 141, - 141, 141, 141, 141, 141, 141, 141, 77, 143, 143, - 55, 11, 12, 13, 14, 15, 16, 17, 18, 19, - 20, 21, 22, 23, 24, 25, 26, 31, 32, 33, - 34, 35, 36, 37, 38, 39, 40, 41, 47, 51, - 54, 109, 110, 111, 114, 115, 4, 46, 48, 78, - 97, 55, 58, 59, 141, 141, 141, 141, 141, 141, - 141, 141, 141, 141, 141, 141, 141, 141, 141, 141, - 141, 141, 141, 141, 141, 141, 141, 141, 141, 141, - 141, 112, 77, 118, 121, 117, 120, 140, 3, 110, - 71, 48, 4, 101, 116, 119, 122, 145, 49, 52, - 49, 55, 77, 49, 113, 121, 120, 119, 48 + 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 }; #if ! defined (YYSIZE_T) && defined (__SIZE_TYPE__) @@ -814,7 +842,8 @@ static const unsigned char yystos[] = #define YYACCEPT goto yyacceptlab #define YYABORT goto yyabortlab -#define YYERROR goto yyerrlab1 +#define YYERROR goto yyerrorlab + /* Like YYERROR except do call yyerror. This remains here temporarily to ease the transition to the new meaning of YYERROR, for GCC. @@ -848,11 +877,11 @@ while (0) are run). */ #ifndef YYLLOC_DEFAULT -# define YYLLOC_DEFAULT(Current, Rhs, N) \ - Current.first_line = Rhs[1].first_line; \ - Current.first_column = Rhs[1].first_column; \ - Current.last_line = Rhs[N].last_line; \ - Current.last_column = Rhs[N].last_column; +# define YYLLOC_DEFAULT(Current, Rhs, N) \ + ((Current).first_line = (Rhs)[1].first_line, \ + (Current).first_column = (Rhs)[1].first_column, \ + (Current).last_line = (Rhs)[N].last_line, \ + (Current).last_column = (Rhs)[N].last_column) #endif /* YYLEX -- calling `yylex' with the right arguments. */ @@ -896,17 +925,17 @@ do { \ /*------------------------------------------------------------------. | yy_stack_print -- Print the state stack from its BOTTOM up to its | -| TOP (cinluded). | +| TOP (included). | `------------------------------------------------------------------*/ #if defined (__STDC__) || defined (__cplusplus) static void -yy_stack_print (short *bottom, short *top) +yy_stack_print (short int *bottom, short int *top) #else static void yy_stack_print (bottom, top) - short *bottom; - short *top; + short int *bottom; + short int *top; #endif { YYFPRINTF (stderr, "Stack now"); @@ -936,9 +965,9 @@ yy_reduce_print (yyrule) #endif { int yyi; - unsigned int yylineno = yyrline[yyrule]; + unsigned int yylno = yyrline[yyrule]; YYFPRINTF (stderr, "Reducing stack by rule %d (line %u), ", - yyrule - 1, yylineno); + yyrule - 1, yylno); /* Print the symbols being reduced, and their result. */ for (yyi = yyprhs[yyrule]; 0 <= yyrhs[yyi]; yyi++) YYFPRINTF (stderr, "%s ", yytname [yyrhs[yyi]]); @@ -975,7 +1004,7 @@ int yydebug; SIZE_MAX < YYSTACK_BYTES (YYMAXDEPTH) evaluated with infinite-precision integer arithmetic. */ -#if YYMAXDEPTH == 0 +#if defined (YYMAXDEPTH) && YYMAXDEPTH == 0 # undef YYMAXDEPTH #endif @@ -1173,9 +1202,9 @@ int yynerrs; to reallocate them elsewhere. */ /* The state stack. */ - short yyssa[YYINITDEPTH]; - short *yyss = yyssa; - register short *yyssp; + short int yyssa[YYINITDEPTH]; + short int *yyss = yyssa; + register short int *yyssp; /* The semantic value stack. */ YYSTYPE yyvsa[YYINITDEPTH]; @@ -1212,6 +1241,7 @@ int yynerrs; yyssp = yyss; yyvsp = yyvs; + goto yysetstate; /*------------------------------------------------------------. @@ -1237,7 +1267,7 @@ int yynerrs; these so that the &'s don't force the real ones into memory. */ YYSTYPE *yyvs1 = yyvs; - short *yyss1 = yyss; + short int *yyss1 = yyss; /* Each stack pointer address is followed by the size of the @@ -1265,7 +1295,7 @@ int yynerrs; yystacksize = YYMAXDEPTH; { - short *yyss1 = yyss; + short int *yyss1 = yyss; union yyalloc *yyptr = (union yyalloc *) YYSTACK_ALLOC (YYSTACK_BYTES (yystacksize)); if (! yyptr) @@ -1398,7 +1428,7 @@ yyreduce: switch (yyn) { case 2: -#line 121 "compile.y" +#line 132 "compile.y" { Method& method=*new Method(Method::CT_ANY, 0, 0, /*min, max numbered_params_count*/ @@ -1409,7 +1439,7 @@ yyreduce: break; case 9: -#line 136 "compile.y" +#line 147 "compile.y" { const String& command=*LA2S(*yyvsp[-2]); YYSTYPE strings_code=yyvsp[0]; @@ -1420,21 +1450,13 @@ yyreduce: YYERROR; } if(command==CLASS_NAME) { - if(PC.cclass->base_class()) { // already changed from default? - strcpy(PC.error, "class already have a name '"); - strncat(PC.error, PC.cclass->name().cstr(), 100); - strcat(PC.error, "'"); - YYERROR; - } if(strings_code->count()==1*OPERATIONS_PER_OPVALUE) { // new class' name const String& name=*LA2S(*strings_code); // creating the class VStateless_class* cclass=new VClass; - PC.cclass=cclass; - PC.cclass->set_name(name); - // append to request's classes - PC.request.classes().put(name, cclass); + PC.cclass_new=cclass; + PC.cclass_new->set_name(name); } else { strcpy(PC.error, "@"CLASS_NAME" must contain only one line with class name (contains more then one)"); YYERROR; @@ -1443,9 +1465,16 @@ yyreduce: for(size_t i=0; icount(); i+=OPERATIONS_PER_OPVALUE) PC.request.use_file(PC.request.main_class, *LA2S(*strings_code, i)); } 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, "'"); + YYERROR; + } + PC.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(), 100); + strncat(PC.error, PC.cclass->base_class()->name().cstr(), MAX_STRING/2); strcat(PC.error, "'"); YYERROR; } @@ -1473,26 +1502,56 @@ yyreduce: strcpy(PC.error, "@"BASE_NAME" must contain sole name"); YYERROR; } + } else if(command==OPTIONS_CONTROL_METHOD_NAME) { + for(size_t i=0; icount(); i+=OPERATIONS_PER_OPVALUE) { + const String& option=*LA2S(*strings_code, i); + if(option==OPTION_ALL_VARS_LOCAL_NAME){ + PC.set_all_vars_local(); + } else if(option==OPTION_PARTIAL_CLASS){ + 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"); + YYERROR; + } + } else { + // mark new class as partial. we can add methods to it later. + PC.cclass_new->set_partial(); + } + } else { + strcpy(PC.error, "'"OPTION_PARTIAL_CLASS"' option should be used straight after @"CLASS_NAME); + YYERROR; + } + } else { + strcpy(PC.error, "'"); + strncat(PC.error, option.cstr(), MAX_STRING/2); + strcat(PC.error, "' invalid option. valid options are " + "'"OPTION_PARTIAL_CLASS"' and '"OPTION_ALL_VARS_LOCAL_NAME"'"); + 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"' and '"BASE_NAME"'"); + "'"CLASS_NAME"', '"USE_CONTROL_METHOD_NAME"', '"BASE_NAME"' and '"OPTIONS_CONTROL_METHOD_NAME"'."); YYERROR; } ;} break; case 13: -#line 208 "compile.y" +#line 248 "compile.y" { yyval=yyvsp[-1]; P(*yyval, *yyvsp[0]) ;} break; case 17: -#line 212 "compile.y" +#line 252 "compile.y" { + PC.class_add(); PC.explicit_result=false; - const String& name=*LA2S(*yyvsp[-4]); YYSTYPE params_names_code=yyvsp[-3]; ArrayString* params_names=0; @@ -1504,24 +1563,29 @@ yyreduce: YYSTYPE locals_names_code=yyvsp[-2]; ArrayString* locals_names=0; + bool all_vars_local=false; 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, Method::CT_ANY, 0, 0/*min,max numbered_params_count*/, params_names, locals_names, - 0/*to be filled later in next {} */, 0); - PC.cclass->add_method(PC.alias_method(name), *method); + 0/*to be filled later in next {} */, 0, all_vars_local); + *reinterpret_cast(&yyval)=method; // todo: check [][;result;] @@ -1529,108 +1593,195 @@ yyreduce: break; case 18: -#line 247 "compile.y" +#line 292 "compile.y" { - // fill in the code - reinterpret_cast(yyvsp[-1])->parser_code=yyvsp[0]; + Method& method=*reinterpret_cast(yyvsp[-1]); + // fill in the code + method.parser_code=yyvsp[0]; + + // register in class + const String& name=*LA2S(*yyvsp[-6]); + PC.cclass->add_method(PC.alias_method(name), method); ;} break; case 21: -#line 253 "compile.y" +#line 303 "compile.y" {yyval=yyvsp[-1];} break; case 25: -#line 255 "compile.y" +#line 305 "compile.y" { yyval=yyvsp[-2]; P(*yyval, *yyvsp[0]) ;} break; case 31: -#line 263 "compile.y" +#line 313 "compile.y" { yyval=yyvsp[-1]; P(*yyval, *yyvsp[0]) ;} break; case 37: -#line 269 "compile.y" +#line 319 "compile.y" { - yyval=yyvsp[0]; /* stack: resulting value */ - changetail_or_append(*yyval, - OP_GET_ELEMENT, false, /*->*/OP_GET_ELEMENT__WRITE, - /*or */OP_WRITE_VALUE - ); /* value=pop; wcontext.write(value) */ + yyval=N(); + YYSTYPE code=yyvsp[0]; + size_t count=code->count(); + +#ifdef OPTIMIZE_BYTECODE_GET_ELEMENT + if( + count!=3 + || !maybe_change_first_opcode(*code, OP::OP_VALUE__GET_ELEMENT, /*=>*/OP::OP_VALUE__GET_ELEMENT__WRITE) + ) +#endif + +#ifdef OPTIMIZE_BYTECODE_GET_SELF_ELEMENT + if( + count!=3 + || !maybe_change_first_opcode(*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 + || !maybe_change_first_opcode(*code, OP::OP_GET_OBJECT_ELEMENT, /*=>*/OP::OP_GET_OBJECT_ELEMENT__WRITE) + ) +#endif + +#ifdef OPTIMIZE_BYTECODE_GET_OBJECT_VAR_ELEMENT + if( + count!=5 + || !maybe_change_first_opcode(*code, OP::OP_GET_OBJECT_VAR_ELEMENT, /*=>*/OP::OP_GET_OBJECT_VAR_ELEMENT__WRITE) + ) +#endif + { + changetail_or_append(*code, + OP::OP_GET_ELEMENT, false, /*=>*/OP::OP_GET_ELEMENT__WRITE, + /*or */OP::OP_WRITE_VALUE + ); /* value=pop; wcontext.write(value) */ + } + + P(*yyval, *code); ;} break; case 38: -#line 276 "compile.y" +#line 360 "compile.y" { yyval=yyvsp[0] ;} break; case 41: -#line 278 "compile.y" +#line 362 "compile.y" { yyval=yyvsp[-1] ;} break; case 44: -#line 282 "compile.y" +#line 366 "compile.y" { yyval=N(); - ArrayOperation* diving_code=yyvsp[0]; - const String* first_name=LA2S(*diving_code); - // self.xxx... -> xxx... - // OP_VALUE+origin+string+OP_GET_ELEMENT+... -> OP_WITH_SELF+... - if(first_name && *first_name==SELF_ELEMENT_NAME) { - O(*yyval, OP_WITH_SELF); /* stack: starting context */ - P(*yyval, *diving_code, - /* skip over... */ - diving_code->count()>=4?4/*OP_VALUE+origin+string+OP_GET_ELEMENTx*/:3/*OP_+origin+string*/); + YYSTYPE diving_code=yyvsp[0]; + size_t count=diving_code->count(); + + if(maybe_make_self(*yyval, *diving_code, count)) { + // $self. + } else + +#ifdef OPTIMIZE_BYTECODE_GET_OBJECT_ELEMENT + if(maybe_make_get_object_element(*yyval, *diving_code, count)){ + // optimization for $object.field + ^object.method[ + } else +#endif + +#ifdef OPTIMIZE_BYTECODE_GET_OBJECT_VAR_ELEMENT + if(maybe_make_get_object_var_element(*yyval, *diving_code, count)){ + // optimization for $object.$var + } else +#endif + +#ifdef OPTIMIZE_BYTECODE_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) + ? OP::OP_VALUE__GET_ELEMENT_OR_OPERATOR // ^object[ : OP_VALUE+origin+string+OP_GET_ELEMENT => OP_VALUE__GET_ELEMENT_OR_OPERATOR+origin+string + : OP::OP_VALUE__GET_ELEMENT // $object : OP_VALUE+origin+string+OP_GET_ELEMENT => OP_VALUE__GET_ELEMENT+origin+string + ); + P(*yyval, *diving_code, 1/*offset*/, 2/*limit*/); // copy origin+value + if(count>4) + P(*yyval, *diving_code, 4); // copy tail } else { - O(*yyval, OP_WITH_READ); /* stack: starting context */ + O(*yyval, OP::OP_WITH_READ); /* stack: starting context */ + P(*yyval, *diving_code); + } +#else + { + O(*yyval, OP::OP_WITH_READ); /* stack: starting context */ - // ^if ELEMENT -> ^if ELEMENT_OR_OPERATOR - // OP_VALUE+origin+string+OP_GET_ELEMENT. -> OP_VALUE+origin+string+OP_GET_ELEMENT_OR_OPERATOR. - if(PC.in_call_value && diving_code->count()==4) - diving_code->put(4-1, OP_GET_ELEMENT_OR_OPERATOR); + // ^if OP_ELEMENT => ^if OP_ELEMENT_OR_OPERATOR + // optimized OP_VALUE+origin+string+OP_GET_ELEMENT. => OP_VALUE+origin+string+OP_GET_ELEMENT_OR_OPERATOR. + if(PC.in_call_value && count==4) + diving_code->put(count-1, OP::OP_GET_ELEMENT_OR_OPERATOR); P(*yyval, *diving_code); } +#endif /* diving code; stack: current context */ ;} break; case 45: -#line 304 "compile.y" +#line 419 "compile.y" { yyval=yyvsp[-1]; P(*yyval, *yyvsp[0]) ;} break; case 47: -#line 305 "compile.y" +#line 420 "compile.y" { yyval=yyvsp[-1]; P(*yyval, *yyvsp[0]) ;} break; case 48: -#line 309 "compile.y" +#line 424 "compile.y" { - yyval=yyvsp[-1]; /* stack: context,name */ - P(*yyval, *yyvsp[0]); /* stack: context,name,constructor_value */ + yyval=N(); +#ifdef OPTIMIZE_BYTECODE_CONSTRUCT + if(maybe_optimize_construct(*yyval, *yyvsp[-1], *yyvsp[0])){ + // $a(expr), $.a(expr), $a[value], $.a[value], $self.a[value], $self.a(expr) + } else +#endif + { + P(*yyval, *yyvsp[-1]); /* stack: context,name */ + P(*yyval, *yyvsp[0]); /* stack: context,name,constructor_value */ + } ;} break; case 52: -#line 317 "compile.y" +#line 440 "compile.y" { yyval=N(); - ArrayOperation* diving_code=yyvsp[0]; - const String* first_name=LA2S(*diving_code); - // $self.xxx... -> $xxx... - // OP_VALUE+origin+string+OP_GET_ELEMENT+... -> OP_WITH_SELF+... - if(first_name && *first_name==SELF_ELEMENT_NAME) { - O(*yyval, OP_WITH_SELF); /* stack: starting context */ - P(*yyval, *diving_code, - /* skip over... */ - diving_code->count()>=4?4/*OP_VALUE+origin+string+OP_GET_ELEMENTx*/:3/*OP_+origin+string*/); - } else { - O(*yyval, OP_WITH_ROOT); /* stack: starting context */ + YYSTYPE diving_code=yyvsp[0]; + size_t count=diving_code->count(); + + if(maybe_make_self(*yyval, *diving_code, count)) { + // $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 + ){ + O(*yyval, OP::OP_WITH_ROOT__VALUE__GET_ELEMENT); + P(*yyval, *diving_code, 1/*offset*/, 2/*limit*/); // copy origin+value + if(count>4) + P(*yyval, *diving_code, 4); // tail + } else +#endif + { + O(*yyval, OP::OP_WITH_ROOT); /* stack: starting context */ P(*yyval, *diving_code); } /* diving code; stack: current context */ @@ -1638,21 +1789,21 @@ yyreduce: break; case 53: -#line 334 "compile.y" +#line 466 "compile.y" { yyval=N(); - O(*yyval, OP_WITH_WRITE); /* stack: starting context */ + O(*yyval, OP::OP_WITH_WRITE); /* stack: starting context */ P(*yyval, *yyvsp[0]); /* diving code; stack: context,name */ ;} break; case 54: -#line 339 "compile.y" +#line 471 "compile.y" { yyval=yyvsp[-1]; P(*yyval, *yyvsp[0]) ;} break; case 58: -#line 346 "compile.y" +#line 478 "compile.y" { // allow $result_or_other_variable[ letters here any time ] *reinterpret_cast(&yyval)=PC.explicit_result; PC.explicit_result=false; @@ -1660,103 +1811,141 @@ yyreduce: break; case 59: -#line 349 "compile.y" +#line 481 "compile.y" { PC.explicit_result=*reinterpret_cast(&yyvsp[-1]); ;} break; case 60: -#line 351 "compile.y" +#line 483 "compile.y" { // stack: context, name yyval=yyvsp[-2]; // stack: context, name, value - O(*yyval, OP_CONSTRUCT_VALUE); /* value=pop; name=pop; context=pop; construct(context,name,value) */ + O(*yyval, OP::OP_CONSTRUCT_VALUE); /* value=pop; name=pop; context=pop; construct(context,name,value) */ ;} break; case 61: -#line 357 "compile.y" +#line 489 "compile.y" { yyval=N(); - O(*yyval, OP_PREPARE_TO_EXPRESSION); + O(*yyval, OP::OP_PREPARE_TO_EXPRESSION); // stack: context, name P(*yyval, *yyvsp[-1]); // stack: context, name, value - O(*yyval, OP_CONSTRUCT_EXPR); /* value=pop->as_expr_result; name=pop; context=pop; construct(context,name,value) */ + O(*yyval, OP::OP_CONSTRUCT_EXPR); /* value=pop->as_expr_result; name=pop; context=pop; construct(context,name,value) */ ;} break; case 62: -#line 365 "compile.y" +#line 497 "compile.y" { // stack: context, name yyval=N(); - OA(*yyval, OP_CURLY_CODE__CONSTRUCT, yyvsp[-1]); /* code=pop; name=pop; context=pop; construct(context,name,junction(code)) */ + OA(*yyval, OP::OP_CURLY_CODE__CONSTRUCT, yyvsp[-1]); /* code=pop; name=pop; context=pop; construct(context,name,junction(code)) */ ;} break; case 66: -#line 376 "compile.y" +#line 508 "compile.y" { yyval=N(); - OA(*yyval, OP_OBJECT_POOL, yyvsp[0]); /* stack: empty write context */ + OA(*yyval, OP::OP_OBJECT_POOL, yyvsp[0]); /* stack: empty write context */ /* some code that writes to that context */ /* context=pop; stack: context.value() */ ;} break; case 69: -#line 383 "compile.y" +#line 515 "compile.y" { yyval=yyvsp[-1]; P(*yyval, *yyvsp[0]) ;} break; case 70: -#line 387 "compile.y" +#line 519 "compile.y" { - yyval=yyvsp[0]; /* stack: value */ - changetail_or_append(*yyval, - OP_CALL, true, /*->*/ OP_CALL__WRITE, - /*or */OP_WRITE_VALUE); /* value=pop; wcontext.write(value) */ +#ifdef OPTIMIZE_BYTECODE_CUT_REM_OPERATOR + if((*yyvsp[0]).count()) +#endif + { + yyval=yyvsp[0]; /* stack: value */ +#ifdef OPTIMIZE_BYTECODE_CONSTRUCT_OBJECT + if(!maybe_change_first_opcode(*yyval, OP::OP_CONSTRUCT_OBJECT, /*=>*/OP::OP_CONSTRUCT_OBJECT__WRITE)) +#endif + changetail_or_append(*yyval, + OP::OP_CALL, true, /*=>*/ OP::OP_CALL__WRITE, + /*or */OP::OP_WRITE_VALUE); /* value=pop; wcontext.write(value) */ + } ;} break; case 71: -#line 393 "compile.y" +#line 533 "compile.y" { PC.in_call_value=true; ;} break; case 72: -#line 396 "compile.y" +#line 536 "compile.y" { PC.in_call_value=false; ;} break; case 73: -#line 399 "compile.y" +#line 539 "compile.y" { /* ^field.$method{vasya} */ - yyval=yyvsp[-3]; /* with_xxx,diving code; stack: context,method_junction */ +#ifdef OPTIMIZE_BYTECODE_CUT_REM_OPERATOR +#ifdef OPTIMIZE_BYTECODE_GET_ELEMENT + const String* operator_name=LA2S(*yyvsp[-3], 0, OP::OP_VALUE__GET_ELEMENT_OR_OPERATOR); +#else + const String* operator_name=LA2S(*yyvsp[-3], 1); +#endif + if(operator_name && *operator_name==REM_OPERATOR_NAME){ + yyval=N(); + } else +#endif + { + YYSTYPE params_code=yyvsp[-1]; + if(params_code->count()==3) { // probably [] case. [OP::OP_VALUE+origin+Void] + if(Value* value=LA2V(*params_code)) // it is OP_VALUE+origin+value? + if(value->is_void()) // value is VVoid? + params_code=0; // ^zzz[] case. don't append lone empty param. + } + /* stack: context, method_junction */ - YYSTYPE params_code=yyvsp[-1]; - if(params_code->count()==4) { // probably [] case. [OP_VALUE+origin+Void+STORE_PARAM] - if(Value* value=LA2V(*params_code)) // it is OP_VALUE+origin+value? - if(!value->is_defined()) // value is VVoid? - params_code=0; // ^zzz[] case. don't append lone empty param. - } - /* stack: context, method_junction */ - OA(*yyval, OP_CALL, params_code); // method_frame=make frame(pop junction); ncontext=pop; call(ncontext,method_frame) stack: value + YYSTYPE var_code=yyvsp[-3]; +#ifdef OPTIMIZE_BYTECODE_CONSTRUCT_OBJECT + if( + var_code->count()==8 + && (*var_code)[0].code==OP::OP_VALUE__GET_CLASS + && (*var_code)[3].code==OP::OP_PREPARE_TO_CONSTRUCT_OBJECT + && (*var_code)[4].code==OP::OP_VALUE + && (*var_code)[7].code==OP::OP_GET_ELEMENT + ){ + yyval=N(); + O(*yyval, OP::OP_CONSTRUCT_OBJECT); + P(*yyval, *var_code, 1/*offset*/, 2/*limit*/); // class name + P(*yyval, *var_code, 5/*offset*/, 2/*limit*/); // constructor name + OA(*yyval, params_code); + } else +#endif + { + yyval=var_code; /* with_xxx,diving code; stack: context,method_junction */ + OA(*yyval, OP::OP_CALL, params_code); // method_frame=make frame(pop junction); ncontext=pop; call(ncontext,method_frame) stack: value + } + } ;} break; case 76: -#line 414 "compile.y" +#line 584 "compile.y" { yyval=yyvsp[-1]; P(*yyval, *yyvsp[0]) ;} break; case 80: -#line 420 "compile.y" +#line 590 "compile.y" { // allow ^call[ letters here any time ] *reinterpret_cast(&yyval)=PC.explicit_result; PC.explicit_result=false; @@ -1764,130 +1953,129 @@ yyreduce: break; case 81: -#line 423 "compile.y" +#line 593 "compile.y" { PC.explicit_result=*reinterpret_cast(&yyvsp[-1]); ;} break; case 82: -#line 425 "compile.y" +#line 595 "compile.y" {yyval=yyvsp[-2];} break; case 83: -#line 426 "compile.y" +#line 596 "compile.y" {yyval=yyvsp[-1];} break; case 84: -#line 427 "compile.y" +#line 597 "compile.y" {yyval=yyvsp[-1];} break; case 86: -#line 430 "compile.y" +#line 600 "compile.y" { yyval=yyvsp[-2]; P(*yyval, *yyvsp[0]) ;} break; case 88: -#line 434 "compile.y" +#line 604 "compile.y" { yyval=yyvsp[-2]; P(*yyval, *yyvsp[0]) ;} break; case 90: -#line 438 "compile.y" +#line 608 "compile.y" { yyval=yyvsp[-2]; P(*yyval, *yyvsp[0]) ;} break; case 91: -#line 440 "compile.y" +#line 610 "compile.y" { yyval=yyvsp[0]; - O(*yyval, OP_STORE_PARAM); ;} break; case 92: -#line 444 "compile.y" +#line 613 "compile.y" { YYSTYPE expr_code=yyvsp[0]; - if(expr_code->count()==3) { // optimizing (double) case. [OP_VALUE+origin+Double] + if(expr_code->count()==3 + && (*expr_code)[0].code==OP::OP_VALUE) { // optimizing (double/bool/incidently 'string' too) case. [OP::OP_VALUE+origin+Double]. no evaluating yyval=expr_code; - O(*yyval, OP_STORE_PARAM); // no evaluating } else { - ArrayOperation* code=N(); - O(*code, OP_PREPARE_TO_EXPRESSION); + YYSTYPE code=N(); + O(*code, OP::OP_PREPARE_TO_EXPRESSION); P(*code, *expr_code); - O(*code, OP_WRITE_EXPR_RESULT); + O(*code, OP::OP_WRITE_EXPR_RESULT); yyval=N(); - OA(*yyval, OP_EXPR_CODE__STORE_PARAM, code); + OA(*yyval, OP::OP_EXPR_CODE__STORE_PARAM, code); } ;} break; case 93: -#line 458 "compile.y" +#line 627 "compile.y" { yyval=N(); - OA(*yyval, OP_CURLY_CODE__STORE_PARAM, yyvsp[0]); + OA(*yyval, OP::OP_CURLY_CODE__STORE_PARAM, yyvsp[0]); ;} break; case 98: -#line 470 "compile.y" +#line 639 "compile.y" { yyval=yyvsp[-1]; P(*yyval, *yyvsp[0]) ;} break; case 100: -#line 472 "compile.y" +#line 641 "compile.y" { yyval=yyvsp[-1]; P(*yyval, *yyvsp[0]) ;} break; case 102: -#line 474 "compile.y" +#line 643 "compile.y" { // we know that name_advance1 not called from ^xxx context // so we'll not check for operator call possibility as we do in name_advance2 /* stack: context */ yyval=yyvsp[0]; /* stack: context,name */ - O(*yyval, OP_GET_ELEMENT); /* name=pop; context=pop; stack: context.get_element(name) */ + O(*yyval, OP::OP_GET_ELEMENT); /* name=pop; context=pop; stack: context.get_element(name) */ ;} break; case 103: -#line 482 "compile.y" +#line 651 "compile.y" { /* stack: context */ yyval=yyvsp[0]; /* stack: context,name */ - O(*yyval, OP_GET_ELEMENT); /* name=pop; context=pop; stack: context.get_element(name) */ + O(*yyval, OP::OP_GET_ELEMENT); /* name=pop; context=pop; stack: context.get_element(name) */ ;} break; case 109: -#line 495 "compile.y" +#line 664 "compile.y" { yyval=yyvsp[0]; - O(*yyval, OP_GET_ELEMENT); + O(*yyval, OP::OP_GET_ELEMENT); ;} break; case 110: -#line 499 "compile.y" +#line 668 "compile.y" { - ArrayOperation* code; + YYSTYPE code; { change_string_literal_to_write_string_literal(*(code=yyvsp[-1])); P(*code, *yyvsp[0]); } yyval=N(); - OA(*yyval, OP_STRING_POOL, code); + OA(*yyval, OP::OP_STRING_POOL, code); ;} break; case 111: -#line 508 "compile.y" +#line 677 "compile.y" { // allow $result_or_other_variable[ letters here any time ] *reinterpret_cast(&yyval)=PC.explicit_result; PC.explicit_result=false; @@ -1895,46 +2083,46 @@ yyreduce: break; case 112: -#line 511 "compile.y" +#line 680 "compile.y" { PC.explicit_result=*reinterpret_cast(&yyvsp[-1]); ;} break; case 113: -#line 513 "compile.y" +#line 682 "compile.y" { yyval=N(); - OA(*yyval, OP_OBJECT_POOL, yyvsp[-2]); /* stack: empty write context */ + OA(*yyval, OP::OP_OBJECT_POOL, yyvsp[-2]); /* stack: empty write context */ /* some code that writes to that context */ /* context=pop; stack: context.value() */ ;} break; case 114: -#line 519 "compile.y" +#line 688 "compile.y" { yyval=N(); - O(*yyval, OP_WITH_READ); + O(*yyval, OP::OP_WITH_READ); P(*yyval, *yyvsp[0]); ;} break; case 116: -#line 524 "compile.y" +#line 693 "compile.y" { yyval=yyvsp[-1]; P(*yyval, *yyvsp[0]) ;} break; case 117: -#line 525 "compile.y" +#line 694 "compile.y" { yyval=yyvsp[0]; - O(*yyval, OP_GET_ELEMENT__WRITE); + O(*yyval, OP::OP_GET_ELEMENT__WRITE); ;} break; case 120: -#line 534 "compile.y" +#line 703 "compile.y" { yyval=yyvsp[-1]; // stack: class name string if(*LA2S(*yyval) == BASE_NAME) { // pseudo BASE class @@ -1945,253 +2133,280 @@ yyreduce: YYERROR; } } - O(*yyval, OP_GET_CLASS); +#ifdef OPTIMIZE_BYTECODE_GET_CLASS + // optimized OP_VALUE+origin+string+OP_GET_CLASS => OP_VALUE__GET_CLASS+origin+string + maybe_change_first_opcode(*yyval, OP::OP_VALUE, OP::OP_VALUE__GET_CLASS) +#else + O(*yyval, OP::OP_GET_CLASS); +#endif ;} break; case 121: -#line 546 "compile.y" +#line 720 "compile.y" { yyval=yyvsp[-1]; if(!PC.in_call_value) { strcpy(PC.error, ":: not allowed here"); YYERROR; } - O(*yyval, OP_PREPARE_TO_CONSTRUCT_OBJECT); + O(*yyval, OP::OP_PREPARE_TO_CONSTRUCT_OBJECT); ;} break; - case 126: -#line 563 "compile.y" - { yyval = yyvsp[-1]; ;} - break; - - case 127: -#line 564 "compile.y" - { yyval = yyvsp[-1]; ;} - break; - case 128: -#line 565 "compile.y" - { yyval = yyvsp[-1]; ;} +#line 739 "compile.y" + { yyval = yyvsp[-1] ;} break; case 129: -#line 567 "compile.y" - { yyval=yyvsp[0]; O(*yyval, OP_NEG) ;} +#line 740 "compile.y" + { yyval = yyvsp[-1] ;} break; case 130: -#line 568 "compile.y" - { yyval=yyvsp[0] ;} +#line 741 "compile.y" + { yyval = yyvsp[-1]; ;} break; case 131: -#line 569 "compile.y" - { yyval=yyvsp[0]; O(*yyval, OP_INV) ;} +#line 743 "compile.y" + { yyval=yyvsp[0]; O(*yyval, OP::OP_NEG) ;} break; case 132: -#line 570 "compile.y" - { yyval=yyvsp[0]; O(*yyval, OP_NOT) ;} +#line 744 "compile.y" + { yyval=yyvsp[0] ;} break; case 133: -#line 571 "compile.y" - { yyval=yyvsp[0]; O(*yyval, OP_DEF) ;} +#line 745 "compile.y" + { yyval=yyvsp[0]; O(*yyval, OP::OP_INV) ;} break; case 134: -#line 572 "compile.y" - { yyval=yyvsp[0]; O(*yyval, OP_IN) ;} +#line 746 "compile.y" + { yyval=yyvsp[0]; O(*yyval, OP::OP_NOT) ;} break; case 135: -#line 573 "compile.y" - { yyval=yyvsp[0]; O(*yyval, OP_FEXISTS) ;} +#line 747 "compile.y" + { yyval=yyvsp[0]; O(*yyval, OP::OP_DEF) ;} break; case 136: -#line 574 "compile.y" - { yyval=yyvsp[0]; O(*yyval, OP_DEXISTS) ;} +#line 748 "compile.y" + { yyval=yyvsp[0]; O(*yyval, OP::OP_IN) ;} break; case 137: -#line 576 "compile.y" - { yyval=yyvsp[-2]; P(*yyval, *yyvsp[0]); O(*yyval, OP_SUB) ;} +#line 749 "compile.y" + { yyval=yyvsp[0]; O(*yyval, OP::OP_FEXISTS) ;} break; case 138: -#line 577 "compile.y" - { yyval=yyvsp[-2]; P(*yyval, *yyvsp[0]); O(*yyval, OP_ADD) ;} +#line 750 "compile.y" + { yyval=yyvsp[0]; O(*yyval, OP::OP_DEXISTS) ;} break; case 139: -#line 578 "compile.y" - { yyval=yyvsp[-2]; P(*yyval, *yyvsp[0]); O(*yyval, OP_MUL) ;} +#line 752 "compile.y" + { yyval=yyvsp[-2]; P(*yyval, *yyvsp[0]); O(*yyval, OP::OP_SUB) ;} break; case 140: -#line 579 "compile.y" - { yyval=yyvsp[-2]; P(*yyval, *yyvsp[0]); O(*yyval, OP_DIV) ;} +#line 753 "compile.y" + { yyval=yyvsp[-2]; P(*yyval, *yyvsp[0]); O(*yyval, OP::OP_ADD) ;} break; case 141: -#line 580 "compile.y" - { yyval=yyvsp[-2]; P(*yyval, *yyvsp[0]); O(*yyval, OP_MOD) ;} +#line 754 "compile.y" + { yyval=yyvsp[-2]; P(*yyval, *yyvsp[0]); O(*yyval, OP::OP_MUL) ;} break; case 142: -#line 581 "compile.y" - { yyval=yyvsp[-2]; P(*yyval, *yyvsp[0]); O(*yyval, OP_INTDIV) ;} +#line 755 "compile.y" + { yyval=yyvsp[-2]; P(*yyval, *yyvsp[0]); O(*yyval, OP::OP_DIV) ;} break; case 143: -#line 582 "compile.y" - { yyval=yyvsp[-2]; P(*yyval, *yyvsp[0]); O(*yyval, OP_BIN_SL) ;} +#line 756 "compile.y" + { yyval=yyvsp[-2]; P(*yyval, *yyvsp[0]); O(*yyval, OP::OP_MOD) ;} break; case 144: -#line 583 "compile.y" - { yyval=yyvsp[-2]; P(*yyval, *yyvsp[0]); O(*yyval, OP_BIN_SR) ;} +#line 757 "compile.y" + { yyval=yyvsp[-2]; P(*yyval, *yyvsp[0]); O(*yyval, OP::OP_INTDIV) ;} break; case 145: -#line 584 "compile.y" - { yyval=yyvsp[-2]; P(*yyval, *yyvsp[0]); O(*yyval, OP_BIN_AND) ;} +#line 758 "compile.y" + { yyval=yyvsp[-2]; P(*yyval, *yyvsp[0]); O(*yyval, OP::OP_BIN_SL) ;} break; case 146: -#line 585 "compile.y" - { yyval=yyvsp[-2]; P(*yyval, *yyvsp[0]); O(*yyval, OP_BIN_OR) ;} +#line 759 "compile.y" + { yyval=yyvsp[-2]; P(*yyval, *yyvsp[0]); O(*yyval, OP::OP_BIN_SR) ;} break; case 147: -#line 586 "compile.y" - { yyval=yyvsp[-2]; P(*yyval, *yyvsp[0]); O(*yyval, OP_BIN_XOR) ;} +#line 760 "compile.y" + { yyval=yyvsp[-2]; P(*yyval, *yyvsp[0]); O(*yyval, OP::OP_BIN_AND) ;} break; case 148: -#line 587 "compile.y" - { yyval=yyvsp[-2]; OA(*yyval, OP_NESTED_CODE, yyvsp[0]); O(*yyval, OP_LOG_AND) ;} +#line 761 "compile.y" + { yyval=yyvsp[-2]; P(*yyval, *yyvsp[0]); O(*yyval, OP::OP_BIN_OR) ;} break; case 149: -#line 588 "compile.y" - { yyval=yyvsp[-2]; OA(*yyval, OP_NESTED_CODE, yyvsp[0]); O(*yyval, OP_LOG_OR) ;} +#line 762 "compile.y" + { yyval=yyvsp[-2]; P(*yyval, *yyvsp[0]); O(*yyval, OP::OP_BIN_XOR) ;} break; case 150: -#line 589 "compile.y" - { yyval=yyvsp[-2]; P(*yyval, *yyvsp[0]); O(*yyval, OP_LOG_XOR) ;} +#line 763 "compile.y" + { yyval=yyvsp[-2]; OA(*yyval, OP::OP_NESTED_CODE, yyvsp[0]); O(*yyval, OP::OP_LOG_AND) ;} break; case 151: -#line 590 "compile.y" - { yyval=yyvsp[-2]; P(*yyval, *yyvsp[0]); O(*yyval, OP_NUM_LT) ;} +#line 764 "compile.y" + { yyval=yyvsp[-2]; OA(*yyval, OP::OP_NESTED_CODE, yyvsp[0]); O(*yyval, OP::OP_LOG_OR) ;} break; case 152: -#line 591 "compile.y" - { yyval=yyvsp[-2]; P(*yyval, *yyvsp[0]); O(*yyval, OP_NUM_GT) ;} +#line 765 "compile.y" + { yyval=yyvsp[-2]; P(*yyval, *yyvsp[0]); O(*yyval, OP::OP_LOG_XOR) ;} break; case 153: -#line 592 "compile.y" - { yyval=yyvsp[-2]; P(*yyval, *yyvsp[0]); O(*yyval, OP_NUM_LE) ;} +#line 766 "compile.y" + { yyval=yyvsp[-2]; P(*yyval, *yyvsp[0]); O(*yyval, OP::OP_NUM_LT) ;} break; case 154: -#line 593 "compile.y" - { yyval=yyvsp[-2]; P(*yyval, *yyvsp[0]); O(*yyval, OP_NUM_GE) ;} +#line 767 "compile.y" + { yyval=yyvsp[-2]; P(*yyval, *yyvsp[0]); O(*yyval, OP::OP_NUM_GT) ;} break; case 155: -#line 594 "compile.y" - { yyval=yyvsp[-2]; P(*yyval, *yyvsp[0]); O(*yyval, OP_NUM_EQ) ;} +#line 768 "compile.y" + { yyval=yyvsp[-2]; P(*yyval, *yyvsp[0]); O(*yyval, OP::OP_NUM_LE) ;} break; case 156: -#line 595 "compile.y" - { yyval=yyvsp[-2]; P(*yyval, *yyvsp[0]); O(*yyval, OP_NUM_NE) ;} +#line 769 "compile.y" + { yyval=yyvsp[-2]; P(*yyval, *yyvsp[0]); O(*yyval, OP::OP_NUM_GE) ;} break; case 157: -#line 596 "compile.y" - { yyval=yyvsp[-2]; P(*yyval, *yyvsp[0]); O(*yyval, OP_STR_LT) ;} +#line 770 "compile.y" + { yyval=yyvsp[-2]; P(*yyval, *yyvsp[0]); O(*yyval, OP::OP_NUM_EQ) ;} break; case 158: -#line 597 "compile.y" - { yyval=yyvsp[-2]; P(*yyval, *yyvsp[0]); O(*yyval, OP_STR_GT) ;} +#line 771 "compile.y" + { yyval=yyvsp[-2]; P(*yyval, *yyvsp[0]); O(*yyval, OP::OP_NUM_NE) ;} break; case 159: -#line 598 "compile.y" - { yyval=yyvsp[-2]; P(*yyval, *yyvsp[0]); O(*yyval, OP_STR_LE) ;} +#line 772 "compile.y" + { yyval=yyvsp[-2]; P(*yyval, *yyvsp[0]); O(*yyval, OP::OP_STR_LT) ;} break; case 160: -#line 599 "compile.y" - { yyval=yyvsp[-2]; P(*yyval, *yyvsp[0]); O(*yyval, OP_STR_GE) ;} +#line 773 "compile.y" + { yyval=yyvsp[-2]; P(*yyval, *yyvsp[0]); O(*yyval, OP::OP_STR_GT) ;} break; case 161: -#line 600 "compile.y" - { yyval=yyvsp[-2]; P(*yyval, *yyvsp[0]); O(*yyval, OP_STR_EQ) ;} +#line 774 "compile.y" + { yyval=yyvsp[-2]; P(*yyval, *yyvsp[0]); O(*yyval, OP::OP_STR_LE) ;} break; case 162: -#line 601 "compile.y" - { yyval=yyvsp[-2]; P(*yyval, *yyvsp[0]); O(*yyval, OP_STR_NE) ;} +#line 775 "compile.y" + { yyval=yyvsp[-2]; P(*yyval, *yyvsp[0]); O(*yyval, OP::OP_STR_GE) ;} break; case 163: -#line 602 "compile.y" - { yyval=yyvsp[-2]; P(*yyval, *yyvsp[0]); O(*yyval, OP_IS) ;} +#line 776 "compile.y" + { yyval=yyvsp[-2]; P(*yyval, *yyvsp[0]); O(*yyval, OP::OP_STR_EQ) ;} break; case 164: -#line 605 "compile.y" +#line 777 "compile.y" + { yyval=yyvsp[-2]; P(*yyval, *yyvsp[0]); O(*yyval, OP::OP_STR_NE) ;} + break; + + case 165: +#line 778 "compile.y" + { yyval=yyvsp[-2]; P(*yyval, *yyvsp[0]); O(*yyval, OP::OP_IS) ;} + break; + + case 166: +#line 781 "compile.y" { - // optimized from OP_STRING->OP_VALUE for doubles + // optimized OP_STRING => OP_VALUE for doubles maybe_change_string_literal_to_double_literal(*(yyval=yyvsp[0])); ;} break; - case 165: -#line 610 "compile.y" + case 167: +#line 786 "compile.y" { +#ifdef OPTIMIZE_BYTECODE_STRING_POOL + // it brakes ^if(" 09 "){...} + YYSTYPE code=yyvsp[0]; + yyval=N(); + if(code->count()==3 && maybe_change_first_opcode(*code, OP::OP_STRING__WRITE, OP::OP_VALUE)){ + // optimized OP_STRING__WRITE+origin+value => OP_VALUE+origin+value without starting OP_STRING_POOL + P(*yyval, *code); + } else { + OA(*yyval, OP::OP_STRING_POOL, code); /* stack: empty write context */ + } +#else yyval=N(); - OA(*yyval, OP_STRING_POOL, yyvsp[0]); /* stack: empty write context */ + OA(*yyval, OP::OP_STRING_POOL, yyvsp[0]); /* stack: empty write context */ +#endif /* some code that writes to that context */ /* context=pop; stack: context.get_string() */ ;} break; - case 166: -#line 619 "compile.y" + case 168: +#line 807 "compile.y" { - // optimized from OP_STRING+OP_WRITE_VALUE to OP_STRING__WRITE + // optimized OP_STRING+OP_WRITE_VALUE => OP_STRING__WRITE change_string_literal_to_write_string_literal(*(yyval=yyvsp[0])) ;} break; - case 167: -#line 624 "compile.y" - { yyval=VL(new VVoid(), 0, 0, 0) ;} + case 169: +#line 812 "compile.y" + { yyval=VL(/*we know that we will not change it*/const_cast(&vvoid), 0, 0, 0) ;} break; - case 168: -#line 625 "compile.y" + case 170: +#line 813 "compile.y" + { yyval = VL(/*we know that we will not change it*/const_cast(&vtrue), 0, 0, 0) ;} + break; + + case 171: +#line 814 "compile.y" + { yyval = VL(/*we know that we will not change it*/const_cast(&vfalse), 0, 0, 0) ;} + break; + + case 172: +#line 816 "compile.y" { yyval=N() ;} break; } -/* Line 991 of yacc.c. */ -#line 2194 "compile.tab.C" +/* Line 1010 of yacc.c. */ +#line 2410 "compile.tab.C" yyvsp -= yylen; yyssp -= yylen; @@ -2232,18 +2447,33 @@ yyerrlab: { YYSIZE_T yysize = 0; int yytype = YYTRANSLATE (yychar); + const char* yyprefix; char *yymsg; - int yyx, yycount; + int yyx; - yycount = 0; /* Start YYX at -YYN if negative to avoid negative indexes in YYCHECK. */ - for (yyx = yyn < 0 ? -yyn : 0; - yyx < (int) (sizeof (yytname) / sizeof (char *)); yyx++) + int yyxbegin = yyn < 0 ? -yyn : 0; + + /* Stay within bounds of both yycheck and yytname. */ + int yychecklim = YYLAST - yyn; + int yyxend = yychecklim < YYNTOKENS ? yychecklim : YYNTOKENS; + int yycount = 0; + + yyprefix = ", expecting "; + for (yyx = yyxbegin; yyx < yyxend; ++yyx) if (yycheck[yyx + yyn] == yyx && yyx != YYTERROR) - yysize += yystrlen (yytname[yyx]) + 15, yycount++; - yysize += yystrlen ("syntax error, unexpected ") + 1; - yysize += yystrlen (yytname[yytype]); + { + yysize += yystrlen (yyprefix) + yystrlen (yytname [yyx]); + yycount += 1; + if (yycount == 5) + { + yysize = 0; + break; + } + } + yysize += (sizeof ("syntax error, unexpected ") + + yystrlen (yytname[yytype])); yymsg = (char *) YYSTACK_ALLOC (yysize); if (yymsg != 0) { @@ -2252,16 +2482,13 @@ yyerrlab: if (yycount < 5) { - yycount = 0; - for (yyx = yyn < 0 ? -yyn : 0; - yyx < (int) (sizeof (yytname) / sizeof (char *)); - yyx++) + yyprefix = ", expecting "; + for (yyx = yyxbegin; yyx < yyxend; ++yyx) if (yycheck[yyx + yyn] == yyx && yyx != YYTERROR) { - const char *yyq = ! yycount ? ", expecting " : " or "; - yyp = yystpcpy (yyp, yyq); + yyp = yystpcpy (yyp, yyprefix); yyp = yystpcpy (yyp, yytname[yyx]); - yycount++; + yyprefix = " or "; } } yyerror (yymsg); @@ -2282,51 +2509,56 @@ yyerrlab: /* If just tried and failed to reuse lookahead token after an error, discard it. */ - /* Return failure if at end of input. */ - if (yychar == YYEOF) + if (yychar <= YYEOF) { - /* Pop the error token. */ - YYPOPSTACK; - /* Pop the rest of the stack. */ - while (yyss < yyssp) - { - YYDSYMPRINTF ("Error: popping", yystos[*yyssp], yyvsp, yylsp); - yydestruct (yystos[*yyssp], yyvsp); - YYPOPSTACK; - } - YYABORT; + /* If at end of input, pop the error token, + then the rest of the stack, then return failure. */ + if (yychar == YYEOF) + for (;;) + { + YYPOPSTACK; + if (yyssp == yyss) + YYABORT; + YYDSYMPRINTF ("Error: popping", yystos[*yyssp], yyvsp, yylsp); + yydestruct (yystos[*yyssp], yyvsp); + } } + else + { + YYDSYMPRINTF ("Error: discarding", yytoken, &yylval, &yylloc); + yydestruct (yytoken, &yylval); + yychar = YYEMPTY; - YYDSYMPRINTF ("Error: discarding", yytoken, &yylval, &yylloc); - yydestruct (yytoken, &yylval); - yychar = YYEMPTY; - + } } /* Else will try to reuse lookahead token after shifting the error token. */ - goto yyerrlab2; + goto yyerrlab1; -/*----------------------------------------------------. -| yyerrlab1 -- error raised explicitly by an action. | -`----------------------------------------------------*/ -yyerrlab1: - - /* Suppress GCC warning that yyerrlab1 is unused when no action - invokes YYERROR. */ -#if defined (__GNUC_MINOR__) && 2093 <= (__GNUC__ * 1000 + __GNUC_MINOR__) - __attribute__ ((__unused__)) +/*---------------------------------------------------. +| yyerrorlab -- error raised explicitly by YYERROR. | +`---------------------------------------------------*/ +yyerrorlab: + +#ifdef __GNUC__ + /* Pacify GCC when the user code never invokes YYERROR and the label + yyerrorlab therefore never appears in user code. */ + if (0) + goto yyerrorlab; #endif - - goto yyerrlab2; + yyvsp -= yylen; + yyssp -= yylen; + yystate = *yyssp; + goto yyerrlab1; -/*---------------------------------------------------------------. -| yyerrlab2 -- pop states until the error token can be shifted. | -`---------------------------------------------------------------*/ -yyerrlab2: +/*-------------------------------------------------------------. +| yyerrlab1 -- common code for both syntax error and YYERROR. | +`-------------------------------------------------------------*/ +yyerrlab1: yyerrstatus = 3; /* Each real token shifted decrements this. */ for (;;) @@ -2349,9 +2581,8 @@ yyerrlab2: YYDSYMPRINTF ("Error: popping", yystos[*yyssp], yyvsp, yylsp); yydestruct (yystos[yystate], yyvsp); - yyvsp--; - yystate = *--yyssp; - + YYPOPSTACK; + yystate = *yyssp; YY_STACK_PRINT (yyss, yyssp); } @@ -2400,7 +2631,7 @@ yyreturn: } -#line 627 "compile.y" +#line 818 "compile.y" #endif @@ -2493,7 +2724,7 @@ case LS_DEF_COMMENT: default: switch(*pc.source) { // ^escaping some punctuators - case '^': case '$': case ';': + case '^': case '$': case ';': case '@': case '(': case ')': case '[': case ']': case '{': case '}': @@ -2521,10 +2752,10 @@ default: pc.string.append_strdup_know_length(begin, end-begin); } // #HH ? - if(pc.source[0]=='#' && pc.source[1] && pc.source[2]) { - char c= + if(pc.source[1] && isxdigit(pc.source[1]) && pc.source[2] && isxdigit(pc.source[2])) { + char c=(char)( hex_value[(unsigned char)pc.source[1]]*0x10+ - hex_value[(unsigned char)pc.source[2]]; + hex_value[(unsigned char)pc.source[2]]); if(c==0) { result=BAD_HEX_LITERAL; goto break2; // wrong hex value[no ^#00 chars allowed]: bail out @@ -2540,7 +2771,14 @@ default: // skip analysis = forced literal continue; } - break; + // just escaped char + // reset piece 'begin' position & line + begin=pc.source; + begin_pos=pc.pos; + // skip over _ after ^ + pc.source++; pc.pos.col++; + // skip analysis = forced literal + continue; } break; } @@ -2837,8 +3075,28 @@ default: case 'd': if(end==begin) // right after whitespace if(pc.source[0]=='e' && pc.source[1]=='f') { // def - skip_analized=2; - result=DEF; + switch(pc.source[2]){ + case ' ': case '\t': case '\n': case '"': case '\'': case '^': case '$': // non-quoted string without whitespace after 'def' is not allowed + skip_analized=2; + result=DEF; + goto break2; + } + // error: incorrect char after 'def' + } + break; + case 't': + if(end==begin) // right after whitespace + if(pc.source[0]=='r' && pc.source[1]=='u' && pc.source[2]=='e') { // true + skip_analized=3; + result=LITERAL_TRUE; + goto break2; + } + break; + case 'f': + if(end==begin) // right after whitespace + if(pc.source[0]=='a' && pc.source[1]=='l' && pc.source[2]=='s' && pc.source[3]=='e') { // false + skip_analized=4; + result=LITERAL_FALSE; goto break2; } break; @@ -2918,6 +3176,8 @@ default: case '=': case '!': // common delimiters case ',': case '?': case '#': + // mysql column separators + case '`': // before call case '^': pop_LS(pc);