Diff list values #450
Merged
Diff list values #450
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
Issue dhall-lang#431 Make the diff of two lists actually show the diff of the values inside. For example with `example1.dhall`: ```dhall { a = [1, 2, 3, 4, 5] , b = [1, 2, 3, 4, 5] : List Natural , c = [1, 2, 3, 4, 5] : List Natural , d = [] : List Natural , e = [] : List Natural , f = [1, 2, 3, 4, 5] : List Natural } ``` And `example2.dhall`: ```dhall { a = [1, 6, 7, 4, 5] , b = [1, 2, 3] : List Natural , c = [2, 3, 4, 5] , d = [] : List Natural , e = [] : List Integer , f = [+1, +2, +3, +4, +5] : List Integer } ``` The diff looks as follows: ```sh ➜ dhall diff "./example1.dhall" "./example2.dhall" { a = [ … , - 2 , - 3 , + 6 , + 7 , … ] , b = [ … , - 4 , - 5 ] , c = [ - 1 , … ] , d = - [ … ] + [ … ] : … … , e = - [ … ] + [ … ] : … - Natural + Integer , f = - [ … ] + [ … ] } ``` Signed-off-by: Basile Henry <[email protected]>
basile-henry
force-pushed
the
dhall-diff-lists
branch
from
8aeae2b to
32cb9fa
Compare
Gabriella439
approved these changes
Jun 9, 2018
src/Dhall/Diff.hs
Outdated
| | otherwise = False | ||
|
|
||
| -- Render a single element of a list using an extra rendering function | ||
| prettyElems f = foldMap (pure . f . token . Internal.prettyExpr) |
There was a problem hiding this comment.
I think you can do prettyElems f = map (f . token . Internal.prettyExpr) here
Signed-off-by: Basile Henry <[email protected]>
Signed-off-by: Basile Henry <[email protected]>
Signed-off-by: Basile Henry <[email protected]>
Gabriella439
added a commit
that referenced
this pull request
Aug 7, 2019
Fixes #1211 The original implementation of diffing two lists in #450 attempted to add a special case in the logic for when the list had no common elements. However, this led to a bug where the two lists would display different if they were both empty. lists would never render. This change fixes that by removing the special case. The new output for the linked example is: ``` Use "dhall --explain" for detailed errors Error: Assertion failed [ … , - 1 , … , + 55 ] 16│ assert : fibs 10 ≡ [ 0, 1, 2, 3, 5, 8, 13, 21, 34, 55 ] 17│ (stdin):16:16 ```
Gabriella439
added a commit
that referenced
this pull request
Aug 7, 2019
Fixes #1211 The original implementation of diffing two lists in #450 attempted to add a special case in the logic for when the list had no common elements. However, this led to a bug where the two lists would display different if they were both empty. lists would never render. This change fixes that by removing the special case. The new output for the linked example is: ``` Use "dhall --explain" for detailed errors Error: Assertion failed [ … , - 1 , … , + 55 ] 16│ assert : fibs 10 ≡ [ 0, 1, 2, 3, 5, 8, 13, 21, 34, 55 ] 17│ (stdin):16:16 ```
Merged
mergify bot
pushed a commit
that referenced
this pull request
Aug 8, 2019
Fixes #1211 The original implementation of diffing two lists in #450 attempted to add a special case in the logic for when the list had no common elements. However, this led to a bug where the two lists would display different if they were both empty. lists would never render. This change fixes that by removing the special case. The new output for the linked example is: ``` Use "dhall --explain" for detailed errors Error: Assertion failed [ … , - 1 , … , + 55 ] 16│ assert : fibs 10 ≡ [ 0, 1, 2, 3, 5, 8, 13, 21, 34, 55 ] 17│ (stdin):16:16 ```
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.
Issue #431
Make the diff of two lists actually show the diff of the values inside.
For example with
example1.dhall:{ a = [1, 2, 3, 4, 5] , b = [1, 2, 3, 4, 5] : List Natural , c = [1, 2, 3, 4, 5] : List Natural , d = [] : List Natural , e = [] : List Natural , f = [1, 2, 3, 4, 5] : List Natural }And
example2.dhall:{ a = [1, 6, 7, 4, 5] , b = [1, 2, 3] : List Natural , c = [2, 3, 4, 5] , d = [] : List Natural , e = [] : List Integer , f = [+1, +2, +3, +4, +5] : List Integer }The diff looks as follows: