ChangeLogTag: Wed Aug 26 17:33:01 UTC 2009 Jeff Parsons <j.parsons@vanderbilt.edu>

12 files changed, 21 insertions, 268 deletions

diff --git a/modules/TAO/ChangeLog b/modules/TAO/ChangeLog
index 53c464162a9..e9120ae0e07 100644
--- a/modules/TAO/ChangeLog
+++ b/modules/TAO/ChangeLog
@@ -1,3 +1,24 @@
+Wed Aug 26 17:33:01 UTC 2009  Jeff Parsons <j.parsons@vanderbilt.edu>
+
+        * TAO_IDL/include/ast_instantiated_interface.h:
+        * TAO_IDL/be/be_instantiated_interface.cpp:
+        * TAO_IDL/ast/ast_instantiated_interface.cpp:
+        * TAO_IDL/be_include/be_instantiated_interface.h:
+
+          Removed these files, their function will be
+          handled in the backend.
+
+        * TAO_IDL/include/ast_generator.h:
+        * TAO_IDL/include/ast_visitor.h:
+        * TAO_IDL/be/be_visitor.cpp:
+        * TAO_IDL/be/be_generator.cpp:
+        * TAO_IDL/ast/ast_generator.cpp:
+        * TAO_IDL/be_include/be_visitor.h:
+        * TAO_IDL/be_include/be_generator.h:
+
+          Removed references to removed nodes from visitors
+          and factories.
+
 Fri Aug 21 16:47:57 UTC 2009  Jeff Parsons <j.parsons@vanderbilt.edu>
 
         * TAO_IDL/be/be_instantiated_connector.cpp:
diff --git a/modules/TAO/TAO_IDL/ast/ast_generator.cpp b/modules/TAO/TAO_IDL/ast/ast_generator.cpp
index ae6adc9a602..57ff5e36610 100644
--- a/modules/TAO/TAO_IDL/ast/ast_generator.cpp
+++ b/modules/TAO/TAO_IDL/ast/ast_generator.cpp
@@ -80,7 +80,6 @@ trademarks or registered trademarks of Sun Microsystems, Inc.
 #include "ast_component_fwd.h"
 #include "ast_home.h"
 #include "ast_template_interface.h"
-#include "ast_instantiated_interface.h"
 #include "ast_mirror_port.h"
 #include "ast_connector.h"
 #include "ast_instantiated_connector.h"
@@ -954,22 +953,6 @@ AST_Generator::create_template_interface (
   return retval;
 }
 
