diff options
| author | Ian Lynagh <igloo@earth.li> | 2008-06-16 14:29:17 +0000 |
|---|---|---|
| committer | Ian Lynagh <igloo@earth.li> | 2008-06-16 14:29:17 +0000 |
| commit | 0f5e104c36b1dc3d8deeec5fef3d65e7b3a1b5ad (patch) | |
| tree | cb2319df6f3669fd22e95029a0de98cd308feec4 /compiler/ghci/InteractiveUI.hs | |
| parent | 1363f4121ceaa38ac50eac42381b976f89d5ea96 (diff) | |
| download | haskell-0f5e104c36b1dc3d8deeec5fef3d65e7b3a1b5ad.tar.gz | |
More commandline flag improvements
* Allow -ffoo flags to be deprecated
* Mark some -ffoo flags as deprecated
* Avoid using deprecated flags in error messages, in the build system, etc
* Add a flag to en/disable the deprecated flag warning
Diffstat (limited to 'compiler/ghci/InteractiveUI.hs')
| -rw-r--r-- | compiler/ghci/InteractiveUI.hs | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/compiler/ghci/InteractiveUI.hs b/compiler/ghci/InteractiveUI.hs index cacbce2446..2e474bef7b 100644 --- a/compiler/ghci/InteractiveUI.hs +++ b/compiler/ghci/InteractiveUI.hs @@ -1406,12 +1406,12 @@ setCmd "" vcat (text "other dynamic, non-language, flag settings:" :map (flagSetting dflags) nonLanguageDynFlags) )) - where flagSetting dflags (str,f) + where flagSetting dflags (str, f, _) | dopt f dflags = text " " <> text "-f" <> text str | otherwise = text " " <> text "-fno-" <> text str - (ghciFlags,others) = partition (\(_,f)->f `elem` flags) + (ghciFlags,others) = partition (\(_, f, _) -> f `elem` flags) DynFlags.fFlags - nonLanguageDynFlags = filterOut (\(_,f) -> f `elem` languageOptions) + nonLanguageDynFlags = filterOut (\(_, f, _) -> f `elem` languageOptions) others flags = [Opt_PrintExplicitForalls ,Opt_PrintBindResult @@ -1689,7 +1689,7 @@ completeWord w start end = do (s,r') = span isBreak r in (n,w):words' isBreak (n+length w+length s) r' -- In a Haskell expression we want to parse 'a-b' as three words - -- where a compiler flag (ie. -fno-monomorphism-restriction) should + -- where a compiler flag (e.g. -ddump-simpl) should -- only be a single word. selectWord [] = (0,w) selectWord ((offset,x):xs) |