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

diff --git a/source/condition.h b/source/condition.h
index 90c844e..bbabf22 100644
--- a/source/condition.h
+++ b/source/condition.h
@@ -18,12 +18,17 @@ public:
 	virtual ~Condition() { }
 
 	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<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:
@@ -37,13 +42,37 @@ protected:
 
 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;
+	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;
+	virtual Condition *flatten(OrCondition *, Condition *) const = 0;
+	virtual Condition *flatten(OrCondition *, AndCondition *) const = 0;
+	virtual Condition *flatten(OrCondition *, OrCondition *) const = 0;
 };
 
 
 class AndCondition: public CompoundCondition
 {
 public:
-	virtual Condition *clone() const;
+	virtual AndCondition *clone() 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;
 };
 
@@ -51,7 +80,16 @@ public:
 class OrCondition: public CompoundCondition
 {
 public:
-	virtual Condition *clone() const;
+	virtual OrCondition *clone() 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;
 };
 
@@ -70,7 +108,7 @@ private:
 public:
 	LinkedColorsCondition(const Colors &);
 
-	virtual Condition *clone() const;
+	virtual LinkedColorsCondition *clone() const;
 	virtual void add_lines(std::list<FilterStatement> &) const;
 };