[project @ 1999-03-02 10:40:40 by sof]

Updates + added empty decl regression test

diff --git a/ghc/tests/reader/should_compile/Makefile b/ghc/tests/reader/should_compile/Makefile
index 71d1bba..93597c1 100644 (file)
--- a/ghc/tests/reader/should_compile/Makefile
+++ b/ghc/tests/reader/should_compile/Makefile
@@ -5,7 +5,7 @@ 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
+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_compile/MyList.hi b/ghc/tests/reader/should_compile/MyList.hi
index fae8c0f..b92cd0f 100644 (file)
--- a/ghc/tests/reader/should_compile/MyList.hi
+++ b/ghc/tests/reader/should_compile/MyList.hi
@@ -1,6 +1,6 @@
 __interface MyList 1 0 where
-import PrelBase 29 :: addr2Integer 8 foldr 1 int2Integer 8 integer_0 8 integer_1 8 integer_2 8 integer_m1 8;
-import PrelPack 28 :: packCString# 1 unpackAppendCString# 1 unpackCString# 1 unpackFoldrCString# 1 unpackNBytes# 9;
-__instimport IO ; __instimport PrelAddr ; __instimport PrelArr ; __instimport PrelBounded ; __instimport PrelCCall ; __instimport PrelConc ; __instimport PrelForeign ; __instimport PrelIOBase ; __instimport PrelNum ; __instimport PrelNumExtra ; __instimport PrelTup ;
-__export MyList MyList{Empty :::};
-1 data MyList a = Empty |  ::: (MyList a) (MyList a) ;
+import PrelBase 16 :: addr2Integer 1 foldr 1 int2Integer 1 integer_0 1 integer_1 1 integer_2 1 integer_m1 1;
+import PrelPack 15 :: packCStringzh 1 unpackAppendCStringzh 1 unpackCStringzh 1 unpackFoldrCStringzh 1 unpackNByteszh 1;
+__instimport IO ; __instimport PrelAddr ; __instimport PrelArr ; __instimport PrelBounded ; __instimport PrelCCall ; __instimport PrelConc ; __instimport PrelForeign ; __instimport PrelIOBase ; __instimport PrelNum ; __instimport PrelNumExtra ; __instimport PrelStable ; __instimport PrelTup ;
+__export MyList MyList{Empty ZCZCZC};
+2 data MyList a = Empty |  ZCZCZC (MyList a) (MyList a) ;

diff --git a/ghc/tests/reader/should_compile/read012.stderr b/ghc/tests/reader/should_compile/read012.stderr
new file mode 100644 (file)
index 0000000..e375ede
--- /dev/null
+++ b/ghc/tests/reader/should_compile/read012.stderr
@@ -0,0 +1 @@
+ghc: module version changed to 1; reason: no old .hi file

diff --git a/ghc/tests/reader/should_compile/read014.stderr b/ghc/tests/reader/should_compile/read014.stderr
index 1a4da3b..950e3db 100644 (file)
--- a/ghc/tests/reader/should_compile/read014.stderr
+++ b/ghc/tests/reader/should_compile/read014.stderr
@@ -1,4 +1,3 @@
-
 read014.hs:2: Warning: definition but no type signature for `ng1'
 
 read014.hs:4: Warning: Defined but not used: x
@@ -6,7 +5,6 @@ read014.hs:4: Warning: Defined but not used: x
 read014.hs:8: Warning: Defined but not used: x
 
 
-
 read014.hs:8:
     Warning: No explicit method nor default method for `fromInteger'
             in an instance declaration for `Num'

diff --git a/ghc/tests/reader/should_compile/read015.hs b/ghc/tests/reader/should_compile/read015.hs
new file mode 100644 (file)
index 0000000..2cee2da
--- /dev/null
+++ b/ghc/tests/reader/should_compile/read015.hs
@@ -0,0 +1,2 @@
+-- !!! Testing whether the parser likes empty declarations..
+module M where { ;;;;;x=let{;;;;;y=2;;;;}in y;;;;;}