X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=ghc%2Fcompiler%2Ftypecheck%2FTcIfaceSig.lhs;h=a606b163a531bef210a58a5e8e91234cd4573dfc;hb=fc356c46f6079ccedd7ca48df0f504fcc2c32c69;hp=2cf40956d393c4fceb4e015581f2e4ddc39cf956;hpb=30b5ebe424ebae69b162ac3fc547eb14d898535f;p=ghc-hetmet.git diff --git a/ghc/compiler/typecheck/TcIfaceSig.lhs b/ghc/compiler/typecheck/TcIfaceSig.lhs index 2cf4095..a606b16 100644 --- a/ghc/compiler/typecheck/TcIfaceSig.lhs +++ b/ghc/compiler/typecheck/TcIfaceSig.lhs @@ -8,48 +8,40 @@ module TcIfaceSig ( tcInterfaceSigs, tcVar, tcCoreExpr, tcCoreLamBndrs ) where #include "HsVersions.h" -import HsSyn ( HsDecl(..), IfaceSig(..) ) +import HsSyn ( TyClDecl(..), HsTupCon(..) ) import TcMonad -import TcMonoType ( tcHsType, tcHsTypeKind, +import TcMonoType ( tcHsType ) -- NB: all the tyars in interface files are kinded, -- so tcHsType will do the Right Thing without -- having to mess about with zonking - tcExtendTyVarScope - ) -import TcEnv ( ValueEnv, tcExtendTyVarEnv, - tcExtendGlobalValEnv, tcSetValueEnv, - tcLookupTyConByKey, tcLookupValueMaybe, - explicitLookupValue, badCon, badPrimOp, valueEnvIds + +import TcEnv ( TcEnv, RecTcEnv, tcExtendTyVarEnv, + tcExtendGlobalValEnv, tcSetEnv, + tcLookupGlobal_maybe, tcLookupRecId_maybe ) -import TcType ( TcKind, kindToTcKind ) -import RnHsSyn ( RenamedHsDecl ) +import RnHsSyn ( RenamedTyClDecl ) import HsCore -import CallConv ( cCallConv ) -import Const ( Con(..), Literal(..) ) +import Literal ( Literal(..) ) import CoreSyn -import CoreUtils ( coreExprType ) +import CoreUtils ( exprType ) import CoreUnfold import CoreLint ( lintUnfolding ) import WorkWrap ( mkWrapper ) -import PrimOp ( PrimOp(..) ) -import Id ( Id, mkId, mkVanillaId, - isPrimitiveId_maybe, isDataConId_maybe - ) +import Id ( Id, mkId, mkVanillaId, isDataConWrapId_maybe ) +import MkId ( mkCCallOpId ) import IdInfo -import DataCon ( dataConSig, dataConArgTys ) -import Type ( mkSynTy, mkTyVarTys, splitAlgTyConApp, unUsgTy ) -import Var ( IdOrTyVar, mkTyVar, tyVarKind ) -import VarEnv -import Name ( Name, NamedThing(..), isLocallyDefined ) -import Unique ( rationalTyConKey ) -import TysWiredIn ( integerTy, stringTy ) +import DataCon ( DataCon, dataConId, dataConSig, dataConArgTys ) +import Type ( mkTyVarTys, splitAlgTyConApp_maybe ) +import TysWiredIn ( tupleCon ) +import Var ( mkTyVar, tyVarKind ) +import Name ( Name ) import Demand ( wwLazy ) import ErrUtils ( pprBagOfErrors ) -import Maybes ( maybeToBool, MaybeErr(..) ) import Outputable import Util ( zipWithEqual ) +import HscTypes ( TyThing(..) ) \end{code} Ultimately, type signatures in interfaces will have pragmatic @@ -60,34 +52,33 @@ As always, we do not have to worry about user-pragmas in interface signatures. \begin{code} -tcInterfaceSigs :: ValueEnv -- Envt to use when checking unfoldings - -> [RenamedHsDecl] -- Ignore non-sig-decls in these decls - -> TcM s [Id] +tcInterfaceSigs :: RecTcEnv -- Envt to use when checking unfoldings + -> [RenamedTyClDecl] -- Ignore non-sig-decls in these decls + -> TcM [Id] tcInterfaceSigs unf_env decls = listTc [ do_one name ty id_infos src_loc - | SigD (IfaceSig name ty id_infos src_loc) <- decls] + | IfaceSig {tcdName = name, tcdType = ty, tcdIdInfo = id_infos, tcdLoc =src_loc} <- decls] where - in_scope_vars = filter isLocallyDefined (valueEnvIds unf_env) + in_scope_vars = [] -- I think this will be OK do_one name ty id_infos src_loc = tcAddSrcLoc src_loc $ tcAddErrCtxt (ifaceSigCtxt name) $ tcHsType ty `thenTc` \ sigma_ty -> tcIdInfo unf_env in_scope_vars name - sigma_ty vanillaIdInfo id_infos `thenTc` \ id_info -> + sigma_ty id_infos `thenTc` \ id_info -> returnTc (mkId name sigma_ty id_info) \end{code} \begin{code} -tcIdInfo unf_env in_scope_vars name ty info info_ins - = foldlTc tcPrag vanillaIdInfo info_ins +tcIdInfo unf_env in_scope_vars name ty info_ins + = foldlTc tcPrag constantIdInfo info_ins where tcPrag info (HsArity arity) = returnTc (info `setArityInfo` arity) - tcPrag info (HsUpdate upd) = returnTc (info `setUpdateInfo` upd) tcPrag info (HsNoCafRefs) = returnTc (info `setCafInfo` NoCafRefs) - tcPrag info (HsCprInfo cpr_info) = returnTc (info `setCprInfo` cpr_info) + tcPrag info HsCprInfo = returnTc (info `setCprInfo` ReturnsCPR) tcPrag info (HsUnfold inline_prag expr) = tcPragExpr unf_env name in_scope_vars expr `thenNF_Tc` \ maybe_expr' -> @@ -102,8 +93,8 @@ tcIdInfo unf_env in_scope_vars name ty info info_ins in returnTc info2 - tcPrag info (HsStrictness (HsStrictnessInfo (demands,bot_result))) - = returnTc (info `setStrictnessInfo` StrictnessInfo demands bot_result) + tcPrag info (HsStrictness strict_info) + = returnTc (info `setStrictnessInfo` strict_info) tcPrag info (HsWorker nm) = tcWorkerInfo unf_env ty info nm @@ -115,14 +106,14 @@ tcWorkerInfo unf_env ty info worker_name = pprPanic "Worker with no arity info" (ppr worker_name) | otherwise - = uniqSMToTcM (mkWrapper ty arity demands cpr_info) `thenNF_Tc` \ wrap_fn -> + = uniqSMToTcM (mkWrapper ty arity demands res_bot cpr_info) `thenNF_Tc` \ wrap_fn -> let -- Watch out! We can't pull on unf_env too eagerly! - info' = case explicitLookupValue unf_env worker_name of - Just worker_id -> info `setUnfoldingInfo` mkTopUnfolding (wrap_fn worker_id) - `setWorkerInfo` Just worker_id + info' = case tcLookupRecId_maybe unf_env worker_name of + Just worker_id -> info `setUnfoldingInfo` mkTopUnfolding (wrap_fn worker_id) + `setWorkerInfo` HasWorker worker_id arity - Nothing -> pprTrace "tcWorkerInfo failed:" (ppr worker_name) info + Nothing -> pprTrace "tcWorkerInfo failed:" (ppr worker_name) info in returnTc info' where @@ -131,9 +122,9 @@ tcWorkerInfo unf_env ty info worker_name arity_info = arityInfo info arity = arityLowerBound arity_info cpr_info = cprInfo info - demands = case strictnessInfo info of - StrictnessInfo d _ -> d - _ -> take arity (repeat wwLazy) -- Noncommittal + (demands, res_bot) = case strictnessInfo info of + StrictnessInfo d r -> (d,r) + _ -> (take arity (repeat wwLazy),False) -- Noncommittal \end{code} For unfoldings we try to do the job lazily, so that we never type check @@ -146,17 +137,18 @@ tcPragExpr unf_env name in_scope_vars expr -- Check for type consistency in the unfolding tcGetSrcLoc `thenNF_Tc` \ src_loc -> - case lintUnfolding src_loc in_scope_vars core_expr' of - Nothing -> returnTc core_expr' - Just fail_msg -> failWithTc ((doc <+> text "failed Lint") $$ fail_msg) + getDOptsTc `thenTc` \ dflags -> + case lintUnfolding dflags src_loc in_scope_vars core_expr' of + (Nothing,_) -> returnTc core_expr' -- ignore warnings + (Just fail_msg,_) -> failWithTc ((doc <+> text "failed Lint") $$ fail_msg) where doc = text "unfolding of" <+> ppr name -tcDelay :: ValueEnv -> SDoc -> TcM s a -> NF_TcM s (Maybe a) +tcDelay :: RecTcEnv -> SDoc -> TcM a -> NF_TcM (Maybe a) tcDelay unf_env doc thing_inside = forkNF_Tc ( recoverNF_Tc bad_value ( - tcSetValueEnv unf_env thing_inside `thenTc` \ r -> + tcSetEnv unf_env thing_inside `thenTc` \ r -> returnTc (Just r) )) where @@ -175,12 +167,12 @@ Variables in unfoldings ****** Why? Because we know all the types and want to bind them to real Ids. \begin{code} -tcVar :: Name -> TcM s Id +tcVar :: Name -> TcM Id tcVar name - = tcLookupValueMaybe name `thenNF_Tc` \ maybe_id -> + = tcLookupGlobal_maybe name `thenNF_Tc` \ maybe_id -> case maybe_id of { - Just id -> returnTc id; - Nothing -> failWithTc (noDecl name) + Just (AnId id) -> returnTc id; + Nothing -> failWithTc (noDecl name) } noDecl name = hsep [ptext SLIT("Warning: no binding for"), ppr name] @@ -189,10 +181,10 @@ noDecl name = hsep [ptext SLIT("Warning: no binding for"), ppr name] UfCore expressions. \begin{code} -tcCoreExpr :: UfExpr Name -> TcM s CoreExpr +tcCoreExpr :: UfExpr Name -> TcM CoreExpr tcCoreExpr (UfType ty) - = tcHsTypeKind ty `thenTc` \ (_, ty') -> + = tcHsType ty `thenTc` \ ty' -> -- It might not be of kind type returnTc (Type ty') @@ -200,19 +192,30 @@ tcCoreExpr (UfVar name) = tcVar name `thenTc` \ id -> returnTc (Var id) -tcCoreExpr (UfCon con args) - = tcUfCon con `thenTc` \ con' -> - mapTc tcCoreExpr args `thenTc` \ args' -> - returnTc (Con con' args') +tcCoreExpr (UfLit lit) + = returnTc (Lit lit) -tcCoreExpr (UfTuple name args) - = tcUfDataCon name `thenTc` \ con -> - mapTc tcCoreExpr args `thenTc` \ args' -> +-- The dreaded lit-lits are also similar, except here the type +-- is read in explicitly rather than being implicit +tcCoreExpr (UfLitLit lit ty) + = tcHsType ty `thenTc` \ ty' -> + returnTc (Lit (MachLitLit lit ty')) + +tcCoreExpr (UfCCall cc ty) + = tcHsType ty `thenTc` \ ty' -> + tcGetUnique `thenNF_Tc` \ u -> + returnTc (Var (mkCCallOpId u cc ty')) + +tcCoreExpr (UfTuple (HsTupCon _ boxity arity) args) + = mapTc tcCoreExpr args `thenTc` \ args' -> let -- Put the missing type arguments back in - con_args = map (Type . unUsgTy . coreExprType) args' ++ args' + con_args = map (Type . exprType) args' ++ args' in - returnTc (Con con con_args) + returnTc (mkApps (Var con_id) con_args) + where + con_id = dataConId (tupleCon boxity arity) + tcCoreExpr (UfLam bndr body) = tcCoreLamBndr bndr $ \ bndr' -> @@ -227,7 +230,7 @@ tcCoreExpr (UfApp fun arg) tcCoreExpr (UfCase scrut case_bndr alts) = tcCoreExpr scrut `thenTc` \ scrut' -> let - scrut_ty = coreExprType scrut' + scrut_ty = exprType scrut' case_bndr' = mkVanillaId case_bndr scrut_ty in tcExtendGlobalValEnv [case_bndr'] $ @@ -252,60 +255,11 @@ tcCoreExpr (UfNote note expr) = tcCoreExpr expr `thenTc` \ expr' -> case note of UfCoerce to_ty -> tcHsType to_ty `thenTc` \ to_ty' -> - returnTc (Note (Coerce (unUsgTy to_ty') - (unUsgTy (coreExprType expr'))) expr') + returnTc (Note (Coerce to_ty' + (exprType expr')) expr') UfInlineCall -> returnTc (Note InlineCall expr') UfInlineMe -> returnTc (Note InlineMe expr') UfSCC cc -> returnTc (Note (SCC cc) expr') - -tcCoreNote (UfSCC cc) = returnTc (SCC cc) -tcCoreNote UfInlineCall = returnTc InlineCall - - --- rationalTy isn't built in so, we have to construct it --- (the "ty" part of the incoming literal is simply bottom) -tcUfCon (UfLitCon (NoRepRational lit _)) - = tcLookupTyConByKey rationalTyConKey `thenNF_Tc` \ rational_tycon -> - let - rational_ty = mkSynTy rational_tycon [] - in - returnTc (Literal (NoRepRational lit rational_ty)) - --- Similarly for integers and strings, except that they are wired in -tcUfCon (UfLitCon (NoRepInteger lit _)) - = returnTc (Literal (NoRepInteger lit integerTy)) -tcUfCon (UfLitCon (NoRepStr lit _)) - = returnTc (Literal (NoRepStr lit stringTy)) - -tcUfCon (UfLitCon other_lit) - = returnTc (Literal other_lit) - --- The dreaded lit-lits are also similar, except here the type --- is read in explicitly rather than being implicit -tcUfCon (UfLitLitCon lit ty) - = tcHsType ty `thenTc` \ ty' -> - returnTc (Literal (MachLitLit lit ty')) - -tcUfCon (UfDataCon name) = tcUfDataCon name - -tcUfCon (UfPrimOp name) - = tcVar name `thenTc` \ op_id -> - case isPrimitiveId_maybe op_id of - Just op -> returnTc (PrimOp op) - Nothing -> failWithTc (badPrimOp name) - -tcUfCon (UfCCallOp str is_dyn casm gc) - = case is_dyn of - True -> - tcGetUnique `thenNF_Tc` \ u -> - returnTc (PrimOp (CCallOp (Right u) casm gc cCallConv)) - False -> returnTc (PrimOp (CCallOp (Left str) casm gc cCallConv)) - -tcUfDataCon name - = tcVar name `thenTc` \ con_id -> - case isDataConId_maybe con_id of - Just con -> returnTc (DataCon con) - Nothing -> failWithTc (badCon name) \end{code} \begin{code} @@ -355,38 +309,36 @@ tcCoreAlt scrut_ty (UfDefault, names, rhs) tcCoreExpr rhs `thenTc` \ rhs' -> returnTc (DEFAULT, [], rhs') -tcCoreAlt scrut_ty (UfLitCon lit, names, rhs) +tcCoreAlt scrut_ty (UfLitAlt lit, names, rhs) = ASSERT( null names ) tcCoreExpr rhs `thenTc` \ rhs' -> - returnTc (Literal lit, [], rhs') + returnTc (LitAlt lit, [], rhs') -tcCoreAlt scrut_ty (UfLitLitCon str ty, names, rhs) +tcCoreAlt scrut_ty (UfLitLitAlt str ty, names, rhs) = ASSERT( null names ) tcCoreExpr rhs `thenTc` \ rhs' -> tcHsType ty `thenTc` \ ty' -> - returnTc (Literal (MachLitLit str ty'), [], rhs') + returnTc (LitAlt (MachLitLit str ty'), [], rhs') -- A case alternative is made quite a bit more complicated -- by the fact that we omit type annotations because we can -- work them out. True enough, but its not that easy! -tcCoreAlt scrut_ty (UfDataCon con_name, names, rhs) - = tcVar con_name `thenTc` \ con_id -> +tcCoreAlt scrut_ty alt@(con, names, rhs) + = tcConAlt con `thenTc` \ con -> let - con = case isDataConId_maybe con_id of - Just con -> con - Nothing -> pprPanic "tcCoreAlt" (ppr con_id) - (main_tyvars, _, ex_tyvars, _, _, _) = dataConSig con - (tycon, inst_tys, cons) = splitAlgTyConApp scrut_ty - ex_tyvars' = [mkTyVar name (tyVarKind tv) | (name,tv) <- names `zip` ex_tyvars] - ex_tys' = mkTyVarTys ex_tyvars' - arg_tys = dataConArgTys con (inst_tys ++ ex_tys') - id_names = drop (length ex_tyvars) names + (_, inst_tys, cons) = case splitAlgTyConApp_maybe scrut_ty of + Just stuff -> stuff + Nothing -> pprPanic "tcCoreAlt" (ppr alt) + ex_tyvars' = [mkTyVar name (tyVarKind tv) | (name,tv) <- names `zip` ex_tyvars] + ex_tys' = mkTyVarTys ex_tyvars' + arg_tys = dataConArgTys con (inst_tys ++ ex_tys') + id_names = drop (length ex_tyvars) names arg_ids #ifdef DEBUG | length id_names /= length arg_tys - = pprPanic "tcCoreAlts" (ppr (con_name, names, rhs) $$ + = pprPanic "tcCoreAlts" (ppr (con, names, rhs) $$ (ppr main_tyvars <+> ppr ex_tyvars) $$ ppr arg_tys) | otherwise @@ -397,7 +349,18 @@ tcCoreAlt scrut_ty (UfDataCon con_name, names, rhs) tcExtendTyVarEnv ex_tyvars' $ tcExtendGlobalValEnv arg_ids $ tcCoreExpr rhs `thenTc` \ rhs' -> - returnTc (DataCon con, ex_tyvars' ++ arg_ids, rhs') + returnTc (DataAlt con, ex_tyvars' ++ arg_ids, rhs') + + +tcConAlt :: UfConAlt Name -> TcM DataCon +tcConAlt (UfTupleAlt (HsTupCon _ boxity arity)) + = returnTc (tupleCon boxity arity) + +tcConAlt (UfDataAlt con_name) + = tcVar con_name `thenTc` \ con_id -> + returnTc (case isDataConWrapId_maybe con_id of + Just con -> con + Nothing -> pprPanic "tcCoreAlt" (ppr con_id)) \end{code} \begin{code}