Fix lex orderings in pulse decreases clauses + examples#575
Merged
Conversation
nikswamy
changed the title
Contributor
|
Ah, so the LGTM, the typing is entirely missing but that doesn't really matter since we're going to remove it anyhow. FYI, we renamed Tm_NuWhile to Tm_While yesterday and that's why you're seeing merge conflicts. |
Change meas field in Tm_NuWhile from 'option term' to 'list term' to support lexicographic decreases clauses like 'decreases %[(!x); (!y)]'. For multi-element measures, build nested tuple values (Mktuple2) and a lexicographic comparison formula: a << d \/ (a == d /\ b << e). The desugarer now detects LexList AST nodes in while decreases clauses and extracts individual terms into the list representation. Remove [@@expect_failure] from the lex function in WhileDecreases.fst. Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
Contributor
Author
|
I'm at least getting it to remove the assumes ... |
Resolve conflicts keeping our lex decreases changes (list term for meas, dec_formula parameter, build_tuple_info) while adopting main's renaming of NuWhile -> While. Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
nikswamy
force-pushed
the
_nik_while_decreases_examples
branch
from
d83424c to
8ba25d0
Compare
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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
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.
Fixes #576