Rework condition merging

[poefilter.git] / source / choicecondition.h

diff --git a/source/choicecondition.h b/source/choicecondition.h
index 170af0e0634a27c4615eb6d5b35e1db8c6168601..424dca6a8fce12be193e6a9fb02f8048db309a7a 100644 (file)
--- a/source/choicecondition.h
+++ b/source/choicecondition.h
@@ -12,15 +12,16 @@ public:
        typedef typename Traits::Type Type;
 
 private:
-       Type value;
+       std::vector<Type> values;
 
 public:
        ChoiceCondition(Type);
+       ChoiceCondition(const std::vector<Type> &);
 
        virtual ChoiceCondition<T> *clone() const;
        virtual bool can_merge(const Condition &, const CompoundCondition &) const;
+       virtual ChoiceCondition<T> *merge(const std::vector<Condition *> &, const CompoundCondition &) const;
        virtual void add_lines(std::list<FilterStatement> &) const;
-       virtual void add_merged_lines(const std::vector<Condition *> &, const CompoundCondition &, std::list<FilterStatement> &) const;
 };
 
 
@@ -43,14 +44,20 @@ typedef ChoiceCondition<BaseTypeTraits> BaseTypeCondition;
 
 
 template<typename T>
-ChoiceCondition<T>::ChoiceCondition(Type v):
-       value(v)
+ChoiceCondition<T>::ChoiceCondition(Type v)
+{
+       values.push_back(v);
+}
+
+template<typename T>
+ChoiceCondition<T>::ChoiceCondition(const std::vector<Type> &v):
+       values(v)
 { }
 
 template<typename T>
 ChoiceCondition<T> *ChoiceCondition<T>::clone() const
 {
-       return new ChoiceCondition<T>(value);
+       return new ChoiceCondition<T>(values);
 }
 
 template<typename T>
@@ -60,22 +67,32 @@ bool ChoiceCondition<T>::can_merge(const Condition &other, const CompoundConditi
 }
 
 template<typename T>
-void ChoiceCondition<T>::add_lines(std::list<FilterStatement> &st) const
+ChoiceCondition<T> *ChoiceCondition<T>::merge(const std::vector<Condition *> &conditions, const CompoundCondition &parent) const
 {
-       const char *keyword = Traits::get_keyword();
-       FilterStatement::add_line(st, Msp::format("%s \"%s\"", keyword, value));
+       if(dynamic_cast<const OrCondition *>(&parent) && !conditions.empty())
+       {
+               ChoiceCondition<T> *result = 0;
+               for(std::vector<Condition *>::const_iterator i=conditions.begin(); ++i!=conditions.end(); )
+               {
+                       const std::vector<Type> &v = static_cast<ChoiceCondition<T> *>(*i)->values;
+                       if(!result)
+                               result = new ChoiceCondition<T>(v);
+                       else
+                               result->values.insert(result->values.end(), v.begin(), v.end());
+               }
+               return result;
+       }
+       else
+               return 0;
 }
 
 template<typename T>
-void ChoiceCondition<T>::add_merged_lines(const std::vector<Condition *> &conditions, const CompoundCondition &parent, std::list<FilterStatement> &st) const
+void ChoiceCondition<T>::add_lines(std::list<FilterStatement> &st) const
 {
-       if(dynamic_cast<const OrCondition *>(&parent))
-       {
-               std::string line = Traits::get_keyword();
-               for(std::vector<Condition *>::const_iterator i=conditions.begin(); i!=conditions.end(); ++i)
-                       line += Msp::format(" \"%s\"", static_cast<const ChoiceCondition<Traits> *>(*i)->value);
-               FilterStatement::add_line(st, line);
-       }
+       std::string line = Traits::get_keyword();
+       for(typename std::vector<Type>::const_iterator i=values.begin(); i!=values.end(); ++i)
+               line += Msp::format(" \"%s\"", *i);
+       FilterStatement::add_line(st, line);
 }
 
 #endif