diff options
| author | krasimir <krasimir@chalmers.se> | 2009-11-12 21:11:51 +0000 |
|---|---|---|
| committer | krasimir <krasimir@chalmers.se> | 2009-11-12 21:11:51 +0000 |
| commit | 94171908c07a7f85ff991f14867c6bc5e7f93258 (patch) | |
| tree | 4a9b3de68349a6eed267594315dd7711900c5a4c /src/GF/Compile.hs | |
| parent | 3aa208dd2bd1ae0f1958c5a2e68b2d4ad6e14b7e (diff) | |
before the optimizations OptParametrize and OptValues were applied twice. in addition the values optimization is now always applied because it become very cheep
Diffstat (limited to 'src/GF/Compile.hs')
| -rw-r--r-- | src/GF/Compile.hs | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/src/GF/Compile.hs b/src/GF/Compile.hs index 33f5e44ea..e0c60178e 100644 --- a/src/GF/Compile.hs +++ b/src/GF/Compile.hs @@ -5,7 +5,7 @@ import GF.Compile.GetGrammar import GF.Compile.Rename import GF.Compile.CheckGrammar import GF.Compile.Optimize -import GF.Compile.OptimizeGF +import GF.Compile.SubExOpt import GF.Compile.OptimizeGFCC import GF.Compile.GrammarToGFCC import GF.Compile.ReadFiles @@ -183,10 +183,8 @@ compileOne opts env@(_,srcgr,_) file = do intermOut opts DumpSource (ppModule Qualified sm0) (k',sm) <- compileSourceModule opts env sm0 - let sm1 = if isConcr sm then shareModule sm else sm -- cannot expand Str - cm <- putPointE Verbose opts " generating code... " $ generateModuleCode opts gfo sm1 - -- sm is optimized before generation, but not in the env - extendCompileEnvInt env k' (Just gfo) sm1 + putPointE Verbose opts " generating code... " $ generateModuleCode opts gfo sm + extendCompileEnvInt env k' (Just gfo) sm where isConcr (_,m) = isModCnc m && mstatus m /= MSIncomplete |