void TraversingVisitor::visit(Block &block)
{
+ if(&block!=current_block)
+ enter(block);
+ SetForScope<Block *> set_block(current_block, &block);
for(NodeList<Statement>::iterator i=block.body.begin(); i!=block.body.end(); ++i)
(*i)->visit(*this);
}
void TraversingVisitor::visit(FunctionDeclaration &func)
{
+ enter(func.body);
+ SetForScope<Block *> set_block(current_block, &func.body);
for(NodeArray<VariableDeclaration>::iterator i=func.parameters.begin(); i!=func.parameters.end(); ++i)
(*i)->visit(*this);
func.body.visit(*this);
void TraversingVisitor::visit(Iteration &iter)
{
+ enter(iter.body);
+ SetForScope<Block *> set_block(current_block, &iter.body);
if(iter.init_statement)
iter.init_statement->visit(*this);
if(iter.condition)
}
-BlockModifier::BlockModifier():
- remove_node(false)
-{ }
-
-void BlockModifier::flatten_block(Block &block)
-{
- insert_nodes.insert(insert_nodes.end(), block.body.begin(), block.body.end());
- remove_node = true;
-}
-
-void BlockModifier::apply_and_increment(Block &block, NodeList<Statement>::iterator &i)
-{
- block.body.insert(i, insert_nodes.begin(), insert_nodes.end());
- insert_nodes.clear();
-
- if(remove_node)
- block.body.erase(i++);
- else
- ++i;
- remove_node = false;
-}
-
-void BlockModifier::visit(Block &block)
-{
- for(NodeList<Statement>::iterator i=block.body.begin(); i!=block.body.end(); )
- {
- (*i)->visit(*this);
- apply_and_increment(block, i);
- }
-}
-
-
NodeRemover::NodeRemover():
stage(0),
- to_remove(0)
+ to_remove(0),
+ recursive_remove(false)
{ }
void NodeRemover::apply(Stage &s, const set<Node *> &tr)
{
stage = &s;
to_remove = &tr;
- visit(s.content);
+ s.content.visit(*this);
+}
+
+template<typename T>
+void NodeRemover::remove_from_map(map<string, T *> &vars, const string &key, T &node)
+{
+ typename map<string, T *>::iterator i = vars.find(key);
+ if(i!=vars.end() && i->second==&node)
+ vars.erase(i);
}
void NodeRemover::visit(Block &block)
{
+ SetForScope<Block *> set_block(current_block, &block);
for(NodeList<Statement>::iterator i=block.body.begin(); i!=block.body.end(); )
{
(*i)->visit(*this);
}
}
+void NodeRemover::visit(StructDeclaration &strct)
+{
+ if(to_remove->count(&strct))
+ remove_from_map(current_block->types, strct.name, strct);
+}
+
void NodeRemover::visit(VariableDeclaration &var)
{
- if(to_remove->count(&var))
+ if(recursive_remove || to_remove->count(&var))
{
- stage->in_variables.erase(var.name);
- stage->out_variables.erase(var.name);
+ remove_from_map(current_block->variables, var.name, var);
stage->locations.erase(var.name);
if(var.linked_declaration)
var.linked_declaration->linked_declaration = 0;
var.init_expression = 0;
}
+void NodeRemover::visit(InterfaceBlock &iface)
+{
+ if(to_remove->count(&iface))
+ {
+ remove_from_map(current_block->interfaces, iface.name, iface);
+ if(!iface.instance_name.empty())
+ remove_from_map(current_block->interfaces, iface.instance_name, iface);
+ }
+ SetFlag set_recursive(recursive_remove, recursive_remove || to_remove->count(&iface));
+ TraversingVisitor::visit(iface);
+}
+
void NodeRemover::visit(Iteration &iter)
{
if(to_remove->count(iter.init_statement.get()))