From 61ad94761e8428c19ca06ebb100cd4ee06c02f5a Mon Sep 17 00:00:00 2001 From: Nadrieril Date: Thu, 25 Jun 2020 14:35:25 +0100 Subject: spec: support Dhall v17.0.0 --- CHANGELOG.md | 11 ++++++----- README.md | 2 +- dhall-lang | 2 +- .../parser/failure/unit/RecordFieldMustNotBeKeyword00.txt | 6 ++++++ .../parser/failure/unit/RecordFieldMustNotBeKeyword01.txt | 6 ++++++ .../parser/failure/unit/RecordFieldMustNotBeKeyword02.txt | 6 ++++++ .../parser/failure/unit/RecordFieldMustNotBeKeyword03.txt | 6 ++++++ .../parser/failure/unit/RecordFieldMustNotBeKeyword04.txt | 6 ++++++ .../parser/failure/unit/RecordFieldMustNotBeKeyword05.txt | 6 ++++++ .../parser/failure/unit/RecordFieldMustNotBeKeyword06.txt | 6 ++++++ .../parser/failure/unit/RecordFieldMustNotBeKeyword07.txt | 6 ++++++ .../parser/failure/unit/RecordFieldMustNotBeKeyword08.txt | 6 ++++++ .../parser/failure/unit/RecordFieldMustNotBeKeyword09.txt | 6 ++++++ .../parser/failure/unit/RecordFieldMustNotBeKeyword10.txt | 6 ++++++ .../parser/failure/unit/RecordFieldMustNotBeKeyword11.txt | 6 ++++++ .../parser/failure/unit/RecordFieldMustNotBeKeyword12.txt | 6 ++++++ .../parser/failure/unit/RecordFieldMustNotBeKeyword13.txt | 6 ++++++ .../parser/failure/unit/RecordFieldMustNotBeKeyword14.txt | 6 ++++++ 18 files changed, 98 insertions(+), 7 deletions(-) create mode 100644 dhall/tests/parser/failure/unit/RecordFieldMustNotBeKeyword00.txt create mode 100644 dhall/tests/parser/failure/unit/RecordFieldMustNotBeKeyword01.txt create mode 100644 dhall/tests/parser/failure/unit/RecordFieldMustNotBeKeyword02.txt create mode 100644 dhall/tests/parser/failure/unit/RecordFieldMustNotBeKeyword03.txt create mode 100644 dhall/tests/parser/failure/unit/RecordFieldMustNotBeKeyword04.txt create mode 100644 dhall/tests/parser/failure/unit/RecordFieldMustNotBeKeyword05.txt create mode 100644 dhall/tests/parser/failure/unit/RecordFieldMustNotBeKeyword06.txt create mode 100644 dhall/tests/parser/failure/unit/RecordFieldMustNotBeKeyword07.txt create mode 100644 dhall/tests/parser/failure/unit/RecordFieldMustNotBeKeyword08.txt create mode 100644 dhall/tests/parser/failure/unit/RecordFieldMustNotBeKeyword09.txt create mode 100644 dhall/tests/parser/failure/unit/RecordFieldMustNotBeKeyword10.txt create mode 100644 dhall/tests/parser/failure/unit/RecordFieldMustNotBeKeyword11.txt create mode 100644 dhall/tests/parser/failure/unit/RecordFieldMustNotBeKeyword12.txt create mode 100644 dhall/tests/parser/failure/unit/RecordFieldMustNotBeKeyword13.txt create mode 100644 dhall/tests/parser/failure/unit/RecordFieldMustNotBeKeyword14.txt diff --git a/CHANGELOG.md b/CHANGELOG.md index 8854a31..2a63eb7 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,10 +2,11 @@ #### [Unreleased] -- BREAKING CHANGE: Remove Optional/build and Optional/fold -- BREAKING CHANGE: Remove the ability to quote paths in URLs -- Allow quoted labels to be empty -- Support Dhall v16.0.0 +- BREAKING CHANGE: Support Dhall v17.0.0 + + See https://github.com/dhall-lang/dhall-lang/releases/tag/v16.0.0 and + https://github.com/dhall-lang/dhall-lang/releases/tag/v17.0.0 for details. + - Fix running tests on Windows. Developing on this lib should now be possible on Windows. #### [0.5.3] - 2020-05-30 @@ -17,7 +18,7 @@ #### [0.5.2] - 2020-04-12 - Fix #162 -- Update to supporting dhall v15.0.0 +- Update to supporting Dhall v15.0.0 - Deserialize `Prelude.Map` and `toMap` to a map instead of a list. #### [0.5.1] - 2020-04-09 diff --git a/README.md b/README.md index d1a3b18..6bce4e5 100644 --- a/README.md +++ b/README.md @@ -72,7 +72,7 @@ assert_eq!(deserialized_map, expected_map); ## Standard-compliance This implementation currently supports most of the [Dhall -standard](https://github.com/dhall-lang/dhall-lang) version `16.0.0`. +standard](https://github.com/dhall-lang/dhall-lang) version `17.0.0`. The main missing feature is import headers. See [here](https://github.com/Nadrieril/dhall-rust/issues?q=is%3Aopen+is%3Aissue+label%3Astandard-compliance) diff --git a/dhall-lang b/dhall-lang index 5494705..f035ea1 160000 --- a/dhall-lang +++ b/dhall-lang @@ -1 +1 @@ -Subproject commit 549470527dcc0ee59253708c6ac23c0cee455093 +Subproject commit f035ea1947d9392bcedbe7f8c563f33559370efd diff --git a/dhall/tests/parser/failure/unit/RecordFieldMustNotBeKeyword00.txt b/dhall/tests/parser/failure/unit/RecordFieldMustNotBeKeyword00.txt new file mode 100644 index 0000000..9a8747b --- /dev/null +++ b/dhall/tests/parser/failure/unit/RecordFieldMustNotBeKeyword00.txt @@ -0,0 +1,6 @@ + --> 1:3 + | +1 | { if: Text }␊ + | ^--- + | + = expected any_label_or_some or empty_record_literal diff --git a/dhall/tests/parser/failure/unit/RecordFieldMustNotBeKeyword01.txt b/dhall/tests/parser/failure/unit/RecordFieldMustNotBeKeyword01.txt new file mode 100644 index 0000000..d041384 --- /dev/null +++ b/dhall/tests/parser/failure/unit/RecordFieldMustNotBeKeyword01.txt @@ -0,0 +1,6 @@ + --> 1:3 + | +1 | { then: Text }␊ + | ^--- + | + = expected any_label_or_some or empty_record_literal diff --git a/dhall/tests/parser/failure/unit/RecordFieldMustNotBeKeyword02.txt b/dhall/tests/parser/failure/unit/RecordFieldMustNotBeKeyword02.txt new file mode 100644 index 0000000..2cdce47 --- /dev/null +++ b/dhall/tests/parser/failure/unit/RecordFieldMustNotBeKeyword02.txt @@ -0,0 +1,6 @@ + --> 1:3 + | +1 | { else: Text }␊ + | ^--- + | + = expected any_label_or_some or empty_record_literal diff --git a/dhall/tests/parser/failure/unit/RecordFieldMustNotBeKeyword03.txt b/dhall/tests/parser/failure/unit/RecordFieldMustNotBeKeyword03.txt new file mode 100644 index 0000000..b8dd809 --- /dev/null +++ b/dhall/tests/parser/failure/unit/RecordFieldMustNotBeKeyword03.txt @@ -0,0 +1,6 @@ + --> 1:3 + | +1 | { let: Text }␊ + | ^--- + | + = expected any_label_or_some or empty_record_literal diff --git a/dhall/tests/parser/failure/unit/RecordFieldMustNotBeKeyword04.txt b/dhall/tests/parser/failure/unit/RecordFieldMustNotBeKeyword04.txt new file mode 100644 index 0000000..4b2df06 --- /dev/null +++ b/dhall/tests/parser/failure/unit/RecordFieldMustNotBeKeyword04.txt @@ -0,0 +1,6 @@ + --> 1:3 + | +1 | { in: Text }␊ + | ^--- + | + = expected any_label_or_some or empty_record_literal diff --git a/dhall/tests/parser/failure/unit/RecordFieldMustNotBeKeyword05.txt b/dhall/tests/parser/failure/unit/RecordFieldMustNotBeKeyword05.txt new file mode 100644 index 0000000..23d4f75 --- /dev/null +++ b/dhall/tests/parser/failure/unit/RecordFieldMustNotBeKeyword05.txt @@ -0,0 +1,6 @@ + --> 1:3 + | +1 | { using: Text }␊ + | ^--- + | + = expected any_label_or_some or empty_record_literal diff --git a/dhall/tests/parser/failure/unit/RecordFieldMustNotBeKeyword06.txt b/dhall/tests/parser/failure/unit/RecordFieldMustNotBeKeyword06.txt new file mode 100644 index 0000000..4e715eb --- /dev/null +++ b/dhall/tests/parser/failure/unit/RecordFieldMustNotBeKeyword06.txt @@ -0,0 +1,6 @@ + --> 1:3 + | +1 | { missing: Text }␊ + | ^--- + | + = expected any_label_or_some or empty_record_literal diff --git a/dhall/tests/parser/failure/unit/RecordFieldMustNotBeKeyword07.txt b/dhall/tests/parser/failure/unit/RecordFieldMustNotBeKeyword07.txt new file mode 100644 index 0000000..420dc77 --- /dev/null +++ b/dhall/tests/parser/failure/unit/RecordFieldMustNotBeKeyword07.txt @@ -0,0 +1,6 @@ + --> 1:3 + | +1 | { assert: Text }␊ + | ^--- + | + = expected any_label_or_some or empty_record_literal diff --git a/dhall/tests/parser/failure/unit/RecordFieldMustNotBeKeyword08.txt b/dhall/tests/parser/failure/unit/RecordFieldMustNotBeKeyword08.txt new file mode 100644 index 0000000..159e243 --- /dev/null +++ b/dhall/tests/parser/failure/unit/RecordFieldMustNotBeKeyword08.txt @@ -0,0 +1,6 @@ + --> 1:3 + | +1 | { as: Text }␊ + | ^--- + | + = expected any_label_or_some or empty_record_literal diff --git a/dhall/tests/parser/failure/unit/RecordFieldMustNotBeKeyword09.txt b/dhall/tests/parser/failure/unit/RecordFieldMustNotBeKeyword09.txt new file mode 100644 index 0000000..f5b7130 --- /dev/null +++ b/dhall/tests/parser/failure/unit/RecordFieldMustNotBeKeyword09.txt @@ -0,0 +1,6 @@ + --> 1:3 + | +1 | { Infinity: Text }␊ + | ^--- + | + = expected any_label_or_some or empty_record_literal diff --git a/dhall/tests/parser/failure/unit/RecordFieldMustNotBeKeyword10.txt b/dhall/tests/parser/failure/unit/RecordFieldMustNotBeKeyword10.txt new file mode 100644 index 0000000..dd6f552 --- /dev/null +++ b/dhall/tests/parser/failure/unit/RecordFieldMustNotBeKeyword10.txt @@ -0,0 +1,6 @@ + --> 1:3 + | +1 | { NaN: Text }␊ + | ^--- + | + = expected any_label_or_some or empty_record_literal diff --git a/dhall/tests/parser/failure/unit/RecordFieldMustNotBeKeyword11.txt b/dhall/tests/parser/failure/unit/RecordFieldMustNotBeKeyword11.txt new file mode 100644 index 0000000..ccf18aa --- /dev/null +++ b/dhall/tests/parser/failure/unit/RecordFieldMustNotBeKeyword11.txt @@ -0,0 +1,6 @@ + --> 1:3 + | +1 | { merge: Text }␊ + | ^--- + | + = expected any_label_or_some or empty_record_literal diff --git a/dhall/tests/parser/failure/unit/RecordFieldMustNotBeKeyword12.txt b/dhall/tests/parser/failure/unit/RecordFieldMustNotBeKeyword12.txt new file mode 100644 index 0000000..f91f9dd --- /dev/null +++ b/dhall/tests/parser/failure/unit/RecordFieldMustNotBeKeyword12.txt @@ -0,0 +1,6 @@ + --> 1:3 + | +1 | { toMap: Text }␊ + | ^--- + | + = expected any_label_or_some or empty_record_literal diff --git a/dhall/tests/parser/failure/unit/RecordFieldMustNotBeKeyword13.txt b/dhall/tests/parser/failure/unit/RecordFieldMustNotBeKeyword13.txt new file mode 100644 index 0000000..be64d1f --- /dev/null +++ b/dhall/tests/parser/failure/unit/RecordFieldMustNotBeKeyword13.txt @@ -0,0 +1,6 @@ + --> 1:3 + | +1 | { with: Text }␊ + | ^--- + | + = expected any_label_or_some or empty_record_literal diff --git a/dhall/tests/parser/failure/unit/RecordFieldMustNotBeKeyword14.txt b/dhall/tests/parser/failure/unit/RecordFieldMustNotBeKeyword14.txt new file mode 100644 index 0000000..9e2b836 --- /dev/null +++ b/dhall/tests/parser/failure/unit/RecordFieldMustNotBeKeyword14.txt @@ -0,0 +1,6 @@ + --> 1:3 + | +1 | { forall: Text }␊ + | ^--- + | + = expected any_label_or_some or empty_record_literal -- cgit v1.2.3