X-Git-Url: http://git.megacz.com/?p=ghc-hetmet.git;a=blobdiff_plain;f=compiler%2Ftypecheck%2FTcDeriv.lhs;h=adf72cfcc2859e6655bf3d42c9d53cfd4ef89532;hp=5bbb382828f1d7e66bd6d4d3ac29ebc7a571b6c7;hb=c25b934ef544fa3eba0a9f9da41b363c470156cb;hpb=fbf4bc17c752e1d1a3db5094ff02fa65e9746325 diff --git a/compiler/typecheck/TcDeriv.lhs b/compiler/typecheck/TcDeriv.lhs index 5bbb382..adf72cf 100644 --- a/compiler/typecheck/TcDeriv.lhs +++ b/compiler/typecheck/TcDeriv.lhs @@ -327,17 +327,8 @@ tcDeriving tycl_decls inst_decls deriv_decls -- from each type declaration, so this is emptyBag ; gen_binds <- return emptyBag -- mkGenericBinds is_boot tycl_decls -{- - -- Generate the generic Representable0 instances - -- from each type declaration - ; repInstsMeta <- genGenericRepBinds is_boot tycl_decls - - ; let repInsts = concat (map (\(a,_,_) -> a) repInstsMeta) - repMetaTys = map (\(_,b,_) -> b) repInstsMeta - repTyCons = map (\(_,_,c) -> c) repInstsMeta --} ; (inst_info, rn_binds, rn_dus) - <- renameDeriv is_boot gen_binds (insts1 ++ insts2 ++ concat metaInsts {- ++ repInsts -}) + <- renameDeriv is_boot gen_binds (insts1 ++ insts2 ++ concat metaInsts) ; dflags <- getDOpts ; liftIO (dumpIfSet_dyn dflags Opt_D_dump_deriv "Derived instances" @@ -407,28 +398,12 @@ renameDeriv is_boot gen_binds insts -- scope (yuk), and rename the method binds ASSERT( null sigs ) bindLocalNames (map Var.varName tyvars) $ - do { (rn_binds, fvs) <- rnMethodBinds clas_nm (\_ -> []) [] binds + do { (rn_binds, fvs) <- rnMethodBinds clas_nm (\_ -> []) binds ; let binds' = VanillaInst rn_binds [] standalone_deriv ; return (inst_info { iBinds = binds' }, fvs) } where (tyvars,_, clas,_) = instanceHead inst clas_nm = className clas - ------------------------------------------ -{- Now unused -mkGenericBinds :: Bool -> [LTyClDecl Name] -> TcM (LHsBinds RdrName) -mkGenericBinds is_boot tycl_decls - | is_boot - = return emptyBag - | otherwise - = do { tcs <- mapM tcLookupTyCon [ tcdName d - | L _ d <- tycl_decls, isDataDecl d ] - ; return (unionManyBags [ mkTyConGenericBinds tc - | tc <- tcs, tyConHasGenerics tc ]) } - -- We are only interested in the data type declarations, - -- and then only in the ones whose 'has-generics' flag is on - -- The predicate tyConHasGenerics finds both of these --} \end{code} Note [Newtype deriving and unused constructors] @@ -460,19 +435,6 @@ stored in NewTypeDerived. @makeDerivSpecs@ fishes around to find the info about needed derived instances. \begin{code} -{- --- Make the EarlyDerivSpec for Representable0 -mkGenDerivSpec :: TyCon -> TcRn (EarlyDerivSpec) -mkGenDerivSpec tc = do - { cls <- tcLookupClass rep0ClassName - ; let tc_tvs = tyConTyVars tc - ; let tc_app = mkTyConApp tc (mkTyVarTys tc_tvs) - ; let cls_tys = [] - ; let mtheta = Just [] - ; ds <- mkEqnHelp StandAloneDerivOrigin tc_tvs cls cls_tys tc_app mtheta - -- JPM TODO: StandAloneDerivOrigin?... - ; return ds } --} -- Make the "extras" for the generic representation mkGenDerivExtras :: TyCon -> TcRn (MetaTyCons, TyCon, [(InstInfo RdrName, DerivAuxBinds)]) @@ -488,48 +450,39 @@ makeDerivSpecs :: Bool -> TcM ( [EarlyDerivSpec] , [(MetaTyCons, TyCon, [(InstInfo RdrName, DerivAuxBinds)])]) makeDerivSpecs is_boot tycl_decls inst_decls deriv_decls - | is_boot -- No 'deriving' at all in hs-boot files - = do { mapM_ add_deriv_err deriv_locs - ; return ([],[]) } + | is_boot -- No 'deriving' at all in hs-boot files + = do { mapM_ add_deriv_err deriv_locs + ; return ([],[]) } | otherwise - = do { eqns1 <- mapAndRecoverM deriveTyData all_tydata - ; eqns2 <- mapAndRecoverM deriveStandalone deriv_decls - -- Generate EarlyDerivSpec's for Representable, if asked for - -- ; (xGenerics, xDerRep) <- genericsFlags - ; xDerRep <- genericsFlag - ; let allTyNames = [ tcdName d | L _ d <- tycl_decls, isDataDecl d ] - -- ; allTyDecls <- mapM tcLookupTyCon allTyNames - -- Select only those types that derive Representable + = do { eqns1 <- mapAndRecoverM deriveTyData all_tydata + ; eqns2 <- mapAndRecoverM deriveStandalone deriv_decls + + -- Generic representation stuff: we might need to add some "extras" + -- to the instances + ; xDerRep <- getDOpts >>= return . xopt Opt_DeriveGeneric + ; generic_extras_deriv <- if not xDerRep + -- No extras if the flag is off + then (return []) + else do { + let allTyNames = [ tcdName d | L _ d <- tycl_decls, isDataDecl d ] + -- Select only those types that derive Generic ; let sel_tydata = [ tcdName t | (L _ c, L _ t) <- all_tydata - , getClassName c == Just rep0ClassName ] + , getClassName c == Just genClassName ] ; let sel_deriv_decls = catMaybes [ getTypeName t | L _ (DerivDecl (L _ t)) <- deriv_decls - , getClassName t == Just rep0ClassName ] + , getClassName t == Just genClassName ] ; derTyDecls <- mapM tcLookupTyCon $ filter (needsExtras xDerRep (sel_tydata ++ sel_deriv_decls)) allTyNames -- We need to generate the extras to add to what has -- already been derived - ; generic_extras_deriv <- mapM mkGenDerivExtras derTyDecls - -- For the remaining types, if Generics is on, we need to - -- generate both the instances and the extras, but only for the - -- types we can represent. -{- - ; let repTyDecls = filter canDoGenerics allTyDecls - ; let remTyDecls = filter (\x -> not (x `elem` derTyDecls)) repTyDecls - ; generic_instances <- if xGenerics - then mapM mkGenDerivSpec remTyDecls - else return [] - ; generic_extras_flag <- if xGenerics - then mapM mkGenDerivExtras remTyDecls - else return [] --} - -- Merge and return everything - ; return ( eqns1 ++ eqns2 -- ++ generic_instances - , generic_extras_deriv {- ++ generic_extras_flag -}) } + ; mapM mkGenDerivExtras derTyDecls } + + -- Merge and return + ; return ( eqns1 ++ eqns2, generic_extras_deriv) } where - -- We need extras if the flag DeriveRepresentable is on and this type is - -- deriving Representable + -- We need extras if the flag DeriveGeneric is on and this type is + -- deriving Generic needsExtras xDerRep tydata tc_name = xDerRep && tc_name `elem` tydata -- Extracts the name of the class in the deriving @@ -548,20 +501,15 @@ makeDerivSpecs is_boot tycl_decls inst_decls deriv_decls = [(p, d) | d@(L _ (TyData {tcdDerivs = Just preds})) <- decls, p <- preds] all_tydata :: [(LHsType Name, LTyClDecl Name)] - -- Derived predicate paired with its data type declaration + -- Derived predicate paired with its data type declaration all_tydata = extractTyDataPreds (instDeclATs inst_decls ++ tycl_decls) deriv_locs = map (getLoc . snd) all_tydata - ++ map getLoc deriv_decls + ++ map getLoc deriv_decls add_deriv_err loc = setSrcSpan loc $ - addErr (hang (ptext (sLit "Deriving not permitted in hs-boot file")) - 2 (ptext (sLit "Use an instance declaration instead"))) - -genericsFlag :: TcM Bool -genericsFlag = do dOpts <- getDOpts - return ( xopt Opt_Generics dOpts - || xopt Opt_DeriveRepresentable dOpts) + addErr (hang (ptext (sLit "Deriving not permitted in hs-boot file")) + 2 (ptext (sLit "Use an instance declaration instead"))) ------------------------------------------------------------------ deriveStandalone :: LDerivDecl Name -> TcM EarlyDerivSpec @@ -831,8 +779,8 @@ inferConstraints :: [TyVar] -> Class -> [TcType] -> TyCon -> [TcType] -> ThetaTy -- generated method definitions should succeed. This set will be simplified -- before being used in the instance declaration inferConstraints _ cls inst_tys rep_tc rep_tc_args - -- Representable0 constraints are easy - | cls `hasKey` rep0ClassKey + -- Generic constraints are easy + | cls `hasKey` genClassKey = [] -- The others are a bit more complicated | otherwise @@ -939,9 +887,8 @@ sideConditions mtheta cls cond_functorOK False) -- Functor/Fold/Trav works ok for rank-n types | cls_key == traversableClassKey = Just (checkFlag Opt_DeriveTraversable `andCond` cond_functorOK False) - | cls_key == rep0ClassKey = Just (cond_RepresentableOk `andCond` - (checkFlag Opt_DeriveRepresentable `orCond` - checkFlag Opt_Generics)) + | cls_key == genClassKey = Just (cond_RepresentableOk `andCond` + checkFlag Opt_DeriveGeneric) | otherwise = Nothing where cls_key = getUnique cls @@ -992,10 +939,8 @@ no_cons_why :: TyCon -> SDoc no_cons_why rep_tc = quotes (pprSourceTyCon rep_tc) <+> ptext (sLit "must have at least one data constructor") --- JPM TODO: should give better error message cond_RepresentableOk :: Condition -cond_RepresentableOk (_,t) | canDoGenerics t = Nothing - | otherwise = Just (ptext (sLit "Cannot derive Representable for type") <+> ppr t) +cond_RepresentableOk (_,t) = canDoGenerics t cond_enumOrProduct :: Condition cond_enumOrProduct = cond_isEnumeration `orCond` @@ -1116,11 +1061,11 @@ std_class_via_iso clas non_iso_class :: Class -> Bool --- *Never* derive Read,Show,Typeable,Data,Representable0 by isomorphism, +-- *Never* derive Read, Show, Typeable, Data, Generic by isomorphism, -- even with -XGeneralizedNewtypeDeriving non_iso_class cls = classKey cls `elem` ([ readClassKey, showClassKey, dataClassKey - , rep0ClassKey] ++ typeableClassKeys) + , genClassKey] ++ typeableClassKeys) typeableClassKeys :: [Unique] typeableClassKeys = map getUnique typeableClassNames @@ -1581,7 +1526,7 @@ genDerivBinds loc fix_env clas tycon ,(functorClassKey, gen_Functor_binds) ,(foldableClassKey, gen_Foldable_binds) ,(traversableClassKey, gen_Traversable_binds) - ,(rep0ClassKey, gen_Rep0_binds) + ,(genClassKey, genGenericBinds) ] \end{code} @@ -1593,37 +1538,18 @@ genDerivBinds loc fix_env clas tycon For the generic representation we need to generate: \begin{itemize} -\item A Representable0 instance -\item A Rep0 type instance +\item A Generic instance +\item A Rep type instance \item Many auxiliary datatypes and instances for them (for the meta-information) \end{itemize} -@gen_Rep0_binds@ does (1) +@genGenericBinds@ does (1) @genGenericRepExtras@ does (2) and (3) -@genGenericRepBind@ does all of them +@genGenericAll@ does all of them \begin{code} -{- -genGenericRepBinds :: Bool -> [LTyClDecl Name] - -> TcM [([(InstInfo RdrName, DerivAuxBinds)] - , MetaTyCons, TyCon)] -genGenericRepBinds isBoot tyclDecls - | isBoot = return [] - | otherwise = do - allTyDecls <- mapM tcLookupTyCon [ tcdName d | L _ d <- tyclDecls - , isDataDecl d ] - let tyDecls = filter tyConHasGenerics allTyDecls - inst1 <- mapM genGenericRepBind tyDecls - let (_repInsts, metaTyCons, _repTys) = unzip3 inst1 - metaInsts <- ASSERT (length tyDecls == length metaTyCons) - mapM genDtMeta (zip tyDecls metaTyCons) - return (ASSERT (length inst1 == length metaInsts) - [ (ri : mi, ms, rt) - | ((ri, ms, rt), mi) <- zip inst1 metaInsts ]) --} - -gen_Rep0_binds :: SrcSpan -> TyCon -> (LHsBinds RdrName, DerivAuxBinds) -gen_Rep0_binds _ tc = (mkBindsRep0 tc, [ {- No DerivAuxBinds -} ]) +genGenericBinds :: SrcSpan -> TyCon -> (LHsBinds RdrName, DerivAuxBinds) +genGenericBinds _ tc = (mkBindsRep tc, [ {- No DerivAuxBinds -} ]) genGenericRepExtras :: TyCon -> TcM (MetaTyCons, TyCon) genGenericRepExtras tc = @@ -1665,27 +1591,27 @@ genGenericRepExtras tc = let metaDts = MetaTyCons metaDTyCon metaCTyCons metaSTyCons - rep0_tycon <- tc_mkRep0TyCon tc metaDts + rep0_tycon <- tc_mkRepTyCon tc metaDts return (metaDts, rep0_tycon) {- -genGenericRepBind :: TyCon +genGenericAll :: TyCon -> TcM ((InstInfo RdrName, DerivAuxBinds), MetaTyCons, TyCon) -genGenericRepBind tc = +genGenericAll tc = do (metaDts, rep0_tycon) <- genGenericRepExtras tc - clas <- tcLookupClass rep0ClassName + clas <- tcLookupClass genClassName dfun_name <- new_dfun_name clas tc let - mkInstRep0 = (InstInfo { iSpec = inst, iBinds = binds } + mkInstRep = (InstInfo { iSpec = inst, iBinds = binds } , [ {- No DerivAuxBinds -} ]) inst = mkLocalInstance dfun NoOverlap - binds = VanillaInst (mkBindsRep0 tc) [] False + binds = VanillaInst (mkBindsRep tc) [] False tvs = tyConTyVars tc tc_ty = mkTyConApp tc (mkTyVarTys tvs) dfun = mkDictFunId dfun_name (tyConTyVars tc) [] clas [tc_ty] - return (mkInstRep0, metaDts, rep0_tycon) + return (mkInstRep, metaDts, rep0_tycon) -} genDtMeta :: (TyCon, MetaTyCons) -> TcM [(InstInfo RdrName, DerivAuxBinds)] genDtMeta (tc,metaDts) =