ChangeLogTag: Thu Oct 2 15:02:10 2003 Boris Kolpackov <boris@dre.vanderbilt.edu>

6 files changed, 105 insertions, 5 deletions

diff --git a/TAO/CIAO/CCF/CCF/IDL2/SemanticAction.hpp b/TAO/CIAO/CCF/CCF/IDL2/SemanticAction.hpp
index 28132ae8147..429bcec2f37 100644
--- a/TAO/CIAO/CCF/CCF/IDL2/SemanticAction.hpp
+++ b/TAO/CIAO/CCF/CCF/IDL2/SemanticAction.hpp
@@ -5,13 +5,13 @@
 #ifndef CCF_IDL2_SEMANTIC_ACTION_HPP
 #define CCF_IDL2_SEMANTIC_ACTION_HPP
 
-#include "CCF/IDL2/SemanticAction/Include.hpp"
-#include "CCF/IDL2/SemanticAction/TypeId.hpp"
-#include "CCF/IDL2/SemanticAction/Elements.hpp"
 #include "CCF/IDL2/SemanticAction/Attribute.hpp"
+#include "CCF/IDL2/SemanticAction/Elements.hpp"
+#include "CCF/IDL2/SemanticAction/Include.hpp"
 #include "CCF/IDL2/SemanticAction/Interface.hpp"
 #include "CCF/IDL2/SemanticAction/Module.hpp"
 #include "CCF/IDL2/SemanticAction/Operation.hpp"
+#include "CCF/IDL2/SemanticAction/TypeId.hpp"
 
 #include "CCF/IDL2/SemanticAction/Factory.hpp"
 
diff --git a/TAO/CIAO/CCF/CCF/IDL2/SyntaxTree.hpp b/TAO/CIAO/CCF/CCF/IDL2/SyntaxTree.hpp
index 89af73bd1cf..c52182a747e 100644
--- a/TAO/CIAO/CCF/CCF/IDL2/SyntaxTree.hpp
+++ b/TAO/CIAO/CCF/CCF/IDL2/SyntaxTree.hpp
@@ -6,12 +6,12 @@
 #define CCF_IDL2_SYNTAX_TREE_HPP
 
 #include "CCF/IDL2/SyntaxTree/Elements.hpp"
-#include "CCF/IDL2/SyntaxTree/TypeId.hpp"
 #include "CCF/IDL2/SyntaxTree/BuiltIn.hpp"
 #include "CCF/IDL2/SyntaxTree/Interface.hpp"
 #include "CCF/IDL2/SyntaxTree/Module.hpp"
 #include "CCF/IDL2/SyntaxTree/Operation.hpp"
 #include "CCF/IDL2/SyntaxTree/Translation.hpp"
+#include "CCF/IDL2/SyntaxTree/TypeId.hpp"
 #include "CCF/IDL2/SyntaxTree/ValueType.hpp"
 
 #endif  // CCF_IDL2_SYNTAX_TREE_HPP
diff --git a/TAO/CIAO/CCF/CCF/IDL2/Traversal.hpp b/TAO/CIAO/CCF/CCF/IDL2/Traversal.hpp
index 0dbfad93578..04da1fe1e4f 100644
--- a/TAO/CIAO/CCF/CCF/IDL2/Traversal.hpp
+++ b/TAO/CIAO/CCF/CCF/IDL2/Traversal.hpp
@@ -11,5 +11,6 @@
 #include "CCF/IDL2/Traversal/Module.hpp"
 #include "CCF/IDL2/Traversal/Operation.hpp"
 #include "CCF/IDL2/Traversal/Translation.hpp"
+#include "CCF/IDL2/Traversal/TypeId.hpp"
 
 #endif  // CCF_IDL2_TRAVERSAL_HPP
