From c6a9a46c654ce40fcf99ab05d0b8647e7bc060af Mon Sep 17 00:00:00 2001
From: simonmar <unknown>
Date: Thu, 29 Mar 2001 14:11:52 +0000
Subject: [PATCH] [project @ 2001-03-29 14:09:14 by simonmar] update expected
 output

---
 ghc/tests/rename/should_fail/rnfail001.stderr  |    5 +----
 ghc/tests/rename/should_fail/rnfail002.stderr  |    9 +++------
 ghc/tests/rename/should_fail/rnfail003.stderr  |    9 +++------
 ghc/tests/rename/should_fail/rnfail004.stderr  |    3 ---
 ghc/tests/rename/should_fail/rnfail007.stderr  |    5 +----
 ghc/tests/rename/should_fail/rnfail008.stderr  |    3 ---
 ghc/tests/rename/should_fail/rnfail009.stderr  |    9 +++------
 ghc/tests/rename/should_fail/rnfail010.stderr  |    9 +++------
 ghc/tests/rename/should_fail/rnfail011.stderr  |    9 +++------
 ghc/tests/rename/should_fail/rnfail012.stderr  |    9 +++------
 ghc/tests/rename/should_fail/rnfail013.stderr  |    9 +++------
 ghc/tests/rename/should_fail/rnfail015.stderr  |   10 ++++------
 ghc/tests/rename/should_fail/rnfail016.stderr  |    3 ---
 ghc/tests/rename/should_fail/rnfail017.stderr  |    7 ++-----
 ghc/tests/rename/should_fail/rnfail018.stderr  |    3 ---
 ghc/tests/rename/should_fail/rnfail019.hs      |    3 ---
 ghc/tests/rename/should_fail/rnfail019.stderr  |    5 +----
 ghc/tests/rename/should_fail/rnfail020.stderr  |   15 +++++++++------
 ghc/tests/rename/should_fail/rnfail021.stderr  |    5 +----
 ghc/tests/rename/should_fail/rnfail022.stderr  |    3 ---
 ghc/tests/rename/should_fail/rnfail023.stderr  |    3 ---
 ghc/tests/rename/should_fail/rnfail024.stderr  |    3 ---
 ghc/tests/rename/should_fail/rnfail025.stderr  |    3 ---
 ghc/tests/rename/should_fail/rnfail027.stderr  |    2 ++
 ghc/tests/stranal/should_compile/Makefile      |    2 --
 ghc/tests/stranal/should_compile/str001.stderr |    1 -
 26 files changed, 42 insertions(+), 105 deletions(-)

diff --git a/ghc/tests/rename/should_fail/rnfail001.stderr b/ghc/tests/rename/should_fail/rnfail001.stderr
index d8552f2..193391f 100644
--- a/ghc/tests/rename/should_fail/rnfail001.stderr
+++ b/ghc/tests/rename/should_fail/rnfail001.stderr
@@ -1,7 +1,4 @@
 
 rnfail001.hs:3:
     Conflicting definitions for `x'
-    in in a pattern match
-
-Compilation had errors
-
+    in a pattern match
diff --git a/ghc/tests/rename/should_fail/rnfail002.stderr b/ghc/tests/rename/should_fail/rnfail002.stderr
index 58f13b7..9ef5c17 100644
--- a/ghc/tests/rename/should_fail/rnfail002.stderr
+++ b/ghc/tests/rename/should_fail/rnfail002.stderr
@@ -1,8 +1,5 @@
 
 rnfail002.hs:4:
-    Multiple declarations of `y'
-	defined at rnfail002.hs:5
-	defined at rnfail002.hs:6
-
-Compilation had errors
-
+    Multiple declarations of `Main.y'
+	rnfail002.hs:5
+	rnfail002.hs:6
diff --git a/ghc/tests/rename/should_fail/rnfail003.stderr b/ghc/tests/rename/should_fail/rnfail003.stderr
index 04fffdb..1ba4c9c 100644
--- a/ghc/tests/rename/should_fail/rnfail003.stderr
+++ b/ghc/tests/rename/should_fail/rnfail003.stderr
@@ -1,8 +1,5 @@
 
 rnfail003.hs:2:
-    Multiple declarations of `f'
-	defined at rnfail003.hs:2
-	defined at rnfail003.hs:4
-
-Compilation had errors
-
+    Multiple declarations of `Main.f'
+	rnfail003.hs:2
+	rnfail003.hs:4
diff --git a/ghc/tests/rename/should_fail/rnfail004.stderr b/ghc/tests/rename/should_fail/rnfail004.stderr
index 3db6dd2..d4d3a9a 100644
--- a/ghc/tests/rename/should_fail/rnfail004.stderr
+++ b/ghc/tests/rename/should_fail/rnfail004.stderr
@@ -6,6 +6,3 @@ rnfail004.hs:7:
 rnfail004.hs:8:
     Conflicting definitions for `b'
     in a binding group
