diff options
Diffstat (limited to 'TAO/TAO_IDL/fe/lex.yy.cpp')
-rw-r--r-- | TAO/TAO_IDL/fe/lex.yy.cpp | 930 |
1 files changed, 447 insertions, 483 deletions
diff --git a/TAO/TAO_IDL/fe/lex.yy.cpp b/TAO/TAO_IDL/fe/lex.yy.cpp index 43423a53333..58b9b5fbbd1 100644 --- a/TAO/TAO_IDL/fe/lex.yy.cpp +++ b/TAO/TAO_IDL/fe/lex.yy.cpp @@ -1,4 +1,4 @@ -/* A lexical scanner generated by flex */ +/* A lexical scanner generated by flex */ /* Scanner skeleton version: * $Id$ @@ -284,69 +284,69 @@ 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[559] = +static tao_yyconst short int tao_yy_accept[558] = { 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, 101, 103, 102, 101, 0, 77, 0, 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, + 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, 62, 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, 68, 68, 68, 68, 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, 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, 101, 0, + 0, 95, 0, 0, 0, 0, 0, 0, 0, 77, + 0, 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, 68, 68, 68, - 68, 63, 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, 68, 68, - 68, 68, 0, 0, 0, 0, 0, 0, 0, 0, - 82, 80, 0, 0, 73, 0, 69, 70, 68, 78, - 0, 0, 0, 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, 0, 0, 0, 0, 0, 0, 0, 0, 82, + 80, 0, 0, 73, 0, 69, 70, 68, 78, 0, + 0, 0, 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, 68, 57, 68, 31, - 68, 68, 0, 0, 0, 0, 0, 0, 0, 96, - - 0, 0, 0, 0, 0, 0, 0, 80, 0, 81, - 0, 60, 0, 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, 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 + 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, 0, 80, 0, 81, 0, + 60, 0, 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, 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] = @@ -391,143 +391,143 @@ static tao_yyconst int tao_yy_meta[60] = 7, 8, 7, 8, 9, 8, 7, 8, 7 } ; -static tao_yyconst short int tao_yy_base[587] = +static tao_yyconst short int tao_yy_base[586] = { 0, - 0, 58, 1102, 1103, 59, 1103, 1103, 56, 1067, 66, - 58, 57, 71, 77, 1083, 1081, 1078, 0, 1075, 61, - 1060, 1066, 40, 1045, 63, 57, 55, 74, 1054, 1043, - 52, 1042, 72, 1055, 60, 67, 89, 84, 25, 77, - 96, 95, 135, 147, 1068, 131, 137, 151, 120, 1080, - 150, 164, 158, 170, 186, 215, 1103, 156, 190, 199, - 220, 206, 0, 233, 1103, 1103, 1103, 0, 1060, 141, - 1052, 1041, 1052, 1030, 1023, 1027, 1031, 1026, 1043, 107, - 1024, 1036, 1020, 1031, 1018, 1033, 1034, 1033, 133, 1020, - 1014, 1020, 1016, 158, 151, 1017, 1026, 1017, 1008, 1007, - - 1021, 1005, 146, 1022, 1014, 1021, 116, 1006, 1002, 1003, - 1009, 996, 1000, 184, 1010, 1002, 1004, 1004, 991, 251, - 0, 178, 1103, 1038, 259, 1000, 1004, 998, 988, 1020, - 263, 237, 244, 270, 1103, 1030, 1029, 252, 1028, 267, - 0, 274, 285, 1103, 289, 1103, 299, 0, 293, 300, - 0, 1005, 271, 292, 297, 1026, 262, 994, 1008, 977, - 0, 978, 983, 989, 975, 976, 198, 971, 989, 987, - 968, 974, 972, 980, 964, 979, 977, 980, 962, 974, - 963, 956, 971, 974, 967, 972, 951, 951, 961, 964, - 945, 0, 274, 945, 954, 946, 960, 942, 944, 943, - - 279, 944, 939, 944, 952, 941, 946, 935, 932, 948, - 950, 932, 977, 976, 935, 941, 931, 943, 351, 317, - 1103, 1103, 321, 969, 0, 323, 333, 1103, 952, 357, - 969, 327, 362, 0, 1103, 0, 937, 0, 921, 929, - 932, 0, 0, 921, 287, 930, 919, 912, 920, 912, - 0, 910, 913, 913, 922, 922, 905, 923, 0, 905, - 902, 903, 908, 0, 912, 906, 908, 894, 895, 913, - 912, 911, 902, 901, 904, 893, 902, 905, 885, 890, - 900, 887, 898, 897, 307, 885, 891, 0, 892, 0, - 878, 886, 922, 366, 888, 878, 886, 883, 877, 1103, - - 318, 395, 879, 883, 877, 867, 368, 1103, 910, 1103, - 909, 0, 374, 411, 908, 861, 879, 877, 877, 863, - 0, 863, 851, 861, 861, 867, 0, 851, 850, 851, - 850, 0, 0, 858, 846, 0, 859, 0, 859, 858, - 846, 856, 0, 835, 841, 838, 853, 291, 837, 841, - 840, 844, 0, 845, 831, 832, 841, 847, 842, 842, - 827, 0, 830, 823, 0, 828, 1103, 416, 373, 821, - 390, 827, 867, 866, 825, 831, 821, 833, 379, 438, - 1103, 859, 0, 829, 810, 816, 824, 823, 807, 0, - 806, 0, 800, 815, 798, 0, 803, 0, 820, 693, - - 0, 699, 0, 0, 670, 661, 658, 0, 654, 0, - 634, 631, 613, 0, 0, 611, 0, 610, 622, 0, - 621, 619, 597, 613, 465, 1103, 480, 419, 381, 488, - 503, 612, 627, 438, 586, 570, 573, 552, 511, 584, - 525, 519, 0, 524, 518, 0, 0, 520, 490, 0, - 498, 495, 0, 492, 485, 0, 475, 484, 463, 477, - 461, 446, 457, 0, 447, 428, 415, 0, 538, 435, - 1103, 468, 494, 508, 1103, 458, 388, 1103, 553, 410, - 390, 561, 381, 423, 416, 0, 375, 353, 0, 364, - 334, 328, 324, 0, 304, 0, 273, 0, 0, 265, - - 0, 251, 203, 0, 202, 517, 1103, 541, 227, 557, - 561, 581, 1103, 585, 577, 453, 589, 605, 608, 191, - 0, 0, 0, 0, 0, 0, 160, 0, 0, 150, - 134, 0, 605, 1103, 611, 613, 627, 1103, 632, 634, - 140, 138, 486, 0, 75, 0, 636, 1103, 638, 69, - 640, 642, 0, 1103, 646, 1103, 648, 1103, 669, 678, - 683, 690, 698, 707, 712, 718, 727, 733, 735, 739, - 748, 754, 756, 758, 761, 767, 773, 779, 785, 791, - 800, 809, 818, 827, 836, 845 + 0, 58, 1094, 1095, 59, 1095, 1095, 56, 1059, 54, + 57, 65, 68, 73, 1075, 1073, 1070, 0, 1067, 69, + 1052, 1058, 45, 1037, 56, 37, 48, 67, 1046, 1035, + 61, 1034, 65, 1047, 79, 63, 82, 83, 71, 71, + 93, 92, 134, 144, 1060, 130, 97, 148, 129, 1072, + 147, 152, 158, 184, 210, 1095, 148, 161, 197, 203, + 229, 0, 239, 1095, 1095, 1095, 0, 1052, 151, 1044, + 1033, 1044, 1022, 1015, 1019, 1023, 1018, 1035, 116, 1016, + 1028, 1012, 1023, 1010, 1025, 1026, 1025, 123, 1012, 1006, + 1012, 1008, 129, 155, 1009, 1018, 1009, 1000, 999, 1013, + + 997, 146, 1014, 1006, 1013, 150, 998, 994, 995, 1001, + 988, 992, 167, 1002, 994, 996, 996, 983, 226, 0, + 192, 1095, 1030, 243, 992, 996, 990, 980, 1012, 260, + 173, 180, 246, 1095, 1022, 1021, 259, 1020, 267, 0, + 272, 261, 1095, 286, 1095, 289, 0, 254, 287, 0, + 997, 196, 292, 284, 1018, 277, 986, 1000, 969, 0, + 970, 975, 981, 967, 968, 251, 963, 981, 979, 960, + 966, 964, 972, 956, 971, 969, 972, 954, 966, 955, + 948, 963, 966, 959, 964, 943, 943, 953, 956, 937, + 0, 253, 937, 946, 938, 952, 934, 936, 935, 186, + + 936, 931, 936, 944, 933, 938, 927, 924, 940, 942, + 924, 969, 968, 927, 933, 923, 935, 338, 302, 1095, + 1095, 307, 961, 0, 309, 330, 1095, 944, 324, 961, + 314, 352, 0, 1095, 0, 929, 0, 913, 921, 924, + 0, 0, 913, 276, 922, 911, 904, 912, 904, 0, + 902, 905, 905, 914, 914, 897, 915, 0, 897, 894, + 895, 900, 0, 904, 898, 900, 886, 887, 905, 904, + 903, 894, 893, 896, 885, 894, 897, 877, 882, 892, + 879, 890, 889, 318, 877, 883, 0, 884, 0, 870, + 878, 914, 359, 880, 870, 878, 875, 869, 1095, 289, + + 386, 871, 875, 869, 859, 331, 1095, 902, 1095, 901, + 0, 379, 408, 900, 853, 871, 869, 869, 855, 0, + 855, 843, 853, 853, 859, 0, 843, 842, 843, 842, + 0, 0, 850, 838, 0, 851, 0, 851, 850, 838, + 848, 0, 827, 833, 830, 845, 169, 829, 833, 832, + 836, 0, 837, 823, 824, 833, 839, 834, 834, 819, + 0, 822, 815, 0, 820, 1095, 394, 345, 813, 390, + 819, 859, 858, 817, 823, 813, 825, 343, 435, 1095, + 851, 0, 821, 802, 808, 816, 815, 799, 0, 798, + 0, 792, 807, 790, 0, 687, 0, 704, 670, 0, + + 648, 0, 0, 632, 651, 635, 0, 620, 0, 614, + 621, 603, 0, 0, 601, 0, 600, 613, 0, 613, + 611, 589, 606, 462, 1095, 477, 408, 367, 423, 497, + 602, 629, 413, 590, 579, 575, 553, 505, 581, 534, + 521, 0, 526, 520, 0, 0, 509, 509, 0, 493, + 494, 0, 485, 477, 0, 464, 465, 436, 455, 451, + 436, 450, 0, 444, 425, 412, 0, 532, 432, 1095, + 465, 484, 504, 1095, 455, 369, 1095, 547, 377, 402, + 555, 407, 369, 433, 0, 401, 373, 0, 387, 373, + 367, 380, 0, 348, 0, 330, 0, 0, 320, 0, + + 324, 295, 0, 295, 493, 1095, 512, 322, 535, 551, + 562, 1095, 577, 581, 450, 585, 601, 581, 283, 0, + 0, 0, 0, 0, 0, 254, 0, 0, 147, 130, + 0, 601, 1095, 605, 609, 607, 1095, 615, 617, 150, + 127, 521, 0, 55, 0, 628, 1095, 630, 61, 636, + 638, 0, 1095, 640, 1095, 642, 1095, 663, 672, 677, + 684, 692, 701, 706, 712, 721, 727, 729, 733, 742, + 748, 750, 752, 755, 761, 767, 773, 779, 785, 794, + 803, 812, 821, 830, 839 } ; -static tao_yyconst short int tao_yy_def[587] = +static tao_yyconst short int tao_yy_def[586] = { 0, - 558, 1, 558, 558, 558, 558, 558, 559, 560, 558, - 558, 558, 558, 558, 558, 558, 558, 561, 561, 561, - 561, 561, 561, 561, 561, 561, 561, 561, 561, 561, - 561, 561, 561, 561, 561, 561, 561, 561, 561, 561, - 561, 561, 558, 558, 558, 558, 559, 558, 562, 558, - 563, 558, 558, 558, 558, 558, 558, 564, 56, 558, - 558, 558, 565, 558, 558, 558, 558, 561, 561, 566, - 567, 561, 561, 561, 561, 561, 561, 561, 561, 561, - 561, 561, 561, 561, 561, 561, 561, 561, 561, 561, - 561, 561, 561, 561, 561, 561, 561, 561, 561, 561, - - 561, 561, 561, 561, 561, 561, 561, 561, 561, 561, - 561, 561, 561, 561, 561, 561, 561, 561, 561, 558, - 44, 44, 558, 122, 558, 558, 558, 558, 558, 558, - 558, 559, 559, 559, 558, 558, 558, 558, 568, 558, - 569, 558, 558, 558, 564, 558, 564, 59, 558, 558, - 565, 561, 566, 558, 570, 558, 558, 561, 561, 561, - 561, 561, 561, 561, 561, 561, 561, 561, 561, 561, - 561, 561, 561, 561, 561, 561, 561, 561, 561, 561, - 561, 561, 561, 561, 561, 561, 561, 561, 561, 561, - 561, 561, 561, 561, 561, 561, 561, 561, 561, 561, - - 561, 561, 561, 561, 561, 561, 561, 561, 561, 561, - 561, 561, 571, 558, 558, 558, 558, 558, 558, 559, - 558, 558, 558, 572, 569, 558, 558, 558, 561, 558, - 558, 566, 566, 573, 558, 574, 561, 561, 561, 561, - 561, 561, 561, 561, 561, 561, 561, 561, 561, 561, - 561, 561, 561, 561, 561, 561, 561, 561, 561, 561, - 561, 561, 561, 561, 561, 561, 561, 561, 561, 561, - 561, 561, 561, 561, 561, 561, 561, 561, 561, 561, - 561, 561, 561, 561, 561, 561, 561, 561, 561, 561, - 561, 561, 571, 558, 558, 558, 558, 558, 219, 558, - - 219, 558, 558, 558, 558, 558, 559, 558, 558, 558, - 558, 561, 566, 566, 575, 561, 561, 561, 561, 561, - 561, 561, 561, 561, 561, 561, 561, 561, 561, 561, - 561, 561, 561, 561, 561, 561, 561, 561, 561, 561, - 561, 561, 561, 561, 561, 561, 561, 561, 561, 561, - 561, 561, 561, 561, 561, 561, 561, 561, 561, 561, - 561, 561, 561, 561, 561, 561, 558, 558, 558, 558, - 558, 558, 576, 558, 558, 558, 558, 558, 566, 314, - 558, 577, 561, 561, 561, 561, 561, 561, 561, 561, - 561, 561, 561, 561, 561, 561, 561, 561, 561, 561, - - 561, 561, 561, 561, 561, 561, 561, 561, 561, 561, - 561, 561, 561, 561, 561, 561, 561, 561, 561, 561, - 561, 561, 561, 561, 558, 558, 558, 578, 558, 558, - 558, 558, 576, 558, 558, 558, 558, 558, 314, 579, - 561, 561, 561, 561, 561, 561, 561, 561, 561, 561, - 561, 561, 561, 561, 561, 561, 561, 561, 561, 561, - 561, 561, 561, 561, 561, 561, 561, 561, 558, 578, - 558, 578, 580, 558, 558, 581, 558, 558, 558, 558, - 558, 558, 558, 566, 558, 561, 561, 561, 561, 561, - 561, 561, 561, 561, 561, 561, 561, 561, 561, 561, - - 561, 561, 561, 561, 561, 580, 558, 580, 581, 558, - 582, 558, 558, 558, 583, 558, 558, 558, 558, 558, - 561, 561, 561, 561, 561, 561, 561, 561, 561, 561, - 561, 561, 582, 558, 582, 558, 583, 558, 583, 584, - 585, 558, 558, 561, 561, 561, 584, 558, 584, 585, - 558, 586, 561, 558, 586, 558, 586, 0, 558, 558, - 558, 558, 558, 558, 558, 558, 558, 558, 558, 558, - 558, 558, 558, 558, 558, 558, 558, 558, 558, 558, - 558, 558, 558, 558, 558, 558 + 557, 1, 557, 557, 557, 557, 557, 558, 559, 557, + 557, 557, 557, 557, 557, 557, 557, 560, 560, 560, + 560, 560, 560, 560, 560, 560, 560, 560, 560, 560, + 560, 560, 560, 560, 560, 560, 560, 560, 560, 560, + 560, 560, 557, 557, 557, 557, 558, 557, 561, 557, + 562, 557, 557, 557, 557, 557, 563, 55, 557, 557, + 557, 564, 557, 557, 557, 557, 560, 560, 565, 566, + 560, 560, 560, 560, 560, 560, 560, 560, 560, 560, + 560, 560, 560, 560, 560, 560, 560, 560, 560, 560, + 560, 560, 560, 560, 560, 560, 560, 560, 560, 560, + + 560, 560, 560, 560, 560, 560, 560, 560, 560, 560, + 560, 560, 560, 560, 560, 560, 560, 560, 557, 44, + 44, 557, 121, 557, 557, 557, 557, 557, 557, 557, + 558, 558, 558, 557, 557, 557, 557, 567, 557, 568, + 557, 557, 557, 563, 557, 563, 58, 557, 557, 564, + 560, 565, 557, 569, 557, 557, 560, 560, 560, 560, + 560, 560, 560, 560, 560, 560, 560, 560, 560, 560, + 560, 560, 560, 560, 560, 560, 560, 560, 560, 560, + 560, 560, 560, 560, 560, 560, 560, 560, 560, 560, + 560, 560, 560, 560, 560, 560, 560, 560, 560, 560, + + 560, 560, 560, 560, 560, 560, 560, 560, 560, 560, + 560, 570, 557, 557, 557, 557, 557, 557, 558, 557, + 557, 557, 571, 568, 557, 557, 557, 560, 557, 557, + 565, 565, 572, 557, 573, 560, 560, 560, 560, 560, + 560, 560, 560, 560, 560, 560, 560, 560, 560, 560, + 560, 560, 560, 560, 560, 560, 560, 560, 560, 560, + 560, 560, 560, 560, 560, 560, 560, 560, 560, 560, + 560, 560, 560, 560, 560, 560, 560, 560, 560, 560, + 560, 560, 560, 560, 560, 560, 560, 560, 560, 560, + 560, 570, 557, 557, 557, 557, 557, 218, 557, 218, + + 557, 557, 557, 557, 557, 558, 557, 557, 557, 557, + 560, 565, 565, 574, 560, 560, 560, 560, 560, 560, + 560, 560, 560, 560, 560, 560, 560, 560, 560, 560, + 560, 560, 560, 560, 560, 560, 560, 560, 560, 560, + 560, 560, 560, 560, 560, 560, 560, 560, 560, 560, + 560, 560, 560, 560, 560, 560, 560, 560, 560, 560, + 560, 560, 560, 560, 560, 557, 557, 557, 557, 557, + 557, 575, 557, 557, 557, 557, 557, 565, 313, 557, + 576, 560, 560, 560, 560, 560, 560, 560, 560, 560, + 560, 560, 560, 560, 560, 560, 560, 560, 560, 560, + + 560, 560, 560, 560, 560, 560, 560, 560, 560, 560, + 560, 560, 560, 560, 560, 560, 560, 560, 560, 560, + 560, 560, 560, 557, 557, 557, 577, 557, 557, 557, + 557, 575, 557, 557, 557, 557, 557, 313, 578, 560, + 560, 560, 560, 560, 560, 560, 560, 560, 560, 560, + 560, 560, 560, 560, 560, 560, 560, 560, 560, 560, + 560, 560, 560, 560, 560, 560, 560, 557, 577, 557, + 577, 579, 557, 557, 580, 557, 557, 557, 557, 557, + 557, 557, 565, 557, 560, 560, 560, 560, 560, 560, + 560, 560, 560, 560, 560, 560, 560, 560, 560, 560, + + 560, 560, 560, 560, 579, 557, 579, 580, 557, 581, + 557, 557, 557, 582, 557, 557, 557, 557, 557, 560, + 560, 560, 560, 560, 560, 560, 560, 560, 560, 560, + 560, 581, 557, 581, 557, 582, 557, 582, 583, 584, + 557, 557, 560, 560, 560, 583, 557, 583, 584, 557, + 585, 560, 557, 585, 557, 585, 0, 557, 557, 557, + 557, 557, 557, 557, 557, 557, 557, 557, 557, 557, + 557, 557, 557, 557, 557, 557, 557, 557, 557, 557, + 557, 557, 557, 557, 557 } ; -static tao_yyconst short int tao_yy_nxt[1163] = +static tao_yyconst short int tao_yy_nxt[1155] = { 0, 4, 5, 6, 7, 5, 8, 4, 9, 4, 4, 10, 11, 12, 13, 14, 14, 15, 16, 4, 17, @@ -535,131 +535,130 @@ static tao_yyconst short int tao_yy_nxt[1163] = 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, - 46, 48, 43, 46, 44, 57, 70, 52, 71, 58, - 52, 56, 56, 56, 551, 74, 112, 53, 45, 54, - 55, 55, 59, 113, 60, 60, 61, 75, 59, 49, - 64, 64, 64, 76, 62, 82, 100, 78, 93, 94, - - 62, 84, 85, 63, 79, 83, 96, 101, 88, 62, - 86, 80, 87, 553, 102, 62, 89, 81, 103, 90, - 97, 104, 107, 105, 114, 108, 98, 106, 63, 115, - 116, 118, 46, 134, 134, 46, 120, 109, 110, 120, - 111, 121, 48, 541, 117, 551, 154, 119, 122, 123, - 123, 124, 131, 166, 167, 131, 132, 137, 146, 147, - 125, 125, 125, 138, 138, 52, 198, 123, 52, 199, - 49, 56, 56, 56, 155, 53, 147, 54, 55, 55, - 176, 59, 139, 140, 140, 61, 126, 184, 193, 127, - 177, 546, 128, 62, 194, 545, 129, 59, 185, 142, - - 142, 142, 141, 148, 148, 148, 182, 139, 62, 62, - 59, 183, 60, 60, 61, 149, 149, 558, 544, 150, - 150, 150, 62, 558, 62, 543, 206, 141, 56, 56, - 56, 59, 510, 61, 61, 61, 207, 62, 143, 144, - 532, 144, 48, 62, 59, 531, 64, 64, 64, 48, - 245, 246, 120, 143, 144, 120, 62, 121, 62, 222, - 144, 123, 123, 214, 131, 223, 223, 131, 132, 235, - 49, 62, 125, 125, 125, 48, 154, 49, 59, 123, - 140, 140, 61, 220, 220, 59, 530, 142, 142, 142, - 62, 146, 147, 230, 226, 226, 230, 62, 227, 227, - - 227, 146, 147, 49, 155, 62, 150, 150, 150, 147, - 233, 233, 62, 150, 150, 150, 236, 529, 231, 147, - 271, 280, 48, 373, 228, 528, 228, 408, 308, 272, - 307, 307, 154, 281, 309, 309, 227, 227, 227, 228, - 321, 322, 527, 409, 359, 228, 227, 227, 227, 360, - 49, 234, 299, 300, 300, 301, 361, 144, 230, 144, - 155, 230, 526, 558, 302, 302, 302, 154, 367, 367, - 368, 300, 144, 48, 428, 313, 313, 428, 144, 154, - 525, 524, 473, 231, 154, 473, 367, 379, 379, 511, - 303, 430, 511, 304, 430, 155, 305, 300, 300, 374, - - 306, 49, 523, 431, 431, 431, 522, 155, 302, 302, - 302, 515, 155, 521, 515, 300, 154, 425, 426, 426, - 425, 471, 472, 381, 380, 380, 380, 520, 154, 427, - 427, 427, 380, 380, 380, 380, 426, 471, 472, 472, - 478, 478, 479, 516, 155, 380, 380, 380, 380, 380, - 380, 439, 439, 439, 540, 472, 155, 540, 478, 439, - 439, 439, 439, 510, 505, 504, 425, 426, 426, 425, - 471, 472, 439, 439, 439, 439, 439, 439, 469, 469, - 469, 425, 426, 426, 425, 426, 503, 552, 472, 430, - 552, 502, 430, 427, 427, 427, 507, 508, 501, 500, - - 426, 431, 431, 431, 474, 475, 475, 474, 476, 474, - 475, 475, 474, 476, 508, 499, 431, 431, 431, 507, - 508, 498, 497, 475, 484, 484, 484, 496, 475, 495, - 494, 493, 484, 484, 484, 484, 492, 508, 491, 425, - 426, 426, 425, 507, 508, 484, 484, 484, 484, 484, - 484, 469, 469, 469, 512, 513, 513, 512, 426, 475, - 475, 508, 517, 534, 535, 518, 514, 514, 514, 490, - 489, 488, 487, 513, 519, 519, 519, 475, 486, 538, - 539, 535, 512, 513, 513, 512, 512, 513, 513, 512, - 517, 381, 483, 518, 536, 536, 536, 539, 514, 514, - - 514, 513, 519, 519, 519, 513, 517, 534, 535, 518, - 541, 482, 542, 534, 535, 513, 513, 481, 519, 519, - 519, 519, 519, 519, 480, 535, 536, 536, 536, 538, - 539, 535, 434, 513, 538, 539, 548, 549, 548, 549, - 548, 549, 554, 554, 556, 557, 477, 539, 556, 557, - 556, 557, 539, 468, 549, 467, 549, 466, 549, 465, - 554, 464, 557, 463, 462, 461, 557, 460, 557, 47, - 47, 47, 47, 47, 47, 47, 47, 47, 50, 459, - 50, 50, 50, 50, 50, 50, 50, 68, 68, 68, - 68, 68, 133, 133, 133, 458, 457, 133, 136, 456, - - 136, 136, 136, 136, 136, 136, 136, 145, 145, 145, - 145, 145, 145, 145, 145, 145, 151, 151, 153, 153, - 153, 153, 153, 153, 153, 153, 153, 156, 455, 156, - 156, 156, 156, 156, 156, 156, 224, 224, 224, 225, - 225, 232, 232, 232, 454, 453, 232, 232, 293, 293, - 293, 293, 293, 293, 293, 293, 293, 311, 311, 311, - 314, 314, 315, 315, 382, 382, 382, 433, 433, 433, - 433, 433, 433, 433, 433, 433, 440, 440, 440, 470, - 470, 470, 470, 470, 470, 470, 470, 470, 485, 485, - 485, 506, 506, 506, 506, 506, 506, 506, 506, 506, - - 509, 509, 509, 509, 509, 509, 509, 509, 509, 533, - 533, 533, 533, 533, 533, 533, 533, 533, 537, 537, - 537, 537, 537, 537, 537, 537, 537, 547, 547, 547, - 547, 547, 547, 547, 547, 547, 550, 550, 550, 550, - 550, 550, 550, 550, 550, 555, 555, 555, 555, 555, - 555, 555, 555, 555, 452, 451, 450, 449, 448, 447, - 446, 445, 444, 443, 442, 441, 381, 438, 437, 436, - 435, 373, 434, 432, 429, 424, 423, 422, 421, 420, - 419, 418, 417, 416, 415, 414, 413, 412, 411, 410, - 407, 406, 405, 404, 403, 402, 401, 400, 399, 398, - - 397, 396, 395, 394, 393, 392, 391, 390, 389, 388, - 387, 386, 385, 384, 383, 381, 310, 308, 378, 377, - 376, 375, 558, 372, 371, 370, 369, 294, 366, 365, - 364, 363, 362, 358, 357, 356, 355, 354, 353, 352, - 351, 350, 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, 320, - 319, 318, 317, 316, 70, 312, 310, 298, 297, 296, - 295, 213, 294, 292, 291, 290, 289, 288, 287, 286, - 285, 284, 283, 282, 279, 278, 277, 276, 275, 274, - - 273, 270, 269, 268, 267, 266, 265, 264, 263, 262, - 261, 260, 259, 258, 257, 256, 255, 254, 253, 252, - 251, 250, 249, 248, 247, 244, 243, 242, 241, 240, - 239, 238, 237, 235, 229, 221, 221, 221, 219, 218, - 217, 216, 215, 213, 212, 211, 210, 209, 208, 205, - 204, 203, 202, 201, 200, 197, 196, 195, 192, 191, - 190, 189, 188, 187, 186, 181, 180, 179, 178, 175, - 174, 173, 172, 171, 170, 169, 168, 165, 164, 163, - 162, 161, 160, 159, 158, 157, 152, 135, 130, 99, - 95, 92, 91, 77, 73, 72, 69, 67, 66, 65, - - 51, 558, 3, 558, 558, 558, 558, 558, 558, 558, - 558, 558, 558, 558, 558, 558, 558, 558, 558, 558, - 558, 558, 558, 558, 558, 558, 558, 558, 558, 558, - 558, 558, 558, 558, 558, 558, 558, 558, 558, 558, - 558, 558, 558, 558, 558, 558, 558, 558, 558, 558, - 558, 558, 558, 558, 558, 558, 558, 558, 558, 558, - 558, 558 + 46, 48, 43, 46, 44, 52, 550, 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, 552, 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, 540, 101, 46, 119, 108, 109, 119, 110, + 120, 116, 133, 133, 118, 121, 122, 122, 123, 130, + 145, 146, 130, 131, 136, 550, 153, 124, 124, 124, + 137, 137, 165, 166, 122, 55, 55, 55, 146, 58, + 175, 139, 139, 60, 147, 147, 147, 181, 48, 138, + 176, 61, 182, 125, 154, 48, 126, 545, 192, 127, + 140, 183, 544, 128, 193, 58, 61, 141, 141, 141, + + 197, 153, 184, 198, 138, 407, 49, 61, 58, 205, + 59, 59, 60, 49, 58, 140, 60, 60, 60, 206, + 61, 408, 61, 55, 55, 55, 61, 119, 279, 154, + 119, 557, 120, 142, 143, 61, 143, 557, 148, 148, + 280, 61, 149, 149, 149, 122, 122, 213, 142, 143, + 58, 48, 63, 63, 63, 143, 124, 124, 124, 219, + 219, 130, 61, 122, 130, 131, 221, 149, 149, 149, + 225, 225, 222, 222, 226, 226, 226, 61, 58, 49, + 139, 139, 60, 58, 234, 141, 141, 141, 145, 146, + 61, 145, 146, 229, 372, 61, 229, 232, 232, 270, + + 149, 149, 149, 244, 245, 61, 146, 48, 271, 146, + 61, 227, 543, 227, 307, 306, 306, 542, 230, 153, + 308, 308, 226, 226, 226, 229, 227, 509, 229, 320, + 321, 235, 227, 531, 557, 49, 48, 530, 233, 298, + 299, 299, 300, 226, 226, 226, 427, 154, 153, 427, + 230, 301, 301, 301, 143, 358, 143, 153, 299, 529, + 359, 366, 366, 367, 49, 312, 312, 360, 472, 143, + 510, 472, 528, 510, 153, 143, 154, 302, 514, 366, + 303, 514, 527, 304, 153, 154, 526, 305, 299, 299, + 373, 429, 378, 378, 429, 424, 425, 425, 424, 301, + + 301, 301, 154, 430, 430, 430, 299, 426, 426, 426, + 470, 471, 154, 153, 425, 477, 477, 478, 525, 524, + 523, 379, 379, 379, 429, 522, 521, 429, 471, 379, + 379, 379, 379, 477, 470, 471, 430, 430, 430, 520, + 380, 154, 379, 379, 379, 379, 379, 379, 438, 438, + 438, 539, 471, 519, 539, 515, 438, 438, 438, 438, + 509, 504, 503, 424, 425, 425, 424, 470, 471, 438, + 438, 438, 438, 438, 438, 468, 468, 468, 424, 425, + 425, 424, 425, 502, 501, 471, 506, 507, 500, 499, + 426, 426, 426, 498, 497, 506, 507, 425, 473, 474, + + 474, 473, 475, 496, 507, 473, 474, 474, 473, 475, + 430, 430, 430, 507, 506, 507, 495, 474, 483, 483, + 483, 494, 551, 493, 474, 551, 483, 483, 483, 483, + 492, 491, 507, 424, 425, 425, 424, 474, 474, 483, + 483, 483, 483, 483, 483, 468, 468, 468, 511, 512, + 512, 511, 425, 533, 534, 474, 516, 490, 489, 517, + 513, 513, 513, 511, 512, 512, 511, 512, 518, 518, + 518, 534, 488, 487, 486, 535, 535, 535, 511, 512, + 512, 511, 512, 537, 538, 541, 516, 485, 380, 517, + 513, 513, 513, 482, 518, 518, 518, 512, 518, 518, + + 518, 538, 516, 533, 534, 517, 540, 533, 534, 537, + 538, 512, 512, 481, 518, 518, 518, 537, 538, 547, + 548, 534, 535, 535, 535, 534, 480, 538, 479, 512, + 547, 548, 547, 548, 433, 538, 476, 548, 553, 553, + 555, 556, 555, 556, 555, 556, 467, 466, 548, 465, + 548, 464, 463, 462, 461, 460, 553, 459, 556, 458, + 556, 457, 556, 47, 47, 47, 47, 47, 47, 47, + 47, 47, 50, 456, 50, 50, 50, 50, 50, 50, + 50, 67, 67, 67, 67, 67, 132, 132, 132, 455, + 454, 132, 135, 453, 135, 135, 135, 135, 135, 135, + + 135, 144, 144, 144, 144, 144, 144, 144, 144, 144, + 150, 150, 152, 152, 152, 152, 152, 152, 152, 152, + 152, 155, 452, 155, 155, 155, 155, 155, 155, 155, + 223, 223, 223, 224, 224, 231, 231, 231, 451, 450, + 231, 231, 292, 292, 292, 292, 292, 292, 292, 292, + 292, 310, 310, 310, 313, 313, 314, 314, 381, 381, + 381, 432, 432, 432, 432, 432, 432, 432, 432, 432, + 439, 439, 439, 469, 469, 469, 469, 469, 469, 469, + 469, 469, 484, 484, 484, 505, 505, 505, 505, 505, + 505, 505, 505, 505, 508, 508, 508, 508, 508, 508, + + 508, 508, 508, 532, 532, 532, 532, 532, 532, 532, + 532, 532, 536, 536, 536, 536, 536, 536, 536, 536, + 536, 546, 546, 546, 546, 546, 546, 546, 546, 546, + 549, 549, 549, 549, 549, 549, 549, 549, 549, 554, + 554, 554, 554, 554, 554, 554, 554, 554, 449, 448, + 447, 446, 445, 444, 443, 442, 441, 440, 380, 437, + 436, 435, 434, 372, 433, 431, 428, 423, 422, 421, + 420, 419, 418, 417, 416, 415, 414, 413, 412, 411, + 410, 409, 406, 405, 404, 403, 402, 401, 400, 399, + 398, 397, 396, 395, 394, 393, 392, 391, 390, 389, + + 388, 387, 386, 385, 384, 383, 382, 380, 309, 307, + 377, 376, 375, 374, 557, 371, 370, 369, 368, 293, + 365, 364, 363, 362, 361, 357, 356, 355, 354, 353, + 352, 351, 350, 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, 319, 318, 317, 316, 315, 69, 311, 309, 297, + 296, 295, 294, 212, 293, 291, 290, 289, 288, 287, + 286, 285, 284, 283, 282, 281, 278, 277, 276, 275, + 274, 273, 272, 269, 268, 267, 266, 265, 264, 263, + + 262, 261, 260, 259, 258, 257, 256, 255, 254, 253, + 252, 251, 250, 249, 248, 247, 246, 243, 242, 241, + 240, 239, 238, 237, 236, 234, 228, 220, 220, 220, + 218, 217, 216, 215, 214, 212, 211, 210, 209, 208, + 207, 204, 203, 202, 201, 200, 199, 196, 195, 194, + 191, 190, 189, 188, 187, 186, 185, 180, 179, 178, + 177, 174, 173, 172, 171, 170, 169, 168, 167, 164, + 163, 162, 161, 160, 159, 158, 157, 156, 151, 134, + 129, 98, 94, 91, 90, 76, 72, 71, 68, 66, + 65, 64, 51, 557, 3, 557, 557, 557, 557, 557, + + 557, 557, 557, 557, 557, 557, 557, 557, 557, 557, + 557, 557, 557, 557, 557, 557, 557, 557, 557, 557, + 557, 557, 557, 557, 557, 557, 557, 557, 557, 557, + 557, 557, 557, 557, 557, 557, 557, 557, 557, 557, + 557, 557, 557, 557, 557, 557, 557, 557, 557, 557, + 557, 557, 557, 557 } ; -static tao_yyconst short int tao_yy_chk[1163] = +static tao_yyconst short int tao_yy_chk[1155] = { 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, @@ -667,128 +666,127 @@ static tao_yyconst short int tao_yy_chk[1163] = 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, 2, 5, 2, 12, 20, 10, 20, 12, - 10, 11, 11, 11, 550, 23, 39, 10, 2, 10, - 10, 10, 13, 39, 13, 13, 13, 23, 14, 8, - 14, 14, 14, 23, 13, 26, 35, 25, 31, 31, - - 14, 27, 27, 13, 25, 26, 33, 35, 28, 13, - 27, 25, 27, 545, 35, 14, 28, 25, 36, 28, - 33, 36, 38, 37, 40, 38, 33, 37, 13, 40, - 41, 42, 46, 49, 49, 46, 43, 38, 38, 43, - 38, 43, 47, 542, 41, 541, 70, 42, 44, 44, - 44, 44, 48, 80, 80, 48, 48, 51, 58, 58, - 44, 44, 44, 51, 51, 52, 107, 44, 52, 107, - 47, 53, 53, 53, 70, 52, 58, 52, 52, 52, - 89, 54, 51, 54, 54, 54, 44, 95, 103, 44, - 89, 531, 44, 54, 103, 530, 44, 55, 95, 55, - - 55, 55, 54, 59, 59, 59, 94, 51, 54, 55, - 60, 94, 60, 60, 60, 62, 62, 122, 527, 62, - 62, 62, 60, 122, 55, 520, 114, 54, 56, 56, - 56, 61, 509, 61, 61, 61, 114, 60, 56, 56, - 505, 56, 132, 61, 64, 503, 64, 64, 64, 133, - 167, 167, 120, 56, 56, 120, 64, 120, 61, 138, - 56, 125, 125, 125, 131, 138, 138, 131, 131, 157, - 132, 64, 125, 125, 125, 134, 153, 133, 140, 125, - 140, 140, 140, 134, 134, 142, 502, 142, 142, 142, - 140, 145, 145, 154, 143, 143, 154, 142, 143, 143, - - 143, 147, 147, 134, 153, 140, 149, 149, 149, 145, - 155, 155, 142, 150, 150, 150, 157, 500, 154, 147, - 193, 201, 220, 301, 150, 497, 150, 348, 223, 193, - 220, 220, 232, 201, 223, 223, 226, 226, 226, 150, - 245, 245, 495, 348, 285, 150, 227, 227, 227, 285, - 220, 155, 219, 219, 219, 219, 285, 227, 230, 227, - 232, 230, 493, 301, 219, 219, 219, 233, 294, 294, - 294, 219, 227, 307, 369, 233, 233, 369, 227, 313, - 492, 491, 429, 230, 379, 429, 294, 313, 313, 477, - 219, 371, 477, 219, 371, 233, 219, 302, 302, 302, - - 219, 307, 490, 371, 371, 371, 488, 313, 302, 302, - 302, 480, 379, 487, 480, 302, 314, 368, 368, 368, - 368, 428, 428, 485, 314, 314, 314, 483, 484, 368, - 368, 368, 314, 314, 314, 314, 368, 470, 470, 428, - 434, 434, 434, 481, 314, 314, 314, 314, 314, 314, - 314, 380, 380, 380, 516, 470, 484, 516, 434, 380, - 380, 380, 380, 476, 467, 466, 425, 425, 425, 425, - 472, 472, 380, 380, 380, 380, 380, 380, 425, 425, - 425, 427, 427, 427, 427, 425, 465, 543, 472, 430, - 543, 463, 430, 427, 427, 427, 473, 473, 462, 461, - - 427, 430, 430, 430, 431, 431, 431, 431, 431, 474, - 474, 474, 474, 474, 473, 460, 431, 431, 431, 506, - 506, 459, 458, 431, 439, 439, 439, 457, 474, 455, - 454, 452, 439, 439, 439, 439, 451, 506, 449, 469, - 469, 469, 469, 508, 508, 439, 439, 439, 439, 439, - 439, 469, 469, 469, 479, 479, 479, 479, 469, 510, - 510, 508, 482, 511, 511, 482, 479, 479, 479, 448, - 445, 444, 442, 479, 482, 482, 482, 510, 441, 515, - 515, 511, 512, 512, 512, 512, 514, 514, 514, 514, - 517, 440, 438, 517, 512, 512, 512, 515, 514, 514, - - 514, 512, 517, 517, 517, 514, 518, 533, 533, 518, - 518, 437, 519, 535, 535, 536, 536, 436, 518, 518, - 518, 519, 519, 519, 435, 533, 536, 536, 536, 537, - 537, 535, 433, 536, 539, 539, 540, 540, 547, 547, - 549, 549, 551, 551, 552, 552, 432, 537, 555, 555, - 557, 557, 539, 424, 540, 423, 547, 422, 549, 421, - 551, 419, 552, 418, 416, 413, 555, 412, 557, 559, - 559, 559, 559, 559, 559, 559, 559, 559, 560, 411, - 560, 560, 560, 560, 560, 560, 560, 561, 561, 561, - 561, 561, 562, 562, 562, 409, 407, 562, 563, 406, - - 563, 563, 563, 563, 563, 563, 563, 564, 564, 564, - 564, 564, 564, 564, 564, 564, 565, 565, 566, 566, - 566, 566, 566, 566, 566, 566, 566, 567, 405, 567, - 567, 567, 567, 567, 567, 567, 568, 568, 568, 569, - 569, 570, 570, 570, 402, 400, 570, 570, 571, 571, - 571, 571, 571, 571, 571, 571, 571, 572, 572, 572, - 573, 573, 574, 574, 575, 575, 575, 576, 576, 576, - 576, 576, 576, 576, 576, 576, 577, 577, 577, 578, - 578, 578, 578, 578, 578, 578, 578, 578, 579, 579, - 579, 580, 580, 580, 580, 580, 580, 580, 580, 580, - - 581, 581, 581, 581, 581, 581, 581, 581, 581, 582, - 582, 582, 582, 582, 582, 582, 582, 582, 583, 583, - 583, 583, 583, 583, 583, 583, 583, 584, 584, 584, - 584, 584, 584, 584, 584, 584, 585, 585, 585, 585, - 585, 585, 585, 585, 585, 586, 586, 586, 586, 586, - 586, 586, 586, 586, 399, 397, 395, 394, 393, 391, - 389, 388, 387, 386, 385, 384, 382, 378, 377, 376, - 375, 374, 373, 372, 370, 366, 364, 363, 361, 360, - 359, 358, 357, 356, 355, 354, 352, 351, 350, 349, - 347, 346, 345, 344, 342, 341, 340, 339, 337, 335, - - 334, 331, 330, 329, 328, 326, 325, 324, 323, 322, - 320, 319, 318, 317, 316, 315, 311, 309, 306, 305, - 304, 303, 299, 298, 297, 296, 295, 293, 292, 291, - 289, 287, 286, 284, 283, 282, 281, 280, 279, 278, - 277, 276, 275, 274, 273, 272, 271, 270, 269, 268, - 267, 266, 265, 263, 262, 261, 260, 258, 257, 256, - 255, 254, 253, 252, 250, 249, 248, 247, 246, 244, - 241, 240, 239, 237, 231, 229, 224, 218, 217, 216, - 215, 214, 213, 212, 211, 210, 209, 208, 207, 206, - 205, 204, 203, 202, 200, 199, 198, 197, 196, 195, - - 194, 191, 190, 189, 188, 187, 186, 185, 184, 183, - 182, 181, 180, 179, 178, 177, 176, 175, 174, 173, - 172, 171, 170, 169, 168, 166, 165, 164, 163, 162, - 160, 159, 158, 156, 152, 139, 137, 136, 130, 129, - 128, 127, 126, 124, 119, 118, 117, 116, 115, 113, - 112, 111, 110, 109, 108, 106, 105, 104, 102, 101, - 100, 99, 98, 97, 96, 93, 92, 91, 90, 88, - 87, 86, 85, 84, 83, 82, 81, 79, 78, 77, - 76, 75, 74, 73, 72, 71, 69, 50, 45, 34, - 32, 30, 29, 24, 22, 21, 19, 17, 16, 15, - - 9, 3, 558, 558, 558, 558, 558, 558, 558, 558, - 558, 558, 558, 558, 558, 558, 558, 558, 558, 558, - 558, 558, 558, 558, 558, 558, 558, 558, 558, 558, - 558, 558, 558, 558, 558, 558, 558, 558, 558, 558, - 558, 558, 558, 558, 558, 558, 558, 558, 558, 558, - 558, 558, 558, 558, 558, 558, 558, 558, 558, 558, - 558, 558 + 5, 8, 2, 5, 2, 10, 549, 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, 544, 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, 541, 35, 46, 43, 38, 38, 43, 38, + 43, 41, 49, 49, 42, 44, 44, 44, 44, 48, + 57, 57, 48, 48, 51, 540, 69, 44, 44, 44, + 51, 51, 79, 79, 44, 52, 52, 52, 57, 53, + 88, 53, 53, 53, 58, 58, 58, 93, 131, 51, + 88, 53, 93, 44, 69, 132, 44, 530, 102, 44, + 53, 94, 529, 44, 102, 54, 53, 54, 54, 54, + + 106, 152, 94, 106, 51, 347, 131, 54, 59, 113, + 59, 59, 59, 132, 60, 53, 60, 60, 60, 113, + 59, 347, 54, 55, 55, 55, 60, 119, 200, 152, + 119, 121, 119, 55, 55, 59, 55, 121, 61, 61, + 200, 60, 61, 61, 61, 124, 124, 124, 55, 55, + 63, 133, 63, 63, 63, 55, 124, 124, 124, 133, + 133, 130, 63, 124, 130, 130, 137, 148, 148, 148, + 142, 142, 137, 137, 142, 142, 142, 63, 139, 133, + 139, 139, 139, 141, 156, 141, 141, 141, 144, 144, + 139, 146, 146, 153, 300, 141, 153, 154, 154, 192, + + 149, 149, 149, 166, 166, 139, 144, 219, 192, 146, + 141, 149, 526, 149, 222, 219, 219, 519, 153, 231, + 222, 222, 225, 225, 225, 229, 149, 508, 229, 244, + 244, 156, 149, 504, 300, 219, 306, 502, 154, 218, + 218, 218, 218, 226, 226, 226, 368, 231, 378, 368, + 229, 218, 218, 218, 226, 284, 226, 232, 218, 501, + 284, 293, 293, 293, 306, 232, 232, 284, 428, 226, + 476, 428, 499, 476, 483, 226, 378, 218, 479, 293, + 218, 479, 496, 218, 312, 232, 494, 218, 301, 301, + 301, 370, 312, 312, 370, 367, 367, 367, 367, 301, + + 301, 301, 483, 370, 370, 370, 301, 367, 367, 367, + 427, 427, 312, 313, 367, 433, 433, 433, 492, 491, + 490, 313, 313, 313, 429, 489, 487, 429, 427, 313, + 313, 313, 313, 433, 469, 469, 429, 429, 429, 486, + 484, 313, 313, 313, 313, 313, 313, 313, 379, 379, + 379, 515, 469, 482, 515, 480, 379, 379, 379, 379, + 475, 466, 465, 424, 424, 424, 424, 471, 471, 379, + 379, 379, 379, 379, 379, 424, 424, 424, 426, 426, + 426, 426, 424, 464, 462, 471, 472, 472, 461, 460, + 426, 426, 426, 459, 458, 505, 505, 426, 430, 430, + + 430, 430, 430, 457, 472, 473, 473, 473, 473, 473, + 430, 430, 430, 505, 507, 507, 456, 430, 438, 438, + 438, 454, 542, 453, 473, 542, 438, 438, 438, 438, + 451, 450, 507, 468, 468, 468, 468, 509, 509, 438, + 438, 438, 438, 438, 438, 468, 468, 468, 478, 478, + 478, 478, 468, 510, 510, 509, 481, 448, 447, 481, + 478, 478, 478, 511, 511, 511, 511, 478, 481, 481, + 481, 510, 444, 443, 441, 511, 511, 511, 513, 513, + 513, 513, 511, 514, 514, 518, 516, 440, 439, 516, + 513, 513, 513, 437, 518, 518, 518, 513, 516, 516, + + 516, 514, 517, 532, 532, 517, 517, 534, 534, 536, + 536, 535, 535, 436, 517, 517, 517, 538, 538, 539, + 539, 532, 535, 535, 535, 534, 435, 536, 434, 535, + 546, 546, 548, 548, 432, 538, 431, 539, 550, 550, + 551, 551, 554, 554, 556, 556, 423, 422, 546, 421, + 548, 420, 418, 417, 415, 412, 550, 411, 551, 410, + 554, 408, 556, 558, 558, 558, 558, 558, 558, 558, + 558, 558, 559, 406, 559, 559, 559, 559, 559, 559, + 559, 560, 560, 560, 560, 560, 561, 561, 561, 405, + 404, 561, 562, 401, 562, 562, 562, 562, 562, 562, + + 562, 563, 563, 563, 563, 563, 563, 563, 563, 563, + 564, 564, 565, 565, 565, 565, 565, 565, 565, 565, + 565, 566, 399, 566, 566, 566, 566, 566, 566, 566, + 567, 567, 567, 568, 568, 569, 569, 569, 398, 396, + 569, 569, 570, 570, 570, 570, 570, 570, 570, 570, + 570, 571, 571, 571, 572, 572, 573, 573, 574, 574, + 574, 575, 575, 575, 575, 575, 575, 575, 575, 575, + 576, 576, 576, 577, 577, 577, 577, 577, 577, 577, + 577, 577, 578, 578, 578, 579, 579, 579, 579, 579, + 579, 579, 579, 579, 580, 580, 580, 580, 580, 580, + + 580, 580, 580, 581, 581, 581, 581, 581, 581, 581, + 581, 581, 582, 582, 582, 582, 582, 582, 582, 582, + 582, 583, 583, 583, 583, 583, 583, 583, 583, 583, + 584, 584, 584, 584, 584, 584, 584, 584, 584, 585, + 585, 585, 585, 585, 585, 585, 585, 585, 394, 393, + 392, 390, 388, 387, 386, 385, 384, 383, 381, 377, + 376, 375, 374, 373, 372, 371, 369, 365, 363, 362, + 360, 359, 358, 357, 356, 355, 354, 353, 351, 350, + 349, 348, 346, 345, 344, 343, 341, 340, 339, 338, + 336, 334, 333, 330, 329, 328, 327, 325, 324, 323, + + 322, 321, 319, 318, 317, 316, 315, 314, 310, 308, + 305, 304, 303, 302, 298, 297, 296, 295, 294, 292, + 291, 290, 288, 286, 285, 283, 282, 281, 280, 279, + 278, 277, 276, 275, 274, 273, 272, 271, 270, 269, + 268, 267, 266, 265, 264, 262, 261, 260, 259, 257, + 256, 255, 254, 253, 252, 251, 249, 248, 247, 246, + 245, 243, 240, 239, 238, 236, 230, 228, 223, 217, + 216, 215, 214, 213, 212, 211, 210, 209, 208, 207, + 206, 205, 204, 203, 202, 201, 199, 198, 197, 196, + 195, 194, 193, 190, 189, 188, 187, 186, 185, 184, + + 183, 182, 181, 180, 179, 178, 177, 176, 175, 174, + 173, 172, 171, 170, 169, 168, 167, 165, 164, 163, + 162, 161, 159, 158, 157, 155, 151, 138, 136, 135, + 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, 557, 557, 557, 557, 557, 557, + + 557, 557, 557, 557, 557, 557, 557, 557, 557, 557, + 557, 557, 557, 557, 557, 557, 557, 557, 557, 557, + 557, 557, 557, 557, 557, 557, 557, 557, 557, 557, + 557, 557, 557, 557, 557, 557, 557, 557, 557, 557, + 557, 557, 557, 557, 557, 557, 557, 557, 557, 557, + 557, 557, 557, 557 } ; static tao_yy_state_type tao_yy_last_accepting_state; @@ -808,7 +806,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.98 2005/07/07 19:55:08 gmaxey Exp COPYRIGHT @@ -1117,13 +1115,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 >= 559 ) + if ( tao_yy_current_state >= 558 ) 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] != 1103 ); + while ( tao_yy_base[tao_yy_current_state] != 1095 ); tao_yy_find_action: tao_yy_act = tao_yy_accept[tao_yy_current_state]; @@ -1980,7 +1978,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 >= 559 ) + if ( tao_yy_current_state >= 558 ) 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]; @@ -2015,11 +2013,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 >= 559 ) + if ( tao_yy_current_state >= 558 ) 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 == 558); + tao_yy_is_jam = (tao_yy_current_state == 557); return tao_yy_is_jam ? 0 : tao_yy_current_state; } @@ -2768,30 +2766,14 @@ idl_store_pragma (char *buf) { unsigned long depth = idl_global->scopes ().depth (); - // We replace the prefix only if there is a prefix already - // associated with this file, otherwise we add the prefix. - char *ext_id = idl_global->filename ()->get_string (); - char *int_id = 0; - int status = idl_global->file_prefixes ().find (ext_id, - int_id); - - if (status == 0) + // At global scope, we always replace the prefix. For all + // other scopes, we replace only if there is a prefix already + // associated with that scope, otherwise we add the prefix. + if (depth == 1 || idl_global->scopes ().top ()->has_prefix ()) { - if (ACE_OS::strcmp (int_id, "") != 0) - { - char *trash = 0; - idl_global->pragma_prefixes ().pop (trash); - delete [] trash; - } - else if (depth == 1) - { - // Remove the default "" and bind the new prefix. - (void) idl_global->file_prefixes ().unbind (ext_id); - ext_id = ACE::strnew (ext_id); - int_id = ACE::strnew (new_prefix); - (void) idl_global->file_prefixes ().bind (ext_id, - int_id); - } + char *trash = 0; + idl_global->pragma_prefixes ().pop (trash); + delete [] trash; } UTL_Scope *top_scope = idl_global->scopes ().top (); @@ -2804,17 +2786,18 @@ idl_store_pragma (char *buf) idl_global->pragma_prefixes ().push (new_prefix); - if (depth == 1) - { - idl_global->root ()->prefix (new_prefix); - } - if (idl_global->in_main_file ()) { + idl_global->root ()->prefix (new_prefix); idl_global->root ()->set_imported (false); top_scope->has_prefix (true); } + char *ext_id = idl_global->filename ()->get_string (); + char *int_id = 0; + int status = idl_global->file_prefixes ().find (ext_id, + int_id); + if (status != 0) { ext_id = ACE::strnew (ext_id); @@ -2840,15 +2823,6 @@ idl_store_pragma (char *buf) number = ACE_OS::strchr (tmp, '\t'); } - // Most likely this means there is only a version number - // without an identifier to apply it to. - if (number == 0) - { - const char *msg = "no identifier or scoped name"; - idl_global->err ()->version_syntax_error (msg); - return; - } - while (*number == ' ' || *number == '\t') { ++number; @@ -2951,12 +2925,7 @@ static long idl_atoi(char *s, long b) { long r = 0; - - // Skip over the dash and possibly spaces after the dash - while (*s == '-' || *s == ' ' || *s == '\t') - { - s++; - } + s++; if (b == 8 && *s == '0') { @@ -3043,12 +3012,7 @@ idl_atof (char *s) if (*s == '-') { neg = 1; - - // Skip over the dash and possibly spaces after the dash - while (*s == '-' || *s == ' ' || *s == '\t') - { - s++; - } + s++; } while (*s >= '0' && *s <= '9') @@ -3319,8 +3283,8 @@ idl_find_node (char *s) if (node != 0) { - d = idl_global->scopes ().top_non_null ()->lookup_by_name (node, - true); + d = + idl_global->scopes ().top_non_null ()->lookup_by_name (node, true); } if (d == 0) |