void CompoundCondition::add(Condition *cond)
{
+ if(!cond)
+ throw invalid_argument("CompoundCondition::add");
conditions.push_back(cond);
}
-const Condition *CompoundCondition::get(unsigned i) const
+const Condition &CompoundCondition::get(unsigned i) const
{
if(i>=conditions.size())
throw out_of_range("CompoundCondition::get");
- return conditions[i];
+ return *conditions[i];
}
Condition *CompoundCondition::flatten() const
merge = conditions.front()->can_merge(**i, *this);
if(merge)
- return conditions.front()->merge(conditions, *this);
+ {
+ vector<const Condition *> merge_conds(conditions.begin(), conditions.end());
+ return conditions.front()->merge(merge_conds, *this);
+ }
else
{
Condition *result = 0;
Condition *CompoundCondition::merge_two(Condition *cond1, Condition *cond2, bool del) const
{
- vector<Condition *> parts;
- parts.reserve(2);
- parts.push_back(cond1);
- parts.push_back(cond2);
+ vector<const Condition *> parts(2);
+ parts[0] = cond1;
+ parts[1] = cond2;
Condition *result = cond1->merge(parts, *this);
if(del)
OrCondition *result = new OrCondition;
unsigned count = cond1->count();
for(unsigned i=0; i<count; ++i)
- if(Condition *sub = dispatch_flatten(cond1->get(i)->clone(), (i+1<count ? cond2->clone() : cond2)))
+ if(Condition *sub = dispatch_flatten(cond1->get(i).clone(), (i+1<count ? cond2->clone() : cond2)))
result->add(sub);
delete cond1;
OrCondition *result = new OrCondition;
for(unsigned i=0; i<count1; ++i)
for(unsigned j=0; j<count2; ++j)
- if(Condition *sub = dispatch_flatten(cond1->get(i)->clone(), cond2->get(j)->clone()))
+ if(Condition *sub = dispatch_flatten(cond1->get(i).clone(), cond2->get(j).clone()))
result->add(sub);
delete cond1;