From 2997e31da2e41b6f1ffeca09a976b739ff9846ea Mon Sep 17 00:00:00 2001 From: Adam Chlipala Date: Sun, 8 Mar 2015 10:55:05 -0400 Subject: Fix interpretation of 'file' argument paths --- src/settings.sml | 2 +- tests/files.urp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/settings.sml b/src/settings.sml index 19ee0b4a..c9b022fd 100644 --- a/src/settings.sml +++ b/src/settings.sml @@ -867,7 +867,7 @@ fun setFilePath path = filePath := path fun addFile {Uri, LoadFromFilename} = let - val path = OS.Path.joinDirFile {dir = !filePath, file = LoadFromFilename} + val path = OS.Path.mkAbsolute {relativeTo = !filePath, path = LoadFromFilename} in case SM.find (!files, Uri) of SOME (path', _) => diff --git a/tests/files.urp b/tests/files.urp index 100992e5..3683f1a8 100644 --- a/tests/files.urp +++ b/tests/files.urp @@ -1,6 +1,6 @@ rewrite all Files/* file /hello_world.txt hello.txt file /img/web.png web.png -file /files.urp files.urp +file /files.urp ./files.urp files -- cgit v1.2.3