#include "HsVersions.h"
-import HsSyn ( HsDecl(..), IfaceSig(..) )
+import HsSyn ( HsDecl(..), IfaceSig(..), 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, tcExtendTyVarEnv,
+ tcExtendGlobalValEnv, tcSetEnv,
+ tcLookupGlobal_maybe, explicitLookupId, tcEnvIds
)
-import TcType ( TcKind, kindToTcKind )
import RnHsSyn ( RenamedHsDecl )
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 Type ( mkTyVarTys, splitAlgTyConApp_maybe, unUsgTy )
+import Var ( mkTyVar, tyVarKind )
+import Name ( Name, isLocallyDefined )
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
signatures.
\begin{code}
-tcInterfaceSigs :: ValueEnv -- Envt to use when checking unfoldings
+tcInterfaceSigs :: TcEnv -- Envt to use when checking unfoldings
-> [RenamedHsDecl] -- Ignore non-sig-decls in these decls
- -> TcM s [Id]
+ -> TcM [Id]
tcInterfaceSigs unf_env decls
= listTc [ do_one name ty id_infos src_loc
| SigD (IfaceSig name ty id_infos src_loc) <- decls]
where
- in_scope_vars = filter isLocallyDefined (valueEnvIds unf_env)
+ in_scope_vars = filter isLocallyDefined (tcEnvIds unf_env)
do_one name ty id_infos src_loc
= tcAddSrcLoc src_loc $
= foldlTc tcPrag vanillaIdInfo 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' ->
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
= 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
+ info' = case explicitLookupId unf_env worker_name of
Just worker_id -> info `setUnfoldingInfo` mkTopUnfolding (wrap_fn worker_id)
- `setWorkerInfo` Just worker_id
+ `setWorkerInfo` HasWorker worker_id arity
Nothing -> pprTrace "tcWorkerInfo failed:" (ppr worker_name) info
in
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
-- 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 :: TcEnv -> 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
****** 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]
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')
= 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 ->
+-- 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 name _) args)
+ = tcVar name `thenTc` \ con_id ->
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 . unUsgTy . exprType) args' ++ args'
in
- returnTc (Con con con_args)
+ returnTc (mkApps (Var con_id) con_args)
tcCoreExpr (UfLam bndr body)
= tcCoreLamBndr bndr $ \ bndr' ->
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'] $
case note of
UfCoerce to_ty -> tcHsType to_ty `thenTc` \ to_ty' ->
returnTc (Note (Coerce (unUsgTy to_ty')
- (unUsgTy (coreExprType expr'))) expr')
+ (unUsgTy (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}
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)
+tcCoreAlt scrut_ty alt@(UfDataAlt con_name, names, rhs)
= tcVar con_name `thenTc` \ con_id ->
let
- con = case isDataConId_maybe con_id of
- Just con -> con
- Nothing -> pprPanic "tcCoreAlt" (ppr con_id)
+ con = case isDataConWrapId_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
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')
\end{code}
\begin{code}
projects / ghc-hetmet.git / blobdiff