diff options
| author | parsons <parsons@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2000-03-26 20:43:15 +0000 |
|---|---|---|
| committer | parsons <parsons@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2000-03-26 20:43:15 +0000 |
| commit | c4cf405c3f58fabd8ff79b7e3b827631d9f117fd (patch) | |
| tree | f1fba1f213fb38773565770637e0918f89b6e9f2 | |
| parent | 3d5bd48851cf9819048a692e34f1b60cf222ab95 (diff) | |
| download | ATCD-c4cf405c3f58fabd8ff79b7e3b827631d9f117fd.tar.gz | |
Implemented handling of escaped identifiers.
| -rw-r--r-- | TAO/TAO_IDL/fe/idl.ll | 8 | ||||
| -rw-r--r-- | TAO/TAO_IDL/fe/lex.yy.cpp | 556 | ||||
| -rw-r--r-- | TAO/TAO_IDL/fe/lex.yy.cpp.diff | 42 |
3 files changed, 305 insertions, 301 deletions
diff --git a/TAO/TAO_IDL/fe/idl.ll b/TAO/TAO_IDL/fe/idl.ll index 6c9e4027a24..37a269b61eb 100644 --- a/TAO/TAO_IDL/fe/idl.ll +++ b/TAO/TAO_IDL/fe/idl.ll @@ -180,20 +180,22 @@ oneway return IDL_ONEWAY; return IDL_SCOPE_DELIMITOR; } -[a-ij-rs-zA-IJ-RS-Z][a-ij-rs-zA-IJ-RS-Z0-9_]* { +[a-ij-rs-zA-IJ-RS-Z_][a-ij-rs-zA-IJ-RS-Z0-9_]* { // Make sure that this identifier is not a C++ keyword. If it is, // prepend it with a _cxx_. Lookup in the perfect hash table for C++ // keyword and grab the mapping. BTW, the reason for the odd // regular expression is to handle EBCDIC, as well as ASCII. + char *tmp = (ace_yytext[0] == '_' ? ace_yytext + 1 : ace_yytext); + TAO_IDL_CPP_Keyword_Table cpp_key_tbl; const TAO_IDL_CPP_Keyword_Entry *entry = cpp_key_tbl.lookup (ace_yytext, - ACE_OS::strlen (ace_yytext)); + ACE_OS::strlen (tmp)); if (entry) yylval.strval = ACE_OS::strdup (entry->mapping_); else - yylval.strval = ACE_OS::strdup (ace_yytext); + yylval.strval = ACE_OS::strdup (tmp); return IDENTIFIER; } diff --git a/TAO/TAO_IDL/fe/lex.yy.cpp b/TAO/TAO_IDL/fe/lex.yy.cpp index aad6b74148f..ac2e4ee0bbb 100644 --- a/TAO/TAO_IDL/fe/lex.yy.cpp +++ b/TAO/TAO_IDL/fe/lex.yy.cpp @@ -344,11 +344,11 @@ static tao_yyconst int tao_yy_ec[256] = 19, 20, 21, 1, 22, 23, 23, 23, 24, 25, 26, 26, 26, 26, 26, 27, 26, 26, 26, 26, 26, 28, 29, 30, 31, 26, 26, 32, 26, 26, - 1, 33, 1, 1, 34, 1, 35, 36, 37, 38, + 1, 33, 1, 1, 26, 1, 34, 35, 36, 37, - 39, 40, 41, 42, 43, 26, 26, 44, 45, 46, - 47, 48, 49, 50, 51, 52, 53, 54, 55, 56, - 57, 26, 1, 1, 1, 1, 1, 1, 1, 1, + 38, 39, 40, 41, 42, 26, 26, 43, 44, 45, + 46, 47, 48, 49, 50, 51, 52, 53, 54, 55, + 56, 26, 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, 1, 1, 1, 1, 1, 1, 1, 1, 1, @@ -365,67 +365,67 @@ static tao_yyconst int tao_yy_ec[256] = 1, 1, 1, 1, 1 } ; -static tao_yyconst int tao_yy_meta[58] = +static tao_yyconst int tao_yy_meta[57] = { 0, 1, 1, 2, 1, 1, 3, 1, 4, 1, 1, 1, 1, 1, 5, 5, 5, 1, 1, 1, 1, 3, 5, 5, 5, 5, 6, 6, 6, 6, 6, - 6, 6, 3, 6, 7, 7, 5, 5, 5, 7, - 6, 6, 6, 6, 6, 8, 6, 6, 6, 8, - 6, 8, 6, 8, 6, 6, 6 + 6, 6, 3, 7, 7, 5, 5, 5, 7, 6, + 6, 6, 6, 6, 8, 6, 6, 6, 8, 6, + 8, 6, 8, 6, 6, 6 } ; static tao_yyconst short int tao_yy_base[445] = { 0, - 0, 51, 866, 867, 57, 867, 867, 54, 832, 49, - 52, 60, 62, 67, 847, 845, 842, 0, 839, 82, - 832, 53, 812, 50, 57, 24, 64, 812, 810, 809, - 820, 47, 45, 36, 70, 60, 808, 67, 76, 126, - 832, 114, 105, 867, 0, 844, 129, 118, 134, 139, - 177, 867, 156, 165, 172, 183, 198, 0, 211, 867, - 867, 867, 0, 824, 129, 817, 818, 797, 790, 794, + 0, 50, 865, 866, 56, 866, 866, 53, 831, 48, + 51, 59, 61, 66, 846, 844, 841, 0, 838, 81, + 831, 49, 812, 57, 50, 24, 59, 812, 810, 809, + 820, 61, 43, 36, 67, 58, 808, 76, 75, 124, + 831, 110, 111, 866, 0, 843, 122, 117, 136, 141, + 178, 866, 120, 147, 166, 171, 196, 0, 184, 866, + 866, 866, 0, 823, 114, 816, 817, 797, 790, 794, 798, 793, 808, 796, 790, 800, 786, 785, 800, 780, - 788, 124, 788, 795, 780, 779, 791, 777, 785, 791, - 783, 790, 775, 776, 772, 773, 777, 766, 770, 113, - - 773, 773, 773, 762, 769, 867, 139, 215, 774, 768, - 760, 790, 199, 867, 800, 799, 225, 798, 229, 0, - 240, 247, 867, 244, 867, 256, 0, 255, 258, 0, - 776, 204, 867, 751, 795, 112, 778, 749, 0, 750, - 755, 759, 747, 215, 744, 760, 758, 748, 753, 752, + 788, 172, 788, 795, 780, 779, 791, 777, 785, 791, + 783, 790, 775, 776, 772, 773, 777, 766, 770, 92, + + 773, 773, 773, 762, 769, 866, 129, 221, 774, 768, + 760, 789, 137, 866, 799, 798, 161, 797, 215, 0, + 231, 246, 866, 229, 866, 237, 0, 249, 252, 0, + 775, 140, 866, 751, 794, 176, 777, 749, 0, 750, + 755, 759, 747, 108, 744, 760, 758, 748, 753, 752, 755, 737, 735, 748, 745, 732, 741, 744, 727, 0, - 727, 736, 728, 740, 724, 726, 83, 727, 722, 727, - 733, 724, 727, 716, 730, 732, 716, 759, 758, 724, - 716, 726, 301, 867, 867, 267, 752, 0, 272, 285, - 867, 735, 0, 867, 0, 0, 708, 714, 717, 0, + 727, 736, 728, 740, 724, 726, 192, 727, 722, 727, + 733, 724, 727, 716, 730, 732, 716, 758, 757, 724, + 716, 726, 294, 866, 866, 205, 751, 0, 256, 278, + 866, 734, 0, 866, 0, 0, 708, 714, 717, 0, 0, 703, 715, 706, 699, 707, 0, 702, 711, 696, 0, 695, 696, 0, 701, 690, 691, 707, 706, 697, - 700, 691, 698, 684, 689, 697, 686, 695, 653, 640, - 620, 621, 620, 0, 606, 601, 635, 286, 586, 582, - 564, 557, 867, 162, 316, 562, 544, 526, 867, 566, - 867, 565, 0, 344, 564, 536, 534, 533, 0, 511, - 521, 521, 525, 511, 0, 0, 0, 522, 522, 516, - 0, 496, 494, 505, 489, 480, 479, 0, 477, 465, - 464, 471, 469, 464, 0, 453, 438, 0, 443, 867, - 349, 426, 341, 432, 466, 464, 426, 418, 428, 371, - - 867, 453, 419, 402, 403, 381, 0, 380, 0, 382, - 389, 0, 0, 0, 382, 0, 0, 376, 355, 0, - 0, 338, 0, 326, 336, 336, 305, 320, 398, 867, - 413, 290, 421, 436, 313, 341, 292, 296, 301, 298, - 444, 330, 281, 276, 0, 0, 0, 280, 281, 0, - 257, 253, 233, 245, 0, 240, 228, 0, 320, 305, - 867, 368, 441, 867, 245, 119, 867, 471, 197, 486, - 201, 209, 230, 0, 195, 182, 185, 0, 0, 0, - 167, 0, 161, 188, 370, 401, 491, 867, 506, 427, - 514, 529, 383, 154, 0, 0, 0, 138, 0, 450, - - 867, 494, 533, 520, 867, 529, 151, 146, 170, 100, - 109, 535, 548, 0, 867, 554, 867, 556, 867, 577, - 585, 589, 595, 603, 611, 615, 622, 630, 635, 638, - 645, 650, 653, 656, 660, 667, 672, 679, 684, 691, - 699, 707, 715, 723 + 700, 691, 698, 684, 689, 697, 686, 695, 694, 692, + 683, 687, 688, 0, 676, 682, 717, 279, 677, 683, + 680, 635, 866, 158, 308, 629, 612, 601, 866, 639, + 866, 636, 0, 336, 624, 595, 585, 575, 0, 538, + 545, 545, 537, 513, 0, 0, 0, 523, 523, 522, + 0, 503, 506, 520, 504, 507, 505, 0, 487, 472, + 468, 472, 477, 468, 0, 457, 435, 0, 434, 866, + 341, 426, 271, 420, 446, 445, 412, 404, 414, 362, + + 866, 435, 406, 389, 391, 381, 0, 379, 0, 379, + 386, 0, 0, 0, 378, 0, 0, 372, 375, 0, + 0, 359, 0, 338, 349, 345, 326, 340, 388, 866, + 403, 285, 333, 423, 345, 362, 360, 322, 328, 314, + 431, 345, 289, 288, 0, 0, 0, 288, 297, 0, + 276, 293, 280, 294, 0, 283, 271, 0, 419, 298, + 866, 391, 455, 866, 308, 246, 866, 469, 256, 473, + 260, 182, 282, 0, 243, 235, 240, 0, 0, 0, + 240, 0, 236, 253, 410, 459, 489, 866, 493, 478, + 510, 514, 311, 220, 0, 0, 0, 195, 0, 497, + + 866, 518, 528, 530, 866, 532, 191, 183, 247, 111, + 77, 534, 537, 0, 866, 542, 866, 544, 866, 565, + 573, 577, 583, 591, 599, 603, 610, 618, 623, 626, + 633, 638, 641, 644, 648, 655, 660, 667, 672, 679, + 687, 695, 703, 711 } ; static tao_yyconst short int tao_yy_def[445] = @@ -481,216 +481,216 @@ static tao_yyconst short int tao_yy_def[445] = 419, 419, 419, 419 } ; -static tao_yyconst short int tao_yy_nxt[925] = +static tao_yyconst short int tao_yy_nxt[923] = { 0, 4, 5, 6, 7, 5, 8, 4, 9, 4, 4, 10, 11, 12, 13, 14, 14, 15, 16, 4, 17, 7, 18, 18, 18, 19, 18, 20, 18, 18, 21, - 18, 18, 4, 4, 22, 23, 24, 25, 26, 27, - 18, 18, 28, 29, 30, 31, 32, 33, 18, 34, - 35, 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, 86, 72, 57, 45, 65, 68, 66, - 57, 73, 87, 58, 89, 76, 74, 90, 69, 88, - - 57, 101, 75, 77, 70, 57, 80, 81, 93, 98, - 44, 94, 103, 102, 412, 42, 99, 58, 42, 194, - 386, 95, 96, 386, 97, 225, 104, 105, 106, 106, - 107, 51, 51, 51, 133, 226, 116, 45, 414, 108, - 108, 108, 117, 117, 178, 54, 106, 119, 119, 56, - 54, 407, 121, 121, 121, 172, 412, 57, 125, 126, - 118, 134, 57, 173, 195, 120, 152, 295, 109, 110, - 153, 413, 57, 111, 413, 154, 126, 57, 127, 127, - 127, 410, 419, 54, 118, 55, 55, 56, 409, 120, - 51, 51, 51, 385, 54, 57, 56, 56, 56, 399, - - 122, 123, 398, 123, 44, 419, 57, 128, 128, 133, - 57, 129, 129, 129, 133, 122, 123, 106, 106, 179, - 123, 57, 54, 397, 59, 59, 59, 396, 108, 108, - 108, 45, 185, 395, 57, 106, 134, 301, 186, 186, - 54, 134, 119, 119, 56, 394, 125, 126, 390, 57, - 385, 54, 57, 121, 121, 121, 189, 189, 125, 126, - 190, 190, 190, 57, 126, 202, 203, 57, 129, 129, - 129, 129, 129, 129, 249, 383, 126, 382, 57, 381, - 250, 250, 191, 380, 191, 190, 190, 190, 290, 290, - 291, 379, 361, 362, 367, 367, 368, 191, 190, 190, - - 190, 191, 242, 243, 243, 244, 290, 361, 362, 123, - 362, 123, 367, 378, 245, 245, 245, 377, 243, 243, - 296, 243, 330, 330, 123, 362, 376, 375, 123, 245, - 245, 245, 374, 359, 359, 359, 243, 301, 371, 370, - 330, 369, 333, 246, 247, 333, 337, 366, 248, 133, - 329, 330, 330, 329, 334, 334, 334, 300, 300, 300, - 358, 357, 331, 331, 331, 300, 300, 300, 300, 330, - 361, 362, 364, 364, 356, 355, 134, 354, 300, 300, - 300, 300, 300, 300, 341, 341, 341, 408, 362, 353, - 364, 352, 341, 341, 341, 341, 393, 393, 393, 329, - - 330, 330, 329, 401, 402, 341, 341, 341, 341, 341, - 341, 359, 359, 359, 329, 330, 330, 329, 330, 351, - 350, 402, 333, 349, 348, 333, 331, 331, 331, 405, - 406, 347, 346, 330, 334, 334, 334, 363, 364, 364, - 363, 365, 363, 364, 364, 363, 365, 406, 345, 334, - 334, 334, 401, 402, 344, 343, 364, 372, 372, 372, - 301, 364, 340, 339, 338, 372, 372, 372, 372, 295, - 402, 337, 387, 388, 388, 387, 335, 332, 372, 372, - 372, 372, 372, 372, 389, 389, 389, 391, 328, 327, - 392, 388, 387, 388, 388, 387, 401, 402, 326, 393, - - 393, 393, 325, 324, 403, 403, 403, 387, 388, 388, - 387, 388, 323, 322, 402, 391, 321, 320, 392, 389, - 389, 389, 405, 406, 319, 318, 388, 393, 393, 393, - 391, 405, 406, 392, 407, 388, 388, 415, 415, 317, - 406, 316, 393, 393, 393, 315, 403, 403, 403, 406, - 417, 418, 314, 388, 313, 415, 417, 418, 417, 418, - 312, 311, 310, 309, 308, 307, 306, 305, 418, 304, - 303, 301, 251, 249, 418, 299, 418, 43, 43, 43, - 43, 43, 43, 43, 43, 46, 298, 46, 46, 46, - 46, 46, 46, 63, 63, 63, 63, 113, 113, 297, - - 419, 113, 113, 115, 294, 115, 115, 115, 115, 115, - 115, 124, 124, 124, 124, 124, 124, 124, 124, 130, - 293, 130, 132, 132, 132, 132, 132, 132, 132, 132, - 135, 292, 135, 135, 135, 135, 135, 135, 187, 187, - 238, 187, 188, 289, 188, 237, 237, 237, 237, 237, - 237, 237, 237, 252, 252, 288, 252, 254, 287, 254, - 255, 286, 255, 302, 302, 285, 302, 336, 336, 336, - 336, 336, 336, 336, 336, 342, 342, 284, 342, 360, - 360, 360, 360, 360, 360, 360, 360, 373, 373, 283, - 373, 384, 384, 384, 384, 384, 384, 384, 384, 400, - - 400, 400, 400, 400, 400, 400, 400, 404, 404, 404, - 404, 404, 404, 404, 404, 411, 411, 411, 411, 411, - 411, 411, 411, 416, 416, 416, 416, 416, 416, 416, - 416, 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, 257, 256, 253, 251, - 241, 240, 239, 178, 238, 236, 235, 234, 233, 232, - 231, 230, 229, 228, 227, 224, 223, 222, 221, 220, - 219, 218, 217, 216, 215, 214, 213, 212, 211, 210, - 209, 208, 207, 206, 205, 204, 201, 200, 199, 198, - - 197, 196, 194, 193, 192, 184, 184, 184, 183, 182, - 181, 180, 419, 177, 176, 175, 174, 171, 170, 169, - 168, 167, 166, 165, 164, 163, 162, 161, 160, 159, - 158, 157, 156, 155, 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, 419, 3, 419, 419, 419, + 18, 18, 4, 22, 23, 24, 25, 26, 27, 18, + 18, 28, 29, 30, 31, 32, 33, 18, 34, 35, + 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, 412, 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, 172, 178, 117, 117, 108, 108, 108, + 126, 173, 44, 45, 106, 133, 134, 54, 414, 119, + 119, 56, 54, 118, 121, 121, 121, 202, 203, 57, + 127, 127, 127, 295, 57, 109, 110, 120, 185, 45, + 111, 419, 134, 57, 186, 186, 118, 54, 57, 55, + 55, 56, 54, 194, 56, 56, 56, 133, 407, 57, + 120, 51, 51, 51, 57, 54, 412, 59, 59, 59, + + 419, 122, 123, 57, 123, 128, 128, 57, 57, 129, + 129, 129, 249, 152, 134, 122, 123, 153, 250, 250, + 123, 57, 154, 106, 106, 179, 54, 195, 119, 119, + 56, 125, 126, 225, 108, 108, 108, 410, 57, 125, + 126, 106, 54, 226, 121, 121, 121, 386, 413, 126, + 386, 413, 57, 409, 57, 189, 189, 126, 385, 190, + 190, 190, 129, 129, 129, 129, 129, 129, 57, 190, + 190, 190, 333, 399, 398, 333, 191, 397, 191, 396, + 395, 290, 290, 291, 334, 334, 334, 361, 362, 301, + 191, 190, 190, 190, 191, 242, 243, 243, 244, 290, + + 361, 362, 123, 394, 123, 362, 390, 245, 245, 245, + 243, 243, 296, 385, 243, 408, 123, 383, 362, 382, + 123, 245, 245, 245, 393, 393, 393, 381, 243, 380, + 379, 378, 377, 376, 333, 246, 247, 333, 375, 374, + 248, 133, 329, 330, 330, 329, 334, 334, 334, 300, + 300, 300, 301, 371, 331, 331, 331, 300, 300, 300, + 300, 330, 367, 367, 368, 370, 369, 337, 134, 300, + 300, 300, 300, 300, 300, 341, 341, 341, 366, 358, + 367, 357, 356, 341, 341, 341, 341, 355, 354, 329, + 330, 330, 329, 361, 362, 341, 341, 341, 341, 341, + + 341, 359, 359, 359, 329, 330, 330, 329, 330, 353, + 352, 362, 364, 364, 351, 350, 331, 331, 331, 349, + 348, 330, 330, 330, 363, 364, 364, 363, 365, 347, + 364, 346, 359, 359, 359, 345, 334, 334, 334, 330, + 344, 343, 301, 364, 372, 372, 372, 340, 339, 338, + 295, 337, 372, 372, 372, 372, 363, 364, 364, 363, + 365, 401, 402, 335, 372, 372, 372, 372, 372, 372, + 387, 388, 388, 387, 391, 364, 332, 392, 328, 402, + 405, 406, 389, 389, 389, 327, 393, 393, 393, 388, + 387, 388, 388, 387, 387, 388, 388, 387, 406, 401, + + 402, 326, 403, 403, 403, 325, 389, 389, 389, 388, + 324, 391, 323, 388, 392, 391, 322, 402, 392, 407, + 401, 402, 321, 393, 393, 393, 320, 393, 393, 393, + 388, 388, 405, 406, 405, 406, 415, 415, 402, 417, + 418, 403, 403, 403, 417, 418, 417, 418, 388, 319, + 406, 318, 406, 317, 415, 316, 315, 418, 314, 313, + 312, 311, 418, 310, 418, 43, 43, 43, 43, 43, + 43, 43, 43, 46, 309, 46, 46, 46, 46, 46, + 46, 63, 63, 63, 63, 113, 113, 308, 307, 113, + 113, 115, 306, 115, 115, 115, 115, 115, 115, 124, + + 124, 124, 124, 124, 124, 124, 124, 130, 305, 130, + 132, 132, 132, 132, 132, 132, 132, 132, 135, 304, + 135, 135, 135, 135, 135, 135, 187, 187, 303, 187, + 188, 301, 188, 237, 237, 237, 237, 237, 237, 237, + 237, 252, 252, 251, 252, 254, 249, 254, 255, 299, + 255, 302, 302, 298, 302, 336, 336, 336, 336, 336, + 336, 336, 336, 342, 342, 297, 342, 360, 360, 360, + 360, 360, 360, 360, 360, 373, 373, 419, 373, 384, + 384, 384, 384, 384, 384, 384, 384, 400, 400, 400, + 400, 400, 400, 400, 400, 404, 404, 404, 404, 404, + + 404, 404, 404, 411, 411, 411, 411, 411, 411, 411, + 411, 416, 416, 416, 416, 416, 416, 416, 416, 294, + 293, 292, 238, 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, 257, 256, 253, 251, 241, + 240, 239, 178, 238, 236, 235, 234, 233, 232, 231, + 230, 229, 228, 227, 224, 223, 222, 221, 220, 219, + 218, 217, 216, 215, 214, 213, 212, 211, 210, 209, + 208, 207, 206, 205, 204, 201, 200, 199, 198, 197, + + 196, 194, 193, 192, 184, 184, 184, 183, 182, 181, + 180, 419, 177, 176, 175, 174, 171, 170, 169, 168, + 167, 166, 165, 164, 163, 162, 161, 160, 159, 158, + 157, 156, 155, 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, 419, 3, 419, 419, 419, 419, 419, 419, 419, 419, 419, 419, 419, 419, 419, 419, 419, 419, 419, 419, 419, 419, 419, 419, 419, 419, 419, 419, 419, 419, 419, 419, 419, 419, 419, 419, 419, 419, 419, 419, 419, 419, 419, 419, 419, 419, 419, 419, 419, 419, 419, 419, 419, 419, 419, 419, - 419, 419, 419, 419 + 419, 419 } ; -static tao_yyconst short int tao_yy_chk[925] = +static tao_yyconst short int tao_yy_chk[923] = { 0, 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, 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, 26, - 34, 2, 12, 13, 34, 13, 13, 13, 14, 26, - 14, 14, 14, 32, 24, 13, 8, 20, 22, 20, - 14, 24, 32, 13, 33, 25, 24, 33, 22, 32, - - 13, 38, 24, 25, 22, 14, 27, 27, 35, 36, - 43, 35, 39, 38, 411, 42, 36, 13, 42, 136, - 366, 35, 35, 366, 35, 167, 39, 40, 40, 40, - 40, 48, 48, 48, 65, 167, 47, 43, 410, 40, - 40, 40, 47, 47, 107, 49, 40, 49, 49, 49, - 50, 408, 50, 50, 50, 100, 407, 49, 53, 53, - 47, 65, 50, 100, 136, 49, 82, 244, 40, 40, - 82, 409, 49, 40, 409, 82, 53, 50, 54, 54, - 54, 398, 107, 55, 47, 55, 55, 55, 394, 49, - 51, 51, 51, 384, 56, 55, 56, 56, 56, 383, - - 51, 51, 381, 51, 113, 244, 56, 57, 57, 132, - 55, 57, 57, 57, 372, 51, 51, 108, 108, 108, - 51, 56, 59, 377, 59, 59, 59, 376, 108, 108, - 108, 113, 117, 375, 59, 108, 132, 373, 117, 117, - 119, 372, 119, 119, 119, 371, 124, 124, 369, 59, - 365, 121, 119, 121, 121, 121, 122, 122, 126, 126, - 122, 122, 122, 121, 124, 144, 144, 119, 128, 128, - 128, 129, 129, 129, 186, 357, 126, 356, 121, 354, - 186, 186, 129, 353, 129, 189, 189, 189, 238, 238, - 238, 352, 332, 332, 337, 337, 337, 129, 190, 190, - - 190, 129, 183, 183, 183, 183, 238, 360, 360, 190, - 332, 190, 337, 351, 183, 183, 183, 349, 245, 245, - 245, 183, 359, 359, 190, 360, 348, 344, 190, 245, - 245, 245, 343, 359, 359, 359, 245, 342, 340, 339, - 359, 338, 293, 183, 183, 293, 336, 335, 183, 254, - 291, 291, 291, 291, 293, 293, 293, 254, 254, 254, - 328, 327, 291, 291, 291, 254, 254, 254, 254, 291, - 362, 362, 385, 385, 326, 325, 254, 324, 254, 254, - 254, 254, 254, 254, 300, 300, 300, 393, 362, 322, - 385, 319, 300, 300, 300, 300, 393, 393, 393, 329, - - 329, 329, 329, 386, 386, 300, 300, 300, 300, 300, - 300, 329, 329, 329, 331, 331, 331, 331, 329, 318, - 315, 386, 333, 311, 310, 333, 331, 331, 331, 390, - 390, 308, 306, 331, 333, 333, 333, 334, 334, 334, - 334, 334, 363, 363, 363, 363, 363, 390, 305, 334, - 334, 334, 400, 400, 304, 303, 334, 341, 341, 341, - 302, 363, 299, 298, 297, 341, 341, 341, 341, 296, - 400, 295, 368, 368, 368, 368, 294, 292, 341, 341, - 341, 341, 341, 341, 368, 368, 368, 370, 289, 287, - 370, 368, 387, 387, 387, 387, 402, 402, 286, 370, - - 370, 370, 284, 283, 387, 387, 387, 389, 389, 389, - 389, 387, 282, 281, 402, 391, 280, 279, 391, 389, - 389, 389, 404, 404, 277, 276, 389, 391, 391, 391, - 392, 406, 406, 392, 392, 403, 403, 412, 412, 275, - 404, 274, 392, 392, 392, 273, 403, 403, 403, 406, - 413, 413, 272, 403, 270, 412, 416, 416, 418, 418, - 269, 268, 264, 263, 262, 261, 260, 258, 413, 257, - 256, 255, 252, 250, 416, 248, 418, 420, 420, 420, - 420, 420, 420, 420, 420, 421, 247, 421, 421, 421, - 421, 421, 421, 422, 422, 422, 422, 423, 423, 246, - - 242, 423, 423, 424, 241, 424, 424, 424, 424, 424, - 424, 425, 425, 425, 425, 425, 425, 425, 425, 426, - 240, 426, 427, 427, 427, 427, 427, 427, 427, 427, - 428, 239, 428, 428, 428, 428, 428, 428, 429, 429, - 237, 429, 430, 236, 430, 431, 431, 431, 431, 431, - 431, 431, 431, 432, 432, 235, 432, 433, 233, 433, - 434, 232, 434, 435, 435, 231, 435, 436, 436, 436, - 436, 436, 436, 436, 436, 437, 437, 230, 437, 438, - 438, 438, 438, 438, 438, 438, 438, 439, 439, 229, - 439, 440, 440, 440, 440, 440, 440, 440, 440, 441, - - 441, 441, 441, 441, 441, 441, 441, 442, 442, 442, - 442, 442, 442, 442, 442, 443, 443, 443, 443, 443, - 443, 443, 443, 444, 444, 444, 444, 444, 444, 444, - 444, 228, 227, 226, 225, 224, 223, 222, 221, 220, - 219, 218, 217, 216, 215, 213, 212, 210, 209, 208, - 206, 205, 204, 203, 202, 199, 198, 197, 192, 187, - 182, 181, 180, 179, 178, 177, 176, 175, 174, 173, - 172, 171, 170, 169, 168, 166, 165, 164, 163, 162, - 161, 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, 83, 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, 419, 419, 419, 419, + 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, 411, 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, 100, 107, 47, 47, 40, 40, 40, + 53, 100, 113, 43, 40, 132, 65, 49, 410, 49, + 49, 49, 50, 47, 50, 50, 50, 144, 144, 49, + 54, 54, 54, 244, 50, 40, 40, 49, 117, 113, + 40, 107, 132, 49, 117, 117, 47, 55, 50, 55, + 55, 55, 56, 136, 56, 56, 56, 372, 408, 55, + 49, 51, 51, 51, 56, 59, 407, 59, 59, 59, + + 244, 51, 51, 55, 51, 57, 57, 59, 56, 57, + 57, 57, 186, 82, 372, 51, 51, 82, 186, 186, + 51, 59, 82, 108, 108, 108, 119, 136, 119, 119, + 119, 124, 124, 167, 108, 108, 108, 398, 119, 126, + 126, 108, 121, 167, 121, 121, 121, 366, 409, 124, + 366, 409, 119, 394, 121, 122, 122, 126, 384, 122, + 122, 122, 128, 128, 128, 129, 129, 129, 121, 189, + 189, 189, 293, 383, 381, 293, 129, 377, 129, 376, + 375, 238, 238, 238, 293, 293, 293, 332, 332, 373, + 129, 190, 190, 190, 129, 183, 183, 183, 183, 238, + + 360, 360, 190, 371, 190, 332, 369, 183, 183, 183, + 245, 245, 245, 365, 183, 393, 190, 357, 360, 356, + 190, 245, 245, 245, 393, 393, 393, 354, 245, 353, + 352, 351, 349, 348, 333, 183, 183, 333, 344, 343, + 183, 254, 291, 291, 291, 291, 333, 333, 333, 254, + 254, 254, 342, 340, 291, 291, 291, 254, 254, 254, + 254, 291, 337, 337, 337, 339, 338, 336, 254, 254, + 254, 254, 254, 254, 254, 300, 300, 300, 335, 328, + 337, 327, 326, 300, 300, 300, 300, 325, 324, 329, + 329, 329, 329, 362, 362, 300, 300, 300, 300, 300, + + 300, 329, 329, 329, 331, 331, 331, 331, 329, 322, + 319, 362, 385, 385, 318, 315, 331, 331, 331, 311, + 310, 359, 359, 331, 334, 334, 334, 334, 334, 308, + 385, 306, 359, 359, 359, 305, 334, 334, 334, 359, + 304, 303, 302, 334, 341, 341, 341, 299, 298, 297, + 296, 295, 341, 341, 341, 341, 363, 363, 363, 363, + 363, 386, 386, 294, 341, 341, 341, 341, 341, 341, + 368, 368, 368, 368, 370, 363, 292, 370, 289, 386, + 390, 390, 368, 368, 368, 287, 370, 370, 370, 368, + 387, 387, 387, 387, 389, 389, 389, 389, 390, 400, + + 400, 286, 387, 387, 387, 284, 389, 389, 389, 387, + 283, 391, 282, 389, 391, 392, 281, 400, 392, 392, + 402, 402, 280, 391, 391, 391, 279, 392, 392, 392, + 403, 403, 404, 404, 406, 406, 412, 412, 402, 413, + 413, 403, 403, 403, 416, 416, 418, 418, 403, 277, + 404, 276, 406, 275, 412, 274, 273, 413, 272, 270, + 269, 268, 416, 264, 418, 420, 420, 420, 420, 420, + 420, 420, 420, 421, 263, 421, 421, 421, 421, 421, + 421, 422, 422, 422, 422, 423, 423, 262, 261, 423, + 423, 424, 260, 424, 424, 424, 424, 424, 424, 425, + + 425, 425, 425, 425, 425, 425, 425, 426, 258, 426, + 427, 427, 427, 427, 427, 427, 427, 427, 428, 257, + 428, 428, 428, 428, 428, 428, 429, 429, 256, 429, + 430, 255, 430, 431, 431, 431, 431, 431, 431, 431, + 431, 432, 432, 252, 432, 433, 250, 433, 434, 248, + 434, 435, 435, 247, 435, 436, 436, 436, 436, 436, + 436, 436, 436, 437, 437, 246, 437, 438, 438, 438, + 438, 438, 438, 438, 438, 439, 439, 242, 439, 440, + 440, 440, 440, 440, 440, 440, 440, 441, 441, 441, + 441, 441, 441, 441, 441, 442, 442, 442, 442, 442, + + 442, 442, 442, 443, 443, 443, 443, 443, 443, 443, + 443, 444, 444, 444, 444, 444, 444, 444, 444, 241, + 240, 239, 237, 236, 235, 233, 232, 231, 230, 229, + 228, 227, 226, 225, 224, 223, 222, 221, 220, 219, + 218, 217, 216, 215, 213, 212, 210, 209, 208, 206, + 205, 204, 203, 202, 199, 198, 197, 192, 187, 182, + 181, 180, 179, 178, 177, 176, 175, 174, 173, 172, + 171, 170, 169, 168, 166, 165, 164, 163, 162, 161, + 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, 83, 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, 419, 419, 419, 419, 419, 419, 419, 419, 419, 419, 419, 419, 419, 419, 419, 419, 419, 419, 419, 419, 419, 419, 419, 419, 419, 419, 419, 419, 419, 419, 419, 419, 419, 419, 419, 419, 419, 419, 419, 419, 419, 419, 419, 419, 419, 419, 419, 419, 419, 419, 419, 419, 419, 419, 419, - 419, 419, 419, 419 + 419, 419 } ; static tao_yy_state_type tao_yy_last_accepting_state; @@ -712,7 +712,7 @@ char *tao_yytext_ptr; #line 1 "fe/idl.ll" #define INITIAL 0 #line 2 "fe/idl.ll" -/* $Id: idl.ll,v 1.44 1999/12/29 02:57:53 levine Exp $ +/* $Id: idl.ll,v 1.45 2000/02/01 02:27:49 parsons Exp $ COPYRIGHT @@ -1042,7 +1042,7 @@ tao_yy_match: 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] != 867 ); + while ( tao_yy_base[tao_yy_current_state] != 866 ); tao_yy_find_action: tao_yy_act = tao_yy_accept[tao_yy_current_state]; @@ -1320,21 +1320,23 @@ TAO_YY_RULE_SETUP // keyword and grab the mapping. BTW, the reason for the odd // regular expression is to handle EBCDIC, as well as ASCII. + char *tmp = (ace_tao_yytext[0] == '_' ? ace_tao_yytext + 1 : ace_tao_yytext); + TAO_IDL_CPP_Keyword_Table cpp_key_tbl; const TAO_IDL_CPP_Keyword_Entry *entry = cpp_key_tbl.lookup (ace_tao_yytext, - ACE_OS::strlen (ace_tao_yytext)); + ACE_OS::strlen (tmp)); if (entry) tao_yylval.strval = ACE_OS::strdup (entry->mapping_); else - tao_yylval.strval = ACE_OS::strdup (ace_tao_yytext); + tao_yylval.strval = ACE_OS::strdup (tmp); return IDENTIFIER; } TAO_YY_BREAK case 50: TAO_YY_RULE_SETUP -#line 201 "fe/idl.ll" +#line 203 "fe/idl.ll" { tao_yylval.dval = idl_atof(ace_tao_yytext); return IDL_FLOATING_PT_LITERAL; @@ -1342,7 +1344,7 @@ TAO_YY_RULE_SETUP TAO_YY_BREAK case 51: TAO_YY_RULE_SETUP -#line 205 "fe/idl.ll" +#line 207 "fe/idl.ll" { tao_yylval.dval = idl_atof(ace_tao_yytext); return IDL_FLOATING_PT_LITERAL; @@ -1350,7 +1352,7 @@ TAO_YY_RULE_SETUP TAO_YY_BREAK case 52: TAO_YY_RULE_SETUP -#line 210 "fe/idl.ll" +#line 212 "fe/idl.ll" { tao_yylval.ival = idl_atoi(ace_tao_yytext, 10); return IDL_INTEGER_LITERAL; @@ -1358,7 +1360,7 @@ TAO_YY_RULE_SETUP TAO_YY_BREAK case 53: TAO_YY_RULE_SETUP -#line 214 "fe/idl.ll" +#line 216 "fe/idl.ll" { tao_yylval.uival = idl_atoui(ace_tao_yytext, 10); return IDL_UINTEGER_LITERAL; @@ -1366,7 +1368,7 @@ TAO_YY_RULE_SETUP TAO_YY_BREAK case 54: TAO_YY_RULE_SETUP -#line 218 "fe/idl.ll" +#line 220 "fe/idl.ll" { tao_yylval.ival = idl_atoi(ace_tao_yytext, 16); return IDL_INTEGER_LITERAL; @@ -1374,7 +1376,7 @@ TAO_YY_RULE_SETUP TAO_YY_BREAK case 55: TAO_YY_RULE_SETUP -#line 222 "fe/idl.ll" +#line 224 "fe/idl.ll" { tao_yylval.uival = idl_atoui(ace_tao_yytext, 16); return IDL_UINTEGER_LITERAL; @@ -1382,7 +1384,7 @@ TAO_YY_RULE_SETUP TAO_YY_BREAK case 56: TAO_YY_RULE_SETUP -#line 226 "fe/idl.ll" +#line 228 "fe/idl.ll" { tao_yylval.ival = idl_atoi(ace_tao_yytext, 8); return IDL_INTEGER_LITERAL; @@ -1390,7 +1392,7 @@ TAO_YY_RULE_SETUP TAO_YY_BREAK case 57: TAO_YY_RULE_SETUP -#line 230 "fe/idl.ll" +#line 232 "fe/idl.ll" { tao_yylval.uival = idl_atoui(ace_tao_yytext, 8); return IDL_UINTEGER_LITERAL; @@ -1398,7 +1400,7 @@ TAO_YY_RULE_SETUP TAO_YY_BREAK case 58: TAO_YY_RULE_SETUP -#line 235 "fe/idl.ll" +#line 237 "fe/idl.ll" { /* Skip the quotes */ char *tmp = ace_tao_yytext; @@ -1409,7 +1411,7 @@ TAO_YY_RULE_SETUP TAO_YY_BREAK case 59: TAO_YY_RULE_SETUP -#line 242 "fe/idl.ll" +#line 244 "fe/idl.ll" { /* Skip the bookends */ char *tmp = ACE_OS::strdup (ace_tao_yytext); @@ -1420,7 +1422,7 @@ TAO_YY_RULE_SETUP TAO_YY_BREAK case 60: TAO_YY_RULE_SETUP -#line 249 "fe/idl.ll" +#line 251 "fe/idl.ll" { tao_yylval.cval = ace_tao_yytext [1]; return IDL_CHARACTER_LITERAL; @@ -1428,7 +1430,7 @@ TAO_YY_RULE_SETUP TAO_YY_BREAK case 61: TAO_YY_RULE_SETUP -#line 253 "fe/idl.ll" +#line 255 "fe/idl.ll" { // octal character constant tao_yylval.cval = idl_escape_reader(ace_tao_yytext + 1); @@ -1437,7 +1439,7 @@ TAO_YY_RULE_SETUP TAO_YY_BREAK case 62: TAO_YY_RULE_SETUP -#line 258 "fe/idl.ll" +#line 260 "fe/idl.ll" { // hexadecimal character constant tao_yylval.cval = idl_escape_reader(ace_tao_yytext + 1); @@ -1446,7 +1448,7 @@ TAO_YY_RULE_SETUP TAO_YY_BREAK case 63: TAO_YY_RULE_SETUP -#line 263 "fe/idl.ll" +#line 265 "fe/idl.ll" { tao_yylval.cval = idl_escape_reader(ace_tao_yytext + 1); return IDL_CHARACTER_LITERAL; @@ -1454,7 +1456,7 @@ TAO_YY_RULE_SETUP TAO_YY_BREAK case 64: TAO_YY_RULE_SETUP -#line 267 "fe/idl.ll" +#line 269 "fe/idl.ll" { // wide character constant tao_yylval.wcval = ace_tao_yytext [2]; @@ -1463,7 +1465,7 @@ TAO_YY_RULE_SETUP TAO_YY_BREAK case 65: TAO_YY_RULE_SETUP -#line 272 "fe/idl.ll" +#line 274 "fe/idl.ll" { // hexadecimal wide character constant tao_yylval.wcval = idl_wchar_escape_reader(ace_tao_yytext + 2); @@ -1471,56 +1473,56 @@ TAO_YY_RULE_SETUP } TAO_YY_BREAK case 66: -#line 278 "fe/idl.ll" +#line 280 "fe/idl.ll" case 67: TAO_YY_RULE_SETUP -#line 278 "fe/idl.ll" +#line 280 "fe/idl.ll" {/* remember pragma */ idl_global->set_lineno(idl_global->lineno() + 1); idl_store_pragma(ace_tao_yytext); } break; case 68: -#line 283 "fe/idl.ll" +#line 285 "fe/idl.ll" case 69: TAO_YY_RULE_SETUP -#line 283 "fe/idl.ll" +#line 285 "fe/idl.ll" { idl_parse_line_and_file(ace_tao_yytext); } break; case 70: -#line 287 "fe/idl.ll" +#line 289 "fe/idl.ll" case 71: TAO_YY_RULE_SETUP -#line 287 "fe/idl.ll" +#line 289 "fe/idl.ll" { idl_parse_line_and_file(ace_tao_yytext); } break; case 72: -#line 291 "fe/idl.ll" +#line 293 "fe/idl.ll" case 73: TAO_YY_RULE_SETUP -#line 291 "fe/idl.ll" +#line 293 "fe/idl.ll" { idl_parse_line_and_file(ace_tao_yytext); } break; case 74: -#line 295 "fe/idl.ll" +#line 297 "fe/idl.ll" case 75: TAO_YY_RULE_SETUP -#line 295 "fe/idl.ll" +#line 297 "fe/idl.ll" { idl_parse_line_and_file(ace_tao_yytext); } break; case 76: -#line 299 "fe/idl.ll" +#line 301 "fe/idl.ll" case 77: TAO_YY_RULE_SETUP -#line 299 "fe/idl.ll" +#line 301 "fe/idl.ll" { /* ignore cpp ident */ idl_global->set_lineno(idl_global->lineno() + 1); @@ -1528,7 +1530,7 @@ TAO_YY_RULE_SETUP break; case 78: TAO_YY_RULE_SETUP -#line 303 "fe/idl.ll" +#line 305 "fe/idl.ll" { /* ignore comments */ idl_global->set_lineno(idl_global->lineno() + 1); @@ -1536,7 +1538,7 @@ TAO_YY_RULE_SETUP break; case 79: TAO_YY_RULE_SETUP -#line 307 "fe/idl.ll" +#line 309 "fe/idl.ll" { for(;;) { char c = tao_yyinput(); @@ -1554,24 +1556,24 @@ TAO_YY_RULE_SETUP break; case 80: TAO_YY_RULE_SETUP -#line 321 "fe/idl.ll" +#line 323 "fe/idl.ll" ; break; case 81: TAO_YY_RULE_SETUP -#line 322 "fe/idl.ll" +#line 324 "fe/idl.ll" { idl_global->set_lineno(idl_global->lineno() + 1); } break; case 82: TAO_YY_RULE_SETUP -#line 325 "fe/idl.ll" +#line 327 "fe/idl.ll" return ace_tao_yytext [0]; TAO_YY_BREAK case 83: TAO_YY_RULE_SETUP -#line 327 "fe/idl.ll" +#line 329 "fe/idl.ll" TAO_YY_ECHO; break; case TAO_YY_STATE_EOF(INITIAL): @@ -2461,7 +2463,7 @@ int main() return 0; } #endif -#line 327 "fe/idl.ll" +#line 329 "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 85e31e596b0..04025962b54 100644 --- a/TAO/TAO_IDL/fe/lex.yy.cpp.diff +++ b/TAO/TAO_IDL/fe/lex.yy.cpp.diff @@ -9,7 +9,7 @@ #endif #define TAO_YY_RULE_SETUP \ -@@ -975,7 +975,7 @@ +@@ -979,7 +979,7 @@ TAO_YY_DECL { register tao_yy_state_type tao_yy_current_state; @@ -18,52 +18,52 @@ register int tao_yy_act; #line 126 "fe/idl.ll" -@@ -1479,7 +1479,7 @@ +@@ -1481,7 +1481,7 @@ idl_global->set_lineno(idl_global->lineno() + 1); idl_store_pragma(ace_tao_yytext); } - TAO_YY_BREAK + break; case 68: - #line 283 "fe/idl.ll" + #line 285 "fe/idl.ll" case 69: -@@ -1488,7 +1488,7 @@ +@@ -1490,7 +1490,7 @@ { idl_parse_line_and_file(ace_tao_yytext); } - TAO_YY_BREAK + break; case 70: - #line 287 "fe/idl.ll" + #line 289 "fe/idl.ll" case 71: -@@ -1497,7 +148897,7 @@ +@@ -1499,7 +1499,7 @@ { idl_parse_line_and_file(ace_tao_yytext); } - TAO_YY_BREAK + break; case 72: - #line 291 "fe/idl.ll" + #line 293 "fe/idl.ll" case 73: -@@ -1506,7 +1506,7 @@ +@@ -1508,7 +1508,7 @@ { idl_parse_line_and_file(ace_tao_yytext); } - TAO_YY_BREAK + break; case 74: - #line 295 "fe/idl.ll" + #line 297 "fe/idl.ll" case 75: -@@ -1515,7 +1515,7 @@ +@@ -1517,7 +1517,7 @@ { idl_parse_line_and_file(ace_tao_yytext); } - TAO_YY_BREAK + break; case 76: - #line 299 "fe/idl.ll" + #line 301 "fe/idl.ll" case 77: -@@ -1525,7 +1525,7 @@ +@@ -1527,7 +1527,7 @@ /* ignore cpp ident */ idl_global->set_lineno(idl_global->lineno() + 1); } @@ -71,8 +71,8 @@ + break; case 78: TAO_YY_RULE_SETUP - #line 303 "fe/idl.ll" -@@ -1533,7 +1533,7 @@ + #line 305 "fe/idl.ll" +@@ -1535,7 +1535,7 @@ /* ignore comments */ idl_global->set_lineno(idl_global->lineno() + 1); } @@ -80,8 +80,8 @@ + break; case 79: TAO_YY_RULE_SETUP - #line 307 "fe/idl.ll" -@@ -1551,19 +1551,19 @@ + #line 309 "fe/idl.ll" +@@ -1553,19 +1553,19 @@ } } } @@ -89,13 +89,13 @@ + break; case 80: TAO_YY_RULE_SETUP - #line 321 "fe/idl.ll" + #line 323 "fe/idl.ll" ; - TAO_YY_BREAK + break; case 81: TAO_YY_RULE_SETUP - #line 322 "fe/idl.ll" + #line 324 "fe/idl.ll" { idl_global->set_lineno(idl_global->lineno() + 1); } @@ -103,10 +103,10 @@ + break; case 82: TAO_YY_RULE_SETUP - #line 325 "fe/idl.ll" -@@ -1573,7 +1573,7 @@ - TAO_YY_RULE_SETUP #line 327 "fe/idl.ll" +@@ -1575,7 +1575,7 @@ + TAO_YY_RULE_SETUP + #line 329 "fe/idl.ll" TAO_YY_ECHO; - TAO_YY_BREAK + break; |