X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=ghc%2Fcompiler%2Frename%2FRnUtils.lhs;h=f2d3f059762fa3b5eadee72a9438fb796ebde64d;hb=f0e42a460a3bb4857f3c4bfa92dd134fcf409849;hp=f79e7c47a4804ea9c8e94fbb3aa0fdaeb2bc7708;hpb=f9120c200bcf613b58d742802172fb4c08171f0d;p=ghc-hetmet.git diff --git a/ghc/compiler/rename/RnUtils.lhs b/ghc/compiler/rename/RnUtils.lhs index f79e7c4..f2d3f05 100644 --- a/ghc/compiler/rename/RnUtils.lhs +++ b/ghc/compiler/rename/RnUtils.lhs @@ -30,8 +30,7 @@ import ErrUtils ( addShortErrLocLine, addErrLoc ) import FiniteMap ( FiniteMap, emptyFM, isEmptyFM, lookupFM, addListToFM, addToFM ) import Maybes ( maybeToBool ) -import Name ( RdrName(..), isQual ) -import Outputable ( pprNonOp, getLocalName ) +import Name ( RdrName(..), isQual, pprNonOp, getLocalName ) import PprStyle ( PprStyle(..) ) import Pretty import RnHsSyn ( RnName ) @@ -87,7 +86,7 @@ emptyRnEnv extendGlobalRnEnv ((qual, unqual, tc_qual, tc_unqual), stack) val_list tc_list = ASSERT(isEmptyFM stack) - (((qual', unqual', tc_qual, tc_unqual), stack), tc_dups `unionBags` dups) + (((qual', unqual', tc_qual', tc_unqual'), stack), tc_dups `unionBags` dups) where (qual', unqual', dups) = extend_global qual unqual val_list (tc_qual', tc_unqual', tc_dups) = extend_global tc_qual tc_unqual tc_list