X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=compiler%2Ftypecheck%2FTcClassDcl.lhs;h=c545dc7e26568ea9ba32aab1369f0f27fed273b9;hb=93a74b86d201bf0ee3233e993e88eb80c2d97f68;hp=87c18414ea3abc400c29e68c13d0be6b2d49c845;hpb=e07e74e5a074490d25443aeff4db4f1f299040c4;p=ghc-hetmet.git

diff --git a/compiler/typecheck/TcClassDcl.lhs b/compiler/typecheck/TcClassDcl.lhs
index 87c1841..c545dc7 100644
--- a/compiler/typecheck/TcClassDcl.lhs
+++ b/compiler/typecheck/TcClassDcl.lhs
@@ -452,8 +452,7 @@ mkMethId origin clas sel_id inst_tys
 	getSrcSpanM			`thenM` \ loc ->
 	let 
 	    real_tau = mkPhiTy (tail preds) tau
-	    meth_id  = mkUserLocal (getOccName sel_id) uniq real_tau 
-			(srcSpanStart loc) --TODO
+	    meth_id  = mkUserLocal (getOccName sel_id) uniq real_tau loc
 	in
 	returnM (Nothing, meth_id)
 
@@ -707,7 +706,7 @@ mkGenericInstance clas (hs_ty, binds)
 	-- Make the dictionary function.
     getSrcSpanM						`thenM` \ span -> 
     getOverlapFlag					`thenM` \ overlap_flag -> 
-    newDFunName clas [inst_ty] (srcSpanStart span)	`thenM` \ dfun_name ->
+    newDFunName clas [inst_ty] span             	`thenM` \ dfun_name ->
     let
 	inst_theta = [mkClassPred clas [mkTyVarTy tv] | tv <- tyvars]
 	dfun_id    = mkDictFunId dfun_name tyvars inst_theta clas [inst_ty]
@@ -734,7 +733,7 @@ tcAddDeclCtxt decl thing_inside
 				 else "data type" ++ maybeInst
 	   | isFamilyDecl decl = "family"
 
-     maybeInst | isFamInstDecl decl = " family"
+     maybeInst | isFamInstDecl decl = " instance"
 	       | otherwise          = ""
 
      ctxt = hsep [ptext SLIT("In the"), text thing,