From: sof <unknown>
Date: Sat, 23 Jan 1999 18:03:53 +0000 (+0000)
Subject: [project @ 1999-01-23 18:03:40 by sof]
X-Git-Tag: Approx_2487_patches~3
X-Git-Url: http://git.megacz.com/?a=commitdiff_plain;h=617094a89428a6206da742aaf05960063b1bef92;p=ghc-hetmet.git

[project @ 1999-01-23 18:03:40 by sof]
h98 updates
---

diff --git a/ghc/tests/rename/should_compile/Int10.hi b/ghc/tests/rename/should_compile/Int10.hi
index 335754f..44c3bf3 100644
--- a/ghc/tests/rename/should_compile/Int10.hi
+++ b/ghc/tests/rename/should_compile/Int10.hi
@@ -1,7 +1,5 @@
-_interface_ Int10 1 400
-_exports_
-Int10 T1{C1} T2{T2C1 T2C2} T3{T3C1 T3C2 T3C3} T4{T4C1 T4C2 T4C3 T4C4} T5{T5C1 T5C2 T5C3 T5C4 T5C5} T6{T6C6} T7{T7C6 T7C7} ;
-_declarations_
+__interface Int10 1 0 where
+__export Int10 T1{C1} T2{T2C1 T2C2} T3{T3C1 T3C2 T3C3} T4{T4C1 T4C2 T4C3 T4C4} T5{T5C1 T5C2 T5C3 T5C4 T5C5} T6{T6C6} T7{T7C6 T7C7} ;
 1 data T1 a = C1 a;
 1 data T2 a b = T2C1 a | T2C2 b ;
 1 data T3 a b c = T3C1 a | T3C2 b | T3C3 c ;
diff --git a/ghc/tests/rename/should_compile/Makefile b/ghc/tests/rename/should_compile/Makefile
index 2596f4d..fd954bb 100644
--- a/ghc/tests/rename/should_compile/Makefile
+++ b/ghc/tests/rename/should_compile/Makefile
@@ -4,7 +4,7 @@ include $(TOP)/mk/should_compile.mk
 
 SRC_HC_OPTS += -noC -dcore-lint
 
-rn017_HC_OPTS = -hi
+rn017_HC_OPTS = -hi -hi-with-exports
 
 include $(TOP)/mk/target.mk
 
diff --git a/ghc/tests/rename/should_compile/Rn016.hi b/ghc/tests/rename/should_compile/Rn016.hi
index fdf2ca0..30dca25 100644
--- a/ghc/tests/rename/should_compile/Rn016.hi
+++ b/ghc/tests/rename/should_compile/Rn016.hi
@@ -1,12 +1,9 @@
-_interface_ Rn016 1 400
-_exports_
-Rn016 K{op1 op2};
-_instances_
-instance {K PrelBase.Int} = $d1;
-instance {K PrelBase.Bool} = $d2;
-instance _forall_ [a] => {K [a]} = $d3;
-_declarations_
-1 $d1 _:_ {K PrelBase.Int} ;;
-1 $d2 _:_ {K PrelBase.Bool} ;;
-1 $d3 _:_ _forall_ [a] {K PrelList.[a]} ;;
+__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 PrelList.[a]} ;
 1 class K a :: (* -> *) where { op1 :: a -> a ; op2 :: a -> a } ;
diff --git a/ghc/tests/rename/should_compile/Rn017.hi b/ghc/tests/rename/should_compile/Rn017.hi
index b618774..8f85dbb 100644
--- a/ghc/tests/rename/should_compile/Rn017.hi
+++ b/ghc/tests/rename/should_compile/Rn017.hi
@@ -1,9 +1,7 @@
-_interface_ Rn017 1 400
-_exports_
-Rn017 a b c Wibble{MkWibble} Wobble ;
-_declarations_
+__interface Rn017 1 0 where
+__export Rn017 a b c Wibble{MkWibble} Wobble ;
 1 data Wibble = MkWibble Wobble ;
 1 data Wobble ;
