diff options
| author | boris <boris@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2003-10-29 19:34:57 +0000 |
|---|---|---|
| committer | boris <boris@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2003-10-29 19:34:57 +0000 |
| commit | dc3ea749a9fba11bb2df81fcf7359badd9a8b842 (patch) | |
| tree | 9a9ab532a3d6f3743d3928ebcac66fc0e5314648 | |
| parent | 3210ac8be498036dfbc2a6c257c6617fe2c06af8 (diff) | |
| download | ATCD-dc3ea749a9fba11bb2df81fcf7359badd9a8b842.tar.gz | |
ChangeLogTag: Wed Oct 29 13:36:47 2003 Boris Kolpackov <boris@dre.vanderbilt.edu>
| -rw-r--r-- | TAO/CIAO/CCF/CCF/IDL2/Traversal/Elements.cpp | 6 | ||||
| -rw-r--r-- | TAO/CIAO/CCF/CCF/IDL2/Traversal/Elements.hpp | 2 | ||||
| -rw-r--r-- | TAO/CIAO/CCF/CCF/IDL2/Traversal/Typedef.hpp | 7 | ||||
| -rw-r--r-- | TAO/CIAO/ChangeLog | 7 |
4 files changed, 15 insertions, 7 deletions
diff --git a/TAO/CIAO/CCF/CCF/IDL2/Traversal/Elements.cpp b/TAO/CIAO/CCF/CCF/IDL2/Traversal/Elements.cpp index fc4ec5bae66..2c4878817d9 100644 --- a/TAO/CIAO/CCF/CCF/IDL2/Traversal/Elements.cpp +++ b/TAO/CIAO/CCF/CCF/IDL2/Traversal/Elements.cpp @@ -74,7 +74,7 @@ namespace CCF } } - void Dispatcher:: + bool Dispatcher:: dispatch (SyntaxTree::NodePtr const& n) { LevelMap levels; @@ -133,8 +133,10 @@ namespace CCF SyntaxTree::NodePtr v (n->virtual_type ()); - if (v != 0) dispatch (v); + if (v != 0) match = dispatch (v); } + + return match; } // Scope diff --git a/TAO/CIAO/CCF/CCF/IDL2/Traversal/Elements.hpp b/TAO/CIAO/CCF/CCF/IDL2/Traversal/Elements.hpp index 442f11b2276..de0b5cd9080 100644 --- a/TAO/CIAO/CCF/CCF/IDL2/Traversal/Elements.hpp +++ b/TAO/CIAO/CCF/CCF/IDL2/Traversal/Elements.hpp @@ -48,7 +48,7 @@ namespace CCF { } - virtual void + virtual bool dispatch (SyntaxTree::NodePtr const& n); public: diff --git a/TAO/CIAO/CCF/CCF/IDL2/Traversal/Typedef.hpp b/TAO/CIAO/CCF/CCF/IDL2/Traversal/Typedef.hpp index dae9925035c..486d6c27ac6 100644 --- a/TAO/CIAO/CCF/CCF/IDL2/Traversal/Typedef.hpp +++ b/TAO/CIAO/CCF/CCF/IDL2/Traversal/Typedef.hpp @@ -25,18 +25,17 @@ namespace CCF virtual bool traverse (SyntaxTree::NodePtr const& n) { - traverse (n->dynamic_type<SyntaxTree::TypedefDecl> ()); - return true; + return traverse (n->dynamic_type<SyntaxTree::TypedefDecl> ()); } - virtual void + virtual bool traverse (SyntaxTree::TypedefDeclPtr const& n) { typedef_decl = n; SyntaxTree::NodePtr vt (n->virtual_type ()); - disp_.dispatch (vt); + return disp_.dispatch (vt); } protected: diff --git a/TAO/CIAO/ChangeLog b/TAO/CIAO/ChangeLog index 88262a59f7d..1104bee2776 100644 --- a/TAO/CIAO/ChangeLog +++ b/TAO/CIAO/ChangeLog @@ -1,3 +1,10 @@ +Wed Oct 29 13:36:47 2003 Boris Kolpackov <boris@dre.vanderbilt.edu> + + * CCF/CCF/IDL2/Traversal/Elements.cpp: + * CCF/CCF/IDL2/Traversal/Elements.hpp: + * CCF/CCF/IDL2/Traversal/Typedef.hpp: fixed bug in typedef + traversal scheme. + Fri Oct 24 19:16:21 2003 Boris Kolpackov <boris@dre.vanderbilt.edu> * CCF/CCF/IDL2/Traversal/Elements.hpp: |