X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fchoicecondition.h;h=91b5e71aa5e58bbc22ead2df8cf8a54bbc7ca7b8;hb=7db8b8a0a7561bb8b26ec78f89b408c91cba1878;hp=df4dacfd5c3e10f5e78abf9ad558f3e2e73a3b37;hpb=d0663f70ea5caea2db3c6d3c846ec67410db3498;p=poefilter.git

diff --git a/source/choicecondition.h b/source/choicecondition.h
index df4dacf..91b5e71 100644
--- 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 Condition *clone() const;
+	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;
 };
 
 
@@ -42,40 +43,56 @@ struct BaseTypeTraits
 typedef ChoiceCondition<BaseTypeTraits> BaseTypeCondition;
 
 
-template<typename Traits>
-ChoiceCondition<Traits>::ChoiceCondition(Type v):
-	value(v)
-{ }
-
-template<typename Traits>
-Condition *ChoiceCondition<Traits>::clone() const
+template<typename T>
+ChoiceCondition<T>::ChoiceCondition(Type v)
 {
-	return new ChoiceCondition<Traits>(value);
+	values.push_back(v);
 }
 
-template<typename Traits>
-bool ChoiceCondition<Traits>::can_merge(const Condition &other, const CompoundCondition &parent) const
+template<typename T>
+ChoiceCondition<T>::ChoiceCondition(const std::vector<Type> &v):
+	values(v)
+{ }
+
+template<typename T>
+ChoiceCondition<T> *ChoiceCondition<T>::clone() const
 {
-	return dynamic_cast<const ChoiceCondition<Traits> *>(&other) && dynamic_cast<const OrCondition *>(&parent);
+	return new ChoiceCondition<T>(values);
 }
 
-template<typename Traits>
-void ChoiceCondition<Traits>::add_lines(std::list<FilterStatement> &st) const
+template<typename T>
+bool ChoiceCondition<T>::can_merge(const Condition &other, const CompoundCondition &parent) const
 {
-	const char *keyword = Traits::get_keyword();
-	FilterStatement::add_line(st, Msp::format("%s \"%s\"", keyword, value));
+	return dynamic_cast<const ChoiceCondition<T> *>(&other) && dynamic_cast<const OrCondition *>(&parent);
 }
 
-template<typename Traits>
-void ChoiceCondition<Traits>::add_merged_lines(const std::vector<Condition *> &conditions, const CompoundCondition &parent, std::list<FilterStatement> &st) const
+template<typename T>
+ChoiceCondition<T> *ChoiceCondition<T>::merge(const std::vector<Condition *> &conditions, const CompoundCondition &parent) const
 {
-	if(dynamic_cast<const OrCondition *>(&parent))
+	if(dynamic_cast<const OrCondition *>(&parent) && !conditions.empty())
 	{
-		std::string line = Traits::get_keyword();
+		ChoiceCondition<T> *result = 0;
 		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);
+		{
+			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_lines(std::list<FilterStatement> &st) const
+{
+	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