diff options
| author | parsons <parsons@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2005-02-15 05:07:04 +0000 |
|---|---|---|
| committer | parsons <parsons@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2005-02-15 05:07:04 +0000 |
| commit | 4d41b27dec39ebd713efcf681add7e90235a7f27 (patch) | |
| tree | 53739f1a6019d8f65b570ebd95b77f4022d57ed1 | |
| parent | 39de6a04c35038b8e4cc03260b928db0588ca921 (diff) | |
| download | ATCD-4d41b27dec39ebd713efcf681add7e90235a7f27.tar.gz | |
Mon Feb 14 23:05:55 2005 Jeff Parsons <j.parsons@vanderbilt.edu>
104 files changed, 368 insertions, 2273 deletions
diff --git a/TAO/ChangeLog b/TAO/ChangeLog index 1db99bb5990..cc83f974f1b 100644 --- a/TAO/ChangeLog +++ b/TAO/ChangeLog @@ -1,3 +1,130 @@ +Mon Feb 14 23:05:55 2005 Jeff Parsons <j.parsons@vanderbilt.edu> + + * TAO_IDL/ast/ast_recursive.cpp: + * TAO_IDL/be/be_eventtype.cpp: + * TAO_IDL/be/be_visitor_arg_traits.cpp: + * TAO_IDL/be/be_visitor_factory.cpp: + * TAO_IDL/be/be_visitor_module.cpp: + * TAO_IDL/be/be_visitor_root.cpp: + * TAO_IDL/be/be_visitor_valuetype.cpp: + * TAO_IDL/be/be_visitor_valuetype_fwd.cpp: + * TAO_IDL/be/be_visitor_module/module.cpp: + * TAO_IDL/be/be_visitor_root/root.cpp: + * TAO_IDL/be/be_visitor_valuetype/any_op_ch.cpp: + * TAO_IDL/be/be_visitor_valuetype/any_op_cs.cpp: + * TAO_IDL/be/be_visitor_valuetype/cdr_op_ch.cpp: + * TAO_IDL/be/be_visitor_valuetype/cdr_op_cs.cpp: + * TAO_IDL/be/be_visitor_valuetype/field_ch.cpp: + * TAO_IDL/be/be_visitor_valuetype/field_ci.cpp: + * TAO_IDL/be/be_visitor_valuetype/field_cs.cpp: + * TAO_IDL/be/be_visitor_valuetype/marshal_ch.cpp: + * TAO_IDL/be/be_visitor_valuetype/marshal_cs.cpp: + * TAO_IDL/be/be_visitor_valuetype/obv_module.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.cpp: + * TAO_IDL/be/be_visitor_valuetype/valuetype_init_ch.cpp: + * TAO_IDL/be/be_visitor_valuetype/valuetype_init_ci.cpp: + * TAO_IDL/be/be_visitor_valuetype/valuetype_init_cs.cpp: + * TAO_IDL/be/be_visitor_valuetype/valuetype_obv_ch.cpp: + * TAO_IDL/be/be_visitor_valuetype/valuetype_obv_ci.cpp: + * TAO_IDL/be/be_visitor_valuetype/valuetype_obv_cs.cpp: + * TAO_IDL/be/be_visitor_valuetype/valuetype_sh.cpp: + * TAO_IDL/be/be_visitor_valuetype/valuetype_si.cpp: + * TAO_IDL/be/be_visitor_valuetype/valuetype_ss.cpp: + * TAO_IDL/be/be_visitor_valuetype_fwd/any_op_ch.cpp: + * TAO_IDL/be/be_visitor_valuetype_fwd/cdr_op_ch.cpp: + * TAO_IDL/be/be_visitor_valuetype_fwd/valuetype_fwd_ch.cpp: + * TAO_IDL/be_include/be_codegen.h: + * TAO_IDL/be_include/be_visitor_valuetype/any_op_ch.h: + * TAO_IDL/be_include/be_visitor_valuetype/any_op_cs.h: + * TAO_IDL/be_include/be_visitor_valuetype/cdr_op_ch.h: + * TAO_IDL/be_include/be_visitor_valuetype/cdr_op_cs.h: + * TAO_IDL/be_include/be_visitor_valuetype/field_cdr_cs.h: + * TAO_IDL/be_include/be_visitor_valuetype/field_ch.h: + * TAO_IDL/be_include/be_visitor_valuetype/field_ci.h: + * TAO_IDL/be_include/be_visitor_valuetype/field_cs.h: + * TAO_IDL/be_include/be_visitor_valuetype/marshal_ch.h: + * TAO_IDL/be_include/be_visitor_valuetype/marshal_cs.h: + * TAO_IDL/be_include/be_visitor_valuetype/valuetype.h: + * TAO_IDL/be_include/be_visitor_valuetype/valuetype_ch.h: + * TAO_IDL/be_include/be_visitor_valuetype/valuetype_ci.h: + * TAO_IDL/be_include/be_visitor_valuetype/valuetype_cs.h: + * TAO_IDL/be_include/be_visitor_valuetype/valuetype_init.h: + * TAO_IDL/be_include/be_visitor_valuetype/valuetype_init_ch.h: + * TAO_IDL/be_include/be_visitor_valuetype/valuetype_init_ci.h: + * TAO_IDL/be_include/be_visitor_valuetype/valuetype_init_cs.h: + * TAO_IDL/be_include/be_visitor_valuetype/valuetype_obv_ch.h: + * TAO_IDL/be_include/be_visitor_valuetype/valuetype_obv_ci.h: + * TAO_IDL/be_include/be_visitor_valuetype/valuetype_obv_cs.h: + * TAO_IDL/be_include/be_visitor_valuetype/valuetype_sh.h: + * TAO_IDL/be_include/be_visitor_valuetype/valuetype_si.h: + * TAO_IDL/be_include/be_visitor_valuetype/valuetype_ss.h: + * TAO_IDL/be_include/be_visitor_valuetype_fwd/any_op_ch.h: + * TAO_IDL/be_include/be_visitor_valuetype_fwd/cdr_op_ch.h: + * TAO_IDL/be_include/be_visitor_valuetype_fwd/valuetype_fwd_ch.h: + + - Removed all eventtype visitors, they all just delegate to + the corresponding valuetype visitor. Added visit_eventtype() + methods to valuetype visitors where necessary so the delegation + can be done within the valuetype visitor itself and still + keep the polymorphism in be_eventtype::visit_eventtype(), + since the arg traits and ccm-preproc visitors still need + it. + + - Changed error checking to allow a struct/union/sequence/array + defined inside an interface to contain that interface + as a member or element type, that is, this is no longer + regarded by the IDL compiler as illegal recursion. + + - Fixed bug that aborted the IDL compiler when an eventtype + contained a constant declaration. Thanks to Steven Baker + <Steven_D_Baker@raytheon.com> for reporting the bug. + + * TAO_IDL/be/be_visitor_eventtype.cpp: + * TAO_IDL/be/be_visitor_eventtype_fwd.cpp: + * TAO_IDL/be/be_visitor_eventtype/any_op_ch.cpp: + * TAO_IDL/be/be_visitor_eventtype/any_op_cs.cpp: + * TAO_IDL/be/be_visitor_eventtype/cdr_op_ch.cpp: + * TAO_IDL/be/be_visitor_eventtype/cdr_op_ci.cpp: + * TAO_IDL/be/be_visitor_eventtype/cdr_op_cs.cpp: + * TAO_IDL/be/be_visitor_eventtype/eventtype_ch.cpp: + * TAO_IDL/be/be_visitor_eventtype/eventtype_ci.cpp: + * TAO_IDL/be/be_visitor_eventtype/eventtype_cs.cpp: + * TAO_IDL/be/be_visitor_eventtype/eventtype_obv_ch.cpp: + * TAO_IDL/be/be_visitor_eventtype/eventtype_obv_ci.cpp: + * TAO_IDL/be/be_visitor_eventtype/eventtype_obv_cs.cpp: + * TAO_IDL/be/be_visitor_eventtype/eventtype_sh.cpp: + * TAO_IDL/be/be_visitor_eventtype/eventtype_si.cpp: + * TAO_IDL/be/be_visitor_eventtype/eventtype_ss.cpp: + * TAO_IDL/be/be_visitor_eventtype_fwd/any_op_ch.cpp: + * TAO_IDL/be/be_visitor_eventtype_fwd/cdr_op_ch.cpp: + * TAO_IDL/be/be_visitor_eventtype_fwd/eventtype_fwd_ch.cpp: + * TAO_IDL/be_include/be_visitor_eventtype.h: + * TAO_IDL/be_include/be_visitor_eventtype_fwd.h: + * TAO_IDL/be_include/be_visitor_eventtype/any_op_ch.h: + * TAO_IDL/be_include/be_visitor_eventtype/any_op_cs.h: + * TAO_IDL/be_include/be_visitor_eventtype/cdr_op_ch.h: + * TAO_IDL/be_include/be_visitor_eventtype/cdr_op_ci.h: + * TAO_IDL/be_include/be_visitor_eventtype/cdr_op_cs.h: + * TAO_IDL/be_include/be_visitor_eventtype/eventtype_ch.h: + * TAO_IDL/be_include/be_visitor_eventtype/eventtype_ci.h: + * TAO_IDL/be_include/be_visitor_eventtype/eventtype_cs.h: + * TAO_IDL/be_include/be_visitor_eventtype/eventtype_obv_ch.h: + * TAO_IDL/be_include/be_visitor_eventtype/eventtype_obv_ci.h: + * TAO_IDL/be_include/be_visitor_eventtype/eventtype_obv_cs.h: + * TAO_IDL/be_include/be_visitor_eventtype/eventtype_sh.h: + * TAO_IDL/be_include/be_visitor_eventtype/eventtype_si.h: + * TAO_IDL/be_include/be_visitor_eventtype/eventtype_ss.h: + * TAO_IDL/be_include/be_visitor_eventtype_fwd/any_op_ch.h: + * TAO_IDL/be_include/be_visitor_eventtype_fwd/cdr_op_ch.h: + * TAO_IDL/be_include/be_visitor_eventtype_fwd/eventtype_fwd_ch.h: + + Files removed as part of the fix in the first listed item + above. + Mon Feb 14 09:25:27 2005 Ciju John <john_c@ociweb.com> * orbsvcs/tests/Notify/MT_Dispatching/run_test.pl: diff --git a/TAO/TAO_IDL/ast/ast_recursive.cpp b/TAO/TAO_IDL/ast/ast_recursive.cpp index 99fbca2ac38..d95c3cc6cd4 100644 --- a/TAO/TAO_IDL/ast/ast_recursive.cpp +++ b/TAO/TAO_IDL/ast/ast_recursive.cpp @@ -141,7 +141,7 @@ AST_illegal_recursive_type (AST_Decl *t) if (nt == AST_Decl::NT_interface) { // Check for interface->struct/union->....->interface nesting. - return AST_illegal_interface_recursion (t); +// return AST_illegal_interface_recursion (t); } else if (nt != AST_Decl::NT_struct && nt != AST_Decl::NT_union) { diff --git a/TAO/TAO_IDL/be/be_eventtype.cpp b/TAO/TAO_IDL/be/be_eventtype.cpp index 83fe7034d67..6f770a3158d 100644 --- a/TAO/TAO_IDL/be/be_eventtype.cpp +++ b/TAO/TAO_IDL/be/be_eventtype.cpp @@ -123,7 +123,8 @@ be_eventtype::~be_eventtype (void) { } -// Accept a visitor. +// The differences between valuetype and eventtype are too small +// to warrant a separate set of visitors. int be_eventtype::accept (be_visitor *visitor) { diff --git a/TAO/TAO_IDL/be/be_visitor_arg_traits.cpp b/TAO/TAO_IDL/be/be_visitor_arg_traits.cpp index 6d52adcc930..f05e3843777 100644 --- a/TAO/TAO_IDL/be/be_visitor_arg_traits.cpp +++ b/TAO/TAO_IDL/be/be_visitor_arg_traits.cpp @@ -688,6 +688,24 @@ be_visitor_arg_traits::visit_structure (be_structure *node) os->gen_endif (); + /* Set this before visiting the scope so things like + + interface foo + { + struct bar + { + .... + foo foo_member; + }; + + void op (in bar inarg); + }; + + will not cause infinite recursion in this visitor. + */ + + this->generated (node, I_TRUE); + if (this->visit_scope (node) != 0) { ACE_ERROR_RETURN ((LM_ERROR, @@ -696,7 +714,6 @@ be_visitor_arg_traits::visit_structure (be_structure *node) -1); } - this->generated (node, I_TRUE); return 0; } @@ -780,6 +797,24 @@ be_visitor_arg_traits::visit_union (be_union *node) os->gen_endif (); + /* Set this before visiting the scope so things like + + interface foo + { + struct bar + { + .... + foo foo_member; + }; + + void op (in bar inarg); + }; + + will not cause infinite recursion in this visitor. + */ + + this->generated (node, I_TRUE); + int status = this->visit_scope (node); if (status != 0) @@ -790,7 +825,6 @@ be_visitor_arg_traits::visit_union (be_union *node) -1); } - this->generated (node, I_TRUE); return 0; } diff --git a/TAO/TAO_IDL/be/be_visitor_eventtype.cpp b/TAO/TAO_IDL/be/be_visitor_eventtype.cpp deleted file mode 100644 index 3351a947161..00000000000 --- a/TAO/TAO_IDL/be/be_visitor_eventtype.cpp +++ /dev/null @@ -1,46 +0,0 @@ - -// $Id$ -// -/* -*- c++ -*- */ -// ============================================================================ -// -// = LIBRARY -// TAO IDL -// -// = FILENAME -// be_visitor_eventtype.cpp -// -// = DESCRIPTION -// Concrete visitor for the Eventtype class -// -// = AUTHOR -// Jeff Parsons -// -// ============================================================================ - -#include "ace/SString.h" - -#include "be_eventtype.h" - -#include "be_visitor_eventtype.h" -#include "be_visitor_valuetype.h" -#include "be_visitor_context.h" -#include "be_helper.h" - -#include "be_visitor_eventtype/eventtype_ch.cpp" -#include "be_visitor_eventtype/eventtype_ci.cpp" -#include "be_visitor_eventtype/eventtype_cs.cpp" -#include "be_visitor_eventtype/eventtype_sh.cpp" -#include "be_visitor_eventtype/eventtype_si.cpp" -#include "be_visitor_eventtype/eventtype_ss.cpp" -#include "be_visitor_eventtype/eventtype_obv_ch.cpp" -#include "be_visitor_eventtype/eventtype_obv_ci.cpp" -#include "be_visitor_eventtype/eventtype_obv_cs.cpp" -#include "be_visitor_eventtype/any_op_ch.cpp" -#include "be_visitor_eventtype/any_op_cs.cpp" -#include "be_visitor_eventtype/cdr_op_ch.cpp" -#include "be_visitor_eventtype/cdr_op_cs.cpp" - -ACE_RCSID (be, - be_visitor_eventtype, - "$Id$") diff --git a/TAO/TAO_IDL/be/be_visitor_eventtype/any_op_ch.cpp b/TAO/TAO_IDL/be/be_visitor_eventtype/any_op_ch.cpp deleted file mode 100644 index 23bf3f3950d..00000000000 --- a/TAO/TAO_IDL/be/be_visitor_eventtype/any_op_ch.cpp +++ /dev/null @@ -1,46 +0,0 @@ -// -// $Id$ -// - -// ============================================================================ -// -// = LIBRARY -// TAO IDL -// -// = FILENAME -// any_op_ch.cpp -// -// = DESCRIPTION -// Visitor generating Any operators for Eventtypes in the client header -// -// = AUTHOR -// Jeff Parsons -// -// ============================================================================ - -ACE_RCSID (be_visitor_eventtype, - any_op_ch, - "$Id$") - -// ****************************************************** -// Eventtype visitor for Any operators in the client header -// ****************************************************** - -be_visitor_eventtype_any_op_ch::be_visitor_eventtype_any_op_ch ( - be_visitor_context *ctx - ) - : be_visitor_valuetype (ctx) -{ -} - -be_visitor_eventtype_any_op_ch::~be_visitor_eventtype_any_op_ch (void) -{ -} - -int -be_visitor_eventtype_any_op_ch::visit_eventtype (be_eventtype *node) -{ - be_visitor_context ctx (*this->ctx_); - be_visitor_valuetype_any_op_ch visitor (&ctx); - return visitor.visit_valuetype (node); -} diff --git a/TAO/TAO_IDL/be/be_visitor_eventtype/any_op_cs.cpp b/TAO/TAO_IDL/be/be_visitor_eventtype/any_op_cs.cpp deleted file mode 100644 index 80474142c50..00000000000 --- a/TAO/TAO_IDL/be/be_visitor_eventtype/any_op_cs.cpp +++ /dev/null @@ -1,46 +0,0 @@ -// -// $Id$ -// - -// ============================================================================ -// -// = LIBRARY -// TAO IDL -// -// = FILENAME -// any_op_cs.cpp -// -// = DESCRIPTION -// Visitor generating Any operators for Eventtypes in the client source -// -// = AUTHOR -// Jeff Parsons -// -// ============================================================================ - -ACE_RCSID (be_visitor_eventtype, - any_op_cs, - "$Id$") - -// ****************************************************** -// Eventtype visitor for Any operators in the client source -// ****************************************************** - -be_visitor_eventtype_any_op_cs::be_visitor_eventtype_any_op_cs ( - be_visitor_context *ctx - ) - : be_visitor_valuetype (ctx) -{ -} - -be_visitor_eventtype_any_op_cs::~be_visitor_eventtype_any_op_cs (void) -{ -} - -int -be_visitor_eventtype_any_op_cs::visit_eventtype (be_eventtype *node) -{ - be_visitor_context ctx (*this->ctx_); - be_visitor_valuetype_any_op_cs visitor (&ctx); - return visitor.visit_valuetype (node); -} diff --git a/TAO/TAO_IDL/be/be_visitor_eventtype/cdr_op_ch.cpp b/TAO/TAO_IDL/be/be_visitor_eventtype/cdr_op_ch.cpp deleted file mode 100644 index b04d9ed516e..00000000000 --- a/TAO/TAO_IDL/be/be_visitor_eventtype/cdr_op_ch.cpp +++ /dev/null @@ -1,46 +0,0 @@ -// -// $Id$ -// - -// ============================================================================ -// -// = LIBRARY -// TAO IDL -// -// = FILENAME -// cdr_op_ch.cpp -// -// = DESCRIPTION -// Visitor generating CDR operators for Eventtypes in the client header -// -// = AUTHOR -// Jeff Parsons -// -// ============================================================================ - -ACE_RCSID (be_visitor_eventtype, - cdr_op_ch, - "$Id$") - -// ****************************************************** -// Eventtype visitor for CDR operators in the client header -// ****************************************************** - -be_visitor_eventtype_cdr_op_ch::be_visitor_eventtype_cdr_op_ch ( - be_visitor_context *ctx - ) - : be_visitor_valuetype (ctx) -{ -} - -be_visitor_eventtype_cdr_op_ch::~be_visitor_eventtype_cdr_op_ch (void) -{ -} - -int -be_visitor_eventtype_cdr_op_ch::visit_eventtype (be_eventtype *node) -{ - be_visitor_context ctx (*this->ctx_); - be_visitor_valuetype_cdr_op_ch visitor (&ctx); - return visitor.visit_valuetype (node); -} diff --git a/TAO/TAO_IDL/be/be_visitor_eventtype/cdr_op_ci.cpp b/TAO/TAO_IDL/be/be_visitor_eventtype/cdr_op_ci.cpp deleted file mode 100644 index 760703bb154..00000000000 --- a/TAO/TAO_IDL/be/be_visitor_eventtype/cdr_op_ci.cpp +++ /dev/null @@ -1,46 +0,0 @@ -// -// $Id$ -// - -// ============================================================================ -// -// = LIBRARY -// TAO IDL -// -// = FILENAME -// cdr_op_ci.cpp -// -// = DESCRIPTION -// Visitor generating CDR operators for Eventtypes in the client inline -// -// = AUTHOR -// Jeff Parsons -// -// ============================================================================ - -ACE_RCSID (be_visitor_eventtype, - cdr_op_ci, - "$Id$") - -// ****************************************************** -// Eventtype visitor for CDR operators in the client inline -// ****************************************************** - -be_visitor_eventtype_cdr_op_ci::be_visitor_eventtype_cdr_op_ci ( - be_visitor_context *ctx - ) - : be_visitor_valuetype (ctx) -{ -} - -be_visitor_eventtype_cdr_op_ci::~be_visitor_eventtype_cdr_op_ci (void) -{ -} - -int -be_visitor_eventtype_cdr_op_ci::visit_eventtype (be_eventtype *node) -{ - be_visitor_context ctx (*this->ctx_); - be_visitor_valuetype_cdr_op_ci visitor (&ctx); - return visitor.visit_valuetype (node); -} diff --git a/TAO/TAO_IDL/be/be_visitor_eventtype/cdr_op_cs.cpp b/TAO/TAO_IDL/be/be_visitor_eventtype/cdr_op_cs.cpp deleted file mode 100644 index 3c6456643f4..00000000000 --- a/TAO/TAO_IDL/be/be_visitor_eventtype/cdr_op_cs.cpp +++ /dev/null @@ -1,46 +0,0 @@ -// -// $Id$ -// - -// ============================================================================ -// -// = LIBRARY -// TAO IDL -// -// = FILENAME -// cdr_op_cs.cpp -// -// = DESCRIPTION -// Visitor generating CDR operators for Eventtypes in the client source -// -// = AUTHOR -// Jeff Parsons -// -// ============================================================================ - -ACE_RCSID (be_visitor_eventtype, - cdr_op_cs, - "$Id$") - -// ****************************************************** -// Eventtype visitor for CDR operators in the client source -// ****************************************************** - -be_visitor_eventtype_cdr_op_cs::be_visitor_eventtype_cdr_op_cs ( - be_visitor_context *ctx - ) - : be_visitor_valuetype (ctx) -{ -} - -be_visitor_eventtype_cdr_op_cs::~be_visitor_eventtype_cdr_op_cs (void) -{ -} - -int -be_visitor_eventtype_cdr_op_cs::visit_eventtype (be_eventtype *node) -{ - be_visitor_context ctx (*this->ctx_); - be_visitor_valuetype_cdr_op_cs visitor (&ctx); - return visitor.visit_valuetype (node); -} diff --git a/TAO/TAO_IDL/be/be_visitor_eventtype/eventtype_ch.cpp b/TAO/TAO_IDL/be/be_visitor_eventtype/eventtype_ch.cpp deleted file mode 100644 index 87514072e0d..00000000000 --- a/TAO/TAO_IDL/be/be_visitor_eventtype/eventtype_ch.cpp +++ /dev/null @@ -1,68 +0,0 @@ -// -// $Id$ -// - -// ============================================================================ -// -// = LIBRARY -// TAO IDL -// -// = FILENAME -// eventtype_ch.cpp -// -// = DESCRIPTION -// Visitor generating code for Eventtypes in the client header -// -// = AUTHOR -// Jeff Parsons -// -// ============================================================================ - -ACE_RCSID (be_visitor_eventtype, - eventtype_ch, - "$Id$") - -// ****************************************************** -// Eventtype visitor for client header -// ****************************************************** - -be_visitor_eventtype_ch::be_visitor_eventtype_ch (be_visitor_context *ctx) - : be_visitor_valuetype (ctx) -{ -} - -be_visitor_eventtype_ch::~be_visitor_eventtype_ch (void) -{ -} - -int -be_visitor_eventtype_ch::visit_eventtype (be_eventtype *node) -{ - if (node->cli_hdr_gen () || node->imported ()) - { - return 0; - } - - TAO_OutStream *os = this->ctx_->stream (); - - *os << be_nl << be_nl << "// TAO_IDL - Generated from" << be_nl - << "// " << __FILE__ << ":" << __LINE__; - - // All we do in this is generate a forward declaration of the - // corresponding consumer interface class. - *os << be_nl << be_nl << "class " << node->local_name () << "Consumer;"; - - // Generate the ifdefined macro for the _ptr type. - os->gen_ifdef_macro (node->flat_name (), "Consumer_ptr"); - - // Generate the _ptr typedef. - *os << be_nl << be_nl - << "typedef " << node->local_name () << "Consumer *" << node->local_name () - << "Consumer_ptr;"; - - os->gen_endif (); - - be_visitor_context ctx (*this->ctx_); - be_visitor_valuetype_ch visitor (&ctx); - return visitor.visit_valuetype (node); -} diff --git a/TAO/TAO_IDL/be/be_visitor_eventtype/eventtype_ci.cpp b/TAO/TAO_IDL/be/be_visitor_eventtype/eventtype_ci.cpp deleted file mode 100644 index 8f877b580cb..00000000000 --- a/TAO/TAO_IDL/be/be_visitor_eventtype/eventtype_ci.cpp +++ /dev/null @@ -1,44 +0,0 @@ -// -// $Id$ -// - -// ============================================================================ -// -// = LIBRARY -// TAO IDL -// -// = FILENAME -// eventtype_ci.cpp -// -// = DESCRIPTION -// Visitor generating code for Eventtypes in the client inline -// -// = AUTHOR -// Jeff Parsons -// -// ============================================================================ - -ACE_RCSID (be_visitor_eventtype, - eventtype_ci, - "$Id$") - -// ****************************************************** -// Eventtype visitor for client inline -// ****************************************************** - -be_visitor_eventtype_ci::be_visitor_eventtype_ci (be_visitor_context *ctx) - : be_visitor_valuetype (ctx) -{ -} - -be_visitor_eventtype_ci::~be_visitor_eventtype_ci (void) -{ -} - -int -be_visitor_eventtype_ci::visit_eventtype (be_eventtype *node) -{ - be_visitor_context ctx (*this->ctx_); - be_visitor_valuetype_ci visitor (&ctx); - return visitor.visit_valuetype (node); -} diff --git a/TAO/TAO_IDL/be/be_visitor_eventtype/eventtype_cs.cpp b/TAO/TAO_IDL/be/be_visitor_eventtype/eventtype_cs.cpp deleted file mode 100644 index 4dd1b75cb3a..00000000000 --- a/TAO/TAO_IDL/be/be_visitor_eventtype/eventtype_cs.cpp +++ /dev/null @@ -1,44 +0,0 @@ -// -// $Id$ -// - -// ============================================================================ -// -// = LIBRARY -// TAO IDL -// -// = FILENAME -// eventtype_cs.cpp -// -// = DESCRIPTION -// Visitor generating code for Eventtypes in the client source -// -// = AUTHOR -// Jeff Parsons -// -// ============================================================================ - -ACE_RCSID (be_visitor_eventtype, - eventtype_cs, - "$Id$") - -// ****************************************************** -// Eventtype visitor for client source -// ****************************************************** - -be_visitor_eventtype_cs::be_visitor_eventtype_cs (be_visitor_context *ctx) - : be_visitor_valuetype (ctx) -{ -} - -be_visitor_eventtype_cs::~be_visitor_eventtype_cs (void) -{ -} - -int -be_visitor_eventtype_cs::visit_eventtype (be_eventtype *node) -{ - be_visitor_context ctx (*this->ctx_); - be_visitor_valuetype_cs visitor (&ctx); - return visitor.visit_valuetype (node); -} diff --git a/TAO/TAO_IDL/be/be_visitor_eventtype/eventtype_obv_ch.cpp b/TAO/TAO_IDL/be/be_visitor_eventtype/eventtype_obv_ch.cpp deleted file mode 100644 index f0164d197ec..00000000000 --- a/TAO/TAO_IDL/be/be_visitor_eventtype/eventtype_obv_ch.cpp +++ /dev/null @@ -1,51 +0,0 @@ - -// -// $Id$ -// - -// ============================================================================ -// -// = LIBRARY -// TAO IDL -// -// = FILENAME -// eventtype_obv_ch.cpp -// -// = DESCRIPTION -// Visitor generating code for Eventtypes in the client header -// OBV_ class -// (see C++ mapping OMG 20.17) -// -// = AUTHOR -// Jeff Parsons -// -// ============================================================================ - -ACE_RCSID (be_visitor_eventtype, - eventtype_obv_ch, - "$Id$") - -// ****************************************************** -// Eventtype visitor for client header -// ****************************************************** - -be_visitor_eventtype_obv_ch::be_visitor_eventtype_obv_ch ( - be_visitor_context *ctx - ) - : be_visitor_valuetype (ctx) -{ -} - -be_visitor_eventtype_obv_ch::~be_visitor_eventtype_obv_ch (void) -{ -} - - -// OBV_ class must be in OBV_ namespace. -int -be_visitor_eventtype_obv_ch::visit_eventtype (be_eventtype *node) -{ - be_visitor_context ctx (*this->ctx_); - be_visitor_valuetype_obv_ch visitor (&ctx); - return visitor.visit_valuetype (node); -} diff --git a/TAO/TAO_IDL/be/be_visitor_eventtype/eventtype_obv_ci.cpp b/TAO/TAO_IDL/be/be_visitor_eventtype/eventtype_obv_ci.cpp deleted file mode 100644 index 17a50567d75..00000000000 --- a/TAO/TAO_IDL/be/be_visitor_eventtype/eventtype_obv_ci.cpp +++ /dev/null @@ -1,51 +0,0 @@ - -// -// $Id$ -// - -// ============================================================================ -// -// = LIBRARY -// TAO IDL -// -// = FILENAME -// eventtype_obv_ci.cpp -// -// = DESCRIPTION -// Visitor generating code for Eventtypes in the client inline -// OBV_ class -// (see C++ mapping OMG 20.17) -// -// = AUTHOR -// Jeff Parsons -// -// ============================================================================ - -ACE_RCSID (be_visitor_eventtype, - eventtype_obv_ci, - "$Id$") - -// ****************************************************** -// Eventtype visitor for client inline -// ****************************************************** - -be_visitor_eventtype_obv_ci::be_visitor_eventtype_obv_ci ( - be_visitor_context *ctx - ) - : be_visitor_valuetype (ctx) -{ -} - -be_visitor_eventtype_obv_ci::~be_visitor_eventtype_obv_ci (void) -{ -} - - -// OBV_ class must be in OBV_ namespace. -int -be_visitor_eventtype_obv_ci::visit_eventtype (be_eventtype *node) -{ - be_visitor_context ctx (*this->ctx_); - be_visitor_valuetype_obv_ci visitor (&ctx); - return visitor.visit_valuetype (node); -} diff --git a/TAO/TAO_IDL/be/be_visitor_eventtype/eventtype_obv_cs.cpp b/TAO/TAO_IDL/be/be_visitor_eventtype/eventtype_obv_cs.cpp deleted file mode 100644 index 01b917396d4..00000000000 --- a/TAO/TAO_IDL/be/be_visitor_eventtype/eventtype_obv_cs.cpp +++ /dev/null @@ -1,51 +0,0 @@ - -// -// $Id$ -// - -// ============================================================================ -// -// = LIBRARY -// TAO IDL -// -// = FILENAME -// eventtype_obv_cs.cpp -// -// = DESCRIPTION -// Visitor generating code for Eventtypes in the client stub -// OBV_ class -// (see C++ mapping OMG 20.17) -// -// = AUTHOR -// Jeff Parsons -// -// ============================================================================ - -ACE_RCSID (be_visitor_eventtype, - eventtype_obv_cs, - "$Id$") - -// ****************************************************** -// Eventtype visitor for client stub -// ****************************************************** - -be_visitor_eventtype_obv_cs::be_visitor_eventtype_obv_cs ( - be_visitor_context *ctx - ) - : be_visitor_valuetype (ctx) -{ -} - -be_visitor_eventtype_obv_cs::~be_visitor_eventtype_obv_cs (void) -{ -} - - -// OBV_ class must be in OBV_ namespace. -int -be_visitor_eventtype_obv_cs::visit_eventtype (be_eventtype *node) -{ - be_visitor_context ctx (*this->ctx_); - be_visitor_valuetype_obv_cs visitor (&ctx); - return visitor.visit_valuetype (node); -} diff --git a/TAO/TAO_IDL/be/be_visitor_eventtype/eventtype_sh.cpp b/TAO/TAO_IDL/be/be_visitor_eventtype/eventtype_sh.cpp deleted file mode 100644 index 4bb72071b58..00000000000 --- a/TAO/TAO_IDL/be/be_visitor_eventtype/eventtype_sh.cpp +++ /dev/null @@ -1,44 +0,0 @@ -// -// $Id$ -// - -// ============================================================================ -// -// = LIBRARY -// TAO IDL -// -// = FILENAME -// eventtype_sh.cpp -// -// = DESCRIPTION -// Visitor generating code for Eventtypes in the server header -// -// = AUTHOR -// Jeff Parsons -// -// ============================================================================ - -ACE_RCSID (be_visitor_eventtype, - eventtype_sh, - "$Id$") - -// ****************************************************** -// Eventtype visitor for server header -// ****************************************************** - -be_visitor_eventtype_sh::be_visitor_eventtype_sh (be_visitor_context *ctx) - : be_visitor_valuetype (ctx) -{ -} - -be_visitor_eventtype_sh::~be_visitor_eventtype_sh (void) -{ -} - -int -be_visitor_eventtype_sh::visit_eventtype (be_eventtype *node) -{ - be_visitor_context ctx (*this->ctx_); - be_visitor_valuetype_sh visitor (&ctx); - return visitor.visit_valuetype (node); -} diff --git a/TAO/TAO_IDL/be/be_visitor_eventtype/eventtype_si.cpp b/TAO/TAO_IDL/be/be_visitor_eventtype/eventtype_si.cpp deleted file mode 100644 index 76112de4454..00000000000 --- a/TAO/TAO_IDL/be/be_visitor_eventtype/eventtype_si.cpp +++ /dev/null @@ -1,44 +0,0 @@ -// -// $Id$ -// - -// ============================================================================ -// -// = LIBRARY -// TAO IDL -// -// = FILENAME -// eventtype_si.cpp -// -// = DESCRIPTION -// Visitor generating code for Eventtypes in the server inline -// -// = AUTHOR -// Jeff Parsons -// -// ============================================================================ - -ACE_RCSID (be_visitor_eventtype, - eventtype_si, - "$Id$") - -// ****************************************************** -// Eventtype visitor for server inline -// ****************************************************** - -be_visitor_eventtype_si::be_visitor_eventtype_si (be_visitor_context *ctx) - : be_visitor_valuetype (ctx) -{ -} - -be_visitor_eventtype_si::~be_visitor_eventtype_si (void) -{ -} - -int -be_visitor_eventtype_si::visit_eventtype (be_eventtype *node) -{ - be_visitor_context ctx (*this->ctx_); - be_visitor_valuetype_si visitor (&ctx); - return visitor.visit_valuetype (node); -} diff --git a/TAO/TAO_IDL/be/be_visitor_eventtype/eventtype_ss.cpp b/TAO/TAO_IDL/be/be_visitor_eventtype/eventtype_ss.cpp deleted file mode 100644 index ed8433bd9a0..00000000000 --- a/TAO/TAO_IDL/be/be_visitor_eventtype/eventtype_ss.cpp +++ /dev/null @@ -1,44 +0,0 @@ -// -// $Id$ -// - -// ============================================================================ -// -// = LIBRARY -// TAO IDL -// -// = FILENAME -// eventtype_ss.cpp -// -// = DESCRIPTION -// Visitor generating code for Eventtypes in the server source -// -// = AUTHOR -// Jeff Parsons -// -// ============================================================================ - -ACE_RCSID (be_visitor_eventtype, - eventtype_ss, - "$Id$") - -// ****************************************************** -// Eventtype visitor for server source -// ****************************************************** - -be_visitor_eventtype_ss::be_visitor_eventtype_ss (be_visitor_context *ctx) - : be_visitor_valuetype (ctx) -{ -} - -be_visitor_eventtype_ss::~be_visitor_eventtype_ss (void) -{ -} - -int -be_visitor_eventtype_ss::visit_eventtype (be_eventtype *node) -{ - be_visitor_context ctx (*this->ctx_); - be_visitor_valuetype_ss visitor (&ctx); - return visitor.visit_valuetype (node); -} diff --git a/TAO/TAO_IDL/be/be_visitor_eventtype_fwd.cpp b/TAO/TAO_IDL/be/be_visitor_eventtype_fwd.cpp deleted file mode 100644 index b68da9d5a75..00000000000 --- a/TAO/TAO_IDL/be/be_visitor_eventtype_fwd.cpp +++ /dev/null @@ -1,35 +0,0 @@ -// -// $Id$ -// - -// ============================================================================ -// -// = LIBRARY -// TAO IDL -// -// = FILENAME -// be_visitor_eventtype_fwd.cpp -// -// = DESCRIPTION -// Visitors for generation of code for Eventtype_Fwd -// -// = AUTHOR -// Jeff Parsons -// -// ============================================================================ - -#include "be_eventtype_fwd.h" - -#include "be_visitor_eventtype_fwd.h" -#include "be_visitor_valuetype_fwd.h" -#include "be_visitor_context.h" -#include "be_helper.h" - -#include "be_visitor_eventtype_fwd/eventtype_fwd_ch.cpp" -#include "be_visitor_eventtype_fwd/any_op_ch.cpp" -#include "be_visitor_eventtype_fwd/cdr_op_ch.cpp" - -ACE_RCSID (be, - be_visitor_eventtype_fwd, - "$Id$") - diff --git a/TAO/TAO_IDL/be/be_visitor_eventtype_fwd/any_op_ch.cpp b/TAO/TAO_IDL/be/be_visitor_eventtype_fwd/any_op_ch.cpp deleted file mode 100644 index 86116afede8..00000000000 --- a/TAO/TAO_IDL/be/be_visitor_eventtype_fwd/any_op_ch.cpp +++ /dev/null @@ -1,43 +0,0 @@ -// -// $Id$ -// - -// ============================================================================ -// -// = LIBRARY -// TAO IDL -// -// = FILENAME -// any_op_ch.cpp -// -// = DESCRIPTION -// Visitor generating Any operators for EventTypeFwd node in the -// client header. -// -// = AUTHOR -// Jeff Parsons -// -// ============================================================================ - -ACE_RCSID (be_visitor_eventtype_fwd, - any_op_ch, - "$Id$") - -be_visitor_eventtype_fwd_any_op_ch::be_visitor_eventtype_fwd_any_op_ch ( - be_visitor_context *ctx - ) - : be_visitor_decl (ctx) -{ -} - -be_visitor_eventtype_fwd_any_op_ch::~be_visitor_eventtype_fwd_any_op_ch (void) -{ -} - -int -be_visitor_eventtype_fwd_any_op_ch::visit_eventtype_fwd (be_eventtype_fwd *node) -{ - be_visitor_context ctx (*this->ctx_); - be_visitor_valuetype_fwd_any_op_ch visitor (&ctx); - return visitor.visit_valuetype_fwd (node); -} diff --git a/TAO/TAO_IDL/be/be_visitor_eventtype_fwd/cdr_op_ch.cpp b/TAO/TAO_IDL/be/be_visitor_eventtype_fwd/cdr_op_ch.cpp deleted file mode 100644 index 15858b3e88e..00000000000 --- a/TAO/TAO_IDL/be/be_visitor_eventtype_fwd/cdr_op_ch.cpp +++ /dev/null @@ -1,43 +0,0 @@ -// -// $Id$ -// - -// ============================================================================ -// -// = LIBRARY -// TAO IDL -// -// = FILENAME -// eventtype_fwd_cdr_op_ch.cpp -// -// = DESCRIPTION -// Visitor generating CDR operators for EventTypeFwd node in the -// client header. -// -// = AUTHOR -// Jeff Parsons -// -// ============================================================================ - -ACE_RCSID (be_visitor_eventtype_fwd, - eventtype_fwd_cdr_op_ch, - "$Id$") - -be_visitor_eventtype_fwd_cdr_op_ch::be_visitor_eventtype_fwd_cdr_op_ch ( - be_visitor_context *ctx - ) - : be_visitor_decl (ctx) -{ -} - -be_visitor_eventtype_fwd_cdr_op_ch::~be_visitor_eventtype_fwd_cdr_op_ch (void) -{ -} - -int -be_visitor_eventtype_fwd_cdr_op_ch::visit_eventtype_fwd (be_eventtype_fwd *node) -{ - be_visitor_context ctx (*this->ctx_); - be_visitor_valuetype_fwd_cdr_op_ch visitor (&ctx); - return visitor.visit_valuetype_fwd (node); -} diff --git a/TAO/TAO_IDL/be/be_visitor_eventtype_fwd/eventtype_fwd_ch.cpp b/TAO/TAO_IDL/be/be_visitor_eventtype_fwd/eventtype_fwd_ch.cpp deleted file mode 100644 index 7f0d8c8d21c..00000000000 --- a/TAO/TAO_IDL/be/be_visitor_eventtype_fwd/eventtype_fwd_ch.cpp +++ /dev/null @@ -1,66 +0,0 @@ -// -// $Id$ -// - -// ============================================================================ -// -// = LIBRARY -// TAO IDL -// -// = FILENAME -// eventtype_fwd_ch.cpp -// -// = DESCRIPTION -// Visitor generating code for EventTypeFwd node in the client header. -// -// = AUTHOR -// Jeff Parsons -// -// ============================================================================ - -ACE_RCSID (be_visitor_eventtype_fwd, - eventtype_fwd_ch, - "$Id$") - -be_visitor_eventtype_fwd_ch::be_visitor_eventtype_fwd_ch ( - be_visitor_context *ctx - ) - : be_visitor_decl (ctx) -{ -} - -be_visitor_eventtype_fwd_ch::~be_visitor_eventtype_fwd_ch (void) -{ -} - -int -be_visitor_eventtype_fwd_ch::visit_eventtype_fwd (be_eventtype_fwd *node) -{ - if (node->cli_hdr_gen () || node->imported ()) - { - return 0; - } - - TAO_OutStream *os = this->ctx_->stream (); - - *os << be_nl << be_nl << "// TAO_IDL - Generated from" << be_nl - << "// " << __FILE__ << ":" << __LINE__; - - // All we do in this is generate a forward declaration of the - // corresponding consumer interface class. - *os << be_nl << be_nl << "class " << node->local_name () << "Consumer;"; - - // Generate the ifdefined macro for the _ptr type. - os->gen_ifdef_macro (node->flat_name (), "Consumer_ptr"); - - // Generate the _ptr typedef. - *os << be_nl << be_nl - << "typedef " << node->local_name () << "Consumer *" << node->local_name () - << "Consumer_ptr;"; - - os->gen_endif (); - - be_visitor_context ctx (*this->ctx_); - be_visitor_valuetype_fwd_ch visitor (&ctx); - return visitor.visit_valuetype_fwd (node); -} diff --git a/TAO/TAO_IDL/be/be_visitor_factory.cpp b/TAO/TAO_IDL/be/be_visitor_factory.cpp index 84e541a3035..2a228ffe01d 100644 --- a/TAO/TAO_IDL/be/be_visitor_factory.cpp +++ b/TAO/TAO_IDL/be/be_visitor_factory.cpp @@ -33,8 +33,6 @@ #include "be_visitor_valuetype/valuetype_ch.h" #include "be_visitor_valuetype/valuetype_obv_ch.h" #include "be_visitor_valuetype/valuetype_obv_cs.h" -#include "be_visitor_eventtype/eventtype_obv_ch.h" -#include "be_visitor_eventtype/eventtype_obv_cs.h" #include "be_visitor_valuetype/ami_exception_holder_ch.h" #include "be_visitor_valuetype/ami_exception_holder_cs.h" #include "be_visitor_operation/operation.h" @@ -80,16 +78,6 @@ TAO_Visitor_Factory::make_visitor (be_visitor_context *ctx) be_visitor_valuetype_obv_cs (ctx), 0); break; - case TAO_CodeGen::TAO_EVENTTYPE_OBV_CH: - ACE_NEW_RETURN (retval, - be_visitor_eventtype_obv_ch (ctx), - 0); - break; - case TAO_CodeGen::TAO_EVENTTYPE_OBV_CS: - ACE_NEW_RETURN (retval, - be_visitor_eventtype_obv_cs (ctx), - 0); - break; case TAO_CodeGen::TAO_OPERATION_CH: ACE_NEW_RETURN (retval, be_visitor_operation_ch (ctx), diff --git a/TAO/TAO_IDL/be/be_visitor_module.cpp b/TAO/TAO_IDL/be/be_visitor_module.cpp index 6a8bfc29f89..296a97fb111 100644 --- a/TAO/TAO_IDL/be/be_visitor_module.cpp +++ b/TAO/TAO_IDL/be/be_visitor_module.cpp @@ -53,8 +53,8 @@ #include "be_visitor_union_fwd.h" #include "be_visitor_valuetype.h" #include "be_visitor_valuetype_fwd.h" -#include "be_visitor_eventtype.h" -#include "be_visitor_eventtype_fwd.h" +//#include "be_visitor_eventtype.h" +//#include "be_visitor_eventtype_fwd.h" #include "be_visitor_component.h" #include "be_visitor_component_fwd.h" #include "be_visitor_home.h" diff --git a/TAO/TAO_IDL/be/be_visitor_module/module.cpp b/TAO/TAO_IDL/be/be_visitor_module/module.cpp index 2fbd779d4cd..063a22f5bf4 100644 --- a/TAO/TAO_IDL/be/be_visitor_module/module.cpp +++ b/TAO/TAO_IDL/be/be_visitor_module/module.cpp @@ -573,133 +573,13 @@ be_visitor_module::visit_valuetype_fwd (be_valuetype_fwd *node) int be_visitor_module::visit_eventtype (be_eventtype *node) { - // Instantiate a visitor context with a copy of our context. This info - // will be modified based on what type of node we are visiting - be_visitor_context ctx (*this->ctx_); - ctx.node (node); - int status = 0; - - switch (this->ctx_->state ()) - { - case TAO_CodeGen::TAO_ROOT_CH: - { - be_visitor_eventtype_ch visitor (&ctx); - status = node->accept (&visitor); - break; - } - case TAO_CodeGen::TAO_ROOT_CI: - { - be_visitor_eventtype_ci visitor (&ctx); - status = node->accept (&visitor); - break; - } - case TAO_CodeGen::TAO_ROOT_CS: - { - be_visitor_eventtype_cs visitor (&ctx); - status = node->accept (&visitor); - break; - } - case TAO_CodeGen::TAO_ROOT_CDR_OP_CH: - { - be_visitor_eventtype_cdr_op_ch visitor (&ctx); - status = node->accept (&visitor); - break; - } - case TAO_CodeGen::TAO_ROOT_CDR_OP_CS: - { - be_visitor_eventtype_cdr_op_cs visitor (&ctx); - status = node->accept (&visitor); - break; - } - case TAO_CodeGen::TAO_ROOT_ANY_OP_CH: - { - be_visitor_eventtype_any_op_ch visitor (&ctx); - status = node->accept (&visitor); - break; - } - case TAO_CodeGen::TAO_ROOT_ANY_OP_CS: - { - be_visitor_eventtype_any_op_cs visitor (&ctx); - status = node->accept (&visitor); - break; - } - case TAO_CodeGen::TAO_ROOT_SH: - { - be_visitor_eventtype_sh visitor (&ctx); - status = node->accept (&visitor); - break; - } - case TAO_CodeGen::TAO_ROOT_SI: - { - be_visitor_eventtype_si visitor (&ctx); - status = node->accept (&visitor); - break; - } - case TAO_CodeGen::TAO_ROOT_SS: - { - be_visitor_eventtype_ss visitor (&ctx); - status = node->accept (&visitor); - break; - } - default: - return 0; // nothing to do. - } - - if (status == -1) - { - ACE_ERROR_RETURN ((LM_ERROR, - "(%N:%l) be_visitor_module::" - "visit_eventtype - " - "failed to accept visitor\n"), - -1); - } - - return 0; + return this->visit_valuetype (node); } int be_visitor_module::visit_eventtype_fwd (be_eventtype_fwd *node) { - // Instantiate a visitor context with a copy of our context. This info - // will be modified based on what type of node we are visiting. - be_visitor_context ctx (*this->ctx_); - ctx.node (node); - int status = 0; - - switch (this->ctx_->state ()) - { - case TAO_CodeGen::TAO_ROOT_CH: - { - be_visitor_eventtype_fwd_ch visitor (&ctx); - status = node->accept (&visitor); - break; - } - case TAO_CodeGen::TAO_ROOT_ANY_OP_CH: - { - be_visitor_eventtype_fwd_any_op_ch visitor (&ctx); - status = node->accept (&visitor); - break; - } - case TAO_CodeGen::TAO_ROOT_CDR_OP_CH: - { - be_visitor_eventtype_fwd_cdr_op_ch visitor (&ctx); - status = node->accept (&visitor); - break; - } - default: - return 0; // nothing to be done - } - - if (status == -1) - { - ACE_ERROR_RETURN ((LM_ERROR, - "(%N:%l) be_visitor_module::" - "visit_eventtype_fwd - " - "failed to accept visitor\n"), - -1); - } - - return 0; + return this->visit_valuetype_fwd (node); } int diff --git a/TAO/TAO_IDL/be/be_visitor_root.cpp b/TAO/TAO_IDL/be/be_visitor_root.cpp index 567c4a4ee42..5dd2cac3f79 100644 --- a/TAO/TAO_IDL/be/be_visitor_root.cpp +++ b/TAO/TAO_IDL/be/be_visitor_root.cpp @@ -52,8 +52,8 @@ #include "be_visitor_union_fwd.h" #include "be_visitor_valuetype.h" #include "be_visitor_valuetype_fwd.h" -#include "be_visitor_eventtype.h" -#include "be_visitor_eventtype_fwd.h" +//#include "be_visitor_eventtype.h" +//#include "be_visitor_eventtype_fwd.h" #include "be_visitor_component.h" #include "be_visitor_component_fwd.h" #include "be_visitor_home.h" diff --git a/TAO/TAO_IDL/be/be_visitor_root/root.cpp b/TAO/TAO_IDL/be/be_visitor_root/root.cpp index ea8ac913eea..3cc1fb40633 100644 --- a/TAO/TAO_IDL/be/be_visitor_root/root.cpp +++ b/TAO/TAO_IDL/be/be_visitor_root/root.cpp @@ -961,133 +961,13 @@ be_visitor_root::visit_valuetype_fwd (be_valuetype_fwd *node) int be_visitor_root::visit_eventtype (be_eventtype *node) { - // Instantiate a visitor context with a copy of our context. This info - // will be modified based on what type of node we are visiting - be_visitor_context ctx (*this->ctx_); - ctx.node (node); - int status = 0; - - switch (this->ctx_->state ()) - { - case TAO_CodeGen::TAO_ROOT_CH: - { - be_visitor_eventtype_ch visitor (&ctx); - status = node->accept (&visitor); - break; - } - case TAO_CodeGen::TAO_ROOT_CI: - { - be_visitor_eventtype_ci visitor (&ctx); - status = node->accept (&visitor); - break; - } - case TAO_CodeGen::TAO_ROOT_CS: - { - be_visitor_eventtype_cs visitor (&ctx); - status = node->accept (&visitor); - break; - } - case TAO_CodeGen::TAO_ROOT_CDR_OP_CH: - { - be_visitor_eventtype_cdr_op_ch visitor (&ctx); - status = node->accept (&visitor); - break; - } - case TAO_CodeGen::TAO_ROOT_CDR_OP_CS: - { - be_visitor_eventtype_cdr_op_cs visitor (&ctx); - status = node->accept (&visitor); - break; - } - case TAO_CodeGen::TAO_ROOT_ANY_OP_CH: - { - be_visitor_eventtype_any_op_ch visitor (&ctx); - status = node->accept (&visitor); - break; - } - case TAO_CodeGen::TAO_ROOT_ANY_OP_CS: - { - be_visitor_eventtype_any_op_cs visitor (&ctx); - status = node->accept (&visitor); - break; - } - case TAO_CodeGen::TAO_ROOT_SH: - { - be_visitor_eventtype_sh visitor (&ctx); - status = node->accept (&visitor); - break; - } - case TAO_CodeGen::TAO_ROOT_SI: - { - be_visitor_eventtype_si visitor (&ctx); - status = node->accept (&visitor); - break; - } - case TAO_CodeGen::TAO_ROOT_SS: - { - be_visitor_eventtype_ss visitor (&ctx); - status = node->accept (&visitor); - break; - } - default: - return 0; // nothing to do. - } - - if (status == -1) - { - ACE_ERROR_RETURN ((LM_ERROR, - "(%N:%l) be_visitor_module::" - "visit_eventtype - " - "failed to accept visitor\n"), - -1); - } - - return 0; + return this->visit_valuetype (node); } int be_visitor_root::visit_eventtype_fwd (be_eventtype_fwd *node) { - // Instantiate a visitor context with a copy of our context. This info - // will be modified based on what type of node we are visiting. - be_visitor_context ctx (*this->ctx_); - ctx.node (node); - int status = 0; - - switch (this->ctx_->state ()) - { - case TAO_CodeGen::TAO_ROOT_CH: - { - be_visitor_eventtype_fwd_ch visitor (&ctx); - status = node->accept (&visitor); - break; - } - case TAO_CodeGen::TAO_ROOT_ANY_OP_CH: - { - be_visitor_eventtype_fwd_any_op_ch visitor (&ctx); - status = node->accept (&visitor); - break; - } - case TAO_CodeGen::TAO_ROOT_CDR_OP_CH: - { - be_visitor_eventtype_fwd_cdr_op_ch visitor (&ctx); - status = node->accept (&visitor); - break; - } - default: - return 0; // nothing to be done - } - - if (status == -1) - { - ACE_ERROR_RETURN ((LM_ERROR, - "(%N:%l) be_visitor_module::" - "visit_eventtype_fwd - " - "failed to accept visitor\n"), - -1); - } - - return 0; + return this->visit_valuetype_fwd (node); } int diff --git a/TAO/TAO_IDL/be/be_visitor_valuetype.cpp b/TAO/TAO_IDL/be/be_visitor_valuetype.cpp index 6a514e4160e..cb3dd343aec 100644 --- a/TAO/TAO_IDL/be/be_visitor_valuetype.cpp +++ b/TAO/TAO_IDL/be/be_visitor_valuetype.cpp @@ -51,7 +51,6 @@ #include "be_visitor_valuetype.h" #include "be_visitor_argument.h" #include "be_visitor_array.h" -#include "be_visitor_eventtype.h" #include "be_visitor_field.h" #include "be_visitor_constant.h" #include "be_visitor_enum.h" diff --git a/TAO/TAO_IDL/be/be_visitor_valuetype/any_op_ch.cpp b/TAO/TAO_IDL/be/be_visitor_valuetype/any_op_ch.cpp index 2f4e63fec96..6245adb5ec3 100644 --- a/TAO/TAO_IDL/be/be_visitor_valuetype/any_op_ch.cpp +++ b/TAO/TAO_IDL/be/be_visitor_valuetype/any_op_ch.cpp @@ -68,3 +68,10 @@ be_visitor_valuetype_any_op_ch::visit_valuetype (be_valuetype *node) node->cli_hdr_any_op_gen (1); return 0; } + +int +be_visitor_valuetype_any_op_ch::visit_eventtype (be_eventtype *node) +{ + return this->visit_valuetype (node); +} + diff --git a/TAO/TAO_IDL/be/be_visitor_valuetype/any_op_cs.cpp b/TAO/TAO_IDL/be/be_visitor_valuetype/any_op_cs.cpp index 0f9a4cc3abf..6887c191370 100644 --- a/TAO/TAO_IDL/be/be_visitor_valuetype/any_op_cs.cpp +++ b/TAO/TAO_IDL/be/be_visitor_valuetype/any_op_cs.cpp @@ -117,3 +117,10 @@ be_visitor_valuetype_any_op_cs::visit_valuetype (be_valuetype *node) node->cli_stub_any_op_gen (1); return 0; } + +int +be_visitor_valuetype_any_op_cs::visit_eventtype (be_eventtype *node) +{ + return this->visit_valuetype (node); +} + diff --git a/TAO/TAO_IDL/be/be_visitor_valuetype/cdr_op_ch.cpp b/TAO/TAO_IDL/be/be_visitor_valuetype/cdr_op_ch.cpp index 13fe3bc35ff..effc2db8a7c 100644 --- a/TAO/TAO_IDL/be/be_visitor_valuetype/cdr_op_ch.cpp +++ b/TAO/TAO_IDL/be/be_visitor_valuetype/cdr_op_ch.cpp @@ -91,3 +91,11 @@ be_visitor_valuetype_cdr_op_ch::visit_valuetype (be_valuetype *node) node->cli_hdr_cdr_op_gen (1); return 0; } + +int +be_visitor_valuetype_cdr_op_ch::visit_eventtype (be_eventtype *node) +{ + return this->visit_valuetype (node); +} + + diff --git a/TAO/TAO_IDL/be/be_visitor_valuetype/cdr_op_cs.cpp b/TAO/TAO_IDL/be/be_visitor_valuetype/cdr_op_cs.cpp index 345e59d88a2..2bb5674fb48 100644 --- a/TAO/TAO_IDL/be/be_visitor_valuetype/cdr_op_cs.cpp +++ b/TAO/TAO_IDL/be/be_visitor_valuetype/cdr_op_cs.cpp @@ -116,6 +116,12 @@ be_visitor_valuetype_cdr_op_cs::visit_valuetype (be_valuetype *node) return 0; } +int +be_visitor_valuetype_cdr_op_cs::visit_eventtype (be_eventtype *node) +{ + return this->visit_valuetype (node); +} + // @@@ (JP) The following three methods are a hack to get CDR // operators generated for anonymous array and sequence // valuetype members. This should be done like it is in structs, diff --git a/TAO/TAO_IDL/be/be_visitor_valuetype/field_ch.cpp b/TAO/TAO_IDL/be/be_visitor_valuetype/field_ch.cpp index 461a6b53a4c..d3024c82d35 100644 --- a/TAO/TAO_IDL/be/be_visitor_valuetype/field_ch.cpp +++ b/TAO/TAO_IDL/be/be_visitor_valuetype/field_ch.cpp @@ -338,6 +338,12 @@ be_visitor_valuetype_field_ch::visit_valuetype (be_valuetype *node) } int +be_visitor_valuetype_field_ch::visit_eventtype (be_eventtype *node) +{ + return this->visit_valuetype (node); +} + +int be_visitor_valuetype_field_ch::visit_valuetype_fwd (be_valuetype_fwd *node) { be_decl *ub = this->ctx_->node (); @@ -381,6 +387,12 @@ be_visitor_valuetype_field_ch::visit_valuetype_fwd (be_valuetype_fwd *node) } int +be_visitor_valuetype_field_ch::visit_eventtype_fwd (be_eventtype_fwd *node) +{ + return this->visit_valuetype_fwd (node); +} + +int be_visitor_valuetype_field_ch::visit_predefined_type (be_predefined_type *node) { be_decl *ub = this->ctx_->node (); diff --git a/TAO/TAO_IDL/be/be_visitor_valuetype/field_ci.cpp b/TAO/TAO_IDL/be/be_visitor_valuetype/field_ci.cpp index 7d9b10d035c..9574e2bca3d 100644 --- a/TAO/TAO_IDL/be/be_visitor_valuetype/field_ci.cpp +++ b/TAO/TAO_IDL/be/be_visitor_valuetype/field_ci.cpp @@ -114,54 +114,6 @@ be_visitor_valuetype_field_ci::visit_array (be_array *node) } int -be_visitor_valuetype_field_ci::visit_enum (be_enum *) -{ - return 0; -} - -int -be_visitor_valuetype_field_ci::visit_interface (be_interface *) -{ - return 0; -} - -int -be_visitor_valuetype_field_ci::visit_interface_fwd (be_interface_fwd *) -{ - return 0; -} - -int -be_visitor_valuetype_field_ci::visit_valuetype (be_valuetype *) -{ - return 0; -} - -int -be_visitor_valuetype_field_ci::visit_valuetype_fwd (be_valuetype_fwd *) -{ - return 0; -} - -int -be_visitor_valuetype_field_ci::visit_predefined_type (be_predefined_type *) -{ - return 0; -} - -int -be_visitor_valuetype_field_ci::visit_sequence (be_sequence *) -{ - return 0; -} - -int -be_visitor_valuetype_field_ci::visit_string (be_string *) -{ - return 0; -} - -int be_visitor_valuetype_field_ci::visit_structure (be_structure *node) { be_decl *ub = this->ctx_->node (); @@ -208,12 +160,6 @@ be_visitor_valuetype_field_ci::visit_structure (be_structure *node) } int -be_visitor_valuetype_field_ci::visit_typedef (be_typedef *) -{ - return 0; -} - -int be_visitor_valuetype_field_ci::visit_union (be_union *node) { be_decl *ub = this->ctx_->node (); diff --git a/TAO/TAO_IDL/be/be_visitor_valuetype/field_cs.cpp b/TAO/TAO_IDL/be/be_visitor_valuetype/field_cs.cpp index a175e283d24..c608bcf6a4b 100644 --- a/TAO/TAO_IDL/be/be_visitor_valuetype/field_cs.cpp +++ b/TAO/TAO_IDL/be/be_visitor_valuetype/field_cs.cpp @@ -468,6 +468,12 @@ be_visitor_valuetype_field_cs::visit_valuetype (be_valuetype *node) } int +be_visitor_valuetype_field_cs::visit_eventtype (be_eventtype *node) +{ + return this->visit_valuetype (node); +} + +int be_visitor_valuetype_field_cs::visit_valuetype_fwd (be_valuetype_fwd *node) { be_decl *ub = this->ctx_->node (); @@ -537,6 +543,12 @@ be_visitor_valuetype_field_cs::visit_valuetype_fwd (be_valuetype_fwd *node) } int +be_visitor_valuetype_field_cs::visit_eventtype_fwd (be_eventtype_fwd *node) +{ + return this->visit_valuetype_fwd (node); +} + +int be_visitor_valuetype_field_cs::visit_predefined_type (be_predefined_type *node) { be_decl *ub = this->ctx_->node (); diff --git a/TAO/TAO_IDL/be/be_visitor_valuetype/marshal_ch.cpp b/TAO/TAO_IDL/be/be_visitor_valuetype/marshal_ch.cpp index a4fa8a2aeb6..55aec2de444 100644 --- a/TAO/TAO_IDL/be/be_visitor_valuetype/marshal_ch.cpp +++ b/TAO/TAO_IDL/be/be_visitor_valuetype/marshal_ch.cpp @@ -81,3 +81,10 @@ be_visitor_valuetype_marshal_ch::visit_valuetype (be_valuetype *node) return 0; } + +int +be_visitor_valuetype_marshal_ch::visit_eventtype (be_eventtype *node) +{ + return this->visit_valuetype (node); +} + diff --git a/TAO/TAO_IDL/be/be_visitor_valuetype/marshal_cs.cpp b/TAO/TAO_IDL/be/be_visitor_valuetype/marshal_cs.cpp index 7fbbaa5b017..442017f72d6 100644 --- a/TAO/TAO_IDL/be/be_visitor_valuetype/marshal_cs.cpp +++ b/TAO/TAO_IDL/be/be_visitor_valuetype/marshal_cs.cpp @@ -159,7 +159,12 @@ be_visitor_valuetype_marshal_cs::visit_valuetype (be_valuetype *node) return 0; } -// Retrieve the fully scoped skeleton name. +int +be_visitor_valuetype_marshal_cs::visit_eventtype (be_eventtype *node) +{ + return this->visit_valuetype (node); +} + void be_visitor_valuetype_marshal_cs::class_name (be_valuetype *node, TAO_OutStream *os) diff --git a/TAO/TAO_IDL/be/be_visitor_valuetype/obv_module.cpp b/TAO/TAO_IDL/be/be_visitor_valuetype/obv_module.cpp index 87571fa8cba..c69154e3dce 100644 --- a/TAO/TAO_IDL/be/be_visitor_valuetype/obv_module.cpp +++ b/TAO/TAO_IDL/be/be_visitor_valuetype/obv_module.cpp @@ -197,16 +197,18 @@ be_visitor_obv_module::visit_eventtype (be_eventtype *node) switch (this->ctx_->state ()) { case TAO_CodeGen::TAO_MODULE_OBV_CH: - ctx.state (TAO_CodeGen::TAO_EVENTTYPE_OBV_CH); + ctx.state (TAO_CodeGen::TAO_VALUETYPE_OBV_CH); break; case TAO_CodeGen::TAO_MODULE_OBV_CI: - { - be_visitor_eventtype_obv_ci visitor (&ctx); - status = node->accept (&visitor); - break; - } + { + // This context state is not involved in any strategies. + ctx.state (TAO_CodeGen::TAO_VALUETYPE_OBV_CI); + be_visitor_valuetype_obv_ci visitor (&ctx); + status = node->accept (&visitor); + break; + } case TAO_CodeGen::TAO_MODULE_OBV_CS: - ctx.state (TAO_CodeGen::TAO_EVENTTYPE_OBV_CS); + ctx.state (TAO_CodeGen::TAO_VALUETYPE_OBV_CS); break; default: return 0; diff --git a/TAO/TAO_IDL/be/be_visitor_valuetype/valuetype.cpp b/TAO/TAO_IDL/be/be_visitor_valuetype/valuetype.cpp index 78d29d24e77..b4b89f4d92c 100644 --- a/TAO/TAO_IDL/be/be_visitor_valuetype/valuetype.cpp +++ b/TAO/TAO_IDL/be/be_visitor_valuetype/valuetype.cpp @@ -32,13 +32,6 @@ be_visitor_valuetype::~be_visitor_valuetype (void) { } -// This method must be overridden by the derived valuetype visitors. -int -be_visitor_valuetype::visit_valuetype (be_valuetype *) -{ - return -1; -} - int be_visitor_valuetype::visit_valuetype_scope (be_valuetype *node) { 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 6292d08fa71..dc10fd54e4f 100644 --- a/TAO/TAO_IDL/be/be_visitor_valuetype/valuetype_ch.cpp +++ b/TAO/TAO_IDL/be/be_visitor_valuetype/valuetype_ch.cpp @@ -380,6 +380,11 @@ be_visitor_valuetype_ch::visit_valuetype (be_valuetype *node) return 0; } +int +be_visitor_valuetype_ch::visit_eventtype (be_eventtype *node) +{ + return this->visit_valuetype (node); +} int be_visitor_valuetype_ch::visit_operation (be_operation *node) 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 2ee88358c20..f4cab1d1ae2 100644 --- a/TAO/TAO_IDL/be/be_visitor_valuetype/valuetype_ci.cpp +++ b/TAO/TAO_IDL/be/be_visitor_valuetype/valuetype_ci.cpp @@ -94,6 +94,11 @@ be_visitor_valuetype_ci::visit_valuetype (be_valuetype *node) return 0; } +int +be_visitor_valuetype_ci::visit_eventtype (be_eventtype *node) +{ + return this->visit_valuetype (node); +} int be_visitor_valuetype_ci::visit_field (be_field *node) 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 e81b14ac126..7d20399e061 100644 --- a/TAO/TAO_IDL/be/be_visitor_valuetype/valuetype_cs.cpp +++ b/TAO/TAO_IDL/be/be_visitor_valuetype/valuetype_cs.cpp @@ -269,6 +269,12 @@ be_visitor_valuetype_cs::visit_valuetype (be_valuetype *node) } int +be_visitor_valuetype_cs::visit_eventtype (be_eventtype *node) +{ + return this->visit_valuetype (node); +} + +int be_visitor_valuetype_cs::visit_operation (be_operation *node) { if (node->cli_stub_gen () || node->imported ()) diff --git a/TAO/TAO_IDL/be/be_visitor_valuetype/valuetype_init.cpp b/TAO/TAO_IDL/be/be_visitor_valuetype/valuetype_init.cpp index 84a56777620..bc351d2fc65 100644 --- a/TAO/TAO_IDL/be/be_visitor_valuetype/valuetype_init.cpp +++ b/TAO/TAO_IDL/be/be_visitor_valuetype/valuetype_init.cpp @@ -35,66 +35,6 @@ be_visitor_valuetype_init::~be_visitor_valuetype_init (void) { } -int -be_visitor_valuetype_init::visit_attribute (be_attribute *) -{ - return 0; -} - -int -be_visitor_valuetype_init::visit_constant (be_constant *) -{ - return 0; -} - -int -be_visitor_valuetype_init::visit_enum (be_enum *) -{ - return 0; -} - -int -be_visitor_valuetype_init::visit_operation (be_operation *) -{ - return 0; -} - -int -be_visitor_valuetype_init::visit_exception (be_exception *) -{ - return 0; -} - -int -be_visitor_valuetype_init::visit_structure (be_structure *) -{ - return 0; -} - -int -be_visitor_valuetype_init::visit_union (be_union *) -{ - return 0; -} - -int -be_visitor_valuetype_init::visit_typedef (be_typedef *) -{ - return 0; -} - -int -be_visitor_valuetype_init::visit_field (be_field *) -{ - return 0; -} - -int -be_visitor_valuetype_init::visit_factory (be_factory *) -{ - return 0; -} - void be_visitor_valuetype_init::begin_public (void) { 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 cbbdd869030..0d27a6f5cef 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 @@ -151,6 +151,12 @@ be_visitor_valuetype_init_ch::visit_valuetype (be_valuetype *node) } int +be_visitor_valuetype_init_ch::visit_eventtype (be_eventtype *node) +{ + return this->visit_valuetype (node); +} + +int be_visitor_valuetype_init_ch::visit_factory (be_factory *node) { diff --git a/TAO/TAO_IDL/be/be_visitor_valuetype/valuetype_init_ci.cpp b/TAO/TAO_IDL/be/be_visitor_valuetype/valuetype_init_ci.cpp index feb64624ca4..68e9b6f3bb1 100644 --- a/TAO/TAO_IDL/be/be_visitor_valuetype/valuetype_init_ci.cpp +++ b/TAO/TAO_IDL/be/be_visitor_valuetype/valuetype_init_ci.cpp @@ -35,14 +35,3 @@ be_visitor_valuetype_init_ci::~be_visitor_valuetype_init_ci (void) { } -int -be_visitor_valuetype_init_ci::visit_valuetype (be_valuetype *) -{ - return 0; -} - -int -be_visitor_valuetype_init_ci::visit_factory (be_factory *) -{ - return 0; -} diff --git a/TAO/TAO_IDL/be/be_visitor_valuetype/valuetype_init_cs.cpp b/TAO/TAO_IDL/be/be_visitor_valuetype/valuetype_init_cs.cpp index 245dab28aed..4adbbc0e883 100644 --- a/TAO/TAO_IDL/be/be_visitor_valuetype/valuetype_init_cs.cpp +++ b/TAO/TAO_IDL/be/be_visitor_valuetype/valuetype_init_cs.cpp @@ -151,7 +151,8 @@ be_visitor_valuetype_init_cs::visit_valuetype (be_valuetype *node) } int -be_visitor_valuetype_init_cs::visit_factory (be_factory *) +be_visitor_valuetype_init_cs::visit_eventtype (be_eventtype *node) { - return 0; + return this->visit_valuetype (node); } + diff --git a/TAO/TAO_IDL/be/be_visitor_valuetype/valuetype_obv_ch.cpp b/TAO/TAO_IDL/be/be_visitor_valuetype/valuetype_obv_ch.cpp index 0d89ded2a01..5cc1bbc11eb 100644 --- a/TAO/TAO_IDL/be/be_visitor_valuetype/valuetype_obv_ch.cpp +++ b/TAO/TAO_IDL/be/be_visitor_valuetype/valuetype_obv_ch.cpp @@ -249,6 +249,12 @@ be_visitor_valuetype_obv_ch::visit_valuetype (be_valuetype *node) } int +be_visitor_valuetype_obv_ch::visit_eventtype (be_eventtype *node) +{ + return this->visit_valuetype (node); +} + +int be_visitor_valuetype_obv_ch::visit_field (be_field *node) { be_valuetype *vt = be_valuetype::narrow_from_scope (node->defined_in ()); diff --git a/TAO/TAO_IDL/be/be_visitor_valuetype/valuetype_obv_ci.cpp b/TAO/TAO_IDL/be/be_visitor_valuetype/valuetype_obv_ci.cpp index c66063fc844..66750c54136 100644 --- a/TAO/TAO_IDL/be/be_visitor_valuetype/valuetype_obv_ci.cpp +++ b/TAO/TAO_IDL/be/be_visitor_valuetype/valuetype_obv_ci.cpp @@ -72,25 +72,32 @@ be_visitor_valuetype_obv_ci::visit_valuetype (be_valuetype *node) ), -1); } } // if !opt_accessor () + return 0; } +int +be_visitor_valuetype_obv_ci::visit_eventtype (be_eventtype *node) +{ + return this->visit_valuetype (node); +} int be_visitor_valuetype_obv_ci::visit_field (be_field *node) { - be_visitor_context *ctx = new be_visitor_context (*this->ctx_); - be_visitor_valuetype_field_ci *visitor = - new be_visitor_valuetype_field_ci (ctx); - visitor->in_obv_space_ = 1; - if (visitor->visit_field (node) == -1) + be_visitor_context new_ctx (*this->ctx_); + be_visitor_valuetype_field_ci visitor (&new_ctx); + + visitor.in_obv_space_ = 1; + + if (visitor.visit_field (node) == -1) { ACE_ERROR_RETURN ((LM_ERROR, "(%N:%l) be_visitor_valuetype_obv_ci::" "visit_field - " - "visit_field failed\n" - ), -1); + "visit_field failed\n"), + -1); } - delete visitor; + return 0; } diff --git a/TAO/TAO_IDL/be/be_visitor_valuetype/valuetype_obv_cs.cpp b/TAO/TAO_IDL/be/be_visitor_valuetype/valuetype_obv_cs.cpp index fc0202f10a6..20aeee342b1 100644 --- a/TAO/TAO_IDL/be/be_visitor_valuetype/valuetype_obv_cs.cpp +++ b/TAO/TAO_IDL/be/be_visitor_valuetype/valuetype_obv_cs.cpp @@ -134,6 +134,12 @@ be_visitor_valuetype_obv_cs::visit_valuetype (be_valuetype *node) } int +be_visitor_valuetype_obv_cs::visit_eventtype (be_eventtype *node) +{ + return this->visit_valuetype (node); +} + +int be_visitor_valuetype_obv_cs::visit_field (be_field *node) { be_visitor_context ctx = (*this->ctx_); diff --git a/TAO/TAO_IDL/be/be_visitor_valuetype/valuetype_sh.cpp b/TAO/TAO_IDL/be/be_visitor_valuetype/valuetype_sh.cpp index 3e9f96accd3..d9938ccfd9d 100644 --- a/TAO/TAO_IDL/be/be_visitor_valuetype/valuetype_sh.cpp +++ b/TAO/TAO_IDL/be/be_visitor_valuetype/valuetype_sh.cpp @@ -127,3 +127,9 @@ be_visitor_valuetype_sh::visit_valuetype (be_valuetype *node) return 0; } +int +be_visitor_valuetype_sh::visit_eventtype (be_eventtype *node) +{ + return this->visit_valuetype (node); +} + diff --git a/TAO/TAO_IDL/be/be_visitor_valuetype/valuetype_si.cpp b/TAO/TAO_IDL/be/be_visitor_valuetype/valuetype_si.cpp index e07545f171f..34cd0b2f248 100644 --- a/TAO/TAO_IDL/be/be_visitor_valuetype/valuetype_si.cpp +++ b/TAO/TAO_IDL/be/be_visitor_valuetype/valuetype_si.cpp @@ -42,3 +42,10 @@ be_visitor_valuetype_si::visit_valuetype (be_valuetype *) // Nothing needed for now, but the visitor is here just in case. return 0; } + +int +be_visitor_valuetype_si::visit_eventtype (be_eventtype *node) +{ + return this->visit_valuetype (node); +} + diff --git a/TAO/TAO_IDL/be/be_visitor_valuetype/valuetype_ss.cpp b/TAO/TAO_IDL/be/be_visitor_valuetype/valuetype_ss.cpp index e3f63a051a7..780e54f73c3 100644 --- a/TAO/TAO_IDL/be/be_visitor_valuetype/valuetype_ss.cpp +++ b/TAO/TAO_IDL/be/be_visitor_valuetype/valuetype_ss.cpp @@ -124,6 +124,12 @@ be_visitor_valuetype_ss::visit_valuetype (be_valuetype *node) return 0; } +int +be_visitor_valuetype_ss::visit_eventtype (be_eventtype *node) +{ + return this->visit_valuetype (node); +} + ACE_CString be_visitor_valuetype_ss::generate_flat_name (be_valuetype *node) { diff --git a/TAO/TAO_IDL/be/be_visitor_valuetype_fwd.cpp b/TAO/TAO_IDL/be/be_visitor_valuetype_fwd.cpp index 1a7f813f2a6..ade9f142cd9 100644 --- a/TAO/TAO_IDL/be/be_visitor_valuetype_fwd.cpp +++ b/TAO/TAO_IDL/be/be_visitor_valuetype_fwd.cpp @@ -20,6 +20,8 @@ #include "be_valuetype.h" #include "be_valuetype_fwd.h" +#include "be_eventtype.h" +#include "be_eventtype_fwd.h" #include "be_extern.h" #include "be_helper.h" diff --git a/TAO/TAO_IDL/be/be_visitor_valuetype_fwd/any_op_ch.cpp b/TAO/TAO_IDL/be/be_visitor_valuetype_fwd/any_op_ch.cpp index ee2355ca3cd..772bc543db3 100644 --- a/TAO/TAO_IDL/be/be_visitor_valuetype_fwd/any_op_ch.cpp +++ b/TAO/TAO_IDL/be/be_visitor_valuetype_fwd/any_op_ch.cpp @@ -77,3 +77,10 @@ be_visitor_valuetype_fwd_any_op_ch::visit_valuetype_fwd ( node->cli_hdr_any_op_gen (1); return 0; } + +int +be_visitor_valuetype_fwd_any_op_ch::visit_eventtype_fwd (be_eventtype_fwd *node) +{ + return this->visit_valuetype_fwd (node); +} + diff --git a/TAO/TAO_IDL/be/be_visitor_valuetype_fwd/cdr_op_ch.cpp b/TAO/TAO_IDL/be/be_visitor_valuetype_fwd/cdr_op_ch.cpp index a6c0d58dbad..b89f35115c3 100644 --- a/TAO/TAO_IDL/be/be_visitor_valuetype_fwd/cdr_op_ch.cpp +++ b/TAO/TAO_IDL/be/be_visitor_valuetype_fwd/cdr_op_ch.cpp @@ -91,3 +91,10 @@ be_visitor_valuetype_fwd_cdr_op_ch::visit_valuetype_fwd ( return 0; } + +int +be_visitor_valuetype_fwd_cdr_op_ch::visit_eventtype_fwd (be_eventtype_fwd *node) +{ + return this->visit_valuetype_fwd (node); +} + diff --git a/TAO/TAO_IDL/be/be_visitor_valuetype_fwd/valuetype_fwd_ch.cpp b/TAO/TAO_IDL/be/be_visitor_valuetype_fwd/valuetype_fwd_ch.cpp index d97f32902be..10c14850898 100644 --- a/TAO/TAO_IDL/be/be_visitor_valuetype_fwd/valuetype_fwd_ch.cpp +++ b/TAO/TAO_IDL/be/be_visitor_valuetype_fwd/valuetype_fwd_ch.cpp @@ -56,3 +56,10 @@ be_visitor_valuetype_fwd_ch::visit_valuetype_fwd (be_valuetype_fwd *node) node->cli_hdr_gen (I_TRUE); return 0; } + +int +be_visitor_valuetype_fwd_ch::visit_eventtype_fwd (be_eventtype_fwd *node) +{ + return this->visit_valuetype_fwd (node); +} + diff --git a/TAO/TAO_IDL/be_include/be_codegen.h b/TAO/TAO_IDL/be_include/be_codegen.h index 5a982ff892f..c4086d203db 100644 --- a/TAO/TAO_IDL/be_include/be_codegen.h +++ b/TAO/TAO_IDL/be_include/be_codegen.h @@ -88,10 +88,7 @@ public: TAO_VALUETYPE_OBV_CH, // OBV_ class TAO_VALUETYPE_OBV_CI, TAO_VALUETYPE_OBV_CS, - - TAO_EVENTTYPE_OBV_CH, - TAO_EVENTTYPE_OBV_CS, - + // Emitting code for the module, TAO_MODULE_OBV_CH, // for OBV_ (cmp. POA_ namespace) TAO_MODULE_OBV_CI, diff --git a/TAO/TAO_IDL/be_include/be_visitor_eventtype.h b/TAO/TAO_IDL/be_include/be_visitor_eventtype.h deleted file mode 100644 index 4a8388dc5d7..00000000000 --- a/TAO/TAO_IDL/be_include/be_visitor_eventtype.h +++ /dev/null @@ -1,41 +0,0 @@ -/* -*- c++ -*- */ -// -// $Id$ -// - -// ============================================================================ -// -// = LIBRARY -// TAO IDL -// -// = FILENAME -// be_visitor_eventtype.h -// -// = DESCRIPTION -// Concrete visitor for the EventType class -// -// = AUTHOR -// Jeff Parsons -// -// ============================================================================ - -#ifndef TAO_BE_VISITOR_EVENTTYPE_H -#define TAO_BE_VISITOR_EVENTTYPE_H - -#include "be_visitor_valuetype.h" - -#include "be_visitor_eventtype/eventtype_ch.h" -#include "be_visitor_eventtype/eventtype_ci.h" -#include "be_visitor_eventtype/eventtype_cs.h" -#include "be_visitor_eventtype/eventtype_sh.h" -#include "be_visitor_eventtype/eventtype_si.h" -#include "be_visitor_eventtype/eventtype_ss.h" -#include "be_visitor_eventtype/eventtype_obv_ch.h" -#include "be_visitor_eventtype/eventtype_obv_ci.h" -#include "be_visitor_eventtype/eventtype_obv_cs.h" -#include "be_visitor_eventtype/any_op_ch.h" -#include "be_visitor_eventtype/any_op_cs.h" -#include "be_visitor_eventtype/cdr_op_ch.h" -#include "be_visitor_eventtype/cdr_op_cs.h" - -#endif diff --git a/TAO/TAO_IDL/be_include/be_visitor_eventtype/any_op_ch.h b/TAO/TAO_IDL/be_include/be_visitor_eventtype/any_op_ch.h deleted file mode 100644 index 1de871158ad..00000000000 --- a/TAO/TAO_IDL/be_include/be_visitor_eventtype/any_op_ch.h +++ /dev/null @@ -1,48 +0,0 @@ -/* -*- c++ -*- */ -// -// $Id$ -// - -// ============================================================================ -// -// = LIBRARY -// TAO IDL -// -// = FILENAME -// any_op_ch.h -// -// = DESCRIPTION -// Concrete visitor for eventtypes. -// This one provides code generation for the any operators. -// -// = AUTHOR -// Jeff Parsons -// -// ============================================================================ - -#ifndef _BE_VISITOR_EVENTTYPE_ANY_OP_CH_H_ -#define _BE_VISITOR_EVENTTYPE_ANY_OP_CH_H_ - -class be_visitor_eventtype_any_op_ch : public be_visitor_valuetype -{ - // - // = TITLE - // be_visitor_eventtype_any_op_ch - // - // = DESCRIPTION - // This is a concrete visitor for eventtype that generates the Any operator - // declarations - // - -public: - be_visitor_eventtype_any_op_ch (be_visitor_context *ctx); - // constructor - - ~be_visitor_eventtype_any_op_ch (void); - // destructor - - virtual int visit_eventtype (be_eventtype *node); - // visit valuetype -}; - -#endif /* _BE_VISITOR_EVENTTYPE_ANY_OP_CH_H_ */ diff --git a/TAO/TAO_IDL/be_include/be_visitor_eventtype/any_op_cs.h b/TAO/TAO_IDL/be_include/be_visitor_eventtype/any_op_cs.h deleted file mode 100644 index b24f645b963..00000000000 --- a/TAO/TAO_IDL/be_include/be_visitor_eventtype/any_op_cs.h +++ /dev/null @@ -1,48 +0,0 @@ -/* -*- c++ -*- */ -// -// $Id$ -// - -// ============================================================================ -// -// = LIBRARY -// TAO IDL -// -// = FILENAME -// any_op_cs.h -// -// = DESCRIPTION -// Concrete visitor for eventtypes. -// This one provides code generation for the any operators. -// -// = AUTHOR -// Jeff Parsons -// -// ============================================================================ - -#ifndef _BE_VISITOR_EVENTTYPE_ANY_OP_CS_H_ -#define _BE_VISITOR_EVENTTYPE_ANY_OP_CS_H_ - -class be_visitor_eventtype_any_op_cs : public be_visitor_valuetype -{ - // - // = TITLE - // be_visitor_eventtype_any_op_cs - // - // = DESCRIPTION - // This is a concrete visitor for eventtype that generates the Any operator - // declarations - // - -public: - be_visitor_eventtype_any_op_cs (be_visitor_context *ctx); - // constructor - - ~be_visitor_eventtype_any_op_cs (void); - // destructor - - virtual int visit_eventtype (be_eventtype *node); - // visit valuetype -}; - -#endif /* _BE_VISITOR_EVENTTYPE_ANY_OP_CS_H_ */ diff --git a/TAO/TAO_IDL/be_include/be_visitor_eventtype/cdr_op_ch.h b/TAO/TAO_IDL/be_include/be_visitor_eventtype/cdr_op_ch.h deleted file mode 100644 index 3e72c36c6b5..00000000000 --- a/TAO/TAO_IDL/be_include/be_visitor_eventtype/cdr_op_ch.h +++ /dev/null @@ -1,48 +0,0 @@ -/* -*- c++ -*- */ -// -// $Id$ -// - -// ============================================================================ -// -// = LIBRARY -// TAO IDL -// -// = FILENAME -// cdr_op_ch.h -// -// = DESCRIPTION -// Concrete visitor for eventtypes. -// This one provides code generation for the CDR operators. -// -// = AUTHOR -// Jeff Parsons -// -// ============================================================================ - -#ifndef _BE_VISITOR_EVENTTYPE_CDR_OP_CH_H_ -#define _BE_VISITOR_EVENTTYPE_CDR_OP_CH_H_ - -class be_visitor_eventtype_cdr_op_ch : public be_visitor_valuetype -{ - // - // = TITLE - // be_visitor_eventtype_cdr_op_ch - // - // = DESCRIPTION - // This is a concrete visitor for eventtype that generates the CDR operator - // declarations - // - -public: - be_visitor_eventtype_cdr_op_ch (be_visitor_context *ctx); - // constructor - - ~be_visitor_eventtype_cdr_op_ch (void); - // destructor - - virtual int visit_eventtype (be_eventtype *node); - // visit valuetype -}; - -#endif /* _BE_VISITOR_EVENTTYPE_CDR_OP_CH_H_ */ diff --git a/TAO/TAO_IDL/be_include/be_visitor_eventtype/cdr_op_ci.h b/TAO/TAO_IDL/be_include/be_visitor_eventtype/cdr_op_ci.h deleted file mode 100644 index a3c1fdcbcc7..00000000000 --- a/TAO/TAO_IDL/be_include/be_visitor_eventtype/cdr_op_ci.h +++ /dev/null @@ -1,48 +0,0 @@ -/* -*- c++ -*- */ -// -// $Id$ -// - -// ============================================================================ -// -// = LIBRARY -// TAO IDL -// -// = FILENAME -// cdr_op_ci.h -// -// = DESCRIPTION -// Concrete visitor for eventtypes. -// This one provides code generation for the CDR operators. -// -// = AUTHOR -// Jeff Parsons -// -// ============================================================================ - -#ifndef _BE_VISITOR_EVENTTYPE_CDR_OP_CI_H_ -#define _BE_VISITOR_EVENTTYPE_CDR_OP_CI_H_ - -class be_visitor_eventtype_cdr_op_ci : public be_visitor_valuetype -{ - // - // = TITLE - // be_visitor_eventtype_cdr_op_ci - // - // = DESCRIPTION - // This is a concrete visitor for eventtype that generates the CDR operator - // declarations - // - -public: - be_visitor_eventtype_cdr_op_ci (be_visitor_context *ctx); - // constructor - - ~be_visitor_eventtype_cdr_op_ci (void); - // destructor - - virtual int visit_eventtype (be_eventtype *node); - // visit valuetype -}; - -#endif /* _BE_VISITOR_EVENTTYPE_CDR_OP_CI_H_ */ diff --git a/TAO/TAO_IDL/be_include/be_visitor_eventtype/cdr_op_cs.h b/TAO/TAO_IDL/be_include/be_visitor_eventtype/cdr_op_cs.h deleted file mode 100644 index 2fd94f7587a..00000000000 --- a/TAO/TAO_IDL/be_include/be_visitor_eventtype/cdr_op_cs.h +++ /dev/null @@ -1,48 +0,0 @@ -/* -*- c++ -*- */ -// -// $Id$ -// - -// ============================================================================ -// -// = LIBRARY -// TAO IDL -// -// = FILENAME -// cdr_op_cs.h -// -// = DESCRIPTION -// Concrete visitor for eventtypes. -// This one provides code generation for the CDR operators. -// -// = AUTHOR -// Jeff Parsons -// -// ============================================================================ - -#ifndef _BE_VISITOR_EVENTTYPE_CDR_OP_CS_H_ -#define _BE_VISITOR_EVENTTYPE_CDR_OP_CS_H_ - -class be_visitor_eventtype_cdr_op_cs : public be_visitor_valuetype -{ - // - // = TITLE - // be_visitor_eventtype_cdr_op_cs - // - // = DESCRIPTION - // This is a concrete visitor for eventtype that generates the CDR operator - // declarations - // - -public: - be_visitor_eventtype_cdr_op_cs (be_visitor_context *ctx); - // constructor - - ~be_visitor_eventtype_cdr_op_cs (void); - // destructor - - virtual int visit_eventtype (be_eventtype *node); - // visit valuetype -}; - -#endif /* _BE_VISITOR_EVENTTYPE_CDR_OP_CS_H_ */ diff --git a/TAO/TAO_IDL/be_include/be_visitor_eventtype/eventtype_ch.h b/TAO/TAO_IDL/be_include/be_visitor_eventtype/eventtype_ch.h deleted file mode 100644 index e2e873e61f7..00000000000 --- a/TAO/TAO_IDL/be_include/be_visitor_eventtype/eventtype_ch.h +++ /dev/null @@ -1,45 +0,0 @@ -// -// $Id$ -// -/* -*- c++ -*- */ -// ============================================================================ -// -// = LIBRARY -// TAO IDL -// -// = FILENAME -// eventtype_ch.h -// -// = DESCRIPTION -// Concrete visitor for the Eventtype node. -// This one provides code generation for eventtypes in the (client) header. -// -// = AUTHOR -// Jeff Parsons -// -// ============================================================================ - -#ifndef _BE_EVENTTYPE_EVENTTYPE_CH_H_ -#define _BE_EVENTTYPE_EVENTTYPE_CH_H_ - -class be_visitor_eventtype_ch : public be_visitor_valuetype -{ - // - // = TITLE - // be_visitor_eventtype_ch - // - // = DESCRIPTION - // This is a concrete visitor to generate the client header for eventtype - // - // -public: - be_visitor_eventtype_ch (be_visitor_context *ctx); - // constructor - - ~be_visitor_eventtype_ch (void); - // destructor - - virtual int visit_eventtype (be_eventtype *node); -}; - -#endif /* _BE_EVENTTYPE_EVENTTYPE_CH_H_ */ diff --git a/TAO/TAO_IDL/be_include/be_visitor_eventtype/eventtype_ci.h b/TAO/TAO_IDL/be_include/be_visitor_eventtype/eventtype_ci.h deleted file mode 100644 index 0ed63ed297c..00000000000 --- a/TAO/TAO_IDL/be_include/be_visitor_eventtype/eventtype_ci.h +++ /dev/null @@ -1,45 +0,0 @@ -// -// $Id$ -// -/* -*- c++ -*- */ -// ============================================================================ -// -// = LIBRARY -// TAO IDL -// -// = FILENAME -// eventtype_ci.h -// -// = DESCRIPTION -// Concrete visitor for the Eventtype node. -// This one provides code generation for eventtypes in the (client) inline. -// -// = AUTHOR -// Jeff Parsons -// -// ============================================================================ - -#ifndef _BE_EVENTTYPE_EVENTTYPE_CI_H_ -#define _BE_EVENTTYPE_EVENTTYPE_CI_H_ - -class be_visitor_eventtype_ci : public be_visitor_valuetype -{ - // - // = TITLE - // be_visitor_eventtype_ci - // - // = DESCRIPTION - // This is a concrete visitor to generate the client inline for eventtype - // - // -public: - be_visitor_eventtype_ci (be_visitor_context *ctx); - // constructor - - ~be_visitor_eventtype_ci (void); - // destructor - - virtual int visit_eventtype (be_eventtype *node); -}; - -#endif /* _BE_EVENTTYPE_EVENTTYPE_CI_H_ */ diff --git a/TAO/TAO_IDL/be_include/be_visitor_eventtype/eventtype_cs.h b/TAO/TAO_IDL/be_include/be_visitor_eventtype/eventtype_cs.h deleted file mode 100644 index 8682cb4b21d..00000000000 --- a/TAO/TAO_IDL/be_include/be_visitor_eventtype/eventtype_cs.h +++ /dev/null @@ -1,45 +0,0 @@ -// -// $Id$ -// -/* -*- c++ -*- */ -// ============================================================================ -// -// = LIBRARY -// TAO IDL -// -// = FILENAME -// eventtype_cs.h -// -// = DESCRIPTION -// Concrete visitor for the Eventtype node. -// This one provides code generation for eventtypes in the (client) source. -// -// = AUTHOR -// Jeff Parsons -// -// ============================================================================ - -#ifndef _BE_EVENTTYPE_EVENTTYPE_CS_H_ -#define _BE_EVENTTYPE_EVENTTYPE_CS_H_ - -class be_visitor_eventtype_cs : public be_visitor_valuetype -{ - // - // = TITLE - // be_visitor_eventtype_cs - // - // = DESCRIPTION - // This is a concrete visitor to generate the client source for eventtype - // - // -public: - be_visitor_eventtype_cs (be_visitor_context *ctx); - // constructor - - ~be_visitor_eventtype_cs (void); - // destructor - - virtual int visit_eventtype (be_eventtype *node); -}; - -#endif /* _BE_EVENTTYPE_EVENTTYPE_CS_H_ */ diff --git a/TAO/TAO_IDL/be_include/be_visitor_eventtype/eventtype_obv_ch.h b/TAO/TAO_IDL/be_include/be_visitor_eventtype/eventtype_obv_ch.h deleted file mode 100644 index d720aa1c011..00000000000 --- a/TAO/TAO_IDL/be_include/be_visitor_eventtype/eventtype_obv_ch.h +++ /dev/null @@ -1,46 +0,0 @@ -// -// $Id$ -// -/* -*- c++ -*- */ -// ============================================================================ -// -// = LIBRARY -// TAO IDL -// -// = FILENAME -// eventtype_obv_ch.h -// -// = DESCRIPTION -// Concrete visitor for the Eventtype node. -// This one provides code generation for valuetype OBV_ class -// in the (client) header. -// -// = AUTHOR -// Jeff Parsons -// -// ============================================================================ - -#ifndef _BE_EVENTTYPE_EVENTTYPE_OBV_CH_H_ -#define _BE_EVENTTYPE_EVENTTYPE_OBV_CH_H_ - -class be_visitor_eventtype_obv_ch : public be_visitor_valuetype -{ - // - // = TITLE - // be_visitor_eventtype_obv_ch - // - // = DESCRIPTION - // This is a concrete visitor to generate the header for valuetype - // OBV_ class - // -public: - be_visitor_eventtype_obv_ch (be_visitor_context *ctx); - // constructor - - ~be_visitor_eventtype_obv_ch (void); - // destructor - - virtual int visit_eventtype (be_eventtype *node); -}; - -#endif /* _BE_EVENTTYPE_EVENTTYPE_OBV_CH_H_ */ diff --git a/TAO/TAO_IDL/be_include/be_visitor_eventtype/eventtype_obv_ci.h b/TAO/TAO_IDL/be_include/be_visitor_eventtype/eventtype_obv_ci.h deleted file mode 100644 index 136ec808ff0..00000000000 --- a/TAO/TAO_IDL/be_include/be_visitor_eventtype/eventtype_obv_ci.h +++ /dev/null @@ -1,46 +0,0 @@ -// -// $Id$ -// -/* -*- c++ -*- */ -// ============================================================================ -// -// = LIBRARY -// TAO IDL -// -// = FILENAME -// eventtype_obv_ci.h -// -// = DESCRIPTION -// Concrete visitor for the Eventtype node. -// This one provides code generation for valuetype OBV_ class -// in the (client) inline. -// -// = AUTHOR -// Jeff Parsons -// -// ============================================================================ - -#ifndef _BE_EVENTTYPE_EVENTTYPE_OBV_CI_H_ -#define _BE_EVENTTYPE_EVENTTYPE_OBV_CI_H_ - -class be_visitor_eventtype_obv_ci : public be_visitor_valuetype -{ - // - // = TITLE - // be_visitor_eventtype_obv_ci - // - // = DESCRIPTION - // This is a concrete visitor to generate the inline for valuetype - // OBV_ class - // -public: - be_visitor_eventtype_obv_ci (be_visitor_context *ctx); - // constructor - - ~be_visitor_eventtype_obv_ci (void); - // destructor - - virtual int visit_eventtype (be_eventtype *node); -}; - -#endif /* _BE_EVENTTYPE_EVENTTYPE_OBV_CI_H_ */ diff --git a/TAO/TAO_IDL/be_include/be_visitor_eventtype/eventtype_obv_cs.h b/TAO/TAO_IDL/be_include/be_visitor_eventtype/eventtype_obv_cs.h deleted file mode 100644 index 8024c40f0cb..00000000000 --- a/TAO/TAO_IDL/be_include/be_visitor_eventtype/eventtype_obv_cs.h +++ /dev/null @@ -1,46 +0,0 @@ -// -// $Id$ -// -/* -*- c++ -*- */ -// ============================================================================ -// -// = LIBRARY -// TAO IDL -// -// = FILENAME -// eventtype_obv_cs.h -// -// = DESCRIPTION -// Concrete visitor for the Eventtype node. -// This one provides code generation for valuetype OBV_ class -// in the (client) stub. -// -// = AUTHOR -// Jeff Parsons -// -// ============================================================================ - -#ifndef _BE_EVENTTYPE_EVENTTYPE_OBV_CS_H_ -#define _BE_EVENTTYPE_EVENTTYPE_OBV_CS_H_ - -class be_visitor_eventtype_obv_cs : public be_visitor_valuetype -{ - // - // = TITLE - // be_visitor_eventtype_obv_cs - // - // = DESCRIPTION - // This is a concrete visitor to generate the stub for valuetype - // OBV_ class - // -public: - be_visitor_eventtype_obv_cs (be_visitor_context *ctx); - // constructor - - ~be_visitor_eventtype_obv_cs (void); - // destructor - - virtual int visit_eventtype (be_eventtype *node); -}; - -#endif /* _BE_EVENTTYPE_EVENTTYPE_OBV_CS_H_ */ diff --git a/TAO/TAO_IDL/be_include/be_visitor_eventtype/eventtype_sh.h b/TAO/TAO_IDL/be_include/be_visitor_eventtype/eventtype_sh.h deleted file mode 100644 index e86b44e2b6b..00000000000 --- a/TAO/TAO_IDL/be_include/be_visitor_eventtype/eventtype_sh.h +++ /dev/null @@ -1,45 +0,0 @@ -// -// $Id$ -// -/* -*- c++ -*- */ -// ============================================================================ -// -// = LIBRARY -// TAO IDL -// -// = FILENAME -// eventtype_sh.h -// -// = DESCRIPTION -// Concrete visitor for the Eventtype node. -// This one provides code generation for eventtypes in the server header. -// -// = AUTHOR -// Jeff Parsons -// -// ============================================================================ - -#ifndef _BE_EVENTTYPE_EVENTTYPE_SH_H_ -#define _BE_EVENTTYPE_EVENTTYPE_SH_H_ - -class be_visitor_eventtype_sh : public be_visitor_valuetype -{ - // - // = TITLE - // be_visitor_eventtype_sh - // - // = DESCRIPTION - // This is a concrete visitor to generate the server header for eventtype - // - // -public: - be_visitor_eventtype_sh (be_visitor_context *ctx); - // constructor - - ~be_visitor_eventtype_sh (void); - // destructor - - virtual int visit_eventtype (be_eventtype *node); -}; - -#endif /* _BE_EVENTTYPE_EVENTTYPE_SH_H_ */ diff --git a/TAO/TAO_IDL/be_include/be_visitor_eventtype/eventtype_si.h b/TAO/TAO_IDL/be_include/be_visitor_eventtype/eventtype_si.h deleted file mode 100644 index 2da19a133c1..00000000000 --- a/TAO/TAO_IDL/be_include/be_visitor_eventtype/eventtype_si.h +++ /dev/null @@ -1,45 +0,0 @@ -// -// $Id$ -// -/* -*- c++ -*- */ -// ============================================================================ -// -// = LIBRARY -// TAO IDL -// -// = FILENAME -// eventtype_si.h -// -// = DESCRIPTION -// Concrete visitor for the Eventtype node. -// This one provides code generation for eventtypes in the server inline. -// -// = AUTHOR -// Jeff Parsons -// -// ============================================================================ - -#ifndef _BE_EVENTTYPE_EVENTTYPE_SI_H_ -#define _BE_EVENTTYPE_EVENTTYPE_SI_H_ - -class be_visitor_eventtype_si : public be_visitor_valuetype -{ - // - // = TITLE - // be_visitor_eventtype_si - // - // = DESCRIPTION - // This is a concrete visitor to generate the server inline for eventtype - // - // -public: - be_visitor_eventtype_si (be_visitor_context *ctx); - // constructor - - ~be_visitor_eventtype_si (void); - // destructor - - virtual int visit_eventtype (be_eventtype *node); -}; - -#endif /* _BE_EVENTTYPE_EVENTTYPE_SI_H_ */ diff --git a/TAO/TAO_IDL/be_include/be_visitor_eventtype/eventtype_ss.h b/TAO/TAO_IDL/be_include/be_visitor_eventtype/eventtype_ss.h deleted file mode 100644 index 51da4f80356..00000000000 --- a/TAO/TAO_IDL/be_include/be_visitor_eventtype/eventtype_ss.h +++ /dev/null @@ -1,45 +0,0 @@ -// -// $Id$ -// -/* -*- c++ -*- */ -// ============================================================================ -// -// = LIBRARY -// TAO IDL -// -// = FILENAME -// eventtype_ss.h -// -// = DESCRIPTION -// Concrete visitor for the Eventtype node. -// This one provides code generation for eventtypes in the server source. -// -// = AUTHOR -// Jeff Parsons -// -// ============================================================================ - -#ifndef _BE_EVENTTYPE_EVENTTYPE_SS_H_ -#define _BE_EVENTTYPE_EVENTTYPE_SS_H_ - -class be_visitor_eventtype_ss : public be_visitor_valuetype -{ - // - // = TITLE - // be_visitor_eventtype_ss - // - // = DESCRIPTION - // This is a concrete visitor to generate the server source for eventtype - // - // -public: - be_visitor_eventtype_ss (be_visitor_context *ctx); - // constructor - - ~be_visitor_eventtype_ss (void); - // destructor - - virtual int visit_eventtype (be_eventtype *node); -}; - -#endif /* _BE_EVENTTYPE_EVENTTYPE_SS_H_ */ diff --git a/TAO/TAO_IDL/be_include/be_visitor_eventtype_fwd.h b/TAO/TAO_IDL/be_include/be_visitor_eventtype_fwd.h deleted file mode 100644 index 1959b5e3609..00000000000 --- a/TAO/TAO_IDL/be_include/be_visitor_eventtype_fwd.h +++ /dev/null @@ -1,30 +0,0 @@ -/* -*- C++ -*- */ -// -// $Id$ -// - -// ============================================================================ -// -// = LIBRARY -// TAO IDL -// -// = FILENAME -// be_visitor_eventtype_fwd.h -// -// = DESCRIPTION -// Concrete visitor for the eventtype_fwd class -// -// = AUTHOR -// Jeff Parsons -// -// ============================================================================ - -#ifndef TAO_BE_VISITOR_EVENTTYPE_FWD_H -#define TAO_BE_VISITOR_EVENTTYPE_FWD_H - -#include "be_visitor_decl.h" -#include "be_visitor_eventtype_fwd/eventtype_fwd_ch.h" -#include "be_visitor_eventtype_fwd/any_op_ch.h" -#include "be_visitor_eventtype_fwd/cdr_op_ch.h" - -#endif /* TAO_BE_VISITOR_EVENTTYPE_FWD_H */ diff --git a/TAO/TAO_IDL/be_include/be_visitor_eventtype_fwd/any_op_ch.h b/TAO/TAO_IDL/be_include/be_visitor_eventtype_fwd/any_op_ch.h deleted file mode 100644 index 029e6fc3b23..00000000000 --- a/TAO/TAO_IDL/be_include/be_visitor_eventtype_fwd/any_op_ch.h +++ /dev/null @@ -1,47 +0,0 @@ -// -// $Id$ -// -/* -*- c++ -*- */ -// ============================================================================ -// -// = LIBRARY -// TAO IDL -// -// = FILENAME -// any_op_ch.h -// -// = DESCRIPTION -// Concrete visitor for the forward declared Eventtype node. -// This one provides code generation for the Any operators. -// -// = AUTHOR -// Jeff Parsons -// -// ============================================================================ - -#ifndef _BE_EVENTTYPE_FWD_ANY_OP_CH_H_ -#define _BE_EVENTTYPE_FWD_ANY_OP_CH_H_ - -class be_visitor_eventtype_fwd_any_op_ch : public be_visitor_decl -{ - // - // = TITLE - // be_visitor_eventtype_fwd_any_op_ch - // - // = DESCRIPTION - // This is a concrete visitor for forward declared eventtypes that - // generates the Any operator declaration. - // - -public: - be_visitor_eventtype_fwd_any_op_ch (be_visitor_context *ctx); - // constructor - - ~be_visitor_eventtype_fwd_any_op_ch (void); - // destructor - - virtual int visit_eventtype_fwd (be_eventtype_fwd *node); - // visit valuetype_fwd -}; - -#endif /* _BE_EVENTTYPE_FWD_ANY_OP_CH_H_ */ diff --git a/TAO/TAO_IDL/be_include/be_visitor_eventtype_fwd/cdr_op_ch.h b/TAO/TAO_IDL/be_include/be_visitor_eventtype_fwd/cdr_op_ch.h deleted file mode 100644 index 9318df51813..00000000000 --- a/TAO/TAO_IDL/be_include/be_visitor_eventtype_fwd/cdr_op_ch.h +++ /dev/null @@ -1,47 +0,0 @@ -// -// $Id$ -// -/* -*- c++ -*- */ -// ============================================================================ -// -// = LIBRARY -// TAO IDL -// -// = FILENAME -// cdr_op_ch.h -// -// = DESCRIPTION -// Concrete visitor for the forward declared Eventtype node. -// This one provides code generation for the CDR operators. -// -// = AUTHOR -// Jeff Parsons -// -// ============================================================================ - -#ifndef _BE_EVENTTYPE_FWD_CDR_OP_CH_H_ -#define _BE_EVENTTYPE_FWD_CDR_OP_CH_H_ - -class be_visitor_eventtype_fwd_cdr_op_ch : public be_visitor_decl -{ - // - // = TITLE - // be_visitor_eventtype_fwd_cdr_op_ch - // - // = DESCRIPTION - // This is a concrete visitor for forward declared eventtypes that - // generates the CDR operator declaration. - // - -public: - be_visitor_eventtype_fwd_cdr_op_ch (be_visitor_context *ctx); - // constructor - - ~be_visitor_eventtype_fwd_cdr_op_ch (void); - // destructor - - virtual int visit_eventtype_fwd (be_eventtype_fwd *node); - // visit valuetype_fwd -}; - -#endif /* _BE_EVENTTYPE_FWD_CDR_OP_CH_H_ */ diff --git a/TAO/TAO_IDL/be_include/be_visitor_eventtype_fwd/eventtype_fwd_ch.h b/TAO/TAO_IDL/be_include/be_visitor_eventtype_fwd/eventtype_fwd_ch.h deleted file mode 100644 index 3f477575696..00000000000 --- a/TAO/TAO_IDL/be_include/be_visitor_eventtype_fwd/eventtype_fwd_ch.h +++ /dev/null @@ -1,46 +0,0 @@ -// -// $Id$ -// -/* -*- c++ -*- */ -// ============================================================================ -// -// = LIBRARY -// TAO IDL -// -// = FILENAME -// eventtype_fwd_ch.h -// -// = DESCRIPTION -// Concrete visitor for the Eventtype Forward node. -// This one provides code generation for eventtype forward node. -// -// = AUTHOR -// Jeff Parsons -// -// ============================================================================ - -#ifndef _BE_VISITOR_EVENTTYPE_FWD_CH_H_ -#define _BE_VISITOR_EVENTTYPE_FWD_CH_H_ - -class be_visitor_eventtype_fwd_ch : public be_visitor_decl -{ - // - // = TITLE - // be_visitor_eventtype_fwd_ch - // - // = DESCRIPTION - // This is the visitor for eventtype_fwd for the header file - // - // -public: - be_visitor_eventtype_fwd_ch (be_visitor_context *ctx); - // constructor - - ~be_visitor_eventtype_fwd_ch (void); - // destructor - - virtual int visit_eventtype_fwd (be_eventtype_fwd *node); - // visit valuetype_fwd. -}; - -#endif /* _BE_VISITOR_EVENTTYPE_FWD_CH_H_ */ diff --git a/TAO/TAO_IDL/be_include/be_visitor_valuetype/any_op_ch.h b/TAO/TAO_IDL/be_include/be_visitor_valuetype/any_op_ch.h index afb3290262d..12a18d278f7 100644 --- a/TAO/TAO_IDL/be_include/be_visitor_valuetype/any_op_ch.h +++ b/TAO/TAO_IDL/be_include/be_visitor_valuetype/any_op_ch.h @@ -41,7 +41,7 @@ public: // destructor virtual int visit_valuetype (be_valuetype *node); - // visit valuetype + virtual int visit_eventtype (be_eventtype *node); }; #endif /* _BE_VALUETYPE_ANY_OP_CH_H_ */ diff --git a/TAO/TAO_IDL/be_include/be_visitor_valuetype/any_op_cs.h b/TAO/TAO_IDL/be_include/be_visitor_valuetype/any_op_cs.h index 3c930612a46..86b86ed0df2 100644 --- a/TAO/TAO_IDL/be_include/be_visitor_valuetype/any_op_cs.h +++ b/TAO/TAO_IDL/be_include/be_visitor_valuetype/any_op_cs.h @@ -41,7 +41,7 @@ public: // destructor virtual int visit_valuetype (be_valuetype *node); - // visit valuetype + virtual int visit_eventtype (be_eventtype *node); }; #endif /* _BE_VALUETYPE_ANY_OP_CS_H_ */ diff --git a/TAO/TAO_IDL/be_include/be_visitor_valuetype/cdr_op_ch.h b/TAO/TAO_IDL/be_include/be_visitor_valuetype/cdr_op_ch.h index 43c9ab57038..9555c9e0f15 100644 --- a/TAO/TAO_IDL/be_include/be_visitor_valuetype/cdr_op_ch.h +++ b/TAO/TAO_IDL/be_include/be_visitor_valuetype/cdr_op_ch.h @@ -42,7 +42,7 @@ public: // destructor virtual int visit_valuetype (be_valuetype *node); - // visit valuetype + virtual int visit_eventtype (be_eventtype *node); }; #endif /* _BE_VISITOR_VALUETYPE_CDR_OP_CH_H_ */ diff --git a/TAO/TAO_IDL/be_include/be_visitor_valuetype/cdr_op_cs.h b/TAO/TAO_IDL/be_include/be_visitor_valuetype/cdr_op_cs.h index 17d45be4b70..e45eb3cc4ed 100644 --- a/TAO/TAO_IDL/be_include/be_visitor_valuetype/cdr_op_cs.h +++ b/TAO/TAO_IDL/be_include/be_visitor_valuetype/cdr_op_cs.h @@ -43,7 +43,7 @@ public: // destructor virtual int visit_valuetype (be_valuetype *node); - // visit valuetype + virtual int visit_eventtype (be_eventtype *node); virtual int visit_field (be_field *node); // visit field diff --git a/TAO/TAO_IDL/be_include/be_visitor_valuetype/field_cdr_cs.h b/TAO/TAO_IDL/be_include/be_visitor_valuetype/field_cdr_cs.h index 4a6184adc85..8ed42da9295 100644 --- a/TAO/TAO_IDL/be_include/be_visitor_valuetype/field_cdr_cs.h +++ b/TAO/TAO_IDL/be_include/be_visitor_valuetype/field_cdr_cs.h @@ -58,10 +58,8 @@ public: // visit interface forward type virtual int visit_valuetype (be_valuetype *node); - // visit valuetype type virtual int visit_valuetype_fwd (be_valuetype_fwd *node); - // visit valuetype forward type virtual int visit_component (be_component *node); // visit component type diff --git a/TAO/TAO_IDL/be_include/be_visitor_valuetype/field_ch.h b/TAO/TAO_IDL/be_include/be_visitor_valuetype/field_ch.h index b22d8b269ba..82b4a8bdae8 100644 --- a/TAO/TAO_IDL/be_include/be_visitor_valuetype/field_ch.h +++ b/TAO/TAO_IDL/be_include/be_visitor_valuetype/field_ch.h @@ -60,10 +60,10 @@ public: // visit interface forward type virtual int visit_valuetype (be_valuetype *node); - // visit valuetype type + virtual int visit_eventtype (be_eventtype *node); virtual int visit_valuetype_fwd (be_valuetype_fwd *node); - // visit valuetype forward type + virtual int visit_eventtype_fwd (be_eventtype_fwd *node); virtual int visit_predefined_type (be_predefined_type *node); // visit predefined type diff --git a/TAO/TAO_IDL/be_include/be_visitor_valuetype/field_ci.h b/TAO/TAO_IDL/be_include/be_visitor_valuetype/field_ci.h index facd77c06be..fe0e43b1909 100644 --- a/TAO/TAO_IDL/be_include/be_visitor_valuetype/field_ci.h +++ b/TAO/TAO_IDL/be_include/be_visitor_valuetype/field_ci.h @@ -49,36 +49,9 @@ public: virtual int visit_array (be_array *node); // visit array type - virtual int visit_enum (be_enum *node); - // visit enum type - - virtual int visit_interface (be_interface *node); - // visit interface type - - virtual int visit_interface_fwd (be_interface_fwd *node); - // visit interface forward type - - virtual int visit_valuetype (be_valuetype *node); - // visit valuetype type - - virtual int visit_valuetype_fwd (be_valuetype_fwd *node); - // visit valuetype forward type - - virtual int visit_predefined_type (be_predefined_type *node); - // visit predefined type - - virtual int visit_sequence (be_sequence *node); - // visit sequence type - - virtual int visit_string (be_string *node); - // visit string type - virtual int visit_structure (be_structure *node); // visit structure type - virtual int visit_typedef (be_typedef *node); - // visit typedefed type - virtual int visit_union (be_union *node); // visit union type @@ -90,6 +63,7 @@ public: // if (in_obv_space_) print OBV_name else print name idl_bool in_obv_space_; + private: const char *pre_op_; }; diff --git a/TAO/TAO_IDL/be_include/be_visitor_valuetype/field_cs.h b/TAO/TAO_IDL/be_include/be_visitor_valuetype/field_cs.h index cbb51bb2de4..ad1a8d91e62 100644 --- a/TAO/TAO_IDL/be_include/be_visitor_valuetype/field_cs.h +++ b/TAO/TAO_IDL/be_include/be_visitor_valuetype/field_cs.h @@ -60,10 +60,10 @@ public: // visit interface forward type virtual int visit_valuetype (be_valuetype *node); - // visit valuetype type + virtual int visit_eventtype (be_eventtype *node); virtual int visit_valuetype_fwd (be_valuetype_fwd *node); - // visit valuetype forward type + virtual int visit_eventtype_fwd (be_eventtype_fwd *node); virtual int visit_predefined_type (be_predefined_type *node); // visit predefined type diff --git a/TAO/TAO_IDL/be_include/be_visitor_valuetype/marshal_ch.h b/TAO/TAO_IDL/be_include/be_visitor_valuetype/marshal_ch.h index 662529b8de8..997f267b315 100644 --- a/TAO/TAO_IDL/be_include/be_visitor_valuetype/marshal_ch.h +++ b/TAO/TAO_IDL/be_include/be_visitor_valuetype/marshal_ch.h @@ -42,8 +42,7 @@ public: // destructor virtual int visit_valuetype (be_valuetype *node); - // visit valuetype - + virtual int visit_eventtype (be_eventtype *node); }; #endif /* _BE_VISITOR_VALUETYPE_MARSHAL_CH_H_ */ diff --git a/TAO/TAO_IDL/be_include/be_visitor_valuetype/marshal_cs.h b/TAO/TAO_IDL/be_include/be_visitor_valuetype/marshal_cs.h index 8ec036d370f..833658657d1 100644 --- a/TAO/TAO_IDL/be_include/be_visitor_valuetype/marshal_cs.h +++ b/TAO/TAO_IDL/be_include/be_visitor_valuetype/marshal_cs.h @@ -42,7 +42,7 @@ public: // destructor virtual int visit_valuetype (be_valuetype *node); - // visit valuetype + virtual int visit_eventtype (be_eventtype *node); void class_name (be_valuetype *node, TAO_OutStream *os); int gen_fields (be_valuetype *node, be_visitor_context &ctx); diff --git a/TAO/TAO_IDL/be_include/be_visitor_valuetype/valuetype.h b/TAO/TAO_IDL/be_include/be_visitor_valuetype/valuetype.h index b2c404bfd1b..1789d83b667 100644 --- a/TAO/TAO_IDL/be_include/be_visitor_valuetype/valuetype.h +++ b/TAO/TAO_IDL/be_include/be_visitor_valuetype/valuetype.h @@ -44,10 +44,6 @@ public: // destructor public: - - virtual int visit_valuetype (be_valuetype *node); - // visit the valuetype node - virtual int visit_valuetype_scope (be_valuetype *node); // visit the scope of the valuetype node // (in public/private field order) diff --git a/TAO/TAO_IDL/be_include/be_visitor_valuetype/valuetype_ch.h b/TAO/TAO_IDL/be_include/be_visitor_valuetype/valuetype_ch.h index 054f2ed38af..0af5bed92b0 100644 --- a/TAO/TAO_IDL/be_include/be_visitor_valuetype/valuetype_ch.h +++ b/TAO/TAO_IDL/be_include/be_visitor_valuetype/valuetype_ch.h @@ -44,6 +44,7 @@ public: // destructor virtual int visit_valuetype (be_valuetype *node); + virtual int visit_eventtype (be_eventtype *node); virtual int visit_operation (be_operation *node); virtual int visit_field (be_field *node); diff --git a/TAO/TAO_IDL/be_include/be_visitor_valuetype/valuetype_ci.h b/TAO/TAO_IDL/be_include/be_visitor_valuetype/valuetype_ci.h index 44e8445de09..d3960113f7e 100644 --- a/TAO/TAO_IDL/be_include/be_visitor_valuetype/valuetype_ci.h +++ b/TAO/TAO_IDL/be_include/be_visitor_valuetype/valuetype_ci.h @@ -41,7 +41,7 @@ public: // destructor virtual int visit_valuetype (be_valuetype *node); - // set the right context and make a visitor + virtual int visit_eventtype (be_eventtype *node); virtual int visit_field (be_field *node); private: diff --git a/TAO/TAO_IDL/be_include/be_visitor_valuetype/valuetype_cs.h b/TAO/TAO_IDL/be_include/be_visitor_valuetype/valuetype_cs.h index f2378bf0e7b..6035d3bc09d 100644 --- a/TAO/TAO_IDL/be_include/be_visitor_valuetype/valuetype_cs.h +++ b/TAO/TAO_IDL/be_include/be_visitor_valuetype/valuetype_cs.h @@ -39,7 +39,7 @@ public: ~be_visitor_valuetype_cs (void); virtual int visit_valuetype (be_valuetype *node); - // Set the right context and make a visitor.l + virtual int visit_eventtype (be_eventtype *node); virtual int visit_operation (be_operation *node); // Called only by AMH exceptions. diff --git a/TAO/TAO_IDL/be_include/be_visitor_valuetype/valuetype_init.h b/TAO/TAO_IDL/be_include/be_visitor_valuetype/valuetype_init.h index 9a3deef7f5b..1c867521d14 100644 --- a/TAO/TAO_IDL/be_include/be_visitor_valuetype/valuetype_init.h +++ b/TAO/TAO_IDL/be_include/be_visitor_valuetype/valuetype_init.h @@ -45,36 +45,6 @@ public: public: - virtual int visit_attribute (be_attribute *node); - // visit attribute - - virtual int visit_constant (be_constant *node); - // visit a constant - - virtual int visit_enum (be_enum *node); - // visit an enum - - virtual int visit_operation (be_operation *node); - // visit operation - - virtual int visit_exception (be_exception *node); - // visit exception (not used) - - virtual int visit_structure (be_structure *node); - // visit a structure - - virtual int visit_union (be_union *node); - // visit a union - - virtual int visit_typedef (be_typedef *node); - // visit the typedef node - - virtual int visit_field (be_field *node); - // visit a field - - virtual int visit_factory (be_factory *node); - // visit a factory - void begin_public (void); void begin_private (void); }; diff --git a/TAO/TAO_IDL/be_include/be_visitor_valuetype/valuetype_init_ch.h b/TAO/TAO_IDL/be_include/be_visitor_valuetype/valuetype_init_ch.h index 509980771a2..32508516a49 100644 --- a/TAO/TAO_IDL/be_include/be_visitor_valuetype/valuetype_init_ch.h +++ b/TAO/TAO_IDL/be_include/be_visitor_valuetype/valuetype_init_ch.h @@ -44,7 +44,7 @@ public: // destructor virtual int visit_valuetype (be_valuetype *node); - // entry point + virtual int visit_eventtype (be_eventtype *node); virtual int visit_factory (be_factory *node); // visit a factory diff --git a/TAO/TAO_IDL/be_include/be_visitor_valuetype/valuetype_init_ci.h b/TAO/TAO_IDL/be_include/be_visitor_valuetype/valuetype_init_ci.h index 49632f5217d..142b19ffdcf 100644 --- a/TAO/TAO_IDL/be_include/be_visitor_valuetype/valuetype_init_ci.h +++ b/TAO/TAO_IDL/be_include/be_visitor_valuetype/valuetype_init_ci.h @@ -42,11 +42,6 @@ public: ~be_visitor_valuetype_init_ci (void); // destructor - - virtual int visit_valuetype (be_valuetype *node); - - virtual int visit_factory (be_factory *node); - // visit a factory }; #endif /* _BE_VALUETYPE_VALUETYPE_INIT_CI_H_ */ diff --git a/TAO/TAO_IDL/be_include/be_visitor_valuetype/valuetype_init_cs.h b/TAO/TAO_IDL/be_include/be_visitor_valuetype/valuetype_init_cs.h index 87584641443..c604b286fea 100644 --- a/TAO/TAO_IDL/be_include/be_visitor_valuetype/valuetype_init_cs.h +++ b/TAO/TAO_IDL/be_include/be_visitor_valuetype/valuetype_init_cs.h @@ -44,9 +44,7 @@ public: // destructor virtual int visit_valuetype (be_valuetype *node); - - virtual int visit_factory (be_factory *node); - // visit a factory + virtual int visit_eventtype (be_eventtype *node); }; #endif /* _BE_VALUETYPE_VALUETYPE_INIT_CS_H_ */ diff --git a/TAO/TAO_IDL/be_include/be_visitor_valuetype/valuetype_obv_ch.h b/TAO/TAO_IDL/be_include/be_visitor_valuetype/valuetype_obv_ch.h index b2523ef2b7a..c2ff28d31ef 100644 --- a/TAO/TAO_IDL/be_include/be_visitor_valuetype/valuetype_obv_ch.h +++ b/TAO/TAO_IDL/be_include/be_visitor_valuetype/valuetype_obv_ch.h @@ -45,6 +45,7 @@ public: // destructor virtual int visit_valuetype (be_valuetype *node); + virtual int visit_eventtype (be_eventtype *node); virtual int visit_field (be_field *node); diff --git a/TAO/TAO_IDL/be_include/be_visitor_valuetype/valuetype_obv_ci.h b/TAO/TAO_IDL/be_include/be_visitor_valuetype/valuetype_obv_ci.h index fff3dfe2565..47648bb9e74 100644 --- a/TAO/TAO_IDL/be_include/be_visitor_valuetype/valuetype_obv_ci.h +++ b/TAO/TAO_IDL/be_include/be_visitor_valuetype/valuetype_obv_ci.h @@ -45,6 +45,7 @@ public: // destructor virtual int visit_valuetype (be_valuetype *node); + virtual int visit_eventtype (be_eventtype *node); virtual int visit_field (be_field *node); }; diff --git a/TAO/TAO_IDL/be_include/be_visitor_valuetype/valuetype_obv_cs.h b/TAO/TAO_IDL/be_include/be_visitor_valuetype/valuetype_obv_cs.h index fc7eba823b4..b6a05417462 100644 --- a/TAO/TAO_IDL/be_include/be_visitor_valuetype/valuetype_obv_cs.h +++ b/TAO/TAO_IDL/be_include/be_visitor_valuetype/valuetype_obv_cs.h @@ -42,6 +42,7 @@ public: // destructor virtual int visit_valuetype (be_valuetype *node); + virtual int visit_eventtype (be_eventtype *node); virtual int visit_field (be_field *node); }; diff --git a/TAO/TAO_IDL/be_include/be_visitor_valuetype/valuetype_sh.h b/TAO/TAO_IDL/be_include/be_visitor_valuetype/valuetype_sh.h index 7bc105ebc18..810bc4be474 100644 --- a/TAO/TAO_IDL/be_include/be_visitor_valuetype/valuetype_sh.h +++ b/TAO/TAO_IDL/be_include/be_visitor_valuetype/valuetype_sh.h @@ -40,7 +40,7 @@ public: // destructor virtual int visit_valuetype (be_valuetype *node); - // set the right context and make a visitor + virtual int visit_eventtype (be_eventtype *node); }; #endif /* _BE_VALUETYPE_VALUETYPE_SH_H_ */ diff --git a/TAO/TAO_IDL/be_include/be_visitor_valuetype/valuetype_si.h b/TAO/TAO_IDL/be_include/be_visitor_valuetype/valuetype_si.h index bbe594e1283..6c01a376559 100644 --- a/TAO/TAO_IDL/be_include/be_visitor_valuetype/valuetype_si.h +++ b/TAO/TAO_IDL/be_include/be_visitor_valuetype/valuetype_si.h @@ -40,7 +40,7 @@ public: // destructor virtual int visit_valuetype (be_valuetype *node); - // set the right context and make a visitor + virtual int visit_eventtype (be_eventtype *node); }; #endif /* _BE_VALUETYPE_VALUETYPE_SI_H_ */ diff --git a/TAO/TAO_IDL/be_include/be_visitor_valuetype/valuetype_ss.h b/TAO/TAO_IDL/be_include/be_visitor_valuetype/valuetype_ss.h index 57dbef6bdcc..8392afce8e9 100644 --- a/TAO/TAO_IDL/be_include/be_visitor_valuetype/valuetype_ss.h +++ b/TAO/TAO_IDL/be_include/be_visitor_valuetype/valuetype_ss.h @@ -40,7 +40,7 @@ public: // destructor virtual int visit_valuetype (be_valuetype *node); - // set the right context and make a visitor + virtual int visit_eventtype (be_eventtype *node); protected: ACE_CString generate_flat_name (be_valuetype *node); diff --git a/TAO/TAO_IDL/be_include/be_visitor_valuetype_fwd/any_op_ch.h b/TAO/TAO_IDL/be_include/be_visitor_valuetype_fwd/any_op_ch.h index 9d20239758c..099299c684f 100644 --- a/TAO/TAO_IDL/be_include/be_visitor_valuetype_fwd/any_op_ch.h +++ b/TAO/TAO_IDL/be_include/be_visitor_valuetype_fwd/any_op_ch.h @@ -41,7 +41,7 @@ public: // destructor virtual int visit_valuetype_fwd (be_valuetype_fwd *node); - // visit valuetype_fwd + virtual int visit_eventtype_fwd (be_eventtype_fwd *node); }; #endif /* _BE_VALUETYPE_FWD_ANY_OP_CH_H_ */ diff --git a/TAO/TAO_IDL/be_include/be_visitor_valuetype_fwd/cdr_op_ch.h b/TAO/TAO_IDL/be_include/be_visitor_valuetype_fwd/cdr_op_ch.h index a0a0401af93..5270f9ca665 100644 --- a/TAO/TAO_IDL/be_include/be_visitor_valuetype_fwd/cdr_op_ch.h +++ b/TAO/TAO_IDL/be_include/be_visitor_valuetype_fwd/cdr_op_ch.h @@ -46,7 +46,7 @@ public: // destructor virtual int visit_valuetype_fwd (be_valuetype_fwd *node); - // visit valuetype + virtual int visit_eventtype_fwd (be_eventtype_fwd *node); }; #endif /* BE_VISITOR_VALUETYPE_FWD_CDR_OP_CH_H */ diff --git a/TAO/TAO_IDL/be_include/be_visitor_valuetype_fwd/valuetype_fwd_ch.h b/TAO/TAO_IDL/be_include/be_visitor_valuetype_fwd/valuetype_fwd_ch.h index 40301223436..428a645de1c 100644 --- a/TAO/TAO_IDL/be_include/be_visitor_valuetype_fwd/valuetype_fwd_ch.h +++ b/TAO/TAO_IDL/be_include/be_visitor_valuetype_fwd/valuetype_fwd_ch.h @@ -41,7 +41,7 @@ public: // destructor virtual int visit_valuetype_fwd (be_valuetype_fwd *node); - // visit valuetype_fwd. + virtual int visit_eventtype_fwd (be_eventtype_fwd *node); }; #endif /* _BE_VISITOR_VALUETYPE_FWD_CH_H_ */ |