[project @ 1998-05-04 20:56:54 by sof]

Import lists updated

diff --git a/ghc/compiler/rename/ParseIface.y b/ghc/compiler/rename/ParseIface.y
index 35043d8..96fac18 100644 (file)
--- a/ghc/compiler/rename/ParseIface.y
+++ b/ghc/compiler/rename/ParseIface.y
@@ -9,7 +9,7 @@ import HsDecls          ( HsIdInfo(..), HsStrictnessInfo(..) )
 import HsTypes         ( mkHsForAllTy )
 import HsCore
 import Literal
-import BasicTypes      ( IfaceFlavour(..), Fixity(..), FixityDirection(..), NewOrData(..), Version(..) )
+import BasicTypes      ( IfaceFlavour(..), Fixity(..), FixityDirection(..), NewOrData(..), Version )
 import HsPragmas       ( noDataPragmas, noClassPragmas )
 import Kind            ( Kind, mkArrowKind, mkBoxedTypeKind, mkTypeKind )
 import IdInfo           ( ArgUsageInfo, FBTypeInfo, ArityInfo, exactArity )

diff --git a/ghc/compiler/rename/Rename.lhs b/ghc/compiler/rename/Rename.lhs
index 5a98a5b..2fab42e 100644 (file)
--- a/ghc/compiler/rename/Rename.lhs
+++ b/ghc/compiler/rename/Rename.lhs
@@ -25,9 +25,10 @@ import RnIfaces              ( getImportedInstDecls, importDecl, getImportVersions, getSpeci
                        )
 import RnEnv           ( addImplicitOccsRn, availNames )
 import Name            ( Name, PrintUnqualified, Provenance, isLocallyDefined,
-                         NameSet(..),
-                         nameSetToList, minusNameSet, NamedThing(..),
-                         nameModule, pprModule, pprOccName, nameOccName
+                         NameSet,
+                           nameSetToList, minusNameSet,
+                         NamedThing(..),
+                          nameModule, pprModule, pprOccName, nameOccName
                        )
 import TysWiredIn      ( unitTyCon, intTyCon, doubleTyCon )
 import TyCon           ( TyCon )

diff --git a/ghc/compiler/rename/RnBinds.lhs b/ghc/compiler/rename/RnBinds.lhs
index a92ac88..4f30204 100644 (file)
--- a/ghc/compiler/rename/RnBinds.lhs
+++ b/ghc/compiler/rename/RnBinds.lhs
@@ -32,7 +32,7 @@ import CmdLineOpts    ( opt_SigsRequired )
 import Digraph         ( stronglyConnComp, SCC(..) )
 import Name            ( OccName(..), Provenance, 
                          Name, isExportedName,
-                         NameSet(..), emptyNameSet, mkNameSet, unionNameSets, 
+                         NameSet, emptyNameSet, mkNameSet, unionNameSets, 
                          minusNameSet, unionManyNameSets, elemNameSet, unitNameSet, nameSetToList
                        )
 import BasicTypes      ( RecFlag(..), TopLevelFlag(..) )

diff --git a/ghc/compiler/rename/RnIfaces.lhs b/ghc/compiler/rename/RnIfaces.lhs
index 55ad5f9..8092a6d 100644 (file)
--- a/ghc/compiler/rename/RnIfaces.lhs
+++ b/ghc/compiler/rename/RnIfaces.lhs
@@ -44,12 +44,12 @@ import FiniteMap    ( FiniteMap, sizeFM, emptyFM, delFromFM,
                        )
 import Name            ( Name {-instance NamedThing-}, Provenance, OccName(..),
                          nameModule, moduleString, pprModule, isLocallyDefined,
-                         NameSet(..), emptyNameSet, unionNameSets, nameSetToList,
+                         NameSet, emptyNameSet, unionNameSets, nameSetToList,
                          minusNameSet, mkNameSet, elemNameSet, nameUnique, addOneToNameSet,
                          isWiredInName, maybeWiredInTyConName, maybeWiredInIdName,
                          NamedThing(..)
                         )
