import CmdLineOpts ( DynFlag(..), DynFlags )
import TcMonad
-import TcEnv ( TcEnv, tcSetInstEnv, newDFunName, InstInfo(..), pprInstInfo,
+import TcEnv ( tcSetInstEnv, newDFunName, InstInfo(..), pprInstInfo,
tcLookupClass, tcLookupTyCon
)
import TcGenDeriv -- Deriv stuff
tyConTheta, maybeTyConSingleCon, isDataTyCon,
isEnumerationTyCon, TyCon
)
-import Type ( TauType, PredType(..), mkTyVarTys, mkTyConApp,
- isUnLiftedType )
+import Type ( ThetaType, mkTyVarTys, mkTyConApp,
+ isUnLiftedType, mkClassPred )
import Var ( TyVar )
import PrelNames
import Util ( zipWithEqual, sortLt )
-- The Name is the name for the DFun we'll build
-- The tyvars bind all the variables in the RHS
-type DerivRhs = [(Class, [TauType])] -- Same as a ThetaType!
- --[PredType] -- ... | Class Class [Type==TauType]
-
+type DerivRhs = ThetaType
type DerivSoln = DerivRhs
\end{code}
-- Make a Real dfun instead of the dummy one we have so far
gen_inst_info :: DFunId -> RenamedMonoBinds -> InstInfo
gen_inst_info dfun binds
- = InstInfo { iLocal = True, iDFunId = dfun,
+ = InstInfo { iDFunId = dfun,
iBinds = binds, iPrags = [] }
rn_meths meths = rnMethodBinds [] meths `thenRn` \ (meths', _) -> returnRn meths'
offensive_class = clas_key `elem` needsDataDeclCtxtClassKeys
mk_constraints data_con
- = [ (clas, [arg_ty])
+ = [ mkClassPred clas [arg_ty]
| arg_ty <- dataConArgTys data_con tyvar_tys,
not (isUnLiftedType arg_ty) -- No constraints for unlifted types?
]
in
-- Simplify each RHS
tcSetInstEnv inst_env (
- listTc [ tcAddErrCtxt (derivCtxt tc) $
+ listTc [ tcAddSrcLoc (getSrcLoc tc) $
+ tcAddErrCtxt (derivCtxt tc) $
tcSimplifyThetas deriv_rhs
| (_, _,tc,_,deriv_rhs) <- orig_eqns ]
) `thenTc` \ next_solns ->
-- They'll appear later, when we do the top-level extendInstEnvs
mk_deriv_dfun (dfun_name, clas, tycon, tyvars, _) theta
- = mkDictFunId dfun_name clas tyvars [mkTyConApp tycon (mkTyVarTys tyvars)]
- (map pair2PredType theta)
-
- pair2PredType (clas, tautypes) = Class clas tautypes
+ = mkDictFunId dfun_name clas tyvars
+ [mkTyConApp tycon (mkTyVarTys tyvars)]
+ theta
\end{code}
%************************************************************************