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

On branch  : master

http://hackage.haskell.org/trac/ghc/changeset/e2147b802b499ab80f871f587a1b988f4a5e9623

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

commit e2147b802b499ab80f871f587a1b988f4a5e9623
Author: Dimitrios Vytiniotis <[email protected]>
Date:   Tue Nov 29 01:59:14 2011 +0000

    Error message shuffling.

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

 tests/indexed-types/should_fail/T4179.stderr |   46 +++++++++++++-------------
 tests/typecheck/should_compile/FD3.stderr    |    4 +-
 2 files changed, 25 insertions(+), 25 deletions(-)

diff --git a/tests/indexed-types/should_fail/T4179.stderr 
b/tests/indexed-types/should_fail/T4179.stderr
index 11bd7d6..1903d7c 100644
--- a/tests/indexed-types/should_fail/T4179.stderr
+++ b/tests/indexed-types/should_fail/T4179.stderr
@@ -1,6 +1,6 @@
 
 T4179.hs:26:16:
-    Could not deduce (DoC (x (A2 (FCon x) -> A3 (FCon x))))
+    Could not deduce (DoC (x (A2 (x (Con x)) -> A3 (x (Con x)))))
       arising from a use of `op'
     from the context (Functor x, DoC (FCon x))
       bound by the type signature for
@@ -8,52 +8,52 @@ T4179.hs:26:16:
                          Con x -> A2 (FCon x) -> A3 (FCon x)
       at T4179.hs:26:1-17
     Possible fix:
-      add (DoC (x (A2 (FCon x) -> A3 (FCon x)))) to the context of
+      add (DoC (x (A2 (x (Con x)) -> A3 (x (Con x))))) to the context of
         the type signature for
           fCon :: (Functor x, DoC (FCon x)) =>
                   Con x -> A2 (FCon x) -> A3 (FCon x)
       or add an instance declaration for
-         (DoC (x (A2 (FCon x) -> A3 (FCon x))))
+         (DoC (x (A2 (x (Con x)) -> A3 (x (Con x)))))
     In the first argument of `foldDoC', namely `op'
     In the expression: foldDoC op
     In an equation for `fCon': fCon = foldDoC op
 
 T4179.hs:26:16:
-    Could not deduce (A3 (x (A2 (FCon x) -> A3 (FCon x)))
-                      ~ A3 (FCon x))
+    Could not deduce (A3 (x (A2 (x (Con x)) -> A3 (x (Con x))))
+                      ~ A3 (x (Con x)))
     from the context (Functor x, DoC (FCon x))
       bound by the type signature for
                  fCon :: (Functor x, DoC (FCon x)) =>
                          Con x -> A2 (FCon x) -> A3 (FCon x)
       at T4179.hs:26:1-17
     NB: `A3' is a type function, and may not be injective
-    Expected type: A2 (FCon x) -> A3 (FCon x)
-      Actual type: A2 (x (A2 (FCon x) -> A3 (FCon x)))
-                   -> A3 (x (A2 (FCon x) -> A3 (FCon x)))
-    Expected type: x (A2 (FCon x) -> A3 (FCon x))
-                   -> A2 (FCon x) -> A3 (FCon x)
-      Actual type: x (A2 (FCon x) -> A3 (FCon x))
-                   -> A2 (x (A2 (FCon x) -> A3 (FCon x)))
-                   -> A3 (x (A2 (FCon x) -> A3 (FCon x)))
+    Expected type: A2 (x (Con x)) -> A3 (x (Con x))
+      Actual type: A2 (x (A2 (x (Con x)) -> A3 (x (Con x))))
+                   -> A3 (x (A2 (x (Con x)) -> A3 (x (Con x))))
+    Expected type: x (A2 (x (Con x)) -> A3 (x (Con x)))
+                   -> A2 (x (Con x)) -> A3 (x (Con x))
+      Actual type: x (A2 (x (Con x)) -> A3 (x (Con x)))
+                   -> A2 (x (A2 (x (Con x)) -> A3 (x (Con x))))
+                   -> A3 (x (A2 (x (Con x)) -> A3 (x (Con x))))
     In the first argument of `foldDoC', namely `op'
     In the expression: foldDoC op
 
 T4179.hs:26:16:
-    Could not deduce (A2 (x (A2 (FCon x) -> A3 (FCon x)))
-                      ~ A2 (FCon x))
+    Could not deduce (A2 (x (A2 (x (Con x)) -> A3 (x (Con x))))
+                      ~ A2 (x (Con x)))
     from the context (Functor x, DoC (FCon x))
       bound by the type signature for
                  fCon :: (Functor x, DoC (FCon x)) =>
                          Con x -> A2 (FCon x) -> A3 (FCon x)
       at T4179.hs:26:1-17
     NB: `A2' is a type function, and may not be injective
-    Expected type: A2 (FCon x) -> A3 (FCon x)
-      Actual type: A2 (x (A2 (FCon x) -> A3 (FCon x)))
-                   -> A3 (x (A2 (FCon x) -> A3 (FCon x)))
-    Expected type: x (A2 (FCon x) -> A3 (FCon x))
-                   -> A2 (FCon x) -> A3 (FCon x)
-      Actual type: x (A2 (FCon x) -> A3 (FCon x))
-                   -> A2 (x (A2 (FCon x) -> A3 (FCon x)))
-                   -> A3 (x (A2 (FCon x) -> A3 (FCon x)))
+    Expected type: A2 (x (Con x)) -> A3 (x (Con x))
+      Actual type: A2 (x (A2 (x (Con x)) -> A3 (x (Con x))))
+                   -> A3 (x (A2 (x (Con x)) -> A3 (x (Con x))))
+    Expected type: x (A2 (x (Con x)) -> A3 (x (Con x)))
+                   -> A2 (x (Con x)) -> A3 (x (Con x))
+      Actual type: x (A2 (x (Con x)) -> A3 (x (Con x)))
+                   -> A2 (x (A2 (x (Con x)) -> A3 (x (Con x))))
+                   -> A3 (x (A2 (x (Con x)) -> A3 (x (Con x))))
     In the first argument of `foldDoC', namely `op'
     In the expression: foldDoC op
diff --git a/tests/typecheck/should_compile/FD3.stderr 
b/tests/typecheck/should_compile/FD3.stderr
index 5e8a4ee..6f6aa8a 100644
--- a/tests/typecheck/should_compile/FD3.stderr
+++ b/tests/typecheck/should_compile/FD3.stderr
@@ -1,6 +1,6 @@
 
 FD3.hs:15:15:
-    Couldn't match type `a' with `(String, a)'
+    Couldn't match type `a' with `([Char], a)'
       `a' is a rigid type variable bound by
           the type signature for translate :: (String, a) -> A a
           at FD3.hs:15:1
@@ -8,6 +8,6 @@ FD3.hs:15:15:
       MkA a a,
         arising from the dependency `a -> b'
         in the instance declaration at FD3.hs:12:10
-      MkA (String, a) a, arising from a use of `mkA' at FD3.hs:15:15-17
+      MkA ([Char], a) a, arising from a use of `mkA' at FD3.hs:15:15-17
     In the expression: mkA a
     In an equation for `translate': translate a = mkA a



_______________________________________________
Cvs-ghc mailing list
[email protected]
http://www.haskell.org/mailman/listinfo/cvs-ghc

Reply via email to