diff options
author | Boris Kolpackov <boris@codesynthesis.com> | 2009-09-20 06:38:01 +0200 |
---|---|---|
committer | Boris Kolpackov <boris@codesynthesis.com> | 2009-09-20 06:38:01 +0200 |
commit | 3b64eb05fd0b139d9f6e4701c2f191bed72328bc (patch) | |
tree | 86345729dadf5d8893bfe288fec9133a0a39f895 | |
parent | 28b0b90f965f08c6363555b6e672da807f9faf7a (diff) | |
download | cli-3b64eb05fd0b139d9f6e4701c2f191bed72328bc.tar.gz cli-3b64eb05fd0b139d9f6e4701c2f191bed72328bc.tar.xz cli-3b64eb05fd0b139d9f6e4701c2f191bed72328bc.zip |
Get rid of the name typedef
Use std::string directly.
-rw-r--r-- | cli/semantics/elements.cxx | 2 | ||||
-rw-r--r-- | cli/semantics/elements.hxx | 16 |
2 files changed, 7 insertions, 11 deletions
diff --git a/cli/semantics/elements.cxx b/cli/semantics/elements.cxx index de9e03a..685604a 100644 --- a/cli/semantics/elements.cxx +++ b/cli/semantics/elements.cxx @@ -13,7 +13,7 @@ namespace semantics // scope::names_iterator_pair scope:: - find (name_type const& name) const + find (string const& name) const { names_map::const_iterator i (names_map_.find (name)); diff --git a/cli/semantics/elements.hxx b/cli/semantics/elements.hxx index da9e031..bbc5517 100644 --- a/cli/semantics/elements.hxx +++ b/cli/semantics/elements.hxx @@ -37,8 +37,6 @@ namespace semantics // // - typedef string name; - using fs::path; using fs::invalid_path; @@ -185,15 +183,14 @@ namespace semantics class names: public edge { public: - typedef semantics::name name_type; typedef semantics::scope scope_type; - typedef std::vector<name_type> name_list; + typedef std::vector<string> name_list; typedef name_list::const_iterator name_iterator; // First name. // - name_type const& + string const& name () const { return names_[0]; @@ -226,7 +223,7 @@ namespace semantics protected: friend class graph<node, edge>; - names (name_type const& name) + names (string const& name) { names_.push_back (name); } @@ -274,10 +271,9 @@ namespace semantics class nameable: public virtual node { public: - typedef semantics::name name_type; typedef semantics::scope scope_type; - name_type + string name () const { return named_->name (); @@ -331,7 +327,7 @@ namespace semantics protected: typedef std::list<names*> names_list; typedef std::map<names*, names_list::iterator> list_iterator_map; - typedef std::map<name_type, names_list> names_map; + typedef std::map<string, names_list> names_map; public: typedef pointer_iterator<names_list::iterator> names_iterator; @@ -367,7 +363,7 @@ namespace semantics } virtual names_iterator_pair - find (name_type const&) const; + find (string const& name) const; names_iterator find (names&); |