X-Git-Url: http://git.megacz.com/?p=ghc-hetmet.git;a=blobdiff_plain;f=compiler%2Fghci%2FInteractiveUI.hs;h=2e474bef7bc47a6f14ef8c1867cfc70ed279dad6;hp=cacbce24461dd2f21a36366222770b469f7f2e8a;hb=0f5e104c36b1dc3d8deeec5fef3d65e7b3a1b5ad;hpb=1363f4121ceaa38ac50eac42381b976f89d5ea96 diff --git a/compiler/ghci/InteractiveUI.hs b/compiler/ghci/InteractiveUI.hs index cacbce2..2e474be 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)