ChangeLogTagL: Mon Nov 23 20:39:24 UTC 2009 Jeff Parsons <j.parsons@vanderbilt.edu>

7 files changed, 49 insertions, 63 deletions

diff --git a/modules/CIAO/ChangeLog b/modules/CIAO/ChangeLog
index 4f00ad25b0e..63d8c0bfaf9 100644
--- a/modules/CIAO/ChangeLog
+++ b/modules/CIAO/ChangeLog
@@ -1,3 +1,16 @@
+Mon Nov 23 20:39:24 UTC 2009  Jeff Parsons <j.parsons@vanderbilt.edu>
+
+        * tools/IDL3_to_IDL2/checking_visitor.h:
+        * tools/IDL3_to_IDL2/basic_visitor.cpp:
+        * tools/IDL3_to_IDL2/basic_visitor.h:
+        * tools/IDL3_to_IDL2/idl3_to_idl2_visitor.cpp:
+        * tools/IDL3_to_IDL2/checking_visitor.cpp:
+        * tools/IDL3_to_IDL2/idl3_to_idl2_visitor.h:
+        
+          Updated visit_* methods. New visit_* methods corresponding
+          to the revised IDL3+ grammar types, have not yet been
+          implemented.
+
 Tue Nov 10 20:00:17 UTC 2009  Marcel Smit  <msmit@remedy.nl>
 
         * connectors/dds4ccm/examples/Hello/descriptors/ReceiverOnly.cdp:
diff --git a/modules/CIAO/tools/IDL3_to_IDL2/basic_visitor.cpp b/modules/CIAO/tools/IDL3_to_IDL2/basic_visitor.cpp
index 3dcbce5c4c1..7cba018097b 100644
--- a/modules/CIAO/tools/IDL3_to_IDL2/basic_visitor.cpp
+++ b/modules/CIAO/tools/IDL3_to_IDL2/basic_visitor.cpp
@@ -130,12 +130,6 @@ basic_visitor::visit_interface_fwd (AST_InterfaceFwd *node)
 }
 
 int
-basic_visitor::visit_template_interface (AST_Template_Interface *)
-{
-  return 0;
-}
-
-int
 basic_visitor::visit_valuebox (AST_ValueBox *node)
 {
   if (node->imported ())
@@ -283,6 +277,24 @@ basic_visitor::visit_valuetype_fwd (AST_ValueTypeFwd *node)
 }
 
 int
+basic_visitor::visit_template_module (AST_Template_Module *node)
+{
+  return 0;
+}
+
+int
+basic_visitor::visit_template_module_inst (AST_Template_Module_Inst *node)
+{
+  return 0;
+}
+
+int
+basic_visitor::visit_template_module_ref (AST_Template_Module_Ref *node)
+{
+  return 0;
+}
+
+int
 basic_visitor::visit_porttype (AST_PortType *)
 {
   return 0;
diff --git a/modules/CIAO/tools/IDL3_to_IDL2/basic_visitor.h b/modules/CIAO/tools/IDL3_to_IDL2/basic_visitor.h
index 29e5b9d25f1..47a3fe9b0d5 100644
--- a/modules/CIAO/tools/IDL3_to_IDL2/basic_visitor.h
+++ b/modules/CIAO/tools/IDL3_to_IDL2/basic_visitor.h
@@ -50,12 +50,14 @@ public:
   virtual int visit_module (AST_Module *node) = 0;
   virtual int visit_interface (AST_Interface *node) = 0;
   virtual int visit_interface_fwd (AST_InterfaceFwd *node);
-  virtual int visit_template_interface (AST_Template_Interface *node);
   virtual int visit_valuebox (AST_ValueBox *node);
   virtual int visit_valuetype (AST_ValueType *node);
   virtual int visit_valuetype_fwd (AST_ValueTypeFwd *node);
   virtual int visit_component (AST_Component *node) = 0;
   virtual int visit_component_fwd (AST_ComponentFwd *node) = 0;
+  virtual int visit_template_module (AST_Template_Module *node);
+  virtual int visit_template_module_inst (AST_Template_Module_Inst *node);
+  virtual int visit_template_module_ref (AST_Template_Module_Ref *node);
   virtual int visit_porttype (AST_PortType *node);
   virtual int visit_provides (AST_Provides *node);
   virtual int visit_uses (AST_Uses *node);
@@ -65,11 +67,6 @@ public:
   virtual int visit_extended_port (AST_Extended_Port *node) = 0;
   virtual int visit_mirror_port (AST_Mirror_Port *node) = 0;
   virtual int visit_connector (AST_Connector *node) = 0;
-  virtual int visit_instantiated_connector (
-    AST_Instantiated_Connector *node) = 0;
-  virtual int visit_tmpl_port (AST_Tmpl_Port *node) = 0;
-  virtual int visit_tmpl_mirror_port (
-    AST_Tmpl_Mirror_Port *node) = 0;
   virtual int visit_eventtype (AST_EventType *node) = 0;
   virtual int visit_eventtype_fwd (AST_EventTypeFwd *node) = 0;
   virtual int visit_home (AST_Home *node) = 0;
diff --git a/modules/CIAO/tools/IDL3_to_IDL2/checking_visitor.cpp b/modules/CIAO/tools/IDL3_to_IDL2/checking_visitor.cpp
index d0ff78e8707..f38bac5cec6 100644
--- a/modules/CIAO/tools/IDL3_to_IDL2/checking_visitor.cpp
+++ b/modules/CIAO/tools/IDL3_to_IDL2/checking_visitor.cpp
@@ -105,12 +105,6 @@ checking_visitor::visit_interface_fwd (AST_InterfaceFwd *)
 }
 
 int
