Turn the unique function into a template and make it more efficient

[builder.git] / source / buildinfo.cpp

diff --git a/source/buildinfo.cpp b/source/buildinfo.cpp
index 0ac20c91e0fce90f67caa5d7f07d0739215d094c..77243ef365ffcb2cc6b82868c852ae04bfe0e757 100644 (file)
--- a/source/buildinfo.cpp
+++ b/source/buildinfo.cpp
@@ -1,4 +1,5 @@
 #include <algorithm>
+#include <set>
 #include "buildinfo.h"
 
 using namespace std;
@@ -7,39 +8,55 @@ using namespace Msp;
 namespace {
 
 /** Removes any duplicate entries from a list, leaving only the first one.  The
-order of other elements is preserved.  O(n²) efficiency. */
-void unique(StringList &l)
+order of other elements is preserved.  O(nlogn) efficiency. */
+template<typename T>
+void unique(list<T> &l)
 {
-       for(StringList::iterator i=l.begin(); i!=l.end(); ++i)
-               for(StringList::iterator j=i; j!=l.end();)
-               {
-                       if(j!=i && *j==*i)
-                               j = l.erase(j);
-                       else
-                               ++j;
-               }
+       set<T> seen;
+       for(typename list<T>::iterator i=l.begin(); i!=l.end(); )
+       {
+               if(seen.count(*i))
+                       l.erase(i++);
+               else
+                       seen.insert(*i++);
+       }
 }
 
 }
 
 
-void BuildInfo::update_from(const BuildInfo &bi)
+BuildInfo::BuildInfo():
+       threads(false),
+       debug(false),
+       optimize(0),
+       strip(false)
+{ }
+
+void BuildInfo::update_from(const BuildInfo &bi, UpdateLevel level)
 {
-       cflags.insert(cflags.end(), bi.cflags.begin(), bi.cflags.end());
-       defines.insert(defines.end(), bi.defines.begin(), bi.defines.end());
+       for(DefineMap::const_iterator i=bi.defines.begin(); i!=bi.defines.end(); ++i)
+               defines[i->first] = i->second;
        incpath.insert(incpath.end(), bi.incpath.begin(), bi.incpath.end());
-       ldflags.insert(ldflags.end(), bi.ldflags.begin(), bi.ldflags.end());
-       libpath.insert(libpath.end(), bi.libpath.begin(), bi.libpath.end());
-       libs.insert(libs.end(), bi.libs.begin(), bi.libs.end());
+       if(level!=CHAINED)
+       {
+               libpath.insert(libpath.end(), bi.libpath.begin(), bi.libpath.end());
+               libs.insert(libs.end(), bi.libs.begin(), bi.libs.end());
+       }
        warnings.insert(warnings.end(), bi.warnings.begin(), bi.warnings.end());
+       threads = bi.threads;
+       if(level==LOCAL)
+       {
+               debug = bi.debug;
+               optimize = bi.optimize;
+               strip = bi.strip;
+       }
+
+       unique();
 }
 
 void BuildInfo::unique()
 {
-       ::unique(cflags);
-       ::unique(defines);
        ::unique(incpath);
-       ::unique(ldflags);
        ::unique(libpath);
        ::unique(libs);
 
@@ -67,48 +84,40 @@ void BuildInfo::unique()
 
 
 BuildInfo::Loader::Loader(BuildInfo &bi):
-       binfo(bi)
+       DataFile::ObjectLoader<BuildInfo>(bi)
 {
-       add("cflag",   &Loader::cflag);
-       add("incpath", &Loader::incpath);
-       add("define",  &Loader::define);
-       add("ldflag",  &Loader::ldflag);
-       add("libpath", &Loader::libpath);
-       add("library", &Loader::library);
-       add("warning", &Loader::warning);
-}
-
-void BuildInfo::Loader::cflag(const std::string &s)
-{
-       binfo.cflags.push_back(s);
+       add("debug",    &BuildInfo::debug);
+       add("define",   &Loader::define);
+       add("incpath",  &Loader::incpath);
+       add("libpath",  &Loader::libpath);
+       add("library",  &Loader::library);
+       add("optimize", &BuildInfo::optimize);
+       add("strip",    &BuildInfo::strip);
+       add("threads",  &BuildInfo::threads);
+       add("warning",  &Loader::warning);
 }
 
 void BuildInfo::Loader::incpath(const std::string &s)
 {
-       binfo.incpath.push_back(s);
-}
-
-void BuildInfo::Loader::define(const std::string &s)
-{
-       binfo.defines.push_back(s);
+       obj.incpath.push_back(s);
 }
 
-void BuildInfo::Loader::ldflag(const std::string &s)
+void BuildInfo::Loader::define(const std::string &d, const std::string &v)
 {
-       binfo.ldflags.push_back(s);
+       obj.defines[d] = v;
 }
 
 void BuildInfo::Loader::libpath(const std::string &s)
 {
-       binfo.libpath.push_back(s);
+       obj.libpath.push_back(s);
 }
 
 void BuildInfo::Loader::library(const std::string &s)
 {
-       binfo.libs.push_back(s);
+       obj.libs.push_back(s);
 }
 
 void BuildInfo::Loader::warning(const std::string &s)
 {
-       binfo.warnings.push_back(s);
+       obj.warnings.push_back(s);
 }