Replace basic for loops with range-based loops or algorithms

[builder.git] / source / buildercli.cpp

diff --git a/source/buildercli.cpp b/source/buildercli.cpp
index c7a2817ce4d6315ea99f33c3e414049c49f8b083..bf53c2912dfd59c964a9e8d96f26e14796105eea 100644 (file)
--- a/source/buildercli.cpp
+++ b/source/buildercli.cpp
@@ -95,12 +95,9 @@ BuilderCLI::BuilderCLI(int argc, char **argv):
                logger.enable_channel("files");
                logger.enable_channel("auxcommands");
        }
-       for(list<string>::const_iterator i=log_channels.begin(); i!=log_channels.end(); ++i)
-       {
-               vector<string> parts = split(*i, ',');
-               for(vector<string>::const_iterator j=parts.begin(); j!=parts.end(); ++j)
-                       logger.enable_channel(*j);
-       }
+       for(const string &c: log_channels)
+               for(const string &p: split(c, ','))
+                       logger.enable_channel(p);
        builder.set_logger(&logger);
 
        if(!analyze_mode.empty())
@@ -124,7 +121,7 @@ BuilderCLI::BuilderCLI(int argc, char **argv):
        else if(!clean && !create_makefile)
                build = true;
 
-       for(NameList::iterator i=cmdline_targets.begin(); i!=cmdline_targets.end(); )
+       for(auto i=cmdline_targets.begin(); i!=cmdline_targets.end(); )
        {
                string::size_type equal = i->find('=');
                if(equal!=string::npos)
@@ -154,9 +151,9 @@ BuilderCLI::BuilderCLI(int argc, char **argv):
        list<FS::Path> start_files;
        start_files.push_back(FS::get_sys_data_dir()/"builderrc");
        start_files.push_back(FS::get_user_data_dir()/"rc");
-       for(list<FS::Path>::const_iterator i=start_files.begin(); i!=start_files.end(); ++i)
-               if(FS::exists(*i))
-                       builder.load_build_file(*i);
+       for(const FS::Path &f: start_files)
+               if(FS::exists(f))
+                       builder.load_build_file(f);
 
        if(!prefix.empty())
                builder.set_prefix(cwd/prefix);
@@ -170,7 +167,7 @@ BuilderCLI::BuilderCLI(int argc, char **argv):
        builder.add_default_tools();
 
        const Toolchain &toolchain = builder.get_toolchain();
-       for(Config::InputOptions::iterator i=cmdline_options.begin(); i!=cmdline_options.end(); )
+       for(auto i=cmdline_options.begin(); i!=cmdline_options.end(); )
        {
                if(toolchain.has_tool(i->first))
                {
@@ -233,26 +230,24 @@ int BuilderCLI::main()
 
        BuildGraph &build_graph = builder.get_build_graph();
        PackageManager &package_manager = builder.get_package_manager();
-       const PackageManager::PackageMap &packages = package_manager.get_packages();
        list<string> package_details;
-       for(PackageManager::PackageMap::const_iterator i=packages.begin(); i!=packages.end(); ++i)
+       for(const auto &kvp: package_manager.get_packages())
        {
-               if(!i->second->is_prepared())
+               if(!kvp.second->is_prepared())
                        continue;
 
-               string line = i->second->get_name();
-               if(dynamic_cast<SourcePackage *>(i->second))
+               string line = kvp.second->get_name();
+               if(dynamic_cast<SourcePackage *>(kvp.second))
                {
                        line += '*';
 
                        unsigned count = 0;
                        unsigned to_be_built = 0;
-                       const BuildGraph::TargetMap &targets = build_graph.get_targets();
-                       for(BuildGraph::TargetMap::const_iterator j=targets.begin(); j!=targets.end(); ++j)
-                               if(j->second->get_package()==i->second)
+                       for(const auto &kvp2: build_graph.get_targets())
+                               if(kvp2.second->get_package()==kvp.second)
                                {
                                        ++count;
-                                       if(j->second->needs_rebuild())
+                                       if(kvp2.second->needs_rebuild())
                                                ++to_be_built;
                                }
                        if(count)
@@ -268,8 +263,8 @@ int BuilderCLI::main()
        }
 
        logger.log("summary", format("%d active packages, %d targets", package_details.size(), build_graph.get_targets().size()));
-       for(list<string>::const_iterator i=package_details.begin(); i!=package_details.end(); ++i)
-               logger.log("packages", *i);
+       for(const string &d: package_details)
+               logger.log("packages", d);
 
        if(analyzer)
                analyzer->analyze();
@@ -278,8 +273,8 @@ int BuilderCLI::main()
        {
                list<string> problems = builder.collect_problems();
                IO::print(IO::cerr, "The following problems were detected:\n");
-               for(list<string>::const_iterator i=problems.begin(); i!=problems.end(); ++i)
-                       IO::print(IO::cerr, "  %s\n", *i);
+               for(const string &p: problems)
+                       IO::print(IO::cerr, "  %s\n", p);
                if(!analyzer)
                        IO::print(IO::cerr, "Please fix them and try again.\n");
                return 1;
@@ -307,12 +302,12 @@ bool BuilderCLI::prepare_build()
        package_manager.get_main_package().prepare();
 
        // Add targets from command line as goals
-       for(NameList::iterator i=cmdline_targets.begin(); i!=cmdline_targets.end(); ++i)
+       for(const string &t: cmdline_targets)
        {
-               Target *tgt = resolve_target(*i);
+               Target *tgt = resolve_target(t);
                if(!tgt)
                {
-                       IO::print("I don't know anything about %s\n", *i);
+                       IO::print("I don't know anything about %s\n", t);
                        return false;
                }
 
@@ -322,12 +317,12 @@ bool BuilderCLI::prepare_build()
        build_graph.prepare();
 
        // Apply what-ifs
-       for(NameList::iterator i=what_if.begin(); i!=what_if.end(); ++i)
+       for(const string &w: what_if)
        {
-               FileTarget *tgt = dynamic_cast<FileTarget *>(resolve_target(*i));
+               FileTarget *tgt = dynamic_cast<FileTarget *>(resolve_target(w));
                if(!tgt)
                {
-                       IO::print(IO::cerr, "Unknown what-if target %s\n", *i);
+                       IO::print(IO::cerr, "Unknown what-if target %s\n", w);
                        return false;
                }
                tgt->touch();
@@ -367,7 +362,7 @@ void BuilderCLI::package_help()
        if(!requires.empty())
        {
                IO::print("\nRequired packages:\n  ");
-               for(Package::Requirements::const_iterator i=requires.begin(); i!=requires.end(); ++i)
+               for(auto i=requires.begin(); i!=requires.end(); ++i)
                {
                        if(i!=requires.begin())
                                IO::print(", ");
@@ -379,19 +374,14 @@ void BuilderCLI::package_help()
        if(!options.empty())
        {
                IO::print("\nPackage configuration:\n");
-               for(Config::OptionMap::const_iterator i=options.begin(); i!=options.end(); ++i)
+               for(const auto &kvp: options)
                {
-                       const Config::Option &opt = i->second;
+                       const Config::Option &opt = kvp.second;
                        string line = format("  %s: %s (%s)", opt.name, opt.description, opt.value);
                        if(!opt.choices.empty())
                        {
                                line += " {";
-                               for(list<string>::const_iterator j=opt.choices.begin(); j!=opt.choices.end(); ++j)
-                               {
-                                       if(j!=opt.choices.begin())
-                                               line += ' ';
-                                       line += *j;
-                               }
+                               line += join(opt.choices.begin(), opt.choices.end(), " ");
                                line += '}';
                        }
                        else if(opt.value!=opt.default_value)