--- parser3/src/main/compile.tab.C 2002/10/15 14:00:44 1.72 +++ parser3/src/main/compile.tab.C 2003/01/30 14:59:44 1.81.2.2 @@ -33,17 +33,17 @@ #define FEXISTS 283 #define DEXISTS 284 #define IS 285 -#define NEG 286 +#define NUNARY 286 #line 1 "compile.y" /** @file Parser: compiler(lexical parser and grammar). - Copyright (c) 2001 ArtLebedev Group (http://www.artlebedev.com) + Copyright (c) 2001, 2003 ArtLebedev Group (http://www.artlebedev.com) Author: Alexander Petrosyan (http://design.ru/paf) - $Id: compile.tab.C,v 1.72 2002/10/15 14:00:44 paf Exp $ + $Id: compile.tab.C,v 1.81.2.2 2003/01/30 14:59:44 paf Exp $ */ /** @@ -57,7 +57,7 @@ -#: in iis make up specialized Pool object for that */ -#define YYSTYPE Array/**/ * +#define YYSTYPE ArrayOperationPtr #define YYPARSE_PARAM pc #define YYLEX_PARAM pc #define YYDEBUG 1 @@ -110,16 +110,16 @@ static const char yytranslate[] = { 2, 2, 2, 2, 2, 2, 2, 2, 2, 46, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, - 2, 2, 34, 58, 2, 50, 42, 36, 59, 54, - 55, 40, 39, 2, 38, 53, 41, 2, 2, 2, + 2, 2, 44, 58, 2, 50, 41, 35, 59, 54, + 55, 38, 36, 2, 37, 53, 39, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 57, 49, 32, 2, 33, 2, 45, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, - 47, 43, 48, 56, 2, 2, 2, 2, 2, 2, + 47, 40, 48, 56, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, - 2, 2, 51, 35, 52, 37, 2, 2, 2, 2, + 2, 2, 51, 34, 52, 43, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, @@ -135,7 +135,7 @@ static const char yytranslate[] = { 2, 2, 2, 2, 2, 1, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, - 27, 28, 29, 30, 31, 44 + 27, 28, 29, 30, 31, 42 }; #if YYDEBUG != 0 @@ -189,14 +189,14 @@ static const short yyrhs[] = { 62, 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, 38, - 134, 0, 39, 134, 0, 37, 134, 0, 34, 134, + 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, 38, 134, 0, 134, 39, 134, - 0, 134, 40, 134, 0, 134, 41, 134, 0, 134, - 42, 134, 0, 134, 43, 134, 0, 134, 19, 134, - 0, 134, 20, 134, 0, 134, 36, 134, 0, 134, - 35, 134, 0, 134, 14, 134, 0, 134, 11, 134, + 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, @@ -210,22 +210,22 @@ static const short yyrhs[] = { 62, #if YYDEBUG != 0 static const short yyrline[] = { 0, - 114, 124, 126, 126, 127, 129, 129, 131, 198, 198, - 199, 199, 200, 201, 201, 203, 232, 232, 233, 234, - 234, 235, 235, 237, 237, 241, 241, 243, 243, 244, - 244, 245, 245, 245, 249, 256, 257, 257, 258, 259, - 261, 262, 288, 289, 289, 293, 297, 299, 300, 301, - 318, 323, 325, 327, 328, 330, 336, 344, 350, 352, - 353, 355, 361, 362, 362, 366, 372, 375, 378, 391, - 393, 393, 394, 396, 397, 399, 400, 401, 402, 404, - 406, 408, 410, 412, 414, 418, 422, 426, 428, 429, - 431, 440, 440, 442, 442, 443, 444, 452, 457, 459, - 461, 462, 463, 465, 469, 478, 484, 489, 489, 490, - 495, 497, 499, 511, 523, 528, 530, 531, 532, 533, - 534, 536, 537, 538, 539, 540, 541, 542, 543, 545, - 546, 547, 548, 549, 550, 551, 552, 553, 554, 555, - 556, 557, 558, 559, 560, 561, 562, 563, 564, 565, - 566, 567, 568, 569, 570, 571, 574, 583, 588, 589 + 115, 123, 125, 125, 126, 128, 128, 130, 195, 195, + 196, 196, 197, 198, 198, 200, 229, 229, 230, 231, + 231, 232, 232, 234, 234, 238, 238, 240, 240, 241, + 241, 242, 242, 242, 246, 253, 254, 254, 255, 256, + 258, 259, 281, 282, 282, 286, 290, 292, 293, 294, + 311, 316, 318, 320, 321, 323, 329, 337, 343, 345, + 346, 348, 354, 355, 355, 359, 365, 368, 371, 384, + 386, 386, 387, 389, 390, 392, 393, 394, 395, 397, + 399, 401, 403, 405, 407, 411, 415, 419, 421, 422, + 424, 433, 433, 435, 435, 436, 437, 445, 450, 452, + 454, 455, 456, 458, 462, 471, 477, 482, 482, 483, + 488, 490, 492, 504, 516, 521, 523, 524, 525, 526, + 527, 529, 530, 531, 532, 533, 534, 535, 536, 538, + 539, 540, 541, 542, 543, 544, 545, 546, 547, 548, + 549, 550, 551, 552, 553, 554, 555, 556, 557, 558, + 559, 560, 561, 562, 563, 564, 567, 576, 581, 582 }; #endif @@ -237,8 +237,8 @@ static const char * const yytname[] = { "BAD_METHOD_PARAMETER_NAME_CHARACTER","BAD_MATH_OPERATOR_CHARACTER","\"&&\"", "\"||\"","\"!||\"","\"!|\"","\"<=\"","\">=\"","\"==\"","\"!=\"","\"<<\"","\">>\"", "\"lt\"","\"gt\"","\"le\"","\"ge\"","\"eq\"","\"ne\"","\"def\"","\"in\"","\"-f\"", -"\"-d\"","\"is\"","'<'","'>'","'!'","'|'","'&'","'~'","'-'","'+'","'*'","'/'", -"'%'","'\\\\'","NEG","'@'","'\\n'","'['","']'","';'","'$'","'{'","'}'","'.'", +"\"-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", @@ -312,15 +312,15 @@ static const short yydefact[] = { 160, 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, 125, 124, - 122, 123, 0, 157, 0, 0, 57, 0, 0, 0, + 24, 65, 56, 58, 126, 127, 128, 129, 123, 122, + 124, 125, 0, 157, 0, 0, 57, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 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, 130, 131, - 132, 133, 134, 135, 158, 90, 0, 79, 85, 88, + 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 @@ -337,156 +337,154 @@ static const short yydefgoto[] = { 250 47, 48, 237, 132, 155, 19, 230, 20 }; -static const short yypact[] = { 36, --32768, 16, 98,-32768, 53,-32768,-32768,-32768,-32768,-32768, +static const short yypact[] = { 13, +-32768, 24, 98,-32768, 36,-32768,-32768,-32768,-32768,-32768, 14,-32768,-32768,-32768,-32768,-32768,-32768,-32768,-32768,-32768, - -3, 4, 14, 107, 30, 46,-32768,-32768, 116,-32768, --32768,-32768, -15,-32768,-32768,-32768,-32768, 105,-32768, 73, --32768, 18,-32768,-32768,-32768, 105, 82,-32768, 30,-32768, --32768, 136, 137, 96,-32768, 107,-32768, 97,-32768, 41, --32768,-32768, 94, 105, 112, 105, 97,-32768, 46, 112, --32768, 44, 14, 29,-32768,-32768,-32768,-32768, 1,-32768, --32768, 18,-32768,-32768,-32768,-32768,-32768,-32768,-32768,-32768, - 6,-32768, 110, 121,-32768, 120, 123,-32768, 165,-32768, --32768,-32768,-32768,-32768,-32768, 112, 122, 14, 67, 125, --32768,-32768,-32768,-32768, 124,-32768, 29, 29, 29, 29, - 29, 29, 29, 29, 103, 29, 14, 14,-32768,-32768, - 119, 281, 52,-32768,-32768,-32768,-32768, 173,-32768, 133, --32768, 14,-32768,-32768, 450, 450, 450, 450, 450, 433, --32768,-32768, 236,-32768, 126, 131,-32768, 29, 29, 29, - 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, - 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, - 29, 29, 29, 29, 45, 14, 29, 66,-32768,-32768, --32768,-32768,-32768, 14,-32768,-32768,-32768, 377, 347, 314, - 245, 407, 407, 420, 420, 187, 458, 407, 407, 407, - 407, 420, 420, 450, 407, 407, -12, 433, 81, 81, --32768,-32768,-32768,-32768, 83,-32768, 85,-32768,-32768,-32768, --32768, -30,-32768, 63,-32768,-32768,-32768,-32768,-32768,-32768, --32768, 45, 14,-32768, 29,-32768,-32768,-32768,-32768, 180, + -26, 39, 14, 44, 45, 100,-32768,-32768, 47,-32768, +-32768,-32768, 52,-32768,-32768,-32768,-32768, 118,-32768, 59, +-32768, 4,-32768,-32768,-32768, 118, -3,-32768, 45,-32768, +-32768, 101, 113, 71,-32768, 44,-32768, 70,-32768, 32, +-32768,-32768, 73, 118, 83, 118, 70,-32768, 100, 83, +-32768, 27, 14, 57,-32768,-32768,-32768,-32768, 1,-32768, +-32768, 4,-32768,-32768,-32768,-32768,-32768,-32768,-32768,-32768, + 20,-32768, 78, 91,-32768, 90, 94,-32768, 135,-32768, +-32768,-32768,-32768,-32768,-32768, 83, 92, 14, -22, 106, +-32768,-32768,-32768,-32768, 115,-32768, 57, 57, 57, 57, + 57, 57, 57, 57, 105, 57, 14, 14,-32768,-32768, + 114, 281, 72,-32768,-32768,-32768,-32768, 142,-32768, 107, +-32768, 14,-32768,-32768, 440, 440, 440, 440,-32768,-32768, +-32768,-32768, 236,-32768, 112, 120,-32768, 57, 57, 57, + 57, 57, 57, 57, 57, 57, 57, 57, 57, 57, + 57, 57, 57, 57, 57, 57, 57, 57, 57, 57, + 57, 57, 57, 57, 41, 14, 57, 5,-32768,-32768, +-32768,-32768,-32768, 14,-32768,-32768,-32768, 371, 343, 312, + 244, 399, 399, 412, 412, 136, 136, 399, 399, 399, + 399, 412, 412, 440, 399, 399, 447, 453, 93, 93, +-32768,-32768,-32768,-32768, -11,-32768, 19,-32768,-32768,-32768, +-32768, -10,-32768, -33,-32768,-32768,-32768,-32768,-32768,-32768, +-32768, 41, 14,-32768, 57,-32768,-32768,-32768,-32768, 180, 181,-32768 }; static const short yypgoto[] = {-32768, --32768,-32768, 177,-32768,-32768,-32768, 100,-32768,-32768,-32768, - 138,-32768,-32768,-32768, 3, -18, -7, -71,-32768, 0, --32768,-32768, -11,-32768,-32768, -29,-32768,-32768,-32768,-32768, --32768,-32768,-32768,-32768,-32768,-32768, 159,-32768,-32768,-32768, - 2,-32768,-32768,-32768,-32768, 5,-32768,-32768,-32768,-32768, --32768,-32768, -47, -13, -10,-32768,-32768, 58, 79, -23, --32768, -22, 9,-32768,-32768,-32768, 178,-32768, 179, 233, --32768,-32768, 164, 40, 111,-32768, 168, 84 +-32768,-32768, 177,-32768,-32768,-32768, 99,-32768,-32768,-32768, + 129,-32768,-32768,-32768, 3, -18, -7, -71,-32768, 0, +-32768,-32768, -6,-32768,-32768, -37,-32768,-32768,-32768,-32768, +-32768,-32768,-32768,-32768,-32768,-32768, 119,-32768,-32768,-32768, + 2,-32768,-32768,-32768,-32768, -4,-32768,-32768,-32768,-32768, +-32768,-32768, -50, -52, -48,-32768,-32768, -16, 95, -23, +-32768, -24, 9,-32768,-32768,-32768, 169,-32768, 168, 224, +-32768,-32768, 154, 40, 102,-32768, 157, -20 }; -#define YYLAST 501 +#define YYLAST 494 static const short yytable[] = { 15, - 109, 18, 10, 51, 60, 55, 166, 167, 55, 89, - 15, 42, 18, 63, 80, 81, 84, 1, 243, 21, - -98, 244, 15, 178, 18, 179, 180, 181, 182, 183, - 184, 72, 116, 22, 70, 73, 84, 87, 74, 1, - 80, 81, 52, 53, 1, 80, 82, 107, 225, 67, - 56, -160, 51, 56, 42, 117, 118, 119, 120, 15, - 57, 18, 121, 3, 108, 122, 123, 124, 238, 4, - -97, 15, 15, 18, 18, 115, 23, 106, 125, 24, - 2, 38, 126, 68, 4, 3, 127, 128, 104, 142, - 3, 4, 23, 3, 3, 24, 4, 2, 185, 4, - 4, 22, 186, 85, 69, 187, 22, 15, 79, 18, - 61, 245, 185, 109, -64, -64, 186, 246, 71, 187, - 181, 182, 183, 184, 38, 83, 15, 15, 18, 18, - -89, -89, 241, 242, 51, 94, 98, 101, 86, 89, - 95, 15, 53, 18, 23, 105, 56, 24, 25, 23, - 26, 23, 24, 25, 24, 136, 145, 146, 147, 148, - 149, 150, 151, 152, -97, 153, -14, 137, 139, -60, - 109, 138, 143, 157, 135, 144, 193, 108, 194, 251, - 252, 50, 141, 196, 15, 15, 18, 18, 231, 197, - 134, 100, 239, 15, 247, 18, 240, 198, 199, 200, + 109, 18, 10, 51, 60, 55, -98, 238, 84, 68, + 15, 42, 18, 81, 80, 245, 1, 1, 63, 52, + 53, 246, 15, 89, 18, -64, -64, 21, 84, 85, + 107, 94, 98, 101, 70, 1, -89, -89, 243, 81, + 80, 244, 87, 55, 225, 80, 82, 61, 22, 71, + 56, 185, 51, 86, 42, 186, -97, 2, 187, 15, + 116, 18, 3, 3, 108, -160, 241, 242, 4, 4, + 135, 15, 15, 18, 18, 115, 3, 106, 141, 104, + 2, 3, 4, 117, 118, 119, 120, 4, 56, 142, + 3, 23, 121, 122, 24, 57, 4, 38, 72, 123, + 124, 22, 73, 67, 89, 74, 125, 15, 22, 18, + 126, 83, 4, 109, 127, 128, 95, 53, 185, 56, + 69, 79, 186, 136, 105, 187, 15, 15, 18, 18, + 181, 182, 183, 184, 51, -97, -14, 137, 139, -60, + 38, 15, 138, 18, 23, 193, 23, 24, 25, 24, + 26, 23, 194, 143, 24, 25, 145, 146, 147, 148, + 149, 150, 151, 152, 23, 153, 144, 24, 157, 196, + 109, 179, 180, 181, 182, 183, 184, 108, 197, 251, + 252, 50, 100, 239, 15, 15, 18, 18, 231, 134, + 111, 247, 249, 15, 248, 18, 240, 198, 199, 200, 201, 202, 203, 204, 205, 206, 207, 208, 209, 210, 211, 212, 213, 214, 215, 216, 217, 218, 219, 220, - 221, 222, 223, 224, 179, 180, 181, 182, 183, 184, - 111, 249, 248, 102, 108, 46, 103, 131, 156, 114, + 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, 0, 166, 167, 0, 174, 175, 176, 0, - 177, 178, 0, 179, 180, 181, 182, 183, 184, 177, - 178, 0, 179, 180, 181, 182, 183, 184, 0, 0, + 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, 0, 177, 178, 0, 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, 0, 177, 178, - 0, 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, - 0, 177, 178, 0, 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, - 0, 177, 178, 0, 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, - 0, 177, 178, 0, 179, 180, 181, 182, 183, 184, - 174, 166, 167, 0, 177, 178, 0, 179, 180, 181, + 0, 174, 175, 176, 177, 178, 179, 180, 181, 182, + 183, 184, 158, 159, 0, 161, 162, 163, 164, 165, + 166, 167, 168, 169, 170, 171, 172, 173, 0, 0, + 0, 0, 174, 175, 176, 177, 178, 179, 180, 181, + 182, 183, 184, 158, 0, 0, 161, 162, 163, 164, + 165, 166, 167, 168, 169, 170, 171, 172, 173, 0, + 0, 0, 0, 174, 175, 176, 177, 178, 179, 180, + 181, 182, 183, 184, 161, 162, 163, 164, 165, 166, + 167, 168, 169, 170, 171, 172, 173, 0, 0, 0, + 0, 174, 175, 176, 177, 178, 179, 180, 181, 182, + 183, 184, 161, 0, 0, 164, 165, 166, 167, 0, + 0, 0, 0, 172, 173, 161, 0, 0, 0, 174, + 166, 167, 177, 178, 179, 180, 181, 182, 183, 184, + 0, 0, 174, 0, 0, 177, 178, 179, 180, 181, 182, 183, 184, 161, 0, 0, 0, 0, 166, 167, - 179, 180, 181, 182, 183, 184, 166, 0, 0, 0, - 0, 0, 0, 0, 177, 178, 0, 179, 180, 181, - 182, 183, 184, 0, 0, 179, 180, 181, 182, 183, - 184 + 0, 0, 0, 0, 0, 166, 167, 0, 0, 0, + 0, 166, 167, 177, 178, 179, 180, 181, 182, 183, + 184, 178, 179, 180, 181, 182, 183, 184, 179, 180, + 181, 182, 183, 184 }; static const short yycheck[] = { 0, - 72, 0, 0, 11, 23, 5, 19, 20, 5, 4, - 11, 3, 11, 25, 38, 38, 46, 4, 49, 4, - 3, 52, 23, 36, 23, 38, 39, 40, 41, 42, - 43, 47, 4, 4, 26, 51, 66, 49, 54, 4, - 64, 64, 46, 47, 4, 69, 38, 4, 4, 4, - 50, 46, 60, 50, 46, 27, 28, 29, 30, 60, - 57, 60, 34, 50, 72, 37, 38, 39, 3, 56, - 53, 72, 73, 72, 73, 73, 47, 69, 50, 50, - 45, 3, 54, 26, 56, 50, 58, 59, 48, 108, - 50, 56, 47, 50, 50, 50, 56, 45, 47, 56, - 56, 4, 51, 46, 26, 54, 4, 108, 4, 108, - 4, 49, 47, 185, 48, 49, 51, 55, 3, 54, - 40, 41, 42, 43, 46, 53, 127, 128, 127, 128, - 48, 49, 48, 49, 142, 52, 53, 54, 57, 4, - 4, 142, 47, 142, 47, 52, 50, 50, 51, 47, - 53, 47, 50, 51, 50, 46, 117, 118, 119, 120, - 121, 122, 123, 124, 53, 126, 46, 48, 4, 48, - 242, 49, 48, 55, 91, 52, 4, 185, 46, 0, - 0, 5, 99, 58, 185, 186, 185, 186, 186, 59, - 91, 54, 188, 194, 242, 194, 194, 158, 159, 160, + 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, 38, 39, 40, 41, 42, 43, - 72, 245, 243, 56, 242, 3, 58, 74, 128, 72, + 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, -1, 19, 20, -1, 31, 32, 33, -1, - 35, 36, -1, 38, 39, 40, 41, 42, 43, 35, - 36, -1, 38, 39, 40, 41, 42, 43, -1, -1, + 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, -1, 35, 36, -1, 38, 39, - 40, 41, 42, 43, 11, 12, -1, 14, 15, 16, - 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, - -1, -1, -1, -1, 31, 32, 33, -1, 35, 36, - -1, 38, 39, 40, 41, 42, 43, 11, -1, -1, - 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, - 24, 25, 26, -1, -1, -1, -1, 31, 32, 33, - -1, 35, 36, -1, 38, 39, 40, 41, 42, 43, - 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, - 24, 25, 26, -1, -1, -1, -1, 31, 32, 33, - -1, 35, 36, -1, 38, 39, 40, 41, 42, 43, - 14, -1, -1, 17, 18, 19, 20, -1, -1, -1, - -1, 25, 26, 14, -1, -1, -1, 31, 19, 20, - -1, 35, 36, -1, 38, 39, 40, 41, 42, 43, - 31, 19, 20, -1, 35, 36, -1, 38, 39, 40, - 41, 42, 43, 14, -1, -1, -1, -1, 19, 20, - 38, 39, 40, 41, 42, 43, 19, -1, -1, -1, - -1, -1, -1, -1, 35, 36, -1, 38, 39, 40, - 41, 42, 43, -1, -1, 38, 39, 40, 41, 42, - 43 + -1, 31, 32, 33, 34, 35, 36, 37, 38, 39, + 40, 41, 11, 12, -1, 14, 15, 16, 17, 18, + 19, 20, 21, 22, 23, 24, 25, 26, -1, -1, + -1, -1, 31, 32, 33, 34, 35, 36, 37, 38, + 39, 40, 41, 11, -1, -1, 14, 15, 16, 17, + 18, 19, 20, 21, 22, 23, 24, 25, 26, -1, + -1, -1, -1, 31, 32, 33, 34, 35, 36, 37, + 38, 39, 40, 41, 14, 15, 16, 17, 18, 19, + 20, 21, 22, 23, 24, 25, 26, -1, -1, -1, + -1, 31, 32, 33, 34, 35, 36, 37, 38, 39, + 40, 41, 14, -1, -1, 17, 18, 19, 20, -1, + -1, -1, -1, 25, 26, 14, -1, -1, -1, 31, + 19, 20, 34, 35, 36, 37, 38, 39, 40, 41, + -1, -1, 31, -1, -1, 34, 35, 36, 37, 38, + 39, 40, 41, 14, -1, -1, -1, -1, 19, 20, + -1, -1, -1, -1, -1, 19, 20, -1, -1, -1, + -1, 19, 20, 34, 35, 36, 37, 38, 39, 40, + 41, 35, 36, 37, 38, 39, 40, 41, 36, 37, + 38, 39, 40, 41 }; #define YYPURE 1 @@ -1034,80 +1032,76 @@ yyreduce: switch (yyn) { case 1: -#line 115 "compile.y" +#line 116 "compile.y" { - Method& method=*NEW Method(POOL, - PC.request->main_method_name, - Method::CT_ANY, + MethodPtr method(new Method(main_method_name, Method::CT_ANY, 0, 0, /*min, max numbered_params_count*/ - 0/*param_names*/, 0/*local_names*/, - yyvsp[0]/*parser_code*/, 0/*native_code*/); - PC.cclass->add_method(PC.request->main_method_name, method); + ArrayConstStringPtr(0)/*param_names*/, ArrayConstStringPtr(0)/*local_names*/, + yyvsp[0]/*parser_code*/, 0/*native_code*/)); + PC.cclass->add_method(main_method_name, method); ; break;} case 8: -#line 132 "compile.y" +#line 131 "compile.y" { - const String& command=*LA2S(yyvsp[-2]); + ConstStringPtr command=LA2S(*yyvsp[-2]); YYSTYPE strings_code=yyvsp[0]; - if(strings_code->size()<1*2) { + if(strings_code->count()<1*2) { strcpy(PC.error, "@"); - strcat(PC.error, command.cstr()); + strcat(PC.error, command->cstr()); strcat(PC.error, " is empty"); YYERROR; } - if(command==CLASS_NAME) { + if(*command==CLASS_NAME) { if(PC.cclass->base_class()) { // already changed from default? strcpy(PC.error, "class already have a name '"); - strncat(PC.error, PC.cclass->name().cstr(), 100); + strncat(PC.error, PC.cclass->name()->cstr(), 100); strcat(PC.error, "'"); YYERROR; } - if(strings_code->size()==1*2) { + if(strings_code->count()==1*2) { // new class' name - const String *name=LA2S(strings_code); + ConstStringPtr name=LA2S(*strings_code); // creating the class - PC.cclass=NEW VClass(POOL); - PC.cclass->set_name(*name); + PC.cclass=VStateless_classPtr(new VClass); + PC.cclass->set_name(name); // append to request's classes - PC.request->classes().put(*name, PC.cclass); + PC.request->classes().put(name, PC.cclass); } else { strcpy(PC.error, "@"CLASS_NAME" must contain sole name"); YYERROR; } - } else if(command==USE_CONTROL_METHOD_NAME) { - for(int i=0; isize(); i+=2) - PC.request->use_file(PC.request->main_class, *LA2S(strings_code, i)); - } else if(command==BASE_NAME) { + } else if(*command==USE_CONTROL_METHOD_NAME) { + for(int i=0; icount(); i+=2) + PC.request->use_file(PC.request->main_class, LA2S(*strings_code, i)); + } else if(*command==BASE_NAME) { if(PC.cclass->base_class()) { // already changed from default? strcpy(PC.error, "class already have a base '"); - strncat(PC.error, PC.cclass->base_class()->name().cstr(), 100); + strncat(PC.error, PC.cclass->base_class()->name()->cstr(), 100); strcat(PC.error, "'"); YYERROR; } - if(strings_code->size()==1*2) { - const String& base_name=*LA2S(strings_code); - Value *vbase_class=static_cast( - PC.request->classes().get(base_name)); - VStateless_class *base_class=vbase_class?vbase_class->get_class():0; - if(!base_class) { - strcpy(PC.error, base_name.cstr()); + if(strings_code->count()==1*2) { + ConstStringPtr base_name=LA2S(*strings_code); + if(VStateless_classPtr base_class=PC.request->classes().get(base_name)) { + // @CLASS == @BASE sanity check + if(PC.cclass.get()==base_class.get()) { + strcpy(PC.error, "@"CLASS_NAME" equals @"BASE_NAME); + YYERROR; + } + PC.cclass->set_base(base_class); + } else { + strcpy(PC.error, base_name->cstr()); strcat(PC.error, ": undefined class in @"BASE_NAME); YYERROR; } - // @CLASS == @BASE sanity check - if(PC.cclass==base_class) { - strcpy(PC.error, "@"CLASS_NAME" equals @"BASE_NAME); - YYERROR; - } - PC.cclass->set_base(base_class); } else { strcpy(PC.error, "@"BASE_NAME" must contain sole name"); YYERROR; } } else { strcpy(PC.error, "'"); - strncat(PC.error, command.cstr(), MAX_STRING/2); + strncat(PC.error, command->cstr(), MAX_STRING/2); strcat(PC.error, "' invalid special name. valid names are " "'"CLASS_NAME"', '"USE_CONTROL_METHOD_NAME"' and '"BASE_NAME"'"); YYERROR; @@ -1115,561 +1109,557 @@ case 8: ; break;} case 12: -#line 199 "compile.y" -{ yyval=yyvsp[-1]; P(yyval, yyvsp[0]) ; +#line 196 "compile.y" +{ yyval=yyvsp[-1]; P(*yyval, *yyvsp[0]) ; break;} case 16: -#line 204 "compile.y" +#line 201 "compile.y" { - const String *name=LA2S(yyvsp[-5]); + ConstStringPtr name=LA2S(*yyvsp[-5]); YYSTYPE params_names_code=yyvsp[-4]; - Array *params_names=0; - if(int size=params_names_code->size()) { - params_names=NEW Array(POOL); + ArrayConstStringPtr params_names; + if(int size=params_names_code->count()) { + params_names=ArrayConstStringPtr(new ArrayConstString); for(int i=0; isize()) { - locals_names=NEW Array(POOL); + ArrayConstStringPtr locals_names; + if(int size=locals_names_code->count()) { + locals_names=ArrayConstStringPtr(new ArrayConstString); for(int i=0; iadd_method(*name, method); + yyvsp[0], 0)); + PC.cclass->add_method(name, method); ; break;} case 19: -#line 233 "compile.y" +#line 230 "compile.y" {yyval=yyvsp[-1]; break;} case 23: -#line 235 "compile.y" -{ yyval=yyvsp[-2]; P(yyval, yyvsp[0]) ; +#line 232 "compile.y" +{ yyval=yyvsp[-2]; P(*yyval, *yyvsp[0]) ; break;} case 29: -#line 243 "compile.y" -{ yyval=yyvsp[-1]; P(yyval, yyvsp[0]) ; +#line 240 "compile.y" +{ yyval=yyvsp[-1]; P(*yyval, *yyvsp[0]) ; break;} case 35: -#line 249 "compile.y" +#line 246 "compile.y" { yyval=yyvsp[0]; /* stack: resulting value */ - changetail_or_append(yyval, + changetail_or_append(*yyval, OP_GET_ELEMENT, false, /*->*/OP_GET_ELEMENT__WRITE, /*or */OP_WRITE_VALUE ); /* value=pop; wcontext.write(value) */ ; break;} case 36: -#line 256 "compile.y" +#line 253 "compile.y" { yyval=yyvsp[0] ; break;} case 39: -#line 258 "compile.y" +#line 255 "compile.y" { yyval=yyvsp[-1] ; break;} case 42: -#line 262 "compile.y" +#line 259 "compile.y" { - yyval=N(POOL); - Array *diving_code=yyvsp[0]; - const String *first_name=LA2S(diving_code); + yyval=N(); + ArrayOperationPtr diving_code=yyvsp[0]; + ConstStringPtr first_name=LA2S(*diving_code); // self.xxx... -> xxx... // OP_VALUE+string+OP_GET_ELEMENT+... -> OP_WITH_SELF+... if(first_name && *first_name==SELF_ELEMENT_NAME) { - O(yyval, OP_WITH_SELF); /* stack: starting context */ - P(yyval, diving_code, + O(*yyval, OP_WITH_SELF); /* stack: starting context */ + P(*yyval, *diving_code, /* skip over... */ - diving_code->size()>=3?3/*OP_VALUE+string+OP_GET_ELEMENTx*/:2/*OP_+string*/); + diving_code->count()>=3?3/*OP_VALUE+string+OP_GET_ELEMENTx*/:2/*OP_+string*/); } else { - O(yyval, OP_WITH_READ); /* stack: starting context */ + O(*yyval, OP_WITH_READ); /* stack: starting context */ - // OP_VALUE+string+OP_GET_ELEMENT. -> OP_VALUE+string+...OR_OPERATOR/OR_JUNCTION_EXP. - if(diving_code->size()==3) // ELEMENT without .SUBELEMENT - diving_code->put_int(2, - PC.in_call_value? - OP_GET_ELEMENT_OR_OPERATOR// possibly ^if [search for operator] - :OP_GET_ELEMENT_OR_JUNCTION_EXPAND // possibly $junction [if junction, expand it] - ); - - P(yyval, diving_code); + // ^if ELEMENT -> ^if ELEMENT_OR_OPERATOR + // OP_VALUE+string+OP_GET_ELEMENT. -> OP_VALUE+string+OP_GET_ELEMENT_OR_OPERATOR. + if(PC.in_call_value && diving_code->count()==3) + (*diving_code)[2].code=OP_GET_ELEMENT_OR_OPERATOR; + P(*yyval, *diving_code); } /* diving code; stack: current context */ ; break;} case 43: -#line 288 "compile.y" -{ yyval=yyvsp[-1]; P(yyval, yyvsp[0]) ; +#line 281 "compile.y" +{ yyval=yyvsp[-1]; P(*yyval, *yyvsp[0]) ; break;} case 45: -#line 289 "compile.y" -{ yyval=yyvsp[-1]; P(yyval, yyvsp[0]) ; +#line 282 "compile.y" +{ yyval=yyvsp[-1]; P(*yyval, *yyvsp[0]) ; break;} case 46: -#line 293 "compile.y" +#line 286 "compile.y" { yyval=yyvsp[-1]; /* stack: context,name */ - P(yyval, yyvsp[0]); /* stack: context,name,constructor_value */ + P(*yyval, *yyvsp[0]); /* stack: context,name,constructor_value */ ; break;} case 50: -#line 301 "compile.y" +#line 294 "compile.y" { - yyval=N(POOL); - Array *diving_code=yyvsp[0]; - const String *first_name=LA2S(diving_code); + yyval=N(); + ArrayOperationPtr diving_code=yyvsp[0]; + ConstStringPtr first_name=LA2S(*diving_code); // $self.xxx... -> $xxx... // OP_VALUE+string+OP_GET_ELEMENT+... -> OP_WITH_SELF+... if(first_name && *first_name==SELF_ELEMENT_NAME) { - O(yyval, OP_WITH_SELF); /* stack: starting context */ - P(yyval, diving_code, + O(*yyval, OP_WITH_SELF); /* stack: starting context */ + P(*yyval, *diving_code, /* skip over... */ - diving_code->size()>=3?3/*OP_VALUE+string+OP_GET_ELEMENTx*/:2/*OP_+string*/); + diving_code->count()>=3?3/*OP_VALUE+string+OP_GET_ELEMENTx*/:2/*OP_+string*/); } else { - O(yyval, OP_WITH_ROOT); /* stack: starting context */ - P(yyval, diving_code); + O(*yyval, OP_WITH_ROOT); /* stack: starting context */ + P(*yyval, *diving_code); } /* diving code; stack: current context */ ; break;} case 51: -#line 318 "compile.y" +#line 311 "compile.y" { - yyval=N(POOL); - O(yyval, OP_WITH_WRITE); /* stack: starting context */ - P(yyval, yyvsp[0]); /* diving code; stack: context,name */ + yyval=N(); + O(*yyval, OP_WITH_WRITE); /* stack: starting context */ + P(*yyval, *yyvsp[0]); /* diving code; stack: context,name */ ; break;} case 52: -#line 323 "compile.y" -{ yyval=yyvsp[-1]; P(yyval, yyvsp[0]) ; +#line 316 "compile.y" +{ yyval=yyvsp[-1]; P(*yyval, *yyvsp[0]) ; break;} case 56: -#line 330 "compile.y" +#line 323 "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) */ + O(*yyval, OP_CONSTRUCT_VALUE); /* value=pop; name=pop; context=pop; construct(context,name,value) */ ; break;} case 57: -#line 336 "compile.y" +#line 329 "compile.y" { - yyval=N(POOL); - O(yyval, OP_PREPARE_TO_EXPRESSION); + yyval=N(); + O(*yyval, OP_PREPARE_TO_EXPRESSION); // stack: context, name - P(yyval, yyvsp[-1]); // stack: context, name, value - O(yyval, OP_CONSTRUCT_EXPR); /* value=pop->as_expr_result; name=pop; context=pop; construct(context,name,value) */ + P(*yyval, *yyvsp[-1]); // stack: context, name, value + O(*yyval, OP_CONSTRUCT_EXPR); /* value=pop->as_expr_result; name=pop; context=pop; construct(context,name,value) */ ; break;} case 58: -#line 344 "compile.y" +#line 337 "compile.y" { // stack: context, name - yyval=N(POOL); - OA(yyval, OP_CURLY_CODE__CONSTRUCT, yyvsp[-1]); /* code=pop; name=pop; context=pop; construct(context,name,junction(code)) */ + 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 355 "compile.y" +#line 348 "compile.y" { - yyval=N(POOL); - OA(yyval, OP_OBJECT_POOL, yyvsp[0]); /* stack: empty write context */ + yyval=N(); + OA(*yyval, OP_OBJECT_POOL, yyvsp[0]); /* stack: empty write context */ /* some code that writes to that context */ /* context=pop; stack: context.value() */ ; break;} case 65: -#line 362 "compile.y" -{ yyval=yyvsp[-1]; P(yyval, yyvsp[0]) ; +#line 355 "compile.y" +{ yyval=yyvsp[-1]; P(*yyval, *yyvsp[0]) ; break;} case 66: -#line 366 "compile.y" +#line 359 "compile.y" { yyval=yyvsp[0]; /* stack: value */ - changetail_or_append(yyval, + changetail_or_append(*yyval, OP_CALL, true, /*->*/ OP_CALL__WRITE, /*or */OP_WRITE_VALUE); /* value=pop; wcontext.write(value) */ ; break;} case 67: -#line 372 "compile.y" +#line 365 "compile.y" { PC.in_call_value=true; ; break;} case 68: -#line 375 "compile.y" +#line 368 "compile.y" { PC.in_call_value=false; ; break;} case 69: -#line 378 "compile.y" +#line 371 "compile.y" { /* ^field.$method{vasya} */ yyval=yyvsp[-3]; /* with_xxx,diving code; stack: context,method_junction */ YYSTYPE params_code=yyvsp[-1]; - if(params_code->size()==3) { // probably [] case. [OP_VALUE + Void + STORE_PARAM] - if(Value *value=LA2V(params_code)) // it is OP_VALUE + value? + if(params_code->count()==3) { // probably [] case. [OP_VALUE + Void + STORE_PARAM] + if(ValuePtr value=LA2V(*params_code)) // it is OP_VALUE + value? if(!value->is_defined()) // value is VVoid? - params_code=0; // ^zzz[] case. don't append lone empty param. + params_code=YYSTYPE(0); // ^zzz[] case. don't append lone empty param. } /* stack: context, method_junction */ - OA(yyval, OP_CALL, params_code); // method_frame=make frame(pop junction); ncontext=pop; call(ncontext,method_frame) stack: value + OA(*yyval, OP_CALL, params_code); // method_frame=make frame(pop junction); ncontext=pop; call(ncontext,method_frame) stack: value ; break;} case 72: -#line 393 "compile.y" -{ yyval=yyvsp[-1]; P(yyval, yyvsp[0]) ; +#line 386 "compile.y" +{ yyval=yyvsp[-1]; P(*yyval, *yyvsp[0]) ; break;} case 76: -#line 399 "compile.y" +#line 392 "compile.y" {yyval=yyvsp[-1]; break;} case 77: -#line 400 "compile.y" +#line 393 "compile.y" {yyval=yyvsp[-1]; break;} case 78: -#line 401 "compile.y" +#line 394 "compile.y" {yyval=yyvsp[-1]; break;} case 80: -#line 404 "compile.y" -{ yyval=yyvsp[-2]; P(yyval, yyvsp[0]) ; +#line 397 "compile.y" +{ yyval=yyvsp[-2]; P(*yyval, *yyvsp[0]) ; break;} case 82: -#line 408 "compile.y" -{ yyval=yyvsp[-2]; P(yyval, yyvsp[0]) ; +#line 401 "compile.y" +{ yyval=yyvsp[-2]; P(*yyval, *yyvsp[0]) ; break;} case 84: -#line 412 "compile.y" -{ yyval=yyvsp[-2]; P(yyval, yyvsp[0]) ; +#line 405 "compile.y" +{ yyval=yyvsp[-2]; P(*yyval, *yyvsp[0]) ; break;} case 85: -#line 414 "compile.y" +#line 407 "compile.y" { yyval=yyvsp[0]; - O(yyval, OP_STORE_PARAM); + O(*yyval, OP_STORE_PARAM); ; break;} case 86: -#line 418 "compile.y" +#line 411 "compile.y" { - yyval=N(POOL); - OA(yyval, OP_EXPR_CODE__STORE_PARAM, yyvsp[0]); + yyval=N(); + OA(*yyval, OP_EXPR_CODE__STORE_PARAM, yyvsp[0]); ; break;} case 87: -#line 422 "compile.y" +#line 415 "compile.y" { - yyval=N(POOL); - OA(yyval, OP_CURLY_CODE__STORE_PARAM, yyvsp[0]); + yyval=N(); + OA(*yyval, OP_CURLY_CODE__STORE_PARAM, yyvsp[0]); ; break;} case 91: -#line 431 "compile.y" +#line 424 "compile.y" { - yyval=N(POOL); - O(yyval, OP_PREPARE_TO_EXPRESSION); - P(yyval, yyvsp[0]); - O(yyval, OP_WRITE_EXPR_RESULT); + yyval=N(); + O(*yyval, OP_PREPARE_TO_EXPRESSION); + P(*yyval, *yyvsp[0]); + O(*yyval, OP_WRITE_EXPR_RESULT); ; break;} case 93: -#line 440 "compile.y" -{ yyval=yyvsp[-1]; P(yyval, yyvsp[0]) ; +#line 433 "compile.y" +{ yyval=yyvsp[-1]; P(*yyval, *yyvsp[0]) ; break;} case 95: -#line 442 "compile.y" -{ yyval=yyvsp[-1]; P(yyval, yyvsp[0]) ; +#line 435 "compile.y" +{ yyval=yyvsp[-1]; P(*yyval, *yyvsp[0]) ; break;} case 97: -#line 444 "compile.y" +#line 437 "compile.y" { // we know that name_advance1 not called from ^xxx context // so we'll not check for operator call possibility as we do in name_advance2 /* stack: context */ yyval=yyvsp[0]; /* stack: context,name */ - O(yyval, OP_GET_ELEMENT); /* name=pop; context=pop; stack: context.get_element(name) */ + O(*yyval, OP_GET_ELEMENT); /* name=pop; context=pop; stack: context.get_element(name) */ ; break;} case 98: -#line 452 "compile.y" +#line 445 "compile.y" { /* stack: context */ yyval=yyvsp[0]; /* stack: context,name */ - O(yyval, OP_GET_ELEMENT); /* name=pop; context=pop; stack: context.get_element(name) */ + O(*yyval, OP_GET_ELEMENT); /* name=pop; context=pop; stack: context.get_element(name) */ ; break;} case 104: -#line 465 "compile.y" +#line 458 "compile.y" { yyval=yyvsp[0]; - O(yyval, OP_GET_ELEMENT); + O(*yyval, OP_GET_ELEMENT); ; break;} case 105: -#line 469 "compile.y" +#line 462 "compile.y" { - Array *code; + ArrayOperationPtr code; { - change_string_literal_to_write_string_literal(code=yyvsp[-1]); - P(code, yyvsp[0]); + change_string_literal_to_write_string_literal(*(code=yyvsp[-1])); + P(*code, *yyvsp[0]); } - yyval=N(POOL); - OA(yyval, OP_STRING_POOL, code); + yyval=N(); + OA(*yyval, OP_STRING_POOL, code); ; break;} case 106: -#line 478 "compile.y" +#line 471 "compile.y" { - yyval=N(POOL); - OA(yyval, OP_OBJECT_POOL, yyvsp[-1]); /* stack: empty write context */ + yyval=N(); + OA(*yyval, OP_OBJECT_POOL, yyvsp[-1]); /* stack: empty write context */ /* some code that writes to that context */ /* context=pop; stack: context.value() */ ; break;} case 107: -#line 484 "compile.y" +#line 477 "compile.y" { - yyval=N(POOL); - O(yyval, OP_WITH_READ); - P(yyval, yyvsp[0]); + yyval=N(); + O(*yyval, OP_WITH_READ); + P(*yyval, *yyvsp[0]); ; break;} case 109: -#line 489 "compile.y" -{ yyval=yyvsp[-1]; P(yyval, yyvsp[0]) ; +#line 482 "compile.y" +{ yyval=yyvsp[-1]; P(*yyval, *yyvsp[0]) ; break;} case 110: -#line 490 "compile.y" +#line 483 "compile.y" { yyval=yyvsp[0]; - O(yyval, OP_GET_ELEMENT__WRITE); + O(*yyval, OP_GET_ELEMENT__WRITE); ; break;} case 113: -#line 499 "compile.y" +#line 492 "compile.y" { yyval=yyvsp[-1]; // stack: class name string - if(*LA2S(yyval) == BASE_NAME) { // pseude BASE class - if(VStateless_class *base=PC.cclass->base_class()) { - change_string_literal_value(yyval, base->name()); + if(*LA2S(*yyval) == BASE_NAME) { // pseude BASE class + if(VStateless_classPtr base=PC.cclass->base_class()) { + change_string_literal_value(*yyval, base->name()); } else { strcpy(PC.error, "no base class declared"); YYERROR; } } - O(yyval, OP_GET_CLASS); + O(*yyval, OP_GET_CLASS); ; break;} case 114: -#line 511 "compile.y" +#line 504 "compile.y" { yyval=yyvsp[-1]; if(!PC.in_call_value) { strcpy(PC.error, ":: not allowed here"); YYERROR; } - O(yyval, OP_PREPARE_TO_CONSTRUCT_OBJECT); + O(*yyval, OP_PREPARE_TO_CONSTRUCT_OBJECT); ; break;} case 115: -#line 523 "compile.y" +#line 516 "compile.y" { // see OP_PREPARE_TO_EXPRESSION!! - if((yyval=yyvsp[0])->size()==2) // only one string literal in there? - change_string_literal_to_double_literal(yyval); // make that string literal Double + 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 532 "compile.y" +#line 525 "compile.y" { yyval = yyvsp[-1]; ; break;} case 120: -#line 533 "compile.y" +#line 526 "compile.y" { yyval = yyvsp[-1]; ; break;} case 121: -#line 534 "compile.y" +#line 527 "compile.y" { yyval = yyvsp[-1]; ; break;} case 122: -#line 536 "compile.y" -{ yyval=yyvsp[0]; O(yyval, OP_NEG) ; +#line 529 "compile.y" +{ yyval=yyvsp[0]; O(*yyval, OP_NEG) ; break;} case 123: -#line 537 "compile.y" +#line 530 "compile.y" { yyval=yyvsp[0] ; break;} case 124: -#line 538 "compile.y" -{ yyval=yyvsp[0]; O(yyval, OP_INV) ; +#line 531 "compile.y" +{ yyval=yyvsp[0]; O(*yyval, OP_INV) ; break;} case 125: -#line 539 "compile.y" -{ yyval=yyvsp[0]; O(yyval, OP_NOT) ; +#line 532 "compile.y" +{ yyval=yyvsp[0]; O(*yyval, OP_NOT) ; break;} case 126: -#line 540 "compile.y" -{ yyval=yyvsp[0]; O(yyval, OP_DEF) ; +#line 533 "compile.y" +{ yyval=yyvsp[0]; O(*yyval, OP_DEF) ; break;} case 127: -#line 541 "compile.y" -{ yyval=yyvsp[0]; O(yyval, OP_IN) ; +#line 534 "compile.y" +{ yyval=yyvsp[0]; O(*yyval, OP_IN) ; break;} case 128: -#line 542 "compile.y" -{ yyval=yyvsp[0]; O(yyval, OP_FEXISTS) ; +#line 535 "compile.y" +{ yyval=yyvsp[0]; O(*yyval, OP_FEXISTS) ; break;} case 129: -#line 543 "compile.y" -{ yyval=yyvsp[0]; O(yyval, OP_DEXISTS) ; +#line 536 "compile.y" +{ yyval=yyvsp[0]; O(*yyval, OP_DEXISTS) ; break;} case 130: -#line 545 "compile.y" -{ yyval=yyvsp[-2]; P(yyval, yyvsp[0]); O(yyval, OP_SUB) ; +#line 538 "compile.y" +{ yyval=yyvsp[-2]; P(*yyval, *yyvsp[0]); O(*yyval, OP_SUB) ; break;} case 131: -#line 546 "compile.y" -{ yyval=yyvsp[-2]; P(yyval, yyvsp[0]); O(yyval, OP_ADD) ; +#line 539 "compile.y" +{ yyval=yyvsp[-2]; P(*yyval, *yyvsp[0]); O(*yyval, OP_ADD) ; break;} case 132: -#line 547 "compile.y" -{ yyval=yyvsp[-2]; P(yyval, yyvsp[0]); O(yyval, OP_MUL) ; +#line 540 "compile.y" +{ yyval=yyvsp[-2]; P(*yyval, *yyvsp[0]); O(*yyval, OP_MUL) ; break;} case 133: -#line 548 "compile.y" -{ yyval=yyvsp[-2]; P(yyval, yyvsp[0]); O(yyval, OP_DIV) ; +#line 541 "compile.y" +{ yyval=yyvsp[-2]; P(*yyval, *yyvsp[0]); O(*yyval, OP_DIV) ; break;} case 134: -#line 549 "compile.y" -{ yyval=yyvsp[-2]; P(yyval, yyvsp[0]); O(yyval, OP_MOD) ; +#line 542 "compile.y" +{ yyval=yyvsp[-2]; P(*yyval, *yyvsp[0]); O(*yyval, OP_MOD) ; break;} case 135: -#line 550 "compile.y" -{ yyval=yyvsp[-2]; P(yyval, yyvsp[0]); O(yyval, OP_INTDIV) ; +#line 543 "compile.y" +{ yyval=yyvsp[-2]; P(*yyval, *yyvsp[0]); O(*yyval, OP_INTDIV) ; break;} case 136: -#line 551 "compile.y" -{ yyval=yyvsp[-2]; P(yyval, yyvsp[0]); O(yyval, OP_BIN_SL) ; +#line 544 "compile.y" +{ yyval=yyvsp[-2]; P(*yyval, *yyvsp[0]); O(*yyval, OP_BIN_SL) ; break;} case 137: -#line 552 "compile.y" -{ yyval=yyvsp[-2]; P(yyval, yyvsp[0]); O(yyval, OP_BIN_SR) ; +#line 545 "compile.y" +{ yyval=yyvsp[-2]; P(*yyval, *yyvsp[0]); O(*yyval, OP_BIN_SR) ; break;} case 138: -#line 553 "compile.y" -{ yyval=yyvsp[-2]; P(yyval, yyvsp[0]); O(yyval, OP_BIN_AND) ; +#line 546 "compile.y" +{ yyval=yyvsp[-2]; P(*yyval, *yyvsp[0]); O(*yyval, OP_BIN_AND) ; break;} case 139: -#line 554 "compile.y" -{ yyval=yyvsp[-2]; P(yyval, yyvsp[0]); O(yyval, OP_BIN_OR) ; +#line 547 "compile.y" +{ yyval=yyvsp[-2]; P(*yyval, *yyvsp[0]); O(*yyval, OP_BIN_OR) ; break;} case 140: -#line 555 "compile.y" -{ yyval=yyvsp[-2]; P(yyval, yyvsp[0]); O(yyval, OP_BIN_XOR) ; +#line 548 "compile.y" +{ yyval=yyvsp[-2]; P(*yyval, *yyvsp[0]); O(*yyval, OP_BIN_XOR) ; break;} case 141: -#line 556 "compile.y" -{ yyval=yyvsp[-2]; OA(yyval, OP_NESTED_CODE, yyvsp[0]); O(yyval, OP_LOG_AND) ; +#line 549 "compile.y" +{ yyval=yyvsp[-2]; OA(*yyval, OP_NESTED_CODE, yyvsp[0]); O(*yyval, OP_LOG_AND) ; break;} case 142: -#line 557 "compile.y" -{ yyval=yyvsp[-2]; OA(yyval, OP_NESTED_CODE, yyvsp[0]); O(yyval, OP_LOG_OR) ; +#line 550 "compile.y" +{ yyval=yyvsp[-2]; OA(*yyval, OP_NESTED_CODE, yyvsp[0]); O(*yyval, OP_LOG_OR) ; break;} case 143: -#line 558 "compile.y" -{ yyval=yyvsp[-2]; P(yyval, yyvsp[0]); O(yyval, OP_LOG_XOR) ; +#line 551 "compile.y" +{ yyval=yyvsp[-2]; P(*yyval, *yyvsp[0]); O(*yyval, OP_LOG_XOR) ; break;} case 144: -#line 559 "compile.y" -{ yyval=yyvsp[-2]; P(yyval, yyvsp[0]); O(yyval, OP_NUM_LT) ; +#line 552 "compile.y" +{ yyval=yyvsp[-2]; P(*yyval, *yyvsp[0]); O(*yyval, OP_NUM_LT) ; break;} case 145: -#line 560 "compile.y" -{ yyval=yyvsp[-2]; P(yyval, yyvsp[0]); O(yyval, OP_NUM_GT) ; +#line 553 "compile.y" +{ yyval=yyvsp[-2]; P(*yyval, *yyvsp[0]); O(*yyval, OP_NUM_GT) ; break;} case 146: -#line 561 "compile.y" -{ yyval=yyvsp[-2]; P(yyval, yyvsp[0]); O(yyval, OP_NUM_LE) ; +#line 554 "compile.y" +{ yyval=yyvsp[-2]; P(*yyval, *yyvsp[0]); O(*yyval, OP_NUM_LE) ; break;} case 147: -#line 562 "compile.y" -{ yyval=yyvsp[-2]; P(yyval, yyvsp[0]); O(yyval, OP_NUM_GE) ; +#line 555 "compile.y" +{ yyval=yyvsp[-2]; P(*yyval, *yyvsp[0]); O(*yyval, OP_NUM_GE) ; break;} case 148: -#line 563 "compile.y" -{ yyval=yyvsp[-2]; P(yyval, yyvsp[0]); O(yyval, OP_NUM_EQ) ; +#line 556 "compile.y" +{ yyval=yyvsp[-2]; P(*yyval, *yyvsp[0]); O(*yyval, OP_NUM_EQ) ; break;} case 149: -#line 564 "compile.y" -{ yyval=yyvsp[-2]; P(yyval, yyvsp[0]); O(yyval, OP_NUM_NE) ; +#line 557 "compile.y" +{ yyval=yyvsp[-2]; P(*yyval, *yyvsp[0]); O(*yyval, OP_NUM_NE) ; break;} case 150: -#line 565 "compile.y" -{ yyval=yyvsp[-2]; P(yyval, yyvsp[0]); O(yyval, OP_STR_LT) ; +#line 558 "compile.y" +{ yyval=yyvsp[-2]; P(*yyval, *yyvsp[0]); O(*yyval, OP_STR_LT) ; break;} case 151: -#line 566 "compile.y" -{ yyval=yyvsp[-2]; P(yyval, yyvsp[0]); O(yyval, OP_STR_GT) ; +#line 559 "compile.y" +{ yyval=yyvsp[-2]; P(*yyval, *yyvsp[0]); O(*yyval, OP_STR_GT) ; break;} case 152: -#line 567 "compile.y" -{ yyval=yyvsp[-2]; P(yyval, yyvsp[0]); O(yyval, OP_STR_LE) ; +#line 560 "compile.y" +{ yyval=yyvsp[-2]; P(*yyval, *yyvsp[0]); O(*yyval, OP_STR_LE) ; break;} case 153: -#line 568 "compile.y" -{ yyval=yyvsp[-2]; P(yyval, yyvsp[0]); O(yyval, OP_STR_GE) ; +#line 561 "compile.y" +{ yyval=yyvsp[-2]; P(*yyval, *yyvsp[0]); O(*yyval, OP_STR_GE) ; break;} case 154: -#line 569 "compile.y" -{ yyval=yyvsp[-2]; P(yyval, yyvsp[0]); O(yyval, OP_STR_EQ) ; +#line 562 "compile.y" +{ yyval=yyvsp[-2]; P(*yyval, *yyvsp[0]); O(*yyval, OP_STR_EQ) ; break;} case 155: -#line 570 "compile.y" -{ yyval=yyvsp[-2]; P(yyval, yyvsp[0]); O(yyval, OP_STR_NE) ; +#line 563 "compile.y" +{ yyval=yyvsp[-2]; P(*yyval, *yyvsp[0]); O(*yyval, OP_STR_NE) ; break;} case 156: -#line 571 "compile.y" -{ yyval=yyvsp[-2]; P(yyval, yyvsp[0]); O(yyval, OP_IS) ; +#line 564 "compile.y" +{ yyval=yyvsp[-2]; P(*yyval, *yyvsp[0]); O(*yyval, OP_IS) ; break;} case 157: -#line 574 "compile.y" +#line 567 "compile.y" { - yyval=N(POOL); - OA(yyval, OP_STRING_POOL, yyvsp[0]); /* stack: empty write context */ + yyval=N(); + OA(*yyval, OP_STRING_POOL, yyvsp[0]); /* stack: empty write context */ /* some code that writes to that context */ /* context=pop; stack: context.get_string() */ ; break;} case 158: -#line 583 "compile.y" +#line 576 "compile.y" { // optimized from OP_STRING+OP_WRITE_VALUE to OP_STRING__WRITE - change_string_literal_to_write_string_literal(yyval=yyvsp[0]) + change_string_literal_to_write_string_literal(*(yyval=yyvsp[0])) ; break;} case 159: -#line 588 "compile.y" -{ yyval=VL(NEW VVoid(POOL)) ; +#line 581 "compile.y" +{ yyval=VL(ValuePtr(new VVoid())) ; break;} case 160: -#line 589 "compile.y" -{ yyval=N(POOL) ; +#line 582 "compile.y" +{ yyval=N() ; break;} } /* the action file gets copied in in place of this dollarsign */ @@ -1893,7 +1883,7 @@ yyerrhandle: } return 1; } -#line 591 "compile.y" +#line 584 "compile.y" #endif @@ -1953,7 +1943,14 @@ static int yylex(YYSTYPE *lvalp, void *p } else // @ in first column inside some code [when could that be?] result=BAD_METHOD_DECL_START; goto break2; - } else if(c=='^') + } else if(c=='^') { + if(PC.ls==LS_METHOD_AFTER) { + // handle after-method situation + pop_LS(PC); + result=EON; + skip_analized=-1; // return to punctuation afterwards to assure it's literality + goto break2; + } switch(PC.ls) { case LS_EXPRESSION_VAR_NAME_WITH_COLON: case LS_EXPRESSION_VAR_NAME_WITHOUT_COLON: @@ -1978,19 +1975,12 @@ default: PC.string->APPEND_CLEAN(begin, end-begin, PC.file, begin_line); } // reset piece 'begin' position & line - end=begin=PC.source; // ^ + begin=PC.source; // ->punctuation begin_line=PC.line; - if(PC.ls==LS_METHOD_AFTER) { - pop_LS(PC); - result=EON; - skip_analized=-1; // return to ^ afterwards to assure it's literality - goto break2; - } else { - // skip over _ after ^ - PC.source++; PC.col++; - // skip analysis = forced literal - continue; - } + // skip over _ after ^ + PC.source++; PC.col++; + // skip analysis = forced literal + continue; // converting ^#HH into char(hex(HH)) case '#': @@ -2014,13 +2004,15 @@ default: PC.source+=3; PC.col+=3; // reset piece 'begin' position & line - begin=PC.source; // ^ + begin=PC.source; // ->after ^#HH begin_line=PC.line; + // skip analysis = forced literal continue; } break; } break; + } } // #comment start skipping if(c=='#' && PC.col==1) { @@ -2606,9 +2598,9 @@ break2: } if(PC.string->size()) { // something accumulated? // create STRING value: array of OP_VALUE+vstring - *lvalp=VL(NEW VString(*PC.string)); + *lvalp=VL(ValuePtr(new VString(PC.string))); // new pieces storage - PC.string=NEW String(POOL); + PC.string=StringPtr(new String); // make current result be pending for next call, return STRING for now PC.pending_state=result; result=STRING; } @@ -2625,5 +2617,5 @@ static int real_yyerror(parse_control *p static void yyprint(FILE *file, int type, YYSTYPE value) { if(type==STRING) - fprintf(file, " \"%s\"", LA2S(value)->cstr()); + fprintf(file, " \"%s\"", LA2S(*value)->cstr()); }