projects
/
ghc-hetmet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Extended TyCon and friends to represent family declarations
[ghc-hetmet.git]
/
compiler
/
typecheck
/
TcExpr.lhs
diff --git
a/compiler/typecheck/TcExpr.lhs
b/compiler/typecheck/TcExpr.lhs
index
bda4e2f
..
d609981
100644
(file)
--- a/
compiler/typecheck/TcExpr.lhs
+++ b/
compiler/typecheck/TcExpr.lhs
@@
-12,7
+12,7
@@
module TcExpr ( tcPolyExpr, tcPolyExprNC,
#ifdef GHCI /* Only if bootstrapped */
import {-# SOURCE #-} TcSplice( tcSpliceExpr, tcBracket )
import HsSyn ( nlHsVar )
#ifdef GHCI /* Only if bootstrapped */
import {-# SOURCE #-} TcSplice( tcSpliceExpr, tcBracket )
import HsSyn ( nlHsVar )
-import Id ( Id )
+import Id ( Id, idName )
import Name ( isExternalName )
import TcType ( isTauTy )
import TcEnv ( checkWellStaged )
import Name ( isExternalName )
import TcType ( isTauTy )
import TcEnv ( checkWellStaged )
@@
-965,16
+965,10
@@
thLocalId orig id id_ty th_bind_lvl
; case use_stage of
Brack use_lvl ps_var lie_var | use_lvl > th_bind_lvl
-> thBrackId orig id ps_var lie_var
; case use_stage of
Brack use_lvl ps_var lie_var | use_lvl > th_bind_lvl
-> thBrackId orig id ps_var lie_var
- other -> checkWellStaged (quotes (ppr id)) th_bind_lvl use_stage
+ other -> do { checkWellStaged (quotes (ppr id)) th_bind_lvl use_stage
+ ; return id }
}
}
-thLocalId orig id_name id th_bind_lvl (Brack use_lvl ps_var lie_var)
- | use_lvl > th_bind_lvl
- = thBrackId
-thLocalId orig id_name id th_bind_lvl use_stage
- = do { checkWellStaged
- ; return id }
-
--------------------------------------
thBrackId orig id ps_var lie_var
| isExternalName id_name
--------------------------------------
thBrackId orig id ps_var lie_var
| isExternalName id_name