[commit: ghc] ghc-7.8: Update expected test outputs to match new format of pretty-printing interface contents (5f28357)

git at git.haskell.org git at git.haskell.org
Sat Mar 22 19:38:39 UTC 2014


Repository : ssh://git@git.haskell.org/ghc

On branch  : ghc-7.8
Link       : http://ghc.haskell.org/trac/ghc/changeset/5f2835770427121b2e6926ea4af72347d4e2268e/ghc

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

commit 5f2835770427121b2e6926ea4af72347d4e2268e
Author: Dr. ERDI Gergo <gergo at erdi.hu>
Date:   Wed Mar 19 21:44:38 2014 +0800

    Update expected test outputs to match new format of pretty-printing
    interface contents
    
    (cherry picked from commit 21028ee6805b896dbbd8a2d46b9690d1adecdcd1)


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

5f2835770427121b2e6926ea4af72347d4e2268e
 .../indexed-types/should_compile/T3017.stderr      |    2 +-
 testsuite/tests/roles/should_compile/Roles1.stderr |   70 ++++++++++----------
 testsuite/tests/roles/should_compile/Roles2.stderr |   20 +++---
 testsuite/tests/roles/should_compile/all.T         |    4 +-
 .../tests/typecheck/should_compile/tc231.stderr    |    7 +-
 5 files changed, 51 insertions(+), 52 deletions(-)

diff --git a/testsuite/tests/indexed-types/should_compile/T3017.stderr b/testsuite/tests/indexed-types/should_compile/T3017.stderr
index d11fad8..2019047 100644
--- a/testsuite/tests/indexed-types/should_compile/T3017.stderr
+++ b/testsuite/tests/indexed-types/should_compile/T3017.stderr
@@ -14,7 +14,7 @@ TYPE CONSTRUCTORS
     No C type associated
     Roles: [representational]
     RecFlag NonRecursive, Promotable
-    = L :: forall a. [a] -> ListColl a Stricts: _
+    = L :: [a] -> ListColl a Stricts: _
     FamilyInstance: none
 COERCION AXIOMS
   axiom Foo.TFCo:R:ElemListColl :: Elem (ListColl a) = a
diff --git a/testsuite/tests/roles/should_compile/Roles1.stderr b/testsuite/tests/roles/should_compile/Roles1.stderr
index e1808e8..cd027f1 100644
--- a/testsuite/tests/roles/should_compile/Roles1.stderr
+++ b/testsuite/tests/roles/should_compile/Roles1.stderr
@@ -2,53 +2,53 @@ TYPE SIGNATURES
 TYPE CONSTRUCTORS
   T1 :: * -> *
   data T1 a
-      No C type associated
-      Roles: [nominal]
-      RecFlag NonRecursive, Promotable
-      = K1 :: forall a. a -> T1 a Stricts: _
-      FamilyInstance: none
+    No C type associated
+    Roles: [nominal]
+    RecFlag NonRecursive, Promotable
+    = K1 :: forall a. a -> T1 a Stricts: _
+    FamilyInstance: none
   T2 :: * -> *
   data T2 a
-      No C type associated
-      Roles: [representational]
-      RecFlag NonRecursive, Promotable
-      = K2 :: forall a. a -> T2 a Stricts: _
-      FamilyInstance: none
+    No C type associated
+    Roles: [representational]
+    RecFlag NonRecursive, Promotable
+    = K2 :: forall a. a -> T2 a Stricts: _
+    FamilyInstance: none
   T3 :: k -> *
   data T3 (k::BOX) (a::k)
-      No C type associated
-      Roles: [nominal, phantom]
-      RecFlag NonRecursive, Not promotable
-      = K3 :: forall (k::BOX) (a::k). T3 k a
-      FamilyInstance: none
+    No C type associated
+    Roles: [nominal, phantom]
+    RecFlag NonRecursive, Not promotable
+    = K3 :: forall (k::BOX) (a::k). T3 k a
+    FamilyInstance: none
   T4 :: (* -> *) -> * -> *
   data T4 (a::* -> *) b
-      No C type associated
-      Roles: [nominal, nominal]
-      RecFlag NonRecursive, Not promotable
-      = K4 :: forall (a::* -> *) b. (a b) -> T4 a b Stricts: _
-      FamilyInstance: none
+    No C type associated
+    Roles: [nominal, nominal]
+    RecFlag NonRecursive, Not promotable
+    = K4 :: forall (a::* -> *) b. (a b) -> T4 a b Stricts: _
+    FamilyInstance: none
   T5 :: * -> *
   data T5 a
-      No C type associated
-      Roles: [representational]
-      RecFlag NonRecursive, Promotable
-      = K5 :: forall a. a -> T5 a Stricts: _
-      FamilyInstance: none
+    No C type associated
+    Roles: [representational]
+    RecFlag NonRecursive, Promotable
+    = K5 :: forall a. a -> T5 a Stricts: _
+    FamilyInstance: none
   T6 :: k -> *
   data T6 (k::BOX) (a::k)
