--- parser3/src/main/compile.tab.C 2001/08/06 16:18:26 1.2 +++ parser3/src/main/compile.tab.C 2001/10/08 08:21:04 1.18 @@ -29,9 +29,16 @@ #define IS 279 #define NEG 280 -#line 8 "compile.y" +#line 1 "compile.y" -static char *RCSId="$Id: compile.tab.C,v 1.2 2001/08/06 16:18:26 parser Exp $"; +/** @file + Parser: compiler(lexical parser and grammar). + + Copyright (c) 2001 ArtLebedev Group (http://www.artlebedev.com) + Author: Alexander Petrosyan (http://design.ru/paf) + + $Id: compile.tab.C,v 1.18 2001/10/08 08:21:04 parser Exp $ +*/ /** @todo parser4: @@ -87,11 +94,11 @@ static int yylex(YYSTYPE *lvalp, void *p -#define YYFINAL 240 +#define YYFINAL 246 #define YYFLAG -32768 #define YYNTBASE 54 -#define YYTRANSLATE(x) ((unsigned)(x) <= 280 ? yytranslate[x] : 132) +#define YYTRANSLATE(x) ((unsigned)(x) <= 280 ? yytranslate[x] : 133) static const char yytranslate[] = { 0, 2, 2, 2, 2, 2, 2, 2, 2, 2, 40, @@ -136,30 +143,30 @@ static const short yyprhs[] = { 0, 177, 179, 182, 184, 186, 188, 192, 196, 200, 202, 206, 208, 212, 214, 218, 220, 222, 224, 226, 228, 230, 232, 234, 237, 239, 242, 245, 247, 249, 252, - 254, 256, 258, 261, 264, 266, 268, 271, 274, 276, - 278, 281, 284, 286, 288, 290, 292, 296, 300, 304, - 307, 310, 313, 316, 319, 322, 325, 329, 333, 337, - 341, 345, 349, 353, 357, 361, 365, 369, 373, 377, - 381, 385, 389, 393, 397, 401, 405, 409, 413, 417, - 421, 423, 425, 426 + 254, 256, 258, 260, 263, 266, 270, 272, 274, 277, + 280, 282, 284, 287, 290, 292, 294, 296, 298, 302, + 306, 310, 313, 316, 319, 322, 325, 328, 331, 334, + 338, 342, 346, 350, 354, 358, 362, 366, 370, 374, + 378, 382, 386, 390, 394, 398, 402, 406, 410, 414, + 418, 422, 426, 430, 432, 434, 435 }; static const short yyrhs[] = { 56, 0, 55, 0, 57, 0, 55, 57, 0, 69, 0, - 58, 0, 63, 0, 39, 4, 40, 59, 0, 131, + 58, 0, 63, 0, 39, 4, 40, 59, 0, 132, 0, 60, 0, 61, 0, 60, 61, 0, 62, 40, - 0, 131, 0, 4, 0, 39, 4, 65, 64, 68, - 40, 69, 0, 131, 0, 65, 0, 41, 66, 42, - 0, 131, 0, 67, 0, 4, 0, 67, 43, 4, - 0, 131, 0, 4, 0, 131, 0, 70, 0, 71, - 0, 70, 71, 0, 129, 0, 72, 0, 73, 0, + 0, 132, 0, 4, 0, 39, 4, 65, 64, 68, + 40, 69, 0, 132, 0, 65, 0, 41, 66, 42, + 0, 132, 0, 67, 0, 4, 0, 67, 43, 4, + 0, 132, 0, 4, 0, 132, 0, 70, 0, 71, + 0, 70, 71, 0, 130, 0, 72, 0, 73, 0, 81, 0, 94, 0, 74, 0, 44, 75, 0, 77, 3, 0, 76, 0, 45, 77, 46, 0, 78, 0, - 79, 0, 80, 0, 123, 80, 0, 116, 0, 113, + 79, 0, 80, 0, 124, 80, 0, 116, 0, 113, 116, 0, 44, 82, 86, 0, 83, 0, 84, 0, - 85, 0, 112, 0, 47, 112, 0, 123, 112, 0, + 85, 0, 112, 0, 47, 112, 0, 124, 112, 0, 87, 0, 88, 0, 89, 0, 41, 90, 42, 0, - 48, 126, 49, 0, 45, 69, 46, 0, 130, 0, + 48, 127, 49, 0, 45, 69, 46, 0, 131, 0, 4, 0, 91, 0, 92, 0, 93, 0, 72, 0, 71, 70, 0, 95, 0, 0, 0, 50, 96, 98, 97, 99, 3, 0, 77, 0, 100, 0, 99, 100, @@ -167,27 +174,28 @@ static const short yyrhs[] = { 56, 0, 48, 105, 49, 0, 45, 106, 46, 0, 107, 0, 104, 43, 107, 0, 108, 0, 105, 43, 108, 0, 109, 0, 106, 43, 109, 0, 110, 0, 111, - 0, 69, 0, 130, 0, 4, 0, 91, 0, 126, + 0, 69, 0, 131, 0, 4, 0, 91, 0, 127, 0, 117, 0, 113, 117, 0, 114, 0, 113, 114, 0, 115, 47, 0, 117, 0, 117, 0, 4, 5, - 0, 4, 0, 118, 0, 119, 0, 44, 120, 0, - 4, 121, 0, 4, 0, 122, 0, 121, 122, 0, - 44, 120, 0, 124, 0, 125, 0, 4, 51, 0, - 124, 51, 0, 127, 0, 4, 0, 74, 0, 95, - 0, 52, 128, 52, 0, 53, 128, 53, 0, 48, - 127, 49, 0, 33, 127, 0, 32, 127, 0, 28, - 127, 0, 21, 127, 0, 22, 127, 0, 23, 127, - 0, 24, 127, 0, 127, 33, 127, 0, 127, 34, - 127, 0, 127, 35, 127, 0, 127, 36, 127, 0, - 127, 37, 127, 0, 127, 31, 127, 0, 127, 30, - 127, 0, 127, 29, 127, 0, 127, 8, 127, 0, - 127, 9, 127, 0, 127, 10, 127, 0, 127, 26, - 127, 0, 127, 27, 127, 0, 127, 11, 127, 0, - 127, 12, 127, 0, 127, 13, 127, 0, 127, 14, - 127, 0, 127, 15, 127, 0, 127, 16, 127, 0, - 127, 17, 127, 0, 127, 18, 127, 0, 127, 19, - 127, 0, 127, 20, 127, 0, 127, 25, 127, 0, - 69, 0, 4, 0, 0, 0 + 0, 4, 0, 118, 0, 119, 0, 120, 0, 44, + 121, 0, 4, 122, 0, 41, 70, 42, 0, 4, + 0, 123, 0, 122, 123, 0, 44, 121, 0, 125, + 0, 126, 0, 4, 51, 0, 125, 51, 0, 128, + 0, 4, 0, 74, 0, 95, 0, 52, 129, 52, + 0, 53, 129, 53, 0, 48, 128, 49, 0, 33, + 128, 0, 34, 128, 0, 32, 128, 0, 28, 128, + 0, 21, 128, 0, 22, 128, 0, 23, 128, 0, + 24, 128, 0, 128, 33, 128, 0, 128, 34, 128, + 0, 128, 35, 128, 0, 128, 36, 128, 0, 128, + 37, 128, 0, 128, 31, 128, 0, 128, 30, 128, + 0, 128, 29, 128, 0, 128, 8, 128, 0, 128, + 9, 128, 0, 128, 10, 128, 0, 128, 26, 128, + 0, 128, 27, 128, 0, 128, 11, 128, 0, 128, + 12, 128, 0, 128, 13, 128, 0, 128, 14, 128, + 0, 128, 15, 128, 0, 128, 16, 128, 0, 128, + 17, 128, 0, 128, 18, 128, 0, 128, 19, 128, + 0, 128, 20, 128, 0, 128, 25, 128, 0, 69, + 0, 4, 0, 0, 0 }; #endif @@ -199,17 +207,17 @@ static const short yyrline[] = { 0, 225, 226, 226, 228, 228, 232, 232, 234, 234, 235, 235, 236, 236, 236, 240, 244, 245, 245, 246, 247, 249, 250, 265, 266, 266, 270, 274, 276, 277, 278, - 293, 298, 300, 301, 302, 305, 311, 317, 323, 325, + 293, 298, 300, 302, 303, 305, 311, 317, 323, 325, 326, 328, 334, 335, 335, 339, 343, 344, 345, 359, 361, 361, 362, 364, 365, 367, 368, 369, 370, 372, 374, 376, 378, 380, 382, 386, 390, 394, 396, 397, 399, 406, 406, 408, 408, 409, 410, 415, 420, 422, - 424, 425, 427, 431, 439, 444, 444, 445, 450, 452, - 454, 458, 470, 474, 476, 477, 478, 479, 480, 482, - 483, 484, 485, 486, 487, 488, 490, 491, 492, 493, - 494, 495, 496, 497, 498, 499, 500, 501, 502, 503, - 504, 505, 506, 507, 508, 509, 510, 511, 512, 513, - 516, 525, 530, 531 + 424, 425, 426, 428, 432, 440, 446, 451, 451, 452, + 457, 459, 461, 465, 477, 481, 483, 484, 485, 486, + 487, 489, 490, 491, 492, 493, 494, 495, 496, 498, + 499, 500, 501, 502, 503, 504, 505, 506, 507, 508, + 509, 510, 511, 512, 513, 514, 515, 516, 517, 518, + 519, 520, 521, 524, 533, 538, 539 }; #endif @@ -236,9 +244,9 @@ static const char * const yytname[] = { "store_code_param_part","store_expr_param_part","store_curly_param_part","code_param_value", "write_expr_value","name_expr_dive_code","name_path","name_step","name_advance1", "name_advance2","name_expr_value","name_expr_subvar_value","name_expr_with_subvar_value", -"subvar_ref_name_rdive","subvar_get_writes","subvar__get_write","class_prefix", -"class_static_prefix","class_constructor_prefix","expr_value","expr","string_inside_quotes_value", -"write_string","void_value","empty", NULL +"name_square_code_value","subvar_ref_name_rdive","subvar_get_writes","subvar__get_write", +"class_prefix","class_static_prefix","class_constructor_prefix","expr_value", +"expr","string_inside_quotes_value","write_string","void_value","empty", NULL }; #endif @@ -253,12 +261,12 @@ static const short yyr1[] = { 0, 99, 99, 100, 100, 100, 101, 102, 103, 104, 104, 105, 105, 106, 106, 107, 108, 109, 110, 110, 110, 111, 112, 112, 113, 113, 114, 115, 116, 116, 117, - 117, 117, 118, 119, 120, 121, 121, 122, 123, 123, - 124, 125, 126, 127, 127, 127, 127, 127, 127, 127, - 127, 127, 127, 127, 127, 127, 127, 127, 127, 127, - 127, 127, 127, 127, 127, 127, 127, 127, 127, 127, - 127, 127, 127, 127, 127, 127, 127, 127, 127, 127, - 128, 129, 130, 131 + 117, 117, 117, 118, 119, 120, 121, 122, 122, 123, + 124, 124, 125, 126, 127, 128, 128, 128, 128, 128, + 128, 128, 128, 128, 128, 128, 128, 128, 128, 128, + 128, 128, 128, 128, 128, 128, 128, 128, 128, 128, + 128, 128, 128, 128, 128, 128, 128, 128, 128, 128, + 128, 128, 128, 129, 130, 131, 132 }; static const short yyr2[] = { 0, @@ -272,185 +280,191 @@ static const short yyr2[] = { 0, 1, 2, 1, 1, 1, 3, 3, 3, 1, 3, 1, 3, 1, 3, 1, 1, 1, 1, 1, 1, 1, 1, 2, 1, 2, 2, 1, 1, 2, 1, - 1, 1, 2, 2, 1, 1, 2, 2, 1, 1, - 2, 2, 1, 1, 1, 1, 3, 3, 3, 2, - 2, 2, 2, 2, 2, 2, 3, 3, 3, 3, + 1, 1, 1, 2, 2, 3, 1, 1, 2, 2, + 1, 1, 2, 2, 1, 1, 1, 1, 3, 3, + 3, 2, 2, 2, 2, 2, 2, 2, 2, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, - 1, 1, 0, 0 + 3, 3, 3, 1, 1, 0, 0 }; -static const short yydefact[] = { 154, - 152, 0, 0, 67, 2, 1, 3, 6, 7, 5, +static const short yydefact[] = { 157, + 155, 0, 0, 67, 2, 1, 3, 6, 7, 5, 27, 28, 31, 32, 35, 33, 34, 66, 30, 26, - 0, 100, 0, 0, 0, 36, 38, 0, 40, 41, - 42, 0, 47, 48, 49, 50, 0, 94, 0, 44, - 92, 101, 102, 0, 109, 110, 0, 4, 29, 154, - 154, 154, 99, 0, 111, 104, 106, 105, 103, 0, - 0, 98, 0, 100, 51, 0, 92, 37, 153, 154, - 0, 46, 53, 54, 55, 100, 95, 45, 93, 96, - 43, 52, 112, 70, 68, 15, 8, 10, 11, 0, - 9, 22, 0, 21, 20, 154, 18, 17, 108, 107, - 39, 93, 152, 0, 31, 0, 61, 62, 63, 59, - 0, 114, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 154, 154, 115, 116, 0, 113, 0, 12, 14, - 13, 19, 0, 25, 0, 24, 65, 56, 58, 123, - 124, 125, 126, 122, 121, 120, 0, 151, 0, 0, - 57, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 100, 0, 0, 0, 0, 36, 38, 0, 40, + 41, 42, 0, 47, 48, 49, 50, 0, 94, 0, + 44, 92, 101, 102, 103, 0, 111, 112, 0, 4, + 29, 157, 157, 157, 99, 0, 113, 105, 108, 0, + 107, 104, 0, 0, 98, 0, 100, 51, 0, 92, + 37, 156, 157, 0, 46, 53, 54, 55, 100, 95, + 45, 93, 96, 43, 52, 114, 70, 68, 15, 8, + 10, 11, 0, 9, 22, 0, 21, 20, 157, 18, + 17, 110, 109, 106, 39, 93, 155, 0, 31, 0, + 61, 62, 63, 59, 0, 116, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 157, 157, 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, 154, 0, 0, 57, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 153, 154, 0, 0, 71, - 73, 74, 75, 23, 154, 119, 117, 118, 135, 136, - 137, 140, 141, 142, 143, 144, 145, 146, 147, 148, - 149, 150, 138, 139, 134, 133, 132, 127, 128, 129, - 130, 131, 152, 90, 0, 79, 85, 88, 87, 0, - 83, 0, 81, 86, 91, 69, 72, 16, 76, 153, - 154, 78, 0, 77, 80, 84, 82, 0, 0, 0 + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 156, 157, 0, 0, 71, 73, 74, 75, 23, + 157, 121, 119, 120, 138, 139, 140, 143, 144, 145, + 146, 147, 148, 149, 150, 151, 152, 153, 141, 142, + 137, 136, 135, 130, 131, 132, 133, 134, 155, 90, + 0, 79, 85, 88, 87, 0, 83, 0, 81, 86, + 91, 69, 72, 16, 76, 156, 157, 78, 0, 77, + 80, 84, 82, 0, 0, 0 }; -static const short yydefgoto[] = { 238, - 5, 6, 7, 8, 87, 88, 89, 90, 9, 96, - 52, 93, 94, 135, 148, 11, 12, 13, 14, 124, - 26, 27, 28, 29, 30, 31, 16, 32, 33, 34, - 35, 72, 73, 74, 75, 106, 214, 108, 109, 17, - 125, 47, 128, 85, 179, 180, 181, 182, 183, 215, - 222, 220, 216, 223, 221, 217, 224, 36, 61, 38, - 39, 40, 62, 42, 43, 59, 56, 57, 63, 45, - 46, 225, 127, 149, 19, 218, 20 +static const short yydefgoto[] = { 244, + 5, 6, 7, 8, 90, 91, 92, 93, 9, 99, + 54, 96, 97, 140, 154, 11, 12, 13, 14, 129, + 27, 28, 29, 30, 31, 32, 16, 33, 34, 35, + 36, 75, 76, 77, 78, 110, 220, 112, 113, 17, + 130, 49, 133, 88, 185, 186, 187, 188, 189, 221, + 228, 226, 222, 229, 227, 223, 230, 37, 64, 39, + 40, 41, 65, 43, 44, 45, 62, 58, 59, 66, + 47, 48, 231, 132, 155, 19, 224, 20 }; -static const short yypact[] = { 10, --32768, 15, 58,-32768, -8,-32768,-32768,-32768,-32768,-32768, - 6,-32768,-32768,-32768,-32768,-32768,-32768,-32768,-32768,-32768, - 80, 4, 32, 70, 105,-32768,-32768, 44,-32768,-32768, --32768, -21,-32768,-32768,-32768,-32768, 106,-32768, 54,-32768, - 19,-32768,-32768, 106, 66,-32768, 70,-32768,-32768, 122, - 124, 92,-32768, 32,-32768, 90,-32768,-32768,-32768, 97, - 106, 101, 106, 90,-32768, 105, 101,-32768, 13, 6, - 108,-32768,-32768,-32768,-32768, 111,-32768,-32768, 19,-32768, --32768,-32768,-32768,-32768,-32768,-32768,-32768, 11,-32768, 113, - 117,-32768, 120, 116,-32768, 147,-32768,-32768,-32768,-32768, --32768, 101, 128, 6, 139, 144,-32768,-32768,-32768,-32768, - 118,-32768, 108, 108, 108, 108, 108, 108, 108, 63, - 108, 6, 6,-32768,-32768, 162, 230, -20,-32768,-32768, --32768,-32768, 186,-32768, 172,-32768, 6,-32768,-32768, 351, - 351, 351, 351, 351, 364,-32768, 188,-32768, 164, 173, --32768, 108, 108, 108, 108, 108, 108, 108, 108, 108, - 108, 108, 108, 108, 108, 108, 108, 108, 108, 108, - 108, 108, 108, 108, 108, 14, 6, 108, 20,-32768, --32768,-32768,-32768,-32768, 6,-32768,-32768,-32768, 317, 290, - 260, 342, 342, 138, 138, 342, 342, 342, 342, 138, - 138, 351, 342, 342, 359, 158, 364, 109, 109,-32768, --32768,-32768, 141,-32768, 167,-32768,-32768,-32768,-32768, -13, --32768, -17,-32768,-32768,-32768,-32768,-32768,-32768,-32768, 14, - 6,-32768, 108,-32768,-32768,-32768,-32768, 227, 228,-32768 +static const short yypact[] = { 13, +-32768, 11, 75,-32768, -2,-32768,-32768,-32768,-32768,-32768, + 17,-32768,-32768,-32768,-32768,-32768,-32768,-32768,-32768,-32768, + -21, 40, 17, 79, 95, 99,-32768,-32768, 82,-32768, +-32768,-32768, 53,-32768,-32768,-32768,-32768, 105,-32768, 60, +-32768, 19,-32768,-32768,-32768, 105, 36,-32768, 95,-32768, +-32768, 91, 111, 76,-32768, 79,-32768, 56,-32768, 27, +-32768,-32768, 77, 105, 94, 105, 56,-32768, 99, 94, +-32768, 20, 17, 6,-32768,-32768,-32768,-32768, 4,-32768, +-32768, 19,-32768,-32768,-32768,-32768,-32768,-32768,-32768,-32768, + 28,-32768, 107, 112,-32768, 103, 110,-32768, 144,-32768, +-32768,-32768,-32768,-32768,-32768, 94, 122, 17, 70, 127, +-32768,-32768,-32768,-32768, 135,-32768, 6, 6, 6, 6, + 6, 6, 6, 6, 93, 6, 17, 17,-32768,-32768, + 138, 275, 73,-32768,-32768,-32768,-32768, 184,-32768, 149, +-32768, 17,-32768,-32768, 190, 190, 190, 190, 190, 143, +-32768,-32768, 233,-32768, 140, 169,-32768, 6, 6, 6, + 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, + 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, + 6, 42, 17, 6, 48,-32768,-32768,-32768,-32768,-32768, + 17,-32768,-32768,-32768, 362, 335, 305, 387, 387, 137, + 137, 387, 387, 387, 387, 137, 137, 190, 387, 387, + 241, 197, 143, 96, 96,-32768,-32768,-32768, 83,-32768, + 108,-32768,-32768,-32768,-32768, 59,-32768, -35,-32768,-32768, +-32768,-32768,-32768,-32768,-32768, 42, 17,-32768, 6,-32768, +-32768,-32768,-32768, 235, 254,-32768 }; static const short yypgoto[] = {-32768, --32768,-32768, 224,-32768,-32768,-32768, 148,-32768,-32768,-32768, - 183,-32768,-32768,-32768, 3, 149, -10, -65,-32768, 0, --32768,-32768, 91,-32768,-32768, -28,-32768,-32768,-32768,-32768, --32768,-32768,-32768,-32768,-32768,-32768, 182,-32768,-32768,-32768, - 2,-32768,-32768,-32768,-32768, 73,-32768,-32768,-32768,-32768, --32768,-32768, 24, 25, 31,-32768,-32768, 75, 110, 81, --32768, -32, 9,-32768,-32768, 216,-32768, 225, 279,-32768, --32768, 212, -76, 161,-32768, 219, -44 +-32768,-32768, 185,-32768,-32768,-32768, 164,-32768,-32768,-32768, + 202,-32768,-32768,-32768, 3, -18, -7, -71,-32768, 0, +-32768,-32768, 57,-32768,-32768, -40,-32768,-32768,-32768,-32768, +-32768,-32768,-32768,-32768,-32768,-32768, 189,-32768,-32768,-32768, + 2,-32768,-32768,-32768,-32768, 72,-32768,-32768,-32768,-32768, +-32768,-32768, 29, 34, 43,-32768,-32768, -10, 78, -20, +-32768, -31, 9,-32768,-32768,-32768, 223,-32768, 238, 278, +-32768,-32768, 224, 37, 171,-32768, 225, -11 }; -#define YYLAST 401 +#define YYLAST 424 static const short yytable[] = { 15, - 49, 18, 10, 105, 78, 91, 95, 98, 53, 1, - 15, 41, 18, 1, 86, 81, 103, 213, 21, 69, - 176, -98, 226, 70, 177, 233, 71, 178, 78, 231, - 2, 234, 232, 67, 81, 58, 140, 141, 142, 143, - 144, 145, 146, 130, 147, 79, 68, 54, 2, 3, - -154, 136, 41, 3, 55, 4, 3, 3, 104, 4, - 176, 22, 4, 4, 177, -97, 22, 178, 15, 15, - 18, 18, 111, 22, 102, 189, 190, 191, 192, 193, - 194, 195, 196, 197, 198, 199, 200, 201, 202, 203, - 204, 205, 206, 207, 208, 209, 210, 211, 212, 65, - 80, 23, 24, 15, 25, 18, 23, 24, 64, 76, - 105, 112, 37, 23, 60, 53, 83, 77, 82, 50, - 51, 15, 15, 18, 18, 86, 49, 92, 113, 114, - 115, 116, 51, 54, 66, 117, 15, 84, 18, 118, - 119, 77, 101, 173, 174, 175, 77, -97, 23, 23, - 134, 120, 131, 37, 54, 121, -14, 4, 133, 122, - 123, 132, 165, 139, 105, 104, 168, 169, 170, -60, - 171, 172, 173, 174, 175, 15, 15, 18, 18, 219, - -64, -64, -89, -89, 15, 138, 18, 228, 170, 184, - 171, 172, 173, 174, 175, 152, 153, 154, 155, 156, - 157, 158, 159, 160, 161, 162, 163, 164, 229, 230, - 151, 185, 165, 166, 167, 187, 168, 169, 170, 104, - 171, 172, 173, 174, 175, 188, 239, 240, 48, 15, - 15, 18, 18, 219, 97, 129, 186, 152, 153, 154, - 155, 156, 157, 158, 159, 160, 161, 162, 163, 164, - 107, 227, 137, 235, 165, 166, 167, 237, 168, 169, - 170, 236, 171, 172, 173, 174, 175, 152, 153, 99, - 155, 156, 157, 158, 159, 160, 161, 162, 163, 164, - 100, 44, 126, 150, 165, 166, 167, 110, 168, 169, - 170, 0, 171, 172, 173, 174, 175, 152, 0, 0, - 155, 156, 157, 158, 159, 160, 161, 162, 163, 164, - 0, 0, 0, 0, 165, 166, 167, 0, 168, 169, - 170, 0, 171, 172, 173, 174, 175, 155, 156, 157, - 158, 159, 160, 161, 162, 163, 164, 0, 0, 0, - 0, 165, 166, 167, 0, 168, 169, 170, 0, 171, - 172, 173, 174, 175, 157, 158, 0, 0, 0, 0, - 163, 164, 0, 0, 0, 0, 165, 0, 0, 0, - 168, 169, 170, 0, 171, 172, 173, 174, 175, 168, - 169, 170, 0, 171, 172, 173, 174, 175, 169, 170, - 0, 171, 172, 173, 174, 175, 171, 172, 173, 174, - 175 + 109, 18, 10, 51, 60, 84, 81, 239, 55, 116, + 15, 42, 18, 240, 21, 68, 1, 80, 52, 53, + 1, -98, 15, 107, 18, 84, 117, 118, 119, 120, + 1, 89, 81, 121, 70, 85, 2, 122, 123, 124, + 94, 98, 101, 80, 55, 219, 82, 56, 80, 125, + 232, 2, 51, 126, 42, 4, 3, 127, 128, 15, + 3, 18, 4, 3, 108, -97, 4, -157, 104, 4, + 3, 15, 15, 18, 18, 115, 4, 106, 22, 135, + 38, 63, 61, 56, 71, 3, 86, 141, 182, 142, + 57, 4, 183, 72, 89, 184, 22, 73, 22, 56, + 74, 237, 67, 69, 238, 87, 83, 15, 79, 18, + 109, -64, -64, 182, 95, 23, 53, 183, 24, 25, + 184, 26, 105, 38, -89, -89, 15, 15, 18, 18, + 179, 180, 181, 23, 51, 23, 24, 25, 24, 23, + -97, 15, 24, 18, 137, 23, 136, 139, 24, 235, + 236, -14, 138, 145, 146, 147, 148, 149, 150, 151, + 152, 171, 153, -60, 109, 174, 175, 176, 143, 177, + 178, 179, 180, 181, 108, 177, 178, 179, 180, 181, + 144, 15, 15, 18, 18, 225, 157, 190, 191, 50, + 15, 193, 18, 234, 195, 196, 197, 198, 199, 200, + 201, 202, 203, 204, 205, 206, 207, 208, 209, 210, + 211, 212, 213, 214, 215, 216, 217, 218, 174, 175, + 176, 194, 177, 178, 179, 180, 181, 176, 108, 177, + 178, 179, 180, 181, 245, 15, 15, 18, 18, 225, + 158, 159, 160, 161, 162, 163, 164, 165, 166, 167, + 168, 169, 170, 246, 134, 100, 233, 171, 172, 173, + 111, 174, 175, 176, 241, 177, 178, 179, 180, 181, + 175, 176, 243, 177, 178, 179, 180, 181, 102, 242, + 46, 192, 158, 159, 160, 161, 162, 163, 164, 165, + 166, 167, 168, 169, 170, 103, 114, 131, 156, 171, + 172, 173, 0, 174, 175, 176, 0, 177, 178, 179, + 180, 181, 158, 159, 0, 161, 162, 163, 164, 165, + 166, 167, 168, 169, 170, 0, 0, 0, 0, 171, + 172, 173, 0, 174, 175, 176, 0, 177, 178, 179, + 180, 181, 158, 0, 0, 161, 162, 163, 164, 165, + 166, 167, 168, 169, 170, 0, 0, 0, 0, 171, + 172, 173, 0, 174, 175, 176, 0, 177, 178, 179, + 180, 181, 161, 162, 163, 164, 165, 166, 167, 168, + 169, 170, 0, 0, 0, 0, 171, 172, 173, 0, + 174, 175, 176, 0, 177, 178, 179, 180, 181, 163, + 164, 0, 0, 0, 0, 169, 170, 0, 0, 0, + 0, 171, 0, 0, 0, 174, 175, 176, 0, 177, + 178, 179, 180, 181 }; static const short yycheck[] = { 0, - 11, 0, 0, 69, 37, 50, 51, 52, 5, 4, - 11, 3, 11, 4, 4, 44, 4, 4, 4, 41, - 41, 3, 3, 45, 45, 43, 48, 48, 61, 43, - 39, 49, 46, 25, 63, 4, 113, 114, 115, 116, - 117, 118, 119, 88, 121, 37, 3, 44, 39, 44, - 40, 96, 44, 44, 51, 50, 44, 44, 69, 50, - 41, 4, 50, 50, 45, 47, 4, 48, 69, 70, - 69, 70, 70, 4, 66, 152, 153, 154, 155, 156, - 157, 158, 159, 160, 161, 162, 163, 164, 165, 166, - 167, 168, 169, 170, 171, 172, 173, 174, 175, 25, - 47, 44, 45, 104, 47, 104, 44, 45, 4, 4, - 176, 4, 3, 44, 24, 5, 51, 37, 44, 40, - 41, 122, 123, 122, 123, 4, 137, 4, 21, 22, - 23, 24, 41, 44, 25, 28, 137, 47, 137, 32, - 33, 61, 46, 35, 36, 37, 66, 47, 44, 44, - 4, 44, 40, 44, 44, 48, 40, 50, 43, 52, - 53, 42, 25, 46, 230, 176, 29, 30, 31, 42, - 33, 34, 35, 36, 37, 176, 177, 176, 177, 177, - 42, 43, 42, 43, 185, 42, 185, 185, 31, 4, - 33, 34, 35, 36, 37, 8, 9, 10, 11, 12, - 13, 14, 15, 16, 17, 18, 19, 20, 42, 43, - 49, 40, 25, 26, 27, 52, 29, 30, 31, 230, - 33, 34, 35, 36, 37, 53, 0, 0, 5, 230, - 231, 230, 231, 231, 52, 88, 49, 8, 9, 10, - 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, - 69, 179, 104, 230, 25, 26, 27, 233, 29, 30, - 31, 231, 33, 34, 35, 36, 37, 8, 9, 54, - 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, - 56, 3, 71, 123, 25, 26, 27, 69, 29, 30, - 31, -1, 33, 34, 35, 36, 37, 8, -1, -1, - 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, - -1, -1, -1, -1, 25, 26, 27, -1, 29, 30, - 31, -1, 33, 34, 35, 36, 37, 11, 12, 13, - 14, 15, 16, 17, 18, 19, 20, -1, -1, -1, - -1, 25, 26, 27, -1, 29, 30, 31, -1, 33, - 34, 35, 36, 37, 13, 14, -1, -1, -1, -1, - 19, 20, -1, -1, -1, -1, 25, -1, -1, -1, - 29, 30, 31, -1, 33, 34, 35, 36, 37, 29, - 30, 31, -1, 33, 34, 35, 36, 37, 30, 31, - -1, 33, 34, 35, 36, 37, 33, 34, 35, 36, - 37 + 72, 0, 0, 11, 23, 46, 38, 43, 5, 4, + 11, 3, 11, 49, 4, 26, 4, 38, 40, 41, + 4, 3, 23, 4, 23, 66, 21, 22, 23, 24, + 4, 4, 64, 28, 26, 46, 39, 32, 33, 34, + 52, 53, 54, 64, 5, 4, 38, 44, 69, 44, + 3, 39, 60, 48, 46, 50, 44, 52, 53, 60, + 44, 60, 50, 44, 72, 47, 50, 40, 42, 50, + 44, 72, 73, 72, 73, 73, 50, 69, 4, 91, + 3, 25, 4, 44, 3, 44, 51, 99, 41, 108, + 51, 50, 45, 41, 4, 48, 4, 45, 4, 44, + 48, 43, 4, 26, 46, 49, 47, 108, 4, 108, + 182, 42, 43, 41, 4, 41, 41, 45, 44, 45, + 48, 47, 46, 46, 42, 43, 127, 128, 127, 128, + 35, 36, 37, 41, 142, 41, 44, 45, 44, 41, + 47, 142, 44, 142, 42, 41, 40, 4, 44, 42, + 43, 40, 43, 117, 118, 119, 120, 121, 122, 123, + 124, 25, 126, 42, 236, 29, 30, 31, 42, 33, + 34, 35, 36, 37, 182, 33, 34, 35, 36, 37, + 46, 182, 183, 182, 183, 183, 49, 4, 40, 5, + 191, 52, 191, 191, 158, 159, 160, 161, 162, 163, + 164, 165, 166, 167, 168, 169, 170, 171, 172, 173, + 174, 175, 176, 177, 178, 179, 180, 181, 29, 30, + 31, 53, 33, 34, 35, 36, 37, 31, 236, 33, + 34, 35, 36, 37, 0, 236, 237, 236, 237, 237, + 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, + 18, 19, 20, 0, 91, 54, 185, 25, 26, 27, + 72, 29, 30, 31, 236, 33, 34, 35, 36, 37, + 30, 31, 239, 33, 34, 35, 36, 37, 56, 237, + 3, 49, 8, 9, 10, 11, 12, 13, 14, 15, + 16, 17, 18, 19, 20, 58, 72, 74, 128, 25, + 26, 27, -1, 29, 30, 31, -1, 33, 34, 35, + 36, 37, 8, 9, -1, 11, 12, 13, 14, 15, + 16, 17, 18, 19, 20, -1, -1, -1, -1, 25, + 26, 27, -1, 29, 30, 31, -1, 33, 34, 35, + 36, 37, 8, -1, -1, 11, 12, 13, 14, 15, + 16, 17, 18, 19, 20, -1, -1, -1, -1, 25, + 26, 27, -1, 29, 30, 31, -1, 33, 34, 35, + 36, 37, 11, 12, 13, 14, 15, 16, 17, 18, + 19, 20, -1, -1, -1, -1, 25, 26, 27, -1, + 29, 30, 31, -1, 33, 34, 35, 36, 37, 13, + 14, -1, -1, -1, -1, 19, 20, -1, -1, -1, + -1, 25, -1, -1, -1, 29, 30, 31, -1, 33, + 34, 35, 36, 37 }; #define YYPURE 1 /* -*-C-*- Note some compilers choke on comments on `#line' lines. */ -#line 3 "D:/cygwin/usr/share/bison.simple" +#line 3 "/usr/share/bison.simple" /* This file comes from bison-1.28. */ /* Skeleton output parser for bison, @@ -664,7 +678,7 @@ __yy_memcpy (char *to, char *from, unsig #endif #endif -#line 217 "D:/cygwin/usr/share/bison.simple" +#line 217 "/usr/share/bison.simple" /* The user can define YYPARSE_PARAM as the name of an argument to be passed into yyparse. The argument should have type void *. @@ -1209,7 +1223,7 @@ case 57: { // stack: context, name yyval=yyvsp[-1]; // stack: context, name, value - O(yyval, OP_CONSTRUCT_EXPR); /* value=pop; name=pop; context=pop; construct(context,name,value) */ + O(yyval, OP_CONSTRUCT_EXPR); /* value=pop->as_expr_result; name=pop; context=pop; construct(context,name,value) */ ; break;} case 58: @@ -1344,15 +1358,15 @@ case 98: O(yyval, OP_GET_ELEMENT); /* name=pop; context=pop; stack: context.get_element(name) */ ; break;} -case 103: -#line 427 "compile.y" +case 104: +#line 428 "compile.y" { yyval=yyvsp[0]; O(yyval, OP_GET_ELEMENT); ; break;} -case 104: -#line 431 "compile.y" +case 105: +#line 432 "compile.y" { yyval=N(POOL); O(yyval, OP_CREATE_EWPOOL); @@ -1362,34 +1376,43 @@ case 104: O(yyval, OP_REDUCE_EWPOOL); ; break;} -case 105: -#line 439 "compile.y" +case 106: +#line 440 "compile.y" +{ + yyval=N(POOL); + O(yyval, OP_CREATE_EWPOOL); + P(yyval, yyvsp[-1]); + O(yyval, OP_REDUCE_EWPOOL); +; + break;} +case 107: +#line 446 "compile.y" { yyval=N(POOL); O(yyval, OP_WITH_READ); P(yyval, yyvsp[0]); ; break;} -case 107: -#line 444 "compile.y" +case 109: +#line 451 "compile.y" { yyval=yyvsp[-1]; P(yyval, yyvsp[0]) ; break;} -case 108: -#line 445 "compile.y" +case 110: +#line 452 "compile.y" { yyval=yyvsp[0]; O(yyval, OP_GET_ELEMENT__WRITE); ; break;} -case 111: -#line 454 "compile.y" +case 113: +#line 461 "compile.y" { yyval=yyvsp[-1]; // stack: class name string O(yyval, OP_GET_CLASS); ; break;} -case 112: -#line 458 "compile.y" +case 114: +#line 465 "compile.y" { yyval=yyvsp[-1]; if(!PC.object_constructor_allowed) { @@ -1399,151 +1422,155 @@ case 112: O(yyval, OP_PREPARE_TO_CONSTRUCT_OBJECT); ; break;} -case 113: -#line 470 "compile.y" +case 115: +#line 477 "compile.y" { if((yyval=yyvsp[0])->size()==2) // only one string literal in there? change_string_literal_to_double_literal(yyval); // make that string literal Double ; break;} -case 117: -#line 478 "compile.y" +case 119: +#line 485 "compile.y" { yyval = yyvsp[-1]; ; break;} -case 118: -#line 479 "compile.y" +case 120: +#line 486 "compile.y" { yyval = yyvsp[-1]; ; break;} -case 119: -#line 480 "compile.y" +case 121: +#line 487 "compile.y" { yyval = yyvsp[-1]; ; break;} -case 120: -#line 482 "compile.y" +case 122: +#line 489 "compile.y" { yyval=yyvsp[0]; O(yyval, OP_NEG) ; break;} -case 121: -#line 483 "compile.y" +case 123: +#line 490 "compile.y" +{ yyval=yyvsp[0] ; + break;} +case 124: +#line 491 "compile.y" { yyval=yyvsp[0]; O(yyval, OP_INV) ; break;} -case 122: -#line 484 "compile.y" +case 125: +#line 492 "compile.y" { yyval=yyvsp[0]; O(yyval, OP_NOT) ; break;} -case 123: -#line 485 "compile.y" +case 126: +#line 493 "compile.y" { yyval=yyvsp[0]; O(yyval, OP_DEF) ; break;} -case 124: -#line 486 "compile.y" +case 127: +#line 494 "compile.y" { yyval=yyvsp[0]; O(yyval, OP_IN) ; break;} -case 125: -#line 487 "compile.y" +case 128: +#line 495 "compile.y" { yyval=yyvsp[0]; O(yyval, OP_FEXISTS) ; break;} -case 126: -#line 488 "compile.y" +case 129: +#line 496 "compile.y" { yyval=yyvsp[0]; O(yyval, OP_DEXISTS) ; break;} -case 127: -#line 490 "compile.y" +case 130: +#line 498 "compile.y" { yyval=yyvsp[-2]; P(yyval, yyvsp[0]); O(yyval, OP_SUB) ; break;} -case 128: -#line 491 "compile.y" +case 131: +#line 499 "compile.y" { yyval=yyvsp[-2]; P(yyval, yyvsp[0]); O(yyval, OP_ADD) ; break;} -case 129: -#line 492 "compile.y" +case 132: +#line 500 "compile.y" { yyval=yyvsp[-2]; P(yyval, yyvsp[0]); O(yyval, OP_MUL) ; break;} -case 130: -#line 493 "compile.y" +case 133: +#line 501 "compile.y" { yyval=yyvsp[-2]; P(yyval, yyvsp[0]); O(yyval, OP_DIV) ; break;} -case 131: -#line 494 "compile.y" +case 134: +#line 502 "compile.y" { yyval=yyvsp[-2]; P(yyval, yyvsp[0]); O(yyval, OP_MOD) ; break;} -case 132: -#line 495 "compile.y" +case 135: +#line 503 "compile.y" { yyval=yyvsp[-2]; P(yyval, yyvsp[0]); O(yyval, OP_BIN_AND) ; break;} -case 133: -#line 496 "compile.y" +case 136: +#line 504 "compile.y" { yyval=yyvsp[-2]; P(yyval, yyvsp[0]); O(yyval, OP_BIN_OR) ; break;} -case 134: -#line 497 "compile.y" +case 137: +#line 505 "compile.y" { yyval=yyvsp[-2]; P(yyval, yyvsp[0]); O(yyval, OP_BIN_XOR) ; break;} -case 135: -#line 498 "compile.y" +case 138: +#line 506 "compile.y" { yyval=yyvsp[-2]; P(yyval, yyvsp[0]); O(yyval, OP_LOG_AND) ; break;} -case 136: -#line 499 "compile.y" +case 139: +#line 507 "compile.y" { yyval=yyvsp[-2]; P(yyval, yyvsp[0]); O(yyval, OP_LOG_OR) ; break;} -case 137: -#line 500 "compile.y" +case 140: +#line 508 "compile.y" { yyval=yyvsp[-2]; P(yyval, yyvsp[0]); O(yyval, OP_LOG_XOR) ; break;} -case 138: -#line 501 "compile.y" +case 141: +#line 509 "compile.y" { yyval=yyvsp[-2]; P(yyval, yyvsp[0]); O(yyval, OP_NUM_LT) ; break;} -case 139: -#line 502 "compile.y" +case 142: +#line 510 "compile.y" { yyval=yyvsp[-2]; P(yyval, yyvsp[0]); O(yyval, OP_NUM_GT) ; break;} -case 140: -#line 503 "compile.y" +case 143: +#line 511 "compile.y" { yyval=yyvsp[-2]; P(yyval, yyvsp[0]); O(yyval, OP_NUM_LE) ; break;} -case 141: -#line 504 "compile.y" +case 144: +#line 512 "compile.y" { yyval=yyvsp[-2]; P(yyval, yyvsp[0]); O(yyval, OP_NUM_GE) ; break;} -case 142: -#line 505 "compile.y" +case 145: +#line 513 "compile.y" { yyval=yyvsp[-2]; P(yyval, yyvsp[0]); O(yyval, OP_NUM_EQ) ; break;} -case 143: -#line 506 "compile.y" +case 146: +#line 514 "compile.y" { yyval=yyvsp[-2]; P(yyval, yyvsp[0]); O(yyval, OP_NUM_NE) ; break;} -case 144: -#line 507 "compile.y" +case 147: +#line 515 "compile.y" { yyval=yyvsp[-2]; P(yyval, yyvsp[0]); O(yyval, OP_STR_LT) ; break;} -case 145: -#line 508 "compile.y" +case 148: +#line 516 "compile.y" { yyval=yyvsp[-2]; P(yyval, yyvsp[0]); O(yyval, OP_STR_GT) ; break;} -case 146: -#line 509 "compile.y" +case 149: +#line 517 "compile.y" { yyval=yyvsp[-2]; P(yyval, yyvsp[0]); O(yyval, OP_STR_LE) ; break;} -case 147: -#line 510 "compile.y" +case 150: +#line 518 "compile.y" { yyval=yyvsp[-2]; P(yyval, yyvsp[0]); O(yyval, OP_STR_GE) ; break;} -case 148: -#line 511 "compile.y" +case 151: +#line 519 "compile.y" { yyval=yyvsp[-2]; P(yyval, yyvsp[0]); O(yyval, OP_STR_EQ) ; break;} -case 149: -#line 512 "compile.y" +case 152: +#line 520 "compile.y" { yyval=yyvsp[-2]; P(yyval, yyvsp[0]); O(yyval, OP_STR_NE) ; break;} -case 150: -#line 513 "compile.y" +case 153: +#line 521 "compile.y" { yyval=yyvsp[-2]; P(yyval, yyvsp[0]); O(yyval, OP_IS) ; break;} -case 151: -#line 516 "compile.y" +case 154: +#line 524 "compile.y" { yyval=N(POOL); O(yyval, OP_CREATE_SWPOOL); /* stack: empty write context */ @@ -1551,24 +1578,24 @@ case 151: O(yyval, OP_REDUCE_SWPOOL); /* context=pop; stack: context.get_string() */ ; break;} -case 152: -#line 525 "compile.y" +case 155: +#line 533 "compile.y" { // optimized from OP_STRING+OP_WRITE_VALUE to OP_STRING__WRITE change_string_literal_to_write_string_literal(yyval=yyvsp[0]) ; break;} -case 153: -#line 530 "compile.y" +case 156: +#line 538 "compile.y" { yyval=VL(NEW VVoid(POOL)) ; break;} -case 154: -#line 531 "compile.y" +case 157: +#line 539 "compile.y" { yyval=N(POOL) ; break;} } /* the action file gets copied in in place of this dollarsign */ -#line 543 "D:/cygwin/usr/share/bison.simple" +#line 543 "/usr/share/bison.simple" yyvsp -= yylen; yyssp -= yylen; @@ -1788,7 +1815,7 @@ yyerrhandle: } return 1; } -#line 533 "compile.y" +#line 541 "compile.y" #endif @@ -1827,6 +1854,7 @@ static int yylex(YYSTYPE *lvalp, void *p int skip_analized=0; while(true) { c=*(end=(PC.source++)); +// fprintf(stderr, "\nchar: %c %02X; nestage: %d, sp=%d", c, c, lexical_brackets_nestage, PC.sp); if(c=='\n') { PC.line++; @@ -1834,9 +1862,21 @@ static int yylex(YYSTYPE *lvalp, void *p } else PC.col++; - if(c=='^' && PC.ls!=LS_COMMENT && PC.ls!=LS_DEF_COMMENT) + if(c=='^') + switch(PC.ls) { +case LS_EXPRESSION_VAR_NAME_WITH_COLON: +case LS_EXPRESSION_VAR_NAME_WITHOUT_COLON: +case LS_VAR_NAME_SIMPLE_WITH_COLON: +case LS_VAR_NAME_SIMPLE_WITHOUT_COLON: +case LS_VAR_NAME_CURLY: +case LS_METHOD_NAME: +case LS_COMMENT: +case LS_DEF_COMMENT: + // no literals in names, please + break; +default: switch(*PC.source) { - // escaping: ^^ & co + // ^escaping some punctuators case '^': case '$': case ';': case '(': case ')': case '[': case ']': @@ -1847,12 +1887,19 @@ static int yylex(YYSTYPE *lvalp, void *p PC.string->APPEND_CLEAN(begin, end-begin, PC.file, begin_line); } // reset piece 'begin' position & line - begin=PC.source; // ^ + end=begin=PC.source; // ^ begin_line=PC.line; - // skip over ^ and _ - PC.source++; PC.col++; - // skip analysis = forced literal - continue; + if(PC.ls==LS_METHOD_AFTER) { + pop_LS(PC); + result=EON; + skip_analized=-1; // return to ^ afterwards to assure it's literality + goto break2; + } else { + // skip over _ after ^ + PC.source++; PC.col++; + // skip analysis = forced literal + continue; + } // converting ^#HH into char(hex(HH)) case '#': @@ -1882,6 +1929,8 @@ static int yylex(YYSTYPE *lvalp, void *p } break; } + break; + } // #comment start skipping if(c=='#' && PC.col==1) { if(end!=begin) { @@ -1895,6 +1944,7 @@ static int yylex(YYSTYPE *lvalp, void *p // USER'S = NOT OURS case LS_USER: + case LS_NAME_SQUARE_PART: // name.[here].xxx if(PC.trim_bof) switch(c) { case '\n': case ' ': case '\t': @@ -1906,7 +1956,7 @@ static int yylex(YYSTYPE *lvalp, void *p } switch(c) { case '$': - push_LS(PC, LS_VAR_NAME_SIMPLE); + push_LS(PC, LS_VAR_NAME_SIMPLE_WITH_COLON); RC; case '^': push_LS(PC, LS_METHOD_NAME); @@ -1917,6 +1967,17 @@ static int yylex(YYSTYPE *lvalp, void *p RC; } break; + case ']': + if(PC.ls==LS_NAME_SQUARE_PART) + if(--lexical_brackets_nestage==0) {// $name.[co<]?>de<]?> + pop_LS(PC); // $name.[co<]>de<]!> + RC; + } + break; + case '[': // $name.[co<[>de] + if(PC.ls==LS_NAME_SQUARE_PART) + lexical_brackets_nestage++; + break; } break; @@ -1946,7 +2007,7 @@ static int yylex(YYSTYPE *lvalp, void *p } break; case '$': - push_LS(PC, LS_VAR_NAME_SIMPLE); + push_LS(PC, LS_VAR_NAME_SIMPLE_WITH_COLON); RC; case '^': push_LS(PC, LS_METHOD_NAME); @@ -2028,7 +2089,7 @@ static int yylex(YYSTYPE *lvalp, void *p pop_LS(PC); // return to normal life RC; case '$': - push_LS(PC, LS_EXPRESSION_VAR_NAME); + push_LS(PC, LS_EXPRESSION_VAR_NAME_WITH_COLON); RC; case '^': push_LS(PC, LS_METHOD_NAME); @@ -2138,10 +2199,13 @@ static int yylex(YYSTYPE *lvalp, void *p break; // VARIABLE GET/PUT/WITH - case LS_VAR_NAME_SIMPLE: - case LS_EXPRESSION_VAR_NAME: - case LS_VAR_NAME_NO_COLON: - if(PC.ls==LS_EXPRESSION_VAR_NAME) { + case LS_VAR_NAME_SIMPLE_WITH_COLON: + case LS_VAR_NAME_SIMPLE_WITHOUT_COLON: + case LS_EXPRESSION_VAR_NAME_WITH_COLON: + case LS_EXPRESSION_VAR_NAME_WITHOUT_COLON: + if( + PC.ls==LS_EXPRESSION_VAR_NAME_WITH_COLON || + PC.ls==LS_EXPRESSION_VAR_NAME_WITHOUT_COLON) { // name in expr ends also before binary operators switch(c) { case '-': @@ -2151,7 +2215,9 @@ static int yylex(YYSTYPE *lvalp, void *p goto break2; } } - if(PC.ls==LS_VAR_NAME_NO_COLON) { + if( + PC.ls==LS_VAR_NAME_SIMPLE_WITHOUT_COLON || + PC.ls==LS_EXPRESSION_VAR_NAME_WITHOUT_COLON) { // name already has ':', stop before next switch(c) { case ':': @@ -2180,6 +2246,16 @@ static int yylex(YYSTYPE *lvalp, void *p result=EON; goto break2; case '[': + // $name.<[>code] + if(PC.col>1/*not first column*/ && ( + end[-1]=='$'/*was start of get*/ || + end[-1]==':'/*was class name delim */ || + end[-1]=='.'/*was name delim */ + )) { + push_LS(PC, LS_NAME_SQUARE_PART); + lexical_brackets_nestage=1; + RC; + } PC.ls=LS_VAR_SQUARE; lexical_brackets_nestage=1; RC; @@ -2198,14 +2274,24 @@ static int yylex(YYSTYPE *lvalp, void *p RC; case '.': // name part delim case '$': // name part subvar - case ':': // ':name' or 'class:name' - PC.ls=LS_VAR_NAME_NO_COLON; // stop before next ':' + case ':': // class<:>name + // go to _WITHOUT_COLON state variant... + if(PC.ls==LS_VAR_NAME_SIMPLE_WITH_COLON) + PC.ls=LS_VAR_NAME_SIMPLE_WITHOUT_COLON; + else if(PC.ls==LS_EXPRESSION_VAR_NAME_WITH_COLON) + PC.ls=LS_EXPRESSION_VAR_NAME_WITHOUT_COLON; + // ...stop before next ':' RC; } break; case LS_VAR_NAME_CURLY: switch(c) { + case '[': + // ${name.<[>code]} + push_LS(PC, LS_NAME_SQUARE_PART); + lexical_brackets_nestage=1; + RC; case '}': // ${name} finished, restoring LS pop_LS(PC); RC; @@ -2219,7 +2305,7 @@ static int yylex(YYSTYPE *lvalp, void *p case LS_VAR_SQUARE: switch(c) { case '$': - push_LS(PC, LS_VAR_NAME_SIMPLE); + push_LS(PC, LS_VAR_NAME_SIMPLE_WITH_COLON); RC; case '^': push_LS(PC, LS_METHOD_NAME); @@ -2241,7 +2327,7 @@ static int yylex(YYSTYPE *lvalp, void *p case LS_VAR_CURLY: switch(c) { case '$': - push_LS(PC, LS_VAR_NAME_SIMPLE); + push_LS(PC, LS_VAR_NAME_SIMPLE_WITH_COLON); RC; case '^': push_LS(PC, LS_METHOD_NAME); @@ -2262,6 +2348,16 @@ static int yylex(YYSTYPE *lvalp, void *p case LS_METHOD_NAME: switch(c) { case '[': + // ^name.<[>code].xxx + if(PC.col>1/*not first column*/ && ( + end[-1]=='^'/*was start of call*/ || // never, ^[ is literal... + end[-1]==':'/*was class name delim */ || + end[-1]=='.'/*was name delim */ + )) { + push_LS(PC, LS_NAME_SQUARE_PART); + lexical_brackets_nestage=1; + RC; + } PC.ls=LS_METHOD_SQUARE; lexical_brackets_nestage=1; RC; @@ -2283,7 +2379,7 @@ static int yylex(YYSTYPE *lvalp, void *p case LS_METHOD_SQUARE: switch(c) { case '$': - push_LS(PC, LS_VAR_NAME_SIMPLE); + push_LS(PC, LS_VAR_NAME_SIMPLE_WITH_COLON); RC; case '^': push_LS(PC, LS_METHOD_NAME); @@ -2305,7 +2401,7 @@ static int yylex(YYSTYPE *lvalp, void *p case LS_METHOD_CURLY: switch(c) { case '$': - push_LS(PC, LS_VAR_NAME_SIMPLE); + push_LS(PC, LS_VAR_NAME_SIMPLE_WITH_COLON); RC; case '^': push_LS(PC, LS_METHOD_NAME);