Use C++11 features to manipulate containers

[libs/datafile.git] / source / loader.cpp

diff --git a/source/loader.cpp b/source/loader.cpp
index 3484799a3e4891b12b622139b646e27a582690a1..98a0234961d2029d0b665450a314c120bf90e35f 100644 (file)
--- a/source/loader.cpp
+++ b/source/loader.cpp
@@ -24,7 +24,7 @@ int signature_match(const string &st_sig, const string &act_sig)
        else if(act_sig.size()==2 && act_sig[1]=='*')
        {
                int match = 3;
-               for(string::const_iterator i=st_sig.begin(); (i!=st_sig.end() && match); ++i)
+               for(auto i=st_sig.begin(); (i!=st_sig.end() && match); ++i)
                        match = min(match, signature_match(*i, act_sig[0]));
 
                return match;
@@ -79,8 +79,8 @@ void Loader::load(const Statement &st)
        if(!actions)
                throw logic_error("no actions");
 
-       for(list<Statement>::const_iterator i=st.sub.begin(); i!=st.sub.end(); ++i)
-               load_statement(*i);
+       for(const Statement &s: st.sub)
+               load_statement(s);
        finish();
 }
 
@@ -117,9 +117,9 @@ void Loader::load_statement(const Statement &st)
 
                if(!aux_loaders.empty() && !has_action(key))
                {
-                       for(vector<Loader *>::const_iterator i=aux_loaders.begin(); i!=aux_loaders.end(); ++i)
-                               if((*i)->has_action(key))
-                                       return (*i)->load_statement(st);
+                       for(Loader *l: aux_loaders)
+                               if(l->has_action(key))
+                                       return l->load_statement(st);
                }
 
                LoaderAction *act = find_action(key);
@@ -196,7 +196,7 @@ bool Loader::has_action(const StatementKey &key) const
        if(!actions)
                return false;
 
-       ActionMap::const_iterator i = actions->lower_bound(StatementKey(key.keyword, string()));
+       auto i = actions->lower_bound(StatementKey(key.keyword, string()));
        for(; (i!=actions->end() && i->first.keyword==key.keyword); ++i)
                if(signature_match(key.signature, i->first.signature))
                        return true;
@@ -208,15 +208,15 @@ LoaderAction *Loader::find_action(const StatementKey &key) const
        if(!actions)
                return 0;
 
-       ActionMap::const_iterator begin = actions->lower_bound(StatementKey(key.keyword, string()));
-       ActionMap::const_iterator end = actions->upper_bound(StatementKey(key.keyword, "~"));
+       auto begin = actions->lower_bound(StatementKey(key.keyword, string()));
+       auto end = actions->upper_bound(StatementKey(key.keyword, "~"));
 
        if(begin==end)
                throw unknown_keyword(key.keyword);
 
        LoaderAction *act = 0;
        int match = 0;
-       for(ActionMap::const_iterator i=begin; i!=end; ++i)
+       for(auto i=begin; i!=end; ++i)
        {
                int m = signature_match(key.signature, i->first.signature);
                if(m>match)
@@ -249,8 +249,8 @@ const string &Loader::get_keyword() const
 
 Loader::ActionMap::~ActionMap()
 {
-       for(iterator i=begin(); i!=end(); ++i)
-               delete i->second;
+       for(const auto &kvp: *this)
+               delete kvp.second;
 }
 
 } // namespace DataFile