Skip to content

format now prints type expressions and the values of named sub-ireps #2153

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
May 4, 2018
Merged

format now prints type expressions and the values of named sub-ireps #2153

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: 21 additions & 11 deletions src/util/format_expr.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -165,6 +165,8 @@ std::ostream &format_rec(
<< to_member_expr(expr).get_component_name();
else if(id == ID_symbol)
return os << to_symbol_expr(expr).get_identifier();
else if(id == ID_type)
return format_rec(os, expr.type());
else if(id == ID_forall || id == ID_exists)
return os << id << ' ' << format(to_quantifier_expr(expr).symbol()) << " : "
<< format(to_quantifier_expr(expr).symbol().type()) << " . "
Expand Down Expand Up @@ -199,22 +201,30 @@ std::ostream &format_rec(
}
else
{
if(!expr.has_operands())
return os << id;
os << id;

os << id << '(';
bool first = true;
for(const auto &s : expr.get_named_sub())
if(s.first!=ID_type)
os << ' ' << s.first << "=\"" << s.second.id() << '"';

for(const auto &op : expr.operands())
if(expr.has_operands())
{
if(first)
first = false;
else
os << ", ";
os << id << '(';
bool first = true;

os << format(op);
for(const auto &op : expr.operands())
{
if(first)
first = false;
else
os << ", ";

os << format(op);
}

os << ')';
}

return os << ')';
return os;
}
}