X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=compiler%2Ftypecheck%2FTcExpr.lhs;h=d6099816bf03709193dcda649464740d28f45677;hb=909d2dd885f5eebaf7c12cf15d5ac153d646566e;hp=bda4e2facf7c1f3e5826598f123a8d941b8ecd3a;hpb=15cb792d18b1094e98c035dca6ecec5dad516056;p=ghc-hetmet.git diff --git a/compiler/typecheck/TcExpr.lhs b/compiler/typecheck/TcExpr.lhs index bda4e2f..d609981 100644 --- 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 ) -import Id ( Id ) +import Id ( Id, idName ) 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 - 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