diff options
| author | Paolo Capriotti <p.capriotti@gmail.com> | 2012-04-11 14:19:25 +0100 |
|---|---|---|
| committer | Paolo Capriotti <p.capriotti@gmail.com> | 2012-04-11 18:03:02 +0100 |
| commit | ab52df86f5f76da6e19ee6562792ea43972a6f24 (patch) | |
| tree | a07e6bfe1f2a333d73f675e572d3a85698e3331a /compiler/main/StaticFlags.hs | |
| parent | f0899173ec6f3bb16dd66bb6d7720d32d8a3bd06 (diff) | |
| download | haskell-ab52df86f5f76da6e19ee6562792ea43972a6f24.tar.gz | |
Revert "trac #5265 (support for additional .ghci files)"
This reverts commit 991f141989940c897cb2fc3dba7b5b49342d402a.
Diffstat (limited to 'compiler/main/StaticFlags.hs')
| -rw-r--r-- | compiler/main/StaticFlags.hs | 11 |
1 files changed, 1 insertions, 10 deletions
diff --git a/compiler/main/StaticFlags.hs b/compiler/main/StaticFlags.hs index c2f8674aa9..cfbd4bab58 100644 --- a/compiler/main/StaticFlags.hs +++ b/compiler/main/StaticFlags.hs @@ -80,7 +80,6 @@ module StaticFlags ( -- misc opts opt_IgnoreDotGhci, - opt_GhciScripts, opt_ErrorSpans, opt_GranMacros, opt_HiVersion, @@ -103,7 +102,7 @@ module StaticFlags ( import Config import FastString import Util -import Maybes ( firstJusts, catMaybes ) +import Maybes ( firstJusts ) import Panic import Control.Monad ( liftM3 ) @@ -133,7 +132,6 @@ lookUp :: FastString -> Bool lookup_def_int :: String -> Int -> Int lookup_def_float :: String -> Float -> Float lookup_str :: String -> Maybe String -lookup_all_str :: String -> [String] -- holds the static opts while they're being collected, before -- being unsafely read by unpacked_static_opts below. @@ -164,10 +162,6 @@ lookup_str sw Just str -> Just str Nothing -> Nothing -lookup_all_str sw = map f $ catMaybes (map (stripPrefix sw) staticFlags) where - f ('=' : str) = str - f str = str - lookup_def_int sw def = case (lookup_str sw) of Nothing -> def -- Use default Just xx -> try_read sw xx @@ -207,9 +201,6 @@ unpacked_opts = opt_IgnoreDotGhci :: Bool opt_IgnoreDotGhci = lookUp (fsLit "-ignore-dot-ghci") -opt_GhciScripts :: [String] -opt_GhciScripts = lookup_all_str "-ghci-script" - -- debugging options -- | Suppress all that is suppressable in core dumps. -- Except for uniques, as some simplifier phases introduce new varibles that |