Skip to content

dot: use irep_idt for function identifier [blocks: #3126] #3829

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jan 20, 2019
Merged

dot: use irep_idt for function identifier [blocks: #3126] #3829

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
32 changes: 16 additions & 16 deletions src/goto-instrument/dot.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,10 +44,8 @@ class dott
std::list<exprt> function_calls;
std::list<exprt> clusters;

void write_dot_subgraph(
std::ostream &,
const std::string &,
const goto_programt &);
void
write_dot_subgraph(std::ostream &, const irep_idt &, const goto_programt &);

void do_dot_function_calls(std::ostream &);

Expand All @@ -64,21 +62,23 @@ class dott
std::set<goto_programt::const_targett> &);
};

/// writes the dot graph that corresponds to the goto program to the output
/// Write the dot graph that corresponds to the goto program to the output
/// stream.
/// \par parameters: output stream, name and goto program
/// \param out: output stream
/// \param function_id: name of \p goto_program
/// \param goto_program: goto program the dot graph of which is written
/// \return true on error, false otherwise
void dott::write_dot_subgraph(
std::ostream &out,
const std::string &name,
const irep_idt &function_id,
const goto_programt &goto_program)
{
clusters.push_back(exprt("cluster"));
clusters.back().set("name", name);
clusters.back().set("name", function_id);
clusters.back().set("nr", subgraphscount);

out << "subgraph \"cluster_" << name << "\" {\n";
out << "label=\"" << name << "\";\n";
out << "subgraph \"cluster_" << function_id << "\" {\n";
out << "label=\"" << function_id << "\";\n";

const goto_programt::instructionst &instructions =
goto_program.instructions;
Expand Down Expand Up @@ -111,22 +111,22 @@ void dott::write_dot_subgraph(
tmp.str("Goto");
else
{
std::string t = from_expr(ns, it->function, it->guard);
std::string t = from_expr(ns, function_id, it->guard);
while(t[ t.size()-1 ]=='\n')
t = t.substr(0, t.size()-1);
tmp << escape(t) << "?";
}
}
else if(it->is_assume())
{
std::string t = from_expr(ns, it->function, it->guard);
std::string t = from_expr(ns, function_id, it->guard);
while(t[ t.size()-1 ]=='\n')
t = t.substr(0, t.size()-1);
tmp << "Assume\\n(" << escape(t) << ")";
}
else if(it->is_assert())
{
std::string t = from_expr(ns, it->function, it->guard);
std::string t = from_expr(ns, function_id, it->guard);
while(t[ t.size()-1 ]=='\n')
t = t.substr(0, t.size()-1);
tmp << "Assert\\n(" << escape(t) << ")";
Expand All @@ -145,7 +145,7 @@ void dott::write_dot_subgraph(
tmp.str("Atomic End");
else if(it->is_function_call())
{
std::string t = from_expr(ns, it->function, it->code);
std::string t = from_expr(ns, function_id, it->code);
while(t[ t.size()-1 ]=='\n')
t = t.substr(0, t.size()-1);
tmp.str(escape(t));
Expand All @@ -162,7 +162,7 @@ void dott::write_dot_subgraph(
it->is_return() ||
it->is_other())
{
std::string t = from_expr(ns, it->function, it->code);
std::string t = from_expr(ns, function_id, it->code);
while(t[ t.size()-1 ]=='\n')
t = t.substr(0, t.size()-1);
tmp.str(escape(t));
Expand Down Expand Up @@ -266,7 +266,7 @@ void dott::output(std::ostream &out)

forall_goto_functions(it, goto_model.goto_functions)
if(it->second.body_available())
write_dot_subgraph(out, id2string(it->first), it->second.body);
write_dot_subgraph(out, it->first, it->second.body);

do_dot_function_calls(out);

Expand Down