Lookup of class and family instances in vectorisation monad

[ghc-hetmet.git] / compiler / main / Main.hs

diff --git a/compiler/main/Main.hs b/compiler/main/Main.hs
index ec1d569..428f42e 100644 (file)
--- a/compiler/main/Main.hs
+++ b/compiler/main/Main.hs
@@ -24,7 +24,7 @@ import HscMain          ( newHscEnv )
 import DriverPipeline  ( oneShot, compileFile )
 import DriverMkDepend  ( doMkDependHS )
 #ifdef GHCI
-import InteractiveUI   ( interactiveUI )
+import InteractiveUI   ( interactiveUI, ghciWelcomeMsg )
 #endif
 
 -- Various other random stuff that we need
@@ -70,7 +70,7 @@ main =
   argv0 <- getArgs
 
   let
-        (minusB_args, argv1) = partition (prefixMatch "-B") argv0
+        (minusB_args, argv1) = partition ("-B" `isPrefixOf`) argv0
         mbMinusB | null minusB_args = Nothing
                  | otherwise = Just (drop 2 (last minusB_args))
 
@@ -428,6 +428,11 @@ showBanner :: CmdLineMode -> DynFlags -> IO ()
 showBanner cli_mode dflags = do
    let verb = verbosity dflags
 
+#ifdef GHCI
+   -- Show the GHCi banner
+   when (isInteractiveMode cli_mode && verb >= 1) $ putStrLn ghciWelcomeMsg
+#endif
+
    -- Display details of the configuration in verbose mode
    when (verb >= 2) $
     do hPutStr stderr "Glasgow Haskell Compiler, Version "
@@ -444,8 +449,8 @@ showVersion = do
 
 showGhcUsage dflags cli_mode = do 
   let usage_path 
-       | DoInteractive <- cli_mode = ghcUsagePath dflags
-       | otherwise                 = ghciUsagePath dflags
+       | DoInteractive <- cli_mode = ghciUsagePath dflags
+       | otherwise                 = ghcUsagePath dflags
   usage <- readFile usage_path
   dump usage
   exitWith ExitSuccess