diff options
| author | hallgren <hallgren@chalmers.se> | 2014-08-20 17:47:08 +0000 |
|---|---|---|
| committer | hallgren <hallgren@chalmers.se> | 2014-08-20 17:47:08 +0000 |
| commit | 21f429caf8c8cb4248457c16abaf0ad4f51c974a (patch) | |
| tree | 558898049275da72a5b2c37101368a68fa5e60de /src/compiler/GF/Compile.hs | |
| parent | 73310add9a549b58381f475eab5324a17a6b83dd (diff) | |
Add lifted directory operations in GF.System.Directory to eliminate the need for liftIO in various places
Diffstat (limited to 'src/compiler/GF/Compile.hs')
| -rw-r--r-- | src/compiler/GF/Compile.hs | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/compiler/GF/Compile.hs b/src/compiler/GF/Compile.hs index 8d842e2ca..ffa0f0b0a 100644 --- a/src/compiler/GF/Compile.hs +++ b/src/compiler/GF/Compile.hs @@ -51,7 +51,7 @@ batchCompile opts files = do -- to compile a set of modules, e.g. an old GF or a .cf file compileSourceGrammar :: Options -> SourceGrammar -> IOE SourceGrammar compileSourceGrammar opts gr = do - cwd <- liftIO getCurrentDirectory + cwd <- getCurrentDirectory (_,gr',_) <- foldM (\env -> compileSourceModule opts cwd env Nothing) emptyCompileEnv (modules gr) @@ -81,13 +81,13 @@ compileModule opts1 env@(_,rfs) file = foldM (compileOne' opts) env files where getRealFile file = do - exists <- liftIO $ doesFileExist file + exists <- doesFileExist file if exists then return file else if isRelative file then do lib_dir <- getLibraryDirectory opts1 let file1 = lib_dir </> file - exists <- liftIO $ doesFileExist file1 + exists <- doesFileExist file1 if exists then return file1 else raise (render ("None of these files exists:" $$ nest 2 (file $$ file1))) @@ -108,7 +108,7 @@ extendCompileEnv (gr,menv) (mfile,mo) = do menv2 <- case mfile of Just file -> do let (mod,imps) = importsOfModule mo - t <- liftIO $ getModificationTime file + t <- getModificationTime file return $ Map.insert mod (t,imps) menv _ -> return menv return (prependModule gr mo,menv2) |
