X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fcondition.h;h=6b0cf6bda2831109cc7ef38b66fb08abf8a1bf7f;hb=b10f2529fa106205fc99d7e3eec8aa80bfb487ce;hp=979f1e904714032788a8daf1d850568c713f353e;hpb=694d2890065b1555a01a81994cb80f106ca577ee;p=poefilter.git

diff --git a/source/condition.h b/source/condition.h
index 979f1e9..6b0cf6b 100644
--- a/source/condition.h
+++ b/source/condition.h
@@ -18,9 +18,11 @@ public:
 	virtual ~Condition() { }
 
 	virtual Condition *clone() const = 0;
+	virtual bool equals(const Condition &) 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;
 };
 
@@ -38,18 +40,19 @@ public:
 
 protected:
 	void clone_to(CompoundCondition &) const;
+	bool sub_equals(const CompoundCondition &) const;
 
 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;
+	static Condition *merge_two(Condition *, Condition *, const CompoundCondition &, bool);
+	static Condition *add_merged_to(Condition *, CompoundCondition *, bool);
+	static Condition *merge_contents_to(CompoundCondition *, CompoundCondition *);
 	virtual Condition *flatten(Condition *, Condition *) const = 0;
 	virtual Condition *flatten(AndCondition *, Condition *) const = 0;
 	virtual Condition *flatten(AndCondition *, AndCondition *) const = 0;
@@ -63,6 +66,7 @@ class AndCondition: public CompoundCondition
 {
 public:
 	virtual AndCondition *clone() const;
+	virtual bool equals(const Condition &) const;
 protected:
 	virtual Condition *flatten(Condition *, Condition *) const;
 	virtual Condition *flatten(AndCondition *, Condition *) const;
@@ -71,6 +75,12 @@ protected:
 	virtual Condition *flatten(OrCondition *, AndCondition *) const;
 	virtual Condition *flatten(OrCondition *, OrCondition *) const;
 public:
+	virtual bool can_merge(const Condition &, const CompoundCondition &) const;
+	virtual AndCondition *merge(const std::vector<const Condition *> &, const CompoundCondition &) const;
+private:
+	static bool merge(const AndCondition &, const AndCondition &, const CompoundCondition &, AndCondition **);
+public:
+	virtual bool is_viable() const;
 	virtual void add_lines(std::list<FilterStatement> &) const;
 };
 
@@ -79,6 +89,7 @@ class OrCondition: public CompoundCondition
 {
 public:
 	virtual OrCondition *clone() const;
+	virtual bool equals(const Condition &) const;
 protected:
 	virtual Condition *flatten(Condition *, Condition *) const;
 	virtual Condition *flatten(AndCondition *, Condition *) const;
@@ -87,6 +98,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;
 };
 
@@ -106,6 +118,7 @@ public:
 	LinkedColorsCondition(const Colors &);
 
 	virtual LinkedColorsCondition *clone() const;
+	virtual bool equals(const Condition &) const;
 	virtual void add_lines(std::list<FilterStatement> &) const;
 };