void DumpTree::visit(UnaryExpression &unary)
{
- annotated_branch(format("Unary: %s, %sfix", unary.oper, (unary.prefix ? "pre" : "suff")), *unary.expression);
+ string text = format("Unary: %s, %sfix", unary.oper->token, (unary.oper->type==Operator::PREFIX ? "pre" : "post"));
+ annotated_branch(text, *unary.expression);
}
void DumpTree::visit(BinaryExpression &binary)
{
- append(format("Binary: %s%s", binary.oper, binary.after));
+ append(format("Binary: %s", (binary.oper->token[0]=='[' ? "[]" : binary.oper->token)));
begin_sub();
binary.left->visit(*this);
last_branch();
void DumpTree::visit(Assignment &assign)
{
- append(format("Assignment: %s%s", assign.oper, (assign.self_referencing ? " (self-referencing)" : "")));
+ append(format("Assignment: %s%s", assign.oper->token, (assign.self_referencing ? " (self-referencing)" : "")));
begin_sub();
if(assign.target_declaration)
append(format("Target: %%%d %s %s", get_label(*assign.target_declaration), assign.target_declaration->type, assign.target_declaration->name));
for(NodeArray<VariableDeclaration>::const_iterator i=func.parameters.begin(); i!=func.parameters.end(); ++i)
(*i)->visit(*this);
last_branch();
- if(func.definition!=&func)
- append(format("Definition: %%%d", get_label(*func.definition)));
- else
+ if(func.definition==&func)
func.body.visit(*this);
+ else if(func.definition)
+ append(format("Definition: %%%d", get_label(*func.definition)));
end_sub();
}