From 9df4eb954ea02d4544299b45df913843eb5abca8 Mon Sep 17 00:00:00 2001 From: Fred Hornsey Date: Sun, 9 Jun 2024 01:19:04 -0500 Subject: [PATCH] Support 3 Small IDL4 Features - Empty structs - `octet` and `wchar` union discriminators - Allow using empty parentheses in annotation applications to workaround syntax errors when an annotation with no arguments has to be followed by a complete scoped name: `@example_annotation() ::ex::ExampleType`. --- TAO/NEWS | 7 + TAO/TAO_IDL/be/be_union.cpp | 2 + TAO/TAO_IDL/be/be_union_branch.cpp | 1 + .../be/be_visitor_structure/cdr_op_cs.cpp | 15 +- TAO/TAO_IDL/be/be_visitor_union/cdr_op_cs.cpp | 3 + .../be/be_visitor_union/discriminant_ci.cpp | 1 + TAO/TAO_IDL/fe/fe_lookup.cpp | 2 +- TAO/TAO_IDL/fe/idl.tab.cpp | 4513 +++++++++-------- TAO/TAO_IDL/fe/idl.ypp | 83 +- TAO/TAO_IDL/fe/idl.yy.cpp | 14 +- TAO/tao/idl_features.h | 10 +- .../IDLv4/annotations/annotation_tests.cpp | 14 +- TAO/tests/IDLv4/structs/.gitignore | 5 + TAO/tests/IDLv4/structs/IDLv4_structs.mpc | 6 + TAO/tests/IDLv4/structs/test.idl | 17 + TAO/tests/IDLv4/union_disc/.gitignore | 5 + .../IDLv4/union_disc/IDLv4_union_disc.mpc | 6 + TAO/tests/IDLv4/union_disc/test.idl | 21 + 18 files changed, 2436 insertions(+), 2289 deletions(-) create mode 100644 TAO/tests/IDLv4/structs/.gitignore create mode 100644 TAO/tests/IDLv4/structs/IDLv4_structs.mpc create mode 100644 TAO/tests/IDLv4/structs/test.idl create mode 100644 TAO/tests/IDLv4/union_disc/.gitignore create mode 100644 TAO/tests/IDLv4/union_disc/IDLv4_union_disc.mpc create mode 100644 TAO/tests/IDLv4/union_disc/test.idl diff --git a/TAO/NEWS b/TAO/NEWS index 32b437bc561ac..b329f4aed1ae8 100644 --- a/TAO/NEWS +++ b/TAO/NEWS @@ -1,6 +1,13 @@ USER VISIBLE CHANGES BETWEEN TAO-4.0.0 and TAO-4.0.1 ==================================================== +- Add support in TAO_IDL for the following IDL v4 features: + - Empty structs + - `octet` and `wchar` union discriminators + - Allow using empty parentheses in annotation applications to workaround + syntax errors when an annotation with no arguments has to be followed by a + complete scoped name: `@example_annotation() ::ex::ExampleType`. + USER VISIBLE CHANGES BETWEEN TAO-3.1.4 and TAO-4.0.0 ==================================================== diff --git a/TAO/TAO_IDL/be/be_union.cpp b/TAO/TAO_IDL/be/be_union.cpp index 01ecb59fbdddf..0ad3aaa6dfdf2 100644 --- a/TAO/TAO_IDL/be/be_union.cpp +++ b/TAO/TAO_IDL/be/be_union.cpp @@ -234,10 +234,12 @@ be_union::gen_empty_default_label () return (n_labels < 2); case AST_PredefinedType::PT_char: + case AST_PredefinedType::PT_octet: return (n_labels <= ACE_OCTET_MAX); case AST_PredefinedType::PT_short: case AST_PredefinedType::PT_ushort: + case AST_PredefinedType::PT_wchar: return (n_labels <= ACE_UINT16_MAX); case AST_PredefinedType::PT_long: diff --git a/TAO/TAO_IDL/be/be_union_branch.cpp b/TAO/TAO_IDL/be/be_union_branch.cpp index ce9ed6972d888..06a1416565cbe 100644 --- a/TAO/TAO_IDL/be/be_union_branch.cpp +++ b/TAO/TAO_IDL/be/be_union_branch.cpp @@ -121,6 +121,7 @@ be_union_branch::gen_default_label_value (TAO_OutStream *os, *os << dv.u.short_val; break; case AST_Expression::EV_ushort: + case AST_Expression::EV_wchar: *os << dv.u.ushort_val; break; case AST_Expression::EV_long: diff --git a/TAO/TAO_IDL/be/be_visitor_structure/cdr_op_cs.cpp b/TAO/TAO_IDL/be/be_visitor_structure/cdr_op_cs.cpp index 2327f40ae93e8..67a9c202222be 100644 --- a/TAO/TAO_IDL/be/be_visitor_structure/cdr_op_cs.cpp +++ b/TAO/TAO_IDL/be/be_visitor_structure/cdr_op_cs.cpp @@ -56,7 +56,9 @@ be_visitor_structure_cdr_op_cs::visit_structure (be_structure *node) << "TAO_OutputCDR &strm," << be_nl << "const " << node->name () << " &_tao_aggregate)" << be_uidt << be_uidt_nl - << "{" << be_idt_nl; + << "{" << be_idt_nl + << "ACE_UNUSED_ARG(strm);" << be_nl + << "ACE_UNUSED_ARG(_tao_aggregate);" << be_nl; be_visitor_context new_ctx (*this->ctx_); be_visitor_cdr_op_field_decl field_decl (&new_ctx); @@ -81,7 +83,7 @@ be_visitor_structure_cdr_op_cs::visit_structure (be_structure *node) -1); } - *os << ";" << be_uidt << be_uidt_nl + *os << "true;" << be_uidt << be_uidt_nl << "}" << be_nl_2; // Set the substate as generating code for the input operator. @@ -104,7 +106,9 @@ be_visitor_structure_cdr_op_cs::visit_structure (be_structure *node) } *os << ")" << be_uidt << be_uidt_nl - << "{" << be_idt_nl; + << "{" << be_idt_nl + << "ACE_UNUSED_ARG(strm);" << be_nl + << "ACE_UNUSED_ARG(_tao_aggregate);" << be_nl; if (node->is_local ()) { @@ -135,7 +139,7 @@ be_visitor_structure_cdr_op_cs::visit_structure (be_structure *node) -1); } - *os << ";" << be_uidt << be_uidt; + *os << "true;" << be_uidt << be_uidt; } *os << be_uidt_nl << "}" << be_nl; @@ -157,8 +161,7 @@ be_visitor_structure_cdr_op_cs::post_process (be_decl *bd) { TAO_OutStream *os = this->ctx_->stream (); - if (!this->last_node (bd) - && bd->node_type () != AST_Decl::NT_enum_val) + if (bd->node_type () != AST_Decl::NT_enum_val) { switch (this->ctx_->sub_state ()) { diff --git a/TAO/TAO_IDL/be/be_visitor_union/cdr_op_cs.cpp b/TAO/TAO_IDL/be/be_visitor_union/cdr_op_cs.cpp index fd251f41596b4..805a60ec55fc6 100644 --- a/TAO/TAO_IDL/be/be_visitor_union/cdr_op_cs.cpp +++ b/TAO/TAO_IDL/be/be_visitor_union/cdr_op_cs.cpp @@ -43,6 +43,9 @@ namespace { case AST_Expression::EV_int8: tmp_suffix = "int8"; break; + case AST_Expression::EV_octet: + tmp_suffix = "octet"; + break; default: break; } diff --git a/TAO/TAO_IDL/be/be_visitor_union/discriminant_ci.cpp b/TAO/TAO_IDL/be/be_visitor_union/discriminant_ci.cpp index 96a77ccb6863d..3ea0e849eeab9 100644 --- a/TAO/TAO_IDL/be/be_visitor_union/discriminant_ci.cpp +++ b/TAO/TAO_IDL/be/be_visitor_union/discriminant_ci.cpp @@ -160,6 +160,7 @@ be_visitor_union_discriminant_ci::visit_predefined_type ( *os << dv.u.short_val; break; case AST_Expression::EV_ushort: + case AST_Expression::EV_wchar: *os << dv.u.ushort_val; break; case AST_Expression::EV_long: diff --git a/TAO/TAO_IDL/fe/fe_lookup.cpp b/TAO/TAO_IDL/fe/fe_lookup.cpp index 3ee0a5be6493a..827538654e9da 100644 --- a/TAO/TAO_IDL/fe/fe_lookup.cpp +++ b/TAO/TAO_IDL/fe/fe_lookup.cpp @@ -7,7 +7,7 @@ unsigned int TAO_IDL_CPP_Keyword_Table::hash (const char *str, unsigned int len) { - static const unsigned char asso_values[] = + static constexpr unsigned char asso_values[] = { 252, 252, 252, 252, 252, 252, 252, 252, 252, 252, 252, 252, 252, 252, 252, 252, 252, 252, 252, 252, diff --git a/TAO/TAO_IDL/fe/idl.tab.cpp b/TAO/TAO_IDL/fe/idl.tab.cpp index 43432b2741c45..62490aaba1f31 100644 --- a/TAO/TAO_IDL/fe/idl.tab.cpp +++ b/TAO/TAO_IDL/fe/idl.tab.cpp @@ -473,243 +473,244 @@ enum yysymbol_kind_t YYSYMBOL_struct_type = 280, /* struct_type */ YYSYMBOL_281_66 = 281, /* $@66 */ YYSYMBOL_282_67 = 282, /* $@67 */ - YYSYMBOL_283_68 = 283, /* $@68 */ - YYSYMBOL_at_least_one_member = 284, /* at_least_one_member */ - YYSYMBOL_members = 285, /* members */ - YYSYMBOL_member = 286, /* member */ - YYSYMBOL_member_i = 287, /* member_i */ - YYSYMBOL_288_69 = 288, /* $@69 */ - YYSYMBOL_289_70 = 289, /* $@70 */ - YYSYMBOL_290_71 = 290, /* $@71 */ - YYSYMBOL_union_decl = 291, /* union_decl */ - YYSYMBOL_292_72 = 292, /* $@72 */ - YYSYMBOL_union_type = 293, /* union_type */ - YYSYMBOL_294_73 = 294, /* $@73 */ - YYSYMBOL_295_74 = 295, /* $@74 */ - YYSYMBOL_296_75 = 296, /* $@75 */ - YYSYMBOL_297_76 = 297, /* $@76 */ - YYSYMBOL_298_77 = 298, /* $@77 */ - YYSYMBOL_299_78 = 299, /* $@78 */ - YYSYMBOL_switch_type_spec = 300, /* switch_type_spec */ - YYSYMBOL_at_least_one_case_branch = 301, /* at_least_one_case_branch */ - YYSYMBOL_case_branches = 302, /* case_branches */ - YYSYMBOL_case_branch = 303, /* case_branch */ - YYSYMBOL_304_79 = 304, /* $@79 */ - YYSYMBOL_305_80 = 305, /* $@80 */ - YYSYMBOL_306_81 = 306, /* $@81 */ - YYSYMBOL_at_least_one_case_label = 307, /* at_least_one_case_label */ - YYSYMBOL_case_labels = 308, /* case_labels */ - YYSYMBOL_case_label = 309, /* case_label */ - YYSYMBOL_310_82 = 310, /* $@82 */ - YYSYMBOL_311_83 = 311, /* $@83 */ - YYSYMBOL_312_84 = 312, /* $@84 */ - YYSYMBOL_element_spec = 313, /* element_spec */ - YYSYMBOL_314_85 = 314, /* $@85 */ - YYSYMBOL_struct_forward_type = 315, /* struct_forward_type */ - YYSYMBOL_union_forward_type = 316, /* union_forward_type */ - YYSYMBOL_enum_type = 317, /* enum_type */ - YYSYMBOL_318_86 = 318, /* $@86 */ - YYSYMBOL_319_87 = 319, /* $@87 */ - YYSYMBOL_320_88 = 320, /* $@88 */ - YYSYMBOL_321_89 = 321, /* $@89 */ - YYSYMBOL_at_least_one_enumerator = 322, /* at_least_one_enumerator */ - YYSYMBOL_enumerators = 323, /* enumerators */ - YYSYMBOL_324_90 = 324, /* $@90 */ - YYSYMBOL_enumerator = 325, /* enumerator */ - YYSYMBOL_map_type_spec = 326, /* map_type_spec */ - YYSYMBOL_map_head = 327, /* map_head */ - YYSYMBOL_328_91 = 328, /* $@91 */ - YYSYMBOL_329_92 = 329, /* $@92 */ - YYSYMBOL_sequence_type_spec = 330, /* sequence_type_spec */ - YYSYMBOL_331_93 = 331, /* $@93 */ - YYSYMBOL_332_94 = 332, /* $@94 */ - YYSYMBOL_seq_head = 333, /* seq_head */ - YYSYMBOL_334_95 = 334, /* $@95 */ - YYSYMBOL_335_96 = 335, /* $@96 */ - YYSYMBOL_fixed_type_spec = 336, /* fixed_type_spec */ - YYSYMBOL_string_type_spec = 337, /* string_type_spec */ - YYSYMBOL_338_97 = 338, /* $@97 */ - YYSYMBOL_339_98 = 339, /* $@98 */ - YYSYMBOL_string_head = 340, /* string_head */ - YYSYMBOL_wstring_type_spec = 341, /* wstring_type_spec */ - YYSYMBOL_342_99 = 342, /* $@99 */ - YYSYMBOL_343_100 = 343, /* $@100 */ - YYSYMBOL_wstring_head = 344, /* wstring_head */ - YYSYMBOL_array_declarator = 345, /* array_declarator */ - YYSYMBOL_346_101 = 346, /* $@101 */ - YYSYMBOL_at_least_one_array_dim = 347, /* at_least_one_array_dim */ - YYSYMBOL_array_dims = 348, /* array_dims */ - YYSYMBOL_array_dim = 349, /* array_dim */ - YYSYMBOL_350_102 = 350, /* $@102 */ - YYSYMBOL_351_103 = 351, /* $@103 */ - YYSYMBOL_attribute = 352, /* attribute */ - YYSYMBOL_attribute_readonly = 353, /* attribute_readonly */ - YYSYMBOL_354_104 = 354, /* $@104 */ - YYSYMBOL_355_105 = 355, /* $@105 */ - YYSYMBOL_356_106 = 356, /* $@106 */ - YYSYMBOL_357_107 = 357, /* $@107 */ - YYSYMBOL_attribute_readwrite = 358, /* attribute_readwrite */ - YYSYMBOL_359_108 = 359, /* $@108 */ - YYSYMBOL_360_109 = 360, /* $@109 */ - YYSYMBOL_361_110 = 361, /* $@110 */ - YYSYMBOL_362_111 = 362, /* $@111 */ - YYSYMBOL_exception = 363, /* exception */ - YYSYMBOL_364_112 = 364, /* $@112 */ - YYSYMBOL_365_113 = 365, /* @113 */ - YYSYMBOL_366_114 = 366, /* $@114 */ - YYSYMBOL_367_115 = 367, /* $@115 */ - YYSYMBOL_operation = 368, /* operation */ - YYSYMBOL_369_116 = 369, /* $@116 */ - YYSYMBOL_370_117 = 370, /* $@117 */ - YYSYMBOL_371_118 = 371, /* $@118 */ - YYSYMBOL_372_119 = 372, /* $@119 */ - YYSYMBOL_opt_op_attribute = 373, /* opt_op_attribute */ - YYSYMBOL_op_type_spec = 374, /* op_type_spec */ - YYSYMBOL_init_decl = 375, /* init_decl */ - YYSYMBOL_376_120 = 376, /* $@120 */ - YYSYMBOL_377_121 = 377, /* @121 */ - YYSYMBOL_378_122 = 378, /* $@122 */ - YYSYMBOL_init_parameter_list = 379, /* init_parameter_list */ - YYSYMBOL_380_123 = 380, /* $@123 */ - YYSYMBOL_381_124 = 381, /* $@124 */ - YYSYMBOL_at_least_one_in_parameter = 382, /* at_least_one_in_parameter */ - YYSYMBOL_in_parameters = 383, /* in_parameters */ - YYSYMBOL_384_125 = 384, /* $@125 */ - YYSYMBOL_in_parameter = 385, /* in_parameter */ - YYSYMBOL_386_126 = 386, /* $@126 */ - YYSYMBOL_387_127 = 387, /* $@127 */ - YYSYMBOL_parameter_list = 388, /* parameter_list */ - YYSYMBOL_389_128 = 389, /* $@128 */ - YYSYMBOL_390_129 = 390, /* $@129 */ - YYSYMBOL_at_least_one_parameter = 391, /* at_least_one_parameter */ - YYSYMBOL_parameters = 392, /* parameters */ - YYSYMBOL_393_130 = 393, /* $@130 */ - YYSYMBOL_parameter = 394, /* parameter */ - YYSYMBOL_395_131 = 395, /* $@131 */ - YYSYMBOL_396_132 = 396, /* $@132 */ - YYSYMBOL_param_type_spec = 397, /* param_type_spec */ - YYSYMBOL_direction = 398, /* direction */ - YYSYMBOL_opt_raises = 399, /* opt_raises */ - YYSYMBOL_400_133 = 400, /* $@133 */ - YYSYMBOL_401_134 = 401, /* $@134 */ - YYSYMBOL_opt_getraises = 402, /* opt_getraises */ - YYSYMBOL_403_135 = 403, /* $@135 */ - YYSYMBOL_404_136 = 404, /* $@136 */ - YYSYMBOL_opt_setraises = 405, /* opt_setraises */ - YYSYMBOL_406_137 = 406, /* $@137 */ - YYSYMBOL_407_138 = 407, /* $@138 */ - YYSYMBOL_opt_context = 408, /* opt_context */ - YYSYMBOL_409_139 = 409, /* $@139 */ - YYSYMBOL_410_140 = 410, /* $@140 */ - YYSYMBOL_at_least_one_string_literal = 411, /* at_least_one_string_literal */ - YYSYMBOL_string_literals = 412, /* string_literals */ - YYSYMBOL_413_141 = 413, /* $@141 */ - YYSYMBOL_typeid_dcl = 414, /* typeid_dcl */ - YYSYMBOL_typeprefix_dcl = 415, /* typeprefix_dcl */ - YYSYMBOL_component = 416, /* component */ - YYSYMBOL_component_forward_decl = 417, /* component_forward_decl */ - YYSYMBOL_component_decl = 418, /* component_decl */ - YYSYMBOL_419_142 = 419, /* @142 */ - YYSYMBOL_420_143 = 420, /* $@143 */ - YYSYMBOL_421_144 = 421, /* $@144 */ - YYSYMBOL_component_header = 422, /* component_header */ - YYSYMBOL_423_145 = 423, /* $@145 */ - YYSYMBOL_424_146 = 424, /* $@146 */ - YYSYMBOL_component_inheritance_spec = 425, /* component_inheritance_spec */ - YYSYMBOL_426_147 = 426, /* $@147 */ - YYSYMBOL_component_exports = 427, /* component_exports */ - YYSYMBOL_component_export = 428, /* component_export */ - YYSYMBOL_429_148 = 429, /* $@148 */ - YYSYMBOL_430_149 = 430, /* $@149 */ - YYSYMBOL_431_150 = 431, /* $@150 */ - YYSYMBOL_432_151 = 432, /* $@151 */ - YYSYMBOL_433_152 = 433, /* $@152 */ - YYSYMBOL_434_153 = 434, /* $@153 */ - YYSYMBOL_435_154 = 435, /* $@154 */ - YYSYMBOL_provides_decl = 436, /* provides_decl */ - YYSYMBOL_interface_type = 437, /* interface_type */ - YYSYMBOL_uses_decl = 438, /* uses_decl */ - YYSYMBOL_uses_opt_multiple = 439, /* uses_opt_multiple */ - YYSYMBOL_opt_multiple = 440, /* opt_multiple */ - YYSYMBOL_emits_decl = 441, /* emits_decl */ - YYSYMBOL_publishes_decl = 442, /* publishes_decl */ - YYSYMBOL_consumes_decl = 443, /* consumes_decl */ - YYSYMBOL_home_decl = 444, /* home_decl */ - YYSYMBOL_445_155 = 445, /* $@155 */ - YYSYMBOL_home_header = 446, /* home_header */ - YYSYMBOL_447_156 = 447, /* $@156 */ - YYSYMBOL_448_157 = 448, /* $@157 */ - YYSYMBOL_449_158 = 449, /* $@158 */ - YYSYMBOL_450_159 = 450, /* $@159 */ - YYSYMBOL_451_160 = 451, /* $@160 */ - YYSYMBOL_452_161 = 452, /* $@161 */ - YYSYMBOL_home_inheritance_spec = 453, /* home_inheritance_spec */ - YYSYMBOL_454_162 = 454, /* $@162 */ - YYSYMBOL_primary_key_spec = 455, /* primary_key_spec */ - YYSYMBOL_home_body = 456, /* home_body */ - YYSYMBOL_457_163 = 457, /* $@163 */ - YYSYMBOL_458_164 = 458, /* $@164 */ - YYSYMBOL_home_exports = 459, /* home_exports */ - YYSYMBOL_home_export = 460, /* home_export */ - YYSYMBOL_461_165 = 461, /* $@165 */ - YYSYMBOL_462_166 = 462, /* $@166 */ - YYSYMBOL_factory_decl = 463, /* factory_decl */ - YYSYMBOL_464_167 = 464, /* $@167 */ - YYSYMBOL_465_168 = 465, /* $@168 */ - YYSYMBOL_finder_decl = 466, /* finder_decl */ - YYSYMBOL_467_169 = 467, /* $@169 */ - YYSYMBOL_468_170 = 468, /* $@170 */ - YYSYMBOL_event = 469, /* event */ - YYSYMBOL_event_forward_decl = 470, /* event_forward_decl */ - YYSYMBOL_event_concrete_forward_decl = 471, /* event_concrete_forward_decl */ - YYSYMBOL_event_abs_forward_decl = 472, /* event_abs_forward_decl */ - YYSYMBOL_event_abs_decl = 473, /* event_abs_decl */ - YYSYMBOL_474_171 = 474, /* $@171 */ - YYSYMBOL_475_172 = 475, /* $@172 */ - YYSYMBOL_476_173 = 476, /* $@173 */ - YYSYMBOL_event_abs_header = 477, /* event_abs_header */ - YYSYMBOL_event_custom_header = 478, /* event_custom_header */ - YYSYMBOL_event_plain_header = 479, /* event_plain_header */ - YYSYMBOL_event_rest_of_header = 480, /* event_rest_of_header */ - YYSYMBOL_481_174 = 481, /* $@174 */ - YYSYMBOL_event_decl = 482, /* event_decl */ - YYSYMBOL_483_175 = 483, /* @175 */ - YYSYMBOL_484_176 = 484, /* $@176 */ - YYSYMBOL_485_177 = 485, /* $@177 */ - YYSYMBOL_event_header = 486, /* event_header */ - YYSYMBOL_formal_parameter_type = 487, /* formal_parameter_type */ - YYSYMBOL_at_least_one_formal_parameter = 488, /* at_least_one_formal_parameter */ - YYSYMBOL_formal_parameters = 489, /* formal_parameters */ - YYSYMBOL_formal_parameter = 490, /* formal_parameter */ - YYSYMBOL_at_least_one_formal_parameter_name = 491, /* at_least_one_formal_parameter_name */ - YYSYMBOL_formal_parameter_names = 492, /* formal_parameter_names */ - YYSYMBOL_formal_parameter_name = 493, /* formal_parameter_name */ - YYSYMBOL_porttype_decl = 494, /* porttype_decl */ - YYSYMBOL_495_178 = 495, /* $@178 */ - YYSYMBOL_496_179 = 496, /* @179 */ - YYSYMBOL_497_180 = 497, /* $@180 */ - YYSYMBOL_498_181 = 498, /* $@181 */ - YYSYMBOL_at_least_one_port_export = 499, /* at_least_one_port_export */ - YYSYMBOL_port_exports = 500, /* port_exports */ - YYSYMBOL_port_export = 501, /* port_export */ - YYSYMBOL_502_182 = 502, /* $@182 */ - YYSYMBOL_extended_port_decl = 503, /* extended_port_decl */ - YYSYMBOL_at_least_one_actual_parameter = 504, /* at_least_one_actual_parameter */ - YYSYMBOL_actual_parameters = 505, /* actual_parameters */ - YYSYMBOL_actual_parameter = 506, /* actual_parameter */ - YYSYMBOL_connector_decl = 507, /* connector_decl */ - YYSYMBOL_connector_header = 508, /* connector_header */ - YYSYMBOL_509_183 = 509, /* $@183 */ - YYSYMBOL_510_184 = 510, /* $@184 */ - YYSYMBOL_connector_body = 511, /* connector_body */ - YYSYMBOL_512_185 = 512, /* $@185 */ - YYSYMBOL_513_186 = 513, /* $@186 */ - YYSYMBOL_connector_exports = 514, /* connector_exports */ - YYSYMBOL_connector_export = 515, /* connector_export */ - YYSYMBOL_516_187 = 516, /* $@187 */ - YYSYMBOL_517_188 = 517, /* $@188 */ - YYSYMBOL_518_189 = 518, /* $@189 */ - YYSYMBOL_519_190 = 519 /* $@190 */ + YYSYMBOL_struct_body = 283, /* struct_body */ + YYSYMBOL_struct_body_with_members = 284, /* struct_body_with_members */ + YYSYMBOL_285_68 = 285, /* $@68 */ + YYSYMBOL_members = 286, /* members */ + YYSYMBOL_member = 287, /* member */ + YYSYMBOL_member_i = 288, /* member_i */ + YYSYMBOL_289_69 = 289, /* $@69 */ + YYSYMBOL_290_70 = 290, /* $@70 */ + YYSYMBOL_291_71 = 291, /* $@71 */ + YYSYMBOL_union_decl = 292, /* union_decl */ + YYSYMBOL_293_72 = 293, /* $@72 */ + YYSYMBOL_union_type = 294, /* union_type */ + YYSYMBOL_295_73 = 295, /* $@73 */ + YYSYMBOL_296_74 = 296, /* $@74 */ + YYSYMBOL_297_75 = 297, /* $@75 */ + YYSYMBOL_298_76 = 298, /* $@76 */ + YYSYMBOL_299_77 = 299, /* $@77 */ + YYSYMBOL_300_78 = 300, /* $@78 */ + YYSYMBOL_switch_type_spec = 301, /* switch_type_spec */ + YYSYMBOL_at_least_one_case_branch = 302, /* at_least_one_case_branch */ + YYSYMBOL_case_branches = 303, /* case_branches */ + YYSYMBOL_case_branch = 304, /* case_branch */ + YYSYMBOL_305_79 = 305, /* $@79 */ + YYSYMBOL_306_80 = 306, /* $@80 */ + YYSYMBOL_307_81 = 307, /* $@81 */ + YYSYMBOL_at_least_one_case_label = 308, /* at_least_one_case_label */ + YYSYMBOL_case_labels = 309, /* case_labels */ + YYSYMBOL_case_label = 310, /* case_label */ + YYSYMBOL_311_82 = 311, /* $@82 */ + YYSYMBOL_312_83 = 312, /* $@83 */ + YYSYMBOL_313_84 = 313, /* $@84 */ + YYSYMBOL_element_spec = 314, /* element_spec */ + YYSYMBOL_315_85 = 315, /* $@85 */ + YYSYMBOL_struct_forward_type = 316, /* struct_forward_type */ + YYSYMBOL_union_forward_type = 317, /* union_forward_type */ + YYSYMBOL_enum_type = 318, /* enum_type */ + YYSYMBOL_319_86 = 319, /* $@86 */ + YYSYMBOL_320_87 = 320, /* $@87 */ + YYSYMBOL_321_88 = 321, /* $@88 */ + YYSYMBOL_322_89 = 322, /* $@89 */ + YYSYMBOL_at_least_one_enumerator = 323, /* at_least_one_enumerator */ + YYSYMBOL_enumerators = 324, /* enumerators */ + YYSYMBOL_325_90 = 325, /* $@90 */ + YYSYMBOL_enumerator = 326, /* enumerator */ + YYSYMBOL_map_type_spec = 327, /* map_type_spec */ + YYSYMBOL_map_head = 328, /* map_head */ + YYSYMBOL_329_91 = 329, /* $@91 */ + YYSYMBOL_330_92 = 330, /* $@92 */ + YYSYMBOL_sequence_type_spec = 331, /* sequence_type_spec */ + YYSYMBOL_332_93 = 332, /* $@93 */ + YYSYMBOL_333_94 = 333, /* $@94 */ + YYSYMBOL_seq_head = 334, /* seq_head */ + YYSYMBOL_335_95 = 335, /* $@95 */ + YYSYMBOL_336_96 = 336, /* $@96 */ + YYSYMBOL_fixed_type_spec = 337, /* fixed_type_spec */ + YYSYMBOL_string_type_spec = 338, /* string_type_spec */ + YYSYMBOL_339_97 = 339, /* $@97 */ + YYSYMBOL_340_98 = 340, /* $@98 */ + YYSYMBOL_string_head = 341, /* string_head */ + YYSYMBOL_wstring_type_spec = 342, /* wstring_type_spec */ + YYSYMBOL_343_99 = 343, /* $@99 */ + YYSYMBOL_344_100 = 344, /* $@100 */ + YYSYMBOL_wstring_head = 345, /* wstring_head */ + YYSYMBOL_array_declarator = 346, /* array_declarator */ + YYSYMBOL_347_101 = 347, /* $@101 */ + YYSYMBOL_at_least_one_array_dim = 348, /* at_least_one_array_dim */ + YYSYMBOL_array_dims = 349, /* array_dims */ + YYSYMBOL_array_dim = 350, /* array_dim */ + YYSYMBOL_351_102 = 351, /* $@102 */ + YYSYMBOL_352_103 = 352, /* $@103 */ + YYSYMBOL_attribute = 353, /* attribute */ + YYSYMBOL_attribute_readonly = 354, /* attribute_readonly */ + YYSYMBOL_355_104 = 355, /* $@104 */ + YYSYMBOL_356_105 = 356, /* $@105 */ + YYSYMBOL_357_106 = 357, /* $@106 */ + YYSYMBOL_358_107 = 358, /* $@107 */ + YYSYMBOL_attribute_readwrite = 359, /* attribute_readwrite */ + YYSYMBOL_360_108 = 360, /* $@108 */ + YYSYMBOL_361_109 = 361, /* $@109 */ + YYSYMBOL_362_110 = 362, /* $@110 */ + YYSYMBOL_363_111 = 363, /* $@111 */ + YYSYMBOL_exception = 364, /* exception */ + YYSYMBOL_365_112 = 365, /* $@112 */ + YYSYMBOL_366_113 = 366, /* @113 */ + YYSYMBOL_367_114 = 367, /* $@114 */ + YYSYMBOL_368_115 = 368, /* $@115 */ + YYSYMBOL_operation = 369, /* operation */ + YYSYMBOL_370_116 = 370, /* $@116 */ + YYSYMBOL_371_117 = 371, /* $@117 */ + YYSYMBOL_372_118 = 372, /* $@118 */ + YYSYMBOL_373_119 = 373, /* $@119 */ + YYSYMBOL_opt_op_attribute = 374, /* opt_op_attribute */ + YYSYMBOL_op_type_spec = 375, /* op_type_spec */ + YYSYMBOL_init_decl = 376, /* init_decl */ + YYSYMBOL_377_120 = 377, /* $@120 */ + YYSYMBOL_378_121 = 378, /* @121 */ + YYSYMBOL_379_122 = 379, /* $@122 */ + YYSYMBOL_init_parameter_list = 380, /* init_parameter_list */ + YYSYMBOL_381_123 = 381, /* $@123 */ + YYSYMBOL_382_124 = 382, /* $@124 */ + YYSYMBOL_at_least_one_in_parameter = 383, /* at_least_one_in_parameter */ + YYSYMBOL_in_parameters = 384, /* in_parameters */ + YYSYMBOL_385_125 = 385, /* $@125 */ + YYSYMBOL_in_parameter = 386, /* in_parameter */ + YYSYMBOL_387_126 = 387, /* $@126 */ + YYSYMBOL_388_127 = 388, /* $@127 */ + YYSYMBOL_parameter_list = 389, /* parameter_list */ + YYSYMBOL_390_128 = 390, /* $@128 */ + YYSYMBOL_391_129 = 391, /* $@129 */ + YYSYMBOL_at_least_one_parameter = 392, /* at_least_one_parameter */ + YYSYMBOL_parameters = 393, /* parameters */ + YYSYMBOL_394_130 = 394, /* $@130 */ + YYSYMBOL_parameter = 395, /* parameter */ + YYSYMBOL_396_131 = 396, /* $@131 */ + YYSYMBOL_397_132 = 397, /* $@132 */ + YYSYMBOL_param_type_spec = 398, /* param_type_spec */ + YYSYMBOL_direction = 399, /* direction */ + YYSYMBOL_opt_raises = 400, /* opt_raises */ + YYSYMBOL_401_133 = 401, /* $@133 */ + YYSYMBOL_402_134 = 402, /* $@134 */ + YYSYMBOL_opt_getraises = 403, /* opt_getraises */ + YYSYMBOL_404_135 = 404, /* $@135 */ + YYSYMBOL_405_136 = 405, /* $@136 */ + YYSYMBOL_opt_setraises = 406, /* opt_setraises */ + YYSYMBOL_407_137 = 407, /* $@137 */ + YYSYMBOL_408_138 = 408, /* $@138 */ + YYSYMBOL_opt_context = 409, /* opt_context */ + YYSYMBOL_410_139 = 410, /* $@139 */ + YYSYMBOL_411_140 = 411, /* $@140 */ + YYSYMBOL_at_least_one_string_literal = 412, /* at_least_one_string_literal */ + YYSYMBOL_string_literals = 413, /* string_literals */ + YYSYMBOL_414_141 = 414, /* $@141 */ + YYSYMBOL_typeid_dcl = 415, /* typeid_dcl */ + YYSYMBOL_typeprefix_dcl = 416, /* typeprefix_dcl */ + YYSYMBOL_component = 417, /* component */ + YYSYMBOL_component_forward_decl = 418, /* component_forward_decl */ + YYSYMBOL_component_decl = 419, /* component_decl */ + YYSYMBOL_420_142 = 420, /* @142 */ + YYSYMBOL_421_143 = 421, /* $@143 */ + YYSYMBOL_422_144 = 422, /* $@144 */ + YYSYMBOL_component_header = 423, /* component_header */ + YYSYMBOL_424_145 = 424, /* $@145 */ + YYSYMBOL_425_146 = 425, /* $@146 */ + YYSYMBOL_component_inheritance_spec = 426, /* component_inheritance_spec */ + YYSYMBOL_427_147 = 427, /* $@147 */ + YYSYMBOL_component_exports = 428, /* component_exports */ + YYSYMBOL_component_export = 429, /* component_export */ + YYSYMBOL_430_148 = 430, /* $@148 */ + YYSYMBOL_431_149 = 431, /* $@149 */ + YYSYMBOL_432_150 = 432, /* $@150 */ + YYSYMBOL_433_151 = 433, /* $@151 */ + YYSYMBOL_434_152 = 434, /* $@152 */ + YYSYMBOL_435_153 = 435, /* $@153 */ + YYSYMBOL_436_154 = 436, /* $@154 */ + YYSYMBOL_provides_decl = 437, /* provides_decl */ + YYSYMBOL_interface_type = 438, /* interface_type */ + YYSYMBOL_uses_decl = 439, /* uses_decl */ + YYSYMBOL_uses_opt_multiple = 440, /* uses_opt_multiple */ + YYSYMBOL_opt_multiple = 441, /* opt_multiple */ + YYSYMBOL_emits_decl = 442, /* emits_decl */ + YYSYMBOL_publishes_decl = 443, /* publishes_decl */ + YYSYMBOL_consumes_decl = 444, /* consumes_decl */ + YYSYMBOL_home_decl = 445, /* home_decl */ + YYSYMBOL_446_155 = 446, /* $@155 */ + YYSYMBOL_home_header = 447, /* home_header */ + YYSYMBOL_448_156 = 448, /* $@156 */ + YYSYMBOL_449_157 = 449, /* $@157 */ + YYSYMBOL_450_158 = 450, /* $@158 */ + YYSYMBOL_451_159 = 451, /* $@159 */ + YYSYMBOL_452_160 = 452, /* $@160 */ + YYSYMBOL_453_161 = 453, /* $@161 */ + YYSYMBOL_home_inheritance_spec = 454, /* home_inheritance_spec */ + YYSYMBOL_455_162 = 455, /* $@162 */ + YYSYMBOL_primary_key_spec = 456, /* primary_key_spec */ + YYSYMBOL_home_body = 457, /* home_body */ + YYSYMBOL_458_163 = 458, /* $@163 */ + YYSYMBOL_459_164 = 459, /* $@164 */ + YYSYMBOL_home_exports = 460, /* home_exports */ + YYSYMBOL_home_export = 461, /* home_export */ + YYSYMBOL_462_165 = 462, /* $@165 */ + YYSYMBOL_463_166 = 463, /* $@166 */ + YYSYMBOL_factory_decl = 464, /* factory_decl */ + YYSYMBOL_465_167 = 465, /* $@167 */ + YYSYMBOL_466_168 = 466, /* $@168 */ + YYSYMBOL_finder_decl = 467, /* finder_decl */ + YYSYMBOL_468_169 = 468, /* $@169 */ + YYSYMBOL_469_170 = 469, /* $@170 */ + YYSYMBOL_event = 470, /* event */ + YYSYMBOL_event_forward_decl = 471, /* event_forward_decl */ + YYSYMBOL_event_concrete_forward_decl = 472, /* event_concrete_forward_decl */ + YYSYMBOL_event_abs_forward_decl = 473, /* event_abs_forward_decl */ + YYSYMBOL_event_abs_decl = 474, /* event_abs_decl */ + YYSYMBOL_475_171 = 475, /* $@171 */ + YYSYMBOL_476_172 = 476, /* $@172 */ + YYSYMBOL_477_173 = 477, /* $@173 */ + YYSYMBOL_event_abs_header = 478, /* event_abs_header */ + YYSYMBOL_event_custom_header = 479, /* event_custom_header */ + YYSYMBOL_event_plain_header = 480, /* event_plain_header */ + YYSYMBOL_event_rest_of_header = 481, /* event_rest_of_header */ + YYSYMBOL_482_174 = 482, /* $@174 */ + YYSYMBOL_event_decl = 483, /* event_decl */ + YYSYMBOL_484_175 = 484, /* @175 */ + YYSYMBOL_485_176 = 485, /* $@176 */ + YYSYMBOL_486_177 = 486, /* $@177 */ + YYSYMBOL_event_header = 487, /* event_header */ + YYSYMBOL_formal_parameter_type = 488, /* formal_parameter_type */ + YYSYMBOL_at_least_one_formal_parameter = 489, /* at_least_one_formal_parameter */ + YYSYMBOL_formal_parameters = 490, /* formal_parameters */ + YYSYMBOL_formal_parameter = 491, /* formal_parameter */ + YYSYMBOL_at_least_one_formal_parameter_name = 492, /* at_least_one_formal_parameter_name */ + YYSYMBOL_formal_parameter_names = 493, /* formal_parameter_names */ + YYSYMBOL_formal_parameter_name = 494, /* formal_parameter_name */ + YYSYMBOL_porttype_decl = 495, /* porttype_decl */ + YYSYMBOL_496_178 = 496, /* $@178 */ + YYSYMBOL_497_179 = 497, /* @179 */ + YYSYMBOL_498_180 = 498, /* $@180 */ + YYSYMBOL_499_181 = 499, /* $@181 */ + YYSYMBOL_at_least_one_port_export = 500, /* at_least_one_port_export */ + YYSYMBOL_port_exports = 501, /* port_exports */ + YYSYMBOL_port_export = 502, /* port_export */ + YYSYMBOL_503_182 = 503, /* $@182 */ + YYSYMBOL_extended_port_decl = 504, /* extended_port_decl */ + YYSYMBOL_at_least_one_actual_parameter = 505, /* at_least_one_actual_parameter */ + YYSYMBOL_actual_parameters = 506, /* actual_parameters */ + YYSYMBOL_actual_parameter = 507, /* actual_parameter */ + YYSYMBOL_connector_decl = 508, /* connector_decl */ + YYSYMBOL_connector_header = 509, /* connector_header */ + YYSYMBOL_510_183 = 510, /* $@183 */ + YYSYMBOL_511_184 = 511, /* $@184 */ + YYSYMBOL_connector_body = 512, /* connector_body */ + YYSYMBOL_513_185 = 513, /* $@185 */ + YYSYMBOL_514_186 = 514, /* $@186 */ + YYSYMBOL_connector_exports = 515, /* connector_exports */ + YYSYMBOL_connector_export = 516, /* connector_export */ + YYSYMBOL_517_187 = 517, /* $@187 */ + YYSYMBOL_518_188 = 518, /* $@188 */ + YYSYMBOL_519_189 = 519, /* $@189 */ + YYSYMBOL_520_190 = 520 /* $@190 */ }; typedef enum yysymbol_kind_t yysymbol_kind_t; @@ -753,6 +754,18 @@ typedef int_least16_t yytype_int16; typedef short yytype_int16; #endif +/* Work around bug in HP-UX 11.23, which defines these macros + incorrectly for preprocessor constants. This workaround can likely + be removed in 2023, as HPE has promised support for HP-UX 11.23 + (aka HP-UX 11i v2) only through the end of 2022; see Table 2 of + . */ +#ifdef __hpux +# undef UINT_LEAST8_MAX +# undef UINT_LEAST16_MAX +# define UINT_LEAST8_MAX 255 +# define UINT_LEAST16_MAX 65535 +#endif + #if defined __UINT_LEAST8_MAX__ && __UINT_LEAST8_MAX__ <= __INT_MAX__ typedef __UINT_LEAST8_TYPE__ yytype_uint8; #elif (!defined __UINT_LEAST8_MAX__ && defined YY_STDINT_H \ @@ -1025,16 +1038,16 @@ union yyalloc /* YYFINAL -- State number of the termination state. */ #define YYFINAL 4 /* YYLAST -- Last index in YYTABLE. */ -#define YYLAST 2130 +#define YYLAST 2253 /* YYNTOKENS -- Number of terminals. */ #define YYNTOKENS 118 /* YYNNTS -- Number of nonterminals. */ -#define YYNNTS 402 +#define YYNNTS 403 /* YYNRULES -- Number of rules. */ -#define YYNRULES 613 +#define YYNRULES 616 /* YYNSTATES -- Number of states. */ -#define YYNSTATES 901 +#define YYNSTATES 903 /* YYMAXUTOK -- Last valid token kind. */ #define YYMAXUTOK 351 @@ -1112,49 +1125,49 @@ static const yytype_int16 yyrline[] = 1964, 2032, 2034, 2036, 2037, 2049, 2050, 2062, 2063, 2075, 2076, 2085, 2097, 2098, 2107, 2119, 2120, 2129, 2138, 2150, 2151, 2160, 2169, 2181, 2238, 2239, 2246, 2250, 2255, 2262, - 2269, 2273, 2278, 2282, 2286, 2290, 2297, 2366, 2365, 2394, - 2395, 2399, 2400, 2401, 2403, 2402, 2411, 2412, 2416, 2472, - 2476, 2483, 2496, 2506, 2514, 2513, 2601, 2605, 2612, 2621, - 2628, 2636, 2642, 2649, 2662, 2661, 2670, 2674, 2678, 2682, - 2710, 2718, 2717, 2788, 2789, 2793, 2800, 2801, 2827, 2828, - 2829, 2830, 2831, 2832, 2833, 2834, 2838, 2839, 2840, 2841, - 2842, 2846, 2847, 2848, 2852, 2853, 2857, 2869, 2867, 2892, - 2899, 2900, 2904, 2916, 2914, 2939, 2946, 2962, 2980, 2981, - 2985, 2989, 2993, 2997, 3001, 3005, 3009, 3016, 3020, 3024, - 3028, 3032, 3036, 3040, 3047, 3051, 3055, 3062, 3069, 3073, - 3080, 3087, 3094, 3101, 3109, 3108, 3122, 3153, 3157, 3121, - 3174, 3177, 3178, 3182, 3200, 3204, 3199, 3262, 3261, 3274, - 3273, 3286, 3290, 3323, 3327, 3386, 3390, 3285, 3412, 3419, - 3432, 3441, 3448, 3449, 3558, 3561, 3562, 3567, 3571, 3566, - 3607, 3606, 3618, 3628, 3646, 3654, 3653, 3667, 3671, 3666, - 3687, 3686, 3736, 3761, 3785, 3789, 3820, 3824, 3784, 3848, - 3853, 3851, 3857, 3861, 3899, 3963, 3973, 3962, 3998, 4002, - 3996, 4086, 4153, 4162, 4152, 4176, 4186, 4190, 4184, 4232, - 4258, 4267, 4271, 4265, 4313, 4339, 4347, 4346, 4389, 4399, - 4417, 4425, 4429, 4424, 4489, 4490, 4495, 4499, 4503, 4507, - 4494, 4566, 4570, 4574, 4578, 4565, 4646, 4650, 4682, 4686, - 4645, 4703, 4707, 4768, 4772, 4702, 4809, 4814, 4819, 4826, - 4827, 4838, 4843, 4886, 4837, 4908, 4907, 4916, 4915, 4926, - 4931, 4929, 4935, 4940, 4944, 4939, 4983, 4982, 4991, 4990, - 5001, 5006, 5004, 5010, 5015, 5019, 5014, 5064, 5071, 5072, - 5073, 5228, 5232, 5236, 5244, 5248, 5243, 5257, 5265, 5269, - 5264, 5278, 5286, 5290, 5285, 5299, 5307, 5311, 5306, 5320, - 5327, 5339, 5337, 5360, 5367, 5397, 5436, 5437, 5441, 5472, - 5514, 5518, 5471, 5537, 5541, 5535, 5582, 5581, 5589, 5596, - 5611, 5612, 5617, 5616, 5626, 5625, 5635, 5634, 5644, 5643, - 5653, 5652, 5662, 5661, 5671, 5670, 5681, 5774, 5780, 5805, - 5912, 5921, 5925, 5932, 6007, 6079, 6155, 6154, 6204, 6208, - 6212, 6216, 6220, 6224, 6203, 6277, 6276, 6284, 6291, 6296, - 6304, 6308, 6303, 6318, 6319, 6323, 6325, 6324, 6333, 6332, - 6345, 6368, 6343, 6394, 6421, 6392, 6445, 6446, 6447, 6451, - 6452, 6456, 6485, 6517, 6561, 6565, 6515, 6582, 6591, 6609, - 6620, 6619, 6657, 6708, 6712, 6655, 6729, 6733, 6740, 6744, - 6748, 6752, 6756, 6760, 6764, 6768, 6772, 6776, 6780, 6788, - 6819, 6832, 6839, 6864, 6882, 6889, 6904, 6911, 6921, 6925, - 6944, 6952, 6920, 6967, 6982, 6986, 6987, 6991, 6992, 6994, - 6993, 7004, 7071, 7119, 7135, 7148, 7155, 7214, 7222, 7226, - 7221, 7287, 7291, 7286, 7304, 7305, 7310, 7309, 7318, 7317, - 7326, 7325, 7334, 7333 + 2269, 2273, 2278, 2282, 2286, 2290, 2297, 2366, 2365, 2392, + 2393, 2397, 2398, 2399, 2401, 2400, 2409, 2410, 2414, 2470, + 2474, 2481, 2494, 2504, 2512, 2511, 2597, 2601, 2608, 2617, + 2621, 2628, 2636, 2642, 2649, 2662, 2661, 2670, 2674, 2678, + 2682, 2710, 2718, 2717, 2788, 2789, 2793, 2800, 2801, 2827, + 2828, 2829, 2830, 2831, 2832, 2833, 2834, 2838, 2839, 2840, + 2841, 2842, 2846, 2847, 2848, 2852, 2853, 2857, 2869, 2867, + 2892, 2899, 2900, 2904, 2916, 2914, 2939, 2946, 2962, 2980, + 2981, 2985, 2989, 2993, 2997, 3001, 3005, 3009, 3016, 3020, + 3024, 3028, 3032, 3036, 3040, 3047, 3051, 3055, 3062, 3069, + 3073, 3080, 3087, 3094, 3101, 3109, 3108, 3122, 3153, 3121, + 3169, 3177, 3182, 3181, 3192, 3193, 3197, 3215, 3219, 3214, + 3277, 3276, 3289, 3288, 3301, 3305, 3338, 3342, 3401, 3405, + 3300, 3427, 3431, 3439, 3447, 3451, 3452, 3561, 3564, 3565, + 3570, 3574, 3569, 3610, 3609, 3621, 3631, 3649, 3657, 3656, + 3670, 3674, 3669, 3690, 3689, 3739, 3764, 3788, 3792, 3823, + 3827, 3787, 3851, 3856, 3854, 3860, 3864, 3902, 3966, 3976, + 3965, 4001, 4005, 3999, 4089, 4156, 4165, 4155, 4179, 4189, + 4193, 4187, 4235, 4261, 4270, 4274, 4268, 4316, 4342, 4350, + 4349, 4392, 4402, 4420, 4428, 4432, 4427, 4492, 4493, 4498, + 4502, 4506, 4510, 4497, 4569, 4573, 4577, 4581, 4568, 4649, + 4653, 4685, 4689, 4648, 4706, 4710, 4771, 4775, 4705, 4812, + 4817, 4822, 4829, 4830, 4841, 4846, 4889, 4840, 4911, 4910, + 4919, 4918, 4929, 4934, 4932, 4938, 4943, 4947, 4942, 4986, + 4985, 4994, 4993, 5004, 5009, 5007, 5013, 5018, 5022, 5017, + 5067, 5074, 5075, 5076, 5231, 5235, 5239, 5247, 5251, 5246, + 5260, 5268, 5272, 5267, 5281, 5289, 5293, 5288, 5302, 5310, + 5314, 5309, 5323, 5330, 5342, 5340, 5363, 5370, 5400, 5439, + 5440, 5444, 5475, 5517, 5521, 5474, 5540, 5544, 5538, 5585, + 5584, 5592, 5599, 5614, 5615, 5620, 5619, 5629, 5628, 5638, + 5637, 5647, 5646, 5656, 5655, 5665, 5664, 5674, 5673, 5684, + 5777, 5783, 5808, 5915, 5924, 5928, 5935, 6010, 6082, 6158, + 6157, 6207, 6211, 6215, 6219, 6223, 6227, 6206, 6280, 6279, + 6287, 6294, 6299, 6307, 6311, 6306, 6321, 6322, 6326, 6328, + 6327, 6336, 6335, 6348, 6371, 6346, 6397, 6424, 6395, 6448, + 6449, 6450, 6454, 6455, 6459, 6488, 6520, 6564, 6568, 6518, + 6585, 6594, 6612, 6623, 6622, 6660, 6711, 6715, 6658, 6732, + 6736, 6743, 6747, 6751, 6755, 6759, 6763, 6767, 6771, 6775, + 6779, 6783, 6791, 6822, 6835, 6842, 6867, 6885, 6892, 6907, + 6914, 6924, 6928, 6947, 6955, 6923, 6970, 6985, 6989, 6990, + 6994, 6995, 6997, 6996, 7007, 7074, 7122, 7138, 7151, 7158, + 7217, 7225, 7229, 7224, 7290, 7294, 7289, 7307, 7308, 7313, + 7312, 7321, 7320, 7329, 7328, 7337, 7336 }; #endif @@ -1230,9 +1243,9 @@ static const char *const yytname[] = "integer_type", "signed_int", "unsigned_int", "floating_pt_type", "fixed_type", "char_type", "octet_type", "boolean_type", "any_type", "object_type", "struct_decl", "$@65", "struct_type", "$@66", "$@67", - "$@68", "at_least_one_member", "members", "member", "member_i", "$@69", - "$@70", "$@71", "union_decl", "$@72", "union_type", "$@73", "$@74", - "$@75", "$@76", "$@77", "$@78", "switch_type_spec", + "struct_body", "struct_body_with_members", "$@68", "members", "member", + "member_i", "$@69", "$@70", "$@71", "union_decl", "$@72", "union_type", + "$@73", "$@74", "$@75", "$@76", "$@77", "$@78", "switch_type_spec", "at_least_one_case_branch", "case_branches", "case_branch", "$@79", "$@80", "$@81", "at_least_one_case_label", "case_labels", "case_label", "$@82", "$@83", "$@84", "element_spec", "$@85", "struct_forward_type", @@ -1288,12 +1301,12 @@ yysymbol_name (yysymbol_kind_t yysymbol) } #endif -#define YYPACT_NINF (-679) +#define YYPACT_NINF (-695) #define yypact_value_is_default(Yyn) \ ((Yyn) == YYPACT_NINF) -#define YYTABLE_NINF (-582) +#define YYTABLE_NINF (-585) #define yytable_value_is_error(Yyn) \ 0 @@ -1302,97 +1315,97 @@ yysymbol_name (yysymbol_kind_t yysymbol) STATE-NUM. */ static const yytype_int16 yypact[] = { - -679, 94, 1414, -679, -679, -679, -679, -679, -679, -679, - -679, -679, -679, -679, 83, 51, 70, 106, -679, 83, - 83, -679, 57, 57, -679, -679, 83, -679, -679, 15, - -679, 577, 29, 69, -679, -679, 7, -679, -679, -679, - -679, -679, -679, 550, -679, -679, -679, -679, -679, 1616, - 21, -679, -679, 78, -679, 126, -679, -679, -679, -679, - -679, -679, -679, -679, -679, -679, -679, -679, -679, -679, - -679, -679, -679, -679, 60, -679, -679, -679, 60, -679, - -679, 87, 91, 2010, 57, 83, 1887, 83, 83, 83, - 83, -679, -679, -679, 10, 83, 25, -679, 76, 83, - -679, 60, 83, 97, 127, 83, -679, -679, 23, -679, - 26, 148, -679, 92, -679, 129, 138, 2062, -679, -679, - -679, 155, 196, -679, 156, 158, 159, 85, -679, 150, - -679, -679, -679, -679, -679, -679, 168, -679, -679, -679, - -679, -679, -679, -679, -679, -679, -679, -679, -679, -679, - -679, -679, 163, -679, -679, -679, -679, -679, -679, -679, - -679, -679, -679, -679, -679, -679, -679, -679, -679, -679, - 126, -679, -679, -679, 157, -679, 5, -679, -679, 169, - -679, 172, 176, 177, -679, 57, 160, 178, 180, -679, - 184, 188, 189, 190, 191, 193, 194, 199, -679, -679, - -679, 200, 204, -679, -679, -679, -679, 163, -679, -679, - -679, -679, -679, -679, -679, -679, -679, 163, -679, -679, - -679, -679, -679, -679, -679, -679, 205, -679, 195, -679, - -679, 207, -679, 288, -679, -679, -679, -679, 44, -679, - -679, -679, 2010, -679, -679, -679, -679, 198, -679, -679, - -679, -679, -679, 300, -679, -679, 56, 210, -679, -679, - -679, -679, -679, -679, -679, -679, 298, -679, 186, 212, - 216, 271, -679, -679, -679, -679, -679, -679, -679, 163, - -679, -679, 211, -679, -679, -679, -679, -679, -679, -679, - -679, -679, 271, 228, 242, -679, -679, -679, 83, 83, - 250, 251, -679, -679, -679, 253, -679, 288, 254, -679, - -679, -679, -679, -679, 350, -679, 257, 256, -679, -679, - -679, -679, -679, -679, -679, -679, -679, -679, 135, 135, - 135, 186, 163, -679, -679, 249, 255, 259, 89, 93, - 86, -679, -679, -679, -679, -679, 57, -679, -679, -679, - -679, 264, -679, -679, 57, -679, 186, 186, 186, 246, - -679, -679, -679, -679, -679, -679, -679, 173, -679, -6, - -679, -679, -679, -679, -679, -679, -679, -679, 57, 271, - -679, -679, -679, -679, 207, 1342, 1529, 269, 268, -679, - 2062, -679, -679, -679, 258, 186, 186, 186, 186, 186, - 186, 186, 186, 186, 186, 267, 83, -679, 163, 1119, - -679, 838, 186, -679, 1435, -679, -679, -679, -679, 186, - -679, 1479, -679, -679, -679, 252, 1026, -679, -679, -679, - -679, 53, 312, 57, 57, -679, -679, -679, -679, -679, - 53, -679, 273, -679, 272, -679, 275, -679, -679, 1213, - 163, -679, 57, 271, -679, -679, -679, -679, 278, -679, - -679, 83, -679, -679, 282, 283, 382, 289, -679, -679, - 255, 259, 89, 93, 93, 86, 86, -679, -679, -679, - -679, -679, 285, -679, -679, -679, 287, -679, -679, 1799, - -679, -679, -679, -679, 1922, -679, -679, -679, -679, -679, - 292, -679, 1834, -679, -679, 1709, -679, 293, 1435, -679, - 299, 304, 306, 297, -679, 301, -679, 290, -679, -679, - -679, 314, 315, 503, 57, 57, 57, 276, -679, 316, - -679, -679, -679, -679, -679, -679, -679, 83, 83, -679, - 318, -679, -679, -679, 1307, 932, 388, 1975, -679, 163, - 288, -679, -679, 65, 67, 324, 328, 330, 288, 331, - -679, -679, -5, -679, 49, -679, -679, 332, 333, 163, - -679, 337, 110, 1887, -679, 399, -679, -679, -679, -679, - 56, -679, 341, -679, 344, -679, 345, 346, 347, 348, - -679, 163, -679, -679, -679, -679, -679, 349, 352, 444, - -679, -679, -679, 353, -679, -679, 351, -679, -679, -679, - 186, -679, 288, -679, 355, 83, -679, -679, 445, 163, - -679, -679, -679, -679, -679, -679, 71, 71, 71, -679, - 358, -679, 359, 360, 362, 363, 366, 369, -679, -679, - -679, 370, 371, 376, 377, -679, -679, -679, -679, -679, - -679, -679, -679, -679, -679, 186, -679, -679, -679, 83, - -679, 379, 378, 384, -679, 402, 386, 110, -679, 390, - 391, -679, 392, 186, 393, 1591, -679, 57, -679, -679, - -679, -679, -679, -679, 488, -679, -679, -679, -679, -679, - -679, 297, 290, -679, -679, 380, -679, -679, -679, -679, - -679, -679, -679, -679, -679, -679, 383, 383, -679, -679, - -679, -679, 1975, 83, -679, 186, 389, -679, -679, -679, - -679, -679, -679, -679, 395, -679, -679, -679, -679, -679, - 57, -679, -679, -679, -679, 396, 163, -679, 383, 1435, - -679, 397, -679, 460, -679, -679, -679, -679, -679, -679, - -679, -679, 57, -679, 163, 400, 668, -679, 394, -679, - -679, -679, 409, 385, 462, 470, 470, 83, 454, 417, - 404, -679, 163, 422, -679, -679, 408, -679, 470, -679, - -679, -679, 414, -679, -679, -679, -679, -679, -679, -679, - -679, -679, 464, 527, 416, 170, 470, -679, 153, 1975, - -679, 431, 423, 470, 424, 476, 83, 57, -679, -679, - 439, -679, -679, -679, -679, -679, 427, -679, -679, -679, - -679, -679, -679, -679, -679, -679, -679, -679, -679, -679, - -679, -679, -679, -679, -679, 163, -679, 440, -679, 441, - 1975, 506, 450, 186, 446, 451, 54, -679, 201, 83, - 462, 57, 57, 435, 83, 527, -679, -679, -679, -679, - -679, -679, -679, -679, -679, 1681, -679, -679, -679, 437, - 457, -679, -679, -679, 170, 83, 442, 452, -679, -679, - -679, -679, 57, -679, -679, -679, -679, 83, 458, 463, - 504, -679, -679, -679, -679, 467, 491, -679, -679, 519, - -679 + -695, 87, 1480, -695, -695, -695, -695, -695, -695, -695, + -695, -695, -695, -695, 100, 62, 59, 92, -695, 100, + 100, -695, 48, 48, -695, -695, 100, -695, -695, 14, + -695, 235, 28, 51, -695, -695, 27, -695, -695, -695, + -695, -695, -695, 663, -695, -695, -695, -695, -695, 1682, + 56, -695, -695, 61, -695, 97, -695, -695, -695, -695, + -695, -695, -695, -695, -695, -695, -695, -695, -695, -695, + -695, -695, -695, -695, 42, -695, -695, -695, 42, -695, + -695, 64, 72, 2163, 48, 100, 2040, 100, 100, 100, + 100, -695, -695, -695, 68, 100, 69, -695, 78, 100, + -695, 42, 100, 81, 95, 100, -695, -695, 15, -695, + 30, 151, -695, 89, -695, 96, 99, 473, -695, -695, + -695, 101, 154, -695, 142, 147, 152, 104, -695, 85, + -695, -695, -695, -695, -695, -695, 149, -695, -695, -695, + -695, -695, -695, -695, -695, -695, -695, -695, -695, -695, + -695, -695, 161, -695, -695, -695, -695, -695, -695, -695, + -695, -695, -695, -695, -695, -695, -695, -695, -695, -695, + 97, -695, -695, -695, 153, -695, -1, -695, -695, 157, + -695, 162, 155, 156, -695, 48, 168, 169, 167, -695, + 170, 172, 177, 178, 180, 182, 183, 185, -695, -695, + -695, 186, 187, -695, -695, -695, -695, 161, -695, -695, + -695, -695, -695, -695, -695, -695, -695, 161, -695, -695, + -695, -695, -695, -695, -695, -695, 190, -695, 192, -695, + -695, 166, -695, 273, -695, -695, -695, -695, 44, -695, + -695, -695, 2163, -695, -695, -695, -695, 191, -695, -695, + -695, -695, -695, 277, -695, -695, 481, 193, -695, -695, + -695, -695, -695, -695, -695, -695, 287, -695, 506, 196, + 197, 250, -695, -695, -695, -695, -695, -695, -695, 161, + -695, -695, 194, -695, -695, -695, -695, -695, -695, -695, + -695, -695, 250, 201, 202, -695, -695, -695, 100, 100, + 207, 209, -695, -695, -695, 210, -695, 273, 213, -695, + -695, -695, -695, -695, 301, -695, 212, 211, -695, -695, + -695, -695, -695, -695, -695, -695, -695, -695, 133, 133, + 133, 506, 161, -695, -695, 216, 217, 215, 93, 110, + 71, -695, -695, -695, -695, -695, 48, -695, -695, -695, + -695, 222, -695, -695, 48, -695, 506, 506, 506, 204, + 227, -695, -695, -695, -695, -695, -695, 136, -695, -15, + -695, -695, -695, -695, -695, -695, -695, -695, 48, 250, + -695, -695, -695, -695, 166, 1430, 1595, 229, 230, -695, + 473, -695, -695, -695, 223, 506, 506, 506, 506, 506, + 506, 506, 506, 506, 506, 234, 100, -695, 161, 1121, + -695, 840, 506, -695, 1772, -695, -695, -695, -695, 506, + -695, -695, 1545, -695, -695, -695, -695, 65, 1028, -695, + -695, -695, -695, 40, 280, 48, 48, -695, -695, -695, + -695, -695, 40, -695, 243, -695, 241, -695, 244, -695, + -695, 1215, 161, -695, 48, 250, -695, -695, -695, -695, + 249, -695, -695, 100, -695, -695, 252, 251, 348, 254, + -695, -695, 217, 215, 93, 110, 110, 71, 71, -695, + -695, -695, -695, -695, 255, -695, -695, -695, 256, -695, + -695, 1952, -695, -695, -695, -695, 2075, -695, -695, -695, + -695, -695, 258, -695, 1987, -695, -695, 1862, -695, 260, + 1772, -695, 261, 264, 266, 265, -695, 238, -695, 267, + -695, -695, -695, 272, 639, 48, 48, 48, 240, -695, + 274, -695, -695, -695, -695, -695, -695, -695, 100, 100, + -695, 275, -695, -695, -695, 1309, 934, 327, 2128, -695, + 161, 273, -695, -695, 55, 57, 278, 282, 283, 273, + 286, -695, -695, -6, -695, 47, -695, -695, 288, 289, + 161, -695, 290, 90, 2040, -695, 342, -695, -695, -695, + -695, 481, -695, 296, -695, 297, -695, 298, 304, 308, + 310, -695, 161, -695, -695, -695, -695, -695, 315, 318, + 374, -695, -695, -695, 319, -695, -695, 295, -695, -695, + -695, 506, -695, 273, -695, 320, 100, 322, -695, 378, + 161, -695, -695, -695, -695, -695, -695, 60, 60, 60, + -695, 321, -695, 328, 330, 332, 333, 334, 336, -695, + -695, -695, 337, 345, 325, 340, -695, -695, -695, -695, + -695, -695, -695, -695, -695, -695, 506, -695, -695, -695, + 100, -695, 344, 316, 346, -695, 377, 347, 90, -695, + 350, 351, -695, 352, 506, 353, 1657, -695, 48, -695, + -695, -695, -695, -695, -695, 449, -695, -695, -695, -695, + -695, -695, 265, 267, -695, -695, -695, 339, -695, -695, + -695, -695, -695, -695, -695, -695, -695, -695, 343, 343, + -695, -695, -695, -695, 2128, 100, -695, 506, 349, -695, + -695, -695, -695, -695, -695, -695, 359, -695, -695, -695, + -695, -695, 48, -695, -695, -695, -695, 363, 161, -695, + 343, 1772, -695, 364, -695, 426, -695, -695, -695, -695, + -695, -695, -695, -695, 48, -695, 161, 369, 1359, -695, + 355, -695, -695, -695, 372, 356, 440, 442, 442, 100, + 430, 384, 373, -695, 161, 389, -695, -695, 376, -695, + 442, -695, -695, -695, 380, -695, -695, -695, -695, -695, + -695, -695, -695, -695, 432, 496, 385, 179, 442, -695, + 131, 2128, -695, 403, 396, 442, 397, 450, 100, 48, + -695, -695, 411, -695, -695, -695, -695, -695, 399, -695, + -695, -695, -695, -695, -695, -695, -695, -695, -695, -695, + -695, -695, -695, -695, -695, -695, -695, 161, -695, 412, + -695, 413, 2128, 477, 421, 506, 417, 422, 54, -695, + 171, 100, 440, 48, 48, 406, 100, 496, -695, -695, + -695, -695, -695, -695, -695, -695, -695, 1747, -695, -695, + -695, 407, 409, -695, -695, -695, 179, 100, 416, 423, + -695, -695, -695, -695, 48, -695, -695, -695, -695, 100, + 434, 420, 456, -695, -695, -695, -695, 424, 437, -695, + -695, 467, -695 }; /* YYDEFACT[STATE-NUM] -- Default reduction number in state STATE-NUM. @@ -1400,143 +1413,143 @@ static const yytype_int16 yypact[] = means the default is an error. */ static const yytype_int16 yydefact[] = { - 4, 0, 0, 3, 1, 38, 147, 40, 70, 224, - 294, 309, 344, 396, 0, 0, 0, 0, 94, 0, - 0, 508, 0, 0, 578, 598, 0, 6, 7, 42, + 4, 0, 0, 3, 1, 38, 147, 40, 70, 225, + 295, 312, 347, 399, 0, 0, 0, 0, 94, 0, + 0, 511, 0, 0, 581, 601, 0, 6, 7, 42, 24, 61, 0, 0, 22, 64, 77, 66, 26, 78, 83, 79, 84, 77, 80, 81, 65, 18, 10, 0, - 0, 12, 230, 296, 226, 343, 227, 254, 255, 228, - 20, 14, 16, 28, 467, 466, 469, 30, 506, 32, - 538, 540, 539, 537, 77, 556, 557, 536, 77, 34, + 0, 12, 231, 297, 227, 346, 228, 255, 256, 229, + 20, 14, 16, 28, 470, 469, 472, 30, 509, 32, + 541, 543, 542, 540, 77, 559, 560, 539, 77, 34, 36, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 143, 266, 229, 77, 0, 77, 88, 77, 0, - 82, 77, 0, 473, 549, 0, 142, 138, 0, 137, + 0, 143, 267, 230, 77, 0, 77, 88, 77, 0, + 82, 77, 0, 476, 552, 0, 142, 138, 0, 137, 0, 0, 213, 0, 46, 0, 0, 0, 213, 8, - 9, 0, 97, 72, 0, 0, 0, 270, 272, 0, - 284, 285, 288, 289, 290, 291, 287, 292, 293, 362, - 355, 370, 375, 273, 280, 274, 281, 275, 282, 276, - 283, 92, 237, 102, 233, 235, 236, 234, 238, 268, - 269, 239, 243, 240, 242, 241, 244, 245, 296, 251, - 0, 252, 253, 250, 0, 246, 0, 249, 247, 369, - 248, 374, 0, 0, 5, 0, 211, 0, 0, 311, - 0, 0, 0, 0, 0, 0, 0, 0, 550, 543, - 552, 0, 0, 601, 597, 39, 287, 160, 148, 152, - 156, 157, 153, 154, 155, 158, 159, 41, 71, 225, - 231, 295, 310, 345, 397, 73, 547, 74, 0, 548, - 95, 478, 509, 0, 464, 140, 465, 579, 0, 197, - 43, 25, 0, 564, 559, 560, 566, 562, 563, 567, - 565, 561, 558, 0, 48, 571, 0, 0, 23, 96, - 75, 67, 27, 85, 271, 286, 277, 279, 0, 0, - 0, 99, 354, 361, 358, 366, 371, 19, 11, 214, - 13, 297, 0, 21, 15, 17, 29, 470, 31, 520, - 507, 33, 99, 0, 0, 35, 37, 605, 0, 0, - 0, 0, 89, 476, 474, 517, 139, 0, 0, 599, - 212, 200, 4, 568, 0, 572, 0, 569, 186, 187, + 9, 0, 97, 72, 0, 0, 0, 271, 273, 0, + 285, 286, 289, 290, 291, 292, 288, 293, 294, 365, + 358, 373, 378, 274, 281, 275, 282, 276, 283, 277, + 284, 92, 238, 102, 234, 236, 237, 235, 239, 269, + 270, 240, 244, 241, 243, 242, 245, 246, 297, 252, + 0, 253, 254, 251, 0, 247, 0, 250, 248, 372, + 249, 377, 0, 0, 5, 0, 211, 0, 0, 314, + 0, 0, 0, 0, 0, 0, 0, 0, 553, 546, + 555, 0, 0, 604, 600, 39, 288, 160, 148, 152, + 156, 157, 153, 154, 155, 158, 159, 41, 71, 226, + 232, 296, 313, 348, 400, 73, 550, 74, 0, 551, + 95, 481, 512, 0, 467, 140, 468, 582, 0, 197, + 43, 25, 0, 567, 562, 563, 569, 565, 566, 570, + 568, 564, 561, 0, 48, 574, 0, 0, 23, 96, + 75, 67, 27, 85, 272, 287, 278, 280, 0, 0, + 0, 99, 357, 364, 361, 369, 374, 19, 11, 214, + 13, 298, 0, 21, 15, 17, 29, 473, 31, 523, + 510, 33, 99, 0, 0, 35, 37, 608, 0, 0, + 0, 0, 89, 479, 477, 520, 139, 0, 0, 602, + 212, 200, 4, 571, 0, 575, 0, 572, 186, 187, 188, 190, 193, 192, 194, 195, 191, 189, 0, 0, - 0, 0, 183, 596, 161, 162, 163, 165, 167, 169, - 172, 175, 179, 184, 595, 62, 0, 114, 105, 278, - 196, 0, 363, 213, 0, 93, 0, 0, 0, 217, - 213, 312, 481, 524, 551, 544, 553, 602, 149, 266, - 232, 259, 260, 261, 267, 346, 398, 114, 0, 99, - 515, 510, 141, 580, 478, 0, 0, 3, 0, 49, + 0, 0, 183, 599, 161, 162, 163, 165, 167, 169, + 172, 175, 179, 184, 598, 62, 0, 114, 105, 279, + 196, 0, 366, 213, 0, 93, 0, 0, 0, 217, + 213, 315, 484, 527, 554, 547, 556, 605, 149, 267, + 233, 260, 261, 262, 268, 349, 401, 114, 0, 99, + 518, 513, 141, 583, 481, 0, 0, 3, 0, 49, 0, 180, 181, 182, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 593, 0, 76, 136, 0, - 113, 0, 0, 213, 0, 98, 359, 367, 372, 0, - 215, 0, 298, 302, 213, 213, 0, 114, 105, 386, - 391, 0, 502, 0, 0, 610, 384, 385, 606, 608, - 0, 612, 0, 604, 0, 213, 256, 213, 302, 0, - 477, 475, 0, 99, 586, 600, 204, 198, 0, 206, - 199, 0, 201, 207, 0, 0, 0, 0, 570, 185, - 164, 166, 168, 170, 171, 173, 174, 176, 177, 178, - 213, 63, 133, 131, 406, 407, 0, 116, 123, 0, - 117, 127, 125, 129, 0, 119, 121, 411, 111, 110, - 0, 104, 0, 106, 107, 0, 108, 0, 0, 356, - 0, 0, 0, 137, 218, 0, 219, 222, 307, 304, - 303, 0, 213, 0, 0, 0, 0, 0, 492, 0, - 480, 482, 484, 486, 488, 490, 494, 0, 0, 525, - 0, 523, 526, 528, 0, 0, 0, 0, 498, 497, - 0, 501, 500, 0, 0, 0, 0, 0, 0, 0, - 603, 150, 0, 257, 0, 347, 352, 213, 0, 516, - 511, 585, 213, 0, 202, 210, 203, 45, 573, 50, - 0, 134, 0, 69, 0, 115, 0, 0, 0, 0, - 410, 440, 437, 438, 439, 401, 409, 0, 0, 0, - 87, 112, 103, 0, 365, 364, 0, 360, 368, 373, - 0, 216, 0, 220, 0, 0, 299, 301, 270, 323, - 318, 319, 320, 321, 313, 322, 0, 0, 0, 479, - 0, 472, 0, 0, 0, 0, 0, 0, 530, 533, - 522, 0, 0, 0, 0, 387, 392, 496, 591, 592, - 611, 607, 609, 499, 613, 0, 381, 377, 380, 0, - 353, 0, 349, 0, 91, 0, 0, 0, 589, 0, - 0, 584, 0, 0, 0, 0, 594, 0, 132, 124, - 118, 128, 126, 130, 0, 120, 122, 412, 109, 213, - 223, 0, 222, 308, 305, 0, 505, 503, 504, 493, - 483, 485, 487, 489, 491, 495, 0, 0, 527, 529, - 546, 555, 0, 0, 151, 0, 378, 258, 348, 350, - 400, 512, 582, 583, 0, 587, 588, 205, 209, 208, - 0, 56, 42, 51, 55, 0, 135, 402, 0, 0, - 221, 0, 314, 415, 531, 534, 388, 393, 265, 382, - 379, 213, 0, 590, 58, 0, 0, 57, 0, 413, - 357, 306, 0, 0, 0, 447, 447, 0, 451, 262, - 0, 351, 513, 0, 52, 54, 428, 403, 447, 315, - 416, 423, 0, 422, 444, 532, 535, 389, 448, 394, - 263, 383, 519, 0, 0, 0, 447, 414, 0, 0, - 418, 419, 0, 447, 0, 455, 0, 0, 514, 577, - 0, 576, 427, 441, 442, 443, 0, 433, 434, 404, - 330, 337, 335, 316, 326, 327, 334, 424, 420, 445, - 390, 449, 452, 395, 264, 518, 59, 574, 429, 430, - 0, 459, 0, 0, 0, 0, 0, 213, 332, 0, - 0, 0, 0, 0, 0, 0, 431, 435, 456, 405, - 331, 338, 336, 317, 325, 0, 333, 425, 421, 0, - 0, 453, 60, 575, 0, 0, 0, 0, 340, 328, - 446, 450, 0, 432, 436, 457, 339, 0, 0, 0, - 0, 341, 329, 454, 463, 0, 460, 458, 461, 0, - 462 + 0, 0, 0, 0, 0, 596, 0, 76, 136, 0, + 113, 0, 0, 213, 0, 98, 362, 370, 375, 220, + 215, 300, 0, 299, 301, 305, 213, 213, 0, 114, + 105, 389, 394, 0, 505, 0, 0, 613, 387, 388, + 609, 611, 0, 615, 0, 607, 0, 213, 257, 213, + 305, 0, 480, 478, 0, 99, 589, 603, 204, 198, + 0, 206, 199, 0, 201, 207, 0, 0, 0, 0, + 573, 185, 164, 166, 168, 170, 171, 173, 174, 176, + 177, 178, 213, 63, 133, 131, 409, 410, 0, 116, + 123, 0, 117, 127, 125, 129, 0, 119, 121, 414, + 111, 110, 0, 104, 0, 106, 107, 0, 108, 0, + 0, 359, 0, 0, 0, 137, 218, 0, 219, 223, + 310, 307, 306, 213, 0, 0, 0, 0, 0, 495, + 0, 483, 485, 487, 489, 491, 493, 497, 0, 0, + 528, 0, 526, 529, 531, 0, 0, 0, 0, 501, + 500, 0, 504, 503, 0, 0, 0, 0, 0, 0, + 0, 606, 150, 0, 258, 0, 350, 355, 213, 0, + 519, 514, 588, 213, 0, 202, 210, 203, 45, 576, + 50, 0, 134, 0, 69, 0, 115, 0, 0, 0, + 0, 413, 443, 440, 441, 442, 404, 412, 0, 0, + 0, 87, 112, 103, 0, 368, 367, 0, 363, 371, + 376, 0, 216, 0, 221, 0, 0, 0, 304, 271, + 326, 321, 322, 323, 324, 316, 325, 0, 0, 0, + 482, 0, 475, 0, 0, 0, 0, 0, 0, 533, + 536, 525, 0, 0, 0, 0, 390, 395, 499, 594, + 595, 614, 610, 612, 502, 616, 0, 384, 380, 383, + 0, 356, 0, 352, 0, 91, 0, 0, 0, 592, + 0, 0, 587, 0, 0, 0, 0, 597, 0, 132, + 124, 118, 128, 126, 130, 0, 120, 122, 415, 109, + 213, 224, 0, 223, 311, 308, 303, 0, 508, 506, + 507, 496, 486, 488, 490, 492, 494, 498, 0, 0, + 530, 532, 549, 558, 0, 0, 151, 0, 381, 259, + 351, 353, 403, 515, 585, 586, 0, 590, 591, 205, + 209, 208, 0, 56, 42, 51, 55, 0, 135, 405, + 0, 0, 222, 0, 317, 418, 534, 537, 391, 396, + 266, 385, 382, 213, 0, 593, 58, 0, 0, 57, + 0, 416, 360, 309, 0, 0, 0, 450, 450, 0, + 454, 263, 0, 354, 516, 0, 52, 54, 431, 406, + 450, 318, 419, 426, 0, 425, 447, 535, 538, 392, + 451, 397, 264, 386, 522, 0, 0, 0, 450, 417, + 0, 0, 421, 422, 0, 450, 0, 458, 0, 0, + 517, 580, 0, 579, 430, 444, 445, 446, 0, 436, + 437, 407, 333, 340, 338, 319, 329, 330, 337, 427, + 423, 448, 393, 452, 455, 398, 265, 521, 59, 577, + 432, 433, 0, 462, 0, 0, 0, 0, 0, 213, + 335, 0, 0, 0, 0, 0, 0, 0, 434, 438, + 459, 408, 334, 341, 339, 320, 328, 0, 336, 428, + 424, 0, 0, 456, 60, 578, 0, 0, 0, 0, + 343, 331, 449, 453, 0, 435, 439, 460, 342, 0, + 0, 0, 0, 344, 332, 457, 466, 0, 463, 461, + 464, 0, 465 }; /* YYPGOTO[NTERM-NUM]. */ static const yytype_int16 yypgoto[] = { - -679, -679, 284, 291, 530, -617, -679, -679, -679, -679, - -679, -679, -679, -679, -679, -679, -679, -679, -679, -679, - -679, -588, -679, -679, -679, -679, -679, -679, -679, -679, - -679, -679, -679, -679, -679, -679, -152, -679, -679, -679, - -679, -679, -679, -679, -679, -679, -679, -679, 222, -679, - -679, 27, -679, -679, -679, 590, -679, -679, -679, -679, - -679, -679, -679, 592, -679, 224, -679, -679, -250, -679, - -679, 181, 107, -679, -679, -679, -324, -679, -361, -679, - -679, -679, -679, -679, -679, -679, -679, -337, -679, -679, - -22, -679, -679, -193, -10, -679, 17, -679, -679, -679, - -679, -198, -44, -233, -679, 218, 219, 217, -151, -150, - -185, -107, -679, -320, -679, -679, -679, -679, -679, -679, - -679, -679, 12, -83, 566, -679, -679, -679, -679, -74, - 8, 18, -679, 46, -679, -31, -389, -466, -679, -679, - -679, 2, -679, -679, -616, -146, -679, -679, -7, -679, - -75, -679, -679, -51, -42, -65, -50, -49, 237, -679, - -40, -679, -38, -679, -679, -679, -679, 175, 265, 122, - -679, -679, -679, -37, -679, -32, -679, -679, -679, -679, - -679, -679, -679, -679, -679, -220, -679, -679, -679, -679, - -679, -219, -679, -679, -679, -679, -679, -679, -679, -41, - -679, -679, -679, -679, -679, -679, -679, -123, -679, -679, - -679, -679, -679, -679, -679, -679, -679, -679, -679, -70, - -679, -679, -679, -68, -679, -679, -679, -679, -679, -679, - -679, -86, -679, -679, -328, -679, -679, -679, -679, -679, - -679, -679, -679, -679, -679, 20, -679, -679, -679, -679, - -679, -679, -679, -679, -679, -679, -679, -679, -679, -679, - -679, -656, -679, -679, -679, -679, -679, -209, -679, -679, - -679, -679, -679, -679, -679, -679, -231, -679, -679, -517, - -679, -678, -679, -679, -679, -679, -679, -679, -679, -679, - -679, -679, -679, -679, -679, -679, 22, 24, -679, -679, - -679, -679, -679, -679, -679, -679, -679, 262, -679, -679, - 121, -679, -679, -679, -679, -679, -679, -679, -340, 209, - -336, -679, -679, -679, -679, -679, -679, -679, -679, -679, - -679, -679, -679, -679, -679, -679, -679, -679, -679, -679, - -679, -679, -679, -679, -679, -679, -679, -679, -679, -679, - -679, -679, -679, -679, -679, -679, -679, -679, -679, -679, - -679, -679, 572, -679, -679, -679, -679, -679, -679, -679, - -679, -679, 261, -679, -679, -202, -679, -679, -679, -679, - -679, -679, -679, -13, -679, 294, -679, -679, 77, -679, - -679, -679, -679, -679, -679, -679, -679, -679, -679, -679, - -679, -679 + -695, -695, 232, 233, 497, -619, -695, -695, -695, -695, + -695, -695, -695, -695, -695, -695, -695, -695, -695, -695, + -695, -603, -695, -695, -695, -695, -695, -695, -695, -695, + -695, -695, -695, -695, -695, -695, -211, -695, -695, -695, + -695, -695, -695, -695, -695, -695, -695, -695, 206, -695, + -695, 63, -695, -695, -695, 531, -695, -695, -695, -695, + -695, -695, -695, 533, -695, 208, -695, -695, -251, -695, + -695, 120, 46, -695, -695, -695, -321, -695, -358, -695, + -695, -695, -695, -695, -695, -695, -695, -346, -695, -695, + -22, -695, -695, -191, -10, -695, 17, -695, -695, -695, + -695, -190, -105, -233, -695, 159, 173, 175, -166, -158, + -173, -92, -695, -320, -695, -695, -695, -695, -695, -695, + -695, -695, 24, -83, 513, -695, -695, -695, -695, -129, + -48, 18, -695, -8, -695, -31, -387, -466, -695, -695, + -695, -43, -695, -695, -616, -202, -695, -695, -7, -695, + -69, -695, -695, -52, -51, -66, -65, -49, 203, -695, + -40, -695, -38, -695, -695, -695, -695, -695, 118, 218, + 75, -695, -695, -695, -37, -695, -32, -695, -695, -695, + -695, -695, -695, -695, -695, -695, -272, -695, -695, -695, + -695, -695, -259, -695, -695, -695, -695, -695, -695, -695, + -41, -695, -695, -695, -695, -695, -695, -695, -161, -695, + -695, -695, -695, -695, -695, -695, -695, -695, -695, -695, + -70, -695, -695, -695, -68, -695, -695, -695, -695, -695, + -695, -695, -125, -695, -695, -339, -695, -695, -695, -695, + -695, -695, -695, -695, -695, -695, 20, -695, -695, -695, + -695, -695, -695, -695, -695, -695, -695, -695, -695, -695, + -695, -695, -633, -695, -695, -695, -695, -695, -254, -695, + -695, -695, -695, -695, -695, -695, -695, -275, -695, -695, + -515, -695, -694, -695, -695, -695, -695, -695, -695, -695, + -695, -695, -695, -695, -695, -695, -695, 22, 23, -695, + -695, -695, -695, -695, -695, -695, -695, -695, 219, -695, + -695, 74, -695, -695, -695, -695, -695, -695, -695, -328, + 163, -327, -695, -695, -695, -695, -695, -695, -695, -695, + -695, -695, -695, -695, -695, -695, -695, -695, -695, -695, + -695, -695, -695, -695, -695, -695, -695, -695, -695, -695, + -695, -695, -695, -695, -695, -695, -695, -695, -695, -695, + -695, -695, -695, 526, -695, -695, -695, -695, -695, -695, + -695, -695, -695, 220, -695, -695, -249, -695, -695, -695, + -695, -695, -695, -695, -62, -695, 242, -695, -695, 32, + -695, -695, -695, -695, -695, -695, -695, -695, -695, -695, + -695, -695, -695 }; /* YYDEFGOTO[NTERM-NUM]. */ @@ -1544,45 +1557,45 @@ static const yytype_int16 yydefgoto[] = { 0, 1, 2, 3, 27, 28, 183, 187, 191, 192, 182, 190, 121, 116, 125, 193, 195, 197, 201, 202, - 82, 29, 84, 30, 115, 312, 465, 31, 32, 117, - 316, 467, 675, 755, 733, 756, 734, 735, 773, 854, - 33, 118, 406, 34, 35, 124, 347, 486, 36, 85, - 37, 151, 346, 38, 39, 40, 126, 348, 500, 41, - 228, 377, 568, 42, 271, 43, 102, 260, 355, 44, - 45, 411, 501, 603, 502, 503, 409, 410, 487, 586, - 597, 598, 584, 588, 587, 589, 582, 407, 482, 677, - 332, 233, 307, 109, 369, 46, 488, 83, 298, 444, - 655, 208, 333, 350, 335, 336, 337, 338, 339, 340, - 341, 342, 343, 351, 48, 311, 385, 460, 573, 461, - 462, 674, 489, 50, 310, 359, 420, 515, 516, 613, - 517, 490, 86, 219, 299, 220, 154, 155, 156, 157, - 52, 370, 446, 659, 371, 747, 769, 806, 372, 373, + 82, 29, 84, 30, 115, 312, 467, 31, 32, 117, + 316, 469, 676, 757, 735, 758, 736, 737, 775, 856, + 33, 118, 406, 34, 35, 124, 347, 488, 36, 85, + 37, 151, 346, 38, 39, 40, 126, 348, 502, 41, + 228, 377, 569, 42, 271, 43, 102, 260, 355, 44, + 45, 411, 503, 604, 504, 505, 409, 410, 489, 587, + 598, 599, 585, 589, 588, 590, 583, 407, 484, 678, + 332, 233, 307, 109, 369, 46, 490, 83, 298, 446, + 656, 208, 333, 350, 335, 336, 337, 338, 339, 340, + 341, 342, 343, 351, 48, 311, 385, 462, 574, 463, + 464, 675, 491, 50, 310, 359, 420, 517, 518, 614, + 519, 492, 86, 219, 299, 220, 154, 155, 156, 157, + 52, 370, 448, 660, 371, 749, 771, 808, 372, 373, 158, 159, 160, 161, 162, 163, 164, 165, 166, 167, - 53, 87, 54, 188, 360, 521, 422, 522, 617, 520, - 615, 741, 614, 55, 88, 56, 282, 424, 695, 762, - 798, 845, 624, 823, 846, 824, 847, 888, 842, 825, - 848, 826, 844, 843, 877, 879, 887, 57, 58, 59, - 89, 300, 447, 661, 565, 662, 751, 566, 173, 174, - 270, 606, 175, 356, 510, 176, 269, 413, 177, 178, - 357, 511, 179, 180, 358, 512, 181, 374, 445, 657, - 716, 658, 715, 770, 491, 436, 546, 712, 767, 803, - 437, 547, 713, 768, 805, 492, 90, 301, 448, 663, - 493, 684, 758, 796, 841, 494, 595, 506, 599, 738, - 778, 744, 763, 764, 782, 801, 850, 783, 799, 849, - 777, 794, 795, 816, 839, 874, 817, 840, 875, 596, - 818, 785, 802, 851, 789, 804, 852, 833, 853, 882, - 859, 876, 890, 895, 896, 899, 495, 496, 63, 64, - 65, 194, 362, 529, 66, 231, 379, 304, 378, 425, - 530, 632, 633, 634, 635, 636, 630, 637, 531, 550, - 532, 440, 552, 533, 534, 535, 67, 196, 68, 105, - 305, 453, 665, 752, 792, 381, 452, 808, 290, 363, - 540, 426, 541, 641, 642, 542, 706, 765, 543, 707, - 766, 69, 70, 71, 72, 73, 293, 427, 643, 74, - 75, 76, 199, 292, 77, 294, 428, 644, 78, 253, - 254, 317, 255, 810, 837, 811, 79, 111, 308, 454, - 666, 571, 572, 671, 724, 536, 257, 405, 344, 80, - 81, 112, 384, 204, 297, 442, 367, 443, 556, 557, - 555, 559 + 53, 87, 54, 188, 360, 423, 424, 617, 523, 618, + 522, 616, 743, 615, 55, 88, 56, 282, 426, 697, + 764, 800, 847, 625, 825, 848, 826, 849, 890, 844, + 827, 850, 828, 846, 845, 879, 881, 889, 57, 58, + 59, 89, 300, 449, 662, 566, 663, 753, 567, 173, + 174, 270, 607, 175, 356, 512, 176, 269, 413, 177, + 178, 357, 513, 179, 180, 358, 514, 181, 374, 447, + 658, 718, 659, 717, 772, 493, 438, 547, 714, 769, + 805, 439, 548, 715, 770, 807, 494, 90, 301, 450, + 664, 495, 685, 760, 798, 843, 496, 596, 508, 600, + 740, 780, 746, 765, 766, 784, 803, 852, 785, 801, + 851, 779, 796, 797, 818, 841, 876, 819, 842, 877, + 597, 820, 787, 804, 853, 791, 806, 854, 835, 855, + 884, 861, 878, 892, 897, 898, 901, 497, 498, 63, + 64, 65, 194, 362, 530, 66, 231, 379, 304, 378, + 427, 531, 633, 634, 635, 636, 637, 631, 638, 532, + 551, 533, 442, 553, 534, 535, 536, 67, 196, 68, + 105, 305, 455, 666, 754, 794, 381, 454, 810, 290, + 363, 541, 428, 542, 642, 643, 543, 708, 767, 544, + 709, 768, 69, 70, 71, 72, 73, 293, 429, 644, + 74, 75, 76, 199, 292, 77, 294, 430, 645, 78, + 253, 254, 317, 255, 812, 839, 813, 79, 111, 308, + 456, 667, 572, 573, 672, 726, 537, 257, 405, 344, + 80, 81, 112, 384, 204, 297, 444, 367, 445, 557, + 558, 556, 560 }; /* YYTABLE[YYPACT[STATE-NUM]] -- What to do in state STATE-NUM. If @@ -1590,438 +1603,462 @@ static const yytype_int16 yydefgoto[] = number is the opposite. If YYTABLE_NINF, syntax error. */ static const yytype_int16 yytable[] = { - 108, 110, 172, 168, 92, 169, 170, 93, 209, 103, - 104, 171, 153, 215, 49, 216, 113, 415, 212, 47, - 51, 152, 60, 334, 61, 509, 62, 438, 592, 238, - 646, 439, 210, 213, 214, 256, 416, 417, 418, 435, - 306, 211, 364, 717, 313, 172, 168, 309, 169, 170, - 504, 745, 660, 449, 171, 820, 106, 8, 731, 106, - 106, 207, 217, 123, 152, 539, 47, 51, 648, 60, - 649, 61, 548, 62, 106, 218, 8, 221, 222, 223, - 224, 592, 759, 821, 822, 226, 91, 732, 786, 229, - -376, 185, 230, 264, 4, 232, 265, 528, 394, 234, - 797, 198, 236, 544, -144, 198, 273, -145, 274, 122, - -376, 656, 122, 235, 382, 114, 235, 185, 819, 605, - 18, 225, -146, 227, 95, 830, 119, 122, 585, 451, - 318, 319, 320, 321, 322, 323, 324, 325, 106, 731, - 185, 429, 430, 107, 504, 185, 107, 107, 189, 326, - 327, 237, 185, -324, 820, 235, 18, 235, 266, 267, - 99, 235, 122, 279, 328, 329, 120, 209, 732, 330, - 331, 431, 215, -100, 216, -342, 432, 212, 122, 507, - 398, 399, 821, 822, 504, 203, 514, 459, 205, 106, - 239, 210, 213, 214, -468, 746, 402, 403, 404, 528, - 211, 400, 401, 570, 429, 430, 813, 814, 815, 318, - 319, 320, 321, 322, 323, 324, 325, 477, 478, 479, - 207, 391, 392, 393, -541, 107, 513, 240, 326, 327, - 821, 822, 669, 867, 431, 241, 670, 94, 96, 432, - 98, 101, 433, 434, 668, 259, 592, 473, 474, 331, - 475, 476, 258, 235, 261, 262, -212, 263, 272, 884, - 318, 319, 320, 321, 322, 323, 324, 325, 268, 275, - 414, 891, 276, 277, 278, 280, 107, 421, 281, 326, - 327, 283, 827, 429, 430, 284, 285, 286, 368, 287, - 288, 106, 289, 302, 328, 329, 291, 295, 314, 330, - 331, 296, -542, 315, 524, 525, 349, 429, 430, 303, - 209, 345, 352, 431, 526, 215, 353, 216, 432, 354, - 212, 433, 434, 857, 408, 361, 365, 669, 524, 525, - 508, 670, 408, 592, 210, 213, 214, 431, 526, 668, - 366, 523, 432, 211, 464, 433, 434, 334, 375, 376, - 760, -471, 383, 388, 395, 380, 450, 647, 389, 390, - 419, 396, 562, 207, 564, 653, 397, 412, -44, 466, - 480, 551, 560, 469, 592, 574, 561, 690, 563, 576, - 172, 168, 577, 169, 170, 578, 583, 579, 581, 171, - 519, 600, 152, 612, 604, 749, 481, 580, 49, 152, - 607, 610, 458, 47, 51, 608, 60, 609, 61, 549, - 62, 553, 554, 616, -300, 631, 611, 640, 549, 691, - 645, 650, 334, 505, 593, 651, 594, 652, 654, 673, - 569, -399, 664, 696, 697, 698, -581, 527, 678, 421, - 728, 679, 680, 681, 682, 683, 685, 687, 620, 686, - 688, 575, 693, 264, 689, 699, 700, 701, 621, 702, - 703, 172, 168, 704, 169, 170, 705, 708, 709, 721, - 171, 519, 591, 622, 623, 710, 711, 593, 718, 594, - 152, 719, 625, 720, 421, 722, 152, 725, 726, 727, - 729, 737, 753, 757, 761, 742, -417, 743, 781, 774, - 780, 619, 626, 627, 628, 656, 106, 779, 776, 784, - 788, 618, 128, 129, 869, 870, 132, 133, 134, 135, - 790, 791, 793, -426, 807, 591, 12, 638, 639, 800, - 809, 812, 172, 168, 828, 169, 170, 829, 831, 832, - 836, 171, 838, 855, 856, 889, 858, 860, 862, 871, - 863, 152, 880, 106, 886, 892, 885, 505, 127, 128, - 129, 130, 131, 132, 133, 134, 135, 136, 137, 138, - 10, 11, 881, 12, 139, 140, 141, 142, 893, 184, - 894, -47, 897, -47, 667, 143, 144, 145, 146, 147, - 148, 149, 150, 107, 898, 900, 386, -47, -47, 185, - -47, -47, -47, 387, 775, -47, 739, 100, 97, 545, - 861, 714, 602, 470, 472, 471, 186, 694, 740, 672, - 692, 787, 463, 567, 601, 423, 864, -47, 771, 866, - 750, -47, 143, 144, 145, 146, 147, 148, 149, 150, - 107, 868, 593, 883, 594, -47, 455, -101, 629, 558, - 200, 468, 122, 873, 723, 736, 0, 676, 0, 0, - 0, 441, 0, 0, 0, 0, 0, 0, 564, 5, - 0, 0, 6, 7, 8, 9, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 10, 11, - 591, 12, 47, 51, 0, 60, 13, 61, 0, 62, - 0, 0, 0, 92, 0, 0, 748, 0, 754, 14, - 15, 16, 17, 0, 0, 0, 0, 152, 18, 19, - 0, 0, 20, 0, 0, 21, 0, 0, 0, 593, - 772, 594, 22, 23, 0, 0, 0, 0, 0, 24, - 25, 730, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 92, 0, 0, - 748, 0, 0, 26, 865, 0, 0, -53, 0, 0, - 593, 0, 594, 47, 51, 0, 60, 591, 61, 0, - 62, 0, 0, 0, 0, 835, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 92, 0, 0, 834, + 108, 110, 172, 168, 92, 169, 170, 93, 415, 103, + 104, 171, 153, 215, 209, 216, 113, 212, 213, 47, + 51, 152, 60, 334, 61, 62, 49, 511, 437, 238, + 593, 210, 211, 647, 214, 256, 416, 417, 418, 440, + 441, 364, 306, 106, 719, 172, 168, 309, 169, 170, + 661, 106, 313, 506, 171, 822, 451, 733, 649, 549, + 650, 207, 217, 106, 152, 8, 47, 51, 8, 60, + 540, 61, 62, 734, 788, 218, 747, 221, 222, 223, + 224, -379, 593, 823, 824, 226, 799, 4, 529, 229, + 185, 234, 230, 266, 267, 232, 431, 432, 394, 123, + 273, -379, 274, 91, 821, 235, 236, 761, 545, 18, + 657, 832, 264, 95, 114, 265, 382, 525, 526, 189, + 235, 431, 432, 606, -144, 119, 433, 527, 453, 122, + 107, 434, 822, 586, 435, 436, 106, 198, 107, 733, + 185, 198, 18, 185, 122, 235, 99, 235, 120, 506, + 235, 433, 185, -327, 237, 734, 434, 225, -345, 227, + 823, 824, 203, 279, -474, -145, -146, 431, 432, 205, + 122, 122, 215, 209, 216, -100, 212, 213, -471, 509, + 122, 402, 403, 404, 398, 399, 516, 239, 506, 529, + 210, 211, -544, 214, 240, 461, 241, 433, 258, 748, + 823, 824, 434, 259, 571, 435, 436, 318, 319, 320, + 321, 322, 323, 324, 325, 815, 816, 817, 400, 401, + 207, 94, 96, 107, 98, 101, 326, 327, 515, 479, + 480, 481, 475, 476, 669, 869, 391, 392, 393, -47, + 261, -47, 477, 478, 262, 670, 671, 331, 593, 268, + 263, 235, 277, 278, 272, -47, -47, 275, -47, -47, + -47, 886, 276, -47, -212, 281, 280, 283, 303, 284, + 414, 431, 432, 893, 285, 286, 106, 422, 287, 288, + 315, 289, 291, 295, 296, -47, 829, -545, 368, -47, + 302, 314, 525, 526, 345, 349, 352, 353, 354, 365, + 366, 433, 527, -47, 388, 375, 434, 376, 361, 435, + 436, 383, 380, 389, 390, 215, 209, 216, 419, 212, + 213, 395, 397, 396, 408, 412, 421, 859, -44, 669, + 510, 468, 408, 210, 211, 593, 214, 482, 471, 552, + 670, 671, 561, 524, 466, 562, 575, 564, 334, 577, + 578, 579, 580, 612, 762, 584, 452, 601, 582, 646, + 648, 605, 608, 207, 563, 609, 565, 610, 654, 611, + 613, -302, 674, 632, 641, 651, 593, 688, 691, 652, + 653, 172, 168, 655, 169, 170, 264, -402, 665, -584, + 171, 521, 152, 679, 680, 681, 483, 751, 690, 581, + 152, 682, 460, 47, 51, 683, 60, 684, 61, 62, + 49, 550, 686, 554, 555, 687, 689, 694, 701, 721, + 550, 696, 692, 334, 712, 702, 594, 703, 595, 704, + 705, 706, 570, 707, 710, 507, 698, 699, 700, 713, + 422, 730, 711, 720, 723, 722, 724, 727, 728, 729, + 731, 528, 739, 576, 744, 621, 755, 745, 622, 623, + 759, 763, -420, 172, 168, 657, 169, 170, 776, 778, + 781, 782, 171, 521, 592, 624, 783, 242, 594, 243, + 595, 786, 152, 626, 106, 422, 790, 792, 152, 795, + 793, -429, 809, 244, 245, 802, 246, 247, 248, 811, + 814, 249, 620, 627, 628, 629, 830, 871, 872, 106, + 831, 833, 838, 834, 840, 857, 858, 860, 862, 864, + 873, 865, 882, 250, 883, 888, 592, 251, 639, 640, + 887, 894, 896, 172, 168, 895, 169, 170, 891, 899, + 900, 252, 171, 902, 386, 387, 184, 777, 100, 97, + 546, 716, 152, 603, 472, 318, 319, 320, 321, 322, + 323, 324, 325, 186, 742, 693, 673, 789, 568, 473, + 507, 107, 474, 695, 326, 327, 866, 185, 425, 602, + 318, 319, 320, 321, 322, 323, 324, 325, 465, 328, + 329, 868, 773, 752, 330, 331, 107, 668, 870, 326, + 327, 885, 630, 457, 200, 559, 725, 741, 875, 443, + 470, 0, 863, 677, 328, 329, 0, 0, 0, 330, + 331, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 591, 0, - 0, 0, 0, 0, 172, 168, 0, 169, 170, 408, - 408, 0, 0, 171, 878, 0, 0, 0, 0, 483, - 0, -408, 6, 152, 872, 9, -408, -408, -408, -408, - -408, -408, -408, -408, -408, -408, -408, -408, 10, 11, - 408, 12, 0, 0, -408, -408, 13, 0, 0, 429, - 430, 484, 485, -408, 0, 0, 0, 0, 0, 14, - 0, 0, 0, 497, 498, 499, 0, 0, 0, 0, + 0, 0, 106, 0, 594, 0, 595, 619, 128, 129, + 0, 0, 132, 133, 134, 135, 738, 0, 0, 0, + 0, 0, 12, 0, 0, 0, 106, 0, 0, 0, + 565, 127, 128, 129, 130, 131, 132, 133, 134, 135, + 136, 137, 138, 10, 11, 0, 12, 139, 140, 141, + 142, 0, 592, 47, 51, 0, 60, 0, 61, 62, + 0, 0, 0, 0, 0, 92, 0, 0, 750, 0, + 756, 0, 0, 0, 0, 0, 0, 0, 0, 152, + 0, 143, 144, 145, 146, 147, 148, 149, 150, 107, + 0, 594, 774, 595, 0, 185, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 143, 144, 145, 146, 147, + 148, 149, 150, 107, 0, 0, 0, 0, 0, 92, + -101, 0, 750, 0, 0, 122, 867, 0, 0, 0, + 0, 0, 594, 0, 595, 47, 51, 0, 60, 592, + 61, 62, 0, 0, 0, 0, 0, 837, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 92, 0, + 0, 836, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 22, 23, 0, 0, 0, 0, 0, 0, + 592, 0, 0, 0, 0, 0, 172, 168, 0, 169, + 170, 408, 408, 0, 0, 171, 880, 0, 0, 0, + 0, 485, 0, -411, 6, 152, 874, 9, -411, -411, + -411, -411, -411, -411, -411, -411, -411, -411, -411, -411, + 10, 11, 408, 12, 0, 0, -411, -411, 13, 0, + 0, 431, 432, 486, 487, -411, 0, 0, 0, 0, + 0, 14, 0, 0, 0, 499, 500, 501, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - -408, -408, -408, -408, -408, -408, -408, -408, -408, 0, - 0, 0, 0, 483, -213, -408, 6, -86, 0, 9, - -408, -408, -408, -408, -408, -408, -408, -408, -408, -408, - -408, -408, 10, 11, 0, 12, 0, 0, -408, -408, - 13, 0, 0, 429, 430, 484, 485, -408, 0, 0, - 0, 0, 0, 14, 0, 0, 0, 497, 498, 499, + 0, 0, 0, 0, 22, 23, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 22, 23, 0, 0, + 0, 0, -411, -411, -411, -411, -411, -411, -411, -411, + -411, 0, 0, 0, 0, 485, -213, -411, 6, -86, + 0, 9, -411, -411, -411, -411, -411, -411, -411, -411, + -411, -411, -411, -411, 10, 11, 0, 12, 0, 0, + -411, -411, 13, 0, 0, 431, 432, 486, 487, -411, + 0, 0, 0, 0, 0, 14, 0, 0, 0, 499, + 500, 501, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 22, 23, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, -408, -408, -408, -408, -408, -408, - -408, -408, -408, 0, 0, 0, 0, 483, -213, -408, - 6, -554, 0, 9, -408, -408, -408, -408, -408, -408, - -408, -408, -408, -408, -408, -408, 10, 11, 0, 12, - 0, 0, -408, -408, 13, 0, 0, 429, 430, 484, - 485, -408, 0, 0, 0, 0, 0, 14, 0, 0, - 0, 537, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 538, 0, 0, 0, 0, 0, 0, 0, 0, - 22, 23, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, -408, -408, - -408, -408, -408, -408, -408, -408, -408, 0, 0, 0, - 483, 0, -408, 6, 0, -521, 9, -408, -408, -408, - -408, -408, -408, -408, -408, -408, -408, -408, -408, 10, - 11, 0, 12, 0, 0, -408, -408, 13, 0, 0, - 429, 430, 484, 485, -408, 0, 0, 0, 0, 0, - 14, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, -411, -411, -411, -411, + -411, -411, -411, -411, -411, 0, 0, 0, 0, 485, + -213, -411, 6, -557, 0, 9, -411, -411, -411, -411, + -411, -411, -411, -411, -411, -411, -411, -411, 10, 11, + 0, 12, 0, 0, -411, -411, 13, 0, 0, 431, + 432, 486, 487, -411, 0, 0, 0, 0, 0, 14, + 0, 0, 0, 538, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 539, 0, 0, 0, 0, 0, 0, + 0, 0, 22, 23, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 22, 23, 0, 0, 0, 0, 0, + -411, -411, -411, -411, -411, -411, -411, -411, -411, 0, + 0, 0, 485, 0, -411, 6, 0, -524, 9, -411, + -411, -411, -411, -411, -411, -411, -411, -411, -411, -411, + -411, 10, 11, 0, 12, 0, 0, -411, -411, 13, + 0, 0, 431, 432, 486, 487, -411, 0, 0, 0, + 0, 0, 14, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, -408, -408, -408, -408, -408, -408, -408, -408, -408, - 0, 0, 0, 0, 483, -213, -408, 6, -68, 0, - 9, -408, -408, -408, -408, -408, -408, -408, -408, -408, - -408, -408, -408, 10, 11, 0, 12, 0, 0, -408, - -408, 13, 0, 0, 429, 430, 484, 485, -408, 0, - 0, 0, 0, 0, 14, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 22, 23, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 22, 23, 0, + 0, 0, 0, -411, -411, -411, -411, -411, -411, -411, + -411, -411, 0, 0, 0, 0, 485, -213, -411, 6, + -68, 0, 9, -411, -411, -411, -411, -411, -411, -411, + -411, -411, -411, -411, -411, 10, 11, 0, 12, 0, + 0, -411, -411, 13, 0, 0, 431, 432, 486, 487, + -411, 0, 0, 0, 0, 0, 14, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, -408, -408, -408, -408, -408, - -408, -408, -408, -408, 0, 0, 0, 0, 483, -213, - -408, 6, -90, 0, 9, -408, -408, -408, -408, -408, - -408, -408, -408, -408, -408, -408, -408, 10, 11, 0, - 12, 0, 0, -408, -408, 13, 0, 0, 429, 430, - 484, 485, -408, 0, 0, 106, 6, 0, 14, 456, - 127, 128, 129, 130, 131, 132, 133, 134, 135, 206, - 137, 0, 0, 0, 0, 12, 0, 0, 141, 142, - 0, 22, 23, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, -408, - -408, -408, -408, -408, -408, -408, -408, -408, 0, 0, - 0, 0, 0, -213, 0, 0, -545, 0, 0, 0, - 0, 0, 0, 0, -2, 5, 0, 0, 6, 7, - 8, 9, 0, 0, 143, 144, 145, 146, 147, 148, - 149, 150, 107, 0, 10, 11, 0, 12, 106, 0, - 0, 457, 13, 127, 128, 129, 130, 131, 132, 133, - 134, 135, 136, 137, 138, 14, 15, 16, 17, 139, - 140, 141, 142, 0, 18, 19, 0, 0, 20, 0, - 0, 21, 0, 0, 0, 0, 0, 0, 22, 23, - 518, 0, 106, 0, 0, 24, 25, 127, 128, 129, - 130, 131, 132, 133, 134, 135, 136, 137, 138, 10, - 11, 0, 12, 139, 140, 141, 142, 0, 0, 26, - -213, 0, 0, 0, 0, 0, 0, 143, 144, 145, - 146, 147, 148, 149, 150, 107, 0, 0, 0, 0, - 5, 185, 0, 6, 7, 8, 9, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 10, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 22, + 23, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, -411, -411, -411, + -411, -411, -411, -411, -411, -411, 0, 0, 0, 0, + 485, -213, -411, 6, -90, 0, 9, -411, -411, -411, + -411, -411, -411, -411, -411, -411, -411, -411, -411, 10, + 11, 0, 12, 0, 0, -411, -411, 13, 0, 0, + 431, 432, 486, 487, -411, 0, 0, 0, 0, 0, + 14, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 5, 0, 0, 6, 7, 8, 9, 0, 0, 0, + 0, 0, 0, 22, 23, 0, 0, 0, 0, 10, 11, 0, 12, 0, 0, 0, 0, 13, 0, 0, - 0, 143, 144, 145, 146, 147, 148, 149, 150, 107, - 14, 15, 16, 17, 0, 185, 0, 0, 0, 18, + 0, -411, -411, -411, -411, -411, -411, -411, -411, -411, + 14, 15, 16, 17, 0, -213, 0, 0, -548, 18, 19, 0, 0, 20, 0, 0, 21, 0, 0, 0, - 0, 0, 5, 22, 23, 6, 7, 8, 9, 0, - 24, 25, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 10, 11, 0, 12, 0, 0, 5, 0, 13, - 6, 7, 8, 9, 26, -213, 0, 0, 0, 0, - 0, 0, 14, 15, 16, 17, 10, 11, 0, 12, - 0, 18, 19, 0, 13, 20, 0, 0, 21, 0, - 0, 0, 0, 0, 0, 22, 23, 14, 15, 16, - 17, 0, 24, 25, 730, 0, 18, 19, 0, 0, - 20, 0, 0, 21, 0, 0, 0, 0, 0, 0, - 22, 23, 0, 0, 106, 0, 26, 24, 25, 127, - 128, 129, 130, 131, 132, 133, 134, 135, 136, 137, - 138, 10, 11, 0, 12, 139, 140, 141, 142, 0, - 483, 26, -408, 6, 0, 0, 9, -408, -408, -408, - -408, -408, -408, -408, -408, -408, -408, -408, -408, 10, - 11, 0, 12, 0, 0, -408, -408, 13, 0, 0, - 429, 430, 484, 485, -408, 0, 0, 0, 0, 0, - 14, 0, 0, 0, 497, 498, 499, 0, 0, 0, - 0, 0, 0, 143, 144, 145, 146, 147, 148, 149, - 150, 107, 0, 22, 23, 0, 0, 185, 0, 0, + 0, 0, 0, 22, 23, 0, 0, 0, 0, 0, + 24, 25, 732, 106, 6, 0, 0, 458, 127, 128, + 129, 130, 131, 132, 133, 134, 135, 206, 137, 0, + 0, 0, 0, 12, 26, 0, 141, 142, -53, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, -408, -408, -408, -408, -408, -408, -408, -408, -408, - 483, 0, -408, 6, 0, 0, 9, -408, -408, -408, - -408, -408, -408, -408, -408, -408, -408, -408, -408, 10, - 11, 0, 12, 0, 0, -408, -408, 13, 0, 0, - 429, 430, 484, 485, -408, 518, 0, 106, 0, 0, - 14, 0, 127, 128, 129, 130, 131, 132, 133, 134, - 135, 136, 137, 138, 10, 11, 0, 12, 139, 140, - 141, 142, 0, 22, 23, 0, 0, 0, 0, 0, + -2, 5, 0, 0, 6, 7, 8, 9, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, -408, -408, -408, -408, -408, -408, -408, -408, -408, - 106, 0, 0, 0, 0, 127, 128, 129, 130, 131, + 10, 11, 0, 12, 0, 0, 0, 0, 13, 0, + 0, 0, 143, 144, 145, 146, 147, 148, 149, 150, + 107, 14, 15, 16, 17, 0, 0, 0, 0, 459, + 18, 19, 0, 0, 20, 0, 0, 21, 0, 0, + 0, 0, 0, 0, 22, 23, 520, 0, 106, 0, + 0, 24, 25, 127, 128, 129, 130, 131, 132, 133, + 134, 135, 136, 137, 138, 10, 11, 0, 12, 139, + 140, 141, 142, 0, 0, 26, -213, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 5, 0, 0, 6, + 7, 8, 9, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 10, 11, 0, 12, 0, + 0, 0, 0, 13, 0, 0, 0, 143, 144, 145, + 146, 147, 148, 149, 150, 107, 14, 15, 16, 17, + 0, 185, 0, 0, 0, 18, 19, 0, 0, 20, + 0, 0, 21, 0, 0, 0, 0, 0, 5, 22, + 23, 6, 7, 8, 9, 0, 24, 25, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 10, 11, 0, + 12, 0, 0, 5, 0, 13, 6, 7, 8, 9, + 26, -213, 0, 0, 0, 0, 0, 0, 14, 15, + 16, 17, 10, 11, 0, 12, 0, 18, 19, 0, + 13, 20, 0, 0, 21, 0, 0, 0, 0, 0, + 0, 22, 23, 14, 15, 16, 17, 0, 24, 25, + 732, 0, 18, 19, 0, 0, 20, 0, 0, 21, + 0, 0, 0, 0, 0, 0, 22, 23, 0, 0, + 106, 0, 26, 24, 25, 127, 128, 129, 130, 131, 132, 133, 134, 135, 136, 137, 138, 10, 11, 0, - 12, 139, 140, 141, 142, 0, 143, 144, 145, 146, - 147, 148, 149, 150, 107, 106, 0, 0, 0, 0, - 127, 128, 129, 130, 131, 132, 133, 134, 135, 206, - 137, 138, 0, 0, 0, 0, 0, 0, 141, 142, - 0, 0, 0, 0, 0, 0, 0, 590, 0, 0, + 12, 139, 140, 141, 142, 106, 0, 26, 0, 0, + 127, 128, 129, 130, 131, 132, 133, 134, 135, 136, + 137, 138, 0, 0, 0, 0, 139, 140, 141, 142, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 143, + 144, 145, 146, 147, 148, 149, 150, 107, 0, 0, + 0, 0, 0, 185, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 143, 144, 145, 146, 147, 148, + 149, 150, 107, 485, 0, -411, 6, 0, 185, 9, + -411, -411, -411, -411, -411, -411, -411, -411, -411, -411, + -411, -411, 10, 11, 0, 12, 0, 0, -411, -411, + 13, 0, 0, 431, 432, 486, 487, -411, 0, 0, + 0, 0, 0, 14, 0, 0, 0, 499, 500, 501, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 22, 23, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, -411, -411, -411, -411, -411, -411, + -411, -411, -411, 485, 0, -411, 6, 0, 0, 9, + -411, -411, -411, -411, -411, -411, -411, -411, -411, -411, + -411, -411, 10, 11, 0, 12, 0, 0, -411, -411, + 13, 0, 0, 431, 432, 486, 487, -411, 520, 0, + 106, 0, 0, 14, 0, 127, 128, 129, 130, 131, + 132, 133, 134, 135, 136, 137, 138, 10, 11, 0, + 12, 139, 140, 141, 142, 0, 22, 23, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, -411, -411, -411, -411, -411, -411, + -411, -411, -411, 106, 0, 0, 0, 0, 127, 128, + 129, 130, 131, 132, 133, 134, 135, 136, 137, 138, + 10, 11, 0, 12, 139, 140, 141, 142, 0, 143, 144, 145, 146, 147, 148, 149, 150, 107, 106, 0, 0, 0, 0, 127, 128, 129, 130, 131, 132, 133, 134, 135, 206, 137, 138, 0, 0, 0, 0, 0, - 0, 141, 142, 0, 143, 144, 145, 146, 147, 148, - 149, 150, 107, 106, 0, 0, 0, 0, 127, 128, - 129, 130, 131, 132, 133, 134, 135, 206, 0, 0, - 0, 0, 0, 0, 0, 0, 141, 142, 0, 0, + 0, 141, 142, 0, 0, 0, 0, 0, 0, 0, + 591, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 143, 144, 145, 146, 147, 148, 149, 150, + 107, 106, 0, 0, 0, 0, 127, 128, 129, 130, + 131, 132, 133, 134, 135, 206, 137, 138, 0, 0, + 0, 0, 0, 0, 141, 142, 0, 143, 144, 145, + 146, 147, 148, 149, 150, 107, 106, 0, 0, 0, + 0, 127, 128, 129, 130, 131, 132, 133, 134, 135, + 206, 0, 0, 0, 0, 0, 0, 0, 0, 141, + 142, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 143, 144, 145, - 146, 147, 148, 149, 150, 107, 242, 0, 243, 0, + 143, 144, 145, 146, 147, 148, 149, 150, 107, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 244, 245, 0, 246, 247, 248, 0, 0, - 249, 0, 143, 144, 145, 146, 147, 148, 149, 150, - 107, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 250, 0, 0, 0, 251, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 252 + 0, 0, 0, 0, 0, 143, 144, 145, 146, 147, + 148, 149, 150, 107 }; static const yytype_int16 yycheck[] = { - 22, 23, 43, 43, 14, 43, 43, 14, 83, 19, - 20, 43, 43, 83, 2, 83, 26, 354, 83, 2, - 2, 43, 2, 256, 2, 414, 2, 367, 494, 112, - 547, 367, 83, 83, 83, 118, 356, 357, 358, 367, - 233, 83, 292, 659, 242, 86, 86, 3, 86, 86, - 411, 707, 3, 377, 86, 1, 3, 6, 675, 3, - 3, 83, 84, 36, 86, 426, 49, 49, 3, 49, - 3, 49, 19, 49, 3, 85, 6, 87, 88, 89, - 90, 547, 738, 29, 30, 95, 3, 675, 766, 99, - 96, 96, 102, 8, 0, 105, 11, 425, 331, 76, - 778, 74, 76, 427, 97, 78, 101, 97, 103, 102, - 116, 116, 102, 90, 307, 100, 90, 96, 796, 508, - 50, 94, 97, 96, 54, 803, 97, 102, 489, 379, - 74, 75, 76, 77, 78, 79, 80, 81, 3, 756, - 96, 31, 32, 90, 505, 96, 90, 90, 22, 93, - 94, 3, 96, 99, 1, 90, 50, 90, 8, 9, - 54, 90, 102, 185, 108, 109, 97, 242, 756, 113, - 114, 61, 242, 97, 242, 97, 66, 242, 102, 412, - 91, 92, 29, 30, 545, 98, 419, 385, 97, 3, - 98, 242, 242, 242, 97, 712, 110, 111, 112, 527, - 242, 108, 109, 453, 31, 32, 36, 37, 38, 74, - 75, 76, 77, 78, 79, 80, 81, 402, 403, 404, - 242, 328, 329, 330, 97, 90, 419, 98, 93, 94, - 29, 30, 572, 849, 61, 97, 572, 15, 16, 66, - 16, 17, 69, 70, 572, 49, 712, 398, 399, 114, - 400, 401, 97, 90, 98, 97, 96, 98, 101, 875, - 74, 75, 76, 77, 78, 79, 80, 81, 100, 100, - 353, 887, 100, 97, 97, 97, 90, 360, 98, 93, - 94, 97, 799, 31, 32, 97, 97, 97, 298, 98, - 97, 3, 98, 98, 108, 109, 97, 97, 100, 113, - 114, 97, 97, 3, 52, 53, 8, 31, 32, 102, - 385, 101, 100, 61, 62, 385, 100, 385, 66, 48, - 385, 69, 70, 840, 346, 114, 98, 667, 52, 53, - 413, 667, 354, 799, 385, 385, 385, 61, 62, 667, - 98, 424, 66, 385, 385, 69, 70, 580, 98, 98, - 739, 99, 98, 3, 105, 102, 378, 550, 101, 103, - 114, 106, 445, 385, 447, 558, 107, 103, 99, 101, - 103, 59, 99, 115, 840, 97, 104, 610, 103, 97, - 421, 421, 99, 421, 421, 3, 99, 98, 103, 421, - 421, 99, 414, 103, 101, 715, 406, 480, 386, 421, - 101, 104, 385, 386, 386, 101, 386, 101, 386, 431, - 386, 433, 434, 99, 99, 99, 115, 99, 440, 612, - 32, 97, 655, 411, 494, 97, 494, 97, 97, 30, - 452, 99, 99, 626, 627, 628, 99, 425, 97, 522, - 673, 97, 97, 97, 97, 97, 97, 3, 523, 97, - 97, 461, 97, 8, 103, 97, 97, 97, 523, 97, - 97, 502, 502, 97, 502, 502, 97, 97, 97, 67, - 502, 502, 494, 523, 523, 99, 99, 547, 99, 547, - 502, 103, 523, 99, 567, 99, 508, 97, 97, 97, - 97, 3, 97, 97, 97, 115, 36, 114, 36, 99, - 115, 523, 524, 525, 526, 116, 3, 98, 114, 39, - 56, 8, 9, 10, 851, 852, 13, 14, 15, 16, - 103, 117, 100, 115, 60, 547, 23, 537, 538, 115, - 3, 115, 573, 573, 103, 573, 573, 114, 114, 63, - 101, 573, 115, 103, 103, 882, 40, 97, 102, 114, - 99, 573, 115, 3, 102, 97, 114, 545, 8, 9, + 22, 23, 43, 43, 14, 43, 43, 14, 354, 19, + 20, 43, 43, 83, 83, 83, 26, 83, 83, 2, + 2, 43, 2, 256, 2, 2, 2, 414, 367, 112, + 496, 83, 83, 548, 83, 118, 356, 357, 358, 367, + 367, 292, 233, 3, 660, 86, 86, 3, 86, 86, + 3, 3, 242, 411, 86, 1, 377, 676, 3, 19, + 3, 83, 84, 3, 86, 6, 49, 49, 6, 49, + 428, 49, 49, 676, 768, 85, 709, 87, 88, 89, + 90, 96, 548, 29, 30, 95, 780, 0, 427, 99, + 96, 76, 102, 8, 9, 105, 31, 32, 331, 36, + 101, 116, 103, 3, 798, 90, 76, 740, 429, 50, + 116, 805, 8, 54, 100, 11, 307, 52, 53, 22, + 90, 31, 32, 510, 97, 97, 61, 62, 379, 102, + 90, 66, 1, 491, 69, 70, 3, 74, 90, 758, + 96, 78, 50, 96, 102, 90, 54, 90, 97, 507, + 90, 61, 96, 99, 3, 758, 66, 94, 97, 96, + 29, 30, 98, 185, 99, 97, 97, 31, 32, 97, + 102, 102, 242, 242, 242, 97, 242, 242, 97, 412, + 102, 110, 111, 112, 91, 92, 419, 98, 546, 528, + 242, 242, 97, 242, 98, 385, 97, 61, 97, 714, + 29, 30, 66, 49, 455, 69, 70, 74, 75, 76, + 77, 78, 79, 80, 81, 36, 37, 38, 108, 109, + 242, 15, 16, 90, 16, 17, 93, 94, 419, 402, + 403, 404, 398, 399, 573, 851, 328, 329, 330, 4, + 98, 6, 400, 401, 97, 573, 573, 114, 714, 100, + 98, 90, 97, 97, 101, 20, 21, 100, 23, 24, + 25, 877, 100, 28, 96, 98, 97, 97, 102, 97, + 353, 31, 32, 889, 97, 97, 3, 360, 98, 97, + 3, 98, 97, 97, 97, 50, 801, 97, 298, 54, + 98, 100, 52, 53, 101, 8, 100, 100, 48, 98, + 98, 61, 62, 68, 3, 98, 66, 98, 114, 69, + 70, 98, 102, 101, 103, 385, 385, 385, 114, 385, + 385, 105, 107, 106, 346, 103, 99, 842, 99, 668, + 413, 101, 354, 385, 385, 801, 385, 103, 115, 59, + 668, 668, 99, 426, 385, 104, 97, 103, 581, 97, + 99, 3, 98, 115, 741, 99, 378, 99, 103, 32, + 551, 101, 101, 385, 447, 101, 449, 101, 559, 104, + 103, 99, 30, 99, 99, 97, 842, 3, 611, 97, + 97, 422, 422, 97, 422, 422, 8, 99, 99, 99, + 422, 422, 414, 97, 97, 97, 406, 717, 103, 482, + 422, 97, 385, 386, 386, 97, 386, 97, 386, 386, + 386, 433, 97, 435, 436, 97, 97, 97, 97, 103, + 442, 99, 613, 656, 99, 97, 496, 97, 496, 97, + 97, 97, 454, 97, 97, 411, 627, 628, 629, 99, + 523, 674, 97, 99, 67, 99, 99, 97, 97, 97, + 97, 427, 3, 463, 115, 524, 97, 114, 524, 524, + 97, 97, 36, 504, 504, 116, 504, 504, 99, 114, + 98, 115, 504, 504, 496, 524, 36, 4, 548, 6, + 548, 39, 504, 524, 3, 568, 56, 103, 510, 100, + 117, 115, 60, 20, 21, 115, 23, 24, 25, 3, + 115, 28, 524, 525, 526, 527, 103, 853, 854, 3, + 114, 114, 101, 63, 115, 103, 103, 40, 97, 102, + 114, 99, 115, 50, 115, 102, 548, 54, 538, 539, + 114, 97, 76, 574, 574, 115, 574, 574, 884, 115, + 103, 68, 574, 76, 312, 312, 49, 758, 17, 16, + 430, 656, 574, 507, 395, 74, 75, 76, 77, 78, + 79, 80, 81, 50, 693, 613, 574, 769, 450, 396, + 546, 90, 397, 616, 93, 94, 848, 96, 360, 504, + 74, 75, 76, 77, 78, 79, 80, 81, 385, 108, + 109, 850, 753, 718, 113, 114, 90, 573, 852, 93, + 94, 876, 528, 384, 78, 442, 668, 690, 857, 367, + 390, -1, 845, 581, 108, 109, -1, -1, -1, 113, + 114, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, 3, -1, 714, -1, 714, 8, 9, 10, + -1, -1, 13, 14, 15, 16, 678, -1, -1, -1, + -1, -1, 23, -1, -1, -1, 3, -1, -1, -1, + 753, 8, 9, 10, 11, 12, 13, 14, 15, 16, + 17, 18, 19, 20, 21, -1, 23, 24, 25, 26, + 27, -1, 714, 676, 676, -1, 676, -1, 676, 676, + -1, -1, -1, -1, -1, 715, -1, -1, 715, -1, + 732, -1, -1, -1, -1, -1, -1, -1, -1, 741, + -1, 82, 83, 84, 85, 86, 87, 88, 89, 90, + -1, 801, 754, 801, -1, 96, -1, -1, -1, -1, + -1, -1, -1, -1, -1, 82, 83, 84, 85, 86, + 87, 88, 89, 90, -1, -1, -1, -1, -1, 769, + 97, -1, 769, -1, -1, 102, 849, -1, -1, -1, + -1, -1, 842, -1, 842, 758, 758, -1, 758, 801, + 758, 758, -1, -1, -1, -1, -1, 809, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, 808, -1, + -1, 808, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + 842, -1, -1, -1, -1, -1, 867, 867, -1, 867, + 867, 853, 854, -1, -1, 867, 867, -1, -1, -1, + -1, 1, -1, 3, 4, 867, 856, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, - 20, 21, 115, 23, 24, 25, 26, 27, 115, 49, - 76, 4, 115, 6, 572, 82, 83, 84, 85, 86, - 87, 88, 89, 90, 103, 76, 312, 20, 21, 96, - 23, 24, 25, 312, 756, 28, 689, 17, 16, 428, - 843, 655, 505, 395, 397, 396, 50, 615, 692, 573, - 612, 767, 385, 448, 502, 360, 846, 50, 751, 848, - 716, 54, 82, 83, 84, 85, 86, 87, 88, 89, - 90, 850, 712, 874, 712, 68, 384, 97, 527, 440, - 78, 390, 102, 855, 667, 677, -1, 580, -1, -1, - -1, 367, -1, -1, -1, -1, -1, -1, 751, 1, - -1, -1, 4, 5, 6, 7, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, 20, 21, - 712, 23, 675, 675, -1, 675, 28, 675, -1, 675, - -1, -1, -1, 713, -1, -1, 713, -1, 730, 41, - 42, 43, 44, -1, -1, -1, -1, 739, 50, 51, - -1, -1, 54, -1, -1, 57, -1, -1, -1, 799, - 752, 799, 64, 65, -1, -1, -1, -1, -1, 71, - 72, 73, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, 767, -1, -1, - 767, -1, -1, 95, 847, -1, -1, 99, -1, -1, - 840, -1, 840, 756, 756, -1, 756, 799, 756, -1, - 756, -1, -1, -1, -1, 807, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, 806, -1, -1, 806, + 20, 21, 884, 23, -1, -1, 26, 27, 28, -1, + -1, 31, 32, 33, 34, 35, -1, -1, -1, -1, + -1, 41, -1, -1, -1, 45, 46, 47, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, 64, 65, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, 840, -1, - -1, -1, -1, -1, 865, 865, -1, 865, 865, 851, - 852, -1, -1, 865, 865, -1, -1, -1, -1, 1, - -1, 3, 4, 865, 854, 7, 8, 9, 10, 11, + -1, -1, 82, 83, 84, 85, 86, 87, 88, 89, + 90, -1, -1, -1, -1, 1, 96, 3, 4, 99, + -1, 7, 8, 9, 10, 11, 12, 13, 14, 15, + 16, 17, 18, 19, 20, 21, -1, 23, -1, -1, + 26, 27, 28, -1, -1, 31, 32, 33, 34, 35, + -1, -1, -1, -1, -1, 41, -1, -1, -1, 45, + 46, 47, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, 64, 65, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, 82, 83, 84, 85, + 86, 87, 88, 89, 90, -1, -1, -1, -1, 1, + 96, 3, 4, 99, -1, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, - 882, 23, -1, -1, 26, 27, 28, -1, -1, 31, + -1, 23, -1, -1, 26, 27, 28, -1, -1, 31, 32, 33, 34, 35, -1, -1, -1, -1, -1, 41, - -1, -1, -1, 45, 46, 47, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, 45, -1, -1, -1, -1, -1, -1, + -1, -1, -1, 55, -1, -1, -1, -1, -1, -1, -1, -1, 64, 65, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 82, 83, 84, 85, 86, 87, 88, 89, 90, -1, - -1, -1, -1, 1, 96, 3, 4, 99, -1, 7, - 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, - 18, 19, 20, 21, -1, 23, -1, -1, 26, 27, - 28, -1, -1, 31, 32, 33, 34, 35, -1, -1, - -1, -1, -1, 41, -1, -1, -1, 45, 46, 47, + -1, -1, 1, -1, 3, 4, -1, 99, 7, 8, + 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, + 19, 20, 21, -1, 23, -1, -1, 26, 27, 28, + -1, -1, 31, 32, 33, 34, 35, -1, -1, -1, + -1, -1, 41, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, 64, 65, -1, -1, + -1, -1, -1, -1, -1, 64, 65, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, 82, 83, 84, 85, 86, 87, - 88, 89, 90, -1, -1, -1, -1, 1, 96, 3, - 4, 99, -1, 7, 8, 9, 10, 11, 12, 13, - 14, 15, 16, 17, 18, 19, 20, 21, -1, 23, - -1, -1, 26, 27, 28, -1, -1, 31, 32, 33, - 34, 35, -1, -1, -1, -1, -1, 41, -1, -1, - -1, 45, -1, -1, -1, -1, -1, -1, -1, -1, - -1, 55, -1, -1, -1, -1, -1, -1, -1, -1, - 64, 65, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, 82, 83, - 84, 85, 86, 87, 88, 89, 90, -1, -1, -1, - 1, -1, 3, 4, -1, 99, 7, 8, 9, 10, + -1, -1, -1, 82, 83, 84, 85, 86, 87, 88, + 89, 90, -1, -1, -1, -1, 1, 96, 3, 4, + 99, -1, 7, 8, 9, 10, 11, 12, 13, 14, + 15, 16, 17, 18, 19, 20, 21, -1, 23, -1, + -1, 26, 27, 28, -1, -1, 31, 32, 33, 34, + 35, -1, -1, -1, -1, -1, 41, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, 64, + 65, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, 82, 83, 84, + 85, 86, 87, 88, 89, 90, -1, -1, -1, -1, + 1, 96, 3, 4, 99, -1, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, -1, 23, -1, -1, 26, 27, 28, -1, -1, 31, 32, 33, 34, 35, -1, -1, -1, -1, -1, 41, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + 1, -1, -1, 4, 5, 6, 7, -1, -1, -1, + -1, -1, -1, 64, 65, -1, -1, -1, -1, 20, + 21, -1, 23, -1, -1, -1, -1, 28, -1, -1, + -1, 82, 83, 84, 85, 86, 87, 88, 89, 90, + 41, 42, 43, 44, -1, 96, -1, -1, 99, 50, + 51, -1, -1, 54, -1, -1, 57, -1, -1, -1, -1, -1, -1, 64, 65, -1, -1, -1, -1, -1, + 71, 72, 73, 3, 4, -1, -1, 7, 8, 9, + 10, 11, 12, 13, 14, 15, 16, 17, 18, -1, + -1, -1, -1, 23, 95, -1, 26, 27, 99, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, 82, 83, 84, 85, 86, 87, 88, 89, 90, - -1, -1, -1, -1, 1, 96, 3, 4, 99, -1, - 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, - 17, 18, 19, 20, 21, -1, 23, -1, -1, 26, - 27, 28, -1, -1, 31, 32, 33, 34, 35, -1, - -1, -1, -1, -1, 41, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, 64, 65, -1, + 0, 1, -1, -1, 4, 5, 6, 7, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, 82, 83, 84, 85, 86, - 87, 88, 89, 90, -1, -1, -1, -1, 1, 96, - 3, 4, 99, -1, 7, 8, 9, 10, 11, 12, + 20, 21, -1, 23, -1, -1, -1, -1, 28, -1, + -1, -1, 82, 83, 84, 85, 86, 87, 88, 89, + 90, 41, 42, 43, 44, -1, -1, -1, -1, 99, + 50, 51, -1, -1, 54, -1, -1, 57, -1, -1, + -1, -1, -1, -1, 64, 65, 1, -1, 3, -1, + -1, 71, 72, 8, 9, 10, 11, 12, 13, 14, + 15, 16, 17, 18, 19, 20, 21, -1, 23, 24, + 25, 26, 27, -1, -1, 95, 96, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, 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, -1, 28, -1, -1, -1, 82, 83, 84, + 85, 86, 87, 88, 89, 90, 41, 42, 43, 44, + -1, 96, -1, -1, -1, 50, 51, -1, -1, 54, + -1, -1, 57, -1, -1, -1, -1, -1, 1, 64, + 65, 4, 5, 6, 7, -1, 71, 72, -1, -1, + -1, -1, -1, -1, -1, -1, -1, 20, 21, -1, + 23, -1, -1, 1, -1, 28, 4, 5, 6, 7, + 95, 96, -1, -1, -1, -1, -1, -1, 41, 42, + 43, 44, 20, 21, -1, 23, -1, 50, 51, -1, + 28, 54, -1, -1, 57, -1, -1, -1, -1, -1, + -1, 64, 65, 41, 42, 43, 44, -1, 71, 72, + 73, -1, 50, 51, -1, -1, 54, -1, -1, 57, + -1, -1, -1, -1, -1, -1, 64, 65, -1, -1, + 3, -1, 95, 71, 72, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, -1, - 23, -1, -1, 26, 27, 28, -1, -1, 31, 32, - 33, 34, 35, -1, -1, 3, 4, -1, 41, 7, + 23, 24, 25, 26, 27, 3, -1, 95, -1, -1, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, - 18, -1, -1, -1, -1, 23, -1, -1, 26, 27, - -1, 64, 65, -1, -1, -1, -1, -1, -1, -1, + 18, 19, -1, -1, -1, -1, 24, 25, 26, 27, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 82, 83, 84, 85, 86, 87, 88, 89, 90, -1, -1, - -1, -1, -1, 96, -1, -1, 99, -1, -1, -1, - -1, -1, -1, -1, 0, 1, -1, -1, 4, 5, - 6, 7, -1, -1, 82, 83, 84, 85, 86, 87, - 88, 89, 90, -1, 20, 21, -1, 23, 3, -1, - -1, 99, 28, 8, 9, 10, 11, 12, 13, 14, - 15, 16, 17, 18, 19, 41, 42, 43, 44, 24, - 25, 26, 27, -1, 50, 51, -1, -1, 54, -1, - -1, 57, -1, -1, -1, -1, -1, -1, 64, 65, - 1, -1, 3, -1, -1, 71, 72, 8, 9, 10, - 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, - 21, -1, 23, 24, 25, 26, 27, -1, -1, 95, - 96, -1, -1, -1, -1, -1, -1, 82, 83, 84, - 85, 86, 87, 88, 89, 90, -1, -1, -1, -1, - 1, 96, -1, 4, 5, 6, 7, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, -1, 20, - 21, -1, 23, -1, -1, -1, -1, 28, -1, -1, - -1, 82, 83, 84, 85, 86, 87, 88, 89, 90, - 41, 42, 43, 44, -1, 96, -1, -1, -1, 50, - 51, -1, -1, 54, -1, -1, 57, -1, -1, -1, - -1, -1, 1, 64, 65, 4, 5, 6, 7, -1, - 71, 72, -1, -1, -1, -1, -1, -1, -1, -1, - -1, 20, 21, -1, 23, -1, -1, 1, -1, 28, - 4, 5, 6, 7, 95, 96, -1, -1, -1, -1, - -1, -1, 41, 42, 43, 44, 20, 21, -1, 23, - -1, 50, 51, -1, 28, 54, -1, -1, 57, -1, - -1, -1, -1, -1, -1, 64, 65, 41, 42, 43, - 44, -1, 71, 72, 73, -1, 50, 51, -1, -1, - 54, -1, -1, 57, -1, -1, -1, -1, -1, -1, - 64, 65, -1, -1, 3, -1, 95, 71, 72, 8, - 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, - 19, 20, 21, -1, 23, 24, 25, 26, 27, -1, - 1, 95, 3, 4, -1, -1, 7, 8, 9, 10, - 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, - 21, -1, 23, -1, -1, 26, 27, 28, -1, -1, - 31, 32, 33, 34, 35, -1, -1, -1, -1, -1, - 41, -1, -1, -1, 45, 46, 47, -1, -1, -1, - -1, -1, -1, 82, 83, 84, 85, 86, 87, 88, - 89, 90, -1, 64, 65, -1, -1, 96, -1, -1, + -1, -1, -1, 96, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, 82, 83, 84, 85, 86, 87, + 88, 89, 90, 1, -1, 3, 4, -1, 96, 7, + 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, + 18, 19, 20, 21, -1, 23, -1, -1, 26, 27, + 28, -1, -1, 31, 32, 33, 34, 35, -1, -1, + -1, -1, -1, 41, -1, -1, -1, 45, 46, 47, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, 82, 83, 84, 85, 86, 87, 88, 89, 90, - 1, -1, 3, 4, -1, -1, 7, 8, 9, 10, - 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, - 21, -1, 23, -1, -1, 26, 27, 28, -1, -1, - 31, 32, 33, 34, 35, 1, -1, 3, -1, -1, - 41, -1, 8, 9, 10, 11, 12, 13, 14, 15, - 16, 17, 18, 19, 20, 21, -1, 23, 24, 25, - 26, 27, -1, 64, 65, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, 64, 65, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, 82, 83, 84, 85, 86, 87, 88, 89, 90, - 3, -1, -1, -1, -1, 8, 9, 10, 11, 12, - 13, 14, 15, 16, 17, 18, 19, 20, 21, -1, - 23, 24, 25, 26, 27, -1, 82, 83, 84, 85, - 86, 87, 88, 89, 90, 3, -1, -1, -1, -1, + -1, -1, -1, -1, 82, 83, 84, 85, 86, 87, + 88, 89, 90, 1, -1, 3, 4, -1, -1, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, - 18, 19, -1, -1, -1, -1, -1, -1, 26, 27, - -1, -1, -1, -1, -1, -1, -1, 35, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, -1, 82, + 18, 19, 20, 21, -1, 23, -1, -1, 26, 27, + 28, -1, -1, 31, 32, 33, 34, 35, 1, -1, + 3, -1, -1, 41, -1, 8, 9, 10, 11, 12, + 13, 14, 15, 16, 17, 18, 19, 20, 21, -1, + 23, 24, 25, 26, 27, -1, 64, 65, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, 82, 83, 84, 85, 86, 87, + 88, 89, 90, 3, -1, -1, -1, -1, 8, 9, + 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, + 20, 21, -1, 23, 24, 25, 26, 27, -1, 82, 83, 84, 85, 86, 87, 88, 89, 90, 3, -1, -1, -1, -1, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, -1, -1, -1, -1, -1, - -1, 26, 27, -1, 82, 83, 84, 85, 86, 87, - 88, 89, 90, 3, -1, -1, -1, -1, 8, 9, - 10, 11, 12, 13, 14, 15, 16, 17, -1, -1, - -1, -1, -1, -1, -1, -1, 26, 27, -1, -1, + -1, 26, 27, -1, -1, -1, -1, -1, -1, -1, + 35, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, 82, 83, 84, 85, 86, 87, 88, 89, + 90, 3, -1, -1, -1, -1, 8, 9, 10, 11, + 12, 13, 14, 15, 16, 17, 18, 19, -1, -1, + -1, -1, -1, -1, 26, 27, -1, 82, 83, 84, + 85, 86, 87, 88, 89, 90, 3, -1, -1, -1, + -1, 8, 9, 10, 11, 12, 13, 14, 15, 16, + 17, -1, -1, -1, -1, -1, -1, -1, -1, 26, + 27, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, 82, 83, 84, - 85, 86, 87, 88, 89, 90, 4, -1, 6, -1, + 82, 83, 84, 85, 86, 87, 88, 89, 90, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, 20, 21, -1, 23, 24, 25, -1, -1, - 28, -1, 82, 83, 84, 85, 86, 87, 88, 89, - 90, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, 50, -1, -1, -1, 54, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - 68 + -1, -1, -1, -1, -1, 82, 83, 84, 85, 86, + 87, 88, 89, 90 }; /* YYSTOS[STATE-NUM] -- The symbol kind of the accessing symbol of @@ -2033,92 +2070,92 @@ static const yytype_int16 yystos[] = 54, 57, 64, 65, 71, 72, 95, 122, 123, 139, 141, 145, 146, 158, 161, 162, 166, 168, 171, 172, 173, 177, 181, 183, 187, 188, 213, 214, 232, 240, - 241, 249, 258, 278, 280, 291, 293, 315, 316, 317, - 363, 414, 415, 416, 417, 418, 422, 444, 446, 469, - 470, 471, 472, 473, 477, 478, 479, 482, 486, 494, - 507, 508, 138, 215, 140, 167, 250, 279, 292, 318, - 364, 3, 212, 266, 166, 54, 166, 181, 183, 54, - 173, 183, 184, 212, 212, 447, 3, 90, 208, 211, - 208, 495, 509, 212, 100, 142, 131, 147, 159, 97, + 241, 249, 258, 278, 280, 292, 294, 316, 317, 318, + 364, 415, 416, 417, 418, 419, 423, 445, 447, 470, + 471, 472, 473, 474, 478, 479, 480, 483, 487, 495, + 508, 509, 138, 215, 140, 167, 250, 279, 293, 319, + 365, 3, 212, 266, 166, 54, 166, 181, 183, 54, + 173, 183, 184, 212, 212, 448, 3, 90, 208, 211, + 208, 496, 510, 212, 100, 142, 131, 147, 159, 97, 97, 130, 102, 169, 163, 132, 174, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 24, 25, 26, 27, 82, 83, 84, 85, 86, 87, 88, 89, 169, 208, 253, 254, 255, 256, 257, 268, 269, 270, 271, 272, 273, 274, 275, 276, 277, 278, 280, - 291, 293, 317, 326, 327, 330, 333, 336, 337, 340, - 341, 344, 128, 124, 122, 96, 242, 125, 281, 22, - 129, 126, 127, 133, 419, 134, 445, 135, 169, 480, - 480, 136, 137, 98, 511, 97, 17, 208, 219, 268, - 271, 272, 273, 274, 275, 337, 341, 208, 212, 251, + 292, 294, 318, 327, 328, 331, 334, 337, 338, 341, + 342, 345, 128, 124, 122, 96, 242, 125, 281, 22, + 129, 126, 127, 133, 420, 134, 446, 135, 169, 481, + 481, 136, 137, 98, 512, 97, 17, 208, 219, 268, + 271, 272, 273, 274, 275, 338, 342, 208, 212, 251, 253, 212, 212, 212, 212, 169, 212, 169, 178, 212, - 212, 423, 212, 209, 76, 90, 76, 3, 241, 98, + 212, 424, 212, 209, 76, 90, 76, 3, 241, 98, 98, 97, 4, 6, 20, 21, 23, 24, 25, 28, - 50, 54, 68, 487, 488, 490, 241, 504, 97, 49, - 185, 98, 97, 98, 8, 11, 8, 9, 100, 334, - 328, 182, 101, 101, 103, 100, 100, 97, 97, 208, - 97, 98, 294, 97, 97, 97, 97, 98, 97, 98, - 456, 97, 481, 474, 483, 97, 97, 512, 216, 252, - 319, 365, 98, 102, 425, 448, 211, 210, 496, 3, - 242, 233, 143, 219, 100, 3, 148, 489, 74, 75, + 50, 54, 68, 488, 489, 491, 241, 505, 97, 49, + 185, 98, 97, 98, 8, 11, 8, 9, 100, 335, + 329, 182, 101, 101, 103, 100, 100, 97, 97, 208, + 97, 98, 295, 97, 97, 97, 97, 98, 97, 98, + 457, 97, 482, 475, 484, 97, 97, 513, 216, 252, + 320, 366, 98, 102, 426, 449, 211, 210, 497, 3, + 242, 233, 143, 219, 100, 3, 148, 490, 74, 75, 76, 77, 78, 79, 80, 81, 93, 94, 108, 109, 113, 114, 208, 220, 221, 222, 223, 224, 225, 226, - 227, 228, 229, 230, 506, 101, 170, 164, 175, 8, - 221, 231, 100, 100, 48, 186, 331, 338, 342, 243, - 282, 114, 420, 457, 186, 98, 98, 514, 212, 212, - 259, 262, 266, 267, 345, 98, 98, 179, 426, 424, - 102, 453, 211, 98, 510, 234, 120, 121, 3, 101, + 227, 228, 229, 230, 507, 101, 170, 164, 175, 8, + 221, 231, 100, 100, 48, 186, 332, 339, 343, 243, + 282, 114, 421, 458, 186, 98, 98, 515, 212, 212, + 259, 262, 266, 267, 346, 98, 98, 179, 427, 425, + 102, 454, 211, 98, 511, 234, 120, 121, 3, 101, 103, 229, 229, 229, 221, 105, 106, 107, 91, 92, - 108, 109, 110, 111, 112, 505, 160, 205, 208, 194, - 195, 189, 103, 335, 241, 205, 231, 231, 231, 114, - 244, 241, 284, 286, 295, 427, 459, 475, 484, 31, - 32, 61, 66, 69, 70, 352, 353, 358, 436, 438, - 439, 503, 513, 515, 217, 346, 260, 320, 366, 194, - 208, 186, 454, 449, 497, 425, 7, 99, 214, 219, - 235, 237, 238, 276, 317, 144, 101, 149, 490, 115, - 223, 224, 225, 226, 226, 227, 227, 228, 228, 228, - 103, 212, 206, 1, 33, 34, 165, 196, 214, 240, - 249, 352, 363, 368, 373, 414, 415, 45, 46, 47, - 176, 190, 192, 193, 196, 240, 375, 221, 241, 254, - 332, 339, 343, 211, 221, 245, 246, 248, 1, 253, - 287, 283, 285, 241, 52, 53, 62, 240, 352, 421, - 428, 436, 438, 441, 442, 443, 503, 45, 55, 196, - 458, 460, 463, 466, 194, 189, 354, 359, 19, 208, - 437, 59, 440, 208, 208, 518, 516, 517, 437, 519, - 99, 104, 241, 103, 241, 322, 325, 285, 180, 208, - 186, 499, 500, 236, 97, 212, 97, 99, 3, 98, - 241, 103, 204, 99, 200, 196, 197, 202, 201, 203, - 35, 208, 255, 337, 341, 374, 397, 198, 199, 376, - 99, 287, 190, 191, 101, 254, 329, 101, 101, 101, - 104, 115, 103, 247, 290, 288, 99, 286, 8, 208, - 268, 273, 274, 275, 300, 317, 208, 208, 208, 428, - 434, 99, 429, 430, 431, 432, 433, 435, 212, 212, - 99, 461, 462, 476, 485, 32, 397, 211, 3, 3, - 97, 97, 97, 211, 97, 218, 116, 347, 349, 261, - 3, 321, 323, 367, 99, 450, 498, 240, 352, 436, - 438, 501, 251, 30, 239, 150, 506, 207, 97, 97, - 97, 97, 97, 97, 369, 97, 97, 3, 97, 103, - 221, 211, 248, 97, 259, 296, 211, 211, 211, 97, - 97, 97, 97, 97, 97, 97, 464, 467, 97, 97, - 99, 99, 355, 360, 220, 350, 348, 262, 99, 103, - 99, 67, 99, 501, 502, 97, 97, 97, 221, 97, - 73, 123, 139, 152, 154, 155, 208, 3, 377, 241, - 247, 289, 115, 114, 379, 379, 397, 263, 266, 231, - 349, 324, 451, 97, 208, 151, 153, 97, 370, 379, - 254, 97, 297, 380, 381, 465, 468, 356, 361, 264, - 351, 325, 208, 156, 99, 154, 114, 388, 378, 98, - 115, 36, 382, 385, 39, 399, 399, 263, 56, 402, - 103, 117, 452, 100, 389, 390, 371, 399, 298, 386, - 115, 383, 400, 357, 403, 362, 265, 60, 455, 3, - 491, 493, 115, 36, 37, 38, 391, 394, 398, 399, - 1, 29, 30, 301, 303, 307, 309, 397, 103, 114, - 399, 114, 63, 405, 266, 208, 101, 492, 115, 392, - 395, 372, 306, 311, 310, 299, 302, 304, 308, 387, - 384, 401, 404, 406, 157, 103, 103, 397, 40, 408, - 97, 221, 102, 99, 303, 241, 309, 262, 385, 205, - 205, 114, 212, 493, 393, 396, 409, 312, 253, 313, - 115, 115, 407, 394, 262, 114, 102, 314, 305, 205, - 410, 262, 97, 115, 76, 411, 412, 115, 103, 413, - 76 + 108, 109, 110, 111, 112, 506, 160, 205, 208, 194, + 195, 189, 103, 336, 241, 205, 231, 231, 231, 114, + 244, 99, 241, 283, 284, 287, 296, 428, 460, 476, + 485, 31, 32, 61, 66, 69, 70, 353, 354, 359, + 437, 439, 440, 504, 514, 516, 217, 347, 260, 321, + 367, 194, 208, 186, 455, 450, 498, 426, 7, 99, + 214, 219, 235, 237, 238, 276, 318, 144, 101, 149, + 491, 115, 223, 224, 225, 226, 226, 227, 227, 228, + 228, 228, 103, 212, 206, 1, 33, 34, 165, 196, + 214, 240, 249, 353, 364, 369, 374, 415, 416, 45, + 46, 47, 176, 190, 192, 193, 196, 240, 376, 221, + 241, 254, 333, 340, 344, 211, 221, 245, 246, 248, + 1, 253, 288, 286, 241, 52, 53, 62, 240, 353, + 422, 429, 437, 439, 442, 443, 444, 504, 45, 55, + 196, 459, 461, 464, 467, 194, 189, 355, 360, 19, + 208, 438, 59, 441, 208, 208, 519, 517, 518, 438, + 520, 99, 104, 241, 103, 241, 323, 326, 286, 180, + 208, 186, 500, 501, 236, 97, 212, 97, 99, 3, + 98, 241, 103, 204, 99, 200, 196, 197, 202, 201, + 203, 35, 208, 255, 338, 342, 375, 398, 198, 199, + 377, 99, 288, 190, 191, 101, 254, 330, 101, 101, + 101, 104, 115, 103, 247, 291, 289, 285, 287, 8, + 208, 268, 273, 274, 275, 301, 318, 208, 208, 208, + 429, 435, 99, 430, 431, 432, 433, 434, 436, 212, + 212, 99, 462, 463, 477, 486, 32, 398, 211, 3, + 3, 97, 97, 97, 211, 97, 218, 116, 348, 350, + 261, 3, 322, 324, 368, 99, 451, 499, 240, 353, + 437, 439, 502, 251, 30, 239, 150, 507, 207, 97, + 97, 97, 97, 97, 97, 370, 97, 97, 3, 97, + 103, 221, 211, 248, 97, 259, 99, 297, 211, 211, + 211, 97, 97, 97, 97, 97, 97, 97, 465, 468, + 97, 97, 99, 99, 356, 361, 220, 351, 349, 262, + 99, 103, 99, 67, 99, 502, 503, 97, 97, 97, + 221, 97, 73, 123, 139, 152, 154, 155, 208, 3, + 378, 241, 247, 290, 115, 114, 380, 380, 398, 263, + 266, 231, 350, 325, 452, 97, 208, 151, 153, 97, + 371, 380, 254, 97, 298, 381, 382, 466, 469, 357, + 362, 264, 352, 326, 208, 156, 99, 154, 114, 389, + 379, 98, 115, 36, 383, 386, 39, 400, 400, 263, + 56, 403, 103, 117, 453, 100, 390, 391, 372, 400, + 299, 387, 115, 384, 401, 358, 404, 363, 265, 60, + 456, 3, 492, 494, 115, 36, 37, 38, 392, 395, + 399, 400, 1, 29, 30, 302, 304, 308, 310, 398, + 103, 114, 400, 114, 63, 406, 266, 208, 101, 493, + 115, 393, 396, 373, 307, 312, 311, 300, 303, 305, + 309, 388, 385, 402, 405, 407, 157, 103, 103, 398, + 40, 409, 97, 221, 102, 99, 304, 241, 310, 262, + 386, 205, 205, 114, 212, 494, 394, 397, 410, 313, + 253, 314, 115, 115, 408, 395, 262, 114, 102, 315, + 306, 205, 411, 262, 97, 115, 76, 412, 413, 115, + 103, 414, 76 }; /* YYR1[RULE-NUM] -- Symbol kind of the left-hand side of rule RULE-NUM. */ @@ -2146,46 +2183,46 @@ static const yytype_int16 yyr1[] = 230, 230, 230, 230, 230, 230, 231, 233, 232, 234, 234, 235, 235, 235, 236, 235, 237, 237, 238, 239, 239, 240, 241, 241, 243, 242, 244, 244, 245, 245, - 246, 247, 247, 248, 250, 249, 249, 249, 249, 249, - 249, 252, 251, 253, 253, 254, 254, 254, 255, 255, - 255, 255, 255, 255, 255, 255, 256, 256, 256, 256, - 256, 257, 257, 257, 258, 258, 259, 261, 260, 260, - 262, 262, 263, 265, 264, 264, 266, 267, 268, 268, - 269, 269, 269, 269, 269, 269, 269, 270, 270, 270, - 270, 270, 270, 270, 271, 271, 271, 272, 273, 273, - 274, 275, 276, 277, 279, 278, 281, 282, 283, 280, - 284, 285, 285, 286, 288, 289, 287, 290, 287, 292, - 291, 294, 295, 296, 297, 298, 299, 293, 300, 300, - 300, 300, 300, 300, 301, 302, 302, 304, 305, 303, - 306, 303, 307, 308, 308, 310, 309, 311, 312, 309, - 314, 313, 315, 316, 318, 319, 320, 321, 317, 322, - 324, 323, 323, 325, 326, 328, 329, 327, 331, 332, - 330, 330, 334, 335, 333, 336, 338, 339, 337, 337, - 340, 342, 343, 341, 341, 344, 346, 345, 347, 348, - 348, 350, 351, 349, 352, 352, 354, 355, 356, 357, - 353, 359, 360, 361, 362, 358, 364, 365, 366, 367, - 363, 369, 370, 371, 372, 368, 373, 373, 373, 374, - 374, 376, 377, 378, 375, 380, 379, 381, 379, 382, - 384, 383, 383, 386, 387, 385, 389, 388, 390, 388, - 391, 393, 392, 392, 395, 396, 394, 397, 397, 397, - 397, 398, 398, 398, 400, 401, 399, 399, 403, 404, - 402, 402, 406, 407, 405, 405, 409, 410, 408, 408, - 411, 413, 412, 412, 414, 415, 416, 416, 417, 419, - 420, 421, 418, 423, 424, 422, 426, 425, 425, 427, - 427, 427, 429, 428, 430, 428, 431, 428, 432, 428, - 433, 428, 434, 428, 435, 428, 436, 437, 437, 438, - 439, 440, 440, 441, 442, 443, 445, 444, 447, 448, - 449, 450, 451, 452, 446, 454, 453, 453, 455, 455, - 457, 458, 456, 459, 459, 460, 461, 460, 462, 460, - 464, 465, 463, 467, 468, 466, 469, 469, 469, 470, - 470, 471, 472, 474, 475, 476, 473, 477, 478, 479, - 481, 480, 483, 484, 485, 482, 486, 486, 487, 487, - 487, 487, 487, 487, 487, 487, 487, 487, 487, 488, - 489, 489, 490, 490, 491, 492, 492, 493, 495, 496, - 497, 498, 494, 499, 499, 500, 500, 501, 501, 502, - 501, 503, 503, 504, 505, 505, 506, 507, 509, 510, - 508, 512, 513, 511, 514, 514, 516, 515, 517, 515, - 518, 515, 519, 515 + 245, 246, 247, 247, 248, 250, 249, 249, 249, 249, + 249, 249, 252, 251, 253, 253, 254, 254, 254, 255, + 255, 255, 255, 255, 255, 255, 255, 256, 256, 256, + 256, 256, 257, 257, 257, 258, 258, 259, 261, 260, + 260, 262, 262, 263, 265, 264, 264, 266, 267, 268, + 268, 269, 269, 269, 269, 269, 269, 269, 270, 270, + 270, 270, 270, 270, 270, 271, 271, 271, 272, 273, + 273, 274, 275, 276, 277, 279, 278, 281, 282, 280, + 283, 283, 285, 284, 286, 286, 287, 289, 290, 288, + 291, 288, 293, 292, 295, 296, 297, 298, 299, 300, + 294, 301, 301, 301, 301, 301, 301, 302, 303, 303, + 305, 306, 304, 307, 304, 308, 309, 309, 311, 310, + 312, 313, 310, 315, 314, 316, 317, 319, 320, 321, + 322, 318, 323, 325, 324, 324, 326, 327, 329, 330, + 328, 332, 333, 331, 331, 335, 336, 334, 337, 339, + 340, 338, 338, 341, 343, 344, 342, 342, 345, 347, + 346, 348, 349, 349, 351, 352, 350, 353, 353, 355, + 356, 357, 358, 354, 360, 361, 362, 363, 359, 365, + 366, 367, 368, 364, 370, 371, 372, 373, 369, 374, + 374, 374, 375, 375, 377, 378, 379, 376, 381, 380, + 382, 380, 383, 385, 384, 384, 387, 388, 386, 390, + 389, 391, 389, 392, 394, 393, 393, 396, 397, 395, + 398, 398, 398, 398, 399, 399, 399, 401, 402, 400, + 400, 404, 405, 403, 403, 407, 408, 406, 406, 410, + 411, 409, 409, 412, 414, 413, 413, 415, 416, 417, + 417, 418, 420, 421, 422, 419, 424, 425, 423, 427, + 426, 426, 428, 428, 428, 430, 429, 431, 429, 432, + 429, 433, 429, 434, 429, 435, 429, 436, 429, 437, + 438, 438, 439, 440, 441, 441, 442, 443, 444, 446, + 445, 448, 449, 450, 451, 452, 453, 447, 455, 454, + 454, 456, 456, 458, 459, 457, 460, 460, 461, 462, + 461, 463, 461, 465, 466, 464, 468, 469, 467, 470, + 470, 470, 471, 471, 472, 473, 475, 476, 477, 474, + 478, 479, 480, 482, 481, 484, 485, 486, 483, 487, + 487, 488, 488, 488, 488, 488, 488, 488, 488, 488, + 488, 488, 489, 490, 490, 491, 491, 492, 493, 493, + 494, 496, 497, 498, 499, 495, 500, 500, 501, 501, + 502, 502, 503, 502, 504, 504, 505, 506, 506, 507, + 508, 510, 511, 509, 513, 514, 512, 515, 515, 517, + 516, 518, 516, 519, 516, 520, 516 }; /* YYR2[RULE-NUM] -- Number of symbols on the right-hand side of rule RULE-NUM. */ @@ -2213,46 +2250,46 @@ static const yytype_int8 yyr2[] = 1, 1, 1, 1, 1, 1, 1, 0, 6, 2, 0, 1, 2, 2, 0, 4, 1, 1, 4, 2, 0, 2, 2, 0, 0, 4, 3, 0, 1, 1, - 2, 3, 0, 3, 0, 3, 1, 1, 1, 2, - 1, 0, 3, 1, 1, 1, 1, 1, 1, 1, + 0, 2, 3, 0, 3, 0, 3, 1, 1, 1, + 2, 1, 0, 3, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 2, 0, 4, + 0, 1, 1, 2, 0, 4, 0, 1, 1, 1, + 1, 1, 2, 1, 1, 1, 1, 1, 2, 3, + 2, 1, 1, 1, 1, 1, 1, 2, 1, 1, + 1, 1, 1, 1, 1, 0, 3, 0, 0, 5, + 1, 1, 0, 4, 2, 0, 2, 0, 0, 5, + 0, 3, 0, 3, 0, 0, 0, 0, 0, 0, + 15, 1, 1, 1, 1, 1, 1, 2, 2, 0, + 0, 0, 6, 0, 3, 2, 2, 0, 0, 3, + 0, 0, 5, 0, 3, 1, 1, 0, 0, 0, + 0, 9, 2, 0, 4, 0, 2, 2, 0, 0, + 9, 0, 0, 6, 2, 0, 0, 6, 6, 0, + 0, 6, 1, 1, 0, 0, 6, 1, 1, 0, + 4, 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, 3, 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, - 1, 1, 1, 1, 1, 1, 2, 0, 4, 0, - 1, 1, 2, 0, 4, 0, 1, 1, 1, 1, - 1, 2, 1, 1, 1, 1, 1, 2, 3, 2, - 1, 1, 1, 1, 1, 1, 2, 1, 1, 1, - 1, 1, 1, 1, 0, 3, 0, 0, 0, 7, - 2, 2, 0, 2, 0, 0, 5, 0, 3, 0, - 3, 0, 0, 0, 0, 0, 0, 15, 1, 1, - 1, 1, 1, 1, 2, 2, 0, 0, 0, 6, - 0, 3, 2, 2, 0, 0, 3, 0, 0, 5, - 0, 3, 1, 1, 0, 0, 0, 0, 9, 2, - 0, 4, 0, 2, 2, 0, 0, 9, 0, 0, - 6, 2, 0, 0, 6, 6, 0, 0, 6, 1, - 1, 0, 0, 6, 1, 1, 0, 4, 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, 3, - 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, 1, 2, 2, - 3, 0, 2, 5, 2, 3, 0, 1, 0, 0, - 0, 0, 9, 3, 2, 1, 0, 2, 2, 0, - 3, 3, 3, 3, 4, 0, 1, 2, 0, 0, - 6, 0, 0, 5, 2, 0, 0, 3, 0, 3, - 0, 3, 0, 3 + 1, 2, 2, 3, 0, 2, 5, 2, 3, 0, + 1, 0, 0, 0, 0, 9, 3, 2, 1, 0, + 2, 2, 0, 3, 3, 3, 3, 4, 0, 1, + 2, 0, 0, 6, 0, 0, 5, 2, 0, 0, + 3, 0, 3, 0, 3, 0, 3 }; @@ -2731,7 +2768,7 @@ yyparse (void) } delete annotations; } -#line 2747 "fe/idl.tab.cpp" +#line 2772 "fe/idl.tab.cpp" break; case 10: /* $@1: %empty */ @@ -2739,7 +2776,7 @@ yyparse (void) { idl_global->set_parse_state (IDL_GlobalData::PS_AnnotationDeclSeen); } -#line 2755 "fe/idl.tab.cpp" +#line 2780 "fe/idl.tab.cpp" break; case 11: /* fixed_definition: annotation_dcl $@1 ';' */ @@ -2747,7 +2784,7 @@ yyparse (void) { idl_global->set_parse_state (IDL_GlobalData::PS_NoState); } -#line 2763 "fe/idl.tab.cpp" +#line 2788 "fe/idl.tab.cpp" break; case 12: /* $@2: %empty */ @@ -2755,7 +2792,7 @@ yyparse (void) { idl_global->set_parse_state (IDL_GlobalData::PS_TypeDeclSeen); } -#line 2771 "fe/idl.tab.cpp" +#line 2796 "fe/idl.tab.cpp" break; case 13: /* fixed_definition: type_dcl $@2 ';' */ @@ -2763,7 +2800,7 @@ yyparse (void) { idl_global->set_parse_state (IDL_GlobalData::PS_NoState); } -#line 2779 "fe/idl.tab.cpp" +#line 2804 "fe/idl.tab.cpp" break; case 14: /* $@3: %empty */ @@ -2771,7 +2808,7 @@ yyparse (void) { idl_global->set_parse_state (IDL_GlobalData::PS_TypeIdDeclSeen); } -#line 2787 "fe/idl.tab.cpp" +#line 2812 "fe/idl.tab.cpp" break; case 15: /* fixed_definition: typeid_dcl $@3 ';' */ @@ -2779,7 +2816,7 @@ yyparse (void) { idl_global->set_parse_state (IDL_GlobalData::PS_NoState); } -#line 2795 "fe/idl.tab.cpp" +#line 2820 "fe/idl.tab.cpp" break; case 16: /* $@4: %empty */ @@ -2787,7 +2824,7 @@ yyparse (void) { idl_global->set_parse_state (IDL_GlobalData::PS_TypePrefixDeclSeen); } -#line 2803 "fe/idl.tab.cpp" +#line 2828 "fe/idl.tab.cpp" break; case 17: /* fixed_definition: typeprefix_dcl $@4 ';' */ @@ -2795,7 +2832,7 @@ yyparse (void) { idl_global->set_parse_state (IDL_GlobalData::PS_NoState); } -#line 2811 "fe/idl.tab.cpp" +#line 2836 "fe/idl.tab.cpp" break; case 18: /* $@5: %empty */ @@ -2803,7 +2840,7 @@ yyparse (void) { idl_global->set_parse_state (IDL_GlobalData::PS_ConstDeclSeen); } -#line 2819 "fe/idl.tab.cpp" +#line 2844 "fe/idl.tab.cpp" break; case 19: /* fixed_definition: const_dcl $@5 ';' */ @@ -2811,7 +2848,7 @@ yyparse (void) { idl_global->set_parse_state (IDL_GlobalData::PS_NoState); } -#line 2827 "fe/idl.tab.cpp" +#line 2852 "fe/idl.tab.cpp" break; case 20: /* $@6: %empty */ @@ -2819,7 +2856,7 @@ yyparse (void) { idl_global->set_parse_state (IDL_GlobalData::PS_ExceptDeclSeen); } -#line 2835 "fe/idl.tab.cpp" +#line 2860 "fe/idl.tab.cpp" break; case 21: /* fixed_definition: exception $@6 ';' */ @@ -2827,7 +2864,7 @@ yyparse (void) { idl_global->set_parse_state (IDL_GlobalData::PS_NoState); } -#line 2843 "fe/idl.tab.cpp" +#line 2868 "fe/idl.tab.cpp" break; case 22: /* $@7: %empty */ @@ -2835,7 +2872,7 @@ yyparse (void) { idl_global->set_parse_state (IDL_GlobalData::PS_InterfaceDeclSeen); } -#line 2851 "fe/idl.tab.cpp" +#line 2876 "fe/idl.tab.cpp" break; case 23: /* fixed_definition: interface_def $@7 ';' */ @@ -2843,7 +2880,7 @@ yyparse (void) { idl_global->set_parse_state (IDL_GlobalData::PS_NoState); } -#line 2859 "fe/idl.tab.cpp" +#line 2884 "fe/idl.tab.cpp" break; case 24: /* $@8: %empty */ @@ -2851,7 +2888,7 @@ yyparse (void) { idl_global->set_parse_state (IDL_GlobalData::PS_ModuleDeclSeen); } -#line 2867 "fe/idl.tab.cpp" +#line 2892 "fe/idl.tab.cpp" break; case 25: /* fixed_definition: module $@8 ';' */ @@ -2859,7 +2896,7 @@ yyparse (void) { idl_global->set_parse_state (IDL_GlobalData::PS_NoState); } -#line 2875 "fe/idl.tab.cpp" +#line 2900 "fe/idl.tab.cpp" break; case 26: /* $@9: %empty */ @@ -2867,7 +2904,7 @@ yyparse (void) { idl_global->set_parse_state (IDL_GlobalData::PS_ValueTypeDeclSeen); } -#line 2883 "fe/idl.tab.cpp" +#line 2908 "fe/idl.tab.cpp" break; case 27: /* fixed_definition: value_def $@9 ';' */ @@ -2875,7 +2912,7 @@ yyparse (void) { idl_global->set_parse_state (IDL_GlobalData::PS_NoState); } -#line 2891 "fe/idl.tab.cpp" +#line 2916 "fe/idl.tab.cpp" break; case 28: /* $@10: %empty */ @@ -2883,7 +2920,7 @@ yyparse (void) { idl_global->set_parse_state (IDL_GlobalData::PS_ComponentDeclSeen); } -#line 2899 "fe/idl.tab.cpp" +#line 2924 "fe/idl.tab.cpp" break; case 29: /* fixed_definition: component $@10 ';' */ @@ -2891,7 +2928,7 @@ yyparse (void) { idl_global->set_parse_state (IDL_GlobalData::PS_NoState); } -#line 2907 "fe/idl.tab.cpp" +#line 2932 "fe/idl.tab.cpp" break; case 30: /* $@11: %empty */ @@ -2899,7 +2936,7 @@ yyparse (void) { idl_global->set_parse_state (IDL_GlobalData::PS_HomeDeclSeen); } -#line 2915 "fe/idl.tab.cpp" +#line 2940 "fe/idl.tab.cpp" break; case 31: /* fixed_definition: home_decl $@11 ';' */ @@ -2907,7 +2944,7 @@ yyparse (void) { idl_global->set_parse_state (IDL_GlobalData::PS_NoState); } -#line 2923 "fe/idl.tab.cpp" +#line 2948 "fe/idl.tab.cpp" break; case 32: /* $@12: %empty */ @@ -2915,7 +2952,7 @@ yyparse (void) { idl_global->set_parse_state (IDL_GlobalData::PS_EventDeclSeen); } -#line 2931 "fe/idl.tab.cpp" +#line 2956 "fe/idl.tab.cpp" break; case 33: /* fixed_definition: event $@12 ';' */ @@ -2923,7 +2960,7 @@ yyparse (void) { idl_global->set_parse_state (IDL_GlobalData::PS_NoState); } -#line 2939 "fe/idl.tab.cpp" +#line 2964 "fe/idl.tab.cpp" break; case 34: /* $@13: %empty */ @@ -2931,7 +2968,7 @@ yyparse (void) { idl_global->set_parse_state (IDL_GlobalData::PS_PorttypeDeclSeen); } -#line 2947 "fe/idl.tab.cpp" +#line 2972 "fe/idl.tab.cpp" break; case 35: /* fixed_definition: porttype_decl $@13 ';' */ @@ -2939,7 +2976,7 @@ yyparse (void) { idl_global->set_parse_state (IDL_GlobalData::PS_NoState); } -#line 2955 "fe/idl.tab.cpp" +#line 2980 "fe/idl.tab.cpp" break; case 36: /* $@14: %empty */ @@ -2947,7 +2984,7 @@ yyparse (void) { idl_global->set_parse_state (IDL_GlobalData::PS_ConnectorDeclSeen); } -#line 2963 "fe/idl.tab.cpp" +#line 2988 "fe/idl.tab.cpp" break; case 37: /* fixed_definition: connector_decl $@14 ';' */ @@ -2955,7 +2992,7 @@ yyparse (void) { idl_global->set_parse_state (IDL_GlobalData::PS_NoState); } -#line 2971 "fe/idl.tab.cpp" +#line 2996 "fe/idl.tab.cpp" break; case 38: /* $@15: %empty */ @@ -2963,7 +3000,7 @@ yyparse (void) { idl_global->err ()->syntax_error (idl_global->parse_state ()); } -#line 2979 "fe/idl.tab.cpp" +#line 3004 "fe/idl.tab.cpp" break; case 39: /* fixed_definition: error $@15 ';' */ @@ -2973,7 +3010,7 @@ yyparse (void) yyerrok; (yyval.dcval) = 0; } -#line 2989 "fe/idl.tab.cpp" +#line 3014 "fe/idl.tab.cpp" break; case 40: /* $@16: %empty */ @@ -2981,7 +3018,7 @@ yyparse (void) { idl_global->set_parse_state (IDL_GlobalData::PS_ModuleSeen); } -#line 2997 "fe/idl.tab.cpp" +#line 3022 "fe/idl.tab.cpp" break; case 41: /* module_header: IDL_MODULE $@16 scoped_name */ @@ -2989,7 +3026,7 @@ yyparse (void) { (yyval.idlist) = (yyvsp[0].idlist); } -#line 3005 "fe/idl.tab.cpp" +#line 3030 "fe/idl.tab.cpp" break; case 42: /* @17: %empty */ @@ -3032,7 +3069,7 @@ yyparse (void) (yyval.dcval) = m; } -#line 3048 "fe/idl.tab.cpp" +#line 3073 "fe/idl.tab.cpp" break; case 43: /* $@18: %empty */ @@ -3040,7 +3077,7 @@ yyparse (void) { idl_global->set_parse_state (IDL_GlobalData::PS_ModuleSqSeen); } -#line 3056 "fe/idl.tab.cpp" +#line 3081 "fe/idl.tab.cpp" break; case 44: /* $@19: %empty */ @@ -3048,7 +3085,7 @@ yyparse (void) { idl_global->set_parse_state (IDL_GlobalData::PS_ModuleBodySeen); } -#line 3064 "fe/idl.tab.cpp" +#line 3089 "fe/idl.tab.cpp" break; case 45: /* module: module_header @17 '{' $@18 at_least_one_definition $@19 '}' */ @@ -3062,7 +3099,7 @@ yyparse (void) idl_global->scopes ().pop (); (yyval.dcval) = (yyvsp[-5].dcval); } -#line 3078 "fe/idl.tab.cpp" +#line 3103 "fe/idl.tab.cpp" break; case 46: /* template_module_header: module_header '<' */ @@ -3070,7 +3107,7 @@ yyparse (void) { idl_global->set_parse_state (IDL_GlobalData::PS_TmplModuleIDSeen); } -#line 3086 "fe/idl.tab.cpp" +#line 3111 "fe/idl.tab.cpp" break; case 47: /* $@20: %empty */ @@ -3088,7 +3125,7 @@ yyparse (void) IDL_GlobalData::PS_ModuleIDSeen); } } -#line 3104 "fe/idl.tab.cpp" +#line 3129 "fe/idl.tab.cpp" break; case 48: /* $@21: %empty */ @@ -3102,7 +3139,7 @@ yyparse (void) return 1; } } -#line 3118 "fe/idl.tab.cpp" +#line 3143 "fe/idl.tab.cpp" break; case 49: /* $@22: %empty */ @@ -3136,7 +3173,7 @@ yyparse (void) // of the template module. idl_global->current_params ((yyvsp[-2].plval)); } -#line 3152 "fe/idl.tab.cpp" +#line 3177 "fe/idl.tab.cpp" break; case 50: /* $@23: %empty */ @@ -3144,7 +3181,7 @@ yyparse (void) { idl_global->set_parse_state (IDL_GlobalData::PS_TmplModuleSqSeen); } -#line 3160 "fe/idl.tab.cpp" +#line 3185 "fe/idl.tab.cpp" break; case 51: /* $@24: %empty */ @@ -3152,7 +3189,7 @@ yyparse (void) { idl_global->set_parse_state (IDL_GlobalData::PS_TmplModuleBodySeen); } -#line 3168 "fe/idl.tab.cpp" +#line 3193 "fe/idl.tab.cpp" break; case 52: /* template_module: template_module_header $@20 at_least_one_formal_parameter $@21 '>' $@22 '{' $@23 at_least_one_tpl_definition $@24 '}' */ @@ -3175,7 +3212,7 @@ yyparse (void) (yyval.dcval) = 0; } -#line 3191 "fe/idl.tab.cpp" +#line 3216 "fe/idl.tab.cpp" break; case 58: /* $@25: %empty */ @@ -3184,7 +3221,7 @@ yyparse (void) idl_global->set_parse_state ( IDL_GlobalData::PS_ModuleRefSeen); } -#line 3200 "fe/idl.tab.cpp" +#line 3225 "fe/idl.tab.cpp" break; case 59: /* $@26: %empty */ @@ -3193,7 +3230,7 @@ yyparse (void) idl_global->set_parse_state ( IDL_GlobalData::PS_ModuleRefParamsSeen); } -#line 3209 "fe/idl.tab.cpp" +#line 3234 "fe/idl.tab.cpp" break; case 60: /* template_module_ref: IDL_ALIAS scoped_name $@25 '<' at_least_one_formal_parameter_name '>' $@26 defining_id */ @@ -3275,7 +3312,7 @@ yyparse (void) idl_global->in_tmpl_mod_no_alias (itmna_flag); idl_global->in_tmpl_mod_alias (false); } -#line 3291 "fe/idl.tab.cpp" +#line 3316 "fe/idl.tab.cpp" break; case 61: /* $@27: %empty */ @@ -3284,7 +3321,7 @@ yyparse (void) idl_global->set_parse_state ( IDL_GlobalData::PS_InstModuleSeen); } -#line 3300 "fe/idl.tab.cpp" +#line 3325 "fe/idl.tab.cpp" break; case 62: /* $@28: %empty */ @@ -3293,7 +3330,7 @@ yyparse (void) idl_global->set_parse_state ( IDL_GlobalData::PS_InstModuleArgsSeen); } -#line 3309 "fe/idl.tab.cpp" +#line 3334 "fe/idl.tab.cpp" break; case 63: /* template_module_inst: template_module_header $@27 at_least_one_actual_parameter '>' $@28 defining_id */ @@ -3361,7 +3398,7 @@ yyparse (void) (yyval.dcval) = 0; } -#line 3377 "fe/idl.tab.cpp" +#line 3402 "fe/idl.tab.cpp" break; case 66: /* $@29: %empty */ @@ -3403,7 +3440,7 @@ yyparse (void) */ idl_global->scopes ().push (i); } -#line 3419 "fe/idl.tab.cpp" +#line 3444 "fe/idl.tab.cpp" break; case 67: /* $@30: %empty */ @@ -3411,7 +3448,7 @@ yyparse (void) { idl_global->set_parse_state (IDL_GlobalData::PS_InterfaceSqSeen); } -#line 3427 "fe/idl.tab.cpp" +#line 3452 "fe/idl.tab.cpp" break; case 68: /* $@31: %empty */ @@ -3419,7 +3456,7 @@ yyparse (void) { idl_global->set_parse_state (IDL_GlobalData::PS_InterfaceBodySeen); } -#line 3435 "fe/idl.tab.cpp" +#line 3460 "fe/idl.tab.cpp" break; case 69: /* interface: interface_header $@29 '{' $@30 exports $@31 '}' */ @@ -3433,7 +3470,7 @@ yyparse (void) */ idl_global->scopes ().pop (); } -#line 3449 "fe/idl.tab.cpp" +#line 3474 "fe/idl.tab.cpp" break; case 70: /* $@32: %empty */ @@ -3441,7 +3478,7 @@ yyparse (void) { idl_global->set_parse_state (IDL_GlobalData::PS_InterfaceSeen); } -#line 3457 "fe/idl.tab.cpp" +#line 3482 "fe/idl.tab.cpp" break; case 71: /* interface_decl: IDL_INTERFACE $@32 defining_id */ @@ -3450,7 +3487,7 @@ yyparse (void) idl_global->set_parse_state (IDL_GlobalData::PS_InterfaceIDSeen); (yyval.idval) = (yyvsp[0].idval); } -#line 3466 "fe/idl.tab.cpp" +#line 3491 "fe/idl.tab.cpp" break; case 72: /* interface_header: interface_decl inheritance_spec */ @@ -3490,7 +3527,7 @@ yyparse (void) (yyvsp[0].nlval) = 0; } } -#line 3506 "fe/idl.tab.cpp" +#line 3531 "fe/idl.tab.cpp" break; case 73: /* interface_header: IDL_LOCAL interface_decl inheritance_spec */ @@ -3523,7 +3560,7 @@ yyparse (void) (yyvsp[0].nlval) = 0; } } -#line 3539 "fe/idl.tab.cpp" +#line 3564 "fe/idl.tab.cpp" break; case 74: /* interface_header: IDL_ABSTRACT interface_decl inheritance_spec */ @@ -3556,7 +3593,7 @@ yyparse (void) (yyvsp[0].nlval) = 0; } } -#line 3572 "fe/idl.tab.cpp" +#line 3597 "fe/idl.tab.cpp" break; case 75: /* $@33: %empty */ @@ -3564,7 +3601,7 @@ yyparse (void) { idl_global->set_parse_state (IDL_GlobalData::PS_InheritColonSeen); } -#line 3580 "fe/idl.tab.cpp" +#line 3605 "fe/idl.tab.cpp" break; case 76: /* inheritance_spec: ':' opt_truncatable $@33 at_least_one_scoped_name */ @@ -3573,7 +3610,7 @@ yyparse (void) (yyvsp[0].nlval)->truncatable ((yyvsp[-2].bval)); (yyval.nlval) = (yyvsp[0].nlval); } -#line 3589 "fe/idl.tab.cpp" +#line 3614 "fe/idl.tab.cpp" break; case 77: /* inheritance_spec: %empty */ @@ -3581,7 +3618,7 @@ yyparse (void) { (yyval.nlval) = 0; } -#line 3597 "fe/idl.tab.cpp" +#line 3622 "fe/idl.tab.cpp" break; case 82: /* valuetype: IDL_CUSTOM value_concrete_decl */ @@ -3590,7 +3627,7 @@ yyparse (void) idl_global->err ()->unsupported_error ("custom is not supported"); (yyval.dcval) = (yyvsp[0].dcval); } -#line 3606 "fe/idl.tab.cpp" +#line 3631 "fe/idl.tab.cpp" break; case 84: /* @34: %empty */ @@ -3641,7 +3678,7 @@ yyparse (void) (yyval.dcval) = valuetype; } -#line 3657 "fe/idl.tab.cpp" +#line 3682 "fe/idl.tab.cpp" break; case 85: /* $@35: %empty */ @@ -3649,7 +3686,7 @@ yyparse (void) { idl_global->set_parse_state (IDL_GlobalData::PS_ValueTypeSqSeen); } -#line 3665 "fe/idl.tab.cpp" +#line 3690 "fe/idl.tab.cpp" break; case 86: /* $@36: %empty */ @@ -3657,7 +3694,7 @@ yyparse (void) { idl_global->set_parse_state (IDL_GlobalData::PS_ValueTypeBodySeen); } -#line 3673 "fe/idl.tab.cpp" +#line 3698 "fe/idl.tab.cpp" break; case 87: /* value_concrete_decl: value_header @34 '{' $@35 value_elements $@36 '}' */ @@ -3682,7 +3719,7 @@ yyparse (void) (yyval.dcval) = (yyvsp[-5].dcval); } -#line 3698 "fe/idl.tab.cpp" +#line 3723 "fe/idl.tab.cpp" break; case 88: /* $@37: %empty */ @@ -3729,7 +3766,7 @@ yyparse (void) */ idl_global->scopes ().push (v); } -#line 3745 "fe/idl.tab.cpp" +#line 3770 "fe/idl.tab.cpp" break; case 89: /* $@38: %empty */ @@ -3737,7 +3774,7 @@ yyparse (void) { idl_global->set_parse_state (IDL_GlobalData::PS_ValueTypeSqSeen); } -#line 3753 "fe/idl.tab.cpp" +#line 3778 "fe/idl.tab.cpp" break; case 90: /* $@39: %empty */ @@ -3745,7 +3782,7 @@ yyparse (void) { idl_global->set_parse_state (IDL_GlobalData::PS_ValueTypeBodySeen); } -#line 3761 "fe/idl.tab.cpp" +#line 3786 "fe/idl.tab.cpp" break; case 91: /* value_abs_decl: IDL_ABSTRACT value_header $@37 '{' $@38 exports $@39 '}' */ @@ -3760,7 +3797,7 @@ yyparse (void) (yyval.dcval) = 0; } -#line 3776 "fe/idl.tab.cpp" +#line 3801 "fe/idl.tab.cpp" break; case 92: /* $@40: %empty */ @@ -3768,7 +3805,7 @@ yyparse (void) { idl_global->set_parse_state (IDL_GlobalData::PS_InheritSpecSeen); } -#line 3784 "fe/idl.tab.cpp" +#line 3809 "fe/idl.tab.cpp" break; case 93: /* value_header: value_decl inheritance_spec $@40 supports_spec */ @@ -3803,7 +3840,7 @@ yyparse (void) (yyvsp[-2].nlval) = 0; } } -#line 3819 "fe/idl.tab.cpp" +#line 3844 "fe/idl.tab.cpp" break; case 94: /* $@41: %empty */ @@ -3811,7 +3848,7 @@ yyparse (void) { idl_global->set_parse_state (IDL_GlobalData::PS_ValueTypeSeen); } -#line 3827 "fe/idl.tab.cpp" +#line 3852 "fe/idl.tab.cpp" break; case 95: /* value_decl: IDL_VALUETYPE $@41 defining_id */ @@ -3820,7 +3857,7 @@ yyparse (void) idl_global->set_parse_state (IDL_GlobalData::PS_ValueTypeIDSeen); (yyval.idval) = (yyvsp[0].idval); } -#line 3836 "fe/idl.tab.cpp" +#line 3861 "fe/idl.tab.cpp" break; case 96: /* opt_truncatable: IDL_TRUNCATABLE */ @@ -3828,7 +3865,7 @@ yyparse (void) { (yyval.bval) = true; } -#line 3844 "fe/idl.tab.cpp" +#line 3869 "fe/idl.tab.cpp" break; case 97: /* opt_truncatable: %empty */ @@ -3836,7 +3873,7 @@ yyparse (void) { (yyval.bval) = false; } -#line 3852 "fe/idl.tab.cpp" +#line 3877 "fe/idl.tab.cpp" break; case 98: /* supports_spec: IDL_SUPPORTS at_least_one_scoped_name */ @@ -3844,7 +3881,7 @@ yyparse (void) { (yyval.nlval) = (yyvsp[0].nlval); } -#line 3860 "fe/idl.tab.cpp" +#line 3885 "fe/idl.tab.cpp" break; case 99: /* supports_spec: %empty */ @@ -3852,7 +3889,7 @@ yyparse (void) { (yyval.nlval) = 0; } -#line 3868 "fe/idl.tab.cpp" +#line 3893 "fe/idl.tab.cpp" break; case 100: /* value_forward_decl: IDL_ABSTRACT value_decl */ @@ -3879,7 +3916,7 @@ yyparse (void) delete (yyvsp[0].idval); (yyvsp[0].idval) = 0; } -#line 3895 "fe/idl.tab.cpp" +#line 3920 "fe/idl.tab.cpp" break; case 101: /* value_forward_decl: value_decl */ @@ -3908,7 +3945,7 @@ yyparse (void) (yyval.dcval) = 0; } -#line 3924 "fe/idl.tab.cpp" +#line 3949 "fe/idl.tab.cpp" break; case 102: /* value_box_decl: value_decl type_spec */ @@ -3975,7 +4012,7 @@ yyparse (void) (yyval.dcval) = 0; } -#line 3991 "fe/idl.tab.cpp" +#line 4016 "fe/idl.tab.cpp" break; case 103: /* value_elements: value_elements at_least_one_annotation value_element */ @@ -3998,7 +4035,7 @@ yyparse (void) delete annotations; delete decls; } -#line 4014 "fe/idl.tab.cpp" +#line 4039 "fe/idl.tab.cpp" break; case 104: /* value_elements: value_elements value_element */ @@ -4006,7 +4043,7 @@ yyparse (void) { delete (yyvsp[0].decls_val); } -#line 4022 "fe/idl.tab.cpp" +#line 4047 "fe/idl.tab.cpp" break; case 107: /* value_element: export */ @@ -4021,7 +4058,7 @@ yyparse (void) } (yyval.decls_val) = value; } -#line 4037 "fe/idl.tab.cpp" +#line 4062 "fe/idl.tab.cpp" break; case 108: /* @42: %empty */ @@ -4036,7 +4073,7 @@ yyparse (void) } (yyval.decls_val) = value; } -#line 4052 "fe/idl.tab.cpp" +#line 4077 "fe/idl.tab.cpp" break; case 109: /* value_element: init_decl @42 ';' */ @@ -4044,7 +4081,7 @@ yyparse (void) { (yyval.decls_val) = (yyvsp[-1].decls_val); } -#line 4060 "fe/idl.tab.cpp" +#line 4085 "fe/idl.tab.cpp" break; case 110: /* visibility: IDL_PUBLIC */ @@ -4052,7 +4089,7 @@ yyparse (void) { (yyval.vival) = AST_Field::vis_PUBLIC; } -#line 4068 "fe/idl.tab.cpp" +#line 4093 "fe/idl.tab.cpp" break; case 111: /* visibility: IDL_PRIVATE */ @@ -4060,7 +4097,7 @@ yyparse (void) { (yyval.vival) = AST_Field::vis_PRIVATE; } -#line 4076 "fe/idl.tab.cpp" +#line 4101 "fe/idl.tab.cpp" break; case 112: /* state_member: visibility member_i */ @@ -4082,7 +4119,7 @@ yyparse (void) } (yyval.decls_val) = decls_ptr; } -#line 4098 "fe/idl.tab.cpp" +#line 4123 "fe/idl.tab.cpp" break; case 115: /* at_least_one_export: exports at_least_one_annotation export */ @@ -4101,7 +4138,7 @@ yyparse (void) } delete annotations; } -#line 4117 "fe/idl.tab.cpp" +#line 4142 "fe/idl.tab.cpp" break; case 117: /* $@43: %empty */ @@ -4109,7 +4146,7 @@ yyparse (void) { idl_global->set_parse_state (IDL_GlobalData::PS_TypeDeclSeen); } -#line 4125 "fe/idl.tab.cpp" +#line 4150 "fe/idl.tab.cpp" break; case 118: /* export: type_dcl $@43 ';' */ @@ -4117,7 +4154,7 @@ yyparse (void) { idl_global->set_parse_state (IDL_GlobalData::PS_NoState); } -#line 4133 "fe/idl.tab.cpp" +#line 4158 "fe/idl.tab.cpp" break; case 119: /* $@44: %empty */ @@ -4125,7 +4162,7 @@ yyparse (void) { idl_global->set_parse_state (IDL_GlobalData::PS_TypeIdDeclSeen); } -#line 4141 "fe/idl.tab.cpp" +#line 4166 "fe/idl.tab.cpp" break; case 120: /* export: typeid_dcl $@44 ';' */ @@ -4133,7 +4170,7 @@ yyparse (void) { idl_global->set_parse_state (IDL_GlobalData::PS_NoState); } -#line 4149 "fe/idl.tab.cpp" +#line 4174 "fe/idl.tab.cpp" break; case 121: /* $@45: %empty */ @@ -4141,7 +4178,7 @@ yyparse (void) { idl_global->set_parse_state (IDL_GlobalData::PS_TypePrefixDeclSeen); } -#line 4157 "fe/idl.tab.cpp" +#line 4182 "fe/idl.tab.cpp" break; case 122: /* export: typeprefix_dcl $@45 ';' */ @@ -4149,7 +4186,7 @@ yyparse (void) { idl_global->set_parse_state (IDL_GlobalData::PS_NoState); } -#line 4165 "fe/idl.tab.cpp" +#line 4190 "fe/idl.tab.cpp" break; case 123: /* $@46: %empty */ @@ -4157,7 +4194,7 @@ yyparse (void) { idl_global->set_parse_state (IDL_GlobalData::PS_ConstDeclSeen); } -#line 4173 "fe/idl.tab.cpp" +#line 4198 "fe/idl.tab.cpp" break; case 124: /* export: const_dcl $@46 ';' */ @@ -4165,7 +4202,7 @@ yyparse (void) { idl_global->set_parse_state (IDL_GlobalData::PS_NoState); } -#line 4181 "fe/idl.tab.cpp" +#line 4206 "fe/idl.tab.cpp" break; case 125: /* $@47: %empty */ @@ -4173,7 +4210,7 @@ yyparse (void) { idl_global->set_parse_state (IDL_GlobalData::PS_ExceptDeclSeen); } -#line 4189 "fe/idl.tab.cpp" +#line 4214 "fe/idl.tab.cpp" break; case 126: /* export: exception $@47 ';' */ @@ -4181,7 +4218,7 @@ yyparse (void) { idl_global->set_parse_state (IDL_GlobalData::PS_NoState); } -#line 4197 "fe/idl.tab.cpp" +#line 4222 "fe/idl.tab.cpp" break; case 127: /* $@48: %empty */ @@ -4189,7 +4226,7 @@ yyparse (void) { idl_global->set_parse_state (IDL_GlobalData::PS_AttrDeclSeen); } -#line 4205 "fe/idl.tab.cpp" +#line 4230 "fe/idl.tab.cpp" break; case 128: /* export: attribute $@48 ';' */ @@ -4197,7 +4234,7 @@ yyparse (void) { idl_global->set_parse_state (IDL_GlobalData::PS_NoState); } -#line 4213 "fe/idl.tab.cpp" +#line 4238 "fe/idl.tab.cpp" break; case 129: /* $@49: %empty */ @@ -4205,7 +4242,7 @@ yyparse (void) { idl_global->set_parse_state (IDL_GlobalData::PS_OpDeclSeen); } -#line 4221 "fe/idl.tab.cpp" +#line 4246 "fe/idl.tab.cpp" break; case 130: /* export: operation $@49 ';' */ @@ -4213,7 +4250,7 @@ yyparse (void) { idl_global->set_parse_state (IDL_GlobalData::PS_NoState); } -#line 4229 "fe/idl.tab.cpp" +#line 4254 "fe/idl.tab.cpp" break; case 131: /* $@50: %empty */ @@ -4221,7 +4258,7 @@ yyparse (void) { idl_global->err ()->syntax_error (idl_global->parse_state ()); } -#line 4237 "fe/idl.tab.cpp" +#line 4262 "fe/idl.tab.cpp" break; case 132: /* export: error $@50 ';' */ @@ -4231,7 +4268,7 @@ yyparse (void) yyerrok; (yyval.dcval) = 0; } -#line 4247 "fe/idl.tab.cpp" +#line 4272 "fe/idl.tab.cpp" break; case 133: /* at_least_one_scoped_name: scoped_name scoped_names */ @@ -4242,7 +4279,7 @@ yyparse (void) (yyvsp[0].nlval)), 1); } -#line 4258 "fe/idl.tab.cpp" +#line 4283 "fe/idl.tab.cpp" break; case 134: /* $@51: %empty */ @@ -4250,7 +4287,7 @@ yyparse (void) { idl_global->set_parse_state (IDL_GlobalData::PS_SNListCommaSeen); } -#line 4266 "fe/idl.tab.cpp" +#line 4291 "fe/idl.tab.cpp" break; case 135: /* scoped_names: scoped_names ',' $@51 scoped_name */ @@ -4274,7 +4311,7 @@ yyparse (void) (yyval.nlval) = (yyvsp[-3].nlval); } } -#line 4290 "fe/idl.tab.cpp" +#line 4315 "fe/idl.tab.cpp" break; case 136: /* scoped_names: %empty */ @@ -4282,7 +4319,7 @@ yyparse (void) { (yyval.nlval) = 0; } -#line 4298 "fe/idl.tab.cpp" +#line 4323 "fe/idl.tab.cpp" break; case 137: /* scoped_name: id */ @@ -4295,7 +4332,7 @@ yyparse (void) 0), 1); } -#line 4311 "fe/idl.tab.cpp" +#line 4336 "fe/idl.tab.cpp" break; case 138: /* $@52: %empty */ @@ -4303,7 +4340,7 @@ yyparse (void) { idl_global->set_parse_state (IDL_GlobalData::PS_ScopeDelimSeen); } -#line 4319 "fe/idl.tab.cpp" +#line 4344 "fe/idl.tab.cpp" break; case 139: /* scoped_name: IDL_SCOPE_DELIMITOR $@52 id */ @@ -4327,7 +4364,7 @@ yyparse (void) sn), 1); } -#line 4343 "fe/idl.tab.cpp" +#line 4368 "fe/idl.tab.cpp" break; case 140: /* $@53: %empty */ @@ -4341,7 +4378,7 @@ yyparse (void) ACE::strdelete ((yyvsp[0].strval)); (yyvsp[0].strval) = 0; } -#line 4357 "fe/idl.tab.cpp" +#line 4382 "fe/idl.tab.cpp" break; case 141: /* scoped_name: scoped_name IDL_SCOPE_DELIMITOR $@53 id */ @@ -4357,7 +4394,7 @@ yyparse (void) (yyvsp[-3].idlist)->nconc (sn); (yyval.idlist) = (yyvsp[-3].idlist); } -#line 4373 "fe/idl.tab.cpp" +#line 4398 "fe/idl.tab.cpp" break; case 142: /* id: IDENTIFIER */ @@ -4369,7 +4406,7 @@ yyparse (void) ACE::strdelete ((yyvsp[0].strval)); (yyvsp[0].strval) = 0; } -#line 4385 "fe/idl.tab.cpp" +#line 4410 "fe/idl.tab.cpp" break; case 143: /* defining_id: IDENTIFIER */ @@ -4381,7 +4418,7 @@ yyparse (void) ACE::strdelete ((yyvsp[0].strval)); (yyvsp[0].strval) = 0; } -#line 4397 "fe/idl.tab.cpp" +#line 4422 "fe/idl.tab.cpp" break; case 144: /* interface_forward: interface_decl */ @@ -4428,7 +4465,7 @@ yyparse (void) delete (yyvsp[0].idval); (yyvsp[0].idval) = 0; } -#line 4444 "fe/idl.tab.cpp" +#line 4469 "fe/idl.tab.cpp" break; case 145: /* interface_forward: IDL_LOCAL interface_decl */ @@ -4458,7 +4495,7 @@ yyparse (void) delete (yyvsp[0].idval); (yyvsp[0].idval) = 0; } -#line 4474 "fe/idl.tab.cpp" +#line 4499 "fe/idl.tab.cpp" break; case 146: /* interface_forward: IDL_ABSTRACT interface_decl */ @@ -4490,7 +4527,7 @@ yyparse (void) (yyval.dcval) = dynamic_cast (f); } -#line 4506 "fe/idl.tab.cpp" +#line 4531 "fe/idl.tab.cpp" break; case 147: /* $@54: %empty */ @@ -4498,7 +4535,7 @@ yyparse (void) { idl_global->set_parse_state (IDL_GlobalData::PS_ConstSeen); } -#line 4514 "fe/idl.tab.cpp" +#line 4539 "fe/idl.tab.cpp" break; case 148: /* $@55: %empty */ @@ -4506,7 +4543,7 @@ yyparse (void) { idl_global->set_parse_state (IDL_GlobalData::PS_ConstTypeSeen); } -#line 4522 "fe/idl.tab.cpp" +#line 4547 "fe/idl.tab.cpp" break; case 149: /* $@56: %empty */ @@ -4514,7 +4551,7 @@ yyparse (void) { idl_global->set_parse_state (IDL_GlobalData::PS_ConstIDSeen); } -#line 4530 "fe/idl.tab.cpp" +#line 4555 "fe/idl.tab.cpp" break; case 150: /* $@57: %empty */ @@ -4522,7 +4559,7 @@ yyparse (void) { idl_global->set_parse_state (IDL_GlobalData::PS_ConstAssignSeen); } -#line 4538 "fe/idl.tab.cpp" +#line 4563 "fe/idl.tab.cpp" break; case 151: /* const_dcl: IDL_CONST $@54 const_type $@55 defining_id $@56 '=' $@57 expression */ @@ -4582,7 +4619,7 @@ yyparse (void) delete (yyvsp[-4].idval); (yyvsp[-4].idval) = 0; } -#line 4598 "fe/idl.tab.cpp" +#line 4623 "fe/idl.tab.cpp" break; case 158: /* const_type: string_type_spec */ @@ -4590,7 +4627,7 @@ yyparse (void) { (yyval.etval) = AST_Expression::EV_string; } -#line 4606 "fe/idl.tab.cpp" +#line 4631 "fe/idl.tab.cpp" break; case 159: /* const_type: wstring_type_spec */ @@ -4598,7 +4635,7 @@ yyparse (void) { (yyval.etval) = AST_Expression::EV_wstring; } -#line 4614 "fe/idl.tab.cpp" +#line 4639 "fe/idl.tab.cpp" break; case 160: /* const_type: scoped_name */ @@ -4668,7 +4705,7 @@ yyparse (void) sn = 0; (yyvsp[0].idlist) = 0; } -#line 4684 "fe/idl.tab.cpp" +#line 4709 "fe/idl.tab.cpp" break; case 164: /* or_expr: or_expr '|' xor_expr */ @@ -4681,7 +4718,7 @@ yyparse (void) (yyvsp[0].exval) ); } -#line 4697 "fe/idl.tab.cpp" +#line 4722 "fe/idl.tab.cpp" break; case 166: /* xor_expr: xor_expr '^' and_expr */ @@ -4694,7 +4731,7 @@ yyparse (void) (yyvsp[0].exval) ); } -#line 4710 "fe/idl.tab.cpp" +#line 4735 "fe/idl.tab.cpp" break; case 168: /* and_expr: and_expr '&' shift_expr */ @@ -4707,7 +4744,7 @@ yyparse (void) (yyvsp[0].exval) ); } -#line 4723 "fe/idl.tab.cpp" +#line 4748 "fe/idl.tab.cpp" break; case 170: /* shift_expr: shift_expr IDL_LEFT_SHIFT add_expr */ @@ -4720,7 +4757,7 @@ yyparse (void) (yyvsp[0].exval) ); } -#line 4736 "fe/idl.tab.cpp" +#line 4761 "fe/idl.tab.cpp" break; case 171: /* shift_expr: shift_expr IDL_RIGHT_SHIFT add_expr */ @@ -4733,7 +4770,7 @@ yyparse (void) (yyvsp[0].exval) ); } -#line 4749 "fe/idl.tab.cpp" +#line 4774 "fe/idl.tab.cpp" break; case 173: /* add_expr: add_expr '+' mult_expr */ @@ -4746,7 +4783,7 @@ yyparse (void) (yyvsp[0].exval) ); } -#line 4762 "fe/idl.tab.cpp" +#line 4787 "fe/idl.tab.cpp" break; case 174: /* add_expr: add_expr '-' mult_expr */ @@ -4759,7 +4796,7 @@ yyparse (void) (yyvsp[0].exval) ); } -#line 4775 "fe/idl.tab.cpp" +#line 4800 "fe/idl.tab.cpp" break; case 176: /* mult_expr: mult_expr '*' unary_expr */ @@ -4772,7 +4809,7 @@ yyparse (void) (yyvsp[0].exval) ); } -#line 4788 "fe/idl.tab.cpp" +#line 4813 "fe/idl.tab.cpp" break; case 177: /* mult_expr: mult_expr '/' unary_expr */ @@ -4785,7 +4822,7 @@ yyparse (void) (yyvsp[0].exval) ); } -#line 4801 "fe/idl.tab.cpp" +#line 4826 "fe/idl.tab.cpp" break; case 178: /* mult_expr: mult_expr '%' unary_expr */ @@ -4798,7 +4835,7 @@ yyparse (void) (yyvsp[0].exval) ); } -#line 4814 "fe/idl.tab.cpp" +#line 4839 "fe/idl.tab.cpp" break; case 180: /* unary_expr: '+' primary_expr */ @@ -4811,7 +4848,7 @@ yyparse (void) 0 ); } -#line 4827 "fe/idl.tab.cpp" +#line 4852 "fe/idl.tab.cpp" break; case 181: /* unary_expr: '-' primary_expr */ @@ -4824,7 +4861,7 @@ yyparse (void) 0 ); } -#line 4840 "fe/idl.tab.cpp" +#line 4865 "fe/idl.tab.cpp" break; case 182: /* unary_expr: '~' primary_expr */ @@ -4837,7 +4874,7 @@ yyparse (void) 0 ); } -#line 4853 "fe/idl.tab.cpp" +#line 4878 "fe/idl.tab.cpp" break; case 183: /* primary_expr: scoped_name */ @@ -4898,7 +4935,7 @@ yyparse (void) delete name; (yyvsp[0].idlist) = name = 0; } -#line 4914 "fe/idl.tab.cpp" +#line 4939 "fe/idl.tab.cpp" break; case 185: /* primary_expr: '(' const_expr ')' */ @@ -4906,7 +4943,7 @@ yyparse (void) { (yyval.exval) = (yyvsp[-1].exval); } -#line 4922 "fe/idl.tab.cpp" +#line 4947 "fe/idl.tab.cpp" break; case 186: /* literal: IDL_INTEGER_LITERAL */ @@ -4914,7 +4951,7 @@ yyparse (void) { (yyval.exval) = idl_global->gen ()->create_expr ((yyvsp[0].ival)); } -#line 4930 "fe/idl.tab.cpp" +#line 4955 "fe/idl.tab.cpp" break; case 187: /* literal: IDL_UINTEGER_LITERAL */ @@ -4923,7 +4960,7 @@ yyparse (void) (yyval.exval) = idl_global->gen ()->create_expr ((yyvsp[0].uival)); } -#line 4939 "fe/idl.tab.cpp" +#line 4964 "fe/idl.tab.cpp" break; case 188: /* literal: IDL_STRING_LITERAL */ @@ -4934,7 +4971,7 @@ yyparse (void) delete (yyvsp[0].sval); (yyvsp[0].sval) = 0; } -#line 4950 "fe/idl.tab.cpp" +#line 4975 "fe/idl.tab.cpp" break; case 189: /* literal: IDL_WSTRING_LITERAL */ @@ -4945,7 +4982,7 @@ yyparse (void) ACE_OS::free (wide_string); (yyvsp[0].wsval) = 0; } -#line 4961 "fe/idl.tab.cpp" +#line 4986 "fe/idl.tab.cpp" break; case 190: /* literal: IDL_CHARACTER_LITERAL */ @@ -4953,7 +4990,7 @@ yyparse (void) { (yyval.exval) = idl_global->gen ()->create_expr ((yyvsp[0].cval)); } -#line 4969 "fe/idl.tab.cpp" +#line 4994 "fe/idl.tab.cpp" break; case 191: /* literal: IDL_WCHAR_LITERAL */ @@ -4962,7 +4999,7 @@ yyparse (void) ACE_OutputCDR::from_wchar wc ((yyvsp[0].wcval)); (yyval.exval) = idl_global->gen ()->create_expr (wc); } -#line 4978 "fe/idl.tab.cpp" +#line 5003 "fe/idl.tab.cpp" break; case 192: /* literal: IDL_FIXED_PT_LITERAL */ @@ -4970,7 +5007,7 @@ yyparse (void) { (yyval.exval) = idl_global->gen ()->create_expr ((yyvsp[0].fixval)); } -#line 4986 "fe/idl.tab.cpp" +#line 5011 "fe/idl.tab.cpp" break; case 193: /* literal: IDL_FLOATING_PT_LITERAL */ @@ -4978,7 +5015,7 @@ yyparse (void) { (yyval.exval) = idl_global->gen ()->create_expr ((yyvsp[0].dval)); } -#line 4994 "fe/idl.tab.cpp" +#line 5019 "fe/idl.tab.cpp" break; case 194: /* literal: IDL_TRUETOK */ @@ -4986,7 +5023,7 @@ yyparse (void) { (yyval.exval) = idl_global->gen ()->create_expr (true); } -#line 5002 "fe/idl.tab.cpp" +#line 5027 "fe/idl.tab.cpp" break; case 195: /* literal: IDL_FALSETOK */ @@ -4994,7 +5031,7 @@ yyparse (void) { (yyval.exval) = idl_global->gen ()->create_expr (false); } -#line 5010 "fe/idl.tab.cpp" +#line 5035 "fe/idl.tab.cpp" break; case 196: /* positive_int_expr: const_expr */ @@ -5063,17 +5100,15 @@ yyparse (void) idl_global->err ()->syntax_error (idl_global->parse_state ()); } } -#line 5079 "fe/idl.tab.cpp" +#line 5104 "fe/idl.tab.cpp" break; case 197: /* $@58: %empty */ #line 2366 "fe/idl.ypp" { if (idl_global->idl_version_ < IDL_VERSION_4) - { - idl_global->err ()->idl_version_error ( - "Annotations are an IDL4 feature"); - } + idl_global->err ()->idl_version_error ( + "Annotations are not allowed in IDL3"); Identifier *id = (yyvsp[-1].idval); UTL_ScopedName name (id, 0); @@ -5084,11 +5119,11 @@ yyparse (void) fe_add_annotation_decl (annotation_decl); idl_global->scopes ().push (annotation_decl); } -#line 5100 "fe/idl.tab.cpp" +#line 5123 "fe/idl.tab.cpp" break; case 198: /* annotation_dcl: IDL_ANNOTATION_DECL defining_id '{' $@58 annotation_body '}' */ -#line 2383 "fe/idl.ypp" +#line 2381 "fe/idl.ypp" { Identifier *id = (yyvsp[-4].idval); idl_global->scopes ().pop (); @@ -5097,20 +5132,20 @@ yyparse (void) (yyval.dcval) = 0; } -#line 5113 "fe/idl.tab.cpp" +#line 5136 "fe/idl.tab.cpp" break; case 204: /* $@59: %empty */ -#line 2403 "fe/idl.ypp" +#line 2401 "fe/idl.ypp" { idl_global->set_parse_state (IDL_GlobalData::PS_TypedefSeen); idl_global->in_typedef (true); } -#line 5122 "fe/idl.tab.cpp" +#line 5145 "fe/idl.tab.cpp" break; case 208: /* annotation_member: annotation_member_type defining_id annotation_member_default ';' */ -#line 2417 "fe/idl.ypp" +#line 2415 "fe/idl.ypp" { UTL_Scope *scope = idl_global->scopes ().top_non_null (); UTL_Scope *root = idl_global->scopes ().bottom (); @@ -5163,27 +5198,27 @@ yyparse (void) delete result; } } -#line 5179 "fe/idl.tab.cpp" +#line 5202 "fe/idl.tab.cpp" break; case 209: /* annotation_member_default: IDL_DEFAULT const_expr */ -#line 2473 "fe/idl.ypp" +#line 2471 "fe/idl.ypp" { (yyval.exval) = (yyvsp[0].exval); } -#line 5187 "fe/idl.tab.cpp" +#line 5210 "fe/idl.tab.cpp" break; case 210: /* annotation_member_default: %empty */ -#line 2477 "fe/idl.ypp" +#line 2475 "fe/idl.ypp" { (yyval.exval) = 0; } -#line 5195 "fe/idl.tab.cpp" +#line 5218 "fe/idl.tab.cpp" break; case 211: /* at_least_one_annotation: annotations_maybe annotation_appl */ -#line 2484 "fe/idl.ypp" +#line 2482 "fe/idl.ypp" { AST_Annotation_Appls *annotations = (yyvsp[-1].annotations_val); AST_Annotation_Appl *annotation = (yyvsp[0].annotation_val); @@ -5193,11 +5228,11 @@ yyparse (void) } (yyval.annotations_val) = annotations; } -#line 5209 "fe/idl.tab.cpp" +#line 5232 "fe/idl.tab.cpp" break; case 212: /* annotations_maybe: annotations_maybe annotation_appl */ -#line 2497 "fe/idl.ypp" +#line 2495 "fe/idl.ypp" { AST_Annotation_Appls *annotations = (yyvsp[-1].annotations_val); AST_Annotation_Appl *annotation = (yyvsp[0].annotation_val); @@ -5207,25 +5242,23 @@ yyparse (void) } (yyval.annotations_val) = annotations; } -#line 5223 "fe/idl.tab.cpp" +#line 5246 "fe/idl.tab.cpp" break; case 213: /* annotations_maybe: %empty */ -#line 2507 "fe/idl.ypp" +#line 2505 "fe/idl.ypp" { (yyval.annotations_val) = new AST_Annotation_Appls (); } -#line 5231 "fe/idl.tab.cpp" +#line 5254 "fe/idl.tab.cpp" break; case 214: /* @60: %empty */ -#line 2514 "fe/idl.ypp" +#line 2512 "fe/idl.ypp" { if (idl_global->idl_version_ < IDL_VERSION_4) - { - idl_global->err ()->idl_version_error ( - "Annotations are an IDL4 feature"); - } + idl_global->err ()->idl_version_error ( + "Annotations are not allowed in IDL3"); AST_Annotation_Decl *decl = 0; UTL_ScopedName *name = (yyvsp[0].idlist); @@ -5276,11 +5309,11 @@ yyparse (void) (yyval.annotation_decl_val) = decl; } -#line 5292 "fe/idl.tab.cpp" +#line 5313 "fe/idl.tab.cpp" break; case 215: /* annotation_appl: IDL_ANNOTATION_SYMBOL scoped_name @60 annotation_appl_params_maybe */ -#line 2571 "fe/idl.ypp" +#line 2567 "fe/idl.ypp" { idl_global->ignore_lookup_errors_ = false; stack_based_lookup_for_primary_expr = false; @@ -5308,27 +5341,27 @@ yyparse (void) (yyval.annotation_val) = appl; } -#line 5324 "fe/idl.tab.cpp" +#line 5345 "fe/idl.tab.cpp" break; case 216: /* annotation_appl_params_maybe: '(' annotation_appl_params ')' */ -#line 2602 "fe/idl.ypp" +#line 2598 "fe/idl.ypp" { (yyval.annotation_params_val) = (yyvsp[-1].annotation_params_val); } -#line 5332 "fe/idl.tab.cpp" +#line 5353 "fe/idl.tab.cpp" break; case 217: /* annotation_appl_params_maybe: %empty */ -#line 2606 "fe/idl.ypp" +#line 2602 "fe/idl.ypp" { (yyval.annotation_params_val) = 0; } -#line 5340 "fe/idl.tab.cpp" +#line 5361 "fe/idl.tab.cpp" break; case 218: /* annotation_appl_params: const_expr */ -#line 2613 "fe/idl.ypp" +#line 2609 "fe/idl.ypp" { AST_Annotation_Appl::Params *params = new AST_Annotation_Appl::Params; AST_Annotation_Appl::Param *param = new AST_Annotation_Appl::Param; @@ -5337,46 +5370,54 @@ yyparse (void) params->push (param); (yyval.annotation_params_val) = params; } -#line 5353 "fe/idl.tab.cpp" +#line 5374 "fe/idl.tab.cpp" break; case 219: /* annotation_appl_params: named_annotation_appl_params */ -#line 2622 "fe/idl.ypp" +#line 2618 "fe/idl.ypp" { (yyval.annotation_params_val) = (yyvsp[0].annotation_params_val); } -#line 5361 "fe/idl.tab.cpp" +#line 5382 "fe/idl.tab.cpp" break; - case 220: /* named_annotation_appl_params: named_annotation_appl_param more_named_annotation_appl_params */ + case 220: /* annotation_appl_params: %empty */ +#line 2622 "fe/idl.ypp" + { + (yyval.annotation_params_val) = 0; + } +#line 5390 "fe/idl.tab.cpp" + break; + + case 221: /* named_annotation_appl_params: named_annotation_appl_param more_named_annotation_appl_params */ #line 2629 "fe/idl.ypp" { AST_Annotation_Appl::Params *params = (yyvsp[0].annotation_params_val); params->push ((yyvsp[-1].annotation_param_val)); (yyval.annotation_params_val) = params; } -#line 5371 "fe/idl.tab.cpp" +#line 5400 "fe/idl.tab.cpp" break; - case 221: /* more_named_annotation_appl_params: ',' named_annotation_appl_param more_named_annotation_appl_params */ + case 222: /* more_named_annotation_appl_params: ',' named_annotation_appl_param more_named_annotation_appl_params */ #line 2637 "fe/idl.ypp" { AST_Annotation_Appl::Params *params = (yyvsp[0].annotation_params_val); params->push ((yyvsp[-1].annotation_param_val)); (yyval.annotation_params_val) = params; } -#line 5381 "fe/idl.tab.cpp" +#line 5410 "fe/idl.tab.cpp" break; - case 222: /* more_named_annotation_appl_params: %empty */ + case 223: /* more_named_annotation_appl_params: %empty */ #line 2643 "fe/idl.ypp" { (yyval.annotation_params_val) = new AST_Annotation_Appl::Params; } -#line 5389 "fe/idl.tab.cpp" +#line 5418 "fe/idl.tab.cpp" break; - case 223: /* named_annotation_appl_param: id '=' const_expr */ + case 224: /* named_annotation_appl_param: id '=' const_expr */ #line 2650 "fe/idl.ypp" { AST_Annotation_Appl::Param *param = new AST_Annotation_Appl::Param; @@ -5386,51 +5427,51 @@ yyparse (void) param->expr = (yyvsp[0].exval); (yyval.annotation_param_val) = param; } -#line 5402 "fe/idl.tab.cpp" +#line 5431 "fe/idl.tab.cpp" break; - case 224: /* $@61: %empty */ + case 225: /* $@61: %empty */ #line 2662 "fe/idl.ypp" { idl_global->set_parse_state (IDL_GlobalData::PS_TypedefSeen); idl_global->in_typedef (true); } -#line 5411 "fe/idl.tab.cpp" +#line 5440 "fe/idl.tab.cpp" break; - case 225: /* type_dcl: IDL_TYPEDEF $@61 type_declarator */ + case 226: /* type_dcl: IDL_TYPEDEF $@61 type_declarator */ #line 2667 "fe/idl.ypp" { (yyval.dcval) = (yyvsp[0].dcval); } -#line 5419 "fe/idl.tab.cpp" +#line 5448 "fe/idl.tab.cpp" break; - case 226: /* type_dcl: struct_type */ + case 227: /* type_dcl: struct_type */ #line 2671 "fe/idl.ypp" { (yyval.dcval) = (yyvsp[0].dcval); } -#line 5427 "fe/idl.tab.cpp" +#line 5456 "fe/idl.tab.cpp" break; - case 227: /* type_dcl: union_type */ + case 228: /* type_dcl: union_type */ #line 2675 "fe/idl.ypp" { (yyval.dcval) = (yyvsp[0].dcval); } -#line 5435 "fe/idl.tab.cpp" +#line 5464 "fe/idl.tab.cpp" break; - case 228: /* type_dcl: enum_type */ + case 229: /* type_dcl: enum_type */ #line 2679 "fe/idl.ypp" { (yyval.dcval) = (yyvsp[0].dcval); } -#line 5443 "fe/idl.tab.cpp" +#line 5472 "fe/idl.tab.cpp" break; - case 229: /* type_dcl: IDL_NATIVE simple_declarator */ + case 230: /* type_dcl: IDL_NATIVE simple_declarator */ #line 2683 "fe/idl.ypp" { UTL_Scope *s = idl_global->scopes ().top_non_null (); @@ -5459,26 +5500,26 @@ yyparse (void) (yyval.dcval) = 0; } -#line 5475 "fe/idl.tab.cpp" +#line 5504 "fe/idl.tab.cpp" break; - case 230: /* type_dcl: constructed_forward_type_spec */ + case 231: /* type_dcl: constructed_forward_type_spec */ #line 2711 "fe/idl.ypp" { (yyval.dcval) = 0; } -#line 5483 "fe/idl.tab.cpp" +#line 5512 "fe/idl.tab.cpp" break; - case 231: /* $@62: %empty */ + case 232: /* $@62: %empty */ #line 2718 "fe/idl.ypp" { idl_global->set_parse_state (IDL_GlobalData::PS_TypeSpecSeen); } -#line 5491 "fe/idl.tab.cpp" +#line 5520 "fe/idl.tab.cpp" break; - case 232: /* type_declarator: type_spec $@62 at_least_one_declarator */ + case 233: /* type_declarator: type_spec $@62 at_least_one_declarator */ #line 2722 "fe/idl.ypp" { AST_Decl *type_spec = (yyvsp[-2].dcval); @@ -5543,10 +5584,10 @@ yyparse (void) (yyval.dcval) = t; } -#line 5559 "fe/idl.tab.cpp" +#line 5588 "fe/idl.tab.cpp" break; - case 235: /* simple_type_spec: base_type_spec */ + case 236: /* simple_type_spec: base_type_spec */ #line 2794 "fe/idl.ypp" { (yyval.dcval) = @@ -5554,10 +5595,10 @@ yyparse (void) (yyvsp[0].etval) ); } -#line 5570 "fe/idl.tab.cpp" +#line 5599 "fe/idl.tab.cpp" break; - case 237: /* simple_type_spec: scoped_name */ + case 238: /* simple_type_spec: scoped_name */ #line 2802 "fe/idl.ypp" { UTL_Scope *s = idl_global->scopes ().top_non_null (); @@ -5581,10 +5622,10 @@ yyparse (void) (yyval.dcval) = d; } -#line 5597 "fe/idl.tab.cpp" +#line 5626 "fe/idl.tab.cpp" break; - case 256: /* at_least_one_declarator: declarator declarators */ + case 257: /* at_least_one_declarator: declarator declarators */ #line 2858 "fe/idl.ypp" { ACE_NEW_RETURN ((yyval.dlval), @@ -5592,18 +5633,18 @@ yyparse (void) (yyvsp[0].dlval)), 1); } -#line 5608 "fe/idl.tab.cpp" +#line 5637 "fe/idl.tab.cpp" break; - case 257: /* $@63: %empty */ + case 258: /* $@63: %empty */ #line 2869 "fe/idl.ypp" { idl_global->set_parse_state (IDL_GlobalData::PS_DeclsCommaSeen); } -#line 5616 "fe/idl.tab.cpp" +#line 5645 "fe/idl.tab.cpp" break; - case 258: /* declarators: declarators ',' $@63 declarator */ + case 259: /* declarators: declarators ',' $@63 declarator */ #line 2873 "fe/idl.ypp" { idl_global->set_parse_state (IDL_GlobalData::PS_DeclsDeclSeen); @@ -5624,18 +5665,18 @@ yyparse (void) (yyval.dlval) = (yyvsp[-3].dlval); } } -#line 5640 "fe/idl.tab.cpp" +#line 5669 "fe/idl.tab.cpp" break; - case 259: /* declarators: %empty */ + case 260: /* declarators: %empty */ #line 2893 "fe/idl.ypp" { (yyval.dlval) = 0; } -#line 5648 "fe/idl.tab.cpp" +#line 5677 "fe/idl.tab.cpp" break; - case 262: /* at_least_one_simple_declarator: simple_declarator simple_declarators */ + case 263: /* at_least_one_simple_declarator: simple_declarator simple_declarators */ #line 2905 "fe/idl.ypp" { ACE_NEW_RETURN ((yyval.dlval), @@ -5643,18 +5684,18 @@ yyparse (void) (yyvsp[0].dlval)), 1); } -#line 5659 "fe/idl.tab.cpp" +#line 5688 "fe/idl.tab.cpp" break; - case 263: /* $@64: %empty */ + case 264: /* $@64: %empty */ #line 2916 "fe/idl.ypp" { idl_global->set_parse_state (IDL_GlobalData::PS_DeclsCommaSeen); } -#line 5667 "fe/idl.tab.cpp" +#line 5696 "fe/idl.tab.cpp" break; - case 264: /* simple_declarators: simple_declarators ',' $@64 simple_declarator */ + case 265: /* simple_declarators: simple_declarators ',' $@64 simple_declarator */ #line 2920 "fe/idl.ypp" { idl_global->set_parse_state (IDL_GlobalData::PS_DeclsDeclSeen); @@ -5675,18 +5716,18 @@ yyparse (void) (yyval.dlval) = (yyvsp[-3].dlval); } } -#line 5691 "fe/idl.tab.cpp" +#line 5720 "fe/idl.tab.cpp" break; - case 265: /* simple_declarators: %empty */ + case 266: /* simple_declarators: %empty */ #line 2940 "fe/idl.ypp" { (yyval.dlval) = 0; } -#line 5699 "fe/idl.tab.cpp" +#line 5728 "fe/idl.tab.cpp" break; - case 266: /* simple_declarator: defining_id */ + case 267: /* simple_declarator: defining_id */ #line 2947 "fe/idl.ypp" { UTL_ScopedName *sn = 0; @@ -5700,10 +5741,10 @@ yyparse (void) 0), 1); } -#line 5716 "fe/idl.tab.cpp" +#line 5745 "fe/idl.tab.cpp" break; - case 267: /* complex_declarator: array_declarator */ + case 268: /* complex_declarator: array_declarator */ #line 2963 "fe/idl.ypp" { UTL_ScopedName *sn = 0; @@ -5719,219 +5760,219 @@ yyparse (void) (yyvsp[0].dcval)), 1); } -#line 5735 "fe/idl.tab.cpp" +#line 5764 "fe/idl.tab.cpp" break; - case 270: /* signed_int: IDL_LONG */ + case 271: /* signed_int: IDL_LONG */ #line 2986 "fe/idl.ypp" { (yyval.etval) = AST_Expression::EV_long; } -#line 5743 "fe/idl.tab.cpp" +#line 5772 "fe/idl.tab.cpp" break; - case 271: /* signed_int: IDL_LONG IDL_LONG */ + case 272: /* signed_int: IDL_LONG IDL_LONG */ #line 2990 "fe/idl.ypp" { (yyval.etval) = AST_Expression::EV_longlong; } -#line 5751 "fe/idl.tab.cpp" +#line 5780 "fe/idl.tab.cpp" break; - case 272: /* signed_int: IDL_SHORT */ + case 273: /* signed_int: IDL_SHORT */ #line 2994 "fe/idl.ypp" { (yyval.etval) = AST_Expression::EV_short; } -#line 5759 "fe/idl.tab.cpp" +#line 5788 "fe/idl.tab.cpp" break; - case 273: /* signed_int: IDL_INT8 */ + case 274: /* signed_int: IDL_INT8 */ #line 2998 "fe/idl.ypp" { (yyval.etval) = AST_Expression::EV_int8; } -#line 5767 "fe/idl.tab.cpp" +#line 5796 "fe/idl.tab.cpp" break; - case 274: /* signed_int: IDL_INT16 */ + case 275: /* signed_int: IDL_INT16 */ #line 3002 "fe/idl.ypp" { (yyval.etval) = AST_Expression::EV_short; } -#line 5775 "fe/idl.tab.cpp" +#line 5804 "fe/idl.tab.cpp" break; - case 275: /* signed_int: IDL_INT32 */ + case 276: /* signed_int: IDL_INT32 */ #line 3006 "fe/idl.ypp" { (yyval.etval) = AST_Expression::EV_long; } -#line 5783 "fe/idl.tab.cpp" +#line 5812 "fe/idl.tab.cpp" break; - case 276: /* signed_int: IDL_INT64 */ + case 277: /* signed_int: IDL_INT64 */ #line 3010 "fe/idl.ypp" { (yyval.etval) = AST_Expression::EV_longlong; } -#line 5791 "fe/idl.tab.cpp" +#line 5820 "fe/idl.tab.cpp" break; - case 277: /* unsigned_int: IDL_UNSIGNED IDL_LONG */ + case 278: /* unsigned_int: IDL_UNSIGNED IDL_LONG */ #line 3017 "fe/idl.ypp" { (yyval.etval) = AST_Expression::EV_ulong; } -#line 5799 "fe/idl.tab.cpp" +#line 5828 "fe/idl.tab.cpp" break; - case 278: /* unsigned_int: IDL_UNSIGNED IDL_LONG IDL_LONG */ + case 279: /* unsigned_int: IDL_UNSIGNED IDL_LONG IDL_LONG */ #line 3021 "fe/idl.ypp" { (yyval.etval) = AST_Expression::EV_ulonglong; } -#line 5807 "fe/idl.tab.cpp" +#line 5836 "fe/idl.tab.cpp" break; - case 279: /* unsigned_int: IDL_UNSIGNED IDL_SHORT */ + case 280: /* unsigned_int: IDL_UNSIGNED IDL_SHORT */ #line 3025 "fe/idl.ypp" { (yyval.etval) = AST_Expression::EV_ushort; } -#line 5815 "fe/idl.tab.cpp" +#line 5844 "fe/idl.tab.cpp" break; - case 280: /* unsigned_int: IDL_UINT8 */ + case 281: /* unsigned_int: IDL_UINT8 */ #line 3029 "fe/idl.ypp" { (yyval.etval) = AST_Expression::EV_uint8; } -#line 5823 "fe/idl.tab.cpp" +#line 5852 "fe/idl.tab.cpp" break; - case 281: /* unsigned_int: IDL_UINT16 */ + case 282: /* unsigned_int: IDL_UINT16 */ #line 3033 "fe/idl.ypp" { (yyval.etval) = AST_Expression::EV_ushort; } -#line 5831 "fe/idl.tab.cpp" +#line 5860 "fe/idl.tab.cpp" break; - case 282: /* unsigned_int: IDL_UINT32 */ + case 283: /* unsigned_int: IDL_UINT32 */ #line 3037 "fe/idl.ypp" { (yyval.etval) = AST_Expression::EV_ulong; } -#line 5839 "fe/idl.tab.cpp" +#line 5868 "fe/idl.tab.cpp" break; - case 283: /* unsigned_int: IDL_UINT64 */ + case 284: /* unsigned_int: IDL_UINT64 */ #line 3041 "fe/idl.ypp" { (yyval.etval) = AST_Expression::EV_ulonglong; } -#line 5847 "fe/idl.tab.cpp" +#line 5876 "fe/idl.tab.cpp" break; - case 284: /* floating_pt_type: IDL_DOUBLE */ + case 285: /* floating_pt_type: IDL_DOUBLE */ #line 3048 "fe/idl.ypp" { (yyval.etval) = AST_Expression::EV_double; } -#line 5855 "fe/idl.tab.cpp" +#line 5884 "fe/idl.tab.cpp" break; - case 285: /* floating_pt_type: IDL_FLOAT */ + case 286: /* floating_pt_type: IDL_FLOAT */ #line 3052 "fe/idl.ypp" { (yyval.etval) = AST_Expression::EV_float; } -#line 5863 "fe/idl.tab.cpp" +#line 5892 "fe/idl.tab.cpp" break; - case 286: /* floating_pt_type: IDL_LONG IDL_DOUBLE */ + case 287: /* floating_pt_type: IDL_LONG IDL_DOUBLE */ #line 3056 "fe/idl.ypp" { (yyval.etval) = AST_Expression::EV_longdouble; } -#line 5871 "fe/idl.tab.cpp" +#line 5900 "fe/idl.tab.cpp" break; - case 287: /* fixed_type: IDL_FIXED */ + case 288: /* fixed_type: IDL_FIXED */ #line 3063 "fe/idl.ypp" { (yyval.etval) = AST_Expression::EV_fixed; } -#line 5879 "fe/idl.tab.cpp" +#line 5908 "fe/idl.tab.cpp" break; - case 288: /* char_type: IDL_CHAR */ + case 289: /* char_type: IDL_CHAR */ #line 3070 "fe/idl.ypp" { (yyval.etval) = AST_Expression::EV_char; } -#line 5887 "fe/idl.tab.cpp" +#line 5916 "fe/idl.tab.cpp" break; - case 289: /* char_type: IDL_WCHAR */ + case 290: /* char_type: IDL_WCHAR */ #line 3074 "fe/idl.ypp" { (yyval.etval) = AST_Expression::EV_wchar; } -#line 5895 "fe/idl.tab.cpp" +#line 5924 "fe/idl.tab.cpp" break; - case 290: /* octet_type: IDL_OCTET */ + case 291: /* octet_type: IDL_OCTET */ #line 3081 "fe/idl.ypp" { (yyval.etval) = AST_Expression::EV_octet; } -#line 5903 "fe/idl.tab.cpp" +#line 5932 "fe/idl.tab.cpp" break; - case 291: /* boolean_type: IDL_BOOLEAN */ + case 292: /* boolean_type: IDL_BOOLEAN */ #line 3088 "fe/idl.ypp" { (yyval.etval) = AST_Expression::EV_bool; } -#line 5911 "fe/idl.tab.cpp" +#line 5940 "fe/idl.tab.cpp" break; - case 292: /* any_type: IDL_ANY */ + case 293: /* any_type: IDL_ANY */ #line 3095 "fe/idl.ypp" { (yyval.etval) = AST_Expression::EV_any; } -#line 5919 "fe/idl.tab.cpp" +#line 5948 "fe/idl.tab.cpp" break; - case 293: /* object_type: IDL_OBJECT */ + case 294: /* object_type: IDL_OBJECT */ #line 3102 "fe/idl.ypp" { (yyval.etval) = AST_Expression::EV_object; } -#line 5927 "fe/idl.tab.cpp" +#line 5956 "fe/idl.tab.cpp" break; - case 294: /* $@65: %empty */ + case 295: /* $@65: %empty */ #line 3109 "fe/idl.ypp" { idl_global->set_parse_state (IDL_GlobalData::PS_StructSeen); } -#line 5935 "fe/idl.tab.cpp" +#line 5964 "fe/idl.tab.cpp" break; - case 295: /* struct_decl: IDL_STRUCT $@65 defining_id */ + case 296: /* struct_decl: IDL_STRUCT $@65 defining_id */ #line 3113 "fe/idl.ypp" { idl_global->set_parse_state (IDL_GlobalData::PS_StructIDSeen); (yyval.idval) = (yyvsp[0].idval); } -#line 5944 "fe/idl.tab.cpp" +#line 5973 "fe/idl.tab.cpp" break; - case 296: /* $@66: %empty */ + case 297: /* $@66: %empty */ #line 3122 "fe/idl.ypp" { UTL_Scope *s = idl_global->scopes ().top_non_null (); @@ -5963,30 +6004,20 @@ yyparse (void) delete (yyvsp[0].idval); (yyvsp[0].idval) = 0; } -#line 5979 "fe/idl.tab.cpp" +#line 6008 "fe/idl.tab.cpp" break; - case 297: /* $@67: %empty */ + case 298: /* $@67: %empty */ #line 3153 "fe/idl.ypp" { idl_global->set_parse_state (IDL_GlobalData::PS_StructSqSeen); } -#line 5987 "fe/idl.tab.cpp" +#line 6016 "fe/idl.tab.cpp" break; - case 298: /* $@68: %empty */ + case 299: /* struct_type: struct_decl $@66 '{' $@67 struct_body */ #line 3157 "fe/idl.ypp" { - idl_global->set_parse_state (IDL_GlobalData::PS_StructBodySeen); - } -#line 5995 "fe/idl.tab.cpp" - break; - - case 299: /* struct_type: struct_decl $@66 '{' $@67 at_least_one_member $@68 '}' */ -#line 3161 "fe/idl.ypp" - { - idl_global->set_parse_state (IDL_GlobalData::PS_StructQsSeen); - /* * Done with this struct. Pop its scope off the scopes stack. */ @@ -5995,11 +6026,39 @@ yyparse (void) ); idl_global->scopes ().pop (); } -#line 6011 "fe/idl.tab.cpp" +#line 6030 "fe/idl.tab.cpp" break; - case 303: /* member: annotations_maybe member_i */ -#line 3183 "fe/idl.ypp" + case 300: /* struct_body: '}' */ +#line 3170 "fe/idl.ypp" + { + if (idl_global->idl_version_ < IDL_VERSION_4) + idl_global->err ()->idl_version_error ( + "Empty structs are not allowed in IDL3"); + + idl_global->set_parse_state (IDL_GlobalData::PS_StructQsSeen); + } +#line 6042 "fe/idl.tab.cpp" + break; + + case 302: /* $@68: %empty */ +#line 3182 "fe/idl.ypp" + { + idl_global->set_parse_state (IDL_GlobalData::PS_StructBodySeen); + } +#line 6050 "fe/idl.tab.cpp" + break; + + case 303: /* struct_body_with_members: member members $@68 '}' */ +#line 3186 "fe/idl.ypp" + { + idl_global->set_parse_state (IDL_GlobalData::PS_StructQsSeen); + } +#line 6058 "fe/idl.tab.cpp" + break; + + case 306: /* member: annotations_maybe member_i */ +#line 3198 "fe/idl.ypp" { AST_Annotation_Appls *annotations = (yyvsp[-1].annotations_val); AST_Decls *members = (yyvsp[0].decls_val); @@ -6013,27 +6072,27 @@ yyparse (void) delete annotations; delete members; } -#line 6029 "fe/idl.tab.cpp" +#line 6076 "fe/idl.tab.cpp" break; - case 304: /* $@69: %empty */ -#line 3200 "fe/idl.ypp" + case 307: /* $@69: %empty */ +#line 3215 "fe/idl.ypp" { idl_global->set_parse_state (IDL_GlobalData::PS_MemberTypeSeen); } -#line 6037 "fe/idl.tab.cpp" +#line 6084 "fe/idl.tab.cpp" break; - case 305: /* $@70: %empty */ -#line 3204 "fe/idl.ypp" + case 308: /* $@70: %empty */ +#line 3219 "fe/idl.ypp" { idl_global->set_parse_state (IDL_GlobalData::PS_MemberDeclsSeen); } -#line 6045 "fe/idl.tab.cpp" +#line 6092 "fe/idl.tab.cpp" break; - case 306: /* member_i: type_spec $@69 at_least_one_declarator $@70 ';' */ -#line 3208 "fe/idl.ypp" + case 309: /* member_i: type_spec $@69 at_least_one_declarator $@70 ';' */ +#line 3223 "fe/idl.ypp" { UTL_Scope *s = idl_global->scopes ().top_non_null (); FE_Declarator *d = 0; @@ -6087,53 +6146,53 @@ yyparse (void) (yyval.decls_val) = members; } -#line 6103 "fe/idl.tab.cpp" +#line 6150 "fe/idl.tab.cpp" break; - case 307: /* $@71: %empty */ -#line 3262 "fe/idl.ypp" + case 310: /* $@71: %empty */ +#line 3277 "fe/idl.ypp" { idl_global->err ()->syntax_error (idl_global->parse_state ()); } -#line 6111 "fe/idl.tab.cpp" +#line 6158 "fe/idl.tab.cpp" break; - case 308: /* member_i: error $@71 ';' */ -#line 3266 "fe/idl.ypp" + case 311: /* member_i: error $@71 ';' */ +#line 3281 "fe/idl.ypp" { idl_global->set_parse_state (IDL_GlobalData::PS_NoState); yyerrok; } -#line 6120 "fe/idl.tab.cpp" +#line 6167 "fe/idl.tab.cpp" break; - case 309: /* $@72: %empty */ -#line 3274 "fe/idl.ypp" + case 312: /* $@72: %empty */ +#line 3289 "fe/idl.ypp" { idl_global->set_parse_state (IDL_GlobalData::PS_UnionSeen); } -#line 6128 "fe/idl.tab.cpp" +#line 6175 "fe/idl.tab.cpp" break; - case 310: /* union_decl: IDL_UNION $@72 defining_id */ -#line 3278 "fe/idl.ypp" + case 313: /* union_decl: IDL_UNION $@72 defining_id */ +#line 3293 "fe/idl.ypp" { idl_global->set_parse_state (IDL_GlobalData::PS_UnionIDSeen); (yyval.idval) = (yyvsp[0].idval); } -#line 6137 "fe/idl.tab.cpp" +#line 6184 "fe/idl.tab.cpp" break; - case 311: /* $@73: %empty */ -#line 3286 "fe/idl.ypp" + case 314: /* $@73: %empty */ +#line 3301 "fe/idl.ypp" { idl_global->set_parse_state (IDL_GlobalData::PS_SwitchSeen); } -#line 6145 "fe/idl.tab.cpp" +#line 6192 "fe/idl.tab.cpp" break; - case 312: /* $@74: %empty */ -#line 3290 "fe/idl.ypp" + case 315: /* $@74: %empty */ +#line 3305 "fe/idl.ypp" { UTL_Scope *s = idl_global->scopes ().top_non_null (); UTL_ScopedName n ((yyvsp[-3].idval), 0); @@ -6166,19 +6225,19 @@ yyparse (void) * Don't delete $1 yet; we'll need it a bit later. */ } -#line 6182 "fe/idl.tab.cpp" +#line 6229 "fe/idl.tab.cpp" break; - case 313: /* $@75: %empty */ -#line 3323 "fe/idl.ypp" + case 316: /* $@75: %empty */ +#line 3338 "fe/idl.ypp" { idl_global->set_parse_state (IDL_GlobalData::PS_SwitchTypeSeen); } -#line 6190 "fe/idl.tab.cpp" +#line 6237 "fe/idl.tab.cpp" break; - case 314: /* $@76: %empty */ -#line 3327 "fe/idl.ypp" + case 317: /* $@76: %empty */ +#line 3342 "fe/idl.ypp" { /* * The top of the scopes must be an empty union we added after we @@ -6237,27 +6296,27 @@ yyparse (void) delete disc_annotations; } -#line 6253 "fe/idl.tab.cpp" +#line 6300 "fe/idl.tab.cpp" break; - case 315: /* $@77: %empty */ -#line 3386 "fe/idl.ypp" + case 318: /* $@77: %empty */ +#line 3401 "fe/idl.ypp" { idl_global->set_parse_state (IDL_GlobalData::PS_UnionSqSeen); } -#line 6261 "fe/idl.tab.cpp" +#line 6308 "fe/idl.tab.cpp" break; - case 316: /* $@78: %empty */ -#line 3390 "fe/idl.ypp" + case 319: /* $@78: %empty */ +#line 3405 "fe/idl.ypp" { idl_global->set_parse_state (IDL_GlobalData::PS_UnionBodySeen); } -#line 6269 "fe/idl.tab.cpp" +#line 6316 "fe/idl.tab.cpp" break; - case 317: /* union_type: union_decl IDL_SWITCH $@73 '(' $@74 annotations_maybe switch_type_spec $@75 ')' $@76 '{' $@77 at_least_one_case_branch $@78 '}' */ -#line 3394 "fe/idl.ypp" + case 320: /* union_type: union_decl IDL_SWITCH $@73 '(' $@74 annotations_maybe switch_type_spec $@75 ')' $@76 '{' $@77 at_least_one_case_branch $@78 '}' */ +#line 3409 "fe/idl.ypp" { idl_global->set_parse_state (IDL_GlobalData::PS_UnionQsSeen); @@ -6273,63 +6332,51 @@ yyparse (void) idl_global->scopes ().pop (); } } -#line 6289 "fe/idl.tab.cpp" +#line 6336 "fe/idl.tab.cpp" break; - case 318: /* switch_type_spec: integer_type */ -#line 3413 "fe/idl.ypp" + case 321: /* switch_type_spec: integer_type */ +#line 3428 "fe/idl.ypp" { - (yyval.dcval) = - idl_global->scopes ().bottom ()->lookup_primitive_type ( - (yyvsp[0].etval) - ); + (yyval.dcval) = idl_global->scopes ().bottom ()->lookup_primitive_type ((yyvsp[0].etval)); } -#line 6300 "fe/idl.tab.cpp" +#line 6344 "fe/idl.tab.cpp" break; - case 319: /* switch_type_spec: char_type */ -#line 3420 "fe/idl.ypp" + case 322: /* switch_type_spec: char_type */ +#line 3432 "fe/idl.ypp" { - /* wchars are not allowed. */ - if ((yyvsp[0].etval) == AST_Expression::EV_wchar) - { - idl_global->err ()->error0 (UTL_Error::EIDL_DISC_TYPE); - } + if ((yyvsp[0].etval) == AST_Expression::EV_wchar && idl_global->idl_version_ < IDL_VERSION_4) + idl_global->err ()->idl_version_error ( + "Using wchar as a union discriminator isn't allowed in IDL3"); - (yyval.dcval) = - idl_global->scopes ().bottom ()->lookup_primitive_type ( - (yyvsp[0].etval) - ); + (yyval.dcval) = idl_global->scopes ().bottom ()->lookup_primitive_type ((yyvsp[0].etval)); } -#line 6317 "fe/idl.tab.cpp" +#line 6356 "fe/idl.tab.cpp" break; - case 320: /* switch_type_spec: octet_type */ -#line 3433 "fe/idl.ypp" + case 323: /* switch_type_spec: octet_type */ +#line 3440 "fe/idl.ypp" { - /* octets are not allowed. */ - idl_global->err ()->error0 (UTL_Error::EIDL_DISC_TYPE); - (yyval.dcval) = - idl_global->scopes ().bottom ()->lookup_primitive_type ( - (yyvsp[0].etval) - ); + if (idl_global->idl_version_ < IDL_VERSION_4) + idl_global->err ()->idl_version_error ( + "Using octet as a union discriminator isn't allowed in IDL3"); + + (yyval.dcval) = idl_global->scopes ().bottom ()->lookup_primitive_type ((yyvsp[0].etval)); } -#line 6330 "fe/idl.tab.cpp" +#line 6368 "fe/idl.tab.cpp" break; - case 321: /* switch_type_spec: boolean_type */ -#line 3442 "fe/idl.ypp" + case 324: /* switch_type_spec: boolean_type */ +#line 3448 "fe/idl.ypp" { - (yyval.dcval) = - idl_global->scopes ().bottom ()->lookup_primitive_type ( - (yyvsp[0].etval) - ); + (yyval.dcval) = idl_global->scopes ().bottom ()->lookup_primitive_type ((yyvsp[0].etval)); } -#line 6341 "fe/idl.tab.cpp" +#line 6376 "fe/idl.tab.cpp" break; - case 323: /* switch_type_spec: scoped_name */ -#line 3450 "fe/idl.ypp" + case 326: /* switch_type_spec: scoped_name */ +#line 3453 "fe/idl.ypp" { UTL_Scope *s = idl_global->scopes ().top_non_null (); AST_Decl *d = 0; @@ -6436,27 +6483,27 @@ yyparse (void) delete (yyvsp[0].idlist); (yyvsp[0].idlist) = 0; } -#line 6452 "fe/idl.tab.cpp" +#line 6487 "fe/idl.tab.cpp" break; - case 327: /* $@79: %empty */ -#line 3567 "fe/idl.ypp" + case 330: /* $@79: %empty */ +#line 3570 "fe/idl.ypp" { idl_global->set_parse_state (IDL_GlobalData::PS_UnionLabelSeen); } -#line 6460 "fe/idl.tab.cpp" +#line 6495 "fe/idl.tab.cpp" break; - case 328: /* $@80: %empty */ -#line 3571 "fe/idl.ypp" + case 331: /* $@80: %empty */ +#line 3574 "fe/idl.ypp" { idl_global->set_parse_state (IDL_GlobalData::PS_UnionElemSeen); } -#line 6468 "fe/idl.tab.cpp" +#line 6503 "fe/idl.tab.cpp" break; - case 329: /* case_branch: at_least_one_case_label $@79 annotations_maybe element_spec $@80 ';' */ -#line 3575 "fe/idl.ypp" + case 332: /* case_branch: at_least_one_case_label $@79 annotations_maybe element_spec $@80 ';' */ +#line 3578 "fe/idl.ypp" { UTL_Scope *s = idl_global->scopes ().top_non_null (); AST_UnionBranch *b = 0; @@ -6488,39 +6535,39 @@ yyparse (void) delete annotations; } -#line 6504 "fe/idl.tab.cpp" +#line 6539 "fe/idl.tab.cpp" break; - case 330: /* $@81: %empty */ -#line 3607 "fe/idl.ypp" + case 333: /* $@81: %empty */ +#line 3610 "fe/idl.ypp" { idl_global->err ()->syntax_error (idl_global->parse_state ()); } -#line 6512 "fe/idl.tab.cpp" +#line 6547 "fe/idl.tab.cpp" break; - case 331: /* case_branch: error $@81 ';' */ -#line 3611 "fe/idl.ypp" + case 334: /* case_branch: error $@81 ';' */ +#line 3614 "fe/idl.ypp" { idl_global->set_parse_state (IDL_GlobalData::PS_NoState); yyerrok; } -#line 6521 "fe/idl.tab.cpp" +#line 6556 "fe/idl.tab.cpp" break; - case 332: /* at_least_one_case_label: case_label case_labels */ -#line 3619 "fe/idl.ypp" + case 335: /* at_least_one_case_label: case_label case_labels */ +#line 3622 "fe/idl.ypp" { ACE_NEW_RETURN ((yyval.llval), UTL_LabelList ((yyvsp[-1].ulval), (yyvsp[0].llval)), 1); } -#line 6532 "fe/idl.tab.cpp" +#line 6567 "fe/idl.tab.cpp" break; - case 333: /* case_labels: case_labels case_label */ -#line 3629 "fe/idl.ypp" + case 336: /* case_labels: case_labels case_label */ +#line 3632 "fe/idl.ypp" { UTL_LabelList *ll = 0; ACE_NEW_RETURN (ll, @@ -6538,27 +6585,27 @@ yyparse (void) (yyval.llval) = (yyvsp[-1].llval); } } -#line 6554 "fe/idl.tab.cpp" +#line 6589 "fe/idl.tab.cpp" break; - case 334: /* case_labels: %empty */ -#line 3647 "fe/idl.ypp" + case 337: /* case_labels: %empty */ +#line 3650 "fe/idl.ypp" { (yyval.llval) = 0; } -#line 6562 "fe/idl.tab.cpp" +#line 6597 "fe/idl.tab.cpp" break; - case 335: /* $@82: %empty */ -#line 3654 "fe/idl.ypp" + case 338: /* $@82: %empty */ +#line 3657 "fe/idl.ypp" { idl_global->set_parse_state (IDL_GlobalData::PS_DefaultSeen); } -#line 6570 "fe/idl.tab.cpp" +#line 6605 "fe/idl.tab.cpp" break; - case 336: /* case_label: IDL_DEFAULT $@82 ':' */ -#line 3658 "fe/idl.ypp" + case 339: /* case_label: IDL_DEFAULT $@82 ':' */ +#line 3661 "fe/idl.ypp" { idl_global->set_parse_state (IDL_GlobalData::PS_LabelColonSeen); @@ -6567,27 +6614,27 @@ yyparse (void) 0 ); } -#line 6583 "fe/idl.tab.cpp" +#line 6618 "fe/idl.tab.cpp" break; - case 337: /* $@83: %empty */ -#line 3667 "fe/idl.ypp" + case 340: /* $@83: %empty */ +#line 3670 "fe/idl.ypp" { idl_global->set_parse_state (IDL_GlobalData::PS_CaseSeen); } -#line 6591 "fe/idl.tab.cpp" +#line 6626 "fe/idl.tab.cpp" break; - case 338: /* $@84: %empty */ -#line 3671 "fe/idl.ypp" + case 341: /* $@84: %empty */ +#line 3674 "fe/idl.ypp" { idl_global->set_parse_state (IDL_GlobalData::PS_LabelExprSeen); } -#line 6599 "fe/idl.tab.cpp" +#line 6634 "fe/idl.tab.cpp" break; - case 339: /* case_label: IDL_CASE $@83 const_expr $@84 ':' */ -#line 3675 "fe/idl.ypp" + case 342: /* case_label: IDL_CASE $@83 const_expr $@84 ':' */ +#line 3678 "fe/idl.ypp" { idl_global->set_parse_state (IDL_GlobalData::PS_LabelColonSeen); @@ -6596,19 +6643,19 @@ yyparse (void) (yyvsp[-2].exval) ); } -#line 6612 "fe/idl.tab.cpp" +#line 6647 "fe/idl.tab.cpp" break; - case 340: /* $@85: %empty */ -#line 3687 "fe/idl.ypp" + case 343: /* $@85: %empty */ +#line 3690 "fe/idl.ypp" { idl_global->set_parse_state (IDL_GlobalData::PS_UnionElemTypeSeen); } -#line 6620 "fe/idl.tab.cpp" +#line 6655 "fe/idl.tab.cpp" break; - case 341: /* element_spec: type_spec $@85 declarator */ -#line 3691 "fe/idl.ypp" + case 344: /* element_spec: type_spec $@85 declarator */ +#line 3694 "fe/idl.ypp" { idl_global->set_parse_state (IDL_GlobalData::PS_UnionElemDeclSeen); @@ -6651,11 +6698,11 @@ yyparse (void) (yyvsp[0].deval) = 0; } } -#line 6667 "fe/idl.tab.cpp" +#line 6702 "fe/idl.tab.cpp" break; - case 342: /* struct_forward_type: struct_decl */ -#line 3737 "fe/idl.ypp" + case 345: /* struct_forward_type: struct_decl */ +#line 3740 "fe/idl.ypp" { UTL_Scope *s = idl_global->scopes ().top_non_null (); UTL_ScopedName n ((yyvsp[0].idval), @@ -6677,11 +6724,11 @@ yyparse (void) (yyval.dcval) = d; } -#line 6693 "fe/idl.tab.cpp" +#line 6728 "fe/idl.tab.cpp" break; - case 343: /* union_forward_type: union_decl */ -#line 3762 "fe/idl.ypp" + case 346: /* union_forward_type: union_decl */ +#line 3765 "fe/idl.ypp" { UTL_Scope *s = idl_global->scopes ().top_non_null (); UTL_ScopedName n ((yyvsp[0].idval), @@ -6701,19 +6748,19 @@ yyparse (void) delete (yyvsp[0].idval); (yyvsp[0].idval) = 0; } -#line 6717 "fe/idl.tab.cpp" +#line 6752 "fe/idl.tab.cpp" break; - case 344: /* $@86: %empty */ -#line 3785 "fe/idl.ypp" + case 347: /* $@86: %empty */ +#line 3788 "fe/idl.ypp" { idl_global->set_parse_state (IDL_GlobalData::PS_EnumSeen); } -#line 6725 "fe/idl.tab.cpp" +#line 6760 "fe/idl.tab.cpp" break; - case 345: /* $@87: %empty */ -#line 3789 "fe/idl.ypp" + case 348: /* $@87: %empty */ +#line 3792 "fe/idl.ypp" { UTL_Scope *s = idl_global->scopes ().top_non_null (); UTL_ScopedName n ((yyvsp[0].idval), 0); @@ -6744,27 +6791,27 @@ yyparse (void) delete (yyvsp[0].idval); (yyvsp[0].idval) = 0; } -#line 6760 "fe/idl.tab.cpp" +#line 6795 "fe/idl.tab.cpp" break; - case 346: /* $@88: %empty */ -#line 3820 "fe/idl.ypp" + case 349: /* $@88: %empty */ +#line 3823 "fe/idl.ypp" { idl_global->set_parse_state (IDL_GlobalData::PS_EnumSqSeen); } -#line 6768 "fe/idl.tab.cpp" +#line 6803 "fe/idl.tab.cpp" break; - case 347: /* $@89: %empty */ -#line 3824 "fe/idl.ypp" + case 350: /* $@89: %empty */ +#line 3827 "fe/idl.ypp" { idl_global->set_parse_state (IDL_GlobalData::PS_EnumBodySeen); } -#line 6776 "fe/idl.tab.cpp" +#line 6811 "fe/idl.tab.cpp" break; - case 348: /* enum_type: IDL_ENUM $@86 defining_id $@87 '{' $@88 at_least_one_enumerator $@89 '}' */ -#line 3828 "fe/idl.ypp" + case 351: /* enum_type: IDL_ENUM $@86 defining_id $@87 '{' $@88 at_least_one_enumerator $@89 '}' */ +#line 3831 "fe/idl.ypp" { idl_global->set_parse_state (IDL_GlobalData::PS_EnumQsSeen); @@ -6783,19 +6830,19 @@ yyparse (void) idl_global->scopes ().pop (); } } -#line 6799 "fe/idl.tab.cpp" +#line 6834 "fe/idl.tab.cpp" break; - case 350: /* $@90: %empty */ -#line 3853 "fe/idl.ypp" + case 353: /* $@90: %empty */ +#line 3856 "fe/idl.ypp" { idl_global->set_parse_state (IDL_GlobalData::PS_EnumCommaSeen); } -#line 6807 "fe/idl.tab.cpp" +#line 6842 "fe/idl.tab.cpp" break; - case 353: /* enumerator: annotations_maybe IDENTIFIER */ -#line 3862 "fe/idl.ypp" + case 356: /* enumerator: annotations_maybe IDENTIFIER */ +#line 3865 "fe/idl.ypp" { UTL_Scope *s = idl_global->scopes ().top_non_null (); AST_Annotation_Appls *annotations = (yyvsp[-1].annotations_val); @@ -6830,11 +6877,11 @@ yyparse (void) delete annotations; } -#line 6846 "fe/idl.tab.cpp" +#line 6881 "fe/idl.tab.cpp" break; - case 354: /* map_type_spec: map_head '>' */ -#line 3901 "fe/idl.ypp" + case 357: /* map_type_spec: map_head '>' */ +#line 3904 "fe/idl.ypp" { AST_Map *map = 0; Decl_Annotations_Pair_Pair* type_pair = (yyvsp[-1].decl_annotations_pair_val_pair); @@ -6893,11 +6940,11 @@ yyparse (void) delete type_pair; (yyval.dcval) = map; } -#line 6909 "fe/idl.tab.cpp" +#line 6944 "fe/idl.tab.cpp" break; - case 355: /* $@91: %empty */ -#line 3963 "fe/idl.ypp" + case 358: /* $@91: %empty */ +#line 3966 "fe/idl.ypp" { idl_global->set_parse_state (IDL_GlobalData::PS_MapSeen); @@ -6906,19 +6953,19 @@ yyparse (void) */ idl_global->scopes ().push (0); } -#line 6922 "fe/idl.tab.cpp" +#line 6957 "fe/idl.tab.cpp" break; - case 356: /* $@92: %empty */ -#line 3973 "fe/idl.ypp" + case 359: /* $@92: %empty */ +#line 3976 "fe/idl.ypp" { idl_global->set_parse_state(IDL_GlobalData::PS_MapKeyTypeSeen); } -#line 6930 "fe/idl.tab.cpp" +#line 6965 "fe/idl.tab.cpp" break; - case 357: /* map_head: IDL_MAP $@91 '<' annotations_maybe simple_type_spec $@92 ',' annotations_maybe simple_type_spec */ -#line 3978 "fe/idl.ypp" + case 360: /* map_head: IDL_MAP $@91 '<' annotations_maybe simple_type_spec $@92 ',' annotations_maybe simple_type_spec */ +#line 3981 "fe/idl.ypp" { idl_global->set_parse_state(IDL_GlobalData::PS_MapValueTypeSeen); Decl_Annotations_Pair *key = new Decl_Annotations_Pair; @@ -6934,27 +6981,27 @@ yyparse (void) pairs->second = value; (yyval.decl_annotations_pair_val_pair) = pairs; } -#line 6950 "fe/idl.tab.cpp" +#line 6985 "fe/idl.tab.cpp" break; - case 358: /* $@93: %empty */ -#line 3998 "fe/idl.ypp" + case 361: /* $@93: %empty */ +#line 4001 "fe/idl.ypp" { idl_global->set_parse_state (IDL_GlobalData::PS_SequenceCommaSeen); } -#line 6958 "fe/idl.tab.cpp" +#line 6993 "fe/idl.tab.cpp" break; - case 359: /* $@94: %empty */ -#line 4002 "fe/idl.ypp" + case 362: /* $@94: %empty */ +#line 4005 "fe/idl.ypp" { idl_global->set_parse_state (IDL_GlobalData::PS_SequenceExprSeen); } -#line 6966 "fe/idl.tab.cpp" +#line 7001 "fe/idl.tab.cpp" break; - case 360: /* sequence_type_spec: seq_head ',' $@93 positive_int_expr $@94 '>' */ -#line 4006 "fe/idl.ypp" + case 363: /* sequence_type_spec: seq_head ',' $@93 positive_int_expr $@94 '>' */ +#line 4009 "fe/idl.ypp" { idl_global->set_parse_state (IDL_GlobalData::PS_SequenceQsSeen); @@ -7035,11 +7082,11 @@ yyparse (void) ev = 0; (yyval.dcval) = seq; } -#line 7051 "fe/idl.tab.cpp" +#line 7086 "fe/idl.tab.cpp" break; - case 361: /* sequence_type_spec: seq_head '>' */ -#line 4088 "fe/idl.ypp" + case 364: /* sequence_type_spec: seq_head '>' */ +#line 4091 "fe/idl.ypp" { idl_global->set_parse_state (IDL_GlobalData::PS_SequenceQsSeen); @@ -7101,11 +7148,11 @@ yyparse (void) delete type_annotations; (yyval.dcval) = seq; } -#line 7117 "fe/idl.tab.cpp" +#line 7152 "fe/idl.tab.cpp" break; - case 362: /* $@95: %empty */ -#line 4153 "fe/idl.ypp" + case 365: /* $@95: %empty */ +#line 4156 "fe/idl.ypp" { idl_global->set_parse_state (IDL_GlobalData::PS_SequenceSeen); @@ -7114,19 +7161,19 @@ yyparse (void) */ idl_global->scopes ().push (0); } -#line 7130 "fe/idl.tab.cpp" +#line 7165 "fe/idl.tab.cpp" break; - case 363: /* $@96: %empty */ -#line 4162 "fe/idl.ypp" + case 366: /* $@96: %empty */ +#line 4165 "fe/idl.ypp" { idl_global->set_parse_state (IDL_GlobalData::PS_SequenceSqSeen); } -#line 7138 "fe/idl.tab.cpp" +#line 7173 "fe/idl.tab.cpp" break; - case 364: /* seq_head: IDL_SEQUENCE $@95 '<' $@96 annotations_maybe simple_type_spec */ -#line 4166 "fe/idl.ypp" + case 367: /* seq_head: IDL_SEQUENCE $@95 '<' $@96 annotations_maybe simple_type_spec */ +#line 4169 "fe/idl.ypp" { idl_global->set_parse_state (IDL_GlobalData::PS_SequenceTypeSeen); Decl_Annotations_Pair *seq_head = new Decl_Annotations_Pair; @@ -7134,36 +7181,36 @@ yyparse (void) seq_head->annotations = (yyvsp[-1].annotations_val); (yyval.decl_annotations_pair_val) = seq_head; } -#line 7150 "fe/idl.tab.cpp" +#line 7185 "fe/idl.tab.cpp" break; - case 365: /* fixed_type_spec: IDL_FIXED '<' positive_int_expr ',' const_expr '>' */ -#line 4177 "fe/idl.ypp" + case 368: /* fixed_type_spec: IDL_FIXED '<' positive_int_expr ',' const_expr '>' */ +#line 4180 "fe/idl.ypp" { (yyvsp[-1].exval)->evaluate (AST_Expression::EK_positive_int); (yyval.dcval) = idl_global->gen ()->create_fixed ((yyvsp[-3].exval), (yyvsp[-1].exval)); } -#line 7159 "fe/idl.tab.cpp" +#line 7194 "fe/idl.tab.cpp" break; - case 366: /* $@97: %empty */ -#line 4186 "fe/idl.ypp" + case 369: /* $@97: %empty */ +#line 4189 "fe/idl.ypp" { idl_global->set_parse_state (IDL_GlobalData::PS_StringSqSeen); } -#line 7167 "fe/idl.tab.cpp" +#line 7202 "fe/idl.tab.cpp" break; - case 367: /* $@98: %empty */ -#line 4190 "fe/idl.ypp" + case 370: /* $@98: %empty */ +#line 4193 "fe/idl.ypp" { idl_global->set_parse_state (IDL_GlobalData::PS_StringExprSeen); } -#line 7175 "fe/idl.tab.cpp" +#line 7210 "fe/idl.tab.cpp" break; - case 368: /* string_type_spec: string_head '<' $@97 positive_int_expr $@98 '>' */ -#line 4194 "fe/idl.ypp" + case 371: /* string_type_spec: string_head '<' $@97 positive_int_expr $@98 '>' */ +#line 4197 "fe/idl.ypp" { idl_global->set_parse_state (IDL_GlobalData::PS_StringQsSeen); @@ -7202,11 +7249,11 @@ yyparse (void) delete ev; ev = 0; } -#line 7218 "fe/idl.tab.cpp" +#line 7253 "fe/idl.tab.cpp" break; - case 369: /* string_type_spec: string_head */ -#line 4233 "fe/idl.ypp" + case 372: /* string_type_spec: string_head */ +#line 4236 "fe/idl.ypp" { idl_global->set_parse_state (IDL_GlobalData::PS_StringCompleted); @@ -7229,35 +7276,35 @@ yyparse (void) (yyval.dcval) = tao_string_decl; } -#line 7245 "fe/idl.tab.cpp" +#line 7280 "fe/idl.tab.cpp" break; - case 370: /* string_head: IDL_STRING */ -#line 4259 "fe/idl.ypp" + case 373: /* string_head: IDL_STRING */ +#line 4262 "fe/idl.ypp" { idl_global->set_parse_state (IDL_GlobalData::PS_StringSeen); } -#line 7253 "fe/idl.tab.cpp" +#line 7288 "fe/idl.tab.cpp" break; - case 371: /* $@99: %empty */ -#line 4267 "fe/idl.ypp" + case 374: /* $@99: %empty */ +#line 4270 "fe/idl.ypp" { idl_global->set_parse_state (IDL_GlobalData::PS_StringSqSeen); } -#line 7261 "fe/idl.tab.cpp" +#line 7296 "fe/idl.tab.cpp" break; - case 372: /* $@100: %empty */ -#line 4271 "fe/idl.ypp" + case 375: /* $@100: %empty */ +#line 4274 "fe/idl.ypp" { idl_global->set_parse_state (IDL_GlobalData::PS_StringExprSeen); } -#line 7269 "fe/idl.tab.cpp" +#line 7304 "fe/idl.tab.cpp" break; - case 373: /* wstring_type_spec: wstring_head '<' $@99 positive_int_expr $@100 '>' */ -#line 4275 "fe/idl.ypp" + case 376: /* wstring_type_spec: wstring_head '<' $@99 positive_int_expr $@100 '>' */ +#line 4278 "fe/idl.ypp" { idl_global->set_parse_state (IDL_GlobalData::PS_StringQsSeen); @@ -7296,11 +7343,11 @@ yyparse (void) delete ev; ev = 0; } -#line 7312 "fe/idl.tab.cpp" +#line 7347 "fe/idl.tab.cpp" break; - case 374: /* wstring_type_spec: wstring_head */ -#line 4314 "fe/idl.ypp" + case 377: /* wstring_type_spec: wstring_head */ +#line 4317 "fe/idl.ypp" { idl_global->set_parse_state (IDL_GlobalData::PS_StringCompleted); @@ -7323,27 +7370,27 @@ yyparse (void) (yyval.dcval) = string; } -#line 7339 "fe/idl.tab.cpp" +#line 7374 "fe/idl.tab.cpp" break; - case 375: /* wstring_head: IDL_WSTRING */ -#line 4340 "fe/idl.ypp" + case 378: /* wstring_head: IDL_WSTRING */ +#line 4343 "fe/idl.ypp" { idl_global->set_parse_state (IDL_GlobalData::PS_StringSeen); } -#line 7347 "fe/idl.tab.cpp" +#line 7382 "fe/idl.tab.cpp" break; - case 376: /* $@101: %empty */ -#line 4347 "fe/idl.ypp" + case 379: /* $@101: %empty */ +#line 4350 "fe/idl.ypp" { idl_global->set_parse_state (IDL_GlobalData::PS_ArrayIDSeen); } -#line 7355 "fe/idl.tab.cpp" +#line 7390 "fe/idl.tab.cpp" break; - case 377: /* array_declarator: defining_id $@101 annotations_maybe at_least_one_array_dim */ -#line 4351 "fe/idl.ypp" + case 380: /* array_declarator: defining_id $@101 annotations_maybe at_least_one_array_dim */ +#line 4354 "fe/idl.ypp" { idl_global->set_parse_state (IDL_GlobalData::PS_ArrayCompleted); @@ -7379,22 +7426,22 @@ yyparse (void) (yyval.dcval) = array; } -#line 7395 "fe/idl.tab.cpp" +#line 7430 "fe/idl.tab.cpp" break; - case 378: /* at_least_one_array_dim: array_dim array_dims */ -#line 4390 "fe/idl.ypp" + case 381: /* at_least_one_array_dim: array_dim array_dims */ +#line 4393 "fe/idl.ypp" { ACE_NEW_RETURN ((yyval.elval), UTL_ExprList ((yyvsp[-1].exval), (yyvsp[0].elval)), 1); } -#line 7406 "fe/idl.tab.cpp" +#line 7441 "fe/idl.tab.cpp" break; - case 379: /* array_dims: array_dims array_dim */ -#line 4400 "fe/idl.ypp" + case 382: /* array_dims: array_dims array_dim */ +#line 4403 "fe/idl.ypp" { UTL_ExprList *el = 0; ACE_NEW_RETURN (el, @@ -7412,35 +7459,35 @@ yyparse (void) (yyval.elval) = (yyvsp[-1].elval); } } -#line 7428 "fe/idl.tab.cpp" +#line 7463 "fe/idl.tab.cpp" break; - case 380: /* array_dims: %empty */ -#line 4418 "fe/idl.ypp" + case 383: /* array_dims: %empty */ +#line 4421 "fe/idl.ypp" { (yyval.elval) = 0; } -#line 7436 "fe/idl.tab.cpp" +#line 7471 "fe/idl.tab.cpp" break; - case 381: /* $@102: %empty */ -#line 4425 "fe/idl.ypp" + case 384: /* $@102: %empty */ +#line 4428 "fe/idl.ypp" { idl_global->set_parse_state (IDL_GlobalData::PS_DimSqSeen); } -#line 7444 "fe/idl.tab.cpp" +#line 7479 "fe/idl.tab.cpp" break; - case 382: /* $@103: %empty */ -#line 4429 "fe/idl.ypp" + case 385: /* $@103: %empty */ +#line 4432 "fe/idl.ypp" { idl_global->set_parse_state (IDL_GlobalData::PS_DimExprSeen); } -#line 7452 "fe/idl.tab.cpp" +#line 7487 "fe/idl.tab.cpp" break; - case 383: /* array_dim: '[' $@102 positive_int_expr $@103 ']' */ -#line 4433 "fe/idl.ypp" + case 386: /* array_dim: '[' $@102 positive_int_expr $@103 ']' */ +#line 4436 "fe/idl.ypp" { idl_global->set_parse_state (IDL_GlobalData::PS_DimQsSeen); @@ -7494,43 +7541,43 @@ yyparse (void) delete ev; ev = 0; } -#line 7510 "fe/idl.tab.cpp" +#line 7545 "fe/idl.tab.cpp" break; - case 386: /* $@104: %empty */ -#line 4495 "fe/idl.ypp" + case 389: /* $@104: %empty */ +#line 4498 "fe/idl.ypp" { idl_global->set_parse_state (IDL_GlobalData::PS_AttrROSeen); } -#line 7518 "fe/idl.tab.cpp" +#line 7553 "fe/idl.tab.cpp" break; - case 387: /* $@105: %empty */ -#line 4499 "fe/idl.ypp" + case 390: /* $@105: %empty */ +#line 4502 "fe/idl.ypp" { idl_global->set_parse_state (IDL_GlobalData::PS_AttrSeen); } -#line 7526 "fe/idl.tab.cpp" +#line 7561 "fe/idl.tab.cpp" break; - case 388: /* $@106: %empty */ -#line 4503 "fe/idl.ypp" + case 391: /* $@106: %empty */ +#line 4506 "fe/idl.ypp" { idl_global->set_parse_state (IDL_GlobalData::PS_AttrTypeSeen); } -#line 7534 "fe/idl.tab.cpp" +#line 7569 "fe/idl.tab.cpp" break; - case 389: /* $@107: %empty */ -#line 4507 "fe/idl.ypp" + case 392: /* $@107: %empty */ +#line 4510 "fe/idl.ypp" { idl_global->set_parse_state (IDL_GlobalData::PS_AttrDeclsSeen); } -#line 7542 "fe/idl.tab.cpp" +#line 7577 "fe/idl.tab.cpp" break; - case 390: /* attribute_readonly: IDL_READONLY $@104 IDL_ATTRIBUTE $@105 param_type_spec $@106 at_least_one_simple_declarator $@107 opt_raises */ -#line 4511 "fe/idl.ypp" + case 393: /* attribute_readonly: IDL_READONLY $@104 IDL_ATTRIBUTE $@105 param_type_spec $@106 at_least_one_simple_declarator $@107 opt_raises */ +#line 4514 "fe/idl.ypp" { UTL_Scope *s = idl_global->scopes ().top_non_null (); AST_Attribute *a = 0; @@ -7582,43 +7629,43 @@ yyparse (void) (yyval.dcval) = a; } -#line 7598 "fe/idl.tab.cpp" +#line 7633 "fe/idl.tab.cpp" break; - case 391: /* $@108: %empty */ -#line 4566 "fe/idl.ypp" + case 394: /* $@108: %empty */ +#line 4569 "fe/idl.ypp" { idl_global->set_parse_state (IDL_GlobalData::PS_AttrSeen); } -#line 7606 "fe/idl.tab.cpp" +#line 7641 "fe/idl.tab.cpp" break; - case 392: /* $@109: %empty */ -#line 4570 "fe/idl.ypp" + case 395: /* $@109: %empty */ +#line 4573 "fe/idl.ypp" { idl_global->set_parse_state (IDL_GlobalData::PS_AttrTypeSeen); } -#line 7614 "fe/idl.tab.cpp" +#line 7649 "fe/idl.tab.cpp" break; - case 393: /* $@110: %empty */ -#line 4574 "fe/idl.ypp" + case 396: /* $@110: %empty */ +#line 4577 "fe/idl.ypp" { idl_global->set_parse_state (IDL_GlobalData::PS_AttrDeclsSeen); } -#line 7622 "fe/idl.tab.cpp" +#line 7657 "fe/idl.tab.cpp" break; - case 394: /* $@111: %empty */ -#line 4578 "fe/idl.ypp" + case 397: /* $@111: %empty */ +#line 4581 "fe/idl.ypp" { idl_global->set_parse_state (IDL_GlobalData::PS_OpGetRaiseCompleted); } -#line 7630 "fe/idl.tab.cpp" +#line 7665 "fe/idl.tab.cpp" break; - case 395: /* attribute_readwrite: IDL_ATTRIBUTE $@108 param_type_spec $@109 at_least_one_simple_declarator $@110 opt_getraises $@111 opt_setraises */ -#line 4582 "fe/idl.ypp" + case 398: /* attribute_readwrite: IDL_ATTRIBUTE $@108 param_type_spec $@109 at_least_one_simple_declarator $@110 opt_getraises $@111 opt_setraises */ +#line 4585 "fe/idl.ypp" { UTL_Scope *s = idl_global->scopes ().top_non_null (); AST_Attribute *a = 0; @@ -7679,19 +7726,19 @@ yyparse (void) (yyval.dcval) = a; } -#line 7695 "fe/idl.tab.cpp" +#line 7730 "fe/idl.tab.cpp" break; - case 396: /* $@112: %empty */ -#line 4646 "fe/idl.ypp" + case 399: /* $@112: %empty */ +#line 4649 "fe/idl.ypp" { idl_global->set_parse_state (IDL_GlobalData::PS_ExceptSeen); } -#line 7703 "fe/idl.tab.cpp" +#line 7738 "fe/idl.tab.cpp" break; - case 397: /* @113: %empty */ -#line 4650 "fe/idl.ypp" + case 400: /* @113: %empty */ +#line 4653 "fe/idl.ypp" { Identifier *&id = (yyvsp[0].idval); UTL_Scope *scope = idl_global->scopes ().top_non_null (); @@ -7723,27 +7770,27 @@ yyparse (void) (yyval.dcval) = exception; } -#line 7739 "fe/idl.tab.cpp" +#line 7774 "fe/idl.tab.cpp" break; - case 398: /* $@114: %empty */ -#line 4682 "fe/idl.ypp" + case 401: /* $@114: %empty */ +#line 4685 "fe/idl.ypp" { idl_global->set_parse_state (IDL_GlobalData::PS_ExceptSqSeen); } -#line 7747 "fe/idl.tab.cpp" +#line 7782 "fe/idl.tab.cpp" break; - case 399: /* $@115: %empty */ -#line 4686 "fe/idl.ypp" + case 402: /* $@115: %empty */ +#line 4689 "fe/idl.ypp" { idl_global->set_parse_state (IDL_GlobalData::PS_ExceptBodySeen); } -#line 7755 "fe/idl.tab.cpp" +#line 7790 "fe/idl.tab.cpp" break; - case 400: /* exception: IDL_EXCEPTION $@112 defining_id @113 '{' $@114 members $@115 '}' */ -#line 4690 "fe/idl.ypp" + case 403: /* exception: IDL_EXCEPTION $@112 defining_id @113 '{' $@114 members $@115 '}' */ +#line 4693 "fe/idl.ypp" { idl_global->set_parse_state (IDL_GlobalData::PS_ExceptQsSeen); /* @@ -7753,19 +7800,19 @@ yyparse (void) (yyval.dcval) = (yyvsp[-5].dcval); } -#line 7769 "fe/idl.tab.cpp" +#line 7804 "fe/idl.tab.cpp" break; - case 401: /* $@116: %empty */ -#line 4703 "fe/idl.ypp" + case 404: /* $@116: %empty */ +#line 4706 "fe/idl.ypp" { idl_global->set_parse_state (IDL_GlobalData::PS_OpTypeSeen); } -#line 7777 "fe/idl.tab.cpp" +#line 7812 "fe/idl.tab.cpp" break; - case 402: /* $@117: %empty */ -#line 4707 "fe/idl.ypp" + case 405: /* $@117: %empty */ +#line 4710 "fe/idl.ypp" { AST_Operation *op = 0; UTL_Scope *scope = idl_global->scopes ().top_non_null (); @@ -7826,27 +7873,27 @@ yyparse (void) */ idl_global->scopes ().push (op); } -#line 7842 "fe/idl.tab.cpp" +#line 7877 "fe/idl.tab.cpp" break; - case 403: /* $@118: %empty */ -#line 4768 "fe/idl.ypp" + case 406: /* $@118: %empty */ +#line 4771 "fe/idl.ypp" { idl_global->set_parse_state (IDL_GlobalData::PS_OpParsCompleted); } -#line 7850 "fe/idl.tab.cpp" +#line 7885 "fe/idl.tab.cpp" break; - case 404: /* $@119: %empty */ -#line 4772 "fe/idl.ypp" + case 407: /* $@119: %empty */ +#line 4775 "fe/idl.ypp" { idl_global->set_parse_state (IDL_GlobalData::PS_OpRaiseCompleted); } -#line 7858 "fe/idl.tab.cpp" +#line 7893 "fe/idl.tab.cpp" break; - case 405: /* operation: opt_op_attribute op_type_spec $@116 IDENTIFIER $@117 parameter_list $@118 opt_raises $@119 opt_context */ -#line 4776 "fe/idl.ypp" + case 408: /* operation: opt_op_attribute op_type_spec $@116 IDENTIFIER $@117 parameter_list $@118 opt_raises $@119 opt_context */ +#line 4779 "fe/idl.ypp" { UTL_Scope *s = idl_global->scopes ().top_non_null (); AST_Operation *o = 0; @@ -7877,57 +7924,57 @@ yyparse (void) (yyval.dcval) = o; } -#line 7893 "fe/idl.tab.cpp" +#line 7928 "fe/idl.tab.cpp" break; - case 406: /* opt_op_attribute: IDL_ONEWAY */ -#line 4810 "fe/idl.ypp" + case 409: /* opt_op_attribute: IDL_ONEWAY */ +#line 4813 "fe/idl.ypp" { idl_global->set_parse_state (IDL_GlobalData::PS_OpAttrSeen); (yyval.ofval) = AST_Operation::OP_oneway; } -#line 7902 "fe/idl.tab.cpp" +#line 7937 "fe/idl.tab.cpp" break; - case 407: /* opt_op_attribute: IDL_IDEMPOTENT */ -#line 4815 "fe/idl.ypp" + case 410: /* opt_op_attribute: IDL_IDEMPOTENT */ +#line 4818 "fe/idl.ypp" { idl_global->set_parse_state (IDL_GlobalData::PS_OpAttrSeen); (yyval.ofval) = AST_Operation::OP_idempotent; } -#line 7911 "fe/idl.tab.cpp" +#line 7946 "fe/idl.tab.cpp" break; - case 408: /* opt_op_attribute: %empty */ -#line 4820 "fe/idl.ypp" + case 411: /* opt_op_attribute: %empty */ +#line 4823 "fe/idl.ypp" { (yyval.ofval) = AST_Operation::OP_noflags; } -#line 7919 "fe/idl.tab.cpp" +#line 7954 "fe/idl.tab.cpp" break; - case 410: /* op_type_spec: IDL_VOID */ -#line 4828 "fe/idl.ypp" + case 413: /* op_type_spec: IDL_VOID */ +#line 4831 "fe/idl.ypp" { (yyval.dcval) = idl_global->scopes ().bottom ()->lookup_primitive_type ( AST_Expression::EV_void ); } -#line 7930 "fe/idl.tab.cpp" +#line 7965 "fe/idl.tab.cpp" break; - case 411: /* $@120: %empty */ -#line 4838 "fe/idl.ypp" + case 414: /* $@120: %empty */ +#line 4841 "fe/idl.ypp" { //@@ PS_FactorySeen? idl_global->set_parse_state (IDL_GlobalData::PS_OpTypeSeen); } -#line 7939 "fe/idl.tab.cpp" +#line 7974 "fe/idl.tab.cpp" break; - case 412: /* @121: %empty */ -#line 4843 "fe/idl.ypp" + case 415: /* @121: %empty */ +#line 4846 "fe/idl.ypp" { UTL_Scope *s = idl_global->scopes ().top_non_null (); @@ -7970,19 +8017,19 @@ yyparse (void) (yyval.dcval) = factory; } -#line 7986 "fe/idl.tab.cpp" +#line 8021 "fe/idl.tab.cpp" break; - case 413: /* $@122: %empty */ -#line 4886 "fe/idl.ypp" + case 416: /* $@122: %empty */ +#line 4889 "fe/idl.ypp" { idl_global->set_parse_state (IDL_GlobalData::PS_OpParsCompleted); } -#line 7994 "fe/idl.tab.cpp" +#line 8029 "fe/idl.tab.cpp" break; - case 414: /* init_decl: IDL_FACTORY $@120 IDENTIFIER @121 init_parameter_list $@122 opt_raises */ -#line 4890 "fe/idl.ypp" + case 417: /* init_decl: IDL_FACTORY $@120 IDENTIFIER @121 init_parameter_list $@122 opt_raises */ +#line 4893 "fe/idl.ypp" { idl_global->set_parse_state (IDL_GlobalData::PS_OpRaiseCompleted); @@ -7997,67 +8044,67 @@ yyparse (void) (yyval.dcval) = (yyvsp[-3].dcval); } -#line 8013 "fe/idl.tab.cpp" +#line 8048 "fe/idl.tab.cpp" break; - case 415: /* $@123: %empty */ -#line 4908 "fe/idl.ypp" + case 418: /* $@123: %empty */ +#line 4911 "fe/idl.ypp" { idl_global->set_parse_state (IDL_GlobalData::PS_OpSqSeen); } -#line 8021 "fe/idl.tab.cpp" +#line 8056 "fe/idl.tab.cpp" break; - case 416: /* init_parameter_list: '(' $@123 ')' */ -#line 4912 "fe/idl.ypp" + case 419: /* init_parameter_list: '(' $@123 ')' */ +#line 4915 "fe/idl.ypp" { idl_global->set_parse_state (IDL_GlobalData::PS_OpQsSeen); } -#line 8029 "fe/idl.tab.cpp" +#line 8064 "fe/idl.tab.cpp" break; - case 417: /* $@124: %empty */ -#line 4916 "fe/idl.ypp" + case 420: /* $@124: %empty */ +#line 4919 "fe/idl.ypp" { idl_global->set_parse_state (IDL_GlobalData::PS_OpSqSeen); } -#line 8037 "fe/idl.tab.cpp" +#line 8072 "fe/idl.tab.cpp" break; - case 418: /* init_parameter_list: '(' $@124 at_least_one_in_parameter ')' */ -#line 4921 "fe/idl.ypp" + case 421: /* init_parameter_list: '(' $@124 at_least_one_in_parameter ')' */ +#line 4924 "fe/idl.ypp" { idl_global->set_parse_state (IDL_GlobalData::PS_OpQsSeen); } -#line 8045 "fe/idl.tab.cpp" +#line 8080 "fe/idl.tab.cpp" break; - case 420: /* $@125: %empty */ -#line 4931 "fe/idl.ypp" + case 423: /* $@125: %empty */ +#line 4934 "fe/idl.ypp" { idl_global->set_parse_state (IDL_GlobalData::PS_OpParCommaSeen); } -#line 8053 "fe/idl.tab.cpp" +#line 8088 "fe/idl.tab.cpp" break; - case 423: /* $@126: %empty */ -#line 4940 "fe/idl.ypp" + case 426: /* $@126: %empty */ +#line 4943 "fe/idl.ypp" { idl_global->set_parse_state (IDL_GlobalData::PS_OpParDirSeen); } -#line 8061 "fe/idl.tab.cpp" +#line 8096 "fe/idl.tab.cpp" break; - case 424: /* $@127: %empty */ -#line 4944 "fe/idl.ypp" + case 427: /* $@127: %empty */ +#line 4947 "fe/idl.ypp" { idl_global->set_parse_state (IDL_GlobalData::PS_OpParTypeSeen); } -#line 8069 "fe/idl.tab.cpp" +#line 8104 "fe/idl.tab.cpp" break; - case 425: /* in_parameter: IDL_IN $@126 param_type_spec $@127 declarator */ -#line 4948 "fe/idl.ypp" + case 428: /* in_parameter: IDL_IN $@126 param_type_spec $@127 declarator */ +#line 4951 "fe/idl.ypp" { UTL_Scope *s = idl_global->scopes ().top_non_null (); AST_Argument *a = 0; @@ -8089,67 +8136,67 @@ yyparse (void) delete (yyvsp[0].deval); (yyvsp[0].deval) = 0; } -#line 8105 "fe/idl.tab.cpp" +#line 8140 "fe/idl.tab.cpp" break; - case 426: /* $@128: %empty */ -#line 4983 "fe/idl.ypp" + case 429: /* $@128: %empty */ +#line 4986 "fe/idl.ypp" { idl_global->set_parse_state (IDL_GlobalData::PS_OpSqSeen); } -#line 8113 "fe/idl.tab.cpp" +#line 8148 "fe/idl.tab.cpp" break; - case 427: /* parameter_list: '(' $@128 ')' */ -#line 4987 "fe/idl.ypp" + case 430: /* parameter_list: '(' $@128 ')' */ +#line 4990 "fe/idl.ypp" { idl_global->set_parse_state (IDL_GlobalData::PS_OpQsSeen); } -#line 8121 "fe/idl.tab.cpp" +#line 8156 "fe/idl.tab.cpp" break; - case 428: /* $@129: %empty */ -#line 4991 "fe/idl.ypp" + case 431: /* $@129: %empty */ +#line 4994 "fe/idl.ypp" { idl_global->set_parse_state (IDL_GlobalData::PS_OpSqSeen); } -#line 8129 "fe/idl.tab.cpp" +#line 8164 "fe/idl.tab.cpp" break; - case 429: /* parameter_list: '(' $@129 at_least_one_parameter ')' */ -#line 4996 "fe/idl.ypp" + case 432: /* parameter_list: '(' $@129 at_least_one_parameter ')' */ +#line 4999 "fe/idl.ypp" { idl_global->set_parse_state (IDL_GlobalData::PS_OpQsSeen); } -#line 8137 "fe/idl.tab.cpp" +#line 8172 "fe/idl.tab.cpp" break; - case 431: /* $@130: %empty */ -#line 5006 "fe/idl.ypp" + case 434: /* $@130: %empty */ +#line 5009 "fe/idl.ypp" { idl_global->set_parse_state (IDL_GlobalData::PS_OpParCommaSeen); } -#line 8145 "fe/idl.tab.cpp" +#line 8180 "fe/idl.tab.cpp" break; - case 434: /* $@131: %empty */ -#line 5015 "fe/idl.ypp" + case 437: /* $@131: %empty */ +#line 5018 "fe/idl.ypp" { idl_global->set_parse_state (IDL_GlobalData::PS_OpParDirSeen); } -#line 8153 "fe/idl.tab.cpp" +#line 8188 "fe/idl.tab.cpp" break; - case 435: /* $@132: %empty */ -#line 5019 "fe/idl.ypp" + case 438: /* $@132: %empty */ +#line 5022 "fe/idl.ypp" { idl_global->set_parse_state (IDL_GlobalData::PS_OpParTypeSeen); } -#line 8161 "fe/idl.tab.cpp" +#line 8196 "fe/idl.tab.cpp" break; - case 436: /* parameter: direction $@131 param_type_spec $@132 declarator */ -#line 5023 "fe/idl.ypp" + case 439: /* parameter: direction $@131 param_type_spec $@132 declarator */ +#line 5026 "fe/idl.ypp" { UTL_Scope *s = idl_global->scopes ().top_non_null (); AST_Argument *a = 0; @@ -8188,22 +8235,22 @@ yyparse (void) delete (yyvsp[0].deval); (yyvsp[0].deval) = 0; } -#line 8204 "fe/idl.tab.cpp" +#line 8239 "fe/idl.tab.cpp" break; - case 437: /* param_type_spec: base_type_spec */ -#line 5065 "fe/idl.ypp" + case 440: /* param_type_spec: base_type_spec */ +#line 5068 "fe/idl.ypp" { (yyval.dcval) = idl_global->scopes ().bottom ()->lookup_primitive_type ( (yyvsp[0].etval) ); } -#line 8215 "fe/idl.tab.cpp" +#line 8250 "fe/idl.tab.cpp" break; - case 440: /* param_type_spec: scoped_name */ -#line 5074 "fe/idl.ypp" + case 443: /* param_type_spec: scoped_name */ +#line 5077 "fe/idl.ypp" { UTL_Scope *s = idl_global->scopes ().top_non_null (); AST_Decl *d = 0; @@ -8355,186 +8402,186 @@ yyparse (void) (yyval.dcval) = d; } -#line 8371 "fe/idl.tab.cpp" +#line 8406 "fe/idl.tab.cpp" break; - case 441: /* direction: IDL_IN */ -#line 5229 "fe/idl.ypp" + case 444: /* direction: IDL_IN */ +#line 5232 "fe/idl.ypp" { (yyval.dival) = AST_Argument::dir_IN; } -#line 8379 "fe/idl.tab.cpp" +#line 8414 "fe/idl.tab.cpp" break; - case 442: /* direction: IDL_OUT */ -#line 5233 "fe/idl.ypp" + case 445: /* direction: IDL_OUT */ +#line 5236 "fe/idl.ypp" { (yyval.dival) = AST_Argument::dir_OUT; } -#line 8387 "fe/idl.tab.cpp" +#line 8422 "fe/idl.tab.cpp" break; - case 443: /* direction: IDL_INOUT */ -#line 5237 "fe/idl.ypp" + case 446: /* direction: IDL_INOUT */ +#line 5240 "fe/idl.ypp" { (yyval.dival) = AST_Argument::dir_INOUT; } -#line 8395 "fe/idl.tab.cpp" +#line 8430 "fe/idl.tab.cpp" break; - case 444: /* $@133: %empty */ -#line 5244 "fe/idl.ypp" + case 447: /* $@133: %empty */ +#line 5247 "fe/idl.ypp" { idl_global->set_parse_state (IDL_GlobalData::PS_OpRaiseSeen); } -#line 8403 "fe/idl.tab.cpp" +#line 8438 "fe/idl.tab.cpp" break; - case 445: /* $@134: %empty */ -#line 5248 "fe/idl.ypp" + case 448: /* $@134: %empty */ +#line 5251 "fe/idl.ypp" { idl_global->set_parse_state (IDL_GlobalData::PS_OpRaiseSqSeen); } -#line 8411 "fe/idl.tab.cpp" +#line 8446 "fe/idl.tab.cpp" break; - case 446: /* opt_raises: IDL_RAISES $@133 '(' $@134 at_least_one_scoped_name ')' */ -#line 5253 "fe/idl.ypp" + case 449: /* opt_raises: IDL_RAISES $@133 '(' $@134 at_least_one_scoped_name ')' */ +#line 5256 "fe/idl.ypp" { idl_global->set_parse_state (IDL_GlobalData::PS_OpRaiseQsSeen); (yyval.nlval) = (yyvsp[-1].nlval); } -#line 8420 "fe/idl.tab.cpp" +#line 8455 "fe/idl.tab.cpp" break; - case 447: /* opt_raises: %empty */ -#line 5258 "fe/idl.ypp" + case 450: /* opt_raises: %empty */ +#line 5261 "fe/idl.ypp" { (yyval.nlval) = 0; } -#line 8428 "fe/idl.tab.cpp" +#line 8463 "fe/idl.tab.cpp" break; - case 448: /* $@135: %empty */ -#line 5265 "fe/idl.ypp" + case 451: /* $@135: %empty */ +#line 5268 "fe/idl.ypp" { idl_global->set_parse_state (IDL_GlobalData::PS_OpGetRaiseSeen); } -#line 8436 "fe/idl.tab.cpp" +#line 8471 "fe/idl.tab.cpp" break; - case 449: /* $@136: %empty */ -#line 5269 "fe/idl.ypp" + case 452: /* $@136: %empty */ +#line 5272 "fe/idl.ypp" { idl_global->set_parse_state (IDL_GlobalData::PS_OpGetRaiseSqSeen); } -#line 8444 "fe/idl.tab.cpp" +#line 8479 "fe/idl.tab.cpp" break; - case 450: /* opt_getraises: IDL_GETRAISES $@135 '(' $@136 at_least_one_scoped_name ')' */ -#line 5274 "fe/idl.ypp" + case 453: /* opt_getraises: IDL_GETRAISES $@135 '(' $@136 at_least_one_scoped_name ')' */ +#line 5277 "fe/idl.ypp" { idl_global->set_parse_state (IDL_GlobalData::PS_OpGetRaiseQsSeen); (yyval.nlval) = (yyvsp[-1].nlval); } -#line 8453 "fe/idl.tab.cpp" +#line 8488 "fe/idl.tab.cpp" break; - case 451: /* opt_getraises: %empty */ -#line 5279 "fe/idl.ypp" + case 454: /* opt_getraises: %empty */ +#line 5282 "fe/idl.ypp" { (yyval.nlval) = 0; } -#line 8461 "fe/idl.tab.cpp" +#line 8496 "fe/idl.tab.cpp" break; - case 452: /* $@137: %empty */ -#line 5286 "fe/idl.ypp" + case 455: /* $@137: %empty */ +#line 5289 "fe/idl.ypp" { idl_global->set_parse_state (IDL_GlobalData::PS_OpSetRaiseSeen); } -#line 8469 "fe/idl.tab.cpp" +#line 8504 "fe/idl.tab.cpp" break; - case 453: /* $@138: %empty */ -#line 5290 "fe/idl.ypp" + case 456: /* $@138: %empty */ +#line 5293 "fe/idl.ypp" { idl_global->set_parse_state (IDL_GlobalData::PS_OpSetRaiseSqSeen); } -#line 8477 "fe/idl.tab.cpp" +#line 8512 "fe/idl.tab.cpp" break; - case 454: /* opt_setraises: IDL_SETRAISES $@137 '(' $@138 at_least_one_scoped_name ')' */ -#line 5295 "fe/idl.ypp" + case 457: /* opt_setraises: IDL_SETRAISES $@137 '(' $@138 at_least_one_scoped_name ')' */ +#line 5298 "fe/idl.ypp" { idl_global->set_parse_state (IDL_GlobalData::PS_OpSetRaiseQsSeen); (yyval.nlval) = (yyvsp[-1].nlval); } -#line 8486 "fe/idl.tab.cpp" +#line 8521 "fe/idl.tab.cpp" break; - case 455: /* opt_setraises: %empty */ -#line 5300 "fe/idl.ypp" + case 458: /* opt_setraises: %empty */ +#line 5303 "fe/idl.ypp" { (yyval.nlval) = 0; } -#line 8494 "fe/idl.tab.cpp" +#line 8529 "fe/idl.tab.cpp" break; - case 456: /* $@139: %empty */ -#line 5307 "fe/idl.ypp" + case 459: /* $@139: %empty */ +#line 5310 "fe/idl.ypp" { idl_global->set_parse_state (IDL_GlobalData::PS_OpContextSeen); } -#line 8502 "fe/idl.tab.cpp" +#line 8537 "fe/idl.tab.cpp" break; - case 457: /* $@140: %empty */ -#line 5311 "fe/idl.ypp" + case 460: /* $@140: %empty */ +#line 5314 "fe/idl.ypp" { idl_global->set_parse_state (IDL_GlobalData::PS_OpContextSqSeen); } -#line 8510 "fe/idl.tab.cpp" +#line 8545 "fe/idl.tab.cpp" break; - case 458: /* opt_context: IDL_CONTEXT $@139 '(' $@140 at_least_one_string_literal ')' */ -#line 5316 "fe/idl.ypp" + case 461: /* opt_context: IDL_CONTEXT $@139 '(' $@140 at_least_one_string_literal ')' */ +#line 5319 "fe/idl.ypp" { idl_global->set_parse_state (IDL_GlobalData::PS_OpContextQsSeen); (yyval.slval) = (yyvsp[-1].slval); } -#line 8519 "fe/idl.tab.cpp" +#line 8554 "fe/idl.tab.cpp" break; - case 459: /* opt_context: %empty */ -#line 5321 "fe/idl.ypp" + case 462: /* opt_context: %empty */ +#line 5324 "fe/idl.ypp" { (yyval.slval) = 0; } -#line 8527 "fe/idl.tab.cpp" +#line 8562 "fe/idl.tab.cpp" break; - case 460: /* at_least_one_string_literal: IDL_STRING_LITERAL string_literals */ -#line 5328 "fe/idl.ypp" + case 463: /* at_least_one_string_literal: IDL_STRING_LITERAL string_literals */ +#line 5331 "fe/idl.ypp" { ACE_NEW_RETURN ((yyval.slval), UTL_StrList ((yyvsp[-1].sval), (yyvsp[0].slval)), 1); } -#line 8538 "fe/idl.tab.cpp" +#line 8573 "fe/idl.tab.cpp" break; - case 461: /* $@141: %empty */ -#line 5339 "fe/idl.ypp" + case 464: /* $@141: %empty */ +#line 5342 "fe/idl.ypp" { idl_global->set_parse_state (IDL_GlobalData::PS_OpContextCommaSeen); } -#line 8546 "fe/idl.tab.cpp" +#line 8581 "fe/idl.tab.cpp" break; - case 462: /* string_literals: string_literals ',' $@141 IDL_STRING_LITERAL */ -#line 5343 "fe/idl.ypp" + case 465: /* string_literals: string_literals ',' $@141 IDL_STRING_LITERAL */ +#line 5346 "fe/idl.ypp" { UTL_StrList *sl = 0; ACE_NEW_RETURN (sl, @@ -8552,19 +8599,19 @@ yyparse (void) (yyval.slval) = (yyvsp[-3].slval); } } -#line 8568 "fe/idl.tab.cpp" +#line 8603 "fe/idl.tab.cpp" break; - case 463: /* string_literals: %empty */ -#line 5361 "fe/idl.ypp" + case 466: /* string_literals: %empty */ +#line 5364 "fe/idl.ypp" { (yyval.slval) = 0; } -#line 8576 "fe/idl.tab.cpp" +#line 8611 "fe/idl.tab.cpp" break; - case 464: /* typeid_dcl: IDL_TYPEID scoped_name IDL_STRING_LITERAL */ -#line 5368 "fe/idl.ypp" + case 467: /* typeid_dcl: IDL_TYPEID scoped_name IDL_STRING_LITERAL */ +#line 5371 "fe/idl.ypp" { UTL_Scope *s = idl_global->scopes ().top_non_null (); AST_Decl *d = @@ -8591,11 +8638,11 @@ yyparse (void) (yyval.dcval) = 0; } -#line 8607 "fe/idl.tab.cpp" +#line 8642 "fe/idl.tab.cpp" break; - case 465: /* typeprefix_dcl: IDL_TYPEPREFIX scoped_name IDL_STRING_LITERAL */ -#line 5398 "fe/idl.ypp" + case 468: /* typeprefix_dcl: IDL_TYPEPREFIX scoped_name IDL_STRING_LITERAL */ +#line 5401 "fe/idl.ypp" { UTL_Scope *s = idl_global->scopes ().top_non_null (); AST_Decl *d = ScopeAsDecl (s); @@ -8631,11 +8678,11 @@ yyparse (void) (yyval.dcval) = 0; } -#line 8647 "fe/idl.tab.cpp" +#line 8682 "fe/idl.tab.cpp" break; - case 468: /* component_forward_decl: IDL_COMPONENT defining_id */ -#line 5443 "fe/idl.ypp" + case 471: /* component_forward_decl: IDL_COMPONENT defining_id */ +#line 5446 "fe/idl.ypp" { UTL_Scope *s = idl_global->scopes ().top_non_null (); UTL_ScopedName n ((yyvsp[0].idval), @@ -8661,11 +8708,11 @@ yyparse (void) (yyval.dcval) = 0; } -#line 8677 "fe/idl.tab.cpp" +#line 8712 "fe/idl.tab.cpp" break; - case 469: /* @142: %empty */ -#line 5472 "fe/idl.ypp" + case 472: /* @142: %empty */ +#line 5475 "fe/idl.ypp" { FE_ComponentHeader *&component_header = (yyvsp[0].chval); UTL_Scope *scope = idl_global->scopes ().top_non_null (); @@ -8707,27 +8754,27 @@ yyparse (void) (yyval.dcval) = component; } -#line 8723 "fe/idl.tab.cpp" +#line 8758 "fe/idl.tab.cpp" break; - case 470: /* $@143: %empty */ -#line 5514 "fe/idl.ypp" + case 473: /* $@143: %empty */ +#line 5517 "fe/idl.ypp" { idl_global->set_parse_state (IDL_GlobalData::PS_ComponentSqSeen); } -#line 8731 "fe/idl.tab.cpp" +#line 8766 "fe/idl.tab.cpp" break; - case 471: /* $@144: %empty */ -#line 5518 "fe/idl.ypp" + case 474: /* $@144: %empty */ +#line 5521 "fe/idl.ypp" { idl_global->set_parse_state (IDL_GlobalData::PS_ComponentBodySeen); } -#line 8739 "fe/idl.tab.cpp" +#line 8774 "fe/idl.tab.cpp" break; - case 472: /* component_decl: component_header @142 '{' $@143 component_exports $@144 '}' */ -#line 5522 "fe/idl.ypp" + case 475: /* component_decl: component_header @142 '{' $@143 component_exports $@144 '}' */ +#line 5525 "fe/idl.ypp" { idl_global->set_parse_state (IDL_GlobalData::PS_ComponentQsSeen); @@ -8738,27 +8785,27 @@ yyparse (void) (yyval.dcval) = (yyvsp[-5].dcval); } -#line 8754 "fe/idl.tab.cpp" +#line 8789 "fe/idl.tab.cpp" break; - case 473: /* $@145: %empty */ -#line 5537 "fe/idl.ypp" + case 476: /* $@145: %empty */ +#line 5540 "fe/idl.ypp" { idl_global->set_parse_state (IDL_GlobalData::PS_ComponentIDSeen); } -#line 8762 "fe/idl.tab.cpp" +#line 8797 "fe/idl.tab.cpp" break; - case 474: /* $@146: %empty */ -#line 5541 "fe/idl.ypp" + case 477: /* $@146: %empty */ +#line 5544 "fe/idl.ypp" { idl_global->set_parse_state (IDL_GlobalData::PS_InheritSpecSeen); } -#line 8770 "fe/idl.tab.cpp" +#line 8805 "fe/idl.tab.cpp" break; - case 475: /* component_header: IDL_COMPONENT defining_id $@145 component_inheritance_spec $@146 supports_spec */ -#line 5545 "fe/idl.ypp" + case 478: /* component_header: IDL_COMPONENT defining_id $@145 component_inheritance_spec $@146 supports_spec */ +#line 5548 "fe/idl.ypp" { idl_global->set_parse_state (IDL_GlobalData::PS_SupportSpecSeen); @@ -8792,35 +8839,35 @@ yyparse (void) (yyvsp[-2].idlist) = 0; } } -#line 8808 "fe/idl.tab.cpp" +#line 8843 "fe/idl.tab.cpp" break; - case 476: /* $@147: %empty */ -#line 5582 "fe/idl.ypp" + case 479: /* $@147: %empty */ +#line 5585 "fe/idl.ypp" { idl_global->set_parse_state (IDL_GlobalData::PS_InheritColonSeen); } -#line 8816 "fe/idl.tab.cpp" +#line 8851 "fe/idl.tab.cpp" break; - case 477: /* component_inheritance_spec: ':' $@147 scoped_name */ -#line 5586 "fe/idl.ypp" + case 480: /* component_inheritance_spec: ':' $@147 scoped_name */ +#line 5589 "fe/idl.ypp" { (yyval.idlist) = (yyvsp[0].idlist); } -#line 8824 "fe/idl.tab.cpp" +#line 8859 "fe/idl.tab.cpp" break; - case 478: /* component_inheritance_spec: %empty */ -#line 5590 "fe/idl.ypp" + case 481: /* component_inheritance_spec: %empty */ +#line 5593 "fe/idl.ypp" { (yyval.idlist) = 0; } -#line 8832 "fe/idl.tab.cpp" +#line 8867 "fe/idl.tab.cpp" break; - case 479: /* component_exports: component_exports at_least_one_annotation component_export */ -#line 5597 "fe/idl.ypp" + case 482: /* component_exports: component_exports at_least_one_annotation component_export */ +#line 5600 "fe/idl.ypp" { AST_Annotation_Appls *&annotations = (yyvsp[-1].annotations_val); AST_Decl *&node = (yyvsp[0].dcval); @@ -8835,130 +8882,130 @@ yyparse (void) } delete annotations; } -#line 8851 "fe/idl.tab.cpp" +#line 8886 "fe/idl.tab.cpp" break; - case 482: /* $@148: %empty */ -#line 5617 "fe/idl.ypp" + case 485: /* $@148: %empty */ +#line 5620 "fe/idl.ypp" { idl_global->set_parse_state (IDL_GlobalData::PS_ProvidesDeclSeen); } -#line 8859 "fe/idl.tab.cpp" +#line 8894 "fe/idl.tab.cpp" break; - case 483: /* component_export: provides_decl $@148 ';' */ -#line 5621 "fe/idl.ypp" + case 486: /* component_export: provides_decl $@148 ';' */ +#line 5624 "fe/idl.ypp" { idl_global->set_parse_state (IDL_GlobalData::PS_NoState); (yyval.dcval) = (yyvsp[-2].dcval); } -#line 8868 "fe/idl.tab.cpp" +#line 8903 "fe/idl.tab.cpp" break; - case 484: /* $@149: %empty */ -#line 5626 "fe/idl.ypp" + case 487: /* $@149: %empty */ +#line 5629 "fe/idl.ypp" { idl_global->set_parse_state (IDL_GlobalData::PS_UsesDeclSeen); } -#line 8876 "fe/idl.tab.cpp" +#line 8911 "fe/idl.tab.cpp" break; - case 485: /* component_export: uses_decl $@149 ';' */ -#line 5630 "fe/idl.ypp" + case 488: /* component_export: uses_decl $@149 ';' */ +#line 5633 "fe/idl.ypp" { idl_global->set_parse_state (IDL_GlobalData::PS_NoState); (yyval.dcval) = (yyvsp[-2].dcval); } -#line 8885 "fe/idl.tab.cpp" +#line 8920 "fe/idl.tab.cpp" break; - case 486: /* $@150: %empty */ -#line 5635 "fe/idl.ypp" + case 489: /* $@150: %empty */ +#line 5638 "fe/idl.ypp" { idl_global->set_parse_state (IDL_GlobalData::PS_EmitsDeclSeen); } -#line 8893 "fe/idl.tab.cpp" +#line 8928 "fe/idl.tab.cpp" break; - case 487: /* component_export: emits_decl $@150 ';' */ -#line 5639 "fe/idl.ypp" + case 490: /* component_export: emits_decl $@150 ';' */ +#line 5642 "fe/idl.ypp" { idl_global->set_parse_state (IDL_GlobalData::PS_NoState); (yyval.dcval) = (yyvsp[-2].dcval); } -#line 8902 "fe/idl.tab.cpp" +#line 8937 "fe/idl.tab.cpp" break; - case 488: /* $@151: %empty */ -#line 5644 "fe/idl.ypp" + case 491: /* $@151: %empty */ +#line 5647 "fe/idl.ypp" { idl_global->set_parse_state (IDL_GlobalData::PS_PublishesDeclSeen); } -#line 8910 "fe/idl.tab.cpp" +#line 8945 "fe/idl.tab.cpp" break; - case 489: /* component_export: publishes_decl $@151 ';' */ -#line 5648 "fe/idl.ypp" + case 492: /* component_export: publishes_decl $@151 ';' */ +#line 5651 "fe/idl.ypp" { idl_global->set_parse_state (IDL_GlobalData::PS_NoState); (yyval.dcval) = (yyvsp[-2].dcval); } -#line 8919 "fe/idl.tab.cpp" +#line 8954 "fe/idl.tab.cpp" break; - case 490: /* $@152: %empty */ -#line 5653 "fe/idl.ypp" + case 493: /* $@152: %empty */ +#line 5656 "fe/idl.ypp" { idl_global->set_parse_state (IDL_GlobalData::PS_ConsumesDeclSeen); } -#line 8927 "fe/idl.tab.cpp" +#line 8962 "fe/idl.tab.cpp" break; - case 491: /* component_export: consumes_decl $@152 ';' */ -#line 5657 "fe/idl.ypp" + case 494: /* component_export: consumes_decl $@152 ';' */ +#line 5660 "fe/idl.ypp" { idl_global->set_parse_state (IDL_GlobalData::PS_NoState); (yyval.dcval) = (yyvsp[-2].dcval); } -#line 8936 "fe/idl.tab.cpp" +#line 8971 "fe/idl.tab.cpp" break; - case 492: /* $@153: %empty */ -#line 5662 "fe/idl.ypp" + case 495: /* $@153: %empty */ +#line 5665 "fe/idl.ypp" { idl_global->set_parse_state (IDL_GlobalData::PS_AttrDeclSeen); } -#line 8944 "fe/idl.tab.cpp" +#line 8979 "fe/idl.tab.cpp" break; - case 493: /* component_export: attribute $@153 ';' */ -#line 5666 "fe/idl.ypp" + case 496: /* component_export: attribute $@153 ';' */ +#line 5669 "fe/idl.ypp" { idl_global->set_parse_state (IDL_GlobalData::PS_NoState); (yyval.dcval) = (yyvsp[-2].dcval); } -#line 8953 "fe/idl.tab.cpp" +#line 8988 "fe/idl.tab.cpp" break; - case 494: /* $@154: %empty */ -#line 5671 "fe/idl.ypp" + case 497: /* $@154: %empty */ +#line 5674 "fe/idl.ypp" { idl_global->set_parse_state (IDL_GlobalData::PS_ExtendedPortDeclSeen); } -#line 8961 "fe/idl.tab.cpp" +#line 8996 "fe/idl.tab.cpp" break; - case 495: /* component_export: extended_port_decl $@154 ';' */ -#line 5675 "fe/idl.ypp" + case 498: /* component_export: extended_port_decl $@154 ';' */ +#line 5678 "fe/idl.ypp" { idl_global->set_parse_state (IDL_GlobalData::PS_NoState); (yyval.dcval) = (yyvsp[-2].dcval); } -#line 8970 "fe/idl.tab.cpp" +#line 9005 "fe/idl.tab.cpp" break; - case 496: /* provides_decl: IDL_PROVIDES interface_type id */ -#line 5682 "fe/idl.ypp" + case 499: /* provides_decl: IDL_PROVIDES interface_type id */ +#line 5685 "fe/idl.ypp" { UTL_Scope *s = idl_global->scopes ().top_non_null (); bool so_far_so_good = true; @@ -9048,21 +9095,21 @@ yyparse (void) (yyval.dcval) = dynamic_cast (provides); } -#line 9064 "fe/idl.tab.cpp" +#line 9099 "fe/idl.tab.cpp" break; - case 497: /* interface_type: scoped_name */ -#line 5775 "fe/idl.ypp" + case 500: /* interface_type: scoped_name */ +#line 5778 "fe/idl.ypp" { // Lookups and checking are done where the 'interface_type' // token is used, in 'provides_decl' and 'uses_decl'. (yyval.idlist) = (yyvsp[0].idlist); } -#line 9074 "fe/idl.tab.cpp" +#line 9109 "fe/idl.tab.cpp" break; - case 498: /* interface_type: IDL_OBJECT */ -#line 5781 "fe/idl.ypp" + case 501: /* interface_type: IDL_OBJECT */ +#line 5784 "fe/idl.ypp" { Identifier *corba_id = 0; @@ -9085,11 +9132,11 @@ yyparse (void) conc_name), 1); } -#line 9101 "fe/idl.tab.cpp" +#line 9136 "fe/idl.tab.cpp" break; - case 499: /* uses_decl: uses_opt_multiple interface_type id */ -#line 5806 "fe/idl.ypp" + case 502: /* uses_decl: uses_opt_multiple interface_type id */ +#line 5809 "fe/idl.ypp" { UTL_Scope *s = idl_global->scopes ().top_non_null (); bool so_far_so_good = true; @@ -9193,37 +9240,37 @@ yyparse (void) (yyval.dcval) = uses; } -#line 9209 "fe/idl.tab.cpp" +#line 9244 "fe/idl.tab.cpp" break; - case 500: /* uses_opt_multiple: IDL_USES opt_multiple */ -#line 5913 "fe/idl.ypp" + case 503: /* uses_opt_multiple: IDL_USES opt_multiple */ +#line 5916 "fe/idl.ypp" { // We use this extra rule here to use in both uses_decl and // extended_uses_decl, so the LALR(1) parser can avoid conflicts. (yyval.bval) = (yyvsp[0].bval); } -#line 9219 "fe/idl.tab.cpp" +#line 9254 "fe/idl.tab.cpp" break; - case 501: /* opt_multiple: IDL_MULTIPLE */ -#line 5922 "fe/idl.ypp" + case 504: /* opt_multiple: IDL_MULTIPLE */ +#line 5925 "fe/idl.ypp" { (yyval.bval) = true; } -#line 9227 "fe/idl.tab.cpp" +#line 9262 "fe/idl.tab.cpp" break; - case 502: /* opt_multiple: %empty */ -#line 5926 "fe/idl.ypp" + case 505: /* opt_multiple: %empty */ +#line 5929 "fe/idl.ypp" { (yyval.bval) = false; } -#line 9235 "fe/idl.tab.cpp" +#line 9270 "fe/idl.tab.cpp" break; - case 503: /* emits_decl: IDL_EMITS scoped_name id */ -#line 5933 "fe/idl.ypp" + case 506: /* emits_decl: IDL_EMITS scoped_name id */ +#line 5936 "fe/idl.ypp" { UTL_Scope *s = idl_global->scopes ().top_non_null (); bool so_far_so_good = true; @@ -9295,11 +9342,11 @@ yyparse (void) (yyval.dcval) = e; } -#line 9311 "fe/idl.tab.cpp" +#line 9346 "fe/idl.tab.cpp" break; - case 504: /* publishes_decl: IDL_PUBLISHES scoped_name id */ -#line 6008 "fe/idl.ypp" + case 507: /* publishes_decl: IDL_PUBLISHES scoped_name id */ +#line 6011 "fe/idl.ypp" { UTL_Scope *s = idl_global->scopes ().top_non_null (); bool so_far_so_good = true; @@ -9368,11 +9415,11 @@ yyparse (void) (yyval.dcval) = p; } -#line 9384 "fe/idl.tab.cpp" +#line 9419 "fe/idl.tab.cpp" break; - case 505: /* consumes_decl: IDL_CONSUMES scoped_name id */ -#line 6080 "fe/idl.ypp" + case 508: /* consumes_decl: IDL_CONSUMES scoped_name id */ +#line 6083 "fe/idl.ypp" { UTL_Scope *s = idl_global->scopes ().top_non_null (); bool so_far_so_good = true; @@ -9444,11 +9491,11 @@ yyparse (void) (yyval.dcval) = c; } -#line 9460 "fe/idl.tab.cpp" +#line 9495 "fe/idl.tab.cpp" break; - case 506: /* $@155: %empty */ -#line 6155 "fe/idl.ypp" + case 509: /* $@155: %empty */ +#line 6158 "fe/idl.ypp" { UTL_Scope *s = idl_global->scopes ().top_non_null (); AST_Home *h = 0; @@ -9485,11 +9532,11 @@ yyparse (void) */ idl_global->scopes ().push (h); } -#line 9501 "fe/idl.tab.cpp" +#line 9536 "fe/idl.tab.cpp" break; - case 507: /* home_decl: home_header $@155 home_body */ -#line 6192 "fe/idl.ypp" + case 510: /* home_decl: home_header $@155 home_body */ +#line 6195 "fe/idl.ypp" { /* * Done with this component - pop it off the scopes stack. @@ -9498,59 +9545,59 @@ yyparse (void) (yyval.dcval) = 0; } -#line 9514 "fe/idl.tab.cpp" +#line 9549 "fe/idl.tab.cpp" break; - case 508: /* $@156: %empty */ -#line 6204 "fe/idl.ypp" + case 511: /* $@156: %empty */ +#line 6207 "fe/idl.ypp" { idl_global->set_parse_state (IDL_GlobalData::PS_HomeSeen); } -#line 9522 "fe/idl.tab.cpp" +#line 9557 "fe/idl.tab.cpp" break; - case 509: /* $@157: %empty */ -#line 6208 "fe/idl.ypp" + case 512: /* $@157: %empty */ +#line 6211 "fe/idl.ypp" { idl_global->set_parse_state (IDL_GlobalData::PS_HomeIDSeen); } -#line 9530 "fe/idl.tab.cpp" +#line 9565 "fe/idl.tab.cpp" break; - case 510: /* $@158: %empty */ -#line 6212 "fe/idl.ypp" + case 513: /* $@158: %empty */ +#line 6215 "fe/idl.ypp" { idl_global->set_parse_state (IDL_GlobalData::PS_InheritSpecSeen); } -#line 9538 "fe/idl.tab.cpp" +#line 9573 "fe/idl.tab.cpp" break; - case 511: /* $@159: %empty */ -#line 6216 "fe/idl.ypp" + case 514: /* $@159: %empty */ +#line 6219 "fe/idl.ypp" { idl_global->set_parse_state (IDL_GlobalData::PS_SupportSpecSeen); } -#line 9546 "fe/idl.tab.cpp" +#line 9581 "fe/idl.tab.cpp" break; - case 512: /* $@160: %empty */ -#line 6220 "fe/idl.ypp" + case 515: /* $@160: %empty */ +#line 6223 "fe/idl.ypp" { idl_global->set_parse_state (IDL_GlobalData::PS_ManagesSeen); } -#line 9554 "fe/idl.tab.cpp" +#line 9589 "fe/idl.tab.cpp" break; - case 513: /* $@161: %empty */ -#line 6224 "fe/idl.ypp" + case 516: /* $@161: %empty */ +#line 6227 "fe/idl.ypp" { idl_global->set_parse_state (IDL_GlobalData::PS_ManagesIDSeen); } -#line 9562 "fe/idl.tab.cpp" +#line 9597 "fe/idl.tab.cpp" break; - case 514: /* home_header: IDL_HOME $@156 defining_id $@157 home_inheritance_spec $@158 supports_spec $@159 IDL_MANAGES $@160 scoped_name $@161 primary_key_spec */ -#line 6228 "fe/idl.ypp" + case 517: /* home_header: IDL_HOME $@156 defining_id $@157 home_inheritance_spec $@158 supports_spec $@159 IDL_MANAGES $@160 scoped_name $@161 primary_key_spec */ +#line 6231 "fe/idl.ypp" { idl_global->set_parse_state (IDL_GlobalData::PS_PrimaryKeySpecSeen); @@ -9596,107 +9643,107 @@ yyparse (void) (yyvsp[-6].nlval) = 0; } } -#line 9612 "fe/idl.tab.cpp" +#line 9647 "fe/idl.tab.cpp" break; - case 515: /* $@162: %empty */ -#line 6277 "fe/idl.ypp" + case 518: /* $@162: %empty */ +#line 6280 "fe/idl.ypp" { idl_global->set_parse_state (IDL_GlobalData::PS_InheritColonSeen); } -#line 9620 "fe/idl.tab.cpp" +#line 9655 "fe/idl.tab.cpp" break; - case 516: /* home_inheritance_spec: ':' $@162 scoped_name */ -#line 6281 "fe/idl.ypp" + case 519: /* home_inheritance_spec: ':' $@162 scoped_name */ +#line 6284 "fe/idl.ypp" { (yyval.idlist) = (yyvsp[0].idlist); } -#line 9628 "fe/idl.tab.cpp" +#line 9663 "fe/idl.tab.cpp" break; - case 517: /* home_inheritance_spec: %empty */ -#line 6285 "fe/idl.ypp" + case 520: /* home_inheritance_spec: %empty */ +#line 6288 "fe/idl.ypp" { (yyval.idlist) = 0; } -#line 9636 "fe/idl.tab.cpp" +#line 9671 "fe/idl.tab.cpp" break; - case 518: /* primary_key_spec: IDL_PRIMARYKEY scoped_name */ -#line 6293 "fe/idl.ypp" + case 521: /* primary_key_spec: IDL_PRIMARYKEY scoped_name */ +#line 6296 "fe/idl.ypp" { (yyval.idlist) = (yyvsp[0].idlist); } -#line 9644 "fe/idl.tab.cpp" +#line 9679 "fe/idl.tab.cpp" break; - case 519: /* primary_key_spec: %empty */ -#line 6297 "fe/idl.ypp" + case 522: /* primary_key_spec: %empty */ +#line 6300 "fe/idl.ypp" { (yyval.idlist) = 0; } -#line 9652 "fe/idl.tab.cpp" +#line 9687 "fe/idl.tab.cpp" break; - case 520: /* $@163: %empty */ -#line 6304 "fe/idl.ypp" + case 523: /* $@163: %empty */ +#line 6307 "fe/idl.ypp" { idl_global->set_parse_state (IDL_GlobalData::PS_HomeSqSeen); } -#line 9660 "fe/idl.tab.cpp" +#line 9695 "fe/idl.tab.cpp" break; - case 521: /* $@164: %empty */ -#line 6308 "fe/idl.ypp" + case 524: /* $@164: %empty */ +#line 6311 "fe/idl.ypp" { idl_global->set_parse_state (IDL_GlobalData::PS_HomeBodySeen); } -#line 9668 "fe/idl.tab.cpp" +#line 9703 "fe/idl.tab.cpp" break; - case 522: /* home_body: '{' $@163 home_exports $@164 '}' */ -#line 6312 "fe/idl.ypp" + case 525: /* home_body: '{' $@163 home_exports $@164 '}' */ +#line 6315 "fe/idl.ypp" { idl_global->set_parse_state (IDL_GlobalData::PS_HomeQsSeen); } -#line 9676 "fe/idl.tab.cpp" +#line 9711 "fe/idl.tab.cpp" break; - case 526: /* $@165: %empty */ -#line 6325 "fe/idl.ypp" + case 529: /* $@165: %empty */ +#line 6328 "fe/idl.ypp" { idl_global->set_parse_state (IDL_GlobalData::PS_FactoryDeclSeen); } -#line 9684 "fe/idl.tab.cpp" +#line 9719 "fe/idl.tab.cpp" break; - case 527: /* home_export: factory_decl $@165 ';' */ -#line 6329 "fe/idl.ypp" + case 530: /* home_export: factory_decl $@165 ';' */ +#line 6332 "fe/idl.ypp" { idl_global->set_parse_state (IDL_GlobalData::PS_NoState); } -#line 9692 "fe/idl.tab.cpp" +#line 9727 "fe/idl.tab.cpp" break; - case 528: /* $@166: %empty */ -#line 6333 "fe/idl.ypp" + case 531: /* $@166: %empty */ +#line 6336 "fe/idl.ypp" { idl_global->set_parse_state (IDL_GlobalData::PS_FinderDeclSeen); } -#line 9700 "fe/idl.tab.cpp" +#line 9735 "fe/idl.tab.cpp" break; - case 529: /* home_export: finder_decl $@166 ';' */ -#line 6337 "fe/idl.ypp" + case 532: /* home_export: finder_decl $@166 ';' */ +#line 6340 "fe/idl.ypp" { idl_global->set_parse_state (IDL_GlobalData::PS_NoState); } -#line 9708 "fe/idl.tab.cpp" +#line 9743 "fe/idl.tab.cpp" break; - case 530: /* $@167: %empty */ -#line 6345 "fe/idl.ypp" + case 533: /* $@167: %empty */ +#line 6348 "fe/idl.ypp" { UTL_Scope *s = idl_global->scopes ().top_non_null (); UTL_ScopedName n ((yyvsp[0].idval), @@ -9719,19 +9766,19 @@ yyparse (void) */ idl_global->scopes ().push (f); } -#line 9735 "fe/idl.tab.cpp" +#line 9770 "fe/idl.tab.cpp" break; - case 531: /* $@168: %empty */ -#line 6368 "fe/idl.ypp" + case 534: /* $@168: %empty */ +#line 6371 "fe/idl.ypp" { idl_global->set_parse_state (IDL_GlobalData::PS_OpParsCompleted); } -#line 9743 "fe/idl.tab.cpp" +#line 9778 "fe/idl.tab.cpp" break; - case 532: /* factory_decl: IDL_FACTORY defining_id $@167 init_parameter_list $@168 opt_raises */ -#line 6372 "fe/idl.ypp" + case 535: /* factory_decl: IDL_FACTORY defining_id $@167 init_parameter_list $@168 opt_raises */ +#line 6375 "fe/idl.ypp" { UTL_Scope *s = idl_global->scopes ().top_non_null (); idl_global->set_parse_state (IDL_GlobalData::PS_OpRaiseCompleted); @@ -9749,11 +9796,11 @@ yyparse (void) */ idl_global->scopes ().pop (); } -#line 9765 "fe/idl.tab.cpp" +#line 9800 "fe/idl.tab.cpp" break; - case 533: /* $@169: %empty */ -#line 6394 "fe/idl.ypp" + case 536: /* $@169: %empty */ +#line 6397 "fe/idl.ypp" { UTL_Scope *s = idl_global->scopes ().top_non_null (); UTL_ScopedName n ((yyvsp[0].idval), @@ -9780,19 +9827,19 @@ yyparse (void) */ idl_global->scopes ().push (f); } -#line 9796 "fe/idl.tab.cpp" +#line 9831 "fe/idl.tab.cpp" break; - case 534: /* $@170: %empty */ -#line 6421 "fe/idl.ypp" + case 537: /* $@170: %empty */ +#line 6424 "fe/idl.ypp" { idl_global->set_parse_state (IDL_GlobalData::PS_OpParsCompleted); } -#line 9804 "fe/idl.tab.cpp" +#line 9839 "fe/idl.tab.cpp" break; - case 535: /* finder_decl: IDL_FINDER defining_id $@169 init_parameter_list $@170 opt_raises */ -#line 6425 "fe/idl.ypp" + case 538: /* finder_decl: IDL_FINDER defining_id $@169 init_parameter_list $@170 opt_raises */ +#line 6428 "fe/idl.ypp" { UTL_Scope *s = idl_global->scopes ().top_non_null (); idl_global->set_parse_state (IDL_GlobalData::PS_OpRaiseCompleted); @@ -9810,11 +9857,11 @@ yyparse (void) */ idl_global->scopes ().pop (); } -#line 9826 "fe/idl.tab.cpp" +#line 9861 "fe/idl.tab.cpp" break; - case 541: /* event_concrete_forward_decl: IDL_EVENTTYPE defining_id */ -#line 6458 "fe/idl.ypp" + case 544: /* event_concrete_forward_decl: IDL_EVENTTYPE defining_id */ +#line 6461 "fe/idl.ypp" { UTL_Scope *s = idl_global->scopes ().top_non_null (); UTL_ScopedName n ((yyvsp[0].idval), @@ -9839,11 +9886,11 @@ yyparse (void) (yyval.dcval) = 0; } -#line 9855 "fe/idl.tab.cpp" +#line 9890 "fe/idl.tab.cpp" break; - case 542: /* event_abs_forward_decl: IDL_ABSTRACT IDL_EVENTTYPE defining_id */ -#line 6488 "fe/idl.ypp" + case 545: /* event_abs_forward_decl: IDL_ABSTRACT IDL_EVENTTYPE defining_id */ +#line 6491 "fe/idl.ypp" { UTL_Scope *s = idl_global->scopes ().top_non_null (); UTL_ScopedName n ((yyvsp[0].idval), @@ -9868,11 +9915,11 @@ yyparse (void) (yyval.dcval) = 0; } -#line 9884 "fe/idl.tab.cpp" +#line 9919 "fe/idl.tab.cpp" break; - case 543: /* $@171: %empty */ -#line 6517 "fe/idl.ypp" + case 546: /* $@171: %empty */ +#line 6520 "fe/idl.ypp" { UTL_Scope *s = idl_global->scopes ().top_non_null (); AST_EventType *e = 0; @@ -9916,27 +9963,27 @@ yyparse (void) delete (yyvsp[-1].idval); (yyvsp[-1].idval) = 0; } -#line 9932 "fe/idl.tab.cpp" +#line 9967 "fe/idl.tab.cpp" break; - case 544: /* $@172: %empty */ -#line 6561 "fe/idl.ypp" + case 547: /* $@172: %empty */ +#line 6564 "fe/idl.ypp" { idl_global->set_parse_state (IDL_GlobalData::PS_EventTypeSqSeen); } -#line 9940 "fe/idl.tab.cpp" +#line 9975 "fe/idl.tab.cpp" break; - case 545: /* $@173: %empty */ -#line 6565 "fe/idl.ypp" + case 548: /* $@173: %empty */ +#line 6568 "fe/idl.ypp" { idl_global->set_parse_state (IDL_GlobalData::PS_EventTypeBodySeen); } -#line 9948 "fe/idl.tab.cpp" +#line 9983 "fe/idl.tab.cpp" break; - case 546: /* event_abs_decl: event_abs_header event_rest_of_header $@171 '{' $@172 exports $@173 '}' */ -#line 6569 "fe/idl.ypp" + case 549: /* event_abs_decl: event_abs_header event_rest_of_header $@171 '{' $@172 exports $@173 '}' */ +#line 6572 "fe/idl.ypp" { idl_global->set_parse_state (IDL_GlobalData::PS_EventTypeQsSeen); @@ -9947,19 +9994,19 @@ yyparse (void) (yyval.dcval) = 0; } -#line 9963 "fe/idl.tab.cpp" +#line 9998 "fe/idl.tab.cpp" break; - case 547: /* event_abs_header: IDL_ABSTRACT IDL_EVENTTYPE defining_id */ -#line 6585 "fe/idl.ypp" + case 550: /* event_abs_header: IDL_ABSTRACT IDL_EVENTTYPE defining_id */ +#line 6588 "fe/idl.ypp" { (yyval.idval) = (yyvsp[0].idval); } -#line 9971 "fe/idl.tab.cpp" +#line 10006 "fe/idl.tab.cpp" break; - case 548: /* event_custom_header: IDL_CUSTOM IDL_EVENTTYPE defining_id */ -#line 6594 "fe/idl.ypp" + case 551: /* event_custom_header: IDL_CUSTOM IDL_EVENTTYPE defining_id */ +#line 6597 "fe/idl.ypp" { idl_global->set_parse_state (IDL_GlobalData::PS_EventTypeIDSeen); @@ -9972,29 +10019,29 @@ yyparse (void) ACE_TEXT (" custom yet\n"))); (yyval.idval) = 0; } -#line 9988 "fe/idl.tab.cpp" +#line 10023 "fe/idl.tab.cpp" break; - case 549: /* event_plain_header: IDL_EVENTTYPE defining_id */ -#line 6611 "fe/idl.ypp" + case 552: /* event_plain_header: IDL_EVENTTYPE defining_id */ +#line 6614 "fe/idl.ypp" { idl_global->set_parse_state (IDL_GlobalData::PS_EventTypeIDSeen); (yyval.idval) = (yyvsp[0].idval); } -#line 9998 "fe/idl.tab.cpp" +#line 10033 "fe/idl.tab.cpp" break; - case 550: /* $@174: %empty */ -#line 6620 "fe/idl.ypp" + case 553: /* $@174: %empty */ +#line 6623 "fe/idl.ypp" { idl_global->set_parse_state (IDL_GlobalData::PS_InheritSpecSeen); } -#line 10006 "fe/idl.tab.cpp" +#line 10041 "fe/idl.tab.cpp" break; - case 551: /* event_rest_of_header: inheritance_spec $@174 supports_spec */ -#line 6624 "fe/idl.ypp" + case 554: /* event_rest_of_header: inheritance_spec $@174 supports_spec */ +#line 6627 "fe/idl.ypp" { idl_global->set_parse_state (IDL_GlobalData::PS_SupportSpecSeen); @@ -10023,11 +10070,11 @@ yyparse (void) (yyvsp[-2].nlval) = 0; } } -#line 10039 "fe/idl.tab.cpp" +#line 10074 "fe/idl.tab.cpp" break; - case 552: /* @175: %empty */ -#line 6657 "fe/idl.ypp" + case 555: /* @175: %empty */ +#line 6660 "fe/idl.ypp" { UTL_Scope *scope = idl_global->scopes ().top_non_null (); Identifier *&event_id = (yyvsp[-1].idval); @@ -10078,27 +10125,27 @@ yyparse (void) (yyval.dcval) = eventtype; } -#line 10094 "fe/idl.tab.cpp" +#line 10129 "fe/idl.tab.cpp" break; - case 553: /* $@176: %empty */ -#line 6708 "fe/idl.ypp" + case 556: /* $@176: %empty */ +#line 6711 "fe/idl.ypp" { idl_global->set_parse_state (IDL_GlobalData::PS_EventTypeSqSeen); } -#line 10102 "fe/idl.tab.cpp" +#line 10137 "fe/idl.tab.cpp" break; - case 554: /* $@177: %empty */ -#line 6712 "fe/idl.ypp" + case 557: /* $@177: %empty */ +#line 6715 "fe/idl.ypp" { idl_global->set_parse_state (IDL_GlobalData::PS_EventTypeBodySeen); } -#line 10110 "fe/idl.tab.cpp" +#line 10145 "fe/idl.tab.cpp" break; - case 555: /* event_decl: event_header event_rest_of_header @175 '{' $@176 value_elements $@177 '}' */ -#line 6716 "fe/idl.ypp" + case 558: /* event_decl: event_header event_rest_of_header @175 '{' $@176 value_elements $@177 '}' */ +#line 6719 "fe/idl.ypp" { idl_global->set_parse_state (IDL_GlobalData::PS_EventTypeQsSeen); @@ -10109,116 +10156,116 @@ yyparse (void) (yyval.dcval) = (yyvsp[-5].dcval); } -#line 10125 "fe/idl.tab.cpp" +#line 10160 "fe/idl.tab.cpp" break; - case 556: /* event_header: event_custom_header */ -#line 6730 "fe/idl.ypp" + case 559: /* event_header: event_custom_header */ +#line 6733 "fe/idl.ypp" { (yyval.idval) = (yyvsp[0].idval); } -#line 10133 "fe/idl.tab.cpp" +#line 10168 "fe/idl.tab.cpp" break; - case 557: /* event_header: event_plain_header */ -#line 6734 "fe/idl.ypp" + case 560: /* event_header: event_plain_header */ +#line 6737 "fe/idl.ypp" { (yyval.idval) = (yyvsp[0].idval); } -#line 10141 "fe/idl.tab.cpp" +#line 10176 "fe/idl.tab.cpp" break; - case 558: /* formal_parameter_type: IDL_TYPENAME */ -#line 6741 "fe/idl.ypp" + case 561: /* formal_parameter_type: IDL_TYPENAME */ +#line 6744 "fe/idl.ypp" { (yyval.ntval) = AST_Decl::NT_type; } -#line 10149 "fe/idl.tab.cpp" +#line 10184 "fe/idl.tab.cpp" break; - case 559: /* formal_parameter_type: IDL_STRUCT */ -#line 6745 "fe/idl.ypp" + case 562: /* formal_parameter_type: IDL_STRUCT */ +#line 6748 "fe/idl.ypp" { (yyval.ntval) = AST_Decl::NT_struct; } -#line 10157 "fe/idl.tab.cpp" +#line 10192 "fe/idl.tab.cpp" break; - case 560: /* formal_parameter_type: IDL_UNION */ -#line 6749 "fe/idl.ypp" + case 563: /* formal_parameter_type: IDL_UNION */ +#line 6752 "fe/idl.ypp" { (yyval.ntval) = AST_Decl::NT_union; } -#line 10165 "fe/idl.tab.cpp" +#line 10200 "fe/idl.tab.cpp" break; - case 561: /* formal_parameter_type: IDL_EVENTTYPE */ -#line 6753 "fe/idl.ypp" + case 564: /* formal_parameter_type: IDL_EVENTTYPE */ +#line 6756 "fe/idl.ypp" { (yyval.ntval) = AST_Decl::NT_eventtype; } -#line 10173 "fe/idl.tab.cpp" +#line 10208 "fe/idl.tab.cpp" break; - case 562: /* formal_parameter_type: IDL_SEQUENCE */ -#line 6757 "fe/idl.ypp" + case 565: /* formal_parameter_type: IDL_SEQUENCE */ +#line 6760 "fe/idl.ypp" { (yyval.ntval) = AST_Decl::NT_sequence; } -#line 10181 "fe/idl.tab.cpp" +#line 10216 "fe/idl.tab.cpp" break; - case 563: /* formal_parameter_type: IDL_MAP */ -#line 6761 "fe/idl.ypp" + case 566: /* formal_parameter_type: IDL_MAP */ +#line 6764 "fe/idl.ypp" { (yyval.ntval) = AST_Decl::NT_map; } -#line 10189 "fe/idl.tab.cpp" +#line 10224 "fe/idl.tab.cpp" break; - case 564: /* formal_parameter_type: IDL_INTERFACE */ -#line 6765 "fe/idl.ypp" + case 567: /* formal_parameter_type: IDL_INTERFACE */ +#line 6768 "fe/idl.ypp" { (yyval.ntval) = AST_Decl::NT_interface; } -#line 10197 "fe/idl.tab.cpp" +#line 10232 "fe/idl.tab.cpp" break; - case 565: /* formal_parameter_type: IDL_VALUETYPE */ -#line 6769 "fe/idl.ypp" + case 568: /* formal_parameter_type: IDL_VALUETYPE */ +#line 6772 "fe/idl.ypp" { (yyval.ntval) = AST_Decl::NT_valuetype; } -#line 10205 "fe/idl.tab.cpp" +#line 10240 "fe/idl.tab.cpp" break; - case 566: /* formal_parameter_type: IDL_ENUM */ -#line 6773 "fe/idl.ypp" + case 569: /* formal_parameter_type: IDL_ENUM */ +#line 6776 "fe/idl.ypp" { (yyval.ntval) = AST_Decl::NT_enum; } -#line 10213 "fe/idl.tab.cpp" +#line 10248 "fe/idl.tab.cpp" break; - case 567: /* formal_parameter_type: IDL_EXCEPTION */ -#line 6777 "fe/idl.ypp" + case 570: /* formal_parameter_type: IDL_EXCEPTION */ +#line 6780 "fe/idl.ypp" { (yyval.ntval) = AST_Decl::NT_except; } -#line 10221 "fe/idl.tab.cpp" +#line 10256 "fe/idl.tab.cpp" break; - case 568: /* formal_parameter_type: IDL_CONST const_type */ -#line 6781 "fe/idl.ypp" + case 571: /* formal_parameter_type: IDL_CONST const_type */ +#line 6784 "fe/idl.ypp" { (yyval.ntval) = AST_Decl::NT_const; t_param_const_type = (yyvsp[0].etval); } -#line 10230 "fe/idl.tab.cpp" +#line 10265 "fe/idl.tab.cpp" break; - case 569: /* at_least_one_formal_parameter: formal_parameter formal_parameters */ -#line 6789 "fe/idl.ypp" + case 572: /* at_least_one_formal_parameter: formal_parameter formal_parameters */ +#line 6792 "fe/idl.ypp" { if ((yyvsp[0].plval) == 0) { @@ -10246,11 +10293,11 @@ yyparse (void) (yyval.plval) = (yyvsp[0].plval); } -#line 10262 "fe/idl.tab.cpp" +#line 10297 "fe/idl.tab.cpp" break; - case 570: /* formal_parameters: formal_parameters ',' formal_parameter */ -#line 6820 "fe/idl.ypp" + case 573: /* formal_parameters: formal_parameters ',' formal_parameter */ +#line 6823 "fe/idl.ypp" { if ((yyvsp[-2].plval) == 0) { @@ -10263,19 +10310,19 @@ yyparse (void) delete (yyvsp[0].pival); (yyvsp[0].pival) = 0; } -#line 10279 "fe/idl.tab.cpp" +#line 10314 "fe/idl.tab.cpp" break; - case 571: /* formal_parameters: %empty */ -#line 6833 "fe/idl.ypp" + case 574: /* formal_parameters: %empty */ +#line 6836 "fe/idl.ypp" { (yyval.plval) = 0; } -#line 10287 "fe/idl.tab.cpp" +#line 10322 "fe/idl.tab.cpp" break; - case 572: /* formal_parameter: formal_parameter_type IDENTIFIER */ -#line 6840 "fe/idl.ypp" + case 575: /* formal_parameter: formal_parameter_type IDENTIFIER */ +#line 6843 "fe/idl.ypp" { ACE_NEW_RETURN ((yyval.pival), @@ -10300,11 +10347,11 @@ yyparse (void) tao_enum_constant_decl = 0; } } -#line 10316 "fe/idl.tab.cpp" +#line 10351 "fe/idl.tab.cpp" break; - case 573: /* formal_parameter: IDL_SEQUENCE '<' IDENTIFIER '>' IDENTIFIER */ -#line 6865 "fe/idl.ypp" + case 576: /* formal_parameter: IDL_SEQUENCE '<' IDENTIFIER '>' IDENTIFIER */ +#line 6868 "fe/idl.ypp" { ACE_NEW_RETURN ((yyval.pival), FE_Utils::T_Param_Info, @@ -10319,19 +10366,19 @@ yyparse (void) ACE::strdelete ((yyvsp[0].strval)); (yyvsp[0].strval) = 0; } -#line 10335 "fe/idl.tab.cpp" +#line 10370 "fe/idl.tab.cpp" break; - case 574: /* at_least_one_formal_parameter_name: formal_parameter_name formal_parameter_names */ -#line 6883 "fe/idl.ypp" + case 577: /* at_least_one_formal_parameter_name: formal_parameter_name formal_parameter_names */ +#line 6886 "fe/idl.ypp" { ACE_NEW_RETURN ((yyval.slval), UTL_StrList ((yyvsp[-1].sval), (yyvsp[0].slval)), 1); } -#line 10343 "fe/idl.tab.cpp" +#line 10378 "fe/idl.tab.cpp" break; - case 575: /* formal_parameter_names: formal_parameter_names ',' formal_parameter_name */ -#line 6890 "fe/idl.ypp" + case 578: /* formal_parameter_names: formal_parameter_names ',' formal_parameter_name */ +#line 6893 "fe/idl.ypp" { UTL_StrList *sl = 0; ACE_NEW_RETURN (sl, UTL_StrList ((yyvsp[0].sval), 0), 1); @@ -10346,37 +10393,37 @@ yyparse (void) (yyval.slval) = (yyvsp[-2].slval); } } -#line 10362 "fe/idl.tab.cpp" +#line 10397 "fe/idl.tab.cpp" break; - case 576: /* formal_parameter_names: %empty */ -#line 6905 "fe/idl.ypp" + case 579: /* formal_parameter_names: %empty */ +#line 6908 "fe/idl.ypp" { (yyval.slval) = 0; } -#line 10370 "fe/idl.tab.cpp" +#line 10405 "fe/idl.tab.cpp" break; - case 577: /* formal_parameter_name: IDENTIFIER */ -#line 6912 "fe/idl.ypp" + case 580: /* formal_parameter_name: IDENTIFIER */ +#line 6915 "fe/idl.ypp" { ACE_NEW_RETURN ((yyval.sval), UTL_String ((yyvsp[0].strval), true), 1); } -#line 10380 "fe/idl.tab.cpp" +#line 10415 "fe/idl.tab.cpp" break; - case 578: /* $@178: %empty */ -#line 6921 "fe/idl.ypp" + case 581: /* $@178: %empty */ +#line 6924 "fe/idl.ypp" { idl_global->set_parse_state (IDL_GlobalData::PS_PorttypeSeen); } -#line 10388 "fe/idl.tab.cpp" +#line 10423 "fe/idl.tab.cpp" break; - case 579: /* @179: %empty */ -#line 6925 "fe/idl.ypp" + case 582: /* @179: %empty */ +#line 6928 "fe/idl.ypp" { char *&id_value = (yyvsp[0].strval); idl_global->set_parse_state (IDL_GlobalData::PS_PorttypeIDSeen); @@ -10395,27 +10442,27 @@ yyparse (void) // Push it on the scopes stack. idl_global->scopes ().push (porttype); } -#line 10411 "fe/idl.tab.cpp" +#line 10446 "fe/idl.tab.cpp" break; - case 580: /* $@180: %empty */ -#line 6944 "fe/idl.ypp" + case 583: /* $@180: %empty */ +#line 6947 "fe/idl.ypp" { idl_global->set_parse_state (IDL_GlobalData::PS_PorttypeSqSeen); } -#line 10419 "fe/idl.tab.cpp" +#line 10454 "fe/idl.tab.cpp" break; - case 581: /* $@181: %empty */ -#line 6952 "fe/idl.ypp" + case 584: /* $@181: %empty */ +#line 6955 "fe/idl.ypp" { idl_global->set_parse_state (IDL_GlobalData::PS_PorttypeBodySeen); } -#line 10427 "fe/idl.tab.cpp" +#line 10462 "fe/idl.tab.cpp" break; - case 582: /* porttype_decl: IDL_PORTTYPE $@178 IDENTIFIER @179 '{' $@180 at_least_one_port_export $@181 '}' */ -#line 6956 "fe/idl.ypp" + case 585: /* porttype_decl: IDL_PORTTYPE $@178 IDENTIFIER @179 '{' $@180 at_least_one_port_export $@181 '}' */ +#line 6959 "fe/idl.ypp" { idl_global->set_parse_state (IDL_GlobalData::PS_PorttypeQsSeen); @@ -10424,11 +10471,11 @@ yyparse (void) (yyval.dcval) = (yyvsp[-5].dcval); } -#line 10440 "fe/idl.tab.cpp" +#line 10475 "fe/idl.tab.cpp" break; - case 583: /* at_least_one_port_export: port_exports at_least_one_annotation port_export */ -#line 6968 "fe/idl.ypp" + case 586: /* at_least_one_port_export: port_exports at_least_one_annotation port_export */ +#line 6971 "fe/idl.ypp" { AST_Annotation_Appls *&annotations = (yyvsp[-1].annotations_val); AST_Decl *&node = (yyvsp[0].dcval); @@ -10443,27 +10490,27 @@ yyparse (void) } delete annotations; } -#line 10459 "fe/idl.tab.cpp" +#line 10494 "fe/idl.tab.cpp" break; - case 589: /* $@182: %empty */ -#line 6994 "fe/idl.ypp" + case 592: /* $@182: %empty */ +#line 6997 "fe/idl.ypp" { idl_global->set_parse_state (IDL_GlobalData::PS_AttrDeclSeen); } -#line 10467 "fe/idl.tab.cpp" +#line 10502 "fe/idl.tab.cpp" break; - case 590: /* port_export: attribute $@182 ';' */ -#line 6998 "fe/idl.ypp" + case 593: /* port_export: attribute $@182 ';' */ +#line 7001 "fe/idl.ypp" { (yyval.dcval) = (yyvsp[-2].dcval); } -#line 10475 "fe/idl.tab.cpp" +#line 10510 "fe/idl.tab.cpp" break; - case 591: /* extended_port_decl: IDL_PORT scoped_name IDENTIFIER */ -#line 7005 "fe/idl.ypp" + case 594: /* extended_port_decl: IDL_PORT scoped_name IDENTIFIER */ +#line 7008 "fe/idl.ypp" { idl_global->set_parse_state (IDL_GlobalData::PS_ExtendedPortDeclSeen); UTL_Scope *s = idl_global->scopes ().top_non_null (); @@ -10530,11 +10577,11 @@ yyparse (void) (yyval.dcval) = ep; } -#line 10546 "fe/idl.tab.cpp" +#line 10581 "fe/idl.tab.cpp" break; - case 592: /* extended_port_decl: IDL_MIRRORPORT scoped_name IDENTIFIER */ -#line 7072 "fe/idl.ypp" + case 595: /* extended_port_decl: IDL_MIRRORPORT scoped_name IDENTIFIER */ +#line 7075 "fe/idl.ypp" { idl_global->set_parse_state (IDL_GlobalData::PS_MirrorPortDeclSeen); UTL_Scope *s = idl_global->scopes ().top_non_null (); @@ -10579,11 +10626,11 @@ yyparse (void) (yyval.dcval) = mp; } -#line 10595 "fe/idl.tab.cpp" +#line 10630 "fe/idl.tab.cpp" break; - case 593: /* at_least_one_actual_parameter: annotations_maybe actual_parameter actual_parameters */ -#line 7120 "fe/idl.ypp" + case 596: /* at_least_one_actual_parameter: annotations_maybe actual_parameter actual_parameters */ +#line 7123 "fe/idl.ypp" { if ((yyvsp[0].alval) == 0) { @@ -10596,11 +10643,11 @@ yyparse (void) (yyvsp[0].alval)->enqueue_head ((yyvsp[-1].dcval)); (yyval.alval) = (yyvsp[0].alval); } -#line 10612 "fe/idl.tab.cpp" +#line 10647 "fe/idl.tab.cpp" break; - case 594: /* actual_parameters: actual_parameters ',' annotations_maybe actual_parameter */ -#line 7136 "fe/idl.ypp" + case 597: /* actual_parameters: actual_parameters ',' annotations_maybe actual_parameter */ +#line 7139 "fe/idl.ypp" { if ((yyvsp[-3].alval) == 0) { @@ -10613,19 +10660,19 @@ yyparse (void) (yyvsp[-3].alval)->enqueue_tail ((yyvsp[0].dcval)); (yyval.alval) = (yyvsp[-3].alval); } -#line 10629 "fe/idl.tab.cpp" +#line 10664 "fe/idl.tab.cpp" break; - case 595: /* actual_parameters: %empty */ -#line 7149 "fe/idl.ypp" + case 598: /* actual_parameters: %empty */ +#line 7152 "fe/idl.ypp" { (yyval.alval) = 0; } -#line 10637 "fe/idl.tab.cpp" +#line 10672 "fe/idl.tab.cpp" break; - case 596: /* actual_parameter: expression */ -#line 7156 "fe/idl.ypp" + case 599: /* actual_parameter: expression */ +#line 7159 "fe/idl.ypp" { // To avoid grammar conflicts with this LALR(1) parser, // we take advantage of the fact that an expression can @@ -10681,35 +10728,35 @@ yyparse (void) 0); } } -#line 10697 "fe/idl.tab.cpp" +#line 10732 "fe/idl.tab.cpp" break; - case 597: /* connector_decl: connector_header connector_body */ -#line 7215 "fe/idl.ypp" + case 600: /* connector_decl: connector_header connector_body */ +#line 7218 "fe/idl.ypp" { (yyval.dcval) = 0; } -#line 10705 "fe/idl.tab.cpp" +#line 10740 "fe/idl.tab.cpp" break; - case 598: /* $@183: %empty */ -#line 7222 "fe/idl.ypp" + case 601: /* $@183: %empty */ +#line 7225 "fe/idl.ypp" { idl_global->set_parse_state (IDL_GlobalData::PS_ConnectorSeen); } -#line 10713 "fe/idl.tab.cpp" +#line 10748 "fe/idl.tab.cpp" break; - case 599: /* $@184: %empty */ -#line 7226 "fe/idl.ypp" + case 602: /* $@184: %empty */ +#line 7229 "fe/idl.ypp" { idl_global->set_parse_state (IDL_GlobalData::PS_ConnectorIDSeen); } -#line 10721 "fe/idl.tab.cpp" +#line 10756 "fe/idl.tab.cpp" break; - case 600: /* connector_header: IDL_CONNECTOR $@183 annotations_maybe IDENTIFIER $@184 component_inheritance_spec */ -#line 7230 "fe/idl.ypp" + case 603: /* connector_header: IDL_CONNECTOR $@183 annotations_maybe IDENTIFIER $@184 component_inheritance_spec */ +#line 7233 "fe/idl.ypp" { UTL_Scope *s = idl_global->scopes ().top_non_null (); AST_Connector *parent = 0; @@ -10763,102 +10810,102 @@ yyparse (void) delete (yyvsp[-3].annotations_val); } -#line 10779 "fe/idl.tab.cpp" +#line 10814 "fe/idl.tab.cpp" break; - case 601: /* $@185: %empty */ -#line 7287 "fe/idl.ypp" + case 604: /* $@185: %empty */ +#line 7290 "fe/idl.ypp" { idl_global->set_parse_state (IDL_GlobalData::PS_ConnectorSqSeen); } -#line 10787 "fe/idl.tab.cpp" +#line 10822 "fe/idl.tab.cpp" break; - case 602: /* $@186: %empty */ -#line 7291 "fe/idl.ypp" + case 605: /* $@186: %empty */ +#line 7294 "fe/idl.ypp" { idl_global->set_parse_state (IDL_GlobalData::PS_ConnectorBodySeen); } -#line 10795 "fe/idl.tab.cpp" +#line 10830 "fe/idl.tab.cpp" break; - case 603: /* connector_body: '{' $@185 connector_exports $@186 '}' */ -#line 7295 "fe/idl.ypp" + case 606: /* connector_body: '{' $@185 connector_exports $@186 '}' */ +#line 7298 "fe/idl.ypp" { idl_global->set_parse_state (IDL_GlobalData::PS_ConnectorQsSeen); // Done with this connector - pop it off the scope stack. idl_global->scopes ().pop (); } -#line 10806 "fe/idl.tab.cpp" +#line 10841 "fe/idl.tab.cpp" break; - case 606: /* $@187: %empty */ -#line 7310 "fe/idl.ypp" + case 609: /* $@187: %empty */ +#line 7313 "fe/idl.ypp" { idl_global->set_parse_state (IDL_GlobalData::PS_ProvidesDeclSeen); } -#line 10814 "fe/idl.tab.cpp" +#line 10849 "fe/idl.tab.cpp" break; - case 607: /* connector_export: provides_decl $@187 ';' */ -#line 7314 "fe/idl.ypp" + case 610: /* connector_export: provides_decl $@187 ';' */ +#line 7317 "fe/idl.ypp" { idl_global->set_parse_state (IDL_GlobalData::PS_NoState); } -#line 10822 "fe/idl.tab.cpp" +#line 10857 "fe/idl.tab.cpp" break; - case 608: /* $@188: %empty */ -#line 7318 "fe/idl.ypp" + case 611: /* $@188: %empty */ +#line 7321 "fe/idl.ypp" { idl_global->set_parse_state (IDL_GlobalData::PS_UsesDeclSeen); } -#line 10830 "fe/idl.tab.cpp" +#line 10865 "fe/idl.tab.cpp" break; - case 609: /* connector_export: uses_decl $@188 ';' */ -#line 7322 "fe/idl.ypp" + case 612: /* connector_export: uses_decl $@188 ';' */ +#line 7325 "fe/idl.ypp" { idl_global->set_parse_state (IDL_GlobalData::PS_NoState); } -#line 10838 "fe/idl.tab.cpp" +#line 10873 "fe/idl.tab.cpp" break; - case 610: /* $@189: %empty */ -#line 7326 "fe/idl.ypp" + case 613: /* $@189: %empty */ +#line 7329 "fe/idl.ypp" { idl_global->set_parse_state (IDL_GlobalData::PS_AttrDeclSeen); } -#line 10846 "fe/idl.tab.cpp" +#line 10881 "fe/idl.tab.cpp" break; - case 611: /* connector_export: attribute $@189 ';' */ -#line 7330 "fe/idl.ypp" + case 614: /* connector_export: attribute $@189 ';' */ +#line 7333 "fe/idl.ypp" { idl_global->set_parse_state (IDL_GlobalData::PS_NoState); } -#line 10854 "fe/idl.tab.cpp" +#line 10889 "fe/idl.tab.cpp" break; - case 612: /* $@190: %empty */ -#line 7334 "fe/idl.ypp" + case 615: /* $@190: %empty */ +#line 7337 "fe/idl.ypp" { idl_global->set_parse_state (IDL_GlobalData::PS_ExtendedPortDeclSeen); } -#line 10862 "fe/idl.tab.cpp" +#line 10897 "fe/idl.tab.cpp" break; - case 613: /* connector_export: extended_port_decl $@190 ';' */ -#line 7338 "fe/idl.ypp" + case 616: /* connector_export: extended_port_decl $@190 ';' */ +#line 7341 "fe/idl.ypp" { idl_global->set_parse_state (IDL_GlobalData::PS_NoState); } -#line 10870 "fe/idl.tab.cpp" +#line 10905 "fe/idl.tab.cpp" break; -#line 10874 "fe/idl.tab.cpp" +#line 10909 "fe/idl.tab.cpp" default: break; } @@ -11051,7 +11098,7 @@ yyparse (void) return yyresult; } -#line 7343 "fe/idl.ypp" +#line 7346 "fe/idl.ypp" /* programs */ diff --git a/TAO/TAO_IDL/fe/idl.ypp b/TAO/TAO_IDL/fe/idl.ypp index ff2d5b6677310..72e782d8051f8 100644 --- a/TAO/TAO_IDL/fe/idl.ypp +++ b/TAO/TAO_IDL/fe/idl.ypp @@ -2365,10 +2365,8 @@ annotation_dcl : IDL_ANNOTATION_DECL defining_id '{' { if (idl_global->idl_version_ < IDL_VERSION_4) - { - idl_global->err ()->idl_version_error ( - "Annotations are an IDL4 feature"); - } + idl_global->err ()->idl_version_error ( + "Annotations are not allowed in IDL3"); Identifier *id = $2; UTL_ScopedName name (id, 0); @@ -2513,10 +2511,8 @@ annotation_appl : IDL_ANNOTATION_SYMBOL scoped_name { if (idl_global->idl_version_ < IDL_VERSION_4) - { - idl_global->err ()->idl_version_error ( - "Annotations are an IDL4 feature"); - } + idl_global->err ()->idl_version_error ( + "Annotations are not allowed in IDL3"); AST_Annotation_Decl *decl = 0; UTL_ScopedName *name = $2; @@ -2622,6 +2618,10 @@ annotation_appl_params { $$ = $1; } + | %empty + { + $$ = 0; + } ; named_annotation_appl_params @@ -3153,14 +3153,8 @@ struct_type { idl_global->set_parse_state (IDL_GlobalData::PS_StructSqSeen); } - at_least_one_member - { - idl_global->set_parse_state (IDL_GlobalData::PS_StructBodySeen); - } - '}' + struct_body { - idl_global->set_parse_state (IDL_GlobalData::PS_StructQsSeen); - /* * Done with this struct. Pop its scope off the scopes stack. */ @@ -3171,7 +3165,28 @@ struct_type } ; -at_least_one_member : member members ; +struct_body + : '}' + { + if (idl_global->idl_version_ < IDL_VERSION_4) + idl_global->err ()->idl_version_error ( + "Empty structs are not allowed in IDL3"); + + idl_global->set_parse_state (IDL_GlobalData::PS_StructQsSeen); + } + | struct_body_with_members + ; + +struct_body_with_members + : member members + { + idl_global->set_parse_state (IDL_GlobalData::PS_StructBodySeen); + } + '}' + { + idl_global->set_parse_state (IDL_GlobalData::PS_StructQsSeen); + } + ; members : members member @@ -3411,39 +3426,27 @@ union_type switch_type_spec : integer_type { - $$ = - idl_global->scopes ().bottom ()->lookup_primitive_type ( - $1 - ); + $$ = idl_global->scopes ().bottom ()->lookup_primitive_type ($1); } | char_type { - /* wchars are not allowed. */ - if ($1 == AST_Expression::EV_wchar) - { - idl_global->err ()->error0 (UTL_Error::EIDL_DISC_TYPE); - } + if ($1 == AST_Expression::EV_wchar && idl_global->idl_version_ < IDL_VERSION_4) + idl_global->err ()->idl_version_error ( + "Using wchar as a union discriminator isn't allowed in IDL3"); - $$ = - idl_global->scopes ().bottom ()->lookup_primitive_type ( - $1 - ); + $$ = idl_global->scopes ().bottom ()->lookup_primitive_type ($1); } | octet_type { - /* octets are not allowed. */ - idl_global->err ()->error0 (UTL_Error::EIDL_DISC_TYPE); - $$ = - idl_global->scopes ().bottom ()->lookup_primitive_type ( - $1 - ); + if (idl_global->idl_version_ < IDL_VERSION_4) + idl_global->err ()->idl_version_error ( + "Using octet as a union discriminator isn't allowed in IDL3"); + + $$ = idl_global->scopes ().bottom ()->lookup_primitive_type ($1); } | boolean_type { - $$ = - idl_global->scopes ().bottom ()->lookup_primitive_type ( - $1 - ); + $$ = idl_global->scopes ().bottom ()->lookup_primitive_type ($1); } | enum_type | scoped_name @@ -3895,7 +3898,7 @@ enumerator : } ; -map_type_spec +map_type_spec : map_head '>' { diff --git a/TAO/TAO_IDL/fe/idl.yy.cpp b/TAO/TAO_IDL/fe/idl.yy.cpp index 98ab312d85c80..270f388f837fe 100644 --- a/TAO/TAO_IDL/fe/idl.yy.cpp +++ b/TAO/TAO_IDL/fe/idl.yy.cpp @@ -1,6 +1,6 @@ -#line 1 "fe/idl.yy.cpp" +#line 2 "fe/idl.yy.cpp" -#line 3 "fe/idl.yy.cpp" +#line 4 "fe/idl.yy.cpp" #define YY_INT_ALIGNED short int @@ -288,7 +288,7 @@ /* C99 systems have . Non-C99 systems may or may not. */ -#if defined (__STDC_VERSION__) && __STDC_VERSION__ >= 199901L +#if defined (__STDC_VERSION__) && __STDC_VERSION__ >= 199901L || defined (__HP_aCC) /* C99 says to define __STDC_LIMIT_MACROS before including stdint.h, * if you want the limit (max/min) macros for int types. @@ -1450,9 +1450,9 @@ static AST_Decl * idl_find_node (const char *); #undef ECHO #endif -#line 1455 "fe/idl.yy.cpp" +#line 1456 "fe/idl.yy.cpp" /* SO we don't choke on files that use \r\n */ -#line 1457 "fe/idl.yy.cpp" +#line 1458 "fe/idl.yy.cpp" #define INITIAL 0 @@ -1681,7 +1681,7 @@ YY_DECL #line 123 "fe/idl.ll" -#line 1686 "fe/idl.yy.cpp" +#line 1687 "fe/idl.yy.cpp" while ( /*CONSTCOND*/1 ) /* loops until end-of-file is reached */ { @@ -2588,7 +2588,7 @@ YY_RULE_SETUP #line 492 "fe/idl.ll" ECHO; YY_BREAK -#line 2593 "fe/idl.yy.cpp" +#line 2594 "fe/idl.yy.cpp" case YY_STATE_EOF(INITIAL): yyterminate(); diff --git a/TAO/tao/idl_features.h b/TAO/tao/idl_features.h index 5c58231ee8463..0068cb9cd4fdf 100644 --- a/TAO/tao/idl_features.h +++ b/TAO/tao/idl_features.h @@ -48,6 +48,10 @@ # define TAO_IDL_HAS_ANNOTATIONS TAO_IDL_IDL_VERSION >= 0x40000 #endif +#ifndef TAO_IDL_HAS_EMPTY_ANNOTATION_PARAMS +# define TAO_IDL_HAS_EMPTY_ANNOTATION_PARAMS TAO_IDL_IDL_VERSION >= 0x40000 +#endif + #ifndef TAO_IDL_HAS_ANONYMOUS_TYPES # define TAO_IDL_HAS_ANONYMOUS_TYPES TAO_IDL_IDL_VERSION >= 0x40000 #endif @@ -57,13 +61,17 @@ #endif #ifndef TAO_IDL_HAS_OCTET_AND_WCHAR_UNION_DISCS -# define TAO_IDL_HAS_OCTET_AND_WCHAR_UNION_DISCS 0 +# define TAO_IDL_HAS_OCTET_AND_WCHAR_UNION_DISCS TAO_IDL_IDL_VERSION >= 0x40000 #endif #ifndef TAO_IDL_HAS_STRUCT_INHERITANCE # define TAO_IDL_HAS_STRUCT_INHERITANCE 0 #endif +#ifndef TAO_IDL_HAS_EMPTY_STRUCTS +# define TAO_IDL_HAS_EMPTY_STRUCTS TAO_IDL_IDL_VERSION >= 0x40000 +#endif + #ifndef TAO_IDL_HAS_MAP # define TAO_IDL_HAS_MAP TAO_IDL_IDL_VERSION >= 0x40000 #endif diff --git a/TAO/tests/IDLv4/annotations/annotation_tests.cpp b/TAO/tests/IDLv4/annotations/annotation_tests.cpp index bd874852c0e6c..66f5323f674d9 100644 --- a/TAO/tests/IDLv4/annotations/annotation_tests.cpp +++ b/TAO/tests/IDLv4/annotations/annotation_tests.cpp @@ -354,6 +354,18 @@ annotation_tests () t.assert_annotation_appl (module1, 0, test_annotation_1); } catch (Failed const &) {} + try { + Annotation_Test t ("Empty Annotation Application Before Fully Scopped Type"); + AST_Field *member = t.run ( + "typedef uint32 fully_scopped_type;\n" + "struct empty_annotation_before_fully_scopped_type {\n" + " @test_annotation_1() ::fully_scopped_type member;\n" + "};\n" + ).assert_node ("::empty_annotation_before_fully_scopped_type::member"); + t.assert_annotation_appl_count (member, 1); + t.assert_annotation_appl (member, 0, test_annotation_1); + } catch (Failed const &) {} + try { Annotation_Test t ("Struct Annotation Application"); AST_Decl *struct1 = t.run ( @@ -1097,7 +1109,7 @@ annotation_tests () } } } -} catch (Failed const &) {} + } catch (Failed const &) {} // Done, Print Overall Results Annotation_Test::results (); diff --git a/TAO/tests/IDLv4/structs/.gitignore b/TAO/tests/IDLv4/structs/.gitignore new file mode 100644 index 0000000000000..e1555c28d5ad0 --- /dev/null +++ b/TAO/tests/IDLv4/structs/.gitignore @@ -0,0 +1,5 @@ +/testC.cpp +/testC.h +/testC.inl +/testS.cpp +/testS.h diff --git a/TAO/tests/IDLv4/structs/IDLv4_structs.mpc b/TAO/tests/IDLv4/structs/IDLv4_structs.mpc new file mode 100644 index 0000000000000..e16cb11874870 --- /dev/null +++ b/TAO/tests/IDLv4/structs/IDLv4_structs.mpc @@ -0,0 +1,6 @@ +project: taoexe { + idlflags += --idl-version 4 + IDL_Files { + test.idl + } +} diff --git a/TAO/tests/IDLv4/structs/test.idl b/TAO/tests/IDLv4/structs/test.idl new file mode 100644 index 0000000000000..af8c22f546f36 --- /dev/null +++ b/TAO/tests/IDLv4/structs/test.idl @@ -0,0 +1,17 @@ +struct EmptyStruct { +}; + +struct StructWithEmptyStruct { + EmptyStruct empty; +}; + +#include __TAO_IDL_FEATURES +#if TAO_IDL_HAS_STRUCT_INHERITANCE +struct Derived1 : EmptyStruct { + int16 member1; +}; + +struct Derived2 : Derived1 { + int32 member2; +}; +#endif diff --git a/TAO/tests/IDLv4/union_disc/.gitignore b/TAO/tests/IDLv4/union_disc/.gitignore new file mode 100644 index 0000000000000..e1555c28d5ad0 --- /dev/null +++ b/TAO/tests/IDLv4/union_disc/.gitignore @@ -0,0 +1,5 @@ +/testC.cpp +/testC.h +/testC.inl +/testS.cpp +/testS.h diff --git a/TAO/tests/IDLv4/union_disc/IDLv4_union_disc.mpc b/TAO/tests/IDLv4/union_disc/IDLv4_union_disc.mpc new file mode 100644 index 0000000000000..e16cb11874870 --- /dev/null +++ b/TAO/tests/IDLv4/union_disc/IDLv4_union_disc.mpc @@ -0,0 +1,6 @@ +project: taoexe { + idlflags += --idl-version 4 + IDL_Files { + test.idl + } +} diff --git a/TAO/tests/IDLv4/union_disc/test.idl b/TAO/tests/IDLv4/union_disc/test.idl new file mode 100644 index 0000000000000..8da1d160088c3 --- /dev/null +++ b/TAO/tests/IDLv4/union_disc/test.idl @@ -0,0 +1,21 @@ +union WcharUnion switch (wchar) { +case L'i': + int32 i32; +case L'u': + uint32 u32; +default: + string str; +}; + +union OctetUnion switch (octet) { +case 1: + boolean b; +case 8: + int8 i8; +case 16: + int8 i16; +case 32: + int32 i32; +default: + string str; +};