X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fcondition.h;h=6b0cf6bda2831109cc7ef38b66fb08abf8a1bf7f;hb=HEAD;hp=53f2a8a8268be8e0248f76d41a1032b8a89516b7;hpb=1805b8e549e6b5c0a53b2f735b8f2eb725f40b2e;p=poefilter.git

diff --git a/source/condition.h b/source/condition.h
index 53f2a8a..6b0cf6b 100644
--- a/source/condition.h
+++ b/source/condition.h
@@ -18,12 +18,18 @@ 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<const Condition *> &, const CompoundCondition &) const { return 0; }
+	virtual bool is_viable() const { return true; }
 	virtual void add_lines(std::list<FilterStatement> &) const = 0;
-	virtual void add_merged_lines(const std::vector<Condition *> &, const CompoundCondition &, std::list<FilterStatement> &) const { }
 };
 
 
+class AndCondition;
+class OrCondition;
+
 class CompoundCondition: public Condition
 {
 protected:
@@ -34,9 +40,25 @@ 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;
+
+	virtual Condition *flatten() const;
+protected:
+	Condition *dispatch_flatten(Condition *, Condition *) 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;
+	virtual Condition *flatten(OrCondition *, Condition *) const = 0;
+	virtual Condition *flatten(OrCondition *, AndCondition *) const = 0;
+	virtual Condition *flatten(OrCondition *, OrCondition *) const = 0;
 };
 
 
@@ -44,6 +66,21 @@ 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;
+	virtual Condition *flatten(AndCondition *, AndCondition *) const;
+	virtual Condition *flatten(OrCondition *, Condition *) const;
+	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;
 };
 
@@ -52,6 +89,16 @@ 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;
+	virtual Condition *flatten(AndCondition *, AndCondition *) const;
+	virtual Condition *flatten(OrCondition *, Condition *) const;
+	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;
 };
 
@@ -71,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;
 };