-1 a _:_ Int -> Int ;;
-1 b _:_ Int -> Int ;;
-1 c _:_ Int -> Int ;;
+1 a :: Int -> Int ;
+1 b :: Int -> Int ;
+1 c :: Int -> Int ;
diff --git a/ghc/tests/rename/should_compile/rn003.hs b/ghc/tests/rename/should_compile/rn003.hs
index 493cfa2..bb22583 100644
--- a/ghc/tests/rename/should_compile/rn003.hs
+++ b/ghc/tests/rename/should_compile/rn003.hs
@@ -2,7 +2,7 @@ module Foo (f) where
 -- export food
 f x = x
 
---!!! weird patterns with no variables
+-- !!! weird patterns with no variables
 1  = f 1
 [] = f []
 1  = f (f 1)
diff --git a/ghc/tests/rename/should_compile/rn005.hs b/ghc/tests/rename/should_compile/rn005.hs
index f1df424..623bd78 100644
--- a/ghc/tests/rename/should_compile/rn005.hs
+++ b/ghc/tests/rename/should_compile/rn005.hs
@@ -1,4 +1,4 @@
---!!! rn005: simplest case: a few non-recursive bindings
+-- !!! rn005: simplest case: a few non-recursive bindings
 
 module Test where
 
diff --git a/ghc/tests/rename/should_compile/rn006.hs b/ghc/tests/rename/should_compile/rn006.hs
index 6524bba..4f4c0a4 100644
--- a/ghc/tests/rename/should_compile/rn006.hs
+++ b/ghc/tests/rename/should_compile/rn006.hs
@@ -1,6 +1,6 @@
---!!! rn006: two sets of mutually-recursive blobs:
---!!!  f, g, h are mut rec
---!!!  i, j, k are mut rec
+-- !!! rn006: two sets of mutually-recursive blobs:
+-- !!!  f, g, h are mut rec
+-- !!!  i, j, k are mut rec
 
 module Test where
 
diff --git a/ghc/tests/rename/should_compile/rn006.stderr b/ghc/tests/rename/should_compile/rn006.stderr
index 955d1e1..e69de29 100644
--- a/ghc/tests/rename/should_compile/rn006.stderr
+++ b/ghc/tests/rename/should_compile/rn006.stderr
@@ -1,2 +0,0 @@
-
-NOTE: Simplifier still going after 4 iterations; bailing out.
diff --git a/ghc/tests/rename/should_compile/rn016.hs b/ghc/tests/rename/should_compile/rn016.hs
index a1c1290..618880e 100644
--- a/ghc/tests/rename/should_compile/rn016.hs
+++ b/ghc/tests/rename/should_compile/rn016.hs
@@ -1,4 +1,4 @@
---!!! Import an interface defining a class and some instances
+-- !!! Import an interface defining a class and some instances
 
 module Main where
 
diff --git a/ghc/tests/rename/should_compile/rn017.hs b/ghc/tests/rename/should_compile/rn017.hs
index 1a3c2d0..6694f24 100644
--- a/ghc/tests/rename/should_compile/rn017.hs
+++ b/ghc/tests/rename/should_compile/rn017.hs
@@ -1,4 +1,4 @@
---!! Rexporting
+-- !! Rexporting
 module Test ( module Test , module Rn017 ) where
 
 import Rn017
diff --git a/ghc/tests/rename/should_compile/rn017.stderr b/ghc/tests/rename/should_compile/rn017.stderr
index 6a7ad69..97e1a59 100644
--- a/ghc/tests/rename/should_compile/rn017.stderr
+++ b/ghc/tests/rename/should_compile/rn017.stderr
@@ -1,20 +1,3 @@
 ghc: module version changed to 1; reason: no old .hi file
