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)
NodeRemover::NodeRemover():
stage(0),
to_remove(0),
- anonymous(false),
recursive_remove(false)
{ }
s.content.visit(*this);
}
-void NodeRemover::remove_variable(map<string, VariableDeclaration *> &vars, VariableDeclaration &decl)
+template<typename T>
+void NodeRemover::remove_from_map(map<string, T *> &vars, const string &key, T &node)
{
- map<string, VariableDeclaration *>::iterator i = vars.find(decl.name);
- if(i!=vars.end() && i->second==&decl)
+ typename map<string, T *>::iterator i = vars.find(key);
+ if(i!=vars.end() && i->second==&node)
vars.erase(i);
}
void NodeRemover::visit(Block &block)
{
- blocks.push_back(&block);
+ SetForScope<Block *> set_block(current_block, &block);
for(NodeList<Statement>::iterator i=block.body.begin(); i!=block.body.end(); )
{
(*i)->visit(*this);
else
++i;
}
- blocks.pop_back();
}
void NodeRemover::visit(StructDeclaration &strct)
{
if(to_remove->count(&strct))
- blocks.back()->types.erase(strct.name);
+ remove_from_map(current_block->types, strct.name, strct);
}
void NodeRemover::visit(VariableDeclaration &var)
{
if(recursive_remove || to_remove->count(&var))
{
- remove_variable(blocks.back()->variables, var);
- if(anonymous && blocks.size()>1)
- remove_variable(blocks[blocks.size()-2]->variables, var);
- remove_variable(stage->in_variables, var);
- remove_variable(stage->out_variables, var);
+ remove_from_map(current_block->variables, var.name, var);
stage->locations.erase(var.name);
if(var.linked_declaration)
var.linked_declaration->linked_declaration = 0;
void NodeRemover::visit(InterfaceBlock &iface)
{
- SetFlag set_anon(anonymous);
+ 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);
}