diff options
Diffstat (limited to 'TAO/CIAO/CIDLC/RepositoryIdGenerator.cpp')
| -rw-r--r-- | TAO/CIAO/CIDLC/RepositoryIdGenerator.cpp | 255 |
1 files changed, 74 insertions, 181 deletions
diff --git a/TAO/CIAO/CIDLC/RepositoryIdGenerator.cpp b/TAO/CIAO/CIDLC/RepositoryIdGenerator.cpp index 796f2ef848e..7746dac71b5 100644 --- a/TAO/CIAO/CIDLC/RepositoryIdGenerator.cpp +++ b/TAO/CIAO/CIDLC/RepositoryIdGenerator.cpp @@ -6,124 +6,54 @@ #include "Literals.hpp" #include "CCF/CompilerElements/Diagnostic.hpp" + +#include "CCF/CIDL/SemanticGraph.hpp" #include "CCF/CIDL/Traversal.hpp" -#include "CCF/CodeGenerationKit/Regex.hpp" using namespace CCF::CIDL; -using namespace CCF::CIDL::SemanticGraph; -using namespace StringLiterals; -using namespace std; +using namespace SyntaxTree; namespace { - string - name_to_string (Name const& n) - { - ostringstream os; - os << n; - return os.str (); - } - - Nameable* defined_in (Nameable& n) - { - for (Nameable::NamedIterator i (n.named_begin ()), e (n.named_end ()); - i != e; - ++i) - { - if (Defines* d = dynamic_cast<Defines*> (*i)) - { - return &d->scope (); - } - } - - return 0; - } - - void - compute_new_repo_id (Nameable& d) - { - string prefix (""); - TypePrefix *tp = 0; - - if (d.context ().count (STRS[TYPE_PREFIX])) - { - tp = d.context ().get<TypePrefix*> (STRS[TYPE_PREFIX]); - prefix = tp->prefix ().literal (); - } - else - { - Nameable* parent = defined_in (d); - - while (parent != 0) - { - if (parent->context ().count (STRS[TYPE_PREFIX])) - { - tp = - parent->context ().get<TypePrefix*> (STRS[TYPE_PREFIX]); - - prefix = tp->prefix ().literal (); - break; - } - - parent = defined_in (*parent); - } - } - - if (prefix != "") prefix += "/"; - - ScopedName scoped (d.scoped_name ()); - Name stripped (scoped.begin () + 1, scoped.end ()); - - string scope_name = regex::perl_s (name_to_string (stripped), "%::%/%"); - - string repo_id = "IDL:" + prefix + scope_name + ":1.0"; - - d.context ().set<string> (STRS[REPO_ID], repo_id); - } + char const* const + type_id_label = "CIDLC::RepositoryIdGenerator::TypeId"; - void - compute_repo_id (Nameable& d) - { - if (d.context ().count (STRS[REPO_ID])) - { - return; - } - else - { - compute_new_repo_id (d); - } - } + char const* const + type_prefix_label = "CIDLC::RepositoryIdGenerator::TypePrefix"; } namespace { + // + // + // class TypeIdLabelGenerator : public Traversal::TypeId { public: - TypeIdLabelGenerator (Diagnostic::Stream& dout, - TranslationUnit& tu) - : dout_ (dout), - tu_ (tu) + TypeIdLabelGenerator (Diagnostic::Stream& dout) + : dout_ (dout) { } virtual void - traverse (SemanticGraph::TypeId& ti) + traverse (TypeIdPtr const& ti) { - ScopedName decl_name (ti.declaration ()); - Nameables ref = tu_.lookup (decl_name); + ScopedName decl_name (ti->declaration ()); - for (Nameables::const_iterator iter (ref.begin ()); - iter != ref.end (); - ++iter) + DeclarationTable::IteratorPair iters ( + ti->table ().lookup (decl_name)); + + for (; iters.first != iters.second; ++iters.first) { - Nameable *decl = *iter; + DeclarationPtr decl (*iters.first); - if (decl->context ().count (STRS[TYPE_ID])) + if (decl->context ().count ( + StringLiterals::STRS[StringLiterals::TYPE_ID])) { //@@ Seems it should contain filename and line // of its origin. // + Diagnostic::Error err ("???", 0); err << "repetition of typeid for " << decl_name @@ -139,50 +69,56 @@ namespace } else { - decl->context ().set (STRS[TYPE_ID], &ti); - decl->context ().set (STRS[REPO_ID], ti.id ().literal ()); + decl->context ().set ( + StringLiterals::STRS[StringLiterals::TYPE_ID], ti); + decl->context ().set ( + StringLiterals::STRS[StringLiterals::REPO_ID], ti->id ().str ()); } } } private: Diagnostic::Stream& dout_; - SemanticGraph::TranslationUnit& tu_; }; + + // + // + // class TypePrefixLabelGenerator : public Traversal::TypePrefix { public: - TypePrefixLabelGenerator (Diagnostic::Stream& dout, - TranslationUnit& tu) - : dout_ (dout), - tu_ (tu) + TypePrefixLabelGenerator (Diagnostic::Stream& dout) + : dout_ (dout) { } virtual void - traverse (SemanticGraph::TypePrefix& tp) + traverse (TypePrefixPtr const& tp) { - ScopedName decl_name (tp.declaration ()); - Nameables ref = tu_.lookup (decl_name); + ScopedName decl_name (tp->declaration ()); + + DeclarationTable::IteratorPair iters ( + tp->table ().lookup (decl_name)); - for (Nameables::const_iterator iter (ref.begin ()); - iter != ref.end (); - ++iter) + for (; iters.first != iters.second; ++iters.first) { - Nameable *decl = *iter; - CCF::CompilerElements::Context& ctx = decl->context (); + DeclarationPtr decl (*iters.first); - if (ctx.count (STRS[TYPE_PREFIX])) + if (decl->context ().count ( + StringLiterals::STRS[StringLiterals::TYPE_PREFIX])) { - SemanticGraph::TypePrefix* prev = - ctx.get<SemanticGraph::TypePrefix*> (STRS[TYPE_PREFIX]); - - if (prev->prefix () != tp.prefix ()) + TypePrefixPtr prev ( + decl->context ().get<TypePrefixPtr> ( + StringLiterals::STRS[StringLiterals::TYPE_PREFIX])); + + if ((prev->prefix ()) != (tp->prefix ())) { - //@@ Seems tp should contain filename and line + + //@@ Seems tp should containt filename and line // of it's origin. // + Diagnostic::Error err ("???", 0); err << "resetting type prefix for " << decl_name @@ -199,85 +135,42 @@ namespace } else { - decl->context ().set (STRS[TYPE_PREFIX], &tp); - - // A typeprefix declaration could appear after the IDL - // type declaration, so we want to update the repo id - // every time. - compute_new_repo_id (*decl); + decl->context ().set ( + StringLiterals::STRS[StringLiterals::TYPE_PREFIX], tp); } } } private: Diagnostic::Stream& dout_; - SemanticGraph::TranslationUnit& tu_; - }; - - class RepoIdGenerator : public Traversal::Interface, - public Traversal::EventType - { - virtual void - traverse (SemanticGraph::Interface& i) - { - compute_repo_id (i); - } - - virtual void - traverse (SemanticGraph::EventType& e) - { - compute_repo_id (e); - } }; } -bool RepositoryIdGenerator::generate (TranslationUnit& u) +bool RepositoryIdGenerator:: +generate (TranslationUnitPtr const& u) { - Diagnostic::Stream dout; - - TypeIdLabelGenerator type_id (dout, u); - TypePrefixLabelGenerator type_prefix (dout, u); - RepoIdGenerator repo_id; - - Traversal::TranslationUnit unit; - - Traversal::ContainsPrincipal contains_principal; - unit.edge_traverser (contains_principal); - - Traversal::TranslationRegion region; - contains_principal.node_traverser (region); - - Traversal::ContainsRoot contains_root; - Traversal::Includes includes; - - region.edge_traverser (includes); - region.edge_traverser (contains_root); - - Traversal::Root root; - includes.node_traverser (region); - contains_root.node_traverser (root); - - Traversal::Defines defines; - root.edge_traverser (defines); - - Traversal::Module module; - - defines.node_traverser (module); - defines.node_traverser (type_id); - defines.node_traverser (type_prefix); - defines.node_traverser (repo_id); - - module.edge_traverser (defines); - - Traversal::Interface iface; - defines.node_traverser (iface); - - unit.traverse (u); - - if (dout.error_count () != 0) return false; - - //@@ check errors + { + Diagnostic::Stream dout; + + TypeIdLabelGenerator type_id (dout); + TypePrefixLabelGenerator type_prefix (dout); + + Traversal::Scope scope; + scope.add_scope_delegate (&type_id); + scope.add_scope_delegate (&type_prefix); + + Traversal::TranslationRegion region (&scope); + + Traversal::TranslationUnit unit; + unit.add_content_delegate (®ion); + + unit.dispatch (u); + + if (dout.error_count () != 0) return false; + + //@@ check errors + } return true; } |