X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fcondition.h;h=bbabf22e5f27d98c8de47b0b4a58622a910dff63;hb=746329e61ac9f26962af740b0b11dee716803521;hp=141e57094cfd666a3b789b889329dbec50b2c1ed;hpb=8b9d1f472e7bfbb1e097bb6d8bcad026e9636822;p=poefilter.git

diff --git a/source/condition.h b/source/condition.h
index 141e570..bbabf22 100644
--- a/source/condition.h
+++ b/source/condition.h
@@ -20,7 +20,8 @@ public:
 	virtual Condition *clone() const = 0;
 	virtual Condition *flatten() const { return clone(); }
 	virtual bool can_merge(const Condition &, const CompoundCondition &) const { return false; }
-	virtual Condition *merge(const std::vector<Condition *> &, const CompoundCondition &) const { return 0; }
+	virtual Condition *merge(const std::vector<const Condition *> &, const CompoundCondition &) const { return 0; }
+	virtual bool is_viable() const { return true; }
 	virtual void add_lines(std::list<FilterStatement> &) const = 0;
 };
 
@@ -42,11 +43,14 @@ protected:
 public:
 	void add(Condition *);
 	unsigned count() const { return conditions.size(); }
-	const Condition *get(unsigned) const;
+	const Condition &get(unsigned) const;
 
 	virtual Condition *flatten() const;
 protected:
 	Condition *dispatch_flatten(Condition *, Condition *) const;
+	Condition *merge_two(Condition *, Condition *, bool) const;
+	Condition *add_merged_to(Condition *, CompoundCondition *, bool) const;
+	Condition *merge_contents_to(CompoundCondition *, CompoundCondition *) const;
 	virtual Condition *flatten(Condition *, Condition *) const = 0;
 	virtual Condition *flatten(AndCondition *, Condition *) const = 0;
 	virtual Condition *flatten(AndCondition *, AndCondition *) const = 0;
@@ -68,6 +72,7 @@ protected:
 	virtual Condition *flatten(OrCondition *, AndCondition *) const;
 	virtual Condition *flatten(OrCondition *, OrCondition *) const;
 public:
+	virtual bool is_viable() const;
 	virtual void add_lines(std::list<FilterStatement> &) const;
 };
 
@@ -84,6 +89,7 @@ protected:
 	virtual Condition *flatten(OrCondition *, AndCondition *) const;
 	virtual Condition *flatten(OrCondition *, OrCondition *) const;
 public:
+	virtual bool is_viable() const;
 	virtual void add_lines(std::list<FilterStatement> &) const;
 };