-/* $Id$
-
-This file is part of builder
-Copyright © 2006-2007 Mikko Rasa, Mikkosoft Productions
-Distributed under the LGPL
-*/
-
#include <algorithm>
#include "buildinfo.h"
using namespace std;
using namespace Msp;
-/**
-Adds another BuildInfo to the end of this one.
-*/
-void BuildInfo::add(const BuildInfo &bi)
+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)
+{
+ 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;
+ }
+}
+
+}
+
+
+void BuildInfo::update_from(const BuildInfo &bi)
{
cflags.insert(cflags.end(), bi.cflags.begin(), bi.cflags.end());
defines.insert(defines.end(), bi.defines.begin(), bi.defines.end());
warnings.insert(warnings.end(), bi.warnings.begin(), bi.warnings.end());
}
-/**
-Makes sure there are no duplicate entries in the lists.
-*/
void BuildInfo::unique()
{
- unique(cflags);
- unique(defines);
- unique(incpath);
- unique(ldflags);
- unique(libpath);
- unique(libs);
+ ::unique(cflags);
+ ::unique(defines);
+ ::unique(incpath);
+ ::unique(ldflags);
+ ::unique(libpath);
+ ::unique(libs);
for(StringList::iterator i=warnings.begin(); i!=warnings.end(); ++i)
{
- bool flag=i->compare(0, 3, "no-");
+ bool flag = i->compare(0, 3, "no-");
- string warn=(flag ? *i : i->substr(3));
- string no_warn="no-"+warn;
+ string warn = (flag ? *i : i->substr(3));
+ string no_warn = "no-"+warn;
for(StringList::iterator j=i; j!=warnings.end();)
{
if(j!=i && (*j==warn || *j==no_warn))
{
- flag=(*j==warn);
- j=warnings.erase(j);
+ flag = (*j==warn);
+ j = warnings.erase(j);
}
else
++j;
}
- *i=(flag ? warn : no_warn);
+ *i = (flag ? warn : no_warn);
}
}
-/**
-Removes any duplicate entries from a list, leaving only the first one. The
-order of other elements is preserved. O(n²) efficiency.
-*/
-void BuildInfo::unique(StringList &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;
- }
-}
BuildInfo::Loader::Loader(BuildInfo &bi):
binfo(bi)
add("warning", &Loader::warning);
}
+void BuildInfo::Loader::cflag(const std::string &s)
+{
+ binfo.cflags.push_back(s);
+}
+
+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);
+}
+
+void BuildInfo::Loader::ldflag(const std::string &s)
+{
+ binfo.ldflags.push_back(s);
+}
+
+void BuildInfo::Loader::libpath(const std::string &s)
+{
+ binfo.libpath.push_back(s);
+}
+void BuildInfo::Loader::library(const std::string &s)
+{
+ binfo.libs.push_back(s);
+}
+
+void BuildInfo::Loader::warning(const std::string &s)
+{
+ binfo.warnings.push_back(s);
+}