[project @ 1999-05-12 12:23:53 by keithw]

Fix some tests, mainly to deal with new dictionary format in interface files.

diff --git a/ghc/tests/codeGen/should_run/cg036.stdout b/ghc/tests/codeGen/should_run/cg036.stdout
index 3713268..7b74638 100644 (file)
--- a/ghc/tests/codeGen/should_run/cg036.stdout
+++ b/ghc/tests/codeGen/should_run/cg036.stdout
@@ -1 +1 @@
-<<function>>
+[1037862,1276425,1276425,1037862,1276425,1276425,1037862,1276425,1276425,1037862,1276425,1276425,1037862,1276425,1276425,1037862,1276425,1276425,1037862,1276425,1276425,1037862,1276425,1276425,1037862,1276425,1276425,1037862,1276425,1276425,1037862,1276425]

diff --git a/ghc/tests/typecheck/should_compile/tc001.stderr b/ghc/tests/typecheck/should_compile/tc001.stderr
index 1bf09a3..8763364 100644 (file)
--- a/ghc/tests/typecheck/should_compile/tc001.stderr
+++ b/ghc/tests/typecheck/should_compile/tc001.stderr
@@ -1,3 +1,3 @@
 ghc: module version changed to 1; reason: no old .hi file
 __export ShouldSucceed a;
-1 a :: __forall [a] {PrelBase.Num a} => a -> a ;
+1 a :: __forall [a] => {PrelBase.Num a} -> a -> a ;

diff --git a/ghc/tests/typecheck/should_compile/tc005.stderr b/ghc/tests/typecheck/should_compile/tc005.stderr
index ba48296..e18dd0f 100644 (file)
--- a/ghc/tests/typecheck/should_compile/tc005.stderr
+++ b/ghc/tests/typecheck/should_compile/tc005.stderr
@@ -1,3 +1,3 @@
 ghc: module version changed to 1; reason: no old .hi file
 __export ShouldSucceed g;
-1 g :: __forall [t t1] {PrelBase.Num t} => ([t], t1) -> t ;
+1 g :: __forall [t t1] => {PrelBase.Num t1} -> ([t1], t) -> t1 ;

diff --git a/ghc/tests/typecheck/should_compile/tc008.stderr b/ghc/tests/typecheck/should_compile/tc008.stderr
index d74ee46..e2c095d 100644 (file)
--- a/ghc/tests/typecheck/should_compile/tc008.stderr
+++ b/ghc/tests/typecheck/should_compile/tc008.stderr
@@ -1,3 +1,3 @@
 ghc: module version changed to 1; reason: no old .hi file
 __export ShouldSucceed n;
-1 n :: __forall [t] {PrelBase.Num t} => PrelBase.Bool -> t ;
+1 n :: __forall [t] => {PrelBase.Num t} -> PrelBase.Bool -> t ;

diff --git a/ghc/tests/typecheck/should_compile/tc009.stderr b/ghc/tests/typecheck/should_compile/tc009.stderr
index 4d9b431..2b9b120 100644 (file)
--- a/ghc/tests/typecheck/should_compile/tc009.stderr
+++ b/ghc/tests/typecheck/should_compile/tc009.stderr
@@ -1,3 +1,3 @@
 ghc: module version changed to 1; reason: no old .hi file
 __export ShouldSucceed o;
-1 o :: __forall [a] {PrelBase.Num a} => (PrelBase.Bool, a) -> a ;
+1 o :: __forall [a] => {PrelBase.Num a} -> (PrelBase.Bool, a) -> a ;

diff --git a/ghc/tests/typecheck/should_compile/tc023.stderr b/ghc/tests/typecheck/should_compile/tc023.stderr
index eeaa682..2f84b28 100644 (file)
--- a/ghc/tests/typecheck/should_compile/tc023.stderr
+++ b/ghc/tests/typecheck/should_compile/tc023.stderr
@@ -2,4 +2,4 @@ ghc: module version changed to 1; reason: no old .hi file
 __export ShouldSucceed k main s;
 1 k :: __forall [t t1] => t -> t1 -> t ;
 1 main :: __forall [t] => t -> t ;
-1 s :: __forall [t t1 t2] => (t2 -> t1 -> t) -> (t2 -> t1) -> t2 -> t ;
+1 s :: __forall [t t1 t2] => (t -> t2 -> t1) -> (t -> t2) -> t -> t1 ;

diff --git a/ghc/tests/typecheck/should_compile/tc024.stderr b/ghc/tests/typecheck/should_compile/tc024.stderr
index eeaa682..2f84b28 100644 (file)
--- a/ghc/tests/typecheck/should_compile/tc024.stderr
+++ b/ghc/tests/typecheck/should_compile/tc024.stderr
@@ -2,4 +2,4 @@ ghc: module version changed to 1; reason: no old .hi file
 __export ShouldSucceed k main s;
 1 k :: __forall [t t1] => t -> t1 -> t ;
 1 main :: __forall [t] => t -> t ;
-1 s :: __forall [t t1 t2] => (t2 -> t1 -> t) -> (t2 -> t1) -> t2 -> t ;
+1 s :: __forall [t t1 t2] => (t -> t2 -> t1) -> (t -> t2) -> t -> t1 ;

diff --git a/ghc/tests/typecheck/should_compile/tc034.stderr b/ghc/tests/typecheck/should_compile/tc034.stderr
index 5c3bed4..1fddd61 100644 (file)
--- a/ghc/tests/typecheck/should_compile/tc034.stderr
+++ b/ghc/tests/typecheck/should_compile/tc034.stderr
@@ -1,5 +1,5 @@
 ghc: module version changed to 1; reason: no old .hi file
 __export ShouldSucceed AList{ANull ANode} IntList g;
 1 data AList a = ANull |  ANode a (AList a) ;
-1 g :: __forall [t] {PrelBase.Num t} => AList PrelBase.Bool -> t ;
+1 g :: __forall [t] => {PrelBase.Num t} -> AList PrelBase.Bool -> t ;
 1 type IntList = AList PrelBase.Int ;

diff --git a/ghc/tests/typecheck/should_compile/tc037.stderr b/ghc/tests/typecheck/should_compile/tc037.stderr
index 5b34e0d..d05c754 100644 (file)
--- a/ghc/tests/typecheck/should_compile/tc037.stderr
+++ b/ghc/tests/typecheck/should_compile/tc037.stderr
@@ -1,5 +1,5 @@
 ghc: module version changed to 1; reason: no old .hi file
 __export ShouldSucceed Eqzq{deq};
-instance __forall [a] {Eqzq a} => {Eqzq [a]} = zdfEqzqZMZN;
+instance __forall [a] => {Eqzq a} -> {Eqzq [a]} = zdfEqzqZMZN;
 1 class Eqzq a where {deq :: a -> a -> PrelBase.Bool} ;
-1 zdfEqzqZMZN :: __forall [a] {Eqzq a} => {Eqzq [a]} ;
+1 zdfEqzqZMZN :: __forall [a] => {Eqzq a} -> {Eqzq [a]} ;

diff --git a/ghc/tests/typecheck/should_compile/tc038.stderr b/ghc/tests/typecheck/should_compile/tc038.stderr
index 9e85b16..e8da6c2 100644 (file)
--- a/ghc/tests/typecheck/should_compile/tc038.stderr
+++ b/ghc/tests/typecheck/should_compile/tc038.stderr
@@ -1,3 +1,3 @@
 ghc: module version changed to 1; reason: no old .hi file
 __export ShouldSucceed f;
-1 f :: __forall [a] {PrelBase.Num a, PrelBase.Eq a} => [a] -> [a] ;
+1 f :: __forall [a] => {PrelBase.Num a} -> {PrelBase.Eq a} -> [a] -> [a] ;

diff --git a/ghc/tests/typecheck/should_compile/tc040.stderr b/ghc/tests/typecheck/should_compile/tc040.stderr
index 2f2762c..b2e755d 100644 (file)
--- a/ghc/tests/typecheck/should_compile/tc040.stderr
+++ b/ghc/tests/typecheck/should_compile/tc040.stderr
@@ -1,3 +1,3 @@
 ghc: module version changed to 1; reason: no old .hi file
 __export ShouldSucceed f;
-1 f :: __forall [a] {PrelBase.Eq a} => a -> [a] ;
+1 f :: __forall [a] => {PrelBase.Eq a} -> a -> [a] ;

diff --git a/ghc/tests/typecheck/should_compile/tc043.stderr b/ghc/tests/typecheck/should_compile/tc043.stderr
index 59e5b4c..41cca91 100644 (file)
--- a/ghc/tests/typecheck/should_compile/tc043.stderr
+++ b/ghc/tests/typecheck/should_compile/tc043.stderr
@@ -1,9 +1,9 @@
 ghc: module version changed to 1; reason: no old .hi file
 __export ShouldSucceed A{op1} B{op2} f;
 instance {A PrelBase.Int} = zdfAInt;
-instance __forall [a] {B a} => {B [a]} = zdfBZMZN;
+instance __forall [a] => {B a} -> {B [a]} = zdfBZMZN;
 1 class A a where {op1 :: a} ;
 1 class B b where {op2 :: b -> PrelBase.Int} ;
-1 f :: __forall [t a] {A a} => t -> a ;
+1 f :: __forall [t a] => {A a} -> t -> a ;
 1 zdfAInt :: {A PrelBase.Int} ;
-1 zdfBZMZN :: __forall [a] {B a} => {B [a]} ;
+1 zdfBZMZN :: __forall [a] => {B a} -> {B [a]} ;

diff --git a/ghc/tests/typecheck/should_compile/tc045.stderr b/ghc/tests/typecheck/should_compile/tc045.stderr
index e371b20..fde05b3 100644 (file)
--- a/ghc/tests/typecheck/should_compile/tc045.stderr
+++ b/ghc/tests/typecheck/should_compile/tc045.stderr
@@ -1,8 +1,8 @@
 ghc: module version changed to 1; reason: no old .hi file
 __export ShouldSucceed B{op2} C{op1};
-instance __forall [a] {B a} => {B [a]} = zdfBZMZN;
+instance __forall [a] => {B a} -> {B [a]} = zdfBZMZN;
 instance __forall [a] => {C [a]} = zdfCZMZN;
 1 class {C a}  => B a where {op2 :: a -> a -> a} ;
 1 class C a where {op1 :: a -> a} ;
-1 zdfBZMZN :: __forall [a] {B a, C [a]} => {B [a]} ;
+1 zdfBZMZN :: __forall [a] => {B a} -> {C [a]} -> {B [a]} ;
 1 zdfCZMZN :: __forall [a] => {C [a]} ;

diff --git a/ghc/tests/typecheck/should_compile/tc047.stderr b/ghc/tests/typecheck/should_compile/tc047.stderr
index d0cc01f..47986a1 100644 (file)
--- a/ghc/tests/typecheck/should_compile/tc047.stderr
+++ b/ghc/tests/typecheck/should_compile/tc047.stderr
@@ -1,6 +1,6 @@
 ghc: module version changed to 1; reason: no old .hi file
 __export ShouldSucceed OL f mp sd;
 1 f :: __forall [t t1 t2] => t -> [(t1, t2)] -> [t2] ;
-1 mp :: __forall [t t1] => (t1 -> t) -> [t1] -> [t] ;
-1 sd :: __forall [t t1] => (t1, t) -> t ;
+1 mp :: __forall [t t1] => (t -> t1) -> [t] -> [t1] ;
+1 sd :: __forall [t t1] => (t, t1) -> t1 ;
 1 type OL a = [a] ;

diff --git a/ghc/tests/typecheck/should_compile/tc048.stderr b/ghc/tests/typecheck/should_compile/tc048.stderr
index 4d6ad93..4a33211 100644 (file)
--- a/ghc/tests/typecheck/should_compile/tc048.stderr
+++ b/ghc/tests/typecheck/should_compile/tc048.stderr
@@ -3,7 +3,7 @@ __export ShouldSucceed AFE{MkAFE} FG{MkFG} OL{MkOL} mAp ranAFE ranOAL sNd;
 1 data AFE n a b = MkAFE (OL (n, FG a b)) ;
 1 data FG a b = MkFG (OL (a, b)) ;
 1 data OL a = MkOL [a] ;
-1 mAp :: __forall [t t1] => (t1 -> t) -> [t1] -> [t] ;
+1 mAp :: __forall [t t1] => (t -> t1) -> [t] -> [t1] ;
 1 ranAFE :: __forall [n a b] => AFE n a b -> [FG a b] ;
 1 ranOAL :: __forall [a v] => OL (a, v) -> [v] ;
-1 sNd :: __forall [t t1] => (t1, t) -> t ;
+1 sNd :: __forall [t t1] => (t, t1) -> t1 ;

diff --git a/ghc/tests/typecheck/should_compile/tc049.stderr b/ghc/tests/typecheck/should_compile/tc049.stderr
index 7d174b2..dc06f59 100644 (file)
--- a/ghc/tests/typecheck/should_compile/tc049.stderr
+++ b/ghc/tests/typecheck/should_compile/tc049.stderr
@@ -1,13 +1,13 @@
 ghc: module version changed to 1; reason: no old .hi file
 __export ShouldSucceed fib main1 main2 main3 mem mem1 mem2 mem3 mem4 oR oR1;
-1 fib :: __forall [a] {PrelBase.Num a, PrelBase.Ord a} => a -> a ;
+1 fib :: __forall [a] => {PrelBase.Num a} -> {PrelBase.Ord a} -> a -> a ;
 1 main1 :: PrelBase.Bool ;
 1 main2 :: PrelBase.Bool ;
 1 main3 :: PrelBase.Bool ;
-1 mem :: __forall [a] {PrelBase.Eq a} => a -> [a] -> PrelBase.Bool ;
-1 mem1 :: __forall [a] {PrelBase.Eq a} => a -> [a] -> PrelBase.Bool ;
-1 mem2 :: __forall [a] {PrelBase.Eq a} => a -> [a] -> PrelBase.Bool ;
-1 mem3 :: __forall [t] {PrelBase.Eq [t]} => t -> [t] -> PrelBase.Bool ;
-1 mem4 :: __forall [t] {PrelBase.Eq [t]} => t -> [t] -> PrelBase.Bool ;
+1 mem :: __forall [a] => {PrelBase.Eq a} -> a -> [a] -> PrelBase.Bool ;
+1 mem1 :: __forall [a] => {PrelBase.Eq a} -> a -> [a] -> PrelBase.Bool ;
+1 mem2 :: __forall [a] => {PrelBase.Eq a} -> a -> [a] -> PrelBase.Bool ;
+1 mem3 :: __forall [t] => {PrelBase.Eq [t]} -> t -> [t] -> PrelBase.Bool ;
+1 mem4 :: __forall [t] => {PrelBase.Eq [t]} -> t -> [t] -> PrelBase.Bool ;
 1 oR :: PrelBase.Bool -> PrelBase.Bool -> PrelBase.Bool ;
 1 oR1 :: PrelBase.Bool -> PrelBase.Bool -> PrelBase.Bool ;

diff --git a/ghc/tests/typecheck/should_compile/tc050.stderr b/ghc/tests/typecheck/should_compile/tc050.stderr
index 033ba55..3d24f91 100644 (file)
--- a/ghc/tests/typecheck/should_compile/tc050.stderr
+++ b/ghc/tests/typecheck/should_compile/tc050.stderr
@@ -4,6 +4,6 @@ instance {Foo PrelBase.Bool} = zdfFooBool;
 instance {Foo PrelBase.Int} = zdfFooInt;
 1 class Foo a where {o_and :: a -> a -> a} ;
 1 f :: __forall [t] => PrelBase.Bool -> t -> PrelBase.Bool ;
-1 g :: __forall [t a] {PrelBase.Num a, Foo a} => a -> t -> a ;
+1 g :: __forall [t a] => {PrelBase.Num a} -> {Foo a} -> a -> t -> a ;
 1 zdfFooBool :: {Foo PrelBase.Bool} ;
 1 zdfFooInt :: {Foo PrelBase.Int} ;

diff --git a/ghc/tests/typecheck/should_compile/tc051.stderr b/ghc/tests/typecheck/should_compile/tc051.stderr
index bd3569a..b534841 100644 (file)
--- a/ghc/tests/typecheck/should_compile/tc051.stderr
+++ b/ghc/tests/typecheck/should_compile/tc051.stderr
@@ -1,10 +1,10 @@
 ghc: module version changed to 1; reason: no old .hi file
 __export ShouldSucceed Eqzq{doubleeq} Ordzq{lt};
 instance {Eqzq PrelBase.Int} = zdfEqzqInt;
-instance __forall [a] {Eqzq a} => {Eqzq [a]} = zdfEqzqZMZN;
+instance __forall [a] => {Eqzq a} -> {Eqzq [a]} = zdfEqzqZMZN;
 instance {Ordzq PrelBase.Int} = zdfOrdzqInt;
 1 class Eqzq a where {doubleeq :: a -> a -> PrelBase.Bool} ;
 1 class {Eqzq a}  => Ordzq a where {lt :: a -> a -> PrelBase.Bool} ;
 1 zdfEqzqInt :: {Eqzq PrelBase.Int} ;
-1 zdfEqzqZMZN :: __forall [a] {Eqzq a} => {Eqzq [a]} ;
+1 zdfEqzqZMZN :: __forall [a] => {Eqzq a} -> {Eqzq [a]} ;
 1 zdfOrdzqInt :: {Ordzq PrelBase.Int} ;

diff --git a/ghc/tests/typecheck/should_compile/tc053.stderr b/ghc/tests/typecheck/should_compile/tc053.stderr
index 204a179..8618c30 100644 (file)
--- a/ghc/tests/typecheck/should_compile/tc053.stderr
+++ b/ghc/tests/typecheck/should_compile/tc053.stderr
@@ -1,8 +1,8 @@
 ghc: module version changed to 1; reason: no old .hi file
 __export ShouldSucceed Eqzq{deq} f;
 instance {Eqzq PrelBase.Int} = zdfEqzqInt;
-instance __forall [a] {Eqzq a} => {Eqzq [a]} = zdfEqzqZMZN;
+instance __forall [a] => {Eqzq a} -> {Eqzq [a]} = zdfEqzqZMZN;
 1 class Eqzq a where {deq :: a -> a -> PrelBase.Bool} ;
