[project @ 2005-10-31 10:25:45 by simonpj]

Accept changes in columnn numbers, now that tabs count as 1, not 8.
(There are some minor changes in where line breaks occur too,
 for reasons I don't understand.)

testsuite/tests/ghc-regress/typecheck/should_fail/tcfail038.stderr

 
-tcfail038.hs:7:10:
+tcfail038.hs:7:3:
     Conflicting definitions for `=='
-    Bound at: tcfail038.hs:7:10-11
-	      tcfail038.hs:9:10-11
+    Bound at: tcfail038.hs:7:3-4
+	      tcfail038.hs:9:3-4
     In the bindings in an instance declaration
 
-tcfail038.hs:8:10:
+tcfail038.hs:8:3:
     Conflicting definitions for `/='
-    Bound at: tcfail038.hs:8:10-11
-	      tcfail038.hs:10:10-11
+    Bound at: tcfail038.hs:8:3-4
+	      tcfail038.hs:10:3-4
     In the bindings in an instance declaration

testsuite/tests/ghc-regress/typecheck/should_fail/tcfail046.stderr

 
-tcfail046.hs:9:8:
+tcfail046.hs:9:6:
     No instance for (Eq (Process a))
-      arising from the 'deriving' clause of a data type declaration at tcfail046.hs:9:8
+      arising from the 'deriving' clause of a data type declaration at tcfail046.hs:9:6
     Probable fix: add an instance declaration for (Eq (Process a))
     When deriving the `Eq' instance for type `Continuation'
 

testsuite/tests/ghc-regress/typecheck/should_fail/tcfail068.stderr

-
-tcfail068.hs:14:8:
-    Couldn't match the rigid variable `s' against the rigid variable `s1'
-      `s' is bound by the type signature for `itgen'
-      `s1' is bound by the polymorphic type `forall s1. GHC.ST.ST s1 a'
-			 at tcfail068.hs:(13,8)-(14,30)
-      Expected type: GHC.ST.ST s1 (IndTree s a1)
-      Inferred type: GHC.ST.ST s1 (STArray s1 i e)
-    In the application `newSTArray ((1, 1), n) x'
-    In the first argument of `runST', namely `(newSTArray ((1, 1), n) x)'
-
-tcfail068.hs:19:8:
-    Couldn't match the rigid variable `s' against the rigid variable `s1'
-      `s' is bound by the polymorphic type `forall s. GHC.ST.ST s a'
-			at tcfail068.hs:(18,8)-(21,18)
-      `s1' is bound by the type signature for `itiap'
-      Expected type: GHC.ST.ST s (IndTree s1 a1)
-      Inferred type: GHC.ST.ST s1 (IndTree s1 a1)
-    In the expression:
-	(readSTArray arr i) >>= (\ val -> (writeSTArray arr i (f val)) >> (return arr))
-    In the first argument of `runST', namely
-	`((readSTArray arr i)
-	  >>= (\ val -> (writeSTArray arr i (f val)) >> (return arr)))'
-
-tcfail068.hs:24:34:
-    Couldn't match the rigid variable `s' against the rigid variable `s1'
-      `s' is bound by the polymorphic type `forall s. GHC.ST.ST s a'
-			at tcfail068.hs:24:28-44
-      `s1' is bound by the type signature for `itrap'
-      Expected type: GHC.ST.ST s (IndTree s1 a1)
-      Inferred type: GHC.ST.ST s1 (IndTree s1 a1)
-    In the application `itrap' i k'
-    In the first argument of `runST', namely `(itrap' i k)'
-
-tcfail068.hs:36:45:
-    Couldn't match the rigid variable `s' against the rigid variable `s1'
-      `s' is bound by the polymorphic type `forall s. GHC.ST.ST s a'
-			at tcfail068.hs:36:39-62
-      `s1' is bound by the type signature for `itrapstate'
-      Expected type: GHC.ST.ST s (c, IndTree s1 b)
-      Inferred type: GHC.ST.ST s1 (c, IndTree s1 b)
-    In the application `itrapstate' i k s'
-    In the first argument of `runST', namely `(itrapstate' i k s)'
+
+tcfail068.hs:14:1:
+    Couldn't match the rigid variable `s'
+	   against the rigid variable `s1'
+      `s' is bound by the type signature for `itgen'
+      `s1' is bound by the polymorphic type `forall s1. GHC.ST.ST s1 a'
+			 at tcfail068.hs:(13,1)-(14,23)
+      Expected type: GHC.ST.ST s1 (IndTree s a1)
+      Inferred type: GHC.ST.ST s1 (STArray s1 i e)
+    In the application `newSTArray ((1, 1), n) x'
+    In the first argument of `runST', namely
+	`(newSTArray ((1, 1), n) x)'
+
+tcfail068.hs:19:1:
+    Couldn't match the rigid variable `s'
+	   against the rigid variable `s1'
+      `s' is bound by the polymorphic type `forall s. GHC.ST.ST s a'
+			at tcfail068.hs:(18,1)-(21,11)
+      `s1' is bound by the type signature for `itiap'
+      Expected type: GHC.ST.ST s (IndTree s1 a1)
+      Inferred type: GHC.ST.ST s1 (IndTree s1 a1)
+    In the expression:
+	(readSTArray arr i)
+	>>= (\ val -> (writeSTArray arr i (f val)) >> (return arr))
+    In the first argument of `runST', namely
+	`((readSTArray arr i)
+	  >>= (\ val -> (writeSTArray arr i (f val)) >> (return arr)))'
+
+tcfail068.hs:24:34:
+    Couldn't match the rigid variable `s'
+	   against the rigid variable `s1'
+      `s' is bound by the polymorphic type `forall s. GHC.ST.ST s a'
+			at tcfail068.hs:24:28-44
+      `s1' is bound by the type signature for `itrap'
+      Expected type: GHC.ST.ST s (IndTree s1 a1)
+      Inferred type: GHC.ST.ST s1 (IndTree s1 a1)
+    In the application `itrap' i k'
+    In the first argument of `runST', namely `(itrap' i k)'
+
+tcfail068.hs:36:45:
+    Couldn't match the rigid variable `s'
+	   against the rigid variable `s1'
+      `s' is bound by the polymorphic type `forall s. GHC.ST.ST s a'
+			at tcfail068.hs:36:39-62
+      `s1' is bound by the type signature for `itrapstate'
+      Expected type: GHC.ST.ST s (c, IndTree s1 b)
+      Inferred type: GHC.ST.ST s1 (c, IndTree s1 b)
+    In the application `itrapstate' i k s'
+    In the first argument of `runST', namely `(itrapstate' i k s)'

