diff options
author | Nadrieril | 2020-09-15 00:10:48 +0100 |
---|---|---|
committer | GitHub | 2020-09-15 00:10:48 +0100 |
commit | 12752fb0ff108fcbc37f209384eb3d2720809fb7 (patch) | |
tree | b7aa0f75932426461234e4b7568a6681247482ff /dhall/tests | |
parent | 97a3719a3b4fa88873cd128fb193444c5d4bb387 (diff) | |
parent | d1ac40eea5d1e62762c4a20ba9d2dc5ed0d5e06e (diff) |
Merge pull request #176 from Nadrieril/catchup-spec
Diffstat (limited to 'dhall/tests')
6 files changed, 11 insertions, 5 deletions
diff --git a/dhall/tests/parser/success/unit/WithB.txt b/dhall/tests/parser/success/unit/WithB.txt index 74f42a2..555eb50 100644 --- a/dhall/tests/parser/success/unit/WithB.txt +++ b/dhall/tests/parser/success/unit/WithB.txt @@ -1 +1 @@ -{ a = 1 } ⫽ { a = 2 } +{ a = 1 } with a = 2 diff --git a/dhall/tests/parser/success/unit/WithMultipleB.txt b/dhall/tests/parser/success/unit/WithMultipleB.txt index 76782a5..dbc5bb3 100644 --- a/dhall/tests/parser/success/unit/WithMultipleB.txt +++ b/dhall/tests/parser/success/unit/WithMultipleB.txt @@ -1 +1 @@ -{ a = { b = 1 }, c = { d = 2 } } ⫽ { a = { a = { b = 1 }, c = { d = 2 } }.a ⫽ { b = 3 } } ⫽ { c = ({ a = { b = 1 }, c = { d = 2 } } ⫽ { a = { a = { b = 1 }, c = { d = 2 } }.a ⫽ { b = 3 } }).c ⫽ { e = 4 } } +{ a = { b = 1 }, c = { d = 2 } } with a.b = 3 with c.e = 4 diff --git a/dhall/tests/parser/success/unit/WithPrecedence1B.txt b/dhall/tests/parser/success/unit/WithPrecedence1B.txt index 5f22335..2509dba 100644 --- a/dhall/tests/parser/success/unit/WithPrecedence1B.txt +++ b/dhall/tests/parser/success/unit/WithPrecedence1B.txt @@ -1 +1 @@ -{ a = Some 1 } ⫽ { a = Some 2 } ⫽ { a = Some 3 } +{ a = Some 1 } with a = Some 2 with a = Some 3 diff --git a/dhall/tests/parser/success/unit/WithPrecedence2B.txt b/dhall/tests/parser/success/unit/WithPrecedence2B.txt index f945cc9..02df511 100644 --- a/dhall/tests/parser/success/unit/WithPrecedence2B.txt +++ b/dhall/tests/parser/success/unit/WithPrecedence2B.txt @@ -1 +1 @@ -{ x = 0 } ⫽ { x = 1 + 1 } +{ x = 0 } with x = 1 + 1 diff --git a/dhall/tests/parser/success/unit/WithPrecedence3B.txt b/dhall/tests/parser/success/unit/WithPrecedence3B.txt index a801b24..544b4d1 100644 --- a/dhall/tests/parser/success/unit/WithPrecedence3B.txt +++ b/dhall/tests/parser/success/unit/WithPrecedence3B.txt @@ -1 +1 @@ -foo::{ x = 0 } ⫽ { x = 1 } +foo::{ x = 0 } with x = 1 diff --git a/dhall/tests/type-inference/failure/unit/WithInvalidOverrideA.txt b/dhall/tests/type-inference/failure/unit/WithInvalidOverrideA.txt index de101e0..c34175f 100644 --- a/dhall/tests/type-inference/failure/unit/WithInvalidOverrideA.txt +++ b/dhall/tests/type-inference/failure/unit/WithInvalidOverrideA.txt @@ -1 +1,7 @@ Type error: error: MustCombineRecord + --> <current file>:1:1 + | +... +6 | { a = 1 } with a.b = 2 + | ^^^^^^^^^^^^^^^^^^^^^^ MustCombineRecord + | |