[project @ 2001-08-08 13:31:05 by simonmar]

update expected output

4 files changed, 6 insertions, 14 deletions

diff --git a/ghc/tests/ccall/should_fail/cc001.stderr b/ghc/tests/ccall/should_fail/cc001.stderr
index 7e8b44fb43..bb6a1e82d0 100644
--- a/ghc/tests/ccall/should_fail/cc001.stderr
+++ b/ghc/tests/ccall/should_fail/cc001.stderr
@@ -3,4 +3,4 @@ cc001.hs:5:
     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 definition of function `f': _ccall_ foo (undefined ())
+    In the definition of `f': _ccall_ foo (undefined ())
diff --git a/ghc/tests/ccall/should_fail/cc002.stderr b/ghc/tests/ccall/should_fail/cc002.stderr
index 3852a6a8cd..408984007a 100644
--- a/ghc/tests/ccall/should_fail/cc002.stderr
+++ b/ghc/tests/ccall/should_fail/cc002.stderr
@@ -2,4 +2,4 @@
 cc002.hs:10:
     No instance for `PrelGHC.CReturnable ForeignObj'
     arising from the result of the _ccall_ to `a' at cc002.hs:10
-    in the definition of function `a': _ccall_ a
+    In the definition of `a': _ccall_ a
diff --git a/ghc/tests/ccall/should_fail/cc004.stderr b/ghc/tests/ccall/should_fail/cc004.stderr
index 7f2415693f..09be734983 100644
--- a/ghc/tests/ccall/should_fail/cc004.stderr
+++ b/ghc/tests/ccall/should_fail/cc004.stderr
@@ -1,16 +1,10 @@
 
-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
-
 cc004.hs:8:
     Ambiguous type variable(s) `a'
 	in the constraint `PrelGHC.CReturnable a'
     arising from the result of the _ccall_ to `f' at cc004.hs:8
     In the first argument of `thenADR', namely `_ccall_ f'
-    in the definition of function `foo':
+    In the definition of `foo':
 	(_ccall_ f) `thenADR` (\ a -> return (a + 1))
 
 cc004.hs:8:
@@ -24,7 +18,7 @@ cc004.hs:15:
 	in the constraint `PrelGHC.CReturnable a'
     arising from the result of the _ccall_ to `f' at cc004.hs:15
     In the first argument of `thenADR', namely `_ccall_ f'
-    in the definition of function `bar':
+    In the definition of `bar':
 	(_ccall_ f) `thenADR` (\ a -> return (a + 1))
 
 cc004.hs:15:
diff --git a/ghc/tests/ccall/should_fail/cc005.stderr b/ghc/tests/ccall/should_fail/cc005.stderr
index a8ca42b5f2..f207a3e3b7 100644
--- a/ghc/tests/ccall/should_fail/cc005.stderr
+++ b/ghc/tests/ccall/should_fail/cc005.stderr
@@ -1,10 +1,8 @@
 
 cc005.hs:7:
     Unacceptable argument type in foreign declaration: Int#
-    When checking declaration:
-	foreign export _ccall "foo" foo :: Int# -> IO ()
+    When checking declaration: foreign export foo foo :: Int# -> IO ()
 
 cc005.hs:10:
     Unacceptable result type in foreign declaration: Int#
-    When checking declaration:
-	foreign export _ccall "bar" bar :: Int -> Int#
+    When checking declaration: foreign export bar bar :: Int -> Int#