--- parser3/src/main/compile.tab.C 2003/09/25 09:15:02 1.89 +++ parser3/src/main/compile.tab.C 2004/04/06 09:01:20 1.97 @@ -11,7 +11,7 @@ #define BAD_HEX_LITERAL 261 #define BAD_METHOD_DECL_START 262 #define BAD_METHOD_PARAMETER_NAME_CHARACTER 263 -#define BAD_MATH_OPERATOR_CHARACTER 264 +#define BAD_NONWHITESPACE_CHARACTER_IN_EXPLICIT_RESULT_MODE 264 #define LAND 265 #define LOR 266 #define LXOR 267 @@ -43,7 +43,7 @@ Copyright (c) 2001, 2003 ArtLebedev Group (http://www.artlebedev.com) Author: Alexander Petrosyan (http://design.ru/paf) - $Id: compile.tab.C,v 1.89 2003/09/25 09:15:02 paf Exp $ + $Id: compile.tab.C,v 1.97 2004/04/06 09:01:20 paf Exp $ */ /** @@ -86,7 +86,6 @@ static int real_yyerror(Parse_control* p static void yyprint(FILE* file, int type, YYSTYPE value); static int yylex(YYSTYPE* lvalp, void* pc); - // local convinient inplace typecast & var #undef PC #define PC (*(Parse_control *)pc) @@ -106,11 +105,11 @@ static int yylex(YYSTYPE* lvalp, void* p -#define YYFINAL 252 +#define YYFINAL 253 #define YYFLAG -32768 #define YYNTBASE 60 -#define YYTRANSLATE(x) ((unsigned)(x) <= 286 ? yytranslate[x] : 139) +#define YYTRANSLATE(x) ((unsigned)(x) <= 286 ? yytranslate[x] : 140) static const char yytranslate[] = { 0, 2, 2, 2, 2, 2, 2, 2, 2, 2, 46, @@ -147,91 +146,93 @@ static const char yytranslate[] = { #if YYDEBUG != 0 static const short yyprhs[] = { 0, 0, 2, 4, 6, 9, 11, 13, 15, 20, 22, - 24, 26, 29, 32, 34, 36, 44, 46, 48, 52, - 54, 56, 58, 62, 64, 66, 68, 70, 72, 75, - 77, 79, 81, 83, 85, 87, 90, 93, 95, 99, - 101, 103, 105, 108, 110, 113, 117, 119, 121, 123, - 125, 128, 131, 133, 135, 137, 141, 145, 149, 151, - 153, 155, 157, 159, 161, 164, 166, 167, 168, 175, - 177, 179, 182, 184, 186, 188, 192, 196, 200, 202, - 206, 208, 212, 214, 218, 220, 222, 224, 226, 228, - 230, 232, 234, 237, 239, 242, 245, 247, 249, 252, - 254, 256, 258, 260, 263, 266, 270, 272, 274, 277, - 280, 282, 284, 287, 290, 292, 294, 296, 298, 302, - 306, 310, 313, 316, 319, 322, 325, 328, 331, 334, - 338, 342, 346, 350, 354, 358, 362, 366, 370, 374, - 378, 382, 386, 390, 394, 398, 402, 406, 410, 414, - 418, 422, 426, 430, 434, 438, 442, 444, 446, 447 + 24, 26, 29, 32, 34, 36, 37, 46, 48, 50, + 54, 56, 58, 60, 64, 66, 68, 70, 72, 74, + 77, 79, 81, 83, 85, 87, 89, 92, 95, 97, + 101, 103, 105, 107, 110, 112, 115, 119, 121, 123, + 125, 127, 130, 133, 135, 137, 139, 143, 147, 151, + 153, 155, 157, 159, 161, 163, 166, 168, 169, 170, + 177, 179, 181, 184, 186, 188, 190, 194, 198, 202, + 204, 208, 210, 214, 216, 220, 222, 224, 226, 228, + 230, 232, 234, 236, 239, 241, 244, 247, 249, 251, + 254, 256, 258, 260, 262, 265, 268, 272, 274, 276, + 279, 282, 284, 286, 289, 292, 294, 296, 298, 300, + 304, 308, 312, 315, 318, 321, 324, 327, 330, 333, + 336, 340, 344, 348, 352, 356, 360, 364, 368, 372, + 376, 380, 384, 388, 392, 396, 400, 404, 408, 412, + 416, 420, 424, 428, 432, 436, 440, 444, 446, 448, + 449 }; 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, 61, 0, 63, 0, 61, 63, 0, 76, 0, + 64, 0, 69, 0, 45, 4, 46, 65, 0, 139, 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 + 0, 139, 0, 4, 0, 0, 45, 4, 72, 71, + 75, 46, 70, 76, 0, 139, 0, 72, 0, 47, + 73, 48, 0, 139, 0, 74, 0, 4, 0, 74, + 49, 4, 0, 139, 0, 4, 0, 139, 0, 77, + 0, 78, 0, 77, 78, 0, 137, 0, 79, 0, + 80, 0, 88, 0, 101, 0, 81, 0, 50, 82, + 0, 84, 3, 0, 83, 0, 51, 84, 52, 0, + 85, 0, 86, 0, 87, 0, 131, 87, 0, 123, + 0, 120, 123, 0, 50, 89, 93, 0, 90, 0, + 91, 0, 92, 0, 119, 0, 53, 119, 0, 131, + 119, 0, 94, 0, 95, 0, 96, 0, 47, 97, + 48, 0, 54, 134, 55, 0, 51, 76, 52, 0, + 138, 0, 4, 0, 98, 0, 99, 0, 100, 0, + 79, 0, 78, 77, 0, 102, 0, 0, 0, 56, + 103, 105, 104, 106, 3, 0, 84, 0, 107, 0, + 106, 107, 0, 108, 0, 109, 0, 110, 0, 47, + 111, 48, 0, 54, 112, 55, 0, 51, 113, 52, + 0, 114, 0, 111, 49, 114, 0, 115, 0, 112, + 49, 115, 0, 116, 0, 113, 49, 116, 0, 117, + 0, 118, 0, 76, 0, 138, 0, 4, 0, 98, + 0, 134, 0, 124, 0, 120, 124, 0, 121, 0, + 120, 121, 0, 122, 53, 0, 124, 0, 124, 0, + 4, 5, 0, 4, 0, 125, 0, 126, 0, 127, + 0, 50, 128, 0, 4, 129, 0, 47, 77, 48, + 0, 4, 0, 130, 0, 129, 130, 0, 50, 128, + 0, 132, 0, 133, 0, 4, 57, 0, 132, 57, + 0, 135, 0, 4, 0, 81, 0, 102, 0, 58, + 136, 58, 0, 59, 136, 59, 0, 54, 135, 55, + 0, 37, 135, 0, 36, 135, 0, 43, 135, 0, + 44, 135, 0, 27, 135, 0, 28, 135, 0, 29, + 135, 0, 30, 135, 0, 135, 37, 135, 0, 135, + 36, 135, 0, 135, 38, 135, 0, 135, 39, 135, + 0, 135, 41, 135, 0, 135, 40, 135, 0, 135, + 19, 135, 0, 135, 20, 135, 0, 135, 35, 135, + 0, 135, 34, 135, 0, 135, 14, 135, 0, 135, + 11, 135, 0, 135, 12, 135, 0, 135, 13, 135, + 0, 135, 32, 135, 0, 135, 33, 135, 0, 135, + 15, 135, 0, 135, 16, 135, 0, 135, 17, 135, + 0, 135, 18, 135, 0, 135, 21, 135, 0, 135, + 22, 135, 0, 135, 23, 135, 0, 135, 24, 135, + 0, 135, 25, 135, 0, 135, 26, 135, 0, 135, + 31, 135, 0, 76, 0, 4, 0, 0, 0 }; #endif #if YYDEBUG != 0 static const short yyrline[] = { 0, - 121, 129, 131, 131, 132, 134, 134, 136, 208, 208, - 209, 209, 210, 211, 211, 213, 242, 242, 243, 244, - 244, 245, 245, 247, 247, 251, 251, 253, 253, 254, - 254, 255, 255, 255, 259, 266, 267, 267, 268, 269, - 271, 272, 294, 295, 295, 299, 303, 305, 306, 307, - 324, 329, 331, 333, 334, 336, 342, 350, 356, 358, - 359, 361, 367, 368, 368, 372, 378, 381, 384, 397, - 399, 399, 400, 402, 403, 405, 406, 407, 408, 410, - 412, 414, 416, 418, 420, 424, 428, 432, 434, 435, - 437, 446, 446, 448, 448, 449, 450, 458, 463, 465, - 467, 468, 469, 471, 475, 484, 490, 495, 495, 496, - 501, 503, 505, 517, 529, 534, 536, 537, 538, 539, - 540, 542, 543, 544, 545, 546, 547, 548, 549, 551, - 552, 553, 554, 555, 556, 557, 558, 559, 560, 561, - 562, 563, 564, 565, 566, 567, 568, 569, 570, 571, - 572, 573, 574, 575, 576, 577, 580, 589, 594, 595 + 120, 128, 130, 130, 131, 133, 133, 135, 207, 207, + 208, 208, 209, 210, 210, 212, 247, 252, 252, 253, + 254, 254, 255, 255, 257, 257, 261, 261, 263, 263, + 264, 264, 265, 265, 265, 269, 276, 277, 277, 278, + 279, 281, 282, 304, 305, 305, 309, 313, 315, 316, + 317, 334, 339, 341, 343, 344, 346, 352, 360, 366, + 368, 369, 371, 377, 378, 378, 382, 388, 391, 394, + 407, 409, 409, 410, 412, 413, 415, 416, 417, 418, + 420, 422, 424, 426, 428, 430, 434, 438, 442, 444, + 445, 447, 456, 456, 458, 458, 459, 460, 468, 473, + 475, 477, 478, 479, 481, 485, 494, 500, 505, 505, + 506, 511, 513, 515, 527, 539, 544, 546, 547, 548, + 549, 550, 552, 553, 554, 555, 556, 557, 558, 559, + 561, 562, 563, 564, 565, 566, 567, 568, 569, 570, + 571, 572, 573, 574, 575, 576, 577, 578, 579, 580, + 581, 582, 583, 584, 585, 586, 587, 590, 599, 604, + 605 }; #endif @@ -240,21 +241,21 @@ 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", -"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", +"BAD_METHOD_PARAMETER_NAME_CHARACTER","BAD_NONWHITESPACE_CHARACTER_IN_EXPLICIT_RESULT_MODE", +"\"&&\"","\"||\"","\"!||\"","\"!|\"","\"<=\"","\">=\"","\"==\"","\"!=\"","\"<<\"", +"\">>\"","\"lt\"","\"gt\"","\"le\"","\"ge\"","\"eq\"","\"ne\"","\"def\"","\"in\"", +"\"-f\"","\"-d\"","\"is\"","'<'","'>'","'|'","'&'","'+'","'-'","'*'","'/'","'\\\\'", +"'%'","NUNARY","'~'","'!'","'@'","'\\n'","'['","']'","';'","'$'","'{'","'}'", +"'.'","'('","')'","'^'","':'","'\\\"'","'\\''","all","methods","one_big_piece", +"method","control_method","maybe_control_strings","control_strings","control_string", +"maybe_string","code_method","@1","maybe_bracketed_strings","bracketed_maybe_strings", "maybe_strings","strings","maybe_comment","maybe_codes","codes","code","action", "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", +"call","call_value","@2","@3","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", @@ -267,230 +268,230 @@ static const char * const yytname[] = { static const short yyr1[] = { 0, 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 + 66, 66, 67, 68, 68, 70, 69, 71, 71, 72, + 73, 73, 74, 74, 75, 75, 76, 76, 77, 77, + 78, 78, 79, 79, 79, 80, 81, 82, 82, 83, + 84, 84, 85, 86, 87, 87, 88, 89, 89, 89, + 90, 91, 92, 93, 93, 93, 94, 95, 96, 97, + 97, 97, 98, 99, 100, 100, 101, 103, 104, 102, + 105, 106, 106, 107, 107, 107, 108, 109, 110, 111, + 111, 112, 112, 113, 113, 114, 115, 116, 117, 117, + 117, 118, 119, 119, 120, 120, 121, 122, 123, 123, + 124, 124, 124, 124, 125, 126, 127, 128, 129, 129, + 130, 131, 131, 132, 133, 134, 135, 135, 135, 135, + 135, 135, 135, 135, 135, 135, 135, 135, 135, 135, + 135, 135, 135, 135, 135, 135, 135, 135, 135, 135, + 135, 135, 135, 135, 135, 135, 135, 135, 135, 135, + 135, 135, 135, 135, 135, 135, 135, 136, 137, 138, + 139 }; static const short yyr2[] = { 0, 1, 1, 1, 2, 1, 1, 1, 4, 1, 1, - 1, 2, 2, 1, 1, 7, 1, 1, 3, 1, - 1, 1, 3, 1, 1, 1, 1, 1, 2, 1, - 1, 1, 1, 1, 1, 2, 2, 1, 3, 1, - 1, 1, 2, 1, 2, 3, 1, 1, 1, 1, - 2, 2, 1, 1, 1, 3, 3, 3, 1, 1, - 1, 1, 1, 1, 2, 1, 0, 0, 6, 1, - 1, 2, 1, 1, 1, 3, 3, 3, 1, 3, - 1, 3, 1, 3, 1, 1, 1, 1, 1, 1, - 1, 1, 2, 1, 2, 2, 1, 1, 2, 1, - 1, 1, 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, + 1, 2, 2, 1, 1, 0, 8, 1, 1, 3, + 1, 1, 1, 3, 1, 1, 1, 1, 1, 2, + 1, 1, 1, 1, 1, 1, 2, 2, 1, 3, + 1, 1, 1, 2, 1, 2, 3, 1, 1, 1, + 1, 2, 2, 1, 1, 1, 3, 3, 3, 1, + 1, 1, 1, 1, 1, 2, 1, 0, 0, 6, + 1, 1, 2, 1, 1, 1, 3, 3, 3, 1, + 3, 1, 3, 1, 3, 1, 1, 1, 1, 1, + 1, 1, 1, 2, 1, 2, 2, 1, 1, 2, + 1, 1, 1, 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, 3, 3, 3, 3, 3, 1, 1, 0, 0 + 3, 3, 3, 3, 3, 3, 3, 1, 1, 0, + 0 }; -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, 160, 160, 160, 99, 0, 113, 105, 108, 0, - 107, 104, 0, 0, 98, 0, 100, 51, 0, 92, - 37, 159, 160, 0, 46, 53, 54, 55, 100, 95, - 45, 93, 96, 43, 52, 114, 70, 68, 15, 8, - 10, 11, 0, 9, 22, 0, 21, 20, 160, 18, - 17, 110, 109, 106, 39, 93, 158, 0, 31, 0, - 61, 62, 63, 59, 0, 116, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 160, 160, 117, 118, - 0, 115, 0, 12, 14, 13, 19, 0, 25, 0, - 24, 65, 56, 58, 126, 127, 128, 129, 123, 122, - 124, 125, 0, 157, 0, 0, 57, 0, 0, 0, +static const short yydefact[] = { 161, + 159, 0, 0, 68, 2, 1, 3, 6, 7, 5, + 28, 29, 32, 33, 36, 34, 35, 67, 31, 27, + 0, 101, 0, 0, 0, 0, 37, 39, 0, 41, + 42, 43, 0, 48, 49, 50, 51, 0, 95, 0, + 45, 93, 102, 103, 104, 0, 112, 113, 0, 4, + 30, 161, 161, 161, 100, 0, 114, 106, 109, 0, + 108, 105, 0, 0, 99, 0, 101, 52, 0, 93, + 38, 160, 161, 0, 47, 54, 55, 56, 101, 96, + 46, 94, 97, 44, 53, 115, 71, 69, 15, 8, + 10, 11, 0, 9, 23, 0, 22, 21, 161, 19, + 18, 111, 110, 107, 40, 94, 159, 0, 32, 0, + 62, 63, 64, 60, 0, 117, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 161, 161, 118, 119, + 0, 116, 0, 12, 14, 13, 20, 0, 26, 0, + 25, 66, 57, 59, 127, 128, 129, 130, 124, 123, + 125, 126, 0, 158, 0, 0, 58, 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, 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 + 0, 0, 0, 0, 160, 161, 0, 0, 72, 74, + 75, 76, 24, 16, 122, 120, 121, 142, 143, 144, + 141, 147, 148, 149, 150, 137, 138, 151, 152, 153, + 154, 155, 156, 157, 145, 146, 140, 139, 132, 131, + 133, 134, 136, 135, 159, 91, 0, 80, 86, 89, + 88, 0, 84, 0, 82, 87, 92, 70, 73, 161, + 77, 160, 161, 79, 0, 78, 17, 81, 85, 83, + 0, 0, 0 }; -static const short yydefgoto[] = { 250, - 5, 6, 7, 8, 90, 91, 92, 93, 9, 99, - 54, 96, 97, 140, 154, 11, 12, 13, 14, 129, - 27, 28, 29, 30, 31, 32, 16, 33, 34, 35, - 36, 75, 76, 77, 78, 110, 226, 112, 113, 17, - 130, 49, 133, 88, 188, 189, 190, 191, 192, 227, - 234, 232, 228, 235, 233, 229, 236, 37, 64, 39, - 40, 41, 65, 43, 44, 45, 62, 58, 59, 66, - 47, 48, 237, 132, 155, 19, 230, 20 +static const short yydefgoto[] = { 251, + 5, 6, 7, 8, 90, 91, 92, 93, 9, 240, + 99, 54, 96, 97, 140, 154, 11, 12, 13, 14, + 129, 27, 28, 29, 30, 31, 32, 16, 33, 34, + 35, 36, 75, 76, 77, 78, 110, 226, 112, 113, + 17, 130, 49, 133, 88, 188, 189, 190, 191, 192, + 227, 234, 232, 228, 235, 233, 229, 236, 37, 64, + 39, 40, 41, 65, 43, 44, 45, 62, 58, 59, + 66, 47, 48, 237, 132, 155, 19, 230, 20 }; -static const short yypact[] = { 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 yypact[] = { 9, +-32768, 16, 43,-32768, -35,-32768,-32768,-32768,-32768,-32768, + 24,-32768,-32768,-32768,-32768,-32768,-32768,-32768,-32768,-32768, + 64, 32, 24, 80, 3, 79,-32768,-32768, 83,-32768, +-32768,-32768, -33,-32768,-32768,-32768,-32768, 91,-32768, 54, +-32768, 14,-32768,-32768,-32768, 91, 56,-32768, 3,-32768, +-32768, 119, 121, 92,-32768, 80,-32768, 90,-32768, 31, +-32768,-32768, 78, 91, 96, 91, 90,-32768, 79, 96, +-32768, 41, 24, 12,-32768,-32768,-32768,-32768, 19,-32768, +-32768, 14,-32768,-32768,-32768,-32768,-32768,-32768,-32768,-32768, + 15,-32768, 97, 104,-32768, 113, 115,-32768, 141,-32768, +-32768,-32768,-32768,-32768,-32768, 96, 117, 24, 86, 118, +-32768,-32768,-32768,-32768, 116,-32768, 12, 12, 12, 12, + 12, 12, 12, 12, 53, 12, 24, 24,-32768,-32768, + 114, 283, -25,-32768,-32768,-32768,-32768, 166,-32768, 126, +-32768, 24,-32768,-32768, 442, 442, 442, 442,-32768,-32768, +-32768,-32768, 238,-32768, 129, 167,-32768, 12, 12, 12, + 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, + 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, + 12, 12, 12, 12, 42, 24, 12, 55,-32768,-32768, +-32768,-32768,-32768,-32768,-32768,-32768,-32768, 373, 345, 314, + 143, 401, 401, 414, 414, 183, 183, 401, 401, 401, + 401, 414, 414, 442, 401, 401, 246, 427, 77, 77, +-32768,-32768,-32768,-32768, 88,-32768, 99,-32768,-32768,-32768, +-32768, -16,-32768, -24,-32768,-32768,-32768,-32768,-32768, 24, +-32768, 42, 24,-32768, 12,-32768,-32768,-32768,-32768,-32768, + 173, 174,-32768 }; static const short yypgoto[] = {-32768, --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 +-32768,-32768, 170,-32768,-32768,-32768, 134,-32768,-32768,-32768, +-32768, 175,-32768,-32768,-32768, 5, -20, -9, -71,-32768, + 0,-32768,-32768, -19,-32768,-32768, 39,-32768,-32768,-32768, +-32768,-32768,-32768,-32768,-32768,-32768,-32768, 155,-32768,-32768, +-32768, 4,-32768,-32768,-32768,-32768, 40,-32768,-32768,-32768, +-32768,-32768,-32768, -54, -15, -12,-32768,-32768, 73, 98, + -26,-32768, -30, 6,-32768,-32768,-32768, 176,-32768, 177, + 231,-32768,-32768, 162, 34, 109,-32768, 169, 68 }; -#define YYLAST 494 +#define YYLAST 483 static const short yytable[] = { 15, - 109, 18, 10, 51, 60, 55, -98, 238, 84, 68, - 15, 42, 18, 81, 80, 245, 1, 1, 63, 52, - 53, 246, 15, 89, 18, -64, -64, 21, 84, 85, - 107, 94, 98, 101, 70, 1, -89, -89, 243, 81, - 80, 244, 87, 55, 225, 80, 82, 61, 22, 71, - 56, 185, 51, 86, 42, 186, -97, 2, 187, 15, - 116, 18, 3, 3, 108, -160, 241, 242, 4, 4, - 135, 15, 15, 18, 18, 115, 3, 106, 141, 104, - 2, 3, 4, 117, 118, 119, 120, 4, 56, 142, - 3, 23, 121, 122, 24, 57, 4, 38, 72, 123, - 124, 22, 73, 67, 89, 74, 125, 15, 22, 18, - 126, 83, 4, 109, 127, 128, 95, 53, 185, 56, - 69, 79, 186, 136, 105, 187, 15, 15, 18, 18, - 181, 182, 183, 184, 51, -97, -14, 137, 139, -60, - 38, 15, 138, 18, 23, 193, 23, 24, 25, 24, - 26, 23, 194, 143, 24, 25, 145, 146, 147, 148, - 149, 150, 151, 152, 23, 153, 144, 24, 157, 196, - 109, 179, 180, 181, 182, 183, 184, 108, 197, 251, - 252, 50, 100, 239, 15, 15, 18, 18, 231, 134, - 111, 247, 249, 15, 248, 18, 240, 198, 199, 200, - 201, 202, 203, 204, 205, 206, 207, 208, 209, 210, - 211, 212, 213, 214, 215, 216, 217, 218, 219, 220, - 221, 222, 223, 224, 102, 103, 46, 131, 114, 156, - 0, 0, 0, 0, 108, 0, 0, 0, 0, 0, - 0, 15, 15, 18, 18, 231, 158, 159, 160, 161, - 162, 163, 164, 165, 166, 167, 168, 169, 170, 171, - 172, 173, 166, 167, 0, 0, 174, 175, 176, 177, - 178, 179, 180, 181, 182, 183, 184, 177, 178, 179, - 180, 181, 182, 183, 184, 0, 0, 0, 0, 0, - 195, 158, 159, 160, 161, 162, 163, 164, 165, 166, - 167, 168, 169, 170, 171, 172, 173, 0, 0, 0, - 0, 174, 175, 176, 177, 178, 179, 180, 181, 182, - 183, 184, 158, 159, 0, 161, 162, 163, 164, 165, - 166, 167, 168, 169, 170, 171, 172, 173, 0, 0, - 0, 0, 174, 175, 176, 177, 178, 179, 180, 181, - 182, 183, 184, 158, 0, 0, 161, 162, 163, 164, + 109, 51, 60, 18, 10, 63, 22, 81, 42, 2, + 15, 80, 1, 72, 18, 116, -99, 73, 89, 21, + 74, 185, 15, 55, 245, 186, 18, 1, 187, 87, + 246, 70, 243, 81, 1, 244, 55, 80, 117, 118, + 119, 120, 80, 82, 107, 225, 22, 121, 122, 23, + 51, 42, 24, 2, 123, 124, 22, 238, 3, 15, + -161, 125, 108, 18, 4, 126, -98, 4, 56, 127, + 128, 15, 15, 3, 106, 18, 18, 115, 104, 4, + 3, 56, 67, 61, 84, 71, 4, 142, 57, 23, + 3, 3, 24, 25, 79, 26, 4, 4, 68, 23, + 38, 185, 24, 25, 84, 186, 83, 15, 187, 52, + 53, 18, 86, 109, 181, 182, 183, 184, 85, 94, + 98, 101, 89, 69, 95, 23, 15, 15, 24, 105, + 18, 18, 51, -65, -65, -90, -90, 23, 53, 56, + 24, 15, 136, 38, 139, 18, 241, 242, -98, -14, + 145, 146, 147, 148, 149, 150, 151, 152, 135, 153, + 137, 166, 167, 138, -61, 143, 141, 144, 157, 193, + 109, 194, 252, 253, 50, 108, 177, 178, 179, 180, + 181, 182, 183, 184, 15, 15, 196, 248, 18, 18, + 231, 198, 199, 200, 201, 202, 203, 204, 205, 206, + 207, 208, 209, 210, 211, 212, 213, 214, 215, 216, + 217, 218, 219, 220, 221, 222, 223, 224, 179, 180, + 181, 182, 183, 184, 134, 197, 111, 239, 100, 250, + 249, 102, 108, 46, 103, 131, 156, 0, 0, 15, + 114, 15, 15, 18, 247, 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, 0, + 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, 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 + 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, 166, 167, 177, 178, 179, + 180, 181, 182, 183, 184, 161, 0, 0, 0, 0, + 166, 167, 179, 180, 181, 182, 183, 184, 0, 0, + 0, 0, 0, 0, 0, 177, 178, 179, 180, 181, + 182, 183, 184 }; static const short yycheck[] = { 0, - 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, + 72, 11, 23, 0, 0, 25, 4, 38, 3, 45, + 11, 38, 4, 47, 11, 4, 3, 51, 4, 4, + 54, 47, 23, 5, 49, 51, 23, 4, 54, 49, + 55, 26, 49, 64, 4, 52, 5, 64, 27, 28, + 29, 30, 69, 38, 4, 4, 4, 36, 37, 47, + 60, 46, 50, 45, 43, 44, 4, 3, 50, 60, + 46, 50, 72, 60, 56, 54, 53, 56, 50, 58, + 59, 72, 73, 50, 69, 72, 73, 73, 48, 56, + 50, 50, 4, 4, 46, 3, 56, 108, 57, 47, + 50, 50, 50, 51, 4, 53, 56, 56, 26, 47, + 3, 47, 50, 51, 66, 51, 53, 108, 54, 46, + 47, 108, 57, 185, 38, 39, 40, 41, 46, 52, + 53, 54, 4, 26, 4, 47, 127, 128, 50, 52, + 127, 128, 142, 48, 49, 48, 49, 47, 47, 50, + 50, 142, 46, 46, 4, 142, 48, 49, 53, 46, + 117, 118, 119, 120, 121, 122, 123, 124, 91, 126, + 48, 19, 20, 49, 48, 48, 99, 52, 55, 4, + 242, 46, 0, 0, 5, 185, 34, 35, 36, 37, + 38, 39, 40, 41, 185, 186, 58, 242, 185, 186, + 186, 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, 36, 37, + 38, 39, 40, 41, 91, 59, 72, 188, 54, 245, + 243, 56, 242, 3, 58, 74, 128, -1, -1, 240, + 72, 242, 243, 240, 240, 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, -1, + 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, 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 + 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, 19, 20, 34, 35, 36, + 37, 38, 39, 40, 41, 14, -1, -1, -1, -1, + 19, 20, 36, 37, 38, 39, 40, 41, -1, -1, + -1, -1, -1, -1, -1, 34, 35, 36, 37, 38, + 39, 40, 41 }; #define YYPURE 1 @@ -1038,7 +1039,7 @@ yyreduce: switch (yyn) { case 1: -#line 122 "compile.y" +#line 121 "compile.y" { Method& method=*new Method(Method::CT_ANY, 0, 0, /*min, max numbered_params_count*/ @@ -1048,7 +1049,7 @@ case 1: ; break;} case 8: -#line 137 "compile.y" +#line 136 "compile.y" { const String& command=*LA2S(*yyvsp[-2]); YYSTYPE strings_code=yyvsp[0]; @@ -1122,15 +1123,16 @@ case 8: ; break;} case 12: -#line 209 "compile.y" +#line 208 "compile.y" { yyval=yyvsp[-1]; P(*yyval, *yyvsp[0]) ; break;} case 16: -#line 214 "compile.y" -{ - const String& name=*LA2S(*yyvsp[-5]); +#line 212 "compile.y" +{ + PC.explicit_result=false; + const String& name=*LA2S(*yyvsp[-4]); - YYSTYPE params_names_code=yyvsp[-4]; + YYSTYPE params_names_code=yyvsp[-3]; ArrayString* params_names=0; if(int size=params_names_code->count()) { params_names=new ArrayString; @@ -1138,37 +1140,52 @@ case 16: *params_names+=LA2S(*params_names_code, i); } - YYSTYPE locals_names_code=yyvsp[-3]; + YYSTYPE locals_names_code=yyvsp[-2]; ArrayString* locals_names=0; if(int size=locals_names_code->count()) { locals_names=new ArrayString; - for(int i=0; iadd_method(PC.alias_method(name), method); + 0/*to be filled later in next {} */, 0); + PC.cclass->add_method(PC.alias_method(name), *method); + *reinterpret_cast(&yyval)=method; + + // todo: check [][;result;] ; break;} -case 19: -#line 243 "compile.y" +case 17: +#line 247 "compile.y" +{ + // fill in the code + reinterpret_cast(yyvsp[-1])->parser_code=yyvsp[0]; +; + break;} +case 20: +#line 253 "compile.y" {yyval=yyvsp[-1]; break;} -case 23: -#line 245 "compile.y" +case 24: +#line 255 "compile.y" { yyval=yyvsp[-2]; P(*yyval, *yyvsp[0]) ; break;} -case 29: -#line 253 "compile.y" +case 30: +#line 263 "compile.y" { yyval=yyvsp[-1]; P(*yyval, *yyvsp[0]) ; break;} -case 35: -#line 259 "compile.y" +case 36: +#line 269 "compile.y" { yyval=yyvsp[0]; /* stack: resulting value */ changetail_or_append(*yyval, @@ -1177,16 +1194,16 @@ case 35: ); /* value=pop; wcontext.write(value) */ ; break;} -case 36: -#line 266 "compile.y" +case 37: +#line 276 "compile.y" { yyval=yyvsp[0] ; break;} -case 39: -#line 268 "compile.y" +case 40: +#line 278 "compile.y" { yyval=yyvsp[-1] ; break;} -case 42: -#line 272 "compile.y" +case 43: +#line 282 "compile.y" { yyval=N(); ArrayOperation* diving_code=yyvsp[0]; @@ -1210,23 +1227,23 @@ case 42: /* diving code; stack: current context */ ; break;} -case 43: -#line 294 "compile.y" +case 44: +#line 304 "compile.y" { yyval=yyvsp[-1]; P(*yyval, *yyvsp[0]) ; break;} -case 45: -#line 295 "compile.y" +case 46: +#line 305 "compile.y" { yyval=yyvsp[-1]; P(*yyval, *yyvsp[0]) ; break;} -case 46: -#line 299 "compile.y" +case 47: +#line 309 "compile.y" { yyval=yyvsp[-1]; /* stack: context,name */ P(*yyval, *yyvsp[0]); /* stack: context,name,constructor_value */ ; break;} -case 50: -#line 307 "compile.y" +case 51: +#line 317 "compile.y" { yyval=N(); ArrayOperation* diving_code=yyvsp[0]; @@ -1245,28 +1262,28 @@ case 50: /* diving code; stack: current context */ ; break;} -case 51: -#line 324 "compile.y" +case 52: +#line 334 "compile.y" { yyval=N(); O(*yyval, OP_WITH_WRITE); /* stack: starting context */ P(*yyval, *yyvsp[0]); /* diving code; stack: context,name */ ; break;} -case 52: -#line 329 "compile.y" +case 53: +#line 339 "compile.y" { yyval=yyvsp[-1]; P(*yyval, *yyvsp[0]) ; break;} -case 56: -#line 336 "compile.y" +case 57: +#line 346 "compile.y" { // stack: context, name yyval=yyvsp[-1]; // stack: context, name, value O(*yyval, OP_CONSTRUCT_VALUE); /* value=pop; name=pop; context=pop; construct(context,name,value) */ ; break;} -case 57: -#line 342 "compile.y" +case 58: +#line 352 "compile.y" { yyval=N(); O(*yyval, OP_PREPARE_TO_EXPRESSION); @@ -1275,16 +1292,16 @@ case 57: O(*yyval, OP_CONSTRUCT_EXPR); /* value=pop->as_expr_result; name=pop; context=pop; construct(context,name,value) */ ; break;} -case 58: -#line 350 "compile.y" +case 59: +#line 360 "compile.y" { // stack: context, name yyval=N(); OA(*yyval, OP_CURLY_CODE__CONSTRUCT, yyvsp[-1]); /* code=pop; name=pop; context=pop; construct(context,name,junction(code)) */ ; break;} -case 62: -#line 361 "compile.y" +case 63: +#line 371 "compile.y" { yyval=N(); OA(*yyval, OP_OBJECT_POOL, yyvsp[0]); /* stack: empty write context */ @@ -1292,12 +1309,12 @@ case 62: /* context=pop; stack: context.value() */ ; break;} -case 65: -#line 368 "compile.y" +case 66: +#line 378 "compile.y" { yyval=yyvsp[-1]; P(*yyval, *yyvsp[0]) ; break;} -case 66: -#line 372 "compile.y" +case 67: +#line 382 "compile.y" { yyval=yyvsp[0]; /* stack: value */ changetail_or_append(*yyval, @@ -1305,20 +1322,20 @@ case 66: /*or */OP_WRITE_VALUE); /* value=pop; wcontext.write(value) */ ; break;} -case 67: -#line 378 "compile.y" +case 68: +#line 388 "compile.y" { PC.in_call_value=true; ; break;} -case 68: -#line 381 "compile.y" +case 69: +#line 391 "compile.y" { PC.in_call_value=false; ; break;} -case 69: -#line 384 "compile.y" +case 70: +#line 394 "compile.y" { /* ^field.$method{vasya} */ yyval=yyvsp[-3]; /* with_xxx,diving code; stack: context,method_junction */ @@ -1332,57 +1349,57 @@ case 69: OA(*yyval, OP_CALL, params_code); // method_frame=make frame(pop junction); ncontext=pop; call(ncontext,method_frame) stack: value ; break;} -case 72: -#line 399 "compile.y" +case 73: +#line 409 "compile.y" { yyval=yyvsp[-1]; P(*yyval, *yyvsp[0]) ; break;} -case 76: -#line 405 "compile.y" -{yyval=yyvsp[-1]; - break;} case 77: -#line 406 "compile.y" +#line 415 "compile.y" {yyval=yyvsp[-1]; break;} case 78: -#line 407 "compile.y" +#line 416 "compile.y" {yyval=yyvsp[-1]; break;} -case 80: -#line 410 "compile.y" -{ yyval=yyvsp[-2]; P(*yyval, *yyvsp[0]) ; +case 79: +#line 417 "compile.y" +{yyval=yyvsp[-1]; break;} -case 82: -#line 414 "compile.y" +case 81: +#line 420 "compile.y" { yyval=yyvsp[-2]; P(*yyval, *yyvsp[0]) ; break;} -case 84: -#line 418 "compile.y" +case 83: +#line 424 "compile.y" { yyval=yyvsp[-2]; P(*yyval, *yyvsp[0]) ; break;} case 85: -#line 420 "compile.y" +#line 428 "compile.y" +{ yyval=yyvsp[-2]; P(*yyval, *yyvsp[0]) ; + break;} +case 86: +#line 430 "compile.y" { yyval=yyvsp[0]; O(*yyval, OP_STORE_PARAM); ; break;} -case 86: -#line 424 "compile.y" +case 87: +#line 434 "compile.y" { yyval=N(); OA(*yyval, OP_EXPR_CODE__STORE_PARAM, yyvsp[0]); ; break;} -case 87: -#line 428 "compile.y" +case 88: +#line 438 "compile.y" { yyval=N(); OA(*yyval, OP_CURLY_CODE__STORE_PARAM, yyvsp[0]); ; break;} -case 91: -#line 437 "compile.y" +case 92: +#line 447 "compile.y" { yyval=N(); O(*yyval, OP_PREPARE_TO_EXPRESSION); @@ -1390,16 +1407,16 @@ case 91: O(*yyval, OP_WRITE_EXPR_RESULT); ; break;} -case 93: -#line 446 "compile.y" +case 94: +#line 456 "compile.y" { yyval=yyvsp[-1]; P(*yyval, *yyvsp[0]) ; break;} -case 95: -#line 448 "compile.y" +case 96: +#line 458 "compile.y" { yyval=yyvsp[-1]; P(*yyval, *yyvsp[0]) ; break;} -case 97: -#line 450 "compile.y" +case 98: +#line 460 "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 @@ -1409,23 +1426,23 @@ case 97: O(*yyval, OP_GET_ELEMENT); /* name=pop; context=pop; stack: context.get_element(name) */ ; break;} -case 98: -#line 458 "compile.y" +case 99: +#line 468 "compile.y" { /* stack: context */ yyval=yyvsp[0]; /* stack: context,name */ O(*yyval, OP_GET_ELEMENT); /* name=pop; context=pop; stack: context.get_element(name) */ ; break;} -case 104: -#line 471 "compile.y" +case 105: +#line 481 "compile.y" { yyval=yyvsp[0]; O(*yyval, OP_GET_ELEMENT); ; break;} -case 105: -#line 475 "compile.y" +case 106: +#line 485 "compile.y" { ArrayOperation* code; { @@ -1436,8 +1453,8 @@ case 105: OA(*yyval, OP_STRING_POOL, code); ; break;} -case 106: -#line 484 "compile.y" +case 107: +#line 494 "compile.y" { yyval=N(); OA(*yyval, OP_OBJECT_POOL, yyvsp[-1]); /* stack: empty write context */ @@ -1445,27 +1462,27 @@ case 106: /* context=pop; stack: context.value() */ ; break;} -case 107: -#line 490 "compile.y" +case 108: +#line 500 "compile.y" { yyval=N(); O(*yyval, OP_WITH_READ); P(*yyval, *yyvsp[0]); ; break;} -case 109: -#line 495 "compile.y" +case 110: +#line 505 "compile.y" { yyval=yyvsp[-1]; P(*yyval, *yyvsp[0]) ; break;} -case 110: -#line 496 "compile.y" +case 111: +#line 506 "compile.y" { yyval=yyvsp[0]; O(*yyval, OP_GET_ELEMENT__WRITE); ; break;} -case 113: -#line 505 "compile.y" +case 114: +#line 515 "compile.y" { yyval=yyvsp[-1]; // stack: class name string if(*LA2S(*yyval) == BASE_NAME) { // pseudo BASE class @@ -1479,8 +1496,8 @@ case 113: O(*yyval, OP_GET_CLASS); ; break;} -case 114: -#line 517 "compile.y" +case 115: +#line 527 "compile.y" { yyval=yyvsp[-1]; if(!PC.in_call_value) { @@ -1490,168 +1507,168 @@ case 114: O(*yyval, OP_PREPARE_TO_CONSTRUCT_OBJECT); ; break;} -case 115: -#line 529 "compile.y" +case 116: +#line 539 "compile.y" { // see OP_PREPARE_TO_EXPRESSION!! if((yyval=yyvsp[0])->count()==2) // only one string literal in there? change_string_literal_to_double_literal(*yyval); // make that string literal Double ; break;} -case 119: -#line 538 "compile.y" -{ yyval = yyvsp[-1]; ; - break;} case 120: -#line 539 "compile.y" +#line 548 "compile.y" { yyval = yyvsp[-1]; ; break;} case 121: -#line 540 "compile.y" +#line 549 "compile.y" { yyval = yyvsp[-1]; ; break;} case 122: -#line 542 "compile.y" -{ yyval=yyvsp[0]; O(*yyval, OP_NEG) ; +#line 550 "compile.y" +{ yyval = yyvsp[-1]; ; break;} case 123: -#line 543 "compile.y" -{ yyval=yyvsp[0] ; +#line 552 "compile.y" +{ yyval=yyvsp[0]; O(*yyval, OP_NEG) ; break;} case 124: -#line 544 "compile.y" -{ yyval=yyvsp[0]; O(*yyval, OP_INV) ; +#line 553 "compile.y" +{ yyval=yyvsp[0] ; break;} case 125: -#line 545 "compile.y" -{ yyval=yyvsp[0]; O(*yyval, OP_NOT) ; +#line 554 "compile.y" +{ yyval=yyvsp[0]; O(*yyval, OP_INV) ; break;} case 126: -#line 546 "compile.y" -{ yyval=yyvsp[0]; O(*yyval, OP_DEF) ; +#line 555 "compile.y" +{ yyval=yyvsp[0]; O(*yyval, OP_NOT) ; break;} case 127: -#line 547 "compile.y" -{ yyval=yyvsp[0]; O(*yyval, OP_IN) ; +#line 556 "compile.y" +{ yyval=yyvsp[0]; O(*yyval, OP_DEF) ; break;} case 128: -#line 548 "compile.y" -{ yyval=yyvsp[0]; O(*yyval, OP_FEXISTS) ; +#line 557 "compile.y" +{ yyval=yyvsp[0]; O(*yyval, OP_IN) ; break;} case 129: -#line 549 "compile.y" -{ yyval=yyvsp[0]; O(*yyval, OP_DEXISTS) ; +#line 558 "compile.y" +{ yyval=yyvsp[0]; O(*yyval, OP_FEXISTS) ; break;} case 130: -#line 551 "compile.y" -{ yyval=yyvsp[-2]; P(*yyval, *yyvsp[0]); O(*yyval, OP_SUB) ; +#line 559 "compile.y" +{ yyval=yyvsp[0]; O(*yyval, OP_DEXISTS) ; break;} case 131: -#line 552 "compile.y" -{ yyval=yyvsp[-2]; P(*yyval, *yyvsp[0]); O(*yyval, OP_ADD) ; +#line 561 "compile.y" +{ yyval=yyvsp[-2]; P(*yyval, *yyvsp[0]); O(*yyval, OP_SUB) ; break;} case 132: -#line 553 "compile.y" -{ yyval=yyvsp[-2]; P(*yyval, *yyvsp[0]); O(*yyval, OP_MUL) ; +#line 562 "compile.y" +{ yyval=yyvsp[-2]; P(*yyval, *yyvsp[0]); O(*yyval, OP_ADD) ; break;} case 133: -#line 554 "compile.y" -{ yyval=yyvsp[-2]; P(*yyval, *yyvsp[0]); O(*yyval, OP_DIV) ; +#line 563 "compile.y" +{ yyval=yyvsp[-2]; P(*yyval, *yyvsp[0]); O(*yyval, OP_MUL) ; break;} case 134: -#line 555 "compile.y" -{ yyval=yyvsp[-2]; P(*yyval, *yyvsp[0]); O(*yyval, OP_MOD) ; +#line 564 "compile.y" +{ yyval=yyvsp[-2]; P(*yyval, *yyvsp[0]); O(*yyval, OP_DIV) ; break;} case 135: -#line 556 "compile.y" -{ yyval=yyvsp[-2]; P(*yyval, *yyvsp[0]); O(*yyval, OP_INTDIV) ; +#line 565 "compile.y" +{ yyval=yyvsp[-2]; P(*yyval, *yyvsp[0]); O(*yyval, OP_MOD) ; break;} case 136: -#line 557 "compile.y" -{ yyval=yyvsp[-2]; P(*yyval, *yyvsp[0]); O(*yyval, OP_BIN_SL) ; +#line 566 "compile.y" +{ yyval=yyvsp[-2]; P(*yyval, *yyvsp[0]); O(*yyval, OP_INTDIV) ; break;} case 137: -#line 558 "compile.y" -{ yyval=yyvsp[-2]; P(*yyval, *yyvsp[0]); O(*yyval, OP_BIN_SR) ; +#line 567 "compile.y" +{ yyval=yyvsp[-2]; P(*yyval, *yyvsp[0]); O(*yyval, OP_BIN_SL) ; break;} case 138: -#line 559 "compile.y" -{ yyval=yyvsp[-2]; P(*yyval, *yyvsp[0]); O(*yyval, OP_BIN_AND) ; +#line 568 "compile.y" +{ yyval=yyvsp[-2]; P(*yyval, *yyvsp[0]); O(*yyval, OP_BIN_SR) ; break;} case 139: -#line 560 "compile.y" -{ yyval=yyvsp[-2]; P(*yyval, *yyvsp[0]); O(*yyval, OP_BIN_OR) ; +#line 569 "compile.y" +{ yyval=yyvsp[-2]; P(*yyval, *yyvsp[0]); O(*yyval, OP_BIN_AND) ; break;} case 140: -#line 561 "compile.y" -{ yyval=yyvsp[-2]; P(*yyval, *yyvsp[0]); O(*yyval, OP_BIN_XOR) ; +#line 570 "compile.y" +{ yyval=yyvsp[-2]; P(*yyval, *yyvsp[0]); O(*yyval, OP_BIN_OR) ; break;} case 141: -#line 562 "compile.y" -{ yyval=yyvsp[-2]; OA(*yyval, OP_NESTED_CODE, yyvsp[0]); O(*yyval, OP_LOG_AND) ; +#line 571 "compile.y" +{ yyval=yyvsp[-2]; P(*yyval, *yyvsp[0]); O(*yyval, OP_BIN_XOR) ; break;} case 142: -#line 563 "compile.y" -{ yyval=yyvsp[-2]; OA(*yyval, OP_NESTED_CODE, yyvsp[0]); O(*yyval, OP_LOG_OR) ; +#line 572 "compile.y" +{ yyval=yyvsp[-2]; OA(*yyval, OP_NESTED_CODE, yyvsp[0]); O(*yyval, OP_LOG_AND) ; break;} case 143: -#line 564 "compile.y" -{ yyval=yyvsp[-2]; P(*yyval, *yyvsp[0]); O(*yyval, OP_LOG_XOR) ; +#line 573 "compile.y" +{ yyval=yyvsp[-2]; OA(*yyval, OP_NESTED_CODE, yyvsp[0]); O(*yyval, OP_LOG_OR) ; break;} case 144: -#line 565 "compile.y" -{ yyval=yyvsp[-2]; P(*yyval, *yyvsp[0]); O(*yyval, OP_NUM_LT) ; +#line 574 "compile.y" +{ yyval=yyvsp[-2]; P(*yyval, *yyvsp[0]); O(*yyval, OP_LOG_XOR) ; break;} case 145: -#line 566 "compile.y" -{ yyval=yyvsp[-2]; P(*yyval, *yyvsp[0]); O(*yyval, OP_NUM_GT) ; +#line 575 "compile.y" +{ yyval=yyvsp[-2]; P(*yyval, *yyvsp[0]); O(*yyval, OP_NUM_LT) ; break;} case 146: -#line 567 "compile.y" -{ yyval=yyvsp[-2]; P(*yyval, *yyvsp[0]); O(*yyval, OP_NUM_LE) ; +#line 576 "compile.y" +{ yyval=yyvsp[-2]; P(*yyval, *yyvsp[0]); O(*yyval, OP_NUM_GT) ; break;} case 147: -#line 568 "compile.y" -{ yyval=yyvsp[-2]; P(*yyval, *yyvsp[0]); O(*yyval, OP_NUM_GE) ; +#line 577 "compile.y" +{ yyval=yyvsp[-2]; P(*yyval, *yyvsp[0]); O(*yyval, OP_NUM_LE) ; break;} case 148: -#line 569 "compile.y" -{ yyval=yyvsp[-2]; P(*yyval, *yyvsp[0]); O(*yyval, OP_NUM_EQ) ; +#line 578 "compile.y" +{ yyval=yyvsp[-2]; P(*yyval, *yyvsp[0]); O(*yyval, OP_NUM_GE) ; break;} case 149: -#line 570 "compile.y" -{ yyval=yyvsp[-2]; P(*yyval, *yyvsp[0]); O(*yyval, OP_NUM_NE) ; +#line 579 "compile.y" +{ yyval=yyvsp[-2]; P(*yyval, *yyvsp[0]); O(*yyval, OP_NUM_EQ) ; break;} case 150: -#line 571 "compile.y" -{ yyval=yyvsp[-2]; P(*yyval, *yyvsp[0]); O(*yyval, OP_STR_LT) ; +#line 580 "compile.y" +{ yyval=yyvsp[-2]; P(*yyval, *yyvsp[0]); O(*yyval, OP_NUM_NE) ; break;} case 151: -#line 572 "compile.y" -{ yyval=yyvsp[-2]; P(*yyval, *yyvsp[0]); O(*yyval, OP_STR_GT) ; +#line 581 "compile.y" +{ yyval=yyvsp[-2]; P(*yyval, *yyvsp[0]); O(*yyval, OP_STR_LT) ; break;} case 152: -#line 573 "compile.y" -{ yyval=yyvsp[-2]; P(*yyval, *yyvsp[0]); O(*yyval, OP_STR_LE) ; +#line 582 "compile.y" +{ yyval=yyvsp[-2]; P(*yyval, *yyvsp[0]); O(*yyval, OP_STR_GT) ; break;} case 153: -#line 574 "compile.y" -{ yyval=yyvsp[-2]; P(*yyval, *yyvsp[0]); O(*yyval, OP_STR_GE) ; +#line 583 "compile.y" +{ yyval=yyvsp[-2]; P(*yyval, *yyvsp[0]); O(*yyval, OP_STR_LE) ; break;} case 154: -#line 575 "compile.y" -{ yyval=yyvsp[-2]; P(*yyval, *yyvsp[0]); O(*yyval, OP_STR_EQ) ; +#line 584 "compile.y" +{ yyval=yyvsp[-2]; P(*yyval, *yyvsp[0]); O(*yyval, OP_STR_GE) ; break;} case 155: -#line 576 "compile.y" -{ yyval=yyvsp[-2]; P(*yyval, *yyvsp[0]); O(*yyval, OP_STR_NE) ; +#line 585 "compile.y" +{ yyval=yyvsp[-2]; P(*yyval, *yyvsp[0]); O(*yyval, OP_STR_EQ) ; break;} case 156: -#line 577 "compile.y" -{ yyval=yyvsp[-2]; P(*yyval, *yyvsp[0]); O(*yyval, OP_IS) ; +#line 586 "compile.y" +{ yyval=yyvsp[-2]; P(*yyval, *yyvsp[0]); O(*yyval, OP_STR_NE) ; break;} case 157: -#line 580 "compile.y" +#line 587 "compile.y" +{ yyval=yyvsp[-2]; P(*yyval, *yyvsp[0]); O(*yyval, OP_IS) ; + break;} +case 158: +#line 590 "compile.y" { yyval=N(); OA(*yyval, OP_STRING_POOL, yyvsp[0]); /* stack: empty write context */ @@ -1659,19 +1676,19 @@ case 157: /* context=pop; stack: context.get_string() */ ; break;} -case 158: -#line 589 "compile.y" +case 159: +#line 599 "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 159: -#line 594 "compile.y" +case 160: +#line 604 "compile.y" { yyval=VL(new VVoid(), 0, 0, 0) ; break;} -case 160: -#line 595 "compile.y" +case 161: +#line 605 "compile.y" { yyval=N() ; break;} } @@ -1896,7 +1913,7 @@ yyerrhandle: } return 1; } -#line 597 "compile.y" +#line 607 "compile.y" #endif @@ -1947,12 +1964,13 @@ static int yylex(YYSTYPE *lvalp, void *a c=*(end=(pc.source++)); // fprintf(stderr, "\nchar: %c %02X; nestage: %d, sp=%d", c, c, lexical_brackets_nestage, pc.sp); - if(c=='\n') { + if(c=='\n') pc.pos_next_line(); - } else + else pc.pos_next_c(c); +// fprintf(stderr, "\nchar: %c file(%d:%d)", c, pc.pos.line, pc.pos.col); - if(c=='@' && pc.pos.col==0+1) { + if(pc.pos.col==0+1 && c=='@') { if(pc.ls==LS_DEF_SPECIAL_BODY) { // @SPECIAL // ... @@ -1965,7 +1983,8 @@ static int yylex(YYSTYPE *lvalp, void *a } else // @ in first column inside some code [when could that be?] result=BAD_METHOD_DECL_START; goto break2; - } else if(c=='^') { + } + if(c=='^') { if(pc.ls==LS_METHOD_AFTER) { // handle after-method situation pop_LS(pc); @@ -2084,6 +2103,16 @@ default: lexical_brackets_nestage++; break; } + if(pc.explicit_result && c) + switch(c) { + case '\n': case ' ': case '\t': + begin=pc.source; + begin_pos=pc.pos; + continue; // skip it + default: + result=BAD_NONWHITESPACE_CHARACTER_IN_EXPLICIT_RESULT_MODE; + goto break2; + } break; // #COMMENT @@ -2537,6 +2566,7 @@ default: case ':': // ':name' or 'class:name' case '^': // ^abc^xxx wrong. bailing out case ']': case '}': case ')': // ^abc]}) wrong. bailing out + case ' ': // ^if ( wrong. bailing out RC; } break; @@ -2583,6 +2613,16 @@ default: lexical_brackets_nestage++; break; } + if(pc.explicit_result && c) + switch(c) { + case '\n': case ' ': case '\t': + begin=pc.source; + begin_pos=pc.pos; + continue; // skip it + default: + result=BAD_NONWHITESPACE_CHARACTER_IN_EXPLICIT_RESULT_MODE; + goto break2; + } break; case LS_METHOD_AFTER: