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

On branch : master

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

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

commit d7546b05f41a12b74a13925b040964f2e408c207
Author: Ian Lynagh <igloo@xxxxxxxx>
Date: Tue Feb 21 21:39:17 2012 +0000

Accept update

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

tests/typecheck/should_compile/tc231.stderr | 2 ++
tests/typecheck/should_fail/T3468.stderr | 2 ++
2 files changed, 4 insertions(+), 0 deletions(-)

diff --git a/tests/typecheck/should_compile/tc231.stderr
b/tests/typecheck/should_compile/tc231.stderr
index 9647f34..6d3be6a 100644
--- a/tests/typecheck/should_compile/tc231.stderr
+++ b/tests/typecheck/should_compile/tc231.stderr
@@ -5,11 +5,13 @@ TYPE SIGNATURES
s :: forall t t1. Q t (Z [Char]) t1 -> Q t (Z [Char]) t1
TYPE CONSTRUCTORS
data Q s a chain
+ No C type associated
RecFlag NonRecursive
= Node :: forall s a chain. s -> a -> chain -> Q s a chain
Stricts: _ _ _
FamilyInstance: none
data Z a
+ No C type associated
RecFlag NonRecursive
= Z :: forall a. a -> Z a Stricts: _
FamilyInstance: none
diff --git a/tests/typecheck/should_fail/T3468.stderr
b/tests/typecheck/should_fail/T3468.stderr
index 45400bc..ac040ba 100644
--- a/tests/typecheck/should_fail/T3468.stderr
+++ b/tests/typecheck/should_fail/T3468.stderr
@@ -2,9 +2,11 @@
T3468.hs-boot:3:6:
Type constructor `Tool' has conflicting definitions in the module and its
hs-boot file
Main module: data Tool d
+ No C type associated
RecFlag Recursive
= F :: forall d a r. a -> Tool d Stricts: _
FamilyInstance: none
Boot file: abstract(False) Tool
+ No C type associated
RecFlag NonRecursive
FamilyInstance: none



_______________________________________________
Cvs-ghc mailing list
Cvs-ghc@xxxxxxxxxxx
http://www.haskell.org/mailman/listinfo/cvs-ghc