Fix: Ability to use .Key as a constant name in datatypes and classes #4423
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
keyboardDrummer
previously approved these changes
Aug 16, 2023
RustanLeino
reviewed
Aug 16, 2023
| @@ -6686,10 +6687,11 @@ AND Apply(f,h0,bxs) == Apply(f,h0,bxs) | |||
| return predef.ArrayLength; | |||
| } else if (f.EnclosingClass is ValuetypeDecl { Name: "real" } && f.Name == "Floor") { | |||
| return predef.RealFloor; | |||
| } else if (f is SpecialField && !(f is DatatypeDestructor)) { | |||
| } else if (f is SpecialField && !(f is DatatypeDestructor || f.EnclosingClass is IndDatatypeDecl or ClassLikeDecl)) { | |||
There was a problem hiding this comment.
You're checking IndDatatypeDecl instead of DatatypeDecl. The latter also includes codatatype declarations. Did you intend to make this distinction? I don't quite understand the test, but perhaps you even want TopLevelDeclWithMembers instead of IndDatatypeDecl 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.
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.
RustanLeino
reviewed
Aug 17, 2023
Co-authored-by: Rustan Leino <[email protected]>
RustanLeino
approved these changes
Aug 17, 2023
keyboardDrummer
pushed a commit
to keyboardDrummer/dafny
that referenced
this pull request
Sep 15, 2023
…afny-lang#4423) This PR fixes dafny-lang#4394 I added the corresponding test. <small>By submitting this pull request, I confirm that my contribution is made under the terms of the [MIT license](https://github.com/dafny-lang/dafny/blob/master/LICENSE.txt).</small> --------- Co-authored-by: Rustan Leino <[email protected]>
keyboardDrummer
pushed a commit
that referenced
this pull request
Sep 19, 2023
…4423) This PR fixes #4394 I added the corresponding test. <small>By submitting this pull request, I confirm that my contribution is made under the terms of the [MIT license](https://github.com/dafny-lang/dafny/blob/master/LICENSE.txt).</small> --------- Co-authored-by: Rustan Leino <[email protected]>
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 PR fixes #4394
I added the corresponding test.
By submitting this pull request, I confirm that my contribution is made under the terms of the MIT license.