--- parser3/src/main/compile.tab.C 2004/04/06 07:53:57 1.96 +++ parser3/src/main/compile.tab.C 2005/08/05 13:01:16 1.103.8.1 @@ -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.96 2004/04/06 07:53:57 paf Exp $ + $Id: compile.tab.C,v 1.103.8.1 2005/08/05 13:01:16 paf Exp $ */ /** @@ -85,7 +85,6 @@ static int real_yyerror(Parse_control* pc, char* s); static void yyprint(FILE* file, int type, YYSTYPE value); static int yylex(YYSTYPE* lvalp, void* pc); -static int is_not_whitespace(char c, int); // local convinient inplace typecast & var #undef PC @@ -106,11 +105,11 @@ static int is_not_whitespace(char c, int -#define YYFINAL 255 +#define YYFINAL 260 #define YYFLAG -32768 #define YYNTBASE 60 -#define YYTRANSLATE(x) ((unsigned)(x) <= 286 ? yytranslate[x] : 142) +#define YYTRANSLATE(x) ((unsigned)(x) <= 286 ? yytranslate[x] : 147) static const char yytranslate[] = { 0, 2, 2, 2, 2, 2, 2, 2, 2, 2, 46, @@ -149,68 +148,69 @@ static const short yyprhs[] = { 0, 0, 2, 4, 6, 9, 11, 13, 15, 20, 22, 24, 26, 29, 32, 34, 36, 37, 46, 48, 50, 54, 56, 58, 60, 64, 66, 68, 70, 72, 74, - 77, 79, 81, 82, 85, 87, 89, 91, 93, 96, - 99, 101, 105, 107, 109, 111, 114, 116, 119, 123, - 125, 127, 129, 131, 134, 137, 139, 141, 143, 147, + 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, 140, 141, 147, 151, 155, 157, 159, 161, 163, 165, 167, 170, 172, - 173, 174, 181, 183, 185, 188, 190, 192, 194, 198, - 202, 206, 208, 212, 214, 218, 220, 224, 226, 228, - 230, 232, 234, 236, 238, 240, 243, 245, 248, 251, - 253, 255, 258, 260, 262, 264, 266, 269, 272, 276, - 278, 280, 283, 286, 288, 290, 293, 296, 298, 300, - 302, 304, 308, 312, 316, 319, 322, 325, 328, 331, - 334, 337, 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, 448, - 450, 452, 453 + 173, 174, 181, 183, 185, 188, 190, 192, 194, 195, + 196, 202, 206, 210, 212, 216, 218, 222, 224, 228, + 230, 232, 234, 236, 238, 240, 242, 244, 247, 249, + 252, 255, 257, 259, 262, 264, 266, 268, 270, 273, + 276, 277, 278, 284, 286, 288, 291, 294, 296, 298, + 301, 304, 306, 308, 310, 312, 316, 320, 324, 327, + 330, 333, 336, 339, 342, 345, 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, 448, 452, 456, 458, 460, 462, 463 }; static const short yyrhs[] = { 62, 0, 61, 0, 63, 0, 61, 63, 0, 76, 0, - 64, 0, 69, 0, 45, 4, 46, 65, 0, 141, + 64, 0, 69, 0, 45, 4, 46, 65, 0, 146, 0, 66, 0, 67, 0, 66, 67, 0, 68, 46, - 0, 141, 0, 4, 0, 0, 45, 4, 72, 71, - 75, 46, 70, 76, 0, 141, 0, 72, 0, 47, - 73, 48, 0, 141, 0, 74, 0, 4, 0, 74, - 49, 4, 0, 141, 0, 4, 0, 141, 0, 77, - 0, 78, 0, 77, 78, 0, 139, 0, 79, 0, - 0, 80, 81, 0, 82, 0, 90, 0, 103, 0, - 83, 0, 50, 84, 0, 86, 3, 0, 85, 0, - 51, 86, 52, 0, 87, 0, 88, 0, 89, 0, - 133, 89, 0, 125, 0, 122, 125, 0, 50, 91, - 95, 0, 92, 0, 93, 0, 94, 0, 121, 0, - 53, 121, 0, 133, 121, 0, 96, 0, 97, 0, - 98, 0, 47, 99, 48, 0, 54, 136, 55, 0, - 51, 76, 52, 0, 140, 0, 4, 0, 100, 0, + 0, 146, 0, 4, 0, 0, 45, 4, 72, 71, + 75, 46, 70, 76, 0, 146, 0, 72, 0, 47, + 73, 48, 0, 146, 0, 74, 0, 4, 0, 74, + 49, 4, 0, 146, 0, 4, 0, 146, 0, 77, + 0, 78, 0, 77, 78, 0, 144, 0, 79, 0, + 80, 0, 88, 0, 103, 0, 81, 0, 50, 82, + 0, 84, 3, 0, 83, 0, 51, 84, 52, 0, + 85, 0, 86, 0, 87, 0, 137, 87, 0, 127, + 0, 124, 127, 0, 50, 89, 93, 0, 90, 0, + 91, 0, 92, 0, 123, 0, 53, 123, 0, 137, + 123, 0, 94, 0, 97, 0, 98, 0, 0, 0, + 47, 95, 99, 96, 48, 0, 54, 140, 55, 0, + 51, 76, 52, 0, 145, 0, 4, 0, 100, 0, 101, 0, 102, 0, 79, 0, 78, 77, 0, 104, 0, 0, 0, 56, 105, 107, 106, 108, 3, 0, - 86, 0, 109, 0, 108, 109, 0, 110, 0, 111, - 0, 112, 0, 47, 113, 48, 0, 54, 114, 55, - 0, 51, 115, 52, 0, 116, 0, 113, 49, 116, - 0, 117, 0, 114, 49, 117, 0, 118, 0, 115, - 49, 118, 0, 119, 0, 120, 0, 76, 0, 140, - 0, 4, 0, 100, 0, 136, 0, 126, 0, 122, - 126, 0, 123, 0, 122, 123, 0, 124, 53, 0, - 126, 0, 126, 0, 4, 5, 0, 4, 0, 127, - 0, 128, 0, 129, 0, 50, 130, 0, 4, 131, - 0, 47, 77, 48, 0, 4, 0, 132, 0, 131, - 132, 0, 50, 130, 0, 134, 0, 135, 0, 4, - 57, 0, 134, 57, 0, 137, 0, 4, 0, 83, - 0, 104, 0, 58, 138, 58, 0, 59, 138, 59, - 0, 54, 137, 55, 0, 37, 137, 0, 36, 137, - 0, 43, 137, 0, 44, 137, 0, 27, 137, 0, - 28, 137, 0, 29, 137, 0, 30, 137, 0, 137, - 37, 137, 0, 137, 36, 137, 0, 137, 38, 137, - 0, 137, 39, 137, 0, 137, 41, 137, 0, 137, - 40, 137, 0, 137, 19, 137, 0, 137, 20, 137, - 0, 137, 35, 137, 0, 137, 34, 137, 0, 137, - 14, 137, 0, 137, 11, 137, 0, 137, 12, 137, - 0, 137, 13, 137, 0, 137, 32, 137, 0, 137, - 33, 137, 0, 137, 15, 137, 0, 137, 16, 137, - 0, 137, 17, 137, 0, 137, 18, 137, 0, 137, - 21, 137, 0, 137, 22, 137, 0, 137, 23, 137, - 0, 137, 24, 137, 0, 137, 25, 137, 0, 137, - 26, 137, 0, 137, 31, 137, 0, 76, 0, 4, + 84, 0, 109, 0, 108, 109, 0, 110, 0, 113, + 0, 114, 0, 0, 0, 47, 111, 115, 112, 48, + 0, 54, 116, 55, 0, 51, 117, 52, 0, 118, + 0, 115, 49, 118, 0, 119, 0, 116, 49, 119, + 0, 120, 0, 117, 49, 120, 0, 121, 0, 122, + 0, 76, 0, 145, 0, 4, 0, 100, 0, 140, + 0, 128, 0, 124, 128, 0, 125, 0, 124, 125, + 0, 126, 53, 0, 128, 0, 128, 0, 4, 5, + 0, 4, 0, 129, 0, 130, 0, 131, 0, 50, + 134, 0, 4, 135, 0, 0, 0, 47, 132, 77, + 133, 48, 0, 4, 0, 136, 0, 135, 136, 0, + 50, 134, 0, 138, 0, 139, 0, 4, 57, 0, + 138, 57, 0, 141, 0, 142, 0, 81, 0, 104, + 0, 58, 143, 58, 0, 59, 143, 59, 0, 54, + 141, 55, 0, 37, 141, 0, 36, 141, 0, 43, + 141, 0, 44, 141, 0, 27, 141, 0, 28, 141, + 0, 29, 141, 0, 30, 141, 0, 141, 37, 141, + 0, 141, 36, 141, 0, 141, 38, 141, 0, 141, + 39, 141, 0, 141, 41, 141, 0, 141, 40, 141, + 0, 141, 19, 141, 0, 141, 20, 141, 0, 141, + 35, 141, 0, 141, 34, 141, 0, 141, 14, 141, + 0, 141, 11, 141, 0, 141, 12, 141, 0, 141, + 13, 141, 0, 141, 32, 141, 0, 141, 33, 141, + 0, 141, 15, 141, 0, 141, 16, 141, 0, 141, + 17, 141, 0, 141, 18, 141, 0, 141, 21, 141, + 0, 141, 22, 141, 0, 141, 23, 141, 0, 141, + 24, 141, 0, 141, 25, 141, 0, 141, 26, 141, + 0, 141, 31, 141, 0, 4, 0, 76, 0, 4, 0, 0, 0 }; @@ -218,23 +218,23 @@ static const short yyrhs[] = { 62, #if YYDEBUG != 0 static const short yyrline[] = { 0, - 121, 129, 131, 131, 132, 134, 134, 136, 208, 208, - 209, 209, 210, 211, 211, 213, 248, 253, 253, 254, - 255, 255, 256, 256, 258, 258, 262, 262, 264, 264, - 265, 265, 266, 269, 273, 273, 273, 277, 284, 285, - 285, 286, 287, 289, 290, 312, 313, 313, 317, 321, - 323, 324, 325, 342, 347, 349, 351, 352, 354, 360, - 368, 374, 376, 377, 379, 385, 386, 386, 390, 396, - 399, 402, 415, 417, 417, 418, 420, 421, 423, 424, - 425, 426, 428, 430, 432, 434, 436, 438, 442, 446, - 450, 452, 453, 455, 464, 464, 466, 466, 467, 468, - 476, 481, 483, 485, 486, 487, 489, 493, 502, 508, - 513, 513, 514, 519, 521, 523, 535, 547, 552, 554, - 555, 556, 557, 558, 560, 561, 562, 563, 564, 565, - 566, 567, 569, 570, 571, 572, 573, 574, 575, 576, - 577, 578, 579, 580, 581, 582, 583, 584, 585, 586, - 587, 588, 589, 590, 591, 592, 593, 594, 595, 598, - 607, 622, 623 + 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, 349, 351, 357, + 365, 371, 373, 374, 376, 382, 383, 383, 387, 393, + 396, 399, 412, 414, 414, 415, 417, 418, 420, 423, + 425, 426, 427, 428, 430, 432, 434, 436, 438, 440, + 444, 448, 452, 454, 455, 457, 466, 466, 468, 468, + 469, 470, 478, 483, 485, 487, 488, 489, 491, 495, + 504, 507, 509, 515, 520, 520, 521, 526, 528, 530, + 542, 554, 555, 557, 558, 559, 560, 561, 563, 564, + 565, 566, 567, 568, 569, 570, 572, 573, 574, 575, + 576, 577, 578, 579, 580, 581, 582, 583, 584, 585, + 586, 587, 588, 589, 590, 591, 592, 593, 594, 595, + 596, 597, 598, 601, 606, 615, 620, 621 }; #endif @@ -243,29 +243,29 @@ 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", +"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", -"@2","real_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","@3", -"@4","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 +"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","@2","@3","construct_round","construct_curly", +"any_constructor_code_value","constructor_code_value","constructor_code","codes__excluding_sole_str_literal", +"call","call_value","@4","@5","call_name","store_params","store_param","store_square_param", +"@6","@7","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","@8","@9","subvar_ref_name_rdive","subvar_get_writes", +"subvar__get_write","class_prefix","class_static_prefix","class_constructor_prefix", +"expr_value","expr","double_or_STRING","string_inside_quotes_value","write_string", +"void_value","empty", NULL }; #endif @@ -273,222 +273,230 @@ static const short yyr1[] = { 0, 60, 60, 61, 61, 62, 63, 63, 64, 65, 65, 66, 66, 67, 68, 68, 70, 69, 71, 71, 72, 73, 73, 74, 74, 75, 75, 76, 76, 77, 77, - 78, 78, 80, 79, 81, 81, 81, 82, 83, 84, - 84, 85, 86, 86, 87, 88, 89, 89, 90, 91, - 91, 91, 92, 93, 94, 95, 95, 95, 96, 97, + 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, 95, 96, 94, 97, 98, 99, 99, 99, 100, 101, 102, 102, 103, 105, - 106, 104, 107, 108, 108, 109, 109, 109, 110, 111, - 112, 113, 113, 114, 114, 115, 115, 116, 117, 118, - 119, 119, 119, 120, 121, 121, 122, 122, 123, 124, - 125, 125, 126, 126, 126, 126, 127, 128, 129, 130, - 131, 131, 132, 133, 133, 134, 135, 136, 137, 137, - 137, 137, 137, 137, 137, 137, 137, 137, 137, 137, - 137, 137, 137, 137, 137, 137, 137, 137, 137, 137, - 137, 137, 137, 137, 137, 137, 137, 137, 137, 137, - 137, 137, 137, 137, 137, 137, 137, 137, 137, 138, - 139, 140, 141 + 106, 104, 107, 108, 108, 109, 109, 109, 111, 112, + 110, 113, 114, 115, 115, 116, 116, 117, 117, 118, + 119, 120, 121, 121, 121, 122, 123, 123, 124, 124, + 125, 126, 127, 127, 128, 128, 128, 128, 129, 130, + 132, 133, 131, 134, 135, 135, 136, 137, 137, 138, + 139, 140, 141, 141, 141, 141, 141, 141, 141, 141, + 141, 141, 141, 141, 141, 141, 141, 141, 141, 141, + 141, 141, 141, 141, 141, 141, 141, 141, 141, 141, + 141, 141, 141, 141, 141, 141, 141, 141, 141, 141, + 141, 141, 141, 142, 143, 144, 145, 146 }; static const short yyr2[] = { 0, 1, 1, 1, 2, 1, 1, 1, 4, 1, 1, 1, 2, 2, 1, 1, 0, 8, 1, 1, 3, 1, 1, 1, 3, 1, 1, 1, 1, 1, 2, - 1, 1, 0, 2, 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, + 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, 0, 0, 5, 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, + 0, 6, 1, 1, 2, 1, 1, 1, 0, 0, + 5, 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, + 0, 0, 5, 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, 1, - 1, 0, 0 + 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, + 3, 3, 3, 1, 1, 1, 0, 0 }; -static const short yydefact[] = { 33, - 161, 0, 2, 1, 3, 6, 7, 5, 28, 29, - 32, 0, 31, 27, 0, 4, 30, 0, 70, 34, - 35, 38, 36, 37, 69, 163, 163, 163, 103, 33, - 0, 0, 0, 39, 41, 0, 43, 44, 45, 0, - 50, 51, 52, 53, 0, 97, 0, 47, 95, 104, - 105, 106, 0, 114, 115, 0, 15, 8, 10, 11, - 0, 9, 23, 0, 22, 21, 163, 19, 18, 102, - 0, 116, 108, 111, 33, 110, 107, 0, 0, 101, - 0, 103, 54, 0, 95, 40, 33, 33, 0, 49, - 56, 57, 58, 103, 98, 48, 96, 99, 46, 55, - 117, 73, 71, 12, 14, 13, 20, 0, 26, 0, - 25, 113, 112, 109, 42, 96, 161, 33, 32, 0, - 64, 65, 66, 62, 0, 119, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 33, 33, 120, 121, - 0, 118, 0, 24, 16, 33, 59, 61, 129, 130, - 131, 132, 126, 125, 127, 128, 0, 160, 0, 0, - 60, 0, 0, 0, 0, 0, 0, 0, 0, 0, +static const short yydefact[] = { 168, + 166, 0, 0, 70, 2, 1, 3, 6, 7, 5, + 28, 29, 32, 33, 36, 34, 35, 69, 31, 27, + 0, 105, 111, 0, 0, 0, 37, 39, 0, 41, + 42, 43, 0, 48, 49, 50, 51, 0, 99, 0, + 45, 97, 106, 107, 108, 0, 118, 119, 0, 4, + 30, 168, 168, 168, 104, 0, 120, 110, 115, 0, + 114, 109, 0, 0, 103, 0, 105, 52, 0, 97, + 38, 57, 168, 0, 47, 54, 55, 56, 105, 100, + 46, 98, 101, 44, 53, 121, 73, 71, 15, 8, + 10, 11, 0, 9, 23, 0, 22, 21, 168, 19, + 18, 117, 116, 112, 40, 98, 167, 0, 164, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 168, + 168, 124, 125, 0, 122, 123, 0, 12, 14, 13, + 20, 0, 26, 0, 25, 0, 166, 0, 32, 58, + 64, 65, 66, 62, 61, 133, 134, 135, 136, 130, + 129, 131, 132, 0, 165, 0, 0, 60, 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, 0, 0, 33, 33, - 0, 0, 74, 76, 77, 78, 33, 124, 122, 123, - 144, 145, 146, 143, 149, 150, 151, 152, 139, 140, - 153, 154, 155, 156, 157, 158, 159, 147, 148, 142, - 141, 134, 133, 135, 136, 138, 137, 161, 93, 0, - 82, 88, 91, 90, 0, 86, 0, 84, 89, 94, - 72, 75, 17, 79, 33, 33, 81, 0, 80, 83, - 87, 85, 0, 0, 0 + 0, 0, 0, 0, 0, 79, 168, 0, 0, 74, + 76, 77, 78, 24, 16, 113, 68, 0, 128, 126, + 127, 148, 149, 150, 147, 153, 154, 155, 156, 143, + 144, 157, 158, 159, 160, 161, 162, 163, 151, 152, + 146, 145, 138, 137, 139, 140, 142, 141, 167, 92, + 0, 88, 0, 86, 91, 96, 72, 75, 168, 59, + 166, 95, 80, 84, 90, 93, 168, 83, 0, 82, + 17, 167, 0, 89, 87, 85, 81, 0, 0, 0 }; -static const short yydefgoto[] = { 253, - 3, 4, 5, 6, 58, 59, 60, 61, 7, 197, - 67, 28, 64, 65, 110, 158, 9, 10, 11, 12, - 20, 21, 139, 34, 35, 36, 37, 38, 39, 23, - 40, 41, 42, 43, 90, 91, 92, 93, 120, 229, - 122, 123, 24, 140, 56, 143, 103, 192, 193, 194, - 195, 196, 230, 237, 235, 231, 238, 236, 232, 239, - 44, 79, 46, 47, 48, 80, 50, 51, 52, 77, - 73, 74, 81, 54, 55, 240, 142, 159, 13, 233, - 14 +static const short yydefgoto[] = { 258, + 5, 6, 7, 8, 90, 91, 92, 93, 9, 239, + 99, 54, 96, 97, 134, 155, 11, 12, 13, 14, + 122, 27, 28, 29, 30, 31, 32, 16, 33, 34, + 35, 36, 75, 76, 107, 198, 77, 78, 140, 242, + 142, 143, 17, 123, 49, 127, 88, 189, 190, 191, + 229, 253, 192, 193, 243, 233, 231, 244, 234, 232, + 245, 235, 37, 64, 39, 40, 41, 65, 43, 44, + 45, 60, 136, 62, 58, 59, 66, 47, 48, 236, + 125, 126, 156, 19, 246, 20 }; -static const short yypact[] = { 99, --32768, 32, -16,-32768,-32768,-32768,-32768,-32768, 22,-32768, --32768, 61,-32768,-32768, 116,-32768,-32768, 78,-32768,-32768, --32768,-32768,-32768,-32768,-32768, 94, 96, -13, 23, 122, - 132, 85, 92,-32768,-32768, 150,-32768,-32768,-32768, -31, --32768,-32768,-32768,-32768, 93,-32768, 105,-32768, 21,-32768, --32768,-32768, 93, 107,-32768, 85,-32768,-32768, 102,-32768, - 141, 142,-32768, 168, 140,-32768, 213,-32768,-32768,-32768, - 132,-32768, 188,-32768, 28,-32768,-32768, 189, 93, 186, - 93, 188,-32768, 92, 186,-32768, 108, 33, 65,-32768, --32768,-32768,-32768, 25,-32768,-32768, 21,-32768,-32768,-32768, --32768,-32768,-32768,-32768,-32768,-32768,-32768, 239,-32768, 194, --32768,-32768,-32768,-32768,-32768, 186, 196, 122, 124, 197, --32768,-32768,-32768,-32768, 211,-32768, 65, 65, 65, 65, - 65, 65, 65, 65, 83, 65, 13, 9,-32768,-32768, - 209, 236, -29,-32768,-32768, 101,-32768,-32768, 395, 395, - 395, 395,-32768,-32768,-32768,-32768, 187,-32768, 207, 221, --32768, 65, 65, 65, 65, 65, 65, 65, 65, 65, - 65, 65, 65, 65, 65, 65, 65, 65, 65, 65, - 65, 65, 65, 65, 65, 65, 65, 65, 103, 34, - 65, 30,-32768,-32768,-32768,-32768, 110,-32768,-32768,-32768, - 326, 298, 267, 195, 354, 354, 367, 367, 130, 130, - 354, 354, 354, 354, 367, 367, 395, 354, 354, 402, - 155, 144, 144,-32768,-32768,-32768,-32768, 128,-32768, 131, --32768,-32768,-32768,-32768, 64,-32768, -28,-32768,-32768,-32768, --32768,-32768,-32768,-32768, 103, 34,-32768, 65,-32768,-32768, --32768,-32768, 266, 294,-32768 +static const short yypact[] = { 5, +-32768, 22, 35,-32768, -13,-32768,-32768,-32768,-32768,-32768, + 8,-32768,-32768,-32768,-32768,-32768,-32768,-32768,-32768,-32768, + -9, 9,-32768, 36, 20, 44,-32768,-32768, 40,-32768, +-32768,-32768, -29,-32768,-32768,-32768,-32768, 52,-32768, -8, +-32768, 4,-32768,-32768,-32768, 52, -3,-32768, 20,-32768, +-32768, 72, 120, 90,-32768, 36,-32768, 89,-32768, 8, +-32768,-32768, 92, 52, 88, 52, 89,-32768, 44, 88, +-32768,-32768, 8, 99,-32768,-32768,-32768,-32768, 18,-32768, +-32768, 4,-32768,-32768,-32768,-32768,-32768,-32768,-32768,-32768, + 32,-32768, 100, 101,-32768, 97, 102,-32768, 146,-32768, +-32768,-32768,-32768, 8,-32768, 88, 13, 121,-32768, 99, + 99, 99, 99, 99, 99, 99, 99, 42, 99, 8, + 8,-32768,-32768, 117, 316,-32768, 54,-32768,-32768,-32768, +-32768, 148,-32768, 108,-32768, 150, 166, 8, 31,-32768, +-32768,-32768,-32768,-32768,-32768, 444, 444, 444, 444,-32768, +-32768,-32768,-32768, 271,-32768, 158, 159,-32768, 99, 99, + 99, 99, 99, 99, 99, 99, 99, 99, 99, 99, + 99, 99, 99, 99, 99, 99, 99, 99, 99, 99, + 99, 99, 99, 99, 99,-32768, 8, 99, 30,-32768, +-32768,-32768,-32768,-32768,-32768,-32768, 8, 169,-32768,-32768, +-32768, 375, 145, 347, 279, 403, 403, 416, 416, 164, + 164, 403, 403, 403, 403, 416, 416, 444, 403, 403, + 76, 155, 93, 93,-32768,-32768,-32768,-32768, 15,-32768, + -21,-32768, -28,-32768,-32768,-32768,-32768,-32768, 8,-32768, + 70,-32768, 170,-32768,-32768,-32768, 8,-32768, 99,-32768, +-32768, 15, 172,-32768,-32768,-32768,-32768, 221, 223,-32768 }; static const short yypgoto[] = {-32768, --32768,-32768, 292,-32768,-32768,-32768, 237,-32768,-32768,-32768, --32768, 269,-32768,-32768,-32768, 0, -27, -8, -85,-32768, --32768,-32768, 299,-32768,-32768, 109,-32768,-32768, 37,-32768, --32768,-32768,-32768,-32768,-32768,-32768,-32768,-32768,-32768, 223, --32768,-32768,-32768, 313,-32768,-32768,-32768,-32768, 134,-32768, --32768,-32768,-32768,-32768,-32768, 111, 79, 123,-32768,-32768, - -18, 104, 75,-32768, 82, -14,-32768,-32768,-32768, 257, --32768, 280, 336,-32768,-32768, 281, -122, 217,-32768, 288, - 119 +-32768,-32768, 219,-32768,-32768,-32768, 134,-32768,-32768,-32768, +-32768, 173,-32768,-32768,-32768, 1, -55, -7, -104,-32768, + 0,-32768,-32768, -5,-32768,-32768, -36,-32768,-32768,-32768, +-32768,-32768,-32768,-32768,-32768,-32768,-32768,-32768,-32768, 119, +-32768,-32768,-32768, 2,-32768,-32768,-32768,-32768, 39,-32768, +-32768,-32768,-32768,-32768,-32768,-32768,-32768, -20, -19, -14, +-32768,-32768, -11, 84, -22,-32768, -30, 3,-32768,-32768, +-32768,-32768,-32768, 178,-32768, 177, 233,-32768,-32768, 163, + 96,-32768, 122,-32768, 131, -1 }; -#define YYLAST 443 +#define YYLAST 485 -static const short yytable[] = { 8, - 17, 119, 75, 49, 149, 150, 151, 152, 153, 154, - 155, 156, 1, 157, 83, 87, 1, 189, 85, 88, - 248, 190, 89, -101, 191, 1, 249, 70, 2, 70, - 97, 1, 241, 27, 100, 15, 1, 1, 49, 201, - 202, 203, 204, 205, 206, 207, 208, 209, 210, 211, - 212, 213, 214, 215, 216, 217, 218, 219, 220, 221, - 222, 223, 224, 225, 226, 227, 17, -163, 126, 116, - -163, -33, 71, -100, 71, 114, 189, -33, 118, 72, - 190, 29, -163, 191, -163, -163, 29, 125, 29, 99, - 146, 127, 128, 129, 130, 82, 94, 57, -163, 63, - 131, 132, 1, 119, 1, 57, 228, 133, 134, -163, - 18, 117, 246, 1, 135, 247, 19, 99, 136, 95, - 19, 45, 137, 138, 30, 1, 96, 31, 32, 30, - 33, 30, 31, 32, 31, 76, 84, 17, 30, 30, - 78, 31, 31, 2, 62, 66, 69, -163, -68, -68, - -162, -162, 86, 95, -163, -162, 45, 98, 95, 119, - 96, 26, 27, 101, 102, 183, 184, 185, 186, 187, - 188, -67, -67, 170, 171, -92, -92, 105, 244, 245, - 118, 185, 186, 187, 188, 111, 106, -14, 108, 234, - 183, 184, 185, 186, 187, 188, 243, 162, 163, 164, - 165, 166, 167, 168, 169, 170, 171, 172, 173, 174, - 175, 176, 177, 170, 171, 107, 109, 178, 179, 180, - 181, 182, 183, 184, 185, 186, 187, 188, 181, 182, - 183, 184, 185, 186, 187, 188, 118, 71, -100, 145, - 115, 198, 144, -63, 147, 234, 162, 163, 164, 165, - 166, 167, 168, 169, 170, 171, 172, 173, 174, 175, - 176, 177, 148, 161, 199, 254, 178, 179, 180, 181, - 182, 183, 184, 185, 186, 187, 188, 162, 163, 200, - 165, 166, 167, 168, 169, 170, 171, 172, 173, 174, - 175, 176, 177, 255, 16, 104, 68, 178, 179, 180, - 181, 182, 183, 184, 185, 186, 187, 188, 162, 121, - 22, 165, 166, 167, 168, 169, 170, 171, 172, 173, - 174, 175, 176, 177, 25, 242, 252, 112, 178, 179, - 180, 181, 182, 183, 184, 185, 186, 187, 188, 165, - 166, 167, 168, 169, 170, 171, 172, 173, 174, 175, - 176, 177, 113, 53, 160, 250, 178, 179, 180, 181, - 182, 183, 184, 185, 186, 187, 188, 165, 251, 141, - 168, 169, 170, 171, 124, 0, 0, 0, 176, 177, - 165, 0, 0, 0, 178, 170, 171, 181, 182, 183, - 184, 185, 186, 187, 188, 0, 0, 178, 0, 0, - 181, 182, 183, 184, 185, 186, 187, 188, 165, 0, - 0, 0, 0, 170, 171, 0, 0, 0, 0, 0, - 170, 171, 0, 0, 0, 0, 0, 0, 181, 182, - 183, 184, 185, 186, 187, 188, 182, 183, 184, 185, - 186, 187, 188 +static const short yytable[] = { 15, + 10, 18, 139, 51, 104, 42, -103, 81, 1, 84, + 15, 1, 18, 55, 68, 80, 137, 72, 241, 63, + 249, 73, 55, 22, 74, 21, 250, 247, 70, 84, + 248, 2, 237, 81, 85, 89, 52, 53, 22, 61, + 82, 80, 71, 87, 83, 22, 80, 67, 42, 2, + 94, 98, 101, 86, 3, 79, -102, 3, 56, 15, + 4, 18, 3, 4, 3, 57, 23, 56, 4, 24, + 4, 106, 15, 108, 18, 89, 186, -168, -67, -67, + 187, 23, 197, 188, 24, 25, 38, 26, 23, 129, + 23, 24, 25, 24, 167, 168, 51, 135, 23, 138, + 186, 24, 109, 15, 187, 18, 15, 188, 18, 69, + 179, 180, 181, 182, 183, 184, 185, -94, -94, 15, + 15, 18, 18, 95, 139, 110, 111, 112, 113, 38, + 182, 183, 184, 185, 114, 115, 53, 15, 56, 18, + -102, 116, 117, 105, 131, 130, -14, 139, 118, 133, + 132, 194, 119, 195, 4, 159, 120, 121, 162, 163, + 164, 165, 166, 167, 168, 169, 170, 171, 172, 173, + 174, 158, 145, 167, 168, 175, 176, 177, 178, 179, + 180, 181, 182, 183, 184, 185, 15, 230, 18, 51, + 180, 181, 182, 183, 184, 185, 15, 196, 18, 180, + 181, 182, 183, 184, 185, 146, 147, 148, 149, 150, + 151, 152, 153, -63, 154, 200, 240, 201, 252, 257, + 259, 138, 260, 50, 128, 141, 100, 238, 15, 255, + 18, 256, 254, 102, 103, 46, 124, 144, 15, 251, + 18, 0, 157, 0, 138, 0, 15, 230, 18, 0, + 0, 15, 0, 18, 202, 203, 204, 205, 206, 207, + 208, 209, 210, 211, 212, 213, 214, 215, 216, 217, + 218, 219, 220, 221, 222, 223, 224, 225, 226, 227, + 228, 159, 160, 161, 162, 163, 164, 165, 166, 167, + 168, 169, 170, 171, 172, 173, 174, 167, 168, 0, + 0, 175, 176, 177, 178, 179, 180, 181, 182, 183, + 184, 185, 178, 179, 180, 181, 182, 183, 184, 185, + 0, 0, 0, 0, 0, 199, 159, 160, 161, 162, + 163, 164, 165, 166, 167, 168, 169, 170, 171, 172, + 173, 174, 0, 0, 0, 0, 175, 176, 177, 178, + 179, 180, 181, 182, 183, 184, 185, 159, 160, 0, + 162, 163, 164, 165, 166, 167, 168, 169, 170, 171, + 172, 173, 174, 0, 0, 0, 0, 175, 176, 177, + 178, 179, 180, 181, 182, 183, 184, 185, 162, 163, + 164, 165, 166, 167, 168, 169, 170, 171, 172, 173, + 174, 0, 0, 0, 0, 175, 176, 177, 178, 179, + 180, 181, 182, 183, 184, 185, 162, 0, 0, 165, + 166, 167, 168, 0, 0, 0, 0, 173, 174, 162, + 0, 0, 0, 175, 167, 168, 178, 179, 180, 181, + 182, 183, 184, 185, 0, 0, 175, 0, 0, 178, + 179, 180, 181, 182, 183, 184, 185, 162, 0, 0, + 0, 0, 167, 168, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 178, 179, 180, + 181, 182, 183, 184, 185 }; static const short yycheck[] = { 0, - 9, 87, 30, 18, 127, 128, 129, 130, 131, 132, - 133, 134, 4, 136, 33, 47, 4, 47, 33, 51, - 49, 51, 54, 3, 54, 4, 55, 5, 45, 5, - 45, 4, 3, 47, 53, 4, 4, 4, 53, 162, - 163, 164, 165, 166, 167, 168, 169, 170, 171, 172, - 173, 174, 175, 176, 177, 178, 179, 180, 181, 182, - 183, 184, 185, 186, 187, 188, 75, 59, 4, 84, - 58, 50, 50, 53, 50, 48, 47, 56, 87, 57, - 51, 4, 49, 54, 52, 52, 4, 88, 4, 53, - 118, 27, 28, 29, 30, 4, 4, 4, 0, 4, - 36, 37, 4, 189, 4, 4, 4, 43, 44, 0, - 50, 4, 49, 4, 50, 52, 56, 81, 54, 45, - 56, 18, 58, 59, 47, 4, 45, 50, 51, 47, - 53, 47, 50, 51, 50, 4, 33, 146, 47, 47, - 32, 50, 50, 45, 26, 27, 28, 46, 48, 49, - 48, 49, 3, 79, 45, 48, 53, 53, 84, 245, - 79, 46, 47, 57, 56, 36, 37, 38, 39, 40, - 41, 48, 49, 19, 20, 48, 49, 59, 48, 49, - 189, 38, 39, 40, 41, 67, 46, 46, 49, 190, - 36, 37, 38, 39, 40, 41, 197, 11, 12, 13, - 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, - 24, 25, 26, 19, 20, 48, 4, 31, 32, 33, - 34, 35, 36, 37, 38, 39, 40, 41, 34, 35, - 36, 37, 38, 39, 40, 41, 245, 50, 53, 46, - 52, 55, 4, 48, 48, 246, 11, 12, 13, 14, + 0, 0, 107, 11, 60, 3, 3, 38, 4, 46, + 11, 4, 11, 5, 26, 38, 4, 47, 4, 25, + 49, 51, 5, 4, 54, 4, 55, 49, 26, 66, + 52, 45, 3, 64, 46, 4, 46, 47, 4, 4, + 38, 64, 3, 49, 53, 4, 69, 4, 46, 45, + 52, 53, 54, 57, 50, 4, 53, 50, 50, 60, + 56, 60, 50, 56, 50, 57, 47, 50, 56, 50, + 56, 69, 73, 73, 73, 4, 47, 46, 48, 49, + 51, 47, 138, 54, 50, 51, 3, 53, 47, 91, + 47, 50, 51, 50, 19, 20, 104, 99, 47, 107, + 47, 50, 4, 104, 51, 104, 107, 54, 107, 26, + 35, 36, 37, 38, 39, 40, 41, 48, 49, 120, + 121, 120, 121, 4, 229, 27, 28, 29, 30, 46, + 38, 39, 40, 41, 36, 37, 47, 138, 50, 138, + 53, 43, 44, 52, 48, 46, 46, 252, 50, 4, + 49, 4, 54, 46, 56, 11, 58, 59, 14, 15, + 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, + 26, 55, 52, 19, 20, 31, 32, 33, 34, 35, + 36, 37, 38, 39, 40, 41, 187, 187, 187, 197, + 36, 37, 38, 39, 40, 41, 197, 48, 197, 36, + 37, 38, 39, 40, 41, 110, 111, 112, 113, 114, + 115, 116, 117, 48, 119, 58, 48, 59, 49, 48, + 0, 229, 0, 5, 91, 107, 54, 189, 229, 249, + 229, 252, 247, 56, 58, 3, 74, 107, 239, 239, + 239, -1, 121, -1, 252, -1, 247, 247, 247, -1, + -1, 252, -1, 252, 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, + 185, 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, 52, 55, 58, 0, 31, 32, 33, 34, - 35, 36, 37, 38, 39, 40, 41, 11, 12, 59, + 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, 0, 3, 59, 28, 31, 32, 33, - 34, 35, 36, 37, 38, 39, 40, 41, 11, 87, - 12, 14, 15, 16, 17, 18, 19, 20, 21, 22, - 23, 24, 25, 26, 12, 192, 248, 71, 31, 32, - 33, 34, 35, 36, 37, 38, 39, 40, 41, 14, - 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, - 25, 26, 73, 18, 138, 245, 31, 32, 33, 34, - 35, 36, 37, 38, 39, 40, 41, 14, 246, 89, - 17, 18, 19, 20, 87, -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, -1, -1, 34, 35, - 36, 37, 38, 39, 40, 41, 35, 36, 37, 38, - 39, 40, 41 + 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, -1, + -1, -1, -1, -1, -1, -1, -1, 34, 35, 36, + 37, 38, 39, 40, 41 }; #define YYPURE 1 @@ -1036,7 +1044,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*/ @@ -1046,7 +1054,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]; @@ -1120,11 +1128,11 @@ case 8: ; break;} case 12: -#line 209 "compile.y" +#line 208 "compile.y" { yyval=yyvsp[-1]; P(*yyval, *yyvsp[0]) ; break;} case 16: -#line 213 "compile.y" +#line 212 "compile.y" { PC.explicit_result=false; const String& name=*LA2S(*yyvsp[-4]); @@ -1163,41 +1171,27 @@ case 16: ; break;} case 17: -#line 248 "compile.y" +#line 247 "compile.y" { // fill in the code reinterpret_cast(yyvsp[-1])->parser_code=yyvsp[0]; ; break;} case 20: -#line 254 "compile.y" +#line 253 "compile.y" {yyval=yyvsp[-1]; break;} case 24: -#line 256 "compile.y" +#line 255 "compile.y" { yyval=yyvsp[-2]; P(*yyval, *yyvsp[0]) ; break;} case 30: -#line 264 "compile.y" +#line 263 "compile.y" { yyval=yyvsp[-1]; P(*yyval, *yyvsp[0]) ; break;} -case 33: -#line 266 "compile.y" -{ - *reinterpret_cast(&yyval)=PC.explicit_result; - PC.explicit_result=false; -; - break;} -case 34: +case 36: #line 269 "compile.y" { - PC.explicit_result=reinterpret_cast(yyvsp[-1]); - yyval=yyvsp[0]; -; - break;} -case 38: -#line 277 "compile.y" -{ yyval=yyvsp[0]; /* stack: resulting value */ changetail_or_append(*yyval, OP_GET_ELEMENT, false, /*->*/OP_GET_ELEMENT__WRITE, @@ -1205,16 +1199,16 @@ case 38: ); /* value=pop; wcontext.write(value) */ ; break;} -case 39: -#line 284 "compile.y" +case 37: +#line 276 "compile.y" { yyval=yyvsp[0] ; break;} -case 42: -#line 286 "compile.y" +case 40: +#line 278 "compile.y" { yyval=yyvsp[-1] ; break;} -case 45: -#line 290 "compile.y" +case 43: +#line 282 "compile.y" { yyval=N(); ArrayOperation* diving_code=yyvsp[0]; @@ -1238,23 +1232,23 @@ case 45: /* diving code; stack: current context */ ; break;} -case 46: -#line 312 "compile.y" +case 44: +#line 304 "compile.y" { yyval=yyvsp[-1]; P(*yyval, *yyvsp[0]) ; break;} -case 48: -#line 313 "compile.y" +case 46: +#line 305 "compile.y" { yyval=yyvsp[-1]; P(*yyval, *yyvsp[0]) ; break;} -case 49: -#line 317 "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 53: -#line 325 "compile.y" +case 51: +#line 317 "compile.y" { yyval=N(); ArrayOperation* diving_code=yyvsp[0]; @@ -1273,28 +1267,41 @@ case 53: /* diving code; stack: current context */ ; break;} -case 54: -#line 342 "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 55: -#line 347 "compile.y" +case 53: +#line 339 "compile.y" { yyval=yyvsp[-1]; P(*yyval, *yyvsp[0]) ; break;} +case 57: +#line 346 "compile.y" +{ + // allow $result_or_other_variable[ letters here any time ] + *reinterpret_cast(&yyval)=PC.explicit_result; PC.explicit_result=false; +; + break;} +case 58: +#line 349 "compile.y" +{ + PC.explicit_result=*reinterpret_cast(&yyvsp[-1]); +; + break;} case 59: -#line 354 "compile.y" +#line 351 "compile.y" { // stack: context, name - yyval=yyvsp[-1]; // stack: context, name, value + yyval=yyvsp[-2]; // stack: context, name, value O(*yyval, OP_CONSTRUCT_VALUE); /* value=pop; name=pop; context=pop; construct(context,name,value) */ ; break;} case 60: -#line 360 "compile.y" +#line 357 "compile.y" { yyval=N(); O(*yyval, OP_PREPARE_TO_EXPRESSION); @@ -1304,7 +1311,7 @@ case 60: ; break;} case 61: -#line 368 "compile.y" +#line 365 "compile.y" { // stack: context, name yyval=N(); @@ -1312,7 +1319,7 @@ case 61: ; break;} case 65: -#line 379 "compile.y" +#line 376 "compile.y" { yyval=N(); OA(*yyval, OP_OBJECT_POOL, yyvsp[0]); /* stack: empty write context */ @@ -1321,11 +1328,11 @@ case 65: ; break;} case 68: -#line 386 "compile.y" +#line 383 "compile.y" { yyval=yyvsp[-1]; P(*yyval, *yyvsp[0]) ; break;} case 69: -#line 390 "compile.y" +#line 387 "compile.y" { yyval=yyvsp[0]; /* stack: value */ changetail_or_append(*yyval, @@ -1334,19 +1341,19 @@ case 69: ; break;} case 70: -#line 396 "compile.y" +#line 393 "compile.y" { PC.in_call_value=true; ; break;} case 71: -#line 399 "compile.y" +#line 396 "compile.y" { PC.in_call_value=false; ; break;} case 72: -#line 402 "compile.y" +#line 399 "compile.y" { /* ^field.$method{vasya} */ yyval=yyvsp[-3]; /* with_xxx,diving code; stack: context,method_junction */ @@ -1361,56 +1368,69 @@ case 72: ; break;} case 75: -#line 417 "compile.y" +#line 414 "compile.y" { yyval=yyvsp[-1]; P(*yyval, *yyvsp[0]) ; break;} case 79: -#line 423 "compile.y" -{yyval=yyvsp[-1]; +#line 420 "compile.y" +{ + // allow ^call[ letters here any time ] + *reinterpret_cast(&yyval)=PC.explicit_result; PC.explicit_result=false; +; break;} case 80: -#line 424 "compile.y" -{yyval=yyvsp[-1]; +#line 423 "compile.y" +{ + PC.explicit_result=*reinterpret_cast(&yyvsp[-1]); +; break;} case 81: #line 425 "compile.y" +{yyval=yyvsp[-2]; + break;} +case 82: +#line 426 "compile.y" {yyval=yyvsp[-1]; break;} case 83: -#line 428 "compile.y" -{ yyval=yyvsp[-2]; P(*yyval, *yyvsp[0]) ; +#line 427 "compile.y" +{yyval=yyvsp[-1]; break;} case 85: -#line 432 "compile.y" +#line 430 "compile.y" { yyval=yyvsp[-2]; P(*yyval, *yyvsp[0]) ; break;} case 87: -#line 436 "compile.y" +#line 434 "compile.y" { yyval=yyvsp[-2]; P(*yyval, *yyvsp[0]) ; break;} -case 88: +case 89: #line 438 "compile.y" +{ yyval=yyvsp[-2]; P(*yyval, *yyvsp[0]) ; + break;} +case 90: +#line 440 "compile.y" { yyval=yyvsp[0]; O(*yyval, OP_STORE_PARAM); ; break;} -case 89: -#line 442 "compile.y" +case 91: +#line 444 "compile.y" { yyval=N(); OA(*yyval, OP_EXPR_CODE__STORE_PARAM, yyvsp[0]); ; break;} -case 90: -#line 446 "compile.y" +case 92: +#line 448 "compile.y" { yyval=N(); OA(*yyval, OP_CURLY_CODE__STORE_PARAM, yyvsp[0]); ; break;} -case 94: -#line 455 "compile.y" +case 96: +#line 457 "compile.y" { yyval=N(); O(*yyval, OP_PREPARE_TO_EXPRESSION); @@ -1418,16 +1438,16 @@ case 94: O(*yyval, OP_WRITE_EXPR_RESULT); ; break;} -case 96: -#line 464 "compile.y" -{ yyval=yyvsp[-1]; P(*yyval, *yyvsp[0]) ; - break;} case 98: #line 466 "compile.y" { yyval=yyvsp[-1]; P(*yyval, *yyvsp[0]) ; break;} case 100: #line 468 "compile.y" +{ yyval=yyvsp[-1]; P(*yyval, *yyvsp[0]) ; + break;} +case 102: +#line 470 "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 @@ -1437,23 +1457,23 @@ case 100: O(*yyval, OP_GET_ELEMENT); /* name=pop; context=pop; stack: context.get_element(name) */ ; break;} -case 101: -#line 476 "compile.y" +case 103: +#line 478 "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 107: -#line 489 "compile.y" +case 109: +#line 491 "compile.y" { yyval=yyvsp[0]; O(*yyval, OP_GET_ELEMENT); ; break;} -case 108: -#line 493 "compile.y" +case 110: +#line 495 "compile.y" { ArrayOperation* code; { @@ -1464,36 +1484,49 @@ case 108: OA(*yyval, OP_STRING_POOL, code); ; break;} -case 109: -#line 502 "compile.y" +case 111: +#line 504 "compile.y" +{ + // allow $result_or_other_variable[ letters here any time ] + *reinterpret_cast(&yyval)=PC.explicit_result; PC.explicit_result=false; +; + break;} +case 112: +#line 507 "compile.y" +{ + PC.explicit_result=*reinterpret_cast(&yyvsp[-1]); +; + break;} +case 113: +#line 509 "compile.y" { yyval=N(); - OA(*yyval, OP_OBJECT_POOL, yyvsp[-1]); /* stack: empty write context */ + OA(*yyval, OP_OBJECT_POOL, yyvsp[-2]); /* stack: empty write context */ /* some code that writes to that context */ /* context=pop; stack: context.value() */ ; break;} -case 110: -#line 508 "compile.y" +case 114: +#line 515 "compile.y" { yyval=N(); O(*yyval, OP_WITH_READ); P(*yyval, *yyvsp[0]); ; break;} -case 112: -#line 513 "compile.y" +case 116: +#line 520 "compile.y" { yyval=yyvsp[-1]; P(*yyval, *yyvsp[0]) ; break;} -case 113: -#line 514 "compile.y" +case 117: +#line 521 "compile.y" { yyval=yyvsp[0]; O(*yyval, OP_GET_ELEMENT__WRITE); ; break;} -case 116: -#line 523 "compile.y" +case 120: +#line 530 "compile.y" { yyval=yyvsp[-1]; // stack: class name string if(*LA2S(*yyval) == BASE_NAME) { // pseudo BASE class @@ -1507,8 +1540,8 @@ case 116: O(*yyval, OP_GET_CLASS); ; break;} -case 117: -#line 535 "compile.y" +case 121: +#line 542 "compile.y" { yyval=yyvsp[-1]; if(!PC.in_call_value) { @@ -1518,168 +1551,167 @@ case 117: O(*yyval, OP_PREPARE_TO_CONSTRUCT_OBJECT); ; break;} -case 118: -#line 547 "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 122: -#line 556 "compile.y" +case 126: +#line 559 "compile.y" { yyval = yyvsp[-1]; ; break;} -case 123: -#line 557 "compile.y" +case 127: +#line 560 "compile.y" { yyval = yyvsp[-1]; ; break;} -case 124: -#line 558 "compile.y" +case 128: +#line 561 "compile.y" { yyval = yyvsp[-1]; ; break;} -case 125: -#line 560 "compile.y" +case 129: +#line 563 "compile.y" { yyval=yyvsp[0]; O(*yyval, OP_NEG) ; break;} -case 126: -#line 561 "compile.y" +case 130: +#line 564 "compile.y" { yyval=yyvsp[0] ; break;} -case 127: -#line 562 "compile.y" +case 131: +#line 565 "compile.y" { yyval=yyvsp[0]; O(*yyval, OP_INV) ; break;} -case 128: -#line 563 "compile.y" +case 132: +#line 566 "compile.y" { yyval=yyvsp[0]; O(*yyval, OP_NOT) ; break;} -case 129: -#line 564 "compile.y" +case 133: +#line 567 "compile.y" { yyval=yyvsp[0]; O(*yyval, OP_DEF) ; break;} -case 130: -#line 565 "compile.y" +case 134: +#line 568 "compile.y" { yyval=yyvsp[0]; O(*yyval, OP_IN) ; break;} -case 131: -#line 566 "compile.y" +case 135: +#line 569 "compile.y" { yyval=yyvsp[0]; O(*yyval, OP_FEXISTS) ; break;} -case 132: -#line 567 "compile.y" +case 136: +#line 570 "compile.y" { yyval=yyvsp[0]; O(*yyval, OP_DEXISTS) ; break;} -case 133: -#line 569 "compile.y" +case 137: +#line 572 "compile.y" { yyval=yyvsp[-2]; P(*yyval, *yyvsp[0]); O(*yyval, OP_SUB) ; break;} -case 134: -#line 570 "compile.y" +case 138: +#line 573 "compile.y" { yyval=yyvsp[-2]; P(*yyval, *yyvsp[0]); O(*yyval, OP_ADD) ; break;} -case 135: -#line 571 "compile.y" +case 139: +#line 574 "compile.y" { yyval=yyvsp[-2]; P(*yyval, *yyvsp[0]); O(*yyval, OP_MUL) ; break;} -case 136: -#line 572 "compile.y" +case 140: +#line 575 "compile.y" { yyval=yyvsp[-2]; P(*yyval, *yyvsp[0]); O(*yyval, OP_DIV) ; break;} -case 137: -#line 573 "compile.y" +case 141: +#line 576 "compile.y" { yyval=yyvsp[-2]; P(*yyval, *yyvsp[0]); O(*yyval, OP_MOD) ; break;} -case 138: -#line 574 "compile.y" +case 142: +#line 577 "compile.y" { yyval=yyvsp[-2]; P(*yyval, *yyvsp[0]); O(*yyval, OP_INTDIV) ; break;} -case 139: -#line 575 "compile.y" +case 143: +#line 578 "compile.y" { yyval=yyvsp[-2]; P(*yyval, *yyvsp[0]); O(*yyval, OP_BIN_SL) ; break;} -case 140: -#line 576 "compile.y" +case 144: +#line 579 "compile.y" { yyval=yyvsp[-2]; P(*yyval, *yyvsp[0]); O(*yyval, OP_BIN_SR) ; break;} -case 141: -#line 577 "compile.y" +case 145: +#line 580 "compile.y" { yyval=yyvsp[-2]; P(*yyval, *yyvsp[0]); O(*yyval, OP_BIN_AND) ; break;} -case 142: -#line 578 "compile.y" +case 146: +#line 581 "compile.y" { yyval=yyvsp[-2]; P(*yyval, *yyvsp[0]); O(*yyval, OP_BIN_OR) ; break;} -case 143: -#line 579 "compile.y" +case 147: +#line 582 "compile.y" { yyval=yyvsp[-2]; P(*yyval, *yyvsp[0]); O(*yyval, OP_BIN_XOR) ; break;} -case 144: -#line 580 "compile.y" +case 148: +#line 583 "compile.y" { yyval=yyvsp[-2]; OA(*yyval, OP_NESTED_CODE, yyvsp[0]); O(*yyval, OP_LOG_AND) ; break;} -case 145: -#line 581 "compile.y" +case 149: +#line 584 "compile.y" { yyval=yyvsp[-2]; OA(*yyval, OP_NESTED_CODE, yyvsp[0]); O(*yyval, OP_LOG_OR) ; break;} -case 146: -#line 582 "compile.y" +case 150: +#line 585 "compile.y" { yyval=yyvsp[-2]; P(*yyval, *yyvsp[0]); O(*yyval, OP_LOG_XOR) ; break;} -case 147: -#line 583 "compile.y" +case 151: +#line 586 "compile.y" { yyval=yyvsp[-2]; P(*yyval, *yyvsp[0]); O(*yyval, OP_NUM_LT) ; break;} -case 148: -#line 584 "compile.y" +case 152: +#line 587 "compile.y" { yyval=yyvsp[-2]; P(*yyval, *yyvsp[0]); O(*yyval, OP_NUM_GT) ; break;} -case 149: -#line 585 "compile.y" +case 153: +#line 588 "compile.y" { yyval=yyvsp[-2]; P(*yyval, *yyvsp[0]); O(*yyval, OP_NUM_LE) ; break;} -case 150: -#line 586 "compile.y" +case 154: +#line 589 "compile.y" { yyval=yyvsp[-2]; P(*yyval, *yyvsp[0]); O(*yyval, OP_NUM_GE) ; break;} -case 151: -#line 587 "compile.y" +case 155: +#line 590 "compile.y" { yyval=yyvsp[-2]; P(*yyval, *yyvsp[0]); O(*yyval, OP_NUM_EQ) ; break;} -case 152: -#line 588 "compile.y" +case 156: +#line 591 "compile.y" { yyval=yyvsp[-2]; P(*yyval, *yyvsp[0]); O(*yyval, OP_NUM_NE) ; break;} -case 153: -#line 589 "compile.y" +case 157: +#line 592 "compile.y" { yyval=yyvsp[-2]; P(*yyval, *yyvsp[0]); O(*yyval, OP_STR_LT) ; break;} -case 154: -#line 590 "compile.y" +case 158: +#line 593 "compile.y" { yyval=yyvsp[-2]; P(*yyval, *yyvsp[0]); O(*yyval, OP_STR_GT) ; break;} -case 155: -#line 591 "compile.y" +case 159: +#line 594 "compile.y" { yyval=yyvsp[-2]; P(*yyval, *yyvsp[0]); O(*yyval, OP_STR_LE) ; break;} -case 156: -#line 592 "compile.y" +case 160: +#line 595 "compile.y" { yyval=yyvsp[-2]; P(*yyval, *yyvsp[0]); O(*yyval, OP_STR_GE) ; break;} -case 157: -#line 593 "compile.y" +case 161: +#line 596 "compile.y" { yyval=yyvsp[-2]; P(*yyval, *yyvsp[0]); O(*yyval, OP_STR_EQ) ; break;} -case 158: -#line 594 "compile.y" +case 162: +#line 597 "compile.y" { yyval=yyvsp[-2]; P(*yyval, *yyvsp[0]); O(*yyval, OP_STR_NE) ; break;} -case 159: -#line 595 "compile.y" +case 163: +#line 598 "compile.y" { yyval=yyvsp[-2]; P(*yyval, *yyvsp[0]); O(*yyval, OP_IS) ; break;} -case 160: -#line 598 "compile.y" +case 164: +#line 601 "compile.y" +{ + // optimized from OP_STRING->OP_VALUE for doubles + maybe_change_string_literal_to_double_literal(*(yyval=yyvsp[0])); +; + break;} +case 165: +#line 606 "compile.y" { yyval=N(); OA(*yyval, OP_STRING_POOL, yyvsp[0]); /* stack: empty write context */ @@ -1687,29 +1719,19 @@ case 160: /* context=pop; stack: context.get_string() */ ; break;} -case 161: -#line 607 "compile.y" +case 166: +#line 615 "compile.y" { - // $1=OP_STRING+origin+OP_WRITE_VALUE - if(PC.explicit_result) { // only allow decoration whitespaces, no byte code actually produced - String::Body body=static_cast(yyvsp[0]->get(2).value)->string(); - if(body.for_each/*first_that, actually*/(is_not_whitespace, 0)) { - strcpy(PC.error, "only whitespaces are allowed here, look before this point (explicit result mode)"); - YYERROR; - } - yyval=N(); - } else { - // optimized from OP_STRING+origin+OP_WRITE_VALUE to OP_STRING__WRITE - change_string_literal_to_write_string_literal(*(yyval=yyvsp[0])); - } + // optimized from OP_STRING+OP_WRITE_VALUE to OP_STRING__WRITE + change_string_literal_to_write_string_literal(*(yyval=yyvsp[0])) ; break;} -case 162: -#line 622 "compile.y" +case 167: +#line 620 "compile.y" { yyval=VL(new VVoid(), 0, 0, 0) ; break;} -case 163: -#line 623 "compile.y" +case 168: +#line 621 "compile.y" { yyval=N() ; break;} } @@ -1934,7 +1956,7 @@ yyerrhandle: } return 1; } -#line 625 "compile.y" +#line 623 "compile.y" #endif @@ -2004,7 +2026,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); @@ -2123,6 +2146,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 @@ -2623,6 +2656,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: @@ -2693,7 +2736,3 @@ static void yyprint(FILE *file, int type if(type==STRING) fprintf(file, " \"%s\"", LA2S(*value)->cstr()); } - -static int is_not_whitespace(char c, int) { - return !isspace(c); -}