[project @ 1996-07-26 20:58:52 by partain]

Final changes for 2.01

50 files changed, 101 insertions, 44 deletions

diff --git a/ghc/compiler/tests/Jmakefile b/ghc/compiler/tests/Jmakefile
index 716cc71966..8450a8258e 100644
--- a/ghc/compiler/tests/Jmakefile
+++ b/ghc/compiler/tests/Jmakefile
@@ -7,5 +7,4 @@ SUBDIRS = reader \
 	  deSugar \
 	  printing \
 	  ccall \
-	  deriving \
-	  bugs
+	  deriving
diff --git a/ghc/compiler/tests/ccall/cc001.hs b/ghc/compiler/tests/ccall/cc001.hs
index 8c37355ca3..c26a53f29c 100644
--- a/ghc/compiler/tests/ccall/cc001.hs
+++ b/ghc/compiler/tests/ccall/cc001.hs
@@ -2,7 +2,7 @@
 
 module Test where
 
-import PreludeGlaIO
+import PreludeGlaST
 
 -- simple functions
 
diff --git a/ghc/compiler/tests/ccall/cc002.hs b/ghc/compiler/tests/ccall/cc002.hs
index 3a4b66d1d7..95a061b971 100644
--- a/ghc/compiler/tests/ccall/cc002.hs
+++ b/ghc/compiler/tests/ccall/cc002.hs
@@ -2,20 +2,20 @@
 
 module Test where
 
-import PreludeGlaIO
+import PreludeGlaST
 
 -- Test returning results
 
-a :: PrimIO _MallocPtr
+a :: PrimIO ForeignObj
 a = _ccall_ a
 
-b :: PrimIO _StablePtr
+b :: PrimIO StablePtr
 b = _ccall_ b
 
 -- Test taking arguments
 
-c :: _MallocPtr -> PrimIO Int
+c :: ForeignObj -> PrimIO Int
 c x = _ccall_ c x
 
-d :: _StablePtr -> PrimIO Int
+d :: StablePtr -> PrimIO Int
 d x = _ccall_ d x
diff --git a/ghc/compiler/tests/ccall/cc003.hs b/ghc/compiler/tests/ccall/cc003.hs
index 5b8bd822e2..474a4b3ad3 100644
--- a/ghc/compiler/tests/ccall/cc003.hs
+++ b/ghc/compiler/tests/ccall/cc003.hs
@@ -1,7 +1,7 @@
 --!!! cc003 -- ccall with unresolved polymorphism (should fail)
 module Test where
 
-import PreludeGlaIO
+import PreludeGlaST
 
 fubar :: PrimIO Int
 fubar = ccall f `seqPrimIO` ccall b
diff --git a/ghc/compiler/tests/ccall/cc004.hs b/ghc/compiler/tests/ccall/cc004.hs
index 7ad0ceda16..6dee39973d 100644
--- a/ghc/compiler/tests/ccall/cc004.hs
+++ b/ghc/compiler/tests/ccall/cc004.hs
@@ -1,7 +1,7 @@
 --!!! cc004 -- ccall with synonyms, polymorphic type variables and user type variables.
 module Test where
 
