X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=compiler%2Fmain%2FStaticFlags.hs;h=9b8ea192f02c99597faae613dc598fdec8bceb92;hb=69a804e3ff13197cd2962bea96a69bb81eb6bcf0;hp=6e9e333c2809eb5c9a8d25dc172354dd863c1707;hpb=2b0c363dcaa51295571bc72a2fa0b72bf0ff353a;p=ghc-hetmet.git

diff --git a/compiler/main/StaticFlags.hs b/compiler/main/StaticFlags.hs
index 6e9e333..9b8ea19 100644
--- a/compiler/main/StaticFlags.hs
+++ b/compiler/main/StaticFlags.hs
@@ -21,9 +21,12 @@ module StaticFlags (
 
 	-- Output style options
 	opt_PprUserLength,
+	opt_SuppressAll,
 	opt_SuppressUniques,
         opt_SuppressCoercions,
 	opt_SuppressModulePrefixes,
+	opt_SuppressTypeApplications,
+	opt_SuppressIdInfo,
 	opt_PprStyle_Debug, opt_TraceLevel,
         opt_NoDebugOutput,
 
@@ -39,7 +42,6 @@ module StaticFlags (
 	opt_Parallel,
 
 	-- optimisation opts
-	opt_DsMultiTyVar,
 	opt_NoStateHack,
         opt_SimpleListLiterals,
 	opt_CprOff,
@@ -182,15 +184,42 @@ unpacked_opts =
 opt_IgnoreDotGhci :: Bool
 opt_IgnoreDotGhci		= lookUp (fsLit "-ignore-dot-ghci")
 
--- debugging opts
+-- debugging options
+-- | Suppress all that is suppressable in core dumps.
+opt_SuppressAll :: Bool
+opt_SuppressAll	
+	= lookUp  (fsLit "-dsuppress-all")
+
+-- | Suppress unique ids on variables.
 opt_SuppressUniques :: Bool
-opt_SuppressUniques		= lookUp  (fsLit "-dsuppress-uniques")
+opt_SuppressUniques
+	=  lookUp  (fsLit "-dsuppress-all")
+	|| lookUp  (fsLit "-dsuppress-uniques")
 
+-- | Suppress all coercions, them replacing with '...'
 opt_SuppressCoercions :: Bool
-opt_SuppressCoercions           = lookUp  (fsLit "-dsuppress-coercions")
+opt_SuppressCoercions
+	=  lookUp  (fsLit "-dsuppress-all") 
+	|| lookUp  (fsLit "-dsuppress-coercions")
 
+-- | Suppress module id prefixes on variables.
 opt_SuppressModulePrefixes :: Bool
-opt_SuppressModulePrefixes	= lookUp  (fsLit "-dsuppress-module-prefixes")
+opt_SuppressModulePrefixes
+	=  lookUp  (fsLit "-dsuppress-all")
+	|| lookUp  (fsLit "-dsuppress-module-prefixes")
+
+-- | Suppress type applications.
+opt_SuppressTypeApplications :: Bool
+opt_SuppressTypeApplications
+	=  lookUp  (fsLit "-dsuppress-all")
+	|| lookUp  (fsLit "-dsuppress-type-applications")
+
+-- | Suppress info such as arity and unfoldings on identifiers.
+opt_SuppressIdInfo :: Bool
+opt_SuppressIdInfo 
+	=  lookUp  (fsLit "-dsuppress-all")
+	|| lookUp  (fsLit "-dsuppress-idinfo")
+	
 
 opt_PprStyle_Debug  :: Bool
 opt_PprStyle_Debug              = lookUp  (fsLit "-dppr-debug")
@@ -227,11 +256,6 @@ opt_IrrefutableTuples		= lookUp  (fsLit "-firrefutable-tuples")
 opt_Parallel :: Bool
 opt_Parallel			= lookUp  (fsLit "-fparallel")
 
--- optimisation opts
-opt_DsMultiTyVar :: Bool
-opt_DsMultiTyVar		= not (lookUp (fsLit "-fno-ds-multi-tyvar"))
-	-- On by default
-
 opt_SimpleListLiterals :: Bool
 opt_SimpleListLiterals	        = lookUp  (fsLit "-fsimple-list-literals")