-
-Compilation had errors
-
diff --git a/ghc/tests/rename/should_fail/rnfail007.stderr b/ghc/tests/rename/should_fail/rnfail007.stderr
index 4a25ef3..91802bc 100644
--- a/ghc/tests/rename/should_fail/rnfail007.stderr
+++ b/ghc/tests/rename/should_fail/rnfail007.stderr
@@ -1,5 +1,2 @@
 
-rnfail007.hs:3: Variable not in scope: `Main.main'
-
-Compilation had errors
-
+rnfail007.hs:3: Variable not in scope: `main'
diff --git a/ghc/tests/rename/should_fail/rnfail008.stderr b/ghc/tests/rename/should_fail/rnfail008.stderr
index deaaaaa..34788e3 100644
--- a/ghc/tests/rename/should_fail/rnfail008.stderr
+++ b/ghc/tests/rename/should_fail/rnfail008.stderr
@@ -1,5 +1,2 @@
 
 rnfail008.hs:18: Variable not in scope: `op3'
-
-Compilation had errors
-
diff --git a/ghc/tests/rename/should_fail/rnfail009.stderr b/ghc/tests/rename/should_fail/rnfail009.stderr
index dd67a9f..347be46 100644
--- a/ghc/tests/rename/should_fail/rnfail009.stderr
+++ b/ghc/tests/rename/should_fail/rnfail009.stderr
@@ -1,8 +1,5 @@
 
 rnfail009.hs:1:
-    Multiple declarations of `A'
-	defined at rnfail009.hs:3
-	defined at rnfail009.hs:5
-
-Compilation had errors
-
+    Multiple declarations of `Foo.A'
+	rnfail009.hs:3
+	rnfail009.hs:5
diff --git a/ghc/tests/rename/should_fail/rnfail010.stderr b/ghc/tests/rename/should_fail/rnfail010.stderr
index 12e987c..36d10f8 100644
--- a/ghc/tests/rename/should_fail/rnfail010.stderr
+++ b/ghc/tests/rename/should_fail/rnfail010.stderr
@@ -1,8 +1,5 @@
 
 rnfail010.hs:2:
-    Multiple declarations of `f'
-	defined at rnfail010.hs:2
-	defined at rnfail010.hs:6
-
-Compilation had errors
-
+    Multiple declarations of `Main.f'
+	rnfail010.hs:2
+	rnfail010.hs:6
diff --git a/ghc/tests/rename/should_fail/rnfail011.stderr b/ghc/tests/rename/should_fail/rnfail011.stderr
index 3b6fe95..68d2f40 100644
--- a/ghc/tests/rename/should_fail/rnfail011.stderr
+++ b/ghc/tests/rename/should_fail/rnfail011.stderr
@@ -1,8 +1,5 @@
 
 rnfail011.hs:2:
-    Multiple declarations of `A'
-	defined at rnfail011.hs:2
-	defined at rnfail011.hs:6
-
-Compilation had errors
-
+    Multiple declarations of `Main.A'
+	rnfail011.hs:2
+	rnfail011.hs:6
diff --git a/ghc/tests/rename/should_fail/rnfail012.stderr b/ghc/tests/rename/should_fail/rnfail012.stderr
index d893c65..de3999f 100644
--- a/ghc/tests/rename/should_fail/rnfail012.stderr
+++ b/ghc/tests/rename/should_fail/rnfail012.stderr
@@ -1,8 +1,5 @@
 
 rnfail012.hs:2:
-    Multiple declarations of `A'
-	defined at rnfail012.hs:2
-	defined at rnfail012.hs:8
-
-Compilation had errors
-
+    Multiple declarations of `Main.A'
+	rnfail012.hs:2
+	rnfail012.hs:8
diff --git a/ghc/tests/rename/should_fail/rnfail013.stderr b/ghc/tests/rename/should_fail/rnfail013.stderr
index 4536981..1a2c8a6 100644
--- a/ghc/tests/rename/should_fail/rnfail013.stderr
+++ b/ghc/tests/rename/should_fail/rnfail013.stderr
@@ -1,8 +1,5 @@
 
 rnfail013.hs:3:
-    Multiple declarations of `MkT'
-	defined at rnfail013.hs:5
-	defined at rnfail013.hs:7
-
-Compilation had errors
-
+    Multiple declarations of `Foo.MkT'
+	rnfail013.hs:5
+	rnfail013.hs:7
diff --git a/ghc/tests/rename/should_fail/rnfail015.stderr b/ghc/tests/rename/should_fail/rnfail015.stderr
index 6760dd0..472c5b4 100644
--- a/ghc/tests/rename/should_fail/rnfail015.stderr
+++ b/ghc/tests/rename/should_fail/rnfail015.stderr
@@ -1,7 +1,5 @@
 
-rnfail015.hs:8:
-    Conflicting definitions for `TokLiteral'
-    in the data type declaration for `Token'
-
-Compilation had errors
-
+rnfail015.hs:1:
+    Multiple declarations of `ShouldFail.TokLiteral'
+	rnfail015.hs:8
+	rnfail015.hs:14
diff --git a/ghc/tests/rename/should_fail/rnfail016.stderr b/ghc/tests/rename/should_fail/rnfail016.stderr
index 3fae669..dc31f5d 100644
--- a/ghc/tests/rename/should_fail/rnfail016.stderr
+++ b/ghc/tests/rename/should_fail/rnfail016.stderr
@@ -4,6 +4,3 @@ rnfail016.hs:5: Pattern syntax in expression context: x@x
 rnfail016.hs:6: Pattern syntax in expression context: ~x
 
 rnfail016.hs:7: Pattern syntax in expression context: _
