X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=compiler%2Fghci%2FInteractiveUI.hs;h=3fbdcbe576bf4c11b8e46331b72b1986cef9d2c7;hb=4c61d9effc9117497cd59a050856c01d8bbf24aa;hp=d18a75c304a266fe3d6f2ed8289eac2a01288ad3;hpb=71cc731f9cb2c54b732328ecb8d84747b18f9477;p=ghc-hetmet.git diff --git a/compiler/ghci/InteractiveUI.hs b/compiler/ghci/InteractiveUI.hs index d18a75c..3fbdcbe 100644 --- a/compiler/ghci/InteractiveUI.hs +++ b/compiler/ghci/InteractiveUI.hs @@ -175,7 +175,7 @@ helpText = " :help, :? display this list of commands\n" ++ " :info [ ...] display information about the given names\n" ++ " :print [ ...] prints a value without forcing its computation\n" ++ - " :sprint [ ...] prints a value without forcing its computation(simpler)\n" ++ + " :sprint [ ...] simplified version of :print\n" ++ " :load ... load module(s) and their dependents\n" ++ " :module [+/-] [*] ... set the context for expression evaluation\n" ++ " :main [ ...] run the main function with the given arguments\n" ++ @@ -1384,11 +1384,13 @@ handler :: Exception -> GHCi Bool handler (DynException dyn) | Just StopChildSession <- fromDynamic dyn -- propagate to the parent session - = ASSERTM (liftM not isTopLevel) >> throwDyn StopChildSession + = do ASSERTM (liftM not isTopLevel) + throwDyn StopChildSession | Just (ChildSessionStopped msg) <- fromDynamic dyn -- Reload modules and display some message - = ASSERTM (isTopLevel) >> io(putStrLn msg) >> return False + = do ASSERTM (isTopLevel) + io(putStrLn msg) >> return False handler exception = do flushInterpBuffers