X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=ghc%2Fcompiler%2Ftypecheck%2FTcExpr.lhs;h=649722118fda8357cd4e9fd2fe198cecab09ab2d;hb=77a8c0dbd5c5ad90fe483cb9ddc2b6ef36d3f4d8;hp=aae7a2489605fedf8ff79675ddc1871ac6e2e30c;hpb=3160f854580e6d8df412c8cd34d93bae27175d67;p=ghc-hetmet.git diff --git a/ghc/compiler/typecheck/TcExpr.lhs b/ghc/compiler/typecheck/TcExpr.lhs index aae7a24..6497221 100644 --- a/ghc/compiler/typecheck/TcExpr.lhs +++ b/ghc/compiler/typecheck/TcExpr.lhs @@ -4,76 +4,85 @@ \section[TcExpr]{Typecheck an expression} \begin{code} -module TcExpr ( tcExpr, tcPolyExpr, tcId ) where +module TcExpr ( tcApp, tcExpr, tcPolyExpr, tcId ) where #include "HsVersions.h" import HsSyn ( HsExpr(..), HsLit(..), ArithSeqInfo(..), - HsBinds(..), Stmt(..), StmtCtxt(..) + HsBinds(..), MonoBinds(..), Stmt(..), StmtCtxt(..), + mkMonoBind, nullMonoBinds ) import RnHsSyn ( RenamedHsExpr, RenamedRecordBinds ) -import TcHsSyn ( TcExpr, TcRecordBinds, - mkHsTyApp, maybeBoxedPrimType +import TcHsSyn ( TcExpr, TcRecordBinds, mkHsConApp, + mkHsTyApp, mkHsLet ) import TcMonad import BasicTypes ( RecFlag(..) ) import Inst ( Inst, InstOrigin(..), OverloadedLit(..), - LIE, emptyLIE, unitLIE, plusLIE, plusLIEs, newOverloadedLit, - newMethod, newMethodWithGivenTy, newDicts, instToId ) + LIE, emptyLIE, unitLIE, consLIE, plusLIE, plusLIEs, + lieToList, listToLIE, + newOverloadedLit, newMethod, newIPDict, + instOverloadedFun, newDicts, newClassDicts, + getIPsOfLIE, instToId, ipToId + ) import TcBinds ( tcBindsAndThen ) import TcEnv ( tcInstId, tcLookupValue, tcLookupClassByKey, tcLookupValueByKey, tcExtendGlobalTyVars, tcLookupValueMaybe, - tcLookupTyCon, tcLookupDataCon + tcLookupTyConByKey, tcLookupDataCon ) import TcMatches ( tcMatchesCase, tcMatchLambda, tcStmts ) -import TcMonoType ( tcHsType, checkSigTyVars, sigCtxt ) +import TcMonoType ( tcHsSigType, checkSigTyVars, sigCtxt ) import TcPat ( badFieldCon ) -import TcSimplify ( tcSimplifyAndCheck ) +import TcSimplify ( tcSimplify, tcSimplifyAndCheck, partitionPredsOfLIE ) +import TcImprove ( tcImprove ) import TcType ( TcType, TcTauType, tcInstTyVars, tcInstTcType, tcSplitRhoTy, - newTyVarTy, newTyVarTy_OpenKind, zonkTcType ) + newTyVarTy, newTyVarTys, zonkTcType ) -import Class ( Class ) -import FieldLabel ( FieldLabel, fieldLabelName, fieldLabelType ) -import Id ( idType, recordSelectorFieldLabel, - isRecordSelector, - Id +import FieldLabel ( FieldLabel, fieldLabelName, fieldLabelType, fieldLabelTyCon ) +import Id ( idType, recordSelectorFieldLabel, isRecordSelector, + Id, mkVanillaId + ) +import DataCon ( dataConFieldLabels, dataConSig, + dataConStrictMarks, StrictnessMark(..) ) -import DataCon ( dataConFieldLabels, dataConSig, dataConId ) -import Name ( Name ) +import Name ( Name, getName ) import Type ( mkFunTy, mkAppTy, mkTyVarTy, mkTyVarTys, - splitFunTy_maybe, splitFunTys, - mkTyConApp, - splitForAllTys, splitRhoTy, + ipName_maybe, + splitFunTy_maybe, splitFunTys, isNotUsgTy, + mkTyConApp, splitSigmaTy, + splitRhoTy, isTauTy, tyVarsOfType, tyVarsOfTypes, - isForAllTy, splitAlgTyConApp, splitAlgTyConApp_maybe, - boxedTypeKind, mkArrowKind, - substTopTheta, tidyOpenType + isSigmaTy, splitAlgTyConApp, splitAlgTyConApp_maybe, + boxedTypeKind, openTypeKind, mkArrowKind, + tidyOpenType ) -import VarEnv ( zipVarEnv ) -import VarSet ( elemVarSet, mkVarSet ) +import TyCon ( TyCon, tyConTyVars ) +import Subst ( mkTopTyVarSubst, substClasses, substTy ) +import UsageSPUtils ( unannotTy ) +import VarSet ( emptyVarSet, unionVarSet, elemVarSet, mkVarSet ) import TyCon ( tyConDataCons ) import TysPrim ( intPrimTy, charPrimTy, doublePrimTy, floatPrimTy, addrPrimTy ) import TysWiredIn ( boolTy, charTy, stringTy ) -import PrelInfo ( ioTyCon_NAME ) -import TcUnify ( unifyTauTy, unifyFunTy, unifyListTy, unifyTupleTy, - unifyUnboxedTupleTy ) +import TcUnify ( unifyTauTy, unifyFunTy, unifyListTy, unifyTupleTy ) import Unique ( cCallableClassKey, cReturnableClassKey, enumFromClassOpKey, enumFromThenClassOpKey, enumFromToClassOpKey, enumFromThenToClassOpKey, - thenMClassOpKey, failMClassOpKey, returnMClassOpKey + thenMClassOpKey, failMClassOpKey, returnMClassOpKey, ioTyConKey ) import Outputable -import Maybes ( maybeToBool ) +import Maybes ( maybeToBool, mapMaybe ) import ListSetOps ( minusList ) import Util +import CmdLineOpts ( opt_WarnMissingFields ) + \end{code} %************************************************************************ @@ -87,12 +96,12 @@ tcExpr :: RenamedHsExpr -- Expession to type check -> TcType -- Expected type (could be a polytpye) -> TcM s (TcExpr, LIE) -tcExpr expr ty | isForAllTy ty = -- Polymorphic case - tcPolyExpr expr ty `thenTc` \ (expr', lie, _, _, _) -> +tcExpr expr ty | isSigmaTy ty = -- Polymorphic case + tcPolyExpr expr ty `thenTc` \ (expr', lie, _, _, _) -> returnTc (expr', lie) - | otherwise = -- Monomorphic case - tcMonoExpr expr ty + | otherwise = -- Monomorphic case + tcMonoExpr expr ty \end{code} @@ -119,6 +128,7 @@ tcPolyExpr arg expected_arg_ty tcInstTcType expected_arg_ty `thenNF_Tc` \ (sig_tyvars, sig_rho) -> let (sig_theta, sig_tau) = splitRhoTy sig_rho + free_tyvars = tyVarsOfType expected_arg_ty in -- Type-check the arg and unify with expected type tcMonoExpr arg sig_tau `thenTc` \ (arg', lie_arg) -> @@ -134,15 +144,16 @@ tcPolyExpr arg expected_arg_ty -- Conclusion: include the free vars of the expected arg type in the -- list of "free vars" for the signature check. - tcExtendGlobalTyVars (tyVarsOfType expected_arg_ty) $ - tcAddErrCtxtM (sigCtxt sig_msg expected_arg_ty) $ + tcExtendGlobalTyVars free_tyvars $ + tcAddErrCtxtM (sigCtxt sig_msg sig_tyvars sig_theta sig_tau) $ - checkSigTyVars sig_tyvars `thenTc` \ zonked_sig_tyvars -> + checkSigTyVars sig_tyvars free_tyvars `thenTc` \ zonked_sig_tyvars -> newDicts SignatureOrigin sig_theta `thenNF_Tc` \ (sig_dicts, dict_ids) -> + tcImprove (sig_dicts `plusLIE` lie_arg) `thenTc_` -- ToDo: better origin tcSimplifyAndCheck - (text "tcPolyExpr") + (text "the type signature of an expression") (mkVarSet zonked_sig_tyvars) sig_dicts lie_arg `thenTc` \ (free_insts, inst_binds) -> @@ -152,13 +163,13 @@ tcPolyExpr arg expected_arg_ty -- a couple of new names which seems worse. generalised_arg = TyLam zonked_sig_tyvars $ DictLam dict_ids $ - HsLet (MonoBind inst_binds [] Recursive) + mkHsLet inst_binds $ arg' in returnTc ( generalised_arg, free_insts, arg', sig_tau, lie_arg ) where - sig_msg ty = ptext SLIT("In an expression with expected type:") <+> ppr ty + sig_msg = ptext SLIT("When checking an expression type signature") \end{code} %************************************************************************ @@ -169,7 +180,7 @@ tcPolyExpr arg expected_arg_ty \begin{code} tcMonoExpr :: RenamedHsExpr -- Expession to type check - -> TcTauType -- Expected type (could be a type variable) + -> TcTauType -- Expected type (could be a type variable) -> TcM s (TcExpr, LIE) tcMonoExpr (HsVar name) res_ty @@ -185,6 +196,15 @@ tcMonoExpr (HsVar name) res_ty returnTc (expr', lie) \end{code} +\begin{code} +tcMonoExpr (HsIPVar name) res_ty + -- ZZ What's the `id' used for here... + = let id = mkVanillaId name res_ty in + tcGetInstLoc (OccurrenceOf id) `thenNF_Tc` \ loc -> + newIPDict name res_ty loc `thenNF_Tc` \ ip -> + returnNF_Tc (HsIPVar (instToId ip), unitLIE ip) +\end{code} + %************************************************************************ %* * \subsection{Literals} @@ -209,8 +229,8 @@ tcMonoExpr (HsLit (HsFrac f)) res_ty tcMonoExpr (HsLit lit@(HsLitLit s)) res_ty = tcLookupClassByKey cCallableClassKey `thenNF_Tc` \ cCallableClass -> - newDicts (LitLitOrigin (_UNPK_ s)) - [(cCallableClass, [res_ty])] `thenNF_Tc` \ (dicts, _) -> + newClassDicts (LitLitOrigin (_UNPK_ s)) + [(cCallableClass,[res_ty])] `thenNF_Tc` \ (dicts, _) -> returnTc (HsLitOut lit res_ty, dicts) \end{code} @@ -332,23 +352,27 @@ arg/result types); unify them with the args/result; and store them for later use. \begin{code} -tcMonoExpr (CCall lbl args may_gc is_asm ignored_fake_result_ty) res_ty +tcMonoExpr (HsCCall lbl args may_gc is_asm ignored_fake_result_ty) res_ty = -- Get the callable and returnable classes. tcLookupClassByKey cCallableClassKey `thenNF_Tc` \ cCallableClass -> tcLookupClassByKey cReturnableClassKey `thenNF_Tc` \ cReturnableClass -> - tcLookupTyCon ioTyCon_NAME `thenNF_Tc` \ ioTyCon -> + tcLookupTyConByKey ioTyConKey `thenNF_Tc` \ ioTyCon -> let new_arg_dict (arg, arg_ty) - = newDicts (CCallOrigin (_UNPK_ lbl) (Just arg)) - [(cCallableClass, [arg_ty])] `thenNF_Tc` \ (arg_dicts, _) -> + = newClassDicts (CCallOrigin (_UNPK_ lbl) (Just arg)) + [(cCallableClass, [arg_ty])] `thenNF_Tc` \ (arg_dicts, _) -> returnNF_Tc arg_dicts -- Actually a singleton bag result_origin = CCallOrigin (_UNPK_ lbl) Nothing {- Not an arg -} in -- Arguments - mapNF_Tc (\ _ -> newTyVarTy_OpenKind) [1..(length args)] `thenNF_Tc` \ arg_tys -> - tcMonoExprs args arg_tys `thenTc` \ (args', args_lie) -> + let n_args = length args + tv_idxs | n_args == 0 = [] + | otherwise = [1..n_args] + in + newTyVarTys (length tv_idxs) openTypeKind `thenNF_Tc` \ arg_tys -> + tcMonoExprs args arg_tys `thenTc` \ (args', args_lie) -> -- The argument types can be unboxed or boxed; the result -- type must, however, be boxed since it's an argument to the IO @@ -356,24 +380,21 @@ tcMonoExpr (CCall lbl args may_gc is_asm ignored_fake_result_ty) res_ty newTyVarTy boxedTypeKind `thenNF_Tc` \ result_ty -> let io_result_ty = mkTyConApp ioTyCon [result_ty] - [ioDataCon] = tyConDataCons ioTyCon in unifyTauTy res_ty io_result_ty `thenTc_` -- Construct the extra insts, which encode the -- constraints on the argument and result types. mapNF_Tc new_arg_dict (zipEqual "tcMonoExpr:CCall" args arg_tys) `thenNF_Tc` \ ccarg_dicts_s -> - newDicts result_origin [(cReturnableClass, [result_ty])] `thenNF_Tc` \ (ccres_dict, _) -> - returnTc (HsApp (HsVar (dataConId ioDataCon) `TyApp` [result_ty]) - (CCall lbl args' may_gc is_asm result_ty), - -- do the wrapping in the newtype constructor here + newClassDicts result_origin [(cReturnableClass, [result_ty])] `thenNF_Tc` \ (ccres_dict, _) -> + returnTc (HsCCall lbl args' may_gc is_asm io_result_ty, foldr plusLIE ccres_dict ccarg_dicts_s `plusLIE` args_lie) \end{code} \begin{code} -tcMonoExpr (HsSCC label expr) res_ty +tcMonoExpr (HsSCC lbl expr) res_ty = tcMonoExpr expr res_ty `thenTc` \ (expr', lie) -> - returnTc (HsSCC label expr', lie) + returnTc (HsSCC lbl expr', lie) tcMonoExpr (HsLet binds expr) res_ty = tcBindsAndThen @@ -384,7 +405,7 @@ tcMonoExpr (HsLet binds expr) res_ty where tc_expr = tcMonoExpr expr res_ty `thenTc` \ (expr', lie) -> returnTc (expr', lie) - combiner is_rec bind expr = HsLet (MonoBind bind [] is_rec) expr + combiner is_rec bind expr = HsLet (mkMonoBind bind [] is_rec) expr tcMonoExpr in_expr@(HsCase scrut matches src_loc) res_ty = tcAddSrcLoc src_loc $ @@ -438,26 +459,25 @@ tcMonoExpr in_expr@(ExplicitList exprs) res_ty -- Non-empty list = tcAddErrCtxt (listCtxt expr) $ tcMonoExpr expr elt_ty -tcMonoExpr (ExplicitTuple exprs boxed) res_ty - = (if boxed - then unifyTupleTy (length exprs) res_ty - else unifyUnboxedTupleTy (length exprs) res_ty - ) `thenTc` \ arg_tys -> +tcMonoExpr (ExplicitTuple exprs boxity) res_ty + = unifyTupleTy boxity (length exprs) res_ty `thenTc` \ arg_tys -> mapAndUnzipTc (\ (expr, arg_ty) -> tcMonoExpr expr arg_ty) (exprs `zip` arg_tys) -- we know they're of equal length. `thenTc` \ (exprs', lies) -> - returnTc (ExplicitTuple exprs' boxed, plusLIEs lies) + returnTc (ExplicitTuple exprs' boxity, plusLIEs lies) -tcMonoExpr (RecordCon con_name rbinds) res_ty - = tcId con_name `thenNF_Tc` \ (con_expr, con_lie, con_tau) -> +tcMonoExpr expr@(RecordCon con_name rbinds) res_ty + = tcAddErrCtxt (recordConCtxt expr) $ + tcId con_name `thenNF_Tc` \ (con_expr, con_lie, con_tau) -> let (_, record_ty) = splitFunTys con_tau + (tycon, ty_args, _) = splitAlgTyConApp record_ty in - -- Con is syntactically constrained to be a data constructor ASSERT( maybeToBool (splitAlgTyConApp_maybe record_ty ) ) unifyTauTy res_ty record_ty `thenTc_` -- Check that the record bindings match the constructor + -- con_name is syntactically constrained to be a data constructor tcLookupDataCon con_name `thenTc` \ (data_con, _, _) -> let bad_fields = badFields rbinds data_con @@ -468,11 +488,23 @@ tcMonoExpr (RecordCon con_name rbinds) res_ty else -- Typecheck the record bindings - tcRecordBinds record_ty rbinds `thenTc` \ (rbinds', rbinds_lie) -> + tcRecordBinds tycon ty_args rbinds `thenTc` \ (rbinds', rbinds_lie) -> + + let + missing_s_fields = missingStrictFields rbinds data_con + in + checkTcM (null missing_s_fields) + (mapNF_Tc (addErrTc . missingStrictFieldCon con_name) missing_s_fields `thenNF_Tc_` + returnNF_Tc ()) `thenNF_Tc_` + let + missing_fields = missingFields rbinds data_con + in + checkTcM (not (opt_WarnMissingFields && not (null missing_fields))) + (mapNF_Tc ((warnTc True) . missingFieldCon con_name) missing_fields `thenNF_Tc_` + returnNF_Tc ()) `thenNF_Tc_` returnTc (RecordConOut data_con con_expr rbinds', con_lie `plusLIE` rbinds_lie) - -- The main complication with RecordUpd is that we need to explicitly -- handle the *non-updated* fields. Consider: -- @@ -499,8 +531,8 @@ tcMonoExpr (RecordCon con_name rbinds) res_ty -- -- All this is done in STEP 4 below. -tcMonoExpr (RecordUpd record_expr rbinds) res_ty - = tcAddErrCtxt recordUpdCtxt $ +tcMonoExpr expr@(RecordUpd record_expr rbinds) res_ty + = tcAddErrCtxt (recordUpdCtxt expr) $ -- STEP 0 -- Check that the field names are really field names @@ -525,10 +557,12 @@ tcMonoExpr (RecordUpd record_expr rbinds) res_ty -- Figure out the tycon and data cons from the first field name let (Just sel_id : _) = maybe_sel_ids - (_, tau) = splitForAllTys (idType sel_id) + (_, _, tau) = ASSERT( isNotUsgTy (idType sel_id) ) + splitSigmaTy (idType sel_id) -- Selectors can be overloaded + -- when the data type has a context Just (data_ty, _) = splitFunTy_maybe tau -- Must succeed since sel_id is a selector - (tycon, _, data_cons) = splitAlgTyConApp data_ty - (con_tyvars, theta, _, _, _, _) = dataConSig (head data_cons) + (tycon, _, data_cons) = splitAlgTyConApp data_ty + (con_tyvars, _, _, _, _, _) = dataConSig (head data_cons) in tcInstTyVars con_tyvars `thenNF_Tc` \ (_, result_inst_tys, _) -> @@ -546,7 +580,7 @@ tcMonoExpr (RecordUpd record_expr rbinds) res_ty result_record_ty = mkTyConApp tycon result_inst_tys in unifyTauTy res_ty result_record_ty `thenTc_` - tcRecordBinds result_record_ty rbinds `thenTc` \ (rbinds', rbinds_lie) -> + tcRecordBinds tycon result_inst_tys rbinds `thenTc` \ (rbinds', rbinds_lie) -> -- STEP 4 -- Use the un-updated fields to find a vector of booleans saying @@ -590,10 +624,10 @@ tcMonoExpr (RecordUpd record_expr rbinds) res_ty -- union the ones that could participate in the update. let (tyvars, theta, _, _, _, _) = dataConSig (head data_cons) - inst_env = zipVarEnv tyvars result_inst_tys - theta' = substTopTheta inst_env theta + inst_env = mkTopTyVarSubst tyvars result_inst_tys + theta' = substClasses inst_env theta in - newDicts RecordUpdOrigin theta' `thenNF_Tc` \ (con_lie, dicts) -> + newClassDicts RecordUpdOrigin theta' `thenNF_Tc` \ (con_lie, dicts) -> -- Phew! returnTc (RecordUpdOut record_expr' result_record_ty dicts rbinds', @@ -660,9 +694,9 @@ tcMonoExpr in_expr@(ArithSeqIn seq@(FromThenTo expr1 expr2 expr3)) res_ty \begin{code} tcMonoExpr in_expr@(ExprWithTySig expr poly_ty) res_ty = tcSetErrCtxt (exprSigCtxt in_expr) $ - tcHsType poly_ty `thenTc` \ sig_tc_ty -> + tcHsSigType poly_ty `thenTc` \ sig_tc_ty -> - if not (isForAllTy sig_tc_ty) then + if not (isSigmaTy sig_tc_ty) then -- Easy case unifyTauTy sig_tc_ty res_ty `thenTc_` tcMonoExpr expr sig_tc_ty @@ -685,6 +719,58 @@ tcMonoExpr in_expr@(ExprWithTySig expr poly_ty) res_ty returnTc (expr, lie) \end{code} +Implicit Parameter bindings. + +\begin{code} +tcMonoExpr (HsWith expr binds) res_ty + = tcMonoExpr expr res_ty `thenTc` \ (expr', lie) -> + tcIPBinds binds `thenTc` \ (binds', types, lie2) -> + partitionPredsOfLIE isBound lie `thenTc` \ (ips, lie', dict_binds) -> + let expr'' = if nullMonoBinds dict_binds + then expr' + else HsLet (mkMonoBind (revBinds dict_binds) [] NonRecursive) + expr' + in + tcCheckIPBinds binds' types ips `thenTc_` + returnTc (HsWith expr'' binds', lie' `plusLIE` lie2) + where isBound p + = case ipName_maybe p of + Just n -> n `elem` names + Nothing -> False + names = map fst binds + -- revBinds is used because tcSimplify outputs the bindings + -- out-of-order. it's not a problem elsewhere because these + -- bindings are normally used in a recursive let + -- ZZ probably need to find a better solution + revBinds (b1 `AndMonoBinds` b2) = + (revBinds b2) `AndMonoBinds` (revBinds b1) + revBinds b = b + +tcIPBinds ((name, expr) : binds) + = newTyVarTy openTypeKind `thenTc` \ ty -> + tcGetSrcLoc `thenTc` \ loc -> + let id = ipToId name ty loc in + tcMonoExpr expr ty `thenTc` \ (expr', lie) -> + zonkTcType ty `thenTc` \ ty' -> + tcIPBinds binds `thenTc` \ (binds', types, lie2) -> + returnTc ((id, expr') : binds', ty : types, lie `plusLIE` lie2) +tcIPBinds [] = returnTc ([], [], emptyLIE) + +tcCheckIPBinds binds types ips + = foldrTc tcCheckIPBind (getIPsOfLIE ips) (zip binds types) + +-- ZZ how do we use the loc? +tcCheckIPBind bt@((v, _), t1) ((n, t2) : ips) | getName v == n + = unifyTauTy t1 t2 `thenTc_` + tcCheckIPBind bt ips `thenTc` \ ips' -> + returnTc ips' +tcCheckIPBind bt (ip : ips) + = tcCheckIPBind bt ips `thenTc` \ ips' -> + returnTc (ip : ips') +tcCheckIPBind bt [] + = returnTc [] +\end{code} + Typecheck expression which in most cases will be an Id. \begin{code} @@ -696,7 +782,7 @@ tcExpr_id id_expr = case id_expr of HsVar name -> tcId name `thenNF_Tc` \ stuff -> returnTc stuff - other -> newTyVarTy_OpenKind `thenNF_Tc` \ id_ty -> + other -> newTyVarTy openTypeKind `thenNF_Tc` \ id_ty -> tcMonoExpr id_expr id_ty `thenTc` \ (id_expr', lie_id) -> returnTc (id_expr', lie_id, id_ty) \end{code} @@ -709,9 +795,9 @@ tcExpr_id id_expr \begin{code} -tcApp :: RenamedHsExpr -> [RenamedHsExpr] -- Function and args - -> TcType -- Expected result type of application - -> TcM s (TcExpr, [TcExpr], -- Translated fun and args +tcApp :: RenamedHsExpr -> [RenamedHsExpr] -- Function and args + -> TcType -- Expected result type of application + -> TcM s (TcExpr, [TcExpr], -- Translated fun and args LIE) tcApp fun args res_ty @@ -791,6 +877,12 @@ tcArg the_fun (arg, expected_arg_ty, arg_no) %* * %************************************************************************ +Between the renamer and the first invocation of the UsageSP inference, +identifiers read from interface files will have usage information in +their types, whereas other identifiers will not. The unannotTy here +in @tcId@ prevents this information from pointlessly propagating +further prior to the first usage inference. + \begin{code} tcId :: Name -> NF_TcM s (TcExpr, LIE, TcType) @@ -799,11 +891,11 @@ tcId name tcLookupValueMaybe name `thenNF_Tc` \ maybe_local -> case maybe_local of - Just tc_id -> instantiate_it tc_id (idType tc_id) + Just tc_id -> instantiate_it (OccurrenceOf tc_id) tc_id (unannotTy (idType tc_id)) Nothing -> tcLookupValue name `thenNF_Tc` \ id -> tcInstId id `thenNF_Tc` \ (tyvars, theta, tau) -> - instantiate_it2 id tyvars theta tau + instantiate_it2 (OccurrenceOf id) id tyvars theta tau where -- The instantiate_it loop runs round instantiating the Id. @@ -812,23 +904,22 @@ tcId name -- f:: forall a. Eq a => forall b. Baz b => tau -- We want to instantiate this to -- f2::tau {f2 = f1 b (Baz b), f1 = f a (Eq a)} - instantiate_it tc_id_occ ty + instantiate_it orig fun ty = tcInstTcType ty `thenNF_Tc` \ (tyvars, rho) -> tcSplitRhoTy rho `thenNF_Tc` \ (theta, tau) -> - instantiate_it2 tc_id_occ tyvars theta tau + instantiate_it2 orig fun tyvars theta tau - instantiate_it2 tc_id_occ tyvars theta tau + instantiate_it2 orig fun tyvars theta tau = if null theta then -- Is it overloaded? - returnNF_Tc (mkHsTyApp (HsVar tc_id_occ) arg_tys, emptyLIE, tau) + returnNF_Tc (mkHsTyApp (HsVar fun) arg_tys, emptyLIE, tau) else -- Yes, it's overloaded - newMethodWithGivenTy (OccurrenceOf tc_id_occ) - tc_id_occ arg_tys theta tau `thenNF_Tc` \ inst -> - instantiate_it (instToId inst) tau `thenNF_Tc` \ (expr, lie2, final_tau) -> - returnNF_Tc (expr, unitLIE inst `plusLIE` lie2, final_tau) + instOverloadedFun orig fun arg_tys theta tau `thenNF_Tc` \ (fun', lie1) -> + instantiate_it orig fun' tau `thenNF_Tc` \ (expr, lie2, final_tau) -> + returnNF_Tc (expr, lie1 `plusLIE` lie2, final_tau) where - arg_tys = mkTyVarTys tyvars + arg_tys = mkTyVarTys tyvars \end{code} %************************************************************************ @@ -847,6 +938,7 @@ tcDoStmts do_or_lc stmts src_loc res_ty newTyVarTy (mkArrowKind boxedTypeKind boxedTypeKind) `thenNF_Tc` \ m -> newTyVarTy boxedTypeKind `thenNF_Tc` \ elt_ty -> unifyTauTy res_ty (mkAppTy m elt_ty) `thenTc_` + -- If it's a comprehension we're dealing with, -- force it to be a list comprehension. -- (as of Haskell 98, monad comprehensions are no more.) @@ -854,7 +946,7 @@ tcDoStmts do_or_lc stmts src_loc res_ty ListComp -> unifyListTy res_ty `thenTc_` returnTc () _ -> returnTc ()) `thenTc_` - tcStmts do_or_lc (mkAppTy m) stmts elt_ty `thenTc` \ (stmts', stmts_lie) -> + tcStmts do_or_lc (mkAppTy m) stmts elt_ty `thenTc` \ (stmts', stmts_lie) -> -- Build the then and zero methods in case we need them -- It's important that "then" and "return" appear just once in the final LIE, @@ -886,54 +978,50 @@ tcDoStmts do_or_lc stmts src_loc res_ty Game plan for record bindings ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -For each binding - field = value -1. look up "field", to find its selector Id, which must have type - forall a1..an. T a1 .. an -> tau - where tau is the type of the field. +1. Find the TyCon for the bindings, from the first field label. + +2. Instantiate its tyvars and unify (T a1 .. an) with expected_ty. -2. Instantiate this type +For each binding field = value -3. Unify the (T a1 .. an) part with the "expected result type", which - is passed in. This checks that all the field labels come from the - same type. +3. Instantiate the field type (from the field label) using the type + envt from step 2. -4. Type check the value using tcArg, passing tau as the expected - argument type. +4 Type check the value using tcArg, passing the field type as + the expected argument type. This extends OK when the field types are universally quantified. -Actually, to save excessive creation of fresh type variables, -we \begin{code} tcRecordBinds - :: TcType -- Expected type of whole record + :: TyCon -- Type constructor for the record + -> [TcType] -- Args of this type constructor -> RenamedRecordBinds -> TcM s (TcRecordBinds, LIE) -tcRecordBinds expected_record_ty rbinds +tcRecordBinds tycon ty_args rbinds = mapAndUnzipTc do_bind rbinds `thenTc` \ (rbinds', lies) -> returnTc (rbinds', plusLIEs lies) where - do_bind (field_label, rhs, pun_flag) - = tcLookupValue field_label `thenNF_Tc` \ sel_id -> + tenv = mkTopTyVarSubst (tyConTyVars tycon) ty_args + + do_bind (field_lbl_name, rhs, pun_flag) + = tcLookupValue field_lbl_name `thenNF_Tc` \ sel_id -> + let + field_lbl = recordSelectorFieldLabel sel_id + field_ty = substTy tenv (fieldLabelType field_lbl) + in ASSERT( isRecordSelector sel_id ) -- This lookup and assertion will surely succeed, because -- we check that the fields are indeed record selectors -- before calling tcRecordBinds + ASSERT2( fieldLabelTyCon field_lbl == tycon, ppr field_lbl ) + -- The caller of tcRecordBinds has already checked + -- that all the fields come from the same type - tcInstId sel_id `thenNF_Tc` \ (_, _, tau) -> + tcPolyExpr rhs field_ty `thenTc` \ (rhs', lie, _, _, _) -> - -- Record selectors all have type - -- forall a1..an. T a1 .. an -> tau - ASSERT( maybeToBool (splitFunTy_maybe tau) ) - let - -- Selector must have type RecordType -> FieldType - Just (record_ty, field_ty) = splitFunTy_maybe tau - in - unifyTauTy expected_record_ty record_ty `thenTc_` - tcPolyExpr rhs field_ty `thenTc` \ (rhs', lie, _, _, _) -> returnTc ((sel_id, rhs', pun_flag), lie) badFields rbinds data_con @@ -942,6 +1030,36 @@ badFields rbinds data_con ] where field_names = map fieldLabelName (dataConFieldLabels data_con) + +missingStrictFields rbinds data_con + = [ fn | fn <- strict_field_names, + not (fn `elem` field_names_used) + ] + where + field_names_used = [ field_name | (field_name, _, _) <- rbinds ] + strict_field_names = mapMaybe isStrict field_info + + isStrict (fl, MarkedStrict) = Just (fieldLabelName fl) + isStrict _ = Nothing + + field_info = zip (dataConFieldLabels data_con) + (dataConStrictMarks data_con) + +missingFields rbinds data_con + = [ fn | fn <- non_strict_field_names, not (fn `elem` field_names_used) ] + where + field_names_used = [ field_name | (field_name, _, _) <- rbinds ] + + -- missing strict fields have already been flagged as + -- being so, so leave them out here. + non_strict_field_names = mapMaybe isn'tStrict field_info + + isn'tStrict (fl, MarkedStrict) = Nothing + isn'tStrict (fl, _) = Just (fieldLabelName fl) + + field_info = zip (dataConFieldLabels data_con) + (dataConStrictMarks data_con) + \end{code} %************************************************************************ @@ -969,7 +1087,7 @@ Errors and contexts Mini-utils: \begin{code} pp_nest_hang :: String -> SDoc -> SDoc -pp_nest_hang label stuff = nest 2 (hang (text label) 4 stuff) +pp_nest_hang lbl stuff = nest 2 (hang (text lbl) 4 stuff) \end{code} Boring and alphabetical: @@ -1013,7 +1131,7 @@ wrongArgsCtxt too_many_or_few fun args the_app = foldl HsApp fun args -- Used in error messages appCtxt fun args - = ptext SLIT("In the application") <+> (ppr the_app) + = ptext SLIT("In the application") <+> quotes (ppr the_app) where the_app = foldl HsApp fun args -- Used in error messages @@ -1031,7 +1149,8 @@ badFieldsUpd rbinds where fields = [field | (field, _, _) <- rbinds] -recordUpdCtxt = ptext SLIT("In a record update construct") +recordUpdCtxt expr = ptext SLIT("In the record update:") <+> ppr expr +recordConCtxt expr = ptext SLIT("In the record construction:") <+> ppr expr notSelector field = hsep [quotes (ppr field), ptext SLIT("is not a record selector")] @@ -1045,4 +1164,13 @@ illegalCcallTyErr isArg ty | otherwise = ptext SLIT("result") +missingStrictFieldCon :: Name -> Name -> SDoc +missingStrictFieldCon con field + = hsep [ptext SLIT("Constructor") <+> quotes (ppr con), + ptext SLIT("does not have the required strict field"), quotes (ppr field)] + +missingFieldCon :: Name -> Name -> SDoc +missingFieldCon con field + = hsep [ptext SLIT("Field") <+> quotes (ppr field), + ptext SLIT("is not initialised")] \end{code}