summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLemmih <lemmih@gmail.com>2006-03-10 02:14:42 +0000
committerLemmih <lemmih@gmail.com>2006-03-10 02:14:42 +0000
commit14f70d834589f134c8fbeaa2e0f5f56cba3eab28 (patch)
tree7234b549c1a7bf97563d5928871d6521e69a3b73
parent0490ee1f0996fcd1f360e2c5fdae488cd36e2a17 (diff)
downloadhaskell-14f70d834589f134c8fbeaa2e0f5f56cba3eab28.tar.gz
Wibble in HscMain.
-rw-r--r--ghc/compiler/main/HscMain.lhs9
1 files changed, 5 insertions, 4 deletions
diff --git a/ghc/compiler/main/HscMain.lhs b/ghc/compiler/main/HscMain.lhs
index ed955591c9..3af61b11fb 100644
--- a/ghc/compiler/main/HscMain.lhs
+++ b/ghc/compiler/main/HscMain.lhs
@@ -274,7 +274,7 @@ hscMkCompiler norecomp messenger frontend backend
hscCompileOneShot :: Compiler HscStatus
hscCompileOneShot hsc_env mod_summary =
compiler hsc_env mod_summary
- where mkComp = hscMkCompiler (norecompOneShot HscNoRecomp) oneShotMsg
+ where mkComp = hscMkCompiler norecompOneShot oneShotMsg
-- How to compile nonBoot files.
nonBootComp inp = hscSimplify inp >>= hscNormalIface >>=
hscWriteIface >>= hscOneShot
@@ -307,6 +307,7 @@ hscCompileBatch hsc_env mod_summary
-> mkComp hscFileFrontEnd bootComp
-- Type-check Haskell, boot and extCore.
+-- Does it make sense to compile extCore to nothing?
hscCompileNothing :: Compiler (HscStatus, ModIface, ModDetails)
hscCompileNothing hsc_env mod_summary
= compiler hsc_env mod_summary
@@ -339,12 +340,12 @@ hscCompileInteractive hsc_env mod_summary =
-- NoRecomp handlers
--------------------------------------------------------------
-norecompOneShot :: a -> NoRecomp a
-norecompOneShot a old_iface
+norecompOneShot :: NoRecomp HscStatus
+norecompOneShot old_iface
= do hsc_env <- gets compHscEnv
liftIO $ do
dumpIfaceStats hsc_env
- return a
+ return HscNoRecomp
norecompBatch :: NoRecomp (HscStatus, ModIface, ModDetails)
norecompBatch = norecompWorker HscNoRecomp False