diff --git a/TAO/NEWS b/TAO/NEWS index 32b437bc561ac..3e039b95c8a14 100644 --- a/TAO/NEWS +++ b/TAO/NEWS @@ -1,6 +1,20 @@ USER VISIBLE CHANGES BETWEEN TAO-4.0.0 and TAO-4.0.1 ==================================================== +- TAO_IDL: + - Support the following IDL v4 features (may not work everywhere in TAO): + - Empty structs + - `octet` and `wchar` union discriminators + - Allow using `typedef`s of `int8` and `uint8` as 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` + This is a proposed solution to an IDL spec issue. + - Reserve the `bitfield`, `bitmask`, and `bitset` keywords in IDL v4 + (these are not implemented yet) + - Allow using `map` as an identifier in IDL v3 again + 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..17b4bae8e66fc 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 @@ -52,9 +52,12 @@ be_visitor_structure_cdr_op_cs::visit_structure (be_structure *node) // Set the sub state as generating code for the output operator. this->ctx_->sub_state (TAO_CodeGen::TAO_CDR_OUTPUT); + const bool empty = node->nfields () == 0; + const char *const strm = empty ? "" : "strm"; + const char *const tao_aggregate = empty ? "" : "_tao_aggregate"; *os << "::CORBA::Boolean operator<< (" << be_idt << be_idt_nl - << "TAO_OutputCDR &strm," << be_nl - << "const " << node->name () << " &_tao_aggregate)" << be_uidt + << "TAO_OutputCDR &" << strm << "," << be_nl + << "const " << node->name () << " &" << tao_aggregate << ")" << be_uidt << be_uidt_nl << "{" << be_idt_nl; @@ -81,7 +84,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. @@ -92,7 +95,7 @@ be_visitor_structure_cdr_op_cs::visit_structure (be_structure *node) if (! node->is_local ()) { - *os << "strm"; + *os << strm; } *os << "," << be_nl @@ -100,7 +103,7 @@ be_visitor_structure_cdr_op_cs::visit_structure (be_structure *node) if (! node->is_local ()) { - *os << "_tao_aggregate"; + *os << tao_aggregate; } *os << ")" << be_uidt << be_uidt_nl @@ -135,7 +138,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 +160,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.ll b/TAO/TAO_IDL/fe/idl.ll index 4306c74383201..32a2d9b4467f1 100644 --- a/TAO/TAO_IDL/fe/idl.ll +++ b/TAO/TAO_IDL/fe/idl.ll @@ -112,6 +112,8 @@ static AST_Decl * idl_find_node (const char *); #undef ECHO #endif +#define IDL4_KEYWORD(TOKEN_NAME) if (idl_global->idl_version_ >= IDL_VERSION_4) return TOKEN_NAME; + %} /* SO we don't choke on files that use \r\n */ @@ -138,7 +140,6 @@ enum return IDL_ENUM; string return IDL_STRING; wstring return IDL_WSTRING; sequence return IDL_SEQUENCE; -map return IDL_MAP; union return IDL_UNION; fixed return IDL_FIXED; switch return IDL_SWITCH; @@ -158,79 +159,6 @@ native return IDL_NATIVE; local return IDL_LOCAL; abstract return IDL_ABSTRACT; -int8 { - if (idl_global->idl_version_ >= IDL_VERSION_4) - return IDL_INT8; - else - { - REJECT; - } -} -uint8 { - if (idl_global->idl_version_ >= IDL_VERSION_4) - return IDL_UINT8; - else - { - REJECT; - } -} -int16 { - if (idl_global->idl_version_ >= IDL_VERSION_4) - return IDL_INT16; - else - { - REJECT; - } -} -uint16 { - if (idl_global->idl_version_ >= IDL_VERSION_4) - return IDL_UINT16; - else - { - REJECT; - } -} -int32 { - if (idl_global->idl_version_ >= IDL_VERSION_4) - return IDL_INT32; - else - { - REJECT; - } -} -uint32 { - if (idl_global->idl_version_ >= IDL_VERSION_4) - return IDL_UINT32; - else - { - REJECT; - } -} -int64 { - if (idl_global->idl_version_ >= IDL_VERSION_4) - return IDL_INT64; - else - { - REJECT; - } -} -uint64 { - if (idl_global->idl_version_ >= IDL_VERSION_4) - return IDL_UINT64; - else - { - REJECT; - } -} -map { - if (idl_global->idl_version_ >= IDL_VERSION_4) - return IDL_MAP; - else - { - REJECT; - } -} - custom return IDL_CUSTOM; factory return IDL_FACTORY; private return IDL_PRIVATE; @@ -282,6 +210,20 @@ oneway return IDL_ONEWAY; @annotation[^A-Za-z0-9_] return IDL_ANNOTATION_DECL; // Allow annotation names that start with "annotation" @ return IDL_ANNOTATION_SYMBOL; +int8 IDL4_KEYWORD(IDL_INT8); REJECT; +uint8 IDL4_KEYWORD(IDL_UINT8); REJECT; +int16 IDL4_KEYWORD(IDL_INT16); REJECT; +uint16 IDL4_KEYWORD(IDL_UINT16); REJECT; +int32 IDL4_KEYWORD(IDL_INT32); REJECT; +uint32 IDL4_KEYWORD(IDL_UINT32); REJECT; +int64 IDL4_KEYWORD(IDL_INT64); REJECT; +uint64 IDL4_KEYWORD(IDL_UINT64); REJECT; + +bitfield IDL4_KEYWORD(IDL_BITFIELD); REJECT; +bitmask IDL4_KEYWORD(IDL_BITMASK); REJECT; +bitset IDL4_KEYWORD(IDL_BITSET); REJECT; +map IDL4_KEYWORD(IDL_MAP); REJECT; + [a-ij-rs-zA-IJ-RS-Z_][a-ij-rs-zA-IJ-RS-Z0-9_]* { // Make sure that this identifier is not a C++ keyword. If it is, // prepend it with a _cxx_. Lookup in the perfect hash table for C++ diff --git a/TAO/TAO_IDL/fe/idl.tab.cpp b/TAO/TAO_IDL/fe/idl.tab.cpp index 43432b2741c45..de355a5a88122 100644 --- a/TAO/TAO_IDL/fe/idl.tab.cpp +++ b/TAO/TAO_IDL/fe/idl.tab.cpp @@ -215,501 +215,505 @@ enum yysymbol_kind_t YYSYMBOL_IDL_SWITCH = 22, /* IDL_SWITCH */ YYSYMBOL_IDL_ENUM = 23, /* IDL_ENUM */ YYSYMBOL_IDL_SEQUENCE = 24, /* IDL_SEQUENCE */ - YYSYMBOL_IDL_MAP = 25, /* IDL_MAP */ - YYSYMBOL_IDL_STRING = 26, /* IDL_STRING */ - YYSYMBOL_IDL_WSTRING = 27, /* IDL_WSTRING */ - YYSYMBOL_IDL_EXCEPTION = 28, /* IDL_EXCEPTION */ - YYSYMBOL_IDL_CASE = 29, /* IDL_CASE */ - YYSYMBOL_IDL_DEFAULT = 30, /* IDL_DEFAULT */ - YYSYMBOL_IDL_READONLY = 31, /* IDL_READONLY */ - YYSYMBOL_IDL_ATTRIBUTE = 32, /* IDL_ATTRIBUTE */ - YYSYMBOL_IDL_ONEWAY = 33, /* IDL_ONEWAY */ - YYSYMBOL_IDL_IDEMPOTENT = 34, /* IDL_IDEMPOTENT */ - YYSYMBOL_IDL_VOID = 35, /* IDL_VOID */ - YYSYMBOL_IDL_IN = 36, /* IDL_IN */ - YYSYMBOL_IDL_OUT = 37, /* IDL_OUT */ - YYSYMBOL_IDL_INOUT = 38, /* IDL_INOUT */ - YYSYMBOL_IDL_RAISES = 39, /* IDL_RAISES */ - YYSYMBOL_IDL_CONTEXT = 40, /* IDL_CONTEXT */ - YYSYMBOL_IDL_NATIVE = 41, /* IDL_NATIVE */ - YYSYMBOL_IDL_LOCAL = 42, /* IDL_LOCAL */ - YYSYMBOL_IDL_ABSTRACT = 43, /* IDL_ABSTRACT */ - YYSYMBOL_IDL_CUSTOM = 44, /* IDL_CUSTOM */ - YYSYMBOL_IDL_FACTORY = 45, /* IDL_FACTORY */ - YYSYMBOL_IDL_PRIVATE = 46, /* IDL_PRIVATE */ - YYSYMBOL_IDL_PUBLIC = 47, /* IDL_PUBLIC */ - YYSYMBOL_IDL_SUPPORTS = 48, /* IDL_SUPPORTS */ - YYSYMBOL_IDL_TRUNCATABLE = 49, /* IDL_TRUNCATABLE */ - YYSYMBOL_IDL_VALUETYPE = 50, /* IDL_VALUETYPE */ - YYSYMBOL_IDL_COMPONENT = 51, /* IDL_COMPONENT */ - YYSYMBOL_IDL_CONSUMES = 52, /* IDL_CONSUMES */ - YYSYMBOL_IDL_EMITS = 53, /* IDL_EMITS */ - YYSYMBOL_IDL_EVENTTYPE = 54, /* IDL_EVENTTYPE */ - YYSYMBOL_IDL_FINDER = 55, /* IDL_FINDER */ - YYSYMBOL_IDL_GETRAISES = 56, /* IDL_GETRAISES */ - YYSYMBOL_IDL_HOME = 57, /* IDL_HOME */ - YYSYMBOL_IDL_IMPORT = 58, /* IDL_IMPORT */ - YYSYMBOL_IDL_MULTIPLE = 59, /* IDL_MULTIPLE */ - YYSYMBOL_IDL_PRIMARYKEY = 60, /* IDL_PRIMARYKEY */ - YYSYMBOL_IDL_PROVIDES = 61, /* IDL_PROVIDES */ - YYSYMBOL_IDL_PUBLISHES = 62, /* IDL_PUBLISHES */ - YYSYMBOL_IDL_SETRAISES = 63, /* IDL_SETRAISES */ - YYSYMBOL_IDL_TYPEID = 64, /* IDL_TYPEID */ - YYSYMBOL_IDL_TYPEPREFIX = 65, /* IDL_TYPEPREFIX */ - YYSYMBOL_IDL_USES = 66, /* IDL_USES */ - YYSYMBOL_IDL_MANAGES = 67, /* IDL_MANAGES */ - YYSYMBOL_IDL_TYPENAME = 68, /* IDL_TYPENAME */ - YYSYMBOL_IDL_PORT = 69, /* IDL_PORT */ - YYSYMBOL_IDL_MIRRORPORT = 70, /* IDL_MIRRORPORT */ - YYSYMBOL_IDL_PORTTYPE = 71, /* IDL_PORTTYPE */ - YYSYMBOL_IDL_CONNECTOR = 72, /* IDL_CONNECTOR */ - YYSYMBOL_IDL_ALIAS = 73, /* IDL_ALIAS */ - YYSYMBOL_IDL_INTEGER_LITERAL = 74, /* IDL_INTEGER_LITERAL */ - YYSYMBOL_IDL_UINTEGER_LITERAL = 75, /* IDL_UINTEGER_LITERAL */ - YYSYMBOL_IDL_STRING_LITERAL = 76, /* IDL_STRING_LITERAL */ - YYSYMBOL_IDL_CHARACTER_LITERAL = 77, /* IDL_CHARACTER_LITERAL */ - YYSYMBOL_IDL_FLOATING_PT_LITERAL = 78, /* IDL_FLOATING_PT_LITERAL */ - YYSYMBOL_IDL_FIXED_PT_LITERAL = 79, /* IDL_FIXED_PT_LITERAL */ - YYSYMBOL_IDL_TRUETOK = 80, /* IDL_TRUETOK */ - YYSYMBOL_IDL_FALSETOK = 81, /* IDL_FALSETOK */ - YYSYMBOL_IDL_INT8 = 82, /* IDL_INT8 */ - YYSYMBOL_IDL_UINT8 = 83, /* IDL_UINT8 */ - YYSYMBOL_IDL_INT16 = 84, /* IDL_INT16 */ - YYSYMBOL_IDL_UINT16 = 85, /* IDL_UINT16 */ - YYSYMBOL_IDL_INT32 = 86, /* IDL_INT32 */ - YYSYMBOL_IDL_UINT32 = 87, /* IDL_UINT32 */ - YYSYMBOL_IDL_INT64 = 88, /* IDL_INT64 */ - YYSYMBOL_IDL_UINT64 = 89, /* IDL_UINT64 */ - YYSYMBOL_IDL_SCOPE_DELIMITOR = 90, /* IDL_SCOPE_DELIMITOR */ - YYSYMBOL_IDL_LEFT_SHIFT = 91, /* IDL_LEFT_SHIFT */ - YYSYMBOL_IDL_RIGHT_SHIFT = 92, /* IDL_RIGHT_SHIFT */ - YYSYMBOL_IDL_WCHAR_LITERAL = 93, /* IDL_WCHAR_LITERAL */ - YYSYMBOL_IDL_WSTRING_LITERAL = 94, /* IDL_WSTRING_LITERAL */ - YYSYMBOL_IDL_ANNOTATION_DECL = 95, /* IDL_ANNOTATION_DECL */ - YYSYMBOL_IDL_ANNOTATION_SYMBOL = 96, /* IDL_ANNOTATION_SYMBOL */ - YYSYMBOL_97_ = 97, /* ';' */ - YYSYMBOL_98_ = 98, /* '{' */ - YYSYMBOL_99_ = 99, /* '}' */ - YYSYMBOL_100_ = 100, /* '<' */ - YYSYMBOL_101_ = 101, /* '>' */ - YYSYMBOL_102_ = 102, /* ':' */ - YYSYMBOL_103_ = 103, /* ',' */ - YYSYMBOL_104_ = 104, /* '=' */ - YYSYMBOL_105_ = 105, /* '|' */ - YYSYMBOL_106_ = 106, /* '^' */ - YYSYMBOL_107_ = 107, /* '&' */ - YYSYMBOL_108_ = 108, /* '+' */ - YYSYMBOL_109_ = 109, /* '-' */ - YYSYMBOL_110_ = 110, /* '*' */ - YYSYMBOL_111_ = 111, /* '/' */ - YYSYMBOL_112_ = 112, /* '%' */ - YYSYMBOL_113_ = 113, /* '~' */ - YYSYMBOL_114_ = 114, /* '(' */ - YYSYMBOL_115_ = 115, /* ')' */ - YYSYMBOL_116_ = 116, /* '[' */ - YYSYMBOL_117_ = 117, /* ']' */ - YYSYMBOL_YYACCEPT = 118, /* $accept */ - YYSYMBOL_start = 119, /* start */ - YYSYMBOL_definitions = 120, /* definitions */ - YYSYMBOL_at_least_one_definition = 121, /* at_least_one_definition */ - YYSYMBOL_definition = 122, /* definition */ - YYSYMBOL_fixed_definition = 123, /* fixed_definition */ - YYSYMBOL_124_1 = 124, /* $@1 */ - YYSYMBOL_125_2 = 125, /* $@2 */ - YYSYMBOL_126_3 = 126, /* $@3 */ - YYSYMBOL_127_4 = 127, /* $@4 */ - YYSYMBOL_128_5 = 128, /* $@5 */ - YYSYMBOL_129_6 = 129, /* $@6 */ - YYSYMBOL_130_7 = 130, /* $@7 */ - YYSYMBOL_131_8 = 131, /* $@8 */ - YYSYMBOL_132_9 = 132, /* $@9 */ - YYSYMBOL_133_10 = 133, /* $@10 */ - YYSYMBOL_134_11 = 134, /* $@11 */ - YYSYMBOL_135_12 = 135, /* $@12 */ - YYSYMBOL_136_13 = 136, /* $@13 */ - YYSYMBOL_137_14 = 137, /* $@14 */ - YYSYMBOL_138_15 = 138, /* $@15 */ - YYSYMBOL_module_header = 139, /* module_header */ - YYSYMBOL_140_16 = 140, /* $@16 */ - YYSYMBOL_module = 141, /* module */ - YYSYMBOL_142_17 = 142, /* @17 */ - YYSYMBOL_143_18 = 143, /* $@18 */ - YYSYMBOL_144_19 = 144, /* $@19 */ - YYSYMBOL_template_module_header = 145, /* template_module_header */ - YYSYMBOL_template_module = 146, /* template_module */ - YYSYMBOL_147_20 = 147, /* $@20 */ - YYSYMBOL_148_21 = 148, /* $@21 */ - YYSYMBOL_149_22 = 149, /* $@22 */ - YYSYMBOL_150_23 = 150, /* $@23 */ - YYSYMBOL_151_24 = 151, /* $@24 */ - YYSYMBOL_at_least_one_tpl_definition = 152, /* at_least_one_tpl_definition */ - YYSYMBOL_tpl_definitions = 153, /* tpl_definitions */ - YYSYMBOL_tpl_definition = 154, /* tpl_definition */ - YYSYMBOL_template_module_ref = 155, /* template_module_ref */ - YYSYMBOL_156_25 = 156, /* $@25 */ - YYSYMBOL_157_26 = 157, /* $@26 */ - YYSYMBOL_template_module_inst = 158, /* template_module_inst */ - YYSYMBOL_159_27 = 159, /* $@27 */ - YYSYMBOL_160_28 = 160, /* $@28 */ - YYSYMBOL_interface_def = 161, /* interface_def */ - YYSYMBOL_interface = 162, /* interface */ - YYSYMBOL_163_29 = 163, /* $@29 */ - YYSYMBOL_164_30 = 164, /* $@30 */ - YYSYMBOL_165_31 = 165, /* $@31 */ - YYSYMBOL_interface_decl = 166, /* interface_decl */ - YYSYMBOL_167_32 = 167, /* $@32 */ - YYSYMBOL_interface_header = 168, /* interface_header */ - YYSYMBOL_inheritance_spec = 169, /* inheritance_spec */ - YYSYMBOL_170_33 = 170, /* $@33 */ - YYSYMBOL_value_def = 171, /* value_def */ - YYSYMBOL_valuetype = 172, /* valuetype */ - YYSYMBOL_value_concrete_decl = 173, /* value_concrete_decl */ - YYSYMBOL_174_34 = 174, /* @34 */ - YYSYMBOL_175_35 = 175, /* $@35 */ - YYSYMBOL_176_36 = 176, /* $@36 */ - YYSYMBOL_value_abs_decl = 177, /* value_abs_decl */ - YYSYMBOL_178_37 = 178, /* $@37 */ - YYSYMBOL_179_38 = 179, /* $@38 */ - YYSYMBOL_180_39 = 180, /* $@39 */ - YYSYMBOL_value_header = 181, /* value_header */ - YYSYMBOL_182_40 = 182, /* $@40 */ - YYSYMBOL_value_decl = 183, /* value_decl */ - YYSYMBOL_184_41 = 184, /* $@41 */ - YYSYMBOL_opt_truncatable = 185, /* opt_truncatable */ - YYSYMBOL_supports_spec = 186, /* supports_spec */ - YYSYMBOL_value_forward_decl = 187, /* value_forward_decl */ - YYSYMBOL_value_box_decl = 188, /* value_box_decl */ - YYSYMBOL_value_elements = 189, /* value_elements */ - YYSYMBOL_value_element = 190, /* value_element */ - YYSYMBOL_191_42 = 191, /* @42 */ - YYSYMBOL_visibility = 192, /* visibility */ - YYSYMBOL_state_member = 193, /* state_member */ - YYSYMBOL_exports = 194, /* exports */ - YYSYMBOL_at_least_one_export = 195, /* at_least_one_export */ - YYSYMBOL_export = 196, /* export */ - YYSYMBOL_197_43 = 197, /* $@43 */ - YYSYMBOL_198_44 = 198, /* $@44 */ - YYSYMBOL_199_45 = 199, /* $@45 */ - YYSYMBOL_200_46 = 200, /* $@46 */ - YYSYMBOL_201_47 = 201, /* $@47 */ - YYSYMBOL_202_48 = 202, /* $@48 */ - YYSYMBOL_203_49 = 203, /* $@49 */ - YYSYMBOL_204_50 = 204, /* $@50 */ - YYSYMBOL_at_least_one_scoped_name = 205, /* at_least_one_scoped_name */ - YYSYMBOL_scoped_names = 206, /* scoped_names */ - YYSYMBOL_207_51 = 207, /* $@51 */ - YYSYMBOL_scoped_name = 208, /* scoped_name */ - YYSYMBOL_209_52 = 209, /* $@52 */ - YYSYMBOL_210_53 = 210, /* $@53 */ - YYSYMBOL_id = 211, /* id */ - YYSYMBOL_defining_id = 212, /* defining_id */ - YYSYMBOL_interface_forward = 213, /* interface_forward */ - YYSYMBOL_const_dcl = 214, /* const_dcl */ - YYSYMBOL_215_54 = 215, /* $@54 */ - YYSYMBOL_216_55 = 216, /* $@55 */ - YYSYMBOL_217_56 = 217, /* $@56 */ - YYSYMBOL_218_57 = 218, /* $@57 */ - YYSYMBOL_const_type = 219, /* const_type */ - YYSYMBOL_expression = 220, /* expression */ - YYSYMBOL_const_expr = 221, /* const_expr */ - YYSYMBOL_or_expr = 222, /* or_expr */ - YYSYMBOL_xor_expr = 223, /* xor_expr */ - YYSYMBOL_and_expr = 224, /* and_expr */ - YYSYMBOL_shift_expr = 225, /* shift_expr */ - YYSYMBOL_add_expr = 226, /* add_expr */ - YYSYMBOL_mult_expr = 227, /* mult_expr */ - YYSYMBOL_unary_expr = 228, /* unary_expr */ - YYSYMBOL_primary_expr = 229, /* primary_expr */ - YYSYMBOL_literal = 230, /* literal */ - YYSYMBOL_positive_int_expr = 231, /* positive_int_expr */ - YYSYMBOL_annotation_dcl = 232, /* annotation_dcl */ - YYSYMBOL_233_58 = 233, /* $@58 */ - YYSYMBOL_annotation_body = 234, /* annotation_body */ - YYSYMBOL_annotation_statement = 235, /* annotation_statement */ - YYSYMBOL_236_59 = 236, /* $@59 */ - YYSYMBOL_annotation_member_type = 237, /* annotation_member_type */ - YYSYMBOL_annotation_member = 238, /* annotation_member */ - YYSYMBOL_annotation_member_default = 239, /* annotation_member_default */ - YYSYMBOL_at_least_one_annotation = 240, /* at_least_one_annotation */ - YYSYMBOL_annotations_maybe = 241, /* annotations_maybe */ - YYSYMBOL_annotation_appl = 242, /* annotation_appl */ - YYSYMBOL_243_60 = 243, /* @60 */ - YYSYMBOL_annotation_appl_params_maybe = 244, /* annotation_appl_params_maybe */ - YYSYMBOL_annotation_appl_params = 245, /* annotation_appl_params */ - YYSYMBOL_named_annotation_appl_params = 246, /* named_annotation_appl_params */ - YYSYMBOL_more_named_annotation_appl_params = 247, /* more_named_annotation_appl_params */ - YYSYMBOL_named_annotation_appl_param = 248, /* named_annotation_appl_param */ - YYSYMBOL_type_dcl = 249, /* type_dcl */ - YYSYMBOL_250_61 = 250, /* $@61 */ - YYSYMBOL_type_declarator = 251, /* type_declarator */ - YYSYMBOL_252_62 = 252, /* $@62 */ - YYSYMBOL_type_spec = 253, /* type_spec */ - YYSYMBOL_simple_type_spec = 254, /* simple_type_spec */ - YYSYMBOL_base_type_spec = 255, /* base_type_spec */ - YYSYMBOL_template_type_spec = 256, /* template_type_spec */ - YYSYMBOL_constructed_type_spec = 257, /* constructed_type_spec */ - YYSYMBOL_constructed_forward_type_spec = 258, /* constructed_forward_type_spec */ - YYSYMBOL_at_least_one_declarator = 259, /* at_least_one_declarator */ - YYSYMBOL_declarators = 260, /* declarators */ - YYSYMBOL_261_63 = 261, /* $@63 */ - YYSYMBOL_declarator = 262, /* declarator */ - YYSYMBOL_at_least_one_simple_declarator = 263, /* at_least_one_simple_declarator */ - YYSYMBOL_simple_declarators = 264, /* simple_declarators */ - YYSYMBOL_265_64 = 265, /* $@64 */ - YYSYMBOL_simple_declarator = 266, /* simple_declarator */ - YYSYMBOL_complex_declarator = 267, /* complex_declarator */ - YYSYMBOL_integer_type = 268, /* integer_type */ - YYSYMBOL_signed_int = 269, /* signed_int */ - YYSYMBOL_unsigned_int = 270, /* unsigned_int */ - YYSYMBOL_floating_pt_type = 271, /* floating_pt_type */ - YYSYMBOL_fixed_type = 272, /* fixed_type */ - YYSYMBOL_char_type = 273, /* char_type */ - YYSYMBOL_octet_type = 274, /* octet_type */ - YYSYMBOL_boolean_type = 275, /* boolean_type */ - YYSYMBOL_any_type = 276, /* any_type */ - YYSYMBOL_object_type = 277, /* object_type */ - YYSYMBOL_struct_decl = 278, /* struct_decl */ - YYSYMBOL_279_65 = 279, /* $@65 */ - 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_IDL_STRING = 25, /* IDL_STRING */ + YYSYMBOL_IDL_WSTRING = 26, /* IDL_WSTRING */ + YYSYMBOL_IDL_EXCEPTION = 27, /* IDL_EXCEPTION */ + YYSYMBOL_IDL_CASE = 28, /* IDL_CASE */ + YYSYMBOL_IDL_DEFAULT = 29, /* IDL_DEFAULT */ + YYSYMBOL_IDL_READONLY = 30, /* IDL_READONLY */ + YYSYMBOL_IDL_ATTRIBUTE = 31, /* IDL_ATTRIBUTE */ + YYSYMBOL_IDL_ONEWAY = 32, /* IDL_ONEWAY */ + YYSYMBOL_IDL_IDEMPOTENT = 33, /* IDL_IDEMPOTENT */ + YYSYMBOL_IDL_VOID = 34, /* IDL_VOID */ + YYSYMBOL_IDL_IN = 35, /* IDL_IN */ + YYSYMBOL_IDL_OUT = 36, /* IDL_OUT */ + YYSYMBOL_IDL_INOUT = 37, /* IDL_INOUT */ + YYSYMBOL_IDL_RAISES = 38, /* IDL_RAISES */ + YYSYMBOL_IDL_CONTEXT = 39, /* IDL_CONTEXT */ + YYSYMBOL_IDL_NATIVE = 40, /* IDL_NATIVE */ + YYSYMBOL_IDL_LOCAL = 41, /* IDL_LOCAL */ + YYSYMBOL_IDL_ABSTRACT = 42, /* IDL_ABSTRACT */ + YYSYMBOL_IDL_CUSTOM = 43, /* IDL_CUSTOM */ + YYSYMBOL_IDL_FACTORY = 44, /* IDL_FACTORY */ + YYSYMBOL_IDL_PRIVATE = 45, /* IDL_PRIVATE */ + YYSYMBOL_IDL_PUBLIC = 46, /* IDL_PUBLIC */ + YYSYMBOL_IDL_SUPPORTS = 47, /* IDL_SUPPORTS */ + YYSYMBOL_IDL_TRUNCATABLE = 48, /* IDL_TRUNCATABLE */ + YYSYMBOL_IDL_VALUETYPE = 49, /* IDL_VALUETYPE */ + YYSYMBOL_IDL_COMPONENT = 50, /* IDL_COMPONENT */ + YYSYMBOL_IDL_CONSUMES = 51, /* IDL_CONSUMES */ + YYSYMBOL_IDL_EMITS = 52, /* IDL_EMITS */ + YYSYMBOL_IDL_EVENTTYPE = 53, /* IDL_EVENTTYPE */ + YYSYMBOL_IDL_FINDER = 54, /* IDL_FINDER */ + YYSYMBOL_IDL_GETRAISES = 55, /* IDL_GETRAISES */ + YYSYMBOL_IDL_HOME = 56, /* IDL_HOME */ + YYSYMBOL_IDL_IMPORT = 57, /* IDL_IMPORT */ + YYSYMBOL_IDL_MULTIPLE = 58, /* IDL_MULTIPLE */ + YYSYMBOL_IDL_PRIMARYKEY = 59, /* IDL_PRIMARYKEY */ + YYSYMBOL_IDL_PROVIDES = 60, /* IDL_PROVIDES */ + YYSYMBOL_IDL_PUBLISHES = 61, /* IDL_PUBLISHES */ + YYSYMBOL_IDL_SETRAISES = 62, /* IDL_SETRAISES */ + YYSYMBOL_IDL_TYPEID = 63, /* IDL_TYPEID */ + YYSYMBOL_IDL_TYPEPREFIX = 64, /* IDL_TYPEPREFIX */ + YYSYMBOL_IDL_USES = 65, /* IDL_USES */ + YYSYMBOL_IDL_MANAGES = 66, /* IDL_MANAGES */ + YYSYMBOL_IDL_TYPENAME = 67, /* IDL_TYPENAME */ + YYSYMBOL_IDL_PORT = 68, /* IDL_PORT */ + YYSYMBOL_IDL_MIRRORPORT = 69, /* IDL_MIRRORPORT */ + YYSYMBOL_IDL_PORTTYPE = 70, /* IDL_PORTTYPE */ + YYSYMBOL_IDL_CONNECTOR = 71, /* IDL_CONNECTOR */ + YYSYMBOL_IDL_ALIAS = 72, /* IDL_ALIAS */ + YYSYMBOL_IDL_INTEGER_LITERAL = 73, /* IDL_INTEGER_LITERAL */ + YYSYMBOL_IDL_UINTEGER_LITERAL = 74, /* IDL_UINTEGER_LITERAL */ + YYSYMBOL_IDL_STRING_LITERAL = 75, /* IDL_STRING_LITERAL */ + YYSYMBOL_IDL_CHARACTER_LITERAL = 76, /* IDL_CHARACTER_LITERAL */ + YYSYMBOL_IDL_FLOATING_PT_LITERAL = 77, /* IDL_FLOATING_PT_LITERAL */ + YYSYMBOL_IDL_FIXED_PT_LITERAL = 78, /* IDL_FIXED_PT_LITERAL */ + YYSYMBOL_IDL_TRUETOK = 79, /* IDL_TRUETOK */ + YYSYMBOL_IDL_FALSETOK = 80, /* IDL_FALSETOK */ + YYSYMBOL_IDL_INT8 = 81, /* IDL_INT8 */ + YYSYMBOL_IDL_UINT8 = 82, /* IDL_UINT8 */ + YYSYMBOL_IDL_INT16 = 83, /* IDL_INT16 */ + YYSYMBOL_IDL_UINT16 = 84, /* IDL_UINT16 */ + YYSYMBOL_IDL_INT32 = 85, /* IDL_INT32 */ + YYSYMBOL_IDL_UINT32 = 86, /* IDL_UINT32 */ + YYSYMBOL_IDL_INT64 = 87, /* IDL_INT64 */ + YYSYMBOL_IDL_UINT64 = 88, /* IDL_UINT64 */ + YYSYMBOL_IDL_SCOPE_DELIMITOR = 89, /* IDL_SCOPE_DELIMITOR */ + YYSYMBOL_IDL_LEFT_SHIFT = 90, /* IDL_LEFT_SHIFT */ + YYSYMBOL_IDL_RIGHT_SHIFT = 91, /* IDL_RIGHT_SHIFT */ + YYSYMBOL_IDL_WCHAR_LITERAL = 92, /* IDL_WCHAR_LITERAL */ + YYSYMBOL_IDL_WSTRING_LITERAL = 93, /* IDL_WSTRING_LITERAL */ + YYSYMBOL_IDL_ANNOTATION_DECL = 94, /* IDL_ANNOTATION_DECL */ + YYSYMBOL_IDL_ANNOTATION_SYMBOL = 95, /* IDL_ANNOTATION_SYMBOL */ + YYSYMBOL_IDL_BITFIELD = 96, /* IDL_BITFIELD */ + YYSYMBOL_IDL_BITMASK = 97, /* IDL_BITMASK */ + YYSYMBOL_IDL_BITSET = 98, /* IDL_BITSET */ + YYSYMBOL_IDL_MAP = 99, /* IDL_MAP */ + YYSYMBOL_100_ = 100, /* ';' */ + YYSYMBOL_101_ = 101, /* '{' */ + YYSYMBOL_102_ = 102, /* '}' */ + YYSYMBOL_103_ = 103, /* '<' */ + YYSYMBOL_104_ = 104, /* '>' */ + YYSYMBOL_105_ = 105, /* ':' */ + YYSYMBOL_106_ = 106, /* ',' */ + YYSYMBOL_107_ = 107, /* '=' */ + YYSYMBOL_108_ = 108, /* '|' */ + YYSYMBOL_109_ = 109, /* '^' */ + YYSYMBOL_110_ = 110, /* '&' */ + YYSYMBOL_111_ = 111, /* '+' */ + YYSYMBOL_112_ = 112, /* '-' */ + YYSYMBOL_113_ = 113, /* '*' */ + YYSYMBOL_114_ = 114, /* '/' */ + YYSYMBOL_115_ = 115, /* '%' */ + YYSYMBOL_116_ = 116, /* '~' */ + YYSYMBOL_117_ = 117, /* '(' */ + YYSYMBOL_118_ = 118, /* ')' */ + YYSYMBOL_119_ = 119, /* '[' */ + YYSYMBOL_120_ = 120, /* ']' */ + YYSYMBOL_YYACCEPT = 121, /* $accept */ + YYSYMBOL_start = 122, /* start */ + YYSYMBOL_definitions = 123, /* definitions */ + YYSYMBOL_at_least_one_definition = 124, /* at_least_one_definition */ + YYSYMBOL_definition = 125, /* definition */ + YYSYMBOL_fixed_definition = 126, /* fixed_definition */ + YYSYMBOL_127_1 = 127, /* $@1 */ + YYSYMBOL_128_2 = 128, /* $@2 */ + YYSYMBOL_129_3 = 129, /* $@3 */ + YYSYMBOL_130_4 = 130, /* $@4 */ + YYSYMBOL_131_5 = 131, /* $@5 */ + YYSYMBOL_132_6 = 132, /* $@6 */ + YYSYMBOL_133_7 = 133, /* $@7 */ + YYSYMBOL_134_8 = 134, /* $@8 */ + YYSYMBOL_135_9 = 135, /* $@9 */ + YYSYMBOL_136_10 = 136, /* $@10 */ + YYSYMBOL_137_11 = 137, /* $@11 */ + YYSYMBOL_138_12 = 138, /* $@12 */ + YYSYMBOL_139_13 = 139, /* $@13 */ + YYSYMBOL_140_14 = 140, /* $@14 */ + YYSYMBOL_141_15 = 141, /* $@15 */ + YYSYMBOL_module_header = 142, /* module_header */ + YYSYMBOL_143_16 = 143, /* $@16 */ + YYSYMBOL_module = 144, /* module */ + YYSYMBOL_145_17 = 145, /* @17 */ + YYSYMBOL_146_18 = 146, /* $@18 */ + YYSYMBOL_147_19 = 147, /* $@19 */ + YYSYMBOL_template_module_header = 148, /* template_module_header */ + YYSYMBOL_template_module = 149, /* template_module */ + YYSYMBOL_150_20 = 150, /* $@20 */ + YYSYMBOL_151_21 = 151, /* $@21 */ + YYSYMBOL_152_22 = 152, /* $@22 */ + YYSYMBOL_153_23 = 153, /* $@23 */ + YYSYMBOL_154_24 = 154, /* $@24 */ + YYSYMBOL_at_least_one_tpl_definition = 155, /* at_least_one_tpl_definition */ + YYSYMBOL_tpl_definitions = 156, /* tpl_definitions */ + YYSYMBOL_tpl_definition = 157, /* tpl_definition */ + YYSYMBOL_template_module_ref = 158, /* template_module_ref */ + YYSYMBOL_159_25 = 159, /* $@25 */ + YYSYMBOL_160_26 = 160, /* $@26 */ + YYSYMBOL_template_module_inst = 161, /* template_module_inst */ + YYSYMBOL_162_27 = 162, /* $@27 */ + YYSYMBOL_163_28 = 163, /* $@28 */ + YYSYMBOL_interface_def = 164, /* interface_def */ + YYSYMBOL_interface = 165, /* interface */ + YYSYMBOL_166_29 = 166, /* $@29 */ + YYSYMBOL_167_30 = 167, /* $@30 */ + YYSYMBOL_168_31 = 168, /* $@31 */ + YYSYMBOL_interface_decl = 169, /* interface_decl */ + YYSYMBOL_170_32 = 170, /* $@32 */ + YYSYMBOL_interface_header = 171, /* interface_header */ + YYSYMBOL_inheritance_spec = 172, /* inheritance_spec */ + YYSYMBOL_173_33 = 173, /* $@33 */ + YYSYMBOL_value_def = 174, /* value_def */ + YYSYMBOL_valuetype = 175, /* valuetype */ + YYSYMBOL_value_concrete_decl = 176, /* value_concrete_decl */ + YYSYMBOL_177_34 = 177, /* @34 */ + YYSYMBOL_178_35 = 178, /* $@35 */ + YYSYMBOL_179_36 = 179, /* $@36 */ + YYSYMBOL_value_abs_decl = 180, /* value_abs_decl */ + YYSYMBOL_181_37 = 181, /* $@37 */ + YYSYMBOL_182_38 = 182, /* $@38 */ + YYSYMBOL_183_39 = 183, /* $@39 */ + YYSYMBOL_value_header = 184, /* value_header */ + YYSYMBOL_185_40 = 185, /* $@40 */ + YYSYMBOL_value_decl = 186, /* value_decl */ + YYSYMBOL_187_41 = 187, /* $@41 */ + YYSYMBOL_opt_truncatable = 188, /* opt_truncatable */ + YYSYMBOL_supports_spec = 189, /* supports_spec */ + YYSYMBOL_value_forward_decl = 190, /* value_forward_decl */ + YYSYMBOL_value_box_decl = 191, /* value_box_decl */ + YYSYMBOL_value_elements = 192, /* value_elements */ + YYSYMBOL_value_element = 193, /* value_element */ + YYSYMBOL_194_42 = 194, /* @42 */ + YYSYMBOL_visibility = 195, /* visibility */ + YYSYMBOL_state_member = 196, /* state_member */ + YYSYMBOL_exports = 197, /* exports */ + YYSYMBOL_at_least_one_export = 198, /* at_least_one_export */ + YYSYMBOL_export = 199, /* export */ + YYSYMBOL_200_43 = 200, /* $@43 */ + YYSYMBOL_201_44 = 201, /* $@44 */ + YYSYMBOL_202_45 = 202, /* $@45 */ + YYSYMBOL_203_46 = 203, /* $@46 */ + YYSYMBOL_204_47 = 204, /* $@47 */ + YYSYMBOL_205_48 = 205, /* $@48 */ + YYSYMBOL_206_49 = 206, /* $@49 */ + YYSYMBOL_207_50 = 207, /* $@50 */ + YYSYMBOL_at_least_one_scoped_name = 208, /* at_least_one_scoped_name */ + YYSYMBOL_scoped_names = 209, /* scoped_names */ + YYSYMBOL_210_51 = 210, /* $@51 */ + YYSYMBOL_scoped_name = 211, /* scoped_name */ + YYSYMBOL_212_52 = 212, /* $@52 */ + YYSYMBOL_213_53 = 213, /* $@53 */ + YYSYMBOL_id = 214, /* id */ + YYSYMBOL_defining_id = 215, /* defining_id */ + YYSYMBOL_interface_forward = 216, /* interface_forward */ + YYSYMBOL_const_dcl = 217, /* const_dcl */ + YYSYMBOL_218_54 = 218, /* $@54 */ + YYSYMBOL_219_55 = 219, /* $@55 */ + YYSYMBOL_220_56 = 220, /* $@56 */ + YYSYMBOL_221_57 = 221, /* $@57 */ + YYSYMBOL_const_type = 222, /* const_type */ + YYSYMBOL_expression = 223, /* expression */ + YYSYMBOL_const_expr = 224, /* const_expr */ + YYSYMBOL_or_expr = 225, /* or_expr */ + YYSYMBOL_xor_expr = 226, /* xor_expr */ + YYSYMBOL_and_expr = 227, /* and_expr */ + YYSYMBOL_shift_expr = 228, /* shift_expr */ + YYSYMBOL_add_expr = 229, /* add_expr */ + YYSYMBOL_mult_expr = 230, /* mult_expr */ + YYSYMBOL_unary_expr = 231, /* unary_expr */ + YYSYMBOL_primary_expr = 232, /* primary_expr */ + YYSYMBOL_literal = 233, /* literal */ + YYSYMBOL_positive_int_expr = 234, /* positive_int_expr */ + YYSYMBOL_annotation_dcl = 235, /* annotation_dcl */ + YYSYMBOL_236_58 = 236, /* $@58 */ + YYSYMBOL_annotation_body = 237, /* annotation_body */ + YYSYMBOL_annotation_statement = 238, /* annotation_statement */ + YYSYMBOL_239_59 = 239, /* $@59 */ + YYSYMBOL_annotation_member_type = 240, /* annotation_member_type */ + YYSYMBOL_annotation_member = 241, /* annotation_member */ + YYSYMBOL_annotation_member_default = 242, /* annotation_member_default */ + YYSYMBOL_at_least_one_annotation = 243, /* at_least_one_annotation */ + YYSYMBOL_annotations_maybe = 244, /* annotations_maybe */ + YYSYMBOL_annotation_appl = 245, /* annotation_appl */ + YYSYMBOL_246_60 = 246, /* @60 */ + YYSYMBOL_annotation_appl_params_maybe = 247, /* annotation_appl_params_maybe */ + YYSYMBOL_annotation_appl_params = 248, /* annotation_appl_params */ + YYSYMBOL_named_annotation_appl_params = 249, /* named_annotation_appl_params */ + YYSYMBOL_more_named_annotation_appl_params = 250, /* more_named_annotation_appl_params */ + YYSYMBOL_named_annotation_appl_param = 251, /* named_annotation_appl_param */ + YYSYMBOL_type_dcl = 252, /* type_dcl */ + YYSYMBOL_253_61 = 253, /* $@61 */ + YYSYMBOL_type_declarator = 254, /* type_declarator */ + YYSYMBOL_255_62 = 255, /* $@62 */ + YYSYMBOL_type_spec = 256, /* type_spec */ + YYSYMBOL_simple_type_spec = 257, /* simple_type_spec */ + YYSYMBOL_base_type_spec = 258, /* base_type_spec */ + YYSYMBOL_template_type_spec = 259, /* template_type_spec */ + YYSYMBOL_constructed_type_spec = 260, /* constructed_type_spec */ + YYSYMBOL_constructed_forward_type_spec = 261, /* constructed_forward_type_spec */ + YYSYMBOL_at_least_one_declarator = 262, /* at_least_one_declarator */ + YYSYMBOL_declarators = 263, /* declarators */ + YYSYMBOL_264_63 = 264, /* $@63 */ + YYSYMBOL_declarator = 265, /* declarator */ + YYSYMBOL_at_least_one_simple_declarator = 266, /* at_least_one_simple_declarator */ + YYSYMBOL_simple_declarators = 267, /* simple_declarators */ + YYSYMBOL_268_64 = 268, /* $@64 */ + YYSYMBOL_simple_declarator = 269, /* simple_declarator */ + YYSYMBOL_complex_declarator = 270, /* complex_declarator */ + YYSYMBOL_integer_type = 271, /* integer_type */ + YYSYMBOL_signed_int = 272, /* signed_int */ + YYSYMBOL_unsigned_int = 273, /* unsigned_int */ + YYSYMBOL_floating_pt_type = 274, /* floating_pt_type */ + YYSYMBOL_fixed_type = 275, /* fixed_type */ + YYSYMBOL_char_type = 276, /* char_type */ + YYSYMBOL_octet_type = 277, /* octet_type */ + YYSYMBOL_boolean_type = 278, /* boolean_type */ + YYSYMBOL_any_type = 279, /* any_type */ + YYSYMBOL_object_type = 280, /* object_type */ + YYSYMBOL_struct_decl = 281, /* struct_decl */ + YYSYMBOL_282_65 = 282, /* $@65 */ + YYSYMBOL_struct_type = 283, /* struct_type */ + YYSYMBOL_284_66 = 284, /* $@66 */ + YYSYMBOL_285_67 = 285, /* $@67 */ + YYSYMBOL_struct_body = 286, /* struct_body */ + YYSYMBOL_struct_body_with_members = 287, /* struct_body_with_members */ + YYSYMBOL_288_68 = 288, /* $@68 */ + YYSYMBOL_members = 289, /* members */ + YYSYMBOL_member = 290, /* member */ + YYSYMBOL_member_i = 291, /* member_i */ + YYSYMBOL_292_69 = 292, /* $@69 */ + YYSYMBOL_293_70 = 293, /* $@70 */ + YYSYMBOL_294_71 = 294, /* $@71 */ + YYSYMBOL_union_decl = 295, /* union_decl */ + YYSYMBOL_296_72 = 296, /* $@72 */ + YYSYMBOL_union_type = 297, /* union_type */ + YYSYMBOL_298_73 = 298, /* $@73 */ + YYSYMBOL_299_74 = 299, /* $@74 */ + YYSYMBOL_300_75 = 300, /* $@75 */ + YYSYMBOL_301_76 = 301, /* $@76 */ + YYSYMBOL_302_77 = 302, /* $@77 */ + YYSYMBOL_303_78 = 303, /* $@78 */ + YYSYMBOL_switch_type_spec = 304, /* switch_type_spec */ + YYSYMBOL_at_least_one_case_branch = 305, /* at_least_one_case_branch */ + YYSYMBOL_case_branches = 306, /* case_branches */ + YYSYMBOL_case_branch = 307, /* case_branch */ + YYSYMBOL_308_79 = 308, /* $@79 */ + YYSYMBOL_309_80 = 309, /* $@80 */ + YYSYMBOL_310_81 = 310, /* $@81 */ + YYSYMBOL_at_least_one_case_label = 311, /* at_least_one_case_label */ + YYSYMBOL_case_labels = 312, /* case_labels */ + YYSYMBOL_case_label = 313, /* case_label */ + YYSYMBOL_314_82 = 314, /* $@82 */ + YYSYMBOL_315_83 = 315, /* $@83 */ + YYSYMBOL_316_84 = 316, /* $@84 */ + YYSYMBOL_element_spec = 317, /* element_spec */ + YYSYMBOL_318_85 = 318, /* $@85 */ + YYSYMBOL_struct_forward_type = 319, /* struct_forward_type */ + YYSYMBOL_union_forward_type = 320, /* union_forward_type */ + YYSYMBOL_enum_type = 321, /* enum_type */ + YYSYMBOL_322_86 = 322, /* $@86 */ + YYSYMBOL_323_87 = 323, /* $@87 */ + YYSYMBOL_324_88 = 324, /* $@88 */ + YYSYMBOL_325_89 = 325, /* $@89 */ + YYSYMBOL_at_least_one_enumerator = 326, /* at_least_one_enumerator */ + YYSYMBOL_enumerators = 327, /* enumerators */ + YYSYMBOL_328_90 = 328, /* $@90 */ + YYSYMBOL_enumerator = 329, /* enumerator */ + YYSYMBOL_map_type_spec = 330, /* map_type_spec */ + YYSYMBOL_map_head = 331, /* map_head */ + YYSYMBOL_332_91 = 332, /* $@91 */ + YYSYMBOL_333_92 = 333, /* $@92 */ + YYSYMBOL_sequence_type_spec = 334, /* sequence_type_spec */ + YYSYMBOL_335_93 = 335, /* $@93 */ + YYSYMBOL_336_94 = 336, /* $@94 */ + YYSYMBOL_seq_head = 337, /* seq_head */ + YYSYMBOL_338_95 = 338, /* $@95 */ + YYSYMBOL_339_96 = 339, /* $@96 */ + YYSYMBOL_fixed_type_spec = 340, /* fixed_type_spec */ + YYSYMBOL_string_type_spec = 341, /* string_type_spec */ + YYSYMBOL_342_97 = 342, /* $@97 */ + YYSYMBOL_343_98 = 343, /* $@98 */ + YYSYMBOL_string_head = 344, /* string_head */ + YYSYMBOL_wstring_type_spec = 345, /* wstring_type_spec */ + YYSYMBOL_346_99 = 346, /* $@99 */ + YYSYMBOL_347_100 = 347, /* $@100 */ + YYSYMBOL_wstring_head = 348, /* wstring_head */ + YYSYMBOL_array_declarator = 349, /* array_declarator */ + YYSYMBOL_350_101 = 350, /* $@101 */ + YYSYMBOL_at_least_one_array_dim = 351, /* at_least_one_array_dim */ + YYSYMBOL_array_dims = 352, /* array_dims */ + YYSYMBOL_array_dim = 353, /* array_dim */ + YYSYMBOL_354_102 = 354, /* $@102 */ + YYSYMBOL_355_103 = 355, /* $@103 */ + YYSYMBOL_attribute = 356, /* attribute */ + YYSYMBOL_attribute_readonly = 357, /* attribute_readonly */ + YYSYMBOL_358_104 = 358, /* $@104 */ + YYSYMBOL_359_105 = 359, /* $@105 */ + YYSYMBOL_360_106 = 360, /* $@106 */ + YYSYMBOL_361_107 = 361, /* $@107 */ + YYSYMBOL_attribute_readwrite = 362, /* attribute_readwrite */ + YYSYMBOL_363_108 = 363, /* $@108 */ + YYSYMBOL_364_109 = 364, /* $@109 */ + YYSYMBOL_365_110 = 365, /* $@110 */ + YYSYMBOL_366_111 = 366, /* $@111 */ + YYSYMBOL_exception = 367, /* exception */ + YYSYMBOL_368_112 = 368, /* $@112 */ + YYSYMBOL_369_113 = 369, /* @113 */ + YYSYMBOL_370_114 = 370, /* $@114 */ + YYSYMBOL_371_115 = 371, /* $@115 */ + YYSYMBOL_operation = 372, /* operation */ + YYSYMBOL_373_116 = 373, /* $@116 */ + YYSYMBOL_374_117 = 374, /* $@117 */ + YYSYMBOL_375_118 = 375, /* $@118 */ + YYSYMBOL_376_119 = 376, /* $@119 */ + YYSYMBOL_opt_op_attribute = 377, /* opt_op_attribute */ + YYSYMBOL_op_type_spec = 378, /* op_type_spec */ + YYSYMBOL_init_decl = 379, /* init_decl */ + YYSYMBOL_380_120 = 380, /* $@120 */ + YYSYMBOL_381_121 = 381, /* @121 */ + YYSYMBOL_382_122 = 382, /* $@122 */ + YYSYMBOL_init_parameter_list = 383, /* init_parameter_list */ + YYSYMBOL_384_123 = 384, /* $@123 */ + YYSYMBOL_385_124 = 385, /* $@124 */ + YYSYMBOL_at_least_one_in_parameter = 386, /* at_least_one_in_parameter */ + YYSYMBOL_in_parameters = 387, /* in_parameters */ + YYSYMBOL_388_125 = 388, /* $@125 */ + YYSYMBOL_in_parameter = 389, /* in_parameter */ + YYSYMBOL_390_126 = 390, /* $@126 */ + YYSYMBOL_391_127 = 391, /* $@127 */ + YYSYMBOL_parameter_list = 392, /* parameter_list */ + YYSYMBOL_393_128 = 393, /* $@128 */ + YYSYMBOL_394_129 = 394, /* $@129 */ + YYSYMBOL_at_least_one_parameter = 395, /* at_least_one_parameter */ + YYSYMBOL_parameters = 396, /* parameters */ + YYSYMBOL_397_130 = 397, /* $@130 */ + YYSYMBOL_parameter = 398, /* parameter */ + YYSYMBOL_399_131 = 399, /* $@131 */ + YYSYMBOL_400_132 = 400, /* $@132 */ + YYSYMBOL_param_type_spec = 401, /* param_type_spec */ + YYSYMBOL_direction = 402, /* direction */ + YYSYMBOL_opt_raises = 403, /* opt_raises */ + YYSYMBOL_404_133 = 404, /* $@133 */ + YYSYMBOL_405_134 = 405, /* $@134 */ + YYSYMBOL_opt_getraises = 406, /* opt_getraises */ + YYSYMBOL_407_135 = 407, /* $@135 */ + YYSYMBOL_408_136 = 408, /* $@136 */ + YYSYMBOL_opt_setraises = 409, /* opt_setraises */ + YYSYMBOL_410_137 = 410, /* $@137 */ + YYSYMBOL_411_138 = 411, /* $@138 */ + YYSYMBOL_opt_context = 412, /* opt_context */ + YYSYMBOL_413_139 = 413, /* $@139 */ + YYSYMBOL_414_140 = 414, /* $@140 */ + YYSYMBOL_at_least_one_string_literal = 415, /* at_least_one_string_literal */ + YYSYMBOL_string_literals = 416, /* string_literals */ + YYSYMBOL_417_141 = 417, /* $@141 */ + YYSYMBOL_typeid_dcl = 418, /* typeid_dcl */ + YYSYMBOL_typeprefix_dcl = 419, /* typeprefix_dcl */ + YYSYMBOL_component = 420, /* component */ + YYSYMBOL_component_forward_decl = 421, /* component_forward_decl */ + YYSYMBOL_component_decl = 422, /* component_decl */ + YYSYMBOL_423_142 = 423, /* @142 */ + YYSYMBOL_424_143 = 424, /* $@143 */ + YYSYMBOL_425_144 = 425, /* $@144 */ + YYSYMBOL_component_header = 426, /* component_header */ + YYSYMBOL_427_145 = 427, /* $@145 */ + YYSYMBOL_428_146 = 428, /* $@146 */ + YYSYMBOL_component_inheritance_spec = 429, /* component_inheritance_spec */ + YYSYMBOL_430_147 = 430, /* $@147 */ + YYSYMBOL_component_exports = 431, /* component_exports */ + YYSYMBOL_component_export = 432, /* component_export */ + YYSYMBOL_433_148 = 433, /* $@148 */ + YYSYMBOL_434_149 = 434, /* $@149 */ + YYSYMBOL_435_150 = 435, /* $@150 */ + YYSYMBOL_436_151 = 436, /* $@151 */ + YYSYMBOL_437_152 = 437, /* $@152 */ + YYSYMBOL_438_153 = 438, /* $@153 */ + YYSYMBOL_439_154 = 439, /* $@154 */ + YYSYMBOL_provides_decl = 440, /* provides_decl */ + YYSYMBOL_interface_type = 441, /* interface_type */ + YYSYMBOL_uses_decl = 442, /* uses_decl */ + YYSYMBOL_uses_opt_multiple = 443, /* uses_opt_multiple */ + YYSYMBOL_opt_multiple = 444, /* opt_multiple */ + YYSYMBOL_emits_decl = 445, /* emits_decl */ + YYSYMBOL_publishes_decl = 446, /* publishes_decl */ + YYSYMBOL_consumes_decl = 447, /* consumes_decl */ + YYSYMBOL_home_decl = 448, /* home_decl */ + YYSYMBOL_449_155 = 449, /* $@155 */ + YYSYMBOL_home_header = 450, /* home_header */ + YYSYMBOL_451_156 = 451, /* $@156 */ + YYSYMBOL_452_157 = 452, /* $@157 */ + YYSYMBOL_453_158 = 453, /* $@158 */ + YYSYMBOL_454_159 = 454, /* $@159 */ + YYSYMBOL_455_160 = 455, /* $@160 */ + YYSYMBOL_456_161 = 456, /* $@161 */ + YYSYMBOL_home_inheritance_spec = 457, /* home_inheritance_spec */ + YYSYMBOL_458_162 = 458, /* $@162 */ + YYSYMBOL_primary_key_spec = 459, /* primary_key_spec */ + YYSYMBOL_home_body = 460, /* home_body */ + YYSYMBOL_461_163 = 461, /* $@163 */ + YYSYMBOL_462_164 = 462, /* $@164 */ + YYSYMBOL_home_exports = 463, /* home_exports */ + YYSYMBOL_home_export = 464, /* home_export */ + YYSYMBOL_465_165 = 465, /* $@165 */ + YYSYMBOL_466_166 = 466, /* $@166 */ + YYSYMBOL_factory_decl = 467, /* factory_decl */ + YYSYMBOL_468_167 = 468, /* $@167 */ + YYSYMBOL_469_168 = 469, /* $@168 */ + YYSYMBOL_finder_decl = 470, /* finder_decl */ + YYSYMBOL_471_169 = 471, /* $@169 */ + YYSYMBOL_472_170 = 472, /* $@170 */ + YYSYMBOL_event = 473, /* event */ + YYSYMBOL_event_forward_decl = 474, /* event_forward_decl */ + YYSYMBOL_event_concrete_forward_decl = 475, /* event_concrete_forward_decl */ + YYSYMBOL_event_abs_forward_decl = 476, /* event_abs_forward_decl */ + YYSYMBOL_event_abs_decl = 477, /* event_abs_decl */ + YYSYMBOL_478_171 = 478, /* $@171 */ + YYSYMBOL_479_172 = 479, /* $@172 */ + YYSYMBOL_480_173 = 480, /* $@173 */ + YYSYMBOL_event_abs_header = 481, /* event_abs_header */ + YYSYMBOL_event_custom_header = 482, /* event_custom_header */ + YYSYMBOL_event_plain_header = 483, /* event_plain_header */ + YYSYMBOL_event_rest_of_header = 484, /* event_rest_of_header */ + YYSYMBOL_485_174 = 485, /* $@174 */ + YYSYMBOL_event_decl = 486, /* event_decl */ + YYSYMBOL_487_175 = 487, /* @175 */ + YYSYMBOL_488_176 = 488, /* $@176 */ + YYSYMBOL_489_177 = 489, /* $@177 */ + YYSYMBOL_event_header = 490, /* event_header */ + YYSYMBOL_formal_parameter_type = 491, /* formal_parameter_type */ + YYSYMBOL_at_least_one_formal_parameter = 492, /* at_least_one_formal_parameter */ + YYSYMBOL_formal_parameters = 493, /* formal_parameters */ + YYSYMBOL_formal_parameter = 494, /* formal_parameter */ + YYSYMBOL_at_least_one_formal_parameter_name = 495, /* at_least_one_formal_parameter_name */ + YYSYMBOL_formal_parameter_names = 496, /* formal_parameter_names */ + YYSYMBOL_formal_parameter_name = 497, /* formal_parameter_name */ + YYSYMBOL_porttype_decl = 498, /* porttype_decl */ + YYSYMBOL_499_178 = 499, /* $@178 */ + YYSYMBOL_500_179 = 500, /* @179 */ + YYSYMBOL_501_180 = 501, /* $@180 */ + YYSYMBOL_502_181 = 502, /* $@181 */ + YYSYMBOL_at_least_one_port_export = 503, /* at_least_one_port_export */ + YYSYMBOL_port_exports = 504, /* port_exports */ + YYSYMBOL_port_export = 505, /* port_export */ + YYSYMBOL_506_182 = 506, /* $@182 */ + YYSYMBOL_extended_port_decl = 507, /* extended_port_decl */ + YYSYMBOL_at_least_one_actual_parameter = 508, /* at_least_one_actual_parameter */ + YYSYMBOL_actual_parameters = 509, /* actual_parameters */ + YYSYMBOL_actual_parameter = 510, /* actual_parameter */ + YYSYMBOL_connector_decl = 511, /* connector_decl */ + YYSYMBOL_connector_header = 512, /* connector_header */ + YYSYMBOL_513_183 = 513, /* $@183 */ + YYSYMBOL_514_184 = 514, /* $@184 */ + YYSYMBOL_connector_body = 515, /* connector_body */ + YYSYMBOL_516_185 = 516, /* $@185 */ + YYSYMBOL_517_186 = 517, /* $@186 */ + YYSYMBOL_connector_exports = 518, /* connector_exports */ + YYSYMBOL_connector_export = 519, /* connector_export */ + YYSYMBOL_520_187 = 520, /* $@187 */ + YYSYMBOL_521_188 = 521, /* $@188 */ + YYSYMBOL_522_189 = 522, /* $@189 */ + YYSYMBOL_523_190 = 523 /* $@190 */ }; typedef enum yysymbol_kind_t yysymbol_kind_t; @@ -753,6 +757,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,19 +1041,19 @@ union yyalloc /* YYFINAL -- State number of the termination state. */ #define YYFINAL 4 /* YYLAST -- Last index in YYTABLE. */ -#define YYLAST 2130 +#define YYLAST 2110 /* YYNTOKENS -- Number of terminals. */ -#define YYNTOKENS 118 +#define YYNTOKENS 121 /* 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 +#define YYMAXUTOK 354 /* YYTRANSLATE(TOKEN-NUM) -- Symbol number corresponding to TOKEN-NUM @@ -1054,16 +1070,16 @@ static const yytype_int8 yytranslate[] = 0, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, - 2, 2, 2, 2, 2, 2, 2, 112, 107, 2, - 114, 115, 110, 108, 103, 109, 2, 111, 2, 2, - 2, 2, 2, 2, 2, 2, 2, 2, 102, 97, - 100, 104, 101, 2, 2, 2, 2, 2, 2, 2, + 2, 2, 2, 2, 2, 2, 2, 115, 110, 2, + 117, 118, 113, 111, 106, 112, 2, 114, 2, 2, + 2, 2, 2, 2, 2, 2, 2, 2, 105, 100, + 103, 107, 104, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, - 2, 116, 2, 117, 106, 2, 2, 2, 2, 2, + 2, 119, 2, 120, 109, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, - 2, 2, 2, 98, 105, 99, 113, 2, 2, 2, + 2, 2, 2, 101, 108, 102, 116, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, @@ -1086,75 +1102,75 @@ static const yytype_int8 yytranslate[] = 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, 78, 79, 80, 81, 82, 83, 84, 85, 86, 87, 88, 89, 90, 91, 92, 93, 94, - 95, 96 + 95, 96, 97, 98, 99 }; #if YYDEBUG /* YYRLINE[YYN] -- Source line where rule number YYN was defined. */ static const yytype_int16 yyrline[] = { - 0, 419, 419, 422, 423, 431, 446, 450, 451, 452, - 457, 456, 465, 464, 473, 472, 481, 480, 489, 488, - 497, 496, 505, 504, 513, 512, 521, 520, 529, 528, - 537, 536, 545, 544, 553, 552, 561, 560, 569, 568, - 582, 581, 593, 632, 636, 592, 652, 660, 674, 684, - 714, 718, 659, 743, 747, 748, 752, 753, 758, 763, - 757, 849, 854, 848, 925, 926, 931, 969, 973, 930, - 990, 989, 1001, 1038, 1068, 1101, 1100, 1109, 1116, 1117, - 1118, 1119, 1123, 1128, 1133, 1180, 1184, 1132, 1213, 1256, - 1260, 1211, 1279, 1277, 1317, 1316, 1328, 1332, 1339, 1344, - 1351, 1376, 1404, 1470, 1489, 1493, 1497, 1498, 1510, 1509, - 1527, 1531, 1538, 1559, 1560, 1564, 1579, 1584, 1583, 1592, - 1591, 1600, 1599, 1608, 1607, 1616, 1615, 1624, 1623, 1632, - 1631, 1640, 1639, 1652, 1664, 1662, 1687, 1694, 1704, 1703, - 1729, 1727, 1752, 1762, 1773, 1817, 1844, 1876, 1880, 1884, - 1888, 1875, 1950, 1951, 1952, 1953, 1954, 1955, 1956, 1960, - 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 + 0, 423, 423, 426, 427, 435, 450, 454, 455, 456, + 461, 460, 469, 468, 477, 476, 485, 484, 493, 492, + 501, 500, 509, 508, 517, 516, 525, 524, 533, 532, + 541, 540, 549, 548, 557, 556, 565, 564, 573, 572, + 586, 585, 597, 636, 640, 596, 656, 664, 678, 688, + 718, 722, 663, 747, 751, 752, 756, 757, 762, 767, + 761, 853, 858, 852, 929, 930, 935, 973, 977, 934, + 994, 993, 1005, 1042, 1072, 1105, 1104, 1113, 1120, 1121, + 1122, 1123, 1127, 1132, 1137, 1184, 1188, 1136, 1217, 1260, + 1264, 1215, 1283, 1281, 1321, 1320, 1332, 1336, 1343, 1348, + 1355, 1380, 1408, 1474, 1493, 1497, 1501, 1502, 1514, 1513, + 1531, 1535, 1542, 1563, 1564, 1568, 1583, 1588, 1587, 1596, + 1595, 1604, 1603, 1612, 1611, 1620, 1619, 1628, 1627, 1636, + 1635, 1644, 1643, 1656, 1668, 1666, 1691, 1698, 1708, 1707, + 1733, 1731, 1756, 1766, 1777, 1821, 1848, 1880, 1884, 1888, + 1892, 1879, 1954, 1955, 1956, 1957, 1958, 1959, 1960, 1964, + 1968, 2036, 2038, 2040, 2041, 2053, 2054, 2066, 2067, 2079, + 2080, 2089, 2101, 2102, 2111, 2123, 2124, 2133, 2142, 2154, + 2155, 2164, 2173, 2185, 2242, 2243, 2250, 2254, 2259, 2266, + 2273, 2277, 2282, 2286, 2290, 2294, 2301, 2370, 2369, 2396, + 2397, 2401, 2402, 2403, 2405, 2404, 2413, 2414, 2418, 2474, + 2478, 2485, 2498, 2508, 2516, 2515, 2601, 2605, 2612, 2621, + 2625, 2632, 2640, 2646, 2653, 2666, 2665, 2674, 2678, 2682, + 2686, 2714, 2722, 2721, 2792, 2793, 2797, 2804, 2805, 2831, + 2832, 2833, 2834, 2835, 2836, 2837, 2838, 2842, 2843, 2844, + 2845, 2846, 2850, 2851, 2852, 2856, 2857, 2861, 2873, 2871, + 2896, 2903, 2904, 2908, 2920, 2918, 2943, 2950, 2966, 2984, + 2985, 2989, 2993, 2997, 3001, 3005, 3009, 3013, 3020, 3024, + 3028, 3032, 3036, 3040, 3044, 3051, 3055, 3059, 3066, 3073, + 3077, 3084, 3091, 3098, 3105, 3113, 3112, 3126, 3157, 3125, + 3173, 3181, 3186, 3185, 3196, 3197, 3201, 3219, 3223, 3218, + 3281, 3280, 3293, 3292, 3305, 3309, 3342, 3346, 3405, 3409, + 3304, 3431, 3435, 3443, 3451, 3455, 3456, 3565, 3568, 3569, + 3574, 3578, 3573, 3614, 3613, 3625, 3635, 3653, 3661, 3660, + 3674, 3678, 3673, 3694, 3693, 3743, 3768, 3792, 3796, 3827, + 3831, 3791, 3855, 3860, 3858, 3864, 3868, 3906, 3970, 3980, + 3969, 4005, 4009, 4003, 4093, 4160, 4169, 4159, 4183, 4193, + 4197, 4191, 4239, 4265, 4274, 4278, 4272, 4320, 4346, 4354, + 4353, 4396, 4406, 4424, 4432, 4436, 4431, 4496, 4497, 4502, + 4506, 4510, 4514, 4501, 4573, 4577, 4581, 4585, 4572, 4653, + 4657, 4689, 4693, 4652, 4710, 4714, 4775, 4779, 4709, 4816, + 4821, 4826, 4833, 4834, 4845, 4850, 4893, 4844, 4915, 4914, + 4923, 4922, 4933, 4938, 4936, 4942, 4947, 4951, 4946, 4990, + 4989, 4998, 4997, 5008, 5013, 5011, 5017, 5022, 5026, 5021, + 5071, 5078, 5079, 5080, 5235, 5239, 5243, 5251, 5255, 5250, + 5264, 5272, 5276, 5271, 5285, 5293, 5297, 5292, 5306, 5314, + 5318, 5313, 5327, 5334, 5346, 5344, 5367, 5374, 5404, 5443, + 5444, 5448, 5479, 5521, 5525, 5478, 5544, 5548, 5542, 5589, + 5588, 5596, 5603, 5618, 5619, 5624, 5623, 5633, 5632, 5642, + 5641, 5651, 5650, 5660, 5659, 5669, 5668, 5678, 5677, 5688, + 5781, 5787, 5812, 5919, 5928, 5932, 5939, 6014, 6086, 6162, + 6161, 6211, 6215, 6219, 6223, 6227, 6231, 6210, 6284, 6283, + 6291, 6298, 6303, 6311, 6315, 6310, 6325, 6326, 6330, 6332, + 6331, 6340, 6339, 6352, 6375, 6350, 6401, 6428, 6399, 6452, + 6453, 6454, 6458, 6459, 6463, 6492, 6524, 6568, 6572, 6522, + 6589, 6598, 6616, 6627, 6626, 6664, 6715, 6719, 6662, 6736, + 6740, 6747, 6751, 6755, 6759, 6763, 6767, 6771, 6775, 6779, + 6783, 6787, 6795, 6826, 6839, 6846, 6871, 6889, 6896, 6911, + 6918, 6928, 6932, 6951, 6959, 6927, 6974, 6989, 6993, 6994, + 6998, 6999, 7001, 7000, 7011, 7078, 7126, 7142, 7155, 7162, + 7221, 7229, 7233, 7228, 7294, 7298, 7293, 7311, 7312, 7317, + 7316, 7325, 7324, 7333, 7332, 7341, 7340 }; #endif @@ -1175,8 +1191,8 @@ static const char *const yytname[] = "IDL_SHORT", "IDL_UNSIGNED", "IDL_DOUBLE", "IDL_FLOAT", "IDL_CHAR", "IDL_WCHAR", "IDL_OCTET", "IDL_BOOLEAN", "IDL_FIXED", "IDL_ANY", "IDL_OBJECT", "IDL_STRUCT", "IDL_UNION", "IDL_SWITCH", "IDL_ENUM", - "IDL_SEQUENCE", "IDL_MAP", "IDL_STRING", "IDL_WSTRING", "IDL_EXCEPTION", - "IDL_CASE", "IDL_DEFAULT", "IDL_READONLY", "IDL_ATTRIBUTE", "IDL_ONEWAY", + "IDL_SEQUENCE", "IDL_STRING", "IDL_WSTRING", "IDL_EXCEPTION", "IDL_CASE", + "IDL_DEFAULT", "IDL_READONLY", "IDL_ATTRIBUTE", "IDL_ONEWAY", "IDL_IDEMPOTENT", "IDL_VOID", "IDL_IN", "IDL_OUT", "IDL_INOUT", "IDL_RAISES", "IDL_CONTEXT", "IDL_NATIVE", "IDL_LOCAL", "IDL_ABSTRACT", "IDL_CUSTOM", "IDL_FACTORY", "IDL_PRIVATE", "IDL_PUBLIC", "IDL_SUPPORTS", @@ -1192,9 +1208,10 @@ static const char *const yytname[] = "IDL_INT32", "IDL_UINT32", "IDL_INT64", "IDL_UINT64", "IDL_SCOPE_DELIMITOR", "IDL_LEFT_SHIFT", "IDL_RIGHT_SHIFT", "IDL_WCHAR_LITERAL", "IDL_WSTRING_LITERAL", "IDL_ANNOTATION_DECL", - "IDL_ANNOTATION_SYMBOL", "';'", "'{'", "'}'", "'<'", "'>'", "':'", "','", - "'='", "'|'", "'^'", "'&'", "'+'", "'-'", "'*'", "'/'", "'%'", "'~'", - "'('", "')'", "'['", "']'", "$accept", "start", "definitions", + "IDL_ANNOTATION_SYMBOL", "IDL_BITFIELD", "IDL_BITMASK", "IDL_BITSET", + "IDL_MAP", "';'", "'{'", "'}'", "'<'", "'>'", "':'", "','", "'='", "'|'", + "'^'", "'&'", "'+'", "'-'", "'*'", "'/'", "'%'", "'~'", "'('", "')'", + "'['", "']'", "$accept", "start", "definitions", "at_least_one_definition", "definition", "fixed_definition", "$@1", "$@2", "$@3", "$@4", "$@5", "$@6", "$@7", "$@8", "$@9", "$@10", "$@11", "$@12", "$@13", "$@14", "$@15", "module_header", "$@16", "module", "@17", @@ -1230,9 +1247,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 +1305,12 @@ yysymbol_name (yysymbol_kind_t yysymbol) } #endif -#define YYPACT_NINF (-679) +#define YYPACT_NINF (-655) #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 +1319,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 + -655, 96, 1478, -655, -655, -655, -655, -655, -655, -655, + -655, -655, -655, -655, 99, 113, 68, 89, -655, 99, + 99, -655, 47, 47, -655, -655, 99, -655, -655, 21, + -655, 1531, 31, 50, -655, -655, 3, -655, -655, -655, + -655, -655, -655, 548, -655, -655, -655, -655, -655, 1671, + 53, -655, -655, 75, -655, 100, -655, -655, -655, -655, + -655, -655, -655, -655, -655, -655, -655, -655, -655, -655, + -655, -655, -655, -655, 73, -655, -655, -655, 73, -655, + -655, 93, 119, 2021, 47, 99, 1426, 99, 99, 99, + 99, -655, -655, -655, 6, 99, 25, -655, 27, 99, + -655, 73, 99, 126, 129, 99, -655, -655, 12, -655, + 29, 229, -655, 137, -655, 140, 144, 1539, -655, -655, + -655, 153, 199, -655, 156, 158, 170, 101, -655, 147, + -655, -655, -655, -655, -655, -655, 169, -655, -655, -655, + -655, -655, -655, -655, -655, -655, -655, -655, -655, -655, + -655, -655, 187, -655, -655, -655, -655, -655, -655, -655, + -655, -655, -655, -655, -655, -655, -655, -655, -655, -655, + 100, -655, -655, -655, 175, -655, 81, -655, -655, 177, + -655, 180, 184, 185, -655, 47, 192, 194, 188, -655, + 197, 198, 200, 201, 202, 210, 213, 211, -655, -655, + -655, 218, 221, -655, -655, -655, -655, 187, -655, -655, + -655, -655, -655, -655, -655, -655, -655, 187, -655, -655, + -655, -655, -655, -655, -655, -655, 222, -655, 224, -655, + -655, 186, -655, 287, -655, -655, -655, -655, 40, -655, + -655, -655, 2021, -655, -655, -655, -655, 196, -655, -655, + -655, -655, -655, 289, -655, -655, 138, 219, -655, -655, + -655, -655, -655, -655, -655, -655, 294, -655, 91, 223, + 225, 284, -655, -655, -655, -655, -655, -655, -655, 187, + -655, -655, 230, -655, -655, -655, -655, -655, -655, -655, + -655, -655, 284, 237, 238, -655, -655, -655, 99, 99, + 248, 249, -655, -655, -655, 246, -655, 287, 251, -655, + -655, -655, -655, -655, 350, -655, 253, 252, -655, -655, + -655, -655, -655, -655, -655, -655, -655, -655, 189, 189, + 189, 91, 187, -655, -655, 247, 250, 255, 71, 70, + 39, -655, -655, -655, -655, -655, 47, -655, -655, -655, + -655, 256, -655, -655, 47, -655, 91, 91, 91, 254, + 259, -655, -655, -655, -655, -655, -655, 277, -655, -14, + -655, -655, -655, -655, -655, -655, -655, -655, 47, 284, + -655, -655, -655, -655, 186, 1293, 1570, 265, 266, -655, + 1539, -655, -655, -655, 257, 91, 91, 91, 91, 91, + 91, 91, 91, 91, 91, 263, 99, -655, 187, 1128, + -655, 840, 91, -655, 506, -655, -655, -655, -655, 91, + -655, -655, 726, -655, -655, -655, -655, 191, 1032, -655, + -655, -655, -655, 54, 314, 47, 47, -655, -655, -655, + -655, -655, 54, -655, 271, -655, 267, -655, 273, -655, + -655, 1163, 187, -655, 47, 284, -655, -655, -655, -655, + 280, -655, -655, 99, -655, -655, 283, 275, 383, 286, + -655, -655, 250, 255, 71, 70, 70, 39, 39, -655, + -655, -655, -655, -655, 282, -655, -655, -655, 291, -655, + -655, 1901, -655, -655, -655, -655, 1934, -655, -655, -655, + -655, -655, 292, -655, 1388, -655, -655, 1812, -655, 285, + 506, -655, 297, 301, 303, 288, -655, 298, -655, 306, + -655, -655, -655, 296, 1723, 47, 47, 47, 244, -655, + 313, -655, -655, -655, -655, -655, -655, -655, 99, 99, + -655, 315, -655, -655, -655, 1259, 936, 387, 1988, -655, + 187, 287, -655, -655, 48, 56, 319, 321, 324, 287, + 325, -655, -655, -9, -655, 44, -655, -655, 327, 328, + 187, -655, 329, 69, 1426, -655, 398, -655, -655, -655, + -655, 138, -655, 333, -655, 334, -655, 339, 342, 343, + 344, -655, 187, -655, -655, -655, -655, -655, 345, 346, + 444, -655, -655, -655, 348, -655, -655, 351, -655, -655, + -655, 91, -655, 287, -655, 349, 99, 352, -655, 442, + 187, -655, -655, -655, -655, -655, -655, 57, 57, 57, + -655, 356, -655, 360, 361, 362, 365, 368, 369, -655, + -655, -655, 370, 371, 374, 375, -655, -655, -655, -655, + -655, -655, -655, -655, -655, -655, 91, -655, -655, -655, + 99, -655, 377, 378, 379, -655, 386, 384, 69, -655, + 389, 390, -655, 391, 91, 392, 1646, -655, 47, -655, + -655, -655, -655, -655, -655, 484, -655, -655, -655, -655, + -655, -655, 288, 306, -655, -655, -655, 376, -655, -655, + -655, -655, -655, -655, -655, -655, -655, -655, 380, 380, + -655, -655, -655, -655, 1988, 99, -655, 91, 381, -655, + -655, -655, -655, -655, -655, -655, 393, -655, -655, -655, + -655, -655, 47, -655, -655, -655, -655, 395, 187, -655, + 380, 506, -655, 396, -655, 463, -655, -655, -655, -655, + -655, -655, -655, -655, 47, -655, 187, 397, 618, -655, + 394, -655, -655, -655, 400, 388, 475, 474, 474, 99, + 458, 421, 415, -655, 187, 436, -655, -655, 422, -655, + 474, -655, -655, -655, 423, -655, -655, -655, -655, -655, + -655, -655, -655, -655, 485, 540, 427, 123, 474, -655, + 62, 1988, -655, 440, 430, 474, 431, 487, 99, 47, + -655, -655, 446, -655, -655, -655, -655, -655, 435, -655, + -655, -655, -655, -655, -655, -655, -655, -655, -655, -655, + -655, -655, -655, -655, -655, -655, -655, 187, -655, 448, + -655, 449, 1988, 536, 476, 91, 472, 477, 55, -655, + 172, 99, 475, 47, 47, 461, 99, 540, -655, -655, + -655, -655, -655, -655, -655, -655, -655, 1407, -655, -655, + -655, 462, 464, -655, -655, -655, 123, 99, 466, 479, + -655, -655, -655, -655, 47, -655, -655, -655, -655, 99, + 481, 467, 511, -655, -655, -655, -655, 478, 492, -655, + -655, 524, -655 }; /* YYDEFACT[STATE-NUM] -- Default reduction number in state STATE-NUM. @@ -1400,143 +1417,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, + 373, 378, 274, 281, 275, 282, 276, 283, 277, 284, + 358, 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, 570, 568, + 564, 561, 566, 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 + -655, -655, 290, 299, 551, -618, -655, -655, -655, -655, + -655, -655, -655, -655, -655, -655, -655, -655, -655, -655, + -655, -611, -655, -655, -655, -655, -655, -655, -655, -655, + -655, -655, -655, -655, -655, -655, -155, -655, -655, -655, + -655, -655, -655, -655, -655, -655, -655, -655, 190, -655, + -655, 19, -655, -655, -655, 587, -655, -655, -655, -655, + -655, -655, -655, 590, -655, 193, -655, -655, -251, -655, + -655, 178, 102, -655, -655, -655, -309, -655, -358, -655, + -655, -655, -655, -655, -655, -655, -655, -346, -655, -655, + -22, -655, -655, -191, -10, -655, 17, -655, -655, -655, + -655, -190, -46, -233, -655, 220, 217, 231, -162, -161, + -206, -105, -655, -320, -655, -655, -655, -655, -655, -655, + -655, -655, 24, -83, 564, -655, -655, -655, -655, -77, + 4, 18, -655, 46, -655, -31, -387, -466, -655, -655, + -655, 2, -655, -655, -616, -148, -655, -655, -7, -655, + -69, -655, -655, -52, -51, -66, -65, -49, 241, -655, + -40, -655, -38, -655, -655, -655, -655, -655, 204, 295, + 136, -655, -655, -655, -37, -655, -32, -655, -655, -655, + -655, -655, -655, -655, -655, -655, -221, -655, -655, -655, + -655, -655, -208, -655, -655, -655, -655, -655, -655, -655, + -41, -655, -655, -655, -655, -655, -655, -655, -110, -655, + -655, -655, -655, -655, -655, -655, -655, -655, -655, -655, + -70, -655, -655, -655, -68, -655, -655, -655, -655, -655, + -655, -655, -67, -655, -655, -339, -655, -655, -655, -655, + -655, -655, -655, -655, -655, -655, 20, -655, -655, -655, + -655, -655, -655, -655, -655, -655, -655, -655, -655, -655, + -655, -655, -633, -655, -655, -655, -655, -655, -203, -655, + -655, -655, -655, -655, -655, -655, -655, -226, -655, -655, + -515, -655, -654, -655, -655, -655, -655, -655, -655, -655, + -655, -655, -655, -655, -655, -655, -655, 22, 23, -655, + -655, -655, -655, -655, -655, -655, -655, -655, 268, -655, + -655, 134, -655, -655, -655, -655, -655, -655, -655, -328, + 215, -327, -655, -655, -655, -655, -655, -655, -655, -655, + -655, -655, -655, -655, -655, -655, -655, -655, -655, -655, + -655, -655, -655, -655, -655, -655, -655, -655, -655, -655, + -655, -655, -655, -655, -655, -655, -655, -655, -655, -655, + -655, -655, -655, 585, -655, -655, -655, -655, -655, -655, + -655, -655, -655, 274, -655, -655, -192, -655, -655, -655, + -655, -655, -655, -655, -2, -655, 302, -655, -655, 92, + -655, -655, -655, -655, -655, -655, -655, -655, -655, -655, + -655, -655, -655 }; /* YYDEFGOTO[NTERM-NUM]. */ @@ -1544,45 +1561,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,602 +1607,598 @@ 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, 309, 719, 172, 168, 661, 169, 170, + 106, 649, 313, 506, 171, 123, 822, 106, 733, 650, + 106, 207, 217, 822, 152, 734, 47, 51, 451, 60, + 540, 61, 62, 549, 8, 218, 747, 221, 222, 223, + 224, -379, 593, 823, 824, 226, 185, 234, 529, 229, + 823, 824, 230, 198, 106, 232, 4, 198, 394, 431, + 432, 235, 91, -144, 236, -379, -145, 761, 122, 264, + 657, 122, 265, 225, 788, 227, 382, 18, 235, 8, + 545, 95, 189, 606, 114, -146, 799, -100, 453, 433, + 122, 119, 122, 586, 434, 185, 107, 235, 18, 185, + 733, 106, 99, 107, 821, 235, 235, 734, 185, 506, + 120, 832, 402, 403, 404, 266, 267, -327, 815, 816, + 817, 398, 399, 279, 318, 319, 320, 321, 322, 323, + 324, 325, 215, 209, 216, -345, 212, 213, 122, 509, + 107, 400, 401, 326, 327, 273, 516, 274, 506, 529, + 210, 211, 106, 214, 203, 461, 479, 480, 481, 748, + 823, 824, 328, 329, 571, 94, 96, 330, 331, 98, + 101, 318, 319, 320, 321, 322, 323, 324, 325, 205, + 207, 431, 432, 391, 392, 393, -471, 107, 515, -544, + 326, 327, 237, 185, 669, 869, 475, 476, 239, 477, + 478, 240, 525, 526, 241, 670, 671, 259, 593, 328, + 329, 433, 527, 258, 330, 331, 434, 261, 262, 435, + 436, 886, 318, 319, 320, 321, 322, 323, 324, 325, + 414, 263, 268, 893, 431, 432, 235, 422, 107, 272, + 275, 326, 327, 276, 277, 278, 829, -212, 368, 281, + 106, 303, 315, -474, 280, 525, 526, 283, 284, 314, + 285, 286, 349, 287, 433, 527, 331, 431, 432, 434, + 288, 291, 435, 436, 289, 215, 209, 216, 295, 212, + 213, 296, -545, 345, 408, 302, 352, 859, 353, 669, + 510, 354, 408, 210, 211, 593, 214, 433, 365, 366, + 670, 671, 434, 524, 466, 435, 436, 361, 334, 375, + 376, 380, 383, 388, 762, 395, 452, 389, 390, 396, + 648, 421, 412, 207, 563, 397, 565, -44, 654, 482, + 468, 419, 552, 561, 562, 471, 593, 578, 691, 564, + 575, 172, 168, 577, 169, 170, 579, 580, 582, 605, + 171, 521, 152, 584, 601, 611, 483, 751, -302, 581, + 152, 608, 460, 47, 51, 609, 60, 610, 61, 62, + 49, 550, 613, 554, 555, 632, 612, 641, 646, 651, + 550, 652, 692, 334, 653, 655, 594, 674, 595, -402, + 665, -584, 570, 679, 680, 507, 698, 699, 700, 681, + 422, 730, 682, 683, 684, 686, 687, 688, 689, 694, + 264, 528, 723, 576, 696, 621, 701, 690, 622, 623, + 702, 703, 704, 172, 168, 705, 169, 170, 706, 707, + 710, 711, 171, 521, 592, 624, 712, 713, 594, 720, + 595, 722, 152, 626, 721, 422, 724, 739, 152, 727, + 728, 729, 731, 755, 744, 759, 763, 745, -420, 776, + 657, 781, 620, 627, 628, 629, 782, 871, 872, 106, + 783, 778, 786, 790, 127, 128, 129, 130, 131, 132, + 133, 134, 135, 136, 137, 138, 592, 792, 639, 640, + 139, 140, 141, 172, 168, 793, 169, 170, 891, 795, + -429, 802, 171, 811, 809, 814, 830, 831, 833, 834, + 838, 106, 152, 840, 857, 858, 127, 128, 129, 130, + 131, 132, 133, 134, 135, 136, 137, 138, 10, 11, + 507, 12, 139, 140, 141, 860, 862, 864, 873, 865, + 882, 894, 883, 887, 888, 895, 896, 142, 143, 144, + 145, 146, 147, 148, 149, 107, 899, 668, 900, 902, + 184, 185, 386, 777, 100, 150, 97, 741, 546, 603, + 716, 387, 863, 473, 186, 472, 742, 693, 695, 5, + 673, 789, 6, 7, 8, 9, 465, 866, 474, 142, + 143, 144, 145, 146, 147, 148, 149, 107, 10, 11, + 602, 12, 868, 773, 594, 13, 595, 150, -101, 870, + 885, 752, 457, 122, 568, 425, 738, 559, 14, 15, + 16, 17, 630, 200, 470, 875, 725, 18, 19, 443, + 565, 20, 0, 677, 21, 0, 0, 0, 0, 0, + 0, 22, 23, 0, 0, 0, 0, 0, 24, 25, + 732, 0, 592, 47, 51, 0, 60, 0, 61, 62, + 0, 0, 0, 0, 0, 92, 0, 0, 750, 0, + 756, 0, 26, 0, 0, 0, 0, 0, 0, 152, + -53, 0, 0, 0, 0, 0, 0, 520, 0, 106, + 0, 594, 774, 595, 127, 128, 129, 130, 131, 132, + 133, 134, 135, 136, 137, 138, 10, 11, 0, 12, + 139, 140, 141, 0, 0, 0, 0, 0, 0, 92, + 0, 0, 750, 0, 0, 0, 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, 142, 143, 144, + 145, 146, 147, 148, 149, 107, 0, 0, 0, 0, + 592, 185, 0, 0, 0, 150, 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, -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, 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, -411, -411, -411, -411, -411, -411, -411, -411, -411, + 0, 0, 0, 0, 0, -213, 0, 485, 0, -411, + 6, 0, -86, 9, -411, -411, -411, -411, -411, -411, + -411, -411, -411, -411, -411, -411, 10, 11, 0, 12, + 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, 0, 0, 0, 0, + 0, -213, 0, 485, 0, -411, 6, 0, -557, 9, + -411, -411, -411, -411, -411, -411, -411, -411, -411, -411, + -411, -411, 10, 11, 0, 12, 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, -411, -411, -411, -411, -411, -411, -411, + -411, -411, 0, 0, 0, 0, 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, -411, -411, 13, 0, 0, 431, 432, + 486, 487, -411, 0, 485, 0, -411, 6, 14, 0, + 9, -411, -411, -411, -411, -411, -411, -411, -411, -411, + -411, -411, -411, 10, 11, 0, 12, 0, -411, -411, + 13, 22, 23, 431, 432, 486, 487, -411, 0, 0, + 0, 0, 0, 14, 0, 0, 0, 0, 0, -411, + -411, -411, -411, -411, -411, -411, -411, -411, 0, 0, + 0, 0, 0, -213, 0, 0, 22, 23, 0, 0, + -68, 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, 0, -213, 0, + 485, 0, -411, 6, 0, -90, 9, -411, -411, -411, + -411, -411, -411, -411, -411, -411, -411, -411, -411, 10, + 11, 0, 12, 0, -411, -411, 13, 0, 0, 431, + 432, 486, 487, -411, 0, 0, 106, 6, 0, 14, + 458, 127, 128, 129, 130, 131, 132, 133, 134, 135, + 206, 137, 0, 0, 0, 0, 12, 0, 140, 141, 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, 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, + -411, -411, -411, -411, -411, -411, -411, -411, -411, 0, + 0, 0, 0, 0, -213, 0, 0, 0, 0, 0, + 0, -548, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 142, 143, 144, 145, 146, 147, + 148, 149, 107, 0, 0, 0, 0, 0, 0, 520, + 0, 106, 0, 0, 0, 459, 127, 128, 129, 130, + 131, 132, 133, 134, 135, 136, 137, 138, 10, 11, + 106, 12, 139, 140, 141, 127, 128, 129, 130, 131, + 132, 133, 134, 135, 136, 137, 138, 10, 11, 106, + 12, 139, 140, 141, 127, 128, 129, 130, 131, 132, + 133, 134, 135, 136, 137, 138, 10, 11, 0, 12, + 139, 140, 141, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 142, + 143, 144, 145, 146, 147, 148, 149, 107, -2, 5, + 0, 0, 6, 7, 8, 9, 0, 150, 142, 143, + 144, 145, 146, 147, 148, 149, 107, 0, 10, 11, + 0, 12, 185, 0, 0, 13, 150, 142, 143, 144, + 145, 146, 147, 148, 149, 107, 0, 0, 14, 15, + 16, 17, 0, 0, 0, 150, 0, 18, 19, 0, + 0, 20, 0, 0, 21, -47, 0, -47, 0, 0, + 0, 22, 23, 242, 0, 243, 0, 0, 24, 25, + 0, -47, -47, 0, -47, -47, 0, 0, -47, 244, + 245, 0, 246, 247, 0, 0, 248, 0, 0, 0, + 0, 5, 26, -213, 6, 7, 8, 9, 0, 0, + -47, 0, 0, 0, -47, 0, 0, 0, 249, 0, + 10, 11, 250, 12, 0, 0, 0, 13, -47, 0, + 0, 0, 0, 0, 0, 0, 251, 0, 0, 0, + 14, 15, 16, 17, 0, 0, 0, 0, 0, 18, + 19, 0, 0, 20, 0, 0, 21, 0, 0, 0, + -47, 0, 0, 22, 23, 0, 0, 0, 252, 0, + 24, 25, 0, 0, 0, 0, 0, 5, 0, 0, + 6, 7, 8, 9, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 26, -213, 10, 11, 0, 12, + 0, 0, 5, 13, 0, 6, 7, 8, 9, 0, + 0, 0, 0, 0, 0, 0, 14, 15, 16, 17, + 0, 10, 11, 0, 12, 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, 106, 21, 0, 0, + 0, 619, 128, 129, 22, 23, 132, 133, 134, 135, + 26, 24, 25, 0, 0, 0, 12, 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, 0, 26, 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, -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, 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, 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, 142, 143, 144, 145, 146, 147, + 148, 149, 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, -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, 0, 0, 22, 23, 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, -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, - 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, 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, 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, + 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, -411, -411, 13, 0, + 0, 431, 432, 486, 487, -411, 0, 106, 0, 0, + 0, 14, 127, 128, 129, 130, 131, 132, 133, 134, + 135, 206, 137, 138, 0, 0, 0, 0, 0, 140, + 141, 0, 0, 0, 22, 23, 0, 0, 591, 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, - 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, - 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, -411, -411, -411, -411, -411, -411, -411, -411, + -411, 106, 0, 0, 0, 0, 127, 128, 129, 130, + 131, 132, 133, 134, 135, 206, 137, 138, 0, 0, + 0, 0, 0, 140, 141, 142, 143, 144, 145, 146, + 147, 148, 149, 107, 106, 0, 0, 0, 0, 127, + 128, 129, 130, 131, 132, 133, 134, 135, 206, 0, + 0, 0, 0, 0, 0, 0, 140, 141, 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, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 142, + 143, 144, 145, 146, 147, 148, 149, 107, 0, 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, 142, 143, 144, 145, 146, 147, 148, 149, + 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, - 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, - -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, + 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, 36, 1, 3, 676, 3, + 3, 83, 84, 1, 86, 676, 49, 49, 377, 49, + 428, 49, 49, 19, 6, 85, 709, 87, 88, 89, + 90, 95, 548, 28, 29, 95, 95, 75, 427, 99, + 28, 29, 102, 74, 3, 105, 0, 78, 331, 30, + 31, 89, 3, 100, 75, 119, 100, 740, 105, 8, + 119, 105, 11, 94, 768, 96, 307, 49, 89, 6, + 429, 53, 22, 510, 103, 100, 780, 100, 379, 60, + 105, 100, 105, 491, 65, 95, 89, 89, 49, 95, + 758, 3, 53, 89, 798, 89, 89, 758, 95, 507, + 100, 805, 113, 114, 115, 8, 9, 102, 35, 36, + 37, 90, 91, 185, 73, 74, 75, 76, 77, 78, + 79, 80, 242, 242, 242, 100, 242, 242, 105, 412, + 89, 111, 112, 92, 93, 104, 419, 106, 546, 528, + 242, 242, 3, 242, 101, 385, 402, 403, 404, 714, + 28, 29, 111, 112, 455, 15, 16, 116, 117, 16, + 17, 73, 74, 75, 76, 77, 78, 79, 80, 100, + 242, 30, 31, 328, 329, 330, 100, 89, 419, 100, + 92, 93, 3, 95, 573, 851, 398, 399, 101, 400, + 401, 101, 51, 52, 100, 573, 573, 48, 714, 111, + 112, 60, 61, 100, 116, 117, 65, 101, 100, 68, + 69, 877, 73, 74, 75, 76, 77, 78, 79, 80, + 353, 101, 103, 889, 30, 31, 89, 360, 89, 104, + 103, 92, 93, 103, 100, 100, 801, 95, 298, 101, + 3, 105, 3, 102, 100, 51, 52, 100, 100, 103, + 100, 100, 8, 101, 60, 61, 117, 30, 31, 65, + 100, 100, 68, 69, 101, 385, 385, 385, 100, 385, + 385, 100, 100, 104, 346, 101, 103, 842, 103, 668, + 413, 47, 354, 385, 385, 801, 385, 60, 101, 101, + 668, 668, 65, 426, 385, 68, 69, 117, 581, 101, + 101, 105, 101, 3, 741, 108, 378, 104, 106, 109, + 551, 102, 106, 385, 447, 110, 449, 102, 559, 106, + 104, 117, 58, 102, 107, 118, 842, 102, 611, 106, + 100, 422, 422, 100, 422, 422, 3, 101, 106, 104, + 422, 422, 414, 102, 102, 107, 406, 717, 102, 482, + 422, 104, 385, 386, 386, 104, 386, 104, 386, 386, + 386, 433, 106, 435, 436, 102, 118, 102, 31, 100, + 442, 100, 613, 656, 100, 100, 496, 29, 496, 102, + 102, 102, 454, 100, 100, 411, 627, 628, 629, 100, + 523, 674, 100, 100, 100, 100, 100, 3, 100, 100, + 8, 427, 66, 463, 102, 524, 100, 106, 524, 524, + 100, 100, 100, 504, 504, 100, 504, 504, 100, 100, + 100, 100, 504, 504, 496, 524, 102, 102, 548, 102, + 548, 102, 504, 524, 106, 568, 102, 3, 510, 100, + 100, 100, 100, 100, 118, 100, 100, 117, 35, 102, + 119, 101, 524, 525, 526, 527, 118, 853, 854, 3, + 35, 117, 38, 55, 8, 9, 10, 11, 12, 13, + 14, 15, 16, 17, 18, 19, 548, 106, 538, 539, + 24, 25, 26, 574, 574, 120, 574, 574, 884, 103, + 118, 118, 574, 3, 59, 118, 106, 117, 117, 62, + 104, 3, 574, 118, 106, 106, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, - 882, 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, + 546, 23, 24, 25, 26, 39, 100, 105, 117, 102, + 118, 100, 118, 117, 105, 118, 75, 81, 82, 83, + 84, 85, 86, 87, 88, 89, 118, 573, 106, 75, + 49, 95, 312, 758, 17, 99, 16, 690, 430, 507, + 656, 312, 845, 396, 50, 395, 693, 613, 616, 1, + 574, 769, 4, 5, 6, 7, 385, 848, 397, 81, + 82, 83, 84, 85, 86, 87, 88, 89, 20, 21, + 504, 23, 850, 753, 714, 27, 714, 99, 100, 852, + 876, 718, 384, 105, 450, 360, 678, 442, 40, 41, + 42, 43, 528, 78, 390, 857, 668, 49, 50, 367, + 753, 53, -1, 581, 56, -1, -1, -1, -1, -1, + -1, 63, 64, -1, -1, -1, -1, -1, 70, 71, + 72, -1, 714, 676, 676, -1, 676, -1, 676, 676, + -1, -1, -1, -1, -1, 715, -1, -1, 715, -1, + 732, -1, 94, -1, -1, -1, -1, -1, -1, 741, + 102, -1, -1, -1, -1, -1, -1, 1, -1, 3, + -1, 801, 754, 801, 8, 9, 10, 11, 12, 13, + 14, 15, 16, 17, 18, 19, 20, 21, -1, 23, + 24, 25, 26, -1, -1, -1, -1, -1, -1, 769, + -1, -1, 769, -1, -1, -1, 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, 81, 82, 83, + 84, 85, 86, 87, 88, 89, -1, -1, -1, -1, + 842, 95, -1, -1, -1, 99, 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, 884, 23, -1, 25, 26, 27, -1, -1, + 30, 31, 32, 33, 34, -1, -1, -1, -1, -1, + 40, -1, -1, -1, 44, 45, 46, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, 64, 65, -1, -1, -1, -1, -1, -1, + -1, -1, -1, 63, 64, -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, + -1, 81, 82, 83, 84, 85, 86, 87, 88, 89, + -1, -1, -1, -1, -1, 95, -1, 1, -1, 3, + 4, -1, 102, 7, 8, 9, 10, 11, 12, 13, + 14, 15, 16, 17, 18, 19, 20, 21, -1, 23, + -1, 25, 26, 27, -1, -1, 30, 31, 32, 33, + 34, -1, -1, -1, -1, -1, 40, -1, -1, -1, + 44, 45, 46, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, 63, + 64, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, 81, 82, 83, + 84, 85, 86, 87, 88, 89, -1, -1, -1, -1, + -1, 95, -1, 1, -1, 3, 4, -1, 102, 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, + 18, 19, 20, 21, -1, 23, -1, 25, 26, 27, + -1, -1, 30, 31, 32, 33, 34, -1, -1, -1, + -1, -1, 40, -1, -1, -1, 44, -1, -1, -1, + -1, -1, -1, -1, -1, -1, 54, -1, -1, -1, + -1, -1, -1, -1, -1, 63, 64, -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, 81, 82, 83, 84, 85, 86, 87, + 88, 89, -1, -1, -1, -1, -1, -1, -1, 1, + -1, 3, 4, -1, 102, 7, 8, 9, 10, 11, + 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, + -1, 23, -1, 25, 26, 27, -1, -1, 30, 31, + 32, 33, 34, -1, 1, -1, 3, 4, 40, -1, + 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, + 17, 18, 19, 20, 21, -1, 23, -1, 25, 26, + 27, 63, 64, 30, 31, 32, 33, 34, -1, -1, + -1, -1, -1, 40, -1, -1, -1, -1, -1, 81, + 82, 83, 84, 85, 86, 87, 88, 89, -1, -1, + -1, -1, -1, 95, -1, -1, 63, 64, -1, -1, + 102, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, 81, 82, 83, 84, 85, 86, + 87, 88, 89, -1, -1, -1, -1, -1, 95, -1, + 1, -1, 3, 4, -1, 102, 7, 8, 9, 10, + 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, + 21, -1, 23, -1, 25, 26, 27, -1, -1, 30, + 31, 32, 33, 34, -1, -1, 3, 4, -1, 40, + 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, + 17, 18, -1, -1, -1, -1, 23, -1, 25, 26, + -1, -1, 63, 64, -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, 3, - 4, 99, -1, 7, 8, 9, 10, 11, 12, 13, + 81, 82, 83, 84, 85, 86, 87, 88, 89, -1, + -1, -1, -1, -1, 95, -1, -1, -1, -1, -1, + -1, 102, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, 81, 82, 83, 84, 85, 86, + 87, 88, 89, -1, -1, -1, -1, -1, -1, 1, + -1, 3, -1, -1, -1, 102, 8, 9, 10, 11, + 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, + 3, 23, 24, 25, 26, 8, 9, 10, 11, 12, + 13, 14, 15, 16, 17, 18, 19, 20, 21, 3, + 23, 24, 25, 26, 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, - 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, + 24, 25, 26, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, 81, + 82, 83, 84, 85, 86, 87, 88, 89, 0, 1, + -1, -1, 4, 5, 6, 7, -1, 99, 81, 82, + 83, 84, 85, 86, 87, 88, 89, -1, 20, 21, + -1, 23, 95, -1, -1, 27, 99, 81, 82, 83, + 84, 85, 86, 87, 88, 89, -1, -1, 40, 41, + 42, 43, -1, -1, -1, 99, -1, 49, 50, -1, + -1, 53, -1, -1, 56, 4, -1, 6, -1, -1, + -1, 63, 64, 4, -1, 6, -1, -1, 70, 71, + -1, 20, 21, -1, 23, 24, -1, -1, 27, 20, + 21, -1, 23, 24, -1, -1, 27, -1, -1, -1, + -1, 1, 94, 95, 4, 5, 6, 7, -1, -1, + 49, -1, -1, -1, 53, -1, -1, -1, 49, -1, + 20, 21, 53, 23, -1, -1, -1, 27, 67, -1, + -1, -1, -1, -1, -1, -1, 67, -1, -1, -1, + 40, 41, 42, 43, -1, -1, -1, -1, -1, 49, + 50, -1, -1, 53, -1, -1, 56, -1, -1, -1, + 99, -1, -1, 63, 64, -1, -1, -1, 99, -1, + 70, 71, -1, -1, -1, -1, -1, 1, -1, -1, + 4, 5, 6, 7, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, 94, 95, 20, 21, -1, 23, + -1, -1, 1, 27, -1, 4, 5, 6, 7, -1, + -1, -1, -1, -1, -1, -1, 40, 41, 42, 43, + -1, 20, 21, -1, 23, 49, 50, -1, 27, 53, + -1, -1, 56, -1, -1, -1, -1, -1, -1, 63, + 64, 40, 41, 42, 43, -1, 70, 71, 72, -1, + 49, 50, -1, -1, 53, -1, 3, 56, -1, -1, + -1, 8, 9, 10, 63, 64, 13, 14, 15, 16, + 94, 70, 71, -1, -1, -1, 23, -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, 94, -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, 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, 3, 4, -1, 41, 7, + -1, -1, -1, -1, 81, 82, 83, 84, 85, 86, + 87, 88, 89, 1, -1, 3, 4, -1, 95, 7, 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, - -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, + 18, 19, 20, 21, -1, 23, -1, 25, 26, 27, + -1, -1, 30, 31, 32, 33, 34, -1, -1, -1, + -1, -1, 40, -1, -1, -1, 44, 45, 46, -1, -1, -1, -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, 63, 64, -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, -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, 81, 82, 83, 84, 85, 86, 87, + 88, 89, 1, -1, 3, 4, -1, -1, 7, 8, + 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, + 19, 20, 21, -1, 23, -1, 25, 26, 27, -1, + -1, 30, 31, 32, 33, 34, -1, 3, -1, -1, + -1, 40, 8, 9, 10, 11, 12, 13, 14, 15, + 16, 17, 18, 19, -1, -1, -1, -1, -1, 25, + 26, -1, -1, -1, 63, 64, -1, -1, 34, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, 81, 82, 83, 84, 85, 86, 87, 88, + 89, 3, -1, -1, -1, -1, 8, 9, 10, 11, + 12, 13, 14, 15, 16, 17, 18, 19, -1, -1, + -1, -1, -1, 25, 26, 81, 82, 83, 84, 85, + 86, 87, 88, 89, 3, -1, -1, -1, -1, 8, + 9, 10, 11, 12, 13, 14, 15, 16, 17, -1, + -1, -1, -1, -1, -1, -1, 25, 26, -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, + -1, -1, -1, -1, -1, -1, -1, -1, -1, 81, + 82, 83, 84, 85, 86, 87, 88, 89, -1, -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, 81, 82, 83, 84, 85, 86, 87, 88, + 89 }; /* YYSTOS[STATE-NUM] -- The symbol kind of the accessing symbol of state STATE-NUM. */ static const yytype_int16 yystos[] = { - 0, 119, 120, 121, 0, 1, 4, 5, 6, 7, - 20, 21, 23, 28, 41, 42, 43, 44, 50, 51, - 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, - 97, 130, 102, 169, 163, 132, 174, 8, 9, 10, + 0, 122, 123, 124, 0, 1, 4, 5, 6, 7, + 20, 21, 23, 27, 40, 41, 42, 43, 49, 50, + 53, 56, 63, 64, 70, 71, 94, 125, 126, 142, + 144, 148, 149, 161, 164, 165, 169, 171, 174, 175, + 176, 180, 184, 186, 190, 191, 216, 217, 235, 243, + 244, 252, 261, 281, 283, 295, 297, 319, 320, 321, + 367, 418, 419, 420, 421, 422, 426, 448, 450, 473, + 474, 475, 476, 477, 481, 482, 483, 486, 490, 498, + 511, 512, 141, 218, 143, 170, 253, 282, 296, 322, + 368, 3, 215, 269, 169, 53, 169, 184, 186, 53, + 176, 186, 187, 215, 215, 451, 3, 89, 211, 214, + 211, 499, 513, 215, 103, 145, 134, 150, 162, 100, + 100, 133, 105, 172, 166, 135, 177, 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, - 253, 212, 212, 212, 212, 169, 212, 169, 178, 212, - 212, 423, 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, - 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, - 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 + 25, 26, 81, 82, 83, 84, 85, 86, 87, 88, + 99, 172, 211, 256, 257, 258, 259, 260, 271, 272, + 273, 274, 275, 276, 277, 278, 279, 280, 281, 283, + 295, 297, 321, 330, 331, 334, 337, 340, 341, 344, + 345, 348, 131, 127, 125, 95, 245, 128, 284, 22, + 132, 129, 130, 136, 423, 137, 449, 138, 172, 484, + 484, 139, 140, 101, 515, 100, 17, 211, 222, 271, + 274, 275, 276, 277, 278, 341, 345, 211, 215, 254, + 256, 215, 215, 215, 215, 172, 215, 172, 181, 215, + 215, 427, 215, 212, 75, 89, 75, 3, 244, 101, + 101, 100, 4, 6, 20, 21, 23, 24, 27, 49, + 53, 67, 99, 491, 492, 494, 244, 508, 100, 48, + 188, 101, 100, 101, 8, 11, 8, 9, 103, 338, + 332, 185, 104, 104, 106, 103, 103, 100, 100, 211, + 100, 101, 298, 100, 100, 100, 100, 101, 100, 101, + 460, 100, 485, 478, 487, 100, 100, 516, 219, 255, + 323, 369, 101, 105, 429, 452, 214, 213, 500, 3, + 245, 236, 146, 222, 103, 3, 151, 493, 73, 74, + 75, 76, 77, 78, 79, 80, 92, 93, 111, 112, + 116, 117, 211, 223, 224, 225, 226, 227, 228, 229, + 230, 231, 232, 233, 510, 104, 173, 167, 178, 8, + 224, 234, 103, 103, 47, 189, 335, 342, 346, 246, + 285, 117, 424, 461, 189, 101, 101, 518, 215, 215, + 262, 265, 269, 270, 349, 101, 101, 182, 430, 428, + 105, 457, 214, 101, 514, 237, 123, 124, 3, 104, + 106, 232, 232, 232, 224, 108, 109, 110, 90, 91, + 111, 112, 113, 114, 115, 509, 163, 208, 211, 197, + 198, 192, 106, 339, 244, 208, 234, 234, 234, 117, + 247, 102, 244, 286, 287, 290, 299, 431, 463, 479, + 488, 30, 31, 60, 65, 68, 69, 356, 357, 362, + 440, 442, 443, 507, 517, 519, 220, 350, 263, 324, + 370, 197, 211, 189, 458, 453, 501, 429, 7, 102, + 217, 222, 238, 240, 241, 279, 321, 147, 104, 152, + 494, 118, 226, 227, 228, 229, 229, 230, 230, 231, + 231, 231, 106, 215, 209, 1, 32, 33, 168, 199, + 217, 243, 252, 356, 367, 372, 377, 418, 419, 44, + 45, 46, 179, 193, 195, 196, 199, 243, 379, 224, + 244, 257, 336, 343, 347, 214, 224, 248, 249, 251, + 1, 256, 291, 289, 244, 51, 52, 61, 243, 356, + 425, 432, 440, 442, 445, 446, 447, 507, 44, 54, + 199, 462, 464, 467, 470, 197, 192, 358, 363, 19, + 211, 441, 58, 444, 211, 211, 522, 520, 521, 441, + 523, 102, 107, 244, 106, 244, 326, 329, 289, 183, + 211, 189, 503, 504, 239, 100, 215, 100, 102, 3, + 101, 244, 106, 207, 102, 203, 199, 200, 205, 204, + 206, 34, 211, 258, 341, 345, 378, 401, 201, 202, + 380, 102, 291, 193, 194, 104, 257, 333, 104, 104, + 104, 107, 118, 106, 250, 294, 292, 288, 290, 8, + 211, 271, 276, 277, 278, 304, 321, 211, 211, 211, + 432, 438, 102, 433, 434, 435, 436, 437, 439, 215, + 215, 102, 465, 466, 480, 489, 31, 401, 214, 3, + 3, 100, 100, 100, 214, 100, 221, 119, 351, 353, + 264, 3, 325, 327, 371, 102, 454, 502, 243, 356, + 440, 442, 505, 254, 29, 242, 153, 510, 210, 100, + 100, 100, 100, 100, 100, 373, 100, 100, 3, 100, + 106, 224, 214, 251, 100, 262, 102, 300, 214, 214, + 214, 100, 100, 100, 100, 100, 100, 100, 468, 471, + 100, 100, 102, 102, 359, 364, 223, 354, 352, 265, + 102, 106, 102, 66, 102, 505, 506, 100, 100, 100, + 224, 100, 72, 126, 142, 155, 157, 158, 211, 3, + 381, 244, 250, 293, 118, 117, 383, 383, 401, 266, + 269, 234, 353, 328, 455, 100, 211, 154, 156, 100, + 374, 383, 257, 100, 301, 384, 385, 469, 472, 360, + 365, 267, 355, 329, 211, 159, 102, 157, 117, 392, + 382, 101, 118, 35, 386, 389, 38, 403, 403, 266, + 55, 406, 106, 120, 456, 103, 393, 394, 375, 403, + 302, 390, 118, 387, 404, 361, 407, 366, 268, 59, + 459, 3, 495, 497, 118, 35, 36, 37, 395, 398, + 402, 403, 1, 28, 29, 305, 307, 311, 313, 401, + 106, 117, 403, 117, 62, 409, 269, 211, 104, 496, + 118, 396, 399, 376, 310, 315, 314, 303, 306, 308, + 312, 391, 388, 405, 408, 410, 160, 106, 106, 401, + 39, 412, 100, 224, 105, 102, 307, 244, 313, 265, + 389, 208, 208, 117, 215, 497, 397, 400, 413, 316, + 256, 317, 118, 118, 411, 398, 265, 117, 105, 318, + 309, 208, 414, 265, 100, 118, 75, 415, 416, 118, + 106, 417, 75 }; /* YYR1[RULE-NUM] -- Symbol kind of the left-hand side of rule RULE-NUM. */ static const yytype_int16 yyr1[] = { - 0, 118, 119, 120, 120, 121, 121, 122, 122, 122, - 124, 123, 125, 123, 126, 123, 127, 123, 128, 123, - 129, 123, 130, 123, 131, 123, 132, 123, 133, 123, - 134, 123, 135, 123, 136, 123, 137, 123, 138, 123, - 140, 139, 142, 143, 144, 141, 145, 147, 148, 149, - 150, 151, 146, 152, 153, 153, 154, 154, 156, 157, - 155, 159, 160, 158, 161, 161, 163, 164, 165, 162, - 167, 166, 168, 168, 168, 170, 169, 169, 171, 171, - 171, 171, 172, 172, 174, 175, 176, 173, 178, 179, - 180, 177, 182, 181, 184, 183, 185, 185, 186, 186, - 187, 187, 188, 189, 189, 189, 190, 190, 191, 190, - 192, 192, 193, 194, 194, 195, 195, 197, 196, 198, - 196, 199, 196, 200, 196, 201, 196, 202, 196, 203, - 196, 204, 196, 205, 207, 206, 206, 208, 209, 208, - 210, 208, 211, 212, 213, 213, 213, 215, 216, 217, - 218, 214, 219, 219, 219, 219, 219, 219, 219, 219, - 219, 220, 221, 222, 222, 223, 223, 224, 224, 225, - 225, 225, 226, 226, 226, 227, 227, 227, 227, 228, - 228, 228, 228, 229, 229, 229, 230, 230, 230, 230, - 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 + 0, 121, 122, 123, 123, 124, 124, 125, 125, 125, + 127, 126, 128, 126, 129, 126, 130, 126, 131, 126, + 132, 126, 133, 126, 134, 126, 135, 126, 136, 126, + 137, 126, 138, 126, 139, 126, 140, 126, 141, 126, + 143, 142, 145, 146, 147, 144, 148, 150, 151, 152, + 153, 154, 149, 155, 156, 156, 157, 157, 159, 160, + 158, 162, 163, 161, 164, 164, 166, 167, 168, 165, + 170, 169, 171, 171, 171, 173, 172, 172, 174, 174, + 174, 174, 175, 175, 177, 178, 179, 176, 181, 182, + 183, 180, 185, 184, 187, 186, 188, 188, 189, 189, + 190, 190, 191, 192, 192, 192, 193, 193, 194, 193, + 195, 195, 196, 197, 197, 198, 198, 200, 199, 201, + 199, 202, 199, 203, 199, 204, 199, 205, 199, 206, + 199, 207, 199, 208, 210, 209, 209, 211, 212, 211, + 213, 211, 214, 215, 216, 216, 216, 218, 219, 220, + 221, 217, 222, 222, 222, 222, 222, 222, 222, 222, + 222, 223, 224, 225, 225, 226, 226, 227, 227, 228, + 228, 228, 229, 229, 229, 230, 230, 230, 230, 231, + 231, 231, 231, 232, 232, 232, 233, 233, 233, 233, + 233, 233, 233, 233, 233, 233, 234, 236, 235, 237, + 237, 238, 238, 238, 239, 238, 240, 240, 241, 242, + 242, 243, 244, 244, 246, 245, 247, 247, 248, 248, + 248, 249, 250, 250, 251, 253, 252, 252, 252, 252, + 252, 252, 255, 254, 256, 256, 257, 257, 257, 258, + 258, 258, 258, 258, 258, 258, 258, 259, 259, 259, + 259, 259, 260, 260, 260, 261, 261, 262, 264, 263, + 263, 265, 265, 266, 268, 267, 267, 269, 270, 271, + 271, 272, 272, 272, 272, 272, 272, 272, 273, 273, + 273, 273, 273, 273, 273, 274, 274, 274, 275, 276, + 276, 277, 278, 279, 280, 282, 281, 284, 285, 283, + 286, 286, 288, 287, 289, 289, 290, 292, 293, 291, + 294, 291, 296, 295, 298, 299, 300, 301, 302, 303, + 297, 304, 304, 304, 304, 304, 304, 305, 306, 306, + 308, 309, 307, 310, 307, 311, 312, 312, 314, 313, + 315, 316, 313, 318, 317, 319, 320, 322, 323, 324, + 325, 321, 326, 328, 327, 327, 329, 330, 332, 333, + 331, 335, 336, 334, 334, 338, 339, 337, 340, 342, + 343, 341, 341, 344, 346, 347, 345, 345, 348, 350, + 349, 351, 352, 352, 354, 355, 353, 356, 356, 358, + 359, 360, 361, 357, 363, 364, 365, 366, 362, 368, + 369, 370, 371, 367, 373, 374, 375, 376, 372, 377, + 377, 377, 378, 378, 380, 381, 382, 379, 384, 383, + 385, 383, 386, 388, 387, 387, 390, 391, 389, 393, + 392, 394, 392, 395, 397, 396, 396, 399, 400, 398, + 401, 401, 401, 401, 402, 402, 402, 404, 405, 403, + 403, 407, 408, 406, 406, 410, 411, 409, 409, 413, + 414, 412, 412, 415, 417, 416, 416, 418, 419, 420, + 420, 421, 423, 424, 425, 422, 427, 428, 426, 430, + 429, 429, 431, 431, 431, 433, 432, 434, 432, 435, + 432, 436, 432, 437, 432, 438, 432, 439, 432, 440, + 441, 441, 442, 443, 444, 444, 445, 446, 447, 449, + 448, 451, 452, 453, 454, 455, 456, 450, 458, 457, + 457, 459, 459, 461, 462, 460, 463, 463, 464, 465, + 464, 466, 464, 468, 469, 467, 471, 472, 470, 473, + 473, 473, 474, 474, 475, 476, 478, 479, 480, 477, + 481, 482, 483, 485, 484, 487, 488, 489, 486, 490, + 490, 491, 491, 491, 491, 491, 491, 491, 491, 491, + 491, 491, 492, 493, 493, 494, 494, 495, 496, 496, + 497, 499, 500, 501, 502, 498, 503, 503, 504, 504, + 505, 505, 506, 505, 507, 507, 508, 509, 509, 510, + 511, 513, 514, 512, 516, 517, 515, 518, 518, 520, + 519, 521, 519, 522, 519, 523, 519 }; /* YYR2[RULE-NUM] -- Number of symbols on the right-hand side of rule RULE-NUM. */ @@ -2213,46 +2226,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, 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, 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, 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 }; @@ -2716,7 +2729,7 @@ yyparse (void) switch (yyn) { case 5: /* at_least_one_definition: definitions at_least_one_annotation definition */ -#line 432 "fe/idl.ypp" +#line 436 "fe/idl.ypp" { AST_Annotation_Appls *&annotations = (yyvsp[-1].annotations_val); AST_Decl *&node = (yyvsp[0].dcval); @@ -2731,269 +2744,269 @@ yyparse (void) } delete annotations; } -#line 2747 "fe/idl.tab.cpp" +#line 2748 "fe/idl.tab.cpp" break; case 10: /* $@1: %empty */ -#line 457 "fe/idl.ypp" +#line 461 "fe/idl.ypp" { idl_global->set_parse_state (IDL_GlobalData::PS_AnnotationDeclSeen); } -#line 2755 "fe/idl.tab.cpp" +#line 2756 "fe/idl.tab.cpp" break; case 11: /* fixed_definition: annotation_dcl $@1 ';' */ -#line 461 "fe/idl.ypp" +#line 465 "fe/idl.ypp" { idl_global->set_parse_state (IDL_GlobalData::PS_NoState); } -#line 2763 "fe/idl.tab.cpp" +#line 2764 "fe/idl.tab.cpp" break; case 12: /* $@2: %empty */ -#line 465 "fe/idl.ypp" +#line 469 "fe/idl.ypp" { idl_global->set_parse_state (IDL_GlobalData::PS_TypeDeclSeen); } -#line 2771 "fe/idl.tab.cpp" +#line 2772 "fe/idl.tab.cpp" break; case 13: /* fixed_definition: type_dcl $@2 ';' */ -#line 469 "fe/idl.ypp" +#line 473 "fe/idl.ypp" { idl_global->set_parse_state (IDL_GlobalData::PS_NoState); } -#line 2779 "fe/idl.tab.cpp" +#line 2780 "fe/idl.tab.cpp" break; case 14: /* $@3: %empty */ -#line 473 "fe/idl.ypp" +#line 477 "fe/idl.ypp" { idl_global->set_parse_state (IDL_GlobalData::PS_TypeIdDeclSeen); } -#line 2787 "fe/idl.tab.cpp" +#line 2788 "fe/idl.tab.cpp" break; case 15: /* fixed_definition: typeid_dcl $@3 ';' */ -#line 477 "fe/idl.ypp" +#line 481 "fe/idl.ypp" { idl_global->set_parse_state (IDL_GlobalData::PS_NoState); } -#line 2795 "fe/idl.tab.cpp" +#line 2796 "fe/idl.tab.cpp" break; case 16: /* $@4: %empty */ -#line 481 "fe/idl.ypp" +#line 485 "fe/idl.ypp" { idl_global->set_parse_state (IDL_GlobalData::PS_TypePrefixDeclSeen); } -#line 2803 "fe/idl.tab.cpp" +#line 2804 "fe/idl.tab.cpp" break; case 17: /* fixed_definition: typeprefix_dcl $@4 ';' */ -#line 485 "fe/idl.ypp" +#line 489 "fe/idl.ypp" { idl_global->set_parse_state (IDL_GlobalData::PS_NoState); } -#line 2811 "fe/idl.tab.cpp" +#line 2812 "fe/idl.tab.cpp" break; case 18: /* $@5: %empty */ -#line 489 "fe/idl.ypp" +#line 493 "fe/idl.ypp" { idl_global->set_parse_state (IDL_GlobalData::PS_ConstDeclSeen); } -#line 2819 "fe/idl.tab.cpp" +#line 2820 "fe/idl.tab.cpp" break; case 19: /* fixed_definition: const_dcl $@5 ';' */ -#line 493 "fe/idl.ypp" +#line 497 "fe/idl.ypp" { idl_global->set_parse_state (IDL_GlobalData::PS_NoState); } -#line 2827 "fe/idl.tab.cpp" +#line 2828 "fe/idl.tab.cpp" break; case 20: /* $@6: %empty */ -#line 497 "fe/idl.ypp" +#line 501 "fe/idl.ypp" { idl_global->set_parse_state (IDL_GlobalData::PS_ExceptDeclSeen); } -#line 2835 "fe/idl.tab.cpp" +#line 2836 "fe/idl.tab.cpp" break; case 21: /* fixed_definition: exception $@6 ';' */ -#line 501 "fe/idl.ypp" +#line 505 "fe/idl.ypp" { idl_global->set_parse_state (IDL_GlobalData::PS_NoState); } -#line 2843 "fe/idl.tab.cpp" +#line 2844 "fe/idl.tab.cpp" break; case 22: /* $@7: %empty */ -#line 505 "fe/idl.ypp" +#line 509 "fe/idl.ypp" { idl_global->set_parse_state (IDL_GlobalData::PS_InterfaceDeclSeen); } -#line 2851 "fe/idl.tab.cpp" +#line 2852 "fe/idl.tab.cpp" break; case 23: /* fixed_definition: interface_def $@7 ';' */ -#line 509 "fe/idl.ypp" +#line 513 "fe/idl.ypp" { idl_global->set_parse_state (IDL_GlobalData::PS_NoState); } -#line 2859 "fe/idl.tab.cpp" +#line 2860 "fe/idl.tab.cpp" break; case 24: /* $@8: %empty */ -#line 513 "fe/idl.ypp" +#line 517 "fe/idl.ypp" { idl_global->set_parse_state (IDL_GlobalData::PS_ModuleDeclSeen); } -#line 2867 "fe/idl.tab.cpp" +#line 2868 "fe/idl.tab.cpp" break; case 25: /* fixed_definition: module $@8 ';' */ -#line 517 "fe/idl.ypp" +#line 521 "fe/idl.ypp" { idl_global->set_parse_state (IDL_GlobalData::PS_NoState); } -#line 2875 "fe/idl.tab.cpp" +#line 2876 "fe/idl.tab.cpp" break; case 26: /* $@9: %empty */ -#line 521 "fe/idl.ypp" +#line 525 "fe/idl.ypp" { idl_global->set_parse_state (IDL_GlobalData::PS_ValueTypeDeclSeen); } -#line 2883 "fe/idl.tab.cpp" +#line 2884 "fe/idl.tab.cpp" break; case 27: /* fixed_definition: value_def $@9 ';' */ -#line 525 "fe/idl.ypp" +#line 529 "fe/idl.ypp" { idl_global->set_parse_state (IDL_GlobalData::PS_NoState); } -#line 2891 "fe/idl.tab.cpp" +#line 2892 "fe/idl.tab.cpp" break; case 28: /* $@10: %empty */ -#line 529 "fe/idl.ypp" +#line 533 "fe/idl.ypp" { idl_global->set_parse_state (IDL_GlobalData::PS_ComponentDeclSeen); } -#line 2899 "fe/idl.tab.cpp" +#line 2900 "fe/idl.tab.cpp" break; case 29: /* fixed_definition: component $@10 ';' */ -#line 533 "fe/idl.ypp" +#line 537 "fe/idl.ypp" { idl_global->set_parse_state (IDL_GlobalData::PS_NoState); } -#line 2907 "fe/idl.tab.cpp" +#line 2908 "fe/idl.tab.cpp" break; case 30: /* $@11: %empty */ -#line 537 "fe/idl.ypp" +#line 541 "fe/idl.ypp" { idl_global->set_parse_state (IDL_GlobalData::PS_HomeDeclSeen); } -#line 2915 "fe/idl.tab.cpp" +#line 2916 "fe/idl.tab.cpp" break; case 31: /* fixed_definition: home_decl $@11 ';' */ -#line 541 "fe/idl.ypp" +#line 545 "fe/idl.ypp" { idl_global->set_parse_state (IDL_GlobalData::PS_NoState); } -#line 2923 "fe/idl.tab.cpp" +#line 2924 "fe/idl.tab.cpp" break; case 32: /* $@12: %empty */ -#line 545 "fe/idl.ypp" +#line 549 "fe/idl.ypp" { idl_global->set_parse_state (IDL_GlobalData::PS_EventDeclSeen); } -#line 2931 "fe/idl.tab.cpp" +#line 2932 "fe/idl.tab.cpp" break; case 33: /* fixed_definition: event $@12 ';' */ -#line 549 "fe/idl.ypp" +#line 553 "fe/idl.ypp" { idl_global->set_parse_state (IDL_GlobalData::PS_NoState); } -#line 2939 "fe/idl.tab.cpp" +#line 2940 "fe/idl.tab.cpp" break; case 34: /* $@13: %empty */ -#line 553 "fe/idl.ypp" +#line 557 "fe/idl.ypp" { idl_global->set_parse_state (IDL_GlobalData::PS_PorttypeDeclSeen); } -#line 2947 "fe/idl.tab.cpp" +#line 2948 "fe/idl.tab.cpp" break; case 35: /* fixed_definition: porttype_decl $@13 ';' */ -#line 557 "fe/idl.ypp" +#line 561 "fe/idl.ypp" { idl_global->set_parse_state (IDL_GlobalData::PS_NoState); } -#line 2955 "fe/idl.tab.cpp" +#line 2956 "fe/idl.tab.cpp" break; case 36: /* $@14: %empty */ -#line 561 "fe/idl.ypp" +#line 565 "fe/idl.ypp" { idl_global->set_parse_state (IDL_GlobalData::PS_ConnectorDeclSeen); } -#line 2963 "fe/idl.tab.cpp" +#line 2964 "fe/idl.tab.cpp" break; case 37: /* fixed_definition: connector_decl $@14 ';' */ -#line 565 "fe/idl.ypp" +#line 569 "fe/idl.ypp" { idl_global->set_parse_state (IDL_GlobalData::PS_NoState); } -#line 2971 "fe/idl.tab.cpp" +#line 2972 "fe/idl.tab.cpp" break; case 38: /* $@15: %empty */ -#line 569 "fe/idl.ypp" +#line 573 "fe/idl.ypp" { idl_global->err ()->syntax_error (idl_global->parse_state ()); } -#line 2979 "fe/idl.tab.cpp" +#line 2980 "fe/idl.tab.cpp" break; case 39: /* fixed_definition: error $@15 ';' */ -#line 573 "fe/idl.ypp" +#line 577 "fe/idl.ypp" { idl_global->set_parse_state (IDL_GlobalData::PS_NoState); yyerrok; (yyval.dcval) = 0; } -#line 2989 "fe/idl.tab.cpp" +#line 2990 "fe/idl.tab.cpp" break; case 40: /* $@16: %empty */ -#line 582 "fe/idl.ypp" +#line 586 "fe/idl.ypp" { idl_global->set_parse_state (IDL_GlobalData::PS_ModuleSeen); } -#line 2997 "fe/idl.tab.cpp" +#line 2998 "fe/idl.tab.cpp" break; case 41: /* module_header: IDL_MODULE $@16 scoped_name */ -#line 586 "fe/idl.ypp" +#line 590 "fe/idl.ypp" { (yyval.idlist) = (yyvsp[0].idlist); } -#line 3005 "fe/idl.tab.cpp" +#line 3006 "fe/idl.tab.cpp" break; case 42: /* @17: %empty */ -#line 593 "fe/idl.ypp" +#line 597 "fe/idl.ypp" { idl_global->set_parse_state (IDL_GlobalData::PS_ModuleIDSeen); @@ -3032,27 +3045,27 @@ yyparse (void) (yyval.dcval) = m; } -#line 3048 "fe/idl.tab.cpp" +#line 3049 "fe/idl.tab.cpp" break; case 43: /* $@18: %empty */ -#line 632 "fe/idl.ypp" +#line 636 "fe/idl.ypp" { idl_global->set_parse_state (IDL_GlobalData::PS_ModuleSqSeen); } -#line 3056 "fe/idl.tab.cpp" +#line 3057 "fe/idl.tab.cpp" break; case 44: /* $@19: %empty */ -#line 636 "fe/idl.ypp" +#line 640 "fe/idl.ypp" { idl_global->set_parse_state (IDL_GlobalData::PS_ModuleBodySeen); } -#line 3064 "fe/idl.tab.cpp" +#line 3065 "fe/idl.tab.cpp" break; case 45: /* module: module_header @17 '{' $@18 at_least_one_definition $@19 '}' */ -#line 640 "fe/idl.ypp" +#line 644 "fe/idl.ypp" { idl_global->set_parse_state (IDL_GlobalData::PS_ModuleQsSeen); /* @@ -3062,19 +3075,19 @@ yyparse (void) idl_global->scopes ().pop (); (yyval.dcval) = (yyvsp[-5].dcval); } -#line 3078 "fe/idl.tab.cpp" +#line 3079 "fe/idl.tab.cpp" break; case 46: /* template_module_header: module_header '<' */ -#line 653 "fe/idl.ypp" +#line 657 "fe/idl.ypp" { idl_global->set_parse_state (IDL_GlobalData::PS_TmplModuleIDSeen); } -#line 3086 "fe/idl.tab.cpp" +#line 3087 "fe/idl.tab.cpp" break; case 47: /* $@20: %empty */ -#line 660 "fe/idl.ypp" +#line 664 "fe/idl.ypp" { // The module_header rule is common to template module, fixed // module and instantiated template module. In the last @@ -3088,11 +3101,11 @@ yyparse (void) IDL_GlobalData::PS_ModuleIDSeen); } } -#line 3104 "fe/idl.tab.cpp" +#line 3105 "fe/idl.tab.cpp" break; case 48: /* $@21: %empty */ -#line 674 "fe/idl.ypp" +#line 678 "fe/idl.ypp" { if (FE_Utils::duplicate_param_id ((yyvsp[0].plval))) { @@ -3102,11 +3115,11 @@ yyparse (void) return 1; } } -#line 3118 "fe/idl.tab.cpp" +#line 3119 "fe/idl.tab.cpp" break; case 49: /* $@22: %empty */ -#line 684 "fe/idl.ypp" +#line 688 "fe/idl.ypp" { idl_global->set_parse_state (IDL_GlobalData::PS_TmplModuleParamsSeen); @@ -3136,27 +3149,27 @@ yyparse (void) // of the template module. idl_global->current_params ((yyvsp[-2].plval)); } -#line 3152 "fe/idl.tab.cpp" +#line 3153 "fe/idl.tab.cpp" break; case 50: /* $@23: %empty */ -#line 714 "fe/idl.ypp" +#line 718 "fe/idl.ypp" { idl_global->set_parse_state (IDL_GlobalData::PS_TmplModuleSqSeen); } -#line 3160 "fe/idl.tab.cpp" +#line 3161 "fe/idl.tab.cpp" break; case 51: /* $@24: %empty */ -#line 718 "fe/idl.ypp" +#line 722 "fe/idl.ypp" { idl_global->set_parse_state (IDL_GlobalData::PS_TmplModuleBodySeen); } -#line 3168 "fe/idl.tab.cpp" +#line 3169 "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 '}' */ -#line 722 "fe/idl.ypp" +#line 726 "fe/idl.ypp" { idl_global->set_parse_state (IDL_GlobalData::PS_TmplModuleQsSeen); @@ -3175,29 +3188,29 @@ yyparse (void) (yyval.dcval) = 0; } -#line 3191 "fe/idl.tab.cpp" +#line 3192 "fe/idl.tab.cpp" break; case 58: /* $@25: %empty */ -#line 758 "fe/idl.ypp" +#line 762 "fe/idl.ypp" { idl_global->set_parse_state ( IDL_GlobalData::PS_ModuleRefSeen); } -#line 3200 "fe/idl.tab.cpp" +#line 3201 "fe/idl.tab.cpp" break; case 59: /* $@26: %empty */ -#line 763 "fe/idl.ypp" +#line 767 "fe/idl.ypp" { idl_global->set_parse_state ( IDL_GlobalData::PS_ModuleRefParamsSeen); } -#line 3209 "fe/idl.tab.cpp" +#line 3210 "fe/idl.tab.cpp" break; case 60: /* template_module_ref: IDL_ALIAS scoped_name $@25 '<' at_least_one_formal_parameter_name '>' $@26 defining_id */ -#line 768 "fe/idl.ypp" +#line 772 "fe/idl.ypp" { idl_global->set_parse_state ( IDL_GlobalData::PS_ModuleRefIDSeen); @@ -3275,29 +3288,29 @@ 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 3292 "fe/idl.tab.cpp" break; case 61: /* $@27: %empty */ -#line 849 "fe/idl.ypp" +#line 853 "fe/idl.ypp" { idl_global->set_parse_state ( IDL_GlobalData::PS_InstModuleSeen); } -#line 3300 "fe/idl.tab.cpp" +#line 3301 "fe/idl.tab.cpp" break; case 62: /* $@28: %empty */ -#line 854 "fe/idl.ypp" +#line 858 "fe/idl.ypp" { idl_global->set_parse_state ( IDL_GlobalData::PS_InstModuleArgsSeen); } -#line 3309 "fe/idl.tab.cpp" +#line 3310 "fe/idl.tab.cpp" break; case 63: /* template_module_inst: template_module_header $@27 at_least_one_actual_parameter '>' $@28 defining_id */ -#line 859 "fe/idl.ypp" +#line 863 "fe/idl.ypp" { idl_global->set_parse_state ( IDL_GlobalData::PS_InstModuleIDSeen); @@ -3361,11 +3374,11 @@ yyparse (void) (yyval.dcval) = 0; } -#line 3377 "fe/idl.tab.cpp" +#line 3378 "fe/idl.tab.cpp" break; case 66: /* $@29: %empty */ -#line 931 "fe/idl.ypp" +#line 935 "fe/idl.ypp" { UTL_Scope *s = idl_global->scopes ().top_non_null (); AST_Interface *i = 0; @@ -3403,27 +3416,27 @@ yyparse (void) */ idl_global->scopes ().push (i); } -#line 3419 "fe/idl.tab.cpp" +#line 3420 "fe/idl.tab.cpp" break; case 67: /* $@30: %empty */ -#line 969 "fe/idl.ypp" +#line 973 "fe/idl.ypp" { idl_global->set_parse_state (IDL_GlobalData::PS_InterfaceSqSeen); } -#line 3427 "fe/idl.tab.cpp" +#line 3428 "fe/idl.tab.cpp" break; case 68: /* $@31: %empty */ -#line 973 "fe/idl.ypp" +#line 977 "fe/idl.ypp" { idl_global->set_parse_state (IDL_GlobalData::PS_InterfaceBodySeen); } -#line 3435 "fe/idl.tab.cpp" +#line 3436 "fe/idl.tab.cpp" break; case 69: /* interface: interface_header $@29 '{' $@30 exports $@31 '}' */ -#line 977 "fe/idl.ypp" +#line 981 "fe/idl.ypp" { idl_global->set_parse_state (IDL_GlobalData::PS_InterfaceQsSeen); @@ -3433,28 +3446,28 @@ yyparse (void) */ idl_global->scopes ().pop (); } -#line 3449 "fe/idl.tab.cpp" +#line 3450 "fe/idl.tab.cpp" break; case 70: /* $@32: %empty */ -#line 990 "fe/idl.ypp" +#line 994 "fe/idl.ypp" { idl_global->set_parse_state (IDL_GlobalData::PS_InterfaceSeen); } -#line 3457 "fe/idl.tab.cpp" +#line 3458 "fe/idl.tab.cpp" break; case 71: /* interface_decl: IDL_INTERFACE $@32 defining_id */ -#line 994 "fe/idl.ypp" +#line 998 "fe/idl.ypp" { idl_global->set_parse_state (IDL_GlobalData::PS_InterfaceIDSeen); (yyval.idval) = (yyvsp[0].idval); } -#line 3466 "fe/idl.tab.cpp" +#line 3467 "fe/idl.tab.cpp" break; case 72: /* interface_header: interface_decl inheritance_spec */ -#line 1002 "fe/idl.ypp" +#line 1006 "fe/idl.ypp" { idl_global->set_parse_state (IDL_GlobalData::PS_InheritSpecSeen); @@ -3490,11 +3503,11 @@ yyparse (void) (yyvsp[0].nlval) = 0; } } -#line 3506 "fe/idl.tab.cpp" +#line 3507 "fe/idl.tab.cpp" break; case 73: /* interface_header: IDL_LOCAL interface_decl inheritance_spec */ -#line 1039 "fe/idl.ypp" +#line 1043 "fe/idl.ypp" { idl_global->set_parse_state (IDL_GlobalData::PS_InheritSpecSeen); @@ -3523,11 +3536,11 @@ yyparse (void) (yyvsp[0].nlval) = 0; } } -#line 3539 "fe/idl.tab.cpp" +#line 3540 "fe/idl.tab.cpp" break; case 74: /* interface_header: IDL_ABSTRACT interface_decl inheritance_spec */ -#line 1069 "fe/idl.ypp" +#line 1073 "fe/idl.ypp" { idl_global->set_parse_state (IDL_GlobalData::PS_InheritSpecSeen); @@ -3556,45 +3569,45 @@ yyparse (void) (yyvsp[0].nlval) = 0; } } -#line 3572 "fe/idl.tab.cpp" +#line 3573 "fe/idl.tab.cpp" break; case 75: /* $@33: %empty */ -#line 1101 "fe/idl.ypp" +#line 1105 "fe/idl.ypp" { idl_global->set_parse_state (IDL_GlobalData::PS_InheritColonSeen); } -#line 3580 "fe/idl.tab.cpp" +#line 3581 "fe/idl.tab.cpp" break; case 76: /* inheritance_spec: ':' opt_truncatable $@33 at_least_one_scoped_name */ -#line 1105 "fe/idl.ypp" +#line 1109 "fe/idl.ypp" { (yyvsp[0].nlval)->truncatable ((yyvsp[-2].bval)); (yyval.nlval) = (yyvsp[0].nlval); } -#line 3589 "fe/idl.tab.cpp" +#line 3590 "fe/idl.tab.cpp" break; case 77: /* inheritance_spec: %empty */ -#line 1110 "fe/idl.ypp" +#line 1114 "fe/idl.ypp" { (yyval.nlval) = 0; } -#line 3597 "fe/idl.tab.cpp" +#line 3598 "fe/idl.tab.cpp" break; case 82: /* valuetype: IDL_CUSTOM value_concrete_decl */ -#line 1124 "fe/idl.ypp" +#line 1128 "fe/idl.ypp" { idl_global->err ()->unsupported_error ("custom is not supported"); (yyval.dcval) = (yyvsp[0].dcval); } -#line 3606 "fe/idl.tab.cpp" +#line 3607 "fe/idl.tab.cpp" break; case 84: /* @34: %empty */ -#line 1133 "fe/idl.ypp" +#line 1137 "fe/idl.ypp" { FE_OBVHeader *&valuetype_header = (yyvsp[0].vhval); UTL_Scope *scope = idl_global->scopes ().top_non_null (); @@ -3641,27 +3654,27 @@ yyparse (void) (yyval.dcval) = valuetype; } -#line 3657 "fe/idl.tab.cpp" +#line 3658 "fe/idl.tab.cpp" break; case 85: /* $@35: %empty */ -#line 1180 "fe/idl.ypp" +#line 1184 "fe/idl.ypp" { idl_global->set_parse_state (IDL_GlobalData::PS_ValueTypeSqSeen); } -#line 3665 "fe/idl.tab.cpp" +#line 3666 "fe/idl.tab.cpp" break; case 86: /* $@36: %empty */ -#line 1184 "fe/idl.ypp" +#line 1188 "fe/idl.ypp" { idl_global->set_parse_state (IDL_GlobalData::PS_ValueTypeBodySeen); } -#line 3673 "fe/idl.tab.cpp" +#line 3674 "fe/idl.tab.cpp" break; case 87: /* value_concrete_decl: value_header @34 '{' $@35 value_elements $@36 '}' */ -#line 1188 "fe/idl.ypp" +#line 1192 "fe/idl.ypp" { idl_global->set_parse_state (IDL_GlobalData::PS_ValueTypeQsSeen); @@ -3682,11 +3695,11 @@ yyparse (void) (yyval.dcval) = (yyvsp[-5].dcval); } -#line 3698 "fe/idl.tab.cpp" +#line 3699 "fe/idl.tab.cpp" break; case 88: /* $@37: %empty */ -#line 1213 "fe/idl.ypp" +#line 1217 "fe/idl.ypp" { UTL_Scope *s = idl_global->scopes ().top_non_null (); AST_ValueType *v = 0; @@ -3729,27 +3742,27 @@ yyparse (void) */ idl_global->scopes ().push (v); } -#line 3745 "fe/idl.tab.cpp" +#line 3746 "fe/idl.tab.cpp" break; case 89: /* $@38: %empty */ -#line 1256 "fe/idl.ypp" +#line 1260 "fe/idl.ypp" { idl_global->set_parse_state (IDL_GlobalData::PS_ValueTypeSqSeen); } -#line 3753 "fe/idl.tab.cpp" +#line 3754 "fe/idl.tab.cpp" break; case 90: /* $@39: %empty */ -#line 1260 "fe/idl.ypp" +#line 1264 "fe/idl.ypp" { idl_global->set_parse_state (IDL_GlobalData::PS_ValueTypeBodySeen); } -#line 3761 "fe/idl.tab.cpp" +#line 3762 "fe/idl.tab.cpp" break; case 91: /* value_abs_decl: IDL_ABSTRACT value_header $@37 '{' $@38 exports $@39 '}' */ -#line 1264 "fe/idl.ypp" +#line 1268 "fe/idl.ypp" { idl_global->set_parse_state (IDL_GlobalData::PS_ValueTypeQsSeen); @@ -3760,19 +3773,19 @@ yyparse (void) (yyval.dcval) = 0; } -#line 3776 "fe/idl.tab.cpp" +#line 3777 "fe/idl.tab.cpp" break; case 92: /* $@40: %empty */ -#line 1279 "fe/idl.ypp" +#line 1283 "fe/idl.ypp" { idl_global->set_parse_state (IDL_GlobalData::PS_InheritSpecSeen); } -#line 3784 "fe/idl.tab.cpp" +#line 3785 "fe/idl.tab.cpp" break; case 93: /* value_header: value_decl inheritance_spec $@40 supports_spec */ -#line 1283 "fe/idl.ypp" +#line 1287 "fe/idl.ypp" { idl_global->set_parse_state (IDL_GlobalData::PS_SupportSpecSeen); @@ -3803,60 +3816,60 @@ yyparse (void) (yyvsp[-2].nlval) = 0; } } -#line 3819 "fe/idl.tab.cpp" +#line 3820 "fe/idl.tab.cpp" break; case 94: /* $@41: %empty */ -#line 1317 "fe/idl.ypp" +#line 1321 "fe/idl.ypp" { idl_global->set_parse_state (IDL_GlobalData::PS_ValueTypeSeen); } -#line 3827 "fe/idl.tab.cpp" +#line 3828 "fe/idl.tab.cpp" break; case 95: /* value_decl: IDL_VALUETYPE $@41 defining_id */ -#line 1321 "fe/idl.ypp" +#line 1325 "fe/idl.ypp" { idl_global->set_parse_state (IDL_GlobalData::PS_ValueTypeIDSeen); (yyval.idval) = (yyvsp[0].idval); } -#line 3836 "fe/idl.tab.cpp" +#line 3837 "fe/idl.tab.cpp" break; case 96: /* opt_truncatable: IDL_TRUNCATABLE */ -#line 1329 "fe/idl.ypp" +#line 1333 "fe/idl.ypp" { (yyval.bval) = true; } -#line 3844 "fe/idl.tab.cpp" +#line 3845 "fe/idl.tab.cpp" break; case 97: /* opt_truncatable: %empty */ -#line 1333 "fe/idl.ypp" +#line 1337 "fe/idl.ypp" { (yyval.bval) = false; } -#line 3852 "fe/idl.tab.cpp" +#line 3853 "fe/idl.tab.cpp" break; case 98: /* supports_spec: IDL_SUPPORTS at_least_one_scoped_name */ -#line 1341 "fe/idl.ypp" +#line 1345 "fe/idl.ypp" { (yyval.nlval) = (yyvsp[0].nlval); } -#line 3860 "fe/idl.tab.cpp" +#line 3861 "fe/idl.tab.cpp" break; case 99: /* supports_spec: %empty */ -#line 1345 "fe/idl.ypp" +#line 1349 "fe/idl.ypp" { (yyval.nlval) = 0; } -#line 3868 "fe/idl.tab.cpp" +#line 3869 "fe/idl.tab.cpp" break; case 100: /* value_forward_decl: IDL_ABSTRACT value_decl */ -#line 1353 "fe/idl.ypp" +#line 1357 "fe/idl.ypp" { UTL_Scope *s = idl_global->scopes ().top_non_null (); UTL_ScopedName n ((yyvsp[0].idval), @@ -3879,11 +3892,11 @@ yyparse (void) delete (yyvsp[0].idval); (yyvsp[0].idval) = 0; } -#line 3895 "fe/idl.tab.cpp" +#line 3896 "fe/idl.tab.cpp" break; case 101: /* value_forward_decl: value_decl */ -#line 1377 "fe/idl.ypp" +#line 1381 "fe/idl.ypp" { UTL_Scope *s = idl_global->scopes ().top_non_null (); UTL_ScopedName n ((yyvsp[0].idval), @@ -3908,11 +3921,11 @@ yyparse (void) (yyval.dcval) = 0; } -#line 3924 "fe/idl.tab.cpp" +#line 3925 "fe/idl.tab.cpp" break; case 102: /* value_box_decl: value_decl type_spec */ -#line 1405 "fe/idl.ypp" +#line 1409 "fe/idl.ypp" { idl_global->set_parse_state (IDL_GlobalData::PS_ValueBoxDeclSeen); @@ -3975,11 +3988,11 @@ yyparse (void) (yyval.dcval) = 0; } -#line 3991 "fe/idl.tab.cpp" +#line 3992 "fe/idl.tab.cpp" break; case 103: /* value_elements: value_elements at_least_one_annotation value_element */ -#line 1471 "fe/idl.ypp" +#line 1475 "fe/idl.ypp" { AST_Annotation_Appls *&annotations = (yyvsp[-1].annotations_val); AST_Decls *&decls = (yyvsp[0].decls_val); @@ -3998,19 +4011,19 @@ yyparse (void) delete annotations; delete decls; } -#line 4014 "fe/idl.tab.cpp" +#line 4015 "fe/idl.tab.cpp" break; case 104: /* value_elements: value_elements value_element */ -#line 1490 "fe/idl.ypp" +#line 1494 "fe/idl.ypp" { delete (yyvsp[0].decls_val); } -#line 4022 "fe/idl.tab.cpp" +#line 4023 "fe/idl.tab.cpp" break; case 107: /* value_element: export */ -#line 1499 "fe/idl.ypp" +#line 1503 "fe/idl.ypp" { AST_Decl *&node = (yyvsp[0].dcval); AST_Decls *value = 0; @@ -4021,11 +4034,11 @@ yyparse (void) } (yyval.decls_val) = value; } -#line 4037 "fe/idl.tab.cpp" +#line 4038 "fe/idl.tab.cpp" break; case 108: /* @42: %empty */ -#line 1510 "fe/idl.ypp" +#line 1514 "fe/idl.ypp" { AST_Decl *&node = (yyvsp[0].dcval); AST_Decls *value = 0; @@ -4036,35 +4049,35 @@ yyparse (void) } (yyval.decls_val) = value; } -#line 4052 "fe/idl.tab.cpp" +#line 4053 "fe/idl.tab.cpp" break; case 109: /* value_element: init_decl @42 ';' */ -#line 1521 "fe/idl.ypp" +#line 1525 "fe/idl.ypp" { (yyval.decls_val) = (yyvsp[-1].decls_val); } -#line 4060 "fe/idl.tab.cpp" +#line 4061 "fe/idl.tab.cpp" break; case 110: /* visibility: IDL_PUBLIC */ -#line 1528 "fe/idl.ypp" +#line 1532 "fe/idl.ypp" { (yyval.vival) = AST_Field::vis_PUBLIC; } -#line 4068 "fe/idl.tab.cpp" +#line 4069 "fe/idl.tab.cpp" break; case 111: /* visibility: IDL_PRIVATE */ -#line 1532 "fe/idl.ypp" +#line 1536 "fe/idl.ypp" { (yyval.vival) = AST_Field::vis_PRIVATE; } -#line 4076 "fe/idl.tab.cpp" +#line 4077 "fe/idl.tab.cpp" break; case 112: /* state_member: visibility member_i */ -#line 1539 "fe/idl.ypp" +#line 1543 "fe/idl.ypp" { AST_Field::Visibility &visibility = (yyvsp[-1].vival); AST_Decls *&decls_ptr = (yyvsp[0].decls_val); @@ -4082,11 +4095,11 @@ yyparse (void) } (yyval.decls_val) = decls_ptr; } -#line 4098 "fe/idl.tab.cpp" +#line 4099 "fe/idl.tab.cpp" break; case 115: /* at_least_one_export: exports at_least_one_annotation export */ -#line 1565 "fe/idl.ypp" +#line 1569 "fe/idl.ypp" { AST_Annotation_Appls *annotations = (yyvsp[-1].annotations_val); AST_Decl *d = (yyvsp[0].dcval); @@ -4101,160 +4114,160 @@ yyparse (void) } delete annotations; } -#line 4117 "fe/idl.tab.cpp" +#line 4118 "fe/idl.tab.cpp" break; case 117: /* $@43: %empty */ -#line 1584 "fe/idl.ypp" +#line 1588 "fe/idl.ypp" { idl_global->set_parse_state (IDL_GlobalData::PS_TypeDeclSeen); } -#line 4125 "fe/idl.tab.cpp" +#line 4126 "fe/idl.tab.cpp" break; case 118: /* export: type_dcl $@43 ';' */ -#line 1588 "fe/idl.ypp" +#line 1592 "fe/idl.ypp" { idl_global->set_parse_state (IDL_GlobalData::PS_NoState); } -#line 4133 "fe/idl.tab.cpp" +#line 4134 "fe/idl.tab.cpp" break; case 119: /* $@44: %empty */ -#line 1592 "fe/idl.ypp" +#line 1596 "fe/idl.ypp" { idl_global->set_parse_state (IDL_GlobalData::PS_TypeIdDeclSeen); } -#line 4141 "fe/idl.tab.cpp" +#line 4142 "fe/idl.tab.cpp" break; case 120: /* export: typeid_dcl $@44 ';' */ -#line 1596 "fe/idl.ypp" +#line 1600 "fe/idl.ypp" { idl_global->set_parse_state (IDL_GlobalData::PS_NoState); } -#line 4149 "fe/idl.tab.cpp" +#line 4150 "fe/idl.tab.cpp" break; case 121: /* $@45: %empty */ -#line 1600 "fe/idl.ypp" +#line 1604 "fe/idl.ypp" { idl_global->set_parse_state (IDL_GlobalData::PS_TypePrefixDeclSeen); } -#line 4157 "fe/idl.tab.cpp" +#line 4158 "fe/idl.tab.cpp" break; case 122: /* export: typeprefix_dcl $@45 ';' */ -#line 1604 "fe/idl.ypp" +#line 1608 "fe/idl.ypp" { idl_global->set_parse_state (IDL_GlobalData::PS_NoState); } -#line 4165 "fe/idl.tab.cpp" +#line 4166 "fe/idl.tab.cpp" break; case 123: /* $@46: %empty */ -#line 1608 "fe/idl.ypp" +#line 1612 "fe/idl.ypp" { idl_global->set_parse_state (IDL_GlobalData::PS_ConstDeclSeen); } -#line 4173 "fe/idl.tab.cpp" +#line 4174 "fe/idl.tab.cpp" break; case 124: /* export: const_dcl $@46 ';' */ -#line 1612 "fe/idl.ypp" +#line 1616 "fe/idl.ypp" { idl_global->set_parse_state (IDL_GlobalData::PS_NoState); } -#line 4181 "fe/idl.tab.cpp" +#line 4182 "fe/idl.tab.cpp" break; case 125: /* $@47: %empty */ -#line 1616 "fe/idl.ypp" +#line 1620 "fe/idl.ypp" { idl_global->set_parse_state (IDL_GlobalData::PS_ExceptDeclSeen); } -#line 4189 "fe/idl.tab.cpp" +#line 4190 "fe/idl.tab.cpp" break; case 126: /* export: exception $@47 ';' */ -#line 1620 "fe/idl.ypp" +#line 1624 "fe/idl.ypp" { idl_global->set_parse_state (IDL_GlobalData::PS_NoState); } -#line 4197 "fe/idl.tab.cpp" +#line 4198 "fe/idl.tab.cpp" break; case 127: /* $@48: %empty */ -#line 1624 "fe/idl.ypp" +#line 1628 "fe/idl.ypp" { idl_global->set_parse_state (IDL_GlobalData::PS_AttrDeclSeen); } -#line 4205 "fe/idl.tab.cpp" +#line 4206 "fe/idl.tab.cpp" break; case 128: /* export: attribute $@48 ';' */ -#line 1628 "fe/idl.ypp" +#line 1632 "fe/idl.ypp" { idl_global->set_parse_state (IDL_GlobalData::PS_NoState); } -#line 4213 "fe/idl.tab.cpp" +#line 4214 "fe/idl.tab.cpp" break; case 129: /* $@49: %empty */ -#line 1632 "fe/idl.ypp" +#line 1636 "fe/idl.ypp" { idl_global->set_parse_state (IDL_GlobalData::PS_OpDeclSeen); } -#line 4221 "fe/idl.tab.cpp" +#line 4222 "fe/idl.tab.cpp" break; case 130: /* export: operation $@49 ';' */ -#line 1636 "fe/idl.ypp" +#line 1640 "fe/idl.ypp" { idl_global->set_parse_state (IDL_GlobalData::PS_NoState); } -#line 4229 "fe/idl.tab.cpp" +#line 4230 "fe/idl.tab.cpp" break; case 131: /* $@50: %empty */ -#line 1640 "fe/idl.ypp" +#line 1644 "fe/idl.ypp" { idl_global->err ()->syntax_error (idl_global->parse_state ()); } -#line 4237 "fe/idl.tab.cpp" +#line 4238 "fe/idl.tab.cpp" break; case 132: /* export: error $@50 ';' */ -#line 1644 "fe/idl.ypp" +#line 1648 "fe/idl.ypp" { idl_global->set_parse_state (IDL_GlobalData::PS_NoState); yyerrok; (yyval.dcval) = 0; } -#line 4247 "fe/idl.tab.cpp" +#line 4248 "fe/idl.tab.cpp" break; case 133: /* at_least_one_scoped_name: scoped_name scoped_names */ -#line 1653 "fe/idl.ypp" +#line 1657 "fe/idl.ypp" { ACE_NEW_RETURN ((yyval.nlval), UTL_NameList ((yyvsp[-1].idlist), (yyvsp[0].nlval)), 1); } -#line 4258 "fe/idl.tab.cpp" +#line 4259 "fe/idl.tab.cpp" break; case 134: /* $@51: %empty */ -#line 1664 "fe/idl.ypp" +#line 1668 "fe/idl.ypp" { idl_global->set_parse_state (IDL_GlobalData::PS_SNListCommaSeen); } -#line 4266 "fe/idl.tab.cpp" +#line 4267 "fe/idl.tab.cpp" break; case 135: /* scoped_names: scoped_names ',' $@51 scoped_name */ -#line 1668 "fe/idl.ypp" +#line 1672 "fe/idl.ypp" { idl_global->set_parse_state (IDL_GlobalData::PS_ScopedNameSeen); @@ -4274,19 +4287,19 @@ yyparse (void) (yyval.nlval) = (yyvsp[-3].nlval); } } -#line 4290 "fe/idl.tab.cpp" +#line 4291 "fe/idl.tab.cpp" break; case 136: /* scoped_names: %empty */ -#line 1688 "fe/idl.ypp" +#line 1692 "fe/idl.ypp" { (yyval.nlval) = 0; } -#line 4298 "fe/idl.tab.cpp" +#line 4299 "fe/idl.tab.cpp" break; case 137: /* scoped_name: id */ -#line 1695 "fe/idl.ypp" +#line 1699 "fe/idl.ypp" { idl_global->set_parse_state (IDL_GlobalData::PS_SN_IDSeen); @@ -4295,19 +4308,19 @@ yyparse (void) 0), 1); } -#line 4311 "fe/idl.tab.cpp" +#line 4312 "fe/idl.tab.cpp" break; case 138: /* $@52: %empty */ -#line 1704 "fe/idl.ypp" +#line 1708 "fe/idl.ypp" { idl_global->set_parse_state (IDL_GlobalData::PS_ScopeDelimSeen); } -#line 4319 "fe/idl.tab.cpp" +#line 4320 "fe/idl.tab.cpp" break; case 139: /* scoped_name: IDL_SCOPE_DELIMITOR $@52 id */ -#line 1708 "fe/idl.ypp" +#line 1712 "fe/idl.ypp" { idl_global->set_parse_state (IDL_GlobalData::PS_SN_IDSeen); @@ -4327,11 +4340,11 @@ yyparse (void) sn), 1); } -#line 4343 "fe/idl.tab.cpp" +#line 4344 "fe/idl.tab.cpp" break; case 140: /* $@53: %empty */ -#line 1729 "fe/idl.ypp" +#line 1733 "fe/idl.ypp" { idl_global->set_parse_state (IDL_GlobalData::PS_ScopeDelimSeen); @@ -4341,11 +4354,11 @@ yyparse (void) ACE::strdelete ((yyvsp[0].strval)); (yyvsp[0].strval) = 0; } -#line 4357 "fe/idl.tab.cpp" +#line 4358 "fe/idl.tab.cpp" break; case 141: /* scoped_name: scoped_name IDL_SCOPE_DELIMITOR $@53 id */ -#line 1739 "fe/idl.ypp" +#line 1743 "fe/idl.ypp" { idl_global->set_parse_state (IDL_GlobalData::PS_SN_IDSeen); @@ -4357,11 +4370,11 @@ yyparse (void) (yyvsp[-3].idlist)->nconc (sn); (yyval.idlist) = (yyvsp[-3].idlist); } -#line 4373 "fe/idl.tab.cpp" +#line 4374 "fe/idl.tab.cpp" break; case 142: /* id: IDENTIFIER */ -#line 1753 "fe/idl.ypp" +#line 1757 "fe/idl.ypp" { ACE_NEW_RETURN ((yyval.idval), Identifier ((yyvsp[0].strval)), @@ -4369,11 +4382,11 @@ yyparse (void) ACE::strdelete ((yyvsp[0].strval)); (yyvsp[0].strval) = 0; } -#line 4385 "fe/idl.tab.cpp" +#line 4386 "fe/idl.tab.cpp" break; case 143: /* defining_id: IDENTIFIER */ -#line 1763 "fe/idl.ypp" +#line 1767 "fe/idl.ypp" { /* defining_id is a defining identifier whereas id is usually a reference to a defining identifier */ @@ -4381,11 +4394,11 @@ yyparse (void) ACE::strdelete ((yyvsp[0].strval)); (yyvsp[0].strval) = 0; } -#line 4397 "fe/idl.tab.cpp" +#line 4398 "fe/idl.tab.cpp" break; case 144: /* interface_forward: interface_decl */ -#line 1774 "fe/idl.ypp" +#line 1778 "fe/idl.ypp" { UTL_Scope *s = idl_global->scopes ().top_non_null (); UTL_ScopedName n ((yyvsp[0].idval), 0); @@ -4428,11 +4441,11 @@ yyparse (void) delete (yyvsp[0].idval); (yyvsp[0].idval) = 0; } -#line 4444 "fe/idl.tab.cpp" +#line 4445 "fe/idl.tab.cpp" break; case 145: /* interface_forward: IDL_LOCAL interface_decl */ -#line 1818 "fe/idl.ypp" +#line 1822 "fe/idl.ypp" { UTL_Scope *s = idl_global->scopes ().top_non_null (); UTL_ScopedName n ((yyvsp[0].idval), @@ -4458,11 +4471,11 @@ yyparse (void) delete (yyvsp[0].idval); (yyvsp[0].idval) = 0; } -#line 4474 "fe/idl.tab.cpp" +#line 4475 "fe/idl.tab.cpp" break; case 146: /* interface_forward: IDL_ABSTRACT interface_decl */ -#line 1845 "fe/idl.ypp" +#line 1849 "fe/idl.ypp" { UTL_Scope *s = idl_global->scopes ().top_non_null (); UTL_ScopedName n ((yyvsp[0].idval), @@ -4490,43 +4503,43 @@ yyparse (void) (yyval.dcval) = dynamic_cast (f); } -#line 4506 "fe/idl.tab.cpp" +#line 4507 "fe/idl.tab.cpp" break; case 147: /* $@54: %empty */ -#line 1876 "fe/idl.ypp" +#line 1880 "fe/idl.ypp" { idl_global->set_parse_state (IDL_GlobalData::PS_ConstSeen); } -#line 4514 "fe/idl.tab.cpp" +#line 4515 "fe/idl.tab.cpp" break; case 148: /* $@55: %empty */ -#line 1880 "fe/idl.ypp" +#line 1884 "fe/idl.ypp" { idl_global->set_parse_state (IDL_GlobalData::PS_ConstTypeSeen); } -#line 4522 "fe/idl.tab.cpp" +#line 4523 "fe/idl.tab.cpp" break; case 149: /* $@56: %empty */ -#line 1884 "fe/idl.ypp" +#line 1888 "fe/idl.ypp" { idl_global->set_parse_state (IDL_GlobalData::PS_ConstIDSeen); } -#line 4530 "fe/idl.tab.cpp" +#line 4531 "fe/idl.tab.cpp" break; case 150: /* $@57: %empty */ -#line 1888 "fe/idl.ypp" +#line 1892 "fe/idl.ypp" { idl_global->set_parse_state (IDL_GlobalData::PS_ConstAssignSeen); } -#line 4538 "fe/idl.tab.cpp" +#line 4539 "fe/idl.tab.cpp" break; case 151: /* const_dcl: IDL_CONST $@54 const_type $@55 defining_id $@56 '=' $@57 expression */ -#line 1892 "fe/idl.ypp" +#line 1896 "fe/idl.ypp" { (yyval.dcval) = 0; UTL_ScopedName n ((yyvsp[-4].idval), 0); @@ -4582,27 +4595,27 @@ yyparse (void) delete (yyvsp[-4].idval); (yyvsp[-4].idval) = 0; } -#line 4598 "fe/idl.tab.cpp" +#line 4599 "fe/idl.tab.cpp" break; case 158: /* const_type: string_type_spec */ -#line 1957 "fe/idl.ypp" +#line 1961 "fe/idl.ypp" { (yyval.etval) = AST_Expression::EV_string; } -#line 4606 "fe/idl.tab.cpp" +#line 4607 "fe/idl.tab.cpp" break; case 159: /* const_type: wstring_type_spec */ -#line 1961 "fe/idl.ypp" +#line 1965 "fe/idl.ypp" { (yyval.etval) = AST_Expression::EV_wstring; } -#line 4614 "fe/idl.tab.cpp" +#line 4615 "fe/idl.tab.cpp" break; case 160: /* const_type: scoped_name */ -#line 1965 "fe/idl.ypp" +#line 1969 "fe/idl.ypp" { UTL_Scope *s = idl_global->scopes ().top_non_null (); AST_PredefinedType *c = 0; @@ -4668,11 +4681,11 @@ yyparse (void) sn = 0; (yyvsp[0].idlist) = 0; } -#line 4684 "fe/idl.tab.cpp" +#line 4685 "fe/idl.tab.cpp" break; case 164: /* or_expr: or_expr '|' xor_expr */ -#line 2038 "fe/idl.ypp" +#line 2042 "fe/idl.ypp" { (yyval.exval) = idl_global->gen ()->create_expr ( @@ -4681,11 +4694,11 @@ yyparse (void) (yyvsp[0].exval) ); } -#line 4697 "fe/idl.tab.cpp" +#line 4698 "fe/idl.tab.cpp" break; case 166: /* xor_expr: xor_expr '^' and_expr */ -#line 2051 "fe/idl.ypp" +#line 2055 "fe/idl.ypp" { (yyval.exval) = idl_global->gen ()->create_expr ( @@ -4694,11 +4707,11 @@ yyparse (void) (yyvsp[0].exval) ); } -#line 4710 "fe/idl.tab.cpp" +#line 4711 "fe/idl.tab.cpp" break; case 168: /* and_expr: and_expr '&' shift_expr */ -#line 2064 "fe/idl.ypp" +#line 2068 "fe/idl.ypp" { (yyval.exval) = idl_global->gen ()->create_expr ( @@ -4707,11 +4720,11 @@ yyparse (void) (yyvsp[0].exval) ); } -#line 4723 "fe/idl.tab.cpp" +#line 4724 "fe/idl.tab.cpp" break; case 170: /* shift_expr: shift_expr IDL_LEFT_SHIFT add_expr */ -#line 2077 "fe/idl.ypp" +#line 2081 "fe/idl.ypp" { (yyval.exval) = idl_global->gen ()->create_expr ( @@ -4720,11 +4733,11 @@ yyparse (void) (yyvsp[0].exval) ); } -#line 4736 "fe/idl.tab.cpp" +#line 4737 "fe/idl.tab.cpp" break; case 171: /* shift_expr: shift_expr IDL_RIGHT_SHIFT add_expr */ -#line 2086 "fe/idl.ypp" +#line 2090 "fe/idl.ypp" { (yyval.exval) = idl_global->gen ()->create_expr ( @@ -4733,11 +4746,11 @@ yyparse (void) (yyvsp[0].exval) ); } -#line 4749 "fe/idl.tab.cpp" +#line 4750 "fe/idl.tab.cpp" break; case 173: /* add_expr: add_expr '+' mult_expr */ -#line 2099 "fe/idl.ypp" +#line 2103 "fe/idl.ypp" { (yyval.exval) = idl_global->gen ()->create_expr ( @@ -4746,11 +4759,11 @@ yyparse (void) (yyvsp[0].exval) ); } -#line 4762 "fe/idl.tab.cpp" +#line 4763 "fe/idl.tab.cpp" break; case 174: /* add_expr: add_expr '-' mult_expr */ -#line 2108 "fe/idl.ypp" +#line 2112 "fe/idl.ypp" { (yyval.exval) = idl_global->gen ()->create_expr ( @@ -4759,11 +4772,11 @@ yyparse (void) (yyvsp[0].exval) ); } -#line 4775 "fe/idl.tab.cpp" +#line 4776 "fe/idl.tab.cpp" break; case 176: /* mult_expr: mult_expr '*' unary_expr */ -#line 2121 "fe/idl.ypp" +#line 2125 "fe/idl.ypp" { (yyval.exval) = idl_global->gen ()->create_expr ( @@ -4772,11 +4785,11 @@ yyparse (void) (yyvsp[0].exval) ); } -#line 4788 "fe/idl.tab.cpp" +#line 4789 "fe/idl.tab.cpp" break; case 177: /* mult_expr: mult_expr '/' unary_expr */ -#line 2130 "fe/idl.ypp" +#line 2134 "fe/idl.ypp" { (yyval.exval) = idl_global->gen ()->create_expr ( @@ -4785,11 +4798,11 @@ yyparse (void) (yyvsp[0].exval) ); } -#line 4801 "fe/idl.tab.cpp" +#line 4802 "fe/idl.tab.cpp" break; case 178: /* mult_expr: mult_expr '%' unary_expr */ -#line 2139 "fe/idl.ypp" +#line 2143 "fe/idl.ypp" { (yyval.exval) = idl_global->gen ()->create_expr ( @@ -4798,11 +4811,11 @@ yyparse (void) (yyvsp[0].exval) ); } -#line 4814 "fe/idl.tab.cpp" +#line 4815 "fe/idl.tab.cpp" break; case 180: /* unary_expr: '+' primary_expr */ -#line 2152 "fe/idl.ypp" +#line 2156 "fe/idl.ypp" { (yyval.exval) = idl_global->gen ()->create_expr ( @@ -4811,11 +4824,11 @@ yyparse (void) 0 ); } -#line 4827 "fe/idl.tab.cpp" +#line 4828 "fe/idl.tab.cpp" break; case 181: /* unary_expr: '-' primary_expr */ -#line 2161 "fe/idl.ypp" +#line 2165 "fe/idl.ypp" { (yyval.exval) = idl_global->gen ()->create_expr ( @@ -4824,11 +4837,11 @@ yyparse (void) 0 ); } -#line 4840 "fe/idl.tab.cpp" +#line 4841 "fe/idl.tab.cpp" break; case 182: /* unary_expr: '~' primary_expr */ -#line 2170 "fe/idl.ypp" +#line 2174 "fe/idl.ypp" { (yyval.exval) = idl_global->gen ()->create_expr ( @@ -4837,11 +4850,11 @@ yyparse (void) 0 ); } -#line 4853 "fe/idl.tab.cpp" +#line 4854 "fe/idl.tab.cpp" break; case 183: /* primary_expr: scoped_name */ -#line 2182 "fe/idl.ypp" +#line 2186 "fe/idl.ypp" { UTL_ScopedName *name = (yyvsp[0].idlist); @@ -4898,107 +4911,107 @@ yyparse (void) delete name; (yyvsp[0].idlist) = name = 0; } -#line 4914 "fe/idl.tab.cpp" +#line 4915 "fe/idl.tab.cpp" break; case 185: /* primary_expr: '(' const_expr ')' */ -#line 2240 "fe/idl.ypp" +#line 2244 "fe/idl.ypp" { (yyval.exval) = (yyvsp[-1].exval); } -#line 4922 "fe/idl.tab.cpp" +#line 4923 "fe/idl.tab.cpp" break; case 186: /* literal: IDL_INTEGER_LITERAL */ -#line 2247 "fe/idl.ypp" +#line 2251 "fe/idl.ypp" { (yyval.exval) = idl_global->gen ()->create_expr ((yyvsp[0].ival)); } -#line 4930 "fe/idl.tab.cpp" +#line 4931 "fe/idl.tab.cpp" break; case 187: /* literal: IDL_UINTEGER_LITERAL */ -#line 2251 "fe/idl.ypp" +#line 2255 "fe/idl.ypp" { (yyval.exval) = idl_global->gen ()->create_expr ((yyvsp[0].uival)); } -#line 4939 "fe/idl.tab.cpp" +#line 4940 "fe/idl.tab.cpp" break; case 188: /* literal: IDL_STRING_LITERAL */ -#line 2256 "fe/idl.ypp" +#line 2260 "fe/idl.ypp" { (yyval.exval) = idl_global->gen ()->create_expr ((yyvsp[0].sval)); (yyvsp[0].sval)->destroy (); delete (yyvsp[0].sval); (yyvsp[0].sval) = 0; } -#line 4950 "fe/idl.tab.cpp" +#line 4951 "fe/idl.tab.cpp" break; case 189: /* literal: IDL_WSTRING_LITERAL */ -#line 2263 "fe/idl.ypp" +#line 2267 "fe/idl.ypp" { char *wide_string = (yyvsp[0].wsval); (yyval.exval) = idl_global->gen ()->create_expr (wide_string); ACE_OS::free (wide_string); (yyvsp[0].wsval) = 0; } -#line 4961 "fe/idl.tab.cpp" +#line 4962 "fe/idl.tab.cpp" break; case 190: /* literal: IDL_CHARACTER_LITERAL */ -#line 2270 "fe/idl.ypp" +#line 2274 "fe/idl.ypp" { (yyval.exval) = idl_global->gen ()->create_expr ((yyvsp[0].cval)); } -#line 4969 "fe/idl.tab.cpp" +#line 4970 "fe/idl.tab.cpp" break; case 191: /* literal: IDL_WCHAR_LITERAL */ -#line 2274 "fe/idl.ypp" +#line 2278 "fe/idl.ypp" { ACE_OutputCDR::from_wchar wc ((yyvsp[0].wcval)); (yyval.exval) = idl_global->gen ()->create_expr (wc); } -#line 4978 "fe/idl.tab.cpp" +#line 4979 "fe/idl.tab.cpp" break; case 192: /* literal: IDL_FIXED_PT_LITERAL */ -#line 2279 "fe/idl.ypp" +#line 2283 "fe/idl.ypp" { (yyval.exval) = idl_global->gen ()->create_expr ((yyvsp[0].fixval)); } -#line 4986 "fe/idl.tab.cpp" +#line 4987 "fe/idl.tab.cpp" break; case 193: /* literal: IDL_FLOATING_PT_LITERAL */ -#line 2283 "fe/idl.ypp" +#line 2287 "fe/idl.ypp" { (yyval.exval) = idl_global->gen ()->create_expr ((yyvsp[0].dval)); } -#line 4994 "fe/idl.tab.cpp" +#line 4995 "fe/idl.tab.cpp" break; case 194: /* literal: IDL_TRUETOK */ -#line 2287 "fe/idl.ypp" +#line 2291 "fe/idl.ypp" { (yyval.exval) = idl_global->gen ()->create_expr (true); } -#line 5002 "fe/idl.tab.cpp" +#line 5003 "fe/idl.tab.cpp" break; case 195: /* literal: IDL_FALSETOK */ -#line 2291 "fe/idl.ypp" +#line 2295 "fe/idl.ypp" { (yyval.exval) = idl_global->gen ()->create_expr (false); } -#line 5010 "fe/idl.tab.cpp" +#line 5011 "fe/idl.tab.cpp" break; case 196: /* positive_int_expr: const_expr */ -#line 2298 "fe/idl.ypp" +#line 2302 "fe/idl.ypp" { int good_expression = 1; (yyvsp[0].exval)->evaluate (AST_Expression::EK_positive_int); @@ -5063,17 +5076,15 @@ yyparse (void) idl_global->err ()->syntax_error (idl_global->parse_state ()); } } -#line 5079 "fe/idl.tab.cpp" +#line 5080 "fe/idl.tab.cpp" break; case 197: /* $@58: %empty */ -#line 2366 "fe/idl.ypp" +#line 2370 "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 IDL versions before 4"); Identifier *id = (yyvsp[-1].idval); UTL_ScopedName name (id, 0); @@ -5084,11 +5095,11 @@ yyparse (void) fe_add_annotation_decl (annotation_decl); idl_global->scopes ().push (annotation_decl); } -#line 5100 "fe/idl.tab.cpp" +#line 5099 "fe/idl.tab.cpp" break; case 198: /* annotation_dcl: IDL_ANNOTATION_DECL defining_id '{' $@58 annotation_body '}' */ -#line 2383 "fe/idl.ypp" +#line 2385 "fe/idl.ypp" { Identifier *id = (yyvsp[-4].idval); idl_global->scopes ().pop (); @@ -5097,20 +5108,20 @@ yyparse (void) (yyval.dcval) = 0; } -#line 5113 "fe/idl.tab.cpp" +#line 5112 "fe/idl.tab.cpp" break; case 204: /* $@59: %empty */ -#line 2403 "fe/idl.ypp" +#line 2405 "fe/idl.ypp" { idl_global->set_parse_state (IDL_GlobalData::PS_TypedefSeen); idl_global->in_typedef (true); } -#line 5122 "fe/idl.tab.cpp" +#line 5121 "fe/idl.tab.cpp" break; case 208: /* annotation_member: annotation_member_type defining_id annotation_member_default ';' */ -#line 2417 "fe/idl.ypp" +#line 2419 "fe/idl.ypp" { UTL_Scope *scope = idl_global->scopes ().top_non_null (); UTL_Scope *root = idl_global->scopes ().bottom (); @@ -5163,27 +5174,27 @@ yyparse (void) delete result; } } -#line 5179 "fe/idl.tab.cpp" +#line 5178 "fe/idl.tab.cpp" break; case 209: /* annotation_member_default: IDL_DEFAULT const_expr */ -#line 2473 "fe/idl.ypp" +#line 2475 "fe/idl.ypp" { (yyval.exval) = (yyvsp[0].exval); } -#line 5187 "fe/idl.tab.cpp" +#line 5186 "fe/idl.tab.cpp" break; case 210: /* annotation_member_default: %empty */ -#line 2477 "fe/idl.ypp" +#line 2479 "fe/idl.ypp" { (yyval.exval) = 0; } -#line 5195 "fe/idl.tab.cpp" +#line 5194 "fe/idl.tab.cpp" break; case 211: /* at_least_one_annotation: annotations_maybe annotation_appl */ -#line 2484 "fe/idl.ypp" +#line 2486 "fe/idl.ypp" { AST_Annotation_Appls *annotations = (yyvsp[-1].annotations_val); AST_Annotation_Appl *annotation = (yyvsp[0].annotation_val); @@ -5193,11 +5204,11 @@ yyparse (void) } (yyval.annotations_val) = annotations; } -#line 5209 "fe/idl.tab.cpp" +#line 5208 "fe/idl.tab.cpp" break; case 212: /* annotations_maybe: annotations_maybe annotation_appl */ -#line 2497 "fe/idl.ypp" +#line 2499 "fe/idl.ypp" { AST_Annotation_Appls *annotations = (yyvsp[-1].annotations_val); AST_Annotation_Appl *annotation = (yyvsp[0].annotation_val); @@ -5207,25 +5218,23 @@ yyparse (void) } (yyval.annotations_val) = annotations; } -#line 5223 "fe/idl.tab.cpp" +#line 5222 "fe/idl.tab.cpp" break; case 213: /* annotations_maybe: %empty */ -#line 2507 "fe/idl.ypp" +#line 2509 "fe/idl.ypp" { (yyval.annotations_val) = new AST_Annotation_Appls (); } -#line 5231 "fe/idl.tab.cpp" +#line 5230 "fe/idl.tab.cpp" break; case 214: /* @60: %empty */ -#line 2514 "fe/idl.ypp" +#line 2516 "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 IDL versions before 4"); AST_Annotation_Decl *decl = 0; UTL_ScopedName *name = (yyvsp[0].idlist); @@ -5276,7 +5285,7 @@ yyparse (void) (yyval.annotation_decl_val) = decl; } -#line 5292 "fe/idl.tab.cpp" +#line 5289 "fe/idl.tab.cpp" break; case 215: /* annotation_appl: IDL_ANNOTATION_SYMBOL scoped_name @60 annotation_appl_params_maybe */ @@ -5308,7 +5317,7 @@ yyparse (void) (yyval.annotation_val) = appl; } -#line 5324 "fe/idl.tab.cpp" +#line 5321 "fe/idl.tab.cpp" break; case 216: /* annotation_appl_params_maybe: '(' annotation_appl_params ')' */ @@ -5316,7 +5325,7 @@ yyparse (void) { (yyval.annotation_params_val) = (yyvsp[-1].annotation_params_val); } -#line 5332 "fe/idl.tab.cpp" +#line 5329 "fe/idl.tab.cpp" break; case 217: /* annotation_appl_params_maybe: %empty */ @@ -5324,7 +5333,7 @@ yyparse (void) { (yyval.annotation_params_val) = 0; } -#line 5340 "fe/idl.tab.cpp" +#line 5337 "fe/idl.tab.cpp" break; case 218: /* annotation_appl_params: const_expr */ @@ -5337,7 +5346,7 @@ yyparse (void) params->push (param); (yyval.annotation_params_val) = params; } -#line 5353 "fe/idl.tab.cpp" +#line 5350 "fe/idl.tab.cpp" break; case 219: /* annotation_appl_params: named_annotation_appl_params */ @@ -5345,39 +5354,47 @@ yyparse (void) { (yyval.annotation_params_val) = (yyvsp[0].annotation_params_val); } -#line 5361 "fe/idl.tab.cpp" +#line 5358 "fe/idl.tab.cpp" + break; + + case 220: /* annotation_appl_params: %empty */ +#line 2626 "fe/idl.ypp" + { + (yyval.annotation_params_val) = 0; + } +#line 5366 "fe/idl.tab.cpp" break; - case 220: /* named_annotation_appl_params: named_annotation_appl_param more_named_annotation_appl_params */ -#line 2629 "fe/idl.ypp" + case 221: /* named_annotation_appl_params: named_annotation_appl_param more_named_annotation_appl_params */ +#line 2633 "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 5376 "fe/idl.tab.cpp" break; - case 221: /* more_named_annotation_appl_params: ',' named_annotation_appl_param more_named_annotation_appl_params */ -#line 2637 "fe/idl.ypp" + case 222: /* more_named_annotation_appl_params: ',' named_annotation_appl_param more_named_annotation_appl_params */ +#line 2641 "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 5386 "fe/idl.tab.cpp" break; - case 222: /* more_named_annotation_appl_params: %empty */ -#line 2643 "fe/idl.ypp" + case 223: /* more_named_annotation_appl_params: %empty */ +#line 2647 "fe/idl.ypp" { (yyval.annotation_params_val) = new AST_Annotation_Appl::Params; } -#line 5389 "fe/idl.tab.cpp" +#line 5394 "fe/idl.tab.cpp" break; - case 223: /* named_annotation_appl_param: id '=' const_expr */ -#line 2650 "fe/idl.ypp" + case 224: /* named_annotation_appl_param: id '=' const_expr */ +#line 2654 "fe/idl.ypp" { AST_Annotation_Appl::Param *param = new AST_Annotation_Appl::Param; param->id = (yyvsp[-2].idval); @@ -5386,52 +5403,52 @@ yyparse (void) param->expr = (yyvsp[0].exval); (yyval.annotation_param_val) = param; } -#line 5402 "fe/idl.tab.cpp" +#line 5407 "fe/idl.tab.cpp" break; - case 224: /* $@61: %empty */ -#line 2662 "fe/idl.ypp" + case 225: /* $@61: %empty */ +#line 2666 "fe/idl.ypp" { idl_global->set_parse_state (IDL_GlobalData::PS_TypedefSeen); idl_global->in_typedef (true); } -#line 5411 "fe/idl.tab.cpp" +#line 5416 "fe/idl.tab.cpp" break; - case 225: /* type_dcl: IDL_TYPEDEF $@61 type_declarator */ -#line 2667 "fe/idl.ypp" + case 226: /* type_dcl: IDL_TYPEDEF $@61 type_declarator */ +#line 2671 "fe/idl.ypp" { (yyval.dcval) = (yyvsp[0].dcval); } -#line 5419 "fe/idl.tab.cpp" +#line 5424 "fe/idl.tab.cpp" break; - case 226: /* type_dcl: struct_type */ -#line 2671 "fe/idl.ypp" + case 227: /* type_dcl: struct_type */ +#line 2675 "fe/idl.ypp" { (yyval.dcval) = (yyvsp[0].dcval); } -#line 5427 "fe/idl.tab.cpp" +#line 5432 "fe/idl.tab.cpp" break; - case 227: /* type_dcl: union_type */ -#line 2675 "fe/idl.ypp" + case 228: /* type_dcl: union_type */ +#line 2679 "fe/idl.ypp" { (yyval.dcval) = (yyvsp[0].dcval); } -#line 5435 "fe/idl.tab.cpp" +#line 5440 "fe/idl.tab.cpp" break; - case 228: /* type_dcl: enum_type */ -#line 2679 "fe/idl.ypp" + case 229: /* type_dcl: enum_type */ +#line 2683 "fe/idl.ypp" { (yyval.dcval) = (yyvsp[0].dcval); } -#line 5443 "fe/idl.tab.cpp" +#line 5448 "fe/idl.tab.cpp" break; - case 229: /* type_dcl: IDL_NATIVE simple_declarator */ -#line 2683 "fe/idl.ypp" + case 230: /* type_dcl: IDL_NATIVE simple_declarator */ +#line 2687 "fe/idl.ypp" { UTL_Scope *s = idl_global->scopes ().top_non_null (); AST_Native *node = 0; @@ -5459,27 +5476,27 @@ yyparse (void) (yyval.dcval) = 0; } -#line 5475 "fe/idl.tab.cpp" +#line 5480 "fe/idl.tab.cpp" break; - case 230: /* type_dcl: constructed_forward_type_spec */ -#line 2711 "fe/idl.ypp" + case 231: /* type_dcl: constructed_forward_type_spec */ +#line 2715 "fe/idl.ypp" { (yyval.dcval) = 0; } -#line 5483 "fe/idl.tab.cpp" +#line 5488 "fe/idl.tab.cpp" break; - case 231: /* $@62: %empty */ -#line 2718 "fe/idl.ypp" + case 232: /* $@62: %empty */ +#line 2722 "fe/idl.ypp" { idl_global->set_parse_state (IDL_GlobalData::PS_TypeSpecSeen); } -#line 5491 "fe/idl.tab.cpp" +#line 5496 "fe/idl.tab.cpp" break; - case 232: /* type_declarator: type_spec $@62 at_least_one_declarator */ -#line 2722 "fe/idl.ypp" + case 233: /* type_declarator: type_spec $@62 at_least_one_declarator */ +#line 2726 "fe/idl.ypp" { AST_Decl *type_spec = (yyvsp[-2].dcval); UTL_DeclList *decls = (yyvsp[0].dlval); @@ -5543,22 +5560,22 @@ yyparse (void) (yyval.dcval) = t; } -#line 5559 "fe/idl.tab.cpp" +#line 5564 "fe/idl.tab.cpp" break; - case 235: /* simple_type_spec: base_type_spec */ -#line 2794 "fe/idl.ypp" + case 236: /* simple_type_spec: base_type_spec */ +#line 2798 "fe/idl.ypp" { (yyval.dcval) = idl_global->scopes ().bottom ()->lookup_primitive_type ( (yyvsp[0].etval) ); } -#line 5570 "fe/idl.tab.cpp" +#line 5575 "fe/idl.tab.cpp" break; - case 237: /* simple_type_spec: scoped_name */ -#line 2802 "fe/idl.ypp" + case 238: /* simple_type_spec: scoped_name */ +#line 2806 "fe/idl.ypp" { UTL_Scope *s = idl_global->scopes ().top_non_null (); AST_Decl *d = 0; @@ -5581,30 +5598,30 @@ yyparse (void) (yyval.dcval) = d; } -#line 5597 "fe/idl.tab.cpp" +#line 5602 "fe/idl.tab.cpp" break; - case 256: /* at_least_one_declarator: declarator declarators */ -#line 2858 "fe/idl.ypp" + case 257: /* at_least_one_declarator: declarator declarators */ +#line 2862 "fe/idl.ypp" { ACE_NEW_RETURN ((yyval.dlval), UTL_DeclList ((yyvsp[-1].deval), (yyvsp[0].dlval)), 1); } -#line 5608 "fe/idl.tab.cpp" +#line 5613 "fe/idl.tab.cpp" break; - case 257: /* $@63: %empty */ -#line 2869 "fe/idl.ypp" + case 258: /* $@63: %empty */ +#line 2873 "fe/idl.ypp" { idl_global->set_parse_state (IDL_GlobalData::PS_DeclsCommaSeen); } -#line 5616 "fe/idl.tab.cpp" +#line 5621 "fe/idl.tab.cpp" break; - case 258: /* declarators: declarators ',' $@63 declarator */ -#line 2873 "fe/idl.ypp" + case 259: /* declarators: declarators ',' $@63 declarator */ +#line 2877 "fe/idl.ypp" { idl_global->set_parse_state (IDL_GlobalData::PS_DeclsDeclSeen); @@ -5624,38 +5641,38 @@ yyparse (void) (yyval.dlval) = (yyvsp[-3].dlval); } } -#line 5640 "fe/idl.tab.cpp" +#line 5645 "fe/idl.tab.cpp" break; - case 259: /* declarators: %empty */ -#line 2893 "fe/idl.ypp" + case 260: /* declarators: %empty */ +#line 2897 "fe/idl.ypp" { (yyval.dlval) = 0; } -#line 5648 "fe/idl.tab.cpp" +#line 5653 "fe/idl.tab.cpp" break; - case 262: /* at_least_one_simple_declarator: simple_declarator simple_declarators */ -#line 2905 "fe/idl.ypp" + case 263: /* at_least_one_simple_declarator: simple_declarator simple_declarators */ +#line 2909 "fe/idl.ypp" { ACE_NEW_RETURN ((yyval.dlval), UTL_DeclList ((yyvsp[-1].deval), (yyvsp[0].dlval)), 1); } -#line 5659 "fe/idl.tab.cpp" +#line 5664 "fe/idl.tab.cpp" break; - case 263: /* $@64: %empty */ -#line 2916 "fe/idl.ypp" + case 264: /* $@64: %empty */ +#line 2920 "fe/idl.ypp" { idl_global->set_parse_state (IDL_GlobalData::PS_DeclsCommaSeen); } -#line 5667 "fe/idl.tab.cpp" +#line 5672 "fe/idl.tab.cpp" break; - case 264: /* simple_declarators: simple_declarators ',' $@64 simple_declarator */ -#line 2920 "fe/idl.ypp" + case 265: /* simple_declarators: simple_declarators ',' $@64 simple_declarator */ +#line 2924 "fe/idl.ypp" { idl_global->set_parse_state (IDL_GlobalData::PS_DeclsDeclSeen); @@ -5675,19 +5692,19 @@ yyparse (void) (yyval.dlval) = (yyvsp[-3].dlval); } } -#line 5691 "fe/idl.tab.cpp" +#line 5696 "fe/idl.tab.cpp" break; - case 265: /* simple_declarators: %empty */ -#line 2940 "fe/idl.ypp" + case 266: /* simple_declarators: %empty */ +#line 2944 "fe/idl.ypp" { (yyval.dlval) = 0; } -#line 5699 "fe/idl.tab.cpp" +#line 5704 "fe/idl.tab.cpp" break; - case 266: /* simple_declarator: defining_id */ -#line 2947 "fe/idl.ypp" + case 267: /* simple_declarator: defining_id */ +#line 2951 "fe/idl.ypp" { UTL_ScopedName *sn = 0; ACE_NEW_RETURN (sn, @@ -5700,11 +5717,11 @@ yyparse (void) 0), 1); } -#line 5716 "fe/idl.tab.cpp" +#line 5721 "fe/idl.tab.cpp" break; - case 267: /* complex_declarator: array_declarator */ -#line 2963 "fe/idl.ypp" + case 268: /* complex_declarator: array_declarator */ +#line 2967 "fe/idl.ypp" { UTL_ScopedName *sn = 0; ACE_NEW_RETURN (sn, @@ -5719,220 +5736,220 @@ yyparse (void) (yyvsp[0].dcval)), 1); } -#line 5735 "fe/idl.tab.cpp" +#line 5740 "fe/idl.tab.cpp" break; - case 270: /* signed_int: IDL_LONG */ -#line 2986 "fe/idl.ypp" + case 271: /* signed_int: IDL_LONG */ +#line 2990 "fe/idl.ypp" { (yyval.etval) = AST_Expression::EV_long; } -#line 5743 "fe/idl.tab.cpp" +#line 5748 "fe/idl.tab.cpp" break; - case 271: /* signed_int: IDL_LONG IDL_LONG */ -#line 2990 "fe/idl.ypp" + case 272: /* signed_int: IDL_LONG IDL_LONG */ +#line 2994 "fe/idl.ypp" { (yyval.etval) = AST_Expression::EV_longlong; } -#line 5751 "fe/idl.tab.cpp" +#line 5756 "fe/idl.tab.cpp" break; - case 272: /* signed_int: IDL_SHORT */ -#line 2994 "fe/idl.ypp" + case 273: /* signed_int: IDL_SHORT */ +#line 2998 "fe/idl.ypp" { (yyval.etval) = AST_Expression::EV_short; } -#line 5759 "fe/idl.tab.cpp" +#line 5764 "fe/idl.tab.cpp" break; - case 273: /* signed_int: IDL_INT8 */ -#line 2998 "fe/idl.ypp" + case 274: /* signed_int: IDL_INT8 */ +#line 3002 "fe/idl.ypp" { (yyval.etval) = AST_Expression::EV_int8; } -#line 5767 "fe/idl.tab.cpp" +#line 5772 "fe/idl.tab.cpp" break; - case 274: /* signed_int: IDL_INT16 */ -#line 3002 "fe/idl.ypp" + case 275: /* signed_int: IDL_INT16 */ +#line 3006 "fe/idl.ypp" { (yyval.etval) = AST_Expression::EV_short; } -#line 5775 "fe/idl.tab.cpp" +#line 5780 "fe/idl.tab.cpp" break; - case 275: /* signed_int: IDL_INT32 */ -#line 3006 "fe/idl.ypp" + case 276: /* signed_int: IDL_INT32 */ +#line 3010 "fe/idl.ypp" { (yyval.etval) = AST_Expression::EV_long; } -#line 5783 "fe/idl.tab.cpp" +#line 5788 "fe/idl.tab.cpp" break; - case 276: /* signed_int: IDL_INT64 */ -#line 3010 "fe/idl.ypp" + case 277: /* signed_int: IDL_INT64 */ +#line 3014 "fe/idl.ypp" { (yyval.etval) = AST_Expression::EV_longlong; } -#line 5791 "fe/idl.tab.cpp" +#line 5796 "fe/idl.tab.cpp" break; - case 277: /* unsigned_int: IDL_UNSIGNED IDL_LONG */ -#line 3017 "fe/idl.ypp" + case 278: /* unsigned_int: IDL_UNSIGNED IDL_LONG */ +#line 3021 "fe/idl.ypp" { (yyval.etval) = AST_Expression::EV_ulong; } -#line 5799 "fe/idl.tab.cpp" +#line 5804 "fe/idl.tab.cpp" break; - case 278: /* unsigned_int: IDL_UNSIGNED IDL_LONG IDL_LONG */ -#line 3021 "fe/idl.ypp" + case 279: /* unsigned_int: IDL_UNSIGNED IDL_LONG IDL_LONG */ +#line 3025 "fe/idl.ypp" { (yyval.etval) = AST_Expression::EV_ulonglong; } -#line 5807 "fe/idl.tab.cpp" +#line 5812 "fe/idl.tab.cpp" break; - case 279: /* unsigned_int: IDL_UNSIGNED IDL_SHORT */ -#line 3025 "fe/idl.ypp" + case 280: /* unsigned_int: IDL_UNSIGNED IDL_SHORT */ +#line 3029 "fe/idl.ypp" { (yyval.etval) = AST_Expression::EV_ushort; } -#line 5815 "fe/idl.tab.cpp" +#line 5820 "fe/idl.tab.cpp" break; - case 280: /* unsigned_int: IDL_UINT8 */ -#line 3029 "fe/idl.ypp" + case 281: /* unsigned_int: IDL_UINT8 */ +#line 3033 "fe/idl.ypp" { (yyval.etval) = AST_Expression::EV_uint8; } -#line 5823 "fe/idl.tab.cpp" +#line 5828 "fe/idl.tab.cpp" break; - case 281: /* unsigned_int: IDL_UINT16 */ -#line 3033 "fe/idl.ypp" + case 282: /* unsigned_int: IDL_UINT16 */ +#line 3037 "fe/idl.ypp" { (yyval.etval) = AST_Expression::EV_ushort; } -#line 5831 "fe/idl.tab.cpp" +#line 5836 "fe/idl.tab.cpp" break; - case 282: /* unsigned_int: IDL_UINT32 */ -#line 3037 "fe/idl.ypp" + case 283: /* unsigned_int: IDL_UINT32 */ +#line 3041 "fe/idl.ypp" { (yyval.etval) = AST_Expression::EV_ulong; } -#line 5839 "fe/idl.tab.cpp" +#line 5844 "fe/idl.tab.cpp" break; - case 283: /* unsigned_int: IDL_UINT64 */ -#line 3041 "fe/idl.ypp" + case 284: /* unsigned_int: IDL_UINT64 */ +#line 3045 "fe/idl.ypp" { (yyval.etval) = AST_Expression::EV_ulonglong; } -#line 5847 "fe/idl.tab.cpp" +#line 5852 "fe/idl.tab.cpp" break; - case 284: /* floating_pt_type: IDL_DOUBLE */ -#line 3048 "fe/idl.ypp" + case 285: /* floating_pt_type: IDL_DOUBLE */ +#line 3052 "fe/idl.ypp" { (yyval.etval) = AST_Expression::EV_double; } -#line 5855 "fe/idl.tab.cpp" +#line 5860 "fe/idl.tab.cpp" break; - case 285: /* floating_pt_type: IDL_FLOAT */ -#line 3052 "fe/idl.ypp" + case 286: /* floating_pt_type: IDL_FLOAT */ +#line 3056 "fe/idl.ypp" { (yyval.etval) = AST_Expression::EV_float; } -#line 5863 "fe/idl.tab.cpp" +#line 5868 "fe/idl.tab.cpp" break; - case 286: /* floating_pt_type: IDL_LONG IDL_DOUBLE */ -#line 3056 "fe/idl.ypp" + case 287: /* floating_pt_type: IDL_LONG IDL_DOUBLE */ +#line 3060 "fe/idl.ypp" { (yyval.etval) = AST_Expression::EV_longdouble; } -#line 5871 "fe/idl.tab.cpp" +#line 5876 "fe/idl.tab.cpp" break; - case 287: /* fixed_type: IDL_FIXED */ -#line 3063 "fe/idl.ypp" + case 288: /* fixed_type: IDL_FIXED */ +#line 3067 "fe/idl.ypp" { (yyval.etval) = AST_Expression::EV_fixed; } -#line 5879 "fe/idl.tab.cpp" +#line 5884 "fe/idl.tab.cpp" break; - case 288: /* char_type: IDL_CHAR */ -#line 3070 "fe/idl.ypp" + case 289: /* char_type: IDL_CHAR */ +#line 3074 "fe/idl.ypp" { (yyval.etval) = AST_Expression::EV_char; } -#line 5887 "fe/idl.tab.cpp" +#line 5892 "fe/idl.tab.cpp" break; - case 289: /* char_type: IDL_WCHAR */ -#line 3074 "fe/idl.ypp" + case 290: /* char_type: IDL_WCHAR */ +#line 3078 "fe/idl.ypp" { (yyval.etval) = AST_Expression::EV_wchar; } -#line 5895 "fe/idl.tab.cpp" +#line 5900 "fe/idl.tab.cpp" break; - case 290: /* octet_type: IDL_OCTET */ -#line 3081 "fe/idl.ypp" + case 291: /* octet_type: IDL_OCTET */ +#line 3085 "fe/idl.ypp" { (yyval.etval) = AST_Expression::EV_octet; } -#line 5903 "fe/idl.tab.cpp" +#line 5908 "fe/idl.tab.cpp" break; - case 291: /* boolean_type: IDL_BOOLEAN */ -#line 3088 "fe/idl.ypp" + case 292: /* boolean_type: IDL_BOOLEAN */ +#line 3092 "fe/idl.ypp" { (yyval.etval) = AST_Expression::EV_bool; } -#line 5911 "fe/idl.tab.cpp" +#line 5916 "fe/idl.tab.cpp" break; - case 292: /* any_type: IDL_ANY */ -#line 3095 "fe/idl.ypp" + case 293: /* any_type: IDL_ANY */ +#line 3099 "fe/idl.ypp" { (yyval.etval) = AST_Expression::EV_any; } -#line 5919 "fe/idl.tab.cpp" +#line 5924 "fe/idl.tab.cpp" break; - case 293: /* object_type: IDL_OBJECT */ -#line 3102 "fe/idl.ypp" + case 294: /* object_type: IDL_OBJECT */ +#line 3106 "fe/idl.ypp" { (yyval.etval) = AST_Expression::EV_object; } -#line 5927 "fe/idl.tab.cpp" +#line 5932 "fe/idl.tab.cpp" break; - case 294: /* $@65: %empty */ -#line 3109 "fe/idl.ypp" + case 295: /* $@65: %empty */ +#line 3113 "fe/idl.ypp" { idl_global->set_parse_state (IDL_GlobalData::PS_StructSeen); } -#line 5935 "fe/idl.tab.cpp" +#line 5940 "fe/idl.tab.cpp" break; - case 295: /* struct_decl: IDL_STRUCT $@65 defining_id */ -#line 3113 "fe/idl.ypp" + case 296: /* struct_decl: IDL_STRUCT $@65 defining_id */ +#line 3117 "fe/idl.ypp" { idl_global->set_parse_state (IDL_GlobalData::PS_StructIDSeen); (yyval.idval) = (yyvsp[0].idval); } -#line 5944 "fe/idl.tab.cpp" +#line 5949 "fe/idl.tab.cpp" break; - case 296: /* $@66: %empty */ -#line 3122 "fe/idl.ypp" + case 297: /* $@66: %empty */ +#line 3126 "fe/idl.ypp" { UTL_Scope *s = idl_global->scopes ().top_non_null (); UTL_ScopedName n ((yyvsp[0].idval), 0); @@ -5963,30 +5980,20 @@ yyparse (void) delete (yyvsp[0].idval); (yyvsp[0].idval) = 0; } -#line 5979 "fe/idl.tab.cpp" +#line 5984 "fe/idl.tab.cpp" break; - case 297: /* $@67: %empty */ -#line 3153 "fe/idl.ypp" - { - idl_global->set_parse_state (IDL_GlobalData::PS_StructSqSeen); - } -#line 5987 "fe/idl.tab.cpp" - break; - - case 298: /* $@68: %empty */ + case 298: /* $@67: %empty */ #line 3157 "fe/idl.ypp" { - idl_global->set_parse_state (IDL_GlobalData::PS_StructBodySeen); + idl_global->set_parse_state (IDL_GlobalData::PS_StructSqSeen); } -#line 5995 "fe/idl.tab.cpp" +#line 5992 "fe/idl.tab.cpp" break; - case 299: /* struct_type: struct_decl $@66 '{' $@67 at_least_one_member $@68 '}' */ + case 299: /* struct_type: struct_decl $@66 '{' $@67 struct_body */ #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 +6002,39 @@ yyparse (void) ); idl_global->scopes ().pop (); } -#line 6011 "fe/idl.tab.cpp" +#line 6006 "fe/idl.tab.cpp" break; - case 303: /* member: annotations_maybe member_i */ -#line 3183 "fe/idl.ypp" + case 300: /* struct_body: '}' */ +#line 3174 "fe/idl.ypp" + { + if (idl_global->idl_version_ < IDL_VERSION_4) + idl_global->err ()->idl_version_error ( + "Empty structs are not allowed in IDL versions before 4"); + + idl_global->set_parse_state (IDL_GlobalData::PS_StructQsSeen); + } +#line 6018 "fe/idl.tab.cpp" + break; + + case 302: /* $@68: %empty */ +#line 3186 "fe/idl.ypp" + { + idl_global->set_parse_state (IDL_GlobalData::PS_StructBodySeen); + } +#line 6026 "fe/idl.tab.cpp" + break; + + case 303: /* struct_body_with_members: member members $@68 '}' */ +#line 3190 "fe/idl.ypp" + { + idl_global->set_parse_state (IDL_GlobalData::PS_StructQsSeen); + } +#line 6034 "fe/idl.tab.cpp" + break; + + case 306: /* member: annotations_maybe member_i */ +#line 3202 "fe/idl.ypp" { AST_Annotation_Appls *annotations = (yyvsp[-1].annotations_val); AST_Decls *members = (yyvsp[0].decls_val); @@ -6013,27 +6048,27 @@ yyparse (void) delete annotations; delete members; } -#line 6029 "fe/idl.tab.cpp" +#line 6052 "fe/idl.tab.cpp" break; - case 304: /* $@69: %empty */ -#line 3200 "fe/idl.ypp" + case 307: /* $@69: %empty */ +#line 3219 "fe/idl.ypp" { idl_global->set_parse_state (IDL_GlobalData::PS_MemberTypeSeen); } -#line 6037 "fe/idl.tab.cpp" +#line 6060 "fe/idl.tab.cpp" break; - case 305: /* $@70: %empty */ -#line 3204 "fe/idl.ypp" + case 308: /* $@70: %empty */ +#line 3223 "fe/idl.ypp" { idl_global->set_parse_state (IDL_GlobalData::PS_MemberDeclsSeen); } -#line 6045 "fe/idl.tab.cpp" +#line 6068 "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 3227 "fe/idl.ypp" { UTL_Scope *s = idl_global->scopes ().top_non_null (); FE_Declarator *d = 0; @@ -6087,53 +6122,53 @@ yyparse (void) (yyval.decls_val) = members; } -#line 6103 "fe/idl.tab.cpp" +#line 6126 "fe/idl.tab.cpp" break; - case 307: /* $@71: %empty */ -#line 3262 "fe/idl.ypp" + case 310: /* $@71: %empty */ +#line 3281 "fe/idl.ypp" { idl_global->err ()->syntax_error (idl_global->parse_state ()); } -#line 6111 "fe/idl.tab.cpp" +#line 6134 "fe/idl.tab.cpp" break; - case 308: /* member_i: error $@71 ';' */ -#line 3266 "fe/idl.ypp" + case 311: /* member_i: error $@71 ';' */ +#line 3285 "fe/idl.ypp" { idl_global->set_parse_state (IDL_GlobalData::PS_NoState); yyerrok; } -#line 6120 "fe/idl.tab.cpp" +#line 6143 "fe/idl.tab.cpp" break; - case 309: /* $@72: %empty */ -#line 3274 "fe/idl.ypp" + case 312: /* $@72: %empty */ +#line 3293 "fe/idl.ypp" { idl_global->set_parse_state (IDL_GlobalData::PS_UnionSeen); } -#line 6128 "fe/idl.tab.cpp" +#line 6151 "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 3297 "fe/idl.ypp" { idl_global->set_parse_state (IDL_GlobalData::PS_UnionIDSeen); (yyval.idval) = (yyvsp[0].idval); } -#line 6137 "fe/idl.tab.cpp" +#line 6160 "fe/idl.tab.cpp" break; - case 311: /* $@73: %empty */ -#line 3286 "fe/idl.ypp" + case 314: /* $@73: %empty */ +#line 3305 "fe/idl.ypp" { idl_global->set_parse_state (IDL_GlobalData::PS_SwitchSeen); } -#line 6145 "fe/idl.tab.cpp" +#line 6168 "fe/idl.tab.cpp" break; - case 312: /* $@74: %empty */ -#line 3290 "fe/idl.ypp" + case 315: /* $@74: %empty */ +#line 3309 "fe/idl.ypp" { UTL_Scope *s = idl_global->scopes ().top_non_null (); UTL_ScopedName n ((yyvsp[-3].idval), 0); @@ -6166,19 +6201,19 @@ yyparse (void) * Don't delete $1 yet; we'll need it a bit later. */ } -#line 6182 "fe/idl.tab.cpp" +#line 6205 "fe/idl.tab.cpp" break; - case 313: /* $@75: %empty */ -#line 3323 "fe/idl.ypp" + case 316: /* $@75: %empty */ +#line 3342 "fe/idl.ypp" { idl_global->set_parse_state (IDL_GlobalData::PS_SwitchTypeSeen); } -#line 6190 "fe/idl.tab.cpp" +#line 6213 "fe/idl.tab.cpp" break; - case 314: /* $@76: %empty */ -#line 3327 "fe/idl.ypp" + case 317: /* $@76: %empty */ +#line 3346 "fe/idl.ypp" { /* * The top of the scopes must be an empty union we added after we @@ -6237,27 +6272,27 @@ yyparse (void) delete disc_annotations; } -#line 6253 "fe/idl.tab.cpp" +#line 6276 "fe/idl.tab.cpp" break; - case 315: /* $@77: %empty */ -#line 3386 "fe/idl.ypp" + case 318: /* $@77: %empty */ +#line 3405 "fe/idl.ypp" { idl_global->set_parse_state (IDL_GlobalData::PS_UnionSqSeen); } -#line 6261 "fe/idl.tab.cpp" +#line 6284 "fe/idl.tab.cpp" break; - case 316: /* $@78: %empty */ -#line 3390 "fe/idl.ypp" + case 319: /* $@78: %empty */ +#line 3409 "fe/idl.ypp" { idl_global->set_parse_state (IDL_GlobalData::PS_UnionBodySeen); } -#line 6269 "fe/idl.tab.cpp" +#line 6292 "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 3413 "fe/idl.ypp" { idl_global->set_parse_state (IDL_GlobalData::PS_UnionQsSeen); @@ -6273,63 +6308,51 @@ yyparse (void) idl_global->scopes ().pop (); } } -#line 6289 "fe/idl.tab.cpp" +#line 6312 "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 3432 "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 6320 "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 3436 "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 IDL versions before 4"); - (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 6332 "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 3444 "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 IDL versions before 4"); + + (yyval.dcval) = idl_global->scopes ().bottom ()->lookup_primitive_type ((yyvsp[0].etval)); } -#line 6330 "fe/idl.tab.cpp" +#line 6344 "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 3452 "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 6352 "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 3457 "fe/idl.ypp" { UTL_Scope *s = idl_global->scopes ().top_non_null (); AST_Decl *d = 0; @@ -6343,8 +6366,7 @@ yyparse (void) * typedef's to arrive at the base type at the end of the * chain. */ - d = - s->lookup_by_name ((yyvsp[0].idlist)); + d = s->lookup_by_name ((yyvsp[0].idlist)); if (s != 0 && d != 0) { @@ -6369,6 +6391,8 @@ yyparse (void) case AST_PredefinedType::PT_ulonglong: case AST_PredefinedType::PT_short: case AST_PredefinedType::PT_ushort: + case AST_PredefinedType::PT_int8: + case AST_PredefinedType::PT_uint8: case AST_PredefinedType::PT_char: case AST_PredefinedType::PT_boolean: (yyval.dcval) = p; @@ -6376,11 +6400,10 @@ yyparse (void) break; case AST_PredefinedType::PT_wchar: case AST_PredefinedType::PT_octet: - /* octets and wchars are not allowed */ - idl_global->err ()->error0 ( - UTL_Error::EIDL_DISC_TYPE - ); - (yyval.dcval) = 0; + if (idl_global->idl_version_ < IDL_VERSION_4) + idl_global->err ()->idl_version_error ( + "Using octet or wchar as a union discriminator isn't allowed in IDL versions before 4"); + (yyval.dcval) = p; found = true; break; default: @@ -6436,27 +6459,27 @@ yyparse (void) delete (yyvsp[0].idlist); (yyvsp[0].idlist) = 0; } -#line 6452 "fe/idl.tab.cpp" +#line 6463 "fe/idl.tab.cpp" break; - case 327: /* $@79: %empty */ -#line 3567 "fe/idl.ypp" + case 330: /* $@79: %empty */ +#line 3574 "fe/idl.ypp" { idl_global->set_parse_state (IDL_GlobalData::PS_UnionLabelSeen); } -#line 6460 "fe/idl.tab.cpp" +#line 6471 "fe/idl.tab.cpp" break; - case 328: /* $@80: %empty */ -#line 3571 "fe/idl.ypp" + case 331: /* $@80: %empty */ +#line 3578 "fe/idl.ypp" { idl_global->set_parse_state (IDL_GlobalData::PS_UnionElemSeen); } -#line 6468 "fe/idl.tab.cpp" +#line 6479 "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 3582 "fe/idl.ypp" { UTL_Scope *s = idl_global->scopes ().top_non_null (); AST_UnionBranch *b = 0; @@ -6488,39 +6511,39 @@ yyparse (void) delete annotations; } -#line 6504 "fe/idl.tab.cpp" +#line 6515 "fe/idl.tab.cpp" break; - case 330: /* $@81: %empty */ -#line 3607 "fe/idl.ypp" + case 333: /* $@81: %empty */ +#line 3614 "fe/idl.ypp" { idl_global->err ()->syntax_error (idl_global->parse_state ()); } -#line 6512 "fe/idl.tab.cpp" +#line 6523 "fe/idl.tab.cpp" break; - case 331: /* case_branch: error $@81 ';' */ -#line 3611 "fe/idl.ypp" + case 334: /* case_branch: error $@81 ';' */ +#line 3618 "fe/idl.ypp" { idl_global->set_parse_state (IDL_GlobalData::PS_NoState); yyerrok; } -#line 6521 "fe/idl.tab.cpp" +#line 6532 "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 3626 "fe/idl.ypp" { ACE_NEW_RETURN ((yyval.llval), UTL_LabelList ((yyvsp[-1].ulval), (yyvsp[0].llval)), 1); } -#line 6532 "fe/idl.tab.cpp" +#line 6543 "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 3636 "fe/idl.ypp" { UTL_LabelList *ll = 0; ACE_NEW_RETURN (ll, @@ -6538,27 +6561,27 @@ yyparse (void) (yyval.llval) = (yyvsp[-1].llval); } } -#line 6554 "fe/idl.tab.cpp" +#line 6565 "fe/idl.tab.cpp" break; - case 334: /* case_labels: %empty */ -#line 3647 "fe/idl.ypp" + case 337: /* case_labels: %empty */ +#line 3654 "fe/idl.ypp" { (yyval.llval) = 0; } -#line 6562 "fe/idl.tab.cpp" +#line 6573 "fe/idl.tab.cpp" break; - case 335: /* $@82: %empty */ -#line 3654 "fe/idl.ypp" + case 338: /* $@82: %empty */ +#line 3661 "fe/idl.ypp" { idl_global->set_parse_state (IDL_GlobalData::PS_DefaultSeen); } -#line 6570 "fe/idl.tab.cpp" +#line 6581 "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 3665 "fe/idl.ypp" { idl_global->set_parse_state (IDL_GlobalData::PS_LabelColonSeen); @@ -6567,27 +6590,27 @@ yyparse (void) 0 ); } -#line 6583 "fe/idl.tab.cpp" +#line 6594 "fe/idl.tab.cpp" break; - case 337: /* $@83: %empty */ -#line 3667 "fe/idl.ypp" + case 340: /* $@83: %empty */ +#line 3674 "fe/idl.ypp" { idl_global->set_parse_state (IDL_GlobalData::PS_CaseSeen); } -#line 6591 "fe/idl.tab.cpp" +#line 6602 "fe/idl.tab.cpp" break; - case 338: /* $@84: %empty */ -#line 3671 "fe/idl.ypp" + case 341: /* $@84: %empty */ +#line 3678 "fe/idl.ypp" { idl_global->set_parse_state (IDL_GlobalData::PS_LabelExprSeen); } -#line 6599 "fe/idl.tab.cpp" +#line 6610 "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 3682 "fe/idl.ypp" { idl_global->set_parse_state (IDL_GlobalData::PS_LabelColonSeen); @@ -6596,19 +6619,19 @@ yyparse (void) (yyvsp[-2].exval) ); } -#line 6612 "fe/idl.tab.cpp" +#line 6623 "fe/idl.tab.cpp" break; - case 340: /* $@85: %empty */ -#line 3687 "fe/idl.ypp" + case 343: /* $@85: %empty */ +#line 3694 "fe/idl.ypp" { idl_global->set_parse_state (IDL_GlobalData::PS_UnionElemTypeSeen); } -#line 6620 "fe/idl.tab.cpp" +#line 6631 "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 3698 "fe/idl.ypp" { idl_global->set_parse_state (IDL_GlobalData::PS_UnionElemDeclSeen); @@ -6651,11 +6674,11 @@ yyparse (void) (yyvsp[0].deval) = 0; } } -#line 6667 "fe/idl.tab.cpp" +#line 6678 "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 3744 "fe/idl.ypp" { UTL_Scope *s = idl_global->scopes ().top_non_null (); UTL_ScopedName n ((yyvsp[0].idval), @@ -6677,11 +6700,11 @@ yyparse (void) (yyval.dcval) = d; } -#line 6693 "fe/idl.tab.cpp" +#line 6704 "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 3769 "fe/idl.ypp" { UTL_Scope *s = idl_global->scopes ().top_non_null (); UTL_ScopedName n ((yyvsp[0].idval), @@ -6701,19 +6724,19 @@ yyparse (void) delete (yyvsp[0].idval); (yyvsp[0].idval) = 0; } -#line 6717 "fe/idl.tab.cpp" +#line 6728 "fe/idl.tab.cpp" break; - case 344: /* $@86: %empty */ -#line 3785 "fe/idl.ypp" + case 347: /* $@86: %empty */ +#line 3792 "fe/idl.ypp" { idl_global->set_parse_state (IDL_GlobalData::PS_EnumSeen); } -#line 6725 "fe/idl.tab.cpp" +#line 6736 "fe/idl.tab.cpp" break; - case 345: /* $@87: %empty */ -#line 3789 "fe/idl.ypp" + case 348: /* $@87: %empty */ +#line 3796 "fe/idl.ypp" { UTL_Scope *s = idl_global->scopes ().top_non_null (); UTL_ScopedName n ((yyvsp[0].idval), 0); @@ -6744,27 +6767,27 @@ yyparse (void) delete (yyvsp[0].idval); (yyvsp[0].idval) = 0; } -#line 6760 "fe/idl.tab.cpp" +#line 6771 "fe/idl.tab.cpp" break; - case 346: /* $@88: %empty */ -#line 3820 "fe/idl.ypp" + case 349: /* $@88: %empty */ +#line 3827 "fe/idl.ypp" { idl_global->set_parse_state (IDL_GlobalData::PS_EnumSqSeen); } -#line 6768 "fe/idl.tab.cpp" +#line 6779 "fe/idl.tab.cpp" break; - case 347: /* $@89: %empty */ -#line 3824 "fe/idl.ypp" + case 350: /* $@89: %empty */ +#line 3831 "fe/idl.ypp" { idl_global->set_parse_state (IDL_GlobalData::PS_EnumBodySeen); } -#line 6776 "fe/idl.tab.cpp" +#line 6787 "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 3835 "fe/idl.ypp" { idl_global->set_parse_state (IDL_GlobalData::PS_EnumQsSeen); @@ -6783,19 +6806,19 @@ yyparse (void) idl_global->scopes ().pop (); } } -#line 6799 "fe/idl.tab.cpp" +#line 6810 "fe/idl.tab.cpp" break; - case 350: /* $@90: %empty */ -#line 3853 "fe/idl.ypp" + case 353: /* $@90: %empty */ +#line 3860 "fe/idl.ypp" { idl_global->set_parse_state (IDL_GlobalData::PS_EnumCommaSeen); } -#line 6807 "fe/idl.tab.cpp" +#line 6818 "fe/idl.tab.cpp" break; - case 353: /* enumerator: annotations_maybe IDENTIFIER */ -#line 3862 "fe/idl.ypp" + case 356: /* enumerator: annotations_maybe IDENTIFIER */ +#line 3869 "fe/idl.ypp" { UTL_Scope *s = idl_global->scopes ().top_non_null (); AST_Annotation_Appls *annotations = (yyvsp[-1].annotations_val); @@ -6830,11 +6853,11 @@ yyparse (void) delete annotations; } -#line 6846 "fe/idl.tab.cpp" +#line 6857 "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 3908 "fe/idl.ypp" { AST_Map *map = 0; Decl_Annotations_Pair_Pair* type_pair = (yyvsp[-1].decl_annotations_pair_val_pair); @@ -6893,11 +6916,11 @@ yyparse (void) delete type_pair; (yyval.dcval) = map; } -#line 6909 "fe/idl.tab.cpp" +#line 6920 "fe/idl.tab.cpp" break; - case 355: /* $@91: %empty */ -#line 3963 "fe/idl.ypp" + case 358: /* $@91: %empty */ +#line 3970 "fe/idl.ypp" { idl_global->set_parse_state (IDL_GlobalData::PS_MapSeen); @@ -6906,19 +6929,19 @@ yyparse (void) */ idl_global->scopes ().push (0); } -#line 6922 "fe/idl.tab.cpp" +#line 6933 "fe/idl.tab.cpp" break; - case 356: /* $@92: %empty */ -#line 3973 "fe/idl.ypp" + case 359: /* $@92: %empty */ +#line 3980 "fe/idl.ypp" { idl_global->set_parse_state(IDL_GlobalData::PS_MapKeyTypeSeen); } -#line 6930 "fe/idl.tab.cpp" +#line 6941 "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 3985 "fe/idl.ypp" { idl_global->set_parse_state(IDL_GlobalData::PS_MapValueTypeSeen); Decl_Annotations_Pair *key = new Decl_Annotations_Pair; @@ -6934,27 +6957,27 @@ yyparse (void) pairs->second = value; (yyval.decl_annotations_pair_val_pair) = pairs; } -#line 6950 "fe/idl.tab.cpp" +#line 6961 "fe/idl.tab.cpp" break; - case 358: /* $@93: %empty */ -#line 3998 "fe/idl.ypp" + case 361: /* $@93: %empty */ +#line 4005 "fe/idl.ypp" { idl_global->set_parse_state (IDL_GlobalData::PS_SequenceCommaSeen); } -#line 6958 "fe/idl.tab.cpp" +#line 6969 "fe/idl.tab.cpp" break; - case 359: /* $@94: %empty */ -#line 4002 "fe/idl.ypp" + case 362: /* $@94: %empty */ +#line 4009 "fe/idl.ypp" { idl_global->set_parse_state (IDL_GlobalData::PS_SequenceExprSeen); } -#line 6966 "fe/idl.tab.cpp" +#line 6977 "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 4013 "fe/idl.ypp" { idl_global->set_parse_state (IDL_GlobalData::PS_SequenceQsSeen); @@ -7035,11 +7058,11 @@ yyparse (void) ev = 0; (yyval.dcval) = seq; } -#line 7051 "fe/idl.tab.cpp" +#line 7062 "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 4095 "fe/idl.ypp" { idl_global->set_parse_state (IDL_GlobalData::PS_SequenceQsSeen); @@ -7101,11 +7124,11 @@ yyparse (void) delete type_annotations; (yyval.dcval) = seq; } -#line 7117 "fe/idl.tab.cpp" +#line 7128 "fe/idl.tab.cpp" break; - case 362: /* $@95: %empty */ -#line 4153 "fe/idl.ypp" + case 365: /* $@95: %empty */ +#line 4160 "fe/idl.ypp" { idl_global->set_parse_state (IDL_GlobalData::PS_SequenceSeen); @@ -7114,19 +7137,19 @@ yyparse (void) */ idl_global->scopes ().push (0); } -#line 7130 "fe/idl.tab.cpp" +#line 7141 "fe/idl.tab.cpp" break; - case 363: /* $@96: %empty */ -#line 4162 "fe/idl.ypp" + case 366: /* $@96: %empty */ +#line 4169 "fe/idl.ypp" { idl_global->set_parse_state (IDL_GlobalData::PS_SequenceSqSeen); } -#line 7138 "fe/idl.tab.cpp" +#line 7149 "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 4173 "fe/idl.ypp" { idl_global->set_parse_state (IDL_GlobalData::PS_SequenceTypeSeen); Decl_Annotations_Pair *seq_head = new Decl_Annotations_Pair; @@ -7134,36 +7157,36 @@ yyparse (void) seq_head->annotations = (yyvsp[-1].annotations_val); (yyval.decl_annotations_pair_val) = seq_head; } -#line 7150 "fe/idl.tab.cpp" +#line 7161 "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 4184 "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 7170 "fe/idl.tab.cpp" break; - case 366: /* $@97: %empty */ -#line 4186 "fe/idl.ypp" + case 369: /* $@97: %empty */ +#line 4193 "fe/idl.ypp" { idl_global->set_parse_state (IDL_GlobalData::PS_StringSqSeen); } -#line 7167 "fe/idl.tab.cpp" +#line 7178 "fe/idl.tab.cpp" break; - case 367: /* $@98: %empty */ -#line 4190 "fe/idl.ypp" + case 370: /* $@98: %empty */ +#line 4197 "fe/idl.ypp" { idl_global->set_parse_state (IDL_GlobalData::PS_StringExprSeen); } -#line 7175 "fe/idl.tab.cpp" +#line 7186 "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 4201 "fe/idl.ypp" { idl_global->set_parse_state (IDL_GlobalData::PS_StringQsSeen); @@ -7202,11 +7225,11 @@ yyparse (void) delete ev; ev = 0; } -#line 7218 "fe/idl.tab.cpp" +#line 7229 "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 4240 "fe/idl.ypp" { idl_global->set_parse_state (IDL_GlobalData::PS_StringCompleted); @@ -7229,35 +7252,35 @@ yyparse (void) (yyval.dcval) = tao_string_decl; } -#line 7245 "fe/idl.tab.cpp" +#line 7256 "fe/idl.tab.cpp" break; - case 370: /* string_head: IDL_STRING */ -#line 4259 "fe/idl.ypp" + case 373: /* string_head: IDL_STRING */ +#line 4266 "fe/idl.ypp" { idl_global->set_parse_state (IDL_GlobalData::PS_StringSeen); } -#line 7253 "fe/idl.tab.cpp" +#line 7264 "fe/idl.tab.cpp" break; - case 371: /* $@99: %empty */ -#line 4267 "fe/idl.ypp" + case 374: /* $@99: %empty */ +#line 4274 "fe/idl.ypp" { idl_global->set_parse_state (IDL_GlobalData::PS_StringSqSeen); } -#line 7261 "fe/idl.tab.cpp" +#line 7272 "fe/idl.tab.cpp" break; - case 372: /* $@100: %empty */ -#line 4271 "fe/idl.ypp" + case 375: /* $@100: %empty */ +#line 4278 "fe/idl.ypp" { idl_global->set_parse_state (IDL_GlobalData::PS_StringExprSeen); } -#line 7269 "fe/idl.tab.cpp" +#line 7280 "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 4282 "fe/idl.ypp" { idl_global->set_parse_state (IDL_GlobalData::PS_StringQsSeen); @@ -7296,11 +7319,11 @@ yyparse (void) delete ev; ev = 0; } -#line 7312 "fe/idl.tab.cpp" +#line 7323 "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 4321 "fe/idl.ypp" { idl_global->set_parse_state (IDL_GlobalData::PS_StringCompleted); @@ -7323,27 +7346,27 @@ yyparse (void) (yyval.dcval) = string; } -#line 7339 "fe/idl.tab.cpp" +#line 7350 "fe/idl.tab.cpp" break; - case 375: /* wstring_head: IDL_WSTRING */ -#line 4340 "fe/idl.ypp" + case 378: /* wstring_head: IDL_WSTRING */ +#line 4347 "fe/idl.ypp" { idl_global->set_parse_state (IDL_GlobalData::PS_StringSeen); } -#line 7347 "fe/idl.tab.cpp" +#line 7358 "fe/idl.tab.cpp" break; - case 376: /* $@101: %empty */ -#line 4347 "fe/idl.ypp" + case 379: /* $@101: %empty */ +#line 4354 "fe/idl.ypp" { idl_global->set_parse_state (IDL_GlobalData::PS_ArrayIDSeen); } -#line 7355 "fe/idl.tab.cpp" +#line 7366 "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 4358 "fe/idl.ypp" { idl_global->set_parse_state (IDL_GlobalData::PS_ArrayCompleted); @@ -7379,22 +7402,22 @@ yyparse (void) (yyval.dcval) = array; } -#line 7395 "fe/idl.tab.cpp" +#line 7406 "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 4397 "fe/idl.ypp" { ACE_NEW_RETURN ((yyval.elval), UTL_ExprList ((yyvsp[-1].exval), (yyvsp[0].elval)), 1); } -#line 7406 "fe/idl.tab.cpp" +#line 7417 "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 4407 "fe/idl.ypp" { UTL_ExprList *el = 0; ACE_NEW_RETURN (el, @@ -7412,35 +7435,35 @@ yyparse (void) (yyval.elval) = (yyvsp[-1].elval); } } -#line 7428 "fe/idl.tab.cpp" +#line 7439 "fe/idl.tab.cpp" break; - case 380: /* array_dims: %empty */ -#line 4418 "fe/idl.ypp" + case 383: /* array_dims: %empty */ +#line 4425 "fe/idl.ypp" { (yyval.elval) = 0; } -#line 7436 "fe/idl.tab.cpp" +#line 7447 "fe/idl.tab.cpp" break; - case 381: /* $@102: %empty */ -#line 4425 "fe/idl.ypp" + case 384: /* $@102: %empty */ +#line 4432 "fe/idl.ypp" { idl_global->set_parse_state (IDL_GlobalData::PS_DimSqSeen); } -#line 7444 "fe/idl.tab.cpp" +#line 7455 "fe/idl.tab.cpp" break; - case 382: /* $@103: %empty */ -#line 4429 "fe/idl.ypp" + case 385: /* $@103: %empty */ +#line 4436 "fe/idl.ypp" { idl_global->set_parse_state (IDL_GlobalData::PS_DimExprSeen); } -#line 7452 "fe/idl.tab.cpp" +#line 7463 "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 4440 "fe/idl.ypp" { idl_global->set_parse_state (IDL_GlobalData::PS_DimQsSeen); @@ -7494,43 +7517,43 @@ yyparse (void) delete ev; ev = 0; } -#line 7510 "fe/idl.tab.cpp" +#line 7521 "fe/idl.tab.cpp" break; - case 386: /* $@104: %empty */ -#line 4495 "fe/idl.ypp" + case 389: /* $@104: %empty */ +#line 4502 "fe/idl.ypp" { idl_global->set_parse_state (IDL_GlobalData::PS_AttrROSeen); } -#line 7518 "fe/idl.tab.cpp" +#line 7529 "fe/idl.tab.cpp" break; - case 387: /* $@105: %empty */ -#line 4499 "fe/idl.ypp" + case 390: /* $@105: %empty */ +#line 4506 "fe/idl.ypp" { idl_global->set_parse_state (IDL_GlobalData::PS_AttrSeen); } -#line 7526 "fe/idl.tab.cpp" +#line 7537 "fe/idl.tab.cpp" break; - case 388: /* $@106: %empty */ -#line 4503 "fe/idl.ypp" + case 391: /* $@106: %empty */ +#line 4510 "fe/idl.ypp" { idl_global->set_parse_state (IDL_GlobalData::PS_AttrTypeSeen); } -#line 7534 "fe/idl.tab.cpp" +#line 7545 "fe/idl.tab.cpp" break; - case 389: /* $@107: %empty */ -#line 4507 "fe/idl.ypp" + case 392: /* $@107: %empty */ +#line 4514 "fe/idl.ypp" { idl_global->set_parse_state (IDL_GlobalData::PS_AttrDeclsSeen); } -#line 7542 "fe/idl.tab.cpp" +#line 7553 "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 4518 "fe/idl.ypp" { UTL_Scope *s = idl_global->scopes ().top_non_null (); AST_Attribute *a = 0; @@ -7582,43 +7605,43 @@ yyparse (void) (yyval.dcval) = a; } -#line 7598 "fe/idl.tab.cpp" +#line 7609 "fe/idl.tab.cpp" break; - case 391: /* $@108: %empty */ -#line 4566 "fe/idl.ypp" + case 394: /* $@108: %empty */ +#line 4573 "fe/idl.ypp" { idl_global->set_parse_state (IDL_GlobalData::PS_AttrSeen); } -#line 7606 "fe/idl.tab.cpp" +#line 7617 "fe/idl.tab.cpp" break; - case 392: /* $@109: %empty */ -#line 4570 "fe/idl.ypp" + case 395: /* $@109: %empty */ +#line 4577 "fe/idl.ypp" { idl_global->set_parse_state (IDL_GlobalData::PS_AttrTypeSeen); } -#line 7614 "fe/idl.tab.cpp" +#line 7625 "fe/idl.tab.cpp" break; - case 393: /* $@110: %empty */ -#line 4574 "fe/idl.ypp" + case 396: /* $@110: %empty */ +#line 4581 "fe/idl.ypp" { idl_global->set_parse_state (IDL_GlobalData::PS_AttrDeclsSeen); } -#line 7622 "fe/idl.tab.cpp" +#line 7633 "fe/idl.tab.cpp" break; - case 394: /* $@111: %empty */ -#line 4578 "fe/idl.ypp" + case 397: /* $@111: %empty */ +#line 4585 "fe/idl.ypp" { idl_global->set_parse_state (IDL_GlobalData::PS_OpGetRaiseCompleted); } -#line 7630 "fe/idl.tab.cpp" +#line 7641 "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 4589 "fe/idl.ypp" { UTL_Scope *s = idl_global->scopes ().top_non_null (); AST_Attribute *a = 0; @@ -7679,19 +7702,19 @@ yyparse (void) (yyval.dcval) = a; } -#line 7695 "fe/idl.tab.cpp" +#line 7706 "fe/idl.tab.cpp" break; - case 396: /* $@112: %empty */ -#line 4646 "fe/idl.ypp" + case 399: /* $@112: %empty */ +#line 4653 "fe/idl.ypp" { idl_global->set_parse_state (IDL_GlobalData::PS_ExceptSeen); } -#line 7703 "fe/idl.tab.cpp" +#line 7714 "fe/idl.tab.cpp" break; - case 397: /* @113: %empty */ -#line 4650 "fe/idl.ypp" + case 400: /* @113: %empty */ +#line 4657 "fe/idl.ypp" { Identifier *&id = (yyvsp[0].idval); UTL_Scope *scope = idl_global->scopes ().top_non_null (); @@ -7723,27 +7746,27 @@ yyparse (void) (yyval.dcval) = exception; } -#line 7739 "fe/idl.tab.cpp" +#line 7750 "fe/idl.tab.cpp" break; - case 398: /* $@114: %empty */ -#line 4682 "fe/idl.ypp" + case 401: /* $@114: %empty */ +#line 4689 "fe/idl.ypp" { idl_global->set_parse_state (IDL_GlobalData::PS_ExceptSqSeen); } -#line 7747 "fe/idl.tab.cpp" +#line 7758 "fe/idl.tab.cpp" break; - case 399: /* $@115: %empty */ -#line 4686 "fe/idl.ypp" + case 402: /* $@115: %empty */ +#line 4693 "fe/idl.ypp" { idl_global->set_parse_state (IDL_GlobalData::PS_ExceptBodySeen); } -#line 7755 "fe/idl.tab.cpp" +#line 7766 "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 4697 "fe/idl.ypp" { idl_global->set_parse_state (IDL_GlobalData::PS_ExceptQsSeen); /* @@ -7753,19 +7776,19 @@ yyparse (void) (yyval.dcval) = (yyvsp[-5].dcval); } -#line 7769 "fe/idl.tab.cpp" +#line 7780 "fe/idl.tab.cpp" break; - case 401: /* $@116: %empty */ -#line 4703 "fe/idl.ypp" + case 404: /* $@116: %empty */ +#line 4710 "fe/idl.ypp" { idl_global->set_parse_state (IDL_GlobalData::PS_OpTypeSeen); } -#line 7777 "fe/idl.tab.cpp" +#line 7788 "fe/idl.tab.cpp" break; - case 402: /* $@117: %empty */ -#line 4707 "fe/idl.ypp" + case 405: /* $@117: %empty */ +#line 4714 "fe/idl.ypp" { AST_Operation *op = 0; UTL_Scope *scope = idl_global->scopes ().top_non_null (); @@ -7826,27 +7849,27 @@ yyparse (void) */ idl_global->scopes ().push (op); } -#line 7842 "fe/idl.tab.cpp" +#line 7853 "fe/idl.tab.cpp" break; - case 403: /* $@118: %empty */ -#line 4768 "fe/idl.ypp" + case 406: /* $@118: %empty */ +#line 4775 "fe/idl.ypp" { idl_global->set_parse_state (IDL_GlobalData::PS_OpParsCompleted); } -#line 7850 "fe/idl.tab.cpp" +#line 7861 "fe/idl.tab.cpp" break; - case 404: /* $@119: %empty */ -#line 4772 "fe/idl.ypp" + case 407: /* $@119: %empty */ +#line 4779 "fe/idl.ypp" { idl_global->set_parse_state (IDL_GlobalData::PS_OpRaiseCompleted); } -#line 7858 "fe/idl.tab.cpp" +#line 7869 "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 4783 "fe/idl.ypp" { UTL_Scope *s = idl_global->scopes ().top_non_null (); AST_Operation *o = 0; @@ -7877,57 +7900,57 @@ yyparse (void) (yyval.dcval) = o; } -#line 7893 "fe/idl.tab.cpp" +#line 7904 "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 4817 "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 7913 "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 4822 "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 7922 "fe/idl.tab.cpp" break; - case 408: /* opt_op_attribute: %empty */ -#line 4820 "fe/idl.ypp" + case 411: /* opt_op_attribute: %empty */ +#line 4827 "fe/idl.ypp" { (yyval.ofval) = AST_Operation::OP_noflags; } -#line 7919 "fe/idl.tab.cpp" +#line 7930 "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 4835 "fe/idl.ypp" { (yyval.dcval) = idl_global->scopes ().bottom ()->lookup_primitive_type ( AST_Expression::EV_void ); } -#line 7930 "fe/idl.tab.cpp" +#line 7941 "fe/idl.tab.cpp" break; - case 411: /* $@120: %empty */ -#line 4838 "fe/idl.ypp" + case 414: /* $@120: %empty */ +#line 4845 "fe/idl.ypp" { //@@ PS_FactorySeen? idl_global->set_parse_state (IDL_GlobalData::PS_OpTypeSeen); } -#line 7939 "fe/idl.tab.cpp" +#line 7950 "fe/idl.tab.cpp" break; - case 412: /* @121: %empty */ -#line 4843 "fe/idl.ypp" + case 415: /* @121: %empty */ +#line 4850 "fe/idl.ypp" { UTL_Scope *s = idl_global->scopes ().top_non_null (); @@ -7970,19 +7993,19 @@ yyparse (void) (yyval.dcval) = factory; } -#line 7986 "fe/idl.tab.cpp" +#line 7997 "fe/idl.tab.cpp" break; - case 413: /* $@122: %empty */ -#line 4886 "fe/idl.ypp" + case 416: /* $@122: %empty */ +#line 4893 "fe/idl.ypp" { idl_global->set_parse_state (IDL_GlobalData::PS_OpParsCompleted); } -#line 7994 "fe/idl.tab.cpp" +#line 8005 "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 4897 "fe/idl.ypp" { idl_global->set_parse_state (IDL_GlobalData::PS_OpRaiseCompleted); @@ -7997,67 +8020,67 @@ yyparse (void) (yyval.dcval) = (yyvsp[-3].dcval); } -#line 8013 "fe/idl.tab.cpp" +#line 8024 "fe/idl.tab.cpp" break; - case 415: /* $@123: %empty */ -#line 4908 "fe/idl.ypp" + case 418: /* $@123: %empty */ +#line 4915 "fe/idl.ypp" { idl_global->set_parse_state (IDL_GlobalData::PS_OpSqSeen); } -#line 8021 "fe/idl.tab.cpp" +#line 8032 "fe/idl.tab.cpp" break; - case 416: /* init_parameter_list: '(' $@123 ')' */ -#line 4912 "fe/idl.ypp" + case 419: /* init_parameter_list: '(' $@123 ')' */ +#line 4919 "fe/idl.ypp" { idl_global->set_parse_state (IDL_GlobalData::PS_OpQsSeen); } -#line 8029 "fe/idl.tab.cpp" +#line 8040 "fe/idl.tab.cpp" break; - case 417: /* $@124: %empty */ -#line 4916 "fe/idl.ypp" + case 420: /* $@124: %empty */ +#line 4923 "fe/idl.ypp" { idl_global->set_parse_state (IDL_GlobalData::PS_OpSqSeen); } -#line 8037 "fe/idl.tab.cpp" +#line 8048 "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 4928 "fe/idl.ypp" { idl_global->set_parse_state (IDL_GlobalData::PS_OpQsSeen); } -#line 8045 "fe/idl.tab.cpp" +#line 8056 "fe/idl.tab.cpp" break; - case 420: /* $@125: %empty */ -#line 4931 "fe/idl.ypp" + case 423: /* $@125: %empty */ +#line 4938 "fe/idl.ypp" { idl_global->set_parse_state (IDL_GlobalData::PS_OpParCommaSeen); } -#line 8053 "fe/idl.tab.cpp" +#line 8064 "fe/idl.tab.cpp" break; - case 423: /* $@126: %empty */ -#line 4940 "fe/idl.ypp" + case 426: /* $@126: %empty */ +#line 4947 "fe/idl.ypp" { idl_global->set_parse_state (IDL_GlobalData::PS_OpParDirSeen); } -#line 8061 "fe/idl.tab.cpp" +#line 8072 "fe/idl.tab.cpp" break; - case 424: /* $@127: %empty */ -#line 4944 "fe/idl.ypp" + case 427: /* $@127: %empty */ +#line 4951 "fe/idl.ypp" { idl_global->set_parse_state (IDL_GlobalData::PS_OpParTypeSeen); } -#line 8069 "fe/idl.tab.cpp" +#line 8080 "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 4955 "fe/idl.ypp" { UTL_Scope *s = idl_global->scopes ().top_non_null (); AST_Argument *a = 0; @@ -8089,67 +8112,67 @@ yyparse (void) delete (yyvsp[0].deval); (yyvsp[0].deval) = 0; } -#line 8105 "fe/idl.tab.cpp" +#line 8116 "fe/idl.tab.cpp" break; - case 426: /* $@128: %empty */ -#line 4983 "fe/idl.ypp" + case 429: /* $@128: %empty */ +#line 4990 "fe/idl.ypp" { idl_global->set_parse_state (IDL_GlobalData::PS_OpSqSeen); } -#line 8113 "fe/idl.tab.cpp" +#line 8124 "fe/idl.tab.cpp" break; - case 427: /* parameter_list: '(' $@128 ')' */ -#line 4987 "fe/idl.ypp" + case 430: /* parameter_list: '(' $@128 ')' */ +#line 4994 "fe/idl.ypp" { idl_global->set_parse_state (IDL_GlobalData::PS_OpQsSeen); } -#line 8121 "fe/idl.tab.cpp" +#line 8132 "fe/idl.tab.cpp" break; - case 428: /* $@129: %empty */ -#line 4991 "fe/idl.ypp" + case 431: /* $@129: %empty */ +#line 4998 "fe/idl.ypp" { idl_global->set_parse_state (IDL_GlobalData::PS_OpSqSeen); } -#line 8129 "fe/idl.tab.cpp" +#line 8140 "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 5003 "fe/idl.ypp" { idl_global->set_parse_state (IDL_GlobalData::PS_OpQsSeen); } -#line 8137 "fe/idl.tab.cpp" +#line 8148 "fe/idl.tab.cpp" break; - case 431: /* $@130: %empty */ -#line 5006 "fe/idl.ypp" + case 434: /* $@130: %empty */ +#line 5013 "fe/idl.ypp" { idl_global->set_parse_state (IDL_GlobalData::PS_OpParCommaSeen); } -#line 8145 "fe/idl.tab.cpp" +#line 8156 "fe/idl.tab.cpp" break; - case 434: /* $@131: %empty */ -#line 5015 "fe/idl.ypp" + case 437: /* $@131: %empty */ +#line 5022 "fe/idl.ypp" { idl_global->set_parse_state (IDL_GlobalData::PS_OpParDirSeen); } -#line 8153 "fe/idl.tab.cpp" +#line 8164 "fe/idl.tab.cpp" break; - case 435: /* $@132: %empty */ -#line 5019 "fe/idl.ypp" + case 438: /* $@132: %empty */ +#line 5026 "fe/idl.ypp" { idl_global->set_parse_state (IDL_GlobalData::PS_OpParTypeSeen); } -#line 8161 "fe/idl.tab.cpp" +#line 8172 "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 5030 "fe/idl.ypp" { UTL_Scope *s = idl_global->scopes ().top_non_null (); AST_Argument *a = 0; @@ -8188,22 +8211,22 @@ yyparse (void) delete (yyvsp[0].deval); (yyvsp[0].deval) = 0; } -#line 8204 "fe/idl.tab.cpp" +#line 8215 "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 5072 "fe/idl.ypp" { (yyval.dcval) = idl_global->scopes ().bottom ()->lookup_primitive_type ( (yyvsp[0].etval) ); } -#line 8215 "fe/idl.tab.cpp" +#line 8226 "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 5081 "fe/idl.ypp" { UTL_Scope *s = idl_global->scopes ().top_non_null (); AST_Decl *d = 0; @@ -8355,186 +8378,186 @@ yyparse (void) (yyval.dcval) = d; } -#line 8371 "fe/idl.tab.cpp" +#line 8382 "fe/idl.tab.cpp" break; - case 441: /* direction: IDL_IN */ -#line 5229 "fe/idl.ypp" + case 444: /* direction: IDL_IN */ +#line 5236 "fe/idl.ypp" { (yyval.dival) = AST_Argument::dir_IN; } -#line 8379 "fe/idl.tab.cpp" +#line 8390 "fe/idl.tab.cpp" break; - case 442: /* direction: IDL_OUT */ -#line 5233 "fe/idl.ypp" + case 445: /* direction: IDL_OUT */ +#line 5240 "fe/idl.ypp" { (yyval.dival) = AST_Argument::dir_OUT; } -#line 8387 "fe/idl.tab.cpp" +#line 8398 "fe/idl.tab.cpp" break; - case 443: /* direction: IDL_INOUT */ -#line 5237 "fe/idl.ypp" + case 446: /* direction: IDL_INOUT */ +#line 5244 "fe/idl.ypp" { (yyval.dival) = AST_Argument::dir_INOUT; } -#line 8395 "fe/idl.tab.cpp" +#line 8406 "fe/idl.tab.cpp" break; - case 444: /* $@133: %empty */ -#line 5244 "fe/idl.ypp" + case 447: /* $@133: %empty */ +#line 5251 "fe/idl.ypp" { idl_global->set_parse_state (IDL_GlobalData::PS_OpRaiseSeen); } -#line 8403 "fe/idl.tab.cpp" +#line 8414 "fe/idl.tab.cpp" break; - case 445: /* $@134: %empty */ -#line 5248 "fe/idl.ypp" + case 448: /* $@134: %empty */ +#line 5255 "fe/idl.ypp" { idl_global->set_parse_state (IDL_GlobalData::PS_OpRaiseSqSeen); } -#line 8411 "fe/idl.tab.cpp" +#line 8422 "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 5260 "fe/idl.ypp" { idl_global->set_parse_state (IDL_GlobalData::PS_OpRaiseQsSeen); (yyval.nlval) = (yyvsp[-1].nlval); } -#line 8420 "fe/idl.tab.cpp" +#line 8431 "fe/idl.tab.cpp" break; - case 447: /* opt_raises: %empty */ -#line 5258 "fe/idl.ypp" + case 450: /* opt_raises: %empty */ +#line 5265 "fe/idl.ypp" { (yyval.nlval) = 0; } -#line 8428 "fe/idl.tab.cpp" +#line 8439 "fe/idl.tab.cpp" break; - case 448: /* $@135: %empty */ -#line 5265 "fe/idl.ypp" + case 451: /* $@135: %empty */ +#line 5272 "fe/idl.ypp" { idl_global->set_parse_state (IDL_GlobalData::PS_OpGetRaiseSeen); } -#line 8436 "fe/idl.tab.cpp" +#line 8447 "fe/idl.tab.cpp" break; - case 449: /* $@136: %empty */ -#line 5269 "fe/idl.ypp" + case 452: /* $@136: %empty */ +#line 5276 "fe/idl.ypp" { idl_global->set_parse_state (IDL_GlobalData::PS_OpGetRaiseSqSeen); } -#line 8444 "fe/idl.tab.cpp" +#line 8455 "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 5281 "fe/idl.ypp" { idl_global->set_parse_state (IDL_GlobalData::PS_OpGetRaiseQsSeen); (yyval.nlval) = (yyvsp[-1].nlval); } -#line 8453 "fe/idl.tab.cpp" +#line 8464 "fe/idl.tab.cpp" break; - case 451: /* opt_getraises: %empty */ -#line 5279 "fe/idl.ypp" + case 454: /* opt_getraises: %empty */ +#line 5286 "fe/idl.ypp" { (yyval.nlval) = 0; } -#line 8461 "fe/idl.tab.cpp" +#line 8472 "fe/idl.tab.cpp" break; - case 452: /* $@137: %empty */ -#line 5286 "fe/idl.ypp" + case 455: /* $@137: %empty */ +#line 5293 "fe/idl.ypp" { idl_global->set_parse_state (IDL_GlobalData::PS_OpSetRaiseSeen); } -#line 8469 "fe/idl.tab.cpp" +#line 8480 "fe/idl.tab.cpp" break; - case 453: /* $@138: %empty */ -#line 5290 "fe/idl.ypp" + case 456: /* $@138: %empty */ +#line 5297 "fe/idl.ypp" { idl_global->set_parse_state (IDL_GlobalData::PS_OpSetRaiseSqSeen); } -#line 8477 "fe/idl.tab.cpp" +#line 8488 "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 5302 "fe/idl.ypp" { idl_global->set_parse_state (IDL_GlobalData::PS_OpSetRaiseQsSeen); (yyval.nlval) = (yyvsp[-1].nlval); } -#line 8486 "fe/idl.tab.cpp" +#line 8497 "fe/idl.tab.cpp" break; - case 455: /* opt_setraises: %empty */ -#line 5300 "fe/idl.ypp" + case 458: /* opt_setraises: %empty */ +#line 5307 "fe/idl.ypp" { (yyval.nlval) = 0; } -#line 8494 "fe/idl.tab.cpp" +#line 8505 "fe/idl.tab.cpp" break; - case 456: /* $@139: %empty */ -#line 5307 "fe/idl.ypp" + case 459: /* $@139: %empty */ +#line 5314 "fe/idl.ypp" { idl_global->set_parse_state (IDL_GlobalData::PS_OpContextSeen); } -#line 8502 "fe/idl.tab.cpp" +#line 8513 "fe/idl.tab.cpp" break; - case 457: /* $@140: %empty */ -#line 5311 "fe/idl.ypp" + case 460: /* $@140: %empty */ +#line 5318 "fe/idl.ypp" { idl_global->set_parse_state (IDL_GlobalData::PS_OpContextSqSeen); } -#line 8510 "fe/idl.tab.cpp" +#line 8521 "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 5323 "fe/idl.ypp" { idl_global->set_parse_state (IDL_GlobalData::PS_OpContextQsSeen); (yyval.slval) = (yyvsp[-1].slval); } -#line 8519 "fe/idl.tab.cpp" +#line 8530 "fe/idl.tab.cpp" break; - case 459: /* opt_context: %empty */ -#line 5321 "fe/idl.ypp" + case 462: /* opt_context: %empty */ +#line 5328 "fe/idl.ypp" { (yyval.slval) = 0; } -#line 8527 "fe/idl.tab.cpp" +#line 8538 "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 5335 "fe/idl.ypp" { ACE_NEW_RETURN ((yyval.slval), UTL_StrList ((yyvsp[-1].sval), (yyvsp[0].slval)), 1); } -#line 8538 "fe/idl.tab.cpp" +#line 8549 "fe/idl.tab.cpp" break; - case 461: /* $@141: %empty */ -#line 5339 "fe/idl.ypp" + case 464: /* $@141: %empty */ +#line 5346 "fe/idl.ypp" { idl_global->set_parse_state (IDL_GlobalData::PS_OpContextCommaSeen); } -#line 8546 "fe/idl.tab.cpp" +#line 8557 "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 5350 "fe/idl.ypp" { UTL_StrList *sl = 0; ACE_NEW_RETURN (sl, @@ -8552,19 +8575,19 @@ yyparse (void) (yyval.slval) = (yyvsp[-3].slval); } } -#line 8568 "fe/idl.tab.cpp" +#line 8579 "fe/idl.tab.cpp" break; - case 463: /* string_literals: %empty */ -#line 5361 "fe/idl.ypp" + case 466: /* string_literals: %empty */ +#line 5368 "fe/idl.ypp" { (yyval.slval) = 0; } -#line 8576 "fe/idl.tab.cpp" +#line 8587 "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 5375 "fe/idl.ypp" { UTL_Scope *s = idl_global->scopes ().top_non_null (); AST_Decl *d = @@ -8591,11 +8614,11 @@ yyparse (void) (yyval.dcval) = 0; } -#line 8607 "fe/idl.tab.cpp" +#line 8618 "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 5405 "fe/idl.ypp" { UTL_Scope *s = idl_global->scopes ().top_non_null (); AST_Decl *d = ScopeAsDecl (s); @@ -8631,11 +8654,11 @@ yyparse (void) (yyval.dcval) = 0; } -#line 8647 "fe/idl.tab.cpp" +#line 8658 "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 5450 "fe/idl.ypp" { UTL_Scope *s = idl_global->scopes ().top_non_null (); UTL_ScopedName n ((yyvsp[0].idval), @@ -8661,11 +8684,11 @@ yyparse (void) (yyval.dcval) = 0; } -#line 8677 "fe/idl.tab.cpp" +#line 8688 "fe/idl.tab.cpp" break; - case 469: /* @142: %empty */ -#line 5472 "fe/idl.ypp" + case 472: /* @142: %empty */ +#line 5479 "fe/idl.ypp" { FE_ComponentHeader *&component_header = (yyvsp[0].chval); UTL_Scope *scope = idl_global->scopes ().top_non_null (); @@ -8707,27 +8730,27 @@ yyparse (void) (yyval.dcval) = component; } -#line 8723 "fe/idl.tab.cpp" +#line 8734 "fe/idl.tab.cpp" break; - case 470: /* $@143: %empty */ -#line 5514 "fe/idl.ypp" + case 473: /* $@143: %empty */ +#line 5521 "fe/idl.ypp" { idl_global->set_parse_state (IDL_GlobalData::PS_ComponentSqSeen); } -#line 8731 "fe/idl.tab.cpp" +#line 8742 "fe/idl.tab.cpp" break; - case 471: /* $@144: %empty */ -#line 5518 "fe/idl.ypp" + case 474: /* $@144: %empty */ +#line 5525 "fe/idl.ypp" { idl_global->set_parse_state (IDL_GlobalData::PS_ComponentBodySeen); } -#line 8739 "fe/idl.tab.cpp" +#line 8750 "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 5529 "fe/idl.ypp" { idl_global->set_parse_state (IDL_GlobalData::PS_ComponentQsSeen); @@ -8738,27 +8761,27 @@ yyparse (void) (yyval.dcval) = (yyvsp[-5].dcval); } -#line 8754 "fe/idl.tab.cpp" +#line 8765 "fe/idl.tab.cpp" break; - case 473: /* $@145: %empty */ -#line 5537 "fe/idl.ypp" + case 476: /* $@145: %empty */ +#line 5544 "fe/idl.ypp" { idl_global->set_parse_state (IDL_GlobalData::PS_ComponentIDSeen); } -#line 8762 "fe/idl.tab.cpp" +#line 8773 "fe/idl.tab.cpp" break; - case 474: /* $@146: %empty */ -#line 5541 "fe/idl.ypp" + case 477: /* $@146: %empty */ +#line 5548 "fe/idl.ypp" { idl_global->set_parse_state (IDL_GlobalData::PS_InheritSpecSeen); } -#line 8770 "fe/idl.tab.cpp" +#line 8781 "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 5552 "fe/idl.ypp" { idl_global->set_parse_state (IDL_GlobalData::PS_SupportSpecSeen); @@ -8792,35 +8815,35 @@ yyparse (void) (yyvsp[-2].idlist) = 0; } } -#line 8808 "fe/idl.tab.cpp" +#line 8819 "fe/idl.tab.cpp" break; - case 476: /* $@147: %empty */ -#line 5582 "fe/idl.ypp" + case 479: /* $@147: %empty */ +#line 5589 "fe/idl.ypp" { idl_global->set_parse_state (IDL_GlobalData::PS_InheritColonSeen); } -#line 8816 "fe/idl.tab.cpp" +#line 8827 "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 5593 "fe/idl.ypp" { (yyval.idlist) = (yyvsp[0].idlist); } -#line 8824 "fe/idl.tab.cpp" +#line 8835 "fe/idl.tab.cpp" break; - case 478: /* component_inheritance_spec: %empty */ -#line 5590 "fe/idl.ypp" + case 481: /* component_inheritance_spec: %empty */ +#line 5597 "fe/idl.ypp" { (yyval.idlist) = 0; } -#line 8832 "fe/idl.tab.cpp" +#line 8843 "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 5604 "fe/idl.ypp" { AST_Annotation_Appls *&annotations = (yyvsp[-1].annotations_val); AST_Decl *&node = (yyvsp[0].dcval); @@ -8835,130 +8858,130 @@ yyparse (void) } delete annotations; } -#line 8851 "fe/idl.tab.cpp" +#line 8862 "fe/idl.tab.cpp" break; - case 482: /* $@148: %empty */ -#line 5617 "fe/idl.ypp" + case 485: /* $@148: %empty */ +#line 5624 "fe/idl.ypp" { idl_global->set_parse_state (IDL_GlobalData::PS_ProvidesDeclSeen); } -#line 8859 "fe/idl.tab.cpp" +#line 8870 "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 5628 "fe/idl.ypp" { idl_global->set_parse_state (IDL_GlobalData::PS_NoState); (yyval.dcval) = (yyvsp[-2].dcval); } -#line 8868 "fe/idl.tab.cpp" +#line 8879 "fe/idl.tab.cpp" break; - case 484: /* $@149: %empty */ -#line 5626 "fe/idl.ypp" + case 487: /* $@149: %empty */ +#line 5633 "fe/idl.ypp" { idl_global->set_parse_state (IDL_GlobalData::PS_UsesDeclSeen); } -#line 8876 "fe/idl.tab.cpp" +#line 8887 "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 5637 "fe/idl.ypp" { idl_global->set_parse_state (IDL_GlobalData::PS_NoState); (yyval.dcval) = (yyvsp[-2].dcval); } -#line 8885 "fe/idl.tab.cpp" +#line 8896 "fe/idl.tab.cpp" break; - case 486: /* $@150: %empty */ -#line 5635 "fe/idl.ypp" + case 489: /* $@150: %empty */ +#line 5642 "fe/idl.ypp" { idl_global->set_parse_state (IDL_GlobalData::PS_EmitsDeclSeen); } -#line 8893 "fe/idl.tab.cpp" +#line 8904 "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 5646 "fe/idl.ypp" { idl_global->set_parse_state (IDL_GlobalData::PS_NoState); (yyval.dcval) = (yyvsp[-2].dcval); } -#line 8902 "fe/idl.tab.cpp" +#line 8913 "fe/idl.tab.cpp" break; - case 488: /* $@151: %empty */ -#line 5644 "fe/idl.ypp" + case 491: /* $@151: %empty */ +#line 5651 "fe/idl.ypp" { idl_global->set_parse_state (IDL_GlobalData::PS_PublishesDeclSeen); } -#line 8910 "fe/idl.tab.cpp" +#line 8921 "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 5655 "fe/idl.ypp" { idl_global->set_parse_state (IDL_GlobalData::PS_NoState); (yyval.dcval) = (yyvsp[-2].dcval); } -#line 8919 "fe/idl.tab.cpp" +#line 8930 "fe/idl.tab.cpp" break; - case 490: /* $@152: %empty */ -#line 5653 "fe/idl.ypp" + case 493: /* $@152: %empty */ +#line 5660 "fe/idl.ypp" { idl_global->set_parse_state (IDL_GlobalData::PS_ConsumesDeclSeen); } -#line 8927 "fe/idl.tab.cpp" +#line 8938 "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 5664 "fe/idl.ypp" { idl_global->set_parse_state (IDL_GlobalData::PS_NoState); (yyval.dcval) = (yyvsp[-2].dcval); } -#line 8936 "fe/idl.tab.cpp" +#line 8947 "fe/idl.tab.cpp" break; - case 492: /* $@153: %empty */ -#line 5662 "fe/idl.ypp" + case 495: /* $@153: %empty */ +#line 5669 "fe/idl.ypp" { idl_global->set_parse_state (IDL_GlobalData::PS_AttrDeclSeen); } -#line 8944 "fe/idl.tab.cpp" +#line 8955 "fe/idl.tab.cpp" break; - case 493: /* component_export: attribute $@153 ';' */ -#line 5666 "fe/idl.ypp" + case 496: /* component_export: attribute $@153 ';' */ +#line 5673 "fe/idl.ypp" { idl_global->set_parse_state (IDL_GlobalData::PS_NoState); (yyval.dcval) = (yyvsp[-2].dcval); } -#line 8953 "fe/idl.tab.cpp" +#line 8964 "fe/idl.tab.cpp" break; - case 494: /* $@154: %empty */ -#line 5671 "fe/idl.ypp" + case 497: /* $@154: %empty */ +#line 5678 "fe/idl.ypp" { idl_global->set_parse_state (IDL_GlobalData::PS_ExtendedPortDeclSeen); } -#line 8961 "fe/idl.tab.cpp" +#line 8972 "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 5682 "fe/idl.ypp" { idl_global->set_parse_state (IDL_GlobalData::PS_NoState); (yyval.dcval) = (yyvsp[-2].dcval); } -#line 8970 "fe/idl.tab.cpp" +#line 8981 "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 5689 "fe/idl.ypp" { UTL_Scope *s = idl_global->scopes ().top_non_null (); bool so_far_so_good = true; @@ -9048,21 +9071,21 @@ yyparse (void) (yyval.dcval) = dynamic_cast (provides); } -#line 9064 "fe/idl.tab.cpp" +#line 9075 "fe/idl.tab.cpp" break; - case 497: /* interface_type: scoped_name */ -#line 5775 "fe/idl.ypp" + case 500: /* interface_type: scoped_name */ +#line 5782 "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 9085 "fe/idl.tab.cpp" break; - case 498: /* interface_type: IDL_OBJECT */ -#line 5781 "fe/idl.ypp" + case 501: /* interface_type: IDL_OBJECT */ +#line 5788 "fe/idl.ypp" { Identifier *corba_id = 0; @@ -9085,11 +9108,11 @@ yyparse (void) conc_name), 1); } -#line 9101 "fe/idl.tab.cpp" +#line 9112 "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 5813 "fe/idl.ypp" { UTL_Scope *s = idl_global->scopes ().top_non_null (); bool so_far_so_good = true; @@ -9193,37 +9216,37 @@ yyparse (void) (yyval.dcval) = uses; } -#line 9209 "fe/idl.tab.cpp" +#line 9220 "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 5920 "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 9230 "fe/idl.tab.cpp" break; - case 501: /* opt_multiple: IDL_MULTIPLE */ -#line 5922 "fe/idl.ypp" + case 504: /* opt_multiple: IDL_MULTIPLE */ +#line 5929 "fe/idl.ypp" { (yyval.bval) = true; } -#line 9227 "fe/idl.tab.cpp" +#line 9238 "fe/idl.tab.cpp" break; - case 502: /* opt_multiple: %empty */ -#line 5926 "fe/idl.ypp" + case 505: /* opt_multiple: %empty */ +#line 5933 "fe/idl.ypp" { (yyval.bval) = false; } -#line 9235 "fe/idl.tab.cpp" +#line 9246 "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 5940 "fe/idl.ypp" { UTL_Scope *s = idl_global->scopes ().top_non_null (); bool so_far_so_good = true; @@ -9295,11 +9318,11 @@ yyparse (void) (yyval.dcval) = e; } -#line 9311 "fe/idl.tab.cpp" +#line 9322 "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 6015 "fe/idl.ypp" { UTL_Scope *s = idl_global->scopes ().top_non_null (); bool so_far_so_good = true; @@ -9368,11 +9391,11 @@ yyparse (void) (yyval.dcval) = p; } -#line 9384 "fe/idl.tab.cpp" +#line 9395 "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 6087 "fe/idl.ypp" { UTL_Scope *s = idl_global->scopes ().top_non_null (); bool so_far_so_good = true; @@ -9444,11 +9467,11 @@ yyparse (void) (yyval.dcval) = c; } -#line 9460 "fe/idl.tab.cpp" +#line 9471 "fe/idl.tab.cpp" break; - case 506: /* $@155: %empty */ -#line 6155 "fe/idl.ypp" + case 509: /* $@155: %empty */ +#line 6162 "fe/idl.ypp" { UTL_Scope *s = idl_global->scopes ().top_non_null (); AST_Home *h = 0; @@ -9485,11 +9508,11 @@ yyparse (void) */ idl_global->scopes ().push (h); } -#line 9501 "fe/idl.tab.cpp" +#line 9512 "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 6199 "fe/idl.ypp" { /* * Done with this component - pop it off the scopes stack. @@ -9498,59 +9521,59 @@ yyparse (void) (yyval.dcval) = 0; } -#line 9514 "fe/idl.tab.cpp" +#line 9525 "fe/idl.tab.cpp" break; - case 508: /* $@156: %empty */ -#line 6204 "fe/idl.ypp" + case 511: /* $@156: %empty */ +#line 6211 "fe/idl.ypp" { idl_global->set_parse_state (IDL_GlobalData::PS_HomeSeen); } -#line 9522 "fe/idl.tab.cpp" +#line 9533 "fe/idl.tab.cpp" break; - case 509: /* $@157: %empty */ -#line 6208 "fe/idl.ypp" + case 512: /* $@157: %empty */ +#line 6215 "fe/idl.ypp" { idl_global->set_parse_state (IDL_GlobalData::PS_HomeIDSeen); } -#line 9530 "fe/idl.tab.cpp" +#line 9541 "fe/idl.tab.cpp" break; - case 510: /* $@158: %empty */ -#line 6212 "fe/idl.ypp" + case 513: /* $@158: %empty */ +#line 6219 "fe/idl.ypp" { idl_global->set_parse_state (IDL_GlobalData::PS_InheritSpecSeen); } -#line 9538 "fe/idl.tab.cpp" +#line 9549 "fe/idl.tab.cpp" break; - case 511: /* $@159: %empty */ -#line 6216 "fe/idl.ypp" + case 514: /* $@159: %empty */ +#line 6223 "fe/idl.ypp" { idl_global->set_parse_state (IDL_GlobalData::PS_SupportSpecSeen); } -#line 9546 "fe/idl.tab.cpp" +#line 9557 "fe/idl.tab.cpp" break; - case 512: /* $@160: %empty */ -#line 6220 "fe/idl.ypp" + case 515: /* $@160: %empty */ +#line 6227 "fe/idl.ypp" { idl_global->set_parse_state (IDL_GlobalData::PS_ManagesSeen); } -#line 9554 "fe/idl.tab.cpp" +#line 9565 "fe/idl.tab.cpp" break; - case 513: /* $@161: %empty */ -#line 6224 "fe/idl.ypp" + case 516: /* $@161: %empty */ +#line 6231 "fe/idl.ypp" { idl_global->set_parse_state (IDL_GlobalData::PS_ManagesIDSeen); } -#line 9562 "fe/idl.tab.cpp" +#line 9573 "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 6235 "fe/idl.ypp" { idl_global->set_parse_state (IDL_GlobalData::PS_PrimaryKeySpecSeen); @@ -9596,107 +9619,107 @@ yyparse (void) (yyvsp[-6].nlval) = 0; } } -#line 9612 "fe/idl.tab.cpp" +#line 9623 "fe/idl.tab.cpp" break; - case 515: /* $@162: %empty */ -#line 6277 "fe/idl.ypp" + case 518: /* $@162: %empty */ +#line 6284 "fe/idl.ypp" { idl_global->set_parse_state (IDL_GlobalData::PS_InheritColonSeen); } -#line 9620 "fe/idl.tab.cpp" +#line 9631 "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 6288 "fe/idl.ypp" { (yyval.idlist) = (yyvsp[0].idlist); } -#line 9628 "fe/idl.tab.cpp" +#line 9639 "fe/idl.tab.cpp" break; - case 517: /* home_inheritance_spec: %empty */ -#line 6285 "fe/idl.ypp" + case 520: /* home_inheritance_spec: %empty */ +#line 6292 "fe/idl.ypp" { (yyval.idlist) = 0; } -#line 9636 "fe/idl.tab.cpp" +#line 9647 "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 6300 "fe/idl.ypp" { (yyval.idlist) = (yyvsp[0].idlist); } -#line 9644 "fe/idl.tab.cpp" +#line 9655 "fe/idl.tab.cpp" break; - case 519: /* primary_key_spec: %empty */ -#line 6297 "fe/idl.ypp" + case 522: /* primary_key_spec: %empty */ +#line 6304 "fe/idl.ypp" { (yyval.idlist) = 0; } -#line 9652 "fe/idl.tab.cpp" +#line 9663 "fe/idl.tab.cpp" break; - case 520: /* $@163: %empty */ -#line 6304 "fe/idl.ypp" + case 523: /* $@163: %empty */ +#line 6311 "fe/idl.ypp" { idl_global->set_parse_state (IDL_GlobalData::PS_HomeSqSeen); } -#line 9660 "fe/idl.tab.cpp" +#line 9671 "fe/idl.tab.cpp" break; - case 521: /* $@164: %empty */ -#line 6308 "fe/idl.ypp" + case 524: /* $@164: %empty */ +#line 6315 "fe/idl.ypp" { idl_global->set_parse_state (IDL_GlobalData::PS_HomeBodySeen); } -#line 9668 "fe/idl.tab.cpp" +#line 9679 "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 6319 "fe/idl.ypp" { idl_global->set_parse_state (IDL_GlobalData::PS_HomeQsSeen); } -#line 9676 "fe/idl.tab.cpp" +#line 9687 "fe/idl.tab.cpp" break; - case 526: /* $@165: %empty */ -#line 6325 "fe/idl.ypp" + case 529: /* $@165: %empty */ +#line 6332 "fe/idl.ypp" { idl_global->set_parse_state (IDL_GlobalData::PS_FactoryDeclSeen); } -#line 9684 "fe/idl.tab.cpp" +#line 9695 "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 6336 "fe/idl.ypp" { idl_global->set_parse_state (IDL_GlobalData::PS_NoState); } -#line 9692 "fe/idl.tab.cpp" +#line 9703 "fe/idl.tab.cpp" break; - case 528: /* $@166: %empty */ -#line 6333 "fe/idl.ypp" + case 531: /* $@166: %empty */ +#line 6340 "fe/idl.ypp" { idl_global->set_parse_state (IDL_GlobalData::PS_FinderDeclSeen); } -#line 9700 "fe/idl.tab.cpp" +#line 9711 "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 6344 "fe/idl.ypp" { idl_global->set_parse_state (IDL_GlobalData::PS_NoState); } -#line 9708 "fe/idl.tab.cpp" +#line 9719 "fe/idl.tab.cpp" break; - case 530: /* $@167: %empty */ -#line 6345 "fe/idl.ypp" + case 533: /* $@167: %empty */ +#line 6352 "fe/idl.ypp" { UTL_Scope *s = idl_global->scopes ().top_non_null (); UTL_ScopedName n ((yyvsp[0].idval), @@ -9719,19 +9742,19 @@ yyparse (void) */ idl_global->scopes ().push (f); } -#line 9735 "fe/idl.tab.cpp" +#line 9746 "fe/idl.tab.cpp" break; - case 531: /* $@168: %empty */ -#line 6368 "fe/idl.ypp" + case 534: /* $@168: %empty */ +#line 6375 "fe/idl.ypp" { idl_global->set_parse_state (IDL_GlobalData::PS_OpParsCompleted); } -#line 9743 "fe/idl.tab.cpp" +#line 9754 "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 6379 "fe/idl.ypp" { UTL_Scope *s = idl_global->scopes ().top_non_null (); idl_global->set_parse_state (IDL_GlobalData::PS_OpRaiseCompleted); @@ -9749,11 +9772,11 @@ yyparse (void) */ idl_global->scopes ().pop (); } -#line 9765 "fe/idl.tab.cpp" +#line 9776 "fe/idl.tab.cpp" break; - case 533: /* $@169: %empty */ -#line 6394 "fe/idl.ypp" + case 536: /* $@169: %empty */ +#line 6401 "fe/idl.ypp" { UTL_Scope *s = idl_global->scopes ().top_non_null (); UTL_ScopedName n ((yyvsp[0].idval), @@ -9780,19 +9803,19 @@ yyparse (void) */ idl_global->scopes ().push (f); } -#line 9796 "fe/idl.tab.cpp" +#line 9807 "fe/idl.tab.cpp" break; - case 534: /* $@170: %empty */ -#line 6421 "fe/idl.ypp" + case 537: /* $@170: %empty */ +#line 6428 "fe/idl.ypp" { idl_global->set_parse_state (IDL_GlobalData::PS_OpParsCompleted); } -#line 9804 "fe/idl.tab.cpp" +#line 9815 "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 6432 "fe/idl.ypp" { UTL_Scope *s = idl_global->scopes ().top_non_null (); idl_global->set_parse_state (IDL_GlobalData::PS_OpRaiseCompleted); @@ -9810,11 +9833,11 @@ yyparse (void) */ idl_global->scopes ().pop (); } -#line 9826 "fe/idl.tab.cpp" +#line 9837 "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 6465 "fe/idl.ypp" { UTL_Scope *s = idl_global->scopes ().top_non_null (); UTL_ScopedName n ((yyvsp[0].idval), @@ -9839,11 +9862,11 @@ yyparse (void) (yyval.dcval) = 0; } -#line 9855 "fe/idl.tab.cpp" +#line 9866 "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 6495 "fe/idl.ypp" { UTL_Scope *s = idl_global->scopes ().top_non_null (); UTL_ScopedName n ((yyvsp[0].idval), @@ -9868,11 +9891,11 @@ yyparse (void) (yyval.dcval) = 0; } -#line 9884 "fe/idl.tab.cpp" +#line 9895 "fe/idl.tab.cpp" break; - case 543: /* $@171: %empty */ -#line 6517 "fe/idl.ypp" + case 546: /* $@171: %empty */ +#line 6524 "fe/idl.ypp" { UTL_Scope *s = idl_global->scopes ().top_non_null (); AST_EventType *e = 0; @@ -9916,27 +9939,27 @@ yyparse (void) delete (yyvsp[-1].idval); (yyvsp[-1].idval) = 0; } -#line 9932 "fe/idl.tab.cpp" +#line 9943 "fe/idl.tab.cpp" break; - case 544: /* $@172: %empty */ -#line 6561 "fe/idl.ypp" + case 547: /* $@172: %empty */ +#line 6568 "fe/idl.ypp" { idl_global->set_parse_state (IDL_GlobalData::PS_EventTypeSqSeen); } -#line 9940 "fe/idl.tab.cpp" +#line 9951 "fe/idl.tab.cpp" break; - case 545: /* $@173: %empty */ -#line 6565 "fe/idl.ypp" + case 548: /* $@173: %empty */ +#line 6572 "fe/idl.ypp" { idl_global->set_parse_state (IDL_GlobalData::PS_EventTypeBodySeen); } -#line 9948 "fe/idl.tab.cpp" +#line 9959 "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 6576 "fe/idl.ypp" { idl_global->set_parse_state (IDL_GlobalData::PS_EventTypeQsSeen); @@ -9947,19 +9970,19 @@ yyparse (void) (yyval.dcval) = 0; } -#line 9963 "fe/idl.tab.cpp" +#line 9974 "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 6592 "fe/idl.ypp" { (yyval.idval) = (yyvsp[0].idval); } -#line 9971 "fe/idl.tab.cpp" +#line 9982 "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 6601 "fe/idl.ypp" { idl_global->set_parse_state (IDL_GlobalData::PS_EventTypeIDSeen); @@ -9972,29 +9995,29 @@ yyparse (void) ACE_TEXT (" custom yet\n"))); (yyval.idval) = 0; } -#line 9988 "fe/idl.tab.cpp" +#line 9999 "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 6618 "fe/idl.ypp" { idl_global->set_parse_state (IDL_GlobalData::PS_EventTypeIDSeen); (yyval.idval) = (yyvsp[0].idval); } -#line 9998 "fe/idl.tab.cpp" +#line 10009 "fe/idl.tab.cpp" break; - case 550: /* $@174: %empty */ -#line 6620 "fe/idl.ypp" + case 553: /* $@174: %empty */ +#line 6627 "fe/idl.ypp" { idl_global->set_parse_state (IDL_GlobalData::PS_InheritSpecSeen); } -#line 10006 "fe/idl.tab.cpp" +#line 10017 "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 6631 "fe/idl.ypp" { idl_global->set_parse_state (IDL_GlobalData::PS_SupportSpecSeen); @@ -10023,11 +10046,11 @@ yyparse (void) (yyvsp[-2].nlval) = 0; } } -#line 10039 "fe/idl.tab.cpp" +#line 10050 "fe/idl.tab.cpp" break; - case 552: /* @175: %empty */ -#line 6657 "fe/idl.ypp" + case 555: /* @175: %empty */ +#line 6664 "fe/idl.ypp" { UTL_Scope *scope = idl_global->scopes ().top_non_null (); Identifier *&event_id = (yyvsp[-1].idval); @@ -10078,27 +10101,27 @@ yyparse (void) (yyval.dcval) = eventtype; } -#line 10094 "fe/idl.tab.cpp" +#line 10105 "fe/idl.tab.cpp" break; - case 553: /* $@176: %empty */ -#line 6708 "fe/idl.ypp" + case 556: /* $@176: %empty */ +#line 6715 "fe/idl.ypp" { idl_global->set_parse_state (IDL_GlobalData::PS_EventTypeSqSeen); } -#line 10102 "fe/idl.tab.cpp" +#line 10113 "fe/idl.tab.cpp" break; - case 554: /* $@177: %empty */ -#line 6712 "fe/idl.ypp" + case 557: /* $@177: %empty */ +#line 6719 "fe/idl.ypp" { idl_global->set_parse_state (IDL_GlobalData::PS_EventTypeBodySeen); } -#line 10110 "fe/idl.tab.cpp" +#line 10121 "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 6723 "fe/idl.ypp" { idl_global->set_parse_state (IDL_GlobalData::PS_EventTypeQsSeen); @@ -10109,116 +10132,116 @@ yyparse (void) (yyval.dcval) = (yyvsp[-5].dcval); } -#line 10125 "fe/idl.tab.cpp" +#line 10136 "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 6737 "fe/idl.ypp" { (yyval.idval) = (yyvsp[0].idval); } -#line 10133 "fe/idl.tab.cpp" +#line 10144 "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 6741 "fe/idl.ypp" { (yyval.idval) = (yyvsp[0].idval); } -#line 10141 "fe/idl.tab.cpp" +#line 10152 "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 6748 "fe/idl.ypp" { (yyval.ntval) = AST_Decl::NT_type; } -#line 10149 "fe/idl.tab.cpp" +#line 10160 "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 6752 "fe/idl.ypp" { (yyval.ntval) = AST_Decl::NT_struct; } -#line 10157 "fe/idl.tab.cpp" +#line 10168 "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 6756 "fe/idl.ypp" { (yyval.ntval) = AST_Decl::NT_union; } -#line 10165 "fe/idl.tab.cpp" +#line 10176 "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 6760 "fe/idl.ypp" { (yyval.ntval) = AST_Decl::NT_eventtype; } -#line 10173 "fe/idl.tab.cpp" +#line 10184 "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 6764 "fe/idl.ypp" { (yyval.ntval) = AST_Decl::NT_sequence; } -#line 10181 "fe/idl.tab.cpp" +#line 10192 "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 6768 "fe/idl.ypp" { (yyval.ntval) = AST_Decl::NT_map; } -#line 10189 "fe/idl.tab.cpp" +#line 10200 "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 6772 "fe/idl.ypp" { (yyval.ntval) = AST_Decl::NT_interface; } -#line 10197 "fe/idl.tab.cpp" +#line 10208 "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 6776 "fe/idl.ypp" { (yyval.ntval) = AST_Decl::NT_valuetype; } -#line 10205 "fe/idl.tab.cpp" +#line 10216 "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 6780 "fe/idl.ypp" { (yyval.ntval) = AST_Decl::NT_enum; } -#line 10213 "fe/idl.tab.cpp" +#line 10224 "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 6784 "fe/idl.ypp" { (yyval.ntval) = AST_Decl::NT_except; } -#line 10221 "fe/idl.tab.cpp" +#line 10232 "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 6788 "fe/idl.ypp" { (yyval.ntval) = AST_Decl::NT_const; t_param_const_type = (yyvsp[0].etval); } -#line 10230 "fe/idl.tab.cpp" +#line 10241 "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 6796 "fe/idl.ypp" { if ((yyvsp[0].plval) == 0) { @@ -10246,11 +10269,11 @@ yyparse (void) (yyval.plval) = (yyvsp[0].plval); } -#line 10262 "fe/idl.tab.cpp" +#line 10273 "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 6827 "fe/idl.ypp" { if ((yyvsp[-2].plval) == 0) { @@ -10263,19 +10286,19 @@ yyparse (void) delete (yyvsp[0].pival); (yyvsp[0].pival) = 0; } -#line 10279 "fe/idl.tab.cpp" +#line 10290 "fe/idl.tab.cpp" break; - case 571: /* formal_parameters: %empty */ -#line 6833 "fe/idl.ypp" + case 574: /* formal_parameters: %empty */ +#line 6840 "fe/idl.ypp" { (yyval.plval) = 0; } -#line 10287 "fe/idl.tab.cpp" +#line 10298 "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 6847 "fe/idl.ypp" { ACE_NEW_RETURN ((yyval.pival), @@ -10300,11 +10323,11 @@ yyparse (void) tao_enum_constant_decl = 0; } } -#line 10316 "fe/idl.tab.cpp" +#line 10327 "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 6872 "fe/idl.ypp" { ACE_NEW_RETURN ((yyval.pival), FE_Utils::T_Param_Info, @@ -10319,19 +10342,19 @@ yyparse (void) ACE::strdelete ((yyvsp[0].strval)); (yyvsp[0].strval) = 0; } -#line 10335 "fe/idl.tab.cpp" +#line 10346 "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 6890 "fe/idl.ypp" { ACE_NEW_RETURN ((yyval.slval), UTL_StrList ((yyvsp[-1].sval), (yyvsp[0].slval)), 1); } -#line 10343 "fe/idl.tab.cpp" +#line 10354 "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 6897 "fe/idl.ypp" { UTL_StrList *sl = 0; ACE_NEW_RETURN (sl, UTL_StrList ((yyvsp[0].sval), 0), 1); @@ -10346,37 +10369,37 @@ yyparse (void) (yyval.slval) = (yyvsp[-2].slval); } } -#line 10362 "fe/idl.tab.cpp" +#line 10373 "fe/idl.tab.cpp" break; - case 576: /* formal_parameter_names: %empty */ -#line 6905 "fe/idl.ypp" + case 579: /* formal_parameter_names: %empty */ +#line 6912 "fe/idl.ypp" { (yyval.slval) = 0; } -#line 10370 "fe/idl.tab.cpp" +#line 10381 "fe/idl.tab.cpp" break; - case 577: /* formal_parameter_name: IDENTIFIER */ -#line 6912 "fe/idl.ypp" + case 580: /* formal_parameter_name: IDENTIFIER */ +#line 6919 "fe/idl.ypp" { ACE_NEW_RETURN ((yyval.sval), UTL_String ((yyvsp[0].strval), true), 1); } -#line 10380 "fe/idl.tab.cpp" +#line 10391 "fe/idl.tab.cpp" break; - case 578: /* $@178: %empty */ -#line 6921 "fe/idl.ypp" + case 581: /* $@178: %empty */ +#line 6928 "fe/idl.ypp" { idl_global->set_parse_state (IDL_GlobalData::PS_PorttypeSeen); } -#line 10388 "fe/idl.tab.cpp" +#line 10399 "fe/idl.tab.cpp" break; - case 579: /* @179: %empty */ -#line 6925 "fe/idl.ypp" + case 582: /* @179: %empty */ +#line 6932 "fe/idl.ypp" { char *&id_value = (yyvsp[0].strval); idl_global->set_parse_state (IDL_GlobalData::PS_PorttypeIDSeen); @@ -10395,27 +10418,27 @@ yyparse (void) // Push it on the scopes stack. idl_global->scopes ().push (porttype); } -#line 10411 "fe/idl.tab.cpp" +#line 10422 "fe/idl.tab.cpp" break; - case 580: /* $@180: %empty */ -#line 6944 "fe/idl.ypp" + case 583: /* $@180: %empty */ +#line 6951 "fe/idl.ypp" { idl_global->set_parse_state (IDL_GlobalData::PS_PorttypeSqSeen); } -#line 10419 "fe/idl.tab.cpp" +#line 10430 "fe/idl.tab.cpp" break; - case 581: /* $@181: %empty */ -#line 6952 "fe/idl.ypp" + case 584: /* $@181: %empty */ +#line 6959 "fe/idl.ypp" { idl_global->set_parse_state (IDL_GlobalData::PS_PorttypeBodySeen); } -#line 10427 "fe/idl.tab.cpp" +#line 10438 "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 6963 "fe/idl.ypp" { idl_global->set_parse_state (IDL_GlobalData::PS_PorttypeQsSeen); @@ -10424,11 +10447,11 @@ yyparse (void) (yyval.dcval) = (yyvsp[-5].dcval); } -#line 10440 "fe/idl.tab.cpp" +#line 10451 "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 6975 "fe/idl.ypp" { AST_Annotation_Appls *&annotations = (yyvsp[-1].annotations_val); AST_Decl *&node = (yyvsp[0].dcval); @@ -10443,27 +10466,27 @@ yyparse (void) } delete annotations; } -#line 10459 "fe/idl.tab.cpp" +#line 10470 "fe/idl.tab.cpp" break; - case 589: /* $@182: %empty */ -#line 6994 "fe/idl.ypp" + case 592: /* $@182: %empty */ +#line 7001 "fe/idl.ypp" { idl_global->set_parse_state (IDL_GlobalData::PS_AttrDeclSeen); } -#line 10467 "fe/idl.tab.cpp" +#line 10478 "fe/idl.tab.cpp" break; - case 590: /* port_export: attribute $@182 ';' */ -#line 6998 "fe/idl.ypp" + case 593: /* port_export: attribute $@182 ';' */ +#line 7005 "fe/idl.ypp" { (yyval.dcval) = (yyvsp[-2].dcval); } -#line 10475 "fe/idl.tab.cpp" +#line 10486 "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 7012 "fe/idl.ypp" { idl_global->set_parse_state (IDL_GlobalData::PS_ExtendedPortDeclSeen); UTL_Scope *s = idl_global->scopes ().top_non_null (); @@ -10530,11 +10553,11 @@ yyparse (void) (yyval.dcval) = ep; } -#line 10546 "fe/idl.tab.cpp" +#line 10557 "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 7079 "fe/idl.ypp" { idl_global->set_parse_state (IDL_GlobalData::PS_MirrorPortDeclSeen); UTL_Scope *s = idl_global->scopes ().top_non_null (); @@ -10579,11 +10602,11 @@ yyparse (void) (yyval.dcval) = mp; } -#line 10595 "fe/idl.tab.cpp" +#line 10606 "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 7127 "fe/idl.ypp" { if ((yyvsp[0].alval) == 0) { @@ -10596,11 +10619,11 @@ yyparse (void) (yyvsp[0].alval)->enqueue_head ((yyvsp[-1].dcval)); (yyval.alval) = (yyvsp[0].alval); } -#line 10612 "fe/idl.tab.cpp" +#line 10623 "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 7143 "fe/idl.ypp" { if ((yyvsp[-3].alval) == 0) { @@ -10613,19 +10636,19 @@ yyparse (void) (yyvsp[-3].alval)->enqueue_tail ((yyvsp[0].dcval)); (yyval.alval) = (yyvsp[-3].alval); } -#line 10629 "fe/idl.tab.cpp" +#line 10640 "fe/idl.tab.cpp" break; - case 595: /* actual_parameters: %empty */ -#line 7149 "fe/idl.ypp" + case 598: /* actual_parameters: %empty */ +#line 7156 "fe/idl.ypp" { (yyval.alval) = 0; } -#line 10637 "fe/idl.tab.cpp" +#line 10648 "fe/idl.tab.cpp" break; - case 596: /* actual_parameter: expression */ -#line 7156 "fe/idl.ypp" + case 599: /* actual_parameter: expression */ +#line 7163 "fe/idl.ypp" { // To avoid grammar conflicts with this LALR(1) parser, // we take advantage of the fact that an expression can @@ -10681,35 +10704,35 @@ yyparse (void) 0); } } -#line 10697 "fe/idl.tab.cpp" +#line 10708 "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 7222 "fe/idl.ypp" { (yyval.dcval) = 0; } -#line 10705 "fe/idl.tab.cpp" +#line 10716 "fe/idl.tab.cpp" break; - case 598: /* $@183: %empty */ -#line 7222 "fe/idl.ypp" + case 601: /* $@183: %empty */ +#line 7229 "fe/idl.ypp" { idl_global->set_parse_state (IDL_GlobalData::PS_ConnectorSeen); } -#line 10713 "fe/idl.tab.cpp" +#line 10724 "fe/idl.tab.cpp" break; - case 599: /* $@184: %empty */ -#line 7226 "fe/idl.ypp" + case 602: /* $@184: %empty */ +#line 7233 "fe/idl.ypp" { idl_global->set_parse_state (IDL_GlobalData::PS_ConnectorIDSeen); } -#line 10721 "fe/idl.tab.cpp" +#line 10732 "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 7237 "fe/idl.ypp" { UTL_Scope *s = idl_global->scopes ().top_non_null (); AST_Connector *parent = 0; @@ -10763,102 +10786,102 @@ yyparse (void) delete (yyvsp[-3].annotations_val); } -#line 10779 "fe/idl.tab.cpp" +#line 10790 "fe/idl.tab.cpp" break; - case 601: /* $@185: %empty */ -#line 7287 "fe/idl.ypp" + case 604: /* $@185: %empty */ +#line 7294 "fe/idl.ypp" { idl_global->set_parse_state (IDL_GlobalData::PS_ConnectorSqSeen); } -#line 10787 "fe/idl.tab.cpp" +#line 10798 "fe/idl.tab.cpp" break; - case 602: /* $@186: %empty */ -#line 7291 "fe/idl.ypp" + case 605: /* $@186: %empty */ +#line 7298 "fe/idl.ypp" { idl_global->set_parse_state (IDL_GlobalData::PS_ConnectorBodySeen); } -#line 10795 "fe/idl.tab.cpp" +#line 10806 "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 7302 "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 10817 "fe/idl.tab.cpp" break; - case 606: /* $@187: %empty */ -#line 7310 "fe/idl.ypp" + case 609: /* $@187: %empty */ +#line 7317 "fe/idl.ypp" { idl_global->set_parse_state (IDL_GlobalData::PS_ProvidesDeclSeen); } -#line 10814 "fe/idl.tab.cpp" +#line 10825 "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 7321 "fe/idl.ypp" { idl_global->set_parse_state (IDL_GlobalData::PS_NoState); } -#line 10822 "fe/idl.tab.cpp" +#line 10833 "fe/idl.tab.cpp" break; - case 608: /* $@188: %empty */ -#line 7318 "fe/idl.ypp" + case 611: /* $@188: %empty */ +#line 7325 "fe/idl.ypp" { idl_global->set_parse_state (IDL_GlobalData::PS_UsesDeclSeen); } -#line 10830 "fe/idl.tab.cpp" +#line 10841 "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 7329 "fe/idl.ypp" { idl_global->set_parse_state (IDL_GlobalData::PS_NoState); } -#line 10838 "fe/idl.tab.cpp" +#line 10849 "fe/idl.tab.cpp" break; - case 610: /* $@189: %empty */ -#line 7326 "fe/idl.ypp" + case 613: /* $@189: %empty */ +#line 7333 "fe/idl.ypp" { idl_global->set_parse_state (IDL_GlobalData::PS_AttrDeclSeen); } -#line 10846 "fe/idl.tab.cpp" +#line 10857 "fe/idl.tab.cpp" break; - case 611: /* connector_export: attribute $@189 ';' */ -#line 7330 "fe/idl.ypp" + case 614: /* connector_export: attribute $@189 ';' */ +#line 7337 "fe/idl.ypp" { idl_global->set_parse_state (IDL_GlobalData::PS_NoState); } -#line 10854 "fe/idl.tab.cpp" +#line 10865 "fe/idl.tab.cpp" break; - case 612: /* $@190: %empty */ -#line 7334 "fe/idl.ypp" + case 615: /* $@190: %empty */ +#line 7341 "fe/idl.ypp" { idl_global->set_parse_state (IDL_GlobalData::PS_ExtendedPortDeclSeen); } -#line 10862 "fe/idl.tab.cpp" +#line 10873 "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 7345 "fe/idl.ypp" { idl_global->set_parse_state (IDL_GlobalData::PS_NoState); } -#line 10870 "fe/idl.tab.cpp" +#line 10881 "fe/idl.tab.cpp" break; -#line 10874 "fe/idl.tab.cpp" +#line 10885 "fe/idl.tab.cpp" default: break; } @@ -11051,7 +11074,7 @@ yyparse (void) return yyresult; } -#line 7343 "fe/idl.ypp" +#line 7350 "fe/idl.ypp" /* programs */ diff --git a/TAO/TAO_IDL/fe/idl.tab.hpp b/TAO/TAO_IDL/fe/idl.tab.hpp index 512f86809f647..ea66d80608415 100644 --- a/TAO/TAO_IDL/fe/idl.tab.hpp +++ b/TAO/TAO_IDL/fe/idl.tab.hpp @@ -76,78 +76,81 @@ extern int tao_yydebug; IDL_SWITCH = 277, /* IDL_SWITCH */ IDL_ENUM = 278, /* IDL_ENUM */ IDL_SEQUENCE = 279, /* IDL_SEQUENCE */ - IDL_MAP = 280, /* IDL_MAP */ - IDL_STRING = 281, /* IDL_STRING */ - IDL_WSTRING = 282, /* IDL_WSTRING */ - IDL_EXCEPTION = 283, /* IDL_EXCEPTION */ - IDL_CASE = 284, /* IDL_CASE */ - IDL_DEFAULT = 285, /* IDL_DEFAULT */ - IDL_READONLY = 286, /* IDL_READONLY */ - IDL_ATTRIBUTE = 287, /* IDL_ATTRIBUTE */ - IDL_ONEWAY = 288, /* IDL_ONEWAY */ - IDL_IDEMPOTENT = 289, /* IDL_IDEMPOTENT */ - IDL_VOID = 290, /* IDL_VOID */ - IDL_IN = 291, /* IDL_IN */ - IDL_OUT = 292, /* IDL_OUT */ - IDL_INOUT = 293, /* IDL_INOUT */ - IDL_RAISES = 294, /* IDL_RAISES */ - IDL_CONTEXT = 295, /* IDL_CONTEXT */ - IDL_NATIVE = 296, /* IDL_NATIVE */ - IDL_LOCAL = 297, /* IDL_LOCAL */ - IDL_ABSTRACT = 298, /* IDL_ABSTRACT */ - IDL_CUSTOM = 299, /* IDL_CUSTOM */ - IDL_FACTORY = 300, /* IDL_FACTORY */ - IDL_PRIVATE = 301, /* IDL_PRIVATE */ - IDL_PUBLIC = 302, /* IDL_PUBLIC */ - IDL_SUPPORTS = 303, /* IDL_SUPPORTS */ - IDL_TRUNCATABLE = 304, /* IDL_TRUNCATABLE */ - IDL_VALUETYPE = 305, /* IDL_VALUETYPE */ - IDL_COMPONENT = 306, /* IDL_COMPONENT */ - IDL_CONSUMES = 307, /* IDL_CONSUMES */ - IDL_EMITS = 308, /* IDL_EMITS */ - IDL_EVENTTYPE = 309, /* IDL_EVENTTYPE */ - IDL_FINDER = 310, /* IDL_FINDER */ - IDL_GETRAISES = 311, /* IDL_GETRAISES */ - IDL_HOME = 312, /* IDL_HOME */ - IDL_IMPORT = 313, /* IDL_IMPORT */ - IDL_MULTIPLE = 314, /* IDL_MULTIPLE */ - IDL_PRIMARYKEY = 315, /* IDL_PRIMARYKEY */ - IDL_PROVIDES = 316, /* IDL_PROVIDES */ - IDL_PUBLISHES = 317, /* IDL_PUBLISHES */ - IDL_SETRAISES = 318, /* IDL_SETRAISES */ - IDL_TYPEID = 319, /* IDL_TYPEID */ - IDL_TYPEPREFIX = 320, /* IDL_TYPEPREFIX */ - IDL_USES = 321, /* IDL_USES */ - IDL_MANAGES = 322, /* IDL_MANAGES */ - IDL_TYPENAME = 323, /* IDL_TYPENAME */ - IDL_PORT = 324, /* IDL_PORT */ - IDL_MIRRORPORT = 325, /* IDL_MIRRORPORT */ - IDL_PORTTYPE = 326, /* IDL_PORTTYPE */ - IDL_CONNECTOR = 327, /* IDL_CONNECTOR */ - IDL_ALIAS = 328, /* IDL_ALIAS */ - IDL_INTEGER_LITERAL = 329, /* IDL_INTEGER_LITERAL */ - IDL_UINTEGER_LITERAL = 330, /* IDL_UINTEGER_LITERAL */ - IDL_STRING_LITERAL = 331, /* IDL_STRING_LITERAL */ - IDL_CHARACTER_LITERAL = 332, /* IDL_CHARACTER_LITERAL */ - IDL_FLOATING_PT_LITERAL = 333, /* IDL_FLOATING_PT_LITERAL */ - IDL_FIXED_PT_LITERAL = 334, /* IDL_FIXED_PT_LITERAL */ - IDL_TRUETOK = 335, /* IDL_TRUETOK */ - IDL_FALSETOK = 336, /* IDL_FALSETOK */ - IDL_INT8 = 337, /* IDL_INT8 */ - IDL_UINT8 = 338, /* IDL_UINT8 */ - IDL_INT16 = 339, /* IDL_INT16 */ - IDL_UINT16 = 340, /* IDL_UINT16 */ - IDL_INT32 = 341, /* IDL_INT32 */ - IDL_UINT32 = 342, /* IDL_UINT32 */ - IDL_INT64 = 343, /* IDL_INT64 */ - IDL_UINT64 = 344, /* IDL_UINT64 */ - IDL_SCOPE_DELIMITOR = 345, /* IDL_SCOPE_DELIMITOR */ - IDL_LEFT_SHIFT = 346, /* IDL_LEFT_SHIFT */ - IDL_RIGHT_SHIFT = 347, /* IDL_RIGHT_SHIFT */ - IDL_WCHAR_LITERAL = 348, /* IDL_WCHAR_LITERAL */ - IDL_WSTRING_LITERAL = 349, /* IDL_WSTRING_LITERAL */ - IDL_ANNOTATION_DECL = 350, /* IDL_ANNOTATION_DECL */ - IDL_ANNOTATION_SYMBOL = 351 /* IDL_ANNOTATION_SYMBOL */ + IDL_STRING = 280, /* IDL_STRING */ + IDL_WSTRING = 281, /* IDL_WSTRING */ + IDL_EXCEPTION = 282, /* IDL_EXCEPTION */ + IDL_CASE = 283, /* IDL_CASE */ + IDL_DEFAULT = 284, /* IDL_DEFAULT */ + IDL_READONLY = 285, /* IDL_READONLY */ + IDL_ATTRIBUTE = 286, /* IDL_ATTRIBUTE */ + IDL_ONEWAY = 287, /* IDL_ONEWAY */ + IDL_IDEMPOTENT = 288, /* IDL_IDEMPOTENT */ + IDL_VOID = 289, /* IDL_VOID */ + IDL_IN = 290, /* IDL_IN */ + IDL_OUT = 291, /* IDL_OUT */ + IDL_INOUT = 292, /* IDL_INOUT */ + IDL_RAISES = 293, /* IDL_RAISES */ + IDL_CONTEXT = 294, /* IDL_CONTEXT */ + IDL_NATIVE = 295, /* IDL_NATIVE */ + IDL_LOCAL = 296, /* IDL_LOCAL */ + IDL_ABSTRACT = 297, /* IDL_ABSTRACT */ + IDL_CUSTOM = 298, /* IDL_CUSTOM */ + IDL_FACTORY = 299, /* IDL_FACTORY */ + IDL_PRIVATE = 300, /* IDL_PRIVATE */ + IDL_PUBLIC = 301, /* IDL_PUBLIC */ + IDL_SUPPORTS = 302, /* IDL_SUPPORTS */ + IDL_TRUNCATABLE = 303, /* IDL_TRUNCATABLE */ + IDL_VALUETYPE = 304, /* IDL_VALUETYPE */ + IDL_COMPONENT = 305, /* IDL_COMPONENT */ + IDL_CONSUMES = 306, /* IDL_CONSUMES */ + IDL_EMITS = 307, /* IDL_EMITS */ + IDL_EVENTTYPE = 308, /* IDL_EVENTTYPE */ + IDL_FINDER = 309, /* IDL_FINDER */ + IDL_GETRAISES = 310, /* IDL_GETRAISES */ + IDL_HOME = 311, /* IDL_HOME */ + IDL_IMPORT = 312, /* IDL_IMPORT */ + IDL_MULTIPLE = 313, /* IDL_MULTIPLE */ + IDL_PRIMARYKEY = 314, /* IDL_PRIMARYKEY */ + IDL_PROVIDES = 315, /* IDL_PROVIDES */ + IDL_PUBLISHES = 316, /* IDL_PUBLISHES */ + IDL_SETRAISES = 317, /* IDL_SETRAISES */ + IDL_TYPEID = 318, /* IDL_TYPEID */ + IDL_TYPEPREFIX = 319, /* IDL_TYPEPREFIX */ + IDL_USES = 320, /* IDL_USES */ + IDL_MANAGES = 321, /* IDL_MANAGES */ + IDL_TYPENAME = 322, /* IDL_TYPENAME */ + IDL_PORT = 323, /* IDL_PORT */ + IDL_MIRRORPORT = 324, /* IDL_MIRRORPORT */ + IDL_PORTTYPE = 325, /* IDL_PORTTYPE */ + IDL_CONNECTOR = 326, /* IDL_CONNECTOR */ + IDL_ALIAS = 327, /* IDL_ALIAS */ + IDL_INTEGER_LITERAL = 328, /* IDL_INTEGER_LITERAL */ + IDL_UINTEGER_LITERAL = 329, /* IDL_UINTEGER_LITERAL */ + IDL_STRING_LITERAL = 330, /* IDL_STRING_LITERAL */ + IDL_CHARACTER_LITERAL = 331, /* IDL_CHARACTER_LITERAL */ + IDL_FLOATING_PT_LITERAL = 332, /* IDL_FLOATING_PT_LITERAL */ + IDL_FIXED_PT_LITERAL = 333, /* IDL_FIXED_PT_LITERAL */ + IDL_TRUETOK = 334, /* IDL_TRUETOK */ + IDL_FALSETOK = 335, /* IDL_FALSETOK */ + IDL_INT8 = 336, /* IDL_INT8 */ + IDL_UINT8 = 337, /* IDL_UINT8 */ + IDL_INT16 = 338, /* IDL_INT16 */ + IDL_UINT16 = 339, /* IDL_UINT16 */ + IDL_INT32 = 340, /* IDL_INT32 */ + IDL_UINT32 = 341, /* IDL_UINT32 */ + IDL_INT64 = 342, /* IDL_INT64 */ + IDL_UINT64 = 343, /* IDL_UINT64 */ + IDL_SCOPE_DELIMITOR = 344, /* IDL_SCOPE_DELIMITOR */ + IDL_LEFT_SHIFT = 345, /* IDL_LEFT_SHIFT */ + IDL_RIGHT_SHIFT = 346, /* IDL_RIGHT_SHIFT */ + IDL_WCHAR_LITERAL = 347, /* IDL_WCHAR_LITERAL */ + IDL_WSTRING_LITERAL = 348, /* IDL_WSTRING_LITERAL */ + IDL_ANNOTATION_DECL = 349, /* IDL_ANNOTATION_DECL */ + IDL_ANNOTATION_SYMBOL = 350, /* IDL_ANNOTATION_SYMBOL */ + IDL_BITFIELD = 351, /* IDL_BITFIELD */ + IDL_BITMASK = 352, /* IDL_BITMASK */ + IDL_BITSET = 353, /* IDL_BITSET */ + IDL_MAP = 354 /* IDL_MAP */ }; typedef enum yytokentype yytoken_kind_t; #endif @@ -202,7 +205,7 @@ union YYSTYPE Decl_Annotations_Pair *decl_annotations_pair_val; Decl_Annotations_Pair_Pair* decl_annotations_pair_val_pair; -#line 206 "fe/idl.tab.hpp" +#line 209 "fe/idl.tab.hpp" }; typedef union YYSTYPE YYSTYPE; diff --git a/TAO/TAO_IDL/fe/idl.ypp b/TAO/TAO_IDL/fe/idl.ypp index ff2d5b6677310..04662cac902d3 100644 --- a/TAO/TAO_IDL/fe/idl.ypp +++ b/TAO/TAO_IDL/fe/idl.ypp @@ -234,7 +234,6 @@ bool stack_based_lookup_for_primary_expr = false; %token IDL_SWITCH %token IDL_ENUM %token IDL_SEQUENCE -%token IDL_MAP %token IDL_STRING %token IDL_WSTRING %token IDL_EXCEPTION @@ -315,6 +314,11 @@ bool stack_based_lookup_for_primary_expr = false; %token IDL_ANNOTATION_DECL %token IDL_ANNOTATION_SYMBOL +%token IDL_BITFIELD +%token IDL_BITMASK +%token IDL_BITSET +%token IDL_MAP + /* * These are production names: */ @@ -2365,10 +2369,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 IDL versions before 4"); Identifier *id = $2; UTL_ScopedName name (id, 0); @@ -2513,10 +2515,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 IDL versions before 4"); AST_Annotation_Decl *decl = 0; UTL_ScopedName *name = $2; @@ -2622,6 +2622,10 @@ annotation_appl_params { $$ = $1; } + | %empty + { + $$ = 0; + } ; named_annotation_appl_params @@ -3153,14 +3157,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 +3169,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 IDL versions before 4"); + + 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 +3430,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 IDL versions before 4"); - $$ = - 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 IDL versions before 4"); + + $$ = 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 @@ -3460,8 +3467,7 @@ switch_type_spec : * typedef's to arrive at the base type at the end of the * chain. */ - d = - s->lookup_by_name ($1); + d = s->lookup_by_name ($1); if (s != 0 && d != 0) { @@ -3486,6 +3492,8 @@ switch_type_spec : case AST_PredefinedType::PT_ulonglong: case AST_PredefinedType::PT_short: case AST_PredefinedType::PT_ushort: + case AST_PredefinedType::PT_int8: + case AST_PredefinedType::PT_uint8: case AST_PredefinedType::PT_char: case AST_PredefinedType::PT_boolean: $$ = p; @@ -3493,11 +3501,10 @@ switch_type_spec : break; case AST_PredefinedType::PT_wchar: case AST_PredefinedType::PT_octet: - /* octets and wchars are not allowed */ - idl_global->err ()->error0 ( - UTL_Error::EIDL_DISC_TYPE - ); - $$ = 0; + if (idl_global->idl_version_ < IDL_VERSION_4) + idl_global->err ()->idl_version_error ( + "Using octet or wchar as a union discriminator isn't allowed in IDL versions before 4"); + $$ = p; found = true; break; default: @@ -3895,7 +3902,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..21634a13bc1c5 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. @@ -608,8 +608,8 @@ static void yynoreturn yy_fatal_error ( const char* msg ); YY_FATAL_ERROR( "token too large, exceeds YYLMAX" ); \ yy_flex_strncpy( yytext, (yytext_ptr), yyleng + 1 ); \ (yy_c_buf_p) = yy_cp; -#define YY_NUM_RULES 123 -#define YY_END_OF_BUFFER 124 +#define YY_NUM_RULES 125 +#define YY_END_OF_BUFFER 126 /* This struct is not used in this scanner, but its presence is necessary. */ struct yy_trans_info @@ -617,80 +617,82 @@ struct yy_trans_info flex_int32_t yy_verify; flex_int32_t yy_nxt; }; -static const flex_int16_t yy_acclist[629] = +static const flex_int16_t yy_acclist[645] = { 0, - 120, 120, 124, 122, 123, 120, 122, 123, 121, 123, - 121, 122, 123, 122, 123, 122, 123, 122, 123, 122, - 123, 122, 123, 95, 122, 123, 91, 122, 123, 122, - 123, 122, 123, 122, 123, 85, 122, 123, 86, 122, - 123, 86, 122, 123, 86, 122, 123, 86, 122, 123, - 86, 122, 123, 86, 122, 123, 86, 122, 123, 86, - 122, 123, 86, 122, 123, 86, 122, 123, 86, 122, - 123, 86, 122, 123, 86, 122, 123, 86, 122, 123, - 86, 122, 123, 86, 122, 123, 86, 122, 123, 86, - 122, 123, 86, 122, 123, 86, 122, 123, 86, 122, - - 123, 86, 122, 123, 86, 122, 123, 86, 122, 123, - 86, 122, 123, 120, 122, 123, 122, 123, 121, 122, - 123, 120, 96, 94, 90, 87, 119, 87, 95, 89, - 91, 83, 81, 82, 86, 86, 86, 86, 86, 86, - 86, 86, 86, 86, 86, 86, 86, 86, 86, 86, - 86, 86, 86, 86, 86, 86, 86, 86, 86, 78, - 86, 86, 86, 86, 86, 86, 86, 86, 86, 86, - 86, 86, 86, 86, 86, 86, 86, 86, 86, 86, - 86, 86, 86, 86, 86, 86, 86, 86, 86, 120, - 114, 96, 98, 98, 94, 90, 87, 118, 118, 87, - - 88, 93, 86, 97, 86, 86, 86, 86, 1, 86, - 86, 86, 86, 86, 86, 86, 86, 86, 86, 86, - 86, 86, 86, 86, 86, 86, 86, 86, 86, 86, - 86, 86, 86, 86, 86, 17, 44, 86, 86, 86, - 86, 86, 86, 86, 79, 86, 86, 86, 86, 86, - 86, 86, 86, 86, 86, 86, 86, 86, 86, 86, - 86, 86, 86, 86, 86, 86, 86, 86, 101, 99, - 101, 92, 87, 88, 86, 97, 102, 86, 75, 86, - 86, 86, 86, 86, 21, 86, 28, 86, 86, 86, - 86, 86, 86, 86, 86, 86, 13, 86, 86, 86, - - 86, 86, 86, 86, 86, 58, 86, 86, 86, 86, - 86, 86, 36, 86, 86, 86, 25, 86, 86, 86, - 86, 86, 86, 86, 86, 70, 86, 86, 86, 86, - 86, 86, 86, 86, 86, 86, 86, 86, 86, 86, - 86, 86, 86, 86, 86, 67, 86, 86, 32, 86, - 86, 86, 115, 99, 100, 76, 86, 86, 86, 74, - 86, 86, 86, 86, 86, 10, 86, 86, 86, 86, - 86, 86, 54, 86, 86, 86, 86, 86, 19, 86, - 23, 86, 86, 86, 77, 86, 38, 86, 40, 86, - 42, 86, 86, 34, 86, 86, 86, 86, 86, 86, - - 31, 86, 86, 86, 86, 86, 86, 86, 86, 86, - 86, 86, 26, 86, 86, 86, 86, 86, 86, 86, - 86, 86, 86, 86, 86, 86, 37, 86, 18, 86, - 86, 86, 29, 86, 86, 110, 103, 2, 86, 86, - 86, 86, 86, 86, 86, 86, 45, 86, 86, 24, - 86, 86, 86, 86, 56, 86, 86, 59, 86, 86, - 86, 86, 3, 86, 86, 33, 86, 80, 86, 86, - 86, 86, 86, 48, 86, 86, 4, 86, 86, 86, - 86, 14, 86, 12, 86, 86, 20, 86, 86, 86, - 65, 86, 86, 86, 39, 86, 41, 86, 43, 86, - - 86, 86, 86, 108, 86, 86, 30, 86, 86, 86, - 86, 8, 86, 22, 86, 86, 86, 46, 86, 86, - 86, 68, 86, 86, 86, 86, 86, 47, 86, 86, - 86, 86, 86, 86, 86, 86, 11, 86, 86, 86, - 86, 86, 15, 86, 106, 106, 112, 111, 35, 86, - 86, 86, 86, 53, 86, 86, 86, 86, 86, 86, - 60, 86, 72, 86, 86, 62, 86, 86, 5, 86, - 16, 86, 86, 49, 86, 86, 69, 86, 86, 27, - 86, 86, 116, 116, 109, 6, 86, 52, 86, 73, - 86, 55, 86, 7, 86, 57, 86, 9, 86, 86, - - 86, 63, 86, 64, 86, 86, 86, 51, 86, 104, - 104, 107, 107, 71, 86, 61, 86, 86, 66, 86, - 117, 117, 50, 86, 113, 105, 105, 84 + 122, 122, 126, 124, 125, 122, 124, 125, 123, 125, + 123, 124, 125, 124, 125, 124, 125, 124, 125, 124, + 125, 124, 125, 97, 124, 125, 93, 124, 125, 124, + 125, 124, 125, 124, 125, 75, 124, 125, 88, 124, + 125, 88, 124, 125, 88, 124, 125, 88, 124, 125, + 88, 124, 125, 88, 124, 125, 88, 124, 125, 88, + 124, 125, 88, 124, 125, 88, 124, 125, 88, 124, + 125, 88, 124, 125, 88, 124, 125, 88, 124, 125, + 88, 124, 125, 88, 124, 125, 88, 124, 125, 88, + 124, 125, 88, 124, 125, 88, 124, 125, 88, 124, + + 125, 88, 124, 125, 88, 124, 125, 88, 124, 125, + 88, 124, 125, 122, 124, 125, 124, 125, 123, 124, + 125, 122, 98, 96, 92, 89, 121, 89, 97, 91, + 93, 73, 71, 72, 88, 88, 88, 88, 88, 88, + 88, 88, 88, 88, 88, 88, 88, 88, 88, 88, + 88, 88, 88, 88, 88, 88, 88, 88, 88, 88, + 68, 88, 88, 88, 88, 88, 88, 88, 88, 88, + 88, 88, 88, 88, 88, 88, 88, 88, 88, 88, + 88, 88, 88, 88, 88, 88, 88, 88, 88, 88, + 122, 116, 98, 100, 100, 96, 92, 89, 120, 120, + + 89, 90, 95, 88, 99, 88, 88, 88, 88, 1, + 88, 88, 88, 88, 88, 88, 88, 88, 88, 88, + 88, 88, 88, 88, 88, 88, 88, 88, 88, 88, + 88, 88, 88, 88, 88, 88, 88, 87, 88, 88, + 88, 88, 88, 88, 88, 69, 88, 88, 88, 88, + 88, 88, 88, 88, 88, 88, 88, 88, 88, 88, + 88, 88, 88, 88, 88, 88, 88, 88, 88, 103, + 101, 103, 94, 89, 90, 88, 99, 104, 88, 65, + 88, 88, 88, 88, 88, 88, 88, 88, 20, 88, + 27, 88, 88, 88, 88, 88, 88, 88, 88, 88, + + 13, 88, 88, 88, 88, 88, 88, 88, 88, 48, + 88, 88, 88, 88, 88, 88, 76, 88, 88, 88, + 24, 88, 88, 88, 88, 88, 88, 88, 88, 60, + 88, 88, 88, 88, 88, 88, 88, 88, 88, 88, + 88, 88, 88, 88, 88, 88, 88, 88, 88, 57, + 88, 88, 31, 88, 88, 88, 117, 101, 102, 66, + 88, 88, 88, 64, 88, 88, 88, 88, 88, 88, + 88, 88, 10, 88, 88, 88, 88, 88, 88, 44, + 88, 88, 88, 88, 88, 18, 88, 22, 88, 88, + 88, 67, 88, 78, 88, 80, 88, 82, 88, 88, + + 33, 88, 88, 88, 88, 88, 88, 30, 88, 88, + 88, 88, 88, 88, 88, 88, 88, 88, 88, 25, + 88, 88, 88, 88, 88, 88, 88, 88, 88, 88, + 88, 88, 88, 77, 88, 17, 88, 88, 88, 28, + 88, 88, 112, 105, 2, 88, 88, 88, 88, 88, + 86, 88, 88, 88, 88, 88, 88, 35, 88, 88, + 23, 88, 88, 88, 88, 46, 88, 88, 49, 88, + 88, 88, 88, 3, 88, 88, 32, 88, 70, 88, + 88, 88, 88, 88, 38, 88, 88, 4, 88, 88, + 88, 88, 14, 88, 12, 88, 88, 19, 88, 88, + + 88, 55, 88, 88, 88, 79, 88, 81, 88, 83, + 88, 88, 88, 88, 110, 88, 88, 88, 85, 88, + 29, 88, 88, 88, 88, 8, 88, 21, 88, 88, + 88, 36, 88, 88, 88, 58, 88, 88, 88, 88, + 88, 37, 88, 88, 88, 88, 88, 88, 88, 88, + 11, 88, 88, 88, 88, 88, 15, 88, 108, 108, + 114, 113, 34, 88, 88, 84, 88, 88, 88, 43, + 88, 88, 88, 88, 88, 88, 50, 88, 62, 88, + 88, 52, 88, 88, 5, 88, 16, 88, 88, 39, + 88, 88, 59, 88, 88, 26, 88, 88, 118, 118, + + 111, 6, 88, 42, 88, 63, 88, 45, 88, 7, + 88, 47, 88, 9, 88, 88, 88, 53, 88, 54, + 88, 88, 88, 41, 88, 106, 106, 109, 109, 61, + 88, 51, 88, 88, 56, 88, 119, 119, 40, 88, + 115, 107, 107, 74 } ; -static const flex_int16_t yy_accept[624] = +static const flex_int16_t yy_accept[638] = { 0, 1, 2, 3, 4, 6, 9, 11, 14, 16, 18, 20, 22, 24, 27, 30, 32, 34, 36, 39, 42, @@ -701,66 +703,67 @@ static const flex_int16_t yy_accept[624] = 130, 130, 131, 131, 131, 132, 133, 134, 135, 135, 136, 137, 137, 137, 138, 139, 140, 141, 142, 143, 144, 145, 146, 147, 148, 149, 150, 151, 152, 153, - 154, 155, 156, 157, 158, 159, 160, 162, 163, 164, + 154, 155, 156, 157, 158, 159, 160, 161, 163, 164, 165, 166, 167, 168, 169, 170, 171, 172, 173, 174, 175, 176, 177, 178, 179, 180, 181, 182, 183, 184, - 185, 186, 187, 188, 189, 190, 191, 191, 191, 192, - 192, 192, 192, 192, 192, 192, 192, 193, 193, 193, - 193, 194, 194, 195, 195, 195, 196, 196, 197, 197, - 198, 198, 199, 200, 201, 201, 202, 203, 203, 204, - 204, 205, 205, 205, 205, 206, 207, 208, 209, 211, + 185, 186, 187, 188, 189, 190, 191, 192, 192, 192, + 193, 193, 193, 193, 193, 193, 193, 193, 194, 194, + 194, 194, 195, 195, 196, 196, 196, 197, 197, 198, + 198, 199, 199, 200, 201, 202, 202, 203, 204, 204, + 205, 205, 206, 206, 206, 206, 207, 208, 209, 210, 212, 213, 214, 215, 216, 217, 218, 219, 220, 221, 222, 223, 224, 225, 226, 227, 228, 229, 230, 231, - 232, 233, 234, 235, 236, 239, 240, 241, 242, 243, - - 244, 245, 247, 248, 249, 250, 251, 252, 253, 254, - 255, 256, 257, 258, 259, 260, 261, 262, 263, 264, - 265, 266, 267, 268, 269, 269, 269, 269, 269, 269, - 269, 269, 269, 270, 272, 272, 272, 273, 273, 274, - 275, 275, 276, 277, 277, 277, 277, 277, 278, 278, - 279, 281, 282, 283, 284, 285, 287, 289, 290, 291, - 292, 293, 294, 295, 296, 297, 299, 300, 301, 302, - 303, 304, 305, 306, 308, 309, 310, 311, 312, 313, - 315, 316, 317, 319, 320, 321, 322, 323, 324, 325, - 326, 328, 329, 330, 331, 332, 333, 334, 335, 336, - - 337, 338, 339, 340, 341, 342, 343, 344, 345, 346, - 348, 349, 351, 352, 353, 353, 353, 353, 353, 353, - 353, 353, 354, 354, 354, 354, 354, 354, 354, 354, - 355, 355, 356, 356, 356, 358, 358, 358, 358, 359, - 360, 362, 363, 364, 365, 366, 368, 369, 370, 371, - 372, 373, 375, 376, 377, 378, 379, 381, 383, 384, - 385, 387, 389, 391, 393, 394, 396, 397, 398, 399, - 400, 401, 403, 404, 405, 406, 407, 408, 409, 410, - 411, 412, 413, 415, 416, 417, 418, 419, 420, 421, - 422, 423, 424, 425, 426, 427, 429, 431, 432, 433, - - 435, 436, 437, 437, 437, 437, 437, 437, 437, 437, - 437, 437, 437, 437, 437, 437, 437, 438, 438, 440, - 441, 442, 443, 444, 445, 446, 447, 449, 450, 452, - 453, 454, 455, 457, 458, 460, 461, 462, 463, 465, - 466, 468, 470, 471, 472, 473, 474, 476, 477, 479, - 480, 481, 482, 484, 486, 487, 489, 490, 491, 493, - 494, 495, 497, 499, 501, 502, 503, 504, 504, 505, - 505, 505, 505, 505, 505, 505, 505, 505, 505, 505, - 505, 505, 505, 505, 505, 506, 507, 509, 510, 511, - 512, 514, 516, 517, 518, 520, 521, 522, 524, 525, - - 526, 527, 528, 530, 531, 532, 533, 534, 535, 536, - 537, 539, 540, 541, 542, 543, 545, 545, 545, 546, - 547, 547, 547, 548, 548, 548, 549, 549, 549, 549, - 549, 549, 549, 549, 549, 551, 552, 553, 554, 556, - 557, 558, 559, 560, 561, 563, 565, 566, 568, 569, - 571, 573, 574, 576, 577, 579, 580, 582, 583, 583, - 584, 585, 585, 585, 585, 585, 586, 586, 586, 586, - 586, 586, 586, 586, 586, 588, 590, 592, 594, 596, - 598, 600, 601, 602, 604, 606, 607, 608, 610, 610, - 610, 610, 611, 612, 612, 612, 613, 614, 614, 614, - - 614, 614, 614, 616, 618, 619, 621, 621, 621, 622, - 623, 623, 623, 623, 623, 625, 625, 626, 626, 627, - 628, 629, 629 + 232, 233, 234, 235, 236, 237, 238, 240, 241, 242, + + 243, 244, 245, 246, 248, 249, 250, 251, 252, 253, + 254, 255, 256, 257, 258, 259, 260, 261, 262, 263, + 264, 265, 266, 267, 268, 269, 270, 270, 270, 270, + 270, 270, 270, 270, 270, 271, 273, 273, 273, 274, + 274, 275, 276, 276, 277, 278, 278, 278, 278, 278, + 279, 279, 280, 282, 283, 284, 285, 286, 287, 288, + 289, 291, 293, 294, 295, 296, 297, 298, 299, 300, + 301, 303, 304, 305, 306, 307, 308, 309, 310, 312, + 313, 314, 315, 316, 317, 319, 320, 321, 323, 324, + 325, 326, 327, 328, 329, 330, 332, 333, 334, 335, + + 336, 337, 338, 339, 340, 341, 342, 343, 344, 345, + 346, 347, 348, 349, 350, 352, 353, 355, 356, 357, + 357, 357, 357, 357, 357, 357, 357, 358, 358, 358, + 358, 358, 358, 358, 358, 359, 359, 360, 360, 360, + 362, 362, 362, 362, 363, 364, 366, 367, 368, 369, + 370, 371, 372, 373, 375, 376, 377, 378, 379, 380, + 382, 383, 384, 385, 386, 388, 390, 391, 392, 394, + 396, 398, 400, 401, 403, 404, 405, 406, 407, 408, + 410, 411, 412, 413, 414, 415, 416, 417, 418, 419, + 420, 422, 423, 424, 425, 426, 427, 428, 429, 430, + + 431, 432, 433, 434, 436, 438, 439, 440, 442, 443, + 444, 444, 444, 444, 444, 444, 444, 444, 444, 444, + 444, 444, 444, 444, 444, 445, 445, 447, 448, 449, + 450, 451, 453, 454, 455, 456, 457, 458, 460, 461, + 463, 464, 465, 466, 468, 469, 471, 472, 473, 474, + 476, 477, 479, 481, 482, 483, 484, 485, 487, 488, + 490, 491, 492, 493, 495, 497, 498, 500, 501, 502, + 504, 505, 506, 508, 510, 512, 513, 514, 515, 515, + 516, 516, 516, 516, 516, 516, 516, 516, 516, 516, + 516, 516, 516, 516, 516, 516, 517, 518, 519, 521, + + 523, 524, 525, 526, 528, 530, 531, 532, 534, 535, + 536, 538, 539, 540, 541, 542, 544, 545, 546, 547, + 548, 549, 550, 551, 553, 554, 555, 556, 557, 559, + 559, 559, 560, 561, 561, 561, 562, 562, 562, 563, + 563, 563, 563, 563, 563, 563, 563, 563, 565, 566, + 568, 569, 570, 572, 573, 574, 575, 576, 577, 579, + 581, 582, 584, 585, 587, 589, 590, 592, 593, 595, + 596, 598, 599, 599, 600, 601, 601, 601, 601, 601, + 602, 602, 602, 602, 602, 602, 602, 602, 602, 604, + 606, 608, 610, 612, 614, 616, 617, 618, 620, 622, + + 623, 624, 626, 626, 626, 626, 627, 628, 628, 628, + 629, 630, 630, 630, 630, 630, 630, 632, 634, 635, + 637, 637, 637, 638, 639, 639, 639, 639, 639, 641, + 641, 642, 642, 643, 644, 645, 645 } ; static const YY_CHAR yy_ec[256] = @@ -806,161 +809,163 @@ static const YY_CHAR yy_meta[68] = 14, 16, 17, 16, 14, 16, 14 } ; -static const flex_int16_t yy_base[665] = +static const flex_int16_t yy_base[679] = { 0, - 0, 66, 1501, 1502, 67, 1502, 1502, 64, 1458, 62, - 80, 76, 95, 91, 1476, 1474, 1471, 1453, 0, 1466, - 80, 1450, 1456, 77, 1435, 97, 61, 64, 81, 1444, - 1433, 35, 1432, 100, 1445, 89, 93, 82, 108, 99, - 111, 121, 104, 172, 178, 1460, 182, 162, 183, 192, - 1478, 205, 223, 260, 202, 313, 1502, 224, 354, 103, - 223, 1502, 94, 0, 252, 1502, 1502, 1502, 1429, 0, - 1449, 210, 1441, 1430, 1441, 1419, 1428, 1411, 1415, 1419, - 1414, 1431, 120, 1412, 1424, 1408, 1419, 1406, 1421, 1422, - 1421, 135, 1408, 1402, 1408, 1404, 30, 202, 90, 1401, - - 1414, 1405, 1396, 1395, 1409, 1393, 1394, 199, 1409, 1401, - 1408, 156, 1393, 1389, 1390, 1396, 1383, 1387, 1388, 202, - 1396, 1388, 1390, 1390, 1377, 255, 0, 211, 1502, 255, - 345, 1387, 1391, 1385, 1375, 1409, 283, 224, 225, 296, - 1502, 1425, 1424, 396, 1423, 227, 0, 293, 192, 1502, - 291, 1502, 293, 0, 403, 344, 0, 1374, 1391, 280, - 347, 412, 1420, 279, 1380, 1394, 1363, 1381, 0, 1363, - 1368, 1374, 1360, 1361, 295, 1356, 1374, 1372, 1353, 1359, - 1357, 1365, 1349, 1364, 1362, 1365, 1347, 1359, 1348, 1341, - 418, 1360, 1353, 1358, 0, 1340, 1336, 1336, 1346, 1349, - - 1330, 0, 1332, 253, 1329, 1338, 1330, 1344, 1326, 1328, - 1327, 290, 1328, 1323, 1328, 1336, 1320, 1324, 1329, 1318, - 1315, 1331, 1333, 1315, 1368, 1367, 1318, 1324, 1314, 1326, - 474, 428, 1502, 1502, 441, 1360, 0, 488, 488, 1502, - 1310, 1334, 360, 1359, 294, 529, 0, 1502, 0, 1319, - 0, 1303, 1301, 1310, 1313, 0, 0, 1302, 1311, 301, - 1310, 1299, 1292, 1300, 1292, 0, 1290, 1293, 1293, 1302, - 1302, 1285, 1303, 0, 1285, 1282, 1323, 1326, 1323, 0, - 1280, 1285, 0, 1289, 1280, 1282, 1284, 1270, 1271, 1289, - 1269, 1287, 1286, 1277, 1276, 1279, 1268, 1277, 1280, 1260, - - 1265, 1275, 1262, 1273, 1272, 332, 447, 1260, 1266, 0, - 1267, 0, 1253, 1260, 1304, 447, 1234, 1224, 1232, 1229, - 1166, 1502, 267, 479, 1168, 1172, 1166, 1133, 352, 1502, - 1184, 1502, 1183, 1128, 0, 544, 581, 1176, 1121, 1139, - 0, 1137, 1137, 1123, 1129, 0, 1118, 1106, 1116, 1078, - 1082, 0, 1064, 1063, 1043, 1042, 0, 0, 1050, 1038, - 0, 0, 0, 0, 1047, 0, 1045, 1029, 1041, 1009, - 1019, 0, 998, 997, 1003, 1000, 1011, 336, 995, 999, - 998, 998, 0, 997, 981, 982, 989, 993, 985, 983, - 982, 962, 999, 1002, 978, 0, 0, 939, 932, 0, - - 936, 1502, 511, 404, 928, 435, 934, 978, 975, 924, - 927, 915, 925, 924, 399, 616, 1502, 943, 0, 885, - 864, 866, 872, 856, 849, 833, 0, 815, 0, 805, - 820, 803, 0, 807, 0, 823, 804, 798, 0, 798, - 0, 0, 793, 766, 765, 764, 0, 760, 0, 755, - 763, 746, 0, 0, 743, 0, 742, 754, 0, 745, - 751, 0, 0, 0, 749, 727, 744, 549, 1502, 563, - 514, 461, 467, 577, 743, 779, 588, 718, 688, 693, - 687, 672, 651, 721, 665, 664, 0, 669, 657, 648, - 0, 0, 650, 650, 0, 646, 631, 0, 618, 611, - - 610, 590, 0, 581, 593, 572, 575, 562, 546, 563, - 0, 558, 546, 543, 530, 0, 614, 581, 1502, 617, - 647, 650, 1502, 564, 478, 1502, 683, 480, 495, 495, - 501, 489, 513, 531, 0, 477, 458, 452, 0, 464, - 431, 425, 426, 411, 0, 0, 407, 0, 392, 0, - 0, 375, 0, 363, 0, 340, 0, 337, 675, 1502, - 686, 374, 701, 688, 714, 1502, 718, 697, 524, 529, - 567, 732, 323, 286, 0, 0, 0, 0, 0, 0, - 0, 275, 256, 0, 0, 265, 238, 0, 728, 572, - 708, 1502, 735, 754, 739, 1502, 757, 760, 284, 211, - - 573, 134, 0, 0, 139, 0, 765, 768, 1502, 770, - 69, 772, 774, 0, 0, 786, 1502, 776, 1502, 779, - 1502, 1502, 813, 830, 840, 845, 858, 874, 884, 897, - 907, 914, 916, 931, 948, 960, 967, 976, 982, 999, - 1011, 1018, 1025, 1035, 1049, 1059, 1069, 1081, 1095, 1106, - 1118, 1133, 1150, 1166, 1176, 1185, 1196, 1212, 1223, 1240, - 1257, 1273, 1284, 1301 + 0, 66, 1515, 1516, 67, 1516, 1516, 64, 1472, 62, + 80, 76, 95, 91, 1490, 1488, 1485, 1467, 0, 1480, + 80, 1464, 1470, 77, 67, 97, 72, 79, 101, 1459, + 1448, 35, 1447, 105, 1460, 101, 106, 61, 120, 65, + 120, 108, 113, 170, 184, 1475, 148, 86, 188, 198, + 1493, 211, 229, 266, 208, 319, 1516, 206, 360, 64, + 225, 1516, 168, 0, 229, 1516, 1516, 1516, 1444, 0, + 1464, 153, 1456, 1445, 1456, 1434, 1443, 1426, 1430, 1429, + 1433, 1428, 1445, 136, 1426, 1438, 1422, 1433, 1420, 1435, + 1436, 1435, 141, 1422, 1416, 1422, 1418, 196, 128, 165, + + 1415, 1428, 1419, 1410, 1409, 1423, 1407, 1408, 208, 1423, + 1415, 1422, 204, 1407, 1403, 1404, 1410, 1397, 1401, 1402, + 173, 1410, 1402, 1404, 1404, 1391, 262, 0, 214, 1516, + 267, 351, 1401, 1405, 1399, 1389, 1423, 287, 264, 268, + 285, 1516, 1439, 1438, 402, 1437, 253, 0, 297, 285, + 1516, 319, 1516, 321, 0, 409, 350, 0, 1388, 1405, + 284, 312, 418, 1434, 300, 1394, 1408, 1377, 1395, 0, + 1377, 294, 1382, 1388, 1374, 1375, 308, 1370, 1388, 1386, + 1367, 1373, 1371, 1379, 1363, 1378, 1376, 1379, 1361, 1373, + 1362, 1355, 424, 1374, 1367, 1372, 0, 1354, 1350, 1350, + + 1360, 1363, 1344, 0, 1346, 256, 1343, 1352, 1344, 1358, + 1340, 1342, 1341, 24, 1342, 1337, 1342, 1350, 1334, 1338, + 1343, 1332, 1329, 1345, 1347, 1329, 1382, 1381, 1332, 1338, + 1328, 1340, 480, 434, 1516, 1516, 447, 1374, 0, 494, + 494, 1516, 1324, 1348, 366, 1373, 352, 535, 0, 1516, + 0, 1333, 0, 1317, 1315, 1324, 1323, 1330, 1325, 1324, + 0, 0, 1313, 1322, 268, 1321, 1310, 1303, 1311, 1303, + 0, 1301, 1304, 1304, 1313, 1313, 1296, 1314, 0, 1296, + 1293, 1334, 1337, 1334, 0, 1291, 1296, 0, 1300, 1291, + 1293, 1295, 1281, 1282, 1300, 1280, 1298, 1297, 1288, 1287, + + 1290, 1279, 1288, 1291, 1271, 1276, 1286, 1273, 1284, 1283, + 422, 369, 1271, 1277, 0, 1278, 0, 1264, 1272, 1315, + 516, 1273, 1235, 1243, 1240, 1234, 1516, 405, 520, 1179, + 1183, 1177, 1167, 437, 1516, 1195, 1516, 1194, 1139, 0, + 566, 603, 1192, 1132, 1150, 0, 1148, 1144, 1129, 1127, + 1141, 1127, 1137, 0, 1126, 1076, 1084, 1082, 1088, 0, + 1051, 1050, 1051, 1050, 0, 0, 1054, 1040, 0, 0, + 0, 0, 1051, 0, 1051, 1017, 1029, 1017, 1027, 0, + 1006, 1005, 1007, 1004, 1019, 135, 1003, 1003, 1000, 1002, + 0, 1003, 987, 986, 992, 996, 988, 986, 986, 968, + + 986, 989, 986, 0, 0, 946, 938, 0, 943, 1516, + 542, 357, 932, 395, 936, 982, 978, 927, 931, 921, + 918, 897, 450, 638, 1516, 929, 0, 887, 866, 874, + 853, 0, 849, 840, 820, 834, 818, 0, 816, 0, + 809, 824, 799, 0, 801, 0, 818, 782, 764, 0, + 767, 0, 0, 762, 751, 770, 769, 0, 764, 0, + 759, 767, 750, 0, 0, 748, 0, 747, 759, 0, + 751, 758, 0, 0, 0, 756, 734, 740, 560, 1516, + 586, 443, 410, 455, 599, 744, 776, 532, 729, 716, + 709, 698, 675, 673, 727, 669, 668, 669, 0, 0, + + 644, 639, 619, 0, 0, 621, 608, 0, 617, 618, + 0, 604, 584, 582, 575, 0, 566, 568, 547, 565, + 564, 549, 557, 0, 551, 549, 550, 537, 0, 635, + 529, 1516, 572, 589, 670, 1516, 588, 467, 1516, 639, + 472, 517, 484, 518, 515, 481, 550, 0, 493, 0, + 477, 470, 0, 479, 468, 457, 470, 415, 0, 0, + 411, 0, 381, 0, 0, 352, 0, 359, 0, 345, + 0, 341, 603, 1516, 674, 381, 705, 695, 709, 1516, + 721, 724, 486, 488, 555, 724, 329, 300, 0, 0, + 0, 0, 0, 0, 0, 283, 251, 0, 0, 262, + + 213, 0, 750, 501, 730, 1516, 746, 756, 759, 1516, + 761, 763, 230, 216, 565, 152, 0, 0, 102, 0, + 766, 771, 1516, 775, 114, 777, 781, 0, 0, 792, + 1516, 788, 1516, 796, 1516, 1516, 823, 840, 850, 855, + 868, 884, 894, 907, 917, 924, 926, 941, 958, 970, + 977, 986, 992, 1009, 1021, 1028, 1035, 1045, 1059, 1069, + 1079, 1091, 1105, 1116, 1128, 1143, 1160, 1176, 1186, 1195, + 1206, 1222, 1233, 1250, 1267, 1283, 1294, 1311 } ; -static const flex_int16_t yy_def[665] = +static const flex_int16_t yy_def[679] = { 0, - 622, 1, 622, 622, 622, 622, 622, 623, 624, 622, - 622, 622, 622, 625, 622, 622, 622, 622, 626, 626, - 626, 626, 626, 626, 626, 626, 626, 626, 626, 626, - 626, 626, 626, 626, 626, 626, 626, 626, 626, 626, - 626, 626, 626, 622, 622, 622, 622, 623, 622, 627, - 622, 628, 622, 622, 629, 622, 622, 630, 622, 13, - 631, 622, 632, 633, 625, 622, 622, 622, 622, 626, - 626, 634, 635, 626, 626, 626, 626, 626, 626, 626, - 626, 626, 626, 626, 626, 626, 626, 626, 626, 626, - 626, 626, 626, 626, 626, 626, 626, 626, 626, 626, - - 626, 626, 626, 626, 626, 626, 626, 626, 626, 626, - 626, 626, 626, 626, 626, 626, 626, 626, 626, 626, - 626, 626, 626, 626, 626, 622, 45, 45, 622, 45, - 45, 622, 622, 622, 622, 622, 622, 623, 623, 623, - 622, 622, 622, 622, 636, 54, 637, 629, 638, 622, - 630, 622, 630, 59, 622, 632, 633, 622, 626, 634, - 622, 639, 622, 622, 626, 626, 626, 626, 626, 626, - 626, 626, 626, 626, 626, 626, 626, 626, 626, 626, - 626, 626, 626, 626, 626, 626, 626, 626, 626, 626, - 626, 626, 626, 626, 626, 626, 626, 626, 626, 626, - - 626, 626, 626, 626, 626, 626, 626, 626, 626, 626, - 626, 626, 626, 626, 626, 626, 626, 626, 626, 626, - 626, 626, 626, 626, 640, 622, 622, 622, 622, 622, - 622, 623, 622, 622, 622, 641, 637, 622, 638, 622, - 622, 626, 622, 622, 634, 634, 642, 622, 643, 626, - 626, 626, 626, 626, 626, 626, 626, 626, 626, 626, - 626, 626, 626, 626, 626, 626, 626, 626, 626, 626, - 626, 626, 626, 626, 626, 626, 626, 626, 626, 626, - 626, 626, 626, 626, 626, 626, 626, 626, 626, 626, - 626, 626, 626, 626, 626, 626, 626, 626, 626, 626, - - 626, 626, 626, 626, 626, 626, 626, 626, 626, 626, - 626, 626, 626, 626, 640, 622, 622, 622, 622, 622, - 231, 622, 231, 231, 622, 622, 622, 622, 623, 622, - 622, 622, 622, 622, 626, 634, 634, 644, 626, 626, - 626, 626, 626, 626, 626, 626, 626, 626, 626, 626, - 626, 626, 626, 626, 626, 626, 626, 626, 626, 626, - 626, 626, 626, 626, 626, 626, 626, 626, 626, 626, - 626, 626, 626, 626, 626, 626, 626, 626, 626, 626, - 626, 626, 626, 626, 626, 626, 626, 626, 626, 626, - 626, 626, 626, 626, 626, 626, 626, 626, 626, 626, - - 626, 622, 645, 622, 622, 646, 622, 647, 622, 622, - 622, 622, 622, 622, 634, 337, 622, 648, 626, 626, - 626, 626, 626, 626, 626, 626, 626, 626, 626, 626, - 626, 626, 626, 626, 626, 626, 626, 626, 626, 626, - 626, 626, 626, 626, 626, 626, 626, 626, 626, 626, - 626, 626, 626, 626, 626, 626, 626, 626, 626, 626, - 626, 626, 626, 626, 626, 626, 626, 649, 622, 645, - 650, 622, 646, 646, 622, 647, 622, 622, 622, 622, - 622, 622, 337, 651, 626, 626, 626, 626, 626, 626, - 626, 626, 626, 626, 626, 626, 626, 626, 626, 626, - - 626, 626, 626, 626, 626, 626, 626, 626, 626, 626, - 626, 626, 626, 626, 626, 626, 649, 650, 622, 650, - 652, 622, 622, 653, 622, 622, 654, 622, 622, 655, - 622, 622, 634, 622, 626, 626, 626, 626, 626, 626, - 626, 626, 626, 626, 626, 626, 626, 626, 626, 626, - 626, 626, 626, 626, 626, 626, 626, 626, 652, 622, - 652, 653, 656, 657, 658, 622, 654, 659, 622, 655, - 655, 622, 622, 622, 626, 626, 626, 626, 626, 626, - 626, 626, 626, 626, 626, 626, 626, 626, 656, 589, - 657, 622, 657, 658, 659, 622, 659, 660, 661, 622, - - 622, 622, 626, 626, 626, 626, 662, 660, 622, 660, - 661, 622, 663, 664, 626, 662, 622, 663, 622, 663, - 622, 0, 622, 622, 622, 622, 622, 622, 622, 622, - 622, 622, 622, 622, 622, 622, 622, 622, 622, 622, - 622, 622, 622, 622, 622, 622, 622, 622, 622, 622, - 622, 622, 622, 622, 622, 622, 622, 622, 622, 622, - 622, 622, 622, 622 + 636, 1, 636, 636, 636, 636, 636, 637, 638, 636, + 636, 636, 636, 639, 636, 636, 636, 636, 640, 640, + 640, 640, 640, 640, 640, 640, 640, 640, 640, 640, + 640, 640, 640, 640, 640, 640, 640, 640, 640, 640, + 640, 640, 640, 636, 636, 636, 636, 637, 636, 641, + 636, 642, 636, 636, 643, 636, 636, 644, 636, 13, + 645, 636, 646, 647, 639, 636, 636, 636, 636, 640, + 640, 648, 649, 640, 640, 640, 640, 640, 640, 640, + 640, 640, 640, 640, 640, 640, 640, 640, 640, 640, + 640, 640, 640, 640, 640, 640, 640, 640, 640, 640, + + 640, 640, 640, 640, 640, 640, 640, 640, 640, 640, + 640, 640, 640, 640, 640, 640, 640, 640, 640, 640, + 640, 640, 640, 640, 640, 640, 636, 45, 45, 636, + 45, 45, 636, 636, 636, 636, 636, 636, 637, 637, + 637, 636, 636, 636, 636, 650, 54, 651, 643, 652, + 636, 644, 636, 644, 59, 636, 646, 647, 636, 640, + 648, 636, 653, 636, 636, 640, 640, 640, 640, 640, + 640, 640, 640, 640, 640, 640, 640, 640, 640, 640, + 640, 640, 640, 640, 640, 640, 640, 640, 640, 640, + 640, 640, 640, 640, 640, 640, 640, 640, 640, 640, + + 640, 640, 640, 640, 640, 640, 640, 640, 640, 640, + 640, 640, 640, 640, 640, 640, 640, 640, 640, 640, + 640, 640, 640, 640, 640, 640, 654, 636, 636, 636, + 636, 636, 636, 637, 636, 636, 636, 655, 651, 636, + 652, 636, 636, 640, 636, 636, 648, 648, 656, 636, + 657, 640, 640, 640, 640, 640, 640, 640, 640, 640, + 640, 640, 640, 640, 640, 640, 640, 640, 640, 640, + 640, 640, 640, 640, 640, 640, 640, 640, 640, 640, + 640, 640, 640, 640, 640, 640, 640, 640, 640, 640, + 640, 640, 640, 640, 640, 640, 640, 640, 640, 640, + + 640, 640, 640, 640, 640, 640, 640, 640, 640, 640, + 640, 640, 640, 640, 640, 640, 640, 640, 640, 654, + 636, 636, 636, 636, 636, 233, 636, 233, 233, 636, + 636, 636, 636, 637, 636, 636, 636, 636, 636, 640, + 648, 648, 658, 640, 640, 640, 640, 640, 640, 640, + 640, 640, 640, 640, 640, 640, 640, 640, 640, 640, + 640, 640, 640, 640, 640, 640, 640, 640, 640, 640, + 640, 640, 640, 640, 640, 640, 640, 640, 640, 640, + 640, 640, 640, 640, 640, 640, 640, 640, 640, 640, + 640, 640, 640, 640, 640, 640, 640, 640, 640, 640, + + 640, 640, 640, 640, 640, 640, 640, 640, 640, 636, + 659, 636, 636, 660, 636, 661, 636, 636, 636, 636, + 636, 636, 648, 342, 636, 662, 640, 640, 640, 640, + 640, 640, 640, 640, 640, 640, 640, 640, 640, 640, + 640, 640, 640, 640, 640, 640, 640, 640, 640, 640, + 640, 640, 640, 640, 640, 640, 640, 640, 640, 640, + 640, 640, 640, 640, 640, 640, 640, 640, 640, 640, + 640, 640, 640, 640, 640, 640, 640, 640, 663, 636, + 659, 664, 636, 660, 660, 636, 661, 636, 636, 636, + 636, 636, 636, 342, 665, 640, 640, 640, 640, 640, + + 640, 640, 640, 640, 640, 640, 640, 640, 640, 640, + 640, 640, 640, 640, 640, 640, 640, 640, 640, 640, + 640, 640, 640, 640, 640, 640, 640, 640, 640, 663, + 664, 636, 664, 666, 636, 636, 667, 636, 636, 668, + 636, 636, 669, 636, 636, 648, 636, 640, 640, 640, + 640, 640, 640, 640, 640, 640, 640, 640, 640, 640, + 640, 640, 640, 640, 640, 640, 640, 640, 640, 640, + 640, 640, 666, 636, 666, 667, 670, 671, 672, 636, + 668, 673, 636, 669, 669, 636, 636, 636, 640, 640, + 640, 640, 640, 640, 640, 640, 640, 640, 640, 640, + + 640, 640, 670, 603, 671, 636, 671, 672, 673, 636, + 673, 674, 675, 636, 636, 636, 640, 640, 640, 640, + 676, 674, 636, 674, 675, 636, 677, 678, 640, 676, + 636, 677, 636, 677, 636, 0, 636, 636, 636, 636, + 636, 636, 636, 636, 636, 636, 636, 636, 636, 636, + 636, 636, 636, 636, 636, 636, 636, 636, 636, 636, + 636, 636, 636, 636, 636, 636, 636, 636, 636, 636, + 636, 636, 636, 636, 636, 636, 636, 636 } ; -static const flex_int16_t yy_nxt[1570] = +static const flex_int16_t yy_nxt[1584] = { 0, 4, 5, 6, 7, 5, 8, 4, 9, 4, 4, 10, 11, 12, 13, 14, 14, 14, 14, 14, 14, @@ -969,174 +974,176 @@ static const flex_int16_t yy_nxt[1570] = 19, 4, 24, 25, 26, 27, 28, 29, 30, 31, 32, 19, 19, 33, 34, 35, 36, 37, 19, 38, 39, 40, 41, 42, 43, 19, 19, 44, 47, 49, - 44, 47, 45, 53, 612, 54, 55, 55, 55, 55, - 55, 55, 55, 55, 57, 72, 190, 73, 58, 96, - 97, 191, 46, 56, 56, 56, 56, 56, 56, 56, - - 56, 56, 59, 155, 155, 50, 59, 85, 60, 60, - 60, 60, 60, 60, 60, 61, 61, 86, 87, 88, - 76, 62, 63, 91, 110, 62, 63, 89, 111, 90, - 77, 92, 78, 104, 93, 64, 62, 63, 79, 81, - 62, 63, 99, 622, 105, 194, 82, 195, 124, 107, - 100, 106, 108, 83, 112, 109, 101, 113, 117, 84, - 64, 119, 102, 122, 125, 118, 120, 49, 622, 114, - 115, 121, 116, 126, 174, 175, 126, 123, 127, 128, - 129, 129, 130, 47, 137, 615, 47, 137, 138, 614, - 184, 131, 131, 131, 131, 131, 131, 131, 131, 131, - - 185, 238, 238, 50, 129, 140, 140, 140, 140, 140, - 140, 140, 143, 59, 209, 161, 599, 210, 144, 144, - 144, 144, 144, 144, 144, 132, 152, 153, 133, 49, - 49, 134, 62, 63, 59, 135, 56, 56, 56, 56, - 56, 56, 56, 56, 56, 145, 192, 62, 63, 204, - 153, 162, 218, 62, 63, 205, 126, 193, 622, 126, - 225, 127, 219, 59, 622, 50, 50, 622, 62, 63, - 145, 59, 408, 146, 146, 146, 146, 146, 146, 146, - 61, 61, 62, 63, 137, 161, 248, 137, 138, 612, - 62, 63, 622, 152, 153, 152, 153, 62, 63, 161, - - 147, 49, 622, 606, 59, 62, 63, 292, 622, 232, - 232, 232, 232, 232, 232, 232, 293, 153, 605, 153, - 622, 162, 604, 62, 63, 147, 56, 56, 56, 56, - 56, 56, 56, 56, 56, 162, 603, 50, 62, 63, - 301, 249, 602, 62, 149, 150, 622, 150, 243, 226, - 259, 243, 302, 622, 622, 260, 261, 49, 62, 149, - 150, 243, 346, 347, 243, 601, 150, 154, 154, 154, - 154, 154, 154, 154, 154, 154, 240, 389, 240, 563, - 447, 244, 390, 588, 62, 149, 150, 391, 150, 392, - 587, 240, 622, 50, 244, 622, 448, 240, 622, 62, - - 149, 150, 622, 234, 161, 471, 586, 150, 471, 235, - 235, 235, 235, 235, 235, 235, 156, 156, 156, 156, - 156, 156, 156, 156, 156, 246, 246, 246, 246, 246, - 246, 246, 277, 49, 278, 585, 473, 279, 280, 473, - 162, 329, 329, 329, 329, 329, 329, 329, 330, 402, - 402, 403, 584, 583, 331, 331, 331, 331, 331, 331, - 331, 393, 521, 394, 281, 521, 395, 396, 473, 50, - 582, 473, 581, 402, 247, 321, 322, 322, 323, 564, - 622, 568, 564, 409, 568, 580, 579, 324, 324, 324, - 324, 324, 324, 324, 324, 324, 570, 622, 622, 571, - - 322, 239, 239, 239, 239, 239, 239, 239, 239, 239, - 578, 577, 468, 469, 469, 468, 519, 520, 161, 576, - 150, 325, 150, 575, 326, 598, 622, 327, 598, 622, - 570, 328, 622, 571, 161, 150, 622, 469, 417, 574, - 520, 150, 336, 336, 336, 336, 336, 336, 336, 161, - 468, 469, 469, 468, 162, 573, 569, 415, 415, 415, - 415, 415, 415, 415, 468, 469, 469, 468, 570, 563, - 162, 571, 599, 607, 613, 469, 607, 613, 522, 523, - 523, 522, 524, 519, 520, 162, 161, 558, 557, 469, - 526, 526, 527, 556, 416, 416, 416, 416, 416, 416, - - 416, 416, 416, 523, 555, 554, 553, 520, 552, 416, - 416, 416, 416, 416, 526, 468, 469, 469, 468, 519, - 520, 551, 162, 416, 416, 416, 416, 416, 416, 483, - 483, 483, 483, 483, 483, 483, 483, 483, 550, 549, - 469, 548, 547, 520, 483, 483, 483, 483, 483, 560, - 561, 522, 523, 523, 522, 524, 546, 545, 483, 483, - 483, 483, 483, 483, 533, 533, 533, 533, 533, 533, - 533, 533, 533, 561, 544, 543, 523, 560, 561, 533, - 533, 533, 533, 533, 565, 566, 566, 565, 560, 561, - 592, 593, 542, 533, 533, 533, 533, 533, 533, 596, - - 597, 561, 589, 523, 523, 589, 541, 540, 539, 566, - 592, 593, 561, 538, 593, 565, 566, 566, 565, 565, - 566, 566, 565, 597, 537, 536, 535, 523, 417, 589, - 523, 523, 589, 532, 593, 531, 600, 592, 593, 530, - 566, 596, 597, 529, 566, 572, 572, 572, 572, 572, - 572, 572, 572, 572, 523, 622, 566, 566, 622, 596, - 597, 593, 609, 610, 528, 597, 607, 523, 523, 607, - 609, 610, 609, 610, 617, 617, 619, 620, 619, 620, - 566, 619, 620, 597, 477, 525, 610, 622, 523, 523, - 622, 523, 516, 515, 610, 514, 610, 513, 617, 512, - - 620, 511, 620, 510, 509, 620, 508, 507, 506, 505, - 504, 503, 523, 48, 48, 48, 48, 48, 48, 48, + 44, 47, 45, 53, 306, 54, 55, 55, 55, 55, + 55, 55, 55, 55, 57, 72, 307, 73, 58, 97, + 98, 49, 46, 56, 56, 56, 56, 56, 56, 56, + + 56, 56, 59, 111, 636, 50, 59, 112, 60, 60, + 60, 60, 60, 60, 60, 61, 61, 80, 86, 626, + 76, 62, 63, 81, 118, 62, 63, 50, 87, 636, + 77, 119, 78, 88, 89, 64, 62, 63, 79, 82, + 62, 63, 90, 92, 91, 105, 83, 100, 629, 47, + 123, 93, 47, 84, 94, 101, 106, 125, 162, 85, + 64, 102, 108, 107, 124, 109, 113, 103, 110, 114, + 120, 127, 194, 126, 127, 121, 128, 156, 156, 458, + 122, 115, 116, 195, 117, 129, 130, 130, 131, 138, + 176, 177, 138, 139, 163, 459, 186, 132, 132, 132, + + 132, 132, 132, 132, 132, 132, 187, 628, 153, 154, + 130, 141, 141, 141, 141, 141, 141, 141, 144, 59, + 196, 613, 197, 220, 145, 145, 145, 145, 145, 145, + 145, 133, 154, 221, 134, 626, 59, 135, 62, 63, + 59, 136, 56, 56, 56, 56, 56, 56, 56, 56, + 56, 146, 192, 62, 63, 62, 63, 193, 206, 62, + 63, 636, 211, 127, 207, 212, 127, 636, 128, 49, + 62, 63, 227, 49, 62, 63, 146, 59, 620, 147, + 147, 147, 147, 147, 147, 147, 61, 61, 138, 162, + 49, 138, 139, 636, 240, 240, 62, 63, 234, 234, + + 234, 234, 234, 234, 234, 50, 148, 250, 59, 50, + 297, 62, 63, 245, 636, 619, 245, 618, 636, 298, + 636, 153, 154, 153, 154, 163, 50, 62, 63, 354, + 355, 148, 56, 56, 56, 56, 56, 56, 56, 56, + 56, 257, 62, 63, 617, 154, 246, 154, 258, 62, + 150, 151, 636, 151, 259, 228, 616, 162, 482, 636, + 636, 482, 251, 264, 62, 150, 151, 245, 265, 266, + 245, 615, 151, 155, 155, 155, 155, 155, 155, 155, + 155, 155, 242, 401, 242, 402, 577, 602, 403, 404, + 62, 150, 151, 163, 151, 601, 484, 242, 636, 484, + + 246, 636, 600, 242, 636, 62, 150, 151, 636, 236, + 416, 534, 599, 151, 534, 237, 237, 237, 237, 237, + 237, 237, 157, 157, 157, 157, 157, 157, 157, 157, + 157, 248, 248, 248, 248, 248, 248, 248, 282, 49, + 283, 598, 49, 284, 285, 532, 533, 334, 334, 334, + 334, 334, 334, 334, 335, 162, 484, 597, 636, 484, + 336, 336, 336, 336, 336, 336, 336, 397, 578, 533, + 286, 578, 398, 582, 596, 50, 582, 399, 50, 400, + 249, 326, 327, 327, 328, 584, 162, 612, 585, 584, + 612, 163, 585, 329, 329, 329, 329, 329, 329, 329, + + 329, 329, 621, 636, 636, 621, 327, 241, 241, 241, + 241, 241, 241, 241, 241, 241, 595, 594, 410, 410, + 411, 636, 163, 593, 417, 592, 151, 330, 151, 591, + 331, 532, 533, 332, 539, 539, 540, 333, 590, 589, + 162, 151, 410, 479, 480, 480, 479, 151, 341, 341, + 341, 341, 341, 341, 341, 533, 584, 425, 539, 585, + 613, 479, 480, 480, 479, 588, 627, 636, 480, 627, + 636, 162, 587, 636, 532, 533, 163, 636, 583, 423, + 423, 423, 423, 423, 423, 423, 480, 479, 480, 480, + 479, 574, 575, 577, 572, 571, 570, 569, 533, 568, + + 535, 536, 536, 535, 537, 574, 575, 163, 162, 567, + 566, 565, 480, 564, 563, 575, 424, 424, 424, 424, + 424, 424, 424, 424, 424, 536, 562, 561, 560, 575, + 559, 424, 424, 424, 424, 424, 479, 480, 480, 479, + 579, 580, 580, 579, 163, 424, 424, 424, 424, 424, + 424, 494, 494, 494, 494, 494, 494, 494, 494, 494, + 558, 480, 557, 556, 555, 580, 494, 494, 494, 494, + 494, 535, 536, 536, 535, 537, 574, 575, 554, 553, + 494, 494, 494, 494, 494, 494, 546, 546, 546, 546, + 546, 546, 546, 546, 546, 552, 536, 606, 607, 551, + + 575, 546, 546, 546, 546, 546, 603, 536, 536, 603, + 579, 580, 580, 579, 550, 546, 546, 546, 546, 546, + 546, 607, 579, 580, 580, 579, 610, 611, 614, 549, + 548, 536, 606, 607, 425, 580, 545, 586, 586, 586, + 586, 586, 586, 586, 586, 586, 544, 580, 606, 607, + 611, 603, 536, 536, 603, 543, 607, 636, 580, 580, + 636, 610, 611, 610, 611, 623, 624, 621, 536, 536, + 621, 542, 607, 623, 624, 541, 536, 623, 624, 631, + 631, 488, 580, 633, 634, 611, 538, 611, 529, 624, + 633, 634, 536, 636, 536, 536, 636, 624, 633, 634, + + 528, 624, 527, 631, 526, 525, 524, 634, 523, 522, + 521, 520, 519, 518, 634, 517, 516, 515, 536, 514, + 513, 512, 634, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, - 51, 51, 502, 51, 51, 51, 51, 51, 51, 51, + 51, 51, 511, 51, 51, 51, 51, 51, 51, 51, 51, 51, 51, 51, 51, 51, 51, 65, 65, 65, - 501, 500, 65, 70, 70, 499, 70, 70, 70, 70, - 70, 70, 139, 139, 498, 497, 139, 496, 139, 495, - 494, 493, 139, 139, 142, 142, 492, 142, 142, 142, - 142, 142, 142, 142, 142, 142, 142, 142, 142, 142, - 142, 148, 148, 148, 491, 490, 148, 151, 151, 151, - - 151, 151, 151, 151, 151, 151, 151, 151, 151, 151, - 151, 151, 151, 151, 61, 61, 61, 489, 488, 61, - 156, 487, 156, 156, 157, 157, 486, 157, 157, 485, - 157, 160, 160, 160, 160, 160, 160, 160, 160, 160, - 160, 160, 160, 160, 160, 160, 160, 160, 163, 163, - 417, 163, 163, 163, 163, 163, 163, 163, 163, 163, - 163, 163, 163, 163, 163, 236, 482, 481, 236, 236, - 480, 236, 236, 479, 236, 237, 237, 478, 237, 237, - 408, 237, 239, 477, 239, 239, 245, 245, 475, 472, - 245, 467, 245, 466, 465, 464, 245, 245, 245, 315, - - 315, 315, 315, 315, 315, 315, 315, 315, 315, 315, - 315, 315, 315, 315, 315, 315, 333, 463, 462, 333, - 333, 461, 333, 333, 460, 333, 337, 337, 459, 337, - 337, 458, 337, 338, 338, 457, 338, 338, 456, 338, - 418, 455, 454, 418, 418, 453, 418, 418, 452, 418, - 470, 470, 470, 451, 450, 449, 446, 470, 470, 470, - 474, 445, 444, 443, 442, 441, 440, 474, 474, 476, - 476, 476, 476, 476, 476, 476, 476, 476, 476, 476, - 476, 476, 476, 476, 476, 476, 484, 439, 438, 484, - 484, 437, 484, 484, 436, 484, 517, 517, 517, 435, - - 434, 433, 432, 517, 517, 517, 518, 518, 518, 518, - 518, 518, 518, 518, 518, 518, 518, 518, 518, 518, - 518, 518, 518, 534, 431, 430, 534, 534, 429, 534, - 534, 428, 534, 559, 559, 559, 559, 559, 559, 559, - 559, 559, 559, 559, 559, 559, 559, 559, 559, 559, - 562, 562, 562, 562, 562, 562, 562, 562, 562, 562, - 562, 562, 562, 562, 562, 562, 562, 567, 567, 567, - 427, 426, 425, 424, 567, 567, 567, 572, 423, 422, - 421, 420, 419, 417, 572, 572, 590, 590, 590, 414, - 332, 330, 413, 590, 590, 590, 591, 591, 591, 591, - - 591, 591, 591, 591, 591, 591, 591, 591, 591, 591, - 591, 591, 591, 594, 594, 594, 412, 411, 410, 622, - 594, 594, 594, 595, 595, 595, 595, 595, 595, 595, - 595, 595, 595, 595, 595, 595, 595, 595, 595, 595, - 608, 608, 608, 608, 608, 608, 608, 608, 608, 608, - 608, 608, 608, 608, 608, 608, 608, 611, 611, 611, - 611, 611, 611, 611, 611, 611, 611, 611, 611, 611, - 611, 611, 611, 611, 616, 616, 616, 407, 406, 405, - 404, 616, 616, 616, 618, 618, 618, 618, 618, 618, - 618, 618, 618, 618, 618, 618, 618, 618, 618, 618, - - 618, 621, 621, 621, 621, 621, 621, 621, 621, 316, - 401, 621, 400, 399, 398, 397, 388, 387, 386, 385, - 384, 383, 382, 381, 380, 379, 378, 377, 376, 375, - 374, 373, 372, 371, 370, 369, 368, 367, 366, 365, - 364, 363, 362, 361, 360, 359, 358, 357, 356, 355, - 354, 353, 352, 351, 350, 349, 348, 345, 344, 343, - 342, 341, 340, 339, 72, 335, 334, 332, 320, 319, - 318, 317, 225, 316, 314, 313, 312, 311, 310, 309, - 308, 307, 306, 305, 304, 303, 300, 299, 298, 297, - 296, 295, 294, 291, 290, 289, 288, 287, 286, 285, - - 284, 283, 282, 276, 275, 274, 273, 272, 271, 270, - 269, 268, 267, 266, 265, 264, 263, 262, 258, 257, - 256, 255, 254, 253, 252, 251, 250, 248, 242, 241, - 233, 233, 233, 231, 230, 229, 228, 227, 224, 223, - 222, 221, 220, 217, 216, 215, 214, 213, 212, 211, - 208, 207, 206, 203, 202, 201, 200, 199, 198, 197, - 196, 189, 188, 187, 186, 183, 182, 181, 180, 179, - 178, 177, 176, 173, 172, 171, 170, 169, 168, 167, - 166, 165, 164, 159, 158, 141, 136, 103, 98, 95, - 94, 80, 75, 74, 71, 69, 68, 67, 66, 52, - - 622, 3, 622, 622, 622, 622, 622, 622, 622, 622, - 622, 622, 622, 622, 622, 622, 622, 622, 622, 622, - 622, 622, 622, 622, 622, 622, 622, 622, 622, 622, - 622, 622, 622, 622, 622, 622, 622, 622, 622, 622, - 622, 622, 622, 622, 622, 622, 622, 622, 622, 622, + 510, 509, 65, 70, 70, 508, 70, 70, 70, 70, + 70, 70, 140, 140, 507, 506, 140, 505, 140, 504, + 503, 502, 140, 140, 143, 143, 501, 143, 143, 143, + 143, 143, 143, 143, 143, 143, 143, 143, 143, 143, + + 143, 149, 149, 149, 500, 499, 149, 152, 152, 152, + 152, 152, 152, 152, 152, 152, 152, 152, 152, 152, + 152, 152, 152, 152, 61, 61, 61, 498, 497, 61, + 157, 496, 157, 157, 158, 158, 425, 158, 158, 493, + 158, 161, 161, 161, 161, 161, 161, 161, 161, 161, + 161, 161, 161, 161, 161, 161, 161, 161, 164, 164, + 492, 164, 164, 164, 164, 164, 164, 164, 164, 164, + 164, 164, 164, 164, 164, 238, 491, 490, 238, 238, + 489, 238, 238, 416, 238, 239, 239, 488, 239, 239, + 486, 239, 241, 483, 241, 241, 247, 247, 478, 477, + + 247, 476, 247, 475, 474, 473, 247, 247, 247, 320, + 320, 320, 320, 320, 320, 320, 320, 320, 320, 320, + 320, 320, 320, 320, 320, 320, 338, 472, 471, 338, + 338, 470, 338, 338, 469, 338, 342, 342, 468, 342, + 342, 467, 342, 343, 343, 466, 343, 343, 465, 343, + 426, 464, 463, 426, 426, 462, 426, 426, 461, 426, + 481, 481, 481, 460, 457, 456, 455, 481, 481, 481, + 485, 454, 453, 452, 451, 450, 449, 485, 485, 487, + 487, 487, 487, 487, 487, 487, 487, 487, 487, 487, + 487, 487, 487, 487, 487, 487, 495, 448, 447, 495, + + 495, 446, 495, 495, 445, 495, 530, 530, 530, 444, + 443, 442, 441, 530, 530, 530, 531, 531, 531, 531, + 531, 531, 531, 531, 531, 531, 531, 531, 531, 531, + 531, 531, 531, 547, 440, 439, 547, 547, 438, 547, + 547, 437, 547, 573, 573, 573, 573, 573, 573, 573, + 573, 573, 573, 573, 573, 573, 573, 573, 573, 573, + 576, 576, 576, 576, 576, 576, 576, 576, 576, 576, + 576, 576, 576, 576, 576, 576, 576, 581, 581, 581, + 436, 435, 434, 433, 581, 581, 581, 586, 432, 431, + 430, 429, 428, 427, 586, 586, 604, 604, 604, 425, + + 422, 337, 335, 604, 604, 604, 605, 605, 605, 605, + 605, 605, 605, 605, 605, 605, 605, 605, 605, 605, + 605, 605, 605, 608, 608, 608, 421, 420, 419, 418, + 608, 608, 608, 609, 609, 609, 609, 609, 609, 609, + 609, 609, 609, 609, 609, 609, 609, 609, 609, 609, 622, 622, 622, 622, 622, 622, 622, 622, 622, 622, - 622, 622, 622, 622, 622, 622, 622, 622, 622 + 622, 622, 622, 622, 622, 622, 622, 625, 625, 625, + 625, 625, 625, 625, 625, 625, 625, 625, 625, 625, + 625, 625, 625, 625, 630, 630, 630, 636, 415, 414, + 413, 630, 630, 630, 632, 632, 632, 632, 632, 632, + + 632, 632, 632, 632, 632, 632, 632, 632, 632, 632, + 632, 635, 635, 635, 635, 635, 635, 635, 635, 412, + 321, 635, 409, 408, 407, 406, 405, 396, 395, 394, + 393, 392, 391, 390, 389, 388, 387, 386, 385, 384, + 383, 382, 381, 380, 379, 378, 377, 376, 375, 374, + 373, 372, 371, 370, 369, 368, 367, 366, 365, 364, + 363, 362, 361, 360, 359, 358, 357, 356, 353, 352, + 351, 350, 349, 348, 347, 346, 345, 344, 72, 340, + 339, 337, 325, 324, 323, 322, 227, 321, 319, 318, + 317, 316, 315, 314, 313, 312, 311, 310, 309, 308, + + 305, 304, 303, 302, 301, 300, 299, 296, 295, 294, + 293, 292, 291, 290, 289, 288, 287, 281, 280, 279, + 278, 277, 276, 275, 274, 273, 272, 271, 270, 269, + 268, 267, 263, 262, 261, 260, 256, 255, 254, 253, + 252, 250, 244, 243, 235, 235, 235, 233, 232, 231, + 230, 229, 226, 225, 224, 223, 222, 219, 218, 217, + 216, 215, 214, 213, 210, 209, 208, 205, 204, 203, + 202, 201, 200, 199, 198, 191, 190, 189, 188, 185, + 184, 183, 182, 181, 180, 179, 178, 175, 174, 173, + 172, 171, 170, 169, 168, 167, 166, 165, 160, 159, + + 142, 137, 104, 99, 96, 95, 75, 74, 71, 69, + 68, 67, 66, 52, 636, 3, 636, 636, 636, 636, + 636, 636, 636, 636, 636, 636, 636, 636, 636, 636, + 636, 636, 636, 636, 636, 636, 636, 636, 636, 636, + 636, 636, 636, 636, 636, 636, 636, 636, 636, 636, + 636, 636, 636, 636, 636, 636, 636, 636, 636, 636, + 636, 636, 636, 636, 636, 636, 636, 636, 636, 636, + 636, 636, 636, 636, 636, 636, 636, 636, 636, 636, + 636, 636, 636 } ; -static const flex_int16_t yy_chk[1570] = +static const flex_int16_t yy_chk[1584] = { 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, @@ -1145,171 +1152,173 @@ static const flex_int16_t yy_chk[1570] = 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 2, 5, 8, - 2, 5, 2, 10, 611, 10, 10, 10, 10, 10, - 10, 10, 10, 10, 12, 21, 97, 21, 12, 32, - 32, 97, 2, 11, 11, 11, 11, 11, 11, 11, - - 11, 11, 14, 63, 63, 8, 13, 27, 13, 13, - 13, 13, 13, 13, 13, 13, 13, 27, 28, 28, - 24, 14, 14, 29, 38, 13, 13, 28, 38, 28, - 24, 29, 24, 36, 29, 13, 14, 14, 24, 26, - 13, 13, 34, 60, 36, 99, 26, 99, 43, 37, - 34, 36, 37, 26, 39, 37, 34, 39, 40, 26, - 13, 41, 34, 42, 43, 40, 41, 48, 60, 39, - 39, 41, 39, 44, 83, 83, 44, 42, 44, 45, - 45, 45, 45, 47, 49, 605, 47, 49, 49, 602, - 92, 45, 45, 45, 45, 45, 45, 45, 45, 45, - - 92, 149, 149, 48, 45, 50, 50, 50, 50, 50, - 50, 50, 52, 55, 112, 72, 600, 112, 52, 52, - 52, 52, 52, 52, 52, 45, 58, 58, 45, 138, - 139, 45, 55, 55, 61, 45, 53, 53, 53, 53, - 53, 53, 53, 53, 53, 52, 98, 55, 55, 108, - 58, 72, 120, 61, 61, 108, 126, 98, 128, 126, - 130, 126, 120, 65, 128, 138, 139, 146, 61, 61, - 52, 54, 323, 54, 54, 54, 54, 54, 54, 54, - 54, 54, 65, 65, 137, 160, 164, 137, 137, 599, - 54, 54, 146, 151, 151, 153, 153, 65, 65, 245, - - 54, 140, 130, 587, 148, 54, 54, 204, 130, 140, - 140, 140, 140, 140, 140, 140, 204, 151, 586, 153, - 323, 160, 583, 148, 148, 54, 56, 56, 56, 56, - 56, 56, 56, 56, 56, 245, 582, 140, 148, 148, - 212, 164, 574, 56, 56, 56, 131, 56, 161, 131, - 175, 161, 212, 156, 156, 175, 175, 329, 56, 56, - 56, 243, 260, 260, 243, 573, 56, 59, 59, 59, - 59, 59, 59, 59, 59, 59, 156, 306, 156, 562, - 378, 161, 306, 558, 59, 59, 59, 306, 59, 306, - 556, 156, 131, 329, 243, 131, 378, 156, 131, 59, - - 59, 59, 131, 144, 415, 404, 554, 59, 404, 144, - 144, 144, 144, 144, 144, 144, 155, 155, 155, 155, - 155, 155, 155, 155, 155, 162, 162, 162, 162, 162, - 162, 162, 191, 232, 191, 552, 406, 191, 191, 406, - 415, 232, 232, 232, 232, 232, 232, 232, 235, 316, - 316, 316, 549, 547, 235, 235, 235, 235, 235, 235, - 235, 307, 472, 307, 191, 472, 307, 307, 473, 232, - 544, 473, 543, 316, 162, 231, 231, 231, 231, 525, - 324, 528, 525, 324, 528, 542, 541, 231, 231, 231, - 231, 231, 231, 231, 231, 231, 530, 239, 239, 530, - - 231, 238, 238, 238, 238, 238, 238, 238, 238, 238, - 540, 538, 403, 403, 403, 403, 471, 471, 533, 537, - 239, 231, 239, 536, 231, 569, 324, 231, 569, 324, - 570, 231, 324, 570, 246, 239, 324, 403, 534, 532, - 471, 239, 246, 246, 246, 246, 246, 246, 246, 336, - 468, 468, 468, 468, 533, 531, 529, 336, 336, 336, - 336, 336, 336, 336, 470, 470, 470, 470, 571, 524, - 246, 571, 571, 590, 601, 468, 590, 601, 474, 474, - 474, 474, 474, 518, 518, 336, 337, 515, 514, 470, - 477, 477, 477, 513, 337, 337, 337, 337, 337, 337, - - 337, 337, 337, 474, 512, 510, 509, 518, 508, 337, - 337, 337, 337, 337, 477, 517, 517, 517, 517, 520, - 520, 507, 337, 337, 337, 337, 337, 337, 337, 416, - 416, 416, 416, 416, 416, 416, 416, 416, 506, 505, - 517, 504, 502, 520, 416, 416, 416, 416, 416, 521, - 521, 522, 522, 522, 522, 522, 501, 500, 416, 416, - 416, 416, 416, 416, 483, 483, 483, 483, 483, 483, - 483, 483, 483, 521, 499, 497, 522, 559, 559, 483, - 483, 483, 483, 483, 527, 527, 527, 527, 561, 561, - 564, 564, 496, 483, 483, 483, 483, 483, 483, 568, - - 568, 559, 563, 563, 563, 563, 494, 493, 490, 527, - 591, 591, 561, 489, 564, 565, 565, 565, 565, 567, - 567, 567, 567, 568, 488, 486, 485, 563, 484, 589, - 589, 589, 589, 482, 591, 481, 572, 593, 593, 480, - 565, 595, 595, 479, 567, 572, 572, 572, 572, 572, - 572, 572, 572, 572, 589, 594, 594, 594, 594, 597, - 597, 593, 598, 598, 478, 595, 607, 607, 607, 607, - 608, 608, 610, 610, 612, 612, 613, 613, 618, 618, - 594, 620, 620, 597, 476, 475, 598, 616, 616, 616, - 616, 607, 467, 466, 608, 465, 610, 461, 612, 460, - - 613, 458, 618, 457, 455, 620, 452, 451, 450, 448, - 446, 445, 616, 623, 623, 623, 623, 623, 623, 623, - 623, 623, 623, 623, 623, 623, 623, 623, 623, 623, - 624, 624, 444, 624, 624, 624, 624, 624, 624, 624, - 624, 624, 624, 624, 624, 624, 624, 625, 625, 625, - 443, 440, 625, 626, 626, 438, 626, 626, 626, 626, - 626, 626, 627, 627, 437, 436, 627, 434, 627, 432, - 431, 430, 627, 627, 628, 628, 428, 628, 628, 628, - 628, 628, 628, 628, 628, 628, 628, 628, 628, 628, - 628, 629, 629, 629, 426, 425, 629, 630, 630, 630, - - 630, 630, 630, 630, 630, 630, 630, 630, 630, 630, - 630, 630, 630, 630, 631, 631, 631, 424, 423, 631, - 632, 422, 632, 632, 633, 633, 421, 633, 633, 420, - 633, 634, 634, 634, 634, 634, 634, 634, 634, 634, - 634, 634, 634, 634, 634, 634, 634, 634, 635, 635, - 418, 635, 635, 635, 635, 635, 635, 635, 635, 635, - 635, 635, 635, 635, 635, 636, 414, 413, 636, 636, - 412, 636, 636, 411, 636, 637, 637, 410, 637, 637, - 409, 637, 638, 408, 638, 638, 639, 639, 407, 405, - 639, 401, 639, 399, 398, 395, 639, 639, 639, 640, - - 640, 640, 640, 640, 640, 640, 640, 640, 640, 640, - 640, 640, 640, 640, 640, 640, 641, 394, 393, 641, - 641, 392, 641, 641, 391, 641, 642, 642, 390, 642, - 642, 389, 642, 643, 643, 388, 643, 643, 387, 643, - 644, 386, 385, 644, 644, 384, 644, 644, 382, 644, - 645, 645, 645, 381, 380, 379, 377, 645, 645, 645, - 646, 376, 375, 374, 373, 371, 370, 646, 646, 647, - 647, 647, 647, 647, 647, 647, 647, 647, 647, 647, - 647, 647, 647, 647, 647, 647, 648, 369, 368, 648, - 648, 367, 648, 648, 365, 648, 649, 649, 649, 360, - - 359, 356, 355, 649, 649, 649, 650, 650, 650, 650, - 650, 650, 650, 650, 650, 650, 650, 650, 650, 650, - 650, 650, 650, 651, 354, 353, 651, 651, 351, 651, - 651, 350, 651, 652, 652, 652, 652, 652, 652, 652, - 652, 652, 652, 652, 652, 652, 652, 652, 652, 652, - 653, 653, 653, 653, 653, 653, 653, 653, 653, 653, - 653, 653, 653, 653, 653, 653, 653, 654, 654, 654, - 349, 348, 347, 345, 654, 654, 654, 655, 344, 343, - 342, 340, 339, 338, 655, 655, 656, 656, 656, 334, - 333, 331, 328, 656, 656, 656, 657, 657, 657, 657, - - 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, - 657, 657, 657, 658, 658, 658, 327, 326, 325, 321, - 658, 658, 658, 659, 659, 659, 659, 659, 659, 659, - 659, 659, 659, 659, 659, 659, 659, 659, 659, 659, - 660, 660, 660, 660, 660, 660, 660, 660, 660, 660, - 660, 660, 660, 660, 660, 660, 660, 661, 661, 661, + 2, 5, 2, 10, 214, 10, 10, 10, 10, 10, + 10, 10, 10, 10, 12, 21, 214, 21, 12, 32, + 32, 48, 2, 11, 11, 11, 11, 11, 11, 11, + + 11, 11, 14, 38, 60, 8, 13, 38, 13, 13, + 13, 13, 13, 13, 13, 13, 13, 25, 27, 625, + 24, 14, 14, 25, 40, 13, 13, 48, 27, 60, + 24, 40, 24, 28, 28, 13, 14, 14, 24, 26, + 13, 13, 28, 29, 28, 36, 26, 34, 619, 47, + 42, 29, 47, 26, 29, 34, 36, 43, 72, 26, + 13, 34, 37, 36, 42, 37, 39, 34, 37, 39, + 41, 44, 99, 43, 44, 41, 44, 63, 63, 386, + 41, 39, 39, 99, 39, 45, 45, 45, 45, 49, + 84, 84, 49, 49, 72, 386, 93, 45, 45, 45, + + 45, 45, 45, 45, 45, 45, 93, 616, 58, 58, + 45, 50, 50, 50, 50, 50, 50, 50, 52, 55, + 100, 614, 100, 121, 52, 52, 52, 52, 52, 52, + 52, 45, 58, 121, 45, 613, 61, 45, 55, 55, + 65, 45, 53, 53, 53, 53, 53, 53, 53, 53, + 53, 52, 98, 55, 55, 61, 61, 98, 109, 65, + 65, 129, 113, 127, 109, 113, 127, 129, 127, 139, + 61, 61, 131, 140, 65, 65, 52, 54, 601, 54, + 54, 54, 54, 54, 54, 54, 54, 54, 138, 161, + 141, 138, 138, 147, 150, 150, 54, 54, 141, 141, + + 141, 141, 141, 141, 141, 139, 54, 165, 149, 140, + 206, 54, 54, 162, 131, 600, 162, 597, 147, 206, + 131, 152, 152, 154, 154, 161, 141, 149, 149, 265, + 265, 54, 56, 56, 56, 56, 56, 56, 56, 56, + 56, 172, 149, 149, 596, 152, 162, 154, 172, 56, + 56, 56, 132, 56, 172, 132, 588, 247, 412, 157, + 157, 412, 165, 177, 56, 56, 56, 245, 177, 177, + 245, 587, 56, 59, 59, 59, 59, 59, 59, 59, + 59, 59, 157, 312, 157, 312, 576, 572, 312, 312, + 59, 59, 59, 247, 59, 570, 414, 157, 132, 414, + + 245, 132, 568, 157, 132, 59, 59, 59, 132, 145, + 328, 483, 566, 59, 483, 145, 145, 145, 145, 145, + 145, 145, 156, 156, 156, 156, 156, 156, 156, 156, + 156, 163, 163, 163, 163, 163, 163, 163, 193, 234, + 193, 563, 334, 193, 193, 482, 482, 234, 234, 234, + 234, 234, 234, 234, 237, 423, 484, 561, 328, 484, + 237, 237, 237, 237, 237, 237, 237, 311, 538, 482, + 193, 538, 311, 541, 558, 234, 541, 311, 334, 311, + 163, 233, 233, 233, 233, 543, 546, 583, 543, 584, + 583, 423, 584, 233, 233, 233, 233, 233, 233, 233, + + 233, 233, 604, 241, 241, 604, 233, 240, 240, 240, + 240, 240, 240, 240, 240, 240, 557, 556, 321, 321, + 321, 329, 546, 555, 329, 554, 241, 233, 241, 552, + 233, 531, 531, 233, 488, 488, 488, 233, 551, 549, + 248, 241, 321, 411, 411, 411, 411, 241, 248, 248, + 248, 248, 248, 248, 248, 531, 585, 547, 488, 585, + 585, 479, 479, 479, 479, 545, 615, 329, 411, 615, + 329, 341, 544, 329, 533, 533, 248, 329, 542, 341, + 341, 341, 341, 341, 341, 341, 479, 481, 481, 481, + 481, 534, 534, 537, 528, 527, 526, 525, 533, 523, + + 485, 485, 485, 485, 485, 573, 573, 341, 342, 522, + 521, 520, 481, 519, 518, 534, 342, 342, 342, 342, + 342, 342, 342, 342, 342, 485, 517, 515, 514, 573, + 513, 342, 342, 342, 342, 342, 530, 530, 530, 530, + 540, 540, 540, 540, 342, 342, 342, 342, 342, 342, + 342, 424, 424, 424, 424, 424, 424, 424, 424, 424, + 512, 530, 510, 509, 507, 540, 424, 424, 424, 424, + 424, 535, 535, 535, 535, 535, 575, 575, 506, 503, + 424, 424, 424, 424, 424, 424, 494, 494, 494, 494, + 494, 494, 494, 494, 494, 502, 535, 578, 578, 501, + + 575, 494, 494, 494, 494, 494, 577, 577, 577, 577, + 579, 579, 579, 579, 498, 494, 494, 494, 494, 494, + 494, 578, 581, 581, 581, 581, 582, 582, 586, 497, + 496, 577, 605, 605, 495, 579, 493, 586, 586, 586, + 586, 586, 586, 586, 586, 586, 492, 581, 607, 607, + 582, 603, 603, 603, 603, 491, 605, 608, 608, 608, + 608, 609, 609, 611, 611, 612, 612, 621, 621, 621, + 621, 490, 607, 622, 622, 489, 603, 624, 624, 626, + 626, 487, 608, 627, 627, 609, 486, 611, 478, 612, + 632, 632, 621, 630, 630, 630, 630, 622, 634, 634, + + 477, 624, 476, 626, 472, 471, 469, 627, 468, 466, + 463, 462, 461, 459, 632, 457, 456, 455, 630, 454, + 451, 449, 634, 637, 637, 637, 637, 637, 637, 637, + 637, 637, 637, 637, 637, 637, 637, 637, 637, 637, + 638, 638, 448, 638, 638, 638, 638, 638, 638, 638, + 638, 638, 638, 638, 638, 638, 638, 639, 639, 639, + 447, 445, 639, 640, 640, 443, 640, 640, 640, 640, + 640, 640, 641, 641, 442, 441, 641, 439, 641, 437, + 436, 435, 641, 641, 642, 642, 434, 642, 642, 642, + 642, 642, 642, 642, 642, 642, 642, 642, 642, 642, + + 642, 643, 643, 643, 433, 431, 643, 644, 644, 644, + 644, 644, 644, 644, 644, 644, 644, 644, 644, 644, + 644, 644, 644, 644, 645, 645, 645, 430, 429, 645, + 646, 428, 646, 646, 647, 647, 426, 647, 647, 422, + 647, 648, 648, 648, 648, 648, 648, 648, 648, 648, + 648, 648, 648, 648, 648, 648, 648, 648, 649, 649, + 421, 649, 649, 649, 649, 649, 649, 649, 649, 649, + 649, 649, 649, 649, 649, 650, 420, 419, 650, 650, + 418, 650, 650, 417, 650, 651, 651, 416, 651, 651, + 415, 651, 652, 413, 652, 652, 653, 653, 409, 407, + + 653, 406, 653, 403, 402, 401, 653, 653, 653, 654, + 654, 654, 654, 654, 654, 654, 654, 654, 654, 654, + 654, 654, 654, 654, 654, 654, 655, 400, 399, 655, + 655, 398, 655, 655, 397, 655, 656, 656, 396, 656, + 656, 395, 656, 657, 657, 394, 657, 657, 393, 657, + 658, 392, 390, 658, 658, 389, 658, 658, 388, 658, + 659, 659, 659, 387, 385, 384, 383, 659, 659, 659, + 660, 382, 381, 379, 378, 377, 376, 660, 660, 661, 661, 661, 661, 661, 661, 661, 661, 661, 661, 661, - 661, 661, 661, 661, 662, 662, 662, 320, 319, 318, - 317, 662, 662, 662, 663, 663, 663, 663, 663, 663, - 663, 663, 663, 663, 663, 663, 663, 663, 663, 663, - - 663, 664, 664, 664, 664, 664, 664, 664, 664, 315, - 314, 664, 313, 311, 309, 308, 305, 304, 303, 302, - 301, 300, 299, 298, 297, 296, 295, 294, 293, 292, - 291, 290, 289, 288, 287, 286, 285, 284, 282, 281, - 279, 278, 277, 276, 275, 273, 272, 271, 270, 269, - 268, 267, 265, 264, 263, 262, 261, 259, 258, 255, - 254, 253, 252, 250, 244, 242, 241, 236, 230, 229, - 228, 227, 226, 225, 224, 223, 222, 221, 220, 219, - 218, 217, 216, 215, 214, 213, 211, 210, 209, 208, - 207, 206, 205, 203, 201, 200, 199, 198, 197, 196, - - 194, 193, 192, 190, 189, 188, 187, 186, 185, 184, - 183, 182, 181, 180, 179, 178, 177, 176, 174, 173, - 172, 171, 170, 168, 167, 166, 165, 163, 159, 158, - 145, 143, 142, 136, 135, 134, 133, 132, 125, 124, - 123, 122, 121, 119, 118, 117, 116, 115, 114, 113, - 111, 110, 109, 107, 106, 105, 104, 103, 102, 101, - 100, 96, 95, 94, 93, 91, 90, 89, 88, 87, - 86, 85, 84, 82, 81, 80, 79, 78, 77, 76, - 75, 74, 73, 71, 69, 51, 46, 35, 33, 31, - 30, 25, 23, 22, 20, 18, 17, 16, 15, 9, - - 3, 622, 622, 622, 622, 622, 622, 622, 622, 622, - 622, 622, 622, 622, 622, 622, 622, 622, 622, 622, - 622, 622, 622, 622, 622, 622, 622, 622, 622, 622, - 622, 622, 622, 622, 622, 622, 622, 622, 622, 622, - 622, 622, 622, 622, 622, 622, 622, 622, 622, 622, - 622, 622, 622, 622, 622, 622, 622, 622, 622, 622, - 622, 622, 622, 622, 622, 622, 622, 622, 622 + 661, 661, 661, 661, 661, 661, 662, 375, 373, 662, + + 662, 368, 662, 662, 367, 662, 663, 663, 663, 364, + 363, 362, 361, 663, 663, 663, 664, 664, 664, 664, + 664, 664, 664, 664, 664, 664, 664, 664, 664, 664, + 664, 664, 664, 665, 359, 358, 665, 665, 357, 665, + 665, 356, 665, 666, 666, 666, 666, 666, 666, 666, + 666, 666, 666, 666, 666, 666, 666, 666, 666, 666, + 667, 667, 667, 667, 667, 667, 667, 667, 667, 667, + 667, 667, 667, 667, 667, 667, 667, 668, 668, 668, + 355, 353, 352, 351, 668, 668, 668, 669, 350, 349, + 348, 347, 345, 344, 669, 669, 670, 670, 670, 343, + + 339, 338, 336, 670, 670, 670, 671, 671, 671, 671, + 671, 671, 671, 671, 671, 671, 671, 671, 671, 671, + 671, 671, 671, 672, 672, 672, 333, 332, 331, 330, + 672, 672, 672, 673, 673, 673, 673, 673, 673, 673, + 673, 673, 673, 673, 673, 673, 673, 673, 673, 673, + 674, 674, 674, 674, 674, 674, 674, 674, 674, 674, + 674, 674, 674, 674, 674, 674, 674, 675, 675, 675, + 675, 675, 675, 675, 675, 675, 675, 675, 675, 675, + 675, 675, 675, 675, 676, 676, 676, 326, 325, 324, + 323, 676, 676, 676, 677, 677, 677, 677, 677, 677, + + 677, 677, 677, 677, 677, 677, 677, 677, 677, 677, + 677, 678, 678, 678, 678, 678, 678, 678, 678, 322, + 320, 678, 319, 318, 316, 314, 313, 310, 309, 308, + 307, 306, 305, 304, 303, 302, 301, 300, 299, 298, + 297, 296, 295, 294, 293, 292, 291, 290, 289, 287, + 286, 284, 283, 282, 281, 280, 278, 277, 276, 275, + 274, 273, 272, 270, 269, 268, 267, 266, 264, 263, + 260, 259, 258, 257, 256, 255, 254, 252, 246, 244, + 243, 238, 232, 231, 230, 229, 228, 227, 226, 225, + 224, 223, 222, 221, 220, 219, 218, 217, 216, 215, + + 213, 212, 211, 210, 209, 208, 207, 205, 203, 202, + 201, 200, 199, 198, 196, 195, 194, 192, 191, 190, + 189, 188, 187, 186, 185, 184, 183, 182, 181, 180, + 179, 178, 176, 175, 174, 173, 171, 169, 168, 167, + 166, 164, 160, 159, 146, 144, 143, 137, 136, 135, + 134, 133, 126, 125, 124, 123, 122, 120, 119, 118, + 117, 116, 115, 114, 112, 111, 110, 108, 107, 106, + 105, 104, 103, 102, 101, 97, 96, 95, 94, 92, + 91, 90, 89, 88, 87, 86, 85, 83, 82, 81, + 80, 79, 78, 77, 76, 75, 74, 73, 71, 69, + + 51, 46, 35, 33, 31, 30, 23, 22, 20, 18, + 17, 16, 15, 9, 3, 636, 636, 636, 636, 636, + 636, 636, 636, 636, 636, 636, 636, 636, 636, 636, + 636, 636, 636, 636, 636, 636, 636, 636, 636, 636, + 636, 636, 636, 636, 636, 636, 636, 636, 636, 636, + 636, 636, 636, 636, 636, 636, 636, 636, 636, 636, + 636, 636, 636, 636, 636, 636, 636, 636, 636, 636, + 636, 636, 636, 636, 636, 636, 636, 636, 636, 636, + 636, 636, 636 } ; extern int yy_flex_debug; @@ -1450,9 +1459,11 @@ static AST_Decl * idl_find_node (const char *); #undef ECHO #endif -#line 1455 "fe/idl.yy.cpp" +#define IDL4_KEYWORD(TOKEN_NAME) if (idl_global->idl_version_ >= IDL_VERSION_4) return TOKEN_NAME; + +#line 1467 "fe/idl.yy.cpp" /* SO we don't choke on files that use \r\n */ -#line 1457 "fe/idl.yy.cpp" +#line 1469 "fe/idl.yy.cpp" #define INITIAL 0 @@ -1678,10 +1689,10 @@ YY_DECL } { -#line 123 "fe/idl.ll" +#line 125 "fe/idl.ll" -#line 1686 "fe/idl.yy.cpp" +#line 1698 "fe/idl.yy.cpp" while ( /*CONSTCOND*/1 ) /* loops until end-of-file is reached */ { @@ -1708,14 +1719,14 @@ YY_DECL while ( yy_chk[yy_base[yy_current_state] + yy_c] != yy_current_state ) { yy_current_state = (int) yy_def[yy_current_state]; - if ( yy_current_state >= 623 ) + if ( yy_current_state >= 637 ) yy_c = yy_meta[yy_c]; } yy_current_state = yy_nxt[yy_base[yy_current_state] + yy_c]; *(yy_state_ptr)++ = yy_current_state; ++yy_cp; } - while ( yy_current_state != 622 ); + while ( yy_current_state != 636 ); yy_find_action: yy_current_state = *--(yy_state_ptr); @@ -1746,499 +1757,446 @@ YY_DECL { /* beginning of action switch */ case 1: YY_RULE_SETUP -#line 125 "fe/idl.ll" +#line 127 "fe/idl.ll" return IDL_ANY; YY_BREAK case 2: YY_RULE_SETUP -#line 126 "fe/idl.ll" +#line 128 "fe/idl.ll" return IDL_OBJECT; YY_BREAK case 3: YY_RULE_SETUP -#line 127 "fe/idl.ll" +#line 129 "fe/idl.ll" return IDL_MODULE; YY_BREAK case 4: YY_RULE_SETUP -#line 128 "fe/idl.ll" +#line 130 "fe/idl.ll" return IDL_RAISES; YY_BREAK case 5: YY_RULE_SETUP -#line 129 "fe/idl.ll" +#line 131 "fe/idl.ll" return IDL_READONLY; YY_BREAK case 6: YY_RULE_SETUP -#line 130 "fe/idl.ll" +#line 132 "fe/idl.ll" return IDL_ATTRIBUTE; YY_BREAK case 7: YY_RULE_SETUP -#line 131 "fe/idl.ll" +#line 133 "fe/idl.ll" return IDL_EXCEPTION; YY_BREAK case 8: YY_RULE_SETUP -#line 132 "fe/idl.ll" +#line 134 "fe/idl.ll" return IDL_CONTEXT; YY_BREAK case 9: YY_RULE_SETUP -#line 133 "fe/idl.ll" +#line 135 "fe/idl.ll" return IDL_INTERFACE; YY_BREAK case 10: YY_RULE_SETUP -#line 134 "fe/idl.ll" +#line 136 "fe/idl.ll" return IDL_CONST; YY_BREAK case 11: YY_RULE_SETUP -#line 135 "fe/idl.ll" +#line 137 "fe/idl.ll" return IDL_TYPEDEF; YY_BREAK case 12: YY_RULE_SETUP -#line 136 "fe/idl.ll" +#line 138 "fe/idl.ll" return IDL_STRUCT; YY_BREAK case 13: YY_RULE_SETUP -#line 137 "fe/idl.ll" +#line 139 "fe/idl.ll" return IDL_ENUM; YY_BREAK case 14: YY_RULE_SETUP -#line 138 "fe/idl.ll" +#line 140 "fe/idl.ll" return IDL_STRING; YY_BREAK case 15: YY_RULE_SETUP -#line 139 "fe/idl.ll" +#line 141 "fe/idl.ll" return IDL_WSTRING; YY_BREAK case 16: YY_RULE_SETUP -#line 140 "fe/idl.ll" +#line 142 "fe/idl.ll" return IDL_SEQUENCE; YY_BREAK case 17: YY_RULE_SETUP -#line 141 "fe/idl.ll" -return IDL_MAP; +#line 143 "fe/idl.ll" +return IDL_UNION; YY_BREAK case 18: YY_RULE_SETUP -#line 142 "fe/idl.ll" -return IDL_UNION; +#line 144 "fe/idl.ll" +return IDL_FIXED; YY_BREAK case 19: YY_RULE_SETUP -#line 143 "fe/idl.ll" -return IDL_FIXED; +#line 145 "fe/idl.ll" +return IDL_SWITCH; YY_BREAK case 20: YY_RULE_SETUP -#line 144 "fe/idl.ll" -return IDL_SWITCH; +#line 146 "fe/idl.ll" +return IDL_CASE; YY_BREAK case 21: YY_RULE_SETUP -#line 145 "fe/idl.ll" -return IDL_CASE; +#line 147 "fe/idl.ll" +return IDL_DEFAULT; YY_BREAK case 22: YY_RULE_SETUP -#line 146 "fe/idl.ll" -return IDL_DEFAULT; +#line 148 "fe/idl.ll" +return IDL_FLOAT; YY_BREAK case 23: YY_RULE_SETUP -#line 147 "fe/idl.ll" -return IDL_FLOAT; +#line 149 "fe/idl.ll" +return IDL_DOUBLE; YY_BREAK case 24: YY_RULE_SETUP -#line 148 "fe/idl.ll" -return IDL_DOUBLE; +#line 150 "fe/idl.ll" +return IDL_LONG; YY_BREAK case 25: YY_RULE_SETUP -#line 149 "fe/idl.ll" -return IDL_LONG; +#line 151 "fe/idl.ll" +return IDL_SHORT; YY_BREAK case 26: YY_RULE_SETUP -#line 150 "fe/idl.ll" -return IDL_SHORT; +#line 152 "fe/idl.ll" +return IDL_UNSIGNED; YY_BREAK case 27: YY_RULE_SETUP -#line 151 "fe/idl.ll" -return IDL_UNSIGNED; +#line 153 "fe/idl.ll" +return IDL_CHAR; YY_BREAK case 28: YY_RULE_SETUP -#line 152 "fe/idl.ll" -return IDL_CHAR; +#line 154 "fe/idl.ll" +return IDL_WCHAR; YY_BREAK case 29: YY_RULE_SETUP -#line 153 "fe/idl.ll" -return IDL_WCHAR; +#line 155 "fe/idl.ll" +return IDL_BOOLEAN; YY_BREAK case 30: YY_RULE_SETUP -#line 154 "fe/idl.ll" -return IDL_BOOLEAN; +#line 156 "fe/idl.ll" +return IDL_OCTET; YY_BREAK case 31: YY_RULE_SETUP -#line 155 "fe/idl.ll" -return IDL_OCTET; +#line 157 "fe/idl.ll" +return IDL_VOID; YY_BREAK case 32: YY_RULE_SETUP -#line 156 "fe/idl.ll" -return IDL_VOID; +#line 158 "fe/idl.ll" +return IDL_NATIVE; YY_BREAK case 33: YY_RULE_SETUP -#line 157 "fe/idl.ll" -return IDL_NATIVE; +#line 159 "fe/idl.ll" +return IDL_LOCAL; YY_BREAK case 34: YY_RULE_SETUP -#line 158 "fe/idl.ll" -return IDL_LOCAL; +#line 160 "fe/idl.ll" +return IDL_ABSTRACT; YY_BREAK case 35: YY_RULE_SETUP -#line 159 "fe/idl.ll" -return IDL_ABSTRACT; +#line 162 "fe/idl.ll" +return IDL_CUSTOM; YY_BREAK case 36: YY_RULE_SETUP -#line 161 "fe/idl.ll" -{ - if (idl_global->idl_version_ >= IDL_VERSION_4) - return IDL_INT8; - else - { - REJECT; - } -} +#line 163 "fe/idl.ll" +return IDL_FACTORY; YY_BREAK case 37: YY_RULE_SETUP -#line 169 "fe/idl.ll" -{ - if (idl_global->idl_version_ >= IDL_VERSION_4) - return IDL_UINT8; - else - { - REJECT; - } -} +#line 164 "fe/idl.ll" +return IDL_PRIVATE; YY_BREAK case 38: YY_RULE_SETUP -#line 177 "fe/idl.ll" -{ - if (idl_global->idl_version_ >= IDL_VERSION_4) - return IDL_INT16; - else - { - REJECT; - } -} +#line 165 "fe/idl.ll" +return IDL_PUBLIC; YY_BREAK case 39: YY_RULE_SETUP -#line 185 "fe/idl.ll" -{ - if (idl_global->idl_version_ >= IDL_VERSION_4) - return IDL_UINT16; - else - { - REJECT; - } -} +#line 166 "fe/idl.ll" +return IDL_SUPPORTS; YY_BREAK case 40: YY_RULE_SETUP -#line 193 "fe/idl.ll" -{ - if (idl_global->idl_version_ >= IDL_VERSION_4) - return IDL_INT32; - else - { - REJECT; - } -} +#line 167 "fe/idl.ll" +return IDL_TRUNCATABLE; YY_BREAK case 41: YY_RULE_SETUP -#line 201 "fe/idl.ll" -{ - if (idl_global->idl_version_ >= IDL_VERSION_4) - return IDL_UINT32; - else - { - REJECT; - } -} +#line 168 "fe/idl.ll" +return IDL_VALUETYPE; YY_BREAK case 42: YY_RULE_SETUP -#line 209 "fe/idl.ll" -{ - if (idl_global->idl_version_ >= IDL_VERSION_4) - return IDL_INT64; - else - { - REJECT; - } -} +#line 170 "fe/idl.ll" +return IDL_COMPONENT; YY_BREAK case 43: YY_RULE_SETUP -#line 217 "fe/idl.ll" -{ - if (idl_global->idl_version_ >= IDL_VERSION_4) - return IDL_UINT64; - else - { - REJECT; - } -} +#line 171 "fe/idl.ll" +return IDL_CONSUMES; YY_BREAK case 44: YY_RULE_SETUP -#line 225 "fe/idl.ll" -{ - if (idl_global->idl_version_ >= IDL_VERSION_4) - return IDL_MAP; - else - { - REJECT; - } -} +#line 172 "fe/idl.ll" +return IDL_EMITS; YY_BREAK case 45: YY_RULE_SETUP -#line 234 "fe/idl.ll" -return IDL_CUSTOM; +#line 173 "fe/idl.ll" +return IDL_EVENTTYPE; YY_BREAK case 46: YY_RULE_SETUP -#line 235 "fe/idl.ll" -return IDL_FACTORY; +#line 174 "fe/idl.ll" +return IDL_FINDER; YY_BREAK case 47: YY_RULE_SETUP -#line 236 "fe/idl.ll" -return IDL_PRIVATE; +#line 175 "fe/idl.ll" +return IDL_GETRAISES; YY_BREAK case 48: YY_RULE_SETUP -#line 237 "fe/idl.ll" -return IDL_PUBLIC; +#line 176 "fe/idl.ll" +return IDL_HOME; YY_BREAK case 49: YY_RULE_SETUP -#line 238 "fe/idl.ll" -return IDL_SUPPORTS; +#line 177 "fe/idl.ll" +return IDL_IMPORT; YY_BREAK case 50: YY_RULE_SETUP -#line 239 "fe/idl.ll" -return IDL_TRUNCATABLE; +#line 178 "fe/idl.ll" +return IDL_MULTIPLE; YY_BREAK case 51: YY_RULE_SETUP -#line 240 "fe/idl.ll" -return IDL_VALUETYPE; +#line 179 "fe/idl.ll" +return IDL_PRIMARYKEY; YY_BREAK case 52: YY_RULE_SETUP -#line 242 "fe/idl.ll" -return IDL_COMPONENT; +#line 180 "fe/idl.ll" +return IDL_PROVIDES; YY_BREAK case 53: YY_RULE_SETUP -#line 243 "fe/idl.ll" -return IDL_CONSUMES; +#line 181 "fe/idl.ll" +return IDL_PUBLISHES; YY_BREAK case 54: YY_RULE_SETUP -#line 244 "fe/idl.ll" -return IDL_EMITS; +#line 182 "fe/idl.ll" +return IDL_SETRAISES; YY_BREAK case 55: YY_RULE_SETUP -#line 245 "fe/idl.ll" -return IDL_EVENTTYPE; +#line 183 "fe/idl.ll" +return IDL_TYPEID; YY_BREAK case 56: YY_RULE_SETUP -#line 246 "fe/idl.ll" -return IDL_FINDER; +#line 184 "fe/idl.ll" +return IDL_TYPEPREFIX; YY_BREAK case 57: YY_RULE_SETUP -#line 247 "fe/idl.ll" -return IDL_GETRAISES; +#line 185 "fe/idl.ll" +return IDL_USES; YY_BREAK case 58: YY_RULE_SETUP -#line 248 "fe/idl.ll" -return IDL_HOME; +#line 186 "fe/idl.ll" +return IDL_MANAGES; YY_BREAK case 59: YY_RULE_SETUP -#line 249 "fe/idl.ll" -return IDL_IMPORT; +#line 188 "fe/idl.ll" +return IDL_TYPENAME; YY_BREAK case 60: YY_RULE_SETUP -#line 250 "fe/idl.ll" -return IDL_MULTIPLE; +#line 189 "fe/idl.ll" +return IDL_PORT; YY_BREAK case 61: YY_RULE_SETUP -#line 251 "fe/idl.ll" -return IDL_PRIMARYKEY; +#line 190 "fe/idl.ll" +return IDL_MIRRORPORT; YY_BREAK case 62: YY_RULE_SETUP -#line 252 "fe/idl.ll" -return IDL_PROVIDES; +#line 191 "fe/idl.ll" +return IDL_PORTTYPE; YY_BREAK case 63: YY_RULE_SETUP -#line 253 "fe/idl.ll" -return IDL_PUBLISHES; +#line 192 "fe/idl.ll" +return IDL_CONNECTOR; YY_BREAK case 64: YY_RULE_SETUP -#line 254 "fe/idl.ll" -return IDL_SETRAISES; +#line 193 "fe/idl.ll" +return IDL_ALIAS; YY_BREAK case 65: YY_RULE_SETUP -#line 255 "fe/idl.ll" -return IDL_TYPEID; +#line 195 "fe/idl.ll" +return IDL_TRUETOK; YY_BREAK case 66: YY_RULE_SETUP -#line 256 "fe/idl.ll" -return IDL_TYPEPREFIX; +#line 196 "fe/idl.ll" +return IDL_FALSETOK; YY_BREAK case 67: YY_RULE_SETUP -#line 257 "fe/idl.ll" -return IDL_USES; +#line 198 "fe/idl.ll" +return IDL_INOUT; YY_BREAK case 68: YY_RULE_SETUP -#line 258 "fe/idl.ll" -return IDL_MANAGES; +#line 199 "fe/idl.ll" +return IDL_IN; YY_BREAK case 69: YY_RULE_SETUP -#line 260 "fe/idl.ll" -return IDL_TYPENAME; +#line 200 "fe/idl.ll" +return IDL_OUT; YY_BREAK case 70: YY_RULE_SETUP -#line 261 "fe/idl.ll" -return IDL_PORT; +#line 201 "fe/idl.ll" +return IDL_ONEWAY; YY_BREAK case 71: YY_RULE_SETUP -#line 262 "fe/idl.ll" -return IDL_MIRRORPORT; +#line 203 "fe/idl.ll" +return IDL_LEFT_SHIFT; YY_BREAK case 72: YY_RULE_SETUP -#line 263 "fe/idl.ll" -return IDL_PORTTYPE; +#line 204 "fe/idl.ll" +return IDL_RIGHT_SHIFT; YY_BREAK case 73: YY_RULE_SETUP -#line 264 "fe/idl.ll" -return IDL_CONNECTOR; +#line 205 "fe/idl.ll" +{ + tao_yylval.strval = ACE::strnew ("::"); + return IDL_SCOPE_DELIMITOR; + } YY_BREAK case 74: +/* rule 74 can match eol */ YY_RULE_SETUP -#line 265 "fe/idl.ll" -return IDL_ALIAS; +#line 210 "fe/idl.ll" +return IDL_ANNOTATION_DECL; // Allow annotation names that start with "annotation" YY_BREAK case 75: YY_RULE_SETUP -#line 267 "fe/idl.ll" -return IDL_TRUETOK; +#line 211 "fe/idl.ll" +return IDL_ANNOTATION_SYMBOL; YY_BREAK case 76: YY_RULE_SETUP -#line 268 "fe/idl.ll" -return IDL_FALSETOK; +#line 213 "fe/idl.ll" +IDL4_KEYWORD(IDL_INT8); REJECT; YY_BREAK case 77: YY_RULE_SETUP -#line 270 "fe/idl.ll" -return IDL_INOUT; +#line 214 "fe/idl.ll" +IDL4_KEYWORD(IDL_UINT8); REJECT; YY_BREAK case 78: YY_RULE_SETUP -#line 271 "fe/idl.ll" -return IDL_IN; +#line 215 "fe/idl.ll" +IDL4_KEYWORD(IDL_INT16); REJECT; YY_BREAK case 79: YY_RULE_SETUP -#line 272 "fe/idl.ll" -return IDL_OUT; +#line 216 "fe/idl.ll" +IDL4_KEYWORD(IDL_UINT16); REJECT; YY_BREAK case 80: YY_RULE_SETUP -#line 273 "fe/idl.ll" -return IDL_ONEWAY; +#line 217 "fe/idl.ll" +IDL4_KEYWORD(IDL_INT32); REJECT; YY_BREAK case 81: YY_RULE_SETUP -#line 275 "fe/idl.ll" -return IDL_LEFT_SHIFT; +#line 218 "fe/idl.ll" +IDL4_KEYWORD(IDL_UINT32); REJECT; YY_BREAK case 82: YY_RULE_SETUP -#line 276 "fe/idl.ll" -return IDL_RIGHT_SHIFT; +#line 219 "fe/idl.ll" +IDL4_KEYWORD(IDL_INT64); REJECT; YY_BREAK case 83: YY_RULE_SETUP -#line 277 "fe/idl.ll" -{ - tao_yylval.strval = ACE::strnew ("::"); - return IDL_SCOPE_DELIMITOR; - } +#line 220 "fe/idl.ll" +IDL4_KEYWORD(IDL_UINT64); REJECT; YY_BREAK case 84: -/* rule 84 can match eol */ YY_RULE_SETUP -#line 282 "fe/idl.ll" -return IDL_ANNOTATION_DECL; // Allow annotation names that start with "annotation" +#line 222 "fe/idl.ll" +IDL4_KEYWORD(IDL_BITFIELD); REJECT; YY_BREAK case 85: YY_RULE_SETUP -#line 283 "fe/idl.ll" -return IDL_ANNOTATION_SYMBOL; +#line 223 "fe/idl.ll" +IDL4_KEYWORD(IDL_BITMASK); REJECT; YY_BREAK case 86: YY_RULE_SETUP -#line 285 "fe/idl.ll" +#line 224 "fe/idl.ll" +IDL4_KEYWORD(IDL_BITSET); REJECT; + YY_BREAK +case 87: +YY_RULE_SETUP +#line 225 "fe/idl.ll" +IDL4_KEYWORD(IDL_MAP); REJECT; + YY_BREAK +case 88: +YY_RULE_SETUP +#line 227 "fe/idl.ll" { // Make sure that this identifier is not a C++ keyword. If it is, // prepend it with a _cxx_. Lookup in the perfect hash table for C++ @@ -2272,82 +2230,82 @@ YY_RULE_SETUP return IDENTIFIER; } YY_BREAK -case 87: +case 89: YY_RULE_SETUP -#line 318 "fe/idl.ll" +#line 260 "fe/idl.ll" { tao_yylval.dval = idl_atof (ace_yytext); return IDL_FLOATING_PT_LITERAL; } YY_BREAK -case 88: +case 90: YY_RULE_SETUP -#line 322 "fe/idl.ll" +#line 264 "fe/idl.ll" { tao_yylval.dval = idl_atof (ace_yytext); return IDL_FLOATING_PT_LITERAL; } YY_BREAK -case 89: +case 91: YY_RULE_SETUP -#line 327 "fe/idl.ll" +#line 269 "fe/idl.ll" { tao_yylval.fixval = ACE_CDR::Fixed::from_string (ace_yytext); return IDL_FIXED_PT_LITERAL; } YY_BREAK -case 90: +case 92: YY_RULE_SETUP -#line 332 "fe/idl.ll" +#line 274 "fe/idl.ll" { tao_yylval.ival = idl_atoi (ace_yytext, 10); return IDL_INTEGER_LITERAL; } YY_BREAK -case 91: +case 93: YY_RULE_SETUP -#line 336 "fe/idl.ll" +#line 278 "fe/idl.ll" { tao_yylval.uival = idl_atoui (ace_yytext, 10); return IDL_UINTEGER_LITERAL; } YY_BREAK -case 92: +case 94: YY_RULE_SETUP -#line 340 "fe/idl.ll" +#line 282 "fe/idl.ll" { tao_yylval.ival = idl_atoi (ace_yytext, 16); return IDL_INTEGER_LITERAL; } YY_BREAK -case 93: +case 95: YY_RULE_SETUP -#line 344 "fe/idl.ll" +#line 286 "fe/idl.ll" { tao_yylval.uival = idl_atoui (ace_yytext, 16); return IDL_UINTEGER_LITERAL; } YY_BREAK -case 94: +case 96: YY_RULE_SETUP -#line 348 "fe/idl.ll" +#line 290 "fe/idl.ll" { tao_yylval.ival = idl_atoi (ace_yytext, 8); return IDL_INTEGER_LITERAL; } YY_BREAK -case 95: +case 97: YY_RULE_SETUP -#line 352 "fe/idl.ll" +#line 294 "fe/idl.ll" { tao_yylval.uival = idl_atoui (ace_yytext, 8); return IDL_UINTEGER_LITERAL; } YY_BREAK -case 96: -/* rule 96 can match eol */ +case 98: +/* rule 98 can match eol */ YY_RULE_SETUP -#line 357 "fe/idl.ll" +#line 299 "fe/idl.ll" { /* Skip the quotes */ char * const tmp = ace_yytext; @@ -2369,10 +2327,10 @@ YY_RULE_SETUP return IDL_STRING_LITERAL; } YY_BREAK -case 97: -/* rule 97 can match eol */ +case 99: +/* rule 99 can match eol */ YY_RULE_SETUP -#line 377 "fe/idl.ll" +#line 319 "fe/idl.ll" { /* Skip the bookends */ char * const tmp = ACE_OS::strdup (ace_yytext); @@ -2393,102 +2351,90 @@ YY_RULE_SETUP return IDL_WSTRING_LITERAL; } YY_BREAK -case 98: +case 100: YY_RULE_SETUP -#line 396 "fe/idl.ll" +#line 338 "fe/idl.ll" { tao_yylval.cval = ace_yytext[1]; return IDL_CHARACTER_LITERAL; } YY_BREAK -case 99: +case 101: YY_RULE_SETUP -#line 400 "fe/idl.ll" +#line 342 "fe/idl.ll" { // octal character constant tao_yylval.cval = idl_escape_reader (ace_yytext + 1); return IDL_CHARACTER_LITERAL; } YY_BREAK -case 100: +case 102: YY_RULE_SETUP -#line 405 "fe/idl.ll" +#line 347 "fe/idl.ll" { // hexadecimal character constant tao_yylval.cval = idl_escape_reader (ace_yytext + 1); return IDL_CHARACTER_LITERAL; } YY_BREAK -case 101: +case 103: YY_RULE_SETUP -#line 410 "fe/idl.ll" +#line 352 "fe/idl.ll" { tao_yylval.cval = idl_escape_reader (ace_yytext + 1); return IDL_CHARACTER_LITERAL; } YY_BREAK -case 102: +case 104: YY_RULE_SETUP -#line 414 "fe/idl.ll" +#line 356 "fe/idl.ll" { // wide character constant tao_yylval.wcval = ace_yytext[2]; return IDL_WCHAR_LITERAL; } YY_BREAK -case 103: +case 105: YY_RULE_SETUP -#line 419 "fe/idl.ll" +#line 361 "fe/idl.ll" { // hexadecimal wide character constant tao_yylval.wcval = idl_wchar_escape_reader (ace_yytext + 2); return IDL_WCHAR_LITERAL; } YY_BREAK -case 104: -/* rule 104 can match eol */ -#line 425 "fe/idl.ll" -case 105: -/* rule 105 can match eol */ -YY_RULE_SETUP -#line 425 "fe/idl.ll" -{/* remember pragma */ - idl_global->set_lineno (idl_global->lineno () + 1); - idl_store_pragma (ace_yytext); - break; - } - YY_BREAK case 106: /* rule 106 can match eol */ -#line 431 "fe/idl.ll" +#line 367 "fe/idl.ll" case 107: /* rule 107 can match eol */ YY_RULE_SETUP -#line 431 "fe/idl.ll" -{/* ignore file */ - idl_global->set_lineno(idl_global->lineno () + 1); +#line 367 "fe/idl.ll" +{/* remember pragma */ + idl_global->set_lineno (idl_global->lineno () + 1); + idl_store_pragma (ace_yytext); break; } YY_BREAK case 108: /* rule 108 can match eol */ -#line 436 "fe/idl.ll" +#line 373 "fe/idl.ll" case 109: /* rule 109 can match eol */ YY_RULE_SETUP -#line 436 "fe/idl.ll" -{ - idl_parse_line_and_file (ace_yytext); +#line 373 "fe/idl.ll" +{/* ignore file */ + idl_global->set_lineno(idl_global->lineno () + 1); break; } YY_BREAK case 110: /* rule 110 can match eol */ -#line 441 "fe/idl.ll" +#line 378 "fe/idl.ll" case 111: /* rule 111 can match eol */ YY_RULE_SETUP -#line 441 "fe/idl.ll" +#line 378 "fe/idl.ll" { idl_parse_line_and_file (ace_yytext); break; @@ -2496,11 +2442,11 @@ YY_RULE_SETUP YY_BREAK case 112: /* rule 112 can match eol */ -#line 446 "fe/idl.ll" +#line 383 "fe/idl.ll" case 113: /* rule 113 can match eol */ YY_RULE_SETUP -#line 446 "fe/idl.ll" +#line 383 "fe/idl.ll" { idl_parse_line_and_file (ace_yytext); break; @@ -2508,11 +2454,11 @@ YY_RULE_SETUP YY_BREAK case 114: /* rule 114 can match eol */ -#line 451 "fe/idl.ll" +#line 388 "fe/idl.ll" case 115: /* rule 115 can match eol */ YY_RULE_SETUP -#line 451 "fe/idl.ll" +#line 388 "fe/idl.ll" { idl_parse_line_and_file (ace_yytext); break; @@ -2520,30 +2466,42 @@ YY_RULE_SETUP YY_BREAK case 116: /* rule 116 can match eol */ -#line 456 "fe/idl.ll" +#line 393 "fe/idl.ll" case 117: /* rule 117 can match eol */ YY_RULE_SETUP -#line 456 "fe/idl.ll" +#line 393 "fe/idl.ll" { - /* ignore cpp ident */ - idl_global->set_lineno (idl_global->lineno () + 1); + idl_parse_line_and_file (ace_yytext); break; } YY_BREAK case 118: /* rule 118 can match eol */ +#line 398 "fe/idl.ll" +case 119: +/* rule 119 can match eol */ +YY_RULE_SETUP +#line 398 "fe/idl.ll" +{ + /* ignore cpp ident */ + idl_global->set_lineno (idl_global->lineno () + 1); + break; + } + YY_BREAK +case 120: +/* rule 120 can match eol */ YY_RULE_SETUP -#line 461 "fe/idl.ll" +#line 403 "fe/idl.ll" { /* ignore comments */ idl_global->set_lineno(idl_global->lineno () + 1); break; } YY_BREAK -case 119: +case 121: YY_RULE_SETUP -#line 466 "fe/idl.ll" +#line 408 "fe/idl.ll" { for (;;) { @@ -2564,31 +2522,31 @@ YY_RULE_SETUP break; } YY_BREAK -case 120: +case 122: YY_RULE_SETUP -#line 485 "fe/idl.ll" +#line 427 "fe/idl.ll" break; YY_BREAK -case 121: -/* rule 121 can match eol */ +case 123: +/* rule 123 can match eol */ YY_RULE_SETUP -#line 486 "fe/idl.ll" +#line 428 "fe/idl.ll" { idl_global->set_lineno (idl_global->lineno () + 1); break; } YY_BREAK -case 122: +case 124: YY_RULE_SETUP -#line 490 "fe/idl.ll" +#line 432 "fe/idl.ll" return ace_yytext[0]; YY_BREAK -case 123: +case 125: YY_RULE_SETUP -#line 492 "fe/idl.ll" +#line 434 "fe/idl.ll" ECHO; YY_BREAK -#line 2593 "fe/idl.yy.cpp" +#line 2552 "fe/idl.yy.cpp" case YY_STATE_EOF(INITIAL): yyterminate(); @@ -2854,7 +2812,7 @@ static int yy_get_next_buffer (void) while ( yy_chk[yy_base[yy_current_state] + yy_c] != yy_current_state ) { yy_current_state = (int) yy_def[yy_current_state]; - if ( yy_current_state >= 623 ) + if ( yy_current_state >= 637 ) yy_c = yy_meta[yy_c]; } yy_current_state = yy_nxt[yy_base[yy_current_state] + yy_c]; @@ -2877,11 +2835,11 @@ static int yy_get_next_buffer (void) while ( yy_chk[yy_base[yy_current_state] + yy_c] != yy_current_state ) { yy_current_state = (int) yy_def[yy_current_state]; - if ( yy_current_state >= 623 ) + if ( yy_current_state >= 637 ) yy_c = yy_meta[yy_c]; } yy_current_state = yy_nxt[yy_base[yy_current_state] + yy_c]; - yy_is_jam = (yy_current_state == 622); + yy_is_jam = (yy_current_state == 636); if ( ! yy_is_jam ) *(yy_state_ptr)++ = yy_current_state; @@ -3569,7 +3527,7 @@ void yyfree (void * ptr ) #define YYTABLES_NAME "yytables" -#line 492 "fe/idl.ll" +#line 434 "fe/idl.ll" /* subroutines */ 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..92c34251c9c4e --- /dev/null +++ b/TAO/tests/IDLv4/union_disc/test.idl @@ -0,0 +1,51 @@ +typedef wchar wchar_t; +const wchar wchar_const = L'u'; +union WcharUnion switch (wchar_t) { +/* TODO: https://github.com/DOCGroup/ACE_TAO/issues/1284 +case L'\u0': + boolean b; +*/ +case L'i': + int32 i32; +case wchar_const: + uint32 u32; +/* TODO: https://github.com/DOCGroup/ACE_TAO/issues/1284 +case L'\uffff': + string s; +*/ +}; + +typedef octet octet_t; +const octet octet_const = 1; +union OctetUnion switch (octet_t) { +case 0: + octet a; +case octet_const: + octet b; +case 255: + octet c; +}; + +typedef uint8 uint8_t; +const uint8 uint8_const = 1; +union Uint8Union switch (uint8_t) { +case 0: + uint8 a; +case uint8_const: + uint8 b; +case 255: + uint8 c; +}; + +typedef int8 int8_t; +const int8 int8_const = 1; +union Int8Union switch (int8_t) { +case -128: + int8 a; +case 0: + int8 b; +case int8_const: + int8 c; +case 127: + int8 d; +};