Fix ord on variants conflicting with Result#260
Open
sim642 wants to merge 4 commits intoocaml-ppx:masterfrom
Open
Fix ord on variants conflicting with Result#260sim642 wants to merge 4 commits intoocaml-ppx:masterfrom
Result#260sim642 wants to merge 4 commits intoocaml-ppx:masterfrom
Conversation
Contributor
Author
|
I'm guessing my fix only works with OCaml 4.11 and up due to the following point in OCaml 4.11.0 release notes:
I tried slapping Changing that to avoid the I hopefully managed to make it all work by also inserting |
sim642
added a commit
to sim642/ppx_deriving
that referenced
this pull request
Mar 19, 2022
sim642
added a commit
to sim642/ppx_deriving
that referenced
this pull request
Mar 19, 2022
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
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.
Closes #254. Besides
Erroralso applies toOk, coming fromPpx_deriving_runtime.Conceptually the fix is simple: just add a type constraint to the
to_intfunction generated into thewildcard_caseof variant comparison. This forces type-directed construction resolution to correctly use the constructor from our type instead ofResult.The tricky part was not breaking other tests, where a new variant type is defined with the same name as a standard one, e.g.
bool. In that case theto_inttype constraint inside the comparator must still refer to the outerbooltype being declared, not the one fromPpx_deriving_runtime, which happens to be opened at that point due tosanitize.A local module definition
Ppx_deriving_ord_helperis used to capture the type being declared outside ofsanitize, such that inside it, we can refer to the correctbool. Hopefully such type-only local module doesn't have any runtime cost (?), otherwise I'll have to make it conditional to only happen for variant types (currently it's generated unconditionally and otherwise just unused).