format_expr: use table and tweak precedences #3208
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Member
kroening
commented
Oct 20, 2018
kroening
commented
- Each commit message has a non-empty body, explaining why the change was made.
- Methods or procedures I have added are documented, following the guidelines provided in CODING_STANDARD.md.
- 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.
- White-space or formatting changes outside the feature-related changed lines are in commits of their own.
kroening
requested review from
peterschrammel,
pkesseli,
smowton and
tautschnig
as code owners
kroening
force-pushed
the
format_expr_table
branch
from
ee91d9c to
bcdf096
Compare
tautschnig
reviewed
Oct 20, 2018
src/util/format_expr.cpp
Outdated
| @@ -180,7 +207,7 @@ std::ostream &fallback_format_rec(std::ostream &os, const exprt &expr) | |||
| if(first) | |||
| first = false; | |||
| else | |||
| os << ", "; | |||
| os << " }, "; | |||
There was a problem hiding this comment.
What is this change about?
src/util/format_expr.cpp
Outdated
| {ID_implies, u8"\u21d2"}, // =>, U+21D2 | ||
| {ID_le, u8"\u2264"}, // <=, U+2264 | ||
| {ID_ge, u8"\u2265"}, // >=, U+2265 | ||
| {ID_notequal, u8"\u2260"}, // /=, U+2260 |
kroening
force-pushed
the
format_expr_table
branch
2 times, most recently
from
1482c22 to
372028e
Compare
tautschnig
approved these changes
Oct 20, 2018
| {ID_xor, {u8"\u2295"}}, // + in circle, U+2295 | ||
| {ID_implies, {u8"\u21d2"}}, // =>, U+21D2 | ||
| {ID_le, {u8"\u2264"}}, // <=, U+2264 | ||
| {ID_ge, {u8"\u2265"}}, // >=, U+2265 |
There was a problem hiding this comment.
What about ID_lt, ID_gt?
| @@ -356,7 +356,7 @@ SCENARIO("miniBDD", "[core][solver][miniBDD]") | |||
| { | |||
| std::ostringstream oss; | |||
| oss << format(t.as_expr()); | |||
| REQUIRE(oss.str() == "(¬a) ∨ b"); | |||
| REQUIRE(oss.str() == "¬a ∨ b"); | |||
There was a problem hiding this comment.
I believe the changes in this file are in the wrong commit as they appear to relate to precedence. But I could be wrong.
There was a problem hiding this comment.
Split into separate commit
kroening
force-pushed
the
format_expr_table
branch
from
372028e to
9b6a3ea
Compare
kroening
force-pushed
the
format_expr_table
branch
from
9b6a3ea to
6dca32d
Compare
allredj
reviewed
Oct 20, 2018
There was a problem hiding this comment.
Passed Diffblue compatibility checks (cbmc commit: 6dca32d).
Build URL: https://travis-ci.com/diffblue/test-gen/builds/88634542
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.