-import PreludeGlaIO
+import PreludeGlaST
 
 -- Since I messed up the handling of polymorphism originally, I'll
 -- explicitly test code with UserSysTyVar (ie an explicit polymorphic
diff --git a/ghc/compiler/tests/deSugar/ds024.hs b/ghc/compiler/tests/deSugar/ds024.hs
index 1e5f7ebe07..6f0b27aade 100644
--- a/ghc/compiler/tests/deSugar/ds024.hs
+++ b/ghc/compiler/tests/deSugar/ds024.hs
@@ -3,6 +3,9 @@
 -- do all the right types get stuck on all the
 -- Nils and Conses?
 
+module ShouldSucceed where
+
+
 f x = [[], []]
 
 g x = ([], [], [])
diff --git a/ghc/compiler/tests/deSugar/ds026.hs b/ghc/compiler/tests/deSugar/ds026.hs
index 2f9faa7303..ff1f0bee7e 100644
--- a/ghc/compiler/tests/deSugar/ds026.hs
+++ b/ghc/compiler/tests/deSugar/ds026.hs
@@ -1,5 +1,7 @@
 --!!! ds026 -- classes -- incl. polymorphic method
 
+module ShouldSucceed where
+
 class Foo a where
   op :: a -> a
 
diff --git a/ghc/compiler/tests/deSugar/ds028.hs b/ghc/compiler/tests/deSugar/ds028.hs
index 728a0c89bc..18c0b7d622 100644
--- a/ghc/compiler/tests/deSugar/ds028.hs
+++ b/ghc/compiler/tests/deSugar/ds028.hs
@@ -1,5 +1,8 @@
 --!!! ds028: failable pats in top row
 
+module ShouldSucceed where
+
+
 -- when the first row of pats doesn't have convenient
 -- variables to grab...
 
diff --git a/ghc/compiler/tests/deSugar/ds031.hs b/ghc/compiler/tests/deSugar/ds031.hs
index 6454e08d03..3378800e16 100644
--- a/ghc/compiler/tests/deSugar/ds031.hs
+++ b/ghc/compiler/tests/deSugar/ds031.hs
@@ -1,3 +1,5 @@
+module ShouldSucceed where
+
 foldPair :: (a->a->a,b->b->b) -> (a,b) -> [(a,b)] -> (a,b)
 foldPair fg       ab [] = ab
 foldPair fg@(f,g) ab ((a,b):abs) = (f a u,g b v)
diff --git a/ghc/compiler/tests/deSugar/ds032.hs b/ghc/compiler/tests/deSugar/ds032.hs
index a1cda8468e..31bc07ebf5 100644
--- a/ghc/compiler/tests/deSugar/ds032.hs
+++ b/ghc/compiler/tests/deSugar/ds032.hs
@@ -1,5 +1,8 @@
 --!!! recursive funs tangled in an AbsBind
 
+module ShouldSucceed where
+
+
 flatten :: Int		-- Indentation
         -> Bool		-- True => just had a newline
         -> Float	-- Current seq to flatten
diff --git a/ghc/compiler/tests/deSugar/ds037.hs b/ghc/compiler/tests/deSugar/ds037.hs
index 924df509e0..6485341650 100644
--- a/ghc/compiler/tests/deSugar/ds037.hs
+++ b/ghc/compiler/tests/deSugar/ds037.hs
@@ -1,4 +1,6 @@
 --!!! AbsBinds with tyvars, no dictvars, but some dict binds
 --
+module ShouldSucceed where
+
 f x y = (fst (g y x), x+(1::Int))
 g x y = (fst (f x y), y+(1::Int))
diff --git a/ghc/compiler/tests/deSugar/ds039.hs b/ghc/compiler/tests/deSugar/ds039.hs
index ad6c1bed07..e153bfa51a 100644
--- a/ghc/compiler/tests/deSugar/ds039.hs
+++ b/ghc/compiler/tests/deSugar/ds039.hs
@@ -1,4 +1,7 @@
 --!!! make sure correct type applications get put in
 --!!!   when (:) is saturated.
 
+module ShouldSucceed where
+
+
 f = (:)
diff --git a/ghc/compiler/tests/deriving/drv001.hs b/ghc/compiler/tests/deriving/drv001.hs
index 707a05d9ba..ffe8196c8f 100644
--- a/ghc/compiler/tests/deriving/drv001.hs
+++ b/ghc/compiler/tests/deriving/drv001.hs
@@ -1,19 +1,21 @@
 --!!! canonical weird example for "deriving"
+module ShouldSucceed where
 
 data X a b
   = C1 (T a)
   | C2 (Y b)
   | C3 (X b a)
-  deriving Text
+  deriving (Read, Show)
 
 data Y b
   = D1
   | D2 (X Int b)
-  deriving Text
+  deriving (Read, Show)
 
 data T a
   = E1
 
-instance Eq a => Text (T a) where
+instance Eq a => Show (T a) where
     showsPrec = error "show"
+instance Eq a => Read (T a) where
     readsPrec = error "read"
diff --git a/ghc/compiler/tests/deriving/drv002.hs b/ghc/compiler/tests/deriving/drv002.hs
index e8855f2600..15eb2d9ecc 100644
--- a/ghc/compiler/tests/deriving/drv002.hs
+++ b/ghc/compiler/tests/deriving/drv002.hs
@@ -1,11 +1,14 @@
+module ShouldSucceed where
+
 data Z a b
   = C1 (T a)
   | C2 (Z [a] [b])
-  deriving Text
+  deriving (Show, Read)
 
 data T a
   = E1
 
-instance Eq a => Text (T a) where
+instance Eq a => Show (T a) where
     showsPrec = error "show"
+instance Eq a => Read (T a) where
     readsPrec = error "read"
diff --git a/ghc/compiler/tests/deriving/drv003.hs b/ghc/compiler/tests/deriving/drv003.hs
index 3da22bd9d0..f6d678006a 100644
--- a/ghc/compiler/tests/deriving/drv003.hs
+++ b/ghc/compiler/tests/deriving/drv003.hs
@@ -1,5 +1,7 @@
 --!!! This is the example given in TcDeriv
 --
+module ShouldSucceed where
+
 data T a b
   = C1 (Foo a) (Bar b) 
   | C2 Int (T b a) 
diff --git a/ghc/compiler/tests/deriving/drv004.hs b/ghc/compiler/tests/deriving/drv004.hs
index 9863e3ae3d..82afb6b8f0 100644
--- a/ghc/compiler/tests/deriving/drv004.hs
+++ b/ghc/compiler/tests/deriving/drv004.hs
@@ -1,5 +1,7 @@
 --!!! simple example of deriving Ord (and, implicitly, Eq)
 --
+module ShouldSucceed where
+
 data Foo a b
   = C1 a Int
   | C2 b Double
diff --git a/ghc/compiler/tests/deriving/drv005.hs b/ghc/compiler/tests/deriving/drv005.hs
index cef5fe6a5b..93d8b45e0e 100644
--- a/ghc/compiler/tests/deriving/drv005.hs
+++ b/ghc/compiler/tests/deriving/drv005.hs
@@ -1,4 +1,6 @@
 --!!! simple example of deriving Enum
 --
+module ShouldSucceed where
+
 data Foo = Foo1 | Foo2 | Foo3 | Foo4 | Foo5 | Foo6 | Foo7 | Foo8
     	 deriving Enum
diff --git a/ghc/compiler/tests/deriving/drv006.hs b/ghc/compiler/tests/deriving/drv006.hs
index a6d6d1c645..029f67adf4 100644
--- a/ghc/compiler/tests/deriving/drv006.hs
+++ b/ghc/compiler/tests/deriving/drv006.hs
@@ -1,5 +1,8 @@
 --!!! simple examples of deriving Ix
 --
+module ShouldSucceed where
+import Ix
+
 data Foo = Foo1 | Foo2 | Foo3 | Foo4 | Foo5 | Foo6 | Foo7 | Foo8
     	 deriving Ix
 
diff --git a/ghc/compiler/tests/deriving/drv007.hs b/ghc/compiler/tests/deriving/drv007.hs
index c1bbab1bae..ba1a864f30 100644
--- a/ghc/compiler/tests/deriving/drv007.hs
+++ b/ghc/compiler/tests/deriving/drv007.hs
@@ -1,3 +1,4 @@
 --!!! buggy deriving with function type, reported by Sigbjorn Finne
+module ShouldSucceed where
 
 data Foo = Foo (Int -> Int) deriving Eq
diff --git a/ghc/compiler/tests/rename/Jmakefile b/ghc/compiler/tests/rename/Jmakefile
index b018f9ddd6..aff8571ca5 100644
--- a/ghc/compiler/tests/rename/Jmakefile
+++ b/ghc/compiler/tests/rename/Jmakefile
@@ -7,7 +7,7 @@ runtests::
 	@echo '# Validation tests for the renamer (incl dependency analysis) #'
 	@echo '###############################################################'
 
-TEST_FLAGS=/*-ddump-rn1 -ddump-rn2 -ddump-rn3*/ -ddump-rn4
+TEST_FLAGS=/*-ddump-rn1 -ddump-rn2 -ddump-rn3*/ -ddump-rn
 
 RunStdTest(rn001,$(GHC), -noC $(TEST_FLAGS) rn001.hs -o2 rn001.stderr -x1)
 RunStdTest(rn002,$(GHC), -noC $(TEST_FLAGS) rn002.hs -o2 rn002.stderr -x1)
diff --git a/ghc/compiler/tests/typecheck/Jmakefile b/ghc/compiler/tests/typecheck/Jmakefile
index a4ca9c760c..7c079c008f 100644
--- a/ghc/compiler/tests/typecheck/Jmakefile
+++ b/ghc/compiler/tests/typecheck/Jmakefile
@@ -3,5 +3,4 @@
 SUBDIRS = /* TEMPORARILY OUT: check_mess */ \
 	  should_fail \
 	  /* TEMPORARILY OUT: test_exps */ \
-	  should_succeed \
-	  bugs
+	  should_succeed
diff --git a/ghc/compiler/tests/typecheck/should_fail/tcfail021.hs b/ghc/compiler/tests/typecheck/should_fail/tcfail021.hs
index 6afdea7920..f6758a1b2b 100644
--- a/ghc/compiler/tests/typecheck/should_fail/tcfail021.hs
+++ b/ghc/compiler/tests/typecheck/should_fail/tcfail021.hs
@@ -1,2 +1,3 @@
+module ShouldFail where
 
 f x x = 2
diff --git a/ghc/compiler/tests/typecheck/should_fail/tcfail029.hs b/ghc/compiler/tests/typecheck/should_fail/tcfail029.hs
index 312e6fee47..4b8f2c6c89 100644
--- a/ghc/compiler/tests/typecheck/should_fail/tcfail029.hs
+++ b/ghc/compiler/tests/typecheck/should_fail/tcfail029.hs
@@ -1,4 +1,5 @@
 --!!! tests for InstOpErr
+module ShouldFail where
 
 data Foo = Bar | Baz
 
diff --git a/ghc/compiler/tests/typecheck/should_fail/tcfail031.hs b/ghc/compiler/tests/typecheck/should_fail/tcfail031.hs
index c81ced8229..6b9a0de12b 100644
--- a/ghc/compiler/tests/typecheck/should_fail/tcfail031.hs
+++ b/ghc/compiler/tests/typecheck/should_fail/tcfail031.hs
@@ -1,2 +1,3 @@
+module ShouldFail where
 
 f x = if 'a' then 1 else 2
diff --git a/ghc/compiler/tests/typecheck/should_fail/tcfail033.hs b/ghc/compiler/tests/typecheck/should_fail/tcfail033.hs
index 5c8b4d8e7e..fdc0aff8ed 100644
--- a/ghc/compiler/tests/typecheck/should_fail/tcfail033.hs
+++ b/ghc/compiler/tests/typecheck/should_fail/tcfail033.hs
@@ -1,3 +1,4 @@
 -- from Jon Hill
+module ShouldFail where
 
 buglet = [ x | (x,y) <- buglet ]
diff --git a/ghc/compiler/tests/typecheck/should_fail/tcfail034.hs b/ghc/compiler/tests/typecheck/should_fail/tcfail034.hs
index e0d0ffeace..82aa18b418 100644
--- a/ghc/compiler/tests/typecheck/should_fail/tcfail034.hs
+++ b/ghc/compiler/tests/typecheck/should_fail/tcfail034.hs
@@ -10,6 +10,8 @@ I came across a rather nasty error message when I gave a function an
 incorrect type signature (the context is wrong). I can remember reading 
 in the source about this problem - I just thought I'd let you know anyway :-)
 -}
