Introduce Prop newtype wrapper for Terms representing propositions as types
#614
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
added 4 commits
December 12, 2019 13:18
Other functions are renamed according to their saw-script names.
A "proposition" is defined as a `Term` whose saw-core type is `sort n` for some `n`. Also fix `split_goal` tactic, which expected a goal in the wrong representation.
andreistefanescu
approved these changes
Dec 13, 2019
| printOutLnTop Warn $ "WARNING: assuming goal " ++ goalName goal ++ " is valid" | ||
| let stats = solverStats "ADMITTED" (scSharedSize (goalTerm goal)) | ||
| return (SV.Valid stats, stats, Nothing) | ||
| assumeValid = |
There was a problem hiding this comment.
mixing code formatting changes with functional changes makes the functional changes harder to review. In general, avoid formatting changes of code you are not changing in other ways, or at least move all code formatting changes in separate commits, so they can be skipped during code review
| -- satisfiability using ABC. | ||
| satABC :: ProofScript SV.SatResult | ||
| satABC = do | ||
| -- | Bit-blast a proposition and check its validity using ABC. |
There was a problem hiding this comment.
nice that these renames are in a separate commit
| do let (args, concl) = asPiList goal | ||
| p <- asEqTrue concl | ||
| p' <- scNot sc p | ||
| p' <- scNot sc p -- is this right? |
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.
This branch attempts to clean up some of the unclear conventions about how various functions expect
Termarguments to encode logical propositions. Now we can use typePropto unambiguously indicate that we will encode universal quantification with Pi types, andEqTrueto lift booleans to typesort 0.This branch also includes a fix for #613, which is one of those bugs caused by disagreement between conventions for variable quantification and logical negation for prove vs sat.