summaryrefslogtreecommitdiff
path: root/src/GF/Devel/Compile/Compile.hs
diff options
context:
space:
mode:
authoraarne <aarne@cs.chalmers.se>2007-12-04 17:10:28 +0000
committeraarne <aarne@cs.chalmers.se>2007-12-04 17:10:28 +0000
commit7fabd2345db0e78480851722e7199292b8593db7 (patch)
treef837507407963982eedca186d6151520b40fcf8e /src/GF/Devel/Compile/Compile.hs
parent61763b57848eaeb5e08ca0429dc5c0926606ad6c (diff)
building extensions in new source format
Diffstat (limited to 'src/GF/Devel/Compile/Compile.hs')
-rw-r--r--src/GF/Devel/Compile/Compile.hs14
1 files changed, 7 insertions, 7 deletions
diff --git a/src/GF/Devel/Compile/Compile.hs b/src/GF/Devel/Compile/Compile.hs
index 78dbfec82..f24ce2f24 100644
--- a/src/GF/Devel/Compile/Compile.hs
+++ b/src/GF/Devel/Compile/Compile.hs
@@ -2,8 +2,7 @@ module GF.Devel.Compile.Compile (batchCompile) where
-- the main compiler passes
import GF.Devel.Compile.GetGrammar
-----import GF.Compile.Update
-----import GF.Compile.Extend
+import GF.Devel.Compile.Extend
----import GF.Compile.Rebuild
----import GF.Compile.Rename
----import GF.Grammar.Refresh
@@ -144,18 +143,19 @@ compileSourceModule :: Options -> CompileEnv ->
compileSourceModule opts env@(k,gr) mo@(i,mi) = do
intermOut opts (iOpt "show_gf") (prMod mo)
- return (k,mo) ----
-{- ----
let putp = putPointE opts
putpp = putPointEsil opts
- mos = modules gr
+ mo1 <- ioeErr $ extendModule gr mo
+ intermOut opts (iOpt "show_extend") (prMod mo1)
+
+ return (k,mo1) ----
+
+{- ----
mo1 <- ioeErr $ rebuildModule mos mo
intermOut opts (iOpt "show_rebuild") (prMod mo1)
- mo1b <- ioeErr $ extendModule mos mo1
- intermOut opts (iOpt "show_extend") (prMod mo1b)
case mo1b of
(_,ModMod n) | not (isCompleteModule n) -> do