X-Git-Url: http://git.megacz.com/?p=ghc-hetmet.git;a=blobdiff_plain;f=compiler%2Ftypecheck%2FTcRnTypes.lhs;h=c48cd8b75f0029f45e0f7d4c260f70d22e9c269e;hp=3d9bb60e4998bb1eab419e63558b1a4b2f866c9d;hb=9bcd95bad83ee937c178970e8b729732e680fe1e;hpb=c4ec8f2a77894af1c6160c4e8ad5625ab62f0bea

diff --git a/compiler/typecheck/TcRnTypes.lhs b/compiler/typecheck/TcRnTypes.lhs
index 3d9bb60..c48cd8b 100644
--- a/compiler/typecheck/TcRnTypes.lhs
+++ b/compiler/typecheck/TcRnTypes.lhs
@@ -13,7 +13,7 @@ module TcRnTypes(
 	IfGblEnv(..), IfLclEnv(..), 
 
 	-- Ranamer types
-	ErrCtxt, RecFieldEnv,
+	ErrCtxt, RecFieldEnv(..),
 	ImportAvails(..), emptyImportAvails, plusImportAvails, 
 	WhereFrom(..), mkModDeps,
 
@@ -21,7 +21,7 @@ module TcRnTypes(
 	TcTyThing(..), pprTcTyThingCategory, RefinementVisibility(..),
 
 	-- Template Haskell
-	ThStage(..), topStage, topSpliceStage,
+	ThStage(..), topStage, topAnnStage, topSpliceStage,
 	ThLevel, impLevel, topLevel,
 
 	-- Arrows
@@ -45,6 +45,7 @@ import HscTypes
 import Type
 import Coercion
 import TcType
+import Annotations
 import InstEnv
 import FamInstEnv
 import IOEnv
@@ -208,11 +209,6 @@ data TcGblEnv
 		-- The binds, rules and foreign-decl fiels are collected
 		-- initially in un-zonked form and are finally zonked in tcRnSrcDecls
 
-		-- The next fields accumulate the payload of the
-		-- module The binds, rules and foreign-decl fiels are
-		-- collected initially in un-zonked form and are
-		-- finally zonked in tcRnSrcDecls
-
         tcg_rn_imports :: Maybe [LImportDecl Name],
         tcg_rn_exports :: Maybe [Located (IE Name)],
 	tcg_rn_decls :: Maybe (HsGroup Name),	-- renamed decls, maybe
@@ -220,6 +216,7 @@ data TcGblEnv
 
 	tcg_binds     :: LHsBinds Id,	    -- Value bindings in this module
 	tcg_warns     :: Warnings,	    -- ...Warnings and deprecations
+	tcg_anns      :: [Annotation],      -- ...Annotations
 	tcg_insts     :: [Instance],	    -- ...Instances
 	tcg_fam_insts :: [FamInst],	    -- ...Family instances
 	tcg_rules     :: [LRuleDecl Id],    -- ...Rules
@@ -230,11 +227,16 @@ data TcGblEnv
         tcg_hpc :: AnyHpcUsage -- True if any part of the prog uses hpc instrumentation.
     }
 
-type RecFieldEnv = NameEnv [Name]	-- Maps a constructor name *in this module*
-					-- to the fields for that constructor
+data RecFieldEnv 
+  = RecFields (NameEnv [Name])	-- Maps a constructor name *in this module*
+				-- to the fields for that constructor
+	      NameSet		-- Set of all fields declared *in this module*;
+				-- used to suppress name-shadowing complaints
+				-- when using record wild cards
+				-- E.g.  let fld = e in C {..}
 	-- This is used when dealing with ".." notation in record 
 	-- construction and pattern matching.
-	-- The FieldEnv deals *only* with constructors defined in *thie*
+	-- The FieldEnv deals *only* with constructors defined in *this*
 	-- module.  For imported modules, we get the same info from the
 	-- TypeEnv
 \end{code}
@@ -373,13 +375,14 @@ impLevel = 0	-- Imported things; they can be used inside a top level splice
 
 
 data ThStage
-  = Comp   				-- Ordinary compiling, at level topLevel
+  = Comp   ThLevel			-- Ordinary compiling, usually at level topLevel but annotations use a lower level
   | Splice ThLevel 			-- Inside a splice
   | Brack  ThLevel 			-- Inside brackets; 
 	   (TcRef [PendingSplice])	--   accumulate pending splices here
 	   (TcRef LIE)			--   and type constraints here
-topStage, topSpliceStage :: ThStage
-topStage       = Comp
+topStage, topAnnStage, topSpliceStage :: ThStage
+topStage       = Comp topLevel
+topAnnStage    = Comp (topLevel - 1)
 topSpliceStage = Splice (topLevel - 1)	-- Stage for the body of a top-level splice
 
 ---------------------------
@@ -638,7 +641,7 @@ I am not convinced that this duplication is necessary or useful! -=chak
 data Inst
   = Dict {
 	tci_name :: Name,
-	tci_pred :: TcPredType,
+	tci_pred :: TcPredType,	  -- Class or implicit parameter only
 	tci_loc  :: InstLoc 
     }
 
@@ -890,6 +893,7 @@ data InstOrigin
   | ProcOrigin		-- Arising from a proc expression
   | ImplicOrigin SDoc	-- An implication constraint
   | EqOrigin		-- A type equality
+  | AnnOrigin           -- An annotation
 
 instance Outputable InstOrigin where
     ppr (OccurrenceOf name)   = hsep [ptext (sLit "a use of"), quotes (ppr name)]
@@ -914,4 +918,5 @@ instance Outputable InstOrigin where
     ppr (SigOrigin info)      = pprSkolInfo info
     ppr EqOrigin	      = ptext (sLit "a type equality")
     ppr InstSigOrigin         = panic "ppr InstSigOrigin"
+    ppr AnnOrigin             = ptext (sLit "an annotation")
 \end{code}