diff --git a/ghc/tests/ccall/should_fail/cc002.stderr b/ghc/tests/ccall/should_fail/cc002.stderr
index 87e047aed3ec4c6e31ce6c3d78297ac1146adb89..ed84260530b7709bc66214348dbe3cdc898b4060 100644
--- a/ghc/tests/ccall/should_fail/cc002.stderr
+++ b/ghc/tests/ccall/should_fail/cc002.stderr
@@ -1,6 +1,15 @@
-cc002.hs:10: No instance for: `CReturnable ForeignObj'
- arising from the result of the _ccall_ to a at cc002.hs:10
- When checking signature(s) for: `a'
+PrelForeign.hi:23:
+ Constructors for `ForeignObj' not visible when checking `PrelGHC.CCallable' instance
+ (Try either importing ForeignObj non-abstractly or compile using -fno-prune-tydecls ..)
+
+cc002.hs:18:
+ No instance for: `PrelGHC.CCallable ForeignObj'
+ arising from an argument in the _ccall_ to `c', namely `x', at cc002.hs:18
+
+cc002.hs:10:
+ No instance for: `PrelGHC.CReturnable ForeignObj'
+ arising from the result of the _ccall_ to a, at cc002.hs:10
+
Compilation had errors
diff --git a/ghc/tests/ccall/should_fail/cc004.stderr b/ghc/tests/ccall/should_fail/cc004.stderr
index cad85c70abd42ba1094f39f22e773fd00ae3b08f..e3022aa50e3933f7d60b47a5ad5b45141aa4991e 100644
--- a/ghc/tests/ccall/should_fail/cc004.stderr
+++ b/ghc/tests/ccall/should_fail/cc004.stderr
@@ -1,8 +1,11 @@
-cc004.hs:2: Cannot generalise these overloadings (in a _ccall_):
- `CReturnable taL8'
+cc004.hs:2:
+ Cannot generalise these overloadings (in a _ccall_):
+ `PrelGHC.CReturnable aMl' arising from the result of the _ccall_ to f, at cc004.hs:18
-cc004.hs:2: Cannot generalise these overloadings (in a _ccall_):
- `CReturnable taM5'
+cc004.hs:2:
+ Cannot generalise these overloadings (in a _ccall_):
+ `PrelGHC.CReturnable aNp' arising from the result of the _ccall_ to f, at cc004.hs:11
+
Compilation had errors
diff --git a/ghc/tests/codeGen/should_run/Makefile b/ghc/tests/codeGen/should_run/Makefile
index fc249e3603fe1ab91c3f920447b03e907ae0aa10..cc330007d4699f985419460cd85b19110c225cda 100644
--- a/ghc/tests/codeGen/should_run/Makefile
+++ b/ghc/tests/codeGen/should_run/Makefile
@@ -7,6 +7,7 @@ HC_OPTS += -dcore-lint
cg012_HC_OPTS = -fglasgow-exts
cg015_HC_OPTS = -fglasgow-exts
cg018_HC_OPTS = -fglasgow-exts
+cg025_HC_OPTS = -fglasgow-exts
cg026_HC_OPTS = -fglasgow-exts
cg029_HC_OPTS = -fglasgow-exts
cg030_HC_OPTS = -fglasgow-exts
diff --git a/ghc/tests/codeGen/should_run/cg030.hs b/ghc/tests/codeGen/should_run/cg030.hs
index 7f468897f0fc7a13aa34db85b0c109019a57cf3e..95947ce92b124430220baa66a9ba1b1ef53663af 100644
--- a/ghc/tests/codeGen/should_run/cg030.hs
+++ b/ghc/tests/codeGen/should_run/cg030.hs
@@ -1,6 +1,5 @@
-module GHCmain(mainIO) where
+module PrelMain(mainIO) where
import ST
-import STBase
mainIO = _ccall_ puts "123\n" >> return ()
diff --git a/ghc/tests/deSugar/should_compile/ds002.stderr b/ghc/tests/deSugar/should_compile/ds002.stderr
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..facbd68204d3ec678465d20264c01c8eaf15cf11 100644
--- a/ghc/tests/deSugar/should_compile/ds002.stderr
+++ b/ghc/tests/deSugar/should_compile/ds002.stderr
@@ -0,0 +1,8 @@
+ds002.hs:11:
+ Pattern match(es) are overlapped in the definition of function `g'
+ x y z = ...
+ds002.hs:7:
+ Pattern match(es) are overlapped in the definition of function `f'
+ y = ...
+ z = ...
+
diff --git a/ghc/tests/deSugar/should_compile/ds003.stderr b/ghc/tests/deSugar/should_compile/ds003.stderr
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..1ad474682daa67015dba96df49fe72bdbf395bb4 100644
--- a/ghc/tests/deSugar/should_compile/ds003.stderr
+++ b/ghc/tests/deSugar/should_compile/ds003.stderr
@@ -0,0 +1,5 @@
+ds003.hs:5:
+ Pattern match(es) are overlapped in the definition of function `f'
+ (x : (x1 : (x2 : x3))) ~(y, ys) z = ...
+ x y True = ...
+
diff --git a/ghc/tests/deSugar/should_compile/ds019.stderr b/ghc/tests/deSugar/should_compile/ds019.stderr
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..069a78e757a426651bcb8e82e9b96df9d76ca6ef 100644
--- a/ghc/tests/deSugar/should_compile/ds019.stderr
+++ b/ghc/tests/deSugar/should_compile/ds019.stderr
@@ -0,0 +1,6 @@
+ds019.hs:5:
+ Pattern match(es) are overlapped in the definition of function `f'
+ d (j, k) p = ...
+ (e, f, g) l q = ...
+ h (m, n) r = ...
+
diff --git a/ghc/tests/deSugar/should_compile/ds020.stderr b/ghc/tests/deSugar/should_compile/ds020.stderr
index 955d1e1e9fe9a44c1af66933722020aa1919e389..e4ee602d2f7bc31f4f6b863b029c58cfca36af49 100644
--- a/ghc/tests/deSugar/should_compile/ds020.stderr
+++ b/ghc/tests/deSugar/should_compile/ds020.stderr
@@ -1,2 +1,16 @@
+ds020.hs:5:
+ Pattern match(es) are overlapped in the definition of function `a'
+ ~(~[], ~[], ~[]) = ...
+ds020.hs:8:
+ Pattern match(es) are overlapped in the definition of function `b'
+ ~(~x : (~xs : ~ys)) = ...
+ds020.hs:13:
+ Pattern match(es) are overlapped in the definition of function `d'
+ ~(n+43) = ...
+ ~(n+999) = ...
+ds020.hs:19:
+ Pattern match(es) are overlapped in the definition of function `f'
+ (x@~[]) = ...
+
NOTE: Simplifier still going after 4 iterations; bailing out.
diff --git a/ghc/tests/deSugar/should_compile/ds022.stderr b/ghc/tests/deSugar/should_compile/ds022.stderr
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..1d0291b37151a0d0411130bba1f906a4f1aeb6e1 100644
--- a/ghc/tests/deSugar/should_compile/ds022.stderr
+++ b/ghc/tests/deSugar/should_compile/ds022.stderr
@@ -0,0 +1,5 @@
+ds022.hs:20:
+ Pattern match(es) are overlapped in the definition of function `i'
+ 1 1.1 = ...
+ 2 2.2 = ...
+
diff --git a/ghc/tests/deSugar/should_compile/ds023.stderr b/ghc/tests/deSugar/should_compile/ds023.stderr
index 955d1e1e9fe9a44c1af66933722020aa1919e389..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391 100644
--- a/ghc/tests/deSugar/should_compile/ds023.stderr
+++ b/ghc/tests/deSugar/should_compile/ds023.stderr
@@ -1,2 +0,0 @@
-
-NOTE: Simplifier still going after 4 iterations; bailing out.
diff --git a/ghc/tests/deSugar/should_compile/ds035.hs b/ghc/tests/deSugar/should_compile/ds035.hs
index ebe338ed08aa0a93cfb189bd0573c2331f895971..70721b7b2da67094117fd48de1a0533459b73bfb 100644
--- a/ghc/tests/deSugar/should_compile/ds035.hs
+++ b/ghc/tests/deSugar/should_compile/ds035.hs
@@ -1,6 +1,6 @@
module ShouldCompile where
-import GHC
+import GlaExts
data CList = CNil | CCons Int# CList
diff --git a/ghc/tests/deSugar/should_compile/ds040.stderr b/ghc/tests/deSugar/should_compile/ds040.stderr
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..60773af411d8a162d792c818c01c7583809e0ce8 100644
--- a/ghc/tests/deSugar/should_compile/ds040.stderr
+++ b/ghc/tests/deSugar/should_compile/ds040.stderr
@@ -0,0 +1,5 @@
+ds040.hs:7:
+ Pattern match(es) are overlapped
+ in the definition of function `^^^^'
+ _ _ = ...
+
diff --git a/ghc/tests/deriving/should_compile/drv003.stderr b/ghc/tests/deriving/should_compile/drv003.stderr
index 4e07ce6ecedc6f00d172b21f56ce516c49f53820..c1e0d4781294216dfae3608ab598f459cb405c05 100644
--- a/ghc/tests/deriving/should_compile/drv003.stderr
+++ b/ghc/tests/deriving/should_compile/drv003.stderr
@@ -1,6 +1,9 @@
-drv003.hs:15: Warning: no explicit method nor default method for `=='
- in an instance declaration for `Eq'
+drv003.hs:15: Warning:
+ No explicit method nor default method for `=='
+ in an instance declaration for `Eq'
-drv003.hs:12: Warning: no explicit method nor default method for `=='
- in an instance declaration for `Eq'
+drv003.hs:12: Warning:
+ No explicit method nor default method for `=='
+ in an instance declaration for `Eq'
+
diff --git a/ghc/tests/deriving/should_fail/drvfail004.stderr b/ghc/tests/deriving/should_fail/drvfail004.stderr
index 0359270fc7eb6190c5d99dbe8f23d87f8cdad1dd..a4a119f00d87b9d5a0b2f113d84c114b2880774b 100644
--- a/ghc/tests/deriving/should_fail/drvfail004.stderr
+++ b/ghc/tests/deriving/should_fail/drvfail004.stderr
@@ -1,6 +1,9 @@
-drvfail004.hs:5: No instance for: `Eq (Foo taFR taFS)'
- arising from an instance declaration at drvfail004.hs:5
- When checking superclass constraints of an instance declaration
+drvfail004.hs:5:
+ No instance for: `Eq (Foo a b)'
+ arising from an instance declaration, at drvfail004.hs:5
+ Available context: (Eq (Foo a b))
+ From the superclasses of the instance declaration
+
Compilation had errors
diff --git a/ghc/tests/deriving/should_fail/drvfail007.stderr b/ghc/tests/deriving/should_fail/drvfail007.stderr
index 29412dc1b53c73c1bb70ed84dad8e680e15527a7..98963de202ed95a5aaebc2a4d2f1a92bc6c2edd7 100644
--- a/ghc/tests/deriving/should_fail/drvfail007.stderr
+++ b/ghc/tests/deriving/should_fail/drvfail007.stderr
@@ -1,8 +1,6 @@
-drvfail007.hs:2: No instance for: `Eq (Int -> Int)'
- When deriving classes for `Foo'
-
-drvfail007.hs:2: No instance for: `Eq (Int -> Int)'
- When deriving classes for `Foo'
+drvfail007.hs:2:
+ No instance for: `Eq (Int -> Int)' When deriving classes for `Foo'
+
Compilation had errors
diff --git a/ghc/tests/io/should_run/io008.in b/ghc/tests/io/should_run/io008.in
new file mode 100644
index 0000000000000000000000000000000000000000..2e2537150ff35a3d8637c7beeeca47776361f43b
--- /dev/null
+++ b/ghc/tests/io/should_run/io008.in
@@ -0,0 +1,2 @@
+123456789*123456789*123456789*123456789*123456789*123456789*123456789*12
+ 1 2 3 4 5 6 7
diff --git a/ghc/tests/io/should_run/io013.in b/ghc/tests/io/should_run/io013.in
new file mode 100644
index 0000000000000000000000000000000000000000..e85d5b45283ac8eee1a921bba21554484a4d7de8
--- /dev/null
+++ b/ghc/tests/io/should_run/io013.in
@@ -0,0 +1 @@
+abcdefghijklmnopqrstuvwxyz
\ No newline at end of file
diff --git a/ghc/tests/io/should_run/io017.stdin b/ghc/tests/io/should_run/io017.stdin
new file mode 100644
index 0000000000000000000000000000000000000000..2510fcaec30744a29b25ecf9dbd5aa11bc73f589
--- /dev/null
+++ b/ghc/tests/io/should_run/io017.stdin
@@ -0,0 +1,2 @@
+42
+-7
diff --git a/ghc/tests/printing/should_compile/Print001.stderr b/ghc/tests/printing/should_compile/Print001.stderr
index cf1f04cfbb06397106fe480241dee4dd2ff8e360..560f2062d3757a942ab2cc4839dcd89779f4086b 100644
--- a/ghc/tests/printing/should_compile/Print001.stderr
+++ b/ghc/tests/printing/should_compile/Print001.stderr
@@ -1,46 +1,59 @@
+
==================== Typechecked ====================
-BarNil{-r8,x-}{i} = _/\_ a_tr4J -> BarNil{-r8,x-}{i} {_@_ a_tr4J}
-BarCon{-r7,x-}{i} =
- _/\_ a_tr4J -> \ tpl_B1 tpl_B2 ->
- BarCon{-r7,x-}{i} {_@_ a_tr4J tpl_B1 tpl_B2}
-MkFoo{-r4P,x-}{i} =
- _/\_ d_tr4L e_tr4M f_tr4N -> \ tpl_B1 tpl_B2 tpl_B3 ->
- MkFoo{-r4P,x-}{i}
- {_@_ d_tr4L _@_ e_tr4M _@_ f_tr4N tpl_B1 tpl_B2 tpl_B3}
-AbsBinds [ta10v, ta10w] [] [([ta10w, ta10v], g{-r4A,x-}, g_a11y)]
- g_a11y x_r4H = lit_a11z
+Print001.BarNil{-r8-} =
+ _/\_ a_tr51 -> Print001.BarNil{-r8-} {_@_ a_tr51}
+Print001.BarCon{-r7-} =
+ _/\_ a_tr51 -> \ tpl_B1 tpl_B2 ->
+ Print001.BarCon{-r7-} {_@_ a_tr51 tpl_B1 tpl_B2}
+Print001.MkFoo{-r57-} =
+ _/\_ d_tr53 e_tr54 f_tr55 -> \ tpl_B1 tpl_B2 tpl_B3 ->
+ Print001.MkFoo{-r57-} {_@_ d_tr53
+ _@_ e_tr54
+ _@_ f_tr55
+ tpl_B1
+ tpl_B2
+ tpl_B3}
+AbsBinds
+[a_ta12D, b_ta12F]
+[]
+[([a_ta12D, b_ta12F], Print001.g{-r4S-}, g_a13Q)]
+ g_a13Q x_r4Z = lit_a13S
AbsBinds
-[ta10J, ta10K, ta10L]
-[d.Eq_a10N, d.Ord_a10O, d.Ix_a10P]
-[([ta10J, ta10K, ta10L], f2{-r4z,x-}, f2_a11H)]
- f2_a11H x_r4F = x_r4F
+[a_ta12R, b_ta12T, c_ta12V]
+[d.Eq_a130, d.Ord_a131, d.Ix_a132]
+[([a_ta12R, b_ta12T, c_ta12V], Print001.f2{-r4R-}, f2_a13Z)]
+ f2_a13Z x_r4X = x_r4X
AbsBinds
-[ta10Z, ta110, ta111]
-[d.Eq_a113]
-[([ta10Z, ta110, ta111], f{-r4y,x-}, f_a11I)]
- f_a11I x_r4D = x_r4D
+[a_ta13b, b_ta13d, c_ta13f]
+[d.Eq_a13k]
+[([a_ta13b, b_ta13d, c_ta13f], Print001.f{-r4Q-}, f_a140)]
+ f_a140 x_r4V = x_r4V
AbsBinds
-[ta118, ta11a, ta11c]
+[a13o, a13q, a13s]
[]
-[([ta118, ta11a, ta11c], mkFoo{-r4B,x-}, mkFoo_a11J)]
- mkFoo_a11J = MkFoo{-r4P,x-}{i} [ta118, ta11a, ta11c]
-AbsBinds [ta11u] [] [([ta11u], $d1{-r11G,x-}, d.Eval_a11i)]
- d.Eval_a11i = ({-dict-} [] [])
+[([a13o, a13q, a13s], Print001.mkFoo{-r4T-}, mkFoo_a141)]
+ mkFoo_a141 = Print001.MkFoo{-r57-} [a13o, a13q, a13s]
AbsBinds
-[ta11v, ta11x, ta11w]
+[a_ta13M]
[]
-[([ta11v, ta11x, ta11w], $d2{-r11F,x-}, d.Eval_a11q)]
- d.Eval_a11q = ({-dict-} [] [])
-d.Fractional_a11t = PrelNum.$d23{-rE3,p-}
-fromRational_a11A =
- PrelNum.fromRational{-8U,p-} PrelBase.Float{-3c,W-}
- d.Fractional_a11t
-lit_a11z = fromRational_a11A 2.0
+[([a_ta13M], Print001.$d1{-r13Y-}, d.Eval_a13A)]
+ d.Eval_a13A = PrelBase.:Eval{-rR-} (Print001.Bar{-r56-} a_ta13M)
+AbsBinds
+[d_ta13N, e_ta13P, f_ta13O]
+[]
+[([d_ta13N, e_ta13P, f_ta13O], Print001.$d2{-r13X-}, d.Eval_a13I)]
+ d.Eval_a13I =
+ PrelBase.:Eval{-rR-} (Print001.Foo{-r58-} d_ta13N e_ta13P f_ta13O)
+lit_a13S = fromRational_a13R 2.0
+fromRational_a13R =
+ PrelNum.fromRational{-8U-} PrelBase.Float{-3c-} d.Fractional_a13L
+d.Fractional_a13L = PrelNum.$d23{-rF0-}
+
ghc: module version changed to 1; reason: no old .hi file
_interface_ Print001 1
_instance_modules_
-Addr ArrBase Foreign IO PrelBounded PrelNum
+IO PrelAddr PrelArr PrelBounded PrelCCall PrelForeign PrelNum
_usages_
Ix 1 :: $d3 1 $d4 1 $d5 1 $d6 1 $d7 1 $d8 1 $d9 1 Ix 1;
PrelBase 1 :: $d1 1 $d10 1 $d11 1 $d12 1 $d13 1 $d15 1 $d2 1 $d20 1 $d21 1 $d24 1 $d25 1 $d26 1 $d27 1 $d28 1 $d29 1 $d3 1 $d30 1 $d31 1 $d32 1 $d33 1 $d34 1 $d36 1 $d37 1 $d38 1 $d39 1 $d4 1 $d40 1 $d41 1 $d42 1 $d43 1 $d5 1 $d6 1 $d7 1 $d8 1 $d9 1 $m- 1 $m/= 1 $m< 1 $m<= 1 $m> 1 $m>= 1 $mcompare 1 $menumFromThenTo 1 $menumFromTo 1 $mfromInt 1 $mmax 1 $mmin 1 $mshowList 1 Enum 1 Eq 1 Eval 1 Num 1 Ord 1 Ordering 1 Show 1 String 1;
@@ -50,13 +63,13 @@ _exports_
Print001 f f2 g mkFoo Bar(BarNil BarCon) Foo(MkFoo);
_instances_
instance _forall_ [a] => {PrelBase.Eval (Bar a)} = $d1;
-instance _forall_ [d e f] => {PrelBase.Eval (Foo d e f)} = $d2;
+instance _forall_ [a b c] => {PrelBase.Eval (Foo a b c)} = $d2;
_declarations_
1 $d1 _:_ _forall_ [a] => {PrelBase.Eval (Bar a)} ;;
-1 $d2 _:_ _forall_ [d e f] => {PrelBase.Eval (Foo d e f)} ;;
+1 $d2 _:_ _forall_ [a b c] => {PrelBase.Eval (Foo a b c)} ;;
1 data Bar a = BarNil | BarCon (Foo a a a) (Bar a) ;
1 data Foo d e f = MkFoo [((d -> PrelBase.Int) -> d) -> e] (d -> e, e -> e) PrelBase.() ;
-1 f _:_ _forall_ [ta tb tc] {PrelBase.Eq ta} => (ta -> tb -> tc) -> ta -> tb -> tc ;;
-1 f2 _:_ _forall_ [ta tb tc] {PrelBase.Eq ta, PrelBase.Ord ta, Ix.Ix tc} => (ta -> tb -> tc) -> ta -> tb -> tc ;;
-1 g _:_ _forall_ [ta tb] => Foo PrelBase.Int (tb -> ta) (tb -> [(tb, PrelBase.Double, PrelBase.Int)]) -> PrelBase.Float ;;
-1 mkFoo _:_ _forall_ [ta tb tc] => [((ta -> PrelBase.Int) -> ta) -> tb] -> (ta -> tb, tb -> tb) -> PrelBase.() -> Foo ta tb tc ;;
+1 f _:_ _forall_ [a b c] {PrelBase.Eq a} => (a -> b -> c) -> a -> b -> c ;;
+1 f2 _:_ _forall_ [a b c] {PrelBase.Eq a, PrelBase.Ord a, Ix.Ix c} => (a -> b -> c) -> a -> b -> c ;;
+1 g _:_ _forall_ [a b] => Foo PrelBase.Int (a -> b) (a -> [(a, PrelBase.Double, PrelBase.Int)]) -> PrelBase.Float ;;
+1 mkFoo _:_ _forall_ [a b c] => [((a -> PrelBase.Int) -> a) -> b] -> (a -> b, b -> b) -> PrelBase.() -> Foo a b c ;;
diff --git a/ghc/tests/printing/should_compile/Print002.stderr b/ghc/tests/printing/should_compile/Print002.stderr
index 65e59e766192811f3ee8f2b4f1c40f5b35f39fb2..9643062929ce00b4876be247add0c8be622a6cd4 100644
--- a/ghc/tests/printing/should_compile/Print002.stderr
+++ b/ghc/tests/printing/should_compile/Print002.stderr
@@ -1,276 +1,304 @@
+
==================== Typechecked ====================
-MkFoo1{-rk,x-}{i} =
- _/\_ a_tr4k b_tr4l c_tr4m -> \ tpl_B1 tpl_B2 ->
- MkFoo1{-rk,x-}{i} {_@_ a_tr4k _@_ b_tr4l _@_ c_tr4m tpl_B1 tpl_B2}
-:##{-rj,x-}{i} =
- _/\_ a_tr4k b_tr4l c_tr4m -> \ tpl_B1 tpl_B2 ->
- :##{-rj,x-}{i} {_@_ a_tr4k _@_ b_tr4l _@_ c_tr4m tpl_B1 tpl_B2}
-MkFoo3{-rm,x-}{i} =
- _/\_ a_tr4k b_tr4l c_tr4m -> \ tpl_B1 tpl_B2 ->
- MkFoo3{-rm,x-}{i} {_@_ a_tr4k _@_ b_tr4l _@_ c_tr4m tpl_B1 tpl_B2}
-:***{-ro,x-}{i} =
- _/\_ a_tr4k b_tr4l c_tr4m -> \ tpl_B1 tpl_B2 ->
- :***{-ro,x-}{i} {_@_ a_tr4k _@_ b_tr4l _@_ c_tr4m tpl_B1 tpl_B2}
-AbsBinds [taHU] [d.Bar_aHX] [([taHU], f3d{-r4o,x-}, f3d_aTh)]
- /////_aTi = /////{-r4B,x-} taHU d.Bar_aHX
- f3d_aTh x_r48 y_r49 = x_r48 /////_aTi y_r49
-AbsBinds [taIe] [d.Bar_aIh] [([taIe], f3c{-r4p,x-}, f3c_aTn)]
- /////_aTo = /////{-r4B,x-} taIe d.Bar_aIh
- f3c_aTn x_r45 y_r46 = /////_aTo x_r45 y_r46
-AbsBinds [taIy] [d.Bar_aIB] [([taIy], f3b{-r4q,x-}, f3b_aTp)]
- meth1_aTq = meth1{-r4C,x-} taIy d.Bar_aIB
- f3b_aTp x_r42 y_r43 = x_r42 meth1_aTq y_r43
-AbsBinds [taIS] [d.Bar_aIV] [([taIS], f3a{-r4r,x-}, f3a_aTr)]
- meth1_aTs = meth1{-r4C,x-} taIS d.Bar_aIV
- f3a_aTr x_r3Z y_r40 = meth1_aTs x_r3Z y_r40
+Print002.MkFoo1{-ro-} =
+ _/\_ a_tr4E b_tr4F c_tr4G -> \ tpl_B1 tpl_B2 ->
+ Print002.MkFoo1{-ro-} {_@_ a_tr4E
+ _@_ b_tr4F
+ _@_ c_tr4G
+ tpl_B1
+ tpl_B2}
+Print002.:##{-rn-} =
+ _/\_ a_tr4E b_tr4F c_tr4G -> \ tpl_B1 tpl_B2 ->
+ Print002.:##{-rn-} {_@_ a_tr4E _@_ b_tr4F _@_ c_tr4G tpl_B1 tpl_B2}
+Print002.MkFoo3{-rq-} =
+ _/\_ a_tr4E b_tr4F c_tr4G -> \ tpl_B1 tpl_B2 ->
+ Print002.MkFoo3{-rq-} {_@_ a_tr4E
+ _@_ b_tr4F
+ _@_ c_tr4G
+ tpl_B1
+ tpl_B2}
+Print002.:***{-rs-} =
+ _/\_ a_tr4E b_tr4F c_tr4G -> \ tpl_B1 tpl_B2 ->
+ Print002.:***{-rs-} {_@_ a_tr4E
+ _@_ b_tr4F
+ _@_ c_tr4G
+ tpl_B1
+ tpl_B2}
+AbsBinds [aK9] [d.Bar_aKd] [([aK9], Print002.f3d{-r4I-}, f3d_aWS)]
+ /////_aWT = Print002./////{-r4X-} aK9 d.Bar_aKd
+ f3d_aWS x_r4s y_r4t = x_r4s /////_aWT y_r4t
+AbsBinds [aKu] [d.Bar_aKy] [([aKu], Print002.f3c{-r4J-}, f3c_aWY)]
+ /////_aWZ = Print002./////{-r4X-} aKu d.Bar_aKy
+ f3c_aWY x_r4p y_r4q = /////_aWZ x_r4p y_r4q
+AbsBinds [aKP] [d.Bar_aKT] [([aKP], Print002.f3b{-r4K-}, f3b_aX0)]
+ meth1_aX1 = Print002.meth1{-r4Y-} aKP d.Bar_aKT
+ f3b_aX0 x_r4m y_r4n = x_r4m meth1_aX1 y_r4n
+AbsBinds [aLa] [d.Bar_aLe] [([aLa], Print002.f3a{-r4L-}, f3a_aX2)]
+ meth1_aX3 = Print002.meth1{-r4Y-} aLa d.Bar_aLe
+ f3a_aX2 x_r4j y_r4k = meth1_aX3 x_r4j y_r4k
AbsBinds
-[taJm, taJo, taJq]
+[aLF, aLH, aLJ]
[]
-[([taJm, taJo, taJq], <<<<{-r4s,x-}, <<<<_aTt)]
- <<<<_aTt x_r3T y_r3U
- = :***{-ro,x-}{i} [taJm, taJo, taJq] x_r3T y_r3U
- <<<<_aTt x_r3W y_r3X
- = :***{-ro,x-}{i} [taJm, taJo, taJq] x_r3W y_r3X
+[([aLF, aLH, aLJ], Print002.<<<<{-r4M-}, <<<<_aX4)]
+ <<<<_aX4 x_r4d y_r4e
+ = Print002.:***{-rs-} [aLF, aLH, aLJ] x_r4d y_r4e
+ <<<<_aX4 x_r4g y_r4h
+ = Print002.:***{-rs-} [aLF, aLH, aLJ] x_r4g y_r4h
AbsBinds
-[taJH, taJJ, taJL]
+[aM0, aM2, aM4]
[]
-[([taJH, taJJ, taJL], .....{-r4t,x-}, ....._aTu)]
- ....._aTu x_r3Q y_r3R
- = MkFoo3{-rm,x-}{i} [taJH, taJJ, taJL] x_r3Q y_r3R
+[([aM0, aM2, aM4], Print002......{-r4N-}, ....._aX5)]
+ ....._aX5 x_r4a y_r4b
+ = Print002.MkFoo3{-rq-} [aM0, aM2, aM4] x_r4a y_r4b
AbsBinds
-[taK2, taK4, taK6]
+[aMl, aMn, aMp]
[]
-[([taK2, taK4, taK6], ....{-r4u,x-}, ...._aTv)]
- ...._aTv x_r3N y_r3O
- = MkFoo3{-rm,x-}{i} [taK2, taK4, taK6] x_r3N y_r3O
+[([aMl, aMn, aMp], Print002.....{-r4O-}, ...._aX6)]
+ ...._aX6 x_r47 y_r48
+ = Print002.MkFoo3{-rq-} [aMl, aMn, aMp] x_r47 y_r48
AbsBinds
-[taKn, taKp, taKr]
+[aMG, aMI, aMK]
[]
-[([taKn, taKp, taKr], f2a{-r4v,x-}, f2a_aTw)]
- f2a_aTw x_r3K y_r3L = :##{-rj,x-}{i} [taKn, taKp, taKr] x_r3K y_r3L
+[([aMG, aMI, aMK], Print002.f2a{-r4P-}, f2a_aX7)]
+ f2a_aX7 x_r44 y_r45
+ = Print002.:##{-rn-} [aMG, aMI, aMK] x_r44 y_r45
AbsBinds
-[taKI, taKK, taKM]
+[aN1, aN3, aN5]
[]
-[([taKI, taKK, taKM], f2{-r4w,x-}, f2_aTx)]
- f2_aTx x_r3H y_r3I = :##{-rj,x-}{i} [taKI, taKK, taKM] x_r3H y_r3I
+[([aN1, aN3, aN5], Print002.f2{-r4Q-}, f2_aX8)]
+ f2_aX8 x_r41 y_r42 = Print002.:##{-rn-} [aN1, aN3, aN5] x_r41 y_r42
AbsBinds
-[taL3, taL5, taL7]
+[aNm, aNo, aNq]
[]
-[([taL3, taL5, taL7], f1a{-r4x,x-}, f1a_aTy)]
- f1a_aTy x_r3E y_r3F
- = MkFoo1{-rk,x-}{i} [taL3, taL5, taL7] x_r3E y_r3F
+[([aNm, aNo, aNq], Print002.f1a{-r4R-}, f1a_aX9)]
+ f1a_aX9 x_r3Y y_r3Z
+ = Print002.MkFoo1{-ro-} [aNm, aNo, aNq] x_r3Y y_r3Z
AbsBinds
-[taLo, taLq, taLs]
+[aNH, aNJ, aNL]
[]
-[([taLo, taLq, taLs], f1{-r4y,x-}, f1_aTz)]
- f1_aTz x_r3B y_r3C
- = MkFoo1{-rk,x-}{i} [taLo, taLq, taLs] x_r3B y_r3C
+[([aNH, aNJ, aNL], Print002.f1{-r4S-}, f1_aXa)]
+ f1_aXa x_r3V y_r3W
+ = Print002.MkFoo1{-ro-} [aNH, aNJ, aNL] x_r3V y_r3W
AbsBinds
-[taM9, taMc, taMd]
+[aOs, aOv, aOw]
[]
-[([taM9, taMc, taMd], con2tag_Foo#_rF7, con2tag_Foo#_aTA)]
- con2tag_Foo#_aTA (MkFoo1{-rk,x-}{i} _ _) = 0#
- con2tag_Foo#_aTA (:##{-rj,x-}{i} _ _) = 1#
- con2tag_Foo#_aTA (MkFoo3{-rm,x-}{i} _ _) = 2#
- con2tag_Foo#_aTA (:***{-ro,x-}{i} _ _) = 3#
+[([aOs, aOv, aOw], con2tag_Foo#_rHm, con2tag_Foo#_aXb)]
+ con2tag_Foo#_aXb (Print002.MkFoo1{-ro-} _ _) = 0#
+ con2tag_Foo#_aXb (Print002.:##{-rn-} _ _) = 1#
+ con2tag_Foo#_aXb (Print002.MkFoo3{-rq-} _ _) = 2#
+ con2tag_Foo#_aXb (Print002.:***{-rs-} _ _) = 3#
AbsBinds
-[taMv, taMy, taMB]
-[d.Eq_aOm, d.Eq_aOn, d.Eq_aOo]
-[([taMv, taMy, taMB], $d1{-rTm,x-}, d.Eq_aMl)]
- d.Eq_aOs = d.Eq_aOm
- ==_aTG = PrelBase.=={-8Z,p-} taMv d.Eq_aOs
- d.Eq_aOu = d.Eq_aOn
- ==_aTF = PrelBase.=={-8Z,p-} taMy d.Eq_aOu
- d.Eq_aOw = d.Eq_aOo
- ==_aTE = PrelBase.=={-8Z,p-} taMB d.Eq_aOw
- ==_aTD = ==_aTC
- AbsBinds [] [] [([], ==_aTC, ==_aTH)]
- ==_aTM = ==_aTG
- ==_aTL = ==_aTF
- ==_aTK = ==_aTF
- ==_aTJ = ==_aTE
- ==_aTI = ==_aTE
- ==_aTH (MkFoo1{-rk,x-}{i} a1_rFg a2_rFh)
- (MkFoo1{-rk,x-}{i} b1_rFi b2_rFj)
- = (a1_rFg ==_aTG b1_rFi)
- PrelBase.&&{-rfg,p-} (a2_rFh ==_aTM b2_rFj)
- ==_aTH (:##{-rj,x-}{i} a1_rFl a2_rFm)
- (:##{-rj,x-}{i} b1_rFn b2_rFo)
- = (a1_rFl ==_aTF b1_rFn)
- PrelBase.&&{-rfg,p-} (a2_rFm ==_aTE b2_rFo)
- ==_aTH (MkFoo3{-rm,x-}{i} a1_rFq a2_rFr)
- (MkFoo3{-rm,x-}{i} b1_rFs b2_rFt)
- = (a1_rFq ==_aTL b1_rFs)
- PrelBase.&&{-rfg,p-} (a2_rFr ==_aTK b2_rFt)
- ==_aTH (:***{-ro,x-}{i} a1_rFv a2_rFw)
- (:***{-ro,x-}{i} b1_rFx b2_rFy)
- = (a1_rFv ==_aTJ b1_rFx)
- PrelBase.&&{-rfg,p-} (a2_rFw ==_aTI b2_rFy)
- ==_aTH a_rFA b_rFB = PrelBase.False{-58,w-}{i}
- AbsBinds [] [] [([], /=_aTB, /=_aTN)]
- /=_aTN a_rFF b_rFG = PrelBase.not{-rga,p-} ==_aTD a_rFF b_rFG
- d.Eq_aMl = ({-dict-} [] [==_aTC, /=_aTB])
+[a_taOO, b_taOR, c_taOU]
+[d.Eq_aQV, d.Eq_aQW, d.Eq_aQX]
+[([a_taOO, b_taOR, c_taOU], Print002.$d1{-rWX-}, d.Eq_aOE)]
+ ==_aWw = ==_aWx
+ ==_aWu = PrelBase.=={-8Z-} c_taOU d.Eq_aR3
+ ==_aWv = ==_aWu
+ ==_aWt = ==_aWu
+ ==_aWr = PrelBase.=={-8Z-} b_taOR d.Eq_aR5
+ ==_aWs = ==_aWr
+ ==_aWq = ==_aWr
+ ==_aWp = PrelBase.=={-8Z-} a_taOO d.Eq_aR7
+ ==_aWo = ==_aWp
+ d.Eq_aR3 = d.Eq_aQX
+ d.Eq_aR5 = d.Eq_aQW
+ d.Eq_aR7 = d.Eq_aQV
+ AbsBinds [] [] [([], ==_aWx, ==_aXd)]
+ ==_aXd (Print002.MkFoo1{-ro-} a1_rHv a2_rHw)
+ (Print002.MkFoo1{-ro-} b1_rHx b2_rHy)
+ = (a1_rHv ==_aWp b1_rHx) PrelBase.&&{-rfL-} (a2_rHw ==_aWo b2_rHy)
+ ==_aXd (Print002.:##{-rn-} a1_rHA a2_rHB)
+ (Print002.:##{-rn-} b1_rHC b2_rHD)
+ = (a1_rHA ==_aWq b1_rHC) PrelBase.&&{-rfL-} (a2_rHB ==_aWt b2_rHD)
+ ==_aXd (Print002.MkFoo3{-rq-} a1_rHF a2_rHG)
+ (Print002.MkFoo3{-rq-} b1_rHH b2_rHI)
+ = (a1_rHF ==_aWr b1_rHH) PrelBase.&&{-rfL-} (a2_rHG ==_aWs b2_rHI)
+ ==_aXd (Print002.:***{-rs-} a1_rHK a2_rHL)
+ (Print002.:***{-rs-} b1_rHM b2_rHN)
+ = (a1_rHK ==_aWu b1_rHM) PrelBase.&&{-rfL-} (a2_rHL ==_aWv b2_rHN)
+ ==_aXd a_rHP b_rHQ = PrelBase.False{-58-}
+ AbsBinds [] [] [([], /=_aXc, /=_aXe)]
+ /=_aXe a_rHU b_rHV = PrelBase.not{-rgT-} ==_aWw a_rHU b_rHV
+ d.Eq_aOE =
+ PrelBase.:Eq{-r16-}
+ (Print002.Foo{-r51-} a_taOO b_taOR c_taOU) ==_aWx /=_aXc
AbsBinds
-[taTc, taTe, taTd]
+[a_taWy, b_taWA, c_taWz]
[]
-[([taTc, taTe, taTd], $d2{-rTl,x-}, d.Eval_aOH)]
- d.Eval_aOH = ({-dict-} [] [])
+[([a_taWy, b_taWA, c_taWz], Print002.$d2{-rWW-}, d.Eval_aRi)]
+ d.Eval_aRi =
+ PrelBase.:Eval{-r19-} (Print002.Foo{-r51-} a_taWy b_taWA c_taWz)
AbsBinds
-[taOV, taOW, taOX]
-[d.Ord_aSP, d.Ord_aSQ, d.Ord_aSR, d.Eq_aSS]
-[([taOV, taOW, taOX], $d3{-rTk,x-}, d.Ord_aOP)]
- d.Eq_aST = d.Eq_aSS
- d.Ord_aRD = d.Ord_aSP
- d.Ord_aRE = d.Ord_aSQ
- d.Ord_aRF = d.Ord_aSR
- compare_aU0 = compare_aTU
- compare_aTZ = compare_aTU
- compare_aTY = compare_aTU
- compare_aTX = compare_aTU
- compare_aTW = compare_aTU
- compare_aTV = compare_aTU
- AbsBinds [] [] [([], compare_aTU, compare_aU1)]
- compare_aU1 a_rGy b_rGz
- = case con2tag_Foo#_rF7 [taOX, taOV, taOW] a_rGy of
- a#_rHm
- -> case con2tag_Foo#_rF7 [taOX, taOV, taOW] b_rGz of
- b#_rHo
- -> if a#_rHm GHC.==#{-79,w-}{I} b#_rHo then
- case cmp_eq_aU2 a_rGy b_rGz of
- PrelBase.LT{-ram,p-}{i} -> PrelBase.LT{-ram,p-}{i}
- PrelBase.EQ{-r4n,p-}{i} -> PrelBase.EQ{-r4n,p-}{i}
- PrelBase.GT{-ran,p-}{i} -> PrelBase.GT{-ran,p-}{i}
+[a_taRr, b_taRs, c_taRt]
+[d.Ord_aVR, d.Ord_aVT, d.Ord_aVU, d.Eq_aVV]
+[([a_taRr, b_taRs, c_taRt], Print002.$d3{-rWV-}, d.Ord_aRq)]
+ compare_aWH = compare_aWC
+ compare_aWG = compare_aWC
+ compare_aWF = compare_aWC
+ compare_aWE = compare_aWC
+ compare_aWD = compare_aWC
+ compare_aWB = compare_aWC
+ d.Ord_aUw = d.Ord_aVU
+ d.Ord_aUv = d.Ord_aVT
+ d.Ord_aUx = d.Ord_aVR
+ d.Eq_aVS = d.Eq_aVV
+ AbsBinds [] [] [([], compare_aWC, compare_aXl)]
+ compare_aXl a_rIN b_rIO
+ = case con2tag_Foo#_rHm [c_taRt, a_taRr, b_taRs] a_rIN of
+ a#_rJB
+ -> case con2tag_Foo#_rHm [c_taRt, a_taRr, b_taRs] b_rIO of
+ b#_rJD
+ -> if a#_rJB PrelGHC.==#{-79-} b#_rJD then
+ case cmp_eq_aXm a_rIN b_rIO of
+ PrelBase.LT{-raU-} -> PrelBase.LT{-raU-}
+ PrelBase.EQ{-r4H-} -> PrelBase.EQ{-r4H-}
+ PrelBase.GT{-raV-} -> PrelBase.GT{-raV-}
else
- if a#_rHm GHC.<#{-7b,w-}{I} b#_rHo then
- PrelBase.LT{-ram,p-}{i}
+ if a#_rJB PrelGHC.<#{-7b-} b#_rJD then
+ PrelBase.LT{-raU-}
else
- PrelBase.GT{-ran,p-}{i}
+ PrelBase.GT{-raV-}
where
- {- nonrec -}
+ {- rec -}
AbsBinds
- [taQP, taQQ, taQX]
- [d.Ord_aR5, d.Ord_aR7, d.Ord_aR9]
- [([taQP, taQQ, taQX], cmp_eq_rGB, cmp_eq_aU3)]
- compare_aUb = PrelBase.compare{-rft,p-} taQP d.Ord_aR5
- compare_aUa = compare_aUb
- compare_aU9 = PrelBase.compare{-rft,p-} taQQ d.Ord_aR7
- compare_aU8 = PrelBase.compare{-rft,p-} taQX d.Ord_aR9
- compare_aU7 = compare_aU9
- compare_aU6 = compare_aU9
- compare_aU5 = compare_aU8
- compare_aU4 = compare_aU8
- cmp_eq_aU3 (MkFoo1{-rk,x-}{i} a1_rGD a2_rGE)
- (MkFoo1{-rk,x-}{i} b1_rGF b2_rGG)
- = case compare_aUb a1_rGD b1_rGF of
- PrelBase.LT{-ram,p-}{i} -> PrelBase.LT{-ram,p-}{i}
- PrelBase.EQ{-r4n,p-}{i}
- -> case compare_aUa a2_rGE b2_rGG of
- PrelBase.LT{-ram,p-}{i} -> PrelBase.LT{-ram,p-}{i}
- PrelBase.EQ{-r4n,p-}{i} -> PrelBase.EQ{-r4n,p-}{i}
- PrelBase.GT{-ran,p-}{i} -> PrelBase.GT{-ran,p-}{i}
- PrelBase.GT{-ran,p-}{i} -> PrelBase.GT{-ran,p-}{i}
- cmp_eq_aU3 (:##{-rj,x-}{i} a1_rGO a2_rGP)
- (:##{-rj,x-}{i} b1_rGQ b2_rGR)
- = case compare_aU9 a1_rGO b1_rGQ of
- PrelBase.LT{-ram,p-}{i} -> PrelBase.LT{-ram,p-}{i}
- PrelBase.EQ{-r4n,p-}{i}
- -> case compare_aU8 a2_rGP b2_rGR of
- PrelBase.LT{-ram,p-}{i} -> PrelBase.LT{-ram,p-}{i}
- PrelBase.EQ{-r4n,p-}{i} -> PrelBase.EQ{-r4n,p-}{i}
- PrelBase.GT{-ran,p-}{i} -> PrelBase.GT{-ran,p-}{i}
- PrelBase.GT{-ran,p-}{i} -> PrelBase.GT{-ran,p-}{i}
- cmp_eq_aU3 (MkFoo3{-rm,x-}{i} a1_rGZ a2_rH0)
- (MkFoo3{-rm,x-}{i} b1_rH1 b2_rH2)
- = case compare_aU7 a1_rGZ b1_rH1 of
- PrelBase.LT{-ram,p-}{i} -> PrelBase.LT{-ram,p-}{i}
- PrelBase.EQ{-r4n,p-}{i}
- -> case compare_aU6 a2_rH0 b2_rH2 of
- PrelBase.LT{-ram,p-}{i} -> PrelBase.LT{-ram,p-}{i}
- PrelBase.EQ{-r4n,p-}{i} -> PrelBase.EQ{-r4n,p-}{i}
- PrelBase.GT{-ran,p-}{i} -> PrelBase.GT{-ran,p-}{i}
- PrelBase.GT{-ran,p-}{i} -> PrelBase.GT{-ran,p-}{i}
- cmp_eq_aU3 (:***{-ro,x-}{i} a1_rHa a2_rHb)
- (:***{-ro,x-}{i} b1_rHc b2_rHd)
- = case compare_aU5 a1_rHa b1_rHc of
- PrelBase.LT{-ram,p-}{i} -> PrelBase.LT{-ram,p-}{i}
- PrelBase.EQ{-r4n,p-}{i}
- -> case compare_aU4 a2_rHb b2_rHd of
- PrelBase.LT{-ram,p-}{i} -> PrelBase.LT{-ram,p-}{i}
- PrelBase.EQ{-r4n,p-}{i} -> PrelBase.EQ{-r4n,p-}{i}
- PrelBase.GT{-ran,p-}{i} -> PrelBase.GT{-ran,p-}{i}
- PrelBase.GT{-ran,p-}{i} -> PrelBase.GT{-ran,p-}{i}
- cmp_eq_aU3 _ _
- = Error.error{-87,w-}
- PrelBase.Ordering{-3n,p-} "Urk! in TcGenDeriv"
- {- nonrec -}
- cmp_eq_aU2 =
- cmp_eq_rGB [taOV, taOW, taOX] [d.Ord_aRD, d.Ord_aRE, d.Ord_aRF]
- {- nonrec -}
- AbsBinds [] [] [([], <_aTT, <_aUc)]
- <_aUc a_rFM b_rFN
- = case compare_aU0 a_rFM b_rFN of
- PrelBase.LT{-ram,p-}{i} -> PrelBase.True{-5E,w-}{i}
- PrelBase.EQ{-r4n,p-}{i} -> PrelBase.False{-58,w-}{i}
- PrelBase.GT{-ran,p-}{i} -> PrelBase.False{-58,w-}{i}
- AbsBinds [] [] [([], <=_aTS, <=_aUd)]
- <=_aUd a_rFU b_rFV
- = case compare_aTZ a_rFU b_rFV of
- PrelBase.LT{-ram,p-}{i} -> PrelBase.True{-5E,w-}{i}
- PrelBase.EQ{-r4n,p-}{i} -> PrelBase.True{-5E,w-}{i}
- PrelBase.GT{-ran,p-}{i} -> PrelBase.False{-58,w-}{i}
- AbsBinds [] [] [([], >=_aTR, >=_aUe)]
- >=_aUe a_rG2 b_rG3
- = case compare_aTY a_rG2 b_rG3 of
- PrelBase.LT{-ram,p-}{i} -> PrelBase.False{-58,w-}{i}
- PrelBase.EQ{-r4n,p-}{i} -> PrelBase.True{-5E,w-}{i}
- PrelBase.GT{-ran,p-}{i} -> PrelBase.True{-5E,w-}{i}
- AbsBinds [] [] [([], >_aTQ, >_aUf)]
- >_aUf a_rGa b_rGb
- = case compare_aTX a_rGa b_rGb of
- PrelBase.LT{-ram,p-}{i} -> PrelBase.False{-58,w-}{i}
- PrelBase.EQ{-r4n,p-}{i} -> PrelBase.False{-58,w-}{i}
- PrelBase.GT{-ran,p-}{i} -> PrelBase.True{-5E,w-}{i}
- AbsBinds [] [] [([], max_aTP, max_aUg)]
- max_aUg a_rGi b_rGj
- = case compare_aTW a_rGi b_rGj of
- PrelBase.LT{-ram,p-}{i} -> b_rGj
- PrelBase.EQ{-r4n,p-}{i} -> a_rGi
- PrelBase.GT{-ran,p-}{i} -> a_rGi
- AbsBinds [] [] [([], min_aTO, min_aUh)]
- min_aUh a_rGq b_rGr
- = case compare_aTV a_rGq b_rGr of
- PrelBase.LT{-ram,p-}{i} -> a_rGq
- PrelBase.EQ{-r4n,p-}{i} -> b_rGr
- PrelBase.GT{-ran,p-}{i} -> b_rGr
- d.Ord_aOP =
- ({-dict-}
- [d.Eq_aST]
- [compare_aTU, <_aTT, <=_aTS, >=_aTR, >_aTQ, max_aTP, min_aTO])
-scsel_Bar2Print002Bar{-aTj,x-} = _/\_ t12 -> \ tpl_B1 -> tpl_B1
-AbsBinds [taTf] [d.Bar2_aT8] []
-meth1{-r4C,x-} =
- _/\_ t12 -> \ tpl_B1 ->
- case tpl_B1 of { PrelTup.(,,){-63,w-}{i} tpl_B1 tpl_B2 tpl_B3 ->
- tpl_B1;}
-/////{-r4B,x-} =
- _/\_ t12 -> \ tpl_B1 ->
- case tpl_B1 of { PrelTup.(,,){-63,w-}{i} tpl_B1 tpl_B2 tpl_B3 ->
+ [aTz, aTA, aTH]
+ [d.Ord_aTY, d.Ord_aTV, d.Ord_aTS]
+ [([aTz, aTA, aTH], cmp_eq_rIQ, cmp_eq_aXn)]
+ compare_aWO = PrelBase.compare{-rgg-} aTH d.Ord_aTV
+ compare_aWP = compare_aWO
+ compare_aWN = compare_aWO
+ compare_aWL = PrelBase.compare{-rgg-} aTA d.Ord_aTY
+ compare_aWM = compare_aWL
+ compare_aWK = compare_aWL
+ compare_aWJ = PrelBase.compare{-rgg-} aTz d.Ord_aTS
+ compare_aWI = compare_aWJ
+ cmp_eq_aXn (Print002.MkFoo1{-ro-} a1_rIS a2_rIT)
+ (Print002.MkFoo1{-ro-} b1_rIU b2_rIV)
+ = case compare_aWI a1_rIS b1_rIU of
+ PrelBase.LT{-raU-} -> PrelBase.LT{-raU-}
+ PrelBase.EQ{-r4H-}
+ -> case compare_aWJ a2_rIT b2_rIV of
+ PrelBase.LT{-raU-} -> PrelBase.LT{-raU-}
+ PrelBase.EQ{-r4H-} -> PrelBase.EQ{-r4H-}
+ PrelBase.GT{-raV-} -> PrelBase.GT{-raV-}
+ PrelBase.GT{-raV-} -> PrelBase.GT{-raV-}
+ cmp_eq_aXn (Print002.:##{-rn-} a1_rJ3 a2_rJ4)
+ (Print002.:##{-rn-} b1_rJ5 b2_rJ6)
+ = case compare_aWL a1_rJ3 b1_rJ5 of
+ PrelBase.LT{-raU-} -> PrelBase.LT{-raU-}
+ PrelBase.EQ{-r4H-}
+ -> case compare_aWO a2_rJ4 b2_rJ6 of
+ PrelBase.LT{-raU-} -> PrelBase.LT{-raU-}
+ PrelBase.EQ{-r4H-} -> PrelBase.EQ{-r4H-}
+ PrelBase.GT{-raV-} -> PrelBase.GT{-raV-}
+ PrelBase.GT{-raV-} -> PrelBase.GT{-raV-}
+ cmp_eq_aXn (Print002.MkFoo3{-rq-} a1_rJe a2_rJf)
+ (Print002.MkFoo3{-rq-} b1_rJg b2_rJh)
+ = case compare_aWK a1_rJe b1_rJg of
+ PrelBase.LT{-raU-} -> PrelBase.LT{-raU-}
+ PrelBase.EQ{-r4H-}
+ -> case compare_aWM a2_rJf b2_rJh of
+ PrelBase.LT{-raU-} -> PrelBase.LT{-raU-}
+ PrelBase.EQ{-r4H-} -> PrelBase.EQ{-r4H-}
+ PrelBase.GT{-raV-} -> PrelBase.GT{-raV-}
+ PrelBase.GT{-raV-} -> PrelBase.GT{-raV-}
+ cmp_eq_aXn (Print002.:***{-rs-} a1_rJp a2_rJq)
+ (Print002.:***{-rs-} b1_rJr b2_rJs)
+ = case compare_aWN a1_rJp b1_rJr of
+ PrelBase.LT{-raU-} -> PrelBase.LT{-raU-}
+ PrelBase.EQ{-r4H-}
+ -> case compare_aWP a2_rJq b2_rJs of
+ PrelBase.LT{-raU-} -> PrelBase.LT{-raU-}
+ PrelBase.EQ{-r4H-} -> PrelBase.EQ{-r4H-}
+ PrelBase.GT{-raV-} -> PrelBase.GT{-raV-}
+ PrelBase.GT{-raV-} -> PrelBase.GT{-raV-}
+ cmp_eq_aXn _ _
+ = PrelErr.error{-87-}
+ PrelBase.Ordering{-3n-} "Urk! in TcGenDeriv"
+ cmp_eq_aXm =
+ cmp_eq_rIQ [a_taRr, b_taRs, c_taRt]
+ [d.Ord_aUv, d.Ord_aUw, d.Ord_aUx]
+ AbsBinds [] [] [([], <_aXk, <_aXo)]
+ <_aXo a_rI1 b_rI2
+ = case compare_aWH a_rI1 b_rI2 of
+ PrelBase.LT{-raU-} -> PrelBase.True{-5E-}
+ PrelBase.EQ{-r4H-} -> PrelBase.False{-58-}
+ PrelBase.GT{-raV-} -> PrelBase.False{-58-}
+ AbsBinds [] [] [([], <=_aXj, <=_aXp)]
+ <=_aXp a_rI9 b_rIa
+ = case compare_aWG a_rI9 b_rIa of
+ PrelBase.LT{-raU-} -> PrelBase.True{-5E-}
+ PrelBase.EQ{-r4H-} -> PrelBase.True{-5E-}
+ PrelBase.GT{-raV-} -> PrelBase.False{-58-}
+ AbsBinds [] [] [([], >=_aXi, >=_aXq)]
+ >=_aXq a_rIh b_rIi
+ = case compare_aWF a_rIh b_rIi of
+ PrelBase.LT{-raU-} -> PrelBase.False{-58-}
+ PrelBase.EQ{-r4H-} -> PrelBase.True{-5E-}
+ PrelBase.GT{-raV-} -> PrelBase.True{-5E-}
+ AbsBinds [] [] [([], >_aXh, >_aXr)]
+ >_aXr a_rIp b_rIq
+ = case compare_aWE a_rIp b_rIq of
+ PrelBase.LT{-raU-} -> PrelBase.False{-58-}
+ PrelBase.EQ{-r4H-} -> PrelBase.False{-58-}
+ PrelBase.GT{-raV-} -> PrelBase.True{-5E-}
+ AbsBinds [] [] [([], max_aXg, max_aXs)]
+ max_aXs a_rIx b_rIy
+ = case compare_aWD a_rIx b_rIy of
+ PrelBase.LT{-raU-} -> b_rIy
+ PrelBase.EQ{-r4H-} -> a_rIx
+ PrelBase.GT{-raV-} -> a_rIx
+ AbsBinds [] [] [([], min_aXf, min_aXt)]
+ min_aXt a_rIF b_rIG
+ = case compare_aWB a_rIF b_rIG of
+ PrelBase.LT{-raU-} -> a_rIF
+ PrelBase.EQ{-r4H-} -> b_rIG
+ PrelBase.GT{-raV-} -> b_rIG
+ d.Ord_aRq =
+ PrelBase.:Ord{-r1n-}
+ (Print002.Foo{-r51-} a_taRr b_taRs c_taRt) d.Eq_aVS
+ compare_aWC
+ <_aXk
+ <=_aXj
+ >=_aXi
+ >_aXh
+ max_aXg
+ min_aXf
+Print002.scsel_Bar2Print002Bar{-aWU-} =
+ _/\_ a_tr4v -> \ tpl_B1 ->
+ _coerce_out_ Print002.:Bar2{-r4U-}
+ {Print002.Bar{-r4w-} a_tr4v}
+ tpl_B1
+AbsBinds [a_taWQ] [d.Bar2_aWj] []
+Print002.meth1{-r4Y-} =
+ _/\_ a_tr4y -> \ tpl_B1 ->
+ case tpl_B1 of { Print002.:Bar{-r50-} tpl_B2 tpl_B3 tpl_B4 ->
tpl_B2;}
-meth2{-r4A,x-} =
- _/\_ t12 -> \ tpl_B1 ->
- case tpl_B1 of { PrelTup.(,,){-63,w-}{i} tpl_B1 tpl_B2 tpl_B3 ->
+Print002./////{-r4X-} =
+ _/\_ a_tr4y -> \ tpl_B1 ->
+ case tpl_B1 of { Print002.:Bar{-r50-} tpl_B2 tpl_B3 tpl_B4 ->
tpl_B3;}
-AbsBinds [taTg] [d.Bar_aTb] []
+Print002.meth2{-r4W-} =
+ _/\_ a_tr4y -> \ tpl_B1 ->
+ case tpl_B1 of { Print002.:Bar{-r50-} tpl_B2 tpl_B3 tpl_B4 ->
+ tpl_B4;}
+AbsBinds [a_taWR] [d.Bar_aWn] []
+
+
+Print002.hs:34:
+ Pattern match(es) are overlapped
+ in the definition of function `<<<<'
+ x y = ...
ghc: module version changed to 1; reason: no old .hi file
_interface_ Print002 1
_instance_modules_
-Addr ArrBase Foreign IO PrelBounded PrelNum
+IO PrelAddr PrelArr PrelBounded PrelCCall PrelForeign PrelNum
_usages_
PrelBase 1 :: $d12 1 $d13 1 $d2 1 $d26 1 $d28 1 $d29 1 $d31 1 $d33 1 $d37 1 $d38 1 $d39 1 $d41 1 $d6 1 $d7 1 $m/= 1 $m< 1 $m<= 1 $m> 1 $m>= 1 $mcompare 1 $mmax 1 $mmin 1 && 1 . 1 not 1 Eq 1 Eval 1 Ord 1 Ordering 1;
PrelNum 1 :: $d17 1 $d18 1;
_exports_
-Print002 .... ..... <<<< f1 f1a f2 f2a f3a f3b f3c f3d Bar(meth1 ///// meth2) Bar2 Foo(MkFoo1 :## MkFoo3 :***);
+Print002 .... ..... <<<< f1 f1a f2 f2a f3a f3b f3c f3d Bar(:Bar :Bar meth1 ///// meth2) Bar2(:Bar2 :Bar2) Foo(MkFoo1 :## MkFoo3 :***);
_instances_
instance _forall_ [a b c] {PrelBase.Eq a, PrelBase.Eq b, PrelBase.Eq c} => {PrelBase.Eq (Foo a b c)} = $d1;
instance _forall_ [a b c] => {PrelBase.Eval (Foo a b c)} = $d2;
@@ -279,17 +307,17 @@ _declarations_
1 $d1 _:_ _forall_ [a b c] {PrelBase.Eq a, PrelBase.Eq b, PrelBase.Eq c} => {PrelBase.Eq (Foo a b c)} ;;
1 $d2 _:_ _forall_ [a b c] => {PrelBase.Eval (Foo a b c)} ;;
1 $d3 _:_ _forall_ [a b c] {PrelBase.Ord a, PrelBase.Ord b, PrelBase.Ord c, PrelBase.Eq (Foo a b c)} => {PrelBase.Ord (Foo a b c)} ;;
-1 .... _:_ _forall_ [ta tb tc] => tb -> tb -> Foo ta tb tc ;;
-1 ..... _:_ _forall_ [ta tb tc] => tb -> tb -> Foo ta tb tc ;;
-1 <<<< _:_ _forall_ [ta tb tc] => tc -> tc -> Foo ta tb tc ;;
+1 .... _:_ _forall_ [a b c] => b -> b -> Foo a b c ;;
+1 ..... _:_ _forall_ [a b c] => b -> b -> Foo a b c ;;
+1 <<<< _:_ _forall_ [a b c] => c -> c -> Foo a b c ;;
1 class Bar a where {meth1 :: a -> a -> PrelBase.Bool; ///// :: a -> a -> PrelBase.Bool; meth2 :: _forall_ [b] => a -> b -> PrelBase.Bool} ;
1 class {Bar a} => Bar2 a ;
1 data Foo a b c = MkFoo1 a a | :## b c | MkFoo3 b b | :*** c c ;
-1 f1 _:_ _forall_ [ta tb tc] => ta -> ta -> Foo ta tb tc ;;
-1 f1a _:_ _forall_ [ta tb tc] => ta -> ta -> Foo ta tb tc ;;
-1 f2 _:_ _forall_ [ta tb tc] => tb -> tc -> Foo ta tb tc ;;
-1 f2a _:_ _forall_ [ta tb tc] => tb -> tc -> Foo ta tb tc ;;
-1 f3a _:_ _forall_ [ta] {Bar ta} => ta -> ta -> PrelBase.Bool ;;
-1 f3b _:_ _forall_ [ta] {Bar ta} => ta -> ta -> PrelBase.Bool ;;
-1 f3c _:_ _forall_ [ta] {Bar ta} => ta -> ta -> PrelBase.Bool ;;
-1 f3d _:_ _forall_ [ta] {Bar ta} => ta -> ta -> PrelBase.Bool ;;
+1 f1 _:_ _forall_ [a b c] => a -> a -> Foo a b c ;;
+1 f1a _:_ _forall_ [a b c] => a -> a -> Foo a b c ;;
+1 f2 _:_ _forall_ [a b c] => b -> c -> Foo a b c ;;
+1 f2a _:_ _forall_ [a b c] => b -> c -> Foo a b c ;;
+1 f3a _:_ _forall_ [a] {Bar a} => a -> a -> PrelBase.Bool ;;
+1 f3b _:_ _forall_ [a] {Bar a} => a -> a -> PrelBase.Bool ;;
+1 f3c _:_ _forall_ [a] {Bar a} => a -> a -> PrelBase.Bool ;;
+1 f3d _:_ _forall_ [a] {Bar a} => a -> a -> PrelBase.Bool ;;
diff --git a/ghc/tests/printing/should_compile/Print003.stderr b/ghc/tests/printing/should_compile/Print003.stderr
index 6f2d050aa59d6e525a4be22b1790a5197a1530c9..cce42578b952780c0846c970ed0133356bd59d42 100644
--- a/ghc/tests/printing/should_compile/Print003.stderr
+++ b/ghc/tests/printing/should_compile/Print003.stderr
@@ -1,18 +1,20 @@
+
==================== Typechecked ====================
-bitRsh{-r3h,x-} =
- _/\_ t12 -> \ tpl_B1 ->
- case tpl_B1 of { PrelTup.(,){-62,w-}{i} tpl_B1 tpl_B2 -> tpl_B1;}
-bitLsh{-r3g,x-} =
- _/\_ t12 -> \ tpl_B1 ->
- case tpl_B1 of { PrelTup.(,){-62,w-}{i} tpl_B1 tpl_B2 -> tpl_B2;}
-AbsBinds [talO] [d.Bits_alN] []
+Word.bitRsh{-r3z-} =
+ _/\_ a_tr3x -> \ tpl_B1 ->
+ case tpl_B1 of { Word.:Bits{-r3B-} tpl_B2 tpl_B3 -> tpl_B2;}
+Word.bitLsh{-r3y-} =
+ _/\_ a_tr3x -> \ tpl_B1 ->
+ case tpl_B1 of { Word.:Bits{-r3B-} tpl_B2 tpl_B3 -> tpl_B3;}
+AbsBinds [a_tan2] [d.Bits_an1] []
+
ghc: module version changed to 1; reason: no old .hi file
_interface_ Word 1
_instance_modules_
-Addr ArrBase Foreign IO PrelBounded PrelNum
+IO PrelAddr PrelArr PrelBounded PrelCCall PrelForeign PrelNum
_exports_
-Word Bits(bitRsh bitLsh);
+Word Bits(:Bits :Bits bitRsh bitLsh);
_fixities_
infixl 8 bitLsh;
infixl 8 bitRsh;
diff --git a/ghc/tests/printing/should_compile/Print004.stderr b/ghc/tests/printing/should_compile/Print004.stderr
index 5d8916b87515171eeb93fbe8b2a514372bbd2f82..8d505b8590c3b4819d8176698fe114e0c50dd8e7 100644
--- a/ghc/tests/printing/should_compile/Print004.stderr
+++ b/ghc/tests/printing/should_compile/Print004.stderr
@@ -1,56 +1,84 @@
-Print004.hs:18: Warning: no explicit method nor default method for `showsPrec'
- in an instance declaration for `Show'
+Print004.hs:18: Warning:
+ No explicit method nor default method for `showsPrec'
+ in an instance declaration for `Show'
+
+
==================== Typechecked ====================
-Con{-r6v,l-}{i} =
- _/\_ a_tr6C -> \ tpl_B1 -> Con{-r6v,l-}{i} {_@_ a_tr6C tpl_B1}
-Junk11{-r4,l-}{i} = _/\_ a_tr6A -> Junk11{-r4,l-}{i} {_@_ a_tr6A}
-Junk2{-r3,l-}{i} = _/\_ a_tr6A -> Junk2{-r3,l-}{i} {_@_ a_tr6A}
-AbsBinds [taI0] [] [([taI0], $d2{-rI2,x-}, d.Eval_aGJ)]
- d.Eval_aGJ = ({-dict-} [] [])
-AbsBinds [taI1] [] [([taI1], $d3{-rI7,x-}, d.Eval_aGP)]
- d.Eval_aGP = ({-dict-} [] [])
-AbsBinds [taH4] [d.Ord_aHo] [([taH4], $d4{-rI6,x-}, d.Show_aGV)]
- d.Ord_aHw = d.Ord_aHo
- d.Show_aHu = $d1{-rI5,x-} taH4 d.Ord_aHw
- showsPrec_aIb =
- PrelBase.showsPrec{-r5B,p-} (FunnyInternalType{-r6u,l-} taH4)
- d.Show_aHu
- showsPrec_aIa = showsPrec_aI9
- AbsBinds [] [] [([], showsPrec_aI9, showsPrec_aIc)]
- showsPrec_aIc a_rG2 (Con{-r6v,l-}{i} b1_rG3)
- = PrelBase.showParen{-r63,p-} a_rG2 >=_aI4 lit_aI3
- PrelBase..{-r6d,p-}
- [PrelBase.String{-r5y,p-}, PrelBase.String{-r5y,p-}, PrelBase.String{-r5y,p-}] PrelBase.showString{-r62,p-} "Con "
- showsPrec_aIb PrelBase.I#{-5b,w-}{i} 10#
- b1_rG3
- AbsBinds [] [] [([], showList_aI8, showList_aId)]
- showList_aId = PrelBase.showList__{-r6F,p-}
- (OpaqueType{-r6,x-} taH4) showsPrec_aIa PrelBase.I#{-5b,w-}{i} 0#
- d.Show_aGV = ({-dict-} [] [showsPrec_aI9, showList_aI8])
-AbsBinds [taHK] [d.Ord_aHS] [([taHK], $d1{-rI5,x-}, d.Show_aHD)]
- d.Show_aHW = d.Show_aHD
- $mshowList_aIg =
- PrelBase.$mshowList{-rh6,p-} (FunnyInternalType{-r6u,l-} taHK)
- d.Show_aHW
- AbsBinds [] [] [([], showsPrec_aIf, showsPrec_aIh)]
- showsPrec_aIh
- = GHCerr.noDefaultMethodError{-8k,w-}
- (PrelBase.Int{-3f,W-}
- -> FunnyInternalType{-r6u,l-} taHK
- -> PrelBase.String{-r5y,p-}
- -> PrelBase.String{-r5y,p-}) "<NoSrcLoc>|showsPrec"
- AbsBinds [] [] [([], showList_aIe, showList_aIi)]
- showList_aIi = $mshowList_aIg
- d.Show_aHD = ({-dict-} [] [showsPrec_aIf, showList_aIe])
-d.Ord_aHZ = PrelBase.$d6{-rcZ,p-}
->=_aI4 = PrelBase.>={-810,p-} PrelBase.Int{-3f,W-} d.Ord_aHZ
-lit_aI3 = PrelBase.I#{-5b,w-}{i} 10#
+ExportOpaque.Con{-r6P-} =
+ _/\_ a_tr6W -> \ tpl_B1 ->
+ ExportOpaque.Con{-r6P-} {_@_ a_tr6W tpl_B1}
+ExportOpaque.Junk11{-r4-} =
+ _/\_ a_tr6U -> ExportOpaque.Junk11{-r4-} {_@_ a_tr6U}
+ExportOpaque.Junk2{-r3-} =
+ _/\_ a_tr6U -> ExportOpaque.Junk2{-r3-} {_@_ a_tr6U}
+AbsBinds
+[a_taKh]
+[]
+[([a_taKh], ExportOpaque.$d2{-rKl-}, d.Eval_aIQ)]
+ d.Eval_aIQ =
+ PrelBase.:Eval{-rN-} (ExportOpaque.OpaqueType{-r1d-} a_taKh)
+AbsBinds
+[a_taKi]
+[]
+[([a_taKi], ExportOpaque.$d3{-rKq-}, d.Eval_aIW)]
+ d.Eval_aIW =
+ PrelBase.:Eval{-rN-} (ExportOpaque.FunnyInternalType{-r6O-} a_taKi)
+AbsBinds
+[a_taJb]
+[d.Ord_aJx]
+[([a_taJb], ExportOpaque.$d4{-rKp-}, d.Show_aJ2)]
+ showsPrec_aKs =
+ PrelBase.showsPrec{-r5W-}
+ (ExportOpaque.FunnyInternalType{-r6O-} a_taJb)
+ d.Show_aJF
+ showsPrec_aKj = showsPrec_aKk
+ d.Show_aJF = ExportOpaque.$d1{-rKo-} a_taJb d.Ord_aJH
+ d.Ord_aJH = d.Ord_aJx
+ AbsBinds [] [] [([], showsPrec_aKk, showsPrec_aKt)]
+ showsPrec_aKt a_rI9 (ExportOpaque.Con{-r6P-} b1_rIa)
+ = PrelBase.showParen{-r6s-} a_rI9 >=_aKm lit_aKn
+ PrelBase..{-r6C-}
+ [PrelBase.String{-r5T-}, PrelBase.String{-r5T-}, PrelBase.String{-r5T-}] PrelBase.showString{-r6r-} "Con "
+ showsPrec_aKs PrelBase.I#{-5b-} 10#
+ b1_rIa
+ AbsBinds [] [] [([], showList_aKr, showList_aKu)]
+ showList_aKu = PrelBase.showList__{-r6Z-}
+ (ExportOpaque.OpaqueType{-r1d-} a_taJb) showsPrec_aKj PrelBase.I#{-5b-} 0#
+ d.Show_aJ2 =
+ PrelBase.:Show{-r1c-}
+ (ExportOpaque.OpaqueType{-r1d-} a_taJb) showsPrec_aKk showList_aKr
+AbsBinds
+[a_taJT]
+[d.Ord_aK5]
+[([a_taJT], ExportOpaque.$d1{-rKo-}, d.Show_aJQ)]
+ $mshowList_aKx =
+ PrelBase.$mshowList{-rhx-}
+ (ExportOpaque.FunnyInternalType{-r6O-} a_taJT)
+ d.Show_aKb
+ d.Show_aKb = d.Show_aJQ
+ AbsBinds [] [] [([], showsPrec_aKw, showsPrec_aKy)]
+ showsPrec_aKy
+ = PrelErr.noDefaultMethodError{-8k-}
+ (PrelBase.Int{-3f-}
+ -> ExportOpaque.FunnyInternalType{-r6O-} a_taJT
+ -> PrelBase.String{-r5T-}
+ -> PrelBase.String{-r5T-}) "<<function>>"
+ AbsBinds [] [] [([], showList_aKv, showList_aKz)]
+ showList_aKz = $mshowList_aKx
+ d.Show_aJQ =
+ PrelBase.:Show{-r1c-}
+ (ExportOpaque.FunnyInternalType{-r6O-} a_taJT) showsPrec_aKw
+ showList_aKv
+lit_aKn = PrelBase.I#{-5b-} 10#
+>=_aKm = PrelBase.>={-810-} PrelBase.Int{-3f-} d.Ord_aKg
+d.Ord_aKg = PrelBase.$d6{-rdt-}
+
ghc: module version changed to 1; reason: no old .hi file
_interface_ ExportOpaque 1
_instance_modules_
-Addr ArrBase Foreign IO PrelBounded PrelNum
+IO PrelAddr PrelArr PrelBounded PrelCCall PrelForeign PrelNum
_usages_
PrelBase 1 :: $d1 1 $d10 1 $d12 1 $d13 1 $d15 1 $d2 1 $d20 1 $d21 1 $d26 1 $d27 1 $d28 1 $d29 1 $d3 1 $d30 1 $d31 1 $d33 1 $d34 1 $d36 1 $d37 1 $d38 1 $d39 1 $d4 1 $d40 1 $d41 1 $d42 1 $d43 1 $d6 1 $d7 1 $d8 1 $m- 1 $m/= 1 $m< 1 $m<= 1 $m> 1 $m>= 1 $mcompare 1 $mfromInt 1 $mmax 1 $mmin 1 $mshowList 1 . 1 showList__ 1 showParen 1 showSpace 1 showString 1 Eq 1 Eval 1 Num 1 Ord 1 Ordering 1 Show 1 ShowS 1 String 1;
PrelNum 1 :: $d10 1 $d16 1 $d17 1 $d18 1 $d29 1 $d33 1 $d34 1 $d35 1;
diff --git a/ghc/tests/reader/should_compile/Makefile b/ghc/tests/reader/should_compile/Makefile
index e509b61afbaa2f9871b45f974e8bc5c9c4ba35a3..16f3a64554992abb8861cafef8a7628f8351ec85 100644
--- a/ghc/tests/reader/should_compile/Makefile
+++ b/ghc/tests/reader/should_compile/Makefile
@@ -5,6 +5,6 @@ include $(TOP)/mk/should_compile.mk
SRC_HC_OPTS += -noC -dcore-lint
read004_HC_OPTS = -fno-implicit-prelude
-read006_HC_OPTS = -hi -ohi MyList.hi
+read006_HC_OPTS = -hi
include $(TOP)/mk/target.mk
diff --git a/ghc/tests/reader/should_compile/MyList.hi b/ghc/tests/reader/should_compile/MyList.hi
index bce90f3353a8d8e58c82102005151a424ae7f0a1..852bdc7185e62a00bd500fbd83f5c905da2e68dd 100644
--- a/ghc/tests/reader/should_compile/MyList.hi
+++ b/ghc/tests/reader/should_compile/MyList.hi
@@ -1,6 +1,6 @@
_interface_ MyList 1
_instance_modules_
-Addr ArrBase Foreign IO PrelBounded PrelNum
+IO PrelAddr PrelArr PrelBounded PrelCCall PrelForeign PrelNum
_usages_
PrelBase 1 :: $d2 1 $d29 1 $d31 1 $d33 1 $d38 1 Eval 1;
_exports_
diff --git a/ghc/tests/reader/should_compile/read006.stderr b/ghc/tests/reader/should_compile/read006.stderr
index a43931d425c8ea8e916478633d354efe9c7f40ea..224f17c6c04bbad742a10145ce7836fc3b85e374 100644
--- a/ghc/tests/reader/should_compile/read006.stderr
+++ b/ghc/tests/reader/should_compile/read006.stderr
@@ -1,7 +1,7 @@
-Module version unchanged at 1
+ghc: module version unchanged at 1
_interface_ MyList 1
_instance_modules_
-Addr ArrBase Foreign IO PrelBounded PrelNum
+IO PrelAddr PrelArr PrelBounded PrelCCall PrelForeign PrelNum
_usages_
PrelBase 1 :: $d2 1 $d29 1 $d31 1 $d33 1 $d38 1 Eval 1;
_exports_
diff --git a/ghc/tests/reader/should_fail/expr001.stderr b/ghc/tests/reader/should_fail/expr001.stderr
index 9591374b4685cdc05fd20cfba4eb6eba8fb41b5b..a6d5ef8b6c66043f2adf6f5c43084c0226a146f1 100644
--- a/ghc/tests/reader/should_fail/expr001.stderr
+++ b/ghc/tests/reader/should_fail/expr001.stderr
@@ -1,10 +1,13 @@
+
==================== Reader ====================
module Main where
{- rec -}
f x = x + (if c then 1 else 2)
f x = x + 1 :: Int
+
expr001.hs:10: Value not in scope: `c'
+
Compilation had errors
diff --git a/ghc/tests/reader/should_fail/read001.stderr b/ghc/tests/reader/should_fail/read001.stderr
index 996657ba239fa3b9133c8ba9988f24305c7586c1..0f50010aca022617660043309fc95a904773cad1 100644
--- a/ghc/tests/reader/should_fail/read001.stderr
+++ b/ghc/tests/reader/should_fail/read001.stderr
@@ -1,3 +1,4 @@
+
==================== Reader ====================
module OneOfEverything (
fixn, FooData, FooDataB(..), FooDataC(..), EqTree(EqLeaf,
@@ -90,17 +91,19 @@ data FooDataB = FooConB Double
data FooData = FooCon Int
type Pair a b = (a, b)
+
read001.hs:17: Could not find valid interface file `OneA'
read001.hs:18: Could not find valid interface file `OneB'
-read001.hs:18: Module OneB does not export `fB'
+read001.hs:18: Module `OneB' does not export `fB'
read001.hs:19: Could not find valid interface file `OneC'
-read001.hs:19: Module OneC does not export `fC'
+read001.hs:19: Module `OneC' does not export `fC'
-read001.hs:20: Module OneC does not export `fC'
+read001.hs:20: Module `OneC' does not export `fC'
+
Compilation had errors
diff --git a/ghc/tests/reader/should_fail/read003.stderr b/ghc/tests/reader/should_fail/read003.stderr
index e50aea84a1f69308ddc067c778418ecb7931aec9..5195c3f797bd32f347ac255128018a840a8c26ad 100644
--- a/ghc/tests/reader/should_fail/read003.stderr
+++ b/ghc/tests/reader/should_fail/read003.stderr
@@ -1,3 +1,4 @@
+
==================== Reader ====================
module Read003 where
{- rec -}
@@ -9,17 +10,20 @@ module Read003 where
{- rec -}
nullity = null
+
-read003.hs:8: Cannot construct the infinite type (occur check)
- `taHn' = `(taHn, taHq, taHt)'
- Expected: `taHn'
- Inferred: `(taHn, [taHB], taHt)'
- In a pattern binding:
- `~(a, b, c)
- | nullity b = a
- | nullity c = a
- | otherwise = a
- where
- nullity = null'
+read003.hs:8:
+ Occurs check: cannot construct the infinite type:
+ aIK = (aIK, aIN, aIQ)
+ Expected: aIK
+ Inferred: (aIK, [aIY], aIQ)
+ In a pattern binding:
+ ~(a, b, c)
+ | nullity b = a
+ | nullity c = a
+ | otherwise = a
+ where
+ nullity = null
+
Compilation had errors
diff --git a/ghc/tests/rename/should_fail/rnfail001.stderr b/ghc/tests/rename/should_fail/rnfail001.stderr
index c1f650dd91e76ff1d591488af575ba07ef8c3b11..92fd2289d120817b6fda554906641eef7964a7b7 100644
--- a/ghc/tests/rename/should_fail/rnfail001.stderr
+++ b/ghc/tests/rename/should_fail/rnfail001.stderr
@@ -1,4 +1,5 @@
rnfail001.hs:3: Conflicting definitions for `x' in pattern
+
Compilation had errors
diff --git a/ghc/tests/rename/should_fail/rnfail002.stderr b/ghc/tests/rename/should_fail/rnfail002.stderr
index 2eb06e2434d553497806831346faa6c4d388849f..24a860182b543b9f058a5a7c4fec0791712a3857 100644
--- a/ghc/tests/rename/should_fail/rnfail002.stderr
+++ b/ghc/tests/rename/should_fail/rnfail002.stderr
@@ -1,7 +1,8 @@
rnfail002.hs:4:
- Conflicting definitions for: `y'
+ Conflicting definitions for `y'
Defined at rnfail002.hs:6
Defined at rnfail002.hs:5
+
Compilation had errors
diff --git a/ghc/tests/rename/should_fail/rnfail003.stderr b/ghc/tests/rename/should_fail/rnfail003.stderr
index 8b958ae364df9fdf36a6332e17ade23d5d47a8da..25b82c0112b57ac9f6cd91a2a122ae3a676009a6 100644
--- a/ghc/tests/rename/should_fail/rnfail003.stderr
+++ b/ghc/tests/rename/should_fail/rnfail003.stderr
@@ -1,7 +1,8 @@
rnfail003.hs:2:
- Conflicting definitions for: `f'
+ Conflicting definitions for `f'
Defined at rnfail003.hs:4
Defined at rnfail003.hs:2
+
Compilation had errors
diff --git a/ghc/tests/rename/should_fail/rnfail004.stderr b/ghc/tests/rename/should_fail/rnfail004.stderr
index e8dbce15c595543e624cada4469710e08f5552aa..cd56751d50dbb93b175ce01c6ee3ff4c95b0c263 100644
--- a/ghc/tests/rename/should_fail/rnfail004.stderr
+++ b/ghc/tests/rename/should_fail/rnfail004.stderr
@@ -3,4 +3,5 @@ rnfail004.hs:6: Conflicting definitions for `a' in binding group
rnfail004.hs:7: Conflicting definitions for `b' in binding group
+
Compilation had errors
diff --git a/ghc/tests/rename/should_fail/rnfail007.stderr b/ghc/tests/rename/should_fail/rnfail007.stderr
index ce39d461d05f817161043c7b09cb3da9742a6afe..56ef0455de1e471088666f0946c551901130dbad 100644
--- a/ghc/tests/rename/should_fail/rnfail007.stderr
+++ b/ghc/tests/rename/should_fail/rnfail007.stderr
@@ -1,4 +1,6 @@
-rnfail007.hs:3: Module Main must include a definition for `main'
+rnfail007.hs:3:
+ Module `Main' must include a definition for `Main.main'
+
Compilation had errors
diff --git a/ghc/tests/rename/should_fail/rnfail008.stderr b/ghc/tests/rename/should_fail/rnfail008.stderr
index 41b22f2a60fc3e342cde0292dcfacb8f1bf14444..116137bd697a7250fb32f966048f42641b387582 100644
--- a/ghc/tests/rename/should_fail/rnfail008.stderr
+++ b/ghc/tests/rename/should_fail/rnfail008.stderr
@@ -1,13 +1,18 @@
-rnfail008.hs:18: Warning: no explicit method nor default method for `op1'
- in an instance declaration for `K'
+rnfail008.hs:18: Warning:
+ No explicit method nor default method for `op1'
+ in an instance declaration for `K'
-rnfail008.hs:18: Warning: no explicit method nor default method for `op2'
- in an instance declaration for `K'
+rnfail008.hs:18: Warning:
+ No explicit method nor default method for `op2'
+ in an instance declaration for `K'
-rnfail008.hs:14: Warning: no explicit method nor default method for `op2'
- in an instance declaration for `K'
+rnfail008.hs:14: Warning:
+ No explicit method nor default method for `op2'
+ in an instance declaration for `K'
+
rnfail008.hs:18: Class `K' does not have a method `op3'
+
Compilation had errors
diff --git a/ghc/tests/rename/should_fail/rnfail009.stderr b/ghc/tests/rename/should_fail/rnfail009.stderr
index aea0d45f5d0e71f0d662cdcd07ef1dc85ab5ac80..0decea24835ba449bfe84da13cca5a3d6b68879e 100644
--- a/ghc/tests/rename/should_fail/rnfail009.stderr
+++ b/ghc/tests/rename/should_fail/rnfail009.stderr
@@ -1,7 +1,8 @@
rnfail009.hs:1:
- Conflicting definitions for: `A'
+ Conflicting definitions for `A'
Defined at rnfail009.hs:5
Defined at rnfail009.hs:3
+
Compilation had errors
diff --git a/ghc/tests/rename/should_fail/rnfail010.stderr b/ghc/tests/rename/should_fail/rnfail010.stderr
index 84d078f17614b9da7256a6577ac699a6fd10ece7..9c4cf0274330aa9a7923c0b47638c5f2972ddae7 100644
--- a/ghc/tests/rename/should_fail/rnfail010.stderr
+++ b/ghc/tests/rename/should_fail/rnfail010.stderr
@@ -1,7 +1,8 @@
rnfail010.hs:2:
- Conflicting definitions for: `f'
+ Conflicting definitions for `f'
Defined at rnfail010.hs:6
Defined at rnfail010.hs:2
+
Compilation had errors
diff --git a/ghc/tests/rename/should_fail/rnfail011.stderr b/ghc/tests/rename/should_fail/rnfail011.stderr
index 50b251cf0d373b7a0726a6069acca1edb350cf95..1b4602f3b086ee06ca238869d6ab4e227e9d022f 100644
--- a/ghc/tests/rename/should_fail/rnfail011.stderr
+++ b/ghc/tests/rename/should_fail/rnfail011.stderr
@@ -1,7 +1,8 @@
rnfail011.hs:2:
- Conflicting definitions for: `A'
+ Conflicting definitions for `A'
Defined at rnfail011.hs:6
Defined at rnfail011.hs:2
+
Compilation had errors
diff --git a/ghc/tests/rename/should_fail/rnfail012.stderr b/ghc/tests/rename/should_fail/rnfail012.stderr
index 38e54d598cb6524147103408c93948bae1910199..e0bbc094f3470e42b9dcf2b3c0c8c9b050e9b57f 100644
--- a/ghc/tests/rename/should_fail/rnfail012.stderr
+++ b/ghc/tests/rename/should_fail/rnfail012.stderr
@@ -1,7 +1,18 @@
rnfail012.hs:2:
- Conflicting definitions for: `A'
+ Conflicting definitions for `A'
Defined at rnfail012.hs:9
Defined at rnfail012.hs:3
+
+rnfail012.hs:2:
+ Conflicting definitions for `:A'
+ Defined at rnfail012.hs:9
+ Defined at rnfail012.hs:3
+
+rnfail012.hs:2:
+ Conflicting definitions for `:A'
+ Defined at rnfail012.hs:9
+ Defined at rnfail012.hs:3
+
Compilation had errors
diff --git a/ghc/tests/rename/should_fail/rnfail013.stderr b/ghc/tests/rename/should_fail/rnfail013.stderr
index f24e8dc48cc4a9e5071bbb63a5664c23c7cd59a9..253eb6eff142e7e88a540690cf7f70fb7125d8c0 100644
--- a/ghc/tests/rename/should_fail/rnfail013.stderr
+++ b/ghc/tests/rename/should_fail/rnfail013.stderr
@@ -1,7 +1,8 @@
rnfail013.hs:3:
- Conflicting definitions for: `MkT'
+ Conflicting definitions for `MkT'
Defined at rnfail013.hs:9
Defined at rnfail013.hs:7
+
Compilation had errors
diff --git a/ghc/tests/rename/should_fail/rnfail014.stderr b/ghc/tests/rename/should_fail/rnfail014.stderr
index 6e93e645eb60d71e86df25f2587aa6a467fe1af2..457ba99e4d83ca4988f26b762f04f8a2e545dcf2 100644
--- a/ghc/tests/rename/should_fail/rnfail014.stderr
+++ b/ghc/tests/rename/should_fail/rnfail014.stderr
@@ -13,4 +13,5 @@ rnfail014.hs:9:
that do not appear in `Eq Bool'
in the type signature for an instance decl
+
Compilation had errors
diff --git a/ghc/tests/stranal/should_compile/str001.stderr b/ghc/tests/stranal/should_compile/str001.stderr
index 9a1d863c4add4fb061b17289fe81d472fd584e04..b8eb12db429834c4e298e6af1aa465a7ce64b59a 100644
--- a/ghc/tests/stranal/should_compile/str001.stderr
+++ b/ghc/tests/stranal/should_compile/str001.stderr
@@ -1,17 +1,17 @@
ghc: module version changed to 1; reason: no old .hi file
_interface_ ShouldSucceed 1
_instance_modules_
-Addr ArrBase Foreign IO PrelBounded PrelNum
+IO PrelAddr PrelArr PrelBounded PrelCCall PrelForeign PrelNum
_usages_
-PrelBase 1 :: $d1 1 $d10 1 $d13 1 $d15 1 $d2 1 $d21 1 $d26 1 $d27 1 $d29 1 $d3 1 $d30 1 $d31 1 $d33 1 $d34 1 $d36 1 $d38 1 $d4 1 $d42 1 $d7 1 $d8 1 $g0 1 $g1E 1 $g1R 1 $g1T 1 $g1U 1 $g1V 1 $g1W 1 $g1X 1 $g1Y 1 $g1Z 1 $g1s 1 $g1t 1 $g20 1 $g23 1 $g24 1 $g28 1 $g29 1 $g2A 1 $g2F 1 $g2I 1 $g2J 1 $g2K 1 $g2L 1 $g2R 1 $g2S 1 $g2T 1 $g2X 1 $g2Y 1 $g2Z 1 $g2u 1 $g2z 1 $g30 1 $g31 1 $g33 1 $g36 1 $g37 1 $g38 1 $g39 1 $g3D 1 $g3E 1 $g3F 1 $g3G 1 $g3Y 1 $g3Z 1 $g40 1 $g41 1 $g42 1 $g43 1 $g44 1 $g46 1 $g6 1 $gb 1 $m- 1 $m/= 1 $mfromInt 1 $mshowList 1 itos 1 showList__ 1 Eq 1 Eval 1 Num 1 Show 1 String 1;
-PrelNum 1 :: $d10 1 $d16 1 $d18 1 $d29 1 $d33 1 $d35 1 $g1B 1 $g1C 1 $g1D 1 $g1E 1 $g1F 1 $g1a 1 $g1b 1 $g1c 1 $g1e 1 $g2V 1 $g2W 1 $g2X 1 $g2Y 1 $g2w 1 $g3T 1 $g4 1 $g46 1 $g47 1 $g48 1 $g49 1 $g4o 1 $g4p 1 $g4s 1 $g5 1 $gD 1 $gK 1 $gg 1 $gh 1 $gi 1 $gj 1 $gk 1 $gl 1 minExpt 1;
+PrelBase 1 :: $d1 1 $d10 1 $d13 1 $d15 1 $d2 1 $d21 1 $d26 1 $d27 1 $d29 1 $d3 1 $d30 1 $d31 1 $d33 1 $d34 1 $d36 1 $d38 1 $d4 1 $d42 1 $d7 1 $d8 1 $g0 1 $g1E 1 $g1R 1 $g1T 1 $g1U 1 $g1V 1 $g1W 1 $g1X 1 $g1Y 1 $g1Z 1 $g1l 1 $g1m 1 $g20 1 $g23 1 $g24 1 $g28 1 $g29 1 $g2A 1 $g2G 1 $g2H 1 $g2I 1 $g2S 1 $g2T 1 $g2U 1 $g2V 1 $g2W 1 $g2X 1 $g2Y 1 $g2r 1 $g2s 1 $g2x 1 $g2y 1 $g2z 1 $g30 1 $g33 1 $g34 1 $g35 1 $g36 1 $g37 1 $g3B 1 $g3C 1 $g3D 1 $g3E 1 $g3V 1 $g3W 1 $g3X 1 $g3Y 1 $g3Z 1 $g40 1 $g42 1 $g6 1 $g8 1 $m- 1 $m/= 1 $mfromInt 1 $mshowList 1 itos 1 showList__ 1 showLitChar 1 Eq 1 Eval 1 Num 1 Show 1 String 1;
+PrelNum 1 :: $d10 1 $d16 1 $d18 1 $d29 1 $d33 1 $d35 1 $g1C 1 $g1D 1 $g1E 1 $g1F 1 $g1G 1 $g1a 1 $g1b 1 $g1c 1 $g1e 1 $g2A 1 $g2D 1 $g2v 1 $g30 1 $g31 1 $g32 1 $g33 1 $g3W 1 $g4 1 $g4a 1 $g4b 1 $g4c 1 $g4d 1 $g4r 1 $g4s 1 $g4v 1 $g5 1 $gD 1 $gK 1 $gg 1 $gh 1 $gi 1 $gj 1 $gk 1 $gl 1 minExpt 1;
PrelTup 1 :: $d13 1 $d4 1 $d9 1 $g0 1 $g1 1 $g3 1;
_exports_
ShouldSucceed area2 Point2(Point2);
_instances_
instance _forall_ [a] => {PrelBase.Eval (Point2 a)} = $d1;
_declarations_
-1 $d1 _:_ _forall_ [a] => {PrelBase.Eval (Point2 a)} ;; _A_ 0 _bot_ ;;
-1 $warea2 _:_ _forall_ [ta] => (ta -> ta -> ta) -> (ta -> ta -> ta) -> ta -> ta -> (ta, ta) -> (ta, ta) -> ta ;; _A_ 6 _S_ SLLLu(LL)u(LL) _U_ _/\_ $x0 -> \ $x1 :: ($x0 -> $x0 -> $x0) $x2 :: ($x0 -> $x0 -> $x0) $x3 :: $x0 $x4 :: $x0 $x5 :: ($x0, $x0) $x6 :: ($x0, $x0) -> case $x5 of { PrelTup.(,) $x7 $x8 -> case $x6 of { PrelTup.(,) $x9 $xa -> let { $xd :: $x0 = let { $xb :: $x0 = $x1 $x3 $x7 } in let { $xc :: $x0 = $x1 $x4 $xa } in $x2 $xb $xc } in let { $xg :: $x0 = let { $xe :: $x0 = $x1 $x4 $x8 } in let { $xf :: $x0 = $x1 $x3 $x9 } in $x2 $xe $xf } in $x1 $xd $xg;};} ;;
+1 $d1 _:_ _forall_ [a] => {PrelBase.Eval (Point2 a)} ;; _A_ 0 _U_ _/\_ $x0 -> PrelBase.:Eval {_@_ (Point2 $x0)} ;;
+1 $warea2 _:_ _forall_ [a] => (a -> a -> a) -> (a -> a -> a) -> a -> a -> (a, a) -> (a, a) -> a ;; _A_ 6 _S_ SLLLu(LL)u(LL) _U_ _/\_ $x0 -> \ $x1 :: ($x0 -> $x0 -> $x0) $x2 :: ($x0 -> $x0 -> $x0) $x3 :: $x0 $x4 :: $x0 $x5 :: ($x0, $x0) $x6 :: ($x0, $x0) -> case $x5 of { PrelTup.(,) $x7 $x8 -> case $x6 of { PrelTup.(,) $x9 $xa -> let { $xd :: $x0 = let { $xb :: $x0 = $x1 $x3 $x7 } in let { $xc :: $x0 = $x1 $x4 $xa } in $x2 $xb $xc } in let { $xg :: $x0 = let { $xe :: $x0 = $x1 $x4 $x8 } in let { $xf :: $x0 = $x1 $x3 $x9 } in $x2 $xe $xf } in $x1 $xd $xg;};} ;;
+1 area2 _:_ _forall_ [a] {PrelBase.Num a} => Point2 a -> Point2 a -> Point2 a -> a ;; _A_ 4 _S_ U(AAAASLAAAAA)N(U(LL))N(u(LL))N(u(LL)) $warea2 {PrelTup.(,) Point2 PrelBase.:Num} ;;
1 newtype {PrelBase.Num a} => Point2 a = Point2 (a, a) ;
-1 area2 _:_ _forall_ [ta] {PrelBase.Num ta} => Point2 ta -> Point2 ta -> Point2 ta -> ta ;; _A_ 4 _S_ U(AAAASLAAAAA)N(U(LL))N(u(LL))N(u(LL)) $warea2 {PrelTup.(,) PrelTup.(,,,,,,,,,,) Point2} ;;
diff --git a/ghc/tests/typecheck/should_compile/Makefile b/ghc/tests/typecheck/should_compile/Makefile
index c213a8048c8e00b882720d9e8e597b10a055ed75..662ec6c27bf4aa7bda1213287e1aa37cd076156d 100644
--- a/ghc/tests/typecheck/should_compile/Makefile
+++ b/ghc/tests/typecheck/should_compile/Makefile
@@ -5,6 +5,6 @@ include $(TOP)/mk/should_compile.mk
HC_OPTS += -noC -dcore-lint -fno-warn-incomplete-patterns -hi
tc019_HC_OPTS = -fglasgow-exts
-tc065_HC_OPTS = -syslib ghc
+tc065_HC_OPTS = -syslib misc
include $(TOP)/mk/target.mk
diff --git a/ghc/tests/typecheck/should_compile/TheUtils.hi b/ghc/tests/typecheck/should_compile/TheUtils.hi
index dd662cd3691dbff5007b5a05be3edc9030760078..375f4de1c72c90f774bf9bd8297394d8bf6aafc5 100644
--- a/ghc/tests/typecheck/should_compile/TheUtils.hi
+++ b/ghc/tests/typecheck/should_compile/TheUtils.hi
@@ -1,6 +1,6 @@
_interface_ TheUtils 2
_instance_modules_
-ArrBase IO PrelNum
+PrelArr IO PrelNum
_usages_
PrelBase 1 :: $d1 1 $d11 1 $d14 1 $d15 1 $d16 1 $d17 1 $d18 1 $d19 1 $d2 1 $d21 1 $d22 1 $d23 1 $d24 1 $d25 1 $d26 1 $d27 1 $d3 1 $d32 1 $d33 1 $d34 1 $d36 1 $d37 1 $d38 1 $d39 1 $d41 1 $d42 1 $d44 1 $d45 1 $d46 1 $d48 1 $d49 1 $d50 1 $d51 1 $d53 1 $d54 1 $d55 1 $d57 1 $d6 1 $d7 1 $d8 1 $m* 1 $m+ 1 $m++ 1 $m- 1 $m/= 1 $m< 1 $m<= 1 $m== 1 $m> 1 $m>= 1 $m>> 1 $m>>= 1 $mabs 1 $mcompare 1 $mfromInt 1 $mfromInteger 1 $mmap 1 $mmax 1 $mmin 1 $mnegate 1 $mreturn 1 $mshowList 1 $mshowsPrec 1 $msignum 1 $mzero 1 && 1 . 1 not 1 otherwise 1 show 1 || 1 Eq 1 Eval 1 Functor 1 Maybe 1 Monad 1 MonadPlus 1 MonadZero 1 Num 1 Ord 1 Ordering 1 Ordering 1 Show 1 String 1;
PrelList 1 :: repeat 1 reverse 1 span 1 take 1;
diff --git a/ghc/tests/typecheck/should_compile/tc001.stderr b/ghc/tests/typecheck/should_compile/tc001.stderr
index 1de774f5e4d7aad6bbdca15d58636f043348e702..74315b5128699ab7fc97c151f8958e8d5ea69c52 100644
--- a/ghc/tests/typecheck/should_compile/tc001.stderr
+++ b/ghc/tests/typecheck/should_compile/tc001.stderr
@@ -1,11 +1,11 @@
ghc: module version changed to 1; reason: no old .hi file
_interface_ ShouldSucceed 1
_instance_modules_
-Addr ArrBase Foreign IO PrelBounded PrelNum
+IO PrelAddr PrelArr PrelBounded PrelCCall PrelForeign PrelNum
_usages_
PrelBase 1 :: $d1 1 $d10 1 $d13 1 $d15 1 $d2 1 $d21 1 $d26 1 $d27 1 $d29 1 $d3 1 $d30 1 $d31 1 $d33 1 $d34 1 $d36 1 $d38 1 $d4 1 $d42 1 $d7 1 $d8 1 $m- 1 $m/= 1 $mfromInt 1 $mshowList 1 Eq 1 Eval 1 Num 1 Show 1 String 1;
PrelNum 1 :: $d10 1 $d16 1 $d18 1 $d29 1 $d33 1 $d35 1;
_exports_
ShouldSucceed a;
_declarations_
-1 a _:_ _forall_ [ta] {PrelBase.Num ta} => ta -> ta ;;
+1 a _:_ _forall_ [a] {PrelBase.Num a} => a -> a ;;
diff --git a/ghc/tests/typecheck/should_compile/tc002.stderr b/ghc/tests/typecheck/should_compile/tc002.stderr
index dac0eaf3c27791e142a918d19dd5d29ea38abb2a..895cf7bf0be30d6436289d450430ea7cc9d0af47 100644
--- a/ghc/tests/typecheck/should_compile/tc002.stderr
+++ b/ghc/tests/typecheck/should_compile/tc002.stderr
@@ -1,7 +1,7 @@
ghc: module version changed to 1; reason: no old .hi file
_interface_ ShouldSucceed 1
_instance_modules_
-Addr ArrBase Foreign IO PrelBounded PrelNum
+IO PrelAddr PrelArr PrelBounded PrelCCall PrelForeign PrelNum
_usages_
PrelBase 1 :: $d1 1 $d10 1 $d13 1 $d15 1 $d2 1 $d21 1 $d26 1 $d27 1 $d29 1 $d3 1 $d30 1 $d31 1 $d33 1 $d34 1 $d36 1 $d38 1 $d4 1 $d42 1 $d7 1 $d8 1 $m- 1 $m/= 1 $mfromInt 1 $mshowList 1 Eq 1 Eval 1 Num 1 Show 1 String 1;
PrelNum 1 :: $d10 1 $d16 1 $d18 1 $d29 1 $d33 1 $d35 1;
diff --git a/ghc/tests/typecheck/should_compile/tc003.stderr b/ghc/tests/typecheck/should_compile/tc003.stderr
index f539e290c9b7deff7767f9868d31e7b3a4990cb4..ed4957e8eb24d06c74383c74284e8b089c394745 100644
--- a/ghc/tests/typecheck/should_compile/tc003.stderr
+++ b/ghc/tests/typecheck/should_compile/tc003.stderr
@@ -1,7 +1,7 @@
ghc: module version changed to 1; reason: no old .hi file
_interface_ ShouldSucceed 1
_instance_modules_
-Addr ArrBase Foreign IO PrelBounded PrelNum
+IO PrelAddr PrelArr PrelBounded PrelCCall PrelForeign PrelNum
_usages_
PrelBase 1 :: $d1 1 $d10 1 $d13 1 $d15 1 $d2 1 $d21 1 $d26 1 $d27 1 $d29 1 $d3 1 $d30 1 $d31 1 $d33 1 $d34 1 $d36 1 $d38 1 $d4 1 $d42 1 $d7 1 $d8 1 $m- 1 $m/= 1 $mfromInt 1 $mshowList 1 Eq 1 Eval 1 Num 1 Show 1 String 1;
PrelNum 1 :: $d10 1 $d16 1 $d18 1 $d29 1 $d33 1 $d35 1;
diff --git a/ghc/tests/typecheck/should_compile/tc004.stderr b/ghc/tests/typecheck/should_compile/tc004.stderr
index 57e6857d2eb785ecbfa33463369da30b0133b7b2..681f7ffe96b7d0166724c896b7b98ada205d7aa4 100644
--- a/ghc/tests/typecheck/should_compile/tc004.stderr
+++ b/ghc/tests/typecheck/should_compile/tc004.stderr
@@ -1,7 +1,7 @@
ghc: module version changed to 1; reason: no old .hi file
_interface_ ShouldSucceed 1
_instance_modules_
-Addr ArrBase Foreign IO PrelBounded PrelNum
+IO PrelAddr PrelArr PrelBounded PrelCCall PrelForeign PrelNum
_exports_
ShouldSucceed f;
_declarations_
diff --git a/ghc/tests/typecheck/should_compile/tc005.stderr b/ghc/tests/typecheck/should_compile/tc005.stderr
index c042b2177f333234961647670ac12a5aacf336db..3c86253d475d27a0802dd199afecae7ff82796ae 100644
--- a/ghc/tests/typecheck/should_compile/tc005.stderr
+++ b/ghc/tests/typecheck/should_compile/tc005.stderr
@@ -1,7 +1,7 @@
ghc: module version changed to 1; reason: no old .hi file
_interface_ ShouldSucceed 1
_instance_modules_
-Addr ArrBase Foreign IO PrelBounded PrelNum
+IO PrelAddr PrelArr PrelBounded PrelCCall PrelForeign PrelNum
_usages_
PrelBase 1 :: $d1 1 $d10 1 $d13 1 $d15 1 $d2 1 $d21 1 $d26 1 $d27 1 $d29 1 $d3 1 $d30 1 $d31 1 $d33 1 $d34 1 $d36 1 $d38 1 $d4 1 $d42 1 $d7 1 $d8 1 $m- 1 $m/= 1 $mfromInt 1 $mshowList 1 Eq 1 Eval 1 Num 1 Show 1 String 1;
PrelNum 1 :: $d10 1 $d16 1 $d18 1 $d29 1 $d33 1 $d35 1;
@@ -9,4 +9,4 @@ PrelTup 1 :: $d13 1 $d4 1 $d9 1;
_exports_
ShouldSucceed g;
_declarations_
-1 g _:_ _forall_ [ta tb] {PrelBase.Num ta} => ([ta], tb) -> ta ;;
+1 g _:_ _forall_ [a b] {PrelBase.Num a} => ([a], b) -> a ;;
diff --git a/ghc/tests/typecheck/should_compile/tc006.stderr b/ghc/tests/typecheck/should_compile/tc006.stderr
index 5f7f27a30726d2c3f804f381d8c577e038ae52d0..f9021ab0b2c141046e22cb5cdcd5b5fb0912ef23 100644
--- a/ghc/tests/typecheck/should_compile/tc006.stderr
+++ b/ghc/tests/typecheck/should_compile/tc006.stderr
@@ -1,7 +1,7 @@
ghc: module version changed to 1; reason: no old .hi file
_interface_ ShouldSucceed 1
_instance_modules_
-Addr ArrBase Foreign IO PrelBounded PrelNum
+IO PrelAddr PrelArr PrelBounded PrelCCall PrelForeign PrelNum
_usages_
PrelBase 1 :: $d1 1 $d10 1 $d13 1 $d15 1 $d2 1 $d21 1 $d26 1 $d27 1 $d29 1 $d3 1 $d30 1 $d31 1 $d33 1 $d34 1 $d36 1 $d38 1 $d4 1 $d42 1 $d7 1 $d8 1 $m- 1 $m/= 1 $mfromInt 1 $mshowList 1 Eq 1 Eval 1 Num 1 Show 1 String 1;
PrelNum 1 :: $d10 1 $d16 1 $d18 1 $d29 1 $d33 1 $d35 1;
diff --git a/ghc/tests/typecheck/should_compile/tc007.stderr b/ghc/tests/typecheck/should_compile/tc007.stderr
index 4dbcc4465d44e0bf297f69000fd698e034156953..678ff65133c4a4429eec407e0a0a943117d29608 100644
--- a/ghc/tests/typecheck/should_compile/tc007.stderr
+++ b/ghc/tests/typecheck/should_compile/tc007.stderr
@@ -1,7 +1,7 @@
ghc: module version changed to 1; reason: no old .hi file
_interface_ ShouldSucceed 1
_instance_modules_
-Addr ArrBase Foreign IO PrelBounded PrelNum
+IO PrelAddr PrelArr PrelBounded PrelCCall PrelForeign PrelNum
_usages_
PrelBase 1 :: $d1 1 $d10 1 $d13 1 $d15 1 $d2 1 $d21 1 $d26 1 $d27 1 $d29 1 $d3 1 $d30 1 $d31 1 $d33 1 $d34 1 $d36 1 $d38 1 $d4 1 $d42 1 $d7 1 $d8 1 $m- 1 $m/= 1 $mfromInt 1 $mshowList 1 Eq 1 Eval 1 Num 1 Show 1 String 1;
PrelNum 1 :: $d10 1 $d16 1 $d18 1 $d29 1 $d33 1 $d35 1;
diff --git a/ghc/tests/typecheck/should_compile/tc008.stderr b/ghc/tests/typecheck/should_compile/tc008.stderr
index f6fa66e8b9d98fa51202e31562c63debdbc8d555..3b25bb5202347f9fd1e8b8c8b0d4144900290779 100644
--- a/ghc/tests/typecheck/should_compile/tc008.stderr
+++ b/ghc/tests/typecheck/should_compile/tc008.stderr
@@ -1,11 +1,11 @@
ghc: module version changed to 1; reason: no old .hi file
_interface_ ShouldSucceed 1
_instance_modules_
-Addr ArrBase Foreign IO PrelBounded PrelNum
+IO PrelAddr PrelArr PrelBounded PrelCCall PrelForeign PrelNum
_usages_
PrelBase 1 :: $d1 1 $d10 1 $d13 1 $d15 1 $d2 1 $d21 1 $d26 1 $d27 1 $d29 1 $d3 1 $d30 1 $d31 1 $d33 1 $d34 1 $d36 1 $d38 1 $d4 1 $d42 1 $d7 1 $d8 1 $m- 1 $m/= 1 $mfromInt 1 $mshowList 1 Eq 1 Eval 1 Num 1 Show 1 String 1;
PrelNum 1 :: $d10 1 $d16 1 $d18 1 $d29 1 $d33 1 $d35 1;
_exports_
ShouldSucceed n;
_declarations_
-1 n _:_ _forall_ [ta] {PrelBase.Num ta} => PrelBase.Bool -> ta ;;
+1 n _:_ _forall_ [a] {PrelBase.Num a} => PrelBase.Bool -> a ;;
diff --git a/ghc/tests/typecheck/should_compile/tc009.stderr b/ghc/tests/typecheck/should_compile/tc009.stderr
index ccee729ebbe96a7a2c53c3f71a81df377372bfd4..ef4a71ddea17d1a89b0670f69925fa24cdb946fd 100644
--- a/ghc/tests/typecheck/should_compile/tc009.stderr
+++ b/ghc/tests/typecheck/should_compile/tc009.stderr
@@ -1,7 +1,7 @@
ghc: module version changed to 1; reason: no old .hi file
_interface_ ShouldSucceed 1
_instance_modules_
-Addr ArrBase Foreign IO PrelBounded PrelNum
+IO PrelAddr PrelArr PrelBounded PrelCCall PrelForeign PrelNum
_usages_
PrelBase 1 :: $d1 1 $d10 1 $d13 1 $d15 1 $d2 1 $d21 1 $d26 1 $d27 1 $d29 1 $d3 1 $d30 1 $d31 1 $d33 1 $d34 1 $d36 1 $d38 1 $d4 1 $d42 1 $d7 1 $d8 1 $m- 1 $m/= 1 $mfromInt 1 $mshowList 1 Eq 1 Eval 1 Num 1 Show 1 String 1;
PrelNum 1 :: $d10 1 $d16 1 $d18 1 $d29 1 $d33 1 $d35 1;
@@ -9,4 +9,4 @@ PrelTup 1 :: $d13 1 $d4 1 $d9 1;
_exports_
ShouldSucceed o;
_declarations_
-1 o _:_ _forall_ [ta] {PrelBase.Num ta} => (PrelBase.Bool, ta) -> ta ;;
+1 o _:_ _forall_ [a] {PrelBase.Num a} => (PrelBase.Bool, a) -> a ;;
diff --git a/ghc/tests/typecheck/should_compile/tc010.stderr b/ghc/tests/typecheck/should_compile/tc010.stderr
index 52400ffb4160603e5bbc49cfe7fe5a7d996080d9..6e609688380ae68be369e8a319cb249981a77d19 100644
--- a/ghc/tests/typecheck/should_compile/tc010.stderr
+++ b/ghc/tests/typecheck/should_compile/tc010.stderr
@@ -1,7 +1,7 @@
ghc: module version changed to 1; reason: no old .hi file
_interface_ ShouldSucceed 1
_instance_modules_
-Addr ArrBase Foreign IO PrelBounded PrelNum
+IO PrelAddr PrelArr PrelBounded PrelCCall PrelForeign PrelNum
_usages_
PrelBase 1 :: $d1 1 $d10 1 $d13 1 $d15 1 $d17 1 $d18 1 $d2 1 $d21 1 $d26 1 $d27 1 $d29 1 $d3 1 $d30 1 $d31 1 $d33 1 $d34 1 $d36 1 $d38 1 $d4 1 $d42 1 $d7 1 $d8 1 $m- 1 $m/= 1 $m>> 1 $mfromInt 1 $mshowList 1 Eq 1 Eval 1 Monad 1 MonadZero 1 Num 1 Show 1 String 1;
PrelNum 1 :: $d10 1 $d16 1 $d18 1 $d29 1 $d33 1 $d35 1;
diff --git a/ghc/tests/typecheck/should_compile/tc011.stderr b/ghc/tests/typecheck/should_compile/tc011.stderr
index 867cc3f5a4127d1c47ed053ac6f147c0f733e067..c9670cfa77fa5b8addac21171ad02800ba47325d 100644
--- a/ghc/tests/typecheck/should_compile/tc011.stderr
+++ b/ghc/tests/typecheck/should_compile/tc011.stderr
@@ -1,8 +1,8 @@
ghc: module version changed to 1; reason: no old .hi file
_interface_ ShouldSucceed 1
_instance_modules_
-Addr ArrBase Foreign IO PrelBounded PrelNum
+IO PrelAddr PrelArr PrelBounded PrelCCall PrelForeign PrelNum
_exports_
ShouldSucceed x;
_declarations_
-1 x _:_ _forall_ [ta] => ta ;;
+1 x _:_ _forall_ [a] => a ;;
diff --git a/ghc/tests/typecheck/should_compile/tc012.stderr b/ghc/tests/typecheck/should_compile/tc012.stderr
index 6b89724f17709c0fc03a206866e6c5ebcdb8e204..0afb535fbec2bf5004b48b9334966e75de7c531a 100644
--- a/ghc/tests/typecheck/should_compile/tc012.stderr
+++ b/ghc/tests/typecheck/should_compile/tc012.stderr
@@ -1,8 +1,8 @@
ghc: module version changed to 1; reason: no old .hi file
_interface_ ShouldSucceed 1
_instance_modules_
-Addr ArrBase Foreign IO PrelBounded PrelNum
+IO PrelAddr PrelArr PrelBounded PrelCCall PrelForeign PrelNum
_exports_
ShouldSucceed q;
_declarations_
-1 q _:_ _forall_ [ta] => ta -> ta ;;
+1 q _:_ _forall_ [a] => a -> a ;;
diff --git a/ghc/tests/typecheck/should_compile/tc013.stderr b/ghc/tests/typecheck/should_compile/tc013.stderr
index 2fd573f2996be0024eb4e9b4ce92ab823be9e4f2..17d2373fc36f873285233c307930695411fde8b6 100644
--- a/ghc/tests/typecheck/should_compile/tc013.stderr
+++ b/ghc/tests/typecheck/should_compile/tc013.stderr
@@ -1,7 +1,7 @@
ghc: module version changed to 1; reason: no old .hi file
_interface_ ShouldSucceed 1
_instance_modules_
-Addr ArrBase Foreign IO PrelBounded PrelNum
+IO PrelAddr PrelArr PrelBounded PrelCCall PrelForeign PrelNum
_usages_
PrelBase 1 :: $d1 1 $d10 1 $d13 1 $d15 1 $d2 1 $d21 1 $d26 1 $d27 1 $d29 1 $d3 1 $d30 1 $d31 1 $d33 1 $d34 1 $d36 1 $d38 1 $d4 1 $d42 1 $d7 1 $d8 1 $m- 1 $m/= 1 $mfromInt 1 $mshowList 1 Eq 1 Eval 1 Num 1 Show 1 String 1;
PrelNum 1 :: $d10 1 $d16 1 $d18 1 $d29 1 $d33 1 $d35 1;
diff --git a/ghc/tests/typecheck/should_compile/tc014.stderr b/ghc/tests/typecheck/should_compile/tc014.stderr
index 5b412d7619c83aea688221c95c7cde07cee94b3b..743295a18c19be9cdf77b6aaf090f542a360fead 100644
--- a/ghc/tests/typecheck/should_compile/tc014.stderr
+++ b/ghc/tests/typecheck/should_compile/tc014.stderr
@@ -1,7 +1,7 @@
ghc: module version changed to 1; reason: no old .hi file
_interface_ ShouldSucceed 1
_instance_modules_
-Addr ArrBase Foreign IO PrelBounded PrelNum
+IO PrelAddr PrelArr PrelBounded PrelCCall PrelForeign PrelNum
_usages_
PrelBase 1 :: $d1 1 $d10 1 $d13 1 $d15 1 $d2 1 $d21 1 $d26 1 $d27 1 $d29 1 $d3 1 $d30 1 $d31 1 $d33 1 $d34 1 $d36 1 $d38 1 $d4 1 $d42 1 $d7 1 $d8 1 $m- 1 $m/= 1 $mfromInt 1 $mshowList 1 Eq 1 Eval 1 Num 1 Show 1 String 1;
PrelNum 1 :: $d10 1 $d16 1 $d18 1 $d29 1 $d33 1 $d35 1;
diff --git a/ghc/tests/typecheck/should_compile/tc015.stderr b/ghc/tests/typecheck/should_compile/tc015.stderr
index c550b2b40d4ef3dfe3b5049f84260bdfe544c6c2..108fbfe4972b066c057736ab30cca01c9a03f33f 100644
--- a/ghc/tests/typecheck/should_compile/tc015.stderr
+++ b/ghc/tests/typecheck/should_compile/tc015.stderr
@@ -1,8 +1,8 @@
ghc: module version changed to 1; reason: no old .hi file
_interface_ ShouldSucceed 1
_instance_modules_
-Addr ArrBase Foreign IO PrelBounded PrelNum
+IO PrelAddr PrelArr PrelBounded PrelCCall PrelForeign PrelNum
_exports_
ShouldSucceed u;
_declarations_
-1 u _:_ _forall_ [ta tb tc] => ta -> (tb, tc) -> ta ;;
+1 u _:_ _forall_ [a b c] => a -> (b, c) -> a ;;
diff --git a/ghc/tests/typecheck/should_compile/tc016.stderr b/ghc/tests/typecheck/should_compile/tc016.stderr
index 4ffd24a8b7f019cec8cb3bc65136407684f2939a..21661d07df77a87aab1d97d0193213e1eb8177cb 100644
--- a/ghc/tests/typecheck/should_compile/tc016.stderr
+++ b/ghc/tests/typecheck/should_compile/tc016.stderr
@@ -1,8 +1,8 @@
ghc: module version changed to 1; reason: no old .hi file
_interface_ ShouldSucceed 1
_instance_modules_
-Addr ArrBase Foreign IO PrelBounded PrelNum
+IO PrelAddr PrelArr PrelBounded PrelCCall PrelForeign PrelNum
_exports_
ShouldSucceed f;
_declarations_
-1 f _:_ _forall_ [ta tb] => tb -> ta -> tb ;;
+1 f _:_ _forall_ [a b] => b -> a -> b ;;
diff --git a/ghc/tests/typecheck/should_compile/tc017.stderr b/ghc/tests/typecheck/should_compile/tc017.stderr
index 54ce60ef57366d4316d172bc80ae6837ae2adff3..b5237a663346ddbb2a4aa0bf73ab0071fb6f54e4 100644
--- a/ghc/tests/typecheck/should_compile/tc017.stderr
+++ b/ghc/tests/typecheck/should_compile/tc017.stderr
@@ -1,7 +1,7 @@
ghc: module version changed to 1; reason: no old .hi file
_interface_ ShouldSucceed 1
_instance_modules_
-Addr ArrBase Foreign IO PrelBounded PrelNum
+IO PrelAddr PrelArr PrelBounded PrelCCall PrelForeign PrelNum
_usages_
PrelBase 1 :: $d1 1 $d10 1 $d13 1 $d15 1 $d2 1 $d21 1 $d26 1 $d27 1 $d29 1 $d3 1 $d30 1 $d31 1 $d33 1 $d34 1 $d36 1 $d38 1 $d4 1 $d42 1 $d7 1 $d8 1 $m- 1 $m/= 1 $mfromInt 1 $mshowList 1 Eq 1 Eval 1 Num 1 Show 1 String 1;
PrelNum 1 :: $d10 1 $d16 1 $d18 1 $d29 1 $d33 1 $d35 1;
diff --git a/ghc/tests/typecheck/should_compile/tc018.stderr b/ghc/tests/typecheck/should_compile/tc018.stderr
index 13a2c3082d8efcdf21961913a080e03df5a67fc3..3ccd129cf062bf3d8d4b78de50fafa85280702ec 100644
--- a/ghc/tests/typecheck/should_compile/tc018.stderr
+++ b/ghc/tests/typecheck/should_compile/tc018.stderr
@@ -1,7 +1,7 @@
ghc: module version changed to 1; reason: no old .hi file
_interface_ ShouldSucceed 1
_instance_modules_
-Addr ArrBase Foreign IO PrelBounded PrelNum
+IO PrelAddr PrelArr PrelBounded PrelCCall PrelForeign PrelNum
_usages_
PrelBase 1 :: $d1 1 $d10 1 $d13 1 $d15 1 $d2 1 $d21 1 $d26 1 $d27 1 $d29 1 $d3 1 $d30 1 $d31 1 $d33 1 $d34 1 $d36 1 $d38 1 $d4 1 $d42 1 $d7 1 $d8 1 $m- 1 $m/= 1 $mfromInt 1 $mshowList 1 Eq 1 Eval 1 Num 1 Show 1 String 1;
PrelNum 1 :: $d10 1 $d16 1 $d18 1 $d29 1 $d33 1 $d35 1;
diff --git a/ghc/tests/typecheck/should_compile/tc019.stderr b/ghc/tests/typecheck/should_compile/tc019.stderr
index 926391cc77bcfd0cfe170b6f62cd05a4c15702b8..6708252d32587939d40e7e086482eaf9915e0d52 100644
--- a/ghc/tests/typecheck/should_compile/tc019.stderr
+++ b/ghc/tests/typecheck/should_compile/tc019.stderr
@@ -1,7 +1,7 @@
ghc: module version changed to 1; reason: no old .hi file
_interface_ ShouldSucceed 1
_instance_modules_
-Addr ArrBase Foreign IO PrelBounded PrelNum
+IO PrelAddr PrelArr PrelBounded PrelCCall PrelForeign PrelNum
_usages_
PrelBase 1 :: $d1 1 $d10 1 $d13 1 $d15 1 $d17 1 $d18 1 $d2 1 $d21 1 $d26 1 $d27 1 $d29 1 $d3 1 $d30 1 $d31 1 $d33 1 $d34 1 $d36 1 $d38 1 $d4 1 $d42 1 $d7 1 $d8 1 $m- 1 $m/= 1 $m>> 1 $mfromInt 1 $mshowList 1 Eq 1 Eval 1 Monad 1 MonadZero 1 Num 1 Show 1 String 1;
PrelNum 1 :: $d10 1 $d16 1 $d18 1 $d29 1 $d33 1 $d35 1;
diff --git a/ghc/tests/typecheck/should_compile/tc020.stderr b/ghc/tests/typecheck/should_compile/tc020.stderr
index c0802c4575e58d305cbdafbece0ce2ca46f6ec31..a4b12b4130ac589d1d9d906975efeddb0b7535a8 100644
--- a/ghc/tests/typecheck/should_compile/tc020.stderr
+++ b/ghc/tests/typecheck/should_compile/tc020.stderr
@@ -1,8 +1,8 @@
ghc: module version changed to 1; reason: no old .hi file
_interface_ ShouldSucceed 1
_instance_modules_
-Addr ArrBase Foreign IO PrelBounded PrelNum
+IO PrelAddr PrelArr PrelBounded PrelCCall PrelForeign PrelNum
_exports_
ShouldSucceed f;
_declarations_
-1 f _:_ _forall_ [ta] => ta -> [ta] ;;
+1 f _:_ _forall_ [a] => a -> [a] ;;
diff --git a/ghc/tests/typecheck/should_compile/tc021.stderr b/ghc/tests/typecheck/should_compile/tc021.stderr
index bbea030c322657bcf26f9c9862e01a4505066df4..8e2ba2274ceee9a408cea9463ccbb1768937571e 100644
--- a/ghc/tests/typecheck/should_compile/tc021.stderr
+++ b/ghc/tests/typecheck/should_compile/tc021.stderr
@@ -1,10 +1,10 @@
ghc: module version changed to 1; reason: no old .hi file
_interface_ ShouldSucceed 1
_instance_modules_
-Addr ArrBase Foreign IO PrelBounded PrelNum
+IO PrelAddr PrelArr PrelBounded PrelCCall PrelForeign PrelNum
_exports_
ShouldSucceed a f x;
_declarations_
-1 a _:_ _forall_ [ta tb] => (ta, tb) ;;
-1 f _:_ _forall_ [ta tb tc] => ta -> (tb, tc) ;;
-1 x _:_ _forall_ [ta] => ta ;;
+1 a _:_ _forall_ [a b] => (a, b) ;;
+1 f _:_ _forall_ [a b c] => a -> (b, c) ;;
+1 x _:_ _forall_ [a] => a ;;
diff --git a/ghc/tests/typecheck/should_compile/tc022.stderr b/ghc/tests/typecheck/should_compile/tc022.stderr
index 17bc4c13be43b1ec17bf842112d2fabf917cd6c0..7533f1300fc79e5f090858189a8208ff38ef583e 100644
--- a/ghc/tests/typecheck/should_compile/tc022.stderr
+++ b/ghc/tests/typecheck/should_compile/tc022.stderr
@@ -1,9 +1,9 @@
ghc: module version changed to 1; reason: no old .hi file
_interface_ ShouldSucceed 1
_instance_modules_
-Addr ArrBase Foreign IO PrelBounded PrelNum
+IO PrelAddr PrelArr PrelBounded PrelCCall PrelForeign PrelNum
_exports_
ShouldSucceed iD main;
_declarations_
-1 iD _:_ _forall_ [ta] => ta -> ta ;;
-1 main _:_ _forall_ [ta] => ta -> ta ;;
+1 iD _:_ _forall_ [a] => a -> a ;;
+1 main _:_ _forall_ [a] => a -> a ;;
diff --git a/ghc/tests/typecheck/should_compile/tc023.stderr b/ghc/tests/typecheck/should_compile/tc023.stderr
index d9968a473e50df275d778903232d2a6d4e915bc3..4d2205c507fc2cf33fce1ca9764ebe81eff27869 100644
--- a/ghc/tests/typecheck/should_compile/tc023.stderr
+++ b/ghc/tests/typecheck/should_compile/tc023.stderr
@@ -1,10 +1,10 @@
ghc: module version changed to 1; reason: no old .hi file
_interface_ ShouldSucceed 1
_instance_modules_
-Addr ArrBase Foreign IO PrelBounded PrelNum
+IO PrelAddr PrelArr PrelBounded PrelCCall PrelForeign PrelNum
_exports_
ShouldSucceed k main s;
_declarations_
-1 k _:_ _forall_ [ta tb] => tb -> ta -> tb ;;
-1 main _:_ _forall_ [ta] => ta -> ta ;;
-1 s _:_ _forall_ [ta tb tc] => (tb -> tc -> ta) -> (tb -> tc) -> tb -> ta ;;
+1 k _:_ _forall_ [a b] => b -> a -> b ;;
+1 main _:_ _forall_ [a] => a -> a ;;
+1 s _:_ _forall_ [a b c] => (b -> c -> a) -> (b -> c) -> b -> a ;;
diff --git a/ghc/tests/typecheck/should_compile/tc024.stderr b/ghc/tests/typecheck/should_compile/tc024.stderr
index d9968a473e50df275d778903232d2a6d4e915bc3..4d2205c507fc2cf33fce1ca9764ebe81eff27869 100644
--- a/ghc/tests/typecheck/should_compile/tc024.stderr
+++ b/ghc/tests/typecheck/should_compile/tc024.stderr
@@ -1,10 +1,10 @@
ghc: module version changed to 1; reason: no old .hi file
_interface_ ShouldSucceed 1
_instance_modules_
-Addr ArrBase Foreign IO PrelBounded PrelNum
+IO PrelAddr PrelArr PrelBounded PrelCCall PrelForeign PrelNum
_exports_
ShouldSucceed k main s;
_declarations_
-1 k _:_ _forall_ [ta tb] => tb -> ta -> tb ;;
-1 main _:_ _forall_ [ta] => ta -> ta ;;
-1 s _:_ _forall_ [ta tb tc] => (tb -> tc -> ta) -> (tb -> tc) -> tb -> ta ;;
+1 k _:_ _forall_ [a b] => b -> a -> b ;;
+1 main _:_ _forall_ [a] => a -> a ;;
+1 s _:_ _forall_ [a b c] => (b -> c -> a) -> (b -> c) -> b -> a ;;
diff --git a/ghc/tests/typecheck/should_compile/tc025.stderr b/ghc/tests/typecheck/should_compile/tc025.stderr
index 991786fa99256ffb2e1e9b102aa83d8172f7e628..03ba01dab197c106e299770cf4962b9e9d1cc778 100644
--- a/ghc/tests/typecheck/should_compile/tc025.stderr
+++ b/ghc/tests/typecheck/should_compile/tc025.stderr
@@ -1,7 +1,7 @@
ghc: module version changed to 1; reason: no old .hi file
_interface_ ShouldSucceed 1
_instance_modules_
-Addr ArrBase Foreign IO PrelBounded PrelNum
+IO PrelAddr PrelArr PrelBounded PrelCCall PrelForeign PrelNum
_exports_
ShouldSucceed g;
_declarations_
diff --git a/ghc/tests/typecheck/should_compile/tc026.stderr b/ghc/tests/typecheck/should_compile/tc026.stderr
index 20b6915c79d000f16979d35a646c8885d9e1540d..47b6a7171d99d625872099e23dcab5e5f0ad6150 100644
--- a/ghc/tests/typecheck/should_compile/tc026.stderr
+++ b/ghc/tests/typecheck/should_compile/tc026.stderr
@@ -1,9 +1,9 @@
ghc: module version changed to 1; reason: no old .hi file
_interface_ ShouldSucceed 1
_instance_modules_
-Addr ArrBase Foreign IO PrelBounded PrelNum
+IO PrelAddr PrelArr PrelBounded PrelCCall PrelForeign PrelNum
_exports_
ShouldSucceed f g;
_declarations_
-1 f _:_ _forall_ [ta] => PrelBase.Bool -> ta -> ta ;;
+1 f _:_ _forall_ [a] => PrelBase.Bool -> a -> a ;;
1 g _:_ PrelBase.Bool -> PrelBase.Bool ;;
diff --git a/ghc/tests/typecheck/should_compile/tc027.stderr b/ghc/tests/typecheck/should_compile/tc027.stderr
index 59c50f59aa5a00836987d26eedef9dde9f5d791b..54b7d3cf3a61a8adcae7842d13863fcf691be8d1 100644
--- a/ghc/tests/typecheck/should_compile/tc027.stderr
+++ b/ghc/tests/typecheck/should_compile/tc027.stderr
@@ -3,10 +3,10 @@ NOTE: Simplifier still going after 4 iterations; bailing out.
ghc: module version changed to 1; reason: no old .hi file
_interface_ ShouldSucceed 1
_instance_modules_
-Addr ArrBase Foreign IO PrelBounded PrelNum
+IO PrelAddr PrelArr PrelBounded PrelCCall PrelForeign PrelNum
_exports_
ShouldSucceed f g h;
_declarations_
-1 f _:_ _forall_ [ta] => PrelBase.Bool -> ta -> ta ;;
-1 g _:_ _forall_ [ta] => ta -> PrelBase.Bool -> ta ;;
+1 f _:_ _forall_ [a] => PrelBase.Bool -> a -> a ;;
+1 g _:_ _forall_ [a] => a -> PrelBase.Bool -> a ;;
1 h _:_ PrelBase.Bool -> PrelBase.Bool ;;
diff --git a/ghc/tests/typecheck/should_compile/tc028.stderr b/ghc/tests/typecheck/should_compile/tc028.stderr
index 38448f072e2a9a8d39aafeabcedfc66d1023fe71..6c85c42786318dcf479923d9024374a00174e785 100644
--- a/ghc/tests/typecheck/should_compile/tc028.stderr
+++ b/ghc/tests/typecheck/should_compile/tc028.stderr
@@ -1,7 +1,7 @@
ghc: module version changed to 1; reason: no old .hi file
_interface_ ShouldSucceed 1
_instance_modules_
-Addr ArrBase Foreign IO PrelBounded PrelNum
+IO PrelAddr PrelArr PrelBounded PrelCCall PrelForeign PrelNum
_exports_
ShouldSucceed H;
_declarations_
diff --git a/ghc/tests/typecheck/should_compile/tc029.stderr b/ghc/tests/typecheck/should_compile/tc029.stderr
index 6fabfd62ef37baf89639e0f580c5fe908232051f..ae2afbdb8bcf30fc49c7a86104f8b6d3aa0d2906 100644
--- a/ghc/tests/typecheck/should_compile/tc029.stderr
+++ b/ghc/tests/typecheck/should_compile/tc029.stderr
@@ -1,7 +1,7 @@
ghc: module version changed to 1; reason: no old .hi file
_interface_ ShouldSucceed 1
_instance_modules_
-Addr ArrBase Foreign IO PrelBounded PrelNum
+IO PrelAddr PrelArr PrelBounded PrelCCall PrelForeign PrelNum
_usages_
PrelBase 1 :: $d2 1 $d29 1 $d31 1 $d33 1 $d36 1 $d38 1 Eval 1;
_exports_
@@ -10,5 +10,5 @@ _instances_
instance {PrelBase.Eval K} = $d1;
_declarations_
1 $d1 _:_ {PrelBase.Eval K} ;;
-1 type G = [PrelBase.Int] ;
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
index 24194ed39e935bf0ed18d73ba935165cbc2097d3..18c6afe59c901cb18249b33f00f27649bc702aeb 100644
--- a/ghc/tests/typecheck/should_compile/tc030.stderr
+++ b/ghc/tests/typecheck/should_compile/tc030.stderr
@@ -1,7 +1,7 @@
ghc: module version changed to 1; reason: no old .hi file
_interface_ ShouldSucceed 1
_instance_modules_
-Addr ArrBase Foreign IO PrelBounded PrelNum
+IO PrelAddr PrelArr PrelBounded PrelCCall PrelForeign PrelNum
_exports_
ShouldSucceed G H;
_declarations_
diff --git a/ghc/tests/typecheck/should_compile/tc031.stderr b/ghc/tests/typecheck/should_compile/tc031.stderr
index f2656f6983489f3c49a634f9388bb0f48a479959..3d4b4ec4fd80439100eb8fa809f69dc4ad8f5bc8 100644
--- a/ghc/tests/typecheck/should_compile/tc031.stderr
+++ b/ghc/tests/typecheck/should_compile/tc031.stderr
@@ -1,7 +1,7 @@
ghc: module version changed to 1; reason: no old .hi file
_interface_ ShouldSucceed 1
_instance_modules_
-Addr ArrBase Foreign IO PrelBounded PrelNum
+IO PrelAddr PrelArr PrelBounded PrelCCall PrelForeign PrelNum
_usages_
PrelBase 1 :: $d2 1 $d29 1 $d31 1 $d33 1 $d38 1 Eval 1;
_exports_
diff --git a/ghc/tests/typecheck/should_compile/tc032.stderr b/ghc/tests/typecheck/should_compile/tc032.stderr
index fc5bff64a316dbff33966c71e67cae60bb013d43..7c882b7d9019a3547cabaea42478ba61e0b4e053 100644
--- a/ghc/tests/typecheck/should_compile/tc032.stderr
+++ b/ghc/tests/typecheck/should_compile/tc032.stderr
@@ -1,14 +1,14 @@
ghc: module version changed to 1; reason: no old .hi file
_interface_ ShouldSucceed 1
_instance_modules_
-Addr ArrBase Foreign IO PrelBounded PrelNum
+IO PrelAddr PrelArr PrelBounded PrelCCall PrelForeign PrelNum
_usages_
PrelBase 1 :: $d2 1 $d29 1 $d30 1 $d31 1 $d33 1 $d36 1 $d38 1 Eval 1;
PrelTup 1 :: $d13 1;
_exports_
ShouldSucceed AList(Node Other);
_instances_
-instance _forall_ [b] => {PrelBase.Eval (AList b)} = $d1;
+instance _forall_ [a] => {PrelBase.Eval (AList a)} = $d1;
_declarations_
-1 $d1 _:_ _forall_ [b] => {PrelBase.Eval (AList b)} ;;
+1 $d1 _:_ _forall_ [a] => {PrelBase.Eval (AList a)} ;;
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
index 8f2124f00e426052f63a416ced7a2aa6d5fb2095..780456ed012b4a1088e09af8e928ce0ca2aa0428 100644
--- a/ghc/tests/typecheck/should_compile/tc033.stderr
+++ b/ghc/tests/typecheck/should_compile/tc033.stderr
@@ -1,7 +1,7 @@
ghc: module version changed to 1; reason: no old .hi file
_interface_ ShouldSucceed 1
_instance_modules_
-Addr ArrBase Foreign IO PrelBounded PrelNum
+IO PrelAddr PrelArr PrelBounded PrelCCall PrelForeign PrelNum
_usages_
PrelBase 1 :: $d2 1 $d29 1 $d31 1 $d33 1 $d38 1 Eval 1;
_exports_
@@ -12,6 +12,6 @@ instance {PrelBase.Eval Twine} = $d2;
_declarations_
1 $d1 _:_ {PrelBase.Eval Twist} ;;
1 $d2 _:_ {PrelBase.Eval Twine} ;;
-1 type F = Twine ;
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
index 2725e9d2857ba45a4b92057445cca15e99be7ded..468e791573309467debd75f58d723be1aa5ec0dd 100644
--- a/ghc/tests/typecheck/should_compile/tc034.stderr
+++ b/ghc/tests/typecheck/should_compile/tc034.stderr
@@ -1,7 +1,7 @@
ghc: module version changed to 1; reason: no old .hi file
_interface_ ShouldSucceed 1
_instance_modules_
-Addr ArrBase Foreign IO PrelBounded PrelNum
+IO PrelAddr PrelArr PrelBounded PrelCCall PrelForeign PrelNum
_usages_
PrelBase 1 :: $d1 1 $d10 1 $d13 1 $d15 1 $d2 1 $d21 1 $d26 1 $d27 1 $d29 1 $d3 1 $d30 1 $d31 1 $d33 1 $d34 1 $d36 1 $d38 1 $d4 1 $d42 1 $d7 1 $d8 1 $m- 1 $m/= 1 $mfromInt 1 $mshowList 1 Eq 1 Eval 1 Num 1 Show 1 String 1;
PrelNum 1 :: $d10 1 $d16 1 $d18 1 $d29 1 $d33 1 $d35 1;
@@ -12,5 +12,5 @@ instance _forall_ [a] => {PrelBase.Eval (AList a)} = $d1;
_declarations_
1 $d1 _:_ _forall_ [a] => {PrelBase.Eval (AList a)} ;;
1 data AList a = ANull | ANode a (AList a) ;
+1 g _:_ _forall_ [a] {PrelBase.Num a} => AList PrelBase.Bool -> a ;;
1 type IntList = AList PrelBase.Int ;
-1 g _:_ _forall_ [ta] {PrelBase.Num ta} => AList PrelBase.Bool -> ta ;;
diff --git a/ghc/tests/typecheck/should_compile/tc035.stderr b/ghc/tests/typecheck/should_compile/tc035.stderr
index 04e92beec9d5a54f045145d183d4068b65d5463d..85cdd733e1d1e5cee8fe165db3c4136596f4e35b 100644
--- a/ghc/tests/typecheck/should_compile/tc035.stderr
+++ b/ghc/tests/typecheck/should_compile/tc035.stderr
@@ -1,7 +1,7 @@
ghc: module version changed to 1; reason: no old .hi file
_interface_ ShouldSucceed 1
_instance_modules_
-Addr ArrBase Foreign IO PrelBounded PrelNum
+IO PrelAddr PrelArr PrelBounded PrelCCall PrelForeign PrelNum
_usages_
PrelBase 1 :: $d16 1 $d17 1 $d18 1 $d2 1 $d29 1 $d30 1 $d31 1 $d33 1 $d36 1 $d38 1 $m>> 1 Eval 1 Monad 1 MonadPlus 1 MonadZero 1;
PrelTup 1 :: $d13 1;
@@ -11,6 +11,6 @@ _instances_
instance _forall_ [a] => {PrelBase.Eval (Expr a)} = $d1;
_declarations_
1 $d1 _:_ _forall_ [a] => {PrelBase.Eval (Expr a)} ;;
-1 type AnnExpr a = (a, Expr a) ;
1 data Expr a = Var [PrelBase.Char] | App (AnnExpr a) (AnnExpr a) ;
-1 g _:_ _forall_ [ta] => (ta, Expr ta) -> [[PrelBase.Char]] ;;
+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
index 7bbf5e8d9c65fe10598e3ecad38076c1a01861fe..7059f93c18798fa3a87d3b902bc2dc745075f91b 100644
--- a/ghc/tests/typecheck/should_compile/tc036.stderr
+++ b/ghc/tests/typecheck/should_compile/tc036.stderr
@@ -1,11 +1,11 @@
ghc: module version changed to 1; reason: no old .hi file
_interface_ ShouldSucceed 1
_instance_modules_
-Addr ArrBase Foreign IO PrelBounded PrelNum
+IO PrelAddr PrelArr PrelBounded PrelCCall PrelForeign PrelNum
_usages_
PrelBase 1 :: $d13 1 $d26 1 $d7 1 $m/= 1 Eq 1;
PrelNum 1 :: $d18 1;
_exports_
-ShouldSucceed A(op1);
+ShouldSucceed A(:A :A op1);
_declarations_
1 class {PrelBase.Eq a} => A a where {op1 :: a -> a} ;
diff --git a/ghc/tests/typecheck/should_compile/tc037.stderr b/ghc/tests/typecheck/should_compile/tc037.stderr
index 20ecaddafe0059e05eb694cf181e28de225275fe..4b3133bbd10a626f69b2342314a71f6477e04e1f 100644
--- a/ghc/tests/typecheck/should_compile/tc037.stderr
+++ b/ghc/tests/typecheck/should_compile/tc037.stderr
@@ -1,9 +1,9 @@
ghc: module version changed to 1; reason: no old .hi file
_interface_ ShouldSucceed 1
_instance_modules_
-Addr ArrBase Foreign IO PrelBounded PrelNum
+IO PrelAddr PrelArr PrelBounded PrelCCall PrelForeign PrelNum
_exports_
-ShouldSucceed Eq'(deq);
+ShouldSucceed Eq'(:Eq' :Eq' deq);
_instances_
instance _forall_ [a] {Eq' a} => {Eq' [a]} = $d1;
_declarations_
diff --git a/ghc/tests/typecheck/should_compile/tc038.stderr b/ghc/tests/typecheck/should_compile/tc038.stderr
index 2d65d4546db4b6de863960b0444e0644adb9b5fc..4525b7f6a442777fd9f66f8588a82c5f159c4491 100644
--- a/ghc/tests/typecheck/should_compile/tc038.stderr
+++ b/ghc/tests/typecheck/should_compile/tc038.stderr
@@ -1,11 +1,11 @@
ghc: module version changed to 1; reason: no old .hi file
_interface_ ShouldSucceed 1
_instance_modules_
-Addr ArrBase Foreign IO PrelBounded PrelNum
+IO PrelAddr PrelArr PrelBounded PrelCCall PrelForeign PrelNum
_usages_
PrelBase 1 :: $d1 1 $d10 1 $d13 1 $d15 1 $d2 1 $d21 1 $d26 1 $d27 1 $d29 1 $d3 1 $d30 1 $d31 1 $d33 1 $d34 1 $d36 1 $d38 1 $d4 1 $d42 1 $d7 1 $d8 1 $m- 1 $m/= 1 $mfromInt 1 $mshowList 1 Eq 1 Eval 1 Num 1 Show 1 String 1;
PrelNum 1 :: $d10 1 $d16 1 $d18 1 $d29 1 $d33 1 $d35 1;
_exports_
ShouldSucceed f;
_declarations_
-1 f _:_ _forall_ [ta] {PrelBase.Num ta} => [ta] -> [ta] ;;
+1 f _:_ _forall_ [a] {PrelBase.Num a} => [a] -> [a] ;;
diff --git a/ghc/tests/typecheck/should_compile/tc039.stderr b/ghc/tests/typecheck/should_compile/tc039.stderr
index 7bbf5e8d9c65fe10598e3ecad38076c1a01861fe..7059f93c18798fa3a87d3b902bc2dc745075f91b 100644
--- a/ghc/tests/typecheck/should_compile/tc039.stderr
+++ b/ghc/tests/typecheck/should_compile/tc039.stderr
@@ -1,11 +1,11 @@
ghc: module version changed to 1; reason: no old .hi file
_interface_ ShouldSucceed 1
_instance_modules_
-Addr ArrBase Foreign IO PrelBounded PrelNum
+IO PrelAddr PrelArr PrelBounded PrelCCall PrelForeign PrelNum
_usages_
PrelBase 1 :: $d13 1 $d26 1 $d7 1 $m/= 1 Eq 1;
PrelNum 1 :: $d18 1;
_exports_
-ShouldSucceed A(op1);
+ShouldSucceed A(:A :A op1);
_declarations_
1 class {PrelBase.Eq a} => A a where {op1 :: a -> a} ;
diff --git a/ghc/tests/typecheck/should_compile/tc040.stderr b/ghc/tests/typecheck/should_compile/tc040.stderr
index 6bc706feb6df4a0ddab549f811be257a094289ca..586fb337d7ea3f9ebf23f631f04333c4df851fae 100644
--- a/ghc/tests/typecheck/should_compile/tc040.stderr
+++ b/ghc/tests/typecheck/should_compile/tc040.stderr
@@ -1,11 +1,11 @@
ghc: module version changed to 1; reason: no old .hi file
_interface_ ShouldSucceed 1
_instance_modules_
-Addr ArrBase Foreign IO PrelBounded PrelNum
+IO PrelAddr PrelArr PrelBounded PrelCCall PrelForeign PrelNum
_usages_
PrelBase 1 :: $d13 1 $d21 1 $d26 1 $d7 1 $m/= 1 Eq 1;
PrelNum 1 :: $d18 1;
_exports_
ShouldSucceed f;
_declarations_
-1 f _:_ _forall_ [ta] {PrelBase.Eq ta} => ta -> [ta] ;;
+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
index 30e24d3268fa68006dca38d4aae225daf626aace..302599bf748de59a219c529c0f3ee2d54aaca72f 100644
--- a/ghc/tests/typecheck/should_compile/tc041.stderr
+++ b/ghc/tests/typecheck/should_compile/tc041.stderr
@@ -1,9 +1,9 @@
ghc: module version changed to 1; reason: no old .hi file
_interface_ ShouldSucceed 1
_instance_modules_
-Addr ArrBase Foreign IO PrelBounded PrelNum
+IO PrelAddr PrelArr PrelBounded PrelCCall PrelForeign PrelNum
_exports_
-ShouldSucceed f H(op1);
+ShouldSucceed f H(:H :H op1);
_instances_
instance {H PrelBase.Bool} = $d1;
_declarations_
diff --git a/ghc/tests/typecheck/should_compile/tc042.stderr b/ghc/tests/typecheck/should_compile/tc042.stderr
index 83d4ac4fdb725f241ac424e5b7c89d00d522d45c..b20faffaf755ca6f2c05de0c295c96a5405a8464 100644
--- a/ghc/tests/typecheck/should_compile/tc042.stderr
+++ b/ghc/tests/typecheck/should_compile/tc042.stderr
@@ -1,37 +1,37 @@
ghc: module version changed to 1; reason: no old .hi file
_interface_ ShouldSucceed 1
_instance_modules_
-Addr ArrBase Foreign IO PrelBounded PrelNum
+IO PrelAddr PrelArr PrelBounded PrelCCall PrelForeign PrelNum
_usages_
PrelBase 1 :: $d2 1 $d29 1 $d31 1 $d33 1 $d38 1 Eval 1;
_exports_
ShouldSucceed add app before flatten idb idl lEngth nUll neg rEverse sUm swap Boolean(FF TT) List(Nil Cons) Nat(Zero Succ) Pair(Mkpair) Tree(Leaf Node);
_instances_
-instance _forall_ [t] => {PrelBase.Eval (Tree t)} = $d1;
+instance _forall_ [a] => {PrelBase.Eval (Tree a)} = $d1;
instance {PrelBase.Eval Nat} = $d2;
-instance _forall_ [alpha] => {PrelBase.Eval (List alpha)} = $d3;
+instance _forall_ [a] => {PrelBase.Eval (List a)} = $d3;
instance _forall_ [a b] => {PrelBase.Eval (Pair a b)} = $d4;
instance {PrelBase.Eval Boolean} = $d5;
_declarations_
-1 $d1 _:_ _forall_ [t] => {PrelBase.Eval (Tree t)} ;;
+1 $d1 _:_ _forall_ [a] => {PrelBase.Eval (Tree a)} ;;
1 $d2 _:_ {PrelBase.Eval Nat} ;;
-1 $d3 _:_ _forall_ [alpha] => {PrelBase.Eval (List alpha)} ;;
+1 $d3 _:_ _forall_ [a] => {PrelBase.Eval (List a)} ;;
1 $d4 _:_ _forall_ [a b] => {PrelBase.Eval (Pair a b)} ;;
1 $d5 _:_ {PrelBase.Eval Boolean} ;;
+1 add _:_ Nat -> Nat -> Nat ;;
+1 app _:_ _forall_ [a] => List a -> List a -> List a ;;
+1 before _:_ List Nat -> List Nat ;;
1 data Boolean = FF | TT ;
1 data List alpha = Nil | Cons alpha (List alpha) ;
1 data Nat = Zero | Succ Nat ;
1 data Pair a b = Mkpair a b ;
1 data Tree t = Leaf t | Node (Tree t) (Tree t) ;
-1 add _:_ Nat -> Nat -> Nat ;;
-1 app _:_ _forall_ [ta] => List ta -> List ta -> List ta ;;
-1 before _:_ List Nat -> List Nat ;;
-1 flatten _:_ _forall_ [ta] => Tree ta -> List ta ;;
+1 flatten _:_ _forall_ [a] => Tree a -> List a ;;
1 idb _:_ Boolean -> Boolean ;;
-1 idl _:_ _forall_ [ta] => List ta -> List ta ;;
-1 lEngth _:_ _forall_ [ta] => List ta -> Nat ;;
-1 nUll _:_ _forall_ [ta] => List ta -> Boolean ;;
+1 idl _:_ _forall_ [a] => List a -> List a ;;
+1 lEngth _:_ _forall_ [a] => List a -> Nat ;;
+1 nUll _:_ _forall_ [a] => List a -> Boolean ;;
1 neg _:_ Boolean -> Boolean ;;
-1 rEverse _:_ _forall_ [ta] => List ta -> List ta ;;
+1 rEverse _:_ _forall_ [a] => List a -> List a ;;
1 sUm _:_ Tree Nat -> Nat ;;
-1 swap _:_ _forall_ [ta tb] => Pair tb ta -> Pair ta tb ;;
+1 swap _:_ _forall_ [a b] => Pair a b -> Pair b a ;;
diff --git a/ghc/tests/typecheck/should_compile/tc043.stderr b/ghc/tests/typecheck/should_compile/tc043.stderr
index c1ddbf26fb071bc795cc298a03857e23e2e9cfae..c9d76d8773b3ab8125c4a0b2d9bdf80a945db847 100644
--- a/ghc/tests/typecheck/should_compile/tc043.stderr
+++ b/ghc/tests/typecheck/should_compile/tc043.stderr
@@ -1,12 +1,12 @@
ghc: module version changed to 1; reason: no old .hi file
_interface_ ShouldSucceed 1
_instance_modules_
-Addr ArrBase Foreign IO PrelBounded PrelNum
+IO PrelAddr PrelArr PrelBounded PrelCCall PrelForeign PrelNum
_usages_
PrelBase 1 :: $d1 1 $d10 1 $d13 1 $d15 1 $d2 1 $d21 1 $d26 1 $d27 1 $d29 1 $d3 1 $d30 1 $d31 1 $d33 1 $d34 1 $d36 1 $d38 1 $d4 1 $d42 1 $d7 1 $d8 1 $m- 1 $m/= 1 $mfromInt 1 $mshowList 1 Eq 1 Eval 1 Num 1 Show 1 String 1;
PrelNum 1 :: $d10 1 $d16 1 $d18 1 $d29 1 $d33 1 $d35 1;
_exports_
-ShouldSucceed f A(op1) B(op2);
+ShouldSucceed f A(:A :A op1) B(:B :B op2);
_instances_
instance _forall_ [a] {B a} => {B [a]} = $d1;
instance {A PrelBase.Int} = $d2;
@@ -15,4 +15,4 @@ _declarations_
1 $d2 _:_ {A PrelBase.Int} ;;
1 class A a where {op1 :: a} ;
1 class B b where {op2 :: b -> PrelBase.Int} ;
-1 f _:_ _forall_ [ta tb] {A tb} => ta -> tb ;;
+1 f _:_ _forall_ [a b] {A b} => a -> b ;;
diff --git a/ghc/tests/typecheck/should_compile/tc044.stderr b/ghc/tests/typecheck/should_compile/tc044.stderr
index dac00761976a0dedeb27064b9e72ccbd9d9b4e23..a30499d4c1e60bfa790569a626ac00b01837d7aa 100644
--- a/ghc/tests/typecheck/should_compile/tc044.stderr
+++ b/ghc/tests/typecheck/should_compile/tc044.stderr
@@ -1,10 +1,10 @@
ghc: module version changed to 1; reason: no old .hi file
_interface_ ShouldSucceed 1
_instance_modules_
-Addr ArrBase Foreign IO PrelBounded PrelNum
+IO PrelAddr PrelArr PrelBounded PrelCCall PrelForeign PrelNum
_usages_
PrelBase 1 :: otherwise 1;
_exports_
ShouldSucceed f;
_declarations_
-1 f _:_ _forall_ [ta] => ta -> PrelBase.() ;;
+1 f _:_ _forall_ [a] => a -> PrelBase.() ;;
diff --git a/ghc/tests/typecheck/should_compile/tc045.stderr b/ghc/tests/typecheck/should_compile/tc045.stderr
index da27e600edfc3c80923c32df429de6a94d15fdff..9b6345507d0bb4afcc4574097af531c1318f6343 100644
--- a/ghc/tests/typecheck/should_compile/tc045.stderr
+++ b/ghc/tests/typecheck/should_compile/tc045.stderr
@@ -1,9 +1,9 @@
ghc: module version changed to 1; reason: no old .hi file
_interface_ ShouldSucceed 1
_instance_modules_
-Addr ArrBase Foreign IO PrelBounded PrelNum
+IO PrelAddr PrelArr PrelBounded PrelCCall PrelForeign PrelNum
_exports_
-ShouldSucceed B(op2) C(op1);
+ShouldSucceed B(:B :B op2) C(:C :C op1);
_instances_
instance _forall_ [a] => {C [a]} = $d1;
instance _forall_ [a] {B a} => {B [a]} = $d2;
diff --git a/ghc/tests/typecheck/should_compile/tc046.stderr b/ghc/tests/typecheck/should_compile/tc046.stderr
index 778493ee61b3de21af0f8a399443f78888eceec4..467ddf1344e841cca4d37cf62efa7cf177b45b22 100644
--- a/ghc/tests/typecheck/should_compile/tc046.stderr
+++ b/ghc/tests/typecheck/should_compile/tc046.stderr
@@ -1,9 +1,9 @@
ghc: module version changed to 1; reason: no old .hi file
_interface_ ShouldSucceed 1
_instance_modules_
-Addr ArrBase Foreign IO PrelBounded PrelNum
+IO PrelAddr PrelArr PrelBounded PrelCCall PrelForeign PrelNum
_exports_
-ShouldSucceed B(op2) C(op1);
+ShouldSucceed B(:B :B op2) C(:C :C op1);
_declarations_
1 class {C a} => B a where {op2 :: a -> a -> a} ;
1 class C a where {op1 :: a -> a} ;
diff --git a/ghc/tests/typecheck/should_compile/tc047.stderr b/ghc/tests/typecheck/should_compile/tc047.stderr
index 65a28771332f7eeaebcbc69f89adcab9010342d1..2a6812182d90bb89d4e0590d9da55fc35ba39da9 100644
--- a/ghc/tests/typecheck/should_compile/tc047.stderr
+++ b/ghc/tests/typecheck/should_compile/tc047.stderr
@@ -1,11 +1,11 @@
ghc: module version changed to 1; reason: no old .hi file
_interface_ ShouldSucceed 1
_instance_modules_
-Addr ArrBase Foreign IO PrelBounded PrelNum
+IO PrelAddr PrelArr PrelBounded PrelCCall PrelForeign PrelNum
_exports_
ShouldSucceed f mp sd OL;
_declarations_
+1 f _:_ _forall_ [a b c] => a -> [(b, c)] -> [c] ;;
+1 mp _:_ _forall_ [a b] => (a -> b) -> [a] -> [b] ;;
+1 sd _:_ _forall_ [a b] => (a, b) -> b ;;
1 type OL a = [a] ;
-1 f _:_ _forall_ [ta tb tc] => ta -> [(tb, tc)] -> [tc] ;;
-1 mp _:_ _forall_ [ta tb] => (ta -> tb) -> [ta] -> [tb] ;;
-1 sd _:_ _forall_ [ta tb] => (ta, tb) -> tb ;;
diff --git a/ghc/tests/typecheck/should_compile/tc048.stderr b/ghc/tests/typecheck/should_compile/tc048.stderr
index 762324fc89c6dc0a42b6dbea46cf77008813fb4b..f0e476c2405424cc51a1430ee179300162d0a8c5 100644
--- a/ghc/tests/typecheck/should_compile/tc048.stderr
+++ b/ghc/tests/typecheck/should_compile/tc048.stderr
@@ -1,24 +1,24 @@
ghc: module version changed to 1; reason: no old .hi file
_interface_ ShouldSucceed 1
_instance_modules_
-Addr ArrBase Foreign IO PrelBounded PrelNum
+IO PrelAddr PrelArr PrelBounded PrelCCall PrelForeign PrelNum
_usages_
PrelBase 1 :: $d2 1 $d29 1 $d31 1 $d33 1 $d36 1 $d38 1 Eval 1;
PrelTup 1 :: $d13 1;
_exports_
ShouldSucceed mAp ranAFE ranOAL sNd AFE(MkAFE) FG(MkFG) OL(MkOL);
_instances_
-instance _forall_ [n a b] => {PrelBase.Eval (AFE n a b)} = $d1;
+instance _forall_ [a b c] => {PrelBase.Eval (AFE a b c)} = $d1;
instance _forall_ [a b] => {PrelBase.Eval (FG a b)} = $d2;
instance _forall_ [a] => {PrelBase.Eval (OL a)} = $d3;
_declarations_
-1 $d1 _:_ _forall_ [n a b] => {PrelBase.Eval (AFE n a b)} ;;
+1 $d1 _:_ _forall_ [a b c] => {PrelBase.Eval (AFE a b c)} ;;
1 $d2 _:_ _forall_ [a b] => {PrelBase.Eval (FG a b)} ;;
1 $d3 _:_ _forall_ [a] => {PrelBase.Eval (OL a)} ;;
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_ [ta tb] => (ta -> tb) -> [ta] -> [tb] ;;
-1 ranAFE _:_ _forall_ [ta tb tc] => AFE ta tb tc -> [FG tb tc] ;;
-1 ranOAL _:_ _forall_ [ta tb] => OL (ta, tb) -> [tb] ;;
-1 sNd _:_ _forall_ [ta tb] => (ta, tb) -> tb ;;
+1 mAp _:_ _forall_ [a b] => (a -> b) -> [a] -> [b] ;;
+1 ranAFE _:_ _forall_ [a b c] => AFE a b c -> [FG b c] ;;
+1 ranOAL _:_ _forall_ [a b] => OL (a, b) -> [b] ;;
+1 sNd _:_ _forall_ [a b] => (a, b) -> b ;;
diff --git a/ghc/tests/typecheck/should_compile/tc049.stderr b/ghc/tests/typecheck/should_compile/tc049.stderr
index ef6e75a062d63ddd00284b9f01f454e306b372f5..d8f348083a19db37071e5be7eeea6ceba55b3881 100644
--- a/ghc/tests/typecheck/should_compile/tc049.stderr
+++ b/ghc/tests/typecheck/should_compile/tc049.stderr
@@ -1,7 +1,7 @@
ghc: module version changed to 1; reason: no old .hi file
_interface_ ShouldSucceed 1
_instance_modules_
-Addr ArrBase Foreign IO PrelBounded PrelNum
+IO PrelAddr PrelArr PrelBounded PrelCCall PrelForeign PrelNum
_usages_
PrelBase 1 :: $d1 1 $d10 1 $d12 1 $d13 1 $d15 1 $d2 1 $d20 1 $d21 1 $d26 1 $d27 1 $d28 1 $d29 1 $d3 1 $d30 1 $d31 1 $d33 1 $d34 1 $d36 1 $d37 1 $d38 1 $d39 1 $d4 1 $d40 1 $d41 1 $d42 1 $d43 1 $d6 1 $d7 1 $d8 1 $m- 1 $m/= 1 $m< 1 $m<= 1 $m> 1 $m>= 1 $mcompare 1 $mfromInt 1 $mmax 1 $mmin 1 $mshowList 1 Eq 1 Eval 1 Num 1 Ord 1 Ordering 1 Show 1 String 1;
PrelNum 1 :: $d10 1 $d16 1 $d17 1 $d18 1 $d29 1 $d33 1 $d34 1 $d35 1;
@@ -9,14 +9,14 @@ PrelTup 1 :: $d13 1 $d4 1 $d49 1 $d9 1;
_exports_
ShouldSucceed fib main1 main2 main3 mem mem1 mem2 mem3 mem4 oR oR1;
_declarations_
-1 fib _:_ _forall_ [ta] {PrelBase.Ord ta, PrelBase.Num ta} => ta -> ta ;;
+1 fib _:_ _forall_ [a] {PrelBase.Ord a, PrelBase.Num a} => a -> a ;;
1 main1 _:_ PrelBase.Bool ;;
1 main2 _:_ PrelBase.Bool ;;
1 main3 _:_ PrelBase.Bool ;;
-1 mem _:_ _forall_ [ta] {PrelBase.Eq ta} => ta -> [ta] -> PrelBase.Bool ;;
-1 mem1 _:_ _forall_ [ta] {PrelBase.Eq ta} => ta -> [ta] -> PrelBase.Bool ;;
-1 mem2 _:_ _forall_ [ta] {PrelBase.Eq ta} => ta -> [ta] -> PrelBase.Bool ;;
-1 mem3 _:_ _forall_ [ta] {PrelBase.Eq ta} => ta -> [ta] -> PrelBase.Bool ;;
-1 mem4 _:_ _forall_ [ta] {PrelBase.Eq ta} => ta -> [ta] -> 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_ [a] {PrelBase.Eq [a]} => a -> [a] -> PrelBase.Bool ;;
+1 mem4 _:_ _forall_ [a] {PrelBase.Eq [a]} => a -> [a] -> PrelBase.Bool ;;
1 oR _:_ PrelBase.Bool -> PrelBase.Bool -> PrelBase.Bool ;;
1 oR1 _:_ PrelBase.Bool -> PrelBase.Bool -> PrelBase.Bool ;;
diff --git a/ghc/tests/typecheck/should_compile/tc050.stderr b/ghc/tests/typecheck/should_compile/tc050.stderr
index 21b6f174fdad2b9d5553e9f47e9429b688d21873..e95c353cb2fd04d3a26cee1b26dd20cc3480b5ea 100644
--- a/ghc/tests/typecheck/should_compile/tc050.stderr
+++ b/ghc/tests/typecheck/should_compile/tc050.stderr
@@ -1,12 +1,14 @@
+
+NOTE: Simplifier still going after 4 iterations; bailing out.
ghc: module version changed to 1; reason: no old .hi file
_interface_ ShouldSucceed 1
_instance_modules_
-Addr ArrBase Foreign IO PrelBounded PrelNum
+IO PrelAddr PrelArr PrelBounded PrelCCall PrelForeign PrelNum
_usages_
PrelBase 1 :: $d1 1 $d10 1 $d13 1 $d15 1 $d2 1 $d21 1 $d26 1 $d27 1 $d29 1 $d3 1 $d30 1 $d31 1 $d33 1 $d34 1 $d36 1 $d38 1 $d4 1 $d42 1 $d7 1 $d8 1 $m- 1 $m/= 1 $mfromInt 1 $mshowList 1 Eq 1 Eval 1 Num 1 Show 1 String 1;
PrelNum 1 :: $d10 1 $d16 1 $d18 1 $d29 1 $d33 1 $d35 1;
_exports_
-ShouldSucceed f g Foo(o_and);
+ShouldSucceed f g Foo(:Foo :Foo o_and);
_instances_
instance {Foo PrelBase.Int} = $d1;
instance {Foo PrelBase.Bool} = $d2;
@@ -14,5 +16,5 @@ _declarations_
1 $d1 _:_ {Foo PrelBase.Int} ;;
1 $d2 _:_ {Foo PrelBase.Bool} ;;
1 class Foo a where {o_and :: a -> a -> a} ;
-1 f _:_ _forall_ [ta] => PrelBase.Bool -> ta -> PrelBase.Bool ;;
-1 g _:_ _forall_ [ta tb] {Foo tb, PrelBase.Num tb} => tb -> ta -> tb ;;
+1 f _:_ _forall_ [a] => PrelBase.Bool -> a -> PrelBase.Bool ;;
+1 g _:_ _forall_ [a b] {Foo b, PrelBase.Num b} => b -> a -> b ;;
diff --git a/ghc/tests/typecheck/should_compile/tc051.stderr b/ghc/tests/typecheck/should_compile/tc051.stderr
index 9e645c32d12e8283f33652f44ad068bf9120557e..b6182a9815d32b0871120c086a5adc857d1a362f 100644
--- a/ghc/tests/typecheck/should_compile/tc051.stderr
+++ b/ghc/tests/typecheck/should_compile/tc051.stderr
@@ -1,9 +1,9 @@
ghc: module version changed to 1; reason: no old .hi file
_interface_ ShouldSucceed 1
_instance_modules_
-Addr ArrBase Foreign IO PrelBounded PrelNum
+IO PrelAddr PrelArr PrelBounded PrelCCall PrelForeign PrelNum
_exports_
-ShouldSucceed Eq'(doubleeq) Ord'(lt);
+ShouldSucceed Eq'(:Eq' :Eq' doubleeq) Ord'(:Ord' :Ord' lt);
_instances_
instance {Ord' PrelBase.Int} = $d1;
instance _forall_ [a] {Eq' a} => {Eq' [a]} = $d2;
diff --git a/ghc/tests/typecheck/should_compile/tc052.stderr b/ghc/tests/typecheck/should_compile/tc052.stderr
index fda13aac3c9825f41954fc8e0f4be80934ce150c..57221d9a25a8335ae93129895300aa23ec8d0c12 100644
--- a/ghc/tests/typecheck/should_compile/tc052.stderr
+++ b/ghc/tests/typecheck/should_compile/tc052.stderr
@@ -1,7 +1,7 @@
ghc: module version changed to 1; reason: no old .hi file
_interface_ ShouldSucceed 1
_instance_modules_
-Addr ArrBase Foreign IO PrelBounded PrelNum
+IO PrelAddr PrelArr PrelBounded PrelCCall PrelForeign PrelNum
_exports_
ShouldSucceed A B C;
_declarations_
diff --git a/ghc/tests/typecheck/should_compile/tc053.stderr b/ghc/tests/typecheck/should_compile/tc053.stderr
index 0e581cbdca70c93f12ecf0ecae4ea61aa9088faa..f5aaf829f33bf330801b3f1170a410a9487e526f 100644
--- a/ghc/tests/typecheck/should_compile/tc053.stderr
+++ b/ghc/tests/typecheck/should_compile/tc053.stderr
@@ -1,12 +1,12 @@
ghc: module version changed to 1; reason: no old .hi file
_interface_ ShouldSucceed 1
_instance_modules_
-Addr ArrBase Foreign IO PrelBounded PrelNum
+IO PrelAddr PrelArr PrelBounded PrelCCall PrelForeign PrelNum
_usages_
PrelBase 1 :: $d1 1 $d10 1 $d13 1 $d15 1 $d2 1 $d21 1 $d26 1 $d27 1 $d29 1 $d3 1 $d30 1 $d31 1 $d33 1 $d34 1 $d36 1 $d38 1 $d4 1 $d42 1 $d7 1 $d8 1 $m- 1 $m/= 1 $mfromInt 1 $mshowList 1 Eq 1 Eval 1 Num 1 Show 1 String 1;
PrelNum 1 :: $d10 1 $d16 1 $d18 1 $d29 1 $d33 1 $d35 1;
_exports_
-ShouldSucceed f Eq'(deq);
+ShouldSucceed f Eq'(:Eq' :Eq' deq);
_instances_
instance _forall_ [a] {Eq' a} => {Eq' [a]} = $d1;
instance {Eq' PrelBase.Int} = $d2;
@@ -14,4 +14,4 @@ _declarations_
1 $d1 _:_ _forall_ [a] {Eq' a} => {Eq' [a]} ;;
1 $d2 _:_ {Eq' PrelBase.Int} ;;
1 class Eq' a where {deq :: a -> a -> PrelBase.Bool} ;
-1 f _:_ _forall_ [ta] {Eq' ta, PrelBase.Num ta} => [ta] -> PrelBase.Bool ;;
+1 f _:_ _forall_ [a] {Eq' [a], PrelBase.Num a} => [a] -> PrelBase.Bool ;;
diff --git a/ghc/tests/typecheck/should_compile/tc054.stderr b/ghc/tests/typecheck/should_compile/tc054.stderr
index 0641d60e17dbd84237304b926e2d0035caed01cf..ba087b903c09f78a7e09c3d57bc4e5e17654099f 100644
--- a/ghc/tests/typecheck/should_compile/tc054.stderr
+++ b/ghc/tests/typecheck/should_compile/tc054.stderr
@@ -1,12 +1,12 @@
ghc: module version changed to 1; reason: no old .hi file
_interface_ ShouldSucceed 1
_instance_modules_
-Addr ArrBase Foreign IO PrelBounded PrelNum
+IO PrelAddr PrelArr PrelBounded PrelCCall PrelForeign PrelNum
_usages_
PrelBase 1 :: $d1 1 $d10 1 $d13 1 $d15 1 $d2 1 $d21 1 $d26 1 $d27 1 $d29 1 $d3 1 $d30 1 $d31 1 $d33 1 $d34 1 $d36 1 $d38 1 $d4 1 $d42 1 $d7 1 $d8 1 $m- 1 $m/= 1 $mfromInt 1 $mshowList 1 otherwise 1 Eq 1 Eval 1 Num 1 Show 1 String 1;
PrelNum 1 :: $d10 1 $d16 1 $d18 1 $d29 1 $d33 1 $d35 1;
_exports_
-ShouldSucceed f Eq'(doubleeq) Ord'(lt);
+ShouldSucceed f Eq'(:Eq' :Eq' doubleeq) Ord'(:Ord' :Ord' lt);
_instances_
instance {Ord' PrelBase.Int} = $d1;
instance {Eq' PrelBase.Int} = $d2;
@@ -15,4 +15,4 @@ _declarations_
1 $d2 _:_ {Eq' PrelBase.Int} ;;
1 class Eq' a where {doubleeq :: a -> a -> PrelBase.Bool} ;
1 class {Eq' a} => Ord' a where {lt :: a -> a -> PrelBase.Bool} ;
-1 f _:_ _forall_ [ta tb] {Ord' tb, PrelBase.Num tb} => tb -> ta -> PrelBase.Bool ;;
+1 f _:_ _forall_ [a b] {Ord' b, PrelBase.Num b} => b -> a -> PrelBase.Bool ;;
diff --git a/ghc/tests/typecheck/should_compile/tc055.stderr b/ghc/tests/typecheck/should_compile/tc055.stderr
index 2bcba362557554830c778b5e13b21653a606cbc9..4c1786883bf9a7b64d563e3bb39ac27eeada3465 100644
--- a/ghc/tests/typecheck/should_compile/tc055.stderr
+++ b/ghc/tests/typecheck/should_compile/tc055.stderr
@@ -3,9 +3,9 @@ NOTE: Simplifier still going after 4 iterations; bailing out.
ghc: module version changed to 1; reason: no old .hi file
_interface_ ShouldSucceed 1
_instance_modules_
-Addr ArrBase Foreign IO PrelBounded PrelNum
+IO PrelAddr PrelArr PrelBounded PrelCCall PrelForeign PrelNum
_exports_
ShouldSucceed x y;
_declarations_
-1 x _:_ _forall_ [ta tb] => ta -> ta ;;
-1 y _:_ _forall_ [ta tb] => tb -> tb ;;
+1 x _:_ _forall_ [a b] => a -> a ;;
+1 y _:_ _forall_ [a b] => b -> b ;;
diff --git a/ghc/tests/typecheck/should_compile/tc056.stderr b/ghc/tests/typecheck/should_compile/tc056.stderr
index 584599911c3d6ffb5f27bec1ea38efd73ee27394..ab94b146a8961259375dde02456865afd5ac8da2 100644
--- a/ghc/tests/typecheck/should_compile/tc056.stderr
+++ b/ghc/tests/typecheck/should_compile/tc056.stderr
@@ -1,15 +1,16 @@
-tc056.hs:15:warning:
- Duplicated class assertion `Eq' a' in context: `(Eq' a, Eq' a)'
+tc056.hs:15: Warning:
+ Duplicated class assertion `Eq' a' in the context: (Eq' a, Eq' a)
+
ghc: module version changed to 1; reason: no old .hi file
_interface_ ShouldSucceed 1
_instance_modules_
-Addr ArrBase Foreign IO PrelBounded PrelNum
+IO PrelAddr PrelArr PrelBounded PrelCCall PrelForeign PrelNum
_usages_
PrelBase 1 :: $d1 1 $d10 1 $d13 1 $d15 1 $d2 1 $d21 1 $d26 1 $d27 1 $d29 1 $d3 1 $d30 1 $d31 1 $d33 1 $d34 1 $d36 1 $d38 1 $d4 1 $d42 1 $d7 1 $d8 1 $m- 1 $m/= 1 $mfromInt 1 $mshowList 1 Eq 1 Eval 1 Num 1 Show 1 String 1;
PrelNum 1 :: $d10 1 $d16 1 $d18 1 $d29 1 $d33 1 $d35 1;
_exports_
-ShouldSucceed f Eq'(doubleeq) Ord'(lt);
+ShouldSucceed f Eq'(:Eq' :Eq' doubleeq) Ord'(:Ord' :Ord' lt);
_instances_
instance _forall_ [a] {Eq' a, Eq' a} => {Eq' [a]} = $d1;
instance {Eq' PrelBase.Int} = $d2;
@@ -18,4 +19,4 @@ _declarations_
1 $d2 _:_ {Eq' PrelBase.Int} ;;
1 class Eq' a where {doubleeq :: a -> a -> PrelBase.Bool} ;
1 class {Eq' a} => Ord' a where {lt :: a -> a -> PrelBase.Bool} ;
-1 f _:_ _forall_ [ta tb] {Eq' tb, PrelBase.Num tb} => [tb] -> ta -> PrelBase.Bool ;;
+1 f _:_ _forall_ [a b] {Eq' [b], PrelBase.Num b} => [b] -> a -> PrelBase.Bool ;;
diff --git a/ghc/tests/typecheck/should_compile/tc057.stderr b/ghc/tests/typecheck/should_compile/tc057.stderr
index 2eb56e160e60ff1b5d9834b1de6d61e92ac13732..5487d9bca0f9d82561c44549bdbd77a95d27fa21 100644
--- a/ghc/tests/typecheck/should_compile/tc057.stderr
+++ b/ghc/tests/typecheck/should_compile/tc057.stderr
@@ -1,12 +1,12 @@
ghc: module version changed to 1; reason: no old .hi file
_interface_ ShouldSucceed 1
_instance_modules_
-Addr ArrBase Foreign IO PrelBounded PrelNum
+IO PrelAddr PrelArr PrelBounded PrelCCall PrelForeign PrelNum
_usages_
PrelBase 1 :: $d1 1 $d10 1 $d13 1 $d15 1 $d2 1 $d21 1 $d26 1 $d27 1 $d29 1 $d3 1 $d30 1 $d31 1 $d33 1 $d34 1 $d36 1 $d38 1 $d4 1 $d42 1 $d7 1 $d8 1 $m- 1 $m/= 1 $mfromInt 1 $mshowList 1 Eq 1 Eval 1 Num 1 Show 1 String 1;
PrelNum 1 :: $d10 1 $d16 1 $d18 1 $d29 1 $d33 1 $d35 1;
_exports_
-ShouldSucceed dand f Eq'(deq);
+ShouldSucceed dand f Eq'(:Eq' :Eq' deq);
_instances_
instance _forall_ [a] {Eq' a} => {Eq' [a]} = $d1;
instance {Eq' PrelBase.Int} = $d2;
@@ -15,4 +15,4 @@ _declarations_
1 $d2 _:_ {Eq' PrelBase.Int} ;;
1 class Eq' a where {deq :: a -> a -> PrelBase.Bool} ;
1 dand _:_ PrelBase.Bool -> PrelBase.Bool -> PrelBase.Bool ;;
-1 f _:_ _forall_ [ta] {Eq' ta} => ta -> ta -> PrelBase.Bool ;;
+1 f _:_ _forall_ [a] {Eq' a} => a -> a -> PrelBase.Bool ;;
diff --git a/ghc/tests/typecheck/should_compile/tc058.stderr b/ghc/tests/typecheck/should_compile/tc058.stderr
index fd27d0d66201431a88a90ba7c35d5e4ff4310267..75141e340e93504818928a285903e8d4d8794416 100644
--- a/ghc/tests/typecheck/should_compile/tc058.stderr
+++ b/ghc/tests/typecheck/should_compile/tc058.stderr
@@ -1,12 +1,12 @@
ghc: module version changed to 1; reason: no old .hi file
_interface_ ShouldSucceed 1
_instance_modules_
-Addr ArrBase Foreign IO PrelBounded PrelNum
+IO PrelAddr PrelArr PrelBounded PrelCCall PrelForeign PrelNum
_usages_
PrelBase 1 :: $d1 1 $d10 1 $d13 1 $d15 1 $d2 1 $d21 1 $d26 1 $d27 1 $d29 1 $d3 1 $d30 1 $d31 1 $d33 1 $d34 1 $d36 1 $d38 1 $d4 1 $d42 1 $d7 1 $d8 1 $m- 1 $m/= 1 $mfromInt 1 $mshowList 1 Eq 1 Eval 1 Num 1 Show 1 String 1;
PrelNum 1 :: $d10 1 $d16 1 $d18 1 $d29 1 $d33 1 $d35 1;
_exports_
-ShouldSucceed f Eq2(doubleeq) Ord2(lt);
+ShouldSucceed f Eq2(:Eq2 :Eq2 doubleeq) Ord2(:Ord2 :Ord2 lt);
_instances_
instance _forall_ [a] {Eq2 a, Ord2 a} => {Eq2 [a]} = $d1;
instance {Ord2 PrelBase.Int} = $d2;
@@ -17,4 +17,4 @@ _declarations_
1 $d3 _:_ {Eq2 PrelBase.Int} ;;
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_ [ta tb] {Ord2 tb, PrelBase.Num tb} => [tb] -> ta -> PrelBase.Bool ;;
+1 f _:_ _forall_ [a b] {Eq2 [b], PrelBase.Num b} => [b] -> a -> PrelBase.Bool ;;
diff --git a/ghc/tests/typecheck/should_compile/tc059.stderr b/ghc/tests/typecheck/should_compile/tc059.stderr
index b6c3db3e5b625a3212acb1d8c6197d1952b343ad..8a6866fdda0a83214ededbf9a07c1d1110d32ec3 100644
--- a/ghc/tests/typecheck/should_compile/tc059.stderr
+++ b/ghc/tests/typecheck/should_compile/tc059.stderr
@@ -1,12 +1,12 @@
ghc: module version changed to 1; reason: no old .hi file
_interface_ ShouldSucceed 1
_instance_modules_
-Addr ArrBase Foreign IO PrelBounded PrelNum
+IO PrelAddr PrelArr PrelBounded PrelCCall PrelForeign PrelNum
_usages_
PrelBase 1 :: $d1 1 $d10 1 $d13 1 $d15 1 $d2 1 $d21 1 $d26 1 $d27 1 $d29 1 $d3 1 $d30 1 $d31 1 $d33 1 $d34 1 $d36 1 $d38 1 $d4 1 $d42 1 $d7 1 $d8 1 $m- 1 $m/= 1 $mfromInt 1 $mshowList 1 Eq 1 Eval 1 Num 1 Show 1 String 1;
PrelNum 1 :: $d10 1 $d16 1 $d18 1 $d29 1 $d33 1 $d35 1;
_exports_
-ShouldSucceed f Eq2(deq foo);
+ShouldSucceed f Eq2(:Eq2 :Eq2 deq foo);
_instances_
instance _forall_ [a] {Eq2 a} => {Eq2 [a]} = $d1;
instance {Eq2 PrelBase.Int} = $d2;
@@ -14,4 +14,4 @@ _declarations_
1 $d1 _:_ _forall_ [a] {Eq2 a} => {Eq2 [a]} ;;
1 $d2 _:_ {Eq2 PrelBase.Int} ;;
1 class Eq2 a where {deq :: a -> a -> PrelBase.Bool; foo :: a -> a} ;
-1 f _:_ _forall_ [ta] {Eq2 ta, PrelBase.Num ta} => [ta] -> PrelBase.Bool ;;
+1 f _:_ _forall_ [a] {Eq2 [a], PrelBase.Num a} => [a] -> PrelBase.Bool ;;
diff --git a/ghc/tests/typecheck/should_compile/tc060.stderr b/ghc/tests/typecheck/should_compile/tc060.stderr
index 9795c7f450d856dfe6f24886178f4c70fae0ca60..3a239a978d4900b39b50ba46d4c74e10aaf16514 100644
--- a/ghc/tests/typecheck/should_compile/tc060.stderr
+++ b/ghc/tests/typecheck/should_compile/tc060.stderr
@@ -1,9 +1,9 @@
ghc: module version changed to 1; reason: no old .hi file
_interface_ ShouldSucceed 1
_instance_modules_
-Addr ArrBase Foreign IO PrelBounded PrelNum
+IO PrelAddr PrelArr PrelBounded PrelCCall PrelForeign PrelNum
_exports_
-ShouldSucceed Eq2(deq);
+ShouldSucceed Eq2(:Eq2 :Eq2 deq);
_instances_
instance {Eq2 PrelBase.Int} = $d1;
instance _forall_ [a] {Eq2 a} => {Eq2 [a]} = $d2;
diff --git a/ghc/tests/typecheck/should_compile/tc061.stderr b/ghc/tests/typecheck/should_compile/tc061.stderr
index f0b8963e2bce1012a7fe45bb3fe76cf5cc9ad94c..f9f5da825a52fa2fdafb1aa0a238e4e9afc54ef3 100644
--- a/ghc/tests/typecheck/should_compile/tc061.stderr
+++ b/ghc/tests/typecheck/should_compile/tc061.stderr
@@ -1,9 +1,9 @@
ghc: module version changed to 1; reason: no old .hi file
_interface_ ShouldSucceed 1
_instance_modules_
-Addr ArrBase Foreign IO PrelBounded PrelNum
+IO PrelAddr PrelArr PrelBounded PrelCCall PrelForeign PrelNum
_exports_
-ShouldSucceed Eq1(deq);
+ShouldSucceed Eq1(:Eq1 :Eq1 deq);
_instances_
instance {Eq1 PrelBase.Int} = $d1;
instance _forall_ [a] {Eq1 a} => {Eq1 [a]} = $d2;
diff --git a/ghc/tests/typecheck/should_compile/tc062.stderr b/ghc/tests/typecheck/should_compile/tc062.stderr
index b9fcf13c7236da9125765b26d40e7a179901a9af..fc3bcfaa77136fe34ecaf056436cc54638ed288b 100644
--- a/ghc/tests/typecheck/should_compile/tc062.stderr
+++ b/ghc/tests/typecheck/should_compile/tc062.stderr
@@ -1,9 +1,9 @@
ghc: module version changed to 1; reason: no old .hi file
_interface_ ShouldSucceed 1
_instance_modules_
-Addr ArrBase Foreign IO PrelBounded PrelNum
+IO PrelAddr PrelArr PrelBounded PrelCCall PrelForeign PrelNum
_exports_
-ShouldSucceed f Eq1(deq);
+ShouldSucceed f Eq1(:Eq1 :Eq1 deq);
_instances_
instance _forall_ [a] {Eq1 a} => {Eq1 [a]} = $d1;
instance {Eq1 PrelBase.Int} = $d2;
@@ -11,4 +11,4 @@ _declarations_
1 $d1 _:_ _forall_ [a] {Eq1 a} => {Eq1 [a]} ;;
1 $d2 _:_ {Eq1 PrelBase.Int} ;;
1 class Eq1 a where {deq :: a -> a -> PrelBase.Bool} ;
-1 f _:_ _forall_ [ta] {Eq1 ta} => [ta] -> [ta] -> PrelBase.Bool ;;
+1 f _:_ _forall_ [a] {Eq1 [a]} => [a] -> [a] -> PrelBase.Bool ;;
diff --git a/ghc/tests/typecheck/should_compile/tc063.stderr b/ghc/tests/typecheck/should_compile/tc063.stderr
index e384277e0c13479253f9afc2143d56aea2e4ab65..10d1b81986a16489d0c3d1296a4c88a74221b753 100644
--- a/ghc/tests/typecheck/should_compile/tc063.stderr
+++ b/ghc/tests/typecheck/should_compile/tc063.stderr
@@ -1,19 +1,19 @@
ghc: module version changed to 1; reason: no old .hi file
_interface_ ShouldSucceed 1
_instance_modules_
-Addr ArrBase Foreign IO PrelBounded PrelNum
+IO PrelAddr PrelArr PrelBounded PrelCCall PrelForeign PrelNum
_usages_
PrelBase 1 :: $d2 1 $d29 1 $d31 1 $d33 1 $d38 1 Eval 1;
_exports_
-ShouldSucceed g Reps(f) X(Tag);
+ShouldSucceed g Reps(:Reps :Reps f) X(Tag);
_instances_
instance {Reps PrelBase.Bool} = $d1;
-instance _forall_ [q] => {Reps (X q)} = $d2;
+instance _forall_ [a] => {Reps (X a)} = $d2;
instance _forall_ [a] => {PrelBase.Eval (X a)} = $d3;
_declarations_
1 $d1 _:_ {Reps PrelBase.Bool} ;;
-1 $d2 _:_ _forall_ [q] => {Reps (X q)} ;;
+1 $d2 _:_ _forall_ [a] => {Reps (X a)} ;;
1 $d3 _:_ _forall_ [a] => {PrelBase.Eval (X a)} ;;
1 class Reps r where {f :: r -> r -> r} ;
1 data X a = Tag a ;
-1 g _:_ _forall_ [ta] {Reps ta} => ta -> ta ;;
+1 g _:_ _forall_ [a] {Reps a} => a -> a ;;
diff --git a/ghc/tests/typecheck/should_compile/tc064.stderr b/ghc/tests/typecheck/should_compile/tc064.stderr
index d99fad6d40ad5d0ec0b3b9e25f4c061bbe85c414..00530dad927a841ce095c2a6417d8d9a6831bc73 100644
--- a/ghc/tests/typecheck/should_compile/tc064.stderr
+++ b/ghc/tests/typecheck/should_compile/tc064.stderr
@@ -1,7 +1,7 @@
ghc: module version changed to 1; reason: no old .hi file
_interface_ ShouldSucceed 1
_instance_modules_
-Addr ArrBase Foreign IO PrelBounded PrelNum
+IO PrelAddr PrelArr PrelBounded PrelCCall PrelForeign PrelNum
_usages_
PrelBase 1 :: $d2 1 $d29 1 $d31 1 $d33 1 $d38 1 Eval 1;
_exports_
diff --git a/ghc/tests/typecheck/should_compile/tc065.stderr b/ghc/tests/typecheck/should_compile/tc065.stderr
index f000d1913ce9bc8c991f5c78e8db352c171aa326..202c18b5ca6188c2d113773c354a0965d3176406 100644
--- a/ghc/tests/typecheck/should_compile/tc065.stderr
+++ b/ghc/tests/typecheck/should_compile/tc065.stderr
@@ -1,9 +1,9 @@
ghc: module version changed to 1; reason: no old .hi file
_interface_ ShouldSucceed 1
_instance_modules_
-Addr ArrBase Foreign IO PrelBounded PrelNum
+IO PrelAddr PrelArr PrelBounded PrelCCall PrelForeign PrelNum
_usages_
-List 1 :: partition 1;
+List 2 :: partition 1;
PrelBase 1 :: $d12 1 $d13 1 $d16 1 $d17 1 $d18 1 $d19 1 $d2 1 $d20 1 $d21 1 $d26 1 $d28 1 $d29 1 $d31 1 $d33 1 $d36 1 $d37 1 $d38 1 $d39 1 $d41 1 $d6 1 $d7 1 $m/= 1 $m< 1 $m<= 1 $m> 1 $m>= 1 $m>> 1 $mcompare 1 $mmax 1 $mmin 1 otherwise 1 Eq 1 Eval 1 Functor 1 Monad 1 MonadPlus 1 MonadZero 1 Ord 1 Ordering 1;
PrelList 1 :: elem 1 head 1;
PrelNum 1 :: $d17 1 $d18 1;
@@ -13,21 +13,21 @@ _exports_
ShouldSucceed dfs isCyclic isRecursiveCycle lookupVertex mkDigraph mkEdges mkVertices stronglyConnComp topSort Cycle Digraph(MkDigraph) Edge FlattenedDependencyInfo MaybeErr(Succeeded Failed);
_instances_
instance _forall_ [a b] => {PrelBase.Eval (MaybeErr a b)} = $d1;
-instance _forall_ [vertex] => {PrelBase.Eval (Digraph vertex)} = $d2;
+instance _forall_ [a] => {PrelBase.Eval (Digraph a)} = $d2;
_declarations_
1 $d1 _:_ _forall_ [a b] => {PrelBase.Eval (MaybeErr a b)} ;;
-1 $d2 _:_ _forall_ [vertex] => {PrelBase.Eval (Digraph vertex)} ;;
-1 type Cycle vertex = [vertex] ;
+1 $d2 _:_ _forall_ [a] => {PrelBase.Eval (Digraph a)} ;;
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_ [a] {PrelBase.Eq a} => [Edge a] -> [a] -> PrelBase.Bool ;;
+1 isRecursiveCycle _:_ _forall_ [a] {PrelBase.Eq a} => Cycle a -> [Edge a] -> PrelBase.Bool ;;
+1 lookupVertex _:_ _forall_ [a b c] {PrelBase.Eq a, PrelBase.Ord b} => FlattenedDependencyInfo a b c -> a -> c ;;
+1 mkDigraph _:_ _forall_ [a] => [a] -> Digraph a ;;
+1 mkEdges _:_ _forall_ [a b c] {PrelBase.Eq a, PrelBase.Ord b} => [a] -> FlattenedDependencyInfo a b c -> [Edge a] ;;
+1 mkVertices _:_ _forall_ [a b c] => FlattenedDependencyInfo a b c -> [a] ;;
+1 stronglyConnComp _:_ _forall_ [a] {PrelBase.Eq a} => [Edge a] -> [a] -> [[a]] ;;
+1 topSort _:_ _forall_ [a] {PrelBase.Eq a} => [Edge a] -> [a] -> MaybeErr [a] [[a]] ;;
+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)] ;
-1 data MaybeErr a b = Succeeded a | Failed b ;
-1 dfs _:_ _forall_ [ta] {PrelBase.Eq ta} => (ta -> [ta]) -> ([ta], [ta]) -> [ta] -> ([ta], [ta]) ;;
-1 isCyclic _:_ _forall_ [ta] {PrelBase.Eq ta} => [Edge ta] -> [ta] -> PrelBase.Bool ;;
-1 isRecursiveCycle _:_ _forall_ [ta] {PrelBase.Eq ta} => Cycle ta -> [Edge ta] -> PrelBase.Bool ;;
-1 lookupVertex _:_ _forall_ [ta tb tc] {PrelBase.Eq tb, PrelBase.Ord ta} => FlattenedDependencyInfo tb ta tc -> tb -> tc ;;
-1 mkDigraph _:_ _forall_ [ta] => [ta] -> Digraph ta ;;
-1 mkEdges _:_ _forall_ [ta tb tc] {PrelBase.Eq tc, PrelBase.Ord ta} => [tc] -> FlattenedDependencyInfo tc ta tb -> [Edge tc] ;;
-1 mkVertices _:_ _forall_ [ta tb tc] => FlattenedDependencyInfo tc ta tb -> [tc] ;;
-1 stronglyConnComp _:_ _forall_ [ta] {PrelBase.Eq ta} => [Edge ta] -> [ta] -> [[ta]] ;;
-1 topSort _:_ _forall_ [ta] {PrelBase.Eq ta} => [Edge ta] -> [ta] -> MaybeErr [ta] [[ta]] ;;
diff --git a/ghc/tests/typecheck/should_compile/tc066.stderr b/ghc/tests/typecheck/should_compile/tc066.stderr
index 2061c9316fa1512e940cfc130964b128913ed764..613e48618fbbc6fdfa5806342b221f840a5e2714 100644
--- a/ghc/tests/typecheck/should_compile/tc066.stderr
+++ b/ghc/tests/typecheck/should_compile/tc066.stderr
@@ -1,7 +1,7 @@
ghc: module version changed to 1; reason: no old .hi file
_interface_ ShouldSucceed 1
_instance_modules_
-Addr ArrBase Foreign IO PrelBounded PrelNum
+IO PrelAddr PrelArr PrelBounded PrelCCall PrelForeign PrelNum
_usages_
PrelBase 1 :: $d2 1 $d29 1 $d31 1 $d33 1 $d38 1 $m>> 1 Eval 1 Monad 1 MonadZero 1;
_exports_
@@ -11,4 +11,4 @@ instance _forall_ [a b] => {PrelBase.Eval (Pair a b)} = $d1;
_declarations_
1 $d1 _:_ _forall_ [a b] => {PrelBase.Eval (Pair a b)} ;;
1 data Pair a b = MkPair a b ;
-1 f _:_ _forall_ [ta tb ac :: (* -> *)] {PrelBase.Monad ac} => ac (Pair ta tb) -> ac tb ;;
+1 f _:_ _forall_ [a b c :: (* -> *)] {PrelBase.Monad c} => c (Pair a b) -> c b ;;
diff --git a/ghc/tests/typecheck/should_compile/tc067.stderr b/ghc/tests/typecheck/should_compile/tc067.stderr
index 70f50cb268e587ccfcd3d629dc8125ce5eb8f76a..5a396b16946c03620167ad196451483025a0eefa 100644
--- a/ghc/tests/typecheck/should_compile/tc067.stderr
+++ b/ghc/tests/typecheck/should_compile/tc067.stderr
@@ -1,8 +1,8 @@
ghc: module version changed to 1; reason: no old .hi file
_interface_ ShouldSucceed 1
_instance_modules_
-Addr ArrBase Foreign IO PrelBounded PrelNum
+IO PrelAddr PrelArr PrelBounded PrelCCall PrelForeign PrelNum
_exports_
ShouldSucceed f;
_declarations_
-1 f _:_ _forall_ [ta] => [ta] -> [ta] ;;
+1 f _:_ _forall_ [a] => [a] -> [a] ;;
diff --git a/ghc/tests/typecheck/should_compile/tc068.stderr b/ghc/tests/typecheck/should_compile/tc068.stderr
index 971a241eeac25e395f1b2ef42a7c0dbb0d58be83..096cc74b7da731cdbf394c668b4ac569c973a95a 100644
--- a/ghc/tests/typecheck/should_compile/tc068.stderr
+++ b/ghc/tests/typecheck/should_compile/tc068.stderr
@@ -1,21 +1,21 @@
ghc: module version changed to 1; reason: no old .hi file
_interface_ ShouldSucceed 1
_instance_modules_
-Addr ArrBase Foreign IO PrelBounded PrelNum
+IO PrelAddr PrelArr PrelBounded PrelCCall PrelForeign PrelNum
_usages_
PrelBase 1 :: $d13 1 $d2 1 $d26 1 $d29 1 $d31 1 $d33 1 $d38 1 $d7 1 $m/= 1 not 1 Eq 1 Eval 1;
PrelNum 1 :: $d18 1;
_exports_
ShouldSucceed B(X Y) T(D C);
_instances_
-instance _forall_ [b] {PrelBase.Eq b} => {PrelBase.Eq (B b)} = $d1;
+instance _forall_ [a] {PrelBase.Eq a} => {PrelBase.Eq (B a)} = $d1;
instance _forall_ [a] {PrelBase.Eq a} => {PrelBase.Eq (T a)} = $d2;
-instance _forall_ [b] => {PrelBase.Eval (B b)} = $d3;
+instance _forall_ [a] => {PrelBase.Eval (B a)} = $d3;
instance _forall_ [a] => {PrelBase.Eval (T a)} = $d4;
_declarations_
-1 $d1 _:_ _forall_ [b] {PrelBase.Eq b} => {PrelBase.Eq (B b)} ;;
+1 $d1 _:_ _forall_ [a] {PrelBase.Eq a} => {PrelBase.Eq (B a)} ;;
1 $d2 _:_ _forall_ [a] {PrelBase.Eq a} => {PrelBase.Eq (T a)} ;;
-1 $d3 _:_ _forall_ [b] => {PrelBase.Eval (B b)} ;;
+1 $d3 _:_ _forall_ [a] => {PrelBase.Eval (B a)} ;;
1 $d4 _:_ _forall_ [a] => {PrelBase.Eval (T a)} ;;
1 data B b = X | Y b ;
1 data T a = D (B a) | C ;
diff --git a/ghc/tests/typecheck/should_compile/tc069.stderr b/ghc/tests/typecheck/should_compile/tc069.stderr
index 3a436100a5a8696b70656d62f20813ddecc1eaa5..8798e9508482039fce44d78beb117c0367123dcc 100644
--- a/ghc/tests/typecheck/should_compile/tc069.stderr
+++ b/ghc/tests/typecheck/should_compile/tc069.stderr
@@ -1,7 +1,7 @@
ghc: module version changed to 1; reason: no old .hi file
_interface_ ShouldSucceed 1
_instance_modules_
-Addr ArrBase Foreign IO PrelBounded PrelNum
+IO PrelAddr PrelArr PrelBounded PrelCCall PrelForeign PrelNum
_exports_
ShouldSucceed x y ys;
_declarations_
diff --git a/ghc/tests/typecheck/should_compile/tc070.stderr b/ghc/tests/typecheck/should_compile/tc070.stderr
index d99fad6d40ad5d0ec0b3b9e25f4c061bbe85c414..00530dad927a841ce095c2a6417d8d9a6831bc73 100644
--- a/ghc/tests/typecheck/should_compile/tc070.stderr
+++ b/ghc/tests/typecheck/should_compile/tc070.stderr
@@ -1,7 +1,7 @@
ghc: module version changed to 1; reason: no old .hi file
_interface_ ShouldSucceed 1
_instance_modules_
-Addr ArrBase Foreign IO PrelBounded PrelNum
+IO PrelAddr PrelArr PrelBounded PrelCCall PrelForeign PrelNum
_usages_
PrelBase 1 :: $d2 1 $d29 1 $d31 1 $d33 1 $d38 1 Eval 1;
_exports_
diff --git a/ghc/tests/typecheck/should_compile/tc073.stderr b/ghc/tests/typecheck/should_compile/tc073.stderr
index 70f50cb268e587ccfcd3d629dc8125ce5eb8f76a..5a396b16946c03620167ad196451483025a0eefa 100644
--- a/ghc/tests/typecheck/should_compile/tc073.stderr
+++ b/ghc/tests/typecheck/should_compile/tc073.stderr
@@ -1,8 +1,8 @@
ghc: module version changed to 1; reason: no old .hi file
_interface_ ShouldSucceed 1
_instance_modules_
-Addr ArrBase Foreign IO PrelBounded PrelNum
+IO PrelAddr PrelArr PrelBounded PrelCCall PrelForeign PrelNum
_exports_
ShouldSucceed f;
_declarations_
-1 f _:_ _forall_ [ta] => [ta] -> [ta] ;;
+1 f _:_ _forall_ [a] => [a] -> [a] ;;
diff --git a/ghc/tests/typecheck/should_compile/tc074.stderr b/ghc/tests/typecheck/should_compile/tc074.stderr
index 971a241eeac25e395f1b2ef42a7c0dbb0d58be83..096cc74b7da731cdbf394c668b4ac569c973a95a 100644
--- a/ghc/tests/typecheck/should_compile/tc074.stderr
+++ b/ghc/tests/typecheck/should_compile/tc074.stderr
@@ -1,21 +1,21 @@
ghc: module version changed to 1; reason: no old .hi file
_interface_ ShouldSucceed 1
_instance_modules_
-Addr ArrBase Foreign IO PrelBounded PrelNum
+IO PrelAddr PrelArr PrelBounded PrelCCall PrelForeign PrelNum
_usages_
PrelBase 1 :: $d13 1 $d2 1 $d26 1 $d29 1 $d31 1 $d33 1 $d38 1 $d7 1 $m/= 1 not 1 Eq 1 Eval 1;
PrelNum 1 :: $d18 1;
_exports_
ShouldSucceed B(X Y) T(D C);
_instances_
-instance _forall_ [b] {PrelBase.Eq b} => {PrelBase.Eq (B b)} = $d1;
+instance _forall_ [a] {PrelBase.Eq a} => {PrelBase.Eq (B a)} = $d1;
instance _forall_ [a] {PrelBase.Eq a} => {PrelBase.Eq (T a)} = $d2;
-instance _forall_ [b] => {PrelBase.Eval (B b)} = $d3;
+instance _forall_ [a] => {PrelBase.Eval (B a)} = $d3;
instance _forall_ [a] => {PrelBase.Eval (T a)} = $d4;
_declarations_
-1 $d1 _:_ _forall_ [b] {PrelBase.Eq b} => {PrelBase.Eq (B b)} ;;
+1 $d1 _:_ _forall_ [a] {PrelBase.Eq a} => {PrelBase.Eq (B a)} ;;
1 $d2 _:_ _forall_ [a] {PrelBase.Eq a} => {PrelBase.Eq (T a)} ;;
-1 $d3 _:_ _forall_ [b] => {PrelBase.Eval (B b)} ;;
+1 $d3 _:_ _forall_ [a] => {PrelBase.Eval (B a)} ;;
1 $d4 _:_ _forall_ [a] => {PrelBase.Eval (T a)} ;;
1 data B b = X | Y b ;
1 data T a = D (B a) | C ;
diff --git a/ghc/tests/typecheck/should_compile/tc076.stderr b/ghc/tests/typecheck/should_compile/tc076.stderr
index 8a43453457490dacafb93dea8949a09fc6327e8a..c7b8ce160ab669a92adfb4fa38d7afc27298638a 100644
--- a/ghc/tests/typecheck/should_compile/tc076.stderr
+++ b/ghc/tests/typecheck/should_compile/tc076.stderr
@@ -1,7 +1,7 @@
ghc: module version changed to 1; reason: no old .hi file
_interface_ ShouldSucceed 1
_instance_modules_
-Addr ArrBase Foreign IO PrelBounded PrelNum
+IO PrelAddr PrelArr PrelBounded PrelCCall PrelForeign PrelNum
_usages_
PrelBase 1 :: $d17 1 $d18 1 $m>> 1 Monad 1 MonadZero 1;
_exports_
diff --git a/ghc/tests/typecheck/should_compile/tc077.stderr b/ghc/tests/typecheck/should_compile/tc077.stderr
index b52e18b68e96f37be3b14e4734befd64802bb6b4..8e5ec11ca748ebe56bf16b923eba7af67167328a 100644
--- a/ghc/tests/typecheck/should_compile/tc077.stderr
+++ b/ghc/tests/typecheck/should_compile/tc077.stderr
@@ -1,16 +1,16 @@
ghc: module version changed to 1; reason: no old .hi file
_interface_ ShouldSucceed 1
_instance_modules_
-Addr ArrBase Foreign IO PrelBounded PrelNum
+IO PrelAddr PrelArr PrelBounded PrelCCall PrelForeign PrelNum
_usages_
PrelBase 1 :: $d1 1 $d10 1 $d13 1 $d15 1 $d2 1 $d21 1 $d26 1 $d27 1 $d29 1 $d3 1 $d30 1 $d31 1 $d33 1 $d34 1 $d36 1 $d38 1 $d4 1 $d42 1 $d7 1 $d8 1 $m- 1 $m/= 1 $mfromInt 1 $mshowList 1 Eq 1 Eval 1 Num 1 Show 1 String 1;
PrelNum 1 :: $d10 1 $d16 1 $d18 1 $d29 1 $d33 1 $d35 1;
_exports_
-ShouldSucceed EQ(===) NUM(ONE TWO) ORD;
+ShouldSucceed EQ(:EQ :EQ ===) NUM(ONE TWO) ORD(:ORD :ORD);
_instances_
instance {PrelBase.Eval NUM} = $d1;
_declarations_
1 $d1 _:_ {PrelBase.Eval NUM} ;;
1 class {ORD a, PrelBase.Show a} => EQ a where {=== :: a -> a -> PrelBase.Bool} ;
-1 data NUM = ONE | TWO ;
1 class {PrelBase.Num a} => ORD a ;
+1 data NUM = ONE | TWO ;
diff --git a/ghc/tests/typecheck/should_compile/tc078.stderr b/ghc/tests/typecheck/should_compile/tc078.stderr
index 466a56be6721b1eed2b4a2aa0141421a3505b745..7da3b2a305d33f1b185ac5b242b42e678b65e61d 100644
--- a/ghc/tests/typecheck/should_compile/tc078.stderr
+++ b/ghc/tests/typecheck/should_compile/tc078.stderr
@@ -1,10 +1,12 @@
-tc078.hs:7: Warning: no explicit method nor default method for `=='
- in an instance declaration for `Eq'
+tc078.hs:7: Warning:
+ No explicit method nor default method for `=='
+ in an instance declaration for `Eq'
+
ghc: module version changed to 1; reason: no old .hi file
_interface_ ShouldFail 1
_instance_modules_
-Addr ArrBase Foreign IO PrelBounded PrelNum
+IO PrelAddr PrelArr PrelBounded PrelCCall PrelForeign PrelNum
_usages_
PrelBase 1 :: $d12 1 $d13 1 $d2 1 $d26 1 $d28 1 $d29 1 $d31 1 $d33 1 $d37 1 $d38 1 $d39 1 $d41 1 $d6 1 $d7 1 $m/= 1 $m< 1 $m<= 1 $m> 1 $m>= 1 $mcompare 1 $mmax 1 $mmin 1 Eq 1 Eval 1 Ord 1 Ordering 1;
PrelNum 1 :: $d17 1 $d18 1;
diff --git a/ghc/tests/typecheck/should_compile/tc079.stderr b/ghc/tests/typecheck/should_compile/tc079.stderr
index 64c69d7b9a60127dc73db216a939ebf70aea365d..c924e1c21106f41cd3db49acc0db5a254079cf69 100644
--- a/ghc/tests/typecheck/should_compile/tc079.stderr
+++ b/ghc/tests/typecheck/should_compile/tc079.stderr
@@ -1,12 +1,12 @@
ghc: module version changed to 1; reason: no old .hi file
_interface_ ShouldSucceed 1
_instance_modules_
-Addr ArrBase Foreign IO PrelBounded PrelNum
+IO PrelAddr PrelArr PrelBounded PrelCCall PrelForeign PrelNum
_usages_
PrelBase 1 :: $d12 1 $d13 1 $d20 1 $d21 1 $d26 1 $d28 1 $d39 1 $d41 1 $d6 1 $d7 1 $m/= 1 $m< 1 $m<= 1 $m> 1 $m>= 1 $mcompare 1 $mmax 1 $mmin 1 && 1 Eq 1 Ord 1 Ordering 1;
PrelNum 1 :: $d17 1 $d18 1;
_exports_
-ShouldSucceed Foo(op1 op2);
+ShouldSucceed Foo(:Foo :Foo op1 op2);
_instances_
instance _forall_ [a] {Foo a} => {Foo [a]} = $d1;
instance {Foo PrelBase.Int} = $d2;
diff --git a/ghc/tests/typecheck/should_compile/tc080.stderr b/ghc/tests/typecheck/should_compile/tc080.stderr
index 3680f807de462a3ea9b71be03bda49bccae553e4..e7febe294fd696cf4910e80cb5e765f2e9b2643a 100644
--- a/ghc/tests/typecheck/should_compile/tc080.stderr
+++ b/ghc/tests/typecheck/should_compile/tc080.stderr
@@ -3,14 +3,14 @@ NOTE: Simplifier still going after 4 iterations; bailing out.
ghc: module version changed to 1; reason: no old .hi file
_interface_ ShouldSucceed 1
_instance_modules_
-Addr ArrBase Foreign IO PrelBounded PrelNum
+IO PrelAddr PrelArr PrelBounded PrelCCall PrelForeign PrelNum
_usages_
PrelBase 1 :: $d1 1 $d10 1 $d11 1 $d12 1 $d13 1 $d15 1 $d16 1 $d17 1 $d18 1 $d19 1 $d2 1 $d20 1 $d21 1 $d24 1 $d25 1 $d26 1 $d27 1 $d28 1 $d29 1 $d3 1 $d30 1 $d31 1 $d33 1 $d34 1 $d36 1 $d37 1 $d38 1 $d39 1 $d4 1 $d40 1 $d41 1 $d42 1 $d43 1 $d5 1 $d6 1 $d7 1 $d8 1 $d9 1 $m- 1 $m/= 1 $m< 1 $m<= 1 $m> 1 $m>= 1 $m>> 1 $mcompare 1 $menumFromThenTo 1 $menumFromTo 1 $mfromInt 1 $mmax 1 $mmin 1 $mshowList 1 . 1 dropWhile 1 isDigit 1 isSpace 1 ord 1 Enum 1 Eq 1 Eval 1 Functor 1 Monad 1 MonadPlus 1 MonadZero 1 Num 1 Ord 1 Ordering 1 Show 1 String 1;
PrelList 1 :: all 1 length 1 null 1 tail 1;
PrelNum 1 :: $d1 1 $d10 1 $d15 1 $d16 1 $d17 1 $d18 1 $d2 1 $d29 1 $d30 1 $d31 1 $d32 1 $d33 1 $d34 1 $d35 1 $d36 1 $d37 1 $d38 1 $d39 1 $d5 1 $d6 1 $d7 1 $d8 1 $mdiv 1 $mdivMod 1 $mmod 1 $mquot 1 $mrem 1 ^ 1 Integral 1 Ratio 1 Rational 1 Real 1;
PrelTup 1 :: $d13 1 $d4 1 $d49 1 $d9 1;
_exports_
-ShouldSucceed charToInt lines' seperatedBy span' strToInt whiteSpace Parse(parseFile parseLine parseType parse forced);
+ShouldSucceed charToInt lines' seperatedBy span' strToInt whiteSpace Parse(:Parse :Parse parseFile parseLine parseType parse forced);
_instances_
instance _forall_ [a] {Parse a} => {Parse [a]} = $d1;
instance {Parse PrelBase.Char} = $d2;
@@ -23,10 +23,10 @@ _declarations_
1 $mparse _:_ _forall_ [a] {Parse a} => PrelBase.String -> (a, PrelBase.String) ;;
1 $mparseFile _:_ _forall_ [a] {Parse a} => PrelBase.String -> [a] ;;
1 $mparseLine _:_ _forall_ [a] {Parse a} => PrelBase.String -> a ;;
-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 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 lines' _:_ [PrelBase.Char] -> [[PrelBase.Char]] ;;
1 seperatedBy _:_ PrelBase.Char -> PrelBase.String -> [PrelBase.String] ;;
-1 span' _:_ _forall_ [ta] => (ta -> PrelBase.Bool) -> [ta] -> ([ta], [ta]) ;;
+1 span' _:_ _forall_ [a] => (a -> PrelBase.Bool) -> [a] -> ([a], [a]) ;;
1 strToInt _:_ PrelBase.String -> PrelBase.Int ;;
1 whiteSpace _:_ PrelBase.String -> PrelBase.String ;;
diff --git a/ghc/tests/typecheck/should_compile/tc081.stderr b/ghc/tests/typecheck/should_compile/tc081.stderr
index 45d94995929def3c1d8b13fb2628d7a422905dde..09eff767e57b1a17df402511f718d8b9a823cd0e 100644
--- a/ghc/tests/typecheck/should_compile/tc081.stderr
+++ b/ghc/tests/typecheck/should_compile/tc081.stderr
@@ -1,7 +1,7 @@
ghc: module version changed to 1; reason: no old .hi file
_interface_ ShouldSucceed 1
_instance_modules_
-Addr ArrBase Foreign IO PrelBounded PrelNum
+IO PrelAddr PrelArr PrelBounded PrelCCall PrelForeign PrelNum
_usages_
PrelBase 1 :: $d1 1 $d10 1 $d12 1 $d13 1 $d15 1 $d2 1 $d20 1 $d21 1 $d26 1 $d27 1 $d28 1 $d29 1 $d3 1 $d30 1 $d31 1 $d33 1 $d34 1 $d36 1 $d37 1 $d38 1 $d39 1 $d4 1 $d40 1 $d41 1 $d42 1 $d43 1 $d6 1 $d7 1 $d8 1 $m- 1 $m/= 1 $m< 1 $m<= 1 $m> 1 $m>= 1 $mcompare 1 $mfromInt 1 $mmax 1 $mmin 1 $mshowList 1 Eq 1 Eval 1 Num 1 Ord 1 Ordering 1 Show 1 String 1;
PrelNum 1 :: $d10 1 $d16 1 $d17 1 $d18 1 $d29 1 $d33 1 $d34 1 $d35 1;
@@ -9,6 +9,6 @@ PrelTup 1 :: $d11 1 $d15 1 $d2 1 $d51 1;
_exports_
ShouldSucceed f f2 f3;
_declarations_
-1 f _:_ _forall_ [ta] {PrelBase.Num ta, PrelBase.Ord ta} => ta -> (ta, PrelBase.Bool, [PrelBase.Bool], [PrelBase.Char]) ;;
-1 f2 _:_ _forall_ [ta] {PrelBase.Num ta, PrelBase.Ord ta} => ta -> (ta, PrelBase.Bool, [PrelBase.Bool], [PrelBase.Char]) ;;
-1 f3 _:_ _forall_ [ta] {PrelBase.Num ta, PrelBase.Ord ta} => ta -> (ta, PrelBase.Bool, [PrelBase.Bool], [PrelBase.Char]) ;;
+1 f _:_ _forall_ [a] {PrelBase.Num a, PrelBase.Ord a} => a -> (a, PrelBase.Bool, [PrelBase.Bool], [PrelBase.Char]) ;;
+1 f2 _:_ _forall_ [a] {PrelBase.Num a, PrelBase.Ord a} => a -> (a, PrelBase.Bool, [PrelBase.Bool], [PrelBase.Char]) ;;
+1 f3 _:_ _forall_ [a] {PrelBase.Num a, PrelBase.Ord 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
index a67b685d0addfeec55ac1f3f63ec01dc60d0a5b1..121f0d7336108f7afdcd35b994249b0bb867fbc5 100644
--- a/ghc/tests/typecheck/should_compile/tc082.stderr
+++ b/ghc/tests/typecheck/should_compile/tc082.stderr
@@ -1,14 +1,16 @@
+
+NOTE: Simplifier still going after 4 iterations; bailing out.
ghc: module version changed to 1; reason: no old .hi file
_interface_ ShouldSucceed 1
_instance_modules_
-Addr ArrBase Foreign IO PrelBounded PrelNum
+IO PrelAddr PrelArr PrelBounded PrelCCall PrelForeign PrelNum
_usages_
PrelBase 1 :: id 1;
_exports_
-ShouldSucceed f Normal(normal);
+ShouldSucceed f Normal(:Normal :Normal normal);
_instances_
instance _forall_ [a b] => {Normal (a -> b)} = $d1;
_declarations_
1 $d1 _:_ _forall_ [a b] => {Normal (a -> b)} ;;
1 class Normal a where {normal :: a -> PrelBase.Bool} ;
-1 f _:_ _forall_ [ta] => ta -> PrelBase.Bool ;;
+1 f _:_ _forall_ [a] => a -> PrelBase.Bool ;;
diff --git a/ghc/tests/typecheck/should_compile/tc084.stderr b/ghc/tests/typecheck/should_compile/tc084.stderr
index d37ebff838addf11e123737c2a36d5b8efdac116..5983c758519b1a22bbf01a0fe5a3e19f8d5a994c 100644
--- a/ghc/tests/typecheck/should_compile/tc084.stderr
+++ b/ghc/tests/typecheck/should_compile/tc084.stderr
@@ -1,13 +1,13 @@
ghc: module version changed to 1; reason: no old .hi file
_interface_ ShouldSucceed 1
_instance_modules_
-Addr ArrBase Foreign IO PrelBounded PrelNum
+IO PrelAddr PrelArr PrelBounded PrelCCall PrelForeign PrelNum
_usages_
PrelBase 1 :: $d1 1 $d10 1 $d13 1 $d15 1 $d2 1 $d21 1 $d26 1 $d27 1 $d29 1 $d3 1 $d30 1 $d31 1 $d33 1 $d34 1 $d36 1 $d38 1 $d4 1 $d42 1 $d7 1 $d8 1 $m- 1 $m/= 1 $mfromInt 1 $mshowList 1 Eq 1 Eval 1 Num 1 Show 1 String 1;
PrelNum 1 :: $d10 1 $d16 1 $d18 1 $d29 1 $d33 1 $d35 1;
_exports_
ShouldSucceed f g h;
_declarations_
-1 f _:_ _forall_ [ta] => PrelBase.Int -> ta -> PrelBase.Int ;;
-1 g _:_ _forall_ [ta tb] {PrelBase.Num tb} => PrelBase.Bool -> tb -> ta -> tb ;;
-1 h _:_ _forall_ [ta] => ta -> PrelBase.Int -> PrelBase.Int ;;
+1 f _:_ _forall_ [a] => PrelBase.Int -> a -> PrelBase.Int ;;
+1 g _:_ _forall_ [a b] {PrelBase.Num a} => PrelBase.Bool -> a -> b -> a ;;
+1 h _:_ _forall_ [a] => a -> PrelBase.Int -> PrelBase.Int ;;
diff --git a/ghc/tests/typecheck/should_compile/tc085.hs b/ghc/tests/typecheck/should_compile/tc085.hs
index 90d5cf031ff0a759b74628698faf9d8b76bc5fe8..445d4cb550f17b664e933519816e966d2987a481 100644
--- a/ghc/tests/typecheck/should_compile/tc085.hs
+++ b/ghc/tests/typecheck/should_compile/tc085.hs
@@ -1,11 +1,13 @@
+{-# OPTIONS -fglasgow-exts #-}
+
--!!! From a bug report from Satnam.
--!!! To do with re-exporting importees from PreludeGla* modules.
-module ShouldSucceed ( module IOExts, module GHC ) where
+module ShouldSucceed ( module IOExts, module PrelGHC ) where
--OLD: import GlaExts
--OLDER: import PreludeGlaIO
import IOExts
-import GHC
+import PrelGHC
type FooType = Int
data FooData = FooData
diff --git a/ghc/tests/typecheck/should_compile/tc085.stderr b/ghc/tests/typecheck/should_compile/tc085.stderr
index c7cd3c08b17027a0f8e4aa855a4bb75933ab9e5f..cc26c51f8f766739e66b6e471bd93c3c1dfc7fc6 100644
--- a/ghc/tests/typecheck/should_compile/tc085.stderr
+++ b/ghc/tests/typecheck/should_compile/tc085.stderr
@@ -1,16 +1,16 @@
ghc: module version changed to 1; reason: no old .hi file
_interface_ ShouldSucceed 1
_instance_modules_
-Addr ArrBase Foreign IO PrelBounded PrelNum
+IO PrelAddr PrelArr PrelBounded PrelCCall PrelForeign PrelNum
_usages_
-GHC 2 ::;
IOExts 1 ::;
PrelBase 1 :: $d2 1 $d29 1 $d31 1 $d33 1 $d38 1 Eval 1;
+PrelGHC 2 ::;
_exports_
-GHC *# *## **## +# +## -# -## /## /=# /=## <# <## <=# <=## ==# ==## ># >## >=# >=## acosDouble# acosFloat# addr2Int# and# asinDouble# asinFloat# atanDouble# atanFloat# chr# cmpInteger# cosDouble# cosFloat# coshDouble# coshFloat# deRefStablePtr# decodeDouble# decodeFloat# delay# divideFloat# double2Float# double2Int# encodeDouble# encodeFloat# eqAddr# eqChar# eqFloat# eqWord# errorIO# expDouble# expFloat# float2Double# float2Int# fork# geAddr# geChar# geFloat# geWord# gtAddr# gtChar# gtFloat# gtWord# iShiftL# iShiftRA# iShiftRL# indexAddrArray# indexAddrOffAddr# indexAddrOffForeignObj# indexArray# indexCharArray# indexCharOffAddr# indexCharOffForeignObj# indexDoubleArray# indexDoubleOffAddr# indexDoubleOffForeignObj# indexFloatArray# indexFloatOffAddr# indexFloatOffForeignObj# indexIntArray# indexIntOffAddr# indexIntOffForeignObj# int2Addr# int2Double# int2Float# int2Integer# int2Word# integer2Int# leAddr# leChar# leFloat# leWord# logDouble# logFloat# ltAddr# ltChar# ltFloat# ltWord# makeForeignObj# makeStablePtr# minusFloat# minusInteger# neAddr# neChar# neFloat# neWord# negateDouble# negateFloat# negateInt# negateInteger# newAddrArray# newArray# newCharArray# newDoubleArray# newFloatArray# newIntArray# newSynchVar# not# or# ord# par# parAt# parAtAbs# parAtForNow# parAtRel# parGlobal# parLocal# plusFloat# plusInteger# powerFloat# putMVar# quotInt# quotRemInteger# quotWord# readAddrArray# readArray# readCharArray# readDoubleArray# readFloatArray# readIntArray# realWorld# reallyUnsafePtrEquality# remInt# remWord# sameMutableArray# sameMutableByteArray# seq# shiftL# shiftRA# shiftRL# sinDouble# sinFloat# sinhDouble# sinhFloat# sqrtDouble# sqrtFloat# takeMVar# tanDouble# tanFloat# tanhDouble# tanhFloat# timesFloat# timesInteger# unsafeFreezeArray# unsafeFreezeByteArray# waitRead# waitWrite# word2Int# writeAddrArray# writeArray# writeCharArray# writeDoubleArray# writeFloatArray# writeForeignObj# writeIntArray# xor# -> Addr# All Array# ByteArray# Char# Double# Float# ForeignObj# Int# MutableArray# MutableByteArray# RealWorld StablePtr# State# SynchVar# Void Word#;
-IOBase fixIO performGC;
IOExts boundsIOArray freezeIOArray newIOArray newIORef readIOArray readIORef reallyUnsafePtrEq writeIOArray writeIORef IOArray IORef;
-Unsafe trace unsafeInterleaveIO unsafePerformIO;
+PrelGHC *# *## **## +# +## -# -## /# /## /=# /=## <# <## <=# <=## ==# ==## ># >## >=# >=## acosDouble# acosFloat# addr2Int# and# asinDouble# asinFloat# atanDouble# atanFloat# chr# cmpInteger# cosDouble# cosFloat# coshDouble# coshFloat# deRefStablePtr# decodeDouble# decodeFloat# delay# divideFloat# double2Float# double2Int# encodeDouble# encodeFloat# eqAddr# eqChar# eqFloat# eqWord# errorIO# expDouble# expFloat# float2Double# float2Int# fork# geAddr# geChar# geFloat# geWord# gtAddr# gtChar# gtFloat# gtWord# iShiftL# iShiftRA# iShiftRL# indexAddrArray# indexAddrOffAddr# indexAddrOffForeignObj# indexArray# indexCharArray# indexCharOffAddr# indexCharOffForeignObj# indexDoubleArray# indexDoubleOffAddr# indexDoubleOffForeignObj# indexFloatArray# indexFloatOffAddr# indexFloatOffForeignObj# indexIntArray# indexIntOffAddr# indexIntOffForeignObj# int2Addr# int2Double# int2Float# int2Integer# int2Word# integer2Int# leAddr# leChar# leFloat# leWord# logDouble# logFloat# ltAddr# ltChar# ltFloat# ltWord# makeForeignObj# makeStablePtr# minusFloat# minusInteger# neAddr# neChar# neFloat# neWord# negateDouble# negateFloat# negateInt# negateInteger# newAddrArray# newArray# newCharArray# newDoubleArray# newFloatArray# newIntArray# newSynchVar# not# or# ord# par# parAt# parAtAbs# parAtForNow# parAtRel# parGlobal# parLocal# plusFloat# plusInteger# powerFloat# putMVar# quotInt# quotRemInteger# quotWord# readAddrArray# readArray# readCharArray# readDoubleArray# readFloatArray# readIntArray# realWorld# reallyUnsafePtrEquality# remInt# remWord# sameMutableArray# sameMutableByteArray# seq# shiftL# shiftRA# shiftRL# sinDouble# sinFloat# sinhDouble# sinhFloat# sqrtDouble# sqrtFloat# takeMVar# tanDouble# tanFloat# tanhDouble# tanhFloat# timesFloat# timesInteger# unsafeFreezeArray# unsafeFreezeByteArray# waitRead# waitWrite# word2Int# word2Integer# writeAddrArray# writeArray# writeCharArray# writeDoubleArray# writeFloatArray# writeForeignObj# writeIntArray# xor# -> Addr# All Array# ByteArray# CCallable CReturnable Char# Double# Float# ForeignObj# Int# MutableArray# MutableByteArray# RealWorld StablePtr# State# SynchVar# Void Word#;
+PrelIOBase fixIO performGC;
+PrelUnsafe trace unsafeInterleaveIO unsafePerformIO;
_instances_
instance {PrelBase.Eval FooData} = $d1;
_declarations_
diff --git a/ghc/tests/typecheck/should_compile/tc086.stderr b/ghc/tests/typecheck/should_compile/tc086.stderr
index b4167f5ef6b71de1f6eb7339f4b9ec25e96c30a3..2853058459c987a813678f1997b87077748fc59c 100644
--- a/ghc/tests/typecheck/should_compile/tc086.stderr
+++ b/ghc/tests/typecheck/should_compile/tc086.stderr
@@ -1,7 +1,7 @@
ghc: module version changed to 1; reason: no old .hi file
_interface_ ShouldSucceed 1
_instance_modules_
-Addr ArrBase Foreign IO PrelBounded PrelNum
+IO PrelAddr PrelArr PrelBounded PrelCCall PrelForeign PrelNum
_usages_
PrelBase 1 :: $d1 1 $d10 1 $d13 1 $d15 1 $d2 1 $d21 1 $d26 1 $d27 1 $d28 1 $d29 1 $d3 1 $d30 1 $d31 1 $d33 1 $d34 1 $d36 1 $d37 1 $d38 1 $d4 1 $d42 1 $d43 1 $d7 1 $d8 1 $m- 1 $m/= 1 $mfromInt 1 $mshowList 1 Eq 1 Eval 1 Num 1 Ordering 1 Ordering 1 Show 1 String 1;
PrelNum 1 :: $d10 1 $d16 1 $d18 1 $d29 1 $d33 1 $d35 1;
diff --git a/ghc/tests/typecheck/should_compile/tc087.stderr b/ghc/tests/typecheck/should_compile/tc087.stderr
index d557b7c2c748394d86042c24702f544f07922af3..06de817216855584afe144af0495d81a30153180 100644
--- a/ghc/tests/typecheck/should_compile/tc087.stderr
+++ b/ghc/tests/typecheck/should_compile/tc087.stderr
@@ -1,25 +1,25 @@
ghc: module version changed to 1; reason: no old .hi file
_interface_ ShouldSucceed 1
_instance_modules_
-Addr ArrBase Foreign IO PrelBounded PrelNum
+IO PrelAddr PrelArr PrelBounded PrelCCall PrelForeign PrelNum
_usages_
-IOBase 1 :: $d2 1 $d3 1 $d7 1 IO 1;
PrelBase 1 :: $d1 1 $d10 1 $d11 1 $d12 1 $d13 1 $d15 1 $d17 1 $d18 1 $d2 1 $d20 1 $d21 1 $d24 1 $d25 1 $d26 1 $d27 1 $d28 1 $d29 1 $d3 1 $d30 1 $d31 1 $d33 1 $d34 1 $d36 1 $d37 1 $d38 1 $d39 1 $d4 1 $d40 1 $d41 1 $d42 1 $d43 1 $d5 1 $d6 1 $d7 1 $d8 1 $d9 1 $m- 1 $m/= 1 $m< 1 $m<= 1 $m> 1 $m>= 1 $m>> 1 $mcompare 1 $menumFromThenTo 1 $menumFromTo 1 $mfromInt 1 $mmax 1 $mmin 1 $mshowList 1 otherwise 1 Enum 1 Eq 1 Eval 1 Monad 1 MonadZero 1 Num 1 Ord 1 Ordering 1 Show 1 String 1;
-PrelIO 1 :: putStr 1;
+PrelIO 2 :: putStr 1;
+PrelIOBase 1 :: $d2 1 $d3 1 $d7 1 IO 1;
PrelList 1 :: sum 1;
PrelNum 1 :: $d1 1 $d10 1 $d14 1 $d15 1 $d16 1 $d17 1 $d18 1 $d2 1 $d29 1 $d30 1 $d31 1 $d32 1 $d33 1 $d34 1 $d35 1 $d36 1 $d37 1 $d38 1 $d39 1 $d4 1 $d5 1 $d6 1 $d7 1 $d8 1 $mdiv 1 $mdivMod 1 $mmod 1 $mquot 1 $mrecip 1 $mrem 1 Fractional 1 Integral 1 Ratio 1 Rational 1 Real 1;
PrelTup 1 :: $d13 1 $d4 1 $d49 1 $d9 1;
_exports_
-ShouldSucceed check insertMany out pqSort toOrderedList PriorityQueue(empty single insert meld splitMin) SeqView(Null Cons);
+ShouldSucceed check insertMany out pqSort toOrderedList PriorityQueue(:PriorityQueue :PriorityQueue empty single insert meld splitMin) SeqView(Null Cons);
_instances_
-instance _forall_ [t :: (* -> *) a] => {PrelBase.Eval (SeqView t a)} = $d1;
+instance _forall_ [a :: (* -> *) b] => {PrelBase.Eval (SeqView a b)} = $d1;
_declarations_
-1 $d1 _:_ _forall_ [t :: (* -> *) a] => {PrelBase.Eval (SeqView t a)} ;;
-1 $minsert _:_ _forall_ [q :: (* -> *)] {PriorityQueue q} => _forall_ [a] {PrelBase.Ord a} => a -> q a -> q a ;;
+1 $d1 _:_ _forall_ [a :: (* -> *) b] => {PrelBase.Eval (SeqView a b)} ;;
+1 $minsert _:_ _forall_ [a :: (* -> *)] {PriorityQueue a} => _forall_ [b] {PrelBase.Ord b} => b -> a b -> a b ;;
+1 check _:_ _forall_ [a :: (* -> *)] {PriorityQueue a} => (_forall_ [b] {PrelBase.Ord b} => a b) -> PrelIOBase.IO PrelBase.() ;;
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 check _:_ _forall_ [aa :: (* -> *)] {PriorityQueue aa} => (_forall_ [tb] {PrelBase.Ord tb} => aa tb) -> IOBase.IO PrelBase.() ;;
-1 insertMany _:_ _forall_ [ta ab :: (* -> *)] {PriorityQueue ab, PrelBase.Ord ta} => [ta] -> ab ta -> ab ta ;;
-1 out _:_ _forall_ [ta] {PrelBase.Num ta} => [ta] -> IOBase.IO PrelBase.() ;;
-1 pqSort _:_ _forall_ [aa :: (* -> *) tb] {PriorityQueue aa, PrelBase.Ord tb} => aa tb -> [tb] -> [tb] ;;
-1 toOrderedList _:_ _forall_ [aa :: (* -> *) tb] {PriorityQueue aa, PrelBase.Ord tb} => aa tb -> [tb] ;;
+1 insertMany _:_ _forall_ [a b :: (* -> *)] {PriorityQueue b, PrelBase.Ord a} => [a] -> b a -> b a ;;
+1 out _:_ _forall_ [a] {PrelBase.Num a} => [a] -> PrelIOBase.IO PrelBase.() ;;
+1 pqSort _:_ _forall_ [a :: (* -> *) b] {PrelBase.Ord b, PriorityQueue a} => a b -> [b] -> [b] ;;
+1 toOrderedList _:_ _forall_ [a :: (* -> *) b] {PriorityQueue a, PrelBase.Ord b} => a b -> [b] ;;
diff --git a/ghc/tests/typecheck/should_compile/tc088.stderr b/ghc/tests/typecheck/should_compile/tc088.stderr
index 25de4ef7785d75b5f7ef05a39dc038b0e24acc86..bd7e7d98575ac9025d64f834aceacbcf0cdc773b 100644
--- a/ghc/tests/typecheck/should_compile/tc088.stderr
+++ b/ghc/tests/typecheck/should_compile/tc088.stderr
@@ -1,7 +1,7 @@
ghc: module version changed to 1; reason: no old .hi file
_interface_ ShouldSucceed 1
_instance_modules_
-Addr ArrBase Foreign IO PrelBounded PrelNum ShouldSucceed
+IO PrelAddr PrelArr PrelBounded PrelCCall PrelForeign PrelNum ShouldSucceed
_usages_
PrelBase 1 :: $d1 1 $d10 1 $d13 1 $d15 1 $d2 1 $d21 1 $d26 1 $d27 1 $d29 1 $d3 1 $d30 1 $d31 1 $d33 1 $d34 1 $d36 1 $d38 1 $d4 1 $d42 1 $d7 1 $d8 1 $m- 1 $m/= 1 $mfromInt 1 $mshowList 1 Eq 1 Eval 1 Num 1 Show 1 String 1;
PrelNum 1 :: $d10 1 $d16 1 $d18 1 $d29 1 $d33 1 $d35 1;
diff --git a/ghc/tests/typecheck/should_compile/tc089.stderr b/ghc/tests/typecheck/should_compile/tc089.stderr
index 94e538fa5f17e894b7eef3acf96efd6a514b3395..2ce8fe897727614740a10138cede6d0ba1d26652 100644
--- a/ghc/tests/typecheck/should_compile/tc089.stderr
+++ b/ghc/tests/typecheck/should_compile/tc089.stderr
@@ -1,41 +1,41 @@
ghc: module version changed to 1; reason: no old .hi file
_interface_ ShouldSucceed 1
_instance_modules_
-Addr ArrBase Foreign IO PrelBounded PrelNum
+IO PrelAddr PrelArr PrelBounded PrelCCall PrelForeign PrelNum
_exports_
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;
_declarations_
-1 absAnd _:_ _forall_ [ta] => ta -> ta -> ta ;;
-1 absIf _:_ _forall_ [ta tb tc] => tc -> ta -> tb -> tc ;;
-1 bottom _:_ _forall_ [ta] => [ta] -> ta ;;
-1 f _:_ _forall_ [ta] => ta -> ta ;;
-1 f_rec _:_ _forall_ [ta tb] => (tb -> ta) -> tb -> ta ;;
-1 f_rec0 _:_ _forall_ [ta] => ta -> ta ;;
-1 f_rec1 _:_ _forall_ [ta] => ta -> ta ;;
-1 f_rec2 _:_ _forall_ [ta] => ta -> ta ;;
-1 fac _:_ _forall_ [ta tb tc td te tf tg th ti tj tk] => (ta, (ti, (tb, (tc, (td, te)))), (tj, (tb, (tc, (td, te))), (tf, (tc, (td, te)), (tg, (td, te), (th, te, te))))) -> (tk, (ti, (tb, (tc, (td, te))))) -> ta ;;
-1 fac_rec _:_ _forall_ [ta tb tc td te] => (tc -> td -> ta) -> (tb, td, tc) -> (te, td) -> tb ;;
-1 fac_rec0 _:_ _forall_ [ta] => ta -> ta -> ta ;;
-1 fac_rec1 _:_ _forall_ [ta tb tc] => (ta, tb, tb) -> (tc, tb) -> ta ;;
-1 fac_rec2 _:_ _forall_ [ta tb tc td te] => (ta, (tc, tb), (td, tb, tb)) -> (te, (tc, tb)) -> ta ;;
-1 fac_rec3 _:_ _forall_ [ta tb tc td te tf tg] => (ta, (te, (tb, tc)), (tf, (tb, tc), (td, tc, tc))) -> (tg, (te, (tb, tc))) -> ta ;;
-1 fac_rec4 _:_ _forall_ [ta tb tc td te tf tg th ti] => (ta, (tg, (tb, (tc, td))), (th, (tb, (tc, td)), (te, (tc, td), (tf, td, td)))) -> (ti, (tg, (tb, (tc, td)))) -> ta ;;
-1 g _:_ _forall_ [ta tb tc td te tf tg th ti tj tk tl tm tn to tp tq tr ts tt tu tv tw tx ty tz ttq ttr tts ttt ttu ttv ttw ttx tty ttz ttA ttB ttC ttD ttE ttF ttG ttH ttI ttJ ttK ttL ttM ttN ttO ttP ttQ ttR ttS ttT ttU ttV ttW ttX ttY ttZ tt10 tt11 tt12 tt13 tt14 tt15 tt16 tt17 tt18 tt19 tt1a tt1b tt1c tt1d tt1e tt1f tt1g tt1h tt1i tt1j tt1k tt1l tt1m tt1n tt1o tt1p tt1q tt1r tt1s tt1t tt1u tt1v tt1w tt1x tt1y tt1z tt1A tt1B tt1C tt1D tt1E tt1F tt1G tt1H tt1I tt1J tt1K tt1L tt1M tt1N tt1O tt1P tt1Q tt1R tt1S tt1T tt1U tt1V tt1W tt1X tt1Y tt1Z tt20 tt21 tt22 tt23 tt24 tt25 tt26 tt27 tt28 tt29 tt2a tt2b tt2c tt2d tt2e tt2f tt2g tt2h tt2i tt2j tt2k tt2l tt2m tt2n tt2o tt2p tt2q tt2r tt2s tt2t tt2u tt2v tt2w tt2x tt2y tt2z tt2A tt2B tt2C tt2D tt2E tt2F tt2G tt2H tt2I tt2J tt2K tt2L tt2M tt2N tt2O tt2P tt2Q tt2R tt2S tt2T tt2U tt2V tt2W tt2X tt2Y tt2Z tt30 tt31 tt32 tt33 tt34 tt35 tt36 tt37 tt38 tt39 tt3a tt3b tt3c tt3d tt3e tt3f tt3g tt3h tt3i tt3j tt3k tt3l tt3m tt3n tt3o tt3p tt3q tt3r tt3s tt3t tt3u tt3v tt3w tt3x tt3y tt3z tt3A tt3B tt3C tt3D tt3E tt3F tt3G tt3H tt3I tt3J tt3K tt3L tt3M tt3N tt3O tt3P tt3Q tt3R tt3S tt3T tt3U tt3V tt3W tt3X tt3Y tt3Z tt40 tt41 tt42 tt43 tt44 tt45 tt46 tt47 tt48 tt49 tt4a tt4b tt4c tt4d tt4e tt4f tt4g tt4h tt4i tt4j tt4k tt4l tt4m tt4n tt4o tt4p tt4q tt4r tt4s tt4t tt4u tt4v tt4w tt4x tt4y tt4z tt4A tt4B tt4C tt4D tt4E tt4F tt4G tt4H tt4I tt4J tt4K tt4L tt4M tt4N tt4O tt4P tt4Q tt4R tt4S tt4T tt4U tt4V tt4W tt4X tt4Y tt4Z tt50 tt51 tt52 tt53 tt54 tt55 tt56 tt57 tt58 tt59 tt5a tt5b tt5c tt5d tt5e tt5f tt5g tt5h tt5i tt5j tt5k tt5l tt5m tt5n tt5o tt5p tt5q tt5r tt5s tt5t tt5u tt5v tt5w tt5x tt5y tt5z tt5A tt5B tt5C tt5D tt5E tt5F tt5G tt5H tt5I tt5J tt5K tt5L tt5M tt5N tt5O tt5P tt5Q tt5R tt5S tt5T tt5U tt5V tt5W tt5X tt5Y tt5Z tt60 tt61 tt62 tt63 tt64 tt65 tt66 tt67 tt68 tt69 tt6a tt6b tt6c tt6d tt6e tt6f tt6g tt6h tt6i tt6j tt6k tt6l tt6m tt6n tt6o tt6p tt6q tt6r tt6s tt6t tt6u tt6v tt6w tt6x tt6y tt6z tt6A tt6B tt6C tt6D tt6E tt6F tt6G tt6H tt6I tt6J tt6K tt6L tt6M tt6N tt6O tt6P tt6Q tt6R tt6S tt6T tt6U tt6V tt6W tt6X tt6Y tt6Z tt70 tt71 tt72 tt73 tt74 tt75 tt76 tt77 tt78 tt79 tt7a tt7b tt7c tt7d tt7e tt7f tt7g tt7h tt7i tt7j tt7k tt7l tt7m tt7n tt7o tt7p tt7q tt7r tt7s tt7t tt7u tt7v tt7w tt7x tt7y tt7z tt7A tt7B tt7C tt7D tt7E tt7F tt7G tt7H tt7I tt7J tt7K tt7L tt7M tt7N tt7O tt7P tt7Q tt7R tt7S tt7T tt7U tt7V tt7W tt7X tt7Y tt7Z tt80 tt81 tt82 tt83 tt84 tt85 tt86 tt87 tt88 tt89 tt8a tt8b tt8c tt8d tt8e tt8f tt8g tt8h tt8i tt8j] => tt8j -> tb -> (tt8j, tt4b, tt4a) -> (ta, (tt49, (tc, (td, (te, (tf, (tg, (th, (ti, tj, tj), (ti, tk, tk)), (th, (tl, tm, tm), (tl, tn, tn))), (tg, (to, (tp, tq, tq), (tp, tr, tr)), (to, (ts, tt, tt), (ts, tu, tu)))), (tf, (tv, (tw, (tx, ty, ty), (tx, tz, tz)), (tw, (ttq, ttr, ttr), (ttq, tts, tts))), (tv, (ttt, (ttu, ttv, ttv), (ttu, ttw, ttw)), (ttt, (ttx, tty, tty), (ttx, ttz, ttz))))), (te, (ttA, (ttB, (ttC, (ttD, ttE, ttE), (ttD, ttF, ttF)), (ttC, (ttG, ttH, ttH), (ttG, ttI, ttI))), (ttB, (ttJ, (ttK, ttL, ttL), (ttK, ttM, ttM)), (ttJ, (ttN, ttO, ttO), (ttN, ttP, ttP)))), (ttA, (ttQ, (ttR, (ttS, ttT, ttT), (ttS, ttU, ttU)), (ttR, (ttV, ttW, ttW), (ttV, ttX, ttX))), (ttQ, (ttY, (ttZ, tt10, tt10), (ttZ, tt11, tt11)), (ttY, (tt12, tt13, tt13), (tt12, tt14, tt14)))))), (td, (tt15, (tt16, (tt17, (tt18, (tt19, tt1a, tt1a), (tt19, tt1b, tt1b)), (tt18, (tt1c, tt1d, tt1d), (tt1c, tt1e, tt1e))), (tt17, (tt1f, (tt1g, tt1h, tt1h), (tt1g, tt1i, tt1i)), (tt1f, (tt1j, tt1k, tt1k), (tt1j, tt1l, tt1l)))), (tt16, (tt1m, (tt1n, (tt1o, tt1p, tt1p), (tt1o, tt1q, tt1q)), (tt1n, (tt1r, tt1s, tt1s), (tt1r, tt1t, tt1t))), (tt1m, (tt1u, (tt1v, tt1w, tt1w), (tt1v, tt1x, tt1x)), (tt1u, (tt1y, tt1z, tt1z), (tt1y, tt1A, tt1A))))), (tt15, (tt1B, (tt1C, (tt1D, (tt1E, tt1F, tt1F), (tt1E, tt1G, tt1G)), (tt1D, (tt1H, tt1I, tt1I), (tt1H, tt1J, tt1J))), (tt1C, (tt1K, (tt1L, tt1M, tt1M), (tt1L, tt1N, tt1N)), (tt1K, (tt1O, tt1P, tt1P), (tt1O, tt1Q, tt1Q)))), (tt1B, (tt1R, (tt1S, (tt1T, tt1U, tt1U), (tt1T, tt1V, tt1V)), (tt1S, (tt1W, tt1X, tt1X), (tt1W, tt1Y, tt1Y))), (tt1R, (tt1Z, (tt20, tt21, tt21), (tt20, tt22, tt22)), (tt1Z, (tt23, tt24, tt24), (tt23, tt25, tt25))))))), (tc, (tt26, (tt27, (tt28, (tt29, (tt2a, (tt2b, tt2c, tt2c), (tt2b, tt2d, tt2d)), (tt2a, (tt2e, tt2f, tt2f), (tt2e, tt2g, tt2g))), (tt29, (tt2h, (tt2i, tt2j, tt2j), (tt2i, tt2k, tt2k)), (tt2h, (tt2l, tt2m, tt2m), (tt2l, tt2n, tt2n)))), (tt28, (tt2o, (tt2p, (tt2q, tt2r, tt2r), (tt2q, tt2s, tt2s)), (tt2p, (tt2t, tt2u, tt2u), (tt2t, tt2v, tt2v))), (tt2o, (tt2w, (tt2x, tt2y, tt2y), (tt2x, tt2z, tt2z)), (tt2w, (tt2A, tt2B, tt2B), (tt2A, tt2C, tt2C))))), (tt27, (tt2D, (tt2E, (tt2F, (tt2G, tt2H, tt2H), (tt2G, tt2I, tt2I)), (tt2F, (tt2J, tt2K, tt2K), (tt2J, tt2L, tt2L))), (tt2E, (tt2M, (tt2N, tt2O, tt2O), (tt2N, tt2P, tt2P)), (tt2M, (tt2Q, tt2R, tt2R), (tt2Q, tt2S, tt2S)))), (tt2D, (tt2T, (tt2U, (tt2V, tt2W, tt2W), (tt2V, tt2X, tt2X)), (tt2U, (tt2Y, tt2Z, tt2Z), (tt2Y, tt30, tt30))), (tt2T, (tt31, (tt32, tt33, tt33), (tt32, tt34, tt34)), (tt31, (tt35, tt36, tt36), (tt35, tt37, tt37)))))), (tt26, (tt38, (tt39, (tt3a, (tt3b, (tt3c, tt3d, tt3d), (tt3c, tt3e, tt3e)), (tt3b, (tt3f, tt3g, tt3g), (tt3f, tt3h, tt3h))), (tt3a, (tt3i, (tt3j, tt3k, tt3k), (tt3j, tt3l, tt3l)), (tt3i, (tt3m, tt3n, tt3n), (tt3m, tt3o, tt3o)))), (tt39, (tt3p, (tt3q, (tt3r, tt3s, tt3s), (tt3r, tt3t, tt3t)), (tt3q, (tt3u, tt3v, tt3v), (tt3u, tt3w, tt3w))), (tt3p, (tt3x, (tt3y, tt3z, tt3z), (tt3y, tt3A, tt3A)), (tt3x, (tt3B, tt3C, tt3C), (tt3B, tt3D, tt3D))))), (tt38, (tt3E, (tt3F, (tt3G, (tt3H, tt3I, tt3I), (tt3H, tt3J, tt3J)), (tt3G, (tt3K, tt3L, tt3L), (tt3K, tt3M, tt3M))), (tt3F, (tt3N, (tt3O, tt3P, tt3P), (tt3O, tt3Q, tt3Q)), (tt3N, (tt3R, tt3S, tt3S), (tt3R, tt3T, tt3T)))), (tt3E, (tt3U, (tt3V, (tt3W, tt3X, tt3X), (tt3W, tt3Y, tt3Y)), (tt3V, (tt3Z, tt40, tt40), (tt3Z, tt41, tt41))), (tt3U, (tt42, (tt43, tt44, tt44), (tt43, tt45, tt45)), (tt42, (tt46, tt47, tt47), (tt46, tt48, tt48)))))))), (tt49, (tt4c, (tt4d, (tt4e, (tt4f, (tt4g, (tt4h, (tt4i, tt4j, tt4j), (tt4i, tt4k, tt4k)), (tt4h, (tt4l, tt4m, tt4m), (tt4l, tt4n, tt4n))), (tt4g, (tt4o, (tt4p, tt4q, tt4q), (tt4p, tt4r, tt4r)), (tt4o, (tt4s, tt4t, tt4t), (tt4s, tt4u, tt4u)))), (tt4f, (tt4v, (tt4w, (tt4x, tt4y, tt4y), (tt4x, tt4z, tt4z)), (tt4w, (tt4A, tt4B, tt4B), (tt4A, tt4C, tt4C))), (tt4v, (tt4D, (tt4E, tt4F, tt4F), (tt4E, tt4G, tt4G)), (tt4D, (tt4H, tt4I, tt4I), (tt4H, tt4J, tt4J))))), (tt4e, (tt4K, (tt4L, (tt4M, (tt4N, tt4O, tt4O), (tt4N, tt4P, tt4P)), (tt4M, (tt4Q, tt4R, tt4R), (tt4Q, tt4S, tt4S))), (tt4L, (tt4T, (tt4U, tt4V, tt4V), (tt4U, tt4W, tt4W)), (tt4T, (tt4X, tt4Y, tt4Y), (tt4X, tt4Z, tt4Z)))), (tt4K, (tt50, (tt51, (tt52, tt53, tt53), (tt52, tt54, tt54)), (tt51, (tt55, tt56, tt56), (tt55, tt57, tt57))), (tt50, (tt58, (tt59, tt5a, tt5a), (tt59, tt5b, tt5b)), (tt58, (tt5c, tt5d, tt5d), (tt5c, tt5e, tt5e)))))), (tt4d, (tt5f, (tt5g, (tt5h, (tt5i, (tt5j, tt5k, tt5k), (tt5j, tt5l, tt5l)), (tt5i, (tt5m, tt5n, tt5n), (tt5m, tt5o, tt5o))), (tt5h, (tt5p, (tt5q, tt5r, tt5r), (tt5q, tt5s, tt5s)), (tt5p, (tt5t, tt5u, tt5u), (tt5t, tt5v, tt5v)))), (tt5g, (tt5w, (tt5x, (tt5y, tt5z, tt5z), (tt5y, tt5A, tt5A)), (tt5x, (tt5B, tt5C, tt5C), (tt5B, tt5D, tt5D))), (tt5w, (tt5E, (tt5F, tt5G, tt5G), (tt5F, tt5H, tt5H)), (tt5E, (tt5I, tt5J, tt5J), (tt5I, tt5K, tt5K))))), (tt5f, (tt5L, (tt5M, (tt5N, (tt5O, tt5P, tt5P), (tt5O, tt5Q, tt5Q)), (tt5N, (tt5R, tt5S, tt5S), (tt5R, tt5T, tt5T))), (tt5M, (tt5U, (tt5V, tt5W, tt5W), (tt5V, tt5X, tt5X)), (tt5U, (tt5Y, tt5Z, tt5Z), (tt5Y, tt60, tt60)))), (tt5L, (tt61, (tt62, (tt63, tt64, tt64), (tt63, tt65, tt65)), (tt62, (tt66, tt67, tt67), (tt66, tt68, tt68))), (tt61, (tt69, (tt6a, tt6b, tt6b), (tt6a, tt6c, tt6c)), (tt69, (tt6d, tt6e, tt6e), (tt6d, tt6f, tt6f))))))), (tt4c, (tt6g, (tt6h, (tt6i, (tt6j, (tt6k, (tt6l, tt6m, tt6m), (tt6l, tt6n, tt6n)), (tt6k, (tt6o, tt6p, tt6p), (tt6o, tt6q, tt6q))), (tt6j, (tt6r, (tt6s, tt6t, tt6t), (tt6s, tt6u, tt6u)), (tt6r, (tt6v, tt6w, tt6w), (tt6v, tt6x, tt6x)))), (tt6i, (tt6y, (tt6z, (tt6A, tt6B, tt6B), (tt6A, tt6C, tt6C)), (tt6z, (tt6D, tt6E, tt6E), (tt6D, tt6F, tt6F))), (tt6y, (tt6G, (tt6H, tt6I, tt6I), (tt6H, tt6J, tt6J)), (tt6G, (tt6K, tt6L, tt6L), (tt6K, tt6M, tt6M))))), (tt6h, (tt6N, (tt6O, (tt6P, (tt6Q, tt6R, tt6R), (tt6Q, tt6S, tt6S)), (tt6P, (tt6T, tt6U, tt6U), (tt6T, tt6V, tt6V))), (tt6O, (tt6W, (tt6X, tt6Y, tt6Y), (tt6X, tt6Z, tt6Z)), (tt6W, (tt70, tt71, tt71), (tt70, tt72, tt72)))), (tt6N, (tt73, (tt74, (tt75, tt76, tt76), (tt75, tt77, tt77)), (tt74, (tt78, tt79, tt79), (tt78, tt7a, tt7a))), (tt73, (tt7b, (tt7c, tt7d, tt7d), (tt7c, tt7e, tt7e)), (tt7b, (tt7f, tt7g, tt7g), (tt7f, tt7h, tt7h)))))), (tt6g, (tt7i, (tt7j, (tt7k, (tt7l, (tt7m, tt7n, tt7n), (tt7m, tt7o, tt7o)), (tt7l, (tt7p, tt7q, tt7q), (tt7p, tt7r, tt7r))), (tt7k, (tt7s, (tt7t, tt7u, tt7u), (tt7t, tt7v, tt7v)), (tt7s, (tt7w, tt7x, tt7x), (tt7w, tt7y, tt7y)))), (tt7j, (tt7z, (tt7A, (tt7B, tt7C, tt7C), (tt7B, tt7D, tt7D)), (tt7A, (tt7E, tt7F, tt7F), (tt7E, tt7G, tt7G))), (tt7z, (tt7H, (tt7I, tt7J, tt7J), (tt7I, tt7K, tt7K)), (tt7H, (tt7L, tt7M, tt7M), (tt7L, tt7N, tt7N))))), (tt7i, (tt7O, (tt7P, (tt7Q, (tt7R, tt7S, tt7S), (tt7R, tt7T, tt7T)), (tt7Q, (tt7U, tt7V, tt7V), (tt7U, tt7W, tt7W))), (tt7P, (tt7X, (tt7Y, tt7Z, tt7Z), (tt7Y, tt80, tt80)), (tt7X, (tt81, tt82, tt82), (tt81, tt83, tt83)))), (tt7O, (tt84, (tt85, (tt86, tt87, tt87), (tt86, tt88, tt88)), (tt85, (tt89, tt8a, tt8a), (tt89, tt8b, tt8b))), (tt84, (tt8c, (tt8d, tt8e, tt8e), (tt8d, tt8f, tt8f)), (tt8c, (tt8g, tt8h, tt8h), (tt8g, tt8i, tt8i))))))))) -> ta ;;
-1 g_rec _:_ _forall_ [ta tb tc td te tf tg th ti tj tk] => (tb -> tc -> td -> tk -> ta) -> (tg -> te -> th -> ti -> ta) -> tf -> tb -> (tf, te, tg) -> (tj, tk, ti) -> tj ;;
-1 g_rec0 _:_ _forall_ [ta] => ta -> ta -> ta -> ta -> ta ;;
-1 g_rec1 _:_ _forall_ [ta tb tc] => tc -> tb -> (tc, tb, tb) -> (ta, tb, tb) -> ta ;;
-1 g_rec2 _:_ _forall_ [ta tb tc td te tf tg] => tg -> tb -> (tg, tf, te) -> (ta, (td, tc, tc), (td, tf, tf)) -> ta ;;
-1 g_rec3 _:_ _forall_ [ta tb tc td te tf tg th ti tj tk tl] => tl -> tb -> (tl, th, tg) -> (ta, (tf, (td, te, te), (td, tc, tc)), (tf, (tj, tk, tk), (tj, ti, ti))) -> ta ;;
-1 g_rec4 _:_ _forall_ [ta tb tc td te tf tg th ti tj tk tl tm tn to tp tq tr ts tt] => tt -> tb -> (tt, tl, tk) -> (ta, (tj, (tc, (td, te, te), (td, tf, tf)), (tc, (tg, th, th), (tg, ti, ti))), (tj, (tm, (tn, to, to), (tn, tp, tp)), (tm, (tq, tr, tr), (tq, ts, ts)))) -> ta ;;
-1 g_rec5 _:_ _forall_ [ta tb tc td te tf tg th ti tj tk tl tm tn to tp tq tr ts tt tu tv tw tx ty tz ttq ttr tts ttt ttu ttv ttw ttx tty ttz] => ttz -> tb -> (ttz, tt, ts) -> (ta, (tr, (tc, (td, (te, tf, tf), (te, tg, tg)), (td, (th, ti, ti), (th, tj, tj))), (tc, (tk, (tl, tm, tm), (tl, tn, tn)), (tk, (to, tp, tp), (to, tq, tq)))), (tr, (tu, (tv, (tw, tx, tx), (tw, ty, ty)), (tv, (tz, ttq, ttq), (tz, ttr, ttr))), (tu, (tts, (ttt, ttu, ttu), (ttt, ttv, ttv)), (tts, (ttw, ttx, ttx), (ttw, tty, tty))))) -> ta ;;
-1 g_rec6 _:_ _forall_ [ta tb tc td te tf tg th ti tj tk tl tm tn to tp tq tr ts tt tu tv tw tx ty tz ttq ttr tts ttt ttu ttv ttw ttx tty ttz ttA ttB ttC ttD ttE ttF ttG ttH ttI ttJ ttK ttL ttM ttN ttO ttP ttQ ttR ttS ttT ttU ttV ttW ttX ttY ttZ tt10 tt11 tt12 tt13 tt14 tt15] => tt15 -> tb -> (tt15, ttz, tty) -> (ta, (ttx, (tc, (td, (te, (tf, tg, tg), (tf, th, th)), (te, (ti, tj, tj), (ti, tk, tk))), (td, (tl, (tm, tn, tn), (tm, to, to)), (tl, (tp, tq, tq), (tp, tr, tr)))), (tc, (ts, (tt, (tu, tv, tv), (tu, tw, tw)), (tt, (tx, ty, ty), (tx, tz, tz))), (ts, (ttq, (ttr, tts, tts), (ttr, ttt, ttt)), (ttq, (ttu, ttv, ttv), (ttu, ttw, ttw))))), (ttx, (ttA, (ttB, (ttC, (ttD, ttE, ttE), (ttD, ttF, ttF)), (ttC, (ttG, ttH, ttH), (ttG, ttI, ttI))), (ttB, (ttJ, (ttK, ttL, ttL), (ttK, ttM, ttM)), (ttJ, (ttN, ttO, ttO), (ttN, ttP, ttP)))), (ttA, (ttQ, (ttR, (ttS, ttT, ttT), (ttS, ttU, ttU)), (ttR, (ttV, ttW, ttW), (ttV, ttX, ttX))), (ttQ, (ttY, (ttZ, tt10, tt10), (ttZ, tt11, tt11)), (ttY, (tt12, tt13, tt13), (tt12, tt14, tt14)))))) -> ta ;;
-1 g_rec7 _:_ _forall_ [ta tb tc td te tf tg th ti tj tk tl tm tn to tp tq tr ts tt tu tv tw tx ty tz ttq ttr tts ttt ttu ttv ttw ttx tty ttz ttA ttB ttC ttD ttE ttF ttG ttH ttI ttJ ttK ttL ttM ttN ttO ttP ttQ ttR ttS ttT ttU ttV ttW ttX ttY ttZ tt10 tt11 tt12 tt13 tt14 tt15 tt16 tt17 tt18 tt19 tt1a tt1b tt1c tt1d tt1e tt1f tt1g tt1h tt1i tt1j tt1k tt1l tt1m tt1n tt1o tt1p tt1q tt1r tt1s tt1t tt1u tt1v tt1w tt1x tt1y tt1z tt1A tt1B tt1C tt1D tt1E tt1F tt1G tt1H tt1I tt1J tt1K tt1L tt1M tt1N tt1O tt1P tt1Q tt1R tt1S tt1T tt1U tt1V tt1W tt1X tt1Y tt1Z tt20 tt21 tt22 tt23 tt24 tt25 tt26 tt27] => tt27 -> tb -> (tt27, tt15, tt14) -> (ta, (tt13, (tc, (td, (te, (tf, (tg, th, th), (tg, ti, ti)), (tf, (tj, tk, tk), (tj, tl, tl))), (te, (tm, (tn, to, to), (tn, tp, tp)), (tm, (tq, tr, tr), (tq, ts, ts)))), (td, (tt, (tu, (tv, tw, tw), (tv, tx, tx)), (tu, (ty, tz, tz), (ty, ttq, ttq))), (tt, (ttr, (tts, ttt, ttt), (tts, ttu, ttu)), (ttr, (ttv, ttw, ttw), (ttv, ttx, ttx))))), (tc, (tty, (ttz, (ttA, (ttB, ttC, ttC), (ttB, ttD, ttD)), (ttA, (ttE, ttF, ttF), (ttE, ttG, ttG))), (ttz, (ttH, (ttI, ttJ, ttJ), (ttI, ttK, ttK)), (ttH, (ttL, ttM, ttM), (ttL, ttN, ttN)))), (tty, (ttO, (ttP, (ttQ, ttR, ttR), (ttQ, ttS, ttS)), (ttP, (ttT, ttU, ttU), (ttT, ttV, ttV))), (ttO, (ttW, (ttX, ttY, ttY), (ttX, ttZ, ttZ)), (ttW, (tt10, tt11, tt11), (tt10, tt12, tt12)))))), (tt13, (tt16, (tt17, (tt18, (tt19, (tt1a, tt1b, tt1b), (tt1a, tt1c, tt1c)), (tt19, (tt1d, tt1e, tt1e), (tt1d, tt1f, tt1f))), (tt18, (tt1g, (tt1h, tt1i, tt1i), (tt1h, tt1j, tt1j)), (tt1g, (tt1k, tt1l, tt1l), (tt1k, tt1m, tt1m)))), (tt17, (tt1n, (tt1o, (tt1p, tt1q, tt1q), (tt1p, tt1r, tt1r)), (tt1o, (tt1s, tt1t, tt1t), (tt1s, tt1u, tt1u))), (tt1n, (tt1v, (tt1w, tt1x, tt1x), (tt1w, tt1y, tt1y)), (tt1v, (tt1z, tt1A, tt1A), (tt1z, tt1B, tt1B))))), (tt16, (tt1C, (tt1D, (tt1E, (tt1F, tt1G, tt1G), (tt1F, tt1H, tt1H)), (tt1E, (tt1I, tt1J, tt1J), (tt1I, tt1K, tt1K))), (tt1D, (tt1L, (tt1M, tt1N, tt1N), (tt1M, tt1O, tt1O)), (tt1L, (tt1P, tt1Q, tt1Q), (tt1P, tt1R, tt1R)))), (tt1C, (tt1S, (tt1T, (tt1U, tt1V, tt1V), (tt1U, tt1W, tt1W)), (tt1T, (tt1X, tt1Y, tt1Y), (tt1X, tt1Z, tt1Z))), (tt1S, (tt20, (tt21, tt22, tt22), (tt21, tt23, tt23)), (tt20, (tt24, tt25, tt25), (tt24, tt26, tt26))))))) -> ta ;;
-1 g_rec8 _:_ _forall_ [ta tb tc td te tf tg th ti tj tk tl tm tn to tp tq tr ts tt tu tv tw tx ty tz ttq ttr tts ttt ttu ttv ttw ttx tty ttz ttA ttB ttC ttD ttE ttF ttG ttH ttI ttJ ttK ttL ttM ttN ttO ttP ttQ ttR ttS ttT ttU ttV ttW ttX ttY ttZ tt10 tt11 tt12 tt13 tt14 tt15 tt16 tt17 tt18 tt19 tt1a tt1b tt1c tt1d tt1e tt1f tt1g tt1h tt1i tt1j tt1k tt1l tt1m tt1n tt1o tt1p tt1q tt1r tt1s tt1t tt1u tt1v tt1w tt1x tt1y tt1z tt1A tt1B tt1C tt1D tt1E tt1F tt1G tt1H tt1I tt1J tt1K tt1L tt1M tt1N tt1O tt1P tt1Q tt1R tt1S tt1T tt1U tt1V tt1W tt1X tt1Y tt1Z tt20 tt21 tt22 tt23 tt24 tt25 tt26 tt27 tt28 tt29 tt2a tt2b tt2c tt2d tt2e tt2f tt2g tt2h tt2i tt2j tt2k tt2l tt2m tt2n tt2o tt2p tt2q tt2r tt2s tt2t tt2u tt2v tt2w tt2x tt2y tt2z tt2A tt2B tt2C tt2D tt2E tt2F tt2G tt2H tt2I tt2J tt2K tt2L tt2M tt2N tt2O tt2P tt2Q tt2R tt2S tt2T tt2U tt2V tt2W tt2X tt2Y tt2Z tt30 tt31 tt32 tt33 tt34 tt35 tt36 tt37 tt38 tt39 tt3a tt3b tt3c tt3d tt3e tt3f tt3g tt3h tt3i tt3j tt3k tt3l tt3m tt3n tt3o tt3p tt3q tt3r tt3s tt3t tt3u tt3v tt3w tt3x tt3y tt3z tt3A tt3B tt3C tt3D tt3E tt3F tt3G tt3H tt3I tt3J tt3K tt3L tt3M tt3N tt3O tt3P tt3Q tt3R tt3S tt3T tt3U tt3V tt3W tt3X tt3Y tt3Z tt40 tt41 tt42 tt43 tt44 tt45 tt46 tt47 tt48 tt49 tt4a tt4b] => tt4b -> tb -> (tt4b, tt27, tt26) -> (ta, (tt25, (tc, (td, (te, (tf, (tg, (th, ti, ti), (th, tj, tj)), (tg, (tk, tl, tl), (tk, tm, tm))), (tf, (tn, (to, tp, tp), (to, tq, tq)), (tn, (tr, ts, ts), (tr, tt, tt)))), (te, (tu, (tv, (tw, tx, tx), (tw, ty, ty)), (tv, (tz, ttq, ttq), (tz, ttr, ttr))), (tu, (tts, (ttt, ttu, ttu), (ttt, ttv, ttv)), (tts, (ttw, ttx, ttx), (ttw, tty, tty))))), (td, (ttz, (ttA, (ttB, (ttC, ttD, ttD), (ttC, ttE, ttE)), (ttB, (ttF, ttG, ttG), (ttF, ttH, ttH))), (ttA, (ttI, (ttJ, ttK, ttK), (ttJ, ttL, ttL)), (ttI, (ttM, ttN, ttN), (ttM, ttO, ttO)))), (ttz, (ttP, (ttQ, (ttR, ttS, ttS), (ttR, ttT, ttT)), (ttQ, (ttU, ttV, ttV), (ttU, ttW, ttW))), (ttP, (ttX, (ttY, ttZ, ttZ), (ttY, tt10, tt10)), (ttX, (tt11, tt12, tt12), (tt11, tt13, tt13)))))), (tc, (tt14, (tt15, (tt16, (tt17, (tt18, tt19, tt19), (tt18, tt1a, tt1a)), (tt17, (tt1b, tt1c, tt1c), (tt1b, tt1d, tt1d))), (tt16, (tt1e, (tt1f, tt1g, tt1g), (tt1f, tt1h, tt1h)), (tt1e, (tt1i, tt1j, tt1j), (tt1i, tt1k, tt1k)))), (tt15, (tt1l, (tt1m, (tt1n, tt1o, tt1o), (tt1n, tt1p, tt1p)), (tt1m, (tt1q, tt1r, tt1r), (tt1q, tt1s, tt1s))), (tt1l, (tt1t, (tt1u, tt1v, tt1v), (tt1u, tt1w, tt1w)), (tt1t, (tt1x, tt1y, tt1y), (tt1x, tt1z, tt1z))))), (tt14, (tt1A, (tt1B, (tt1C, (tt1D, tt1E, tt1E), (tt1D, tt1F, tt1F)), (tt1C, (tt1G, tt1H, tt1H), (tt1G, tt1I, tt1I))), (tt1B, (tt1J, (tt1K, tt1L, tt1L), (tt1K, tt1M, tt1M)), (tt1J, (tt1N, tt1O, tt1O), (tt1N, tt1P, tt1P)))), (tt1A, (tt1Q, (tt1R, (tt1S, tt1T, tt1T), (tt1S, tt1U, tt1U)), (tt1R, (tt1V, tt1W, tt1W), (tt1V, tt1X, tt1X))), (tt1Q, (tt1Y, (tt1Z, tt20, tt20), (tt1Z, tt21, tt21)), (tt1Y, (tt22, tt23, tt23), (tt22, tt24, tt24))))))), (tt25, (tt28, (tt29, (tt2a, (tt2b, (tt2c, (tt2d, tt2e, tt2e), (tt2d, tt2f, tt2f)), (tt2c, (tt2g, tt2h, tt2h), (tt2g, tt2i, tt2i))), (tt2b, (tt2j, (tt2k, tt2l, tt2l), (tt2k, tt2m, tt2m)), (tt2j, (tt2n, tt2o, tt2o), (tt2n, tt2p, tt2p)))), (tt2a, (tt2q, (tt2r, (tt2s, tt2t, tt2t), (tt2s, tt2u, tt2u)), (tt2r, (tt2v, tt2w, tt2w), (tt2v, tt2x, tt2x))), (tt2q, (tt2y, (tt2z, tt2A, tt2A), (tt2z, tt2B, tt2B)), (tt2y, (tt2C, tt2D, tt2D), (tt2C, tt2E, tt2E))))), (tt29, (tt2F, (tt2G, (tt2H, (tt2I, tt2J, tt2J), (tt2I, tt2K, tt2K)), (tt2H, (tt2L, tt2M, tt2M), (tt2L, tt2N, tt2N))), (tt2G, (tt2O, (tt2P, tt2Q, tt2Q), (tt2P, tt2R, tt2R)), (tt2O, (tt2S, tt2T, tt2T), (tt2S, tt2U, tt2U)))), (tt2F, (tt2V, (tt2W, (tt2X, tt2Y, tt2Y), (tt2X, tt2Z, tt2Z)), (tt2W, (tt30, tt31, tt31), (tt30, tt32, tt32))), (tt2V, (tt33, (tt34, tt35, tt35), (tt34, tt36, tt36)), (tt33, (tt37, tt38, tt38), (tt37, tt39, tt39)))))), (tt28, (tt3a, (tt3b, (tt3c, (tt3d, (tt3e, tt3f, tt3f), (tt3e, tt3g, tt3g)), (tt3d, (tt3h, tt3i, tt3i), (tt3h, tt3j, tt3j))), (tt3c, (tt3k, (tt3l, tt3m, tt3m), (tt3l, tt3n, tt3n)), (tt3k, (tt3o, tt3p, tt3p), (tt3o, tt3q, tt3q)))), (tt3b, (tt3r, (tt3s, (tt3t, tt3u, tt3u), (tt3t, tt3v, tt3v)), (tt3s, (tt3w, tt3x, tt3x), (tt3w, tt3y, tt3y))), (tt3r, (tt3z, (tt3A, tt3B, tt3B), (tt3A, tt3C, tt3C)), (tt3z, (tt3D, tt3E, tt3E), (tt3D, tt3F, tt3F))))), (tt3a, (tt3G, (tt3H, (tt3I, (tt3J, tt3K, tt3K), (tt3J, tt3L, tt3L)), (tt3I, (tt3M, tt3N, tt3N), (tt3M, tt3O, tt3O))), (tt3H, (tt3P, (tt3Q, tt3R, tt3R), (tt3Q, tt3S, tt3S)), (tt3P, (tt3T, tt3U, tt3U), (tt3T, tt3V, tt3V)))), (tt3G, (tt3W, (tt3X, (tt3Y, tt3Z, tt3Z), (tt3Y, tt40, tt40)), (tt3X, (tt41, tt42, tt42), (tt41, tt43, tt43))), (tt3W, (tt44, (tt45, tt46, tt46), (tt45, tt47, tt47)), (tt44, (tt48, tt49, tt49), (tt48, tt4a, tt4a)))))))) -> ta ;;
-1 head _:_ _forall_ [ta] => [ta] -> ta ;;
-1 one _:_ _forall_ [ta] => ta ;;
-1 s_1_0 _:_ _forall_ [ta] => ta -> ta ;;
-1 s_2_0 _:_ _forall_ [ta tb] => (ta, tb) -> ta ;;
-1 s_2_1 _:_ _forall_ [ta tb] => (ta, tb) -> tb ;;
-1 s_3_0 _:_ _forall_ [ta tb tc] => (ta, tb, tc) -> ta ;;
-1 s_3_1 _:_ _forall_ [ta tb tc] => (ta, tb, tc) -> tb ;;
-1 s_3_2 _:_ _forall_ [ta tb tc] => (ta, tb, tc) -> tc ;;
+1 absAnd _:_ _forall_ [a] => a -> a -> a ;;
+1 absIf _:_ _forall_ [a b c] => c -> a -> b -> c ;;
+1 bottom _:_ _forall_ [a] => [a] -> a ;;
+1 f _:_ _forall_ [a] => a -> a ;;
+1 f_rec _:_ _forall_ [a b] => (b -> a) -> b -> a ;;
+1 f_rec0 _:_ _forall_ [a] => a -> a ;;
+1 f_rec1 _:_ _forall_ [a] => a -> a ;;
+1 f_rec2 _:_ _forall_ [a] => a -> a ;;
+1 fac _:_ _forall_ [a b c d e f g h i j k] => (a, (i, (b, (c, (d, e)))), (j, (b, (c, (d, e))), (f, (c, (d, e)), (g, (d, e), (h, e, e))))) -> (k, (i, (b, (c, (d, e))))) -> a ;;
+1 fac_rec _:_ _forall_ [a b c d e] => (c -> d -> a) -> (b, d, c) -> (e, d) -> b ;;
+1 fac_rec0 _:_ _forall_ [a] => a -> a -> a ;;
+1 fac_rec1 _:_ _forall_ [a b c] => (a, b, b) -> (c, b) -> a ;;
+1 fac_rec2 _:_ _forall_ [a b c d e] => (a, (c, b), (d, b, b)) -> (e, (c, b)) -> a ;;
+1 fac_rec3 _:_ _forall_ [a b c d e f g] => (a, (e, (b, c)), (f, (b, c), (d, c, c))) -> (g, (e, (b, c))) -> a ;;
+1 fac_rec4 _:_ _forall_ [a b c d e f g h i] => (a, (g, (b, (c, d))), (h, (b, (c, d)), (e, (c, d), (f, d, d)))) -> (i, (g, (b, (c, d)))) -> a ;;
+1 g _:_ _forall_ [a b c d e f g h i j k l m n o p q r s t u v w x y z tq tr ts tt tu tv tw tx ty tz tA tB tC tD tE tF tG tH tI tJ tK tL tM tN tO tP tQ tR tS tT tU tV tW tX tY tZ t10 t11 t12 t13 t14 t15 t16 t17 t18 t19 t1a t1b t1c t1d t1e t1f t1g t1h t1i t1j t1k t1l t1m t1n t1o t1p t1q t1r t1s t1t t1u t1v t1w t1x t1y t1z t1A t1B t1C t1D t1E t1F t1G t1H t1I t1J t1K t1L t1M t1N t1O t1P t1Q t1R t1S t1T t1U t1V t1W t1X t1Y t1Z t20 t21 t22 t23 t24 t25 t26 t27 t28 t29 t2a t2b t2c t2d t2e t2f t2g t2h t2i t2j t2k t2l t2m t2n t2o t2p t2q t2r t2s t2t t2u t2v t2w t2x t2y t2z t2A t2B t2C t2D t2E t2F t2G t2H t2I t2J t2K t2L t2M t2N t2O t2P t2Q t2R t2S t2T t2U t2V t2W t2X t2Y t2Z t30 t31 t32 t33 t34 t35 t36 t37 t38 t39 t3a t3b t3c t3d t3e t3f t3g t3h t3i t3j t3k t3l t3m t3n t3o t3p t3q t3r t3s t3t t3u t3v t3w t3x t3y t3z t3A t3B t3C t3D t3E t3F t3G t3H t3I t3J t3K t3L t3M t3N t3O t3P t3Q t3R t3S t3T t3U t3V t3W t3X t3Y t3Z t40 t41 t42 t43 t44 t45 t46 t47 t48 t49 t4a t4b t4c t4d t4e t4f t4g t4h t4i t4j t4k t4l t4m t4n t4o t4p t4q t4r t4s t4t t4u t4v t4w t4x t4y t4z t4A t4B t4C t4D t4E t4F t4G t4H t4I t4J t4K t4L t4M t4N t4O t4P t4Q t4R t4S t4T t4U t4V t4W t4X t4Y t4Z t50 t51 t52 t53 t54 t55 t56 t57 t58 t59 t5a t5b t5c t5d t5e t5f t5g t5h t5i t5j t5k t5l t5m t5n t5o t5p t5q t5r t5s t5t t5u t5v t5w t5x t5y t5z t5A t5B t5C t5D t5E t5F t5G t5H t5I t5J t5K t5L t5M t5N t5O t5P t5Q t5R t5S t5T t5U t5V t5W t5X t5Y t5Z t60 t61 t62 t63 t64 t65 t66 t67 t68 t69 t6a t6b t6c t6d t6e t6f t6g t6h t6i t6j t6k t6l t6m t6n t6o t6p t6q t6r t6s t6t t6u t6v t6w t6x t6y t6z t6A t6B t6C t6D t6E t6F t6G t6H t6I t6J t6K t6L t6M t6N t6O t6P t6Q t6R t6S t6T t6U t6V t6W t6X t6Y t6Z t70 t71 t72 t73 t74 t75 t76 t77 t78 t79 t7a t7b t7c t7d t7e t7f t7g t7h t7i t7j t7k t7l t7m t7n t7o t7p t7q t7r t7s t7t t7u t7v t7w t7x t7y t7z t7A t7B t7C t7D t7E t7F t7G t7H t7I t7J t7K t7L t7M t7N t7O t7P t7Q t7R t7S t7T t7U t7V t7W t7X t7Y t7Z t80 t81 t82 t83 t84 t85 t86 t87 t88 t89 t8a t8b t8c t8d t8e t8f t8g t8h t8i t8j] => t8j -> b -> (t8j, t4b, t4a) -> (a, (t49, (c, (d, (e, (f, (g, (h, (i, j, j), (i, k, k)), (h, (l, m, m), (l, n, n))), (g, (o, (p, q, q), (p, r, r)), (o, (s, t, t), (s, u, u)))), (f, (v, (w, (x, y, y), (x, z, z)), (w, (tq, tr, tr), (tq, ts, ts))), (v, (tt, (tu, tv, tv), (tu, tw, tw)), (tt, (tx, ty, ty), (tx, tz, tz))))), (e, (tA, (tB, (tC, (tD, tE, tE), (tD, tF, tF)), (tC, (tG, tH, tH), (tG, tI, tI))), (tB, (tJ, (tK, tL, tL), (tK, tM, tM)), (tJ, (tN, tO, tO), (tN, tP, tP)))), (tA, (tQ, (tR, (tS, tT, tT), (tS, tU, tU)), (tR, (tV, tW, tW), (tV, tX, tX))), (tQ, (tY, (tZ, t10, t10), (tZ, t11, t11)), (tY, (t12, t13, t13), (t12, t14, t14)))))), (d, (t15, (t16, (t17, (t18, (t19, t1a, t1a), (t19, t1b, t1b)), (t18, (t1c, t1d, t1d), (t1c, t1e, t1e))), (t17, (t1f, (t1g, t1h, t1h), (t1g, t1i, t1i)), (t1f, (t1j, t1k, t1k), (t1j, t1l, t1l)))), (t16, (t1m, (t1n, (t1o, t1p, t1p), (t1o, t1q, t1q)), (t1n, (t1r, t1s, t1s), (t1r, t1t, t1t))), (t1m, (t1u, (t1v, t1w, t1w), (t1v, t1x, t1x)), (t1u, (t1y, t1z, t1z), (t1y, t1A, t1A))))), (t15, (t1B, (t1C, (t1D, (t1E, t1F, t1F), (t1E, t1G, t1G)), (t1D, (t1H, t1I, t1I), (t1H, t1J, t1J))), (t1C, (t1K, (t1L, t1M, t1M), (t1L, t1N, t1N)), (t1K, (t1O, t1P, t1P), (t1O, t1Q, t1Q)))), (t1B, (t1R, (t1S, (t1T, t1U, t1U), (t1T, t1V, t1V)), (t1S, (t1W, t1X, t1X), (t1W, t1Y, t1Y))), (t1R, (t1Z, (t20, t21, t21), (t20, t22, t22)), (t1Z, (t23, t24, t24), (t23, t25, t25))))))), (c, (t26, (t27, (t28, (t29, (t2a, (t2b, t2c, t2c), (t2b, t2d, t2d)), (t2a, (t2e, t2f, t2f), (t2e, t2g, t2g))), (t29, (t2h, (t2i, t2j, t2j), (t2i, t2k, t2k)), (t2h, (t2l, t2m, t2m), (t2l, t2n, t2n)))), (t28, (t2o, (t2p, (t2q, t2r, t2r), (t2q, t2s, t2s)), (t2p, (t2t, t2u, t2u), (t2t, t2v, t2v))), (t2o, (t2w, (t2x, t2y, t2y), (t2x, t2z, t2z)), (t2w, (t2A, t2B, t2B), (t2A, t2C, t2C))))), (t27, (t2D, (t2E, (t2F, (t2G, t2H, t2H), (t2G, t2I, t2I)), (t2F, (t2J, t2K, t2K), (t2J, t2L, t2L))), (t2E, (t2M, (t2N, t2O, t2O), (t2N, t2P, t2P)), (t2M, (t2Q, t2R, t2R), (t2Q, t2S, t2S)))), (t2D, (t2T, (t2U, (t2V, t2W, t2W), (t2V, t2X, t2X)), (t2U, (t2Y, t2Z, t2Z), (t2Y, t30, t30))), (t2T, (t31, (t32, t33, t33), (t32, t34, t34)), (t31, (t35, t36, t36), (t35, t37, t37)))))), (t26, (t38, (t39, (t3a, (t3b, (t3c, t3d, t3d), (t3c, t3e, t3e)), (t3b, (t3f, t3g, t3g), (t3f, t3h, t3h))), (t3a, (t3i, (t3j, t3k, t3k), (t3j, t3l, t3l)), (t3i, (t3m, t3n, t3n), (t3m, t3o, t3o)))), (t39, (t3p, (t3q, (t3r, t3s, t3s), (t3r, t3t, t3t)), (t3q, (t3u, t3v, t3v), (t3u, t3w, t3w))), (t3p, (t3x, (t3y, t3z, t3z), (t3y, t3A, t3A)), (t3x, (t3B, t3C, t3C), (t3B, t3D, t3D))))), (t38, (t3E, (t3F, (t3G, (t3H, t3I, t3I), (t3H, t3J, t3J)), (t3G, (t3K, t3L, t3L), (t3K, t3M, t3M))), (t3F, (t3N, (t3O, t3P, t3P), (t3O, t3Q, t3Q)), (t3N, (t3R, t3S, t3S), (t3R, t3T, t3T)))), (t3E, (t3U, (t3V, (t3W, t3X, t3X), (t3W, t3Y, t3Y)), (t3V, (t3Z, t40, t40), (t3Z, t41, t41))), (t3U, (t42, (t43, t44, t44), (t43, t45, t45)), (t42, (t46, t47, t47), (t46, t48, t48)))))))), (t49, (t4c, (t4d, (t4e, (t4f, (t4g, (t4h, (t4i, t4j, t4j), (t4i, t4k, t4k)), (t4h, (t4l, t4m, t4m), (t4l, t4n, t4n))), (t4g, (t4o, (t4p, t4q, t4q), (t4p, t4r, t4r)), (t4o, (t4s, t4t, t4t), (t4s, t4u, t4u)))), (t4f, (t4v, (t4w, (t4x, t4y, t4y), (t4x, t4z, t4z)), (t4w, (t4A, t4B, t4B), (t4A, t4C, t4C))), (t4v, (t4D, (t4E, t4F, t4F), (t4E, t4G, t4G)), (t4D, (t4H, t4I, t4I), (t4H, t4J, t4J))))), (t4e, (t4K, (t4L, (t4M, (t4N, t4O, t4O), (t4N, t4P, t4P)), (t4M, (t4Q, t4R, t4R), (t4Q, t4S, t4S))), (t4L, (t4T, (t4U, t4V, t4V), (t4U, t4W, t4W)), (t4T, (t4X, t4Y, t4Y), (t4X, t4Z, t4Z)))), (t4K, (t50, (t51, (t52, t53, t53), (t52, t54, t54)), (t51, (t55, t56, t56), (t55, t57, t57))), (t50, (t58, (t59, t5a, t5a), (t59, t5b, t5b)), (t58, (t5c, t5d, t5d), (t5c, t5e, t5e)))))), (t4d, (t5f, (t5g, (t5h, (t5i, (t5j, t5k, t5k), (t5j, t5l, t5l)), (t5i, (t5m, t5n, t5n), (t5m, t5o, t5o))), (t5h, (t5p, (t5q, t5r, t5r), (t5q, t5s, t5s)), (t5p, (t5t, t5u, t5u), (t5t, t5v, t5v)))), (t5g, (t5w, (t5x, (t5y, t5z, t5z), (t5y, t5A, t5A)), (t5x, (t5B, t5C, t5C), (t5B, t5D, t5D))), (t5w, (t5E, (t5F, t5G, t5G), (t5F, t5H, t5H)), (t5E, (t5I, t5J, t5J), (t5I, t5K, t5K))))), (t5f, (t5L, (t5M, (t5N, (t5O, t5P, t5P), (t5O, t5Q, t5Q)), (t5N, (t5R, t5S, t5S), (t5R, t5T, t5T))), (t5M, (t5U, (t5V, t5W, t5W), (t5V, t5X, t5X)), (t5U, (t5Y, t5Z, t5Z), (t5Y, t60, t60)))), (t5L, (t61, (t62, (t63, t64, t64), (t63, t65, t65)), (t62, (t66, t67, t67), (t66, t68, t68))), (t61, (t69, (t6a, t6b, t6b), (t6a, t6c, t6c)), (t69, (t6d, t6e, t6e), (t6d, t6f, t6f))))))), (t4c, (t6g, (t6h, (t6i, (t6j, (t6k, (t6l, t6m, t6m), (t6l, t6n, t6n)), (t6k, (t6o, t6p, t6p), (t6o, t6q, t6q))), (t6j, (t6r, (t6s, t6t, t6t), (t6s, t6u, t6u)), (t6r, (t6v, t6w, t6w), (t6v, t6x, t6x)))), (t6i, (t6y, (t6z, (t6A, t6B, t6B), (t6A, t6C, t6C)), (t6z, (t6D, t6E, t6E), (t6D, t6F, t6F))), (t6y, (t6G, (t6H, t6I, t6I), (t6H, t6J, t6J)), (t6G, (t6K, t6L, t6L), (t6K, t6M, t6M))))), (t6h, (t6N, (t6O, (t6P, (t6Q, t6R, t6R), (t6Q, t6S, t6S)), (t6P, (t6T, t6U, t6U), (t6T, t6V, t6V))), (t6O, (t6W, (t6X, t6Y, t6Y), (t6X, t6Z, t6Z)), (t6W, (t70, t71, t71), (t70, t72, t72)))), (t6N, (t73, (t74, (t75, t76, t76), (t75, t77, t77)), (t74, (t78, t79, t79), (t78, t7a, t7a))), (t73, (t7b, (t7c, t7d, t7d), (t7c, t7e, t7e)), (t7b, (t7f, t7g, t7g), (t7f, t7h, t7h)))))), (t6g, (t7i, (t7j, (t7k, (t7l, (t7m, t7n, t7n), (t7m, t7o, t7o)), (t7l, (t7p, t7q, t7q), (t7p, t7r, t7r))), (t7k, (t7s, (t7t, t7u, t7u), (t7t, t7v, t7v)), (t7s, (t7w, t7x, t7x), (t7w, t7y, t7y)))), (t7j, (t7z, (t7A, (t7B, t7C, t7C), (t7B, t7D, t7D)), (t7A, (t7E, t7F, t7F), (t7E, t7G, t7G))), (t7z, (t7H, (t7I, t7J, t7J), (t7I, t7K, t7K)), (t7H, (t7L, t7M, t7M), (t7L, t7N, t7N))))), (t7i, (t7O, (t7P, (t7Q, (t7R, t7S, t7S), (t7R, t7T, t7T)), (t7Q, (t7U, t7V, t7V), (t7U, t7W, t7W))), (t7P, (t7X, (t7Y, t7Z, t7Z), (t7Y, t80, t80)), (t7X, (t81, t82, t82), (t81, t83, t83)))), (t7O, (t84, (t85, (t86, t87, t87), (t86, t88, t88)), (t85, (t89, t8a, t8a), (t89, t8b, t8b))), (t84, (t8c, (t8d, t8e, t8e), (t8d, t8f, t8f)), (t8c, (t8g, t8h, t8h), (t8g, t8i, t8i))))))))) -> a ;;
+1 g_rec _:_ _forall_ [a b c d e f g h i j k] => (b -> c -> d -> k -> a) -> (g -> e -> h -> i -> a) -> f -> b -> (f, e, g) -> (j, k, i) -> j ;;
+1 g_rec0 _:_ _forall_ [a] => a -> a -> a -> a -> a ;;
+1 g_rec1 _:_ _forall_ [a b c] => c -> b -> (c, b, b) -> (a, b, b) -> a ;;
+1 g_rec2 _:_ _forall_ [a b c d e f g] => g -> b -> (g, f, e) -> (a, (d, c, c), (d, f, f)) -> a ;;
+1 g_rec3 _:_ _forall_ [a b c d e f g h i j k l] => l -> b -> (l, h, g) -> (a, (f, (d, e, e), (d, c, c)), (f, (j, k, k), (j, i, i))) -> a ;;
+1 g_rec4 _:_ _forall_ [a b c d e f g h i j k l m n o p q r s t] => t -> b -> (t, l, k) -> (a, (j, (c, (d, e, e), (d, f, f)), (c, (g, h, h), (g, i, i))), (j, (m, (n, o, o), (n, p, p)), (m, (q, r, r), (q, s, s)))) -> a ;;
+1 g_rec5 _:_ _forall_ [a b c d e f g h i j k l m n o p q r s t u v w x y z tq tr ts tt tu tv tw tx ty tz] => tz -> b -> (tz, t, s) -> (a, (r, (c, (d, (e, f, f), (e, g, g)), (d, (h, i, i), (h, j, j))), (c, (k, (l, m, m), (l, n, n)), (k, (o, p, p), (o, q, q)))), (r, (u, (v, (w, x, x), (w, y, y)), (v, (z, tq, tq), (z, tr, tr))), (u, (ts, (tt, tu, tu), (tt, tv, tv)), (ts, (tw, tx, tx), (tw, ty, ty))))) -> a ;;
+1 g_rec6 _:_ _forall_ [a b c d e f g h i j k l m n o p q r s t u v w x y z tq tr ts tt tu tv tw tx ty tz tA tB tC tD tE tF tG tH tI tJ tK tL tM tN tO tP tQ tR tS tT tU tV tW tX tY tZ t10 t11 t12 t13 t14 t15] => t15 -> b -> (t15, tz, ty) -> (a, (tx, (c, (d, (e, (f, g, g), (f, h, h)), (e, (i, j, j), (i, k, k))), (d, (l, (m, n, n), (m, o, o)), (l, (p, q, q), (p, r, r)))), (c, (s, (t, (u, v, v), (u, w, w)), (t, (x, y, y), (x, z, z))), (s, (tq, (tr, ts, ts), (tr, tt, tt)), (tq, (tu, tv, tv), (tu, tw, tw))))), (tx, (tA, (tB, (tC, (tD, tE, tE), (tD, tF, tF)), (tC, (tG, tH, tH), (tG, tI, tI))), (tB, (tJ, (tK, tL, tL), (tK, tM, tM)), (tJ, (tN, tO, tO), (tN, tP, tP)))), (tA, (tQ, (tR, (tS, tT, tT), (tS, tU, tU)), (tR, (tV, tW, tW), (tV, tX, tX))), (tQ, (tY, (tZ, t10, t10), (tZ, t11, t11)), (tY, (t12, t13, t13), (t12, t14, t14)))))) -> a ;;
+1 g_rec7 _:_ _forall_ [a b c d e f g h i j k l m n o p q r s t u v w x y z tq tr ts tt tu tv tw tx ty tz tA tB tC tD tE tF tG tH tI tJ tK tL tM tN tO tP tQ tR tS tT tU tV tW tX tY tZ t10 t11 t12 t13 t14 t15 t16 t17 t18 t19 t1a t1b t1c t1d t1e t1f t1g t1h t1i t1j t1k t1l t1m t1n t1o t1p t1q t1r t1s t1t t1u t1v t1w t1x t1y t1z t1A t1B t1C t1D t1E t1F t1G t1H t1I t1J t1K t1L t1M t1N t1O t1P t1Q t1R t1S t1T t1U t1V t1W t1X t1Y t1Z t20 t21 t22 t23 t24 t25 t26 t27] => t27 -> b -> (t27, t15, t14) -> (a, (t13, (c, (d, (e, (f, (g, h, h), (g, i, i)), (f, (j, k, k), (j, l, l))), (e, (m, (n, o, o), (n, p, p)), (m, (q, r, r), (q, s, s)))), (d, (t, (u, (v, w, w), (v, x, x)), (u, (y, z, z), (y, tq, tq))), (t, (tr, (ts, tt, tt), (ts, tu, tu)), (tr, (tv, tw, tw), (tv, tx, tx))))), (c, (ty, (tz, (tA, (tB, tC, tC), (tB, tD, tD)), (tA, (tE, tF, tF), (tE, tG, tG))), (tz, (tH, (tI, tJ, tJ), (tI, tK, tK)), (tH, (tL, tM, tM), (tL, tN, tN)))), (ty, (tO, (tP, (tQ, tR, tR), (tQ, tS, tS)), (tP, (tT, tU, tU), (tT, tV, tV))), (tO, (tW, (tX, tY, tY), (tX, tZ, tZ)), (tW, (t10, t11, t11), (t10, t12, t12)))))), (t13, (t16, (t17, (t18, (t19, (t1a, t1b, t1b), (t1a, t1c, t1c)), (t19, (t1d, t1e, t1e), (t1d, t1f, t1f))), (t18, (t1g, (t1h, t1i, t1i), (t1h, t1j, t1j)), (t1g, (t1k, t1l, t1l), (t1k, t1m, t1m)))), (t17, (t1n, (t1o, (t1p, t1q, t1q), (t1p, t1r, t1r)), (t1o, (t1s, t1t, t1t), (t1s, t1u, t1u))), (t1n, (t1v, (t1w, t1x, t1x), (t1w, t1y, t1y)), (t1v, (t1z, t1A, t1A), (t1z, t1B, t1B))))), (t16, (t1C, (t1D, (t1E, (t1F, t1G, t1G), (t1F, t1H, t1H)), (t1E, (t1I, t1J, t1J), (t1I, t1K, t1K))), (t1D, (t1L, (t1M, t1N, t1N), (t1M, t1O, t1O)), (t1L, (t1P, t1Q, t1Q), (t1P, t1R, t1R)))), (t1C, (t1S, (t1T, (t1U, t1V, t1V), (t1U, t1W, t1W)), (t1T, (t1X, t1Y, t1Y), (t1X, t1Z, t1Z))), (t1S, (t20, (t21, t22, t22), (t21, t23, t23)), (t20, (t24, t25, t25), (t24, t26, t26))))))) -> a ;;
+1 g_rec8 _:_ _forall_ [a b c d e f g h i j k l m n o p q r s t u v w x y z tq tr ts tt tu tv tw tx ty tz tA tB tC tD tE tF tG tH tI tJ tK tL tM tN tO tP tQ tR tS tT tU tV tW tX tY tZ t10 t11 t12 t13 t14 t15 t16 t17 t18 t19 t1a t1b t1c t1d t1e t1f t1g t1h t1i t1j t1k t1l t1m t1n t1o t1p t1q t1r t1s t1t t1u t1v t1w t1x t1y t1z t1A t1B t1C t1D t1E t1F t1G t1H t1I t1J t1K t1L t1M t1N t1O t1P t1Q t1R t1S t1T t1U t1V t1W t1X t1Y t1Z t20 t21 t22 t23 t24 t25 t26 t27 t28 t29 t2a t2b t2c t2d t2e t2f t2g t2h t2i t2j t2k t2l t2m t2n t2o t2p t2q t2r t2s t2t t2u t2v t2w t2x t2y t2z t2A t2B t2C t2D t2E t2F t2G t2H t2I t2J t2K t2L t2M t2N t2O t2P t2Q t2R t2S t2T t2U t2V t2W t2X t2Y t2Z t30 t31 t32 t33 t34 t35 t36 t37 t38 t39 t3a t3b t3c t3d t3e t3f t3g t3h t3i t3j t3k t3l t3m t3n t3o t3p t3q t3r t3s t3t t3u t3v t3w t3x t3y t3z t3A t3B t3C t3D t3E t3F t3G t3H t3I t3J t3K t3L t3M t3N t3O t3P t3Q t3R t3S t3T t3U t3V t3W t3X t3Y t3Z t40 t41 t42 t43 t44 t45 t46 t47 t48 t49 t4a t4b] => t4b -> b -> (t4b, t27, t26) -> (a, (t25, (c, (d, (e, (f, (g, (h, i, i), (h, j, j)), (g, (k, l, l), (k, m, m))), (f, (n, (o, p, p), (o, q, q)), (n, (r, s, s), (r, t, t)))), (e, (u, (v, (w, x, x), (w, y, y)), (v, (z, tq, tq), (z, tr, tr))), (u, (ts, (tt, tu, tu), (tt, tv, tv)), (ts, (tw, tx, tx), (tw, ty, ty))))), (d, (tz, (tA, (tB, (tC, tD, tD), (tC, tE, tE)), (tB, (tF, tG, tG), (tF, tH, tH))), (tA, (tI, (tJ, tK, tK), (tJ, tL, tL)), (tI, (tM, tN, tN), (tM, tO, tO)))), (tz, (tP, (tQ, (tR, tS, tS), (tR, tT, tT)), (tQ, (tU, tV, tV), (tU, tW, tW))), (tP, (tX, (tY, tZ, tZ), (tY, t10, t10)), (tX, (t11, t12, t12), (t11, t13, t13)))))), (c, (t14, (t15, (t16, (t17, (t18, t19, t19), (t18, t1a, t1a)), (t17, (t1b, t1c, t1c), (t1b, t1d, t1d))), (t16, (t1e, (t1f, t1g, t1g), (t1f, t1h, t1h)), (t1e, (t1i, t1j, t1j), (t1i, t1k, t1k)))), (t15, (t1l, (t1m, (t1n, t1o, t1o), (t1n, t1p, t1p)), (t1m, (t1q, t1r, t1r), (t1q, t1s, t1s))), (t1l, (t1t, (t1u, t1v, t1v), (t1u, t1w, t1w)), (t1t, (t1x, t1y, t1y), (t1x, t1z, t1z))))), (t14, (t1A, (t1B, (t1C, (t1D, t1E, t1E), (t1D, t1F, t1F)), (t1C, (t1G, t1H, t1H), (t1G, t1I, t1I))), (t1B, (t1J, (t1K, t1L, t1L), (t1K, t1M, t1M)), (t1J, (t1N, t1O, t1O), (t1N, t1P, t1P)))), (t1A, (t1Q, (t1R, (t1S, t1T, t1T), (t1S, t1U, t1U)), (t1R, (t1V, t1W, t1W), (t1V, t1X, t1X))), (t1Q, (t1Y, (t1Z, t20, t20), (t1Z, t21, t21)), (t1Y, (t22, t23, t23), (t22, t24, t24))))))), (t25, (t28, (t29, (t2a, (t2b, (t2c, (t2d, t2e, t2e), (t2d, t2f, t2f)), (t2c, (t2g, t2h, t2h), (t2g, t2i, t2i))), (t2b, (t2j, (t2k, t2l, t2l), (t2k, t2m, t2m)), (t2j, (t2n, t2o, t2o), (t2n, t2p, t2p)))), (t2a, (t2q, (t2r, (t2s, t2t, t2t), (t2s, t2u, t2u)), (t2r, (t2v, t2w, t2w), (t2v, t2x, t2x))), (t2q, (t2y, (t2z, t2A, t2A), (t2z, t2B, t2B)), (t2y, (t2C, t2D, t2D), (t2C, t2E, t2E))))), (t29, (t2F, (t2G, (t2H, (t2I, t2J, t2J), (t2I, t2K, t2K)), (t2H, (t2L, t2M, t2M), (t2L, t2N, t2N))), (t2G, (t2O, (t2P, t2Q, t2Q), (t2P, t2R, t2R)), (t2O, (t2S, t2T, t2T), (t2S, t2U, t2U)))), (t2F, (t2V, (t2W, (t2X, t2Y, t2Y), (t2X, t2Z, t2Z)), (t2W, (t30, t31, t31), (t30, t32, t32))), (t2V, (t33, (t34, t35, t35), (t34, t36, t36)), (t33, (t37, t38, t38), (t37, t39, t39)))))), (t28, (t3a, (t3b, (t3c, (t3d, (t3e, t3f, t3f), (t3e, t3g, t3g)), (t3d, (t3h, t3i, t3i), (t3h, t3j, t3j))), (t3c, (t3k, (t3l, t3m, t3m), (t3l, t3n, t3n)), (t3k, (t3o, t3p, t3p), (t3o, t3q, t3q)))), (t3b, (t3r, (t3s, (t3t, t3u, t3u), (t3t, t3v, t3v)), (t3s, (t3w, t3x, t3x), (t3w, t3y, t3y))), (t3r, (t3z, (t3A, t3B, t3B), (t3A, t3C, t3C)), (t3z, (t3D, t3E, t3E), (t3D, t3F, t3F))))), (t3a, (t3G, (t3H, (t3I, (t3J, t3K, t3K), (t3J, t3L, t3L)), (t3I, (t3M, t3N, t3N), (t3M, t3O, t3O))), (t3H, (t3P, (t3Q, t3R, t3R), (t3Q, t3S, t3S)), (t3P, (t3T, t3U, t3U), (t3T, t3V, t3V)))), (t3G, (t3W, (t3X, (t3Y, t3Z, t3Z), (t3Y, t40, t40)), (t3X, (t41, t42, t42), (t41, t43, t43))), (t3W, (t44, (t45, t46, t46), (t45, t47, t47)), (t44, (t48, t49, t49), (t48, t4a, t4a)))))))) -> a ;;
+1 head _:_ _forall_ [a] => [a] -> a ;;
+1 one _:_ _forall_ [a] => a ;;
+1 s_1_0 _:_ _forall_ [a] => a -> a ;;
+1 s_2_0 _:_ _forall_ [a b] => (a, b) -> a ;;
+1 s_2_1 _:_ _forall_ [a b] => (a, b) -> b ;;
+1 s_3_0 _:_ _forall_ [a b c] => (a, b, c) -> a ;;
+1 s_3_1 _:_ _forall_ [a b c] => (a, b, c) -> b ;;
+1 s_3_2 _:_ _forall_ [a b c] => (a, b, c) -> c ;;
diff --git a/ghc/tests/typecheck/should_compile/tc090.stderr b/ghc/tests/typecheck/should_compile/tc090.stderr
index 9df2599b3ee954b8b2288576b9076cd78253c8d2..ef3ef57fc8a51c1fce8afec872637b4415948591 100644
--- a/ghc/tests/typecheck/should_compile/tc090.stderr
+++ b/ghc/tests/typecheck/should_compile/tc090.stderr
@@ -1,12 +1,12 @@
ghc: module version changed to 1; reason: no old .hi file
_interface_ ShouldSucceed 1
_instance_modules_
-Addr ArrBase Foreign IO PrelBounded PrelNum
+IO PrelAddr PrelArr PrelBounded PrelCCall PrelForeign PrelNum
_usages_
PrelBase 1 :: $d12 1 $d13 1 $d26 1 $d28 1 $d39 1 $d41 1 $d6 1 $d7 1 $m/= 1 $m< 1 $m<= 1 $m> 1 $m>= 1 $mcompare 1 $mmax 1 $mmin 1 Eq 1 Ord 1 Ordering 1;
PrelNum 1 :: $d17 1 $d18 1;
_exports_
ShouldSucceed a b;
_declarations_
-1 a _:_ _forall_ [ta] {PrelBase.Ord ta} => ta ;;
-1 b _:_ _forall_ [ta] {PrelBase.Ord ta} => ta ;;
+1 a _:_ _forall_ [a] {PrelBase.Ord a} => a ;;
+1 b _:_ _forall_ [a] {PrelBase.Ord a} => a ;;
diff --git a/ghc/tests/typecheck/should_compile/tc091.stderr b/ghc/tests/typecheck/should_compile/tc091.stderr
index 02a66e50d843b1be9044f2aba31dfde79537a129..30a5d498e95a846b2ec4d9413b6c954fc59d4e2e 100644
--- a/ghc/tests/typecheck/should_compile/tc091.stderr
+++ b/ghc/tests/typecheck/should_compile/tc091.stderr
@@ -1,7 +1,7 @@
ghc: module version changed to 1; reason: no old .hi file
_interface_ ShouldSucceed 1
_instance_modules_
-Addr ArrBase Foreign IO PrelBounded PrelNum
+IO PrelAddr PrelArr PrelBounded PrelCCall PrelForeign PrelNum
_usages_
PrelBase 1 :: $d1 1 $d10 1 $d11 1 $d12 1 $d13 1 $d15 1 $d2 1 $d20 1 $d21 1 $d24 1 $d25 1 $d26 1 $d27 1 $d28 1 $d29 1 $d3 1 $d30 1 $d31 1 $d33 1 $d34 1 $d36 1 $d37 1 $d38 1 $d39 1 $d4 1 $d40 1 $d41 1 $d42 1 $d43 1 $d5 1 $d6 1 $d7 1 $d8 1 $d9 1 $m- 1 $m/= 1 $m< 1 $m<= 1 $m> 1 $m>= 1 $mcompare 1 $menumFromThenTo 1 $menumFromTo 1 $mfromInt 1 $mmax 1 $mmin 1 $mshowList 1 Enum 1 Eq 1 Eval 1 Num 1 Ord 1 Ordering 1 Show 1 String 1;
PrelList 1 :: length 1;
@@ -10,6 +10,6 @@ PrelTup 1 :: $d13 1 $d4 1 $d49 1 $d9 1;
_exports_
ShouldSucceed init_last merge sort;
_declarations_
-1 init_last _:_ _forall_ [ta] => [ta] -> PrelBase.Int -> ([ta], [ta]) ;;
-1 merge _:_ _forall_ [ta] {PrelBase.Ord ta} => [ta] -> [ta] -> [ta] ;;
-1 sort _:_ _forall_ [ta] {PrelBase.Ord ta} => [ta] -> [ta] ;;
+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
index 99f65c73a6a9e7149e899bf63e82057769933d41..141189d498399eed50414f77c6cec94943639fac 100644
--- a/ghc/tests/typecheck/should_compile/tc092.stderr
+++ b/ghc/tests/typecheck/should_compile/tc092.stderr
@@ -1,17 +1,18 @@
ghc: module version changed to 1; reason: no old .hi file
_interface_ ShouldSucceed 1
_instance_modules_
-Addr ArrBase Foreign IO PrelBounded PrelNum
+IO PrelAddr PrelArr PrelBounded PrelCCall PrelForeign PrelNum
_usages_
PrelBase 1 :: $d12 1 $d13 1 $d2 1 $d20 1 $d21 1 $d26 1 $d28 1 $d29 1 $d31 1 $d33 1 $d36 1 $d37 1 $d38 1 $d39 1 $d41 1 $d6 1 $d7 1 $m/= 1 $m< 1 $m<= 1 $m> 1 $m>= 1 $mcompare 1 $mmax 1 $mmin 1 Eq 1 Eval 1 Ord 1 Ordering 1;
PrelNum 1 :: $d17 1 $d18 1;
_exports_
ShouldSucceed e0 e1 e2 q Empty(Empty);
_instances_
-instance _forall_ [q :: (* -> *)] => {PrelBase.Eval (Empty q)} = $d1;
+instance _forall_ [a :: (* -> *)] => {PrelBase.Eval (Empty a)} = $d1;
_declarations_
-1 $d1 _:_ _forall_ [q :: (* -> *)] => {PrelBase.Eval (Empty q)} ;;
+1 $d1 _:_ _forall_ [a :: (* -> *)] => {PrelBase.Eval (Empty a)} ;;
+1 data Empty q :: (* -> *) = Empty (_forall_ [a] {PrelBase.Ord a} => q a) ;
1 e0 _:_ Empty PrelBase.[] ;;
1 e1 _:_ Empty PrelBase.[] ;;
1 e2 _:_ Empty PrelBase.[] ;;
-1 q _:_ _forall_ [ta] {PrelBase.Ord ta} => [ta] ;;
+1 q _:_ _forall_ [a] {PrelBase.Ord a} => [a] ;;
diff --git a/ghc/tests/typecheck/should_compile/tc093.stderr b/ghc/tests/typecheck/should_compile/tc093.stderr
index f9652e791a214152f494cbad02705038cca51fd1..c420b1e65794b1babf1fa032813b1f5b3a011479 100644
--- a/ghc/tests/typecheck/should_compile/tc093.stderr
+++ b/ghc/tests/typecheck/should_compile/tc093.stderr
@@ -1,7 +1,7 @@
ghc: module version changed to 1; reason: no old .hi file
_interface_ ShouldSucceed 1
_instance_modules_
-Addr ArrBase Foreign IO PrelBounded PrelNum
+IO PrelAddr PrelArr PrelBounded PrelCCall PrelForeign PrelNum
_usages_
PrelBase 1 :: $d1 1 $d10 1 $d12 1 $d13 1 $d15 1 $d18 1 $d2 1 $d20 1 $d21 1 $d26 1 $d27 1 $d28 1 $d29 1 $d3 1 $d30 1 $d31 1 $d33 1 $d34 1 $d36 1 $d37 1 $d38 1 $d39 1 $d4 1 $d40 1 $d41 1 $d42 1 $d43 1 $d6 1 $d7 1 $d8 1 $m- 1 $m/= 1 $m< 1 $m<= 1 $m> 1 $m>= 1 $m>> 1 $mcompare 1 $mfromInt 1 $mmax 1 $mmin 1 $mshowList 1 && 1 . 1 not 1 showList__ 1 showParen 1 showSpace 1 showString 1 Eq 1 Eval 1 Monad 1 Num 1 Ord 1 Ordering 1 Show 1 ShowS 1 String 1;
PrelNum 1 :: $d10 1 $d16 1 $d17 1 $d18 1 $d29 1 $d33 1 $d34 1 $d35 1;
@@ -9,21 +9,21 @@ PrelTup 1 :: $d13 1 $d4 1 $d49 1 $d9 1;
_exports_
ShouldSucceed bindState foo unState unitState St State(State) TS(TS vs);
_instances_
-instance _forall_ [c] {PrelBase.Eq c} => {PrelBase.Monad (State c)} = $d1;
+instance _forall_ [a] {PrelBase.Eq a} => {PrelBase.Monad (State a)} = $d1;
instance {PrelBase.Eq TS} = $d2;
instance {PrelBase.Eval TS} = $d3;
-instance _forall_ [c a] => {PrelBase.Eval (State c a)} = $d4;
+instance _forall_ [a b] => {PrelBase.Eval (State a b)} = $d4;
instance {PrelBase.Show TS} = $d5;
_declarations_
-1 $d1 _:_ _forall_ [c] {PrelBase.Eq c} => {PrelBase.Monad (State c)} ;;
+1 $d1 _:_ _forall_ [a] {PrelBase.Eq a} => {PrelBase.Monad (State a)} ;;
1 $d2 _:_ {PrelBase.Eq TS} ;;
1 $d3 _:_ {PrelBase.Eval TS} ;;
-1 $d4 _:_ _forall_ [c a] => {PrelBase.Eval (State c a)} ;;
+1 $d4 _:_ _forall_ [a b] => {PrelBase.Eval (State a b)} ;;
1 $d5 _:_ {PrelBase.Show TS} ;;
-1 type St = State TS ;
+1 bindState _:_ _forall_ [a b c] => State a b -> (b -> State a c) -> State a c ;;
1 data State c a = State (c -> (a, c)) ;
1 data TS = TS {vs :: PrelBase.Int} ;
-1 bindState _:_ _forall_ [ta tb tc] => State tb ta -> (ta -> State tb tc) -> State tb tc ;;
1 foo _:_ PrelBase.Int -> State TS PrelBase.Int ;;
-1 unState _:_ _forall_ [ta tb] => State tb ta -> tb -> (ta, tb) ;;
-1 unitState _:_ _forall_ [ta tb] => tb -> State ta tb ;;
+1 type St = State TS ;
+1 unState _:_ _forall_ [a b] => State a b -> a -> (b, a) ;;
+1 unitState _:_ _forall_ [a b] => a -> State b a ;;
diff --git a/ghc/tests/typecheck/should_compile/tc094.stderr b/ghc/tests/typecheck/should_compile/tc094.stderr
new file mode 100644
index 0000000000000000000000000000000000000000..551ccb49bfd082f2f3f640564ee4df28f72112d5
--- /dev/null
+++ b/ghc/tests/typecheck/should_compile/tc094.stderr
@@ -0,0 +1,12 @@
+ghc: module version changed to 1; reason: no old .hi file
+_interface_ ShouldSucceed 1
+_instance_modules_
+IO PrelAddr PrelArr PrelBounded PrelCCall PrelForeign PrelNum
+_usages_
+PrelBase 1 :: $d1 1 $d10 1 $d11 1 $d12 1 $d13 1 $d15 1 $d2 1 $d20 1 $d21 1 $d24 1 $d25 1 $d26 1 $d27 1 $d28 1 $d29 1 $d3 1 $d30 1 $d31 1 $d33 1 $d34 1 $d36 1 $d37 1 $d38 1 $d39 1 $d4 1 $d40 1 $d41 1 $d42 1 $d43 1 $d5 1 $d6 1 $d7 1 $d8 1 $d9 1 $m- 1 $m/= 1 $m< 1 $m<= 1 $m> 1 $m>= 1 $mcompare 1 $menumFromThenTo 1 $menumFromTo 1 $mfromInt 1 $mmax 1 $mmin 1 $mshowList 1 Enum 1 Eq 1 Eval 1 Num 1 Ord 1 Ordering 1 Show 1 String 1;
+PrelNum 1 :: $d1 1 $d10 1 $d12 1 $d14 1 $d15 1 $d16 1 $d17 1 $d18 1 $d2 1 $d29 1 $d3 1 $d30 1 $d31 1 $d32 1 $d33 1 $d34 1 $d35 1 $d36 1 $d37 1 $d38 1 $d39 1 $d4 1 $d5 1 $d6 1 $d7 1 $d8 1 $mceiling 1 $mdiv 1 $mdivMod 1 $mfloor 1 $mmod 1 $mquot 1 $mrecip 1 $mrem 1 $mround 1 $mtruncate 1 Fractional 1 Integral 1 Ratio 1 Rational 1 Real 1 RealFrac 1;
+PrelTup 1 :: $d13 1 $d4 1 $d49 1 $d9 1;
+_exports_
+ShouldSucceed foo;
+_declarations_
+1 foo _:_ _forall_ [a] => a -> (PrelBase.Int, PrelBase.Int) ;;
diff --git a/ghc/tests/typecheck/should_fail/Digraph.stderr b/ghc/tests/typecheck/should_fail/Digraph.stderr
index 07699c348297ee90f8ac2bae17583f62f3c01a49..7883f862605e7790b640c556d8e65994fad84577 100644
--- a/ghc/tests/typecheck/should_fail/Digraph.stderr
+++ b/ghc/tests/typecheck/should_fail/Digraph.stderr
@@ -1,28 +1,30 @@
-Digraph.hs:19: A type signature is more polymorphic than the inferred type
- Can't for-all the type variable(s) `taY7'
- in the inferred type `[Edge taY7]'
- When checking signature for `reversed_edges'
- In an equation for function `stronglyConnComp':
- `stronglyConnComp es vs
- = snd (span_tree (new_range reversed_edges)
- ([], ([]))
- (snd (dfs (new_range es) ([], ([])) vs)))
- where
- span_tree r (vs, ns) [] = (vs, (ns))
- span_tree r (vs, ns) (x : xs)
- | x elem vs = span_tree r (vs, (ns)) xs
- | otherwise = span_tree r (vs', ((x : ns') : ns)) xs
- where
- (vs', ns') = dfs r (x : vs, ([])) (r x)
- new_range [] w = []
- new_range ((x, y) : xys) w
- = if x == w then
- (y : (new_range xys w))
- else
- (new_range xys w)
- swap (x, y) = (y, (x))
- reversed_edges :: _forall_ [v] (Eq v) => [Edge v]
- reversed_edges = map swap es'
+Digraph.hs:19:
+ A type signature is more polymorphic than the inferred type
+ Can't for-all the type variable(s) `v'
+ in the type `[Edge v]'
+ When checking the type signature for `reversed_edges'
+ In an equation for function `stronglyConnComp':
+ stronglyConnComp es vs
+ = snd (span_tree (new_range reversed_edges)
+ ([], ([]))
+ (snd (dfs (... ...) (..., ...) vs)))
+ where
+ span_tree r (vs, ns) [] = (vs, (ns))
+ span_tree r (vs, ns) (x : xs)
+ | x elem vs = span_tree r (vs, (ns)) xs
+ | otherwise = span_tree r (vs', ((x : ns') : ns)) xs
+ where
+ (vs', ns') = dfs r (x : vs, ([])) (r x)
+ new_range [] w = []
+ new_range ((x, y) : xys) w
+ = if x == w then
+ (y : (new_range xys w))
+ else
+ (new_range xys w)
+ swap (x, y) = (y, (x))
+ reversed_edges :: _forall_ [v] (PrelBase.Eq v) => [Edge v]
+ reversed_edges = map swap es
+
Compilation had errors
diff --git a/ghc/tests/typecheck/should_fail/Makefile b/ghc/tests/typecheck/should_fail/Makefile
index 5e1414de0e3f034adfb3858e9344b54eb86c8fb6..b169c84b605ff717e8e622f8b8356af151080626 100644
--- a/ghc/tests/typecheck/should_fail/Makefile
+++ b/ghc/tests/typecheck/should_fail/Makefile
@@ -2,7 +2,7 @@ TOP = ../..
include $(TOP)/mk/boilerplate.mk
include $(TOP)/mk/should_fail.mk
-HC_OPTS += -noC -ddump-tc
+HC_OPTS += -noC
tcfail045_HC_OPTS = -fglasgow-exts
tcfail068_HC_OPTS = -fglasgow-exts
diff --git a/ghc/tests/typecheck/should_fail/tcfail001.stderr b/ghc/tests/typecheck/should_fail/tcfail001.stderr
index 0eae5f487e938f2bd4056b3718ad9fdf5eab6052..8ad92992980e697725ea5f290a08876e497bdbd9 100644
--- a/ghc/tests/typecheck/should_fail/tcfail001.stderr
+++ b/ghc/tests/typecheck/should_fail/tcfail001.stderr
@@ -1,10 +1,14 @@
-tcfail001.hs:9:warning:
- Duplicated class assertion `A a' in context: `(A a, A a)'
+tcfail001.hs:9: Warning:
+ Duplicated class assertion `A a' in the context: (A a, A a)
+
-tcfail001.hs:9: Couldn't match the type `-> oalM' against `[]'
- Expected: `oalM -> oalN'
- Inferred: `[talK]'
- In an equation for function `op': `op [] = []'
+tcfail001.hs:9:
+ Couldn't match the type `an0 -> an1' against `[a]'
+ Expected: an0 -> an1
+ Inferred: [a]
+ In an equation for function `op': op [] = []
+ In the definition for method `op'
+
Compilation had errors
diff --git a/ghc/tests/typecheck/should_fail/tcfail002.stderr b/ghc/tests/typecheck/should_fail/tcfail002.stderr
index 5b5bc931f7608f937754be9cf08d80b121b1236b..181c448d9befdf87b13f2a08c51ec9d4e723a95e 100644
--- a/ghc/tests/typecheck/should_fail/tcfail002.stderr
+++ b/ghc/tests/typecheck/should_fail/tcfail002.stderr
@@ -1,8 +1,9 @@
-tcfail002.hs:4: Cannot construct the infinite type (occur check)
- `talq' = `[talq]'
- Expected: `[talq]'
- Inferred: `talq'
- In an equation for function `c': `c z = z'
+tcfail002.hs:4:
+ Occurs check: cannot construct the infinite type: amA = [amA]
+ Expected: [amA]
+ Inferred: amA
+ In an equation for function `c': c z = z
+
Compilation had errors
diff --git a/ghc/tests/typecheck/should_fail/tcfail003.stderr b/ghc/tests/typecheck/should_fail/tcfail003.stderr
index 370ea4831f19fa52c6fd7cd93714fe2409dc0e92..17b6d5c814080065e1b20ca40aa2ab4a1420f206 100644
--- a/ghc/tests/typecheck/should_fail/tcfail003.stderr
+++ b/ghc/tests/typecheck/should_fail/tcfail003.stderr
@@ -1,5 +1,7 @@
-tcfail003.hs:3: No instance for: `Num Char'
- arising from the literal 1 at tcfail003.hs:3
+tcfail003.hs:3:
+ No instance for: `Num Char'
+ arising from the literal `1', at tcfail003.hs:3
+
Compilation had errors
diff --git a/ghc/tests/typecheck/should_fail/tcfail004.stderr b/ghc/tests/typecheck/should_fail/tcfail004.stderr
index c292567261330f96420295deddd5572233bf0f76..06b0465a25cf026d0264b4f504beeb85d7ef7ed2 100644
--- a/ghc/tests/typecheck/should_fail/tcfail004.stderr
+++ b/ghc/tests/typecheck/should_fail/tcfail004.stderr
@@ -1,7 +1,9 @@
-tcfail004.hs:3: Couldn't match the type `(,,) taUg' against `(,)'
- Expected: `(taUg, taUi, taUk)'
- Inferred: `(taUa, taUd)'
- In a pattern binding: `(f, g) = (1, 2, 3)'
+tcfail004.hs:3:
+ Couldn't match the type `(aWn, aWp, aWr)' against `(aWi, aWl)'
+ Expected: (aWn, aWp, aWr)
+ Inferred: (aWh, aWk)
+ In a pattern binding: (f, g) = (1, 2, 3)
+
Compilation had errors
diff --git a/ghc/tests/typecheck/should_fail/tcfail005.stderr b/ghc/tests/typecheck/should_fail/tcfail005.stderr
index 0e9eddda790cf5876be4dff25486f0a36047c7e4..831d452b0b0c1d6032063e55246765ecb8a945ba 100644
--- a/ghc/tests/typecheck/should_fail/tcfail005.stderr
+++ b/ghc/tests/typecheck/should_fail/tcfail005.stderr
@@ -1,7 +1,9 @@
-tcfail005.hs:3: Couldn't match the type `(,) taTu' against `[]'
- Expected: `(taTu, taTw)'
- Inferred: `[taTq]'
- In a pattern binding: `(h : i) = (1, ('a'))'
+tcfail005.hs:3:
+ Couldn't match the type `(aVB, aVD)' against `[aVx]'
+ Expected: (aVB, aVD)
+ Inferred: [aVx]
+ In a pattern binding: (h : i) = (1, ('a'))
+
Compilation had errors
diff --git a/ghc/tests/typecheck/should_fail/tcfail006.stderr b/ghc/tests/typecheck/should_fail/tcfail006.stderr
index 840b2dc7166a6901c9ad4bfd3c07c0dba2986074..ec2273ab5fd56e1b93118ac18a68473bd3b400e4 100644
--- a/ghc/tests/typecheck/should_fail/tcfail006.stderr
+++ b/ghc/tests/typecheck/should_fail/tcfail006.stderr
@@ -1,5 +1,7 @@
-tcfail006.hs:4: No instance for: `Num Bool'
- arising from the literal 1 at tcfail006.hs:4
+tcfail006.hs:4:
+ No instance for: `Num Bool'
+ arising from the literal `1', at tcfail006.hs:4
+
Compilation had errors
diff --git a/ghc/tests/typecheck/should_fail/tcfail007.stderr b/ghc/tests/typecheck/should_fail/tcfail007.stderr
index 094e0523a623d0e7d6c59d8cef9359bf84e9859c..640da9b9960ea1e042d34d043413623e88d44cd3 100644
--- a/ghc/tests/typecheck/should_fail/tcfail007.stderr
+++ b/ghc/tests/typecheck/should_fail/tcfail007.stderr
@@ -1,5 +1,7 @@
-tcfail007.hs:4: No instance for: `Num Bool'
- arising from use of `+' at tcfail007.hs:4
+tcfail007.hs:4:
+ No instance for: `Num Bool'
+ arising from the literal `1', at tcfail007.hs:4
+
Compilation had errors
diff --git a/ghc/tests/typecheck/should_fail/tcfail008.stderr b/ghc/tests/typecheck/should_fail/tcfail008.stderr
index 311eed1bc549b13a52771a926725459289da948f..7fa75fc1cf9504e7211ff84682cb450ea51efc89 100644
--- a/ghc/tests/typecheck/should_fail/tcfail008.stderr
+++ b/ghc/tests/typecheck/should_fail/tcfail008.stderr
@@ -1,11 +1,11 @@
-tcfail008.hs:3: No instance for: `Num [taDV]'
- arising from the literal 2 at tcfail008.hs:3
+tcfail008.hs:3:
+ Cannot resolve the ambiguous context (Num [aG1])
+ `Num [aG1]' arising from the literal `2', at tcfail008.hs:3
-tcfail008.hs:3: No instance for: `Num [taDV]'
- arising from the literal 2 at tcfail008.hs:3
-
-tcfail008.hs:3: No instance for: `Num [Int]'
- arising from the literal 2 at tcfail008.hs:3
+tcfail008.hs:3:
+ Cannot resolve the ambiguous context (Num aG1)
+ `Num aG1' arising from the literal `1', at tcfail008.hs:3
+
Compilation had errors
diff --git a/ghc/tests/typecheck/should_fail/tcfail009.stderr b/ghc/tests/typecheck/should_fail/tcfail009.stderr
index 3214d09c7162247c2c2e71b403992c267b0ad3e9..e24b0f7fb0977eb4418307ec0ae3fde939e81fc3 100644
--- a/ghc/tests/typecheck/should_fail/tcfail009.stderr
+++ b/ghc/tests/typecheck/should_fail/tcfail009.stderr
@@ -1,7 +1,9 @@
-tcfail009.hs:3: Couldn't match the type `Int' against `Integer'
- Expected: `Integer'
- Inferred: `Int'
- In an expression with a type signature: `2 :: Integer'
+tcfail009.hs:3:
+ Couldn't match the type `Int' against `Integer'
+ Expected: Integer
+ Inferred: Int
+ In an expression with a type signature: 2 :: Integer
+
Compilation had errors
diff --git a/ghc/tests/typecheck/should_fail/tcfail010.stderr b/ghc/tests/typecheck/should_fail/tcfail010.stderr
index f12dfd6936309240b3da0f7e87431d28f9d6775e..38fecefe1afd08b702525d47d86dff439ba8f899 100644
--- a/ghc/tests/typecheck/should_fail/tcfail010.stderr
+++ b/ghc/tests/typecheck/should_fail/tcfail010.stderr
@@ -1,8 +1,7 @@
-tcfail010.hs:3: No instance for: `Num [taE4]'
- arising from use of `+' at tcfail010.hs:3
-
-tcfail010.hs:3: No instance for: `Num [taE4]'
- arising from use of `+' at tcfail010.hs:3
+tcfail010.hs:3:
+ Cannot resolve the ambiguous context (Num [aGb])
+ `Num [aGb]' arising from the literal `2', at tcfail010.hs:3
+
Compilation had errors
diff --git a/ghc/tests/typecheck/should_fail/tcfail011.stderr b/ghc/tests/typecheck/should_fail/tcfail011.stderr
index 56d927fe15dcc4143a7b6688c7babda389bb952d..636731270fb086072f8e804832a464a6084f92e9 100644
--- a/ghc/tests/typecheck/should_fail/tcfail011.stderr
+++ b/ghc/tests/typecheck/should_fail/tcfail011.stderr
@@ -1,4 +1,5 @@
tcfail011.hs:3: Value not in scope: `y'
+
Compilation had errors
diff --git a/ghc/tests/typecheck/should_fail/tcfail012.stderr b/ghc/tests/typecheck/should_fail/tcfail012.stderr
index 5657049ec4e5ea811d208d3eb3a10ad3cb8b15a7..d9fd060bef66c0be1712e74f8829283983f11438 100644
--- a/ghc/tests/typecheck/should_fail/tcfail012.stderr
+++ b/ghc/tests/typecheck/should_fail/tcfail012.stderr
@@ -1,7 +1,9 @@
-tcfail012.hs:3: Couldn't match the type `[tala]' against `Bool'
- Expected: `[tala]'
- Inferred: `Bool'
- In a pattern binding: `True = []'
+tcfail012.hs:3:
+ Couldn't match the type `[amk]' against `Bool'
+ Expected: [amk]
+ Inferred: Bool
+ In a pattern binding: True = []
+
Compilation had errors
diff --git a/ghc/tests/typecheck/should_fail/tcfail013.stderr b/ghc/tests/typecheck/should_fail/tcfail013.stderr
index 5d8bde375a1b6218211ebaaeb48564eab85d5d12..5491de93c56035bcb7a936bf4b504a343883b221 100644
--- a/ghc/tests/typecheck/should_fail/tcfail013.stderr
+++ b/ghc/tests/typecheck/should_fail/tcfail013.stderr
@@ -1,7 +1,9 @@
-tcfail013.hs:4: Couldn't match the type `[taE1]' against `Bool'
- Expected: `Bool'
- Inferred: `[taE1]'
- In an equation for function `f': `f True = 2'
+tcfail013.hs:4:
+ Couldn't match the type `[aG8]' against `Bool'
+ Expected: Bool
+ Inferred: [aG8]
+ In an equation for function `f': f True = 2
+
Compilation had errors
diff --git a/ghc/tests/typecheck/should_fail/tcfail014.stderr b/ghc/tests/typecheck/should_fail/tcfail014.stderr
index 4b5304adca51da5528a37b8ef74a625bd37b8ed3..7094789a319f1d8fc897c4eb6bf3b80a4d3c0967 100644
--- a/ghc/tests/typecheck/should_fail/tcfail014.stderr
+++ b/ghc/tests/typecheck/should_fail/tcfail014.stderr
@@ -1,17 +1,10 @@
-tcfail014.hs:5: Cannot construct the infinite type (occur check)
- `oaEt' = `oaEt -> oaEv'
- Expected: `oaEt -> oaEv'
- Inferred: `oaEt'
- In the first argument of `z', namely `z'
- In an equation for function `h': `h z = z z'
- In an equation for function `g':
- `g y
- = h + 2
- where
- h z = z z'
-
-tcfail014.hs:5: No instance for: `Num (taEP -> taER)'
- arising from use of `+' at tcfail014.hs:5
+tcfail014.hs:5:
+ Occurs check: cannot construct the infinite type: aGA = aGA -> aGC
+ Expected: aGA -> aGC
+ Inferred: aGA
+ In the first argument of `z', namely `z'
+ In an equation for function `h': h z = z z
+
Compilation had errors
diff --git a/ghc/tests/typecheck/should_fail/tcfail015.stderr b/ghc/tests/typecheck/should_fail/tcfail015.stderr
index 74f130dd7d3d0b5d0c2e227deb22ad1d47d15f97..8f5d3df19f50b9b1e5a9cce5c47d7e1ed925e1c3 100644
--- a/ghc/tests/typecheck/should_fail/tcfail015.stderr
+++ b/ghc/tests/typecheck/should_fail/tcfail015.stderr
@@ -1,5 +1,7 @@
-tcfail015.hs:7: No instance for: `Num Bool'
- arising from the literal 2 at tcfail015.hs:7
+tcfail015.hs:7:
+ No instance for: `Num Bool'
+ arising from the literal `2', at tcfail015.hs:7
+
Compilation had errors
diff --git a/ghc/tests/typecheck/should_fail/tcfail016.stderr b/ghc/tests/typecheck/should_fail/tcfail016.stderr
index f5eb71330ecfceb65ff91c5a0e4818b59939745d..8ea41105d2522a43ec67816c97c9672d9f35dacc 100644
--- a/ghc/tests/typecheck/should_fail/tcfail016.stderr
+++ b/ghc/tests/typecheck/should_fail/tcfail016.stderr
@@ -1,9 +1,10 @@
-tcfail016.hs:9: Couldn't match the type `Expr' against `(,) taTH'
- Expected: `AnnExpr taTH'
- Inferred: `Expr taTH'
- In the first argument of `g', namely `e1'
- In the first argument of `++', namely `(g e1)'
- In an equation for function `g': `g (App e1 e2) = (g e1) ++ (g e2)'
+tcfail016.hs:9:
+ Couldn't match the type `Expr aVI' against `AnnExpr aVO'
+ Expected: AnnExpr aVO
+ Inferred: Expr aVO
+ In the first argument of `g', namely `e1'
+ In the first argument of `++', namely `(g e1)'
+
Compilation had errors
diff --git a/ghc/tests/typecheck/should_fail/tcfail017.stderr b/ghc/tests/typecheck/should_fail/tcfail017.stderr
index 02b6adbdfe58f5bc53016e3822e0d95c977287af..652c3c57d603c1c4768a7cb25f10a6602560fedc 100644
--- a/ghc/tests/typecheck/should_fail/tcfail017.stderr
+++ b/ghc/tests/typecheck/should_fail/tcfail017.stderr
@@ -1,6 +1,9 @@
-tcfail017.hs:11: No instance for: `C [talQ]'
- arising from an instance declaration at tcfail017.hs:11
- When checking superclass constraints of an instance declaration
+tcfail017.hs:11:
+ No instance for: `C [a]'
+ arising from an instance declaration, at tcfail017.hs:11
+ Available context: (C [a])
+ From the superclasses of the instance declaration
+
Compilation had errors
diff --git a/ghc/tests/typecheck/should_fail/tcfail018.stderr b/ghc/tests/typecheck/should_fail/tcfail018.stderr
index 37eab56fcbd5b9b66f8d61d035009854565d4752..c75b47f9d9e7917ef7285df689dec0afefc017dd 100644
--- a/ghc/tests/typecheck/should_fail/tcfail018.stderr
+++ b/ghc/tests/typecheck/should_fail/tcfail018.stderr
@@ -1,8 +1,7 @@
-tcfail018.hs:5: No instance for: `Num [taDX]'
- arising from the literal 1 at tcfail018.hs:5
-
-tcfail018.hs:5: No instance for: `Num [taDX]'
- arising from the literal 1 at tcfail018.hs:5
+tcfail018.hs:5:
+ Cannot resolve the ambiguous context (Num [aG4])
+ `Num [aG4]' arising from the literal `1', at tcfail018.hs:5
+
Compilation had errors
diff --git a/ghc/tests/typecheck/should_fail/tcfail019.stderr b/ghc/tests/typecheck/should_fail/tcfail019.stderr
index 181afc8440e72f2027f196c551c7cf6fa3ccd753..6657a8d96172755063b759fef1f15f87e41a7dd2 100644
--- a/ghc/tests/typecheck/should_fail/tcfail019.stderr
+++ b/ghc/tests/typecheck/should_fail/tcfail019.stderr
@@ -1,18 +1,15 @@
-tcfail019.hs:19: No instance for: `B [tamn]'
- arising from an instance declaration at tcfail019.hs:19
- When checking methods of an instance declaration
-
-tcfail019.hs:19: No instance for: `C [tamn]'
- arising from an instance declaration at tcfail019.hs:19
- When checking methods of an instance declaration
-
-tcfail019.hs:19: No instance for: `B [tamn]'
- arising from an instance declaration at tcfail019.hs:19
- When checking superclass constraints of an instance declaration
-
-tcfail019.hs:19: No instance for: `C [tamn]'
- arising from an instance declaration at tcfail019.hs:19
- When checking superclass constraints of an instance declaration
+tcfail019.hs:19:
+ No instance for: `B [a]'
+ arising from an instance declaration, at tcfail019.hs:19
+ Available context: (B [a], C [a])
+ From the superclasses of the instance declaration
+
+tcfail019.hs:19:
+ No instance for: `C [a]'
+ arising from an instance declaration, at tcfail019.hs:19
+ Available context: (B [a], C [a])
+ From the superclasses of the instance declaration
+
Compilation had errors
diff --git a/ghc/tests/typecheck/should_fail/tcfail020.stderr b/ghc/tests/typecheck/should_fail/tcfail020.stderr
index 0932038095d78c0d1141b33660fb7715c065c55a..77f8d3f9e7d1bbb465563a0c4914c0fa73143486 100644
--- a/ghc/tests/typecheck/should_fail/tcfail020.stderr
+++ b/ghc/tests/typecheck/should_fail/tcfail020.stderr
@@ -1,6 +1,9 @@
-tcfail020.hs:11: No instance for: `A [taDM]'
- arising from an instance declaration at tcfail020.hs:11
- When checking superclass constraints of an instance declaration
+tcfail020.hs:11:
+ No instance for: `A [a]'
+ arising from an instance declaration, at tcfail020.hs:11
+ Available context: (A [a])
+ From the superclasses of the instance declaration
+
Compilation had errors
diff --git a/ghc/tests/typecheck/should_fail/tcfail021.stderr b/ghc/tests/typecheck/should_fail/tcfail021.stderr
index 85e52d36e52e659ad725cdb4ac36ca84a789d534..31120b0494f4e6de354ae57731a86b539dd2fffd 100644
--- a/ghc/tests/typecheck/should_fail/tcfail021.stderr
+++ b/ghc/tests/typecheck/should_fail/tcfail021.stderr
@@ -1,6 +1,7 @@
tcfail021.hs:8:
Can't handle multiple methods defined by one pattern binding
- `(==, /=) = (\ x -> \ y -> True, (\ x -> \ y -> False))'
+ (==, /=) = (\ x -> \ y -> True, (\ x -> \ y -> False))
+
Compilation had errors
diff --git a/ghc/tests/typecheck/should_fail/tcfail023.stderr b/ghc/tests/typecheck/should_fail/tcfail023.stderr
index 4520320ddbbf2f20156468f115f65995e8bb0d3a..0cfc6581fddce0f9aaa0c238f41ee6efd8c97ddd 100644
--- a/ghc/tests/typecheck/should_fail/tcfail023.stderr
+++ b/ghc/tests/typecheck/should_fail/tcfail023.stderr
@@ -1,21 +1,21 @@
-tcfail023.hs:1: Duplicate or overlapping instance declarations
- for `A B' at tcfail023.hs:11 and tcfail023.hs:14
+tcfail023.hs:1:
+ Duplicate or overlapping instance declarations
+ for `A B' at tcfail023.hs:14 and tcfail023.hs:11
-tcfail023.hs:1: Duplicate or overlapping instance declarations
- for `A B' at tcfail023.hs:11 and tcfail023.hs:14
+tcfail023.hs:14:
+ Couldn't match the type `Bool' against `B'
+ Expected: Bool
+ Inferred: B
+ In an equation for function `op': op C = True
+ In the definition for method `op'
-tcfail023.hs:1: Duplicate or overlapping instance declarations
- for `A B' at tcfail023.hs:11 and tcfail023.hs:14
-
-tcfail023.hs:14: Couldn't match the type `Bool' against `B'
- Expected: `Bool'
- Inferred: `B'
- In an equation for function `op': `op C = True'
-
-tcfail023.hs:11: Couldn't match the type `Bool' against `B'
- Expected: `Bool'
- Inferred: `B'
- In an equation for function `op': `op C = True'
+tcfail023.hs:11:
+ Couldn't match the type `Bool' against `B'
+ Expected: Bool
+ Inferred: B
+ In an equation for function `op': op C = True
+ In the definition for method `op'
+
Compilation had errors
diff --git a/ghc/tests/typecheck/should_fail/tcfail027.stderr b/ghc/tests/typecheck/should_fail/tcfail027.stderr
index a6f1b97d282b9cf1ddc9cb587babf7a090e3bbe9..c06f988ccd4504376446f97dbaaed45972232c9d 100644
--- a/ghc/tests/typecheck/should_fail/tcfail027.stderr
+++ b/ghc/tests/typecheck/should_fail/tcfail027.stderr
@@ -1,6 +1,8 @@
-tcfail027.hs:3: Cycle in class declarations ...
- `A' tcfail027.hs:4
- `B' tcfail027.hs:7
+tcfail027.hs:3:
+ Cycle in class declarations:
+ `A' at tcfail027.hs:4
+ `B' at tcfail027.hs:7
+
Compilation had errors
diff --git a/ghc/tests/typecheck/should_fail/tcfail028.stderr b/ghc/tests/typecheck/should_fail/tcfail028.stderr
index 0f9d475464ec68f0f825c7274b377fa14728fcc0..8bded94df3c51f1c6ad4e4b2a0958f1659a7c136 100644
--- a/ghc/tests/typecheck/should_fail/tcfail028.stderr
+++ b/ghc/tests/typecheck/should_fail/tcfail028.stderr
@@ -1,6 +1,10 @@
-tcfail028.hs:4: Couldn't match the kind `ka2649 -> *' against `*'
- When unifying two kinds `ka2649 -> *' and `*'
- In the data declaration for `A'
+tcfail028.hs:4:
+ Couldn't match the kind ** against kaIT -> *
+ Expected: **
+ Found: kaIT -> *
+ In the type `A a'
+ In the data declaration for `A'
+
Compilation had errors
diff --git a/ghc/tests/typecheck/should_fail/tcfail029.stderr b/ghc/tests/typecheck/should_fail/tcfail029.stderr
index 211b411f3c6faaed7e207abf5134b5eed4d23b6d..e7e685825f545cbf06d03d89694c4bbe582e459e 100644
--- a/ghc/tests/typecheck/should_fail/tcfail029.stderr
+++ b/ghc/tests/typecheck/should_fail/tcfail029.stderr
@@ -1,5 +1,7 @@
-tcfail029.hs:6: No instance for: `Ord Foo'
- arising from use of `>' at tcfail029.hs:6
+tcfail029.hs:6:
+ No instance for: `Ord Foo'
+ arising from use of `>', at tcfail029.hs:6
+
Compilation had errors
diff --git a/ghc/tests/typecheck/should_fail/tcfail030.stderr b/ghc/tests/typecheck/should_fail/tcfail030.stderr
index e2f5c836ce9fecbd4d406fcb02c25b3549f6c2ba..6271ba5fca5497b502e77bf060f57812cf27cd92 100644
--- a/ghc/tests/typecheck/should_fail/tcfail030.stderr
+++ b/ghc/tests/typecheck/should_fail/tcfail030.stderr
@@ -1,4 +1,6 @@
-tcfail030.hs:0: Module Main must include a definition for `main'
+tcfail030.hs:0:
+ Module `Main' must include a definition for `Main.main'
+
Compilation had errors
diff --git a/ghc/tests/typecheck/should_fail/tcfail031.stderr b/ghc/tests/typecheck/should_fail/tcfail031.stderr
index 786d1cc7fc821dfcad04dafcf478987426484769..ce245a2095aa053538b5dcef8e906278d325fbbf 100644
--- a/ghc/tests/typecheck/should_fail/tcfail031.stderr
+++ b/ghc/tests/typecheck/should_fail/tcfail031.stderr
@@ -1,8 +1,10 @@
-tcfail031.hs:3: Couldn't match the type `Char' against `Bool'
- Expected: `Char'
- Inferred: `Bool'
- In the predicate expression `'a''
- In an equation for function `f': `f x = if 'a' then 1 else 2'
+tcfail031.hs:3:
+ Couldn't match the type `Char' against `Bool'
+ Expected: Char
+ Inferred: Bool
+ In the predicate expression: 'a'
+ In an equation for function `f': f x = if 'a' then 1 else 2
+
Compilation had errors
diff --git a/ghc/tests/typecheck/should_fail/tcfail032.stderr b/ghc/tests/typecheck/should_fail/tcfail032.stderr
index dbf16533c74e5ba6dfe5789811faf26d8f0bf8ee..ea59332d899e00c4b13a86baf222cd2761eb6879 100644
--- a/ghc/tests/typecheck/should_fail/tcfail032.stderr
+++ b/ghc/tests/typecheck/should_fail/tcfail032.stderr
@@ -1,8 +1,10 @@
-tcfail032.hs:14: A type signature is more polymorphic than the inferred type
- Can't for-all the type variable(s) `taCY'
- in the inferred type `taCY -> Int'
- In an expression with a type signature:
- `x :: _forall_ [a] (Eq a) => a -> Int'
+tcfail032.hs:14:
+ A type signature is more polymorphic than the inferred type
+ Can't for-all the type variable(s) `a'
+ in the type `a -> Int'
+ In an expression with a type signature:
+ x :: _forall_ [a] (PrelBase.Eq a) => a -> Int
+
Compilation had errors
diff --git a/ghc/tests/typecheck/should_fail/tcfail033.stderr b/ghc/tests/typecheck/should_fail/tcfail033.stderr
index f510c2281460ae8bfc980003043091f7e68afa1e..460d6f35a28d81ec3abdd0eab461b71ad408aa62 100644
--- a/ghc/tests/typecheck/should_fail/tcfail033.stderr
+++ b/ghc/tests/typecheck/should_fail/tcfail033.stderr
@@ -1,8 +1,9 @@
-tcfail033.hs:4: Cannot construct the infinite type (occur check)
- `taHe' = `(taHe, taHh)'
- Expected: `aaHj taHe'
- Inferred: `aaHj (taHe, taHh)'
- In a pattern binding: `buglet = [x | (x, y) <- buglet]'
+tcfail033.hs:4:
+ Occurs check: cannot construct the infinite type: aIB = (aIB, aIE)
+ Expected: aIF aIB
+ Inferred: aIF (aIB, aIE)
+ In a pattern binding: buglet = [x | (x, y) <- buglet]
+
Compilation had errors
diff --git a/ghc/tests/typecheck/should_fail/tcfail034.stderr b/ghc/tests/typecheck/should_fail/tcfail034.stderr
index 4d7ca4366c58ff74c927b357f4aa829d8f411470..c1176928f2054c39e77f7cee24253510af0b6cec 100644
--- a/ghc/tests/typecheck/should_fail/tcfail034.stderr
+++ b/ghc/tests/typecheck/should_fail/tcfail034.stderr
@@ -1,7 +1,9 @@
-tcfail034.hs:13: Context `{Integral taW7}'
- required by inferred type, but missing on a type signature
- `Integral taW7' arising from use of `mod' at tcfail034.hs:17
- When checking signature(s) for: `test'
+tcfail034.hs:17:
+ No instance for: `Integral a'
+ arising from use of `mod', at tcfail034.hs:17
+ Available context: (Num a, Eq a)
+ When checking the type signature(s) for `test'
+
Compilation had errors
diff --git a/ghc/tests/typecheck/should_fail/tcfail035.stderr b/ghc/tests/typecheck/should_fail/tcfail035.stderr
index 0d7e28d880b459e8fd8d67af82cd24cb22b2cb5e..08286794444b673e100b5dea0d78bae5a794f974 100644
--- a/ghc/tests/typecheck/should_fail/tcfail035.stderr
+++ b/ghc/tests/typecheck/should_fail/tcfail035.stderr
@@ -1,69 +1,64 @@
-tcfail035.hs:9: Warning: no explicit method nor default method for `showsPrec'
- in an instance declaration for `Show'
+tcfail035.hs:9: Warning:
+ No explicit method nor default method for `showsPrec'
+ in an instance declaration for `Show'
-tcfail035.hs:8: Warning: no explicit method nor default method for `=='
- in an instance declaration for `Eq'
+tcfail035.hs:8: Warning:
+ No explicit method nor default method for `=='
+ in an instance declaration for `Eq'
-tcfail035.hs:7: Warning: no explicit method nor default method for `+'
- in an instance declaration for `Num'
+tcfail035.hs:7: Warning:
+ No explicit method nor default method for `+'
+ in an instance declaration for `Num'
-tcfail035.hs:7: Warning: no explicit method nor default method for `*'
- in an instance declaration for `Num'
+tcfail035.hs:7: Warning:
+ No explicit method nor default method for `*'
+ in an instance declaration for `Num'
-tcfail035.hs:7: Warning: no explicit method nor default method for `negate'
- in an instance declaration for `Num'
+tcfail035.hs:7: Warning:
+ No explicit method nor default method for `negate'
+ in an instance declaration for `Num'
-tcfail035.hs:7: Warning: no explicit method nor default method for `abs'
- in an instance declaration for `Num'
+tcfail035.hs:7: Warning:
+ No explicit method nor default method for `abs'
+ in an instance declaration for `Num'
-tcfail035.hs:7: Warning: no explicit method nor default method for `signum'
- in an instance declaration for `Num'
+tcfail035.hs:7: Warning:
+ No explicit method nor default method for `signum'
+ in an instance declaration for `Num'
-tcfail035.hs:7: Warning: no explicit method nor default method for `fromInteger'
- in an instance declaration for `Num'
+tcfail035.hs:7: Warning:
+ No explicit method nor default method for `fromInteger'
+ in an instance declaration for `Num'
-tcfail035.hs:6: Warning: no explicit method nor default method for `+'
- in an instance declaration for `Num'
+tcfail035.hs:6: Warning:
+ No explicit method nor default method for `+'
+ in an instance declaration for `Num'
-tcfail035.hs:6: Warning: no explicit method nor default method for `*'
- in an instance declaration for `Num'
+tcfail035.hs:6: Warning:
+ No explicit method nor default method for `*'
+ in an instance declaration for `Num'
-tcfail035.hs:6: Warning: no explicit method nor default method for `negate'
- in an instance declaration for `Num'
+tcfail035.hs:6: Warning:
+ No explicit method nor default method for `negate'
+ in an instance declaration for `Num'
-tcfail035.hs:6: Warning: no explicit method nor default method for `abs'
- in an instance declaration for `Num'
+tcfail035.hs:6: Warning:
+ No explicit method nor default method for `abs'
+ in an instance declaration for `Num'
-tcfail035.hs:6: Warning: no explicit method nor default method for `signum'
- in an instance declaration for `Num'
+tcfail035.hs:6: Warning:
+ No explicit method nor default method for `signum'
+ in an instance declaration for `Num'
-tcfail035.hs:6: Warning: no explicit method nor default method for `fromInteger'
- in an instance declaration for `Num'
-
-tcfail035.hs:3: Duplicate or overlapping instance declarations
- for `Num NUM' at tcfail035.hs:6 and tcfail035.hs:7
-
-tcfail035.hs:3: Duplicate or overlapping instance declarations
- for `Num NUM' at tcfail035.hs:6 and tcfail035.hs:7
-
-tcfail035.hs:3: Duplicate or overlapping instance declarations
- for `Num NUM' at tcfail035.hs:6 and tcfail035.hs:7
-
-tcfail035.hs:7: No instance for: `Eval NUM'
- arising from an instance declaration at tcfail035.hs:7
- When checking methods of an instance declaration
-
-tcfail035.hs:7: No instance for: `Eval NUM'
- arising from an instance declaration at tcfail035.hs:7
- When checking superclass constraints of an instance declaration
-
-tcfail035.hs:6: No instance for: `Eval NUM'
- arising from an instance declaration at tcfail035.hs:6
- When checking methods of an instance declaration
+tcfail035.hs:6: Warning:
+ No explicit method nor default method for `fromInteger'
+ in an instance declaration for `Num'
+
-tcfail035.hs:6: No instance for: `Eval NUM'
- arising from an instance declaration at tcfail035.hs:6
- When checking superclass constraints of an instance declaration
+tcfail035.hs:3:
+ Duplicate or overlapping instance declarations
+ for `Num NUM' at tcfail035.hs:7 and tcfail035.hs:6
+
Compilation had errors
diff --git a/ghc/tests/typecheck/should_fail/tcfail036.stderr b/ghc/tests/typecheck/should_fail/tcfail036.stderr
index 1f9f358b3f0fe609988754c2b92337cd5d5ece61..0df79dc7b1b43a5078af41877efe745c6c006327 100644
--- a/ghc/tests/typecheck/should_fail/tcfail036.stderr
+++ b/ghc/tests/typecheck/should_fail/tcfail036.stderr
@@ -1,94 +1,63 @@
-tcfail036.hs:8: Warning: no explicit method nor default method for `+'
- in an instance declaration for `Num'
+tcfail036.hs:8: Warning:
+ No explicit method nor default method for `+'
+ in an instance declaration for `Num'
-tcfail036.hs:8: Warning: no explicit method nor default method for `*'
- in an instance declaration for `Num'
+tcfail036.hs:8: Warning:
+ No explicit method nor default method for `*'
+ in an instance declaration for `Num'
-tcfail036.hs:8: Warning: no explicit method nor default method for `negate'
- in an instance declaration for `Num'
+tcfail036.hs:8: Warning:
+ No explicit method nor default method for `negate'
+ in an instance declaration for `Num'
-tcfail036.hs:8: Warning: no explicit method nor default method for `abs'
- in an instance declaration for `Num'
+tcfail036.hs:8: Warning:
+ No explicit method nor default method for `abs'
+ in an instance declaration for `Num'
-tcfail036.hs:8: Warning: no explicit method nor default method for `signum'
- in an instance declaration for `Num'
+tcfail036.hs:8: Warning:
+ No explicit method nor default method for `signum'
+ in an instance declaration for `Num'
-tcfail036.hs:8: Warning: no explicit method nor default method for `fromInteger'
- in an instance declaration for `Num'
+tcfail036.hs:8: Warning:
+ No explicit method nor default method for `fromInteger'
+ in an instance declaration for `Num'
-tcfail036.hs:7: Warning: no explicit method nor default method for `*'
- in an instance declaration for `Num'
+tcfail036.hs:7: Warning:
+ No explicit method nor default method for `*'
+ in an instance declaration for `Num'
-tcfail036.hs:7: Warning: no explicit method nor default method for `negate'
- in an instance declaration for `Num'
+tcfail036.hs:7: Warning:
+ No explicit method nor default method for `negate'
+ in an instance declaration for `Num'
-tcfail036.hs:7: Warning: no explicit method nor default method for `abs'
- in an instance declaration for `Num'
+tcfail036.hs:7: Warning:
+ No explicit method nor default method for `abs'
+ in an instance declaration for `Num'
-tcfail036.hs:7: Warning: no explicit method nor default method for `signum'
- in an instance declaration for `Num'
+tcfail036.hs:7: Warning:
+ No explicit method nor default method for `signum'
+ in an instance declaration for `Num'
-tcfail036.hs:7: Warning: no explicit method nor default method for `fromInteger'
- in an instance declaration for `Num'
-
-tcfail036.hs:9: Class used as a type constructor: `Num'
-
-tcfail036.hs:3: Duplicate or overlapping instance declarations
- for `Num NUM' at tcfail036.hs:7 and tcfail036.hs:8
-
-tcfail036.hs:3: Duplicate or overlapping instance declarations
- for `Num NUM' at tcfail036.hs:7 and tcfail036.hs:8
-
-tcfail036.hs:3: Duplicate or overlapping instance declarations
- for `Num NUM' at tcfail036.hs:7 and tcfail036.hs:8
-
-tcfail036.hs:8: No instance for: `Eq NUM'
- arising from an instance declaration at tcfail036.hs:8
- When checking methods of an instance declaration
-
-tcfail036.hs:8: No instance for: `Show NUM'
- arising from an instance declaration at tcfail036.hs:8
- When checking methods of an instance declaration
-
-tcfail036.hs:8: No instance for: `Eval NUM'
- arising from an instance declaration at tcfail036.hs:8
- When checking methods of an instance declaration
-
-tcfail036.hs:8: No instance for: `Eq NUM'
- arising from an instance declaration at tcfail036.hs:8
- When checking superclass constraints of an instance declaration
-
-tcfail036.hs:8: No instance for: `Show NUM'
- arising from an instance declaration at tcfail036.hs:8
- When checking superclass constraints of an instance declaration
-
-tcfail036.hs:8: No instance for: `Eval NUM'
- arising from an instance declaration at tcfail036.hs:8
- When checking superclass constraints of an instance declaration
-
-tcfail036.hs:7: No instance for: `Eq NUM'
- arising from an instance declaration at tcfail036.hs:7
- When checking methods of an instance declaration
-
-tcfail036.hs:7: No instance for: `Show NUM'
- arising from an instance declaration at tcfail036.hs:7
- When checking methods of an instance declaration
+tcfail036.hs:7: Warning:
+ No explicit method nor default method for `fromInteger'
+ in an instance declaration for `Num'
+
-tcfail036.hs:7: No instance for: `Eval NUM'
- arising from an instance declaration at tcfail036.hs:7
- When checking methods of an instance declaration
+tcfail036.hs:9:
+ Class used as a type constructor: Num In the type `Eq Num'
-tcfail036.hs:7: No instance for: `Eq NUM'
- arising from an instance declaration at tcfail036.hs:7
- When checking superclass constraints of an instance declaration
+tcfail036.hs:3:
+ Duplicate or overlapping instance declarations
+ for `Num NUM' at tcfail036.hs:8 and tcfail036.hs:7
-tcfail036.hs:7: No instance for: `Show NUM'
- arising from an instance declaration at tcfail036.hs:7
- When checking superclass constraints of an instance declaration
+tcfail036.hs:8:
+ No instance for: `Eq NUM'
+ arising from an instance declaration, at tcfail036.hs:8
-tcfail036.hs:7: No instance for: `Eval NUM'
- arising from an instance declaration at tcfail036.hs:7
- When checking superclass constraints of an instance declaration
+tcfail036.hs:8:
+ No instance for: `Show NUM'
+ arising from an instance declaration, at tcfail036.hs:8
+
Compilation had errors
diff --git a/ghc/tests/typecheck/should_fail/tcfail037.stderr b/ghc/tests/typecheck/should_fail/tcfail037.stderr
index 857681f121b2b5c404cb82ebedb68c477409b342..fbf7d468e6a536efdde2a2873131fbb819f97069 100644
--- a/ghc/tests/typecheck/should_fail/tcfail037.stderr
+++ b/ghc/tests/typecheck/should_fail/tcfail037.stderr
@@ -1,7 +1,8 @@
tcfail037.hs:3:
- Conflicting definitions for: `+'
- Imported from Prelude at tcfail037.hs:3
+ Conflicting definitions for `+'
+ Imported from `Prelude' at tcfail037.hs:3
Defined at tcfail037.hs:10
+
Compilation had errors
diff --git a/ghc/tests/typecheck/should_fail/tcfail038.stderr b/ghc/tests/typecheck/should_fail/tcfail038.stderr
index 5b8c3e822bbbd2f4d34fbde9ac2a7f81c172a290..84e74e123d47108756b2f5c7f8b47bd58d1d6737 100644
--- a/ghc/tests/typecheck/should_fail/tcfail038.stderr
+++ b/ghc/tests/typecheck/should_fail/tcfail038.stderr
@@ -5,4 +5,5 @@ tcfail038.hs:8:
tcfail038.hs:7:
Conflicting definitions for `==' in the bindings in an instance declaration
+
Compilation had errors
diff --git a/ghc/tests/typecheck/should_fail/tcfail039.stderr b/ghc/tests/typecheck/should_fail/tcfail039.stderr
index 86e1fd8fca884cc572cc55123b87b7c255aff93d..ad660bbd2051ae8483c69013522dfa2092caa86e 100644
--- a/ghc/tests/typecheck/should_fail/tcfail039.stderr
+++ b/ghc/tests/typecheck/should_fail/tcfail039.stderr
@@ -1,7 +1,8 @@
tcfail039.hs:3:
- Conflicting definitions for: `=='
- Imported from Prelude at tcfail039.hs:3
+ Conflicting definitions for `=='
+ Imported from `Prelude' at tcfail039.hs:3
Defined at tcfail039.hs:7
+
Compilation had errors
diff --git a/ghc/tests/typecheck/should_fail/tcfail040.stderr b/ghc/tests/typecheck/should_fail/tcfail040.stderr
index 57640e4a4b3fb97ebabd2a3ec3d2bd0dd4126af5..d490c5c21ba0528f7c0aad091ee93e2f6fd7dcad 100644
--- a/ghc/tests/typecheck/should_fail/tcfail040.stderr
+++ b/ghc/tests/typecheck/should_fail/tcfail040.stderr
@@ -1,5 +1,7 @@
-tcfail040.hs:3: Ambiguous context `{ORD taDQ}'
- `ORD taDQ' arising from use of `<<' at tcfail040.hs:19
+tcfail040.hs:19:
+ Cannot resolve the ambiguous context (ORD aG5)
+ `ORD aG5' arising from use of `<<', at tcfail040.hs:19
+
Compilation had errors
diff --git a/ghc/tests/typecheck/should_fail/tcfail042.stderr b/ghc/tests/typecheck/should_fail/tcfail042.stderr
index 4223b27666a3c9f1ec9b8d3ecd607f56f1205092..8e0f8e5a31a304f7f83dde9441a1938412029137 100644
--- a/ghc/tests/typecheck/should_fail/tcfail042.stderr
+++ b/ghc/tests/typecheck/should_fail/tcfail042.stderr
@@ -1,7 +1,9 @@
-tcfail042.hs:18: Context `{Num taEZ}'
- required by inferred type, but missing on a type signature
- `Num taEZ' arising from an instance declaration at tcfail042.hs:18
- When checking superclass constraints of an instance declaration
+tcfail042.hs:18:
+ No instance for: `Num a'
+ arising from an instance declaration, at tcfail042.hs:18
+ Available context: (Foo [a])
+ From the superclasses of the instance declaration
+
Compilation had errors
diff --git a/ghc/tests/typecheck/should_fail/tcfail043.stderr b/ghc/tests/typecheck/should_fail/tcfail043.stderr
index db1353d0a7f09ea673eb136c232ea3a40df37d02..edf14eb22e4d92339a7e511fb3d68873b7670f1f 100644
--- a/ghc/tests/typecheck/should_fail/tcfail043.stderr
+++ b/ghc/tests/typecheck/should_fail/tcfail043.stderr
@@ -1,12 +1,13 @@
tcfail043.hs:16:
- Conflicting definitions for: `and'
- Imported from Prelude at tcfail043.hs:16
+ Conflicting definitions for `and'
+ Imported from `Prelude' at tcfail043.hs:16
Defined at tcfail043.hs:42
tcfail043.hs:16:
- Conflicting definitions for: `null'
- Imported from Prelude at tcfail043.hs:16
+ Conflicting definitions for `null'
+ Imported from `Prelude' at tcfail043.hs:16
Defined at tcfail043.hs:57
+
Compilation had errors
diff --git a/ghc/tests/typecheck/should_fail/tcfail044.stderr b/ghc/tests/typecheck/should_fail/tcfail044.stderr
index 58e3646b768676ef7c5c50bb3b973cfddda8c332..31a73cfdce1b38e512510317f4978853abde3c7d 100644
--- a/ghc/tests/typecheck/should_fail/tcfail044.stderr
+++ b/ghc/tests/typecheck/should_fail/tcfail044.stderr
@@ -1,13 +1,17 @@
-tcfail044.hs:12: The type
- `a -> a'
- cannot be used as an instance type
+tcfail044.hs:12:
+ Illegal instance declaration for `Num (a -> a)'
+ (the instance type must be of form (T a b c)
+ where T is not a synonym, and a,b,c are distinct type variables)
-tcfail044.hs:5: The type
- `a -> a'
- cannot be used as an instance type
+tcfail044.hs:5:
+ Illegal instance declaration for `Eq (a -> a)'
+ (the instance type must be of form (T a b c)
+ where T is not a synonym, and a,b,c are distinct type variables)
-tcfail044.hs:20: No instance for: `Num (Float -> Float)'
- arising from use of `+' at tcfail044.hs:20
+tcfail044.hs:20:
+ No instance for: `Num (Float -> Float)'
+ arising from use of `+', at tcfail044.hs:20
+
Compilation had errors
diff --git a/ghc/tests/typecheck/should_fail/tcfail045.stderr b/ghc/tests/typecheck/should_fail/tcfail045.stderr
index a12ddfc69e23d8dddd2aa3a3f86656253a23901f..c02f3bd7ad071e17c255d4d081bae2d3ac4b07e1 100644
--- a/ghc/tests/typecheck/should_fail/tcfail045.stderr
+++ b/ghc/tests/typecheck/should_fail/tcfail045.stderr
@@ -1,9 +1,11 @@
-tcfail045.hs:10: Unacceptable instance type for ccall-ish class
- class `CCallable' type `Socket'
+tcfail045.hs:10:
+ Unacceptable instance type for ccall-ish class
+ class CCallable type Socket
-tcfail045.hs:13: No instance for: `CCallable Socket'
- arising from an argument in the _ccall_ to foo, namely `x' at tcfail045.hs:13
- When checking signature(s) for: `f'
+tcfail045.hs:13:
+ No instance for: `CCallable Socket'
+ arising from an argument in the _ccall_ to `foo', namely `x', at tcfail045.hs:13
+
Compilation had errors
diff --git a/ghc/tests/typecheck/should_fail/tcfail046.stderr b/ghc/tests/typecheck/should_fail/tcfail046.stderr
index 897ea90a62f2e875ba037a799ccb639ede47c1d4..16a7906bd4e672d679031b01faa512354ff382f0 100644
--- a/ghc/tests/typecheck/should_fail/tcfail046.stderr
+++ b/ghc/tests/typecheck/should_fail/tcfail046.stderr
@@ -1,14 +1,7 @@
-tcfail046.hs:4: No instance for: `Eq (Process a)'
- When deriving classes for `Message'
-
-tcfail046.hs:4: No instance for: `Eq (Process a)'
- When deriving classes for `Continuation'
-
-tcfail046.hs:4: No instance for: `Eq (Process a)'
- When deriving classes for `Message'
-
-tcfail046.hs:4: No instance for: `Eq (Process a)'
- When deriving classes for `Continuation'
+tcfail046.hs:4:
+ No instance for: `Eq (Process a)'
+ When deriving classes for `Message'
+
Compilation had errors
diff --git a/ghc/tests/typecheck/should_fail/tcfail047.stderr b/ghc/tests/typecheck/should_fail/tcfail047.stderr
index b95c59bd83e4f4d08e14d51255fd190f8f606b9d..43e80b8ccd20c5c3d3e95e92eea06eb1cff2a012 100644
--- a/ghc/tests/typecheck/should_fail/tcfail047.stderr
+++ b/ghc/tests/typecheck/should_fail/tcfail047.stderr
@@ -1,6 +1,8 @@
-tcfail047.hs:7: The type
- `(a, (b, c))'
- cannot be used as an instance type
+tcfail047.hs:7:
+ Illegal instance declaration for `A (a, (b, c))'
+ (the instance type must be of form (T a b c)
+ where T is not a synonym, and a,b,c are distinct type variables)
+
Compilation had errors
diff --git a/ghc/tests/typecheck/should_fail/tcfail048.stderr b/ghc/tests/typecheck/should_fail/tcfail048.stderr
index 79f5db23873fe287f850df85da509ed3cb7fb260..fd7bc0bf7f7d0e2298f6e51c710e5804a89c962e 100644
--- a/ghc/tests/typecheck/should_fail/tcfail048.stderr
+++ b/ghc/tests/typecheck/should_fail/tcfail048.stderr
@@ -1,4 +1,5 @@
tcfail048.hs:4: Type constructor or class not in scope: `B'
+
Compilation had errors
diff --git a/ghc/tests/typecheck/should_fail/tcfail049.stderr b/ghc/tests/typecheck/should_fail/tcfail049.stderr
index 2876a8470c955713743df1e54a9e34181bcfa592..972ab29272dcdb12297d41016acd1b3b775860e9 100644
--- a/ghc/tests/typecheck/should_fail/tcfail049.stderr
+++ b/ghc/tests/typecheck/should_fail/tcfail049.stderr
@@ -1,4 +1,5 @@
tcfail049.hs:3: Value not in scope: `g'
+
Compilation had errors
diff --git a/ghc/tests/typecheck/should_fail/tcfail050.stderr b/ghc/tests/typecheck/should_fail/tcfail050.stderr
index b7c7be27eeffcbb83c9c7d107b615f7e5299a2fb..e468e080fd82e975f82cb0351c17c25c8823330c 100644
--- a/ghc/tests/typecheck/should_fail/tcfail050.stderr
+++ b/ghc/tests/typecheck/should_fail/tcfail050.stderr
@@ -1,4 +1,5 @@
tcfail050.hs:3: Data constructor not in scope: `B'
+
Compilation had errors
diff --git a/ghc/tests/typecheck/should_fail/tcfail051.stderr b/ghc/tests/typecheck/should_fail/tcfail051.stderr
index fe2120f27ebbe14caeadd52040e3ca0b498ec80f..9f4e645b2da54f2fc3d4e5fb745d516f97f8c79e 100644
--- a/ghc/tests/typecheck/should_fail/tcfail051.stderr
+++ b/ghc/tests/typecheck/should_fail/tcfail051.stderr
@@ -1,4 +1,5 @@
tcfail051.hs:4: Type constructor or class not in scope: `B'
+
Compilation had errors
diff --git a/ghc/tests/typecheck/should_fail/tcfail052.stderr b/ghc/tests/typecheck/should_fail/tcfail052.stderr
index dd169a93eb73e26cf5c956c51845ae567163376d..8f1508967b46e35846ae8054936f3dca7e07ac84 100644
--- a/ghc/tests/typecheck/should_fail/tcfail052.stderr
+++ b/ghc/tests/typecheck/should_fail/tcfail052.stderr
@@ -1,4 +1,5 @@
tcfail052.hs:4: Type variable not in scope: `c'
+
Compilation had errors
diff --git a/ghc/tests/typecheck/should_fail/tcfail053.stderr b/ghc/tests/typecheck/should_fail/tcfail053.stderr
index b6a04998ee0a7750f2750ba26a8c90ed678a5045..6c9d899f2972512e2c0c3f1db13ce1eb46653f65 100644
--- a/ghc/tests/typecheck/should_fail/tcfail053.stderr
+++ b/ghc/tests/typecheck/should_fail/tcfail053.stderr
@@ -1,4 +1,5 @@
tcfail053.hs:3: Type constructor or class not in scope: `A'
+
Compilation had errors
diff --git a/ghc/tests/typecheck/should_fail/tcfail054.stderr b/ghc/tests/typecheck/should_fail/tcfail054.stderr
index 6ac1fee8ad47a7ecb1d244b0f5b72bac06102125..a2dc363e5c0bfe0d97831daa1d2261cc7edf1c53 100644
--- a/ghc/tests/typecheck/should_fail/tcfail054.stderr
+++ b/ghc/tests/typecheck/should_fail/tcfail054.stderr
@@ -1,4 +1,5 @@
tcfail054.hs:3: Data constructor not in scope: `B'
+
Compilation had errors
diff --git a/ghc/tests/typecheck/should_fail/tcfail055.stderr b/ghc/tests/typecheck/should_fail/tcfail055.stderr
index 623875c96f37c50011b64de72cb85b4c5bcd84b9..37f6b2323ed2b61f6a9bd455c740147dd4066550 100644
--- a/ghc/tests/typecheck/should_fail/tcfail055.stderr
+++ b/ghc/tests/typecheck/should_fail/tcfail055.stderr
@@ -1,7 +1,9 @@
-tcfail055.hs:3: Couldn't match the type `Int' against `Float'
- Expected: `Int'
- Inferred: `Float'
- In an expression with a type signature: `x + 1 :: Int'
+tcfail055.hs:3:
+ Couldn't match the type `Int' against `Float'
+ Expected: Int
+ Inferred: Float
+ In an expression with a type signature: x + 1 :: Int
+
Compilation had errors
diff --git a/ghc/tests/typecheck/should_fail/tcfail056.stderr b/ghc/tests/typecheck/should_fail/tcfail056.stderr
index 6349ccf18de2b9f7d3ae20610f3092f35a66ee6a..8a2f7badc13af32f1b60824c5272e6700570b7cb 100644
--- a/ghc/tests/typecheck/should_fail/tcfail056.stderr
+++ b/ghc/tests/typecheck/should_fail/tcfail056.stderr
@@ -1,16 +1,14 @@
-tcfail056.hs:10: Warning: no explicit method nor default method for `=='
- in an instance declaration for `Eq'
-
-tcfail056.hs:1: Duplicate or overlapping instance declarations
- for `Eq Foo' at tcfail056.hs:6 and tcfail056.hs:10
-
-tcfail056.hs:1: Duplicate or overlapping instance declarations
- for `Eq Foo' at tcfail056.hs:6 and tcfail056.hs:10
+tcfail056.hs:10: Warning:
+ No explicit method nor default method for `=='
+ in an instance declaration for `Eq'
+
-tcfail056.hs:1: Duplicate or overlapping instance declarations
- for `Eq Foo' at tcfail056.hs:6 and tcfail056.hs:10
+tcfail056.hs:1:
+ Duplicate or overlapping instance declarations
+ for `Eq Foo' at tcfail056.hs:10 and tcfail056.hs:6
tcfail056.hs:10: Class `Eq' does not have a method `<='
+
Compilation had errors
diff --git a/ghc/tests/typecheck/should_fail/tcfail057.stderr b/ghc/tests/typecheck/should_fail/tcfail057.stderr
index 921a57283b023f8e7b31b6976f5ba163a0dc6d19..60eecacee69b447f45efa6c4246288dde12f7508 100644
--- a/ghc/tests/typecheck/should_fail/tcfail057.stderr
+++ b/ghc/tests/typecheck/should_fail/tcfail057.stderr
@@ -1,4 +1,7 @@
-tcfail057.hs:5: Class used as a type constructor: `RealFrac'
+tcfail057.hs:5:
+ Class used as a type constructor: RealFrac
+ In the type `_forall_ [a] => RealFrac a -> a -> a'
+
Compilation had errors
diff --git a/ghc/tests/typecheck/should_fail/tcfail058.stderr b/ghc/tests/typecheck/should_fail/tcfail058.stderr
index 36c71c8851d16414a33e7599456eb4a57fe81cbd..f3107106776b0058e847b04a99c901a12bbd9333 100644
--- a/ghc/tests/typecheck/should_fail/tcfail058.stderr
+++ b/ghc/tests/typecheck/should_fail/tcfail058.stderr
@@ -1,4 +1,8 @@
-tcfail058.hs:6: Type constructor used as a class: `Array'
+tcfail058.hs:6:
+ Type constructor used as a class: PrelArr.Array
+ In the context `(PrelArr.Array a)'
+ In the type `_forall_ [a b] (PrelArr.Array a) => a -> b'
+
Compilation had errors
diff --git a/ghc/tests/typecheck/should_fail/tcfail061.stderr b/ghc/tests/typecheck/should_fail/tcfail061.stderr
index ce06645079002f5118dcfcd8d72f0ef12277b13b..bf0379483c5a6c527efa8dbbf918729252ec3f18 100644
--- a/ghc/tests/typecheck/should_fail/tcfail061.stderr
+++ b/ghc/tests/typecheck/should_fail/tcfail061.stderr
@@ -7,4 +7,5 @@ tcfail061.hs:5: Type variable not in scope: `b'
tcfail061.hs:5: Type variable not in scope: `b'
+
Compilation had errors
diff --git a/ghc/tests/typecheck/should_fail/tcfail062.stderr b/ghc/tests/typecheck/should_fail/tcfail062.stderr
index a7e622eb034fe48c480a711fe37a30aff7e5b45c..7cffa7b5e3b571dec8d5f538910ac5fe78cb5be6 100644
--- a/ghc/tests/typecheck/should_fail/tcfail062.stderr
+++ b/ghc/tests/typecheck/should_fail/tcfail062.stderr
@@ -5,4 +5,5 @@ tcfail062.hs:33:
tcfail062.hs:33:
Type variable not in scope: `behaviouralExpression'
+
Compilation had errors
diff --git a/ghc/tests/typecheck/should_fail/tcfail063.stderr b/ghc/tests/typecheck/should_fail/tcfail063.stderr
index bdec0c873ca56ade98398a97bc9895a9b1168566..fff632e139b8a6136bcc3e378db11fd44e86e68f 100644
--- a/ghc/tests/typecheck/should_fail/tcfail063.stderr
+++ b/ghc/tests/typecheck/should_fail/tcfail063.stderr
@@ -1 +1 @@
-tcfail063.hs:5:1: is_context_format: variable missing after class name on input: "moby"
+tcfail063.hs:5:1: is_context_format: type missing after class name on input: "moby"
diff --git a/ghc/tests/typecheck/should_fail/tcfail065.stderr b/ghc/tests/typecheck/should_fail/tcfail065.stderr
index bac2bd6969f41e0eab9189379aca502f8f82a5b5..e80ebf7a29b29609c15b28644501c2a4a3161440 100644
--- a/ghc/tests/typecheck/should_fail/tcfail065.stderr
+++ b/ghc/tests/typecheck/should_fail/tcfail065.stderr
@@ -1,7 +1,10 @@
-tcfail065.hs:29: A type signature is more polymorphic than the inferred type
- Can't for-all the type variable(s) `taJC'
- in the inferred type `taJC -> X taJC -> X taJC'
- When checking signature for `setX'
+tcfail065.hs:29:
+ A type signature is more polymorphic than the inferred type
+ Can't for-all the type variable(s) `aLX'
+ in the type `aLX -> X x -> X x'
+ When checking the type signature for `setX'
+ In the definition for method `setX'
+
Compilation had errors
diff --git a/ghc/tests/typecheck/should_fail/tcfail067.stderr b/ghc/tests/typecheck/should_fail/tcfail067.stderr
index 31d616fe290283a0acce46211eed39f08607395e..d62b84f6f041a8a78b976dd6156c7d910b94f98f 100644
--- a/ghc/tests/typecheck/should_fail/tcfail067.stderr
+++ b/ghc/tests/typecheck/should_fail/tcfail067.stderr
@@ -1,18 +1,30 @@
-tcfail067.hs:65: Warning: no explicit method nor default method for `abs'
- in an instance declaration for `Num'
+tcfail067.hs:65: Warning:
+ No explicit method nor default method for `abs'
+ in an instance declaration for `Num'
-tcfail067.hs:65: Warning: no explicit method nor default method for `signum'
- in an instance declaration for `Num'
+tcfail067.hs:65: Warning:
+ No explicit method nor default method for `signum'
+ in an instance declaration for `Num'
+
+
+tcfail067.hs:76:
+ No instance for: `Ord a'
+ arising from use of `SubRange', at tcfail067.hs:76
+ Available context: (Num a)
+ When checking the type signature(s) for `numSubRangeBinOp'
-tcfail067.hs:1: Context `{Ord ta18P}'
- required by inferred type, but missing on a type signature
- `Ord ta18P' arising from use of `SubRange' at tcfail067.hs:76
- When checking signature(s) for: `numSubRangeBinOp'
+tcfail067.hs:61:
+ No instance for: `Ord a'
+ arising from use of `numSubRangeNegate', at tcfail067.hs:61
+ Available context: (Eq (SubRange a), Show (SubRange a), Eval (SubRange a))
+ From the superclasses of the instance declaration
-tcfail067.hs:65: Context `{Ord ta1al}'
- required by inferred type, but missing on a type signature
- `Ord ta1al' arising from use of `numSubRangeNegate' at tcfail067.hs:61
- When checking methods of an instance declaration
+tcfail067.hs:65:
+ No instance for: `Show (SubRange a)'
+ arising from an instance declaration, at tcfail067.hs:65
+ Available context: (Eq (SubRange a), Show (SubRange a), Eval (SubRange a))
+ From the superclasses of the instance declaration
+
Compilation had errors
diff --git a/ghc/tests/typecheck/should_fail/tcfail068.stderr b/ghc/tests/typecheck/should_fail/tcfail068.stderr
index 584e5f06f76b5f51a8fbcffac613712d3cb9261c..1da5ab1f31f9455d81ff7be1fcda0c011441851d 100644
--- a/ghc/tests/typecheck/should_fail/tcfail068.stderr
+++ b/ghc/tests/typecheck/should_fail/tcfail068.stderr
@@ -1,73 +1,80 @@
-tcfail068.hs:45: A type signature is more polymorphic than the inferred type
- Can't for-all the type variable(s) `ta17h'
- in the inferred type `ST ta17h (ta17a, IndTree ta17h ta177)'
- In a polymorphic function argument `(itrapstate' i k s)'
- In the first argument of `runST', namely `(itrapstate' i k s)'
- In an equation for function `itrapstate':
- `itrapstate ((i, k), (j, l)) f c d s arr
- = runST (itrapstate' i k s)
- where
- itrapstatesnd i k s
- = if i > j then
- return (s, (arr))
- else
- ((readArray arr (i, (k)))
- >>= (\ val
- -> let (newstate, newval) = f (c (i, (k)) s) val
- in
- (writeArray arr (i, (k)) newval)
- >> (itrapstatesnd (i + 1) k (d newstate))))
- itrapstate' i k s
- = if k > l then
- return (s, (arr))
- else
- ((itrapstatesnd i k s)
- >>= (\ (s, arr) -> itrapstate' i (k + 1) s))'
+tcfail068.hs:45:
+ A type signature is more polymorphic than the inferred type
+ Can't for-all the type variable(s) `a1cm'
+ in the type `ST a1cm a1ci'
+ In a polymorphic function argument: (itrapstate' i k s)
+ In the first argument of `runST', namely `(itrapstate' i k s)'
+ In an equation for function `itrapstate':
+ itrapstate ((i, k), (j, l)) f c d s arr
+ = runST (itrapstate' i k s)
+ where
+ itrapstatesnd i k s
+ = if i > j then
+ return (s, (arr))
+ else
+ ((readArray arr (i, (k)))
+ >>= (\ val
+ -> let
+ (newstate, newval) = f (... ... ...) val
+ in
+ (... ... ... ...) >> (... ... ... ...)))
+ itrapstate' i k s
+ = if k > l then
+ return (s, (arr))
+ else
+ ((itrapstatesnd i k s)
+ >>= (\ (s, arr) -> itrapstate' i (k + 1) s))
-tcfail068.hs:32: A type signature is more polymorphic than the inferred type
- Can't for-all the type variable(s) `ta1aj'
- in the inferred type `ST ta1aj (IndTree ta1aj ta1ag)'
- In a polymorphic function argument `(itrap' i k)'
- In the first argument of `runST', namely `(itrap' i k)'
- In an equation for function `itrap':
- `itrap ((i, k), (j, l)) f arr
- = runST (itrap' i k)
- where
- itrapsnd i k
- = if i > j then
- return arr
- else
- ((readArray arr (i, (k)))
- >>= (\ val
- -> (writeArray arr (i, (k)) (f val))
- >> (itrapsnd (i + 1) k)))
- itrap' i k
- = if k > l then
- return arr
- else
- ((itrapsnd i k) >> (itrap' i (k + 1)))'
+tcfail068.hs:32:
+ A type signature is more polymorphic than the inferred type
+ Can't for-all the type variable(s) `a1f3'
+ in the type `ST a1f3 a1eZ'
+ In a polymorphic function argument: (itrap' i k)
+ In the first argument of `runST', namely `(itrap' i k)'
+ In an equation for function `itrap':
+ itrap ((i, k), (j, l)) f arr
+ = runST (itrap' i k)
+ where
+ itrapsnd i k
+ = if i > j then
+ return arr
+ else
+ ((readArray arr (i, (k)))
+ >>= (\ val
+ -> (writeArray arr (..., ...) (... ...))
+ >> (itrapsnd (... + 1) k)))
+ itrap' i k
+ = if k > l then
+ return arr
+ else
+ ((itrapsnd i k) >> (itrap' i (k + 1)))
-tcfail068.hs:21: A type signature is more polymorphic than the inferred type
- Can't for-all the type variable(s) `ta1cC'
- in the inferred type `ST ta1cC (IndTree ta1cC ta1cn)'
- In a polymorphic function argument `((readArray arr i)
- >>= (\ val -> (writeArray arr i (f val)) >> (return arr)))'
- In the first argument of `runST', namely
- `((readArray arr i)
- >>= (\ val -> (writeArray arr i (f val)) >> (return arr)))'
- In an equation for function `itiap':
- `itiap i f arr
- = runST ((readArray arr i)
- >>= (\ val -> (writeArray arr i (f val)) >> (return arr)))'
+tcfail068.hs:21:
+ A type signature is more polymorphic than the inferred type
+ Can't for-all the type variable(s) `a1fu'
+ in the type `ST a1fu a1fk'
+ In a polymorphic function argument: ((readArray arr i)
+ >>= (\ val
+ -> (writeArray arr i (... ...))
+ >> (return arr)))
+ In the first argument of `runST', namely
+ `((readArray arr i)
+ >>= (\ val -> (writeArray arr i (... ...)) >> (return arr)))'
+ In an equation for function `itiap':
+ itiap i f arr
+ = runST ((readArray arr i)
+ >>= (\ val -> (... ... ... ...) >> (... ...)))
-tcfail068.hs:14: A type signature is more polymorphic than the inferred type
- Can't for-all the type variable(s) `ta1dv'
- in the inferred type `ST ta1dv (IndTree ta1dv ta1do)'
- In a polymorphic function argument `(newArray ((1, (1)), (n)) x)'
- In the first argument of `runST', namely
- `(newArray ((1, (1)), (n)) x)'
- In an equation for function `itgen':
- `itgen n x = runST (newArray ((1, (1)), (n)) x)'
+tcfail068.hs:14:
+ A type signature is more polymorphic than the inferred type
+ Can't for-all the type variable(s) `a1gq'
+ in the type `ST a1gq a1gm'
+ In a polymorphic function argument: (newArray ((1, (1)), (n)) x)
+ In the first argument of `runST', namely
+ `(newArray ((1, (1)), (n)) x)'
+ In an equation for function `itgen':
+ itgen n x = runST (newArray ((1, (1)), (n)) x)
+
Compilation had errors
diff --git a/ghc/tests/typecheck/should_fail/tcfail069.stderr b/ghc/tests/typecheck/should_fail/tcfail069.stderr
index db567536be8f8b932386b1c689043505ff891e31..c88f9be9a476399fc65b6620530f55e11f7fa3ed 100644
--- a/ghc/tests/typecheck/should_fail/tcfail069.stderr
+++ b/ghc/tests/typecheck/should_fail/tcfail069.stderr
@@ -1,14 +1,10 @@
-tcfail069.hs:21: Couldn't match the type `(,) taAi' against `[]'
- Expected: `[taAm]'
- Inferred: `([Int], [Int])'
- In a "case" branch: `[]' -> `error "foo"'
- In the case expression `case (list1, (list2)) of [] -> error "foo"'
- In an equation for function `too_much':
- `too_much ds ((k, m) : q1) s0
- = case (list1, (list2)) of [] -> error "foo"
- where
- list2 = ds
- list1 = ds'
+tcfail069.hs:21:
+ Couldn't match the type `(aBr, aBt)' against `[aBw]'
+ Expected: [aBw]
+ Inferred: ([Int], [Int])
+ In a "case" branch: [] -> error "foo"
+ In the case expression: case (list1, (list2)) of [] -> error "foo"
+
Compilation had errors
diff --git a/ghc/tests/typecheck/should_fail/tcfail070.stderr b/ghc/tests/typecheck/should_fail/tcfail070.stderr
index 804bde15d311678a61e8178b31aea2264a33c3ae..65162846870043f6d55963aeda2c20f13854a095 100644
--- a/ghc/tests/typecheck/should_fail/tcfail070.stderr
+++ b/ghc/tests/typecheck/should_fail/tcfail070.stderr
@@ -1,6 +1,10 @@
-tcfail070.hs:13: Couldn't match the kind `*' against `* -> ka1937'
- When unifying two kinds `*' and `* -> ka1937'
- In the type declaration for `State'
+tcfail070.hs:13:
+ Couldn't match the kind * against * -> kawG
+ Expected: *
+ Found: * -> kawG
+ In the type `[Int] Bool'
+ In the type declaration for `State'
+
Compilation had errors
diff --git a/ghc/tests/typecheck/should_fail/tcfail071.stderr b/ghc/tests/typecheck/should_fail/tcfail071.stderr
index 4bcb964c0e74932ff3801fe0a47a7a29aa35fa0b..253c05dc7387087541ce789cea7159636c4f3495 100644
--- a/ghc/tests/typecheck/should_fail/tcfail071.stderr
+++ b/ghc/tests/typecheck/should_fail/tcfail071.stderr
@@ -1,14 +1,9 @@
-tcfail071.hs:10: Couldn't match the signature/existential type variable
- `taDJ' with the type `taDW -> taDT -> taDT'
- Expected: `taDJ'
- Inferred: `taDW -> taDT -> taDT'
- In the first argument of `f', namely `c'
- In the first argument of `foldr', namely `(f c)'
- In a pattern binding: `p = foldr (f c) [] []'
-
-tcfail071.hs:8: Mismatched contexts
- When matching the contexts of the signatures for `f' and `g'
- (the signature contexts in a mutually recursive group should all be identical)
+tcfail071.hs:8:
+ Type signature doesn't match inferred type
+ Signature: c -> c
+ Inferred : (aG1 -> [aG6] -> [aG6]) -> aG1 -> [aG6] -> [aG6]
+ When checking the type signature for `g'
+
Compilation had errors
diff --git a/ghc/tests/typecheck/should_fail/tcfail072.stderr b/ghc/tests/typecheck/should_fail/tcfail072.stderr
index 108ac3654f217c1a47260b1310c6cc6087704e1b..063d6edd1de9565d94e6394b22bca0525a87100a 100644
--- a/ghc/tests/typecheck/should_fail/tcfail072.stderr
+++ b/ghc/tests/typecheck/should_fail/tcfail072.stderr
@@ -1,6 +1,11 @@
-tcfail072.hs:17: Ambiguous context `{Ord taE6}'
- `Ord taE6' arising from use of `g' at tcfail072.hs:23
- When checking signature(s) for: `g'
+tcfail072.hs:23:
+ Cannot resolve the ambiguous context (Ord aGd)
+ `Ord aGd' arising from use of `g', at tcfail072.hs:23
+
+tcfail072.hs:23:
+ Cannot resolve the ambiguous context (Ord aGg)
+ `Ord aGg' arising from use of `g', at tcfail072.hs:23
+
Compilation had errors
diff --git a/ghc/tests/typecheck/should_fail/tcfail073.stderr b/ghc/tests/typecheck/should_fail/tcfail073.stderr
index 83ac0e662a8105962f81e279213adbdbf0b97b2e..b3c1bc5ecc5a92f6ee83966f6a270d9e8f1e9f81 100644
--- a/ghc/tests/typecheck/should_fail/tcfail073.stderr
+++ b/ghc/tests/typecheck/should_fail/tcfail073.stderr
@@ -1,16 +1,13 @@
-tcfail073.hs:3: Duplicate or overlapping instance declarations
- for `Eq (a, b)' at tcfail073.hs:8 and <NoSrcLoc>
-
-tcfail073.hs:3: Duplicate or overlapping instance declarations
- for `Eq (a, b)' at tcfail073.hs:8 and <NoSrcLoc>
-
-tcfail073.hs:3: Duplicate or overlapping instance declarations
- for `Eq (a, b)' at tcfail073.hs:8 and <NoSrcLoc>
-
-tcfail073.hs:8: Context `{Eq taT4}'
- required by inferred type, but missing on a type signature
- `Eq taT4' arising from use of `==' at tcfail073.hs:8
- When checking methods of an instance declaration
+tcfail073.hs:3:
+ Duplicate or overlapping instance declarations
+ for `Eq (a, b)' at PrelTup.hi:58 and tcfail073.hs:8
+
+tcfail073.hs:8:
+ No instance for: `Eq a'
+ arising from use of `==', at tcfail073.hs:8
+ Available context: ()
+ From the superclasses of the instance declaration
+
Compilation had errors
diff --git a/ghc/tests/typecheck/should_fail/tcfail074.stderr b/ghc/tests/typecheck/should_fail/tcfail074.stderr
index 5ee43263119b30436ba925429cfe52659e7a7f2e..83bb80a3d2ff48b0ea985ce5b630f08dd9aa4e36 100644
--- a/ghc/tests/typecheck/should_fail/tcfail074.stderr
+++ b/ghc/tests/typecheck/should_fail/tcfail074.stderr
@@ -1,7 +1,8 @@
tcfail074.hs:7:
- Conflicting definitions for: `main'
+ Conflicting definitions for `main'
Defined at tcfail074.hs:8
Defined at tcfail074.hs:7
+
Compilation had errors
diff --git a/ghc/tests/typecheck/should_fail/tcfail076.hs b/ghc/tests/typecheck/should_fail/tcfail076.hs
index 08f775b8ca93e8d39687faaa6833a709acb9380f..262b79f9fa7e7a4405dbce4140c31dbd00e35e90 100644
--- a/ghc/tests/typecheck/should_fail/tcfail076.hs
+++ b/ghc/tests/typecheck/should_fail/tcfail076.hs
@@ -1,3 +1,5 @@
+{-# OPTIONS -fglasgow-exts #-}
+
{-
From: Ralf Hinze <ralf@uran.informatik.uni-bonn.de>
Date: Fri, 15 Aug 1997 15:20:51 +0200 (MET DST)
@@ -7,11 +9,9 @@ program, which I think is ill-typed, passes silently the type checker.
Needless to say that it uses some of GHC's arcane type extensions.
-}
-{-# OPTIONS -fglasgow-exts #-}
-
module ShouldFail where
-import GHC ( All )
+import GlaExts ( All )
data ContT m a = KContT ((All res) => (a -> m res) -> m res)
unKContT (KContT x) = x
diff --git a/ghc/tests/typecheck/should_fail/tcfail076.stderr b/ghc/tests/typecheck/should_fail/tcfail076.stderr
index 81b086a4ac956c41375004b12aa098263645e5e7..5633ada5577c17d3abca8b56bbc882c3b94533ab 100644
--- a/ghc/tests/typecheck/should_fail/tcfail076.stderr
+++ b/ghc/tests/typecheck/should_fail/tcfail076.stderr
@@ -1,12 +1,12 @@
-tcfail076.hs:20: A type signature is more polymorphic than the inferred type
- Can't for-all the type variable(s) `taE6'
- in the inferred type `(taDW -> aaDV taE6) -> aaDV taE6'
- In a polymorphic function argument `(\ cont' -> cont a)'
- In the first argument of `KContT', namely `(\ cont' -> cont a)'
- In the first argument of `f', namely
- `(\ a -> KContT (\ cont' -> cont a))'
- In the first argument of `unKContT', namely
- `(f (\ a -> KContT (\ cont' -> cont a)))'
+tcfail076.hs:20:
+ A type signature is more polymorphic than the inferred type
+ Can't for-all the type variable(s) `aGU'
+ in the type `(aGQ -> aGO aGU) -> aGO aGU'
+ In a polymorphic function argument: (\ cont' -> cont a)
+ In the first argument of `KContT', namely `(\ cont' -> cont a)'
+ In the first argument of `f', namely
+ `(\ a -> KContT (\ cont' -> cont a))'
+
Compilation had errors
diff --git a/ghc/tests/typecheck/should_fail/tcfail077.stderr b/ghc/tests/typecheck/should_fail/tcfail077.stderr
index 4988e5c99b527d350a9eb4fc10cc5f49589316a7..fad6c248110b7e171df4e4df04d100f8b68dfb13 100644
--- a/ghc/tests/typecheck/should_fail/tcfail077.stderr
+++ b/ghc/tests/typecheck/should_fail/tcfail077.stderr
@@ -1,4 +1,5 @@
tcfail077.hs:8: Class `Foo' does not have a method `op2'
+
Compilation had errors
diff --git a/ghc/tests/typecheck/should_fail/tcfail078.stderr b/ghc/tests/typecheck/should_fail/tcfail078.stderr
index 027604c7fc097fb7123289184afb1ef470d28afa..56711e38c89a8b8b06f5b5aacfadf289d1df4fe9 100644
--- a/ghc/tests/typecheck/should_fail/tcfail078.stderr
+++ b/ghc/tests/typecheck/should_fail/tcfail078.stderr
@@ -1,4 +1,8 @@
-tcfail078.hs:5: Type constructor used as a class: `Integer'
+tcfail078.hs:5:
+ Type constructor used as a class: Integer
+ In the context `(Integer i)'
+ In the type `_forall_ [i] (Integer i) => i'
+
Compilation had errors