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

On branch : master

http://hackage.haskell.org/trac/ghc/changeset/79d99acaeaaf2bc55f745c099dcf03a5052430c8

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

commit 79d99acaeaaf2bc55f745c099dcf03a5052430c8
Author: Ian Lynagh <igloo@xxxxxxxx>
Date: Tue Feb 21 21:59:48 2012 +0000

Follow more output changes

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

tests/indexed-types/should_compile/T3017.stderr | 1 +
tests/rename/should_fail/rnfail055.stderr | 26 +++++++++++++++++++---
2 files changed, 23 insertions(+), 4 deletions(-)

diff --git a/tests/indexed-types/should_compile/T3017.stderr
b/tests/indexed-types/should_compile/T3017.stderr
index d0eed54..d92f29f 100644
--- a/tests/indexed-types/should_compile/T3017.stderr
+++ b/tests/indexed-types/should_compile/T3017.stderr
@@ -9,6 +9,7 @@ TYPE CONSTRUCTORS
type family Elem c :: *
empty :: c insert :: Elem c -> c -> c
data ListColl a
+ No C type associated
RecFlag NonRecursive
= L :: forall a. [a] -> ListColl a Stricts: _
FamilyInstance: none
diff --git a/tests/rename/should_fail/rnfail055.stderr
b/tests/rename/should_fail/rnfail055.stderr
index d1a8ac1..64fe7e9 100644
--- a/tests/rename/should_fail/rnfail055.stderr
+++ b/tests/rename/should_fail/rnfail055.stderr
@@ -12,21 +12,31 @@ RnFail055.hs-boot:4:1:

RnFail055.hs-boot:6:6:
Type constructor `S1' has conflicting definitions in the module and its
hs-boot file
- Main module: type S1 a b = (a, b)
- Boot file: type S1 a b c = (a, b)
+ Main module: type S1 a b
+ No C type associated
+ = (a, b)
+ Boot file: type S1 a b c
+ No C type associated
+ = (a, b)

RnFail055.hs-boot:8:6:
Type constructor `S2' has conflicting definitions in the module and its
hs-boot file
- Main module: type S2 a b = forall a. (a, b)
- Boot file: type S2 a b = forall b. (a, b)
+ Main module: type S2 a b
+ No C type associated
+ = forall a. (a, b)
+ Boot file: type S2 a b
+ No C type associated
+ = forall b. (a, b)

RnFail055.hs-boot:12:6:
Type constructor `T1' has conflicting definitions in the module and its
hs-boot file
Main module: data T1 a b
+ No C type associated
RecFlag Recursive
= T1 :: forall a b. [b] -> [a] -> T1 a b Stricts: _ _
FamilyInstance: none
Boot file: data T1 a b
+ No C type associated
RecFlag NonRecursive
= T1 :: forall a b. [a] -> [b] -> T1 a b Stricts: _ _
FamilyInstance: none
@@ -34,10 +44,12 @@ RnFail055.hs-boot:12:6:
RnFail055.hs-boot:14:16:
Type constructor `T2' has conflicting definitions in the module and its
hs-boot file
Main module: data Eq b => T2 a b
+ No C type associated
RecFlag Recursive
= T2 :: forall a b. a -> T2 a b Stricts: _
FamilyInstance: none
Boot file: data Eq a => T2 a b
+ No C type associated
RecFlag NonRecursive
= T2 :: forall a b. a -> T2 a b Stricts: _
FamilyInstance: none
@@ -51,10 +63,12 @@ RnFail055.hs-boot:17:12:
RnFail055.hs-boot:21:6:
Type constructor `T5' has conflicting definitions in the module and its
hs-boot file
Main module: data T5 a
+ No C type associated
RecFlag Recursive
= T5 :: forall a. a -> T5 a Stricts: _ Fields: field5
FamilyInstance: none
Boot file: data T5 a
+ No C type associated
RecFlag NonRecursive
= T5 :: forall a. a -> T5 a Stricts: _
FamilyInstance: none
@@ -62,10 +76,12 @@ RnFail055.hs-boot:21:6:
RnFail055.hs-boot:23:6:
Type constructor `T6' has conflicting definitions in the module and its
hs-boot file
Main module: data T6
+ No C type associated
RecFlag Recursive
= T6 :: Int -> T6 Stricts: _
FamilyInstance: none
Boot file: data T6
+ No C type associated
RecFlag NonRecursive
= T6 :: Int -> T6 HasWrapper Stricts: !
FamilyInstance: none
@@ -73,10 +89,12 @@ RnFail055.hs-boot:23:6:
RnFail055.hs-boot:25:6:
Type constructor `T7' has conflicting definitions in the module and its
hs-boot file
Main module: data T7 a
+ No C type associated
RecFlag Recursive
= T7 :: forall a a. a -> T7 a Stricts: _
FamilyInstance: none
Boot file: data T7 a
+ No C type associated
RecFlag NonRecursive
= T7 :: forall a b. a -> T7 a Stricts: _
FamilyInstance: none



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