summaryrefslogtreecommitdiff
path: root/dhall/tests/import
diff options
context:
space:
mode:
authorNadrieril2020-12-06 18:18:05 +0000
committerGitHub2020-12-06 18:18:05 +0000
commit35ed301e8de5a2b1102e370e638564d3c3d204a8 (patch)
tree0f84a9d5b60e00c49168fcf92eb34c903c088dde /dhall/tests/import
parent3c0a850d1522701e136f4fafbcf69d46560fe0ee (diff)
parentee941f668977b66d9d829bc9c359f3a3b64f9dc1 (diff)
Merge pull request #203 from Nadrieril/fix-import-bug
Diffstat (limited to 'dhall/tests/import')
-rw-r--r--dhall/tests/import/failure/cycle.txt2
-rw-r--r--dhall/tests/import/success/unit/MixImportModesA.dhall1
-rw-r--r--dhall/tests/import/success/unit/MixImportModesB.dhall1
3 files changed, 3 insertions, 1 deletions
diff --git a/dhall/tests/import/failure/cycle.txt b/dhall/tests/import/failure/cycle.txt
index 899484b..641667f 100644
--- a/dhall/tests/import/failure/cycle.txt
+++ b/dhall/tests/import/failure/cycle.txt
@@ -10,7 +10,7 @@ Type error: error: error
--> <current file>:1:1
|
1 | ../data/cycle.dhall
- | ^^^^^^^^^^^^^^^^^^^ ImportCycle([Local("./dhall-lang/tests/import/data/cycle.dhall"), Local("./dhall-lang/tests/import/failure/cycle.dhall")], Local("./dhall-lang/tests/import/data/cycle.dhall"))
+ | ^^^^^^^^^^^^^^^^^^^ ImportCycle([ImportLocation { kind: Local("./dhall-lang/tests/import/data/cycle.dhall"), mode: Code }, ImportLocation { kind: Local("./dhall-lang/tests/import/failure/cycle.dhall"), mode: Code }], ImportLocation { kind: Local("./dhall-lang/tests/import/data/cycle.dhall"), mode: Code })
|
|
|
diff --git a/dhall/tests/import/success/unit/MixImportModesA.dhall b/dhall/tests/import/success/unit/MixImportModesA.dhall
new file mode 100644
index 0000000..8946ff8
--- /dev/null
+++ b/dhall/tests/import/success/unit/MixImportModesA.dhall
@@ -0,0 +1 @@
+{ n = ../../data/simple.dhall, txt = ../../data/simple.dhall as Text, loc = ../../data/simple.dhall as Location }
diff --git a/dhall/tests/import/success/unit/MixImportModesB.dhall b/dhall/tests/import/success/unit/MixImportModesB.dhall
new file mode 100644
index 0000000..430e0bc
--- /dev/null
+++ b/dhall/tests/import/success/unit/MixImportModesB.dhall
@@ -0,0 +1 @@
+{ loc = < Environment: Text | Local: Text | Missing | Remote: Text >.Local "./dhall/tests/import/data/simple.dhall", n = 3, txt = "3\n" }