Replace basic for loops with range-based loops or algorithms

[builder.git] / source / csourcefile.cpp

diff --git a/source/csourcefile.cpp b/source/csourcefile.cpp
index ca061d2b19e581ccdc1f6f308c2848533f8135c9..954fdba72927c8b4417d177094b2de849e3306c8 100644 (file)
--- a/source/csourcefile.cpp
+++ b/source/csourcefile.cpp
@@ -6,6 +6,7 @@
 #include "component.h"
 #include "csourcefile.h"
 #include "sourcepackage.h"
+#include "tool.h"
 
 using namespace std;
 using namespace Msp;
@@ -22,6 +23,16 @@ CSourceFile::CSourceFile(Builder &b, const Component &c, const FS::Path &p):
                install_location = FS::Path("include")/package->get_name();
 }
 
+void CSourceFile::parse_includes(IO::Base &in)
+{
+       static Regex r_include("^[ \t]*#include[ \t]+([\"<].*)[\">]");
+
+       string line;
+       while(in.getline(line))
+               if(RegMatch match = r_include.match(line))
+                       includes.push_back(match[1].str);
+}
+
 void CSourceFile::find_dependencies()
 {
        if(!component || !mtime)
@@ -38,31 +49,27 @@ void CSourceFile::find_dependencies()
 
                builder.get_logger().log("files", format("Reading includes from %s", path.str()));
 
-               Regex r_include("^[ \t]*#include[ \t]+([\"<].*)[\">]");
-
-               string line;
-               while(in.getline(line))
-                       if(RegMatch match = r_include.match(line))
-                               includes.push_back(match[1].str);
-
+               parse_includes(in);
                cache.set_values(this, "includes", includes);
        }
 
-       const BuildInfo::PathList &incpath = component->get_build_info().incpath;
+       const BuildInfo &build_info = component->get_build_info_for_path(path);
+       const BuildInfo::PathList &incpath = build_info.incpath;
        BuildInfo::PathList local_incpath = incpath;
+       local_incpath.insert(local_incpath.begin(), build_info.local_incpath.begin(), build_info.local_incpath.end());
        local_incpath.push_front(FS::dirname(path).str());
 
-       for(IncludeList::iterator i=includes.begin(); i!=includes.end(); ++i)
-       {
-               Target *hdr = builder.get_vfs().find_header(i->substr(1), ((*i)[0]=='"' ? local_incpath : incpath));
-               if(hdr)
-                       add_dependency(*hdr);
-       }
+       Tool *compiler = builder.get_toolchain().get_tool_for_suffix(FS::extpart(FS::basename(path)), true);
+       if(compiler)
+               compiler->prepare();
+       for(const string &i: includes)
+               if(Target *hdr = builder.get_vfs().find_header(i.substr(1), compiler, (i[0]=='"' ? local_incpath : incpath)))
+                       add_transitive_dependency(*hdr);
 }
 
 void CSourceFile::modified()
 {
        includes.clear();
-       depends.clear();
+       trans_depends.clear();
        find_dependencies();
 }