Skip to content

show-vcc: colors #3209

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
Oct 20, 2018
Merged

show-vcc: colors #3209

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
68a5555
fix description in exception thrown
Oct 20, 2018
ef3f429
switch show_vcc_plain to mstreamt
Oct 20, 2018
5e7a1dd
(moderate) use of color in show-vcc
Oct 20, 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
27 changes: 18 additions & 9 deletions src/goto-symex/show_vcc.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ Author: Daniel Kroening, [email protected]
#include <util/ui_message.h>

void show_vcc_plain(
std::ostream &out,
messaget::mstreamt &out,
const namespacet &ns,
const symex_target_equationt &equation)
{
Expand Down Expand Up @@ -63,7 +63,8 @@ void show_vcc_plain(
{
if(!p_it->ignore)
{
out << "{-" << count << "} " << format(p_it->cond_expr) << '\n';
out << messaget::faint << "{-" << count << "} " << messaget::reset
<< format(p_it->cond_expr) << '\n';

#ifdef DEBUG
out << "GUARD: " << format(p_it->guard) << '\n';
Expand All @@ -75,10 +76,10 @@ void show_vcc_plain(
}

// Unicode equivalent of "|--------------------------"
out << u8"\u251c";
out << messaget::faint << u8"\u251c";
for(unsigned i = 0; i < 26; i++)
out << u8"\u2500";
out << '\n';
out << messaget::reset << '\n';

// split property into multiple disjunts, if applicable
exprt::operandst disjuncts;
Expand All @@ -91,9 +92,12 @@ void show_vcc_plain(
std::size_t count = 1;
for(const auto &disjunct : disjuncts)
{
out << '{' << count << "} " << format(disjunct) << '\n';
out << messaget::faint << '{' << count << "} " << messaget::reset
<< format(disjunct) << '\n';
count++;
}

out << messaget::eom;
}
}

Expand Down Expand Up @@ -174,7 +178,7 @@ void show_vcc(
of.open(filename);
if(!of)
throw invalid_command_line_argument_exceptiont(
"invalid file to read trace from: " + filename, "--outfile");
"failed to open output file: " + filename, "--outfile");
}

std::ostream &out = have_file ? of : std::cout;
Expand All @@ -190,13 +194,18 @@ void show_vcc(
break;

case ui_message_handlert::uit::PLAIN:
msg.status() << "VERIFICATION CONDITIONS:\n" << messaget::eom;
if(have_file)
show_vcc_plain(out, ns, equation);
{
msg.status() << "Verification conditions written to file"
<< messaget::eom;
stream_message_handlert mout_handler(out);
messaget mout(mout_handler);
show_vcc_plain(mout.status(), ns, equation);
}
else
{
msg.status() << "VERIFICATION CONDITIONS:\n" << messaget::eom;
show_vcc_plain(msg.status(), ns, equation);
msg.status() << messaget::eom;
}
break;
}
Expand Down