X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fbuildinfo.cpp;h=2bf928a9ba950f4676d8b011e7010907ee252722;hb=43bd25ffcb0b4f7882773f4676b209a99cb73c04;hp=766954623cc3679e0f063179a5fee870244e0da7;hpb=59ac0a44d6edf179c01604c6ced744873213f855;p=builder.git

diff --git a/source/buildinfo.cpp b/source/buildinfo.cpp
index 7669546..2bf928a 100644
--- a/source/buildinfo.cpp
+++ b/source/buildinfo.cpp
@@ -1,8 +1,28 @@
-#include <msp/algo.h>
+#include <algorithm>
 #include "buildinfo.h"
 
+using namespace std;
 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)
+{
+	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::add(const BuildInfo &bi)
 {
 	cflags.insert(cflags.end(), bi.cflags.begin(), bi.cflags.end());
@@ -11,23 +31,84 @@ void BuildInfo::add(const BuildInfo &bi)
 	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());
+	warnings.insert(warnings.end(), bi.warnings.begin(), bi.warnings.end());
 }
 
 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-");
+
+		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);
+			}
+			else
+				++j;
+		}
+
+		*i = (flag ? warn : no_warn);
+	}
+}
+
+
+BuildInfo::Loader::Loader(BuildInfo &bi):
+	binfo(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);
+}
+
+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::unique(InfoList &l)
+void BuildInfo::Loader::warning(const std::string &s)
 {
-	InfoList l2;
-	for(InfoList::iterator i=l.begin(); i!=l.end(); ++i)
-		if(!contains(l2, *i))
-			l2.push_back(*i);
-	swap(l, l2);
+	binfo.warnings.push_back(s);
 }