X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fcondition.cpp;h=413870e6cb20ab069374aa8781a5e7738f6cad2e;hb=0dd3d23846e7fdb729359a57d3f4b190f65aed55;hp=4c7b5ed5b2d923a8b308c975e470dbfdf75041b3;hpb=433f9ef196b6f5af6bb38447b650f5afaa5a783a;p=builder.git

diff --git a/source/condition.cpp b/source/condition.cpp
index 4c7b5ed..413870e 100644
--- a/source/condition.cpp
+++ b/source/condition.cpp
@@ -1,10 +1,3 @@
-/* $Id$
-
-This file is part of builder
-Copyright © 2007-2010  Mikko Rasa, Mikkosoft Productions
-Distributed under the LGPL
-*/
-
 #include <msp/strings/utils.h>
 #include "builder.h"
 #include "condition.h"
@@ -25,11 +18,11 @@ Condition::Condition(SourcePackage &p, const string &expr):
 
 		string::size_type token = i->find_first_of("=!");
 		if(token==string::npos)
-			expression.insert(StringMap::value_type(*i, "!0"));
+			expression.insert(Expression::value_type(*i, "="));
 		else if(token==0 && (*i)[0]=='!')
-			expression.insert(StringMap::value_type(*i, "=0"));
+			expression.insert(Expression::value_type(i->substr(1), "!"));
 		else
-			expression.insert(StringMap::value_type(i->substr(0, token), i->substr(token)));
+			expression.insert(Expression::value_type(i->substr(0, token), i->substr(token)));
 	}
 }
 
@@ -38,7 +31,7 @@ bool Condition::eval()
 	const Config &conf = pkg.get_config();
 
 	bool result = true;
-	for(StringMap::iterator i=expression.begin(); i!=expression.end(); ++i)
+	for(Expression::iterator i=expression.begin(); i!=expression.end(); ++i)
 	{
 		bool neg = (i->second[0]=='!');
 		unsigned start = 1;
@@ -48,7 +41,12 @@ bool Condition::eval()
 
 		bool match = false;
 		if(conf.is_option(i->first))
-			match = (conf.get_option(i->first).value==value);
+		{
+			if(value.empty())
+				match = lexical_cast<bool>(conf.get_option(i->first).value);
+			else
+				match = (conf.get_option(i->first).value==value);
+		}
 		else if(i->first=="arch")
 			match = pkg.get_builder().get_current_arch().match_name(value);
 
@@ -61,7 +59,7 @@ bool Condition::eval()
 
 
 Condition::Loader::Loader(Condition &c):
-	cond(c)
+	DataFile::ObjectLoader<Condition>(c)
 {
 	add("require",    &Loader::require);
 	add("build_info", &Loader::build_info);
@@ -69,10 +67,10 @@ Condition::Loader::Loader(Condition &c):
 
 void Condition::Loader::require(const string &pkg)
 {
-	cond.requires.push_back(pkg);
+	obj.requires.push_back(pkg);
 }
 
 void Condition::Loader::build_info()
 {
-	load_sub(cond.build_info);
+	load_sub(obj.build_info);
 }