-_interface_ Test 1 400
-_instance_modules_
-IO PrelAddr PrelArr PrelBounded PrelCCall PrelForeign PrelIOBase PrelNum PrelNumExtra PrelTup
-_usages_
-PrelBase 1 :: $dEq0 1 $dEq1 1 $dEqBool0 1 $dEqChar0 1 $dEqInt0 1 $dEqInteger0 1 $dNumInt0 1 $dShow0 1 $dShow1 1 $dShow2 1 $dShowBool0 1 $dShowChar0 1 $dShowInt0 1 $m- 1 $m/= 1 $mfromInt 1 $mshowList 1 addr2Integer 1 foldr 1 int2Integer 1 integer_0 1 integer_1 1 integer_2 1 integer_m1 1 Eq 1 Num 1 Show 1 String 1;
-PrelNum 1 :: $dNumInteger0 1 $dShowInteger0 1;
-PrelNumExtra 1 :: $dEqDouble0 1 $dNumDouble0 1 $dShowDouble0 1;
-PrelPack 1 :: packCString# 1 unpackAppendCString# 1 unpackCString# 1 unpackFoldrCString# 1 unpackNBytes# 1;
-Rn017 1 ::;
-_exports_
-Rn017 a b c Wibble{MkWibble} Wobble;
-Test f FOO{:FOO :FOO op} Foo{MkFoo};
-_instances_
-instance {FOO Foo} = $dFOOFoo0;
-_declarations_
-1 $dFOOFoo0 _:_ {FOO Foo} ;;
-1 class FOO $r3I where {op :: $r3I -> PrelBase.Int} ;
-1 data Foo = MkFoo ;
-1 f _:_ _forall_ [$a] => $a -> $a ;;
+__export Rn017 a b c Wibble{MkWibble} Wobble;
+__export Test f FOO{op} Foo{MkFoo};
diff --git a/ghc/tests/rename/should_compile/rn023.hs b/ghc/tests/rename/should_compile/rn023.hs
index 4b533ec..3522ff0 100644
--- a/ghc/tests/rename/should_compile/rn023.hs
+++ b/ghc/tests/rename/should_compile/rn023.hs
@@ -1,3 +1,3 @@
---!! This one is fine in Haskell 1.4
+-- !! This one is fine in Haskell 1.4
 --
 module Foo ( Bar(..) ) where { data Bar = Bar X; data X = Y }
diff --git a/ghc/tests/rename/should_compile/rn024.hs b/ghc/tests/rename/should_compile/rn024.hs
index 36fd8fd..ae9cc6b 100644
--- a/ghc/tests/rename/should_compile/rn024.hs
+++ b/ghc/tests/rename/should_compile/rn024.hs
@@ -1,4 +1,4 @@
---!! This is fine in Haskell 1.4
+-- !! This is fine in Haskell 1.4
 --
 module Foo ( Baz(..) ) where 
 
diff --git a/ghc/tests/rename/should_compile/timing001.hs b/ghc/tests/rename/should_compile/timing001.hs
index ab20102..b84b341 100644
--- a/ghc/tests/rename/should_compile/timing001.hs
+++ b/ghc/tests/rename/should_compile/timing001.hs
@@ -1,4 +1,4 @@
---!!! 500 defns chained together at the top-level
+-- !!! 500 defns chained together at the top-level
 module Main(main) where
 main = undefined
 a000 = a001
diff --git a/ghc/tests/rename/should_compile/timing002.hs b/ghc/tests/rename/should_compile/timing002.hs
index db98718..f81b026 100644
--- a/ghc/tests/rename/should_compile/timing002.hs
+++ b/ghc/tests/rename/should_compile/timing002.hs
@@ -1,4 +1,4 @@
---!!! 500 defns chained together with "where"s
+-- !!! 500 defns chained together with "where"s
 module Main(main) where
 
 main = undefined
diff --git a/ghc/tests/rename/should_compile/timing003.hs b/ghc/tests/rename/should_compile/timing003.hs
index e897868..c268646 100644
--- a/ghc/tests/rename/should_compile/timing003.hs
+++ b/ghc/tests/rename/should_compile/timing003.hs
@@ -1,4 +1,4 @@
---!!! 500 defns, not chained together
+-- !!! 500 defns, not chained together
 module Main(main) where
 
 main = undefined
