summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorlevine <levine@ae88bc3d-4319-0410-8dbf-d08b4c9d3795>1999-12-29 02:57:54 +0000
committerlevine <levine@ae88bc3d-4319-0410-8dbf-d08b4c9d3795>1999-12-29 02:57:54 +0000
commit30625a74cfaaa2eb780f67ca9cd35e10a5af5697 (patch)
treee3a34bf5fb98e18a30ff611dcd0d12981eed752e
parentcc293ea42a2c787813f854ca4831361940426bcd (diff)
downloadATCD-30625a74cfaaa2eb780f67ca9cd35e10a5af5697.tar.gz
ChangeLogTag: Tue Dec 28 20:54:09 1999 Thomas Lockhart <Thomas.G.Lockhart@jpl.nasa.gov>
-rw-r--r--TAO/ChangeLog-99c19
-rw-r--r--TAO/TAO_IDL/driver/drv_preproc.cpp2
-rw-r--r--TAO/TAO_IDL/fe/idl.ll4
-rw-r--r--TAO/TAO_IDL/fe/lex.yy.cpp574
4 files changed, 310 insertions, 289 deletions
diff --git a/TAO/ChangeLog-99c b/TAO/ChangeLog-99c
index b167577d175..d13fe4ec091 100644
--- a/TAO/ChangeLog-99c
+++ b/TAO/ChangeLog-99c
@@ -1,8 +1,21 @@
+Tue Dec 28 20:54:09 1999 Thomas Lockhart <Thomas.G.Lockhart@jpl.nasa.gov>
+
+ * TAO_IDL/driver/drv_preproc.cpp,TAO_IDL/fe/idl.ll,
+ TAO_IDL/fe/lex.yy.cpp:
+ It turns out that g++, gcc, and whatever other preprocessor I
+ tried puts an extra numeric field into the generated line
+ labels *only* when the included source file resided in
+ /usr/include or /usr/local/include or
+ /usr/local/include/tao.d/!! There may be other locations
+ which will provoke this behavior too; I didn't test
+ exhaustively. I've patched the lexer source code to accept
+ an extra numeric field, which seems to fix the problem.
+
Tue Dec 28 14:13:18 1999 Irfan Pyarali <irfan@cs.wustl.edu>
- * tao/Makefile (ORB_CORE_FILES): Moved TAOC and TAOS from the
- corba messaging section to the general section. These files now
- contain more code than what simply belongs to corba messaging.
+ * tao/Makefile (ORB_CORE_FILES): Moved TAOC and TAOS from the
+ corba messaging section to the general section. These files now
+ contain more code than what simply belongs to corba messaging.
Tue Dec 28 09:31:03 1999 David L. Levine <levine@cs.wustl.edu>
diff --git a/TAO/TAO_IDL/driver/drv_preproc.cpp b/TAO/TAO_IDL/driver/drv_preproc.cpp
index 10153585150..b197f06c2ba 100644
--- a/TAO/TAO_IDL/driver/drv_preproc.cpp
+++ b/TAO/TAO_IDL/driver/drv_preproc.cpp
@@ -187,7 +187,7 @@ DRV_cpp_init (void)
// So we can find OMG IDL files, such as `orb.idl'.
ACE_OS::strcpy (option, "-I");
-#if defined (TAO_IDL_INCLUDE_DIR) && TAO_IDL_INCLUDE_DIR != 0
+#if defined (TAO_IDL_INCLUDE_DIR)
// TAO_IDL_INCLUDE_DIR should be in quotes,
// e.g. "/usr/local/include/tao"
diff --git a/TAO/TAO_IDL/fe/idl.ll b/TAO/TAO_IDL/fe/idl.ll
index c9777949432..37af731e768 100644
--- a/TAO/TAO_IDL/fe/idl.ll
+++ b/TAO/TAO_IDL/fe/idl.ll
@@ -278,8 +278,8 @@ L"'"\\u([0-9a-fA-F]{1,4})"'" {
idl_global->set_lineno(idl_global->lineno() + 1);
idl_store_pragma(ace_yytext);
}
-^#[ \t]*[0-9]*" ""\""[^\"]*"\""" "[0-9]*{NL} |
-^\?\?=[ \t]*[0-9]*" ""\""[^\"]*"\""" "[0-9]*{NL} {
+^#[ \t]*[0-9]*" ""\""[^\"]*"\""" "[0-9]*([ \t]*[0-9]*)?{NL} |
+^\?\?=[ \t]*[0-9]*" ""\""[^\"]*"\""" "[0-9]*([ \t]*[0-9]*)?{NL} {
idl_parse_line_and_file(ace_yytext);
}
^#[ \t]*[0-9]*" ""\""[^\"]*"\""{NL} |
diff --git a/TAO/TAO_IDL/fe/lex.yy.cpp b/TAO/TAO_IDL/fe/lex.yy.cpp
index 0f8f90f4934..ae959fdaaec 100644
--- a/TAO/TAO_IDL/fe/lex.yy.cpp
+++ b/TAO/TAO_IDL/fe/lex.yy.cpp
@@ -283,7 +283,7 @@ static void tao_yy_fatal_error TAO_YY_PROTO(( tao_yyconst char msg[] ));
#define TAO_YY_NUM_RULES 82
#define TAO_YY_END_OF_BUFFER 83
-static tao_yyconst short int tao_yy_accept[412] =
+static tao_yyconst short int tao_yy_accept[416] =
{ 0,
79, 79, 83, 81, 79, 80, 80, 81, 81, 81,
81, 81, 56, 52, 81, 81, 81, 48, 48, 48,
@@ -320,17 +320,17 @@ static tao_yyconst short int tao_yy_accept[412] =
48, 48, 32, 48, 21, 48, 48, 2, 30, 44,
48, 35, 3, 48, 48, 13, 11, 48, 17, 48,
- 48, 48, 48, 48, 67, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 48, 48, 27,
- 7, 19, 48, 48, 34, 48, 48, 48, 48, 10,
- 48, 48, 14, 0, 75, 75, 0, 71, 0, 0,
- 70, 0, 0, 0, 0, 0, 0, 31, 48, 48,
- 48, 4, 15, 36, 48, 24, 48, 0, 0, 0,
- 68, 0, 0, 0, 0, 0, 0, 5, 6, 8,
- 48, 38, 0, 65, 65, 0, 76, 76, 0, 0,
-
- 0, 48, 0, 0, 0, 37, 72, 0, 66, 66,
- 0
+ 48, 48, 48, 48, 0, 67, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 48, 48,
+ 27, 7, 19, 48, 48, 34, 48, 48, 48, 48,
+ 10, 48, 48, 14, 0, 0, 75, 75, 0, 71,
+ 0, 0, 70, 0, 0, 0, 0, 0, 0, 31,
+ 48, 48, 48, 4, 15, 36, 48, 24, 48, 0,
+ 0, 0, 0, 68, 0, 0, 0, 0, 0, 0,
+ 5, 6, 8, 48, 38, 0, 65, 65, 0, 0,
+
+ 76, 76, 0, 0, 0, 48, 0, 0, 0, 37,
+ 72, 0, 66, 66, 0
} ;
static tao_yyconst int tao_yy_ec[256] =
@@ -375,111 +375,111 @@ static tao_yyconst int tao_yy_meta[58] =
6, 8, 6, 8, 6, 6, 6
} ;
-static tao_yyconst short int tao_yy_base[437] =
+static tao_yyconst short int tao_yy_base[441] =
{ 0,
- 0, 51, 826, 827, 57, 827, 827, 54, 792, 49,
- 52, 60, 62, 67, 807, 805, 802, 0, 799, 82,
- 792, 53, 772, 50, 57, 24, 774, 771, 769, 768,
- 779, 47, 45, 36, 68, 52, 767, 77, 71, 123,
- 791, 109, 107, 827, 0, 803, 121, 101, 118, 131,
- 164, 827, 148, 144, 170, 181, 196, 0, 201, 827,
- 827, 827, 0, 783, 135, 776, 777, 756, 749, 753,
- 757, 752, 767, 755, 749, 759, 745, 744, 759, 748,
- 129, 748, 755, 740, 739, 751, 737, 745, 751, 743,
- 750, 735, 736, 732, 733, 737, 726, 730, 105, 733,
-
- 733, 733, 722, 729, 827, 143, 218, 734, 728, 720,
- 750, 157, 827, 760, 759, 184, 758, 212, 0, 229,
- 244, 827, 197, 827, 226, 0, 234, 247, 0, 736,
- 169, 827, 711, 755, 111, 738, 709, 0, 710, 715,
- 719, 707, 110, 704, 720, 718, 708, 713, 716, 698,
- 696, 709, 706, 693, 702, 705, 688, 0, 688, 697,
- 689, 701, 685, 687, 130, 688, 683, 688, 694, 685,
- 688, 677, 691, 693, 677, 720, 719, 685, 677, 687,
- 290, 827, 827, 223, 713, 0, 250, 263, 827, 696,
- 0, 827, 0, 0, 669, 675, 678, 0, 0, 664,
-
- 676, 667, 660, 668, 0, 663, 658, 0, 657, 658,
- 0, 663, 652, 653, 669, 668, 659, 662, 653, 660,
- 646, 651, 659, 648, 657, 656, 654, 645, 649, 650,
- 0, 638, 644, 680, 277, 639, 645, 642, 638, 827,
- 208, 305, 643, 637, 629, 827, 670, 827, 669, 0,
- 333, 668, 640, 638, 638, 0, 616, 626, 626, 630,
- 616, 0, 0, 627, 627, 626, 0, 566, 559, 562,
- 544, 546, 543, 0, 536, 522, 515, 512, 503, 495,
- 0, 487, 468, 0, 463, 827, 309, 455, 313, 460,
- 498, 497, 463, 455, 464, 360, 827, 489, 458, 441,
-
- 438, 423, 0, 414, 0, 419, 425, 0, 0, 0,
- 420, 0, 0, 409, 404, 0, 0, 388, 0, 387,
- 393, 385, 359, 371, 827, 338, 280, 330, 399, 376,
- 403, 357, 348, 347, 339, 407, 371, 325, 315, 0,
- 0, 0, 318, 314, 0, 293, 304, 289, 302, 0,
- 298, 283, 0, 293, 827, 296, 385, 827, 316, 265,
- 827, 434, 264, 449, 257, 213, 281, 0, 247, 239,
- 236, 0, 0, 0, 235, 0, 230, 251, 360, 389,
- 827, 453, 404, 456, 471, 412, 221, 0, 0, 0,
- 198, 0, 415, 827, 431, 475, 827, 477, 229, 159,
-
- 271, 115, 125, 479, 485, 0, 827, 487, 827, 489,
- 827, 510, 518, 522, 528, 536, 544, 548, 555, 563,
- 568, 571, 578, 583, 586, 589, 593, 600, 605, 612,
- 617, 624, 632, 640, 648, 656
+ 0, 51, 862, 863, 57, 863, 863, 54, 828, 49,
+ 52, 60, 62, 67, 843, 841, 838, 0, 835, 82,
+ 828, 53, 808, 50, 57, 24, 810, 807, 805, 804,
+ 815, 47, 45, 36, 68, 52, 803, 77, 71, 123,
+ 827, 109, 107, 863, 0, 839, 121, 101, 118, 131,
+ 164, 863, 148, 144, 170, 181, 196, 0, 201, 863,
+ 863, 863, 0, 819, 135, 812, 813, 792, 785, 789,
+ 793, 788, 803, 791, 785, 795, 781, 780, 795, 784,
+ 129, 784, 791, 776, 775, 787, 773, 781, 787, 779,
+ 786, 771, 772, 768, 769, 773, 762, 766, 105, 769,
+
+ 769, 769, 758, 765, 863, 143, 218, 770, 764, 756,
+ 786, 157, 863, 796, 795, 184, 794, 212, 0, 229,
+ 244, 863, 197, 863, 226, 0, 234, 247, 0, 772,
+ 169, 863, 747, 791, 111, 774, 745, 0, 746, 751,
+ 755, 743, 110, 740, 756, 754, 744, 749, 752, 734,
+ 732, 745, 742, 729, 738, 741, 724, 0, 724, 733,
+ 725, 737, 721, 723, 130, 724, 719, 724, 730, 721,
+ 724, 713, 727, 729, 713, 756, 755, 721, 713, 723,
+ 290, 863, 863, 223, 749, 0, 250, 263, 863, 732,
+ 0, 863, 0, 0, 705, 711, 714, 0, 0, 700,
+
+ 712, 703, 696, 704, 0, 699, 694, 0, 693, 694,
+ 0, 699, 688, 689, 705, 704, 695, 698, 689, 696,
+ 682, 687, 695, 684, 693, 692, 690, 681, 685, 686,
+ 0, 674, 680, 716, 277, 675, 681, 637, 622, 863,
+ 208, 305, 616, 607, 597, 863, 636, 863, 624, 0,
+ 333, 621, 585, 573, 558, 0, 533, 543, 531, 525,
+ 510, 0, 0, 520, 520, 519, 0, 500, 504, 517,
+ 502, 506, 505, 0, 509, 497, 491, 497, 497, 489,
+ 0, 480, 460, 0, 465, 863, 338, 452, 313, 458,
+ 494, 493, 451, 443, 450, 360, 863, 468, 438, 411,
+
+ 417, 405, 0, 404, 0, 408, 415, 0, 0, 0,
+ 410, 0, 0, 403, 405, 0, 0, 383, 0, 368,
+ 379, 376, 352, 353, 387, 863, 402, 280, 330, 422,
+ 358, 375, 309, 333, 328, 324, 430, 356, 299, 298,
+ 0, 0, 0, 290, 299, 0, 274, 286, 273, 288,
+ 0, 284, 268, 0, 418, 296, 863, 357, 408, 863,
+ 296, 265, 863, 457, 245, 472, 251, 213, 281, 0,
+ 247, 239, 236, 0, 0, 0, 235, 0, 230, 251,
+ 359, 427, 477, 863, 492, 437, 500, 515, 372, 221,
+ 0, 0, 0, 198, 0, 480, 863, 506, 519, 515,
+
+ 863, 521, 229, 159, 271, 115, 125, 534, 540, 0,
+ 863, 542, 863, 544, 863, 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[437] =
+static tao_yyconst short int tao_yy_def[441] =
{ 0,
- 411, 1, 411, 411, 411, 411, 411, 412, 413, 411,
- 411, 411, 411, 411, 411, 411, 411, 414, 414, 414,
- 414, 414, 414, 414, 414, 414, 414, 414, 414, 414,
- 414, 414, 414, 414, 414, 414, 414, 414, 414, 411,
- 411, 411, 412, 411, 415, 411, 416, 411, 411, 411,
- 411, 411, 417, 51, 411, 411, 411, 418, 411, 411,
- 411, 411, 414, 414, 419, 420, 414, 414, 414, 414,
- 414, 414, 414, 414, 414, 414, 414, 414, 414, 414,
- 414, 414, 414, 414, 414, 414, 414, 414, 414, 414,
- 414, 414, 414, 414, 414, 414, 414, 414, 414, 414,
-
- 414, 414, 414, 40, 411, 40, 411, 411, 411, 411,
- 411, 412, 411, 411, 411, 411, 421, 411, 422, 411,
- 411, 411, 417, 411, 417, 54, 411, 411, 418, 414,
- 419, 411, 411, 411, 411, 414, 414, 414, 414, 414,
- 414, 414, 414, 414, 414, 414, 414, 414, 414, 414,
- 414, 414, 414, 414, 414, 414, 414, 414, 414, 414,
- 414, 414, 414, 414, 414, 414, 414, 414, 414, 414,
- 414, 414, 414, 414, 414, 423, 411, 411, 411, 411,
- 411, 411, 411, 411, 424, 422, 411, 411, 411, 414,
- 425, 411, 426, 414, 414, 414, 414, 414, 414, 414,
-
- 414, 414, 414, 414, 414, 414, 414, 414, 414, 414,
- 414, 414, 414, 414, 414, 414, 414, 414, 414, 414,
- 414, 414, 414, 414, 414, 414, 414, 414, 414, 414,
- 414, 414, 414, 423, 411, 411, 411, 411, 181, 411,
- 181, 411, 411, 411, 411, 411, 411, 411, 411, 414,
- 419, 427, 414, 414, 414, 414, 414, 414, 414, 414,
- 414, 414, 414, 414, 414, 414, 414, 414, 414, 414,
- 414, 414, 414, 414, 414, 414, 414, 414, 414, 414,
- 414, 414, 414, 414, 414, 411, 411, 411, 411, 411,
- 428, 411, 411, 411, 411, 251, 411, 429, 414, 414,
-
- 414, 414, 414, 414, 414, 414, 414, 414, 414, 414,
- 414, 414, 414, 414, 414, 414, 414, 414, 414, 414,
- 414, 414, 414, 414, 411, 411, 430, 411, 411, 411,
- 428, 411, 411, 411, 411, 251, 431, 414, 414, 414,
- 414, 414, 414, 414, 414, 414, 414, 414, 414, 414,
- 414, 414, 414, 430, 411, 430, 411, 411, 432, 411,
- 411, 411, 411, 411, 411, 419, 411, 414, 414, 414,
- 414, 414, 414, 414, 414, 414, 414, 432, 411, 433,
- 411, 411, 434, 411, 411, 411, 411, 414, 414, 414,
- 414, 414, 433, 411, 433, 434, 411, 434, 435, 411,
-
- 411, 414, 435, 411, 436, 414, 411, 436, 411, 436,
- 0, 411, 411, 411, 411, 411, 411, 411, 411, 411,
- 411, 411, 411, 411, 411, 411, 411, 411, 411, 411,
- 411, 411, 411, 411, 411, 411
+ 415, 1, 415, 415, 415, 415, 415, 416, 417, 415,
+ 415, 415, 415, 415, 415, 415, 415, 418, 418, 418,
+ 418, 418, 418, 418, 418, 418, 418, 418, 418, 418,
+ 418, 418, 418, 418, 418, 418, 418, 418, 418, 415,
+ 415, 415, 416, 415, 419, 415, 420, 415, 415, 415,
+ 415, 415, 421, 51, 415, 415, 415, 422, 415, 415,
+ 415, 415, 418, 418, 423, 424, 418, 418, 418, 418,
+ 418, 418, 418, 418, 418, 418, 418, 418, 418, 418,
+ 418, 418, 418, 418, 418, 418, 418, 418, 418, 418,
+ 418, 418, 418, 418, 418, 418, 418, 418, 418, 418,
+
+ 418, 418, 418, 40, 415, 40, 415, 415, 415, 415,
+ 415, 416, 415, 415, 415, 415, 425, 415, 426, 415,
+ 415, 415, 421, 415, 421, 54, 415, 415, 422, 418,
+ 423, 415, 415, 415, 415, 418, 418, 418, 418, 418,
+ 418, 418, 418, 418, 418, 418, 418, 418, 418, 418,
+ 418, 418, 418, 418, 418, 418, 418, 418, 418, 418,
+ 418, 418, 418, 418, 418, 418, 418, 418, 418, 418,
+ 418, 418, 418, 418, 418, 427, 415, 415, 415, 415,
+ 415, 415, 415, 415, 428, 426, 415, 415, 415, 418,
+ 429, 415, 430, 418, 418, 418, 418, 418, 418, 418,
+
+ 418, 418, 418, 418, 418, 418, 418, 418, 418, 418,
+ 418, 418, 418, 418, 418, 418, 418, 418, 418, 418,
+ 418, 418, 418, 418, 418, 418, 418, 418, 418, 418,
+ 418, 418, 418, 427, 415, 415, 415, 415, 181, 415,
+ 181, 415, 415, 415, 415, 415, 415, 415, 415, 418,
+ 423, 431, 418, 418, 418, 418, 418, 418, 418, 418,
+ 418, 418, 418, 418, 418, 418, 418, 418, 418, 418,
+ 418, 418, 418, 418, 418, 418, 418, 418, 418, 418,
+ 418, 418, 418, 418, 418, 415, 415, 415, 415, 415,
+ 432, 415, 415, 415, 415, 251, 415, 433, 418, 418,
+
+ 418, 418, 418, 418, 418, 418, 418, 418, 418, 418,
+ 418, 418, 418, 418, 418, 418, 418, 418, 418, 418,
+ 418, 418, 418, 418, 415, 415, 415, 434, 415, 415,
+ 415, 432, 415, 415, 415, 415, 251, 435, 418, 418,
+ 418, 418, 418, 418, 418, 418, 418, 418, 418, 418,
+ 418, 418, 418, 418, 415, 434, 415, 434, 415, 415,
+ 436, 415, 415, 415, 415, 415, 415, 423, 415, 418,
+ 418, 418, 418, 418, 418, 418, 418, 418, 418, 436,
+ 415, 437, 415, 415, 415, 438, 415, 415, 415, 415,
+ 418, 418, 418, 418, 418, 437, 415, 437, 415, 438,
+
+ 415, 438, 439, 415, 415, 418, 439, 415, 440, 418,
+ 415, 440, 415, 440, 0, 415, 415, 415, 415, 415,
+ 415, 415, 415, 415, 415, 415, 415, 415, 415, 415,
+ 415, 415, 415, 415, 415, 415, 415, 415, 415, 415
} ;
-static tao_yyconst short int tao_yy_nxt[885] =
+static tao_yyconst short int tao_yy_nxt[921] =
{ 0,
4, 5, 6, 7, 5, 8, 4, 9, 4, 4,
10, 11, 12, 13, 14, 14, 15, 16, 4, 17,
@@ -495,92 +495,96 @@ static tao_yyconst short int tao_yy_nxt[885] =
57, 97, 75, 77, 70, 57, 92, 102, 98, 93,
42, 100, 44, 42, 51, 51, 51, 58, 192, 94,
95, 103, 96, 101, 104, 105, 105, 106, 115, 54,
- 404, 118, 118, 56, 116, 116, 107, 107, 107, 45,
+ 408, 118, 118, 56, 116, 116, 107, 107, 107, 45,
132, 57, 54, 105, 120, 120, 120, 170, 176, 119,
- 124, 125, 117, 406, 57, 171, 57, 126, 126, 126,
- 200, 201, 44, 193, 399, 108, 109, 133, 125, 57,
+ 124, 125, 117, 410, 57, 171, 57, 126, 126, 126,
+ 200, 201, 44, 193, 403, 108, 109, 133, 125, 57,
110, 150, 222, 119, 132, 151, 117, 51, 51, 51,
- 152, 54, 223, 55, 55, 56, 411, 121, 122, 45,
+ 152, 54, 223, 55, 55, 56, 415, 121, 122, 45,
122, 183, 54, 57, 56, 56, 56, 184, 184, 124,
125, 133, 121, 122, 57, 127, 127, 122, 57, 128,
128, 128, 54, 291, 59, 59, 59, 125, 132, 57,
105, 105, 177, 54, 57, 118, 118, 56, 124, 125,
- 246, 107, 107, 107, 404, 57, 247, 247, 105, 57,
- 54, 402, 120, 120, 120, 133, 125, 128, 128, 128,
- 57, 411, 57, 187, 187, 401, 379, 188, 188, 188,
- 128, 128, 128, 188, 188, 188, 380, 57, 392, 380,
- 391, 189, 405, 189, 390, 405, 188, 188, 188, 286,
- 286, 287, 355, 356, 389, 388, 189, 122, 297, 122,
- 189, 239, 240, 240, 241, 355, 356, 286, 355, 356,
-
- 356, 387, 122, 242, 242, 242, 122, 240, 240, 292,
- 240, 325, 325, 356, 328, 383, 356, 328, 242, 242,
- 242, 379, 326, 326, 326, 240, 329, 329, 329, 325,
- 377, 328, 243, 244, 328, 376, 375, 245, 132, 374,
- 325, 325, 373, 329, 329, 329, 296, 296, 296, 372,
- 371, 326, 326, 326, 296, 296, 296, 296, 325, 361,
- 361, 362, 358, 358, 370, 133, 369, 296, 296, 296,
- 296, 296, 296, 336, 336, 336, 368, 361, 297, 365,
- 358, 336, 336, 336, 336, 364, 357, 358, 358, 357,
- 359, 394, 395, 363, 336, 336, 336, 336, 336, 336,
-
- 357, 358, 358, 357, 359, 358, 397, 398, 332, 395,
- 360, 353, 329, 329, 329, 352, 400, 394, 395, 358,
- 366, 366, 366, 351, 398, 386, 386, 386, 366, 366,
- 366, 366, 350, 394, 395, 395, 381, 381, 349, 348,
- 347, 366, 366, 366, 366, 366, 366, 382, 382, 382,
- 384, 395, 346, 385, 381, 381, 381, 384, 345, 344,
- 385, 343, 386, 386, 386, 342, 382, 382, 382, 386,
- 386, 386, 384, 381, 341, 385, 399, 397, 398, 397,
- 398, 407, 407, 340, 386, 386, 386, 409, 410, 409,
- 410, 409, 410, 339, 338, 398, 297, 398, 335, 407,
-
- 334, 333, 291, 332, 330, 410, 327, 410, 324, 410,
- 43, 43, 43, 43, 43, 43, 43, 43, 46, 323,
- 46, 46, 46, 46, 46, 46, 63, 63, 63, 63,
- 112, 112, 322, 321, 112, 112, 114, 320, 114, 114,
- 114, 114, 114, 114, 123, 123, 123, 123, 123, 123,
- 123, 123, 129, 319, 129, 131, 131, 131, 131, 131,
- 131, 131, 131, 134, 318, 134, 134, 134, 134, 134,
- 134, 185, 185, 317, 185, 186, 316, 186, 234, 234,
- 234, 234, 234, 234, 234, 234, 249, 249, 315, 249,
- 251, 314, 251, 252, 313, 252, 298, 298, 312, 298,
-
- 331, 331, 331, 331, 331, 331, 331, 331, 337, 337,
- 311, 337, 354, 354, 354, 354, 354, 354, 354, 354,
- 367, 367, 310, 367, 378, 378, 378, 378, 378, 378,
- 378, 378, 393, 393, 393, 393, 393, 393, 393, 393,
- 396, 396, 396, 396, 396, 396, 396, 396, 403, 403,
- 403, 403, 403, 403, 403, 403, 408, 408, 408, 408,
- 408, 408, 408, 408, 309, 308, 307, 306, 305, 304,
- 303, 302, 301, 300, 299, 297, 248, 246, 295, 294,
- 293, 411, 290, 289, 288, 235, 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, 255, 254, 253, 250,
- 248, 238, 237, 236, 176, 235, 233, 232, 231, 230,
- 229, 228, 227, 226, 225, 224, 221, 220, 219, 218,
- 217, 216, 215, 214, 213, 212, 211, 210, 209, 208,
- 207, 206, 205, 204, 203, 202, 199, 198, 197, 196,
- 195, 194, 192, 191, 190, 182, 182, 182, 181, 180,
- 179, 178, 411, 175, 174, 173, 172, 169, 168, 167,
- 166, 165, 164, 163, 162, 161, 160, 159, 158, 157,
- 156, 155, 154, 153, 149, 148, 147, 146, 145, 144,
-
- 143, 142, 141, 140, 139, 138, 137, 136, 135, 130,
- 113, 111, 99, 84, 83, 82, 81, 80, 71, 67,
- 64, 62, 61, 60, 47, 411, 3, 411, 411, 411,
- 411, 411, 411, 411, 411, 411, 411, 411, 411, 411,
- 411, 411, 411, 411, 411, 411, 411, 411, 411, 411,
- 411, 411, 411, 411, 411, 411, 411, 411, 411, 411,
- 411, 411, 411, 411, 411, 411, 411, 411, 411, 411,
- 411, 411, 411, 411, 411, 411, 411, 411, 411, 411,
- 411, 411, 411, 411
+ 246, 107, 107, 107, 408, 57, 247, 247, 105, 57,
+ 54, 406, 120, 120, 120, 133, 125, 128, 128, 128,
+ 57, 415, 57, 187, 187, 405, 381, 188, 188, 188,
+ 128, 128, 128, 188, 188, 188, 382, 57, 395, 382,
+ 394, 189, 409, 189, 393, 409, 188, 188, 188, 286,
+ 286, 287, 357, 358, 392, 391, 189, 122, 297, 122,
+ 189, 239, 240, 240, 241, 390, 386, 286, 357, 358,
+
+ 358, 381, 122, 242, 242, 242, 122, 240, 240, 292,
+ 240, 363, 363, 364, 329, 379, 358, 329, 242, 242,
+ 242, 378, 377, 376, 375, 240, 330, 330, 330, 363,
+ 374, 329, 243, 244, 329, 373, 372, 245, 132, 325,
+ 326, 326, 325, 330, 330, 330, 296, 296, 296, 371,
+ 370, 327, 327, 327, 296, 296, 296, 296, 326, 357,
+ 358, 360, 360, 297, 367, 133, 366, 296, 296, 296,
+ 296, 296, 296, 337, 337, 337, 404, 358, 365, 360,
+ 333, 337, 337, 337, 337, 389, 389, 389, 325, 326,
+ 326, 325, 362, 354, 337, 337, 337, 337, 337, 337,
+
+ 355, 355, 355, 325, 326, 326, 325, 326, 353, 359,
+ 360, 360, 359, 361, 352, 327, 327, 327, 351, 350,
+ 326, 326, 326, 359, 360, 360, 359, 361, 360, 397,
+ 398, 355, 355, 355, 349, 330, 330, 330, 326, 401,
+ 402, 348, 360, 368, 368, 368, 347, 398, 346, 345,
+ 344, 368, 368, 368, 368, 343, 342, 402, 383, 384,
+ 384, 383, 341, 340, 368, 368, 368, 368, 368, 368,
+ 385, 385, 385, 387, 339, 297, 388, 384, 383, 384,
+ 384, 383, 397, 398, 336, 389, 389, 389, 335, 334,
+ 399, 399, 399, 383, 384, 384, 383, 384, 291, 333,
+
+ 398, 387, 331, 328, 388, 385, 385, 385, 397, 398,
+ 324, 323, 384, 389, 389, 389, 387, 401, 402, 388,
+ 403, 384, 384, 401, 402, 322, 398, 321, 389, 389,
+ 389, 320, 399, 399, 399, 402, 411, 411, 319, 384,
+ 318, 402, 413, 414, 413, 414, 413, 414, 317, 316,
+ 315, 314, 313, 312, 411, 311, 310, 309, 308, 307,
+ 414, 306, 414, 305, 414, 43, 43, 43, 43, 43,
+ 43, 43, 43, 46, 304, 46, 46, 46, 46, 46,
+ 46, 63, 63, 63, 63, 112, 112, 303, 302, 112,
+ 112, 114, 301, 114, 114, 114, 114, 114, 114, 123,
+
+ 123, 123, 123, 123, 123, 123, 123, 129, 300, 129,
+ 131, 131, 131, 131, 131, 131, 131, 131, 134, 299,
+ 134, 134, 134, 134, 134, 134, 185, 185, 297, 185,
+ 186, 248, 186, 234, 234, 234, 234, 234, 234, 234,
+ 234, 249, 249, 246, 249, 251, 295, 251, 252, 294,
+ 252, 298, 298, 293, 298, 332, 332, 332, 332, 332,
+ 332, 332, 332, 338, 338, 415, 338, 356, 356, 356,
+ 356, 356, 356, 356, 356, 369, 369, 290, 369, 380,
+ 380, 380, 380, 380, 380, 380, 380, 396, 396, 396,
+ 396, 396, 396, 396, 396, 400, 400, 400, 400, 400,
+
+ 400, 400, 400, 407, 407, 407, 407, 407, 407, 407,
+ 407, 412, 412, 412, 412, 412, 412, 412, 412, 289,
+ 288, 235, 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, 255, 254, 253, 250, 248, 238, 237, 236,
+ 176, 235, 233, 232, 231, 230, 229, 228, 227, 226,
+ 225, 224, 221, 220, 219, 218, 217, 216, 215, 214,
+ 213, 212, 211, 210, 209, 208, 207, 206, 205, 204,
+ 203, 202, 199, 198, 197, 196, 195, 194, 192, 191,
+
+ 190, 182, 182, 182, 181, 180, 179, 178, 415, 175,
+ 174, 173, 172, 169, 168, 167, 166, 165, 164, 163,
+ 162, 161, 160, 159, 158, 157, 156, 155, 154, 153,
+ 149, 148, 147, 146, 145, 144, 143, 142, 141, 140,
+ 139, 138, 137, 136, 135, 130, 113, 111, 99, 84,
+ 83, 82, 81, 80, 71, 67, 64, 62, 61, 60,
+ 47, 415, 3, 415, 415, 415, 415, 415, 415, 415,
+ 415, 415, 415, 415, 415, 415, 415, 415, 415, 415,
+ 415, 415, 415, 415, 415, 415, 415, 415, 415, 415,
+ 415, 415, 415, 415, 415, 415, 415, 415, 415, 415,
+
+ 415, 415, 415, 415, 415, 415, 415, 415, 415, 415,
+ 415, 415, 415, 415, 415, 415, 415, 415, 415, 415
} ;
-static tao_yyconst short int tao_yy_chk[885] =
+static tao_yyconst short int tao_yy_chk[921] =
{ 0,
1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
@@ -596,89 +600,93 @@ static tao_yyconst short int tao_yy_chk[885] =
13, 36, 24, 25, 22, 14, 35, 39, 36, 35,
42, 38, 43, 42, 48, 48, 48, 13, 135, 35,
35, 39, 35, 38, 40, 40, 40, 40, 47, 49,
- 403, 49, 49, 49, 47, 47, 40, 40, 40, 43,
+ 407, 49, 49, 49, 47, 47, 40, 40, 40, 43,
65, 49, 50, 40, 50, 50, 50, 99, 106, 49,
- 53, 53, 47, 402, 50, 99, 49, 54, 54, 54,
- 143, 143, 112, 135, 400, 40, 40, 65, 53, 50,
+ 53, 53, 47, 406, 50, 99, 49, 54, 54, 54,
+ 143, 143, 112, 135, 404, 40, 40, 65, 53, 50,
40, 81, 165, 49, 131, 81, 47, 51, 51, 51,
81, 55, 165, 55, 55, 55, 106, 51, 51, 112,
51, 116, 56, 55, 56, 56, 56, 116, 116, 123,
123, 131, 51, 51, 56, 57, 57, 51, 55, 57,
- 57, 57, 59, 241, 59, 59, 59, 123, 366, 56,
+ 57, 57, 59, 241, 59, 59, 59, 123, 368, 56,
107, 107, 107, 118, 59, 118, 118, 118, 125, 125,
- 184, 107, 107, 107, 399, 118, 184, 184, 107, 59,
- 120, 391, 120, 120, 120, 366, 125, 127, 127, 127,
- 118, 241, 120, 121, 121, 387, 378, 121, 121, 121,
- 128, 128, 128, 187, 187, 187, 360, 120, 377, 360,
- 375, 128, 401, 128, 371, 401, 188, 188, 188, 235,
- 235, 235, 327, 327, 370, 369, 128, 188, 367, 188,
- 128, 181, 181, 181, 181, 354, 354, 235, 356, 356,
-
- 327, 365, 188, 181, 181, 181, 188, 242, 242, 242,
- 181, 287, 287, 354, 289, 363, 356, 289, 242, 242,
- 242, 359, 287, 287, 287, 242, 289, 289, 289, 287,
- 352, 328, 181, 181, 328, 351, 349, 181, 251, 348,
- 326, 326, 347, 328, 328, 328, 251, 251, 251, 346,
- 344, 326, 326, 326, 251, 251, 251, 251, 326, 332,
- 332, 332, 379, 379, 343, 251, 339, 251, 251, 251,
- 251, 251, 251, 296, 296, 296, 338, 332, 337, 335,
- 379, 296, 296, 296, 296, 334, 357, 357, 357, 357,
- 357, 380, 380, 333, 296, 296, 296, 296, 296, 296,
-
- 329, 329, 329, 329, 329, 357, 383, 383, 331, 380,
- 330, 324, 329, 329, 329, 323, 386, 393, 393, 329,
- 336, 336, 336, 322, 383, 386, 386, 386, 336, 336,
- 336, 336, 321, 395, 395, 393, 362, 362, 320, 318,
- 315, 336, 336, 336, 336, 336, 336, 362, 362, 362,
- 364, 395, 314, 364, 362, 382, 382, 384, 311, 307,
- 384, 306, 364, 364, 364, 304, 382, 382, 382, 384,
- 384, 384, 385, 382, 302, 385, 385, 396, 396, 398,
- 398, 404, 404, 301, 385, 385, 385, 405, 405, 408,
- 408, 410, 410, 300, 299, 396, 298, 398, 295, 404,
-
- 294, 293, 292, 291, 290, 405, 288, 408, 285, 410,
- 412, 412, 412, 412, 412, 412, 412, 412, 413, 283,
- 413, 413, 413, 413, 413, 413, 414, 414, 414, 414,
- 415, 415, 282, 280, 415, 415, 416, 279, 416, 416,
- 416, 416, 416, 416, 417, 417, 417, 417, 417, 417,
- 417, 417, 418, 278, 418, 419, 419, 419, 419, 419,
- 419, 419, 419, 420, 277, 420, 420, 420, 420, 420,
- 420, 421, 421, 276, 421, 422, 275, 422, 423, 423,
- 423, 423, 423, 423, 423, 423, 424, 424, 273, 424,
- 425, 272, 425, 426, 271, 426, 427, 427, 270, 427,
-
- 428, 428, 428, 428, 428, 428, 428, 428, 429, 429,
- 269, 429, 430, 430, 430, 430, 430, 430, 430, 430,
- 431, 431, 268, 431, 432, 432, 432, 432, 432, 432,
- 432, 432, 433, 433, 433, 433, 433, 433, 433, 433,
- 434, 434, 434, 434, 434, 434, 434, 434, 435, 435,
- 435, 435, 435, 435, 435, 435, 436, 436, 436, 436,
- 436, 436, 436, 436, 266, 265, 264, 261, 260, 259,
- 258, 257, 255, 254, 253, 252, 249, 247, 245, 244,
- 243, 239, 238, 237, 236, 234, 233, 232, 230, 229,
- 228, 227, 226, 225, 224, 223, 222, 221, 220, 219,
-
- 218, 217, 216, 215, 214, 213, 212, 210, 209, 207,
- 206, 204, 203, 202, 201, 200, 197, 196, 195, 190,
- 185, 180, 179, 178, 177, 176, 175, 174, 173, 172,
- 171, 170, 169, 168, 167, 166, 164, 163, 162, 161,
- 160, 159, 157, 156, 155, 154, 153, 152, 151, 150,
- 149, 148, 147, 146, 145, 144, 142, 141, 140, 139,
- 137, 136, 134, 133, 130, 117, 115, 114, 111, 110,
- 109, 108, 104, 103, 102, 101, 100, 98, 97, 96,
- 95, 94, 93, 92, 91, 90, 89, 88, 87, 86,
- 85, 84, 83, 82, 80, 79, 78, 77, 76, 75,
-
- 74, 73, 72, 71, 70, 69, 68, 67, 66, 64,
- 46, 41, 37, 31, 30, 29, 28, 27, 23, 21,
- 19, 17, 16, 15, 9, 3, 411, 411, 411, 411,
- 411, 411, 411, 411, 411, 411, 411, 411, 411, 411,
- 411, 411, 411, 411, 411, 411, 411, 411, 411, 411,
- 411, 411, 411, 411, 411, 411, 411, 411, 411, 411,
- 411, 411, 411, 411, 411, 411, 411, 411, 411, 411,
- 411, 411, 411, 411, 411, 411, 411, 411, 411, 411,
- 411, 411, 411, 411
+ 184, 107, 107, 107, 403, 118, 184, 184, 107, 59,
+ 120, 394, 120, 120, 120, 368, 125, 127, 127, 127,
+ 118, 241, 120, 121, 121, 390, 380, 121, 121, 121,
+ 128, 128, 128, 187, 187, 187, 362, 120, 379, 362,
+ 377, 128, 405, 128, 373, 405, 188, 188, 188, 235,
+ 235, 235, 328, 328, 372, 371, 128, 188, 369, 188,
+ 128, 181, 181, 181, 181, 367, 365, 235, 356, 356,
+
+ 328, 361, 188, 181, 181, 181, 188, 242, 242, 242,
+ 181, 333, 333, 333, 289, 353, 356, 289, 242, 242,
+ 242, 352, 350, 349, 348, 242, 289, 289, 289, 333,
+ 347, 329, 181, 181, 329, 345, 344, 181, 251, 287,
+ 287, 287, 287, 329, 329, 329, 251, 251, 251, 340,
+ 339, 287, 287, 287, 251, 251, 251, 251, 287, 358,
+ 358, 381, 381, 338, 336, 251, 335, 251, 251, 251,
+ 251, 251, 251, 296, 296, 296, 389, 358, 334, 381,
+ 332, 296, 296, 296, 296, 389, 389, 389, 325, 325,
+ 325, 325, 331, 324, 296, 296, 296, 296, 296, 296,
+
+ 325, 325, 325, 327, 327, 327, 327, 325, 323, 359,
+ 359, 359, 359, 359, 322, 327, 327, 327, 321, 320,
+ 355, 355, 327, 330, 330, 330, 330, 330, 359, 382,
+ 382, 355, 355, 355, 318, 330, 330, 330, 355, 386,
+ 386, 315, 330, 337, 337, 337, 314, 382, 311, 307,
+ 306, 337, 337, 337, 337, 304, 302, 386, 364, 364,
+ 364, 364, 301, 300, 337, 337, 337, 337, 337, 337,
+ 364, 364, 364, 366, 299, 298, 366, 364, 383, 383,
+ 383, 383, 396, 396, 295, 366, 366, 366, 294, 293,
+ 383, 383, 383, 385, 385, 385, 385, 383, 292, 291,
+
+ 396, 387, 290, 288, 387, 385, 385, 385, 398, 398,
+ 285, 283, 385, 387, 387, 387, 388, 400, 400, 388,
+ 388, 399, 399, 402, 402, 282, 398, 280, 388, 388,
+ 388, 279, 399, 399, 399, 400, 408, 408, 278, 399,
+ 277, 402, 409, 409, 412, 412, 414, 414, 276, 275,
+ 273, 272, 271, 270, 408, 269, 268, 266, 265, 264,
+ 409, 261, 412, 260, 414, 416, 416, 416, 416, 416,
+ 416, 416, 416, 417, 259, 417, 417, 417, 417, 417,
+ 417, 418, 418, 418, 418, 419, 419, 258, 257, 419,
+ 419, 420, 255, 420, 420, 420, 420, 420, 420, 421,
+
+ 421, 421, 421, 421, 421, 421, 421, 422, 254, 422,
+ 423, 423, 423, 423, 423, 423, 423, 423, 424, 253,
+ 424, 424, 424, 424, 424, 424, 425, 425, 252, 425,
+ 426, 249, 426, 427, 427, 427, 427, 427, 427, 427,
+ 427, 428, 428, 247, 428, 429, 245, 429, 430, 244,
+ 430, 431, 431, 243, 431, 432, 432, 432, 432, 432,
+ 432, 432, 432, 433, 433, 239, 433, 434, 434, 434,
+ 434, 434, 434, 434, 434, 435, 435, 238, 435, 436,
+ 436, 436, 436, 436, 436, 436, 436, 437, 437, 437,
+ 437, 437, 437, 437, 437, 438, 438, 438, 438, 438,
+
+ 438, 438, 438, 439, 439, 439, 439, 439, 439, 439,
+ 439, 440, 440, 440, 440, 440, 440, 440, 440, 237,
+ 236, 234, 233, 232, 230, 229, 228, 227, 226, 225,
+ 224, 223, 222, 221, 220, 219, 218, 217, 216, 215,
+ 214, 213, 212, 210, 209, 207, 206, 204, 203, 202,
+ 201, 200, 197, 196, 195, 190, 185, 180, 179, 178,
+ 177, 176, 175, 174, 173, 172, 171, 170, 169, 168,
+ 167, 166, 164, 163, 162, 161, 160, 159, 157, 156,
+ 155, 154, 153, 152, 151, 150, 149, 148, 147, 146,
+ 145, 144, 142, 141, 140, 139, 137, 136, 134, 133,
+
+ 130, 117, 115, 114, 111, 110, 109, 108, 104, 103,
+ 102, 101, 100, 98, 97, 96, 95, 94, 93, 92,
+ 91, 90, 89, 88, 87, 86, 85, 84, 83, 82,
+ 80, 79, 78, 77, 76, 75, 74, 73, 72, 71,
+ 70, 69, 68, 67, 66, 64, 46, 41, 37, 31,
+ 30, 29, 28, 27, 23, 21, 19, 17, 16, 15,
+ 9, 3, 415, 415, 415, 415, 415, 415, 415, 415,
+ 415, 415, 415, 415, 415, 415, 415, 415, 415, 415,
+ 415, 415, 415, 415, 415, 415, 415, 415, 415, 415,
+ 415, 415, 415, 415, 415, 415, 415, 415, 415, 415,
+
+ 415, 415, 415, 415, 415, 415, 415, 415, 415, 415,
+ 415, 415, 415, 415, 415, 415, 415, 415, 415, 415
} ;
static tao_yy_state_type tao_yy_last_accepting_state;
@@ -700,7 +708,7 @@ char *tao_yytext_ptr;
#line 1 "fe/idl.ll"
#define INITIAL 0
#line 2 "fe/idl.ll"
-/* $Id: idl.ll,v 1.41 1999/08/12 21:49:27 parsons Exp $
+/* $Id: idl.ll,v 1.43 1999/08/13 21:29:15 parsons Exp $
COPYRIGHT
@@ -955,7 +963,7 @@ TAO_YY_MALLOC_DECL
/* Code executed at the end of each rule. */
#ifndef TAO_YY_BREAK
-#define TAO_YY_BREAK ACE_NOTREACHED (break;)
+#define TAO_YY_BREAK break;
#endif
#define TAO_YY_RULE_SETUP \
@@ -967,7 +975,7 @@ TAO_YY_MALLOC_DECL
TAO_YY_DECL
{
register tao_yy_state_type tao_yy_current_state;
- register char *tao_yy_cp = 0, *tao_yy_bp = 0;
+ register char *tao_yy_cp, *tao_yy_bp;
register int tao_yy_act;
#line 126 "fe/idl.ll"
@@ -1024,13 +1032,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 >= 412 )
+ if ( tao_yy_current_state >= 416 )
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] != 827 );
+ while ( tao_yy_base[tao_yy_current_state] != 863 );
tao_yy_find_action:
tao_yy_act = tao_yy_accept[tao_yy_current_state];
@@ -1462,7 +1470,7 @@ TAO_YY_RULE_SETUP
idl_global->set_lineno(idl_global->lineno() + 1);
idl_store_pragma(ace_tao_yytext);
}
- break;
+ TAO_YY_BREAK
case 67:
#line 282 "fe/idl.ll"
case 68:
@@ -1471,7 +1479,7 @@ TAO_YY_RULE_SETUP
{
idl_parse_line_and_file(ace_tao_yytext);
}
- break;
+ TAO_YY_BREAK
case 69:
#line 286 "fe/idl.ll"
case 70:
@@ -1480,7 +1488,7 @@ TAO_YY_RULE_SETUP
{
idl_parse_line_and_file(ace_tao_yytext);
}
- break;
+ TAO_YY_BREAK
case 71:
#line 290 "fe/idl.ll"
case 72:
@@ -1489,7 +1497,7 @@ TAO_YY_RULE_SETUP
{
idl_parse_line_and_file(ace_tao_yytext);
}
- break;
+ TAO_YY_BREAK
case 73:
#line 294 "fe/idl.ll"
case 74:
@@ -1498,7 +1506,7 @@ TAO_YY_RULE_SETUP
{
idl_parse_line_and_file(ace_tao_yytext);
}
- break;
+ TAO_YY_BREAK
case 75:
#line 298 "fe/idl.ll"
case 76:
@@ -1508,7 +1516,7 @@ TAO_YY_RULE_SETUP
/* ignore cpp ident */
idl_global->set_lineno(idl_global->lineno() + 1);
}
- break;
+ TAO_YY_BREAK
case 77:
TAO_YY_RULE_SETUP
#line 302 "fe/idl.ll"
@@ -1516,7 +1524,7 @@ TAO_YY_RULE_SETUP
/* ignore comments */
idl_global->set_lineno(idl_global->lineno() + 1);
}
- break;
+ TAO_YY_BREAK
case 78:
TAO_YY_RULE_SETUP
#line 306 "fe/idl.ll"
@@ -1534,19 +1542,19 @@ TAO_YY_RULE_SETUP
}
}
}
- break;
+ TAO_YY_BREAK
case 79:
TAO_YY_RULE_SETUP
#line 320 "fe/idl.ll"
;
- break;
+ TAO_YY_BREAK
case 80:
TAO_YY_RULE_SETUP
#line 321 "fe/idl.ll"
{
idl_global->set_lineno(idl_global->lineno() + 1);
}
- break;
+ TAO_YY_BREAK
case 81:
TAO_YY_RULE_SETUP
#line 324 "fe/idl.ll"
@@ -1556,7 +1564,7 @@ case 82:
TAO_YY_RULE_SETUP
#line 326 "fe/idl.ll"
TAO_YY_ECHO;
- break;
+ TAO_YY_BREAK
case TAO_YY_STATE_EOF(INITIAL):
tao_yyterminate();
@@ -1849,7 +1857,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 >= 412 )
+ if ( tao_yy_current_state >= 416 )
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];
@@ -1884,11 +1892,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 >= 412 )
+ if ( tao_yy_current_state >= 416 )
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 == 411);
+ tao_yy_is_jam = (tao_yy_current_state == 415);
return tao_yy_is_jam ? 0 : tao_yy_current_state;
}