[commit: ghc] master: Refactor TcSplice.tcBracket a bit (db53b5a)

[git at git.haskell.org]

Repository : ssh://git@git.haskell.org/ghc

On branch  : master
Link       : http://ghc.haskell.org/trac/ghc/changeset/db53b5aae4818facba6b73f5b03a3e389c3ce5d5/ghc

>---------------------------------------------------------------

commit db53b5aae4818facba6b73f5b03a3e389c3ce5d5
Author: Simon Peyton Jones <simonpj at microsoft.com>
Date:   Fri Nov 22 09:41:02 2013 +0000

    Refactor TcSplice.tcBracket a bit
    
    The way that untyped brackets are typechecked is still grotesquely
    indirect, but I'll sort that out in a subsequent patch


>---------------------------------------------------------------

db53b5aae4818facba6b73f5b03a3e389c3ce5d5
 compiler/typecheck/TcSplice.lhs |   30 ++++++++++++++----------------
 1 file changed, 14 insertions(+), 16 deletions(-)

diff --git a/compiler/typecheck/TcSplice.lhs b/compiler/typecheck/TcSplice.lhs
index 285a449..29fae0e 100644
--- a/compiler/typecheck/TcSplice.lhs
+++ b/compiler/typecheck/TcSplice.lhs
@@ -331,32 +331,21 @@ tcBracket brack ps res_ty
          tc_bracket brack ps_ref
        }
   where
-    tcUntypedBracket :: HsBracket Name -> TcM TcType
-    tcUntypedBracket (VarBr _ _) = -- Result type is Var (not Q-monadic)
-                                   tcMetaTy nameTyConName
-    tcUntypedBracket (ExpBr _)   = -- Result type is ExpQ (= Q Exp)
-                                   tcMetaTy expQTyConName
-    tcUntypedBracket (TypBr _)   = -- Result type is Type (= Q Typ)
-                                   tcMetaTy typeQTyConName
-    tcUntypedBracket (DecBrG _)  = -- Result type is Q [Dec]
-                                   tcMetaTy decsQTyConName 
-    tcUntypedBracket (PatBr _)   = -- Result type is PatQ (= Q Pat)
-                                   tcMetaTy patQTyConName
-    tcUntypedBracket (DecBrL _)  = panic "tcUntypedBracket: Unexpected DecBrL"
-    tcUntypedBracket (TExpBr _)  = panic "tcUntypedBracket: Unexpected TExpBr"
-
     tc_bracket :: HsBracket Name -> TcRef [PendingSplice] -> TcM (HsExpr TcId)
     tc_bracket brack ps_ref
       | not (isTypedBracket brack)
-      = do { mapM_ tcPendingSplice ps
+      = do { traceTc "tc_bracked untyped" (ppr brack $$ ppr ps)
+           ; mapM_ tcPendingSplice ps
            ; meta_ty <- tcUntypedBracket brack
            ; ps' <- readMutVar ps_ref
            ; co <- unifyType meta_ty res_ty
+           ; traceTc "tc_bracked done untyped" (ppr meta_ty)
            ; return (mkHsWrapCo co (HsBracketOut brack ps'))
            }
 
     tc_bracket (TExpBr expr) ps_ref
-      = do { any_ty <- newFlexiTyVarTy openTypeKind
+      = do { traceTc "tc_bracked typed" (ppr brack)
+           ; any_ty <- newFlexiTyVarTy openTypeKind
              -- NC for no context; tcBracket does that
            ; _ <- tcMonoExprNC expr any_ty
            ; meta_ty <- tcTExpTy any_ty
@@ -369,6 +358,15 @@ tcBracket brack ps res_ty
     tc_bracket _ _
       = panic "tc_bracket: Expected untyped splice"
 
+tcUntypedBracket :: HsBracket Name -> TcM TcType
+tcUntypedBracket (VarBr _ _) = tcMetaTy nameTyConName  -- Result type is Var (not Q-monadic)
+tcUntypedBracket (ExpBr _)   = tcMetaTy expQTyConName  -- Result type is ExpQ (= Q Exp)
+tcUntypedBracket (TypBr _)   = tcMetaTy typeQTyConName -- Result type is Type (= Q Typ)
+tcUntypedBracket (DecBrG _)  = tcMetaTy decsQTyConName -- Result type is Q [Dec]
+tcUntypedBracket (PatBr _)   = tcMetaTy patQTyConName  -- Result type is PatQ (= Q Pat)
+tcUntypedBracket (DecBrL _)  = panic "tcUntypedBracket: Unexpected DecBrL"
+tcUntypedBracket (TExpBr _)  = panic "tcUntypedBracket: Unexpected TExpBr"
+
 tcPendingSplice :: PendingSplice -> TcM ()
 tcPendingSplice (PendingRnExpSplice n expr) 
   = do { res_ty <- newFlexiTyVarTy openTypeKind