From 584d954c53359db8a83e6582e742167a957f7437 Mon Sep 17 00:00:00 2001 From: simonmar Date: Tue, 12 Dec 2000 17:21:43 +0000 Subject: [PATCH] [project @ 2000-12-12 17:21:40 by simonmar] Take a pass over the tests, get most things working again. Mostly -package lang changes, and synching up of the expected output. This was a good exercise though: I found at least two real bugs in the process :) --- ghc/tests/array/should_run/Makefile | 7 +- ghc/tests/array/should_run/arr014.hs | 2 - ghc/tests/ccall/should_compile/Makefile | 6 +- ghc/tests/ccall/should_fail/Makefile | 2 +- ghc/tests/ccall/should_fail/cc001.stderr | 6 +- ghc/tests/ccall/should_fail/cc002.stderr | 5 +- ghc/tests/ccall/should_fail/cc004.stderr | 13 +- ghc/tests/ccall/should_fail/cc005.stderr | 3 - ghc/tests/ccall/should_run/Makefile | 4 +- ghc/tests/codeGen/should_run/Makefile | 16 +-- ghc/tests/deSugar/should_compile/Makefile | 4 +- ghc/tests/deSugar/should_compile/ds040.stderr | 2 +- ghc/tests/deriving/should_fail/drvfail001.stderr | 8 +- ghc/tests/deriving/should_fail/drvfail004.stderr | 6 +- ghc/tests/deriving/should_fail/drvfail007.stderr | 8 +- ghc/tests/io/should_run/Makefile | 9 +- ghc/tests/io/should_run/io018.stdout | 44 +++++- ghc/tests/io/should_run/io033.stdout | 150 ++++++++++++++++++++ ghc/tests/lib/should_run/Makefile | 33 +++-- ghc/tests/lib/should_run/char001.stdout | 4 +- ghc/tests/lib/should_run/dynamic002.hs | 1 - ghc/tests/lib/should_run/dynamic002.stdout | 1 - ghc/tests/lib/should_run/enum01.hs | 9 +- ghc/tests/lib/should_run/enum01.stdout | 12 +- ghc/tests/lib/should_run/enum02.hs | 9 +- ghc/tests/lib/should_run/enum03.hs | 11 +- ghc/tests/lib/should_run/exceptions001.hs | 5 +- ghc/tests/lib/should_run/exceptions001.stdout | 6 +- ghc/tests/lib/should_run/ioexts001.hs | 2 - ghc/tests/numeric/should_run/Makefile | 12 +- ghc/tests/reader/should_compile/read014.stderr | 2 +- ghc/tests/reader/should_compile/read023.hs | 5 +- ghc/tests/reader/should_compile/read027.hs | 4 +- ghc/tests/reader/should_fail/read001.stderr | 5 +- ghc/tests/reader/should_fail/read001.stdout | 12 +- ghc/tests/reader/should_fail/read003.stderr | 3 - ghc/tests/reader/should_fail/read004.stderr | 3 - ghc/tests/reader/should_fail/read005.stderr | 3 - ghc/tests/reader/should_fail/read006.stderr | 3 - ghc/tests/reader/should_fail/read007.stderr | 3 - ghc/tests/reader/should_fail/read008.stderr | 3 - ghc/tests/reader/should_fail/read009.stderr | 3 - ghc/tests/reader/should_fail/read011.stderr | 3 - ghc/tests/reader/should_fail/read012.stderr | 3 - ghc/tests/reader/should_fail/read013.stderr | 3 - ghc/tests/reader/should_fail/read014.stderr | 3 - ghc/tests/rename/should_compile/Rn016.hi | 9 -- ghc/tests/rename/should_compile/rn016.hs | 7 - ghc/tests/simplCore/should_compile/Makefile | 2 + ghc/tests/simplCore/should_compile/Simpl006Help.hs | 2 - ghc/tests/typecheck/should_compile/Makefile | 4 +- ghc/tests/typecheck/should_compile/tc042.stderr | 19 +-- ghc/tests/typecheck/should_compile/tc056.stderr | 10 -- ghc/tests/typecheck/should_compile/tc095.stderr | 35 +---- ghc/tests/typecheck/should_compile/tc108.stderr | 5 +- ghc/tests/typecheck/should_compile/tc109.hs | 2 +- ghc/tests/typecheck/should_compile/tc109.stderr | 4 + ghc/tests/typecheck/should_fail/Digraph.stderr | 3 - ghc/tests/typecheck/should_fail/Makefile | 8 +- ghc/tests/typecheck/should_fail/tcfail001.stderr | 3 - ghc/tests/typecheck/should_fail/tcfail002.stderr | 3 - ghc/tests/typecheck/should_fail/tcfail003.stderr | 3 - ghc/tests/typecheck/should_fail/tcfail004.stderr | 3 - ghc/tests/typecheck/should_fail/tcfail005.stderr | 3 - ghc/tests/typecheck/should_fail/tcfail006.stderr | 3 - ghc/tests/typecheck/should_fail/tcfail007.stderr | 5 +- ghc/tests/typecheck/should_fail/tcfail008.stderr | 11 +- ghc/tests/typecheck/should_fail/tcfail009.stderr | 3 - ghc/tests/typecheck/should_fail/tcfail010.stderr | 6 +- ghc/tests/typecheck/should_fail/tcfail011.stderr | 3 - ghc/tests/typecheck/should_fail/tcfail012.stderr | 3 - ghc/tests/typecheck/should_fail/tcfail013.stderr | 3 - ghc/tests/typecheck/should_fail/tcfail014.stderr | 3 - ghc/tests/typecheck/should_fail/tcfail015.stderr | 3 - ghc/tests/typecheck/should_fail/tcfail016.stderr | 5 +- ghc/tests/typecheck/should_fail/tcfail017.stderr | 10 +- ghc/tests/typecheck/should_fail/tcfail018.stderr | 3 - ghc/tests/typecheck/should_fail/tcfail019.stderr | 17 ++- ghc/tests/typecheck/should_fail/tcfail020.stderr | 10 +- ghc/tests/typecheck/should_fail/tcfail021.stderr | 3 - ghc/tests/typecheck/should_fail/tcfail023.stderr | 9 +- ghc/tests/typecheck/should_fail/tcfail027.stderr | 10 +- ghc/tests/typecheck/should_fail/tcfail028.stderr | 11 +- ghc/tests/typecheck/should_fail/tcfail029.stderr | 3 - ghc/tests/typecheck/should_fail/tcfail030.stderr | 5 +- ghc/tests/typecheck/should_fail/tcfail031.stderr | 3 - ghc/tests/typecheck/should_fail/tcfail032.stderr | 3 - ghc/tests/typecheck/should_fail/tcfail033.stderr | 3 - ghc/tests/typecheck/should_fail/tcfail034.stderr | 10 +- ghc/tests/typecheck/should_fail/tcfail035.stderr | 10 +- ghc/tests/typecheck/should_fail/tcfail036.stderr | 12 +- ghc/tests/typecheck/should_fail/tcfail037.stderr | 7 +- ghc/tests/typecheck/should_fail/tcfail038.stderr | 3 - ghc/tests/typecheck/should_fail/tcfail039.stderr | 7 +- ghc/tests/typecheck/should_fail/tcfail040.stderr | 7 +- ghc/tests/typecheck/should_fail/tcfail042.stderr | 8 +- ghc/tests/typecheck/should_fail/tcfail043.stderr | 13 -- ghc/tests/typecheck/should_fail/tcfail044.stderr | 3 - ghc/tests/typecheck/should_fail/tcfail045.stderr | 3 - ghc/tests/typecheck/should_fail/tcfail046.stderr | 8 +- ghc/tests/typecheck/should_fail/tcfail047.stderr | 3 - ghc/tests/typecheck/should_fail/tcfail048.stderr | 3 - ghc/tests/typecheck/should_fail/tcfail049.stderr | 3 - ghc/tests/typecheck/should_fail/tcfail050.stderr | 3 - ghc/tests/typecheck/should_fail/tcfail051.stderr | 3 - ghc/tests/typecheck/should_fail/tcfail052.stderr | 3 - ghc/tests/typecheck/should_fail/tcfail053.stderr | 3 - ghc/tests/typecheck/should_fail/tcfail054.stderr | 3 - ghc/tests/typecheck/should_fail/tcfail055.stderr | 3 - ghc/tests/typecheck/should_fail/tcfail056.stderr | 12 +- ghc/tests/typecheck/should_fail/tcfail057.stderr | 7 +- ghc/tests/typecheck/should_fail/tcfail058.stderr | 6 +- ghc/tests/typecheck/should_fail/tcfail062.stderr | 11 +- ghc/tests/typecheck/should_fail/tcfail063.stderr | 3 - ghc/tests/typecheck/should_fail/tcfail065.stderr | 9 +- ghc/tests/typecheck/should_fail/tcfail067.stderr | 31 ++-- ghc/tests/typecheck/should_fail/tcfail068.stderr | 11 +- ghc/tests/typecheck/should_fail/tcfail069.stderr | 3 - ghc/tests/typecheck/should_fail/tcfail070.stderr | 3 - ghc/tests/typecheck/should_fail/tcfail071.stderr | 3 - ghc/tests/typecheck/should_fail/tcfail072.stderr | 3 - ghc/tests/typecheck/should_fail/tcfail073.stderr | 16 +-- ghc/tests/typecheck/should_fail/tcfail075.stderr | 15 +- ghc/tests/typecheck/should_fail/tcfail076.stderr | 11 +- ghc/tests/typecheck/should_fail/tcfail077.stderr | 3 - ghc/tests/typecheck/should_fail/tcfail078.stderr | 6 +- ghc/tests/typecheck/should_fail/tcfail079.stderr | 10 +- ghc/tests/typecheck/should_fail/tcfail080.stderr | 3 - ghc/tests/typecheck/should_fail/tcfail081.stderr | 12 +- ghc/tests/typecheck/should_fail/tcfail082.stderr | 12 +- ghc/tests/typecheck/should_fail/tcfail083.stderr | 3 - ghc/tests/typecheck/should_fail/tcfail084.stderr | 5 +- ghc/tests/typecheck/should_fail/tcfail085.stderr | 5 +- ghc/tests/typecheck/should_fail/tcfail086.stderr | 8 +- ghc/tests/typecheck/should_fail/tcfail087.stderr | 5 +- ghc/tests/typecheck/should_fail/tcfail088.stderr | 3 - 136 files changed, 427 insertions(+), 634 deletions(-) delete mode 100644 ghc/tests/rename/should_compile/Rn016.hi delete mode 100644 ghc/tests/rename/should_compile/rn016.hs diff --git a/ghc/tests/array/should_run/Makefile b/ghc/tests/array/should_run/Makefile index 08c5852..97c7295 100644 --- a/ghc/tests/array/should_run/Makefile +++ b/ghc/tests/array/should_run/Makefile @@ -1,10 +1,13 @@ +# ----------------------------------------------------------------------------- +# $Id: Makefile,v 1.4 2000/12/12 17:21:40 simonmar Exp $ + TOP = ../.. include $(TOP)/mk/boilerplate.mk include $(TOP)/mk/should_run.mk SRC_HC_OPTS += -dcore-lint -arr014_HC_OPTS = -fglasgow-exts +arr014_HC_OPTS = -package lang arr003_RUNTEST_OPTS = -x 1 arr004_RUNTEST_OPTS = -x 1 @@ -12,6 +15,6 @@ arr007_RUNTEST_OPTS = -x 1 arr008_RUNTEST_OPTS = -x 1 # mkdependHS doesn't understand OPTIONS pragmas... -SRC_MKDEPENDHS_OPTS += -fglasgow-exts +SRC_MKDEPENDHS_OPTS += -package lang include $(TOP)/mk/target.mk diff --git a/ghc/tests/array/should_run/arr014.hs b/ghc/tests/array/should_run/arr014.hs index 78ba8be..919736c 100644 --- a/ghc/tests/array/should_run/arr014.hs +++ b/ghc/tests/array/should_run/arr014.hs @@ -1,5 +1,3 @@ -{-# OPTIONS -fglasgow-exts #-} - -- !!! multi-dimensional arrays module Main ( main ) where diff --git a/ghc/tests/ccall/should_compile/Makefile b/ghc/tests/ccall/should_compile/Makefile index 829e80e..4496c95 100644 --- a/ghc/tests/ccall/should_compile/Makefile +++ b/ghc/tests/ccall/should_compile/Makefile @@ -1,8 +1,12 @@ +# ----------------------------------------------------------------------------- +# $Id: Makefile,v 1.12 2000/12/12 17:21:40 simonmar Exp $ + TOP = ../.. +HCOnly = YES include $(TOP)/mk/boilerplate.mk include $(TOP)/mk/should_compile.mk -SRC_HC_OPTS += -dcore-lint -fglasgow-exts +SRC_HC_OPTS += -dcore-lint -fglasgow-exts -package lang # Note that these tests are still in a state of flux... don't believe errors # they report. In fact, these aren't really very good tests at all... diff --git a/ghc/tests/ccall/should_fail/Makefile b/ghc/tests/ccall/should_fail/Makefile index ac50886..0a6773c 100644 --- a/ghc/tests/ccall/should_fail/Makefile +++ b/ghc/tests/ccall/should_fail/Makefile @@ -2,6 +2,6 @@ TOP = ../.. include $(TOP)/mk/boilerplate.mk include $(TOP)/mk/should_fail.mk -SRC_HC_OPTS += -fglasgow-exts +SRC_HC_OPTS += -fglasgow-exts -package lang include $(TOP)/mk/target.mk diff --git a/ghc/tests/ccall/should_fail/cc001.stderr b/ghc/tests/ccall/should_fail/cc001.stderr index 51c8f3a..bb0cdfa 100644 --- a/ghc/tests/ccall/should_fail/cc001.stderr +++ b/ghc/tests/ccall/should_fail/cc001.stderr @@ -1,9 +1,7 @@ cc001.hs:5: - Ambiguous type variable(s) `t' in the constraint `CCallable t' + Ambiguous type variable(s) `t' + in the constraint `PrelGHC.CCallable t' arising from an argument in the _ccall_ to `foo', namely `(undefined ())' at cc001.hs:5 In the right-hand side of an equation for `f': _ccall_ foo (undefined ()) - -Compilation had errors - diff --git a/ghc/tests/ccall/should_fail/cc002.stderr b/ghc/tests/ccall/should_fail/cc002.stderr index 3b4b7fe..cc2fd26 100644 --- a/ghc/tests/ccall/should_fail/cc002.stderr +++ b/ghc/tests/ccall/should_fail/cc002.stderr @@ -1,8 +1,5 @@ cc002.hs:10: - No instance for `CReturnable ForeignObj' + No instance for `PrelGHC.CReturnable ForeignObj' arising from the result of the _ccall_ to `a' at cc002.hs:10 In the right-hand side of an equation for `a': _ccall_ a - -Compilation had errors - diff --git a/ghc/tests/ccall/should_fail/cc004.stderr b/ghc/tests/ccall/should_fail/cc004.stderr index 4aa80df..30df2fb 100644 --- a/ghc/tests/ccall/should_fail/cc004.stderr +++ b/ghc/tests/ccall/should_fail/cc004.stderr @@ -1,11 +1,6 @@ -cc004.hs:2: - Cannot generalise these overloadings (in a _ccall_): - `CReturnable b' arising from the result of the _ccall_ to `f' at cc004.hs:8 - -cc004.hs:2: - Cannot generalise these overloadings (in a _ccall_): - `CReturnable t_aMc' arising from the result of the _ccall_ to `f' at cc004.hs:15 - -Compilation had errors +Cannot generalise these overloadings (in a _ccall_): + `PrelGHC.CReturnable a' arising from the result of the _ccall_ to `f' at cc004.hs:8 +Cannot generalise these overloadings (in a _ccall_): + `PrelGHC.CReturnable a' arising from the result of the _ccall_ to `f' at cc004.hs:15 diff --git a/ghc/tests/ccall/should_fail/cc005.stderr b/ghc/tests/ccall/should_fail/cc005.stderr index 7c5c548..a8ca42b 100644 --- a/ghc/tests/ccall/should_fail/cc005.stderr +++ b/ghc/tests/ccall/should_fail/cc005.stderr @@ -8,6 +8,3 @@ cc005.hs:10: Unacceptable result type in foreign declaration: Int# When checking declaration: foreign export _ccall "bar" bar :: Int -> Int# - -Compilation had errors - diff --git a/ghc/tests/ccall/should_run/Makefile b/ghc/tests/ccall/should_run/Makefile index 72bc938..d6c76fc 100644 --- a/ghc/tests/ccall/should_run/Makefile +++ b/ghc/tests/ccall/should_run/Makefile @@ -1,11 +1,11 @@ #----------------------------------------------------------------------------- -# $Id: Makefile,v 1.5 2000/06/12 17:01:57 panne Exp $ +# $Id: Makefile,v 1.6 2000/12/12 17:21:40 simonmar Exp $ TOP = ../.. include $(TOP)/mk/boilerplate.mk include $(TOP)/mk/should_run.mk -SRC_HC_OPTS += -dcore-lint -fglasgow-exts +SRC_HC_OPTS += -dcore-lint -fglasgow-exts -package lang callback_HC_OPTS += -fvia-C diff --git a/ghc/tests/codeGen/should_run/Makefile b/ghc/tests/codeGen/should_run/Makefile index d9b7a9f..893a21a 100644 --- a/ghc/tests/codeGen/should_run/Makefile +++ b/ghc/tests/codeGen/should_run/Makefile @@ -1,5 +1,5 @@ #----------------------------------------------------------------------------- -# $Id: Makefile,v 1.15 2000/11/03 16:23:37 simonmar Exp $ +# $Id: Makefile,v 1.16 2000/12/12 17:21:40 simonmar Exp $ TOP = ../.. include $(TOP)/mk/boilerplate.mk @@ -18,16 +18,16 @@ SRC_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 -fvia-C -cg029_HC_OPTS = -fglasgow-exts -cg030_HC_OPTS = -fglasgow-exts +cg025_HC_OPTS = -package lang +cg026_HC_OPTS = -package lang -fglasgow-exts -fvia-C +cg029_HC_OPTS = -package lang -fglasgow-exts +cg030_HC_OPTS = -package lang -fglasgow-exts cg031_HC_OPTS = -fglasgow-exts cg032_HC_OPTS = -fglasgow-exts cg033_HC_OPTS = -fglasgow-exts -cg035_HC_OPTS = -fglasgow-exts -cg042_HC_OPTS = -fglasgow-exts -cg044_HC_OPTS = -fglasgow-exts +cg035_HC_OPTS = -package lang -fglasgow-exts +cg042_HC_OPTS = -package lang -fglasgow-exts +cg044_HC_OPTS = -package lang cg016_RUNTEST_OPTS = -x 1 # should override the -x 0 above. cg021_RUNTEST_OPTS = +RTS -K2m diff --git a/ghc/tests/deSugar/should_compile/Makefile b/ghc/tests/deSugar/should_compile/Makefile index eaeae14..7ca54f7 100644 --- a/ghc/tests/deSugar/should_compile/Makefile +++ b/ghc/tests/deSugar/should_compile/Makefile @@ -4,9 +4,9 @@ include $(TOP)/mk/should_compile.mk SRC_HC_OPTS += -dcore-lint -ds035_HC_OPTS = -fglasgow-exts +ds035_HC_OPTS = -fglasgow-exts -package lang ds046_HC_OPTS = -O -funbox-strict-fields -ds049_HC_OPTS = -fvia-C +ds049_HC_OPTS = -fvia-C -package lang ds050_HC_OPTS = -fglasgow-exts # mkdependHS doesn't understand OPTIONS pragmas... diff --git a/ghc/tests/deSugar/should_compile/ds040.stderr b/ghc/tests/deSugar/should_compile/ds040.stderr index 0a7bb3f..533d6eb 100644 --- a/ghc/tests/deSugar/should_compile/ds040.stderr +++ b/ghc/tests/deSugar/should_compile/ds040.stderr @@ -1,3 +1,3 @@ -ds040.hs:7: Pattern match(es) are overlapped in the definition of function `^^^^': +ds040.hs:9: Pattern match(es) are overlapped in the definition of function `^^^^': ^^^^ _ _ = ... diff --git a/ghc/tests/deriving/should_fail/drvfail001.stderr b/ghc/tests/deriving/should_fail/drvfail001.stderr index 887f7cd..4fe0f76 100644 --- a/ghc/tests/deriving/should_fail/drvfail001.stderr +++ b/ghc/tests/deriving/should_fail/drvfail001.stderr @@ -1,7 +1,3 @@ -drvfail001.hs:11: - No instance for `Show (f (f a))' - When deriving classes for `SM' - -Compilation had errors - +No instance for `Show (f a)' +When deriving classes for `Cons' diff --git a/ghc/tests/deriving/should_fail/drvfail004.stderr b/ghc/tests/deriving/should_fail/drvfail004.stderr index 4010f99..b32730c 100644 --- a/ghc/tests/deriving/should_fail/drvfail004.stderr +++ b/ghc/tests/deriving/should_fail/drvfail004.stderr @@ -1,11 +1,7 @@ drvfail004.hs:5: - Could not deduce `Eq (Foo a b)' - from the context (Ord a1, Ord b1) + Could not deduce `Eq (Foo a b)' from the context (Ord a, Ord b) Probable fix: Add `Eq (Foo a b)' to the instance declaration context Or add an instance declaration for `Eq (Foo a b)' arising from an instance declaration at drvfail004.hs:5 - -Compilation had errors - diff --git a/ghc/tests/deriving/should_fail/drvfail007.stderr b/ghc/tests/deriving/should_fail/drvfail007.stderr index ae4b9bf..303d631 100644 --- a/ghc/tests/deriving/should_fail/drvfail007.stderr +++ b/ghc/tests/deriving/should_fail/drvfail007.stderr @@ -1,7 +1,3 @@ -drvfail007.hs:2: - No instance for `Eq (Int -> Int)' - When deriving classes for `Foo' - -Compilation had errors - +No instance for `Eq (Int -> Int)' +When deriving classes for `Foo' diff --git a/ghc/tests/io/should_run/Makefile b/ghc/tests/io/should_run/Makefile index 4e19bcf..74eb4c3 100644 --- a/ghc/tests/io/should_run/Makefile +++ b/ghc/tests/io/should_run/Makefile @@ -10,12 +10,11 @@ endif include $(TOP)/mk/should_run.mk SRC_HC_OPTS += -dcore-lint -io022_HC_OPTS += -fglasgow-exts io010_HC_OPTS += -fglasgow-exts -io011_HC_OPTS += -fglasgow-exts -io018_HC_OPTS += -fglasgow-exts -io030_HC_OPTS += -fglasgow-exts -io032_HC_OPTS += -fglasgow-exts +io011_HC_OPTS += -fglasgow-exts -package lang +io018_HC_OPTS += -fglasgow-exts -package lang +io022_HC_OPTS += -fglasgow-exts -package lang +io032_HC_OPTS += -fglasgow-exts -package lang io004_RUNTEST_OPTS += -x 42 io016_RUNTEST_OPTS += io016.hs io016.out diff --git a/ghc/tests/io/should_run/io018.stdout b/ghc/tests/io/should_run/io018.stdout index 18c9dbc..281e7ac 100644 --- a/ghc/tests/io/should_run/io018.stdout +++ b/ghc/tests/io/should_run/io018.stdout @@ -1,6 +1,46 @@ Smoewnst pa ihyu Caught EOF -Smoewnst pa ihyu +S-m-o e!w!n Caught EOF -Smoewnst pa ihyu +S-m-o e!w!n!s tT epsat iinhgy uR!s tT epsat iinhgy uRW handles +module Main(main) where + +import IO +import IOExts +import Directory (removeFile, doesFileExist) +import Monad + +-- This test is weird, full marks to whoever dreamt it up! + +main :: IO () +main = do + let username = "io018.inout" + f <- doesFileExist username + when f (removeFile username) + cd <- openFile username ReadWriteMode + hSetBinaryMode cd True + hSetBuffering stdin NoBuffering + hSetBuffering stdout NoBuffering + hSetBuffering cd NoBuffering + hPutStr cd speakString + hSeek cd AbsoluteSeek 0 + speak cd `catch` \ err -> if isEOFError err then putStrLn "\nCaught EOF" else ioError err + hSeek cd AbsoluteSeek 0 + hSetBuffering cd LineBuffering + speak cd `catch` \ err -> if isEOFError err then putStrLn "\nCaught EOF" else ioError err + hSeek cd AbsoluteSeek 0 + hSetBuffering cd (BlockBuffering Nothing) + speak cd `catch` \ err -> if isEOFError err then putStrLn "\nCaught EOF" else ioError err + +speakString = "Someone wants to speak with you\n" + +speak cd = do + (do + ready <- hReady cd + if ready then + hGetChar cd >>= putChar + else + return () + ready <- hReady stdin + if ready then (do { ch <- ge Caught EOF diff --git a/ghc/tests/io/should_run/io033.stdout b/ghc/tests/io/should_run/io033.stdout index 806cc80..ec04732 100644 --- a/ghc/tests/io/should_run/io033.stdout +++ b/ghc/tests/io/should_run/io033.stdout @@ -48,3 +48,153 @@ ok ok ok ok +ok +ok +ok +ok +ok +ok +ok +ok +ok +ok +ok +ok +ok +ok +ok +ok +ok +ok +ok +ok +ok +ok +ok +ok +ok +ok +ok +ok +ok +ok +ok +ok +ok +ok +ok +ok +ok +ok +ok +ok +ok +ok +ok +ok +ok +ok +ok +ok +ok +ok +ok +ok +ok +ok +ok +ok +ok +ok +ok +ok +ok +ok +ok +ok +ok +ok +ok +ok +ok +ok +ok +ok +ok +ok +ok +ok +ok +ok +ok +ok +ok +ok +ok +ok +ok +ok +ok +ok +ok +ok +ok +ok +ok +ok +ok +ok +ok +ok +ok +ok +ok +ok +ok +ok +ok +ok +ok +ok +ok +ok +ok +ok +ok +ok +ok +ok +ok +ok +ok +ok +ok +ok +ok +ok +ok +ok +ok +ok +ok +ok +ok +ok +ok +ok +ok +ok +ok +ok +ok +ok +ok +ok +ok +ok +ok +ok +ok +ok +ok +ok diff --git a/ghc/tests/lib/should_run/Makefile b/ghc/tests/lib/should_run/Makefile index 2a14739..3a49ee3 100644 --- a/ghc/tests/lib/should_run/Makefile +++ b/ghc/tests/lib/should_run/Makefile @@ -1,5 +1,5 @@ #----------------------------------------------------------------------------- -# $Id: Makefile,v 1.24 2000/09/04 15:23:55 simonmar Exp $ +# $Id: Makefile,v 1.25 2000/12/12 17:21:41 simonmar Exp $ TOP = ../.. include $(TOP)/mk/boilerplate.mk @@ -8,30 +8,29 @@ include $(TOP)/mk/should_run.mk SRC_HC_OPTS += -dcore-lint packedstring001_HC_OPTS = -package lang -exceptions001_HC_OPTS = -fglasgow-exts -fno-warn-missing-methods -stableptr001_HC_OPTS = -fglasgow-exts -stableptr002_HC_OPTS = -fglasgow-exts -stableptr003_HC_OPTS = -fglasgow-exts -stableptr004_HC_OPTS = -fglasgow-exts -list001_HC_OPTS = -fglasgow-exts +exceptions001_HC_OPTS = -package lang -fno-warn-missing-methods +stableptr001_HC_OPTS = -package lang +stableptr002_HC_OPTS = -package lang -fglasgow-exts +stableptr003_HC_OPTS = -package lang +stableptr004_HC_OPTS = -package lang +list001_HC_OPTS = -package lang uri001_HC_OPTS = -package lang -package net time001_HC_OPTS = -package lang +io001_HC_OPTS = -package lang +io002_HC_OPTS = -package lang +addr001_HC_OPTS = -package lang -enum01_HC_OPTS = -cpp -fglasgow-exts -H12m -enum02_HC_OPTS = -cpp -fglasgow-exts -H12m -enum03_HC_OPTS = -cpp -fglasgow-exts -H12m +enum01_HC_OPTS = -cpp -package lang -H12m +enum02_HC_OPTS = -cpp -package lang -H12m +enum03_HC_OPTS = -cpp -package lang -H12m stableptr001_RUNTEST_OPTS = +RTS -K4m stableptr004_RUNTEST_OPTS = +RTS -K4m dynamic001_HC_OPTS = -package lang dynamic002_HC_OPTS = -package lang -io001_HC_OPTS = -fglasgow-exts -io002_HC_OPTS = -fglasgow-exts -addr001_HC_OPTS = -fglasgow-exts - -ioexts001_HC_OPTS = -fglasgow-exts -O -ioexts001_RUNTEST_OPTS = +RTS -K8m +ioexts001_HC_OPTS = -package lang -O +ioexts001_RUNTEST_OPTS = +RTS -K16m memo001_HC_OPTS = -package lang -package util # stress the garbage collector a bit, to make sure weak pointers are being @@ -41,7 +40,7 @@ memo001_RUNTEST_OPTS = +RTS -A10k -G1 memo002_HC_OPTS = -package lang -package util memo002_RUNTEST_OPTS = 20 -weak001_HC_OPTS = -fglasgow-exts +weak001_HC_OPTS = -package lang -fglasgow-exts SRC_MKDEPENDHS_OPTS += -package lang diff --git a/ghc/tests/lib/should_run/char001.stdout b/ghc/tests/lib/should_run/char001.stdout index c5d261e..e524ce2 100644 --- a/ghc/tests/lib/should_run/char001.stdout +++ b/ghc/tests/lib/should_run/char001.stdout @@ -3,8 +3,8 @@ lex '\x0f2' = [("'\\x0f2'","")] lex '\xf2' = [("'\\xf2'","")] lex '\xf2t' = [] lex '\X24' = [("'\\x24'","")] -lex '\x24b' = [] -lex '\Xa4b' = [] +lex '\x24b' = [("'\\x24b'","")] +lex '\Xa4b' = [("'\\xa4b'","")] lex '\xa4bg' = [] lex '\o00' = [("'\\o00'","")] lex '\o05' = [("'\\o05'","")] diff --git a/ghc/tests/lib/should_run/dynamic002.hs b/ghc/tests/lib/should_run/dynamic002.hs index 07ff150..cfbf829 100644 --- a/ghc/tests/lib/should_run/dynamic002.hs +++ b/ghc/tests/lib/should_run/dynamic002.hs @@ -47,7 +47,6 @@ main = do print (typeOf (undefined :: Ordering)) print (typeOf (undefined :: Addr)) - print (typeOf (undefined :: AddrOff)) print (typeOf (undefined :: Dynamic)) print (typeOf (undefined :: ForeignObj)) print (typeOf (undefined :: (IORef ()))) diff --git a/ghc/tests/lib/should_run/dynamic002.stdout b/ghc/tests/lib/should_run/dynamic002.stdout index 2fe7d4f..23e3cab 100644 --- a/ghc/tests/lib/should_run/dynamic002.stdout +++ b/ghc/tests/lib/should_run/dynamic002.stdout @@ -19,7 +19,6 @@ IO () Maybe () Ordering Addr -AddrOff Dynamic ForeignObj IORef () diff --git a/ghc/tests/lib/should_run/enum01.hs b/ghc/tests/lib/should_run/enum01.hs index 9254b40..d8a6eda 100644 --- a/ghc/tests/lib/should_run/enum01.hs +++ b/ghc/tests/lib/should_run/enum01.hs @@ -480,14 +480,7 @@ testEnumRatioInt = do -- -mayBomb x = catchAllIO x errorHandler - -errorHandler :: Exception -> IO () -errorHandler e = - case justErrors e of - Just t -> putStrLn ("error " ++ show t) - _ -> return () - +mayBomb x = catchJust errorCalls x (\e -> putStrLn ("error " ++ show e)) test :: Show a => String -> String -> a -> IO () test test_nm expected val = do diff --git a/ghc/tests/lib/should_run/enum01.stdout b/ghc/tests/lib/should_run/enum01.stdout index 4dd0c27..8e5dfc3 100644 --- a/ghc/tests/lib/should_run/enum01.stdout +++ b/ghc/tests/lib/should_run/enum01.stdout @@ -62,13 +62,13 @@ Testing Enum Char: (succ (minBound::Char)) = '\SOH' (succ (maxBound::Char)) = error "Prelude.Enum.Char.succ: bad argument" (pred 'b') = 'a' - pred (maxBound::Char) = '\254' + pred (maxBound::Char) = '\2147483646' pred (minBound::Char) = error "Prelude.Enum.Char.pred: bad argument" - (map (toEnum::Int->Char) [123,ord (minBound::Char), ord(maxBound::Char)]) = "{\NUL\255" + (map (toEnum::Int->Char) [123,ord (minBound::Char), ord(maxBound::Char)]) = "{\NUL\2147483647" (toEnum::Int->Char) (minBound::Int) = error "Prelude.chr: bad argument" - (map fromEnum ['X',minBound,maxBound]) = [88,0,255] + (map fromEnum ['X',minBound,maxBound]) = [88,0,2147483647] (take 7 ['\NUL' .. ]) = "\NUL\SOH\STX\ETX\EOT\ENQ\ACK" - (take 7 ['\250' .. ]) = "\250\251\252\253\254\255" + (take 7 ['\250' .. ]) = "\250\251\252\253\254\255\256" (take 7 ['a','b'..]) = "abcdefg" (take 7 ['a','e'..]) = "aeimquy" (take 7 ['a','a'..]) = "aaaaaaa" @@ -76,7 +76,7 @@ Testing Enum Char: (take 7 ['z','v'..]) = "zvrnjfb" (take 7 ['\1', '\0' ..]) = "\SOH\NUL" (take 7 ['\5', '\4' ..]) = "\ENQ\EOT\ETX\STX\SOH\NUL" - (take 7 ['\250', '\251' ..]) = "\250\251\252\253\254\255" + (take 7 ['\250', '\251' ..]) = "\250\251\252\253\254\255\256" (take 7 (['a' .. 'e'])) = "abcde" (take 4 (['a' .. 'a'])) = "a" (take 7 (['b' .. 'a'])) = "" @@ -90,7 +90,7 @@ Testing Enum Char: (take 7 ['c','b' .. 'c']) = "c" (take 7 ['c','b' .. 'b']) = "cb" (take 7 ['c','d' .. 'b']) = "" - (take 7 ['\251', '\252' .. maxBound]) = "\251\252\253\254\255" + (take 7 ['\251', '\252' .. maxBound]) = "\251\252\253\254\255\256\257" (take 7 ['\5', '\4' .. minBound]) = "\ENQ\EOT\ETX\STX\SOH\NUL" Testing Enum (): (succ ()) = error "Prelude.Enum.().succ: bad argment" diff --git a/ghc/tests/lib/should_run/enum02.hs b/ghc/tests/lib/should_run/enum02.hs index 27be3fd..c04677d 100644 --- a/ghc/tests/lib/should_run/enum02.hs +++ b/ghc/tests/lib/should_run/enum02.hs @@ -258,11 +258,4 @@ testEnumInt64 = do -- -mayBomb x = catchAllIO x errorHandler - -errorHandler :: Exception -> IO () -errorHandler e = - case justErrors e of - Just t -> putStrLn ("error " ++ show t) - _ -> return () - +mayBomb x = catchJust errorCalls x (\e -> putStrLn ("error " ++ show e)) diff --git a/ghc/tests/lib/should_run/enum03.hs b/ghc/tests/lib/should_run/enum03.hs index 5313b0c..0546984 100644 --- a/ghc/tests/lib/should_run/enum03.hs +++ b/ghc/tests/lib/should_run/enum03.hs @@ -40,7 +40,7 @@ testEnumWord8 = do -- [x..] aka enumFrom printTest ((take 7 [(1::Word8)..])) printTest ((take 7 [((maxBound::Word8)-5)..])) -- just in case it doesn't catch the upper bound.. - + -- [x,y..] aka enumFromThen printTest ((take 7 [(1::Word8),2..])) printTest ((take 7 [(1::Word8),7..])) @@ -261,11 +261,4 @@ testEnumWord64 = do -- -mayBomb x = catchAllIO x errorHandler - -errorHandler :: Exception -> IO () -errorHandler e = - case justErrors e of - Just t -> putStrLn ("error " ++ show t) - _ -> return () - +mayBomb x = catchJust errorCalls x (\e -> putStrLn ("error " ++ show e)) diff --git a/ghc/tests/lib/should_run/exceptions001.hs b/ghc/tests/lib/should_run/exceptions001.hs index 3332008..d3c9d15 100644 --- a/ghc/tests/lib/should_run/exceptions001.hs +++ b/ghc/tests/lib/should_run/exceptions001.hs @@ -13,9 +13,8 @@ main = do dynTest ioTest :: IO () -ioTest = catchIO justIoErrors (ioError (userError "wibble")) - (\ex -> if isUserError ex then putStr "io exception caught\n" - else error "help!") +ioTest = catchJust userErrors (ioError (userError "wibble")) + (\ex -> putStr "user exception caught\n") errorTest :: IO () errorTest = tryAll (1 + error "call to 'error'") >>= \r -> diff --git a/ghc/tests/lib/should_run/exceptions001.stdout b/ghc/tests/lib/should_run/exceptions001.stdout index 1c498ad..09c1675 100644 --- a/ghc/tests/lib/should_run/exceptions001.stdout +++ b/ghc/tests/lib/should_run/exceptions001.stdout @@ -1,6 +1,6 @@ -io exception caught +user exception caught error call caught no method error -exceptions001.hs:40: Non-exhaustive patterns in function test1 -exceptions001.hs:47: Non-exhaustive patterns in function test2 +exceptions001.hs:39: Non-exhaustive patterns in function test1 +exceptions001.hs:46: Non-exhaustive patterns in function test2 43 \ No newline at end of file diff --git a/ghc/tests/lib/should_run/ioexts001.hs b/ghc/tests/lib/should_run/ioexts001.hs index b7f87a4..7b9d1b3 100644 --- a/ghc/tests/lib/should_run/ioexts001.hs +++ b/ghc/tests/lib/should_run/ioexts001.hs @@ -8,5 +8,3 @@ loop r 0 = return () loop r c = loop r (c-1) >> writeIORef r 42 main = newIORef 0 >>= \r -> loop r 1000000 >> putStrLn "done" - - diff --git a/ghc/tests/numeric/should_run/Makefile b/ghc/tests/numeric/should_run/Makefile index cb30478..eee8085 100644 --- a/ghc/tests/numeric/should_run/Makefile +++ b/ghc/tests/numeric/should_run/Makefile @@ -1,16 +1,16 @@ #----------------------------------------------------------------------------- -# $Id: Makefile,v 1.7 2000/06/12 17:01:58 panne Exp $ +# $Id: Makefile,v 1.8 2000/12/12 17:21:41 simonmar Exp $ TOP = ../.. include $(TOP)/mk/boilerplate.mk include $(TOP)/mk/should_run.mk SRC_HC_OPTS += -dcore-lint -arith006_HC_OPTS += -fglasgow-exts -arith010_HC_OPTS += -fglasgow-exts -arith011_HC_OPTS += -fglasgow-exts -arith012_HC_OPTS += -fglasgow-exts -num006_HC_OPTS += -fglasgow-exts +arith006_HC_OPTS += -package lang +arith010_HC_OPTS += -package lang +arith011_HC_OPTS += -package lang +arith012_HC_OPTS += -package lang +num006_HC_OPTS += -package lang .PRECIOUS: %.bin %.o diff --git a/ghc/tests/reader/should_compile/read014.stderr b/ghc/tests/reader/should_compile/read014.stderr index ae9922b..302d505 100644 --- a/ghc/tests/reader/should_compile/read014.stderr +++ b/ghc/tests/reader/should_compile/read014.stderr @@ -1,5 +1,5 @@ -read014.hs:2: Warning: definition but no type signature for `ng1' +read014.hs:4: Warning: Definition but no type signature for `ng1' read014.hs:4: Warning: Defined but not used: x diff --git a/ghc/tests/reader/should_compile/read023.hs b/ghc/tests/reader/should_compile/read023.hs index f6f73dd..3410afe 100644 --- a/ghc/tests/reader/should_compile/read023.hs +++ b/ghc/tests/reader/should_compile/read023.hs @@ -10,10 +10,9 @@ f = Just.let x=id in x -- f' = Just.\1 where (.\) = ($) -- ----------------------------------------------------- --- M.{as,hiding,qualified} *are* qualified identifiers, --- but GHC deviates from the Haskell report here. +-- M.{as,hiding,qualified} *are* qualified identifiers: --- g = ShouldCompile.as +g = ShouldCompile.as -- --------------------------------------------------------------------------- -- special symbols (!, -) can be qualified to make varids. diff --git a/ghc/tests/reader/should_compile/read027.hs b/ghc/tests/reader/should_compile/read027.hs index c793ca7..a689345 100644 --- a/ghc/tests/reader/should_compile/read027.hs +++ b/ghc/tests/reader/should_compile/read027.hs @@ -5,8 +5,8 @@ infix 9 := data Equal = Char := Int --- fails in GHC 4.04, due to not doing fixity resolution on the lhs --- before deciding which is the function symbol. +-- fails in GHC (all versions), due to not doing fixity resolution on +-- the lhs before deciding which is the function symbol. (|-) :: Int -> Equal -> Bool 0 |- x:=y = 1 |- x:=y -- XXX fails here diff --git a/ghc/tests/reader/should_fail/read001.stderr b/ghc/tests/reader/should_fail/read001.stderr index 5e77834..e414b0b 100644 --- a/ghc/tests/reader/should_fail/read001.stderr +++ b/ghc/tests/reader/should_fail/read001.stderr @@ -3,6 +3,8 @@ read001.hs:5: Unknown module in export list: module `OneC' read001.hs:5: Type constructor or class not in scope: `FooDataC' +read001.hs:25: Variable not in scope: `+#' + read001.hs:38: Type constructor or class not in scope: `EqLeaf' read001.hs:38: Type constructor or class not in scope: `EqLeaf' @@ -20,6 +22,3 @@ read001.hs:107: Data constructor not in scope: `Foo' read001.hs:107: Data constructor not in scope: `Bar' read001.hs:112: Type constructor or class not in scope: `Foo' - -Compilation had errors - diff --git a/ghc/tests/reader/should_fail/read001.stdout b/ghc/tests/reader/should_fail/read001.stdout index a4589a9..8c7cc09 100644 --- a/ghc/tests/reader/should_fail/read001.stdout +++ b/ghc/tests/reader/should_fail/read001.stdout @@ -26,12 +26,13 @@ f _ ((n+42)) = y expr a b c d - = ((((((((a + (: a b)) + (a : b)) + (((1 - 'c') - "abc") - 1.293)) + = ((((((((a + ((:) a b)) + (a : b)) + + (((1 - 'c') - "abc") - 1.293)) + ((\ x y z -> x) 42)) + ((9 *))) + ((* 8))) + (case x of - Prelude.[] + PrelBase.[] | null x -> 99 | otherwise -> 98 | True -> 97 @@ -72,9 +73,12 @@ type Pair a b = (a, b) data FooData = FooCon Int data FooDataB = FooConB Double data (Eq a) => EqTree a = EqLeaf a | EqBranch (EqLeaf a) (EqLeaf a) -class (Eq a) => EqClass a where { eqc :: a -> Char; eqc x = '?' } +class (Eq a) => EqClass a where { + eqc = :: a -> Char; Just eqc x = '?' } class (Ord a) => OrdClass a where { - orda :: a -> Char; ordb :: a -> Char; ordc :: a -> Char; } + orda = :: a -> Char; ordb = :: a -> Char; ordc = :: a -> Char; + Just + } instance (Eq a) => {EqClass (EqTree a)} where [] eqc x = 'a' diff --git a/ghc/tests/reader/should_fail/read003.stderr b/ghc/tests/reader/should_fail/read003.stderr index c2219e6..a1adc5f 100644 --- a/ghc/tests/reader/should_fail/read003.stderr +++ b/ghc/tests/reader/should_fail/read003.stderr @@ -4,6 +4,3 @@ read003.hs:4: Expected type: (t, [a], t1) Inferred type: t In the right-hand side of a pattern binding: a - -Compilation had errors - diff --git a/ghc/tests/reader/should_fail/read004.stderr b/ghc/tests/reader/should_fail/read004.stderr index e2f516b..c133ed0 100644 --- a/ghc/tests/reader/should_fail/read004.stderr +++ b/ghc/tests/reader/should_fail/read004.stderr @@ -1,4 +1 @@ read004.hs:19: error in character literal - -Compilation had errors - diff --git a/ghc/tests/reader/should_fail/read005.stderr b/ghc/tests/reader/should_fail/read005.stderr index 8b28be0..8b0b8c4 100644 --- a/ghc/tests/reader/should_fail/read005.stderr +++ b/ghc/tests/reader/should_fail/read005.stderr @@ -1,4 +1 @@ read005.hs:4: error in character literal - -Compilation had errors - diff --git a/ghc/tests/reader/should_fail/read006.stderr b/ghc/tests/reader/should_fail/read006.stderr index f1f31a5..fca9ae6 100644 --- a/ghc/tests/reader/should_fail/read006.stderr +++ b/ghc/tests/reader/should_fail/read006.stderr @@ -1,4 +1 @@ read006.hs:8: parse error on input `@' - -Compilation had errors - diff --git a/ghc/tests/reader/should_fail/read007.stderr b/ghc/tests/reader/should_fail/read007.stderr index 1c3cb49..0b8d90e 100644 --- a/ghc/tests/reader/should_fail/read007.stderr +++ b/ghc/tests/reader/should_fail/read007.stderr @@ -3,6 +3,3 @@ read007.hs:6: `+' is not a data constructor In the pattern: 2 + 2 In a do statement: (2 + 2) <- 2 - -Compilation had errors - diff --git a/ghc/tests/reader/should_fail/read008.stderr b/ghc/tests/reader/should_fail/read008.stderr index bf43cd6..f056219 100644 --- a/ghc/tests/reader/should_fail/read008.stderr +++ b/ghc/tests/reader/should_fail/read008.stderr @@ -1,4 +1 @@ read008.hs:5: parse error on input `!' - -Compilation had errors - diff --git a/ghc/tests/reader/should_fail/read009.stderr b/ghc/tests/reader/should_fail/read009.stderr index a44f2c1..131ac17 100644 --- a/ghc/tests/reader/should_fail/read009.stderr +++ b/ghc/tests/reader/should_fail/read009.stderr @@ -1,6 +1,3 @@ read009.hs:5: `do' statements must end in expression: do let foo = True - -Compilation had errors - diff --git a/ghc/tests/reader/should_fail/read011.stderr b/ghc/tests/reader/should_fail/read011.stderr index a8ca485..f582cf0 100644 --- a/ghc/tests/reader/should_fail/read011.stderr +++ b/ghc/tests/reader/should_fail/read011.stderr @@ -1,4 +1 @@ read011.hs:7: parse error on input `=' - -Compilation had errors - diff --git a/ghc/tests/reader/should_fail/read012.stderr b/ghc/tests/reader/should_fail/read012.stderr index 5105742..bbfcad3 100644 --- a/ghc/tests/reader/should_fail/read012.stderr +++ b/ghc/tests/reader/should_fail/read012.stderr @@ -1,4 +1 @@ read012.hs:7: parse error (possibly incorrect indentation) - -Compilation had errors - diff --git a/ghc/tests/reader/should_fail/read013.stderr b/ghc/tests/reader/should_fail/read013.stderr index 774e4ca..0867e7b 100644 --- a/ghc/tests/reader/should_fail/read013.stderr +++ b/ghc/tests/reader/should_fail/read013.stderr @@ -1,4 +1 @@ read013.hs:4: unterminated `` - -Compilation had errors - diff --git a/ghc/tests/reader/should_fail/read014.stderr b/ghc/tests/reader/should_fail/read014.stderr index dd89e03..5f387d3 100644 --- a/ghc/tests/reader/should_fail/read014.stderr +++ b/ghc/tests/reader/should_fail/read014.stderr @@ -1,4 +1 @@ read014.hs:3: parse error on input `}' - -Compilation had errors - diff --git a/ghc/tests/rename/should_compile/Rn016.hi b/ghc/tests/rename/should_compile/Rn016.hi deleted file mode 100644 index 7048122..0000000 --- a/ghc/tests/rename/should_compile/Rn016.hi +++ /dev/null @@ -1,9 +0,0 @@ -__interface Rn016 1 0 where -__export Rn016 K{op1 op2}; -instance {K PrelBase.Int} = _f1; -instance {K PrelBase.Bool} = _f2; -instance __forall [a] => {K [a]} = _f3; -1 _f1 :: {K PrelBase.Int} ; -1 _f2 :: {K PrelBase.Bool} ; -1 _f3 :: __forall [a] => {K [a]} ; -1 class K a :: (* -> *) where { op1 :: a -> a ; op2 :: a -> a ; } ; diff --git a/ghc/tests/rename/should_compile/rn016.hs b/ghc/tests/rename/should_compile/rn016.hs deleted file mode 100644 index 618880e..0000000 --- a/ghc/tests/rename/should_compile/rn016.hs +++ /dev/null @@ -1,7 +0,0 @@ --- !!! Import an interface defining a class and some instances - -module Main where - -import Rn016 - -main = undefined diff --git a/ghc/tests/simplCore/should_compile/Makefile b/ghc/tests/simplCore/should_compile/Makefile index 876f9b6..323ebba 100644 --- a/ghc/tests/simplCore/should_compile/Makefile +++ b/ghc/tests/simplCore/should_compile/Makefile @@ -5,6 +5,8 @@ include $(TOP)/mk/should_compile.mk SRC_HC_OPTS += -dcore-lint simpl006_HC_OPTS += -package concurrent +simpl004_HC_OPTS = -package lang +Simpl006Help_HC_OPTS = -O include $(TOP)/mk/target.mk diff --git a/ghc/tests/simplCore/should_compile/Simpl006Help.hs b/ghc/tests/simplCore/should_compile/Simpl006Help.hs index 4356a28..81baad3 100644 --- a/ghc/tests/simplCore/should_compile/Simpl006Help.hs +++ b/ghc/tests/simplCore/should_compile/Simpl006Help.hs @@ -1,5 +1,3 @@ -{-# OPTIONS -O #-} - module Simpl006Help( forever ) where forever c = sequence_ (repeat c) diff --git a/ghc/tests/typecheck/should_compile/Makefile b/ghc/tests/typecheck/should_compile/Makefile index 165edb8..8fef5e6 100644 --- a/ghc/tests/typecheck/should_compile/Makefile +++ b/ghc/tests/typecheck/should_compile/Makefile @@ -2,16 +2,18 @@ TOP = ../.. include $(TOP)/mk/boilerplate.mk include $(TOP)/mk/should_compile.mk -SRC_HC_OPTS += -dcore-lint -fno-warn-incomplete-patterns +SRC_HC_OPTS += -dcore-lint -fno-warn-incomplete-patterns # -hi-with-declarations -hi-with-instances -hi-with-exports tc019_HC_OPTS = -fglasgow-exts tc065_HC_OPTS = -package lang -package data +tc085_HC_OPTS = -package lang tc087_HC_OPTS = -fglasgow-exts tc088_HC_OPTS = -package lang tc089_HC_OPTS = -H12m tc097_HC_OPTS = -fglasgow-exts tc100_HC_OPTS = -O +tc108_HC_OPTS = -fglasgow-exts # mkdependHS doesn't understand OPTIONS pragmas... SRC_MKDEPENDHS_OPTS += -fglasgow-exts diff --git a/ghc/tests/typecheck/should_compile/tc042.stderr b/ghc/tests/typecheck/should_compile/tc042.stderr index 54b104d..64675a7 100644 --- a/ghc/tests/typecheck/should_compile/tc042.stderr +++ b/ghc/tests/typecheck/should_compile/tc042.stderr @@ -1,18 +1 @@ -__export ShouldSucceed Boolean{FF TT} List{Nil Cons} Nat{ZZero Succ} Pair{Mkpair} Tree{Leaf Node} add app before flatten idb idl lEngth nUll neg rEverse sUm swap; -1 add :: Nat -> Nat -> Nat ; -1 app :: __forall [alpha] => List alpha -> List alpha -> List alpha ; -1 before :: List Nat -> List Nat ; -1 data Boolean = FF | TT ; -1 data List alpha = Nil | Cons alpha (List alpha) ; -1 data Nat = ZZero | Succ Nat ; -1 data Pair a b = Mkpair a b ; -1 data Tree t = Leaf t | Node (Tree t) (Tree t) ; -1 flatten :: __forall [alpha] => Tree alpha -> List alpha ; -1 idb :: Boolean -> Boolean ; -1 idl :: __forall [a] => List a -> List a ; -1 lEngth :: __forall [a] => List a -> Nat ; -1 nUll :: __forall [alpha] => List alpha -> Boolean ; -1 neg :: Boolean -> Boolean ; -1 rEverse :: __forall [alpha] => List alpha -> List alpha ; -1 sUm :: Tree Nat -> Nat ; -1 swap :: __forall [a b] => Pair a b -> Pair b a ; +NOTE: Simplifier still going after 4 iterations; bailing out. diff --git a/ghc/tests/typecheck/should_compile/tc056.stderr b/ghc/tests/typecheck/should_compile/tc056.stderr index f252e5e..b6a09e3 100644 --- a/ghc/tests/typecheck/should_compile/tc056.stderr +++ b/ghc/tests/typecheck/should_compile/tc056.stderr @@ -2,13 +2,3 @@ tc056.hs:14: Warning: Duplicate class assertion `Eq' a' in the context: (Eq' a, Eq' a) => ... -__export ShouldSucceed Eqzq{doubleeq} Ordzq{lt} f; -instance {Eqzq PrelBase.Int} = zdfEqzqInt; -instance __forall [a] => {Eqzq a} -> {Eqzq a} -> {Eqzq [a]} = zdfEqzqZMZN; -1 class Eqzq a where {doubleeq :: a -> a -> PrelBase.Bool} ; -1 class {Eqzq a} => Ordzq a where {lt :: a -> a -> PrelBase.Bool} ; -1 f :: __forall [t t1] => {Eqzq [t1]} -> {PrelNum.Num t1} -> [t1] -> t -> PrelBase.Bool ; -1 zddmdoubleeq :: __forall [a] => {Eqzq a} -> a -> a -> PrelBase.Bool ; -1 zddmlt :: __forall [a] => {Ordzq a} -> a -> a -> PrelBase.Bool ; -1 zdfEqzqInt :: {Eqzq PrelBase.Int} ; -1 zdfEqzqZMZN :: __forall [a] => {Eqzq a} -> {Eqzq a} -> {Eqzq [a]} ; diff --git a/ghc/tests/typecheck/should_compile/tc095.stderr b/ghc/tests/typecheck/should_compile/tc095.stderr index 0aae4b2..64675a7 100644 --- a/ghc/tests/typecheck/should_compile/tc095.stderr +++ b/ghc/tests/typecheck/should_compile/tc095.stderr @@ -1,34 +1 @@ -__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} -> {PrelBase.Eq t} -> t -> PrelBase.Int -> Token -> HappyState Token ([HappyAbsSyn (t1 -> PrelFloat.Double) [([PrelBase.Char], t1 -> PrelBase.Int)] (t1 -> PrelBase.Int)] -> [Token] -> t1 -> PrelFloat.Double) -> [HappyState Token ([HappyAbsSyn (t1 -> PrelFloat.Double) [([PrelBase.Char], t1 -> PrelBase.Int)] (t1 -> PrelBase.Int)] -> [Token] -> t1 -> PrelFloat.Double)] -> [HappyAbsSyn (t1 -> PrelFloat.Double) [([PrelBase.Char], t1 -> PrelBase.Int)] (t1 -> PrelBase.Int)] -> [Token] -> t1 -> PrelFloat.Double ; -1 action_1 :: __forall [t t1 t2 t3 b] => {PrelNum.Num t} -> {PrelBase.Eq 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 -> PrelFloat.Double) [(t4, t3 -> t5)] t31] -> t1)] -> [HappyAbsSyn (t3 -> PrelFloat.Double) [(t4, t3 -> t5)] t31] -> t1 ; -1 action_3 :: __forall [t t1 t11 a] => {PrelNum.Num t} -> {PrelBase.Eq 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} -> {PrelBase.Eq 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) ; -1 data Token = TokenInt PrelBase.Int | TokenVar PrelBase.String | TokenEq ; -1 happyAccept :: __forall [t t1 t2 t3 t11 t21 t31 t4] => t -> t1 -> t2 -> t3 -> [HappyAbsSyn t11 t21 t31] -> t4 -> t11 ; -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 -> 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 -> PrelFloat.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 -> PrelFloat.Double) [(t2, t3 -> t4)] t31] -> t)] -> [HappyAbsSyn (t3 -> PrelFloat.Double) [(t2, t3 -> t4)] t31] -> 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.Eq t} -> (PrelBase.Int -> PrelBase.Int -> Token -> HappyState Token ([HappyAbsSyn t1 t2 t3] -> [Token] -> t11) -> [HappyState Token ([HappyAbsSyn t1 t2 t3] -> [Token] -> t11)] -> [HappyAbsSyn t1 t2 t3] -> [Token] -> t11) -> t -> Token -> HappyState Token ([HappyAbsSyn t1 t2 t3] -> [Token] -> t11) -> [HappyState Token ([HappyAbsSyn t1 t2 t3] -> [Token] -> t11)] -> [HappyAbsSyn t1 t2 t3] -> [Token] -> t11 ; -1 happySpecReduce_0 :: __forall [t a b] => PrelBase.Int -> t -> PrelBase.Int -> b -> HappyState b ([t] -> [Token] -> a) -> [HappyState b ([t] -> [Token] -> a)] -> [t] -> [Token] -> a ; -1 happySpecReduce_1 :: __forall [t b t1 t2] => PrelBase.Int -> (t1 -> t1) -> PrelBase.Int -> b -> t -> [HappyState b ([t1] -> t2)] -> [t1] -> t2 ; -1 happySpecReduce_2 :: __forall [t b t1 t2] => PrelBase.Int -> (t1 -> t1 -> t1) -> PrelBase.Int -> b -> t -> [HappyState b ([t1] -> t2)] -> [t1] -> t2 ; -1 happySpecReduce_3 :: __forall [t b t1 t2] => PrelBase.Int -> (t1 -> t1 -> t1 -> t1) -> PrelBase.Int -> b -> t -> [HappyState b ([t1] -> t2)] -> [t1] -> t2 ; -1 happyThen :: __forall [t t1] => t -> (t -> t1) -> t1 ; -1 main :: PrelIOBase.IO PrelBase.Z0T ; -1 myparser :: __forall [t] => [Token] -> t -> PrelFloat.Double ; -1 notHappyAtAll :: __forall [t] => t ; -1 zdfShowToken :: {PrelShow.Show Token} ; +NOTE: Simplifier still going after 4 iterations; bailing out. diff --git a/ghc/tests/typecheck/should_compile/tc108.stderr b/ghc/tests/typecheck/should_compile/tc108.stderr index 8d1c8b6..b07f30b 100644 --- a/ghc/tests/typecheck/should_compile/tc108.stderr +++ b/ghc/tests/typecheck/should_compile/tc108.stderr @@ -1 +1,4 @@ - + +tc108.hs:15: + Too many parameters for class `HasConfigValue' + In the class declaration for `HasConfigValue' diff --git a/ghc/tests/typecheck/should_compile/tc109.hs b/ghc/tests/typecheck/should_compile/tc109.hs index 656fe11..133aac1 100644 --- a/ghc/tests/typecheck/should_compile/tc109.hs +++ b/ghc/tests/typecheck/should_compile/tc109.hs @@ -1,6 +1,6 @@ {-# OPTIONS -fglasgow-exts #-} -module ShouldCompile +module ShouldCompile where -- This accepted by Hugs, but not by GHC 4.08.1 -- Reported by Thomas Hallgren Nov 00 diff --git a/ghc/tests/typecheck/should_compile/tc109.stderr b/ghc/tests/typecheck/should_compile/tc109.stderr index e69de29..35219fc 100644 --- a/ghc/tests/typecheck/should_compile/tc109.stderr +++ b/ghc/tests/typecheck/should_compile/tc109.stderr @@ -0,0 +1,4 @@ + +tc109.hs:11: + Illegal instance declaration for `P b' + (There must be at least one non-type-variable in the instance head) diff --git a/ghc/tests/typecheck/should_fail/Digraph.stderr b/ghc/tests/typecheck/should_fail/Digraph.stderr index 7287732..e5766b5 100644 --- a/ghc/tests/typecheck/should_fail/Digraph.stderr +++ b/ghc/tests/typecheck/should_fail/Digraph.stderr @@ -30,6 +30,3 @@ Digraph.hs:19: | otherwise = span_tree r (vs', (x : ns') : ns) xs where (vs', ns') = dfs r (x : vs, []) (r x) - -Compilation had errors - diff --git a/ghc/tests/typecheck/should_fail/Makefile b/ghc/tests/typecheck/should_fail/Makefile index 8bb190a..f3483b4 100644 --- a/ghc/tests/typecheck/should_fail/Makefile +++ b/ghc/tests/typecheck/should_fail/Makefile @@ -7,9 +7,9 @@ HS_SRCS = $(wildcard *.hs) # The -noC messes up the Data82 compilation # HC_OPTS += -noC -tcfail045_HC_OPTS = -fglasgow-exts -tcfail068_HC_OPTS = -fglasgow-exts -tcfail080_HC_OPTS = -fglasgow-exts +tcfail045_HC_OPTS = -fglasgow-exts -package lang +tcfail068_HC_OPTS = -fglasgow-exts -package lang +tcfail080_HC_OPTS = -fglasgow-exts -package lang Inst82_1.o : Inst82_1.hs Data82.hi $(HC) $(HC_OPTS) -c $< -o $@ @@ -19,6 +19,6 @@ Data82.o : Data82.hs $(HC) $(HC_OPTS) -c $< -o $@ # mkdependHS doesn't understand OPTIONS pragmas... -SRC_MKDEPENDHS_OPTS += -fglasgow-exts +SRC_MKDEPENDHS_OPTS += -fglasgow-exts -package lang include $(TOP)/mk/target.mk diff --git a/ghc/tests/typecheck/should_fail/tcfail001.stderr b/ghc/tests/typecheck/should_fail/tcfail001.stderr index aa1bc11..6281cf5 100644 --- a/ghc/tests/typecheck/should_fail/tcfail001.stderr +++ b/ghc/tests/typecheck/should_fail/tcfail001.stderr @@ -9,6 +9,3 @@ tcfail001.hs:9: Inferred type: t -> t1 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 9dc37d1..5cc7593 100644 --- a/ghc/tests/typecheck/should_fail/tcfail002.stderr +++ b/ghc/tests/typecheck/should_fail/tcfail002.stderr @@ -4,6 +4,3 @@ tcfail002.hs:4: Expected type: t Inferred type: [t] In the right-hand side of an equation for `c': z - -Compilation had errors - diff --git a/ghc/tests/typecheck/should_fail/tcfail003.stderr b/ghc/tests/typecheck/should_fail/tcfail003.stderr index 4870b4d..07d31a7 100644 --- a/ghc/tests/typecheck/should_fail/tcfail003.stderr +++ b/ghc/tests/typecheck/should_fail/tcfail003.stderr @@ -4,6 +4,3 @@ tcfail003.hs:3: arising from the literal `1' at tcfail003.hs:3 In the list element: 1 In the right-hand side of a pattern binding: [1, 'a'] - -Compilation had errors - diff --git a/ghc/tests/typecheck/should_fail/tcfail004.stderr b/ghc/tests/typecheck/should_fail/tcfail004.stderr index 459b08c..50bfd4d 100644 --- a/ghc/tests/typecheck/should_fail/tcfail004.stderr +++ b/ghc/tests/typecheck/should_fail/tcfail004.stderr @@ -4,6 +4,3 @@ tcfail004.hs:3: Expected type: (t, t1) Inferred type: (t2, t3, t4) In the right-hand side of a pattern binding: (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 258e41d..600dfe0 100644 --- a/ghc/tests/typecheck/should_fail/tcfail005.stderr +++ b/ghc/tests/typecheck/should_fail/tcfail005.stderr @@ -4,6 +4,3 @@ tcfail005.hs:3: Expected type: [t] Inferred type: (t1, t2) In the right-hand side of a pattern binding: (1, 'a') - -Compilation had errors - diff --git a/ghc/tests/typecheck/should_fail/tcfail006.stderr b/ghc/tests/typecheck/should_fail/tcfail006.stderr index 257abfb..5e3ed85 100644 --- a/ghc/tests/typecheck/should_fail/tcfail006.stderr +++ b/ghc/tests/typecheck/should_fail/tcfail006.stderr @@ -3,6 +3,3 @@ tcfail006.hs:4: No instance for `Num Bool' arising from the literal `1' at tcfail006.hs:4 In the right-hand side of a case alternative: (True, 1) - -Compilation had errors - diff --git a/ghc/tests/typecheck/should_fail/tcfail007.stderr b/ghc/tests/typecheck/should_fail/tcfail007.stderr index ad50c0f..6ad768c 100644 --- a/ghc/tests/typecheck/should_fail/tcfail007.stderr +++ b/ghc/tests/typecheck/should_fail/tcfail007.stderr @@ -2,8 +2,5 @@ tcfail007.hs:3: No instance for `Num Bool' arising from the literal `1' at tcfail007.hs:3 - In the second argument of `+', namely `1' + In the second argument of `(+)', namely `1' In the right-hand side of an equation for `n': x + 1 - -Compilation had errors - diff --git a/ghc/tests/typecheck/should_fail/tcfail008.stderr b/ghc/tests/typecheck/should_fail/tcfail008.stderr index 3a731b7..0cc084b 100644 --- a/ghc/tests/typecheck/should_fail/tcfail008.stderr +++ b/ghc/tests/typecheck/should_fail/tcfail008.stderr @@ -2,14 +2,11 @@ tcfail008.hs:3: Ambiguous type variable(s) `t' in the constraint `Num [t]' arising from the literal `2' at tcfail008.hs:3 - In the second argument of `:', namely `2' - In the right-hand side of a pattern binding: 1 : 2 + In the second argument of `(:)', namely `2' + In the right-hand side of an equation for `o': 1 : 2 tcfail008.hs:3: Ambiguous type variable(s) `t' in the constraint `Num t' arising from the literal `1' at tcfail008.hs:3 - In the first argument of `:', namely `1' - In the right-hand side of a pattern binding: 1 : 2 - -Compilation had errors - + In the first argument of `(:)', namely `1' + In the right-hand side of an equation for `o': 1 : 2 diff --git a/ghc/tests/typecheck/should_fail/tcfail009.stderr b/ghc/tests/typecheck/should_fail/tcfail009.stderr index a91cbbb..260fef1 100644 --- a/ghc/tests/typecheck/should_fail/tcfail009.stderr +++ b/ghc/tests/typecheck/should_fail/tcfail009.stderr @@ -4,6 +4,3 @@ tcfail009.hs:3: Expected type: Integer Inferred type: 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 3712503..67a9902 100644 --- a/ghc/tests/typecheck/should_fail/tcfail010.stderr +++ b/ghc/tests/typecheck/should_fail/tcfail010.stderr @@ -1,9 +1,5 @@ tcfail010.hs:3: Ambiguous type variable(s) `t' in the constraint `Num [t]' - arising from the literal `2' at tcfail010.hs:3 - In the second argument of `+', namely `2' + arising from use of `+' at tcfail010.hs:3 In the right-hand side of a lambda abstraction: z + 2 - -Compilation had errors - diff --git a/ghc/tests/typecheck/should_fail/tcfail011.stderr b/ghc/tests/typecheck/should_fail/tcfail011.stderr index 348dcb2..b94eea6 100644 --- a/ghc/tests/typecheck/should_fail/tcfail011.stderr +++ b/ghc/tests/typecheck/should_fail/tcfail011.stderr @@ -1,5 +1,2 @@ tcfail011.hs:3: Variable 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 ea50af1..d626ad6 100644 --- a/ghc/tests/typecheck/should_fail/tcfail012.stderr +++ b/ghc/tests/typecheck/should_fail/tcfail012.stderr @@ -4,6 +4,3 @@ tcfail012.hs:3: Expected type: Bool Inferred type: [t] In the right-hand side of a pattern binding: [] - -Compilation had errors - diff --git a/ghc/tests/typecheck/should_fail/tcfail013.stderr b/ghc/tests/typecheck/should_fail/tcfail013.stderr index cc92015..f460026 100644 --- a/ghc/tests/typecheck/should_fail/tcfail013.stderr +++ b/ghc/tests/typecheck/should_fail/tcfail013.stderr @@ -5,6 +5,3 @@ tcfail013.hs:4: Inferred type: Bool In the pattern: True 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 08b902e..90f3128 100644 --- a/ghc/tests/typecheck/should_fail/tcfail014.stderr +++ b/ghc/tests/typecheck/should_fail/tcfail014.stderr @@ -5,6 +5,3 @@ tcfail014.hs:5: Inferred type: t -> t1 In the first argument of `z', namely `z' In the right-hand side of an equation for `h': z z - -Compilation had errors - diff --git a/ghc/tests/typecheck/should_fail/tcfail015.stderr b/ghc/tests/typecheck/should_fail/tcfail015.stderr index b14fcb5..a0a8884 100644 --- a/ghc/tests/typecheck/should_fail/tcfail015.stderr +++ b/ghc/tests/typecheck/should_fail/tcfail015.stderr @@ -3,6 +3,3 @@ tcfail015.hs:7: No instance for `Num Bool' arising from the literal `2' at tcfail015.hs:7 In the right-hand side of an equation for `g': 2 - -Compilation had errors - diff --git a/ghc/tests/typecheck/should_fail/tcfail016.stderr b/ghc/tests/typecheck/should_fail/tcfail016.stderr index 799b9ed..aebdb2c 100644 --- a/ghc/tests/typecheck/should_fail/tcfail016.stderr +++ b/ghc/tests/typecheck/should_fail/tcfail016.stderr @@ -4,7 +4,4 @@ tcfail016.hs:9: Expected type: Expr a Inferred type: AnnExpr a In the first argument of `g', namely `e1' - In the first argument of `++', namely `(g e1)' - -Compilation had errors - + In the first argument of `(++)', namely `(g e1)' diff --git a/ghc/tests/typecheck/should_fail/tcfail017.stderr b/ghc/tests/typecheck/should_fail/tcfail017.stderr index 5ae7a65..ac4fd91 100644 --- a/ghc/tests/typecheck/should_fail/tcfail017.stderr +++ b/ghc/tests/typecheck/should_fail/tcfail017.stderr @@ -1,9 +1,7 @@ tcfail017.hs:10: - Could not deduce `C [a]' from the context: (B a) - Probable cause: missing `C [a]' in instance declaration context - or missing instance declaration for `C [a]' + Could not deduce `C [a]' from the context (B a) + Probable fix: + Add `C [a]' to the instance declaration context + Or add an instance declaration for `C [a]' arising from an instance declaration at tcfail017.hs:10 - -Compilation had errors - diff --git a/ghc/tests/typecheck/should_fail/tcfail018.stderr b/ghc/tests/typecheck/should_fail/tcfail018.stderr index 6a5a919..eb01853 100644 --- a/ghc/tests/typecheck/should_fail/tcfail018.stderr +++ b/ghc/tests/typecheck/should_fail/tcfail018.stderr @@ -3,6 +3,3 @@ tcfail018.hs:5: Ambiguous type variable(s) `t' in the constraint `Num [t]' arising from the literal `1' at tcfail018.hs:5 In the right-hand side of a pattern binding: 1 - -Compilation had errors - diff --git a/ghc/tests/typecheck/should_fail/tcfail019.stderr b/ghc/tests/typecheck/should_fail/tcfail019.stderr index 8343555..80093c1 100644 --- a/ghc/tests/typecheck/should_fail/tcfail019.stderr +++ b/ghc/tests/typecheck/should_fail/tcfail019.stderr @@ -1,15 +1,14 @@ tcfail019.hs:18: - Could not deduce `C [a]' from the context: () - Probable cause: missing `C [a]' in instance declaration context - or missing instance declaration for `C [a]' + Could not deduce `C [a]' from the context () + Probable fix: + Add `C [a]' to the instance declaration context + Or add an instance declaration for `C [a]' arising from an instance declaration at tcfail019.hs:18 tcfail019.hs:18: - Could not deduce `B [a]' from the context: () - Probable cause: missing `B [a]' in instance declaration context - or missing instance declaration for `B [a]' + Could not deduce `B [a]' from the context () + Probable fix: + Add `B [a]' to the instance declaration context + Or add an instance declaration for `B [a]' arising from an instance declaration at tcfail019.hs:18 - -Compilation had errors - diff --git a/ghc/tests/typecheck/should_fail/tcfail020.stderr b/ghc/tests/typecheck/should_fail/tcfail020.stderr index dddbe04..69c9e54 100644 --- a/ghc/tests/typecheck/should_fail/tcfail020.stderr +++ b/ghc/tests/typecheck/should_fail/tcfail020.stderr @@ -1,9 +1,7 @@ tcfail020.hs:10: - Could not deduce `A [a]' from the context: (A a) - Probable cause: missing `A [a]' in instance declaration context - or missing instance declaration for `A [a]' + Could not deduce `A [a]' from the context (A a) + Probable fix: + Add `A [a]' to the instance declaration context + Or add an instance declaration for `A [a]' arising from an instance declaration at tcfail020.hs:10 - -Compilation had errors - diff --git a/ghc/tests/typecheck/should_fail/tcfail021.stderr b/ghc/tests/typecheck/should_fail/tcfail021.stderr index ffe4544..2ba2199 100644 --- a/ghc/tests/typecheck/should_fail/tcfail021.stderr +++ b/ghc/tests/typecheck/should_fail/tcfail021.stderr @@ -2,6 +2,3 @@ tcfail021.hs:8: Can't handle multiple methods defined by one pattern binding (==, /=) = (\ x -> \ y -> ..., \ x -> \ y -> ...) - -Compilation had errors - diff --git a/ghc/tests/typecheck/should_fail/tcfail023.stderr b/ghc/tests/typecheck/should_fail/tcfail023.stderr index 180a702..39e1470 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' defined at tcfail023.hs:13 and defined at tcfail023.hs:10 +Duplicate or overlapping instance declarations: + tcfail023.hs:10: {A B} + tcfail023.hs:13: {A B} tcfail023.hs:11: Couldn't match `B' against `Bool' @@ -14,6 +14,3 @@ tcfail023.hs:14: Expected type: B Inferred type: Bool In the right-hand side of an equation for `op': True - -Compilation had errors - diff --git a/ghc/tests/typecheck/should_fail/tcfail027.stderr b/ghc/tests/typecheck/should_fail/tcfail027.stderr index c1415ee..de3a728 100644 --- a/ghc/tests/typecheck/should_fail/tcfail027.stderr +++ b/ghc/tests/typecheck/should_fail/tcfail027.stderr @@ -1,8 +1,4 @@ -tcfail027.hs:2: - Cycle in class declarations: - `A' at tcfail027.hs:4 - `B' at tcfail027.hs:7 - -Compilation had errors - +Cycle in class declarations: + `A' at tcfail027.hs:4 + `B' at tcfail027.hs:7 diff --git a/ghc/tests/typecheck/should_fail/tcfail028.stderr b/ghc/tests/typecheck/should_fail/tcfail028.stderr index 8856630..ef349d4 100644 --- a/ghc/tests/typecheck/should_fail/tcfail028.stderr +++ b/ghc/tests/typecheck/should_fail/tcfail028.stderr @@ -1,10 +1,7 @@ tcfail028.hs:4: - Couldn't match `Type t' against `k -> *' - Expected kind: Type t - Inferred kind: k -> * + Couldn't match `k -> k1' against `Type bx' + Expected kind: k -> k1 + Inferred kind: Type bx When checking that `A a' is a type - In the newtype declaration for `A' - -Compilation had errors - + In the data type declaration for `A' diff --git a/ghc/tests/typecheck/should_fail/tcfail029.stderr b/ghc/tests/typecheck/should_fail/tcfail029.stderr index 001f665..1e6d04b 100644 --- a/ghc/tests/typecheck/should_fail/tcfail029.stderr +++ b/ghc/tests/typecheck/should_fail/tcfail029.stderr @@ -3,6 +3,3 @@ tcfail029.hs:6: No instance for `Ord Foo' arising from use of `>' at tcfail029.hs:6 In the right-hand side of an equation for `f': x > Bar - -Compilation had errors - diff --git a/ghc/tests/typecheck/should_fail/tcfail030.stderr b/ghc/tests/typecheck/should_fail/tcfail030.stderr index 908c1e0..2a6d9df 100644 --- a/ghc/tests/typecheck/should_fail/tcfail030.stderr +++ b/ghc/tests/typecheck/should_fail/tcfail030.stderr @@ -1,5 +1,4 @@ -tcfail030.hs:3: Variable not in scope: `Main.main' - -Compilation had errors +tcfail030.hs:3: Variable not in scope: `main' +tcfail030.hs:3: Module `Main' must include a definition for `main' diff --git a/ghc/tests/typecheck/should_fail/tcfail031.stderr b/ghc/tests/typecheck/should_fail/tcfail031.stderr index c1795e5..79a4572 100644 --- a/ghc/tests/typecheck/should_fail/tcfail031.stderr +++ b/ghc/tests/typecheck/should_fail/tcfail031.stderr @@ -5,6 +5,3 @@ tcfail031.hs:3: Inferred type: Char In the predicate expression: 'a' In the right-hand side of an equation for `f': 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 1ce9ae7..4b6d85a 100644 --- a/ghc/tests/typecheck/should_fail/tcfail032.stderr +++ b/ghc/tests/typecheck/should_fail/tcfail032.stderr @@ -10,6 +10,3 @@ tcfail032.hs:14: When checking an expression type signature In an expression with a type signature: x :: forall a. (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 e4ed3e6..f6f2a65 100644 --- a/ghc/tests/typecheck/should_fail/tcfail033.stderr +++ b/ghc/tests/typecheck/should_fail/tcfail033.stderr @@ -4,6 +4,3 @@ tcfail033.hs:4: Expected type: (t, t1) Inferred type: t In a list-comprehension qualifier: return x - -Compilation had errors - diff --git a/ghc/tests/typecheck/should_fail/tcfail034.stderr b/ghc/tests/typecheck/should_fail/tcfail034.stderr index 0f1169d..76dbca6 100644 --- a/ghc/tests/typecheck/should_fail/tcfail034.stderr +++ b/ghc/tests/typecheck/should_fail/tcfail034.stderr @@ -1,10 +1,8 @@ tcfail034.hs:17: - Could not deduce `Integral a' from the context: (Num a, Eq a) - Probable cause: missing `Integral a' in type signature for `test' + Could not deduce `Integral a' from the context (Num a, Eq a) + Probable fix: + Add `Integral a' to the type signature for `test' arising from use of `mod' at tcfail034.hs:17 - In the first argument of `==', namely `(x `mod` 3)' + In the first argument of `(==)', namely `(x `mod` 3)' In the right-hand side of an equation for `test': (x `mod` 3) == 0 - -Compilation had errors - diff --git a/ghc/tests/typecheck/should_fail/tcfail035.stderr b/ghc/tests/typecheck/should_fail/tcfail035.stderr index 8cac31e..419cf09 100644 --- a/ghc/tests/typecheck/should_fail/tcfail035.stderr +++ b/ghc/tests/typecheck/should_fail/tcfail035.stderr @@ -1,8 +1,4 @@ -tcfail035.hs:3: - Duplicate or overlapping instance declarations - for `Num NUM' - defined at tcfail035.hs:7 and defined at tcfail035.hs:6 - -Compilation had errors - +Duplicate or overlapping instance declarations: + tcfail035.hs:6: {Num NUM} + tcfail035.hs:7: {Num NUM} diff --git a/ghc/tests/typecheck/should_fail/tcfail036.stderr b/ghc/tests/typecheck/should_fail/tcfail036.stderr index ba8ddf2..e6636c2 100644 --- a/ghc/tests/typecheck/should_fail/tcfail036.stderr +++ b/ghc/tests/typecheck/should_fail/tcfail036.stderr @@ -1,8 +1,7 @@ -tcfail036.hs:3: - Duplicate or overlapping instance declarations - for `Num NUM' - defined at tcfail036.hs:8 and defined at tcfail036.hs:6 +Duplicate or overlapping instance declarations: + tcfail036.hs:6: {Num NUM} + tcfail036.hs:8: {Num NUM} tcfail036.hs:8: No instance for `Eq NUM' @@ -13,8 +12,5 @@ tcfail036.hs:8: arising from an instance declaration at tcfail036.hs:8 tcfail036.hs:9: - Class used as a type constructor: Num + Class `Num' used as a type When checking kinds in `Eq Num' - -Compilation had errors - diff --git a/ghc/tests/typecheck/should_fail/tcfail037.stderr b/ghc/tests/typecheck/should_fail/tcfail037.stderr index d130a2e..ed18d86 100644 --- a/ghc/tests/typecheck/should_fail/tcfail037.stderr +++ b/ghc/tests/typecheck/should_fail/tcfail037.stderr @@ -1,8 +1,5 @@ tcfail037.hs:7: Ambiguous occurrence `+' - It could refer to either `+', defined at tcfail037.hs:10 - or `Prelude.+', imported from Prelude at tcfail037.hs:3 - -Compilation had errors - + It could refer to either `ShouldFail.+', defined at tcfail037.hs:10 + or `PrelNum.+', imported from Prelude at tcfail037.hs:3 () diff --git a/ghc/tests/typecheck/should_fail/tcfail038.stderr b/ghc/tests/typecheck/should_fail/tcfail038.stderr index 9354e05..d16461e 100644 --- a/ghc/tests/typecheck/should_fail/tcfail038.stderr +++ b/ghc/tests/typecheck/should_fail/tcfail038.stderr @@ -6,6 +6,3 @@ tcfail038.hs:9: tcfail038.hs:10: 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 97514c6..489c1ce 100644 --- a/ghc/tests/typecheck/should_fail/tcfail039.stderr +++ b/ghc/tests/typecheck/should_fail/tcfail039.stderr @@ -1,8 +1,5 @@ tcfail039.hs:11: Ambiguous occurrence `==' - It could refer to either `==', defined at tcfail039.hs:7 - or `Prelude.==', imported from Prelude at tcfail039.hs:3 - -Compilation had errors - + It could refer to either `ShouldFail.==', defined at tcfail039.hs:7 + or `PrelBase.==', imported from Prelude at tcfail039.hs:3 () diff --git a/ghc/tests/typecheck/should_fail/tcfail040.stderr b/ghc/tests/typecheck/should_fail/tcfail040.stderr index 737c07c..02c3525 100644 --- a/ghc/tests/typecheck/should_fail/tcfail040.stderr +++ b/ghc/tests/typecheck/should_fail/tcfail040.stderr @@ -2,8 +2,5 @@ tcfail040.hs:19: Ambiguous type variable(s) `a' in the constraint `ORD a' arising from use of `<<' at tcfail040.hs:19 - In the first argument of `===', namely `<<' - In the right-hand side of a pattern binding: << === << - -Compilation had errors - + In the second argument of `(===)', namely `(<<)' + In the right-hand side of an equation for `f': (<<) === (<<) diff --git a/ghc/tests/typecheck/should_fail/tcfail042.stderr b/ghc/tests/typecheck/should_fail/tcfail042.stderr index 363fc20..aad6ff0 100644 --- a/ghc/tests/typecheck/should_fail/tcfail042.stderr +++ b/ghc/tests/typecheck/should_fail/tcfail042.stderr @@ -1,8 +1,6 @@ tcfail042.hs:15: - Could not deduce `Num a' from the context: (Eq a, Show a) - Probable cause: missing `Num a' in instance declaration context + Could not deduce `Num a' from the context (Eq a, Show a) + Probable fix: + Add `Num a' to the instance declaration context arising from an instance declaration at tcfail042.hs:15 - -Compilation had errors - diff --git a/ghc/tests/typecheck/should_fail/tcfail043.stderr b/ghc/tests/typecheck/should_fail/tcfail043.stderr index 52e2914..e55fca9 100644 --- a/ghc/tests/typecheck/should_fail/tcfail043.stderr +++ b/ghc/tests/typecheck/should_fail/tcfail043.stderr @@ -8,16 +8,3 @@ tcfail043.hs:38: False else if eq a (hd bs) then True else search a (tl bs) - -tcfail043.hs:40: - Ambiguous type variable(s) `a' in the constraint `Eq_ a' - arising from use of `eq' at tcfail043.hs:40 - In the predicate expression: eq a (hd bs) - In the right-hand side of a lambda abstraction: - if gt (hd bs) a then - False - else - if eq a (hd bs) then True else search a (tl bs) - -Compilation had errors - diff --git a/ghc/tests/typecheck/should_fail/tcfail044.stderr b/ghc/tests/typecheck/should_fail/tcfail044.stderr index cc76219..f454eb8 100644 --- a/ghc/tests/typecheck/should_fail/tcfail044.stderr +++ b/ghc/tests/typecheck/should_fail/tcfail044.stderr @@ -8,6 +8,3 @@ 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) - -Compilation had errors - diff --git a/ghc/tests/typecheck/should_fail/tcfail045.stderr b/ghc/tests/typecheck/should_fail/tcfail045.stderr index 10b2367..dcfd39a 100644 --- a/ghc/tests/typecheck/should_fail/tcfail045.stderr +++ b/ghc/tests/typecheck/should_fail/tcfail045.stderr @@ -2,6 +2,3 @@ tcfail045.hs:10: Unacceptable instance type for ccall-ish class class CCallable type Socket - -Compilation had errors - diff --git a/ghc/tests/typecheck/should_fail/tcfail046.stderr b/ghc/tests/typecheck/should_fail/tcfail046.stderr index 37ddafc..7877826 100644 --- a/ghc/tests/typecheck/should_fail/tcfail046.stderr +++ b/ghc/tests/typecheck/should_fail/tcfail046.stderr @@ -1,7 +1,3 @@ -tcfail046.hs:4: - No instance for `Eq (Process a)' - When deriving classes for `Continuation' - -Compilation had errors - +No instance for `Eq (Process a)' +When deriving classes for `Message' diff --git a/ghc/tests/typecheck/should_fail/tcfail047.stderr b/ghc/tests/typecheck/should_fail/tcfail047.stderr index 75d7aae..7b95bc9 100644 --- a/ghc/tests/typecheck/should_fail/tcfail047.stderr +++ b/ghc/tests/typecheck/should_fail/tcfail047.stderr @@ -3,6 +3,3 @@ 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) - -Compilation had errors - diff --git a/ghc/tests/typecheck/should_fail/tcfail048.stderr b/ghc/tests/typecheck/should_fail/tcfail048.stderr index 8d2f11f..e6b021c 100644 --- a/ghc/tests/typecheck/should_fail/tcfail048.stderr +++ b/ghc/tests/typecheck/should_fail/tcfail048.stderr @@ -1,5 +1,2 @@ tcfail048.hs:3: 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 1c7f82a..527106b 100644 --- a/ghc/tests/typecheck/should_fail/tcfail049.stderr +++ b/ghc/tests/typecheck/should_fail/tcfail049.stderr @@ -1,5 +1,2 @@ tcfail049.hs:3: Variable 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 6f4c224..ce157ac 100644 --- a/ghc/tests/typecheck/should_fail/tcfail050.stderr +++ b/ghc/tests/typecheck/should_fail/tcfail050.stderr @@ -1,5 +1,2 @@ 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 dcef5e2..e2f184d 100644 --- a/ghc/tests/typecheck/should_fail/tcfail051.stderr +++ b/ghc/tests/typecheck/should_fail/tcfail051.stderr @@ -2,6 +2,3 @@ tcfail051.hs:3: Type constructor or class not in scope: `B' tcfail051.hs:4: Variable not in scope: `op1' - -Compilation had errors - diff --git a/ghc/tests/typecheck/should_fail/tcfail052.stderr b/ghc/tests/typecheck/should_fail/tcfail052.stderr index a4a1d08..190f1b2 100644 --- a/ghc/tests/typecheck/should_fail/tcfail052.stderr +++ b/ghc/tests/typecheck/should_fail/tcfail052.stderr @@ -1,5 +1,2 @@ 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 7824eda..95a74b9 100644 --- a/ghc/tests/typecheck/should_fail/tcfail053.stderr +++ b/ghc/tests/typecheck/should_fail/tcfail053.stderr @@ -1,5 +1,2 @@ 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 277623e..10e8655 100644 --- a/ghc/tests/typecheck/should_fail/tcfail054.stderr +++ b/ghc/tests/typecheck/should_fail/tcfail054.stderr @@ -1,5 +1,2 @@ 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 0c18a15..8c9ee83 100644 --- a/ghc/tests/typecheck/should_fail/tcfail055.stderr +++ b/ghc/tests/typecheck/should_fail/tcfail055.stderr @@ -4,6 +4,3 @@ tcfail055.hs:3: Expected type: Int Inferred type: 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 5904ec5..e7f90dd 100644 --- a/ghc/tests/typecheck/should_fail/tcfail056.stderr +++ b/ghc/tests/typecheck/should_fail/tcfail056.stderr @@ -1,10 +1,6 @@ -tcfail056.hs:1: - Duplicate or overlapping instance declarations - for `Eq Foo' - defined at tcfail056.hs:8 and defined at tcfail056.hs:5 - -tcfail056.hs:10: Class `Eq' does not have a method `<=' - -Compilation had errors +Duplicate or overlapping instance declarations: + tcfail056.hs:5: {Eq Foo} + tcfail056.hs:8: {Eq Foo} +tcfail056.hs:8: Class `Eq' does not have a method `<=' diff --git a/ghc/tests/typecheck/should_fail/tcfail057.stderr b/ghc/tests/typecheck/should_fail/tcfail057.stderr index 163df53..40abefb 100644 --- a/ghc/tests/typecheck/should_fail/tcfail057.stderr +++ b/ghc/tests/typecheck/should_fail/tcfail057.stderr @@ -1,7 +1,4 @@ tcfail057.hs:5: - Class used as a type constructor: RealFrac - When checking kinds in `RealFrac a' - -Compilation had errors - + Class `RealFrac' used as a type + In a type signature for `f' diff --git a/ghc/tests/typecheck/should_fail/tcfail058.stderr b/ghc/tests/typecheck/should_fail/tcfail058.stderr index 69e4de1..b01081c 100644 --- a/ghc/tests/typecheck/should_fail/tcfail058.stderr +++ b/ghc/tests/typecheck/should_fail/tcfail058.stderr @@ -1,7 +1,5 @@ tcfail058.hs:6: - Type constructor used as a class: Array + Type constructor `Array' used as a class When checking kinds in `Array a' - -Compilation had errors - + In a type signature for `f' diff --git a/ghc/tests/typecheck/should_fail/tcfail062.stderr b/ghc/tests/typecheck/should_fail/tcfail062.stderr index f0d6c1c..f6dc641 100644 --- a/ghc/tests/typecheck/should_fail/tcfail062.stderr +++ b/ghc/tests/typecheck/should_fail/tcfail062.stderr @@ -1,9 +1,4 @@ -tcfail062.hs:33: - Type variable not in scope: `behaviouralExpression' - -tcfail062.hs:33: - Type variable not in scope: `behaviouralExpression' - -Compilation had errors - +tcfail062.hs:37: + Illegal polymorphic type as argument: BehaviouralRelation + In the type synonym declaration for `BehaviouralRelationList' diff --git a/ghc/tests/typecheck/should_fail/tcfail063.stderr b/ghc/tests/typecheck/should_fail/tcfail063.stderr index eef4b88..6408fb8 100644 --- a/ghc/tests/typecheck/should_fail/tcfail063.stderr +++ b/ghc/tests/typecheck/should_fail/tcfail063.stderr @@ -1,4 +1 @@ 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 d4518a3..f2615e2 100644 --- a/ghc/tests/typecheck/should_fail/tcfail065.stderr +++ b/ghc/tests/typecheck/should_fail/tcfail065.stderr @@ -1,13 +1,8 @@ tcfail065.hs:28: Inferred type is less polymorphic than expected - Quantified type variable `x' escapes - It is reachable from the type variable(s) `x1' - which is free in the signature + Quantified type variable `x' is unified with `x' Signature type: forall x. x -> X x1 -> X x1 - Type to generalise: x1 -> X x1 -> X x1 + Type to generalise: x -> 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 b0a04cf..1e4d1a5 100644 --- a/ghc/tests/typecheck/should_fail/tcfail067.stderr +++ b/ghc/tests/typecheck/should_fail/tcfail067.stderr @@ -1,28 +1,27 @@ tcfail067.hs:60: - Could not deduce `Show (SubRange a)' from the context: (Num a) - Probable cause: missing `Show (SubRange a)' - in instance declaration context - or missing instance declaration for `Show (SubRange a)' + Could not deduce `Show (SubRange a)' from the context (Num a1) + Probable fix: + Add `Show (SubRange a)' to the instance declaration context + Or add an instance declaration for `Show (SubRange a)' arising from an instance declaration at tcfail067.hs:60 tcfail067.hs:61: Could not deduce `Ord a' - from the context: (Num (SubRange a), - Num a, - Eq (SubRange a), - Show (SubRange a)) - Probable cause: missing `Ord a' in instance declaration context + from the context (Num (SubRange a1), + Num a1, + Eq (SubRange a1), + Show (SubRange a1)) + Probable fix: + Add `Ord a' to the instance declaration context arising from use of `numSubRangeNegate' at tcfail067.hs:61 - In the right-hand side of a pattern binding: numSubRangeNegate + In the right-hand side of an equation for `negate': + numSubRangeNegate tcfail067.hs:74: - Could not deduce `Ord a' from the context: (Num a) - Probable cause: missing `Ord a' - in type signature for `numSubRangeBinOp' + Could not deduce `Ord a' from the context (Num a) + Probable fix: + Add `Ord a' to the type signature for `numSubRangeBinOp' arising from use of `SubRange' at tcfail067.hs:74 In the right-hand side of an equation for `numSubRangeBinOp': SubRange (result, result) result - -Compilation had errors - diff --git a/ghc/tests/typecheck/should_fail/tcfail068.stderr b/ghc/tests/typecheck/should_fail/tcfail068.stderr index caf7ad1..137b143 100644 --- a/ghc/tests/typecheck/should_fail/tcfail068.stderr +++ b/ghc/tests/typecheck/should_fail/tcfail068.stderr @@ -49,13 +49,9 @@ tcfail068.hs:35: It unifies with `s1', which is mentioned in the environment The following variables in the environment mention `s1' itrapstate' :: Int - -> Int - -> c - -> ST s1 (c, STArray s1 (Int, Int) b) + -> Int -> c -> ST s1 (c, STArray s1 (Int, Int) b) itrapstatesnd :: Int - -> Int - -> c - -> ST s1 (c, STArray s1 (Int, Int) b) + -> Int -> c -> ST s1 (c, STArray s1 (Int, Int) b) arr :: IndTree s1 b Signature type: forall s. ST s a Type to generalise: ST s1 (c, IndTree s1 b) @@ -63,6 +59,3 @@ tcfail068.hs:35: In the first argument of `runST', namely `(itrapstate' i k s)' In the right-hand side of an equation for `itrapstate': runST (itrapstate' i k s) - -Compilation had errors - diff --git a/ghc/tests/typecheck/should_fail/tcfail069.stderr b/ghc/tests/typecheck/should_fail/tcfail069.stderr index a3c950d..103cffd 100644 --- a/ghc/tests/typecheck/should_fail/tcfail069.stderr +++ b/ghc/tests/typecheck/should_fail/tcfail069.stderr @@ -5,6 +5,3 @@ tcfail069.hs:20: Inferred type: (t1, t2) In the scrutinee of a case expression: (list1, list2) 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 6a5d4af..9682b5f 100644 --- a/ghc/tests/typecheck/should_fail/tcfail070.stderr +++ b/ghc/tests/typecheck/should_fail/tcfail070.stderr @@ -5,6 +5,3 @@ tcfail070.hs:15: Inferred kind: * -> k When checking kinds in `[Int] Bool' In the type synonym 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 7b6f448..af4ae90 100644 --- a/ghc/tests/typecheck/should_fail/tcfail071.stderr +++ b/ghc/tests/typecheck/should_fail/tcfail071.stderr @@ -11,6 +11,3 @@ tcfail071.hs:10: Inferred type: c In the first argument of `f', namely `c' In the first argument of `foldr', namely `(f c)' - -Compilation had errors - diff --git a/ghc/tests/typecheck/should_fail/tcfail072.stderr b/ghc/tests/typecheck/should_fail/tcfail072.stderr index 2f1915d..f0cd8c3 100644 --- a/ghc/tests/typecheck/should_fail/tcfail072.stderr +++ b/ghc/tests/typecheck/should_fail/tcfail072.stderr @@ -8,6 +8,3 @@ tcfail072.hs:23: Ambiguous type variable(s) `q' in the constraint `Ord q' arising from use of `g' at tcfail072.hs:23 In the right-hand side of an equation for `g': g A - -Compilation had errors - diff --git a/ghc/tests/typecheck/should_fail/tcfail073.stderr b/ghc/tests/typecheck/should_fail/tcfail073.stderr index aaaefc3..d51d64e 100644 --- a/ghc/tests/typecheck/should_fail/tcfail073.stderr +++ b/ghc/tests/typecheck/should_fail/tcfail073.stderr @@ -1,14 +1,12 @@ -tcfail073.hs:3: - Duplicate or overlapping instance declarations - for `Eq (a, b)' - defined at tcfail073.hs:7 and imported from module `PrelTup' +Duplicate or overlapping instance declarations: + tcfail073.hs:7: {Eq (a, b)} + /home/simonmar/builds/i386-unknown-linux/ghc/compiler/../lib/std/PrelTup.hi:66: {Eq (a, + b)} tcfail073.hs:8: - Could not deduce `Eq a' from the context: (Eq (a, b)) - Probable cause: missing `Eq a' in instance declaration context + Could not deduce `Eq a' from the context (Eq (a, b)) + Probable fix: + Add `Eq a' to the instance declaration context arising from use of `==' at tcfail073.hs:8 In the right-hand side of an equation for `==': m == o - -Compilation had errors - diff --git a/ghc/tests/typecheck/should_fail/tcfail075.stderr b/ghc/tests/typecheck/should_fail/tcfail075.stderr index 3417c3a..37519c9 100644 --- a/ghc/tests/typecheck/should_fail/tcfail075.stderr +++ b/ghc/tests/typecheck/should_fail/tcfail075.stderr @@ -1,30 +1,23 @@ -tcfail075.hs:5: - Top-level bindings for unlifted types aren't allowed x = 1# +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 + In the first argument of `(+#)', namely `x' tcfail075.hs:15: Couldn't match `#' against `*' - Expected kind: # - Inferred kind: * When matching types `Int#' and `t' Expected type: Int# Inferred type: t + In the first argument of `(-#)', namely `x' 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 - + In the first argument of `(>#)', namely `z' diff --git a/ghc/tests/typecheck/should_fail/tcfail076.stderr b/ghc/tests/typecheck/should_fail/tcfail076.stderr index d3bf9a7..fdf02e0 100644 --- a/ghc/tests/typecheck/should_fail/tcfail076.stderr +++ b/ghc/tests/typecheck/should_fail/tcfail076.stderr @@ -2,15 +2,12 @@ tcfail076.hs:18: Inferred type is less polymorphic than expected Quantified type variable `res' escapes - It is mentioned in the environment - The following variables in the environment mention `res' - cont :: a -> m res + It unifies with `res1', which is mentioned in the environment + The following variables in the environment mention `res1' + cont :: a -> m res1 Signature type: forall res. (a1 -> m1 res) -> m1 res - Type to generalise: (b -> m res) -> m res + Type to generalise: (b -> m res1) -> m res1 When checking an expression type signature In the first argument of `KContT', namely `(\ cont' -> cont a)' In the right-hand side of a lambda abstraction: KContT (\ cont' -> cont a) - -Compilation had errors - diff --git a/ghc/tests/typecheck/should_fail/tcfail077.stderr b/ghc/tests/typecheck/should_fail/tcfail077.stderr index 9626bb4..9fa247b 100644 --- a/ghc/tests/typecheck/should_fail/tcfail077.stderr +++ b/ghc/tests/typecheck/should_fail/tcfail077.stderr @@ -1,5 +1,2 @@ tcfail077.hs:8: Variable not in scope: `op2' - -Compilation had errors - diff --git a/ghc/tests/typecheck/should_fail/tcfail078.stderr b/ghc/tests/typecheck/should_fail/tcfail078.stderr index 8002caa..ff654ac 100644 --- a/ghc/tests/typecheck/should_fail/tcfail078.stderr +++ b/ghc/tests/typecheck/should_fail/tcfail078.stderr @@ -1,7 +1,5 @@ tcfail078.hs:5: - Type constructor used as a class: Integer + Type constructor `Integer' used as a class When checking kinds in `Integer i' - -Compilation had errors - + In a type signature for `f' diff --git a/ghc/tests/typecheck/should_fail/tcfail079.stderr b/ghc/tests/typecheck/should_fail/tcfail079.stderr index 7765b82..29fe55c 100644 --- a/ghc/tests/typecheck/should_fail/tcfail079.stderr +++ b/ghc/tests/typecheck/should_fail/tcfail079.stderr @@ -1,10 +1,2 @@ -tcfail079.hs:9: - Couldn't match `*' against `#' - Expected kind: * - Inferred kind: # - When checking that `Int#' is a type - In the data type declaration for `Unboxed' - -Compilation had errors - +tcfail079.hs:7: Could not find interface file for `GlaExts' diff --git a/ghc/tests/typecheck/should_fail/tcfail080.stderr b/ghc/tests/typecheck/should_fail/tcfail080.stderr index 0e40dd8..c5c6f22 100644 --- a/ghc/tests/typecheck/should_fail/tcfail080.stderr +++ b/ghc/tests/typecheck/should_fail/tcfail080.stderr @@ -5,6 +5,3 @@ tcfail080.hs:11: In the first argument of `isempty', namely `(singleton x)' In the right-hand side of an equation for `q': isempty (singleton x) - -Compilation had errors - diff --git a/ghc/tests/typecheck/should_fail/tcfail081.stderr b/ghc/tests/typecheck/should_fail/tcfail081.stderr index f66b5ec..ab83566 100644 --- a/ghc/tests/typecheck/should_fail/tcfail081.stderr +++ b/ghc/tests/typecheck/should_fail/tcfail081.stderr @@ -1,9 +1,5 @@ -tcfail081.hs:2: - Cannot unify the type-signature variable `a' with the type `IO t' - Expected type: IO t - Inferred type: a - When checking that `main' has the required type - -Compilation had errors - +Cannot unify the type-signature variable `a' with the type `IO t' + Expected type: IO t + Inferred type: a +When checking that `main' has the required type diff --git a/ghc/tests/typecheck/should_fail/tcfail082.stderr b/ghc/tests/typecheck/should_fail/tcfail082.stderr index 7d714ee..e9f9baa 100644 --- a/ghc/tests/typecheck/should_fail/tcfail082.stderr +++ b/ghc/tests/typecheck/should_fail/tcfail082.stderr @@ -1,14 +1,10 @@ -tcfail082.hs:1: - Duplicate or overlapping instance declarations - for `Read FooData' - imported from module `Inst82_1' and imported from module `Inst82_2' +Duplicate or overlapping instance declarations: + ./Inst82_1.hi:8: {Read FooData} + ./Inst82_2.hi:8: {Read FooData} tcfail082.hs:8: No instance for `Show FooData' arising from use of `print' at tcfail082.hs:8 - In the right-hand side of a pattern binding: + In the right-hand side of an equation for `main': print ((read "FooData") :: FooData) - -Compilation had errors - diff --git a/ghc/tests/typecheck/should_fail/tcfail083.stderr b/ghc/tests/typecheck/should_fail/tcfail083.stderr index fc7776b..275ba74 100644 --- a/ghc/tests/typecheck/should_fail/tcfail083.stderr +++ b/ghc/tests/typecheck/should_fail/tcfail083.stderr @@ -5,6 +5,3 @@ tcfail083.hs:8: In the pattern: State {bar = Bar {flag = f, baz = b}} In an equation for function `display': display (State {bar = Bar {flag = f, baz = b}}) = print (f, b) - -Compilation had errors - diff --git a/ghc/tests/typecheck/should_fail/tcfail084.stderr b/ghc/tests/typecheck/should_fail/tcfail084.stderr index 85e1440..ce21a59 100644 --- a/ghc/tests/typecheck/should_fail/tcfail084.stderr +++ b/ghc/tests/typecheck/should_fail/tcfail084.stderr @@ -2,7 +2,4 @@ tcfail084.hs:10: Constructor `F' does not have field `y' In the record construction: F {y = 2} - In the right-hand side of a pattern binding: F {y = 2} - -Compilation had errors - + In the right-hand side of an equation for `z': F {y = 2} diff --git a/ghc/tests/typecheck/should_fail/tcfail085.stderr b/ghc/tests/typecheck/should_fail/tcfail085.stderr index 7b1637b..6b5747d 100644 --- a/ghc/tests/typecheck/should_fail/tcfail085.stderr +++ b/ghc/tests/typecheck/should_fail/tcfail085.stderr @@ -2,7 +2,4 @@ tcfail085.hs:9: Constructor `F' does not have the required strict field `y' In the record construction: F {x = 2} - In the right-hand side of a pattern binding: F {x = 2} - -Compilation had errors - + In the right-hand side of an equation for `z': F {x = 2} diff --git a/ghc/tests/typecheck/should_fail/tcfail086.stderr b/ghc/tests/typecheck/should_fail/tcfail086.stderr index bb58519..1a477ad 100644 --- a/ghc/tests/typecheck/should_fail/tcfail086.stderr +++ b/ghc/tests/typecheck/should_fail/tcfail086.stderr @@ -1,7 +1,3 @@ -tcfail086.hs:4: - Can't derive any instances for type `Ex' - because it has existentially-quantified constructor(s) - -Compilation had errors - +Can't derive any instances for type `Ex' +because it has existentially-quantified constructor(s) diff --git a/ghc/tests/typecheck/should_fail/tcfail087.stderr b/ghc/tests/typecheck/should_fail/tcfail087.stderr index 8d1c8b6..d4270ef 100644 --- a/ghc/tests/typecheck/should_fail/tcfail087.stderr +++ b/ghc/tests/typecheck/should_fail/tcfail087.stderr @@ -1 +1,4 @@ - + +tcfail087.hs:8: + Illegal unboxed tuple type as argument: (# Int, Int #) + In a type signature for `f' diff --git a/ghc/tests/typecheck/should_fail/tcfail088.stderr b/ghc/tests/typecheck/should_fail/tcfail088.stderr index bd08451..a0e880c 100644 --- a/ghc/tests/typecheck/should_fail/tcfail088.stderr +++ b/ghc/tests/typecheck/should_fail/tcfail088.stderr @@ -7,6 +7,3 @@ tcfail088.hs:14: Illegal polymorphic type as argument: forall b. b When checking kinds in `T s (forall b. b)' In a type signature for `g' - -Compilation had errors - -- 1.7.10.4