diff --git a/ghc/tests/rename/should_fail/rnfail001.stderr b/ghc/tests/rename/should_fail/rnfail001.stderr
index 92fd228..aa56cac 100644
--- a/ghc/tests/rename/should_fail/rnfail001.stderr
+++ b/ghc/tests/rename/should_fail/rnfail001.stderr
@@ -3,3 +3,4 @@ rnfail001.hs:3: Conflicting definitions for `x' in pattern
 
 
 Compilation had errors
+
diff --git a/ghc/tests/rename/should_fail/rnfail002.hs b/ghc/tests/rename/should_fail/rnfail002.hs
index f2648a9..ab38722 100644
--- a/ghc/tests/rename/should_fail/rnfail002.hs
+++ b/ghc/tests/rename/should_fail/rnfail002.hs
@@ -1,5 +1,5 @@
---!!! rn001: super-simple set of bindings,
---!!!	incl wildcard pattern-bindings and *duplicates*
+-- !!! rn001: super-simple set of bindings,
+-- !!!	incl wildcard pattern-bindings and *duplicates*
 
 x = []
 y = []
diff --git a/ghc/tests/rename/should_fail/rnfail002.stderr b/ghc/tests/rename/should_fail/rnfail002.stderr
index 24a8601..4a0a131 100644
--- a/ghc/tests/rename/should_fail/rnfail002.stderr
+++ b/ghc/tests/rename/should_fail/rnfail002.stderr
@@ -1,8 +1,9 @@
  
 rnfail002.hs:4:
-    Conflicting definitions for `y'
-	Defined at rnfail002.hs:6
-	Defined at rnfail002.hs:5
+    Multiple declarations of `y'
+	defined at rnfail002.hs:5
+	defined at rnfail002.hs:6
 
 
 Compilation had errors
+
diff --git a/ghc/tests/rename/should_fail/rnfail003.hs b/ghc/tests/rename/should_fail/rnfail003.hs
index 51a09b6..fb62bac 100644
--- a/ghc/tests/rename/should_fail/rnfail003.hs
+++ b/ghc/tests/rename/should_fail/rnfail003.hs
@@ -1,4 +1,4 @@
---!!! split definition of f (error)
+-- !!! split definition of f (error)
 f [] = []
 g x = x
 f (x:xs) = []
diff --git a/ghc/tests/rename/should_fail/rnfail003.stderr b/ghc/tests/rename/should_fail/rnfail003.stderr
index 25b82c0..cd3ec69 100644
--- a/ghc/tests/rename/should_fail/rnfail003.stderr
+++ b/ghc/tests/rename/should_fail/rnfail003.stderr
@@ -1,8 +1,9 @@
  
 rnfail003.hs:2:
-    Conflicting definitions for `f'
-	Defined at rnfail003.hs:4
-	Defined at rnfail003.hs:2
+    Multiple declarations of `f'
+	defined at rnfail003.hs:2
+	defined at rnfail003.hs:4
 
 
 Compilation had errors
+
diff --git a/ghc/tests/rename/should_fail/rnfail004.hs b/ghc/tests/rename/should_fail/rnfail004.hs
index 3a14f48..90a97f8 100644
--- a/ghc/tests/rename/should_fail/rnfail004.hs
+++ b/ghc/tests/rename/should_fail/rnfail004.hs
@@ -1,4 +1,4 @@
---!!! multiple definitions, but hidden in patterns
+-- !!! multiple definitions, but hidden in patterns
 module Foo where
 
 f x = x
diff --git a/ghc/tests/rename/should_fail/rnfail004.stderr b/ghc/tests/rename/should_fail/rnfail004.stderr
index cd56751..1136eea 100644
--- a/ghc/tests/rename/should_fail/rnfail004.stderr
+++ b/ghc/tests/rename/should_fail/rnfail004.stderr
@@ -5,3 +5,4 @@ rnfail004.hs:7: Conflicting definitions for `b' in binding group
 
 
 Compilation had errors
+
diff --git a/ghc/tests/rename/should_fail/rnfail007.hs b/ghc/tests/rename/should_fail/rnfail007.hs
index 99254dc..272abcf 100644
--- a/ghc/tests/rename/should_fail/rnfail007.hs
+++ b/ghc/tests/rename/should_fail/rnfail007.hs
@@ -1,4 +1,4 @@
---!!! Main module with no definition of main
+-- !!! Main module with no definition of main
 
 module Main where
 
