comparison src/settings.sml @ 2232:a07b91fa71db

Merge.
author Ziv Scully <ziv@mit.edu>
date Wed, 06 May 2015 14:51:09 -0400
parents 54884b28b6c6 a159625975a7
children c05851bf7861
comparison
equal deleted inserted replaced
2231:67e801cf42c6 2232:a07b91fa71db
878 878
879 fun setFilePath path = filePath := path 879 fun setFilePath path = filePath := path
880 880
881 fun addFile {Uri, LoadFromFilename} = 881 fun addFile {Uri, LoadFromFilename} =
882 let 882 let
883 val path = OS.Path.mkAbsolute {relativeTo = !filePath, path = LoadFromFilename} 883 val path = OS.Path.concat (!filePath, LoadFromFilename)
884 in 884 in
885 case SM.find (!files, Uri) of 885 case SM.find (!files, Uri) of
886 SOME (path', _) => 886 SOME (path', _) =>
887 if path' = path then 887 if path' = path then
888 () 888 ()