Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix yaml-to-dhall support for empty objects #1186

Merged
merged 4 commits into from
Aug 9, 2019
Merged

Fix yaml-to-dhall support for empty objects #1186

merged 4 commits into from
Aug 9, 2019

Conversation

Gabriella439
Copy link
Collaborator

yaml-to-dhall was decoding an empty object into:

[] : { mapKey : Text, mapValue : Text }

... instead of:

[] : List { mapKey : Text, mapValue : Text }

... which this change fixes

@Gabriella439
Fix yaml-to-dhall support for empty objects
a64bcef 
`yaml-to-dhall` was decoding an empty object into:

```dhall
[] : { mapKey : Text, mapValue : Text }
```

... instead of:

```dhall
[] : List { mapKey : Text, mapValue : Text }
```

... which this change fixes
@Gabriella439
Add missing test files
2d378af
@sjakobi
Copy link
Collaborator

sjakobi commented Aug 8, 2019

AppVeyor reports an error:

dhall-json
…
  ./tasty/data/emptyObject:      FAIL
    Exception: 
    Error: Invalid input
    
    ./tasty/data/emptyObjectSchema.dhall:1:3:
      |
    1 |   ∀(JSON : Type)
      |   ^^^^^^^^
    unexpected "∀(JSON"

@Gabriella439
Hopefully fix test failure on Windows
c97b563 
I suspect that the test failure is due to the locale for the test suite
not being set to UTF8
@mergify mergify bot merged commit 268c796 into master Aug 9, 2019
@mergify mergify bot deleted the gabriel/fix_yaml-to-dhall branch August 9, 2019 18:22
Gabriella439 added a commit that referenced this pull request Sep 6, 2019
@Gabriella439
Fix {json,yaml}-to-dhall marshaling into empty lists
bffc802 
This is essentially the same fix as #1186, applied in more places
@Gabriella439 Gabriella439 mentioned this pull request Sep 6, 2019
Merged
mergify bot pushed a commit that referenced this pull request Sep 6, 2019
@Gabriella439 @mergify
Fix {json,yaml}-to-dhall marshaling into empty lists (#1284)
eee7524 
This is essentially the same fix as #1186, applied in more places
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@sjakobi sjakobi sjakobi approved these changes

Assignees
No one assigned
Labels
merge me
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
2 participants
@Gabriella439 @sjakobi