diff options
| author | parsons <parsons@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2003-01-30 02:48:48 +0000 |
|---|---|---|
| committer | parsons <parsons@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2003-01-30 02:48:48 +0000 |
| commit | f6e689abbaf5c899f991bc3c56746ad3709ae572 (patch) | |
| tree | 12eaf199b2a27b6552f33c8c09e52e609086ce63 | |
| parent | 0f7b43fafb05935661d6a157789ecc4ee563cba0 (diff) | |
| download | ATCD-f6e689abbaf5c899f991bc3c56746ad3709ae572.tar.gz | |
Wed Jan 29 20:47:39 2003 Jeff Parsons <j.parsons@vanderbilt.edu>
85 files changed, 268 insertions, 920 deletions
diff --git a/TAO/ChangeLog b/TAO/ChangeLog index 3b7c6056479..bd20530a692 100644 --- a/TAO/ChangeLog +++ b/TAO/ChangeLog @@ -1,3 +1,95 @@ +Wed Jan 29 20:47:39 2003 Jeff Parsons <j.parsons@vanderbilt.edu> + + * TAO_IDL/be/be_visitor_context.cpp: + * TAO_IDL/be/be_visitor_attribute/attribute.cpp: + * TAO_IDL/be/be_visitor_component/component_ch.cpp: + * TAO_IDL/be/be_visitor_component/component_cs.cpp: + * TAO_IDL/be/be_visitor_component/component_sh.cpp: + * TAO_IDL/be/be_visitor_enum/enum_ch.cpp: + * TAO_IDL/be/be_visitor_enum/enum_cs.cpp: + * TAO_IDL/be/be_visitor_exception/exception_ch.cpp: + * TAO_IDL/be/be_visitor_exception/exception_cs.cpp: + * TAO_IDL/be/be_visitor_interface/base_proxy_impl_ch.cpp: + * TAO_IDL/be/be_visitor_interface/direct_proxy_impl_sh.cpp: + * TAO_IDL/be/be_visitor_interface/direct_proxy_impl_ss.cpp: + * TAO_IDL/be/be_visitor_interface/interceptors_cs.cpp: + * TAO_IDL/be/be_visitor_interface/interceptors_ss.cpp: + * TAO_IDL/be/be_visitor_interface/interface.cpp: + * TAO_IDL/be/be_visitor_interface/interface_ch.cpp: + * TAO_IDL/be/be_visitor_interface/interface_cs.cpp: + * TAO_IDL/be/be_visitor_interface/interface_sh.cpp: + * TAO_IDL/be/be_visitor_interface/interface_ss.cpp: + * TAO_IDL/be/be_visitor_interface/proxy_brokers_ch.cpp: + * TAO_IDL/be/be_visitor_interface/remote_proxy_impl_ch.cpp: + * TAO_IDL/be/be_visitor_interface/remote_proxy_impl_cs.cpp: + * TAO_IDL/be/be_visitor_interface/thru_poa_proxy_impl_sh.cpp: + * TAO_IDL/be/be_visitor_interface/thru_poa_proxy_impl_ss.cpp: + * TAO_IDL/be/be_visitor_operation/amh_rh_sh.cpp: + * TAO_IDL/be/be_visitor_operation/amh_rh_ss.cpp: + * TAO_IDL/be/be_visitor_operation/amh_sh.cpp: + * TAO_IDL/be/be_visitor_operation/ami_cs.cpp: + * TAO_IDL/be/be_visitor_operation/ami_handler_reply_stub_operation_cs.cpp: + * TAO_IDL/be/be_visitor_operation/arglist.cpp: + * TAO_IDL/be/be_visitor_operation/argument.cpp: + * TAO_IDL/be/be_visitor_operation/base_proxy_impl_ch.cpp: + * TAO_IDL/be/be_visitor_operation/direct_proxy_impl_ss.cpp: + * TAO_IDL/be/be_visitor_operation/interceptors_arglist.cpp: + * TAO_IDL/be/be_visitor_operation/interceptors_cs.cpp: + * TAO_IDL/be/be_visitor_operation/interceptors_ss.cpp: + * TAO_IDL/be/be_visitor_operation/operation.cpp: + * TAO_IDL/be/be_visitor_operation/operation_ch.cpp: + * TAO_IDL/be/be_visitor_operation/operation_cs.cpp: + * TAO_IDL/be/be_visitor_operation/operation_ih.cpp: + * TAO_IDL/be/be_visitor_operation/operation_is.cpp: + * TAO_IDL/be/be_visitor_operation/operation_sh.cpp: + * TAO_IDL/be/be_visitor_operation/operation_ss.cpp: + * TAO_IDL/be/be_visitor_operation/proxy_impl_xh.cpp: + * TAO_IDL/be/be_visitor_operation/remote_proxy_impl_cs.cpp: + * TAO_IDL/be/be_visitor_operation/smart_proxy_ch.cpp: + * TAO_IDL/be/be_visitor_operation/smart_proxy_cs.cpp: + * TAO_IDL/be/be_visitor_operation/thru_poa_proxy_impl_ss.cpp: + * TAO_IDL/be/be_visitor_operation/tie_sh.cpp: + * TAO_IDL/be/be_visitor_operation/tie_si.cpp: + * TAO_IDL/be/be_visitor_sequence/cdr_op_cs.cpp: + * TAO_IDL/be/be_visitor_sequence/gen_bounded_obj_sequence_ci.cpp: + * TAO_IDL/be/be_visitor_sequence/gen_bounded_obj_sequence_cs.cpp: + * TAO_IDL/be/be_visitor_sequence/gen_bounded_sequence_ci.cpp: + * TAO_IDL/be/be_visitor_sequence/gen_bounded_sequence_cs.cpp: + * TAO_IDL/be/be_visitor_sequence/gen_unbounded_obj_sequence_ci.cpp: + * TAO_IDL/be/be_visitor_sequence/gen_unbounded_obj_sequence_cs.cpp: + * TAO_IDL/be/be_visitor_sequence/gen_unbounded_sequence_ci.cpp: + * TAO_IDL/be/be_visitor_sequence/gen_unbounded_sequence_cs.cpp: + * TAO_IDL/be/be_visitor_sequence/sequence_base.cpp: + * TAO_IDL/be/be_visitor_sequence/sequence_ci.cpp: + * TAO_IDL/be/be_visitor_sequence/sequence_cs.cpp: + * TAO_IDL/be/be_visitor_structure/cdr_op_cs.cpp: + * TAO_IDL/be/be_visitor_structure/structure_ch.cpp: + * TAO_IDL/be/be_visitor_structure/structure_cs.cpp: + * TAO_IDL/be/be_visitor_typedef/typedef_ch.cpp: + * TAO_IDL/be/be_visitor_typedef/typedef_cs.cpp: + * TAO_IDL/be/be_visitor_union/cdr_op_ch.cpp: + * TAO_IDL/be/be_visitor_union/cdr_op_ci.cpp: + * TAO_IDL/be/be_visitor_union/cdr_op_cs.cpp: + * TAO_IDL/be/be_visitor_union/union.cpp: + * TAO_IDL/be/be_visitor_union/union_ch.cpp: + * TAO_IDL/be/be_visitor_union/union_ci.cpp: + * TAO_IDL/be/be_visitor_union/union_cs.cpp: + * TAO_IDL/be/be_visitor_valuetype/arglist.cpp: + * TAO_IDL/be/be_visitor_valuetype/valuetype.cpp: + * TAO_IDL/be/be_visitor_valuetype/valuetype_ch.cpp: + * TAO_IDL/be/be_visitor_valuetype/valuetype_ci.cpp: + * TAO_IDL/be/be_visitor_valuetype/valuetype_cs.cpp: + * TAO_IDL/be/be_visitor_valuetype/valuetype_init_arglist_ch.cpp: + * TAO_IDL/be/be_visitor_valuetype/valuetype_init_ch.cpp: + * TAO_IDL/be_include/be_codegen.h: + + More removal of context state enum values. + + * TAO_IDL/fe/idl.ll: + * TAO_IDL/fe/lex.yy.cpp: + + Cosmetic changes. + Wed Jan 29 01:04:07 2003 Jeff Parsons <j.parsons@vanderbilt.edu> * TAO_IDL/be/be_visitor_decl.cpp: diff --git a/TAO/TAO_IDL/be/be_visitor_attribute/attribute.cpp b/TAO/TAO_IDL/be/be_visitor_attribute/attribute.cpp index 32591428800..2afe2296ea2 100644 --- a/TAO/TAO_IDL/be/be_visitor_attribute/attribute.cpp +++ b/TAO/TAO_IDL/be/be_visitor_attribute/attribute.cpp @@ -116,37 +116,34 @@ be_visitor_attribute::visit_attribute (be_attribute *node) status = get_op.accept (&visitor); break; } - case TAO_CodeGen::TAO_ATTRIBUTE_BASE_PROXY_IMPL_CH: + case TAO_CodeGen::TAO_INTERFACE_BASE_PROXY_IMPL_CH: { - ctx.state (TAO_CodeGen::TAO_OPERATION_BASE_PROXY_IMPL_CH); be_visitor_operation_base_proxy_impl_ch visitor (&ctx); status = get_op.accept (&visitor); break; } - case TAO_CodeGen::TAO_ATTRIBUTE_PROXY_IMPL_XH: + case TAO_CodeGen::TAO_INTERFACE_REMOTE_PROXY_IMPL_CH: + case TAO_CodeGen::TAO_INTERFACE_THRU_POA_PROXY_IMPL_SH: + case TAO_CodeGen::TAO_INTERFACE_DIRECT_PROXY_IMPL_SH: { - ctx.state (TAO_CodeGen::TAO_OPERATION_PROXY_IMPL_XH); be_visitor_operation_proxy_impl_xh visitor (&ctx); status = get_op.accept (&visitor); break; } - case TAO_CodeGen::TAO_ATTRIBUTE_REMOTE_PROXY_IMPL_CS: + case TAO_CodeGen::TAO_INTERFACE_REMOTE_PROXY_IMPL_CS: { - ctx.state (TAO_CodeGen::TAO_OPERATION_REMOTE_PROXY_IMPL_CS); be_visitor_operation_remote_proxy_impl_cs visitor (&ctx); status = get_op.accept (&visitor); break; } - case TAO_CodeGen::TAO_ATTRIBUTE_THRU_POA_PROXY_IMPL_SS: + case TAO_CodeGen::TAO_INTERFACE_THRU_POA_PROXY_IMPL_SS: { - ctx.state (TAO_CodeGen::TAO_OPERATION_THRU_POA_PROXY_IMPL_SS); be_visitor_operation_thru_poa_proxy_impl_ss visitor (&ctx); status = get_op.accept (&visitor); break; } - case TAO_CodeGen::TAO_ATTRIBUTE_DIRECT_PROXY_IMPL_SS: + case TAO_CodeGen::TAO_INTERFACE_DIRECT_PROXY_IMPL_SS: { - ctx.state (TAO_CodeGen::TAO_OPERATION_DIRECT_PROXY_IMPL_SS); be_visitor_operation_direct_proxy_impl_ss visitor (&ctx); status = get_op.accept (&visitor); break; @@ -157,30 +154,26 @@ be_visitor_attribute::visit_attribute (be_attribute *node) status = get_op.accept (&visitor); break; } - case TAO_CodeGen::TAO_ATTRIBUTE_SMART_PROXY_CS: + case TAO_CodeGen::TAO_INTERFACE_SMART_PROXY_CS: { - ctx.state (TAO_CodeGen::TAO_OPERATION_SMART_PROXY_CS); be_visitor_operation_smart_proxy_cs visitor (&ctx); status = get_op.accept (&visitor); break; } - case TAO_CodeGen::TAO_ATTRIBUTE_INTERCEPTORS_CS: + case TAO_CodeGen::TAO_INTERFACE_INTERCEPTORS_CS: { - ctx.state (TAO_CodeGen::TAO_OPERATION_INTERCEPTORS_CS); be_visitor_operation_interceptors_cs visitor (&ctx); status = get_op.accept (&visitor); break; } - case TAO_CodeGen::TAO_ATTRIBUTE_INTERCEPTORS_SH: + case TAO_CodeGen::TAO_INTERFACE_INTERCEPTORS_SH: { - ctx.state (TAO_CodeGen::TAO_OPERATION_INTERCEPTORS_SH); be_visitor_operation_interceptors_sh visitor (&ctx); status = get_op.accept (&visitor); break; } - case TAO_CodeGen::TAO_ATTRIBUTE_INTERCEPTORS_SS: + case TAO_CodeGen::TAO_INTERFACE_INTERCEPTORS_SS: { - ctx.state (TAO_CodeGen::TAO_OPERATION_INTERCEPTORS_SS); be_visitor_operation_interceptors_ss visitor (&ctx); status = get_op.accept (&visitor); break; @@ -198,12 +191,7 @@ be_visitor_attribute::visit_attribute (be_attribute *node) break; } default: - // Error. - ACE_ERROR_RETURN ((LM_ERROR, - "(%N:%l) be_visitor_attribute::" - "visit_attribute - " - "bad codegen state\n"), - -1); + return 0; } if (status == -1) @@ -328,37 +316,34 @@ be_visitor_attribute::visit_attribute (be_attribute *node) status = set_op.accept (&visitor); break; } - case TAO_CodeGen::TAO_ATTRIBUTE_BASE_PROXY_IMPL_CH: + case TAO_CodeGen::TAO_INTERFACE_BASE_PROXY_IMPL_CH: { - ctx.state (TAO_CodeGen::TAO_OPERATION_BASE_PROXY_IMPL_CH); be_visitor_operation_base_proxy_impl_ch visitor (&ctx); status = set_op.accept (&visitor); break; } - case TAO_CodeGen::TAO_ATTRIBUTE_PROXY_IMPL_XH: + case TAO_CodeGen::TAO_INTERFACE_REMOTE_PROXY_IMPL_CH: + case TAO_CodeGen::TAO_INTERFACE_THRU_POA_PROXY_IMPL_SH: + case TAO_CodeGen::TAO_INTERFACE_DIRECT_PROXY_IMPL_SH: { - ctx.state (TAO_CodeGen::TAO_OPERATION_PROXY_IMPL_XH); be_visitor_operation_proxy_impl_xh visitor (&ctx); status = set_op.accept (&visitor); break; } - case TAO_CodeGen::TAO_ATTRIBUTE_REMOTE_PROXY_IMPL_CS: + case TAO_CodeGen::TAO_INTERFACE_REMOTE_PROXY_IMPL_CS: { - ctx.state (TAO_CodeGen::TAO_OPERATION_REMOTE_PROXY_IMPL_CS); be_visitor_operation_remote_proxy_impl_cs visitor (&ctx); status = set_op.accept (&visitor); break; } - case TAO_CodeGen::TAO_ATTRIBUTE_THRU_POA_PROXY_IMPL_SS: + case TAO_CodeGen::TAO_INTERFACE_THRU_POA_PROXY_IMPL_SS: { - ctx.state (TAO_CodeGen::TAO_OPERATION_THRU_POA_PROXY_IMPL_SS); be_visitor_operation_thru_poa_proxy_impl_ss visitor (&ctx); status = set_op.accept (&visitor); break; } - case TAO_CodeGen::TAO_ATTRIBUTE_DIRECT_PROXY_IMPL_SS: + case TAO_CodeGen::TAO_INTERFACE_DIRECT_PROXY_IMPL_SS: { - ctx.state (TAO_CodeGen::TAO_OPERATION_DIRECT_PROXY_IMPL_SS); be_visitor_operation_direct_proxy_impl_ss visitor (&ctx); status = set_op.accept (&visitor); break; @@ -369,30 +354,26 @@ be_visitor_attribute::visit_attribute (be_attribute *node) status = set_op.accept (&visitor); break; } - case TAO_CodeGen::TAO_ATTRIBUTE_SMART_PROXY_CS: + case TAO_CodeGen::TAO_INTERFACE_SMART_PROXY_CS: { - ctx.state (TAO_CodeGen::TAO_OPERATION_SMART_PROXY_CS); be_visitor_operation_smart_proxy_cs visitor (&ctx); status = set_op.accept (&visitor); break; } - case TAO_CodeGen::TAO_ATTRIBUTE_INTERCEPTORS_CS: + case TAO_CodeGen::TAO_INTERFACE_INTERCEPTORS_CS: { - ctx.state (TAO_CodeGen::TAO_OPERATION_INTERCEPTORS_CS); be_visitor_operation_interceptors_cs visitor (&ctx); status = set_op.accept (&visitor); break; } - case TAO_CodeGen::TAO_ATTRIBUTE_INTERCEPTORS_SH: + case TAO_CodeGen::TAO_INTERFACE_INTERCEPTORS_SH: { - ctx.state (TAO_CodeGen::TAO_OPERATION_INTERCEPTORS_SH); be_visitor_operation_interceptors_sh visitor (&ctx); status = set_op.accept (&visitor); break; } - case TAO_CodeGen::TAO_ATTRIBUTE_INTERCEPTORS_SS: + case TAO_CodeGen::TAO_INTERFACE_INTERCEPTORS_SS: { - ctx.state (TAO_CodeGen::TAO_OPERATION_INTERCEPTORS_SS); be_visitor_operation_interceptors_ss visitor (&ctx); status = set_op.accept (&visitor); break; diff --git a/TAO/TAO_IDL/be/be_visitor_component/component_ch.cpp b/TAO/TAO_IDL/be/be_visitor_component/component_ch.cpp index a8c03a62c5c..43506413a5d 100644 --- a/TAO/TAO_IDL/be/be_visitor_component/component_ch.cpp +++ b/TAO/TAO_IDL/be/be_visitor_component/component_ch.cpp @@ -296,7 +296,6 @@ be_visitor_component_ch::visit_component (be_component *node) // Proxy Implementation Declaration. ctx = *this->ctx_; - ctx.state (TAO_CodeGen::TAO_INTERFACE_PROXY_IMPLS_CH); be_visitor_interface_proxy_impls_ch spi_visitor (&ctx); if (node->accept (&spi_visitor) == -1) @@ -310,7 +309,6 @@ be_visitor_component_ch::visit_component (be_component *node) // Proxy Broker Declaration. ctx = *this->ctx_; - ctx.state (TAO_CodeGen::TAO_INTERFACE_PROXY_BROKERS_CH); be_visitor_interface_proxy_brokers_ch pb_visitor (&ctx); if (node->accept (&pb_visitor) == -1) @@ -326,7 +324,6 @@ be_visitor_component_ch::visit_component (be_component *node) if (be_global->tc_support ()) { - ctx.state (TAO_CodeGen::TAO_TYPECODE_DECL); be_visitor_typecode_decl td_visitor (&ctx); if (node->accept (&td_visitor) == -1) diff --git a/TAO/TAO_IDL/be/be_visitor_component/component_cs.cpp b/TAO/TAO_IDL/be/be_visitor_component/component_cs.cpp index 0666343ff6f..ea825cc452e 100644 --- a/TAO/TAO_IDL/be/be_visitor_component/component_cs.cpp +++ b/TAO/TAO_IDL/be/be_visitor_component/component_cs.cpp @@ -171,7 +171,6 @@ be_visitor_component_cs::visit_component (be_component *node) } ctx = *this->ctx_; - ctx.state (TAO_CodeGen::TAO_INTERFACE_REMOTE_PROXY_BROKER_CS); be_visitor_interface_remote_proxy_broker_cs irpb_visitor (&ctx); if (node->accept (&irpb_visitor) == -1) @@ -419,7 +418,6 @@ be_visitor_component_cs::visit_component (be_component *node) if (be_global->tc_support ()) { - ctx.state (TAO_CodeGen::TAO_TYPECODE_DEFN); ctx.sub_state (TAO_CodeGen::TAO_TC_DEFN_TYPECODE); be_visitor_typecode_defn tc_visitor (&ctx); diff --git a/TAO/TAO_IDL/be/be_visitor_component/component_sh.cpp b/TAO/TAO_IDL/be/be_visitor_component/component_sh.cpp index 8dc85a2fdf2..107adfc34af 100644 --- a/TAO/TAO_IDL/be/be_visitor_component/component_sh.cpp +++ b/TAO/TAO_IDL/be/be_visitor_component/component_sh.cpp @@ -256,7 +256,6 @@ be_visitor_component_sh::visit_component (be_component *node) { ctx = *this->ctx_; // Generate strategized proxy broker. - ctx.state (TAO_CodeGen::TAO_INTERFACE_STRATEGIZED_PROXY_BROKER_SH); be_visitor_interface_strategized_proxy_broker_sh ispb_visitor (&ctx); if (node->accept (&ispb_visitor) == -1) diff --git a/TAO/TAO_IDL/be/be_visitor_context.cpp b/TAO/TAO_IDL/be/be_visitor_context.cpp index c119f139be2..14ff798d34c 100644 --- a/TAO/TAO_IDL/be/be_visitor_context.cpp +++ b/TAO/TAO_IDL/be/be_visitor_context.cpp @@ -48,7 +48,7 @@ ACE_RCSID (be, // constructor be_visitor_context::be_visitor_context (void) - : state_ (TAO_CodeGen::TAO_UNKNOWN), + : state_ (TAO_CodeGen::TAO_INITIAL), sub_state_ (TAO_CodeGen::TAO_SUB_STATE_UNKNOWN), os_ (0), scope_ (0), diff --git a/TAO/TAO_IDL/be/be_visitor_enum/enum_ch.cpp b/TAO/TAO_IDL/be/be_visitor_enum/enum_ch.cpp index d7384b3666c..0ed02f95883 100644 --- a/TAO/TAO_IDL/be/be_visitor_enum/enum_ch.cpp +++ b/TAO/TAO_IDL/be/be_visitor_enum/enum_ch.cpp @@ -79,7 +79,6 @@ be_visitor_enum_ch::visit_enum (be_enum *node) if (be_global->tc_support ()) { be_visitor_context ctx (*this->ctx_); - ctx.state (TAO_CodeGen::TAO_TYPECODE_DECL); be_visitor_typecode_decl visitor (&ctx); if (node->accept (&visitor) == -1) diff --git a/TAO/TAO_IDL/be/be_visitor_enum/enum_cs.cpp b/TAO/TAO_IDL/be/be_visitor_enum/enum_cs.cpp index 72ef3b80356..7259809d181 100644 --- a/TAO/TAO_IDL/be/be_visitor_enum/enum_cs.cpp +++ b/TAO/TAO_IDL/be/be_visitor_enum/enum_cs.cpp @@ -46,7 +46,6 @@ be_visitor_enum_cs::visit_enum (be_enum *node) if (!node->cli_stub_gen () && !node->imported () && !node->is_local ()) { be_visitor_context ctx (*this->ctx_); - ctx.state (TAO_CodeGen::TAO_TYPECODE_DEFN); ctx.sub_state (TAO_CodeGen::TAO_TC_DEFN_TYPECODE); be_visitor_typecode_defn visitor (&ctx); diff --git a/TAO/TAO_IDL/be/be_visitor_exception/exception_ch.cpp b/TAO/TAO_IDL/be/be_visitor_exception/exception_ch.cpp index 460f96a72fb..00312fe9793 100644 --- a/TAO/TAO_IDL/be/be_visitor_exception/exception_ch.cpp +++ b/TAO/TAO_IDL/be/be_visitor_exception/exception_ch.cpp @@ -135,7 +135,6 @@ int be_visitor_exception_ch::visit_exception (be_exception *node) if (be_global->tc_support ()) { be_visitor_context ctx (*this->ctx_); - ctx.state (TAO_CodeGen::TAO_TYPECODE_DECL); be_visitor_typecode_decl visitor (&ctx); if (node->accept (&visitor) == -1) diff --git a/TAO/TAO_IDL/be/be_visitor_exception/exception_cs.cpp b/TAO/TAO_IDL/be/be_visitor_exception/exception_cs.cpp index 7a03815c3ba..29d24edea9d 100644 --- a/TAO/TAO_IDL/be/be_visitor_exception/exception_cs.cpp +++ b/TAO/TAO_IDL/be/be_visitor_exception/exception_cs.cpp @@ -88,7 +88,6 @@ int be_visitor_exception_cs::visit_exception (be_exception *node) *os << "{"; be_visitor_context ctx (*this->ctx_); - ctx.state (TAO_CodeGen::TAO_EXCEPTION_CTOR_ASSIGN_CS); if (node->nmembers () > 0) { @@ -120,7 +119,6 @@ int be_visitor_exception_cs::visit_exception (be_exception *node) // Assign each individual member. ctx = *this->ctx_; - ctx.state (TAO_CodeGen::TAO_EXCEPTION_CTOR_ASSIGN_CS); be_visitor_exception_ctor_assign visitor (&ctx); if (node->accept (&visitor) == -1) @@ -305,7 +303,6 @@ int be_visitor_exception_cs::visit_exception (be_exception *node) // Assign each individual member. We need yet another state. ctx = *this->ctx_; - ctx.state (TAO_CodeGen::TAO_EXCEPTION_CTOR_ASSIGN_CS); // Indicate that the special ctor is being generated. ctx.exception (1); @@ -337,7 +334,6 @@ int be_visitor_exception_cs::visit_exception (be_exception *node) if (be_global->tc_support ()) { ctx = *this->ctx_; - ctx.state (TAO_CodeGen::TAO_TYPECODE_DEFN); ctx.sub_state (TAO_CodeGen::TAO_TC_DEFN_TYPECODE); be_visitor_typecode_defn visitor (&ctx); diff --git a/TAO/TAO_IDL/be/be_visitor_interface/base_proxy_impl_ch.cpp b/TAO/TAO_IDL/be/be_visitor_interface/base_proxy_impl_ch.cpp index 24dcb753fff..22dea90b18a 100644 --- a/TAO/TAO_IDL/be/be_visitor_interface/base_proxy_impl_ch.cpp +++ b/TAO/TAO_IDL/be/be_visitor_interface/base_proxy_impl_ch.cpp @@ -169,7 +169,6 @@ be_visitor_interface_base_proxy_impl_ch::gen_abstract_ops_helper ( new_op.set_defined_in (node); be_visitor_interface::add_abstract_op_args (op, new_op); - ctx.state (TAO_CodeGen::TAO_OPERATION_BASE_PROXY_IMPL_CH); be_visitor_operation_base_proxy_impl_ch op_visitor (&ctx); op_visitor.visit_operation (&new_op); } diff --git a/TAO/TAO_IDL/be/be_visitor_interface/direct_proxy_impl_sh.cpp b/TAO/TAO_IDL/be/be_visitor_interface/direct_proxy_impl_sh.cpp index 383146411ab..6ea03336c42 100644 --- a/TAO/TAO_IDL/be/be_visitor_interface/direct_proxy_impl_sh.cpp +++ b/TAO/TAO_IDL/be/be_visitor_interface/direct_proxy_impl_sh.cpp @@ -134,7 +134,6 @@ be_visitor_interface_direct_proxy_impl_sh::gen_abstract_ops_helper ( new_op.set_defined_in (node); be_visitor_interface::add_abstract_op_args (op, new_op); - ctx.state (TAO_CodeGen::TAO_OPERATION_PROXY_IMPL_XH); be_visitor_operation_proxy_impl_xh op_visitor (&ctx); op_visitor.visit_operation (&new_op); } diff --git a/TAO/TAO_IDL/be/be_visitor_interface/direct_proxy_impl_ss.cpp b/TAO/TAO_IDL/be/be_visitor_interface/direct_proxy_impl_ss.cpp index 4a8985f03e1..0756a75d572 100644 --- a/TAO/TAO_IDL/be/be_visitor_interface/direct_proxy_impl_ss.cpp +++ b/TAO/TAO_IDL/be/be_visitor_interface/direct_proxy_impl_ss.cpp @@ -110,7 +110,6 @@ be_visitor_interface_direct_proxy_impl_ss::gen_abstract_ops_helper ( be_visitor_interface::add_abstract_op_args (op, new_op); new_op.set_name (base); - ctx.state (TAO_CodeGen::TAO_OPERATION_DIRECT_PROXY_IMPL_SS); be_visitor_operation_direct_proxy_impl_ss op_visitor (&ctx); op_visitor.visit_operation (&new_op); diff --git a/TAO/TAO_IDL/be/be_visitor_interface/interceptors_cs.cpp b/TAO/TAO_IDL/be/be_visitor_interface/interceptors_cs.cpp index 9e3c33b8f36..3bea06a436c 100644 --- a/TAO/TAO_IDL/be/be_visitor_interface/interceptors_cs.cpp +++ b/TAO/TAO_IDL/be/be_visitor_interface/interceptors_cs.cpp @@ -132,7 +132,6 @@ be_visitor_interface_interceptors_cs::gen_abstract_ops_helper ( be_visitor_interface::add_abstract_op_args (op, new_op); new_op.set_name (base); - ctx.state (TAO_CodeGen::TAO_OPERATION_INTERCEPTORS_CS); be_visitor_operation_interceptors_cs op_visitor (&ctx); op_visitor.visit_operation (&new_op); diff --git a/TAO/TAO_IDL/be/be_visitor_interface/interceptors_ss.cpp b/TAO/TAO_IDL/be/be_visitor_interface/interceptors_ss.cpp index 97c6d6073bc..0a590a2f5ff 100644 --- a/TAO/TAO_IDL/be/be_visitor_interface/interceptors_ss.cpp +++ b/TAO/TAO_IDL/be/be_visitor_interface/interceptors_ss.cpp @@ -134,7 +134,6 @@ be_visitor_interface_interceptors_ss::gen_abstract_ops_helper ( be_visitor_interface::add_abstract_op_args (op, new_op); new_op.set_name (base); - ctx.state (TAO_CodeGen::TAO_OPERATION_INTERCEPTORS_SS); be_visitor_operation_interceptors_ss op_visitor (&ctx); op_visitor.visit_operation (&new_op); diff --git a/TAO/TAO_IDL/be/be_visitor_interface/interface.cpp b/TAO/TAO_IDL/be/be_visitor_interface/interface.cpp index a7057e69806..6a960c8373b 100644 --- a/TAO/TAO_IDL/be/be_visitor_interface/interface.cpp +++ b/TAO/TAO_IDL/be/be_visitor_interface/interface.cpp @@ -193,95 +193,6 @@ be_visitor_interface::visit_attribute (be_attribute *node) be_visitor_context ctx (*this->ctx_); ctx.node (node); - switch (this->ctx_->state ()) - { - case TAO_CodeGen::TAO_INTERFACE_CH: - break; - case TAO_CodeGen::TAO_ROOT_CS: - break; - case TAO_CodeGen::TAO_ROOT_SH: - break; - case TAO_CodeGen::TAO_ROOT_IH: - break; - case TAO_CodeGen::TAO_ROOT_SS: - break; - case TAO_CodeGen::TAO_ROOT_IS: - break; - case TAO_CodeGen::TAO_INTERFACE_SMART_PROXY_CH: - break; - case TAO_CodeGen::TAO_INTERFACE_SMART_PROXY_CS: - ctx.state (TAO_CodeGen::TAO_ATTRIBUTE_SMART_PROXY_CS); - break; - case TAO_CodeGen::TAO_INTERFACE_INTERCEPTORS_CS: - ctx.state (TAO_CodeGen::TAO_ATTRIBUTE_INTERCEPTORS_CS); - break; - case TAO_CodeGen::TAO_INTERFACE_INTERCEPTORS_SH: - ctx.state (TAO_CodeGen::TAO_ATTRIBUTE_INTERCEPTORS_SH); - break; - case TAO_CodeGen::TAO_INTERFACE_INTERCEPTORS_SS: - ctx.state (TAO_CodeGen::TAO_ATTRIBUTE_INTERCEPTORS_SS); - break; - case TAO_CodeGen::TAO_ROOT_TIE_SH: - break; - case TAO_CodeGen::TAO_ROOT_TIE_SI: - break; - case TAO_CodeGen::TAO_INTERFACE_BASE_PROXY_IMPL_CH: - ctx.state (TAO_CodeGen::TAO_ATTRIBUTE_BASE_PROXY_IMPL_CH); - break; - case TAO_CodeGen::TAO_INTERFACE_REMOTE_PROXY_IMPL_CH: - case TAO_CodeGen::TAO_INTERFACE_THRU_POA_PROXY_IMPL_SH: - case TAO_CodeGen::TAO_INTERFACE_DIRECT_PROXY_IMPL_SH: - ctx.state (TAO_CodeGen::TAO_ATTRIBUTE_PROXY_IMPL_XH); - break; - case TAO_CodeGen::TAO_INTERFACE_REMOTE_PROXY_IMPL_CS: - ctx.state (TAO_CodeGen::TAO_ATTRIBUTE_REMOTE_PROXY_IMPL_CS); - break; - case TAO_CodeGen::TAO_INTERFACE_THRU_POA_PROXY_IMPL_SS: - ctx.state (TAO_CodeGen::TAO_ATTRIBUTE_THRU_POA_PROXY_IMPL_SS); - break; - case TAO_CodeGen::TAO_INTERFACE_DIRECT_PROXY_IMPL_SS: - ctx.state (TAO_CodeGen::TAO_ATTRIBUTE_DIRECT_PROXY_IMPL_SS); - break; - - // AMH stuff - case TAO_CodeGen::TAO_INTERFACE_AMH_RH_SH: - break; - case TAO_CodeGen::TAO_INTERFACE_AMH_RH_SS: - break; - - case TAO_CodeGen::TAO_INTERFACE_PROXY_IMPLS_CH: - case TAO_CodeGen::TAO_INTERFACE_PROXY_IMPLS_CS: - case TAO_CodeGen::TAO_INTERFACE_PROXY_IMPLS_SH: - case TAO_CodeGen::TAO_INTERFACE_PROXY_IMPLS_SS: - case TAO_CodeGen::TAO_INTERFACE_BASE_PROXY_IMPL_CS: - case TAO_CodeGen::TAO_INTERFACE_PROXY_BROKERS_CH: - case TAO_CodeGen::TAO_INTERFACE_PROXY_BROKERS_CS: - case TAO_CodeGen::TAO_INTERFACE_PROXY_BROKERS_SH: - case TAO_CodeGen::TAO_INTERFACE_PROXY_BROKERS_SS: - case TAO_CodeGen::TAO_INTERFACE_BASE_PROXY_BROKER_CH: - case TAO_CodeGen::TAO_INTERFACE_BASE_PROXY_BROKER_CS: - case TAO_CodeGen::TAO_INTERFACE_REMOTE_PROXY_BROKER_CH: - case TAO_CodeGen::TAO_INTERFACE_REMOTE_PROXY_BROKER_CS: - case TAO_CodeGen::TAO_INTERFACE_STRATEGIZED_PROXY_BROKER_SH: - case TAO_CodeGen::TAO_INTERFACE_STRATEGIZED_PROXY_BROKER_SS: - case TAO_CodeGen::TAO_ROOT_ANY_OP_CH: - case TAO_CodeGen::TAO_ROOT_ANY_OP_CS: - case TAO_CodeGen::TAO_ROOT_CDR_OP_CH: - case TAO_CodeGen::TAO_ROOT_CDR_OP_CI: - case TAO_CodeGen::TAO_ROOT_CDR_OP_CS: - case TAO_CodeGen::TAO_ROOT_CI: - case TAO_CodeGen::TAO_ROOT_SI: - return 0; // nothing to be done - default: - { - ACE_ERROR_RETURN ((LM_ERROR, - "(%N:%l) be_visitor_interface::" - "visit_attribute - " - "Bad context state\n: "), - -1); - } - } - // Same visitor for all the above cases where an action is taken. be_visitor_attribute visitor (&ctx); @@ -320,57 +231,8 @@ be_visitor_interface::visit_constant (be_constant *node) status = node->accept (&visitor); break; } - case TAO_CodeGen::TAO_ROOT_ANY_OP_CH: - case TAO_CodeGen::TAO_ROOT_ANY_OP_CS: - case TAO_CodeGen::TAO_ROOT_CDR_OP_CH: - case TAO_CodeGen::TAO_ROOT_CDR_OP_CI: - case TAO_CodeGen::TAO_ROOT_CDR_OP_CS: - case TAO_CodeGen::TAO_INTERFACE_SMART_PROXY_CH: - case TAO_CodeGen::TAO_INTERFACE_SMART_PROXY_CS: - case TAO_CodeGen::TAO_INTERFACE_INTERCEPTORS_CS: - case TAO_CodeGen::TAO_INTERFACE_INTERCEPTORS_SH: - case TAO_CodeGen::TAO_INTERFACE_INTERCEPTORS_SS: - case TAO_CodeGen::TAO_ROOT_CI: - case TAO_CodeGen::TAO_ROOT_SH: - case TAO_CodeGen::TAO_ROOT_IH: - case TAO_CodeGen::TAO_ROOT_IS: - case TAO_CodeGen::TAO_ROOT_SI: - case TAO_CodeGen::TAO_ROOT_SS: - case TAO_CodeGen::TAO_ROOT_TIE_SH: - case TAO_CodeGen::TAO_ROOT_TIE_SI: - case TAO_CodeGen::TAO_INTERFACE_PROXY_BROKERS_CH: - case TAO_CodeGen::TAO_INTERFACE_PROXY_BROKERS_CS: - case TAO_CodeGen::TAO_INTERFACE_PROXY_BROKERS_SH: - case TAO_CodeGen::TAO_INTERFACE_PROXY_BROKERS_SS: - case TAO_CodeGen::TAO_INTERFACE_BASE_PROXY_BROKER_CH: - case TAO_CodeGen::TAO_INTERFACE_BASE_PROXY_BROKER_CS: - case TAO_CodeGen::TAO_INTERFACE_REMOTE_PROXY_BROKER_CH: - case TAO_CodeGen::TAO_INTERFACE_REMOTE_PROXY_BROKER_CS: - case TAO_CodeGen::TAO_INTERFACE_STRATEGIZED_PROXY_BROKER_SH: - case TAO_CodeGen::TAO_INTERFACE_STRATEGIZED_PROXY_BROKER_SS: - case TAO_CodeGen::TAO_INTERFACE_PROXY_IMPLS_CH: - case TAO_CodeGen::TAO_INTERFACE_PROXY_IMPLS_CS: - case TAO_CodeGen::TAO_INTERFACE_PROXY_IMPLS_SH: - case TAO_CodeGen::TAO_INTERFACE_PROXY_IMPLS_SS: - case TAO_CodeGen::TAO_INTERFACE_BASE_PROXY_IMPL_CH: - case TAO_CodeGen::TAO_INTERFACE_BASE_PROXY_IMPL_CS: - case TAO_CodeGen::TAO_INTERFACE_REMOTE_PROXY_IMPL_CH: - case TAO_CodeGen::TAO_INTERFACE_REMOTE_PROXY_IMPL_CS: - case TAO_CodeGen::TAO_INTERFACE_THRU_POA_PROXY_IMPL_SH: - case TAO_CodeGen::TAO_INTERFACE_THRU_POA_PROXY_IMPL_SS: - case TAO_CodeGen::TAO_INTERFACE_DIRECT_PROXY_IMPL_SH: - case TAO_CodeGen::TAO_INTERFACE_DIRECT_PROXY_IMPL_SS: - case TAO_CodeGen::TAO_INTERFACE_AMH_RH_SH: - case TAO_CodeGen::TAO_INTERFACE_AMH_RH_SS: - return 0; // nothing to be done default: - { - ACE_ERROR_RETURN ((LM_ERROR, - "(%N:%l) be_visitor_interface::" - "visit_constant - " - "Bad context state\n"), - -1); - } + return 0; // nothing to be done } if (status == -1) @@ -432,56 +294,8 @@ be_visitor_interface::visit_enum (be_enum *node) status = node->accept (&visitor); break; } - - case TAO_CodeGen::TAO_ROOT_CDR_OP_CS: - case TAO_CodeGen::TAO_ROOT_CI: - case TAO_CodeGen::TAO_ROOT_SH: - case TAO_CodeGen::TAO_ROOT_IH: - case TAO_CodeGen::TAO_ROOT_IS: - case TAO_CodeGen::TAO_ROOT_SI: - case TAO_CodeGen::TAO_ROOT_SS: - case TAO_CodeGen::TAO_INTERFACE_SMART_PROXY_CH: - case TAO_CodeGen::TAO_INTERFACE_SMART_PROXY_CS: - case TAO_CodeGen::TAO_INTERFACE_INTERCEPTORS_CS: - case TAO_CodeGen::TAO_INTERFACE_INTERCEPTORS_SH: - case TAO_CodeGen::TAO_INTERFACE_INTERCEPTORS_SS: - case TAO_CodeGen::TAO_ROOT_TIE_SH: - case TAO_CodeGen::TAO_ROOT_TIE_SI: - - case TAO_CodeGen::TAO_INTERFACE_PROXY_BROKERS_CH: - case TAO_CodeGen::TAO_INTERFACE_PROXY_BROKERS_CS: - case TAO_CodeGen::TAO_INTERFACE_PROXY_BROKERS_SH: - case TAO_CodeGen::TAO_INTERFACE_PROXY_BROKERS_SS: - case TAO_CodeGen::TAO_INTERFACE_BASE_PROXY_BROKER_CH: - case TAO_CodeGen::TAO_INTERFACE_BASE_PROXY_BROKER_CS: - case TAO_CodeGen::TAO_INTERFACE_REMOTE_PROXY_BROKER_CH: - case TAO_CodeGen::TAO_INTERFACE_REMOTE_PROXY_BROKER_CS: - case TAO_CodeGen::TAO_INTERFACE_STRATEGIZED_PROXY_BROKER_SH: - case TAO_CodeGen::TAO_INTERFACE_STRATEGIZED_PROXY_BROKER_SS: - case TAO_CodeGen::TAO_INTERFACE_PROXY_IMPLS_CH: - case TAO_CodeGen::TAO_INTERFACE_PROXY_IMPLS_CS: - case TAO_CodeGen::TAO_INTERFACE_PROXY_IMPLS_SH: - case TAO_CodeGen::TAO_INTERFACE_PROXY_IMPLS_SS: - case TAO_CodeGen::TAO_INTERFACE_BASE_PROXY_IMPL_CH: - case TAO_CodeGen::TAO_INTERFACE_BASE_PROXY_IMPL_CS: - case TAO_CodeGen::TAO_INTERFACE_REMOTE_PROXY_IMPL_CH: - case TAO_CodeGen::TAO_INTERFACE_REMOTE_PROXY_IMPL_CS: - case TAO_CodeGen::TAO_INTERFACE_THRU_POA_PROXY_IMPL_SH: - case TAO_CodeGen::TAO_INTERFACE_THRU_POA_PROXY_IMPL_SS: - case TAO_CodeGen::TAO_INTERFACE_DIRECT_PROXY_IMPL_SH: - case TAO_CodeGen::TAO_INTERFACE_DIRECT_PROXY_IMPL_SS: - - case TAO_CodeGen::TAO_INTERFACE_AMH_RH_SH: - case TAO_CodeGen::TAO_INTERFACE_AMH_RH_SS: - return 0; // nothing to be done default: - { - ACE_ERROR_RETURN ((LM_ERROR, - "(%N:%l) be_visitor_interface::" - "visit_enum - " - "Bad context state\n" - ), -1); - } + return 0; // nothing to be done } if (status == -1) @@ -556,53 +370,8 @@ be_visitor_interface::visit_exception (be_exception *node) status = node->accept (&visitor); break; } - case TAO_CodeGen::TAO_ROOT_SH: - case TAO_CodeGen::TAO_ROOT_IH: - case TAO_CodeGen::TAO_ROOT_IS: - case TAO_CodeGen::TAO_ROOT_SI: - case TAO_CodeGen::TAO_ROOT_SS: - case TAO_CodeGen::TAO_INTERFACE_SMART_PROXY_CH: - case TAO_CodeGen::TAO_INTERFACE_SMART_PROXY_CS: - case TAO_CodeGen::TAO_INTERFACE_INTERCEPTORS_CS: - case TAO_CodeGen::TAO_INTERFACE_INTERCEPTORS_SH: - case TAO_CodeGen::TAO_INTERFACE_INTERCEPTORS_SS: - case TAO_CodeGen::TAO_ROOT_TIE_SH: - case TAO_CodeGen::TAO_ROOT_TIE_SI: - - case TAO_CodeGen::TAO_INTERFACE_PROXY_BROKERS_CH: - case TAO_CodeGen::TAO_INTERFACE_PROXY_BROKERS_CS: - case TAO_CodeGen::TAO_INTERFACE_PROXY_BROKERS_SH: - case TAO_CodeGen::TAO_INTERFACE_PROXY_BROKERS_SS: - case TAO_CodeGen::TAO_INTERFACE_BASE_PROXY_BROKER_CH: - case TAO_CodeGen::TAO_INTERFACE_BASE_PROXY_BROKER_CS: - case TAO_CodeGen::TAO_INTERFACE_REMOTE_PROXY_BROKER_CH: - case TAO_CodeGen::TAO_INTERFACE_REMOTE_PROXY_BROKER_CS: - case TAO_CodeGen::TAO_INTERFACE_STRATEGIZED_PROXY_BROKER_SH: - case TAO_CodeGen::TAO_INTERFACE_STRATEGIZED_PROXY_BROKER_SS: - case TAO_CodeGen::TAO_INTERFACE_PROXY_IMPLS_CH: - case TAO_CodeGen::TAO_INTERFACE_PROXY_IMPLS_CS: - case TAO_CodeGen::TAO_INTERFACE_PROXY_IMPLS_SH: - case TAO_CodeGen::TAO_INTERFACE_PROXY_IMPLS_SS: - case TAO_CodeGen::TAO_INTERFACE_BASE_PROXY_IMPL_CH: - case TAO_CodeGen::TAO_INTERFACE_BASE_PROXY_IMPL_CS: - case TAO_CodeGen::TAO_INTERFACE_REMOTE_PROXY_IMPL_CH: - case TAO_CodeGen::TAO_INTERFACE_REMOTE_PROXY_IMPL_CS: - case TAO_CodeGen::TAO_INTERFACE_THRU_POA_PROXY_IMPL_SH: - case TAO_CodeGen::TAO_INTERFACE_THRU_POA_PROXY_IMPL_SS: - case TAO_CodeGen::TAO_INTERFACE_DIRECT_PROXY_IMPL_SH: - case TAO_CodeGen::TAO_INTERFACE_DIRECT_PROXY_IMPL_SS: - - case TAO_CodeGen::TAO_INTERFACE_AMH_RH_SH: - case TAO_CodeGen::TAO_INTERFACE_AMH_RH_SS: - return 0; // nothing to be done default: - { - ACE_ERROR_RETURN ((LM_ERROR, - "(%N:%l) be_visitor_interface::" - "visit_exception - " - "Bad context state\n" - ), -1); - } + return 0; // nothing to be done } if (status == -1) @@ -681,35 +450,30 @@ be_visitor_interface::visit_operation (be_operation *node) } case TAO_CodeGen::TAO_INTERFACE_SMART_PROXY_CS: { - ctx.state (TAO_CodeGen::TAO_OPERATION_SMART_PROXY_CS); be_visitor_operation_smart_proxy_cs visitor (&ctx); status = node->accept (&visitor); break; } case TAO_CodeGen::TAO_INTERFACE_INTERCEPTORS_CS: { - ctx.state (TAO_CodeGen::TAO_OPERATION_INTERCEPTORS_CS); be_visitor_operation_interceptors_cs visitor (&ctx); status = node->accept (&visitor); break; } case TAO_CodeGen::TAO_INTERFACE_INTERCEPTORS_SH: { - ctx.state (TAO_CodeGen::TAO_OPERATION_INTERCEPTORS_SH); be_visitor_operation_interceptors_sh visitor (&ctx); status = node->accept (&visitor); break; } case TAO_CodeGen::TAO_INTERFACE_INTERCEPTORS_SS: { - ctx.state (TAO_CodeGen::TAO_OPERATION_INTERCEPTORS_SS); be_visitor_operation_interceptors_ss visitor (&ctx); status = node->accept (&visitor); break; } case TAO_CodeGen::TAO_INTERFACE_BASE_PROXY_IMPL_CH: { - ctx.state (TAO_CodeGen::TAO_OPERATION_BASE_PROXY_IMPL_CH); be_visitor_operation_base_proxy_impl_ch visitor (&ctx); status = node->accept (&visitor); break; @@ -718,42 +482,36 @@ be_visitor_interface::visit_operation (be_operation *node) case TAO_CodeGen::TAO_INTERFACE_THRU_POA_PROXY_IMPL_SH: case TAO_CodeGen::TAO_INTERFACE_DIRECT_PROXY_IMPL_SH: { - ctx.state (TAO_CodeGen::TAO_OPERATION_PROXY_IMPL_XH); be_visitor_operation_proxy_impl_xh visitor (&ctx); status = node->accept (&visitor); break; } case TAO_CodeGen::TAO_INTERFACE_AMH_RH_SH: { - ctx.state (TAO_CodeGen::TAO_OPERATION_AMH_RH_SH); be_visitor_amh_rh_operation_sh visitor (&ctx); status = node->accept (&visitor); break; } case TAO_CodeGen::TAO_INTERFACE_AMH_RH_SS: { - ctx.state (TAO_CodeGen::TAO_OPERATION_AMH_RH_SS); be_visitor_amh_rh_operation_ss visitor (&ctx); status = node->accept (&visitor); break; } case TAO_CodeGen::TAO_INTERFACE_REMOTE_PROXY_IMPL_CS: { - ctx.state (TAO_CodeGen::TAO_OPERATION_REMOTE_PROXY_IMPL_CS); be_visitor_operation_remote_proxy_impl_cs visitor (&ctx); status = node->accept (&visitor); break; } case TAO_CodeGen::TAO_INTERFACE_THRU_POA_PROXY_IMPL_SS: { - ctx.state (TAO_CodeGen::TAO_OPERATION_THRU_POA_PROXY_IMPL_SS); be_visitor_operation_thru_poa_proxy_impl_ss visitor (&ctx); status = node->accept (&visitor); break; } case TAO_CodeGen::TAO_INTERFACE_DIRECT_PROXY_IMPL_SS: { - ctx.state (TAO_CodeGen::TAO_OPERATION_DIRECT_PROXY_IMPL_SS); be_visitor_operation_direct_proxy_impl_ss visitor (&ctx); status = node->accept (&visitor); break; @@ -1020,53 +778,8 @@ be_visitor_interface::visit_union (be_union *node) status = node->accept (&visitor); break; } - case TAO_CodeGen::TAO_ROOT_SH: - case TAO_CodeGen::TAO_ROOT_IH: - case TAO_CodeGen::TAO_ROOT_IS: - case TAO_CodeGen::TAO_ROOT_SI: - case TAO_CodeGen::TAO_ROOT_SS: - case TAO_CodeGen::TAO_INTERFACE_SMART_PROXY_CH: - case TAO_CodeGen::TAO_INTERFACE_SMART_PROXY_CS: - case TAO_CodeGen::TAO_INTERFACE_INTERCEPTORS_CS: - case TAO_CodeGen::TAO_INTERFACE_INTERCEPTORS_SH: - case TAO_CodeGen::TAO_INTERFACE_INTERCEPTORS_SS: - case TAO_CodeGen::TAO_ROOT_TIE_SH: - case TAO_CodeGen::TAO_ROOT_TIE_SI: - - case TAO_CodeGen::TAO_INTERFACE_PROXY_BROKERS_CH: - case TAO_CodeGen::TAO_INTERFACE_PROXY_BROKERS_CS: - case TAO_CodeGen::TAO_INTERFACE_PROXY_BROKERS_SH: - case TAO_CodeGen::TAO_INTERFACE_PROXY_BROKERS_SS: - case TAO_CodeGen::TAO_INTERFACE_BASE_PROXY_BROKER_CH: - case TAO_CodeGen::TAO_INTERFACE_BASE_PROXY_BROKER_CS: - case TAO_CodeGen::TAO_INTERFACE_REMOTE_PROXY_BROKER_CH: - case TAO_CodeGen::TAO_INTERFACE_REMOTE_PROXY_BROKER_CS: - case TAO_CodeGen::TAO_INTERFACE_STRATEGIZED_PROXY_BROKER_SH: - case TAO_CodeGen::TAO_INTERFACE_STRATEGIZED_PROXY_BROKER_SS: - case TAO_CodeGen::TAO_INTERFACE_PROXY_IMPLS_CH: - case TAO_CodeGen::TAO_INTERFACE_PROXY_IMPLS_CS: - case TAO_CodeGen::TAO_INTERFACE_PROXY_IMPLS_SH: - case TAO_CodeGen::TAO_INTERFACE_PROXY_IMPLS_SS: - case TAO_CodeGen::TAO_INTERFACE_BASE_PROXY_IMPL_CH: - case TAO_CodeGen::TAO_INTERFACE_BASE_PROXY_IMPL_CS: - case TAO_CodeGen::TAO_INTERFACE_REMOTE_PROXY_IMPL_CH: - case TAO_CodeGen::TAO_INTERFACE_REMOTE_PROXY_IMPL_CS: - case TAO_CodeGen::TAO_INTERFACE_THRU_POA_PROXY_IMPL_SH: - case TAO_CodeGen::TAO_INTERFACE_THRU_POA_PROXY_IMPL_SS: - case TAO_CodeGen::TAO_INTERFACE_DIRECT_PROXY_IMPL_SH: - case TAO_CodeGen::TAO_INTERFACE_DIRECT_PROXY_IMPL_SS: - - case TAO_CodeGen::TAO_INTERFACE_AMH_RH_SH: - case TAO_CodeGen::TAO_INTERFACE_AMH_RH_SS: - return 0; // nothing to be done default: - { - ACE_ERROR_RETURN ((LM_ERROR, - "(%N:%l) be_visitor_interface::" - "visit_union - " - "Bad context state\n"), - -1); - } + return 0; // nothing to be done } if (status == -1) @@ -1098,60 +811,8 @@ be_visitor_interface::visit_union_fwd (be_union_fwd *node) status = node->accept (&visitor); break; } - case TAO_CodeGen::TAO_ROOT_CI: - case TAO_CodeGen::TAO_ROOT_CS: - case TAO_CodeGen::TAO_ROOT_ANY_OP_CH: - case TAO_CodeGen::TAO_ROOT_ANY_OP_CS: - case TAO_CodeGen::TAO_ROOT_CDR_OP_CH: - case TAO_CodeGen::TAO_ROOT_CDR_OP_CI: - case TAO_CodeGen::TAO_ROOT_CDR_OP_CS: - case TAO_CodeGen::TAO_ROOT_SH: - case TAO_CodeGen::TAO_ROOT_IH: - case TAO_CodeGen::TAO_ROOT_IS: - case TAO_CodeGen::TAO_ROOT_SI: - case TAO_CodeGen::TAO_ROOT_SS: - case TAO_CodeGen::TAO_INTERFACE_SMART_PROXY_CH: - case TAO_CodeGen::TAO_INTERFACE_SMART_PROXY_CS: - case TAO_CodeGen::TAO_INTERFACE_INTERCEPTORS_CS: - case TAO_CodeGen::TAO_INTERFACE_INTERCEPTORS_SH: - case TAO_CodeGen::TAO_INTERFACE_INTERCEPTORS_SS: - case TAO_CodeGen::TAO_ROOT_TIE_SH: - case TAO_CodeGen::TAO_ROOT_TIE_SI: - - case TAO_CodeGen::TAO_INTERFACE_PROXY_BROKERS_CH: - case TAO_CodeGen::TAO_INTERFACE_PROXY_BROKERS_CS: - case TAO_CodeGen::TAO_INTERFACE_PROXY_BROKERS_SH: - case TAO_CodeGen::TAO_INTERFACE_PROXY_BROKERS_SS: - case TAO_CodeGen::TAO_INTERFACE_BASE_PROXY_BROKER_CH: - case TAO_CodeGen::TAO_INTERFACE_BASE_PROXY_BROKER_CS: - case TAO_CodeGen::TAO_INTERFACE_REMOTE_PROXY_BROKER_CH: - case TAO_CodeGen::TAO_INTERFACE_REMOTE_PROXY_BROKER_CS: - case TAO_CodeGen::TAO_INTERFACE_STRATEGIZED_PROXY_BROKER_SH: - case TAO_CodeGen::TAO_INTERFACE_STRATEGIZED_PROXY_BROKER_SS: - case TAO_CodeGen::TAO_INTERFACE_PROXY_IMPLS_CH: - case TAO_CodeGen::TAO_INTERFACE_PROXY_IMPLS_CS: - case TAO_CodeGen::TAO_INTERFACE_PROXY_IMPLS_SH: - case TAO_CodeGen::TAO_INTERFACE_PROXY_IMPLS_SS: - case TAO_CodeGen::TAO_INTERFACE_BASE_PROXY_IMPL_CH: - case TAO_CodeGen::TAO_INTERFACE_BASE_PROXY_IMPL_CS: - case TAO_CodeGen::TAO_INTERFACE_REMOTE_PROXY_IMPL_CH: - case TAO_CodeGen::TAO_INTERFACE_REMOTE_PROXY_IMPL_CS: - case TAO_CodeGen::TAO_INTERFACE_THRU_POA_PROXY_IMPL_SH: - case TAO_CodeGen::TAO_INTERFACE_THRU_POA_PROXY_IMPL_SS: - case TAO_CodeGen::TAO_INTERFACE_DIRECT_PROXY_IMPL_SH: - case TAO_CodeGen::TAO_INTERFACE_DIRECT_PROXY_IMPL_SS: - - case TAO_CodeGen::TAO_INTERFACE_AMH_RH_SH: - case TAO_CodeGen::TAO_INTERFACE_AMH_RH_SS: - return 0; // nothing to be done default: - { - ACE_ERROR_RETURN ((LM_ERROR, - "(%N:%l) be_visitor_interface::" - "visit_union_fwd - " - "Bad context state\n"), - -1); - } + return 0; // nothing to be done } if (status == -1) @@ -1225,53 +886,8 @@ be_visitor_interface::visit_typedef (be_typedef *node) status = node->accept (&visitor); break; } - case TAO_CodeGen::TAO_ROOT_SH: - case TAO_CodeGen::TAO_ROOT_IH: - case TAO_CodeGen::TAO_ROOT_IS: - case TAO_CodeGen::TAO_ROOT_SI: - case TAO_CodeGen::TAO_ROOT_SS: - case TAO_CodeGen::TAO_INTERFACE_SMART_PROXY_CH: - case TAO_CodeGen::TAO_INTERFACE_SMART_PROXY_CS: - case TAO_CodeGen::TAO_INTERFACE_INTERCEPTORS_CS: - case TAO_CodeGen::TAO_INTERFACE_INTERCEPTORS_SH: - case TAO_CodeGen::TAO_INTERFACE_INTERCEPTORS_SS: - case TAO_CodeGen::TAO_ROOT_TIE_SH: - case TAO_CodeGen::TAO_ROOT_TIE_SI: - - case TAO_CodeGen::TAO_INTERFACE_PROXY_BROKERS_CH: - case TAO_CodeGen::TAO_INTERFACE_PROXY_BROKERS_CS: - case TAO_CodeGen::TAO_INTERFACE_PROXY_BROKERS_SH: - case TAO_CodeGen::TAO_INTERFACE_PROXY_BROKERS_SS: - case TAO_CodeGen::TAO_INTERFACE_BASE_PROXY_BROKER_CH: - case TAO_CodeGen::TAO_INTERFACE_BASE_PROXY_BROKER_CS: - case TAO_CodeGen::TAO_INTERFACE_REMOTE_PROXY_BROKER_CH: - case TAO_CodeGen::TAO_INTERFACE_REMOTE_PROXY_BROKER_CS: - case TAO_CodeGen::TAO_INTERFACE_STRATEGIZED_PROXY_BROKER_SH: - case TAO_CodeGen::TAO_INTERFACE_STRATEGIZED_PROXY_BROKER_SS: - case TAO_CodeGen::TAO_INTERFACE_PROXY_IMPLS_CH: - case TAO_CodeGen::TAO_INTERFACE_PROXY_IMPLS_CS: - case TAO_CodeGen::TAO_INTERFACE_PROXY_IMPLS_SH: - case TAO_CodeGen::TAO_INTERFACE_PROXY_IMPLS_SS: - case TAO_CodeGen::TAO_INTERFACE_BASE_PROXY_IMPL_CH: - case TAO_CodeGen::TAO_INTERFACE_BASE_PROXY_IMPL_CS: - case TAO_CodeGen::TAO_INTERFACE_REMOTE_PROXY_IMPL_CH: - case TAO_CodeGen::TAO_INTERFACE_REMOTE_PROXY_IMPL_CS: - case TAO_CodeGen::TAO_INTERFACE_THRU_POA_PROXY_IMPL_SH: - case TAO_CodeGen::TAO_INTERFACE_THRU_POA_PROXY_IMPL_SS: - case TAO_CodeGen::TAO_INTERFACE_DIRECT_PROXY_IMPL_SH: - case TAO_CodeGen::TAO_INTERFACE_DIRECT_PROXY_IMPL_SS: - - case TAO_CodeGen::TAO_INTERFACE_AMH_RH_SH: - case TAO_CodeGen::TAO_INTERFACE_AMH_RH_SS: - return 0; // nothing to be done default: - { - ACE_ERROR_RETURN ((LM_ERROR, - "(%N:%l) be_visitor_interface::" - "visit_typedef - " - "Bad context state\n"), - -1); - } + return 0; // nothing to be done } if (status == -1) diff --git a/TAO/TAO_IDL/be/be_visitor_interface/interface_ch.cpp b/TAO/TAO_IDL/be/be_visitor_interface/interface_ch.cpp index 1e789a7ab59..69e914229a0 100644 --- a/TAO/TAO_IDL/be/be_visitor_interface/interface_ch.cpp +++ b/TAO/TAO_IDL/be/be_visitor_interface/interface_ch.cpp @@ -413,7 +413,6 @@ be_visitor_interface_ch::visit_interface (be_interface *node) // Proxy Implementation Declaration. ctx = *this->ctx_; - ctx.state (TAO_CodeGen::TAO_INTERFACE_PROXY_IMPLS_CH); be_visitor_interface_proxy_impls_ch spi_visitor (&ctx); if (node->accept (&spi_visitor) == -1) @@ -427,7 +426,6 @@ be_visitor_interface_ch::visit_interface (be_interface *node) // Proxy Broker Declaration. ctx = *this->ctx_; - ctx.state (TAO_CodeGen::TAO_INTERFACE_PROXY_BROKERS_CH); be_visitor_interface_proxy_brokers_ch pb_visitor (&ctx); if (node->accept (&pb_visitor) == -1) @@ -444,7 +442,6 @@ be_visitor_interface_ch::visit_interface (be_interface *node) if (be_global->tc_support ()) { - ctx.state (TAO_CodeGen::TAO_TYPECODE_DECL); be_visitor_typecode_decl td_visitor (&ctx); if (node->accept (&td_visitor) == -1) diff --git a/TAO/TAO_IDL/be/be_visitor_interface/interface_cs.cpp b/TAO/TAO_IDL/be/be_visitor_interface/interface_cs.cpp index fc23279b8d8..b70c417bdc5 100644 --- a/TAO/TAO_IDL/be/be_visitor_interface/interface_cs.cpp +++ b/TAO/TAO_IDL/be/be_visitor_interface/interface_cs.cpp @@ -218,7 +218,6 @@ be_visitor_interface_cs::visit_interface (be_interface *node) } ctx = *this->ctx_; - ctx.state (TAO_CodeGen::TAO_INTERFACE_REMOTE_PROXY_BROKER_CS); be_visitor_interface_remote_proxy_broker_cs irpb_visitor (&ctx); if (node->accept (&irpb_visitor) == -1) @@ -659,7 +658,6 @@ be_visitor_interface_cs::visit_interface (be_interface *node) if (be_global->tc_support ()) { - ctx.state (TAO_CodeGen::TAO_TYPECODE_DEFN); ctx.sub_state (TAO_CodeGen::TAO_TC_DEFN_TYPECODE); be_visitor_typecode_defn tc_visitor (&ctx); diff --git a/TAO/TAO_IDL/be/be_visitor_interface/interface_sh.cpp b/TAO/TAO_IDL/be/be_visitor_interface/interface_sh.cpp index 106230ddcb6..c903f0ef6e9 100644 --- a/TAO/TAO_IDL/be/be_visitor_interface/interface_sh.cpp +++ b/TAO/TAO_IDL/be/be_visitor_interface/interface_sh.cpp @@ -256,7 +256,6 @@ be_visitor_interface_sh::visit_interface (be_interface *node) { ctx = *this->ctx_; // Generate strategized proxy broker. - ctx.state (TAO_CodeGen::TAO_INTERFACE_STRATEGIZED_PROXY_BROKER_SH); be_visitor_interface_strategized_proxy_broker_sh ispb_visitor (&ctx); if (node->accept (&ispb_visitor) == -1) diff --git a/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp b/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp index 4df27046bf9..fb6ed3ae50d 100644 --- a/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp +++ b/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp @@ -581,7 +581,6 @@ be_visitor_interface_ss::generate_proxy_classes (be_interface *node) || be_global->gen_direct_collocation ()) { ctx = (*this->ctx_); - ctx.state (TAO_CodeGen::TAO_INTERFACE_STRATEGIZED_PROXY_BROKER_SS); be_visitor_interface_strategized_proxy_broker_ss ispb_visitor (&ctx); if (node->accept (&ispb_visitor) == -1) diff --git a/TAO/TAO_IDL/be/be_visitor_interface/proxy_brokers_ch.cpp b/TAO/TAO_IDL/be/be_visitor_interface/proxy_brokers_ch.cpp index 05fbdcdfbb4..8b4a8415806 100644 --- a/TAO/TAO_IDL/be/be_visitor_interface/proxy_brokers_ch.cpp +++ b/TAO/TAO_IDL/be/be_visitor_interface/proxy_brokers_ch.cpp @@ -37,7 +37,6 @@ be_visitor_interface_proxy_brokers_ch::visit_interface (be_interface *node) // Code Generation for the proxy brokers base class. be_visitor_context ctx (*this->ctx_); - ctx.state (TAO_CodeGen::TAO_INTERFACE_BASE_PROXY_BROKER_CH); be_visitor_interface_base_proxy_broker_ch bpb_visitor (&ctx); if (node->accept (&bpb_visitor) == -1) @@ -50,7 +49,6 @@ be_visitor_interface_proxy_brokers_ch::visit_interface (be_interface *node) } ctx = *this->ctx_; - ctx.state (TAO_CodeGen::TAO_INTERFACE_REMOTE_PROXY_BROKER_CH); be_visitor_interface_remote_proxy_broker_ch rpb_visitor (&ctx); if (node->accept (&rpb_visitor) == -1) diff --git a/TAO/TAO_IDL/be/be_visitor_interface/remote_proxy_impl_ch.cpp b/TAO/TAO_IDL/be/be_visitor_interface/remote_proxy_impl_ch.cpp index 492664ab7b8..6c83426fdee 100644 --- a/TAO/TAO_IDL/be/be_visitor_interface/remote_proxy_impl_ch.cpp +++ b/TAO/TAO_IDL/be/be_visitor_interface/remote_proxy_impl_ch.cpp @@ -152,7 +152,6 @@ be_visitor_interface_remote_proxy_impl_ch::gen_abstract_ops_helper ( new_op.set_defined_in (node); be_visitor_interface::add_abstract_op_args (op, new_op); - ctx.state (TAO_CodeGen::TAO_OPERATION_PROXY_IMPL_XH); be_visitor_operation_proxy_impl_xh op_visitor (&ctx); op_visitor.visit_operation (&new_op); } diff --git a/TAO/TAO_IDL/be/be_visitor_interface/remote_proxy_impl_cs.cpp b/TAO/TAO_IDL/be/be_visitor_interface/remote_proxy_impl_cs.cpp index d0fc791e803..60b78e71365 100644 --- a/TAO/TAO_IDL/be/be_visitor_interface/remote_proxy_impl_cs.cpp +++ b/TAO/TAO_IDL/be/be_visitor_interface/remote_proxy_impl_cs.cpp @@ -125,7 +125,6 @@ be_visitor_interface_remote_proxy_impl_cs::gen_abstract_ops_helper ( be_visitor_interface::add_abstract_op_args (op, new_op); new_op.set_name (base); - ctx.state (TAO_CodeGen::TAO_OPERATION_REMOTE_PROXY_IMPL_CS); be_visitor_operation_remote_proxy_impl_cs op_visitor (&ctx); op_visitor.visit_operation (&new_op); diff --git a/TAO/TAO_IDL/be/be_visitor_interface/thru_poa_proxy_impl_sh.cpp b/TAO/TAO_IDL/be/be_visitor_interface/thru_poa_proxy_impl_sh.cpp index 9e32c2c826b..3e3441b252c 100644 --- a/TAO/TAO_IDL/be/be_visitor_interface/thru_poa_proxy_impl_sh.cpp +++ b/TAO/TAO_IDL/be/be_visitor_interface/thru_poa_proxy_impl_sh.cpp @@ -156,7 +156,6 @@ be_visitor_interface_thru_poa_proxy_impl_sh::gen_abstract_ops_helper ( new_op.set_defined_in (node); be_visitor_interface::add_abstract_op_args (op, new_op); - ctx.state (TAO_CodeGen::TAO_OPERATION_PROXY_IMPL_XH); be_visitor_operation_proxy_impl_xh op_visitor (&ctx); op_visitor.visit_operation (&new_op); } diff --git a/TAO/TAO_IDL/be/be_visitor_interface/thru_poa_proxy_impl_ss.cpp b/TAO/TAO_IDL/be/be_visitor_interface/thru_poa_proxy_impl_ss.cpp index e228dc61a5c..a9ab00f56be 100644 --- a/TAO/TAO_IDL/be/be_visitor_interface/thru_poa_proxy_impl_ss.cpp +++ b/TAO/TAO_IDL/be/be_visitor_interface/thru_poa_proxy_impl_ss.cpp @@ -114,7 +114,6 @@ be_visitor_interface_thru_poa_proxy_impl_ss::gen_abstract_ops_helper ( be_visitor_interface::add_abstract_op_args (op, new_op); new_op.set_name (base); - ctx.state (TAO_CodeGen::TAO_OPERATION_THRU_POA_PROXY_IMPL_SS); be_visitor_operation_thru_poa_proxy_impl_ss op_visitor (&ctx); op_visitor.visit_operation (&new_op); diff --git a/TAO/TAO_IDL/be/be_visitor_operation/amh_rh_sh.cpp b/TAO/TAO_IDL/be/be_visitor_operation/amh_rh_sh.cpp index d4bc04e549e..2bdca1eeb58 100644 --- a/TAO/TAO_IDL/be/be_visitor_operation/amh_rh_sh.cpp +++ b/TAO/TAO_IDL/be/be_visitor_operation/amh_rh_sh.cpp @@ -89,7 +89,6 @@ be_visitor_amh_rh_operation_sh::visit_operation (be_operation *node) *os << node->local_name(); be_visitor_context ctx (*this->ctx_); - ctx.state (TAO_CodeGen::TAO_OPERATION_ARGLIST_OTHERS); be_visitor_operation_arglist visitor (&ctx); if (node->accept (&visitor) == -1) diff --git a/TAO/TAO_IDL/be/be_visitor_operation/amh_rh_ss.cpp b/TAO/TAO_IDL/be/be_visitor_operation/amh_rh_ss.cpp index 7365c32eea2..2158f9fc565 100644 --- a/TAO/TAO_IDL/be/be_visitor_operation/amh_rh_ss.cpp +++ b/TAO/TAO_IDL/be/be_visitor_operation/amh_rh_ss.cpp @@ -88,7 +88,6 @@ be_visitor_amh_rh_operation_ss::visit_operation (be_operation *node) // Step 2 : Generate the params of the method be_visitor_context ctx (*this->ctx_); - ctx.state (TAO_CodeGen::TAO_OPERATION_ARGLIST_OTHERS); // Set the substate because response handler operations without // parameters don't use the environment parameter in the body. diff --git a/TAO/TAO_IDL/be/be_visitor_operation/amh_sh.cpp b/TAO/TAO_IDL/be/be_visitor_operation/amh_sh.cpp index 4697813c5de..ac6c8acf11c 100644 --- a/TAO/TAO_IDL/be/be_visitor_operation/amh_sh.cpp +++ b/TAO/TAO_IDL/be/be_visitor_operation/amh_sh.cpp @@ -54,8 +54,6 @@ be_visitor_amh_operation_sh::visit_operation (be_operation *node) this->generate_shared_prologue (node, os, ""); be_visitor_context ctx (*this->ctx_); - ctx.state (TAO_CodeGen::TAO_OPERATION_ARGLIST_OTHERS); - be_visitor_args_arglist arglist_visitor (&ctx); arglist_visitor.set_fixed_direction (AST_Argument::dir_IN); ctx.scope (node); diff --git a/TAO/TAO_IDL/be/be_visitor_operation/ami_cs.cpp b/TAO/TAO_IDL/be/be_visitor_operation/ami_cs.cpp index 2da80088d2c..329d120276b 100644 --- a/TAO/TAO_IDL/be/be_visitor_operation/ami_cs.cpp +++ b/TAO/TAO_IDL/be/be_visitor_operation/ami_cs.cpp @@ -113,7 +113,6 @@ be_visitor_operation_ami_cs::visit_operation (be_operation *node) // Generate the argument list with the appropriate mapping (same as // in the header file) ctx = *this->ctx_; - ctx.state (TAO_CodeGen::TAO_OPERATION_ARGLIST_OTHERS); be_visitor_operation_arglist oa_visitor (&ctx); if (node->arguments ()->accept (&oa_visitor) == -1) diff --git a/TAO/TAO_IDL/be/be_visitor_operation/ami_handler_reply_stub_operation_cs.cpp b/TAO/TAO_IDL/be/be_visitor_operation/ami_handler_reply_stub_operation_cs.cpp index b5d56a50322..af73c7e648c 100644 --- a/TAO/TAO_IDL/be/be_visitor_operation/ami_handler_reply_stub_operation_cs.cpp +++ b/TAO/TAO_IDL/be/be_visitor_operation/ami_handler_reply_stub_operation_cs.cpp @@ -344,7 +344,6 @@ be_visitor_operation_ami_handler_reply_stub_operation_cs::gen_pre_stub_info ( if (!this->ctx_->attribute ()) { be_visitor_context ctx = *this->ctx_; - ctx.state (TAO_CodeGen::TAO_OPERATION_EXCEPTLIST_CS); be_visitor_operation_exceptlist_cs visitor (&ctx); if (node->accept (&visitor) == -1) diff --git a/TAO/TAO_IDL/be/be_visitor_operation/arglist.cpp b/TAO/TAO_IDL/be/be_visitor_operation/arglist.cpp index 3d15b3b810d..8fc4be665b8 100644 --- a/TAO/TAO_IDL/be/be_visitor_operation/arglist.cpp +++ b/TAO/TAO_IDL/be/be_visitor_operation/arglist.cpp @@ -172,31 +172,6 @@ be_visitor_operation_arglist::visit_argument (be_argument *node) // Set new scope. ctx.scope (intf); - switch (this->ctx_->state ()) - { - case TAO_CodeGen::TAO_OPERATION_ARGLIST_CH: - ctx.state (TAO_CodeGen::TAO_ARGUMENT_ARGLIST_CH); - break; - case TAO_CodeGen::TAO_OPERATION_ARGLIST_OTHERS: - case TAO_CodeGen::TAO_OPERATION_ARGLIST_SH: - case TAO_CodeGen::TAO_OPERATION_ARGLIST_IH: - case TAO_CodeGen::TAO_OPERATION_ARGLIST_IS: - case TAO_CodeGen::TAO_OPERATION_ARGLIST_PROXY_IMPL_XH: - case TAO_CodeGen::TAO_OPERATION_ARGLIST_PROXY_IMPL_XS: - case TAO_CodeGen::TAO_OPERATION_ARGLIST_BASE_PROXY_IMPL_CH: - case TAO_CodeGen::TAO_OPERATION_ARGLIST_COLLOCATED_SH: - ctx.state (TAO_CodeGen::TAO_ARGUMENT_ARGLIST_OTHERS); - break; - default: - { - ACE_ERROR_RETURN ((LM_ERROR, - "(%N:%l) be_visitor_arglist::" - "visit_argument - " - "Bad context\n"), - -1); - } - } - // Create a visitor. be_visitor_args_arglist visitor (&ctx); diff --git a/TAO/TAO_IDL/be/be_visitor_operation/argument.cpp b/TAO/TAO_IDL/be/be_visitor_operation/argument.cpp index b90d69e0231..bf614658014 100644 --- a/TAO/TAO_IDL/be/be_visitor_operation/argument.cpp +++ b/TAO/TAO_IDL/be/be_visitor_operation/argument.cpp @@ -162,42 +162,36 @@ be_visitor_operation_argument::visit_argument (be_argument *node) { case TAO_CodeGen::TAO_OPERATION_ARG_PRE_INVOKE_CS: { - ctx.state (TAO_CodeGen::TAO_ARGUMENT_PRE_INVOKE_CS); be_visitor_args_pre_invoke_cs visitor (&ctx); status = node->accept (&visitor); break; } case TAO_CodeGen::TAO_OPERATION_ARG_INVOKE_CS: { - ctx.state (TAO_CodeGen::TAO_ARGUMENT_INVOKE_CS); be_visitor_args_invoke_cs visitor (&ctx); status = node->accept (&visitor); break; } case TAO_CodeGen::TAO_OPERATION_ARG_POST_INVOKE_CS: { - ctx.state (TAO_CodeGen::TAO_ARGUMENT_POST_INVOKE_CS); be_visitor_args_post_invoke_cs visitor (&ctx); status = node->accept (&visitor); break; } case TAO_CodeGen::TAO_OPERATION_ARG_DECL_SS: { - ctx.state (TAO_CodeGen::TAO_ARGUMENT_VARDECL_SS); be_visitor_args_vardecl_ss visitor (&ctx); status = node->accept (&visitor); break; } case TAO_CodeGen::TAO_OPERATION_ARG_DEMARSHAL_SS: { - ctx.state (TAO_CodeGen::TAO_ARGUMENT_DEMARSHAL_SS); be_visitor_args_marshal_ss visitor (&ctx); status = node->accept (&visitor); break; } case TAO_CodeGen::TAO_OPERATION_ARG_MARSHAL_SS: { - ctx.state (TAO_CodeGen::TAO_ARGUMENT_MARSHAL_SS); be_visitor_args_marshal_ss visitor (&ctx); status = node->accept (&visitor); break; @@ -211,7 +205,6 @@ be_visitor_operation_argument::visit_argument (be_argument *node) } case TAO_CodeGen::TAO_OPERATION_ARG_UPCALL_SS: { - ctx.state (TAO_CodeGen::TAO_ARGUMENT_UPCALL_SS); be_visitor_args_upcall_ss visitor (&ctx); status = node->accept (&visitor); break; diff --git a/TAO/TAO_IDL/be/be_visitor_operation/base_proxy_impl_ch.cpp b/TAO/TAO_IDL/be/be_visitor_operation/base_proxy_impl_ch.cpp index 7a9777992de..04890bc1de8 100644 --- a/TAO/TAO_IDL/be/be_visitor_operation/base_proxy_impl_ch.cpp +++ b/TAO/TAO_IDL/be/be_visitor_operation/base_proxy_impl_ch.cpp @@ -38,7 +38,6 @@ int be_visitor_operation_base_proxy_impl_ch::visit_operation (be_operation *node } be_visitor_context ctx (*this->ctx_); - ctx.state (TAO_CodeGen::TAO_OPERATION_RETTYPE_OTHERS); be_visitor_operation_rettype oro_visitor (&ctx); if (bt->accept (&oro_visitor) == -1) diff --git a/TAO/TAO_IDL/be/be_visitor_operation/direct_proxy_impl_ss.cpp b/TAO/TAO_IDL/be/be_visitor_operation/direct_proxy_impl_ss.cpp index 3906b4e89eb..62ba04ab3ec 100644 --- a/TAO/TAO_IDL/be/be_visitor_operation/direct_proxy_impl_ss.cpp +++ b/TAO/TAO_IDL/be/be_visitor_operation/direct_proxy_impl_ss.cpp @@ -52,7 +52,6 @@ be_visitor_operation_direct_proxy_impl_ss::visit_operation ( os->indent (); // STEP 2: generate the return type mapping (same as in the header file) be_visitor_context ctx (*this->ctx_); - ctx.state (TAO_CodeGen::TAO_OPERATION_RETTYPE_OTHERS); be_visitor_operation_rettype oro_visitor (&ctx); if (bt->accept (&oro_visitor) == -1) diff --git a/TAO/TAO_IDL/be/be_visitor_operation/interceptors_arglist.cpp b/TAO/TAO_IDL/be/be_visitor_operation/interceptors_arglist.cpp index 2a6a379501f..2af9183d4b0 100644 --- a/TAO/TAO_IDL/be/be_visitor_operation/interceptors_arglist.cpp +++ b/TAO/TAO_IDL/be/be_visitor_operation/interceptors_arglist.cpp @@ -215,14 +215,12 @@ be_visitor_operation_interceptors_arglist::visit_argument (be_argument *node) case TAO_CodeGen::TAO_OPERATION_INTERCEPTORS_ARGLIST_SH: case TAO_CodeGen::TAO_OPERATION_INTERCEPTORS_ARGLIST_SS: { - ctx.state (TAO_CodeGen::TAO_ARGUMENT_INTERCEPTORS_INFO_ARGLIST_CH); be_visitor_args_request_info_arglist visitor (&ctx); status = node->accept (&visitor); break; } case TAO_CodeGen::TAO_OPERATION_INTERCEPTORS_INFO_ARGLIST_CH: { - ctx.state (TAO_CodeGen::TAO_ARGUMENT_INTERCEPTORS_ARGLIST_CH); be_visitor_args_request_info_ch visitor (&ctx); status = node->accept (&visitor); break; @@ -243,14 +241,12 @@ be_visitor_operation_interceptors_arglist::visit_argument (be_argument *node) } case TAO_CodeGen::TAO_OPERATION_INTERCEPTORS_PARAMLIST: { - ctx.state (TAO_CodeGen::TAO_ARGUMENT_INTERCEPTORS_PARAMLIST); be_visitor_args_paramlist visitor (&ctx); status = node->accept (&visitor); break; } case TAO_CodeGen::TAO_OPERATION_INTERCEPTORS_INFO_ARGLIST_SH: { - ctx.state (TAO_CodeGen::TAO_ARGUMENT_INTERCEPTORS_ARGLIST_SH); be_visitor_args_request_info_sh visitor (&ctx); status = node->accept (&visitor); break; @@ -264,7 +260,6 @@ be_visitor_operation_interceptors_arglist::visit_argument (be_argument *node) } case TAO_CodeGen::TAO_OPERATION_INTERCEPTORS_INFO_ARGLIST_SS: { - ctx.state (TAO_CodeGen::TAO_ARGUMENT_UPCALL_SS); be_visitor_args_upcall_ss visitor (&ctx); status = node->accept (&visitor); break; diff --git a/TAO/TAO_IDL/be/be_visitor_operation/interceptors_cs.cpp b/TAO/TAO_IDL/be/be_visitor_operation/interceptors_cs.cpp index 1c57bdb2439..2c8ba9fd294 100644 --- a/TAO/TAO_IDL/be/be_visitor_operation/interceptors_cs.cpp +++ b/TAO/TAO_IDL/be/be_visitor_operation/interceptors_cs.cpp @@ -228,7 +228,6 @@ be_visitor_operation_interceptors_cs::generate_class_declaration ( } ctx = *this->ctx_; - ctx.state (TAO_CodeGen::TAO_OPERATION_INTERCEPTORS_INFO_RETTYPE_CH); be_visitor_operation_interceptors_info_rettype oiir_visitor (&ctx); if (bt->accept (&oiir_visitor) == -1) @@ -342,7 +341,6 @@ be_visitor_operation_interceptors_cs::generate_class_declaration ( } ctx = *this->ctx_; - ctx.state (TAO_CodeGen::TAO_OPERATION_INTERCEPTORS_INFO_RETTYPE_CH); be_visitor_operation_interceptors_info_rettype toiir_visitor (&ctx); if (bt->accept (&toiir_visitor) == -1) @@ -781,7 +779,6 @@ be_visitor_operation_interceptors_cs::generate_class_definition ( // Generate the insertion of result into Any. ctx = *this->ctx_; - ctx.state (TAO_CodeGen::TAO_OPERATION_INTERCEPTORS_RESULT); be_visitor_operation_interceptors_result oir_visitor (&ctx); if (bt->accept (&oir_visitor) == -1) @@ -870,7 +867,6 @@ be_visitor_operation_interceptors_cs::generate_class_definition ( << "result ("; ctx = *this->ctx_; - ctx.state (TAO_CodeGen::TAO_OPERATION_RETTYPE_CH); be_visitor_operation_rettype or_visitor (&ctx); if (bt->accept (&or_visitor) == -1) diff --git a/TAO/TAO_IDL/be/be_visitor_operation/interceptors_ss.cpp b/TAO/TAO_IDL/be/be_visitor_operation/interceptors_ss.cpp index e6cee89736a..5603affab76 100644 --- a/TAO/TAO_IDL/be/be_visitor_operation/interceptors_ss.cpp +++ b/TAO/TAO_IDL/be/be_visitor_operation/interceptors_ss.cpp @@ -241,7 +241,6 @@ be_visitor_operation_interceptors_ss::generate_class_declaration ( *os << be_nl << "void result ("; ctx = *this->ctx_; - ctx.state (TAO_CodeGen::TAO_OPERATION_RETTYPE_CH); be_visitor_operation_rettype or_visitor (&ctx); if (bt->accept (&or_visitor) == -1) @@ -402,7 +401,6 @@ be_visitor_operation_interceptors_ss::generate_class_declaration ( if (!this->void_return_type (bt)) { ctx = *this->ctx_; - ctx.state (TAO_CodeGen::TAO_OPERATION_RETTYPE_SH); be_visitor_operation_rettype tor_visitor (&ctx); if (bt->accept (&tor_visitor) == -1) @@ -844,7 +842,6 @@ be_visitor_operation_interceptors_ss::generate_class_definition ( // Generate the insertion of result into Any. ctx = *this->ctx_; - ctx.state (TAO_CodeGen::TAO_OPERATION_INTERCEPTORS_RESULT); be_visitor_operation_interceptors_result oir_visitor (&ctx); if (bt->accept (&oir_visitor) == -1) @@ -1028,7 +1025,6 @@ be_visitor_operation_interceptors_ss::generate_class_definition ( << "result ("; ctx = *this->ctx_; - ctx.state (TAO_CodeGen::TAO_OPERATION_RETTYPE_CH); be_visitor_operation_rettype or_visitor (&ctx); if (bt->accept (&or_visitor) == -1) diff --git a/TAO/TAO_IDL/be/be_visitor_operation/operation.cpp b/TAO/TAO_IDL/be/be_visitor_operation/operation.cpp index aa8fdb67a2f..3de03a93819 100644 --- a/TAO/TAO_IDL/be/be_visitor_operation/operation.cpp +++ b/TAO/TAO_IDL/be/be_visitor_operation/operation.cpp @@ -235,13 +235,6 @@ be_visitor_operation::gen_environment_decl (int argument_emitted, // Last argument is always CORBA::Environment. *os << env_decl << "_WITH_DEFAULTS"; break; - case TAO_CodeGen::TAO_OPERATION_ARGLIST_IS: - case TAO_CodeGen::TAO_OPERATION_ARGLIST_IH: - case TAO_CodeGen::TAO_OPERATION_ARGLIST_PROXY_IMPL_XH: - case TAO_CodeGen::TAO_OPERATION_ARGLIST_BASE_PROXY_IMPL_CH: - // Last argument is always CORBA::Environment. - *os << env_decl; - break; default: *os << env_decl; break; @@ -308,8 +301,6 @@ be_visitor_operation::gen_raise_exception (be_type *return_type, // Non-void return type. be_visitor_context ctx (*this->ctx_); - ctx.state (TAO_CodeGen::TAO_OPERATION_RETVAL_RETURN_CS); - be_visitor_operation_rettype_return_cs visitor (&ctx); if (return_type->accept (&visitor) == -1) @@ -340,8 +331,6 @@ be_visitor_operation::gen_check_exception (be_type *return_type) // Non-void return type.... *os << "ACE_CHECK_RETURN ("; be_visitor_context ctx (*this->ctx_); - ctx.state (TAO_CodeGen::TAO_OPERATION_RETVAL_RETURN_CS); - be_visitor_operation_rettype_return_cs visitor (&ctx); if (return_type->accept (&visitor) == -1) @@ -371,8 +360,6 @@ be_visitor_operation::gen_check_interceptor_exception (be_type *return_type) // Non-void return type. *os << "TAO_INTERCEPTOR_CHECK_RETURN ("; be_visitor_context ctx (*this->ctx_); - ctx.state (TAO_CodeGen::TAO_OPERATION_RETVAL_RETURN_CS); - be_visitor_operation_rettype_return_cs visitor (&ctx); if (return_type->accept (&visitor) == -1) @@ -437,7 +424,6 @@ be_visitor_operation::gen_stub_operation_body ( // Declare return type. ctx = *this->ctx_; - ctx.state (TAO_CodeGen::TAO_OPERATION_RETVAL_DECL_CS); be_visitor_operation_rettype_vardecl_cs rd_visitor (&ctx); if (return_type->accept (&rd_visitor) == -1) @@ -497,7 +483,6 @@ be_visitor_operation::gen_stub_operation_body ( // Do any pre marshal and invoke processing with return type. This // includes allocating memory, initialization. ctx = *this->ctx_; - ctx.state (TAO_CodeGen::TAO_OPERATION_RETVAL_PRE_INVOKE_CS); be_visitor_operation_rettype_pre_invoke_cs rpi_visitor (&ctx); if (return_type->accept (&rpi_visitor) == -1) @@ -581,7 +566,6 @@ be_visitor_operation::gen_pre_stub_info ( ) { be_visitor_context ctx = *this->ctx_; - ctx.state (TAO_CodeGen::TAO_OPERATION_EXCEPTLIST_CS); be_visitor_operation_exceptlist_cs visitor (&ctx); if (node->accept (&visitor) == -1) @@ -999,7 +983,6 @@ be_visitor_operation::gen_marshal_and_invoke ( { // Demarshal the return value. ctx = *this->ctx_; - ctx.state (TAO_CodeGen::TAO_OPERATION_RETVAL_INVOKE_CS); ctx.sub_state (TAO_CodeGen::TAO_CDR_INPUT); be_visitor_operation_rettype_marshal_ss ori_visitor (&ctx); @@ -1079,7 +1062,6 @@ be_visitor_operation::gen_marshal_and_invoke ( // Generate the return type mapping (same as in the header file) ctx = *this->ctx_; - ctx.state (TAO_CodeGen::TAO_OPERATION_RETTYPE_OTHERS); be_visitor_operation_rettype oro_visitor (&ctx); if (bt->accept (&oro_visitor) == -1) diff --git a/TAO/TAO_IDL/be/be_visitor_operation/operation_ch.cpp b/TAO/TAO_IDL/be/be_visitor_operation/operation_ch.cpp index 6a4db01e572..dbc17505b5f 100644 --- a/TAO/TAO_IDL/be/be_visitor_operation/operation_ch.cpp +++ b/TAO/TAO_IDL/be/be_visitor_operation/operation_ch.cpp @@ -62,7 +62,6 @@ be_visitor_operation_ch::visit_operation (be_operation *node) // Grab the right visitor to generate the return type. be_visitor_context ctx (*this->ctx_); - ctx.state (TAO_CodeGen::TAO_OPERATION_RETTYPE_CH); be_visitor_operation_rettype or_visitor (&ctx); if (bt->accept (&or_visitor) == -1) diff --git a/TAO/TAO_IDL/be/be_visitor_operation/operation_cs.cpp b/TAO/TAO_IDL/be/be_visitor_operation/operation_cs.cpp index 40656926263..de19dd9e8d3 100644 --- a/TAO/TAO_IDL/be/be_visitor_operation/operation_cs.cpp +++ b/TAO/TAO_IDL/be/be_visitor_operation/operation_cs.cpp @@ -93,7 +93,6 @@ be_visitor_operation_cs::visit_operation (be_operation *node) // Generate the return type mapping (same as in the header file) be_visitor_context ctx = *this->ctx_; - ctx.state (TAO_CodeGen::TAO_OPERATION_RETTYPE_OTHERS); be_visitor_operation_rettype rt_visitor = (&ctx); if (bt->accept (&rt_visitor) == -1) @@ -111,7 +110,6 @@ be_visitor_operation_cs::visit_operation (be_operation *node) // Generate the argument list with the appropriate mapping (same as // in the header file) ctx = *this->ctx_; - ctx.state (TAO_CodeGen::TAO_OPERATION_ARGLIST_OTHERS); be_visitor_operation_arglist al_visitor (&ctx); if (node->accept (&al_visitor) == -1) diff --git a/TAO/TAO_IDL/be/be_visitor_operation/operation_ih.cpp b/TAO/TAO_IDL/be/be_visitor_operation/operation_ih.cpp index 63145f078a4..5ba720bb3b4 100644 --- a/TAO/TAO_IDL/be/be_visitor_operation/operation_ih.cpp +++ b/TAO/TAO_IDL/be/be_visitor_operation/operation_ih.cpp @@ -56,7 +56,6 @@ be_visitor_operation_ih::visit_operation (be_operation *node) // grab the right visitor to generate the return type be_visitor_context ctx (*this->ctx_); - ctx.state (TAO_CodeGen::TAO_OPERATION_RETTYPE_OTHERS); be_visitor_operation_rettype oro_visitor (&ctx); if (bt->accept (&oro_visitor) == -1) diff --git a/TAO/TAO_IDL/be/be_visitor_operation/operation_is.cpp b/TAO/TAO_IDL/be/be_visitor_operation/operation_is.cpp index 928cddddcc5..7cbb014e3db 100644 --- a/TAO/TAO_IDL/be/be_visitor_operation/operation_is.cpp +++ b/TAO/TAO_IDL/be/be_visitor_operation/operation_is.cpp @@ -56,7 +56,6 @@ be_visitor_operation_is::visit_operation (be_operation *node) } be_visitor_context ctx (*this->ctx_); - ctx.state (TAO_CodeGen::TAO_OPERATION_RETTYPE_OTHERS); be_visitor_operation_rettype oro_visitor (&ctx); if (bt->accept (&oro_visitor) == -1) diff --git a/TAO/TAO_IDL/be/be_visitor_operation/operation_sh.cpp b/TAO/TAO_IDL/be/be_visitor_operation/operation_sh.cpp index 677e7c3da98..1c4f7ff9280 100644 --- a/TAO/TAO_IDL/be/be_visitor_operation/operation_sh.cpp +++ b/TAO/TAO_IDL/be/be_visitor_operation/operation_sh.cpp @@ -59,7 +59,6 @@ be_visitor_operation_sh::visit_operation (be_operation *node) } be_visitor_context ctx (*this->ctx_); - ctx.state (TAO_CodeGen::TAO_OPERATION_RETTYPE_OTHERS); be_visitor_operation_rettype oro_visitor (&ctx); if (bt->accept (&oro_visitor) == -1) diff --git a/TAO/TAO_IDL/be/be_visitor_operation/operation_ss.cpp b/TAO/TAO_IDL/be/be_visitor_operation/operation_ss.cpp index a4df3e3a546..fb5e46e3674 100644 --- a/TAO/TAO_IDL/be/be_visitor_operation/operation_ss.cpp +++ b/TAO/TAO_IDL/be/be_visitor_operation/operation_ss.cpp @@ -149,7 +149,6 @@ be_visitor_operation_ss::visit_operation (be_operation *node) // Declare a return type variable. be_visitor_context ctx = *this->ctx_; - ctx.state (TAO_CodeGen::TAO_OPERATION_RETVAL_DECL_SS); be_visitor_operation_rettype_vardecl_ss ord_visitor (&ctx); // Do we have any arguments in the operation that needs marshalling? @@ -297,7 +296,6 @@ be_visitor_operation_ss::visit_operation (be_operation *node) // Make the upcall and assign to the return val. ctx = *this->ctx_; - ctx.state (TAO_CodeGen::TAO_OPERATION_RETVAL_ASSIGN_SS); be_visitor_operation_rettype_assign_ss ora_visitor (&ctx); if (bt->accept (&ora_visitor) == -1) @@ -379,7 +377,6 @@ be_visitor_operation_ss::visit_operation (be_operation *node) // causing any problems. // Generate the return type mapping (same as in the header file) ctx = *this->ctx_; - ctx.state (TAO_CodeGen::TAO_OPERATION_RETTYPE_OTHERS); be_visitor_operation_rettype oro_visitor (&ctx); if (bt->accept (&oro_visitor) == -1) @@ -697,7 +694,6 @@ be_visitor_operation_ss::gen_marshal_params (be_operation *node, { // Demarshal the return val and each inout and out argument. ctx = *this->ctx_; - ctx.state (TAO_CodeGen::TAO_OPERATION_RETVAL_MARSHAL_SS); ctx.sub_state (TAO_CodeGen::TAO_CDR_OUTPUT); be_visitor_operation_rettype_marshal_ss orm_visitor (&ctx); diff --git a/TAO/TAO_IDL/be/be_visitor_operation/proxy_impl_xh.cpp b/TAO/TAO_IDL/be/be_visitor_operation/proxy_impl_xh.cpp index fd1dd846946..eeaf83dfeb1 100644 --- a/TAO/TAO_IDL/be/be_visitor_operation/proxy_impl_xh.cpp +++ b/TAO/TAO_IDL/be/be_visitor_operation/proxy_impl_xh.cpp @@ -38,7 +38,6 @@ int be_visitor_operation_proxy_impl_xh::visit_operation (be_operation *node) } be_visitor_context ctx (*this->ctx_); - ctx.state (TAO_CodeGen::TAO_OPERATION_RETTYPE_OTHERS); be_visitor_operation_rettype oro_visitor (&ctx); if (bt->accept (&oro_visitor) == -1) diff --git a/TAO/TAO_IDL/be/be_visitor_operation/remote_proxy_impl_cs.cpp b/TAO/TAO_IDL/be/be_visitor_operation/remote_proxy_impl_cs.cpp index 2b1b6b6af4f..49834dd76e3 100644 --- a/TAO/TAO_IDL/be/be_visitor_operation/remote_proxy_impl_cs.cpp +++ b/TAO/TAO_IDL/be/be_visitor_operation/remote_proxy_impl_cs.cpp @@ -64,7 +64,6 @@ be_visitor_operation_remote_proxy_impl_cs::visit_operation ( // Generate the return type mapping (same as in the header file) be_visitor_context ctx = *this->ctx_; - ctx.state (TAO_CodeGen::TAO_OPERATION_RETTYPE_OTHERS); be_visitor_operation_rettype ort_visitor (&ctx); if (bt->accept (&ort_visitor) == -1) diff --git a/TAO/TAO_IDL/be/be_visitor_operation/smart_proxy_ch.cpp b/TAO/TAO_IDL/be/be_visitor_operation/smart_proxy_ch.cpp index 2dbf281187a..1e34b2b8db5 100644 --- a/TAO/TAO_IDL/be/be_visitor_operation/smart_proxy_ch.cpp +++ b/TAO/TAO_IDL/be/be_visitor_operation/smart_proxy_ch.cpp @@ -64,7 +64,6 @@ be_visitor_operation_smart_proxy_ch::visit_operation (be_operation *node) } be_visitor_context ctx (*this->ctx_); - ctx.state (TAO_CodeGen::TAO_OPERATION_RETTYPE_CH); be_visitor_operation_rettype or_visitor (&ctx); if (bt->accept (&or_visitor) == -1) diff --git a/TAO/TAO_IDL/be/be_visitor_operation/smart_proxy_cs.cpp b/TAO/TAO_IDL/be/be_visitor_operation/smart_proxy_cs.cpp index e0740edbd2a..984a49b9da8 100644 --- a/TAO/TAO_IDL/be/be_visitor_operation/smart_proxy_cs.cpp +++ b/TAO/TAO_IDL/be/be_visitor_operation/smart_proxy_cs.cpp @@ -74,7 +74,6 @@ int be_visitor_operation_smart_proxy_cs::visit_operation (be_operation *node) // STEP 2: generate the return type mapping (same as in the header file). be_visitor_context ctx (*this->ctx_); - ctx.state (TAO_CodeGen::TAO_OPERATION_RETTYPE_OTHERS); be_visitor_operation_rettype oro_visitor (&ctx); if (bt->accept (&oro_visitor) == -1) @@ -106,7 +105,6 @@ int be_visitor_operation_smart_proxy_cs::visit_operation (be_operation *node) // STEP 4: generate the argument list with the appropriate mapping (same as // in the header file) ctx = *this->ctx_; - ctx.state (TAO_CodeGen::TAO_OPERATION_ARGLIST_OTHERS); be_visitor_operation_arglist oao_visitor (&ctx); if (node->accept (&oao_visitor) == -1) diff --git a/TAO/TAO_IDL/be/be_visitor_operation/thru_poa_proxy_impl_ss.cpp b/TAO/TAO_IDL/be/be_visitor_operation/thru_poa_proxy_impl_ss.cpp index d2c0e74a7ee..22c5855579b 100644 --- a/TAO/TAO_IDL/be/be_visitor_operation/thru_poa_proxy_impl_ss.cpp +++ b/TAO/TAO_IDL/be/be_visitor_operation/thru_poa_proxy_impl_ss.cpp @@ -68,7 +68,6 @@ be_visitor_operation_thru_poa_proxy_impl_ss::visit_operation ( // STEP 2: generate the return type mapping (same as in the header file) be_visitor_context ctx (*this->ctx_); - ctx.state (TAO_CodeGen::TAO_OPERATION_RETTYPE_OTHERS); be_visitor_operation_rettype oro_visitor (&ctx); if (bt->accept (&oro_visitor) == -1) @@ -107,7 +106,6 @@ be_visitor_operation_thru_poa_proxy_impl_ss::visit_operation ( { // Declare a return type ctx = *this->ctx_; - ctx.state (TAO_CodeGen::TAO_OPERATION_RETVAL_DECL_SS); be_visitor_operation_rettype_vardecl_ss ord_visitor (&ctx); if (bt->accept (&ord_visitor) == -1) diff --git a/TAO/TAO_IDL/be/be_visitor_operation/tie_sh.cpp b/TAO/TAO_IDL/be/be_visitor_operation/tie_sh.cpp index f28dddd463d..a0fc6da455e 100644 --- a/TAO/TAO_IDL/be/be_visitor_operation/tie_sh.cpp +++ b/TAO/TAO_IDL/be/be_visitor_operation/tie_sh.cpp @@ -60,7 +60,6 @@ be_visitor_operation_tie_sh::visit_operation (be_operation *node) << "// " << __FILE__ << ":" << __LINE__ << be_nl << be_nl; be_visitor_context ctx (*this->ctx_); - ctx.state (TAO_CodeGen::TAO_OPERATION_RETTYPE_OTHERS); be_visitor_operation_rettype oro_visitor (&ctx); if (bt->accept (&oro_visitor) == -1) diff --git a/TAO/TAO_IDL/be/be_visitor_operation/tie_si.cpp b/TAO/TAO_IDL/be/be_visitor_operation/tie_si.cpp index 4539860019e..8bfc9f75869 100644 --- a/TAO/TAO_IDL/be/be_visitor_operation/tie_si.cpp +++ b/TAO/TAO_IDL/be/be_visitor_operation/tie_si.cpp @@ -71,7 +71,6 @@ int be_visitor_operation_tie_si::visit_operation (be_operation *node) // Generate the return type mapping (same as in the header file). be_visitor_context ctx (*this->ctx_); - ctx.state (TAO_CodeGen::TAO_OPERATION_RETTYPE_OTHERS); be_visitor_operation_rettype oro_visitor (&ctx); if (bt->accept (&oro_visitor) == -1) @@ -89,7 +88,6 @@ int be_visitor_operation_tie_si::visit_operation (be_operation *node) // STEP 4: generate the argument list with the appropriate mapping (same as // in the header file) ctx = *this->ctx_; - ctx.state (TAO_CodeGen::TAO_OPERATION_ARGLIST_OTHERS); be_visitor_operation_arglist oao_visitor (&ctx); if (node->accept (&oao_visitor) == -1) diff --git a/TAO/TAO_IDL/be/be_visitor_sequence/cdr_op_cs.cpp b/TAO/TAO_IDL/be/be_visitor_sequence/cdr_op_cs.cpp index 6265046a17f..3aa7cf022ed 100644 --- a/TAO/TAO_IDL/be/be_visitor_sequence/cdr_op_cs.cpp +++ b/TAO/TAO_IDL/be/be_visitor_sequence/cdr_op_cs.cpp @@ -573,7 +573,6 @@ be_visitor_sequence_cdr_op_cs::visit_node (be_type *bt) } be_visitor_context ctx (*this->ctx_); - ctx.state (TAO_CodeGen::TAO_SEQUENCE_BASE_CS); be_visitor_sequence_base visitor (&ctx); // Initialize a boolean variable. diff --git a/TAO/TAO_IDL/be/be_visitor_sequence/gen_bounded_obj_sequence_ci.cpp b/TAO/TAO_IDL/be/be_visitor_sequence/gen_bounded_obj_sequence_ci.cpp index 74ecf921ead..a2baf85435e 100644 --- a/TAO/TAO_IDL/be/be_visitor_sequence/gen_bounded_obj_sequence_ci.cpp +++ b/TAO/TAO_IDL/be/be_visitor_sequence/gen_bounded_obj_sequence_ci.cpp @@ -98,7 +98,6 @@ be_visitor_sequence_ci::gen_bounded_obj_sequence (be_sequence *node) } be_visitor_context ctx (*this->ctx_); - ctx.state (TAO_CodeGen::TAO_SEQUENCE_BASE_CI); be_visitor_sequence_base visitor (&ctx); *os << be_nl << be_nl << "// TAO_IDL - Generated from " << be_nl diff --git a/TAO/TAO_IDL/be/be_visitor_sequence/gen_bounded_obj_sequence_cs.cpp b/TAO/TAO_IDL/be/be_visitor_sequence/gen_bounded_obj_sequence_cs.cpp index 8f3dc5e6e8d..808d6cd53da 100644 --- a/TAO/TAO_IDL/be/be_visitor_sequence/gen_bounded_obj_sequence_cs.cpp +++ b/TAO/TAO_IDL/be/be_visitor_sequence/gen_bounded_obj_sequence_cs.cpp @@ -98,7 +98,6 @@ be_visitor_sequence_cs::gen_bounded_obj_sequence (be_sequence *node) } be_visitor_context ctx (*this->ctx_); - ctx.state (TAO_CodeGen::TAO_SEQUENCE_BASE_CS); be_visitor_sequence_base visitor (&ctx); *os << be_nl << be_nl << "// TAO_IDL - Generated from " << be_nl diff --git a/TAO/TAO_IDL/be/be_visitor_sequence/gen_bounded_sequence_ci.cpp b/TAO/TAO_IDL/be/be_visitor_sequence/gen_bounded_sequence_ci.cpp index abd050474ef..24b2a666569 100644 --- a/TAO/TAO_IDL/be/be_visitor_sequence/gen_bounded_sequence_ci.cpp +++ b/TAO/TAO_IDL/be/be_visitor_sequence/gen_bounded_sequence_ci.cpp @@ -97,7 +97,6 @@ be_visitor_sequence_ci::gen_bounded_sequence (be_sequence *node) be_visitor_context ctx (*this->ctx_); - ctx.state (TAO_CodeGen::TAO_SEQUENCE_BASE_CI); be_visitor_sequence_base visitor (&ctx); *os << be_nl << be_nl << "// TAO_IDL - Generated from " << be_nl diff --git a/TAO/TAO_IDL/be/be_visitor_sequence/gen_bounded_sequence_cs.cpp b/TAO/TAO_IDL/be/be_visitor_sequence/gen_bounded_sequence_cs.cpp index 35ab49e48d7..fc46694356e 100644 --- a/TAO/TAO_IDL/be/be_visitor_sequence/gen_bounded_sequence_cs.cpp +++ b/TAO/TAO_IDL/be/be_visitor_sequence/gen_bounded_sequence_cs.cpp @@ -80,7 +80,6 @@ be_visitor_sequence_cs::gen_bounded_sequence (be_sequence *node) be_visitor_context ctx (*this->ctx_); - ctx.state (TAO_CodeGen::TAO_SEQUENCE_BASE_CS); be_visitor_sequence_base visitor (&ctx); *os << be_nl << be_nl << "// TAO_IDL - Generated from " << be_nl diff --git a/TAO/TAO_IDL/be/be_visitor_sequence/gen_unbounded_obj_sequence_ci.cpp b/TAO/TAO_IDL/be/be_visitor_sequence/gen_unbounded_obj_sequence_ci.cpp index 22a38b301d2..31660353d25 100644 --- a/TAO/TAO_IDL/be/be_visitor_sequence/gen_unbounded_obj_sequence_ci.cpp +++ b/TAO/TAO_IDL/be/be_visitor_sequence/gen_unbounded_obj_sequence_ci.cpp @@ -101,7 +101,6 @@ be_visitor_sequence_ci::gen_unbounded_obj_sequence (be_sequence *node) } be_visitor_context ctx (*this->ctx_); - ctx.state (TAO_CodeGen::TAO_SEQUENCE_BASE_CI); be_visitor_sequence_base visitor (&ctx); *os << be_nl << be_nl << "// TAO_IDL - Generated from " << be_nl diff --git a/TAO/TAO_IDL/be/be_visitor_sequence/gen_unbounded_obj_sequence_cs.cpp b/TAO/TAO_IDL/be/be_visitor_sequence/gen_unbounded_obj_sequence_cs.cpp index 6cf50cceb52..65c5cce1dfc 100644 --- a/TAO/TAO_IDL/be/be_visitor_sequence/gen_unbounded_obj_sequence_cs.cpp +++ b/TAO/TAO_IDL/be/be_visitor_sequence/gen_unbounded_obj_sequence_cs.cpp @@ -96,7 +96,6 @@ be_visitor_sequence_cs::gen_unbounded_obj_sequence (be_sequence *node) } be_visitor_context ctx (*this->ctx_); - ctx.state (TAO_CodeGen::TAO_SEQUENCE_BASE_CS); be_visitor_sequence_base visitor (&ctx); *os << be_nl << be_nl << "// TAO_IDL - Generated from" << be_nl diff --git a/TAO/TAO_IDL/be/be_visitor_sequence/gen_unbounded_sequence_ci.cpp b/TAO/TAO_IDL/be/be_visitor_sequence/gen_unbounded_sequence_ci.cpp index 2ef8a279d33..d170d256dfb 100644 --- a/TAO/TAO_IDL/be/be_visitor_sequence/gen_unbounded_sequence_ci.cpp +++ b/TAO/TAO_IDL/be/be_visitor_sequence/gen_unbounded_sequence_ci.cpp @@ -92,7 +92,6 @@ be_visitor_sequence_ci::gen_unbounded_sequence (be_sequence *node) // Get the visitor for the type of the sequence. be_visitor_context ctx (*this->ctx_); - ctx.state (TAO_CodeGen::TAO_SEQUENCE_BASE_CI); be_visitor_sequence_base visitor (&ctx); *os << be_nl << be_nl << "// TAO_IDL - Generated from " << be_nl diff --git a/TAO/TAO_IDL/be/be_visitor_sequence/gen_unbounded_sequence_cs.cpp b/TAO/TAO_IDL/be/be_visitor_sequence/gen_unbounded_sequence_cs.cpp index 786903c9e4a..b562dfc62de 100644 --- a/TAO/TAO_IDL/be/be_visitor_sequence/gen_unbounded_sequence_cs.cpp +++ b/TAO/TAO_IDL/be/be_visitor_sequence/gen_unbounded_sequence_cs.cpp @@ -94,7 +94,6 @@ be_visitor_sequence_cs::gen_unbounded_sequence (be_sequence *node) // Get the visitor for the type of the sequence. be_visitor_context ctx (*this->ctx_); - ctx.state (TAO_CodeGen::TAO_SEQUENCE_BASE_CS); be_visitor_sequence_base visitor (&ctx); *os << be_nl << be_nl << "// TAO_IDL - Generated from " << be_nl diff --git a/TAO/TAO_IDL/be/be_visitor_sequence/sequence_base.cpp b/TAO/TAO_IDL/be/be_visitor_sequence/sequence_base.cpp index 1277fd82ccf..e4222bf17b5 100644 --- a/TAO/TAO_IDL/be/be_visitor_sequence/sequence_base.cpp +++ b/TAO/TAO_IDL/be/be_visitor_sequence/sequence_base.cpp @@ -92,9 +92,7 @@ be_visitor_sequence_base::visit_sequence (be_sequence *node) int be_visitor_sequence_base::visit_interface (be_interface *node) { - return this->visit_node (node); - } int diff --git a/TAO/TAO_IDL/be/be_visitor_sequence/sequence_ci.cpp b/TAO/TAO_IDL/be/be_visitor_sequence/sequence_ci.cpp index 44008bf655e..364b32a5105 100644 --- a/TAO/TAO_IDL/be/be_visitor_sequence/sequence_ci.cpp +++ b/TAO/TAO_IDL/be/be_visitor_sequence/sequence_ci.cpp @@ -399,7 +399,6 @@ be_visitor_sequence_ci::gen_var_impl (be_sequence *node) *os << "ACE_INLINE" << be_nl; be_visitor_context ctx (*this->ctx_); - ctx.state (TAO_CodeGen::TAO_SEQELEM_RETTYPE_CI); be_visitor_sequence_elemtype sr_visitor (&ctx); if (bt->accept (&sr_visitor) == -1) @@ -650,7 +649,6 @@ be_visitor_sequence_ci::gen_out_impl (be_sequence *node) *os << "ACE_INLINE" << be_nl; be_visitor_context ctx (*this->ctx_); - ctx.state (TAO_CodeGen::TAO_SEQELEM_RETTYPE_CI); be_visitor_sequence_elemtype sr_visitor (&ctx); if (bt->accept (&sr_visitor) == -1) diff --git a/TAO/TAO_IDL/be/be_visitor_sequence/sequence_cs.cpp b/TAO/TAO_IDL/be/be_visitor_sequence/sequence_cs.cpp index 2c04fcf5514..becf4b1ca0a 100644 --- a/TAO/TAO_IDL/be/be_visitor_sequence/sequence_cs.cpp +++ b/TAO/TAO_IDL/be/be_visitor_sequence/sequence_cs.cpp @@ -154,9 +154,8 @@ be_visitor_sequence_cs::gen_base_sequence_class (be_sequence *node) } be_visitor_context ctx (*this->ctx_); - be_visitor_sequence_base_template_args visitor (&ctx, + be_visitor_sequence_base_template_args visitor (&ctx, node); - ctx.state (TAO_CodeGen::TAO_SEQUENCE_BASE_CS); if (bt->accept (&visitor) == -1) { @@ -296,7 +295,6 @@ int be_visitor_sequence_cs::visit_sequence (be_sequence *node) // generate the base type for the buffer be_visitor_context ctx (*this->ctx_); - ctx.state (TAO_CodeGen::TAO_SEQUENCE_BUFFER_TYPE_CS); be_visitor_sequence_buffer_type bt_visitor (&ctx); if (bt->accept (&bt_visitor) == -1) 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 7c9c1797e4d..9ad013c1e88 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 @@ -44,7 +44,7 @@ be_visitor_structure_cdr_op_cs::visit_structure (be_structure *node) } // Set the substate as generating code for the types defined in our scope. - this->ctx_->sub_state(TAO_CodeGen::TAO_CDR_SCOPE); + this->ctx_->sub_state (TAO_CodeGen::TAO_CDR_SCOPE); if (this->visit_scope (node) == -1) { diff --git a/TAO/TAO_IDL/be/be_visitor_structure/structure_ch.cpp b/TAO/TAO_IDL/be/be_visitor_structure/structure_ch.cpp index fec1785e8b6..cba35e725bc 100644 --- a/TAO/TAO_IDL/be/be_visitor_structure/structure_ch.cpp +++ b/TAO/TAO_IDL/be/be_visitor_structure/structure_ch.cpp @@ -111,7 +111,6 @@ int be_visitor_structure_ch::visit_structure (be_structure *node) if (be_global->tc_support ()) { be_visitor_context ctx (*this->ctx_); - ctx.state (TAO_CodeGen::TAO_TYPECODE_DECL); be_visitor_typecode_decl visitor (&ctx); if (node->accept (&visitor) == -1) diff --git a/TAO/TAO_IDL/be/be_visitor_structure/structure_cs.cpp b/TAO/TAO_IDL/be/be_visitor_structure/structure_cs.cpp index 1e096bf1bbb..a160d3c2900 100644 --- a/TAO/TAO_IDL/be/be_visitor_structure/structure_cs.cpp +++ b/TAO/TAO_IDL/be/be_visitor_structure/structure_cs.cpp @@ -46,7 +46,6 @@ be_visitor_structure_cs::visit_structure (be_structure *node) if (be_global->tc_support ()) { be_visitor_context ctx (*this->ctx_); - ctx.state (TAO_CodeGen::TAO_TYPECODE_DEFN); ctx.sub_state (TAO_CodeGen::TAO_TC_DEFN_TYPECODE); be_visitor_typecode_defn visitor (&ctx); diff --git a/TAO/TAO_IDL/be/be_visitor_typedef/typedef_ch.cpp b/TAO/TAO_IDL/be/be_visitor_typedef/typedef_ch.cpp index 52b4d1035e8..76bd347a843 100644 --- a/TAO/TAO_IDL/be/be_visitor_typedef/typedef_ch.cpp +++ b/TAO/TAO_IDL/be/be_visitor_typedef/typedef_ch.cpp @@ -126,7 +126,6 @@ be_visitor_typedef_ch::visit_typedef (be_typedef *node) if (!node->imported () && be_global->tc_support ()) { be_visitor_context ctx (*this->ctx_); - ctx.state (TAO_CodeGen::TAO_TYPECODE_DECL); be_visitor_typecode_decl visitor (&ctx); if (node->accept (&visitor) == -1) diff --git a/TAO/TAO_IDL/be/be_visitor_typedef/typedef_cs.cpp b/TAO/TAO_IDL/be/be_visitor_typedef/typedef_cs.cpp index d0cc395424e..5e1cef76908 100644 --- a/TAO/TAO_IDL/be/be_visitor_typedef/typedef_cs.cpp +++ b/TAO/TAO_IDL/be/be_visitor_typedef/typedef_cs.cpp @@ -125,7 +125,6 @@ be_visitor_typedef_cs::visit_typedef (be_typedef *node) if (!node->imported () && be_global->tc_support ()) { be_visitor_context ctx (*this->ctx_); - ctx.state (TAO_CodeGen::TAO_TYPECODE_DEFN); ctx.sub_state (TAO_CodeGen::TAO_TC_DEFN_TYPECODE); be_visitor_typecode_defn visitor (&ctx); diff --git a/TAO/TAO_IDL/be/be_visitor_union/cdr_op_ch.cpp b/TAO/TAO_IDL/be/be_visitor_union/cdr_op_ch.cpp index a9f9dfe6b1c..bd4683ea50a 100644 --- a/TAO/TAO_IDL/be/be_visitor_union/cdr_op_ch.cpp +++ b/TAO/TAO_IDL/be/be_visitor_union/cdr_op_ch.cpp @@ -62,7 +62,7 @@ be_visitor_union_cdr_op_ch::visit_union (be_union *node) // Set the substate as generating code for the types defined in our scope. - this->ctx_->sub_state(TAO_CodeGen::TAO_CDR_SCOPE); + this->ctx_->sub_state (TAO_CodeGen::TAO_CDR_SCOPE); if (this->visit_scope (node) == -1) { diff --git a/TAO/TAO_IDL/be/be_visitor_union/cdr_op_ci.cpp b/TAO/TAO_IDL/be/be_visitor_union/cdr_op_ci.cpp index fafd879760a..3d532e16da6 100644 --- a/TAO/TAO_IDL/be/be_visitor_union/cdr_op_ci.cpp +++ b/TAO/TAO_IDL/be/be_visitor_union/cdr_op_ci.cpp @@ -52,7 +52,7 @@ be_visitor_union_cdr_op_ci::visit_union (be_union *node) } // Set the substate as generating code for the types defined in our scope. - this->ctx_->sub_state(TAO_CodeGen::TAO_CDR_SCOPE); + this->ctx_->sub_state (TAO_CodeGen::TAO_CDR_SCOPE); if (this->visit_scope (node) == -1) { 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 05092325e82..225773b7724 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 @@ -50,7 +50,7 @@ be_visitor_union_cdr_op_cs::visit_union (be_union *node) } // Set the substate as generating code for the types defined in our scope - this->ctx_->sub_state(TAO_CodeGen::TAO_CDR_SCOPE); + this->ctx_->sub_state (TAO_CodeGen::TAO_CDR_SCOPE); if (this->visit_scope (node) == -1) { diff --git a/TAO/TAO_IDL/be/be_visitor_union/union.cpp b/TAO/TAO_IDL/be/be_visitor_union/union.cpp index 2dd1be9877e..e9d2c7cbb67 100644 --- a/TAO/TAO_IDL/be/be_visitor_union/union.cpp +++ b/TAO/TAO_IDL/be/be_visitor_union/union.cpp @@ -50,42 +50,36 @@ be_visitor_union::visit_union_branch (be_union_branch *node) { case TAO_CodeGen::TAO_UNION_PUBLIC_CH: { - ctx.state (TAO_CodeGen::TAO_UNION_PUBLIC_CH); be_visitor_union_branch_public_ch visitor (&ctx); status = node->accept (&visitor); break; } case TAO_CodeGen::TAO_UNION_PRIVATE_CH: { - ctx.state (TAO_CodeGen::TAO_UNION_PRIVATE_CH); be_visitor_union_branch_private_ch visitor (&ctx); status = node->accept (&visitor); break; } - case TAO_CodeGen::TAO_UNION_PUBLIC_CI: + case TAO_CodeGen::TAO_ROOT_CI: { - ctx.state (TAO_CodeGen::TAO_UNION_PUBLIC_CI); be_visitor_union_branch_public_ci visitor (&ctx); status = node->accept (&visitor); break; } case TAO_CodeGen::TAO_UNION_PUBLIC_CS: { - ctx.state (TAO_CodeGen::TAO_UNION_PUBLIC_CS); be_visitor_union_branch_public_cs visitor (&ctx); status = node->accept (&visitor); break; } case TAO_CodeGen::TAO_UNION_PUBLIC_ASSIGN_CS: { - ctx.state (TAO_CodeGen::TAO_UNION_PUBLIC_ASSIGN_CS); be_visitor_union_branch_public_assign_cs visitor (&ctx); status = node->accept (&visitor); break; } case TAO_CodeGen::TAO_UNION_PUBLIC_RESET_CS: { - ctx.state (TAO_CodeGen::TAO_UNION_PUBLIC_RESET_CS); be_visitor_union_branch_public_reset_cs visitor (&ctx); status = node->accept (&visitor); break; diff --git a/TAO/TAO_IDL/be/be_visitor_union/union_ch.cpp b/TAO/TAO_IDL/be/be_visitor_union/union_ch.cpp index 7614572ec3d..87eee4b15e5 100644 --- a/TAO/TAO_IDL/be/be_visitor_union/union_ch.cpp +++ b/TAO/TAO_IDL/be/be_visitor_union/union_ch.cpp @@ -95,7 +95,6 @@ int be_visitor_union_ch::visit_union (be_union *node) // The discriminant type may have to be defined here if it was an enum // declaration inside of the union statement. - ctx.state (TAO_CodeGen::TAO_UNION_DISCTYPEDEFN_CH); be_visitor_union_discriminant_ch ud_visitor (&ctx); if (bt->accept (&ud_visitor) == -1) @@ -187,7 +186,6 @@ int be_visitor_union_ch::visit_union (be_union *node) if (be_global->tc_support ()) { ctx = *this->ctx_; - ctx.state (TAO_CodeGen::TAO_TYPECODE_DECL); be_visitor_typecode_decl tc_visitor (&ctx); if (node->accept (&tc_visitor) == -1) diff --git a/TAO/TAO_IDL/be/be_visitor_union/union_ci.cpp b/TAO/TAO_IDL/be/be_visitor_union/union_ci.cpp index 245f2931d87..f349e99661d 100644 --- a/TAO/TAO_IDL/be/be_visitor_union/union_ci.cpp +++ b/TAO/TAO_IDL/be/be_visitor_union/union_ci.cpp @@ -69,8 +69,6 @@ int be_visitor_union_ci::visit_union (be_union *node) -1); } - ctx.state (TAO_CodeGen::TAO_UNION_DISCTYPEDEFN_CI); - be_visitor_union_discriminant_ci visitor (&ctx); if (bt->accept (&visitor) == -1) @@ -84,8 +82,6 @@ int be_visitor_union_ci::visit_union (be_union *node) // Now generate the implementation of the access methods for the // union. For this set our state. - this->ctx_->state (TAO_CodeGen::TAO_UNION_PUBLIC_CI); - if (this->visit_scope (node) == -1) { ACE_ERROR_RETURN ((LM_ERROR, diff --git a/TAO/TAO_IDL/be/be_visitor_union/union_cs.cpp b/TAO/TAO_IDL/be/be_visitor_union/union_cs.cpp index cf3af206500..b638b8807ac 100644 --- a/TAO/TAO_IDL/be/be_visitor_union/union_cs.cpp +++ b/TAO/TAO_IDL/be/be_visitor_union/union_cs.cpp @@ -60,7 +60,6 @@ int be_visitor_union_cs::visit_union (be_union *node) "bad discriminant type\n"), -1); } - ctx.state (TAO_CodeGen::TAO_UNION_DISCTYPEDEFN_CS); be_visitor_union_discriminant_cs disc_visitor (&ctx); if (bt->accept (&disc_visitor) == -1) @@ -279,7 +278,6 @@ int be_visitor_union_cs::visit_union (be_union *node) if (!node->is_local () && be_global->tc_support ()) { ctx = *this->ctx_; - ctx.state (TAO_CodeGen::TAO_TYPECODE_DEFN); ctx.sub_state (TAO_CodeGen::TAO_TC_DEFN_TYPECODE); be_visitor_typecode_defn tc_visitor (&ctx); diff --git a/TAO/TAO_IDL/be/be_visitor_valuetype/arglist.cpp b/TAO/TAO_IDL/be/be_visitor_valuetype/arglist.cpp index dadbaa62c0a..d92250712c6 100644 --- a/TAO/TAO_IDL/be/be_visitor_valuetype/arglist.cpp +++ b/TAO/TAO_IDL/be/be_visitor_valuetype/arglist.cpp @@ -269,7 +269,6 @@ be_visitor_obv_operation_arglist::visit_argument (be_argument *node) { case TAO_CodeGen::TAO_OBV_OPERATION_ARGLIST_CH: { - ctx.state (TAO_CodeGen::TAO_ARGUMENT_ARGLIST_CH); be_visitor_args_arglist visitor (&ctx); status = bt->accept (&visitor); break; @@ -279,7 +278,6 @@ be_visitor_obv_operation_arglist::visit_argument (be_argument *node) case TAO_CodeGen::TAO_OBV_OPERATION_ARGLIST_IH: case TAO_CodeGen::TAO_OBV_OPERATION_ARGLIST_IS: { - ctx.state (TAO_CodeGen::TAO_ARGUMENT_ARGLIST_OTHERS); be_visitor_args_arglist visitor (&ctx); status = bt->accept (&visitor); break; diff --git a/TAO/TAO_IDL/be/be_visitor_valuetype/valuetype.cpp b/TAO/TAO_IDL/be/be_visitor_valuetype/valuetype.cpp index 4914a6f6241..47b84795441 100644 --- a/TAO/TAO_IDL/be/be_visitor_valuetype/valuetype.cpp +++ b/TAO/TAO_IDL/be/be_visitor_valuetype/valuetype.cpp @@ -416,31 +416,8 @@ be_visitor_valuetype::visit_exception (be_exception *node) status = node->accept (&visitor); break; } - case TAO_CodeGen::TAO_ROOT_SH: - case TAO_CodeGen::TAO_ROOT_IH: - case TAO_CodeGen::TAO_ROOT_SI: - case TAO_CodeGen::TAO_ROOT_SS: - case TAO_CodeGen::TAO_ROOT_IS: - case TAO_CodeGen::TAO_VALUETYPE_OBV_CH: - case TAO_CodeGen::TAO_VALUETYPE_OBV_CI: - case TAO_CodeGen::TAO_VALUETYPE_OBV_CS: - case TAO_CodeGen::TAO_VALUETYPE_COLLOCATED_SH: - case TAO_CodeGen::TAO_VALUETYPE_COLLOCATED_SS: - case TAO_CodeGen::TAO_VALUETYPE_MARSHAL_CH: - case TAO_CodeGen::TAO_VALUETYPE_MARSHAL_CS: - case TAO_CodeGen::TAO_VALUETYPE_INIT_CH: - case TAO_CodeGen::TAO_VALUETYPE_INIT_CI: - case TAO_CodeGen::TAO_VALUETYPE_INIT_CS: - case TAO_CodeGen::TAO_VALUETYPE_INIT_ARGLIST_CH: - return 0; // Nothing to be done. default: - { - ACE_ERROR_RETURN ((LM_ERROR, - "(%N:%l) be_visitor_interface::" - "visit_exception - " - "Bad context state\n"), - -1); - } + return 0; // Nothing to be done. } if (status == -1) @@ -666,38 +643,8 @@ be_visitor_valuetype::visit_union_fwd (be_union_fwd *node) status = node->accept (&visitor); break; } - case TAO_CodeGen::TAO_ROOT_CI: - case TAO_CodeGen::TAO_ROOT_CS: - case TAO_CodeGen::TAO_ROOT_ANY_OP_CH: - case TAO_CodeGen::TAO_ROOT_ANY_OP_CS: - case TAO_CodeGen::TAO_ROOT_CDR_OP_CH: - case TAO_CodeGen::TAO_ROOT_CDR_OP_CI: - case TAO_CodeGen::TAO_ROOT_CDR_OP_CS: - case TAO_CodeGen::TAO_ROOT_SH: - case TAO_CodeGen::TAO_ROOT_IH: - case TAO_CodeGen::TAO_ROOT_SI: - case TAO_CodeGen::TAO_ROOT_SS: - case TAO_CodeGen::TAO_ROOT_IS: - case TAO_CodeGen::TAO_VALUETYPE_OBV_CH: - case TAO_CodeGen::TAO_VALUETYPE_OBV_CI: - case TAO_CodeGen::TAO_VALUETYPE_OBV_CS: - case TAO_CodeGen::TAO_VALUETYPE_COLLOCATED_SH: - case TAO_CodeGen::TAO_VALUETYPE_COLLOCATED_SS: - case TAO_CodeGen::TAO_VALUETYPE_MARSHAL_CH: - case TAO_CodeGen::TAO_VALUETYPE_MARSHAL_CS: - case TAO_CodeGen::TAO_VALUETYPE_INIT_CH: - case TAO_CodeGen::TAO_VALUETYPE_INIT_CI: - case TAO_CodeGen::TAO_VALUETYPE_INIT_CS: - case TAO_CodeGen::TAO_VALUETYPE_INIT_ARGLIST_CH: - return 0; // nothing to be done default: - { - ACE_ERROR_RETURN ((LM_ERROR, - "(%N:%l) be_visitor_valuetype::" - "visit_union_fwd - " - "Bad context state\n"), - -1); - } + return 0; // nothing to be done } if (status == -1) diff --git a/TAO/TAO_IDL/be/be_visitor_valuetype/valuetype_ch.cpp b/TAO/TAO_IDL/be/be_visitor_valuetype/valuetype_ch.cpp index 2aa3226539c..f8e74cdc049 100644 --- a/TAO/TAO_IDL/be/be_visitor_valuetype/valuetype_ch.cpp +++ b/TAO/TAO_IDL/be/be_visitor_valuetype/valuetype_ch.cpp @@ -427,7 +427,6 @@ be_visitor_valuetype_ch::visit_valuetype (be_valuetype *node) // Generate the _init -related declarations. be_visitor_context ctx (*this->ctx_); - ctx.state (TAO_CodeGen::TAO_VALUETYPE_INIT_CH); be_visitor_valuetype_init_ch visitor (&ctx); if (visitor.visit_valuetype (node) == -1) @@ -443,7 +442,6 @@ be_visitor_valuetype_ch::visit_valuetype (be_valuetype *node) if (be_global->tc_support ()) { be_visitor_context ctx (*this->ctx_); - ctx.state (TAO_CodeGen::TAO_TYPECODE_DECL); be_visitor_typecode_decl visitor (&ctx); if (node->accept (&visitor) == -1) @@ -489,7 +487,6 @@ be_visitor_valuetype_ch::visit_operation (be_operation *node) // Grab the right visitor to generate the return type. be_visitor_context ctx (*this->ctx_); - ctx.state (TAO_CodeGen::TAO_OPERATION_RETTYPE_CH); be_visitor_operation_rettype or_visitor (&ctx); if (bt->accept (&or_visitor) == -1) diff --git a/TAO/TAO_IDL/be/be_visitor_valuetype/valuetype_ci.cpp b/TAO/TAO_IDL/be/be_visitor_valuetype/valuetype_ci.cpp index 72f8e62cf2a..7e0a54baa8d 100644 --- a/TAO/TAO_IDL/be/be_visitor_valuetype/valuetype_ci.cpp +++ b/TAO/TAO_IDL/be/be_visitor_valuetype/valuetype_ci.cpp @@ -106,7 +106,6 @@ be_visitor_valuetype_ci::visit_valuetype (be_valuetype *node) // Generate the _init-related code. be_visitor_context ctx (*this->ctx_); - ctx.state (TAO_CodeGen::TAO_VALUETYPE_INIT_CI); be_visitor_valuetype_init_ci visitor (&ctx); if (visitor.visit_valuetype (node) == -1) diff --git a/TAO/TAO_IDL/be/be_visitor_valuetype/valuetype_cs.cpp b/TAO/TAO_IDL/be/be_visitor_valuetype/valuetype_cs.cpp index 2dca378e520..21bebf0e698 100644 --- a/TAO/TAO_IDL/be/be_visitor_valuetype/valuetype_cs.cpp +++ b/TAO/TAO_IDL/be/be_visitor_valuetype/valuetype_cs.cpp @@ -75,7 +75,6 @@ be_visitor_valuetype_cs::visit_valuetype (be_valuetype *node) if (be_global->tc_support ()) { be_visitor_context ctx (*this->ctx_); - ctx.state (TAO_CodeGen::TAO_TYPECODE_DEFN); ctx.sub_state (TAO_CodeGen::TAO_TC_DEFN_TYPECODE); be_visitor_typecode_defn tc_visitor (&ctx); @@ -370,7 +369,6 @@ be_visitor_valuetype_cs::visit_valuetype (be_valuetype *node) // Generate the _init-related code. be_visitor_context ctx (*this->ctx_); - ctx.state (TAO_CodeGen::TAO_VALUETYPE_INIT_CS); be_visitor_valuetype_init_cs vi_visitor (&ctx); if (vi_visitor.visit_valuetype (node) == -1) diff --git a/TAO/TAO_IDL/be/be_visitor_valuetype/valuetype_init_arglist_ch.cpp b/TAO/TAO_IDL/be/be_visitor_valuetype/valuetype_init_arglist_ch.cpp index ee8ef8cbdcb..3489d7d2b59 100644 --- a/TAO/TAO_IDL/be/be_visitor_valuetype/valuetype_init_arglist_ch.cpp +++ b/TAO/TAO_IDL/be/be_visitor_valuetype/valuetype_init_arglist_ch.cpp @@ -66,26 +66,8 @@ be_visitor_valuetype_init_arglist_ch::visit_argument (be_argument *node) // Get the visitor that will dump the argument's mapping in the operation // signature. be_visitor_context ctx (*this->ctx_); - int status = 0; - - switch (this->ctx_->state ()) - { - case TAO_CodeGen::TAO_VALUETYPE_INIT_ARGLIST_CH: - { - ctx.state (TAO_CodeGen::TAO_ARGUMENT_ARGLIST_CH); - be_visitor_args_arglist visitor (&ctx); - status = node->accept (&visitor); - break; - } - default: - { - ACE_ERROR_RETURN ((LM_ERROR, - "(%N:%l) be_visitor_valuetype_init_arglist_ch::" - "visit_argument - " - "Bad context\n"), - -1); - } - } + be_visitor_args_arglist visitor (&ctx); + int status = node->accept (&visitor); if (status == -1) { diff --git a/TAO/TAO_IDL/be/be_visitor_valuetype/valuetype_init_ch.cpp b/TAO/TAO_IDL/be/be_visitor_valuetype/valuetype_init_ch.cpp index 4d057ca4d21..4035fd4d7ca 100644 --- a/TAO/TAO_IDL/be/be_visitor_valuetype/valuetype_init_ch.cpp +++ b/TAO/TAO_IDL/be/be_visitor_valuetype/valuetype_init_ch.cpp @@ -162,7 +162,6 @@ be_visitor_valuetype_init_ch::visit_factory (be_factory *node) // STEP 3: Generate the argument list with the appropriate mapping. For these // we grab a visitor that generates the parameter listing. be_visitor_context ctx (*this->ctx_); - ctx.state (TAO_CodeGen::TAO_VALUETYPE_INIT_ARGLIST_CH); be_visitor_valuetype_init_arglist_ch visitor (&ctx); if (node->accept (&visitor) == -1) diff --git a/TAO/TAO_IDL/be_include/be_codegen.h b/TAO/TAO_IDL/be_include/be_codegen.h index c52507c6bf9..c518fdb4524 100644 --- a/TAO/TAO_IDL/be_include/be_codegen.h +++ b/TAO/TAO_IDL/be_include/be_codegen.h @@ -56,59 +56,19 @@ public: // Emitting code for arguments of an operation. No distinction between // headers, inlines, stubs. - TAO_ARGUMENT_ARGLIST_CH, // argument in op signature of - // ... client header - TAO_ARGUMENT_ARGLIST_SH, // argument in op signature of - // ... server header - TAO_ARGUMENT_INVOKE_ARG_LIST, - - TAO_ARGUMENT_INTERCEPTORS_ARGLIST_CH, // ... client header TAO_ARGUMENT_INTERCEPTORS_ARGLIST_CS, // ... client source - TAO_ARGUMENT_INTERCEPTORS_INFO_ARGLIST_CH, // ... client header TAO_ARGUMENT_INTERCEPTORS_INFO_ARGLIST_CS, // ... client source - TAO_ARGUMENT_INTERCEPTORS_PARAMLIST, // ... client source - TAO_ARGUMENT_INTERCEPTORS_RESULT, // ... client source - TAO_ARGUMENT_INTERCEPTORS_ARGLIST_SH, // ... server header TAO_ARGUMENT_INTERCEPTORS_ARGLIST_SS, // ... server source TAO_ARGUMENT_INTERCEPTORS_INFO_ARGLIST_SS, // ... server source - TAO_ARGUMENT_ARGLIST_OTHERS, // ... in other cases - TAO_ARGUMENT_PRE_INVOKE_CS, // preprocessing of argument - // variable before passing to - // do_static_call (in stub) - TAO_ARGUMENT_INVOKE_CS, // passing argument variable to do_static_call - TAO_ARGUMENT_POST_INVOKE_CS, // postprocessing of argument - // variable after do_static_call - TAO_ARGUMENT_VARDECL_SS, // declaration of argument - // variable in skeleton (server) - TAO_ARGUMENT_MARSHAL_SS, // passing argument node to the - TAO_ARGUMENT_DEMARSHAL_SS, // demarshal and marshal - // operations - TAO_ARGUMENT_UPCALL_SS, // passing argument variable to upcall TAO_ARGUMENT_COLLOCATED_UPCALL_SS, // passing argument // variable to upcall - // emitting code for attributes. - TAO_ATTRIBUTE_BASE_PROXY_IMPL_CH, // Proxy Impl Related Attribute visitors. - - TAO_ATTRIBUTE_PROXY_IMPL_XH, - - TAO_ATTRIBUTE_REMOTE_PROXY_IMPL_CS, - TAO_ATTRIBUTE_THRU_POA_PROXY_IMPL_SS, - TAO_ATTRIBUTE_DIRECT_PROXY_IMPL_SS, - - TAO_ATTRIBUTE_SMART_PROXY_CH, // in client header - TAO_ATTRIBUTE_SMART_PROXY_CS, // in client source - TAO_ATTRIBUTE_INTERCEPTORS_CS, // in client source - TAO_ATTRIBUTE_INTERCEPTORS_SH, // in server header - TAO_ATTRIBUTE_INTERCEPTORS_SS, // in server source - // Emitting code for array defn. TAO_ARRAY_CH, // Emitting code for exceptions. TAO_EXCEPTION_CTOR_CH, TAO_EXCEPTION_CTOR_CS, - TAO_EXCEPTION_CTOR_ASSIGN_CS, // Emitting code for the interface. TAO_INTERFACE_CH, @@ -118,24 +78,8 @@ public: TAO_INTERFACE_INTERCEPTORS_CS, TAO_INTERFACE_INTERCEPTORS_SH, TAO_INTERFACE_INTERCEPTORS_SS, - TAO_INTERFACE_PROXY_BROKERS_CH, - TAO_INTERFACE_PROXY_BROKERS_CS, - TAO_INTERFACE_PROXY_BROKERS_SH, - TAO_INTERFACE_PROXY_BROKERS_SS, - TAO_INTERFACE_BASE_PROXY_BROKER_CH, - TAO_INTERFACE_BASE_PROXY_BROKER_CS, - TAO_INTERFACE_REMOTE_PROXY_BROKER_CH, - TAO_INTERFACE_REMOTE_PROXY_BROKER_CS, - TAO_INTERFACE_STRATEGIZED_PROXY_BROKER_SH, - TAO_INTERFACE_STRATEGIZED_PROXY_BROKER_SS, - TAO_INTERFACE_PROXY_IMPLS_CH, - TAO_INTERFACE_PROXY_IMPLS_CS, - - TAO_INTERFACE_PROXY_IMPLS_SH, - - TAO_INTERFACE_PROXY_IMPLS_SS, + TAO_INTERFACE_BASE_PROXY_IMPL_CH, - TAO_INTERFACE_BASE_PROXY_IMPL_CS, TAO_INTERFACE_REMOTE_PROXY_IMPL_CH, TAO_INTERFACE_REMOTE_PROXY_IMPL_CS, TAO_INTERFACE_THRU_POA_PROXY_IMPL_SH, @@ -144,7 +88,6 @@ public: TAO_INTERFACE_DIRECT_PROXY_IMPL_SS, // Emitting code for the AMH ResponseHandlers. - TAO_INTERFACE_AMH_RH_CH, TAO_INTERFACE_AMH_RH_SH, TAO_INTERFACE_AMH_RH_SS, @@ -152,14 +95,6 @@ public: TAO_VALUETYPE_OBV_CH, // OBV_ class TAO_VALUETYPE_OBV_CI, TAO_VALUETYPE_OBV_CS, - TAO_VALUETYPE_COLLOCATED_SH, - TAO_VALUETYPE_COLLOCATED_SS, - TAO_VALUETYPE_MARSHAL_CH, // the actual generation of CDR in header - TAO_VALUETYPE_MARSHAL_CS, // and the implementation, activated from: - TAO_VALUETYPE_INIT_CH, // _init -related generation - TAO_VALUETYPE_INIT_CI, // - TAO_VALUETYPE_INIT_CS, // - TAO_VALUETYPE_INIT_ARGLIST_CH,// unfortunately there are no CI and CS TAO_EVENTTYPE_OBV_CH, TAO_EVENTTYPE_OBV_CS, @@ -173,38 +108,14 @@ public: TAO_OPERATION_CH, // in client header TAO_OPERATION_CS, // in client stubs - TAO_OPERATION_BASE_PROXY_IMPL_CH, // Proxy_Impl operation gen. - // in client header - TAO_OPERATION_PROXY_IMPL_XH, - TAO_OPERATION_REMOTE_PROXY_IMPL_CS, - TAO_OPERATION_THRU_POA_PROXY_IMPL_SS, - TAO_OPERATION_DIRECT_PROXY_IMPL_SS, - - TAO_OPERATION_SMART_PROXY_CH, // in client header - TAO_OPERATION_SMART_PROXY_CS, // in client stubs - TAO_OPERATION_INTERCEPTORS_CH, // in client header - TAO_OPERATION_INTERCEPTORS_CS, // in client source - TAO_OPERATION_INTERCEPTORS_SH, // in server header - TAO_OPERATION_INTERCEPTORS_SS, // in server source - - TAO_OPERATION_RETTYPE_CH, // return type in client header op - // signature - TAO_OPERATION_INTERCEPTORS_INFO_RETTYPE_CH, // return type in client header op - // signature for RequestInfo class - TAO_OPERATION_RETTYPE_SH, // return type in server header op - // signature - TAO_OPERATION_RETTYPE_IS, // return type in client header op - TAO_OPERATION_RETTYPE_OTHERS, // ... in other cases - TAO_OPERATION_ARGLIST_CH, // parameter list in op signature - // ... for client header TAO_OPERATION_ARGLIST_SH, // ... for server header + TAO_OPERATION_INTERCEPTORS_ARGLIST_CH, // private member list list for request info TAO_OPERATION_INTERCEPTORS_INFO_ARGLIST_CH, // private member list list for request info TAO_OPERATION_INTERCEPTORS_INFO_ARGLIST_CS, // arglist for request info obj instantiation TAO_OPERATION_INTERCEPTORS_ARGLIST_CS, // private member list list for request info // ... for client source TAO_OPERATION_INTERCEPTORS_PARAMLIST, // create the paramlist on demand - TAO_OPERATION_INTERCEPTORS_RESULT, // create the result on demand TAO_OPERATION_INTERCEPTORS_EXCEPTLIST, // create the exceptionlist on demand TAO_OPERATION_INTERCEPTORS_ARGLIST_SH, // private member list list for request info TAO_OPERATION_INTERCEPTORS_INFO_ARGLIST_SH, // private member list list for request info @@ -220,36 +131,21 @@ public: TAO_OPERATION_ARGLIST_IH, // ... for implementation header TAO_OPERATION_ARGLIST_IS, // ... for implementation header TAO_OPERATION_ARGLIST_COLLOCATED_SH, // ... for collocated server - TAO_OPERATION_ARGLIST_OTHERS, // ... for all other cases - TAO_OPERATION_RETVAL_DECL_CS, // return value variable declaration - TAO_OPERATION_RETVAL_PRE_INVOKE_CS, // preprocessing for return value // before sending over the wire TAO_OPERATION_ARG_PRE_INVOKE_CS, // preprocessing of arguments - // before do_static_call - TAO_OPERATION_RETVAL_INVOKE_CS, // passing the return type // variable to do_static_call TAO_OPERATION_ARG_INVOKE_CS, // passing argument variable to do_static_call // after do_static_call TAO_OPERATION_ARG_POST_INVOKE_CS, // processing of arg after do_static_call - TAO_OPERATION_RETVAL_RETURN_CS, // returning the return type - // variable - TAO_OPERATION_EXCEPTLIST_CS, // generating the exception list - TAO_OPERATION_RETVAL_DECL_SS, // return type decl in skeleton TAO_OPERATION_ARG_DECL_SS, // argument decl in skeleton TAO_OPERATION_ARG_DEMARSHAL_SS, // and argument variables to the - TAO_OPERATION_RETVAL_MARSHAL_SS, // marshal and demarshal operations TAO_OPERATION_ARG_MARSHAL_SS, - TAO_OPERATION_RETVAL_ASSIGN_SS, // assigning to return type // variable TAO_OPERATION_ARG_UPCALL_SS, // variables to upcall TAO_OPERATION_COLLOCATED_ARG_UPCALL_SS, // variables to upcall for // collocated op - TAO_OPERATION_ARG_POST_UPCALL_SS, // return and argument variables TAO_OPERATION_INTERCEPTORS_ARG_INFO_CS, // Interceptor args TAO_OPERATION_INTERCEPTORS_ARG_INFO_SS, // Interceptor args - TAO_OPERATION_RESULT_SS, // XXXASG rm? - TAO_OPERATION_TIE_SH, - TAO_OPERATION_TIE_SI, TAO_OBV_OPERATION_ARGLIST_CH, // parameter list in obv op signature // ... for client header @@ -257,7 +153,6 @@ public: TAO_OBV_OPERATION_ARGLIST_SH, // ... for server header TAO_OBV_OPERATION_ARGLIST_IH, // ... for implementation header TAO_OBV_OPERATION_ARGLIST_IS, // ... for implementation header - TAO_OBV_OPERATION_ARGLIST_COLLOCATED_SH, // ... for collocated server TAO_OBV_OPERATION_ARGLIST_OTHERS, // ... for all other cases TAO_OBV_OPERATION_ARGLIST_IMPL_CH, // for implementations, e.g. exception holders TAO_OBV_OPERATION_ARGLIST_IMPL_CS, // for implementations, e.g. exception holders @@ -272,10 +167,6 @@ public: TAO_AMI_EXCEPTION_HOLDER_VALUETYPE_CS, TAO_AMI_EXCEPTION_HOLDER_RAISE_OPERATION_CS, - // AMH next state generation - TAO_OPERATION_AMH_RH_SH, - TAO_OPERATION_AMH_RH_SS, - // Emitting code for root. TAO_ROOT_CH, TAO_ROOT_CI, @@ -295,23 +186,12 @@ public: // Emitting code for sequence base type. TAO_SEQUENCE_BASE_CH, - TAO_SEQUENCE_BASE_CI, - TAO_SEQUENCE_BASE_CS, // For special sequnce elements. TAO_SEQELEM_RETTYPE_CH, - TAO_SEQELEM_RETTYPE_CI, - TAO_SEQELEM_RETTYPE_CS, // For sequence buffer types. TAO_SEQUENCE_BUFFER_TYPE_CH, - TAO_SEQUENCE_BUFFER_TYPE_CI, - TAO_SEQUENCE_BUFFER_TYPE_CS, - - // Emitting code for the discriminant. - TAO_UNION_DISCTYPEDEFN_CH, - TAO_UNION_DISCTYPEDEFN_CI, - TAO_UNION_DISCTYPEDEFN_CS, // Emitting code for the public members of the union. TAO_UNION_PUBLIC_CH, @@ -322,13 +202,6 @@ public: // Emitting code for private members of the union. TAO_UNION_PRIVATE_CH, - - // Emitting code for typecodes. - TAO_TYPECODE_DECL, - TAO_TYPECODE_DEFN, - - // Always must be last. - TAO_UNKNOWN }; enum LOOKUP_STRATEGY @@ -356,7 +229,6 @@ public: TAO_TC_DEFN_TYPECODE_NESTED, // nested tc TAO_TC_DEFN_ENCAPSULATION, // encapsulation - TAO_AMI_HANDLER_TC_DEFN_ENCAPSULATION, // encapsulation TAO_TC_DEFN_SCOPE, // scope TAO_TC_DEFN_TC_SIZE, // tc size computation diff --git a/TAO/TAO_IDL/fe/idl.ll b/TAO/TAO_IDL/fe/idl.ll index f20f40f3b90..bd30731ffc6 100644 --- a/TAO/TAO_IDL/fe/idl.ll +++ b/TAO/TAO_IDL/fe/idl.ll @@ -750,66 +750,77 @@ idl_atof(char *s) static char idl_escape_reader( char *str -) + ) { - if (str[0] != '\\') { - return str[0]; - } - - switch (str[1]) { - case 'n': - return '\n'; - case 't': - return '\t'; - case 'v': - return '\v'; - case 'b': - return '\b'; - case 'r': - return '\r'; - case 'f': - return '\f'; - case 'a': - return '\a'; - case '\\': - return '\\'; - case '\?': - return '?'; - case '\'': - return '\''; - case '"': - return '"'; - case 'x': - { - int i; - // hex value - for (i = 2; str[i] != '\0' && isxdigit(str[i]); i++) { - continue; - } - char save = str[i]; - str[i] = '\0'; - char out = (char)idl_atoui(&str[2], 16); - str[i] = save; - return out; - } - ACE_NOTREACHED (break;) - default: - // check for octal value - if (str[1] >= '0' && str[1] <= '7') { - int i; - for (i = 1; str[i] >= '0' && str[i] <= '7'; i++) { - continue; + if (str[0] != '\\') + { + return str[0]; + } + + switch (str[1]) + { + case 'n': + return '\n'; + case 't': + return '\t'; + case 'v': + return '\v'; + case 'b': + return '\b'; + case 'r': + return '\r'; + case 'f': + return '\f'; + case 'a': + return '\a'; + case '\\': + return '\\'; + case '\?': + return '?'; + case '\'': + return '\''; + case '"': + return '"'; + case 'x': + { + int i; + + // hex value + for (i = 2; str[i] != '\0' && isxdigit (str[i]); ++i) + { + continue; + } + + char save = str[i]; + str[i] = '\0'; + char out = (char)idl_atoui(&str[2], 16); + str[i] = save; + return out; + } + ACE_NOTREACHED (break;) + default: + // check for octal value + if (str[1] >= '0' && str[1] <= '7') + { + int i; + + for (i = 1; str[i] >= '0' && str[i] <= '7'; ++i) + { + continue; } - char save = str[i]; - str[i] = '\0'; - char out = (char)idl_atoui(&str[1], 8); - str[i] = save; - return out; - } else { + + char save = str[i]; + str[i] = '\0'; + char out = (char)idl_atoui(&str[1], 8); + str[i] = save; + return out; + } + else + { return str[1] - 'a'; } - ACE_NOTREACHED (break;) - } + ACE_NOTREACHED (break;) + } } /* * Convert escaped hex digits into a wchar diff --git a/TAO/TAO_IDL/fe/lex.yy.cpp b/TAO/TAO_IDL/fe/lex.yy.cpp index ffddd4238b8..83cac60250b 100644 --- a/TAO/TAO_IDL/fe/lex.yy.cpp +++ b/TAO/TAO_IDL/fe/lex.yy.cpp @@ -2951,66 +2951,77 @@ idl_atof(char *s) static char idl_escape_reader( char *str -) + ) { - if (str[0] != '\\') { - return str[0]; + if (str[0] != '\\') + { + return str[0]; } - switch (str[1]) { - case 'n': - return '\n'; - case 't': - return '\t'; - case 'v': - return '\v'; - case 'b': - return '\b'; - case 'r': - return '\r'; - case 'f': - return '\f'; - case 'a': - return '\a'; - case '\\': - return '\\'; - case '\?': - return '?'; - case '\'': - return '\''; - case '"': - return '"'; - case 'x': - { - int i; - // hex value - for (i = 2; str[i] != '\0' && isxdigit(str[i]); i++) { - continue; - } - char save = str[i]; - str[i] = '\0'; - char out = (char)idl_atoui(&str[2], 16); - str[i] = save; - return out; - } - ACE_NOTREACHED (break;) - default: - // check for octal value - if (str[1] >= '0' && str[1] <= '7') { - int i; - for (i = 1; str[i] >= '0' && str[i] <= '7'; i++) { - continue; + switch (str[1]) + { + case 'n': + return '\n'; + case 't': + return '\t'; + case 'v': + return '\v'; + case 'b': + return '\b'; + case 'r': + return '\r'; + case 'f': + return '\f'; + case 'a': + return '\a'; + case '\\': + return '\\'; + case '\?': + return '?'; + case '\'': + return '\''; + case '"': + return '"'; + case 'x': + { + int i; + + // hex value + for (i = 2; str[i] != '\0' && isxdigit(str[i]); ++i) + { + continue; + } + + char save = str[i]; + str[i] = '\0'; + char out = (char)idl_atoui(&str[2], 16); + str[i] = save; + return out; } - char save = str[i]; - str[i] = '\0'; - char out = (char)idl_atoui(&str[1], 8); - str[i] = save; - return out; - } else { - return str[1] - 'a'; - } - ACE_NOTREACHED (break;) - } + ACE_NOTREACHED (break;) + default: + // check for octal value + if (str[1] >= '0' && str[1] <= '7') + { + int i; + + for (i = 1; str[i] >= '0' && str[i] <= '7'; ++i) + { + continue; + } + + char save = str[i]; + str[i] = '\0'; + char out = (char)idl_atoui(&str[1], 8); + str[i] = save; + return out; + } + else + { + return str[1] - 'a'; + } + ACE_NOTREACHED (break;) + } } /* * Convert escaped hex digits into a wchar |