+module ShouldSucceed where
+
 
 test::(Num a, Eq a) => a -> Bool
 test x = (x `mod` 3) == 0
diff --git a/ghc/compiler/tests/typecheck/should_fail/tcfail035.hs b/ghc/compiler/tests/typecheck/should_fail/tcfail035.hs
index a0b9f0ee56..a12908ee5a 100644
--- a/ghc/compiler/tests/typecheck/should_fail/tcfail035.hs
+++ b/ghc/compiler/tests/typecheck/should_fail/tcfail035.hs
@@ -6,4 +6,4 @@ data NUM = ONE | TWO
 instance Num NUM
 instance Num NUM
 instance Eq NUM
-instance Text NUM
+instance Show NUM
diff --git a/ghc/compiler/tests/typecheck/should_fail/tcfail041.hs b/ghc/compiler/tests/typecheck/should_fail/tcfail041.hs
index ca92003d70..542c400a86 100644
--- a/ghc/compiler/tests/typecheck/should_fail/tcfail041.hs
+++ b/ghc/compiler/tests/typecheck/should_fail/tcfail041.hs
@@ -42,6 +42,7 @@ all right.
 	-- Lennart
 - ------- End of forwarded message -------
 -}
+module ShouldFail where
 
 sort :: Ord a => [a] -> [a]
 sort xs = s xs (length xs)
