[project @ 2001-03-29 14:35:20 by simonmar]

update expected output

diff --git a/ghc/tests/typecheck/should_compile/Makefile b/ghc/tests/typecheck/should_compile/Makefile
index 8fef5e6..d49a6a1 100644 (file)
--- a/ghc/tests/typecheck/should_compile/Makefile
+++ b/ghc/tests/typecheck/should_compile/Makefile
@@ -3,7 +3,6 @@ include $(TOP)/mk/boilerplate.mk
 include $(TOP)/mk/should_compile.mk
 
 SRC_HC_OPTS += -dcore-lint -fno-warn-incomplete-patterns
-# -hi-with-declarations -hi-with-instances -hi-with-exports
 
 tc019_HC_OPTS = -fglasgow-exts
 tc065_HC_OPTS = -package lang -package data

diff --git a/ghc/tests/typecheck/should_compile/tc001.stderr b/ghc/tests/typecheck/should_compile/tc001.stderr
deleted file mode 100644 (file)
index 54119c0..0000000
--- a/ghc/tests/typecheck/should_compile/tc001.stderr
+++ /dev/null
@@ -1,2 +0,0 @@
-__export ShouldSucceed a;
-1 a :: __forall [a] => {PrelNum.Num a} -> a -> a ;

diff --git a/ghc/tests/typecheck/should_compile/tc002.stderr b/ghc/tests/typecheck/should_compile/tc002.stderr
deleted file mode 100644 (file)
index ee4e9df..0000000
--- a/ghc/tests/typecheck/should_compile/tc002.stderr
+++ /dev/null
@@ -1,2 +0,0 @@
-__export ShouldSucceed b;
-1 b :: PrelNum.Integer ;

diff --git a/ghc/tests/typecheck/should_compile/tc003.stderr b/ghc/tests/typecheck/should_compile/tc003.stderr
deleted file mode 100644 (file)
index 209a8d8..0000000
--- a/ghc/tests/typecheck/should_compile/tc003.stderr
+++ /dev/null
@@ -1,4 +0,0 @@
-__export ShouldSucceed c d e;
-1 c :: (PrelNum.Integer, PrelNum.Integer) ;
-1 d :: PrelNum.Integer ;
-1 e :: PrelNum.Integer ;

diff --git a/ghc/tests/typecheck/should_compile/tc004.stderr b/ghc/tests/typecheck/should_compile/tc004.stderr
deleted file mode 100644 (file)
index faca71a..0000000
--- a/ghc/tests/typecheck/should_compile/tc004.stderr
+++ /dev/null
@@ -1,2 +0,0 @@
-__export ShouldSucceed f;
-1 f :: PrelBase.Bool -> PrelBase.Bool ;

diff --git a/ghc/tests/typecheck/should_compile/tc005.stderr b/ghc/tests/typecheck/should_compile/tc005.stderr
deleted file mode 100644 (file)
index 78a5b3d..0000000
--- a/ghc/tests/typecheck/should_compile/tc005.stderr
+++ /dev/null
@@ -1,2 +0,0 @@
-__export ShouldSucceed g;
-1 g :: __forall [t t1] => {PrelNum.Num t1} -> ([t1], t) -> t1 ;

diff --git a/ghc/tests/typecheck/should_compile/tc006.stderr b/ghc/tests/typecheck/should_compile/tc006.stderr
deleted file mode 100644 (file)
index f1d3c74..0000000
--- a/ghc/tests/typecheck/should_compile/tc006.stderr
+++ /dev/null
@@ -1,2 +0,0 @@
-__export ShouldSucceed h;
-1 h :: [PrelNum.Integer] ;

diff --git a/ghc/tests/typecheck/should_compile/tc007.stderr b/ghc/tests/typecheck/should_compile/tc007.stderr
deleted file mode 100644 (file)
index 68d2e03..0000000
--- a/ghc/tests/typecheck/should_compile/tc007.stderr
+++ /dev/null
@@ -1,5 +0,0 @@
-__export ShouldSucceed j k l m;
-1 j :: PrelNum.Integer ;
-1 k :: [PrelNum.Integer] ;
-1 l :: [PrelNum.Integer] ;
-1 m :: PrelNum.Integer ;

diff --git a/ghc/tests/typecheck/should_compile/tc008.stderr b/ghc/tests/typecheck/should_compile/tc008.stderr
deleted file mode 100644 (file)
index 1244d9e..0000000
--- a/ghc/tests/typecheck/should_compile/tc008.stderr
+++ /dev/null
@@ -1,2 +0,0 @@
-__export ShouldSucceed n;
-1 n :: __forall [t] => {PrelNum.Num t} -> PrelBase.Bool -> t ;

diff --git a/ghc/tests/typecheck/should_compile/tc009.stderr b/ghc/tests/typecheck/should_compile/tc009.stderr
deleted file mode 100644 (file)
index ad92402..0000000
--- a/ghc/tests/typecheck/should_compile/tc009.stderr
+++ /dev/null
@@ -1,2 +0,0 @@
-__export ShouldSucceed o;
-1 o :: __forall [a] => {PrelNum.Num a} -> (PrelBase.Bool, a) -> a ;

diff --git a/ghc/tests/typecheck/should_compile/tc010.stderr b/ghc/tests/typecheck/should_compile/tc010.stderr
deleted file mode 100644 (file)
index af6b1e7..0000000
--- a/ghc/tests/typecheck/should_compile/tc010.stderr
+++ /dev/null
@@ -1,2 +0,0 @@
-__export ShouldSucceed p;
-1 p :: [(PrelNum.Integer, PrelBase.Bool)] ;

diff --git a/ghc/tests/typecheck/should_compile/tc011.stderr b/ghc/tests/typecheck/should_compile/tc011.stderr
deleted file mode 100644 (file)
index b73b0c7..0000000
--- a/ghc/tests/typecheck/should_compile/tc011.stderr
+++ /dev/null
@@ -1,2 +0,0 @@
-__export ShouldSucceed x;
-1 x :: __forall [t] => t ;

diff --git a/ghc/tests/typecheck/should_compile/tc012.stderr b/ghc/tests/typecheck/should_compile/tc012.stderr
deleted file mode 100644 (file)
index 9661cd0..0000000
--- a/ghc/tests/typecheck/should_compile/tc012.stderr
+++ /dev/null
@@ -1,2 +0,0 @@
-__export ShouldSucceed q;
-1 q :: __forall [t] => t -> t ;

diff --git a/ghc/tests/typecheck/should_compile/tc013.stderr b/ghc/tests/typecheck/should_compile/tc013.stderr
deleted file mode 100644 (file)
index 56dfc4b..0000000
--- a/ghc/tests/typecheck/should_compile/tc013.stderr
+++ /dev/null
@@ -1,3 +0,0 @@
-__export ShouldSucceed r s;
-1 r :: PrelNum.Integer ;
-1 s :: PrelBase.Char ;

diff --git a/ghc/tests/typecheck/should_compile/tc014.stderr b/ghc/tests/typecheck/should_compile/tc014.stderr
deleted file mode 100644 (file)
index 1bced01..0000000
--- a/ghc/tests/typecheck/should_compile/tc014.stderr
+++ /dev/null
@@ -1,2 +0,0 @@
-__export ShouldSucceed t;
-1 t :: PrelNum.Integer ;

diff --git a/ghc/tests/typecheck/should_compile/tc015.stderr b/ghc/tests/typecheck/should_compile/tc015.stderr
deleted file mode 100644 (file)
index 05edd0c..0000000
--- a/ghc/tests/typecheck/should_compile/tc015.stderr
+++ /dev/null
@@ -1,2 +0,0 @@
-__export ShouldSucceed u;
-1 u :: __forall [t t1 t2] => t -> (t1, t2) -> t ;

diff --git a/ghc/tests/typecheck/should_compile/tc016.stderr b/ghc/tests/typecheck/should_compile/tc016.stderr
deleted file mode 100644 (file)
index 3b3f768..0000000
--- a/ghc/tests/typecheck/should_compile/tc016.stderr
+++ /dev/null
@@ -1,2 +0,0 @@
-__export ShouldSucceed f;
-1 f :: __forall [t t1] => t -> t1 -> t ;

diff --git a/ghc/tests/typecheck/should_compile/tc017.stderr b/ghc/tests/typecheck/should_compile/tc017.stderr
deleted file mode 100644 (file)
index 81fa012..0000000
--- a/ghc/tests/typecheck/should_compile/tc017.stderr
+++ /dev/null
@@ -1,2 +0,0 @@
-__export ShouldSucceed v;
-1 v :: PrelNum.Integer ;

diff --git a/ghc/tests/typecheck/should_compile/tc018.stderr b/ghc/tests/typecheck/should_compile/tc018.stderr
deleted file mode 100644 (file)
index 6a43ada..0000000
--- a/ghc/tests/typecheck/should_compile/tc018.stderr
+++ /dev/null
@@ -1,2 +0,0 @@
-__export ShouldSucceed w;
-1 w :: PrelNum.Integer ;

diff --git a/ghc/tests/typecheck/should_compile/tc019.stderr b/ghc/tests/typecheck/should_compile/tc019.stderr
deleted file mode 100644 (file)
index 73af965..0000000
--- a/ghc/tests/typecheck/should_compile/tc019.stderr
+++ /dev/null
@@ -1,3 +0,0 @@
-__export ShouldSucceed al am;
-1 al :: PrelNum.Integer ;
-1 am :: [PrelNum.Integer] ;

diff --git a/ghc/tests/typecheck/should_compile/tc020.stderr b/ghc/tests/typecheck/should_compile/tc020.stderr
deleted file mode 100644 (file)
index 3cd74fc..0000000
--- a/ghc/tests/typecheck/should_compile/tc020.stderr
+++ /dev/null
@@ -1,2 +0,0 @@
-__export ShouldSucceed f;
-1 f :: __forall [t] => t -> [t] ;

diff --git a/ghc/tests/typecheck/should_compile/tc021.stderr b/ghc/tests/typecheck/should_compile/tc021.stderr
deleted file mode 100644 (file)
index 7b5d460..0000000
--- a/ghc/tests/typecheck/should_compile/tc021.stderr
+++ /dev/null
@@ -1,4 +0,0 @@
-__export ShouldSucceed a f x;
-1 a :: __forall [t t1] => (t, t1) ;
-1 f :: __forall [t t1 t2] => t -> (t1, t2) ;
-1 x :: __forall [t] => t ;

diff --git a/ghc/tests/typecheck/should_compile/tc022.stderr b/ghc/tests/typecheck/should_compile/tc022.stderr
deleted file mode 100644 (file)
index e96aa6e..0000000
--- a/ghc/tests/typecheck/should_compile/tc022.stderr
+++ /dev/null
@@ -1,3 +0,0 @@
-__export ShouldSucceed iD main;
-1 iD :: __forall [t] => t -> t ;
-1 main :: __forall [t] => t -> t ;

diff --git a/ghc/tests/typecheck/should_compile/tc023.stderr b/ghc/tests/typecheck/should_compile/tc023.stderr
deleted file mode 100644 (file)
index fae3588..0000000
--- a/ghc/tests/typecheck/should_compile/tc023.stderr
+++ /dev/null
@@ -1,4 +0,0 @@
-__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] => (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
deleted file mode 100644 (file)
index fae3588..0000000
--- a/ghc/tests/typecheck/should_compile/tc024.stderr
+++ /dev/null
@@ -1,4 +0,0 @@
-__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] => (t -> t2 -> t1) -> (t -> t2) -> t -> t1 ;

