Merge branch 'master' into ghc-generics

[ghc-hetmet.git] / compiler / main / StaticFlags.hs

diff --git a/compiler/main/StaticFlags.hs b/compiler/main/StaticFlags.hs
index f9be713..049b61f 100644 (file)
--- a/compiler/main/StaticFlags.hs
+++ b/compiler/main/StaticFlags.hs
@@ -21,8 +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,
@@ -50,6 +52,7 @@ module StaticFlags (
        opt_CprOff,
        opt_SimplNoPreInlining,
        opt_SimplExcessPrecision,
+       opt_NoOptCoercion,
        opt_MaxWorkerArgs,
 
        -- Unfolding control
@@ -230,6 +233,24 @@ opt_SuppressTypeSignatures
        || lookUp  (fsLit "-dsuppress-type-signatures")
 
 
+-- | Display case expressions with a single alternative as strict let bindings
+opt_PprCaseAsLet :: Bool
+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")
 
@@ -246,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")
@@ -300,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