projects
/
ghc-hetmet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
only comments, spacing, alpha-renaming
[ghc-hetmet.git]
/
compiler
/
typecheck
/
FamInst.lhs
diff --git
a/compiler/typecheck/FamInst.lhs
b/compiler/typecheck/FamInst.lhs
index
9a34943
..
f85f6b9
100644
(file)
--- a/
compiler/typecheck/FamInst.lhs
+++ b/
compiler/typecheck/FamInst.lhs
@@
-65,6
+65,7
@@
instance Ord ModulePair where
--
type ModulePairSet = FiniteMap ModulePair ()
--
type ModulePairSet = FiniteMap ModulePair ()
+listToSet :: [ModulePair] -> ModulePairSet
listToSet l = listToFM (zip l (repeat ()))
checkFamInstConsistency :: [Module] -> [Module] -> TcM ()
listToSet l = listToFM (zip l (repeat ()))
checkFamInstConsistency :: [Module] -> [Module] -> TcM ()
@@
-179,7
+180,7
@@
checkForConflicts inst_envs famInst
; let { matches = lookupFamInstEnvUnify inst_envs fam tys'
; conflicts = [ conflictingFamInst
; let { matches = lookupFamInstEnvUnify inst_envs fam tys'
; conflicts = [ conflictingFamInst
- | match@(_, conflictingFamInst) <- matches
+ | match@(conflictingFamInst, _) <- matches
, conflicting fam tys' tycon match
]
}
, conflicting fam tys' tycon match
]
}