diff --git a/ghc/tests/typecheck/should_compile/tc025.stderr b/ghc/tests/typecheck/should_compile/tc025.stderr
deleted file mode 100644 (file)
index d808202..0000000
--- a/ghc/tests/typecheck/should_compile/tc025.stderr
+++ /dev/null
@@ -1,2 +0,0 @@
-__export ShouldSucceed g;
-1 g :: PrelBase.Bool -> PrelBase.Bool ;

diff --git a/ghc/tests/typecheck/should_compile/tc026.stderr b/ghc/tests/typecheck/should_compile/tc026.stderr
deleted file mode 100644 (file)
index db802d7..0000000
--- a/ghc/tests/typecheck/should_compile/tc026.stderr
+++ /dev/null
@@ -1,3 +0,0 @@
-__export ShouldSucceed f g;
-1 f :: __forall [t] => PrelBase.Bool -> t -> t ;
-1 g :: PrelBase.Bool -> PrelBase.Bool ;

diff --git a/ghc/tests/typecheck/should_compile/tc027.stderr b/ghc/tests/typecheck/should_compile/tc027.stderr
deleted file mode 100644 (file)
index 2dfe52e..0000000
--- a/ghc/tests/typecheck/should_compile/tc027.stderr
+++ /dev/null
@@ -1,4 +0,0 @@
-__export ShouldSucceed f g h;
-1 f :: __forall [t] => PrelBase.Bool -> t -> t ;
-1 g :: __forall [t] => t -> PrelBase.Bool -> t ;
-1 h :: PrelBase.Bool -> PrelBase.Bool ;

diff --git a/ghc/tests/typecheck/should_compile/tc028.stderr b/ghc/tests/typecheck/should_compile/tc028.stderr
deleted file mode 100644 (file)
index 8e4fe20..0000000
--- a/ghc/tests/typecheck/should_compile/tc028.stderr
+++ /dev/null
@@ -1,2 +0,0 @@
-__export ShouldSucceed H;
-1 type H = (PrelBase.Int, PrelBase.Bool) ;

diff --git a/ghc/tests/typecheck/should_compile/tc029.stderr b/ghc/tests/typecheck/should_compile/tc029.stderr
deleted file mode 100644 (file)
index 6b6ecb7..0000000
--- a/ghc/tests/typecheck/should_compile/tc029.stderr
+++ /dev/null
@@ -1,3 +0,0 @@
-__export ShouldSucceed G K{H M};
-1 data K = H PrelBase.Bool |  M G ;
-1 type G = [PrelBase.Int] ;

diff --git a/ghc/tests/typecheck/should_compile/tc030.stderr b/ghc/tests/typecheck/should_compile/tc030.stderr
deleted file mode 100644 (file)
index 39b1b3c..0000000
--- a/ghc/tests/typecheck/should_compile/tc030.stderr
+++ /dev/null
@@ -1,3 +0,0 @@
-__export ShouldSucceed G H;
-1 type G = (H, PrelBase.Char) ;
-1 type H = [PrelBase.Bool] ;

diff --git a/ghc/tests/typecheck/should_compile/tc031.stderr b/ghc/tests/typecheck/should_compile/tc031.stderr
deleted file mode 100644 (file)
index b488947..0000000
--- a/ghc/tests/typecheck/should_compile/tc031.stderr
+++ /dev/null
@@ -1,2 +0,0 @@
-__export ShouldSucceed Rec{Node};
-1 data Rec = Node PrelBase.Int Rec ;

diff --git a/ghc/tests/typecheck/should_compile/tc032.stderr b/ghc/tests/typecheck/should_compile/tc032.stderr
deleted file mode 100644 (file)
index e392297..0000000
--- a/ghc/tests/typecheck/should_compile/tc032.stderr
+++ /dev/null
@@ -1,2 +0,0 @@
-__export ShouldSucceed AList{Node Other};
-1 data AList b = Node b [b] |  Other (b, PrelBase.Char) ;

diff --git a/ghc/tests/typecheck/should_compile/tc033.stderr b/ghc/tests/typecheck/should_compile/tc033.stderr
deleted file mode 100644 (file)
index 28651e5..0000000
--- a/ghc/tests/typecheck/should_compile/tc033.stderr
+++ /dev/null
@@ -1,4 +0,0 @@
-__export ShouldSucceed F Twine{Twine2} Twist{Twist2};
-1 data Twine = Twine2 Twist ;
-1 data Twist = Twist2 Twine ;
-1 type F = Twine ;

diff --git a/ghc/tests/typecheck/should_compile/tc034.stderr b/ghc/tests/typecheck/should_compile/tc034.stderr
deleted file mode 100644 (file)
index 1601bc6..0000000
--- a/ghc/tests/typecheck/should_compile/tc034.stderr
+++ /dev/null
@@ -1,4 +0,0 @@
-__export ShouldSucceed AList{ANull ANode} IntList g;
-1 data AList a = ANull |  ANode a (AList a) ;
-1 g :: __forall [t] => {PrelNum.Num t} -> AList PrelBase.Bool -> t ;
-1 type IntList = AList PrelBase.Int ;

diff --git a/ghc/tests/typecheck/should_compile/tc035.stderr b/ghc/tests/typecheck/should_compile/tc035.stderr
deleted file mode 100644 (file)
index a6d2cb9..0000000
--- a/ghc/tests/typecheck/should_compile/tc035.stderr
+++ /dev/null
@@ -1,4 +0,0 @@
-__export ShouldSucceed AnnExpr Expr{Var App} g;
-1 data Expr a = Var [PrelBase.Char] |  App (AnnExpr a) (AnnExpr a) ;
-1 g :: __forall [a] => (a, Expr a) -> [[PrelBase.Char]] ;
-1 type AnnExpr a = (a, Expr a) ;

diff --git a/ghc/tests/typecheck/should_compile/tc036.stderr b/ghc/tests/typecheck/should_compile/tc036.stderr
deleted file mode 100644 (file)
index ecde73f..0000000
--- a/ghc/tests/typecheck/should_compile/tc036.stderr
+++ /dev/null
@@ -1,3 +0,0 @@
-__export ShouldSucceed A{op1};
-1 class {PrelBase.Eq a}  => A a where {op1 :: a -> a} ;
-1 zddmop1 :: __forall [a] => {A a} -> a -> a ;

diff --git a/ghc/tests/typecheck/should_compile/tc037.stderr b/ghc/tests/typecheck/should_compile/tc037.stderr
deleted file mode 100644 (file)
index 3aa4687..0000000
--- a/ghc/tests/typecheck/should_compile/tc037.stderr
+++ /dev/null
@@ -1,5 +0,0 @@
-__export ShouldSucceed Eqzq{deq};
-instance __forall [a] => {Eqzq a} -> {Eqzq [a]} = zdfEqzqZMZN;
-1 class Eqzq a where {deq :: a -> a -> PrelBase.Bool} ;
-1 zddmdeq :: __forall [a] => {Eqzq a} -> a -> a -> PrelBase.Bool ;
-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
deleted file mode 100644 (file)
index 989868b..0000000
--- a/ghc/tests/typecheck/should_compile/tc038.stderr
+++ /dev/null
@@ -1,2 +0,0 @@
-__export ShouldSucceed f;
-1 f :: __forall [a] => {PrelNum.Num a} -> [a] -> [a] ;

diff --git a/ghc/tests/typecheck/should_compile/tc039.stderr b/ghc/tests/typecheck/should_compile/tc039.stderr
deleted file mode 100644 (file)
index ecde73f..0000000
--- a/ghc/tests/typecheck/should_compile/tc039.stderr
+++ /dev/null
@@ -1,3 +0,0 @@
-__export ShouldSucceed A{op1};
-1 class {PrelBase.Eq a}  => A a where {op1 :: a -> a} ;
-1 zddmop1 :: __forall [a] => {A a} -> a -> a ;

diff --git a/ghc/tests/typecheck/should_compile/tc040.stderr b/ghc/tests/typecheck/should_compile/tc040.stderr
deleted file mode 100644 (file)
index 701f0e9..0000000
--- a/ghc/tests/typecheck/should_compile/tc040.stderr
+++ /dev/null
@@ -1,2 +0,0 @@
-__export ShouldSucceed f;
-1 f :: __forall [a] => {PrelBase.Eq a} -> a -> [a] ;

diff --git a/ghc/tests/typecheck/should_compile/tc041.stderr b/ghc/tests/typecheck/should_compile/tc041.stderr
deleted file mode 100644 (file)
index a3026f1..0000000
--- a/ghc/tests/typecheck/should_compile/tc041.stderr
+++ /dev/null
@@ -1,6 +0,0 @@
-__export ShouldSucceed H{op1} f;
-instance {H PrelBase.Bool} = zdfHBool;
-1 class H a where {op1 :: a -> a -> a} ;
-1 f :: PrelBase.Bool -> PrelBase.Int -> PrelBase.Bool ;
-1 zddmop1 :: __forall [a] => {H a} -> a -> a -> a ;
-1 zdfHBool :: {H PrelBase.Bool} ;

diff --git a/ghc/tests/typecheck/should_compile/tc042.stderr b/ghc/tests/typecheck/should_compile/tc042.stderr
deleted file mode 100644 (file)
index 64675a7..0000000
--- a/ghc/tests/typecheck/should_compile/tc042.stderr
+++ /dev/null
@@ -1 +0,0 @@
-NOTE: Simplifier still going after 4 iterations; bailing out.

diff --git a/ghc/tests/typecheck/should_compile/tc043.stderr b/ghc/tests/typecheck/should_compile/tc043.stderr
deleted file mode 100644 (file)
index b97fa1e..0000000
--- a/ghc/tests/typecheck/should_compile/tc043.stderr
+++ /dev/null
@@ -1,10 +0,0 @@
-__export ShouldSucceed A{op1} B{op2} f;
-instance {A PrelBase.Int} = zdfAInt;
-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 zddmop1 :: __forall [a] => {A a} -> a ;
-1 zddmop2 :: __forall [b] => {B b} -> b -> PrelBase.Int ;
-1 zdfAInt :: {A PrelBase.Int} ;
-1 zdfBZMZN :: __forall [a] => {B a} -> {B [a]} ;

diff --git a/ghc/tests/typecheck/should_compile/tc044.stderr b/ghc/tests/typecheck/should_compile/tc044.stderr
deleted file mode 100644 (file)
index 4d49294..0000000
--- a/ghc/tests/typecheck/should_compile/tc044.stderr
+++ /dev/null
@@ -1,2 +0,0 @@
-__export ShouldSucceed f;
-1 f :: __forall [t] => t -> PrelBase.Z0T ;

diff --git a/ghc/tests/typecheck/should_compile/tc045.stderr b/ghc/tests/typecheck/should_compile/tc045.stderr
deleted file mode 100644 (file)
index 56987c2..0000000
--- a/ghc/tests/typecheck/should_compile/tc045.stderr
+++ /dev/null
@@ -1,9 +0,0 @@
-__export ShouldSucceed B{op2} C{op1};
-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 zddmop1 :: __forall [a] => {C a} -> a -> a ;
-1 zddmop2 :: __forall [a] => {B a} -> a -> a -> a ;
-1 zdfBZMZN :: __forall [a] => {B a} -> {B [a]} ;
-1 zdfCZMZN :: __forall [a] => {C [a]} ;

