diff options
| author | bjorn <bjorn@bringert.net> | 2008-10-15 11:38:34 +0000 |
|---|---|---|
| committer | bjorn <bjorn@bringert.net> | 2008-10-15 11:38:34 +0000 |
| commit | 1ecb4f63e9765962aab570bf043cb65c22df1e45 (patch) | |
| tree | c12112454cbd1bb41d2a83864dd795347fa4df81 /src/GF/Compile.hs | |
| parent | 60ba93cfbb043ecf0831f182b2044c5e94508d47 (diff) | |
Added OPTIONS class to make options handling somewhat nicer. Next, I will merge Flags and ModuleFlags.
Diffstat (limited to 'src/GF/Compile.hs')
| -rw-r--r-- | src/GF/Compile.hs | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/GF/Compile.hs b/src/GF/Compile.hs index 289bdd92b..226602616 100644 --- a/src/GF/Compile.hs +++ b/src/GF/Compile.hs @@ -68,13 +68,13 @@ link opts cnc gr = do optimize :: Options -> PGF -> PGF optimize opts = cse . suf - where os = moduleFlag optOptimizations opts + where os = flag optOptimizations opts cse = if OptCSE `Set.member` os then cseOptimize else id suf = if OptStem `Set.member` os then suffixOptimize else id buildParser :: Options -> PGF -> PGF buildParser opts = - if moduleFlag optBuildParser opts then addParsers else id + if flag optBuildParser opts then addParsers else id batchCompile :: Options -> [FilePath] -> IOE SourceGrammar batchCompile opts files = do @@ -112,7 +112,7 @@ compileModule opts1 env file = do opts0 <- getOptionsFromFile file let opts = addOptions opts0 opts1 let fdir = dropFileName file - let ps0 = moduleFlag optLibraryPath opts + let ps0 = flag optLibraryPath opts ps1 <- ioeIO $ extendPathEnv $ fdir : ps0 let ps2 = ps1 ++ map (fdir </>) ps0 ps <- ioeIO $ fmap nub $ mapM canonicalizePath ps2 |