-import Id              ( GenId, Id(..), idType, dataConTyCon, isAlgCon )
+import Id              ( GenId, Id, idType, dataConTyCon, isAlgCon )
 import TyCon           ( TyCon, tyConDataCons, isSynTyCon, getSynTyConDefn )
 import Type            ( namesOfType )
 import TyVar           ( GenTyVar )

diff --git a/ghc/compiler/rename/RnNames.lhs b/ghc/compiler/rename/RnNames.lhs
index a45926d..549137a 100644 (file)
--- a/ghc/compiler/rename/RnNames.lhs
+++ b/ghc/compiler/rename/RnNames.lhs
@@ -19,7 +19,7 @@ import HsSyn  ( HsModule(..), ImportDecl(..), HsDecl(..),
                  FixityDecl(..),
                  collectTopBinders
                )
-import RdrHsSyn        ( RdrNameHsDecl(..), RdrName(..), RdrNameIE(..), RdrNameImportDecl,
+import RdrHsSyn        ( RdrNameHsDecl, RdrName(..), RdrNameIE, RdrNameImportDecl,
                  RdrNameHsModule, RdrNameFixityDecl,
                  rdrNameOcc, ieOcc
                )

diff --git a/ghc/compiler/simplStg/SimplStg.lhs b/ghc/compiler/simplStg/SimplStg.lhs
index e843a6f..fb626f3 100644 (file)
--- a/ghc/compiler/simplStg/SimplStg.lhs
+++ b/ghc/compiler/simplStg/SimplStg.lhs
@@ -12,7 +12,7 @@ import StgSyn
 
 import LambdaLift      ( liftProgram )
 import Name            ( isLocallyDefined )
-import UniqSet          ( UniqSet(..), mapUniqSet )
+import UniqSet          ( UniqSet, mapUniqSet )
 import CostCentre       ( CostCentre )
 import SCCfinal                ( stgMassageForProfiling )
 import StgLint         ( lintStgBindings )

diff --git a/ghc/compiler/typecheck/TcClassDcl.lhs b/ghc/compiler/typecheck/TcClassDcl.lhs
index 2482fe1..82c9212 100644 (file)
--- a/ghc/compiler/typecheck/TcClassDcl.lhs
+++ b/ghc/compiler/typecheck/TcClassDcl.lhs
@@ -15,9 +15,9 @@ import HsSyn          ( HsDecl(..), ClassDecl(..), Sig(..), MonoBinds(..),
                        )
 import HsPragmas       ( ClassPragmas(..) )
 import BasicTypes      ( NewOrData(..), TopLevelFlag(..), RecFlag(..) )
-import RnHsSyn         ( RenamedClassDecl(..), RenamedClassPragmas(..),
-                         RenamedClassOpSig(..), RenamedMonoBinds,
-                         RenamedContext(..), RenamedHsDecl, RenamedSig
+import RnHsSyn         ( RenamedClassDecl, RenamedClassPragmas,
+                         RenamedClassOpSig, RenamedMonoBinds,
+                         RenamedContext, RenamedHsDecl, RenamedSig
                        )
 import TcHsSyn         ( TcMonoBinds )
 

diff --git a/ghc/compiler/typecheck/TcDefaults.lhs b/ghc/compiler/typecheck/TcDefaults.lhs
index f6e337e..28046a1 100644 (file)
--- a/ghc/compiler/typecheck/TcDefaults.lhs
+++ b/ghc/compiler/typecheck/TcDefaults.lhs
@@ -9,7 +9,7 @@ module TcDefaults ( tcDefaults ) where
 #include "HsVersions.h"
 
 import HsSyn           ( HsDecl(..), DefaultDecl(..) )
-import RnHsSyn         ( RenamedHsDecl(..) )
+import RnHsSyn         ( RenamedHsDecl )
 
 import TcMonad
 import TcEnv           ( tcLookupClassByKey )

diff --git a/ghc/compiler/typecheck/TcDeriv.lhs b/ghc/compiler/typecheck/TcDeriv.lhs
index f83767c..6c45ca9 100644 (file)
--- a/ghc/compiler/typecheck/TcDeriv.lhs
+++ b/ghc/compiler/typecheck/TcDeriv.lhs
@@ -24,7 +24,7 @@ import TcSimplify     ( tcSimplifyThetas )
 
 import RnBinds         ( rnMethodBinds, rnTopMonoBinds )
 import RnEnv           ( newDfunName, bindLocatedLocalsRn )
-import RnMonad         ( RnM, RnDown, SDown, RnNameSupply(..), 
+import RnMonad         ( RnM, RnDown, SDown, RnNameSupply, 
                          renameSourceCode, thenRn, mapRn, returnRn )
 
 import Bag             ( Bag, emptyBag, unionBags, listToBag )

diff --git a/ghc/compiler/typecheck/TcIfaceSig.lhs b/ghc/compiler/typecheck/TcIfaceSig.lhs
index 14e4c9f..1646bfb 100644 (file)
--- a/ghc/compiler/typecheck/TcIfaceSig.lhs
+++ b/ghc/compiler/typecheck/TcIfaceSig.lhs
@@ -18,7 +18,7 @@ import TcEnv          ( tcExtendTyVarEnv, tcExtendGlobalValEnv, tcSetGlobalValEnv,
                        )
 import TcKind          ( TcKind, kindToTcKind )
 
-import RnHsSyn         ( RenamedHsDecl(..) )
+import RnHsSyn         ( RenamedHsDecl )
 import HsCore
 import HsDecls         ( HsIdInfo(..), HsStrictnessInfo(..) )
 import Literal         ( Literal(..) )

diff --git a/ghc/compiler/typecheck/TcInstUtil.lhs b/ghc/compiler/typecheck/TcInstUtil.lhs
index 51ce967..d84bf54 100644 (file)
--- a/ghc/compiler/typecheck/TcInstUtil.lhs
+++ b/ghc/compiler/typecheck/TcInstUtil.lhs
@@ -15,7 +15,7 @@ module TcInstUtil (
 
 #include "HsVersions.h"
 
-import RnHsSyn         ( RenamedMonoBinds, RenamedSig(..) )
+import RnHsSyn         ( RenamedMonoBinds, RenamedSig )
 
 import CmdLineOpts     ( opt_AllowOverlappingInstances )
 import TcMonad

diff --git a/ghc/compiler/typecheck/TcModule.lhs b/ghc/compiler/typecheck/TcModule.lhs
index 7ed38a5..c3767e1 100644 (file)
--- a/ghc/compiler/typecheck/TcModule.lhs
+++ b/ghc/compiler/typecheck/TcModule.lhs
@@ -35,7 +35,7 @@ import TcTyDecls      ( mkDataBinds )
 import TcType          ( TcType, tcInstType )
 import TcKind          ( TcKind, kindToTcKind )
 
-import RnMonad         ( RnNameSupply(..) )
+import RnMonad         ( RnNameSupply )
 import Bag             ( isEmptyBag )
 import ErrUtils                ( WarnMsg, ErrMsg, 
                          pprBagOfErrors, dumpIfSet

diff --git a/ghc/compiler/typecheck/TcMonoType.lhs b/ghc/compiler/typecheck/TcMonoType.lhs
index ed35d08..d20bb91 100644 (file)
--- a/ghc/compiler/typecheck/TcMonoType.lhs
+++ b/ghc/compiler/typecheck/TcMonoType.lhs
@@ -9,7 +9,7 @@ module TcMonoType ( tcHsType, tcHsTypeKind, tcContext, tcTyVarScope ) where
 #include "HsVersions.h"
 
 import HsSyn           ( HsType(..), HsTyVar(..), pprContext )
-import RnHsSyn         ( RenamedHsType(..), RenamedContext(..) )
+import RnHsSyn         ( RenamedHsType, RenamedContext )
 
 import TcMonad
 import TcEnv           ( tcLookupTyVar, tcLookupClass, tcLookupTyCon, tcExtendTyVarEnv )

diff --git a/ghc/compiler/typecheck/TcSimplify.lhs b/ghc/compiler/typecheck/TcSimplify.lhs
index 7c6e6e5..3f9a9de 100644 (file)
--- a/ghc/compiler/typecheck/TcSimplify.lhs
+++ b/ghc/compiler/typecheck/TcSimplify.lhs
@@ -136,7 +136,7 @@ import Inst         ( lookupInst, lookupSimpleInst, LookupInstResult(..),
                          newDictFromOld,
                          instLoc, getDictClassTys,
                          pprInst, zonkInst,
-                         Inst(..), LIE, pprInsts, pprInstsInFull, mkLIE, 
+                         Inst, LIE, pprInsts, pprInstsInFull, mkLIE, 
                          InstOrigin, pprOrigin
                        )
 import TcEnv           ( TcIdOcc(..) )

diff --git a/ghc/compiler/typecheck/TcTyClsDecls.lhs b/ghc/compiler/typecheck/TcTyClsDecls.lhs
index 7de928a..32c571e 100644 (file)
--- a/ghc/compiler/typecheck/TcTyClsDecls.lhs
+++ b/ghc/compiler/typecheck/TcTyClsDecls.lhs
@@ -16,7 +16,7 @@ import HsSyn          ( HsDecl(..), TyDecl(..), ClassDecl(..),
                          Sig(..),
                          hsDeclName
                        )
-import RnHsSyn         ( RenamedTyDecl(..), RenamedClassDecl(..), RenamedHsDecl )
+import RnHsSyn         ( RenamedTyDecl, RenamedClassDecl, RenamedHsDecl )
 import TcHsSyn         ( TcHsBinds )
 import BasicTypes      ( RecFlag(..) )
 

diff --git a/ghc/compiler/typecheck/TcTyDecls.lhs b/ghc/compiler/typecheck/TcTyDecls.lhs
index 0e83986..64ccfbb 100644 (file)
--- a/ghc/compiler/typecheck/TcTyDecls.lhs
+++ b/ghc/compiler/typecheck/TcTyDecls.lhs
@@ -17,7 +17,7 @@ import HsSyn          ( MonoBinds(..),
                          andMonoBinds
                        )
 import HsTypes         ( getTyVarName )
-import RnHsSyn         ( RenamedTyDecl(..), RenamedConDecl(..) )
+import RnHsSyn         ( RenamedTyDecl, RenamedConDecl )
 import TcHsSyn         ( mkHsTyLam, mkHsDictLam, tcIdType,
                          TcHsBinds, TcMonoBinds
                        )

diff --git a/ghc/compiler/typecheck/Unify.lhs b/ghc/compiler/typecheck/Unify.lhs
index 4e20000..276a110 100644 (file)
--- a/ghc/compiler/typecheck/Unify.lhs
+++ b/ghc/compiler/typecheck/Unify.lhs
@@ -19,7 +19,7 @@ import TcMonad
 import Type    ( GenType(..), Type, tyVarsOfType,
                  typeKind, mkFunTy, splitFunTy_maybe, splitTyConApp_maybe )
 import TyCon   ( TyCon, mkFunTyCon, isTupleTyCon, tyConArity, Arity )
-import TyVar   ( TyVar(..), GenTyVar(..), tyVarKind, tyVarFlexi,
+import TyVar   ( TyVar, GenTyVar(..), tyVarKind, tyVarFlexi,
                  TyVarEnv, lookupTyVarEnv, emptyTyVarEnv, addToTyVarEnv,
                  tyVarSetToList
                )