X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=compiler%2Fmain%2FStaticFlags.hs;h=049b61fedb6e0fe7ce3c09daf1de7b1c8cd7ba84;hb=3deca8f44135bd1a146902f498189af00dd4d7b4;hp=880206417d1234440a5d2554302849db97a5a0f5;hpb=1e4f900ade324e2db2f886a11d7cb571ad5f180c;p=ghc-hetmet.git

diff --git a/compiler/main/StaticFlags.hs b/compiler/main/StaticFlags.hs
index 8802064..049b61f 100644
--- a/compiler/main/StaticFlags.hs
+++ b/compiler/main/StaticFlags.hs
@@ -21,9 +21,10 @@ module StaticFlags (
 
 	-- Output style options
 	opt_PprUserLength,
+	opt_PprCols,
 	opt_PprCaseAsLet,
 	opt_PprStyle_Debug, opt_TraceLevel,
-        opt_NoDebugOutput,
+        opt_NoDebugOutput, 
 
 	-- Suppressing boring aspects of core dumps
 	opt_SuppressAll,
@@ -51,6 +52,7 @@ module StaticFlags (
 	opt_CprOff,
 	opt_SimplNoPreInlining,
 	opt_SimplExcessPrecision,
+	opt_NoOptCoercion,
 	opt_MaxWorkerArgs,
 
 	-- Unfolding control
@@ -233,8 +235,21 @@ opt_SuppressTypeSignatures
 
 -- | Display case expressions with a single alternative as strict let bindings
 opt_PprCaseAsLet :: Bool
-opt_PprCaseAsLet
-	= lookUp   (fsLit "-dppr-case-as-let")
+opt_PprCaseAsLet		= lookUp   (fsLit "-dppr-case-as-let")
+
+-- | Set the maximum width of the dumps
+--   If GHC's command line options are bad then the options parser uses the
+--   pretty printer display the error message. In this case the staticFlags
+--   won't be initialized yet, so we must check for this case explicitly 
+--   and return the default value.
+opt_PprCols :: Int
+opt_PprCols 
+ = unsafePerformIO
+ $ do	ready <- readIORef v_opt_C_ready
+	if (not ready)
+		then return 100
+		else return $ lookup_def_int "-dppr-cols" 100
+
 
 opt_PprStyle_Debug  :: Bool
 opt_PprStyle_Debug              = lookUp  (fsLit "-dppr-debug")
@@ -252,7 +267,6 @@ opt_Fuel                        = lookup_def_int "-dopt-fuel" maxBound
 opt_NoDebugOutput   :: Bool
 opt_NoDebugOutput               = lookUp  (fsLit "-dno-debug-output")
 
-
 -- profiling opts
 opt_SccProfilingOn :: Bool
 opt_SccProfilingOn		= lookUp  (fsLit "-fscc-profiling")
@@ -306,6 +320,9 @@ opt_SimplNoPreInlining		= lookUp  (fsLit "-fno-pre-inlining")
 opt_SimplExcessPrecision :: Bool
 opt_SimplExcessPrecision	= lookUp  (fsLit "-fexcess-precision")
 
+opt_NoOptCoercion :: Bool
+opt_NoOptCoercion    	        = lookUp  (fsLit "-fno-opt-coercion")
+
 -- Unfolding control
 -- See Note [Discounts and thresholds] in CoreUnfold