[project @ 2001-08-08 14:18:12 by simonmar]

update expected output

diff --git a/ghc/tests/deSugar/should_compile/ds002.stderr b/ghc/tests/deSugar/should_compile/ds002.stderr
index 1561121..629217e 100644 (file)
--- a/ghc/tests/deSugar/should_compile/ds002.stderr
+++ b/ghc/tests/deSugar/should_compile/ds002.stderr
@@ -1,7 +1,8 @@
 
-ds002.hs:7: Warning: Pattern match(es) are overlapped in the definition of function `f':
-           f y = ...
-           f z = ...
+ds002.hs:7: Warning: Pattern match(es) are overlapped
+    In the definition of `f':
+       f y = ...
+       f z = ...
 
-ds002.hs:11: Warning: Pattern match(es) are overlapped in the definition of function `g':
-           g x y z = ...
+ds002.hs:11: Warning: Pattern match(es) are overlapped
+    In the definition of `g': g x y z = ...

diff --git a/ghc/tests/deSugar/should_compile/ds003.stderr b/ghc/tests/deSugar/should_compile/ds003.stderr
index f0e2876..4eb1190 100644 (file)
--- a/ghc/tests/deSugar/should_compile/ds003.stderr
+++ b/ghc/tests/deSugar/should_compile/ds003.stderr
@@ -1,4 +1,5 @@
 
-ds003.hs:5: Warning: Pattern match(es) are overlapped in the definition of function `f':
-           f (x : (x1 : (x2 : x3))) ~(y, ys) z = ...
-           f x y True = ...
+ds003.hs:5: Warning: Pattern match(es) are overlapped
+    In the definition of `f':
+       f (x : (x1 : (x2 : x3))) ~(y, ys) z = ...
+       f x y True = ...

diff --git a/ghc/tests/deSugar/should_compile/ds019.stderr b/ghc/tests/deSugar/should_compile/ds019.stderr
index 135617c..f2ae2ad 100644 (file)
--- a/ghc/tests/deSugar/should_compile/ds019.stderr
+++ b/ghc/tests/deSugar/should_compile/ds019.stderr
@@ -1,5 +1,6 @@
 
-ds019.hs:5: Warning: Pattern match(es) are overlapped in the definition of function `f':
-           f d (j, k) p = ...
-           f (e, f, g) l q = ...
-           f h (m, n) r = ...
+ds019.hs:5: Warning: Pattern match(es) are overlapped
+    In the definition of `f':
+       f d (j, k) p = ...
+       f (e, f, g) l q = ...
+       f h (m, n) r = ...

diff --git a/ghc/tests/deSugar/should_compile/ds020.stderr b/ghc/tests/deSugar/should_compile/ds020.stderr
index 1266804..c838082 100644 (file)
--- a/ghc/tests/deSugar/should_compile/ds020.stderr
+++ b/ghc/tests/deSugar/should_compile/ds020.stderr
@@ -1,13 +1,14 @@
 
-ds020.hs:5: Warning: Pattern match(es) are overlapped in the definition of function `a':
-           a ~(~[], ~[], ~[]) = ...
+ds020.hs:5: Warning: Pattern match(es) are overlapped
+    In the definition of `a': a ~(~[], ~[], ~[]) = ...
 
-ds020.hs:8: Warning: Pattern match(es) are overlapped in the definition of function `b':
-           b ~(~x : (~xs : ~ys)) = ...
+ds020.hs:8: Warning: Pattern match(es) are overlapped
+    In the definition of `b': b ~(~x : (~xs : ~ys)) = ...
 
-ds020.hs:13: Warning: Pattern match(es) are overlapped in the definition of function `d':
-           d ~(n+43) = ...
-           d ~(n+999) = ...
+ds020.hs:13: Warning: Pattern match(es) are overlapped
+    In the definition of `d':
+       d ~(n+43) = ...
+       d ~(n+999) = ...
 
-ds020.hs:19: Warning: Pattern match(es) are overlapped in the definition of function `f':
-           f (x@~[]) = ...
+ds020.hs:19: Warning: Pattern match(es) are overlapped
+    In the definition of `f': f (x@~[]) = ...

diff --git a/ghc/tests/deSugar/should_compile/ds022.stderr b/ghc/tests/deSugar/should_compile/ds022.stderr
index f392c43..83a94e1 100644 (file)
--- a/ghc/tests/deSugar/should_compile/ds022.stderr
+++ b/ghc/tests/deSugar/should_compile/ds022.stderr
@@ -1,4 +1,5 @@
 