diff --git a/ghc/tests/typecheck/should_compile/tc046.stderr b/ghc/tests/typecheck/should_compile/tc046.stderr
deleted file mode 100644 (file)
index 4300615..0000000
--- a/ghc/tests/typecheck/should_compile/tc046.stderr
+++ /dev/null
@@ -1,5 +0,0 @@
-__export ShouldSucceed B{op2} C{op1};
-1 class {C a}  => B a where {op2 :: a -> a -> a} ;
-1 class C a where {op1 :: a -> a} ;
-1 zddmop1 :: __forall [a] => {C a} -> a -> a ;
-1 zddmop2 :: __forall [a] => {B a} -> a -> a -> a ;

diff --git a/ghc/tests/typecheck/should_compile/tc047.stderr b/ghc/tests/typecheck/should_compile/tc047.stderr
deleted file mode 100644 (file)
index c2d3259..0000000
--- a/ghc/tests/typecheck/should_compile/tc047.stderr
+++ /dev/null
@@ -1,5 +0,0 @@
-__export ShouldSucceed OL f mp sd;
-1 f :: __forall [t t1 t2] => t -> [(t1, t2)] -> [t2] ;
-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
deleted file mode 100644 (file)
index fd8abd5..0000000
--- a/ghc/tests/typecheck/should_compile/tc048.stderr
+++ /dev/null
@@ -1,8 +0,0 @@
-__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] => (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] => (t, t1) -> t1 ;

diff --git a/ghc/tests/typecheck/should_compile/tc049.stderr b/ghc/tests/typecheck/should_compile/tc049.stderr
deleted file mode 100644 (file)
index 6a1df40..0000000
--- a/ghc/tests/typecheck/should_compile/tc049.stderr
+++ /dev/null
@@ -1,12 +0,0 @@
-__export ShouldSucceed fib main1 main2 main3 mem mem1 mem2 mem3 mem4 oR oR1;
-1 fib :: __forall [a] => {PrelBase.Ord a} -> {PrelNum.Num 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 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
deleted file mode 100644 (file)
index b9ea2fb..0000000
--- a/ghc/tests/typecheck/should_compile/tc050.stderr
+++ /dev/null
@@ -1,9 +0,0 @@
-__export ShouldSucceed Foo{o_and} f g;
-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] => {Foo a} -> {PrelNum.Num a} -> a -> t -> a ;
-1 zddmo_and :: __forall [a] => {Foo a} -> a -> a -> 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
deleted file mode 100644 (file)
index b335831..0000000
--- a/ghc/tests/typecheck/should_compile/tc051.stderr
+++ /dev/null
@@ -1,11 +0,0 @@
-__export ShouldSucceed Eqzq{doubleeq} Ordzq{lt};
-instance {Eqzq PrelBase.Int} = zdfEqzqInt;
-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 zddmdoubleeq :: __forall [a] => {Eqzq a} -> a -> a -> PrelBase.Bool ;
-1 zddmlt :: __forall [a] => {Ordzq a} -> a -> a -> PrelBase.Bool ;
-1 zdfEqzqInt :: {Eqzq PrelBase.Int} ;
-1 zdfEqzqZMZN :: __forall [a] => {Eqzq a} -> {Eqzq [a]} ;
-1 zdfOrdzqInt :: {Ordzq PrelBase.Int} ;

diff --git a/ghc/tests/typecheck/should_compile/tc052.stderr b/ghc/tests/typecheck/should_compile/tc052.stderr
deleted file mode 100644 (file)
index 357208f..0000000
--- a/ghc/tests/typecheck/should_compile/tc052.stderr
+++ /dev/null
@@ -1,4 +0,0 @@
-__export ShouldSucceed A B C;
-1 type A a = B   a ;
-1 type B c = C ;
-1 type C = PrelBase.Int ;

diff --git a/ghc/tests/typecheck/should_compile/tc053.stderr b/ghc/tests/typecheck/should_compile/tc053.stderr
deleted file mode 100644 (file)
index 21caf58..0000000
--- a/ghc/tests/typecheck/should_compile/tc053.stderr
+++ /dev/null
@@ -1,8 +0,0 @@
-__export ShouldSucceed Eqzq{deq} f;
-instance {Eqzq PrelBase.Int} = zdfEqzqInt;
-instance __forall [a] => {Eqzq a} -> {Eqzq [a]} = zdfEqzqZMZN;
-1 class Eqzq a where {deq :: a -> a -> PrelBase.Bool} ;
-1 f :: __forall [t] => {Eqzq [t]} -> {PrelNum.Num t} -> [t] -> PrelBase.Bool ;
-1 zddmdeq :: __forall [a] => {Eqzq a} -> a -> a -> PrelBase.Bool ;
-1 zdfEqzqInt :: {Eqzq PrelBase.Int} ;
-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
deleted file mode 100644 (file)
index 7e6417b..0000000
--- a/ghc/tests/typecheck/should_compile/tc054.stderr
+++ /dev/null
@@ -1,10 +0,0 @@
-__export ShouldSucceed Eqzq{doubleeq} Ordzq{lt} f;
-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] => {Ordzq a} -> {PrelNum.Num a} -> a -> t -> PrelBase.Bool ;
-1 zddmdoubleeq :: __forall [a] => {Eqzq a} -> a -> a -> PrelBase.Bool ;
-1 zddmlt :: __forall [a] => {Ordzq a} -> a -> a -> PrelBase.Bool ;
-1 zdfEqzqInt :: {Eqzq PrelBase.Int} ;
-1 zdfOrdzqInt :: {Ordzq PrelBase.Int} ;

diff --git a/ghc/tests/typecheck/should_compile/tc055.stderr b/ghc/tests/typecheck/should_compile/tc055.stderr
deleted file mode 100644 (file)
index 849be8a..0000000
--- a/ghc/tests/typecheck/should_compile/tc055.stderr
+++ /dev/null
@@ -1,3 +0,0 @@
-__export ShouldSucceed x y;
-1 x :: __forall [t t1] => t -> t ;
-1 y :: __forall [t t1] => t1 -> t1 ;

