From e90ccb500287de7e5a335340b23e7d1b6d76ffa4 Mon Sep 17 00:00:00 2001
From: aarne <aarne@cs.chalmers.se>
Date: Fri, 7 Dec 2007 21:00:24 +0000
Subject: [PATCH] a couple of fixes in new Optimize

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

diff --git a/src/GF/Devel/Compile/Compile.hs b/src/GF/Devel/Compile/Compile.hs
index df3ea079e..70ba5e9c0 100644
--- a/src/GF/Devel/Compile/Compile.hs
+++ b/src/GF/Devel/Compile/Compile.hs
@@ -160,10 +160,10 @@ compileSourceModule opts env@(k,gr) mo@(i,mi) = do
   moo <- putpp "  optimizing " $ ioeErr $ optimizeModule opts gr mox
   intermOut opts (iOpt "show_optimize") (prMod moo)
 
-  mof <- putpp "  factorizing " $ ioeErr $ optimizeModule opts gr moo
-  intermOut opts (iOpt "show_factorize") (prMod mof)
+----  mof <- putpp "  factorizing " $ ioeErr $ optimizeModule opts gr moo
+----  intermOut opts (iOpt "show_factorize") (prMod mof)
 
-  return (k,mof) ----
+  return (k,moo) ----
 
 
 {- ----
diff --git a/src/GF/Devel/Compile/Optimize.hs b/src/GF/Devel/Compile/Optimize.hs
index 9ed2860fd..1d5024714 100644
--- a/src/GF/Devel/Compile/Optimize.hs
+++ b/src/GF/Devel/Compile/Optimize.hs
@@ -37,17 +37,19 @@ import GF.Data.Operations
 
 import Control.Monad
 import Data.List
+import qualified Data.Map as Map
 
 import Debug.Trace
 
 
 optimizeModule :: Options -> GF -> SourceModule -> Err SourceModule
-optimizeModule opts gf sm@(m,mo) = case mtype mo of
+optimizeModule opts gf0 sm@(m,mo) = case mtype mo of
   MTConcrete _ -> opt sm 
   MTInstance _ -> opt sm
   MTGrammar   -> opt sm
   _ -> return sm
  where
+   gf = gf0 {gfmodules = Map.insert m mo (gfmodules gf0)}
    opt (m,mo) = do
      mo' <- termOpModule (computeTerm gf) mo
      return (m,mo')