Since nodes are now easily distinguished, there's no need for special
labeling branches in many cases.
vector<Branch>::const_iterator j = increment(i, branches);
if(!j->text.empty())
{
vector<Branch>::const_iterator j = increment(i, branches);
if(!j->text.empty())
{
- annotated_branch(j->text, *j->node);
- else
- append(j->text);
+ {
+ begin_sub();
+ last_branch();
+ j->node->visit(*this);
+ end_sub();
+ }
}
else
j->node->visit(*this);
}
else
j->node->visit(*this);
-void DumpTree::annotated_branch(const string &annotation, Node &node)
-{
- append(annotation);
- begin_sub();
- last_branch();
- node.visit(*this);
- end_sub();
-}
-
unsigned DumpTree::get_label(const Node &node)
{
unsigned &label = node_labels[&node];
unsigned DumpTree::get_label(const Node &node)
{
unsigned &label = node_labels[&node];
for(std::map<string, VariableDeclaration *>::const_iterator i=block.variables.begin(); i!=block.variables.end(); ++i)
append(format("Variable: %%%d %s %s", get_label(*i->second), i->second->type, i->first));
for(std::map<string, VariableDeclaration *>::const_iterator i=block.variables.begin(); i!=block.variables.end(); ++i)
append(format("Variable: %%%d %s %s", get_label(*i->second), i->second->type, i->first));
- bool labeled_body = !block.variables.empty();
- if(labeled_body)
- {
- last_branch();
- append("Body");
- begin_sub();
- }
for(NodeList<Statement>::const_iterator i=block.body.begin(); i!=block.body.end(); )
{
NodeList<Statement>::const_iterator j = increment(i, block.body);
(*j)->visit(*this);
}
for(NodeList<Statement>::const_iterator i=block.body.begin(); i!=block.body.end(); )
{
NodeList<Statement>::const_iterator j = increment(i, block.body);
(*j)->visit(*this);
}
- if(labeled_body)
- end_sub();
if(iface.type_declaration)
append(format("Type: %%%d %s", get_label(*iface.type_declaration), iface.type_declaration->name));
if(iface.layout)
if(iface.type_declaration)
append(format("Type: %%%d %s", get_label(*iface.type_declaration), iface.type_declaration->name));
if(iface.layout)
- branches.push_back(Branch("Layout", iface.layout.get()));
+ branches.push_back(iface.layout.get());
- branches.push_back(Branch("Members", iface.members.get()));
+ branches.push_back(iface.members.get());
append_subtree(branches);
}
append_subtree(branches);
}
vector<Branch> branches;
branches.push_back(cond.condition.get());
vector<Branch> branches;
branches.push_back(cond.condition.get());
- branches.push_back(&cond.body);
+ branches.push_back(Branch("then", &cond.body));
if(!cond.else_body.body.empty())
if(!cond.else_body.body.empty())
- branches.push_back(&cond.else_body);
+ branches.push_back(Branch("else", &cond.else_body));
append_subtree(branches);
}
append_subtree(branches);
}
+ vector<Branch> branches;
- annotated_branch("Initialization", *iter.init_statement);
+ branches.push_back(Branch("Initialization", iter.init_statement.get()));
- annotated_branch("Condition", *iter.condition);
+ branches.push_back(Branch("Condition", iter.condition.get()));
- annotated_branch("Loop", *iter.loop_expression);
- last_branch();
- annotated_branch("Body", iter.body);
- end_sub();
+ branches.push_back(Branch("Loop", iter.loop_expression.get()));
+ branches.push_back(&iter.body);
+ append_subtree(branches);
}
void DumpTree::visit(Passthrough &pass)
}
void DumpTree::visit(Passthrough &pass)
void begin_sub();
void last_branch();
void end_sub();
void begin_sub();
void last_branch();
void end_sub();
- void annotated_branch(const std::string &, Node &);
unsigned get_label(const Node &);
std::string format_type(TypeDeclaration *);
unsigned get_label(const Node &);
std::string format_type(TypeDeclaration *);