diff --git a/ghc/tests/typecheck/should_compile/tc056.stderr b/ghc/tests/typecheck/should_compile/tc056.stderr
deleted file mode 100644 (file)
index b6a09e3..0000000
--- a/ghc/tests/typecheck/should_compile/tc056.stderr
+++ /dev/null
@@ -1,4 +0,0 @@
-
-tc056.hs:14:
-    Warning: Duplicate class assertion `Eq' a' in the context:
-                (Eq' a, Eq' a) => ...

diff --git a/ghc/tests/typecheck/should_compile/tc057.stderr b/ghc/tests/typecheck/should_compile/tc057.stderr
deleted file mode 100644 (file)
index 7691dd0..0000000
--- a/ghc/tests/typecheck/should_compile/tc057.stderr
+++ /dev/null
@@ -1,9 +0,0 @@
-__export ShouldSucceed Eqzq{deq} dand f;
-instance {Eqzq PrelBase.Int} = zdfEqzqInt;
-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 zddmdeq :: __forall [a] => {Eqzq a} -> a -> a -> PrelBase.Bool ;
-1 zdfEqzqInt :: {Eqzq PrelBase.Int} ;
-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
deleted file mode 100644 (file)
index 184d13c..0000000
--- a/ghc/tests/typecheck/should_compile/tc058.stderr
+++ /dev/null
@@ -1,12 +0,0 @@
-__export ShouldSucceed Eq2{doubleeq} Ord2{lt} f;
-instance {Eq2 PrelBase.Int} = zdfEq2Int;
-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] => {Eq2 [t1]} -> {PrelNum.Num t1} -> [t1] -> t -> PrelBase.Bool ;
-1 zddmdoubleeq :: __forall [a] => {Eq2 a} -> a -> a -> PrelBase.Bool ;
-1 zddmlt :: __forall [a] => {Ord2 a} -> a -> a -> PrelBase.Bool ;
-1 zdfEq2Int :: {Eq2 PrelBase.Int} ;
-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
deleted file mode 100644 (file)
index 4adcd1a..0000000
--- a/ghc/tests/typecheck/should_compile/tc059.stderr
+++ /dev/null
@@ -1,9 +0,0 @@
-__export ShouldSucceed Eq2{deq foo} f;
-instance {Eq2 PrelBase.Int} = zdfEq2Int;
-instance __forall [a] => {Eq2 a} -> {Eq2 [a]} = zdfEq2ZMZN;
-1 class Eq2 a where {deq :: a -> a -> PrelBase.Bool; foo :: a -> a} ;
-1 f :: __forall [t] => {Eq2 [t]} -> {PrelNum.Num t} -> [t] -> PrelBase.Bool ;
-1 zddmdeq :: __forall [a] => {Eq2 a} -> a -> a -> PrelBase.Bool ;
-1 zddmfoo :: __forall [a] => {Eq2 a} -> a -> a ;
-1 zdfEq2Int :: {Eq2 PrelBase.Int} ;
-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
deleted file mode 100644 (file)
index 7763cc5..0000000
--- a/ghc/tests/typecheck/should_compile/tc060.stderr
+++ /dev/null
@@ -1,7 +0,0 @@
-__export ShouldSucceed Eq2{deq};
-instance {Eq2 PrelBase.Int} = zdfEq2Int;
-instance __forall [a] => {Eq2 a} -> {Eq2 [a]} = zdfEq2ZMZN;
-1 class Eq2 a where {deq :: a -> a -> PrelBase.Bool} ;
-1 zddmdeq :: __forall [a] => {Eq2 a} -> a -> a -> PrelBase.Bool ;
-1 zdfEq2Int :: {Eq2 PrelBase.Int} ;
-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
deleted file mode 100644 (file)
index b2e170f..0000000
--- a/ghc/tests/typecheck/should_compile/tc061.stderr
+++ /dev/null
@@ -1,7 +0,0 @@
-__export ShouldSucceed Eq1{deq};
-instance {Eq1 PrelBase.Int} = zdfEq1Int;
-instance __forall [a] => {Eq1 a} -> {Eq1 [a]} = zdfEq1ZMZN;
-1 class Eq1 a where {deq :: a -> a -> PrelBase.Bool} ;
-1 zddmdeq :: __forall [a] => {Eq1 a} -> a -> a -> PrelBase.Bool ;
-1 zdfEq1Int :: {Eq1 PrelBase.Int} ;
-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
deleted file mode 100644 (file)
index 964a442..0000000
--- a/ghc/tests/typecheck/should_compile/tc062.stderr
+++ /dev/null
@@ -1,8 +0,0 @@
-__export ShouldSucceed Eq1{deq} f;
-instance {Eq1 PrelBase.Int} = zdfEq1Int;
-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 zddmdeq :: __forall [a] => {Eq1 a} -> a -> a -> PrelBase.Bool ;
-1 zdfEq1Int :: {Eq1 PrelBase.Int} ;
-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
deleted file mode 100644 (file)
index da5dfb8..0000000
--- a/ghc/tests/typecheck/should_compile/tc063.stderr
+++ /dev/null
@@ -1,9 +0,0 @@
-__export ShouldSucceed Reps{f} X{Tag} g;
-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 zddmf :: __forall [r] => {Reps r} -> r -> r -> r ;
-1 zdfRepsBool :: {Reps PrelBase.Bool} ;
-1 zdfRepsX :: __forall [q] => {Reps (X   q)} ;

diff --git a/ghc/tests/typecheck/should_compile/tc064.stderr b/ghc/tests/typecheck/should_compile/tc064.stderr
deleted file mode 100644 (file)
index dc67a55..0000000
--- a/ghc/tests/typecheck/should_compile/tc064.stderr
+++ /dev/null
@@ -1,3 +0,0 @@
-__export ShouldSucceed Boolean{FF TT} idb;
-1 data Boolean = FF |  TT ;
-1 idb :: Boolean -> Boolean ;

diff --git a/ghc/tests/typecheck/should_compile/tc065.stderr b/ghc/tests/typecheck/should_compile/tc065.stderr
deleted file mode 100644 (file)
index 1ae6931..0000000
--- a/ghc/tests/typecheck/should_compile/tc065.stderr
+++ /dev/null
@@ -1,15 +0,0 @@
-__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 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 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 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/tc066.stderr b/ghc/tests/typecheck/should_compile/tc066.stderr
deleted file mode 100644 (file)
index 9ddc3fa..0000000
--- a/ghc/tests/typecheck/should_compile/tc066.stderr
+++ /dev/null
@@ -1,3 +0,0 @@
-__export ShouldSucceed Pair{MkPair} f;
-1 data Pair a b = MkPair a b ;
-1 f :: __forall [a b] => [Pair a b] -> [b] ;

diff --git a/ghc/tests/typecheck/should_compile/tc067.stderr b/ghc/tests/typecheck/should_compile/tc067.stderr
deleted file mode 100644 (file)
index a441d7b..0000000
--- a/ghc/tests/typecheck/should_compile/tc067.stderr
+++ /dev/null
@@ -1,2 +0,0 @@
-__export ShouldSucceed f;
-1 f :: __forall [t] => [t] -> [t] ;

diff --git a/ghc/tests/typecheck/should_compile/tc068.stderr b/ghc/tests/typecheck/should_compile/tc068.stderr
deleted file mode 100644 (file)
index 7e49d08..0000000
--- a/ghc/tests/typecheck/should_compile/tc068.stderr
+++ /dev/null
@@ -1,7 +0,0 @@
-__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;
-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)} ;

diff --git a/ghc/tests/typecheck/should_compile/tc069.stderr b/ghc/tests/typecheck/should_compile/tc069.stderr
deleted file mode 100644 (file)
index 0d6f791..0000000
--- a/ghc/tests/typecheck/should_compile/tc069.stderr
+++ /dev/null
@@ -1,4 +0,0 @@
-__export ShouldSucceed x y ys;
-1 x :: PrelBase.Char ;
-1 y :: PrelBase.Char ;
-1 ys :: [PrelBase.Char] ;

diff --git a/ghc/tests/typecheck/should_compile/tc070.stderr b/ghc/tests/typecheck/should_compile/tc070.stderr
deleted file mode 100644 (file)
index dc67a55..0000000
--- a/ghc/tests/typecheck/should_compile/tc070.stderr
+++ /dev/null
@@ -1,3 +0,0 @@
-__export ShouldSucceed Boolean{FF TT} idb;
-1 data Boolean = FF |  TT ;
-1 idb :: Boolean -> Boolean ;

diff --git a/ghc/tests/typecheck/should_compile/tc073.stderr b/ghc/tests/typecheck/should_compile/tc073.stderr
deleted file mode 100644 (file)
index a441d7b..0000000
--- a/ghc/tests/typecheck/should_compile/tc073.stderr
+++ /dev/null
@@ -1,2 +0,0 @@
-__export ShouldSucceed f;
-1 f :: __forall [t] => [t] -> [t] ;

diff --git a/ghc/tests/typecheck/should_compile/tc074.stderr b/ghc/tests/typecheck/should_compile/tc074.stderr
deleted file mode 100644 (file)
index 7e49d08..0000000
--- a/ghc/tests/typecheck/should_compile/tc074.stderr
+++ /dev/null
@@ -1,7 +0,0 @@
-__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;
-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)} ;

diff --git a/ghc/tests/typecheck/should_compile/tc076.stderr b/ghc/tests/typecheck/should_compile/tc076.stderr
deleted file mode 100644 (file)
index c2ebe72..0000000
--- a/ghc/tests/typecheck/should_compile/tc076.stderr
+++ /dev/null
@@ -1,3 +0,0 @@
-__export ShouldSucceed x xs;
-1 x :: [[PrelBase.Bool]] ;
-1 xs :: [PrelBase.Bool] ;

diff --git a/ghc/tests/typecheck/should_compile/tc077.stderr b/ghc/tests/typecheck/should_compile/tc077.stderr
deleted file mode 100644 (file)
index f572571..0000000
--- a/ghc/tests/typecheck/should_compile/tc077.stderr
+++ /dev/null
@@ -1,5 +0,0 @@
-__export ShouldSucceed EQ{zezeze} NUM{ONE TWO} ORD;
-1 class {ORD a, PrelShow.Show a}  => EQ a where {zezeze :: a -> a -> PrelBase.Bool} ;
-1 class {PrelNum.Num a}  => ORD a ;
-1 data NUM = ONE |  TWO ;
-1 zddmzezeze :: __forall [a] => {EQ a} -> a -> a -> PrelBase.Bool ;

diff --git a/ghc/tests/typecheck/should_compile/tc078.stderr b/ghc/tests/typecheck/should_compile/tc078.stderr
deleted file mode 100644 (file)
index 9db2b80..0000000
--- a/ghc/tests/typecheck/should_compile/tc078.stderr
+++ /dev/null
@@ -1,6 +0,0 @@
-__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;
-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.Ord (Bar a)} ;

diff --git a/ghc/tests/typecheck/should_compile/tc079.stderr b/ghc/tests/typecheck/should_compile/tc079.stderr
deleted file mode 100644 (file)
index e1fbf9b..0000000
--- a/ghc/tests/typecheck/should_compile/tc079.stderr
+++ /dev/null
@@ -1,8 +0,0 @@
-__export ShouldSucceed Foo{op1 op2};
-instance {Foo PrelBase.Int} = zdfFooInt;
-instance __forall [a] => {Foo a} -> {Foo [a]} = zdfFooZMZN;
-1 class Foo a where {op1 = :: a -> PrelBase.Bool; op2 = :: __forall [b] => {PrelBase.Ord b} -> a -> b -> b -> b} ;
-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]} ;

diff --git a/ghc/tests/typecheck/should_compile/tc080.stderr b/ghc/tests/typecheck/should_compile/tc080.stderr
deleted file mode 100644 (file)
index 8f10047..0000000
--- a/ghc/tests/typecheck/should_compile/tc080.stderr
+++ /dev/null
@@ -1,19 +0,0 @@
-__export ShouldSucceed Parse{parseFile parseLine parseType parse forced} charToInt lineszq seperatedBy spanzq strToInt whiteSpace;
-instance {Parse PrelBase.Char} = zdfParseChar;
-instance {Parse PrelBase.Int} = zdfParseInt;
-instance __forall [a] => {Parse a} -> {Parse [a]} = zdfParseZMZN;
-1 charToInt :: PrelBase.Char -> PrelBase.Int ;
-1 class Parse a where {parseFile = :: PrelBase.String -> [a]; parseLine = :: PrelBase.String -> a; parseType :: PrelBase.String -> (a, PrelBase.String); parse = :: PrelBase.String -> (a, PrelBase.String); forced = :: a -> PrelBase.Bool} ;
-1 lineszq :: [PrelBase.Char] -> [[PrelBase.Char]] ;
-1 seperatedBy :: PrelBase.Char -> PrelBase.String -> [PrelBase.String] ;
-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 zddmparseType :: __forall [a] => {Parse a} -> PrelBase.String -> (a, PrelBase.String) ;
-1 zdfParseChar :: {Parse PrelBase.Char} ;
-1 zdfParseInt :: {Parse PrelBase.Int} ;
-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
deleted file mode 100644 (file)
index e387451..0000000
--- a/ghc/tests/typecheck/should_compile/tc081.stderr
+++ /dev/null
@@ -1,4 +0,0 @@
-__export ShouldSucceed f f2 f3;
-1 f :: __forall [a] => {PrelBase.Ord a} -> {PrelNum.Num a} -> a -> (a, PrelBase.Bool, [PrelBase.Bool], [PrelBase.Char]) ;
-1 f2 :: __forall [a] => {PrelBase.Ord a} -> {PrelNum.Num a} -> a -> (a, PrelBase.Bool, [PrelBase.Bool], [PrelBase.Char]) ;
-1 f3 :: __forall [a] => {PrelBase.Ord a} -> {PrelNum.Num a} -> a -> (a, PrelBase.Bool, [PrelBase.Bool], [PrelBase.Char]) ;

diff --git a/ghc/tests/typecheck/should_compile/tc082.stderr b/ghc/tests/typecheck/should_compile/tc082.stderr
deleted file mode 100644 (file)
index 3b89f1c..0000000
--- a/ghc/tests/typecheck/should_compile/tc082.stderr
+++ /dev/null
@@ -1,6 +0,0 @@
-__export ShouldSucceed Normal{normal} f;
-instance __forall [a b] => {Normal (a -> b)} = zdfNormalZLzmzgZR;
-1 class Normal a where {normal :: a -> PrelBase.Bool} ;
-1 f :: __forall [t] => t -> PrelBase.Bool ;
-1 zddmnormal :: __forall [a] => {Normal a} -> a -> PrelBase.Bool ;
-1 zdfNormalZLzmzgZR :: __forall [a b] => {Normal (a -> b)} ;

diff --git a/ghc/tests/typecheck/should_compile/tc084.stderr b/ghc/tests/typecheck/should_compile/tc084.stderr
deleted file mode 100644 (file)
index 354c6ef..0000000
--- a/ghc/tests/typecheck/should_compile/tc084.stderr
+++ /dev/null
@@ -1,4 +0,0 @@
-__export ShouldSucceed f g h;
-1 f :: __forall [b] => PrelBase.Int -> b -> PrelBase.Int ;
-1 g :: __forall [a b] => {PrelNum.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
deleted file mode 100644 (file)
index 588e614..0000000
--- a/ghc/tests/typecheck/should_compile/tc085.stderr
+++ /dev/null
@@ -1,6 +0,0 @@
-__export IOExts IOArray IORef boundsIOArray fixIO freeHaskellFunctionPtr freezzeIOArray hGetBuf hGetBufBA hGetBufBAFull hGetBufFull hPutBuf hPutBufBA hPutBufBAFull hPutBufFull hSetBinaryMode hTell mkWeakIORef newIOArray newIORef performGC readIOArray readIORef thawIOArray trace unsafeFreezzeIOArray unsafePtrEq unsafeThawIOArray updateIORef withHandleFor withStderr withStdin withStdout writeIOArray writeIORef;
-__export PrelGHC Addrzh 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 blockAsyncExceptionszh catchzh chrzh cmpIntegerIntzh cmpIntegerzh cosDoublezh cosFloatzh coshDoublezh coshFloatzh dataToTagzh deRefStablePtrzh deRefWeakzh decodeDoublezh decodeFloatzh delayzh divExactIntegerzh divModIntegerzh divideFloatzh double2Floatzh double2Intzh eqAddrzh eqCharzh eqFloatzh eqStableNamezh eqStablePtrzh eqWordzh expDoublezh expFloatzh finalizzeWeakzh float2Doublezh float2Intzh forkzh gcdIntegerIntzh gcdIntegerzh gcdIntzh 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 makeStableNamezh makeStablePtrzh minusFloatzh minusIntegerzh mkForeignObjzh 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 quotIntegerzh quotIntzh quotRemIntegerzh quotWordzh raisezh readAddrArrayzh readAddrOffAddrzh readArrayzh readCharArrayzh readCharOffAddrzh readDoubleArrayzh readDoubleOffAddrzh readFloatArrayzh readFloatOffAddrzh readInt64Arrayzh readInt64OffAddrzh readIntArrayzh readIntOffAddrzh readMutVarzh readStablePtrArrayzh readStablePtrOffAddrzh readWord64Arrayzh readWord64OffAddrzh readWordArrayzh readWordOffAddrzh realWorldzh reallyUnsafePtrEqualityzh remIntegerzh 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 tryTakeMVarzh unblockAsyncExceptionszh unsafeCoercezh unsafeFreezzeArrayzh unsafeFreezzeByteArrayzh unsafeThawArrayzh 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 zszhzh ztzh ztzhzh ztztzhzh;
-__export PrelHandle HandlePosition HandlePosn{HandlePosn} IOModeEx{BinaryMode TextMode} hConnectTo hGetEcho hIsTerminalDevice hSetEcho openFileEx slurpFile;
-__export PrelIOBase unsafeInterleaveIO unsafePerformIO;
-1 data FooData = FooData ;
-1 type FooType = PrelBase.Int ;

diff --git a/ghc/tests/typecheck/should_compile/tc086.stderr b/ghc/tests/typecheck/should_compile/tc086.stderr
deleted file mode 100644 (file)
index 2ee1779..0000000
--- a/ghc/tests/typecheck/should_compile/tc086.stderr
+++ /dev/null
@@ -1,10 +0,0 @@
-__export ShouldSucceed Group Ring;
-1 class Group a where {compare :: a -> a -> PrelBase.Ordering; fromInteger :: PrelNum.Integer -> a; zp :: a -> a -> a; zm :: a -> a -> a; zzero = :: a; one = :: a} ;
-1 class {Group a}  => Ring a where {zt = :: a -> a -> a} ;
-1 zddmcompare :: __forall [a] => {Group a} -> a -> a -> PrelBase.Ordering ;
-1 zddmfromInteger :: __forall [a] => {Group a} -> PrelNum.Integer -> a ;
-1 zddmone :: __forall [a] => {Group a} -> a ;
-1 zddmzm :: __forall [a] => {Group a} -> a -> a -> a ;
-1 zddmzp :: __forall [a] => {Group a} -> a -> 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
deleted file mode 100644 (file)
index 91bd7a8..0000000
--- a/ghc/tests/typecheck/should_compile/tc087.stderr
+++ /dev/null
@@ -1,13 +0,0 @@
-__export ShouldSucceed PriorityQueue{empty single insert meld splitMin} 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 {empty :: __forall [a] => {PrelBase.Ord a} -> q a; single :: __forall [a] => {PrelBase.Ord a} -> a -> q a; insert = :: __forall [a] => {PrelBase.Ord a} -> a -> q a -> q a; meld :: __forall [a] => {PrelBase.Ord a} -> q a -> q a -> q a; splitMin :: __forall [a] => {PrelBase.Ord a} -> q a -> SeqView q a} ;
-1 data SeqView t :: (* -> *) a = Null |  Cons a (t a) ;
-1 insertMany :: __forall [q :: (* -> *) a] => {PriorityQueue q} -> {PrelBase.Ord a} -> [a] -> q a -> q a ;
-1 out :: __forall [a] => {PrelNum.Num a} -> [a] -> PrelIOBase.IO PrelBase.Z0T ;
-1 pqSort :: __forall [a t :: (* -> *)] => {PrelBase.Ord a} -> {PriorityQueue t} -> t a -> [a] -> [a] ;
-1 toOrderedList :: __forall [t :: (* -> *) a] => {PriorityQueue t} -> {PrelBase.Ord a} -> t a -> [a] ;
-1 zddmempty :: __forall [q :: (* -> *)] => {PriorityQueue q} -> (__forall [a] => {PrelBase.Ord a} -> q a) ;
-1 zddminsert :: __forall [q :: (* -> *)] => {PriorityQueue q} -> (__forall [a] => {PrelBase.Ord a} -> a -> q a -> q a) ;
-1 zddmmeld :: __forall [q :: (* -> *)] => {PriorityQueue q} -> (__forall [a] => {PrelBase.Ord a} -> q a -> q a -> q a) ;
-1 zddmsingle :: __forall [q :: (* -> *)] => {PriorityQueue q} -> (__forall [a] => {PrelBase.Ord a} -> a -> q a) ;
-1 zddmsplitMin :: __forall [q :: (* -> *)] => {PriorityQueue q} -> (__forall [a] => {PrelBase.Ord a} -> q a -> SeqView q a) ;

diff --git a/ghc/tests/typecheck/should_compile/tc088.hs b/ghc/tests/typecheck/should_compile/tc088.hs
index 2c5b5d4..05faeae 100644 (file)
--- a/ghc/tests/typecheck/should_compile/tc088.hs
+++ b/ghc/tests/typecheck/should_compile/tc088.hs
@@ -1,7 +1,6 @@
 -- Check that "->" is an instance of Eval
 
 module ShouldSucceed where
-import Int( Num(fromInt) )
 
 instance Show (a->b)
 
@@ -18,4 +17,3 @@ instance (Num b) => Num (a -> b) where
     abs f                     =  \a -> abs (f a)
     signum f                  =  \a -> signum (f a)
     fromInteger n             =  \a -> fromInteger n
-    fromInt n                 =  \a -> fromInt n

diff --git a/ghc/tests/typecheck/should_compile/tc088.stderr b/ghc/tests/typecheck/should_compile/tc088.stderr
deleted file mode 100644 (file)
index dc88050..0000000
--- a/ghc/tests/typecheck/should_compile/tc088.stderr
+++ /dev/null
@@ -1,6 +0,0 @@
-instance __forall [a b] => {PrelBase.Eq b} -> {PrelBase.Eq (a -> b)} = zdfEqZLzmzgZR;
-instance __forall [a b] => {PrelNum.Num b} -> {PrelNum.Num (a -> b)} = zdfNumZLzmzgZR;
-instance __forall [a b] => {PrelShow.Show (a -> b)} = zdfShowZLzmzgZR;
-1 zdfEqZLzmzgZR :: __forall [a b] => {PrelBase.Eq b} -> {PrelBase.Eq (a -> b)} ;
-1 zdfNumZLzmzgZR :: __forall [a b] => {PrelNum.Num b} -> {PrelNum.Num (a -> b)} ;
-1 zdfShowZLzmzgZR :: __forall [a b] => {PrelShow.Show (a -> b)} ;

diff --git a/ghc/tests/typecheck/should_compile/tc089.stderr b/ghc/tests/typecheck/should_compile/tc089.stderr
deleted file mode 100644 (file)
index 60dca4c..0000000
--- a/ghc/tests/typecheck/should_compile/tc089.stderr
+++ /dev/null
@@ -1,35 +0,0 @@
-__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] => t -> t1 -> t2 -> t ;
-1 bottom :: __forall [t] => [t] -> t ;
-1 f :: __forall [t] => t -> 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, (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, (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] => 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] => (t, t1) -> t1 ;
-1 s_3_0 :: __forall [t t1 t2] => (t, t1, t2) -> 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
deleted file mode 100644 (file)
index f216338..0000000
--- a/ghc/tests/typecheck/should_compile/tc090.stderr
+++ /dev/null
@@ -1,3 +0,0 @@
-__export ShouldSucceed a b;
-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
deleted file mode 100644 (file)
index f23c68c..0000000
--- a/ghc/tests/typecheck/should_compile/tc091.stderr
+++ /dev/null
@@ -1,4 +0,0 @@
-__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] ;

diff --git a/ghc/tests/typecheck/should_compile/tc092.stderr b/ghc/tests/typecheck/should_compile/tc092.stderr
deleted file mode 100644 (file)
index b170489..0000000
--- a/ghc/tests/typecheck/should_compile/tc092.stderr
+++ /dev/null
@@ -1,6 +0,0 @@
-__export ShouldSucceed Empty{Empty} e0 e1 e2 q;
-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] ;

diff --git a/ghc/tests/typecheck/should_compile/tc093.stderr b/ghc/tests/typecheck/should_compile/tc093.stderr
deleted file mode 100644 (file)
index 2e09f5d..0000000
--- a/ghc/tests/typecheck/should_compile/tc093.stderr
+++ /dev/null
@@ -1,14 +0,0 @@
-__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 {PrelShow.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)) ;
-1 data TS = TS {vs :: PrelBase.Int} ;
-1 foo :: PrelBase.Int -> St  PrelBase.Int ;
-1 type St a = State TS a ;
-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 zdfShowTS :: {PrelShow.Show TS} ;

diff --git a/ghc/tests/typecheck/should_compile/tc094.stderr b/ghc/tests/typecheck/should_compile/tc094.stderr
deleted file mode 100644 (file)
index c5e46d7..0000000
--- a/ghc/tests/typecheck/should_compile/tc094.stderr
+++ /dev/null
@@ -1,2 +0,0 @@
-__export ShouldSucceed foo;
-1 foo :: __forall [t] => t -> (PrelNum.Integer, PrelNum.Integer) ;

diff --git a/ghc/tests/typecheck/should_compile/tc095.stderr b/ghc/tests/typecheck/should_compile/tc095.stderr
deleted file mode 100644 (file)
index 64675a7..0000000
--- a/ghc/tests/typecheck/should_compile/tc095.stderr
+++ /dev/null
@@ -1 +0,0 @@
-NOTE: Simplifier still going after 4 iterations; bailing out.

diff --git a/ghc/tests/typecheck/should_compile/tc096.stderr b/ghc/tests/typecheck/should_compile/tc096.stderr
deleted file mode 100644 (file)
index f3f0fa7..0000000
--- a/ghc/tests/typecheck/should_compile/tc096.stderr
+++ /dev/null
@@ -1,3 +0,0 @@
-__export ShouldSucceed main x;
-1 main :: PrelIOBase.IO PrelBase.Z0T ;
-1 x :: PrelFloat.Double ;

diff --git a/ghc/tests/typecheck/should_compile/tc097.stderr b/ghc/tests/typecheck/should_compile/tc097.stderr
deleted file mode 100644 (file)
index ef87be8..0000000
--- a/ghc/tests/typecheck/should_compile/tc097.stderr
+++ /dev/null
@@ -1,3 +0,0 @@
-__export ShouldSucceed Monad2{MkMonad2} halfListMonad;
-1 data Monad2 m :: (* -> *) = MkMonad2 (__forall [a] => a -> m a) (__forall [b a] => m a -> (a -> m b) -> m b) ;
-1 halfListMonad :: (__forall [b a] => [a] -> (a -> [b]) -> [b]) -> Monad2 PrelBase.ZMZN ;

diff --git a/ghc/tests/typecheck/should_compile/tc098.stderr b/ghc/tests/typecheck/should_compile/tc098.stderr
deleted file mode 100644 (file)
index a632880..0000000
--- a/ghc/tests/typecheck/should_compile/tc098.stderr
+++ /dev/null
@@ -1,5 +0,0 @@
-__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 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
deleted file mode 100644 (file)
index 89fc5ef..0000000
--- a/ghc/tests/typecheck/should_compile/tc099.stderr
+++ /dev/null
@@ -1,3 +0,0 @@
-__export ShouldCompile f g;
-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_compile/tc100.stderr b/ghc/tests/typecheck/should_compile/tc100.stderr
deleted file mode 100644 (file)
index d271659..0000000
--- a/ghc/tests/typecheck/should_compile/tc100.stderr
+++ /dev/null
@@ -1,4 +0,0 @@
-__export ShouldCompile C D{DD} D_;
-1 newtype D a = DD (D_  a) ;
-1 type C a = D   a -> a ;
-1 type D_ a = C   (PrelMaybe.Maybe a) ;

diff --git a/ghc/tests/typecheck/should_compile/tc101.stderr b/ghc/tests/typecheck/should_compile/tc101.stderr
deleted file mode 100644 (file)
index f12ea9f..0000000
--- a/ghc/tests/typecheck/should_compile/tc101.stderr
+++ /dev/null
@@ -1,4 +0,0 @@
-__export ShouldCompile A f x;
-1 f :: __forall [a] => (A   a -> a -> PrelBase.Z0T) -> PrelBase.Z0T ;
-1 type A a = PrelBase.Z0T ;
-1 x :: PrelBase.Z0T ;

diff --git a/ghc/tests/typecheck/should_compile/tc102.stderr b/ghc/tests/typecheck/should_compile/tc102.stderr
deleted file mode 100644 (file)
index 94966a1..0000000
--- a/ghc/tests/typecheck/should_compile/tc102.stderr
+++ /dev/null
@@ -1,2 +0,0 @@
-__export ShouldCompile p;
-1 p :: __forall [a] => a -> a ;

diff --git a/ghc/tests/typecheck/should_compile/tc103.stderr b/ghc/tests/typecheck/should_compile/tc103.stderr
deleted file mode 100644 (file)
index d271659..0000000
--- a/ghc/tests/typecheck/should_compile/tc103.stderr
+++ /dev/null
@@ -1,4 +0,0 @@
-__export ShouldCompile C D{DD} D_;
-1 newtype D a = DD (D_  a) ;
-1 type C a = D   a -> a ;
-1 type D_ a = C   (PrelMaybe.Maybe a) ;

diff --git a/ghc/tests/typecheck/should_compile/tc104.stderr b/ghc/tests/typecheck/should_compile/tc104.stderr
deleted file mode 100644 (file)
index 4b0bc3c..0000000
--- a/ghc/tests/typecheck/should_compile/tc104.stderr
+++ /dev/null
@@ -1,2 +0,0 @@
-__export Main main;
-1 main :: __forall [a] => PrelIOBase.IO (a -> a) ;

diff --git a/ghc/tests/typecheck/should_compile/tc105.stderr b/ghc/tests/typecheck/should_compile/tc105.stderr
deleted file mode 100644 (file)
index e69de29..0000000

diff --git a/ghc/tests/typecheck/should_compile/tc106.stderr b/ghc/tests/typecheck/should_compile/tc106.stderr
deleted file mode 100644 (file)
index e69de29..0000000

diff --git a/ghc/tests/typecheck/should_compile/tc107.stderr b/ghc/tests/typecheck/should_compile/tc107.stderr
deleted file mode 100644 (file)
index 8d1c8b6..0000000
--- a/ghc/tests/typecheck/should_compile/tc107.stderr
+++ /dev/null
@@ -1 +0,0 @@
- 

diff --git a/ghc/tests/typecheck/should_compile/tc108.stderr b/ghc/tests/typecheck/should_compile/tc108.stderr
deleted file mode 100644 (file)
index b07f30b..0000000
--- a/ghc/tests/typecheck/should_compile/tc108.stderr
+++ /dev/null
@@ -1,4 +0,0 @@
-
-tc108.hs:15:
-    Too many parameters for class `HasConfigValue'
-    In the class declaration for `HasConfigValue'

diff --git a/ghc/tests/typecheck/should_compile/tc109.stderr b/ghc/tests/typecheck/should_compile/tc109.stderr
deleted file mode 100644 (file)
index 35219fc..0000000
--- a/ghc/tests/typecheck/should_compile/tc109.stderr
+++ /dev/null
@@ -1,4 +0,0 @@
-
-tc109.hs:11:
-    Illegal instance declaration for `P b'
-       (There must be at least one non-type-variable in the instance head)

