From eb2d8fe3f17b2c2bd30b3bf2d1451b367152f036 Mon Sep 17 00:00:00 2001
From: Ben Lippmeier <benl@ouroborus.net>
Date: Wed, 8 Dec 2010 06:28:14 +0000
Subject: [PATCH] Implement -dsuppress-type-signatures

---
 compiler/coreSyn/PprCore.lhs      |    5 +++--
 compiler/main/StaticFlagParser.hs |    1 +
 compiler/main/StaticFlags.hs      |   15 ++++++++++++---
 3 files changed, 16 insertions(+), 5 deletions(-)

diff --git a/compiler/coreSyn/PprCore.lhs b/compiler/coreSyn/PprCore.lhs
index cc38837..104bf81 100644
--- a/compiler/coreSyn/PprCore.lhs
+++ b/compiler/coreSyn/PprCore.lhs
@@ -282,8 +282,9 @@ pprTypedLCBinder bind_site debug_on var
 pprTypedBinder :: Var -> SDoc
 -- Print binder with a type or kind signature (not paren'd)
 pprTypedBinder binder
-  | isTyCoVar binder  = pprKindedTyVarBndr binder
-  | otherwise	    = hang (pprIdBndr binder) 2 (dcolon <+> pprType (idType binder))
+  | isTyCoVar binder		= pprKindedTyVarBndr binder
+  | opt_SuppressTypeSignatures	= empty
+  | otherwise			= hang (pprIdBndr binder) 2 (dcolon <+> pprType (idType binder))
 
 pprKindedTyVarBndr :: TyVar -> SDoc
 -- Print a type variable binder with its kind (but not if *)
diff --git a/compiler/main/StaticFlagParser.hs b/compiler/main/StaticFlagParser.hs
index 8de4c5c..431414a 100644
--- a/compiler/main/StaticFlagParser.hs
+++ b/compiler/main/StaticFlagParser.hs
@@ -128,6 +128,7 @@ static_flags = [
   , Flag "dsuppress-module-prefixes"   (PassFlag addOpt)
   , Flag "dsuppress-type-applications" (PassFlag addOpt)
   , Flag "dsuppress-idinfo"            (PassFlag addOpt)
+  , Flag "dsuppress-type-signatures"   (PassFlag addOpt)
   , Flag "dppr-user-length"            (AnySuffix addOpt)
   , Flag "dopt-fuel"                   (AnySuffix addOpt)
   , Flag "dtrace-level"                (AnySuffix addOpt)
diff --git a/compiler/main/StaticFlags.hs b/compiler/main/StaticFlags.hs
index 9b8ea19..f9be713 100644
--- a/compiler/main/StaticFlags.hs
+++ b/compiler/main/StaticFlags.hs
@@ -21,14 +21,17 @@ module StaticFlags (
 
 	-- Output style options
 	opt_PprUserLength,
+	opt_PprStyle_Debug, opt_TraceLevel,
+        opt_NoDebugOutput,
+
+	-- Suppressing boring aspects of core dumps
 	opt_SuppressAll,
 	opt_SuppressUniques,
         opt_SuppressCoercions,
 	opt_SuppressModulePrefixes,
 	opt_SuppressTypeApplications,
 	opt_SuppressIdInfo,
-	opt_PprStyle_Debug, opt_TraceLevel,
-        opt_NoDebugOutput,
+	opt_SuppressTypeSignatures,
 
 	-- profiling opts
 	opt_SccProfilingOn,
@@ -219,7 +222,13 @@ opt_SuppressIdInfo :: Bool
 opt_SuppressIdInfo 
 	=  lookUp  (fsLit "-dsuppress-all")
 	|| lookUp  (fsLit "-dsuppress-idinfo")
-	
+
+-- | Suppress seprate type signatures in core, but leave types on lambda bound vars
+opt_SuppressTypeSignatures :: Bool
+opt_SuppressTypeSignatures
+	=  lookUp  (fsLit "-dsuppress-all")
+	|| lookUp  (fsLit "-dsuppress-type-signatures")
+
 
 opt_PprStyle_Debug  :: Bool
 opt_PprStyle_Debug              = lookUp  (fsLit "-dppr-debug")
-- 
1.7.10.4