diff --git a/ghc/tests/rename/should_fail/rnfail007.stderr b/ghc/tests/rename/should_fail/rnfail007.stderr
index 56ef045..7e8bc0e 100644
--- a/ghc/tests/rename/should_fail/rnfail007.stderr
+++ b/ghc/tests/rename/should_fail/rnfail007.stderr
@@ -4,3 +4,4 @@ rnfail007.hs:3:
 
 
 Compilation had errors
+
diff --git a/ghc/tests/rename/should_fail/rnfail008.hs b/ghc/tests/rename/should_fail/rnfail008.hs
index 8520347..196214a 100644
--- a/ghc/tests/rename/should_fail/rnfail008.hs
+++ b/ghc/tests/rename/should_fail/rnfail008.hs
@@ -1,4 +1,4 @@
---!!! Class and instance decl
+-- !!! Class and instance decl
 
 module Test where
 
diff --git a/ghc/tests/rename/should_fail/rnfail008.stderr b/ghc/tests/rename/should_fail/rnfail008.stderr
index 5c51c89..be1cc77 100644
--- a/ghc/tests/rename/should_fail/rnfail008.stderr
+++ b/ghc/tests/rename/should_fail/rnfail008.stderr
@@ -3,3 +3,4 @@ rnfail008.hs:18: Value not in scope: `op3'
 
 
 Compilation had errors
+
diff --git a/ghc/tests/rename/should_fail/rnfail009.stderr b/ghc/tests/rename/should_fail/rnfail009.stderr
index 0decea2..774e538 100644
--- a/ghc/tests/rename/should_fail/rnfail009.stderr
+++ b/ghc/tests/rename/should_fail/rnfail009.stderr
@@ -1,8 +1,9 @@
  
 rnfail009.hs:1:
-    Conflicting definitions for `A'
-	Defined at rnfail009.hs:5
-	Defined at rnfail009.hs:3
+    Multiple declarations of `A'
+	defined at rnfail009.hs:3
+	defined at rnfail009.hs:5
 
 
 Compilation had errors
+
diff --git a/ghc/tests/rename/should_fail/rnfail010.stderr b/ghc/tests/rename/should_fail/rnfail010.stderr
index 9c4cf02..d19435b 100644
--- a/ghc/tests/rename/should_fail/rnfail010.stderr
+++ b/ghc/tests/rename/should_fail/rnfail010.stderr
@@ -1,8 +1,9 @@
  
 rnfail010.hs:2:
-    Conflicting definitions for `f'
-	Defined at rnfail010.hs:6
-	Defined at rnfail010.hs:2
+    Multiple declarations of `f'
+	defined at rnfail010.hs:2
+	defined at rnfail010.hs:6
 
 
 Compilation had errors
+
diff --git a/ghc/tests/rename/should_fail/rnfail011.stderr b/ghc/tests/rename/should_fail/rnfail011.stderr
index 1b4602f..8a33a31 100644
--- a/ghc/tests/rename/should_fail/rnfail011.stderr
+++ b/ghc/tests/rename/should_fail/rnfail011.stderr
@@ -1,8 +1,9 @@
  
 rnfail011.hs:2:
-    Conflicting definitions for `A'
-	Defined at rnfail011.hs:6
-	Defined at rnfail011.hs:2
+    Multiple declarations of `A'
+	defined at rnfail011.hs:2
+	defined at rnfail011.hs:6
 
 
 Compilation had errors
+
diff --git a/ghc/tests/rename/should_fail/rnfail012.stderr b/ghc/tests/rename/should_fail/rnfail012.stderr
index d1afdd7..bee8e16 100644
--- a/ghc/tests/rename/should_fail/rnfail012.stderr
+++ b/ghc/tests/rename/should_fail/rnfail012.stderr
@@ -1,13 +1,9 @@
  
 rnfail012.hs:2:
-    Conflicting definitions for `A'
-	Defined at rnfail012.hs:9
-	Defined at rnfail012.hs:3
- 
-rnfail012.hs:2:
-    Conflicting definitions for `:A'
-	Defined at rnfail012.hs:9
-	Defined at rnfail012.hs:3
+    Multiple declarations of `A'
+	defined at rnfail012.hs:3
+	defined at rnfail012.hs:9
 
 
 Compilation had errors