testsuite/tests/ghc-regress/typecheck/should_fail/tcfail075.stderr

 
-tcfail075.hs:11:0: Top-level bindings for unlifted types aren't allowed: x = 1#
+tcfail075.hs:11:0:
+    Top-level bindings for unlifted types aren't allowed: x = 1#
 
 tcfail075.hs:14:4:
     Couldn't match kind `#' against `*'
@@ -8,14 +9,14 @@ tcfail075.hs:14:4:
       Inferred type: a
     In the first argument of `(+#)', namely `x'
 
-tcfail075.hs:17:14:
+tcfail075.hs:17:7:
     Couldn't match kind `#' against `*'
     When matching the kinds of `Int# :: #' and `a :: *'
       Expected type: Int#
       Inferred type: a
     In the first argument of `(-#)', namely `x'
 
-tcfail075.hs:19:11:
+tcfail075.hs:19:4:
     Couldn't match kind `#' against `*'
     When matching the kinds of `Int# :: #' and `a :: *'
       Expected type: Int#

testsuite/tests/ghc-regress/typecheck/should_fail/tcfail076.stderr

-
-tcfail076.hs:18:81:
-    Couldn't match the rigid variable `res' against the rigid variable `res1'
-      `res' is bound by the polymorphic type `forall res. (a -> m res) -> m res'
-			  at tcfail076.hs:18:63-87
-      `res1' is bound by the polymorphic type `forall res1.
-					       (a1 -> m1 res1) -> m1 res1'
-			   at tcfail076.hs:18:27-95
-      Expected type: m2 res
-      Inferred type: m2 res1
-    In the application `cont a'
-    In a lambda abstraction: \ cont' -> cont a
+
+tcfail076.hs:18:67:
+    Couldn't match the rigid variable `res'
+	   against the rigid variable `res1'
+      `res' is bound by the polymorphic type `forall res.
+					      (a -> m res) -> m res'
+			  at tcfail076.hs:18:49-73
+      `res1' is bound by the polymorphic type `forall res1.
+					       (a1 -> m1 res1) -> m1 res1'
+			   at tcfail076.hs:18:13-81
+      Expected type: m2 res
+      Inferred type: m2 res1
+    In the application `cont a'
+    In a lambda abstraction: \ cont' -> cont a

testsuite/tests/ghc-regress/typecheck/should_fail/tcfail104.stderr

 
-tcfail104.hs:9:14:
+tcfail104.hs:9:7:
     Inferred type is less polymorphic than expected
       Quantified type variable `a' escapes
       Expected type: forall a1. a1 -> a1
@@ -7,7 +7,7 @@ tcfail104.hs:9:14:
     When checking the pattern: x :: forall a. a -> a
     In a lambda abstraction: \ (x :: forall a. a -> a) -> x
 
-tcfail104.hs:15:14:
+tcfail104.hs:15:7:
     Inferred type is less polymorphic than expected
       Quantified type variable `a' escapes
       Expected type: forall a1. a1 -> a1

testsuite/tests/ghc-regress/typecheck/should_fail/tcfail122.stderr

 
-tcfail122.hs:8:8:
+tcfail122.hs:8:1:
     Couldn't match kind `* -> *' against `(* -> *) -> *'
     When matching the kinds of `a :: * -> *' and `c :: (* -> *) -> *'
       Expected type: a b
       Inferred type: c d
-    In the expression: undefined :: forall c :: ((* -> *) -> *) d :: (* -> *). c d
+    In the expression:
+	  undefined :: forall c :: ((* -> *) -> *) d :: (* -> *). c d

testsuite/tests/ghc-regress/typecheck/should_fail/tcfail128.stderr

 
-tcfail128.hs:18:15:
+tcfail128.hs:18:8:
     No instance for (Data.Array.Base.MArray b FlatVector IO)
-      arising from use of `thaw' at tcfail128.hs:18:15-18
+      arising from use of `thaw' at tcfail128.hs:18:8-11
     Probable fix:
-      add an instance declaration for (Data.Array.Base.MArray b FlatVector IO)
+      add an instance declaration for (Data.Array.Base.MArray b
+							      FlatVector
+							      IO)
     In a 'do' expression: v <- thaw tmp
     In the definition of `main':
 	main = do

testsuite/tests/ghc-regress/typecheck/should_fail/tcfail135.stderr

 
-tcfail135.hs:6:22:
+tcfail135.hs:6:15:
     `f' is not applied to enough type arguments
     Expected kind `?', but `f' has kind `k -> *'
     In the type `f a -> f'