--- parser3/src/main/compile.tab.C 2001/08/06 16:18:26 1.2 +++ parser3/src/main/compile.tab.C 2002/01/31 17:12:27 1.35 @@ -9,29 +9,37 @@ #define BOGUS 259 #define BAD_STRING_COMPARISON_OPERATOR 260 #define BAD_HEX_LITERAL 261 -#define LAND 262 -#define LOR 263 -#define LXOR 264 -#define NLE 265 -#define NGE 266 -#define NEQ 267 -#define NNE 268 -#define SLT 269 -#define SGT 270 -#define SLE 271 -#define SGE 272 -#define SEQ 273 -#define SNE 274 -#define DEF 275 -#define IN 276 -#define FEXISTS 277 -#define DEXISTS 278 -#define IS 279 -#define NEG 280 +#define BAD_METHOD_DECL_START 262 +#define 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 + +#line 1 "compile.y" -#line 8 "compile.y" +/** @file + Parser: compiler(lexical parser and grammar). -static char *RCSId="$Id: compile.tab.C,v 1.2 2001/08/06 16:18:26 parser Exp $"; + Copyright (c) 2001 ArtLebedev Group (http://www.artlebedev.com) + Author: Alexander Petrosyan (http://design.ru/paf) + + $Id: compile.tab.C,v 1.35 2002/01/31 17:12:27 paf Exp $ +*/ /** @todo parser4: @@ -87,26 +95,26 @@ static int yylex(YYSTYPE *lvalp, void *p -#define YYFINAL 240 +#define YYFINAL 248 #define YYFLAG -32768 -#define YYNTBASE 54 +#define YYNTBASE 56 -#define YYTRANSLATE(x) ((unsigned)(x) <= 280 ? yytranslate[x] : 132) +#define YYTRANSLATE(x) ((unsigned)(x) <= 281 ? yytranslate[x] : 135) static const char yytranslate[] = { 0, - 2, 2, 2, 2, 2, 2, 2, 2, 2, 40, + 2, 2, 2, 2, 2, 2, 2, 2, 2, 42, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, - 2, 2, 28, 52, 29, 44, 37, 31, 53, 48, - 49, 35, 34, 2, 33, 47, 36, 2, 2, 2, - 2, 2, 2, 2, 2, 2, 2, 51, 43, 26, - 2, 27, 2, 39, 2, 2, 2, 2, 2, 2, + 2, 2, 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, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, - 41, 2, 42, 50, 2, 2, 2, 2, 2, 2, + 43, 39, 44, 52, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, - 2, 2, 45, 30, 46, 32, 2, 2, 2, 2, + 2, 2, 47, 31, 48, 33, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, @@ -121,7 +129,8 @@ static const char yytranslate[] = { 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 1, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, - 17, 18, 19, 20, 21, 22, 23, 24, 25, 38 + 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, + 40 }; #if YYDEBUG != 0 @@ -136,80 +145,81 @@ static const short yyprhs[] = { 0, 177, 179, 182, 184, 186, 188, 192, 196, 200, 202, 206, 208, 212, 214, 218, 220, 222, 224, 226, 228, 230, 232, 234, 237, 239, 242, 245, 247, 249, 252, - 254, 256, 258, 261, 264, 266, 268, 271, 274, 276, - 278, 281, 284, 286, 288, 290, 292, 296, 300, 304, - 307, 310, 313, 316, 319, 322, 325, 329, 333, 337, - 341, 345, 349, 353, 357, 361, 365, 369, 373, 377, - 381, 385, 389, 393, 397, 401, 405, 409, 413, 417, - 421, 423, 425, 426 + 254, 256, 258, 260, 263, 266, 270, 272, 274, 277, + 280, 282, 284, 287, 290, 292, 294, 296, 298, 302, + 306, 310, 313, 316, 319, 322, 325, 328, 331, 334, + 338, 342, 346, 350, 354, 358, 362, 366, 370, 374, + 378, 382, 386, 390, 394, 398, 402, 406, 410, 414, + 418, 422, 426, 430, 434, 436, 438, 439 }; -static const short yyrhs[] = { 56, - 0, 55, 0, 57, 0, 55, 57, 0, 69, 0, - 58, 0, 63, 0, 39, 4, 40, 59, 0, 131, - 0, 60, 0, 61, 0, 60, 61, 0, 62, 40, - 0, 131, 0, 4, 0, 39, 4, 65, 64, 68, - 40, 69, 0, 131, 0, 65, 0, 41, 66, 42, - 0, 131, 0, 67, 0, 4, 0, 67, 43, 4, - 0, 131, 0, 4, 0, 131, 0, 70, 0, 71, - 0, 70, 71, 0, 129, 0, 72, 0, 73, 0, - 81, 0, 94, 0, 74, 0, 44, 75, 0, 77, - 3, 0, 76, 0, 45, 77, 46, 0, 78, 0, - 79, 0, 80, 0, 123, 80, 0, 116, 0, 113, - 116, 0, 44, 82, 86, 0, 83, 0, 84, 0, - 85, 0, 112, 0, 47, 112, 0, 123, 112, 0, - 87, 0, 88, 0, 89, 0, 41, 90, 42, 0, - 48, 126, 49, 0, 45, 69, 46, 0, 130, 0, - 4, 0, 91, 0, 92, 0, 93, 0, 72, 0, - 71, 70, 0, 95, 0, 0, 0, 50, 96, 98, - 97, 99, 3, 0, 77, 0, 100, 0, 99, 100, - 0, 101, 0, 102, 0, 103, 0, 41, 104, 42, - 0, 48, 105, 49, 0, 45, 106, 46, 0, 107, - 0, 104, 43, 107, 0, 108, 0, 105, 43, 108, - 0, 109, 0, 106, 43, 109, 0, 110, 0, 111, - 0, 69, 0, 130, 0, 4, 0, 91, 0, 126, - 0, 117, 0, 113, 117, 0, 114, 0, 113, 114, - 0, 115, 47, 0, 117, 0, 117, 0, 4, 5, - 0, 4, 0, 118, 0, 119, 0, 44, 120, 0, - 4, 121, 0, 4, 0, 122, 0, 121, 122, 0, - 44, 120, 0, 124, 0, 125, 0, 4, 51, 0, - 124, 51, 0, 127, 0, 4, 0, 74, 0, 95, - 0, 52, 128, 52, 0, 53, 128, 53, 0, 48, - 127, 49, 0, 33, 127, 0, 32, 127, 0, 28, - 127, 0, 21, 127, 0, 22, 127, 0, 23, 127, - 0, 24, 127, 0, 127, 33, 127, 0, 127, 34, - 127, 0, 127, 35, 127, 0, 127, 36, 127, 0, - 127, 37, 127, 0, 127, 31, 127, 0, 127, 30, - 127, 0, 127, 29, 127, 0, 127, 8, 127, 0, - 127, 9, 127, 0, 127, 10, 127, 0, 127, 26, - 127, 0, 127, 27, 127, 0, 127, 11, 127, 0, - 127, 12, 127, 0, 127, 13, 127, 0, 127, 14, - 127, 0, 127, 15, 127, 0, 127, 16, 127, 0, - 127, 17, 127, 0, 127, 18, 127, 0, 127, 19, - 127, 0, 127, 20, 127, 0, 127, 25, 127, 0, - 69, 0, 4, 0, 0, 0 +static const short yyrhs[] = { 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 }; #endif #if YYDEBUG != 0 static const short yyrline[] = { 0, - 106, 116, 118, 118, 119, 121, 121, 123, 189, 189, - 190, 190, 191, 192, 192, 194, 223, 223, 224, 225, - 225, 226, 226, 228, 228, 232, 232, 234, 234, 235, - 235, 236, 236, 236, 240, 244, 245, 245, 246, 247, - 249, 250, 265, 266, 266, 270, 274, 276, 277, 278, - 293, 298, 300, 301, 302, 305, 311, 317, 323, 325, - 326, 328, 334, 335, 335, 339, 343, 344, 345, 359, - 361, 361, 362, 364, 365, 367, 368, 369, 370, 372, - 374, 376, 378, 380, 382, 386, 390, 394, 396, 397, - 399, 406, 406, 408, 408, 409, 410, 415, 420, 422, - 424, 425, 427, 431, 439, 444, 444, 445, 450, 452, - 454, 458, 470, 474, 476, 477, 478, 479, 480, 482, - 483, 484, 485, 486, 487, 488, 490, 491, 492, 493, - 494, 495, 496, 497, 498, 499, 500, 501, 502, 503, - 504, 505, 506, 507, 508, 509, 510, 511, 512, 513, - 516, 525, 530, 531 + 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 }; #endif @@ -217,48 +227,48 @@ static const short yyrline[] = { 0, #if YYDEBUG != 0 || defined (YYERROR_VERBOSE) static const char * const yytname[] = { "$","error","$undefined.","EON","STRING", -"BOGUS","BAD_STRING_COMPARISON_OPERATOR","BAD_HEX_LITERAL","\"&&\"","\"||\"", -"\"##\"","\"<=\"","\">=\"","\"==\"","\"!=\"","\"lt\"","\"gt\"","\"le\"","\"ge\"", -"\"eq\"","\"ne\"","\"def\"","\"in\"","\"-f\"","\"-d\"","\"is\"","'<'","'>'", -"'!'","'#'","'|'","'&'","'~'","'-'","'+'","'*'","'/'","'%'","NEG","'@'","'\\n'", -"'['","']'","';'","'$'","'{'","'}'","'.'","'('","')'","'^'","':'","'\\\"'","'\\''", -"all","methods","one_big_piece","method","control_method","maybe_control_strings", -"control_strings","control_string","maybe_string","code_method","maybe_bracketed_strings", -"bracketed_maybe_strings","maybe_strings","strings","maybe_comment","maybe_codes", -"codes","code","action","get","get_value","get_name_value","name_in_curly_rdive", -"name_without_curly_rdive","name_without_curly_rdive_read","name_without_curly_rdive_class", -"name_without_curly_rdive_code","put","name_expr_wdive","name_expr_wdive_root", -"name_expr_wdive_write","name_expr_wdive_class","construct","construct_square", -"construct_round","construct_curly","any_constructor_code_value","constructor_code_value", -"constructor_code","codes__excluding_sole_str_literal","call","call_value","@1", -"@2","call_name","store_params","store_param","store_square_param","store_round_param", -"store_curly_param","store_code_param_parts","store_expr_param_parts","store_curly_param_parts", -"store_code_param_part","store_expr_param_part","store_curly_param_part","code_param_value", -"write_expr_value","name_expr_dive_code","name_path","name_step","name_advance1", -"name_advance2","name_expr_value","name_expr_subvar_value","name_expr_with_subvar_value", -"subvar_ref_name_rdive","subvar_get_writes","subvar__get_write","class_prefix", -"class_static_prefix","class_constructor_prefix","expr_value","expr","string_inside_quotes_value", -"write_string","void_value","empty", NULL +"BOGUS","BAD_STRING_COMPARISON_OPERATOR","BAD_HEX_LITERAL","BAD_METHOD_DECL_START", +"\"&&\"","\"||\"","\"##\"","\"<=\"","\">=\"","\"==\"","\"!=\"","\"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", +"name_square_code_value","subvar_ref_name_rdive","subvar_get_writes","subvar__get_write", +"class_prefix","class_static_prefix","class_constructor_prefix","expr_value", +"expr","string_inside_quotes_value","write_string","void_value","empty", NULL }; #endif static const short yyr1[] = { 0, - 54, 54, 55, 55, 56, 57, 57, 58, 59, 59, - 60, 60, 61, 62, 62, 63, 64, 64, 65, 66, - 66, 67, 67, 68, 68, 69, 69, 70, 70, 71, - 71, 72, 72, 72, 73, 74, 75, 75, 76, 77, - 77, 78, 79, 80, 80, 81, 82, 82, 82, 83, - 84, 85, 86, 86, 86, 87, 88, 89, 90, 90, - 90, 91, 92, 93, 93, 94, 96, 97, 95, 98, - 99, 99, 100, 100, 100, 101, 102, 103, 104, 104, - 105, 105, 106, 106, 107, 108, 109, 110, 110, 110, - 111, 112, 112, 113, 113, 114, 115, 116, 116, 117, - 117, 117, 118, 119, 120, 121, 121, 122, 123, 123, - 124, 125, 126, 127, 127, 127, 127, 127, 127, 127, - 127, 127, 127, 127, 127, 127, 127, 127, 127, 127, - 127, 127, 127, 127, 127, 127, 127, 127, 127, 127, - 127, 127, 127, 127, 127, 127, 127, 127, 127, 127, - 128, 129, 130, 131 + 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 }; static const short yyr2[] = { 0, @@ -272,185 +282,193 @@ static const short yyr2[] = { 0, 1, 2, 1, 1, 1, 3, 3, 3, 1, 3, 1, 3, 1, 3, 1, 1, 1, 1, 1, 1, 1, 1, 2, 1, 2, 2, 1, 1, 2, 1, - 1, 1, 2, 2, 1, 1, 2, 2, 1, 1, - 2, 2, 1, 1, 1, 1, 3, 3, 3, 2, - 2, 2, 2, 2, 2, 2, 3, 3, 3, 3, + 1, 1, 1, 2, 2, 3, 1, 1, 2, 2, + 1, 1, 2, 2, 1, 1, 1, 1, 3, 3, + 3, 2, 2, 2, 2, 2, 2, 2, 2, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, - 1, 1, 0, 0 + 3, 3, 3, 3, 1, 1, 0, 0 }; -static const short yydefact[] = { 154, - 152, 0, 0, 67, 2, 1, 3, 6, 7, 5, +static const short yydefact[] = { 158, + 156, 0, 0, 67, 2, 1, 3, 6, 7, 5, 27, 28, 31, 32, 35, 33, 34, 66, 30, 26, - 0, 100, 0, 0, 0, 36, 38, 0, 40, 41, - 42, 0, 47, 48, 49, 50, 0, 94, 0, 44, - 92, 101, 102, 0, 109, 110, 0, 4, 29, 154, - 154, 154, 99, 0, 111, 104, 106, 105, 103, 0, - 0, 98, 0, 100, 51, 0, 92, 37, 153, 154, - 0, 46, 53, 54, 55, 100, 95, 45, 93, 96, - 43, 52, 112, 70, 68, 15, 8, 10, 11, 0, - 9, 22, 0, 21, 20, 154, 18, 17, 108, 107, - 39, 93, 152, 0, 31, 0, 61, 62, 63, 59, - 0, 114, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 154, 154, 115, 116, 0, 113, 0, 12, 14, - 13, 19, 0, 25, 0, 24, 65, 56, 58, 123, - 124, 125, 126, 122, 121, 120, 0, 151, 0, 0, - 57, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 100, 0, 0, 0, 0, 36, 38, 0, 40, + 41, 42, 0, 47, 48, 49, 50, 0, 94, 0, + 44, 92, 101, 102, 103, 0, 111, 112, 0, 4, + 29, 158, 158, 158, 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, + 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, + 61, 62, 63, 59, 0, 116, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 158, 158, 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, + 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, 153, 154, 0, 0, 71, - 73, 74, 75, 23, 154, 119, 117, 118, 135, 136, - 137, 140, 141, 142, 143, 144, 145, 146, 147, 148, - 149, 150, 138, 139, 134, 133, 132, 127, 128, 129, - 130, 131, 152, 90, 0, 79, 85, 88, 87, 0, - 83, 0, 81, 86, 91, 69, 72, 16, 76, 153, - 154, 78, 0, 77, 80, 84, 82, 0, 0, 0 + 0, 0, 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 }; -static const short yydefgoto[] = { 238, - 5, 6, 7, 8, 87, 88, 89, 90, 9, 96, - 52, 93, 94, 135, 148, 11, 12, 13, 14, 124, - 26, 27, 28, 29, 30, 31, 16, 32, 33, 34, - 35, 72, 73, 74, 75, 106, 214, 108, 109, 17, - 125, 47, 128, 85, 179, 180, 181, 182, 183, 215, - 222, 220, 216, 223, 221, 217, 224, 36, 61, 38, - 39, 40, 62, 42, 43, 59, 56, 57, 63, 45, - 46, 225, 127, 149, 19, 218, 20 +static const short yydefgoto[] = { 246, + 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, + 40, 41, 65, 43, 44, 45, 62, 58, 59, 66, + 47, 48, 233, 132, 155, 19, 226, 20 }; -static const short yypact[] = { 10, --32768, 15, 58,-32768, -8,-32768,-32768,-32768,-32768,-32768, - 6,-32768,-32768,-32768,-32768,-32768,-32768,-32768,-32768,-32768, - 80, 4, 32, 70, 105,-32768,-32768, 44,-32768,-32768, --32768, -21,-32768,-32768,-32768,-32768, 106,-32768, 54,-32768, - 19,-32768,-32768, 106, 66,-32768, 70,-32768,-32768, 122, - 124, 92,-32768, 32,-32768, 90,-32768,-32768,-32768, 97, - 106, 101, 106, 90,-32768, 105, 101,-32768, 13, 6, - 108,-32768,-32768,-32768,-32768, 111,-32768,-32768, 19,-32768, --32768,-32768,-32768,-32768,-32768,-32768,-32768, 11,-32768, 113, - 117,-32768, 120, 116,-32768, 147,-32768,-32768,-32768,-32768, --32768, 101, 128, 6, 139, 144,-32768,-32768,-32768,-32768, - 118,-32768, 108, 108, 108, 108, 108, 108, 108, 63, - 108, 6, 6,-32768,-32768, 162, 230, -20,-32768,-32768, --32768,-32768, 186,-32768, 172,-32768, 6,-32768,-32768, 351, - 351, 351, 351, 351, 364,-32768, 188,-32768, 164, 173, --32768, 108, 108, 108, 108, 108, 108, 108, 108, 108, - 108, 108, 108, 108, 108, 108, 108, 108, 108, 108, - 108, 108, 108, 108, 108, 14, 6, 108, 20,-32768, --32768,-32768,-32768,-32768, 6,-32768,-32768,-32768, 317, 290, - 260, 342, 342, 138, 138, 342, 342, 342, 342, 138, - 138, 351, 342, 342, 359, 158, 364, 109, 109,-32768, --32768,-32768, 141,-32768, 167,-32768,-32768,-32768,-32768, -13, --32768, -17,-32768,-32768,-32768,-32768,-32768,-32768,-32768, 14, - 6,-32768, 108,-32768,-32768,-32768,-32768, 227, 228,-32768 +static const short yypact[] = { 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 yypgoto[] = {-32768, --32768,-32768, 224,-32768,-32768,-32768, 148,-32768,-32768,-32768, - 183,-32768,-32768,-32768, 3, 149, -10, -65,-32768, 0, --32768,-32768, 91,-32768,-32768, -28,-32768,-32768,-32768,-32768, --32768,-32768,-32768,-32768,-32768,-32768, 182,-32768,-32768,-32768, - 2,-32768,-32768,-32768,-32768, 73,-32768,-32768,-32768,-32768, --32768,-32768, 24, 25, 31,-32768,-32768, 75, 110, 81, --32768, -32, 9,-32768,-32768, 216,-32768, 225, 279,-32768, --32768, 212, -76, 161,-32768, 219, -44 +-32768,-32768, 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 }; -#define YYLAST 401 +#define YYLAST 440 static const short yytable[] = { 15, - 49, 18, 10, 105, 78, 91, 95, 98, 53, 1, - 15, 41, 18, 1, 86, 81, 103, 213, 21, 69, - 176, -98, 226, 70, 177, 233, 71, 178, 78, 231, - 2, 234, 232, 67, 81, 58, 140, 141, 142, 143, - 144, 145, 146, 130, 147, 79, 68, 54, 2, 3, - -154, 136, 41, 3, 55, 4, 3, 3, 104, 4, - 176, 22, 4, 4, 177, -97, 22, 178, 15, 15, - 18, 18, 111, 22, 102, 189, 190, 191, 192, 193, - 194, 195, 196, 197, 198, 199, 200, 201, 202, 203, - 204, 205, 206, 207, 208, 209, 210, 211, 212, 65, - 80, 23, 24, 15, 25, 18, 23, 24, 64, 76, - 105, 112, 37, 23, 60, 53, 83, 77, 82, 50, - 51, 15, 15, 18, 18, 86, 49, 92, 113, 114, - 115, 116, 51, 54, 66, 117, 15, 84, 18, 118, - 119, 77, 101, 173, 174, 175, 77, -97, 23, 23, - 134, 120, 131, 37, 54, 121, -14, 4, 133, 122, - 123, 132, 165, 139, 105, 104, 168, 169, 170, -60, - 171, 172, 173, 174, 175, 15, 15, 18, 18, 219, - -64, -64, -89, -89, 15, 138, 18, 228, 170, 184, - 171, 172, 173, 174, 175, 152, 153, 154, 155, 156, - 157, 158, 159, 160, 161, 162, 163, 164, 229, 230, - 151, 185, 165, 166, 167, 187, 168, 169, 170, 104, - 171, 172, 173, 174, 175, 188, 239, 240, 48, 15, - 15, 18, 18, 219, 97, 129, 186, 152, 153, 154, - 155, 156, 157, 158, 159, 160, 161, 162, 163, 164, - 107, 227, 137, 235, 165, 166, 167, 237, 168, 169, - 170, 236, 171, 172, 173, 174, 175, 152, 153, 99, - 155, 156, 157, 158, 159, 160, 161, 162, 163, 164, - 100, 44, 126, 150, 165, 166, 167, 110, 168, 169, - 170, 0, 171, 172, 173, 174, 175, 152, 0, 0, - 155, 156, 157, 158, 159, 160, 161, 162, 163, 164, - 0, 0, 0, 0, 165, 166, 167, 0, 168, 169, - 170, 0, 171, 172, 173, 174, 175, 155, 156, 157, - 158, 159, 160, 161, 162, 163, 164, 0, 0, 0, - 0, 165, 166, 167, 0, 168, 169, 170, 0, 171, - 172, 173, 174, 175, 157, 158, 0, 0, 0, 0, - 163, 164, 0, 0, 0, 0, 165, 0, 0, 0, - 168, 169, 170, 0, 171, 172, 173, 174, 175, 168, - 169, 170, 0, 171, 172, 173, 174, 175, 169, 170, - 0, 171, 172, 173, 174, 175, 171, 172, 173, 174, - 175 + 109, 18, 10, 51, 60, 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, + 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 }; static const short yycheck[] = { 0, - 11, 0, 0, 69, 37, 50, 51, 52, 5, 4, - 11, 3, 11, 4, 4, 44, 4, 4, 4, 41, - 41, 3, 3, 45, 45, 43, 48, 48, 61, 43, - 39, 49, 46, 25, 63, 4, 113, 114, 115, 116, - 117, 118, 119, 88, 121, 37, 3, 44, 39, 44, - 40, 96, 44, 44, 51, 50, 44, 44, 69, 50, - 41, 4, 50, 50, 45, 47, 4, 48, 69, 70, - 69, 70, 70, 4, 66, 152, 153, 154, 155, 156, - 157, 158, 159, 160, 161, 162, 163, 164, 165, 166, - 167, 168, 169, 170, 171, 172, 173, 174, 175, 25, - 47, 44, 45, 104, 47, 104, 44, 45, 4, 4, - 176, 4, 3, 44, 24, 5, 51, 37, 44, 40, - 41, 122, 123, 122, 123, 4, 137, 4, 21, 22, - 23, 24, 41, 44, 25, 28, 137, 47, 137, 32, - 33, 61, 46, 35, 36, 37, 66, 47, 44, 44, - 4, 44, 40, 44, 44, 48, 40, 50, 43, 52, - 53, 42, 25, 46, 230, 176, 29, 30, 31, 42, - 33, 34, 35, 36, 37, 176, 177, 176, 177, 177, - 42, 43, 42, 43, 185, 42, 185, 185, 31, 4, - 33, 34, 35, 36, 37, 8, 9, 10, 11, 12, - 13, 14, 15, 16, 17, 18, 19, 20, 42, 43, - 49, 40, 25, 26, 27, 52, 29, 30, 31, 230, - 33, 34, 35, 36, 37, 53, 0, 0, 5, 230, - 231, 230, 231, 231, 52, 88, 49, 8, 9, 10, - 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, - 69, 179, 104, 230, 25, 26, 27, 233, 29, 30, - 31, 231, 33, 34, 35, 36, 37, 8, 9, 54, - 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, - 56, 3, 71, 123, 25, 26, 27, 69, 29, 30, - 31, -1, 33, 34, 35, 36, 37, 8, -1, -1, - 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, - -1, -1, -1, -1, 25, 26, 27, -1, 29, 30, - 31, -1, 33, 34, 35, 36, 37, 11, 12, 13, - 14, 15, 16, 17, 18, 19, 20, -1, -1, -1, - -1, 25, 26, 27, -1, 29, 30, 31, -1, 33, - 34, 35, 36, 37, 13, 14, -1, -1, -1, -1, - 19, 20, -1, -1, -1, -1, 25, -1, -1, -1, - 29, 30, 31, -1, 33, 34, 35, 36, 37, 29, - 30, 31, -1, 33, 34, 35, 36, 37, 30, 31, - -1, 33, 34, 35, 36, 37, 33, 34, 35, 36, - 37 + 72, 0, 0, 11, 23, 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 }; #define YYPURE 1 /* -*-C-*- Note some compilers choke on comments on `#line' lines. */ -#line 3 "D:/cygwin/usr/share/bison.simple" +#line 3 "/usr/share/bison.simple" /* This file comes from bison-1.28. */ /* Skeleton output parser for bison, @@ -664,7 +682,7 @@ __yy_memcpy (char *to, char *from, unsig #endif #endif -#line 217 "D:/cygwin/usr/share/bison.simple" +#line 217 "/usr/share/bison.simple" /* The user can define YYPARSE_PARAM as the name of an argument to be passed into yyparse. The argument should have type void *. @@ -993,7 +1011,7 @@ yyreduce: switch (yyn) { case 1: -#line 107 "compile.y" +#line 108 "compile.y" { Method& method=*NEW Method(POOL, *main_method_name, @@ -1005,7 +1023,7 @@ case 1: ; break;} case 8: -#line 124 "compile.y" +#line 125 "compile.y" { const String& command=*LA2S(yyvsp[-2]); YYSTYPE strings_code=yyvsp[0]; @@ -1073,11 +1091,11 @@ case 8: ; break;} case 12: -#line 190 "compile.y" +#line 191 "compile.y" { yyval=yyvsp[-1]; P(yyval, yyvsp[0]) ; break;} case 16: -#line 195 "compile.y" +#line 196 "compile.y" { const String *name=LA2S(yyvsp[-5]); @@ -1107,34 +1125,34 @@ case 16: ; break;} case 19: -#line 224 "compile.y" +#line 225 "compile.y" {yyval=yyvsp[-1]; break;} case 23: -#line 226 "compile.y" +#line 227 "compile.y" { yyval=yyvsp[-2]; P(yyval, yyvsp[0]) ; break;} case 29: -#line 234 "compile.y" +#line 235 "compile.y" { yyval=yyvsp[-1]; P(yyval, yyvsp[0]) ; break;} case 35: -#line 240 "compile.y" +#line 241 "compile.y" { yyval=yyvsp[0]; /* stack: resulting value */ O(yyval, OP_WRITE_VALUE); /* value=pop; wcontext.write(value) */ ; break;} case 36: -#line 244 "compile.y" +#line 245 "compile.y" { yyval=yyvsp[0] ; break;} case 39: -#line 246 "compile.y" +#line 247 "compile.y" { yyval=yyvsp[-1] ; break;} case 42: -#line 250 "compile.y" +#line 251 "compile.y" { yyval=N(POOL); Array *diving_code=yyvsp[0]; @@ -1152,22 +1170,22 @@ case 42: ; break;} case 43: -#line 265 "compile.y" +#line 266 "compile.y" { yyval=yyvsp[-1]; P(yyval, yyvsp[0]) ; break;} case 45: -#line 266 "compile.y" +#line 267 "compile.y" { yyval=yyvsp[-1]; P(yyval, yyvsp[0]) ; break;} case 46: -#line 270 "compile.y" +#line 271 "compile.y" { yyval=yyvsp[-1]; /* stack: context,name */ P(yyval, yyvsp[0]); /* stack: context,name,constructor_value */ ; break;} case 50: -#line 278 "compile.y" +#line 279 "compile.y" { yyval=N(POOL); Array *diving_code=yyvsp[0]; @@ -1185,7 +1203,7 @@ case 50: ; break;} case 51: -#line 293 "compile.y" +#line 294 "compile.y" { yyval=N(POOL); O(yyval, OP_WITH_WRITE); /* stack: starting context */ @@ -1193,11 +1211,11 @@ case 51: ; break;} case 52: -#line 298 "compile.y" +#line 299 "compile.y" { yyval=yyvsp[-1]; P(yyval, yyvsp[0]) ; break;} case 56: -#line 305 "compile.y" +#line 306 "compile.y" { // stack: context, name yyval=yyvsp[-1]; // stack: context, name, value @@ -1205,15 +1223,15 @@ case 56: ; break;} case 57: -#line 311 "compile.y" +#line 312 "compile.y" { // stack: context, name yyval=yyvsp[-1]; // stack: context, name, value - O(yyval, OP_CONSTRUCT_EXPR); /* value=pop; name=pop; context=pop; construct(context,name,value) */ + O(yyval, OP_CONSTRUCT_EXPR); /* value=pop->as_expr_result; name=pop; context=pop; construct(context,name,value) */ ; break;} case 58: -#line 317 "compile.y" +#line 318 "compile.y" { // stack: context, name yyval=N(POOL); @@ -1221,7 +1239,7 @@ case 58: ; break;} case 62: -#line 328 "compile.y" +#line 329 "compile.y" { yyval=N(POOL); O(yyval, OP_CREATE_EWPOOL); /* stack: empty write context */ @@ -1230,26 +1248,32 @@ case 62: ; break;} case 65: -#line 335 "compile.y" +#line 336 "compile.y" { yyval=yyvsp[-1]; P(yyval, yyvsp[0]) ; break;} case 66: -#line 339 "compile.y" +#line 340 "compile.y" { yyval=yyvsp[0]; /* stack: value */ O(yyval, OP_WRITE_VALUE); /* value=pop; wcontext.write(value) */ ; break;} case 67: -#line 343 "compile.y" -{ PC.object_constructor_allowed=true ; +#line 344 "compile.y" +{ + PC.object_constructor_allowed=true; + push_OCA(PC, true); + ; break;} case 68: -#line 344 "compile.y" -{ PC.object_constructor_allowed=false ; +#line 348 "compile.y" +{ + PC.object_constructor_allowed=false; + pop_OCA(PC); + ; break;} case 69: -#line 345 "compile.y" +#line 352 "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 */ @@ -1265,94 +1289,99 @@ case 69: ; break;} case 72: -#line 361 "compile.y" +#line 368 "compile.y" { yyval=yyvsp[-1]; P(yyval, yyvsp[0]) ; break;} case 76: -#line 367 "compile.y" +#line 374 "compile.y" {yyval=yyvsp[-1]; break;} case 77: -#line 368 "compile.y" +#line 375 "compile.y" {yyval=yyvsp[-1]; break;} case 78: -#line 369 "compile.y" +#line 376 "compile.y" {yyval=yyvsp[-1]; break;} case 80: -#line 372 "compile.y" +#line 379 "compile.y" { yyval=yyvsp[-2]; P(yyval, yyvsp[0]) ; break;} case 82: -#line 376 "compile.y" +#line 383 "compile.y" { yyval=yyvsp[-2]; P(yyval, yyvsp[0]) ; break;} case 84: -#line 380 "compile.y" +#line 387 "compile.y" { yyval=yyvsp[-2]; P(yyval, yyvsp[0]) ; break;} case 85: -#line 382 "compile.y" +#line 389 "compile.y" { yyval=yyvsp[0]; O(yyval, OP_STORE_PARAM); ; break;} case 86: -#line 386 "compile.y" +#line 393 "compile.y" { yyval=N(POOL); PEA(yyval, yyvsp[0]); ; break;} case 87: -#line 390 "compile.y" +#line 397 "compile.y" { yyval=N(POOL); PCA(yyval, yyvsp[0]); ; break;} case 91: -#line 399 "compile.y" +#line 406 "compile.y" { yyval=yyvsp[0]; O(yyval, OP_WRITE_EXPR_RESULT); ; break;} case 93: -#line 406 "compile.y" +#line 413 "compile.y" { yyval=yyvsp[-1]; P(yyval, yyvsp[0]) ; break;} case 95: -#line 408 "compile.y" +#line 415 "compile.y" { yyval=yyvsp[-1]; P(yyval, yyvsp[0]) ; break;} case 97: -#line 410 "compile.y" +#line 417 "compile.y" { + // we know that name_advance1 not called from ^xxx context + // so we'll not check for operator call possibility as we do in name_advance2 + /* stack: context */ yyval=yyvsp[0]; /* stack: context,name */ O(yyval, OP_GET_ELEMENT); /* name=pop; context=pop; stack: context.get_element(name) */ ; break;} case 98: -#line 415 "compile.y" +#line 425 "compile.y" { /* stack: context */ yyval=yyvsp[0]; /* stack: context,name */ - O(yyval, OP_GET_ELEMENT); /* name=pop; context=pop; stack: context.get_element(name) */ + O(yyval, 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; ; break;} -case 103: -#line 427 "compile.y" +case 104: +#line 440 "compile.y" { yyval=yyvsp[0]; O(yyval, OP_GET_ELEMENT); ; break;} -case 104: -#line 431 "compile.y" +case 105: +#line 444 "compile.y" { yyval=N(POOL); O(yyval, OP_CREATE_EWPOOL); @@ -1362,34 +1391,46 @@ case 104: O(yyval, OP_REDUCE_EWPOOL); ; break;} -case 105: -#line 439 "compile.y" +case 106: +#line 452 "compile.y" +{ + yyval=N(POOL); + O(yyval, OP_CREATE_EWPOOL); + P(yyval, yyvsp[-1]); + O(yyval, OP_REDUCE_EWPOOL); +; + break;} +case 107: +#line 458 "compile.y" { yyval=N(POOL); O(yyval, OP_WITH_READ); P(yyval, yyvsp[0]); ; break;} -case 107: -#line 444 "compile.y" +case 109: +#line 463 "compile.y" { yyval=yyvsp[-1]; P(yyval, yyvsp[0]) ; break;} -case 108: -#line 445 "compile.y" +case 110: +#line 464 "compile.y" { yyval=yyvsp[0]; O(yyval, OP_GET_ELEMENT__WRITE); ; break;} -case 111: -#line 454 "compile.y" +case 113: +#line 473 "compile.y" { + // drop allow code after "name:" + PC.operator_call_allowed=false; + yyval=yyvsp[-1]; // stack: class name string O(yyval, OP_GET_CLASS); ; break;} -case 112: -#line 458 "compile.y" +case 114: +#line 480 "compile.y" { yyval=yyvsp[-1]; if(!PC.object_constructor_allowed) { @@ -1399,151 +1440,159 @@ case 112: O(yyval, OP_PREPARE_TO_CONSTRUCT_OBJECT); ; break;} -case 113: -#line 470 "compile.y" +case 115: +#line 492 "compile.y" { if((yyval=yyvsp[0])->size()==2) // only one string literal in there? change_string_literal_to_double_literal(yyval); // make that string literal Double ; break;} -case 117: -#line 478 "compile.y" -{ yyval = yyvsp[-1]; ; - break;} -case 118: -#line 479 "compile.y" -{ yyval = yyvsp[-1]; ; - break;} case 119: -#line 480 "compile.y" +#line 500 "compile.y" { yyval = yyvsp[-1]; ; break;} case 120: -#line 482 "compile.y" -{ yyval=yyvsp[0]; O(yyval, OP_NEG) ; +#line 501 "compile.y" +{ yyval = yyvsp[-1]; ; break;} case 121: -#line 483 "compile.y" -{ yyval=yyvsp[0]; O(yyval, OP_INV) ; +#line 502 "compile.y" +{ yyval = yyvsp[-1]; ; break;} case 122: -#line 484 "compile.y" -{ yyval=yyvsp[0]; O(yyval, OP_NOT) ; +#line 504 "compile.y" +{ yyval=yyvsp[0]; O(yyval, OP_NEG) ; break;} case 123: -#line 485 "compile.y" -{ yyval=yyvsp[0]; O(yyval, OP_DEF) ; +#line 505 "compile.y" +{ yyval=yyvsp[0] ; break;} case 124: -#line 486 "compile.y" -{ yyval=yyvsp[0]; O(yyval, OP_IN) ; +#line 506 "compile.y" +{ yyval=yyvsp[0]; O(yyval, OP_INV) ; break;} case 125: -#line 487 "compile.y" -{ yyval=yyvsp[0]; O(yyval, OP_FEXISTS) ; +#line 507 "compile.y" +{ yyval=yyvsp[0]; O(yyval, OP_NOT) ; break;} case 126: -#line 488 "compile.y" -{ yyval=yyvsp[0]; O(yyval, OP_DEXISTS) ; +#line 508 "compile.y" +{ yyval=yyvsp[0]; O(yyval, OP_DEF) ; break;} case 127: -#line 490 "compile.y" -{ yyval=yyvsp[-2]; P(yyval, yyvsp[0]); O(yyval, OP_SUB) ; +#line 509 "compile.y" +{ yyval=yyvsp[0]; O(yyval, OP_IN) ; break;} case 128: -#line 491 "compile.y" -{ yyval=yyvsp[-2]; P(yyval, yyvsp[0]); O(yyval, OP_ADD) ; +#line 510 "compile.y" +{ yyval=yyvsp[0]; O(yyval, OP_FEXISTS) ; break;} case 129: -#line 492 "compile.y" -{ yyval=yyvsp[-2]; P(yyval, yyvsp[0]); O(yyval, OP_MUL) ; +#line 511 "compile.y" +{ yyval=yyvsp[0]; O(yyval, OP_DEXISTS) ; break;} case 130: -#line 493 "compile.y" -{ yyval=yyvsp[-2]; P(yyval, yyvsp[0]); O(yyval, OP_DIV) ; +#line 513 "compile.y" +{ yyval=yyvsp[-2]; P(yyval, yyvsp[0]); O(yyval, OP_SUB) ; break;} case 131: -#line 494 "compile.y" -{ yyval=yyvsp[-2]; P(yyval, yyvsp[0]); O(yyval, OP_MOD) ; +#line 514 "compile.y" +{ yyval=yyvsp[-2]; P(yyval, yyvsp[0]); O(yyval, OP_ADD) ; break;} case 132: -#line 495 "compile.y" -{ yyval=yyvsp[-2]; P(yyval, yyvsp[0]); O(yyval, OP_BIN_AND) ; +#line 515 "compile.y" +{ yyval=yyvsp[-2]; P(yyval, yyvsp[0]); O(yyval, OP_MUL) ; break;} case 133: -#line 496 "compile.y" -{ yyval=yyvsp[-2]; P(yyval, yyvsp[0]); O(yyval, OP_BIN_OR) ; +#line 516 "compile.y" +{ yyval=yyvsp[-2]; P(yyval, yyvsp[0]); O(yyval, OP_DIV) ; break;} case 134: -#line 497 "compile.y" -{ yyval=yyvsp[-2]; P(yyval, yyvsp[0]); O(yyval, OP_BIN_XOR) ; +#line 517 "compile.y" +{ yyval=yyvsp[-2]; P(yyval, yyvsp[0]); O(yyval, OP_MOD) ; break;} case 135: -#line 498 "compile.y" -{ yyval=yyvsp[-2]; P(yyval, yyvsp[0]); O(yyval, OP_LOG_AND) ; +#line 518 "compile.y" +{ yyval=yyvsp[-2]; P(yyval, yyvsp[0]); O(yyval, OP_INTDIV) ; break;} case 136: -#line 499 "compile.y" -{ yyval=yyvsp[-2]; P(yyval, yyvsp[0]); O(yyval, OP_LOG_OR) ; +#line 519 "compile.y" +{ yyval=yyvsp[-2]; P(yyval, yyvsp[0]); O(yyval, OP_BIN_AND) ; break;} case 137: -#line 500 "compile.y" -{ yyval=yyvsp[-2]; P(yyval, yyvsp[0]); O(yyval, OP_LOG_XOR) ; +#line 520 "compile.y" +{ yyval=yyvsp[-2]; P(yyval, yyvsp[0]); O(yyval, OP_BIN_OR) ; break;} case 138: -#line 501 "compile.y" -{ yyval=yyvsp[-2]; P(yyval, yyvsp[0]); O(yyval, OP_NUM_LT) ; +#line 521 "compile.y" +{ yyval=yyvsp[-2]; P(yyval, yyvsp[0]); O(yyval, OP_BIN_XOR) ; break;} case 139: -#line 502 "compile.y" -{ yyval=yyvsp[-2]; P(yyval, yyvsp[0]); O(yyval, OP_NUM_GT) ; +#line 522 "compile.y" +{ yyval=yyvsp[-2]; PNC(yyval, yyvsp[0]); O(yyval, OP_LOG_AND) ; break;} case 140: -#line 503 "compile.y" -{ yyval=yyvsp[-2]; P(yyval, yyvsp[0]); O(yyval, OP_NUM_LE) ; +#line 523 "compile.y" +{ yyval=yyvsp[-2]; PNC(yyval, yyvsp[0]); O(yyval, OP_LOG_OR) ; break;} case 141: -#line 504 "compile.y" -{ yyval=yyvsp[-2]; P(yyval, yyvsp[0]); O(yyval, OP_NUM_GE) ; +#line 524 "compile.y" +{ yyval=yyvsp[-2]; P(yyval, yyvsp[0]); O(yyval, OP_LOG_XOR) ; break;} case 142: -#line 505 "compile.y" -{ yyval=yyvsp[-2]; P(yyval, yyvsp[0]); O(yyval, OP_NUM_EQ) ; +#line 525 "compile.y" +{ yyval=yyvsp[-2]; P(yyval, yyvsp[0]); O(yyval, OP_NUM_LT) ; break;} case 143: -#line 506 "compile.y" -{ yyval=yyvsp[-2]; P(yyval, yyvsp[0]); O(yyval, OP_NUM_NE) ; +#line 526 "compile.y" +{ yyval=yyvsp[-2]; P(yyval, yyvsp[0]); O(yyval, OP_NUM_GT) ; break;} case 144: -#line 507 "compile.y" -{ yyval=yyvsp[-2]; P(yyval, yyvsp[0]); O(yyval, OP_STR_LT) ; +#line 527 "compile.y" +{ yyval=yyvsp[-2]; P(yyval, yyvsp[0]); O(yyval, OP_NUM_LE) ; break;} case 145: -#line 508 "compile.y" -{ yyval=yyvsp[-2]; P(yyval, yyvsp[0]); O(yyval, OP_STR_GT) ; +#line 528 "compile.y" +{ yyval=yyvsp[-2]; P(yyval, yyvsp[0]); O(yyval, OP_NUM_GE) ; break;} case 146: -#line 509 "compile.y" -{ yyval=yyvsp[-2]; P(yyval, yyvsp[0]); O(yyval, OP_STR_LE) ; +#line 529 "compile.y" +{ yyval=yyvsp[-2]; P(yyval, yyvsp[0]); O(yyval, OP_NUM_EQ) ; break;} case 147: -#line 510 "compile.y" -{ yyval=yyvsp[-2]; P(yyval, yyvsp[0]); O(yyval, OP_STR_GE) ; +#line 530 "compile.y" +{ yyval=yyvsp[-2]; P(yyval, yyvsp[0]); O(yyval, OP_NUM_NE) ; break;} case 148: -#line 511 "compile.y" -{ yyval=yyvsp[-2]; P(yyval, yyvsp[0]); O(yyval, OP_STR_EQ) ; +#line 531 "compile.y" +{ yyval=yyvsp[-2]; P(yyval, yyvsp[0]); O(yyval, OP_STR_LT) ; break;} case 149: -#line 512 "compile.y" -{ yyval=yyvsp[-2]; P(yyval, yyvsp[0]); O(yyval, OP_STR_NE) ; +#line 532 "compile.y" +{ yyval=yyvsp[-2]; P(yyval, yyvsp[0]); O(yyval, OP_STR_GT) ; break;} case 150: -#line 513 "compile.y" -{ yyval=yyvsp[-2]; P(yyval, yyvsp[0]); O(yyval, OP_IS) ; +#line 533 "compile.y" +{ yyval=yyvsp[-2]; P(yyval, yyvsp[0]); O(yyval, OP_STR_LE) ; break;} case 151: -#line 516 "compile.y" +#line 534 "compile.y" +{ yyval=yyvsp[-2]; P(yyval, yyvsp[0]); O(yyval, OP_STR_GE) ; + break;} +case 152: +#line 535 "compile.y" +{ yyval=yyvsp[-2]; P(yyval, yyvsp[0]); O(yyval, OP_STR_EQ) ; + break;} +case 153: +#line 536 "compile.y" +{ yyval=yyvsp[-2]; P(yyval, yyvsp[0]); O(yyval, OP_STR_NE) ; + break;} +case 154: +#line 537 "compile.y" +{ yyval=yyvsp[-2]; P(yyval, yyvsp[0]); O(yyval, OP_IS) ; + break;} +case 155: +#line 540 "compile.y" { yyval=N(POOL); O(yyval, OP_CREATE_SWPOOL); /* stack: empty write context */ @@ -1551,24 +1600,24 @@ case 151: O(yyval, OP_REDUCE_SWPOOL); /* context=pop; stack: context.get_string() */ ; break;} -case 152: -#line 525 "compile.y" +case 156: +#line 549 "compile.y" { // optimized from OP_STRING+OP_WRITE_VALUE to OP_STRING__WRITE change_string_literal_to_write_string_literal(yyval=yyvsp[0]) ; break;} -case 153: -#line 530 "compile.y" +case 157: +#line 554 "compile.y" { yyval=VL(NEW VVoid(POOL)) ; break;} -case 154: -#line 531 "compile.y" +case 158: +#line 555 "compile.y" { yyval=N(POOL) ; break;} } /* the action file gets copied in in place of this dollarsign */ -#line 543 "D:/cygwin/usr/share/bison.simple" +#line 543 "/usr/share/bison.simple" yyvsp -= yylen; yyssp -= yylen; @@ -1788,7 +1837,7 @@ yyerrhandle: } return 1; } -#line 533 "compile.y" +#line 557 "compile.y" #endif @@ -1809,7 +1858,7 @@ yyerrhandle: */ static int yylex(YYSTYPE *lvalp, void *pc) { - #define lexical_brackets_nestage PC.brackets_nestages[PC.sp] + #define lexical_brackets_nestage PC.brackets_nestages[PC.ls_sp] #define RC {result=c; goto break2; } register int c; @@ -1827,6 +1876,7 @@ static int yylex(YYSTYPE *lvalp, void *p int skip_analized=0; while(true) { c=*(end=(PC.source++)); +// fprintf(stderr, "\nchar: %c %02X; nestage: %d, sp=%d", c, c, lexical_brackets_nestage, PC.sp); if(c=='\n') { PC.line++; @@ -1834,25 +1884,57 @@ static int yylex(YYSTYPE *lvalp, void *p } else PC.col++; - if(c=='^' && PC.ls!=LS_COMMENT && PC.ls!=LS_DEF_COMMENT) + if(c=='@' && PC.col==0+1) { + if(PC.ls==LS_DEF_SPECIAL_BODY) { + // @SPECIAL + // ... + // @APPEND_CLEAN(begin, end-begin, PC.file, begin_line); } // reset piece 'begin' position & line - begin=PC.source; // ^ + end=begin=PC.source; // ^ begin_line=PC.line; - // skip over ^ and _ - PC.source++; PC.col++; - // skip analysis = forced literal - continue; + 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; + } // converting ^#HH into char(hex(HH)) case '#': @@ -1882,6 +1964,8 @@ static int yylex(YYSTYPE *lvalp, void *p } break; } + break; + } // #comment start skipping if(c=='#' && PC.col==1) { if(end!=begin) { @@ -1890,11 +1974,13 @@ static int yylex(YYSTYPE *lvalp, void *p } // fall into COMMENT lexical state [wait for \n] push_LS(PC, LS_COMMENT); + continue; } switch(PC.ls) { // USER'S = NOT OURS case LS_USER: + case LS_NAME_SQUARE_PART: // name.[here].xxx if(PC.trim_bof) switch(c) { case '\n': case ' ': case '\t': @@ -1906,16 +1992,21 @@ static int yylex(YYSTYPE *lvalp, void *p } switch(c) { case '$': - push_LS(PC, LS_VAR_NAME_SIMPLE); + push_LS(PC, LS_VAR_NAME_SIMPLE_WITH_COLON); RC; case '^': push_LS(PC, LS_METHOD_NAME); RC; - case '@': - if(PC.col==0+1) { - push_LS(PC, LS_DEF_NAME); - RC; - } + case ']': + if(PC.ls==LS_NAME_SQUARE_PART) + if(--lexical_brackets_nestage==0) {// $name.[co<]?>de<]?> + pop_LS(PC); // $name.[co<]>de<]!> + RC; + } + break; + case '[': // $name.[co<[>de] + if(PC.ls==LS_NAME_SQUARE_PART) + lexical_brackets_nestage++; break; } break; @@ -1946,7 +2037,7 @@ static int yylex(YYSTYPE *lvalp, void *p } break; case '$': - push_LS(PC, LS_VAR_NAME_SIMPLE); + push_LS(PC, LS_VAR_NAME_SIMPLE_WITH_COLON); RC; case '^': push_LS(PC, LS_METHOD_NAME); @@ -2001,19 +2092,8 @@ static int yylex(YYSTYPE *lvalp, void *p break; case LS_DEF_SPECIAL_BODY: - // @todo in case - // ################ - // @next-method - // we are here with c=='@' - // which is wrong, and need action - if(c=='\n') { - switch(*PC.source) { - case '@': case 0: // end of special_code - pop_LS(PC); - break; - } + if(c=='\n') RC; - } break; // (EXPRESSION) @@ -2028,7 +2108,7 @@ static int yylex(YYSTYPE *lvalp, void *p pop_LS(PC); // return to normal life RC; case '$': - push_LS(PC, LS_EXPRESSION_VAR_NAME); + push_LS(PC, LS_EXPRESSION_VAR_NAME_WITH_COLON); RC; case '^': push_LS(PC, LS_METHOD_NAME); @@ -2051,7 +2131,7 @@ static int yylex(YYSTYPE *lvalp, void *p goto break2; } goto break2; - case '+': case '*': case '/': case '%': + case '+': case '*': case '/': case '%': case '\\': case '~': case ';': RC; @@ -2138,10 +2218,13 @@ static int yylex(YYSTYPE *lvalp, void *p break; // VARIABLE GET/PUT/WITH - case LS_VAR_NAME_SIMPLE: - case LS_EXPRESSION_VAR_NAME: - case LS_VAR_NAME_NO_COLON: - if(PC.ls==LS_EXPRESSION_VAR_NAME) { + case LS_VAR_NAME_SIMPLE_WITH_COLON: + case LS_VAR_NAME_SIMPLE_WITHOUT_COLON: + case LS_EXPRESSION_VAR_NAME_WITH_COLON: + case LS_EXPRESSION_VAR_NAME_WITHOUT_COLON: + if( + PC.ls==LS_EXPRESSION_VAR_NAME_WITH_COLON || + PC.ls==LS_EXPRESSION_VAR_NAME_WITHOUT_COLON) { // name in expr ends also before binary operators switch(c) { case '-': @@ -2151,7 +2234,9 @@ static int yylex(YYSTYPE *lvalp, void *p goto break2; } } - if(PC.ls==LS_VAR_NAME_NO_COLON) { + if( + PC.ls==LS_VAR_NAME_SIMPLE_WITHOUT_COLON || + PC.ls==LS_EXPRESSION_VAR_NAME_WITHOUT_COLON) { // name already has ':', stop before next switch(c) { case ':': @@ -2180,6 +2265,16 @@ static int yylex(YYSTYPE *lvalp, void *p result=EON; goto break2; case '[': + // $name.<[>code] + if(PC.col>1/*not first column*/ && ( + end[-1]=='$'/*was start of get*/ || + end[-1]==':'/*was class name delim */ || + end[-1]=='.'/*was name delim */ + )) { + push_LS(PC, LS_NAME_SQUARE_PART); + lexical_brackets_nestage=1; + RC; + } PC.ls=LS_VAR_SQUARE; lexical_brackets_nestage=1; RC; @@ -2198,14 +2293,24 @@ static int yylex(YYSTYPE *lvalp, void *p RC; case '.': // name part delim case '$': // name part subvar - case ':': // ':name' or 'class:name' - PC.ls=LS_VAR_NAME_NO_COLON; // stop before next ':' + case ':': // class<:>name + // go to _WITHOUT_COLON state variant... + if(PC.ls==LS_VAR_NAME_SIMPLE_WITH_COLON) + PC.ls=LS_VAR_NAME_SIMPLE_WITHOUT_COLON; + else if(PC.ls==LS_EXPRESSION_VAR_NAME_WITH_COLON) + PC.ls=LS_EXPRESSION_VAR_NAME_WITHOUT_COLON; + // ...stop before next ':' RC; } break; case LS_VAR_NAME_CURLY: switch(c) { + case '[': + // ${name.<[>code]} + push_LS(PC, LS_NAME_SQUARE_PART); + lexical_brackets_nestage=1; + RC; case '}': // ${name} finished, restoring LS pop_LS(PC); RC; @@ -2219,7 +2324,7 @@ static int yylex(YYSTYPE *lvalp, void *p case LS_VAR_SQUARE: switch(c) { case '$': - push_LS(PC, LS_VAR_NAME_SIMPLE); + push_LS(PC, LS_VAR_NAME_SIMPLE_WITH_COLON); RC; case '^': push_LS(PC, LS_METHOD_NAME); @@ -2241,7 +2346,7 @@ static int yylex(YYSTYPE *lvalp, void *p case LS_VAR_CURLY: switch(c) { case '$': - push_LS(PC, LS_VAR_NAME_SIMPLE); + push_LS(PC, LS_VAR_NAME_SIMPLE_WITH_COLON); RC; case '^': push_LS(PC, LS_METHOD_NAME); @@ -2262,6 +2367,16 @@ static int yylex(YYSTYPE *lvalp, void *p case LS_METHOD_NAME: switch(c) { case '[': + // ^name.<[>code].xxx + if(PC.col>1/*not first column*/ && ( + end[-1]=='^'/*was start of call*/ || // never, ^[ is literal... + end[-1]==':'/*was class name delim */ || + end[-1]=='.'/*was name delim */ + )) { + push_LS(PC, LS_NAME_SQUARE_PART); + lexical_brackets_nestage=1; + RC; + } PC.ls=LS_METHOD_SQUARE; lexical_brackets_nestage=1; RC; @@ -2276,6 +2391,8 @@ static int yylex(YYSTYPE *lvalp, void *p case '.': // name part delim case '$': // name part subvar case ':': // ':name' or 'class:name' + case '^': // ^abc^xxx wrong. bailing out + case ']': case '}': case ')': // ^abc]}) wrong. bailing out RC; } break; @@ -2283,7 +2400,7 @@ static int yylex(YYSTYPE *lvalp, void *p case LS_METHOD_SQUARE: switch(c) { case '$': - push_LS(PC, LS_VAR_NAME_SIMPLE); + push_LS(PC, LS_VAR_NAME_SIMPLE_WITH_COLON); RC; case '^': push_LS(PC, LS_METHOD_NAME); @@ -2305,7 +2422,7 @@ static int yylex(YYSTYPE *lvalp, void *p case LS_METHOD_CURLY: switch(c) { case '$': - push_LS(PC, LS_VAR_NAME_SIMPLE); + push_LS(PC, LS_VAR_NAME_SIMPLE_WITH_COLON); RC; case '^': push_LS(PC, LS_METHOD_NAME);