[project @ 2004-08-12 13:10:35 by simonmar]

avoid string gaps

diff --git a/ghc/compiler/ghci/InteractiveUI.hs b/ghc/compiler/ghci/InteractiveUI.hs
index 3e0feaf..c4b5aeb 100644 (file)
--- a/ghc/compiler/ghci/InteractiveUI.hs
+++ b/ghc/compiler/ghci/InteractiveUI.hs
@@ -1,6 +1,6 @@
 {-# OPTIONS -#include "Linker.h" #-}
 -----------------------------------------------------------------------------
--- $Id: InteractiveUI.hs,v 1.171 2004/08/12 13:06:51 simonmar Exp $
+-- $Id: InteractiveUI.hs,v 1.172 2004/08/12 13:10:35 simonmar Exp $
 --
 -- GHC Interactive User Interface
 --
@@ -77,12 +77,12 @@ import System.Posix.Internals ( setNonBlockingFD )
 
 -----------------------------------------------------------------------------
 
-ghciWelcomeMsg = "\ 
-\   ___         ___ _\n\ 
-\  / _ \\ /\\  /\\/ __(_)\n\ 
-\ / /_\\// /_/ / /  | |      GHC Interactive, version " ++ cProjectVersion ++ ", for Haskell 98.\n\ 
-\/ /_\\\\/ __  / /___| |      http://www.haskell.org/ghc/\n\ 
-\\\____/\\/ /_/\\____/|_|      Type :? for help.\n"
+ghciWelcomeMsg =
+ "   ___         ___ _\n"++
+ "  / _ \\ /\\  /\\/ __(_)\n"++
+ " / /_\\// /_/ / /  | |      GHC Interactive, version " ++ cProjectVersion ++ ", for Haskell 98.\n"++
+ "/ /_\\\\/ __  / /___| |      http://www.haskell.org/ghc/\n"++
+ "\\____/\\/ /_/\\____/|_|      Type :? for help.\n"
 
 GLOBAL_VAR(commands, builtin_commands, [(String, String -> GHCi Bool)])
 

diff --git a/ghc/compiler/main/DriverFlags.hs b/ghc/compiler/main/DriverFlags.hs
index cc8b772..7a15685 100644 (file)
--- a/ghc/compiler/main/DriverFlags.hs
+++ b/ghc/compiler/main/DriverFlags.hs
@@ -254,8 +254,7 @@ static_flags =
                                    then do writeIORef v_Split_object_files True
                                            add v_Opt_C "-fglobalise-toplev-names"
                                    else hPutStrLn stderr
-                                           "warning: don't know how to  split \ 
-                                           \object files on this architecture"
+                                           "warning: don't know how to  split object files on this architecture"
                                ) )
 
        ------- Include/Import Paths ----------------------------------------

diff --git a/ghc/compiler/main/Main.hs b/ghc/compiler/main/Main.hs
index bbdd8f8..cf25bde 100644 (file)
--- a/ghc/compiler/main/Main.hs
+++ b/ghc/compiler/main/Main.hs
@@ -1,7 +1,7 @@
 {-# OPTIONS -fno-warn-incomplete-patterns -optc-DNON_POSIX_SOURCE #-}
 
 -----------------------------------------------------------------------------
--- $Id: Main.hs,v 1.136 2003/11/01 01:01:18 sof Exp $
+-- $Id: Main.hs,v 1.137 2004/08/12 13:10:40 simonmar Exp $
 --
 -- GHC Driver program
 --
@@ -99,8 +99,7 @@ main =
                -- an IO exception probably isn't our fault, so don't panic
                IOException _ ->  hPutStrLn stderr (show exception)
                AsyncException StackOverflow ->
-                       hPutStrLn stderr "stack overflow: use +RTS -K<size> \ 
-                                        \to increase it"
+                       hPutStrLn stderr "stack overflow: use +RTS -K<size> to increase it"
                _other ->  hPutStr stderr (show (Panic (show exception)))
           exitWith (ExitFailure 1)
          ) $ do

diff --git a/ghc/compiler/ndpFlatten/FlattenMonad.hs b/ghc/compiler/ndpFlatten/FlattenMonad.hs
index 944d10a..9f89563 100644 (file)
--- a/ghc/compiler/ndpFlatten/FlattenMonad.hs
+++ b/ghc/compiler/ndpFlatten/FlattenMonad.hs
@@ -428,8 +428,7 @@ mk'indexOfP ty a1 a2  = mkFunApp indexOfPName [Type ty, a1, a2]
 --
 ctxtVarErr   :: FlattenState -> Var
 ctxtVarErr s  = case ctxtVar s of
-                 Nothing -> panic "FlattenMonad.ctxtVarErr: No context \
-                                  \variable available!"
+                 Nothing -> panic "FlattenMonad.ctxtVarErr: No context variable available!"
                  Just v  -> v
 
 -- given the name of a known function and a set of arguments (needs to include

diff --git a/ghc/compiler/ndpFlatten/Flattening.hs b/ghc/compiler/ndpFlatten/Flattening.hs
index ccced5a..a28be20 100644 (file)
--- a/ghc/compiler/ndpFlatten/Flattening.hs
+++ b/ghc/compiler/ndpFlatten/Flattening.hs
@@ -651,8 +651,7 @@ dftbpBinders indexBnds exprBnds =
        return ((fBnd, (newBnd:restBnds)), liftTy ty)
 
     dftbpBinders'  _ _ _ = 
-      panic "Flattening.dftbpBinders: index and expression binder lists \ 
-           \have different length!"
+      panic "Flattening.dftbpBinders: index and expression binder lists have different length!"
 
 getExprOfBind:: CoreBind -> CoreExpr
 getExprOfBind (NonRec _ expr) = expr