Skip to content

print disjuncts in Gentzen sequent separately #3164

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.

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
Oct 14, 2018
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
7 changes: 7 additions & 0 deletions regression/cbmc/show-vcc/main.c
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
int main()
{
__CPROVER_bool a, b, c, d;
__CPROVER_assume(a);
__CPROVER_assume(b);
__CPROVER_assert(c || d, "some property");
}
11 changes: 11 additions & 0 deletions regression/cbmc/show-vcc/test.desc
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
CORE
main.c
--show-vcc
^EXIT=0$
^SIGNAL=0$
^some property$
^\{-.*\} a!0@1#1$
^\{-.*\} b!0@1#1$
^\{1\} c!0@1#1$
^\{2\} d!0@1#1$
--
19 changes: 16 additions & 3 deletions src/goto-symex/show_vcc.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -83,9 +83,22 @@ void show_vcc_plain(
out << u8"\u2500";
out << '\n';

std::string string_value =
from_expr(ns, s_it->source.pc->function, s_it->cond_expr);
out << "{" << 1 << "} " << string_value << "\n";
// split property into multiple disjunts, if applicable
exprt::operandst disjuncts;

if(s_it->cond_expr.id() == ID_or)
disjuncts = to_or_expr(s_it->cond_expr).operands();
else
disjuncts.push_back(s_it->cond_expr);

std::size_t count = 1;
for(const auto &disjunct : disjuncts)
{
std::string string_value =
from_expr(ns, s_it->source.pc->function, disjunct);
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Aren't we removing the function member?

out << "{" << count << "} " << string_value << "\n";
count++;
}
}
}

Expand Down