-1 f :: __forall [t] {PrelBase.Num t, Eqzq [t]} => [t] -> PrelBase.Bool ;
+1 f :: __forall [t] => {PrelBase.Num t} -> {Eqzq [t]} -> [t] -> PrelBase.Bool ;
 1 zdfEqzqInt :: {Eqzq PrelBase.Int} ;
-1 zdfEqzqZMZN :: __forall [a] {Eqzq a} => {Eqzq [a]} ;
+1 zdfEqzqZMZN :: __forall [a] => {Eqzq a} -> {Eqzq [a]} ;

diff --git a/ghc/tests/typecheck/should_compile/tc054.stderr b/ghc/tests/typecheck/should_compile/tc054.stderr
index c0af517..a889e1c 100644 (file)
--- a/ghc/tests/typecheck/should_compile/tc054.stderr
+++ b/ghc/tests/typecheck/should_compile/tc054.stderr
@@ -4,6 +4,6 @@ instance {Eqzq PrelBase.Int} = zdfEqzqInt;
 instance {Ordzq PrelBase.Int} = zdfOrdzqInt;
 1 class Eqzq a where {doubleeq :: a -> a -> PrelBase.Bool} ;
 1 class {Eqzq a}  => Ordzq a where {lt :: a -> a -> PrelBase.Bool} ;
-1 f :: __forall [t a] {PrelBase.Num a, Ordzq a} => a -> t -> PrelBase.Bool ;
+1 f :: __forall [t a] => {PrelBase.Num a} -> {Ordzq a} -> a -> t -> PrelBase.Bool ;
 1 zdfEqzqInt :: {Eqzq PrelBase.Int} ;
 1 zdfOrdzqInt :: {Ordzq PrelBase.Int} ;