diff --git a/ghc/tests/typecheck/should_compile/tc110.stderr b/ghc/tests/typecheck/should_compile/tc110.stderr
deleted file mode 100644 (file)
index e69de29..0000000

diff --git a/ghc/tests/typecheck/should_compile/tc111.stderr b/ghc/tests/typecheck/should_compile/tc111.stderr
deleted file mode 100644 (file)
index e69de29..0000000

diff --git a/ghc/tests/typecheck/should_compile/tc112.stderr b/ghc/tests/typecheck/should_compile/tc112.stderr
deleted file mode 100644 (file)
index e69de29..0000000

diff --git a/ghc/tests/typecheck/should_compile/tc113.stderr b/ghc/tests/typecheck/should_compile/tc113.stderr
deleted file mode 100644 (file)
index e69de29..0000000

diff --git a/ghc/tests/typecheck/should_compile/tc114.stderr b/ghc/tests/typecheck/should_compile/tc114.stderr
deleted file mode 100644 (file)
index e69de29..0000000

diff --git a/ghc/tests/typecheck/should_compile/tc115.stderr b/ghc/tests/typecheck/should_compile/tc115.stderr
deleted file mode 100644 (file)
index e69de29..0000000

diff --git a/ghc/tests/typecheck/should_compile/tc116.stderr b/ghc/tests/typecheck/should_compile/tc116.stderr
deleted file mode 100644 (file)
index e69de29..0000000

