Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion dhall/dhall-lang
Submodule dhall-lang updated 74 files
+86 −4 CHANGELOG.md
+45 −0 Prelude/List/filterMap.dhall
+4 −0 Prelude/List/package.dhall
+5 −10 Prelude/List/unpackOptionals.dhall
+1 −1 Prelude/package.dhall
+1 −1 docs/conf.py
+1 −1 docs/discussions/Design-choices.md
+16 −17 docs/discussions/Safety-guarantees.md
+7 −7 docs/howtos/How-to-integrate-Dhall.md
+1 −1 docs/howtos/How-to-translate-recursive-code-to-Dhall.md
+1 −1 docs/index.md
+1 −1 docs/tutorials/Language-Tour.md
+1 −1 nixops/README.md
+27 −11 nixops/logical.nix
+15 −0 nixops/packages/Prelude_21_1_0.nix
+3 −3 nixops/packages/dhall-kubernetes_3_0_0.nix
+3 −3 nixops/packages/dhall-kubernetes_4_0_0.nix
+3 −3 nixops/packages/dhall-kubernetes_5_0_0.nix
+15 −0 nixops/packages/dhall-kubernetes_6_0_0.nix
+33 −9 nixops/store.nix
+22 −4 standard/Parser.hs
+12 −1 standard/alpha-normalization.md
+172 −60 standard/beta-normalization.md
+65 −12 standard/binary.md
+34 −27 standard/dhall.abnf
+2 −2 standard/imports.md
+11 −0 standard/shift.md
+1 −1 standard/standard.cabal
+12 −1 standard/substitution.md
+10 −1 standard/syntax.md
+2 −2 standard/tasty/Main.hs
+66 −35 standard/type-inference.md
+6 −0 tests/README.md
+1 −0 tests/import/home/hello.dhall
+5 −9 tests/import/success/headerForwardingA.dhall
+1 −18 tests/import/success/headerForwardingB.dhall
+1 −0 tests/import/success/unit/ImportRelativeToHomeA.dhall
+1 −0 tests/import/success/unit/ImportRelativeToHomeB.dhall
+1 −0 tests/normalization/success/unit/ShowConstructorEmptyA.dhall
+1 −0 tests/normalization/success/unit/ShowConstructorEmptyB.dhall
+1 −0 tests/normalization/success/unit/ShowConstructorNonEmptyA.dhall
+1 −0 tests/normalization/success/unit/ShowConstructorNonEmptyB.dhall
+1 −0 tests/normalization/success/unit/WithOnOptionalNoneA.dhall
+1 −0 tests/normalization/success/unit/WithOnOptionalNoneB.dhall
+1 −0 tests/normalization/success/unit/WithOnOptionalSomeA.dhall
+1 −0 tests/normalization/success/unit/WithOnOptionalSomeB.dhall
+1 −0 tests/normalization/success/unit/WithOptionalDeeplyNestedA.dhall
+1 −0 tests/normalization/success/unit/WithOptionalDeeplyNestedB.dhall
+1 −0 tests/normalization/success/unit/WithOptionalNestedA.dhall
+1 −0 tests/normalization/success/unit/WithOptionalNestedB.dhall
+1 −1 tests/parser/failure/boundBuiltins.dhall
+1 −0 tests/parser/failure/spacing/LetNoSpace3.dhall
+1 −0 tests/parser/failure/spacing/LetNoSpace4.dhall
+1 −0 tests/parser/failure/unit/showConstructorAlone.dhall
+1 −0 tests/parser/success/unit/WithSomeA.dhall
+ tests/parser/success/unit/WithSomeB.dhallb
+1 −0 tests/parser/success/unit/WithSomeB.diag
+1 −0 tests/parser/success/withQuestionMarkA.dhall
+ tests/parser/success/withQuestionMarkB.dhallb
+1 −0 tests/parser/success/withQuestionMarkB.diag
+1 −0 tests/type-inference/failure/unit/ShowConstructorNotFullyApplied.dhall
+1 −0 tests/type-inference/failure/unit/ShowConstructorNotFullyAppliedOptional.dhall
+1 −0 tests/type-inference/failure/unit/ShowConstructorWrongArgument.dhall
+1 −0 tests/type-inference/failure/unit/WithNotOptional.dhall
+1 −0 tests/type-inference/failure/unit/WithOptionalTypeChanged.dhall
+6 −0 tests/type-inference/success/preludeB.dhall
+1 −0 tests/type-inference/success/unit/ShowConstructorEmptyA.dhall
+1 −0 tests/type-inference/success/unit/ShowConstructorEmptyB.dhall
+1 −0 tests/type-inference/success/unit/ShowConstructorNonEmptyA.dhall
+1 −0 tests/type-inference/success/unit/ShowConstructorNonEmptyB.dhall
+1 −0 tests/type-inference/success/unit/ShowConstructorOptionalA.dhall
+1 −0 tests/type-inference/success/unit/ShowConstructorOptionalB.dhall
+1 −0 tests/type-inference/success/unit/WithOptionalTypeUnchangedA.dhall
+1 −0 tests/type-inference/success/unit/WithOptionalTypeUnchangedB.dhall
2 changes: 2 additions & 0 deletions dhall/tests/Dhall/Test/Main.hs
Original file line number Diff line number Diff line change
Expand Up @@ -81,6 +81,8 @@ main = do

System.Environment.setEnv "DHALL_TEST_VAR" "6 * 7"

System.Environment.setEnv "HOME" (pwd </> "dhall-lang/tests/import/home")

-- Make test failures easier to find by eliding the successes.
-- https://github.com/feuerbach/tasty/issues/273#issuecomment-657054281
System.Environment.setEnv "TASTY_HIDE_SUCCESSES" "true"
Expand Down
4 changes: 3 additions & 1 deletion dhall/tests/Dhall/Test/Parser.hs
Original file line number Diff line number Diff line change
Expand Up @@ -152,7 +152,9 @@ shouldParse path = do

shouldNotParse :: Text -> TestTree
shouldNotParse path = do
let expectedFailures = []
let expectedFailures =
[ parseDirectory </> "failure/spacing/LetNoSpace4.dhall"
]

let pathString = Text.unpack path

Expand Down