ConstantConditionEliminator::ConstantConditionEliminator():
scope_level(0),
+ current_block(0),
record_only(false)
{ }
+void ConstantConditionEliminator::apply(Stage &stage)
+{
+ visit(stage.content);
+ NodeRemover().apply(stage, nodes_to_remove);
+}
+
void ConstantConditionEliminator::visit(Block &block)
{
SetForScope<unsigned> set(scope_level, scope_level+1);
- BlockModifier::visit(block);
+ SetForScope<Block *> set_block(current_block, &block);
+ for(NodeList<Statement>::iterator i=block.body.begin(); i!=block.body.end(); ++i)
+ {
+ insert_point = i;
+ (*i)->visit(*this);
+ }
for(map<string, VariableDeclaration *>::const_iterator i=block.variables.begin(); i!=block.variables.end(); ++i)
variable_values.erase(i->second);
cond.condition->visit(eval);
if(eval.is_result_valid())
{
- flatten_block(eval.get_result() ? cond.body : cond.else_body);
+ Block &block = (eval.get_result() ? cond.body : cond.else_body);
+ current_block->body.splice(insert_point, block.body);
+ nodes_to_remove.insert(&cond);
return;
}
}
iter.condition->visit(eval);
if(eval.is_result_valid() && !eval.get_result())
{
- remove_node = true;
+ nodes_to_remove.insert(&iter);
return;
}
}