Skip to content

prop_conv_solvert::get_bool now returns optional #4500

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

Jump to bottom
Merged
merged 1 commit into from
Apr 13, 2019
Merged

prop_conv_solvert::get_bool now returns optional #4500

merged 1 commit into from
Apr 13, 2019

Conversation

kroening
Copy link
Member

@kroening kroening commented Apr 8, 2019 •
edited
Loading

  • Each commit message has a non-empty body, explaining why the change was made.
  • n/a Methods or procedures I have added are documented, following the guidelines provided in CODING_STANDARD.md.
  • n/a The feature or user visible behaviour I have added or modified has been documented in the User Guide in doc/cprover-manual/
  • Regression or unit tests are included, or existing tests cover the modified code (in this case I have detailed which ones those are in the commit message).
  • n/a My commit message includes data points confirming performance improvements (if claimed).
  • My PR is restricted to a single feature or bugfix.
  • n/a White-space or formatting changes outside the feature-related changed lines are in commits of their own.

@kroening kroening force-pushed the get_bool_interface branch from d4120c4 to 1c678c7 Compare April 8, 2019 19:59
allredj
allredj reviewed Apr 8, 2019
View reviewed changes
Copy link
Contributor

@allredj allredj left a comment

Choose a reason for hiding this comment

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

⚠️
This PR failed Diffblue compatibility checks (cbmc commit: 1c678c7).
Build URL: https://travis-ci.com/diffblue/test-gen/builds/107532945
Status will be re-evaluated on next push.
Common spurious failures include: the cbmc commit has disappeared in the mean time (e.g. in a force-push); the author is not in the list of contributors (e.g. first-time contributors); compatibility was already broken by an earlier merge.

@kroening kroening changed the title prop_conv_solvert::get_bool now always returns a value prop_conv_solvert::get_bool now returns optional Apr 9, 2019
tautschnig
tautschnig approved these changes Apr 10, 2019
View reviewed changes
Copy link
Collaborator

@tautschnig tautschnig left a comment

Choose a reason for hiding this comment

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

Seems ok, but wouldn't the use of tvt as the return type be very natural here? The result quite literally is true, false, or unknown!

src/solvers/prop/prop_conv_solver.h
@@ -112,7 +112,7 @@ class prop_conv_solvert : public prop_convt, public solver_resource_limitst
bool post_processing_done = false;

// get a _boolean_ value from counterexample if not valid
virtual bool get_bool(const exprt &expr, tvt &value) const;
virtual optionalt<bool> get_bool(const exprt &expr) const;
Copy link
Collaborator

Choose a reason for hiding this comment

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

Maybe this method can actually receive proper documentation? It doesn't at all discuss the error case, and the "if not valid" lacks a subject.

Copy link
Member Author

Choose a reason for hiding this comment

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

fixed

simplify prop_conv_solvert::get_bool signature
8dbfae1 
The previous signature has used a boolean to indicate error; the result was
returned by reference.

The new variant returns the result and indicates error using an optional.
@kroening kroening force-pushed the get_bool_interface branch from 1c678c7 to 8dbfae1 Compare April 13, 2019 11:40
allredj
allredj reviewed Apr 13, 2019
View reviewed changes
Copy link
Contributor

@allredj allredj left a comment

Choose a reason for hiding this comment

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

✔️
Passed Diffblue compatibility checks (cbmc commit: 8dbfae1).
Build URL: https://travis-ci.com/diffblue/test-gen/builds/108218296

@tautschnig tautschnig merged commit 4205dcd into develop Apr 13, 2019
@tautschnig tautschnig deleted the get_bool_interface branch April 13, 2019 13:06
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@allredj allredj allredj left review comments

@tautschnig tautschnig tautschnig approved these changes

@peterschrammel peterschrammel peterschrammel approved these changes

@martin-cs martin-cs Awaiting requested review from martin-cs martin-cs is a code owner

Assignees

@kroening kroening

Labels
Solvers
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@kroening @tautschnig @peterschrammel @allredj