X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=compiler%2Ftypecheck%2FTcRnDriver.lhs;h=c4b351724f36524ffd5ed5a62a00b1bdb81c27dc;hb=1a9245caefb80a3c4c5965aaacdf9a607e792e1c;hp=069446fb43504d6abbef56ae027840e745d729bb;hpb=de1a1f9f882cf1a5c81c4a152edc001aafd3f8a3;p=ghc-hetmet.git

diff --git a/compiler/typecheck/TcRnDriver.lhs b/compiler/typecheck/TcRnDriver.lhs
index 069446f..c4b3517 100644
--- a/compiler/typecheck/TcRnDriver.lhs
+++ b/compiler/typecheck/TcRnDriver.lhs
@@ -9,10 +9,10 @@ module TcRnDriver (
 #ifdef GHCI
 	tcRnStmt, tcRnExpr, tcRnType,
 	tcRnLookupRdrName,
-	tcRnLookupName,
-	tcRnGetInfo,
 	getModuleExports, 
 #endif
+	tcRnLookupName,
+	tcRnGetInfo,
 	tcRnModule, 
 	tcTopSrcDecls,
 	tcRnExtCore
@@ -72,6 +72,7 @@ import Outputable
 import DataCon
 import Type
 import Class
+import TcType
 import Data.List ( sortBy )
 
 #ifdef GHCI
@@ -84,7 +85,6 @@ import IfaceEnv
 import MkId
 import BasicTypes
 import TidyPgm	  ( globaliseAndTidyId )
-import TcType	  ( isUnitTy, isTauTy, tyClsNamesOfDFunHead )
 import TysWiredIn ( unitTy, mkListTy )
 #endif
 
@@ -297,7 +297,7 @@ tcRnExtCore hsc_env (HsExtCore this_mod decls src_binds)
 	-- any mutually recursive types are done right
 	-- Just discard the auxiliary bindings; they are generated 
 	-- only for Haskell source code, and should already be in Core
-   (tcg_env, _aux_binds) <- tcTyAndClassDecls emptyModDetails rn_decls ;
+   (tcg_env, _aux_binds, _dm_ids) <- tcTyAndClassDecls emptyModDetails rn_decls ;
 
    setGblEnv tcg_env $ do {
 	-- Make the new type env available to stuff slurped from interface files
@@ -485,8 +485,10 @@ tcRnHsBootDecls decls
 
 		-- Typecheck type/class decls
 	; traceTc (text "Tc2")
-	; (tcg_env, aux_binds) <- tcTyAndClassDecls emptyModDetails tycl_decls
-	; setGblEnv tcg_env	$ do {
+	; (tcg_env, aux_binds, dm_ids) 
+               <- tcTyAndClassDecls emptyModDetails tycl_decls
+	; setGblEnv tcg_env    $ 
+          tcExtendIdEnv dm_ids $ do {
 
 		-- Typecheck instance decls
 		-- Family instance declarations are rejected here
@@ -821,10 +823,12 @@ tcTopSrcDecls boot_details
 		-- The latter come in via tycl_decls
         traceTc (text "Tc2") ;
 
-	(tcg_env, aux_binds) <- tcTyAndClassDecls boot_details tycl_decls ;
+	(tcg_env, aux_binds, dm_ids) <- tcTyAndClassDecls boot_details tycl_decls ;
 		-- If there are any errors, tcTyAndClassDecls fails here
 	
-	setGblEnv tcg_env	$ do {
+	setGblEnv tcg_env	$
+        tcExtendIdEnv dm_ids    $ do {
+
 		-- Source-language instances, including derivings,
 		-- and import the supporting declarations
         traceTc (text "Tc3") ;
@@ -854,13 +858,12 @@ tcTopSrcDecls boot_details
 	(tc_val_binds, tcl_env) <- setLclTypeEnv tcl_env $
 			 	   tcTopBinds val_binds;
 
+        setLclTypeEnv tcl_env $ do {	-- Environment doesn't change now
+
 	     	-- Second pass over class and instance declarations, 
         traceTc (text "Tc6") ;
-	(inst_binds, tcl_env) <- setLclTypeEnv tcl_env $ 
-                                 tcInstDecls2 tycl_decls inst_infos ;
-                                 	showLIE (text "after instDecls2") ;
-
-        setLclTypeEnv tcl_env $ do {	-- Environment doesn't change now
+	inst_binds <- tcInstDecls2 tycl_decls inst_infos ;
+        showLIE (text "after instDecls2") ;
 
 		-- Foreign exports
         traceTc (text "Tc7") ;
@@ -1015,7 +1018,6 @@ get two defns for 'main' in the interface file!
 %*********************************************************
 
 \begin{code}
-#ifdef GHCI
 setInteractiveContext :: HscEnv -> InteractiveContext -> TcRn a -> TcRn a
 setInteractiveContext hsc_env icxt thing_inside 
   = let -- Initialise the tcg_inst_env with instances from all home modules.  
@@ -1046,6 +1048,7 @@ setInteractiveContext hsc_env icxt thing_inside
 
 
 \begin{code}
+#ifdef GHCI
 tcRnStmt :: HscEnv
 	 -> InteractiveContext
 	 -> LStmt RdrName
@@ -1401,6 +1404,7 @@ lookup_rdr_name rdr_name = do {
     
     return good_names
  }
+#endif
 
 tcRnLookupName :: HscEnv -> Name -> IO (Messages, Maybe TyThing)
 tcRnLookupName hsc_env name
@@ -1421,8 +1425,8 @@ tcRnLookupName' name = do
      _ -> panic "tcRnLookupName'"
 
 tcRnGetInfo :: HscEnv
-	    -> Name
-	    -> IO (Messages, Maybe (TyThing, Fixity, [Instance]))
+            -> Name
+            -> IO (Messages, Maybe (TyThing, Fixity, [Instance]))
 
 -- Used to implement :info in GHCi
 --
@@ -1432,8 +1436,14 @@ tcRnGetInfo :: HscEnv
 --  *and* as a type or class constructor; 
 -- hence the call to dataTcOccs, and we return up to two results
 tcRnGetInfo hsc_env name
-  = initTcPrintErrors hsc_env iNTERACTIVE $ 
-    let ictxt = hsc_IC hsc_env in
+  = initTcPrintErrors hsc_env iNTERACTIVE $
+    tcRnGetInfo' hsc_env name
+
+tcRnGetInfo' :: HscEnv
+             -> Name
+             -> TcRn (TyThing, Fixity, [Instance])
+tcRnGetInfo' hsc_env name
+  = let ictxt = hsc_IC hsc_env in
     setInteractiveContext hsc_env ictxt $ do
 
 	-- Load the interface for all unqualified types and classes
@@ -1482,7 +1492,6 @@ loadUnqualIfaces ictxt
 		    isTcOcc (nameOccName name),  -- Types and classes only
 		    unQualOK gre ]		 -- In scope unqualified
     doc = ptext (sLit "Need interface for module whose export(s) are in scope unqualified")
-#endif /* GHCI */
 \end{code}
 
 %************************************************************************