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);
+ for(const RefPtr<Statement> &s: block.body)
+ s->visit(*this);
}
void TraversingVisitor::visit(RefPtr<Expression> &expr)
void TraversingVisitor::visit(FunctionCall &call)
{
- for(NodeArray<Expression>::iterator i=call.arguments.begin(); i!=call.arguments.end(); ++i)
- visit(*i);
+ for(RefPtr<Expression> &a: call.arguments)
+ visit(a);
}
void TraversingVisitor::visit(ExpressionStatement &expr)
void TraversingVisitor::visit(InterfaceBlock &iface)
{
+ if(iface.layout)
+ iface.layout->visit(*this);
if(iface.members)
iface.members->visit(*this);
}
{
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);
+ for(const RefPtr<VariableDeclaration> &p: func.parameters)
+ p->visit(*this);
func.body.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);
+ auto 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(); )
+ for(auto i=block.body.begin(); i!=block.body.end(); )
{
(*i)->visit(*this);
if(to_remove->count(i->get()))
{
if(to_remove->count(&iface))
{
- remove_from_map(stage->interface_blocks, iface.interface+iface.block_name, iface);
+ remove_from_map(stage->interface_blocks, format("%s %s", iface.interface, iface.block_name), iface);
if(!iface.instance_name.empty())
- remove_from_map(stage->interface_blocks, "_"+iface.instance_name, iface);
+ remove_from_map(stage->interface_blocks, iface.instance_name, iface);
}
SetFlag set_recursive(recursive_remove, recursive_remove || to_remove->count(&iface));
TraversingVisitor::visit(iface);
void NodeReorderer::visit(Block &block)
{
- NodeList<Statement>::iterator insert_point = block.body.end();
- for(NodeList<Statement>::iterator i=block.body.begin(); i!=block.body.end(); )
+ auto insert_point = block.body.end();
+ for(auto i=block.body.begin(); i!=block.body.end(); )
{
(*i)->visit(*this);
if(insert_point!=block.body.end() && to_reorder->count(i->get()))
- {
- NodeList<Statement>::iterator j = i++;
- block.body.splice(insert_point, block.body, j);
- }
+ block.body.splice(insert_point, block.body, i++);
else
{
if(i->get()==reorder_before)