More import tidying and fixing the stage 2 build

[ghc-hetmet.git] / compiler / typecheck / TcTyDecls.lhs

diff --git a/compiler/typecheck/TcTyDecls.lhs b/compiler/typecheck/TcTyDecls.lhs
index f16d89e..c1a3389 100644 (file)
--- a/compiler/typecheck/TcTyDecls.lhs
+++ b/compiler/typecheck/TcTyDecls.lhs
@@ -1,4 +1,5 @@
 %
+% (c) The University of Glasgow 2006
 % (c) The GRASP/AQUA Project, Glasgow University, 1992-1999
 %
 
@@ -7,7 +8,6 @@ Analysis functions over data types.  Specficially, detecting recursive types.
 This stuff is only used for source-code decls; it's recorded in interface
 files for imported data types.
 
-
 \begin{code}
 module TcTyDecls(
        calcRecFlags, 
@@ -16,25 +16,22 @@ module TcTyDecls(
 
 #include "HsVersions.h"
 
-import TypeRep          ( Type(..), TyNote(..), PredType(..) )  -- friend
-import HsSyn           ( TyClDecl(..), HsPred(..), LTyClDecl, isClassDecl )
-import RnHsSyn         ( extractHsTyNames )
-import Type            ( predTypeRep, tcView )
-import HscTypes                ( TyThing(..), ModDetails(..) )
-import TyCon            ( TyCon, tyConArity, tyConDataCons, tyConTyVars,
-                          isSynTyCon, isAlgTyCon, 
-                         tyConName, isNewTyCon, isProductTyCon, newTyConRhs,
-                         isOpenTyCon )
-import Class           ( classTyCon )
-import DataCon          ( dataConOrigArgTys )
-import Var              ( TyVar )
+import TypeRep
+import HsSyn
+import RnHsSyn
+import Type
+import HscTypes
+import TyCon
+import Class
+import DataCon
+import Var
 import VarSet
-import Name            ( Name, isTyVarName )
+import Name
 import NameEnv
 import NameSet
-import Digraph                 ( SCC(..), stronglyConnComp, stronglyConnCompR )
-import BasicTypes      ( RecFlag(..) )
-import SrcLoc          ( Located(..), unLoc )
+import Digraph
+import BasicTypes
+import SrcLoc
 import Outputable
 \end{code}
 
@@ -215,7 +212,7 @@ calcRecFlags boot_details tyclss
     is_rec n | n `elemNameSet` rec_names = Recursive
             | otherwise                 = NonRecursive
 
-    boot_name_set = md_exports boot_details
+    boot_name_set = availsToNameSet (md_exports boot_details)
     rec_names = boot_name_set    `unionNameSets` 
                nt_loop_breakers  `unionNameSets`
                prod_loop_breakers