Simplify Inject/Interpret for 1-field records
#1315
Merged
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
Fixes #346 Now a Haskell type like: ```haskell data Example = Foo Bool | Bar Text ``` ... corresponds to this Dhall type: ```dhall { Foo : Bool | Bar : Text } ```
sjakobi
reviewed
Sep 14, 2019
... as suggested by @sjakobi
sjakobi
approved these changes
Sep 14, 2019
dhall/tests/Dhall/Test/Dhall.hs
Outdated
| @@ -161,56 +161,62 @@ data NonEmptyUnion = N0 Bool | N1 Natural | N2 Text | |||
| data Enum = E0 | E1 | E2 | |||
| deriving (Eq, Generic, Inject, Interpret, Show) | |||
|
|
|||
| data Mixed = M0 Bool | M1 | M2 () | |||
| data Mixed = M0 Bool | M1 | M2 () | M3 Bool () | M4 { x :: Double, y :: Double } | |||
There was a problem hiding this comment.
I guess there are still more interesting cases like
| M5 { x :: Text }
and
| M6 { x :: () }
Handling () fields consistently seems a bit tricky, but I don't think it's particularly important.
* 0, 1, or 2 fields * Fields of type `()` or `Double` * Named or anonymous fields
|
Ah great, I was very surprised by the implicit |
|
I think this broke a place where I'm deserializing a one-field record: data MyRecord = MyRecord { foo :: Text }myRecord = { foo : Text }--> Just making sure that's intentional. |
|
@patrickmn: It was intentional, but we can make this behavior configurable via |
|
I understand it now, the error was just a bit puzzling until I looked at the recent merges. My data type was just a placeholder, so it's no bother :) |
Gabriella439
added a commit
that referenced
this pull request
Sep 17, 2019
This builds on top of #1315 to minimize disruption by disabling the breaking change by default and instead requiring the user to opt in by setting a new `collapseSingletonRecords` option to `True`. The additional tests added to verify this also caught a bug in the `Interpret` instance for functions, which this change also fixes.
|
@patrickmn: I decided to disable the breaking change by default, at least for the upcoming release, by guarding it behind an option. See: #1321 |
mergify bot
pushed a commit
that referenced
this pull request
Sep 19, 2019
* Disable 1-field simplification by default This builds on top of #1315 to minimize disruption by disabling the breaking change by default and instead requiring the user to opt in by setting a new `collapseSingletonRecords` option to `True`. The additional tests added to verify this also caught a bug in the `Interpret` instance for functions, which this change also fixes. * Change to three-valued option ... based on feedback from @sjakobi This change the option to a three-valued option: * `Bare` - 1-field constructor does not include a nested record * `Wrapped` - 1-field constructor always includes a nested record * `Smart` - Named fields that don't begin with `_` include a nested record The default is `Wrapped` (for backwards compatibility), but users will probably want to eventually switch to `Smart` * Don't depend on `fieldModifier` for determining if a field is anonymous ... as suggested by @sjakobi
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.
Fixes #346
Now a Haskell type like:
... corresponds to this Dhall type:
{ Foo : Bool | Bar : Text }