[project @ 1999-11-01 16:07:48 by simonpj]

fromInt stuff and other wibbles

diff --git a/ghc/tests/ccall/should_fail/cc001.stderr b/ghc/tests/ccall/should_fail/cc001.stderr
index 4388fc9..b8cc6cd 100644 (file)
--- a/ghc/tests/ccall/should_fail/cc001.stderr
+++ b/ghc/tests/ccall/should_fail/cc001.stderr
@@ -1,8 +1,9 @@
 
 cc001.hs:5:
-    Ambiguous type variable(s) `t'
-       in the constraint `CCallable t'
-       arising from an argument in the _ccall_ to `foo', namely `(undefined ())' at cc001.hs:5
+    Ambiguous type variable(s) `t' in the constraint `CCallable t'
+    arising from an argument in the _ccall_ to `foo', namely `(undefined ())' at cc001.hs:5
+    In the right-hand side of a pattern binding:
+       _ccall_ foo (undefined ())
 
 Compilation had errors
 

diff --git a/ghc/tests/ccall/should_fail/cc002.stderr b/ghc/tests/ccall/should_fail/cc002.stderr
index 26bc5d0..d06e5b2 100644 (file)
--- a/ghc/tests/ccall/should_fail/cc002.stderr
+++ b/ghc/tests/ccall/should_fail/cc002.stderr
@@ -1,7 +1,8 @@
 
 cc002.hs:10:
     No instance for `CReturnable ForeignObj'
-       arising from the result of the _ccall_ to `a' at cc002.hs:10
+    arising from the result of the _ccall_ to `a' at cc002.hs:10
+    In the right-hand side of a pattern binding: _ccall_ a
 
 Compilation had errors
 

diff --git a/ghc/tests/codeGen/should_run/cg026.hs b/ghc/tests/codeGen/should_run/cg026.hs
index 69bd85b..570306c 100644 (file)
--- a/ghc/tests/codeGen/should_run/cg026.hs
+++ b/ghc/tests/codeGen/should_run/cg026.hs
@@ -8,7 +8,8 @@ import IOExts
 import MutableArray
 import ByteArray
 import Addr
-
+import Int( Num(fromInt) )
+       
 import Ratio
 import Array
 

diff --git a/ghc/tests/codeGen/should_run/cg042.hs b/ghc/tests/codeGen/should_run/cg042.hs
index 95b7349..f128dfa 100644 (file)
--- a/ghc/tests/codeGen/should_run/cg042.hs
+++ b/ghc/tests/codeGen/should_run/cg042.hs
@@ -7,6 +7,7 @@ import IOExts
 import ByteArray
 import MutableArray
 import ST
+import Int( Num(fromInt) )
 
 import Ratio   -- 1.3
 import Array   -- 1.3

diff --git a/ghc/tests/lib/should_run/enum03.hs b/ghc/tests/lib/should_run/enum03.hs
index 6d25333..16efa2d 100644 (file)
--- a/ghc/tests/lib/should_run/enum03.hs
+++ b/ghc/tests/lib/should_run/enum03.hs
@@ -3,6 +3,7 @@ module Main(main) where
 
 import Exception
 import Word
+import Int( Num(fromInt) )
 
 main = do
   putStrLn "Testing Enum Word8:"

diff --git a/ghc/tests/numeric/should_run/Makefile b/ghc/tests/numeric/should_run/Makefile
index 22a203c..1538736 100644 (file)
--- a/ghc/tests/numeric/should_run/Makefile
+++ b/ghc/tests/numeric/should_run/Makefile
@@ -1,11 +1,12 @@
 #-----------------------------------------------------------------------------
-# $Id: Makefile,v 1.5 1999/05/10 10:12:25 simonm Exp $
+# $Id: Makefile,v 1.6 1999/11/01 16:07:50 simonpj Exp $
 
 TOP = ../..
 include $(TOP)/mk/boilerplate.mk
 include $(TOP)/mk/should_run.mk
 
 HC_OPTS += -dcore-lint
+arith006_HC_OPTS += -fglasgow-exts
 arith010_HC_OPTS += -fglasgow-exts
 arith011_HC_OPTS += -fglasgow-exts
 arith012_HC_OPTS += -fglasgow-exts

diff --git a/ghc/tests/numeric/should_run/arith006.hs b/ghc/tests/numeric/should_run/arith006.hs
index 0f2bca3..8e7ff88 100644 (file)
--- a/ghc/tests/numeric/should_run/arith006.hs
+++ b/ghc/tests/numeric/should_run/arith006.hs
@@ -1,3 +1,6 @@
 -- !!! printing Floats; was a bug in hbc (reported by andy)
 --
+
+import Int( Num(fromInt) )
+
 main = print ((fromInt 42) :: Float)

diff --git a/ghc/tests/programs/barton-mangler-bug/Basic.hs b/ghc/tests/programs/barton-mangler-bug/Basic.hs
index 5b3d054..1e46897 100644 (file)
--- a/ghc/tests/programs/barton-mangler-bug/Basic.hs
+++ b/ghc/tests/programs/barton-mangler-bug/Basic.hs
@@ -1,7 +1,8 @@
-{-# OPTIONS -H12m #-}
+{-# OPTIONS -H12m -syslib exts #-}
 
 module Basic where
 import TypesettingTricks
+import Int( Num(fromInt) )
 import Physical
 --import GHC( (->) )
 infixr 7 |>

diff --git a/ghc/tests/programs/dmgob_native2/LPA.lhs b/ghc/tests/programs/dmgob_native2/LPA.lhs
index 26f28ee..359fe25 100644 (file)
--- a/ghc/tests/programs/dmgob_native2/LPA.lhs
+++ b/ghc/tests/programs/dmgob_native2/LPA.lhs
@@ -4,6 +4,7 @@
 >#ifndef __GLASGOW_HASKELL__
 > import Trace
 >#endif
+> import Int( Num(fromInt) )
 
 \end{comment}
 

diff --git a/ghc/tests/programs/dmgob_native2/Main.lhs b/ghc/tests/programs/dmgob_native2/Main.lhs
index 46239a1..175ba9a 100644 (file)
--- a/ghc/tests/programs/dmgob_native2/Main.lhs
+++ b/ghc/tests/programs/dmgob_native2/Main.lhs
@@ -6,6 +6,7 @@
 > import Trace
 > import Maybe   -- an hbc library module defining the ``Maybe'' type
 >#endif
+> import Int( Num(fromInt) )
 
 > import Native  -- an hbc library module for native-mode binary IO
 

diff --git a/ghc/tests/programs/dmgob_native2/Makefile b/ghc/tests/programs/dmgob_native2/Makefile
index d6a976d..39e1e2c 100644 (file)
--- a/ghc/tests/programs/dmgob_native2/Makefile
+++ b/ghc/tests/programs/dmgob_native2/Makefile
@@ -1,7 +1,7 @@
 TOP = ..
 include $(TOP)/mk/boilerplate.mk
 
-SRC_HC_OPTS += -cpp -syslib misc
+SRC_HC_OPTS += -cpp -syslib misc -syslib exts
 
 all :: runtest
 

diff --git a/ghc/tests/programs/fast2haskell/Fast2haskell.hs b/ghc/tests/programs/fast2haskell/Fast2haskell.hs
index 5261173..848ee4e 100644 (file)
--- a/ghc/tests/programs/fast2haskell/Fast2haskell.hs
+++ b/ghc/tests/programs/fast2haskell/Fast2haskell.hs
@@ -10,6 +10,7 @@
             import Word;
            import Complex; -- 1.3
            import Array; -- 1.3
+           import Int ( Num(fromInt) );
             type Complex_type   = Complex Double;
             type Array_type b   = Array Int b;
             type Assoc_type a   = (Int, a);

diff --git a/ghc/tests/programs/okeefe_neural/Main.hs b/ghc/tests/programs/okeefe_neural/Main.hs
index 35c5c82..eb9dec5 100644 (file)
--- a/ghc/tests/programs/okeefe_neural/Main.hs
+++ b/ghc/tests/programs/okeefe_neural/Main.hs
@@ -1,5 +1,9 @@
+{-# OPTIONS -syslib exts #-}
+
 module Main(main) where
 
+import Int( Num(fromInt) )
+
 newtype RNG_State = RNG_State (Int, Int, Int)
 
 new_random i = RNG_State (i `mod` 30269, i `mod` 30307, i `mod` 30323)

diff --git a/ghc/tests/typecheck/should_compile/Makefile b/ghc/tests/typecheck/should_compile/Makefile
index 7a300ba..1b44903 100644 (file)
--- a/ghc/tests/typecheck/should_compile/Makefile
+++ b/ghc/tests/typecheck/should_compile/Makefile
@@ -7,6 +7,7 @@ SRC_HC_OPTS += -noC -dcore-lint -fno-warn-incomplete-patterns -hi-with-declarati
 tc019_HC_OPTS = -fglasgow-exts
 tc065_HC_OPTS = -syslib misc
 tc087_HC_OPTS = -fglasgow-exts
+tc088_HC_OPTS = -syslib exts
 tc089_HC_OPTS = -H12m
 tc097_HC_OPTS = -fglasgow-exts
 tc100_HC_OPTS = -O

diff --git a/ghc/tests/typecheck/should_compile/tc088.hs b/ghc/tests/typecheck/should_compile/tc088.hs
index ce4b6be..2c5b5d4 100644 (file)
--- a/ghc/tests/typecheck/should_compile/tc088.hs
+++ b/ghc/tests/typecheck/should_compile/tc088.hs
@@ -1,6 +1,7 @@
 -- Check that "->" is an instance of Eval
 
 module ShouldSucceed where
+import Int( Num(fromInt) )
 
 instance Show (a->b)
 

diff --git a/ghc/tests/typecheck/should_fail/tcfail003.stderr b/ghc/tests/typecheck/should_fail/tcfail003.stderr
index 811e275..4870b4d 100644 (file)
--- a/ghc/tests/typecheck/should_fail/tcfail003.stderr
+++ b/ghc/tests/typecheck/should_fail/tcfail003.stderr
@@ -1,7 +1,9 @@
 
 tcfail003.hs:3:
     No instance for `Num Char'
-       arising from the literal `1' at tcfail003.hs:3
+    arising from the literal `1' at tcfail003.hs:3
+    In the list element: 1
+    In the right-hand side of a pattern binding: [1, 'a']
 
 Compilation had errors