X-Git-Url: http://git.megacz.com/?p=ghc-hetmet.git;a=blobdiff_plain;f=compiler%2Fmain%2FHscMain.lhs;h=0b8a5a26758829bde29becd500621c5caaeabf15;hp=81766015898fbaa9a9ee47460f55e113cc2aea85;hb=4c6a3f787abcaed009a574196d82237d9ae64fc8;hpb=98c68a1c5b63aadf9c7917274519d95bbe9394d4

diff --git a/compiler/main/HscMain.lhs b/compiler/main/HscMain.lhs
index 8176601..0b8a5a2 100644
--- a/compiler/main/HscMain.lhs
+++ b/compiler/main/HscMain.lhs
@@ -40,7 +40,6 @@ import ByteCodeGen	( byteCodeGen, coreExprToBCOs )
 import Linker		( HValue, linkExpr )
 import CoreTidy		( tidyExpr )
 import CorePrep		( corePrepExpr )
-import Flattening	( flattenExpr )
 import Desugar          ( deSugarExpr )
 import SimplCore        ( simplifyExpr )
 import TcRnDriver	( tcRnStmt, tcRnExpr, tcRnType ) 
@@ -64,7 +63,7 @@ import StringBuffer
 import Parser
 import Lexer
 import SrcLoc		( mkSrcLoc )
-import TcRnDriver	( tcRnModule, tcRnExtCore )
+import TcRnDriver	( tcRnModule )
 import TcIface		( typecheckIface )
 import TcRnMonad	( initIfaceCheck, TcGblEnv(..) )
 import IfaceEnv		( initNameCache )
@@ -101,10 +100,8 @@ import Outputable
 import HscStats		( ppSourceStats )
 import HscTypes
 import MkExternalCore	( emitExternalCore )
-import ParserCore
-import ParserCoreUtils
 import FastString
-import UniqFM		( emptyUFM )
+import LazyUniqFM		( emptyUFM )
 import UniqSupply       ( initUs_ )
 import Bag		( unitBag )
 
@@ -409,11 +406,8 @@ genComp :: (ModGuts  -> Comp (Maybe a))
 genComp backend boot_backend = do
     mod_summary <- gets compModSummary
     case ms_hsc_src mod_summary of
-       ExtCoreFile -> do 
-          mb_modguts <- hscCoreFrontEnd
-          case mb_modguts of
-            Nothing -> return Nothing
-            Just guts -> backend guts
+       ExtCoreFile -> do
+          panic "GHC does not currently support reading External Core files"
        _not_core -> do
           mb_tc <- hscFileFrontEnd
           case mb_tc of
@@ -484,32 +478,6 @@ batchMsg mb_mod_index recomp
 --------------------------------------------------------------
 -- FrontEnds
 --------------------------------------------------------------
-
-hscCoreFrontEnd :: Comp (Maybe ModGuts)
-hscCoreFrontEnd =
-    do hsc_env <- gets compHscEnv
-       mod_summary <- gets compModSummary
-       liftIO $ do
-            -------------------
-            -- PARSE
-            -------------------
-       inp <- readFile (ms_hspp_file mod_summary)
-       case parseCore inp 1 of
-         FailP s
-             -> do errorMsg (hsc_dflags hsc_env) (text s{-ToDo: wrong-})
-                   return Nothing
-         OkP rdr_module
-             -------------------
-             -- RENAME and TYPECHECK
-             -------------------
-             -> do (tc_msgs, maybe_tc_result) <- {-# SCC "TypeCheck" #-}
-                                                 tcRnExtCore hsc_env rdr_module
-                   printErrorsAndWarnings (hsc_dflags hsc_env) tc_msgs
-                   case maybe_tc_result of
-                     Nothing       -> return Nothing
-                     Just mod_guts -> return (Just mod_guts)         -- No desugaring to do!
-
-	 
 hscFileFrontEnd :: Comp (Maybe TcGblEnv)
 hscFileFrontEnd =
     do hsc_env <- gets compHscEnv
@@ -609,7 +577,10 @@ hscNormalIface simpl_result
 		<- {-# SCC "MkFinalIface" #-}
 		   mkIface hsc_env maybe_old_iface details simpl_result
 	-- Emit external core
-       emitExternalCore (hsc_dflags hsc_env) (availsToNameSet (mg_exports simpl_result)) cg_guts -- Move this? --Lemmih 03/07/2006
+       -- This should definitely be here and not after CorePrep,
+       -- because CorePrep produces unqualified constructor wrapper declarations,
+       -- so its output isn't valid External Core (without some preprocessing).
+       emitExternalCore (hsc_dflags hsc_env) cg_guts 
        dumpIfaceStats hsc_env
 
  	    -------------------
@@ -992,11 +963,8 @@ compileExpr hsc_env srcspan ds_expr
   = do	{ let { dflags  = hsc_dflags hsc_env ;
 		lint_on = dopt Opt_DoCoreLinting dflags }
 	      
-		-- Flatten it
-	; flat_expr <- flattenExpr hsc_env ds_expr
-
 		-- Simplify it
-	; simpl_expr <- simplifyExpr dflags flat_expr
+	; simpl_expr <- simplifyExpr dflags ds_expr
 
 		-- Tidy it (temporary, until coreSat does cloning)
 	; let tidy_expr = tidyExpr emptyTidyEnv simpl_expr