-AST_Instantiated_Interface *
-AST_Generator::create_instantiated_interface (
-  UTL_ScopedName *n,
-  AST_Template_Interface *template_ref,
-  AST_Template_Common::T_ARGLIST *template_args)
-{
-  AST_Instantiated_Interface *retval = 0;
-  ACE_NEW_RETURN (retval,
-                  AST_Instantiated_Interface (n,
-                                              template_ref,
-                                              template_args),
-                  0);
-                  
-  return retval;
-}
-
 AST_PortType *
 AST_Generator::create_porttype (
   UTL_ScopedName *n,
diff --git a/modules/TAO/TAO_IDL/ast/ast_instantiated_interface.cpp b/modules/TAO/TAO_IDL/ast/ast_instantiated_interface.cpp
deleted file mode 100644
index 16377220308..00000000000
--- a/modules/TAO/TAO_IDL/ast/ast_instantiated_interface.cpp
+++ /dev/null
@@ -1,78 +0,0 @@
-// $Id$
-
-#include "ast_instantiated_interface.h"
-#include "ast_visitor.h"
-
-#include "utl_identifier.h"
-#include "utl_indenter.h"
-#include "utl_namelist.h"
-#include "global_extern.h"
-
-ACE_RCSID (ast,
-           ast_instantiated_interface,
-           "$Id$")
-
-AST_Instantiated_Interface::AST_Instantiated_Interface (
-      UTL_ScopedName *n,
-      AST_Template_Interface *template_ref,
-      AST_Template_Common::T_ARGLIST *template_args)
-  : COMMON_Base (false,
-                 false),
-    AST_Decl (AST_Decl::NT_interface,
-              n),
-    AST_Type (AST_Decl::NT_interface,
-              n),
-    UTL_Scope (AST_Decl::NT_interface),
-    AST_Interface (n,
-                   0,
-                   0,
-                   0,
-                   0,
-                   false,
-                   false),
-    template_ref_ (template_ref),
-    template_args_ (template_args)
-{
-}
-
-AST_Instantiated_Interface::~AST_Instantiated_Interface (void)
-{
-}
-
-void
-AST_Instantiated_Interface::destroy (void)
-{
-  delete this->template_args_;
-  this->template_args_ = 0;
-  
-  this->AST_Interface::destroy ();
-}
-
-void
-AST_Instantiated_Interface::dump (ACE_OSTREAM_TYPE &o)
-{
-  this->dump_i (o, "interface ");
-
-  this->local_name ()->dump (o);
-  this->dump_i (o, "<");
-//  unsigned long index = 0UL;
-
-  // TODO - template args
-
-  this->dump_i (o, " {\n");
-
-  UTL_Scope::dump (o);
-  idl_global->indent ()->skip_to (o);
-
-  this->dump_i (o, "}\n");
-}
-
-int
-AST_Instantiated_Interface::ast_accept (ast_visitor *visitor)
-{
-  return visitor->visit_instantiated_interface (this);
-}
-
-IMPL_NARROW_FROM_DECL (AST_Instantiated_Interface)
-IMPL_NARROW_FROM_SCOPE (AST_Instantiated_Interface)
-
diff --git a/modules/TAO/TAO_IDL/be/be_generator.cpp b/modules/TAO/TAO_IDL/be/be_generator.cpp
index 73cb99e10d0..73bbb856754 100644
--- a/modules/TAO/TAO_IDL/be/be_generator.cpp
+++ b/modules/TAO/TAO_IDL/be/be_generator.cpp
@@ -82,7 +82,6 @@ trademarks or registered trademarks of Sun Microsystems, Inc.
 #include "be_component_fwd.h"
 #include "be_home.h"
 #include "be_template_interface.h"
-#include "be_instantiated_interface.h"
 #include "be_porttype.h"
 #include "be_mirror_port.h"
 #include "be_connector.h"
@@ -947,22 +946,6 @@ be_generator::create_template_interface (
   return retval;
 }
 
-AST_Instantiated_Interface *
-be_generator::create_instantiated_interface (
-  UTL_ScopedName *n,
-  AST_Template_Interface *template_ref,
-  AST_Template_Common::T_ARGLIST *template_args)
-{
-  be_instantiated_interface *retval = 0;
-  ACE_NEW_RETURN (retval,
-                  be_instantiated_interface (n,
-                                             template_ref,
-                                             template_args),
-                  0);
-                  
-  return retval;
-}
-
 AST_PortType *
 be_generator::create_porttype (
   UTL_ScopedName *n,
diff --git a/modules/TAO/TAO_IDL/be/be_instantiated_interface.cpp b/modules/TAO/TAO_IDL/be/be_instantiated_interface.cpp
deleted file mode 100644
index eacbaf9488d..00000000000
--- a/modules/TAO/TAO_IDL/be/be_instantiated_interface.cpp
+++ /dev/null
@@ -1,52 +0,0 @@
-// $Id$
-
-#include "be_instantiated_interface.h"
-#include "be_visitor.h"
-
-ACE_RCSID (be,
-           be_instantiated_interface,
-           "$Id$")
-
-be_instantiated_interface::be_instantiated_interface (
-      UTL_ScopedName *n,
-      AST_Template_Interface *template_ref,
-      AST_Template_Common::T_ARGLIST *template_args)
-  : COMMON_Base (false,
-                 false),
-    AST_Decl (AST_Decl::NT_interface,
-              n),
-    AST_Type (AST_Decl::NT_interface,
-              n),
-    UTL_Scope (AST_Decl::NT_interface),
-    AST_Interface (n,
-                   0,
-                   0,
-                   0,
-                   0,
-                   false,
-                   false),
-    AST_Instantiated_Interface (n,
-                                template_ref,
-                                template_args)
-{
-}
-
-be_instantiated_interface::~be_instantiated_interface (void)
-{
-}
-
-void
-be_instantiated_interface::destroy (void)
-{
-  this->AST_Instantiated_Interface::destroy ();
-}
-
-int
-be_instantiated_interface::accept (be_visitor *visitor)
-{
-  return visitor->visit_instantiated_interface (this);
-}
-
-IMPL_NARROW_FROM_DECL (be_instantiated_interface)
-IMPL_NARROW_FROM_SCOPE (be_instantiated_interface)
-
diff --git a/modules/TAO/TAO_IDL/be/be_visitor.cpp b/modules/TAO/TAO_IDL/be/be_visitor.cpp
index e2ad55b0625..8306f326723 100644
--- a/modules/TAO/TAO_IDL/be/be_visitor.cpp
+++ b/modules/TAO/TAO_IDL/be/be_visitor.cpp
@@ -84,13 +84,6 @@ be_visitor::visit_template_interface (be_template_interface *)
 }
 
 int
-be_visitor::visit_instantiated_interface (
-  be_instantiated_interface *)
-{
-  return 0;
-}
-
-int
 be_visitor::visit_valuebox (be_valuebox *)
 {
   return 0;
diff --git a/modules/TAO/TAO_IDL/be_include/be_generator.h b/modules/TAO/TAO_IDL/be_include/be_generator.h
index 17084612482..73f05189e88 100644
--- a/modules/TAO/TAO_IDL/be_include/be_generator.h
+++ b/modules/TAO/TAO_IDL/be_include/be_generator.h
@@ -275,12 +275,6 @@ public:
     FE_Utils::T_PARAMLIST_INFO *template_params);
 
   virtual
-  AST_Instantiated_Interface *create_instantiated_interface (
-    UTL_ScopedName *n,
-    AST_Template_Interface *template_ref,
-    AST_Template_Common::T_ARGLIST *template_args);  
-
-  virtual
   AST_PortType *create_porttype (
     UTL_ScopedName *n,
     FE_Utils::T_PARAMLIST_INFO *template_params);
diff --git a/modules/TAO/TAO_IDL/be_include/be_instantiated_interface.h b/modules/TAO/TAO_IDL/be_include/be_instantiated_interface.h
deleted file mode 100644
index cb9f8806d82..00000000000
--- a/modules/TAO/TAO_IDL/be_include/be_instantiated_interface.h
+++ /dev/null
@@ -1,35 +0,0 @@
-// -*- C++ -*-
-// $Id$
-
-#ifndef BE_INSTANTIATED_INTERFACE_H
-#define BE_INSTANTIATED_INTERFACE_H
-
-#include "ast_instantiated_interface.h"
-
-class be_visitor;
-
-class be_instantiated_interface
-  : public virtual AST_Instantiated_Interface
-{
-public:
-  be_instantiated_interface (
-    UTL_ScopedName *n,
-    AST_Template_Interface *template_ref,
-    AST_Template_Common::T_ARGLIST *template_args);
-
-  virtual ~be_instantiated_interface (void);
-
-  // Cleanup function.
-  virtual void destroy (void);
-
-  // Narrowing.
-
-  DEF_NARROW_FROM_DECL (be_instantiated_interface);
-  DEF_NARROW_FROM_SCOPE (be_instantiated_interface);
-
-  // Visiting.
-  virtual int accept (be_visitor *visitor);
-};
-
-#endif /* BE_INSTANTIATED_INTERFACE_H */
-
diff --git a/modules/TAO/TAO_IDL/be_include/be_visitor.h b/modules/TAO/TAO_IDL/be_include/be_visitor.h
index 36cdc2251bf..5b2a25a5068 100644
--- a/modules/TAO/TAO_IDL/be_include/be_visitor.h
+++ b/modules/TAO/TAO_IDL/be_include/be_visitor.h
@@ -33,7 +33,6 @@ class be_module;
 class be_interface;
 class be_interface_fwd;
 class be_template_interface;
-class be_instantiated_interface;
 class be_valuebox;
 class be_valuetype;
 class be_valuetype_fwd;
@@ -104,8 +103,6 @@ public:
   virtual int visit_interface_fwd (be_interface_fwd *node);
   virtual int visit_template_interface (
     be_template_interface *node);
-  virtual int visit_instantiated_interface (
-    be_instantiated_interface *node);
   virtual int visit_valuebox (be_valuebox *node);
   virtual int visit_valuetype (be_valuetype *node);
   virtual int visit_valuetype_fwd (be_valuetype_fwd *node);
diff --git a/modules/TAO/TAO_IDL/include/ast_generator.h b/modules/TAO/TAO_IDL/include/ast_generator.h
index 35d63fef075..b215eac204b 100644
--- a/modules/TAO/TAO_IDL/include/ast_generator.h
+++ b/modules/TAO/TAO_IDL/include/ast_generator.h
@@ -82,7 +82,6 @@ class AST_Root;
 class AST_EventType;
 class AST_EventTypeFwd;
 class AST_Template_Interface;
-class AST_Instantiated_Interface;
 class AST_Extended_Port;
 class AST_Mirror_Port;
 class AST_Connector;
@@ -365,12 +364,6 @@ public:
     FE_Utils::T_PARAMLIST_INFO *template_params);
     
   virtual
