--- parser3/src/main/compile.tab.C 2001/08/06 16:18:26 1.2 +++ parser3/src/main/compile.tab.C 2004/04/06 07:53:57 1.96 @@ -9,29 +9,42 @@ #define BOGUS 259 #define BAD_STRING_COMPARISON_OPERATOR 260 #define BAD_HEX_LITERAL 261 -#define LAND 262 -#define LOR 263 -#define LXOR 264 -#define NLE 265 -#define NGE 266 -#define NEQ 267 -#define NNE 268 -#define SLT 269 -#define SGT 270 -#define SLE 271 -#define SGE 272 -#define SEQ 273 -#define SNE 274 -#define DEF 275 -#define IN 276 -#define FEXISTS 277 -#define DEXISTS 278 -#define IS 279 -#define NEG 280 +#define BAD_METHOD_DECL_START 262 +#define BAD_METHOD_PARAMETER_NAME_CHARACTER 263 +#define BAD_MATH_OPERATOR_CHARACTER 264 +#define LAND 265 +#define LOR 266 +#define LXOR 267 +#define NXOR 268 +#define NLE 269 +#define NGE 270 +#define NEQ 271 +#define NNE 272 +#define NSL 273 +#define NSR 274 +#define SLT 275 +#define SGT 276 +#define SLE 277 +#define SGE 278 +#define SEQ 279 +#define SNE 280 +#define DEF 281 +#define IN 282 +#define FEXISTS 283 +#define DEXISTS 284 +#define IS 285 +#define NUNARY 286 + +#line 1 "compile.y" -#line 8 "compile.y" +/** @file + Parser: compiler(lexical parser and grammar). -static char *RCSId="$Id: compile.tab.C,v 1.2 2001/08/06 16:18:26 parser Exp $"; + Copyright (c) 2001, 2003 ArtLebedev Group (http://www.artlebedev.com) + Author: Alexander Petrosyan (http://design.ru/paf) + + $Id: compile.tab.C,v 1.96 2004/04/06 07:53:57 paf Exp $ +*/ /** @todo parser4: @@ -44,14 +57,16 @@ static char *RCSId="$Id: compile.tab.C,v -#: in iis make up specialized Pool object for that */ -#define YYSTYPE Array/**/ * +#define YYSTYPE ArrayOperation* #define YYPARSE_PARAM pc #define YYLEX_PARAM pc #define YYDEBUG 1 #define YYERROR_VERBOSE 1 -#define yyerror(msg) real_yyerror((parse_control *)pc, msg) +#define yyerror(msg) real_yyerror((Parse_control *)pc, msg) #define YYPRINT(file, type, value) yyprint(file, type, value) +// includes + #include "compile_tools.h" #include "pa_value.h" #include "pa_request.h" @@ -59,20 +74,24 @@ static char *RCSId="$Id: compile.tab.C,v #include "pa_vdouble.h" #include "pa_globals.h" #include "pa_vvoid.h" +#include "pa_vmethod_frame.h" + +// defines -#define SELF_ELEMENT_NAME "self" #define USE_CONTROL_METHOD_NAME "USE" -static int real_yyerror(parse_control *pc, char *s); -static void yyprint(FILE *file, int type, YYSTYPE value); -static int yylex(YYSTYPE *lvalp, void *pc); +// forwards +static int real_yyerror(Parse_control* pc, char* s); +static void yyprint(FILE* file, int type, YYSTYPE value); +static int yylex(YYSTYPE* lvalp, void* pc); +static int is_not_whitespace(char c, int); // local convinient inplace typecast & var -#define PC (*(parse_control *)pc) +#undef PC +#define PC (*(Parse_control *)pc) +#undef POOL #define POOL (*PC.pool) -#undef NEW -#define NEW new(POOL) #ifndef DOXYGEN #ifndef YYSTYPE #define YYSTYPE int @@ -87,26 +106,26 @@ static int yylex(YYSTYPE *lvalp, void *p -#define YYFINAL 240 +#define YYFINAL 255 #define YYFLAG -32768 -#define YYNTBASE 54 +#define YYNTBASE 60 -#define YYTRANSLATE(x) ((unsigned)(x) <= 280 ? yytranslate[x] : 132) +#define YYTRANSLATE(x) ((unsigned)(x) <= 286 ? yytranslate[x] : 142) static const char yytranslate[] = { 0, - 2, 2, 2, 2, 2, 2, 2, 2, 2, 40, + 2, 2, 2, 2, 2, 2, 2, 2, 2, 46, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, - 2, 2, 28, 52, 29, 44, 37, 31, 53, 48, - 49, 35, 34, 2, 33, 47, 36, 2, 2, 2, - 2, 2, 2, 2, 2, 2, 2, 51, 43, 26, - 2, 27, 2, 39, 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, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, - 41, 2, 42, 50, 2, 2, 2, 2, 2, 2, + 47, 40, 48, 56, 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, 45, 30, 46, 32, 2, 2, 2, 2, + 2, 2, 51, 34, 52, 43, 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, 2, @@ -121,95 +140,101 @@ static const char yytranslate[] = { 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 1, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, - 17, 18, 19, 20, 21, 22, 23, 24, 25, 38 + 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, + 27, 28, 29, 30, 31, 42 }; #if YYDEBUG != 0 static const short yyprhs[] = { 0, 0, 2, 4, 6, 9, 11, 13, 15, 20, 22, - 24, 26, 29, 32, 34, 36, 44, 46, 48, 52, - 54, 56, 58, 62, 64, 66, 68, 70, 72, 75, - 77, 79, 81, 83, 85, 87, 90, 93, 95, 99, - 101, 103, 105, 108, 110, 113, 117, 119, 121, 123, - 125, 128, 131, 133, 135, 137, 141, 145, 149, 151, - 153, 155, 157, 159, 161, 164, 166, 167, 168, 175, - 177, 179, 182, 184, 186, 188, 192, 196, 200, 202, - 206, 208, 212, 214, 218, 220, 222, 224, 226, 228, - 230, 232, 234, 237, 239, 242, 245, 247, 249, 252, - 254, 256, 258, 261, 264, 266, 268, 271, 274, 276, - 278, 281, 284, 286, 288, 290, 292, 296, 300, 304, - 307, 310, 313, 316, 319, 322, 325, 329, 333, 337, - 341, 345, 349, 353, 357, 361, 365, 369, 373, 377, - 381, 385, 389, 393, 397, 401, 405, 409, 413, 417, - 421, 423, 425, 426 + 24, 26, 29, 32, 34, 36, 37, 46, 48, 50, + 54, 56, 58, 60, 64, 66, 68, 70, 72, 74, + 77, 79, 81, 82, 85, 87, 89, 91, 93, 96, + 99, 101, 105, 107, 109, 111, 114, 116, 119, 123, + 125, 127, 129, 131, 134, 137, 139, 141, 143, 147, + 151, 155, 157, 159, 161, 163, 165, 167, 170, 172, + 173, 174, 181, 183, 185, 188, 190, 192, 194, 198, + 202, 206, 208, 212, 214, 218, 220, 224, 226, 228, + 230, 232, 234, 236, 238, 240, 243, 245, 248, 251, + 253, 255, 258, 260, 262, 264, 266, 269, 272, 276, + 278, 280, 283, 286, 288, 290, 293, 296, 298, 300, + 302, 304, 308, 312, 316, 319, 322, 325, 328, 331, + 334, 337, 340, 344, 348, 352, 356, 360, 364, 368, + 372, 376, 380, 384, 388, 392, 396, 400, 404, 408, + 412, 416, 420, 424, 428, 432, 436, 440, 444, 448, + 450, 452, 453 }; -static const short yyrhs[] = { 56, - 0, 55, 0, 57, 0, 55, 57, 0, 69, 0, - 58, 0, 63, 0, 39, 4, 40, 59, 0, 131, - 0, 60, 0, 61, 0, 60, 61, 0, 62, 40, - 0, 131, 0, 4, 0, 39, 4, 65, 64, 68, - 40, 69, 0, 131, 0, 65, 0, 41, 66, 42, - 0, 131, 0, 67, 0, 4, 0, 67, 43, 4, - 0, 131, 0, 4, 0, 131, 0, 70, 0, 71, - 0, 70, 71, 0, 129, 0, 72, 0, 73, 0, - 81, 0, 94, 0, 74, 0, 44, 75, 0, 77, - 3, 0, 76, 0, 45, 77, 46, 0, 78, 0, - 79, 0, 80, 0, 123, 80, 0, 116, 0, 113, - 116, 0, 44, 82, 86, 0, 83, 0, 84, 0, - 85, 0, 112, 0, 47, 112, 0, 123, 112, 0, - 87, 0, 88, 0, 89, 0, 41, 90, 42, 0, - 48, 126, 49, 0, 45, 69, 46, 0, 130, 0, - 4, 0, 91, 0, 92, 0, 93, 0, 72, 0, - 71, 70, 0, 95, 0, 0, 0, 50, 96, 98, - 97, 99, 3, 0, 77, 0, 100, 0, 99, 100, - 0, 101, 0, 102, 0, 103, 0, 41, 104, 42, - 0, 48, 105, 49, 0, 45, 106, 46, 0, 107, - 0, 104, 43, 107, 0, 108, 0, 105, 43, 108, - 0, 109, 0, 106, 43, 109, 0, 110, 0, 111, - 0, 69, 0, 130, 0, 4, 0, 91, 0, 126, - 0, 117, 0, 113, 117, 0, 114, 0, 113, 114, - 0, 115, 47, 0, 117, 0, 117, 0, 4, 5, - 0, 4, 0, 118, 0, 119, 0, 44, 120, 0, - 4, 121, 0, 4, 0, 122, 0, 121, 122, 0, - 44, 120, 0, 124, 0, 125, 0, 4, 51, 0, - 124, 51, 0, 127, 0, 4, 0, 74, 0, 95, - 0, 52, 128, 52, 0, 53, 128, 53, 0, 48, - 127, 49, 0, 33, 127, 0, 32, 127, 0, 28, - 127, 0, 21, 127, 0, 22, 127, 0, 23, 127, - 0, 24, 127, 0, 127, 33, 127, 0, 127, 34, - 127, 0, 127, 35, 127, 0, 127, 36, 127, 0, - 127, 37, 127, 0, 127, 31, 127, 0, 127, 30, - 127, 0, 127, 29, 127, 0, 127, 8, 127, 0, - 127, 9, 127, 0, 127, 10, 127, 0, 127, 26, - 127, 0, 127, 27, 127, 0, 127, 11, 127, 0, - 127, 12, 127, 0, 127, 13, 127, 0, 127, 14, - 127, 0, 127, 15, 127, 0, 127, 16, 127, 0, - 127, 17, 127, 0, 127, 18, 127, 0, 127, 19, - 127, 0, 127, 20, 127, 0, 127, 25, 127, 0, - 69, 0, 4, 0, 0, 0 +static const short yyrhs[] = { 62, + 0, 61, 0, 63, 0, 61, 63, 0, 76, 0, + 64, 0, 69, 0, 45, 4, 46, 65, 0, 141, + 0, 66, 0, 67, 0, 66, 67, 0, 68, 46, + 0, 141, 0, 4, 0, 0, 45, 4, 72, 71, + 75, 46, 70, 76, 0, 141, 0, 72, 0, 47, + 73, 48, 0, 141, 0, 74, 0, 4, 0, 74, + 49, 4, 0, 141, 0, 4, 0, 141, 0, 77, + 0, 78, 0, 77, 78, 0, 139, 0, 79, 0, + 0, 80, 81, 0, 82, 0, 90, 0, 103, 0, + 83, 0, 50, 84, 0, 86, 3, 0, 85, 0, + 51, 86, 52, 0, 87, 0, 88, 0, 89, 0, + 133, 89, 0, 125, 0, 122, 125, 0, 50, 91, + 95, 0, 92, 0, 93, 0, 94, 0, 121, 0, + 53, 121, 0, 133, 121, 0, 96, 0, 97, 0, + 98, 0, 47, 99, 48, 0, 54, 136, 55, 0, + 51, 76, 52, 0, 140, 0, 4, 0, 100, 0, + 101, 0, 102, 0, 79, 0, 78, 77, 0, 104, + 0, 0, 0, 56, 105, 107, 106, 108, 3, 0, + 86, 0, 109, 0, 108, 109, 0, 110, 0, 111, + 0, 112, 0, 47, 113, 48, 0, 54, 114, 55, + 0, 51, 115, 52, 0, 116, 0, 113, 49, 116, + 0, 117, 0, 114, 49, 117, 0, 118, 0, 115, + 49, 118, 0, 119, 0, 120, 0, 76, 0, 140, + 0, 4, 0, 100, 0, 136, 0, 126, 0, 122, + 126, 0, 123, 0, 122, 123, 0, 124, 53, 0, + 126, 0, 126, 0, 4, 5, 0, 4, 0, 127, + 0, 128, 0, 129, 0, 50, 130, 0, 4, 131, + 0, 47, 77, 48, 0, 4, 0, 132, 0, 131, + 132, 0, 50, 130, 0, 134, 0, 135, 0, 4, + 57, 0, 134, 57, 0, 137, 0, 4, 0, 83, + 0, 104, 0, 58, 138, 58, 0, 59, 138, 59, + 0, 54, 137, 55, 0, 37, 137, 0, 36, 137, + 0, 43, 137, 0, 44, 137, 0, 27, 137, 0, + 28, 137, 0, 29, 137, 0, 30, 137, 0, 137, + 37, 137, 0, 137, 36, 137, 0, 137, 38, 137, + 0, 137, 39, 137, 0, 137, 41, 137, 0, 137, + 40, 137, 0, 137, 19, 137, 0, 137, 20, 137, + 0, 137, 35, 137, 0, 137, 34, 137, 0, 137, + 14, 137, 0, 137, 11, 137, 0, 137, 12, 137, + 0, 137, 13, 137, 0, 137, 32, 137, 0, 137, + 33, 137, 0, 137, 15, 137, 0, 137, 16, 137, + 0, 137, 17, 137, 0, 137, 18, 137, 0, 137, + 21, 137, 0, 137, 22, 137, 0, 137, 23, 137, + 0, 137, 24, 137, 0, 137, 25, 137, 0, 137, + 26, 137, 0, 137, 31, 137, 0, 76, 0, 4, + 0, 0, 0 }; #endif #if YYDEBUG != 0 static const short yyrline[] = { 0, - 106, 116, 118, 118, 119, 121, 121, 123, 189, 189, - 190, 190, 191, 192, 192, 194, 223, 223, 224, 225, - 225, 226, 226, 228, 228, 232, 232, 234, 234, 235, - 235, 236, 236, 236, 240, 244, 245, 245, 246, 247, - 249, 250, 265, 266, 266, 270, 274, 276, 277, 278, - 293, 298, 300, 301, 302, 305, 311, 317, 323, 325, - 326, 328, 334, 335, 335, 339, 343, 344, 345, 359, - 361, 361, 362, 364, 365, 367, 368, 369, 370, 372, - 374, 376, 378, 380, 382, 386, 390, 394, 396, 397, - 399, 406, 406, 408, 408, 409, 410, 415, 420, 422, - 424, 425, 427, 431, 439, 444, 444, 445, 450, 452, - 454, 458, 470, 474, 476, 477, 478, 479, 480, 482, - 483, 484, 485, 486, 487, 488, 490, 491, 492, 493, - 494, 495, 496, 497, 498, 499, 500, 501, 502, 503, - 504, 505, 506, 507, 508, 509, 510, 511, 512, 513, - 516, 525, 530, 531 + 121, 129, 131, 131, 132, 134, 134, 136, 208, 208, + 209, 209, 210, 211, 211, 213, 248, 253, 253, 254, + 255, 255, 256, 256, 258, 258, 262, 262, 264, 264, + 265, 265, 266, 269, 273, 273, 273, 277, 284, 285, + 285, 286, 287, 289, 290, 312, 313, 313, 317, 321, + 323, 324, 325, 342, 347, 349, 351, 352, 354, 360, + 368, 374, 376, 377, 379, 385, 386, 386, 390, 396, + 399, 402, 415, 417, 417, 418, 420, 421, 423, 424, + 425, 426, 428, 430, 432, 434, 436, 438, 442, 446, + 450, 452, 453, 455, 464, 464, 466, 466, 467, 468, + 476, 481, 483, 485, 486, 487, 489, 493, 502, 508, + 513, 513, 514, 519, 521, 523, 535, 547, 552, 554, + 555, 556, 557, 558, 560, 561, 562, 563, 564, 565, + 566, 567, 569, 570, 571, 572, 573, 574, 575, 576, + 577, 578, 579, 580, 581, 582, 583, 584, 585, 586, + 587, 588, 589, 590, 591, 592, 593, 594, 595, 598, + 607, 622, 623 }; #endif @@ -217,240 +242,258 @@ static const short yyrline[] = { 0, #if YYDEBUG != 0 || defined (YYERROR_VERBOSE) static const char * const yytname[] = { "$","error","$undefined.","EON","STRING", -"BOGUS","BAD_STRING_COMPARISON_OPERATOR","BAD_HEX_LITERAL","\"&&\"","\"||\"", -"\"##\"","\"<=\"","\">=\"","\"==\"","\"!=\"","\"lt\"","\"gt\"","\"le\"","\"ge\"", -"\"eq\"","\"ne\"","\"def\"","\"in\"","\"-f\"","\"-d\"","\"is\"","'<'","'>'", -"'!'","'#'","'|'","'&'","'~'","'-'","'+'","'*'","'/'","'%'","NEG","'@'","'\\n'", -"'['","']'","';'","'$'","'{'","'}'","'.'","'('","')'","'^'","':'","'\\\"'","'\\''", -"all","methods","one_big_piece","method","control_method","maybe_control_strings", -"control_strings","control_string","maybe_string","code_method","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", +"BOGUS","BAD_STRING_COMPARISON_OPERATOR","BAD_HEX_LITERAL","BAD_METHOD_DECL_START", +"BAD_METHOD_PARAMETER_NAME_CHARACTER","BAD_MATH_OPERATOR_CHARACTER","\"&&\"", +"\"||\"","\"!||\"","\"!|\"","\"<=\"","\">=\"","\"==\"","\"!=\"","\"<<\"","\">>\"", +"\"lt\"","\"gt\"","\"le\"","\"ge\"","\"eq\"","\"ne\"","\"def\"","\"in\"","\"-f\"", +"\"-d\"","\"is\"","'<'","'>'","'|'","'&'","'+'","'-'","'*'","'/'","'\\\\'","'%'", +"NUNARY","'~'","'!'","'@'","'\\n'","'['","']'","';'","'$'","'{'","'}'","'.'", +"'('","')'","'^'","':'","'\\\"'","'\\''","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", +"@2","real_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", "construct_round","construct_curly","any_constructor_code_value","constructor_code_value", -"constructor_code","codes__excluding_sole_str_literal","call","call_value","@1", -"@2","call_name","store_params","store_param","store_square_param","store_round_param", +"constructor_code","codes__excluding_sole_str_literal","call","call_value","@3", +"@4","call_name","store_params","store_param","store_square_param","store_round_param", "store_curly_param","store_code_param_parts","store_expr_param_parts","store_curly_param_parts", "store_code_param_part","store_expr_param_part","store_curly_param_part","code_param_value", "write_expr_value","name_expr_dive_code","name_path","name_step","name_advance1", "name_advance2","name_expr_value","name_expr_subvar_value","name_expr_with_subvar_value", -"subvar_ref_name_rdive","subvar_get_writes","subvar__get_write","class_prefix", -"class_static_prefix","class_constructor_prefix","expr_value","expr","string_inside_quotes_value", -"write_string","void_value","empty", NULL +"name_square_code_value","subvar_ref_name_rdive","subvar_get_writes","subvar__get_write", +"class_prefix","class_static_prefix","class_constructor_prefix","expr_value", +"expr","string_inside_quotes_value","write_string","void_value","empty", NULL }; #endif static const short yyr1[] = { 0, - 54, 54, 55, 55, 56, 57, 57, 58, 59, 59, - 60, 60, 61, 62, 62, 63, 64, 64, 65, 66, - 66, 67, 67, 68, 68, 69, 69, 70, 70, 71, - 71, 72, 72, 72, 73, 74, 75, 75, 76, 77, - 77, 78, 79, 80, 80, 81, 82, 82, 82, 83, - 84, 85, 86, 86, 86, 87, 88, 89, 90, 90, - 90, 91, 92, 93, 93, 94, 96, 97, 95, 98, - 99, 99, 100, 100, 100, 101, 102, 103, 104, 104, - 105, 105, 106, 106, 107, 108, 109, 110, 110, 110, - 111, 112, 112, 113, 113, 114, 115, 116, 116, 117, - 117, 117, 118, 119, 120, 121, 121, 122, 123, 123, - 124, 125, 126, 127, 127, 127, 127, 127, 127, 127, - 127, 127, 127, 127, 127, 127, 127, 127, 127, 127, - 127, 127, 127, 127, 127, 127, 127, 127, 127, 127, - 127, 127, 127, 127, 127, 127, 127, 127, 127, 127, - 128, 129, 130, 131 + 60, 60, 61, 61, 62, 63, 63, 64, 65, 65, + 66, 66, 67, 68, 68, 70, 69, 71, 71, 72, + 73, 73, 74, 74, 75, 75, 76, 76, 77, 77, + 78, 78, 80, 79, 81, 81, 81, 82, 83, 84, + 84, 85, 86, 86, 87, 88, 89, 89, 90, 91, + 91, 91, 92, 93, 94, 95, 95, 95, 96, 97, + 98, 99, 99, 99, 100, 101, 102, 102, 103, 105, + 106, 104, 107, 108, 108, 109, 109, 109, 110, 111, + 112, 113, 113, 114, 114, 115, 115, 116, 117, 118, + 119, 119, 119, 120, 121, 121, 122, 122, 123, 124, + 125, 125, 126, 126, 126, 126, 127, 128, 129, 130, + 131, 131, 132, 133, 133, 134, 135, 136, 137, 137, + 137, 137, 137, 137, 137, 137, 137, 137, 137, 137, + 137, 137, 137, 137, 137, 137, 137, 137, 137, 137, + 137, 137, 137, 137, 137, 137, 137, 137, 137, 137, + 137, 137, 137, 137, 137, 137, 137, 137, 137, 138, + 139, 140, 141 }; static const short yyr2[] = { 0, 1, 1, 1, 2, 1, 1, 1, 4, 1, 1, - 1, 2, 2, 1, 1, 7, 1, 1, 3, 1, - 1, 1, 3, 1, 1, 1, 1, 1, 2, 1, - 1, 1, 1, 1, 1, 2, 2, 1, 3, 1, - 1, 1, 2, 1, 2, 3, 1, 1, 1, 1, - 2, 2, 1, 1, 1, 3, 3, 3, 1, 1, - 1, 1, 1, 1, 2, 1, 0, 0, 6, 1, - 1, 2, 1, 1, 1, 3, 3, 3, 1, 3, - 1, 3, 1, 3, 1, 1, 1, 1, 1, 1, - 1, 1, 2, 1, 2, 2, 1, 1, 2, 1, - 1, 1, 2, 2, 1, 1, 2, 2, 1, 1, - 2, 2, 1, 1, 1, 1, 3, 3, 3, 2, - 2, 2, 2, 2, 2, 2, 3, 3, 3, 3, - 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, + 1, 2, 2, 1, 1, 0, 8, 1, 1, 3, + 1, 1, 1, 3, 1, 1, 1, 1, 1, 2, + 1, 1, 0, 2, 1, 1, 1, 1, 2, 2, + 1, 3, 1, 1, 1, 2, 1, 2, 3, 1, + 1, 1, 1, 2, 2, 1, 1, 1, 3, 3, + 3, 1, 1, 1, 1, 1, 1, 2, 1, 0, + 0, 6, 1, 1, 2, 1, 1, 1, 3, 3, + 3, 1, 3, 1, 3, 1, 3, 1, 1, 1, + 1, 1, 1, 1, 1, 2, 1, 2, 2, 1, + 1, 2, 1, 1, 1, 1, 2, 2, 3, 1, + 1, 2, 2, 1, 1, 2, 2, 1, 1, 1, + 1, 3, 3, 3, 2, 2, 2, 2, 2, 2, + 2, 2, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, - 1, 1, 0, 0 + 3, 3, 3, 3, 3, 3, 3, 3, 3, 1, + 1, 0, 0 }; -static const short yydefact[] = { 154, - 152, 0, 0, 67, 2, 1, 3, 6, 7, 5, - 27, 28, 31, 32, 35, 33, 34, 66, 30, 26, - 0, 100, 0, 0, 0, 36, 38, 0, 40, 41, - 42, 0, 47, 48, 49, 50, 0, 94, 0, 44, - 92, 101, 102, 0, 109, 110, 0, 4, 29, 154, - 154, 154, 99, 0, 111, 104, 106, 105, 103, 0, - 0, 98, 0, 100, 51, 0, 92, 37, 153, 154, - 0, 46, 53, 54, 55, 100, 95, 45, 93, 96, - 43, 52, 112, 70, 68, 15, 8, 10, 11, 0, - 9, 22, 0, 21, 20, 154, 18, 17, 108, 107, - 39, 93, 152, 0, 31, 0, 61, 62, 63, 59, - 0, 114, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 154, 154, 115, 116, 0, 113, 0, 12, 14, - 13, 19, 0, 25, 0, 24, 65, 56, 58, 123, - 124, 125, 126, 122, 121, 120, 0, 151, 0, 0, - 57, 0, 0, 0, 0, 0, 0, 0, 0, 0, +static const short yydefact[] = { 33, + 161, 0, 2, 1, 3, 6, 7, 5, 28, 29, + 32, 0, 31, 27, 0, 4, 30, 0, 70, 34, + 35, 38, 36, 37, 69, 163, 163, 163, 103, 33, + 0, 0, 0, 39, 41, 0, 43, 44, 45, 0, + 50, 51, 52, 53, 0, 97, 0, 47, 95, 104, + 105, 106, 0, 114, 115, 0, 15, 8, 10, 11, + 0, 9, 23, 0, 22, 21, 163, 19, 18, 102, + 0, 116, 108, 111, 33, 110, 107, 0, 0, 101, + 0, 103, 54, 0, 95, 40, 33, 33, 0, 49, + 56, 57, 58, 103, 98, 48, 96, 99, 46, 55, + 117, 73, 71, 12, 14, 13, 20, 0, 26, 0, + 25, 113, 112, 109, 42, 96, 161, 33, 32, 0, + 64, 65, 66, 62, 0, 119, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 33, 33, 120, 121, + 0, 118, 0, 24, 16, 33, 59, 61, 129, 130, + 131, 132, 126, 125, 127, 128, 0, 160, 0, 0, + 60, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 153, 154, 0, 0, 71, - 73, 74, 75, 23, 154, 119, 117, 118, 135, 136, - 137, 140, 141, 142, 143, 144, 145, 146, 147, 148, - 149, 150, 138, 139, 134, 133, 132, 127, 128, 129, - 130, 131, 152, 90, 0, 79, 85, 88, 87, 0, - 83, 0, 81, 86, 91, 69, 72, 16, 76, 153, - 154, 78, 0, 77, 80, 84, 82, 0, 0, 0 + 0, 0, 0, 0, 0, 0, 0, 0, 33, 33, + 0, 0, 74, 76, 77, 78, 33, 124, 122, 123, + 144, 145, 146, 143, 149, 150, 151, 152, 139, 140, + 153, 154, 155, 156, 157, 158, 159, 147, 148, 142, + 141, 134, 133, 135, 136, 138, 137, 161, 93, 0, + 82, 88, 91, 90, 0, 86, 0, 84, 89, 94, + 72, 75, 17, 79, 33, 33, 81, 0, 80, 83, + 87, 85, 0, 0, 0 }; -static const short yydefgoto[] = { 238, - 5, 6, 7, 8, 87, 88, 89, 90, 9, 96, - 52, 93, 94, 135, 148, 11, 12, 13, 14, 124, - 26, 27, 28, 29, 30, 31, 16, 32, 33, 34, - 35, 72, 73, 74, 75, 106, 214, 108, 109, 17, - 125, 47, 128, 85, 179, 180, 181, 182, 183, 215, - 222, 220, 216, 223, 221, 217, 224, 36, 61, 38, - 39, 40, 62, 42, 43, 59, 56, 57, 63, 45, - 46, 225, 127, 149, 19, 218, 20 +static const short yydefgoto[] = { 253, + 3, 4, 5, 6, 58, 59, 60, 61, 7, 197, + 67, 28, 64, 65, 110, 158, 9, 10, 11, 12, + 20, 21, 139, 34, 35, 36, 37, 38, 39, 23, + 40, 41, 42, 43, 90, 91, 92, 93, 120, 229, + 122, 123, 24, 140, 56, 143, 103, 192, 193, 194, + 195, 196, 230, 237, 235, 231, 238, 236, 232, 239, + 44, 79, 46, 47, 48, 80, 50, 51, 52, 77, + 73, 74, 81, 54, 55, 240, 142, 159, 13, 233, + 14 }; -static const short yypact[] = { 10, --32768, 15, 58,-32768, -8,-32768,-32768,-32768,-32768,-32768, - 6,-32768,-32768,-32768,-32768,-32768,-32768,-32768,-32768,-32768, - 80, 4, 32, 70, 105,-32768,-32768, 44,-32768,-32768, --32768, -21,-32768,-32768,-32768,-32768, 106,-32768, 54,-32768, - 19,-32768,-32768, 106, 66,-32768, 70,-32768,-32768, 122, - 124, 92,-32768, 32,-32768, 90,-32768,-32768,-32768, 97, - 106, 101, 106, 90,-32768, 105, 101,-32768, 13, 6, - 108,-32768,-32768,-32768,-32768, 111,-32768,-32768, 19,-32768, --32768,-32768,-32768,-32768,-32768,-32768,-32768, 11,-32768, 113, - 117,-32768, 120, 116,-32768, 147,-32768,-32768,-32768,-32768, --32768, 101, 128, 6, 139, 144,-32768,-32768,-32768,-32768, - 118,-32768, 108, 108, 108, 108, 108, 108, 108, 63, - 108, 6, 6,-32768,-32768, 162, 230, -20,-32768,-32768, --32768,-32768, 186,-32768, 172,-32768, 6,-32768,-32768, 351, - 351, 351, 351, 351, 364,-32768, 188,-32768, 164, 173, --32768, 108, 108, 108, 108, 108, 108, 108, 108, 108, - 108, 108, 108, 108, 108, 108, 108, 108, 108, 108, - 108, 108, 108, 108, 108, 14, 6, 108, 20,-32768, --32768,-32768,-32768,-32768, 6,-32768,-32768,-32768, 317, 290, - 260, 342, 342, 138, 138, 342, 342, 342, 342, 138, - 138, 351, 342, 342, 359, 158, 364, 109, 109,-32768, --32768,-32768, 141,-32768, 167,-32768,-32768,-32768,-32768, -13, --32768, -17,-32768,-32768,-32768,-32768,-32768,-32768,-32768, 14, - 6,-32768, 108,-32768,-32768,-32768,-32768, 227, 228,-32768 +static const short yypact[] = { 99, +-32768, 32, -16,-32768,-32768,-32768,-32768,-32768, 22,-32768, +-32768, 61,-32768,-32768, 116,-32768,-32768, 78,-32768,-32768, +-32768,-32768,-32768,-32768,-32768, 94, 96, -13, 23, 122, + 132, 85, 92,-32768,-32768, 150,-32768,-32768,-32768, -31, +-32768,-32768,-32768,-32768, 93,-32768, 105,-32768, 21,-32768, +-32768,-32768, 93, 107,-32768, 85,-32768,-32768, 102,-32768, + 141, 142,-32768, 168, 140,-32768, 213,-32768,-32768,-32768, + 132,-32768, 188,-32768, 28,-32768,-32768, 189, 93, 186, + 93, 188,-32768, 92, 186,-32768, 108, 33, 65,-32768, +-32768,-32768,-32768, 25,-32768,-32768, 21,-32768,-32768,-32768, +-32768,-32768,-32768,-32768,-32768,-32768,-32768, 239,-32768, 194, +-32768,-32768,-32768,-32768,-32768, 186, 196, 122, 124, 197, +-32768,-32768,-32768,-32768, 211,-32768, 65, 65, 65, 65, + 65, 65, 65, 65, 83, 65, 13, 9,-32768,-32768, + 209, 236, -29,-32768,-32768, 101,-32768,-32768, 395, 395, + 395, 395,-32768,-32768,-32768,-32768, 187,-32768, 207, 221, +-32768, 65, 65, 65, 65, 65, 65, 65, 65, 65, + 65, 65, 65, 65, 65, 65, 65, 65, 65, 65, + 65, 65, 65, 65, 65, 65, 65, 65, 103, 34, + 65, 30,-32768,-32768,-32768,-32768, 110,-32768,-32768,-32768, + 326, 298, 267, 195, 354, 354, 367, 367, 130, 130, + 354, 354, 354, 354, 367, 367, 395, 354, 354, 402, + 155, 144, 144,-32768,-32768,-32768,-32768, 128,-32768, 131, +-32768,-32768,-32768,-32768, 64,-32768, -28,-32768,-32768,-32768, +-32768,-32768,-32768,-32768, 103, 34,-32768, 65,-32768,-32768, +-32768,-32768, 266, 294,-32768 }; static const short yypgoto[] = {-32768, --32768,-32768, 224,-32768,-32768,-32768, 148,-32768,-32768,-32768, - 183,-32768,-32768,-32768, 3, 149, -10, -65,-32768, 0, --32768,-32768, 91,-32768,-32768, -28,-32768,-32768,-32768,-32768, --32768,-32768,-32768,-32768,-32768,-32768, 182,-32768,-32768,-32768, - 2,-32768,-32768,-32768,-32768, 73,-32768,-32768,-32768,-32768, --32768,-32768, 24, 25, 31,-32768,-32768, 75, 110, 81, --32768, -32, 9,-32768,-32768, 216,-32768, 225, 279,-32768, --32768, 212, -76, 161,-32768, 219, -44 +-32768,-32768, 292,-32768,-32768,-32768, 237,-32768,-32768,-32768, +-32768, 269,-32768,-32768,-32768, 0, -27, -8, -85,-32768, +-32768,-32768, 299,-32768,-32768, 109,-32768,-32768, 37,-32768, +-32768,-32768,-32768,-32768,-32768,-32768,-32768,-32768,-32768, 223, +-32768,-32768,-32768, 313,-32768,-32768,-32768,-32768, 134,-32768, +-32768,-32768,-32768,-32768,-32768, 111, 79, 123,-32768,-32768, + -18, 104, 75,-32768, 82, -14,-32768,-32768,-32768, 257, +-32768, 280, 336,-32768,-32768, 281, -122, 217,-32768, 288, + 119 }; -#define YYLAST 401 +#define YYLAST 443 -static const short yytable[] = { 15, - 49, 18, 10, 105, 78, 91, 95, 98, 53, 1, - 15, 41, 18, 1, 86, 81, 103, 213, 21, 69, - 176, -98, 226, 70, 177, 233, 71, 178, 78, 231, - 2, 234, 232, 67, 81, 58, 140, 141, 142, 143, - 144, 145, 146, 130, 147, 79, 68, 54, 2, 3, - -154, 136, 41, 3, 55, 4, 3, 3, 104, 4, - 176, 22, 4, 4, 177, -97, 22, 178, 15, 15, - 18, 18, 111, 22, 102, 189, 190, 191, 192, 193, - 194, 195, 196, 197, 198, 199, 200, 201, 202, 203, - 204, 205, 206, 207, 208, 209, 210, 211, 212, 65, - 80, 23, 24, 15, 25, 18, 23, 24, 64, 76, - 105, 112, 37, 23, 60, 53, 83, 77, 82, 50, - 51, 15, 15, 18, 18, 86, 49, 92, 113, 114, - 115, 116, 51, 54, 66, 117, 15, 84, 18, 118, - 119, 77, 101, 173, 174, 175, 77, -97, 23, 23, - 134, 120, 131, 37, 54, 121, -14, 4, 133, 122, - 123, 132, 165, 139, 105, 104, 168, 169, 170, -60, - 171, 172, 173, 174, 175, 15, 15, 18, 18, 219, - -64, -64, -89, -89, 15, 138, 18, 228, 170, 184, - 171, 172, 173, 174, 175, 152, 153, 154, 155, 156, - 157, 158, 159, 160, 161, 162, 163, 164, 229, 230, - 151, 185, 165, 166, 167, 187, 168, 169, 170, 104, - 171, 172, 173, 174, 175, 188, 239, 240, 48, 15, - 15, 18, 18, 219, 97, 129, 186, 152, 153, 154, - 155, 156, 157, 158, 159, 160, 161, 162, 163, 164, - 107, 227, 137, 235, 165, 166, 167, 237, 168, 169, - 170, 236, 171, 172, 173, 174, 175, 152, 153, 99, - 155, 156, 157, 158, 159, 160, 161, 162, 163, 164, - 100, 44, 126, 150, 165, 166, 167, 110, 168, 169, - 170, 0, 171, 172, 173, 174, 175, 152, 0, 0, - 155, 156, 157, 158, 159, 160, 161, 162, 163, 164, - 0, 0, 0, 0, 165, 166, 167, 0, 168, 169, - 170, 0, 171, 172, 173, 174, 175, 155, 156, 157, - 158, 159, 160, 161, 162, 163, 164, 0, 0, 0, - 0, 165, 166, 167, 0, 168, 169, 170, 0, 171, - 172, 173, 174, 175, 157, 158, 0, 0, 0, 0, - 163, 164, 0, 0, 0, 0, 165, 0, 0, 0, - 168, 169, 170, 0, 171, 172, 173, 174, 175, 168, - 169, 170, 0, 171, 172, 173, 174, 175, 169, 170, - 0, 171, 172, 173, 174, 175, 171, 172, 173, 174, - 175 +static const short yytable[] = { 8, + 17, 119, 75, 49, 149, 150, 151, 152, 153, 154, + 155, 156, 1, 157, 83, 87, 1, 189, 85, 88, + 248, 190, 89, -101, 191, 1, 249, 70, 2, 70, + 97, 1, 241, 27, 100, 15, 1, 1, 49, 201, + 202, 203, 204, 205, 206, 207, 208, 209, 210, 211, + 212, 213, 214, 215, 216, 217, 218, 219, 220, 221, + 222, 223, 224, 225, 226, 227, 17, -163, 126, 116, + -163, -33, 71, -100, 71, 114, 189, -33, 118, 72, + 190, 29, -163, 191, -163, -163, 29, 125, 29, 99, + 146, 127, 128, 129, 130, 82, 94, 57, -163, 63, + 131, 132, 1, 119, 1, 57, 228, 133, 134, -163, + 18, 117, 246, 1, 135, 247, 19, 99, 136, 95, + 19, 45, 137, 138, 30, 1, 96, 31, 32, 30, + 33, 30, 31, 32, 31, 76, 84, 17, 30, 30, + 78, 31, 31, 2, 62, 66, 69, -163, -68, -68, + -162, -162, 86, 95, -163, -162, 45, 98, 95, 119, + 96, 26, 27, 101, 102, 183, 184, 185, 186, 187, + 188, -67, -67, 170, 171, -92, -92, 105, 244, 245, + 118, 185, 186, 187, 188, 111, 106, -14, 108, 234, + 183, 184, 185, 186, 187, 188, 243, 162, 163, 164, + 165, 166, 167, 168, 169, 170, 171, 172, 173, 174, + 175, 176, 177, 170, 171, 107, 109, 178, 179, 180, + 181, 182, 183, 184, 185, 186, 187, 188, 181, 182, + 183, 184, 185, 186, 187, 188, 118, 71, -100, 145, + 115, 198, 144, -63, 147, 234, 162, 163, 164, 165, + 166, 167, 168, 169, 170, 171, 172, 173, 174, 175, + 176, 177, 148, 161, 199, 254, 178, 179, 180, 181, + 182, 183, 184, 185, 186, 187, 188, 162, 163, 200, + 165, 166, 167, 168, 169, 170, 171, 172, 173, 174, + 175, 176, 177, 255, 16, 104, 68, 178, 179, 180, + 181, 182, 183, 184, 185, 186, 187, 188, 162, 121, + 22, 165, 166, 167, 168, 169, 170, 171, 172, 173, + 174, 175, 176, 177, 25, 242, 252, 112, 178, 179, + 180, 181, 182, 183, 184, 185, 186, 187, 188, 165, + 166, 167, 168, 169, 170, 171, 172, 173, 174, 175, + 176, 177, 113, 53, 160, 250, 178, 179, 180, 181, + 182, 183, 184, 185, 186, 187, 188, 165, 251, 141, + 168, 169, 170, 171, 124, 0, 0, 0, 176, 177, + 165, 0, 0, 0, 178, 170, 171, 181, 182, 183, + 184, 185, 186, 187, 188, 0, 0, 178, 0, 0, + 181, 182, 183, 184, 185, 186, 187, 188, 165, 0, + 0, 0, 0, 170, 171, 0, 0, 0, 0, 0, + 170, 171, 0, 0, 0, 0, 0, 0, 181, 182, + 183, 184, 185, 186, 187, 188, 182, 183, 184, 185, + 186, 187, 188 }; static const short yycheck[] = { 0, - 11, 0, 0, 69, 37, 50, 51, 52, 5, 4, - 11, 3, 11, 4, 4, 44, 4, 4, 4, 41, - 41, 3, 3, 45, 45, 43, 48, 48, 61, 43, - 39, 49, 46, 25, 63, 4, 113, 114, 115, 116, - 117, 118, 119, 88, 121, 37, 3, 44, 39, 44, - 40, 96, 44, 44, 51, 50, 44, 44, 69, 50, - 41, 4, 50, 50, 45, 47, 4, 48, 69, 70, - 69, 70, 70, 4, 66, 152, 153, 154, 155, 156, - 157, 158, 159, 160, 161, 162, 163, 164, 165, 166, - 167, 168, 169, 170, 171, 172, 173, 174, 175, 25, - 47, 44, 45, 104, 47, 104, 44, 45, 4, 4, - 176, 4, 3, 44, 24, 5, 51, 37, 44, 40, - 41, 122, 123, 122, 123, 4, 137, 4, 21, 22, - 23, 24, 41, 44, 25, 28, 137, 47, 137, 32, - 33, 61, 46, 35, 36, 37, 66, 47, 44, 44, - 4, 44, 40, 44, 44, 48, 40, 50, 43, 52, - 53, 42, 25, 46, 230, 176, 29, 30, 31, 42, - 33, 34, 35, 36, 37, 176, 177, 176, 177, 177, - 42, 43, 42, 43, 185, 42, 185, 185, 31, 4, - 33, 34, 35, 36, 37, 8, 9, 10, 11, 12, - 13, 14, 15, 16, 17, 18, 19, 20, 42, 43, - 49, 40, 25, 26, 27, 52, 29, 30, 31, 230, - 33, 34, 35, 36, 37, 53, 0, 0, 5, 230, - 231, 230, 231, 231, 52, 88, 49, 8, 9, 10, - 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, - 69, 179, 104, 230, 25, 26, 27, 233, 29, 30, - 31, 231, 33, 34, 35, 36, 37, 8, 9, 54, - 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, - 56, 3, 71, 123, 25, 26, 27, 69, 29, 30, - 31, -1, 33, 34, 35, 36, 37, 8, -1, -1, - 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, - -1, -1, -1, -1, 25, 26, 27, -1, 29, 30, - 31, -1, 33, 34, 35, 36, 37, 11, 12, 13, - 14, 15, 16, 17, 18, 19, 20, -1, -1, -1, - -1, 25, 26, 27, -1, 29, 30, 31, -1, 33, - 34, 35, 36, 37, 13, 14, -1, -1, -1, -1, - 19, 20, -1, -1, -1, -1, 25, -1, -1, -1, - 29, 30, 31, -1, 33, 34, 35, 36, 37, 29, - 30, 31, -1, 33, 34, 35, 36, 37, 30, 31, - -1, 33, 34, 35, 36, 37, 33, 34, 35, 36, - 37 + 9, 87, 30, 18, 127, 128, 129, 130, 131, 132, + 133, 134, 4, 136, 33, 47, 4, 47, 33, 51, + 49, 51, 54, 3, 54, 4, 55, 5, 45, 5, + 45, 4, 3, 47, 53, 4, 4, 4, 53, 162, + 163, 164, 165, 166, 167, 168, 169, 170, 171, 172, + 173, 174, 175, 176, 177, 178, 179, 180, 181, 182, + 183, 184, 185, 186, 187, 188, 75, 59, 4, 84, + 58, 50, 50, 53, 50, 48, 47, 56, 87, 57, + 51, 4, 49, 54, 52, 52, 4, 88, 4, 53, + 118, 27, 28, 29, 30, 4, 4, 4, 0, 4, + 36, 37, 4, 189, 4, 4, 4, 43, 44, 0, + 50, 4, 49, 4, 50, 52, 56, 81, 54, 45, + 56, 18, 58, 59, 47, 4, 45, 50, 51, 47, + 53, 47, 50, 51, 50, 4, 33, 146, 47, 47, + 32, 50, 50, 45, 26, 27, 28, 46, 48, 49, + 48, 49, 3, 79, 45, 48, 53, 53, 84, 245, + 79, 46, 47, 57, 56, 36, 37, 38, 39, 40, + 41, 48, 49, 19, 20, 48, 49, 59, 48, 49, + 189, 38, 39, 40, 41, 67, 46, 46, 49, 190, + 36, 37, 38, 39, 40, 41, 197, 11, 12, 13, + 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, + 24, 25, 26, 19, 20, 48, 4, 31, 32, 33, + 34, 35, 36, 37, 38, 39, 40, 41, 34, 35, + 36, 37, 38, 39, 40, 41, 245, 50, 53, 46, + 52, 55, 4, 48, 48, 246, 11, 12, 13, 14, + 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, + 25, 26, 52, 55, 58, 0, 31, 32, 33, 34, + 35, 36, 37, 38, 39, 40, 41, 11, 12, 59, + 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, + 24, 25, 26, 0, 3, 59, 28, 31, 32, 33, + 34, 35, 36, 37, 38, 39, 40, 41, 11, 87, + 12, 14, 15, 16, 17, 18, 19, 20, 21, 22, + 23, 24, 25, 26, 12, 192, 248, 71, 31, 32, + 33, 34, 35, 36, 37, 38, 39, 40, 41, 14, + 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, + 25, 26, 73, 18, 138, 245, 31, 32, 33, 34, + 35, 36, 37, 38, 39, 40, 41, 14, 246, 89, + 17, 18, 19, 20, 87, -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 }; #define YYPURE 1 /* -*-C-*- Note some compilers choke on comments on `#line' lines. */ -#line 3 "D:/cygwin/usr/share/bison.simple" +#line 3 "/usr/share/bison.simple" /* This file comes from bison-1.28. */ /* Skeleton output parser for bison, @@ -664,7 +707,7 @@ __yy_memcpy (char *to, char *from, unsig #endif #endif -#line 217 "D:/cygwin/usr/share/bison.simple" +#line 217 "/usr/share/bison.simple" /* The user can define YYPARSE_PARAM as the name of an argument to be passed into yyparse. The argument should have type void *. @@ -726,14 +769,14 @@ yyparse(YYPARSE_PARAM_ARG) #ifdef YYPURE int yychar; - YYSTYPE yylval; + YYSTYPE yylval=0; /*paf:calm down, vc7 warning level 4*/ int yynerrs; #ifdef YYLSP_NEEDED YYLTYPE yylloc; #endif #endif - YYSTYPE yyval; /* the variable used to return */ + YYSTYPE yyval=0; /*paf:calm down, vc7 warning level 4*/ /* the variable used to return */ /* semantic values from the action */ /* routines */ @@ -993,72 +1036,76 @@ yyreduce: switch (yyn) { case 1: -#line 107 "compile.y" +#line 122 "compile.y" { - Method& method=*NEW Method(POOL, - *main_method_name, - Method::CT_ANY, + 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->add_method(*main_method_name, method); + PC.cclass->add_method(PC.alias_method(main_method_name), method); ; break;} case 8: -#line 124 "compile.y" +#line 137 "compile.y" { - const String& command=*LA2S(yyvsp[-2]); + const String& command=*LA2S(*yyvsp[-2]); YYSTYPE strings_code=yyvsp[0]; - if(strings_code->size()<1*2) { + if(strings_code->count()<1*OPERATIONS_PER_OPVALUE) { strcpy(PC.error, "@"); strcat(PC.error, command.cstr()); strcat(PC.error, " is empty"); YYERROR; } if(command==CLASS_NAME) { - if(PC.cclass->base()) { // already changed from default? + 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->size()==1*2) { + if(strings_code->count()==1*OPERATIONS_PER_OPVALUE) { // new class' name - const String *name=LA2S(strings_code); + const String& name=*LA2S(*strings_code); // creating the class - PC.cclass=NEW VClass(POOL); - PC.cclass->set_name(*name); + VStateless_class* cclass=new VClass; + PC.cclass=cclass; + PC.cclass->set_name(name); // append to request's classes - PC.request->classes().put(*name, PC.cclass); + PC.request.classes().put(name, cclass); } else { - strcpy(PC.error, "@"CLASS_NAME" must contain sole name"); + strcpy(PC.error, "@"CLASS_NAME" must contain only one line with class name (contains more then one)"); YYERROR; } } else if(command==USE_CONTROL_METHOD_NAME) { - for(int i=0; isize(); i+=2) - PC.request->use_file(*LA2S(strings_code, i)); + 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.cclass->base()) { // already changed from default? + if(PC.cclass->base_class()) { // already changed from default? strcpy(PC.error, "class already have a base '"); - strncat(PC.error, PC.cclass->base()->name().cstr(), 100); + strncat(PC.error, PC.cclass->base_class()->name().cstr(), 100); strcat(PC.error, "'"); YYERROR; } - if(strings_code->size()==1*2) { - const String& base_name=*LA2S(strings_code); - VClass *base=static_cast( - PC.request->classes().get(base_name)); - if(!base) { + if(strings_code->count()==1*OPERATIONS_PER_OPVALUE) { + const String& base_name=*LA2S(*strings_code); + if(Value* base_class_value=PC.request.classes().get(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); + YYERROR; + } + } else { strcpy(PC.error, base_name.cstr()); strcat(PC.error, ": undefined class in @"BASE_NAME); YYERROR; } - // @CLASS == @BASE sanity check - if(PC.cclass==base) { - strcpy(PC.error, "@"CLASS_NAME" equals @"BASE_NAME); - YYERROR; - } - PC.cclass->set_base(*base); } else { strcpy(PC.error, "@"BASE_NAME" must contain sole name"); YYERROR; @@ -1073,502 +1120,601 @@ case 8: ; break;} case 12: -#line 190 "compile.y" -{ yyval=yyvsp[-1]; P(yyval, yyvsp[0]) ; +#line 209 "compile.y" +{ yyval=yyvsp[-1]; P(*yyval, *yyvsp[0]) ; break;} case 16: -#line 195 "compile.y" -{ - const String *name=LA2S(yyvsp[-5]); +#line 213 "compile.y" +{ + PC.explicit_result=false; + const String& name=*LA2S(*yyvsp[-4]); - YYSTYPE params_names_code=yyvsp[-4]; - Array *params_names=0; - if(int size=params_names_code->size()) { - params_names=NEW Array(POOL); - for(int i=0; icount()) { + params_names=new ArrayString; + for(int i=0; isize()) { - locals_names=NEW Array(POOL); - for(int i=0; icount()) { + locals_names=new ArrayString; + for(int i=0; iadd_method(*name, method); + 0/*to be filled later in next {} */, 0); + PC.cclass->add_method(PC.alias_method(name), *method); + *reinterpret_cast(&yyval)=method; + + // todo: check [][;result;] +; + break;} +case 17: +#line 248 "compile.y" +{ + // fill in the code + reinterpret_cast(yyvsp[-1])->parser_code=yyvsp[0]; ; break;} -case 19: -#line 224 "compile.y" +case 20: +#line 254 "compile.y" {yyval=yyvsp[-1]; break;} -case 23: -#line 226 "compile.y" -{ yyval=yyvsp[-2]; P(yyval, yyvsp[0]) ; +case 24: +#line 256 "compile.y" +{ yyval=yyvsp[-2]; P(*yyval, *yyvsp[0]) ; + break;} +case 30: +#line 264 "compile.y" +{ yyval=yyvsp[-1]; P(*yyval, *yyvsp[0]) ; break;} -case 29: -#line 234 "compile.y" -{ yyval=yyvsp[-1]; P(yyval, yyvsp[0]) ; +case 33: +#line 266 "compile.y" +{ + *reinterpret_cast(&yyval)=PC.explicit_result; + PC.explicit_result=false; +; break;} -case 35: -#line 240 "compile.y" +case 34: +#line 269 "compile.y" { - yyval=yyvsp[0]; /* stack: resulting value */ - O(yyval, OP_WRITE_VALUE); /* value=pop; wcontext.write(value) */ + PC.explicit_result=reinterpret_cast(yyvsp[-1]); + yyval=yyvsp[0]; ; break;} -case 36: -#line 244 "compile.y" -{ yyval=yyvsp[0] ; +case 38: +#line 277 "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) */ +; break;} case 39: -#line 246 "compile.y" -{ yyval=yyvsp[-1] ; +#line 284 "compile.y" +{ yyval=yyvsp[0] ; break;} case 42: -#line 250 "compile.y" +#line 286 "compile.y" +{ yyval=yyvsp[-1] ; + break;} +case 45: +#line 290 "compile.y" { - yyval=N(POOL); - Array *diving_code=yyvsp[0]; - const String *first_name=LA2S(diving_code); + 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, + O(*yyval, OP_WITH_SELF); /* stack: starting context */ + P(*yyval, *diving_code, /* skip over... */ - diving_code->size()>2?3/*OP_+string+get_element*/:2/*OP_+string*/); + diving_code->count()>=4?4/*OP_VALUE+origin+string+OP_GET_ELEMENTx*/:3/*OP_+origin+string*/); } else { - O(yyval, OP_WITH_READ); /* stack: starting context */ - P(yyval, diving_code); + O(*yyval, 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); + P(*yyval, *diving_code); } /* diving code; stack: current context */ ; break;} -case 43: -#line 265 "compile.y" -{ yyval=yyvsp[-1]; P(yyval, yyvsp[0]) ; +case 46: +#line 312 "compile.y" +{ yyval=yyvsp[-1]; P(*yyval, *yyvsp[0]) ; break;} -case 45: -#line 266 "compile.y" -{ yyval=yyvsp[-1]; P(yyval, yyvsp[0]) ; +case 48: +#line 313 "compile.y" +{ yyval=yyvsp[-1]; P(*yyval, *yyvsp[0]) ; break;} -case 46: -#line 270 "compile.y" +case 49: +#line 317 "compile.y" { yyval=yyvsp[-1]; /* stack: context,name */ - P(yyval, yyvsp[0]); /* stack: context,name,constructor_value */ + P(*yyval, *yyvsp[0]); /* stack: context,name,constructor_value */ ; break;} -case 50: -#line 278 "compile.y" +case 53: +#line 325 "compile.y" { - yyval=N(POOL); - Array *diving_code=yyvsp[0]; - const String *first_name=LA2S(diving_code); + 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, + O(*yyval, OP_WITH_SELF); /* stack: starting context */ + P(*yyval, *diving_code, /* skip over... */ - diving_code->size()>2?3/*OP_+string+get_element*/:2/*OP_+string*/); + 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 */ - P(yyval, diving_code); + O(*yyval, OP_WITH_ROOT); /* stack: starting context */ + P(*yyval, *diving_code); } /* diving code; stack: current context */ ; break;} -case 51: -#line 293 "compile.y" +case 54: +#line 342 "compile.y" { - yyval=N(POOL); - O(yyval, OP_WITH_WRITE); /* stack: starting context */ - P(yyval, yyvsp[0]); /* diving code; stack: context,name */ + yyval=N(); + O(*yyval, OP_WITH_WRITE); /* stack: starting context */ + P(*yyval, *yyvsp[0]); /* diving code; stack: context,name */ ; break;} -case 52: -#line 298 "compile.y" -{ yyval=yyvsp[-1]; P(yyval, yyvsp[0]) ; +case 55: +#line 347 "compile.y" +{ yyval=yyvsp[-1]; P(*yyval, *yyvsp[0]) ; break;} -case 56: -#line 305 "compile.y" +case 59: +#line 354 "compile.y" { // stack: context, name yyval=yyvsp[-1]; // stack: context, name, value - O(yyval, OP_CONSTRUCT_VALUE); /* value=pop; name=pop; context=pop; construct(context,name,value) */ + O(*yyval, OP_CONSTRUCT_VALUE); /* value=pop; name=pop; context=pop; construct(context,name,value) */ ; break;} -case 57: -#line 311 "compile.y" +case 60: +#line 360 "compile.y" { + yyval=N(); + O(*yyval, OP_PREPARE_TO_EXPRESSION); // stack: context, name - yyval=yyvsp[-1]; // stack: context, name, value - O(yyval, OP_CONSTRUCT_EXPR); /* value=pop; name=pop; context=pop; construct(context,name,value) */ + 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) */ ; break;} -case 58: -#line 317 "compile.y" +case 61: +#line 368 "compile.y" { // stack: context, name - yyval=N(POOL); - CCA(yyval, yyvsp[-1]); /* code=pop; name=pop; context=pop; construct(context,name,junction(code)) */ + yyval=N(); + OA(*yyval, OP_CURLY_CODE__CONSTRUCT, yyvsp[-1]); /* code=pop; name=pop; context=pop; construct(context,name,junction(code)) */ ; break;} -case 62: -#line 328 "compile.y" +case 65: +#line 379 "compile.y" { - yyval=N(POOL); - O(yyval, OP_CREATE_EWPOOL); /* stack: empty write context */ - P(yyval, yyvsp[0]); /* some code that writes to that context */ - O(yyval, OP_REDUCE_EWPOOL); /* context=pop; stack: context.value() */ + yyval=N(); + OA(*yyval, OP_OBJECT_POOL, yyvsp[0]); /* stack: empty write context */ + /* some code that writes to that context */ + /* context=pop; stack: context.value() */ ; break;} -case 65: -#line 335 "compile.y" -{ yyval=yyvsp[-1]; P(yyval, yyvsp[0]) ; +case 68: +#line 386 "compile.y" +{ yyval=yyvsp[-1]; P(*yyval, *yyvsp[0]) ; break;} -case 66: -#line 339 "compile.y" +case 69: +#line 390 "compile.y" { yyval=yyvsp[0]; /* stack: value */ - O(yyval, OP_WRITE_VALUE); /* value=pop; wcontext.write(value) */ + changetail_or_append(*yyval, + OP_CALL, true, /*->*/ OP_CALL__WRITE, + /*or */OP_WRITE_VALUE); /* value=pop; wcontext.write(value) */ ; break;} -case 67: -#line 343 "compile.y" -{ PC.object_constructor_allowed=true ; +case 70: +#line 396 "compile.y" +{ + PC.in_call_value=true; + ; break;} -case 68: -#line 344 "compile.y" -{ PC.object_constructor_allowed=false ; +case 71: +#line 399 "compile.y" +{ + PC.in_call_value=false; + ; break;} -case 69: -#line 345 "compile.y" +case 72: +#line 402 "compile.y" { /* ^field.$method{vasya} */ yyval=yyvsp[-3]; /* with_xxx,diving code; stack: context,method_junction */ - O(yyval, OP_GET_METHOD_FRAME); /* stack: context,method_frame */ YYSTYPE params_code=yyvsp[-1]; - if(params_code->size()==3) // probably [] case. [OP_VALUE + Void + STORE_PARAM] - if(Value *value=LA2V(params_code)) // it is OP_VALUE + value? + 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. - if(params_code) - P(yyval, params_code); // filling method_frame.store_params - O(yyval, OP_CALL); // method_frame=pop; ncontext=pop; call(ncontext,method_frame) stack: value + } + /* stack: context, method_junction */ + OA(*yyval, OP_CALL, params_code); // method_frame=make frame(pop junction); ncontext=pop; call(ncontext,method_frame) stack: value ; break;} -case 72: -#line 361 "compile.y" -{ yyval=yyvsp[-1]; P(yyval, yyvsp[0]) ; +case 75: +#line 417 "compile.y" +{ yyval=yyvsp[-1]; P(*yyval, *yyvsp[0]) ; break;} -case 76: -#line 367 "compile.y" +case 79: +#line 423 "compile.y" {yyval=yyvsp[-1]; break;} -case 77: -#line 368 "compile.y" +case 80: +#line 424 "compile.y" {yyval=yyvsp[-1]; break;} -case 78: -#line 369 "compile.y" +case 81: +#line 425 "compile.y" {yyval=yyvsp[-1]; break;} -case 80: -#line 372 "compile.y" -{ yyval=yyvsp[-2]; P(yyval, yyvsp[0]) ; - break;} -case 82: -#line 376 "compile.y" -{ yyval=yyvsp[-2]; P(yyval, yyvsp[0]) ; - break;} -case 84: -#line 380 "compile.y" -{ yyval=yyvsp[-2]; P(yyval, yyvsp[0]) ; +case 83: +#line 428 "compile.y" +{ yyval=yyvsp[-2]; P(*yyval, *yyvsp[0]) ; break;} case 85: -#line 382 "compile.y" +#line 432 "compile.y" +{ yyval=yyvsp[-2]; P(*yyval, *yyvsp[0]) ; + break;} +case 87: +#line 436 "compile.y" +{ yyval=yyvsp[-2]; P(*yyval, *yyvsp[0]) ; + break;} +case 88: +#line 438 "compile.y" { yyval=yyvsp[0]; - O(yyval, OP_STORE_PARAM); + O(*yyval, OP_STORE_PARAM); ; break;} -case 86: -#line 386 "compile.y" +case 89: +#line 442 "compile.y" { - yyval=N(POOL); - PEA(yyval, yyvsp[0]); + yyval=N(); + OA(*yyval, OP_EXPR_CODE__STORE_PARAM, yyvsp[0]); ; break;} -case 87: -#line 390 "compile.y" +case 90: +#line 446 "compile.y" { - yyval=N(POOL); - PCA(yyval, yyvsp[0]); + yyval=N(); + OA(*yyval, OP_CURLY_CODE__STORE_PARAM, yyvsp[0]); ; break;} -case 91: -#line 399 "compile.y" +case 94: +#line 455 "compile.y" { - yyval=yyvsp[0]; - O(yyval, OP_WRITE_EXPR_RESULT); + yyval=N(); + O(*yyval, OP_PREPARE_TO_EXPRESSION); + P(*yyval, *yyvsp[0]); + O(*yyval, OP_WRITE_EXPR_RESULT); ; break;} -case 93: -#line 406 "compile.y" -{ yyval=yyvsp[-1]; P(yyval, yyvsp[0]) ; +case 96: +#line 464 "compile.y" +{ yyval=yyvsp[-1]; P(*yyval, *yyvsp[0]) ; break;} -case 95: -#line 408 "compile.y" -{ yyval=yyvsp[-1]; P(yyval, yyvsp[0]) ; +case 98: +#line 466 "compile.y" +{ yyval=yyvsp[-1]; P(*yyval, *yyvsp[0]) ; break;} -case 97: -#line 410 "compile.y" +case 100: +#line 468 "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_GET_ELEMENT); /* name=pop; context=pop; stack: context.get_element(name) */ ; break;} -case 98: -#line 415 "compile.y" +case 101: +#line 476 "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_GET_ELEMENT); /* name=pop; context=pop; stack: context.get_element(name) */ ; break;} -case 103: -#line 427 "compile.y" +case 107: +#line 489 "compile.y" { yyval=yyvsp[0]; - O(yyval, OP_GET_ELEMENT); + O(*yyval, OP_GET_ELEMENT); ; break;} -case 104: -#line 431 "compile.y" +case 108: +#line 493 "compile.y" { - yyval=N(POOL); - O(yyval, OP_CREATE_EWPOOL); - P(yyval, yyvsp[-1]); - O(yyval, OP_WRITE_VALUE); - P(yyval, yyvsp[0]); - O(yyval, OP_REDUCE_EWPOOL); + ArrayOperation* code; + { + change_string_literal_to_write_string_literal(*(code=yyvsp[-1])); + P(*code, *yyvsp[0]); + } + yyval=N(); + OA(*yyval, OP_STRING_POOL, code); ; break;} -case 105: -#line 439 "compile.y" +case 109: +#line 502 "compile.y" { - yyval=N(POOL); - O(yyval, OP_WITH_READ); - P(yyval, yyvsp[0]); + yyval=N(); + OA(*yyval, OP_OBJECT_POOL, yyvsp[-1]); /* stack: empty write context */ + /* some code that writes to that context */ + /* context=pop; stack: context.value() */ ; break;} -case 107: -#line 444 "compile.y" -{ yyval=yyvsp[-1]; P(yyval, yyvsp[0]) ; +case 110: +#line 508 "compile.y" +{ + yyval=N(); + O(*yyval, OP_WITH_READ); + P(*yyval, *yyvsp[0]); +; break;} -case 108: -#line 445 "compile.y" +case 112: +#line 513 "compile.y" +{ yyval=yyvsp[-1]; P(*yyval, *yyvsp[0]) ; + break;} +case 113: +#line 514 "compile.y" { yyval=yyvsp[0]; - O(yyval, OP_GET_ELEMENT__WRITE); + O(*yyval, OP_GET_ELEMENT__WRITE); ; break;} -case 111: -#line 454 "compile.y" +case 116: +#line 523 "compile.y" { yyval=yyvsp[-1]; // stack: class name string - O(yyval, OP_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()); + } else { + strcpy(PC.error, "no base class declared"); + YYERROR; + } + } + O(*yyval, OP_GET_CLASS); ; break;} -case 112: -#line 458 "compile.y" +case 117: +#line 535 "compile.y" { yyval=yyvsp[-1]; - if(!PC.object_constructor_allowed) { + if(!PC.in_call_value) { strcpy(PC.error, ":: not allowed here"); YYERROR; } - O(yyval, OP_PREPARE_TO_CONSTRUCT_OBJECT); + O(*yyval, OP_PREPARE_TO_CONSTRUCT_OBJECT); ; break;} -case 113: -#line 470 "compile.y" +case 118: +#line 547 "compile.y" { - if((yyval=yyvsp[0])->size()==2) // only one string literal in there? - change_string_literal_to_double_literal(yyval); // make that string literal Double + // see OP_PREPARE_TO_EXPRESSION!! + if((yyval=yyvsp[0])->count()==2) // only one string literal in there? + change_string_literal_to_double_literal(*yyval); // make that string literal Double ; break;} -case 117: -#line 478 "compile.y" -{ yyval = yyvsp[-1]; ; - break;} -case 118: -#line 479 "compile.y" -{ yyval = yyvsp[-1]; ; - break;} -case 119: -#line 480 "compile.y" -{ yyval = yyvsp[-1]; ; - break;} -case 120: -#line 482 "compile.y" -{ yyval=yyvsp[0]; O(yyval, OP_NEG) ; - break;} -case 121: -#line 483 "compile.y" -{ yyval=yyvsp[0]; O(yyval, OP_INV) ; - break;} case 122: -#line 484 "compile.y" -{ yyval=yyvsp[0]; O(yyval, OP_NOT) ; +#line 556 "compile.y" +{ yyval = yyvsp[-1]; ; break;} case 123: -#line 485 "compile.y" -{ yyval=yyvsp[0]; O(yyval, OP_DEF) ; +#line 557 "compile.y" +{ yyval = yyvsp[-1]; ; break;} case 124: -#line 486 "compile.y" -{ yyval=yyvsp[0]; O(yyval, OP_IN) ; +#line 558 "compile.y" +{ yyval = yyvsp[-1]; ; break;} case 125: -#line 487 "compile.y" -{ yyval=yyvsp[0]; O(yyval, OP_FEXISTS) ; +#line 560 "compile.y" +{ yyval=yyvsp[0]; O(*yyval, OP_NEG) ; break;} case 126: -#line 488 "compile.y" -{ yyval=yyvsp[0]; O(yyval, OP_DEXISTS) ; +#line 561 "compile.y" +{ yyval=yyvsp[0] ; break;} case 127: -#line 490 "compile.y" -{ yyval=yyvsp[-2]; P(yyval, yyvsp[0]); O(yyval, OP_SUB) ; +#line 562 "compile.y" +{ yyval=yyvsp[0]; O(*yyval, OP_INV) ; break;} case 128: -#line 491 "compile.y" -{ yyval=yyvsp[-2]; P(yyval, yyvsp[0]); O(yyval, OP_ADD) ; +#line 563 "compile.y" +{ yyval=yyvsp[0]; O(*yyval, OP_NOT) ; break;} case 129: -#line 492 "compile.y" -{ yyval=yyvsp[-2]; P(yyval, yyvsp[0]); O(yyval, OP_MUL) ; +#line 564 "compile.y" +{ yyval=yyvsp[0]; O(*yyval, OP_DEF) ; break;} case 130: -#line 493 "compile.y" -{ yyval=yyvsp[-2]; P(yyval, yyvsp[0]); O(yyval, OP_DIV) ; +#line 565 "compile.y" +{ yyval=yyvsp[0]; O(*yyval, OP_IN) ; break;} case 131: -#line 494 "compile.y" -{ yyval=yyvsp[-2]; P(yyval, yyvsp[0]); O(yyval, OP_MOD) ; +#line 566 "compile.y" +{ yyval=yyvsp[0]; O(*yyval, OP_FEXISTS) ; break;} case 132: -#line 495 "compile.y" -{ yyval=yyvsp[-2]; P(yyval, yyvsp[0]); O(yyval, OP_BIN_AND) ; +#line 567 "compile.y" +{ yyval=yyvsp[0]; O(*yyval, OP_DEXISTS) ; break;} case 133: -#line 496 "compile.y" -{ yyval=yyvsp[-2]; P(yyval, yyvsp[0]); O(yyval, OP_BIN_OR) ; +#line 569 "compile.y" +{ yyval=yyvsp[-2]; P(*yyval, *yyvsp[0]); O(*yyval, OP_SUB) ; break;} case 134: -#line 497 "compile.y" -{ yyval=yyvsp[-2]; P(yyval, yyvsp[0]); O(yyval, OP_BIN_XOR) ; +#line 570 "compile.y" +{ yyval=yyvsp[-2]; P(*yyval, *yyvsp[0]); O(*yyval, OP_ADD) ; break;} case 135: -#line 498 "compile.y" -{ yyval=yyvsp[-2]; P(yyval, yyvsp[0]); O(yyval, OP_LOG_AND) ; +#line 571 "compile.y" +{ yyval=yyvsp[-2]; P(*yyval, *yyvsp[0]); O(*yyval, OP_MUL) ; break;} case 136: -#line 499 "compile.y" -{ yyval=yyvsp[-2]; P(yyval, yyvsp[0]); O(yyval, OP_LOG_OR) ; +#line 572 "compile.y" +{ yyval=yyvsp[-2]; P(*yyval, *yyvsp[0]); O(*yyval, OP_DIV) ; break;} case 137: -#line 500 "compile.y" -{ yyval=yyvsp[-2]; P(yyval, yyvsp[0]); O(yyval, OP_LOG_XOR) ; +#line 573 "compile.y" +{ yyval=yyvsp[-2]; P(*yyval, *yyvsp[0]); O(*yyval, OP_MOD) ; break;} case 138: -#line 501 "compile.y" -{ yyval=yyvsp[-2]; P(yyval, yyvsp[0]); O(yyval, OP_NUM_LT) ; +#line 574 "compile.y" +{ yyval=yyvsp[-2]; P(*yyval, *yyvsp[0]); O(*yyval, OP_INTDIV) ; break;} case 139: -#line 502 "compile.y" -{ yyval=yyvsp[-2]; P(yyval, yyvsp[0]); O(yyval, OP_NUM_GT) ; +#line 575 "compile.y" +{ yyval=yyvsp[-2]; P(*yyval, *yyvsp[0]); O(*yyval, OP_BIN_SL) ; break;} case 140: -#line 503 "compile.y" -{ yyval=yyvsp[-2]; P(yyval, yyvsp[0]); O(yyval, OP_NUM_LE) ; +#line 576 "compile.y" +{ yyval=yyvsp[-2]; P(*yyval, *yyvsp[0]); O(*yyval, OP_BIN_SR) ; break;} case 141: -#line 504 "compile.y" -{ yyval=yyvsp[-2]; P(yyval, yyvsp[0]); O(yyval, OP_NUM_GE) ; +#line 577 "compile.y" +{ yyval=yyvsp[-2]; P(*yyval, *yyvsp[0]); O(*yyval, OP_BIN_AND) ; break;} case 142: -#line 505 "compile.y" -{ yyval=yyvsp[-2]; P(yyval, yyvsp[0]); O(yyval, OP_NUM_EQ) ; +#line 578 "compile.y" +{ yyval=yyvsp[-2]; P(*yyval, *yyvsp[0]); O(*yyval, OP_BIN_OR) ; break;} case 143: -#line 506 "compile.y" -{ yyval=yyvsp[-2]; P(yyval, yyvsp[0]); O(yyval, OP_NUM_NE) ; +#line 579 "compile.y" +{ yyval=yyvsp[-2]; P(*yyval, *yyvsp[0]); O(*yyval, OP_BIN_XOR) ; break;} case 144: -#line 507 "compile.y" -{ yyval=yyvsp[-2]; P(yyval, yyvsp[0]); O(yyval, OP_STR_LT) ; +#line 580 "compile.y" +{ yyval=yyvsp[-2]; OA(*yyval, OP_NESTED_CODE, yyvsp[0]); O(*yyval, OP_LOG_AND) ; break;} case 145: -#line 508 "compile.y" -{ yyval=yyvsp[-2]; P(yyval, yyvsp[0]); O(yyval, OP_STR_GT) ; +#line 581 "compile.y" +{ yyval=yyvsp[-2]; OA(*yyval, OP_NESTED_CODE, yyvsp[0]); O(*yyval, OP_LOG_OR) ; break;} case 146: -#line 509 "compile.y" -{ yyval=yyvsp[-2]; P(yyval, yyvsp[0]); O(yyval, OP_STR_LE) ; +#line 582 "compile.y" +{ yyval=yyvsp[-2]; P(*yyval, *yyvsp[0]); O(*yyval, OP_LOG_XOR) ; break;} case 147: -#line 510 "compile.y" -{ yyval=yyvsp[-2]; P(yyval, yyvsp[0]); O(yyval, OP_STR_GE) ; +#line 583 "compile.y" +{ yyval=yyvsp[-2]; P(*yyval, *yyvsp[0]); O(*yyval, OP_NUM_LT) ; break;} case 148: -#line 511 "compile.y" -{ yyval=yyvsp[-2]; P(yyval, yyvsp[0]); O(yyval, OP_STR_EQ) ; +#line 584 "compile.y" +{ yyval=yyvsp[-2]; P(*yyval, *yyvsp[0]); O(*yyval, OP_NUM_GT) ; break;} case 149: -#line 512 "compile.y" -{ yyval=yyvsp[-2]; P(yyval, yyvsp[0]); O(yyval, OP_STR_NE) ; +#line 585 "compile.y" +{ yyval=yyvsp[-2]; P(*yyval, *yyvsp[0]); O(*yyval, OP_NUM_LE) ; break;} case 150: -#line 513 "compile.y" -{ yyval=yyvsp[-2]; P(yyval, yyvsp[0]); O(yyval, OP_IS) ; +#line 586 "compile.y" +{ yyval=yyvsp[-2]; P(*yyval, *yyvsp[0]); O(*yyval, OP_NUM_GE) ; break;} case 151: -#line 516 "compile.y" -{ - yyval=N(POOL); - O(yyval, OP_CREATE_SWPOOL); /* stack: empty write context */ - P(yyval, yyvsp[0]); /* some code that writes to that context */ - O(yyval, OP_REDUCE_SWPOOL); /* context=pop; stack: context.get_string() */ -; +#line 587 "compile.y" +{ yyval=yyvsp[-2]; P(*yyval, *yyvsp[0]); O(*yyval, OP_NUM_EQ) ; break;} case 152: -#line 525 "compile.y" -{ - // optimized from OP_STRING+OP_WRITE_VALUE to OP_STRING__WRITE - change_string_literal_to_write_string_literal(yyval=yyvsp[0]) -; +#line 588 "compile.y" +{ yyval=yyvsp[-2]; P(*yyval, *yyvsp[0]); O(*yyval, OP_NUM_NE) ; break;} case 153: -#line 530 "compile.y" -{ yyval=VL(NEW VVoid(POOL)) ; +#line 589 "compile.y" +{ yyval=yyvsp[-2]; P(*yyval, *yyvsp[0]); O(*yyval, OP_STR_LT) ; break;} case 154: -#line 531 "compile.y" -{ yyval=N(POOL) ; +#line 590 "compile.y" +{ yyval=yyvsp[-2]; P(*yyval, *yyvsp[0]); O(*yyval, OP_STR_GT) ; + break;} +case 155: +#line 591 "compile.y" +{ yyval=yyvsp[-2]; P(*yyval, *yyvsp[0]); O(*yyval, OP_STR_LE) ; + break;} +case 156: +#line 592 "compile.y" +{ yyval=yyvsp[-2]; P(*yyval, *yyvsp[0]); O(*yyval, OP_STR_GE) ; + break;} +case 157: +#line 593 "compile.y" +{ yyval=yyvsp[-2]; P(*yyval, *yyvsp[0]); O(*yyval, OP_STR_EQ) ; + break;} +case 158: +#line 594 "compile.y" +{ yyval=yyvsp[-2]; P(*yyval, *yyvsp[0]); O(*yyval, OP_STR_NE) ; + break;} +case 159: +#line 595 "compile.y" +{ yyval=yyvsp[-2]; P(*yyval, *yyvsp[0]); O(*yyval, OP_IS) ; + break;} +case 160: +#line 598 "compile.y" +{ + yyval=N(); + OA(*yyval, OP_STRING_POOL, yyvsp[0]); /* stack: empty write context */ + /* some code that writes to that context */ + /* context=pop; stack: context.get_string() */ +; + break;} +case 161: +#line 607 "compile.y" +{ + // $1=OP_STRING+origin+OP_WRITE_VALUE + if(PC.explicit_result) { // only allow decoration whitespaces, no byte code actually produced + String::Body body=static_cast(yyvsp[0]->get(2).value)->string(); + if(body.for_each/*first_that, actually*/(is_not_whitespace, 0)) { + strcpy(PC.error, "only whitespaces are allowed here, look before this point (explicit result mode)"); + YYERROR; + } + yyval=N(); + } else { + // optimized from OP_STRING+origin+OP_WRITE_VALUE to OP_STRING__WRITE + change_string_literal_to_write_string_literal(*(yyval=yyvsp[0])); + } +; + break;} +case 162: +#line 622 "compile.y" +{ yyval=VL(new VVoid(), 0, 0, 0) ; + break;} +case 163: +#line 623 "compile.y" +{ yyval=N() ; break;} } /* the action file gets copied in in place of this dollarsign */ -#line 543 "D:/cygwin/usr/share/bison.simple" +#line 543 "/usr/share/bison.simple" yyvsp -= yylen; yyssp -= yylen; @@ -1788,7 +1934,7 @@ yyerrhandle: } return 1; } -#line 533 "compile.y" +#line 625 "compile.y" #endif @@ -1808,126 +1954,185 @@ yyerrhandle: 4:[^({]=pop */ -static int yylex(YYSTYPE *lvalp, void *pc) { - #define lexical_brackets_nestage PC.brackets_nestages[PC.sp] +inline void ungetc(Parse_control& pc, uint last_line_end_col) { + pc.source--; + if(pc.pos.col==0) { + --pc.pos.line; pc.pos.col=last_line_end_col; + } else + --pc.pos.col; + +} +static int yylex(YYSTYPE *lvalp, void *apc) { + register Parse_control& pc=*static_cast(apc); + + #define lexical_brackets_nestage pc.brackets_nestages[pc.ls_sp] #define RC {result=c; goto break2; } - register int c; - int result; + register int c; + int result; - if(PC.pending_state) { - result=PC.pending_state; - PC.pending_state=0; + if(pc.pending_state) { + result=pc.pending_state; + pc.pending_state=0; return result; } - const char *begin=PC.source; + const char *begin=pc.source; + Pos begin_pos=pc.pos; const char *end; - int begin_line=PC.line; int skip_analized=0; while(true) { - c=*(end=(PC.source++)); + c=*(end=(pc.source++)); +// fprintf(stderr, "\nchar: %c %02X; nestage: %d, sp=%d", c, c, lexical_brackets_nestage, pc.sp); - if(c=='\n') { - PC.line++; - PC.col=0; - } else - PC.col++; - - if(c=='^' && PC.ls!=LS_COMMENT && PC.ls!=LS_DEF_COMMENT) - switch(*PC.source) { - // escaping: ^^ & co + if(c=='\n') + pc.pos_next_line(); + else + pc.pos_next_c(c); +// fprintf(stderr, "\nchar: %c file(%d:%d)", c, pc.pos.line, pc.pos.col); + + if(pc.pos.col==0+1 && c=='@') { + if(pc.ls==LS_DEF_SPECIAL_BODY) { + // @SPECIAL + // ... + // @APPEND_CLEAN(begin, end-begin, PC.file, begin_line); + pc.string.append_strdup_know_length(begin, end-begin); } // reset piece 'begin' position & line - begin=PC.source; // ^ - begin_line=PC.line; - // skip over ^ and _ - PC.source++; PC.col++; + begin=pc.source; // ->punctuation + begin_pos=pc.pos; + // skip over _ after ^ + pc.source++; pc.pos.col++; // skip analysis = forced literal continue; // converting ^#HH into char(hex(HH)) case '#': if(end!=begin) { + if(!pc.string_start) + pc.string_start=begin_pos; // append piece till ^ - PC.string->APPEND_CLEAN(begin, end-begin, PC.file, begin_line); + pc.string.append_strdup_know_length(begin, end-begin); } // #HH ? - if(PC.source[0]=='#' && PC.source[1] && PC.source[2]) { - char *hex=(char *)POOL.malloc(1); - hex[0]= - hex_value[(unsigned char)PC.source[1]]*0x10+ - hex_value[(unsigned char)PC.source[2]]; - if(hex[0]==0) { + if(pc.source[0]=='#' && pc.source[1] && pc.source[2]) { + char c= + hex_value[(unsigned char)pc.source[1]]*0x10+ + 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 } // append char(hex(HH)) - PC.string->APPEND_CLEAN(hex, 1, PC.file, begin_line); + pc.string.append(c); // skip over ^#HH - PC.source+=3; - PC.col+=3; + pc.source+=3; + pc.pos.col+=3; // reset piece 'begin' position & line - begin=PC.source; // ^ - begin_line=PC.line; + begin=pc.source; // ->after ^#HH + begin_pos=pc.pos; + // skip analysis = forced literal continue; } break; } + break; + } + } // #comment start skipping - if(c=='#' && PC.col==1) { + if(c=='#' && pc.pos.col==1) { if(end!=begin) { + if(!pc.string_start) + pc.string_start=begin_pos; // append piece till # - PC.string->APPEND_CLEAN(begin, end-begin, PC.file, begin_line); + pc.string.append_strdup_know_length(begin, end-begin); } // fall into COMMENT lexical state [wait for \n] - push_LS(PC, LS_COMMENT); + push_LS(pc, LS_USER_COMMENT); + continue; } - switch(PC.ls) { + switch(pc.ls) { // USER'S = NOT OURS case LS_USER: - if(PC.trim_bof) + case LS_NAME_SQUARE_PART: // name.[here].xxx + if(pc.trim_bof) switch(c) { case '\n': case ' ': case '\t': - begin=PC.source; - begin_line=PC.line; + begin=pc.source; + begin_pos=pc.pos; continue; // skip it default: - PC.trim_bof=false; + pc.trim_bof=false; } switch(c) { case '$': - push_LS(PC, LS_VAR_NAME_SIMPLE); + push_LS(pc, LS_VAR_NAME_SIMPLE_WITH_COLON); RC; case '^': - push_LS(PC, LS_METHOD_NAME); + push_LS(pc, LS_METHOD_NAME); RC; - case '@': - if(PC.col==0+1) { - push_LS(PC, LS_DEF_NAME); - RC; - } + case ']': + if(pc.ls==LS_NAME_SQUARE_PART) + if(--lexical_brackets_nestage==0) {// $name.[co<]?>de<]?> + pop_LS(pc); // $name.[co<]>de<]!> + RC; + } + break; + case '[': // $name.[co<[>de] + if(pc.ls==LS_NAME_SQUARE_PART) + lexical_brackets_nestage++; break; } break; // #COMMENT - case LS_COMMENT: + case LS_USER_COMMENT: if(c=='\n') { // skip comment - begin=PC.source; - begin_line=PC.line; + begin=pc.source; + begin_pos=pc.pos; - pop_LS(PC); + pop_LS(pc); continue; } break; @@ -1939,17 +2144,17 @@ static int yylex(YYSTYPE *lvalp, void *p case '"': case '\'': if( - PC.ls == LS_EXPRESSION_STRING_QUOTED && c=='"' || - PC.ls == LS_EXPRESSION_STRING_APOSTROFED && c=='\'') { - pop_LS(PC); //"abc". | 'abc'. + pc.ls == LS_EXPRESSION_STRING_QUOTED && c=='"' || + pc.ls == LS_EXPRESSION_STRING_APOSTROFED && c=='\'') { + pop_LS(pc); //"abc". | 'abc'. RC; } break; case '$': - push_LS(PC, LS_VAR_NAME_SIMPLE); + push_LS(pc, LS_VAR_NAME_SIMPLE_WITH_COLON); RC; case '^': - push_LS(PC, LS_METHOD_NAME); + push_LS(pc, LS_METHOD_NAME); RC; } break; @@ -1958,23 +2163,26 @@ static int yylex(YYSTYPE *lvalp, void *p case LS_DEF_NAME: switch(c) { case '[': - PC.ls=LS_DEF_PARAMS; + pc.ls=LS_DEF_PARAMS; RC; case '\n': - PC.ls=LS_DEF_SPECIAL_BODY; + pc.ls=LS_DEF_SPECIAL_BODY; RC; } break; case LS_DEF_PARAMS: switch(c) { + case '$': // common error + result=BAD_METHOD_PARAMETER_NAME_CHARACTER; + goto break2; case ';': RC; case ']': - PC.ls=*PC.source=='['?LS_DEF_LOCALS:LS_DEF_COMMENT; + pc.ls=*pc.source=='['?LS_DEF_LOCALS:LS_DEF_COMMENT; RC; case '\n': // wrong. bailing out - pop_LS(PC); + pop_LS(pc); RC; } break; @@ -1985,35 +2193,24 @@ static int yylex(YYSTYPE *lvalp, void *p case ';': RC; case ']': - PC.ls=LS_DEF_COMMENT; + pc.ls=LS_DEF_COMMENT; RC; case '\n': // wrong. bailing out - pop_LS(PC); + pop_LS(pc); RC; } break; case LS_DEF_COMMENT: if(c=='\n') { - pop_LS(PC); + pop_LS(pc); RC; } break; case LS_DEF_SPECIAL_BODY: - // @todo in case - // ################ - // @next-method - // we are here with c=='@' - // which is wrong, and need action - if(c=='\n') { - switch(*PC.source) { - case '@': case 0: // end of special_code - pop_LS(PC); - break; - } + if(c=='\n') RC; - } break; // (EXPRESSION) @@ -2022,22 +2219,33 @@ static int yylex(YYSTYPE *lvalp, void *p switch(c) { case ')': if(--lexical_brackets_nestage==0) - if(PC.ls==LS_METHOD_ROUND) // method round param ended - PC.ls=LS_METHOD_AFTER; // look for method end - else // PC.ls==LS_VAR_ROUND // variable constructor ended - pop_LS(PC); // return to normal life + if(pc.ls==LS_METHOD_ROUND) // method round param ended + pc.ls=LS_METHOD_AFTER; // look for method end + else // pc.ls==LS_VAR_ROUND // variable constructor ended + pop_LS(pc); // return to normal life RC; + case '#': // comment start skipping + if(end!=begin) { + if(!pc.string_start) + pc.string_start=begin_pos; + // append piece till # + pc.string.append_strdup_know_length(begin, end-begin); + } + // fall into COMMENT lexical state [wait for \n] + push_LS(pc, LS_EXPRESSION_COMMENT); + lexical_brackets_nestage=1; + continue; case '$': - push_LS(PC, LS_EXPRESSION_VAR_NAME); + push_LS(pc, LS_EXPRESSION_VAR_NAME_WITH_COLON); RC; case '^': - push_LS(PC, LS_METHOD_NAME); + push_LS(pc, LS_METHOD_NAME); RC; case '(': lexical_brackets_nestage++; RC; case '-': - switch(*PC.source) { + switch(*pc.source) { case 'f': // -f skip_analized=1; result=FEXISTS; @@ -2046,44 +2254,78 @@ static int yylex(YYSTYPE *lvalp, void *p skip_analized=1; result=DEXISTS; goto break2; - default: + default: // minus result=c; goto break2; } goto break2; - case '+': case '*': case '/': case '%': + case '+': case '*': case '/': case '%': case '\\': case '~': case ';': RC; - case '&': case '|': case '#': - if(*PC.source==c) { // && || - result=c=='#'?LXOR:c=='&'?LAND:LOR; + case '&': case '|': + if(*pc.source==c) { // && || + result=c=='&'?LAND:LOR; skip_analized=1; } else result=c; goto break2; - case '<': case '>': case '=': case '!': - if(*PC.source=='=') { // <= >= == != + case '!': + switch(pc.source[0]) { + case '|': // !| !|| skip_analized=1; - switch(c) { - case '<': result=NLE; break; - case '>': result=NGE; break; - case '=': result=NEQ; break; - case '!': result=NNE; break; - } - } else - result=c; + if(pc.source[1]=='|') { + skip_analized++; + result=LXOR; + } else + result=NXOR; + goto break2; + case '=': // != + skip_analized=1; + result=NNE; + goto break2; + } + RC; + + case '<': // <<, <=, < + switch(*pc.source) { + case '<': // <[<] + skip_analized=1; result=NSL; break; + case '=': // <[=] + skip_analized=1; result=NLE; break; + default: // <[] + result=c; break; + } + goto break2; + case '>': // >>, >=, > + switch(*pc.source) { + case '>': // >[>] + skip_analized=1; result=NSR; break; + case '=': // >[=] + skip_analized=1; result=NGE; break; + default: // >[] + result=c; break; + } + goto break2; + case '=': // == + switch(*pc.source) { + case '=': // =[=] + skip_analized=1; result=NEQ; break; + default: // =[] + result=c; break; // not used now + } goto break2; + case '"': - push_LS(PC, LS_EXPRESSION_STRING_QUOTED); + push_LS(pc, LS_EXPRESSION_STRING_QUOTED); RC; case '\'': - push_LS(PC, LS_EXPRESSION_STRING_APOSTROFED); + push_LS(pc, LS_EXPRESSION_STRING_APOSTROFED); RC; case 'l': case 'g': case 'e': case 'n': if(end==begin) // right after whitespace - if(isspace(PC.source[1])) { - switch(*PC.source) { + if(isspace(pc.source[1])) { + switch(*pc.source) { // case '?': // ok [and bad cases, yacc would bark at them] case 't': // lt gt [et nt] result=c=='l'?SLT:c=='g'?SGT:BAD_STRING_COMPARISON_OPERATOR; @@ -2102,8 +2344,8 @@ static int yylex(YYSTYPE *lvalp, void *p break; case 'i': if(end==begin) // right after whitespace - if(isspace(PC.source[1])) { - switch(PC.source[0]) { + if(isspace(pc.source[1])) { + switch(pc.source[0]) { case 'n': // in skip_analized=1; result=IN; @@ -2117,7 +2359,7 @@ static int yylex(YYSTYPE *lvalp, void *p break; case 'd': if(end==begin) // right after whitespace - if(PC.source[0]=='e' && PC.source[1]=='f') { // def + if(pc.source[0]=='e' && pc.source[1]=='f') { // def skip_analized=2; result=DEF; goto break2; @@ -2131,32 +2373,58 @@ static int yylex(YYSTYPE *lvalp, void *p // that's a leading|traling space or after-operator-space // ignoring it // reset piece 'begin' position & line - begin=PC.source; // after whitespace char - begin_line=PC.line; + begin=pc.source; // after whitespace char + begin_pos=pc.pos; + continue; + } + break; + case LS_EXPRESSION_COMMENT: + if(c=='(') + lexical_brackets_nestage++; + + switch(*pc.source) { + case '\n': case ')': + if(*pc.source==')') + if(--lexical_brackets_nestage!=0) + continue; + + // skip comment + begin=pc.source; + begin_pos=pc.pos; + + pop_LS(pc); continue; } break; // VARIABLE GET/PUT/WITH - case LS_VAR_NAME_SIMPLE: - case LS_EXPRESSION_VAR_NAME: - case LS_VAR_NAME_NO_COLON: - if(PC.ls==LS_EXPRESSION_VAR_NAME) { - // name in expr ends also before binary operators + case LS_VAR_NAME_SIMPLE_WITH_COLON: + case LS_VAR_NAME_SIMPLE_WITHOUT_COLON: + case LS_EXPRESSION_VAR_NAME_WITH_COLON: + case LS_EXPRESSION_VAR_NAME_WITHOUT_COLON: + if( + pc.ls==LS_EXPRESSION_VAR_NAME_WITH_COLON || + pc.ls==LS_EXPRESSION_VAR_NAME_WITHOUT_COLON) { + // name in expr ends also before switch(c) { + // expression minus case '-': - pop_LS(PC); - PC.source--; if(--PC.col<0) { PC.line--; PC.col=-1; } + // expression integer division + case '\\': + pop_LS(pc); + pc.ungetc(); result=EON; goto break2; } } - if(PC.ls==LS_VAR_NAME_NO_COLON) { + if( + pc.ls==LS_VAR_NAME_SIMPLE_WITHOUT_COLON || + pc.ls==LS_EXPRESSION_VAR_NAME_WITHOUT_COLON) { // name already has ':', stop before next switch(c) { case ':': - pop_LS(PC); - PC.source--; if(--PC.col<0) { PC.line--; PC.col=-1; } + pop_LS(pc); + pc.ungetc(); result=EON; goto break2; } @@ -2172,42 +2440,62 @@ static int yylex(YYSTYPE *lvalp, void *p case '&': case '|': case '=': case '!': // common delimiters - case ',': case '?': + case ',': case '?': case '#': // before call case '^': - pop_LS(PC); - PC.source--; if(--PC.col<0) { PC.line--; PC.col=-1; } + pop_LS(pc); + pc.ungetc(); result=EON; goto break2; case '[': - PC.ls=LS_VAR_SQUARE; + // $name.<[>code] + if(pc.pos.col>1/*not first column*/ && ( + end[-1]=='$'/*was start of get*/ || + end[-1]==':'/*was class name delim */ || + end[-1]=='.'/*was name delim */ + )) { + push_LS(pc, LS_NAME_SQUARE_PART); + lexical_brackets_nestage=1; + RC; + } + pc.ls=LS_VAR_SQUARE; lexical_brackets_nestage=1; RC; case '{': if(begin==end) { // ${name}, no need of EON, switching LS - PC.ls=LS_VAR_NAME_CURLY; + pc.ls=LS_VAR_NAME_CURLY; } else { - PC.ls=LS_VAR_CURLY; + pc.ls=LS_VAR_CURLY; lexical_brackets_nestage=1; } RC; case '(': - PC.ls=LS_VAR_ROUND; + pc.ls=LS_VAR_ROUND; lexical_brackets_nestage=1; RC; case '.': // name part delim case '$': // name part subvar - case ':': // ':name' or 'class:name' - PC.ls=LS_VAR_NAME_NO_COLON; // stop before next ':' + case ':': // class<:>name + // go to _WITHOUT_COLON state variant... + if(pc.ls==LS_VAR_NAME_SIMPLE_WITH_COLON) + pc.ls=LS_VAR_NAME_SIMPLE_WITHOUT_COLON; + else if(pc.ls==LS_EXPRESSION_VAR_NAME_WITH_COLON) + pc.ls=LS_EXPRESSION_VAR_NAME_WITHOUT_COLON; + // ...stop before next ':' RC; } break; case LS_VAR_NAME_CURLY: switch(c) { + case '[': + // ${name.<[>code]} + push_LS(pc, LS_NAME_SQUARE_PART); + lexical_brackets_nestage=1; + RC; case '}': // ${name} finished, restoring LS - pop_LS(PC); + pop_LS(pc); RC; case '.': // name part delim case '$': // name part subvar @@ -2219,14 +2507,14 @@ static int yylex(YYSTYPE *lvalp, void *p case LS_VAR_SQUARE: switch(c) { case '$': - push_LS(PC, LS_VAR_NAME_SIMPLE); + push_LS(pc, LS_VAR_NAME_SIMPLE_WITH_COLON); RC; case '^': - push_LS(PC, LS_METHOD_NAME); + push_LS(pc, LS_METHOD_NAME); RC; case ']': if(--lexical_brackets_nestage==0) { - pop_LS(PC); + pop_LS(pc); RC; } break; @@ -2241,14 +2529,14 @@ static int yylex(YYSTYPE *lvalp, void *p case LS_VAR_CURLY: switch(c) { case '$': - push_LS(PC, LS_VAR_NAME_SIMPLE); + push_LS(pc, LS_VAR_NAME_SIMPLE_WITH_COLON); RC; case '^': - push_LS(PC, LS_METHOD_NAME); + push_LS(pc, LS_METHOD_NAME); RC; case '}': if(--lexical_brackets_nestage==0) { - pop_LS(PC); + pop_LS(pc); RC; } break; @@ -2262,20 +2550,33 @@ static int yylex(YYSTYPE *lvalp, void *p case LS_METHOD_NAME: switch(c) { case '[': - PC.ls=LS_METHOD_SQUARE; + // ^name.<[>code].xxx + if(pc.pos.col>1/*not first column*/ && ( + end[-1]=='^'/*was start of call*/ || // never, ^[ is literal... + end[-1]==':'/*was class name delim */ || + end[-1]=='.'/*was name delim */ + )) { + push_LS(pc, LS_NAME_SQUARE_PART); + lexical_brackets_nestage=1; + RC; + } + pc.ls=LS_METHOD_SQUARE; lexical_brackets_nestage=1; RC; case '{': - PC.ls=LS_METHOD_CURLY; + pc.ls=LS_METHOD_CURLY; lexical_brackets_nestage=1; RC; case '(': - PC.ls=LS_METHOD_ROUND; + pc.ls=LS_METHOD_ROUND; lexical_brackets_nestage=1; RC; case '.': // name part delim case '$': // name part subvar case ':': // ':name' or 'class:name' + case '^': // ^abc^xxx wrong. bailing out + case ']': case '}': case ')': // ^abc]}) wrong. bailing out + case ' ': // ^if ( wrong. bailing out RC; } break; @@ -2283,16 +2584,16 @@ static int yylex(YYSTYPE *lvalp, void *p case LS_METHOD_SQUARE: switch(c) { case '$': - push_LS(PC, LS_VAR_NAME_SIMPLE); + push_LS(pc, LS_VAR_NAME_SIMPLE_WITH_COLON); RC; case '^': - push_LS(PC, LS_METHOD_NAME); + push_LS(pc, LS_METHOD_NAME); RC; case ';': // param delim RC; case ']': if(--lexical_brackets_nestage==0) { - PC.ls=LS_METHOD_AFTER; + pc.ls=LS_METHOD_AFTER; RC; } break; @@ -2305,16 +2606,16 @@ static int yylex(YYSTYPE *lvalp, void *p case LS_METHOD_CURLY: switch(c) { case '$': - push_LS(PC, LS_VAR_NAME_SIMPLE); + push_LS(pc, LS_VAR_NAME_SIMPLE_WITH_COLON); RC; case '^': - push_LS(PC, LS_METHOD_NAME); + push_LS(pc, LS_METHOD_NAME); RC; case ';': // param delim RC; case '}': if(--lexical_brackets_nestage==0) { - PC.ls=LS_METHOD_AFTER; + pc.ls=LS_METHOD_AFTER; RC; } break; @@ -2326,22 +2627,22 @@ static int yylex(YYSTYPE *lvalp, void *p case LS_METHOD_AFTER: if(c=='[') {/* ][ }[ )[ */ - PC.ls=LS_METHOD_SQUARE; + pc.ls=LS_METHOD_SQUARE; lexical_brackets_nestage=1; RC; } if(c=='{') {/* ]{ }{ ){ */ - PC.ls=LS_METHOD_CURLY; + pc.ls=LS_METHOD_CURLY; lexical_brackets_nestage=1; RC; } if(c=='(') {/* ]( }( )( */ - PC.ls=LS_METHOD_ROUND; + pc.ls=LS_METHOD_ROUND; lexical_brackets_nestage=1; RC; } - pop_LS(PC); - PC.source--; if(--PC.col<0) { PC.line--; PC.col=-1; } + pop_LS(pc); + pc.ungetc(); result=EON; goto break2; } @@ -2359,31 +2660,40 @@ break2: if(end!=begin && end[-1]=='\n') // allow one empty line before LS_DEF_NAME end--; } - if(end!=begin && PC.ls!=LS_COMMENT) { // last piece still alive and not comment? + if(end!=begin && pc.ls!=LS_USER_COMMENT) { // last piece still alive and not comment? + if(!pc.string_start) + pc.string_start=begin_pos; // append it - PC.string->APPEND_CLEAN(begin, end-begin, PC.file, begin_line/*, start_col*/); + pc.string.append_strdup_know_length(begin, end-begin); } } - if(PC.string->size()) { // something accumulated? - // create STRING value: array of OP_VALUE+vstring - *lvalp=VL(NEW VString(*PC.string)); + 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); // new pieces storage - PC.string=NEW String(POOL); + pc.string.clear(); + pc.string_start.clear(); // make current result be pending for next call, return STRING for now - PC.pending_state=result; result=STRING; + pc.pending_state=result; result=STRING; } if(skip_analized) { - PC.source+=skip_analized; PC.col+=skip_analized; + pc.source+=skip_analized; pc.pos.col+=skip_analized; } return result; } -static int real_yyerror(parse_control *pc, char *s) { // Called by yyparse on error +static int real_yyerror(Parse_control *pc, char *s) { // Called by yyparse on error strncpy(PC.error, s, MAX_STRING); return 1; } static void yyprint(FILE *file, int type, YYSTYPE value) { if(type==STRING) - fprintf(file, " \"%s\"", LA2S(value)->cstr()); + fprintf(file, " \"%s\"", LA2S(*value)->cstr()); +} + +static int is_not_whitespace(char c, int) { + return !isspace(c); }