X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=ghc%2Fcompiler%2Ftypecheck%2FTcDeriv.lhs;h=d69a57722a2a4d9339a1763129b8a37a0feadec9;hb=2f51f1402e6869c0f049ffbe7b019bf6ab80558f;hp=ea4828a9ea3fe491e31ff44a9dfdadc15361656b;hpb=7b0181919416d8f04324575b7e17031ca692f5b0;p=ghc-hetmet.git

diff --git a/ghc/compiler/typecheck/TcDeriv.lhs b/ghc/compiler/typecheck/TcDeriv.lhs
index ea4828a..d69a577 100644
--- a/ghc/compiler/typecheck/TcDeriv.lhs
+++ b/ghc/compiler/typecheck/TcDeriv.lhs
@@ -33,7 +33,7 @@ import TcSimplify	( tcSimplifyThetas )
 import RnUtils		( GlobalNameMappers(..), GlobalNameMapper(..) )
 --import RnBinds4		( rnMethodBinds, rnTopBinds )
 
-import Bag		( Bag, isEmptyBag, unionBags, listToBag )
+import Bag		( emptyBag{-ToDo:rm-}, Bag, isEmptyBag, unionBags, listToBag )
 import Class		( GenClass, getClassKey )
 import CmdLineOpts	( opt_CompilingPrelude )
 import ErrUtils		( pprBagOfErrors, addErrLoc, Error(..) )
@@ -162,7 +162,9 @@ tcDeriving  :: Module			-- name of module under scrutiny
 		      RenamedHsBinds,	-- Extra generated bindings
 		      PprStyle -> Pretty)  -- Printable derived instance decls;
 				     	   -- for debugging via -ddump-derivings.
-tcDeriving = panic "tcDeriving: ToDo LATER"
+
+tcDeriving modname renamer_name_funs inst_decl_infos_in fixities
+  = returnTc (trace "tcDeriving:ToDo" (emptyBag, EmptyBinds, \ x -> ppNil))
 {- LATER:
 
 tcDeriving modname renamer_name_funs inst_decl_infos_in fixities
@@ -562,7 +564,7 @@ gen_inst_info modname fixities deriver_name_funs
   where
     clas_key = getClassKey clas
     clas_Name
-      = let  (mod, nm) = getOrigName clas  in
+      = let  (mod, nm) = moduleNamePair clas  in
     	ClassName clas_key (mkPreludeCoreName mod nm) []
 \end{code}