diff options
| author | parsons <parsons@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2009-12-22 17:13:29 +0000 |
|---|---|---|
| committer | parsons <parsons@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2009-12-22 17:13:29 +0000 |
| commit | 76a55d6844f8de5394e4da505871b97a4db97540 (patch) | |
| tree | 45d4fb8c619e3463d162d1c47523ce8786269a66 /TAO | |
| parent | 7ad719e4a332b844813f62f7f1122899b722a30f (diff) | |
| download | ATCD-76a55d6844f8de5394e4da505871b97a4db97540.tar.gz | |
ChangeLogTag: Tue Dec 22 17:06:08 UTC 2009 Jeff Parsons <j.parsons@vanderbilt.edu>
Diffstat (limited to 'TAO')
| -rw-r--r-- | TAO/ChangeLog | 17 | ||||
| -rw-r--r-- | TAO/TAO_IDL/fe/fe_utils.cpp | 57 | ||||
| -rw-r--r-- | TAO/TAO_IDL/fe/idl.yy | 52 | ||||
| -rw-r--r-- | TAO/TAO_IDL/fe/y.tab.cpp | 2881 | ||||
| -rw-r--r-- | TAO/TAO_IDL/fe/y.tab.h | 4 | ||||
| -rw-r--r-- | TAO/TAO_IDL/include/fe_utils.h | 31 | ||||
| -rw-r--r-- | TAO/TAO_IDL/include/utl_err.h | 2 |
7 files changed, 1473 insertions, 1571 deletions
diff --git a/TAO/ChangeLog b/TAO/ChangeLog index aad7613c51d..bba6dbfd33f 100644 --- a/TAO/ChangeLog +++ b/TAO/ChangeLog @@ -1,8 +1,17 @@ -Tue Dec 22 15:59:42 UTC 2009 Johnny Willemsen <jwillemsen@remedy.nl> +Tue Dec 22 17:06:08 UTC 2009 Jeff Parsons <j.parsons@vanderbilt.edu> - * tests/IDL_Test/attribute.idl: - * tests/IDL_Test/IDL_Test.mpc: - Added test file for attributes + * TAO_IDL/fe/fe_utils.cpp: + * TAO_IDL/fe/idl.yy: + * TAO_IDL/fe/y.tab.h: + * TAO_IDL/fe/y.tab.cpp: + * TAO_IDL/include/fe_utils.h: + * TAO_IDL/include/utl_err.h: + + - Fixed bug in grammar that did not allow a template module + to be declared inside a regular module. + + - Removed unused data types from FE_Utils and from the big + parser union. Mon Dec 21 20:11:42 UTC 2009 Jeff Parsons <j.parsons@vanderbilt.edu> diff --git a/TAO/TAO_IDL/fe/fe_utils.cpp b/TAO/TAO_IDL/fe/fe_utils.cpp index 027efab15fc..0cd9050d517 100644 --- a/TAO/TAO_IDL/fe/fe_utils.cpp +++ b/TAO/TAO_IDL/fe/fe_utils.cpp @@ -42,63 +42,6 @@ FE_Utils::duplicate_param_id (T_PARAMLIST_INFO *params) return false; } -FE_Utils::T_Ref_Info::T_Ref_Info (void) - : name_ (0), - params_ (0) -{ -} - -FE_Utils::T_Ref_Info::T_Ref_Info (UTL_ScopedName *n, - UTL_StrList *strs) - : name_ (n), - params_ (strs) -{ -} - -void -FE_Utils::T_Ref_Info::destroy (void) -{ - if (name_ != 0) - { - name_->destroy (); - delete name_; - name_ = 0; - } - - if (params_ != 0) - { - params_->destroy (); - delete params_; - params_ = 0; - } -} - -FE_Utils::T_Port_Info::T_Port_Info (const char *name, - AST_PortType *type) - : name_ (name), - type_ (type) -{ -} - -FE_Utils::T_Inst_Info::T_Inst_Info (UTL_ScopedName *n, - UTL_NameList *args) - : name_ (n), - args_ (args) -{ -} - -void -FE_Utils::T_Inst_Info::destroy (void) -{ - this->name_->destroy (); - delete this->name_; - this->name_ = 0; - - this->args_->destroy (); - delete this->args_; - this->args_ = 0; -} - void FE_Utils::T_ARGLIST::destroy (void) { diff --git a/TAO/TAO_IDL/fe/idl.yy b/TAO/TAO_IDL/fe/idl.yy index 54b2d87cab2..dd9fd4c4662 100644 --- a/TAO/TAO_IDL/fe/idl.yy +++ b/TAO/TAO_IDL/fe/idl.yy @@ -182,10 +182,6 @@ AST_Expression::ExprType t_param_const_type = AST_Expression::EV_none; AST_Decl::NodeType ntval; /* Node type value */ FE_Utils::T_Param_Info *pival; /* Template interface param */ FE_Utils::T_PARAMLIST_INFO *plval; /* List of template params */ - FE_Utils::T_Ref_Info *trval; /* Template interface info */ - FE_Utils::T_REFLIST_INFO *rlval; /* List of above structs */ - FE_Utils::T_Inst_Info *tival; /* Template instantiation */ - FE_Utils::T_Port_Info *ptval; /* Porttype reference */ FE_Utils::T_ARGLIST *alval; /* List of template args */ } @@ -377,13 +373,8 @@ definition } ; -at_least_one_fixed_definition - : fixed_definitions fixed_definition - ; - -fixed_definitions - : fixed_definitions fixed_definition - | /* EMPTY */ +at_least_one_definition + : definitions definition ; fixed_definition @@ -447,9 +438,9 @@ fixed_definition // ';' idl_global->set_parse_state (IDL_GlobalData::PS_NoState); } - | fixed_module + | module { -// | fixed_module +// | module idl_global->set_parse_state (IDL_GlobalData::PS_ModuleDeclSeen); } ';' @@ -542,10 +533,10 @@ module_header } ; -fixed_module +module : module_header { -// fixed_module : module_header +// module : module_header idl_global->set_parse_state (IDL_GlobalData::PS_ModuleIDSeen); // The module_header rule is common to template module, fixed @@ -583,9 +574,9 @@ fixed_module // '{' idl_global->set_parse_state (IDL_GlobalData::PS_ModuleSqSeen); } - at_least_one_fixed_definition + at_least_one_definition { -// at_least_one_fixed_definition +// at_least_one_definition idl_global->set_parse_state (IDL_GlobalData::PS_ModuleBodySeen); } '}' @@ -628,7 +619,7 @@ template_module { idl_global->err ()->duplicate_param_id ( $1); - + return 1; } } @@ -649,7 +640,7 @@ template_module * Push it on the stack */ idl_global->scopes ().push (tm); - + // Store these for reference as we parse the scope // of the template module. idl_global->current_params ($3); @@ -1398,17 +1389,23 @@ state_member : IDL_PUBLIC { // state_member : IDL_PUBLIC + } + member_i + { +// member_i /* is $0 to member_i */ $<vival>$ = AST_Field::vis_PUBLIC; } - member_i | IDL_PRIVATE { -// IDL_PRIVATE +// IDL_PRIVATE + } + member_i + { +// member_i /* is $0 to member_i */ $<vival>$ = AST_Field::vis_PRIVATE; } - member_i ; exports @@ -5404,6 +5401,9 @@ emits_decl : IDL_EMITS scoped_name id // emits_decl : IDL_EMITS scoped_name id UTL_Scope *s = idl_global->scopes ().top_non_null (); bool so_far_so_good = true; + AST_Decl::NodeType nt = AST_Decl::NT_type; + AST_Param_Holder *ph = 0; + AST_Decl *d = s->lookup_by_name ($2, true); @@ -5415,7 +5415,7 @@ emits_decl : IDL_EMITS scoped_name id else { nt = d->node_type (); - + switch (nt) { case AST_Decl::NT_eventtype: @@ -5423,16 +5423,16 @@ emits_decl : IDL_EMITS scoped_name id case AST_Decl::NT_param_holder: ph = AST_Param_Holder::narrow_from_decl (d); nt = ph->info ()->type_; - + if (nt != AST_Decl::NT_type && nt != AST_Decl::NT_eventtype) { idl_global->err ()->mismatched_template_param ( ph->info ()->name_.c_str ()); - + so_far_so_good = false; } - + break; default: idl_global->err ()->eventtype_expected (d); diff --git a/TAO/TAO_IDL/fe/y.tab.cpp b/TAO/TAO_IDL/fe/y.tab.cpp index 32f608a0a84..32a9fff0675 100644 --- a/TAO/TAO_IDL/fe/y.tab.cpp +++ b/TAO/TAO_IDL/fe/y.tab.cpp @@ -369,10 +369,6 @@ typedef union TAO_YYSTYPE AST_Decl::NodeType ntval; /* Node type value */ FE_Utils::T_Param_Info *pival; /* Template interface param */ FE_Utils::T_PARAMLIST_INFO *plval; /* List of template params */ - FE_Utils::T_Ref_Info *trval; /* Template interface info */ - FE_Utils::T_REFLIST_INFO *rlval; /* List of above structs */ - FE_Utils::T_Inst_Info *tival; /* Template instantiation */ - FE_Utils::T_Port_Info *ptval; /* Porttype reference */ FE_Utils::T_ARGLIST *alval; /* List of template args */ } /* Line 187 of yacc.c. */ @@ -604,14 +600,14 @@ union tao_yyalloc /* TAO_YYFINAL -- State number of the termination state. */ #define TAO_YYFINAL 3 /* TAO_YYLAST -- Last index in TAO_YYTABLE. */ -#define TAO_YYLAST 1264 +#define TAO_YYLAST 1234 /* TAO_YYNTOKENS -- Number of terminals. */ #define TAO_YYNTOKENS 106 /* TAO_YYNNTS -- Number of nonterminals. */ -#define TAO_YYNNTS 382 +#define TAO_YYNNTS 381 /* TAO_YYNRULES -- Number of rules. */ -#define TAO_YYNRULES 565 +#define TAO_YYNRULES 563 /* TAO_YYNRULES -- Number of states. */ #define TAO_YYNSTATES 808 @@ -667,273 +663,273 @@ static const tao_yytype_uint8 tao_yytranslate[] = static const tao_yytype_uint16 tao_yyprhs[] = { 0, 0, 3, 5, 8, 9, 11, 14, 17, 20, - 23, 24, 25, 29, 30, 34, 35, 39, 40, 44, - 45, 49, 50, 54, 55, 59, 60, 64, 65, 69, - 70, 74, 75, 79, 80, 84, 85, 89, 90, 94, - 95, 99, 100, 101, 102, 110, 113, 114, 115, 116, - 117, 118, 130, 133, 136, 137, 139, 142, 143, 144, - 153, 154, 155, 162, 164, 166, 167, 168, 169, 177, - 178, 182, 185, 189, 193, 194, 199, 200, 202, 204, - 206, 208, 211, 213, 214, 215, 216, 224, 225, 226, - 227, 236, 237, 242, 243, 247, 249, 250, 253, 254, - 257, 259, 262, 265, 266, 268, 270, 273, 274, 278, - 279, 283, 286, 287, 288, 292, 293, 297, 298, 302, - 303, 307, 308, 312, 313, 317, 318, 322, 323, 327, - 330, 331, 336, 337, 339, 340, 344, 345, 350, 352, - 354, 357, 360, 361, 362, 363, 364, 374, 376, 378, - 380, 382, 384, 386, 388, 390, 392, 394, 396, 398, - 402, 404, 408, 410, 414, 416, 420, 424, 426, 430, - 434, 436, 440, 444, 448, 450, 453, 456, 459, 461, - 463, 467, 469, 471, 473, 475, 477, 479, 481, 483, - 485, 487, 488, 492, 494, 496, 498, 501, 503, 504, + 21, 25, 26, 30, 31, 35, 36, 40, 41, 45, + 46, 50, 51, 55, 56, 60, 61, 65, 66, 70, + 71, 75, 76, 80, 81, 85, 86, 90, 91, 95, + 96, 97, 98, 106, 109, 110, 111, 112, 113, 114, + 126, 129, 132, 133, 135, 138, 139, 140, 149, 150, + 151, 158, 160, 162, 163, 164, 165, 173, 174, 178, + 181, 185, 189, 190, 195, 196, 198, 200, 202, 204, + 207, 209, 210, 211, 212, 220, 221, 222, 223, 232, + 233, 238, 239, 243, 245, 246, 249, 250, 253, 255, + 258, 261, 262, 264, 266, 269, 270, 274, 275, 279, + 282, 283, 284, 288, 289, 293, 294, 298, 299, 303, + 304, 308, 309, 313, 314, 318, 319, 323, 326, 327, + 332, 333, 335, 336, 340, 341, 346, 348, 350, 353, + 356, 357, 358, 359, 360, 370, 372, 374, 376, 378, + 380, 382, 384, 386, 388, 390, 392, 394, 398, 400, + 404, 406, 410, 412, 416, 420, 422, 426, 430, 432, + 436, 440, 444, 446, 449, 452, 455, 457, 459, 463, + 465, 467, 469, 471, 473, 475, 477, 479, 481, 483, + 484, 488, 490, 492, 494, 497, 499, 500, 504, 506, 508, 510, 512, 514, 516, 518, 520, 522, 524, 526, 528, 530, 532, 534, 536, 538, 540, 542, 544, 546, - 548, 550, 553, 554, 559, 560, 562, 564, 567, 568, - 573, 574, 576, 578, 580, 582, 584, 587, 589, 592, - 596, 599, 601, 603, 606, 608, 610, 612, 614, 616, - 618, 620, 621, 625, 626, 627, 628, 636, 639, 642, - 643, 644, 647, 648, 649, 655, 656, 660, 661, 665, - 666, 667, 668, 669, 670, 671, 686, 688, 690, 692, - 694, 696, 698, 701, 704, 705, 706, 707, 713, 714, - 718, 721, 724, 725, 726, 730, 731, 732, 738, 739, - 743, 745, 747, 748, 749, 750, 751, 761, 764, 765, - 770, 771, 773, 774, 775, 782, 785, 786, 787, 793, - 794, 795, 802, 804, 806, 807, 808, 815, 817, 819, - 820, 824, 827, 830, 831, 832, 833, 839, 841, 843, - 844, 845, 846, 847, 857, 858, 859, 860, 861, 871, - 872, 873, 874, 875, 885, 886, 887, 888, 889, 900, - 902, 904, 905, 907, 909, 910, 911, 912, 920, 921, - 925, 926, 931, 934, 935, 940, 941, 942, 943, 949, - 950, 954, 955, 960, 963, 964, 969, 970, 971, 972, - 978, 980, 982, 984, 986, 988, 990, 992, 993, 994, - 1001, 1002, 1003, 1004, 1011, 1012, 1013, 1014, 1021, 1022, - 1023, 1024, 1031, 1032, 1035, 1036, 1041, 1042, 1046, 1050, - 1052, 1054, 1057, 1058, 1059, 1060, 1068, 1069, 1070, 1077, - 1078, 1082, 1083, 1086, 1087, 1088, 1092, 1093, 1097, 1098, - 1102, 1103, 1107, 1108, 1112, 1113, 1117, 1118, 1122, 1126, - 1128, 1130, 1134, 1137, 1139, 1140, 1144, 1148, 1152, 1153, - 1157, 1158, 1159, 1160, 1161, 1162, 1163, 1177, 1178, 1182, - 1183, 1186, 1187, 1188, 1189, 1195, 1198, 1199, 1201, 1202, - 1206, 1207, 1211, 1212, 1213, 1220, 1221, 1222, 1229, 1231, - 1233, 1235, 1237, 1239, 1242, 1246, 1247, 1248, 1249, 1258, - 1262, 1266, 1269, 1270, 1274, 1275, 1276, 1277, 1286, 1288, - 1290, 1292, 1294, 1296, 1298, 1300, 1302, 1304, 1306, 1308, - 1311, 1314, 1315, 1320, 1321, 1324, 1330, 1333, 1337, 1338, - 1340, 1341, 1342, 1343, 1344, 1354, 1357, 1360, 1361, 1362, - 1366, 1367, 1371, 1375, 1379, 1382, 1386, 1387, 1389, 1392, - 1393, 1394, 1400, 1401, 1402, 1408, 1411, 1414, 1415, 1416, - 1420, 1421, 1425, 1426, 1430, 1431 + 549, 550, 555, 556, 558, 560, 563, 564, 569, 570, + 572, 574, 576, 578, 580, 583, 585, 588, 592, 595, + 597, 599, 602, 604, 606, 608, 610, 612, 614, 616, + 617, 621, 622, 623, 624, 632, 635, 638, 639, 640, + 643, 644, 645, 651, 652, 656, 657, 661, 662, 663, + 664, 665, 666, 667, 682, 684, 686, 688, 690, 692, + 694, 697, 700, 701, 702, 703, 709, 710, 714, 717, + 720, 721, 722, 726, 727, 728, 734, 735, 739, 741, + 743, 744, 745, 746, 747, 757, 760, 761, 766, 767, + 769, 770, 771, 778, 781, 782, 783, 789, 790, 791, + 798, 800, 802, 803, 804, 811, 813, 815, 816, 820, + 823, 826, 827, 828, 829, 835, 837, 839, 840, 841, + 842, 843, 853, 854, 855, 856, 857, 867, 868, 869, + 870, 871, 881, 882, 883, 884, 885, 896, 898, 900, + 901, 903, 905, 906, 907, 908, 916, 917, 921, 922, + 927, 930, 931, 936, 937, 938, 939, 945, 946, 950, + 951, 956, 959, 960, 965, 966, 967, 968, 974, 976, + 978, 980, 982, 984, 986, 988, 989, 990, 997, 998, + 999, 1000, 1007, 1008, 1009, 1010, 1017, 1018, 1019, 1020, + 1027, 1028, 1031, 1032, 1037, 1038, 1042, 1046, 1048, 1050, + 1053, 1054, 1055, 1056, 1064, 1065, 1066, 1073, 1074, 1078, + 1079, 1082, 1083, 1084, 1088, 1089, 1093, 1094, 1098, 1099, + 1103, 1104, 1108, 1109, 1113, 1114, 1118, 1122, 1124, 1126, + 1130, 1133, 1135, 1136, 1140, 1144, 1148, 1149, 1153, 1154, + 1155, 1156, 1157, 1158, 1159, 1173, 1174, 1178, 1179, 1182, + 1183, 1184, 1185, 1191, 1194, 1195, 1197, 1198, 1202, 1203, + 1207, 1208, 1209, 1216, 1217, 1218, 1225, 1227, 1229, 1231, + 1233, 1235, 1238, 1242, 1243, 1244, 1245, 1254, 1258, 1262, + 1265, 1266, 1270, 1271, 1272, 1273, 1282, 1284, 1286, 1288, + 1290, 1292, 1294, 1296, 1298, 1300, 1302, 1304, 1307, 1310, + 1311, 1316, 1317, 1320, 1326, 1329, 1333, 1334, 1336, 1337, + 1338, 1339, 1340, 1350, 1353, 1356, 1357, 1358, 1362, 1363, + 1367, 1371, 1375, 1378, 1382, 1383, 1385, 1388, 1389, 1390, + 1396, 1397, 1398, 1404, 1407, 1410, 1411, 1412, 1416, 1417, + 1421, 1422, 1426, 1427 }; /* TAO_YYRHS -- A `-1'-separated list of the rules' RHS. */ static const tao_yytype_int16 tao_yyrhs[] = { - 107, 0, -1, 108, -1, 108, 109, -1, -1, 112, - -1, 134, 85, -1, 146, 85, -1, 111, 112, -1, - 111, 112, -1, -1, -1, 218, 113, 85, -1, -1, - 379, 114, 85, -1, -1, 380, 115, 85, -1, -1, - 200, 116, 85, -1, -1, 328, 117, 85, -1, -1, - 149, 118, 85, -1, -1, 129, 119, 85, -1, -1, - 159, 120, 85, -1, -1, 381, 121, 85, -1, -1, - 409, 122, 85, -1, -1, 434, 123, 85, -1, -1, - 460, 124, 85, -1, -1, 474, 125, 85, -1, -1, - 1, 126, 85, -1, -1, 5, 128, 195, -1, -1, - -1, -1, 127, 130, 86, 131, 110, 132, 87, -1, - 127, 88, -1, -1, -1, -1, -1, -1, 133, 135, - 453, 136, 89, 137, 86, 138, 140, 139, 87, -1, - 142, 141, -1, 141, 142, -1, -1, 112, -1, 143, - 85, -1, -1, -1, 72, 195, 144, 88, 457, 89, - 145, 198, -1, -1, -1, 133, 147, 471, 89, 148, - 198, -1, 150, -1, 199, -1, -1, -1, -1, 156, - 151, 86, 152, 182, 153, 87, -1, -1, 6, 155, - 198, -1, 154, 157, -1, 41, 154, 157, -1, 42, - 154, 157, -1, -1, 90, 173, 158, 192, -1, -1, - 160, -1, 165, -1, 175, -1, 176, -1, 43, 161, - -1, 161, -1, -1, -1, -1, 169, 162, 86, 163, - 177, 164, 87, -1, -1, -1, -1, 42, 169, 166, - 86, 167, 182, 168, 87, -1, -1, 171, 157, 170, - 174, -1, -1, 49, 172, 198, -1, 48, -1, -1, - 47, 192, -1, -1, 42, 171, -1, 171, -1, 171, - 222, -1, 177, 178, -1, -1, 179, -1, 183, -1, - 340, 85, -1, -1, 46, 180, 257, -1, -1, 45, - 181, 257, -1, 182, 183, -1, -1, -1, 218, 184, - 85, -1, -1, 379, 185, 85, -1, -1, 380, 186, - 85, -1, -1, 200, 187, 85, -1, -1, 328, 188, - 85, -1, -1, 317, 189, 85, -1, -1, 333, 190, - 85, -1, -1, 1, 191, 85, -1, 195, 193, -1, - -1, 193, 91, 194, 195, -1, -1, 198, -1, -1, - 80, 196, 198, -1, -1, 195, 80, 197, 198, -1, - 3, -1, 154, -1, 41, 154, -1, 42, 154, -1, - -1, -1, -1, -1, 4, 201, 205, 202, 198, 203, - 92, 204, 206, -1, 237, -1, 242, -1, 243, -1, - 244, -1, 240, -1, 241, -1, 302, -1, 306, -1, - 195, -1, 207, -1, 208, -1, 209, -1, 208, 93, - 209, -1, 210, -1, 209, 94, 210, -1, 211, -1, - 210, 95, 211, -1, 212, -1, 211, 81, 212, -1, - 211, 82, 212, -1, 213, -1, 212, 96, 213, -1, - 212, 97, 213, -1, 214, -1, 213, 98, 214, -1, - 213, 99, 214, -1, 213, 100, 214, -1, 215, -1, - 96, 215, -1, 97, 215, -1, 101, 215, -1, 195, - -1, 216, -1, 102, 207, 103, -1, 73, -1, 74, - -1, 75, -1, 84, -1, 76, -1, 83, -1, 77, - -1, 78, -1, 79, -1, 207, -1, -1, 7, 219, - 220, -1, 249, -1, 263, -1, 287, -1, 40, 235, - -1, 227, -1, -1, 222, 221, 228, -1, 223, -1, - 226, -1, 224, -1, 225, -1, 195, -1, 237, -1, - 240, -1, 242, -1, 244, -1, 243, -1, 241, -1, - 245, -1, 246, -1, 296, -1, 302, -1, 306, -1, - 249, -1, 263, -1, 287, -1, 285, -1, 286, -1, - 231, 229, -1, -1, 229, 91, 230, 231, -1, -1, - 235, -1, 236, -1, 235, 233, -1, -1, 233, 91, - 234, 235, -1, -1, 198, -1, 310, -1, 238, -1, - 239, -1, 8, -1, 8, 8, -1, 9, -1, 10, - 8, -1, 10, 8, 8, -1, 10, 9, -1, 11, - -1, 12, -1, 8, 11, -1, 17, -1, 13, -1, - 14, -1, 15, -1, 16, -1, 18, -1, 19, -1, - -1, 20, 248, 198, -1, -1, -1, -1, 247, 250, - 86, 251, 253, 252, 87, -1, 255, 254, -1, 254, - 255, -1, -1, -1, 256, 257, -1, -1, -1, 222, - 258, 228, 259, 85, -1, -1, 1, 260, 85, -1, - -1, 21, 262, 198, -1, -1, -1, -1, -1, -1, - -1, 261, 22, 264, 102, 265, 270, 266, 103, 267, - 86, 268, 271, 269, 87, -1, 237, -1, 242, -1, - 243, -1, 244, -1, 287, -1, 195, -1, 273, 272, - -1, 272, 273, -1, -1, -1, -1, 277, 274, 283, - 275, 85, -1, -1, 1, 276, 85, -1, 279, 278, - -1, 278, 279, -1, -1, -1, 29, 280, 90, -1, - -1, -1, 28, 281, 207, 282, 90, -1, -1, 222, - 284, 231, -1, 247, -1, 261, -1, -1, -1, -1, - -1, 23, 288, 198, 289, 86, 290, 292, 291, 87, - -1, 295, 293, -1, -1, 293, 91, 294, 295, -1, - -1, 3, -1, -1, -1, 299, 91, 297, 217, 298, - 89, -1, 299, 89, -1, -1, -1, 24, 300, 88, - 301, 223, -1, -1, -1, 305, 88, 303, 217, 304, - 89, -1, 305, -1, 25, -1, -1, -1, 309, 88, - 307, 217, 308, 89, -1, 309, -1, 26, -1, -1, - 198, 311, 312, -1, 314, 313, -1, 313, 314, -1, - -1, -1, -1, 104, 315, 217, 316, 105, -1, 318, - -1, 323, -1, -1, -1, -1, -1, 30, 319, 31, - 320, 362, 321, 232, 322, 364, -1, -1, -1, -1, - -1, 31, 324, 362, 325, 232, 326, 367, 327, 370, - -1, -1, -1, -1, -1, 27, 329, 198, 330, 86, - 331, 254, 332, 87, -1, -1, -1, -1, -1, 338, - 339, 334, 3, 335, 353, 336, 364, 337, 373, -1, - 32, -1, 33, -1, -1, 362, -1, 34, -1, -1, - -1, -1, 44, 341, 3, 342, 344, 343, 364, -1, - -1, 102, 345, 103, -1, -1, 102, 346, 347, 103, - -1, 350, 348, -1, -1, 348, 91, 349, 350, -1, - -1, -1, -1, 35, 351, 362, 352, 231, -1, -1, - 102, 354, 103, -1, -1, 102, 355, 356, 103, -1, - 359, 357, -1, -1, 357, 91, 358, 359, -1, -1, - -1, -1, 363, 360, 362, 361, 231, -1, 224, -1, - 302, -1, 306, -1, 195, -1, 35, -1, 36, -1, - 37, -1, -1, -1, 38, 365, 102, 366, 192, 103, - -1, -1, -1, -1, 55, 368, 102, 369, 192, 103, - -1, -1, -1, -1, 62, 371, 102, 372, 192, 103, - -1, -1, -1, -1, 39, 374, 102, 375, 376, 103, - -1, -1, 75, 377, -1, -1, 377, 91, 378, 75, - -1, -1, 63, 195, 75, -1, 64, 195, 75, -1, - 383, -1, 382, -1, 50, 198, -1, -1, -1, -1, - 387, 384, 86, 385, 392, 386, 87, -1, -1, -1, - 50, 198, 388, 390, 389, 174, -1, -1, 90, 391, - 195, -1, -1, 392, 393, -1, -1, -1, 401, 394, - 85, -1, -1, 403, 395, 85, -1, -1, 406, 396, - 85, -1, -1, 407, 397, 85, -1, -1, 408, 398, - 85, -1, -1, 317, 399, 85, -1, -1, 470, 400, - 85, -1, 60, 402, 198, -1, 195, -1, 19, -1, - 404, 402, 198, -1, 65, 405, -1, 58, -1, -1, - 52, 195, 198, -1, 61, 195, 198, -1, 51, 195, - 198, -1, -1, 411, 410, 421, -1, -1, -1, -1, - -1, -1, -1, 56, 412, 198, 413, 418, 414, 174, - 415, 66, 416, 195, 417, 420, -1, -1, 90, 419, - 195, -1, -1, 59, 195, -1, -1, -1, -1, 86, - 422, 424, 423, 87, -1, 424, 425, -1, -1, 183, - -1, -1, 428, 426, 85, -1, -1, 431, 427, 85, - -1, -1, -1, 44, 198, 429, 344, 430, 364, -1, - -1, -1, 54, 198, 432, 344, 433, 364, -1, 447, - -1, 438, -1, 435, -1, 437, -1, 436, -1, 53, - 198, -1, 42, 53, 198, -1, -1, -1, -1, 442, - 445, 439, 86, 440, 182, 441, 87, -1, 42, 53, - 198, -1, 43, 53, 198, -1, 53, 198, -1, -1, - 157, 446, 174, -1, -1, -1, -1, 451, 445, 448, - 86, 449, 177, 450, 87, -1, 443, -1, 444, -1, - 67, -1, 20, -1, 21, -1, 53, -1, 24, -1, - 6, -1, 49, -1, 23, -1, 27, -1, 4, 205, - -1, 456, 454, -1, -1, 454, 91, 455, 456, -1, - -1, 452, 3, -1, 24, 88, 3, 89, 3, -1, - 459, 458, -1, 458, 91, 459, -1, -1, 3, -1, - -1, -1, -1, -1, 70, 461, 3, 462, 86, 463, - 465, 464, 87, -1, 467, 466, -1, 466, 467, -1, - -1, -1, 401, 468, 85, -1, -1, 403, 469, 85, - -1, 68, 195, 3, -1, 69, 195, 3, -1, 473, - 472, -1, 472, 91, 473, -1, -1, 206, -1, 475, - 478, -1, -1, -1, 71, 476, 3, 477, 390, -1, - -1, -1, 86, 479, 481, 480, 87, -1, 483, 482, - -1, 482, 483, -1, -1, -1, 401, 484, 85, -1, - -1, 403, 485, 85, -1, -1, 317, 486, 85, -1, - -1, 470, 487, 85, -1 + 107, 0, -1, 108, -1, 108, 109, -1, -1, 111, + -1, 133, 85, -1, 145, 85, -1, 108, 109, -1, + -1, 217, 112, 85, -1, -1, 378, 113, 85, -1, + -1, 379, 114, 85, -1, -1, 199, 115, 85, -1, + -1, 327, 116, 85, -1, -1, 148, 117, 85, -1, + -1, 128, 118, 85, -1, -1, 158, 119, 85, -1, + -1, 380, 120, 85, -1, -1, 408, 121, 85, -1, + -1, 433, 122, 85, -1, -1, 459, 123, 85, -1, + -1, 473, 124, 85, -1, -1, 1, 125, 85, -1, + -1, 5, 127, 194, -1, -1, -1, -1, 126, 129, + 86, 130, 110, 131, 87, -1, 126, 88, -1, -1, + -1, -1, -1, -1, 132, 134, 452, 135, 89, 136, + 86, 137, 139, 138, 87, -1, 141, 140, -1, 140, + 141, -1, -1, 111, -1, 142, 85, -1, -1, -1, + 72, 194, 143, 88, 456, 89, 144, 197, -1, -1, + -1, 132, 146, 470, 89, 147, 197, -1, 149, -1, + 198, -1, -1, -1, -1, 155, 150, 86, 151, 181, + 152, 87, -1, -1, 6, 154, 197, -1, 153, 156, + -1, 41, 153, 156, -1, 42, 153, 156, -1, -1, + 90, 172, 157, 191, -1, -1, 159, -1, 164, -1, + 174, -1, 175, -1, 43, 160, -1, 160, -1, -1, + -1, -1, 168, 161, 86, 162, 176, 163, 87, -1, + -1, -1, -1, 42, 168, 165, 86, 166, 181, 167, + 87, -1, -1, 170, 156, 169, 173, -1, -1, 49, + 171, 197, -1, 48, -1, -1, 47, 191, -1, -1, + 42, 170, -1, 170, -1, 170, 221, -1, 176, 177, + -1, -1, 178, -1, 182, -1, 339, 85, -1, -1, + 46, 179, 256, -1, -1, 45, 180, 256, -1, 181, + 182, -1, -1, -1, 217, 183, 85, -1, -1, 378, + 184, 85, -1, -1, 379, 185, 85, -1, -1, 199, + 186, 85, -1, -1, 327, 187, 85, -1, -1, 316, + 188, 85, -1, -1, 332, 189, 85, -1, -1, 1, + 190, 85, -1, 194, 192, -1, -1, 192, 91, 193, + 194, -1, -1, 197, -1, -1, 80, 195, 197, -1, + -1, 194, 80, 196, 197, -1, 3, -1, 153, -1, + 41, 153, -1, 42, 153, -1, -1, -1, -1, -1, + 4, 200, 204, 201, 197, 202, 92, 203, 205, -1, + 236, -1, 241, -1, 242, -1, 243, -1, 239, -1, + 240, -1, 301, -1, 305, -1, 194, -1, 206, -1, + 207, -1, 208, -1, 207, 93, 208, -1, 209, -1, + 208, 94, 209, -1, 210, -1, 209, 95, 210, -1, + 211, -1, 210, 81, 211, -1, 210, 82, 211, -1, + 212, -1, 211, 96, 212, -1, 211, 97, 212, -1, + 213, -1, 212, 98, 213, -1, 212, 99, 213, -1, + 212, 100, 213, -1, 214, -1, 96, 214, -1, 97, + 214, -1, 101, 214, -1, 194, -1, 215, -1, 102, + 206, 103, -1, 73, -1, 74, -1, 75, -1, 84, + -1, 76, -1, 83, -1, 77, -1, 78, -1, 79, + -1, 206, -1, -1, 7, 218, 219, -1, 248, -1, + 262, -1, 286, -1, 40, 234, -1, 226, -1, -1, + 221, 220, 227, -1, 222, -1, 225, -1, 223, -1, + 224, -1, 194, -1, 236, -1, 239, -1, 241, -1, + 243, -1, 242, -1, 240, -1, 244, -1, 245, -1, + 295, -1, 301, -1, 305, -1, 248, -1, 262, -1, + 286, -1, 284, -1, 285, -1, 230, 228, -1, -1, + 228, 91, 229, 230, -1, -1, 234, -1, 235, -1, + 234, 232, -1, -1, 232, 91, 233, 234, -1, -1, + 197, -1, 309, -1, 237, -1, 238, -1, 8, -1, + 8, 8, -1, 9, -1, 10, 8, -1, 10, 8, + 8, -1, 10, 9, -1, 11, -1, 12, -1, 8, + 11, -1, 17, -1, 13, -1, 14, -1, 15, -1, + 16, -1, 18, -1, 19, -1, -1, 20, 247, 197, + -1, -1, -1, -1, 246, 249, 86, 250, 252, 251, + 87, -1, 254, 253, -1, 253, 254, -1, -1, -1, + 255, 256, -1, -1, -1, 221, 257, 227, 258, 85, + -1, -1, 1, 259, 85, -1, -1, 21, 261, 197, + -1, -1, -1, -1, -1, -1, -1, 260, 22, 263, + 102, 264, 269, 265, 103, 266, 86, 267, 270, 268, + 87, -1, 236, -1, 241, -1, 242, -1, 243, -1, + 286, -1, 194, -1, 272, 271, -1, 271, 272, -1, + -1, -1, -1, 276, 273, 282, 274, 85, -1, -1, + 1, 275, 85, -1, 278, 277, -1, 277, 278, -1, + -1, -1, 29, 279, 90, -1, -1, -1, 28, 280, + 206, 281, 90, -1, -1, 221, 283, 230, -1, 246, + -1, 260, -1, -1, -1, -1, -1, 23, 287, 197, + 288, 86, 289, 291, 290, 87, -1, 294, 292, -1, + -1, 292, 91, 293, 294, -1, -1, 3, -1, -1, + -1, 298, 91, 296, 216, 297, 89, -1, 298, 89, + -1, -1, -1, 24, 299, 88, 300, 222, -1, -1, + -1, 304, 88, 302, 216, 303, 89, -1, 304, -1, + 25, -1, -1, -1, 308, 88, 306, 216, 307, 89, + -1, 308, -1, 26, -1, -1, 197, 310, 311, -1, + 313, 312, -1, 312, 313, -1, -1, -1, -1, 104, + 314, 216, 315, 105, -1, 317, -1, 322, -1, -1, + -1, -1, -1, 30, 318, 31, 319, 361, 320, 231, + 321, 363, -1, -1, -1, -1, -1, 31, 323, 361, + 324, 231, 325, 366, 326, 369, -1, -1, -1, -1, + -1, 27, 328, 197, 329, 86, 330, 253, 331, 87, + -1, -1, -1, -1, -1, 337, 338, 333, 3, 334, + 352, 335, 363, 336, 372, -1, 32, -1, 33, -1, + -1, 361, -1, 34, -1, -1, -1, -1, 44, 340, + 3, 341, 343, 342, 363, -1, -1, 102, 344, 103, + -1, -1, 102, 345, 346, 103, -1, 349, 347, -1, + -1, 347, 91, 348, 349, -1, -1, -1, -1, 35, + 350, 361, 351, 230, -1, -1, 102, 353, 103, -1, + -1, 102, 354, 355, 103, -1, 358, 356, -1, -1, + 356, 91, 357, 358, -1, -1, -1, -1, 362, 359, + 361, 360, 230, -1, 223, -1, 301, -1, 305, -1, + 194, -1, 35, -1, 36, -1, 37, -1, -1, -1, + 38, 364, 102, 365, 191, 103, -1, -1, -1, -1, + 55, 367, 102, 368, 191, 103, -1, -1, -1, -1, + 62, 370, 102, 371, 191, 103, -1, -1, -1, -1, + 39, 373, 102, 374, 375, 103, -1, -1, 75, 376, + -1, -1, 376, 91, 377, 75, -1, -1, 63, 194, + 75, -1, 64, 194, 75, -1, 382, -1, 381, -1, + 50, 197, -1, -1, -1, -1, 386, 383, 86, 384, + 391, 385, 87, -1, -1, -1, 50, 197, 387, 389, + 388, 173, -1, -1, 90, 390, 194, -1, -1, 391, + 392, -1, -1, -1, 400, 393, 85, -1, -1, 402, + 394, 85, -1, -1, 405, 395, 85, -1, -1, 406, + 396, 85, -1, -1, 407, 397, 85, -1, -1, 316, + 398, 85, -1, -1, 469, 399, 85, -1, 60, 401, + 197, -1, 194, -1, 19, -1, 403, 401, 197, -1, + 65, 404, -1, 58, -1, -1, 52, 194, 197, -1, + 61, 194, 197, -1, 51, 194, 197, -1, -1, 410, + 409, 420, -1, -1, -1, -1, -1, -1, -1, 56, + 411, 197, 412, 417, 413, 173, 414, 66, 415, 194, + 416, 419, -1, -1, 90, 418, 194, -1, -1, 59, + 194, -1, -1, -1, -1, 86, 421, 423, 422, 87, + -1, 423, 424, -1, -1, 182, -1, -1, 427, 425, + 85, -1, -1, 430, 426, 85, -1, -1, -1, 44, + 197, 428, 343, 429, 363, -1, -1, -1, 54, 197, + 431, 343, 432, 363, -1, 446, -1, 437, -1, 434, + -1, 436, -1, 435, -1, 53, 197, -1, 42, 53, + 197, -1, -1, -1, -1, 441, 444, 438, 86, 439, + 181, 440, 87, -1, 42, 53, 197, -1, 43, 53, + 197, -1, 53, 197, -1, -1, 156, 445, 173, -1, + -1, -1, -1, 450, 444, 447, 86, 448, 176, 449, + 87, -1, 442, -1, 443, -1, 67, -1, 20, -1, + 21, -1, 53, -1, 24, -1, 6, -1, 49, -1, + 23, -1, 27, -1, 4, 204, -1, 455, 453, -1, + -1, 453, 91, 454, 455, -1, -1, 451, 3, -1, + 24, 88, 3, 89, 3, -1, 458, 457, -1, 457, + 91, 458, -1, -1, 3, -1, -1, -1, -1, -1, + 70, 460, 3, 461, 86, 462, 464, 463, 87, -1, + 466, 465, -1, 465, 466, -1, -1, -1, 400, 467, + 85, -1, -1, 402, 468, 85, -1, 68, 194, 3, + -1, 69, 194, 3, -1, 472, 471, -1, 471, 91, + 472, -1, -1, 205, -1, 474, 477, -1, -1, -1, + 71, 475, 3, 476, 389, -1, -1, -1, 86, 478, + 480, 479, 87, -1, 482, 481, -1, 481, 482, -1, + -1, -1, 400, 483, 85, -1, -1, 402, 484, 85, + -1, -1, 316, 485, 85, -1, -1, 469, 486, 85, + -1 }; /* TAO_YYRLINE[TAO_YYN] -- source line where rule number TAO_YYN was defined. */ static const tao_yytype_uint16 tao_yyrline[] = { - 0, 360, 360, 363, 364, 368, 371, 374, 380, 384, - 385, 390, 389, 400, 399, 410, 409, 420, 419, 430, - 429, 440, 439, 450, 449, 460, 459, 470, 469, 480, - 479, 490, 489, 500, 499, 510, 509, 520, 519, 534, - 533, 546, 581, 586, 545, 602, 610, 625, 635, 657, - 661, 609, 680, 684, 685, 689, 690, 695, 701, 694, - 759, 765, 758, 823, 824, 829, 868, 873, 828, 891, - 890, 904, 942, 973, 1007, 1006, 1018, 1025, 1026, 1027, - 1028, 1032, 1043, 1048, 1092, 1097, 1047, 1126, 1165, 1170, - 1124, 1189, 1187, 1227, 1226, 1240, 1246, 1253, 1260, 1267, - 1293, 1320, 1385, 1386, 1390, 1391, 1392, 1398, 1397, 1405, - 1404, 1414, 1415, 1420, 1419, 1430, 1429, 1440, 1439, 1450, - 1449, 1460, 1459, 1470, 1469, 1480, 1479, 1490, 1489, 1503, - 1516, 1514, 1542, 1549, 1560, 1559, 1587, 1585, 1612, 1624, - 1670, 1698, 1729, 1734, 1739, 1744, 1728, 1797, 1798, 1799, - 1800, 1801, 1802, 1803, 1815, 1820, 1889, 1891, 1893, 1894, - 1908, 1909, 1923, 1924, 1937, 1938, 1948, 1961, 1962, 1972, - 1985, 1986, 1996, 2006, 2019, 2020, 2030, 2040, 2053, 2104, - 2105, 2114, 2119, 2126, 2134, 2139, 2144, 2150, 2155, 2160, - 2168, 2240, 2239, 2249, 2254, 2259, 2264, 2291, 2300, 2299, - 2370, 2371, 2375, 2383, 2384, 2412, 2413, 2414, 2415, 2416, - 2417, 2418, 2419, 2423, 2424, 2425, 2429, 2430, 2431, 2435, - 2436, 2440, 2453, 2451, 2479, 2486, 2487, 2491, 2504, 2502, - 2530, 2537, 2554, 2573, 2574, 2578, 2583, 2588, 2596, 2601, - 2606, 2614, 2619, 2624, 2632, 2646, 2651, 2659, 2667, 2675, - 2683, 2692, 2691, 2707, 2741, 2746, 2706, 2765, 2768, 2769, - 2773, 2773, 2783, 2788, 2782, 2851, 2850, 2865, 2864, 2879, - 2884, 2889, 2894, 2941, 2946, 2878, 2970, 2978, 2992, 3002, - 3010, 3011, 3119, 3122, 3123, 3128, 3133, 3127, 3169, 3168, - 3182, 3193, 3213, 3221, 3220, 3236, 3241, 3235, 3258, 3257, - 3310, 3334, 3359, 3364, 3397, 3402, 3358, 3428, 3433, 3431, - 3438, 3442, 3479, 3484, 3477, 3551, 3606, 3616, 3605, 3631, - 3636, 3629, 3677, 3703, 3713, 3718, 3711, 3748, 3773, 3782, - 3781, 3817, 3828, 3848, 3856, 3861, 3855, 3898, 3899, 3904, - 3909, 3914, 3919, 3903, 3988, 3993, 3998, 4003, 3987, 4081, - 4086, 4116, 4121, 4080, 4139, 4144, 4197, 4202, 4137, 4239, - 4245, 4252, 4259, 4260, 4272, 4278, 4320, 4271, 4342, 4341, - 4352, 4351, 4364, 4369, 4367, 4374, 4379, 4384, 4378, 4425, - 4424, 4435, 4434, 4447, 4452, 4450, 4457, 4462, 4467, 4461, - 4514, 4522, 4523, 4524, 4629, 4634, 4639, 4648, 4653, 4647, - 4665, 4673, 4678, 4672, 4690, 4698, 4703, 4697, 4715, 4723, - 4728, 4722, 4740, 4747, 4760, 4758, 4784, 4791, 4820, 4858, - 4859, 4863, 4893, 4933, 4938, 4892, 4957, 4962, 4955, 5005, - 5004, 5015, 5022, 5023, 5028, 5027, 5038, 5037, 5048, 5047, - 5058, 5057, 5068, 5067, 5078, 5077, 5088, 5087, 5099, 5158, - 5165, 5191, 5265, 5275, 5281, 5287, 5334, 5381, 5430, 5429, - 5479, 5484, 5489, 5494, 5499, 5504, 5478, 5559, 5558, 5569, - 5576, 5583, 5591, 5596, 5590, 5608, 5609, 5613, 5615, 5614, - 5625, 5624, 5639, 5675, 5637, 5709, 5745, 5707, 5777, 5778, - 5779, 5783, 5784, 5788, 5816, 5847, 5892, 5897, 5845, 5914, - 5924, 5943, 5955, 5954, 5994, 6044, 6049, 5992, 6066, 6071, - 6079, 6084, 6089, 6094, 6099, 6104, 6109, 6114, 6119, 6124, - 6133, 6168, 6167, 6189, 6196, 6220, 6238, 6249, 6269, 6276, - 6287, 6292, 6297, 6302, 6286, 6317, 6324, 6329, 6336, 6335, - 6344, 6343, 6354, 6423, 6473, 6489, 6503, 6510, 6570, 6575, - 6580, 6574, 6640, 6645, 6639, 6660, 6664, 6665, 6670, 6669, - 6680, 6679, 6690, 6689, 6700, 6699 + 0, 357, 357, 360, 361, 365, 368, 371, 377, 382, + 381, 392, 391, 402, 401, 412, 411, 422, 421, 432, + 431, 442, 441, 452, 451, 462, 461, 472, 471, 482, + 481, 492, 491, 502, 501, 512, 511, 526, 525, 538, + 573, 578, 537, 594, 602, 617, 627, 649, 653, 601, + 672, 676, 677, 681, 682, 687, 693, 686, 751, 757, + 750, 815, 816, 821, 860, 865, 820, 883, 882, 896, + 934, 965, 999, 998, 1010, 1017, 1018, 1019, 1020, 1024, + 1035, 1040, 1084, 1089, 1039, 1118, 1157, 1162, 1116, 1181, + 1179, 1219, 1218, 1232, 1238, 1245, 1252, 1259, 1285, 1312, + 1377, 1378, 1382, 1383, 1384, 1390, 1389, 1400, 1399, 1412, + 1413, 1418, 1417, 1428, 1427, 1438, 1437, 1448, 1447, 1458, + 1457, 1468, 1467, 1478, 1477, 1488, 1487, 1501, 1514, 1512, + 1540, 1547, 1558, 1557, 1585, 1583, 1610, 1622, 1668, 1696, + 1727, 1732, 1737, 1742, 1726, 1813, 1814, 1815, 1816, 1817, + 1818, 1819, 1831, 1836, 1905, 1907, 1909, 1910, 1924, 1925, + 1939, 1940, 1953, 1954, 1964, 1977, 1978, 1988, 2001, 2002, + 2012, 2022, 2035, 2036, 2046, 2056, 2069, 2120, 2121, 2130, + 2135, 2142, 2150, 2155, 2160, 2166, 2171, 2176, 2184, 2256, + 2255, 2265, 2270, 2275, 2280, 2307, 2316, 2315, 2386, 2387, + 2391, 2399, 2400, 2428, 2429, 2430, 2431, 2432, 2433, 2434, + 2435, 2439, 2440, 2441, 2445, 2446, 2447, 2451, 2452, 2456, + 2469, 2467, 2495, 2502, 2503, 2507, 2520, 2518, 2546, 2553, + 2570, 2589, 2590, 2594, 2599, 2604, 2612, 2617, 2622, 2630, + 2635, 2640, 2648, 2662, 2667, 2675, 2683, 2691, 2699, 2708, + 2707, 2723, 2757, 2762, 2722, 2781, 2784, 2785, 2789, 2789, + 2799, 2804, 2798, 2867, 2866, 2881, 2880, 2895, 2900, 2905, + 2910, 2957, 2962, 2894, 2986, 2994, 3008, 3018, 3026, 3027, + 3135, 3138, 3139, 3144, 3149, 3143, 3185, 3184, 3198, 3209, + 3229, 3237, 3236, 3252, 3257, 3251, 3274, 3273, 3326, 3350, + 3375, 3380, 3413, 3418, 3374, 3444, 3449, 3447, 3454, 3458, + 3495, 3500, 3493, 3575, 3630, 3640, 3629, 3655, 3660, 3653, + 3701, 3727, 3737, 3742, 3735, 3772, 3797, 3806, 3805, 3841, + 3852, 3872, 3880, 3885, 3879, 3947, 3948, 3953, 3958, 3963, + 3968, 3952, 4037, 4042, 4047, 4052, 4036, 4130, 4135, 4165, + 4170, 4129, 4188, 4193, 4246, 4251, 4186, 4288, 4294, 4301, + 4308, 4309, 4321, 4327, 4369, 4320, 4391, 4390, 4401, 4400, + 4413, 4418, 4416, 4423, 4428, 4433, 4427, 4474, 4473, 4484, + 4483, 4496, 4501, 4499, 4506, 4511, 4516, 4510, 4563, 4571, + 4572, 4573, 4678, 4683, 4688, 4697, 4702, 4696, 4714, 4722, + 4727, 4721, 4739, 4747, 4752, 4746, 4764, 4772, 4777, 4771, + 4789, 4796, 4809, 4807, 4833, 4840, 4869, 4907, 4908, 4912, + 4942, 4982, 4987, 4941, 5006, 5011, 5004, 5054, 5053, 5064, + 5071, 5072, 5077, 5076, 5087, 5086, 5097, 5096, 5107, 5106, + 5117, 5116, 5127, 5126, 5137, 5136, 5148, 5238, 5245, 5271, + 5377, 5387, 5393, 5399, 5472, 5545, 5620, 5619, 5669, 5674, + 5679, 5684, 5689, 5694, 5668, 5749, 5748, 5759, 5766, 5773, + 5781, 5786, 5780, 5798, 5799, 5803, 5805, 5804, 5815, 5814, + 5829, 5865, 5827, 5899, 5935, 5897, 5967, 5968, 5969, 5973, + 5974, 5978, 6006, 6037, 6082, 6087, 6035, 6104, 6114, 6133, + 6145, 6144, 6184, 6234, 6239, 6182, 6256, 6261, 6269, 6274, + 6279, 6284, 6289, 6294, 6299, 6304, 6309, 6314, 6323, 6358, + 6357, 6379, 6386, 6410, 6428, 6439, 6459, 6466, 6477, 6482, + 6501, 6506, 6476, 6521, 6528, 6533, 6540, 6539, 6548, 6547, + 6558, 6627, 6677, 6693, 6707, 6714, 6774, 6779, 6784, 6778, + 6844, 6849, 6843, 6864, 6868, 6869, 6874, 6873, 6884, 6883, + 6894, 6893, 6904, 6903 }; #endif @@ -964,13 +960,12 @@ static const char *const tao_yytname[] = "IDL_WCHAR_LITERAL", "IDL_WSTRING_LITERAL", "';'", "'{'", "'}'", "'<'", "'>'", "':'", "','", "'='", "'|'", "'^'", "'&'", "'+'", "'-'", "'*'", "'/'", "'%'", "'~'", "'('", "')'", "'['", "']'", "$accept", "start", - "definitions", "definition", "at_least_one_fixed_definition", - "fixed_definitions", "fixed_definition", "@1", "@2", "@3", "@4", "@5", - "@6", "@7", "@8", "@9", "@10", "@11", "@12", "@13", "@14", - "module_header", "@15", "fixed_module", "@16", "@17", "@18", - "template_module_header", "template_module", "@19", "@20", "@21", "@22", - "@23", "at_least_one_tpl_definition", "tpl_definitions", - "tpl_definition", "template_module_ref", "@24", "@25", + "definitions", "definition", "at_least_one_definition", + "fixed_definition", "@1", "@2", "@3", "@4", "@5", "@6", "@7", "@8", "@9", + "@10", "@11", "@12", "@13", "@14", "module_header", "@15", "module", + "@16", "@17", "@18", "template_module_header", "template_module", "@19", + "@20", "@21", "@22", "@23", "at_least_one_tpl_definition", + "tpl_definitions", "tpl_definition", "template_module_ref", "@24", "@25", "template_module_inst", "@26", "@27", "interface_def", "interface", "@28", "@29", "@30", "interface_decl", "@31", "interface_header", "inheritance_spec", "@32", "value_def", "valuetype", @@ -1065,125 +1060,125 @@ static const tao_yytype_uint16 tao_yytoknum[] = /* TAO_YYR1[TAO_YYN] -- Symbol number of symbol that rule TAO_YYN derives. */ static const tao_yytype_uint16 tao_yyr1[] = { - 0, 106, 107, 108, 108, 109, 109, 109, 110, 111, - 111, 113, 112, 114, 112, 115, 112, 116, 112, 117, - 112, 118, 112, 119, 112, 120, 112, 121, 112, 122, - 112, 123, 112, 124, 112, 125, 112, 126, 112, 128, - 127, 130, 131, 132, 129, 133, 135, 136, 137, 138, - 139, 134, 140, 141, 141, 142, 142, 144, 145, 143, - 147, 148, 146, 149, 149, 151, 152, 153, 150, 155, - 154, 156, 156, 156, 158, 157, 157, 159, 159, 159, - 159, 160, 160, 162, 163, 164, 161, 166, 167, 168, - 165, 170, 169, 172, 171, 173, 173, 174, 174, 175, - 175, 176, 177, 177, 178, 178, 178, 180, 179, 181, - 179, 182, 182, 184, 183, 185, 183, 186, 183, 187, - 183, 188, 183, 189, 183, 190, 183, 191, 183, 192, - 194, 193, 193, 195, 196, 195, 197, 195, 198, 199, - 199, 199, 201, 202, 203, 204, 200, 205, 205, 205, - 205, 205, 205, 205, 205, 205, 206, 207, 208, 208, - 209, 209, 210, 210, 211, 211, 211, 212, 212, 212, - 213, 213, 213, 213, 214, 214, 214, 214, 215, 215, - 215, 216, 216, 216, 216, 216, 216, 216, 216, 216, - 217, 219, 218, 218, 218, 218, 218, 218, 221, 220, - 222, 222, 223, 223, 223, 224, 224, 224, 224, 224, - 224, 224, 224, 225, 225, 225, 226, 226, 226, 227, - 227, 228, 230, 229, 229, 231, 231, 232, 234, 233, - 233, 235, 236, 237, 237, 238, 238, 238, 239, 239, - 239, 240, 240, 240, 241, 242, 242, 243, 244, 245, - 246, 248, 247, 250, 251, 252, 249, 253, 254, 254, - 256, 255, 258, 259, 257, 260, 257, 262, 261, 264, - 265, 266, 267, 268, 269, 263, 270, 270, 270, 270, - 270, 270, 271, 272, 272, 274, 275, 273, 276, 273, - 277, 278, 278, 280, 279, 281, 282, 279, 284, 283, - 285, 286, 288, 289, 290, 291, 287, 292, 294, 293, - 293, 295, 297, 298, 296, 296, 300, 301, 299, 303, - 304, 302, 302, 305, 307, 308, 306, 306, 309, 311, - 310, 312, 313, 313, 315, 316, 314, 317, 317, 319, - 320, 321, 322, 318, 324, 325, 326, 327, 323, 329, - 330, 331, 332, 328, 334, 335, 336, 337, 333, 338, - 338, 338, 339, 339, 341, 342, 343, 340, 345, 344, - 346, 344, 347, 349, 348, 348, 351, 352, 350, 354, - 353, 355, 353, 356, 358, 357, 357, 360, 361, 359, - 362, 362, 362, 362, 363, 363, 363, 365, 366, 364, - 364, 368, 369, 367, 367, 371, 372, 370, 370, 374, - 375, 373, 373, 376, 378, 377, 377, 379, 380, 381, - 381, 382, 384, 385, 386, 383, 388, 389, 387, 391, - 390, 390, 392, 392, 394, 393, 395, 393, 396, 393, - 397, 393, 398, 393, 399, 393, 400, 393, 401, 402, - 402, 403, 404, 405, 405, 406, 407, 408, 410, 409, - 412, 413, 414, 415, 416, 417, 411, 419, 418, 418, - 420, 420, 422, 423, 421, 424, 424, 425, 426, 425, - 427, 425, 429, 430, 428, 432, 433, 431, 434, 434, - 434, 435, 435, 436, 437, 439, 440, 441, 438, 442, - 443, 444, 446, 445, 448, 449, 450, 447, 451, 451, - 452, 452, 452, 452, 452, 452, 452, 452, 452, 452, - 453, 455, 454, 454, 456, 456, 457, 458, 458, 459, - 461, 462, 463, 464, 460, 465, 466, 466, 468, 467, - 469, 467, 470, 470, 471, 472, 472, 473, 474, 476, - 477, 475, 479, 480, 478, 481, 482, 482, 484, 483, - 485, 483, 486, 483, 487, 483 + 0, 106, 107, 108, 108, 109, 109, 109, 110, 112, + 111, 113, 111, 114, 111, 115, 111, 116, 111, 117, + 111, 118, 111, 119, 111, 120, 111, 121, 111, 122, + 111, 123, 111, 124, 111, 125, 111, 127, 126, 129, + 130, 131, 128, 132, 134, 135, 136, 137, 138, 133, + 139, 140, 140, 141, 141, 143, 144, 142, 146, 147, + 145, 148, 148, 150, 151, 152, 149, 154, 153, 155, + 155, 155, 157, 156, 156, 158, 158, 158, 158, 159, + 159, 161, 162, 163, 160, 165, 166, 167, 164, 169, + 168, 171, 170, 172, 172, 173, 173, 174, 174, 175, + 176, 176, 177, 177, 177, 179, 178, 180, 178, 181, + 181, 183, 182, 184, 182, 185, 182, 186, 182, 187, + 182, 188, 182, 189, 182, 190, 182, 191, 193, 192, + 192, 194, 195, 194, 196, 194, 197, 198, 198, 198, + 200, 201, 202, 203, 199, 204, 204, 204, 204, 204, + 204, 204, 204, 204, 205, 206, 207, 207, 208, 208, + 209, 209, 210, 210, 210, 211, 211, 211, 212, 212, + 212, 212, 213, 213, 213, 213, 214, 214, 214, 215, + 215, 215, 215, 215, 215, 215, 215, 215, 216, 218, + 217, 217, 217, 217, 217, 217, 220, 219, 221, 221, + 222, 222, 222, 223, 223, 223, 223, 223, 223, 223, + 223, 224, 224, 224, 225, 225, 225, 226, 226, 227, + 229, 228, 228, 230, 230, 231, 233, 232, 232, 234, + 235, 236, 236, 237, 237, 237, 238, 238, 238, 239, + 239, 239, 240, 241, 241, 242, 243, 244, 245, 247, + 246, 249, 250, 251, 248, 252, 253, 253, 255, 254, + 257, 258, 256, 259, 256, 261, 260, 263, 264, 265, + 266, 267, 268, 262, 269, 269, 269, 269, 269, 269, + 270, 271, 271, 273, 274, 272, 275, 272, 276, 277, + 277, 279, 278, 280, 281, 278, 283, 282, 284, 285, + 287, 288, 289, 290, 286, 291, 293, 292, 292, 294, + 296, 297, 295, 295, 299, 300, 298, 302, 303, 301, + 301, 304, 306, 307, 305, 305, 308, 310, 309, 311, + 312, 312, 314, 315, 313, 316, 316, 318, 319, 320, + 321, 317, 323, 324, 325, 326, 322, 328, 329, 330, + 331, 327, 333, 334, 335, 336, 332, 337, 337, 337, + 338, 338, 340, 341, 342, 339, 344, 343, 345, 343, + 346, 348, 347, 347, 350, 351, 349, 353, 352, 354, + 352, 355, 357, 356, 356, 359, 360, 358, 361, 361, + 361, 361, 362, 362, 362, 364, 365, 363, 363, 367, + 368, 366, 366, 370, 371, 369, 369, 373, 374, 372, + 372, 375, 377, 376, 376, 378, 379, 380, 380, 381, + 383, 384, 385, 382, 387, 388, 386, 390, 389, 389, + 391, 391, 393, 392, 394, 392, 395, 392, 396, 392, + 397, 392, 398, 392, 399, 392, 400, 401, 401, 402, + 403, 404, 404, 405, 406, 407, 409, 408, 411, 412, + 413, 414, 415, 416, 410, 418, 417, 417, 419, 419, + 421, 422, 420, 423, 423, 424, 425, 424, 426, 424, + 428, 429, 427, 431, 432, 430, 433, 433, 433, 434, + 434, 435, 436, 438, 439, 440, 437, 441, 442, 443, + 445, 444, 447, 448, 449, 446, 450, 450, 451, 451, + 451, 451, 451, 451, 451, 451, 451, 451, 452, 454, + 453, 453, 455, 455, 456, 457, 457, 458, 460, 461, + 462, 463, 459, 464, 465, 465, 467, 466, 468, 466, + 469, 469, 470, 471, 471, 472, 473, 475, 476, 474, + 478, 479, 477, 480, 481, 481, 483, 482, 484, 482, + 485, 482, 486, 482 }; /* TAO_YYR2[TAO_YYN] -- Number of symbols composing right hand side of rule TAO_YYN. */ static const tao_yytype_uint8 tao_yyr2[] = { - 0, 2, 1, 2, 0, 1, 2, 2, 2, 2, - 0, 0, 3, 0, 3, 0, 3, 0, 3, 0, + 0, 2, 1, 2, 0, 1, 2, 2, 2, 0, 3, 0, 3, 0, 3, 0, 3, 0, 3, 0, 3, 0, 3, 0, 3, 0, 3, 0, 3, 0, - 3, 0, 0, 0, 7, 2, 0, 0, 0, 0, - 0, 11, 2, 2, 0, 1, 2, 0, 0, 8, - 0, 0, 6, 1, 1, 0, 0, 0, 7, 0, - 3, 2, 3, 3, 0, 4, 0, 1, 1, 1, - 1, 2, 1, 0, 0, 0, 7, 0, 0, 0, - 8, 0, 4, 0, 3, 1, 0, 2, 0, 2, - 1, 2, 2, 0, 1, 1, 2, 0, 3, 0, - 3, 2, 0, 0, 3, 0, 3, 0, 3, 0, - 3, 0, 3, 0, 3, 0, 3, 0, 3, 2, - 0, 4, 0, 1, 0, 3, 0, 4, 1, 1, - 2, 2, 0, 0, 0, 0, 9, 1, 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, - 1, 0, 3, 1, 1, 1, 2, 1, 0, 3, - 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, + 3, 0, 3, 0, 3, 0, 3, 0, 3, 0, + 0, 0, 7, 2, 0, 0, 0, 0, 0, 11, + 2, 2, 0, 1, 2, 0, 0, 8, 0, 0, + 6, 1, 1, 0, 0, 0, 7, 0, 3, 2, + 3, 3, 0, 4, 0, 1, 1, 1, 1, 2, + 1, 0, 0, 0, 7, 0, 0, 0, 8, 0, + 4, 0, 3, 1, 0, 2, 0, 2, 1, 2, + 2, 0, 1, 1, 2, 0, 3, 0, 3, 2, + 0, 0, 3, 0, 3, 0, 3, 0, 3, 0, + 3, 0, 3, 0, 3, 0, 3, 2, 0, 4, + 0, 1, 0, 3, 0, 4, 1, 1, 2, 2, + 0, 0, 0, 0, 9, 1, 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, 1, 0, + 3, 1, 1, 1, 2, 1, 0, 3, 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, 1, - 1, 0, 3, 0, 0, 0, 7, 2, 2, 0, - 0, 2, 0, 0, 5, 0, 3, 0, 3, 0, - 0, 0, 0, 0, 0, 14, 1, 1, 1, 1, - 1, 1, 2, 2, 0, 0, 0, 5, 0, 3, - 2, 2, 0, 0, 3, 0, 0, 5, 0, 3, - 1, 1, 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, 1, 1, 0, - 0, 0, 0, 9, 0, 0, 0, 0, 9, 0, - 0, 0, 0, 9, 0, 0, 0, 0, 10, 1, - 1, 0, 1, 1, 0, 0, 0, 7, 0, 3, - 0, 4, 2, 0, 4, 0, 0, 0, 5, 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, 0, 0, 6, 0, 0, - 0, 6, 0, 2, 0, 4, 0, 3, 3, 1, - 1, 2, 0, 0, 0, 7, 0, 0, 6, 0, - 3, 0, 2, 0, 0, 3, 0, 3, 0, 3, - 0, 3, 0, 3, 0, 3, 0, 3, 3, 1, - 1, 3, 2, 1, 0, 3, 3, 3, 0, 3, - 0, 0, 0, 0, 0, 0, 13, 0, 3, 0, - 2, 0, 0, 0, 5, 2, 0, 1, 0, 3, - 0, 3, 0, 0, 6, 0, 0, 6, 1, 1, - 1, 1, 1, 2, 3, 0, 0, 0, 8, 3, - 3, 2, 0, 3, 0, 0, 0, 8, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 2, - 2, 0, 4, 0, 2, 5, 2, 3, 0, 1, - 0, 0, 0, 0, 9, 2, 2, 0, 0, 3, - 0, 3, 3, 3, 2, 3, 0, 1, 2, 0, - 0, 5, 0, 0, 5, 2, 2, 0, 0, 3, - 0, 3, 0, 3, 0, 3 + 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, 1, 0, + 3, 0, 0, 0, 7, 2, 2, 0, 0, 2, + 0, 0, 5, 0, 3, 0, 3, 0, 0, 0, + 0, 0, 0, 14, 1, 1, 1, 1, 1, 1, + 2, 2, 0, 0, 0, 5, 0, 3, 2, 2, + 0, 0, 3, 0, 0, 5, 0, 3, 1, 1, + 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, 1, 1, 0, 0, 0, + 0, 9, 0, 0, 0, 0, 9, 0, 0, 0, + 0, 9, 0, 0, 0, 0, 10, 1, 1, 0, + 1, 1, 0, 0, 0, 7, 0, 3, 0, 4, + 2, 0, 4, 0, 0, 0, 5, 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, 0, 0, 6, 0, 0, 0, 6, + 0, 2, 0, 4, 0, 3, 3, 1, 1, 2, + 0, 0, 0, 7, 0, 0, 6, 0, 3, 0, + 2, 0, 0, 3, 0, 3, 0, 3, 0, 3, + 0, 3, 0, 3, 0, 3, 3, 1, 1, 3, + 2, 1, 0, 3, 3, 3, 0, 3, 0, 0, + 0, 0, 0, 0, 13, 0, 3, 0, 2, 0, + 0, 0, 5, 2, 0, 1, 0, 3, 0, 3, + 0, 0, 6, 0, 0, 6, 1, 1, 1, 1, + 1, 2, 3, 0, 0, 0, 8, 3, 3, 2, + 0, 3, 0, 0, 0, 8, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 2, 2, 0, + 4, 0, 2, 5, 2, 3, 0, 1, 0, 0, + 0, 0, 9, 2, 2, 0, 0, 3, 0, 3, + 3, 3, 2, 3, 0, 1, 2, 0, 0, 5, + 0, 0, 5, 2, 2, 0, 0, 3, 0, 3, + 0, 3, 0, 3 }; /* TAO_YYDEFACT[STATE-NAME] -- Default rule to reduce with in state @@ -1191,397 +1186,394 @@ static const tao_yytype_uint8 tao_yyr2[] = means the default is an error. */ static const tao_yytype_uint16 tao_yydefact[] = { - 4, 0, 0, 1, 37, 142, 39, 69, 191, 251, - 267, 302, 349, 0, 0, 0, 0, 93, 0, 0, - 460, 0, 0, 530, 549, 3, 5, 41, 23, 60, - 0, 0, 21, 63, 76, 65, 25, 77, 82, 78, - 83, 76, 79, 80, 64, 17, 11, 197, 253, 193, - 301, 194, 219, 220, 195, 19, 13, 15, 27, 420, - 419, 422, 29, 458, 31, 490, 492, 491, 489, 76, - 508, 509, 488, 76, 33, 35, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 138, 231, 196, 76, - 0, 76, 87, 76, 0, 81, 76, 0, 426, 501, - 0, 134, 0, 133, 0, 0, 0, 45, 0, 0, - 0, 0, 6, 7, 0, 96, 71, 0, 0, 0, - 235, 237, 0, 241, 242, 245, 246, 247, 248, 244, - 249, 250, 316, 323, 328, 91, 204, 101, 200, 202, - 203, 201, 205, 233, 234, 206, 210, 207, 209, 208, - 211, 212, 253, 216, 0, 217, 218, 213, 0, 214, - 322, 215, 327, 0, 0, 0, 269, 0, 0, 0, - 0, 0, 0, 0, 0, 502, 495, 504, 0, 0, - 552, 548, 38, 155, 143, 147, 151, 152, 148, 149, - 150, 153, 154, 40, 70, 192, 198, 252, 268, 303, - 350, 72, 499, 73, 0, 500, 94, 431, 461, 0, - 417, 136, 418, 531, 550, 42, 24, 0, 515, 511, - 512, 517, 514, 518, 516, 513, 510, 0, 47, 523, - 181, 182, 183, 185, 187, 188, 189, 186, 184, 0, - 0, 0, 0, 178, 547, 156, 157, 158, 160, 162, - 164, 167, 170, 174, 179, 0, 546, 22, 95, 74, - 66, 26, 84, 236, 243, 238, 240, 0, 98, 315, - 312, 319, 324, 18, 12, 254, 0, 20, 14, 16, - 28, 423, 30, 472, 459, 32, 98, 0, 0, 34, - 36, 0, 0, 0, 0, 0, 88, 429, 427, 469, - 135, 0, 0, 431, 10, 519, 0, 524, 0, 520, - 175, 176, 177, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 61, 544, 0, 112, 103, 239, - 317, 0, 92, 0, 0, 0, 260, 270, 433, 476, - 503, 496, 505, 339, 344, 0, 454, 0, 0, 562, - 337, 338, 558, 560, 0, 564, 553, 557, 144, 231, - 199, 224, 225, 226, 232, 304, 351, 112, 0, 98, - 467, 462, 137, 532, 551, 43, 0, 0, 48, 521, - 180, 159, 161, 163, 165, 166, 168, 169, 171, 172, - 173, 0, 0, 75, 132, 0, 0, 0, 97, 190, - 313, 320, 325, 255, 259, 0, 0, 424, 0, 112, - 103, 0, 0, 450, 449, 0, 453, 452, 0, 0, - 0, 0, 0, 0, 0, 0, 555, 0, 0, 221, - 0, 259, 0, 430, 428, 0, 98, 0, 0, 9, - 41, 0, 0, 0, 62, 545, 129, 127, 359, 360, - 0, 111, 119, 113, 123, 121, 125, 0, 115, 117, - 364, 109, 107, 0, 102, 104, 105, 0, 318, 0, - 0, 0, 0, 260, 265, 262, 261, 235, 281, 276, - 277, 278, 279, 271, 280, 0, 0, 0, 444, 0, - 432, 434, 436, 438, 440, 442, 446, 0, 0, 477, - 0, 475, 478, 480, 0, 0, 340, 393, 390, 391, - 392, 345, 448, 542, 543, 563, 559, 561, 451, 565, - 554, 556, 145, 334, 330, 333, 222, 311, 305, 310, - 260, 0, 468, 463, 538, 540, 533, 537, 44, 525, - 49, 522, 130, 0, 68, 0, 0, 0, 0, 0, - 363, 354, 362, 0, 0, 0, 0, 0, 86, 106, - 314, 321, 326, 256, 258, 0, 0, 0, 0, 0, - 0, 0, 425, 0, 0, 0, 0, 0, 0, 482, - 485, 474, 0, 0, 0, 0, 0, 0, 0, 0, - 331, 0, 0, 307, 0, 90, 0, 0, 0, 0, - 535, 0, 0, 128, 120, 114, 124, 122, 126, 0, - 116, 118, 365, 110, 108, 266, 263, 272, 457, 455, - 456, 445, 435, 437, 439, 441, 443, 447, 0, 0, - 479, 481, 498, 507, 341, 346, 230, 146, 335, 332, - 223, 306, 308, 353, 464, 539, 541, 534, 536, 0, - 55, 50, 54, 0, 131, 355, 0, 0, 0, 368, - 483, 486, 0, 404, 227, 0, 0, 0, 57, 0, - 0, 56, 0, 366, 264, 273, 0, 0, 400, 400, - 342, 401, 347, 228, 336, 309, 465, 0, 51, 53, - 381, 356, 400, 0, 369, 376, 0, 375, 397, 484, - 487, 400, 0, 408, 0, 471, 0, 0, 0, 400, - 367, 288, 295, 293, 274, 284, 285, 292, 0, 371, - 372, 0, 343, 402, 405, 348, 229, 0, 466, 529, - 0, 528, 380, 394, 395, 396, 0, 386, 387, 357, - 0, 0, 0, 0, 0, 0, 290, 377, 373, 398, - 0, 0, 470, 58, 526, 382, 383, 0, 412, 289, - 296, 294, 275, 283, 298, 286, 291, 0, 0, 0, - 0, 406, 0, 0, 384, 388, 409, 358, 0, 0, - 0, 378, 374, 0, 403, 0, 59, 527, 0, 0, - 0, 297, 299, 287, 399, 0, 385, 389, 410, 407, - 0, 416, 0, 413, 411, 414, 0, 415 + 4, 0, 0, 1, 35, 140, 37, 67, 189, 249, + 265, 300, 347, 0, 0, 0, 0, 91, 0, 0, + 458, 0, 0, 528, 547, 3, 5, 39, 21, 58, + 0, 0, 19, 61, 74, 63, 23, 75, 80, 76, + 81, 74, 77, 78, 62, 15, 9, 195, 251, 191, + 299, 192, 217, 218, 193, 17, 11, 13, 25, 418, + 417, 420, 27, 456, 29, 488, 490, 489, 487, 74, + 506, 507, 486, 74, 31, 33, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 136, 229, 194, 74, + 0, 74, 85, 74, 0, 79, 74, 0, 424, 499, + 0, 132, 0, 131, 0, 0, 0, 43, 0, 0, + 0, 0, 6, 7, 0, 94, 69, 0, 0, 0, + 233, 235, 0, 239, 240, 243, 244, 245, 246, 242, + 247, 248, 314, 321, 326, 89, 202, 99, 198, 200, + 201, 199, 203, 231, 232, 204, 208, 205, 207, 206, + 209, 210, 251, 214, 0, 215, 216, 211, 0, 212, + 320, 213, 325, 0, 0, 0, 267, 0, 0, 0, + 0, 0, 0, 0, 0, 500, 493, 502, 0, 0, + 550, 546, 36, 153, 141, 145, 149, 150, 146, 147, + 148, 151, 152, 38, 68, 190, 196, 250, 266, 301, + 348, 70, 497, 71, 0, 498, 92, 429, 459, 0, + 415, 134, 416, 529, 548, 40, 22, 0, 513, 509, + 510, 515, 512, 516, 514, 511, 508, 0, 45, 521, + 179, 180, 181, 183, 185, 186, 187, 184, 182, 0, + 0, 0, 0, 176, 545, 154, 155, 156, 158, 160, + 162, 165, 168, 172, 177, 0, 544, 20, 93, 72, + 64, 24, 82, 234, 241, 236, 238, 0, 96, 313, + 310, 317, 322, 16, 10, 252, 0, 18, 12, 14, + 26, 421, 28, 470, 457, 30, 96, 0, 0, 32, + 34, 0, 0, 0, 0, 0, 86, 427, 425, 467, + 133, 0, 0, 429, 4, 517, 0, 522, 0, 518, + 173, 174, 175, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 59, 542, 0, 110, 101, 237, + 315, 0, 90, 0, 0, 0, 258, 268, 431, 474, + 501, 494, 503, 337, 342, 0, 452, 0, 0, 560, + 335, 336, 556, 558, 0, 562, 551, 555, 142, 229, + 197, 222, 223, 224, 230, 302, 349, 110, 0, 96, + 465, 460, 135, 530, 549, 0, 41, 0, 46, 519, + 178, 157, 159, 161, 163, 164, 166, 167, 169, 170, + 171, 0, 0, 73, 130, 0, 0, 0, 95, 188, + 311, 318, 323, 253, 257, 0, 0, 422, 0, 110, + 101, 0, 0, 448, 447, 0, 451, 450, 0, 0, + 0, 0, 0, 0, 0, 0, 553, 0, 0, 219, + 0, 257, 0, 428, 426, 0, 96, 0, 3, 0, + 0, 0, 0, 60, 543, 127, 125, 357, 358, 0, + 109, 117, 111, 121, 119, 123, 0, 113, 115, 362, + 107, 105, 0, 100, 102, 103, 0, 316, 0, 0, + 0, 0, 258, 263, 260, 259, 233, 279, 274, 275, + 276, 277, 269, 278, 0, 0, 0, 442, 0, 430, + 432, 434, 436, 438, 440, 444, 0, 0, 475, 0, + 473, 476, 478, 0, 0, 338, 391, 388, 389, 390, + 343, 446, 540, 541, 561, 557, 559, 449, 563, 552, + 554, 143, 332, 328, 331, 220, 309, 303, 308, 258, + 0, 466, 461, 536, 538, 531, 535, 42, 523, 47, + 520, 128, 0, 66, 0, 0, 0, 0, 0, 361, + 352, 360, 0, 0, 0, 0, 0, 84, 104, 312, + 319, 324, 254, 256, 0, 0, 0, 0, 0, 0, + 0, 423, 0, 0, 0, 0, 0, 0, 480, 483, + 472, 0, 0, 0, 0, 0, 0, 0, 0, 329, + 0, 0, 305, 0, 88, 0, 0, 0, 0, 533, + 0, 0, 126, 118, 112, 122, 120, 124, 0, 114, + 116, 363, 108, 106, 264, 261, 270, 455, 453, 454, + 443, 433, 435, 437, 439, 441, 445, 0, 0, 477, + 479, 496, 505, 339, 344, 228, 144, 333, 330, 221, + 304, 306, 351, 462, 537, 539, 532, 534, 0, 53, + 39, 48, 52, 0, 129, 353, 0, 0, 0, 366, + 481, 484, 0, 402, 225, 0, 0, 0, 55, 0, + 0, 54, 0, 364, 262, 271, 0, 0, 398, 398, + 340, 399, 345, 226, 334, 307, 463, 0, 49, 51, + 379, 354, 398, 0, 367, 374, 0, 373, 395, 482, + 485, 398, 0, 406, 0, 469, 0, 0, 0, 398, + 365, 286, 293, 291, 272, 282, 283, 290, 0, 369, + 370, 0, 341, 400, 403, 346, 227, 0, 464, 527, + 0, 526, 378, 392, 393, 394, 0, 384, 385, 355, + 0, 0, 0, 0, 0, 0, 288, 375, 371, 396, + 0, 0, 468, 56, 524, 380, 381, 0, 410, 287, + 294, 292, 273, 281, 296, 284, 289, 0, 0, 0, + 0, 404, 0, 0, 382, 386, 407, 356, 0, 0, + 0, 376, 372, 0, 401, 0, 57, 525, 0, 0, + 0, 295, 297, 285, 397, 0, 383, 387, 408, 405, + 0, 414, 0, 411, 409, 412, 0, 413 }; /* TAO_YYDEFGOTO[NTERM-NUM]. */ static const tao_yytype_int16 tao_yydefgoto[] = { - -1, 1, 2, 25, 375, 376, 650, 164, 168, 169, - 163, 167, 114, 109, 118, 170, 172, 174, 178, 179, - 77, 440, 79, 28, 108, 304, 438, 29, 30, 110, - 308, 442, 601, 669, 651, 670, 652, 653, 687, 772, - 31, 111, 391, 32, 33, 117, 327, 450, 34, 80, - 35, 135, 326, 36, 37, 38, 119, 328, 463, 39, - 204, 367, 531, 40, 268, 41, 97, 259, 332, 42, - 43, 396, 464, 465, 557, 556, 395, 451, 546, 553, - 554, 545, 548, 547, 549, 543, 393, 446, 602, 243, - 209, 301, 103, 44, 452, 78, 292, 427, 588, 184, - 244, 399, 246, 247, 248, 249, 250, 251, 252, 253, - 254, 400, 453, 81, 195, 293, 475, 138, 139, 140, - 141, 47, 360, 429, 591, 361, 635, 664, 704, 362, - 363, 142, 143, 144, 145, 146, 147, 148, 149, 150, - 151, 48, 82, 49, 165, 336, 472, 403, 473, 564, - 405, 476, 566, 657, 565, 50, 83, 51, 276, 406, - 567, 658, 693, 743, 483, 714, 744, 715, 745, 780, - 740, 716, 746, 717, 742, 741, 778, 765, 779, 52, - 53, 54, 84, 294, 430, 592, 528, 593, 666, 529, - 157, 333, 469, 158, 267, 397, 159, 334, 470, 160, - 161, 335, 471, 162, 364, 428, 524, 590, 525, 589, - 665, 454, 350, 411, 586, 662, 701, 351, 412, 587, - 663, 703, 455, 85, 295, 431, 594, 456, 609, 672, - 709, 758, 457, 551, 467, 555, 656, 692, 660, 676, - 677, 696, 720, 768, 697, 718, 767, 691, 707, 708, - 736, 756, 788, 737, 757, 789, 511, 738, 699, 721, - 769, 682, 702, 750, 725, 751, 785, 777, 790, 800, - 802, 803, 806, 458, 459, 58, 59, 60, 171, 338, - 489, 61, 207, 369, 298, 368, 407, 490, 573, 574, - 575, 576, 577, 571, 578, 352, 415, 353, 354, 417, - 493, 494, 495, 62, 173, 63, 100, 299, 436, 596, - 667, 705, 371, 435, 728, 284, 339, 500, 408, 501, - 582, 583, 502, 628, 678, 503, 629, 679, 64, 65, - 66, 67, 68, 287, 409, 584, 69, 70, 71, 176, - 286, 72, 288, 410, 585, 73, 227, 228, 309, 443, - 229, 730, 754, 731, 74, 105, 302, 437, 599, 536, - 600, 537, 597, 598, 355, 255, 325, 256, 75, 76, - 106, 303, 181, 291, 425, 356, 426, 357, 421, 422, - 420, 424 + -1, 1, 2, 25, 376, 26, 164, 168, 169, 163, + 167, 114, 109, 118, 170, 172, 174, 178, 179, 77, + 27, 79, 28, 108, 304, 439, 29, 30, 110, 308, + 441, 600, 669, 651, 670, 652, 653, 687, 772, 31, + 111, 391, 32, 33, 117, 327, 449, 34, 80, 35, + 135, 326, 36, 37, 38, 119, 328, 462, 39, 204, + 367, 530, 40, 268, 41, 97, 259, 332, 42, 43, + 396, 463, 464, 556, 555, 395, 450, 545, 552, 553, + 544, 547, 546, 548, 542, 393, 445, 601, 243, 209, + 301, 103, 44, 451, 78, 292, 427, 587, 184, 244, + 399, 246, 247, 248, 249, 250, 251, 252, 253, 254, + 400, 452, 81, 195, 293, 474, 138, 139, 140, 141, + 47, 360, 429, 590, 361, 634, 664, 704, 362, 363, + 142, 143, 144, 145, 146, 147, 148, 149, 150, 151, + 48, 82, 49, 165, 336, 471, 403, 472, 563, 405, + 475, 565, 657, 564, 50, 83, 51, 276, 406, 566, + 658, 693, 743, 482, 714, 744, 715, 745, 780, 740, + 716, 746, 717, 742, 741, 778, 765, 779, 52, 53, + 54, 84, 294, 430, 591, 527, 592, 666, 528, 157, + 333, 468, 158, 267, 397, 159, 334, 469, 160, 161, + 335, 470, 162, 364, 428, 523, 589, 524, 588, 665, + 453, 350, 411, 585, 662, 701, 351, 412, 586, 663, + 703, 454, 85, 295, 431, 593, 455, 608, 672, 709, + 758, 456, 550, 466, 554, 656, 692, 660, 676, 677, + 696, 720, 768, 697, 718, 767, 691, 707, 708, 736, + 756, 788, 737, 757, 789, 510, 738, 699, 721, 769, + 682, 702, 750, 725, 751, 785, 777, 790, 800, 802, + 803, 806, 457, 458, 58, 59, 60, 171, 338, 488, + 61, 207, 369, 298, 368, 407, 489, 572, 573, 574, + 575, 576, 570, 577, 352, 415, 353, 354, 417, 492, + 493, 494, 62, 173, 63, 100, 299, 436, 595, 667, + 705, 371, 435, 728, 284, 339, 499, 408, 500, 581, + 582, 501, 627, 678, 502, 628, 679, 64, 65, 66, + 67, 68, 287, 409, 583, 69, 70, 71, 176, 286, + 72, 288, 410, 584, 73, 227, 228, 309, 442, 229, + 730, 754, 731, 74, 105, 302, 437, 598, 535, 599, + 536, 596, 597, 355, 255, 325, 256, 75, 76, 106, + 303, 181, 291, 425, 356, 426, 357, 421, 422, 420, + 424 }; /* TAO_YYPACT[STATE-NUM] -- Index in TAO_YYTABLE of the portion describing STATE-NUM. */ -#define TAO_YYPACT_NINF -591 +#define TAO_YYPACT_NINF -565 static const tao_yytype_int16 tao_yypact[] = { - -591, 54, 1115, -591, -591, -591, -591, -591, -591, -591, - -591, -591, -591, 42, 51, 59, 26, -591, 42, 42, - -591, 38, 38, -591, -591, -591, -591, -12, -591, 292, - -17, -7, -591, -591, -5, -591, -591, -591, -591, -591, - -591, 80, -591, -591, -591, -591, -591, -591, 1, -591, - 85, -591, -591, -591, -591, -591, -591, -591, -591, -591, - -591, -591, -591, -591, -591, -591, -591, -591, -591, 25, - -591, -591, -591, 25, -591, -591, 35, 63, 1092, 38, - 42, 483, 42, 42, 42, 42, -591, -591, -591, 46, - 42, 52, -591, 72, 42, -591, 25, 42, 69, 71, - 42, -591, 60, -591, 96, 131, 141, -591, 91, 73, - 697, 49, -591, -591, 94, 145, -591, 116, 121, 126, - 130, -591, 215, -591, -591, -591, -591, -591, -591, -591, - -591, -591, -591, -591, -591, -591, 137, -591, -591, -591, - -591, -591, -591, -591, -591, -591, -591, -591, -591, -591, - -591, -591, -591, -591, 85, -591, -591, -591, 22, -591, - 138, -591, 161, 166, 179, 180, -591, 185, 189, 193, - 198, 203, 207, 211, 214, -591, -591, -591, 216, 217, - -591, -591, -591, 137, -591, -591, -591, -591, -591, -591, - -591, -591, -591, 137, -591, -591, -591, -591, -591, -591, - -591, -591, 218, -591, 219, -591, -591, 220, -591, 42, - -591, -591, -591, -591, -591, -591, -591, 1092, -591, -591, - -591, -591, 229, -591, -591, -591, -591, 315, -591, -591, - -591, -591, -591, -591, -591, -591, -591, -591, -591, 111, - 111, 111, 49, 137, -591, -591, 228, 237, 238, 151, - 159, 82, -591, -591, -591, 243, -591, -591, -591, -591, - -591, -591, -591, -591, -591, 327, -591, 235, 289, -591, - -591, -591, -591, -591, -591, -591, 240, -591, -591, -591, - -591, -591, -591, -591, -591, -591, 289, 251, 263, -591, - -591, 335, 42, 42, 264, 265, -591, -591, -591, 250, - -591, 42, 271, 220, -591, -591, 355, -591, 272, 269, - -591, -591, -591, 259, 49, 49, 49, 49, 49, 49, - 49, 49, 49, 49, -591, 273, 38, -591, -591, -591, - -591, 38, -591, 49, 49, 49, -591, -591, -591, -591, - -591, -591, -591, -591, -591, 37, 309, 38, 38, -591, - -591, -591, -591, -591, 37, -591, -591, -591, -591, 266, - -591, -591, -591, -591, -591, -591, -591, -591, 38, 289, - -591, -591, -591, -591, -591, -591, 1193, 283, -591, -591, - -591, 237, 238, 151, 159, 159, 82, 82, -591, -591, - -591, 42, 49, -591, 137, 886, 227, 437, -591, -591, - -591, -591, -591, -591, -591, 408, 195, 278, 828, -591, - -591, 343, 654, -591, 137, 42, -591, -591, 39, 40, - 291, 295, 296, 42, 297, 307, 335, 304, 279, 293, - 395, -591, 921, 137, -591, 38, 289, 113, 314, 318, - -591, 403, 321, 697, -591, -591, 317, -591, -591, -591, - 325, -591, -591, -591, -591, -591, -591, 576, -591, -591, - -591, -591, -591, 326, -591, -591, -591, 329, -591, 341, - 346, 347, 351, 352, -591, -591, -591, 434, 137, -591, - -591, -591, -591, -591, -591, 38, 38, 38, -591, 356, - -591, -591, -591, -591, -591, -591, -591, 42, 42, -591, - 357, -591, -591, -591, 979, 770, -591, 137, -591, -591, - -591, -591, -591, -591, -591, -591, -591, -591, -591, -591, - -591, -591, -591, -591, -591, -591, -591, -591, -591, -591, - 370, 371, 137, -591, -591, -591, -591, -591, -591, -591, - -591, -591, -591, 374, -591, 379, 383, 384, 385, 386, - -591, -591, -591, 387, 388, 471, 408, 408, -591, -591, - -591, -591, -591, -591, -591, 390, 42, 375, 50, 50, - 50, 392, -591, 394, 396, 397, 398, 402, 405, -591, - -591, -591, 420, 425, 393, 424, 654, 42, 49, 49, - 279, 42, 426, 421, 427, -591, 449, 431, 436, 442, - 113, 1140, 38, -591, -591, -591, -591, -591, -591, 529, - -591, -591, -591, -591, -591, -591, -591, -591, -591, -591, - -591, -591, -591, -591, -591, -591, -591, -591, 432, 432, - -591, -591, -591, -591, -591, -591, -591, -591, -591, -591, - -591, -591, -591, -591, -591, -591, -591, -591, -591, 38, - -591, -591, -591, 448, 137, -591, 432, 450, 452, 504, - -591, -591, 42, 485, 451, 438, 395, 38, 137, 454, - 1027, -591, 443, -591, -591, -591, 441, 511, 509, 509, - -591, -591, -591, -591, -591, -591, 137, 460, -591, -591, - 446, -591, 509, 45, -591, -591, 447, -591, -591, -591, - -591, 509, 456, 489, 42, 493, 551, 457, 164, 509, - -591, -591, -591, -591, -591, -591, -591, -591, 654, -591, - 468, 459, -591, -591, -591, -591, -591, 38, -591, -591, - 473, -591, -591, -591, -591, -591, 461, -591, -591, -591, - 480, 49, 477, 481, 81, 483, 234, -591, -591, -591, - 38, 467, 137, -591, 479, -591, 482, 654, 532, -591, - -591, -591, -591, -591, -591, -591, -591, 42, 511, 38, - 469, -591, 42, 551, -591, -591, -591, -591, 486, 42, - 490, -591, -591, 478, -591, 38, -591, -591, 164, 42, - 494, -591, -591, -591, -591, 495, -591, -591, -591, -591, - 505, -591, 496, 492, -591, -591, 522, -591 + -565, 66, 1085, -565, -565, -565, -565, -565, -565, -565, + -565, -565, -565, 72, 93, 48, 105, -565, 72, 72, + -565, 40, 40, -565, -565, -565, -565, 59, -565, 292, + -7, 22, -565, -565, -45, -565, -565, -565, -565, -565, + -565, 219, -565, -565, -565, -565, -565, -565, 70, -565, + 135, -565, -565, -565, -565, -565, -565, -565, -565, -565, + -565, -565, -565, -565, -565, -565, -565, -565, -565, 81, + -565, -565, -565, 81, -565, -565, 75, 92, 731, 40, + 72, 482, 72, 72, 72, 72, -565, -565, -565, 36, + 72, 85, -565, 110, 72, -565, 81, 72, 118, 121, + 72, -565, 25, -565, 64, 205, 210, -565, 129, 156, + 408, 39, -565, -565, 161, 200, -565, 182, 202, 199, + 45, -565, 77, -565, -565, -565, -565, -565, -565, -565, + -565, -565, -565, -565, -565, -565, 214, -565, -565, -565, + -565, -565, -565, -565, -565, -565, -565, -565, -565, -565, + -565, -565, -565, -565, 135, -565, -565, -565, 19, -565, + 209, -565, 212, 220, 225, 228, -565, 232, 233, 236, + 239, 243, 245, 247, 252, -565, -565, -565, 253, 257, + -565, -565, -565, 214, -565, -565, -565, -565, -565, -565, + -565, -565, -565, 214, -565, -565, -565, -565, -565, -565, + -565, -565, 258, -565, 260, -565, -565, 259, -565, 72, + -565, -565, -565, -565, -565, -565, -565, 731, -565, -565, + -565, -565, 262, -565, -565, -565, -565, 352, -565, -565, + -565, -565, -565, -565, -565, -565, -565, -565, -565, 54, + 54, 54, 39, 214, -565, -565, 264, 266, 261, 43, + 97, 69, -565, -565, -565, 269, -565, -565, -565, -565, + -565, -565, -565, -565, -565, 353, -565, 274, 316, -565, + -565, -565, -565, -565, -565, -565, 265, -565, -565, -565, + -565, -565, -565, -565, -565, -565, 316, 278, 279, -565, + -565, 149, 72, 72, 280, 284, -565, -565, -565, 282, + -565, 72, 290, 259, -565, -565, 377, -565, 293, 303, + -565, -565, -565, 281, 39, 39, 39, 39, 39, 39, + 39, 39, 39, 39, -565, 305, 40, -565, -565, -565, + -565, 40, -565, 39, 39, 39, -565, -565, -565, -565, + -565, -565, -565, -565, -565, 79, 323, 40, 40, -565, + -565, -565, -565, -565, 79, -565, -565, -565, -565, 294, + -565, -565, -565, -565, -565, -565, -565, -565, 40, 316, + -565, -565, -565, -565, -565, 1163, -565, 308, -565, -565, + -565, 266, 261, 43, 97, 97, 69, 69, -565, -565, + -565, 72, 39, -565, 214, 944, 770, 575, -565, -565, + -565, -565, -565, -565, -565, 246, 80, 271, 886, -565, + -565, 368, 648, -565, 214, 72, -565, -565, 62, 65, + 298, 322, 324, 72, 326, 314, 149, 321, 304, 325, + 414, -565, 979, 214, -565, 40, 316, -19, 331, 334, + 420, 338, 408, -565, -565, 336, -565, -565, -565, 343, + -565, -565, -565, -565, -565, -565, 173, -565, -565, -565, + -565, -565, 346, -565, -565, -565, 340, -565, 345, 349, + 354, 357, 358, -565, -565, -565, 438, 214, -565, -565, + -565, -565, -565, -565, 40, 40, 40, -565, 360, -565, + -565, -565, -565, -565, -565, -565, 72, 72, -565, 363, + -565, -565, -565, 1037, 828, -565, 214, -565, -565, -565, + -565, -565, -565, -565, -565, -565, -565, -565, -565, -565, + -565, -565, -565, -565, -565, -565, -565, -565, -565, 364, + 366, 214, -565, -565, -565, -565, -565, -565, -565, -565, + -565, -565, 369, -565, 373, 374, 375, 382, 383, -565, + -565, -565, 388, 389, 473, 246, 246, -565, -565, -565, + -565, -565, -565, -565, 392, 72, 376, 71, 71, 71, + 393, -565, 395, 396, 397, 402, 404, 419, -565, -565, + -565, 424, 425, 426, 427, 648, 72, 39, 39, 304, + 72, 428, 421, 429, -565, 445, 442, 443, 444, -19, + 1138, 40, -565, -565, -565, -565, -565, -565, 529, -565, + -565, -565, -565, -565, -565, -565, -565, -565, -565, -565, + -565, -565, -565, -565, -565, -565, -565, 431, 431, -565, + -565, -565, -565, -565, -565, -565, -565, -565, -565, -565, + -565, -565, -565, -565, -565, -565, -565, -565, 40, -565, + -565, -565, -565, 449, 214, -565, 431, 452, 453, 503, + -565, -565, 72, 485, 450, 437, 414, 40, 214, 456, + 399, -565, 446, -565, -565, -565, 441, 510, 508, 508, + -565, -565, -565, -565, -565, -565, 214, 459, -565, -565, + 447, -565, 508, 51, -565, -565, 448, -565, -565, -565, + -565, 508, 451, 487, 72, 498, 555, 457, 175, 508, + -565, -565, -565, -565, -565, -565, -565, -565, 648, -565, + 468, 461, -565, -565, -565, -565, -565, 40, -565, -565, + 472, -565, -565, -565, -565, -565, 463, -565, -565, -565, + 479, 39, 477, 481, 63, 482, 191, -565, -565, -565, + 40, 467, 214, -565, 480, -565, 483, 648, 531, -565, + -565, -565, -565, -565, -565, -565, -565, 72, 510, 40, + 469, -565, 72, 555, -565, -565, -565, -565, 489, 72, + 490, -565, -565, 492, -565, 40, -565, -565, 175, 72, + 478, -565, -565, -565, -565, 493, -565, -565, -565, -565, + 507, -565, 494, 511, -565, -565, 523, -565 }; /* TAO_YYPGOTO[NTERM-NUM]. */ static const tao_yytype_int16 tao_yypgoto[] = { - -591, -591, -591, -591, -591, -591, 21, -591, -591, -591, - -591, -591, -591, -591, -591, -591, -591, -591, -591, -591, - -591, 598, -591, -591, -591, -591, -591, -591, -591, -591, - -591, -591, -591, -591, -591, -591, -67, -591, -591, -591, - -591, -591, -591, -591, -591, -591, -591, -591, 254, -591, - -591, 231, -591, -591, -591, 588, -591, -591, -591, -591, - -591, -591, -591, 590, -591, 261, -591, -591, -253, -591, - -591, 196, -591, -591, -591, -591, -307, -358, -591, -591, - -591, -591, -591, -591, -591, -591, -309, -591, -591, -20, - -591, -591, -13, -591, 11, -591, -591, -591, -591, 391, - 19, -99, -591, 300, 294, 301, -36, -25, -107, -19, - -591, -305, 12, -591, -591, -591, -33, 222, -394, -591, - -591, -591, 55, -591, -591, -560, -40, -591, -591, -10, - -591, -54, -591, -591, -43, -42, -53, -51, -50, -591, - -591, -34, -591, -32, -591, -591, -591, -591, 192, 275, - -591, -271, -591, -591, -591, -30, -591, -26, -591, -591, - -591, -591, -591, -591, -591, -591, -591, -124, -591, -591, - -591, -591, -591, -122, -591, -591, -591, -591, -591, -591, - -591, -37, -591, -591, -591, -591, -591, -591, -591, -41, - -591, -591, -591, -591, -591, -591, -68, -591, -591, -591, - -58, -591, -591, -591, -591, -591, -591, -591, 36, -591, - -591, -254, -591, -591, -591, -591, -591, -591, -591, -591, - -591, -591, 14, -591, -591, -591, -591, -591, -591, -591, - -591, -591, -591, -591, -591, -591, -591, -591, -590, -591, - -591, -591, -591, -591, -141, -591, -591, -591, -591, -591, - -591, -591, -591, -160, -591, -591, -431, -591, -540, -591, - -591, -591, -591, -591, -591, -591, -591, -591, -591, -591, - -591, -591, -591, 15, 17, -591, -591, -591, -591, -591, - -591, -591, -591, -591, 328, -591, -591, -591, -591, -591, - -591, -591, -591, -591, -591, -375, 276, -373, -591, -591, - -591, -591, -591, -591, -591, -591, -591, -591, -591, -591, - -591, -591, -591, -591, -591, -591, -591, -591, -591, -591, - -591, -591, -591, -591, -591, -591, -591, -591, -591, -591, - -591, -591, -591, -591, -591, -591, -591, -591, -591, 559, - -591, -591, -591, -591, -591, -591, -591, -591, -591, -591, - 190, -591, -591, -139, -591, -591, -591, -591, -591, -591, - -591, 41, -591, -591, 230, -591, -591, 244, -591, -591, - -591, -591, -591, -591, -591, -591, -591, 209, -591, -591, - -591, -591 + -565, -565, 299, 229, -565, -564, -565, -565, -565, -565, + -565, -565, -565, -565, -565, -565, -565, -565, -565, -565, + -561, -565, -565, -565, -565, -565, -565, -565, -565, -565, + -565, -565, -565, -565, -565, -64, -565, -565, -565, -565, + -565, -565, -565, -565, -565, -565, -565, 263, -565, -565, + 132, -565, -565, -565, 589, -565, -565, -565, -565, -565, + -565, -565, 592, -565, 267, -565, -565, -258, -565, -565, + 198, -565, -565, -565, -565, -307, -358, -565, -565, -565, + -565, -565, -565, -565, -565, -313, -565, -565, -20, -565, + -565, -13, -565, 12, -565, -565, -565, -565, 394, 23, + -99, -565, 295, 301, 297, -28, -12, -71, 35, -565, + -304, 14, -565, -565, -565, -33, 222, -383, -565, -565, + -565, 52, -565, -565, -563, -41, -565, -565, -10, -565, + -55, -565, -565, -44, -43, -54, -53, -52, -565, -565, + -34, -565, -32, -565, -565, -565, -565, 192, 286, -565, + -264, -565, -565, -565, -30, -565, -26, -565, -565, -565, + -565, -565, -565, -565, -565, -565, -120, -565, -565, -565, + -565, -565, -121, -565, -565, -565, -565, -565, -565, -565, + -37, -565, -565, -565, -565, -565, -565, -565, -40, -565, + -565, -565, -565, -565, -565, -68, -565, -565, -565, -65, + -565, -565, -565, -565, -565, -565, -565, 38, -565, -565, + -254, -565, -565, -565, -565, -565, -565, -565, -565, -565, + -565, 15, -565, -565, -565, -565, -565, -565, -565, -565, + -565, -565, -565, -565, -565, -565, -565, -552, -565, -565, + -565, -565, -565, -139, -565, -565, -565, -565, -565, -565, + -565, -565, -158, -565, -565, -437, -565, -406, -565, -565, + -565, -565, -565, -565, -565, -565, -565, -565, -565, -565, + -565, -565, 18, 20, -565, -565, -565, -565, -565, -565, + -565, -565, -565, 328, -565, -565, -565, -565, -565, -565, + -565, -565, -565, -565, -375, 283, -374, -565, -565, -565, + -565, -565, -565, -565, -565, -565, -565, -565, -565, -565, + -565, -565, -565, -565, -565, -565, -565, -565, -565, -565, + -565, -565, -565, -565, -565, -565, -565, -565, -565, -565, + -565, -565, -565, -565, -565, -565, -565, -565, 559, -565, + -565, -565, -565, -565, -565, -565, -565, -565, -565, 193, + -565, -565, -140, -565, -565, -565, -565, -565, -565, -565, + 37, -565, -565, 227, -565, -565, 248, -565, -565, -565, + -565, -565, -565, -565, -565, -565, 213, -565, -565, -565, + -565 }; /* TAO_YYTABLE[TAO_YYPACT[STATE-NUM]]. What to do in state STATE-NUM. If positive, shift that token. If negative, reduce the rule which number is the opposite. If zero, do what TAO_YYDEFACT says. If TAO_YYTABLE_NINF, syntax error. */ -#define TAO_YYTABLE_NINF -507 +#define TAO_YYTABLE_NINF -505 static const tao_yytype_int16 tao_yytable[] = { 87, 102, 104, 88, 156, 98, 99, 152, 137, 153, - 191, 154, 245, 45, 46, 155, 55, 56, 508, 57, - 192, 136, 398, 26, 185, 188, 552, 189, 190, 401, - 402, 640, 491, 340, 492, 186, 187, 349, 466, 661, - 86, 86, 513, 514, 156, 86, 711, 152, 196, 153, - 499, 154, 86, 86, 3, 155, 413, 7, 183, 193, - 432, 136, 534, 508, 535, 7, 673, 194, 112, 197, - 198, 199, 200, 712, 713, 17, 107, 202, 113, 94, - -139, 205, 711, 86, 206, 115, -300, 208, 120, 121, - 122, 123, 124, 125, 126, 127, 128, 129, 130, 131, - 9, 10, 504, 11, 132, 133, 134, 166, 17, 712, - 713, 269, 90, 270, 86, 115, 434, 101, 101, 211, - 211, 180, 230, 231, 232, 233, 234, 235, 236, 101, - 211, -140, 237, 238, 213, 210, 115, -141, 263, 700, - 211, 264, 115, 313, 214, 239, 240, 466, 182, 191, - 241, 242, 710, 488, -421, 634, -493, -99, 216, 192, - 101, 722, 115, 185, 188, -100, 189, 190, -282, 739, - 115, 212, 349, 345, 186, 187, 211, 215, 346, 257, - 321, 322, 323, 533, 230, 231, 232, 233, 234, 235, - 236, 101, 508, 258, 237, 238, 300, 183, 86, 733, - 734, 735, 260, 477, 121, 122, 261, 781, 125, 126, - 127, 128, 262, 242, 388, 389, 390, 211, 11, 792, - 310, 311, 312, 265, 266, 534, 271, 535, 447, 797, - -361, 5, 317, 318, 8, -361, -361, -361, -361, -361, - -361, -361, -361, -361, -361, -361, -361, 9, 10, 272, - 11, 273, -361, -361, 12, 319, 320, 343, 344, 448, - 449, -361, 712, 713, 274, 116, 275, 13, 89, 91, - 277, 460, 461, 462, 278, 101, 93, 96, 279, 358, - 359, 384, 385, 280, 638, 613, 614, 747, 372, 281, - 21, 22, 282, 245, 386, 387, -46, 283, -46, 285, - 175, 289, 290, -494, 175, 296, 394, -361, 343, 344, - 297, 394, -46, -46, -85, -46, -46, 306, 307, -46, - 201, 314, 203, 330, 508, 414, 775, 418, 419, 485, - 486, 315, 324, 316, 414, 329, 331, 341, 345, 487, - 370, -46, 337, 346, 509, -46, 347, 348, 433, 342, - 365, 366, 479, 480, 510, 481, 482, 373, 377, -46, - 379, 378, 380, 508, 392, 343, 344, 416, 156, 484, - -329, 152, 441, 153, 506, 154, 515, 136, 444, 155, - 516, 517, 519, 523, 526, 136, 478, 45, 46, 509, - 55, 56, 507, 57, 520, 345, 522, 439, 527, 510, - 346, 538, 512, 347, 348, -8, 539, 540, 542, 474, - 518, 86, 544, 558, 559, 532, 120, 121, 122, 123, - 124, 125, 126, 127, 128, 129, 130, 131, 9, 10, - 560, 11, 132, 133, 134, 561, 562, 507, 563, -257, - 86, 770, 263, 572, 581, 120, 121, 122, 123, 124, - 125, 126, 127, 128, 129, 130, 131, -352, 595, 603, - 783, 132, 133, 134, 604, 568, 569, 570, 605, 606, - 607, 608, 610, 611, 612, 615, 795, 621, 617, 622, - 632, 623, 624, 625, 579, 580, 86, 626, 101, 245, - 627, 120, 121, 122, 123, 124, 125, 126, 127, 128, - 129, 130, 131, 9, 10, 630, 11, 132, 133, 134, - 631, 633, 642, 641, 643, 644, 645, 101, 509, 156, - 156, 646, 152, 152, 153, 153, 154, 154, 510, 647, - 155, 155, 655, 671, 659, 674, 136, 136, 675, -370, - 681, 688, 683, 684, 694, 690, 695, 698, 706, -379, - 719, 724, 727, 359, 729, 618, 619, 620, 723, 748, - 732, 749, 753, 101, 755, 759, 507, 761, 762, 771, - 773, 776, 784, 774, 87, 793, 791, 636, 359, 86, - 801, 794, 654, 805, 120, 121, 122, 123, 124, 125, - 126, 127, 128, 129, 130, 131, 798, 807, 799, 804, - 27, 133, 134, 689, 95, 92, 505, 637, 305, 382, - 550, 404, 45, 46, 381, 55, 56, 383, 57, 468, - 763, 616, 680, 530, 766, 685, 639, 782, 796, 668, - 423, 374, 177, 541, 787, 521, 445, 496, 0, 0, - 0, 648, 760, 0, 0, 0, 0, 686, 0, 87, - 509, 0, 636, 0, 0, 0, 101, 86, 0, 0, - 510, 0, 120, 121, 122, 123, 124, 125, 126, 127, - 128, 129, 130, 131, 0, 0, 0, 0, 0, 133, - 134, 45, 46, 0, 55, 56, 0, 57, 0, 509, - 0, 87, 0, 0, 726, 0, 0, 0, 507, 510, - 0, 217, 0, 218, 0, 0, 0, 752, 156, 0, - 0, 152, 764, 153, 0, 154, 0, 219, 220, 155, - 221, 222, 0, 0, 223, 136, 0, 0, 0, 0, - 394, 0, 0, 0, 101, 0, 0, 507, 0, 0, - 0, 0, 0, 0, 0, 0, 224, 0, 0, 394, - 225, 0, 0, 0, 359, 0, 0, 0, 0, 786, - 0, 0, 0, 0, 226, 394, 359, 0, 0, 0, - 0, 447, 0, -361, 5, 0, 359, 8, -361, -361, - -361, -361, -361, -361, -361, -361, -361, -361, -361, -361, - 9, 10, 0, 11, 0, -361, -361, 12, 0, 0, - 343, 344, 448, 449, -361, 0, 0, 0, 0, 0, - 13, 0, 0, 0, 460, 461, 462, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 447, - 0, -361, 5, 21, 22, 8, -361, -361, -361, -361, - -361, -361, -361, -361, -361, -361, -361, -361, 9, 10, - -361, 11, 0, -361, -361, 12, 0, -506, 343, 344, - 448, 449, -361, 0, 0, 0, 0, 0, 13, 0, - 0, 0, 497, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 498, 0, 0, 0, 0, 447, 0, -361, - 5, 21, 22, 8, -361, -361, -361, -361, -361, -361, - -361, -361, -361, -361, -361, -361, 9, 10, -361, 11, - 0, -361, -361, 12, 0, -473, 343, 344, 448, 449, - -361, 0, 447, 0, -361, 5, 13, 0, 8, -361, - -361, -361, -361, -361, -361, -361, -361, -361, -361, -361, - -361, 9, 10, 0, 11, 0, -361, -361, 12, 21, - 22, 343, 344, 448, 449, -361, 0, 0, 0, 0, - 0, 13, 0, 0, 0, 0, -361, 0, 0, 0, - 0, 0, 0, -67, 0, 0, 0, 0, 0, 0, - 447, 0, -361, 5, 21, 22, 8, -361, -361, -361, - -361, -361, -361, -361, -361, -361, -361, -361, -361, 9, - 10, -361, 11, 0, -361, -361, 12, 0, -89, 343, - 344, 448, 449, -361, 0, 0, 0, 0, 0, 13, - 0, 0, 0, 0, 0, 0, 0, 0, 4, 0, - 0, 5, 6, 7, 8, 0, 0, 0, 0, 0, - 0, 0, 21, 22, 0, 0, 0, 9, 10, 0, - 11, 0, 0, 0, 12, 0, 0, 0, 0, -361, - 0, 0, 0, 0, 0, 0, -497, 13, 14, 15, - 16, 0, 0, 0, 0, 0, 17, 18, 0, 0, - 19, 0, 0, 20, 0, 0, 0, 0, 0, 0, - 21, 22, 0, 0, 0, 86, 0, 23, 24, 649, + 191, 154, 245, 192, 45, 155, 46, 55, 398, 551, + 56, 136, 57, 185, 188, 189, 190, 639, 340, 507, + 401, 402, 490, 491, 186, 187, 649, 349, 465, 650, + -137, 345, 86, 86, 156, 115, 346, 152, 196, 153, + 498, 154, 711, 263, 7, 155, 264, 86, 183, 193, + 432, 136, 533, 534, 711, 512, 3, 194, 513, 197, + 198, 199, 200, 507, 86, 86, 661, 202, 112, 712, + 713, 205, 86, 86, 206, 265, 266, 208, 476, 121, + 122, 712, 713, 125, 126, 127, 128, 17, 413, 7, + 210, 90, 503, 11, 673, 211, 649, 113, 269, 650, + 270, 434, 230, 231, 232, 233, 234, 235, 236, 101, + 101, -138, 237, 238, 317, 318, 115, 230, 231, 232, + 233, 234, 235, 236, 101, 239, 240, 237, 238, 212, + 241, 242, 211, 313, 211, 211, 465, 107, 633, 191, + -280, 211, 192, 487, 17, -298, 242, 166, 94, 101, + 101, 180, 185, 188, 189, 190, 116, 321, 322, 323, + -139, 115, 349, 186, 187, 115, 86, 182, 532, 343, + 344, 120, 121, 122, 123, 124, 125, 126, 127, 128, + 129, 130, 131, 319, 320, -97, 300, 183, 133, 134, + 115, 175, 507, -419, 781, 175, -491, 549, 213, 345, + 733, 734, 735, 214, 346, 215, 792, 347, 348, 712, + 713, 201, 86, 203, 533, 534, 797, 120, 121, 122, + 123, 124, 125, 126, 127, 128, 129, 130, 131, 9, + 10, 216, 11, 132, 133, 134, 257, 473, 258, 86, + 388, 389, 390, 101, 120, 121, 122, 123, 124, 125, + 126, 127, 128, 129, 130, 131, 9, 10, 260, 11, + 132, 133, 134, 700, 310, 311, 312, 89, 91, 358, + 359, 747, 93, 96, 637, 262, 710, 261, 372, 384, + 385, 612, 613, 245, 211, 722, -44, 271, -44, 101, + 272, 343, 344, 739, -98, 273, 394, 386, 387, 115, + 274, 394, -44, -44, 275, -44, -44, 277, 278, -44, + 775, 279, 484, 485, 280, 414, 101, 418, 419, 281, + 282, 345, 486, 283, 414, 507, 346, 285, 289, 347, + 348, -44, 290, -492, 508, -44, 296, 509, 433, 297, + 306, 478, 479, 480, 481, 307, 316, 314, 324, -44, + 315, 329, 330, 331, 341, 342, 365, 337, 156, 483, + 366, 152, 370, 153, 507, 154, 373, 136, 443, 155, + 377, 416, 378, 514, 380, 136, 477, 45, 508, 46, + 55, 509, 506, 56, 379, 57, 392, 440, -327, 505, + 4, 519, 511, 5, 6, 7, 8, 515, 522, 516, + 517, 518, 217, 521, 218, 531, 525, 526, -8, 9, + 10, 537, 11, 538, 539, 558, 12, 541, 219, 220, + 543, 221, 222, 557, 559, 223, 506, 770, 560, 13, + 14, 15, 16, 561, 562, -255, 263, 571, 17, 18, + 580, -350, 19, 594, 602, 20, 783, 224, 603, 604, + 605, 225, 21, 22, 567, 568, 569, 606, 607, 23, + 24, 648, 795, 609, 610, 226, 611, 614, 620, 616, + 621, 622, 623, 578, 579, 86, -50, 624, 245, 625, 120, 121, 122, 123, 124, 125, 126, 127, 128, 129, - 0, 0, 0, 0, -52, -2, 4, 133, 134, 5, + 130, 131, 9, 10, 626, 11, 132, 133, 134, 629, + 630, 643, 641, 631, 632, 640, 642, 508, 156, 156, + 509, 152, 152, 153, 153, 154, 154, 644, 645, 155, + 155, 646, 655, 659, 671, 136, 136, 674, -368, 675, + 681, 683, 684, 688, 694, 695, 698, 706, 690, 724, + -377, 719, 359, 723, 617, 618, 619, 727, 729, 748, + 732, 753, 101, 749, 759, 506, 755, 761, 762, 771, + 776, 773, 784, 87, 774, 793, 635, 359, 86, 791, + 798, 654, 801, 120, 121, 122, 123, 124, 125, 126, + 127, 128, 129, 130, 131, 794, 799, 804, 807, 132, + 133, 134, 805, 375, 438, 95, 689, 92, 504, 381, + 636, 305, 45, 383, 46, 55, 382, 615, 56, 467, + 57, 680, 404, 529, 763, 766, 685, 638, 668, 782, + 796, 374, 177, 787, 495, 540, 647, 423, 0, 520, + 444, 0, 760, 0, 0, 0, 0, 686, 0, 87, + 508, 86, 635, 509, 0, 101, 120, 121, 122, 123, + 124, 125, 126, 127, 128, 129, 130, 131, 0, 0, + 0, 0, 0, 133, 134, 0, 0, 0, 0, 0, + 0, 0, 45, 0, 46, 55, 0, 0, 56, 508, + 57, 87, 509, 0, 726, 0, 0, 0, 506, 0, + 0, 0, 0, 0, 0, 0, 0, 752, 156, 0, + 0, 152, 764, 153, 0, 154, 0, 0, 0, 155, + 0, 0, 0, 0, 0, 136, 0, 0, 101, 0, + 394, 0, 0, 0, 86, 0, 0, 506, 0, 120, + 121, 122, 123, 124, 125, 126, 127, 128, 129, 394, + 0, 0, 0, 0, 359, 0, 133, 134, 0, 786, + 0, 0, 0, 0, 0, 394, 359, 0, 0, 0, + 0, 446, 0, -359, 5, 0, 359, 8, -359, -359, + -359, -359, -359, -359, -359, -359, -359, -359, -359, -359, + 9, 10, 0, 11, 0, -359, -359, 12, 0, 0, + 343, 344, 447, 448, -359, 0, 0, 0, 0, 0, + 13, 101, 0, 0, 459, 460, 461, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 446, + 0, -359, 5, 21, 22, 8, -359, -359, -359, -359, + -359, -359, -359, -359, -359, -359, -359, -359, 9, 10, + -359, 11, 0, -359, -359, 12, 0, -83, 343, 344, + 447, 448, -359, 0, 0, 0, 0, 0, 13, 0, + 0, 0, 459, 460, 461, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 446, 0, -359, + 5, 21, 22, 8, -359, -359, -359, -359, -359, -359, + -359, -359, -359, -359, -359, -359, 9, 10, -359, 11, + 0, -359, -359, 12, 0, -504, 343, 344, 447, 448, + -359, 0, 0, 0, 0, 0, 13, 0, 0, 0, + 496, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 497, 0, 0, 0, 0, 446, 0, -359, 5, 21, + 22, 8, -359, -359, -359, -359, -359, -359, -359, -359, + -359, -359, -359, -359, 9, 10, -359, 11, 0, -359, + -359, 12, 0, -471, 343, 344, 447, 448, -359, 0, + 446, 0, -359, 5, 13, 0, 8, -359, -359, -359, + -359, -359, -359, -359, -359, -359, -359, -359, -359, 9, + 10, 0, 11, 0, -359, -359, 12, 21, 22, 343, + 344, 447, 448, -359, 0, 0, 0, 0, 0, 13, + 0, 0, 0, 0, -359, 0, 0, 0, 0, 0, + 0, -65, 0, 0, 0, 0, 0, 0, 446, 0, + -359, 5, 21, 22, 8, -359, -359, -359, -359, -359, + -359, -359, -359, -359, -359, -359, -359, 9, 10, -359, + 11, 0, -359, -359, 12, 0, -87, 343, 344, 447, + 448, -359, 0, 0, 0, 0, 0, 13, 0, 0, + 0, 0, 0, 0, 0, -2, 4, 0, 0, 5, 6, 7, 8, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 9, 10, 0, 11, 0, - 0, 4, 12, 0, 5, 6, 7, 8, 0, 0, - 0, 0, 0, 0, 0, 13, 14, 15, 16, 0, - 9, 10, 0, 11, 17, 18, 0, 12, 19, 0, - 0, 20, 101, 0, 0, 0, 0, 0, 21, 22, - 13, 14, 15, 16, 0, 23, 24, 0, 0, 17, - 18, 0, 0, 19, 4, 0, 20, 5, 6, 7, - 8, 0, 0, 21, 22, 0, 0, 0, 0, 0, - 23, 24, 649, 9, 10, 0, 11, 0, 0, 0, - 12, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 13, 14, 15, 16, 0, 0, 0, - 0, 0, 17, 18, 0, 0, 19, 0, 0, 20, + 21, 22, 0, 0, 0, 9, 10, 0, 11, 0, + 0, 0, 12, 0, 0, 0, 0, -359, 0, 0, + 0, 0, 0, 0, -495, 13, 14, 15, 16, 0, + 0, 0, 0, 0, 17, 18, 0, 0, 19, 4, + 0, 20, 5, 6, 7, 8, 0, 0, 21, 22, + 0, 0, 0, 0, 0, 23, 24, 0, 9, 10, + 0, 11, 0, 0, 4, 12, 0, 5, 6, 7, + 8, 0, 0, 0, 0, 0, 0, 0, 13, 14, + 15, 16, 0, 9, 10, 0, 11, 17, 18, 0, + 12, 19, 0, 0, 20, 0, 0, 0, 0, 0, + 0, 21, 22, 13, 14, 15, 16, 0, 23, 24, + 648, 0, 17, 18, 0, 0, 19, 0, 0, 20, 0, 0, 0, 0, 0, 0, 21, 22, 0, 0, 0, 0, 0, 23, 24 }; @@ -1589,130 +1581,127 @@ static const tao_yytype_int16 tao_yytable[] = static const tao_yytype_int16 tao_yycheck[] = { 13, 21, 22, 13, 41, 18, 19, 41, 41, 41, - 78, 41, 111, 2, 2, 41, 2, 2, 412, 2, - 78, 41, 331, 2, 78, 78, 457, 78, 78, 334, - 335, 591, 407, 286, 407, 78, 78, 291, 396, 629, - 3, 3, 3, 3, 81, 3, 1, 81, 81, 81, - 408, 81, 3, 3, 0, 81, 19, 6, 78, 79, - 367, 81, 437, 457, 437, 6, 656, 80, 85, 82, - 83, 84, 85, 28, 29, 49, 88, 90, 85, 53, - 85, 94, 1, 3, 97, 90, 85, 100, 8, 9, - 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, - 20, 21, 409, 23, 24, 25, 26, 22, 49, 28, - 29, 89, 53, 91, 3, 90, 369, 80, 80, 80, - 80, 86, 73, 74, 75, 76, 77, 78, 79, 80, - 80, 85, 83, 84, 3, 75, 90, 85, 8, 679, - 80, 11, 90, 242, 3, 96, 97, 505, 85, 217, - 101, 102, 692, 407, 85, 586, 85, 85, 85, 217, - 80, 701, 90, 217, 217, 85, 217, 217, 87, 709, - 90, 75, 426, 60, 217, 217, 80, 86, 65, 85, - 98, 99, 100, 436, 73, 74, 75, 76, 77, 78, - 79, 80, 586, 48, 83, 84, 209, 217, 3, 35, - 36, 37, 86, 8, 9, 10, 85, 767, 13, 14, - 15, 16, 86, 102, 321, 322, 323, 80, 23, 779, - 239, 240, 241, 8, 9, 600, 88, 600, 1, 789, - 3, 4, 81, 82, 7, 8, 9, 10, 11, 12, - 13, 14, 15, 16, 17, 18, 19, 20, 21, 88, - 23, 85, 25, 26, 27, 96, 97, 30, 31, 32, - 33, 34, 28, 29, 85, 34, 86, 40, 14, 15, - 85, 44, 45, 46, 85, 80, 15, 16, 85, 292, - 293, 317, 318, 85, 589, 556, 557, 718, 301, 86, - 63, 64, 85, 392, 319, 320, 4, 86, 6, 85, - 69, 85, 85, 85, 73, 86, 326, 80, 30, 31, - 90, 331, 20, 21, 87, 23, 24, 88, 3, 27, - 89, 93, 91, 88, 718, 345, 757, 347, 348, 51, - 52, 94, 89, 95, 354, 8, 47, 86, 60, 61, - 90, 49, 102, 65, 412, 53, 68, 69, 368, 86, - 86, 86, 406, 406, 412, 406, 406, 86, 3, 67, - 91, 89, 103, 757, 91, 30, 31, 58, 405, 406, - 104, 405, 89, 405, 31, 405, 85, 397, 391, 405, - 85, 85, 85, 104, 91, 405, 406, 376, 376, 457, - 376, 376, 412, 376, 87, 60, 92, 376, 3, 457, - 65, 87, 415, 68, 69, 87, 3, 86, 91, 1, - 423, 3, 87, 87, 85, 435, 8, 9, 10, 11, - 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, - 89, 23, 24, 25, 26, 89, 89, 457, 87, 87, - 3, 750, 8, 87, 87, 8, 9, 10, 11, 12, - 13, 14, 15, 16, 17, 18, 19, 87, 87, 85, - 769, 24, 25, 26, 85, 485, 486, 487, 85, 85, - 85, 85, 85, 85, 3, 85, 785, 85, 103, 85, - 87, 85, 85, 85, 497, 498, 3, 85, 80, 588, - 85, 8, 9, 10, 11, 12, 13, 14, 15, 16, - 17, 18, 19, 20, 21, 85, 23, 24, 25, 26, - 85, 87, 91, 87, 87, 66, 85, 80, 586, 556, - 557, 85, 556, 557, 556, 557, 556, 557, 586, 87, - 556, 557, 3, 85, 102, 85, 556, 557, 86, 35, - 55, 87, 91, 105, 103, 102, 35, 38, 88, 103, - 103, 62, 59, 566, 3, 568, 569, 570, 102, 91, - 103, 102, 89, 80, 103, 85, 586, 90, 87, 102, - 91, 39, 103, 91, 587, 85, 90, 587, 591, 3, - 75, 103, 602, 91, 8, 9, 10, 11, 12, 13, - 14, 15, 16, 17, 18, 19, 102, 75, 103, 103, - 2, 25, 26, 670, 16, 15, 410, 588, 217, 315, - 34, 336, 601, 601, 314, 601, 601, 316, 601, 397, - 744, 566, 662, 431, 746, 666, 590, 768, 788, 649, - 354, 303, 73, 443, 773, 426, 392, 407, -1, -1, - -1, 600, 741, -1, -1, -1, -1, 667, -1, 662, - 718, -1, 662, -1, -1, -1, 80, 3, -1, -1, - 718, -1, 8, 9, 10, 11, 12, 13, 14, 15, - 16, 17, 18, 19, -1, -1, -1, -1, -1, 25, - 26, 670, 670, -1, 670, 670, -1, 670, -1, 757, - -1, 704, -1, -1, 704, -1, -1, -1, 718, 757, - -1, 4, -1, 6, -1, -1, -1, 727, 745, -1, - -1, 745, 745, 745, -1, 745, -1, 20, 21, 745, - 23, 24, -1, -1, 27, 745, -1, -1, -1, -1, - 750, -1, -1, -1, 80, -1, -1, 757, -1, -1, - -1, -1, -1, -1, -1, -1, 49, -1, -1, 769, - 53, -1, -1, -1, 767, -1, -1, -1, -1, 772, - -1, -1, -1, -1, 67, 785, 779, -1, -1, -1, + 78, 41, 111, 78, 2, 41, 2, 2, 331, 456, + 2, 41, 2, 78, 78, 78, 78, 590, 286, 412, + 334, 335, 407, 407, 78, 78, 600, 291, 396, 600, + 85, 60, 3, 3, 81, 90, 65, 81, 81, 81, + 408, 81, 1, 8, 6, 81, 11, 3, 78, 79, + 367, 81, 437, 437, 1, 3, 0, 80, 3, 82, + 83, 84, 85, 456, 3, 3, 628, 90, 85, 28, + 29, 94, 3, 3, 97, 8, 9, 100, 8, 9, + 10, 28, 29, 13, 14, 15, 16, 49, 19, 6, + 75, 53, 409, 23, 656, 80, 670, 85, 89, 670, + 91, 369, 73, 74, 75, 76, 77, 78, 79, 80, + 80, 85, 83, 84, 81, 82, 90, 73, 74, 75, + 76, 77, 78, 79, 80, 96, 97, 83, 84, 75, + 101, 102, 80, 242, 80, 80, 504, 88, 585, 217, + 87, 80, 217, 407, 49, 85, 102, 22, 53, 80, + 80, 86, 217, 217, 217, 217, 34, 98, 99, 100, + 85, 90, 426, 217, 217, 90, 3, 85, 436, 30, + 31, 8, 9, 10, 11, 12, 13, 14, 15, 16, + 17, 18, 19, 96, 97, 85, 209, 217, 25, 26, + 90, 69, 585, 85, 767, 73, 85, 34, 3, 60, + 35, 36, 37, 3, 65, 86, 779, 68, 69, 28, + 29, 89, 3, 91, 599, 599, 789, 8, 9, 10, + 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, + 21, 85, 23, 24, 25, 26, 85, 1, 48, 3, + 321, 322, 323, 80, 8, 9, 10, 11, 12, 13, + 14, 15, 16, 17, 18, 19, 20, 21, 86, 23, + 24, 25, 26, 679, 239, 240, 241, 14, 15, 292, + 293, 718, 15, 16, 588, 86, 692, 85, 301, 317, + 318, 555, 556, 392, 80, 701, 4, 88, 6, 80, + 88, 30, 31, 709, 85, 85, 326, 319, 320, 90, + 85, 331, 20, 21, 86, 23, 24, 85, 85, 27, + 757, 85, 51, 52, 85, 345, 80, 347, 348, 86, + 85, 60, 61, 86, 354, 718, 65, 85, 85, 68, + 69, 49, 85, 85, 412, 53, 86, 412, 368, 90, + 88, 406, 406, 406, 406, 3, 95, 93, 89, 67, + 94, 8, 88, 47, 86, 86, 86, 102, 405, 406, + 86, 405, 90, 405, 757, 405, 86, 397, 391, 405, + 3, 58, 89, 85, 103, 405, 406, 375, 456, 375, + 375, 456, 412, 375, 91, 375, 91, 89, 104, 31, + 1, 87, 415, 4, 5, 6, 7, 85, 104, 85, + 423, 85, 4, 92, 6, 435, 91, 3, 87, 20, + 21, 87, 23, 3, 86, 85, 27, 91, 20, 21, + 87, 23, 24, 87, 89, 27, 456, 750, 89, 40, + 41, 42, 43, 89, 87, 87, 8, 87, 49, 50, + 87, 87, 53, 87, 85, 56, 769, 49, 85, 85, + 85, 53, 63, 64, 484, 485, 486, 85, 85, 70, + 71, 72, 785, 85, 85, 67, 3, 85, 85, 103, + 85, 85, 85, 496, 497, 3, 87, 85, 587, 85, + 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, + 18, 19, 20, 21, 85, 23, 24, 25, 26, 85, + 85, 66, 91, 87, 87, 87, 87, 585, 555, 556, + 585, 555, 556, 555, 556, 555, 556, 85, 85, 555, + 556, 87, 3, 102, 85, 555, 556, 85, 35, 86, + 55, 91, 105, 87, 103, 35, 38, 88, 102, 62, + 103, 103, 565, 102, 567, 568, 569, 59, 3, 91, + 103, 89, 80, 102, 85, 585, 103, 90, 87, 102, + 39, 91, 103, 586, 91, 85, 586, 590, 3, 90, + 102, 601, 75, 8, 9, 10, 11, 12, 13, 14, + 15, 16, 17, 18, 19, 103, 103, 103, 75, 24, + 25, 26, 91, 304, 375, 16, 670, 15, 410, 314, + 587, 217, 600, 316, 600, 600, 315, 565, 600, 397, + 600, 662, 336, 431, 744, 746, 666, 589, 648, 768, + 788, 303, 73, 773, 407, 442, 599, 354, -1, 426, + 392, -1, 741, -1, -1, -1, -1, 667, -1, 662, + 718, 3, 662, 718, -1, 80, 8, 9, 10, 11, + 12, 13, 14, 15, 16, 17, 18, 19, -1, -1, + -1, -1, -1, 25, 26, -1, -1, -1, -1, -1, + -1, -1, 670, -1, 670, 670, -1, -1, 670, 757, + 670, 704, 757, -1, 704, -1, -1, -1, 718, -1, + -1, -1, -1, -1, -1, -1, -1, 727, 745, -1, + -1, 745, 745, 745, -1, 745, -1, -1, -1, 745, + -1, -1, -1, -1, -1, 745, -1, -1, 80, -1, + 750, -1, -1, -1, 3, -1, -1, 757, -1, 8, + 9, 10, 11, 12, 13, 14, 15, 16, 17, 769, + -1, -1, -1, -1, 767, -1, 25, 26, -1, 772, + -1, -1, -1, -1, -1, 785, 779, -1, -1, -1, -1, 1, -1, 3, 4, -1, 789, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, -1, 23, -1, 25, 26, 27, -1, -1, 30, 31, 32, 33, 34, -1, -1, -1, -1, -1, - 40, -1, -1, -1, 44, 45, 46, -1, -1, -1, + 40, 80, -1, -1, 44, 45, 46, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 1, -1, 3, 4, 63, 64, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 80, 23, -1, 25, 26, 27, -1, 87, 30, 31, 32, 33, 34, -1, -1, -1, -1, -1, 40, -1, - -1, -1, 44, -1, -1, -1, -1, -1, -1, -1, - -1, -1, 54, -1, -1, -1, -1, 1, -1, 3, + -1, -1, 44, 45, 46, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, 1, -1, 3, 4, 63, 64, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 80, 23, -1, 25, 26, 27, -1, 87, 30, 31, 32, 33, - 34, -1, 1, -1, 3, 4, 40, -1, 7, 8, - 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, - 19, 20, 21, -1, 23, -1, 25, 26, 27, 63, - 64, 30, 31, 32, 33, 34, -1, -1, -1, -1, - -1, 40, -1, -1, -1, -1, 80, -1, -1, -1, - -1, -1, -1, 87, -1, -1, -1, -1, -1, -1, - 1, -1, 3, 4, 63, 64, 7, 8, 9, 10, + 34, -1, -1, -1, -1, -1, 40, -1, -1, -1, + 44, -1, -1, -1, -1, -1, -1, -1, -1, -1, + 54, -1, -1, -1, -1, 1, -1, 3, 4, 63, + 64, 7, 8, 9, 10, 11, 12, 13, 14, 15, + 16, 17, 18, 19, 20, 21, 80, 23, -1, 25, + 26, 27, -1, 87, 30, 31, 32, 33, 34, -1, + 1, -1, 3, 4, 40, -1, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, - 21, 80, 23, -1, 25, 26, 27, -1, 87, 30, + 21, -1, 23, -1, 25, 26, 27, 63, 64, 30, 31, 32, 33, 34, -1, -1, -1, -1, -1, 40, - -1, -1, -1, -1, -1, -1, -1, -1, 1, -1, - -1, 4, 5, 6, 7, -1, -1, -1, -1, -1, - -1, -1, 63, 64, -1, -1, -1, 20, 21, -1, - 23, -1, -1, -1, 27, -1, -1, -1, -1, 80, - -1, -1, -1, -1, -1, -1, 87, 40, 41, 42, - 43, -1, -1, -1, -1, -1, 49, 50, -1, -1, - 53, -1, -1, 56, -1, -1, -1, -1, -1, -1, - 63, 64, -1, -1, -1, 3, -1, 70, 71, 72, - 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, - -1, -1, -1, -1, 87, 0, 1, 25, 26, 4, + -1, -1, -1, -1, 80, -1, -1, -1, -1, -1, + -1, 87, -1, -1, -1, -1, -1, -1, 1, -1, + 3, 4, 63, 64, 7, 8, 9, 10, 11, 12, + 13, 14, 15, 16, 17, 18, 19, 20, 21, 80, + 23, -1, 25, 26, 27, -1, 87, 30, 31, 32, + 33, 34, -1, -1, -1, -1, -1, 40, -1, -1, + -1, -1, -1, -1, -1, 0, 1, -1, -1, 4, 5, 6, 7, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, 20, 21, -1, 23, -1, - -1, 1, 27, -1, 4, 5, 6, 7, -1, -1, - -1, -1, -1, -1, -1, 40, 41, 42, 43, -1, - 20, 21, -1, 23, 49, 50, -1, 27, 53, -1, - -1, 56, 80, -1, -1, -1, -1, -1, 63, 64, - 40, 41, 42, 43, -1, 70, 71, -1, -1, 49, - 50, -1, -1, 53, 1, -1, 56, 4, 5, 6, - 7, -1, -1, 63, 64, -1, -1, -1, -1, -1, - 70, 71, 72, 20, 21, -1, 23, -1, -1, -1, - 27, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, 40, 41, 42, 43, -1, -1, -1, - -1, -1, 49, 50, -1, -1, 53, -1, -1, 56, + 63, 64, -1, -1, -1, 20, 21, -1, 23, -1, + -1, -1, 27, -1, -1, -1, -1, 80, -1, -1, + -1, -1, -1, -1, 87, 40, 41, 42, 43, -1, + -1, -1, -1, -1, 49, 50, -1, -1, 53, 1, + -1, 56, 4, 5, 6, 7, -1, -1, 63, 64, + -1, -1, -1, -1, -1, 70, 71, -1, 20, 21, + -1, 23, -1, -1, 1, 27, -1, 4, 5, 6, + 7, -1, -1, -1, -1, -1, -1, -1, 40, 41, + 42, 43, -1, 20, 21, -1, 23, 49, 50, -1, + 27, 53, -1, -1, 56, -1, -1, -1, -1, -1, + -1, 63, 64, 40, 41, 42, 43, -1, 70, 71, + 72, -1, 49, 50, -1, -1, 53, -1, -1, 56, -1, -1, -1, -1, -1, -1, 63, 64, -1, -1, -1, -1, -1, 70, 71 }; @@ -1723,85 +1712,85 @@ static const tao_yytype_uint16 tao_yystos[] = { 0, 107, 108, 0, 1, 4, 5, 6, 7, 20, 21, 23, 27, 40, 41, 42, 43, 49, 50, 53, - 56, 63, 64, 70, 71, 109, 112, 127, 129, 133, - 134, 146, 149, 150, 154, 156, 159, 160, 161, 165, - 169, 171, 175, 176, 199, 200, 218, 227, 247, 249, - 261, 263, 285, 286, 287, 328, 379, 380, 381, 382, - 383, 387, 409, 411, 434, 435, 436, 437, 438, 442, - 443, 444, 447, 451, 460, 474, 475, 126, 201, 128, - 155, 219, 248, 262, 288, 329, 3, 198, 235, 154, - 53, 154, 169, 171, 53, 161, 171, 172, 198, 198, - 412, 80, 195, 198, 195, 461, 476, 88, 130, 119, - 135, 147, 85, 85, 118, 90, 157, 151, 120, 162, + 56, 63, 64, 70, 71, 109, 111, 126, 128, 132, + 133, 145, 148, 149, 153, 155, 158, 159, 160, 164, + 168, 170, 174, 175, 198, 199, 217, 226, 246, 248, + 260, 262, 284, 285, 286, 327, 378, 379, 380, 381, + 382, 386, 408, 410, 433, 434, 435, 436, 437, 441, + 442, 443, 446, 450, 459, 473, 474, 125, 200, 127, + 154, 218, 247, 261, 287, 328, 3, 197, 234, 153, + 53, 153, 168, 170, 53, 160, 170, 171, 197, 197, + 411, 80, 194, 197, 194, 460, 475, 88, 129, 118, + 134, 146, 85, 85, 117, 90, 156, 150, 119, 161, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, - 18, 19, 24, 25, 26, 157, 195, 222, 223, 224, - 225, 226, 237, 238, 239, 240, 241, 242, 243, 244, - 245, 246, 247, 249, 261, 263, 287, 296, 299, 302, - 305, 306, 309, 116, 113, 250, 22, 117, 114, 115, - 121, 384, 122, 410, 123, 157, 445, 445, 124, 125, - 86, 478, 85, 195, 205, 237, 240, 241, 242, 243, - 244, 302, 306, 195, 198, 220, 222, 198, 198, 198, - 198, 157, 198, 157, 166, 198, 198, 388, 198, 196, + 18, 19, 24, 25, 26, 156, 194, 221, 222, 223, + 224, 225, 236, 237, 238, 239, 240, 241, 242, 243, + 244, 245, 246, 248, 260, 262, 286, 295, 298, 301, + 304, 305, 308, 115, 112, 249, 22, 116, 113, 114, + 120, 383, 121, 409, 122, 156, 444, 444, 123, 124, + 86, 477, 85, 194, 204, 236, 239, 240, 241, 242, + 243, 301, 305, 194, 197, 219, 221, 197, 197, 197, + 197, 156, 197, 156, 165, 197, 197, 387, 197, 195, 75, 80, 75, 3, 3, 86, 85, 4, 6, 20, - 21, 23, 24, 27, 49, 53, 67, 452, 453, 456, + 21, 23, 24, 27, 49, 53, 67, 451, 452, 455, 73, 74, 75, 76, 77, 78, 79, 83, 84, 96, - 97, 101, 102, 195, 206, 207, 208, 209, 210, 211, - 212, 213, 214, 215, 216, 471, 473, 85, 48, 173, - 86, 85, 86, 8, 11, 8, 9, 300, 170, 89, - 91, 88, 88, 85, 85, 86, 264, 85, 85, 85, - 85, 86, 85, 86, 421, 85, 446, 439, 448, 85, - 85, 479, 202, 221, 289, 330, 86, 90, 390, 413, - 198, 197, 462, 477, 131, 205, 88, 3, 136, 454, - 215, 215, 215, 207, 93, 94, 95, 81, 82, 96, - 97, 98, 99, 100, 89, 472, 158, 152, 163, 8, - 88, 47, 174, 297, 303, 307, 251, 102, 385, 422, - 174, 86, 86, 30, 31, 60, 65, 68, 69, 317, - 318, 323, 401, 403, 404, 470, 481, 483, 198, 198, - 228, 231, 235, 236, 310, 86, 86, 167, 391, 389, - 90, 418, 198, 86, 390, 110, 111, 3, 89, 91, - 103, 209, 210, 211, 212, 212, 213, 213, 214, 214, - 214, 148, 91, 192, 195, 182, 177, 301, 192, 207, - 217, 217, 217, 253, 255, 256, 265, 392, 424, 440, - 449, 319, 324, 19, 195, 402, 58, 405, 195, 195, - 486, 484, 485, 402, 487, 480, 482, 203, 311, 229, - 290, 331, 182, 195, 174, 419, 414, 463, 132, 112, - 127, 89, 137, 455, 198, 473, 193, 1, 32, 33, - 153, 183, 200, 218, 317, 328, 333, 338, 379, 380, - 44, 45, 46, 164, 178, 179, 183, 340, 223, 298, - 304, 308, 252, 254, 1, 222, 257, 8, 195, 237, - 242, 243, 244, 270, 287, 51, 52, 61, 317, 386, - 393, 401, 403, 406, 407, 408, 470, 44, 54, 183, - 423, 425, 428, 431, 182, 177, 31, 195, 224, 302, - 306, 362, 198, 3, 3, 85, 85, 85, 198, 85, - 87, 483, 92, 104, 312, 314, 91, 3, 292, 295, - 254, 168, 195, 174, 401, 403, 465, 467, 87, 3, - 86, 456, 91, 191, 87, 187, 184, 189, 188, 190, - 34, 339, 362, 185, 186, 341, 181, 180, 87, 85, - 89, 89, 89, 87, 255, 260, 258, 266, 195, 195, - 195, 399, 87, 394, 395, 396, 397, 398, 400, 198, - 198, 87, 426, 427, 441, 450, 320, 325, 204, 315, - 313, 230, 291, 293, 332, 87, 415, 468, 469, 464, - 466, 138, 194, 85, 85, 85, 85, 85, 85, 334, - 85, 85, 3, 257, 257, 85, 228, 103, 198, 198, - 198, 85, 85, 85, 85, 85, 85, 85, 429, 432, - 85, 85, 87, 87, 362, 232, 235, 206, 217, 314, - 231, 87, 91, 87, 66, 85, 85, 87, 467, 72, - 112, 140, 142, 143, 195, 3, 342, 259, 267, 102, - 344, 344, 321, 326, 233, 316, 294, 416, 195, 139, - 141, 85, 335, 344, 85, 86, 345, 346, 430, 433, - 232, 55, 367, 91, 105, 295, 195, 144, 87, 142, - 102, 353, 343, 268, 103, 35, 347, 350, 38, 364, - 364, 322, 368, 327, 234, 417, 88, 354, 355, 336, - 364, 1, 28, 29, 271, 273, 277, 279, 351, 103, - 348, 365, 364, 102, 62, 370, 235, 59, 420, 3, - 457, 459, 103, 35, 36, 37, 356, 359, 363, 364, - 276, 281, 280, 269, 272, 274, 278, 362, 91, 102, - 369, 371, 195, 89, 458, 103, 357, 360, 337, 85, - 207, 90, 87, 273, 222, 283, 279, 352, 349, 366, - 192, 102, 145, 91, 91, 362, 39, 373, 282, 284, - 275, 231, 350, 192, 103, 372, 198, 459, 358, 361, - 374, 90, 231, 85, 103, 192, 359, 231, 102, 103, - 375, 75, 376, 377, 103, 91, 378, 75 + 97, 101, 102, 194, 205, 206, 207, 208, 209, 210, + 211, 212, 213, 214, 215, 470, 472, 85, 48, 172, + 86, 85, 86, 8, 11, 8, 9, 299, 169, 89, + 91, 88, 88, 85, 85, 86, 263, 85, 85, 85, + 85, 86, 85, 86, 420, 85, 445, 438, 447, 85, + 85, 478, 201, 220, 288, 329, 86, 90, 389, 412, + 197, 196, 461, 476, 130, 204, 88, 3, 135, 453, + 214, 214, 214, 206, 93, 94, 95, 81, 82, 96, + 97, 98, 99, 100, 89, 471, 157, 151, 162, 8, + 88, 47, 173, 296, 302, 306, 250, 102, 384, 421, + 173, 86, 86, 30, 31, 60, 65, 68, 69, 316, + 317, 322, 400, 402, 403, 469, 480, 482, 197, 197, + 227, 230, 234, 235, 309, 86, 86, 166, 390, 388, + 90, 417, 197, 86, 389, 108, 110, 3, 89, 91, + 103, 208, 209, 210, 211, 211, 212, 212, 213, 213, + 213, 147, 91, 191, 194, 181, 176, 300, 191, 206, + 216, 216, 216, 252, 254, 255, 264, 391, 423, 439, + 448, 318, 323, 19, 194, 401, 58, 404, 194, 194, + 485, 483, 484, 401, 486, 479, 481, 202, 310, 228, + 289, 330, 181, 194, 173, 418, 413, 462, 109, 131, + 89, 136, 454, 197, 472, 192, 1, 32, 33, 152, + 182, 199, 217, 316, 327, 332, 337, 378, 379, 44, + 45, 46, 163, 177, 178, 182, 339, 222, 297, 303, + 307, 251, 253, 1, 221, 256, 8, 194, 236, 241, + 242, 243, 269, 286, 51, 52, 61, 316, 385, 392, + 400, 402, 405, 406, 407, 469, 44, 54, 182, 422, + 424, 427, 430, 181, 176, 31, 194, 223, 301, 305, + 361, 197, 3, 3, 85, 85, 85, 197, 85, 87, + 482, 92, 104, 311, 313, 91, 3, 291, 294, 253, + 167, 194, 173, 400, 402, 464, 466, 87, 3, 86, + 455, 91, 190, 87, 186, 183, 188, 187, 189, 34, + 338, 361, 184, 185, 340, 180, 179, 87, 85, 89, + 89, 89, 87, 254, 259, 257, 265, 194, 194, 194, + 398, 87, 393, 394, 395, 396, 397, 399, 197, 197, + 87, 425, 426, 440, 449, 319, 324, 203, 314, 312, + 229, 290, 292, 331, 87, 414, 467, 468, 463, 465, + 137, 193, 85, 85, 85, 85, 85, 85, 333, 85, + 85, 3, 256, 256, 85, 227, 103, 197, 197, 197, + 85, 85, 85, 85, 85, 85, 85, 428, 431, 85, + 85, 87, 87, 361, 231, 234, 205, 216, 313, 230, + 87, 91, 87, 66, 85, 85, 87, 466, 72, 111, + 126, 139, 141, 142, 194, 3, 341, 258, 266, 102, + 343, 343, 320, 325, 232, 315, 293, 415, 194, 138, + 140, 85, 334, 343, 85, 86, 344, 345, 429, 432, + 231, 55, 366, 91, 105, 294, 194, 143, 87, 141, + 102, 352, 342, 267, 103, 35, 346, 349, 38, 363, + 363, 321, 367, 326, 233, 416, 88, 353, 354, 335, + 363, 1, 28, 29, 270, 272, 276, 278, 350, 103, + 347, 364, 363, 102, 62, 369, 234, 59, 419, 3, + 456, 458, 103, 35, 36, 37, 355, 358, 362, 363, + 275, 280, 279, 268, 271, 273, 277, 361, 91, 102, + 368, 370, 194, 89, 457, 103, 356, 359, 336, 85, + 206, 90, 87, 272, 221, 282, 278, 351, 348, 365, + 191, 102, 144, 91, 91, 361, 39, 372, 281, 283, + 274, 230, 349, 191, 103, 371, 197, 458, 357, 360, + 373, 90, 230, 85, 103, 191, 358, 230, 102, 103, + 374, 75, 375, 376, 103, 91, 377, 75 }; #define tao_yyerrok (tao_yyerrstatus = 0) @@ -2622,7 +2611,7 @@ tao_yyreduce: } break; - case 11: + case 9: { // fixed_definition : type_dcl @@ -2630,7 +2619,7 @@ tao_yyreduce: } break; - case 12: + case 10: { // ';' @@ -2638,7 +2627,7 @@ tao_yyreduce: } break; - case 13: + case 11: { // | typeid_dcl @@ -2646,7 +2635,7 @@ tao_yyreduce: } break; - case 14: + case 12: { // ';' @@ -2654,7 +2643,7 @@ tao_yyreduce: } break; - case 15: + case 13: { // | typeprefix_dcl @@ -2662,7 +2651,7 @@ tao_yyreduce: } break; - case 16: + case 14: { // ';' @@ -2670,7 +2659,7 @@ tao_yyreduce: } break; - case 17: + case 15: { // | const_dcl @@ -2678,7 +2667,7 @@ tao_yyreduce: } break; - case 18: + case 16: { // ';' @@ -2686,7 +2675,7 @@ tao_yyreduce: } break; - case 19: + case 17: { // | exception @@ -2694,7 +2683,7 @@ tao_yyreduce: } break; - case 20: + case 18: { // ';' @@ -2702,7 +2691,7 @@ tao_yyreduce: } break; - case 21: + case 19: { // | interface_def @@ -2710,7 +2699,7 @@ tao_yyreduce: } break; - case 22: + case 20: { // ';' @@ -2718,15 +2707,15 @@ tao_yyreduce: } break; - case 23: + case 21: { -// | fixed_module +// | module idl_global->set_parse_state (IDL_GlobalData::PS_ModuleDeclSeen); } break; - case 24: + case 22: { // ';' @@ -2734,7 +2723,7 @@ tao_yyreduce: } break; - case 25: + case 23: { // | value_def @@ -2742,7 +2731,7 @@ tao_yyreduce: } break; - case 26: + case 24: { // ';' @@ -2750,7 +2739,7 @@ tao_yyreduce: } break; - case 27: + case 25: { // | component @@ -2758,7 +2747,7 @@ tao_yyreduce: } break; - case 28: + case 26: { // ';' @@ -2766,7 +2755,7 @@ tao_yyreduce: } break; - case 29: + case 27: { // | home_decl @@ -2774,7 +2763,7 @@ tao_yyreduce: } break; - case 30: + case 28: { // ';' @@ -2782,7 +2771,7 @@ tao_yyreduce: } break; - case 31: + case 29: { // | event @@ -2790,7 +2779,7 @@ tao_yyreduce: } break; - case 32: + case 30: { // ';' @@ -2798,7 +2787,7 @@ tao_yyreduce: } break; - case 33: + case 31: { // | porttype_decl @@ -2806,7 +2795,7 @@ tao_yyreduce: } break; - case 34: + case 32: { // ';' @@ -2814,7 +2803,7 @@ tao_yyreduce: } break; - case 35: + case 33: { // | connector_decl @@ -2822,7 +2811,7 @@ tao_yyreduce: } break; - case 36: + case 34: { // ';' @@ -2830,7 +2819,7 @@ tao_yyreduce: } break; - case 37: + case 35: { // | error @@ -2838,7 +2827,7 @@ tao_yyreduce: } break; - case 38: + case 36: { // ';' @@ -2847,7 +2836,7 @@ tao_yyreduce: } break; - case 39: + case 37: { // module_header : IDL_MODULE @@ -2855,17 +2844,17 @@ tao_yyreduce: } break; - case 40: + case 38: { (tao_yyval.idlist) = (tao_yyvsp[(3) - (3)].idlist); } break; - case 41: + case 39: { -// fixed_module : module_header +// module : module_header idl_global->set_parse_state (IDL_GlobalData::PS_ModuleIDSeen); // The module_header rule is common to template module, fixed @@ -2900,7 +2889,7 @@ tao_yyreduce: } break; - case 42: + case 40: { // '{' @@ -2908,15 +2897,15 @@ tao_yyreduce: } break; - case 43: + case 41: { -// at_least_one_fixed_definition +// at_least_one_definition idl_global->set_parse_state (IDL_GlobalData::PS_ModuleBodySeen); } break; - case 44: + case 42: { // '}' @@ -2928,14 +2917,14 @@ tao_yyreduce: } break; - case 45: + case 43: { idl_global->set_parse_state (IDL_GlobalData::PS_TmplModuleIDSeen); } break; - case 46: + case 44: { // template_module : template_module_header @@ -2953,7 +2942,7 @@ tao_yyreduce: } break; - case 47: + case 45: { if (FE_Utils::duplicate_param_id ((tao_yyvsp[(3) - (3)].plval))) @@ -2966,7 +2955,7 @@ tao_yyreduce: } break; - case 48: + case 46: { // '>' @@ -2991,21 +2980,21 @@ tao_yyreduce: } break; - case 49: + case 47: { idl_global->set_parse_state (IDL_GlobalData::PS_TmplModuleSqSeen); } break; - case 50: + case 48: { idl_global->set_parse_state (IDL_GlobalData::PS_TmplModuleBodySeen); } break; - case 51: + case 49: { idl_global->set_parse_state (IDL_GlobalData::PS_TmplModuleQsSeen); @@ -3021,7 +3010,7 @@ tao_yyreduce: } break; - case 57: + case 55: { // template_module_ref : IDL_ALIAS scoped_name @@ -3030,7 +3019,7 @@ tao_yyreduce: } break; - case 58: + case 56: { // '<' at_least_one_formal_parameter_name '>' @@ -3039,7 +3028,7 @@ tao_yyreduce: } break; - case 59: + case 57: { // id @@ -3091,7 +3080,7 @@ tao_yyreduce: } break; - case 60: + case 58: { // template_module_inst : template_module_header @@ -3100,7 +3089,7 @@ tao_yyreduce: } break; - case 61: + case 59: { // at_least_one_actual_parameter '>' @@ -3109,7 +3098,7 @@ tao_yyreduce: } break; - case 62: + case 60: { // id @@ -3162,7 +3151,7 @@ tao_yyreduce: } break; - case 65: + case 63: { // interface : interface_header @@ -3204,7 +3193,7 @@ tao_yyreduce: } break; - case 66: + case 64: { // '{' @@ -3212,7 +3201,7 @@ tao_yyreduce: } break; - case 67: + case 65: { // exports @@ -3220,7 +3209,7 @@ tao_yyreduce: } break; - case 68: + case 66: { // '}' @@ -3233,7 +3222,7 @@ tao_yyreduce: } break; - case 69: + case 67: { // interface_decl : IDL_INTERFACE @@ -3241,7 +3230,7 @@ tao_yyreduce: } break; - case 70: + case 68: { // id @@ -3250,7 +3239,7 @@ tao_yyreduce: } break; - case 71: + case 69: { // interface_header : interface_decl inheritance_spec @@ -3290,7 +3279,7 @@ tao_yyreduce: } break; - case 72: + case 70: { // | IDL_LOCAL interface_decl inheritance_spec @@ -3323,7 +3312,7 @@ tao_yyreduce: } break; - case 73: + case 71: { // | IDL_ABSTRACT interface_decl inheritance_spec @@ -3356,7 +3345,7 @@ tao_yyreduce: } break; - case 74: + case 72: { // inheritance_spec : ':' opt_truncatable @@ -3364,7 +3353,7 @@ tao_yyreduce: } break; - case 75: + case 73: { // at_least_one_scoped_name @@ -3373,7 +3362,7 @@ tao_yyreduce: } break; - case 76: + case 74: { /* | EMPTY */ @@ -3381,7 +3370,7 @@ tao_yyreduce: } break; - case 81: + case 79: { // valuetype : IDL_CUSTOM value_concrete_decl @@ -3395,7 +3384,7 @@ tao_yyreduce: } break; - case 83: + case 81: { // value_concrete_decl : value_header @@ -3442,7 +3431,7 @@ tao_yyreduce: } break; - case 84: + case 82: { // '{' @@ -3450,7 +3439,7 @@ tao_yyreduce: } break; - case 85: + case 83: { // value_elements @@ -3458,7 +3447,7 @@ tao_yyreduce: } break; - case 86: + case 84: { // '}' @@ -3481,7 +3470,7 @@ tao_yyreduce: } break; - case 87: + case 85: { // value_abs_decl : IDL_ABSTRACT value_header @@ -3523,7 +3512,7 @@ tao_yyreduce: } break; - case 88: + case 86: { // '{' @@ -3531,7 +3520,7 @@ tao_yyreduce: } break; - case 89: + case 87: { // exports @@ -3539,7 +3528,7 @@ tao_yyreduce: } break; - case 90: + case 88: { // '}' @@ -3552,7 +3541,7 @@ tao_yyreduce: } break; - case 91: + case 89: { // value_header : value_decl inheritance_spec @@ -3560,7 +3549,7 @@ tao_yyreduce: } break; - case 92: + case 90: { // supports_spec @@ -3593,7 +3582,7 @@ tao_yyreduce: } break; - case 93: + case 91: { // value_decl : IDL_VALUETYPE @@ -3601,7 +3590,7 @@ tao_yyreduce: } break; - case 94: + case 92: { // id @@ -3610,7 +3599,7 @@ tao_yyreduce: } break; - case 95: + case 93: { // opt_truncatable : IDL_TRUNCATABLE @@ -3618,7 +3607,7 @@ tao_yyreduce: } break; - case 96: + case 94: { /* | EMPTY */ @@ -3626,7 +3615,7 @@ tao_yyreduce: } break; - case 97: + case 95: { // supports_spec : IDL_SUPPORTS at_least_one_scoped_name @@ -3634,7 +3623,7 @@ tao_yyreduce: } break; - case 98: + case 96: { /* | EMPTY */ @@ -3642,7 +3631,7 @@ tao_yyreduce: } break; - case 99: + case 97: { // value_forward_decl : IDL_ABSTRACT value_decl @@ -3669,7 +3658,7 @@ tao_yyreduce: } break; - case 100: + case 98: { // | value_decl @@ -3696,7 +3685,7 @@ tao_yyreduce: } break; - case 101: + case 99: { // value_box_decl : value_decl type_spec @@ -3761,25 +3750,39 @@ tao_yyreduce: } break; - case 107: + case 105: { // state_member : IDL_PUBLIC + } + break; + + case 106: + + { +// member_i /* is $0 to member_i */ (tao_yyval.vival) = AST_Field::vis_PUBLIC; } break; - case 109: + case 107: { -// IDL_PRIVATE +// IDL_PRIVATE + } + break; + + case 108: + + { +// member_i /* is $0 to member_i */ (tao_yyval.vival) = AST_Field::vis_PRIVATE; } break; - case 113: + case 111: { // export : type_dcl @@ -3787,7 +3790,7 @@ tao_yyreduce: } break; - case 114: + case 112: { // ';' @@ -3795,7 +3798,7 @@ tao_yyreduce: } break; - case 115: + case 113: { // | typeid_dcl @@ -3803,7 +3806,7 @@ tao_yyreduce: } break; - case 116: + case 114: { // ';' @@ -3811,7 +3814,7 @@ tao_yyreduce: } break; - case 117: + case 115: { // | typeprefix_dcl @@ -3819,7 +3822,7 @@ tao_yyreduce: } break; - case 118: + case 116: { // ';' @@ -3827,7 +3830,7 @@ tao_yyreduce: } break; - case 119: + case 117: { // | const_dcl @@ -3835,7 +3838,7 @@ tao_yyreduce: } break; - case 120: + case 118: { // ';' @@ -3843,7 +3846,7 @@ tao_yyreduce: } break; - case 121: + case 119: { // | exception @@ -3851,7 +3854,7 @@ tao_yyreduce: } break; - case 122: + case 120: { // ';' @@ -3859,7 +3862,7 @@ tao_yyreduce: } break; - case 123: + case 121: { // | attribute @@ -3867,7 +3870,7 @@ tao_yyreduce: } break; - case 124: + case 122: { // ';' @@ -3875,7 +3878,7 @@ tao_yyreduce: } break; - case 125: + case 123: { // | operation @@ -3883,7 +3886,7 @@ tao_yyreduce: } break; - case 126: + case 124: { // ';' @@ -3891,7 +3894,7 @@ tao_yyreduce: } break; - case 127: + case 125: { // | error @@ -3899,7 +3902,7 @@ tao_yyreduce: } break; - case 128: + case 126: { // ';' @@ -3908,7 +3911,7 @@ tao_yyreduce: } break; - case 129: + case 127: { // at_least_one_scoped_name : scoped_name scoped_names @@ -3919,7 +3922,7 @@ tao_yyreduce: } break; - case 130: + case 128: { // scoped_names : scoped_names ',' @@ -3927,7 +3930,7 @@ tao_yyreduce: } break; - case 131: + case 129: { // scoped_name @@ -3951,7 +3954,7 @@ tao_yyreduce: } break; - case 132: + case 130: { /* | EMPTY */ @@ -3959,7 +3962,7 @@ tao_yyreduce: } break; - case 133: + case 131: { // scoped_name : id @@ -3972,7 +3975,7 @@ tao_yyreduce: } break; - case 134: + case 132: { // | IDL_SCOPE_DELIMITOR @@ -3980,7 +3983,7 @@ tao_yyreduce: } break; - case 135: + case 133: { // id @@ -4004,7 +4007,7 @@ tao_yyreduce: } break; - case 136: + case 134: { // | scoped_name IDL_SCOPE_DELIMITOR @@ -4018,7 +4021,7 @@ tao_yyreduce: } break; - case 137: + case 135: { // id @@ -4034,7 +4037,7 @@ tao_yyreduce: } break; - case 138: + case 136: { // id: IDENTIFIER @@ -4046,7 +4049,7 @@ tao_yyreduce: } break; - case 139: + case 137: { // interface_forward : interface_decl @@ -4094,7 +4097,7 @@ tao_yyreduce: } break; - case 140: + case 138: { // | IDL_LOCAL interface_decl @@ -4124,7 +4127,7 @@ tao_yyreduce: } break; - case 141: + case 139: { // | IDL_ABSTRACT interface_decl @@ -4154,7 +4157,7 @@ tao_yyreduce: } break; - case 142: + case 140: { // const_dcl : IDL_CONST @@ -4162,7 +4165,7 @@ tao_yyreduce: } break; - case 143: + case 141: { // const_type @@ -4170,7 +4173,7 @@ tao_yyreduce: } break; - case 144: + case 142: { // id @@ -4178,7 +4181,7 @@ tao_yyreduce: } break; - case 145: + case 143: { // '=' @@ -4186,7 +4189,7 @@ tao_yyreduce: } break; - case 146: + case 144: { // expression @@ -4209,7 +4212,7 @@ tao_yyreduce: (tao_yyvsp[(9) - (9)].exval)->check_and_coerce ((tao_yyvsp[(3) - (9)].etval), tao_enum_constant_decl); tao_enum_constant_decl = 0; - + // If the expression is a template parameter place // holder, 'result' will be 0, but it's ok. if (result == 0 && param_holder == 0) @@ -4224,7 +4227,7 @@ tao_yyreduce: { AST_Expression::ExprType et = (tao_yyvsp[(3) - (9)].etval); - + if (param_holder != 0 && et != param_holder->info ()->const_type_) { @@ -4232,13 +4235,13 @@ tao_yyreduce: param_holder->info ()->name_.c_str ()); } else - { + { c = idl_global->gen ()->create_constant ( (tao_yyvsp[(3) - (9)].etval), (tao_yyvsp[(9) - (9)].exval), &n); - + (void) s->fe_add_constant (c); } } @@ -4246,14 +4249,14 @@ tao_yyreduce: (tao_yyvsp[(5) - (9)].idval)->destroy (); delete (tao_yyvsp[(5) - (9)].idval); (tao_yyvsp[(5) - (9)].idval) = 0; - + delete result; result = 0; } } break; - case 153: + case 151: { // const_type @@ -4268,7 +4271,7 @@ tao_yyreduce: } break; - case 154: + case 152: { // | wstring_type_spec @@ -4276,7 +4279,7 @@ tao_yyreduce: } break; - case 155: + case 153: { // | scoped_name @@ -4346,7 +4349,7 @@ tao_yyreduce: } break; - case 159: + case 157: { // or_expr : xor_expr @@ -4360,7 +4363,7 @@ tao_yyreduce: } break; - case 161: + case 159: { // xor_expr : and_expr @@ -4374,7 +4377,7 @@ tao_yyreduce: } break; - case 163: + case 161: { // and_expr : shift_expr | and_expr '&' shift_expr @@ -4387,7 +4390,7 @@ tao_yyreduce: } break; - case 165: + case 163: { // shift_expr : add_expr | shift_expr IDL_LEFT_SHIFT add_expr @@ -4400,7 +4403,7 @@ tao_yyreduce: } break; - case 166: + case 164: { // | shift_expr IDL_RIGHT_SHIFT add_expr @@ -4413,7 +4416,7 @@ tao_yyreduce: } break; - case 168: + case 166: { // add_expr : mult_expr | add_expr '+' mult_expr @@ -4426,7 +4429,7 @@ tao_yyreduce: } break; - case 169: + case 167: { // | add_expr '-' mult_expr @@ -4439,7 +4442,7 @@ tao_yyreduce: } break; - case 171: + case 169: { // mult_expr : unary_expr | mult_expr '*' unary_expr @@ -4452,7 +4455,7 @@ tao_yyreduce: } break; - case 172: + case 170: { // | mult_expr '/' unary_expr @@ -4465,7 +4468,7 @@ tao_yyreduce: } break; - case 173: + case 171: { // | mult_expr '%' unary_expr @@ -4478,7 +4481,7 @@ tao_yyreduce: } break; - case 175: + case 173: { // unary_expr : primary_expr | '+' primary_expr @@ -4491,7 +4494,7 @@ tao_yyreduce: } break; - case 176: + case 174: { // | '-' primary_expr @@ -4504,7 +4507,7 @@ tao_yyreduce: } break; - case 177: + case 175: { // | '~' primary_expr @@ -4517,7 +4520,7 @@ tao_yyreduce: } break; - case 178: + case 176: { // primary_expr : scoped_name @@ -4571,7 +4574,7 @@ tao_yyreduce: } break; - case 180: + case 178: { // | literal @@ -4580,7 +4583,7 @@ tao_yyreduce: } break; - case 181: + case 179: { // literal : IDL_INTEGER_LITERAL @@ -4588,7 +4591,7 @@ tao_yyreduce: } break; - case 182: + case 180: { // | IDL_UINTEGER_LITERAL @@ -4598,7 +4601,7 @@ tao_yyreduce: } break; - case 183: + case 181: { // | IDL_STRING_LITERAL @@ -4609,7 +4612,7 @@ tao_yyreduce: } break; - case 184: + case 182: { // | IDL_WSTRING_LITERAL @@ -4617,7 +4620,7 @@ tao_yyreduce: } break; - case 185: + case 183: { // | IDL_CHARACTER_LITERAL @@ -4625,7 +4628,7 @@ tao_yyreduce: } break; - case 186: + case 184: { // | IDL_WCHAR_LITERAL @@ -4634,7 +4637,7 @@ tao_yyreduce: } break; - case 187: + case 185: { // | IDL_FLOATING_PT_LITERAL @@ -4642,7 +4645,7 @@ tao_yyreduce: } break; - case 188: + case 186: { // | IDL_TRUETOK @@ -4650,7 +4653,7 @@ tao_yyreduce: } break; - case 189: + case 187: { // | IDL_FALSETOK @@ -4658,7 +4661,7 @@ tao_yyreduce: } break; - case 190: + case 188: { // positive_int_expr : const_expr @@ -4729,7 +4732,7 @@ tao_yyreduce: } break; - case 191: + case 189: { // type_dcl : IDL_TYPEDEF @@ -4737,7 +4740,7 @@ tao_yyreduce: } break; - case 192: + case 190: { // type_declarator @@ -4745,7 +4748,7 @@ tao_yyreduce: } break; - case 193: + case 191: { // | struct_type @@ -4753,7 +4756,7 @@ tao_yyreduce: } break; - case 194: + case 192: { // | union_type @@ -4761,7 +4764,7 @@ tao_yyreduce: } break; - case 195: + case 193: { // | enum_type @@ -4769,7 +4772,7 @@ tao_yyreduce: } break; - case 196: + case 194: { // | IDL_NATIVE simple_declarator @@ -4799,7 +4802,7 @@ tao_yyreduce: } break; - case 197: + case 195: { // | constructed_forward_type_spec @@ -4807,7 +4810,7 @@ tao_yyreduce: } break; - case 198: + case 196: { // type_declarator : type_spec @@ -4815,7 +4818,7 @@ tao_yyreduce: } break; - case 199: + case 197: { // at_least_one_declarator @@ -4881,7 +4884,7 @@ tao_yyreduce: } break; - case 202: + case 200: { // simple_type_spec : base_type_spec @@ -4892,7 +4895,7 @@ tao_yyreduce: } break; - case 204: + case 202: { // | template_type_spec @@ -4920,7 +4923,7 @@ tao_yyreduce: } break; - case 221: + case 219: { // at_least_one_declarator : declarator declarators @@ -4931,7 +4934,7 @@ tao_yyreduce: } break; - case 222: + case 220: { // declarators : declarators ',' @@ -4939,7 +4942,7 @@ tao_yyreduce: } break; - case 223: + case 221: { // declarator @@ -4963,7 +4966,7 @@ tao_yyreduce: } break; - case 224: + case 222: { /* | EMPTY */ @@ -4971,7 +4974,7 @@ tao_yyreduce: } break; - case 227: + case 225: { // at_least_one_simple_declarator : simple_declarator simple_declarators @@ -4982,7 +4985,7 @@ tao_yyreduce: } break; - case 228: + case 226: { // simple_declarators : simple_declarators ',' @@ -4990,7 +4993,7 @@ tao_yyreduce: } break; - case 229: + case 227: { // simple_declarator @@ -5014,7 +5017,7 @@ tao_yyreduce: } break; - case 230: + case 228: { /* | EMPTY */ @@ -5022,7 +5025,7 @@ tao_yyreduce: } break; - case 231: + case 229: { // simple_declarator : id @@ -5039,7 +5042,7 @@ tao_yyreduce: } break; - case 232: + case 230: { // complex_declarator : array_declarator @@ -5058,7 +5061,7 @@ tao_yyreduce: } break; - case 235: + case 233: { // signed_int : IDL_LONG @@ -5066,7 +5069,7 @@ tao_yyreduce: } break; - case 236: + case 234: { // | IDL_LONG IDL_LONG @@ -5074,7 +5077,7 @@ tao_yyreduce: } break; - case 237: + case 235: { // | IDL_SHORT @@ -5082,7 +5085,7 @@ tao_yyreduce: } break; - case 238: + case 236: { // unsigned_int : IDL_UNSIGNED IDL_LONG @@ -5090,7 +5093,7 @@ tao_yyreduce: } break; - case 239: + case 237: { // | IDL_UNSIGNED IDL_LONG IDL_LONG @@ -5098,7 +5101,7 @@ tao_yyreduce: } break; - case 240: + case 238: { // | IDL_UNSIGNED IDL_SHORT @@ -5106,7 +5109,7 @@ tao_yyreduce: } break; - case 241: + case 239: { // floating_pt_type : IDL_DOUBLE @@ -5114,7 +5117,7 @@ tao_yyreduce: } break; - case 242: + case 240: { // | IDL_FLOAT @@ -5122,7 +5125,7 @@ tao_yyreduce: } break; - case 243: + case 241: { // | IDL_LONG IDL_DOUBLE @@ -5130,7 +5133,7 @@ tao_yyreduce: } break; - case 244: + case 242: { // fixed_type : IDL_FIXED @@ -5144,7 +5147,7 @@ tao_yyreduce: } break; - case 245: + case 243: { // char_type : IDL_CHAR @@ -5152,7 +5155,7 @@ tao_yyreduce: } break; - case 246: + case 244: { // | IDL_WCHAR @@ -5160,7 +5163,7 @@ tao_yyreduce: } break; - case 247: + case 245: { // octet_type : IDL_OCTET @@ -5168,7 +5171,7 @@ tao_yyreduce: } break; - case 248: + case 246: { // boolean_type : IDL_BOOLEAN @@ -5176,7 +5179,7 @@ tao_yyreduce: } break; - case 249: + case 247: { // any_type : IDL_ANY @@ -5184,7 +5187,7 @@ tao_yyreduce: } break; - case 250: + case 248: { // object_type : IDL_OBJECT @@ -5192,7 +5195,7 @@ tao_yyreduce: } break; - case 251: + case 249: { // struct_decl : IDL_STRUCT @@ -5200,7 +5203,7 @@ tao_yyreduce: } break; - case 252: + case 250: { // id @@ -5209,7 +5212,7 @@ tao_yyreduce: } break; - case 253: + case 251: { // struct_type : struct_header @@ -5246,7 +5249,7 @@ tao_yyreduce: } break; - case 254: + case 252: { // '{' @@ -5254,7 +5257,7 @@ tao_yyreduce: } break; - case 255: + case 253: { // at_least_one_member @@ -5262,7 +5265,7 @@ tao_yyreduce: } break; - case 256: + case 254: { // '}' @@ -5278,7 +5281,7 @@ tao_yyreduce: } break; - case 260: + case 258: { // member : @@ -5287,7 +5290,7 @@ tao_yyreduce: } break; - case 262: + case 260: { // member_i : type_spec @@ -5295,7 +5298,7 @@ tao_yyreduce: } break; - case 263: + case 261: { // at_least_one_declarator @@ -5303,7 +5306,7 @@ tao_yyreduce: } break; - case 264: + case 262: { // ';' @@ -5364,7 +5367,7 @@ tao_yyreduce: } break; - case 265: + case 263: { // | error @@ -5372,7 +5375,7 @@ tao_yyreduce: } break; - case 266: + case 264: { // ';' @@ -5381,7 +5384,7 @@ tao_yyreduce: } break; - case 267: + case 265: { // union_decl : IDL_UNION @@ -5389,7 +5392,7 @@ tao_yyreduce: } break; - case 268: + case 266: { // id @@ -5398,7 +5401,7 @@ tao_yyreduce: } break; - case 269: + case 267: { // union_type : union_decl IDL_SWITCH @@ -5406,7 +5409,7 @@ tao_yyreduce: } break; - case 270: + case 268: { // '(' @@ -5414,7 +5417,7 @@ tao_yyreduce: } break; - case 271: + case 269: { // switch_type_spec @@ -5422,7 +5425,7 @@ tao_yyreduce: } break; - case 272: + case 270: { // ')' @@ -5472,7 +5475,7 @@ tao_yyreduce: } break; - case 273: + case 271: { // '{' @@ -5480,7 +5483,7 @@ tao_yyreduce: } break; - case 274: + case 272: { // at_least_one_case_branch @@ -5488,7 +5491,7 @@ tao_yyreduce: } break; - case 275: + case 273: { // '}' @@ -5508,7 +5511,7 @@ tao_yyreduce: } break; - case 276: + case 274: { // switch_type_spec : integer_type @@ -5519,7 +5522,7 @@ tao_yyreduce: } break; - case 277: + case 275: { // | char_type @@ -5536,7 +5539,7 @@ tao_yyreduce: } break; - case 278: + case 276: { // | octet_type @@ -5549,7 +5552,7 @@ tao_yyreduce: } break; - case 279: + case 277: { // | boolean_type @@ -5560,7 +5563,7 @@ tao_yyreduce: } break; - case 281: + case 279: { // | enum_type @@ -5669,7 +5672,7 @@ tao_yyreduce: } break; - case 285: + case 283: { // case_branch : at_least_one_case_label @@ -5677,7 +5680,7 @@ tao_yyreduce: } break; - case 286: + case 284: { // element_spec @@ -5685,7 +5688,7 @@ tao_yyreduce: } break; - case 287: + case 285: { // ';' @@ -5719,7 +5722,7 @@ tao_yyreduce: } break; - case 288: + case 286: { // | error @@ -5727,7 +5730,7 @@ tao_yyreduce: } break; - case 289: + case 287: { // ';' @@ -5736,7 +5739,7 @@ tao_yyreduce: } break; - case 290: + case 288: { // at_least_one_case_label : case_label case_labels @@ -5747,7 +5750,7 @@ tao_yyreduce: } break; - case 291: + case 289: { // case_labels : case_labels case_label @@ -5769,7 +5772,7 @@ tao_yyreduce: } break; - case 292: + case 290: { /* | EMPTY */ @@ -5777,7 +5780,7 @@ tao_yyreduce: } break; - case 293: + case 291: { // case_label : IDL_DEFAULT @@ -5785,7 +5788,7 @@ tao_yyreduce: } break; - case 294: + case 292: { // ':' @@ -5798,7 +5801,7 @@ tao_yyreduce: } break; - case 295: + case 293: { // | IDL_CASE @@ -5806,14 +5809,14 @@ tao_yyreduce: } break; - case 296: + case 294: { idl_global->set_parse_state (IDL_GlobalData::PS_LabelExprSeen); } break; - case 297: + case 295: { // const_expr @@ -5826,7 +5829,7 @@ tao_yyreduce: } break; - case 298: + case 296: { // element_spec : type_spec @@ -5834,7 +5837,7 @@ tao_yyreduce: } break; - case 299: + case 297: { // declarator @@ -5882,7 +5885,7 @@ tao_yyreduce: } break; - case 300: + case 298: { // struct_forward_type : struct_decl @@ -5906,7 +5909,7 @@ tao_yyreduce: } break; - case 301: + case 299: { // union_forward_type : union_decl @@ -5930,7 +5933,7 @@ tao_yyreduce: } break; - case 302: + case 300: { // enum_type : IDL_ENUM @@ -5938,7 +5941,7 @@ tao_yyreduce: } break; - case 303: + case 301: { // id @@ -5974,7 +5977,7 @@ tao_yyreduce: } break; - case 304: + case 302: { // '{' @@ -5982,7 +5985,7 @@ tao_yyreduce: } break; - case 305: + case 303: { // at_least_one_enumerator @@ -5990,7 +5993,7 @@ tao_yyreduce: } break; - case 306: + case 304: { // '}' @@ -6013,7 +6016,7 @@ tao_yyreduce: } break; - case 308: + case 306: { // enumerators : enumerators ',' @@ -6021,7 +6024,7 @@ tao_yyreduce: } break; - case 311: + case 309: { // enumerator : IDENTIFIER @@ -6056,7 +6059,7 @@ tao_yyreduce: } break; - case 312: + case 310: { // sequence_type_spec : seq_head ',' @@ -6064,7 +6067,7 @@ tao_yyreduce: } break; - case 313: + case 311: { // positive_int_expr @@ -6072,7 +6075,7 @@ tao_yyreduce: } break; - case 314: + case 312: { // '>' @@ -6098,7 +6101,7 @@ tao_yyreduce: { param_holder = (tao_yyvsp[(4) - (6)].exval)->param_holder (); - + ev = (tao_yyvsp[(4) - (6)].exval)->coerce (AST_Expression::EV_ulong); } @@ -6126,25 +6129,6 @@ tao_yyreduce: } else { - if (param_holder != 0) - { - AST_Expression::ExprType et = - param_holder->info ()->const_type_; - - // If the bound expression represents a - // template parameter, it must be a const - // and of type unsigned long. - if (et != AST_Expression::EV_ulong) - { - idl_global->err ()->mismatched_template_param ( - param_holder->info ()->name_.c_str ()); - - delete ev; - ev = 0; - return 1; - } - } - Identifier id ("sequence"); UTL_ScopedName sn (&id, 0); @@ -6165,7 +6149,7 @@ tao_yyreduce: } break; - case 315: + case 313: { // | seq_head '>' @@ -6218,7 +6202,7 @@ tao_yyreduce: } break; - case 316: + case 314: { // seq_head : IDL_SEQUENCE @@ -6231,7 +6215,7 @@ tao_yyreduce: } break; - case 317: + case 315: { // '<' @@ -6239,7 +6223,7 @@ tao_yyreduce: } break; - case 318: + case 316: { // simple_type_spec @@ -6248,7 +6232,7 @@ tao_yyreduce: } break; - case 319: + case 317: { // string_type_spec : string_head '<' @@ -6256,7 +6240,7 @@ tao_yyreduce: } break; - case 320: + case 318: { // positive_int_expr @@ -6264,7 +6248,7 @@ tao_yyreduce: } break; - case 321: + case 319: { // '>' @@ -6304,7 +6288,7 @@ tao_yyreduce: } break; - case 322: + case 320: { // | string_head @@ -6330,7 +6314,7 @@ tao_yyreduce: } break; - case 323: + case 321: { // string_head : IDL_STRING @@ -6338,7 +6322,7 @@ tao_yyreduce: } break; - case 324: + case 322: { // wstring_type_spec : wstring_head '<' @@ -6346,7 +6330,7 @@ tao_yyreduce: } break; - case 325: + case 323: { // positive_int_expr @@ -6354,7 +6338,7 @@ tao_yyreduce: } break; - case 326: + case 324: { // '>' @@ -6383,7 +6367,7 @@ tao_yyreduce: } break; - case 327: + case 325: { // | wstring_head @@ -6408,7 +6392,7 @@ tao_yyreduce: } break; - case 328: + case 326: { // wstring_head : IDL_WSTRING @@ -6416,7 +6400,7 @@ tao_yyreduce: } break; - case 329: + case 327: { // array_declarator : id @@ -6424,7 +6408,7 @@ tao_yyreduce: } break; - case 330: + case 328: { // at_least_one_array_dim @@ -6455,7 +6439,7 @@ tao_yyreduce: } break; - case 331: + case 329: { // at_least_one_array_dim : array_dim array_dims @@ -6466,7 +6450,7 @@ tao_yyreduce: } break; - case 332: + case 330: { // array_dims : array_dims array_dim @@ -6488,7 +6472,7 @@ tao_yyreduce: } break; - case 333: + case 331: { /* | EMPTY */ @@ -6496,7 +6480,7 @@ tao_yyreduce: } break; - case 334: + case 332: { // array_dim : '[' @@ -6504,7 +6488,7 @@ tao_yyreduce: } break; - case 335: + case 333: { // positive_int_expr @@ -6512,7 +6496,7 @@ tao_yyreduce: } break; - case 336: + case 334: { // ']' @@ -6530,11 +6514,12 @@ tao_yyreduce: param_holder = (tao_yyvsp[(3) - (5)].exval)->param_holder (); - ev = (tao_yyvsp[(3) - (5)].exval)->coerce (AST_Expression::EV_ulong); + ev = + (tao_yyvsp[(3) - (5)].exval)->coerce (AST_Expression::EV_ulong); } if (0 == (tao_yyvsp[(3) - (5)].exval) - || (0 == ev && param_holder == 0)) + || (ev == 0 && param_holder == 0)) { idl_global->err ()->coercion_error ((tao_yyvsp[(3) - (5)].exval), AST_Expression::EV_ulong); @@ -6546,15 +6531,15 @@ tao_yyreduce: { AST_Expression::ExprType et = param_holder->info ()->const_type_; - + // If the bound expression represents a // template parameter, it must be a const - // and of type unsigned long. + // and of type unsigned long. if (et != AST_Expression::EV_ulong) { idl_global->err ()->mismatched_template_param ( param_holder->info ()->name_.c_str ()); - + delete ev; ev = 0; return 1; @@ -6569,7 +6554,7 @@ tao_yyreduce: } break; - case 339: + case 337: { // attribute_readonly : IDL_READONLY @@ -6577,7 +6562,7 @@ tao_yyreduce: } break; - case 340: + case 338: { // IDL_ATTRIBUTE @@ -6585,7 +6570,7 @@ tao_yyreduce: } break; - case 341: + case 339: { // param_type_spec @@ -6593,7 +6578,7 @@ tao_yyreduce: } break; - case 342: + case 340: { // at_least_one_simple_declarator @@ -6601,7 +6586,7 @@ tao_yyreduce: } break; - case 343: + case 341: { // opt_raises @@ -6665,7 +6650,7 @@ tao_yyreduce: } break; - case 344: + case 342: { // attribute_readonly : IDL_ATTRIBUTE @@ -6673,7 +6658,7 @@ tao_yyreduce: } break; - case 345: + case 343: { // param_type_spec @@ -6681,7 +6666,7 @@ tao_yyreduce: } break; - case 346: + case 344: { // at_least_one_simple_declarator @@ -6689,7 +6674,7 @@ tao_yyreduce: } break; - case 347: + case 345: { // opt_getraises @@ -6697,7 +6682,7 @@ tao_yyreduce: } break; - case 348: + case 346: { // opt_setraises @@ -6770,7 +6755,7 @@ tao_yyreduce: } break; - case 349: + case 347: { // exception : IDL_EXCEPTION @@ -6778,7 +6763,7 @@ tao_yyreduce: } break; - case 350: + case 348: { // id @@ -6811,7 +6796,7 @@ tao_yyreduce: } break; - case 351: + case 349: { // '{' @@ -6819,7 +6804,7 @@ tao_yyreduce: } break; - case 352: + case 350: { // members @@ -6827,7 +6812,7 @@ tao_yyreduce: } break; - case 353: + case 351: { // '}' @@ -6839,7 +6824,7 @@ tao_yyreduce: } break; - case 354: + case 352: { // operation : opt_op_attribute op_type_spec @@ -6847,7 +6832,7 @@ tao_yyreduce: } break; - case 355: + case 353: { // IDENTIFIER @@ -6903,7 +6888,7 @@ tao_yyreduce: } break; - case 356: + case 354: { // parameter_list @@ -6911,7 +6896,7 @@ tao_yyreduce: } break; - case 357: + case 355: { // opt_raises @@ -6919,7 +6904,7 @@ tao_yyreduce: } break; - case 358: + case 356: { // opt_context @@ -6952,7 +6937,7 @@ tao_yyreduce: } break; - case 359: + case 357: { // opt_op_attribute : IDL_ONEWAY @@ -6961,7 +6946,7 @@ tao_yyreduce: } break; - case 360: + case 358: { // | IDL_IDEMPOTENT @@ -6970,7 +6955,7 @@ tao_yyreduce: } break; - case 361: + case 359: { /* | EMPTY */ @@ -6978,7 +6963,7 @@ tao_yyreduce: } break; - case 363: + case 361: { // op_type_spec : param_type_spec | IDL_VOID @@ -6989,7 +6974,7 @@ tao_yyreduce: } break; - case 364: + case 362: { // init_decl : IDL_FACTORY @@ -6998,7 +6983,7 @@ tao_yyreduce: } break; - case 365: + case 363: { // IDENTIFIER @@ -7043,7 +7028,7 @@ tao_yyreduce: } break; - case 366: + case 364: { // init_parameter_list @@ -7051,7 +7036,7 @@ tao_yyreduce: } break; - case 367: + case 365: { // opt_raises @@ -7068,7 +7053,7 @@ tao_yyreduce: } break; - case 368: + case 366: { // init_parameter_list : '(' @@ -7076,7 +7061,7 @@ tao_yyreduce: } break; - case 369: + case 367: { // ')' @@ -7084,7 +7069,7 @@ tao_yyreduce: } break; - case 370: + case 368: { // | '(' @@ -7092,7 +7077,7 @@ tao_yyreduce: } break; - case 371: + case 369: { // at_least_one_in_parameter ')' @@ -7100,7 +7085,7 @@ tao_yyreduce: } break; - case 373: + case 371: { // in_parameters : in_parameters ',' @@ -7108,7 +7093,7 @@ tao_yyreduce: } break; - case 376: + case 374: { // in_parameter : IDL_IN @@ -7116,7 +7101,7 @@ tao_yyreduce: } break; - case 377: + case 375: { // param_type_spec @@ -7124,7 +7109,7 @@ tao_yyreduce: } break; - case 378: + case 376: { // declarator @@ -7160,7 +7145,7 @@ tao_yyreduce: } break; - case 379: + case 377: { // parameter_list : '(' @@ -7168,7 +7153,7 @@ tao_yyreduce: } break; - case 380: + case 378: { // ')' @@ -7176,7 +7161,7 @@ tao_yyreduce: } break; - case 381: + case 379: { // | '(' @@ -7184,7 +7169,7 @@ tao_yyreduce: } break; - case 382: + case 380: { // at_least_one_parameter ')' @@ -7192,7 +7177,7 @@ tao_yyreduce: } break; - case 384: + case 382: { // parameters : parameters ',' @@ -7200,7 +7185,7 @@ tao_yyreduce: } break; - case 387: + case 385: { // parameter : direction @@ -7208,7 +7193,7 @@ tao_yyreduce: } break; - case 388: + case 386: { // param_type_spec @@ -7216,7 +7201,7 @@ tao_yyreduce: } break; - case 389: + case 387: { // declarator @@ -7259,7 +7244,7 @@ tao_yyreduce: } break; - case 390: + case 388: { // param_type_spec : base_type_spec @@ -7270,7 +7255,7 @@ tao_yyreduce: } break; - case 393: + case 391: { // | string_type_spec @@ -7375,7 +7360,7 @@ tao_yyreduce: } break; - case 394: + case 392: { // direction : IDL_IN @@ -7383,7 +7368,7 @@ tao_yyreduce: } break; - case 395: + case 393: { // | IDL_OUT @@ -7391,7 +7376,7 @@ tao_yyreduce: } break; - case 396: + case 394: { // | IDL_INOUT @@ -7399,7 +7384,7 @@ tao_yyreduce: } break; - case 397: + case 395: { // opt_raises : IDL_RAISES @@ -7407,7 +7392,7 @@ tao_yyreduce: } break; - case 398: + case 396: { // '(' @@ -7415,7 +7400,7 @@ tao_yyreduce: } break; - case 399: + case 397: { // at_least_one_scoped_name ')' @@ -7424,7 +7409,7 @@ tao_yyreduce: } break; - case 400: + case 398: { (tao_yyval.nlval) = 0; @@ -7432,7 +7417,7 @@ tao_yyreduce: } break; - case 401: + case 399: { // opt_getraises : IDL_GETRAISES @@ -7440,7 +7425,7 @@ tao_yyreduce: } break; - case 402: + case 400: { // '(' @@ -7448,7 +7433,7 @@ tao_yyreduce: } break; - case 403: + case 401: { // at_least_one_scoped_name ')' @@ -7457,7 +7442,7 @@ tao_yyreduce: } break; - case 404: + case 402: { (tao_yyval.nlval) = 0; @@ -7465,7 +7450,7 @@ tao_yyreduce: } break; - case 405: + case 403: { // opt_setraises : IDL_SETRAISES @@ -7473,7 +7458,7 @@ tao_yyreduce: } break; - case 406: + case 404: { // '(' @@ -7481,7 +7466,7 @@ tao_yyreduce: } break; - case 407: + case 405: { // at_least_one_scoped_name ')' @@ -7490,7 +7475,7 @@ tao_yyreduce: } break; - case 408: + case 406: { (tao_yyval.nlval) = 0; @@ -7498,7 +7483,7 @@ tao_yyreduce: } break; - case 409: + case 407: { // opt_context : IDL_CONTEXT @@ -7506,7 +7491,7 @@ tao_yyreduce: } break; - case 410: + case 408: { idl_global->set_parse_state (IDL_GlobalData::PS_OpContextSqSeen); @@ -7514,7 +7499,7 @@ tao_yyreduce: } break; - case 411: + case 409: { // at_least_one_string_literal ')' @@ -7523,7 +7508,7 @@ tao_yyreduce: } break; - case 412: + case 410: { /* | EMPTY */ @@ -7531,7 +7516,7 @@ tao_yyreduce: } break; - case 413: + case 411: { // at_least_one_string_literal : IDL_STRING_LITERAL string_literals @@ -7542,7 +7527,7 @@ tao_yyreduce: } break; - case 414: + case 412: { // string_literals : string_literals ',' @@ -7550,7 +7535,7 @@ tao_yyreduce: } break; - case 415: + case 413: { // IDL_STRING_LITERAL @@ -7572,7 +7557,7 @@ tao_yyreduce: } break; - case 416: + case 414: { /* | EMPTY */ @@ -7580,7 +7565,7 @@ tao_yyreduce: } break; - case 417: + case 415: { // typeid_dcl : IDL_TYPEID scoped_name IDL_STRING_LITERAL @@ -7609,7 +7594,7 @@ tao_yyreduce: } break; - case 418: + case 416: { // typeprefix_dcl : IDL_TYPEPREFIX scoped_name IDL_STRING_LITERAL @@ -7647,7 +7632,7 @@ tao_yyreduce: } break; - case 421: + case 419: { // component_forward_decl : IDL_COMPONENT id @@ -7675,7 +7660,7 @@ tao_yyreduce: } break; - case 422: + case 420: { // component_decl : component_header @@ -7718,7 +7703,7 @@ tao_yyreduce: } break; - case 423: + case 421: { // '{' @@ -7726,7 +7711,7 @@ tao_yyreduce: } break; - case 424: + case 422: { // component_exports @@ -7734,7 +7719,7 @@ tao_yyreduce: } break; - case 425: + case 423: { // '}' @@ -7747,7 +7732,7 @@ tao_yyreduce: } break; - case 426: + case 424: { // id @@ -7755,7 +7740,7 @@ tao_yyreduce: } break; - case 427: + case 425: { // component_inheritance_spec @@ -7763,7 +7748,7 @@ tao_yyreduce: } break; - case 428: + case 426: { // supports_spec @@ -7801,7 +7786,7 @@ tao_yyreduce: } break; - case 429: + case 427: { // component_inheritance_spec : ':' @@ -7809,7 +7794,7 @@ tao_yyreduce: } break; - case 430: + case 428: { // scoped_name @@ -7817,7 +7802,7 @@ tao_yyreduce: } break; - case 431: + case 429: { /* | EMPTY */ @@ -7825,7 +7810,7 @@ tao_yyreduce: } break; - case 434: + case 432: { // component_export : provides_decl @@ -7833,7 +7818,7 @@ tao_yyreduce: } break; - case 435: + case 433: { // ';' @@ -7841,7 +7826,7 @@ tao_yyreduce: } break; - case 436: + case 434: { // | uses_decl @@ -7849,7 +7834,7 @@ tao_yyreduce: } break; - case 437: + case 435: { // ';' @@ -7857,7 +7842,7 @@ tao_yyreduce: } break; - case 438: + case 436: { // | emits_decl @@ -7865,7 +7850,7 @@ tao_yyreduce: } break; - case 439: + case 437: { // ';' @@ -7873,7 +7858,7 @@ tao_yyreduce: } break; - case 440: + case 438: { // | publishes_decl @@ -7881,7 +7866,7 @@ tao_yyreduce: } break; - case 441: + case 439: { // ';' @@ -7889,7 +7874,7 @@ tao_yyreduce: } break; - case 442: + case 440: { // | consumes_decl @@ -7897,7 +7882,7 @@ tao_yyreduce: } break; - case 443: + case 441: { // ';' @@ -7905,7 +7890,7 @@ tao_yyreduce: } break; - case 444: + case 442: { // | attribute @@ -7913,7 +7898,7 @@ tao_yyreduce: } break; - case 445: + case 443: { // ';' @@ -7921,7 +7906,7 @@ tao_yyreduce: } break; - case 446: + case 444: { // | extended_port_decl @@ -7929,7 +7914,7 @@ tao_yyreduce: } break; - case 447: + case 445: { // ';' @@ -7937,7 +7922,7 @@ tao_yyreduce: } break; - case 448: + case 446: { // provides_decl : IDL_PROVIDES interface_type id @@ -7957,7 +7942,7 @@ tao_yyreduce: { int compare = 0; nt = d->node_type (); - + switch (nt) { case AST_Decl::NT_interface: @@ -7965,16 +7950,16 @@ tao_yyreduce: case AST_Decl::NT_param_holder: ph = AST_Param_Holder::narrow_from_decl (d); nt = ph->info ()->type_; - + if (nt != AST_Decl::NT_type && nt != AST_Decl::NT_interface) { idl_global->err ()->mismatched_template_param ( ph->info ()->name_.c_str ()); - + so_far_so_good = false; } - + break; case AST_Decl::NT_pre_defined: // Nothing else but CORBA::Object can have @@ -7990,7 +7975,7 @@ tao_yyreduce: idl_global->err ()->interface_expected (d); so_far_so_good = false; } - + break; default: idl_global->err ()->interface_expected (d); @@ -8027,7 +8012,7 @@ tao_yyreduce: } break; - case 449: + case 447: { // interface_type : scoped_name @@ -8037,7 +8022,7 @@ tao_yyreduce: } break; - case 450: + case 448: { // | IDL_OBJECT @@ -8064,7 +8049,7 @@ tao_yyreduce: } break; - case 451: + case 449: { // uses_decl : uses_opt_multiple interface_type id @@ -8084,7 +8069,7 @@ tao_yyreduce: { int compare = 0; nt = d->node_type (); - + switch (nt) { case AST_Decl::NT_interface: @@ -8092,16 +8077,16 @@ tao_yyreduce: case AST_Decl::NT_param_holder: ph = AST_Param_Holder::narrow_from_decl (d); nt = ph->info ()->type_; - + if (nt != AST_Decl::NT_type && nt != AST_Decl::NT_interface) { idl_global->err ()->mismatched_template_param ( ph->info ()->name_.c_str ()); - + so_far_so_good = false; } - + break; case AST_Decl::NT_pre_defined: // Nothing else but CORBA::Object can have @@ -8117,7 +8102,7 @@ tao_yyreduce: idl_global->err ()->interface_expected (d); so_far_so_good = false; } - + break; default: idl_global->err ()->interface_expected (d); @@ -8170,7 +8155,7 @@ tao_yyreduce: } break; - case 452: + case 450: { // uses_opt_multiple : IDL_USES opt_multiple @@ -8180,7 +8165,7 @@ tao_yyreduce: } break; - case 453: + case 451: { // opt_multiple : IDL_MULTIPLE @@ -8188,7 +8173,7 @@ tao_yyreduce: } break; - case 454: + case 452: { /* | EMPTY */ @@ -8196,7 +8181,7 @@ tao_yyreduce: } break; - case 455: + case 453: { // emits_decl : IDL_EMITS scoped_name id @@ -8204,7 +8189,7 @@ tao_yyreduce: bool so_far_so_good = true; AST_Decl::NodeType nt = AST_Decl::NT_type; AST_Param_Holder *ph = 0; - + AST_Decl *d = s->lookup_by_name ((tao_yyvsp[(2) - (3)].idlist), true); @@ -8216,7 +8201,7 @@ tao_yyreduce: else { nt = d->node_type (); - + switch (nt) { case AST_Decl::NT_eventtype: @@ -8224,16 +8209,16 @@ tao_yyreduce: case AST_Decl::NT_param_holder: ph = AST_Param_Holder::narrow_from_decl (d); nt = ph->info ()->type_; - + if (nt != AST_Decl::NT_type && nt != AST_Decl::NT_eventtype) { idl_global->err ()->mismatched_template_param ( ph->info ()->name_.c_str ()); - + so_far_so_good = false; } - + break; default: idl_global->err ()->eventtype_expected (d); @@ -8270,7 +8255,7 @@ tao_yyreduce: } break; - case 456: + case 454: { // publishes_decl : IDL_PUBLISHES scoped_name id @@ -8278,7 +8263,7 @@ tao_yyreduce: bool so_far_so_good = true; AST_Decl::NodeType nt = AST_Decl::NT_type; AST_Param_Holder *ph = 0; - + AST_Decl *d = s->lookup_by_name ((tao_yyvsp[(2) - (3)].idlist), true); @@ -8290,7 +8275,7 @@ tao_yyreduce: else { nt = d->node_type (); - + switch (nt) { case AST_Decl::NT_eventtype: @@ -8298,16 +8283,16 @@ tao_yyreduce: case AST_Decl::NT_param_holder: ph = AST_Param_Holder::narrow_from_decl (d); nt = ph->info ()->type_; - + if (nt != AST_Decl::NT_type && nt != AST_Decl::NT_eventtype) { idl_global->err ()->mismatched_template_param ( ph->info ()->name_.c_str ()); - + so_far_so_good = false; } - + break; default: idl_global->err ()->eventtype_expected (d); @@ -8344,7 +8329,7 @@ tao_yyreduce: } break; - case 457: + case 455: { // consumes_decl : IDL_CONSUMES scoped_name id @@ -8352,7 +8337,7 @@ tao_yyreduce: bool so_far_so_good = true; AST_Decl::NodeType nt = AST_Decl::NT_type; AST_Param_Holder *ph = 0; - + AST_Decl *d = s->lookup_by_name ((tao_yyvsp[(2) - (3)].idlist), true); @@ -8364,7 +8349,7 @@ tao_yyreduce: else { nt = d->node_type (); - + switch (nt) { case AST_Decl::NT_eventtype: @@ -8372,16 +8357,16 @@ tao_yyreduce: case AST_Decl::NT_param_holder: ph = AST_Param_Holder::narrow_from_decl (d); nt = ph->info ()->type_; - + if (nt != AST_Decl::NT_type && nt != AST_Decl::NT_eventtype) { idl_global->err ()->mismatched_template_param ( ph->info ()->name_.c_str ()); - + so_far_so_good = false; } - + break; default: idl_global->err ()->eventtype_expected (d); @@ -8418,7 +8403,7 @@ tao_yyreduce: } break; - case 458: + case 456: { // home_decl : home_header @@ -8459,7 +8444,7 @@ tao_yyreduce: } break; - case 459: + case 457: { // home_body @@ -8470,7 +8455,7 @@ tao_yyreduce: } break; - case 460: + case 458: { // home_header : IDL_HOME @@ -8478,7 +8463,7 @@ tao_yyreduce: } break; - case 461: + case 459: { // id @@ -8486,7 +8471,7 @@ tao_yyreduce: } break; - case 462: + case 460: { // home_inheritance_spec @@ -8494,7 +8479,7 @@ tao_yyreduce: } break; - case 463: + case 461: { // supports_spec @@ -8502,7 +8487,7 @@ tao_yyreduce: } break; - case 464: + case 462: { // IDL_MANAGES @@ -8510,7 +8495,7 @@ tao_yyreduce: } break; - case 465: + case 463: { // scoped_name @@ -8518,7 +8503,7 @@ tao_yyreduce: } break; - case 466: + case 464: { // primary_key_spec @@ -8568,7 +8553,7 @@ tao_yyreduce: } break; - case 467: + case 465: { // home_inheritance_spec ':' @@ -8576,7 +8561,7 @@ tao_yyreduce: } break; - case 468: + case 466: { // scoped_name @@ -8584,7 +8569,7 @@ tao_yyreduce: } break; - case 469: + case 467: { /* | EMPTY */ @@ -8592,7 +8577,7 @@ tao_yyreduce: } break; - case 470: + case 468: { // primary_key_spec : IDL_PRIMARYKEY scoped_name @@ -8600,7 +8585,7 @@ tao_yyreduce: } break; - case 471: + case 469: { /* | EMPTY */ @@ -8608,7 +8593,7 @@ tao_yyreduce: } break; - case 472: + case 470: { // home_body : '{' @@ -8616,7 +8601,7 @@ tao_yyreduce: } break; - case 473: + case 471: { // home_exports @@ -8624,7 +8609,7 @@ tao_yyreduce: } break; - case 474: + case 472: { // '}' @@ -8632,7 +8617,7 @@ tao_yyreduce: } break; - case 478: + case 476: { // home_export : factory_decl @@ -8640,7 +8625,7 @@ tao_yyreduce: } break; - case 479: + case 477: { // | ';' @@ -8648,7 +8633,7 @@ tao_yyreduce: } break; - case 480: + case 478: { // | finder_decl @@ -8656,7 +8641,7 @@ tao_yyreduce: } break; - case 481: + case 479: { // | ';' @@ -8664,7 +8649,7 @@ tao_yyreduce: } break; - case 482: + case 480: { // factory_decl : IDL_FACTORY id @@ -8703,7 +8688,7 @@ tao_yyreduce: } break; - case 483: + case 481: { // init_parameter_list @@ -8711,7 +8696,7 @@ tao_yyreduce: } break; - case 484: + case 482: { // opt_raises @@ -8739,7 +8724,7 @@ tao_yyreduce: } break; - case 485: + case 483: { // finder_decl : IDL_FINDER id @@ -8778,7 +8763,7 @@ tao_yyreduce: } break; - case 486: + case 484: { // init_parameter_list @@ -8786,7 +8771,7 @@ tao_yyreduce: } break; - case 487: + case 485: { // opt_raises @@ -8814,7 +8799,7 @@ tao_yyreduce: } break; - case 493: + case 491: { // event_concrete_forward_decl : IDL_EVENTTYPE id @@ -8841,7 +8826,7 @@ tao_yyreduce: } break; - case 494: + case 492: { // event_abs_forward_decl : IDL_ABSTRACT IDL_EVENTTYPE id @@ -8868,7 +8853,7 @@ tao_yyreduce: } break; - case 495: + case 493: { // event_abs_decl : event_abs_header event_rest_of_header @@ -8916,7 +8901,7 @@ tao_yyreduce: } break; - case 496: + case 494: { // '{' @@ -8924,7 +8909,7 @@ tao_yyreduce: } break; - case 497: + case 495: { // exports @@ -8932,7 +8917,7 @@ tao_yyreduce: } break; - case 498: + case 496: { // '}' @@ -8945,7 +8930,7 @@ tao_yyreduce: } break; - case 499: + case 497: { // event_abs_header : IDL_ABSTRACT IDL_EVENTTYPE id @@ -8953,7 +8938,7 @@ tao_yyreduce: } break; - case 500: + case 498: { // event_custom_header : IDL_CUSTOM IDL_EVENTTYPE id @@ -8970,7 +8955,7 @@ tao_yyreduce: } break; - case 501: + case 499: { // event_plain_header : IDL_EVENTTYPE id @@ -8980,7 +8965,7 @@ tao_yyreduce: } break; - case 502: + case 500: { // event_rest_of_header : inheritance_spec @@ -8988,7 +8973,7 @@ tao_yyreduce: } break; - case 503: + case 501: { // supports_spec @@ -9021,7 +9006,7 @@ tao_yyreduce: } break; - case 504: + case 502: { // event_decl : event_header event_rest_of_header @@ -9074,7 +9059,7 @@ tao_yyreduce: } break; - case 505: + case 503: { // '{' @@ -9082,7 +9067,7 @@ tao_yyreduce: } break; - case 506: + case 504: { // value_elements @@ -9090,7 +9075,7 @@ tao_yyreduce: } break; - case 507: + case 505: { // '}' @@ -9103,7 +9088,7 @@ tao_yyreduce: } break; - case 508: + case 506: { // event_header : event_custom_header @@ -9111,7 +9096,7 @@ tao_yyreduce: } break; - case 509: + case 507: { // event_header : event_plain_header @@ -9119,7 +9104,7 @@ tao_yyreduce: } break; - case 510: + case 508: { // formal_parameter_type : IDL_TYPENAME @@ -9127,7 +9112,7 @@ tao_yyreduce: } break; - case 511: + case 509: { // IDL_STRUCT @@ -9135,7 +9120,7 @@ tao_yyreduce: } break; - case 512: + case 510: { // IDL_UNION @@ -9143,7 +9128,7 @@ tao_yyreduce: } break; - case 513: + case 511: { // IDL_EVENTTYPE @@ -9151,7 +9136,7 @@ tao_yyreduce: } break; - case 514: + case 512: { // IDL_SEQUENCE @@ -9159,7 +9144,7 @@ tao_yyreduce: } break; - case 515: + case 513: { // IDL_INTERFACE @@ -9167,7 +9152,7 @@ tao_yyreduce: } break; - case 516: + case 514: { // IDL_VALUETYPE @@ -9175,7 +9160,7 @@ tao_yyreduce: } break; - case 517: + case 515: { // IDL_ENUM @@ -9183,7 +9168,7 @@ tao_yyreduce: } break; - case 518: + case 516: { // IDL_EXCEPTION @@ -9191,7 +9176,7 @@ tao_yyreduce: } break; - case 519: + case 517: { // IDL_CONST const_type @@ -9200,7 +9185,7 @@ tao_yyreduce: } break; - case 520: + case 518: { // at_least_one_formal_parameter : formal_parameter formal_parameters @@ -9234,7 +9219,7 @@ tao_yyreduce: } break; - case 521: + case 519: { // formal_parameters : formal_parameters ',' @@ -9242,7 +9227,7 @@ tao_yyreduce: } break; - case 522: + case 520: { // formal_parameter @@ -9261,7 +9246,7 @@ tao_yyreduce: } break; - case 523: + case 521: { // /* EMPTY */ @@ -9269,7 +9254,7 @@ tao_yyreduce: } break; - case 524: + case 522: { // formal_parameter : formal_parameter_type IDENTIFIER @@ -9296,7 +9281,7 @@ tao_yyreduce: } break; - case 525: + case 523: { ACE_NEW_RETURN ((tao_yyval.pival), @@ -9314,7 +9299,7 @@ tao_yyreduce: } break; - case 526: + case 524: { // at_least_one_formal_parameter_name : formal_parameter_name formal_parameter_names @@ -9325,7 +9310,7 @@ tao_yyreduce: } break; - case 527: + case 525: { // formal_parameter_names : formal_parameter_names ',' formal_parameter_name @@ -9347,7 +9332,7 @@ tao_yyreduce: } break; - case 528: + case 526: { // /* EMPTY */ @@ -9355,7 +9340,7 @@ tao_yyreduce: } break; - case 529: + case 527: { // formal_parameter_name : IDENTIFIER @@ -9365,7 +9350,7 @@ tao_yyreduce: } break; - case 530: + case 528: { // porttype_decl : IDL_PORTTYPE @@ -9373,29 +9358,29 @@ tao_yyreduce: } break; - case 531: + case 529: { // IDENTIFIER idl_global->set_parse_state (IDL_GlobalData::PS_PorttypeIDSeen); UTL_Scope *s = idl_global->scopes ().top_non_null (); - + Identifier id ((tao_yyvsp[(3) - (3)].strval)); ACE::strdelete ((tao_yyvsp[(3) - (3)].strval)); (tao_yyvsp[(3) - (3)].strval) = 0; - + UTL_ScopedName sn (&id, 0); AST_PortType *p = idl_global->gen ()->create_porttype (&sn); - + (void) s->fe_add_porttype (p); - + // Push it on the scopes stack. idl_global->scopes ().push (p); } break; - case 532: + case 530: { // '{' @@ -9403,7 +9388,7 @@ tao_yyreduce: } break; - case 533: + case 531: { // at_least_one_port_export @@ -9411,7 +9396,7 @@ tao_yyreduce: } break; - case 534: + case 532: { // '}' @@ -9422,56 +9407,56 @@ tao_yyreduce: } break; - case 535: + case 533: { // at_least_one_port_export : port_export port_exports } break; - case 536: + case 534: { // port_exports : port_exports port_export } break; - case 537: + case 535: { // | /* EMPTY */ } break; - case 538: + case 536: { // port_export : provides_decl } break; - case 539: + case 537: { // ';' } break; - case 540: + case 538: { // | uses_decl } break; - case 541: + case 539: { // ';' } break; - case 542: + case 540: { // extended_port_decl : IDL_PORT scoped_name IDENTIFIER @@ -9543,7 +9528,7 @@ tao_yyreduce: } break; - case 543: + case 541: { // | IDL_MIRRORPORT scoped_name IDENTIFIER @@ -9593,7 +9578,7 @@ tao_yyreduce: } break; - case 544: + case 542: { // at_least_one_actual_parameter : actual_parameter actual_parameters @@ -9609,7 +9594,7 @@ tao_yyreduce: } break; - case 545: + case 543: { // actual_parameters : actual_parameters ',' actual_parameter @@ -9625,7 +9610,7 @@ tao_yyreduce: } break; - case 546: + case 544: { // | /* EMPTY */ @@ -9633,7 +9618,7 @@ tao_yyreduce: } break; - case 547: + case 545: { // actual_parameter : expression @@ -9693,7 +9678,7 @@ tao_yyreduce: } break; - case 549: + case 547: { // connector_header : IDL_CONNECTOR @@ -9701,7 +9686,7 @@ tao_yyreduce: } break; - case 550: + case 548: { // IDENTIFIER @@ -9709,7 +9694,7 @@ tao_yyreduce: } break; - case 551: + case 549: { // component_inheritance_spec @@ -9764,7 +9749,7 @@ tao_yyreduce: } break; - case 552: + case 550: { // connector_body " '{' @@ -9772,7 +9757,7 @@ tao_yyreduce: } break; - case 553: + case 551: { // at_least_one_connector_export @@ -9780,7 +9765,7 @@ tao_yyreduce: } break; - case 554: + case 552: { // '} @@ -9791,7 +9776,7 @@ tao_yyreduce: } break; - case 558: + case 556: { // connector_export : provides_decl @@ -9799,7 +9784,7 @@ tao_yyreduce: } break; - case 559: + case 557: { // ';' @@ -9807,7 +9792,7 @@ tao_yyreduce: } break; - case 560: + case 558: { // | uses_decl @@ -9815,7 +9800,7 @@ tao_yyreduce: } break; - case 561: + case 559: { // ';' @@ -9823,7 +9808,7 @@ tao_yyreduce: } break; - case 562: + case 560: { // | attribute @@ -9831,7 +9816,7 @@ tao_yyreduce: } break; - case 563: + case 561: { // ';' @@ -9839,7 +9824,7 @@ tao_yyreduce: } break; - case 564: + case 562: { // | extended_port_decl @@ -9847,7 +9832,7 @@ tao_yyreduce: } break; - case 565: + case 563: { // ';' diff --git a/TAO/TAO_IDL/fe/y.tab.h b/TAO/TAO_IDL/fe/y.tab.h index 5a5660cb8fe..d491b305813 100644 --- a/TAO/TAO_IDL/fe/y.tab.h +++ b/TAO/TAO_IDL/fe/y.tab.h @@ -249,10 +249,6 @@ typedef union TAO_YYSTYPE AST_Decl::NodeType ntval; /* Node type value */ FE_Utils::T_Param_Info *pival; /* Template interface param */ FE_Utils::T_PARAMLIST_INFO *plval; /* List of template params */ - FE_Utils::T_Ref_Info *trval; /* Template interface info */ - FE_Utils::T_REFLIST_INFO *rlval; /* List of above structs */ - FE_Utils::T_Inst_Info *tival; /* Template instantiation */ - FE_Utils::T_Port_Info *ptval; /* Porttype reference */ FE_Utils::T_ARGLIST *alval; /* List of template args */ } /* Line 1489 of yacc.c. */ diff --git a/TAO/TAO_IDL/include/fe_utils.h b/TAO/TAO_IDL/include/fe_utils.h index c04ef286dde..274627acbf5 100644 --- a/TAO/TAO_IDL/include/fe_utils.h +++ b/TAO/TAO_IDL/include/fe_utils.h @@ -32,37 +32,6 @@ struct TAO_IDL_FE_Export FE_Utils static bool duplicate_param_id (T_PARAMLIST_INFO *params); - struct T_Ref_Info - { - UTL_ScopedName *name_; - UTL_StrList *params_; - - T_Ref_Info (void); - T_Ref_Info (UTL_ScopedName *n, UTL_StrList *strs); - - void destroy (void); - }; - - typedef ACE_Unbounded_Queue<T_Ref_Info> T_REFLIST_INFO; - - struct T_Port_Info - { - ACE_CString name_; - AST_PortType *type_; - - T_Port_Info (const char *name, AST_PortType *type); - }; - - struct T_Inst_Info - { - UTL_ScopedName *name_; - UTL_NameList *args_; - - T_Inst_Info (UTL_ScopedName *n, UTL_NameList *args); - - void destroy (void); - }; - struct T_ARGLIST : ACE_Unbounded_Queue<AST_Decl *> { void destroy (void); diff --git a/TAO/TAO_IDL/include/utl_err.h b/TAO/TAO_IDL/include/utl_err.h index 2a2ef3c91f0..8378849cc88 100644 --- a/TAO/TAO_IDL/include/utl_err.h +++ b/TAO/TAO_IDL/include/utl_err.h @@ -147,7 +147,7 @@ public: EIDL_MISMATCHED_T_PARAM, // Between defined & referenced template interfaces EIDL_DUPLICATE_T_PARAM, // A template interface's param ids must be unique EIDL_T_ARG_LENGTH, // Wrong # of template args - EIDL_MISMATCHED_SEQ_PARAM, // 'sequence<T> must match a previous param + EIDL_MISMATCHED_SEQ_PARAM, // 'sequence<T>' must match a previous param EIDL_OK // No error }; |