import qualified Language.Haskell.THSyntax as Meta
import HscTypes ( HscEnv(..), GhciMode(..), PersistentCompilerState(..), unQualInScope )
-import HsSyn ( HsBracket(..) )
+import HsSyn ( HsBracket(..), HsExpr(..) )
import Convert ( convertToHsExpr, convertToHsDecls )
import RnExpr ( rnExpr )
import RdrHsSyn ( RdrNameHsExpr, RdrNameHsDecl )
import RnHsSyn ( RenamedHsExpr )
-import TcExpr ( tcMonoExpr )
+import TcExpr ( tcCheckRho, tcMonoExpr )
import TcHsSyn ( TcExpr, TypecheckedHsExpr, mkHsLet, zonkTopExpr )
-import TcSimplify ( tcSimplifyTop )
+import TcSimplify ( tcSimplifyTop, tcSimplifyBracket )
+import TcUnify ( Expected, unifyTauTy, zapExpectedTo, zapExpectedType )
import TcType ( TcType, openTypeKind, mkAppTy )
-import TcEnv ( spliceOK, tcMetaTy, tcWithTempInstEnv )
+import TcEnv ( spliceOK, tcMetaTy, tcWithTempInstEnv, bracketOK )
import TcRnTypes ( TopEnv(..) )
-import TcMType ( newTyVarTy, zapToType )
+import TcMType ( newTyVarTy, UserTypeCtxt(ExprSigCtxt) )
+import TcMonoType ( tcHsSigType )
import Name ( Name )
import TcRnMonad
import TysWiredIn ( mkListTy )
-import DsMeta ( exprTyConName, declTyConName, decTyConName, qTyConName )
+import DsMeta ( expQTyConName, decQTyConName, typQTyConName, decTyConName, qTyConName )
import ErrUtils (Message)
import Outputable
import Panic ( showException )
tcSpliceExpr :: Name
-> RenamedHsExpr
- -> TcType
+ -> Expected TcType
-> TcM TcExpr
#ifndef GHCI
%************************************************************************
\begin{code}
-tcBracket :: HsBracket Name -> TcM TcType
-tcBracket brack
+tcBracket :: HsBracket Name -> Expected TcType -> TcM TcExpr
+tcBracket brack res_ty
= getStage `thenM` \ level ->
case bracketOK level of {
Nothing -> failWithTc (illegalBracket level) ;
) `thenM` \ (meta_ty, lie) ->
tcSimplifyBracket lie `thenM_`
- unifyTauTy res_ty meta_ty `thenM_`
+ -- Make the expected type have the right shape
+ zapExpectedTo res_ty meta_ty `thenM_`
-- Return the original expression, not the type-decorated one
readMutVar pending_splices `thenM` \ pendings ->
returnM (HsBracketOut brack pendings)
}
+tc_bracket :: HsBracket Name -> TcM TcType
tc_bracket (ExpBr expr)
- = newTyVarTy openTypeKind `thenM` \ any_ty ->
- tcMonoExpr expr any_ty `thenM_`
- tcMetaTy exprTyConName
+ = newTyVarTy openTypeKind `thenM` \ any_ty ->
+ tcCheckRho expr any_ty `thenM_`
+ tcMetaTy expQTyConName
-- Result type is Expr (= Q Exp)
+tc_bracket (TypBr typ)
+ = tcHsSigType ExprSigCtxt typ `thenM_`
+ tcMetaTy typQTyConName
+ -- Result type is Type (= Q Typ)
+
tc_bracket (DecBr decls)
= tcWithTempInstEnv (tcTopSrcDecls decls) `thenM_`
-- Typecheck the declarations, dicarding any side effects
-- Here (h 4) :: Q Exp
-- but $(h 4) :: forall a.a i.e. anything!
- zapToType res_ty `thenM_`
- tcMetaTy exprTyConName `thenM` \ meta_exp_ty ->
+ zapExpectedType res_ty `thenM_`
+ tcMetaTy expQTyConName `thenM` \ meta_exp_ty ->
setStage (Splice next_level) (
setLIEVar lie_var $
- tcMonoExpr expr meta_exp_ty
+ tcCheckRho expr meta_exp_ty
) `thenM` \ expr' ->
-- Write the pending splice into the bucket
-- inner escape before dealing with the outer one
tcTopSplice expr res_ty
- = tcMetaTy exprTyConName `thenM` \ meta_exp_ty ->
+ = tcMetaTy expQTyConName `thenM` \ meta_exp_ty ->
-- Typecheck the expression
tcTopSpliceExpr expr meta_exp_ty `thenM` \ zonked_q_expr ->
setStage topSpliceStage $
-- Typecheck the expression
- getLIE (tcMonoExpr expr meta_ty) `thenM` \ (expr', lie) ->
+ getLIE (tcCheckRho expr meta_ty) `thenM` \ (expr', lie) ->
-- Solve the constraints
tcSimplifyTop lie `thenM` \ const_binds ->