--- parser3/src/main/compile.tab.C 2001/08/10 12:36:55 1.3 +++ parser3/src/main/compile.tab.C 2001/08/22 07:31:53 1.7 @@ -31,7 +31,7 @@ #line 8 "compile.y" -static char *RCSId="$Id: compile.tab.C,v 1.3 2001/08/10 12:36:55 parser Exp $"; +static char *RCSId="$Id: compile.tab.C,v 1.7 2001/08/22 07:31:53 parser Exp $"; /** @todo parser4: @@ -171,7 +171,7 @@ static const short yyrhs[] = { 56, 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, 120, 0, 44, - 121, 0, 4, 122, 0, 48, 70, 49, 0, 4, + 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, @@ -200,7 +200,7 @@ 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, @@ -287,12 +287,12 @@ static const short yydefact[] = { 156, 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, 156, 156, 156, 99, 0, 113, 105, 108, 107, - 104, 0, 0, 98, 0, 100, 51, 0, 92, 0, + 29, 156, 156, 156, 99, 0, 113, 105, 108, 0, + 107, 104, 0, 0, 98, 0, 100, 51, 0, 92, 37, 155, 156, 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, 156, 18, - 17, 110, 109, 39, 93, 106, 154, 0, 31, 0, + 17, 110, 109, 106, 39, 93, 154, 0, 31, 0, 61, 62, 63, 59, 0, 116, 0, 0, 0, 0, 0, 0, 0, 0, 0, 156, 156, 117, 118, 0, 115, 0, 12, 14, 13, 19, 0, 25, 0, 24, @@ -315,144 +315,144 @@ static const short yydefgoto[] = { 242 27, 28, 29, 30, 31, 32, 16, 33, 34, 35, 36, 75, 76, 77, 78, 110, 218, 112, 113, 17, 129, 49, 132, 88, 183, 184, 185, 186, 187, 219, - 226, 224, 220, 227, 225, 221, 228, 37, 63, 39, - 40, 41, 64, 43, 44, 45, 61, 58, 59, 65, + 226, 224, 220, 227, 225, 221, 228, 37, 64, 39, + 40, 41, 65, 43, 44, 45, 62, 58, 59, 66, 47, 48, 229, 131, 153, 19, 222, 20 }; -static const short yypact[] = { 6, --32768, 14, 57,-32768, -17,-32768,-32768,-32768,-32768,-32768, - 16,-32768,-32768,-32768,-32768,-32768,-32768,-32768,-32768,-32768, - 73, 35, 23, 51, 76, 16,-32768,-32768, 80,-32768, --32768,-32768, -24,-32768,-32768,-32768,-32768, 77,-32768, 47, --32768, 22,-32768,-32768,-32768, 77, 46,-32768, 51,-32768, --32768, 96, 107, 88,-32768, 23,-32768, 71,-32768,-32768, --32768, 141, 77, 90, 77, 71,-32768, 76, 90, 8, --32768, 38, 16, 15,-32768,-32768,-32768,-32768, 9,-32768, --32768, 22,-32768,-32768,-32768,-32768,-32768,-32768,-32768,-32768, - 94,-32768, 83, 142,-32768, 144, 145,-32768, 186,-32768, --32768,-32768,-32768,-32768, 90,-32768, 150, 16, 123, 152, --32768,-32768,-32768,-32768, 173,-32768, 15, 15, 15, 15, - 15, 15, 15, 74, 15, 16, 16,-32768,-32768, 171, - 274, 91,-32768,-32768,-32768,-32768, 217,-32768, 182,-32768, - 16,-32768,-32768, 140, 140, 140, 140, 140, 118,-32768, - 232,-32768, 180, 170,-32768, 15, 15, 15, 15, 15, - 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, - 15, 15, 15, 15, 15, 15, 15, 15, 15, 40, - 16, 15, 48,-32768,-32768,-32768,-32768,-32768, 16,-32768, --32768,-32768, 361, 334, 304, 386, 386, 113, 113, 386, - 386, 386, 386, 113, 113, 140, 386, 386, 194, 239, - 118, -4, -4,-32768,-32768,-32768, 125,-32768, 136,-32768, --32768,-32768,-32768, 60,-32768, -20,-32768,-32768,-32768,-32768, --32768,-32768,-32768, 40, 16,-32768, 15,-32768,-32768,-32768, --32768, 233, 236,-32768 +static const short yypact[] = { 13, +-32768, 16, 91,-32768, -6,-32768,-32768,-32768,-32768,-32768, + 17,-32768,-32768,-32768,-32768,-32768,-32768,-32768,-32768,-32768, + 73, 38, 17, 33, 5, 79,-32768,-32768, 45,-32768, +-32768,-32768, -26,-32768,-32768,-32768,-32768, 89,-32768, 49, +-32768, 4,-32768,-32768,-32768, 89, 54,-32768, 5,-32768, +-32768, 80, 84, 59,-32768, 33,-32768, 67,-32768, 27, +-32768,-32768, 69, 89, 90, 89, 67,-32768, 79, 90, +-32768, 20, 17, 6,-32768,-32768,-32768,-32768, 87,-32768, +-32768, 4,-32768,-32768,-32768,-32768,-32768,-32768,-32768,-32768, + 28,-32768, 76, 99,-32768, 100, 104,-32768, 149,-32768, +-32768,-32768,-32768,-32768,-32768, 90, 119, 17, 210, 125, +-32768,-32768,-32768,-32768, 133,-32768, 6, 6, 6, 6, + 6, 6, 6, 62, 6, 17, 17,-32768,-32768, 70, + 273, 53,-32768,-32768,-32768,-32768, 184,-32768, 179,-32768, + 17,-32768,-32768, 135, 135, 135, 135, 135, 141,-32768, + 231,-32768, 138, 172,-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, 41, + 17, 6, 77,-32768,-32768,-32768,-32768,-32768, 17,-32768, +-32768,-32768, 360, 333, 303, 385, 385, 115, 115, 385, + 385, 385, 385, 115, 115, 135, 385, 385, 187, 195, + 141, 150, 150,-32768,-32768,-32768, 212,-32768, 227,-32768, +-32768,-32768,-32768, 56,-32768, -35,-32768,-32768,-32768,-32768, +-32768,-32768,-32768, 41, 17,-32768, 6,-32768,-32768,-32768, +-32768, 233, 259,-32768 }; static const short yypgoto[] = {-32768, --32768,-32768, 248,-32768,-32768,-32768, 163,-32768,-32768,-32768, - 201,-32768,-32768,-32768, 2, -21, -8, -71,-32768, 0, --32768,-32768, 67,-32768,-32768, -30,-32768,-32768,-32768,-32768, --32768,-32768,-32768,-32768,-32768,-32768, 184,-32768,-32768,-32768, - 4,-32768,-32768,-32768,-32768, 81,-32768,-32768,-32768,-32768, --32768,-32768, 26, 34, 42,-32768,-32768, -12, 82, 72, --32768, 54, 3,-32768,-32768,-32768, 222,-32768, 221, 277, --32768,-32768, 223, 39, 168,-32768, 224, -45 +-32768,-32768, 258,-32768,-32768,-32768, 180,-32768,-32768,-32768, + 218,-32768,-32768,-32768, 3, -18, -7, -71,-32768, 0, +-32768,-32768, 72,-32768,-32768, -40,-32768,-32768,-32768,-32768, +-32768,-32768,-32768,-32768,-32768,-32768, 201,-32768,-32768,-32768, + 2,-32768,-32768,-32768,-32768, 92,-32768,-32768,-32768,-32768, +-32768,-32768, 40, 39, 42,-32768,-32768, -10, 78, 48, +-32768, -20, 9,-32768,-32768,-32768, 222,-32768, 221, 291, +-32768,-32768, 223, 37, 168,-32768, 224, -12 }; -#define YYLAST 423 +#define YYLAST 422 static const short yytable[] = { 15, - 109, 10, 51, 18, 70, 42, 94, 98, 101, 1, - 15, 1, 67, 55, 18, 84, 72, 21, 116, 1, - 73, 2, 237, 74, -98, 15, 60, 69, 238, 18, - 177, 178, 179, 85, 84, 117, 118, 119, 120, 55, - 82, 107, 121, 217, 2, 134, 122, 123, 42, 3, - 230, 3, 56, 140, 22, 4, 106, 4, 124, 3, - 22, 51, 125, 108, 4, 4, 126, 127, -97, 15, - 105, 15, 15, 18, 115, 18, 18, 22, 56, 66, - 79, 3, 71, 3, 38, 57, 141, 4, 180, 4, - 62, 81, 181, 83, 23, 182, 86, 89, 26, 89, - 23, 24, 235, 25, 26, 236, 68, 15, 109, 80, - 95, 18, 52, 53, 56, 87, 81, 23, 24, 23, - 23, 26, 135, 26, 26, 15, 15, 38, 53, 18, - 18, 180, 51, -156, 80, 181, -97, 169, 182, 80, - 15, 172, 173, 174, 18, 175, 176, 177, 178, 179, - 175, 176, 177, 178, 179, 144, 145, 146, 147, 148, - 149, 150, 109, 151, -64, -64, -89, -89, 172, 173, - 174, 108, 175, 176, 177, 178, 179, 233, 234, 15, - 15, -14, 223, 18, 18, 136, 104, 137, 15, 138, - 232, -60, 18, 142, 193, 194, 195, 196, 197, 198, - 199, 200, 201, 202, 203, 204, 205, 206, 207, 208, - 209, 210, 211, 212, 213, 214, 215, 216, 143, 155, - 188, 189, 192, 173, 174, 108, 175, 176, 177, 178, - 179, 191, 243, 15, 15, 244, 223, 18, 18, 156, - 157, 158, 159, 160, 161, 162, 163, 164, 165, 166, - 167, 168, 50, 133, 100, 111, 169, 170, 171, 239, - 172, 173, 174, 231, 175, 176, 177, 178, 179, 174, - 241, 175, 176, 177, 178, 179, 240, 102, 103, 46, - 190, 156, 157, 158, 159, 160, 161, 162, 163, 164, - 165, 166, 167, 168, 154, 114, 130, 0, 169, 170, - 171, 0, 172, 173, 174, 0, 175, 176, 177, 178, - 179, 156, 157, 0, 159, 160, 161, 162, 163, 164, - 165, 166, 167, 168, 0, 0, 0, 0, 169, 170, - 171, 0, 172, 173, 174, 0, 175, 176, 177, 178, - 179, 156, 0, 0, 159, 160, 161, 162, 163, 164, - 165, 166, 167, 168, 0, 0, 0, 0, 169, 170, - 171, 0, 172, 173, 174, 0, 175, 176, 177, 178, - 179, 159, 160, 161, 162, 163, 164, 165, 166, 167, - 168, 0, 0, 0, 0, 169, 170, 171, 0, 172, - 173, 174, 0, 175, 176, 177, 178, 179, 161, 162, - 0, 0, 0, 0, 167, 168, 0, 0, 0, 0, - 169, 0, 0, 0, 172, 173, 174, 0, 175, 176, - 177, 178, 179 + 109, 18, 10, 51, 60, 84, -98, 237, 22, 116, + 15, 42, 18, 238, 72, 68, 1, 81, 73, 21, + 1, 74, 15, 107, 18, 84, 117, 118, 119, 120, + 1, 89, 2, 121, 70, 85, 61, 122, 123, 94, + 98, 101, 55, 81, 217, 23, 82, 71, 24, 124, + -97, 2, 51, 125, 42, 4, 3, 126, 127, 15, + 3, 18, 4, 3, 108, 22, 4, -156, 104, 4, + 3, 15, 15, 18, 18, 115, 4, 106, 134, 230, + 38, 56, 67, 89, 3, 80, 140, 95, 57, 141, + 4, 55, 79, 180, 22, 83, 63, 181, 235, 53, + 182, 236, 23, 69, 86, 24, 25, 15, 109, 18, + 56, 80, 52, 53, 105, 135, 80, 180, 155, 23, + 87, 181, 24, 38, 182, 15, 15, 18, 18, 23, + 56, 23, 24, 51, 24, 25, -97, 26, -14, 169, + 15, 136, 18, 172, 173, 174, 137, 175, 176, 177, + 178, 179, 138, 144, 145, 146, 147, 148, 149, 150, + -60, 151, 109, 172, 173, 174, 142, 175, 176, 177, + 178, 179, 108, 175, 176, 177, 178, 179, 143, 15, + 15, 18, 18, 223, 177, 178, 179, 188, 15, 191, + 18, 232, 193, 194, 195, 196, 197, 198, 199, 200, + 201, 202, 203, 204, 205, 206, 207, 208, 209, 210, + 211, 212, 213, 214, 215, 216, 173, 174, 189, 175, + 176, 177, 178, 179, 192, 174, 108, 175, 176, 177, + 178, 179, 243, 15, 15, 18, 18, 223, 156, 157, + 158, 159, 160, 161, 162, 163, 164, 165, 166, 167, + 168, -64, -64, -89, -89, 169, 170, 171, 244, 172, + 173, 174, 50, 175, 176, 177, 178, 179, 233, 234, + 133, 100, 111, 239, 231, 241, 240, 102, 103, 190, + 156, 157, 158, 159, 160, 161, 162, 163, 164, 165, + 166, 167, 168, 46, 154, 114, 130, 169, 170, 171, + 0, 172, 173, 174, 0, 175, 176, 177, 178, 179, + 156, 157, 0, 159, 160, 161, 162, 163, 164, 165, + 166, 167, 168, 0, 0, 0, 0, 169, 170, 171, + 0, 172, 173, 174, 0, 175, 176, 177, 178, 179, + 156, 0, 0, 159, 160, 161, 162, 163, 164, 165, + 166, 167, 168, 0, 0, 0, 0, 169, 170, 171, + 0, 172, 173, 174, 0, 175, 176, 177, 178, 179, + 159, 160, 161, 162, 163, 164, 165, 166, 167, 168, + 0, 0, 0, 0, 169, 170, 171, 0, 172, 173, + 174, 0, 175, 176, 177, 178, 179, 161, 162, 0, + 0, 0, 0, 167, 168, 0, 0, 0, 0, 169, + 0, 0, 0, 172, 173, 174, 0, 175, 176, 177, + 178, 179 }; static const short yycheck[] = { 0, - 72, 0, 11, 0, 26, 3, 52, 53, 54, 4, - 11, 4, 25, 5, 11, 46, 41, 4, 4, 4, - 45, 39, 43, 48, 3, 26, 4, 25, 49, 26, - 35, 36, 37, 46, 65, 21, 22, 23, 24, 5, - 38, 4, 28, 4, 39, 91, 32, 33, 46, 44, - 3, 44, 44, 99, 4, 50, 49, 50, 44, 44, - 4, 70, 48, 72, 50, 50, 52, 53, 47, 70, - 68, 72, 73, 70, 73, 72, 73, 4, 44, 4, - 4, 44, 3, 44, 3, 51, 108, 50, 41, 50, - 24, 38, 45, 47, 44, 48, 51, 4, 48, 4, - 44, 45, 43, 47, 48, 46, 25, 108, 180, 38, - 4, 108, 40, 41, 44, 49, 63, 44, 45, 44, - 44, 48, 40, 48, 48, 126, 127, 46, 41, 126, - 127, 41, 141, 40, 63, 45, 47, 25, 48, 68, - 141, 29, 30, 31, 141, 33, 34, 35, 36, 37, - 33, 34, 35, 36, 37, 117, 118, 119, 120, 121, - 122, 123, 234, 125, 42, 43, 42, 43, 29, 30, - 31, 180, 33, 34, 35, 36, 37, 42, 43, 180, - 181, 40, 181, 180, 181, 42, 46, 43, 189, 4, - 189, 42, 189, 42, 156, 157, 158, 159, 160, 161, - 162, 163, 164, 165, 166, 167, 168, 169, 170, 171, - 172, 173, 174, 175, 176, 177, 178, 179, 46, 49, - 4, 40, 53, 30, 31, 234, 33, 34, 35, 36, - 37, 52, 0, 234, 235, 0, 235, 234, 235, 8, - 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, - 19, 20, 5, 91, 54, 72, 25, 26, 27, 234, - 29, 30, 31, 183, 33, 34, 35, 36, 37, 31, - 237, 33, 34, 35, 36, 37, 235, 56, 58, 3, - 49, 8, 9, 10, 11, 12, 13, 14, 15, 16, - 17, 18, 19, 20, 127, 72, 74, -1, 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 + 72, 0, 0, 11, 23, 46, 3, 43, 4, 4, + 11, 3, 11, 49, 41, 26, 4, 38, 45, 4, + 4, 48, 23, 4, 23, 66, 21, 22, 23, 24, + 4, 4, 39, 28, 26, 46, 4, 32, 33, 52, + 53, 54, 5, 64, 4, 41, 38, 3, 44, 44, + 47, 39, 60, 48, 46, 50, 44, 52, 53, 60, + 44, 60, 50, 44, 72, 4, 50, 40, 42, 50, + 44, 72, 73, 72, 73, 73, 50, 69, 91, 3, + 3, 44, 4, 4, 44, 38, 99, 4, 51, 108, + 50, 5, 4, 41, 4, 47, 25, 45, 43, 41, + 48, 46, 41, 26, 51, 44, 45, 108, 180, 108, + 44, 64, 40, 41, 46, 40, 69, 41, 49, 41, + 49, 45, 44, 46, 48, 126, 127, 126, 127, 41, + 44, 41, 44, 141, 44, 45, 47, 47, 40, 25, + 141, 42, 141, 29, 30, 31, 43, 33, 34, 35, + 36, 37, 4, 117, 118, 119, 120, 121, 122, 123, + 42, 125, 234, 29, 30, 31, 42, 33, 34, 35, + 36, 37, 180, 33, 34, 35, 36, 37, 46, 180, + 181, 180, 181, 181, 35, 36, 37, 4, 189, 52, + 189, 189, 156, 157, 158, 159, 160, 161, 162, 163, + 164, 165, 166, 167, 168, 169, 170, 171, 172, 173, + 174, 175, 176, 177, 178, 179, 30, 31, 40, 33, + 34, 35, 36, 37, 53, 31, 234, 33, 34, 35, + 36, 37, 0, 234, 235, 234, 235, 235, 8, 9, + 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, + 20, 42, 43, 42, 43, 25, 26, 27, 0, 29, + 30, 31, 5, 33, 34, 35, 36, 37, 42, 43, + 91, 54, 72, 234, 183, 237, 235, 56, 58, 49, + 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, + 18, 19, 20, 3, 127, 72, 74, 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 @@ -1216,7 +1216,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: @@ -1863,12 +1863,18 @@ 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; + goto break2; + } else { + // skip over _ after ^ + PC.source++; PC.col++; + // skip analysis = forced literal + continue; + } // converting ^#HH into char(hex(HH)) case '#': @@ -1933,12 +1939,15 @@ static int yylex(YYSTYPE *lvalp, void *p RC; } break; - case ')': // $name.(code<)> + case ']': // $name.(code<)> if(--lexical_brackets_nestage==0) { pop_LS(PC); RC; } break; + case '[': + lexical_brackets_nestage++; + break; } break; @@ -2202,6 +2211,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_USER); + lexical_brackets_nestage=1; + RC; + } PC.ls=LS_VAR_SQUARE; lexical_brackets_nestage=1; RC; @@ -2215,12 +2234,6 @@ static int yylex(YYSTYPE *lvalp, void *p RC; case '(': - // $name.<(>code) - if(PC.col>1/*not first column*/ && end[-1]=='.'/*was dot */) { - push_LS(PC, LS_USER); - lexical_brackets_nestage=1; - RC; - } PC.ls=LS_VAR_ROUND; lexical_brackets_nestage=1; RC; @@ -2234,8 +2247,8 @@ static int yylex(YYSTYPE *lvalp, void *p case LS_VAR_NAME_CURLY: switch(c) { - case '(': - // ${name.<(>code)} + case '[': + // ${name.<[>code)} push_LS(PC, LS_USER); lexical_brackets_nestage=1; RC; @@ -2295,6 +2308,16 @@ static int yylex(YYSTYPE *lvalp, void *p case LS_METHOD_NAME: switch(c) { case '[': + // $name.<[>code) + 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_USER); + lexical_brackets_nestage=1; + RC; + } PC.ls=LS_METHOD_SQUARE; lexical_brackets_nestage=1; RC; @@ -2303,12 +2326,6 @@ static int yylex(YYSTYPE *lvalp, void *p lexical_brackets_nestage=1; RC; case '(': - // $name.<(>code) - if(PC.col>1/*not first column*/ && end[-1]=='.'/*was dot */) { - push_LS(PC, LS_USER); - lexical_brackets_nestage=1; - RC; - } PC.ls=LS_METHOD_ROUND; lexical_brackets_nestage=1; RC;