diff --git a/ghc/tests/typecheck/should_compile/tc117.stderr b/ghc/tests/typecheck/should_compile/tc117.stderr
deleted file mode 100644 (file)
index 8d1c8b6..0000000
--- a/ghc/tests/typecheck/should_compile/tc117.stderr
+++ /dev/null
@@ -1 +0,0 @@
- 

diff --git a/ghc/tests/typecheck/should_compile/tc118.stderr b/ghc/tests/typecheck/should_compile/tc118.stderr
deleted file mode 100644 (file)
index 8d1c8b6..0000000
--- a/ghc/tests/typecheck/should_compile/tc118.stderr
+++ /dev/null
@@ -1 +0,0 @@
- 

diff --git a/ghc/tests/typecheck/should_compile/tc119.stderr b/ghc/tests/typecheck/should_compile/tc119.stderr
deleted file mode 100644 (file)
index e69de29..0000000

diff --git a/ghc/tests/typecheck/should_fail/tcfail002.stderr b/ghc/tests/typecheck/should_fail/tcfail002.stderr
index 5cc7593..1c333fc 100644 (file)
--- a/ghc/tests/typecheck/should_fail/tcfail002.stderr
+++ b/ghc/tests/typecheck/should_fail/tcfail002.stderr
@@ -3,4 +3,4 @@ tcfail002.hs:4:
     Occurs check: cannot construct the infinite type: t = [t]
        Expected type: t
        Inferred type: [t]
-    In the right-hand side of an equation for `c': z
+    in the definition of function `c': z

diff --git a/ghc/tests/typecheck/should_fail/tcfail003.stderr b/ghc/tests/typecheck/should_fail/tcfail003.stderr
index 07d31a7..7f5ad7e 100644 (file)
--- a/ghc/tests/typecheck/should_fail/tcfail003.stderr
+++ b/ghc/tests/typecheck/should_fail/tcfail003.stderr
@@ -3,4 +3,4 @@ tcfail003.hs:3:
     No instance for `Num Char'
     arising from the literal `1' at tcfail003.hs:3
     In the list element: 1
-    In the right-hand side of a pattern binding: [1, 'a']
+    in a pattern binding: [1, 'a']

diff --git a/ghc/tests/typecheck/should_fail/tcfail004.stderr b/ghc/tests/typecheck/should_fail/tcfail004.stderr
index 50bfd4d..5325da0 100644 (file)
--- a/ghc/tests/typecheck/should_fail/tcfail004.stderr
+++ b/ghc/tests/typecheck/should_fail/tcfail004.stderr
@@ -3,4 +3,4 @@ tcfail004.hs:3:
     Couldn't match `(t, t1)' against `(t2, t3, t4)'
        Expected type: (t, t1)
        Inferred type: (t2, t3, t4)
-    In the right-hand side of a pattern binding: (1, 2, 3)
+    in a pattern binding: (1, 2, 3)

diff --git a/ghc/tests/typecheck/should_fail/tcfail005.stderr b/ghc/tests/typecheck/should_fail/tcfail005.stderr
index 600dfe0..5bf893c 100644 (file)
--- a/ghc/tests/typecheck/should_fail/tcfail005.stderr
+++ b/ghc/tests/typecheck/should_fail/tcfail005.stderr
@@ -3,4 +3,4 @@ tcfail005.hs:3:
     Couldn't match `[t]' against `(t1, t2)'
        Expected type: [t]
        Inferred type: (t1, t2)
-    In the right-hand side of a pattern binding: (1, 'a')
+    in a pattern binding: (1, 'a')

diff --git a/ghc/tests/typecheck/should_fail/tcfail006.stderr b/ghc/tests/typecheck/should_fail/tcfail006.stderr
index 5e3ed85..96f63de 100644 (file)
--- a/ghc/tests/typecheck/should_fail/tcfail006.stderr
+++ b/ghc/tests/typecheck/should_fail/tcfail006.stderr
@@ -1,5 +1,5 @@
 
-tcfail006.hs:4:
+tcfail006.hs:5:
     No instance for `Num Bool'
-    arising from the literal `1' at tcfail006.hs:4
-    In the right-hand side of a case alternative: (True, 1)
+    arising from the literal `1' at tcfail006.hs:5
+    in a group of case alternatives beginning: (1, True)

diff --git a/ghc/tests/typecheck/should_fail/tcfail007.stderr b/ghc/tests/typecheck/should_fail/tcfail007.stderr
index 6ad768c..656a76e 100644 (file)
--- a/ghc/tests/typecheck/should_fail/tcfail007.stderr
+++ b/ghc/tests/typecheck/should_fail/tcfail007.stderr
@@ -3,4 +3,4 @@ tcfail007.hs:3:
     No instance for `Num Bool'
     arising from the literal `1' at tcfail007.hs:3
     In the second argument of `(+)', namely `1'
-    In the right-hand side of an equation for `n': x + 1
+    in the definition of function `n': x + 1

diff --git a/ghc/tests/typecheck/should_fail/tcfail008.stderr b/ghc/tests/typecheck/should_fail/tcfail008.stderr
index 0cc084b..ba4fd83 100644 (file)
--- a/ghc/tests/typecheck/should_fail/tcfail008.stderr
+++ b/ghc/tests/typecheck/should_fail/tcfail008.stderr
@@ -1,12 +1,12 @@
 
 tcfail008.hs:3:
-    Ambiguous type variable(s) `t' in the constraint `Num [t]'
+    No instance for `Num [t]'
     arising from the literal `2' at tcfail008.hs:3
     In the second argument of `(:)', namely `2'
-    In the right-hand side of an equation for `o': 1 : 2
+    in the definition of function `o': 1 : 2
 
 tcfail008.hs:3:
     Ambiguous type variable(s) `t' in the constraint `Num t'
     arising from the literal `1' at tcfail008.hs:3
     In the first argument of `(:)', namely `1'
