[project @ 2001-08-07 09:16:15 by sewardj]

[ghc-hetmet.git] / ghc / lib / std / PrelReal.lhs

diff --git a/ghc/lib/std/PrelReal.lhs b/ghc/lib/std/PrelReal.lhs
index 6748108..7229c6a 100644 (file)
--- a/ghc/lib/std/PrelReal.lhs
+++ b/ghc/lib/std/PrelReal.lhs
@@ -1,5 +1,5 @@
 % ------------------------------------------------------------------------------
-% $Id: PrelReal.lhs,v 1.10 2001/02/28 00:01:03 qrczak Exp $
+% $Id: PrelReal.lhs,v 1.13 2001/03/29 08:03:47 qrczak Exp $
 %
 % (c) The University of Glasgow, 1994-2000
 %
@@ -283,12 +283,12 @@ realToFrac = fromRational . toRational
     #-}
 
 -- For backward compatibility
-{- DEPRECATED fromInt "use fromIntegral instead" -}
+{-# DEPRECATED fromInt "use fromIntegral instead" #-}
 fromInt :: Num a => Int -> a
 fromInt = fromIntegral
 
 -- For backward compatibility
-{- DEPRECATED toInt "use fromIntegral instead" -}
+{-# DEPRECATED toInt "use fromIntegral instead" #-}
 toInt :: Integral a => a -> Int
 toInt = fromIntegral
 \end{code}
@@ -353,10 +353,17 @@ integralEnumFrom :: (Integral a, Bounded a) => a -> [a]
 integralEnumFrom n = map fromInteger [toInteger n .. toInteger (maxBound `asTypeOf` n)]
 
 integralEnumFromThen :: (Integral a, Bounded a) => a -> a -> [a]
-integralEnumFromThen n1 n2 
+integralEnumFromThen n1 n2
   | i_n2 >= i_n1  = map fromInteger [i_n1, i_n2 .. toInteger (maxBound `asTypeOf` n1)]
   | otherwise     = map fromInteger [i_n1, i_n2 .. toInteger (minBound `asTypeOf` n1)]
   where
     i_n1 = toInteger n1
     i_n2 = toInteger n2
+
+integralEnumFromTo :: Integral a => a -> a -> [a]
+integralEnumFromTo n m = map fromInteger [toInteger n .. toInteger m]
+
+integralEnumFromThenTo :: Integral a => a -> a -> a -> [a]
+integralEnumFromThenTo n1 n2 m
+  = map fromInteger [toInteger n1, toInteger n2 .. toInteger m]
 \end{code}