-
Notifications
You must be signed in to change notification settings - Fork 1.5k
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
Seq rewriter integration #4599
Merged
NikolajBjorner
merged 67 commits into
Z3Prover:master
from
calebstanford-msr:seq-rewriter-integration
Jul 28, 2020
Merged
Seq rewriter integration #4599
NikolajBjorner
merged 67 commits into
Z3Prover:master
from
calebstanford-msr:seq-rewriter-integration
Jul 28, 2020
Conversation
This file contains 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
…dundant predicates locally
(and revert an experimental change where BDDs aren't sorted by get_id)
…mplement separate functionality for expr* logic
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.
(Redoing pull request)
Integrate the new derivative normalization functionality into the sequence rewriter.
The primary changes are:
All conditions formed when creating a derivative now go through the
mk_der_cond
function, which enforces a desired normal form. Currently, it enforces that conditions are rewritten to the formx <= c
wherec
is a character code.In the BDD form, conditions are order by character code whenever possible; otherwise expression ID only as a fallback. So, we redefine
get_id
in the context ofmk_der_op_rec
to bec
for conditions of the formx <= c
.In the BDD form, conditions are then simplified locally: unreachable branches are removed. (This uses the auxiliary function
pred_implies
)The result is that for regexes which only involve ranges and raw characters/strings as predicates, the BDD form is linear and all leaves of the BDD are reachable. Finally:
seq_verbose
tag