From: Manuel M T Chakravarty <chak@cse.unsw.edu.au>
Date: Fri, 15 Sep 2006 21:02:06 +0000 (+0000)
Subject: Fix class construction
X-Git-Tag: After_FC_branch_merge~121
X-Git-Url: http://git.megacz.com/?p=ghc-hetmet.git;a=commitdiff_plain;h=7f7be6d1bb33393c1d384923fe938b7c10acbeec

Fix class construction
Wed Aug  2 13:34:58 EDT 2006  Manuel M T Chakravarty <chak@cse.unsw.edu.au>
  * Fix class construction
---

diff --git a/compiler/hsSyn/Convert.lhs b/compiler/hsSyn/Convert.lhs
index 4dd3a6d..cd5b36d 100644
--- a/compiler/hsSyn/Convert.lhs
+++ b/compiler/hsSyn/Convert.lhs
@@ -125,11 +125,11 @@ cvtTop (NewtypeD ctxt tc tvs constr derivs)
 	; returnL $ TyClD (mkTyData NewType stuff Nothing [con'] derivs') }
 
 cvtTop (ClassD ctxt cl tvs fds decs)
-  = do	{ stuff <- cvt_tycl_hdr ctxt cl tvs
+  = do	{ (cxt', tc', tvs', _) <- cvt_tycl_hdr ctxt cl tvs
 	; fds'  <- mapM cvt_fundep fds
 	; (binds', sigs') <- cvtBindsAndSigs decs
-	; returnL $ TyClD $ mkClassDecl stuff fds' sigs' binds' []  
-							     -- ^^no ATs in TH
+	; returnL $ TyClD $ mkClassDecl (cxt', tc', tvs') fds' sigs' binds' []
+							     -- no ATs in TH^^
 	}
 
 cvtTop (InstanceD tys ty decs)