X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;ds=sidebyside;f=ghc%2Fcompiler%2Ftypecheck%2FTcRnMonad.lhs;h=a4032cd16a591babab2a43b7d46fdaa06b0f442b;hb=958924a2b338aebbcc8a88ba2cab511517762a19;hp=d1d85287959cbd3e168d40a6f19edb19cdc771b0;hpb=47d253ba58b8b7bbbdd2ad21b6aa7ab78f7aef53;p=ghc-hetmet.git diff --git a/ghc/compiler/typecheck/TcRnMonad.lhs b/ghc/compiler/typecheck/TcRnMonad.lhs index d1d8528..a4032cd 100644 --- a/ghc/compiler/typecheck/TcRnMonad.lhs +++ b/ghc/compiler/typecheck/TcRnMonad.lhs @@ -41,7 +41,7 @@ import UniqSupply ( UniqSupply, mkSplitUniqSupply, uniqFromSupply, splitUniqSupp import Unique ( Unique ) import DynFlags ( DynFlags(..), DynFlag(..), dopt, dopt_set, GhcMode ) import StaticFlags ( opt_PprStyle_Debug ) -import Bag ( snocBag, unionBags, unitBag ) +import Bag ( snocBag, unionBags ) import Panic ( showException ) import IO ( stderr ) @@ -448,14 +448,12 @@ addErrAt loc msg = addLongErrAt loc msg empty addLongErrAt :: SrcSpan -> Message -> Message -> TcRn () addLongErrAt loc msg extra - = do { errs_var <- getErrsVar ; + = do { traceTc (ptext SLIT("Adding error:") <+> (mkLocMessage loc (msg $$ extra))) ; + + errs_var <- getErrsVar ; rdr_env <- getGlobalRdrEnv ; let { err = mkLongErrMsg loc (unQualInScope rdr_env) msg extra } ; (warns, errs) <- readMutVar errs_var ; - - let style = mkErrStyle (unQualInScope rdr_env) - doc = mkLocMessage loc (msg $$ extra) - in traceTc (ptext SLIT("Adding error:") <+> doc) ; writeMutVar errs_var (warns, errs `snocBag` err) } addErrs :: [(SrcSpan,Message)] -> TcRn ()