X-Git-Url: http://git.megacz.com/?p=ghc-hetmet.git;a=blobdiff_plain;f=compiler%2Ftypecheck%2FTcHsType.lhs;h=3a8326fee9450f74c3946a0fdefb1022da0361e1;hp=08f4f7f718d8e4d9bb8a63cb07087413b77b372d;hb=9319fbaf14f420cbbd9e670093cc86c5f04b7800;hpb=30c122df62ec75f9ed7f392f24c2925675bf1d06 diff --git a/compiler/typecheck/TcHsType.lhs b/compiler/typecheck/TcHsType.lhs index 08f4f7f..3a8326f 100644 --- a/compiler/typecheck/TcHsType.lhs +++ b/compiler/typecheck/TcHsType.lhs @@ -5,13 +5,6 @@ \section[TcMonoType]{Typechecking user-specified @MonoTypes@} \begin{code} -{-# OPTIONS -w #-} --- The above warning supression flag is a temporary kludge. --- While working on this module you are encouraged to remove it and fix --- any warnings in the module. See --- http://hackage.haskell.org/trac/ghc/wiki/Commentary/CodingStyle#Warnings --- for details - module TcHsType ( tcHsSigType, tcHsDeriv, tcHsInstHead, tcHsQuantifiedType, @@ -173,13 +166,15 @@ tcHsQuantifiedType tv_names hs_ty ; return (tvs, ty) } } -- Used for the deriving(...) items -tcHsDeriv :: LHsType Name -> TcM ([TyVar], Class, [Type]) -tcHsDeriv = addLocM (tc_hs_deriv []) +tcHsDeriv :: HsType Name -> TcM ([TyVar], Class, [Type]) +tcHsDeriv = tc_hs_deriv [] +tc_hs_deriv :: [LHsTyVarBndr Name] -> HsType Name + -> TcM ([TyVar], Class, [Type]) tc_hs_deriv tv_names (HsPredTy (HsClassP cls_name hs_tys)) = kcHsTyVars tv_names $ \ tv_names' -> do { cls_kind <- kcClass cls_name - ; (tys, res_kind) <- kcApps cls_kind (ppr cls_name) hs_tys + ; (tys, _res_kind) <- kcApps cls_kind (ppr cls_name) hs_tys ; tcTyVarBndrs tv_names' $ \ tyvars -> do { arg_tys <- dsHsTypes tys ; cls <- tcLookupClass cls_name @@ -192,7 +187,7 @@ tc_hs_deriv tv_names1 (HsForAllTy _ tv_names2 (L _ []) (L _ ty)) tc_hs_deriv (tv_names1 ++ tv_names2) ty tc_hs_deriv _ other - = failWithTc (ptext SLIT("Illegal deriving item") <+> ppr other) + = failWithTc (ptext (sLit "Illegal deriving item") <+> ppr other) \end{code} These functions are used during knot-tying in @@ -214,8 +209,8 @@ tcHsKindedType hs_ty = dsHsType hs_ty tcHsBangType :: LHsType Name -> TcM Type -- Permit a bang, but discard it -tcHsBangType (L span (HsBangTy b ty)) = tcHsKindedType ty -tcHsBangType ty = tcHsKindedType ty +tcHsBangType (L _ (HsBangTy _ ty)) = tcHsKindedType ty +tcHsBangType ty = tcHsKindedType ty tcHsKindedContext :: LHsContext Name -> TcM ThetaType -- Used when we are expecting a ClassContext (i.e. no implicit params) @@ -260,7 +255,7 @@ kcCheckHsType (L span ty) exp_kind ; return (L span ty') } where -- Wrap a context around only if we want to show that contexts. - add_ctxt (HsPredTy p) thing = thing + add_ctxt (HsPredTy _) thing = thing -- Omit invisble ones and ones user's won't grok (HsPred p). add_ctxt (HsForAllTy _ _ (L _ []) _) thing = thing -- Omit wrapping if the theta-part is empty @@ -294,6 +289,7 @@ kcHsType ty = wrapLocFstM kc_hs_type ty -- -- The translated type has explicitly-kinded type-variable binders +kc_hs_type :: HsType Name -> TcM (HsType Name, TcKind) kc_hs_type (HsParTy ty) = do (ty', kind) <- kcHsType ty return (HsParTy ty', kind) @@ -330,12 +326,12 @@ kc_hs_type (HsFunTy ty1 ty2) = do ty2' <- kcTypeType ty2 return (HsFunTy ty1' ty2', liftedTypeKind) -kc_hs_type ty@(HsOpTy ty1 op ty2) = do +kc_hs_type (HsOpTy ty1 op ty2) = do op_kind <- addLocM kcTyVar op ([ty1',ty2'], res_kind) <- kcApps op_kind (ppr op) [ty1,ty2] return (HsOpTy ty1' op ty2', res_kind) -kc_hs_type ty@(HsAppTy ty1 ty2) = do +kc_hs_type (HsAppTy ty1 ty2) = do (fun_ty', fun_kind) <- kcHsType fun_ty ((arg_ty':arg_tys'), res_kind) <- kcApps fun_kind (ppr fun_ty) arg_tys return (foldl mk_app (HsAppTy fun_ty' arg_ty') arg_tys', res_kind) @@ -347,7 +343,7 @@ kc_hs_type ty@(HsAppTy ty1 ty2) = do -- the application; they are -- never used -kc_hs_type ty@(HsPredTy (HsEqualP _ _)) +kc_hs_type (HsPredTy (HsEqualP _ _)) = wrongEqualityErr kc_hs_type (HsPredTy pred) = do @@ -374,7 +370,7 @@ kc_hs_type (HsBangTy b ty) = do return (HsBangTy b ty', kind) kc_hs_type ty@(HsSpliceTy _) - = failWithTc (ptext SLIT("Unexpected type splice:") <+> ppr ty) + = failWithTc (ptext (sLit "Unexpected type splice:") <+> ppr ty) -- remove the doc nodes here, no need to worry about the location since -- its the same for a doc node and it's child type node @@ -400,8 +396,8 @@ kcApps fun_kind ppr_fun args = do kc_arg arg arg_kind = kcCheckHsType arg arg_kind - too_many_args = ptext SLIT("Kind error:") <+> quotes ppr_fun <+> - ptext SLIT("is applied to too many type arguments") + too_many_args = ptext (sLit "Kind error:") <+> quotes ppr_fun <+> + ptext (sLit "is applied to too many type arguments") --------------------------- kcHsContext :: LHsContext Name -> TcM (LHsContext Name) @@ -420,16 +416,16 @@ kcHsPred pred = do -- Checks that the result is of kind liftedType kc_pred :: HsPred Name -> TcM (HsPred Name, TcKind) -- Does *not* check for a saturated -- application (reason: used from TcDeriv) -kc_pred pred@(HsIParam name ty) +kc_pred (HsIParam name ty) = do { (ty', kind) <- kcHsType ty ; return (HsIParam name ty', kind) } -kc_pred pred@(HsClassP cls tys) +kc_pred (HsClassP cls tys) = do { kind <- kcClass cls ; (tys', res_kind) <- kcApps kind (ppr cls) tys ; return (HsClassP cls tys', res_kind) } -kc_pred pred@(HsEqualP ty1 ty2) +kc_pred (HsEqualP ty1 ty2) = do { (ty1', kind1) <- kcHsType ty1 -- ; checkExpectedKind ty1 kind1 liftedTypeKind ; (ty2', kind2) <- kcHsType ty2 @@ -448,7 +444,7 @@ kcTyVar name = do -- Could be a tyvar or a tycon ATyVar _ ty -> return (typeKind ty) AThing kind -> return kind AGlobal (ATyCon tc) -> return (tyConKind tc) - other -> wrongThingErr "type" thing name + _ -> wrongThingErr "type" thing name kcClass :: Name -> TcM TcKind kcClass cls = do -- Must be a class @@ -456,7 +452,7 @@ kcClass cls = do -- Must be a class case thing of AThing kind -> return kind AGlobal (AClass cls) -> return (tyConKind (classTyCon cls)) - other -> wrongThingErr "class" thing cls + _ -> wrongThingErr "class" thing cls \end{code} @@ -481,16 +477,17 @@ dsHsType :: LHsType Name -> TcM Type -- All HsTyVarBndrs in the intput type are kind-annotated dsHsType ty = ds_type (unLoc ty) -ds_type ty@(HsTyVar name) +ds_type :: HsType Name -> TcM Type +ds_type ty@(HsTyVar _) = ds_app ty [] ds_type (HsParTy ty) -- Remove the parentheses markers = dsHsType ty ds_type ty@(HsBangTy _ _) -- No bangs should be here - = failWithTc (ptext SLIT("Unexpected strictness annotation:") <+> ppr ty) + = failWithTc (ptext (sLit "Unexpected strictness annotation:") <+> ppr ty) -ds_type (HsKindSig ty k) +ds_type (HsKindSig ty _) = dsHsType ty -- Kind checking done already ds_type (HsListTy ty) = do @@ -532,7 +529,7 @@ ds_type (HsPredTy pred) = do pred' <- dsHsPred pred return (mkPredTy pred') -ds_type full_ty@(HsForAllTy exp tv_names ctxt ty) +ds_type (HsForAllTy _ tv_names ctxt ty) = tcTyVarBndrs tv_names $ \ tyvars -> do theta <- mapM dsHsLPred (unLoc ctxt) tau <- dsHsType ty @@ -543,6 +540,7 @@ ds_type (HsSpliceTy {}) = panic "ds_type: HsSpliceTy" ds_type (HsDocTy ty _) -- Remove the doc comment = dsHsType ty +dsHsTypes :: [LHsType Name] -> TcM [Type] dsHsTypes arg_tys = mapM dsHsType arg_tys \end{code} @@ -558,16 +556,16 @@ ds_app ty tys = do arg_tys <- dsHsTypes tys case ty of HsTyVar fun -> ds_var_app fun arg_tys - other -> do fun_ty <- ds_type ty + _ -> do fun_ty <- ds_type ty return (mkAppTys fun_ty arg_tys) ds_var_app :: Name -> [Type] -> TcM Type ds_var_app name arg_tys = do thing <- tcLookup name case thing of - ATyVar _ ty -> return (mkAppTys ty arg_tys) + ATyVar _ ty -> return (mkAppTys ty arg_tys) AGlobal (ATyCon tc) -> return (mkTyConApp tc arg_tys) - other -> wrongThingErr "type" thing name + _ -> wrongThingErr "type" thing name \end{code} @@ -578,12 +576,13 @@ Contexts dsHsLPred :: LHsPred Name -> TcM PredType dsHsLPred pred = dsHsPred (unLoc pred) -dsHsPred pred@(HsClassP class_name tys) +dsHsPred :: HsPred Name -> TcM PredType +dsHsPred (HsClassP class_name tys) = do { arg_tys <- dsHsTypes tys ; clas <- tcLookupClass class_name ; return (ClassP clas arg_tys) } -dsHsPred pred@(HsEqualP ty1 ty2) +dsHsPred (HsEqualP ty1 ty2) = do { arg_ty1 <- dsHsType ty1 ; arg_ty2 <- dsHsType ty2 ; return (EqPred arg_ty1 arg_ty2) @@ -606,23 +605,25 @@ tcLHsConResTy (L span res_ty) ; thing <- tcLookup tc_name ; case thing of AGlobal (ATyCon tc) -> return (tc, args') - other -> failWithTc (badGadtDecl res_ty) } - other -> failWithTc (badGadtDecl res_ty) + _ -> failWithTc (badGadtDecl res_ty) } + _ -> failWithTc (badGadtDecl res_ty) where -- We can't call dsHsType on res_ty, and then do tcSplitTyConApp_maybe -- because that causes a black hole, and for good reason. Building -- the type means expanding type synonyms, and we can't do that -- inside the "knot". So we have to work by steam. - get_args (HsAppTy (L _ fun) arg) args = get_args fun (arg:args) - get_args (HsParTy (L _ ty)) args = get_args ty args - get_args (HsOpTy ty1 (L span tc) ty2) args = (HsTyVar tc, ty1:ty2:args) - get_args ty args = (ty, args) + get_args (HsAppTy (L _ fun) arg) args = get_args fun (arg:args) + get_args (HsParTy (L _ ty)) args = get_args ty args + get_args (HsOpTy ty1 (L _ tc) ty2) args = (HsTyVar tc, ty1:ty2:args) + get_args ty args = (ty, args) +badGadtDecl :: HsType Name -> SDoc badGadtDecl ty - = hang (ptext SLIT("Malformed constructor result type:")) + = hang (ptext (sLit "Malformed constructor result type:")) 2 (ppr ty) -typeCtxt ty = ptext SLIT("In the type") <+> quotes (ppr ty) +typeCtxt :: HsType Name -> SDoc +typeCtxt ty = ptext (sLit "In the type") <+> quotes (ppr ty) \end{code} %************************************************************************ @@ -658,7 +659,7 @@ tcTyVarBndrs bndrs thing_inside = do where zonk (KindedTyVar name kind) = do { kind' <- zonkTcKindToKind kind ; return (mkTyVar name kind') } - zonk (UserTyVar name) = WARN( True, ptext SLIT("Un-kinded tyvar") <+> ppr name ) + zonk (UserTyVar name) = WARN( True, ptext (sLit "Un-kinded tyvar") <+> ppr name ) return (mkTyVar name liftedTypeKind) ----------------------------------- @@ -688,7 +689,7 @@ tcDataKindSig (Just kind) badKindSig :: Kind -> SDoc badKindSig kind - = hang (ptext SLIT("Kind signature on data type declaration has non-* return kind")) + = hang (ptext (sLit "Kind signature on data type declaration has non-* return kind")) 2 (ppr kind) \end{code} @@ -782,7 +783,7 @@ tcPatSig ctxt sig res_ty -- So we just have an ASSERT here ; let in_pat_bind = case ctxt of BindPatSigCtxt -> True - other -> False + _ -> False ; ASSERT( not in_pat_bind || null sig_tvs ) return () -- Check that pat_ty is rigid @@ -807,7 +808,7 @@ tcPatSig ctxt sig res_ty ; return (res_ty, tv_binds) } } where - check in_scope [] = return () + check _ [] = return () check in_scope ((n,ty):rest) = do { check_one in_scope n ty ; check ((n,ty):in_scope) rest } @@ -833,32 +834,35 @@ tcPatSig ctxt sig res_ty \begin{code} pprHsSigCtxt :: UserTypeCtxt -> LHsType Name -> SDoc -pprHsSigCtxt ctxt hs_ty = vcat [ ptext SLIT("In") <+> pprUserTypeCtxt ctxt <> colon, +pprHsSigCtxt ctxt hs_ty = vcat [ ptext (sLit "In") <+> pprUserTypeCtxt ctxt <> colon, nest 2 (pp_sig ctxt) ] where pp_sig (FunSigCtxt n) = pp_n_colon n pp_sig (ConArgCtxt n) = pp_n_colon n pp_sig (ForSigCtxt n) = pp_n_colon n - pp_sig other = ppr (unLoc hs_ty) + pp_sig _ = ppr (unLoc hs_ty) pp_n_colon n = ppr n <+> dcolon <+> ppr (unLoc hs_ty) - +wobblyPatSig :: [Var] -> SDoc wobblyPatSig sig_tvs - = hang (ptext SLIT("A pattern type signature cannot bind scoped type variables") + = hang (ptext (sLit "A pattern type signature cannot bind scoped type variables") <+> pprQuotedList sig_tvs) - 2 (ptext SLIT("unless the pattern has a rigid type context")) + 2 (ptext (sLit "unless the pattern has a rigid type context")) +scopedNonVar :: Name -> Type -> SDoc scopedNonVar n ty - = vcat [sep [ptext SLIT("The scoped type variable") <+> quotes (ppr n), - nest 2 (ptext SLIT("is bound to the type") <+> quotes (ppr ty))], - nest 2 (ptext SLIT("You can only bind scoped type variables to type variables"))] + = vcat [sep [ptext (sLit "The scoped type variable") <+> quotes (ppr n), + nest 2 (ptext (sLit "is bound to the type") <+> quotes (ppr ty))], + nest 2 (ptext (sLit "You can only bind scoped type variables to type variables"))] -dupInScope n n' ty - = hang (ptext SLIT("The scoped type variables") <+> quotes (ppr n) <+> ptext SLIT("and") <+> quotes (ppr n')) - 2 (vcat [ptext SLIT("are bound to the same type (variable)"), - ptext SLIT("Distinct scoped type variables must be distinct")]) +dupInScope :: Name -> Name -> Type -> SDoc +dupInScope n n' _ + = hang (ptext (sLit "The scoped type variables") <+> quotes (ppr n) <+> ptext (sLit "and") <+> quotes (ppr n')) + 2 (vcat [ptext (sLit "are bound to the same type (variable)"), + ptext (sLit "Distinct scoped type variables must be distinct")]) +wrongEqualityErr :: TcM (HsType Name, TcKind) wrongEqualityErr = failWithTc (text "Equality predicate used as a type") \end{code}