diff --git a/ghc/compiler/tests/typecheck/should_fail/tcfail042.hs b/ghc/compiler/tests/typecheck/should_fail/tcfail042.hs
index 566bfea991..37c24936a9 100644
--- a/ghc/compiler/tests/typecheck/should_fail/tcfail042.hs
+++ b/ghc/compiler/tests/typecheck/should_fail/tcfail042.hs
@@ -10,7 +10,7 @@ instance Num a => Foo [a] where
     foo (x:xs) = map (x+) xs
 
 
-instance (Eq a, Text a) => Bar [a] where
+instance (Eq a, Show a) => Bar [a] where
     bar []     = []
     bar (x:xs) = foo xs where u = x==x
                               v = show x
@@ -20,7 +20,7 @@ instance (Eq a, Text a) => Bar [a] where
 {-
 class Foo a => Bar2 a where bar2 :: a -> a
 
-instance (Eq a, Text a) => Foo [a]
+instance (Eq a, Show a) => Foo [a]
 
 instance Num a => Bar2 [a]
 
diff --git a/ghc/compiler/tests/typecheck/should_fail/tcfail044.hs b/ghc/compiler/tests/typecheck/should_fail/tcfail044.hs
index 9d056409f1..3f899a6f6b 100644
--- a/ghc/compiler/tests/typecheck/should_fail/tcfail044.hs
+++ b/ghc/compiler/tests/typecheck/should_fail/tcfail044.hs
@@ -19,4 +19,4 @@ ss = sin * sin
 cc = cos * cos
 tt = ss + cc
 
-main _ = [AppendChan stdout ((show (tt 0.4))++ "  "++(show (tt 1.652)))]
+main = putStr ((show (tt 0.4))++ "  "++(show (tt 1.652)))
diff --git a/ghc/compiler/tests/typecheck/should_fail/tcfail045.hs b/ghc/compiler/tests/typecheck/should_fail/tcfail045.hs
index f13b603508..83a1daf81c 100644
--- a/ghc/compiler/tests/typecheck/should_fail/tcfail045.hs
+++ b/ghc/compiler/tests/typecheck/should_fail/tcfail045.hs
@@ -1,7 +1,10 @@
 --!!! a bad _CCallable thing (from a bug from Satnam)
 --
-data Socket = Socket# _Addr
-instance _CCallable Socket
+module ShouldSucceed where
+import PreludeGlaST
+
+data Socket = Socket# Addr
+instance CCallable Socket
 
 f :: Socket -> PrimIO ()
 f x = _ccall_ foo x
diff --git a/ghc/compiler/tests/typecheck/should_fail/tcfail046.hs b/ghc/compiler/tests/typecheck/should_fail/tcfail046.hs
index c58988a5e3..40fad6ba7d 100644
--- a/ghc/compiler/tests/typecheck/should_fail/tcfail046.hs
+++ b/ghc/compiler/tests/typecheck/should_fail/tcfail046.hs
@@ -1,13 +1,13 @@
 --!! function types in deriving Eq things
 -- From a bug report by Dave Harrison <D.A.Harrison@newcastle.ac.uk>
 
-module Simulation(Process(..),
+module Simulation(Process,
 		  Status,
-		  Pid(..),
-		  Time(..),
+		  Pid,
+		  Time,
 		  Continuation,
 		  Message,
-		  MessList(..) ) where
+		  MessList ) where
 
 type 	Process a = Pid -> Time -> Message a -> ( MessList a, 
 			     		   	  Continuation a)
diff --git a/ghc/compiler/tests/typecheck/should_fail/tcfail048.hs b/ghc/compiler/tests/typecheck/should_fail/tcfail048.hs
index 5b58e204a2..f4400e2fa0 100644
--- a/ghc/compiler/tests/typecheck/should_fail/tcfail048.hs
+++ b/ghc/compiler/tests/typecheck/should_fail/tcfail048.hs
@@ -1,3 +1,4 @@
+module ShouldFail where
 
 class (B a) => C a where
  op1 :: a -> a
diff --git a/ghc/compiler/tests/typecheck/should_fail/tcfail049.hs b/ghc/compiler/tests/typecheck/should_fail/tcfail049.hs
index 3fa7791dff..64dee54a5c 100644
--- a/ghc/compiler/tests/typecheck/should_fail/tcfail049.hs
+++ b/ghc/compiler/tests/typecheck/should_fail/tcfail049.hs
@@ -1,2 +1,3 @@
+module ShouldFail where
 
 f x = g x
diff --git a/ghc/compiler/tests/typecheck/should_fail/tcfail050.hs b/ghc/compiler/tests/typecheck/should_fail/tcfail050.hs
index a1fa3541d2..c0cee979f7 100644
--- a/ghc/compiler/tests/typecheck/should_fail/tcfail050.hs
+++ b/ghc/compiler/tests/typecheck/should_fail/tcfail050.hs
@@ -1,2 +1,3 @@
+module ShouldFail where
 
 f x = B x
diff --git a/ghc/compiler/tests/typecheck/should_fail/tcfail051.hs b/ghc/compiler/tests/typecheck/should_fail/tcfail051.hs
index f94aa9d9bf..1b8e251c40 100644
--- a/ghc/compiler/tests/typecheck/should_fail/tcfail051.hs
+++ b/ghc/compiler/tests/typecheck/should_fail/tcfail051.hs
@@ -1,3 +1,4 @@
+module ShouldFail where
 
 instance B Bool where
  op1 a = a
diff --git a/ghc/compiler/tests/typecheck/should_fail/tcfail052.hs b/ghc/compiler/tests/typecheck/should_fail/tcfail052.hs
index 09488054ed..e9be21e6f2 100644
--- a/ghc/compiler/tests/typecheck/should_fail/tcfail052.hs
+++ b/ghc/compiler/tests/typecheck/should_fail/tcfail052.hs
@@ -1,2 +1,3 @@
+module ShouldFail where
 
 data C a = B a c
diff --git a/ghc/compiler/tests/typecheck/should_fail/tcfail054.hs b/ghc/compiler/tests/typecheck/should_fail/tcfail054.hs
index 69ce2e81b2..a4e724cf18 100644
--- a/ghc/compiler/tests/typecheck/should_fail/tcfail054.hs
+++ b/ghc/compiler/tests/typecheck/should_fail/tcfail054.hs
@@ -1,2 +1,3 @@
+module ShouldFail where
 
 f (B a) = True
diff --git a/ghc/compiler/tests/typecheck/should_fail/tcfail055.hs b/ghc/compiler/tests/typecheck/should_fail/tcfail055.hs
index fc6efe3bb7..f61c5a81be 100644
--- a/ghc/compiler/tests/typecheck/should_fail/tcfail055.hs
+++ b/ghc/compiler/tests/typecheck/should_fail/tcfail055.hs
@@ -1,2 +1,3 @@
+module ShouldFail where
 
 f x = (x + 1 :: Int) :: Float
diff --git a/ghc/compiler/tests/typecheck/should_fail/tcfail056.hs b/ghc/compiler/tests/typecheck/should_fail/tcfail056.hs
index 6e15f2bf5d..a8a1315be7 100644
--- a/ghc/compiler/tests/typecheck/should_fail/tcfail056.hs
+++ b/ghc/compiler/tests/typecheck/should_fail/tcfail056.hs
@@ -1,3 +1,4 @@
+module ShouldFail where
 
 data Foo = MkFoo Bool
 
diff --git a/ghc/compiler/tests/typecheck/should_fail/tcfail058.hs b/ghc/compiler/tests/typecheck/should_fail/tcfail058.hs
index 191d5644b9..c05c85972f 100644
--- a/ghc/compiler/tests/typecheck/should_fail/tcfail058.hs
+++ b/ghc/compiler/tests/typecheck/should_fail/tcfail058.hs
@@ -1,4 +1,5 @@
 module ShouldFail where
+import Array
 
 --!!! inadvertently using => instead of ->
 
diff --git a/ghc/compiler/tests/typecheck/should_fail/tcfail061.hs b/ghc/compiler/tests/typecheck/should_fail/tcfail061.hs
index 4ed535e9ea..2957e800d5 100644
--- a/ghc/compiler/tests/typecheck/should_fail/tcfail061.hs
+++ b/ghc/compiler/tests/typecheck/should_fail/tcfail061.hs
@@ -1,5 +1,6 @@
 --!! signature bugs exposed by Sigbjorne Finne
 --
+module ShouldFail where
 
 type Flarp a = (b,b)
 
diff --git a/ghc/compiler/tests/typecheck/should_fail/tcfail062.hs b/ghc/compiler/tests/typecheck/should_fail/tcfail062.hs
index 8989d91b20..5c9b0ea215 100644
--- a/ghc/compiler/tests/typecheck/should_fail/tcfail062.hs
+++ b/ghc/compiler/tests/typecheck/should_fail/tcfail062.hs
@@ -8,10 +8,10 @@ type Module = (String,[Declaration])
 data Declaration
   = Architecture String StructuralExpression |
     Behaviour String Parameter Parameter BehaviouralExpression
-    deriving (Eq, Text)
+    deriving (Eq, Show)
 
 data Parameter = ParameterVariable String | ParameterList [Parameter]
-                 deriving (Eq, Text)
+                 deriving (Eq, Show)
 
 nameOfModule :: Module -> String
 nameOfModule (name, _) = name
@@ -20,14 +20,14 @@ data StructuralExpression
   = Variable String |
     Serial StructuralExpression StructuralExpression | 
     Par [StructuralExpression] 
-    deriving (Eq, Text)
+    deriving (Eq, Show)
 
 data BehaviouralExpression
   = BehaviouralVariable String 
     | AndExpr BehaviouralExpression BehaviouralExpression
     | OrExpr BehaviouralExpression BehaviouralExpression
     | NotExpr BehaviouralExpression
-    deriving (Eq, Text)
+    deriving (Eq, Show)
 
 
 type BehaviouralRelation
diff --git a/ghc/compiler/tests/typecheck/should_fail/tcfail066.hs b/ghc/compiler/tests/typecheck/should_fail/tcfail066.hs
index f146acd759..2d2e9bafd8 100644
--- a/ghc/compiler/tests/typecheck/should_fail/tcfail066.hs
+++ b/ghc/compiler/tests/typecheck/should_fail/tcfail066.hs
@@ -5,6 +5,7 @@ From: Julian Seward (DRL PhD) <sewardj@computer-science.manchester.ac.uk>
 Message-Id: <9412081138.AA16652@rdf009.cs.man.ac.uk>
 To: partain@dcs.gla.ac.uk
 -}
