From 734c66710e9bffa986c094e8c584295b33cd2f63 Mon Sep 17 00:00:00 2001 From: "kr.angelov" Date: Wed, 2 Nov 2011 13:57:11 +0000 Subject: merge GF.Infra.Modules and GF.Grammar.Grammar. This is a preparation for the separate PGF building --- src/compiler/GF/Compile/Optimize.hs | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) (limited to 'src/compiler/GF/Compile/Optimize.hs') diff --git a/src/compiler/GF/Compile/Optimize.hs b/src/compiler/GF/Compile/Optimize.hs index 95ee460ef..303bdb8d0 100644 --- a/src/compiler/GF/Compile/Optimize.hs +++ b/src/compiler/GF/Compile/Optimize.hs @@ -17,7 +17,6 @@ module GF.Compile.Optimize (optimizeModule) where import GF.Grammar.Grammar import GF.Infra.Ident -import GF.Infra.Modules import GF.Grammar.Printer import GF.Grammar.Macros import GF.Grammar.Lookup @@ -49,11 +48,11 @@ optimizeModule opts ms m@(name,mi) return (name,mi) | otherwise = return m where - oopts = opts `addOptions` flagsModule m + oopts = opts `addOptions` mflags mi updateEvalInfo mi (i,info) = do - info' <- evalInfo oopts ms (name,mi) i info - return (updateModule mi i info') + info <- evalInfo oopts ms (name,mi) i info + return (mi{jments=updateTree (i,info) (jments mi)}) evalInfo :: Options -> [SourceModule] -> SourceModule -> Ident -> Info -> Err Info evalInfo opts ms m c info = do -- cgit v1.2.3