X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fcondition.h;h=c1bf7a3f3da6423e1f8d64e148a6d63e43328afb;hb=5881b8499dc159564d2f69c3b037e16b4d1af4db;hp=f7b7c003a5a48387e1a899deb54f89b583495bf8;hpb=7aeaa4ba965f596edad438c02e345a8843f7469a;p=builder.git

diff --git a/source/condition.h b/source/condition.h
index f7b7c00..c1bf7a3 100644
--- a/source/condition.h
+++ b/source/condition.h
@@ -1,44 +1,36 @@
-/* $Id$
-
-This file is part of builder
-Copyright © 2006-2007 Mikko Rasa, Mikkosoft Productions
-Distributed under the LGPL
-*/
-
 #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();
 private:
-	Package    &pkg;
-	StringMap  expression;
-	PkgRefList requires;
-	BuildInfo  build_info;
+	SourcePackage &pkg;
+	StringMap expression;
+	StringList requires;
+	BuildInfo build_info;
+
+public:
+	Condition(SourcePackage &, const std::string &);
+	const StringList &get_requires() const { return requires; }
+	const BuildInfo &get_build_info() const { return build_info; }
+	bool eval();
 };
 typedef std::list<Condition> ConditionList;