-ds022.hs:20: Warning: Pattern match(es) are overlapped in the definition of function `i':
-           i 1 1.1 = ...
-           i 2 2.2 = ...
+ds022.hs:20: Warning: Pattern match(es) are overlapped
+    In the definition of `i':
+       i 1 1.1 = ...
+       i 2 2.2 = ...

diff --git a/ghc/tests/deSugar/should_compile/ds040.stderr b/ghc/tests/deSugar/should_compile/ds040.stderr
index 60c3e51..d492cb2 100644 (file)
--- a/ghc/tests/deSugar/should_compile/ds040.stderr
+++ b/ghc/tests/deSugar/should_compile/ds040.stderr
@@ -1,3 +1,3 @@
 
-ds040.hs:9: Warning: Pattern match(es) are overlapped in the definition of function `^^^^':
-           ^^^^ _ _ = ...
+ds040.hs:9: Warning: Pattern match(es) are overlapped
+    In the definition of `^^^^': ^^^^ _ _ = ...

diff --git a/ghc/tests/deSugar/should_compile/ds041.stderr b/ghc/tests/deSugar/should_compile/ds041.stderr
index 536e038..69d5d1f 100644 (file)
--- a/ghc/tests/deSugar/should_compile/ds041.stderr
+++ b/ghc/tests/deSugar/should_compile/ds041.stderr
@@ -2,4 +2,4 @@
 ds041.hs:15:
     Warning: Field `x' is not initialised
             In the record construction: Foo {}
-            in the definition of function `foo': Foo {}
+            In the definition of `foo': Foo {}

diff --git a/ghc/tests/deSugar/should_compile/ds043.stderr b/ghc/tests/deSugar/should_compile/ds043.stderr
index 7a02594..d5f74d7 100644 (file)
--- a/ghc/tests/deSugar/should_compile/ds043.stderr
+++ b/ghc/tests/deSugar/should_compile/ds043.stderr
@@ -1,3 +1,4 @@
 
-ds043.hs:8: Warning: Pattern match(es) are overlapped in a group of case alternatives beginning (B _ _ _ _ True False):
-           B {e = True, f = False} -> ...
+ds043.hs:8: Warning: Pattern match(es) are overlapped
+    In a case alternative (B _ _ _ _ True False):
+       B {e = True, f = False} -> ...

diff --git a/ghc/tests/deSugar/should_compile/ds051.stderr b/ghc/tests/deSugar/should_compile/ds051.stderr
index 18554db..6d4c714 100644 (file)
--- a/ghc/tests/deSugar/should_compile/ds051.stderr
+++ b/ghc/tests/deSugar/should_compile/ds051.stderr
@@ -1,9 +1,9 @@
 
-ds051.hs:6: Warning: Pattern match(es) are overlapped in the definition of function `f1':
-           f1 "ab" = ...
+ds051.hs:6: Warning: Pattern match(es) are overlapped
+    In the definition of `f1': f1 "ab" = ...
 
-ds051.hs:11: Warning: Pattern match(es) are overlapped in the definition of function `f2':
-           f2 ('a' : ('b' : [])) = ...
+ds051.hs:11: Warning: Pattern match(es) are overlapped
+    In the definition of `f2': f2 ('a' : ('b' : [])) = ...
 
-ds051.hs:16: Warning: Pattern match(es) are overlapped in the definition of function `f3':
-           f3 "ab" = ...
+ds051.hs:16: Warning: Pattern match(es) are overlapped
+    In the definition of `f3': f3 "ab" = ...

diff --git a/ghc/tests/deriving/should_fail/drvfail004.stderr b/ghc/tests/deriving/should_fail/drvfail004.stderr
index b32730c..523ddc9 100644 (file)
--- a/ghc/tests/deriving/should_fail/drvfail004.stderr
+++ b/ghc/tests/deriving/should_fail/drvfail004.stderr
@@ -4,4 +4,5 @@ drvfail004.hs:5:
     Probable fix:
        Add `Eq (Foo a b)' to the instance declaration context
        Or add an instance declaration for `Eq (Foo a b)'
-    arising from an instance declaration at drvfail004.hs:5
+    arising from the instance declaration at drvfail004.hs:5
+    In the instance declaration for `Ord (Foo a b)'