GitHub/gf-core
1
0
Fork 1
mirror of https://github.com/GrammaticalFramework/gf-core.git synced 2026-04-21 10:49:33 -06:00
Code Issues Packages Projects Releases Wiki Activity

Some more monadic lifting changes

Browse Source
This commit is contained in:
hallgren
2013-11-21 15:01:04 +00:00
parent aad6a1c4bb
commit fe065b5ee4
4 changed files with 30 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/compiler/GF/Compile/ReadFiles.hs
View File

@@ -212,11 +212,11 @@ importsOfModule (m,mi) = (modName m,depModInfo mi [])
-- | options can be passed to the compiler by comments in @--#@, in the main file
getOptionsFromFile :: (MonadIO m,ErrorMonad m) => FilePath -> m Options
getOptionsFromFile file = do
s <- handle (liftIO $ BS.readFile file)
(\_ -> raise $ "File " ++ file ++ " does not exist")
s <- either (\_ -> raise $ "File " ++ file ++ " does not exist") return =<<
liftIO (try $ BS.readFile file)
let ls = filter (BS.isPrefixOf (BS.pack "--#")) $ BS.lines s
fs = map (BS.unpack . BS.unwords . BS.words . BS.drop 3) ls
liftErr $ parseModuleOptions fs
parseModuleOptions fs
getFilePath :: MonadIO m => [FilePath] -> String -> m (Maybe FilePath)
getFilePath paths file = liftIO $ get paths