projects
/
ghc-hetmet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[project @ 1996-04-10 16:55:54 by partain]
[ghc-hetmet.git]
/
ghc
/
compiler
/
rename
/
RnUtils.lhs
diff --git
a/ghc/compiler/rename/RnUtils.lhs
b/ghc/compiler/rename/RnUtils.lhs
index
f79e7c4
..
f2d3f05
100644
(file)
--- 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 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 )
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)
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
where
(qual', unqual', dups) = extend_global qual unqual val_list
(tc_qual', tc_unqual', tc_dups) = extend_global tc_qual tc_unqual tc_list