[project @ 1999-08-04 15:47:33 by simonmar]

Fix up expr001.hs and move it into should_compile

diff --git a/ghc/tests/reader/should_compile/Makefile b/ghc/tests/reader/should_compile/Makefile
index 71c4f4f..603d66b 100644 (file)
--- a/ghc/tests/reader/should_compile/Makefile
+++ b/ghc/tests/reader/should_compile/Makefile
@@ -4,7 +4,6 @@ include $(TOP)/mk/should_compile.mk
 
 SRC_HC_OPTS += -noC -dcore-lint
 
-read004_HC_OPTS = -fno-implicit-prelude
 read012_HC_OPTS += -O -funfold-casms-in-hi-file -fglasgow-exts -ohi T1.hi
 read013_HC_OPTS += -O -funfold-casms-in-hi-file -fglasgow-exts
 read014_HC_OPTS += -Wall

diff --git a/ghc/tests/reader/should_fail/expr001.hs b/ghc/tests/reader/should_compile/read004.hs
similarity index 90%
rename from ghc/tests/reader/should_fail/expr001.hs
rename to ghc/tests/reader/should_compile/read004.hs
index 764ffd9..f21bb12 100644 (file)
--- a/ghc/tests/reader/should_fail/expr001.hs
+++ b/ghc/tests/reader/should_compile/read004.hs
@@ -8,10 +8,9 @@ Date: Wed, 9 Oct 91 17:31:46 BST
 
 OK, I've fixed that little problem by disallowing,
 -}
-module Test where
 
 f x = x + if True then 1 else 2
-f x = x + 1::Int
+g x = x + 1::Int
 
 -- (the conditional/sig need to be parenthesised).  If this is
 -- problematic, let me know!

diff --git a/ghc/tests/reader/should_fail/expr001.stderr b/ghc/tests/reader/should_fail/expr001.stderr
deleted file mode 100644 (file)
index 53883ac..0000000
--- a/ghc/tests/reader/should_fail/expr001.stderr
+++ /dev/null
@@ -1,13 +0,0 @@
-
-==================== Reader ====================
-module Test where
-{- rec -}
-f x = x zp (if c then 1 else 2)
-f x = x zp 1 :: Int
-
-
-
-expr001.hs:11: Variable not in scope: `c'
-
-Compilation had errors
-