Remove system-filepath/system-fileio dependencies
#248
Conversation
|
This is a first WIP draft. Please point me to obvious mistakes. |
There was a problem hiding this comment.
I wouldn't worry about the difference between System.FilePath.takeDirectory and Filesystem.Path.parent. It only matters if somebody tries to import a directory which won't be supported after I standardize the import semantics.
Specifically, see dhall-lang/dhall-lang#72 which indicates that
support for @ (and therefore, support for importing directories) will not be included in
the language standard.
src/Dhall/Import.hs
Outdated
| @@ -411,11 +403,11 @@ canonicalize (File hasHome0 file0:paths0) = | |||
|
|
|||
| -- `clean` will resolve internal @.@/@..@'s in @currPath@, but we still | |||
| -- need to manually handle @.@/@..@'s at the beginning of the path | |||
| combine url path = case Filesystem.stripPrefix ".." path of | |||
| combine url path = case List.stripPrefix ".." path of | |||
There was a problem hiding this comment.
Data.List.stripPrefix behaves slightly differently from Filesystem.stripPrefix:
>>> Filesystem.Path.CurrentOS.stripPrefix ".." "../foo"
Just (FilePath "foo")
>>> Data.List.stripPrefix ".." "../foo"
Just "/foo"I believe this should be `List.stripPrefix "../" instead
src/Dhall/Import.hs
Outdated
| Just path' -> combine url' path' | ||
| where | ||
| url' = parentURL (removeAtFromURL url) | ||
| Nothing -> case Filesystem.stripPrefix "." path of | ||
| Nothing -> case List.stripPrefix "." path of |
There was a problem hiding this comment.
Similarly, I believe this should be List.stripPrefix "./" instead
src/Dhall/Import.hs
Outdated
| where | ||
| strip p = case Filesystem.stripPrefix "." p of | ||
| strip p = case List.stripPrefix "." p of |
There was a problem hiding this comment.
Should I also change "." for "./" here ?
There was a problem hiding this comment.
Do we still need to call strip after normalise ? (tests are passing either way)
There was a problem hiding this comment.
You're right that we don't need stripPrefix here because System.FilePath.normalise removes any preceding ./s (unlike Filesystem.Path.collapse)
|
Let me know if you are expecting something more from this PR. I can rebase to avoid the conflict if it is more convenient on your side. |
|
Thank you for contributing this :) |
Fix #239