summaryrefslogtreecommitdiff
path: root/src/GF/Compile/Compile.hs
diff options
context:
space:
mode:
authoraarne <unknown>2003-11-19 15:19:05 +0000
committeraarne <unknown>2003-11-19 15:19:05 +0000
commit18dfde370ec276835c99a3bac9754d5562d6ff7b (patch)
tree3e71ed6391c041c9081e1165e293d12937b2c9fd /src/GF/Compile/Compile.hs
parent9d0fb921a7ec7e84f14334ffedcd7dab3de4242a (diff)
Fixed reuse of extended modules.
Diffstat (limited to 'src/GF/Compile/Compile.hs')
-rw-r--r--src/GF/Compile/Compile.hs6
1 files changed, 4 insertions, 2 deletions
diff --git a/src/GF/Compile/Compile.hs b/src/GF/Compile/Compile.hs
index 404620a28..e2915c0e4 100644
--- a/src/GF/Compile/Compile.hs
+++ b/src/GF/Compile/Compile.hs
@@ -166,7 +166,7 @@ makeSourceModule opts env@(k,gr,can) mo@(i,mi) = case mi of
sm <- ioeErr $ makeReuse gr i (extends m) c
let mo2 = (i, ModMod sm)
mos = modules gr
- putp " type checking reused" $ ioeErr $ showCheckModule mos mo2
+ --- putp " type checking reused" $ ioeErr $ showCheckModule mos mo2
return $ (k,mo2)
_ -> compileSourceModule opts env mo
_ -> compileSourceModule opts env mo
@@ -212,7 +212,7 @@ generateModuleCode opts path minfo@(name,info) = do
-- for resource, also emit gfr
case info of
- ModMod m | isModRes m && isCompilable info && emit && nomulti -> do
+ ModMod m | emitsGFR m && emit && nomulti -> do
let (file,out) = (gfrFile pname, prGrammar (MGrammar [minfo]))
ioeIO $ writeFile file out >> putStr (" wrote file" +++ file)
_ -> return ()
@@ -224,6 +224,8 @@ generateModuleCode opts path minfo@(name,info) = do
else ioeIO $ putStrFlush $ "no need to save module" +++ prt name
return minfo'
where
+ emitsGFR m = isModRes m && isCompilable info
+ ---- isModRes m || (isModCnc m && mstatus m == MSIncomplete)
isCompilable mi = case mi of
ModMod m -> not $ isModCnc m && mstatus m == MSIncomplete
_ -> True