-
-Compilation had errors
-
diff --git a/ghc/tests/rename/should_fail/rnfail017.stderr b/ghc/tests/rename/should_fail/rnfail017.stderr
index 665afc9..0867ade 100644
--- a/ghc/tests/rename/should_fail/rnfail017.stderr
+++ b/ghc/tests/rename/should_fail/rnfail017.stderr
@@ -1,11 +1,8 @@
 
 rnfail017.hs:5:
     precedence parsing error
-	cannot mix `+' [infixl 6] and prefix `-' [infixl 6] in the same infix expression
+	cannot mix `(+)' [infixl 6] and prefix `-' [infixl 6] in the same infix expression
 
 rnfail017.hs:6:
     precedence parsing error
-	cannot mix `*' [infixl 7] and prefix `-' [infixl 6] in the same infix expression
-
-Compilation had errors
-
+	cannot mix `(*)' [infixl 7] and prefix `-' [infixl 6] in the same infix expression
diff --git a/ghc/tests/rename/should_fail/rnfail018.stderr b/ghc/tests/rename/should_fail/rnfail018.stderr
index ea2975b..50f4b86 100644
--- a/ghc/tests/rename/should_fail/rnfail018.stderr
+++ b/ghc/tests/rename/should_fail/rnfail018.stderr
@@ -6,6 +6,3 @@ rnfail018.hs:12: Type variable not in scope: `m'
 rnfail018.hs:12: Type variable not in scope: `m'
 
 rnfail018.hs:12: Type variable not in scope: `a'
-
-Compilation had errors
-
diff --git a/ghc/tests/rename/should_fail/rnfail019.hs b/ghc/tests/rename/should_fail/rnfail019.hs
index 7f54942..ec97efe 100644
--- a/ghc/tests/rename/should_fail/rnfail019.hs
+++ b/ghc/tests/rename/should_fail/rnfail019.hs
@@ -5,6 +5,3 @@ module ShouldFail where
 f x y = (x:y:)
 
 -- GHC 4.04 (as released) let this by, but it's a precedence error.
-
-
-
diff --git a/ghc/tests/rename/should_fail/rnfail019.stderr b/ghc/tests/rename/should_fail/rnfail019.stderr
index e1a9879..e2305c3 100644
--- a/ghc/tests/rename/should_fail/rnfail019.stderr
+++ b/ghc/tests/rename/should_fail/rnfail019.stderr
@@ -1,8 +1,5 @@
 
 rnfail019.hs:5:
     The operator `:' [infixr 5] of a section
