X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=compiler%2Fmain%2FHscMain.lhs;h=93324d59bc789e19c32e0238c5d2372e70e6455b;hb=d0f6db5b0cf1189d84e292aeca350211f3b810dd;hp=50a015fa47c0e68d76435250c7aa897359c61506;hpb=671b39c5b40e5a3105e4ffb49b673b20ce96ba15;p=ghc-hetmet.git

diff --git a/compiler/main/HscMain.lhs b/compiler/main/HscMain.lhs
index 50a015f..93324d5 100644
--- a/compiler/main/HscMain.lhs
+++ b/compiler/main/HscMain.lhs
@@ -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
@@ -74,6 +75,7 @@ import Name		( Name, NamedThing(..) )
 import SimplStg		( stg2stg )
 import CodeGen		( codeGen )
 import CmmParse		( parseCmmFile )
+import CmmCPS
 import CodeOutput	( codeOutput )
 import NameEnv          ( emptyNameEnv )
 
@@ -183,7 +185,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 +401,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 ()
 
@@ -601,10 +604,12 @@ hscCompile cgguts
                       codeGen dflags this_mod data_tycons
                               foreign_stubs dir_imps cost_centre_info
                               stg_binds hpc_info
+         ------------------  Convert to CPS --------------------
+         continuationC <- cmmCPS dflags abstractC
          ------------------  Code output -----------------------
          (stub_h_exists,stub_c_exists)
              <- codeOutput dflags this_mod location foreign_stubs 
-                dependencies abstractC
+                dependencies continuationC
          return stub_c_exists
 
 hscConst :: b -> a -> Comp b
@@ -646,8 +651,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 +678,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 +687,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)))
 	}}}}
 
 
@@ -705,7 +721,8 @@ hscCmmFile dflags filename = do
   case maybe_cmm of
     Nothing -> return False
     Just cmm -> do
-	codeOutput dflags no_mod no_loc NoStubs [] [cmm]
+        continuationC <- cmmCPS dflags [cmm]
+	codeOutput dflags no_mod no_loc NoStubs [] continuationC
 	return True
   where
 	no_mod = panic "hscCmmFile: no_mod"
@@ -797,7 +814,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 (InteractiveContext, [Name], HValue))
+  -> IO (Maybe ([Id], HValue))
 
 hscStmt hsc_env stmt
   = do	{ maybe_stmt <- hscParseStmt (hsc_dflags hsc_env) stmt
@@ -812,12 +829,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 +844,7 @@ hscStmt hsc_env stmt
 	; let src_span = srcLocSpan interactiveSrcLoc
 	; hval <- compileExpr hsc_env src_span ds_expr
 
-	; return (Just (new_ic, bound_names, hval))
+	; return (Just (ids, hval))
 	}}}}}}}
 
 hscTcExpr	-- Typecheck an expression (but don't run it)