summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorparsons <parsons@ae88bc3d-4319-0410-8dbf-d08b4c9d3795>2003-10-24 23:25:55 +0000
committerparsons <parsons@ae88bc3d-4319-0410-8dbf-d08b4c9d3795>2003-10-24 23:25:55 +0000
commit9938fdef6c936443ad8bd69ae11a1492f5303cc8 (patch)
tree65f19e3fe03822973dc26422d0a5bfe536bf3d64
parentd390310683291f5c63c6cdf4278e919a4409bb26 (diff)
downloadATCD-9938fdef6c936443ad8bd69ae11a1492f5303cc8.tar.gz
ChangeLogTag: Fri Oct 24 18:17:21 2003 Jeff Parsons <j.parsons@vanderbilt.edu>
-rw-r--r--TAO/CIAO/CCF/CCF/IDL2/IDL2.vcproj223
-rw-r--r--TAO/CIAO/CCF/CCF/IDL2/SemanticAction.hpp1
-rw-r--r--TAO/CIAO/CCF/CCF/IDL2/SemanticAction/Impl/Member.hpp2
-rw-r--r--TAO/CIAO/CCF/CCF/IDL2/SemanticAction/Impl/TypeId.hpp9
-rw-r--r--TAO/CIAO/CCF/CCF/IDL2/SemanticAction/Impl/Typedef.hpp2
-rw-r--r--TAO/CIAO/CCF/CCF/IDL2/SyntaxTree/ElementsCtor.cpp3
-rw-r--r--TAO/CIAO/CCF/CCF/IDL2/SyntaxTree/InterfaceCtor.cpp3
-rw-r--r--TAO/CIAO/CCF/CCF/IDL2/SyntaxTree/Struct.cpp4
-rw-r--r--TAO/CIAO/CCF/CCF/IDL2/SyntaxTree/Typedef.hpp7
-rw-r--r--TAO/CIAO/CCF/CCF/IDL2/SyntaxTree/ValueTypeCtor.cpp3
-rw-r--r--TAO/CIAO/CCF/CCF/IDL2/Traversal.hpp1
-rw-r--r--TAO/CIAO/CIDLC/TypeNameEmitter.cpp61
-rw-r--r--TAO/CIAO/CIDLC/TypeNameEmitter.hpp14
-rw-r--r--TAO/CIAO/ChangeLog25
14 files changed, 348 insertions, 10 deletions
diff --git a/TAO/CIAO/CCF/CCF/IDL2/IDL2.vcproj b/TAO/CIAO/CCF/CCF/IDL2/IDL2.vcproj
index baca9200931..8af0f2191c5 100644
--- a/TAO/CIAO/CCF/CCF/IDL2/IDL2.vcproj
+++ b/TAO/CIAO/CCF/CCF/IDL2/IDL2.vcproj
@@ -153,20 +153,59 @@
RelativePath=".\SyntaxTree\Elements.cpp">
</File>
<File
+ RelativePath=".\SyntaxTree\ElementsCtor.cpp">
+ </File>
+ <File
RelativePath=".\SyntaxTree\Interface.cpp">
</File>
<File
+ RelativePath=".\SyntaxTree\InterfaceCtor.cpp">
+ </File>
+ <File
+ RelativePath=".\SyntaxTree\Member.cpp">
+ </File>
+ <File
RelativePath=".\SyntaxTree\Module.cpp">
</File>
<File
RelativePath=".\SyntaxTree\Operation.cpp">
</File>
<File
+ RelativePath=".\SyntaxTree\Sequence.cpp">
+ </File>
+ <File
+ RelativePath=".\SyntaxTree\Struct.cpp">
+ <FileConfiguration
+ Name="Debug|Win32">
+ <Tool
+ Name="VCCLCompilerTool"
+ ObjectFile="$(IntDir)/$(InputName)1.obj"/>
+ </FileConfiguration>
+ <FileConfiguration
+ Name="Release|Win32">
+ <Tool
+ Name="VCCLCompilerTool"
+ ObjectFile="$(IntDir)/$(InputName)1.obj"/>
+ </FileConfiguration>
+ </File>
+ <File
RelativePath=".\SyntaxTree\Translation.cpp">
</File>
<File
+ RelativePath=".\SyntaxTree\TranslationCtor.cpp">
+ </File>
+ <File
+ RelativePath=".\SyntaxTree\Typedef.cpp">
+ </File>
+ <File
+ RelativePath=".\SyntaxTree\TypeId.cpp">
+ </File>
+ <File
RelativePath=".\SyntaxTree\ValueType.cpp">
</File>
+ <File
+ RelativePath=".\SyntaxTree\ValueTypeCtor.cpp">
+ </File>
</Filter>
<Filter
Name="Header Files"
@@ -181,15 +220,30 @@
RelativePath=".\SyntaxTree\Interface.hpp">
</File>
<File
+ RelativePath=".\SyntaxTree\Member.hpp">
+ </File>
+ <File
RelativePath=".\SyntaxTree\Module.hpp">
</File>
<File
RelativePath=".\SyntaxTree\Operation.hpp">
</File>
<File
+ RelativePath=".\SyntaxTree\Sequence.hpp">
+ </File>
+ <File
+ RelativePath=".\SyntaxTree\Struct.hpp">
+ </File>
+ <File
RelativePath=".\SyntaxTree\Translation.hpp">
</File>
<File
+ RelativePath=".\SyntaxTree\Typedef.hpp">
+ </File>
+ <File
+ RelativePath=".\SyntaxTree\TypeId.hpp">
+ </File>
+ <File
RelativePath=".\SyntaxTree\ValueType.hpp">
</File>
</Filter>
@@ -267,6 +321,21 @@
</FileConfiguration>
</File>
<File
+ RelativePath=".\Traversal\Member.cpp">
+ <FileConfiguration
+ Name="Debug|Win32">
+ <Tool
+ Name="VCCLCompilerTool"
+ ObjectFile="$(IntDir)/$(InputName)1.obj"/>
+ </FileConfiguration>
+ <FileConfiguration
+ Name="Release|Win32">
+ <Tool
+ Name="VCCLCompilerTool"
+ ObjectFile="$(IntDir)/$(InputName)1.obj"/>
+ </FileConfiguration>
+ </File>
+ <File
RelativePath=".\Traversal\Module.cpp">
<FileConfiguration
Name="Debug|Win32">
@@ -297,6 +366,36 @@
</FileConfiguration>
</File>
<File
+ RelativePath=".\Traversal\Sequence.cpp">
+ <FileConfiguration
+ Name="Debug|Win32">
+ <Tool
+ Name="VCCLCompilerTool"
+ ObjectFile="$(IntDir)/$(InputName)1.obj"/>
+ </FileConfiguration>
+ <FileConfiguration
+ Name="Release|Win32">
+ <Tool
+ Name="VCCLCompilerTool"
+ ObjectFile="$(IntDir)/$(InputName)1.obj"/>
+ </FileConfiguration>
+ </File>
+ <File
+ RelativePath=".\Traversal\Struct.cpp">
+ <FileConfiguration
+ Name="Debug|Win32">
+ <Tool
+ Name="VCCLCompilerTool"
+ ObjectFile="$(IntDir)/$(InputName)2.obj"/>
+ </FileConfiguration>
+ <FileConfiguration
+ Name="Release|Win32">
+ <Tool
+ Name="VCCLCompilerTool"
+ ObjectFile="$(IntDir)/$(InputName)2.obj"/>
+ </FileConfiguration>
+ </File>
+ <File
RelativePath=".\Traversal\Translation.cpp">
<FileConfiguration
Name="Debug|Win32">
@@ -311,6 +410,36 @@
ObjectFile="$(IntDir)/$(InputName)1.obj"/>
</FileConfiguration>
</File>
+ <File
+ RelativePath=".\Traversal\Typedef.cpp">
+ <FileConfiguration
+ Name="Debug|Win32">
+ <Tool
+ Name="VCCLCompilerTool"
+ ObjectFile="$(IntDir)/$(InputName)1.obj"/>
+ </FileConfiguration>
+ <FileConfiguration
+ Name="Release|Win32">
+ <Tool
+ Name="VCCLCompilerTool"
+ ObjectFile="$(IntDir)/$(InputName)1.obj"/>
+ </FileConfiguration>
+ </File>
+ <File
+ RelativePath=".\Traversal\TypeId.cpp">
+ <FileConfiguration
+ Name="Debug|Win32">
+ <Tool
+ Name="VCCLCompilerTool"
+ ObjectFile="$(IntDir)/$(InputName)2.obj"/>
+ </FileConfiguration>
+ <FileConfiguration
+ Name="Release|Win32">
+ <Tool
+ Name="VCCLCompilerTool"
+ ObjectFile="$(IntDir)/$(InputName)2.obj"/>
+ </FileConfiguration>
+ </File>
</Filter>
<Filter
Name="Header Files"
@@ -325,14 +454,29 @@
RelativePath=".\Traversal\Interface.hpp">
</File>
<File
+ RelativePath=".\Traversal\Member.hpp">
+ </File>
+ <File
RelativePath=".\Traversal\Module.hpp">
</File>
<File
RelativePath=".\Traversal\Operation.hpp">
</File>
<File
+ RelativePath=".\Traversal\Sequence.hpp">
+ </File>
+ <File
+ RelativePath=".\Traversal\Struct.hpp">
+ </File>
+ <File
RelativePath=".\Traversal\Translation.hpp">
</File>
+ <File
+ RelativePath=".\Traversal\Typedef.hpp">
+ </File>
+ <File
+ RelativePath=".\Traversal\TypeId.hpp">
+ </File>
</Filter>
</Filter>
<Filter
@@ -376,11 +520,23 @@
RelativePath=".\SemanticAction\Interface.hpp">
</File>
<File
+ RelativePath=".\SemanticAction\Member.hpp">
+ </File>
+ <File
RelativePath=".\SemanticAction\Module.hpp">
</File>
<File
RelativePath=".\SemanticAction\Operation.hpp">
</File>
+ <File
+ RelativePath=".\SemanticAction\Struct.hpp">
+ </File>
+ <File
+ RelativePath=".\SemanticAction\Typedef.hpp">
+ </File>
+ <File
+ RelativePath=".\SemanticAction\TypeId.hpp">
+ </File>
</Filter>
<Filter
Name="Impl"
@@ -468,6 +624,21 @@
</FileConfiguration>
</File>
<File
+ RelativePath=".\SemanticAction\Impl\Member.cpp">
+ <FileConfiguration
+ Name="Debug|Win32">
+ <Tool
+ Name="VCCLCompilerTool"
+ ObjectFile="$(IntDir)/$(InputName)2.obj"/>
+ </FileConfiguration>
+ <FileConfiguration
+ Name="Release|Win32">
+ <Tool
+ Name="VCCLCompilerTool"
+ ObjectFile="$(IntDir)/$(InputName)2.obj"/>
+ </FileConfiguration>
+ </File>
+ <File
RelativePath=".\SemanticAction\Impl\Module.cpp">
<FileConfiguration
Name="Debug|Win32"
@@ -501,6 +672,46 @@
ObjectFile="$(IntDir)/$(InputName)3.obj"/>
</FileConfiguration>
</File>
+ <File
+ RelativePath=".\SemanticAction\Impl\Struct.cpp">
+ <FileConfiguration
+ Name="Debug|Win32"
+ ExcludedFromBuild="TRUE">
+ <Tool
+ Name="VCCLCompilerTool"/>
+ </FileConfiguration>
+ </File>
+ <File
+ RelativePath=".\SemanticAction\Impl\Typedef.cpp">
+ <FileConfiguration
+ Name="Debug|Win32">
+ <Tool
+ Name="VCCLCompilerTool"
+ ObjectFile="$(IntDir)/$(InputName)2.obj"/>
+ </FileConfiguration>
+ <FileConfiguration
+ Name="Release|Win32">
+ <Tool
+ Name="VCCLCompilerTool"
+ ObjectFile="$(IntDir)/$(InputName)2.obj"/>
+ </FileConfiguration>
+ </File>
+ <File
+ RelativePath=".\SemanticAction\Impl\TypeId.cpp">
+ <FileConfiguration
+ Name="Debug|Win32"
+ ExcludedFromBuild="TRUE">
+ <Tool
+ Name="VCCLCompilerTool"
+ ObjectFile="$(IntDir)/$(InputName)1.obj"/>
+ </FileConfiguration>
+ <FileConfiguration
+ Name="Release|Win32">
+ <Tool
+ Name="VCCLCompilerTool"
+ ObjectFile="$(IntDir)/$(InputName)1.obj"/>
+ </FileConfiguration>
+ </File>
</Filter>
<Filter
Name="Header Files"
@@ -521,11 +732,23 @@
RelativePath=".\SemanticAction\Impl\Interface.hpp">
</File>
<File
+ RelativePath=".\SemanticAction\Impl\Member.hpp">
+ </File>
+ <File
RelativePath=".\SemanticAction\Impl\Module.hpp">
</File>
<File
RelativePath=".\SemanticAction\Impl\Operation.hpp">
</File>
+ <File
+ RelativePath=".\SemanticAction\Impl\Struct.hpp">
+ </File>
+ <File
+ RelativePath=".\SemanticAction\Impl\Typedef.hpp">
+ </File>
+ <File
+ RelativePath=".\SemanticAction\Impl\TypeId.hpp">
+ </File>
</Filter>
</Filter>
</Filter>
diff --git a/TAO/CIAO/CCF/CCF/IDL2/SemanticAction.hpp b/TAO/CIAO/CCF/CCF/IDL2/SemanticAction.hpp
index d12d18e4911..bee02c72d47 100644
--- a/TAO/CIAO/CCF/CCF/IDL2/SemanticAction.hpp
+++ b/TAO/CIAO/CCF/CCF/IDL2/SemanticAction.hpp
@@ -15,7 +15,6 @@
#include "CCF/IDL2/SemanticAction/Struct.hpp"
#include "CCF/IDL2/SemanticAction/Typedef.hpp"
#include "CCF/IDL2/SemanticAction/TypeId.hpp"
-
#include "CCF/IDL2/SemanticAction/Factory.hpp"
#endif // CCF_IDL2_SEMANTIC_ACTION_HPP
diff --git a/TAO/CIAO/CCF/CCF/IDL2/SemanticAction/Impl/Member.hpp b/TAO/CIAO/CCF/CCF/IDL2/SemanticAction/Impl/Member.hpp
index f3f5b9e89b1..15e1b5ac6fa 100644
--- a/TAO/CIAO/CCF/CCF/IDL2/SemanticAction/Impl/Member.hpp
+++ b/TAO/CIAO/CCF/CCF/IDL2/SemanticAction/Impl/Member.hpp
@@ -8,6 +8,8 @@
#include "CCF/IDL2/SyntaxTree/Member.hpp"
#include "CCF/IDL2/SemanticAction/Member.hpp"
+using namespace std;
+
namespace CCF
{
namespace IDL2
diff --git a/TAO/CIAO/CCF/CCF/IDL2/SemanticAction/Impl/TypeId.hpp b/TAO/CIAO/CCF/CCF/IDL2/SemanticAction/Impl/TypeId.hpp
index 4ae2a09462d..40b2510af46 100644
--- a/TAO/CIAO/CCF/CCF/IDL2/SemanticAction/Impl/TypeId.hpp
+++ b/TAO/CIAO/CCF/CCF/IDL2/SemanticAction/Impl/TypeId.hpp
@@ -130,11 +130,12 @@ namespace CCF
virtual bool
test (DeclarationPtr const& d) const throw ()
{
+ //@@ MSVC bug - requires fully qualified name in parameter.
return
- d->is_a<SyntaxTree::Module> ()
- || d->is_a<SyntaxTree::FileScope> ()
- || d->is_a<SyntaxTree::InterfaceDecl> ()
- || d->is_a<SyntaxTree::ValueTypeDecl> ();
+ d->is_a<CCF::IDL2::SyntaxTree::Module> ()
+ || d->is_a<CCF::IDL2::SyntaxTree::FileScope> ()
+ || d->is_a<CCF::IDL2::SyntaxTree::InterfaceDecl> ()
+ || d->is_a<CCF::IDL2::SyntaxTree::ValueTypeDecl> ();
}
} p;
diff --git a/TAO/CIAO/CCF/CCF/IDL2/SemanticAction/Impl/Typedef.hpp b/TAO/CIAO/CCF/CCF/IDL2/SemanticAction/Impl/Typedef.hpp
index 00d2c949a50..4a0e5a733e7 100644
--- a/TAO/CIAO/CCF/CCF/IDL2/SemanticAction/Impl/Typedef.hpp
+++ b/TAO/CIAO/CCF/CCF/IDL2/SemanticAction/Impl/Typedef.hpp
@@ -11,6 +11,8 @@
#include <sstream>
+using namespace std;
+
namespace CCF
{
namespace IDL2
diff --git a/TAO/CIAO/CCF/CCF/IDL2/SyntaxTree/ElementsCtor.cpp b/TAO/CIAO/CCF/CCF/IDL2/SyntaxTree/ElementsCtor.cpp
index 89601eed775..cc800fa9967 100644
--- a/TAO/CIAO/CCF/CCF/IDL2/SyntaxTree/ElementsCtor.cpp
+++ b/TAO/CIAO/CCF/CCF/IDL2/SyntaxTree/ElementsCtor.cpp
@@ -8,8 +8,9 @@ namespace CCF
{
namespace SyntaxTree
{
- struct Declaration
+ class Declaration
{
+ protected:
Declaration ();
};
diff --git a/TAO/CIAO/CCF/CCF/IDL2/SyntaxTree/InterfaceCtor.cpp b/TAO/CIAO/CCF/CCF/IDL2/SyntaxTree/InterfaceCtor.cpp
index 81ef700a8d7..ed9713a50d4 100644
--- a/TAO/CIAO/CCF/CCF/IDL2/SyntaxTree/InterfaceCtor.cpp
+++ b/TAO/CIAO/CCF/CCF/IDL2/SyntaxTree/InterfaceCtor.cpp
@@ -8,8 +8,9 @@ namespace CCF
{
namespace SyntaxTree
{
- struct InterfaceDef
+ class InterfaceDef
{
+ protected:
InterfaceDef ();
};
diff --git a/TAO/CIAO/CCF/CCF/IDL2/SyntaxTree/Struct.cpp b/TAO/CIAO/CCF/CCF/IDL2/SyntaxTree/Struct.cpp
index 4c0999cee8f..4dbba686e64 100644
--- a/TAO/CIAO/CCF/CCF/IDL2/SyntaxTree/Struct.cpp
+++ b/TAO/CIAO/CCF/CCF/IDL2/SyntaxTree/Struct.cpp
@@ -29,12 +29,12 @@ namespace CCF
return true;
}
- catch (DeclarationTable::DeclarationNotFound const& e)
+ catch (DeclarationTable::DeclarationNotFound const&)
{
//@@ ICE
abort ();
}
- catch (DeclarationTable::TypeMismatch const& e)
+ catch (DeclarationTable::TypeMismatch const&)
{
return false;
}
diff --git a/TAO/CIAO/CCF/CCF/IDL2/SyntaxTree/Typedef.hpp b/TAO/CIAO/CCF/CCF/IDL2/SyntaxTree/Typedef.hpp
index cdd7b5a2024..29f401decb1 100644
--- a/TAO/CIAO/CCF/CCF/IDL2/SyntaxTree/Typedef.hpp
+++ b/TAO/CIAO/CCF/CCF/IDL2/SyntaxTree/Typedef.hpp
@@ -51,6 +51,13 @@ namespace CCF
}
public:
+ ScopedName
+ type_name () const
+ {
+ return type_;
+ }
+
+ public:
virtual std::string
declaration_class ()
{
diff --git a/TAO/CIAO/CCF/CCF/IDL2/SyntaxTree/ValueTypeCtor.cpp b/TAO/CIAO/CCF/CCF/IDL2/SyntaxTree/ValueTypeCtor.cpp
index 527f4438787..4fc3cfc11e2 100644
--- a/TAO/CIAO/CCF/CCF/IDL2/SyntaxTree/ValueTypeCtor.cpp
+++ b/TAO/CIAO/CCF/CCF/IDL2/SyntaxTree/ValueTypeCtor.cpp
@@ -8,8 +8,9 @@ namespace CCF
{
namespace SyntaxTree
{
- struct ValueTypeDef
+ class ValueTypeDef
{
+ protected:
ValueTypeDef ();
};
diff --git a/TAO/CIAO/CCF/CCF/IDL2/Traversal.hpp b/TAO/CIAO/CCF/CCF/IDL2/Traversal.hpp
index 8f92146e8da..a44c151001e 100644
--- a/TAO/CIAO/CCF/CCF/IDL2/Traversal.hpp
+++ b/TAO/CIAO/CCF/CCF/IDL2/Traversal.hpp
@@ -11,6 +11,7 @@
#include "CCF/IDL2/Traversal/Member.hpp"
#include "CCF/IDL2/Traversal/Module.hpp"
#include "CCF/IDL2/Traversal/Operation.hpp"
+#include "CCF/IDL2/Traversal/Struct.hpp"
#include "CCF/IDL2/Traversal/Sequence.hpp"
#include "CCF/IDL2/Traversal/Struct.hpp"
#include "CCF/IDL2/Traversal/Translation.hpp"
diff --git a/TAO/CIAO/CIDLC/TypeNameEmitter.cpp b/TAO/CIAO/CIDLC/TypeNameEmitter.cpp
index bf3ae1eac73..1672ecdf534 100644
--- a/TAO/CIAO/CIDLC/TypeNameEmitter.cpp
+++ b/TAO/CIAO/CIDLC/TypeNameEmitter.cpp
@@ -105,12 +105,24 @@ ReturnTypeNameEmitter::traverse (StringDeclPtr const&)
}
void
+ReturnTypeNameEmitter::traverse (TypedefDeclPtr const &, StringDeclPtr const&)
+{
+ os << "char *";
+}
+
+void
ReturnTypeNameEmitter::traverse (WstringDeclPtr const&)
{
os << "::CORBA::WChar *";
}
void
+ReturnTypeNameEmitter::traverse (TypedefDeclPtr const &, WstringDeclPtr const&)
+{
+ os << "::CORBA::WChar *";
+}
+
+void
ReturnTypeNameEmitter::traverse (ObjectDeclPtr const&)
{
os << "::CORBA::Object_ptr";
@@ -129,6 +141,18 @@ ReturnTypeNameEmitter::traverse (AnyDeclPtr const&)
}
void
+ReturnTypeNameEmitter::traverse (StructDeclPtr const&)
+{
+ //os << "::CORBA::Any *";
+}
+
+void
+ReturnTypeNameEmitter::traverse (SequenceDeclPtr const& s)
+{
+ os << s->name () << " *";
+}
+
+void
ReturnTypeNameEmitter::traverse (LocalInterfaceDeclPtr const& i)
{
os << i->name () << "_ptr";
@@ -243,6 +267,18 @@ INArgTypeNameEmitter::traverse (AnyDeclPtr const&)
os << "const ::CORBA::Any &";
}
+void
+INArgTypeNameEmitter::traverse (StructDeclPtr const&)
+{
+ //os << "::CORBA::Any *";
+}
+
+void
+INArgTypeNameEmitter::traverse (SequenceDeclPtr const& s)
+{
+ os << "const " << s->name () << " &";;
+}
+
// ===============================================================
INOUTArgTypeNameEmitter::INOUTArgTypeNameEmitter (ostream& os_)
@@ -352,6 +388,18 @@ INOUTArgTypeNameEmitter::traverse (AnyDeclPtr const&)
os << "::CORBA::Any &";
}
+void
+INOUTArgTypeNameEmitter::traverse (StructDeclPtr const&)
+{
+ //os << "::CORBA::Any *";
+}
+
+void
+INOUTArgTypeNameEmitter::traverse (SequenceDeclPtr const& s)
+{
+ os << s->name () << " &";
+}
+
// =================================================================
OUTArgTypeNameEmitter::OUTArgTypeNameEmitter (ostream& os_)
@@ -460,3 +508,16 @@ OUTArgTypeNameEmitter::traverse (AnyDeclPtr const&)
{
os << "::CORBA::Any_out";
}
+
+void
+OUTArgTypeNameEmitter::traverse (StructDeclPtr const&)
+{
+ //os << "::CORBA::Any *";
+}
+
+void
+OUTArgTypeNameEmitter::traverse (SequenceDeclPtr const& s)
+{
+ os << s->name () << "_out";
+}
+
diff --git a/TAO/CIAO/CIDLC/TypeNameEmitter.hpp b/TAO/CIAO/CIDLC/TypeNameEmitter.hpp
index eba2dfcde58..b5dbb34f3ac 100644
--- a/TAO/CIAO/CIDLC/TypeNameEmitter.hpp
+++ b/TAO/CIAO/CIDLC/TypeNameEmitter.hpp
@@ -29,10 +29,14 @@ class TypeNameEmitter : public Traversal::VoidDecl,
public Traversal::FloatDecl,
public Traversal::DoubleDecl,
public Traversal::StringDecl,
+ public Traversal::TypedefDecl<StringDecl>,
public Traversal::WstringDecl,
+ public Traversal::TypedefDecl<WstringDecl>,
public Traversal::ObjectDecl,
public Traversal::ValueBaseDecl,
public Traversal::AnyDecl,
+ public Traversal::StructDecl,
+ public Traversal::SequenceDecl,
public Traversal::LocalInterfaceDecl
{
protected:
@@ -63,10 +67,14 @@ public:
virtual void traverse (FloatDeclPtr const&);
virtual void traverse (DoubleDeclPtr const&);
virtual void traverse (StringDeclPtr const&);
+ virtual void traverse (TypedefDeclPtr const&, StringDeclPtr const&);
virtual void traverse (WstringDeclPtr const&);
+ virtual void traverse (TypedefDeclPtr const&, WstringDeclPtr const&);
virtual void traverse (ObjectDeclPtr const&);
virtual void traverse (ValueBaseDeclPtr const&);
virtual void traverse (AnyDeclPtr const&);
+ virtual void traverse (StructDeclPtr const&);
+ virtual void traverse (SequenceDeclPtr const&);
virtual void traverse (LocalInterfaceDeclPtr const&);
};
@@ -95,6 +103,8 @@ public:
virtual void traverse (ObjectDeclPtr const&);
virtual void traverse (ValueBaseDeclPtr const&);
virtual void traverse (AnyDeclPtr const&);
+ virtual void traverse (StructDeclPtr const&);
+ virtual void traverse (SequenceDeclPtr const&);
};
// Generates the typename of an INOUT argument.
@@ -122,6 +132,8 @@ public:
virtual void traverse (ObjectDeclPtr const&);
virtual void traverse (ValueBaseDeclPtr const&);
virtual void traverse (AnyDeclPtr const&);
+ virtual void traverse (StructDeclPtr const&);
+ virtual void traverse (SequenceDeclPtr const&);
};
// Generates the typename of an OUT argument.
@@ -149,6 +161,8 @@ public:
virtual void traverse (ObjectDeclPtr const&);
virtual void traverse (ValueBaseDeclPtr const&);
virtual void traverse (AnyDeclPtr const&);
+ virtual void traverse (StructDeclPtr const&);
+ virtual void traverse (SequenceDeclPtr const&);
};
#endif /* TYPENAME_EMITTER_HPP */
diff --git a/TAO/CIAO/ChangeLog b/TAO/CIAO/ChangeLog
index 147647cbfe1..5ba9bdcb707 100644
--- a/TAO/CIAO/ChangeLog
+++ b/TAO/CIAO/ChangeLog
@@ -1,3 +1,28 @@
+Fri Oct 24 18:17:21 2003 Jeff Parsons <j.parsons@vanderbilt.edu>
+
+ * CCF/CCF/IDL2/IDL2.vcproj:
+
+ Added new front end files to the project.
+
+ * CCF/CCF/IDL2/SemanticAction.hpp:
+ * CCF/CCF/IDL2/Traversal.hpp:
+ * CCF/CCF/IDL2/SemanticAction/Impl/Member.hpp:
+ * CCF/CCF/IDL2/SemanticAction/Impl/TypeId.hpp:
+ * CCF/CCF/IDL2/SemanticAction/Impl/Typedef.hpp:
+ * CCF/CCF/IDL2/SyntaxTree/ElementsCtor.cpp:
+ * CCF/CCF/IDL2/SyntaxTree/InterfaceCtor.cpp:
+ * CCF/CCF/IDL2/SyntaxTree/Struct.cpp:
+ * CCF/CCF/IDL2/SyntaxTree/Typedef.hpp:
+ * CCF/CCF/IDL2/SyntaxTree/ValueTypeCtor.cpp:
+
+ Fixed various minor errors, such as removal of unused argument
+ identifiers, and addition of 'using std".
+
+ * CIDLC/TypeNameEmitter.cpp:
+ * CIDLC/TypeNameEmitter.hpp:
+
+ Added case for sequences, and typedefs of string and wstring.
+
Fri Oct 24 17:14:51 2003 Boris Kolpackov <boris@dre.vanderbilt.edu>
* CCF/CCF/IDL2/Traversal/Typedef.hpp: New implementation of