[project @ 2001-06-05 14:09:45 by sewardj]

Updates for 5.01.

diff --git a/ghc/tests/ghci/ghci001.stdout b/ghc/tests/ghci/ghci001.stdout
index 9fd44f8..ead9955 100644 (file)
--- a/ghc/tests/ghci/ghci001.stdout
+++ b/ghc/tests/ghci/ghci001.stdout
@@ -1,10 +1,12 @@
    ___         ___ _
   / _ \ /\  /\/ __(_)
- / /_\// /_/ / /  | |      GHC Interactive, version 4.11, For Haskell 98.
+ / /_\// /_/ / /  | |      GHC Interactive, version 5.01, for Haskell 98.
 / /_\\/ __  / /___| |      http://www.haskell.org/ghc/
 \____/\/ /_/\____/|_|      Type :? for help.
 
 Loading package std ... linking ... done.
+*** WARNING: . is writable by someone else, IGNORING!
+*** WARNING: ./.ghci is writable by someone else, IGNORING!
 Prelude> -- bug: shouldn't be defaulting these expressions
 Prelude> :type (+)
 forall a. (Num a) => a -> a -> a

diff --git a/ghc/tests/ghci/ghci002.stdout b/ghc/tests/ghci/ghci002.stdout
index f34f092..6fa668e 100644 (file)
--- a/ghc/tests/ghci/ghci002.stdout
+++ b/ghc/tests/ghci/ghci002.stdout
@@ -1,10 +1,12 @@
    ___         ___ _
   / _ \ /\  /\/ __(_)
- / /_\// /_/ / /  | |      GHC Interactive, version 4.11, For Haskell 98.
+ / /_\// /_/ / /  | |      GHC Interactive, version 5.01, for Haskell 98.
 / /_\\/ __  / /___| |      http://www.haskell.org/ghc/
 \____/\/ /_/\____/|_|      Type :? for help.
 
 Loading package std ... linking ... done.
+*** WARNING: . is writable by someone else, IGNORING!
+*** WARNING: ./.ghci is writable by someone else, IGNORING!
 Prelude> -- bug: we used to throw away the instance accidentally here
 Prelude> :m PrelBase
 PrelBase> 1 == (2 :: Int)

diff --git a/ghc/tests/ghci/ghci003.stdout b/ghc/tests/ghci/ghci003.stdout
index 7bfabbe..b1c768e 100644 (file)
--- a/ghc/tests/ghci/ghci003.stdout
+++ b/ghc/tests/ghci/ghci003.stdout
@@ -1,10 +1,12 @@
    ___         ___ _
   / _ \ /\  /\/ __(_)
- / /_\// /_/ / /  | |      GHC Interactive, version 4.11, For Haskell 98.
+ / /_\// /_/ / /  | |      GHC Interactive, version 5.01, for Haskell 98.
 / /_\\/ __  / /___| |      http://www.haskell.org/ghc/
 \____/\/ /_/\____/|_|      Type :? for help.
 
 Loading package std ... linking ... done.
+*** WARNING: . is writable by someone else, IGNORING!
+*** WARNING: ./.ghci is writable by someone else, IGNORING!
 Prelude> -- check that 'it' works
 Prelude> 1
 1

diff --git a/ghc/tests/ghci/ghci004.stdout b/ghc/tests/ghci/ghci004.stdout
index 9b1bae5..7f530a1 100644 (file)
--- a/ghc/tests/ghci/ghci004.stdout
+++ b/ghc/tests/ghci/ghci004.stdout
@@ -1,10 +1,12 @@
    ___         ___ _
   / _ \ /\  /\/ __(_)
- / /_\// /_/ / /  | |      GHC Interactive, version 4.11, For Haskell 98.
+ / /_\// /_/ / /  | |      GHC Interactive, version 5.01, for Haskell 98.
 / /_\\/ __  / /___| |      http://www.haskell.org/ghc/
 \____/\/ /_/\____/|_|      Type :? for help.
 
 Loading package std ... linking ... done.
+*** WARNING: . is writable by someone else, IGNORING!
+*** WARNING: ./.ghci is writable by someone else, IGNORING!
 Prelude> :unset +s +t
 Prelude> -- test importing a module from a package
 Prelude> :l ghci004

diff --git a/ghc/tests/ghci/ghci005.stdout b/ghc/tests/ghci/ghci005.stdout
index 7514da8..aaef7c5 100644 (file)
--- a/ghc/tests/ghci/ghci005.stdout
+++ b/ghc/tests/ghci/ghci005.stdout
@@ -1,10 +1,12 @@
    ___         ___ _
   / _ \ /\  /\/ __(_)