-    In the right-hand side of an equation for `o': 1 : 2
+    in the definition of function `o': 1 : 2

diff --git a/ghc/tests/typecheck/should_fail/tcfail010.stderr b/ghc/tests/typecheck/should_fail/tcfail010.stderr
index 67a9902..ef08279 100644 (file)
--- a/ghc/tests/typecheck/should_fail/tcfail010.stderr
+++ b/ghc/tests/typecheck/should_fail/tcfail010.stderr
@@ -1,5 +1,6 @@
 
 tcfail010.hs:3:
-    Ambiguous type variable(s) `t' in the constraint `Num [t]'
-    arising from use of `+' at tcfail010.hs:3
-    In the right-hand side of a lambda abstraction: z + 2
+    No instance for `Num [t]'
+    arising from the literal `2' at tcfail010.hs:3
+    In the second argument of `(+)', namely `2'
+    in a lambda abstraction: z + 2

diff --git a/ghc/tests/typecheck/should_fail/tcfail012.stderr b/ghc/tests/typecheck/should_fail/tcfail012.stderr
index d626ad6..2177dd9 100644 (file)
--- a/ghc/tests/typecheck/should_fail/tcfail012.stderr
+++ b/ghc/tests/typecheck/should_fail/tcfail012.stderr
@@ -3,4 +3,4 @@ tcfail012.hs:3:
     Couldn't match `Bool' against `[t]'
        Expected type: Bool
        Inferred type: [t]
-    In the right-hand side of a pattern binding: []
+    in a pattern binding: []

diff --git a/ghc/tests/typecheck/should_fail/tcfail014.stderr b/ghc/tests/typecheck/should_fail/tcfail014.stderr
index 90f3128..e6836fd 100644 (file)
--- a/ghc/tests/typecheck/should_fail/tcfail014.stderr
+++ b/ghc/tests/typecheck/should_fail/tcfail014.stderr
@@ -4,4 +4,4 @@ tcfail014.hs:5:
        Expected type: t
        Inferred type: t -> t1
     In the first argument of `z', namely `z'
-    In the right-hand side of an equation for `h': z z
+    in the definition of function `h': z z

diff --git a/ghc/tests/typecheck/should_fail/tcfail015.stderr b/ghc/tests/typecheck/should_fail/tcfail015.stderr
index a0a8884..7ff8cae 100644 (file)
--- a/ghc/tests/typecheck/should_fail/tcfail015.stderr
+++ b/ghc/tests/typecheck/should_fail/tcfail015.stderr
@@ -1,5 +1,5 @@
 
-tcfail015.hs:7:
+tcfail015.hs:9:
     No instance for `Num Bool'
-    arising from the literal `2' at tcfail015.hs:7
-    In the right-hand side of an equation for `g': 2
+    arising from the literal `4' at tcfail015.hs:9
+    in the definition of function `g': 4

diff --git a/ghc/tests/typecheck/should_fail/tcfail018.stderr b/ghc/tests/typecheck/should_fail/tcfail018.stderr
index eb01853..c446b20 100644 (file)
--- a/ghc/tests/typecheck/should_fail/tcfail018.stderr
+++ b/ghc/tests/typecheck/should_fail/tcfail018.stderr
@@ -1,5 +1,5 @@
 
 tcfail018.hs:5:
-    Ambiguous type variable(s) `t' in the constraint `Num [t]'
+    No instance for `Num [t]'
     arising from the literal `1' at tcfail018.hs:5
-    In the right-hand side of a pattern binding: 1
+    in a pattern binding: 1

diff --git a/ghc/tests/typecheck/should_fail/tcfail029.stderr b/ghc/tests/typecheck/should_fail/tcfail029.stderr
index 1e6d04b..daa3175 100644 (file)
--- a/ghc/tests/typecheck/should_fail/tcfail029.stderr
+++ b/ghc/tests/typecheck/should_fail/tcfail029.stderr
@@ -2,4 +2,4 @@
 tcfail029.hs:6:
     No instance for `Ord Foo'
     arising from use of `>' at tcfail029.hs:6
-    In the right-hand side of an equation for `f': x > Bar
+    in the definition of function `f': x > Bar

diff --git a/ghc/tests/typecheck/should_fail/tcfail030.stderr b/ghc/tests/typecheck/should_fail/tcfail030.stderr
index 2a6d9df..06668c1 100644 (file)
--- a/ghc/tests/typecheck/should_fail/tcfail030.stderr
+++ b/ghc/tests/typecheck/should_fail/tcfail030.stderr
@@ -1,4 +1,2 @@
 
 tcfail030.hs:3: Variable not in scope: `main'
-
-tcfail030.hs:3: Module `Main' must include a definition for `main'

diff --git a/ghc/tests/typecheck/should_fail/tcfail031.stderr b/ghc/tests/typecheck/should_fail/tcfail031.stderr
index 79a4572..5664334 100644 (file)
--- a/ghc/tests/typecheck/should_fail/tcfail031.stderr
+++ b/ghc/tests/typecheck/should_fail/tcfail031.stderr
@@ -4,4 +4,4 @@ tcfail031.hs:3:
        Expected type: Bool
        Inferred type: Char
     In the predicate expression: 'a'
-    In the right-hand side of an equation for `f': if 'a' then 1 else 2
+    in the definition of function `f': if 'a' then 1 else 2

diff --git a/ghc/tests/typecheck/should_fail/tcfail033.stderr b/ghc/tests/typecheck/should_fail/tcfail033.stderr
index f6f2a65..1daa31d 100644 (file)
--- a/ghc/tests/typecheck/should_fail/tcfail033.stderr
+++ b/ghc/tests/typecheck/should_fail/tcfail033.stderr
@@ -3,4 +3,4 @@ tcfail033.hs:4:
     Occurs check: cannot construct the infinite type: t = (t, t1)
        Expected type: (t, t1)
        Inferred type: t
-    In a list-comprehension qualifier: return x
+    in a `list comprension' pattern binding: x

diff --git a/ghc/tests/typecheck/should_fail/tcfail034.stderr b/ghc/tests/typecheck/should_fail/tcfail034.stderr
index 76dbca6..3986844 100644 (file)
--- a/ghc/tests/typecheck/should_fail/tcfail034.stderr
+++ b/ghc/tests/typecheck/should_fail/tcfail034.stderr
@@ -2,7 +2,7 @@
 tcfail034.hs:17:
     Could not deduce `Integral a' from the context (Num a, Eq a)
     Probable fix:
-       Add `Integral a' to the type signature for `test'
+       Add `Integral a' to the type signature(s) for {test}
     arising from use of `mod' at tcfail034.hs:17
     In the first argument of `(==)', namely `(x `mod` 3)'
-    In the right-hand side of an equation for `test': (x `mod` 3) == 0
+    in the definition of function `test': (x `mod` 3) == 0

diff --git a/ghc/tests/typecheck/should_fail/tcfail035.stderr b/ghc/tests/typecheck/should_fail/tcfail035.stderr
index 419cf09..d8f1091 100644 (file)
--- a/ghc/tests/typecheck/should_fail/tcfail035.stderr
+++ b/ghc/tests/typecheck/should_fail/tcfail035.stderr
@@ -1,4 +1,4 @@
 
-Duplicate or overlapping instance declarations:
-  tcfail035.hs:6: {Num NUM}
-  tcfail035.hs:7: {Num NUM}
+Duplicate instance declarations:
+  tcfail035.hs:6: Num NUM
+  tcfail035.hs:7: Num NUM

diff --git a/ghc/tests/typecheck/should_fail/tcfail036.stderr b/ghc/tests/typecheck/should_fail/tcfail036.stderr
index 53cea4c..af65473 100644 (file)
--- a/ghc/tests/typecheck/should_fail/tcfail036.stderr
+++ b/ghc/tests/typecheck/should_fail/tcfail036.stderr
@@ -1,8 +1,9 @@
 
-Duplicate or overlapping instance declarations:
-  tcfail036.hs:6: {Num NUM}
-  tcfail036.hs:8: {Num NUM}
+Duplicate instance declarations:
+  tcfail036.hs:6: Num NUM
+  tcfail036.hs:8: Num NUM
 
 tcfail036.hs:9:
     Class `Num' used as a type
     When checking kinds in `Eq Num'
+    In the instance declaration for `Eq Num'

diff --git a/ghc/tests/typecheck/should_fail/tcfail037.stderr b/ghc/tests/typecheck/should_fail/tcfail037.stderr
index ed18d86..0191c72 100644 (file)
--- a/ghc/tests/typecheck/should_fail/tcfail037.stderr
+++ b/ghc/tests/typecheck/should_fail/tcfail037.stderr
@@ -2,4 +2,4 @@
 tcfail037.hs:7:
     Ambiguous occurrence `+'
     It could refer to either `ShouldFail.+', defined at tcfail037.hs:10
-                         or `PrelNum.+', imported from Prelude at tcfail037.hs:3 ()
+                         or `PrelNum.+', imported from Prelude at tcfail037.hs:3

diff --git a/ghc/tests/typecheck/should_fail/tcfail039.stderr b/ghc/tests/typecheck/should_fail/tcfail039.stderr
index 489c1ce..1250034 100644 (file)
--- a/ghc/tests/typecheck/should_fail/tcfail039.stderr
+++ b/ghc/tests/typecheck/should_fail/tcfail039.stderr
@@ -2,4 +2,4 @@
 tcfail039.hs:11:
     Ambiguous occurrence `=='
     It could refer to either `ShouldFail.==', defined at tcfail039.hs:7
-                         or `PrelBase.==', imported from Prelude at tcfail039.hs:3 ()
+                         or `PrelBase.==', imported from Prelude at tcfail039.hs:3

diff --git a/ghc/tests/typecheck/should_fail/tcfail040.stderr b/ghc/tests/typecheck/should_fail/tcfail040.stderr
index 02c3525..bf521eb 100644 (file)
--- a/ghc/tests/typecheck/should_fail/tcfail040.stderr
+++ b/ghc/tests/typecheck/should_fail/tcfail040.stderr
@@ -3,4 +3,4 @@ tcfail040.hs:19:
     Ambiguous type variable(s) `a' in the constraint `ORD a'
     arising from use of `<<' at tcfail040.hs:19
     In the second argument of `(===)', namely `(<<)'
-    In the right-hand side of an equation for `f': (<<) === (<<)
+    in the definition of function `f': (<<) === (<<)