-checking_visitor::visit_template_interface (AST_Template_Interface *)
-{
-  return 0;
-}
-
-int
 checking_visitor::visit_valuebox (AST_ValueBox *)
 {
   return 0;
@@ -145,75 +139,73 @@ checking_visitor::visit_component_fwd (AST_ComponentFwd *node)
 }
 
 int
-checking_visitor::visit_porttype (AST_PortType *)
+checking_visitor::visit_template_module (AST_Template_Module *node)
 {
   return 0;
 }
 
 int
-checking_visitor::visit_provides (AST_Provides *)
+checking_visitor::visit_template_module_inst (AST_Template_Module_Inst *node)
 {
   return 0;
 }
 
 int
-checking_visitor::visit_uses (AST_Uses *)
+checking_visitor::visit_template_module_ref (AST_Template_Module_Ref *node)
 {
   return 0;
 }
 
 int
-checking_visitor::visit_publishes (AST_Publishes *)
+checking_visitor::visit_porttype (AST_PortType *)
 {
   return 0;
 }
 
 int
-checking_visitor::visit_emits (AST_Emits *)
+checking_visitor::visit_provides (AST_Provides *)
 {
   return 0;
 }
 
 int
-checking_visitor::visit_consumes (AST_Consumes *)
+checking_visitor::visit_uses (AST_Uses *)
 {
   return 0;
 }
 
 int
-checking_visitor::visit_extended_port (AST_Extended_Port *)
+checking_visitor::visit_publishes (AST_Publishes *)
 {
   return 0;
 }
 
 int
-checking_visitor::visit_mirror_port (AST_Mirror_Port *)
+checking_visitor::visit_emits (AST_Emits *)
 {
   return 0;
 }
 
 int
-checking_visitor::visit_connector (AST_Connector *)
+checking_visitor::visit_consumes (AST_Consumes *)
 {
   return 0;
 }
 
 int
-checking_visitor::visit_instantiated_connector (
-  AST_Instantiated_Connector *)
+checking_visitor::visit_extended_port (AST_Extended_Port *)
 {
   return 0;
 }
 
 int
-checking_visitor::visit_tmpl_port (AST_Tmpl_Port *)
+checking_visitor::visit_mirror_port (AST_Mirror_Port *)
 {
   return 0;
 }
 
 int
-checking_visitor::visit_tmpl_mirror_port (
-  AST_Tmpl_Mirror_Port *)
+checking_visitor::visit_connector (AST_Connector *)
 {
   return 0;
 }
