void Formatter::visit(UnaryExpression &unary)
{
- if(unary.prefix)
- append(unary.oper);
+ if(unary.oper->type==Operator::PREFIX)
+ append(unary.oper->token);
unary.expression->visit(*this);
- if(!unary.prefix)
- append(unary.oper);
+ if(unary.oper->type==Operator::POSTFIX)
+ append(unary.oper->token);
}
void Formatter::visit(BinaryExpression &binary)
{
binary.left->visit(*this);
- append(binary.oper);
+ append(binary.oper->token);
binary.right->visit(*this);
- append(binary.after);
+ if(binary.oper->token[0]=='[')
+ append(']');
}
void Formatter::visit(Assignment &assign)
{
assign.left->visit(*this);
- append(format(" %s ", assign.oper));
+ append(format(" %s ", assign.oper->token));
assign.right->visit(*this);
}
SetForScope<unsigned> set(indent, indent+(indent>0 || use_braces));
string spaces(indent*2, ' ');
+ bool first = true;
for(NodeList<Statement>::iterator i=block.body.begin(); i!=block.body.end(); ++i)
{
- if(i!=block.body.begin())
+ if((*i)->source==BUILTIN_SOURCE)
+ continue;
+ if(!first)
append('\n');
+ first = false;
set_source((*i)->source, (*i)->line);
append(spaces);
(*i)->visit(*this);