[project @ 2001-10-30 16:18:12 by simonmar]

Update sample output.  All the GHCi tests work as of today.

diff --git a/ghc/tests/ghci/ghci001.stdout b/ghc/tests/ghci/ghci001.stdout
index 2a123fe..4a86ff5 100644 (file)
--- a/ghc/tests/ghci/ghci001.stdout
+++ b/ghc/tests/ghci/ghci001.stdout
@@ -1,6 +1,6 @@
    ___         ___ _
   / _ \ /\  /\/ __(_)
- / /_\// /_/ / /  | |      GHC Interactive, version 5.01, for Haskell 98.
+ / /_\// /_/ / /  | |      GHC Interactive, version 5.03, for Haskell 98.
 / /_\\/ __  / /___| |      http://www.haskell.org/ghc/
 \____/\/ /_/\____/|_|      Type :? for help.
 

diff --git a/ghc/tests/ghci/ghci002.stdout b/ghc/tests/ghci/ghci002.stdout
index 03773d9..33aaac6 100644 (file)
--- a/ghc/tests/ghci/ghci002.stdout
+++ b/ghc/tests/ghci/ghci002.stdout
@@ -1,6 +1,6 @@
    ___         ___ _
   / _ \ /\  /\/ __(_)
- / /_\// /_/ / /  | |      GHC Interactive, version 5.01, for Haskell 98.
+ / /_\// /_/ / /  | |      GHC Interactive, version 5.03, for Haskell 98.
 / /_\\/ __  / /___| |      http://www.haskell.org/ghc/
 \____/\/ /_/\____/|_|      Type :? for help.
 

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

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

diff --git a/ghc/tests/ghci/ghci005.stdout b/ghc/tests/ghci/ghci005.stdout
index 8c3aed4..dbec13f 100644 (file)
--- a/ghc/tests/ghci/ghci005.stdout
+++ b/ghc/tests/ghci/ghci005.stdout
@@ -1,6 +1,6 @@
    ___         ___ _
   / _ \ /\  /\/ __(_)
- / /_\// /_/ / /  | |      GHC Interactive, version 5.01, for Haskell 98.
+ / /_\// /_/ / /  | |      GHC Interactive, version 5.03, for Haskell 98.
 / /_\\/ __  / /___| |      http://www.haskell.org/ghc/
 \____/\/ /_/\____/|_|      Type :? for help.
 
@@ -11,12 +11,12 @@ Prelude> let void m = m >> return ""
 Prelude> let echo s = void (putStrLn s)
 Prelude> :def echo echo
 Prelude> :echo hello, world!
+hello, world!
 Prelude> 
 Prelude> let echo s = return (":! echo " ++ map Char.toUpper s)
-hello, world!
 Prelude> :echo hello, world!
-Prelude> :def echo echo
 hello, world!
+Prelude> :def echo echo
 command `echo' is already defined
 Prelude> :undef echo
 Prelude> :def echo echo

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

diff --git a/ghc/tests/ghci/ghci007.stdout b/ghc/tests/ghci/ghci007.stdout
index 90b3d98..9df37f6 100644 (file)
--- a/ghc/tests/ghci/ghci007.stdout
+++ b/ghc/tests/ghci/ghci007.stdout
@@ -1,6 +1,6 @@
    ___         ___ _
   / _ \ /\  /\/ __(_)
- / /_\// /_/ / /  | |      GHC Interactive, version 5.01, for Haskell 98.
+ / /_\// /_/ / /  | |      GHC Interactive, version 5.03, for Haskell 98.
 / /_\\/ __  / /___| |      http://www.haskell.org/ghc/
 \____/\/ /_/\____/|_|      Type :? for help.
 

diff --git a/ghc/tests/ghci/ghci008.stdout b/ghc/tests/ghci/ghci008.stdout
index 3aab118..5db5463 100644 (file)
--- a/ghc/tests/ghci/ghci008.stdout
+++ b/ghc/tests/ghci/ghci008.stdout
@@ -1,6 +1,6 @@
    ___         ___ _
   / _ \ /\  /\/ __(_)
- / /_\// /_/ / /  | |      GHC Interactive, version 5.01, for Haskell 98.
+ / /_\// /_/ / /  | |      GHC Interactive, version 5.03, for Haskell 98.
 / /_\\/ __  / /___| |      http://www.haskell.org/ghc/
 \____/\/ /_/\____/|_|      Type :? for help.
 
@@ -44,10 +44,10 @@ class (RealFrac a, Floating a) => RealFloat a where {
     }
 Prelude> :info []
 -- [] is a data constructor
-[] :: forall t_12. [t_12]
+[] :: forall a. [a]
 
 -- [] is a type constructor
-data [] t_12 = [] | : t_12 [t_12]
+data [] a = [] | (:) a [a]
 Prelude> :info ()
 -- () is a data constructor
 () :: ()
@@ -56,10 +56,10 @@ Prelude> :info ()
 data () = ()
 Prelude> :info (,)
 -- (,) is a data constructor
-(,) :: forall t_12 t_13. t_12 -> t_13 -> (t_12, t_13)
+(,) :: forall a b. a -> b -> (a, b)
 
 -- (,) is a type constructor
-data (,) t_12 t_13 = (,) t_12 t_13
+data (,) a b = (,) a b
 Prelude> :info `List.isPrefixOf`
 -- List.isPrefixOf is a variable
 List.isPrefixOf :: forall a. (Eq a) => [a] -> [a] -> Bool

diff --git a/ghc/tests/ghci/prog001/prog001.stdout b/ghc/tests/ghci/prog001/prog001.stdout
index 6b26c99..bd9b24a 100644 (file)
--- a/ghc/tests/ghci/prog001/prog001.stdout
+++ b/ghc/tests/ghci/prog001/prog001.stdout
@@ -1,6 +1,6 @@
    ___         ___ _
   / _ \ /\  /\/ __(_)
- / /_\// /_/ / /  | |      GHC Interactive, version 5.01, for Haskell 98.
+ / /_\// /_/ / /  | |      GHC Interactive, version 5.03, 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 72afca3..50b8739 100644 (file)
--- a/ghc/tests/ghci/prog002/prog002.stdout
+++ b/ghc/tests/ghci/prog002/prog002.stdout
@@ -1,6 +1,6 @@
    ___         ___ _
   / _ \ /\  /\/ __(_)
- / /_\// /_/ / /  | |      GHC Interactive, version 5.01, for Haskell 98.
+ / /_\// /_/ / /  | |      GHC Interactive, version 5.03, for Haskell 98.
 / /_\\/ __  / /___| |      http://www.haskell.org/ghc/
 \____/\/ /_/\____/|_|      Type :? for help.
 

diff --git a/ghc/tests/ghci/prog003/prog003.stderr b/ghc/tests/ghci/prog003/prog003.stderr
index 001dc82..affe517 100644 (file)
--- a/ghc/tests/ghci/prog003/prog003.stderr
+++ b/ghc/tests/ghci/prog003/prog003.stderr
@@ -34,7 +34,7 @@ Compiling D                ( D.hs, interpreted )
 Compiling C                ( C.hs, interpreted )
 Compiling B                ( B.hs, interpreted )
 Compiling Main             ( A.hs, interpreted )
-ghc-5.01: chasing modules from: A
+ghc-5.03: chasing modules from: A
 Compiling D                ( D.hs, D.o )
 Compiling C                ( C.hs, C.o )
 Compiling B                ( B.hs, B.o )

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