diff --git a/modules/CIAO/tools/IDL3_to_IDL2/checking_visitor.h b/modules/CIAO/tools/IDL3_to_IDL2/checking_visitor.h
index ade99005e81..e01b96464cc 100644
--- a/modules/CIAO/tools/IDL3_to_IDL2/checking_visitor.h
+++ b/modules/CIAO/tools/IDL3_to_IDL2/checking_visitor.h
@@ -54,12 +54,14 @@ public:
   virtual int visit_module (AST_Module *node);
   virtual int visit_interface (AST_Interface *node);
   virtual int visit_interface_fwd (AST_InterfaceFwd *node);
-  virtual int visit_template_interface (AST_Template_Interface *node);
   virtual int visit_valuebox (AST_ValueBox *node);
   virtual int visit_valuetype (AST_ValueType *node);
   virtual int visit_valuetype_fwd (AST_ValueTypeFwd *node);
   virtual int visit_component (AST_Component *node);
   virtual int visit_component_fwd (AST_ComponentFwd *node);
+  virtual int visit_template_module (AST_Template_Module *node);
+  virtual int visit_template_module_inst (AST_Template_Module_Inst *node);
+  virtual int visit_template_module_ref (AST_Template_Module_Ref *node);
   virtual int visit_porttype (AST_PortType *node);
   virtual int visit_provides (AST_Provides *node);
   virtual int visit_uses (AST_Uses *node);
@@ -69,11 +71,6 @@ public:
   virtual int visit_extended_port (AST_Extended_Port *node);
   virtual int visit_mirror_port (AST_Mirror_Port *node);
   virtual int visit_connector (AST_Connector *node);
-  virtual int visit_instantiated_connector (
-    AST_Instantiated_Connector *node);
-  virtual int visit_tmpl_port (AST_Tmpl_Port *node);
-  virtual int visit_tmpl_mirror_port (
-    AST_Tmpl_Mirror_Port *node);
   virtual int visit_eventtype (AST_EventType *node);
   virtual int visit_eventtype_fwd (AST_EventTypeFwd *node);
   virtual int visit_home (AST_Home *node);
diff --git a/modules/CIAO/tools/IDL3_to_IDL2/idl3_to_idl2_visitor.cpp b/modules/CIAO/tools/IDL3_to_IDL2/idl3_to_idl2_visitor.cpp
index 209c5a8e716..5327816dd6f 100644
--- a/modules/CIAO/tools/IDL3_to_IDL2/idl3_to_idl2_visitor.cpp
+++ b/modules/CIAO/tools/IDL3_to_IDL2/idl3_to_idl2_visitor.cpp
@@ -352,26 +352,6 @@ idl3_to_idl2_visitor::visit_connector (AST_Connector *)
 }
 
 int
-idl3_to_idl2_visitor::visit_instantiated_connector (
-  AST_Instantiated_Connector *)
-{
-  return 0;
-}
-
-int
-idl3_to_idl2_visitor::visit_tmpl_port (AST_Tmpl_Port *)
-{
-  return 0;
-}
-
-int
-idl3_to_idl2_visitor::visit_tmpl_mirror_port (
-  AST_Tmpl_Mirror_Port *)
-{
-  return 0;
-}
-
-int
 idl3_to_idl2_visitor::visit_eventtype (AST_EventType *node)
 {
   if (node->imported ())
diff --git a/modules/CIAO/tools/IDL3_to_IDL2/idl3_to_idl2_visitor.h b/modules/CIAO/tools/IDL3_to_IDL2/idl3_to_idl2_visitor.h
index b489a8b3cd9..17e8abcb38e 100644
--- a/modules/CIAO/tools/IDL3_to_IDL2/idl3_to_idl2_visitor.h
+++ b/modules/CIAO/tools/IDL3_to_IDL2/idl3_to_idl2_visitor.h
@@ -56,11 +56,6 @@ public:
   virtual int visit_extended_port (AST_Extended_Port *node);
   virtual int visit_mirror_port (AST_Mirror_Port *node);
   virtual int visit_connector (AST_Connector *node);
-  virtual int visit_instantiated_connector (
-    AST_Instantiated_Connector *node);
-  virtual int visit_tmpl_port (AST_Tmpl_Port *node);
-  virtual int visit_tmpl_mirror_port (
-    AST_Tmpl_Mirror_Port *node);
   virtual int visit_eventtype (AST_EventType *node);
   virtual int visit_eventtype_fwd (AST_EventTypeFwd *node);
   virtual int visit_home (AST_Home *node);