From 849642e9dd638082bb7b1d7b704200e01429233d Mon Sep 17 00:00:00 2001
From: bjorn <bjorn@bringert.net>
Date: Wed, 15 Oct 2008 11:55:18 +0000
Subject: Merge ModuleOptions and Options.

---
 src/GF/Compile/Optimize.hs  | 2 +-
 src/GF/Compile/ReadFiles.hs | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

(limited to 'src/GF/Compile')

diff --git a/src/GF/Compile/Optimize.hs b/src/GF/Compile/Optimize.hs
index ca3e6ec3e..05a3826bf 100644
--- a/src/GF/Compile/Optimize.hs
+++ b/src/GF/Compile/Optimize.hs
@@ -58,7 +58,7 @@ optimizeModule opts mse@(ms,eenv) mo@(_,mi) = case mi of
       return (mo2,eenv)
   _ -> evalModule oopts mse mo
  where
-   oopts = opts `addOptions` toOptions (flagsModule mo)
+   oopts = opts `addOptions` flagsModule mo
    optim = flag optOptimizations oopts
 
 evalModule :: Options -> ([(Ident,SourceModInfo)],EEnv) -> (Ident,SourceModInfo) -> 
diff --git a/src/GF/Compile/ReadFiles.hs b/src/GF/Compile/ReadFiles.hs
index 67535227b..19bcc013b 100644
--- a/src/GF/Compile/ReadFiles.hs
+++ b/src/GF/Compile/ReadFiles.hs
@@ -210,4 +210,4 @@ getOptionsFromFile file = do
   s <- ioeIO $ readFileIfStrict file
   let ls = filter (BS.isPrefixOf (BS.pack "--#")) $ BS.lines s
       fs = map (BS.unpack . BS.unwords . BS.words . BS.drop 3) ls
-  ioeErr $ liftM toOptions $ parseModuleOptions fs
+  ioeErr $ parseModuleOptions fs
-- 
cgit v1.2.3