#include "HsVersions.h"
-import HsSyn ( HsDecl(..), IfaceSig(..), HsTupCon(..) )
+import HsSyn ( HsDecl(..), TyClDecl(..), HsTupCon(..) )
import TcMonad
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
-import TcEnv ( ValueEnv, tcExtendTyVarEnv,
- tcExtendGlobalValEnv, tcSetValueEnv,
- tcLookupValueMaybe,
- explicitLookupValue, valueEnvIds
+import TcEnv ( TcEnv, RecTcEnv, tcExtendTyVarEnv,
+ tcExtendGlobalValEnv, tcSetEnv,
+ tcLookupGlobal_maybe, tcLookupRecId, tcEnvIds
)
import RnHsSyn ( RenamedHsDecl )
import CoreLint ( lintUnfolding )
import WorkWrap ( mkWrapper )
-import Id ( Id, mkId, mkVanillaId,
- isDataConWrapId_maybe
- )
+import Id ( Id, mkId, mkVanillaId, isDataConWrapId_maybe )
import MkId ( mkCCallOpId )
import IdInfo
import DataCon ( dataConSig, dataConArgTys )
-import Type ( mkTyVarTys, splitAlgTyConApp_maybe, unUsgTy )
+import Type ( mkTyVarTys, splitAlgTyConApp_maybe )
import Var ( mkTyVar, tyVarKind )
-import Name ( Name, isLocallyDefined )
+import Name ( Name )
import Demand ( wwLazy )
import ErrUtils ( pprBagOfErrors )
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 :: RecTcEnv -- Envt to use when checking unfoldings
-> [RenamedHsDecl] -- 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]
+ | TyClD (IfaceSig name ty id_infos 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 $
\begin{code}
tcIdInfo unf_env in_scope_vars name ty info info_ins
- = foldlTc tcPrag vanillaIdInfo info_ins
+ = foldlTc tcPrag constantIdInfo info_ins
where
tcPrag info (HsArity arity) = returnTc (info `setArityInfo` arity)
tcPrag info (HsNoCafRefs) = returnTc (info `setCafInfo` NoCafRefs)
= 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` HasWorker worker_id arity
+ info' = case tcLookupRecId 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
-- Check for type consistency in the unfolding
tcGetSrcLoc `thenNF_Tc` \ src_loc ->
- case lintUnfolding src_loc in_scope_vars core_expr' of
+ 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 a -> NF_TcM (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
\begin{code}
tcVar :: Name -> TcM Id
tcVar name
- = tcLookupGlobalMaybe name `thenNF_Tc` \ maybe_id ->
+ = tcLookupGlobal_maybe name `thenNF_Tc` \ maybe_id ->
case maybe_id of {
Just (AnId id) -> returnTc id;
Nothing -> failWithTc (noDecl name)
mapTc tcCoreExpr args `thenTc` \ args' ->
let
-- Put the missing type arguments back in
- con_args = map (Type . unUsgTy . exprType) args' ++ args'
+ con_args = map (Type . exprType) args' ++ args'
in
returnTc (mkApps (Var con_id) con_args)
= tcCoreExpr expr `thenTc` \ expr' ->
case note of
UfCoerce to_ty -> tcHsType to_ty `thenTc` \ to_ty' ->
- returnTc (Note (Coerce (unUsgTy to_ty')
- (unUsgTy (exprType 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
\end{code}
\begin{code}