X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=compiler%2Fmain%2FStaticFlags.hs;h=5a43eb663259f9a0a94cbb07efcd9418cfa4c59b;hb=003790317ddc02cf220d8907fccc6b5a237321aa;hp=bc2ae38fc66931c4b6f3b9a713f3d5c83f1fc7c9;hpb=f91610ed5832f850940b70dc55291311ff34b326;p=ghc-hetmet.git diff --git a/compiler/main/StaticFlags.hs b/compiler/main/StaticFlags.hs index bc2ae38..5a43eb6 100644 --- a/compiler/main/StaticFlags.hs +++ b/compiler/main/StaticFlags.hs @@ -39,7 +39,6 @@ module StaticFlags ( opt_Parallel, -- optimisation opts - opt_DsMultiTyVar, opt_NoStateHack, opt_SimpleListLiterals, opt_CprOff, @@ -84,7 +83,7 @@ module StaticFlags ( import Config import FastString import Util -import Maybes ( firstJust ) +import Maybes ( firstJusts ) import Panic import Data.Maybe ( listToMaybe ) @@ -138,7 +137,7 @@ lookUp sw = sw `elem` packed_static_opts -- (lookup_str "foo") looks for the flag -foo=X or -fooX, -- and returns the string X lookup_str sw - = case firstJust (map (stripPrefix sw) staticFlags) of + = case firstJusts (map (stripPrefix sw) staticFlags) of Just ('=' : str) -> Just str Just str -> Just str Nothing -> Nothing @@ -227,11 +226,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")