+
diff --git a/ghc/tests/rename/should_fail/rnfail013.hs b/ghc/tests/rename/should_fail/rnfail013.hs
index 0c78946..4d30ded 100644
--- a/ghc/tests/rename/should_fail/rnfail013.hs
+++ b/ghc/tests/rename/should_fail/rnfail013.hs
@@ -1,4 +1,4 @@
---!!! Conflicting constructors from two data type decls
+-- !!! Conflicting constructors from two data type decls
 
 module Foo where
 
diff --git a/ghc/tests/rename/should_fail/rnfail013.stderr b/ghc/tests/rename/should_fail/rnfail013.stderr
index 253eb6e..86c73ba 100644
--- a/ghc/tests/rename/should_fail/rnfail013.stderr
+++ b/ghc/tests/rename/should_fail/rnfail013.stderr
@@ -1,8 +1,9 @@
  
 rnfail013.hs:3:
-    Conflicting definitions for `MkT'
-	Defined at rnfail013.hs:9
-	Defined at rnfail013.hs:7
+    Multiple declarations of `MkT'
+	defined at rnfail013.hs:7
+	defined at rnfail013.hs:9
 
 
 Compilation had errors
+
diff --git a/ghc/tests/rename/should_fail/rnfail014.stderr b/ghc/tests/rename/should_fail/rnfail014.stderr
index 8e2bef9..460650a 100644
--- a/ghc/tests/rename/should_fail/rnfail014.stderr
+++ b/ghc/tests/rename/should_fail/rnfail014.stderr
@@ -1,4 +1,16 @@
  
+rnfail014.hs:9:
+    The constraint `Eq a' does not mention any of
+	the universally quantified type variables {}
+	of the type `Eq Bool'
+    In the type signature for an instance decl
+ 
+rnfail014.hs:9:
+    The constraint `Eq a'
+	mentions type variables that do not appear in the type
+	`Eq Bool'
+    In the type signature for an instance decl
+ 
 rnfail014.hs:12:
     The constraint `Eq a' does not mention any of
 	the universally quantified type variables {}
@@ -16,18 +28,7 @@ rnfail014.hs:17:
 	the universally quantified type variables {}
 	of the type `a -> a'
     In the type signature for `op'
- 
-rnfail014.hs:9:
-    The constraint `Eq a' does not mention any of
-	the universally quantified type variables {}
-	of the type `Eq Bool'
-    In the type signature for an instance decl
- 
-rnfail014.hs:9:
-    The constraint `Eq a'
-	mentions type variables that do not appear in the type
-	`Eq Bool'
-    In the type signature for an instance decl
 
 
 Compilation had errors
+
diff --git a/ghc/tests/rename/should_fail/rnfail015.hs b/ghc/tests/rename/should_fail/rnfail015.hs
index 0852c50..20f9934 100644
--- a/ghc/tests/rename/should_fail/rnfail015.hs
+++ b/ghc/tests/rename/should_fail/rnfail015.hs
@@ -1,6 +1,6 @@
 module ShouldFail where
 
---!!! duplicate constructors in datatype
+-- !!! duplicate constructors in datatype
 -- (bug report from Alex Ferguson, c. 2.06)
 
 data Token
diff --git a/ghc/tests/rename/should_fail/rnfail015.stderr b/ghc/tests/rename/should_fail/rnfail015.stderr
index a4add48..5dfde4c 100644
--- a/ghc/tests/rename/should_fail/rnfail015.stderr
+++ b/ghc/tests/rename/should_fail/rnfail015.stderr
@@ -4,3 +4,4 @@ rnfail015.hs:9:
 
 
 Compilation had errors
+