-	must have lower precedence than the operand `:' [infixr 5]
+	must have lower precedence than the operand `(:)' [infixr 5]
 	In the section: `((x : y) :)'
-
-Compilation had errors
-
diff --git a/ghc/tests/rename/should_fail/rnfail020.stderr b/ghc/tests/rename/should_fail/rnfail020.stderr
index 802f9f3..461dc6d 100644
--- a/ghc/tests/rename/should_fail/rnfail020.stderr
+++ b/ghc/tests/rename/should_fail/rnfail020.stderr
@@ -1,8 +1,11 @@
 
 rnfail020.hs:12:
-    All of the type variable(s) in the constraint `Eq a' are already in scope
-	At least one must be universally quantified here
-    In the type signature for `unionSets'
-
-Compilation had errors
-
+    The constraint `Eq a' does not mention any of the universally quantified type variables
+	in the type `(Eq a) => Set a -> Set a -> Set a'
+    In a type signature for `unionSets'
+    In an equation for function `unionSetB':
+	unionSetB (s1 :: Set a) s2
+		    = unionSets s1 s2
+		    where
+			unionSets :: forall. (Eq a) => Set a -> Set a -> Set a
+			unionSets a b = a
diff --git a/ghc/tests/rename/should_fail/rnfail021.stderr b/ghc/tests/rename/should_fail/rnfail021.stderr
index 00d554d..76a236f 100644
--- a/ghc/tests/rename/should_fail/rnfail021.stderr
+++ b/ghc/tests/rename/should_fail/rnfail021.stderr
@@ -1,6 +1,3 @@
 
 rnfail021.hs:5:
-    Invalid use of qualified name `Baz.f' in the binding for `Baz.f'
-
-Compilation had errors
-
+    Invalid use of qualified name `Baz.f' in its declaration
diff --git a/ghc/tests/rename/should_fail/rnfail022.stderr b/ghc/tests/rename/should_fail/rnfail022.stderr
index 6d6af2f..f425ef4 100644
--- a/ghc/tests/rename/should_fail/rnfail022.stderr
+++ b/ghc/tests/rename/should_fail/rnfail022.stderr
@@ -1,5 +1,2 @@
 
 rnfail022.hs:8: Variable not in scope: `intersperse'
-
-Compilation had errors
-
diff --git a/ghc/tests/rename/should_fail/rnfail023.stderr b/ghc/tests/rename/should_fail/rnfail023.stderr
index 2725fe6..faf09bb 100644
--- a/ghc/tests/rename/should_fail/rnfail023.stderr
+++ b/ghc/tests/rename/should_fail/rnfail023.stderr
@@ -4,6 +4,3 @@ rnfail023.hs:7: Variable not in scope: `f'
 rnfail023.hs:8: Variable not in scope: `f'
 
 rnfail023.hs:14: Variable not in scope: `g'
-
-Compilation had errors
-
diff --git a/ghc/tests/rename/should_fail/rnfail024.stderr b/ghc/tests/rename/should_fail/rnfail024.stderr
index b8769fc..1519c38 100644
--- a/ghc/tests/rename/should_fail/rnfail024.stderr
+++ b/ghc/tests/rename/should_fail/rnfail024.stderr
@@ -2,6 +2,3 @@
 rnfail024.hs:3: Variable not in scope: `sig_without_a_defn'
 
 rnfail024.hs:6: Variable not in scope: `sig_without_a_defn'
-
-Compilation had errors
-
diff --git a/ghc/tests/rename/should_fail/rnfail025.stderr b/ghc/tests/rename/should_fail/rnfail025.stderr
index c0640fd..cba1afc 100644
--- a/ghc/tests/rename/should_fail/rnfail025.stderr
+++ b/ghc/tests/rename/should_fail/rnfail025.stderr
@@ -1,5 +1,2 @@
 
 rnfail025.hs:3: Variable not in scope: `sig_without_a_defn'
-
-Compilation had errors
-
diff --git a/ghc/tests/rename/should_fail/rnfail027.stderr b/ghc/tests/rename/should_fail/rnfail027.stderr
index e69de29..33accec 100644
--- a/ghc/tests/rename/should_fail/rnfail027.stderr
+++ b/ghc/tests/rename/should_fail/rnfail027.stderr
@@ -0,0 +1,2 @@
+
+rnfail027.hs:5: Variable not in scope: `wibble'
diff --git a/ghc/tests/stranal/should_compile/Makefile b/ghc/tests/stranal/should_compile/Makefile
index 17c5e92..070a5de 100644
--- a/ghc/tests/stranal/should_compile/Makefile
+++ b/ghc/tests/stranal/should_compile/Makefile
@@ -4,6 +4,4 @@ include $(TOP)/mk/should_compile.mk
 
 SRC_HC_OPTS += -O -dcore-lint
 
-str001_HC_OPTS = -hi-with-decls -hi-with-exports -hi-with-instances
-
 include $(TOP)/mk/target.mk
diff --git a/ghc/tests/stranal/should_compile/str001.stderr b/ghc/tests/stranal/should_compile/str001.stderr
index f275cec..e69de29 100644
--- a/ghc/tests/stranal/should_compile/str001.stderr
+++ b/ghc/tests/stranal/should_compile/str001.stderr
@@ -1 +0,0 @@
-__export ShouldSucceed Point2{Point2} area2;
-- 
1.7.10.4