[project @ 1998-03-16 17:53:54 by sof]

New layout test

diff --git a/ghc/tests/reader/should_compile/Makefile b/ghc/tests/reader/should_compile/Makefile
index 16f3a64..d55ad91 100644 (file)
--- a/ghc/tests/reader/should_compile/Makefile
+++ b/ghc/tests/reader/should_compile/Makefile
@@ -5,6 +5,5 @@ include $(TOP)/mk/should_compile.mk
 SRC_HC_OPTS += -noC -dcore-lint
 
 read004_HC_OPTS = -fno-implicit-prelude
-read006_HC_OPTS = -hi
 
 include $(TOP)/mk/target.mk

diff --git a/ghc/tests/reader/should_compile/MyList.hi b/ghc/tests/reader/should_compile/MyList.hi
index 852bdc7..7fefb65 100644 (file)
--- a/ghc/tests/reader/should_compile/MyList.hi
+++ b/ghc/tests/reader/should_compile/MyList.hi
@@ -1,12 +1,12 @@
-_interface_ MyList 1
+_interface_ MyList 1 302
 _instance_modules_
 IO PrelAddr PrelArr PrelBounded PrelCCall PrelForeign PrelNum
 _usages_
-PrelBase 1 :: $d2 1 $d29 1 $d31 1 $d33 1 $d38 1 Eval 1;
+PrelBase 3 :: $dEval0 1 $dEval2 1 $dEvalBool0 1 $dEvalDouble0 1 $dEvalInt0 1 Eval 1;
 _exports_
 MyList MyList(Empty :::);
 _instances_
-instance _forall_ [a] => {PrelBase.Eval (MyList a)} = $d1;
+instance _forall_ [a] => {PrelBase.Eval (MyList a)} = $dEvalMyList0;
 _declarations_
-1 $d1 _:_ _forall_ [a] => {PrelBase.Eval (MyList a)} ;;
+1 $dEvalMyList0 _:_ _forall_ [a] => {PrelBase.Eval (MyList a)} ;;
 1 data MyList a = Empty |  ::: (MyList a) (MyList a) ;

diff --git a/ghc/tests/reader/should_compile/read003.hs b/ghc/tests/reader/should_compile/read003.hs
new file mode 100644 (file)
index 0000000..7b3ef7a
--- /dev/null
+++ b/ghc/tests/reader/should_compile/read003.hs
@@ -0,0 +1,20 @@
+--!!! Testing layout rule
+module Layout where
+
+l1 :: IO ()
+l1 = do
+  return a
+  where
+   a = ()
+
+l2 :: IO ()
+l2 = do
+  return a
+ where
+  a = ()
+
+l3 :: IO ()
+l3 = do
+  return a
+   where
+   a = ()

diff --git a/ghc/tests/reader/should_compile/read006.hs b/ghc/tests/reader/should_compile/read006.hs
index 2fda8ca..036b02f 100644 (file)
--- a/ghc/tests/reader/should_compile/read006.hs
+++ b/ghc/tests/reader/should_compile/read006.hs
@@ -1,3 +1,4 @@
+--!!! Testing handling of troublesome constructor name (:::)
 module MyList (MyList(Empty, (:::))) where
 
 data MyList a =   Empty

diff --git a/ghc/tests/reader/should_compile/read006.stderr b/ghc/tests/reader/should_compile/read006.stderr
deleted file mode 100644 (file)
index 224f17c..0000000
--- a/ghc/tests/reader/should_compile/read006.stderr
+++ /dev/null
@@ -1,13 +0,0 @@
-ghc: module version unchanged at 1
-_interface_ MyList 1
-_instance_modules_
-IO PrelAddr PrelArr PrelBounded PrelCCall PrelForeign PrelNum
-_usages_
-PrelBase 1 :: $d2 1 $d29 1 $d31 1 $d33 1 $d38 1 Eval 1;
-_exports_
-MyList MyList(Empty :::);
-_instances_
-instance _forall_ [a] => {PrelBase.Eval (MyList a)} = $d1;
-_declarations_
-1 $d1 _:_ _forall_ [a] => {PrelBase.Eval (MyList a)} ;;
-1 data MyList a = Empty |  ::: (MyList a) (MyList a) ;

diff --git a/ghc/tests/reader/should_compile/read006.stdout b/ghc/tests/reader/should_compile/read006.stdout
deleted file mode 100644 (file)
index e69de29..0000000

diff --git a/ghc/tests/reader/should_compile/read009.hs b/ghc/tests/reader/should_compile/read009.hs
index c35b81a..a115cb5 100644 (file)
--- a/ghc/tests/reader/should_compile/read009.hs
+++ b/ghc/tests/reader/should_compile/read009.hs
@@ -1,6 +1,5 @@
-module ShouldSucceed where
-
 --!!! combining undeclared infix operators
+module ShouldSucceed where
 
 -- should default to 'infixl 9'