X-Git-Url: http://git.megacz.com/?p=ghc-hetmet.git;a=blobdiff_plain;f=compiler%2Ftypecheck%2FTcRnTypes.lhs;h=428392444c2bed39d595e73019f3adbfc4e1952c;hp=b7b8bd2168564cb7fd6a1985894daf64f57e3a34;hb=190f24892156953d73b55401d0467a6f1a88ce5d;hpb=e6d057711f4d6d6ff6342c39fa2b9e44d25447f1

diff --git a/compiler/typecheck/TcRnTypes.lhs b/compiler/typecheck/TcRnTypes.lhs
index b7b8bd2..4283924 100644
--- a/compiler/typecheck/TcRnTypes.lhs
+++ b/compiler/typecheck/TcRnTypes.lhs
@@ -43,18 +43,18 @@ module TcRnTypes(
 
 import HsSyn		( PendingSplice, HsOverLit, LRuleDecl, LForeignDecl,
 			  ArithSeqInfo, DictBinds, LHsBinds, LImportDecl, HsGroup,
-                          HsWrapper, IE )
+                          HsWrapper, IE, HsDoc, HaddockModInfo )
 import HscTypes		( FixityEnv,
 			  HscEnv, TypeEnv, TyThing, 
 			  GenAvailInfo(..), AvailInfo, HscSource(..),
 			  availName, IsBootInterface, Deprecations )
 import Packages		( PackageId )
 import Type		( Type, pprTyThingCategory )
-import TcType		( TcTyVarSet, TcType, TcThetaType, SkolemInfo, TvSubst,
+import TcType		( TcTyVarSet, TcType, TcThetaType, SkolemInfo, 
 			  TcPredType, TcKind, tcCmpPred, tcCmpType,
 			  tcCmpTypes, pprSkolInfo )
 import InstEnv		( Instance, InstEnv )
-import FamInstEnv	( FamInst, FamInstEnv )
+import FamInstEnv	( FamInstEnv )
 import IOEnv
 import RdrName		( GlobalRdrEnv, LocalRdrEnv )
 import Name		( Name )
@@ -67,7 +67,6 @@ import UniqFM
 import SrcLoc		( SrcSpan, SrcLoc, Located, srcSpanStart )
 import VarSet		( IdSet )
 import ErrUtils		( Messages, Message )
-import UniqFM           ( UniqFM )
 import UniqSupply	( UniqSupply )
 import BasicTypes	( IPName )
 import Util		( thenCmp )
@@ -228,7 +227,10 @@ data TcGblEnv
 	tcg_deprecs :: Deprecations,		-- ...Deprecations 
 	tcg_insts   :: [Instance],		-- ...Instances
 	tcg_rules   :: [LRuleDecl Id],		-- ...Rules
-	tcg_fords   :: [LForeignDecl Id]	-- ...Foreign import & exports
+	tcg_fords   :: [LForeignDecl Id],	-- ...Foreign import & exports
+
+	tcg_doc :: Maybe (HsDoc Name), -- Maybe Haddock documentation
+        tcg_hmi :: HaddockModInfo Name -- Haddock module information
     }
 \end{code}
 
@@ -800,6 +802,7 @@ data InstOrigin
   | RecordUpdOrigin
   | InstScOrigin	-- Typechecking superclasses of an instance declaration
   | DerivOrigin		-- Typechecking deriving
+  | StandAloneDerivOrigin -- Typechecking stand-alone deriving
   | DefaultOrigin	-- Typechecking a default decl
   | DoOrigin		-- Arising from a do expression
   | ProcOrigin		-- Arising from a proc expression
@@ -821,6 +824,7 @@ pprInstLoc (InstLoc orig locn _)
     pp_orig InstSigOrigin	 = ptext SLIT("instantiating a type signature")
     pp_orig InstScOrigin	 = ptext SLIT("the superclasses of an instance declaration")
     pp_orig DerivOrigin	 	 = ptext SLIT("the 'deriving' clause of a data type declaration")
+    pp_orig StandAloneDerivOrigin = ptext SLIT("a 'deriving' declaration")
     pp_orig DefaultOrigin	 = ptext SLIT("a 'default' declaration")
     pp_orig DoOrigin		 = ptext SLIT("a do statement")
     pp_orig ProcOrigin		 = ptext SLIT("a proc expression")