diff --git a/TAO/CIAO/CCF/CCF/IDL2/Traversal/TypeId.cpp b/TAO/CIAO/CCF/CCF/IDL2/Traversal/TypeId.cpp
new file mode 100644
index 00000000000..1be1ec9642e
--- /dev/null
+++ b/TAO/CIAO/CCF/CCF/IDL2/Traversal/TypeId.cpp
@@ -0,0 +1,15 @@
+// file      : CCF/IDL2/Traversal/TypeId.cpp
+// author    : Boris Kolpackov <boris@dre.vanderbilt.edu>
+// cvs-id    : $Id$
+
+#include "CCF/IDL2/Traversal/TypeId.hpp"
+
+namespace CCF
+{
+  namespace IDL2
+  {
+    namespace Traversal
+    {
+    }
+  }
+}
diff --git a/TAO/CIAO/CCF/CCF/IDL2/Traversal/TypeId.hpp b/TAO/CIAO/CCF/CCF/IDL2/Traversal/TypeId.hpp
new file mode 100644
index 00000000000..1c2e3bf47fa
--- /dev/null
+++ b/TAO/CIAO/CCF/CCF/IDL2/Traversal/TypeId.hpp
@@ -0,0 +1,75 @@
+// file      : CCF/IDL2/Traversal/TypeId.hpp
+// author    : Boris Kolpackov <boris@dre.vanderbilt.edu>
+// cvs-id    : $Id$
+
+#ifndef CCF_IDL2_TRAVERSAL_TYPE_ID_HPP
+#define CCF_IDL2_TRAVERSAL_TYPE_ID_HPP
+
+#include "CCF/IDL2/Traversal/Elements.hpp"
+#include "CCF/IDL2/SyntaxTree/TypeId.hpp"
+
+namespace CCF
+{
+  namespace IDL2
+  {
+    namespace Traversal
+    {
+      //
+      //
+      //
+      struct TypeId : Traverser
+      {
+        typedef
+        SyntaxTree::TypeIdPtr
+        NodePtr;
+
+        Void ()
+        {
+          map (typeid (SyntaxTree::TypeId), this);
+        }
+
+        virtual void
+        traverse (SyntaxTree::NodePtr const& n)
+        {
+          traverse (n->dynamic_type<SyntaxTree::TypeId> ());
+        }
+
+        virtual void
+        traverse (NodePtr const& n)
+        {
+          delegate (n);
+        }
+      };
+
+      
+      //
+      //
+      //
+      struct TypePrefix : Traverser
+      {
+        typedef
+        SyntaxTree::TypePrefixPtr
+        NodePtr;
+
+        Void ()
+        {
+          map (typeid (SyntaxTree::TypePrefix), this);
+        }
+
+        virtual void
+        traverse (SyntaxTree::NodePtr const& n)
+        {
+          traverse (n->dynamic_type<SyntaxTree::TypePrefix> ());
+        }
+
+        virtual void
+        traverse (NodePtr const& n)
+        {
+          delegate (n);
+        }
+      };
+    }
+  }
+}
+
+#endif  // CCF_IDL2_TRAVERSAL_TYPE_ID_HPP
diff --git a/TAO/CIAO/ChangeLog b/TAO/CIAO/ChangeLog
index 6a1e36bd8bf..2c013f6d7fb 100644
--- a/TAO/CIAO/ChangeLog
+++ b/TAO/CIAO/ChangeLog
@@ -1,8 +1,17 @@
+Thu Oct  2 15:02:10 2003  Boris Kolpackov  <boris@dre.vanderbilt.edu>
+
+	* CCF/CCF/IDL2/Traversal/TypeId.hpp:
+	* CCF/CCF/IDL2/Traversal/TypeId.cpp:
+	* CCF/CCF/IDL2/Traversal.hpp:
+	* CCF/CCF/IDL2/SyntaxTree.hpp:
+	* CCF/CCF/IDL2/SemanticAction.hpp: added missing pieces for
+	  typeid/typeprefix support.
+
 Wed Oct  1 14:26:09 2003  Boris Kolpackov  <boris@dre.vanderbilt.edu>
 
 	* CCF/CCF/CompilerElements/Context.hpp: added count () member
 	  function.
-	
+
 	* CIDLC/RepositoryIdGenerator.hpp:
 	* CIDLC/RepositoryIdGenerator.cpp: implemented first phase of
 	  repository id generation.