- / /_\// /_/ / /  | |      GHC Interactive, version 4.11, For Haskell 98.
+ / /_\// /_/ / /  | |      GHC Interactive, version 5.01, for Haskell 98.
 / /_\\/ __  / /___| |      http://www.haskell.org/ghc/
 \____/\/ /_/\____/|_|      Type :? for help.
 
 Loading package std ... linking ... done.
+*** WARNING: . is writable by someone else, IGNORING!
+*** WARNING: ./.ghci is writable by someone else, IGNORING!
 Prelude> :unset +s +t
 Prelude> -- tests for :def, :undef
 Prelude> let void m = m >> return ""
@@ -16,7 +18,7 @@ Prelude> let echo s = return (":! echo " ++ map Char.toUpper s)
 hello, world!
 Prelude> :echo hello, world!
 Prelude> :def echo echo
-ghc: command `echo' is already defined
+command `echo' is already defined
 Prelude> :undef echo
 Prelude> :def echo echo
 Prelude> :echo hello, world!

diff --git a/ghc/tests/ghci/ghci006.hs b/ghc/tests/ghci/ghci006.hs
index a09377c..c1bef51 100644 (file)
--- a/ghc/tests/ghci/ghci006.hs
+++ b/ghc/tests/ghci/ghci006.hs
@@ -1,6 +1,8 @@
 
+module Ghci006 where
+
 data Q = forall x . Show x => Q x
 showQ (Q x) = show x
 
 -- associated bug is that at the interpreter command line,
---   showQ (Q "foo") crashed the interpreter.
\ No newline at end of file
+--   showQ (Q "foo") crashed the interpreter.

diff --git a/ghc/tests/ghci/ghci006.stderr b/ghc/tests/ghci/ghci006.stderr
new file mode 100644 (file)
index 0000000..75eb459
--- /dev/null
+++ b/ghc/tests/ghci/ghci006.stderr
@@ -0,0 +1 @@
+Compiling Ghci006          ( ghci006.hs, interpreted )

diff --git a/ghc/tests/ghci/ghci006.stdout b/ghc/tests/ghci/ghci006.stdout
index c0f6098..a1e722c 100644 (file)
--- a/ghc/tests/ghci/ghci006.stdout
+++ b/ghc/tests/ghci/ghci006.stdout
@@ -1 +1,18 @@
-\"foo\"
+   ___         ___ _
+  / _ \ /\  /\/ __(_)
+ / /_\// /_/ / /  | |      GHC Interactive, version 5.01, for Haskell 98.
+/ /_\\/ __  / /___| |      http://www.haskell.org/ghc/
+\____/\/ /_/\____/|_|      Type :? for help.
+
+Loading package std ... linking ... done.
+*** WARNING: . is writable by someone else, IGNORING!
+*** WARNING: ./.ghci is writable by someone else, IGNORING!
+Prelude> :unset +s +t
+Prelude> :s -fglasgow-exts
+Prelude> -- test for contexts on existential types crashing the interpreter
+Prelude> :l ghci006
+Ok, modules loaded: Ghci006.
+Ghci006> showQ (Q "foo")
+"\"foo\""
+Ghci006> 
+Ghci006> Leaving GHCi.

diff --git a/ghc/tests/ghci/prog001/prog001.stdout b/ghc/tests/ghci/prog001/prog001.stdout
index c697eeb..a333f37 100644 (file)
--- a/ghc/tests/ghci/prog001/prog001.stdout
+++ b/ghc/tests/ghci/prog001/prog001.stdout
@@ -1,6 +1,6 @@
    ___         ___ _
   / _ \ /\  /\/ __(_)
- / /_\// /_/ / /  | |      GHC Interactive, version 4.11, For Haskell 98.
+ / /_\// /_/ / /  | |      GHC Interactive, version 5.01, for Haskell 98.
 / /_\\/ __  / /___| |      http://www.haskell.org/ghc/
 \____/\/ /_/\____/|_|      Type :? for help.
 

diff --git a/ghc/tests/ghci/prog002/prog002.stdout b/ghc/tests/ghci/prog002/prog002.stdout
index eb7d354..72afca3 100644 (file)
--- a/ghc/tests/ghci/prog002/prog002.stdout
+++ b/ghc/tests/ghci/prog002/prog002.stdout
@@ -1,6 +1,6 @@
    ___         ___ _
   / _ \ /\  /\/ __(_)
- / /_\// /_/ / /  | |      GHC Interactive, version 4.11, For Haskell 98.
+ / /_\// /_/ / /  | |      GHC Interactive, version 5.01, for Haskell 98.
 / /_\\/ __  / /___| |      http://www.haskell.org/ghc/
 \____/\/ /_/\____/|_|      Type :? for help.