X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fcondition.cpp;h=413870e6cb20ab069374aa8781a5e7738f6cad2e;hb=1dad660f7bbda5ef3239fd6374e0f8a77e19eaaa;hp=c80134d237a7707a4f439b7cebd17ff62c9b582d;hpb=43bd25ffcb0b4f7882773f4676b209a99cb73c04;p=builder.git

diff --git a/source/condition.cpp b/source/condition.cpp
index c80134d..413870e 100644
--- a/source/condition.cpp
+++ b/source/condition.cpp
@@ -18,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, "="));
+			expression.insert(Expression::value_type(*i, "="));
 		else if(token==0 && (*i)[0]=='!')
-			expression.insert(StringMap::value_type(i->substr(1), "!"));
+			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)));
 	}
 }
 
@@ -31,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;
@@ -59,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);
@@ -67,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);
 }