GitHub/gf-core
1
0
Fork 1
mirror of https://github.com/GrammaticalFramework/gf-core.git synced 2026-05-11 04:02:52 -06:00
Code Issues Packages Projects Releases Wiki Activity

a couple of fixes in new Optimize

Browse Source
This commit is contained in:
aarne
2007-12-07 21:00:24 +00:00
parent 1e8f17d12b
commit 49c91adf7a
2 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/GF/Devel/Compile/Compile.hs
View File

@@ -160,10 +160,10 @@ compileSourceModule opts env@(k,gr) mo@(i,mi) = do
moo <- putpp " optimizing " $ ioeErr $ optimizeModule opts gr mox moo <- putpp " optimizing " $ ioeErr $ optimizeModule opts gr mox
intermOut opts (iOpt "show_optimize") (prMod moo) intermOut opts (iOpt "show_optimize") (prMod moo)
mof <- putpp " factorizing " $ ioeErr $ optimizeModule opts gr moo ---- mof <- putpp " factorizing " $ ioeErr $ optimizeModule opts gr moo
intermOut opts (iOpt "show_factorize") (prMod mof) ---- intermOut opts (iOpt "show_factorize") (prMod mof)
return (k,mof) ---- return (k,moo) ----
{- ---- {- ----

4
src/GF/Devel/Compile/Optimize.hs
View File

@@ -37,17 +37,19 @@ import GF.Data.Operations
import Control.Monad import Control.Monad
import Data.List import Data.List
import qualified Data.Map as Map
import Debug.Trace import Debug.Trace
optimizeModule :: Options -> GF -> SourceModule -> Err SourceModule 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 MTConcrete _ -> opt sm
MTInstance _ -> opt sm MTInstance _ -> opt sm
MTGrammar -> opt sm MTGrammar -> opt sm
_ -> return sm _ -> return sm
where where
gf = gf0 {gfmodules = Map.insert m mo (gfmodules gf0)}
opt (m,mo) = do opt (m,mo) = do
mo' <- termOpModule (computeTerm gf) mo mo' <- termOpModule (computeTerm gf) mo
return (m,mo') return (m,mo')