From 6c3485caacc4ae369a91ce31050eb6d6a508307b Mon Sep 17 00:00:00 2001 From: parsons Date: Fri, 28 Jun 2002 16:49:51 +0000 Subject: ChangeLogTag: Fri Jun 28 11:46:26 2002 Jeff Parsons --- TAO/TAO_IDL/fe/idl.ll | 14 +- TAO/TAO_IDL/fe/lex.yy.cpp | 820 +++++++++++++++++++++++----------------------- 2 files changed, 419 insertions(+), 415 deletions(-) diff --git a/TAO/TAO_IDL/fe/idl.ll b/TAO/TAO_IDL/fe/idl.ll index 4b256ac6f65..e9a3283f175 100644 --- a/TAO/TAO_IDL/fe/idl.ll +++ b/TAO/TAO_IDL/fe/idl.ll @@ -319,32 +319,32 @@ L"'"\\u([0-9a-fA-F]{1,4})"'" { yylval.wcval = idl_wchar_escape_reader(ace_yytext + 2); return IDL_WCHAR_LITERAL; } -^#[ \t]*pragma[ \t].*{NL} | +^[ \t]*#[ \t]*pragma[ \t].*{NL} | ^\?\?=[ \t]*pragma[ \t].*{NL} {/* remember pragma */ idl_global->set_lineno(idl_global->lineno() + 1); idl_store_pragma(ace_yytext); } -^#[ \t]*file[ \t].*{NL} | +^[ \t]*#file[ \t].*{NL} | ^\?\?=[ \t]*file[ \t].*{NL} {/* ignore file */ idl_global->set_lineno(idl_global->lineno() + 1); } -^#[ \t]*[0-9]*" ""\""[^\"]*"\""" "[0-9]*([ \t]*[0-9]*)?{NL} | +^[ \t]*#[ \t]*[0-9]*" ""\""[^\"]*"\""" "[0-9]*([ \t]*[0-9]*)?{NL} | ^\?\?=[ \t]*[0-9]*" ""\""[^\"]*"\""" "[0-9]*([ \t]*[0-9]*)?{NL} { idl_parse_line_and_file(ace_yytext); } -^#[ \t]*[0-9]*" ""\""[^\"]*"\""{NL} | +^[ \t]*#[ \t]*[0-9]*" ""\""[^\"]*"\""{NL} | ^\?\?=[ \t]*[0-9]*" ""\""[^\"]*"\""{NL} { idl_parse_line_and_file(ace_yytext); } -^#line[ \t]*[0-9]+[ \t]*("\""[^\"]*"\"")?{NL} | +^[ \t]*#line[ \t]*[0-9]+[ \t]*("\""[^\"]*"\"")?{NL} | ^\?\?=line[ \t]*[0-9]*" ""\""[^\"]*"\""{NL} { idl_parse_line_and_file(ace_yytext); } -^#[ \t]*[0-9]*{NL} | +^[ \t]*#[ \t]*[0-9]*{NL} | ^\?\?=[ \t]*[0-9]*{NL} { idl_parse_line_and_file(ace_yytext); } -^#[ \t]*ident[ \t].*{NL} | +^[ \t]*#[ \t]*ident[ \t].*{NL} | ^\?\?=[ \t]*ident[ \t].*{NL} { /* ignore cpp ident */ idl_global->set_lineno(idl_global->lineno() + 1); diff --git a/TAO/TAO_IDL/fe/lex.yy.cpp b/TAO/TAO_IDL/fe/lex.yy.cpp index d39a551a05a..f6c08ece498 100644 --- a/TAO/TAO_IDL/fe/lex.yy.cpp +++ b/TAO/TAO_IDL/fe/lex.yy.cpp @@ -283,68 +283,68 @@ static void tao_yy_fatal_error TAO_YY_PROTO(( tao_yyconst char msg[] )); #define TAO_YY_NUM_RULES 104 #define TAO_YY_END_OF_BUFFER 105 -static tao_yyconst short int tao_yy_accept[546] = +static tao_yyconst short int tao_yy_accept[549] = { 0, 101, 101, 105, 103, 101, 102, 102, 103, 103, 103, 103, 103, 76, 72, 103, 103, 103, 68, 68, 68, 68, 68, 68, 68, 68, 68, 68, 68, 68, 68, 68, 68, 68, 68, 68, 68, 68, 68, 68, 68, - 68, 68, 103, 102, 101, 0, 77, 0, 0, 0, - 0, 75, 71, 69, 100, 0, 69, 76, 0, 0, - 0, 72, 67, 65, 66, 68, 68, 0, 0, 68, + 68, 68, 101, 103, 102, 101, 0, 77, 0, 0, + 0, 0, 75, 71, 69, 100, 0, 69, 76, 0, + 0, 0, 72, 67, 65, 66, 68, 68, 0, 0, 68, 68, 68, 68, 68, 68, 68, 68, 68, 68, 68, 68, 68, 68, 68, 68, 68, 68, 68, 68, - 68, 62, 68, 68, 68, 68, 68, 68, 68, 68, + 68, 68, 62, 68, 68, 68, 68, 68, 68, 68, 68, 68, 68, 68, 68, 68, 68, 68, 68, 68, - 68, 68, 68, 68, 68, 68, 68, 0, 95, 0, - 0, 0, 0, 0, 0, 0, 77, 0, 0, 79, - 0, 79, 0, 0, 75, 0, 71, 0, 69, 0, - 99, 99, 69, 0, 70, 74, 68, 0, 78, 0, - 0, 0, 68, 68, 68, 1, 68, 68, 68, 68, + 68, 68, 68, 68, 68, 68, 68, 68, 101, 0, + 0, 95, 0, 0, 0, 0, 0, 0, 0, 77, + 0, 0, 79, 0, 79, 0, 0, 75, 0, 71, + 0, 69, 0, 99, 99, 69, 0, 70, 74, 68, + 0, 78, 0, 0, 0, 68, 68, 68, 1, 68, 68, 68, 68, 68, 68, 68, 68, 68, 68, 68, 68, 68, 68, 68, 68, 68, 68, 68, 68, 68, - 68, 68, 68, 68, 68, 68, 63, 68, 68, 68, + 68, 68, 68, 68, 68, 68, 68, 68, 68, 63, 68, 68, 68, 68, 68, 68, 68, 68, 68, 68, - 68, 68, 68, 68, 68, 68, 68, 0, 0, 0, - 0, 0, 0, 0, 82, 80, 0, 0, 73, 0, - 69, 70, 68, 0, 83, 0, 68, 59, 68, 68, - 68, 20, 27, 68, 68, 68, 68, 68, 68, 68, - 13, 68, 68, 68, 68, 68, 68, 68, 48, 68, - 68, 68, 68, 24, 68, 68, 68, 68, 68, 68, 68, 68, 68, 68, 68, 68, 68, 68, 68, 68, - 68, 68, 68, 68, 68, 68, 68, 57, 68, 31, - 68, 68, 0, 0, 0, 0, 0, 0, 0, 96, - 0, 0, 0, 0, 0, 0, 80, 0, 81, 0, - - 60, 0, 0, 68, 68, 68, 68, 68, 10, 68, - 68, 68, 68, 68, 44, 68, 68, 68, 68, 18, - 22, 68, 68, 61, 68, 33, 68, 68, 68, 68, - 30, 68, 68, 68, 68, 68, 68, 68, 68, 68, - 25, 68, 68, 68, 68, 68, 68, 68, 68, 17, - 68, 68, 28, 68, 91, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 84, 0, 2, - 68, 68, 68, 68, 68, 68, 35, 68, 23, 68, - 68, 68, 46, 68, 49, 68, 68, 3, 68, 32, - 64, 68, 68, 68, 38, 68, 4, 68, 68, 68, - - 14, 12, 68, 19, 68, 68, 55, 68, 68, 68, - 68, 0, 89, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 68, 68, 29, - 68, 68, 8, 21, 68, 68, 36, 68, 68, 58, - 68, 68, 37, 68, 68, 68, 68, 68, 68, 68, - 11, 68, 68, 68, 15, 0, 0, 87, 87, 0, - 0, 93, 0, 0, 92, 0, 0, 0, 0, 0, - 0, 0, 34, 68, 68, 43, 68, 68, 68, 68, - 50, 68, 52, 68, 5, 16, 68, 39, 68, 68, - 26, 68, 0, 97, 97, 0, 0, 0, 0, 90, - - 0, 0, 0, 0, 0, 0, 0, 6, 42, 45, - 7, 47, 9, 68, 53, 54, 68, 68, 41, 0, - 85, 85, 0, 0, 88, 88, 0, 0, 0, 0, - 51, 68, 56, 0, 98, 98, 0, 0, 0, 40, - 94, 0, 86, 86, 0 + 0, 0, 0, 0, 0, 0, 0, 82, 80, 0, + 0, 73, 0, 69, 70, 68, 0, 83, 0, 68, + 59, 68, 68, 68, 20, 27, 68, 68, 68, 68, + 68, 68, 68, 13, 68, 68, 68, 68, 68, 68, + 68, 48, 68, 68, 68, 68, 24, 68, 68, 68, + 68, 68, 68, 68, 68, 68, 68, 68, 68, 68, + 68, 68, 68, 68, 68, 68, 68, 68, 68, 68, + 57, 68, 31, 68, 68, 0, 0, 0, 0, 0, + 0, 0, 96, 0, 0, 0, 0, 0, 0, 80, + + 0, 81, 0, 60, 0, 0, 68, 68, 68, 68, + 68, 10, 68, 68, 68, 68, 68, 44, 68, 68, + 68, 68, 18, 22, 68, 68, 61, 68, 33, 68, + 68, 68, 68, 30, 68, 68, 68, 68, 68, 68, + 68, 68, 68, 25, 68, 68, 68, 68, 68, 68, + 68, 68, 17, 68, 68, 28, 68, 91, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 84, 0, 2, 68, 68, 68, 68, 68, 68, 35, + 68, 23, 68, 68, 68, 46, 68, 49, 68, 68, + 3, 68, 32, 64, 68, 68, 68, 38, 68, 4, + + 68, 68, 68, 14, 12, 68, 19, 68, 68, 55, + 68, 68, 68, 68, 0, 89, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 68, 68, 29, 68, 68, 8, 21, 68, 68, 36, + 68, 68, 58, 68, 68, 37, 68, 68, 68, 68, + 68, 68, 68, 11, 68, 68, 68, 15, 0, 0, + 87, 87, 0, 0, 93, 0, 0, 92, 0, 0, + 0, 0, 0, 0, 0, 34, 68, 68, 43, 68, + 68, 68, 68, 50, 68, 52, 68, 5, 16, 68, + 39, 68, 68, 26, 68, 0, 97, 97, 0, 0, + + 0, 0, 90, 0, 0, 0, 0, 0, 0, 0, + 6, 42, 45, 7, 47, 9, 68, 53, 54, 68, + 68, 41, 0, 85, 85, 0, 0, 88, 88, 0, + 0, 0, 0, 51, 68, 56, 0, 98, 98, 0, + 0, 0, 40, 94, 0, 86, 86, 0 } ; static tao_yyconst int tao_yy_ec[256] = @@ -389,141 +389,141 @@ static tao_yyconst int tao_yy_meta[60] = 6, 8, 6, 8, 6, 8, 6, 8, 6 } ; -static tao_yyconst short int tao_yy_base[573] = +static tao_yyconst short int tao_yy_base[576] = { 0, - 0, 53, 1029, 1030, 59, 1030, 1030, 56, 994, 51, - 54, 62, 64, 69, 1010, 1008, 1005, 0, 1002, 81, - 987, 993, 46, 972, 56, 47, 54, 71, 981, 970, - 25, 969, 60, 982, 70, 61, 84, 82, 40, 78, - 85, 90, 142, 995, 127, 127, 136, 0, 1007, 140, - 135, 150, 155, 195, 1030, 156, 181, 188, 201, 222, - 0, 230, 1030, 1030, 1030, 0, 987, 134, 979, 968, - 979, 957, 950, 954, 958, 953, 970, 105, 951, 963, - 947, 958, 945, 960, 961, 960, 128, 947, 941, 947, - 943, 81, 143, 944, 953, 944, 935, 934, 948, 932, - - 129, 949, 941, 948, 130, 933, 929, 930, 936, 923, - 927, 171, 937, 929, 931, 931, 918, 925, 1030, 184, - 244, 927, 931, 925, 915, 947, 250, 187, 195, 1030, - 957, 956, 191, 955, 252, 0, 258, 269, 1030, 274, - 1030, 283, 0, 247, 274, 0, 932, 217, 1030, 906, - 952, 120, 920, 934, 903, 0, 904, 909, 915, 901, - 902, 239, 897, 915, 913, 894, 900, 898, 906, 890, - 905, 903, 906, 888, 900, 889, 882, 897, 900, 893, - 898, 877, 877, 887, 890, 871, 0, 247, 871, 880, - 872, 886, 868, 870, 869, 188, 870, 865, 870, 878, - - 867, 872, 861, 858, 874, 876, 858, 903, 902, 861, - 867, 857, 869, 319, 1030, 1030, 292, 895, 0, 294, - 301, 1030, 878, 0, 1030, 0, 864, 0, 848, 856, - 859, 0, 0, 848, 257, 857, 846, 839, 847, 839, - 0, 837, 840, 840, 849, 849, 832, 850, 0, 832, - 829, 830, 835, 0, 839, 833, 835, 821, 822, 840, - 839, 838, 829, 828, 831, 820, 829, 832, 812, 817, - 827, 814, 825, 824, 275, 812, 818, 0, 819, 0, - 805, 813, 849, 327, 815, 805, 813, 810, 804, 1030, - 290, 339, 806, 810, 804, 794, 1030, 837, 1030, 836, - - 0, 364, 835, 788, 806, 804, 804, 790, 0, 790, - 778, 788, 788, 794, 0, 778, 777, 778, 777, 0, - 0, 785, 773, 0, 786, 0, 786, 785, 773, 783, - 0, 762, 768, 765, 780, 292, 764, 768, 767, 771, - 0, 772, 758, 759, 768, 774, 769, 769, 754, 0, - 757, 750, 0, 755, 1030, 369, 248, 748, 361, 754, - 794, 793, 752, 758, 748, 760, 391, 1030, 786, 0, - 756, 737, 743, 751, 750, 734, 0, 733, 0, 670, - 674, 646, 0, 648, 0, 663, 642, 0, 637, 0, - 0, 621, 632, 621, 0, 602, 0, 594, 602, 573, - - 0, 0, 561, 0, 560, 572, 0, 571, 570, 549, - 566, 418, 1030, 433, 335, 300, 441, 456, 570, 598, - 346, 564, 554, 562, 559, 464, 583, 532, 530, 0, - 534, 506, 0, 0, 505, 500, 0, 506, 506, 0, - 499, 474, 0, 465, 471, 431, 444, 434, 399, 416, - 0, 405, 402, 362, 0, 460, 388, 1030, 390, 421, - 463, 1030, 404, 356, 1030, 491, 439, 343, 506, 348, - 362, 374, 0, 342, 310, 0, 318, 304, 293, 298, - 0, 288, 0, 266, 0, 0, 245, 0, 245, 232, - 0, 232, 488, 1030, 494, 251, 510, 513, 521, 1030, - - 525, 529, 448, 542, 546, 403, 204, 0, 0, 0, - 0, 0, 0, 169, 0, 0, 180, 160, 0, 550, - 1030, 560, 562, 564, 1030, 566, 569, 201, 181, 480, - 0, 65, 0, 571, 1030, 576, 71, 585, 590, 0, - 1030, 592, 1030, 595, 1030, 616, 624, 628, 634, 642, - 650, 654, 661, 669, 674, 677, 684, 689, 692, 695, - 699, 706, 711, 718, 723, 730, 738, 746, 754, 762, - 770, 778 + 0, 58, 1037, 1038, 59, 1038, 1038, 56, 1002, 54, + 57, 65, 68, 73, 1018, 1016, 1013, 0, 1010, 69, + 995, 1001, 45, 980, 56, 37, 48, 67, 989, 978, + 61, 977, 65, 990, 79, 63, 82, 83, 71, 71, + 93, 92, 134, 144, 1003, 130, 97, 148, 0, 1015, + 147, 152, 158, 184, 210, 1038, 148, 161, 197, 203, + 229, 0, 239, 1038, 1038, 1038, 0, 995, 137, 987, + 976, 987, 965, 958, 962, 966, 961, 978, 109, 959, + 971, 955, 966, 953, 968, 969, 968, 130, 955, 949, + 955, 951, 132, 96, 952, 961, 952, 943, 942, 956, + + 940, 136, 957, 949, 956, 138, 941, 937, 938, 944, + 931, 935, 140, 945, 937, 939, 939, 926, 199, 0, + 174, 1038, 973, 243, 935, 939, 933, 923, 955, 226, + 196, 204, 1038, 965, 964, 252, 963, 256, 0, 261, + 272, 1038, 258, 1038, 286, 0, 277, 283, 0, 940, + 235, 1038, 914, 960, 257, 928, 942, 911, 0, 912, + 917, 923, 909, 910, 110, 905, 923, 921, 902, 908, + 906, 914, 898, 913, 911, 914, 896, 908, 897, 890, + 905, 908, 901, 906, 885, 885, 895, 898, 879, 0, + 247, 879, 888, 880, 894, 876, 878, 877, 152, 878, + + 873, 878, 886, 875, 880, 869, 866, 882, 884, 866, + 911, 910, 869, 875, 865, 877, 328, 1038, 1038, 301, + 903, 0, 290, 310, 1038, 886, 0, 1038, 0, 872, + 0, 856, 864, 867, 0, 0, 856, 247, 865, 854, + 847, 855, 847, 0, 845, 848, 848, 857, 857, 840, + 858, 0, 840, 837, 838, 843, 0, 847, 841, 843, + 829, 830, 848, 847, 846, 837, 836, 839, 828, 837, + 840, 820, 825, 835, 822, 833, 832, 284, 820, 826, + 0, 827, 0, 813, 821, 857, 315, 823, 813, 821, + 818, 812, 1038, 268, 343, 814, 818, 812, 802, 1038, + + 845, 1038, 844, 0, 373, 843, 796, 814, 812, 812, + 798, 0, 798, 786, 796, 796, 802, 0, 786, 785, + 786, 785, 0, 0, 793, 781, 0, 794, 0, 794, + 793, 781, 791, 0, 770, 776, 773, 788, 301, 772, + 776, 775, 779, 0, 780, 766, 767, 776, 782, 777, + 777, 762, 0, 765, 758, 0, 763, 1038, 378, 279, + 756, 361, 762, 802, 801, 760, 766, 756, 768, 400, + 1038, 794, 0, 764, 745, 751, 759, 701, 674, 0, + 662, 0, 653, 666, 647, 0, 641, 0, 656, 629, + 0, 625, 0, 0, 596, 612, 611, 0, 595, 0, + + 580, 587, 569, 0, 0, 566, 0, 565, 578, 0, + 578, 577, 556, 573, 427, 1038, 442, 348, 360, 450, + 465, 578, 605, 381, 562, 551, 558, 551, 473, 579, + 523, 510, 0, 510, 502, 0, 0, 504, 501, 0, + 510, 506, 0, 493, 474, 0, 446, 455, 433, 452, + 443, 408, 425, 0, 414, 411, 378, 0, 469, 369, + 1038, 397, 400, 472, 1038, 421, 365, 1038, 500, 415, + 372, 515, 372, 305, 398, 0, 366, 337, 0, 322, + 312, 302, 314, 0, 306, 0, 288, 0, 0, 287, + 0, 292, 278, 0, 278, 430, 1038, 497, 307, 503, + + 519, 523, 1038, 531, 538, 448, 546, 551, 558, 261, + 0, 0, 0, 0, 0, 0, 193, 0, 0, 187, + 171, 0, 565, 1038, 567, 575, 572, 1038, 577, 579, + 216, 197, 457, 0, 55, 0, 581, 1038, 591, 61, + 600, 602, 0, 1038, 604, 1038, 606, 1038, 627, 635, + 639, 645, 653, 661, 665, 672, 680, 685, 688, 695, + 700, 703, 706, 710, 717, 722, 729, 734, 741, 749, + 757, 765, 773, 781, 789 } ; -static tao_yyconst short int tao_yy_def[573] = +static tao_yyconst short int tao_yy_def[576] = { 0, - 545, 1, 545, 545, 545, 545, 545, 546, 547, 545, - 545, 545, 545, 545, 545, 545, 545, 548, 548, 548, - 548, 548, 548, 548, 548, 548, 548, 548, 548, 548, - 548, 548, 548, 548, 548, 548, 548, 548, 548, 548, - 548, 548, 545, 545, 545, 546, 545, 549, 545, 550, - 545, 545, 545, 545, 545, 551, 54, 545, 545, 545, - 552, 545, 545, 545, 545, 548, 548, 553, 554, 548, - 548, 548, 548, 548, 548, 548, 548, 548, 548, 548, - 548, 548, 548, 548, 548, 548, 548, 548, 548, 548, - 548, 548, 548, 548, 548, 548, 548, 548, 548, 548, - - 548, 548, 548, 548, 548, 548, 548, 548, 548, 548, - 548, 548, 548, 548, 548, 548, 548, 43, 545, 43, - 545, 545, 545, 545, 545, 545, 545, 546, 546, 545, - 545, 545, 545, 555, 545, 556, 545, 545, 545, 551, - 545, 551, 57, 545, 545, 552, 548, 553, 545, 545, - 545, 545, 548, 548, 548, 548, 548, 548, 548, 548, - 548, 548, 548, 548, 548, 548, 548, 548, 548, 548, - 548, 548, 548, 548, 548, 548, 548, 548, 548, 548, - 548, 548, 548, 548, 548, 548, 548, 548, 548, 548, - 548, 548, 548, 548, 548, 548, 548, 548, 548, 548, - - 548, 548, 548, 548, 548, 548, 548, 557, 545, 545, - 545, 545, 545, 545, 545, 545, 545, 558, 556, 545, - 545, 545, 548, 559, 545, 560, 548, 548, 548, 548, - 548, 548, 548, 548, 548, 548, 548, 548, 548, 548, - 548, 548, 548, 548, 548, 548, 548, 548, 548, 548, - 548, 548, 548, 548, 548, 548, 548, 548, 548, 548, - 548, 548, 548, 548, 548, 548, 548, 548, 548, 548, - 548, 548, 548, 548, 548, 548, 548, 548, 548, 548, - 548, 548, 557, 545, 545, 545, 545, 545, 214, 545, - 214, 545, 545, 545, 545, 545, 545, 545, 545, 545, - - 548, 553, 561, 548, 548, 548, 548, 548, 548, 548, - 548, 548, 548, 548, 548, 548, 548, 548, 548, 548, + 548, 1, 548, 548, 548, 548, 548, 549, 550, 548, + 548, 548, 548, 548, 548, 548, 548, 551, 551, 551, + 551, 551, 551, 551, 551, 551, 551, 551, 551, 551, + 551, 551, 551, 551, 551, 551, 551, 551, 551, 551, + 551, 551, 548, 548, 548, 548, 549, 548, 552, 548, + 553, 548, 548, 548, 548, 548, 554, 55, 548, 548, + 548, 555, 548, 548, 548, 548, 551, 551, 556, 557, + 551, 551, 551, 551, 551, 551, 551, 551, 551, 551, + 551, 551, 551, 551, 551, 551, 551, 551, 551, 551, + 551, 551, 551, 551, 551, 551, 551, 551, 551, 551, + + 551, 551, 551, 551, 551, 551, 551, 551, 551, 551, + 551, 551, 551, 551, 551, 551, 551, 551, 548, 44, + 44, 548, 121, 548, 548, 548, 548, 548, 548, 548, + 549, 549, 548, 548, 548, 548, 558, 548, 559, 548, + 548, 548, 554, 548, 554, 58, 548, 548, 555, 551, + 556, 548, 548, 548, 548, 551, 551, 551, 551, 551, + 551, 551, 551, 551, 551, 551, 551, 551, 551, 551, + 551, 551, 551, 551, 551, 551, 551, 551, 551, 551, + 551, 551, 551, 551, 551, 551, 551, 551, 551, 551, + 551, 551, 551, 551, 551, 551, 551, 551, 551, 551, + + 551, 551, 551, 551, 551, 551, 551, 551, 551, 551, + 560, 548, 548, 548, 548, 548, 548, 548, 548, 548, + 561, 559, 548, 548, 548, 551, 562, 548, 563, 551, + 551, 551, 551, 551, 551, 551, 551, 551, 551, 551, + 551, 551, 551, 551, 551, 551, 551, 551, 551, 551, + 551, 551, 551, 551, 551, 551, 551, 551, 551, 551, + 551, 551, 551, 551, 551, 551, 551, 551, 551, 551, + 551, 551, 551, 551, 551, 551, 551, 551, 551, 551, + 551, 551, 551, 551, 551, 560, 548, 548, 548, 548, + 548, 217, 548, 217, 548, 548, 548, 548, 548, 548, + + 548, 548, 548, 551, 556, 564, 551, 551, 551, 551, + 551, 551, 551, 551, 551, 551, 551, 551, 551, 551, + 551, 551, 551, 551, 551, 551, 551, 551, 551, 551, + 551, 551, 551, 551, 551, 551, 551, 551, 551, 551, + 551, 551, 551, 551, 551, 551, 551, 551, 551, 551, + 551, 551, 551, 551, 551, 551, 551, 548, 548, 548, + 548, 548, 548, 565, 548, 548, 548, 548, 548, 305, + 548, 566, 551, 551, 551, 551, 551, 551, 551, 551, + 551, 551, 551, 551, 551, 551, 551, 551, 551, 551, + 551, 551, 551, 551, 551, 551, 551, 551, 551, 551, + + 551, 551, 551, 551, 551, 551, 551, 551, 551, 551, + 551, 551, 551, 551, 548, 548, 548, 567, 548, 548, + 548, 548, 565, 548, 548, 548, 548, 548, 305, 568, + 551, 551, 551, 551, 551, 551, 551, 551, 551, 551, + 551, 551, 551, 551, 551, 551, 551, 551, 551, 551, + 551, 551, 551, 551, 551, 551, 551, 551, 548, 567, + 548, 567, 569, 548, 548, 570, 548, 548, 548, 548, + 548, 548, 548, 556, 548, 551, 551, 551, 551, 551, + 551, 551, 551, 551, 551, 551, 551, 551, 551, 551, + 551, 551, 551, 551, 551, 569, 548, 569, 570, 548, + + 571, 548, 548, 548, 572, 548, 548, 548, 548, 548, + 551, 551, 551, 551, 551, 551, 551, 551, 551, 551, + 551, 551, 571, 548, 571, 548, 572, 548, 572, 573, + 574, 548, 548, 551, 551, 551, 573, 548, 573, 574, + 548, 575, 551, 548, 575, 548, 575, 0, 548, 548, 548, 548, 548, 548, 548, 548, 548, 548, 548, 548, 548, 548, 548, 548, 548, 548, 548, 548, 548, 548, - 548, 548, 548, 548, 548, 548, 548, 548, 548, 548, - 548, 548, 548, 548, 545, 545, 545, 545, 545, 545, - 562, 545, 545, 545, 545, 545, 302, 545, 563, 548, - 548, 548, 548, 548, 548, 548, 548, 548, 548, 548, - 548, 548, 548, 548, 548, 548, 548, 548, 548, 548, - 548, 548, 548, 548, 548, 548, 548, 548, 548, 548, - - 548, 548, 548, 548, 548, 548, 548, 548, 548, 548, - 548, 545, 545, 545, 564, 545, 545, 545, 545, 562, - 545, 545, 545, 545, 545, 302, 565, 548, 548, 548, - 548, 548, 548, 548, 548, 548, 548, 548, 548, 548, - 548, 548, 548, 548, 548, 548, 548, 548, 548, 548, - 548, 548, 548, 548, 548, 545, 564, 545, 564, 566, - 545, 545, 567, 545, 545, 545, 545, 545, 545, 545, - 553, 545, 548, 548, 548, 548, 548, 548, 548, 548, - 548, 548, 548, 548, 548, 548, 548, 548, 548, 548, - 548, 548, 566, 545, 566, 567, 545, 568, 545, 545, - - 545, 569, 545, 545, 545, 545, 545, 548, 548, 548, - 548, 548, 548, 548, 548, 548, 548, 548, 548, 568, - 545, 568, 545, 569, 545, 569, 570, 571, 545, 545, - 548, 548, 548, 570, 545, 570, 571, 545, 572, 548, - 545, 572, 545, 572, 0, 545, 545, 545, 545, 545, - 545, 545, 545, 545, 545, 545, 545, 545, 545, 545, - 545, 545, 545, 545, 545, 545, 545, 545, 545, 545, - 545, 545 + 548, 548, 548, 548, 548 } ; -static tao_yyconst short int tao_yy_nxt[1090] = +static tao_yyconst short int tao_yy_nxt[1098] = { 0, 4, 5, 6, 7, 5, 8, 4, 9, 4, 4, 10, 11, 12, 13, 14, 14, 15, 16, 4, 17, @@ -531,122 +531,124 @@ static tao_yyconst short int tao_yy_nxt[1090] = 22, 18, 18, 4, 23, 24, 25, 26, 27, 28, 29, 30, 31, 18, 18, 32, 33, 34, 35, 36, 18, 37, 38, 39, 40, 41, 42, 18, 18, 43, - 45, 47, 51, 45, 52, 53, 53, 54, 54, 54, - 55, 91, 92, 44, 56, 57, 538, 58, 58, 59, - 57, 72, 62, 62, 62, 80, 68, 60, 69, 48, - 76, 110, 60, 73, 94, 81, 61, 77, 111, 74, - - 82, 83, 60, 540, 78, 86, 98, 60, 95, 84, - 79, 85, 101, 87, 96, 102, 88, 99, 103, 114, - 105, 61, 104, 106, 100, 112, 116, 225, 45, 177, - 113, 45, 47, 115, 178, 107, 108, 127, 109, 149, - 127, 128, 117, 118, 119, 119, 120, 132, 54, 54, - 54, 161, 162, 133, 133, 121, 121, 121, 141, 142, - 48, 57, 119, 135, 135, 59, 57, 150, 137, 137, - 137, 188, 134, 60, 226, 171, 142, 189, 60, 179, - 193, 122, 136, 194, 123, 172, 528, 124, 60, 208, - 180, 125, 47, 60, 143, 143, 143, 134, 216, 57, - - 47, 58, 58, 59, 217, 217, 538, 136, 54, 54, - 54, 60, 57, 201, 59, 59, 59, 533, 138, 139, - 48, 139, 149, 202, 60, 532, 60, 531, 48, 545, - 270, 144, 144, 138, 139, 145, 145, 145, 530, 60, - 139, 57, 271, 62, 62, 62, 119, 119, 209, 415, - 150, 127, 415, 60, 127, 128, 497, 121, 121, 121, - 145, 145, 145, 57, 119, 135, 135, 59, 60, 57, - 519, 137, 137, 137, 518, 60, 141, 142, 220, 220, - 517, 60, 221, 221, 221, 141, 142, 145, 145, 145, - 60, 235, 236, 261, 142, 361, 60, 516, 222, 297, - - 222, 460, 262, 142, 460, 298, 298, 221, 221, 221, - 309, 310, 347, 222, 221, 221, 221, 348, 515, 222, - 289, 290, 290, 291, 349, 139, 514, 139, 395, 355, - 355, 356, 292, 292, 292, 545, 513, 458, 459, 290, - 139, 290, 290, 362, 396, 512, 139, 355, 465, 465, - 466, 511, 292, 292, 292, 459, 510, 498, 293, 290, - 498, 294, 417, 509, 295, 417, 465, 149, 296, 149, - 412, 413, 413, 412, 418, 418, 418, 367, 367, 367, - 508, 368, 414, 414, 414, 367, 367, 367, 367, 413, - 458, 459, 458, 459, 507, 150, 503, 150, 367, 367, - - 367, 367, 367, 367, 426, 426, 426, 529, 459, 497, - 459, 492, 426, 426, 426, 426, 506, 506, 506, 412, - 413, 413, 412, 494, 495, 426, 426, 426, 426, 426, - 426, 456, 456, 456, 412, 413, 413, 412, 413, 491, - 502, 495, 417, 502, 490, 417, 414, 414, 414, 527, - 489, 488, 527, 413, 418, 418, 418, 461, 462, 462, - 461, 463, 413, 413, 461, 462, 462, 461, 463, 418, - 418, 418, 487, 456, 456, 456, 462, 471, 471, 471, - 413, 539, 486, 462, 539, 471, 471, 471, 471, 485, - 494, 495, 499, 500, 500, 499, 494, 495, 471, 471, - - 471, 471, 471, 471, 501, 501, 501, 504, 495, 484, - 505, 500, 462, 462, 495, 521, 522, 483, 482, 506, - 506, 506, 499, 500, 500, 499, 499, 500, 500, 499, - 462, 525, 526, 522, 523, 523, 523, 481, 501, 501, - 501, 500, 480, 504, 479, 500, 505, 504, 478, 526, - 505, 528, 521, 522, 477, 506, 506, 506, 476, 506, - 506, 506, 521, 522, 500, 500, 525, 526, 525, 526, - 522, 535, 536, 535, 536, 523, 523, 523, 535, 536, - 522, 475, 500, 474, 526, 473, 526, 541, 541, 536, - 368, 536, 543, 544, 543, 544, 536, 543, 544, 470, - - 469, 468, 467, 421, 464, 541, 455, 454, 453, 452, - 544, 451, 544, 450, 449, 544, 46, 46, 46, 46, - 46, 46, 46, 46, 49, 448, 49, 49, 49, 49, - 49, 49, 66, 66, 66, 66, 129, 129, 447, 446, - 129, 129, 131, 445, 131, 131, 131, 131, 131, 131, - 140, 140, 140, 140, 140, 140, 140, 140, 146, 444, - 146, 148, 148, 148, 148, 148, 148, 148, 148, 151, - 443, 151, 151, 151, 151, 151, 151, 218, 218, 442, - 218, 219, 441, 219, 283, 283, 283, 283, 283, 283, - 283, 283, 300, 300, 440, 300, 302, 439, 302, 303, - - 438, 303, 369, 369, 437, 369, 420, 420, 420, 420, - 420, 420, 420, 420, 427, 427, 436, 427, 457, 457, - 457, 457, 457, 457, 457, 457, 472, 472, 435, 472, - 493, 493, 493, 493, 493, 493, 493, 493, 496, 496, - 496, 496, 496, 496, 496, 496, 520, 520, 520, 520, - 520, 520, 520, 520, 524, 524, 524, 524, 524, 524, - 524, 524, 534, 534, 534, 534, 534, 534, 534, 534, - 537, 537, 537, 537, 537, 537, 537, 537, 542, 542, - 542, 542, 542, 542, 542, 542, 434, 433, 432, 431, - 430, 429, 428, 368, 425, 424, 423, 422, 361, 421, - - 419, 416, 411, 410, 409, 408, 407, 406, 405, 404, - 403, 402, 401, 400, 399, 398, 397, 394, 393, 392, - 391, 390, 389, 388, 387, 386, 385, 384, 383, 382, - 381, 380, 379, 378, 377, 376, 375, 374, 373, 372, - 371, 370, 368, 299, 297, 366, 365, 364, 363, 545, - 360, 359, 358, 357, 284, 354, 353, 352, 351, 350, - 346, 345, 344, 343, 342, 341, 340, 339, 338, 337, - 336, 335, 334, 333, 332, 331, 330, 329, 328, 327, - 326, 325, 324, 323, 322, 321, 320, 319, 318, 317, - 316, 315, 314, 313, 312, 311, 308, 307, 306, 305, - - 304, 301, 299, 288, 287, 286, 285, 208, 284, 282, - 281, 280, 279, 278, 277, 276, 275, 274, 273, 272, - 269, 268, 267, 266, 265, 264, 263, 260, 259, 258, - 257, 256, 255, 254, 253, 252, 251, 250, 249, 248, - 247, 246, 245, 244, 243, 242, 241, 240, 239, 238, - 237, 234, 233, 232, 231, 230, 229, 228, 227, 225, - 224, 223, 215, 215, 215, 214, 213, 212, 211, 210, - 545, 207, 206, 205, 204, 203, 200, 199, 198, 197, - 196, 195, 192, 191, 190, 187, 186, 185, 184, 183, - 182, 181, 176, 175, 174, 173, 170, 169, 168, 167, - - 166, 165, 164, 163, 160, 159, 158, 157, 156, 155, - 154, 153, 152, 147, 130, 126, 97, 93, 90, 89, - 75, 71, 70, 67, 65, 64, 63, 50, 545, 3, - 545, 545, 545, 545, 545, 545, 545, 545, 545, 545, - 545, 545, 545, 545, 545, 545, 545, 545, 545, 545, - 545, 545, 545, 545, 545, 545, 545, 545, 545, 545, - 545, 545, 545, 545, 545, 545, 545, 545, 545, 545, - 545, 545, 545, 545, 545, 545, 545, 545, 545, 545, - 545, 545, 545, 545, 545, 545, 545, 545, 545 + 46, 48, 43, 46, 44, 52, 541, 53, 54, 54, + 55, 55, 55, 56, 69, 81, 70, 57, 45, 58, + 73, 59, 59, 60, 58, 82, 63, 63, 63, 49, + 77, 61, 74, 543, 83, 84, 61, 78, 75, 95, + + 62, 87, 48, 85, 79, 86, 61, 92, 93, 88, + 80, 61, 89, 96, 102, 99, 104, 103, 113, 97, + 105, 106, 111, 114, 107, 62, 100, 115, 117, 112, + 49, 46, 182, 101, 46, 119, 108, 109, 119, 110, + 120, 116, 152, 183, 118, 121, 122, 122, 123, 130, + 144, 145, 130, 131, 135, 164, 165, 124, 124, 124, + 136, 136, 238, 239, 122, 55, 55, 55, 145, 58, + 153, 138, 138, 60, 146, 146, 146, 174, 191, 137, + 180, 61, 204, 125, 192, 181, 126, 175, 196, 127, + 139, 197, 205, 128, 273, 58, 61, 140, 140, 140, + + 119, 48, 531, 119, 137, 120, 274, 61, 58, 48, + 59, 59, 60, 548, 58, 139, 60, 60, 60, 548, + 61, 541, 61, 55, 55, 55, 61, 130, 536, 49, + 130, 131, 535, 141, 142, 61, 142, 49, 147, 147, + 152, 61, 148, 148, 148, 122, 122, 212, 141, 142, + 58, 534, 63, 63, 63, 142, 124, 124, 124, 219, + 144, 145, 61, 122, 228, 220, 220, 58, 153, 138, + 138, 60, 58, 364, 140, 140, 140, 61, 145, 61, + 418, 223, 223, 418, 61, 224, 224, 224, 144, 145, + 148, 148, 148, 264, 61, 533, 148, 148, 148, 61, + + 312, 313, 265, 224, 224, 224, 145, 225, 300, 225, + 152, 229, 500, 548, 301, 301, 522, 358, 358, 359, + 521, 350, 225, 224, 224, 224, 351, 520, 225, 292, + 293, 293, 294, 352, 142, 358, 142, 398, 153, 519, + 518, 295, 295, 295, 517, 293, 293, 365, 293, 142, + 461, 462, 516, 399, 515, 142, 295, 295, 295, 514, + 513, 463, 420, 293, 463, 420, 501, 296, 462, 501, + 297, 461, 462, 298, 421, 421, 421, 299, 152, 415, + 416, 416, 415, 468, 468, 469, 370, 370, 370, 462, + 512, 417, 417, 417, 370, 370, 370, 370, 416, 461, + + 462, 468, 497, 498, 511, 371, 153, 370, 370, 370, + 370, 370, 370, 429, 429, 429, 505, 462, 510, 505, + 498, 429, 429, 429, 429, 506, 500, 495, 415, 416, + 416, 415, 497, 498, 429, 429, 429, 429, 429, 429, + 459, 459, 459, 415, 416, 416, 415, 416, 494, 530, + 498, 420, 530, 493, 420, 417, 417, 417, 542, 492, + 491, 542, 416, 421, 421, 421, 464, 465, 465, 464, + 466, 416, 416, 464, 465, 465, 464, 466, 421, 421, + 421, 490, 459, 459, 459, 465, 474, 474, 474, 416, + 489, 488, 465, 487, 474, 474, 474, 474, 486, 497, + + 498, 502, 503, 503, 502, 465, 465, 474, 474, 474, + 474, 474, 474, 504, 504, 504, 507, 498, 485, 508, + 503, 524, 525, 465, 502, 503, 503, 502, 509, 509, + 509, 484, 502, 503, 503, 502, 526, 526, 526, 525, + 528, 529, 483, 503, 504, 504, 504, 507, 482, 481, + 508, 503, 507, 480, 479, 508, 531, 478, 529, 509, + 509, 509, 532, 477, 509, 509, 509, 524, 525, 524, + 525, 509, 509, 509, 528, 529, 476, 503, 503, 528, + 529, 538, 539, 538, 539, 525, 371, 525, 526, 526, + 526, 473, 529, 538, 539, 503, 472, 529, 471, 539, + + 470, 539, 544, 544, 546, 547, 546, 547, 546, 547, + 424, 539, 467, 458, 457, 456, 455, 454, 453, 452, + 544, 451, 547, 450, 547, 449, 547, 47, 47, 47, + 47, 47, 47, 47, 47, 50, 448, 50, 50, 50, + 50, 50, 50, 67, 67, 67, 67, 132, 132, 447, + 446, 132, 132, 134, 445, 134, 134, 134, 134, 134, + 134, 143, 143, 143, 143, 143, 143, 143, 143, 149, + 444, 149, 151, 151, 151, 151, 151, 151, 151, 151, + 154, 443, 154, 154, 154, 154, 154, 154, 221, 221, + 442, 221, 222, 441, 222, 286, 286, 286, 286, 286, + + 286, 286, 286, 303, 303, 440, 303, 305, 439, 305, + 306, 438, 306, 372, 372, 437, 372, 423, 423, 423, + 423, 423, 423, 423, 423, 430, 430, 436, 430, 460, + 460, 460, 460, 460, 460, 460, 460, 475, 475, 435, + 475, 496, 496, 496, 496, 496, 496, 496, 496, 499, + 499, 499, 499, 499, 499, 499, 499, 523, 523, 523, + 523, 523, 523, 523, 523, 527, 527, 527, 527, 527, + 527, 527, 527, 537, 537, 537, 537, 537, 537, 537, + 537, 540, 540, 540, 540, 540, 540, 540, 540, 545, + 545, 545, 545, 545, 545, 545, 545, 434, 433, 432, + + 431, 371, 428, 427, 426, 425, 364, 424, 422, 419, + 414, 413, 412, 411, 410, 409, 408, 407, 406, 405, + 404, 403, 402, 401, 400, 397, 396, 395, 394, 393, + 392, 391, 390, 389, 388, 387, 386, 385, 384, 383, + 382, 381, 380, 379, 378, 377, 376, 375, 374, 373, + 371, 302, 300, 369, 368, 367, 366, 548, 363, 362, + 361, 360, 287, 357, 356, 355, 354, 353, 349, 348, + 347, 346, 345, 344, 343, 342, 341, 340, 339, 338, + 337, 336, 335, 334, 333, 332, 331, 330, 329, 328, + 327, 326, 325, 324, 323, 322, 321, 320, 319, 318, + + 317, 316, 315, 314, 311, 310, 309, 308, 307, 304, + 302, 291, 290, 289, 288, 211, 287, 285, 284, 283, + 282, 281, 280, 279, 278, 277, 276, 275, 272, 271, + 270, 269, 268, 267, 266, 263, 262, 261, 260, 259, + 258, 257, 256, 255, 254, 253, 252, 251, 250, 249, + 248, 247, 246, 245, 244, 243, 242, 241, 240, 237, + 236, 235, 234, 233, 232, 231, 230, 228, 227, 226, + 218, 218, 218, 217, 216, 215, 214, 213, 211, 210, + 209, 208, 207, 206, 203, 202, 201, 200, 199, 198, + 195, 194, 193, 190, 189, 188, 187, 186, 185, 184, + + 179, 178, 177, 176, 173, 172, 171, 170, 169, 168, + 167, 166, 163, 162, 161, 160, 159, 158, 157, 156, + 155, 150, 133, 129, 98, 94, 91, 90, 76, 72, + 71, 68, 66, 65, 64, 51, 548, 3, 548, 548, + 548, 548, 548, 548, 548, 548, 548, 548, 548, 548, + 548, 548, 548, 548, 548, 548, 548, 548, 548, 548, + 548, 548, 548, 548, 548, 548, 548, 548, 548, 548, + 548, 548, 548, 548, 548, 548, 548, 548, 548, 548, + 548, 548, 548, 548, 548, 548, 548, 548, 548, 548, + 548, 548, 548, 548, 548, 548, 548 + } ; -static tao_yyconst short int tao_yy_chk[1090] = +static tao_yyconst short int tao_yy_chk[1098] = { 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, @@ -654,119 +656,121 @@ static tao_yyconst short int tao_yy_chk[1090] = 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 2, - 5, 8, 10, 5, 10, 10, 10, 11, 11, 11, - 12, 31, 31, 2, 12, 13, 537, 13, 13, 13, - 14, 23, 14, 14, 14, 26, 20, 13, 20, 8, - 25, 39, 14, 23, 33, 26, 13, 25, 39, 23, - - 27, 27, 13, 532, 25, 28, 35, 14, 33, 27, - 25, 27, 36, 28, 33, 36, 28, 35, 37, 41, - 38, 13, 37, 38, 35, 40, 42, 152, 45, 92, - 40, 45, 46, 41, 92, 38, 38, 47, 38, 68, - 47, 47, 42, 43, 43, 43, 43, 50, 51, 51, - 51, 78, 78, 50, 50, 43, 43, 43, 56, 56, - 46, 52, 43, 52, 52, 52, 53, 68, 53, 53, - 53, 101, 50, 52, 152, 87, 56, 101, 53, 93, - 105, 43, 52, 105, 43, 87, 529, 43, 52, 120, - 93, 43, 128, 53, 57, 57, 57, 50, 133, 58, - - 129, 58, 58, 58, 133, 133, 528, 52, 54, 54, - 54, 58, 59, 112, 59, 59, 59, 518, 54, 54, - 128, 54, 148, 112, 59, 517, 58, 514, 129, 120, - 196, 60, 60, 54, 54, 60, 60, 60, 507, 59, - 54, 62, 196, 62, 62, 62, 121, 121, 121, 357, - 148, 127, 357, 62, 127, 127, 496, 121, 121, 121, - 144, 144, 144, 135, 121, 135, 135, 135, 62, 137, - 492, 137, 137, 137, 490, 135, 140, 140, 138, 138, - 489, 137, 138, 138, 138, 142, 142, 145, 145, 145, - 135, 162, 162, 188, 140, 291, 137, 487, 145, 217, - - 145, 416, 188, 142, 416, 217, 217, 220, 220, 220, - 235, 235, 275, 145, 221, 221, 221, 275, 484, 145, - 214, 214, 214, 214, 275, 221, 482, 221, 336, 284, - 284, 284, 214, 214, 214, 291, 480, 415, 415, 214, - 221, 292, 292, 292, 336, 479, 221, 284, 421, 421, - 421, 478, 292, 292, 292, 415, 477, 464, 214, 292, - 464, 214, 359, 475, 214, 359, 421, 471, 214, 302, - 356, 356, 356, 356, 359, 359, 359, 302, 302, 302, - 474, 472, 356, 356, 356, 302, 302, 302, 302, 356, - 457, 457, 459, 459, 470, 471, 468, 302, 302, 302, - - 302, 302, 302, 302, 367, 367, 367, 506, 457, 463, - 459, 454, 367, 367, 367, 367, 506, 506, 506, 412, - 412, 412, 412, 460, 460, 367, 367, 367, 367, 367, - 367, 412, 412, 412, 414, 414, 414, 414, 412, 453, - 467, 460, 417, 467, 452, 417, 414, 414, 414, 503, - 450, 449, 503, 414, 417, 417, 417, 418, 418, 418, - 418, 418, 456, 456, 461, 461, 461, 461, 461, 418, - 418, 418, 448, 456, 456, 456, 418, 426, 426, 426, - 456, 530, 447, 461, 530, 426, 426, 426, 426, 446, - 493, 493, 466, 466, 466, 466, 495, 495, 426, 426, - - 426, 426, 426, 426, 466, 466, 466, 469, 493, 445, - 469, 466, 497, 497, 495, 498, 498, 444, 442, 469, - 469, 469, 499, 499, 499, 499, 501, 501, 501, 501, - 497, 502, 502, 498, 499, 499, 499, 441, 501, 501, - 501, 499, 439, 504, 438, 501, 504, 505, 436, 502, - 505, 505, 520, 520, 435, 504, 504, 504, 432, 505, - 505, 505, 522, 522, 523, 523, 524, 524, 526, 526, - 520, 527, 527, 534, 534, 523, 523, 523, 536, 536, - 522, 431, 523, 429, 524, 428, 526, 538, 538, 527, - 427, 534, 539, 539, 542, 542, 536, 544, 544, 425, - - 424, 423, 422, 420, 419, 538, 411, 410, 409, 408, - 539, 406, 542, 405, 403, 544, 546, 546, 546, 546, - 546, 546, 546, 546, 547, 400, 547, 547, 547, 547, - 547, 547, 548, 548, 548, 548, 549, 549, 399, 398, - 549, 549, 550, 396, 550, 550, 550, 550, 550, 550, - 551, 551, 551, 551, 551, 551, 551, 551, 552, 394, - 552, 553, 553, 553, 553, 553, 553, 553, 553, 554, - 393, 554, 554, 554, 554, 554, 554, 555, 555, 392, - 555, 556, 389, 556, 557, 557, 557, 557, 557, 557, - 557, 557, 558, 558, 387, 558, 559, 386, 559, 560, - - 384, 560, 561, 561, 382, 561, 562, 562, 562, 562, - 562, 562, 562, 562, 563, 563, 381, 563, 564, 564, - 564, 564, 564, 564, 564, 564, 565, 565, 380, 565, - 566, 566, 566, 566, 566, 566, 566, 566, 567, 567, - 567, 567, 567, 567, 567, 567, 568, 568, 568, 568, - 568, 568, 568, 568, 569, 569, 569, 569, 569, 569, - 569, 569, 570, 570, 570, 570, 570, 570, 570, 570, - 571, 571, 571, 571, 571, 571, 571, 571, 572, 572, - 572, 572, 572, 572, 572, 572, 378, 376, 375, 374, - 373, 372, 371, 369, 366, 365, 364, 363, 362, 361, - - 360, 358, 354, 352, 351, 349, 348, 347, 346, 345, - 344, 343, 342, 340, 339, 338, 337, 335, 334, 333, - 332, 330, 329, 328, 327, 325, 323, 322, 319, 318, - 317, 316, 314, 313, 312, 311, 310, 308, 307, 306, - 305, 304, 303, 300, 298, 296, 295, 294, 293, 289, - 288, 287, 286, 285, 283, 282, 281, 279, 277, 276, - 274, 273, 272, 271, 270, 269, 268, 267, 266, 265, - 264, 263, 262, 261, 260, 259, 258, 257, 256, 255, - 253, 252, 251, 250, 248, 247, 246, 245, 244, 243, - 242, 240, 239, 238, 237, 236, 234, 231, 230, 229, - - 227, 223, 218, 213, 212, 211, 210, 209, 208, 207, - 206, 205, 204, 203, 202, 201, 200, 199, 198, 197, - 195, 194, 193, 192, 191, 190, 189, 186, 185, 184, - 183, 182, 181, 180, 179, 178, 177, 176, 175, 174, - 173, 172, 171, 170, 169, 168, 167, 166, 165, 164, - 163, 161, 160, 159, 158, 157, 155, 154, 153, 151, - 150, 147, 134, 132, 131, 126, 125, 124, 123, 122, - 118, 117, 116, 115, 114, 113, 111, 110, 109, 108, - 107, 106, 104, 103, 102, 100, 99, 98, 97, 96, - 95, 94, 91, 90, 89, 88, 86, 85, 84, 83, - - 82, 81, 80, 79, 77, 76, 75, 74, 73, 72, - 71, 70, 69, 67, 49, 44, 34, 32, 30, 29, - 24, 22, 21, 19, 17, 16, 15, 9, 3, 545, - 545, 545, 545, 545, 545, 545, 545, 545, 545, 545, - 545, 545, 545, 545, 545, 545, 545, 545, 545, 545, - 545, 545, 545, 545, 545, 545, 545, 545, 545, 545, - 545, 545, 545, 545, 545, 545, 545, 545, 545, 545, - 545, 545, 545, 545, 545, 545, 545, 545, 545, 545, - 545, 545, 545, 545, 545, 545, 545, 545, 545 + 5, 8, 2, 5, 2, 10, 540, 10, 10, 10, + 11, 11, 11, 12, 20, 26, 20, 12, 2, 13, + 23, 13, 13, 13, 14, 26, 14, 14, 14, 8, + 25, 13, 23, 535, 27, 27, 14, 25, 23, 33, + + 13, 28, 47, 27, 25, 27, 13, 31, 31, 28, + 25, 14, 28, 33, 36, 35, 37, 36, 40, 33, + 37, 38, 39, 40, 38, 13, 35, 41, 42, 39, + 47, 46, 94, 35, 46, 43, 38, 38, 43, 38, + 43, 41, 69, 94, 42, 44, 44, 44, 44, 48, + 57, 57, 48, 48, 51, 79, 79, 44, 44, 44, + 51, 51, 165, 165, 44, 52, 52, 52, 57, 53, + 69, 53, 53, 53, 58, 58, 58, 88, 102, 51, + 93, 53, 113, 44, 102, 93, 44, 88, 106, 44, + 53, 106, 113, 44, 199, 54, 53, 54, 54, 54, + + 119, 131, 532, 119, 51, 119, 199, 54, 59, 132, + 59, 59, 59, 121, 60, 53, 60, 60, 60, 121, + 59, 531, 54, 55, 55, 55, 60, 130, 521, 131, + 130, 130, 520, 55, 55, 59, 55, 132, 61, 61, + 151, 60, 61, 61, 61, 124, 124, 124, 55, 55, + 63, 517, 63, 63, 63, 55, 124, 124, 124, 136, + 143, 143, 63, 124, 155, 136, 136, 138, 151, 138, + 138, 138, 140, 294, 140, 140, 140, 63, 143, 138, + 360, 141, 141, 360, 140, 141, 141, 141, 145, 145, + 147, 147, 147, 191, 138, 510, 148, 148, 148, 140, + + 238, 238, 191, 223, 223, 223, 145, 148, 220, 148, + 474, 155, 499, 294, 220, 220, 495, 287, 287, 287, + 493, 278, 148, 224, 224, 224, 278, 492, 148, 217, + 217, 217, 217, 278, 224, 287, 224, 339, 474, 490, + 487, 217, 217, 217, 485, 295, 295, 295, 217, 224, + 418, 418, 483, 339, 482, 224, 295, 295, 295, 481, + 480, 419, 362, 295, 419, 362, 467, 217, 418, 467, + 217, 460, 460, 217, 362, 362, 362, 217, 305, 359, + 359, 359, 359, 424, 424, 424, 305, 305, 305, 460, + 478, 359, 359, 359, 305, 305, 305, 305, 359, 462, + + 462, 424, 463, 463, 477, 475, 305, 305, 305, 305, + 305, 305, 305, 370, 370, 370, 470, 462, 473, 470, + 463, 370, 370, 370, 370, 471, 466, 457, 415, 415, + 415, 415, 496, 496, 370, 370, 370, 370, 370, 370, + 415, 415, 415, 417, 417, 417, 417, 415, 456, 506, + 496, 420, 506, 455, 420, 417, 417, 417, 533, 453, + 452, 533, 417, 420, 420, 420, 421, 421, 421, 421, + 421, 459, 459, 464, 464, 464, 464, 464, 421, 421, + 421, 451, 459, 459, 459, 421, 429, 429, 429, 459, + 450, 449, 464, 448, 429, 429, 429, 429, 447, 498, + + 498, 469, 469, 469, 469, 500, 500, 429, 429, 429, + 429, 429, 429, 469, 469, 469, 472, 498, 445, 472, + 469, 501, 501, 500, 502, 502, 502, 502, 472, 472, + 472, 444, 504, 504, 504, 504, 502, 502, 502, 501, + 505, 505, 442, 502, 504, 504, 504, 507, 441, 439, + 507, 504, 508, 438, 435, 508, 508, 434, 505, 507, + 507, 507, 509, 432, 508, 508, 508, 523, 523, 525, + 525, 509, 509, 509, 527, 527, 431, 526, 526, 529, + 529, 530, 530, 537, 537, 523, 430, 525, 526, 526, + 526, 428, 527, 539, 539, 526, 427, 529, 426, 530, + + 425, 537, 541, 541, 542, 542, 545, 545, 547, 547, + 423, 539, 422, 414, 413, 412, 411, 409, 408, 406, + 541, 403, 542, 402, 545, 401, 547, 549, 549, 549, + 549, 549, 549, 549, 549, 550, 399, 550, 550, 550, + 550, 550, 550, 551, 551, 551, 551, 552, 552, 397, + 396, 552, 552, 553, 395, 553, 553, 553, 553, 553, + 553, 554, 554, 554, 554, 554, 554, 554, 554, 555, + 392, 555, 556, 556, 556, 556, 556, 556, 556, 556, + 557, 390, 557, 557, 557, 557, 557, 557, 558, 558, + 389, 558, 559, 387, 559, 560, 560, 560, 560, 560, + + 560, 560, 560, 561, 561, 385, 561, 562, 384, 562, + 563, 383, 563, 564, 564, 381, 564, 565, 565, 565, + 565, 565, 565, 565, 565, 566, 566, 379, 566, 567, + 567, 567, 567, 567, 567, 567, 567, 568, 568, 378, + 568, 569, 569, 569, 569, 569, 569, 569, 569, 570, + 570, 570, 570, 570, 570, 570, 570, 571, 571, 571, + 571, 571, 571, 571, 571, 572, 572, 572, 572, 572, + 572, 572, 572, 573, 573, 573, 573, 573, 573, 573, + 573, 574, 574, 574, 574, 574, 574, 574, 574, 575, + 575, 575, 575, 575, 575, 575, 575, 377, 376, 375, + + 374, 372, 369, 368, 367, 366, 365, 364, 363, 361, + 357, 355, 354, 352, 351, 350, 349, 348, 347, 346, + 345, 343, 342, 341, 340, 338, 337, 336, 335, 333, + 332, 331, 330, 328, 326, 325, 322, 321, 320, 319, + 317, 316, 315, 314, 313, 311, 310, 309, 308, 307, + 306, 303, 301, 299, 298, 297, 296, 292, 291, 290, + 289, 288, 286, 285, 284, 282, 280, 279, 277, 276, + 275, 274, 273, 272, 271, 270, 269, 268, 267, 266, + 265, 264, 263, 262, 261, 260, 259, 258, 256, 255, + 254, 253, 251, 250, 249, 248, 247, 246, 245, 243, + + 242, 241, 240, 239, 237, 234, 233, 232, 230, 226, + 221, 216, 215, 214, 213, 212, 211, 210, 209, 208, + 207, 206, 205, 204, 203, 202, 201, 200, 198, 197, + 196, 195, 194, 193, 192, 189, 188, 187, 186, 185, + 184, 183, 182, 181, 180, 179, 178, 177, 176, 175, + 174, 173, 172, 171, 170, 169, 168, 167, 166, 164, + 163, 162, 161, 160, 158, 157, 156, 154, 153, 150, + 137, 135, 134, 129, 128, 127, 126, 125, 123, 118, + 117, 116, 115, 114, 112, 111, 110, 109, 108, 107, + 105, 104, 103, 101, 100, 99, 98, 97, 96, 95, + + 92, 91, 90, 89, 87, 86, 85, 84, 83, 82, + 81, 80, 78, 77, 76, 75, 74, 73, 72, 71, + 70, 68, 50, 45, 34, 32, 30, 29, 24, 22, + 21, 19, 17, 16, 15, 9, 3, 548, 548, 548, + 548, 548, 548, 548, 548, 548, 548, 548, 548, 548, + 548, 548, 548, 548, 548, 548, 548, 548, 548, 548, + 548, 548, 548, 548, 548, 548, 548, 548, 548, 548, + 548, 548, 548, 548, 548, 548, 548, 548, 548, 548, + 548, 548, 548, 548, 548, 548, 548, 548, 548, 548, + 548, 548, 548, 548, 548, 548, 548 + } ; static tao_yy_state_type tao_yy_last_accepting_state; @@ -786,7 +790,7 @@ static char *tao_yy_last_accepting_cpos; char tao_yytext[TAO_YYLMAX]; char *tao_yytext_ptr; #define INITIAL 0 -/* $Id: idl.ll,v 1.60.4.4 2002/05/24 14:08:53 parsons Exp $ +/* $Id: idl.ll,v 1.60.4.5 2002/06/28 14:06:18 parsons Exp $ COPYRIGHT @@ -1135,13 +1139,13 @@ tao_yy_match: while ( tao_yy_chk[tao_yy_base[tao_yy_current_state] + tao_yy_c] != tao_yy_current_state ) { tao_yy_current_state = (int) tao_yy_def[tao_yy_current_state]; - if ( tao_yy_current_state >= 546 ) + if ( tao_yy_current_state >= 549 ) tao_yy_c = tao_yy_meta[(unsigned int) tao_yy_c]; } tao_yy_current_state = tao_yy_nxt[tao_yy_base[tao_yy_current_state] + (unsigned int) tao_yy_c]; ++tao_yy_cp; } - while ( tao_yy_base[tao_yy_current_state] != 1030 ); + while ( tao_yy_base[tao_yy_current_state] != 1038 ); tao_yy_find_action: tao_yy_act = tao_yy_accept[tao_yy_current_state]; @@ -1965,7 +1969,7 @@ static tao_yy_state_type tao_yy_get_previous_state() while ( tao_yy_chk[tao_yy_base[tao_yy_current_state] + tao_yy_c] != tao_yy_current_state ) { tao_yy_current_state = (int) tao_yy_def[tao_yy_current_state]; - if ( tao_yy_current_state >= 546 ) + if ( tao_yy_current_state >= 549 ) tao_yy_c = tao_yy_meta[(unsigned int) tao_yy_c]; } tao_yy_current_state = tao_yy_nxt[tao_yy_base[tao_yy_current_state] + (unsigned int) tao_yy_c]; @@ -2000,11 +2004,11 @@ tao_yy_state_type tao_yy_current_state; while ( tao_yy_chk[tao_yy_base[tao_yy_current_state] + tao_yy_c] != tao_yy_current_state ) { tao_yy_current_state = (int) tao_yy_def[tao_yy_current_state]; - if ( tao_yy_current_state >= 546 ) + if ( tao_yy_current_state >= 549 ) tao_yy_c = tao_yy_meta[(unsigned int) tao_yy_c]; } tao_yy_current_state = tao_yy_nxt[tao_yy_base[tao_yy_current_state] + (unsigned int) tao_yy_c]; - tao_yy_is_jam = (tao_yy_current_state == 545); + tao_yy_is_jam = (tao_yy_current_state == 548); return tao_yy_is_jam ? 0 : tao_yy_current_state; } -- cgit v1.2.1