-  AST_Instantiated_Interface *create_instantiated_interface (
-    UTL_ScopedName *n,
-    AST_Template_Interface *template_ref,
-    AST_Template_Common::T_ARGLIST *template_args);  
-
-  virtual
   AST_PortType *create_porttype (
     UTL_ScopedName *n,
     FE_Utils::T_PARAMLIST_INFO *template_params);
diff --git a/modules/TAO/TAO_IDL/include/ast_instantiated_interface.h b/modules/TAO/TAO_IDL/include/ast_instantiated_interface.h
deleted file mode 100644
index c552601942a..00000000000
--- a/modules/TAO/TAO_IDL/include/ast_instantiated_interface.h
+++ /dev/null
@@ -1,43 +0,0 @@
-// -*- C++ -*-
-// $Id$
-
-#ifndef AST_INSTANTIATED_INTERFACE_H
-#define AST_INSTANTIATED_INTERFACE_H
-
-#include "ast_interface.h"
-#include "ast_template_common.h"
-
-class AST_Template_Interface;
-
-class TAO_IDL_FE_Export AST_Instantiated_Interface
-  : public virtual AST_Interface
-{
-public:
-  AST_Instantiated_Interface (
-    UTL_ScopedName *n,
-    AST_Template_Interface *template_ref,
-    AST_Template_Common::T_ARGLIST *template_args);
-
-  virtual ~AST_Instantiated_Interface (void);
-
-  // Cleanup function.
-  virtual void destroy (void);
-
-  // Narrowing.
-
-  DEF_NARROW_FROM_DECL (AST_Instantiated_Interface);
-  DEF_NARROW_FROM_SCOPE (AST_Instantiated_Interface);
-
-  // AST Dumping.
-  virtual void dump (ACE_OSTREAM_TYPE &o);
-
-  // Visiting.
-  virtual int ast_accept (ast_visitor *visitor);
-
-protected:
-  AST_Template_Interface *template_ref_;
-  AST_Template_Common::T_ARGLIST *template_args_;
-};
-
-#endif /* AST_INSTANTIATED_INTERFACE_H */
-
diff --git a/modules/TAO/TAO_IDL/include/ast_visitor.h b/modules/TAO/TAO_IDL/include/ast_visitor.h
index 595dd91565d..5ad3cf1d5bc 100644
--- a/modules/TAO/TAO_IDL/include/ast_visitor.h
+++ b/modules/TAO/TAO_IDL/include/ast_visitor.h
@@ -30,7 +30,6 @@ class AST_Module;
 class AST_Interface;
 class AST_InterfaceFwd;
 class AST_Template_Interface;
-class AST_Instantiated_Interface;
 class AST_ValueBox;
 class AST_ValueType;
 class AST_ValueTypeFwd;
@@ -100,8 +99,6 @@ public:
   virtual int visit_interface_fwd (AST_InterfaceFwd *node) = 0;
   virtual int visit_template_interface (
     AST_Template_Interface *node) = 0;
-  virtual int visit_instantiated_interface (
-    AST_Instantiated_Interface *node) = 0;
   virtual int visit_valuetype (AST_ValueType *node) = 0;
   virtual int visit_valuetype_fwd (AST_ValueTypeFwd *node) = 0;
   virtual int visit_component (AST_Component *node) = 0;