[project @ 2001-03-13 17:12:43 by simonmar]

update expected output

diff --git a/ghc/tests/ccall/should_fail/cc001.stderr b/ghc/tests/ccall/should_fail/cc001.stderr
index bb0cdfa..7e8b44f 100644 (file)
--- a/ghc/tests/ccall/should_fail/cc001.stderr
+++ b/ghc/tests/ccall/should_fail/cc001.stderr
@@ -3,5 +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 right-hand side of an equation for `f':
-       _ccall_ foo (undefined ())
+    in the definition of function `f': _ccall_ foo (undefined ())

diff --git a/ghc/tests/ccall/should_fail/cc002.stderr b/ghc/tests/ccall/should_fail/cc002.stderr
index cc2fd26..3852a6a 100644 (file)
--- 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 right-hand side of an equation for `a': _ccall_ a
+    in the definition of function `a': _ccall_ a

diff --git a/ghc/tests/ccall/should_fail/cc004.stderr b/ghc/tests/ccall/should_fail/cc004.stderr
index a6c1804..7f24156 100644 (file)
--- a/ghc/tests/ccall/should_fail/cc004.stderr
+++ b/ghc/tests/ccall/should_fail/cc004.stderr
@@ -1,28 +1,34 @@
 
-cc004.hs:8:
-    Ambiguous type variable(s) `a' in the constraint `Num a'
-    arising from use of `+' at cc004.hs:8
-    In the first argument of `return', namely `(a + 1)'
-    In the right-hand side of a lambda abstraction: return (a + 1)
+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 right-hand side of an equation for `foo':
+    in the definition of function `foo':
        (_ccall_ f) `thenADR` (\ a -> return (a + 1))
 
-cc004.hs:15:
+cc004.hs:8:
     Ambiguous type variable(s) `a' in the constraint `Num a'
-    arising from use of `+' at cc004.hs:15
+    arising from the literal `1' at cc004.hs:8
+    In the second argument of `(+)', namely `1'
     In the first argument of `return', namely `(a + 1)'
-    In the right-hand side of a lambda abstraction: return (a + 1)
 
 cc004.hs:15:
     Ambiguous type variable(s) `a'
        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 right-hand side of an equation for `bar':
+    in the definition of function `bar':
        (_ccall_ f) `thenADR` (\ a -> return (a + 1))
+
+cc004.hs:15:
+    Ambiguous type variable(s) `a' in the constraint `Num a'
+    arising from the literal `1' at cc004.hs:15
+    In the second argument of `(+)', namely `1'
+    In the first argument of `return', namely `(a + 1)'