-      No C type associated
-      Roles: [nominal, phantom]
-      RecFlag NonRecursive, Not promotable
-      = K6 :: forall (k::BOX) (a::k). T6 k a
-      FamilyInstance: none
+    No C type associated
+    Roles: [nominal, phantom]
+    RecFlag NonRecursive, Not promotable
+    = K6 :: forall (k::BOX) (a::k). T6 k a
+    FamilyInstance: none
   T7 :: k -> * -> *
   data T7 (k::BOX) (a::k) b
-      No C type associated
-      Roles: [nominal, phantom, representational]
-      RecFlag NonRecursive, Not promotable
-      = K7 :: forall (k::BOX) (a::k) b. b -> T7 k a b Stricts: _
-      FamilyInstance: none
+    No C type associated
+    Roles: [nominal, phantom, representational]
+    RecFlag NonRecursive, Not promotable
+    = K7 :: forall (k::BOX) (a::k) b. b -> T7 k a b Stricts: _
+    FamilyInstance: none
 COERCION AXIOMS
 Dependent modules: []
 Dependent packages: [base, ghc-prim, integer-gmp]
diff --git a/testsuite/tests/roles/should_compile/Roles2.stderr b/testsuite/tests/roles/should_compile/Roles2.stderr
index ac7a94b..f5bcbe6 100644
--- a/testsuite/tests/roles/should_compile/Roles2.stderr
+++ b/testsuite/tests/roles/should_compile/Roles2.stderr
@@ -2,18 +2,18 @@ TYPE SIGNATURES
 TYPE CONSTRUCTORS
   T1 :: * -> *
   data T1 a
-      No C type associated
-      Roles: [representational]
-      RecFlag NonRecursive, Not promotable
-      = K1 :: forall a. (IO a) -> T1 a Stricts: _
-      FamilyInstance: none
+    No C type associated
+    Roles: [representational]
+    RecFlag NonRecursive, Not promotable
+    = K1 :: forall a. (IO a) -> T1 a Stricts: _
+    FamilyInstance: none
   T2 :: * -> *
   data T2 a
-      No C type associated
-      Roles: [representational]
-      RecFlag NonRecursive, Not promotable
-      = K2 :: forall a. (FunPtr a) -> T2 a Stricts: _
-      FamilyInstance: none
+    No C type associated
+    Roles: [representational]
+    RecFlag NonRecursive, Not promotable
+    = K2 :: forall a. (FunPtr a) -> T2 a Stricts: _
+    FamilyInstance: none
 COERCION AXIOMS
 Dependent modules: []
 Dependent packages: [base, ghc-prim, integer-gmp]
diff --git a/testsuite/tests/roles/should_compile/all.T b/testsuite/tests/roles/should_compile/all.T
index a016de3..f77e61f 100644
--- a/testsuite/tests/roles/should_compile/all.T
+++ b/testsuite/tests/roles/should_compile/all.T
@@ -1,5 +1,5 @@
-test('Roles1', only_ways('normal'), compile, ['-ddump-tc'])
-test('Roles2', only_ways('normal'), compile, ['-ddump-tc'])
+test('Roles1', only_ways('normal'), compile, ['-ddump-tc -fprint-explicit-foralls'])
+test('Roles2', only_ways('normal'), compile, ['-ddump-tc -fprint-explicit-foralls'])
 test('Roles3', only_ways('normal'), compile, ['-ddump-tc'])
 test('Roles4', only_ways('normal'), compile, ['-ddump-tc'])
 test('Roles13', only_ways('normal'), compile, ['-ddump-simpl -dsuppress-uniques'])
diff --git a/testsuite/tests/typecheck/should_compile/tc231.stderr b/testsuite/tests/typecheck/should_compile/tc231.stderr
index 4334d62..16dddda 100644
--- a/testsuite/tests/typecheck/should_compile/tc231.stderr
+++ b/testsuite/tests/typecheck/should_compile/tc231.stderr
@@ -10,21 +10,20 @@ TYPE CONSTRUCTORS
     No C type associated
     Roles: [representational, representational, representational]
     RecFlag NonRecursive, Promotable
-    = Node :: forall s a chain. s -> a -> chain -> Q s a chain
-        Stricts: _ _ _
+    = Node :: s -> a -> chain -> Q s a chain Stricts: _ _ _
     FamilyInstance: none
   Z :: * -> *
   data Z a
     No C type associated
     Roles: [representational]
     RecFlag NonRecursive, Promotable
-    = Z :: forall a. a -> Z a Stricts: _
+    = Z :: a -> Z a Stricts: _
     FamilyInstance: none
   Zork :: * -> * -> * -> Constraint
   class Zork s a b | a -> b
     Roles: [nominal, nominal, nominal]
     RecFlag NonRecursive
-    huh :: forall chain. Q s a chain -> ST s ()
+    huh :: Q s a chain -> ST s ()
 COERCION AXIOMS
   axiom ShouldCompile.NTCo:Zork ::
       Zork s a b = forall chain. Q s a chain -> ST s ()



More information about the ghc-commits mailing list