X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=ghc%2Fcompiler%2Ftypecheck%2FTcMatches.lhs;h=bd223b46de55025e55a72fcac0d8043c966ca4be;hb=1553c7788e7f663bfc55813158325d695a21a229;hp=eaaf80ca6edb7b20e82b6cc18f0912f00a44ee57;hpb=a8d3e136e9bb989fde0ec655d291d3d2e7036fff;p=ghc-hetmet.git diff --git a/ghc/compiler/typecheck/TcMatches.lhs b/ghc/compiler/typecheck/TcMatches.lhs index eaaf80c..bd223b4 100644 --- a/ghc/compiler/typecheck/TcMatches.lhs +++ b/ghc/compiler/typecheck/TcMatches.lhs @@ -10,37 +10,38 @@ module TcMatches ( tcMatchesFun, tcMatchesCase, tcMatchLambda, #include "HsVersions.h" -import {-# SOURCE #-} TcExpr( tcExpr ) +import {-# SOURCE #-} TcExpr( tcMonoExpr ) import HsSyn ( HsBinds(..), Match(..), GRHSs(..), GRHS(..), MonoBinds(..), Stmt(..), HsMatchContext(..), HsDoContext(..), pprMatch, getMatchLoc, pprMatchContext, isDoExpr, mkMonoBind, nullMonoBinds, collectSigTysFromPats ) -import RnHsSyn ( RenamedMatch, RenamedGRHSs, RenamedStmt, RenamedPat, RenamedHsType, - RenamedMatchContext, extractHsTyVars ) +import RnHsSyn ( RenamedMatch, RenamedGRHSs, RenamedStmt, RenamedPat, RenamedMatchContext ) import TcHsSyn ( TcMatch, TcGRHSs, TcStmt, TcDictBinds, TypecheckedPat ) import TcMonad -import TcMonoType ( kcHsSigTypes, tcScopedTyVars, checkSigTyVars, tcHsSigType, UserTypeCtxt(..), sigPatCtxt ) +import TcMonoType ( tcAddScopedTyVars, tcHsSigType, UserTypeCtxt(..) ) import Inst ( LIE, isEmptyLIE, plusLIE, emptyLIE, plusLIEs, lieToList ) -import TcEnv ( TcId, tcLookupLocalIds, tcExtendLocalValEnv, tcExtendGlobalTyVars, - tcInLocalScope ) -import TcPat ( tcPat, tcMonoPatBndr, polyPatSig ) -import TcMType ( newTyVarTy, unifyFunTy, unifyTauTy ) -import TcType ( tyVarsOfType, isTauTy, mkFunTy, isOverloadedTy, - liftedTypeKind, openTypeKind ) +import TcEnv ( TcId, tcLookupLocalIds, tcExtendLocalValEnv2 ) +import TcPat ( tcPat, tcMonoPatBndr ) +import TcMType ( newTyVarTy, zonkTcType ) +import TcType ( TcType, TcTyVar, tyVarsOfType, tidyOpenTypes, tidyOpenType, + mkFunTy, isOverloadedTy, liftedTypeKind, openTypeKind ) import TcBinds ( tcBindsAndThen ) +import TcUnify ( subFunTy, checkSigTyVarsWrt, tcSub, isIdCoercion, (<$>) ) import TcSimplify ( tcSimplifyCheck, bindInstsOfLocalFuns ) import Name ( Name ) import TysWiredIn ( boolTy ) import Id ( idType ) +import CoreFVs ( idFreeTyVars ) import BasicTypes ( RecFlag(..) ) -import NameSet import VarSet import Var ( Id ) import Bag +import Util ( isSingleton ) import Outputable + import List ( nub ) \end{code} @@ -78,7 +79,7 @@ tcMatchesFun xve fun_name expected_ty matches@(first_match:_) -- because inconsistency between branches -- may show up as something wrong with the (non-existent) type signature - -- No need to zonk expected_ty, because unifyFunTy does that on the fly + -- No need to zonk expected_ty, because subFunTy does that on the fly tcMatches xve (FunRhs fun_name) matches expected_ty \end{code} @@ -109,11 +110,11 @@ tcMatches :: [(Name,Id)] -> TcType -> TcM ([TcMatch], LIE) -tcMatches xve fun_or_case matches expected_ty +tcMatches xve ctxt matches expected_ty = mapAndUnzipTc tc_match matches `thenTc` \ (matches, lies) -> returnTc (matches, plusLIEs lies) where - tc_match match = tcMatch xve fun_or_case match expected_ty + tc_match match = tcMatch xve ctxt match expected_ty \end{code} @@ -127,50 +128,55 @@ tcMatches xve fun_or_case matches expected_ty tcMatch :: [(Name,Id)] -> RenamedMatchContext -> RenamedMatch - -> TcType -- Expected result-type of the Match. - -- Early unification with this guy gives better error messages + -> TcType -- Expected result-type of the Match. + -- Early unification with this guy gives better error messages + -- We regard the Match as having type + -- (ty1 -> ... -> tyn -> result_ty) + -- where there are n patterns. -> TcM (TcMatch, LIE) -tcMatch xve1 ctxt match@(Match sig_tvs pats maybe_rhs_sig grhss) expected_ty +tcMatch xve1 ctxt match@(Match pats maybe_rhs_sig grhss) expected_ty = tcAddSrcLoc (getMatchLoc match) $ -- At one stage I removed this; tcAddErrCtxt (matchCtxt ctxt match) $ -- I'm not sure why, so I put it back tcMatchPats pats expected_ty tc_grhss `thenTc` \ ((pats', grhss'), lie, ex_binds) -> - returnTc (Match [] pats' Nothing (glue_on Recursive ex_binds grhss'), lie) + returnTc (Match pats' Nothing (glue_on Recursive ex_binds grhss'), lie) where tc_grhss pats' rhs_ty - = -- Check that the remaining "expected type" is not a rank-2 type - -- If it is it'll mess up the unifier when checking the RHS - checkTc (isTauTy rhs_ty) lurkingRank2SigErr `thenTc_` + = tcExtendLocalValEnv2 xve1 $ -- Deal with the result signature - tc_result_sig maybe_rhs_sig ( - - -- Typecheck the body - tcExtendLocalValEnv xve1 $ - tcGRHSs ctxt grhss rhs_ty `thenTc` \ (grhss', lie) -> - returnTc ((pats', grhss'), lie) - ) - - tc_result_sig Nothing thing_inside - = thing_inside - tc_result_sig (Just sig) thing_inside - = tcAddScopedTyVars [sig] $ - tcHsSigType ResSigCtxt sig `thenTc` \ sig_ty -> - - -- Check that the signature isn't a polymorphic one, which - -- we don't permit (at present, anyway) - checkTc (isTauTy sig_ty) (polyPatSig sig_ty) `thenTc_` - unifyTauTy expected_ty sig_ty `thenTc_` - thing_inside - - - -- glue_on just avoids stupid dross + case maybe_rhs_sig of + Nothing -> tcGRHSs ctxt grhss rhs_ty `thenTc` \ (grhss', lie) -> + returnTc ((pats', grhss'), lie) + + Just sig -> tcAddScopedTyVars [sig] $ + -- Bring into scope the type variables in the signature + tcHsSigType ResSigCtxt sig `thenTc` \ sig_ty -> + tcGRHSs ctxt grhss sig_ty `thenTc` \ (grhss', lie1) -> + tcSub rhs_ty sig_ty `thenTc` \ (co_fn, lie2) -> + returnTc ((pats', lift_grhss co_fn rhs_ty grhss'), + lie1 `plusLIE` lie2) + +-- lift_grhss pushes the coercion down to the right hand sides, +-- because there is no convenient place to hang it otherwise. +lift_grhss co_fn rhs_ty grhss + | isIdCoercion co_fn = grhss +lift_grhss co_fn rhs_ty (GRHSs grhss binds ty) + = GRHSs (map lift_grhs grhss) binds rhs_ty -- Change the type, since we + where + lift_grhs (GRHS stmts loc) = GRHS (map lift_stmt stmts) loc + + lift_stmt (ResultStmt e l) = ResultStmt (co_fn <$> e) l + lift_stmt stmt = stmt + +-- glue_on just avoids stupid dross glue_on _ EmptyMonoBinds grhss = grhss -- The common case glue_on is_rec mbinds (GRHSs grhss binds ty) = GRHSs grhss (mkMonoBind mbinds [] is_rec `ThenBinds` binds) ty + tcGRHSs :: RenamedMatchContext -> RenamedGRHSs -> TcType -> TcM (TcGRHSs, LIE) @@ -217,10 +223,10 @@ tcMatchPats pats expected_ty thing_inside xve = bagToList pat_bndrs pat_ids = map snd xve in - tcExtendLocalValEnv xve (thing_inside pats' rhs_ty) `thenTc` \ (result, lie_req2) -> + tcExtendLocalValEnv2 xve (thing_inside pats' rhs_ty) `thenTc` \ (result, lie_req2) -> - returnTc (rhs_ty, lie_req1, ex_tvs, pat_ids, lie_avail, result, lie_req2) - ) `thenTc` \ (rhs_ty, lie_req1, ex_tvs, pat_ids, lie_avail, result, lie_req2) -> + returnTc (lie_req1, ex_tvs, pat_ids, lie_avail, result, lie_req2) + ) `thenTc` \ (lie_req1, ex_tvs, pat_ids, lie_avail, result, lie_req2) -> -- STEP 4: Check for existentially bound type variables -- Do this *outside* the scope of the tcAddScopedTyVars, else checkSigTyVars @@ -229,38 +235,22 @@ tcMatchPats pats expected_ty thing_inside -- I'm a bit concerned that lie_req1 from an 'inner' pattern in the list -- might need (via lie_req2) something made available from an 'outer' -- pattern. But it's inconvenient to deal with, and I can't find an example - tcCheckExistentialPat pat_ids ex_tvs lie_avail lie_req2 rhs_ty `thenTc` \ (lie_req2', ex_binds) -> + tcCheckExistentialPat pat_ids ex_tvs lie_avail lie_req2 expected_ty `thenTc` \ (lie_req2', ex_binds) -> + -- NB: we *must* pass "expected_ty" not "result_ty" to tcCheckExistentialPat + -- For example, we must reject this program: + -- data C = forall a. C (a -> Int) + -- f (C g) x = g x + -- Here, result_ty will be simply Int, but expected_ty is (a -> Int). returnTc (result, lie_req1 `plusLIE` lie_req2', ex_binds) -tcAddScopedTyVars :: [RenamedHsType] -> TcM a -> TcM a --- Find the not-already-in-scope signature type variables, --- kind-check them, and bring them into scope --- --- We no longer specify that these type variables must be univerally --- quantified (lots of email on the subject). If you want to put that --- back in, you need to --- a) Do a checkSigTyVars after thing_inside --- b) More insidiously, don't pass in expected_ty, else --- we unify with it too early and checkSigTyVars barfs --- Instead you have to pass in a fresh ty var, and unify --- it with expected_ty afterwards -tcAddScopedTyVars sig_tys thing_inside - = tcGetEnv `thenNF_Tc` \ env -> - let - all_sig_tvs = foldr (unionNameSets . extractHsTyVars) emptyNameSet sig_tys - sig_tvs = filter not_in_scope (nameSetToList all_sig_tvs) - not_in_scope tv = not (tcInLocalScope env tv) - in - tcScopedTyVars sig_tvs (kcHsSigTypes sig_tys) thing_inside - tcCheckExistentialPat :: [TcId] -- Ids bound by this pattern -> Bag TcTyVar -- Existentially quantified tyvars bound by pattern -> LIE -- and context -> LIE -- Required context - -> TcType -- and result type; vars in here must not escape + -> TcType -- and type of the Match; vars in here must not escape -> TcM (LIE, TcDictBinds) -- LIE to float out and dict bindings -tcCheckExistentialPat ids ex_tvs lie_avail lie_req result_ty +tcCheckExistentialPat ids ex_tvs lie_avail lie_req match_ty | isEmptyBag ex_tvs && all not_overloaded ids -- Short cut for case when there are no existentials -- and no polymorphic overloaded variables @@ -271,8 +261,7 @@ tcCheckExistentialPat ids ex_tvs lie_avail lie_req result_ty returnTc (lie_req, EmptyMonoBinds) | otherwise - = tcExtendGlobalTyVars (tyVarsOfType result_ty) $ - tcAddErrCtxtM (sigPatCtxt tv_list ids) $ + = tcAddErrCtxtM (sigPatCtxt tv_list ids match_ty) $ -- In case there are any polymorpic, overloaded binders in the pattern -- (which can happen in the case of rank-2 type signatures, or data constructors @@ -281,7 +270,7 @@ tcCheckExistentialPat ids ex_tvs lie_avail lie_req result_ty -- Deal with overloaded functions bound by the pattern tcSimplifyCheck doc tv_list (lieToList lie_avail) lie1 `thenTc` \ (lie2, dict_binds) -> - checkSigTyVars tv_list emptyVarSet `thenTc_` + checkSigTyVarsWrt (tyVarsOfType match_ty) tv_list `thenTc_` returnTc (lie2, dict_binds `AndMonoBinds` inst_binds) where @@ -293,7 +282,10 @@ tc_match_pats [] expected_ty = returnTc (expected_ty, [], emptyLIE, emptyBag, emptyBag, emptyLIE) tc_match_pats (pat:pats) expected_ty - = unifyFunTy expected_ty `thenTc` \ (arg_ty, rest_ty) -> + = subFunTy expected_ty `thenTc` \ (arg_ty, rest_ty) -> + -- This is the unique place we call subFunTy + -- The point is that if expected_y is a "hole", we want + -- to make arg_ty and rest_ty as "holes" too. tcPat tcMonoPatBndr pat arg_ty `thenTc` \ (pat', lie_req, pat_tvs, pat_ids, lie_avail) -> tc_match_pats pats rest_ty `thenTc` \ (rhs_ty, pats', lie_reqs, pats_tvs, pats_ids, lie_avails) -> returnTc ( rhs_ty, @@ -366,7 +358,7 @@ tcStmtAndThen combine do_or_lc m_ty@(m,elt_ty) stmt@(BindStmt pat exp src_loc) t = tcAddSrcLoc src_loc $ tcAddErrCtxt (stmtCtxt do_or_lc stmt) $ newTyVarTy liftedTypeKind `thenNF_Tc` \ pat_ty -> - tcExpr exp (m pat_ty) `thenTc` \ (exp', exp_lie) -> + tcMonoExpr exp (m pat_ty) `thenTc` \ (exp', exp_lie) -> tcMatchPats [pat] (mkFunTy pat_ty (m elt_ty)) (\ [pat'] _ -> tcPopErrCtxt $ thing_inside `thenTc` \ (thing, lie) -> @@ -403,10 +395,10 @@ tcStmtAndThen combine do_or_lc m_ty@(m, res_elt_ty) stmt@(ExprStmt exp _ locn) t = tcSetErrCtxt (stmtCtxt do_or_lc stmt) ( if isDoExpr do_or_lc then newTyVarTy openTypeKind `thenNF_Tc` \ any_ty -> - tcExpr exp (m any_ty) `thenNF_Tc` \ (exp', lie) -> + tcMonoExpr exp (m any_ty) `thenNF_Tc` \ (exp', lie) -> returnTc (ExprStmt exp' any_ty locn, lie) else - tcExpr exp boolTy `thenNF_Tc` \ (exp', lie) -> + tcMonoExpr exp boolTy `thenNF_Tc` \ (exp', lie) -> returnTc (ExprStmt exp' boolTy locn, lie) ) `thenTc` \ (stmt', stmt_lie) -> @@ -419,9 +411,9 @@ tcStmtAndThen combine do_or_lc m_ty@(m, res_elt_ty) stmt@(ExprStmt exp _ locn) t tcStmtAndThen combine do_or_lc m_ty@(m, res_elt_ty) stmt@(ResultStmt exp locn) thing_inside = tcSetErrCtxt (stmtCtxt do_or_lc stmt) ( if isDoExpr do_or_lc then - tcExpr exp (m res_elt_ty) + tcMonoExpr exp (m res_elt_ty) else - tcExpr exp res_elt_ty + tcMonoExpr exp res_elt_ty ) `thenTc` \ (exp', stmt_lie) -> thing_inside `thenTc` \ (thing, stmts_lie) -> @@ -448,19 +440,33 @@ number of args are used in each equation. \begin{code} sameNoOfArgs :: [RenamedMatch] -> Bool -sameNoOfArgs matches = length (nub (map args_in_match matches)) == 1 +sameNoOfArgs matches = isSingleton (nub (map args_in_match matches)) where args_in_match :: RenamedMatch -> Int - args_in_match (Match _ pats _ _) = length pats + args_in_match (Match pats _ _) = length pats \end{code} \begin{code} +varyingArgsErr name matches + = sep [ptext SLIT("Varying number of arguments for function"), quotes (ppr name)] + matchCtxt ctxt match = hang (pprMatchContext ctxt <> colon) 4 (pprMatch ctxt match) stmtCtxt do_or_lc stmt = hang (pprMatchContext do_or_lc <> colon) 4 (ppr stmt) -varyingArgsErr name matches - = sep [ptext SLIT("Varying number of arguments for function"), quotes (ppr name)] +sigPatCtxt bound_tvs bound_ids match_ty tidy_env + = zonkTcType match_ty `thenNF_Tc` \ match_ty' -> + let + (env1, tidy_tys) = tidyOpenTypes tidy_env (map idType show_ids) + (env2, tidy_mty) = tidyOpenType env1 match_ty' + in + returnNF_Tc (env1, + sep [ptext SLIT("When checking an existential match that binds"), + nest 4 (vcat (zipWith ppr_id show_ids tidy_tys)), + ptext SLIT("and whose type is") <+> ppr tidy_mty]) + where + show_ids = filter is_interesting bound_ids + is_interesting id = any (`elemVarSet` idFreeTyVars id) bound_tvs -lurkingRank2SigErr - = ptext SLIT("Too few explicit arguments when defining a function with a rank-2 type") + ppr_id id ty = ppr id <+> dcolon <+> ppr ty + -- Don't zonk the types so we get the separate, un-unified versions \end{code}