[commit: ghc] new-typeable: Small fix (f6720a1)

José Pedro Magalhães <[email protected]>
Newsgroups gmane.comp.lang.haskell.cvs.ghc
Message-ID <[email protected]>
Repository : ssh://darcs.haskell.org//srv/darcs/ghc

On branch  : new-typeable

http://hackage.haskell.org/trac/ghc/changeset/f6720a177184d422b0d96178979f99cdd1974e59

>---------------------------------------------------------------

commit f6720a177184d422b0d96178979f99cdd1974e59
Author: Jose Pedro Magalhaes <[email protected]>
Date:   Fri Nov 23 10:37:39 2012 +0000

    Small fix

>---------------------------------------------------------------

 compiler/typecheck/TcDeriv.lhs |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/compiler/typecheck/TcDeriv.lhs b/compiler/typecheck/TcDeriv.lhs
index 04a4028..59da454 100644
--- a/compiler/typecheck/TcDeriv.lhs
+++ b/compiler/typecheck/TcDeriv.lhs
@@ -606,7 +606,7 @@ deriveTyData tvs tc tc_args (L loc deriv_pred)
         ; checkTc (not (isFamilyTyCon tc) || n_args_to_drop == 0)
                   (typeFamilyPapErr tc cls cls_tys inst_ty)
 
-        ; mkEqnHelp DerivOrigin (varSetElemsKvsFirst univ_tvs) cls cls_tys inst_ty Nothing }
+        ; mkEqnHelp DerivOrigin (varSetElemsKvsFirst univ_tvs) cls cls_tys inst_ty Nothing } }
 \end{code}
 
 Note [Deriving, type families, and partial applications]
@@ -767,7 +767,7 @@ mk_old_typeable_eqn orig tvs cls tycon tc_args mtheta
   | isNothing mtheta    -- deriving on a data type decl
   = do  { checkTc (cls `hasKey` oldTypeableClassKey)
                   (ptext (sLit "Use deriving( Typeable ) on a data type declaration"))
-        ; real_cls <- tcLookupClass (typeableClassNames !! tyConArity tycon)
+        ; real_cls <- tcLookupClass (oldTypeableClassNames !! tyConArity tycon)
                       -- See Note [Getting base classes]
         ; mk_old_typeable_eqn orig tvs real_cls tycon [] (Just []) }
lmpx.com only provides a reader for public news (NNTP) servers. It is not affiliated with the servers or forums shown here and is not responsible for the content of articles, which is written by their respective authors.