From 7e523ae1903ae2d8bca8b3a8352167d7bac5b2b5 Mon Sep 17 00:00:00 2001 From: Nadrieril Date: Mon, 14 Sep 2020 23:09:22 +0100 Subject: spec: Enable `with` optimizations --- dhall/tests/parser/success/unit/WithB.txt | 2 +- dhall/tests/parser/success/unit/WithMultipleB.txt | 2 +- dhall/tests/parser/success/unit/WithPrecedence1B.txt | 2 +- dhall/tests/parser/success/unit/WithPrecedence2B.txt | 2 +- dhall/tests/parser/success/unit/WithPrecedence3B.txt | 2 +- dhall/tests/type-inference/failure/unit/WithInvalidOverrideA.txt | 6 ++++++ 6 files changed, 11 insertions(+), 5 deletions(-) (limited to 'dhall/tests') 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 + --> :1:1 + | +... +6 | { a = 1 } with a.b = 2 + | ^^^^^^^^^^^^^^^^^^^^^^ MustCombineRecord + | -- cgit v1.2.3