diff --git a/ghc/tests/typecheck/should_fail/tcfail043.stderr b/ghc/tests/typecheck/should_fail/tcfail043.stderr
index e55fca9..3dd8884 100644 (file)
--- a/ghc/tests/typecheck/should_fail/tcfail043.stderr
+++ b/ghc/tests/typecheck/should_fail/tcfail043.stderr
@@ -3,7 +3,7 @@ tcfail043.hs:38:
     Ambiguous type variable(s) `a' in the constraint `Ord_ a'
     arising from use of `gt' at tcfail043.hs:38
     In the predicate expression: gt (hd bs) a
-    In the right-hand side of a lambda abstraction:
+    in a lambda abstraction:
        if gt (hd bs) a then
            False
        else

diff --git a/ghc/tests/typecheck/should_fail/tcfail045.stderr b/ghc/tests/typecheck/should_fail/tcfail045.stderr
index dcfd39a..58d4df4 100644 (file)
--- a/ghc/tests/typecheck/should_fail/tcfail045.stderr
+++ b/ghc/tests/typecheck/should_fail/tcfail045.stderr
@@ -1,4 +1,3 @@
 
 tcfail045.hs:10:
-    Unacceptable instance type for ccall-ish class
-       class CCallable type Socket
+    Unacceptable instance type for ccall-ish class CCallable Socket

diff --git a/ghc/tests/typecheck/should_fail/tcfail046.stderr b/ghc/tests/typecheck/should_fail/tcfail046.stderr
index 7877826..eb75308 100644 (file)
--- a/ghc/tests/typecheck/should_fail/tcfail046.stderr
+++ b/ghc/tests/typecheck/should_fail/tcfail046.stderr
@@ -1,3 +1,4 @@
 
-No instance for `Eq (Process a)'
-When deriving classes for `Message'
+tcfail046.hs:17:
+    No instance for `Eq (Process a)'
+    When deriving classes for `Message'

diff --git a/ghc/tests/typecheck/should_fail/tcfail056.stderr b/ghc/tests/typecheck/should_fail/tcfail056.stderr
index e7f90dd..15b6194 100644 (file)
--- a/ghc/tests/typecheck/should_fail/tcfail056.stderr
+++ b/ghc/tests/typecheck/should_fail/tcfail056.stderr
@@ -1,6 +1,4 @@
 
-Duplicate or overlapping instance declarations:
-  tcfail056.hs:5: {Eq Foo}
-  tcfail056.hs:8: {Eq Foo}
-
-tcfail056.hs:8: Class `Eq' does not have a method `<='
+Duplicate instance declarations:
+  tcfail056.hs:5: Eq Foo
+  tcfail056.hs:8: Eq Foo

diff --git a/ghc/tests/typecheck/should_fail/tcfail067.stderr b/ghc/tests/typecheck/should_fail/tcfail067.stderr
index 1e4d1a5..bb15e5c 100644 (file)
--- a/ghc/tests/typecheck/should_fail/tcfail067.stderr
+++ b/ghc/tests/typecheck/should_fail/tcfail067.stderr
@@ -1,27 +1,26 @@
 
 tcfail067.hs:60:
-    Could not deduce `Show (SubRange a)' from the context (Num a1)
+    Could not deduce `Show (SubRange a1)' from the context (Num a)
     Probable fix:
-       Add `Show (SubRange a)' to the instance declaration context
-       Or add an instance declaration for `Show (SubRange a)'
+       Add `Show (SubRange a1)' to the instance declaration context
+       Or add an instance declaration for `Show (SubRange a1)'
     arising from an instance declaration at tcfail067.hs:60
 
 tcfail067.hs:61:
-    Could not deduce `Ord a'
-       from the context (Num (SubRange a1),
-                         Num a1,
-                         Eq (SubRange a1),
-                         Show (SubRange a1))
+    Could not deduce `Ord a1'
+       from the context (Num (SubRange a),
+                         Num a,
+                         Eq (SubRange a),
+                         Show (SubRange a))
     Probable fix:
-       Add `Ord a' to the instance declaration context
+       Add `Ord a1' to the instance declaration context
     arising from use of `numSubRangeNegate' at tcfail067.hs:61
-    In the right-hand side of an equation for `negate':
-       numSubRangeNegate
+    in the definition of function `negate': numSubRangeNegate
 
 tcfail067.hs:74:
     Could not deduce `Ord a' from the context (Num a)
     Probable fix:
-       Add `Ord a' to the type signature for `numSubRangeBinOp'
+       Add `Ord a' to the type signature(s) for {numSubRangeBinOp}
     arising from use of `SubRange' at tcfail067.hs:74
-    In the right-hand side of an equation for `numSubRangeBinOp':
+    in the definition of function `numSubRangeBinOp':
        SubRange (result, result) result

diff --git a/ghc/tests/typecheck/should_fail/tcfail068.stderr b/ghc/tests/typecheck/should_fail/tcfail068.stderr
index 137b143..0837ecc 100644 (file)
--- a/ghc/tests/typecheck/should_fail/tcfail068.stderr
+++ b/ghc/tests/typecheck/should_fail/tcfail068.stderr
@@ -5,11 +5,11 @@ tcfail068.hs:12:
        It is reachable from the type variable(s) `a'
          which is free in the signature
     Signature type:     forall s. ST s a
-    Type to generalise: ST s1 (STArray s1 (Int, Int) a1)
+    Type to generalise: ST s1 (IndTree s1 a1)
     When checking an expression type signature
     In the first argument of `runST', namely
        `(newSTArray ((1, 1), n) x)'
-    In the right-hand side of an equation for `itgen':
+    in the definition of function `itgen':
        runST (newSTArray ((1, 1), n) x)
 
 tcfail068.hs:17:
@@ -19,12 +19,12 @@ tcfail068.hs:17:
        The following variables in the environment mention `s1'
          arr :: IndTree s1 a
     Signature type:     forall s. ST s a1
-    Type to generalise: ST s1 (STArray s1 (Int, Int) a)
+    Type to generalise: ST s1 (IndTree s1 a)
     When checking an expression type signature
     In the first argument of `runST', namely
        `((readSTArray arr i)
          >>= (\ val -> (writeSTArray arr i (f val)) >> (return arr)))'
-    In the right-hand side of an equation for `itiap':
+    in the definition of function `itiap':
        runST ((readSTArray arr i)
               >>= (\ val -> (writeSTArray arr i (f val)) >> (return arr)))
 
@@ -33,29 +33,26 @@ tcfail068.hs:23:
        Quantified type variable `s' escapes
        It unifies with `s1', which is mentioned in the environment
        The following variables in the environment mention `s1'
-         itrap' :: Int -> Int -> ST s1 (STArray s1 (Int, Int) a)
-         itrapsnd :: Int -> Int -> ST s1 (STArray s1 (Int, Int) a)
+         itrap' :: Int -> Int -> ST s1 (IndTree s1 a)
+         itrapsnd :: Int -> Int -> ST s1 (IndTree s1 a)
          arr :: IndTree s1 a
     Signature type:     forall s. ST s a1
-    Type to generalise: ST s1 (STArray s1 (Int, Int) a)
+    Type to generalise: ST s1 (IndTree s1 a)
     When checking an expression type signature
     In the first argument of `runST', namely `(itrap' i k)'
-    In the right-hand side of an equation for `itrap':
-       runST (itrap' i k)
+    in the definition of function `itrap': runST (itrap' i k)
 
 tcfail068.hs:35:
     Inferred type is less polymorphic than expected
        Quantified type variable `s' escapes
        It unifies with `s1', which is mentioned in the environment
        The following variables in the environment mention `s1'
-         itrapstate' :: Int
-                        -> Int -> c -> ST s1 (c, STArray s1 (Int, Int) b)
-         itrapstatesnd :: Int
-                          -> Int -> c -> ST s1 (c, STArray s1 (Int, Int) b)
+         itrapstate' :: Int -> Int -> c -> ST s1 (c, IndTree s1 b)
+         itrapstatesnd :: Int -> Int -> c -> ST s1 (c, IndTree s1 b)
          arr :: IndTree s1 b
     Signature type:     forall s. ST s a
     Type to generalise: ST s1 (c, IndTree s1 b)
     When checking an expression type signature
     In the first argument of `runST', namely `(itrapstate' i k s)'
-    In the right-hand side of an equation for `itrapstate':
+    in the definition of function `itrapstate':
        runST (itrapstate' i k s)

diff --git a/ghc/tests/typecheck/should_fail/tcfail072.stderr b/ghc/tests/typecheck/should_fail/tcfail072.stderr
index f0cd8c3..5ef2e7f 100644 (file)
--- a/ghc/tests/typecheck/should_fail/tcfail072.stderr
+++ b/ghc/tests/typecheck/should_fail/tcfail072.stderr
@@ -2,9 +2,9 @@
 tcfail072.hs:23:
     Ambiguous type variable(s) `p' in the constraint `Ord p'
     arising from use of `g' at tcfail072.hs:23
-    In the right-hand side of an equation for `g': g A
+    in the definition of function `g': g A
 
 tcfail072.hs:23:
     Ambiguous type variable(s) `q' in the constraint `Ord q'
     arising from use of `g' at tcfail072.hs:23
-    In the right-hand side of an equation for `g': g A
+    in the definition of function `g': g A

diff --git a/ghc/tests/typecheck/should_fail/tcfail076.stderr b/ghc/tests/typecheck/should_fail/tcfail076.stderr
index fdf02e0..d913f20 100644 (file)
--- a/ghc/tests/typecheck/should_fail/tcfail076.stderr
+++ b/ghc/tests/typecheck/should_fail/tcfail076.stderr
@@ -9,5 +9,4 @@ tcfail076.hs:18:
     Type to generalise: (b -> m res1) -> m res1
     When checking an expression type signature
     In the first argument of `KContT', namely `(\ cont' -> cont a)'
-    In the right-hand side of a lambda abstraction:
-       KContT (\ cont' -> cont a)
+    in a lambda abstraction: KContT (\ cont' -> cont a)

diff --git a/ghc/tests/typecheck/should_fail/tcfail079.stderr b/ghc/tests/typecheck/should_fail/tcfail079.stderr
index 29fe55c..f269113 100644 (file)
--- a/ghc/tests/typecheck/should_fail/tcfail079.stderr
+++ b/ghc/tests/typecheck/should_fail/tcfail079.stderr
@@ -1,2 +1,4 @@
 
-tcfail079.hs:7: Could not find interface file for `GlaExts'
+tcfail079.hs:7:
+    failed to load interface for `GlaExts':
+       Could not find interface file for `GlaExts'

diff --git a/ghc/tests/typecheck/should_fail/tcfail084.stderr b/ghc/tests/typecheck/should_fail/tcfail084.stderr
index ce21a59..46dba23 100644 (file)
--- a/ghc/tests/typecheck/should_fail/tcfail084.stderr
+++ b/ghc/tests/typecheck/should_fail/tcfail084.stderr
@@ -2,4 +2,4 @@
 tcfail084.hs:10:
     Constructor `F' does not have field `y'
     In the record construction: F {y = 2}
-    In the right-hand side of an equation for `z': F {y = 2}
+    in the definition of function `z': F {y = 2}

diff --git a/ghc/tests/typecheck/should_fail/tcfail085.stderr b/ghc/tests/typecheck/should_fail/tcfail085.stderr
index 6b5747d..3d6fc01 100644 (file)
--- a/ghc/tests/typecheck/should_fail/tcfail085.stderr
+++ b/ghc/tests/typecheck/should_fail/tcfail085.stderr
@@ -2,4 +2,4 @@
 tcfail085.hs:9:
     Constructor `F' does not have the required strict field `y'
     In the record construction: F {x = 2}
-    In the right-hand side of an equation for `z': F {x = 2}
+    in the definition of function `z': F {x = 2}

diff --git a/ghc/tests/typecheck/should_fail/tcfail090.stderr b/ghc/tests/typecheck/should_fail/tcfail090.stderr
index 8b011a2..45984b1 100644 (file)
--- a/ghc/tests/typecheck/should_fail/tcfail090.stderr
+++ b/ghc/tests/typecheck/should_fail/tcfail090.stderr
@@ -4,4 +4,4 @@ tcfail090.hs:8:
     When matching types `ByteArray#' and `a'
        Expected type: ByteArray#
        Inferred type: a
-    In the right-hand side of an equation for `die': undefined
+    in the definition of function `die': undefined