Skip to content

Unicode for format_expr #2751

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 3 commits into from
Aug 28, 2018
Merged

Unicode for format_expr #2751

Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
963b866
format_expr now produces unicode
Aug 15, 2018
f2fa169
draw Gentzen turnstile using Unicode
Aug 28, 2018
86aea9b
use status() to output VCCs
Aug 28, 2018
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
31 changes: 28 additions & 3 deletions src/util/format_expr.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,6 +62,27 @@ static std::ostream &format_rec(std::ostream &os, const multi_ary_exprt &src)
{
bool first = true;

std::string operator_str;

if(src.id() == ID_and)
operator_str = u8"\u2227"; // wedge, U+2227
else if(src.id() == ID_or)
operator_str = u8"\u2228"; // vee, U+2228
else if(src.id() == ID_xor)
operator_str = u8"\u2295"; // + in circle, U+2295
else if(src.id() == ID_le)
operator_str = u8"\u2264"; // <=, U+2264
else if(src.id() == ID_ge)
operator_str = u8"\u2265"; // >=, U+2265
else if(src.id() == ID_notequal)
operator_str = u8"\u2260"; // /=, U+2260
else if(src.id() == ID_implies)
operator_str = u8"\u21d2"; // =>, U+21D2
else if(src.id() == ID_iff)
operator_str = u8"\u21d4"; // <=>, U+21D4
else
operator_str = id2string(src.id());

for(const auto &op : src.operands())
{
if(first)
Expand Down Expand Up @@ -95,7 +116,7 @@ static std::ostream &format_rec(std::ostream &os, const binary_exprt &src)
static std::ostream &format_rec(std::ostream &os, const unary_exprt &src)
{
if(src.id() == ID_not)
os << '!';
os << u8"\u00ac"; // neg, U+00AC
else if(src.id() == ID_unary_minus)
os << '-';
else
Expand Down Expand Up @@ -197,8 +218,12 @@ std::ostream &format_rec(std::ostream &os, const exprt &expr)
}
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()) << " : "
else if(id == ID_forall)
return os << id << u8" \u2200 : "
<< format(to_quantifier_expr(expr).symbol().type()) << " . "
<< format(to_quantifier_expr(expr).where());
else if(id == ID_exists)
return os << id << u8" \u2203 : "
<< format(to_quantifier_expr(expr).symbol().type()) << " . "
<< format(to_quantifier_expr(expr).where());
else if(id == ID_let)
Expand Down