X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=ghc%2Fcompiler%2Ftypes%2FGenerics.lhs;h=2c973649cfcf8c8836e9d8c8dd65b9cb0b700bd8;hb=28a464a75e14cece5db40f2765a29348273ff2d2;hp=d6a4278a37103e9cec370bebe63293bd83c3bff3;hpb=a7ecdf96844404b7bc8273d4ff6d85759278427c;p=ghc-hetmet.git

diff --git a/ghc/compiler/types/Generics.lhs b/ghc/compiler/types/Generics.lhs
index d6a4278..2c97364 100644
--- a/ghc/compiler/types/Generics.lhs
+++ b/ghc/compiler/types/Generics.lhs
@@ -255,15 +255,12 @@ type FromAlt = (LPat RdrName, LHsExpr RdrName)
 
 mkTyConGenericBinds :: TyCon -> LHsBinds RdrName
 mkTyConGenericBinds tycon
-  = unitBag (L loc (FunBind (L loc from_RDR) False {- Not infix -}
-		 	    from_matches placeHolderNames))
-
+  = unitBag (L loc (mkFunBind (L loc from_RDR) from_matches))
 	`unionBags`
-    unitBag (L loc (FunBind (L loc to_RDR) False 
-			    to_matches placeHolderNames))
+    unitBag (L loc (mkFunBind (L loc to_RDR) to_matches))
   where
-    from_matches = mkMatchGroup [mkSimpleHsAlt pat rhs | (pat,rhs) <- from_alts]
-    to_matches   = mkMatchGroup [mkSimpleHsAlt to_pat to_body]
+    from_matches = [mkSimpleHsAlt pat rhs | (pat,rhs) <- from_alts]
+    to_matches   = [mkSimpleHsAlt to_pat to_body]
     loc	     = srcLocSpan (getSrcLoc tycon)
     datacons = tyConDataCons tycon
     (from_RDR, to_RDR) = mkGenericNames tycon
@@ -526,7 +523,7 @@ bimapTuple eps
 	 toEP   = mkHsLam [noLoc tuple_pat] (noLoc to_body) }
   where
     names	= takeList eps gs_RDR
-    tuple_pat	= TuplePat (map nlVarPat names) Boxed
+    tuple_pat	= TuplePat (map nlVarPat names) Boxed placeHolderType
     eps_w_names = eps `zip` names
     to_body     = ExplicitTuple [toEP   ep `mkHsApp` nlHsVar g | (ep,g) <- eps_w_names] Boxed
     from_body   = ExplicitTuple [fromEP ep `mkHsApp` nlHsVar g | (ep,g) <- eps_w_names] Boxed