diff options
| author | parsons <parsons@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2000-02-01 02:27:49 +0000 |
|---|---|---|
| committer | parsons <parsons@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2000-02-01 02:27:49 +0000 |
| commit | abae6bfd515851a392f9cec5019b4b323351ec1b (patch) | |
| tree | 9865f6316775e015bc6462c079c7015bdfcbf0c9 | |
| parent | 45c01e9e69fd8fb33384476cb8b6defed306008f (diff) | |
| download | ATCD-abae6bfd515851a392f9cec5019b4b323351ec1b.tar.gz | |
Added keyword 'fixed' to lexer and parser.
| -rw-r--r-- | TAO/TAO_IDL/fe/idl.ll | 1 | ||||
| -rw-r--r-- | TAO/TAO_IDL/fe/idl.yy | 16 | ||||
| -rw-r--r-- | TAO/TAO_IDL/fe/lex.yy.cpp | 881 | ||||
| -rw-r--r-- | TAO/TAO_IDL/fe/lex.yy.cpp.diff | 60 | ||||
| -rw-r--r-- | TAO/TAO_IDL/fe/y.tab.cpp | 1788 | ||||
| -rw-r--r-- | TAO/TAO_IDL/fe/y.tab.h | 85 |
6 files changed, 1431 insertions, 1400 deletions
diff --git a/TAO/TAO_IDL/fe/idl.ll b/TAO/TAO_IDL/fe/idl.ll index 37af731e768..6c9e4027a24 100644 --- a/TAO/TAO_IDL/fe/idl.ll +++ b/TAO/TAO_IDL/fe/idl.ll @@ -141,6 +141,7 @@ string return IDL_STRING; wstring return IDL_WSTRING; sequence return IDL_SEQUENCE; union return IDL_UNION; +fixed return IDL_FIXED; switch return IDL_SWITCH; case return IDL_CASE; default return IDL_DEFAULT; diff --git a/TAO/TAO_IDL/fe/idl.yy b/TAO/TAO_IDL/fe/idl.yy index 6b19f9d6a4f..2870cc1d3e7 100644 --- a/TAO/TAO_IDL/fe/idl.yy +++ b/TAO/TAO_IDL/fe/idl.yy @@ -12,7 +12,7 @@ license restricting its use. The Interface Definition Language Compiler Front End (CFE) is made available for your use provided that you include this license and copyright -notice on all media and documentation and the software program in which +notice on all media and documentation and the software program in whichlong this product is incorporated in whole or part. You may copy and extend functionality (but may not remove functionality) of the Interface Definition Language CFE without charge, but you are not authorized to @@ -144,6 +144,7 @@ extern int yyleng; %token IDL_WCHAR %token IDL_OCTET %token IDL_BOOLEAN +%token IDL_FIXED %token IDL_ANY %token IDL_STRUCT %token IDL_UNION @@ -227,7 +228,7 @@ extern int yyleng; %type <ffval> element_spec %type <etval> const_type integer_type char_type boolean_type -%type <etval> floating_pt_type any_type signed_int +%type <etval> floating_pt_type any_type fixed_type signed_int %type <etval> unsigned_int base_type_spec octet_type %type <dival> direction @@ -915,6 +916,7 @@ const_type | octet_type | boolean_type | floating_pt_type + | fixed_type | string_type_spec { $$ = AST_Expression::EV_string; @@ -1223,6 +1225,7 @@ base_type_spec | char_type | boolean_type | octet_type + | fixed_type | any_type ; @@ -1370,6 +1373,15 @@ floating_pt_type } ; +fixed_type + : IDL_FIXED + { + cerr << "error in " << idl_global->filename()->get_string() + << " line " << idl_global->lineno() << ":\n" ; + cerr << "Sorry, I (TAO_IDL) can't handle fixed types yet\n"; + } + ; + char_type : IDL_CHAR { diff --git a/TAO/TAO_IDL/fe/lex.yy.cpp b/TAO/TAO_IDL/fe/lex.yy.cpp index f60d039fa8f..aad6b74148f 100644 --- a/TAO/TAO_IDL/fe/lex.yy.cpp +++ b/TAO/TAO_IDL/fe/lex.yy.cpp @@ -281,56 +281,56 @@ 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 82 -#define TAO_YY_END_OF_BUFFER 83 -static tao_yyconst short int tao_yy_accept[416] = +#define TAO_YY_NUM_RULES 83 +#define TAO_YY_END_OF_BUFFER 84 +static tao_yyconst short int tao_yy_accept[420] = { 0, - 79, 79, 83, 81, 79, 80, 80, 81, 81, 81, - 81, 81, 56, 52, 81, 81, 81, 48, 48, 48, - 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, - 48, 48, 48, 48, 48, 48, 48, 48, 48, 81, - 80, 79, 0, 57, 0, 0, 0, 0, 55, 51, - 49, 78, 0, 49, 56, 0, 0, 0, 52, 47, - 45, 46, 48, 48, 0, 0, 48, 48, 48, 48, - 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, - 42, 48, 48, 48, 48, 48, 48, 48, 48, 48, - 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, - - 48, 48, 48, 0, 73, 0, 0, 0, 0, 0, - 0, 0, 59, 0, 59, 0, 0, 55, 0, 51, - 0, 49, 0, 77, 77, 49, 0, 50, 54, 48, - 0, 58, 0, 0, 0, 48, 48, 1, 48, 48, - 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, - 48, 48, 48, 48, 48, 48, 48, 43, 48, 48, - 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, - 48, 48, 48, 48, 48, 0, 0, 0, 0, 0, - 0, 62, 60, 0, 0, 53, 0, 49, 50, 48, - 0, 63, 0, 39, 48, 48, 48, 18, 25, 48, - - 48, 48, 48, 48, 12, 48, 48, 33, 48, 48, - 22, 48, 48, 48, 48, 48, 48, 48, 48, 48, - 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, - 29, 48, 48, 0, 0, 0, 0, 0, 0, 74, - 0, 0, 0, 0, 0, 60, 0, 61, 0, 40, - 0, 0, 48, 48, 48, 9, 48, 48, 48, 48, - 48, 20, 41, 48, 48, 48, 28, 48, 48, 48, - 48, 48, 48, 23, 48, 48, 48, 48, 48, 48, - 16, 48, 48, 26, 48, 69, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 64, 0, 48, 48, - - 48, 48, 32, 48, 21, 48, 48, 2, 30, 44, - 48, 35, 3, 48, 48, 13, 11, 48, 17, 48, - 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 + 80, 80, 84, 82, 80, 81, 81, 82, 82, 82, + 82, 82, 57, 53, 82, 82, 82, 49, 49, 49, + 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, + 49, 49, 49, 49, 49, 49, 49, 49, 49, 82, + 81, 80, 0, 58, 0, 0, 0, 0, 56, 52, + 50, 79, 0, 50, 57, 0, 0, 0, 53, 48, + 46, 47, 49, 49, 0, 0, 49, 49, 49, 49, + 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, + 49, 43, 49, 49, 49, 49, 49, 49, 49, 49, + 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, + + 49, 49, 49, 49, 0, 74, 0, 0, 0, 0, + 0, 0, 0, 60, 0, 60, 0, 0, 56, 0, + 52, 0, 50, 0, 78, 78, 50, 0, 51, 55, + 49, 0, 59, 0, 0, 0, 49, 49, 1, 49, + 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, + 49, 49, 49, 49, 49, 49, 49, 49, 49, 44, + 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, + 49, 49, 49, 49, 49, 49, 49, 0, 0, 0, + 0, 0, 0, 63, 61, 0, 0, 54, 0, 50, + 51, 49, 0, 64, 0, 40, 49, 49, 49, 19, + + 26, 49, 49, 49, 49, 49, 12, 49, 49, 49, + 34, 49, 49, 23, 49, 49, 49, 49, 49, 49, + 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, + 49, 49, 49, 30, 49, 49, 0, 0, 0, 0, + 0, 0, 75, 0, 0, 0, 0, 0, 61, 0, + 62, 0, 41, 0, 0, 49, 49, 49, 9, 49, + 49, 49, 49, 49, 17, 21, 42, 49, 49, 49, + 29, 49, 49, 49, 49, 49, 49, 24, 49, 49, + 49, 49, 49, 49, 16, 49, 49, 27, 49, 70, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + + 65, 0, 49, 49, 49, 49, 33, 49, 22, 49, + 49, 2, 31, 45, 49, 36, 3, 49, 49, 13, + 11, 49, 18, 49, 49, 49, 49, 49, 0, 68, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 49, 49, 28, 7, 20, 49, 49, 35, + 49, 49, 49, 49, 10, 49, 49, 14, 0, 0, + 76, 76, 0, 72, 0, 0, 71, 0, 0, 0, + 0, 0, 0, 32, 49, 49, 49, 4, 15, 37, + 49, 25, 49, 0, 0, 0, 0, 69, 0, 0, + 0, 0, 0, 0, 5, 6, 8, 49, 39, 0, + + 66, 66, 0, 0, 77, 77, 0, 0, 0, 49, + 0, 0, 0, 38, 73, 0, 67, 67, 0 } ; static tao_yyconst int tao_yy_ec[256] = @@ -375,111 +375,113 @@ static tao_yyconst int tao_yy_meta[58] = 6, 8, 6, 8, 6, 6, 6 } ; -static tao_yyconst short int tao_yy_base[441] = +static tao_yyconst short int tao_yy_base[445] = { 0, - 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 + 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, + 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, + 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, + + 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 } ; -static tao_yyconst short int tao_yy_def[441] = +static tao_yyconst short int tao_yy_def[445] = { 0, - 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 + 419, 1, 419, 419, 419, 419, 419, 420, 421, 419, + 419, 419, 419, 419, 419, 419, 419, 422, 422, 422, + 422, 422, 422, 422, 422, 422, 422, 422, 422, 422, + 422, 422, 422, 422, 422, 422, 422, 422, 422, 419, + 419, 419, 420, 419, 423, 419, 424, 419, 419, 419, + 419, 419, 425, 51, 419, 419, 419, 426, 419, 419, + 419, 419, 422, 422, 427, 428, 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, 40, 419, 40, 419, 419, 419, + 419, 419, 420, 419, 419, 419, 419, 429, 419, 430, + 419, 419, 419, 425, 419, 425, 54, 419, 419, 426, + 422, 427, 419, 419, 419, 419, 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, 431, 419, 419, + 419, 419, 419, 419, 419, 419, 432, 430, 419, 419, + 419, 422, 433, 419, 434, 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, 431, 419, 419, 419, + 419, 183, 419, 183, 419, 419, 419, 419, 419, 419, + 419, 419, 422, 427, 435, 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, 419, + 419, 419, 419, 419, 436, 419, 419, 419, 419, 254, + + 419, 437, 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, 419, 419, + 419, 438, 419, 419, 419, 436, 419, 419, 419, 419, + 254, 439, 422, 422, 422, 422, 422, 422, 422, 422, + 422, 422, 422, 422, 422, 422, 422, 422, 419, 438, + 419, 438, 419, 419, 440, 419, 419, 419, 419, 419, + 419, 427, 419, 422, 422, 422, 422, 422, 422, 422, + 422, 422, 422, 440, 419, 441, 419, 419, 419, 442, + 419, 419, 419, 419, 422, 422, 422, 422, 422, 441, + + 419, 441, 419, 442, 419, 442, 443, 419, 419, 422, + 443, 419, 444, 422, 419, 444, 419, 444, 0, 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_nxt[921] = +static tao_yyconst short int tao_yy_nxt[925] = { 0, 4, 5, 6, 7, 5, 8, 4, 9, 4, 4, 10, 11, 12, 13, 14, 14, 15, 16, 4, 17, @@ -488,103 +490,104 @@ static tao_yyconst short int tao_yy_nxt[921] = 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, - 90, 41, 53, 54, 91, 55, 55, 56, 54, 79, - 59, 59, 59, 85, 72, 57, 45, 65, 68, 66, - 57, 73, 86, 58, 88, 76, 74, 89, 69, 87, - - 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, - 408, 118, 118, 56, 116, 116, 107, 107, 107, 45, - 132, 57, 54, 105, 120, 120, 120, 170, 176, 119, - 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, 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, 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 + 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, + 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[921] = +static tao_yyconst short int tao_yy_chk[925] = { 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, @@ -597,96 +600,97 @@ static tao_yyconst short int tao_yy_chk[921] = 14, 14, 14, 32, 24, 13, 8, 20, 22, 20, 14, 24, 32, 13, 33, 25, 24, 33, 22, 32, - 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, - 407, 49, 49, 49, 47, 47, 40, 40, 40, 43, - 65, 49, 50, 40, 50, 50, 50, 99, 106, 49, - 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, 368, 56, - 107, 107, 107, 118, 59, 118, 118, 118, 125, 125, - 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 + 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, + 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; @@ -1032,13 +1036,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 >= 416 ) + if ( tao_yy_current_state >= 420 ) 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] != 863 ); + while ( tao_yy_base[tao_yy_current_state] != 867 ); tao_yy_find_action: tao_yy_act = tao_yy_accept[tao_yy_current_state]; @@ -1147,164 +1151,169 @@ return IDL_UNION; case 17: TAO_YY_RULE_SETUP #line 144 "fe/idl.ll" -return IDL_SWITCH; +return IDL_FIXED; TAO_YY_BREAK case 18: TAO_YY_RULE_SETUP #line 145 "fe/idl.ll" -return IDL_CASE; +return IDL_SWITCH; TAO_YY_BREAK case 19: TAO_YY_RULE_SETUP #line 146 "fe/idl.ll" -return IDL_DEFAULT; +return IDL_CASE; TAO_YY_BREAK case 20: TAO_YY_RULE_SETUP #line 147 "fe/idl.ll" -return IDL_FLOAT; +return IDL_DEFAULT; TAO_YY_BREAK case 21: TAO_YY_RULE_SETUP #line 148 "fe/idl.ll" -return IDL_DOUBLE; +return IDL_FLOAT; TAO_YY_BREAK case 22: TAO_YY_RULE_SETUP #line 149 "fe/idl.ll" -return IDL_LONG; +return IDL_DOUBLE; TAO_YY_BREAK case 23: TAO_YY_RULE_SETUP #line 150 "fe/idl.ll" -return IDL_SHORT; +return IDL_LONG; TAO_YY_BREAK case 24: TAO_YY_RULE_SETUP #line 151 "fe/idl.ll" -return IDL_UNSIGNED; +return IDL_SHORT; TAO_YY_BREAK case 25: TAO_YY_RULE_SETUP #line 152 "fe/idl.ll" -return IDL_CHAR; +return IDL_UNSIGNED; TAO_YY_BREAK case 26: TAO_YY_RULE_SETUP #line 153 "fe/idl.ll" -return IDL_WCHAR; +return IDL_CHAR; TAO_YY_BREAK case 27: TAO_YY_RULE_SETUP #line 154 "fe/idl.ll" -return IDL_BOOLEAN; +return IDL_WCHAR; TAO_YY_BREAK case 28: TAO_YY_RULE_SETUP #line 155 "fe/idl.ll" -return IDL_OCTET; +return IDL_BOOLEAN; TAO_YY_BREAK case 29: TAO_YY_RULE_SETUP #line 156 "fe/idl.ll" -return IDL_VOID; +return IDL_OCTET; TAO_YY_BREAK case 30: TAO_YY_RULE_SETUP #line 157 "fe/idl.ll" -return IDL_NATIVE; +return IDL_VOID; TAO_YY_BREAK case 31: TAO_YY_RULE_SETUP #line 158 "fe/idl.ll" -return scan_obv_token (IDL_ABSTRACT); +return IDL_NATIVE; TAO_YY_BREAK case 32: TAO_YY_RULE_SETUP #line 159 "fe/idl.ll" -return scan_obv_token (IDL_CUSTOM); +return scan_obv_token (IDL_ABSTRACT); TAO_YY_BREAK case 33: TAO_YY_RULE_SETUP #line 160 "fe/idl.ll" -return scan_obv_token (IDL_INIT); +return scan_obv_token (IDL_CUSTOM); TAO_YY_BREAK case 34: TAO_YY_RULE_SETUP #line 161 "fe/idl.ll" -return scan_obv_token (IDL_PRIVATE); +return scan_obv_token (IDL_INIT); TAO_YY_BREAK case 35: TAO_YY_RULE_SETUP #line 162 "fe/idl.ll" -return scan_obv_token (IDL_PUBLIC); +return scan_obv_token (IDL_PRIVATE); TAO_YY_BREAK case 36: TAO_YY_RULE_SETUP #line 163 "fe/idl.ll" -return scan_obv_token (IDL_SUPPORTS); +return scan_obv_token (IDL_PUBLIC); TAO_YY_BREAK case 37: TAO_YY_RULE_SETUP #line 164 "fe/idl.ll" -return scan_obv_token (IDL_TRUNCATABLE); +return scan_obv_token (IDL_SUPPORTS); TAO_YY_BREAK case 38: TAO_YY_RULE_SETUP #line 165 "fe/idl.ll" -return scan_obv_token (IDL_VALUETYPE); +return scan_obv_token (IDL_TRUNCATABLE); TAO_YY_BREAK case 39: TAO_YY_RULE_SETUP -#line 167 "fe/idl.ll" -return IDL_TRUETOK; +#line 166 "fe/idl.ll" +return scan_obv_token (IDL_VALUETYPE); TAO_YY_BREAK case 40: TAO_YY_RULE_SETUP #line 168 "fe/idl.ll" -return IDL_FALSETOK; +return IDL_TRUETOK; TAO_YY_BREAK case 41: TAO_YY_RULE_SETUP -#line 170 "fe/idl.ll" -return IDL_INOUT; +#line 169 "fe/idl.ll" +return IDL_FALSETOK; TAO_YY_BREAK case 42: TAO_YY_RULE_SETUP #line 171 "fe/idl.ll" -return IDL_IN; +return IDL_INOUT; TAO_YY_BREAK case 43: TAO_YY_RULE_SETUP #line 172 "fe/idl.ll" -return IDL_OUT; +return IDL_IN; TAO_YY_BREAK case 44: TAO_YY_RULE_SETUP #line 173 "fe/idl.ll" -return IDL_ONEWAY; +return IDL_OUT; TAO_YY_BREAK case 45: TAO_YY_RULE_SETUP -#line 175 "fe/idl.ll" -return IDL_LEFT_SHIFT; +#line 174 "fe/idl.ll" +return IDL_ONEWAY; TAO_YY_BREAK case 46: TAO_YY_RULE_SETUP #line 176 "fe/idl.ll" -return IDL_RIGHT_SHIFT; +return IDL_LEFT_SHIFT; TAO_YY_BREAK case 47: TAO_YY_RULE_SETUP #line 177 "fe/idl.ll" +return IDL_RIGHT_SHIFT; + TAO_YY_BREAK +case 48: +TAO_YY_RULE_SETUP +#line 178 "fe/idl.ll" { tao_yylval.strval = (char *) "::"; return IDL_SCOPE_DELIMITOR; } TAO_YY_BREAK -case 48: +case 49: TAO_YY_RULE_SETUP -#line 182 "fe/idl.ll" +#line 183 "fe/idl.ll" { // 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++ @@ -1323,73 +1332,73 @@ TAO_YY_RULE_SETUP return IDENTIFIER; } TAO_YY_BREAK -case 49: +case 50: TAO_YY_RULE_SETUP -#line 200 "fe/idl.ll" +#line 201 "fe/idl.ll" { tao_yylval.dval = idl_atof(ace_tao_yytext); return IDL_FLOATING_PT_LITERAL; } TAO_YY_BREAK -case 50: +case 51: TAO_YY_RULE_SETUP -#line 204 "fe/idl.ll" +#line 205 "fe/idl.ll" { tao_yylval.dval = idl_atof(ace_tao_yytext); return IDL_FLOATING_PT_LITERAL; } TAO_YY_BREAK -case 51: +case 52: TAO_YY_RULE_SETUP -#line 209 "fe/idl.ll" +#line 210 "fe/idl.ll" { tao_yylval.ival = idl_atoi(ace_tao_yytext, 10); return IDL_INTEGER_LITERAL; } TAO_YY_BREAK -case 52: +case 53: TAO_YY_RULE_SETUP -#line 213 "fe/idl.ll" +#line 214 "fe/idl.ll" { tao_yylval.uival = idl_atoui(ace_tao_yytext, 10); return IDL_UINTEGER_LITERAL; } TAO_YY_BREAK -case 53: +case 54: TAO_YY_RULE_SETUP -#line 217 "fe/idl.ll" +#line 218 "fe/idl.ll" { tao_yylval.ival = idl_atoi(ace_tao_yytext, 16); return IDL_INTEGER_LITERAL; } TAO_YY_BREAK -case 54: +case 55: TAO_YY_RULE_SETUP -#line 221 "fe/idl.ll" +#line 222 "fe/idl.ll" { tao_yylval.uival = idl_atoui(ace_tao_yytext, 16); return IDL_UINTEGER_LITERAL; } TAO_YY_BREAK -case 55: +case 56: TAO_YY_RULE_SETUP -#line 225 "fe/idl.ll" +#line 226 "fe/idl.ll" { tao_yylval.ival = idl_atoi(ace_tao_yytext, 8); return IDL_INTEGER_LITERAL; } TAO_YY_BREAK -case 56: +case 57: TAO_YY_RULE_SETUP -#line 229 "fe/idl.ll" +#line 230 "fe/idl.ll" { tao_yylval.uival = idl_atoui(ace_tao_yytext, 8); return IDL_UINTEGER_LITERAL; } TAO_YY_BREAK -case 57: +case 58: TAO_YY_RULE_SETUP -#line 234 "fe/idl.ll" +#line 235 "fe/idl.ll" { /* Skip the quotes */ char *tmp = ace_tao_yytext; @@ -1398,9 +1407,9 @@ TAO_YY_RULE_SETUP return IDL_STRING_LITERAL; } TAO_YY_BREAK -case 58: +case 59: TAO_YY_RULE_SETUP -#line 241 "fe/idl.ll" +#line 242 "fe/idl.ll" { /* Skip the bookends */ char *tmp = ACE_OS::strdup (ace_tao_yytext); @@ -1409,125 +1418,125 @@ TAO_YY_RULE_SETUP return IDL_WSTRING_LITERAL; } TAO_YY_BREAK -case 59: +case 60: TAO_YY_RULE_SETUP -#line 248 "fe/idl.ll" +#line 249 "fe/idl.ll" { tao_yylval.cval = ace_tao_yytext [1]; return IDL_CHARACTER_LITERAL; } TAO_YY_BREAK -case 60: +case 61: TAO_YY_RULE_SETUP -#line 252 "fe/idl.ll" +#line 253 "fe/idl.ll" { // octal character constant tao_yylval.cval = idl_escape_reader(ace_tao_yytext + 1); return IDL_CHARACTER_LITERAL; } TAO_YY_BREAK -case 61: +case 62: TAO_YY_RULE_SETUP -#line 257 "fe/idl.ll" +#line 258 "fe/idl.ll" { // hexadecimal character constant tao_yylval.cval = idl_escape_reader(ace_tao_yytext + 1); return IDL_CHARACTER_LITERAL; } TAO_YY_BREAK -case 62: +case 63: TAO_YY_RULE_SETUP -#line 262 "fe/idl.ll" +#line 263 "fe/idl.ll" { tao_yylval.cval = idl_escape_reader(ace_tao_yytext + 1); return IDL_CHARACTER_LITERAL; } TAO_YY_BREAK -case 63: +case 64: TAO_YY_RULE_SETUP -#line 266 "fe/idl.ll" +#line 267 "fe/idl.ll" { // wide character constant tao_yylval.wcval = ace_tao_yytext [2]; return IDL_WCHAR_LITERAL; } TAO_YY_BREAK -case 64: +case 65: TAO_YY_RULE_SETUP -#line 271 "fe/idl.ll" +#line 272 "fe/idl.ll" { // hexadecimal wide character constant tao_yylval.wcval = idl_wchar_escape_reader(ace_tao_yytext + 2); return IDL_WCHAR_LITERAL; } TAO_YY_BREAK -case 65: -#line 277 "fe/idl.ll" case 66: +#line 278 "fe/idl.ll" +case 67: TAO_YY_RULE_SETUP -#line 277 "fe/idl.ll" +#line 278 "fe/idl.ll" {/* remember pragma */ idl_global->set_lineno(idl_global->lineno() + 1); idl_store_pragma(ace_tao_yytext); } break; -case 67: -#line 282 "fe/idl.ll" case 68: +#line 283 "fe/idl.ll" +case 69: TAO_YY_RULE_SETUP -#line 282 "fe/idl.ll" +#line 283 "fe/idl.ll" { idl_parse_line_and_file(ace_tao_yytext); } break; -case 69: -#line 286 "fe/idl.ll" case 70: +#line 287 "fe/idl.ll" +case 71: TAO_YY_RULE_SETUP -#line 286 "fe/idl.ll" +#line 287 "fe/idl.ll" { idl_parse_line_and_file(ace_tao_yytext); } break; -case 71: -#line 290 "fe/idl.ll" case 72: +#line 291 "fe/idl.ll" +case 73: TAO_YY_RULE_SETUP -#line 290 "fe/idl.ll" +#line 291 "fe/idl.ll" { idl_parse_line_and_file(ace_tao_yytext); } break; -case 73: -#line 294 "fe/idl.ll" case 74: +#line 295 "fe/idl.ll" +case 75: TAO_YY_RULE_SETUP -#line 294 "fe/idl.ll" +#line 295 "fe/idl.ll" { idl_parse_line_and_file(ace_tao_yytext); } break; -case 75: -#line 298 "fe/idl.ll" case 76: +#line 299 "fe/idl.ll" +case 77: TAO_YY_RULE_SETUP -#line 298 "fe/idl.ll" +#line 299 "fe/idl.ll" { /* ignore cpp ident */ idl_global->set_lineno(idl_global->lineno() + 1); } break; -case 77: +case 78: TAO_YY_RULE_SETUP -#line 302 "fe/idl.ll" +#line 303 "fe/idl.ll" { /* ignore comments */ idl_global->set_lineno(idl_global->lineno() + 1); } break; -case 78: +case 79: TAO_YY_RULE_SETUP -#line 306 "fe/idl.ll" +#line 307 "fe/idl.ll" { for(;;) { char c = tao_yyinput(); @@ -1543,26 +1552,26 @@ TAO_YY_RULE_SETUP } } break; -case 79: +case 80: TAO_YY_RULE_SETUP -#line 320 "fe/idl.ll" +#line 321 "fe/idl.ll" ; break; -case 80: +case 81: TAO_YY_RULE_SETUP -#line 321 "fe/idl.ll" +#line 322 "fe/idl.ll" { idl_global->set_lineno(idl_global->lineno() + 1); } break; -case 81: +case 82: TAO_YY_RULE_SETUP -#line 324 "fe/idl.ll" +#line 325 "fe/idl.ll" return ace_tao_yytext [0]; TAO_YY_BREAK -case 82: +case 83: TAO_YY_RULE_SETUP -#line 326 "fe/idl.ll" +#line 327 "fe/idl.ll" TAO_YY_ECHO; break; case TAO_YY_STATE_EOF(INITIAL): @@ -1857,7 +1866,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 >= 416 ) + if ( tao_yy_current_state >= 420 ) 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]; @@ -1892,11 +1901,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 >= 416 ) + if ( tao_yy_current_state >= 420 ) 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 == 415); + tao_yy_is_jam = (tao_yy_current_state == 419); return tao_yy_is_jam ? 0 : tao_yy_current_state; } @@ -2452,7 +2461,7 @@ int main() return 0; } #endif -#line 326 "fe/idl.ll" +#line 327 "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 7640779be20..85e31e596b0 100644 --- a/TAO/TAO_IDL/fe/lex.yy.cpp.diff +++ b/TAO/TAO_IDL/fe/lex.yy.cpp.diff @@ -18,95 +18,95 @@ register int tao_yy_act; #line 126 "fe/idl.ll" -@@ -1470,7 +1470,7 @@ +@@ -1479,7 +1479,7 @@ idl_global->set_lineno(idl_global->lineno() + 1); idl_store_pragma(ace_tao_yytext); } - TAO_YY_BREAK + break; - case 67: - #line 282 "fe/idl.ll" case 68: -@@ -1479,7 +1479,7 @@ + #line 283 "fe/idl.ll" + case 69: +@@ -1488,7 +1488,7 @@ { idl_parse_line_and_file(ace_tao_yytext); } - TAO_YY_BREAK + break; - case 69: - #line 286 "fe/idl.ll" case 70: -@@ -1488,7 +1488,7 @@ + #line 287 "fe/idl.ll" + case 71: +@@ -1497,7 +148897,7 @@ { idl_parse_line_and_file(ace_tao_yytext); } - TAO_YY_BREAK + break; - case 71: - #line 290 "fe/idl.ll" case 72: -@@ -1497,7 +1497,7 @@ + #line 291 "fe/idl.ll" + case 73: +@@ -1506,7 +1506,7 @@ { idl_parse_line_and_file(ace_tao_yytext); } - TAO_YY_BREAK + break; - case 73: - #line 294 "fe/idl.ll" case 74: -@@ -1506,7 +1506,7 @@ + #line 295 "fe/idl.ll" + case 75: +@@ -1515,7 +1515,7 @@ { idl_parse_line_and_file(ace_tao_yytext); } - TAO_YY_BREAK + break; - case 75: - #line 298 "fe/idl.ll" case 76: -@@ -1516,7 +1516,7 @@ + #line 299 "fe/idl.ll" + case 77: +@@ -1525,7 +1525,7 @@ /* ignore cpp ident */ idl_global->set_lineno(idl_global->lineno() + 1); } - TAO_YY_BREAK + break; - case 77: + case 78: TAO_YY_RULE_SETUP - #line 302 "fe/idl.ll" -@@ -1524,7 +1524,7 @@ + #line 303 "fe/idl.ll" +@@ -1533,7 +1533,7 @@ /* ignore comments */ idl_global->set_lineno(idl_global->lineno() + 1); } - TAO_YY_BREAK + break; - case 78: + case 79: TAO_YY_RULE_SETUP - #line 306 "fe/idl.ll" -@@ -1542,19 +1542,19 @@ + #line 307 "fe/idl.ll" +@@ -1551,19 +1551,19 @@ } } } - TAO_YY_BREAK + break; - case 79: + case 80: TAO_YY_RULE_SETUP - #line 320 "fe/idl.ll" + #line 321 "fe/idl.ll" ; - TAO_YY_BREAK + break; - case 80: + case 81: TAO_YY_RULE_SETUP - #line 321 "fe/idl.ll" + #line 322 "fe/idl.ll" { idl_global->set_lineno(idl_global->lineno() + 1); } - TAO_YY_BREAK + break; - case 81: + case 82: TAO_YY_RULE_SETUP - #line 324 "fe/idl.ll" -@@ -1564,7 +1564,7 @@ + #line 325 "fe/idl.ll" +@@ -1573,7 +1573,7 @@ TAO_YY_RULE_SETUP - #line 326 "fe/idl.ll" + #line 327 "fe/idl.ll" TAO_YY_ECHO; - TAO_YY_BREAK + break; diff --git a/TAO/TAO_IDL/fe/y.tab.cpp b/TAO/TAO_IDL/fe/y.tab.cpp index 3378a07501e..9c6bdc54461 100644 --- a/TAO/TAO_IDL/fe/y.tab.cpp +++ b/TAO/TAO_IDL/fe/y.tab.cpp @@ -67,84 +67,85 @@ typedef union { #define IDL_WCHAR 268 #define IDL_OCTET 269 #define IDL_BOOLEAN 270 -#define IDL_ANY 271 -#define IDL_STRUCT 272 -#define IDL_UNION 273 -#define IDL_SWITCH 274 -#define IDL_ENUM 275 -#define IDL_SEQUENCE 276 -#define IDL_STRING 277 -#define IDL_WSTRING 278 -#define IDL_EXCEPTION 279 -#define IDL_CASE 280 -#define IDL_DEFAULT 281 -#define IDL_READONLY 282 -#define IDL_ATTRIBUTE 283 -#define IDL_ONEWAY 284 -#define IDL_IDEMPOTENT 285 -#define IDL_VOID 286 -#define IDL_IN 287 -#define IDL_OUT 288 -#define IDL_INOUT 289 -#define IDL_RAISES 290 -#define IDL_CONTEXT 291 -#define IDL_NATIVE 292 -#define IDL_ABSTRACT 293 -#define IDL_CUSTOM 294 -#define IDL_INIT 295 -#define IDL_PRIVATE 296 -#define IDL_PUBLIC 297 -#define IDL_SUPPORTS 298 -#define IDL_TRUNCATABLE 299 -#define IDL_VALUETYPE 300 -#define IDL_INTEGER_LITERAL 301 -#define IDL_UINTEGER_LITERAL 302 -#define IDL_STRING_LITERAL 303 -#define IDL_CHARACTER_LITERAL 304 -#define IDL_FLOATING_PT_LITERAL 305 -#define IDL_TRUETOK 306 -#define IDL_FALSETOK 307 -#define IDL_SCOPE_DELIMITOR 308 -#define IDL_LEFT_SHIFT 309 -#define IDL_RIGHT_SHIFT 310 -#define IDL_WCHAR_LITERAL 311 -#define IDL_WSTRING_LITERAL 312 +#define IDL_FIXED 271 +#define IDL_ANY 272 +#define IDL_STRUCT 273 +#define IDL_UNION 274 +#define IDL_SWITCH 275 +#define IDL_ENUM 276 +#define IDL_SEQUENCE 277 +#define IDL_STRING 278 +#define IDL_WSTRING 279 +#define IDL_EXCEPTION 280 +#define IDL_CASE 281 +#define IDL_DEFAULT 282 +#define IDL_READONLY 283 +#define IDL_ATTRIBUTE 284 +#define IDL_ONEWAY 285 +#define IDL_IDEMPOTENT 286 +#define IDL_VOID 287 +#define IDL_IN 288 +#define IDL_OUT 289 +#define IDL_INOUT 290 +#define IDL_RAISES 291 +#define IDL_CONTEXT 292 +#define IDL_NATIVE 293 +#define IDL_ABSTRACT 294 +#define IDL_CUSTOM 295 +#define IDL_INIT 296 +#define IDL_PRIVATE 297 +#define IDL_PUBLIC 298 +#define IDL_SUPPORTS 299 +#define IDL_TRUNCATABLE 300 +#define IDL_VALUETYPE 301 +#define IDL_INTEGER_LITERAL 302 +#define IDL_UINTEGER_LITERAL 303 +#define IDL_STRING_LITERAL 304 +#define IDL_CHARACTER_LITERAL 305 +#define IDL_FLOATING_PT_LITERAL 306 +#define IDL_TRUETOK 307 +#define IDL_FALSETOK 308 +#define IDL_SCOPE_DELIMITOR 309 +#define IDL_LEFT_SHIFT 310 +#define IDL_RIGHT_SHIFT 311 +#define IDL_WCHAR_LITERAL 312 +#define IDL_WSTRING_LITERAL 313 #define TAO_YYERRCODE 256 short tao_yylhs[] = { -1, - 0, 71, 71, 73, 72, 75, 72, 77, 72, 79, - 72, 81, 72, 83, 72, 84, 72, 85, 86, 87, - 88, 80, 78, 78, 91, 93, 94, 89, 95, 67, - 33, 96, 22, 22, 82, 82, 82, 82, 97, 97, - 102, 104, 105, 101, 106, 107, 108, 98, 34, 109, - 68, 66, 66, 24, 24, 99, 99, 100, 103, 103, - 110, 110, 110, 115, 111, 116, 111, 92, 92, 117, - 112, 118, 112, 119, 112, 121, 112, 123, 112, 124, - 112, 20, 125, 21, 21, 16, 126, 16, 127, 16, - 69, 90, 128, 129, 130, 131, 74, 50, 50, 50, - 50, 50, 50, 50, 50, 35, 36, 37, 37, 38, - 38, 39, 39, 40, 40, 40, 41, 41, 41, 42, - 42, 42, 42, 43, 43, 43, 43, 44, 44, 44, - 45, 45, 45, 45, 45, 45, 45, 45, 45, 46, - 133, 70, 70, 70, 70, 70, 134, 132, 1, 1, - 2, 2, 2, 58, 58, 58, 58, 58, 58, 4, - 4, 4, 3, 3, 3, 29, 135, 30, 30, 62, - 62, 31, 136, 32, 32, 63, 64, 51, 51, 56, - 56, 56, 57, 57, 57, 54, 54, 54, 52, 52, - 59, 53, 55, 137, 138, 140, 141, 7, 139, 139, - 144, 139, 143, 143, 145, 143, 146, 142, 147, 148, - 114, 149, 114, 150, 151, 152, 153, 154, 155, 157, - 158, 10, 9, 9, 9, 9, 9, 9, 156, 160, - 160, 161, 162, 159, 163, 159, 27, 28, 28, 164, - 48, 165, 166, 48, 167, 49, 168, 169, 171, 172, - 8, 170, 175, 174, 174, 173, 176, 177, 5, 5, - 178, 179, 13, 181, 182, 6, 6, 180, 184, 185, - 14, 14, 183, 186, 11, 25, 26, 26, 187, 188, - 47, 189, 190, 120, 65, 65, 191, 192, 193, 194, - 76, 195, 197, 198, 199, 122, 61, 61, 61, 12, - 12, 113, 200, 196, 202, 196, 201, 205, 204, 204, - 206, 207, 203, 15, 15, 15, 15, 60, 60, 60, - 208, 209, 23, 23, 210, 211, 17, 17, 18, 212, - 19, 19, + 0, 72, 72, 74, 73, 76, 73, 78, 73, 80, + 73, 82, 73, 84, 73, 85, 73, 86, 87, 88, + 89, 81, 79, 79, 92, 94, 95, 90, 96, 68, + 33, 97, 22, 22, 83, 83, 83, 83, 98, 98, + 103, 105, 106, 102, 107, 108, 109, 99, 34, 110, + 69, 67, 67, 24, 24, 100, 100, 101, 104, 104, + 111, 111, 111, 116, 112, 117, 112, 93, 93, 118, + 113, 119, 113, 120, 113, 122, 113, 124, 113, 125, + 113, 20, 126, 21, 21, 16, 127, 16, 128, 16, + 70, 91, 129, 130, 131, 132, 75, 50, 50, 50, + 50, 50, 50, 50, 50, 50, 35, 36, 37, 37, + 38, 38, 39, 39, 40, 40, 40, 41, 41, 41, + 42, 42, 42, 42, 43, 43, 43, 43, 44, 44, + 44, 45, 45, 45, 45, 45, 45, 45, 45, 45, + 46, 134, 71, 71, 71, 71, 71, 135, 133, 1, + 1, 2, 2, 2, 59, 59, 59, 59, 59, 59, + 59, 4, 4, 4, 3, 3, 3, 29, 136, 30, + 30, 63, 63, 31, 137, 32, 32, 64, 65, 51, + 51, 57, 57, 57, 58, 58, 58, 54, 54, 54, + 56, 52, 52, 60, 53, 55, 138, 139, 141, 142, + 7, 140, 140, 145, 140, 144, 144, 146, 144, 147, + 143, 148, 149, 115, 150, 115, 151, 152, 153, 154, + 155, 156, 158, 159, 10, 9, 9, 9, 9, 9, + 9, 157, 161, 161, 162, 163, 160, 164, 160, 27, + 28, 28, 165, 48, 166, 167, 48, 168, 49, 169, + 170, 172, 173, 8, 171, 176, 175, 175, 174, 177, + 178, 5, 5, 179, 180, 13, 182, 183, 6, 6, + 181, 185, 186, 14, 14, 184, 187, 11, 25, 26, + 26, 188, 189, 47, 190, 191, 121, 66, 66, 192, + 193, 194, 195, 77, 196, 198, 199, 200, 123, 62, + 62, 62, 12, 12, 114, 201, 197, 203, 197, 202, + 206, 205, 205, 207, 208, 204, 15, 15, 15, 15, + 61, 61, 61, 209, 210, 23, 23, 211, 212, 17, + 17, 18, 213, 19, 19, }; short tao_yylen[] = { 2, 1, 2, 0, 0, 3, 0, 3, 0, 3, 0, @@ -157,423 +158,419 @@ short tao_yylen[] = { 2, 3, 0, 3, 0, 3, 0, 3, 0, 3, 0, 3, 2, 0, 4, 0, 1, 0, 3, 0, 4, 1, 1, 0, 0, 0, 0, 9, 1, 1, 1, - 1, 1, 1, 1, 1, 1, 1, 1, 3, 1, - 3, 1, 3, 1, 3, 3, 1, 3, 3, 1, - 3, 3, 3, 1, 2, 2, 2, 1, 1, 3, + 1, 1, 1, 1, 1, 1, 1, 1, 1, 3, + 1, 3, 1, 3, 1, 3, 3, 1, 3, 3, + 1, 3, 3, 3, 1, 2, 2, 2, 1, 1, + 3, 1, 1, 1, 1, 1, 1, 1, 1, 1, + 1, 0, 3, 1, 1, 1, 2, 0, 3, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, - 0, 3, 1, 1, 1, 2, 0, 3, 1, 1, - 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, - 1, 1, 1, 1, 1, 2, 0, 4, 0, 1, - 1, 2, 0, 4, 0, 1, 1, 1, 1, 1, - 2, 1, 2, 3, 2, 1, 1, 2, 1, 1, - 1, 1, 1, 0, 0, 0, 0, 9, 2, 0, - 0, 3, 2, 0, 0, 3, 0, 2, 0, 0, - 5, 0, 3, 0, 0, 0, 0, 0, 0, 0, - 0, 17, 1, 1, 1, 1, 1, 1, 2, 2, - 0, 0, 0, 5, 0, 3, 2, 2, 0, 0, - 3, 0, 0, 5, 0, 3, 0, 0, 0, 0, - 9, 2, 0, 4, 0, 1, 0, 0, 6, 2, - 0, 0, 5, 0, 0, 6, 1, 1, 0, 0, - 6, 1, 1, 0, 3, 2, 2, 0, 0, 0, - 5, 0, 0, 6, 1, 0, 0, 0, 0, 0, - 9, 0, 0, 0, 0, 10, 1, 1, 0, 1, - 1, 1, 0, 3, 0, 4, 2, 0, 4, 0, - 0, 0, 5, 1, 1, 1, 1, 1, 1, 1, - 0, 0, 6, 0, 0, 0, 6, 0, 2, 0, - 4, 0, + 1, 1, 1, 1, 1, 1, 1, 2, 0, 4, + 0, 1, 1, 2, 0, 4, 0, 1, 1, 1, + 1, 1, 2, 1, 2, 3, 2, 1, 1, 2, + 1, 1, 1, 1, 1, 1, 0, 0, 0, 0, + 9, 2, 0, 0, 3, 2, 0, 0, 3, 0, + 2, 0, 0, 5, 0, 3, 0, 0, 0, 0, + 0, 0, 0, 0, 17, 1, 1, 1, 1, 1, + 1, 2, 2, 0, 0, 0, 5, 0, 3, 2, + 2, 0, 0, 3, 0, 0, 5, 0, 3, 0, + 0, 0, 0, 9, 2, 0, 4, 0, 1, 0, + 0, 6, 2, 0, 0, 5, 0, 0, 6, 1, + 1, 0, 0, 6, 1, 1, 0, 3, 2, 2, + 0, 0, 0, 5, 0, 0, 6, 1, 0, 0, + 0, 0, 0, 9, 0, 0, 0, 0, 10, 1, + 1, 0, 1, 1, 1, 0, 3, 0, 4, 2, + 0, 4, 0, 0, 0, 5, 1, 1, 1, 1, + 1, 1, 1, 0, 0, 6, 0, 0, 0, 6, + 0, 2, 0, 4, 0, }; short tao_yydefred[] = { 3, - 0, 0, 16, 93, 18, 29, 141, 194, 214, 247, - 287, 0, 0, 0, 50, 143, 145, 144, 25, 41, + 0, 0, 16, 93, 18, 29, 142, 197, 217, 250, + 290, 0, 0, 0, 50, 144, 146, 145, 25, 41, 0, 0, 4, 2, 6, 8, 10, 12, 14, 23, 24, 35, 36, 37, 38, 40, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 91, 146, 176, 45, 0, - 0, 39, 0, 0, 0, 32, 31, 0, 182, 0, - 186, 187, 189, 190, 191, 192, 193, 261, 268, 273, - 52, 87, 58, 149, 150, 152, 160, 161, 163, 165, - 164, 0, 162, 0, 154, 156, 157, 155, 159, 178, - 179, 151, 158, 0, 86, 0, 0, 0, 0, 0, - 0, 0, 0, 17, 103, 104, 0, 94, 98, 99, - 101, 102, 100, 19, 30, 147, 142, 195, 215, 248, - 288, 0, 51, 26, 42, 0, 181, 188, 0, 185, - 0, 0, 257, 260, 89, 0, 264, 269, 5, 7, - 9, 11, 13, 15, 0, 0, 0, 0, 0, 0, - 0, 46, 69, 60, 0, 33, 184, 262, 88, 0, - 0, 0, 49, 0, 0, 95, 20, 177, 148, 169, - 170, 171, 0, 196, 216, 249, 289, 69, 0, 0, - 0, 0, 131, 132, 133, 135, 137, 138, 139, 136, - 134, 0, 0, 0, 0, 0, 140, 0, 0, 0, - 0, 0, 0, 120, 124, 129, 258, 90, 0, 265, - 270, 0, 3, 0, 0, 0, 0, 0, 0, 0, - 80, 285, 297, 298, 0, 0, 70, 72, 74, 0, - 68, 76, 78, 302, 66, 64, 0, 59, 61, 62, - 63, 83, 263, 125, 126, 127, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 91, 147, 178, 45, 0, + 0, 39, 0, 0, 0, 32, 31, 0, 184, 0, + 188, 189, 192, 193, 194, 195, 191, 196, 264, 271, + 276, 52, 87, 58, 150, 151, 153, 162, 163, 165, + 167, 166, 0, 164, 0, 155, 157, 158, 156, 161, + 160, 180, 181, 152, 159, 0, 86, 0, 0, 0, + 0, 0, 0, 0, 0, 17, 104, 105, 0, 94, + 98, 99, 101, 102, 103, 100, 19, 30, 148, 143, + 198, 218, 251, 291, 0, 51, 26, 42, 0, 183, + 190, 0, 187, 0, 0, 260, 263, 89, 0, 267, + 272, 5, 7, 9, 11, 13, 15, 0, 0, 0, + 0, 0, 0, 0, 46, 69, 60, 0, 33, 186, + 265, 88, 0, 0, 0, 49, 0, 0, 95, 20, + 179, 149, 171, 172, 173, 0, 199, 219, 252, 292, + 69, 0, 0, 0, 0, 132, 133, 134, 136, 138, + 139, 140, 137, 135, 0, 0, 0, 0, 0, 141, + 0, 0, 0, 0, 0, 0, 121, 125, 130, 261, + 90, 0, 268, 273, 0, 3, 0, 0, 0, 0, + 0, 0, 0, 80, 288, 300, 301, 0, 0, 70, + 72, 74, 0, 68, 76, 78, 305, 66, 64, 0, + 59, 61, 62, 63, 83, 266, 126, 127, 128, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 96, 0, 167, 279, 275, 278, 201, 197, 0, 0, - 217, 256, 250, 255, 205, 0, 0, 0, 301, 315, - 292, 316, 300, 0, 314, 282, 0, 0, 0, 28, - 0, 0, 0, 0, 44, 0, 130, 0, 0, 0, - 0, 0, 0, 0, 121, 122, 123, 259, 266, 271, - 0, 0, 0, 0, 0, 0, 0, 0, 212, 209, - 208, 0, 0, 0, 0, 203, 0, 48, 81, 0, - 0, 71, 73, 75, 77, 79, 67, 65, 0, 97, - 106, 22, 168, 280, 277, 202, 198, 0, 0, 0, - 227, 218, 0, 223, 224, 226, 225, 251, 253, 206, - 291, 293, 283, 0, 213, 210, 0, 0, 0, 0, - 281, 0, 219, 254, 0, 294, 284, 175, 211, 0, - 0, 0, 0, 0, 220, 304, 318, 319, 320, 311, - 0, 310, 321, 295, 173, 0, 0, 306, 0, 0, - 0, 0, 235, 242, 240, 232, 239, 221, 231, 312, - 308, 322, 325, 296, 174, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 236, 243, 241, 245, - 233, 238, 222, 230, 313, 309, 0, 326, 0, 0, - 0, 323, 0, 244, 246, 234, 332, 0, 0, 327, - 330, 0, 331, + 0, 0, 0, 96, 0, 169, 282, 278, 281, 204, + 200, 0, 0, 220, 259, 253, 258, 208, 0, 0, + 0, 304, 318, 295, 319, 303, 0, 317, 285, 0, + 0, 0, 28, 0, 0, 0, 0, 44, 0, 131, + 0, 0, 0, 0, 0, 0, 0, 122, 123, 124, + 262, 269, 274, 0, 0, 0, 0, 0, 0, 0, + 0, 215, 212, 211, 0, 0, 0, 0, 206, 0, + 48, 81, 0, 0, 71, 73, 75, 77, 79, 67, + 65, 0, 97, 107, 22, 170, 283, 280, 205, 201, + 0, 0, 0, 230, 221, 0, 226, 227, 229, 228, + 254, 256, 209, 294, 296, 286, 0, 216, 213, 0, + 0, 0, 0, 284, 0, 222, 257, 0, 297, 287, + 177, 214, 0, 0, 0, 0, 0, 223, 307, 321, + 322, 323, 314, 0, 313, 324, 298, 175, 0, 0, + 309, 0, 0, 0, 0, 238, 245, 243, 235, 242, + 224, 234, 315, 311, 325, 328, 299, 176, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 239, + 246, 244, 248, 236, 241, 225, 233, 316, 312, 0, + 329, 0, 0, 0, 326, 0, 247, 249, 237, 335, + 0, 0, 330, 333, 0, 334, }; short tao_yydgoto[] = { 1, - 320, 74, 75, 76, 77, 78, 79, 80, 352, 81, - 168, 281, 82, 83, 283, 196, 414, 448, 449, 156, - 181, 57, 394, 163, 265, 315, 406, 420, 169, 214, - 377, 384, 19, 20, 340, 197, 198, 199, 200, 201, - 202, 203, 204, 205, 206, 207, 266, 407, 431, 108, - 85, 86, 87, 88, 89, 90, 91, 92, 93, 390, - 225, 170, 171, 172, 226, 94, 21, 22, 95, 227, - 2, 24, 98, 228, 99, 229, 100, 27, 101, 28, - 102, 29, 103, 37, 39, 146, 213, 312, 30, 31, - 54, 179, 153, 230, 40, 126, 32, 33, 34, 35, - 36, 55, 180, 154, 237, 122, 178, 277, 53, 238, - 239, 231, 241, 321, 294, 293, 287, 288, 289, 232, - 291, 233, 292, 278, 296, 132, 161, 38, 145, 212, - 311, 117, 41, 147, 313, 402, 42, 148, 268, 216, - 317, 326, 276, 316, 325, 270, 349, 372, 348, 43, - 149, 217, 322, 367, 380, 408, 396, 421, 409, 422, - 419, 441, 416, 418, 417, 439, 440, 44, 150, 273, - 218, 323, 274, 324, 368, 160, 258, 131, 182, 96, - 164, 259, 97, 165, 260, 215, 314, 364, 331, 370, - 45, 151, 219, 327, 330, 376, 369, 383, 401, 381, - 391, 382, 392, 399, 424, 397, 423, 400, 425, 426, - 443, 452, + 323, 75, 76, 77, 78, 79, 80, 81, 355, 82, + 171, 284, 83, 84, 286, 199, 417, 451, 452, 159, + 184, 57, 397, 166, 268, 318, 409, 423, 172, 217, + 380, 387, 19, 20, 343, 200, 201, 202, 203, 204, + 205, 206, 207, 208, 209, 210, 269, 410, 434, 110, + 86, 87, 88, 89, 90, 91, 92, 93, 94, 95, + 393, 228, 173, 174, 175, 229, 96, 21, 22, 97, + 230, 2, 24, 100, 231, 101, 232, 102, 27, 103, + 28, 104, 29, 105, 37, 39, 149, 216, 315, 30, + 31, 54, 182, 156, 233, 40, 129, 32, 33, 34, + 35, 36, 55, 183, 157, 240, 125, 181, 280, 53, + 241, 242, 234, 244, 324, 297, 296, 290, 291, 292, + 235, 294, 236, 295, 281, 299, 135, 164, 38, 148, + 215, 314, 120, 41, 150, 316, 405, 42, 151, 271, + 219, 320, 329, 279, 319, 328, 273, 352, 375, 351, + 43, 152, 220, 325, 370, 383, 411, 399, 424, 412, + 425, 422, 444, 419, 421, 420, 442, 443, 44, 153, + 276, 221, 326, 277, 327, 371, 163, 261, 134, 185, + 98, 167, 262, 99, 168, 263, 218, 317, 367, 334, + 373, 45, 154, 222, 330, 333, 379, 372, 386, 404, + 384, 394, 385, 395, 402, 427, 400, 426, 403, 428, + 429, 446, 455, }; short tao_yysindex[] = { 0, - 0, 595, 0, 0, 0, 0, 0, 0, 0, 0, - 0, -230, -251, -251, 0, 0, 0, 0, 0, 0, - -1, 442, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 3, 366, -186, -230, - 459, -230, -230, -230, -230, 0, 0, 0, 0, -214, - -214, 0, -230, -14, -4, 0, 0, -196, 0, -164, + 0, 583, 0, 0, 0, 0, 0, 0, 0, 0, + 0, -231, -254, -254, 0, 0, 0, 0, 0, 0, + 16, 407, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, -10, 559, -186, -231, + 455, -231, -231, -231, -231, 0, 0, 0, 0, -224, + -224, 0, -231, -43, -41, 0, 0, -205, 0, -226, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, -19, 0, -206, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 16, 0, 55, 57, 65, + 71, 73, 94, 96, 100, 0, 0, 0, -206, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 60, 0, -184, 0, 0, 0, 0, 0, 0, - 0, 0, 0, -1, 0, 67, 81, 95, 112, 118, - 128, 134, 142, 0, 0, 0, -184, 0, 0, 0, + 0, 0, 0, 0, 51, 0, 0, 0, -184, 0, + 0, -79, 0, 125, -231, 0, 0, 0, -109, 0, + 0, 0, 0, 0, 0, 0, 0, -231, 86, -231, + 90, -52, 103, 105, 0, 0, 0, -206, 0, 0, + 0, 0, 18, -231, -184, 0, 18, 18, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 83, 0, 0, 0, -233, 0, 0, -44, 0, - 165, -230, 0, 0, 0, -77, 0, 0, 0, 0, - 0, 0, 0, 0, -230, 105, -230, 125, -41, 126, - 129, 0, 0, 0, -184, 0, 0, 0, 0, 27, - -230, -233, 0, 27, 27, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 651, 621, - 197, 523, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 11, 11, 11, 27, -184, 0, 122, 157, 215, - -97, 155, 185, 0, 0, 0, 0, 0, -184, 0, - 0, 195, 0, 213, 168, 8, 225, 12, 14, 651, - 0, 0, 0, 0, 540, -5, 0, 0, 0, 156, - 0, 0, 0, 0, 0, 0, 163, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 226, 27, 27, 27, - 27, 27, 27, 27, 27, 27, 27, 218, 224, 227, - 0, 595, 0, 0, 0, 0, 0, 0, 14, 425, - 0, 0, 0, 0, 0, 0, 170, 237, 0, 0, - 0, 0, 0, -184, 0, 0, 244, 245, 249, 0, - 251, 261, 425, 425, 0, -233, 0, 157, 215, -97, - 155, 155, 185, 185, 0, 0, 0, 0, 0, 0, - 27, 180, -230, 27, 168, 262, 200, 0, 0, 0, - 0, 490, 211, 296, 282, 0, 217, 0, 0, 86, - 572, 0, 0, 0, 0, 0, 0, 0, -184, 0, - 0, 0, 0, 0, 0, 0, 0, 288, -230, 88, - 0, 0, -184, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 255, 0, 0, 308, 12, 311, -230, - 0, 295, 0, 0, 0, 0, 0, 0, 0, 232, - 315, -149, 69, 313, 0, 0, 0, 0, 0, 0, - 319, 0, 0, 0, 0, -198, 572, 0, 318, 325, - 75, -230, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 310, 27, 309, 459, -66, - 247, -198, -230, -149, -233, 330, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 332, 0, 316, -230, - 317, 0, 76, 0, 0, 0, 0, 334, 336, 0, - 0, 80, 0, + 0, 632, 606, 191, 491, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 30, 30, 30, 18, -206, 0, + 112, 154, 213, -191, 19, 124, 0, 0, 0, 0, + 0, -206, 0, 0, 193, 0, 208, 169, 10, 225, + 14, 11, 632, 0, 0, 0, 0, 509, -14, 0, + 0, 0, 147, 0, 0, 0, 0, 0, 0, 148, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 242, + 18, 18, 18, 18, 18, 18, 18, 18, 18, 18, + 222, 226, 227, 0, 583, 0, 0, 0, 0, 0, + 0, 11, 383, 0, 0, 0, 0, 0, 0, 165, + 232, 0, 0, 0, 0, 0, -206, 0, 0, 234, + 243, 244, 0, 247, 250, 383, 383, 0, -184, 0, + 154, 213, -191, 19, 19, 124, 124, 0, 0, 0, + 0, 0, 0, 18, 185, -231, 18, 169, 254, 190, + 0, 0, 0, 0, 158, 194, 272, 282, 0, 203, + 0, 0, 91, 541, 0, 0, 0, 0, 0, 0, + 0, -206, 0, 0, 0, 0, 0, 0, 0, 0, + 288, -231, 87, 0, 0, -206, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 261, 0, 0, 314, + 14, 322, -231, 0, 304, 0, 0, 0, 0, 0, + 0, 0, 249, 324, -49, 83, 331, 0, 0, 0, + 0, 0, 0, 335, 0, 0, 0, 0, -119, 541, + 0, 338, 339, 92, -231, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 326, 18, + 325, 455, -133, 262, -119, -231, -49, -184, 346, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 349, + 0, 333, -231, 336, 0, 99, 0, 0, 0, 0, + 359, 360, 0, 0, 101, 0, }; short tao_yyrindex[] = { 0, - 0, 378, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 406, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - -7, -11, 0, 0, 0, 0, 0, 0, 0, 0, + -5, -35, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 87, - 29, 0, 0, 0, 0, 0, 0, 1, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 54, + -7, 0, 0, 0, 0, 0, 0, 140, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 6, 0, 0, 0, 0, 0, 0, - 0, 0, 0, -101, 0, 52, 111, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 127, 0, 0, 0, + 0, 0, 0, 0, 152, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, -110, 0, 156, 160, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 150, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 33, 0, - 0, 0, 0, 0, 0, 263, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, -15, 0, 0, 0, 0, 0, + 0, 116, 0, 0, 0, 0, 0, 0, 287, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 59, 0, 0, 0, 0, 0, 275, 302, - -16, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, -3, 0, 149, 355, 560, - 161, 85, 35, 0, 0, 0, 0, 0, 264, 0, - 0, 0, 0, 333, 0, 221, 0, 0, 246, 329, + 0, 0, 0, 0, 0, 0, 0, 53, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 110, 0, 0, 0, 0, + 0, 293, 328, 12, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, -3, 0, + 319, 175, 162, 330, 46, 7, 0, 0, 0, 0, + 0, 296, 0, 0, 0, 0, 352, 0, 245, 0, + 0, 269, 354, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 266, 0, 0, 0, 0, 0, 0, 246, 0, - 0, 0, 0, 0, 0, 174, 0, 0, 0, 0, - 0, 0, 0, 131, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 489, 562, 546, - 110, 123, 43, 72, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 20, 0, 0, 199, 0, 0, - 0, 0, 0, 272, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 2, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 348, - 0, 0, 360, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 291, 0, 0, 0, 0, 0, + 0, 269, 0, 0, 0, 0, 0, 0, 173, 0, + 0, 0, 0, 0, 0, 0, 176, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, -27, 0, 0, 0, 0, 0, - 0, 0, -46, 343, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 362, 0, - 345, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 506, - 0, 281, 0, 0, 0, 0, 0, 0, 0, 0, + 188, 572, 511, 48, 88, 34, 40, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 166, 0, 0, + 221, 0, 0, 0, 0, 0, 307, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 367, 0, - 0, 0, 0, + 0, 70, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 414, 0, 0, 415, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, -27, 0, 0, + 0, 0, 0, 0, 0, -47, 389, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 416, 0, 399, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 473, 0, 334, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 419, 0, 0, 0, 0, }; short tao_yygindex[] = { 0, - -21, 228, 0, 0, 0, -34, 9, 4, 0, 15, - 0, 0, 0, -33, -308, -20, 0, 0, 0, -13, - 0, 321, 0, 0, 0, 0, 0, 0, 58, 0, - 0, 0, 0, 396, 0, -179, 0, 173, 167, 172, - -8, -23, -99, -18, 0, -128, 103, 5, 0, 0, - -31, -30, -29, 385, 0, 0, 0, -171, -28, 0, - 0, -260, -9, 0, 0, 0, 0, 223, -12, 10, - 216, 0, 0, 13, 0, 17, 0, 0, 0, 0, + -21, 276, 0, 0, 0, -34, 9, 4, 0, 15, + 0, 0, 0, -33, -305, -20, 0, 0, 0, 35, + 0, 366, 0, 0, 0, 0, 0, 0, 113, 0, + 0, 0, 0, 451, 0, -171, 0, 215, 216, 217, + -87, -77, -16, 62, 0, -100, 151, 49, 0, 0, + -31, -30, -29, 433, 0, 435, 0, 0, -212, -28, + 0, 0, -270, -9, 0, 0, 0, 0, 192, -12, + 13, 258, 0, 0, 17, 0, 20, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 248, 0, 0, 0, 0, 0, 0, 0, 0, - 410, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 254, 0, -54, 0, 0, 0, 0, 0, 0, + 0, 0, 294, 0, 0, 0, 0, 0, 0, 0, + 0, 462, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 297, 0, -66, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 219, 184, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 36, 0, + 0, 0, 277, 209, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 76, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 89, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 132, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 49, 0, 0, 0, 0, 0, 0, 0, - 0, 0, + 0, 0, 0, 77, 0, 0, 0, 0, 0, 0, + 0, 0, 0, }; -#define TAO_YYTABLESIZE 943 +#define TAO_YYTABLESIZE 925 short tao_yytable[] = { 48, - 73, 84, 47, 105, 106, 17, 109, 110, 111, 113, - 16, 23, 324, 303, 25, 247, 18, 107, 26, 116, - 84, 34, 363, 46, 82, 85, 46, 115, 85, 118, - 119, 120, 121, 128, 128, 210, 211, 128, 128, 128, - 123, 128, 84, 128, 180, 84, 53, 57, 15, 153, - 195, 92, 343, 285, 128, 128, 56, 403, 128, 180, - 276, 104, 180, 276, 153, 127, 195, 153, 128, 192, - 114, 193, 117, 183, 72, 117, 183, 117, 276, 117, - 118, 404, 405, 118, 71, 118, 53, 118, 410, 128, - 128, 183, 117, 117, 183, 267, 117, 129, 130, 176, - 118, 118, 176, 133, 118, 155, 82, 85, 124, 119, - 267, 53, 119, 267, 119, 34, 119, 176, 125, 159, - 128, 134, 114, 135, 84, 114, 137, 117, 117, 119, - 119, 341, 166, 119, 173, 118, 118, 387, 388, 389, - 138, 209, 114, 114, 53, 56, 114, 115, 208, 274, - 115, 53, 194, 139, 272, 305, 306, 307, 117, 285, - 116, 84, 435, 116, 119, 119, 118, 115, 115, 272, - 140, 115, 272, 244, 245, 246, 141, 114, 114, 445, - 116, 116, 17, 17, 116, 344, 142, 16, 16, 107, - 280, 282, 143, 18, 18, 119, 34, 253, 112, 254, - 144, 112, 115, 115, 284, 152, 107, 107, 114, 53, - 107, 251, 252, 404, 405, 116, 116, 157, 112, 112, - 162, 257, 112, 17, 158, 285, 255, 167, 16, 303, - 304, 256, 175, 115, 18, 50, 51, 428, 337, 338, - 242, 107, 301, 302, 324, 248, 116, 174, 176, 84, - 249, 177, 250, 112, 112, 261, 263, 180, 264, 305, - 305, 305, 153, 267, 271, 17, 297, 46, 272, 275, - 16, 23, 84, 84, 25, 339, 18, 286, 26, 308, - 290, 82, 85, 46, 112, 309, 53, 295, 310, 183, - 354, 355, 356, 357, 328, 329, 280, 282, 290, 84, - 173, 353, 332, 333, 342, 128, 128, 334, 267, 335, - 284, 183, 184, 185, 186, 187, 188, 189, 72, 336, - 346, 190, 191, 199, 347, 351, 53, 183, 184, 185, - 186, 187, 188, 189, 72, 358, 173, 190, 191, 359, - 360, 361, 362, 117, 117, 200, 365, 371, 373, 127, - 375, 118, 118, 379, 385, 386, 395, 48, 393, 398, - 378, 411, 280, 282, 412, 413, 429, 272, 427, 438, - 204, 433, 442, 444, 450, 446, 284, 1, 447, 451, - 119, 119, 453, 105, 53, 55, 54, 317, 180, 48, - 21, 166, 415, 114, 114, 108, 252, 430, 84, 27, - 228, 172, 307, 328, 155, 229, 366, 329, 49, 243, - 173, 437, 108, 108, 136, 299, 108, 345, 115, 115, - 298, 300, 112, 52, 432, 220, 43, 173, 262, 207, - 207, 116, 116, 240, 269, 207, 207, 207, 207, 207, - 207, 207, 207, 207, 207, 207, 207, 108, 207, 207, - 207, 207, 318, 47, 207, 207, 374, 434, 0, 0, + 74, 85, 47, 107, 108, 17, 111, 112, 113, 116, + 16, 327, 34, 306, 23, 288, 18, 109, 25, 119, + 85, 26, 53, 57, 136, 46, 250, 118, 366, 121, + 122, 123, 124, 129, 129, 132, 133, 129, 129, 129, + 126, 129, 137, 129, 118, 346, 15, 118, 106, 118, + 53, 118, 82, 92, 129, 129, 130, 198, 129, 131, + 195, 256, 196, 257, 118, 118, 213, 214, 118, 198, + 117, 119, 46, 56, 119, 72, 119, 120, 119, 127, + 120, 128, 120, 115, 120, 116, 115, 53, 116, 129, + 129, 119, 119, 85, 413, 119, 85, 120, 120, 118, + 118, 120, 138, 115, 115, 116, 116, 115, 158, 116, + 84, 53, 56, 84, 140, 53, 141, 34, 254, 255, + 129, 288, 162, 142, 73, 117, 119, 119, 117, 143, + 118, 144, 120, 120, 82, 169, 406, 176, 115, 115, + 116, 116, 344, 197, 212, 117, 117, 407, 408, 117, + 178, 211, 145, 178, 146, 438, 185, 119, 147, 185, + 260, 407, 408, 120, 85, 258, 304, 305, 178, 115, + 259, 116, 448, 155, 185, 85, 53, 185, 306, 307, + 117, 117, 160, 182, 161, 17, 17, 288, 34, 165, + 16, 16, 84, 283, 285, 154, 18, 18, 182, 270, + 277, 182, 111, 275, 50, 51, 279, 287, 170, 279, + 154, 117, 177, 154, 270, 109, 347, 270, 275, 111, + 111, 275, 178, 111, 279, 179, 17, 180, 110, 340, + 341, 16, 109, 109, 245, 251, 109, 18, 390, 391, + 392, 308, 309, 310, 327, 110, 110, 252, 431, 110, + 253, 266, 85, 264, 111, 111, 247, 248, 249, 267, + 308, 308, 308, 53, 274, 270, 278, 109, 17, 289, + 275, 293, 298, 16, 46, 85, 85, 23, 342, 18, + 110, 25, 300, 311, 26, 111, 46, 312, 313, 331, + 332, 53, 335, 357, 358, 359, 360, 293, 109, 283, + 285, 336, 337, 176, 356, 338, 129, 129, 339, 345, + 82, 110, 349, 287, 350, 362, 118, 118, 361, 186, + 187, 188, 189, 190, 191, 192, 73, 364, 354, 193, + 194, 186, 187, 188, 189, 190, 191, 192, 73, 176, + 363, 193, 194, 119, 119, 202, 368, 365, 130, 120, + 120, 85, 53, 374, 376, 115, 115, 116, 116, 108, + 48, 378, 382, 381, 389, 283, 285, 113, 84, 203, + 113, 388, 185, 396, 398, 401, 108, 108, 415, 287, + 108, 414, 432, 416, 430, 441, 436, 113, 113, 445, + 447, 113, 48, 207, 449, 418, 182, 117, 117, 453, + 433, 85, 450, 454, 456, 1, 106, 158, 154, 55, + 168, 108, 270, 176, 46, 21, 275, 27, 54, 353, + 59, 60, 113, 113, 63, 64, 65, 66, 210, 210, + 176, 255, 320, 10, 210, 210, 210, 210, 210, 210, + 210, 210, 210, 210, 210, 210, 210, 174, 210, 210, + 210, 210, 43, 113, 182, 231, 310, 331, 232, 332, + 246, 139, 440, 49, 369, 301, 73, 302, 348, 303, + 114, 435, 115, 265, 223, 52, 210, 210, 47, 243, + 321, 210, 210, 210, 210, 210, 210, 210, 210, 210, + 210, 210, 210, 210, 210, 272, 210, 210, 210, 210, + 437, 210, 377, 439, 0, 0, 210, 210, 210, 210, + 210, 210, 210, 210, 210, 210, 210, 210, 210, 0, + 210, 210, 210, 210, 0, 207, 0, 0, 0, 210, 207, 207, 207, 207, 207, 207, 207, 207, 207, 207, - 207, 207, 436, 207, 207, 207, 207, 207, 108, 0, - 0, 207, 207, 207, 207, 207, 207, 207, 207, 207, - 207, 207, 207, 207, 0, 207, 207, 207, 207, 0, - 0, 0, 204, 0, 0, 0, 207, 204, 204, 204, - 204, 204, 204, 204, 204, 204, 204, 204, 204, 0, - 204, 204, 204, 204, 0, 0, 0, 0, 207, 109, - 0, 299, 0, 0, 0, 0, 299, 299, 299, 299, - 299, 299, 299, 299, 299, 299, 109, 109, 0, 0, - 109, 299, 299, 204, 0, 0, 0, 286, 299, 0, - 299, 0, 0, 299, 299, 299, 299, 299, 299, 299, - 299, 299, 299, 0, 0, 0, 0, 0, 299, 299, - 0, 109, 299, 113, 286, 299, 113, 299, 0, 0, - 299, 299, 299, 299, 299, 299, 299, 299, 299, 299, - 110, 0, 111, 113, 113, 299, 299, 113, 0, 299, - 0, 286, 109, 0, 299, 0, 0, 110, 110, 111, - 111, 110, 46, 111, 0, 0, 0, 58, 59, 60, - 61, 62, 63, 64, 65, 66, 299, 0, 113, 113, - 0, 0, 69, 70, 0, 0, 0, 0, 0, 0, - 0, 0, 110, 110, 111, 111, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 113, - 0, 0, 0, 72, 0, 0, 0, 0, 0, 0, - 319, 46, 0, 110, 0, 111, 58, 59, 60, 61, - 62, 63, 64, 65, 66, 67, 8, 9, 46, 10, - 68, 69, 70, 58, 59, 60, 61, 62, 63, 64, - 65, 66, 67, 8, 9, 46, 10, 68, 69, 70, + 207, 207, 207, 0, 207, 207, 207, 207, 114, 302, + 0, 114, 0, 210, 302, 302, 302, 302, 302, 302, + 302, 302, 302, 302, 302, 0, 0, 0, 114, 114, + 302, 302, 114, 0, 0, 0, 289, 207, 0, 302, + 0, 0, 0, 0, 302, 0, 0, 0, 0, 302, + 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, + 0, 302, 0, 114, 114, 302, 302, 0, 0, 0, + 302, 289, 112, 0, 302, 302, 302, 302, 302, 302, + 302, 302, 302, 302, 302, 302, 0, 0, 0, 112, + 112, 302, 302, 112, 114, 0, 302, 289, 322, 46, + 302, 0, 0, 0, 58, 59, 60, 61, 62, 63, + 64, 65, 66, 67, 68, 8, 9, 0, 10, 69, + 70, 71, 302, 46, 112, 112, 0, 0, 58, 59, + 60, 61, 62, 63, 64, 65, 66, 67, 68, 8, + 9, 0, 10, 69, 70, 71, 0, 0, 0, 0, + 0, 73, 0, 0, 0, 112, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 72, 0, 0, 0, + 0, 46, 0, 0, 0, 73, 58, 59, 60, 61, + 62, 63, 64, 65, 66, 67, 68, 8, 9, 240, + 10, 69, 70, 71, 240, 240, 240, 240, 240, 240, + 240, 240, 240, 240, 240, 240, 240, 46, 240, 240, + 240, 240, 58, 59, 60, 61, 62, 63, 64, 65, + 66, 67, 68, 73, 0, 46, 0, 69, 70, 71, 58, 59, 60, 61, 62, 63, 64, 65, 66, 67, - 8, 9, 72, 10, 68, 69, 70, 0, 0, 0, - 71, 0, 0, 0, 0, 0, 46, 0, 0, 72, - 0, 350, 59, 60, 0, 0, 63, 64, 65, 66, - 0, 0, 237, 0, 10, 0, 72, 237, 237, 237, - 237, 237, 237, 237, 237, 237, 237, 237, 237, 46, - 237, 237, 237, 237, 58, 59, 60, 61, 62, 63, - 64, 65, 66, 67, 0, 0, 46, 72, 68, 69, - 70, 58, 59, 60, 61, 62, 63, 64, 65, 66, - 67, 0, 0, 237, 0, 0, 69, 70, 0, 0, - 0, 0, 0, 0, 0, 279, 0, 0, 46, 0, - 72, 0, 0, 58, 59, 60, 61, 62, 63, 64, - 65, 66, 67, 0, 0, 0, 0, 72, 69, 70, - 3, 0, 4, 5, 6, 7, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 8, 9, 0, 10, - 0, 0, 0, 11, 0, 0, 221, 0, 4, 72, - 0, 7, 0, 0, 0, 0, 12, 13, 14, 0, - 0, 0, 8, 9, 15, 10, 0, 0, 0, 11, - 0, 0, 222, 0, 223, 224, 221, 0, 4, 0, - 0, 7, 12, 0, 0, 234, 235, 236, 0, 0, - 0, 0, 8, 9, 0, 10, 0, 0, 0, 11, - 0, 0, 222, 0, 223, 224, 0, 0, 0, 0, - 0, 0, 12, + 68, 240, 0, 0, 0, 0, 70, 71, 0, 0, + 0, 0, 0, 0, 0, 282, 0, 46, 0, 73, + 0, 0, 58, 59, 60, 61, 62, 63, 64, 65, + 66, 67, 68, 0, 0, 46, 0, 73, 70, 71, + 58, 59, 60, 61, 62, 63, 64, 65, 66, 67, + 0, 0, 0, 0, 0, 0, 70, 71, 3, 0, + 4, 5, 6, 7, 0, 0, 0, 0, 0, 73, + 0, 0, 0, 0, 0, 8, 9, 0, 10, 0, + 0, 224, 11, 4, 0, 0, 7, 73, 0, 0, + 0, 0, 0, 0, 0, 12, 13, 14, 8, 9, + 0, 10, 0, 15, 0, 11, 0, 224, 225, 4, + 226, 227, 7, 0, 0, 0, 0, 0, 12, 0, + 0, 237, 238, 239, 8, 9, 0, 10, 0, 0, + 0, 11, 0, 0, 225, 0, 226, 227, 0, 0, + 0, 0, 0, 0, 12, }; short tao_yycheck[] = { 12, 22, 22, 12, 38, 38, 2, 38, 38, 38, 38, - 2, 2, 59, 41, 2, 195, 2, 38, 2, 41, - 41, 123, 331, 257, 41, 41, 257, 40, 44, 42, - 43, 44, 45, 37, 38, 164, 165, 41, 42, 43, - 53, 45, 41, 47, 44, 44, 58, 59, 300, 44, - 40, 59, 313, 225, 58, 59, 58, 256, 62, 59, - 41, 59, 62, 44, 59, 262, 40, 62, 265, 43, - 257, 45, 38, 41, 308, 41, 44, 43, 59, 45, - 38, 280, 281, 41, 299, 43, 58, 45, 397, 93, - 94, 59, 58, 59, 62, 44, 62, 262, 263, 41, - 58, 59, 44, 44, 62, 126, 123, 123, 123, 38, - 59, 123, 41, 62, 43, 123, 45, 59, 123, 132, - 124, 62, 38, 308, 123, 41, 60, 93, 94, 58, - 59, 311, 145, 62, 147, 93, 94, 287, 288, 289, - 60, 162, 58, 59, 58, 59, 62, 38, 161, 91, - 41, 123, 126, 59, 44, 255, 256, 257, 124, 331, - 38, 182, 423, 41, 93, 94, 124, 58, 59, 59, - 59, 62, 62, 192, 193, 194, 59, 93, 94, 440, - 58, 59, 179, 180, 62, 314, 59, 179, 180, 41, - 225, 225, 59, 179, 180, 124, 298, 43, 38, 45, - 59, 41, 93, 94, 225, 123, 58, 59, 124, 123, - 62, 309, 310, 280, 281, 93, 94, 262, 58, 59, - 298, 37, 62, 220, 60, 397, 42, 123, 220, 253, - 254, 47, 274, 124, 220, 13, 14, 417, 293, 294, - 44, 93, 251, 252, 291, 124, 124, 123, 123, 270, - 94, 123, 38, 93, 94, 61, 44, 257, 91, 287, - 288, 289, 257, 256, 40, 262, 41, 257, 257, 256, - 262, 262, 293, 294, 262, 296, 262, 283, 262, 62, - 125, 298, 298, 257, 124, 62, 298, 125, 62, 257, - 322, 322, 322, 322, 125, 59, 331, 331, 125, 298, - 313, 322, 59, 59, 125, 309, 310, 59, 257, 59, - 331, 301, 302, 303, 304, 305, 306, 307, 308, 59, - 59, 311, 312, 125, 125, 322, 298, 301, 302, 303, - 304, 305, 306, 307, 308, 125, 349, 311, 312, 44, - 59, 125, 257, 309, 310, 125, 59, 93, 41, 262, - 40, 309, 310, 59, 123, 41, 44, 370, 290, 41, - 370, 44, 397, 397, 40, 291, 58, 257, 59, 40, - 125, 125, 41, 58, 41, 59, 397, 0, 303, 44, - 309, 310, 303, 257, 298, 123, 123, 257, 41, 402, - 125, 59, 402, 309, 310, 41, 125, 419, 419, 125, - 41, 59, 41, 59, 425, 125, 349, 41, 13, 182, - 423, 425, 58, 59, 94, 249, 62, 315, 309, 310, - 248, 250, 38, 14, 420, 178, 125, 440, 213, 256, - 257, 309, 310, 180, 216, 262, 263, 264, 265, 266, - 267, 268, 269, 270, 271, 272, 273, 93, 275, 276, - 277, 278, 269, 125, 256, 257, 368, 422, -1, -1, + 2, 59, 123, 41, 2, 228, 2, 38, 2, 41, + 41, 2, 58, 59, 44, 257, 198, 40, 334, 42, + 43, 44, 45, 37, 38, 262, 263, 41, 42, 43, + 53, 45, 62, 47, 38, 316, 301, 41, 59, 43, + 58, 45, 41, 59, 58, 59, 262, 40, 62, 265, + 43, 43, 45, 45, 58, 59, 167, 168, 62, 40, + 257, 38, 257, 58, 41, 300, 43, 38, 45, 123, + 41, 123, 43, 38, 45, 38, 41, 123, 41, 93, + 94, 58, 59, 41, 400, 62, 44, 58, 59, 93, + 94, 62, 309, 58, 59, 58, 59, 62, 129, 62, + 41, 58, 59, 44, 60, 123, 60, 123, 310, 311, + 124, 334, 135, 59, 309, 38, 93, 94, 41, 59, + 124, 59, 93, 94, 123, 148, 256, 150, 93, 94, + 93, 94, 314, 126, 165, 58, 59, 281, 282, 62, + 41, 164, 59, 44, 59, 426, 41, 124, 59, 44, + 37, 281, 282, 124, 185, 42, 254, 255, 59, 124, + 47, 124, 443, 123, 59, 123, 123, 62, 256, 257, + 93, 94, 262, 44, 60, 182, 183, 400, 299, 299, + 182, 183, 123, 228, 228, 44, 182, 183, 59, 44, + 91, 62, 41, 44, 13, 14, 41, 228, 123, 44, + 59, 124, 123, 62, 59, 41, 317, 62, 59, 58, + 59, 62, 275, 62, 59, 123, 223, 123, 41, 296, + 297, 223, 58, 59, 44, 124, 62, 223, 288, 289, + 290, 258, 259, 260, 292, 58, 59, 94, 420, 62, + 38, 44, 273, 61, 93, 94, 195, 196, 197, 91, + 288, 289, 290, 299, 40, 256, 256, 93, 265, 284, + 257, 125, 125, 265, 257, 296, 297, 265, 299, 265, + 93, 265, 41, 62, 265, 124, 257, 62, 62, 125, + 59, 299, 59, 325, 325, 325, 325, 125, 124, 334, + 334, 59, 59, 316, 325, 59, 310, 311, 59, 125, + 299, 124, 59, 334, 125, 44, 310, 311, 125, 302, + 303, 304, 305, 306, 307, 308, 309, 125, 325, 312, + 313, 302, 303, 304, 305, 306, 307, 308, 309, 352, + 59, 312, 313, 310, 311, 125, 59, 257, 262, 310, + 311, 299, 299, 93, 41, 310, 311, 310, 311, 41, + 373, 40, 59, 373, 41, 400, 400, 38, 299, 125, + 41, 123, 257, 291, 44, 41, 58, 59, 40, 400, + 62, 44, 58, 292, 59, 40, 125, 58, 59, 41, + 58, 62, 405, 125, 59, 405, 257, 310, 311, 41, + 422, 422, 304, 44, 304, 0, 257, 428, 257, 123, + 59, 93, 257, 426, 257, 125, 257, 125, 123, 262, + 263, 264, 93, 94, 267, 268, 269, 270, 256, 257, + 443, 125, 257, 276, 262, 263, 264, 265, 266, 267, + 268, 269, 270, 271, 272, 273, 274, 59, 276, 277, + 278, 279, 125, 124, 41, 41, 41, 59, 125, 41, + 185, 96, 428, 13, 352, 251, 309, 252, 318, 253, + 38, 423, 38, 216, 181, 14, 256, 257, 125, 183, + 272, 309, 262, 263, 264, 265, 266, 267, 268, 269, + 270, 271, 272, 273, 274, 219, 276, 277, 278, 279, + 425, 257, 371, 427, -1, -1, 262, 263, 264, 265, + 266, 267, 268, 269, 270, 271, 272, 273, 274, -1, + 276, 277, 278, 279, -1, 257, -1, -1, -1, 309, 262, 263, 264, 265, 266, 267, 268, 269, 270, 271, - 272, 273, 424, 275, 276, 277, 278, 257, 124, -1, - -1, 308, 262, 263, 264, 265, 266, 267, 268, 269, - 270, 271, 272, 273, -1, 275, 276, 277, 278, -1, - -1, -1, 257, -1, -1, -1, 308, 262, 263, 264, - 265, 266, 267, 268, 269, 270, 271, 272, 273, -1, - 275, 276, 277, 278, -1, -1, -1, -1, 308, 41, - -1, 257, -1, -1, -1, -1, 262, 263, 264, 265, - 266, 267, 268, 269, 270, 271, 58, 59, -1, -1, - 62, 277, 278, 308, -1, -1, -1, 283, 257, -1, - 286, -1, -1, 262, 263, 264, 265, 266, 267, 268, - 269, 270, 271, -1, -1, -1, -1, -1, 277, 278, - -1, 93, 308, 38, 283, 257, 41, 286, -1, -1, + 272, 273, 274, -1, 276, 277, 278, 279, 38, 257, + -1, 41, -1, 309, 262, 263, 264, 265, 266, 267, + 268, 269, 270, 271, 272, -1, -1, -1, 58, 59, + 278, 279, 62, -1, -1, -1, 284, 309, -1, 287, + -1, -1, -1, -1, 257, -1, -1, -1, -1, 262, + 263, 264, 265, 266, 267, 268, 269, 270, 271, 272, + -1, 309, -1, 93, 94, 278, 279, -1, -1, -1, + 257, 284, 41, -1, 287, 262, 263, 264, 265, 266, + 267, 268, 269, 270, 271, 272, -1, -1, -1, 58, + 59, 278, 279, 62, 124, -1, 309, 284, 256, 257, + 287, -1, -1, -1, 262, 263, 264, 265, 266, 267, + 268, 269, 270, 271, 272, 273, 274, -1, 276, 277, + 278, 279, 309, 257, 93, 94, -1, -1, 262, 263, + 264, 265, 266, 267, 268, 269, 270, 271, 272, 273, + 274, -1, 276, 277, 278, 279, -1, -1, -1, -1, + -1, 309, -1, -1, -1, 124, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, 300, -1, -1, -1, + -1, 257, -1, -1, -1, 309, 262, 263, 264, 265, + 266, 267, 268, 269, 270, 271, 272, 273, 274, 257, + 276, 277, 278, 279, 262, 263, 264, 265, 266, 267, + 268, 269, 270, 271, 272, 273, 274, 257, 276, 277, + 278, 279, 262, 263, 264, 265, 266, 267, 268, 269, + 270, 271, 272, 309, -1, 257, -1, 277, 278, 279, 262, 263, 264, 265, 266, 267, 268, 269, 270, 271, - 41, -1, 41, 58, 59, 277, 278, 62, -1, 308, - -1, 283, 124, -1, 286, -1, -1, 58, 59, 58, - 59, 62, 257, 62, -1, -1, -1, 262, 263, 264, - 265, 266, 267, 268, 269, 270, 308, -1, 93, 94, - -1, -1, 277, 278, -1, -1, -1, -1, -1, -1, - -1, -1, 93, 94, 93, 94, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, -1, 124, - -1, -1, -1, 308, -1, -1, -1, -1, -1, -1, - 256, 257, -1, 124, -1, 124, 262, 263, 264, 265, - 266, 267, 268, 269, 270, 271, 272, 273, 257, 275, - 276, 277, 278, 262, 263, 264, 265, 266, 267, 268, - 269, 270, 271, 272, 273, 257, 275, 276, 277, 278, + 272, 309, -1, -1, -1, -1, 278, 279, -1, -1, + -1, -1, -1, -1, -1, 287, -1, 257, -1, 309, + -1, -1, 262, 263, 264, 265, 266, 267, 268, 269, + 270, 271, 272, -1, -1, 257, -1, 309, 278, 279, 262, 263, 264, 265, 266, 267, 268, 269, 270, 271, - 272, 273, 308, 275, 276, 277, 278, -1, -1, -1, - 299, -1, -1, -1, -1, -1, 257, -1, -1, 308, - -1, 262, 263, 264, -1, -1, 267, 268, 269, 270, - -1, -1, 257, -1, 275, -1, 308, 262, 263, 264, - 265, 266, 267, 268, 269, 270, 271, 272, 273, 257, - 275, 276, 277, 278, 262, 263, 264, 265, 266, 267, - 268, 269, 270, 271, -1, -1, 257, 308, 276, 277, - 278, 262, 263, 264, 265, 266, 267, 268, 269, 270, - 271, -1, -1, 308, -1, -1, 277, 278, -1, -1, - -1, -1, -1, -1, -1, 286, -1, -1, 257, -1, - 308, -1, -1, 262, 263, 264, 265, 266, 267, 268, - 269, 270, 271, -1, -1, -1, -1, 308, 277, 278, - 256, -1, 258, 259, 260, 261, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, 272, 273, -1, 275, - -1, -1, -1, 279, -1, -1, 256, -1, 258, 308, - -1, 261, -1, -1, -1, -1, 292, 293, 294, -1, - -1, -1, 272, 273, 300, 275, -1, -1, -1, 279, - -1, -1, 282, -1, 284, 285, 256, -1, 258, -1, - -1, 261, 292, -1, -1, 295, 296, 297, -1, -1, - -1, -1, 272, 273, -1, 275, -1, -1, -1, 279, - -1, -1, 282, -1, 284, 285, -1, -1, -1, -1, - -1, -1, 292, + -1, -1, -1, -1, -1, -1, 278, 279, 256, -1, + 258, 259, 260, 261, -1, -1, -1, -1, -1, 309, + -1, -1, -1, -1, -1, 273, 274, -1, 276, -1, + -1, 256, 280, 258, -1, -1, 261, 309, -1, -1, + -1, -1, -1, -1, -1, 293, 294, 295, 273, 274, + -1, 276, -1, 301, -1, 280, -1, 256, 283, 258, + 285, 286, 261, -1, -1, -1, -1, -1, 293, -1, + -1, 296, 297, 298, 273, 274, -1, 276, -1, -1, + -1, 280, -1, -1, 283, -1, 285, 286, -1, -1, + -1, -1, -1, -1, 293, }; #define TAO_YYFINAL 1 #ifndef TAO_YYDEBUG #define TAO_YYDEBUG 0 #endif -#define TAO_YYMAXTOKEN 312 +#define TAO_YYMAXTOKEN 313 #if TAO_YYDEBUG const char *tao_yyname[] = { "end-of-file",0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, @@ -586,8 +583,8 @@ const char *tao_yyname[] = { 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,"IDENTIFIER","IDL_CONST", "IDL_MODULE","IDL_INTERFACE","IDL_TYPEDEF","IDL_LONG","IDL_SHORT", "IDL_UNSIGNED","IDL_DOUBLE","IDL_FLOAT","IDL_CHAR","IDL_WCHAR","IDL_OCTET", -"IDL_BOOLEAN","IDL_ANY","IDL_STRUCT","IDL_UNION","IDL_SWITCH","IDL_ENUM", -"IDL_SEQUENCE","IDL_STRING","IDL_WSTRING","IDL_EXCEPTION","IDL_CASE", +"IDL_BOOLEAN","IDL_FIXED","IDL_ANY","IDL_STRUCT","IDL_UNION","IDL_SWITCH", +"IDL_ENUM","IDL_SEQUENCE","IDL_STRING","IDL_WSTRING","IDL_EXCEPTION","IDL_CASE", "IDL_DEFAULT","IDL_READONLY","IDL_ATTRIBUTE","IDL_ONEWAY","IDL_IDEMPOTENT", "IDL_VOID","IDL_IN","IDL_OUT","IDL_INOUT","IDL_RAISES","IDL_CONTEXT", "IDL_NATIVE","IDL_ABSTRACT","IDL_CUSTOM","IDL_INIT","IDL_PRIVATE","IDL_PUBLIC", @@ -700,6 +697,7 @@ const char *tao_yyrule[] = { "const_type : octet_type", "const_type : boolean_type", "const_type : floating_pt_type", +"const_type : fixed_type", "const_type : string_type_spec", "const_type : wstring_type_spec", "const_type : scoped_name", @@ -756,6 +754,7 @@ const char *tao_yyrule[] = { "base_type_spec : char_type", "base_type_spec : boolean_type", "base_type_spec : octet_type", +"base_type_spec : fixed_type", "base_type_spec : any_type", "template_type_spec : sequence_type_spec", "template_type_spec : string_type_spec", @@ -786,6 +785,7 @@ const char *tao_yyrule[] = { "floating_pt_type : IDL_DOUBLE", "floating_pt_type : IDL_FLOAT", "floating_pt_type : IDL_LONG IDL_DOUBLE", +"fixed_type : IDL_FIXED", "char_type : IDL_CHAR", "char_type : IDL_WCHAR", "octet_type : IDL_OCTET", @@ -952,7 +952,7 @@ TAO_YYSTYPE tao_yylval; #define tao_yystacksize TAO_YYSTACKSIZE short tao_yyss[TAO_YYSTACKSIZE]; TAO_YYSTYPE tao_yyvs[TAO_YYSTACKSIZE]; -#line 2588 "fe/idl.tao_yy" +#line 2600 "fe/idl.tao_yy" /* programs */ /* @@ -1280,98 +1280,98 @@ tao_yyreduce: switch (tao_yyn) { case 4: -#line 258 "fe/idl.tao_yy" +#line 259 "fe/idl.tao_yy" { idl_global->set_parse_state(IDL_GlobalData::PS_TypeDeclSeen); } break; case 5: -#line 262 "fe/idl.tao_yy" +#line 263 "fe/idl.tao_yy" { idl_global->set_parse_state(IDL_GlobalData::PS_NoState); } break; case 6: -#line 266 "fe/idl.tao_yy" +#line 267 "fe/idl.tao_yy" { idl_global->set_parse_state(IDL_GlobalData::PS_ConstDeclSeen); } break; case 7: -#line 270 "fe/idl.tao_yy" +#line 271 "fe/idl.tao_yy" { idl_global->set_parse_state(IDL_GlobalData::PS_NoState); } break; case 8: -#line 274 "fe/idl.tao_yy" +#line 275 "fe/idl.tao_yy" { idl_global->set_parse_state(IDL_GlobalData::PS_ExceptDeclSeen); } break; case 9: -#line 278 "fe/idl.tao_yy" +#line 279 "fe/idl.tao_yy" { idl_global->set_parse_state(IDL_GlobalData::PS_NoState); } break; case 10: -#line 282 "fe/idl.tao_yy" +#line 283 "fe/idl.tao_yy" { idl_global->set_parse_state(IDL_GlobalData::PS_InterfaceDeclSeen); } break; case 11: -#line 286 "fe/idl.tao_yy" +#line 287 "fe/idl.tao_yy" { idl_global->set_parse_state(IDL_GlobalData::PS_NoState); } break; case 12: -#line 290 "fe/idl.tao_yy" +#line 291 "fe/idl.tao_yy" { idl_global->set_parse_state(IDL_GlobalData::PS_ModuleDeclSeen); } break; case 13: -#line 294 "fe/idl.tao_yy" +#line 295 "fe/idl.tao_yy" { idl_global->set_parse_state(IDL_GlobalData::PS_NoState); } break; case 14: -#line 298 "fe/idl.tao_yy" +#line 299 "fe/idl.tao_yy" { idl_global->set_parse_state(IDL_GlobalData::PS_ValuetypeDeclSeen); } break; case 15: -#line 302 "fe/idl.tao_yy" +#line 303 "fe/idl.tao_yy" { idl_global->set_parse_state(IDL_GlobalData::PS_NoState); } break; case 16: -#line 306 "fe/idl.tao_yy" +#line 307 "fe/idl.tao_yy" { idl_global->err()->syntax_error(idl_global->parse_state()); } break; case 17: -#line 310 "fe/idl.tao_yy" +#line 311 "fe/idl.tao_yy" { idl_global->set_parse_state(IDL_GlobalData::PS_NoState); tao_yyerrok; } break; case 18: -#line 317 "fe/idl.tao_yy" +#line 318 "fe/idl.tao_yy" { idl_global->set_parse_state(IDL_GlobalData::PS_ModuleSeen); } break; case 19: -#line 321 "fe/idl.tao_yy" +#line 322 "fe/idl.tao_yy" { UTL_ScopedName *n = new UTL_ScopedName(new Identifier(tao_yyvsp[0].strval, 1, 0, I_FALSE), NULL); @@ -1394,19 +1394,19 @@ case 19: } break; case 20: -#line 342 "fe/idl.tao_yy" +#line 343 "fe/idl.tao_yy" { idl_global->set_parse_state(IDL_GlobalData::PS_ModuleSqSeen); } break; case 21: -#line 346 "fe/idl.tao_yy" +#line 347 "fe/idl.tao_yy" { idl_global->set_parse_state(IDL_GlobalData::PS_ModuleBodySeen); } break; case 22: -#line 350 "fe/idl.tao_yy" +#line 351 "fe/idl.tao_yy" { idl_global->set_parse_state(IDL_GlobalData::PS_ModuleQsSeen); /* @@ -1422,7 +1422,7 @@ case 22: } break; case 25: -#line 372 "fe/idl.tao_yy" +#line 373 "fe/idl.tao_yy" { UTL_Scope *s = idl_global->scopes ()->top_non_null (); AST_Interface *i = NULL; @@ -1455,19 +1455,19 @@ case 25: } break; case 26: -#line 403 "fe/idl.tao_yy" +#line 404 "fe/idl.tao_yy" { idl_global->set_parse_state(IDL_GlobalData::PS_InterfaceSqSeen); } break; case 27: -#line 407 "fe/idl.tao_yy" +#line 408 "fe/idl.tao_yy" { idl_global->set_parse_state(IDL_GlobalData::PS_InterfaceBodySeen); } break; case 28: -#line 411 "fe/idl.tao_yy" +#line 412 "fe/idl.tao_yy" { idl_global->set_parse_state(IDL_GlobalData::PS_InterfaceQsSeen); /* @@ -1489,20 +1489,20 @@ case 28: } break; case 29: -#line 434 "fe/idl.tao_yy" +#line 435 "fe/idl.tao_yy" { idl_global->set_parse_state(IDL_GlobalData::PS_InterfaceSeen); } break; case 30: -#line 438 "fe/idl.tao_yy" +#line 439 "fe/idl.tao_yy" { idl_global->set_parse_state(IDL_GlobalData::PS_InterfaceIDSeen); tao_yyval.idval = tao_yyvsp[0].idval; } break; case 31: -#line 446 "fe/idl.tao_yy" +#line 447 "fe/idl.tao_yy" { idl_global->set_parse_state(IDL_GlobalData::PS_InheritSpecSeen); /* @@ -1515,25 +1515,25 @@ case 31: } break; case 32: -#line 460 "fe/idl.tao_yy" +#line 461 "fe/idl.tao_yy" { idl_global->set_parse_state(IDL_GlobalData::PS_InheritColonSeen); } break; case 33: -#line 464 "fe/idl.tao_yy" +#line 465 "fe/idl.tao_yy" { tao_yyval.nlval = tao_yyvsp[0].nlval; } break; case 34: -#line 468 "fe/idl.tao_yy" +#line 469 "fe/idl.tao_yy" { tao_yyval.nlval = NULL; } break; case 39: -#line 482 "fe/idl.tao_yy" +#line 483 "fe/idl.tao_yy" { cerr << "error in " << idl_global->filename()->get_string() << " line " << idl_global->lineno() << ":\n" ; @@ -1542,7 +1542,7 @@ case 39: } break; case 41: -#line 493 "fe/idl.tao_yy" +#line 494 "fe/idl.tao_yy" { UTL_Scope *s = idl_global->scopes()->top_non_null(); AST_Interface *i = NULL; @@ -1566,19 +1566,19 @@ case 41: } break; case 42: -#line 515 "fe/idl.tao_yy" +#line 516 "fe/idl.tao_yy" { idl_global->set_parse_state(IDL_GlobalData::PS_InterfaceSqSeen); } break; case 43: -#line 519 "fe/idl.tao_yy" +#line 520 "fe/idl.tao_yy" { idl_global->set_parse_state(IDL_GlobalData::PS_InterfaceBodySeen); } break; case 44: -#line 523 "fe/idl.tao_yy" +#line 524 "fe/idl.tao_yy" { idl_global->set_parse_state(IDL_GlobalData::PS_InterfaceQsSeen); /* @@ -1594,7 +1594,7 @@ case 44: } break; case 45: -#line 541 "fe/idl.tao_yy" +#line 542 "fe/idl.tao_yy" { UTL_Scope *s = idl_global->scopes()->top_non_null(); AST_Interface *i = NULL; @@ -1624,19 +1624,19 @@ case 45: } break; case 46: -#line 569 "fe/idl.tao_yy" +#line 570 "fe/idl.tao_yy" { idl_global->set_parse_state(IDL_GlobalData::PS_InterfaceSqSeen); } break; case 47: -#line 573 "fe/idl.tao_yy" +#line 574 "fe/idl.tao_yy" { idl_global->set_parse_state(IDL_GlobalData::PS_InterfaceBodySeen); } break; case 48: -#line 577 "fe/idl.tao_yy" +#line 578 "fe/idl.tao_yy" { idl_global->set_parse_state(IDL_GlobalData::PS_InterfaceQsSeen); /* @@ -1652,26 +1652,26 @@ case 48: } break; case 49: -#line 598 "fe/idl.tao_yy" +#line 599 "fe/idl.tao_yy" { tao_yyval.vhval = new FE_obv_header (new UTL_ScopedName (tao_yyvsp[-3].idval, NULL), tao_yyvsp[-1].nlval, tao_yyvsp[0].nlval); } break; case 50: -#line 605 "fe/idl.tao_yy" +#line 606 "fe/idl.tao_yy" { idl_global->set_parse_state(IDL_GlobalData::PS_ValuetypeSeen); } break; case 51: -#line 609 "fe/idl.tao_yy" +#line 610 "fe/idl.tao_yy" { idl_global->set_parse_state(IDL_GlobalData::PS_ValuetypeIDSeen); tao_yyval.idval = tao_yyvsp[0].idval; } break; case 52: -#line 617 "fe/idl.tao_yy" +#line 618 "fe/idl.tao_yy" { cerr << "warning in " << idl_global->filename()->get_string() << " line " << idl_global->lineno() << ":\n" ; @@ -1681,25 +1681,25 @@ case 52: } break; case 53: -#line 625 "fe/idl.tao_yy" +#line 626 "fe/idl.tao_yy" { tao_yyval.bval = I_FALSE; } break; case 54: -#line 633 "fe/idl.tao_yy" +#line 634 "fe/idl.tao_yy" { tao_yyval.nlval = new UTL_NameList(tao_yyvsp[0].idlist, NULL); } break; case 55: -#line 637 "fe/idl.tao_yy" +#line 638 "fe/idl.tao_yy" { tao_yyval.nlval = NULL; } break; case 56: -#line 645 "fe/idl.tao_yy" +#line 646 "fe/idl.tao_yy" { UTL_Scope *s = idl_global->scopes()->top_non_null(); UTL_ScopedName *n = new UTL_ScopedName(tao_yyvsp[0].idval, NULL); @@ -1721,7 +1721,7 @@ case 56: } break; case 57: -#line 666 "fe/idl.tao_yy" +#line 667 "fe/idl.tao_yy" { UTL_Scope *s = idl_global->scopes()->top_non_null(); UTL_ScopedName *n = new UTL_ScopedName(tao_yyvsp[0].idval, NULL); @@ -1741,7 +1741,7 @@ case 57: } break; case 58: -#line 688 "fe/idl.tao_yy" +#line 689 "fe/idl.tao_yy" { cerr << "error in " << idl_global->filename()->get_string() << " line " << idl_global->lineno() << ":\n" ; @@ -1749,106 +1749,106 @@ case 58: } break; case 64: -#line 708 "fe/idl.tao_yy" +#line 709 "fe/idl.tao_yy" { /* is $0 to member_i */ tao_yyval.vival = AST_Field::vis_PUBLIC; } break; case 66: -#line 714 "fe/idl.tao_yy" +#line 715 "fe/idl.tao_yy" { /* is $0 to member_i */ tao_yyval.vival = AST_Field::vis_PRIVATE; } break; case 70: -#line 728 "fe/idl.tao_yy" +#line 729 "fe/idl.tao_yy" { idl_global->set_parse_state(IDL_GlobalData::PS_TypeDeclSeen); } break; case 71: -#line 732 "fe/idl.tao_yy" +#line 733 "fe/idl.tao_yy" { idl_global->set_parse_state(IDL_GlobalData::PS_NoState); } break; case 72: -#line 736 "fe/idl.tao_yy" +#line 737 "fe/idl.tao_yy" { idl_global->set_parse_state(IDL_GlobalData::PS_ConstDeclSeen); } break; case 73: -#line 740 "fe/idl.tao_yy" +#line 741 "fe/idl.tao_yy" { idl_global->set_parse_state(IDL_GlobalData::PS_NoState); } break; case 74: -#line 744 "fe/idl.tao_yy" +#line 745 "fe/idl.tao_yy" { idl_global->set_parse_state(IDL_GlobalData::PS_ExceptDeclSeen); } break; case 75: -#line 748 "fe/idl.tao_yy" +#line 749 "fe/idl.tao_yy" { idl_global->set_parse_state(IDL_GlobalData::PS_NoState); } break; case 76: -#line 752 "fe/idl.tao_yy" +#line 753 "fe/idl.tao_yy" { idl_global->set_parse_state(IDL_GlobalData::PS_AttrDeclSeen); } break; case 77: -#line 756 "fe/idl.tao_yy" +#line 757 "fe/idl.tao_yy" { idl_global->set_parse_state(IDL_GlobalData::PS_NoState); } break; case 78: -#line 760 "fe/idl.tao_yy" +#line 761 "fe/idl.tao_yy" { idl_global->set_parse_state(IDL_GlobalData::PS_OpDeclSeen); } break; case 79: -#line 764 "fe/idl.tao_yy" +#line 765 "fe/idl.tao_yy" { idl_global->set_parse_state(IDL_GlobalData::PS_NoState); } break; case 80: -#line 768 "fe/idl.tao_yy" +#line 769 "fe/idl.tao_yy" { idl_global->err()->syntax_error(idl_global->parse_state()); } break; case 81: -#line 772 "fe/idl.tao_yy" +#line 773 "fe/idl.tao_yy" { idl_global->set_parse_state(IDL_GlobalData::PS_NoState); tao_yyerrok; } break; case 82: -#line 780 "fe/idl.tao_yy" +#line 781 "fe/idl.tao_yy" { tao_yyval.nlval = new UTL_NameList(tao_yyvsp[-1].idlist, tao_yyvsp[0].nlval); } break; case 83: -#line 788 "fe/idl.tao_yy" +#line 789 "fe/idl.tao_yy" { idl_global->set_parse_state(IDL_GlobalData::PS_SNListCommaSeen); } break; case 84: -#line 792 "fe/idl.tao_yy" +#line 793 "fe/idl.tao_yy" { idl_global->set_parse_state(IDL_GlobalData::PS_ScopedNameSeen); @@ -1861,13 +1861,13 @@ case 84: } break; case 85: -#line 803 "fe/idl.tao_yy" +#line 804 "fe/idl.tao_yy" { tao_yyval.nlval = NULL; } break; case 86: -#line 810 "fe/idl.tao_yy" +#line 811 "fe/idl.tao_yy" { idl_global->set_parse_state(IDL_GlobalData::PS_SN_IDSeen); @@ -1875,13 +1875,13 @@ case 86: } break; case 87: -#line 816 "fe/idl.tao_yy" +#line 817 "fe/idl.tao_yy" { idl_global->set_parse_state(IDL_GlobalData::PS_ScopeDelimSeen); } break; case 88: -#line 820 "fe/idl.tao_yy" +#line 821 "fe/idl.tao_yy" { idl_global->set_parse_state(IDL_GlobalData::PS_SN_IDSeen); @@ -1890,13 +1890,13 @@ case 88: } break; case 89: -#line 828 "fe/idl.tao_yy" +#line 829 "fe/idl.tao_yy" { idl_global->set_parse_state(IDL_GlobalData::PS_ScopeDelimSeen); } break; case 90: -#line 832 "fe/idl.tao_yy" +#line 833 "fe/idl.tao_yy" { idl_global->set_parse_state(IDL_GlobalData::PS_SN_IDSeen); @@ -1905,13 +1905,13 @@ case 90: } break; case 91: -#line 841 "fe/idl.tao_yy" +#line 842 "fe/idl.tao_yy" { tao_yyval.idval = new Identifier(tao_yyvsp[0].strval, 1, 0, I_FALSE); } break; case 92: -#line 848 "fe/idl.tao_yy" +#line 849 "fe/idl.tao_yy" { UTL_Scope *s = idl_global->scopes()->top_non_null(); UTL_ScopedName *n = new UTL_ScopedName(tao_yyvsp[0].idval, NULL); @@ -1931,31 +1931,31 @@ case 92: } break; case 93: -#line 869 "fe/idl.tao_yy" +#line 870 "fe/idl.tao_yy" { idl_global->set_parse_state(IDL_GlobalData::PS_ConstSeen); } break; case 94: -#line 873 "fe/idl.tao_yy" +#line 874 "fe/idl.tao_yy" { idl_global->set_parse_state(IDL_GlobalData::PS_ConstTypeSeen); } break; case 95: -#line 877 "fe/idl.tao_yy" +#line 878 "fe/idl.tao_yy" { idl_global->set_parse_state(IDL_GlobalData::PS_ConstIDSeen); } break; case 96: -#line 881 "fe/idl.tao_yy" +#line 882 "fe/idl.tao_yy" { idl_global->set_parse_state(IDL_GlobalData::PS_ConstAssignSeen); } break; case 97: -#line 885 "fe/idl.tao_yy" +#line 886 "fe/idl.tao_yy" { UTL_ScopedName *n = new UTL_ScopedName(tao_yyvsp[-4].idval, NULL); UTL_Scope *s = idl_global->scopes()->top_non_null(); @@ -1982,20 +1982,20 @@ case 97: idl_global->set_pragmas (p); } break; -case 103: -#line 919 "fe/idl.tao_yy" +case 104: +#line 921 "fe/idl.tao_yy" { tao_yyval.etval = AST_Expression::EV_string; } break; -case 104: -#line 923 "fe/idl.tao_yy" +case 105: +#line 925 "fe/idl.tao_yy" { tao_yyval.etval = AST_Expression::EV_wstring; } break; -case 105: -#line 927 "fe/idl.tao_yy" +case 106: +#line 929 "fe/idl.tao_yy" { UTL_Scope *s = idl_global->scopes()->top_non_null(); AST_Decl *d = NULL; @@ -2035,92 +2035,92 @@ case 105: tao_yyval.etval = AST_Expression::EV_any; } break; -case 109: -#line 973 "fe/idl.tao_yy" +case 110: +#line 975 "fe/idl.tao_yy" { tao_yyval.exval = idl_global->gen()->create_expr(AST_Expression::EC_or, tao_yyvsp[-2].exval, tao_yyvsp[0].exval); } break; -case 111: -#line 981 "fe/idl.tao_yy" +case 112: +#line 983 "fe/idl.tao_yy" { tao_yyval.exval = idl_global->gen()->create_expr(AST_Expression::EC_xor, tao_yyvsp[-2].exval, tao_yyvsp[0].exval); } break; -case 113: -#line 989 "fe/idl.tao_yy" +case 114: +#line 991 "fe/idl.tao_yy" { tao_yyval.exval = idl_global->gen()->create_expr(AST_Expression::EC_and, tao_yyvsp[-2].exval, tao_yyvsp[0].exval); } break; -case 115: -#line 997 "fe/idl.tao_yy" +case 116: +#line 999 "fe/idl.tao_yy" { tao_yyval.exval = idl_global->gen()->create_expr(AST_Expression::EC_left,tao_yyvsp[-2].exval,tao_yyvsp[0].exval); } break; -case 116: -#line 1001 "fe/idl.tao_yy" +case 117: +#line 1003 "fe/idl.tao_yy" { tao_yyval.exval = idl_global->gen()->create_expr(AST_Expression::EC_right,tao_yyvsp[-2].exval,tao_yyvsp[0].exval); } break; -case 118: -#line 1009 "fe/idl.tao_yy" +case 119: +#line 1011 "fe/idl.tao_yy" { tao_yyval.exval = idl_global->gen()->create_expr(AST_Expression::EC_add, tao_yyvsp[-2].exval, tao_yyvsp[0].exval); } break; -case 119: -#line 1013 "fe/idl.tao_yy" +case 120: +#line 1015 "fe/idl.tao_yy" { tao_yyval.exval = idl_global->gen()->create_expr(AST_Expression::EC_minus,tao_yyvsp[-2].exval,tao_yyvsp[0].exval); } break; -case 121: -#line 1021 "fe/idl.tao_yy" +case 122: +#line 1023 "fe/idl.tao_yy" { tao_yyval.exval = idl_global->gen()->create_expr(AST_Expression::EC_mul, tao_yyvsp[-2].exval, tao_yyvsp[0].exval); } break; -case 122: -#line 1025 "fe/idl.tao_yy" +case 123: +#line 1027 "fe/idl.tao_yy" { tao_yyval.exval = idl_global->gen()->create_expr(AST_Expression::EC_div, tao_yyvsp[-2].exval, tao_yyvsp[0].exval); } break; -case 123: -#line 1029 "fe/idl.tao_yy" +case 124: +#line 1031 "fe/idl.tao_yy" { tao_yyval.exval = idl_global->gen()->create_expr(AST_Expression::EC_mod, tao_yyvsp[-2].exval, tao_yyvsp[0].exval); } break; -case 125: -#line 1037 "fe/idl.tao_yy" +case 126: +#line 1039 "fe/idl.tao_yy" { tao_yyval.exval = idl_global->gen()->create_expr(AST_Expression::EC_u_plus, tao_yyvsp[0].exval, NULL); } break; -case 126: -#line 1043 "fe/idl.tao_yy" +case 127: +#line 1045 "fe/idl.tao_yy" { tao_yyval.exval = idl_global->gen()->create_expr(AST_Expression::EC_u_minus, tao_yyvsp[0].exval, NULL); } break; -case 127: -#line 1049 "fe/idl.tao_yy" +case 128: +#line 1051 "fe/idl.tao_yy" { tao_yyval.exval = idl_global->gen()->create_expr(AST_Expression::EC_bit_neg, tao_yyvsp[0].exval, NULL); } break; -case 128: -#line 1058 "fe/idl.tao_yy" +case 129: +#line 1060 "fe/idl.tao_yy" { /* * An expression which is a scoped name is not resolved now, @@ -2130,100 +2130,100 @@ case 128: tao_yyval.exval = idl_global->gen()->create_expr(tao_yyvsp[0].idlist); } break; -case 130: -#line 1068 "fe/idl.tao_yy" +case 131: +#line 1070 "fe/idl.tao_yy" { tao_yyval.exval = tao_yyvsp[-1].exval; } break; -case 131: -#line 1075 "fe/idl.tao_yy" +case 132: +#line 1077 "fe/idl.tao_yy" { tao_yyval.exval = idl_global->gen()->create_expr(tao_yyvsp[0].ival); } break; -case 132: -#line 1079 "fe/idl.tao_yy" +case 133: +#line 1081 "fe/idl.tao_yy" { tao_yyval.exval = idl_global->gen()->create_expr(tao_yyvsp[0].uival); } break; -case 133: -#line 1083 "fe/idl.tao_yy" +case 134: +#line 1085 "fe/idl.tao_yy" { tao_yyval.exval = idl_global->gen()->create_expr(tao_yyvsp[0].sval); } break; -case 134: -#line 1087 "fe/idl.tao_yy" +case 135: +#line 1089 "fe/idl.tao_yy" { tao_yyval.exval = idl_global->gen()->create_expr(tao_yyvsp[0].wsval); } break; -case 135: -#line 1091 "fe/idl.tao_yy" +case 136: +#line 1093 "fe/idl.tao_yy" { tao_yyval.exval = idl_global->gen()->create_expr(tao_yyvsp[0].cval); } break; -case 136: -#line 1095 "fe/idl.tao_yy" +case 137: +#line 1097 "fe/idl.tao_yy" { ACE_OutputCDR::from_wchar wc (tao_yyvsp[0].wcval); tao_yyval.exval = idl_global->gen()->create_expr(wc); } break; -case 137: -#line 1100 "fe/idl.tao_yy" +case 138: +#line 1102 "fe/idl.tao_yy" { tao_yyval.exval = idl_global->gen()->create_expr(tao_yyvsp[0].dval); } break; -case 138: -#line 1104 "fe/idl.tao_yy" +case 139: +#line 1106 "fe/idl.tao_yy" { tao_yyval.exval = idl_global->gen()->create_expr((idl_bool) I_TRUE, AST_Expression::EV_bool); } break; -case 139: -#line 1109 "fe/idl.tao_yy" +case 140: +#line 1111 "fe/idl.tao_yy" { tao_yyval.exval = idl_global->gen()->create_expr((idl_bool) I_FALSE, AST_Expression::EV_bool); } break; -case 140: -#line 1117 "fe/idl.tao_yy" +case 141: +#line 1119 "fe/idl.tao_yy" { tao_yyvsp[0].exval->evaluate(AST_Expression::EK_const); tao_yyval.exval = idl_global->gen()->create_expr(tao_yyvsp[0].exval, AST_Expression::EV_ulong); } break; -case 141: -#line 1125 "fe/idl.tao_yy" +case 142: +#line 1127 "fe/idl.tao_yy" { idl_global->set_parse_state(IDL_GlobalData::PS_TypedefSeen); } break; -case 142: -#line 1128 "fe/idl.tao_yy" -{tao_yyval.ival = 0;} -break; case 143: -#line 1129 "fe/idl.tao_yy" -{ tao_yyval.ival = 0;} +#line 1130 "fe/idl.tao_yy" +{tao_yyval.ival = 0;} break; case 144: -#line 1130 "fe/idl.tao_yy" +#line 1131 "fe/idl.tao_yy" { tao_yyval.ival = 0;} break; case 145: -#line 1131 "fe/idl.tao_yy" +#line 1132 "fe/idl.tao_yy" { tao_yyval.ival = 0;} break; case 146: #line 1133 "fe/idl.tao_yy" +{ tao_yyval.ival = 0;} +break; +case 147: +#line 1135 "fe/idl.tao_yy" { UTL_Scope *s = idl_global->scopes()->top_non_null(); AST_Native *node = NULL; @@ -2247,14 +2247,14 @@ case 146: idl_global->set_pragmas (p); } break; -case 147: -#line 1159 "fe/idl.tao_yy" +case 148: +#line 1161 "fe/idl.tao_yy" { idl_global->set_parse_state(IDL_GlobalData::PS_TypeSpecSeen); } break; -case 148: -#line 1163 "fe/idl.tao_yy" +case 149: +#line 1165 "fe/idl.tao_yy" { UTL_Scope *s = idl_global->scopes()->top_non_null(); UTL_DecllistActiveIterator *l; @@ -2287,14 +2287,14 @@ case 148: idl_global->set_pragmas (p); } break; -case 151: -#line 1203 "fe/idl.tao_yy" +case 152: +#line 1205 "fe/idl.tao_yy" { tao_yyval.dcval = idl_global->scopes()->bottom()->lookup_primitive_type(tao_yyvsp[0].etval); } break; -case 153: -#line 1208 "fe/idl.tao_yy" +case 154: +#line 1210 "fe/idl.tao_yy" { UTL_Scope *s = idl_global->scopes()->top_non_null(); AST_Decl *d = NULL; @@ -2306,20 +2306,20 @@ case 153: tao_yyval.dcval = d; } break; -case 166: -#line 1243 "fe/idl.tao_yy" +case 168: +#line 1246 "fe/idl.tao_yy" { tao_yyval.dlval = new UTL_DeclList(tao_yyvsp[-1].deval, tao_yyvsp[0].dlval); } break; -case 167: -#line 1251 "fe/idl.tao_yy" +case 169: +#line 1254 "fe/idl.tao_yy" { idl_global->set_parse_state(IDL_GlobalData::PS_DeclsCommaSeen); } break; -case 168: -#line 1255 "fe/idl.tao_yy" +case 170: +#line 1258 "fe/idl.tao_yy" { idl_global->set_parse_state(IDL_GlobalData::PS_DeclsDeclSeen); @@ -2331,26 +2331,26 @@ case 168: } } break; -case 169: -#line 1266 "fe/idl.tao_yy" +case 171: +#line 1269 "fe/idl.tao_yy" { tao_yyval.dlval = NULL; } break; -case 172: -#line 1278 "fe/idl.tao_yy" +case 174: +#line 1281 "fe/idl.tao_yy" { tao_yyval.dlval = new UTL_DeclList(tao_yyvsp[-1].deval, tao_yyvsp[0].dlval); } break; -case 173: -#line 1286 "fe/idl.tao_yy" +case 175: +#line 1289 "fe/idl.tao_yy" { idl_global->set_parse_state(IDL_GlobalData::PS_DeclsCommaSeen); } break; -case 174: -#line 1290 "fe/idl.tao_yy" +case 176: +#line 1293 "fe/idl.tao_yy" { idl_global->set_parse_state(IDL_GlobalData::PS_DeclsDeclSeen); @@ -2362,119 +2362,127 @@ case 174: } } break; -case 175: -#line 1301 "fe/idl.tao_yy" +case 177: +#line 1304 "fe/idl.tao_yy" { tao_yyval.dlval = NULL; } break; -case 176: -#line 1308 "fe/idl.tao_yy" +case 178: +#line 1311 "fe/idl.tao_yy" { tao_yyval.deval = new FE_Declarator(new UTL_ScopedName(tao_yyvsp[0].idval, NULL), FE_Declarator::FD_simple, NULL); } break; -case 177: -#line 1316 "fe/idl.tao_yy" +case 179: +#line 1319 "fe/idl.tao_yy" { tao_yyval.deval = new FE_Declarator(new UTL_ScopedName(tao_yyvsp[0].dcval->local_name(), NULL), FE_Declarator::FD_complex, tao_yyvsp[0].dcval); } break; -case 180: -#line 1330 "fe/idl.tao_yy" +case 182: +#line 1333 "fe/idl.tao_yy" { tao_yyval.etval = AST_Expression::EV_long; } break; -case 181: -#line 1334 "fe/idl.tao_yy" +case 183: +#line 1337 "fe/idl.tao_yy" { tao_yyval.etval = AST_Expression::EV_longlong; } break; -case 182: -#line 1338 "fe/idl.tao_yy" +case 184: +#line 1341 "fe/idl.tao_yy" { tao_yyval.etval = AST_Expression::EV_short; } break; -case 183: -#line 1345 "fe/idl.tao_yy" +case 185: +#line 1348 "fe/idl.tao_yy" { tao_yyval.etval = AST_Expression::EV_ulong; } break; -case 184: -#line 1349 "fe/idl.tao_yy" +case 186: +#line 1352 "fe/idl.tao_yy" { tao_yyval.etval = AST_Expression::EV_ulonglong; } break; -case 185: -#line 1353 "fe/idl.tao_yy" +case 187: +#line 1356 "fe/idl.tao_yy" { tao_yyval.etval = AST_Expression::EV_ushort; } break; -case 186: -#line 1360 "fe/idl.tao_yy" +case 188: +#line 1363 "fe/idl.tao_yy" { tao_yyval.etval = AST_Expression::EV_double; } break; -case 187: -#line 1364 "fe/idl.tao_yy" +case 189: +#line 1367 "fe/idl.tao_yy" { tao_yyval.etval = AST_Expression::EV_float; } break; -case 188: -#line 1368 "fe/idl.tao_yy" +case 190: +#line 1371 "fe/idl.tao_yy" { tao_yyval.etval = AST_Expression::EV_longdouble; } break; -case 189: -#line 1375 "fe/idl.tao_yy" +case 191: +#line 1378 "fe/idl.tao_yy" +{ + cerr << "error in " << idl_global->filename()->get_string() + << " line " << idl_global->lineno() << ":\n" ; + cerr << "Sorry, I (TAO_IDL) can't handle fixed types yet\n"; + } +break; +case 192: +#line 1387 "fe/idl.tao_yy" { tao_yyval.etval = AST_Expression::EV_char; } break; -case 190: -#line 1379 "fe/idl.tao_yy" +case 193: +#line 1391 "fe/idl.tao_yy" { tao_yyval.etval = AST_Expression::EV_wchar; } break; -case 191: -#line 1386 "fe/idl.tao_yy" +case 194: +#line 1398 "fe/idl.tao_yy" { tao_yyval.etval = AST_Expression::EV_octet; } break; -case 192: -#line 1393 "fe/idl.tao_yy" +case 195: +#line 1405 "fe/idl.tao_yy" { tao_yyval.etval = AST_Expression::EV_bool; } break; -case 193: -#line 1400 "fe/idl.tao_yy" +case 196: +#line 1412 "fe/idl.tao_yy" { tao_yyval.etval = AST_Expression::EV_any; } break; -case 194: -#line 1407 "fe/idl.tao_yy" +case 197: +#line 1419 "fe/idl.tao_yy" { idl_global->set_parse_state(IDL_GlobalData::PS_StructSeen); } break; -case 195: -#line 1411 "fe/idl.tao_yy" +case 198: +#line 1423 "fe/idl.tao_yy" { UTL_Scope *s = idl_global->scopes()->top_non_null(); UTL_ScopedName *n = new UTL_ScopedName(tao_yyvsp[0].idval, NULL); @@ -2499,20 +2507,20 @@ case 195: idl_global->scopes()->push(d); } break; -case 196: -#line 1435 "fe/idl.tao_yy" +case 199: +#line 1447 "fe/idl.tao_yy" { idl_global->set_parse_state(IDL_GlobalData::PS_StructSqSeen); } break; -case 197: -#line 1439 "fe/idl.tao_yy" +case 200: +#line 1451 "fe/idl.tao_yy" { idl_global->set_parse_state(IDL_GlobalData::PS_StructBodySeen); } break; -case 198: -#line 1443 "fe/idl.tao_yy" +case 201: +#line 1455 "fe/idl.tao_yy" { idl_global->set_parse_state(IDL_GlobalData::PS_StructQsSeen); /* @@ -2528,61 +2536,61 @@ case 198: idl_global->scopes()->pop(); } break; -case 200: -#line 1462 "fe/idl.tao_yy" +case 203: +#line 1474 "fe/idl.tao_yy" { idl_global->err()->syntax_error(idl_global->parse_state()); idl_global->set_parse_state(IDL_GlobalData::PS_NoState); tao_yyerrok; } break; -case 201: -#line 1468 "fe/idl.tao_yy" +case 204: +#line 1480 "fe/idl.tao_yy" { idl_global->err()->syntax_error(idl_global->parse_state()); } break; -case 202: -#line 1472 "fe/idl.tao_yy" +case 205: +#line 1484 "fe/idl.tao_yy" { idl_global->set_parse_state(IDL_GlobalData::PS_NoState); tao_yyerrok; } break; -case 205: -#line 1482 "fe/idl.tao_yy" +case 208: +#line 1494 "fe/idl.tao_yy" { idl_global->err()->syntax_error(idl_global->parse_state()); } break; -case 206: -#line 1486 "fe/idl.tao_yy" +case 209: +#line 1498 "fe/idl.tao_yy" { idl_global->set_parse_state(IDL_GlobalData::PS_NoState); tao_yyerrok; } break; -case 207: -#line 1493 "fe/idl.tao_yy" +case 210: +#line 1505 "fe/idl.tao_yy" { /* is $0 to member_i */ tao_yyval.vival = AST_Field::vis_NA; } break; -case 209: -#line 1502 "fe/idl.tao_yy" +case 212: +#line 1514 "fe/idl.tao_yy" { idl_global->set_parse_state(IDL_GlobalData::PS_MemberTypeSeen); } break; -case 210: -#line 1506 "fe/idl.tao_yy" +case 213: +#line 1518 "fe/idl.tao_yy" { idl_global->set_parse_state(IDL_GlobalData::PS_MemberDeclsSeen); } break; -case 211: -#line 1510 "fe/idl.tao_yy" +case 214: +#line 1522 "fe/idl.tao_yy" { UTL_Scope *s = idl_global->scopes()->top_non_null(); UTL_DecllistActiveIterator *l = NULL; @@ -2617,51 +2625,51 @@ case 211: } } break; -case 212: -#line 1544 "fe/idl.tao_yy" +case 215: +#line 1556 "fe/idl.tao_yy" { idl_global->err()->syntax_error(idl_global->parse_state()); } break; -case 213: -#line 1548 "fe/idl.tao_yy" +case 216: +#line 1560 "fe/idl.tao_yy" { idl_global->set_parse_state(IDL_GlobalData::PS_NoState); tao_yyerrok; } break; -case 214: -#line 1556 "fe/idl.tao_yy" +case 217: +#line 1568 "fe/idl.tao_yy" { idl_global->set_parse_state(IDL_GlobalData::PS_UnionSeen); } break; -case 215: -#line 1560 "fe/idl.tao_yy" +case 218: +#line 1572 "fe/idl.tao_yy" { idl_global->set_parse_state(IDL_GlobalData::PS_UnionIDSeen); } break; -case 216: -#line 1564 "fe/idl.tao_yy" +case 219: +#line 1576 "fe/idl.tao_yy" { idl_global->set_parse_state(IDL_GlobalData::PS_SwitchSeen); } break; -case 217: -#line 1568 "fe/idl.tao_yy" +case 220: +#line 1580 "fe/idl.tao_yy" { idl_global->set_parse_state(IDL_GlobalData::PS_SwitchOpenParSeen); } break; -case 218: -#line 1572 "fe/idl.tao_yy" +case 221: +#line 1584 "fe/idl.tao_yy" { idl_global->set_parse_state(IDL_GlobalData::PS_SwitchTypeSeen); } break; -case 219: -#line 1576 "fe/idl.tao_yy" +case 222: +#line 1588 "fe/idl.tao_yy" { UTL_Scope *s = idl_global->scopes()->top_non_null(); UTL_ScopedName *n = new UTL_ScopedName(tao_yyvsp[-8].idval, NULL); @@ -2691,20 +2699,20 @@ case 219: idl_global->scopes()->push(u); } break; -case 220: -#line 1605 "fe/idl.tao_yy" +case 223: +#line 1617 "fe/idl.tao_yy" { idl_global->set_parse_state(IDL_GlobalData::PS_UnionSqSeen); } break; -case 221: -#line 1609 "fe/idl.tao_yy" +case 224: +#line 1621 "fe/idl.tao_yy" { idl_global->set_parse_state(IDL_GlobalData::PS_UnionBodySeen); } break; -case 222: -#line 1613 "fe/idl.tao_yy" +case 225: +#line 1625 "fe/idl.tao_yy" { idl_global->set_parse_state(IDL_GlobalData::PS_UnionQsSeen); /* @@ -2720,33 +2728,33 @@ case 222: idl_global->scopes()->pop(); } break; -case 223: -#line 1631 "fe/idl.tao_yy" +case 226: +#line 1643 "fe/idl.tao_yy" { tao_yyval.dcval = idl_global->scopes()->bottom()->lookup_primitive_type(tao_yyvsp[0].etval); } break; -case 224: -#line 1635 "fe/idl.tao_yy" +case 227: +#line 1647 "fe/idl.tao_yy" { tao_yyval.dcval = idl_global->scopes()->bottom()->lookup_primitive_type(tao_yyvsp[0].etval); } break; -case 225: -#line 1639 "fe/idl.tao_yy" +case 228: +#line 1651 "fe/idl.tao_yy" { /* octets are not allowed*/ idl_global->err ()->error0 (UTL_Error::EIDL_DISC_TYPE); } break; -case 226: -#line 1644 "fe/idl.tao_yy" +case 229: +#line 1656 "fe/idl.tao_yy" { tao_yyval.dcval = idl_global->scopes()->bottom()->lookup_primitive_type(tao_yyvsp[0].etval); } break; -case 228: -#line 1649 "fe/idl.tao_yy" +case 231: +#line 1661 "fe/idl.tao_yy" { UTL_Scope *s = idl_global->scopes()->top_non_null(); AST_Decl *d = NULL; @@ -2816,20 +2824,20 @@ case 228: idl_global->err()->lookup_error(tao_yyvsp[0].idlist); } break; -case 232: -#line 1728 "fe/idl.tao_yy" +case 235: +#line 1740 "fe/idl.tao_yy" { idl_global->set_parse_state(IDL_GlobalData::PS_UnionLabelSeen); } break; -case 233: -#line 1732 "fe/idl.tao_yy" +case 236: +#line 1744 "fe/idl.tao_yy" { idl_global->set_parse_state(IDL_GlobalData::PS_UnionElemSeen); } break; -case 234: -#line 1736 "fe/idl.tao_yy" +case 237: +#line 1748 "fe/idl.tao_yy" { UTL_Scope *s = idl_global->scopes()->top_non_null(); UTL_LabellistActiveIterator *l = NULL; @@ -2854,27 +2862,27 @@ case 234: } } break; -case 235: -#line 1760 "fe/idl.tao_yy" +case 238: +#line 1772 "fe/idl.tao_yy" { idl_global->err()->syntax_error(idl_global->parse_state()); } break; -case 236: -#line 1765 "fe/idl.tao_yy" +case 239: +#line 1777 "fe/idl.tao_yy" { idl_global->set_parse_state(IDL_GlobalData::PS_NoState); tao_yyerrok; } break; -case 237: -#line 1773 "fe/idl.tao_yy" +case 240: +#line 1785 "fe/idl.tao_yy" { tao_yyval.llval = new UTL_LabelList(tao_yyvsp[-1].ulval, tao_yyvsp[0].llval); } break; -case 238: -#line 1780 "fe/idl.tao_yy" +case 241: +#line 1792 "fe/idl.tao_yy" { if (tao_yyvsp[-1].llval == NULL) tao_yyval.llval = new UTL_LabelList(tao_yyvsp[0].ulval, NULL); @@ -2884,20 +2892,20 @@ case 238: } } break; -case 239: -#line 1789 "fe/idl.tao_yy" +case 242: +#line 1801 "fe/idl.tao_yy" { tao_yyval.llval = NULL; } break; -case 240: -#line 1796 "fe/idl.tao_yy" +case 243: +#line 1808 "fe/idl.tao_yy" { idl_global->set_parse_state(IDL_GlobalData::PS_DefaultSeen); } break; -case 241: -#line 1800 "fe/idl.tao_yy" +case 244: +#line 1812 "fe/idl.tao_yy" { idl_global->set_parse_state(IDL_GlobalData::PS_LabelColonSeen); @@ -2906,20 +2914,20 @@ case 241: NULL); } break; -case 242: -#line 1808 "fe/idl.tao_yy" +case 245: +#line 1820 "fe/idl.tao_yy" { idl_global->set_parse_state(IDL_GlobalData::PS_CaseSeen); } break; -case 243: -#line 1812 "fe/idl.tao_yy" +case 246: +#line 1824 "fe/idl.tao_yy" { idl_global->set_parse_state(IDL_GlobalData::PS_LabelExprSeen); } break; -case 244: -#line 1816 "fe/idl.tao_yy" +case 247: +#line 1828 "fe/idl.tao_yy" { idl_global->set_parse_state(IDL_GlobalData::PS_LabelColonSeen); @@ -2927,14 +2935,14 @@ case 244: tao_yyvsp[-2].exval); } break; -case 245: -#line 1826 "fe/idl.tao_yy" +case 248: +#line 1838 "fe/idl.tao_yy" { idl_global->set_parse_state(IDL_GlobalData::PS_UnionElemTypeSeen); } break; -case 246: -#line 1830 "fe/idl.tao_yy" +case 249: +#line 1842 "fe/idl.tao_yy" { idl_global->set_parse_state(IDL_GlobalData::PS_UnionElemDeclSeen); /* @@ -2958,14 +2966,14 @@ case 246: } } break; -case 247: -#line 1856 "fe/idl.tao_yy" +case 250: +#line 1868 "fe/idl.tao_yy" { idl_global->set_parse_state(IDL_GlobalData::PS_EnumSeen); } break; -case 248: -#line 1860 "fe/idl.tao_yy" +case 251: +#line 1872 "fe/idl.tao_yy" { UTL_Scope *s = idl_global->scopes()->top_non_null(); UTL_ScopedName *n = new UTL_ScopedName(tao_yyvsp[0].idval, NULL); @@ -2993,20 +3001,20 @@ case 248: idl_global->scopes()->push(e); } break; -case 249: -#line 1887 "fe/idl.tao_yy" +case 252: +#line 1899 "fe/idl.tao_yy" { idl_global->set_parse_state(IDL_GlobalData::PS_EnumSqSeen); } break; -case 250: -#line 1891 "fe/idl.tao_yy" +case 253: +#line 1903 "fe/idl.tao_yy" { idl_global->set_parse_state(IDL_GlobalData::PS_EnumBodySeen); } break; -case 251: -#line 1895 "fe/idl.tao_yy" +case 254: +#line 1907 "fe/idl.tao_yy" { UTL_StrList *p = 0; idl_global->set_parse_state(IDL_GlobalData::PS_EnumQsSeen); @@ -3023,14 +3031,14 @@ case 251: idl_global->set_pragmas (p); } break; -case 253: -#line 1917 "fe/idl.tao_yy" +case 256: +#line 1929 "fe/idl.tao_yy" { idl_global->set_parse_state(IDL_GlobalData::PS_EnumCommaSeen); } break; -case 256: -#line 1926 "fe/idl.tao_yy" +case 259: +#line 1938 "fe/idl.tao_yy" { UTL_Scope *s = idl_global->scopes()->top_non_null(); UTL_ScopedName *n = @@ -3051,20 +3059,20 @@ case 256: } } break; -case 257: -#line 1950 "fe/idl.tao_yy" +case 260: +#line 1962 "fe/idl.tao_yy" { idl_global->set_parse_state(IDL_GlobalData::PS_SequenceCommaSeen); } break; -case 258: -#line 1954 "fe/idl.tao_yy" +case 261: +#line 1966 "fe/idl.tao_yy" { idl_global->set_parse_state(IDL_GlobalData::PS_SequenceExprSeen); } break; -case 259: -#line 1958 "fe/idl.tao_yy" +case 262: +#line 1970 "fe/idl.tao_yy" { idl_global->set_parse_state(IDL_GlobalData::PS_SequenceQsSeen); /* @@ -3095,8 +3103,8 @@ case 259: } } break; -case 260: -#line 1989 "fe/idl.tao_yy" +case 263: +#line 2001 "fe/idl.tao_yy" { idl_global->set_parse_state(IDL_GlobalData::PS_SequenceQsSeen); /* @@ -3127,8 +3135,8 @@ case 260: } } break; -case 261: -#line 2022 "fe/idl.tao_yy" +case 264: +#line 2034 "fe/idl.tao_yy" { idl_global->set_parse_state(IDL_GlobalData::PS_SequenceSeen); /* @@ -3137,33 +3145,33 @@ case 261: idl_global->scopes()->push(NULL); } break; -case 262: -#line 2030 "fe/idl.tao_yy" +case 265: +#line 2042 "fe/idl.tao_yy" { idl_global->set_parse_state(IDL_GlobalData::PS_SequenceSqSeen); } break; -case 263: -#line 2034 "fe/idl.tao_yy" +case 266: +#line 2046 "fe/idl.tao_yy" { idl_global->set_parse_state(IDL_GlobalData::PS_SequenceTypeSeen); tao_yyval.dcval = tao_yyvsp[0].dcval; } break; -case 264: -#line 2043 "fe/idl.tao_yy" +case 267: +#line 2055 "fe/idl.tao_yy" { idl_global->set_parse_state(IDL_GlobalData::PS_StringSqSeen); } break; -case 265: -#line 2047 "fe/idl.tao_yy" +case 268: +#line 2059 "fe/idl.tao_yy" { idl_global->set_parse_state(IDL_GlobalData::PS_StringExprSeen); } break; -case 266: -#line 2051 "fe/idl.tao_yy" +case 269: +#line 2063 "fe/idl.tao_yy" { idl_global->set_parse_state(IDL_GlobalData::PS_StringQsSeen); /* @@ -3182,8 +3190,8 @@ case 266: } } break; -case 267: -#line 2069 "fe/idl.tao_yy" +case 270: +#line 2081 "fe/idl.tao_yy" { idl_global->set_parse_state(IDL_GlobalData::PS_StringCompleted); /* @@ -3199,26 +3207,26 @@ case 267: ->fe_add_string(AST_String::narrow_from_decl(tao_yyval.dcval)); } break; -case 268: -#line 2087 "fe/idl.tao_yy" +case 271: +#line 2099 "fe/idl.tao_yy" { idl_global->set_parse_state(IDL_GlobalData::PS_StringSeen); } break; -case 269: -#line 2095 "fe/idl.tao_yy" +case 272: +#line 2107 "fe/idl.tao_yy" { idl_global->set_parse_state(IDL_GlobalData::PS_StringSqSeen); } break; -case 270: -#line 2099 "fe/idl.tao_yy" +case 273: +#line 2111 "fe/idl.tao_yy" { idl_global->set_parse_state(IDL_GlobalData::PS_StringExprSeen); } break; -case 271: -#line 2103 "fe/idl.tao_yy" +case 274: +#line 2115 "fe/idl.tao_yy" { idl_global->set_parse_state(IDL_GlobalData::PS_StringQsSeen); /* @@ -3237,8 +3245,8 @@ case 271: } } break; -case 272: -#line 2121 "fe/idl.tao_yy" +case 275: +#line 2133 "fe/idl.tao_yy" { idl_global->set_parse_state(IDL_GlobalData::PS_StringCompleted); /* @@ -3254,20 +3262,20 @@ case 272: ->fe_add_string(AST_String::narrow_from_decl(tao_yyval.dcval)); } break; -case 273: -#line 2139 "fe/idl.tao_yy" +case 276: +#line 2151 "fe/idl.tao_yy" { idl_global->set_parse_state(IDL_GlobalData::PS_StringSeen); } break; -case 274: -#line 2146 "fe/idl.tao_yy" +case 277: +#line 2158 "fe/idl.tao_yy" { idl_global->set_parse_state(IDL_GlobalData::PS_ArrayIDSeen); } break; -case 275: -#line 2150 "fe/idl.tao_yy" +case 278: +#line 2162 "fe/idl.tao_yy" { idl_global->set_parse_state(IDL_GlobalData::PS_ArrayCompleted); /* @@ -3279,14 +3287,14 @@ case 275: } } break; -case 276: -#line 2164 "fe/idl.tao_yy" +case 279: +#line 2176 "fe/idl.tao_yy" { tao_yyval.elval = new UTL_ExprList(tao_yyvsp[-1].exval, tao_yyvsp[0].elval); } break; -case 277: -#line 2171 "fe/idl.tao_yy" +case 280: +#line 2183 "fe/idl.tao_yy" { if (tao_yyvsp[-1].elval == NULL) tao_yyval.elval = new UTL_ExprList(tao_yyvsp[0].exval, NULL); @@ -3296,26 +3304,26 @@ case 277: } } break; -case 278: -#line 2180 "fe/idl.tao_yy" +case 281: +#line 2192 "fe/idl.tao_yy" { tao_yyval.elval = NULL; } break; -case 279: -#line 2187 "fe/idl.tao_yy" +case 282: +#line 2199 "fe/idl.tao_yy" { idl_global->set_parse_state(IDL_GlobalData::PS_DimSqSeen); } break; -case 280: -#line 2191 "fe/idl.tao_yy" +case 283: +#line 2203 "fe/idl.tao_yy" { idl_global->set_parse_state(IDL_GlobalData::PS_DimExprSeen); } break; -case 281: -#line 2195 "fe/idl.tao_yy" +case 284: +#line 2207 "fe/idl.tao_yy" { idl_global->set_parse_state(IDL_GlobalData::PS_DimQsSeen); /* @@ -3329,20 +3337,20 @@ case 281: tao_yyval.exval = tao_yyvsp[-2].exval; } break; -case 282: -#line 2212 "fe/idl.tao_yy" +case 285: +#line 2224 "fe/idl.tao_yy" { idl_global->set_parse_state(IDL_GlobalData::PS_AttrSeen); } break; -case 283: -#line 2216 "fe/idl.tao_yy" +case 286: +#line 2228 "fe/idl.tao_yy" { idl_global->set_parse_state(IDL_GlobalData::PS_AttrTypeSeen); } break; -case 284: -#line 2220 "fe/idl.tao_yy" +case 287: +#line 2232 "fe/idl.tao_yy" { UTL_Scope *s = idl_global->scopes()->top_non_null(); UTL_DecllistActiveIterator *l = NULL; @@ -3375,27 +3383,27 @@ case 284: idl_global->set_pragmas (p); } break; -case 285: -#line 2255 "fe/idl.tao_yy" +case 288: +#line 2267 "fe/idl.tao_yy" { idl_global->set_parse_state(IDL_GlobalData::PS_AttrROSeen); tao_yyval.bval = I_TRUE; } break; -case 286: -#line 2260 "fe/idl.tao_yy" +case 289: +#line 2272 "fe/idl.tao_yy" { tao_yyval.bval = I_FALSE; } break; -case 287: -#line 2267 "fe/idl.tao_yy" +case 290: +#line 2279 "fe/idl.tao_yy" { idl_global->set_parse_state(IDL_GlobalData::PS_ExceptSeen); } break; -case 288: -#line 2271 "fe/idl.tao_yy" +case 291: +#line 2283 "fe/idl.tao_yy" { UTL_Scope *s = idl_global->scopes()->top_non_null(); UTL_ScopedName *n = new UTL_ScopedName(tao_yyvsp[0].idval, NULL); @@ -3420,20 +3428,20 @@ case 288: idl_global->scopes()->push(e); } break; -case 289: -#line 2295 "fe/idl.tao_yy" +case 292: +#line 2307 "fe/idl.tao_yy" { idl_global->set_parse_state(IDL_GlobalData::PS_ExceptSqSeen); } break; -case 290: -#line 2299 "fe/idl.tao_yy" +case 293: +#line 2311 "fe/idl.tao_yy" { idl_global->set_parse_state(IDL_GlobalData::PS_ExceptBodySeen); } break; -case 291: -#line 2303 "fe/idl.tao_yy" +case 294: +#line 2315 "fe/idl.tao_yy" { idl_global->set_parse_state(IDL_GlobalData::PS_ExceptQsSeen); /* @@ -3446,14 +3454,14 @@ case 291: idl_global->set_pragmas (p); } break; -case 292: -#line 2319 "fe/idl.tao_yy" +case 295: +#line 2331 "fe/idl.tao_yy" { idl_global->set_parse_state(IDL_GlobalData::PS_OpTypeSeen); } break; -case 293: -#line 2323 "fe/idl.tao_yy" +case 296: +#line 2335 "fe/idl.tao_yy" { UTL_Scope *s = idl_global->scopes()->top_non_null(); UTL_ScopedName *n = @@ -3483,20 +3491,20 @@ case 293: idl_global->scopes()->push(o); } break; -case 294: -#line 2352 "fe/idl.tao_yy" +case 297: +#line 2364 "fe/idl.tao_yy" { idl_global->set_parse_state(IDL_GlobalData::PS_OpParsCompleted); } break; -case 295: -#line 2356 "fe/idl.tao_yy" +case 298: +#line 2368 "fe/idl.tao_yy" { idl_global->set_parse_state(IDL_GlobalData::PS_OpRaiseCompleted); } break; -case 296: -#line 2360 "fe/idl.tao_yy" +case 299: +#line 2372 "fe/idl.tao_yy" { UTL_Scope *s = idl_global->scopes()->top_non_null(); AST_Operation *o = NULL; @@ -3519,86 +3527,86 @@ case 296: idl_global->scopes()->pop(); } break; -case 297: -#line 2385 "fe/idl.tao_yy" +case 300: +#line 2397 "fe/idl.tao_yy" { idl_global->set_parse_state(IDL_GlobalData::PS_OpAttrSeen); tao_yyval.ofval = AST_Operation::OP_oneway; } break; -case 298: -#line 2390 "fe/idl.tao_yy" +case 301: +#line 2402 "fe/idl.tao_yy" { idl_global->set_parse_state(IDL_GlobalData::PS_OpAttrSeen); tao_yyval.ofval = AST_Operation::OP_idempotent; } break; -case 299: -#line 2395 "fe/idl.tao_yy" +case 302: +#line 2407 "fe/idl.tao_yy" { tao_yyval.ofval = AST_Operation::OP_noflags; } break; -case 301: -#line 2403 "fe/idl.tao_yy" +case 304: +#line 2415 "fe/idl.tao_yy" { tao_yyval.dcval = idl_global->scopes()->bottom() ->lookup_primitive_type(AST_Expression::EV_void); } break; -case 302: -#line 2412 "fe/idl.tao_yy" +case 305: +#line 2424 "fe/idl.tao_yy" { cerr << "error in " << idl_global->filename()->get_string() << " line " << idl_global->lineno() << ":\n" ; cerr << "Sorry, I (TAO_IDL) can't handle init yet\n"; } break; -case 303: -#line 2422 "fe/idl.tao_yy" +case 306: +#line 2434 "fe/idl.tao_yy" { idl_global->set_parse_state(IDL_GlobalData::PS_OpSqSeen); } break; -case 304: -#line 2426 "fe/idl.tao_yy" +case 307: +#line 2438 "fe/idl.tao_yy" { idl_global->set_parse_state(IDL_GlobalData::PS_OpQsSeen); } break; -case 305: -#line 2430 "fe/idl.tao_yy" +case 308: +#line 2442 "fe/idl.tao_yy" { idl_global->set_parse_state(IDL_GlobalData::PS_OpSqSeen); } break; -case 306: -#line 2435 "fe/idl.tao_yy" +case 309: +#line 2447 "fe/idl.tao_yy" { idl_global->set_parse_state(IDL_GlobalData::PS_OpQsSeen); } break; -case 308: -#line 2445 "fe/idl.tao_yy" +case 311: +#line 2457 "fe/idl.tao_yy" { idl_global->set_parse_state(IDL_GlobalData::PS_OpParCommaSeen); } break; -case 311: -#line 2454 "fe/idl.tao_yy" +case 314: +#line 2466 "fe/idl.tao_yy" { idl_global->set_parse_state(IDL_GlobalData::PS_OpParDirSeen); } break; -case 312: -#line 2458 "fe/idl.tao_yy" +case 315: +#line 2470 "fe/idl.tao_yy" { idl_global->set_parse_state(IDL_GlobalData::PS_OpParTypeSeen); } break; -case 313: -#line 2462 "fe/idl.tao_yy" +case 316: +#line 2474 "fe/idl.tao_yy" { UTL_Scope *s = idl_global->scopes()->top_non_null(); AST_Argument *a = NULL; @@ -3618,14 +3626,14 @@ case 313: } } break; -case 314: -#line 2484 "fe/idl.tao_yy" +case 317: +#line 2496 "fe/idl.tao_yy" { tao_yyval.dcval = idl_global->scopes()->bottom()->lookup_primitive_type(tao_yyvsp[0].etval); } break; -case 317: -#line 2490 "fe/idl.tao_yy" +case 320: +#line 2502 "fe/idl.tao_yy" { UTL_Scope *s = idl_global->scopes()->top_non_null(); AST_Decl *d = NULL; @@ -3637,88 +3645,88 @@ case 317: tao_yyval.dcval = d; } break; -case 318: -#line 2504 "fe/idl.tao_yy" +case 321: +#line 2516 "fe/idl.tao_yy" { tao_yyval.dival = AST_Argument::dir_IN; } break; -case 319: -#line 2508 "fe/idl.tao_yy" +case 322: +#line 2520 "fe/idl.tao_yy" { tao_yyval.dival = AST_Argument::dir_OUT; } break; -case 320: -#line 2512 "fe/idl.tao_yy" +case 323: +#line 2524 "fe/idl.tao_yy" { tao_yyval.dival = AST_Argument::dir_INOUT; } break; -case 321: -#line 2519 "fe/idl.tao_yy" +case 324: +#line 2531 "fe/idl.tao_yy" { idl_global->set_parse_state(IDL_GlobalData::PS_OpRaiseSeen); } break; -case 322: -#line 2523 "fe/idl.tao_yy" +case 325: +#line 2535 "fe/idl.tao_yy" { idl_global->set_parse_state(IDL_GlobalData::PS_OpRaiseSqSeen); } break; -case 323: -#line 2528 "fe/idl.tao_yy" +case 326: +#line 2540 "fe/idl.tao_yy" { idl_global->set_parse_state(IDL_GlobalData::PS_OpRaiseQsSeen); tao_yyval.nlval = tao_yyvsp[-1].nlval; } break; -case 324: -#line 2533 "fe/idl.tao_yy" +case 327: +#line 2545 "fe/idl.tao_yy" { tao_yyval.nlval = NULL; } break; -case 325: -#line 2540 "fe/idl.tao_yy" +case 328: +#line 2552 "fe/idl.tao_yy" { idl_global->set_parse_state(IDL_GlobalData::PS_OpContextSeen); } break; -case 326: -#line 2544 "fe/idl.tao_yy" +case 329: +#line 2556 "fe/idl.tao_yy" { idl_global->set_parse_state(IDL_GlobalData::PS_OpContextSqSeen); } break; -case 327: -#line 2549 "fe/idl.tao_yy" +case 330: +#line 2561 "fe/idl.tao_yy" { idl_global->set_parse_state(IDL_GlobalData::PS_OpContextQsSeen); tao_yyval.slval = tao_yyvsp[-1].slval; } break; -case 328: -#line 2554 "fe/idl.tao_yy" +case 331: +#line 2566 "fe/idl.tao_yy" { tao_yyval.slval = NULL; } break; -case 329: -#line 2561 "fe/idl.tao_yy" +case 332: +#line 2573 "fe/idl.tao_yy" { tao_yyval.slval = new UTL_StrList(tao_yyvsp[-1].sval, tao_yyvsp[0].slval); } break; -case 330: -#line 2569 "fe/idl.tao_yy" +case 333: +#line 2581 "fe/idl.tao_yy" { idl_global->set_parse_state(IDL_GlobalData::PS_OpContextCommaSeen); } break; -case 331: -#line 2573 "fe/idl.tao_yy" +case 334: +#line 2585 "fe/idl.tao_yy" { if (tao_yyvsp[-3].slval == NULL) tao_yyval.slval = new UTL_StrList(tao_yyvsp[0].sval, NULL); @@ -3728,13 +3736,13 @@ case 331: } } break; -case 332: -#line 2582 "fe/idl.tao_yy" +case 335: +#line 2594 "fe/idl.tao_yy" { tao_yyval.slval = NULL; } break; -#line 3737 "y.tab.cpp" +#line 3745 "y.tab.cpp" } tao_yyssp -= tao_yym; tao_yystate = *tao_yyssp; diff --git a/TAO/TAO_IDL/fe/y.tab.h b/TAO/TAO_IDL/fe/y.tab.h index 25f3d1f22e8..e60f5d13d89 100644 --- a/TAO/TAO_IDL/fe/y.tab.h +++ b/TAO/TAO_IDL/fe/y.tab.h @@ -13,48 +13,49 @@ #define IDL_WCHAR 268 #define IDL_OCTET 269 #define IDL_BOOLEAN 270 -#define IDL_ANY 271 -#define IDL_STRUCT 272 -#define IDL_UNION 273 -#define IDL_SWITCH 274 -#define IDL_ENUM 275 -#define IDL_SEQUENCE 276 -#define IDL_STRING 277 -#define IDL_WSTRING 278 -#define IDL_EXCEPTION 279 -#define IDL_CASE 280 -#define IDL_DEFAULT 281 -#define IDL_READONLY 282 -#define IDL_ATTRIBUTE 283 -#define IDL_ONEWAY 284 -#define IDL_IDEMPOTENT 285 -#define IDL_VOID 286 -#define IDL_IN 287 -#define IDL_OUT 288 -#define IDL_INOUT 289 -#define IDL_RAISES 290 -#define IDL_CONTEXT 291 -#define IDL_NATIVE 292 -#define IDL_ABSTRACT 293 -#define IDL_CUSTOM 294 -#define IDL_INIT 295 -#define IDL_PRIVATE 296 -#define IDL_PUBLIC 297 -#define IDL_SUPPORTS 298 -#define IDL_TRUNCATABLE 299 -#define IDL_VALUETYPE 300 -#define IDL_INTEGER_LITERAL 301 -#define IDL_UINTEGER_LITERAL 302 -#define IDL_STRING_LITERAL 303 -#define IDL_CHARACTER_LITERAL 304 -#define IDL_FLOATING_PT_LITERAL 305 -#define IDL_TRUETOK 306 -#define IDL_FALSETOK 307 -#define IDL_SCOPE_DELIMITOR 308 -#define IDL_LEFT_SHIFT 309 -#define IDL_RIGHT_SHIFT 310 -#define IDL_WCHAR_LITERAL 311 -#define IDL_WSTRING_LITERAL 312 +#define IDL_FIXED 271 +#define IDL_ANY 272 +#define IDL_STRUCT 273 +#define IDL_UNION 274 +#define IDL_SWITCH 275 +#define IDL_ENUM 276 +#define IDL_SEQUENCE 277 +#define IDL_STRING 278 +#define IDL_WSTRING 279 +#define IDL_EXCEPTION 280 +#define IDL_CASE 281 +#define IDL_DEFAULT 282 +#define IDL_READONLY 283 +#define IDL_ATTRIBUTE 284 +#define IDL_ONEWAY 285 +#define IDL_IDEMPOTENT 286 +#define IDL_VOID 287 +#define IDL_IN 288 +#define IDL_OUT 289 +#define IDL_INOUT 290 +#define IDL_RAISES 291 +#define IDL_CONTEXT 292 +#define IDL_NATIVE 293 +#define IDL_ABSTRACT 294 +#define IDL_CUSTOM 295 +#define IDL_INIT 296 +#define IDL_PRIVATE 297 +#define IDL_PUBLIC 298 +#define IDL_SUPPORTS 299 +#define IDL_TRUNCATABLE 300 +#define IDL_VALUETYPE 301 +#define IDL_INTEGER_LITERAL 302 +#define IDL_UINTEGER_LITERAL 303 +#define IDL_STRING_LITERAL 304 +#define IDL_CHARACTER_LITERAL 305 +#define IDL_FLOATING_PT_LITERAL 306 +#define IDL_TRUETOK 307 +#define IDL_FALSETOK 308 +#define IDL_SCOPE_DELIMITOR 309 +#define IDL_LEFT_SHIFT 310 +#define IDL_RIGHT_SHIFT 311 +#define IDL_WCHAR_LITERAL 312 +#define IDL_WSTRING_LITERAL 313 typedef union { AST_Decl *dcval; /* Decl value */ UTL_StrList *slval; /* String list */ |