X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=compiler%2Fmain%2FHscMain.lhs;h=c86bd48d74407c49df99f9ad80784383c126e72f;hb=78f4da288f8a189c739766a3107fa80073800ba7;hp=4413c52ec2538479ff2252a4a8897dfdc5b9de6e;hpb=cdce647711c0f46f5799b24de087622cb77e647f;p=ghc-hetmet.git

diff --git a/compiler/main/HscMain.lhs b/compiler/main/HscMain.lhs
index 4413c52..c86bd48 100644
--- a/compiler/main/HscMain.lhs
+++ b/compiler/main/HscMain.lhs
@@ -25,8 +25,7 @@ module HscMain
 #include "HsVersions.h"
 
 #ifdef GHCI
-import HsSyn		( Stmt(..), LHsExpr, LStmt, LHsType )
-import Module		( Module )
+import HsSyn		( Stmt(..), LStmt, LHsType )
 import CodeOutput	( outputForeignStubs )
 import ByteCodeGen	( byteCodeGen, coreExprToBCOs )
 import Linker		( HValue, linkExpr )
@@ -43,6 +42,7 @@ import {- Kind parts of -} Type		( Kind )
 import CoreLint		( lintUnfolding )
 import DsMeta		( templateHaskellNames )
 import SrcLoc		( SrcSpan, noSrcLoc, interactiveSrcLoc, srcLocSpan )
+import VarSet
 import VarEnv		( emptyTidyEnv )
 #endif
 
@@ -51,6 +51,7 @@ import Module		( emptyModuleEnv, ModLocation(..) )
 import RdrName		( GlobalRdrEnv, RdrName, emptyGlobalRdrEnv )
 import HsSyn		( HsModule, LHsBinds, HsGroup, LIE, LImportDecl, HsDoc,
                           HaddockModInfo )
+import CoreSyn
 import SrcLoc		( Located(..) )
 import StringBuffer	( hGetStringBuffer, stringToStringBuffer )
 import Parser
@@ -183,7 +184,8 @@ data HscChecked
                 Maybe (HsDoc Name), HaddockModInfo Name))
         -- typechecked
         (Maybe (LHsBinds Id, GlobalRdrEnv, ModDetails))
-
+        -- desugared
+        (Maybe [CoreBind])
 
 -- Status of a compilation to hard-code or nothing.
 data HscStatus
@@ -398,7 +400,7 @@ batchMsg mb_mod_index recomp
          liftIO $ do
          if recomp
             then showMsg "Compiling "
-            else if verbosity (hsc_dflags hsc_env) >= 1
+            else if verbosity (hsc_dflags hsc_env) >= 2
                     then showMsg "Skipping  "
                     else return ()
 
@@ -646,8 +648,8 @@ hscInteractive (iface, details, cgguts)
 
 ------------------------------
 
-hscFileCheck :: HscEnv -> ModSummary -> IO (Maybe HscChecked)
-hscFileCheck hsc_env mod_summary = do {
+hscFileCheck :: HscEnv -> ModSummary -> Bool -> IO (Maybe HscChecked)
+hscFileCheck hsc_env mod_summary compileToCore = do {
  	    -------------------
  	    -- PARSE
  	    -------------------
@@ -673,7 +675,7 @@ hscFileCheck hsc_env mod_summary = do {
 
 	; printErrorsAndWarnings dflags tc_msgs
 	; case maybe_tc_result of {
-      	     Nothing -> return (Just (HscChecked rdr_module Nothing Nothing));
+      	     Nothing -> return (Just (HscChecked rdr_module Nothing Nothing Nothing));
       	     Just tc_result -> do
 		let type_env = tcg_type_env tc_result
 		    md = ModDetails { 
@@ -682,20 +684,31 @@ hscFileCheck hsc_env mod_summary = do {
 				md_insts     = tcg_insts     tc_result,
 				md_fam_insts = tcg_fam_insts tc_result,
                                 md_modBreaks = emptyModBreaks,      
-				md_rules     = [panic "no rules"] }
+				md_rules     = [panic "no rules"],
 				   -- Rules are CoreRules, not the
 				   -- RuleDecls we get out of the typechecker
+                                md_vect_info = 
+                                  panic "HscMain.hscFileCheck: no VectInfo"
+                                   -- VectInfo is added by the Core 
+                                   -- vectorisation pass
+                          }
                     rnInfo = do decl <- tcg_rn_decls tc_result
                                 imports <- tcg_rn_imports tc_result
                                 let exports = tcg_rn_exports tc_result
 			        let doc = tcg_doc tc_result
 				    hmi = tcg_hmi tc_result
                                 return (decl,imports,exports,doc,hmi)
-		return (Just (HscChecked rdr_module 
+		maybeModGuts <- 
+                 if compileToCore then
+                   deSugar hsc_env (ms_location mod_summary) tc_result
+                 else
+                   return Nothing
+                return (Just (HscChecked rdr_module 
                                    rnInfo
 				   (Just (tcg_binds tc_result,
 					  tcg_rdr_env tc_result,
-					  md))))
+					  md))
+                                   (fmap mg_binds maybeModGuts)))
 	}}}}
 
 
@@ -797,7 +810,7 @@ A naked expression returns a singleton Name [it].
 hscStmt		-- Compile a stmt all the way to an HValue, but don't run it
   :: HscEnv
   -> String			-- The statement
-  -> IO (Maybe (HscEnv, [Name], HValue))
+  -> IO (Maybe ([Id], HValue))
 
 hscStmt hsc_env stmt
   = do	{ maybe_stmt <- hscParseStmt (hsc_dflags hsc_env) stmt
@@ -812,12 +825,11 @@ hscStmt hsc_env stmt
 
 	; case maybe_tc_result of {
 		Nothing -> return Nothing ;
-		Just (new_ic, bound_names, tc_expr) -> do {
-
+		Just (ids, tc_expr) -> do {
 
 	 	-- Desugar it
-	; let rdr_env  = ic_rn_gbl_env new_ic
-	      type_env = ic_type_env new_ic
+	; let rdr_env  = ic_rn_gbl_env icontext
+	      type_env = mkTypeEnv (map AnId (ic_tmp_ids icontext))
 	; mb_ds_expr <- deSugarExpr hsc_env iNTERACTIVE rdr_env type_env tc_expr
 	
 	; case mb_ds_expr of {
@@ -828,7 +840,7 @@ hscStmt hsc_env stmt
 	; let src_span = srcLocSpan interactiveSrcLoc
 	; hval <- compileExpr hsc_env src_span ds_expr
 
-	; return (Just (hsc_env{ hsc_IC=new_ic }, bound_names, hval))
+	; return (Just (ids, hval))
 	}}}}}}}
 
 hscTcExpr	-- Typecheck an expression (but don't run it)
@@ -934,7 +946,10 @@ compileExpr hsc_env srcspan ds_expr
 		-- Lint if necessary
 		-- ToDo: improve SrcLoc
 	; if lint_on then 
-		case lintUnfolding noSrcLoc [] prepd_expr of
+                let ictxt = hsc_IC hsc_env
+                    tyvars = varSetElems (ic_tyvars ictxt)
+                in
+		case lintUnfolding noSrcLoc tyvars prepd_expr of
 		   Just err -> pprPanic "compileExpr" err
 		   Nothing  -> return ()
 	  else