X-Git-Url: http://git.megacz.com/?p=ghc-hetmet.git;a=blobdiff_plain;f=compiler%2Ftypecheck%2FTcRnTypes.lhs;h=fd7e954b743a07fdc91e34b473ae24fb023e4f39;hp=19432fa98853d766b1b2e5f26621abffbfd3f7fa;hb=aa0c0de94e25aa64139688f8e4c4ba51ddca6f54;hpb=b752fe11fcff303a5ced0bbf67066941597b28af

diff --git a/compiler/typecheck/TcRnTypes.lhs b/compiler/typecheck/TcRnTypes.lhs
index 19432fa..fd7e954 100644
--- a/compiler/typecheck/TcRnTypes.lhs
+++ b/compiler/typecheck/TcRnTypes.lhs
@@ -333,7 +333,7 @@ data TcLclEnv		-- Changes as we move inside an expression
 			-- Discarded after typecheck/rename; not passed on to desugarer
   = TcLclEnv {
 	tcl_loc  :: SrcSpan,		-- Source span
-	tcl_ctxt :: ErrCtxt,		-- Error context
+	tcl_ctxt :: [ErrCtxt],		-- Error context, innermost on top
 	tcl_errs :: TcRef Messages,	-- Place to accumulate errors
 
 	tcl_th_ctxt    :: ThStage,	      -- Template Haskell context
@@ -516,10 +516,13 @@ instance Outputable RefinementVisibility where
 \end{code}
 
 \begin{code}
-type ErrCtxt = [TidyEnv -> TcM (TidyEnv, Message)]	
-			-- Innermost first.  Monadic so that we have a chance
-			-- to deal with bound type variables just before error
-			-- message construction
+type ErrCtxt = (Bool, TidyEnv -> TcM (TidyEnv, Message))
+	-- Monadic so that we have a chance
+	-- to deal with bound type variables just before error
+	-- message construction
+
+	-- Bool:  True <=> this is a landmark context; do not
+	--		   discard it when trimming for display
 \end{code}
 
 
@@ -876,7 +879,7 @@ functions that deal with it.
 
 \begin{code}
 -------------------------------------------
-data InstLoc = InstLoc InstOrigin SrcSpan ErrCtxt
+data InstLoc = InstLoc InstOrigin SrcSpan [ErrCtxt]
 
 instLoc :: Inst -> InstLoc
 instLoc inst = tci_loc inst