-
Notifications
You must be signed in to change notification settings - Fork 260
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: Ability to use .Key as a constant name in datatypes and classes #4423
Merged
Merged
Changes from 3 commits
Commits
Show all changes
10 commits
Select commit
Hold shift + click to select a range
99db39c
Add test for issue #4394
MikaelMayer ceaa8d5
Fix: Ability to use .Key as a constant name in datatypes and classes
MikaelMayer ede95fd
Merge branch 'master' into fix-4394-translator-crash
MikaelMayer 4523ded
Review comments
MikaelMayer 5325dab
Merge branch 'master' into fix-4394-translator-crash
MikaelMayer 5ef92bb
Update Source/DafnyCore/Verifier/Translator.cs
MikaelMayer d56a05f
Merge branch 'master' into fix-4394-translator-crash
MikaelMayer 995dea3
Merge branch 'master' into fix-4394-translator-crash
MikaelMayer f1519ab
Merge branch 'master' into fix-4394-translator-crash
MikaelMayer de3290a
Merge branch 'master' into fix-4394-translator-crash
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
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,16 @@ | ||
// RUN: %baredafny verify %args "%s" > "%t" | ||
// RUN: %diff "%s.expect" "%t" | ||
|
||
datatype T = T( | ||
f:map<nat,nat> | ||
) { | ||
const Keys := f.Keys // no problem if another name is used for the constant | ||
} | ||
|
||
class C { | ||
const Keys: set<nat> | ||
|
||
constructor(f:map<nat,nat>) { | ||
this.Keys := f.Keys; | ||
} | ||
} |
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,2 @@ | ||
|
||
Dafny program verifier finished with 0 verified, 0 errors |
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 @@ | ||
Ability to use .Key as a constant name in datatypes and classes |
Oops, something went wrong.
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.
You're checking
IndDatatypeDecl
instead ofDatatypeDecl
. The latter also includes codatatype declarations. Did you intend to make this distinction? I don't quite understand the test, but perhaps you even wantTopLevelDeclWithMembers
instead ofIndDatatypeDecl or ClassLikeDecl
, which would then also include abstract types and newtypes. I suggest adding test cases for these, too.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.
Interesting remark. Testing it with co-datatype did not yield any error, but opaque types and newtypes did yield errors.
However, map itself being a ValueTypeDecl, which is a TopLevelDeclWithMembers, I had to make an exclusion check, but it ended up working.