--- parser3/src/main/compile.tab.C 2001/08/06 16:18:26 1.2 +++ parser3/src/main/compile.tab.C 2002/12/06 17:27:35 1.78 @@ -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 ArtLebedev Group (http://www.artlebedev.com) + Author: Alexander Petrosyan (http://design.ru/paf) + + $Id: compile.tab.C,v 1.78 2002/12/06 17:27:35 paf Exp $ +*/ /** @todo parser4: @@ -59,8 +72,8 @@ 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" -#define SELF_ELEMENT_NAME "self" #define USE_CONTROL_METHOD_NAME "USE" static int real_yyerror(parse_control *pc, char *s); @@ -87,26 +100,26 @@ static int yylex(YYSTYPE *lvalp, void *p -#define YYFINAL 240 +#define YYFINAL 252 #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] : 139) 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,7 +134,8 @@ 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 @@ -136,80 +150,82 @@ static const short yyprhs[] = { 0, 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 + 254, 256, 258, 260, 263, 266, 270, 272, 274, 277, + 280, 282, 284, 287, 290, 292, 294, 296, 298, 302, + 306, 310, 313, 316, 319, 322, 325, 328, 331, 334, + 338, 342, 346, 350, 354, 358, 362, 366, 370, 374, + 378, 382, 386, 390, 394, 398, 402, 406, 410, 414, + 418, 422, 426, 430, 434, 438, 442, 444, 446, 447 }; -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, 75, 0, + 64, 0, 69, 0, 45, 4, 46, 65, 0, 138, + 0, 66, 0, 67, 0, 66, 67, 0, 68, 46, + 0, 138, 0, 4, 0, 45, 4, 71, 70, 74, + 46, 75, 0, 138, 0, 71, 0, 47, 72, 48, + 0, 138, 0, 73, 0, 4, 0, 73, 49, 4, + 0, 138, 0, 4, 0, 138, 0, 76, 0, 77, + 0, 76, 77, 0, 136, 0, 78, 0, 79, 0, + 87, 0, 100, 0, 80, 0, 50, 81, 0, 83, + 3, 0, 82, 0, 51, 83, 52, 0, 84, 0, + 85, 0, 86, 0, 130, 86, 0, 122, 0, 119, + 122, 0, 50, 88, 92, 0, 89, 0, 90, 0, + 91, 0, 118, 0, 53, 118, 0, 130, 118, 0, + 93, 0, 94, 0, 95, 0, 47, 96, 48, 0, + 54, 133, 55, 0, 51, 75, 52, 0, 137, 0, + 4, 0, 97, 0, 98, 0, 99, 0, 78, 0, + 77, 76, 0, 101, 0, 0, 0, 56, 102, 104, + 103, 105, 3, 0, 83, 0, 106, 0, 105, 106, + 0, 107, 0, 108, 0, 109, 0, 47, 110, 48, + 0, 54, 111, 55, 0, 51, 112, 52, 0, 113, + 0, 110, 49, 113, 0, 114, 0, 111, 49, 114, + 0, 115, 0, 112, 49, 115, 0, 116, 0, 117, + 0, 75, 0, 137, 0, 4, 0, 97, 0, 133, + 0, 123, 0, 119, 123, 0, 120, 0, 119, 120, + 0, 121, 53, 0, 123, 0, 123, 0, 4, 5, + 0, 4, 0, 124, 0, 125, 0, 126, 0, 50, + 127, 0, 4, 128, 0, 47, 76, 48, 0, 4, + 0, 129, 0, 128, 129, 0, 50, 127, 0, 131, + 0, 132, 0, 4, 57, 0, 131, 57, 0, 134, + 0, 4, 0, 80, 0, 101, 0, 58, 135, 58, + 0, 59, 135, 59, 0, 54, 134, 55, 0, 37, + 134, 0, 36, 134, 0, 43, 134, 0, 44, 134, + 0, 27, 134, 0, 28, 134, 0, 29, 134, 0, + 30, 134, 0, 134, 37, 134, 0, 134, 36, 134, + 0, 134, 38, 134, 0, 134, 39, 134, 0, 134, + 41, 134, 0, 134, 40, 134, 0, 134, 19, 134, + 0, 134, 20, 134, 0, 134, 35, 134, 0, 134, + 34, 134, 0, 134, 14, 134, 0, 134, 11, 134, + 0, 134, 12, 134, 0, 134, 13, 134, 0, 134, + 32, 134, 0, 134, 33, 134, 0, 134, 15, 134, + 0, 134, 16, 134, 0, 134, 17, 134, 0, 134, + 18, 134, 0, 134, 21, 134, 0, 134, 22, 134, + 0, 134, 23, 134, 0, 134, 24, 134, 0, 134, + 25, 134, 0, 134, 26, 134, 0, 134, 31, 134, + 0, 75, 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 + 115, 125, 127, 127, 128, 130, 130, 132, 199, 199, + 200, 200, 201, 202, 202, 204, 233, 233, 234, 235, + 235, 236, 236, 238, 238, 242, 242, 244, 244, 245, + 245, 246, 246, 246, 250, 257, 258, 258, 259, 260, + 262, 263, 285, 286, 286, 290, 294, 296, 297, 298, + 315, 320, 322, 324, 325, 327, 333, 341, 347, 349, + 350, 352, 358, 359, 359, 363, 369, 372, 375, 388, + 390, 390, 391, 393, 394, 396, 397, 398, 399, 401, + 403, 405, 407, 409, 411, 415, 419, 423, 425, 426, + 428, 437, 437, 439, 439, 440, 441, 449, 454, 456, + 458, 459, 460, 462, 466, 475, 481, 486, 486, 487, + 492, 494, 496, 508, 520, 525, 527, 528, 529, 530, + 531, 533, 534, 535, 536, 537, 538, 539, 540, 542, + 543, 544, 545, 546, 547, 548, 549, 550, 551, 552, + 553, 554, 555, 556, 557, 558, 559, 560, 561, 562, + 563, 564, 565, 566, 567, 568, 571, 580, 585, 586 }; #endif @@ -217,48 +233,49 @@ 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", -"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", -"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 +"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","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","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","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", +"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, 69, 70, 70, 71, 72, + 72, 73, 73, 74, 74, 75, 75, 76, 76, 77, + 77, 78, 78, 78, 79, 80, 81, 81, 82, 83, + 83, 84, 85, 86, 86, 87, 88, 88, 88, 89, + 90, 91, 92, 92, 92, 93, 94, 95, 96, 96, + 96, 97, 98, 99, 99, 100, 102, 103, 101, 104, + 105, 105, 106, 106, 106, 107, 108, 109, 110, 110, + 111, 111, 112, 112, 113, 114, 115, 116, 116, 116, + 117, 118, 118, 119, 119, 120, 121, 122, 122, 123, + 123, 123, 123, 124, 125, 126, 127, 128, 128, 129, + 130, 130, 131, 132, 133, 134, 134, 134, 134, 134, + 134, 134, 134, 134, 134, 134, 134, 134, 134, 134, + 134, 134, 134, 134, 134, 134, 134, 134, 134, 134, + 134, 134, 134, 134, 134, 134, 134, 134, 134, 134, + 134, 134, 134, 134, 134, 134, 135, 136, 137, 138 }; static const short yyr2[] = { 0, @@ -272,185 +289,207 @@ static const short yyr2[] = { 0, 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, + 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, 3, 3, 3, - 1, 1, 0, 0 + 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, +static const short yydefact[] = { 160, + 158, 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, + 0, 100, 0, 0, 0, 0, 36, 38, 0, 40, + 41, 42, 0, 47, 48, 49, 50, 0, 94, 0, + 44, 92, 101, 102, 103, 0, 111, 112, 0, 4, + 29, 160, 160, 160, 99, 0, 113, 105, 108, 0, + 107, 104, 0, 0, 98, 0, 100, 51, 0, 92, + 37, 159, 160, 0, 46, 53, 54, 55, 100, 95, + 45, 93, 96, 43, 52, 114, 70, 68, 15, 8, + 10, 11, 0, 9, 22, 0, 21, 20, 160, 18, + 17, 110, 109, 106, 39, 93, 158, 0, 31, 0, + 61, 62, 63, 59, 0, 116, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 160, 160, 117, 118, + 0, 115, 0, 12, 14, 13, 19, 0, 25, 0, + 24, 65, 56, 58, 126, 127, 128, 129, 123, 122, + 124, 125, 0, 157, 0, 0, 57, 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, 0, 0, + 0, 0, 0, 0, 159, 160, 0, 0, 71, 73, + 74, 75, 23, 160, 121, 119, 120, 141, 142, 143, + 140, 146, 147, 148, 149, 136, 137, 150, 151, 152, + 153, 154, 155, 156, 144, 145, 139, 138, 131, 130, + 132, 133, 135, 134, 158, 90, 0, 79, 85, 88, + 87, 0, 83, 0, 81, 86, 91, 69, 72, 16, + 76, 159, 160, 78, 0, 77, 80, 84, 82, 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[] = { 250, + 5, 6, 7, 8, 90, 91, 92, 93, 9, 99, + 54, 96, 97, 140, 154, 11, 12, 13, 14, 129, + 27, 28, 29, 30, 31, 32, 16, 33, 34, 35, + 36, 75, 76, 77, 78, 110, 226, 112, 113, 17, + 130, 49, 133, 88, 188, 189, 190, 191, 192, 227, + 234, 232, 228, 235, 233, 229, 236, 37, 64, 39, + 40, 41, 65, 43, 44, 45, 62, 58, 59, 66, + 47, 48, 237, 132, 155, 19, 230, 20 }; -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[] = { 13, +-32768, 24, 98,-32768, 36,-32768,-32768,-32768,-32768,-32768, + 14,-32768,-32768,-32768,-32768,-32768,-32768,-32768,-32768,-32768, + -26, 39, 14, 44, 45, 100,-32768,-32768, 47,-32768, +-32768,-32768, 52,-32768,-32768,-32768,-32768, 118,-32768, 59, +-32768, 4,-32768,-32768,-32768, 118, -3,-32768, 45,-32768, +-32768, 101, 113, 71,-32768, 44,-32768, 70,-32768, 32, +-32768,-32768, 73, 118, 83, 118, 70,-32768, 100, 83, +-32768, 27, 14, 57,-32768,-32768,-32768,-32768, 1,-32768, +-32768, 4,-32768,-32768,-32768,-32768,-32768,-32768,-32768,-32768, + 20,-32768, 78, 91,-32768, 90, 94,-32768, 135,-32768, +-32768,-32768,-32768,-32768,-32768, 83, 92, 14, -22, 106, +-32768,-32768,-32768,-32768, 115,-32768, 57, 57, 57, 57, + 57, 57, 57, 57, 105, 57, 14, 14,-32768,-32768, + 114, 281, 72,-32768,-32768,-32768,-32768, 142,-32768, 107, +-32768, 14,-32768,-32768, 440, 440, 440, 440,-32768,-32768, +-32768,-32768, 236,-32768, 112, 120,-32768, 57, 57, 57, + 57, 57, 57, 57, 57, 57, 57, 57, 57, 57, + 57, 57, 57, 57, 57, 57, 57, 57, 57, 57, + 57, 57, 57, 57, 41, 14, 57, 5,-32768,-32768, +-32768,-32768,-32768, 14,-32768,-32768,-32768, 371, 343, 312, + 244, 399, 399, 412, 412, 136, 136, 399, 399, 399, + 399, 412, 412, 440, 399, 399, 447, 453, 93, 93, +-32768,-32768,-32768,-32768, -11,-32768, 19,-32768,-32768,-32768, +-32768, -10,-32768, -33,-32768,-32768,-32768,-32768,-32768,-32768, +-32768, 41, 14,-32768, 57,-32768,-32768,-32768,-32768, 180, + 181,-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, 177,-32768,-32768,-32768, 99,-32768,-32768,-32768, + 129,-32768,-32768,-32768, 3, -18, -7, -71,-32768, 0, +-32768,-32768, -6,-32768,-32768, -37,-32768,-32768,-32768,-32768, +-32768,-32768,-32768,-32768,-32768,-32768, 119,-32768,-32768,-32768, + 2,-32768,-32768,-32768,-32768, -4,-32768,-32768,-32768,-32768, +-32768,-32768, -50, -52, -48,-32768,-32768, -16, 95, -23, +-32768, -24, 9,-32768,-32768,-32768, 169,-32768, 168, 224, +-32768,-32768, 154, 40, 102,-32768, 157, -20 }; -#define YYLAST 401 +#define YYLAST 494 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 + 109, 18, 10, 51, 60, 55, -98, 238, 84, 68, + 15, 42, 18, 81, 80, 245, 1, 1, 63, 52, + 53, 246, 15, 89, 18, -64, -64, 21, 84, 85, + 107, 94, 98, 101, 70, 1, -89, -89, 243, 81, + 80, 244, 87, 55, 225, 80, 82, 61, 22, 71, + 56, 185, 51, 86, 42, 186, -97, 2, 187, 15, + 116, 18, 3, 3, 108, -160, 241, 242, 4, 4, + 135, 15, 15, 18, 18, 115, 3, 106, 141, 104, + 2, 3, 4, 117, 118, 119, 120, 4, 56, 142, + 3, 23, 121, 122, 24, 57, 4, 38, 72, 123, + 124, 22, 73, 67, 89, 74, 125, 15, 22, 18, + 126, 83, 4, 109, 127, 128, 95, 53, 185, 56, + 69, 79, 186, 136, 105, 187, 15, 15, 18, 18, + 181, 182, 183, 184, 51, -97, -14, 137, 139, -60, + 38, 15, 138, 18, 23, 193, 23, 24, 25, 24, + 26, 23, 194, 143, 24, 25, 145, 146, 147, 148, + 149, 150, 151, 152, 23, 153, 144, 24, 157, 196, + 109, 179, 180, 181, 182, 183, 184, 108, 197, 251, + 252, 50, 100, 239, 15, 15, 18, 18, 231, 134, + 111, 247, 249, 15, 248, 18, 240, 198, 199, 200, + 201, 202, 203, 204, 205, 206, 207, 208, 209, 210, + 211, 212, 213, 214, 215, 216, 217, 218, 219, 220, + 221, 222, 223, 224, 102, 103, 46, 131, 114, 156, + 0, 0, 0, 0, 108, 0, 0, 0, 0, 0, + 0, 15, 15, 18, 18, 231, 158, 159, 160, 161, + 162, 163, 164, 165, 166, 167, 168, 169, 170, 171, + 172, 173, 166, 167, 0, 0, 174, 175, 176, 177, + 178, 179, 180, 181, 182, 183, 184, 177, 178, 179, + 180, 181, 182, 183, 184, 0, 0, 0, 0, 0, + 195, 158, 159, 160, 161, 162, 163, 164, 165, 166, + 167, 168, 169, 170, 171, 172, 173, 0, 0, 0, + 0, 174, 175, 176, 177, 178, 179, 180, 181, 182, + 183, 184, 158, 159, 0, 161, 162, 163, 164, 165, + 166, 167, 168, 169, 170, 171, 172, 173, 0, 0, + 0, 0, 174, 175, 176, 177, 178, 179, 180, 181, + 182, 183, 184, 158, 0, 0, 161, 162, 163, 164, + 165, 166, 167, 168, 169, 170, 171, 172, 173, 0, + 0, 0, 0, 174, 175, 176, 177, 178, 179, 180, + 181, 182, 183, 184, 161, 162, 163, 164, 165, 166, + 167, 168, 169, 170, 171, 172, 173, 0, 0, 0, + 0, 174, 175, 176, 177, 178, 179, 180, 181, 182, + 183, 184, 161, 0, 0, 164, 165, 166, 167, 0, + 0, 0, 0, 172, 173, 161, 0, 0, 0, 174, + 166, 167, 177, 178, 179, 180, 181, 182, 183, 184, + 0, 0, 174, 0, 0, 177, 178, 179, 180, 181, + 182, 183, 184, 161, 0, 0, 0, 0, 166, 167, + 0, 0, 0, 0, 0, 166, 167, 0, 0, 0, + 0, 166, 167, 177, 178, 179, 180, 181, 182, 183, + 184, 178, 179, 180, 181, 182, 183, 184, 179, 180, + 181, 182, 183, 184 }; 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 + 72, 0, 0, 11, 23, 5, 3, 3, 46, 26, + 11, 3, 11, 38, 38, 49, 4, 4, 25, 46, + 47, 55, 23, 4, 23, 48, 49, 4, 66, 46, + 4, 52, 53, 54, 26, 4, 48, 49, 49, 64, + 64, 52, 49, 5, 4, 69, 38, 4, 4, 3, + 50, 47, 60, 57, 46, 51, 53, 45, 54, 60, + 4, 60, 50, 50, 72, 46, 48, 49, 56, 56, + 91, 72, 73, 72, 73, 73, 50, 69, 99, 48, + 45, 50, 56, 27, 28, 29, 30, 56, 50, 108, + 50, 47, 36, 37, 50, 57, 56, 3, 47, 43, + 44, 4, 51, 4, 4, 54, 50, 108, 4, 108, + 54, 53, 56, 185, 58, 59, 4, 47, 47, 50, + 26, 4, 51, 46, 52, 54, 127, 128, 127, 128, + 38, 39, 40, 41, 142, 53, 46, 48, 4, 48, + 46, 142, 49, 142, 47, 4, 47, 50, 51, 50, + 53, 47, 46, 48, 50, 51, 117, 118, 119, 120, + 121, 122, 123, 124, 47, 126, 52, 50, 55, 58, + 242, 36, 37, 38, 39, 40, 41, 185, 59, 0, + 0, 5, 54, 188, 185, 186, 185, 186, 186, 91, + 72, 242, 245, 194, 243, 194, 194, 158, 159, 160, + 161, 162, 163, 164, 165, 166, 167, 168, 169, 170, + 171, 172, 173, 174, 175, 176, 177, 178, 179, 180, + 181, 182, 183, 184, 56, 58, 3, 74, 72, 128, + -1, -1, -1, -1, 242, -1, -1, -1, -1, -1, + -1, 242, 243, 242, 243, 243, 11, 12, 13, 14, + 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, + 25, 26, 19, 20, -1, -1, 31, 32, 33, 34, + 35, 36, 37, 38, 39, 40, 41, 34, 35, 36, + 37, 38, 39, 40, 41, -1, -1, -1, -1, -1, + 55, 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, 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, 19, 20, 34, 35, 36, 37, 38, 39, 40, + 41, 35, 36, 37, 38, 39, 40, 41, 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 +703,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 *. @@ -993,19 +1032,19 @@ yyreduce: switch (yyn) { case 1: -#line 107 "compile.y" +#line 116 "compile.y" { Method& method=*NEW Method(POOL, - *main_method_name, + PC.request->main_method_name, 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.request->main_method_name, method); ; break;} case 8: -#line 124 "compile.y" +#line 133 "compile.y" { const String& command=*LA2S(yyvsp[-2]); YYSTYPE strings_code=yyvsp[0]; @@ -1016,7 +1055,7 @@ case 8: 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, "'"); @@ -1036,29 +1075,30 @@ case 8: } } else if(command==USE_CONTROL_METHOD_NAME) { for(int i=0; isize(); i+=2) - PC.request->use_file(*LA2S(strings_code, i)); + 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( + Value *vbase_class=static_cast( PC.request->classes().get(base_name)); - if(!base) { + VStateless_class *base_class=vbase_class?vbase_class->get_class():0; + if(!base_class) { strcpy(PC.error, base_name.cstr()); strcat(PC.error, ": undefined class in @"BASE_NAME); YYERROR; } // @CLASS == @BASE sanity check - if(PC.cclass==base) { + if(PC.cclass==base_class) { strcpy(PC.error, "@"CLASS_NAME" equals @"BASE_NAME); YYERROR; } - PC.cclass->set_base(*base); + PC.cclass->set_base(base_class); } else { strcpy(PC.error, "@"BASE_NAME" must contain sole name"); YYERROR; @@ -1073,11 +1113,11 @@ case 8: ; break;} case 12: -#line 190 "compile.y" +#line 200 "compile.y" { yyval=yyvsp[-1]; P(yyval, yyvsp[0]) ; break;} case 16: -#line 195 "compile.y" +#line 205 "compile.y" { const String *name=LA2S(yyvsp[-5]); @@ -1107,76 +1147,88 @@ case 16: ; break;} case 19: -#line 224 "compile.y" +#line 234 "compile.y" {yyval=yyvsp[-1]; break;} case 23: -#line 226 "compile.y" +#line 236 "compile.y" { yyval=yyvsp[-2]; P(yyval, yyvsp[0]) ; break;} case 29: -#line 234 "compile.y" +#line 244 "compile.y" { yyval=yyvsp[-1]; P(yyval, yyvsp[0]) ; break;} case 35: -#line 240 "compile.y" +#line 250 "compile.y" { - yyval=yyvsp[0]; /* stack: resulting value */ - O(yyval, OP_WRITE_VALUE); /* value=pop; wcontext.write(value) */ + 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 36: -#line 244 "compile.y" +#line 257 "compile.y" { yyval=yyvsp[0] ; break;} case 39: -#line 246 "compile.y" +#line 259 "compile.y" { yyval=yyvsp[-1] ; break;} case 42: -#line 250 "compile.y" +#line 263 "compile.y" { yyval=N(POOL); Array *diving_code=yyvsp[0]; const String *first_name=LA2S(diving_code); + // self.xxx... -> xxx... + // OP_VALUE+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->size()>2?3/*OP_+string+get_element*/:2/*OP_+string*/); + diving_code->size()>=3?3/*OP_VALUE+string+OP_GET_ELEMENTx*/:2/*OP_+string*/); } else { O(yyval, OP_WITH_READ); /* stack: starting context */ + + // ^if ELEMENT -> ^if ELEMENT_OR_OPERATOR + // OP_VALUE+string+OP_GET_ELEMENT. -> OP_VALUE+string+OP_GET_ELEMENT_OR_OPERATOR. + if(PC.in_call_value && diving_code->size()==3) + diving_code->put_int(2, OP_GET_ELEMENT_OR_OPERATOR); P(yyval, diving_code); } /* diving code; stack: current context */ ; break;} case 43: -#line 265 "compile.y" +#line 285 "compile.y" { yyval=yyvsp[-1]; P(yyval, yyvsp[0]) ; break;} case 45: -#line 266 "compile.y" +#line 286 "compile.y" { yyval=yyvsp[-1]; P(yyval, yyvsp[0]) ; break;} case 46: -#line 270 "compile.y" +#line 290 "compile.y" { yyval=yyvsp[-1]; /* stack: context,name */ P(yyval, yyvsp[0]); /* stack: context,name,constructor_value */ ; break;} case 50: -#line 278 "compile.y" +#line 298 "compile.y" { yyval=N(POOL); Array *diving_code=yyvsp[0]; const String *first_name=LA2S(diving_code); + // $self.xxx... -> $xxx... + // OP_VALUE+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->size()>2?3/*OP_+string+get_element*/:2/*OP_+string*/); + diving_code->size()>=3?3/*OP_VALUE+string+OP_GET_ELEMENTx*/:2/*OP_+string*/); } else { O(yyval, OP_WITH_ROOT); /* stack: starting context */ P(yyval, diving_code); @@ -1185,7 +1237,7 @@ case 50: ; break;} case 51: -#line 293 "compile.y" +#line 315 "compile.y" { yyval=N(POOL); O(yyval, OP_WITH_WRITE); /* stack: starting context */ @@ -1193,11 +1245,11 @@ case 51: ; break;} case 52: -#line 298 "compile.y" +#line 320 "compile.y" { yyval=yyvsp[-1]; P(yyval, yyvsp[0]) ; break;} case 56: -#line 305 "compile.y" +#line 327 "compile.y" { // stack: context, name yyval=yyvsp[-1]; // stack: context, name, value @@ -1205,370 +1257,417 @@ case 56: ; break;} case 57: -#line 311 "compile.y" +#line 333 "compile.y" { + yyval=N(POOL); + 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" +#line 341 "compile.y" { // stack: context, name yyval=N(POOL); - CCA(yyval, yyvsp[-1]); /* code=pop; name=pop; context=pop; construct(context,name,junction(code)) */ + 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" +#line 352 "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() */ + 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" +#line 359 "compile.y" { yyval=yyvsp[-1]; P(yyval, yyvsp[0]) ; break;} case 66: -#line 339 "compile.y" +#line 363 "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 ; +#line 369 "compile.y" +{ + PC.in_call_value=true; + ; break;} case 68: -#line 344 "compile.y" -{ PC.object_constructor_allowed=false ; +#line 372 "compile.y" +{ + PC.in_call_value=false; + ; break;} case 69: -#line 345 "compile.y" +#line 375 "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(params_code->size()==3) { // probably [] case. [OP_VALUE + Void + STORE_PARAM] if(Value *value=LA2V(params_code)) // it is OP_VALUE + 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" +#line 390 "compile.y" { yyval=yyvsp[-1]; P(yyval, yyvsp[0]) ; break;} case 76: -#line 367 "compile.y" +#line 396 "compile.y" {yyval=yyvsp[-1]; break;} case 77: -#line 368 "compile.y" +#line 397 "compile.y" {yyval=yyvsp[-1]; break;} case 78: -#line 369 "compile.y" +#line 398 "compile.y" {yyval=yyvsp[-1]; break;} case 80: -#line 372 "compile.y" +#line 401 "compile.y" { yyval=yyvsp[-2]; P(yyval, yyvsp[0]) ; break;} case 82: -#line 376 "compile.y" +#line 405 "compile.y" { yyval=yyvsp[-2]; P(yyval, yyvsp[0]) ; break;} case 84: -#line 380 "compile.y" +#line 409 "compile.y" { yyval=yyvsp[-2]; P(yyval, yyvsp[0]) ; break;} case 85: -#line 382 "compile.y" +#line 411 "compile.y" { yyval=yyvsp[0]; O(yyval, OP_STORE_PARAM); ; break;} case 86: -#line 386 "compile.y" +#line 415 "compile.y" { yyval=N(POOL); - PEA(yyval, yyvsp[0]); + OA(yyval, OP_EXPR_CODE__STORE_PARAM, yyvsp[0]); ; break;} case 87: -#line 390 "compile.y" +#line 419 "compile.y" { yyval=N(POOL); - PCA(yyval, yyvsp[0]); + OA(yyval, OP_CURLY_CODE__STORE_PARAM, yyvsp[0]); ; break;} case 91: -#line 399 "compile.y" +#line 428 "compile.y" { - yyval=yyvsp[0]; + yyval=N(POOL); + O(yyval, OP_PREPARE_TO_EXPRESSION); + P(yyval, yyvsp[0]); O(yyval, OP_WRITE_EXPR_RESULT); ; break;} case 93: -#line 406 "compile.y" +#line 437 "compile.y" { yyval=yyvsp[-1]; P(yyval, yyvsp[0]) ; break;} case 95: -#line 408 "compile.y" +#line 439 "compile.y" { yyval=yyvsp[-1]; P(yyval, yyvsp[0]) ; break;} case 97: -#line 410 "compile.y" +#line 441 "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) */ ; break;} case 98: -#line 415 "compile.y" +#line 449 "compile.y" { /* stack: context */ yyval=yyvsp[0]; /* stack: context,name */ O(yyval, OP_GET_ELEMENT); /* name=pop; context=pop; stack: context.get_element(name) */ ; break;} -case 103: -#line 427 "compile.y" +case 104: +#line 462 "compile.y" { yyval=yyvsp[0]; O(yyval, OP_GET_ELEMENT); ; break;} -case 104: -#line 431 "compile.y" +case 105: +#line 466 "compile.y" { + Array *code; + { + change_string_literal_to_write_string_literal(code=yyvsp[-1]); + P(code, yyvsp[0]); + } 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); + OA(yyval, OP_STRING_POOL, code); ; break;} -case 105: -#line 439 "compile.y" +case 106: +#line 475 "compile.y" +{ + yyval=N(POOL); + 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 481 "compile.y" { yyval=N(POOL); O(yyval, OP_WITH_READ); P(yyval, yyvsp[0]); ; break;} -case 107: -#line 444 "compile.y" +case 109: +#line 486 "compile.y" { yyval=yyvsp[-1]; P(yyval, yyvsp[0]) ; break;} -case 108: -#line 445 "compile.y" +case 110: +#line 487 "compile.y" { yyval=yyvsp[0]; O(yyval, OP_GET_ELEMENT__WRITE); ; break;} -case 111: -#line 454 "compile.y" +case 113: +#line 496 "compile.y" { yyval=yyvsp[-1]; // stack: class name string + if(*LA2S(yyval) == BASE_NAME) { // pseude 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 114: +#line 508 "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); ; break;} -case 113: -#line 470 "compile.y" +case 115: +#line 520 "compile.y" { + // see OP_PREPARE_TO_EXPRESSION!! if((yyval=yyvsp[0])->size()==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" +#line 529 "compile.y" { yyval = yyvsp[-1]; ; break;} case 120: -#line 482 "compile.y" -{ yyval=yyvsp[0]; O(yyval, OP_NEG) ; +#line 530 "compile.y" +{ yyval = yyvsp[-1]; ; break;} case 121: -#line 483 "compile.y" -{ yyval=yyvsp[0]; O(yyval, OP_INV) ; +#line 531 "compile.y" +{ yyval = yyvsp[-1]; ; break;} case 122: -#line 484 "compile.y" -{ yyval=yyvsp[0]; O(yyval, OP_NOT) ; +#line 533 "compile.y" +{ yyval=yyvsp[0]; O(yyval, OP_NEG) ; break;} case 123: -#line 485 "compile.y" -{ yyval=yyvsp[0]; O(yyval, OP_DEF) ; +#line 534 "compile.y" +{ yyval=yyvsp[0] ; break;} case 124: -#line 486 "compile.y" -{ yyval=yyvsp[0]; O(yyval, OP_IN) ; +#line 535 "compile.y" +{ yyval=yyvsp[0]; O(yyval, OP_INV) ; break;} case 125: -#line 487 "compile.y" -{ yyval=yyvsp[0]; O(yyval, OP_FEXISTS) ; +#line 536 "compile.y" +{ yyval=yyvsp[0]; O(yyval, OP_NOT) ; break;} case 126: -#line 488 "compile.y" -{ yyval=yyvsp[0]; O(yyval, OP_DEXISTS) ; +#line 537 "compile.y" +{ yyval=yyvsp[0]; O(yyval, OP_DEF) ; break;} case 127: -#line 490 "compile.y" -{ yyval=yyvsp[-2]; P(yyval, yyvsp[0]); O(yyval, OP_SUB) ; +#line 538 "compile.y" +{ yyval=yyvsp[0]; O(yyval, OP_IN) ; break;} case 128: -#line 491 "compile.y" -{ yyval=yyvsp[-2]; P(yyval, yyvsp[0]); O(yyval, OP_ADD) ; +#line 539 "compile.y" +{ yyval=yyvsp[0]; O(yyval, OP_FEXISTS) ; break;} case 129: -#line 492 "compile.y" -{ yyval=yyvsp[-2]; P(yyval, yyvsp[0]); O(yyval, OP_MUL) ; +#line 540 "compile.y" +{ yyval=yyvsp[0]; O(yyval, OP_DEXISTS) ; break;} case 130: -#line 493 "compile.y" -{ yyval=yyvsp[-2]; P(yyval, yyvsp[0]); O(yyval, OP_DIV) ; +#line 542 "compile.y" +{ yyval=yyvsp[-2]; P(yyval, yyvsp[0]); O(yyval, OP_SUB) ; break;} case 131: -#line 494 "compile.y" -{ yyval=yyvsp[-2]; P(yyval, yyvsp[0]); O(yyval, OP_MOD) ; +#line 543 "compile.y" +{ yyval=yyvsp[-2]; P(yyval, yyvsp[0]); O(yyval, OP_ADD) ; break;} case 132: -#line 495 "compile.y" -{ yyval=yyvsp[-2]; P(yyval, yyvsp[0]); O(yyval, OP_BIN_AND) ; +#line 544 "compile.y" +{ yyval=yyvsp[-2]; P(yyval, yyvsp[0]); O(yyval, OP_MUL) ; break;} case 133: -#line 496 "compile.y" -{ yyval=yyvsp[-2]; P(yyval, yyvsp[0]); O(yyval, OP_BIN_OR) ; +#line 545 "compile.y" +{ yyval=yyvsp[-2]; P(yyval, yyvsp[0]); O(yyval, OP_DIV) ; break;} case 134: -#line 497 "compile.y" -{ yyval=yyvsp[-2]; P(yyval, yyvsp[0]); O(yyval, OP_BIN_XOR) ; +#line 546 "compile.y" +{ yyval=yyvsp[-2]; P(yyval, yyvsp[0]); O(yyval, OP_MOD) ; break;} case 135: -#line 498 "compile.y" -{ yyval=yyvsp[-2]; P(yyval, yyvsp[0]); O(yyval, OP_LOG_AND) ; +#line 547 "compile.y" +{ yyval=yyvsp[-2]; P(yyval, yyvsp[0]); O(yyval, OP_INTDIV) ; break;} case 136: -#line 499 "compile.y" -{ yyval=yyvsp[-2]; P(yyval, yyvsp[0]); O(yyval, OP_LOG_OR) ; +#line 548 "compile.y" +{ yyval=yyvsp[-2]; P(yyval, yyvsp[0]); O(yyval, OP_BIN_SL) ; break;} case 137: -#line 500 "compile.y" -{ yyval=yyvsp[-2]; P(yyval, yyvsp[0]); O(yyval, OP_LOG_XOR) ; +#line 549 "compile.y" +{ yyval=yyvsp[-2]; P(yyval, yyvsp[0]); O(yyval, OP_BIN_SR) ; break;} case 138: -#line 501 "compile.y" -{ yyval=yyvsp[-2]; P(yyval, yyvsp[0]); O(yyval, OP_NUM_LT) ; +#line 550 "compile.y" +{ yyval=yyvsp[-2]; P(yyval, yyvsp[0]); O(yyval, OP_BIN_AND) ; break;} case 139: -#line 502 "compile.y" -{ yyval=yyvsp[-2]; P(yyval, yyvsp[0]); O(yyval, OP_NUM_GT) ; +#line 551 "compile.y" +{ yyval=yyvsp[-2]; P(yyval, yyvsp[0]); O(yyval, OP_BIN_OR) ; break;} case 140: -#line 503 "compile.y" -{ yyval=yyvsp[-2]; P(yyval, yyvsp[0]); O(yyval, OP_NUM_LE) ; +#line 552 "compile.y" +{ yyval=yyvsp[-2]; P(yyval, yyvsp[0]); O(yyval, OP_BIN_XOR) ; break;} case 141: -#line 504 "compile.y" -{ yyval=yyvsp[-2]; P(yyval, yyvsp[0]); O(yyval, OP_NUM_GE) ; +#line 553 "compile.y" +{ yyval=yyvsp[-2]; OA(yyval, OP_NESTED_CODE, yyvsp[0]); O(yyval, OP_LOG_AND) ; break;} case 142: -#line 505 "compile.y" -{ yyval=yyvsp[-2]; P(yyval, yyvsp[0]); O(yyval, OP_NUM_EQ) ; +#line 554 "compile.y" +{ yyval=yyvsp[-2]; OA(yyval, OP_NESTED_CODE, yyvsp[0]); O(yyval, OP_LOG_OR) ; break;} case 143: -#line 506 "compile.y" -{ yyval=yyvsp[-2]; P(yyval, yyvsp[0]); O(yyval, OP_NUM_NE) ; +#line 555 "compile.y" +{ yyval=yyvsp[-2]; P(yyval, yyvsp[0]); O(yyval, OP_LOG_XOR) ; break;} case 144: -#line 507 "compile.y" -{ yyval=yyvsp[-2]; P(yyval, yyvsp[0]); O(yyval, OP_STR_LT) ; +#line 556 "compile.y" +{ yyval=yyvsp[-2]; P(yyval, yyvsp[0]); O(yyval, OP_NUM_LT) ; break;} case 145: -#line 508 "compile.y" -{ yyval=yyvsp[-2]; P(yyval, yyvsp[0]); O(yyval, OP_STR_GT) ; +#line 557 "compile.y" +{ yyval=yyvsp[-2]; P(yyval, yyvsp[0]); O(yyval, OP_NUM_GT) ; break;} case 146: -#line 509 "compile.y" -{ yyval=yyvsp[-2]; P(yyval, yyvsp[0]); O(yyval, OP_STR_LE) ; +#line 558 "compile.y" +{ yyval=yyvsp[-2]; P(yyval, yyvsp[0]); O(yyval, OP_NUM_LE) ; break;} case 147: -#line 510 "compile.y" -{ yyval=yyvsp[-2]; P(yyval, yyvsp[0]); O(yyval, OP_STR_GE) ; +#line 559 "compile.y" +{ yyval=yyvsp[-2]; P(yyval, yyvsp[0]); O(yyval, OP_NUM_GE) ; break;} case 148: -#line 511 "compile.y" -{ yyval=yyvsp[-2]; P(yyval, yyvsp[0]); O(yyval, OP_STR_EQ) ; +#line 560 "compile.y" +{ yyval=yyvsp[-2]; P(yyval, yyvsp[0]); O(yyval, OP_NUM_EQ) ; break;} case 149: -#line 512 "compile.y" -{ yyval=yyvsp[-2]; P(yyval, yyvsp[0]); O(yyval, OP_STR_NE) ; +#line 561 "compile.y" +{ yyval=yyvsp[-2]; P(yyval, yyvsp[0]); O(yyval, OP_NUM_NE) ; break;} case 150: -#line 513 "compile.y" -{ yyval=yyvsp[-2]; P(yyval, yyvsp[0]); O(yyval, OP_IS) ; +#line 562 "compile.y" +{ yyval=yyvsp[-2]; P(yyval, yyvsp[0]); O(yyval, OP_STR_LT) ; break;} case 151: -#line 516 "compile.y" +#line 563 "compile.y" +{ yyval=yyvsp[-2]; P(yyval, yyvsp[0]); O(yyval, OP_STR_GT) ; + break;} +case 152: +#line 564 "compile.y" +{ yyval=yyvsp[-2]; P(yyval, yyvsp[0]); O(yyval, OP_STR_LE) ; + break;} +case 153: +#line 565 "compile.y" +{ yyval=yyvsp[-2]; P(yyval, yyvsp[0]); O(yyval, OP_STR_GE) ; + break;} +case 154: +#line 566 "compile.y" +{ yyval=yyvsp[-2]; P(yyval, yyvsp[0]); O(yyval, OP_STR_EQ) ; + break;} +case 155: +#line 567 "compile.y" +{ yyval=yyvsp[-2]; P(yyval, yyvsp[0]); O(yyval, OP_STR_NE) ; + break;} +case 156: +#line 568 "compile.y" +{ yyval=yyvsp[-2]; P(yyval, yyvsp[0]); O(yyval, OP_IS) ; + break;} +case 157: +#line 571 "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() */ + 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 152: -#line 525 "compile.y" +case 158: +#line 580 "compile.y" { // optimized from OP_STRING+OP_WRITE_VALUE to OP_STRING__WRITE change_string_literal_to_write_string_literal(yyval=yyvsp[0]) ; break;} -case 153: -#line 530 "compile.y" +case 159: +#line 585 "compile.y" { yyval=VL(NEW VVoid(POOL)) ; break;} -case 154: -#line 531 "compile.y" +case 160: +#line 586 "compile.y" { yyval=N(POOL) ; 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 +1887,7 @@ yyerrhandle: } return 1; } -#line 533 "compile.y" +#line 588 "compile.y" #endif @@ -1809,7 +1908,7 @@ yyerrhandle: */ static int yylex(YYSTYPE *lvalp, void *pc) { - #define lexical_brackets_nestage PC.brackets_nestages[PC.sp] + #define lexical_brackets_nestage PC.brackets_nestages[PC.ls_sp] #define RC {result=c; goto break2; } register int c; @@ -1827,6 +1926,7 @@ static int yylex(YYSTYPE *lvalp, void *p int skip_analized=0; while(true) { 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++; @@ -1834,22 +1934,54 @@ static int yylex(YYSTYPE *lvalp, void *p } else PC.col++; - if(c=='^' && PC.ls!=LS_COMMENT && PC.ls!=LS_DEF_COMMENT) + if(c=='@' && PC.col==0+1) { + if(PC.ls==LS_DEF_SPECIAL_BODY) { + // @SPECIAL + // ... + // @APPEND_CLEAN(begin, end-begin, PC.file, begin_line); } // reset piece 'begin' position & line - begin=PC.source; // ^ + begin=PC.source; // ->punctuation begin_line=PC.line; - // skip over ^ and _ + // skip over _ after ^ PC.source++; PC.col++; // skip analysis = forced literal continue; @@ -1876,12 +2008,16 @@ static int yylex(YYSTYPE *lvalp, void *p PC.source+=3; PC.col+=3; // reset piece 'begin' position & line - begin=PC.source; // ^ + begin=PC.source; // ->after ^#HH begin_line=PC.line; + // skip analysis = forced literal continue; } break; } + break; + } + } // #comment start skipping if(c=='#' && PC.col==1) { if(end!=begin) { @@ -1889,12 +2025,14 @@ static int yylex(YYSTYPE *lvalp, void *p PC.string->APPEND_CLEAN(begin, end-begin, PC.file, begin_line); } // fall into COMMENT lexical state [wait for \n] - push_LS(PC, LS_COMMENT); + push_LS(PC, LS_USER_COMMENT); + continue; } switch(PC.ls) { // USER'S = NOT OURS case LS_USER: + case LS_NAME_SQUARE_PART: // name.[here].xxx if(PC.trim_bof) switch(c) { case '\n': case ' ': case '\t': @@ -1906,22 +2044,27 @@ static int yylex(YYSTYPE *lvalp, void *p } 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); 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; @@ -1946,7 +2089,7 @@ static int yylex(YYSTYPE *lvalp, void *p } 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); @@ -1968,6 +2111,9 @@ static int yylex(YYSTYPE *lvalp, void *p case LS_DEF_PARAMS: switch(c) { + case '$': // common error + result=BAD_METHOD_PARAMETER_NAME_CHARACTER; + goto break2; case ';': RC; case ']': @@ -2001,19 +2147,8 @@ static int yylex(YYSTYPE *lvalp, void *p 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) @@ -2027,8 +2162,17 @@ static int yylex(YYSTYPE *lvalp, void *p else // PC.ls==LS_VAR_ROUND // variable constructor ended pop_LS(PC); // return to normal life RC; + case '#': // comment start skipping + if(end!=begin) { + // append piece till # + PC.string->APPEND_CLEAN(begin, end-begin, PC.file, begin_line); + } + // 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); @@ -2046,34 +2190,68 @@ 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 '#': + case '&': case '|': if(*PC.source==c) { // && || - result=c=='#'?LXOR:c=='&'?LAND:LOR; + 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); RC; @@ -2136,22 +2314,48 @@ static int yylex(YYSTYPE *lvalp, void *p 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_line=PC.line; + + 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 '-': + // expression integer division + case '\\': pop_LS(PC); PC.source--; if(--PC.col<0) { PC.line--; PC.col=-1; } 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 ':': @@ -2172,7 +2376,7 @@ static int yylex(YYSTYPE *lvalp, void *p case '&': case '|': case '=': case '!': // common delimiters - case ',': case '?': + case ',': case '?': case '#': // before call case '^': pop_LS(PC); @@ -2180,6 +2384,16 @@ static int yylex(YYSTYPE *lvalp, void *p result=EON; goto break2; case '[': + // $name.<[>code] + if(PC.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; @@ -2198,14 +2412,24 @@ static int yylex(YYSTYPE *lvalp, void *p 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); RC; @@ -2219,7 +2443,7 @@ 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); @@ -2241,7 +2465,7 @@ 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); @@ -2262,6 +2486,16 @@ static int yylex(YYSTYPE *lvalp, void *p case LS_METHOD_NAME: switch(c) { case '[': + // ^name.<[>code].xxx + if(PC.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; @@ -2276,6 +2510,8 @@ static int yylex(YYSTYPE *lvalp, void *p 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 RC; } break; @@ -2283,7 +2519,7 @@ 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); @@ -2305,7 +2541,7 @@ 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); @@ -2359,7 +2595,7 @@ 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? // append it PC.string->APPEND_CLEAN(begin, end-begin, PC.file, begin_line/*, start_col*/); }