X-Git-Url: http://git.megacz.com/?p=ghc-hetmet.git;a=blobdiff_plain;f=compiler%2Ftypecheck%2FTcGenDeriv.lhs;h=499a839aadaeeceac715aa8155d0d157f2adeea5;hp=26cec8b69306a4862cc776eb90bca8c4c2d9383f;hb=9ff76535edb25ab7434284adddb5c64708ecb547;hpb=ab22f4e6456820c1b5169d75f5975a94e61f54ce

diff --git a/compiler/typecheck/TcGenDeriv.lhs b/compiler/typecheck/TcGenDeriv.lhs
index 26cec8b..499a839 100644
--- a/compiler/typecheck/TcGenDeriv.lhs
+++ b/compiler/typecheck/TcGenDeriv.lhs
@@ -47,7 +47,6 @@ import TcType
 import TysPrim
 import TysWiredIn
 import Util
-import Constants
 import Outputable
 import FastString
 import OccName
@@ -1208,12 +1207,13 @@ gen_tag_n_con_monobind (rdr_name, tycon, GenCon2Tag)
 					      (nlHsApp (nlHsVar getTag_RDR) a_Expr)))
 			(noLoc (mkExplicitHsForAllTy (map (noLoc.UserTyVar) tvs) (noLoc []) con2tag_ty))
 
-    con2tag_ty = foldl nlHsAppTy (nlHsTyVar (getRdrName tycon)) 
-		       (map nlHsTyVar tvs)
+    con2tag_ty = nlHsTyConApp (getRdrName tycon) (map nlHsTyVar tvs)
 		`nlHsFunTy` 
 		nlHsTyVar (getRdrName intPrimTyCon)
 
-    lots_of_constructors = tyConFamilySize tycon > mAX_FAMILY_SIZE_FOR_VEC_RETURNS
+    lots_of_constructors = tyConFamilySize tycon > 8
+                                -- was: mAX_FAMILY_SIZE_FOR_VEC_RETURNS
+                                -- but we don't do vectored returns any more.
 
     mk_stuff :: DataCon -> ([LPat RdrName], LHsExpr RdrName)
     mk_stuff con = ([nlWildConPat con],