diff options
| author | parsons <parsons@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2000-06-21 18:20:37 +0000 |
|---|---|---|
| committer | parsons <parsons@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2000-06-21 18:20:37 +0000 |
| commit | be51b0ba9c1e0ecfe28267a49996f3df2f0626e1 (patch) | |
| tree | afd16f1ad3d60f68847c67c7ccb184b02e34a4f1 | |
| parent | 0ca71870bd64518cf3b17bc633b10dfac5a6b284 (diff) | |
| download | ATCD-be51b0ba9c1e0ecfe28267a49996f3df2f0626e1.tar.gz | |
Added regular expression to lexer.
| -rw-r--r-- | TAO/TAO_IDL/fe/idl.ll | 4 | ||||
| -rw-r--r-- | TAO/TAO_IDL/fe/lex.yy.cpp | 716 | ||||
| -rw-r--r-- | TAO/TAO_IDL/fe/lex.yy.cpp.diff | 69 |
3 files changed, 413 insertions, 376 deletions
diff --git a/TAO/TAO_IDL/fe/idl.ll b/TAO/TAO_IDL/fe/idl.ll index bb64fa47819..608ae2e30bf 100644 --- a/TAO/TAO_IDL/fe/idl.ll +++ b/TAO/TAO_IDL/fe/idl.ll @@ -282,6 +282,10 @@ L"'"\\u([0-9a-fA-F]{1,4})"'" { idl_global->set_lineno(idl_global->lineno() + 1); idl_store_pragma(ace_yytext); } +^#[ \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]*[0-9]*" ""\""[^\"]*"\""" "[0-9]*([ \t]*[0-9]*)?{NL} { idl_parse_line_and_file(ace_yytext); diff --git a/TAO/TAO_IDL/fe/lex.yy.cpp b/TAO/TAO_IDL/fe/lex.yy.cpp index f1651d20fce..0998fde6199 100644 --- a/TAO/TAO_IDL/fe/lex.yy.cpp +++ b/TAO/TAO_IDL/fe/lex.yy.cpp @@ -1,7 +1,7 @@ /* A lexical scanner generated by flex */ /* Scanner skeleton version: - * $Header: /home/daffy/u0/vern/flex/RCS/flex.skl,v 2.91 96/09/10 16:58:48 vern Exp $ + * $Id$ */ #define FLEX_SCANNER @@ -281,57 +281,58 @@ static void tao_yy_fatal_error TAO_YY_PROTO(( tao_yyconst char msg[] )); tao_yy_flex_strncpy( tao_yytext, tao_yytext_ptr, tao_yyleng + 1 ); \ tao_yy_c_buf_p = tao_yy_cp; -#define TAO_YY_NUM_RULES 84 -#define TAO_YY_END_OF_BUFFER 85 -static tao_yyconst short int tao_yy_accept[423] = +#define TAO_YY_NUM_RULES 86 +#define TAO_YY_END_OF_BUFFER 87 +static tao_yyconst short int tao_yy_accept[439] = { 0, - 81, 81, 85, 83, 81, 82, 82, 83, 83, 83, - 83, 83, 58, 54, 83, 83, 83, 50, 50, 50, + 83, 83, 87, 85, 83, 84, 84, 85, 85, 85, + 85, 85, 58, 54, 85, 85, 85, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, - 50, 50, 50, 50, 50, 50, 50, 50, 50, 83, - 82, 81, 0, 59, 0, 0, 0, 0, 57, 53, - 51, 80, 0, 51, 58, 0, 0, 0, 54, 49, + 50, 50, 50, 50, 50, 50, 50, 50, 50, 85, + 84, 83, 0, 59, 0, 0, 0, 0, 57, 53, + 51, 82, 0, 51, 58, 0, 0, 0, 54, 49, 47, 48, 50, 50, 0, 0, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 44, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, - 50, 50, 50, 50, 0, 75, 0, 0, 0, 0, - 0, 0, 0, 61, 0, 61, 0, 0, 57, 0, - 53, 0, 51, 0, 79, 79, 51, 0, 52, 56, - 50, 0, 60, 0, 0, 0, 50, 50, 1, 50, + 50, 50, 50, 50, 0, 77, 0, 0, 0, 0, + 0, 0, 0, 0, 61, 0, 61, 0, 0, 57, + 0, 53, 0, 51, 0, 81, 81, 51, 0, 52, + 56, 50, 0, 60, 0, 0, 0, 50, 50, 1, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, - 45, 50, 50, 50, 50, 50, 50, 50, 50, 50, - 50, 50, 50, 50, 50, 50, 50, 50, 0, 0, - 0, 0, 0, 0, 64, 62, 0, 0, 55, 0, - 51, 52, 50, 0, 65, 0, 41, 50, 50, 50, + 50, 45, 50, 50, 50, 50, 50, 50, 50, 50, + 50, 50, 50, 50, 50, 50, 50, 50, 50, 0, + 0, 0, 0, 0, 0, 0, 64, 62, 0, 0, + 55, 0, 51, 52, 50, 0, 65, 0, 41, 50, - 19, 26, 50, 50, 50, 50, 50, 12, 50, 50, - 50, 35, 50, 50, 50, 23, 50, 50, 50, 50, + 50, 50, 19, 26, 50, 50, 50, 50, 50, 12, + 50, 50, 50, 35, 50, 50, 50, 23, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, - 50, 50, 50, 50, 50, 30, 50, 50, 0, 0, - 0, 0, 0, 0, 76, 0, 0, 0, 0, 0, - 62, 0, 63, 0, 42, 0, 0, 50, 50, 50, - 9, 50, 50, 50, 50, 50, 17, 21, 43, 50, - 32, 50, 50, 29, 50, 50, 50, 50, 50, 50, - 24, 50, 50, 50, 50, 50, 50, 16, 50, 50, - 27, 50, 71, 0, 0, 0, 0, 0, 0, 0, - - 0, 0, 0, 66, 0, 50, 50, 50, 50, 34, - 50, 22, 50, 50, 2, 31, 46, 50, 37, 3, - 50, 50, 13, 11, 50, 18, 50, 50, 50, 50, - 50, 0, 69, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 50, 50, 28, 7, 20, - 50, 50, 36, 50, 50, 50, 50, 10, 50, 50, - 14, 0, 0, 77, 77, 0, 73, 0, 0, 72, - 0, 0, 0, 0, 0, 0, 33, 50, 50, 50, - 4, 15, 38, 50, 25, 50, 0, 0, 0, 0, - 70, 0, 0, 0, 0, 0, 0, 5, 6, 8, - - 50, 40, 0, 67, 67, 0, 0, 78, 78, 0, - 0, 0, 50, 0, 0, 0, 39, 74, 0, 68, - 68, 0 + 50, 50, 50, 50, 50, 50, 50, 30, 50, 50, + 0, 0, 0, 0, 0, 0, 0, 78, 0, 0, + 0, 0, 0, 0, 62, 0, 63, 0, 42, 0, + 0, 50, 50, 50, 9, 50, 50, 50, 50, 50, + 17, 21, 43, 50, 32, 50, 50, 29, 50, 50, + 50, 50, 50, 50, 24, 50, 50, 50, 50, 50, + 50, 16, 50, 50, 27, 50, 73, 0, 0, 0, + + 0, 0, 0, 0, 0, 0, 0, 0, 0, 66, + 0, 50, 50, 50, 50, 34, 50, 22, 50, 50, + 2, 31, 46, 50, 37, 3, 50, 50, 13, 11, + 50, 18, 50, 50, 50, 50, 50, 0, 71, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 50, 50, 28, 7, 20, 50, 50, + 36, 50, 50, 50, 50, 10, 50, 50, 14, 0, + 0, 69, 69, 0, 79, 79, 0, 75, 0, 0, + 74, 0, 0, 0, 0, 0, 0, 0, 33, 50, + 50, 50, 4, 15, 38, 50, 25, 50, 0, 0, + + 0, 0, 72, 0, 0, 0, 0, 0, 0, 0, + 5, 6, 8, 50, 40, 0, 67, 67, 0, 0, + 70, 70, 0, 80, 80, 0, 0, 0, 50, 0, + 0, 0, 39, 76, 0, 68, 68, 0 } ; static tao_yyconst int tao_yy_ec[256] = @@ -376,113 +377,117 @@ static tao_yyconst int tao_yy_meta[57] = 8, 6, 8, 6, 6, 6 } ; -static tao_yyconst short int tao_yy_base[448] = +static tao_yyconst short int tao_yy_base[466] = { 0, - 0, 50, 868, 869, 56, 869, 869, 53, 834, 48, - 51, 59, 61, 66, 849, 847, 844, 0, 841, 81, - 834, 49, 815, 57, 50, 24, 59, 815, 813, 812, - 823, 61, 43, 36, 67, 58, 811, 76, 75, 124, - 834, 110, 111, 869, 0, 846, 122, 117, 136, 141, - 178, 869, 120, 147, 166, 171, 196, 0, 184, 869, - 869, 869, 0, 826, 114, 819, 820, 800, 793, 797, - 801, 796, 811, 799, 793, 803, 789, 788, 803, 783, - 791, 172, 98, 799, 784, 783, 795, 781, 789, 795, - 787, 794, 779, 780, 776, 777, 781, 770, 774, 122, - - 777, 777, 777, 766, 773, 869, 170, 221, 778, 772, - 764, 793, 136, 869, 803, 802, 219, 801, 216, 0, - 229, 236, 869, 235, 869, 245, 0, 243, 246, 0, - 779, 140, 869, 755, 798, 167, 781, 753, 0, 754, - 759, 763, 751, 108, 748, 764, 762, 752, 757, 756, - 759, 741, 739, 752, 755, 748, 735, 744, 747, 730, - 0, 730, 739, 731, 743, 727, 729, 213, 730, 725, - 730, 736, 727, 730, 719, 733, 735, 719, 761, 760, - 727, 719, 729, 288, 869, 869, 255, 754, 0, 260, - 272, 869, 737, 0, 869, 0, 0, 711, 717, 720, - - 0, 0, 706, 718, 709, 702, 710, 0, 705, 714, - 699, 0, 698, 699, 704, 0, 703, 692, 693, 709, - 708, 699, 702, 693, 700, 686, 691, 699, 688, 697, - 696, 694, 685, 689, 690, 0, 678, 684, 719, 274, - 679, 685, 682, 678, 869, 258, 302, 683, 677, 628, - 869, 657, 869, 645, 0, 330, 641, 612, 608, 597, - 0, 573, 575, 565, 554, 537, 0, 0, 0, 548, - 0, 536, 525, 0, 505, 508, 521, 506, 510, 509, - 0, 513, 500, 501, 508, 514, 500, 0, 491, 478, - 0, 480, 869, 335, 472, 327, 465, 502, 495, 462, - - 452, 462, 356, 869, 479, 450, 430, 428, 410, 0, - 409, 0, 407, 413, 0, 0, 0, 408, 0, 0, - 394, 381, 0, 0, 358, 0, 357, 365, 345, 326, - 336, 382, 869, 397, 277, 405, 420, 340, 367, 279, - 317, 323, 308, 428, 339, 283, 282, 0, 0, 0, - 282, 291, 0, 270, 287, 274, 287, 0, 283, 267, - 0, 424, 354, 869, 356, 427, 869, 306, 308, 869, - 454, 257, 469, 252, 164, 286, 0, 234, 223, 191, - 0, 0, 0, 185, 0, 177, 195, 385, 451, 474, - 869, 489, 477, 497, 512, 400, 155, 0, 0, 0, - - 145, 0, 503, 869, 512, 516, 518, 869, 531, 178, - 143, 317, 97, 77, 537, 539, 0, 869, 541, 869, - 543, 869, 564, 572, 576, 582, 590, 598, 602, 609, - 617, 622, 625, 632, 637, 640, 643, 647, 654, 659, - 666, 671, 678, 686, 694, 702, 710 + 0, 50, 914, 915, 56, 915, 915, 53, 880, 48, + 51, 59, 61, 66, 895, 893, 890, 0, 887, 81, + 880, 49, 861, 57, 50, 24, 59, 861, 859, 858, + 869, 61, 43, 36, 67, 58, 857, 76, 75, 124, + 880, 110, 111, 915, 0, 892, 122, 117, 136, 141, + 178, 915, 120, 166, 171, 184, 196, 0, 211, 915, + 915, 915, 0, 872, 114, 865, 866, 846, 839, 843, + 847, 842, 857, 845, 839, 849, 835, 834, 849, 829, + 837, 127, 98, 845, 830, 829, 841, 827, 835, 841, + 833, 840, 825, 826, 822, 823, 827, 816, 820, 120, + + 823, 823, 823, 812, 819, 915, 129, 215, 819, 823, + 817, 809, 838, 143, 915, 848, 847, 224, 846, 228, + 0, 239, 246, 915, 243, 915, 255, 0, 174, 253, + 0, 824, 191, 915, 800, 843, 176, 826, 798, 0, + 799, 804, 808, 796, 108, 793, 809, 807, 797, 802, + 801, 804, 786, 784, 797, 800, 793, 780, 789, 792, + 775, 0, 775, 784, 776, 788, 772, 774, 162, 775, + 770, 775, 781, 772, 775, 764, 778, 780, 764, 806, + 805, 767, 771, 763, 773, 295, 915, 915, 257, 798, + 0, 259, 279, 915, 781, 0, 915, 0, 0, 755, + + 761, 764, 0, 0, 750, 762, 753, 746, 754, 0, + 749, 758, 743, 0, 742, 743, 748, 0, 747, 736, + 737, 753, 752, 743, 746, 737, 744, 730, 735, 743, + 732, 741, 740, 738, 729, 733, 734, 0, 722, 728, + 763, 280, 730, 722, 728, 725, 721, 915, 158, 309, + 721, 725, 719, 711, 915, 751, 915, 701, 0, 337, + 681, 643, 638, 636, 0, 612, 611, 609, 605, 581, + 0, 0, 0, 577, 0, 574, 573, 0, 542, 536, + 549, 534, 538, 537, 0, 541, 529, 530, 537, 542, + 537, 0, 529, 522, 0, 521, 915, 342, 232, 513, + + 334, 518, 551, 528, 489, 490, 476, 485, 363, 915, + 502, 470, 438, 438, 430, 0, 417, 0, 414, 421, + 0, 0, 0, 415, 0, 0, 401, 404, 0, 0, + 387, 0, 373, 384, 378, 359, 372, 389, 915, 404, + 284, 286, 412, 427, 377, 384, 361, 351, 339, 345, + 341, 435, 372, 318, 317, 0, 0, 0, 321, 319, + 0, 298, 303, 290, 301, 0, 296, 284, 0, 431, + 299, 915, 392, 418, 915, 433, 459, 915, 315, 243, + 915, 473, 277, 268, 477, 271, 275, 283, 0, 248, + 225, 212, 0, 0, 0, 206, 0, 195, 209, 463, + + 482, 493, 915, 497, 501, 512, 515, 521, 312, 179, + 0, 0, 0, 132, 0, 521, 915, 535, 537, 540, + 915, 542, 544, 915, 546, 155, 140, 327, 104, 77, + 551, 556, 0, 915, 565, 915, 567, 915, 588, 596, + 600, 606, 614, 622, 626, 633, 641, 646, 649, 656, + 661, 664, 667, 671, 678, 683, 690, 698, 703, 710, + 718, 726, 734, 742, 750 } ; -static tao_yyconst short int tao_yy_def[448] = +static tao_yyconst short int tao_yy_def[466] = { 0, - 422, 1, 422, 422, 422, 422, 422, 423, 424, 422, - 422, 422, 422, 422, 422, 422, 422, 425, 425, 425, - 425, 425, 425, 425, 425, 425, 425, 425, 425, 425, - 425, 425, 425, 425, 425, 425, 425, 425, 425, 422, - 422, 422, 423, 422, 426, 422, 427, 422, 422, 422, - 422, 422, 428, 51, 422, 422, 422, 429, 422, 422, - 422, 422, 425, 425, 430, 431, 425, 425, 425, 425, - 425, 425, 425, 425, 425, 425, 425, 425, 425, 425, - 425, 425, 425, 425, 425, 425, 425, 425, 425, 425, - 425, 425, 425, 425, 425, 425, 425, 425, 425, 425, - - 425, 425, 425, 425, 40, 422, 40, 422, 422, 422, - 422, 422, 423, 422, 422, 422, 422, 432, 422, 433, - 422, 422, 422, 428, 422, 428, 54, 422, 422, 429, - 425, 430, 422, 422, 422, 422, 425, 425, 425, 425, - 425, 425, 425, 425, 425, 425, 425, 425, 425, 425, - 425, 425, 425, 425, 425, 425, 425, 425, 425, 425, - 425, 425, 425, 425, 425, 425, 425, 425, 425, 425, - 425, 425, 425, 425, 425, 425, 425, 425, 434, 422, - 422, 422, 422, 422, 422, 422, 422, 435, 433, 422, - 422, 422, 425, 436, 422, 437, 425, 425, 425, 425, - - 425, 425, 425, 425, 425, 425, 425, 425, 425, 425, - 425, 425, 425, 425, 425, 425, 425, 425, 425, 425, - 425, 425, 425, 425, 425, 425, 425, 425, 425, 425, - 425, 425, 425, 425, 425, 425, 425, 425, 434, 422, - 422, 422, 422, 184, 422, 184, 422, 422, 422, 422, - 422, 422, 422, 422, 425, 430, 438, 425, 425, 425, - 425, 425, 425, 425, 425, 425, 425, 425, 425, 425, - 425, 425, 425, 425, 425, 425, 425, 425, 425, 425, - 425, 425, 425, 425, 425, 425, 425, 425, 425, 425, - 425, 425, 422, 422, 422, 422, 422, 439, 422, 422, - - 422, 422, 256, 422, 440, 425, 425, 425, 425, 425, - 425, 425, 425, 425, 425, 425, 425, 425, 425, 425, - 425, 425, 425, 425, 425, 425, 425, 425, 425, 425, - 425, 422, 422, 422, 441, 422, 422, 422, 439, 422, - 422, 422, 422, 256, 442, 425, 425, 425, 425, 425, - 425, 425, 425, 425, 425, 425, 425, 425, 425, 425, - 425, 422, 441, 422, 441, 422, 422, 443, 422, 422, - 422, 422, 422, 422, 430, 422, 425, 425, 425, 425, - 425, 425, 425, 425, 425, 425, 443, 422, 444, 422, - 422, 422, 445, 422, 422, 422, 422, 425, 425, 425, - - 425, 425, 444, 422, 444, 422, 445, 422, 445, 446, - 422, 422, 425, 446, 422, 447, 425, 422, 447, 422, - 447, 0, 422, 422, 422, 422, 422, 422, 422, 422, - 422, 422, 422, 422, 422, 422, 422, 422, 422, 422, - 422, 422, 422, 422, 422, 422, 422 + 438, 1, 438, 438, 438, 438, 438, 439, 440, 438, + 438, 438, 438, 438, 438, 438, 438, 441, 441, 441, + 441, 441, 441, 441, 441, 441, 441, 441, 441, 441, + 441, 441, 441, 441, 441, 441, 441, 441, 441, 438, + 438, 438, 439, 438, 442, 438, 443, 438, 438, 438, + 438, 438, 444, 51, 438, 438, 438, 445, 438, 438, + 438, 438, 441, 441, 446, 447, 441, 441, 441, 441, + 441, 441, 441, 441, 441, 441, 441, 441, 441, 441, + 441, 441, 441, 441, 441, 441, 441, 441, 441, 441, + 441, 441, 441, 441, 441, 441, 441, 441, 441, 441, + + 441, 441, 441, 441, 40, 438, 40, 438, 438, 438, + 438, 438, 438, 439, 438, 438, 438, 438, 448, 438, + 449, 438, 438, 438, 444, 438, 444, 54, 438, 438, + 445, 441, 446, 438, 438, 438, 438, 441, 441, 441, + 441, 441, 441, 441, 441, 441, 441, 441, 441, 441, + 441, 441, 441, 441, 441, 441, 441, 441, 441, 441, + 441, 441, 441, 441, 441, 441, 441, 441, 441, 441, + 441, 441, 441, 441, 441, 441, 441, 441, 441, 450, + 438, 438, 438, 438, 438, 438, 438, 438, 438, 451, + 449, 438, 438, 438, 441, 452, 438, 453, 441, 441, + + 441, 441, 441, 441, 441, 441, 441, 441, 441, 441, + 441, 441, 441, 441, 441, 441, 441, 441, 441, 441, + 441, 441, 441, 441, 441, 441, 441, 441, 441, 441, + 441, 441, 441, 441, 441, 441, 441, 441, 441, 441, + 450, 438, 438, 438, 438, 438, 186, 438, 186, 438, + 438, 438, 438, 438, 438, 438, 438, 438, 441, 446, + 454, 441, 441, 441, 441, 441, 441, 441, 441, 441, + 441, 441, 441, 441, 441, 441, 441, 441, 441, 441, + 441, 441, 441, 441, 441, 441, 441, 441, 441, 441, + 441, 441, 441, 441, 441, 441, 438, 438, 438, 438, + + 438, 438, 455, 438, 438, 438, 438, 438, 260, 438, + 456, 441, 441, 441, 441, 441, 441, 441, 441, 441, + 441, 441, 441, 441, 441, 441, 441, 441, 441, 441, + 441, 441, 441, 441, 441, 441, 441, 438, 438, 438, + 457, 458, 438, 438, 438, 455, 438, 438, 438, 438, + 438, 260, 459, 441, 441, 441, 441, 441, 441, 441, + 441, 441, 441, 441, 441, 441, 441, 441, 441, 438, + 457, 438, 457, 458, 438, 458, 438, 438, 460, 438, + 438, 438, 438, 438, 438, 438, 446, 438, 441, 441, + 441, 441, 441, 441, 441, 441, 441, 441, 460, 438, + + 461, 438, 438, 438, 462, 463, 438, 438, 438, 438, + 441, 441, 441, 441, 441, 461, 438, 461, 438, 462, + 438, 462, 463, 438, 463, 464, 438, 438, 441, 464, + 438, 465, 441, 438, 465, 438, 465, 0, 438, 438, + 438, 438, 438, 438, 438, 438, 438, 438, 438, 438, + 438, 438, 438, 438, 438, 438, 438, 438, 438, 438, + 438, 438, 438, 438, 438 } ; -static tao_yyconst short int tao_yy_nxt[926] = +static tao_yyconst short int tao_yy_nxt[972] = { 0, 4, 5, 6, 7, 5, 8, 4, 9, 4, 4, 10, 11, 12, 13, 14, 14, 15, 16, 4, 17, @@ -492,103 +497,108 @@ static tao_yyconst short int tao_yy_nxt[926] = 36, 37, 38, 39, 18, 18, 40, 42, 44, 48, 42, 49, 50, 50, 51, 51, 51, 52, 78, 91, 41, 53, 54, 92, 55, 55, 56, 54, 79, 59, - 59, 59, 415, 68, 57, 45, 65, 76, 66, 57, + 59, 59, 431, 68, 57, 45, 65, 76, 66, 57, 72, 89, 58, 69, 90, 77, 86, 73, 57, 70, 80, 81, 74, 57, 93, 87, 98, 94, 75, 101, - 103, 42, 88, 99, 42, 58, 44, 95, 96, 133, - 97, 102, 125, 126, 104, 105, 106, 106, 107, 116, - 51, 51, 51, 155, 417, 117, 117, 108, 108, 108, - 126, 44, 156, 45, 106, 133, 134, 54, 410, 119, - 119, 56, 54, 118, 121, 121, 121, 203, 204, 57, - 127, 127, 127, 173, 57, 109, 110, 120, 45, 133, - 111, 174, 134, 57, 195, 179, 118, 54, 57, 55, - 55, 56, 54, 415, 56, 56, 56, 413, 412, 57, - 120, 51, 51, 51, 57, 54, 134, 59, 59, 59, - - 388, 122, 123, 57, 123, 128, 128, 57, 57, 129, - 129, 129, 422, 152, 402, 122, 123, 153, 196, 401, - 123, 57, 154, 106, 106, 180, 186, 54, 400, 119, - 119, 56, 187, 187, 108, 108, 108, 125, 126, 57, - 54, 106, 121, 121, 121, 190, 190, 125, 126, 191, - 191, 191, 57, 57, 227, 126, 129, 129, 129, 129, - 129, 129, 251, 298, 228, 126, 57, 399, 252, 252, - 192, 398, 192, 191, 191, 191, 293, 293, 294, 364, - 365, 370, 370, 371, 192, 191, 191, 191, 192, 244, - 245, 245, 246, 304, 293, 397, 123, 365, 123, 370, - - 422, 247, 247, 247, 245, 245, 299, 393, 245, 389, - 123, 388, 389, 386, 123, 247, 247, 247, 416, 385, - 384, 416, 245, 383, 382, 381, 380, 379, 336, 248, - 249, 336, 378, 377, 250, 133, 332, 333, 333, 332, - 337, 337, 337, 303, 303, 303, 304, 374, 334, 334, - 334, 303, 303, 303, 303, 333, 364, 365, 364, 365, - 373, 372, 134, 303, 303, 303, 303, 303, 303, 344, - 344, 344, 340, 369, 365, 361, 365, 344, 344, 344, - 344, 360, 359, 332, 333, 333, 332, 367, 367, 344, - 344, 344, 344, 344, 344, 362, 362, 362, 332, 333, - - 333, 332, 333, 358, 411, 367, 336, 357, 356, 336, - 334, 334, 334, 396, 396, 396, 355, 333, 337, 337, - 337, 366, 367, 367, 366, 368, 333, 333, 366, 367, - 367, 366, 368, 337, 337, 337, 354, 362, 362, 362, - 367, 375, 375, 375, 333, 353, 352, 367, 351, 375, - 375, 375, 375, 404, 405, 390, 391, 391, 390, 350, - 349, 375, 375, 375, 375, 375, 375, 392, 392, 392, - 394, 405, 348, 395, 391, 390, 391, 391, 390, 408, - 409, 347, 396, 396, 396, 346, 304, 406, 406, 406, - 390, 391, 391, 390, 391, 343, 342, 409, 394, 341, - - 298, 395, 392, 392, 392, 404, 405, 340, 338, 391, - 396, 396, 396, 394, 404, 405, 395, 410, 391, 391, - 408, 409, 335, 405, 331, 396, 396, 396, 330, 406, - 406, 406, 405, 408, 409, 329, 391, 328, 409, 418, - 418, 420, 421, 420, 421, 420, 421, 327, 326, 325, - 324, 409, 323, 322, 321, 320, 319, 418, 318, 421, - 317, 421, 316, 421, 43, 43, 43, 43, 43, 43, - 43, 43, 46, 315, 46, 46, 46, 46, 46, 46, - 63, 63, 63, 63, 113, 113, 314, 313, 113, 113, - 115, 312, 115, 115, 115, 115, 115, 115, 124, 124, - - 124, 124, 124, 124, 124, 124, 130, 311, 130, 132, - 132, 132, 132, 132, 132, 132, 132, 135, 310, 135, - 135, 135, 135, 135, 135, 188, 188, 309, 188, 189, - 308, 189, 239, 239, 239, 239, 239, 239, 239, 239, - 254, 254, 307, 254, 256, 306, 256, 257, 304, 257, - 305, 305, 253, 305, 339, 339, 339, 339, 339, 339, - 339, 339, 345, 345, 251, 345, 363, 363, 363, 363, - 363, 363, 363, 363, 376, 376, 302, 376, 387, 387, - 387, 387, 387, 387, 387, 387, 403, 403, 403, 403, - 403, 403, 403, 403, 407, 407, 407, 407, 407, 407, - - 407, 407, 414, 414, 414, 414, 414, 414, 414, 414, - 419, 419, 419, 419, 419, 419, 419, 419, 301, 300, - 422, 297, 296, 295, 240, 292, 291, 290, 289, 288, - 287, 286, 285, 284, 283, 282, 281, 280, 279, 278, - 277, 276, 275, 274, 273, 272, 271, 270, 269, 268, - 267, 266, 265, 264, 263, 262, 261, 260, 259, 258, - 255, 253, 243, 242, 241, 179, 240, 238, 237, 236, - 235, 234, 233, 232, 231, 230, 229, 226, 225, 224, - 223, 222, 221, 220, 219, 218, 217, 216, 215, 214, - 213, 212, 211, 210, 209, 208, 207, 206, 205, 202, - - 201, 200, 199, 198, 197, 195, 194, 193, 185, 185, - 185, 184, 183, 182, 181, 422, 178, 177, 176, 175, - 172, 171, 170, 169, 168, 167, 166, 165, 164, 163, - 162, 161, 160, 159, 158, 157, 151, 150, 149, 148, - 147, 146, 145, 144, 143, 142, 141, 140, 139, 138, - 137, 136, 131, 114, 112, 100, 85, 84, 83, 82, - 71, 67, 64, 62, 61, 60, 47, 422, 3, 422, - 422, 422, 422, 422, 422, 422, 422, 422, 422, 422, - 422, 422, 422, 422, 422, 422, 422, 422, 422, 422, - 422, 422, 422, 422, 422, 422, 422, 422, 422, 422, - - 422, 422, 422, 422, 422, 422, 422, 422, 422, 422, - 422, 422, 422, 422, 422, 422, 422, 422, 422, 422, - 422, 422, 422, 422, 422 + 103, 42, 88, 99, 42, 58, 44, 95, 96, 134, + 97, 102, 126, 127, 104, 105, 106, 106, 107, 117, + 51, 51, 51, 156, 180, 118, 118, 108, 108, 108, + 127, 433, 157, 45, 106, 426, 135, 54, 44, 120, + 120, 56, 54, 119, 122, 122, 122, 205, 206, 57, + 431, 174, 109, 303, 57, 110, 111, 121, 153, 175, + 112, 438, 154, 57, 429, 45, 119, 155, 57, 128, + 128, 128, 54, 197, 55, 55, 56, 130, 130, 130, + 121, 51, 51, 51, 57, 54, 134, 56, 56, 56, + + 438, 123, 124, 229, 124, 129, 129, 57, 57, 130, + 130, 130, 428, 230, 400, 123, 124, 106, 106, 181, + 124, 57, 54, 135, 59, 59, 59, 198, 108, 108, + 108, 188, 415, 341, 57, 106, 341, 189, 189, 54, + 414, 120, 120, 56, 401, 126, 127, 401, 57, 413, + 54, 57, 122, 122, 122, 192, 192, 126, 127, 193, + 193, 193, 57, 127, 255, 57, 130, 130, 130, 412, + 256, 256, 193, 193, 193, 127, 57, 194, 405, 194, + 134, 405, 297, 297, 298, 411, 372, 373, 375, 376, + 310, 194, 193, 193, 193, 194, 247, 248, 248, 249, + + 297, 372, 373, 124, 373, 124, 376, 135, 250, 250, + 250, 248, 248, 304, 410, 248, 427, 124, 406, 373, + 400, 124, 250, 250, 250, 409, 409, 409, 432, 248, + 398, 432, 397, 251, 396, 343, 252, 253, 343, 395, + 394, 254, 134, 338, 339, 339, 338, 344, 344, 344, + 309, 309, 309, 393, 392, 340, 340, 340, 309, 309, + 309, 309, 339, 381, 381, 382, 391, 390, 389, 135, + 309, 309, 309, 309, 309, 309, 352, 352, 352, 310, + 386, 381, 385, 384, 352, 352, 352, 352, 383, 347, + 338, 339, 339, 338, 372, 373, 352, 352, 352, 352, + + 352, 352, 370, 370, 370, 338, 339, 339, 338, 339, + 380, 369, 373, 343, 368, 367, 343, 340, 340, 340, + 375, 376, 366, 365, 339, 344, 344, 344, 377, 378, + 378, 377, 379, 339, 339, 375, 376, 364, 376, 363, + 344, 344, 344, 362, 370, 370, 370, 378, 387, 387, + 387, 339, 361, 376, 360, 359, 387, 387, 387, 387, + 377, 378, 378, 377, 379, 378, 378, 358, 387, 387, + 387, 387, 387, 387, 402, 403, 403, 402, 407, 378, + 357, 408, 356, 378, 417, 418, 404, 404, 404, 355, + 409, 409, 409, 403, 402, 403, 403, 402, 402, 403, + + 403, 402, 418, 421, 422, 354, 419, 419, 419, 310, + 404, 404, 404, 403, 424, 425, 407, 403, 351, 408, + 350, 422, 407, 417, 418, 408, 426, 349, 409, 409, + 409, 348, 425, 303, 409, 409, 409, 417, 418, 403, + 403, 418, 421, 422, 421, 422, 424, 425, 424, 425, + 419, 419, 419, 434, 434, 418, 347, 403, 436, 437, + 422, 345, 422, 342, 425, 337, 425, 436, 437, 436, + 437, 434, 336, 335, 334, 333, 437, 332, 331, 330, + 329, 328, 327, 326, 325, 437, 324, 437, 43, 43, + 43, 43, 43, 43, 43, 43, 46, 323, 46, 46, + + 46, 46, 46, 46, 63, 63, 63, 63, 114, 114, + 322, 321, 114, 114, 116, 320, 116, 116, 116, 116, + 116, 116, 125, 125, 125, 125, 125, 125, 125, 125, + 131, 319, 131, 133, 133, 133, 133, 133, 133, 133, + 133, 136, 318, 136, 136, 136, 136, 136, 136, 190, + 190, 317, 190, 191, 316, 191, 241, 241, 241, 241, + 241, 241, 241, 241, 258, 258, 315, 258, 260, 314, + 260, 261, 313, 261, 311, 311, 312, 311, 346, 346, + 346, 346, 346, 346, 346, 346, 353, 353, 310, 353, + 371, 371, 371, 371, 371, 371, 371, 371, 374, 374, + + 374, 374, 374, 374, 374, 374, 388, 388, 257, 388, + 399, 399, 399, 399, 399, 399, 399, 399, 416, 416, + 416, 416, 416, 416, 416, 416, 420, 420, 420, 420, + 420, 420, 420, 420, 423, 423, 423, 423, 423, 423, + 423, 423, 430, 430, 430, 430, 430, 430, 430, 430, + 435, 435, 435, 435, 435, 435, 435, 435, 255, 308, + 307, 306, 305, 438, 302, 301, 300, 299, 242, 296, + 295, 294, 293, 292, 291, 290, 289, 288, 287, 286, + 285, 284, 283, 282, 281, 280, 279, 278, 277, 276, + 275, 274, 273, 272, 271, 270, 269, 268, 267, 266, + + 265, 264, 263, 262, 259, 257, 246, 245, 244, 243, + 180, 242, 240, 239, 238, 237, 236, 235, 234, 233, + 232, 231, 228, 227, 226, 225, 224, 223, 222, 221, + 220, 219, 218, 217, 216, 215, 214, 213, 212, 211, + 210, 209, 208, 207, 204, 203, 202, 201, 200, 199, + 197, 196, 195, 187, 187, 187, 186, 185, 184, 183, + 182, 438, 179, 178, 177, 176, 173, 172, 171, 170, + 169, 168, 167, 166, 165, 164, 163, 162, 161, 160, + 159, 158, 152, 151, 150, 149, 148, 147, 146, 145, + 144, 143, 142, 141, 140, 139, 138, 137, 132, 115, + + 113, 100, 85, 84, 83, 82, 71, 67, 64, 62, + 61, 60, 47, 438, 3, 438, 438, 438, 438, 438, + 438, 438, 438, 438, 438, 438, 438, 438, 438, 438, + 438, 438, 438, 438, 438, 438, 438, 438, 438, 438, + 438, 438, 438, 438, 438, 438, 438, 438, 438, 438, + 438, 438, 438, 438, 438, 438, 438, 438, 438, 438, + 438, 438, 438, 438, 438, 438, 438, 438, 438, 438, + 438 } ; -static tao_yyconst short int tao_yy_chk[926] = +static tao_yyconst short int tao_yy_chk[972] = { 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, @@ -598,100 +608,105 @@ static tao_yyconst short int tao_yy_chk[926] = 1, 1, 1, 1, 1, 1, 2, 5, 8, 10, 5, 10, 10, 10, 11, 11, 11, 12, 26, 34, 2, 12, 13, 34, 13, 13, 13, 14, 26, 14, - 14, 14, 414, 22, 13, 8, 20, 25, 20, 14, + 14, 14, 430, 22, 13, 8, 20, 25, 20, 14, 24, 33, 13, 22, 33, 25, 32, 24, 13, 22, 27, 27, 24, 14, 35, 32, 36, 35, 24, 38, 39, 42, 32, 36, 42, 13, 43, 35, 35, 65, 35, 38, 53, 53, 39, 40, 40, 40, 40, 47, - 48, 48, 48, 83, 413, 47, 47, 40, 40, 40, - 53, 113, 83, 43, 40, 132, 65, 49, 411, 49, - 49, 49, 50, 47, 50, 50, 50, 144, 144, 49, - 54, 54, 54, 100, 50, 40, 40, 49, 113, 375, - 40, 100, 132, 49, 136, 107, 47, 55, 50, 55, - 55, 55, 56, 410, 56, 56, 56, 401, 397, 55, - 49, 51, 51, 51, 56, 59, 375, 59, 59, 59, - - 387, 51, 51, 55, 51, 57, 57, 59, 56, 57, - 57, 57, 107, 82, 386, 51, 51, 82, 136, 384, - 51, 59, 82, 108, 108, 108, 117, 119, 380, 119, - 119, 119, 117, 117, 108, 108, 108, 124, 124, 119, - 121, 108, 121, 121, 121, 122, 122, 126, 126, 122, - 122, 122, 121, 119, 168, 124, 128, 128, 128, 129, - 129, 129, 187, 246, 168, 126, 121, 379, 187, 187, - 129, 378, 129, 190, 190, 190, 240, 240, 240, 335, - 335, 340, 340, 340, 129, 191, 191, 191, 129, 184, - 184, 184, 184, 376, 240, 374, 191, 335, 191, 340, - - 246, 184, 184, 184, 247, 247, 247, 372, 184, 369, - 191, 368, 369, 360, 191, 247, 247, 247, 412, 359, - 357, 412, 247, 356, 355, 354, 352, 351, 296, 184, - 184, 296, 347, 346, 184, 256, 294, 294, 294, 294, - 296, 296, 296, 256, 256, 256, 345, 343, 294, 294, - 294, 256, 256, 256, 256, 294, 363, 363, 365, 365, - 342, 341, 256, 256, 256, 256, 256, 256, 256, 303, - 303, 303, 339, 338, 363, 331, 365, 303, 303, 303, - 303, 330, 329, 332, 332, 332, 332, 388, 388, 303, - 303, 303, 303, 303, 303, 332, 332, 332, 334, 334, - - 334, 334, 332, 328, 396, 388, 336, 327, 325, 336, - 334, 334, 334, 396, 396, 396, 322, 334, 336, 336, - 336, 337, 337, 337, 337, 337, 362, 362, 366, 366, - 366, 366, 366, 337, 337, 337, 321, 362, 362, 362, - 337, 344, 344, 344, 362, 318, 314, 366, 313, 344, - 344, 344, 344, 389, 389, 371, 371, 371, 371, 311, - 309, 344, 344, 344, 344, 344, 344, 371, 371, 371, - 373, 389, 308, 373, 371, 390, 390, 390, 390, 393, - 393, 307, 373, 373, 373, 306, 305, 390, 390, 390, - 392, 392, 392, 392, 390, 302, 301, 393, 394, 300, - - 299, 394, 392, 392, 392, 403, 403, 298, 297, 392, - 394, 394, 394, 395, 405, 405, 395, 395, 406, 406, - 407, 407, 295, 403, 292, 395, 395, 395, 290, 406, - 406, 406, 405, 409, 409, 289, 406, 287, 407, 415, - 415, 416, 416, 419, 419, 421, 421, 286, 285, 284, - 283, 409, 282, 280, 279, 278, 277, 415, 276, 416, - 275, 419, 273, 421, 423, 423, 423, 423, 423, 423, - 423, 423, 424, 272, 424, 424, 424, 424, 424, 424, - 425, 425, 425, 425, 426, 426, 270, 266, 426, 426, - 427, 265, 427, 427, 427, 427, 427, 427, 428, 428, - - 428, 428, 428, 428, 428, 428, 429, 264, 429, 430, - 430, 430, 430, 430, 430, 430, 430, 431, 263, 431, - 431, 431, 431, 431, 431, 432, 432, 262, 432, 433, - 260, 433, 434, 434, 434, 434, 434, 434, 434, 434, - 435, 435, 259, 435, 436, 258, 436, 437, 257, 437, - 438, 438, 254, 438, 439, 439, 439, 439, 439, 439, - 439, 439, 440, 440, 252, 440, 441, 441, 441, 441, - 441, 441, 441, 441, 442, 442, 250, 442, 443, 443, - 443, 443, 443, 443, 443, 443, 444, 444, 444, 444, - 444, 444, 444, 444, 445, 445, 445, 445, 445, 445, - - 445, 445, 446, 446, 446, 446, 446, 446, 446, 446, - 447, 447, 447, 447, 447, 447, 447, 447, 249, 248, - 244, 243, 242, 241, 239, 238, 237, 235, 234, 233, - 232, 231, 230, 229, 228, 227, 226, 225, 224, 223, - 222, 221, 220, 219, 218, 217, 215, 214, 213, 211, - 210, 209, 207, 206, 205, 204, 203, 200, 199, 198, - 193, 188, 183, 182, 181, 180, 179, 178, 177, 176, - 175, 174, 173, 172, 171, 170, 169, 167, 166, 165, - 164, 163, 162, 160, 159, 158, 157, 156, 155, 154, - 153, 152, 151, 150, 149, 148, 147, 146, 145, 143, - - 142, 141, 140, 138, 137, 135, 134, 131, 118, 116, - 115, 112, 111, 110, 109, 105, 104, 103, 102, 101, - 99, 98, 97, 96, 95, 94, 93, 92, 91, 90, - 89, 88, 87, 86, 85, 84, 81, 80, 79, 78, - 77, 76, 75, 74, 73, 72, 71, 70, 69, 68, - 67, 66, 64, 46, 41, 37, 31, 30, 29, 28, - 23, 21, 19, 17, 16, 15, 9, 3, 422, 422, - 422, 422, 422, 422, 422, 422, 422, 422, 422, 422, - 422, 422, 422, 422, 422, 422, 422, 422, 422, 422, - 422, 422, 422, 422, 422, 422, 422, 422, 422, 422, - - 422, 422, 422, 422, 422, 422, 422, 422, 422, 422, - 422, 422, 422, 422, 422, 422, 422, 422, 422, 422, - 422, 422, 422, 422, 422 + 48, 48, 48, 83, 107, 47, 47, 40, 40, 40, + 53, 429, 83, 43, 40, 427, 65, 49, 114, 49, + 49, 49, 50, 47, 50, 50, 50, 145, 145, 49, + 426, 100, 40, 249, 50, 40, 40, 49, 82, 100, + 40, 107, 82, 49, 414, 114, 47, 82, 50, 54, + 54, 54, 55, 137, 55, 55, 55, 129, 129, 129, + 49, 51, 51, 51, 55, 56, 133, 56, 56, 56, + + 249, 51, 51, 169, 51, 57, 57, 56, 55, 57, + 57, 57, 410, 169, 399, 51, 51, 108, 108, 108, + 51, 56, 59, 133, 59, 59, 59, 137, 108, 108, + 108, 118, 398, 299, 59, 108, 299, 118, 118, 120, + 396, 120, 120, 120, 380, 125, 125, 380, 59, 392, + 122, 120, 122, 122, 122, 123, 123, 127, 127, 123, + 123, 123, 122, 125, 189, 120, 130, 130, 130, 391, + 189, 189, 192, 192, 192, 127, 122, 130, 383, 130, + 387, 383, 242, 242, 242, 390, 341, 341, 342, 342, + 388, 130, 193, 193, 193, 130, 186, 186, 186, 186, + + 242, 371, 371, 193, 341, 193, 342, 387, 186, 186, + 186, 250, 250, 250, 386, 186, 409, 193, 384, 371, + 379, 193, 250, 250, 250, 409, 409, 409, 428, 250, + 368, 428, 367, 186, 365, 301, 186, 186, 301, 364, + 363, 186, 260, 298, 298, 298, 298, 301, 301, 301, + 260, 260, 260, 362, 360, 298, 298, 298, 260, 260, + 260, 260, 298, 347, 347, 347, 359, 355, 354, 260, + 260, 260, 260, 260, 260, 260, 309, 309, 309, 353, + 351, 347, 350, 349, 309, 309, 309, 309, 348, 346, + 338, 338, 338, 338, 373, 373, 309, 309, 309, 309, + + 309, 309, 338, 338, 338, 340, 340, 340, 340, 338, + 345, 337, 373, 343, 336, 335, 343, 340, 340, 340, + 374, 374, 334, 333, 340, 343, 343, 343, 344, 344, + 344, 344, 344, 370, 370, 376, 376, 331, 374, 328, + 344, 344, 344, 327, 370, 370, 370, 344, 352, 352, + 352, 370, 324, 376, 320, 319, 352, 352, 352, 352, + 377, 377, 377, 377, 377, 400, 400, 317, 352, 352, + 352, 352, 352, 352, 382, 382, 382, 382, 385, 377, + 315, 385, 314, 400, 401, 401, 382, 382, 382, 313, + 385, 385, 385, 382, 402, 402, 402, 402, 404, 404, + + 404, 404, 401, 405, 405, 312, 402, 402, 402, 311, + 404, 404, 404, 402, 406, 406, 407, 404, 308, 407, + 307, 405, 408, 416, 416, 408, 408, 306, 407, 407, + 407, 305, 406, 304, 408, 408, 408, 418, 418, 419, + 419, 416, 420, 420, 422, 422, 423, 423, 425, 425, + 419, 419, 419, 431, 431, 418, 303, 419, 432, 432, + 420, 302, 422, 300, 423, 296, 425, 435, 435, 437, + 437, 431, 294, 293, 291, 290, 432, 289, 288, 287, + 286, 284, 283, 282, 281, 435, 280, 437, 439, 439, + 439, 439, 439, 439, 439, 439, 440, 279, 440, 440, + + 440, 440, 440, 440, 441, 441, 441, 441, 442, 442, + 277, 276, 442, 442, 443, 274, 443, 443, 443, 443, + 443, 443, 444, 444, 444, 444, 444, 444, 444, 444, + 445, 270, 445, 446, 446, 446, 446, 446, 446, 446, + 446, 447, 269, 447, 447, 447, 447, 447, 447, 448, + 448, 268, 448, 449, 267, 449, 450, 450, 450, 450, + 450, 450, 450, 450, 451, 451, 266, 451, 452, 264, + 452, 453, 263, 453, 454, 454, 262, 454, 455, 455, + 455, 455, 455, 455, 455, 455, 456, 456, 261, 456, + 457, 457, 457, 457, 457, 457, 457, 457, 458, 458, + + 458, 458, 458, 458, 458, 458, 459, 459, 258, 459, + 460, 460, 460, 460, 460, 460, 460, 460, 461, 461, + 461, 461, 461, 461, 461, 461, 462, 462, 462, 462, + 462, 462, 462, 462, 463, 463, 463, 463, 463, 463, + 463, 463, 464, 464, 464, 464, 464, 464, 464, 464, + 465, 465, 465, 465, 465, 465, 465, 465, 256, 254, + 253, 252, 251, 247, 246, 245, 244, 243, 241, 240, + 239, 237, 236, 235, 234, 233, 232, 231, 230, 229, + 228, 227, 226, 225, 224, 223, 222, 221, 220, 219, + 217, 216, 215, 213, 212, 211, 209, 208, 207, 206, + + 205, 202, 201, 200, 195, 190, 185, 184, 183, 182, + 181, 180, 179, 178, 177, 176, 175, 174, 173, 172, + 171, 170, 168, 167, 166, 165, 164, 163, 161, 160, + 159, 158, 157, 156, 155, 154, 153, 152, 151, 150, + 149, 148, 147, 146, 144, 143, 142, 141, 139, 138, + 136, 135, 132, 119, 117, 116, 113, 112, 111, 110, + 109, 105, 104, 103, 102, 101, 99, 98, 97, 96, + 95, 94, 93, 92, 91, 90, 89, 88, 87, 86, + 85, 84, 81, 80, 79, 78, 77, 76, 75, 74, + 73, 72, 71, 70, 69, 68, 67, 66, 64, 46, + + 41, 37, 31, 30, 29, 28, 23, 21, 19, 17, + 16, 15, 9, 3, 438, 438, 438, 438, 438, 438, + 438, 438, 438, 438, 438, 438, 438, 438, 438, 438, + 438, 438, 438, 438, 438, 438, 438, 438, 438, 438, + 438, 438, 438, 438, 438, 438, 438, 438, 438, 438, + 438, 438, 438, 438, 438, 438, 438, 438, 438, 438, + 438, 438, 438, 438, 438, 438, 438, 438, 438, 438, + 438 } ; static tao_yy_state_type tao_yy_last_accepting_state; @@ -713,7 +728,7 @@ char *tao_yytext_ptr; #line 1 "fe/idl.ll" #define INITIAL 0 #line 2 "fe/idl.ll" -/* $Id: idl.ll,v 1.47 2000/03/26 20:50:03 parsons Exp $ +/* $Id: idl.ll,v 1.48 2000/04/26 03:34:51 nanbor Exp $ COPYRIGHT @@ -1037,13 +1052,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 >= 423 ) + if ( tao_yy_current_state >= 439 ) 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] != 869 ); + while ( tao_yy_base[tao_yy_current_state] != 915 ); tao_yy_find_action: tao_yy_act = tao_yy_accept[tao_yy_current_state]; @@ -1493,10 +1508,10 @@ case 69: case 70: TAO_YY_RULE_SETUP #line 286 "fe/idl.ll" -{ - idl_parse_line_and_file(ace_tao_yytext); +{/* ignore file */ + idl_global->set_lineno(idl_global->lineno() + 1); } - break; + TAO_YY_BREAK case 71: #line 290 "fe/idl.ll" case 72: @@ -1522,7 +1537,7 @@ TAO_YY_RULE_SETUP #line 298 "fe/idl.ll" { idl_parse_line_and_file(ace_tao_yytext); - } + } break; case 77: #line 302 "fe/idl.ll" @@ -1530,21 +1545,30 @@ case 78: TAO_YY_RULE_SETUP #line 302 "fe/idl.ll" { + idl_parse_line_and_file(ace_tao_yytext); + } + break; +case 79: +#line 306 "fe/idl.ll" +case 80: +TAO_YY_RULE_SETUP +#line 306 "fe/idl.ll" +{ /* ignore cpp ident */ idl_global->set_lineno(idl_global->lineno() + 1); } break; -case 79: +case 81: TAO_YY_RULE_SETUP -#line 306 "fe/idl.ll" +#line 310 "fe/idl.ll" { /* ignore comments */ idl_global->set_lineno(idl_global->lineno() + 1); } break; -case 80: +case 82: TAO_YY_RULE_SETUP -#line 310 "fe/idl.ll" +#line 314 "fe/idl.ll" { for(;;) { char c = tao_yyinput(); @@ -1560,26 +1584,26 @@ TAO_YY_RULE_SETUP } } break; -case 81: +case 83: TAO_YY_RULE_SETUP -#line 324 "fe/idl.ll" +#line 328 "fe/idl.ll" ; break; -case 82: +case 84: TAO_YY_RULE_SETUP -#line 325 "fe/idl.ll" +#line 329 "fe/idl.ll" { idl_global->set_lineno(idl_global->lineno() + 1); } break; -case 83: +case 85: TAO_YY_RULE_SETUP -#line 328 "fe/idl.ll" +#line 332 "fe/idl.ll" return ace_tao_yytext [0]; TAO_YY_BREAK -case 84: +case 86: TAO_YY_RULE_SETUP -#line 330 "fe/idl.ll" +#line 334 "fe/idl.ll" TAO_YY_ECHO; break; case TAO_YY_STATE_EOF(INITIAL): @@ -1874,7 +1898,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 >= 423 ) + if ( tao_yy_current_state >= 439 ) 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]; @@ -1909,11 +1933,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 >= 423 ) + if ( tao_yy_current_state >= 439 ) 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 == 422); + tao_yy_is_jam = (tao_yy_current_state == 438); return tao_yy_is_jam ? 0 : tao_yy_current_state; } @@ -2469,7 +2493,7 @@ int main() return 0; } #endif -#line 330 "fe/idl.ll" +#line 334 "fe/idl.ll" /* subroutines */ diff --git a/TAO/TAO_IDL/fe/lex.yy.cpp.diff b/TAO/TAO_IDL/fe/lex.yy.cpp.diff index 005a45fc6ed..df480d91b29 100644 --- a/TAO/TAO_IDL/fe/lex.yy.cpp.diff +++ b/TAO/TAO_IDL/fe/lex.yy.cpp.diff @@ -1,6 +1,6 @@ --- lex.yy.cpp.orig Mon Apr 17 13:15:44 2000 +++ lex.yy.cpp Mon Apr 17 13:16:19 2000 -@@ -968,7 +968,7 @@ +@@ -983,7 +983,7 @@ /* Code executed at the end of each rule. */ #ifndef TAO_YY_BREAK @@ -9,7 +9,7 @@ #endif #define TAO_YY_RULE_SETUP \ -@@ -980,7 +980,7 @@ +@@ -995,7 +995,7 @@ TAO_YY_DECL { register tao_yy_state_type tao_yy_current_state; @@ -18,7 +18,7 @@ register int tao_yy_act; #line 126 "fe/idl.ll" -@@ -1487,7 +1487,7 @@ +@@ -1502,7 +1502,7 @@ idl_global->set_lineno(idl_global->lineno() + 1); idl_store_pragma(ace_tao_yytext); } @@ -27,16 +27,16 @@ case 69: #line 286 "fe/idl.ll" case 70: -@@ -1496,7 +1496,7 @@ - { - idl_parse_line_and_file(ace_tao_yytext); - } +@@ -1511,7 +1511,7 @@ +{/* ignore file */ + idl_global->set_lineno(idl_global->lineno() + 1); + } - TAO_YY_BREAK -+ break; - case 71: - #line 290 "fe/idl.ll" - case 72: -@@ -1505,7 +1505,7 @@ ++ break; +case 71: +#line 290 "fe/idl.ll" +case 72: +@@ -1520,7 +1520,7 @@ { idl_parse_line_and_file(ace_tao_yytext); } @@ -45,7 +45,7 @@ case 73: #line 294 "fe/idl.ll" case 74: -@@ -1514,7 +1514,7 @@ +@@ -1529,7 +1529,7 @@ { idl_parse_line_and_file(ace_tao_yytext); } @@ -54,59 +54,68 @@ case 75: #line 298 "fe/idl.ll" case 76: -@@ -1523,7 +1523,7 @@ +@@ -1538,7 +1538,7 @@ { idl_parse_line_and_file(ace_tao_yytext); - } + } - TAO_YY_BREAK + break; case 77: #line 302 "fe/idl.ll" case 78: -@@ -1533,7 +1533,7 @@ +@@ -1547,7 +1547,7 @@ + { + idl_parse_line_and_file(ace_tao_yytext); + } +- TAO_YY_BREAK ++ break; + case 79: + #line 306 "fe/idl.ll" + case 80: +@@ -1556,7 +1556,7 @@ /* ignore cpp ident */ idl_global->set_lineno(idl_global->lineno() + 1); } - TAO_YY_BREAK + break; - case 79: + case 81: TAO_YY_RULE_SETUP - #line 306 "fe/idl.ll" -@@ -1541,7 +1541,7 @@ + #line 310 "fe/idl.ll" +@@ -1565,7 +1565,7 @@ /* ignore comments */ idl_global->set_lineno(idl_global->lineno() + 1); } - TAO_YY_BREAK + break; - case 80: + case 82: TAO_YY_RULE_SETUP - #line 310 "fe/idl.ll" -@@ -1559,19 +1559,19 @@ + #line 314 "fe/idl.ll" +@@ -1583,19 +1583,19 @@ } } } - TAO_YY_BREAK + break; - case 81: + case 83: TAO_YY_RULE_SETUP - #line 324 "fe/idl.ll" + #line 328 "fe/idl.ll" ; - TAO_YY_BREAK + break; - case 82: + case 84: TAO_YY_RULE_SETUP - #line 325 "fe/idl.ll" + #line 329 "fe/idl.ll" { idl_global->set_lineno(idl_global->lineno() + 1); } - TAO_YY_BREAK + break; - case 83: + case 85: TAO_YY_RULE_SETUP - #line 328 "fe/idl.ll" -@@ -1581,7 +1581,7 @@ + #line 332 "fe/idl.ll" +@@ -1605,7 +1605,7 @@ TAO_YY_RULE_SETUP - #line 330 "fe/idl.ll" + #line 334 "fe/idl.ll" TAO_YY_ECHO; - TAO_YY_BREAK + break; |