diff --git a/ghc/tests/typecheck/should_compile/tc056.stderr b/ghc/tests/typecheck/should_compile/tc056.stderr
index e856eb1..61998cc 100644 (file)
--- a/ghc/tests/typecheck/should_compile/tc056.stderr
+++ b/ghc/tests/typecheck/should_compile/tc056.stderr
@@ -2,14 +2,12 @@
 tc056.hs:15:
     Warning: Duplicate class assertion `Eq' a' in the context:
                 (Eq' a, Eq' a) => ...
-
-
 ghc: module version changed to 1; reason: no old .hi file
 __export ShouldSucceed Eqzq{doubleeq} Ordzq{lt} f;
 instance {Eqzq PrelBase.Int} = zdfEqzqInt;
-instance __forall [a] {Eqzq a, Eqzq a} => {Eqzq [a]} = zdfEqzqZMZN;
+instance __forall [a] => {Eqzq a} -> {Eqzq a} -> {Eqzq [a]} = zdfEqzqZMZN;
 1 class Eqzq a where {doubleeq :: a -> a -> PrelBase.Bool} ;
 1 class {Eqzq a}  => Ordzq a where {lt :: a -> a -> PrelBase.Bool} ;
-1 f :: __forall [t t1] {PrelBase.Num t1, Eqzq [t1]} => [t1] -> t -> PrelBase.Bool ;
+1 f :: __forall [t t1] => {PrelBase.Num t1} -> {Eqzq [t1]} -> [t1] -> t -> PrelBase.Bool ;
 1 zdfEqzqInt :: {Eqzq PrelBase.Int} ;
-1 zdfEqzqZMZN :: __forall [a] {Eqzq a} => {Eqzq [a]} ;
+1 zdfEqzqZMZN :: __forall [a] => {Eqzq a} -> {Eqzq [a]} ;

diff --git a/ghc/tests/typecheck/should_compile/tc057.stderr b/ghc/tests/typecheck/should_compile/tc057.stderr
index aa9bb59..d2173f7 100644 (file)
--- a/ghc/tests/typecheck/should_compile/tc057.stderr
+++ b/ghc/tests/typecheck/should_compile/tc057.stderr
@@ -1,9 +1,9 @@
 ghc: module version changed to 1; reason: no old .hi file
 __export ShouldSucceed Eqzq{deq} dand f;
 instance {Eqzq PrelBase.Int} = zdfEqzqInt;
-instance __forall [a] {Eqzq a} => {Eqzq [a]} = zdfEqzqZMZN;
+instance __forall [a] => {Eqzq a} -> {Eqzq [a]} = zdfEqzqZMZN;
 1 class Eqzq a where {deq :: a -> a -> PrelBase.Bool} ;
 1 dand :: PrelBase.Bool -> PrelBase.Bool -> PrelBase.Bool ;
-1 f :: __forall [a] {Eqzq a} => a -> a -> PrelBase.Bool ;
+1 f :: __forall [a] => {Eqzq a} -> a -> a -> PrelBase.Bool ;
 1 zdfEqzqInt :: {Eqzq PrelBase.Int} ;
-1 zdfEqzqZMZN :: __forall [a] {Eqzq a} => {Eqzq [a]} ;
+1 zdfEqzqZMZN :: __forall [a] => {Eqzq a} -> {Eqzq [a]} ;

diff --git a/ghc/tests/typecheck/should_compile/tc058.stderr b/ghc/tests/typecheck/should_compile/tc058.stderr
index 61c2027..74a990a 100644 (file)
--- a/ghc/tests/typecheck/should_compile/tc058.stderr
+++ b/ghc/tests/typecheck/should_compile/tc058.stderr
@@ -1,11 +1,11 @@
 ghc: module version changed to 1; reason: no old .hi file
 __export ShouldSucceed Eq2{doubleeq} Ord2{lt} f;
 instance {Eq2 PrelBase.Int} = zdfEq2Int;
-instance __forall [a] {Eq2 a, Ord2 a} => {Eq2 [a]} = zdfEq2ZMZN;
+instance __forall [a] => {Eq2 a} -> {Ord2 a} -> {Eq2 [a]} = zdfEq2ZMZN;
 instance {Ord2 PrelBase.Int} = zdfOrd2Int;
 1 class Eq2 a where {doubleeq :: a -> a -> PrelBase.Bool} ;
 1 class {Eq2 a}  => Ord2 a where {lt :: a -> a -> PrelBase.Bool} ;
-1 f :: __forall [t t1] {PrelBase.Num t1, Eq2 [t1]} => [t1] -> t -> PrelBase.Bool ;
+1 f :: __forall [t t1] => {PrelBase.Num t1} -> {Eq2 [t1]} -> [t1] -> t -> PrelBase.Bool ;
 1 zdfEq2Int :: {Eq2 PrelBase.Int} ;
-1 zdfEq2ZMZN :: __forall [a] {Eq2 a, Ord2 a} => {Eq2 [a]} ;
+1 zdfEq2ZMZN :: __forall [a] => {Eq2 a} -> {Ord2 a} -> {Eq2 [a]} ;
 1 zdfOrd2Int :: {Ord2 PrelBase.Int} ;

diff --git a/ghc/tests/typecheck/should_compile/tc059.stderr b/ghc/tests/typecheck/should_compile/tc059.stderr
index f8d91ca..acab588 100644 (file)
--- a/ghc/tests/typecheck/should_compile/tc059.stderr
+++ b/ghc/tests/typecheck/should_compile/tc059.stderr
@@ -1,8 +1,8 @@
 ghc: module version changed to 1; reason: no old .hi file
 __export ShouldSucceed Eq2{foo deq} f;
 instance {Eq2 PrelBase.Int} = zdfEq2Int;
-instance __forall [a] {Eq2 a} => {Eq2 [a]} = zdfEq2ZMZN;
+instance __forall [a] => {Eq2 a} -> {Eq2 [a]} = zdfEq2ZMZN;
 1 class Eq2 a where {foo :: a -> a; deq :: a -> a -> PrelBase.Bool} ;
-1 f :: __forall [t] {PrelBase.Num t, Eq2 [t]} => [t] -> PrelBase.Bool ;
+1 f :: __forall [t] => {PrelBase.Num t} -> {Eq2 [t]} -> [t] -> PrelBase.Bool ;
 1 zdfEq2Int :: {Eq2 PrelBase.Int} ;
-1 zdfEq2ZMZN :: __forall [a] {Eq2 a} => {Eq2 [a]} ;
+1 zdfEq2ZMZN :: __forall [a] => {Eq2 a} -> {Eq2 [a]} ;

diff --git a/ghc/tests/typecheck/should_compile/tc060.stderr b/ghc/tests/typecheck/should_compile/tc060.stderr
index d1db20d..ab063d9 100644 (file)
--- a/ghc/tests/typecheck/should_compile/tc060.stderr
+++ b/ghc/tests/typecheck/should_compile/tc060.stderr
@@ -1,7 +1,7 @@
 ghc: module version changed to 1; reason: no old .hi file
 __export ShouldSucceed Eq2{deq};
 instance {Eq2 PrelBase.Int} = zdfEq2Int;
-instance __forall [a] {Eq2 a} => {Eq2 [a]} = zdfEq2ZMZN;
+instance __forall [a] => {Eq2 a} -> {Eq2 [a]} = zdfEq2ZMZN;
 1 class Eq2 a where {deq :: a -> a -> PrelBase.Bool} ;
 1 zdfEq2Int :: {Eq2 PrelBase.Int} ;
-1 zdfEq2ZMZN :: __forall [a] {Eq2 a} => {Eq2 [a]} ;
+1 zdfEq2ZMZN :: __forall [a] => {Eq2 a} -> {Eq2 [a]} ;

diff --git a/ghc/tests/typecheck/should_compile/tc061.stderr b/ghc/tests/typecheck/should_compile/tc061.stderr
index 3df4b54..8da50c9 100644 (file)
--- a/ghc/tests/typecheck/should_compile/tc061.stderr
+++ b/ghc/tests/typecheck/should_compile/tc061.stderr
@@ -1,7 +1,7 @@
 ghc: module version changed to 1; reason: no old .hi file
 __export ShouldSucceed Eq1{deq};
 instance {Eq1 PrelBase.Int} = zdfEq1Int;
-instance __forall [a] {Eq1 a} => {Eq1 [a]} = zdfEq1ZMZN;
+instance __forall [a] => {Eq1 a} -> {Eq1 [a]} = zdfEq1ZMZN;
 1 class Eq1 a where {deq :: a -> a -> PrelBase.Bool} ;
 1 zdfEq1Int :: {Eq1 PrelBase.Int} ;
-1 zdfEq1ZMZN :: __forall [a] {Eq1 a} => {Eq1 [a]} ;
+1 zdfEq1ZMZN :: __forall [a] => {Eq1 a} -> {Eq1 [a]} ;

diff --git a/ghc/tests/typecheck/should_compile/tc062.stderr b/ghc/tests/typecheck/should_compile/tc062.stderr
index 85085f0..dd79383 100644 (file)
--- a/ghc/tests/typecheck/should_compile/tc062.stderr
+++ b/ghc/tests/typecheck/should_compile/tc062.stderr
@@ -1,8 +1,8 @@
 ghc: module version changed to 1; reason: no old .hi file
 __export ShouldSucceed Eq1{deq} f;
 instance {Eq1 PrelBase.Int} = zdfEq1Int;
-instance __forall [a] {Eq1 a} => {Eq1 [a]} = zdfEq1ZMZN;
+instance __forall [a] => {Eq1 a} -> {Eq1 [a]} = zdfEq1ZMZN;
 1 class Eq1 a where {deq :: a -> a -> PrelBase.Bool} ;
-1 f :: __forall [t] {Eq1 [t]} => [t] -> [t] -> PrelBase.Bool ;
+1 f :: __forall [t] => {Eq1 [t]} -> [t] -> [t] -> PrelBase.Bool ;
 1 zdfEq1Int :: {Eq1 PrelBase.Int} ;
-1 zdfEq1ZMZN :: __forall [a] {Eq1 a} => {Eq1 [a]} ;
+1 zdfEq1ZMZN :: __forall [a] => {Eq1 a} -> {Eq1 [a]} ;

diff --git a/ghc/tests/typecheck/should_compile/tc063.stderr b/ghc/tests/typecheck/should_compile/tc063.stderr
index 1183f02..6ef53ae 100644 (file)
--- a/ghc/tests/typecheck/should_compile/tc063.stderr
+++ b/ghc/tests/typecheck/should_compile/tc063.stderr
@@ -4,6 +4,6 @@ instance {Reps PrelBase.Bool} = zdfRepsBool;
 instance __forall [q] => {Reps (X q)} = zdfRepsX;
 1 class Reps r where {f :: r -> r -> r} ;
 1 data X a = Tag a ;
-1 g :: __forall [r] {Reps r} => r -> r ;
+1 g :: __forall [r] => {Reps r} -> r -> r ;
 1 zdfRepsBool :: {Reps PrelBase.Bool} ;
 1 zdfRepsX :: __forall [q] => {Reps (X q)} ;

diff --git a/ghc/tests/typecheck/should_compile/tc065.stderr b/ghc/tests/typecheck/should_compile/tc065.stderr
index c13d9e7..b93942d 100644 (file)
--- a/ghc/tests/typecheck/should_compile/tc065.stderr
+++ b/ghc/tests/typecheck/should_compile/tc065.stderr
@@ -2,15 +2,15 @@ ghc: module version changed to 1; reason: no old .hi file
 __export ShouldSucceed Cycle Digraph{MkDigraph} Edge FlattenedDependencyInfo MaybeErr{Succeeded Failed} dfs isCyclic isRecursiveCycle lookupVertex mkDigraph mkEdges mkVertices stronglyConnComp topSort;
 1 data Digraph vertex = MkDigraph [vertex] ;
 1 data MaybeErr a b = Succeeded a |  Failed b ;
-1 dfs :: __forall [a] {PrelBase.Eq a} => (a -> [a]) -> ([a], [a]) -> [a] -> ([a], [a]) ;
-1 isCyclic :: __forall [vertex] {PrelBase.Eq vertex} => [Edge vertex] -> [vertex] -> PrelBase.Bool ;
-1 isRecursiveCycle :: __forall [vertex] {PrelBase.Eq vertex} => Cycle vertex -> [Edge vertex] -> PrelBase.Bool ;
-1 lookupVertex :: __forall [vertex name code] {PrelBase.Eq vertex, PrelBase.Ord name} => FlattenedDependencyInfo vertex name code -> vertex -> code ;
+1 dfs :: __forall [a] => {PrelBase.Eq a} -> (a -> [a]) -> ([a], [a]) -> [a] -> ([a], [a]) ;
+1 isCyclic :: __forall [vertex] => {PrelBase.Eq vertex} -> [Edge vertex] -> [vertex] -> PrelBase.Bool ;
+1 isRecursiveCycle :: __forall [vertex] => {PrelBase.Eq vertex} -> Cycle vertex -> [Edge vertex] -> PrelBase.Bool ;
+1 lookupVertex :: __forall [vertex name code] => {PrelBase.Eq vertex} -> {PrelBase.Ord name} -> FlattenedDependencyInfo vertex name code -> vertex -> code ;
 1 mkDigraph :: __forall [vertex] => [vertex] -> Digraph vertex ;
-1 mkEdges :: __forall [vertex name code] {PrelBase.Eq vertex, PrelBase.Ord name} => [vertex] -> FlattenedDependencyInfo vertex name code -> [Edge vertex] ;
+1 mkEdges :: __forall [vertex name code] => {PrelBase.Eq vertex} -> {PrelBase.Ord name} -> [vertex] -> FlattenedDependencyInfo vertex name code -> [Edge vertex] ;
 1 mkVertices :: __forall [vertex name code] => FlattenedDependencyInfo vertex name code -> [vertex] ;
-1 stronglyConnComp :: __forall [vertex] {PrelBase.Eq vertex} => [Edge vertex] -> [vertex] -> [[vertex]] ;
-1 topSort :: __forall [vertex] {PrelBase.Eq vertex} => [Edge vertex] -> [vertex] -> MaybeErr [vertex] [[vertex]] ;
+1 stronglyConnComp :: __forall [vertex] => {PrelBase.Eq vertex} -> [Edge vertex] -> [vertex] -> [[vertex]] ;
+1 topSort :: __forall [vertex] => {PrelBase.Eq vertex} -> [Edge vertex] -> [vertex] -> MaybeErr [vertex] [[vertex]] ;
 1 type Cycle vertex = [vertex] ;
 1 type Edge vertex = (vertex, vertex) ;
 1 type FlattenedDependencyInfo vertex name code = [(vertex, Set.Set name, Set.Set name, code)] ;

diff --git a/ghc/tests/typecheck/should_compile/tc068.stderr b/ghc/tests/typecheck/should_compile/tc068.stderr
index 587ce7c..080ebff 100644 (file)
--- a/ghc/tests/typecheck/should_compile/tc068.stderr
+++ b/ghc/tests/typecheck/should_compile/tc068.stderr
@@ -1,8 +1,8 @@
 ghc: module version changed to 1; reason: no old .hi file
 __export ShouldSucceed B{X Y} T{D C};
-instance __forall [b] {PrelBase.Eq b} => {PrelBase.Eq (B b)} = zdfEqB;
-instance __forall [a] {PrelBase.Eq a} => {PrelBase.Eq (T a)} = zdfEqT;
+instance __forall [b] => {PrelBase.Eq b} -> {PrelBase.Eq (B b)} = zdfEqB;
+instance __forall [a] => {PrelBase.Eq a} -> {PrelBase.Eq (T a)} = zdfEqT;
 1 data B b = X |  Y b ;
 1 data T a = D (B a) |  C ;
-1 zdfEqB :: __forall [b] {PrelBase.Eq b} => {PrelBase.Eq (B b)} ;
-1 zdfEqT :: __forall [a] {PrelBase.Eq a} => {PrelBase.Eq (T a)} ;
+1 zdfEqB :: __forall [b] => {PrelBase.Eq b} -> {PrelBase.Eq (B b)} ;
+1 zdfEqT :: __forall [a] => {PrelBase.Eq a} -> {PrelBase.Eq (T a)} ;

diff --git a/ghc/tests/typecheck/should_compile/tc074.stderr b/ghc/tests/typecheck/should_compile/tc074.stderr
index 587ce7c..080ebff 100644 (file)
--- a/ghc/tests/typecheck/should_compile/tc074.stderr
+++ b/ghc/tests/typecheck/should_compile/tc074.stderr
@@ -1,8 +1,8 @@
 ghc: module version changed to 1; reason: no old .hi file
 __export ShouldSucceed B{X Y} T{D C};
-instance __forall [b] {PrelBase.Eq b} => {PrelBase.Eq (B b)} = zdfEqB;
-instance __forall [a] {PrelBase.Eq a} => {PrelBase.Eq (T a)} = zdfEqT;
+instance __forall [b] => {PrelBase.Eq b} -> {PrelBase.Eq (B b)} = zdfEqB;
+instance __forall [a] => {PrelBase.Eq a} -> {PrelBase.Eq (T a)} = zdfEqT;
 1 data B b = X |  Y b ;
 1 data T a = D (B a) |  C ;
-1 zdfEqB :: __forall [b] {PrelBase.Eq b} => {PrelBase.Eq (B b)} ;
-1 zdfEqT :: __forall [a] {PrelBase.Eq a} => {PrelBase.Eq (T a)} ;
+1 zdfEqB :: __forall [b] => {PrelBase.Eq b} -> {PrelBase.Eq (B b)} ;
+1 zdfEqT :: __forall [a] => {PrelBase.Eq a} -> {PrelBase.Eq (T a)} ;

diff --git a/ghc/tests/typecheck/should_compile/tc078.stderr b/ghc/tests/typecheck/should_compile/tc078.stderr
index 1e0c8b4..68c882d 100644 (file)
--- a/ghc/tests/typecheck/should_compile/tc078.stderr
+++ b/ghc/tests/typecheck/should_compile/tc078.stderr
@@ -1,7 +1,7 @@
 ghc: module version changed to 1; reason: no old .hi file
 __export ShouldFail Bar{MkBar};
-instance __forall [a] {PrelBase.Eq a} => {PrelBase.Eq (Bar a)} = zdfEqBar;
-instance __forall [a] {PrelBase.Ord a} => {PrelBase.Ord (Bar a)} = zdfOrdBar;
+instance __forall [a] => {PrelBase.Eq a} -> {PrelBase.Eq (Bar a)} = zdfEqBar;
+instance __forall [a] => {PrelBase.Ord a} -> {PrelBase.Ord (Bar a)} = zdfOrdBar;
 1 data Bar a = MkBar PrelBase.Int a ;
-1 zdfEqBar :: __forall [a] {PrelBase.Eq a} => {PrelBase.Eq (Bar a)} ;
-1 zdfOrdBar :: __forall [a] {PrelBase.Ord a, PrelBase.Eq (Bar a)} => {PrelBase.Ord (Bar a)} ;
+1 zdfEqBar :: __forall [a] => {PrelBase.Eq a} -> {PrelBase.Eq (Bar a)} ;
+1 zdfOrdBar :: __forall [a] => {PrelBase.Ord a} -> {PrelBase.Eq (Bar a)} -> {PrelBase.Ord (Bar a)} ;

diff --git a/ghc/tests/typecheck/should_compile/tc079.stderr b/ghc/tests/typecheck/should_compile/tc079.stderr
index 34efb10..8131c36 100644 (file)
--- a/ghc/tests/typecheck/should_compile/tc079.stderr
+++ b/ghc/tests/typecheck/should_compile/tc079.stderr
@@ -1,9 +1,9 @@
 ghc: module version changed to 1; reason: no old .hi file
 __export ShouldSucceed Foo{op2 op1};
 instance {Foo PrelBase.Int} = zdfFooInt;
-instance __forall [a] {Foo a} => {Foo [a]} = zdfFooZMZN;
-1 class Foo a where {op2 = :: __forall [b] {PrelBase.Ord b} => a -> b -> b -> b; op1 = :: a -> PrelBase.Bool} ;
-1 zddmop1 :: __forall [a] {Foo a} => a -> PrelBase.Bool ;
-1 zddmop2 :: __forall [a] {Foo a} => __forall [b] {PrelBase.Ord b} => a -> b -> b -> b ;
+instance __forall [a] => {Foo a} -> {Foo [a]} = zdfFooZMZN;
+1 class Foo a where {op2 = :: __forall [b] => {PrelBase.Ord b} -> a -> b -> b -> b; op1 = :: a -> PrelBase.Bool} ;
+1 zddmop1 :: __forall [a] => {Foo a} -> a -> PrelBase.Bool ;
+1 zddmop2 :: __forall [a] => {Foo a} -> (__forall [b] => {PrelBase.Ord b} -> a -> b -> b -> b) ;
 1 zdfFooInt :: {Foo PrelBase.Int} ;
-1 zdfFooZMZN :: __forall [a] {Foo a} => {Foo [a]} ;
+1 zdfFooZMZN :: __forall [a] => {Foo a} -> {Foo [a]} ;

diff --git a/ghc/tests/typecheck/should_compile/tc080.stderr b/ghc/tests/typecheck/should_compile/tc080.stderr
index 64503a9..cf380c8 100644 (file)
--- a/ghc/tests/typecheck/should_compile/tc080.stderr
+++ b/ghc/tests/typecheck/should_compile/tc080.stderr
@@ -2,7 +2,7 @@ ghc: module version changed to 1; reason: no old .hi file
 __export ShouldSucceed Parse{forced parse parseType parseLine parseFile} charToInt lineszq seperatedBy spanzq strToInt whiteSpace;
 instance {Parse PrelBase.Char} = zdfParseChar;
 instance {Parse PrelBase.Int} = zdfParseInt;
-instance __forall [a] {Parse a} => {Parse [a]} = zdfParseZMZN;
+instance __forall [a] => {Parse a} -> {Parse [a]} = zdfParseZMZN;
 1 charToInt :: PrelBase.Char -> PrelBase.Int ;
 1 class Parse a where {forced = :: a -> PrelBase.Bool; parse = :: PrelBase.String -> (a, PrelBase.String); parseType :: PrelBase.String -> (a, PrelBase.String); parseLine = :: PrelBase.String -> a; parseFile = :: PrelBase.String -> [a]} ;
 1 lineszq :: [PrelBase.Char] -> [[PrelBase.Char]] ;
@@ -10,10 +10,10 @@ instance __forall [a] {Parse a} => {Parse [a]} = zdfParseZMZN;
 1 spanzq :: __forall [a] => (a -> PrelBase.Bool) -> [a] -> ([a], [a]) ;
 1 strToInt :: PrelBase.String -> PrelBase.Int ;
 1 whiteSpace :: PrelBase.String -> PrelBase.String ;
-1 zddmforced :: __forall [a] {Parse a} => a -> PrelBase.Bool ;
-1 zddmparse :: __forall [a] {Parse a} => PrelBase.String -> (a, PrelBase.String) ;
-1 zddmparseFile :: __forall [a] {Parse a} => PrelBase.String -> [a] ;
-1 zddmparseLine :: __forall [a] {Parse a} => PrelBase.String -> a ;
+1 zddmforced :: __forall [a] => {Parse a} -> a -> PrelBase.Bool ;
+1 zddmparse :: __forall [a] => {Parse a} -> PrelBase.String -> (a, PrelBase.String) ;
+1 zddmparseFile :: __forall [a] => {Parse a} -> PrelBase.String -> [a] ;
+1 zddmparseLine :: __forall [a] => {Parse a} -> PrelBase.String -> a ;
 1 zdfParseChar :: {Parse PrelBase.Char} ;
 1 zdfParseInt :: {Parse PrelBase.Int} ;
-1 zdfParseZMZN :: __forall [a] {Parse a} => {Parse [a]} ;
+1 zdfParseZMZN :: __forall [a] => {Parse a} -> {Parse [a]} ;

diff --git a/ghc/tests/typecheck/should_compile/tc081.stderr b/ghc/tests/typecheck/should_compile/tc081.stderr
index 249ebff..4831739 100644 (file)
--- a/ghc/tests/typecheck/should_compile/tc081.stderr
+++ b/ghc/tests/typecheck/should_compile/tc081.stderr
@@ -1,5 +1,5 @@
 ghc: module version changed to 1; reason: no old .hi file
 __export ShouldSucceed f f2 f3;
-1 f :: __forall [a] {PrelBase.Ord a, PrelBase.Num a} => a -> (a, PrelBase.Bool, [PrelBase.Bool], [PrelBase.Char]) ;
-1 f2 :: __forall [a] {PrelBase.Ord a, PrelBase.Num a} => a -> (a, PrelBase.Bool, [PrelBase.Bool], [PrelBase.Char]) ;
-1 f3 :: __forall [a] {PrelBase.Ord a, PrelBase.Num a} => a -> (a, PrelBase.Bool, [PrelBase.Bool], [PrelBase.Char]) ;
+1 f :: __forall [a] => {PrelBase.Ord a} -> {PrelBase.Num a} -> a -> (a, PrelBase.Bool, [PrelBase.Bool], [PrelBase.Char]) ;
+1 f2 :: __forall [a] => {PrelBase.Ord a} -> {PrelBase.Num a} -> a -> (a, PrelBase.Bool, [PrelBase.Bool], [PrelBase.Char]) ;
+1 f3 :: __forall [a] => {PrelBase.Ord a} -> {PrelBase.Num a} -> a -> (a, PrelBase.Bool, [PrelBase.Bool], [PrelBase.Char]) ;

diff --git a/ghc/tests/typecheck/should_compile/tc084.stderr b/ghc/tests/typecheck/should_compile/tc084.stderr
index 4e91922..1a659a3 100644 (file)
--- a/ghc/tests/typecheck/should_compile/tc084.stderr
+++ b/ghc/tests/typecheck/should_compile/tc084.stderr
@@ -1,5 +1,5 @@
 ghc: module version changed to 1; reason: no old .hi file
 __export ShouldSucceed f g h;
 1 f :: __forall [b] => PrelBase.Int -> b -> PrelBase.Int ;
-1 g :: __forall [a b] {PrelBase.Num a} => PrelBase.Bool -> a -> b -> a ;
+1 g :: __forall [a b] => {PrelBase.Num a} -> PrelBase.Bool -> a -> b -> a ;
 1 h :: __forall [b] => b -> PrelBase.Int -> PrelBase.Int ;

diff --git a/ghc/tests/typecheck/should_compile/tc085.stderr b/ghc/tests/typecheck/should_compile/tc085.stderr
index f21b47a..0f001c9 100644 (file)
--- a/ghc/tests/typecheck/should_compile/tc085.stderr
+++ b/ghc/tests/typecheck/should_compile/tc085.stderr
@@ -1,6 +1,6 @@
 ghc: module version changed to 1; reason: no old .hi file
-__export IOExts IOArray IORef boundsIOArray freezzeIOArray newIOArray newIORef performGC readIOArray readIORef thawIOArray trace unsafePtrEq writeIOArray writeIORef;
-__export PrelGHC Addrzh All Arrayzh ByteArrayzh CCallable CReturnable Charzh Doublezh Floatzh ForeignObjzh Int64zh Intzh MVarzh MutVarzh MutableArrayzh MutableByteArrayzh RealWorld StableNamezh StablePtrzh Statezh ThreadIdzh Weakzh Word64zh Wordzh ZLzmzgZR acosDoublezh acosFloatzh addr2Integerzh addr2Intzh andzh asinDoublezh asinFloatzh assert atanDoublezh atanFloatzh catchzh chrzh cmpIntegerzh cosDoublezh cosFloatzh coshDoublezh coshFloatzh deRefStablePtrzh deRefWeakzh decodeDoublezh decodeFloatzh delayzh divideFloatzh double2Floatzh double2Intzh encodeDoublezh encodeFloatzh eqAddrzh eqCharzh eqFloatzh eqStableNamezh eqStablePtrzh eqWordzh expDoublezh expFloatzh finaliseWeakzh float2Doublezh float2Intzh forkzh geAddrzh geCharzh geFloatzh geWordzh gtAddrzh gtCharzh gtFloatzh gtWordzh iShiftLzh iShiftRAzh iShiftRLzh indexAddrArrayzh indexAddrOffAddrzh indexAddrOffForeignObjzh indexArrayzh indexCharArrayzh indexCharOffAddrzh indexCharOffForeignObjzh indexDoubleArrayzh indexDoubleOffAddrzh indexDoubleOffForeignObjzh indexFloatArrayzh indexFloatOffAddrzh indexFloatOffForeignObjzh indexInt64Arrayzh indexInt64OffAddrzh indexInt64OffForeignObjzh indexIntArrayzh indexIntOffAddrzh indexIntOffForeignObjzh indexStablePtrArrayzh indexStablePtrOffAddrzh indexStablePtrOffForeignObjzh indexWord64Arrayzh indexWord64OffAddrzh indexWord64OffForeignObjzh indexWordArrayzh indexWordOffAddrzh indexWordOffForeignObjzh int2Addrzh int2Doublezh int2Floatzh int2Integerzh int2Wordzh int64ToIntegerzh integer2Intzh integer2Wordzh integerToInt64zh integerToWord64zh isEmptyMVarzh killThreadzh leAddrzh leCharzh leFloatzh leWordzh logDoublezh logFloatzh ltAddrzh ltCharzh ltFloatzh ltWordzh makeForeignObjzh makeStableNamezh makeStablePtrzh minusFloatzh minusIntegerzh mkWeakzh neAddrzh neCharzh neFloatzh neWordzh negateDoublezh negateFloatzh negateIntegerzh negateIntzh newAddrArrayzh newArrayzh newCharArrayzh newDoubleArrayzh newFloatArrayzh newIntArrayzh newMVarzh newMutVarzh newStablePtrArrayzh newWordArrayzh notzh ordzh orzh parAtAbszh parAtForNowzh parAtRelzh parAtzh parGlobalzh parLocalzh parzh plusFloatzh plusIntegerzh powerFloatzh putMVarzh quotIntzh quotRemIntegerzh quotWordzh raisezh readAddrArrayzh readArrayzh readCharArrayzh readDoubleArrayzh readFloatArrayzh readInt64Arrayzh readIntArrayzh readMutVarzh readStablePtrArrayzh readWord64Arrayzh readWordArrayzh realWorldzh reallyUnsafePtrEqualityzh remIntzh remWordzh sameMVarzh sameMutVarzh sameMutableArrayzh sameMutableByteArrayzh seqzh shiftLzh shiftRLzh sinDoublezh sinFloatzh sinhDoublezh sinhFloatzh sizzeofByteArrayzh sizzeofMutableByteArrayzh sqrtDoublezh sqrtFloatzh stableNameToIntzh takeMVarzh tanDoublezh tanFloatzh tanhDoublezh tanhFloatzh timesFloatzh timesIntegerzh unsafeCoercezh unsafeFreezzeArrayzh unsafeFreezzeByteArrayzh waitReadzh waitWritezh word2Integerzh word2Intzh word64ToIntegerzh writeAddrArrayzh writeAddrOffAddrzh writeArrayzh writeCharArrayzh writeCharOffAddrzh writeDoubleArrayzh writeDoubleOffAddrzh writeFloatArrayzh writeFloatOffAddrzh writeForeignObjOffAddrzh writeForeignObjzh writeInt64Arrayzh writeInt64OffAddrzh writeIntArrayzh writeIntOffAddrzh writeMutVarzh writeStablePtrArrayzh writeStablePtrOffAddrzh writeWord64Arrayzh writeWord64OffAddrzh writeWordArrayzh writeWordOffAddrzh xorzh zezezh zezezhzh zgzezh zgzezhzh zgzh zgzhzh zlzezh zlzezhzh zlzh zlzhzh zmzh zmzhzh zpzh zpzhzh zszezh zszezhzh zszh zszhzh ztzh ztzhzh ztztzhzh;
+__export IOExts IOArray IORef boundsIOArray freeHaskellFunctionPtr freezzeIOArray newIOArray newIORef performGC readIOArray readIORef thawIOArray trace unsafeFreezzeIOArray unsafePtrEq unsafeThawIOArray writeIOArray writeIORef;
+__export PrelGHC Addrzh All Arrayzh ByteArrayzh CCallable CReturnable Charzh Doublezh Floatzh ForeignObjzh Int64zh Intzh MVarzh MutVarzh MutableArrayzh MutableByteArrayzh RealWorld StableNamezh StablePtrzh Statezh ThreadIdzh Weakzh Word64zh Wordzh ZLzmzgZR acosDoublezh acosFloatzh addIntCzh addr2Integerzh addr2Intzh andzh asinDoublezh asinFloatzh assert atanDoublezh atanFloatzh catchzh chrzh cmpIntegerIntzh cmpIntegerzh cosDoublezh cosFloatzh coshDoublezh coshFloatzh dataToTagzh deRefStablePtrzh deRefWeakzh decodeDoublezh decodeFloatzh delayzh divideFloatzh double2Floatzh double2Intzh eqAddrzh eqCharzh eqFloatzh eqStableNamezh eqStablePtrzh eqWordzh expDoublezh expFloatzh finalizzeWeakzh float2Doublezh float2Intzh forkzh geAddrzh geCharzh geFloatzh geWordzh getTagzh gtAddrzh gtCharzh gtFloatzh gtWordzh iShiftLzh iShiftRAzh iShiftRLzh indexAddrArrayzh indexAddrOffAddrzh indexAddrOffForeignObjzh indexArrayzh indexCharArrayzh indexCharOffAddrzh indexCharOffForeignObjzh indexDoubleArrayzh indexDoubleOffAddrzh indexDoubleOffForeignObjzh indexFloatArrayzh indexFloatOffAddrzh indexFloatOffForeignObjzh indexInt64Arrayzh indexInt64OffAddrzh indexInt64OffForeignObjzh indexIntArrayzh indexIntOffAddrzh indexIntOffForeignObjzh indexStablePtrArrayzh indexStablePtrOffAddrzh indexStablePtrOffForeignObjzh indexWord64Arrayzh indexWord64OffAddrzh indexWord64OffForeignObjzh indexWordArrayzh indexWordOffAddrzh indexWordOffForeignObjzh int2Addrzh int2Doublezh int2Floatzh int2Integerzh int2Wordzh int64ToIntegerzh integer2Intzh integer2Wordzh integerToInt64zh integerToWord64zh isEmptyMVarzh killThreadzh leAddrzh leCharzh leFloatzh leWordzh logDoublezh logFloatzh ltAddrzh ltCharzh ltFloatzh ltWordzh makeForeignObjzh makeStableNamezh makeStablePtrzh minusFloatzh minusIntegerzh mkWeakzh mulIntCzh myThreadIdzh neAddrzh neCharzh neFloatzh neWordzh negateDoublezh negateFloatzh negateIntzh newAddrArrayzh newArrayzh newCharArrayzh newDoubleArrayzh newFloatArrayzh newIntArrayzh newMVarzh newMutVarzh newStablePtrArrayzh newWordArrayzh notzh ordzh orzh parAtAbszh parAtForNowzh parAtRelzh parAtzh parGlobalzh parLocalzh parzh plusFloatzh plusIntegerzh powerFloatzh putMVarzh quotIntzh quotRemIntegerzh quotWordzh raisezh readAddrArrayzh readArrayzh readCharArrayzh readDoubleArrayzh readFloatArrayzh readInt64Arrayzh readIntArrayzh readMutVarzh readStablePtrArrayzh readWord64Arrayzh readWordArrayzh realWorldzh reallyUnsafePtrEqualityzh remIntzh remWordzh sameMVarzh sameMutVarzh sameMutableArrayzh sameMutableByteArrayzh seqzh shiftLzh shiftRLzh sinDoublezh sinFloatzh sinhDoublezh sinhFloatzh sizzeofByteArrayzh sizzeofMutableByteArrayzh sqrtDoublezh sqrtFloatzh stableNameToIntzh subIntCzh tagToEnumzh takeMVarzh tanDoublezh tanFloatzh tanhDoublezh tanhFloatzh timesFloatzh timesIntegerzh unsafeCoercezh unsafeFreezzeArrayzh unsafeFreezzeByteArrayzh unsafeThawArrayzh unsafeThawByteArrayzh waitReadzh waitWritezh word2Integerzh word2Intzh word64ToIntegerzh writeAddrArrayzh writeAddrOffAddrzh writeArrayzh writeCharArrayzh writeCharOffAddrzh writeDoubleArrayzh writeDoubleOffAddrzh writeFloatArrayzh writeFloatOffAddrzh writeForeignObjOffAddrzh writeForeignObjzh writeInt64Arrayzh writeInt64OffAddrzh writeIntArrayzh writeIntOffAddrzh writeMutVarzh writeStablePtrArrayzh writeStablePtrOffAddrzh writeWord64Arrayzh writeWord64OffAddrzh writeWordArrayzh writeWordOffAddrzh xorzh yieldzh zezezh zezezhzh zgzezh zgzezhzh zgzh zgzhzh zlzezh zlzezhzh zlzh zlzhzh zmzh zmzhzh zpzh zpzhzh zszezh zszezhzh zszh zszhzh ztzh ztzhzh ztztzhzh;
 __export PrelHandle IOModeEx{BinaryMode TextMode} hConnectTo hGetEcho hIsTerminalDevice hSetEcho openFileEx;
 __export PrelIOBase fixIO unsafeInterleaveIO unsafePerformIO;
 1 data FooData = FooData ;

diff --git a/ghc/tests/typecheck/should_compile/tc086.stderr b/ghc/tests/typecheck/should_compile/tc086.stderr
index 83dea72..1d306c0 100644 (file)
--- a/ghc/tests/typecheck/should_compile/tc086.stderr
+++ b/ghc/tests/typecheck/should_compile/tc086.stderr
@@ -2,6 +2,6 @@ ghc: module version changed to 1; reason: no old .hi file
 __export ShouldSucceed Group Ring;
 1 class Group a where {one = :: a; zzero = :: a; zm :: a -> a -> a; zp :: a -> a -> a; fromInteger :: PrelBase.Integer -> a; compare :: a -> a -> PrelBase.Ordering} ;
 1 class {Group a}  => Ring a where {zt = :: a -> a -> a} ;
-1 zddmone :: __forall [a] {Group a} => a ;
-1 zddmzt :: __forall [a] {Ring a} => a -> a -> a ;
-1 zddmzzero :: __forall [a] {Group a} => a ;
+1 zddmone :: __forall [a] => {Group a} -> a ;
+1 zddmzt :: __forall [a] => {Ring a} -> a -> a -> a ;
+1 zddmzzero :: __forall [a] => {Group a} -> a ;

diff --git a/ghc/tests/typecheck/should_compile/tc087.stderr b/ghc/tests/typecheck/should_compile/tc087.stderr
index 38bc7e1..cc7e6a9 100644 (file)
--- a/ghc/tests/typecheck/should_compile/tc087.stderr
+++ b/ghc/tests/typecheck/should_compile/tc087.stderr
@@ -1,10 +1,10 @@
 ghc: module version changed to 1; reason: no old .hi file
 __export ShouldSucceed PriorityQueue{splitMin meld insert single empty} SeqView{Null Cons} check insertMany out pqSort toOrderedList;
-1 check :: __forall [q :: (* -> *)] {PriorityQueue q} => (__forall [a] {PrelBase.Ord a} => q a) -> PrelIOBase.IO PrelBase.Z0T ;
-1 class PriorityQueue q :: (* -> *) where {splitMin :: __forall [a] {PrelBase.Ord a} => q a -> SeqView q a; meld :: __forall [a] {PrelBase.Ord a} => q a -> q a -> q a; insert = :: __forall [a] {PrelBase.Ord a} => a -> q a -> q a; single :: __forall [a] {PrelBase.Ord a} => a -> q a; empty :: __forall [a] {PrelBase.Ord a} => q a} ;
+1 check :: __forall [q :: (* -> *)] => {PriorityQueue q} -> (__forall [a] => {PrelBase.Ord a} -> q a) -> PrelIOBase.IO PrelBase.Z0T ;
+1 class PriorityQueue q :: (* -> *) where {splitMin :: __forall [a] => {PrelBase.Ord a} -> q a -> SeqView q a; meld :: __forall [a] => {PrelBase.Ord a} -> q a -> q a -> q a; insert = :: __forall [a] => {PrelBase.Ord a} -> a -> q a -> q a; single :: __forall [a] => {PrelBase.Ord a} -> a -> q a; empty :: __forall [a] => {PrelBase.Ord a} -> q a} ;
 1 data SeqView t :: (* -> *) a = Null |  Cons a (t a) ;
-1 insertMany :: __forall [a q :: (* -> *)] {PrelBase.Ord a, PriorityQueue q} => [a] -> q a -> q a ;
-1 out :: __forall [a] {PrelBase.Num a} => [a] -> PrelIOBase.IO PrelBase.Z0T ;
-1 pqSort :: __forall [q :: (* -> *) a] {PriorityQueue q, PrelBase.Ord a} => q a -> [a] -> [a] ;
-1 toOrderedList :: __forall [q :: (* -> *) a] {PrelBase.Ord a, PriorityQueue q} => q a -> [a] ;
-1 zddminsert :: __forall [q :: (* -> *)] {PriorityQueue q} => __forall [a] {PrelBase.Ord a} => a -> q a -> q a ;
+1 insertMany :: __forall [a q :: (* -> *)] => {PrelBase.Ord a} -> {PriorityQueue q} -> [a] -> q a -> q a ;
+1 out :: __forall [a] => {PrelBase.Num a} -> [a] -> PrelIOBase.IO PrelBase.Z0T ;
+1 pqSort :: __forall [a t :: (* -> *)] => {PriorityQueue t} -> {PrelBase.Ord a} -> t a -> [a] -> [a] ;
+1 toOrderedList :: __forall [t :: (* -> *) a] => {PrelBase.Ord a} -> {PriorityQueue t} -> t a -> [a] ;
+1 zddminsert :: __forall [q :: (* -> *)] => {PriorityQueue q} -> (__forall [a] => {PrelBase.Ord a} -> a -> q a -> q a) ;

diff --git a/ghc/tests/typecheck/should_compile/tc088.stderr b/ghc/tests/typecheck/should_compile/tc088.stderr
index d36d102..cfbee79 100644 (file)
--- a/ghc/tests/typecheck/should_compile/tc088.stderr
+++ b/ghc/tests/typecheck/should_compile/tc088.stderr
@@ -1,5 +1,5 @@
 ghc: module version changed to 1; reason: no old .hi file
-instance __forall [a b] {PrelBase.Eq b} => {PrelBase.Eq (a -> b)} = zdfEqZLzmzgZR;
-instance __forall [a b] {PrelBase.Num b} => {PrelBase.Num (a -> b)} = zdfNumZLzmzgZR;
-1 zdfEqZLzmzgZR :: __forall [a b] {PrelBase.Eq b} => {PrelBase.Eq (a -> b)} ;
-1 zdfNumZLzmzgZR :: __forall [a b] {PrelBase.Num b, PrelBase.Eq (a -> b), PrelBase.Show (a -> b)} => {PrelBase.Num (a -> b)} ;
+instance __forall [a b] => {PrelBase.Eq b} -> {PrelBase.Eq (a -> b)} = zdfEqZLzmzgZR;
+instance __forall [a b] => {PrelBase.Num b} -> {PrelBase.Num (a -> b)} = zdfNumZLzmzgZR;
+1 zdfEqZLzmzgZR :: __forall [a b] => {PrelBase.Eq b} -> {PrelBase.Eq (a -> b)} ;
+1 zdfNumZLzmzgZR :: __forall [a b] => {PrelBase.Num b} -> {PrelBase.Eq (a -> b)} -> {PrelBase.Show (a -> b)} -> {PrelBase.Num (a -> b)} ;

diff --git a/ghc/tests/typecheck/should_compile/tc089.stderr b/ghc/tests/typecheck/should_compile/tc089.stderr
index 860479b..edaab80 100644 (file)
--- a/ghc/tests/typecheck/should_compile/tc089.stderr
+++ b/ghc/tests/typecheck/should_compile/tc089.stderr
@@ -1,36 +1,36 @@
 ghc: module version changed to 1; reason: no old .hi file
 __export ShouldSucceed absAnd absIf bottom f f_rec f_rec0 f_rec1 f_rec2 fac fac_rec fac_rec0 fac_rec1 fac_rec2 fac_rec3 fac_rec4 g g_rec g_rec0 g_rec1 g_rec2 g_rec3 g_rec4 g_rec5 g_rec6 g_rec7 g_rec8 head one s_1_0 s_2_0 s_2_1 s_3_0 s_3_1 s_3_2;
 1 absAnd :: __forall [t] => t -> t -> t ;
-1 absIf :: __forall [t t1 t2] => t1 -> t -> t2 -> t1 ;
+1 absIf :: __forall [t t1 t2] => t -> t1 -> t2 -> t ;
 1 bottom :: __forall [t] => [t] -> t ;
 1 f :: __forall [t] => t -> t ;
-1 f_rec :: __forall [t t1] => (t1 -> t) -> t1 -> t ;
+1 f_rec :: __forall [t t1] => (t -> t1) -> t -> t1 ;
 1 f_rec0 :: __forall [t] => t -> t ;
 1 f_rec1 :: __forall [t] => t -> t ;
 1 f_rec2 :: __forall [t] => t -> t ;
-1 fac :: __forall [t t1 t2 t3 t4 t5 t6 t7 t8 t9 t10] => (t, (t8, (t1, (t2, (t3, t4)))), (t9, (t1, (t2, (t3, t4))), (t5, (t2, (t3, t4)), (t6, (t3, t4), (t7, t4, t4))))) -> (t10, (t8, (t1, (t2, (t3, t4))))) -> t ;
-1 fac_rec :: __forall [t t1 t2 t3 t4] => (t3 -> t -> t1) -> (t2, t, t3) -> (t4, t) -> t2 ;
+1 fac :: __forall [t t1 t2 t3 t4 t5 t6 t7 t8 t9 t10] => (t, (t9, (t2, (t3, (t4, t5)))), (t1, (t2, (t3, (t4, t5))), (t6, (t3, (t4, t5)), (t7, (t4, t5), (t8, t5, t5))))) -> (t10, (t9, (t2, (t3, (t4, t5))))) -> t ;
+1 fac_rec :: __forall [t t1 t2 t3 t4] => (t4 -> t2 -> t3) -> (t, t2, t4) -> (t1, t2) -> t ;
 1 fac_rec0 :: __forall [t] => t -> t -> t ;
 1 fac_rec1 :: __forall [t t1 t2] => (t, t1, t1) -> (t2, t1) -> t ;
-1 fac_rec2 :: __forall [t t1 t2 t3 t4] => (t, (t2, t1), (t3, t1, t1)) -> (t4, (t2, t1)) -> t ;
-1 fac_rec3 :: __forall [t t1 t2 t3 t4 t5 t6] => (t, (t4, (t1, t2)), (t5, (t1, t2), (t3, t2, t2))) -> (t6, (t4, (t1, t2))) -> t ;
-1 fac_rec4 :: __forall [t t1 t2 t3 t4 t5 t6 t7 t8] => (t, (t6, (t1, (t2, t3))), (t7, (t1, (t2, t3)), (t4, (t2, t3), (t5, t3, t3)))) -> (t8, (t6, (t1, (t2, t3)))) -> t ;
-1 g :: __forall [t t1 t2 t3 t4 t5 t6 t7 t8 t9 t10 t11 t12 t13 t14 t15 t16 t17 t18 t19 t20 t21 t22 t23 t24 t25 t26 t27 t28 t29 t30 t31 t32 t33 t34 t35 t36 t37 t38 t39 t40 t41 t42 t43 t44 t45 t46 t47 t48 t49 t50 t51 t52 t53 t54 t55 t56 t57 t58 t59 t60 t61 t62 t63 t64 t65 t66 t67 t68 t69 t70 t71 t72 t73 t74 t75 t76 t77 t78 t79 t80 t81 t82 t83 t84 t85 t86 t87 t88 t89 t90 t91 t92 t93 t94 t95 t96 t97 t98 t99 t100 t101 t102 t103 t104 t105 t106 t107 t108 t109 t110 t111 t112 t113 t114 t115 t116 t117 t118 t119 t120 t121 t122 t123 t124 t125 t126 t127 t128 t129 t130 t131 t132 t133 t134 t135 t136 t137 t138 t139 t140 t141 t142 t143 t144 t145 t146 t147 t148 t149 t150 t151 t152 t153 t154 t155 t156 t157 t158 t159 t160 t161 t162 t163 t164 t165 t166 t167 t168 t169 t170 t171 t172 t173 t174 t175 t176 t177 t178 t179 t180 t181 t182 t183 t184 t185 t186 t187 t188 t189 t190 t191 t192 t193 t194 t195 t196 t197 t198 t199 t200 t201 t202 t203 t204 t205 t206 t207 t208 t209 t210 t211 t212 t213 t214 t215 t216 t217 t218 t219 t220 t221 t222 t223 t224 t225 t226 t227 t228 t229 t230 t231 t232 t233 t234 t235 t236 t237 t238 t239 t240 t241 t242 t243 t244 t245 t246 t247 t248 t249 t250 t251 t252 t253 t254 t255 t256 t257 t258 t259 t260 t261 t262 t263 t264 t265 t266 t267 t268 t269 t270 t271 t272 t273 t274 t275 t276 t277 t278 t279 t280 t281 t282 t283 t284 t285 t286 t287 t288 t289 t290 t291 t292 t293 t294 t295 t296 t297 t298 t299 t300 t301 t302 t303 t304 t305 t306 t307 t308 t309 t310 t311 t312 t313 t314 t315 t316 t317 t318 t319 t320 t321 t322 t323 t324 t325 t326 t327 t328 t329 t330 t331 t332 t333 t334 t335 t336 t337 t338 t339 t340 t341 t342 t343 t344 t345 t346 t347 t348 t349 t350 t351 t352 t353 t354 t355 t356 t357 t358 t359 t360 t361 t362 t363 t364 t365 t366 t367 t368 t369 t370 t371 t372 t373 t374 t375 t376 t377 t378 t379 t380 t381 t382 t383 t384 t385 t386 t387 t388 t389 t390 t391 t392 t393 t394 t395 t396 t397 t398 t399 t400 t401 t402 t403 t404 t405 t406 t407 t408 t409 t410 t411 t412 t413 t414 t415 t416 t417 t418 t419 t420 t421 t422 t423 t424 t425 t426 t427 t428 t429 t430 t431 t432 t433 t434 t435 t436 t437 t438 t439 t440 t441 t442 t443 t444 t445 t446 t447 t448 t449 t450 t451 t452 t453 t454 t455 t456 t457 t458 t459 t460 t461 t462 t463 t464 t465 t466 t467 t468 t469 t470 t471 t472 t473 t474 t475 t476 t477 t478 t479 t480 t481 t482 t483 t484 t485 t486 t487 t488 t489 t490 t491 t492 t493 t494 t495 t496 t497 t498 t499 t500 t501 t502 t503 t504 t505 t506 t507 t508 t509 t510 t511 t512 t513 t514 t515] => t515 -> t1 -> (t515, t259, t258) -> (t, (t257, (t2, (t3, (t4, (t5, (t6, (t7, (t8, t9, t9), (t8, t10, t10)), (t7, (t11, t12, t12), (t11, t13, t13))), (t6, (t14, (t15, t16, t16), (t15, t17, t17)), (t14, (t18, t19, t19), (t18, t20, t20)))), (t5, (t21, (t22, (t23, t24, t24), (t23, t25, t25)), (t22, (t26, t27, t27), (t26, t28, t28))), (t21, (t29, (t30, t31, t31), (t30, t32, t32)), (t29, (t33, t34, t34), (t33, t35, t35))))), (t4, (t36, (t37, (t38, (t39, t40, t40), (t39, t41, t41)), (t38, (t42, t43, t43), (t42, t44, t44))), (t37, (t45, (t46, t47, t47), (t46, t48, t48)), (t45, (t49, t50, t50), (t49, t51, t51)))), (t36, (t52, (t53, (t54, t55, t55), (t54, t56, t56)), (t53, (t57, t58, t58), (t57, t59, t59))), (t52, (t60, (t61, t62, t62), (t61, t63, t63)), (t60, (t64, t65, t65), (t64, t66, t66)))))), (t3, (t67, (t68, (t69, (t70, (t71, t72, t72), (t71, t73, t73)), (t70, (t74, t75, t75), (t74, t76, t76))), (t69, (t77, (t78, t79, t79), (t78, t80, t80)), (t77, (t81, t82, t82), (t81, t83, t83)))), (t68, (t84, (t85, (t86, t87, t87), (t86, t88, t88)), (t85, (t89, t90, t90), (t89, t91, t91))), (t84, (t92, (t93, t94, t94), (t93, t95, t95)), (t92, (t96, t97, t97), (t96, t98, t98))))), (t67, (t99, (t100, (t101, (t102, t103, t103), (t102, t104, t104)), (t101, (t105, t106, t106), (t105, t107, t107))), (t100, (t108, (t109, t110, t110), (t109, t111, t111)), (t108, (t112, t113, t113), (t112, t114, t114)))), (t99, (t115, (t116, (t117, t118, t118), (t117, t119, t119)), (t116, (t120, t121, t121), (t120, t122, t122))), (t115, (t123, (t124, t125, t125), (t124, t126, t126)), (t123, (t127, t128, t128), (t127, t129, t129))))))), (t2, (t130, (t131, (t132, (t133, (t134, (t135, t136, t136), (t135, t137, t137)), (t134, (t138, t139, t139), (t138, t140, t140))), (t133, (t141, (t142, t143, t143), (t142, t144, t144)), (t141, (t145, t146, t146), (t145, t147, t147)))), (t132, (t148, (t149, (t150, t151, t151), (t150, t152, t152)), (t149, (t153, t154, t154), (t153, t155, t155))), (t148, (t156, (t157, t158, t158), (t157, t159, t159)), (t156, (t160, t161, t161), (t160, t162, t162))))), (t131, (t163, (t164, (t165, (t166, t167, t167), (t166, t168, t168)), (t165, (t169, t170, t170), (t169, t171, t171))), (t164, (t172, (t173, t174, t174), (t173, t175, t175)), (t172, (t176, t177, t177), (t176, t178, t178)))), (t163, (t179, (t180, (t181, t182, t182), (t181, t183, t183)), (t180, (t184, t185, t185), (t184, t186, t186))), (t179, (t187, (t188, t189, t189), (t188, t190, t190)), (t187, (t191, t192, t192), (t191, t193, t193)))))), (t130, (t194, (t195, (t196, (t197, (t198, t199, t199), (t198, t200, t200)), (t197, (t201, t202, t202), (t201, t203, t203))), (t196, (t204, (t205, t206, t206), (t205, t207, t207)), (t204, (t208, t209, t209), (t208, t210, t210)))), (t195, (t211, (t212, (t213, t214, t214), (t213, t215, t215)), (t212, (t216, t217, t217), (t216, t218, t218))), (t211, (t219, (t220, t221, t221), (t220, t222, t222)), (t219, (t223, t224, t224), (t223, t225, t225))))), (t194, (t226, (t227, (t228, (t229, t230, t230), (t229, t231, t231)), (t228, (t232, t233, t233), (t232, t234, t234))), (t227, (t235, (t236, t237, t237), (t236, t238, t238)), (t235, (t239, t240, t240), (t239, t241, t241)))), (t226, (t242, (t243, (t244, t245, t245), (t244, t246, t246)), (t243, (t247, t248, t248), (t247, t249, t249))), (t242, (t250, (t251, t252, t252), (t251, t253, t253)), (t250, (t254, t255, t255), (t254, t256, t256)))))))), (t257, (t260, (t261, (t262, (t263, (t264, (t265, (t266, t267, t267), (t266, t268, t268)), (t265, (t269, t270, t270), (t269, t271, t271))), (t264, (t272, (t273, t274, t274), (t273, t275, t275)), (t272, (t276, t277, t277), (t276, t278, t278)))), (t263, (t279, (t280, (t281, t282, t282), (t281, t283, t283)), (t280, (t284, t285, t285), (t284, t286, t286))), (t279, (t287, (t288, t289, t289), (t288, t290, t290)), (t287, (t291, t292, t292), (t291, t293, t293))))), (t262, (t294, (t295, (t296, (t297, t298, t298), (t297, t299, t299)), (t296, (t300, t301, t301), (t300, t302, t302))), (t295, (t303, (t304, t305, t305), (t304, t306, t306)), (t303, (t307, t308, t308), (t307, t309, t309)))), (t294, (t310, (t311, (t312, t313, t313), (t312, t314, t314)), (t311, (t315, t316, t316), (t315, t317, t317))), (t310, (t318, (t319, t320, t320), (t319, t321, t321)), (t318, (t322, t323, t323), (t322, t324, t324)))))), (t261, (t325, (t326, (t327, (t328, (t329, t330, t330), (t329, t331, t331)), (t328, (t332, t333, t333), (t332, t334, t334))), (t327, (t335, (t336, t337, t337), (t336, t338, t338)), (t335, (t339, t340, t340), (t339, t341, t341)))), (t326, (t342, (t343, (t344, t345, t345), (t344, t346, t346)), (t343, (t347, t348, t348), (t347, t349, t349))), (t342, (t350, (t351, t352, t352), (t351, t353, t353)), (t350, (t354, t355, t355), (t354, t356, t356))))), (t325, (t357, (t358, (t359, (t360, t361, t361), (t360, t362, t362)), (t359, (t363, t364, t364), (t363, t365, t365))), (t358, (t366, (t367, t368, t368), (t367, t369, t369)), (t366, (t370, t371, t371), (t370, t372, t372)))), (t357, (t373, (t374, (t375, t376, t376), (t375, t377, t377)), (t374, (t378, t379, t379), (t378, t380, t380))), (t373, (t381, (t382, t383, t383), (t382, t384, t384)), (t381, (t385, t386, t386), (t385, t387, t387))))))), (t260, (t388, (t389, (t390, (t391, (t392, (t393, t394, t394), (t393, t395, t395)), (t392, (t396, t397, t397), (t396, t398, t398))), (t391, (t399, (t400, t401, t401), (t400, t402, t402)), (t399, (t403, t404, t404), (t403, t405, t405)))), (t390, (t406, (t407, (t408, t409, t409), (t408, t410, t410)), (t407, (t411, t412, t412), (t411, t413, t413))), (t406, (t414, (t415, t416, t416), (t415, t417, t417)), (t414, (t418, t419, t419), (t418, t420, t420))))), (t389, (t421, (t422, (t423, (t424, t425, t425), (t424, t426, t426)), (t423, (t427, t428, t428), (t427, t429, t429))), (t422, (t430, (t431, t432, t432), (t431, t433, t433)), (t430, (t434, t435, t435), (t434, t436, t436)))), (t421, (t437, (t438, (t439, t440, t440), (t439, t441, t441)), (t438, (t442, t443, t443), (t442, t444, t444))), (t437, (t445, (t446, t447, t447), (t446, t448, t448)), (t445, (t449, t450, t450), (t449, t451, t451)))))), (t388, (t452, (t453, (t454, (t455, (t456, t457, t457), (t456, t458, t458)), (t455, (t459, t460, t460), (t459, t461, t461))), (t454, (t462, (t463, t464, t464), (t463, t465, t465)), (t462, (t466, t467, t467), (t466, t468, t468)))), (t453, (t469, (t470, (t471, t472, t472), (t471, t473, t473)), (t470, (t474, t475, t475), (t474, t476, t476))), (t469, (t477, (t478, t479, t479), (t478, t480, t480)), (t477, (t481, t482, t482), (t481, t483, t483))))), (t452, (t484, (t485, (t486, (t487, t488, t488), (t487, t489, t489)), (t486, (t490, t491, t491), (t490, t492, t492))), (t485, (t493, (t494, t495, t495), (t494, t496, t496)), (t493, (t497, t498, t498), (t497, t499, t499)))), (t484, (t500, (t501, (t502, t503, t503), (t502, t504, t504)), (t501, (t505, t506, t506), (t505, t507, t507))), (t500, (t508, (t509, t510, t510), (t509, t511, t511)), (t508, (t512, t513, t513), (t512, t514, t514))))))))) -> t ;
-1 g_rec :: __forall [t t1 t2 t3 t4 t5 t6 t7 t8 t9 t10] => (t1 -> t2 -> t3 -> t10 -> t) -> (t8 -> t4 -> t5 -> t6 -> t) -> t7 -> t1 -> (t7, t4, t8) -> (t9, t10, t6) -> t9 ;
+1 fac_rec2 :: __forall [t t1 t2 t3 t4] => (t, (t3, t2), (t1, t2, t2)) -> (t4, (t3, t2)) -> t ;
+1 fac_rec3 :: __forall [t t1 t2 t3 t4 t5 t6] => (t, (t5, (t2, t3)), (t1, (t2, t3), (t4, t3, t3))) -> (t6, (t5, (t2, t3))) -> t ;
+1 fac_rec4 :: __forall [t t1 t2 t3 t4 t5 t6 t7 t8] => (t, (t7, (t2, (t3, t4))), (t1, (t2, (t3, t4)), (t5, (t3, t4), (t6, t4, t4)))) -> (t8, (t7, (t2, (t3, t4)))) -> t ;
+1 g :: __forall [t t1 t2 t3 t4 t5 t6 t7 t8 t9 t10 t11 t12 t13 t14 t15 t16 t17 t18 t19 t20 t21 t22 t23 t24 t25 t26 t27 t28 t29 t30 t31 t32 t33 t34 t35 t36 t37 t38 t39 t40 t41 t42 t43 t44 t45 t46 t47 t48 t49 t50 t51 t52 t53 t54 t55 t56 t57 t58 t59 t60 t61 t62 t63 t64 t65 t66 t67 t68 t69 t70 t71 t72 t73 t74 t75 t76 t77 t78 t79 t80 t81 t82 t83 t84 t85 t86 t87 t88 t89 t90 t91 t92 t93 t94 t95 t96 t97 t98 t99 t100 t101 t102 t103 t104 t105 t106 t107 t108 t109 t110 t111 t112 t113 t114 t115 t116 t117 t118 t119 t120 t121 t122 t123 t124 t125 t126 t127 t128 t129 t130 t131 t132 t133 t134 t135 t136 t137 t138 t139 t140 t141 t142 t143 t144 t145 t146 t147 t148 t149 t150 t151 t152 t153 t154 t155 t156 t157 t158 t159 t160 t161 t162 t163 t164 t165 t166 t167 t168 t169 t170 t171 t172 t173 t174 t175 t176 t177 t178 t179 t180 t181 t182 t183 t184 t185 t186 t187 t188 t189 t190 t191 t192 t193 t194 t195 t196 t197 t198 t199 t200 t201 t202 t203 t204 t205 t206 t207 t208 t209 t210 t211 t212 t213 t214 t215 t216 t217 t218 t219 t220 t221 t222 t223 t224 t225 t226 t227 t228 t229 t230 t231 t232 t233 t234 t235 t236 t237 t238 t239 t240 t241 t242 t243 t244 t245 t246 t247 t248 t249 t250 t251 t252 t253 t254 t255 t256 t257 t258 t259 t260 t261 t262 t263 t264 t265 t266 t267 t268 t269 t270 t271 t272 t273 t274 t275 t276 t277 t278 t279 t280 t281 t282 t283 t284 t285 t286 t287 t288 t289 t290 t291 t292 t293 t294 t295 t296 t297 t298 t299 t300 t301 t302 t303 t304 t305 t306 t307 t308 t309 t310 t311 t312 t313 t314 t315 t316 t317 t318 t319 t320 t321 t322 t323 t324 t325 t326 t327 t328 t329 t330 t331 t332 t333 t334 t335 t336 t337 t338 t339 t340 t341 t342 t343 t344 t345 t346 t347 t348 t349 t350 t351 t352 t353 t354 t355 t356 t357 t358 t359 t360 t361 t362 t363 t364 t365 t366 t367 t368 t369 t370 t371 t372 t373 t374 t375 t376 t377 t378 t379 t380 t381 t382 t383 t384 t385 t386 t387 t388 t389 t390 t391 t392 t393 t394 t395 t396 t397 t398 t399 t400 t401 t402 t403 t404 t405 t406 t407 t408 t409 t410 t411 t412 t413 t414 t415 t416 t417 t418 t419 t420 t421 t422 t423 t424 t425 t426 t427 t428 t429 t430 t431 t432 t433 t434 t435 t436 t437 t438 t439 t440 t441 t442 t443 t444 t445 t446 t447 t448 t449 t450 t451 t452 t453 t454 t455 t456 t457 t458 t459 t460 t461 t462 t463 t464 t465 t466 t467 t468 t469 t470 t471 t472 t473 t474 t475 t476 t477 t478 t479 t480 t481 t482 t483 t484 t485 t486 t487 t488 t489 t490 t491 t492 t493 t494 t495 t496 t497 t498 t499 t500 t501 t502 t503 t504 t505 t506 t507 t508 t509 t510 t511 t512 t513 t514 t515] => t -> t1 -> (t, t259, t258) -> (t2, (t260, (t3, (t4, (t5, (t6, (t7, (t8, (t9, t10, t10), (t9, t11, t11)), (t8, (t12, t13, t13), (t12, t14, t14))), (t7, (t15, (t16, t17, t17), (t16, t18, t18)), (t15, (t19, t20, t20), (t19, t21, t21)))), (t6, (t22, (t23, (t24, t25, t25), (t24, t26, t26)), (t23, (t27, t28, t28), (t27, t29, t29))), (t22, (t30, (t31, t32, t32), (t31, t33, t33)), (t30, (t34, t35, t35), (t34, t36, t36))))), (t5, (t37, (t38, (t39, (t40, t41, t41), (t40, t42, t42)), (t39, (t43, t44, t44), (t43, t45, t45))), (t38, (t46, (t47, t48, t48), (t47, t49, t49)), (t46, (t50, t51, t51), (t50, t52, t52)))), (t37, (t53, (t54, (t55, t56, t56), (t55, t57, t57)), (t54, (t58, t59, t59), (t58, t60, t60))), (t53, (t61, (t62, t63, t63), (t62, t64, t64)), (t61, (t65, t66, t66), (t65, t67, t67)))))), (t4, (t68, (t69, (t70, (t71, (t72, t73, t73), (t72, t74, t74)), (t71, (t75, t76, t76), (t75, t77, t77))), (t70, (t78, (t79, t80, t80), (t79, t81, t81)), (t78, (t82, t83, t83), (t82, t84, t84)))), (t69, (t85, (t86, (t87, t88, t88), (t87, t89, t89)), (t86, (t90, t91, t91), (t90, t92, t92))), (t85, (t93, (t94, t95, t95), (t94, t96, t96)), (t93, (t97, t98, t98), (t97, t99, t99))))), (t68, (t100, (t101, (t102, (t103, t104, t104), (t103, t105, t105)), (t102, (t106, t107, t107), (t106, t108, t108))), (t101, (t109, (t110, t111, t111), (t110, t112, t112)), (t109, (t113, t114, t114), (t113, t115, t115)))), (t100, (t116, (t117, (t118, t119, t119), (t118, t120, t120)), (t117, (t121, t122, t122), (t121, t123, t123))), (t116, (t124, (t125, t126, t126), (t125, t127, t127)), (t124, (t128, t129, t129), (t128, t130, t130))))))), (t3, (t131, (t132, (t133, (t134, (t135, (t136, t137, t137), (t136, t138, t138)), (t135, (t139, t140, t140), (t139, t141, t141))), (t134, (t142, (t143, t144, t144), (t143, t145, t145)), (t142, (t146, t147, t147), (t146, t148, t148)))), (t133, (t149, (t150, (t151, t152, t152), (t151, t153, t153)), (t150, (t154, t155, t155), (t154, t156, t156))), (t149, (t157, (t158, t159, t159), (t158, t160, t160)), (t157, (t161, t162, t162), (t161, t163, t163))))), (t132, (t164, (t165, (t166, (t167, t168, t168), (t167, t169, t169)), (t166, (t170, t171, t171), (t170, t172, t172))), (t165, (t173, (t174, t175, t175), (t174, t176, t176)), (t173, (t177, t178, t178), (t177, t179, t179)))), (t164, (t180, (t181, (t182, t183, t183), (t182, t184, t184)), (t181, (t185, t186, t186), (t185, t187, t187))), (t180, (t188, (t189, t190, t190), (t189, t191, t191)), (t188, (t192, t193, t193), (t192, t194, t194)))))), (t131, (t195, (t196, (t197, (t198, (t199, t200, t200), (t199, t201, t201)), (t198, (t202, t203, t203), (t202, t204, t204))), (t197, (t205, (t206, t207, t207), (t206, t208, t208)), (t205, (t209, t210, t210), (t209, t211, t211)))), (t196, (t212, (t213, (t214, t215, t215), (t214, t216, t216)), (t213, (t217, t218, t218), (t217, t219, t219))), (t212, (t220, (t221, t222, t222), (t221, t223, t223)), (t220, (t224, t225, t225), (t224, t226, t226))))), (t195, (t227, (t228, (t229, (t230, t231, t231), (t230, t232, t232)), (t229, (t233, t234, t234), (t233, t235, t235))), (t228, (t236, (t237, t238, t238), (t237, t239, t239)), (t236, (t240, t241, t241), (t240, t242, t242)))), (t227, (t243, (t244, (t245, t246, t246), (t245, t247, t247)), (t244, (t248, t249, t249), (t248, t250, t250))), (t243, (t251, (t252, t253, t253), (t252, t254, t254)), (t251, (t255, t256, t256), (t255, t257, t257)))))))), (t260, (t261, (t262, (t263, (t264, (t265, (t266, (t267, t268, t268), (t267, t269, t269)), (t266, (t270, t271, t271), (t270, t272, t272))), (t265, (t273, (t274, t275, t275), (t274, t276, t276)), (t273, (t277, t278, t278), (t277, t279, t279)))), (t264, (t280, (t281, (t282, t283, t283), (t282, t284, t284)), (t281, (t285, t286, t286), (t285, t287, t287))), (t280, (t288, (t289, t290, t290), (t289, t291, t291)), (t288, (t292, t293, t293), (t292, t294, t294))))), (t263, (t295, (t296, (t297, (t298, t299, t299), (t298, t300, t300)), (t297, (t301, t302, t302), (t301, t303, t303))), (t296, (t304, (t305, t306, t306), (t305, t307, t307)), (t304, (t308, t309, t309), (t308, t310, t310)))), (t295, (t311, (t312, (t313, t314, t314), (t313, t315, t315)), (t312, (t316, t317, t317), (t316, t318, t318))), (t311, (t319, (t320, t321, t321), (t320, t322, t322)), (t319, (t323, t324, t324), (t323, t325, t325)))))), (t262, (t326, (t327, (t328, (t329, (t330, t331, t331), (t330, t332, t332)), (t329, (t333, t334, t334), (t333, t335, t335))), (t328, (t336, (t337, t338, t338), (t337, t339, t339)), (t336, (t340, t341, t341), (t340, t342, t342)))), (t327, (t343, (t344, (t345, t346, t346), (t345, t347, t347)), (t344, (t348, t349, t349), (t348, t350, t350))), (t343, (t351, (t352, t353, t353), (t352, t354, t354)), (t351, (t355, t356, t356), (t355, t357, t357))))), (t326, (t358, (t359, (t360, (t361, t362, t362), (t361, t363, t363)), (t360, (t364, t365, t365), (t364, t366, t366))), (t359, (t367, (t368, t369, t369), (t368, t370, t370)), (t367, (t371, t372, t372), (t371, t373, t373)))), (t358, (t374, (t375, (t376, t377, t377), (t376, t378, t378)), (t375, (t379, t380, t380), (t379, t381, t381))), (t374, (t382, (t383, t384, t384), (t383, t385, t385)), (t382, (t386, t387, t387), (t386, t388, t388))))))), (t261, (t389, (t390, (t391, (t392, (t393, (t394, t395, t395), (t394, t396, t396)), (t393, (t397, t398, t398), (t397, t399, t399))), (t392, (t400, (t401, t402, t402), (t401, t403, t403)), (t400, (t404, t405, t405), (t404, t406, t406)))), (t391, (t407, (t408, (t409, t410, t410), (t409, t411, t411)), (t408, (t412, t413, t413), (t412, t414, t414))), (t407, (t415, (t416, t417, t417), (t416, t418, t418)), (t415, (t419, t420, t420), (t419, t421, t421))))), (t390, (t422, (t423, (t424, (t425, t426, t426), (t425, t427, t427)), (t424, (t428, t429, t429), (t428, t430, t430))), (t423, (t431, (t432, t433, t433), (t432, t434, t434)), (t431, (t435, t436, t436), (t435, t437, t437)))), (t422, (t438, (t439, (t440, t441, t441), (t440, t442, t442)), (t439, (t443, t444, t444), (t443, t445, t445))), (t438, (t446, (t447, t448, t448), (t447, t449, t449)), (t446, (t450, t451, t451), (t450, t452, t452)))))), (t389, (t453, (t454, (t455, (t456, (t457, t458, t458), (t457, t459, t459)), (t456, (t460, t461, t461), (t460, t462, t462))), (t455, (t463, (t464, t465, t465), (t464, t466, t466)), (t463, (t467, t468, t468), (t467, t469, t469)))), (t454, (t470, (t471, (t472, t473, t473), (t472, t474, t474)), (t471, (t475, t476, t476), (t475, t477, t477))), (t470, (t478, (t479, t480, t480), (t479, t481, t481)), (t478, (t482, t483, t483), (t482, t484, t484))))), (t453, (t485, (t486, (t487, (t488, t489, t489), (t488, t490, t490)), (t487, (t491, t492, t492), (t491, t493, t493))), (t486, (t494, (t495, t496, t496), (t495, t497, t497)), (t494, (t498, t499, t499), (t498, t500, t500)))), (t485, (t501, (t502, (t503, t504, t504), (t503, t505, t505)), (t502, (t506, t507, t507), (t506, t508, t508))), (t501, (t509, (t510, t511, t511), (t510, t512, t512)), (t509, (t513, t514, t514), (t513, t515, t515))))))))) -> t2 ;
+1 g_rec :: __forall [t t1 t2 t3 t4 t5 t6 t7 t8 t9 t10] => (t -> t5 -> t6 -> t7 -> t8) -> (t4 -> t3 -> t9 -> t10 -> t8) -> t2 -> t -> (t2, t3, t4) -> (t1, t7, t10) -> t1 ;
 1 g_rec0 :: __forall [t] => t -> t -> t -> t -> t ;
-1 g_rec1 :: __forall [t t1 t2] => t2 -> t1 -> (t2, t1, t1) -> (t, t1, t1) -> t ;
-1 g_rec2 :: __forall [t t1 t2 t3 t4 t5 t6] => t6 -> t1 -> (t6, t5, t4) -> (t, (t3, t2, t2), (t3, t5, t5)) -> t ;
-1 g_rec3 :: __forall [t t1 t2 t3 t4 t5 t6 t7 t8 t9 t10 t11] => t11 -> t1 -> (t11, t7, t6) -> (t, (t5, (t3, t4, t4), (t3, t2, t2)), (t5, (t9, t10, t10), (t9, t8, t8))) -> t ;
-1 g_rec4 :: __forall [t t1 t2 t3 t4 t5 t6 t7 t8 t9 t10 t11 t12 t13 t14 t15 t16 t17 t18 t19] => t19 -> t1 -> (t19, t11, t10) -> (t, (t9, (t2, (t3, t4, t4), (t3, t5, t5)), (t2, (t6, t7, t7), (t6, t8, t8))), (t9, (t12, (t13, t14, t14), (t13, t15, t15)), (t12, (t16, t17, t17), (t16, t18, t18)))) -> t ;
-1 g_rec5 :: __forall [t t1 t2 t3 t4 t5 t6 t7 t8 t9 t10 t11 t12 t13 t14 t15 t16 t17 t18 t19 t20 t21 t22 t23 t24 t25 t26 t27 t28 t29 t30 t31 t32 t33 t34 t35] => t35 -> t1 -> (t35, t19, t18) -> (t, (t17, (t2, (t3, (t4, t5, t5), (t4, t6, t6)), (t3, (t7, t8, t8), (t7, t9, t9))), (t2, (t10, (t11, t12, t12), (t11, t13, t13)), (t10, (t14, t15, t15), (t14, t16, t16)))), (t17, (t20, (t21, (t22, t23, t23), (t22, t24, t24)), (t21, (t25, t26, t26), (t25, t27, t27))), (t20, (t28, (t29, t30, t30), (t29, t31, t31)), (t28, (t32, t33, t33), (t32, t34, t34))))) -> t ;
-1 g_rec6 :: __forall [t t1 t2 t3 t4 t5 t6 t7 t8 t9 t10 t11 t12 t13 t14 t15 t16 t17 t18 t19 t20 t21 t22 t23 t24 t25 t26 t27 t28 t29 t30 t31 t32 t33 t34 t35 t36 t37 t38 t39 t40 t41 t42 t43 t44 t45 t46 t47 t48 t49 t50 t51 t52 t53 t54 t55 t56 t57 t58 t59 t60 t61 t62 t63 t64 t65 t66 t67] => t67 -> t1 -> (t67, t35, t34) -> (t, (t33, (t2, (t3, (t4, (t5, t6, t6), (t5, t7, t7)), (t4, (t8, t9, t9), (t8, t10, t10))), (t3, (t11, (t12, t13, t13), (t12, t14, t14)), (t11, (t15, t16, t16), (t15, t17, t17)))), (t2, (t18, (t19, (t20, t21, t21), (t20, t22, t22)), (t19, (t23, t24, t24), (t23, t25, t25))), (t18, (t26, (t27, t28, t28), (t27, t29, t29)), (t26, (t30, t31, t31), (t30, t32, t32))))), (t33, (t36, (t37, (t38, (t39, t40, t40), (t39, t41, t41)), (t38, (t42, t43, t43), (t42, t44, t44))), (t37, (t45, (t46, t47, t47), (t46, t48, t48)), (t45, (t49, t50, t50), (t49, t51, t51)))), (t36, (t52, (t53, (t54, t55, t55), (t54, t56, t56)), (t53, (t57, t58, t58), (t57, t59, t59))), (t52, (t60, (t61, t62, t62), (t61, t63, t63)), (t60, (t64, t65, t65), (t64, t66, t66)))))) -> t ;
-1 g_rec7 :: __forall [t t1 t2 t3 t4 t5 t6 t7 t8 t9 t10 t11 t12 t13 t14 t15 t16 t17 t18 t19 t20 t21 t22 t23 t24 t25 t26 t27 t28 t29 t30 t31 t32 t33 t34 t35 t36 t37 t38 t39 t40 t41 t42 t43 t44 t45 t46 t47 t48 t49 t50 t51 t52 t53 t54 t55 t56 t57 t58 t59 t60 t61 t62 t63 t64 t65 t66 t67 t68 t69 t70 t71 t72 t73 t74 t75 t76 t77 t78 t79 t80 t81 t82 t83 t84 t85 t86 t87 t88 t89 t90 t91 t92 t93 t94 t95 t96 t97 t98 t99 t100 t101 t102 t103 t104 t105 t106 t107 t108 t109 t110 t111 t112 t113 t114 t115 t116 t117 t118 t119 t120 t121 t122 t123 t124 t125 t126 t127 t128 t129 t130 t131] => t131 -> t1 -> (t131, t67, t66) -> (t, (t65, (t2, (t3, (t4, (t5, (t6, t7, t7), (t6, t8, t8)), (t5, (t9, t10, t10), (t9, t11, t11))), (t4, (t12, (t13, t14, t14), (t13, t15, t15)), (t12, (t16, t17, t17), (t16, t18, t18)))), (t3, (t19, (t20, (t21, t22, t22), (t21, t23, t23)), (t20, (t24, t25, t25), (t24, t26, t26))), (t19, (t27, (t28, t29, t29), (t28, t30, t30)), (t27, (t31, t32, t32), (t31, t33, t33))))), (t2, (t34, (t35, (t36, (t37, t38, t38), (t37, t39, t39)), (t36, (t40, t41, t41), (t40, t42, t42))), (t35, (t43, (t44, t45, t45), (t44, t46, t46)), (t43, (t47, t48, t48), (t47, t49, t49)))), (t34, (t50, (t51, (t52, t53, t53), (t52, t54, t54)), (t51, (t55, t56, t56), (t55, t57, t57))), (t50, (t58, (t59, t60, t60), (t59, t61, t61)), (t58, (t62, t63, t63), (t62, t64, t64)))))), (t65, (t68, (t69, (t70, (t71, (t72, t73, t73), (t72, t74, t74)), (t71, (t75, t76, t76), (t75, t77, t77))), (t70, (t78, (t79, t80, t80), (t79, t81, t81)), (t78, (t82, t83, t83), (t82, t84, t84)))), (t69, (t85, (t86, (t87, t88, t88), (t87, t89, t89)), (t86, (t90, t91, t91), (t90, t92, t92))), (t85, (t93, (t94, t95, t95), (t94, t96, t96)), (t93, (t97, t98, t98), (t97, t99, t99))))), (t68, (t100, (t101, (t102, (t103, t104, t104), (t103, t105, t105)), (t102, (t106, t107, t107), (t106, t108, t108))), (t101, (t109, (t110, t111, t111), (t110, t112, t112)), (t109, (t113, t114, t114), (t113, t115, t115)))), (t100, (t116, (t117, (t118, t119, t119), (t118, t120, t120)), (t117, (t121, t122, t122), (t121, t123, t123))), (t116, (t124, (t125, t126, t126), (t125, t127, t127)), (t124, (t128, t129, t129), (t128, t130, t130))))))) -> t ;
-1 g_rec8 :: __forall [t t1 t2 t3 t4 t5 t6 t7 t8 t9 t10 t11 t12 t13 t14 t15 t16 t17 t18 t19 t20 t21 t22 t23 t24 t25 t26 t27 t28 t29 t30 t31 t32 t33 t34 t35 t36 t37 t38 t39 t40 t41 t42 t43 t44 t45 t46 t47 t48 t49 t50 t51 t52 t53 t54 t55 t56 t57 t58 t59 t60 t61 t62 t63 t64 t65 t66 t67 t68 t69 t70 t71 t72 t73 t74 t75 t76 t77 t78 t79 t80 t81 t82 t83 t84 t85 t86 t87 t88 t89 t90 t91 t92 t93 t94 t95 t96 t97 t98 t99 t100 t101 t102 t103 t104 t105 t106 t107 t108 t109 t110 t111 t112 t113 t114 t115 t116 t117 t118 t119 t120 t121 t122 t123 t124 t125 t126 t127 t128 t129 t130 t131 t132 t133 t134 t135 t136 t137 t138 t139 t140 t141 t142 t143 t144 t145 t146 t147 t148 t149 t150 t151 t152 t153 t154 t155 t156 t157 t158 t159 t160 t161 t162 t163 t164 t165 t166 t167 t168 t169 t170 t171 t172 t173 t174 t175 t176 t177 t178 t179 t180 t181 t182 t183 t184 t185 t186 t187 t188 t189 t190 t191 t192 t193 t194 t195 t196 t197 t198 t199 t200 t201 t202 t203 t204 t205 t206 t207 t208 t209 t210 t211 t212 t213 t214 t215 t216 t217 t218 t219 t220 t221 t222 t223 t224 t225 t226 t227 t228 t229 t230 t231 t232 t233 t234 t235 t236 t237 t238 t239 t240 t241 t242 t243 t244 t245 t246 t247 t248 t249 t250 t251 t252 t253 t254 t255 t256 t257 t258 t259] => t259 -> t1 -> (t259, t131, t130) -> (t, (t129, (t2, (t3, (t4, (t5, (t6, (t7, t8, t8), (t7, t9, t9)), (t6, (t10, t11, t11), (t10, t12, t12))), (t5, (t13, (t14, t15, t15), (t14, t16, t16)), (t13, (t17, t18, t18), (t17, t19, t19)))), (t4, (t20, (t21, (t22, t23, t23), (t22, t24, t24)), (t21, (t25, t26, t26), (t25, t27, t27))), (t20, (t28, (t29, t30, t30), (t29, t31, t31)), (t28, (t32, t33, t33), (t32, t34, t34))))), (t3, (t35, (t36, (t37, (t38, t39, t39), (t38, t40, t40)), (t37, (t41, t42, t42), (t41, t43, t43))), (t36, (t44, (t45, t46, t46), (t45, t47, t47)), (t44, (t48, t49, t49), (t48, t50, t50)))), (t35, (t51, (t52, (t53, t54, t54), (t53, t55, t55)), (t52, (t56, t57, t57), (t56, t58, t58))), (t51, (t59, (t60, t61, t61), (t60, t62, t62)), (t59, (t63, t64, t64), (t63, t65, t65)))))), (t2, (t66, (t67, (t68, (t69, (t70, t71, t71), (t70, t72, t72)), (t69, (t73, t74, t74), (t73, t75, t75))), (t68, (t76, (t77, t78, t78), (t77, t79, t79)), (t76, (t80, t81, t81), (t80, t82, t82)))), (t67, (t83, (t84, (t85, t86, t86), (t85, t87, t87)), (t84, (t88, t89, t89), (t88, t90, t90))), (t83, (t91, (t92, t93, t93), (t92, t94, t94)), (t91, (t95, t96, t96), (t95, t97, t97))))), (t66, (t98, (t99, (t100, (t101, t102, t102), (t101, t103, t103)), (t100, (t104, t105, t105), (t104, t106, t106))), (t99, (t107, (t108, t109, t109), (t108, t110, t110)), (t107, (t111, t112, t112), (t111, t113, t113)))), (t98, (t114, (t115, (t116, t117, t117), (t116, t118, t118)), (t115, (t119, t120, t120), (t119, t121, t121))), (t114, (t122, (t123, t124, t124), (t123, t125, t125)), (t122, (t126, t127, t127), (t126, t128, t128))))))), (t129, (t132, (t133, (t134, (t135, (t136, (t137, t138, t138), (t137, t139, t139)), (t136, (t140, t141, t141), (t140, t142, t142))), (t135, (t143, (t144, t145, t145), (t144, t146, t146)), (t143, (t147, t148, t148), (t147, t149, t149)))), (t134, (t150, (t151, (t152, t153, t153), (t152, t154, t154)), (t151, (t155, t156, t156), (t155, t157, t157))), (t150, (t158, (t159, t160, t160), (t159, t161, t161)), (t158, (t162, t163, t163), (t162, t164, t164))))), (t133, (t165, (t166, (t167, (t168, t169, t169), (t168, t170, t170)), (t167, (t171, t172, t172), (t171, t173, t173))), (t166, (t174, (t175, t176, t176), (t175, t177, t177)), (t174, (t178, t179, t179), (t178, t180, t180)))), (t165, (t181, (t182, (t183, t184, t184), (t183, t185, t185)), (t182, (t186, t187, t187), (t186, t188, t188))), (t181, (t189, (t190, t191, t191), (t190, t192, t192)), (t189, (t193, t194, t194), (t193, t195, t195)))))), (t132, (t196, (t197, (t198, (t199, (t200, t201, t201), (t200, t202, t202)), (t199, (t203, t204, t204), (t203, t205, t205))), (t198, (t206, (t207, t208, t208), (t207, t209, t209)), (t206, (t210, t211, t211), (t210, t212, t212)))), (t197, (t213, (t214, (t215, t216, t216), (t215, t217, t217)), (t214, (t218, t219, t219), (t218, t220, t220))), (t213, (t221, (t222, t223, t223), (t222, t224, t224)), (t221, (t225, t226, t226), (t225, t227, t227))))), (t196, (t228, (t229, (t230, (t231, t232, t232), (t231, t233, t233)), (t230, (t234, t235, t235), (t234, t236, t236))), (t229, (t237, (t238, t239, t239), (t238, t240, t240)), (t237, (t241, t242, t242), (t241, t243, t243)))), (t228, (t244, (t245, (t246, t247, t247), (t246, t248, t248)), (t245, (t249, t250, t250), (t249, t251, t251))), (t244, (t252, (t253, t254, t254), (t253, t255, t255)), (t252, (t256, t257, t257), (t256, t258, t258)))))))) -> t ;
+1 g_rec1 :: __forall [t t1 t2] => t -> t1 -> (t, t1, t1) -> (t2, t1, t1) -> t2 ;
+1 g_rec2 :: __forall [t t1 t2 t3 t4 t5 t6] => t -> t1 -> (t, t5, t4) -> (t2, (t6, t3, t3), (t6, t5, t5)) -> t2 ;
+1 g_rec3 :: __forall [t t1 t2 t3 t4 t5 t6 t7 t8 t9 t10 t11] => t -> t1 -> (t, t7, t6) -> (t2, (t9, (t4, t5, t5), (t4, t3, t3)), (t9, (t10, t11, t11), (t10, t8, t8))) -> t2 ;
+1 g_rec4 :: __forall [t t1 t2 t3 t4 t5 t6 t7 t8 t9 t10 t11 t12 t13 t14 t15 t16 t17 t18 t19] => t -> t1 -> (t, t11, t10) -> (t2, (t12, (t3, (t4, t5, t5), (t4, t6, t6)), (t3, (t7, t8, t8), (t7, t9, t9))), (t12, (t13, (t14, t15, t15), (t14, t16, t16)), (t13, (t17, t18, t18), (t17, t19, t19)))) -> t2 ;
+1 g_rec5 :: __forall [t t1 t2 t3 t4 t5 t6 t7 t8 t9 t10 t11 t12 t13 t14 t15 t16 t17 t18 t19 t20 t21 t22 t23 t24 t25 t26 t27 t28 t29 t30 t31 t32 t33 t34 t35] => t -> t1 -> (t, t19, t18) -> (t2, (t20, (t3, (t4, (t5, t6, t6), (t5, t7, t7)), (t4, (t8, t9, t9), (t8, t10, t10))), (t3, (t11, (t12, t13, t13), (t12, t14, t14)), (t11, (t15, t16, t16), (t15, t17, t17)))), (t20, (t21, (t22, (t23, t24, t24), (t23, t25, t25)), (t22, (t26, t27, t27), (t26, t28, t28))), (t21, (t29, (t30, t31, t31), (t30, t32, t32)), (t29, (t33, t34, t34), (t33, t35, t35))))) -> t2 ;
+1 g_rec6 :: __forall [t t1 t2 t3 t4 t5 t6 t7 t8 t9 t10 t11 t12 t13 t14 t15 t16 t17 t18 t19 t20 t21 t22 t23 t24 t25 t26 t27 t28 t29 t30 t31 t32 t33 t34 t35 t36 t37 t38 t39 t40 t41 t42 t43 t44 t45 t46 t47 t48 t49 t50 t51 t52 t53 t54 t55 t56 t57 t58 t59 t60 t61 t62 t63 t64 t65 t66 t67] => t -> t1 -> (t, t35, t34) -> (t2, (t36, (t3, (t4, (t5, (t6, t7, t7), (t6, t8, t8)), (t5, (t9, t10, t10), (t9, t11, t11))), (t4, (t12, (t13, t14, t14), (t13, t15, t15)), (t12, (t16, t17, t17), (t16, t18, t18)))), (t3, (t19, (t20, (t21, t22, t22), (t21, t23, t23)), (t20, (t24, t25, t25), (t24, t26, t26))), (t19, (t27, (t28, t29, t29), (t28, t30, t30)), (t27, (t31, t32, t32), (t31, t33, t33))))), (t36, (t37, (t38, (t39, (t40, t41, t41), (t40, t42, t42)), (t39, (t43, t44, t44), (t43, t45, t45))), (t38, (t46, (t47, t48, t48), (t47, t49, t49)), (t46, (t50, t51, t51), (t50, t52, t52)))), (t37, (t53, (t54, (t55, t56, t56), (t55, t57, t57)), (t54, (t58, t59, t59), (t58, t60, t60))), (t53, (t61, (t62, t63, t63), (t62, t64, t64)), (t61, (t65, t66, t66), (t65, t67, t67)))))) -> t2 ;
+1 g_rec7 :: __forall [t t1 t2 t3 t4 t5 t6 t7 t8 t9 t10 t11 t12 t13 t14 t15 t16 t17 t18 t19 t20 t21 t22 t23 t24 t25 t26 t27 t28 t29 t30 t31 t32 t33 t34 t35 t36 t37 t38 t39 t40 t41 t42 t43 t44 t45 t46 t47 t48 t49 t50 t51 t52 t53 t54 t55 t56 t57 t58 t59 t60 t61 t62 t63 t64 t65 t66 t67 t68 t69 t70 t71 t72 t73 t74 t75 t76 t77 t78 t79 t80 t81 t82 t83 t84 t85 t86 t87 t88 t89 t90 t91 t92 t93 t94 t95 t96 t97 t98 t99 t100 t101 t102 t103 t104 t105 t106 t107 t108 t109 t110 t111 t112 t113 t114 t115 t116 t117 t118 t119 t120 t121 t122 t123 t124 t125 t126 t127 t128 t129 t130 t131] => t -> t1 -> (t, t67, t66) -> (t2, (t68, (t3, (t4, (t5, (t6, (t7, t8, t8), (t7, t9, t9)), (t6, (t10, t11, t11), (t10, t12, t12))), (t5, (t13, (t14, t15, t15), (t14, t16, t16)), (t13, (t17, t18, t18), (t17, t19, t19)))), (t4, (t20, (t21, (t22, t23, t23), (t22, t24, t24)), (t21, (t25, t26, t26), (t25, t27, t27))), (t20, (t28, (t29, t30, t30), (t29, t31, t31)), (t28, (t32, t33, t33), (t32, t34, t34))))), (t3, (t35, (t36, (t37, (t38, t39, t39), (t38, t40, t40)), (t37, (t41, t42, t42), (t41, t43, t43))), (t36, (t44, (t45, t46, t46), (t45, t47, t47)), (t44, (t48, t49, t49), (t48, t50, t50)))), (t35, (t51, (t52, (t53, t54, t54), (t53, t55, t55)), (t52, (t56, t57, t57), (t56, t58, t58))), (t51, (t59, (t60, t61, t61), (t60, t62, t62)), (t59, (t63, t64, t64), (t63, t65, t65)))))), (t68, (t69, (t70, (t71, (t72, (t73, t74, t74), (t73, t75, t75)), (t72, (t76, t77, t77), (t76, t78, t78))), (t71, (t79, (t80, t81, t81), (t80, t82, t82)), (t79, (t83, t84, t84), (t83, t85, t85)))), (t70, (t86, (t87, (t88, t89, t89), (t88, t90, t90)), (t87, (t91, t92, t92), (t91, t93, t93))), (t86, (t94, (t95, t96, t96), (t95, t97, t97)), (t94, (t98, t99, t99), (t98, t100, t100))))), (t69, (t101, (t102, (t103, (t104, t105, t105), (t104, t106, t106)), (t103, (t107, t108, t108), (t107, t109, t109))), (t102, (t110, (t111, t112, t112), (t111, t113, t113)), (t110, (t114, t115, t115), (t114, t116, t116)))), (t101, (t117, (t118, (t119, t120, t120), (t119, t121, t121)), (t118, (t122, t123, t123), (t122, t124, t124))), (t117, (t125, (t126, t127, t127), (t126, t128, t128)), (t125, (t129, t130, t130), (t129, t131, t131))))))) -> t2 ;
+1 g_rec8 :: __forall [t t1 t2 t3 t4 t5 t6 t7 t8 t9 t10 t11 t12 t13 t14 t15 t16 t17 t18 t19 t20 t21 t22 t23 t24 t25 t26 t27 t28 t29 t30 t31 t32 t33 t34 t35 t36 t37 t38 t39 t40 t41 t42 t43 t44 t45 t46 t47 t48 t49 t50 t51 t52 t53 t54 t55 t56 t57 t58 t59 t60 t61 t62 t63 t64 t65 t66 t67 t68 t69 t70 t71 t72 t73 t74 t75 t76 t77 t78 t79 t80 t81 t82 t83 t84 t85 t86 t87 t88 t89 t90 t91 t92 t93 t94 t95 t96 t97 t98 t99 t100 t101 t102 t103 t104 t105 t106 t107 t108 t109 t110 t111 t112 t113 t114 t115 t116 t117 t118 t119 t120 t121 t122 t123 t124 t125 t126 t127 t128 t129 t130 t131 t132 t133 t134 t135 t136 t137 t138 t139 t140 t141 t142 t143 t144 t145 t146 t147 t148 t149 t150 t151 t152 t153 t154 t155 t156 t157 t158 t159 t160 t161 t162 t163 t164 t165 t166 t167 t168 t169 t170 t171 t172 t173 t174 t175 t176 t177 t178 t179 t180 t181 t182 t183 t184 t185 t186 t187 t188 t189 t190 t191 t192 t193 t194 t195 t196 t197 t198 t199 t200 t201 t202 t203 t204 t205 t206 t207 t208 t209 t210 t211 t212 t213 t214 t215 t216 t217 t218 t219 t220 t221 t222 t223 t224 t225 t226 t227 t228 t229 t230 t231 t232 t233 t234 t235 t236 t237 t238 t239 t240 t241 t242 t243 t244 t245 t246 t247 t248 t249 t250 t251 t252 t253 t254 t255 t256 t257 t258 t259] => t -> t1 -> (t, t131, t130) -> (t2, (t132, (t3, (t4, (t5, (t6, (t7, (t8, t9, t9), (t8, t10, t10)), (t7, (t11, t12, t12), (t11, t13, t13))), (t6, (t14, (t15, t16, t16), (t15, t17, t17)), (t14, (t18, t19, t19), (t18, t20, t20)))), (t5, (t21, (t22, (t23, t24, t24), (t23, t25, t25)), (t22, (t26, t27, t27), (t26, t28, t28))), (t21, (t29, (t30, t31, t31), (t30, t32, t32)), (t29, (t33, t34, t34), (t33, t35, t35))))), (t4, (t36, (t37, (t38, (t39, t40, t40), (t39, t41, t41)), (t38, (t42, t43, t43), (t42, t44, t44))), (t37, (t45, (t46, t47, t47), (t46, t48, t48)), (t45, (t49, t50, t50), (t49, t51, t51)))), (t36, (t52, (t53, (t54, t55, t55), (t54, t56, t56)), (t53, (t57, t58, t58), (t57, t59, t59))), (t52, (t60, (t61, t62, t62), (t61, t63, t63)), (t60, (t64, t65, t65), (t64, t66, t66)))))), (t3, (t67, (t68, (t69, (t70, (t71, t72, t72), (t71, t73, t73)), (t70, (t74, t75, t75), (t74, t76, t76))), (t69, (t77, (t78, t79, t79), (t78, t80, t80)), (t77, (t81, t82, t82), (t81, t83, t83)))), (t68, (t84, (t85, (t86, t87, t87), (t86, t88, t88)), (t85, (t89, t90, t90), (t89, t91, t91))), (t84, (t92, (t93, t94, t94), (t93, t95, t95)), (t92, (t96, t97, t97), (t96, t98, t98))))), (t67, (t99, (t100, (t101, (t102, t103, t103), (t102, t104, t104)), (t101, (t105, t106, t106), (t105, t107, t107))), (t100, (t108, (t109, t110, t110), (t109, t111, t111)), (t108, (t112, t113, t113), (t112, t114, t114)))), (t99, (t115, (t116, (t117, t118, t118), (t117, t119, t119)), (t116, (t120, t121, t121), (t120, t122, t122))), (t115, (t123, (t124, t125, t125), (t124, t126, t126)), (t123, (t127, t128, t128), (t127, t129, t129))))))), (t132, (t133, (t134, (t135, (t136, (t137, (t138, t139, t139), (t138, t140, t140)), (t137, (t141, t142, t142), (t141, t143, t143))), (t136, (t144, (t145, t146, t146), (t145, t147, t147)), (t144, (t148, t149, t149), (t148, t150, t150)))), (t135, (t151, (t152, (t153, t154, t154), (t153, t155, t155)), (t152, (t156, t157, t157), (t156, t158, t158))), (t151, (t159, (t160, t161, t161), (t160, t162, t162)), (t159, (t163, t164, t164), (t163, t165, t165))))), (t134, (t166, (t167, (t168, (t169, t170, t170), (t169, t171, t171)), (t168, (t172, t173, t173), (t172, t174, t174))), (t167, (t175, (t176, t177, t177), (t176, t178, t178)), (t175, (t179, t180, t180), (t179, t181, t181)))), (t166, (t182, (t183, (t184, t185, t185), (t184, t186, t186)), (t183, (t187, t188, t188), (t187, t189, t189))), (t182, (t190, (t191, t192, t192), (t191, t193, t193)), (t190, (t194, t195, t195), (t194, t196, t196)))))), (t133, (t197, (t198, (t199, (t200, (t201, t202, t202), (t201, t203, t203)), (t200, (t204, t205, t205), (t204, t206, t206))), (t199, (t207, (t208, t209, t209), (t208, t210, t210)), (t207, (t211, t212, t212), (t211, t213, t213)))), (t198, (t214, (t215, (t216, t217, t217), (t216, t218, t218)), (t215, (t219, t220, t220), (t219, t221, t221))), (t214, (t222, (t223, t224, t224), (t223, t225, t225)), (t222, (t226, t227, t227), (t226, t228, t228))))), (t197, (t229, (t230, (t231, (t232, t233, t233), (t232, t234, t234)), (t231, (t235, t236, t236), (t235, t237, t237))), (t230, (t238, (t239, t240, t240), (t239, t241, t241)), (t238, (t242, t243, t243), (t242, t244, t244)))), (t229, (t245, (t246, (t247, t248, t248), (t247, t249, t249)), (t246, (t250, t251, t251), (t250, t252, t252))), (t245, (t253, (t254, t255, t255), (t254, t256, t256)), (t253, (t257, t258, t258), (t257, t259, t259)))))))) -> t2 ;
 1 head :: __forall [t] => [t] -> t ;
 1 one :: __forall [t] => t ;
 1 s_1_0 :: __forall [t] => t -> t ;
 1 s_2_0 :: __forall [t t1] => (t, t1) -> t ;
-1 s_2_1 :: __forall [t t1] => (t1, t) -> t ;
+1 s_2_1 :: __forall [t t1] => (t, t1) -> t1 ;
 1 s_3_0 :: __forall [t t1 t2] => (t, t1, t2) -> t ;
-1 s_3_1 :: __forall [t t1 t2] => (t1, t, t2) -> t ;
-1 s_3_2 :: __forall [t t1 t2] => (t1, t2, t) -> t ;
+1 s_3_1 :: __forall [t t1 t2] => (t, t1, t2) -> t1 ;
+1 s_3_2 :: __forall [t t1 t2] => (t, t1, t2) -> t2 ;

diff --git a/ghc/tests/typecheck/should_compile/tc090.stderr b/ghc/tests/typecheck/should_compile/tc090.stderr
index f64b39f..5d19722 100644 (file)
--- a/ghc/tests/typecheck/should_compile/tc090.stderr
+++ b/ghc/tests/typecheck/should_compile/tc090.stderr
@@ -1,4 +1,4 @@
 ghc: module version changed to 1; reason: no old .hi file
 __export ShouldSucceed a b;
-1 a :: __forall [f] {PrelBase.Ord f} => f ;
-1 b :: __forall [f] {PrelBase.Ord f} => f ;
+1 a :: __forall [f] => {PrelBase.Ord f} -> f ;
+1 b :: __forall [f] => {PrelBase.Ord f} -> f ;

diff --git a/ghc/tests/typecheck/should_compile/tc091.stderr b/ghc/tests/typecheck/should_compile/tc091.stderr
index 769af0a..9e3ff27 100644 (file)
--- a/ghc/tests/typecheck/should_compile/tc091.stderr
+++ b/ghc/tests/typecheck/should_compile/tc091.stderr
@@ -1,5 +1,5 @@
 ghc: module version changed to 1; reason: no old .hi file
 __export ShouldSucceed init_last merge sort;
 1 init_last :: __forall [a] => [a] -> PrelBase.Int -> ([a], [a]) ;
-1 merge :: __forall [a] {PrelBase.Ord a} => [a] -> [a] -> [a] ;
-1 sort :: __forall [a] {PrelBase.Ord a} => [a] -> [a] ;
+1 merge :: __forall [a] => {PrelBase.Ord a} -> [a] -> [a] -> [a] ;
+1 sort :: __forall [a] => {PrelBase.Ord a} -> [a] -> [a] ;

diff --git a/ghc/tests/typecheck/should_compile/tc092.stderr b/ghc/tests/typecheck/should_compile/tc092.stderr
index 0e31286..21adbb5 100644 (file)
--- a/ghc/tests/typecheck/should_compile/tc092.stderr
+++ b/ghc/tests/typecheck/should_compile/tc092.stderr
@@ -1,7 +1,7 @@
 ghc: module version changed to 1; reason: no old .hi file
 __export ShouldSucceed Empty{Empty} e0 e1 e2 q;
-1 data Empty q :: (* -> *) = Empty (__forall [a] {PrelBase.Ord a} => q a) ;
+1 data Empty q :: (* -> *) = Empty (__forall [a] => {PrelBase.Ord a} -> q a) ;
 1 e0 :: Empty PrelBase.ZMZN ;
 1 e1 :: Empty PrelBase.ZMZN ;
 1 e2 :: Empty PrelBase.ZMZN ;
-1 q :: __forall [a] {PrelBase.Ord a} => [a] ;
+1 q :: __forall [a] => {PrelBase.Ord a} -> [a] ;

diff --git a/ghc/tests/typecheck/should_compile/tc093.stderr b/ghc/tests/typecheck/should_compile/tc093.stderr
index 934e947..8f5cf27 100644 (file)
--- a/ghc/tests/typecheck/should_compile/tc093.stderr
+++ b/ghc/tests/typecheck/should_compile/tc093.stderr
@@ -1,7 +1,7 @@
 ghc: module version changed to 1; reason: no old .hi file
 __export ShouldSucceed St State{State} TS{TS vs} bindState foo unState unitState;
 instance {PrelBase.Eq TS} = zdfEqTS;
-instance __forall [c] {PrelBase.Eq c} => {PrelBase.Monad (State c)} = zdfMonadState;
+instance __forall [c] => {PrelBase.Eq c} -> {PrelBase.Monad (State c)} = zdfMonadState;
 instance {PrelBase.Show TS} = zdfShowTS;
 1 bindState :: __forall [c a b] => State c a -> (a -> State c b) -> State c b ;
 1 data State c a = State (c -> (a, c)) ;
@@ -11,5 +11,5 @@ instance {PrelBase.Show TS} = zdfShowTS;
 1 unState :: __forall [c a] => State c a -> c -> (a, c) ;
 1 unitState :: __forall [a c] => a -> State c a ;
 1 zdfEqTS :: {PrelBase.Eq TS} ;
-1 zdfMonadState :: __forall [c] {PrelBase.Eq c} => {PrelBase.Monad (State c)} ;
+1 zdfMonadState :: __forall [c] => {PrelBase.Eq c} -> {PrelBase.Monad (State c)} ;
 1 zdfShowTS :: {PrelBase.Show TS} ;

diff --git a/ghc/tests/typecheck/should_compile/tc095.stderr b/ghc/tests/typecheck/should_compile/tc095.stderr
index 4d7b6c6..68bcaa5 100644 (file)
--- a/ghc/tests/typecheck/should_compile/tc095.stderr
+++ b/ghc/tests/typecheck/should_compile/tc095.stderr
@@ -2,11 +2,11 @@ NOTE: Simplifier still going after 4 iterations; bailing out.
 ghc: module version changed to 1; reason: no old .hi file
 __export ShouldSucceed HappyAbsSyn{HappyTerminal HappyErrorToken HappyAbsSyn1 HappyAbsSyn2 HappyAbsSyn3} HappyState{HappyState} Token{TokenInt TokenVar TokenEq} action_0 action_1 action_2 action_3 action_4 action_5 action_6 happyAccept happyError happyFail happyGoto happyMonadReduce happyNewToken happyParse happyReduce happyReduce_1 happyReduce_2 happyReduce_3 happyReturn happyShift happySpecReduce_0 happySpecReduce_1 happySpecReduce_2 happySpecReduce_3 happyThen main myparser notHappyAtAll;
 instance {PrelBase.Show Token} = zdfShowToken;
-1 action_0 :: __forall [t t1] {PrelBase.Num t} => t -> PrelBase.Int -> Token -> HappyState Token ([HappyAbsSyn (t1 -> PrelBase.Double) [(PrelBase.String, t1 -> PrelBase.Int)] (t1 -> PrelBase.Int)] -> [Token] -> t1 -> PrelBase.Double) -> [HappyState Token ([HappyAbsSyn (t1 -> PrelBase.Double) [(PrelBase.String, t1 -> PrelBase.Int)] (t1 -> PrelBase.Int)] -> [Token] -> t1 -> PrelBase.Double)] -> [HappyAbsSyn (t1 -> PrelBase.Double) [(PrelBase.String, t1 -> PrelBase.Int)] (t1 -> PrelBase.Int)] -> [Token] -> t1 -> PrelBase.Double ;
-1 action_1 :: __forall [t b t2 t3 a] {PrelBase.Num t} => t -> PrelBase.Int -> b -> HappyState b ([HappyAbsSyn a t2 t3] -> [Token] -> a) -> [HappyState b ([HappyAbsSyn a t2 t3] -> [Token] -> a)] -> [HappyAbsSyn a t2 t3] -> [Token] -> a ;
+1 action_0 :: __forall [t t1] => {PrelBase.Num t} -> t -> PrelBase.Int -> Token -> HappyState Token ([HappyAbsSyn (t1 -> PrelBase.Double) [(PrelBase.String, t1 -> PrelBase.Int)] (t1 -> PrelBase.Int)] -> [Token] -> t1 -> PrelBase.Double) -> [HappyState Token ([HappyAbsSyn (t1 -> PrelBase.Double) [(PrelBase.String, t1 -> PrelBase.Int)] (t1 -> PrelBase.Int)] -> [Token] -> t1 -> PrelBase.Double)] -> [HappyAbsSyn (t1 -> PrelBase.Double) [(PrelBase.String, t1 -> PrelBase.Int)] (t1 -> PrelBase.Int)] -> [Token] -> t1 -> PrelBase.Double ;
+1 action_1 :: __forall [t t1 t2 t3 b] => {PrelBase.Num t} -> t -> PrelBase.Int -> b -> HappyState b ([HappyAbsSyn t1 t2 t3] -> [Token] -> t1) -> [HappyState b ([HappyAbsSyn t1 t2 t3] -> [Token] -> t1)] -> [HappyAbsSyn t1 t2 t3] -> [Token] -> t1 ;
 1 action_2 :: __forall [t t1 b t2 t3 t4 t5 t31] => t -> PrelBase.Int -> b -> t2 -> [HappyState b ([HappyAbsSyn (t3 -> PrelBase.Double) [(t4, t3 -> t5)] t31] -> t1)] -> [HappyAbsSyn (t3 -> PrelBase.Double) [(t4, t3 -> t5)] t31] -> t1 ;
-1 action_3 :: __forall [t t1 t11 a] {PrelBase.Num t} => t -> PrelBase.Int -> Token -> HappyState Token ([HappyAbsSyn t11 [(PrelBase.String, t1 -> PrelBase.Int)] (t1 -> PrelBase.Int)] -> [Token] -> a) -> [HappyState Token ([HappyAbsSyn t11 [(PrelBase.String, t1 -> PrelBase.Int)] (t1 -> PrelBase.Int)] -> [Token] -> a)] -> [HappyAbsSyn t11 [(PrelBase.String, t1 -> PrelBase.Int)] (t1 -> PrelBase.Int)] -> [Token] -> a ;
-1 action_4 :: __forall [t t1 t11 a] {PrelBase.Num t} => t -> PrelBase.Int -> Token -> HappyState Token ([HappyAbsSyn t11 [(PrelBase.String, t1 -> PrelBase.Int)] (t1 -> PrelBase.Int)] -> [Token] -> a) -> [HappyState Token ([HappyAbsSyn t11 [(PrelBase.String, t1 -> PrelBase.Int)] (t1 -> PrelBase.Int)] -> [Token] -> a)] -> [HappyAbsSyn t11 [(PrelBase.String, t1 -> PrelBase.Int)] (t1 -> PrelBase.Int)] -> [Token] -> a ;
+1 action_3 :: __forall [t t1 t11 a] => {PrelBase.Num t} -> t -> PrelBase.Int -> Token -> HappyState Token ([HappyAbsSyn t1 [(PrelBase.String, t11 -> PrelBase.Int)] (t11 -> PrelBase.Int)] -> [Token] -> a) -> [HappyState Token ([HappyAbsSyn t1 [(PrelBase.String, t11 -> PrelBase.Int)] (t11 -> PrelBase.Int)] -> [Token] -> a)] -> [HappyAbsSyn t1 [(PrelBase.String, t11 -> PrelBase.Int)] (t11 -> PrelBase.Int)] -> [Token] -> a ;
+1 action_4 :: __forall [t t1 t11 a] => {PrelBase.Num t} -> t -> PrelBase.Int -> Token -> HappyState Token ([HappyAbsSyn t1 [(PrelBase.String, t11 -> PrelBase.Int)] (t11 -> PrelBase.Int)] -> [Token] -> a) -> [HappyState Token ([HappyAbsSyn t1 [(PrelBase.String, t11 -> PrelBase.Int)] (t11 -> PrelBase.Int)] -> [Token] -> a)] -> [HappyAbsSyn t1 [(PrelBase.String, t11 -> PrelBase.Int)] (t11 -> PrelBase.Int)] -> [Token] -> a ;
 1 action_5 :: __forall [t t1 b t2 t11 t3] => t -> PrelBase.Int -> b -> t2 -> [HappyState b ([HappyAbsSyn t11 [(PrelBase.String, t3)] t3] -> t1)] -> [HappyAbsSyn t11 [(PrelBase.String, t3)] t3] -> t1 ;
 1 action_6 :: __forall [t t1 b t2 t11 t21 t3] => t -> PrelBase.Int -> b -> t2 -> [HappyState b ([HappyAbsSyn t11 t21 (t3 -> PrelBase.Int)] -> t1)] -> [HappyAbsSyn t11 t21 (t3 -> PrelBase.Int)] -> t1 ;
 1 data HappyAbsSyn t1 t2 t3 = HappyTerminal Token |  HappyErrorToken PrelBase.Int |  HappyAbsSyn1 t1 |  HappyAbsSyn2 t2 |  HappyAbsSyn3 t3 ;
@@ -16,20 +16,20 @@ instance {PrelBase.Show Token} = zdfShowToken;
 1 happyError :: __forall [a] => [Token] -> a ;
 1 happyFail :: __forall [a b t1 t2 t3] => PrelBase.Int -> b -> HappyState b ([HappyAbsSyn t1 t2 t3] -> [Token] -> a) -> [HappyState b ([HappyAbsSyn t1 t2 t3] -> [Token] -> a)] -> [HappyAbsSyn t1 t2 t3] -> [Token] -> a ;
 1 happyGoto :: __forall [t b c] => (PrelBase.Int -> PrelBase.Int -> b -> HappyState b c -> [HappyState b c] -> c) -> PrelBase.Int -> b -> t -> [HappyState b c] -> c ;
-1 happyMonadReduce :: __forall [b a b1 t] => PrelBase.Int -> PrelBase.Int -> (t -> b1) -> ([b1] -> t) -> PrelBase.Int -> b -> HappyState b ([b1] -> [Token] -> a) -> [HappyState b ([b1] -> [Token] -> a)] -> [b1] -> [Token] -> a ;
+1 happyMonadReduce :: __forall [a b b1 t] => PrelBase.Int -> PrelBase.Int -> (t -> b) -> ([b] -> t) -> PrelBase.Int -> b1 -> HappyState b1 ([b] -> [Token] -> a) -> [HappyState b1 ([b] -> [Token] -> a)] -> [b] -> [Token] -> a ;
 1 happyNewToken :: __forall [t t1] => (PrelBase.Int -> PrelBase.Int -> Token -> HappyState Token (t -> [Token] -> t1) -> [HappyState Token (t -> [Token] -> t1)] -> t -> [Token] -> t1) -> [HappyState Token (t -> [Token] -> t1)] -> t -> [Token] -> t1 ;
 1 happyParse :: __forall [t] => [Token] -> t -> PrelBase.Double ;
-1 happyReduce :: __forall [b t t1] => PrelBase.Int -> PrelBase.Int -> (t1 -> t1) -> PrelBase.Int -> b -> HappyState b (t1 -> t) -> [HappyState b (t1 -> t)] -> t1 -> t ;
+1 happyReduce :: __forall [t b t1] => PrelBase.Int -> PrelBase.Int -> (t1 -> t1) -> PrelBase.Int -> b -> HappyState b (t1 -> t) -> [HappyState b (t1 -> t)] -> t1 -> t ;
 1 happyReduce_1 :: __forall [t b t1 t2 t3 t4 t31] => PrelBase.Int -> b -> t1 -> [HappyState b ([HappyAbsSyn (t3 -> PrelBase.Double) [(t2, t3 -> t4)] t31] -> t)] -> [HappyAbsSyn (t3 -> PrelBase.Double) [(t2, t3 -> t4)] t31] -> t ;
 1 happyReduce_2 :: __forall [t b t1 t11 t3] => PrelBase.Int -> b -> t1 -> [HappyState b ([HappyAbsSyn t11 [(PrelBase.String, t3)] t3] -> t)] -> [HappyAbsSyn t11 [(PrelBase.String, t3)] t3] -> t ;
 1 happyReduce_3 :: __forall [t b t1 t11 t2 t21] => PrelBase.Int -> b -> t1 -> [HappyState b ([HappyAbsSyn t11 t2 (t21 -> PrelBase.Int)] -> t)] -> [HappyAbsSyn t11 t2 (t21 -> PrelBase.Int)] -> t ;
 1 happyReturn :: __forall [t t1] => t -> t1 -> t ;
-1 happyShift :: __forall [t t1 t11 t2 t3] {PrelBase.Num t} => (PrelBase.Int -> PrelBase.Int -> Token -> HappyState Token ([HappyAbsSyn t11 t2 t3] -> [Token] -> t1) -> [HappyState Token ([HappyAbsSyn t11 t2 t3] -> [Token] -> t1)] -> [HappyAbsSyn t11 t2 t3] -> [Token] -> t1) -> t -> Token -> HappyState Token ([HappyAbsSyn t11 t2 t3] -> [Token] -> t1) -> [HappyState Token ([HappyAbsSyn t11 t2 t3] -> [Token] -> t1)] -> [HappyAbsSyn t11 t2 t3] -> [Token] -> t1 ;
-1 happySpecReduce_0 :: __forall [b a t] => PrelBase.Int -> t -> PrelBase.Int -> b -> HappyState b ([t] -> [Token] -> a) -> [HappyState b ([t] -> [Token] -> a)] -> [t] -> [Token] -> a ;
-1 happySpecReduce_1 :: __forall [t t1 b t2] => PrelBase.Int -> (t2 -> t2) -> PrelBase.Int -> b -> t -> [HappyState b ([t2] -> t1)] -> [t2] -> t1 ;
-1 happySpecReduce_2 :: __forall [t t1 b t2] => PrelBase.Int -> (t2 -> t2 -> t2) -> PrelBase.Int -> b -> t -> [HappyState b ([t2] -> t1)] -> [t2] -> t1 ;
-1 happySpecReduce_3 :: __forall [t t1 b t2] => PrelBase.Int -> (t2 -> t2 -> t2 -> t2) -> PrelBase.Int -> b -> t -> [HappyState b ([t2] -> t1)] -> [t2] -> t1 ;
-1 happyThen :: __forall [t t1] => t1 -> (t1 -> t) -> t ;
+1 happyShift :: __forall [t t1 t2 t3 t11] => {PrelBase.Num t} -> (PrelBase.Int -> PrelBase.Int -> Token -> HappyState Token ([HappyAbsSyn t1 t2 t3] -> [Token] -> t11) -> [HappyState Token ([HappyAbsSyn t1 t2 t3] -> [Token] -> t11)] -> [HappyAbsSyn t1 t2 t3] -> [Token] -> t11) -> t -> Token -> HappyState Token ([HappyAbsSyn t1 t2 t3] -> [Token] -> t11) -> [HappyState Token ([HappyAbsSyn t1 t2 t3] -> [Token] -> t11)] -> [HappyAbsSyn t1 t2 t3] -> [Token] -> t11 ;
+1 happySpecReduce_0 :: __forall [t a b] => PrelBase.Int -> t -> PrelBase.Int -> b -> HappyState b ([t] -> [Token] -> a) -> [HappyState b ([t] -> [Token] -> a)] -> [t] -> [Token] -> a ;
+1 happySpecReduce_1 :: __forall [t b t1 t2] => PrelBase.Int -> (t1 -> t1) -> PrelBase.Int -> b -> t -> [HappyState b ([t1] -> t2)] -> [t1] -> t2 ;
+1 happySpecReduce_2 :: __forall [t b t1 t2] => PrelBase.Int -> (t1 -> t1 -> t1) -> PrelBase.Int -> b -> t -> [HappyState b ([t1] -> t2)] -> [t1] -> t2 ;
+1 happySpecReduce_3 :: __forall [t b t1 t2] => PrelBase.Int -> (t1 -> t1 -> t1 -> t1) -> PrelBase.Int -> b -> t -> [HappyState b ([t1] -> t2)] -> [t1] -> t2 ;
+1 happyThen :: __forall [t t1] => t -> (t -> t1) -> t1 ;
 1 main :: PrelIOBase.IO PrelBase.Z0T ;
 1 myparser :: __forall [t] => [Token] -> t -> PrelBase.Double ;
 1 notHappyAtAll :: __forall [t] => t ;

diff --git a/ghc/tests/typecheck/should_compile/tc098.stderr b/ghc/tests/typecheck/should_compile/tc098.stderr
index 1842f86..5859c9a 100644 (file)
--- a/ghc/tests/typecheck/should_compile/tc098.stderr
+++ b/ghc/tests/typecheck/should_compile/tc098.stderr
@@ -1,6 +1,6 @@
 ghc: module version changed to 1; reason: no old .hi file
 __export ShouldSucceed Cp cpPairs m mp;
 1 cpPairs :: __forall [j a] => Cp [j] -> (a, [j]) -> (a, [j]) -> PrelBase.Ordering ;
-1 m :: __forall [a] {PrelBase.Eq a} => Cp a -> [a] -> a ;
-1 mp :: __forall [j i] {PrelBase.Eq i, PrelBase.Eq j} => Cp [j] -> [(i, [j])] -> (i, [j]) ;
+1 m :: __forall [a] => {PrelBase.Eq a} -> Cp a -> [a] -> a ;
+1 mp :: __forall [j i] => {PrelBase.Eq i} -> {PrelBase.Eq j} -> Cp [j] -> [(i, [j])] -> (i, [j]) ;
 1 type Cp a = a -> a -> PrelBase.Ordering ;

diff --git a/ghc/tests/typecheck/should_compile/tc099.stderr b/ghc/tests/typecheck/should_compile/tc099.stderr
index e85a66e..ac5b29c 100644 (file)
--- a/ghc/tests/typecheck/should_compile/tc099.stderr
+++ b/ghc/tests/typecheck/should_compile/tc099.stderr
@@ -1,4 +1,4 @@
 ghc: module version changed to 1; reason: no old .hi file
 __export ShouldCompile f g;
-1 f :: __forall [a b] {PrelBase.Eq a} => (a, b) ;
-1 g :: __forall [a b] {PrelBase.Eq a} => (a, b) ;
+1 f :: __forall [a b] => {PrelBase.Eq a} -> (a, b) ;
+1 g :: __forall [a b] => {PrelBase.Eq a} -> (a, b) ;

diff --git a/ghc/tests/typecheck/should_run/tcrun004.stdout b/ghc/tests/typecheck/should_run/tcrun004.stdout
new file mode 100644 (file)
index 0000000..f0842b6
--- /dev/null
+++ b/ghc/tests/typecheck/should_run/tcrun004.stdout
@@ -0,0 +1,2 @@
+Sphere
+Cube