Convert all list containers to vectors

[builder.git] / source / datatransform.cpp

diff --git a/source/datatransform.cpp b/source/datatransform.cpp
index e45c80a69085f4e68d51dffc8005476d7ecf206c..055587a71bc7d290343f4674173dc625f087a3f8 100644 (file)
--- a/source/datatransform.cpp
+++ b/source/datatransform.cpp
@@ -1,4 +1,5 @@
 #include <msp/fs/dir.h>
+#include <msp/fs/stat.h>
 #include <msp/fs/utils.h>
 #include <msp/strings/format.h>
 #include <msp/strings/regex.h>
@@ -16,14 +17,17 @@ DataTransform::DataTransform(Builder &b, const Component &c, const FS::Path &p):
        FileTarget(b, c.get_package(), p)
 {
        component = &c;
+
+       if(FS::Stat st = FS::lstat(FS::dirname(path)))
+               dir_mtime = st.get_modify_time();
 }
 
 void DataTransform::find_dependencies()
 {
-       list<string> files;
+       vector<string> files;
        Cache &cache = component->get_package().get_cache();
-       // XXX Should check directory mtime as well
-       if(mtime<cache.get_mtime() && cache.has_key(this, "files"))
+       const Time::TimeStamp &cache_mtime = cache.get_mtime();
+       if(mtime<cache_mtime && dir_mtime<cache_mtime && cache.has_key(this, "files"))
                files = cache.get_values(this, "files");
        else
        {
@@ -31,7 +35,7 @@ void DataTransform::find_dependencies()
                IO::File in(path.str());
                DataFile::Parser parser(in, path.str());
 
-               list<string> dir_files;
+               vector<string> dir_files;
                while(!in.eof())
                {
                        DataFile::Statement st = parser.parse();
@@ -45,12 +49,12 @@ void DataTransform::find_dependencies()
                                        dir_files = list_files(dir);
                                }
 
-                               for(DataFile::Statement::Arguments::const_iterator i=st.args.begin(); i!=st.args.end(); ++i)
+                               for(const DataFile::Value &a: st.args)
                                {
-                                       Regex re(i->get<string>());
-                                       for(list<string>::const_iterator j=dir_files.begin(); j!=dir_files.end(); ++j)
-                                               if(re.match(*j))
-                                                       files.push_back(*j);
+                                       Regex re(a.get<string>());
+                                       for(const string &f: dir_files)
+                                               if(re.match(f))
+                                                       files.push_back(f);
                                }
                        }
                        else if(st.keyword=="file" && st.args.size()==1)
@@ -60,9 +64,9 @@ void DataTransform::find_dependencies()
                cache.set_values(this, "files", files);
        }
 
-       for(list<string>::iterator i=files.begin(); i!=files.end(); ++i)
+       for(const string &f: files)
        {
-               FS::Path file_path = FS::dirname(path)/ *i;
+               FS::Path file_path = FS::dirname(path)/f;
                if(Target *tgt = builder.get_vfs().get_target(file_path))
                        add_transitive_dependency(*tgt);
                else