From 5a9a5859eec0cf7deebf7fa07fe99f8dc8722ec8 Mon Sep 17 00:00:00 2001 From: Nadrieril Date: Sun, 1 Mar 2020 19:37:24 +0000 Subject: Implement remote `as Location` resolution --- dhall/tests/import/success/unit/asLocation/Chain1A.dhall | 2 +- dhall/tests/import/success/unit/asLocation/Relative1A.dhall | 1 + dhall/tests/import/success/unit/asLocation/Relative1B.dhall | 2 ++ dhall/tests/import/success/unit/asLocation/Relative2A.dhall | 1 + dhall/tests/import/success/unit/asLocation/Relative2B.dhall | 2 ++ dhall/tests/import/success/unit/asLocation/RelativeA.dhall | 1 - dhall/tests/import/success/unit/asLocation/RelativeB.dhall | 2 -- dhall/tests/import/success/unit/asLocation/RemoteA.dhall | 2 +- dhall/tests/import/success/unit/asLocation/RemoteB.dhall | 4 ++-- dhall/tests/import/success/unit/asLocation/RemoteCanonicalize1A.dhall | 1 + dhall/tests/import/success/unit/asLocation/RemoteCanonicalize1B.dhall | 2 ++ dhall/tests/import/success/unit/asLocation/RemoteCanonicalize2A.dhall | 1 + dhall/tests/import/success/unit/asLocation/RemoteCanonicalize2B.dhall | 2 ++ dhall/tests/import/success/unit/asLocation/RemoteCanonicalize3A.dhall | 1 + dhall/tests/import/success/unit/asLocation/RemoteCanonicalize3B.dhall | 2 ++ dhall/tests/import/success/unit/asLocation/RemoteCanonicalize4A.dhall | 1 + dhall/tests/import/success/unit/asLocation/RemoteCanonicalize4B.dhall | 2 ++ dhall/tests/import/success/unit/asLocation/RemoteChain1A.dhall | 1 + dhall/tests/import/success/unit/asLocation/RemoteChain1B.dhall | 2 ++ dhall/tests/import/success/unit/asLocation/RemoteChain2A.dhall | 1 + dhall/tests/import/success/unit/asLocation/RemoteChain2B.dhall | 2 ++ dhall/tests/import/success/unit/asLocation/RemoteChain3A.dhall | 1 + dhall/tests/import/success/unit/asLocation/RemoteChain3B.dhall | 2 ++ 23 files changed, 31 insertions(+), 7 deletions(-) create mode 100644 dhall/tests/import/success/unit/asLocation/Relative1A.dhall create mode 100644 dhall/tests/import/success/unit/asLocation/Relative1B.dhall create mode 100644 dhall/tests/import/success/unit/asLocation/Relative2A.dhall create mode 100644 dhall/tests/import/success/unit/asLocation/Relative2B.dhall delete mode 100644 dhall/tests/import/success/unit/asLocation/RelativeA.dhall delete mode 100644 dhall/tests/import/success/unit/asLocation/RelativeB.dhall create mode 100644 dhall/tests/import/success/unit/asLocation/RemoteCanonicalize1A.dhall create mode 100644 dhall/tests/import/success/unit/asLocation/RemoteCanonicalize1B.dhall create mode 100644 dhall/tests/import/success/unit/asLocation/RemoteCanonicalize2A.dhall create mode 100644 dhall/tests/import/success/unit/asLocation/RemoteCanonicalize2B.dhall create mode 100644 dhall/tests/import/success/unit/asLocation/RemoteCanonicalize3A.dhall create mode 100644 dhall/tests/import/success/unit/asLocation/RemoteCanonicalize3B.dhall create mode 100644 dhall/tests/import/success/unit/asLocation/RemoteCanonicalize4A.dhall create mode 100644 dhall/tests/import/success/unit/asLocation/RemoteCanonicalize4B.dhall create mode 100644 dhall/tests/import/success/unit/asLocation/RemoteChain1A.dhall create mode 100644 dhall/tests/import/success/unit/asLocation/RemoteChain1B.dhall create mode 100644 dhall/tests/import/success/unit/asLocation/RemoteChain2A.dhall create mode 100644 dhall/tests/import/success/unit/asLocation/RemoteChain2B.dhall create mode 100644 dhall/tests/import/success/unit/asLocation/RemoteChain3A.dhall create mode 100644 dhall/tests/import/success/unit/asLocation/RemoteChain3B.dhall (limited to 'dhall/tests') diff --git a/dhall/tests/import/success/unit/asLocation/Chain1A.dhall b/dhall/tests/import/success/unit/asLocation/Chain1A.dhall index 7b20bc3..cf633fe 100644 --- a/dhall/tests/import/success/unit/asLocation/Chain1A.dhall +++ b/dhall/tests/import/success/unit/asLocation/Chain1A.dhall @@ -1 +1 @@ -./RelativeA.dhall +./Relative1A.dhall diff --git a/dhall/tests/import/success/unit/asLocation/Relative1A.dhall b/dhall/tests/import/success/unit/asLocation/Relative1A.dhall new file mode 100644 index 0000000..b514f79 --- /dev/null +++ b/dhall/tests/import/success/unit/asLocation/Relative1A.dhall @@ -0,0 +1 @@ +./some/import.dhall as Location diff --git a/dhall/tests/import/success/unit/asLocation/Relative1B.dhall b/dhall/tests/import/success/unit/asLocation/Relative1B.dhall new file mode 100644 index 0000000..6aee0b5 --- /dev/null +++ b/dhall/tests/import/success/unit/asLocation/Relative1B.dhall @@ -0,0 +1,2 @@ +< Environment : Text | Local : Text | Missing | Remote : Text >.Local + "./dhall/tests/import/success/unit/asLocation/some/import.dhall" diff --git a/dhall/tests/import/success/unit/asLocation/Relative2A.dhall b/dhall/tests/import/success/unit/asLocation/Relative2A.dhall new file mode 100644 index 0000000..ec59586 --- /dev/null +++ b/dhall/tests/import/success/unit/asLocation/Relative2A.dhall @@ -0,0 +1 @@ +../some/import.dhall as Location diff --git a/dhall/tests/import/success/unit/asLocation/Relative2B.dhall b/dhall/tests/import/success/unit/asLocation/Relative2B.dhall new file mode 100644 index 0000000..9842f7c --- /dev/null +++ b/dhall/tests/import/success/unit/asLocation/Relative2B.dhall @@ -0,0 +1,2 @@ +< Environment : Text | Local : Text | Missing | Remote : Text >.Local + "./dhall/tests/import/success/unit/some/import.dhall" diff --git a/dhall/tests/import/success/unit/asLocation/RelativeA.dhall b/dhall/tests/import/success/unit/asLocation/RelativeA.dhall deleted file mode 100644 index b514f79..0000000 --- a/dhall/tests/import/success/unit/asLocation/RelativeA.dhall +++ /dev/null @@ -1 +0,0 @@ -./some/import.dhall as Location diff --git a/dhall/tests/import/success/unit/asLocation/RelativeB.dhall b/dhall/tests/import/success/unit/asLocation/RelativeB.dhall deleted file mode 100644 index b3bd255..0000000 --- a/dhall/tests/import/success/unit/asLocation/RelativeB.dhall +++ /dev/null @@ -1,2 +0,0 @@ -< Environment : Text | Remote : Text | Local : Text | Missing >.Local - "./dhall/tests/import/success/unit/asLocation/some/import.dhall" diff --git a/dhall/tests/import/success/unit/asLocation/RemoteA.dhall b/dhall/tests/import/success/unit/asLocation/RemoteA.dhall index e0be314..54ea028 100644 --- a/dhall/tests/import/success/unit/asLocation/RemoteA.dhall +++ b/dhall/tests/import/success/unit/asLocation/RemoteA.dhall @@ -1 +1 @@ -https://prelude.dhall-lang.org/package.dhall as Location +https://example.com/foo/import.dhall as Location diff --git a/dhall/tests/import/success/unit/asLocation/RemoteB.dhall b/dhall/tests/import/success/unit/asLocation/RemoteB.dhall index 8ab6366..e22cfac 100644 --- a/dhall/tests/import/success/unit/asLocation/RemoteB.dhall +++ b/dhall/tests/import/success/unit/asLocation/RemoteB.dhall @@ -1,2 +1,2 @@ -< Environment : Text | Remote : Text | Local : Text | Missing >.Remote - "https://prelude.dhall-lang.org/package.dhall" +< Environment : Text | Local : Text | Missing | Remote : Text >.Remote + "https://example.com/foo/import.dhall" diff --git a/dhall/tests/import/success/unit/asLocation/RemoteCanonicalize1A.dhall b/dhall/tests/import/success/unit/asLocation/RemoteCanonicalize1A.dhall new file mode 100644 index 0000000..3e6378e --- /dev/null +++ b/dhall/tests/import/success/unit/asLocation/RemoteCanonicalize1A.dhall @@ -0,0 +1 @@ +https://example.com/foo/./bar/import.dhall as Location diff --git a/dhall/tests/import/success/unit/asLocation/RemoteCanonicalize1B.dhall b/dhall/tests/import/success/unit/asLocation/RemoteCanonicalize1B.dhall new file mode 100644 index 0000000..0064a13 --- /dev/null +++ b/dhall/tests/import/success/unit/asLocation/RemoteCanonicalize1B.dhall @@ -0,0 +1,2 @@ +< Environment : Text | Local : Text | Missing | Remote : Text >.Remote + "https://example.com/foo/bar/import.dhall" diff --git a/dhall/tests/import/success/unit/asLocation/RemoteCanonicalize2A.dhall b/dhall/tests/import/success/unit/asLocation/RemoteCanonicalize2A.dhall new file mode 100644 index 0000000..d3fd11e --- /dev/null +++ b/dhall/tests/import/success/unit/asLocation/RemoteCanonicalize2A.dhall @@ -0,0 +1 @@ +https://example.com/foo/bar/../baz/import.dhall as Location diff --git a/dhall/tests/import/success/unit/asLocation/RemoteCanonicalize2B.dhall b/dhall/tests/import/success/unit/asLocation/RemoteCanonicalize2B.dhall new file mode 100644 index 0000000..d85236b --- /dev/null +++ b/dhall/tests/import/success/unit/asLocation/RemoteCanonicalize2B.dhall @@ -0,0 +1,2 @@ +< Environment : Text | Local : Text | Missing | Remote : Text >.Remote + "https://example.com/foo/baz/import.dhall" diff --git a/dhall/tests/import/success/unit/asLocation/RemoteCanonicalize3A.dhall b/dhall/tests/import/success/unit/asLocation/RemoteCanonicalize3A.dhall new file mode 100644 index 0000000..2074fbf --- /dev/null +++ b/dhall/tests/import/success/unit/asLocation/RemoteCanonicalize3A.dhall @@ -0,0 +1 @@ +https://example.com/foo/bar/../../baz/import.dhall as Location diff --git a/dhall/tests/import/success/unit/asLocation/RemoteCanonicalize3B.dhall b/dhall/tests/import/success/unit/asLocation/RemoteCanonicalize3B.dhall new file mode 100644 index 0000000..45a2857 --- /dev/null +++ b/dhall/tests/import/success/unit/asLocation/RemoteCanonicalize3B.dhall @@ -0,0 +1,2 @@ +< Environment : Text | Local : Text | Missing | Remote : Text >.Remote + "https://example.com/baz/import.dhall" diff --git a/dhall/tests/import/success/unit/asLocation/RemoteCanonicalize4A.dhall b/dhall/tests/import/success/unit/asLocation/RemoteCanonicalize4A.dhall new file mode 100644 index 0000000..9358f44 --- /dev/null +++ b/dhall/tests/import/success/unit/asLocation/RemoteCanonicalize4A.dhall @@ -0,0 +1 @@ +https://example.com/../bar/import.dhall as Location diff --git a/dhall/tests/import/success/unit/asLocation/RemoteCanonicalize4B.dhall b/dhall/tests/import/success/unit/asLocation/RemoteCanonicalize4B.dhall new file mode 100644 index 0000000..b5ccbcd --- /dev/null +++ b/dhall/tests/import/success/unit/asLocation/RemoteCanonicalize4B.dhall @@ -0,0 +1,2 @@ +< Environment : Text | Local : Text | Missing | Remote : Text >.Remote + "https://example.com/../bar/import.dhall" diff --git a/dhall/tests/import/success/unit/asLocation/RemoteChain1A.dhall b/dhall/tests/import/success/unit/asLocation/RemoteChain1A.dhall new file mode 100644 index 0000000..7d081ab --- /dev/null +++ b/dhall/tests/import/success/unit/asLocation/RemoteChain1A.dhall @@ -0,0 +1 @@ +https://raw.githubusercontent.com/dhall-lang/dhall-lang/0b983b92aa2222dc3e292c20550ee37dea3f41df/tests/import/data/simpleLocation.dhall diff --git a/dhall/tests/import/success/unit/asLocation/RemoteChain1B.dhall b/dhall/tests/import/success/unit/asLocation/RemoteChain1B.dhall new file mode 100644 index 0000000..8ac2c6b --- /dev/null +++ b/dhall/tests/import/success/unit/asLocation/RemoteChain1B.dhall @@ -0,0 +1,2 @@ +< Environment : Text | Local : Text | Missing | Remote : Text >.Remote + "https://raw.githubusercontent.com/dhall-lang/dhall-lang/0b983b92aa2222dc3e292c20550ee37dea3f41df/tests/import/data/simple.dhall" diff --git a/dhall/tests/import/success/unit/asLocation/RemoteChain2A.dhall b/dhall/tests/import/success/unit/asLocation/RemoteChain2A.dhall new file mode 100644 index 0000000..9929517 --- /dev/null +++ b/dhall/tests/import/success/unit/asLocation/RemoteChain2A.dhall @@ -0,0 +1 @@ +https://raw.githubusercontent.com/Nadrieril/dhall-rust/f7d8c64a9799f139ad65427c2518376adb9e2e2f/dhall/tests/import/success/unit/asLocation/Canonicalize3A.dhall diff --git a/dhall/tests/import/success/unit/asLocation/RemoteChain2B.dhall b/dhall/tests/import/success/unit/asLocation/RemoteChain2B.dhall new file mode 100644 index 0000000..685dc04 --- /dev/null +++ b/dhall/tests/import/success/unit/asLocation/RemoteChain2B.dhall @@ -0,0 +1,2 @@ +< Environment : Text | Local : Text | Missing | Remote : Text >.Remote + "https://raw.githubusercontent.com/Nadrieril/dhall-rust/f7d8c64a9799f139ad65427c2518376adb9e2e2f/dhall/tests/import/success/unit/bar/import.dhall" diff --git a/dhall/tests/import/success/unit/asLocation/RemoteChain3A.dhall b/dhall/tests/import/success/unit/asLocation/RemoteChain3A.dhall new file mode 100644 index 0000000..851108c --- /dev/null +++ b/dhall/tests/import/success/unit/asLocation/RemoteChain3A.dhall @@ -0,0 +1 @@ +https://raw.githubusercontent.com/Nadrieril/dhall-rust/f7d8c64a9799f139ad65427c2518376adb9e2e2f/dhall/tests/import/success/unit/asLocation/Canonicalize5A.dhall diff --git a/dhall/tests/import/success/unit/asLocation/RemoteChain3B.dhall b/dhall/tests/import/success/unit/asLocation/RemoteChain3B.dhall new file mode 100644 index 0000000..685dc04 --- /dev/null +++ b/dhall/tests/import/success/unit/asLocation/RemoteChain3B.dhall @@ -0,0 +1,2 @@ +< Environment : Text | Local : Text | Missing | Remote : Text >.Remote + "https://raw.githubusercontent.com/Nadrieril/dhall-rust/f7d8c64a9799f139ad65427c2518376adb9e2e2f/dhall/tests/import/success/unit/bar/import.dhall" -- cgit v1.2.3