[commit: base] master: Follow toInt# -> integerToInt renaming (0e618f8)

[Ian Lynagh]

Repository : ssh://darcs.haskell.org//srv/darcs/packages/base

On branch  : master

http://hackage.haskell.org/trac/ghc/changeset/0e618f8e9d9f51f90a4795e6e779d925e081a5a6

>---------------------------------------------------------------

commit 0e618f8e9d9f51f90a4795e6e779d925e081a5a6
Author: Ian Lynagh <igloo at earth.li>
Date:   Sat Jul 23 13:30:45 2011 +0100

    Follow toInt# -> integerToInt renaming

>---------------------------------------------------------------

 GHC/Float.lhs                |    2 +-
 GHC/Float/ConversionUtils.hs |    2 +-
 GHC/Float/RealFracMethods.hs |    2 +-
 GHC/Int.hs                   |    8 ++++----
 GHC/Num.lhs                  |    4 ++--
 5 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/GHC/Float.lhs b/GHC/Float.lhs
index fa31751..2f6e489 100644
--- a/GHC/Float.lhs
+++ b/GHC/Float.lhs
@@ -356,7 +356,7 @@ instance  Real Double  where
           (# m, e# #)
             | e# >=# 0#                                         ->
                 shiftLInteger m e# :% 1
-            | (int2Word# (toInt# m) `and#` 1##) `eqWord#` 0##   ->
+            | (int2Word# (integerToInt m) `and#` 1##) `eqWord#` 0##   ->
                 case elimZerosInteger m (negateInt# e#) of
                     (# n, d# #) ->  n :% shiftLInteger 1 d#
             | otherwise                                         ->
diff --git a/GHC/Float/ConversionUtils.hs b/GHC/Float/ConversionUtils.hs
index 1d849f1..ddfc4e5 100644
--- a/GHC/Float/ConversionUtils.hs
+++ b/GHC/Float/ConversionUtils.hs
@@ -46,7 +46,7 @@ elim64# n e =
 
 #else
 
-#define TO64    toInt#
+#define TO64    integerToInt
 
 -- Double mantissae fit it Int#
 elim64# :: Int# -> Int# -> (# Integer, Int# #)
diff --git a/GHC/Float/RealFracMethods.hs b/GHC/Float/RealFracMethods.hs
index 7967957..765b0ca 100644
--- a/GHC/Float/RealFracMethods.hs
+++ b/GHC/Float/RealFracMethods.hs
@@ -71,7 +71,7 @@ import GHC.IntWord64
 
 #else
 
-#define TO64 toInt#
+#define TO64 integerToInt
 #define FROM64 smallInteger
 #define MINUS64 ( -# )
 #define NEGATE64 negateInt#
diff --git a/GHC/Int.hs b/GHC/Int.hs
index d9f131e..42e5c9f 100644
--- a/GHC/Int.hs
+++ b/GHC/Int.hs
@@ -68,7 +68,7 @@ instance Num Int8 where
     signum x | x > 0       = 1
     signum 0               = 0
     signum _               = -1
-    fromInteger i          = I8# (narrow8Int# (toInt# i))
+    fromInteger i          = I8# (narrow8Int# (integerToInt i))
 
 instance Real Int8 where
     toRational x = toInteger x % 1
@@ -210,7 +210,7 @@ instance Num Int16 where
     signum x | x > 0       = 1
     signum 0               = 0
     signum _               = -1
-    fromInteger i          = I16# (narrow16Int# (toInt# i))
+    fromInteger i          = I16# (narrow16Int# (integerToInt i))
 
 instance Real Int16 where
     toRational x = toInteger x % 1
@@ -500,7 +500,7 @@ instance Num Int32 where
     signum x | x > 0       = 1
     signum 0               = 0
     signum _               = -1
-    fromInteger i          = I32# (narrow32Int# (toInt# i))
+    fromInteger i          = I32# (narrow32Int# (integerToInt i))
 
 instance Enum Int32 where
     succ x
@@ -815,7 +815,7 @@ instance Num Int64 where
     signum x | x > 0       = 1
     signum 0               = 0
     signum _               = -1
-    fromInteger i          = I64# (toInt# i)
+    fromInteger i          = I64# (integerToInt i)
 
 instance Enum Int64 where
     succ x
diff --git a/GHC/Num.lhs b/GHC/Num.lhs
index b7b0260..bbdc89f 100644
--- a/GHC/Num.lhs
+++ b/GHC/Num.lhs
@@ -113,7 +113,7 @@ instance  Num Int  where
              | otherwise   = 1
 
     {-# INLINE fromInteger #-}	 -- Just to be sure!
-    fromInteger i = I# (toInt# i)
+    fromInteger i = I# (integerToInt i)
 
 quotRemInt :: Int -> Int -> (Int, Int)
 quotRemInt a@(I# _) b@(I# _) = (a `quotInt` b, a `remInt` b)
@@ -251,7 +251,7 @@ instance  Enum Integer  where
     succ x               = x + 1
     pred x               = x - 1
     toEnum (I# n)        = smallInteger n
-    fromEnum n           = I# (toInt# n)
+    fromEnum n           = I# (integerToInt n)
 
     {-# INLINE enumFrom #-}
     {-# INLINE enumFromThen #-}