-
Notifications
You must be signed in to change notification settings - Fork 257
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
Fix: Optional pre-type won't cause a crash anymore #5442
Merged
Merged
Changes from all commits
Commits
Show all changes
9 commits
Select commit
Hold shift + click to select a range
5906960
Add test for issue #5369
MikaelMayer a44d8b1
Fix: Optional pre-type won't cause a crash anymore
MikaelMayer 79dfa4c
Merge branch 'master' into fix-5369-crash-new-resolver
MikaelMayer 87aa2c5
Merge branch 'master' into fix-5369-crash-new-resolver
MikaelMayer eb0327c
Merge branch 'master' into fix-5369-crash-new-resolver
MikaelMayer cfa8acb
Added comment
MikaelMayer 12310a8
Review comments
MikaelMayer 0faf793
Update fix and expect file
keyboardDrummer 4445b96
Merge branch 'master' into fix-5369-crash-new-resolver
MikaelMayer File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
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
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
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
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
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
43 changes: 43 additions & 0 deletions
43
Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-5369.dfy
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
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,43 @@ | ||
// RUN: %exits-with 2 %baredafny verify %args --type-system-refresh "%s" > "%t" | ||
// RUN: %diff "%s.expect" "%t" | ||
|
||
ghost function f2(items: set<nat>): (r:nat) | ||
requires |items| > 0 { | ||
var item :| item in items; | ||
item | ||
} | ||
|
||
function f(items: set<nat>) : (r:nat) | ||
requires |items| > 0 { | ||
//assume exists item :: item in items && forall other <- items :: item == other || item < other; | ||
//assert exists item Smallest() | ||
var item :| IsSmallest(items, item); | ||
item | ||
} | ||
|
||
predicate IsSmallest(s: set<nat>, item: nat) | ||
requires item in s { | ||
m in s && forall y: nat :: y in s ==> m <= y | ||
} | ||
|
||
lemma Smallest(s: set<nat>) returns (m: nat) | ||
requires s != {} | ||
ensures m in s && IsSmallest(s, m) | ||
decreases s | ||
{ | ||
m :| m in s; | ||
if y: nat :| y in s && y < m { | ||
ghost var s' := s - {m}; | ||
assert y in s'; | ||
m := ThereIsASmallest(s'); | ||
} | ||
} | ||
|
||
function smallest(items: set<nat>): (r: nat) | ||
requires |items| > 0 | ||
|
||
method m(items: set<nat>) returns (r:nat) | ||
requires |items| > 0 { | ||
var item :| item in items; | ||
return item; | ||
} |
4 changes: 4 additions & 0 deletions
4
Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-5369.dfy.expect
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
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,4 @@ | ||
git-issue-5369.dfy(20,2): Error: expression is not allowed to invoke a method (m) | ||
git-issue-5369.dfy(20,40): Error: expression is not allowed to invoke a method (m) | ||
git-issue-5369.dfy(32,9): Error: unresolved identifier: ThereIsASmallest | ||
3 resolution/type errors detected in git-issue-5369.dfy |
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
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1 @@ | ||
Optional pre-type won't cause a crash anymore |
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
What do you mean by
MemberSelect
not being considered an expression? It inherits fromExpression
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
It weirdly is an Expression, but not a true Dafny expression: you cannot use it in a regular Dafny expression. Consider the following:
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
It is also used for fields, in which case it is an expression, right?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
It seems nice to conceptually consider a
MemberSelectExpr
that references a method still an expression, even if we don't allow it in an expression context. If we do that, then I would expect to assign some sort of callable type to it. Could we renameUnusedPreType
toMethod[Pre]Type
?There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Yes, it's used for fields and in that case it's indeed an expression.
I did the renaming, hoping it won't break any future development.