Use format() when creating strings from more than two parts

[builder.git] / source / toolchain.cpp

diff --git a/source/toolchain.cpp b/source/toolchain.cpp
index 9d234038279d07d4ce41232c63e7ab5acec63f40..8790c83dca0737e186a868900cc8d2665343484b 100644 (file)
--- a/source/toolchain.cpp
+++ b/source/toolchain.cpp
@@ -1,3 +1,4 @@
+#include <algorithm>
 #include <msp/core/maputils.h>
 #include "tool.h"
 #include "toolchain.h"
@@ -7,8 +8,10 @@ using namespace Msp;
 
 Toolchain::~Toolchain()
 {
-       for(ToolMap::iterator i=tools.begin(); i!=tools.end(); ++i)
-               delete i->second;
+       for(const auto &kvp: tools)
+               delete kvp.second;
+       for(Toolchain *c: chains)
+               delete c;
 }
 
 void Toolchain::add_tool(Tool *tool)
@@ -16,16 +19,39 @@ void Toolchain::add_tool(Tool *tool)
        insert_unique(tools, tool->get_tag(), tool);
 }
 
+void Toolchain::add_toolchain(Toolchain *chain)
+{
+       chains.push_back(chain);
+}
+
+bool Toolchain::has_tool(const string &tag) const
+{
+       if(tools.count(tag))
+               return true;
+       return any_of(chains.begin(), chains.end(), [&tag](Toolchain *tc){ return tc->has_tool(tag); });
+}
+
 Tool &Toolchain::get_tool(const string &tag) const
 {
+       if(!tools.count(tag))
+       {
+               for(const Toolchain *c: chains)
+                       if(c->has_tool(tag))
+                               return c->get_tool(tag);
+       }
+
        return *get_item(tools, tag);
 }
 
 Tool *Toolchain::get_tool_for_suffix(const string &suffix, bool aux) const
 {
-       for(ToolMap::const_iterator i=tools.begin(); i!=tools.end(); ++i)
-               if(i->second->accepts_suffix(suffix, aux))
-                       return i->second;
+       for(const auto &kvp: tools)
+               if(kvp.second->accepts_suffix(suffix, aux))
+                       return kvp.second;
+
+       for(const Toolchain *c: chains)
+               if(Tool *tool = c->get_tool_for_suffix(suffix, aux))
+                       return tool;
 
        return 0;
 }