[project @ 2001-03-28 16:20:00 by simonmar]

[ghc-hetmet.git] / ghc / tests / lib / should_run / enum03.hs

diff --git a/ghc/tests/lib/should_run/enum03.hs b/ghc/tests/lib/should_run/enum03.hs
index 6d25333..0821326 100644 (file)
--- a/ghc/tests/lib/should_run/enum03.hs
+++ b/ghc/tests/lib/should_run/enum03.hs
@@ -30,7 +30,7 @@ testEnumWord8 = do
   mayBomb   (printTest (pred (minBound::Word8))) 
 
      -- toEnum
-  printTest ((map (toEnum::Int->Word8) [1, toInt (minBound::Word8), toInt (maxBound::Word8)]))
+  printTest ((map (toEnum::Int->Word8) [1, fromIntegral (minBound::Word8)::Int, fromIntegral (maxBound::Word8)::Int]))
   mayBomb   (printTest ((toEnum (maxBound::Int))::Word8))
 
      -- fromEnum
@@ -39,7 +39,7 @@ testEnumWord8 = do
      -- [x..] aka enumFrom
   printTest ((take 7 [(1::Word8)..]))
   printTest ((take 7 [((maxBound::Word8)-5)..])) -- just in case it doesn't catch the upper bound..
-  
+
      -- [x,y..] aka enumFromThen
   printTest ((take 7 [(1::Word8),2..]))
   printTest ((take 7 [(1::Word8),7..]))
@@ -88,7 +88,7 @@ testEnumWord16 = do
   mayBomb   (printTest (pred (minBound::Word16))) 
 
      -- toEnum
-  printTest ((map (toEnum::Int->Word16) [1, toInt (minBound::Word16), toInt (maxBound::Word16)]))
+  printTest ((map (toEnum::Int->Word16) [1, fromIntegral (minBound::Word16)::Int, fromIntegral (maxBound::Word16)::Int]))
   mayBomb   (printTest ((toEnum (maxBound::Int))::Word16))
 
 
@@ -147,11 +147,11 @@ testEnumWord32 = do
   mayBomb   (printTest (pred (minBound::Word32))) 
 
      -- toEnum
-  printTest ((map (toEnum::Int->Word32) [1, toInt (minBound::Word32), maxBound::Int]))
+  printTest ((map (toEnum::Int->Word32) [1, fromIntegral (minBound::Word32)::Int, maxBound::Int]))
   mayBomb   (printTest ((toEnum (maxBound::Int))::Word32))
 
      -- fromEnum
-  printTest ((map fromEnum [(1::Word32),minBound,fromInt (maxBound::Int)]))
+  printTest ((map fromEnum [(1::Word32),minBound,fromIntegral (maxBound::Int)]))
   mayBomb   (printTest (fromEnum (maxBound::Word32)))
 
      -- [x..] aka enumFrom
@@ -206,11 +206,11 @@ testEnumWord64 = do
   mayBomb   (printTest (pred (minBound::Word64))) 
 
      -- toEnum
-  printTest ((map (toEnum::Int->Word64) [1, toInt (minBound::Word64), maxBound::Int]))
+  printTest ((map (toEnum::Int->Word64) [1, fromIntegral (minBound::Word64)::Int, maxBound::Int]))
   mayBomb   (printTest ((toEnum (maxBound::Int))::Word64))
 
      -- fromEnum
-  printTest ((map fromEnum [(1::Word64),minBound,fromInt (maxBound::Int)]))
+  printTest ((map fromEnum [(1::Word64),minBound,fromIntegral (maxBound::Int)]))
   mayBomb   (printTest (fromEnum (maxBound::Word64)))
 
      -- [x..] aka enumFrom
@@ -260,11 +260,4 @@ testEnumWord64 = do
 --
 
 
-mayBomb x = catchAllIO x errorHandler
-
-errorHandler :: Exception -> IO ()
-errorHandler e =
-  case justErrors e of
-    Just t -> putStrLn ("error " ++ show t)
-    _     -> return ()
- 
+mayBomb x = catchJust errorCalls x (\e -> putStrLn ("error " ++ show e))