X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fcondition.h;h=0cdc2bb482723e756dd94abcc32e94f9367045a3;hb=373e9bb43c24d38316c5bb0393f4a369563319d3;hp=f518aea0829a0a4164be613fc0b6c84cfdedf7dc;hpb=445edbc3c42bbd7880cc414cf153ddfd196bfc1c;p=builder.git

diff --git a/source/condition.h b/source/condition.h
index f518aea..0cdc2bb 100644
--- a/source/condition.h
+++ b/source/condition.h
@@ -1,38 +1,39 @@
 #ifndef CONDITION_H_
 #define CONDITION_H_
 
-#include <msp/parser/loader.h>
+#include <msp/datafile/loader.h>
 #include "buildinfo.h"
-#include "misc.h"
-#include "packageref.h"
 
 class Config;
+class SourcePackage;
 
 class Condition
 {
 public:
-	class Loader: public Msp::Parser::Loader
+	class Loader: public Msp::DataFile::ObjectLoader<Condition>
 	{
 	public:
 		Loader(Condition &);
 	private:
-		Condition &cond;
-
 		void require(const std::string &);
 		void build_info();
 	};
 
-	Condition(Package &, const std::string &);
-	const PkgRefList &get_requires() const { return requires; }
-	const BuildInfo  &get_build_info() const { return build_info; }
-	void             resolve_refs();
-	bool             eval();
+	typedef std::list<std::string> RequireList;
+
 private:
-	Package    &pkg;
-	StringMap  expression;
-	PkgRefList requires;
-	BuildInfo  build_info;
+	typedef std::map<std::string, std::string> Expression;
+	
+	SourcePackage &pkg;
+	Expression expression;
+	RequireList requires;
+	BuildInfo build_info;
+
+public:
+	Condition(SourcePackage &, const std::string &);
+	const RequireList &get_requires() const { return requires; }
+	const BuildInfo &get_build_info() const { return build_info; }
+	bool eval();
 };
-typedef std::list<Condition> ConditionList;
 
 #endif