--- parser3/src/main/compile.tab.C 2002/01/31 17:12:27 1.35 +++ parser3/src/main/compile.tab.C 2002/12/06 17:27:35 1.78 @@ -10,25 +10,30 @@ #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 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" @@ -38,7 +43,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.78 2002/12/06 17:27:35 paf Exp $ */ /** @@ -67,8 +72,8 @@ #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); @@ -95,26 +100,26 @@ static int yylex(YYSTYPE *lvalp, void *p -#define YYFINAL 248 +#define YYFINAL 252 #define YYFLAG -32768 -#define YYNTBASE 56 +#define YYNTBASE 60 -#define YYTRANSLATE(x) ((unsigned)(x) <= 281 ? yytranslate[x] : 135) +#define YYTRANSLATE(x) ((unsigned)(x) <= 286 ? yytranslate[x] : 139) static const char yytranslate[] = { 0, - 2, 2, 2, 2, 2, 2, 2, 2, 2, 42, + 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, 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, 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, - 43, 39, 44, 52, 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, 47, 31, 48, 33, 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, @@ -130,7 +135,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, 30, 31, 42 }; #if YYDEBUG != 0 @@ -150,76 +155,77 @@ static const short yyprhs[] = { 0, 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, 436, 438, 439 + 418, 422, 426, 430, 434, 438, 442, 444, 446, 447 }; -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[] = { 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, - 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 + 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 @@ -228,18 +234,19 @@ 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\"", -"\"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", +"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", @@ -253,22 +260,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 + 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, @@ -287,183 +294,197 @@ static const short yyr2[] = { 0, 3, 2, 2, 2, 2, 2, 2, 2, 2, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, - 3, 3, 3, 3, 1, 1, 0, 0 + 3, 3, 3, 3, 3, 3, 1, 1, 0, 0 }; -static const short yydefact[] = { 158, - 156, 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, 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, 158, 158, 158, 99, 0, 113, 105, 108, 0, + 29, 160, 160, 160, 99, 0, 113, 105, 108, 0, 107, 104, 0, 0, 98, 0, 100, 51, 0, 92, - 37, 157, 158, 0, 46, 53, 54, 55, 100, 95, + 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, 158, 18, - 17, 110, 109, 106, 39, 93, 156, 0, 31, 0, + 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, 158, 158, 117, 118, + 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, 125, 124, - 122, 123, 0, 155, 0, 0, 57, 0, 0, 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, 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, - 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 + 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[] = { 246, +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, 222, 112, 113, 17, - 130, 49, 133, 88, 186, 187, 188, 189, 190, 223, - 230, 228, 224, 231, 229, 225, 232, 37, 64, 39, + 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, 233, 132, 155, 19, 226, 20 + 47, 48, 237, 132, 155, 19, 230, 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[] = { 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, 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, 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 440 +#define YYLAST 494 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, -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, - 174, 175, 176, 134, 177, 178, 179, 180, 181, 182, - 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, - 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, - 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, - 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 + 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, - 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, - 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 + 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 @@ -1011,19 +1032,19 @@ yyreduce: switch (yyn) { case 1: -#line 108 "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 125 "compile.y" +#line 133 "compile.y" { const String& command=*LA2S(yyvsp[-2]); YYSTYPE strings_code=yyvsp[0]; @@ -1034,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, "'"); @@ -1054,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; @@ -1091,11 +1113,11 @@ case 8: ; break;} case 12: -#line 191 "compile.y" +#line 200 "compile.y" { yyval=yyvsp[-1]; P(yyval, yyvsp[0]) ; break;} case 16: -#line 196 "compile.y" +#line 205 "compile.y" { const String *name=LA2S(yyvsp[-5]); @@ -1125,76 +1147,88 @@ case 16: ; break;} case 19: -#line 225 "compile.y" +#line 234 "compile.y" {yyval=yyvsp[-1]; break;} case 23: -#line 227 "compile.y" +#line 236 "compile.y" { yyval=yyvsp[-2]; P(yyval, yyvsp[0]) ; break;} case 29: -#line 235 "compile.y" +#line 244 "compile.y" { yyval=yyvsp[-1]; P(yyval, yyvsp[0]) ; break;} case 35: -#line 241 "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 245 "compile.y" +#line 257 "compile.y" { yyval=yyvsp[0] ; break;} case 39: -#line 247 "compile.y" +#line 259 "compile.y" { yyval=yyvsp[-1] ; break;} case 42: -#line 251 "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 266 "compile.y" +#line 285 "compile.y" { yyval=yyvsp[-1]; P(yyval, yyvsp[0]) ; break;} case 45: -#line 267 "compile.y" +#line 286 "compile.y" { yyval=yyvsp[-1]; P(yyval, yyvsp[0]) ; break;} case 46: -#line 271 "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 279 "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); @@ -1203,7 +1237,7 @@ case 50: ; break;} case 51: -#line 294 "compile.y" +#line 315 "compile.y" { yyval=N(POOL); O(yyval, OP_WITH_WRITE); /* stack: starting context */ @@ -1211,11 +1245,11 @@ case 51: ; break;} case 52: -#line 299 "compile.y" +#line 320 "compile.y" { yyval=yyvsp[-1]; P(yyval, yyvsp[0]) ; break;} case 56: -#line 306 "compile.y" +#line 327 "compile.y" { // stack: context, name yyval=yyvsp[-1]; // stack: context, name, value @@ -1223,137 +1257,140 @@ case 56: ; break;} case 57: -#line 312 "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 + 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 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 329 "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 336 "compile.y" +#line 359 "compile.y" { yyval=yyvsp[-1]; P(yyval, yyvsp[0]) ; break;} case 66: -#line 340 "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 344 "compile.y" +#line 369 "compile.y" { - PC.object_constructor_allowed=true; - push_OCA(PC, true); + PC.in_call_value=true; ; break;} case 68: -#line 348 "compile.y" +#line 372 "compile.y" { - PC.object_constructor_allowed=false; - pop_OCA(PC); + PC.in_call_value=false; ; break;} case 69: -#line 352 "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 368 "compile.y" +#line 390 "compile.y" { yyval=yyvsp[-1]; P(yyval, yyvsp[0]) ; break;} case 76: -#line 374 "compile.y" +#line 396 "compile.y" {yyval=yyvsp[-1]; break;} case 77: -#line 375 "compile.y" +#line 397 "compile.y" {yyval=yyvsp[-1]; break;} case 78: -#line 376 "compile.y" +#line 398 "compile.y" {yyval=yyvsp[-1]; break;} case 80: -#line 379 "compile.y" +#line 401 "compile.y" { yyval=yyvsp[-2]; P(yyval, yyvsp[0]) ; break;} case 82: -#line 383 "compile.y" +#line 405 "compile.y" { yyval=yyvsp[-2]; P(yyval, yyvsp[0]) ; break;} case 84: -#line 387 "compile.y" +#line 409 "compile.y" { yyval=yyvsp[-2]; P(yyval, yyvsp[0]) ; break;} case 85: -#line 389 "compile.y" +#line 411 "compile.y" { yyval=yyvsp[0]; O(yyval, OP_STORE_PARAM); ; break;} case 86: -#line 393 "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 397 "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 406 "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 413 "compile.y" +#line 437 "compile.y" { yyval=yyvsp[-1]; P(yyval, yyvsp[0]) ; break;} case 95: -#line 415 "compile.y" +#line 439 "compile.y" { yyval=yyvsp[-1]; P(yyval, yyvsp[0]) ; break;} case 97: -#line 417 "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 @@ -1364,44 +1401,43 @@ case 97: ; break;} case 98: -#line 425 "compile.y" +#line 449 "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 462 "compile.y" { yyval=yyvsp[0]; O(yyval, OP_GET_ELEMENT); ; break;} case 105: -#line 444 "compile.y" +#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 106: -#line 452 "compile.y" +#line 475 "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 481 "compile.y" { yyval=N(POOL); O(yyval, OP_WITH_READ); @@ -1409,31 +1445,36 @@ case 107: ; break;} case 109: -#line 463 "compile.y" +#line 486 "compile.y" { yyval=yyvsp[-1]; P(yyval, yyvsp[0]) ; break;} case 110: -#line 464 "compile.y" +#line 487 "compile.y" { yyval=yyvsp[0]; O(yyval, OP_GET_ELEMENT__WRITE); ; break;} case 113: -#line 473 "compile.y" +#line 496 "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 508 "compile.y" { yyval=yyvsp[-1]; - if(!PC.object_constructor_allowed) { + if(!PC.in_call_value) { strcpy(PC.error, ":: not allowed here"); YYERROR; } @@ -1441,178 +1482,187 @@ case 114: ; break;} case 115: -#line 492 "compile.y" +#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 119: -#line 500 "compile.y" +#line 529 "compile.y" { yyval = yyvsp[-1]; ; break;} case 120: -#line 501 "compile.y" +#line 530 "compile.y" { yyval = yyvsp[-1]; ; break;} case 121: -#line 502 "compile.y" +#line 531 "compile.y" { yyval = yyvsp[-1]; ; break;} case 122: -#line 504 "compile.y" +#line 533 "compile.y" { yyval=yyvsp[0]; O(yyval, OP_NEG) ; break;} case 123: -#line 505 "compile.y" +#line 534 "compile.y" { yyval=yyvsp[0] ; break;} case 124: -#line 506 "compile.y" +#line 535 "compile.y" { yyval=yyvsp[0]; O(yyval, OP_INV) ; break;} case 125: -#line 507 "compile.y" +#line 536 "compile.y" { yyval=yyvsp[0]; O(yyval, OP_NOT) ; break;} case 126: -#line 508 "compile.y" +#line 537 "compile.y" { yyval=yyvsp[0]; O(yyval, OP_DEF) ; break;} case 127: -#line 509 "compile.y" +#line 538 "compile.y" { yyval=yyvsp[0]; O(yyval, OP_IN) ; break;} case 128: -#line 510 "compile.y" +#line 539 "compile.y" { yyval=yyvsp[0]; O(yyval, OP_FEXISTS) ; break;} case 129: -#line 511 "compile.y" +#line 540 "compile.y" { yyval=yyvsp[0]; O(yyval, OP_DEXISTS) ; break;} case 130: -#line 513 "compile.y" +#line 542 "compile.y" { yyval=yyvsp[-2]; P(yyval, yyvsp[0]); O(yyval, OP_SUB) ; break;} case 131: -#line 514 "compile.y" +#line 543 "compile.y" { yyval=yyvsp[-2]; P(yyval, yyvsp[0]); O(yyval, OP_ADD) ; break;} case 132: -#line 515 "compile.y" +#line 544 "compile.y" { yyval=yyvsp[-2]; P(yyval, yyvsp[0]); O(yyval, OP_MUL) ; break;} case 133: -#line 516 "compile.y" +#line 545 "compile.y" { yyval=yyvsp[-2]; P(yyval, yyvsp[0]); O(yyval, OP_DIV) ; break;} case 134: -#line 517 "compile.y" +#line 546 "compile.y" { yyval=yyvsp[-2]; P(yyval, yyvsp[0]); O(yyval, OP_MOD) ; break;} case 135: -#line 518 "compile.y" +#line 547 "compile.y" { yyval=yyvsp[-2]; P(yyval, yyvsp[0]); O(yyval, OP_INTDIV) ; break;} case 136: -#line 519 "compile.y" -{ yyval=yyvsp[-2]; P(yyval, yyvsp[0]); O(yyval, OP_BIN_AND) ; +#line 548 "compile.y" +{ yyval=yyvsp[-2]; P(yyval, yyvsp[0]); O(yyval, OP_BIN_SL) ; break;} case 137: -#line 520 "compile.y" -{ yyval=yyvsp[-2]; P(yyval, yyvsp[0]); O(yyval, OP_BIN_OR) ; +#line 549 "compile.y" +{ yyval=yyvsp[-2]; P(yyval, yyvsp[0]); O(yyval, OP_BIN_SR) ; break;} case 138: -#line 521 "compile.y" -{ yyval=yyvsp[-2]; P(yyval, yyvsp[0]); O(yyval, OP_BIN_XOR) ; +#line 550 "compile.y" +{ yyval=yyvsp[-2]; P(yyval, yyvsp[0]); O(yyval, OP_BIN_AND) ; break;} case 139: -#line 522 "compile.y" -{ yyval=yyvsp[-2]; PNC(yyval, yyvsp[0]); O(yyval, OP_LOG_AND) ; +#line 551 "compile.y" +{ yyval=yyvsp[-2]; P(yyval, yyvsp[0]); O(yyval, OP_BIN_OR) ; break;} case 140: -#line 523 "compile.y" -{ yyval=yyvsp[-2]; PNC(yyval, yyvsp[0]); O(yyval, OP_LOG_OR) ; +#line 552 "compile.y" +{ yyval=yyvsp[-2]; P(yyval, yyvsp[0]); O(yyval, OP_BIN_XOR) ; break;} case 141: -#line 524 "compile.y" -{ yyval=yyvsp[-2]; P(yyval, yyvsp[0]); O(yyval, OP_LOG_XOR) ; +#line 553 "compile.y" +{ yyval=yyvsp[-2]; OA(yyval, OP_NESTED_CODE, yyvsp[0]); O(yyval, OP_LOG_AND) ; break;} case 142: -#line 525 "compile.y" -{ yyval=yyvsp[-2]; P(yyval, yyvsp[0]); O(yyval, OP_NUM_LT) ; +#line 554 "compile.y" +{ yyval=yyvsp[-2]; OA(yyval, OP_NESTED_CODE, yyvsp[0]); O(yyval, OP_LOG_OR) ; break;} case 143: -#line 526 "compile.y" -{ yyval=yyvsp[-2]; P(yyval, yyvsp[0]); O(yyval, OP_NUM_GT) ; +#line 555 "compile.y" +{ yyval=yyvsp[-2]; P(yyval, yyvsp[0]); O(yyval, OP_LOG_XOR) ; break;} case 144: -#line 527 "compile.y" -{ yyval=yyvsp[-2]; P(yyval, yyvsp[0]); O(yyval, OP_NUM_LE) ; +#line 556 "compile.y" +{ yyval=yyvsp[-2]; P(yyval, yyvsp[0]); O(yyval, OP_NUM_LT) ; break;} case 145: -#line 528 "compile.y" -{ yyval=yyvsp[-2]; P(yyval, yyvsp[0]); O(yyval, OP_NUM_GE) ; +#line 557 "compile.y" +{ yyval=yyvsp[-2]; P(yyval, yyvsp[0]); O(yyval, OP_NUM_GT) ; break;} case 146: -#line 529 "compile.y" -{ yyval=yyvsp[-2]; P(yyval, yyvsp[0]); O(yyval, OP_NUM_EQ) ; +#line 558 "compile.y" +{ yyval=yyvsp[-2]; P(yyval, yyvsp[0]); O(yyval, OP_NUM_LE) ; break;} case 147: -#line 530 "compile.y" -{ yyval=yyvsp[-2]; P(yyval, yyvsp[0]); O(yyval, OP_NUM_NE) ; +#line 559 "compile.y" +{ yyval=yyvsp[-2]; P(yyval, yyvsp[0]); O(yyval, OP_NUM_GE) ; break;} case 148: -#line 531 "compile.y" -{ yyval=yyvsp[-2]; P(yyval, yyvsp[0]); O(yyval, OP_STR_LT) ; +#line 560 "compile.y" +{ yyval=yyvsp[-2]; P(yyval, yyvsp[0]); O(yyval, OP_NUM_EQ) ; break;} case 149: -#line 532 "compile.y" -{ yyval=yyvsp[-2]; P(yyval, yyvsp[0]); O(yyval, OP_STR_GT) ; +#line 561 "compile.y" +{ yyval=yyvsp[-2]; P(yyval, yyvsp[0]); O(yyval, OP_NUM_NE) ; break;} case 150: -#line 533 "compile.y" -{ yyval=yyvsp[-2]; P(yyval, yyvsp[0]); O(yyval, OP_STR_LE) ; +#line 562 "compile.y" +{ yyval=yyvsp[-2]; P(yyval, yyvsp[0]); O(yyval, OP_STR_LT) ; break;} case 151: -#line 534 "compile.y" -{ yyval=yyvsp[-2]; P(yyval, yyvsp[0]); O(yyval, OP_STR_GE) ; +#line 563 "compile.y" +{ yyval=yyvsp[-2]; P(yyval, yyvsp[0]); O(yyval, OP_STR_GT) ; break;} case 152: -#line 535 "compile.y" -{ yyval=yyvsp[-2]; P(yyval, yyvsp[0]); O(yyval, OP_STR_EQ) ; +#line 564 "compile.y" +{ yyval=yyvsp[-2]; P(yyval, yyvsp[0]); O(yyval, OP_STR_LE) ; break;} case 153: -#line 536 "compile.y" -{ yyval=yyvsp[-2]; P(yyval, yyvsp[0]); O(yyval, OP_STR_NE) ; +#line 565 "compile.y" +{ yyval=yyvsp[-2]; P(yyval, yyvsp[0]); O(yyval, OP_STR_GE) ; break;} case 154: -#line 537 "compile.y" -{ yyval=yyvsp[-2]; P(yyval, yyvsp[0]); O(yyval, OP_IS) ; +#line 566 "compile.y" +{ yyval=yyvsp[-2]; P(yyval, yyvsp[0]); O(yyval, OP_STR_EQ) ; break;} case 155: -#line 540 "compile.y" +#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 156: -#line 549 "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 157: -#line 554 "compile.y" +case 159: +#line 585 "compile.y" { yyval=VL(NEW VVoid(POOL)) ; break;} -case 158: -#line 555 "compile.y" +case 160: +#line 586 "compile.y" { yyval=N(POOL) ; break;} } @@ -1837,7 +1887,7 @@ yyerrhandle: } return 1; } -#line 557 "compile.y" +#line 588 "compile.y" #endif @@ -1897,7 +1947,14 @@ static int yylex(YYSTYPE *lvalp, void *p } else // @ in first column inside some code [when could that be?] result=BAD_METHOD_DECL_START; goto break2; - } else if(c=='^') + } else if(c=='^') { + if(PC.ls==LS_METHOD_AFTER) { + // handle after-method situation + pop_LS(PC); + result=EON; + skip_analized=-1; // return to punctuation afterwards to assure it's literality + goto break2; + } switch(PC.ls) { case LS_EXPRESSION_VAR_NAME_WITH_COLON: case LS_EXPRESSION_VAR_NAME_WITHOUT_COLON: @@ -1905,7 +1962,7 @@ case LS_VAR_NAME_SIMPLE_WITH_COLON: case LS_VAR_NAME_SIMPLE_WITHOUT_COLON: case LS_VAR_NAME_CURLY: case LS_METHOD_NAME: -case LS_COMMENT: +case LS_USER_COMMENT: case LS_DEF_COMMENT: // no literals in names, please break; @@ -1922,19 +1979,12 @@ default: PC.string->APPEND_CLEAN(begin, end-begin, PC.file, begin_line); } // reset piece 'begin' position & line - end=begin=PC.source; // ^ + begin=PC.source; // ->punctuation begin_line=PC.line; - if(PC.ls==LS_METHOD_AFTER) { - pop_LS(PC); - result=EON; - skip_analized=-1; // return to ^ afterwards to assure it's literality - goto break2; - } else { - // skip over _ after ^ - PC.source++; PC.col++; - // skip analysis = forced literal - continue; - } + // skip over _ after ^ + PC.source++; PC.col++; + // skip analysis = forced literal + continue; // converting ^#HH into char(hex(HH)) case '#': @@ -1958,13 +2008,15 @@ default: 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) { @@ -1973,7 +2025,7 @@ default: 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) { @@ -2012,7 +2064,7 @@ default: break; // #COMMENT - case LS_COMMENT: + case LS_USER_COMMENT: if(c=='\n') { // skip comment begin=PC.source; @@ -2059,6 +2111,9 @@ default: case LS_DEF_PARAMS: switch(c) { + case '$': // common error + result=BAD_METHOD_PARAMETER_NAME_CHARACTER; + goto break2; case ';': RC; case ']': @@ -2107,6 +2162,15 @@ default: 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_WITH_COLON); RC; @@ -2126,7 +2190,7 @@ default: skip_analized=1; result=DEXISTS; goto break2; - default: + default: // minus result=c; goto break2; } @@ -2135,25 +2199,59 @@ default: 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; @@ -2216,6 +2314,24 @@ default: 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_WITH_COLON: @@ -2225,9 +2341,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 +2376,7 @@ default: case '&': case '|': case '=': case '!': // common delimiters - case ',': case '?': + case ',': case '?': case '#': // before call case '^': pop_LS(PC); @@ -2476,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*/); }