fix: Account for the optional equality support of map/seq inside newtypes #5980
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,57 +1,240 @@ | ||
| // RUN: %testDafnyForEachResolver --expect-exit-code=2 "%s" | ||
|
|
||
| module Issue5972 { | ||
| datatype M<T, U> = M(m: map<T, U>) | ||
|
|
||
| method CompareAnything<A>(f: A, g: A) returns (b: bool) | ||
| ensures b <==> f == g | ||
| { | ||
| var m1 := M(map[0 := f]); | ||
| var m2 := M(map[0 := g]); | ||
| assert m1 == m2 <==> f == g by { | ||
| if f == g { | ||
| assert m1 == m2; | ||
| } | ||
| if m1 == m2 { | ||
| assert m1.m[0] == m2.m[0]; | ||
| } | ||
| } | ||
| return m1 == m2; // error: the types of m1 and m2 do not support equality | ||
| } | ||
|
|
||
| datatype S<T> = S(s: seq<T>) | ||
|
|
||
| method CompareAnythingS<A>(f: A, g: A) returns (b: bool) | ||
| ensures b <==> f == g | ||
| { | ||
| var m1 := S([f]); | ||
| var m2 := S([g]); | ||
| assert m1 == m2 <==> f == g by { | ||
| if f == g { | ||
| assert m1 == m2; | ||
| } | ||
| if m1 == m2 { | ||
| assert m1.s[0] == m2.s[0]; | ||
| } | ||
| } | ||
| return m1 == m2; // error: the types of m1 and m2 do not support equality | ||
| } | ||
|
|
||
|
|
||
| codatatype Stream = Stream(head: int, tail: Stream) | ||
| { | ||
| static function From(i: int): Stream { | ||
| Stream(i, From(i + 1)) | ||
| } | ||
| } | ||
|
|
||
| method Main() { | ||
| var s1 := Stream.From(0); | ||
| var s2 := Stream.From(0); | ||
| var b := CompareAnything(s1, s2); | ||
| var b2 := CompareAnythingS(s1, s2); | ||
| if !b || !b2 { | ||
| assert false; | ||
| print 1/0; | ||
| } | ||
| } | ||
| } | ||
|
|
||
| // This module is like Issue5972 above, but uses type synonyms around the map/seq types | ||
| module TypeSynonyms { | ||
| type MyMap<T, U> = map<T, U> | ||
| type MySeq<T> = seq<T> | ||
|
|
||
| datatype M<T, U> = M(m: MyMap<T, U>) | ||
|
|
||
| method CompareAnything<A>(f: A, g: A) returns (b: bool) | ||
| ensures b <==> f == g | ||
| { | ||
| var m1 := M(map[0 := f]); | ||
| var m2 := M(map[0 := g]); | ||
| assert m1 == m2 <==> f == g by { | ||
| if f == g { | ||
| assert m1 == m2; | ||
| } | ||
| if m1 == m2 { | ||
| assert m1.m[0] == m2.m[0]; | ||
| } | ||
| } | ||
| return m1 == m2; // error: the types of m1 and m2 do not support equality | ||
| } | ||
|
|
||
| datatype S<T> = S(s: MySeq<T>) | ||
|
|
||
| method CompareAnythingS<A>(f: A, g: A) returns (b: bool) | ||
| ensures b <==> f == g | ||
| { | ||
| var m1 := S([f]); | ||
| var m2 := S([g]); | ||
| assert m1 == m2 <==> f == g by { | ||
| if f == g { | ||
| assert m1 == m2; | ||
| } | ||
| if m1 == m2 { | ||
| assert m1.s[0] == m2.s[0]; | ||
| } | ||
| } | ||
| return m1 == m2; // error: the types of m1 and m2 do not support equality | ||
| } | ||
|
|
||
| codatatype Stream = Stream(head: int, tail: Stream) | ||
| { | ||
| static function From(i: int): Stream { | ||
| Stream(i, From(i + 1)) | ||
| } | ||
| } | ||
|
|
||
| method Test() { | ||
| var s1 := Stream.From(0); | ||
| var s2 := Stream.From(0); | ||
| var b := CompareAnything(s1, s2); | ||
| var b2 := CompareAnythingS(s1, s2); | ||
| if !b || !b2 { | ||
| assert false; | ||
| print 1/0; | ||
| } | ||
| } | ||
| } | ||
|
|
||
| // This module is like TypeSynonyms above, but the two type synonyms are declared to definitely support equality. | ||
| // The fact that their RHSs don't gives rise to errors, but in the process of fixing issue 5972, this program | ||
| // had caused a crash, so it seems good to include as a test case. | ||
| module TypeSynonymsWithGuaranteedEqualitySupport { | ||
| type MyMap(==)<T, U> = map<T, U> // error: RHS does not support equality as promised | ||
| type MySeq(==)<T> = seq<T> // error: RHS does not support equality as promised | ||
|
|
||
| datatype M<T, U> = M(m: MyMap<T, U>) | ||
|
|
||
| method CompareAnything<A>(f: A, g: A) returns (b: bool) | ||
| ensures b <==> f == g | ||
| { | ||
| var m1 := M(map[0 := f]); | ||
| var m2 := M(map[0 := g]); | ||
| assert m1 == m2 <==> f == g by { | ||
| if f == g { | ||
| assert m1 == m2; | ||
| } | ||
| if m1 == m2 { | ||
| assert m1.m[0] == m2.m[0]; | ||
| } | ||
| } | ||
| return m1 == m2; | ||
| } | ||
|
|
||
| datatype S<T> = S(s: MySeq<T>) | ||
|
|
||
| method CompareAnythingS<A>(f: A, g: A) returns (b: bool) | ||
| ensures b <==> f == g | ||
| { | ||
| var m1 := S([f]); | ||
| var m2 := S([g]); | ||
| assert m1 == m2 <==> f == g by { | ||
| if f == g { | ||
| assert m1 == m2; | ||
| } | ||
| if m1 == m2 { | ||
| assert m1.s[0] == m2.s[0]; | ||
| } | ||
| } | ||
| return m1 == m2; | ||
| } | ||
|
|
||
| codatatype Stream = Stream(head: int, tail: Stream) | ||
| { | ||
| static function From(i: int): Stream { | ||
| Stream(i, From(i + 1)) | ||
| } | ||
| } | ||
|
|
||
| method Test() { | ||
| var s1 := Stream.From(0); | ||
| var s2 := Stream.From(0); | ||
| var b := CompareAnything(s1, s2); | ||
| var b2 := CompareAnythingS(s1, s2); | ||
| if !b || !b2 { | ||
| assert false; | ||
| print 1/0; | ||
| } | ||
| } | ||
| } | ||
|
|
||
| // This module is like TypeSynonyms above, but uses subset types around the map/seq types | ||
| module SubsetTypes { | ||
| type MyMap<T, U> = m: map<T, U> | true | ||
| type MySeq<T> = s: seq<T> | true | ||
|
|
||
| datatype M<T, U> = M(m: MyMap<T, U>) | ||
|
|
||
| method CompareAnything<A>(f: A, g: A) returns (b: bool) | ||
| ensures b <==> f == g | ||
| { | ||
| var m1 := M(map[0 := f]); | ||
| var m2 := M(map[0 := g]); | ||
| assert m1 == m2 <==> f == g by { | ||
| if f == g { | ||
| assert m1 == m2; | ||
| } | ||
| if m1 == m2 { | ||
| assert m1.m[0] == m2.m[0]; | ||
| } | ||
| } | ||
| return m1 == m2; // error: the types of m1 and m2 do not support equality | ||
| } | ||
|
|
||
| datatype S<T> = S(s: MySeq<T>) | ||
|
|
||
| method CompareAnythingS<A>(f: A, g: A) returns (b: bool) | ||
| ensures b <==> f == g | ||
| { | ||
| var m1 := S([f]); | ||
| var m2 := S([g]); | ||
| assert m1 == m2 <==> f == g by { | ||
| if f == g { | ||
| assert m1 == m2; | ||
| } | ||
| if m1 == m2 { | ||
| assert m1.s[0] == m2.s[0]; | ||
| } | ||
| } | ||
| return m1 == m2; // error: the types of m1 and m2 do not support equality | ||
| } | ||
|
|
||
| codatatype Stream = Stream(head: int, tail: Stream) | ||
| { | ||
| static function From(i: int): Stream { | ||
| Stream(i, From(i + 1)) | ||
| } | ||
| } | ||
|
|
||
| method Test() { | ||
| var s1 := Stream.From(0); | ||
| var s2 := Stream.From(0); | ||
| var b := CompareAnything(s1, s2); | ||
| var b2 := CompareAnythingS(s1, s2); | ||
| if !b || !b2 { | ||
| assert false; | ||
| print 1/0; | ||
| } | ||
| } | ||
| } |
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 |
|---|---|---|
| @@ -1,3 +1,9 @@ | ||
| git-issue-5972.dfy(19,11): Error: == can only be applied to expressions of types that support equality (got M<int, A>) | ||
| git-issue-5972.dfy(37,11): Error: == can only be applied to expressions of types that support equality (got S<A>) | ||
| git-issue-5972.dfy(80,11): Error: == can only be applied to expressions of types that support equality (got M<int, A>) | ||
| git-issue-5972.dfy(98,11): Error: == can only be applied to expressions of types that support equality (got S<A>) | ||
| git-issue-5972.dfy(124,7): Error: type 'MyMap' declared as supporting equality, but the RHS type (map<T, U>) might not | ||
| git-issue-5972.dfy(125,7): Error: type 'MySeq' declared as supporting equality, but the RHS type (seq<T>) might not | ||
| git-issue-5972.dfy(202,11): Error: == can only be applied to expressions of types that support equality (got M<int, A>) | ||
| git-issue-5972.dfy(220,11): Error: == can only be applied to expressions of types that support equality (got S<A>) | ||
| 8 resolution/type errors detected in git-issue-5972.dfy |
Oops, something went wrong.
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.
Because of my change, we could also do the same treatment as for the datatypes, if you preferred. I'm fine with both approaches and to switch if you prefer.