projects
/
ghc-hetmet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Adjust code from manual merges
[ghc-hetmet.git]
/
compiler
/
typecheck
/
TcExpr.lhs
diff --git
a/compiler/typecheck/TcExpr.lhs
b/compiler/typecheck/TcExpr.lhs
index
d609981
..
d68e8b0
100644
(file)
--- a/
compiler/typecheck/TcExpr.lhs
+++ b/
compiler/typecheck/TcExpr.lhs
@@
-772,8
+772,8
@@
instFun orig fun subst []
= return fun -- Common short cut
instFun orig fun subst tv_theta_prs
= return fun -- Common short cut
instFun orig fun subst tv_theta_prs
- = do {-- !!!SPJ: -- Horrid check for tagToEnum; see Note [tagToEnum#]
- -- !!!SPJ: checkBadTagToEnumCall fun_id qtv_tys
+ = do { -- !!!SPJ: -- Horrid check for tagToEnum; see Note [tagToEnum#]
+ -- !!!SPJ: checkBadTagToEnumCall fun_id qtv_tys
; let ty_theta_prs' = map subst_pr tv_theta_prs
; let ty_theta_prs' = map subst_pr tv_theta_prs