[commit: testsuite] overlapping-tyfams: Update to various tests to reflect output changes due to overlapping (432e510)

Repository : ssh://darcs.haskell.org//srv/darcs/testsuite

On branch  : overlapping-tyfams

http://hackage.haskell.org/trac/ghc/changeset/432e510544c1402344783beaab58aa4ec61722e8

>---------------------------------------------------------------

commit 432e510544c1402344783beaab58aa4ec61722e8
Author: Richard Eisenberg <[email protected]>
Date:   Thu Dec 6 20:26:08 2012 -0500

    Update to various tests to reflect output changes due to overlapping
    type family instances.

>---------------------------------------------------------------

 tests/simplCore/should_compile/Makefile         |    2 +-
 tests/simplCore/should_compile/T4201.stdout     |    4 +++-
 tests/typecheck/should_compile/T5481.stderr     |    4 ++--
 tests/typecheck/should_compile/tc231.stderr     |    4 ++--
 tests/typecheck/should_fail/AssocTyDef02.stderr |    2 +-
 tests/typecheck/should_fail/AssocTyDef05.stderr |    2 +-
 tests/typecheck/should_fail/AssocTyDef06.stderr |    2 +-
 7 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/tests/simplCore/should_compile/Makefile b/tests/simplCore/should_compile/Makefile
index 1026363..1c2372d 100644
--- a/tests/simplCore/should_compile/Makefile
+++ b/tests/simplCore/should_compile/Makefile
@@ -29,7 +29,7 @@ T4306:
 T4201:
 	$(RM) -f T4201.hi T4201.o
 	'$(TEST_HC)' $(TEST_HC_OPTS) -c -O T4201.hs 
-	'$(TEST_HC)' $(TEST_HC_OPTS) --show-iface T4201.hi | grep 'Sym'
+	'$(TEST_HC)' $(TEST_HC_OPTS) --show-iface T4201.hi | grep -B2 'Sym'
 
 # This one looped as a result of bogus specialisation
 T4903:
diff --git a/tests/simplCore/should_compile/T4201.stdout b/tests/simplCore/should_compile/T4201.stdout
index e180856..c3b7e8d 100644
--- a/tests/simplCore/should_compile/T4201.stdout
+++ b/tests/simplCore/should_compile/T4201.stdout
@@ -1 +1,3 @@
-       Unfolding: (Eta.bof `cast` (Sym (Eta.NTCo:Foo) -> Refl Eta.T)) -}
+       Unfolding: (Eta.bof
+                     `cast`
+                   (Sym (Eta.NTCo:Foo[0]) -> Refl Eta.T)) -}
diff --git a/tests/typecheck/should_compile/T5481.stderr b/tests/typecheck/should_compile/T5481.stderr
index 34eb747..c88aecb 100644
--- a/tests/typecheck/should_compile/T5481.stderr
+++ b/tests/typecheck/should_compile/T5481.stderr
@@ -1,8 +1,8 @@
 
-T5481.hs:6:5:
+T5481.hs:6:10:
     The RHS of an associated type declaration mentions type variable `b'
       All such variables must be bound on the LHS
 
-T5481.hs:8:5:
+T5481.hs:8:10:
     The RHS of an associated type declaration mentions type variable `a'
       All such variables must be bound on the LHS
diff --git a/tests/typecheck/should_compile/tc231.stderr b/tests/typecheck/should_compile/tc231.stderr
index 72f0c20..0e9196c 100644
--- a/tests/typecheck/should_compile/tc231.stderr
+++ b/tests/typecheck/should_compile/tc231.stderr
@@ -23,7 +23,7 @@ TYPE CONSTRUCTORS
       RecFlag NonRecursive
       huh :: forall chain. Q s a chain -> ST s ()
 COERCION AXIOMS
-  axiom ShouldCompile.NTCo:Zork s a b
-    :: Zork s a b ~# (forall chain. Q s a chain -> ST s ())
+  axiom ShouldCompile.NTCo:Zork ::
+    forall s a b. Zork s a b ~# (forall chain. Q s a chain -> ST s ())
 Dependent modules: []
 Dependent packages: [base, ghc-prim, integer-gmp]
diff --git a/tests/typecheck/should_fail/AssocTyDef02.stderr b/tests/typecheck/should_fail/AssocTyDef02.stderr
index 93832ed..920ae0a 100644
--- a/tests/typecheck/should_fail/AssocTyDef02.stderr
+++ b/tests/typecheck/should_fail/AssocTyDef02.stderr
@@ -1,5 +1,5 @@
 
-AssocTyDef02.hs:6:5:
+AssocTyDef02.hs:6:10:
     Type indexes must match class instance head
     Found `b' but expected `a'
     In the type synonym instance default declaration for `Typ'
diff --git a/tests/typecheck/should_fail/AssocTyDef05.stderr b/tests/typecheck/should_fail/AssocTyDef05.stderr
index 3416a3c..797c838 100644
--- a/tests/typecheck/should_fail/AssocTyDef05.stderr
+++ b/tests/typecheck/should_fail/AssocTyDef05.stderr
@@ -1,5 +1,5 @@
 
-AssocTyDef05.hs:6:5:
+AssocTyDef05.hs:6:10:
     Number of parameters must match family declaration; expected 1
     In the type instance declaration for `Typ'
     In the class declaration for `Cls'
diff --git a/tests/typecheck/should_fail/AssocTyDef06.stderr b/tests/typecheck/should_fail/AssocTyDef06.stderr
index dd88bc3..6100ef2 100644
--- a/tests/typecheck/should_fail/AssocTyDef06.stderr
+++ b/tests/typecheck/should_fail/AssocTyDef06.stderr
@@ -1,5 +1,5 @@
 
-AssocTyDef06.hs:6:5:
+AssocTyDef06.hs:6:10:
     Number of parameters must match family declaration; expected 1
     In the type instance declaration for `Typ'
     In the class declaration for `Cls'