Replace basic for loops with range-based loops or algorithms

[builder.git] / source / component.cpp

diff --git a/source/component.cpp b/source/component.cpp
index 2d09f8a0cd007ed12f9e7c09d2a1c78cc4670b47..0e183b5fc8039e509a0fecc87e9f4f66a8a138f5 100644 (file)
--- a/source/component.cpp
+++ b/source/component.cpp
@@ -1,4 +1,4 @@
-#include <algorithm>
+#include <msp/core/algorithm.h>
 #include <msp/fs/dir.h>
 #include <msp/fs/stat.h>
 #include <msp/fs/utils.h>
@@ -19,8 +19,8 @@ Component::Component(SourcePackage &p, const string &n):
 
 void Component::prepare()
 {
-       for(Package::Requirements::const_iterator i=requires.begin(); i!=requires.end(); ++i)
-               (*i)->prepare();
+       for(Package *r: requires)
+               r->prepare();
 }
 
 void Component::create_build_info()
@@ -32,27 +32,26 @@ void Component::create_build_info()
        direct_reqs.insert(direct_reqs.end(), pkg_reqs.begin(), pkg_reqs.end());
 
        Package::Requirements all_reqs = direct_reqs;
-       for(Package::Requirements::iterator i=all_reqs.begin(); i!=all_reqs.end(); ++i)
+       for(Package *r: all_reqs)
        {
                BuildInfo::UpdateLevel level = BuildInfo::CHAINED;
-               if(find(direct_reqs.begin(), direct_reqs.end(), *i)!=direct_reqs.end())
+               if(find(direct_reqs.begin(), direct_reqs.end(), r)!=direct_reqs.end())
                        level = BuildInfo::DEPENDENCY;
-               final_build_info.update_from((*i)->get_exported_build_info(), level);
+               final_build_info.update_from(r->get_exported_build_info(), level);
 
-               const Package::Requirements &reqs = (*i)->get_required_packages();
-               for(Package::Requirements::const_iterator j=reqs.begin(); j!=reqs.end(); ++j)
-                       if(find(all_reqs.begin(), all_reqs.end(), *j)==all_reqs.end())
-                               all_reqs.push_back(*j);
+               for(Package *q: r->get_required_packages())
+                       if(find(all_reqs.begin(), all_reqs.end(), q)==all_reqs.end())
+                               all_reqs.push_back(q);
        }
 
        final_build_info.update_from(package.get_build_info());
        final_build_info.update_from(build_info);
        build_info = final_build_info;
 
-       for(BuildInfo::PathList::iterator i=build_info.incpath.begin(); i!=build_info.incpath.end(); ++i)
-               *i = (package.get_source_directory() / *i).str();
-       for(BuildInfo::PathList::iterator i=build_info.libpath.begin(); i!=build_info.libpath.end(); ++i)
-               *i = (package.get_source_directory() / *i).str();
+       for(FS::Path &p: build_info.incpath)
+               p = (package.get_source_directory()/p).str();
+       for(FS::Path &p: build_info.libpath)
+               p = (package.get_source_directory()/p).str();
 }
 
 BuildInfo Component::get_build_info_for_path(const FS::Path &path) const
@@ -76,20 +75,15 @@ BuildInfo Component::get_build_info_for_path(const FS::Path &path) const
        {
                FS::Path dir = FS::dirname(path);
                string last = FS::basename(dir);
-               for(OverlayList::const_iterator i=overlays.begin(); i!=overlays.end(); ++i)
-                       if(last==*i)
-                       {
-                               dir = FS::dirname(dir);
-                               break;
-                       }
+               if(any_equals(overlays, last))
+                       dir = FS::dirname(dir);
 
-               for(SourceList::const_iterator i=sources.begin(); i!=sources.end(); ++i)
-                       if(dir==*i)
-                       {
-                               binfo.local_incpath.push_back(dir);
-                               for(OverlayList::const_iterator j=overlays.begin(); j!=overlays.end(); ++j)
-                                       binfo.local_incpath.push_back(*i/ *j);
-                       }
+               if(any_equals(sources, dir))
+               {
+                       binfo.local_incpath.push_back(dir);
+                       for(const string &o: overlays)
+                               binfo.local_incpath.push_back(dir/o);
+               }
        }
        return binfo;
 }
@@ -97,33 +91,31 @@ BuildInfo Component::get_build_info_for_path(const FS::Path &path) const
 Component::SourceList Component::collect_source_files() const
 {
        SourceList files;
-       for(SourceList::const_iterator i=sources.begin(); i!=sources.end(); ++i)
+       for(const FS::Path &p: sources)
        {
-               FS::Path path(*i);
-               if(FS::is_dir(path))
+               if(FS::is_dir(p))
                {
                        SourceList dirs;
-                       dirs.push_back(path);
-                       for(OverlayList::const_iterator j=overlays.begin(); j!=overlays.end(); ++j)
+                       dirs.push_back(p);
+                       for(const string &o: overlays)
                        {
-                               FS::Path opath = path / *j;
+                               FS::Path opath = p/o;
                                if(FS::is_dir(opath))
                                        dirs.push_back(opath);
                        }
                        set<string> overlay_files;
-                       for(SourceList::const_iterator j=dirs.begin(); j!=dirs.end(); ++j)
+                       for(auto j=dirs.begin(); j!=dirs.end(); ++j)
                        {
                                package.get_builder().get_logger().log("files", format("Traversing %s", *j));
-                               vector<string> sfiles = list_files(*j);
-                               for(vector<string>::iterator k=sfiles.begin(); k!=sfiles.end(); ++k)
+                               for(const string &f: list_files(*j))
                                {
                                        if(j!=dirs.begin())
                                        {
-                                               if(overlay_files.count(*k))
+                                               if(overlay_files.count(f))
                                                        continue;
-                                               overlay_files.insert(*k);
+                                               overlay_files.insert(f);
                                        }
-                                       FS::Path fn = *j / *k;
+                                       FS::Path fn = *j/f;
                                        if(!FS::is_dir(fn))
                                                files.push_back(fn);
                                }
@@ -131,10 +123,10 @@ Component::SourceList Component::collect_source_files() const
                }
                else
                {
-                       files.push_back(path);
-                       for(OverlayList::const_iterator j=overlays.begin(); j!=overlays.end(); ++j)
+                       files.push_back(p);
+                       for(const string &o: overlays)
                        {
-                               FS::Path opath = FS::dirname(path)/ *j/FS::basename(path);
+                               FS::Path opath = FS::dirname(p)/o/FS::basename(p);
                                if(FS::is_reg(opath))
                                        files.push_back(opath);
                        }