--- parser3/src/main/compile.tab.C 2002/01/31 17:12:27 1.35 +++ parser3/src/main/compile.tab.C 2002/09/13 13:41:48 1.65 @@ -10,25 +10,28 @@ #define BAD_STRING_COMPARISON_OPERATOR 260 #define BAD_HEX_LITERAL 261 #define BAD_METHOD_DECL_START 262 -#define LAND 263 -#define LOR 264 -#define LXOR 265 -#define NLE 266 -#define NGE 267 -#define NEQ 268 -#define NNE 269 -#define SLT 270 -#define SGT 271 -#define SLE 272 -#define SGE 273 -#define SEQ 274 -#define SNE 275 -#define DEF 276 -#define IN 277 -#define FEXISTS 278 -#define DEXISTS 279 -#define IS 280 -#define NEG 281 +#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 SLT 273 +#define SGT 274 +#define SLE 275 +#define SGE 276 +#define SEQ 277 +#define SNE 278 +#define DEF 279 +#define IN 280 +#define FEXISTS 281 +#define DEXISTS 282 +#define IS 283 +#define NEG 284 #line 1 "compile.y" @@ -38,7 +41,7 @@ Copyright (c) 2001 ArtLebedev Group (http://www.artlebedev.com) Author: Alexander Petrosyan (http://design.ru/paf) - $Id: compile.tab.C,v 1.35 2002/01/31 17:12:27 paf Exp $ + $Id: compile.tab.C,v 1.65 2002/09/13 13:41:48 paf Exp $ */ /** @@ -97,24 +100,24 @@ static int yylex(YYSTYPE *lvalp, void *p #define YYFINAL 248 #define YYFLAG -32768 -#define YYNTBASE 56 +#define YYNTBASE 58 -#define YYTRANSLATE(x) ((unsigned)(x) <= 281 ? yytranslate[x] : 135) +#define YYTRANSLATE(x) ((unsigned)(x) <= 284 ? yytranslate[x] : 137) static const char yytranslate[] = { 0, - 2, 2, 2, 2, 2, 2, 2, 2, 2, 42, + 2, 2, 2, 2, 2, 2, 2, 2, 2, 44, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, - 2, 2, 29, 54, 30, 46, 38, 32, 55, 50, - 51, 36, 35, 2, 34, 49, 37, 2, 2, 2, - 2, 2, 2, 2, 2, 2, 2, 53, 45, 27, - 2, 28, 2, 41, 2, 2, 2, 2, 2, 2, + 2, 2, 32, 56, 2, 48, 40, 34, 57, 52, + 53, 38, 37, 2, 36, 51, 39, 2, 2, 2, + 2, 2, 2, 2, 2, 2, 2, 55, 47, 30, + 2, 31, 2, 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, - 43, 39, 44, 52, 2, 2, 2, 2, 2, 2, + 45, 41, 46, 54, 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, 47, 31, 48, 33, 2, 2, 2, 2, + 2, 2, 49, 33, 50, 35, 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, @@ -130,7 +133,7 @@ static const char yytranslate[] = { 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, 26, - 40 + 27, 28, 29, 42 }; #if YYDEBUG != 0 @@ -153,73 +156,73 @@ static const short yyprhs[] = { 0, 418, 422, 426, 430, 434, 436, 438, 439 }; -static const short yyrhs[] = { 58, - 0, 57, 0, 59, 0, 57, 59, 0, 71, 0, - 60, 0, 65, 0, 41, 4, 42, 61, 0, 134, - 0, 62, 0, 63, 0, 62, 63, 0, 64, 42, - 0, 134, 0, 4, 0, 41, 4, 67, 66, 70, - 42, 71, 0, 134, 0, 67, 0, 43, 68, 44, - 0, 134, 0, 69, 0, 4, 0, 69, 45, 4, - 0, 134, 0, 4, 0, 134, 0, 72, 0, 73, - 0, 72, 73, 0, 132, 0, 74, 0, 75, 0, - 83, 0, 96, 0, 76, 0, 46, 77, 0, 79, - 3, 0, 78, 0, 47, 79, 48, 0, 80, 0, - 81, 0, 82, 0, 126, 82, 0, 118, 0, 115, - 118, 0, 46, 84, 88, 0, 85, 0, 86, 0, - 87, 0, 114, 0, 49, 114, 0, 126, 114, 0, - 89, 0, 90, 0, 91, 0, 43, 92, 44, 0, - 50, 129, 51, 0, 47, 71, 48, 0, 133, 0, - 4, 0, 93, 0, 94, 0, 95, 0, 74, 0, - 73, 72, 0, 97, 0, 0, 0, 52, 98, 100, - 99, 101, 3, 0, 79, 0, 102, 0, 101, 102, - 0, 103, 0, 104, 0, 105, 0, 43, 106, 44, - 0, 50, 107, 51, 0, 47, 108, 48, 0, 109, - 0, 106, 45, 109, 0, 110, 0, 107, 45, 110, - 0, 111, 0, 108, 45, 111, 0, 112, 0, 113, - 0, 71, 0, 133, 0, 4, 0, 93, 0, 129, - 0, 119, 0, 115, 119, 0, 116, 0, 115, 116, - 0, 117, 49, 0, 119, 0, 119, 0, 4, 5, - 0, 4, 0, 120, 0, 121, 0, 122, 0, 46, - 123, 0, 4, 124, 0, 43, 72, 44, 0, 4, - 0, 125, 0, 124, 125, 0, 46, 123, 0, 127, - 0, 128, 0, 4, 53, 0, 127, 53, 0, 130, - 0, 4, 0, 76, 0, 97, 0, 54, 131, 54, - 0, 55, 131, 55, 0, 50, 130, 51, 0, 34, - 130, 0, 35, 130, 0, 33, 130, 0, 29, 130, - 0, 22, 130, 0, 23, 130, 0, 24, 130, 0, - 25, 130, 0, 130, 34, 130, 0, 130, 35, 130, - 0, 130, 36, 130, 0, 130, 37, 130, 0, 130, - 38, 130, 0, 130, 39, 130, 0, 130, 32, 130, - 0, 130, 31, 130, 0, 130, 30, 130, 0, 130, - 9, 130, 0, 130, 10, 130, 0, 130, 11, 130, - 0, 130, 27, 130, 0, 130, 28, 130, 0, 130, - 12, 130, 0, 130, 13, 130, 0, 130, 14, 130, - 0, 130, 15, 130, 0, 130, 16, 130, 0, 130, - 17, 130, 0, 130, 18, 130, 0, 130, 19, 130, - 0, 130, 20, 130, 0, 130, 21, 130, 0, 130, - 26, 130, 0, 71, 0, 4, 0, 0, 0 +static const short yyrhs[] = { 60, + 0, 59, 0, 61, 0, 59, 61, 0, 73, 0, + 62, 0, 67, 0, 43, 4, 44, 63, 0, 136, + 0, 64, 0, 65, 0, 64, 65, 0, 66, 44, + 0, 136, 0, 4, 0, 43, 4, 69, 68, 72, + 44, 73, 0, 136, 0, 69, 0, 45, 70, 46, + 0, 136, 0, 71, 0, 4, 0, 71, 47, 4, + 0, 136, 0, 4, 0, 136, 0, 74, 0, 75, + 0, 74, 75, 0, 134, 0, 76, 0, 77, 0, + 85, 0, 98, 0, 78, 0, 48, 79, 0, 81, + 3, 0, 80, 0, 49, 81, 50, 0, 82, 0, + 83, 0, 84, 0, 128, 84, 0, 120, 0, 117, + 120, 0, 48, 86, 90, 0, 87, 0, 88, 0, + 89, 0, 116, 0, 51, 116, 0, 128, 116, 0, + 91, 0, 92, 0, 93, 0, 45, 94, 46, 0, + 52, 131, 53, 0, 49, 73, 50, 0, 135, 0, + 4, 0, 95, 0, 96, 0, 97, 0, 76, 0, + 75, 74, 0, 99, 0, 0, 0, 54, 100, 102, + 101, 103, 3, 0, 81, 0, 104, 0, 103, 104, + 0, 105, 0, 106, 0, 107, 0, 45, 108, 46, + 0, 52, 109, 53, 0, 49, 110, 50, 0, 111, + 0, 108, 47, 111, 0, 112, 0, 109, 47, 112, + 0, 113, 0, 110, 47, 113, 0, 114, 0, 115, + 0, 73, 0, 135, 0, 4, 0, 95, 0, 131, + 0, 121, 0, 117, 121, 0, 118, 0, 117, 118, + 0, 119, 51, 0, 121, 0, 121, 0, 4, 5, + 0, 4, 0, 122, 0, 123, 0, 124, 0, 48, + 125, 0, 4, 126, 0, 45, 74, 46, 0, 4, + 0, 127, 0, 126, 127, 0, 48, 125, 0, 129, + 0, 130, 0, 4, 55, 0, 129, 55, 0, 132, + 0, 4, 0, 78, 0, 99, 0, 56, 133, 56, + 0, 57, 133, 57, 0, 52, 132, 53, 0, 36, + 132, 0, 37, 132, 0, 35, 132, 0, 32, 132, + 0, 25, 132, 0, 26, 132, 0, 27, 132, 0, + 28, 132, 0, 132, 36, 132, 0, 132, 37, 132, + 0, 132, 38, 132, 0, 132, 39, 132, 0, 132, + 40, 132, 0, 132, 41, 132, 0, 132, 34, 132, + 0, 132, 33, 132, 0, 132, 14, 132, 0, 132, + 11, 132, 0, 132, 12, 132, 0, 132, 13, 132, + 0, 132, 30, 132, 0, 132, 31, 132, 0, 132, + 15, 132, 0, 132, 16, 132, 0, 132, 17, 132, + 0, 132, 18, 132, 0, 132, 19, 132, 0, 132, + 20, 132, 0, 132, 21, 132, 0, 132, 22, 132, + 0, 132, 23, 132, 0, 132, 24, 132, 0, 132, + 29, 132, 0, 73, 0, 4, 0, 0, 0 }; #endif #if YYDEBUG != 0 static const short yyrline[] = { 0, - 107, 117, 119, 119, 120, 122, 122, 124, 190, 190, - 191, 191, 192, 193, 193, 195, 224, 224, 225, 226, - 226, 227, 227, 229, 229, 233, 233, 235, 235, 236, - 236, 237, 237, 237, 241, 245, 246, 246, 247, 248, - 250, 251, 266, 267, 267, 271, 275, 277, 278, 279, - 294, 299, 301, 303, 304, 306, 312, 318, 324, 326, - 327, 329, 335, 336, 336, 340, 344, 348, 352, 366, - 368, 368, 369, 371, 372, 374, 375, 376, 377, 379, - 381, 383, 385, 387, 389, 393, 397, 401, 403, 404, - 406, 413, 413, 415, 415, 416, 417, 425, 432, 434, - 436, 437, 438, 440, 444, 452, 458, 463, 463, 464, - 469, 471, 473, 480, 492, 496, 498, 499, 500, 501, - 502, 504, 505, 506, 507, 508, 509, 510, 511, 513, - 514, 515, 516, 517, 518, 519, 520, 521, 522, 523, - 524, 525, 526, 527, 528, 529, 530, 531, 532, 533, - 534, 535, 536, 537, 540, 549, 554, 555 + 110, 120, 122, 122, 123, 125, 125, 127, 194, 194, + 195, 195, 196, 197, 197, 199, 228, 228, 229, 230, + 230, 231, 231, 233, 233, 237, 237, 239, 239, 240, + 240, 241, 241, 241, 245, 252, 253, 253, 254, 255, + 257, 258, 280, 281, 281, 285, 289, 291, 292, 293, + 310, 315, 317, 319, 320, 322, 328, 336, 342, 344, + 345, 347, 353, 354, 354, 358, 364, 367, 370, 383, + 385, 385, 386, 388, 389, 391, 392, 393, 394, 396, + 398, 400, 402, 404, 406, 410, 414, 418, 420, 421, + 423, 432, 432, 434, 434, 435, 436, 444, 449, 451, + 453, 454, 455, 457, 461, 470, 476, 481, 481, 482, + 487, 489, 491, 503, 515, 520, 522, 523, 524, 525, + 526, 528, 529, 530, 531, 532, 533, 534, 535, 537, + 538, 539, 540, 541, 542, 543, 544, 545, 546, 547, + 548, 549, 550, 551, 552, 553, 554, 555, 556, 557, + 558, 559, 560, 561, 564, 573, 578, 579 }; #endif @@ -228,24 +231,25 @@ static const short yyrline[] = { 0, static const char * const yytname[] = { "$","error","$undefined.","EON","STRING", "BOGUS","BAD_STRING_COMPARISON_OPERATOR","BAD_HEX_LITERAL","BAD_METHOD_DECL_START", -"\"&&\"","\"||\"","\"##\"","\"<=\"","\">=\"","\"==\"","\"!=\"","\"lt\"","\"gt\"", +"BAD_METHOD_PARAMETER_NAME_CHARACTER","BAD_MATH_OPERATOR_CHARACTER","\"&&\"", +"\"||\"","\"!||\"","\"!|\"","\"<=\"","\">=\"","\"==\"","\"!=\"","\"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", +"'<'","'>'","'!'","'|'","'&'","'~'","'-'","'+'","'*'","'/'","'%'","'\\\\'","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", "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 @@ -253,22 +257,22 @@ static const char * const yytname[] = { #endif static const short yyr1[] = { 0, - 56, 56, 57, 57, 58, 59, 59, 60, 61, 61, - 62, 62, 63, 64, 64, 65, 66, 66, 67, 68, - 68, 69, 69, 70, 70, 71, 71, 72, 72, 73, - 73, 74, 74, 74, 75, 76, 77, 77, 78, 79, - 79, 80, 81, 82, 82, 83, 84, 84, 84, 85, - 86, 87, 88, 88, 88, 89, 90, 91, 92, 92, - 92, 93, 94, 95, 95, 96, 98, 99, 97, 100, - 101, 101, 102, 102, 102, 103, 104, 105, 106, 106, - 107, 107, 108, 108, 109, 110, 111, 112, 112, 112, - 113, 114, 114, 115, 115, 116, 117, 118, 118, 119, - 119, 119, 119, 120, 121, 122, 123, 124, 124, 125, - 126, 126, 127, 128, 129, 130, 130, 130, 130, 130, - 130, 130, 130, 130, 130, 130, 130, 130, 130, 130, - 130, 130, 130, 130, 130, 130, 130, 130, 130, 130, - 130, 130, 130, 130, 130, 130, 130, 130, 130, 130, - 130, 130, 130, 130, 131, 132, 133, 134 + 58, 58, 59, 59, 60, 61, 61, 62, 63, 63, + 64, 64, 65, 66, 66, 67, 68, 68, 69, 70, + 70, 71, 71, 72, 72, 73, 73, 74, 74, 75, + 75, 76, 76, 76, 77, 78, 79, 79, 80, 81, + 81, 82, 83, 84, 84, 85, 86, 86, 86, 87, + 88, 89, 90, 90, 90, 91, 92, 93, 94, 94, + 94, 95, 96, 97, 97, 98, 100, 101, 99, 102, + 103, 103, 104, 104, 104, 105, 106, 107, 108, 108, + 109, 109, 110, 110, 111, 112, 113, 114, 114, 114, + 115, 116, 116, 117, 117, 118, 119, 120, 120, 121, + 121, 121, 121, 122, 123, 124, 125, 126, 126, 127, + 128, 128, 129, 130, 131, 132, 132, 132, 132, 132, + 132, 132, 132, 132, 132, 132, 132, 132, 132, 132, + 132, 132, 132, 132, 132, 132, 132, 132, 132, 132, + 132, 132, 132, 132, 132, 132, 132, 132, 132, 132, + 132, 132, 132, 132, 133, 134, 135, 136 }; static const short yyr2[] = { 0, @@ -310,9 +314,9 @@ static const short yydefact[] = { 158, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 157, 158, 0, 0, 71, 73, 74, 75, - 23, 158, 121, 119, 120, 139, 140, 141, 144, 145, - 146, 147, 148, 149, 150, 151, 152, 153, 154, 142, - 143, 138, 137, 136, 130, 131, 132, 133, 134, 135, + 23, 158, 121, 119, 120, 139, 140, 141, 138, 144, + 145, 146, 147, 148, 149, 150, 151, 152, 153, 154, + 142, 143, 137, 136, 130, 131, 132, 133, 134, 135, 156, 90, 0, 79, 85, 88, 87, 0, 83, 0, 81, 86, 91, 69, 72, 16, 76, 157, 158, 78, 0, 77, 80, 84, 82, 0, 0, 0 @@ -329,141 +333,143 @@ static const short yydefgoto[] = { 246 47, 48, 233, 132, 155, 19, 226, 20 }; -static const short yypact[] = { 5, --32768, 20, 75,-32768, -34,-32768,-32768,-32768,-32768,-32768, - 18,-32768,-32768,-32768,-32768,-32768,-32768,-32768,-32768,-32768, - -27, 31, 18, 27, 97, 102,-32768,-32768, 39,-32768, --32768,-32768, 91,-32768,-32768,-32768,-32768, 103,-32768, 32, --32768, 42,-32768,-32768,-32768, 103, 34,-32768, 97,-32768, --32768, 89, 96, 52,-32768, 27,-32768, 56,-32768, 17, --32768,-32768, 61, 103, 62, 103, 56,-32768, 102, 62, --32768, 36, 18, 4,-32768,-32768,-32768,-32768, 25,-32768, --32768, 42,-32768,-32768,-32768,-32768,-32768,-32768,-32768,-32768, - 6,-32768, 74, 78,-32768, 87, 94,-32768, 115,-32768, --32768,-32768,-32768,-32768,-32768, 62, 88, 18, 41, 106, --32768,-32768,-32768,-32768, 105,-32768, 4, 4, 4, 4, - 4, 4, 4, 4, 90, 4, 18, 18,-32768,-32768, - 101, 277, 104,-32768,-32768,-32768,-32768, 159,-32768, 123, --32768, 18,-32768,-32768, 191, 191, 191, 191, 191, 198, --32768,-32768, 234,-32768, 112, 113,-32768, 4, 4, 4, - 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, - 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, - 4, 4, 37, 18, 4, 49,-32768,-32768,-32768,-32768, --32768, 18,-32768,-32768,-32768, 367, 339, 308, 393, 393, - 143, 143, 393, 393, 393, 393, 143, 143, 191, 393, - 393, 243, 401, 198, 152, 152,-32768,-32768,-32768,-32768, - 70,-32768, 81,-32768,-32768,-32768,-32768, -28,-32768, 53, --32768,-32768,-32768,-32768,-32768,-32768,-32768, 37, 18,-32768, - 4,-32768,-32768,-32768,-32768, 170, 171,-32768 +static const short yypact[] = { 15, +-32768, 12, 55,-32768, -25,-32768,-32768,-32768,-32768,-32768, + 16,-32768,-32768,-32768,-32768,-32768,-32768,-32768,-32768,-32768, + 54, 1, 16, 17, 93, 98,-32768,-32768, 42,-32768, +-32768,-32768, -6,-32768,-32768,-32768,-32768, 103,-32768, 40, +-32768, 37,-32768,-32768,-32768, 103, 13,-32768, 93,-32768, +-32768, 97, 113, 100,-32768, 17,-32768, 99,-32768, 33, +-32768,-32768, 118, 103, 121, 103, 99,-32768, 98, 121, +-32768, 23, 16, 57,-32768,-32768,-32768,-32768, 19,-32768, +-32768, 37,-32768,-32768,-32768,-32768,-32768,-32768,-32768,-32768, + 22,-32768, 105, 125,-32768, 104, 123,-32768, 169,-32768, +-32768,-32768,-32768,-32768,-32768, 121, 142, 16, 87, 143, +-32768,-32768,-32768,-32768, 140,-32768, 57, 57, 57, 57, + 57, 57, 57, 57, 91, 57, 16, 16,-32768,-32768, + 138, 275, -1,-32768,-32768,-32768,-32768, 189,-32768, 178, +-32768, 16,-32768,-32768, 82, 82, 82, 82, 82, 196, +-32768,-32768, 232,-32768, 173, 200,-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, 32, 16, 57, 5,-32768,-32768,-32768,-32768, +-32768, 16,-32768,-32768,-32768, 365, 337, 306, 141, 393, + 393, 406, 406, 393, 393, 393, 393, 406, 406, 82, + 393, 393, 187, 196, -10, -10,-32768,-32768,-32768,-32768, + 107,-32768, 119,-32768,-32768,-32768,-32768, -33,-32768, 84, +-32768,-32768,-32768,-32768,-32768,-32768,-32768, 32, 16,-32768, + 57,-32768,-32768,-32768,-32768, 230, 258,-32768 }; static const short yypgoto[] = {-32768, --32768,-32768, 167,-32768,-32768,-32768, 133,-32768,-32768,-32768, - 139,-32768,-32768,-32768, 3, -18, -7, -71,-32768, 0, --32768,-32768, -6,-32768,-32768, 51,-32768,-32768,-32768,-32768, --32768,-32768,-32768,-32768,-32768,-32768, 184,-32768,-32768,-32768, - 2,-32768,-32768,-32768,-32768, 71,-32768,-32768,-32768,-32768, --32768,-32768, 21, 22, 19,-32768,-32768, -12, 77, -20, --32768, -32, 9,-32768,-32768,-32768, 211,-32768, 218, 280, --32768,-32768, 210, 38, 172,-32768, 227, 14 +-32768,-32768, 254,-32768,-32768,-32768, 176,-32768,-32768,-32768, + 206,-32768,-32768,-32768, 3, -18, -7, -71,-32768, 0, +-32768,-32768, -15,-32768,-32768, -24,-32768,-32768,-32768,-32768, +-32768,-32768,-32768,-32768,-32768,-32768, 192,-32768,-32768,-32768, + 2,-32768,-32768,-32768,-32768, 88,-32768,-32768,-32768,-32768, +-32768,-32768, 39, 34, 41,-32768,-32768, 106, 6, -31, +-32768, -23, 9,-32768,-32768,-32768, 220,-32768, 221, 278, +-32768,-32768, 204, 38, 154,-32768, 211, 72 }; -#define YYLAST 440 +#define YYLAST 447 static const short yytable[] = { 15, - 109, 18, 10, 51, 60, 81, 2, 116, 1, 89, - 15, 42, 18, 68, 52, 53, 239, 80, 63, 240, - 1, 1, 15, 21, 18, 117, 118, 119, 120, 55, - 61, 81, 121, 85, 70, 55, 122, 123, 124, 107, - 221, 71, 87, 80, -98, 2, 82, -158, 80, 125, - 3, 234, 51, 126, 42, 4, 4, 127, 128, 15, - 104, 18, 3, 3, 108, 94, 98, 101, 4, 4, - 56, 15, 15, 18, 18, 115, 56, 106, 22, 38, - 83, 3, 3, 57, -64, -64, 86, 4, 4, 142, - -97, 183, 89, 22, 53, 184, 84, 241, 185, 95, - 22, 56, 69, 242, 135, 67, 79, 15, 105, 18, - -97, 109, 141, -89, -89, 136, 84, 23, 139, -14, - 24, 25, 38, 26, 237, 238, 15, 15, 18, 18, - 137, -60, 23, 72, 51, 24, 25, 73, 138, 23, - 74, 15, 24, 18, 23, 23, 183, 24, 24, 143, - 184, 157, 144, 185, 145, 146, 147, 148, 149, 150, - 151, 152, 191, 153, 192, 194, 109, 195, 171, 247, - 248, 50, 174, 175, 176, 108, 177, 178, 179, 180, - 181, 182, 15, 15, 18, 18, 227, 179, 180, 181, - 182, 15, 100, 18, 236, 196, 197, 198, 199, 200, + 109, 18, 10, 51, 60, 55, 80, 234, 38, 63, + 15, 42, 18, 239, 81, 21, 240, 2, 1, 1, + 61, 84, 15, 55, 18, 89, 107, 179, 180, 181, + 182, 69, 80, 87, 70, 221, 1, 80, 72, -98, + 81, 84, 73, 183, 71, 74, 82, 184, 56, 183, + 185, 38, 51, 184, 42, 57, 185, 2, 22, 15, + 116, 18, 3, 3, 108, -158, 56, 86, 4, 4, + 3, 15, 15, 18, 18, 115, 4, 106, 104, 3, + 3, 117, 118, 119, 120, 4, 4, -97, 121, 142, + 83, 122, 123, 124, 22, 161, 22, 52, 53, 23, + 89, 67, 24, 25, 125, 26, 79, 15, 126, 18, + 4, 109, 127, 128, 175, 176, 95, 177, 178, 179, + 180, 181, 182, 94, 98, 101, 15, 15, 18, 18, + 241, 68, -64, -64, 51, 23, 242, 23, 24, 25, + 24, 15, 23, 18, 53, 24, 56, 23, 136, 137, + 24, 85, -89, -89, 145, 146, 147, 148, 149, 150, + 151, 152, 135, 153, 237, 238, 109, 105, -14, 138, + 141, -97, 139, 175, 176, 108, 177, 178, 179, 180, + 181, 182, 15, 15, 18, 18, 227, -60, 143, 144, + 157, 15, 191, 18, 236, 196, 197, 198, 199, 200, 201, 202, 203, 204, 205, 206, 207, 208, 209, 210, 211, 212, 213, 214, 215, 216, 217, 218, 219, 220, - 174, 175, 176, 134, 177, 178, 179, 180, 181, 182, + 176, 192, 177, 178, 179, 180, 181, 182, 194, 247, 108, 177, 178, 179, 180, 181, 182, 15, 15, 18, 18, 227, 158, 159, 160, 161, 162, 163, 164, 165, - 166, 167, 168, 169, 170, 111, 235, 244, 243, 171, - 172, 173, 245, 174, 175, 176, 102, 177, 178, 179, - 180, 181, 182, 175, 176, 103, 177, 178, 179, 180, - 181, 182, 46, 131, 193, 158, 159, 160, 161, 162, - 163, 164, 165, 166, 167, 168, 169, 170, 114, 156, - 0, 0, 171, 172, 173, 0, 174, 175, 176, 0, + 166, 167, 168, 169, 170, 171, 195, 248, 50, 100, + 172, 173, 174, 111, 175, 176, 134, 177, 178, 179, + 180, 181, 182, 235, 245, 102, 243, 131, 103, 244, + 46, 156, 114, 0, 193, 158, 159, 160, 161, 162, + 163, 164, 165, 166, 167, 168, 169, 170, 171, 0, + 0, 0, 0, 172, 173, 174, 0, 175, 176, 0, 177, 178, 179, 180, 181, 182, 158, 159, 0, 161, - 162, 163, 164, 165, 166, 167, 168, 169, 170, 0, - 0, 0, 0, 171, 172, 173, 0, 174, 175, 176, + 162, 163, 164, 165, 166, 167, 168, 169, 170, 171, + 0, 0, 0, 0, 172, 173, 174, 0, 175, 176, 0, 177, 178, 179, 180, 181, 182, 158, 0, 0, 161, 162, 163, 164, 165, 166, 167, 168, 169, 170, - 0, 0, 0, 0, 171, 172, 173, 0, 174, 175, + 171, 0, 0, 0, 0, 172, 173, 174, 0, 175, 176, 0, 177, 178, 179, 180, 181, 182, 161, 162, - 163, 164, 165, 166, 167, 168, 169, 170, 0, 0, - 0, 0, 171, 172, 173, 0, 174, 175, 176, 0, - 177, 178, 179, 180, 181, 182, 163, 164, 0, 0, - 0, 0, 169, 170, 0, 0, 0, 0, 171, 0, - 0, 0, 174, 175, 176, 0, 177, 178, 179, 180, - 181, 182, 176, 0, 177, 178, 179, 180, 181, 182 + 163, 164, 165, 166, 167, 168, 169, 170, 171, 0, + 0, 0, 0, 172, 173, 174, 0, 175, 176, 0, + 177, 178, 179, 180, 181, 182, 161, 0, 0, 164, + 165, 0, 0, 0, 0, 170, 171, 0, 0, 161, + 0, 172, 0, 0, 0, 175, 176, 0, 177, 178, + 179, 180, 181, 182, 172, 0, 0, 0, 175, 176, + 0, 177, 178, 179, 180, 181, 182 }; static const short yycheck[] = { 0, - 72, 0, 0, 11, 23, 38, 41, 4, 4, 4, - 11, 3, 11, 26, 42, 43, 45, 38, 25, 48, - 4, 4, 23, 4, 23, 22, 23, 24, 25, 5, - 4, 64, 29, 46, 26, 5, 33, 34, 35, 4, - 4, 3, 49, 64, 3, 41, 38, 42, 69, 46, - 46, 3, 60, 50, 46, 52, 52, 54, 55, 60, - 44, 60, 46, 46, 72, 52, 53, 54, 52, 52, - 46, 72, 73, 72, 73, 73, 46, 69, 4, 3, - 49, 46, 46, 53, 44, 45, 53, 52, 52, 108, - 49, 43, 4, 4, 43, 47, 46, 45, 50, 4, - 4, 46, 26, 51, 91, 4, 4, 108, 48, 108, - 49, 183, 99, 44, 45, 42, 66, 43, 4, 42, - 46, 47, 46, 49, 44, 45, 127, 128, 127, 128, - 44, 44, 43, 43, 142, 46, 47, 47, 45, 43, - 50, 142, 46, 142, 43, 43, 43, 46, 46, 44, - 47, 51, 48, 50, 117, 118, 119, 120, 121, 122, - 123, 124, 4, 126, 42, 54, 238, 55, 26, 0, - 0, 5, 30, 31, 32, 183, 34, 35, 36, 37, - 38, 39, 183, 184, 183, 184, 184, 36, 37, 38, - 39, 192, 54, 192, 192, 158, 159, 160, 161, 162, + 72, 0, 0, 11, 23, 5, 38, 3, 3, 25, + 11, 3, 11, 47, 38, 4, 50, 43, 4, 4, + 4, 46, 23, 5, 23, 4, 4, 38, 39, 40, + 41, 26, 64, 49, 26, 4, 4, 69, 45, 3, + 64, 66, 49, 45, 3, 52, 38, 49, 48, 45, + 52, 46, 60, 49, 46, 55, 52, 43, 4, 60, + 4, 60, 48, 48, 72, 44, 48, 55, 54, 54, + 48, 72, 73, 72, 73, 73, 54, 69, 46, 48, + 48, 25, 26, 27, 28, 54, 54, 51, 32, 108, + 51, 35, 36, 37, 4, 14, 4, 44, 45, 45, + 4, 4, 48, 49, 48, 51, 4, 108, 52, 108, + 54, 183, 56, 57, 33, 34, 4, 36, 37, 38, + 39, 40, 41, 52, 53, 54, 127, 128, 127, 128, + 47, 26, 46, 47, 142, 45, 53, 45, 48, 49, + 48, 142, 45, 142, 45, 48, 48, 45, 44, 46, + 48, 46, 46, 47, 117, 118, 119, 120, 121, 122, + 123, 124, 91, 126, 46, 47, 238, 50, 44, 47, + 99, 51, 4, 33, 34, 183, 36, 37, 38, 39, + 40, 41, 183, 184, 183, 184, 184, 46, 46, 50, + 53, 192, 4, 192, 192, 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, - 30, 31, 32, 91, 34, 35, 36, 37, 38, 39, - 238, 34, 35, 36, 37, 38, 39, 238, 239, 238, - 239, 239, 9, 10, 11, 12, 13, 14, 15, 16, - 17, 18, 19, 20, 21, 72, 186, 239, 238, 26, - 27, 28, 241, 30, 31, 32, 56, 34, 35, 36, - 37, 38, 39, 31, 32, 58, 34, 35, 36, 37, - 38, 39, 3, 74, 51, 9, 10, 11, 12, 13, - 14, 15, 16, 17, 18, 19, 20, 21, 72, 128, - -1, -1, 26, 27, 28, -1, 30, 31, 32, -1, - 34, 35, 36, 37, 38, 39, 9, 10, -1, 12, - 13, 14, 15, 16, 17, 18, 19, 20, 21, -1, - -1, -1, -1, 26, 27, 28, -1, 30, 31, 32, - -1, 34, 35, 36, 37, 38, 39, 9, -1, -1, - 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, - -1, -1, -1, -1, 26, 27, 28, -1, 30, 31, - 32, -1, 34, 35, 36, 37, 38, 39, 12, 13, - 14, 15, 16, 17, 18, 19, 20, 21, -1, -1, - -1, -1, 26, 27, 28, -1, 30, 31, 32, -1, - 34, 35, 36, 37, 38, 39, 14, 15, -1, -1, - -1, -1, 20, 21, -1, -1, -1, -1, 26, -1, - -1, -1, 30, 31, 32, -1, 34, 35, 36, 37, - 38, 39, 32, -1, 34, 35, 36, 37, 38, 39 + 34, 44, 36, 37, 38, 39, 40, 41, 56, 0, + 238, 36, 37, 38, 39, 40, 41, 238, 239, 238, + 239, 239, 11, 12, 13, 14, 15, 16, 17, 18, + 19, 20, 21, 22, 23, 24, 57, 0, 5, 54, + 29, 30, 31, 72, 33, 34, 91, 36, 37, 38, + 39, 40, 41, 186, 241, 56, 238, 74, 58, 239, + 3, 128, 72, -1, 53, 11, 12, 13, 14, 15, + 16, 17, 18, 19, 20, 21, 22, 23, 24, -1, + -1, -1, -1, 29, 30, 31, -1, 33, 34, -1, + 36, 37, 38, 39, 40, 41, 11, 12, -1, 14, + 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, + -1, -1, -1, -1, 29, 30, 31, -1, 33, 34, + -1, 36, 37, 38, 39, 40, 41, 11, -1, -1, + 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, + 24, -1, -1, -1, -1, 29, 30, 31, -1, 33, + 34, -1, 36, 37, 38, 39, 40, 41, 14, 15, + 16, 17, 18, 19, 20, 21, 22, 23, 24, -1, + -1, -1, -1, 29, 30, 31, -1, 33, 34, -1, + 36, 37, 38, 39, 40, 41, 14, -1, -1, 17, + 18, -1, -1, -1, -1, 23, 24, -1, -1, 14, + -1, 29, -1, -1, -1, 33, 34, -1, 36, 37, + 38, 39, 40, 41, 29, -1, -1, -1, 33, 34, + -1, 36, 37, 38, 39, 40, 41 }; #define YYPURE 1 @@ -1011,19 +1017,19 @@ yyreduce: switch (yyn) { case 1: -#line 108 "compile.y" +#line 111 "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 125 "compile.y" +#line 128 "compile.y" { const String& command=*LA2S(yyvsp[-2]); YYSTYPE strings_code=yyvsp[0]; @@ -1034,7 +1040,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, "'"); @@ -1056,27 +1062,28 @@ case 8: for(int i=0; isize(); i+=2) PC.request->use_file(*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; @@ -1091,11 +1098,11 @@ case 8: ; break;} case 12: -#line 191 "compile.y" +#line 195 "compile.y" { yyval=yyvsp[-1]; P(yyval, yyvsp[0]) ; break;} case 16: -#line 196 "compile.y" +#line 200 "compile.y" { const String *name=LA2S(yyvsp[-5]); @@ -1125,76 +1132,88 @@ case 16: ; break;} case 19: -#line 225 "compile.y" +#line 229 "compile.y" {yyval=yyvsp[-1]; break;} case 23: -#line 227 "compile.y" +#line 231 "compile.y" { yyval=yyvsp[-2]; P(yyval, yyvsp[0]) ; break;} case 29: -#line 235 "compile.y" +#line 239 "compile.y" { yyval=yyvsp[-1]; P(yyval, yyvsp[0]) ; break;} case 35: -#line 241 "compile.y" +#line 245 "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 245 "compile.y" +#line 252 "compile.y" { yyval=yyvsp[0] ; break;} case 39: -#line 247 "compile.y" +#line 254 "compile.y" { yyval=yyvsp[-1] ; break;} case 42: -#line 251 "compile.y" +#line 258 "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 266 "compile.y" +#line 280 "compile.y" { yyval=yyvsp[-1]; P(yyval, yyvsp[0]) ; break;} case 45: -#line 267 "compile.y" +#line 281 "compile.y" { yyval=yyvsp[-1]; P(yyval, yyvsp[0]) ; break;} case 46: -#line 271 "compile.y" +#line 285 "compile.y" { yyval=yyvsp[-1]; /* stack: context,name */ P(yyval, yyvsp[0]); /* stack: context,name,constructor_value */ ; break;} case 50: -#line 279 "compile.y" +#line 293 "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); @@ -1203,7 +1222,7 @@ case 50: ; break;} case 51: -#line 294 "compile.y" +#line 310 "compile.y" { yyval=N(POOL); O(yyval, OP_WITH_WRITE); /* stack: starting context */ @@ -1211,11 +1230,11 @@ case 51: ; break;} case 52: -#line 299 "compile.y" +#line 315 "compile.y" { yyval=yyvsp[-1]; P(yyval, yyvsp[0]) ; break;} case 56: -#line 306 "compile.y" +#line 322 "compile.y" { // stack: context, name yyval=yyvsp[-1]; // stack: context, name, value @@ -1223,137 +1242,140 @@ case 56: ; break;} case 57: -#line 312 "compile.y" +#line 328 "compile.y" { + yyval=N(POOL); + O(yyval, OP_PREPARE_TO_EXPRESSION); // stack: context, name - yyval=yyvsp[-1]; // stack: 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 318 "compile.y" +#line 336 "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 329 "compile.y" +#line 347 "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 336 "compile.y" +#line 354 "compile.y" { yyval=yyvsp[-1]; P(yyval, yyvsp[0]) ; break;} case 66: -#line 340 "compile.y" +#line 358 "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 344 "compile.y" +#line 364 "compile.y" { - PC.object_constructor_allowed=true; - push_OCA(PC, true); + PC.in_call_value=true; ; break;} case 68: -#line 348 "compile.y" +#line 367 "compile.y" { - PC.object_constructor_allowed=false; - pop_OCA(PC); + PC.in_call_value=false; ; break;} case 69: -#line 352 "compile.y" +#line 370 "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 368 "compile.y" +#line 385 "compile.y" { yyval=yyvsp[-1]; P(yyval, yyvsp[0]) ; break;} case 76: -#line 374 "compile.y" +#line 391 "compile.y" {yyval=yyvsp[-1]; break;} case 77: -#line 375 "compile.y" +#line 392 "compile.y" {yyval=yyvsp[-1]; break;} case 78: -#line 376 "compile.y" +#line 393 "compile.y" {yyval=yyvsp[-1]; break;} case 80: -#line 379 "compile.y" +#line 396 "compile.y" { yyval=yyvsp[-2]; P(yyval, yyvsp[0]) ; break;} case 82: -#line 383 "compile.y" +#line 400 "compile.y" { yyval=yyvsp[-2]; P(yyval, yyvsp[0]) ; break;} case 84: -#line 387 "compile.y" +#line 404 "compile.y" { yyval=yyvsp[-2]; P(yyval, yyvsp[0]) ; break;} case 85: -#line 389 "compile.y" +#line 406 "compile.y" { yyval=yyvsp[0]; O(yyval, OP_STORE_PARAM); ; break;} case 86: -#line 393 "compile.y" +#line 410 "compile.y" { yyval=N(POOL); - PEA(yyval, yyvsp[0]); + OA(yyval, OP_EXPR_CODE__STORE_PARAM, yyvsp[0]); ; break;} case 87: -#line 397 "compile.y" +#line 414 "compile.y" { yyval=N(POOL); - PCA(yyval, yyvsp[0]); + OA(yyval, OP_CURLY_CODE__STORE_PARAM, yyvsp[0]); ; break;} case 91: -#line 406 "compile.y" +#line 423 "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 413 "compile.y" +#line 432 "compile.y" { yyval=yyvsp[-1]; P(yyval, yyvsp[0]) ; break;} case 95: -#line 415 "compile.y" +#line 434 "compile.y" { yyval=yyvsp[-1]; P(yyval, yyvsp[0]) ; break;} case 97: -#line 417 "compile.y" +#line 436 "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 @@ -1364,44 +1386,43 @@ case 97: ; break;} case 98: -#line 425 "compile.y" +#line 444 "compile.y" { /* stack: context */ yyval=yyvsp[0]; /* stack: context,name */ - O(yyval, PC.operator_call_allowed?OP_GET_ELEMENT_OR_OPERATOR:OP_GET_ELEMENT); /* name=pop; context=pop; stack: context.get_element(name) */ - // only ^FIRST.part.allowed.to.be.an.operator - PC.operator_call_allowed=false; + O(yyval, OP_GET_ELEMENT); /* name=pop; context=pop; stack: context.get_element(name) */ ; break;} case 104: -#line 440 "compile.y" +#line 457 "compile.y" { yyval=yyvsp[0]; O(yyval, OP_GET_ELEMENT); ; break;} case 105: -#line 444 "compile.y" +#line 461 "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 106: -#line 452 "compile.y" +#line 470 "compile.y" { yyval=N(POOL); - O(yyval, OP_CREATE_EWPOOL); - P(yyval, yyvsp[-1]); - O(yyval, OP_REDUCE_EWPOOL); + 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 458 "compile.y" +#line 476 "compile.y" { yyval=N(POOL); O(yyval, OP_WITH_READ); @@ -1409,31 +1430,36 @@ case 107: ; break;} case 109: -#line 463 "compile.y" +#line 481 "compile.y" { yyval=yyvsp[-1]; P(yyval, yyvsp[0]) ; break;} case 110: -#line 464 "compile.y" +#line 482 "compile.y" { yyval=yyvsp[0]; O(yyval, OP_GET_ELEMENT__WRITE); ; break;} case 113: -#line 473 "compile.y" +#line 491 "compile.y" { - // drop allow code after "name:" - PC.operator_call_allowed=false; - 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 114: -#line 480 "compile.y" +#line 503 "compile.y" { yyval=yyvsp[-1]; - if(!PC.object_constructor_allowed) { + if(!PC.in_call_value) { strcpy(PC.error, ":: not allowed here"); YYERROR; } @@ -1441,178 +1467,179 @@ case 114: ; break;} case 115: -#line 492 "compile.y" +#line 515 "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 119: -#line 500 "compile.y" +#line 524 "compile.y" { yyval = yyvsp[-1]; ; break;} case 120: -#line 501 "compile.y" +#line 525 "compile.y" { yyval = yyvsp[-1]; ; break;} case 121: -#line 502 "compile.y" +#line 526 "compile.y" { yyval = yyvsp[-1]; ; break;} case 122: -#line 504 "compile.y" +#line 528 "compile.y" { yyval=yyvsp[0]; O(yyval, OP_NEG) ; break;} case 123: -#line 505 "compile.y" +#line 529 "compile.y" { yyval=yyvsp[0] ; break;} case 124: -#line 506 "compile.y" +#line 530 "compile.y" { yyval=yyvsp[0]; O(yyval, OP_INV) ; break;} case 125: -#line 507 "compile.y" +#line 531 "compile.y" { yyval=yyvsp[0]; O(yyval, OP_NOT) ; break;} case 126: -#line 508 "compile.y" +#line 532 "compile.y" { yyval=yyvsp[0]; O(yyval, OP_DEF) ; break;} case 127: -#line 509 "compile.y" +#line 533 "compile.y" { yyval=yyvsp[0]; O(yyval, OP_IN) ; break;} case 128: -#line 510 "compile.y" +#line 534 "compile.y" { yyval=yyvsp[0]; O(yyval, OP_FEXISTS) ; break;} case 129: -#line 511 "compile.y" +#line 535 "compile.y" { yyval=yyvsp[0]; O(yyval, OP_DEXISTS) ; break;} case 130: -#line 513 "compile.y" +#line 537 "compile.y" { yyval=yyvsp[-2]; P(yyval, yyvsp[0]); O(yyval, OP_SUB) ; break;} case 131: -#line 514 "compile.y" +#line 538 "compile.y" { yyval=yyvsp[-2]; P(yyval, yyvsp[0]); O(yyval, OP_ADD) ; break;} case 132: -#line 515 "compile.y" +#line 539 "compile.y" { yyval=yyvsp[-2]; P(yyval, yyvsp[0]); O(yyval, OP_MUL) ; break;} case 133: -#line 516 "compile.y" +#line 540 "compile.y" { yyval=yyvsp[-2]; P(yyval, yyvsp[0]); O(yyval, OP_DIV) ; break;} case 134: -#line 517 "compile.y" +#line 541 "compile.y" { yyval=yyvsp[-2]; P(yyval, yyvsp[0]); O(yyval, OP_MOD) ; break;} case 135: -#line 518 "compile.y" +#line 542 "compile.y" { yyval=yyvsp[-2]; P(yyval, yyvsp[0]); O(yyval, OP_INTDIV) ; break;} case 136: -#line 519 "compile.y" +#line 543 "compile.y" { yyval=yyvsp[-2]; P(yyval, yyvsp[0]); O(yyval, OP_BIN_AND) ; break;} case 137: -#line 520 "compile.y" +#line 544 "compile.y" { yyval=yyvsp[-2]; P(yyval, yyvsp[0]); O(yyval, OP_BIN_OR) ; break;} case 138: -#line 521 "compile.y" +#line 545 "compile.y" { yyval=yyvsp[-2]; P(yyval, yyvsp[0]); O(yyval, OP_BIN_XOR) ; break;} case 139: -#line 522 "compile.y" -{ yyval=yyvsp[-2]; PNC(yyval, yyvsp[0]); O(yyval, OP_LOG_AND) ; +#line 546 "compile.y" +{ yyval=yyvsp[-2]; OA(yyval, OP_NESTED_CODE, yyvsp[0]); O(yyval, OP_LOG_AND) ; break;} case 140: -#line 523 "compile.y" -{ yyval=yyvsp[-2]; PNC(yyval, yyvsp[0]); O(yyval, OP_LOG_OR) ; +#line 547 "compile.y" +{ yyval=yyvsp[-2]; OA(yyval, OP_NESTED_CODE, yyvsp[0]); O(yyval, OP_LOG_OR) ; break;} case 141: -#line 524 "compile.y" +#line 548 "compile.y" { yyval=yyvsp[-2]; P(yyval, yyvsp[0]); O(yyval, OP_LOG_XOR) ; break;} case 142: -#line 525 "compile.y" +#line 549 "compile.y" { yyval=yyvsp[-2]; P(yyval, yyvsp[0]); O(yyval, OP_NUM_LT) ; break;} case 143: -#line 526 "compile.y" +#line 550 "compile.y" { yyval=yyvsp[-2]; P(yyval, yyvsp[0]); O(yyval, OP_NUM_GT) ; break;} case 144: -#line 527 "compile.y" +#line 551 "compile.y" { yyval=yyvsp[-2]; P(yyval, yyvsp[0]); O(yyval, OP_NUM_LE) ; break;} case 145: -#line 528 "compile.y" +#line 552 "compile.y" { yyval=yyvsp[-2]; P(yyval, yyvsp[0]); O(yyval, OP_NUM_GE) ; break;} case 146: -#line 529 "compile.y" +#line 553 "compile.y" { yyval=yyvsp[-2]; P(yyval, yyvsp[0]); O(yyval, OP_NUM_EQ) ; break;} case 147: -#line 530 "compile.y" +#line 554 "compile.y" { yyval=yyvsp[-2]; P(yyval, yyvsp[0]); O(yyval, OP_NUM_NE) ; break;} case 148: -#line 531 "compile.y" +#line 555 "compile.y" { yyval=yyvsp[-2]; P(yyval, yyvsp[0]); O(yyval, OP_STR_LT) ; break;} case 149: -#line 532 "compile.y" +#line 556 "compile.y" { yyval=yyvsp[-2]; P(yyval, yyvsp[0]); O(yyval, OP_STR_GT) ; break;} case 150: -#line 533 "compile.y" +#line 557 "compile.y" { yyval=yyvsp[-2]; P(yyval, yyvsp[0]); O(yyval, OP_STR_LE) ; break;} case 151: -#line 534 "compile.y" +#line 558 "compile.y" { yyval=yyvsp[-2]; P(yyval, yyvsp[0]); O(yyval, OP_STR_GE) ; break;} case 152: -#line 535 "compile.y" +#line 559 "compile.y" { yyval=yyvsp[-2]; P(yyval, yyvsp[0]); O(yyval, OP_STR_EQ) ; break;} case 153: -#line 536 "compile.y" +#line 560 "compile.y" { yyval=yyvsp[-2]; P(yyval, yyvsp[0]); O(yyval, OP_STR_NE) ; break;} case 154: -#line 537 "compile.y" +#line 561 "compile.y" { yyval=yyvsp[-2]; P(yyval, yyvsp[0]); O(yyval, OP_IS) ; break;} case 155: -#line 540 "compile.y" +#line 564 "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 156: -#line 549 "compile.y" +#line 573 "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 157: -#line 554 "compile.y" +#line 578 "compile.y" { yyval=VL(NEW VVoid(POOL)) ; break;} case 158: -#line 555 "compile.y" +#line 579 "compile.y" { yyval=N(POOL) ; break;} } @@ -1837,7 +1864,7 @@ yyerrhandle: } return 1; } -#line 557 "compile.y" +#line 581 "compile.y" #endif @@ -2059,6 +2086,9 @@ default: case LS_DEF_PARAMS: switch(c) { + case '$': // common error + result=BAD_METHOD_PARAMETER_NAME_CHARACTER; + goto break2; case ';': RC; case ']': @@ -2126,7 +2156,7 @@ default: skip_analized=1; result=DEXISTS; goto break2; - default: + default: // minus result=c; goto break2; } @@ -2135,21 +2165,37 @@ default: case '~': case ';': RC; - case '&': case '|': case '#': + //case '#': // comment start + 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; + if(PC.source[1]=='|') { + skip_analized++; + result=LXOR; + } else + result=NXOR; + goto break2; + case '=': // != + skip_analized=1; + result=NNE; + goto break2; + } + RC; + case '<': case '>': case '=': + if(*PC.source=='=') { // <= >= == skip_analized=1; switch(c) { case '<': result=NLE; break; case '>': result=NGE; break; case '=': result=NEQ; break; - case '!': result=NNE; break; } } else result=c; @@ -2225,9 +2271,12 @@ default: if( PC.ls==LS_EXPRESSION_VAR_NAME_WITH_COLON || PC.ls==LS_EXPRESSION_VAR_NAME_WITHOUT_COLON) { - // name in expr ends also before binary operators + // 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; @@ -2257,7 +2306,7 @@ default: case '&': case '|': case '=': case '!': // common delimiters - case ',': case '?': + case ',': case '?': case '#': // before call case '^': pop_LS(PC);