diff options
| author | Nadrieril | 2020-02-20 18:52:34 +0000 |
|---|---|---|
| committer | Nadrieril | 2020-02-20 18:54:11 +0000 |
| commit | 86508a3ad59a0bfc1e24448d0a0126b1a1c645e1 (patch) | |
| tree | 05db6aab6499ba2a3d91e0253571ee3cf5fefc8f /dhall/tests | |
| parent | 26ed5a1d4d43573ac8ad2f8de9e4dd411650aa9a (diff) | |
Add support for duplicate record fields
Diffstat (limited to '')
6 files changed, 7 insertions, 10 deletions
diff --git a/dhall/tests/parser/failure/spacing/MergeNoSpace2.txt b/dhall/tests/parser/failure/spacing/MergeNoSpace2.txt index 96d937b..77314e0 100644 --- a/dhall/tests/parser/failure/spacing/MergeNoSpace2.txt +++ b/dhall/tests/parser/failure/spacing/MergeNoSpace2.txt @@ -3,4 +3,4 @@ 1 | merge x(y)␊ | ^--- | - = expected missing, double_quote_literal, single_quote_literal, if_, merge, non_empty_list_literal, NaN, Some_, toMap, assert, forall, numeric_double_literal, minus_infinity_literal, plus_infinity_literal, natural_literal, integer_literal, or import_hashed + = expected missing, non_empty_list_literal, double_quote_literal, single_quote_literal, if_, merge, NaN, Some_, toMap, assert, forall, numeric_double_literal, minus_infinity_literal, plus_infinity_literal, natural_literal, integer_literal, or import_hashed diff --git a/dhall/tests/parser/failure/spacing/RecordTypeNoSpace.txt b/dhall/tests/parser/failure/spacing/RecordTypeNoSpace.txt index beca670..f6427a4 100644 --- a/dhall/tests/parser/failure/spacing/RecordTypeNoSpace.txt +++ b/dhall/tests/parser/failure/spacing/RecordTypeNoSpace.txt @@ -1,6 +1,6 @@ - --> 1:5 + --> 1:3 | 1 | { x :T }␊ - | ^--- + | ^--- | - = expected non_empty_record_literal or non_empty_record_type + = expected non_empty_record_type_or_literal or empty_record_literal diff --git a/dhall/tests/type-inference/failure/unit/RecordLitDuplicateFields.txt b/dhall/tests/type-inference/failure/unit/RecordLitDuplicateFields.txt deleted file mode 100644 index 608c6a0..0000000 --- a/dhall/tests/type-inference/failure/unit/RecordLitDuplicateFields.txt +++ /dev/null @@ -1,6 +0,0 @@ -Type error: error: RecordTypeDuplicateField - --> <current file>:1:0 - | -1 | { x = 0, x = 0 } - | ^^^^^^^^^^^^^^^^ RecordTypeDuplicateField - | diff --git a/dhall/tests/type-inference/failure/unit/RecordLitDuplicateFieldsAbstract.txt b/dhall/tests/type-inference/failure/unit/RecordLitDuplicateFieldsAbstract.txt new file mode 100644 index 0000000..f74e839 --- /dev/null +++ b/dhall/tests/type-inference/failure/unit/RecordLitDuplicateFieldsAbstract.txt @@ -0,0 +1 @@ +Type error: error: RecordTypeMergeRequiresRecordType diff --git a/dhall/tests/type-inference/failure/unit/RecordLitDuplicateFieldsCollidingRecords.txt b/dhall/tests/type-inference/failure/unit/RecordLitDuplicateFieldsCollidingRecords.txt new file mode 100644 index 0000000..f74e839 --- /dev/null +++ b/dhall/tests/type-inference/failure/unit/RecordLitDuplicateFieldsCollidingRecords.txt @@ -0,0 +1 @@ +Type error: error: RecordTypeMergeRequiresRecordType diff --git a/dhall/tests/type-inference/failure/unit/RecordLitDuplicateFieldsNotRecords.txt b/dhall/tests/type-inference/failure/unit/RecordLitDuplicateFieldsNotRecords.txt new file mode 100644 index 0000000..f74e839 --- /dev/null +++ b/dhall/tests/type-inference/failure/unit/RecordLitDuplicateFieldsNotRecords.txt @@ -0,0 +1 @@ +Type error: error: RecordTypeMergeRequiresRecordType |