X-Git-Url: http://git.megacz.com/?p=ghc-hetmet.git;a=blobdiff_plain;f=compiler%2Fmain%2FPprTyThing.hs;h=8bdb072d0ccb6f6568a18591beab00994a23d813;hp=dfa713fdc0b13276cc52d5ee9ba06ed3cf7e602d;hb=8b6c1605e75a2482892995c6d0529911796e89dd;hpb=40612c9014ef04806cd341a12cf010db51eca2e3

diff --git a/compiler/main/PprTyThing.hs b/compiler/main/PprTyThing.hs
index dfa713f..8bdb072 100644
--- a/compiler/main/PprTyThing.hs
+++ b/compiler/main/PprTyThing.hs
@@ -179,21 +179,15 @@ pprDataConDecl :: PrintExplicitForalls -> Bool -> (FieldLabel -> Bool)
 pprDataConDecl _ gadt_style show_label dataCon
   | not gadt_style = ppr_fields tys_w_strs
   | otherwise      = ppr_bndr dataCon <+> dcolon <+> 
-			sep [ ppr_tvs, GHC.pprThetaArrow theta, pp_tau ]
+			sep [ GHC.pprForAll forall_tvs, GHC.pprThetaArrow theta, pp_tau ]
+	-- Printing out the dataCon as a type signature, in GADT style
   where
-    (tyvars, theta, argTypes, res_ty) = GHC.dataConSig dataCon
-    tyCon = GHC.dataConTyCon dataCon
-    labels = GHC.dataConFieldLabels dataCon
-    qualVars = filter (flip notElem (GHC.tyConTyVars tyCon)) tyvars
-    stricts = GHC.dataConStrictMarks dataCon
-    tys_w_strs = zip stricts argTypes
-
-    ppr_tvs 
-	| null qualVars = empty
-	| otherwise     = ptext (sLit "forall") <+> 
-				hsep (map ppr qualVars) <> dot
-
-	-- printing out the dataCon as a type signature, in GADT style
+    (forall_tvs, theta, tau) = tcSplitSigmaTy (GHC.dataConUserType dataCon)
+    (arg_tys, res_ty)        = tcSplitFunTys tau
+    labels     = GHC.dataConFieldLabels dataCon
+    stricts    = GHC.dataConStrictMarks dataCon
+    tys_w_strs = zip stricts arg_tys
+
     pp_tau = foldr add (ppr res_ty) tys_w_strs
     add str_ty pp_ty = pprParendBangTy str_ty <+> arrow <+> pp_ty