+module ShouldFail where
 
 type IMonad a
    = IMonadState -> IMonadReturn a
diff --git a/ghc/compiler/tests/typecheck/should_fail/tcfail067.hs b/ghc/compiler/tests/typecheck/should_fail/tcfail067.hs
index b84328c414..99d4c648c0 100644
--- a/ghc/compiler/tests/typecheck/should_fail/tcfail067.hs
+++ b/ghc/compiler/tests/typecheck/should_fail/tcfail067.hs
@@ -14,11 +14,11 @@ subRangeValue (SubRange (lower, upper) value) = value
 subRange :: SubRange a -> (a, a)
 subRange (SubRange r value) = r
 
-newRange :: (Ord a, Text a) => (a, a) -> a -> SubRange a
+newRange :: (Ord a, Show a) => (a, a) -> a -> SubRange a
 newRange r value = checkRange (SubRange r value)
 
 
-checkRange :: (Ord a, Text a) => SubRange a -> SubRange a
+checkRange :: (Ord a, Show a) => SubRange a -> SubRange a
 checkRange (SubRange (lower, upper) value)
   = if (value < lower) || (value > upper) then
       error ("### sub range error. range = " ++ show lower ++ 
@@ -39,18 +39,18 @@ instance (Ord a) => Ord (SubRange a) where
 relOp :: Ord a => (a->a->Bool) -> SubRange a -> SubRange a -> Bool
 relOp op a b = (subRangeValue a) `op` (subRangeValue b)
 
-rangeOf :: (Ord a, Text a) => SubRange a -> SubRange a -> SubRange a
+rangeOf :: (Ord a, Show a) => SubRange a -> SubRange a -> SubRange a
 rangeOf a b = checkRange (SubRange (subRange b) (subRangeValue a))
 
-showRange :: Text a => SubRange a -> String
+showRange :: Show a => SubRange a -> String
 showRange (SubRange (lower, upper) value)
   = show value ++ " :" ++ show lower ++ ".." ++ show upper
 
-showRangePair :: (Text a, Text b) => (SubRange a, SubRange b) -> String
+showRangePair :: (Show a, Show b) => (SubRange a, SubRange b) -> String
 showRangePair (a, b)
   = "(" ++ showRange a ++ ", " ++ showRange b ++ ")"
 
-showRangeTriple :: (Text a, Text b, Text c) =>
+showRangeTriple :: (Show a, Show b, Show c) =>
                    (SubRange a, SubRange b, SubRange c) -> String
 showRangeTriple (a, b, c) 
   = "(" ++ showRange a ++ ", " ++ showRange b ++ ", " ++ showRange c ++ ")"
diff --git a/ghc/compiler/tests/typecheck/should_fail/tcfail068.hs b/ghc/compiler/tests/typecheck/should_fail/tcfail068.hs
index 2b17bcebc3..64bf294c08 100644
--- a/ghc/compiler/tests/typecheck/should_fail/tcfail068.hs
+++ b/ghc/compiler/tests/typecheck/should_fail/tcfail068.hs
@@ -6,22 +6,22 @@ module IndTree(IndTree(..), itgen, itiap, itrap, itrapstate) where
 --partain: import Auxiliary
 import PreludeGlaST
 
-type IndTree s t = _MutableArray s (Int,Int) t
+type IndTree s t = MutableArray s (Int,Int) t
 
 itgen :: Constructed a => (Int,Int) -> a -> IndTree s a
 itgen n x = 
-	_runST (
+	runST (
 	newArray ((1,1),n) x)
 
 itiap :: Constructed a => (Int,Int) -> (a->a) -> IndTree s a -> IndTree s a
 itiap i f arr =
-	_runST (
+	runST (
 	readArray arr i `thenStrictlyST` \val ->
 	writeArray arr i (f val) `seqStrictlyST`
 	returnStrictlyST arr)
 
 itrap :: Constructed a => ((Int,Int),(Int,Int)) -> (a->a) -> IndTree s a -> IndTree s a
-itrap ((i,k),(j,l)) f arr = _runST(itrap' i k)
+itrap ((i,k),(j,l)) f arr = runST(itrap' i k)
 	where
 	itrap' i k = if k > l then returnStrictlyST arr
 		     else (itrapsnd i k `seqStrictlyST`
@@ -33,7 +33,7 @@ itrap ((i,k),(j,l)) f arr = _runST(itrap' i k)
 
 itrapstate :: Constructed b => ((Int,Int),(Int,Int)) -> (a->b->(a,b)) -> ((Int,Int)->c->a) ->
 		(a->c) -> c -> IndTree s b -> (c, IndTree s b)
-itrapstate ((i,k),(j,l)) f c d s arr = _runST(itrapstate' i k s)
+itrapstate ((i,k),(j,l)) f c d s arr = runST(itrapstate' i k s)
 	where
 	itrapstate' i k s = if k > l then returnStrictlyST (s,arr)
 			    else (itrapstatesnd i k s `thenStrictlyST` \(s,arr) ->
diff --git a/ghc/compiler/tests/typecheck/should_succeed/tc002.hs b/ghc/compiler/tests/typecheck/should_succeed/tc002.hs
index fbe2cd50bd..85f1a91e1f 100644
--- a/ghc/compiler/tests/typecheck/should_succeed/tc002.hs
+++ b/ghc/compiler/tests/typecheck/should_succeed/tc002.hs
@@ -1 +1,3 @@
+module ShouldSucceed where
+
 b = if True then 1 else 2
diff --git a/ghc/compiler/tests/typecheck/should_succeed/tc069.hs b/ghc/compiler/tests/typecheck/should_succeed/tc069.hs
index 115af278b3..539b3046da 100644
--- a/ghc/compiler/tests/typecheck/should_succeed/tc069.hs
+++ b/ghc/compiler/tests/typecheck/should_succeed/tc069.hs
@@ -1,4 +1,4 @@
-
+module ShouldSucceed where
 
 x = 'a'
 (y:ys) = ['a','b','c'] where p = x
diff --git a/ghc/compiler/tests/typecheck/should_succeed/tc070.hs b/ghc/compiler/tests/typecheck/should_succeed/tc070.hs
index 3ef920f2af..831195f9f6 100644
--- a/ghc/compiler/tests/typecheck/should_succeed/tc070.hs
+++ b/ghc/compiler/tests/typecheck/should_succeed/tc070.hs
@@ -1,3 +1,5 @@
+module ShouldSucceed where
+
 
 data Boolean = FF | TT
 
diff --git a/ghc/compiler/tests/typecheck/should_succeed/tc081.hs b/ghc/compiler/tests/typecheck/should_succeed/tc081.hs
index 27c29329ae..6590550cf6 100644
--- a/ghc/compiler/tests/typecheck/should_succeed/tc081.hs
+++ b/ghc/compiler/tests/typecheck/should_succeed/tc081.hs
@@ -1,5 +1,6 @@
 --!!! an example Simon made up
 --
+module ShouldSucceed where
 
 f x = (x+1, x<3, g True, g 'c')
 	where