From 19f6e95fe4cd58542900cad79a9fc0ded74d9966 Mon Sep 17 00:00:00 2001
From: simonmar <unknown>
Date: Fri, 27 Aug 1999 14:57:11 +0000
Subject: [PATCH] [project @ 1999-08-27 14:57:07 by simonmar] synch output.
---
.../typecheck/should_compile/tc056.stderr | 2 +-
.../typecheck/should_compile/tc059.stderr | 4 +--
.../typecheck/should_compile/tc079.stderr | 4 +--
.../typecheck/should_compile/tc080.stderr | 4 +--
.../typecheck/should_compile/tc085.stderr | 4 +--
.../typecheck/should_compile/tc086.stderr | 2 +-
.../typecheck/should_compile/tc087.stderr | 4 +--
.../typecheck/should_compile/tc095.stderr | 12 +++----
.../typecheck/should_compile/tc097.stderr | 4 +--
.../typecheck/should_fail/tcfail023.stderr | 2 +-
.../typecheck/should_fail/tcfail030.stderr | 2 +-
.../typecheck/should_fail/tcfail035.stderr | 3 +-
.../typecheck/should_fail/tcfail036.stderr | 3 +-
.../typecheck/should_fail/tcfail038.stderr | 4 +--
.../typecheck/should_fail/tcfail042.stderr | 4 +--
.../typecheck/should_fail/tcfail044.stderr | 10 +++---
.../typecheck/should_fail/tcfail047.stderr | 2 +-
.../typecheck/should_fail/tcfail048.stderr | 2 +-
.../typecheck/should_fail/tcfail051.stderr | 2 +-
.../typecheck/should_fail/tcfail052.stderr | 2 +-
.../typecheck/should_fail/tcfail053.stderr | 2 +-
.../typecheck/should_fail/tcfail056.stderr | 3 +-
.../typecheck/should_fail/tcfail063.stderr | 5 ++-
.../typecheck/should_fail/tcfail065.stderr | 4 +--
.../typecheck/should_fail/tcfail067.stderr | 30 +++++++++---------
.../typecheck/should_fail/tcfail068.stderr | 18 +++++++----
.../typecheck/should_fail/tcfail071.stderr | 4 +--
.../typecheck/should_fail/tcfail073.stderr | 3 +-
ghc/tests/typecheck/should_fail/tcfail075.hs | 6 ++--
.../typecheck/should_fail/tcfail075.stderr | 31 ++++++++++++++++++-
30 files changed, 112 insertions(+), 70 deletions(-)
diff --git a/ghc/tests/typecheck/should_compile/tc056.stderr b/ghc/tests/typecheck/should_compile/tc056.stderr
index 40c11083fcfe..96951924b2f1 100644
--- a/ghc/tests/typecheck/should_compile/tc056.stderr
+++ b/ghc/tests/typecheck/should_compile/tc056.stderr
@@ -1,5 +1,5 @@
-tc056.hs:15:
+tc056.hs:14:
Warning: Duplicate class assertion `Eq' a' in the context:
(Eq' a, Eq' a) => ...
ghc: module version changed to 1; reason: no old .hi file
diff --git a/ghc/tests/typecheck/should_compile/tc059.stderr b/ghc/tests/typecheck/should_compile/tc059.stderr
index 5372979e590f..07f7f5b12fd8 100644
--- a/ghc/tests/typecheck/should_compile/tc059.stderr
+++ b/ghc/tests/typecheck/should_compile/tc059.stderr
@@ -1,8 +1,8 @@
ghc: module version changed to 1; reason: no old .hi file
-__export ShouldSucceed Eq2{foo deq} f;
+__export ShouldSucceed Eq2{deq foo} f;
instance {Eq2 PrelBase.Int} = zdfEq2Int;
instance __forall [a] => {Eq2 a} -> {Eq2 [a]} = zdfEq2ZMZN;
-1 class Eq2 a where {foo :: a -> a; deq :: a -> a -> PrelBase.Bool} ;
+1 class Eq2 a where {deq :: a -> a -> PrelBase.Bool; foo :: a -> a} ;
1 f :: __forall [t] => {PrelNum.Num t} -> {Eq2 [t]} -> [t] -> PrelBase.Bool ;
1 zdfEq2Int :: {Eq2 PrelBase.Int} ;
1 zdfEq2ZMZN :: __forall [a] => {Eq2 a} -> {Eq2 [a]} ;
diff --git a/ghc/tests/typecheck/should_compile/tc079.stderr b/ghc/tests/typecheck/should_compile/tc079.stderr
index 8131c36ee6be..0d1506ce9b86 100644
--- a/ghc/tests/typecheck/should_compile/tc079.stderr
+++ b/ghc/tests/typecheck/should_compile/tc079.stderr
@@ -1,8 +1,8 @@
ghc: module version changed to 1; reason: no old .hi file
-__export ShouldSucceed Foo{op2 op1};
+__export ShouldSucceed Foo{op1 op2};
instance {Foo PrelBase.Int} = zdfFooInt;
instance __forall [a] => {Foo a} -> {Foo [a]} = zdfFooZMZN;
-1 class Foo a where {op2 = :: __forall [b] => {PrelBase.Ord b} -> a -> b -> b -> b; op1 = :: a -> PrelBase.Bool} ;
+1 class Foo a where {op1 = :: a -> PrelBase.Bool; op2 = :: __forall [b] => {PrelBase.Ord b} -> a -> b -> b -> b} ;
1 zddmop1 :: __forall [a] => {Foo a} -> a -> PrelBase.Bool ;
1 zddmop2 :: __forall [a] => {Foo a} -> (__forall [b] => {PrelBase.Ord b} -> a -> b -> b -> b) ;
1 zdfFooInt :: {Foo PrelBase.Int} ;
diff --git a/ghc/tests/typecheck/should_compile/tc080.stderr b/ghc/tests/typecheck/should_compile/tc080.stderr
index cf380c8dbec3..03bc0724afd9 100644
--- a/ghc/tests/typecheck/should_compile/tc080.stderr
+++ b/ghc/tests/typecheck/should_compile/tc080.stderr
@@ -1,10 +1,10 @@
ghc: module version changed to 1; reason: no old .hi file
-__export ShouldSucceed Parse{forced parse parseType parseLine parseFile} charToInt lineszq seperatedBy spanzq strToInt whiteSpace;
+__export ShouldSucceed Parse{parseFile parseLine parseType parse forced} charToInt lineszq seperatedBy spanzq strToInt whiteSpace;
instance {Parse PrelBase.Char} = zdfParseChar;
instance {Parse PrelBase.Int} = zdfParseInt;
instance __forall [a] => {Parse a} -> {Parse [a]} = zdfParseZMZN;
1 charToInt :: PrelBase.Char -> PrelBase.Int ;
-1 class Parse a where {forced = :: a -> PrelBase.Bool; parse = :: PrelBase.String -> (a, PrelBase.String); parseType :: PrelBase.String -> (a, PrelBase.String); parseLine = :: PrelBase.String -> a; parseFile = :: PrelBase.String -> [a]} ;
+1 class Parse a where {parseFile = :: PrelBase.String -> [a]; parseLine = :: PrelBase.String -> a; parseType :: PrelBase.String -> (a, PrelBase.String); parse = :: PrelBase.String -> (a, PrelBase.String); forced = :: a -> PrelBase.Bool} ;
1 lineszq :: [PrelBase.Char] -> [[PrelBase.Char]] ;
1 seperatedBy :: PrelBase.Char -> PrelBase.String -> [PrelBase.String] ;
1 spanzq :: __forall [a] => (a -> PrelBase.Bool) -> [a] -> ([a], [a]) ;
diff --git a/ghc/tests/typecheck/should_compile/tc085.stderr b/ghc/tests/typecheck/should_compile/tc085.stderr
index 0f001c9bf614..39d4dc64b568 100644
--- a/ghc/tests/typecheck/should_compile/tc085.stderr
+++ b/ghc/tests/typecheck/should_compile/tc085.stderr
@@ -1,6 +1,6 @@
ghc: module version changed to 1; reason: no old .hi file
-__export IOExts IOArray IORef boundsIOArray freeHaskellFunctionPtr freezzeIOArray newIOArray newIORef performGC readIOArray readIORef thawIOArray trace unsafeFreezzeIOArray unsafePtrEq unsafeThawIOArray writeIOArray writeIORef;
-__export PrelGHC Addrzh All Arrayzh ByteArrayzh CCallable CReturnable Charzh Doublezh Floatzh ForeignObjzh Int64zh Intzh MVarzh MutVarzh MutableArrayzh MutableByteArrayzh RealWorld StableNamezh StablePtrzh Statezh ThreadIdzh Weakzh Word64zh Wordzh ZLzmzgZR acosDoublezh acosFloatzh addIntCzh addr2Integerzh addr2Intzh andzh asinDoublezh asinFloatzh assert atanDoublezh atanFloatzh catchzh chrzh cmpIntegerIntzh cmpIntegerzh cosDoublezh cosFloatzh coshDoublezh coshFloatzh dataToTagzh deRefStablePtrzh deRefWeakzh decodeDoublezh decodeFloatzh delayzh divideFloatzh double2Floatzh double2Intzh eqAddrzh eqCharzh eqFloatzh eqStableNamezh eqStablePtrzh eqWordzh expDoublezh expFloatzh finalizzeWeakzh float2Doublezh float2Intzh forkzh geAddrzh geCharzh geFloatzh geWordzh getTagzh gtAddrzh gtCharzh gtFloatzh gtWordzh iShiftLzh iShiftRAzh iShiftRLzh indexAddrArrayzh indexAddrOffAddrzh indexAddrOffForeignObjzh indexArrayzh indexCharArrayzh indexCharOffAddrzh indexCharOffForeignObjzh indexDoubleArrayzh indexDoubleOffAddrzh indexDoubleOffForeignObjzh indexFloatArrayzh indexFloatOffAddrzh indexFloatOffForeignObjzh indexInt64Arrayzh indexInt64OffAddrzh indexInt64OffForeignObjzh indexIntArrayzh indexIntOffAddrzh indexIntOffForeignObjzh indexStablePtrArrayzh indexStablePtrOffAddrzh indexStablePtrOffForeignObjzh indexWord64Arrayzh indexWord64OffAddrzh indexWord64OffForeignObjzh indexWordArrayzh indexWordOffAddrzh indexWordOffForeignObjzh int2Addrzh int2Doublezh int2Floatzh int2Integerzh int2Wordzh int64ToIntegerzh integer2Intzh integer2Wordzh integerToInt64zh integerToWord64zh isEmptyMVarzh killThreadzh leAddrzh leCharzh leFloatzh leWordzh logDoublezh logFloatzh ltAddrzh ltCharzh ltFloatzh ltWordzh makeForeignObjzh makeStableNamezh makeStablePtrzh minusFloatzh minusIntegerzh mkWeakzh mulIntCzh myThreadIdzh neAddrzh neCharzh neFloatzh neWordzh negateDoublezh negateFloatzh negateIntzh newAddrArrayzh newArrayzh newCharArrayzh newDoubleArrayzh newFloatArrayzh newIntArrayzh newMVarzh newMutVarzh newStablePtrArrayzh newWordArrayzh notzh ordzh orzh parAtAbszh parAtForNowzh parAtRelzh parAtzh parGlobalzh parLocalzh parzh plusFloatzh plusIntegerzh powerFloatzh putMVarzh quotIntzh quotRemIntegerzh quotWordzh raisezh readAddrArrayzh readArrayzh readCharArrayzh readDoubleArrayzh readFloatArrayzh readInt64Arrayzh readIntArrayzh readMutVarzh readStablePtrArrayzh readWord64Arrayzh readWordArrayzh realWorldzh reallyUnsafePtrEqualityzh remIntzh remWordzh sameMVarzh sameMutVarzh sameMutableArrayzh sameMutableByteArrayzh seqzh shiftLzh shiftRLzh sinDoublezh sinFloatzh sinhDoublezh sinhFloatzh sizzeofByteArrayzh sizzeofMutableByteArrayzh sqrtDoublezh sqrtFloatzh stableNameToIntzh subIntCzh tagToEnumzh takeMVarzh tanDoublezh tanFloatzh tanhDoublezh tanhFloatzh timesFloatzh timesIntegerzh unsafeCoercezh unsafeFreezzeArrayzh unsafeFreezzeByteArrayzh unsafeThawArrayzh unsafeThawByteArrayzh waitReadzh waitWritezh word2Integerzh word2Intzh word64ToIntegerzh writeAddrArrayzh writeAddrOffAddrzh writeArrayzh writeCharArrayzh writeCharOffAddrzh writeDoubleArrayzh writeDoubleOffAddrzh writeFloatArrayzh writeFloatOffAddrzh writeForeignObjOffAddrzh writeForeignObjzh writeInt64Arrayzh writeInt64OffAddrzh writeIntArrayzh writeIntOffAddrzh writeMutVarzh writeStablePtrArrayzh writeStablePtrOffAddrzh writeWord64Arrayzh writeWord64OffAddrzh writeWordArrayzh writeWordOffAddrzh xorzh yieldzh zezezh zezezhzh zgzezh zgzezhzh zgzh zgzhzh zlzezh zlzezhzh zlzh zlzhzh zmzh zmzhzh zpzh zpzhzh zszezh zszezhzh zszh zszhzh ztzh ztzhzh ztztzhzh;
+__export IOExts IOArray IORef boundsIOArray freeHaskellFunctionPtr freezzeIOArray mkWeakIORef newIOArray newIORef performGC readIOArray readIORef thawIOArray trace unsafeFreezzeIOArray unsafePtrEq unsafeThawIOArray writeIOArray writeIORef;
+__export PrelGHC Addrzh All Arrayzh ByteArrayzh CCallable CReturnable Charzh Doublezh Floatzh ForeignObjzh Int64zh Intzh MVarzh MutVarzh MutableArrayzh MutableByteArrayzh RealWorld StableNamezh StablePtrzh Statezh ThreadIdzh Weakzh Word64zh Wordzh ZLzmzgZR acosDoublezh acosFloatzh addIntCzh addr2Integerzh addr2Intzh andzh asinDoublezh asinFloatzh assert atanDoublezh atanFloatzh catchzh chrzh cmpIntegerIntzh cmpIntegerzh cosDoublezh cosFloatzh coshDoublezh coshFloatzh dataToTagzh deRefStablePtrzh deRefWeakzh decodeDoublezh decodeFloatzh delayzh divideFloatzh double2Floatzh double2Intzh eqAddrzh eqCharzh eqFloatzh eqStableNamezh eqStablePtrzh eqWordzh expDoublezh expFloatzh finalizzeWeakzh float2Doublezh float2Intzh forkzh gcdIntegerzh geAddrzh geCharzh geFloatzh geWordzh getTagzh gtAddrzh gtCharzh gtFloatzh gtWordzh iShiftLzh iShiftRAzh iShiftRLzh indexAddrArrayzh indexAddrOffAddrzh indexAddrOffForeignObjzh indexArrayzh indexCharArrayzh indexCharOffAddrzh indexCharOffForeignObjzh indexDoubleArrayzh indexDoubleOffAddrzh indexDoubleOffForeignObjzh indexFloatArrayzh indexFloatOffAddrzh indexFloatOffForeignObjzh indexInt64Arrayzh indexInt64OffAddrzh indexInt64OffForeignObjzh indexIntArrayzh indexIntOffAddrzh indexIntOffForeignObjzh indexStablePtrArrayzh indexStablePtrOffAddrzh indexStablePtrOffForeignObjzh indexWord64Arrayzh indexWord64OffAddrzh indexWord64OffForeignObjzh indexWordArrayzh indexWordOffAddrzh indexWordOffForeignObjzh int2Addrzh int2Doublezh int2Floatzh int2Integerzh int2Wordzh int64ToIntegerzh integer2Intzh integer2Wordzh integerToInt64zh integerToWord64zh isEmptyMVarzh killThreadzh leAddrzh leCharzh leFloatzh leWordzh logDoublezh logFloatzh ltAddrzh ltCharzh ltFloatzh ltWordzh makeForeignObjzh makeStableNamezh makeStablePtrzh minusFloatzh minusIntegerzh mkWeakzh mulIntCzh myThreadIdzh neAddrzh neCharzh neFloatzh neWordzh negateDoublezh negateFloatzh negateIntzh newAddrArrayzh newArrayzh newCharArrayzh newDoubleArrayzh newFloatArrayzh newIntArrayzh newMVarzh newMutVarzh newStablePtrArrayzh newWordArrayzh notzh ordzh orzh parAtAbszh parAtForNowzh parAtRelzh parAtzh parGlobalzh parLocalzh parzh plusFloatzh plusIntegerzh powerFloatzh putMVarzh quotIntzh quotRemIntegerzh quotWordzh raisezh readAddrArrayzh readArrayzh readCharArrayzh readDoubleArrayzh readFloatArrayzh readInt64Arrayzh readIntArrayzh readMutVarzh readStablePtrArrayzh readWord64Arrayzh readWordArrayzh realWorldzh reallyUnsafePtrEqualityzh remIntzh remWordzh sameMVarzh sameMutVarzh sameMutableArrayzh sameMutableByteArrayzh seqzh shiftLzh shiftRLzh sinDoublezh sinFloatzh sinhDoublezh sinhFloatzh sizzeofByteArrayzh sizzeofMutableByteArrayzh sqrtDoublezh sqrtFloatzh stableNameToIntzh subIntCzh tagToEnumzh takeMVarzh tanDoublezh tanFloatzh tanhDoublezh tanhFloatzh timesFloatzh timesIntegerzh unsafeCoercezh unsafeFreezzeArrayzh unsafeFreezzeByteArrayzh unsafeThawArrayzh unsafeThawByteArrayzh waitReadzh waitWritezh word2Integerzh word2Intzh word64ToIntegerzh writeAddrArrayzh writeAddrOffAddrzh writeArrayzh writeCharArrayzh writeCharOffAddrzh writeDoubleArrayzh writeDoubleOffAddrzh writeFloatArrayzh writeFloatOffAddrzh writeForeignObjOffAddrzh writeForeignObjzh writeInt64Arrayzh writeInt64OffAddrzh writeIntArrayzh writeIntOffAddrzh writeMutVarzh writeStablePtrArrayzh writeStablePtrOffAddrzh writeWord64Arrayzh writeWord64OffAddrzh writeWordArrayzh writeWordOffAddrzh xorzh yieldzh zezezh zezezhzh zgzezh zgzezhzh zgzh zgzhzh zlzezh zlzezhzh zlzh zlzhzh zmzh zmzhzh zpzh zpzhzh zszezh zszezhzh zszh zszhzh ztzh ztzhzh ztztzhzh;
__export PrelHandle IOModeEx{BinaryMode TextMode} hConnectTo hGetEcho hIsTerminalDevice hSetEcho openFileEx;
__export PrelIOBase fixIO unsafeInterleaveIO unsafePerformIO;
1 data FooData = FooData ;
diff --git a/ghc/tests/typecheck/should_compile/tc086.stderr b/ghc/tests/typecheck/should_compile/tc086.stderr
index 1d306c0e21c3..b948554094e4 100644
--- a/ghc/tests/typecheck/should_compile/tc086.stderr
+++ b/ghc/tests/typecheck/should_compile/tc086.stderr
@@ -1,6 +1,6 @@
ghc: module version changed to 1; reason: no old .hi file
__export ShouldSucceed Group Ring;
-1 class Group a where {one = :: a; zzero = :: a; zm :: a -> a -> a; zp :: a -> a -> a; fromInteger :: PrelBase.Integer -> a; compare :: a -> a -> PrelBase.Ordering} ;
+1 class Group a where {compare :: a -> a -> PrelBase.Ordering; fromInteger :: PrelBase.Integer -> a; zp :: a -> a -> a; zm :: a -> a -> a; zzero = :: a; one = :: a} ;
1 class {Group a} => Ring a where {zt = :: a -> a -> a} ;
1 zddmone :: __forall [a] => {Group a} -> a ;
1 zddmzt :: __forall [a] => {Ring a} -> a -> a -> a ;
diff --git a/ghc/tests/typecheck/should_compile/tc087.stderr b/ghc/tests/typecheck/should_compile/tc087.stderr
index 09f4679a5dcd..94c8a1f9d214 100644
--- a/ghc/tests/typecheck/should_compile/tc087.stderr
+++ b/ghc/tests/typecheck/should_compile/tc087.stderr
@@ -1,7 +1,7 @@
ghc: module version changed to 1; reason: no old .hi file
-__export ShouldSucceed PriorityQueue{splitMin meld insert single empty} SeqView{Null Cons} check insertMany out pqSort toOrderedList;
+__export ShouldSucceed PriorityQueue{empty single insert meld splitMin} SeqView{Null Cons} check insertMany out pqSort toOrderedList;
1 check :: __forall [q :: (* -> *)] => {PriorityQueue q} -> (__forall [a] => {PrelBase.Ord a} -> q a) -> PrelIOBase.IO PrelBase.Z0T ;
-1 class PriorityQueue q :: (* -> *) where {splitMin :: __forall [a] => {PrelBase.Ord a} -> q a -> SeqView q a; meld :: __forall [a] => {PrelBase.Ord a} -> q a -> q a -> q a; insert = :: __forall [a] => {PrelBase.Ord a} -> a -> q a -> q a; single :: __forall [a] => {PrelBase.Ord a} -> a -> q a; empty :: __forall [a] => {PrelBase.Ord a} -> q a} ;
+1 class PriorityQueue q :: (* -> *) where {empty :: __forall [a] => {PrelBase.Ord a} -> q a; single :: __forall [a] => {PrelBase.Ord a} -> a -> q a; insert = :: __forall [a] => {PrelBase.Ord a} -> a -> q a -> q a; meld :: __forall [a] => {PrelBase.Ord a} -> q a -> q a -> q a; splitMin :: __forall [a] => {PrelBase.Ord a} -> q a -> SeqView q a} ;
1 data SeqView t :: (* -> *) a = Null | Cons a (t a) ;
1 insertMany :: __forall [q :: (* -> *) a] => {PrelBase.Ord a} -> {PriorityQueue q} -> [a] -> q a -> q a ;
1 out :: __forall [a] => {PrelNum.Num a} -> [a] -> PrelIOBase.IO PrelBase.Z0T ;
diff --git a/ghc/tests/typecheck/should_compile/tc095.stderr b/ghc/tests/typecheck/should_compile/tc095.stderr
index db90d1a324fa..df8377a7d6b7 100644
--- a/ghc/tests/typecheck/should_compile/tc095.stderr
+++ b/ghc/tests/typecheck/should_compile/tc095.stderr
@@ -2,12 +2,12 @@ NOTE: Simplifier still going after 4 iterations; bailing out.
ghc: module version changed to 1; reason: no old .hi file
__export ShouldSucceed HappyAbsSyn{HappyTerminal HappyErrorToken HappyAbsSyn1 HappyAbsSyn2 HappyAbsSyn3} HappyState{HappyState} Token{TokenInt TokenVar TokenEq} action_0 action_1 action_2 action_3 action_4 action_5 action_6 happyAccept happyError happyFail happyGoto happyMonadReduce happyNewToken happyParse happyReduce happyReduce_1 happyReduce_2 happyReduce_3 happyReturn happyShift happySpecReduce_0 happySpecReduce_1 happySpecReduce_2 happySpecReduce_3 happyThen main myparser notHappyAtAll;
instance {PrelShow.Show Token} = zdfShowToken;
-1 action_0 :: __forall [t t1] => {PrelNum.Num t} -> t -> PrelBase.Int -> Token -> HappyState Token ([HappyAbsSyn (t1 -> PrelBase.Double) [(PrelBase.String, t1 -> PrelBase.Int)] (t1 -> PrelBase.Int)] -> [Token] -> t1 -> PrelBase.Double) -> [HappyState Token ([HappyAbsSyn (t1 -> PrelBase.Double) [(PrelBase.String, t1 -> PrelBase.Int)] (t1 -> PrelBase.Int)] -> [Token] -> t1 -> PrelBase.Double)] -> [HappyAbsSyn (t1 -> PrelBase.Double) [(PrelBase.String, t1 -> PrelBase.Int)] (t1 -> PrelBase.Int)] -> [Token] -> t1 -> PrelBase.Double ;
+1 action_0 :: __forall [t t1] => {PrelNum.Num t} -> t -> PrelBase.Int -> Token -> HappyState Token ([HappyAbsSyn (t1 -> PrelBase.Double) [([PrelBase.Char], t1 -> PrelBase.Int)] (t1 -> PrelBase.Int)] -> [Token] -> t1 -> PrelBase.Double) -> [HappyState Token ([HappyAbsSyn (t1 -> PrelBase.Double) [([PrelBase.Char], t1 -> PrelBase.Int)] (t1 -> PrelBase.Int)] -> [Token] -> t1 -> PrelBase.Double)] -> [HappyAbsSyn (t1 -> PrelBase.Double) [([PrelBase.Char], t1 -> PrelBase.Int)] (t1 -> PrelBase.Int)] -> [Token] -> t1 -> PrelBase.Double ;
1 action_1 :: __forall [t t1 t2 t3 b] => {PrelNum.Num t} -> t -> PrelBase.Int -> b -> HappyState b ([HappyAbsSyn t1 t2 t3] -> [Token] -> t1) -> [HappyState b ([HappyAbsSyn t1 t2 t3] -> [Token] -> t1)] -> [HappyAbsSyn t1 t2 t3] -> [Token] -> t1 ;
1 action_2 :: __forall [t t1 b t2 t3 t4 t5 t31] => t -> PrelBase.Int -> b -> t2 -> [HappyState b ([HappyAbsSyn (t3 -> PrelBase.Double) [(t4, t3 -> t5)] t31] -> t1)] -> [HappyAbsSyn (t3 -> PrelBase.Double) [(t4, t3 -> t5)] t31] -> t1 ;
-1 action_3 :: __forall [t t1 t11 a] => {PrelNum.Num t} -> t -> PrelBase.Int -> Token -> HappyState Token ([HappyAbsSyn t1 [(PrelBase.String, t11 -> PrelBase.Int)] (t11 -> PrelBase.Int)] -> [Token] -> a) -> [HappyState Token ([HappyAbsSyn t1 [(PrelBase.String, t11 -> PrelBase.Int)] (t11 -> PrelBase.Int)] -> [Token] -> a)] -> [HappyAbsSyn t1 [(PrelBase.String, t11 -> PrelBase.Int)] (t11 -> PrelBase.Int)] -> [Token] -> a ;
-1 action_4 :: __forall [t t1 t11 a] => {PrelNum.Num t} -> t -> PrelBase.Int -> Token -> HappyState Token ([HappyAbsSyn t1 [(PrelBase.String, t11 -> PrelBase.Int)] (t11 -> PrelBase.Int)] -> [Token] -> a) -> [HappyState Token ([HappyAbsSyn t1 [(PrelBase.String, t11 -> PrelBase.Int)] (t11 -> PrelBase.Int)] -> [Token] -> a)] -> [HappyAbsSyn t1 [(PrelBase.String, t11 -> PrelBase.Int)] (t11 -> PrelBase.Int)] -> [Token] -> a ;
-1 action_5 :: __forall [t t1 b t2 t11 t3] => t -> PrelBase.Int -> b -> t2 -> [HappyState b ([HappyAbsSyn t11 [(PrelBase.String, t3)] t3] -> t1)] -> [HappyAbsSyn t11 [(PrelBase.String, t3)] t3] -> t1 ;
+1 action_3 :: __forall [t t1 t11 a] => {PrelNum.Num t} -> t -> PrelBase.Int -> Token -> HappyState Token ([HappyAbsSyn t1 [([PrelBase.Char], t11 -> PrelBase.Int)] (t11 -> PrelBase.Int)] -> [Token] -> a) -> [HappyState Token ([HappyAbsSyn t1 [([PrelBase.Char], t11 -> PrelBase.Int)] (t11 -> PrelBase.Int)] -> [Token] -> a)] -> [HappyAbsSyn t1 [([PrelBase.Char], t11 -> PrelBase.Int)] (t11 -> PrelBase.Int)] -> [Token] -> a ;
+1 action_4 :: __forall [t t1 t11 a] => {PrelNum.Num t} -> t -> PrelBase.Int -> Token -> HappyState Token ([HappyAbsSyn t1 [([PrelBase.Char], t11 -> PrelBase.Int)] (t11 -> PrelBase.Int)] -> [Token] -> a) -> [HappyState Token ([HappyAbsSyn t1 [([PrelBase.Char], t11 -> PrelBase.Int)] (t11 -> PrelBase.Int)] -> [Token] -> a)] -> [HappyAbsSyn t1 [([PrelBase.Char], t11 -> PrelBase.Int)] (t11 -> PrelBase.Int)] -> [Token] -> a ;
+1 action_5 :: __forall [t t1 b t2 t11 t3] => t -> PrelBase.Int -> b -> t2 -> [HappyState b ([HappyAbsSyn t11 [([PrelBase.Char], t3)] t3] -> t1)] -> [HappyAbsSyn t11 [([PrelBase.Char], t3)] t3] -> t1 ;
1 action_6 :: __forall [t t1 b t2 t11 t21 t3] => t -> PrelBase.Int -> b -> t2 -> [HappyState b ([HappyAbsSyn t11 t21 (t3 -> PrelBase.Int)] -> t1)] -> [HappyAbsSyn t11 t21 (t3 -> PrelBase.Int)] -> t1 ;
1 data HappyAbsSyn t1 t2 t3 = HappyTerminal Token | HappyErrorToken PrelBase.Int | HappyAbsSyn1 t1 | HappyAbsSyn2 t2 | HappyAbsSyn3 t3 ;
1 newtype HappyState b c = HappyState (PrelBase.Int -> PrelBase.Int -> b -> HappyState b c -> [HappyState b c] -> c) ;
@@ -16,12 +16,12 @@ instance {PrelShow.Show Token} = zdfShowToken;
1 happyError :: __forall [a] => [Token] -> a ;
1 happyFail :: __forall [a b t1 t2 t3] => PrelBase.Int -> b -> HappyState b ([HappyAbsSyn t1 t2 t3] -> [Token] -> a) -> [HappyState b ([HappyAbsSyn t1 t2 t3] -> [Token] -> a)] -> [HappyAbsSyn t1 t2 t3] -> [Token] -> a ;
1 happyGoto :: __forall [t b c] => (PrelBase.Int -> PrelBase.Int -> b -> HappyState b c -> [HappyState b c] -> c) -> PrelBase.Int -> b -> t -> [HappyState b c] -> c ;
-1 happyMonadReduce :: __forall [a b b1 t] => PrelBase.Int -> PrelBase.Int -> (t -> b) -> ([b] -> t) -> PrelBase.Int -> b1 -> HappyState b1 ([b] -> [Token] -> a) -> [HappyState b1 ([b] -> [Token] -> a)] -> [b] -> [Token] -> a ;
+1 happyMonadReduce :: __forall [a b b1 t] => PrelBase.Int -> PrelBase.Int -> (t -> b1) -> ([b1] -> t) -> PrelBase.Int -> b -> HappyState b ([b1] -> [Token] -> a) -> [HappyState b ([b1] -> [Token] -> a)] -> [b1] -> [Token] -> a ;
1 happyNewToken :: __forall [t t1] => (PrelBase.Int -> PrelBase.Int -> Token -> HappyState Token (t -> [Token] -> t1) -> [HappyState Token (t -> [Token] -> t1)] -> t -> [Token] -> t1) -> [HappyState Token (t -> [Token] -> t1)] -> t -> [Token] -> t1 ;
1 happyParse :: __forall [t] => [Token] -> t -> PrelBase.Double ;
1 happyReduce :: __forall [t b t1] => PrelBase.Int -> PrelBase.Int -> (t1 -> t1) -> PrelBase.Int -> b -> HappyState b (t1 -> t) -> [HappyState b (t1 -> t)] -> t1 -> t ;
1 happyReduce_1 :: __forall [t b t1 t2 t3 t4 t31] => PrelBase.Int -> b -> t1 -> [HappyState b ([HappyAbsSyn (t3 -> PrelBase.Double) [(t2, t3 -> t4)] t31] -> t)] -> [HappyAbsSyn (t3 -> PrelBase.Double) [(t2, t3 -> t4)] t31] -> t ;
-1 happyReduce_2 :: __forall [t b t1 t11 t3] => PrelBase.Int -> b -> t1 -> [HappyState b ([HappyAbsSyn t11 [(PrelBase.String, t3)] t3] -> t)] -> [HappyAbsSyn t11 [(PrelBase.String, t3)] t3] -> t ;
+1 happyReduce_2 :: __forall [t b t1 t11 t3] => PrelBase.Int -> b -> t1 -> [HappyState b ([HappyAbsSyn t11 [([PrelBase.Char], t3)] t3] -> t)] -> [HappyAbsSyn t11 [([PrelBase.Char], t3)] t3] -> t ;
1 happyReduce_3 :: __forall [t b t1 t11 t2 t21] => PrelBase.Int -> b -> t1 -> [HappyState b ([HappyAbsSyn t11 t2 (t21 -> PrelBase.Int)] -> t)] -> [HappyAbsSyn t11 t2 (t21 -> PrelBase.Int)] -> t ;
1 happyReturn :: __forall [t t1] => t -> t1 -> t ;
1 happyShift :: __forall [t t1 t2 t3 t11] => {PrelNum.Num t} -> (PrelBase.Int -> PrelBase.Int -> Token -> HappyState Token ([HappyAbsSyn t1 t2 t3] -> [Token] -> t11) -> [HappyState Token ([HappyAbsSyn t1 t2 t3] -> [Token] -> t11)] -> [HappyAbsSyn t1 t2 t3] -> [Token] -> t11) -> t -> Token -> HappyState Token ([HappyAbsSyn t1 t2 t3] -> [Token] -> t11) -> [HappyState Token ([HappyAbsSyn t1 t2 t3] -> [Token] -> t11)] -> [HappyAbsSyn t1 t2 t3] -> [Token] -> t11 ;
diff --git a/ghc/tests/typecheck/should_compile/tc097.stderr b/ghc/tests/typecheck/should_compile/tc097.stderr
index ab820aa98ecb..a1fa0597066f 100644
--- a/ghc/tests/typecheck/should_compile/tc097.stderr
+++ b/ghc/tests/typecheck/should_compile/tc097.stderr
@@ -1,4 +1,4 @@
ghc: module version changed to 1; reason: no old .hi file
__export ShouldSucceed Monad2{MkMonad2} halfListMonad;
-1 data Monad2 m :: (* -> *) = MkMonad2 (__forall [a] => a -> m a) (__forall [a b] => m a -> (a -> m b) -> m b) ;
-1 halfListMonad :: (__forall [a b] => [a] -> (a -> [b]) -> [b]) -> Monad2 PrelBase.ZMZN ;
+1 data Monad2 m :: (* -> *) = MkMonad2 (__forall [a] => a -> m a) (__forall [b a] => m a -> (a -> m b) -> m b) ;
+1 halfListMonad :: (__forall [b a] => [a] -> (a -> [b]) -> [b]) -> Monad2 PrelBase.ZMZN ;
diff --git a/ghc/tests/typecheck/should_fail/tcfail023.stderr b/ghc/tests/typecheck/should_fail/tcfail023.stderr
index 241484f4f8f3..180a70278114 100644
--- a/ghc/tests/typecheck/should_fail/tcfail023.stderr
+++ b/ghc/tests/typecheck/should_fail/tcfail023.stderr
@@ -1,7 +1,7 @@
tcfail023.hs:1:
Duplicate or overlapping instance declarations
- for `A B' at tcfail023.hs:13 and tcfail023.hs:10
+ for `A B' defined at tcfail023.hs:13 and defined at tcfail023.hs:10
tcfail023.hs:11:
Couldn't match `B' against `Bool'
diff --git a/ghc/tests/typecheck/should_fail/tcfail030.stderr b/ghc/tests/typecheck/should_fail/tcfail030.stderr
index 040dde3621ee..908c1e0ce4fc 100644
--- a/ghc/tests/typecheck/should_fail/tcfail030.stderr
+++ b/ghc/tests/typecheck/should_fail/tcfail030.stderr
@@ -1,5 +1,5 @@
-tcfail030.hs:2: Variable not in scope: `Main.main'
+tcfail030.hs:3: Variable not in scope: `Main.main'
Compilation had errors
diff --git a/ghc/tests/typecheck/should_fail/tcfail035.stderr b/ghc/tests/typecheck/should_fail/tcfail035.stderr
index 894d84e12e33..da6d72fc0787 100644
--- a/ghc/tests/typecheck/should_fail/tcfail035.stderr
+++ b/ghc/tests/typecheck/should_fail/tcfail035.stderr
@@ -41,7 +41,8 @@ tcfail035.hs:7:
tcfail035.hs:3:
Duplicate or overlapping instance declarations
- for `Num NUM' at tcfail035.hs:7 and tcfail035.hs:6
+ for `Num NUM'
+ defined at tcfail035.hs:7 and defined at 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 e6fed8556ced..482401b99150 100644
--- a/ghc/tests/typecheck/should_fail/tcfail036.stderr
+++ b/ghc/tests/typecheck/should_fail/tcfail036.stderr
@@ -37,7 +37,8 @@ tcfail036.hs:8:
tcfail036.hs:3:
Duplicate or overlapping instance declarations
- for `Num NUM' at tcfail036.hs:8 and tcfail036.hs:6
+ for `Num NUM'
+ defined at tcfail036.hs:8 and defined at tcfail036.hs:6
tcfail036.hs:8:
No instance for `Show NUM'
diff --git a/ghc/tests/typecheck/should_fail/tcfail038.stderr b/ghc/tests/typecheck/should_fail/tcfail038.stderr
index b31ade5dcab4..9354e05cbf52 100644
--- a/ghc/tests/typecheck/should_fail/tcfail038.stderr
+++ b/ghc/tests/typecheck/should_fail/tcfail038.stderr
@@ -1,9 +1,9 @@
-tcfail038.hs:7:
+tcfail038.hs:9:
Conflicting definitions for `=='
in the bindings in an instance declaration
-tcfail038.hs:8:
+tcfail038.hs:10:
Conflicting definitions for `/='
in the bindings in an instance declaration
diff --git a/ghc/tests/typecheck/should_fail/tcfail042.stderr b/ghc/tests/typecheck/should_fail/tcfail042.stderr
index da5c6b1e6bb1..11126bed8bff 100644
--- a/ghc/tests/typecheck/should_fail/tcfail042.stderr
+++ b/ghc/tests/typecheck/should_fail/tcfail042.stderr
@@ -1,7 +1,7 @@
-tcfail042.hs:18:
+tcfail042.hs:15:
Could not deduce `Num a'
- (arising from an instance declaration at tcfail042.hs:18)
+ (arising from an instance declaration at tcfail042.hs:15)
from the context: (Eq a, Show a)
Probable cause: missing `Num a' in instance declaration context
When checking the superclasses of an instance declaration
diff --git a/ghc/tests/typecheck/should_fail/tcfail044.stderr b/ghc/tests/typecheck/should_fail/tcfail044.stderr
index 0fe6b349bdde..a477db2fd0c3 100644
--- a/ghc/tests/typecheck/should_fail/tcfail044.stderr
+++ b/ghc/tests/typecheck/should_fail/tcfail044.stderr
@@ -1,10 +1,10 @@
-tcfail044.hs:12:
- Warning: No explicit method nor default method for `signum'
+tcfail044.hs:8:
+ Warning: No explicit method nor default method for `abs'
in an instance declaration for `Num'
-tcfail044.hs:12:
- Warning: No explicit method nor default method for `abs'
+tcfail044.hs:8:
+ Warning: No explicit method nor default method for `signum'
in an instance declaration for `Num'
tcfail044.hs:5:
@@ -12,7 +12,7 @@ tcfail044.hs:5:
(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:12:
+tcfail044.hs:8:
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)
diff --git a/ghc/tests/typecheck/should_fail/tcfail047.stderr b/ghc/tests/typecheck/should_fail/tcfail047.stderr
index d9b4692171b9..75d7aaeedac0 100644
--- a/ghc/tests/typecheck/should_fail/tcfail047.stderr
+++ b/ghc/tests/typecheck/should_fail/tcfail047.stderr
@@ -1,5 +1,5 @@
-tcfail047.hs:7:
+tcfail047.hs:6:
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)
diff --git a/ghc/tests/typecheck/should_fail/tcfail048.stderr b/ghc/tests/typecheck/should_fail/tcfail048.stderr
index 11f833d06df3..8d2f11f2b9b7 100644
--- a/ghc/tests/typecheck/should_fail/tcfail048.stderr
+++ b/ghc/tests/typecheck/should_fail/tcfail048.stderr
@@ -1,5 +1,5 @@
-tcfail048.hs:4: Type constructor or class not in scope: `B'
+tcfail048.hs:3: Type constructor or class 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 668c158ec2db..dcef5e25182e 100644
--- a/ghc/tests/typecheck/should_fail/tcfail051.stderr
+++ b/ghc/tests/typecheck/should_fail/tcfail051.stderr
@@ -1,5 +1,5 @@
-tcfail051.hs:4: Type constructor or class not in scope: `B'
+tcfail051.hs:3: Type constructor or class not in scope: `B'
tcfail051.hs:4: Variable not in scope: `op1'
diff --git a/ghc/tests/typecheck/should_fail/tcfail052.stderr b/ghc/tests/typecheck/should_fail/tcfail052.stderr
index cf01d153c9af..a4a1d08fbee8 100644
--- a/ghc/tests/typecheck/should_fail/tcfail052.stderr
+++ b/ghc/tests/typecheck/should_fail/tcfail052.stderr
@@ -1,5 +1,5 @@
-tcfail052.hs:4: Type variable not in scope: `c'
+tcfail052.hs:3: 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 327beefd31c4..7824eda8300c 100644
--- a/ghc/tests/typecheck/should_fail/tcfail053.stderr
+++ b/ghc/tests/typecheck/should_fail/tcfail053.stderr
@@ -1,5 +1,5 @@
-tcfail053.hs:4: Type constructor or class not in scope: `A'
+tcfail053.hs:3: Type constructor or class not in scope: `A'
Compilation had errors
diff --git a/ghc/tests/typecheck/should_fail/tcfail056.stderr b/ghc/tests/typecheck/should_fail/tcfail056.stderr
index 457aed54da7d..5904ec5a3757 100644
--- a/ghc/tests/typecheck/should_fail/tcfail056.stderr
+++ b/ghc/tests/typecheck/should_fail/tcfail056.stderr
@@ -1,7 +1,8 @@
tcfail056.hs:1:
Duplicate or overlapping instance declarations
- for `Eq Foo' at tcfail056.hs:6 and tcfail056.hs:10
+ for `Eq Foo'
+ defined at tcfail056.hs:8 and defined at tcfail056.hs:5
tcfail056.hs:10: Class `Eq' does not have a method `<='
diff --git a/ghc/tests/typecheck/should_fail/tcfail063.stderr b/ghc/tests/typecheck/should_fail/tcfail063.stderr
index fff632e139b8..eef4b88cbbf6 100644
--- a/ghc/tests/typecheck/should_fail/tcfail063.stderr
+++ b/ghc/tests/typecheck/should_fail/tcfail063.stderr
@@ -1 +1,4 @@
-tcfail063.hs:5:1: is_context_format: type missing after class name on input: "moby"
+tcfail063.hs:4: Illegal class assertion
+
+Compilation had errors
+
diff --git a/ghc/tests/typecheck/should_fail/tcfail065.stderr b/ghc/tests/typecheck/should_fail/tcfail065.stderr
index 2b7b343ceda9..41d80bd3c098 100644
--- a/ghc/tests/typecheck/should_fail/tcfail065.stderr
+++ b/ghc/tests/typecheck/should_fail/tcfail065.stderr
@@ -1,11 +1,9 @@
-tcfail065.hs:29:
+tcfail065.hs:28:
Inferred type is less polymorphic than expected
Quantified type variable `x' escapes
It unifies with `x1', which is mentioned in the environment
-** SLPJ: I HATE THE 'unifies with' PART **
The following variables in the environment mention `x1'
-** AND NOTHING MENTIONED! **
When checking the type signature
setX :: forall x2. x2 -> X x1 -> X x1
In the definition for method `setX'
diff --git a/ghc/tests/typecheck/should_fail/tcfail067.stderr b/ghc/tests/typecheck/should_fail/tcfail067.stderr
index 8cfe0b1d582b..2fc16546903b 100644
--- a/ghc/tests/typecheck/should_fail/tcfail067.stderr
+++ b/ghc/tests/typecheck/should_fail/tcfail067.stderr
@@ -1,15 +1,24 @@
-tcfail067.hs:65:
- Warning: No explicit method nor default method for `signum'
+tcfail067.hs:60:
+ 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'
+tcfail067.hs:60:
+ Warning: No explicit method nor default method for `signum'
in an instance declaration for `Num'
-tcfail067.hs:65:
+tcfail067.hs:60:
+ Could not deduce `Show (SubRange a)'
+ (arising from an instance declaration at tcfail067.hs:60)
+ from the context: (Num a)
+ Probable cause: missing `Show (SubRange a)'
+ in instance declaration context
+ or missing instance declaration for `Show (SubRange a)'
+ When checking the superclasses of an instance declaration
+
+tcfail067.hs:61:
Could not deduce `Ord a'
- (arising from use of `SubRange' at tcfail067.hs:65)
+ (arising from use of `numSubRangeNegate' at tcfail067.hs:61)
from the context: (Num (SubRange a),
Num a,
Eq (SubRange a),
@@ -19,15 +28,6 @@ tcfail067.hs:65:
Probable cause: missing `Ord a' in instance declaration context
When checking the methods of an instance declaration
-tcfail067.hs:65:
- Could not deduce `Show (SubRange a)'
- (arising from an instance declaration at tcfail067.hs:65)
- from the context: (Num a)
- Probable cause: missing `Show (SubRange a)'
- in instance declaration context
- or missing instance declaration for `Show (SubRange a)'
- When checking the superclasses of an instance declaration
-
tcfail067.hs:74:
Could not deduce `Ord a'
(arising from use of `SubRange' at tcfail067.hs:74)
diff --git a/ghc/tests/typecheck/should_fail/tcfail068.stderr b/ghc/tests/typecheck/should_fail/tcfail068.stderr
index ccd2fab361e2..320443211d54 100644
--- a/ghc/tests/typecheck/should_fail/tcfail068.stderr
+++ b/ghc/tests/typecheck/should_fail/tcfail068.stderr
@@ -1,5 +1,5 @@
-tcfail068.hs:12:
+tcfail068.hs:13:
Inferred type is less polymorphic than expected
Quantified type variable `s' escapes
It unifies with `s1', which is mentioned in the environment
@@ -9,7 +9,7 @@ tcfail068.hs:12:
In the right-hand side of an equation for `itgen':
runST (newArray ((1, 1), n) x)
-tcfail068.hs:17:
+tcfail068.hs:18:
Inferred type is less polymorphic than expected
Quantified type variable `s' escapes
It unifies with `s1', which is mentioned in the environment
@@ -29,8 +29,8 @@ tcfail068.hs:24:
It unifies with `s1', which is mentioned in the environment
The following variables in the environment mention `s1'
arr :: IndTree s1 a
- itrap' :: Int -> Int -> ST s1 (IndTree s1 a)
- itrapsnd :: Int -> Int -> ST s1 (IndTree s1 a)
+ itrapsnd :: Int -> Int -> ST s1 (MutableArray s1 (Int, Int) a)
+ itrap' :: Int -> Int -> ST s1 (MutableArray s1 (Int, Int) a)
In an expression with expected type: forall s2. ST s2 a1
In the first argument of `runST', namely `(itrap' i k)'
In the right-hand side of an equation for `itrap':
@@ -42,8 +42,14 @@ tcfail068.hs:36:
It unifies with `s1', which is mentioned in the environment
The following variables in the environment mention `s1'
arr :: IndTree s1 b
- itrapstate' :: Int -> Int -> c -> ST s1 (c, IndTree s1 b)
- itrapstatesnd :: Int -> Int -> c -> ST s1 (c, IndTree s1 b)
+ itrapstatesnd :: Int
+ -> Int
+ -> c
+ -> ST s1 (c, MutableArray s1 (Int, Int) b)
+ itrapstate' :: Int
+ -> Int
+ -> c
+ -> ST s1 (c, MutableArray s1 (Int, Int) b)
In an expression with expected type: forall s2. ST s2 a
In the first argument of `runST', namely `(itrapstate' i k s)'
In the right-hand side of an equation for `itrapstate':
diff --git a/ghc/tests/typecheck/should_fail/tcfail071.stderr b/ghc/tests/typecheck/should_fail/tcfail071.stderr
index 3f711e9c4959..7b6f4489da7b 100644
--- a/ghc/tests/typecheck/should_fail/tcfail071.stderr
+++ b/ghc/tests/typecheck/should_fail/tcfail071.stderr
@@ -1,7 +1,7 @@
-tcfail071.hs:8:
+tcfail071.hs:5:
Mismatched contexts
- When matching the contexts of the signatures for `f' and `g'
+ When matching the contexts of the signatures for `g' and `f'
(the signature contexts in a mutually recursive group should all be identical)
tcfail071.hs:10:
diff --git a/ghc/tests/typecheck/should_fail/tcfail073.stderr b/ghc/tests/typecheck/should_fail/tcfail073.stderr
index 90c9b23df230..b4d0a9868a57 100644
--- a/ghc/tests/typecheck/should_fail/tcfail073.stderr
+++ b/ghc/tests/typecheck/should_fail/tcfail073.stderr
@@ -1,7 +1,8 @@
tcfail073.hs:3:
Duplicate or overlapping instance declarations
- for `Eq (a, b)' at PrelTup.hi:5 and tcfail073.hs:8
+ for `Eq (a, b)'
+ imported from module `PrelTup' and defined at tcfail073.hs:7
tcfail073.hs:8:
Could not deduce `Eq a'
diff --git a/ghc/tests/typecheck/should_fail/tcfail075.hs b/ghc/tests/typecheck/should_fail/tcfail075.hs
index dc898107c57d..98447d4d31b7 100644
--- a/ghc/tests/typecheck/should_fail/tcfail075.hs
+++ b/ghc/tests/typecheck/should_fail/tcfail075.hs
@@ -1,9 +1,11 @@
--- !! Test top-level unboxed types
-
{-# OPTIONS -fglasgow-exts #-}
+-- !!! Test top-level unboxed types
+
module ShouldFail where
+import PrelGHC
+
x = 1#
y :: Int#
diff --git a/ghc/tests/typecheck/should_fail/tcfail075.stderr b/ghc/tests/typecheck/should_fail/tcfail075.stderr
index 986d5d7c87d5..3417c3ab87eb 100644
--- a/ghc/tests/typecheck/should_fail/tcfail075.stderr
+++ b/ghc/tests/typecheck/should_fail/tcfail075.stderr
@@ -1 +1,30 @@
-tcfail075.hs:9:1: parse error on input: "y"
+
+tcfail075.hs:5:
+ Top-level bindings for unlifted types aren't allowed x = 1#
+
+tcfail075.hs:12:
+ Couldn't match `#' against `*'
+ Expected kind: #
+ Inferred kind: *
+ When matching types `Int#' and `t'
+ Expected type: Int#
+ Inferred type: t
+
+tcfail075.hs:15:
+ Couldn't match `#' against `*'
+ Expected kind: #
+ Inferred kind: *
+ When matching types `Int#' and `t'
+ Expected type: Int#
+ Inferred type: t
+
+tcfail075.hs:17:
+ Couldn't match `#' against `*'
+ Expected kind: #
+ Inferred kind: *
+ When matching types `Int#' and `t'
+ Expected type: Int#
+ Inferred type: t
+
+Compilation had errors
+
--
GitLab