Move Integer out into its own package

[ghc-base.git] / GHC / Ptr.lhs

diff --git a/GHC/Ptr.lhs b/GHC/Ptr.lhs
index 0b5679f..5e1b982 100644 (file)
--- a/GHC/Ptr.lhs
+++ b/GHC/Ptr.lhs
@@ -149,14 +149,11 @@ castPtrToFunPtr (Ptr addr) = FunPtr addr
 
 #if (WORD_SIZE_IN_BITS == 32 || WORD_SIZE_IN_BITS == 64)
 instance Show (Ptr a) where
-   showsPrec p (Ptr a) rs = pad_out (showHex (word2Integer(int2Word#(addr2Int# a))) "") rs
+   showsPrec p (Ptr a) rs = pad_out (showHex (wordToInteger(int2Word#(addr2Int# a))) "") rs
      where
         -- want 0s prefixed to pad it out to a fixed length.
        pad_out ls rs = 
           '0':'x':(replicate (2*SIZEOF_HSPTR - length ls) '0') ++ ls ++ rs
-       -- word2Integer :: Word# -> Integer (stolen from Word.lhs)
-       word2Integer w = case word2Integer# w of
-                        (# s, d #) -> J# s d
 
 instance Show (FunPtr a) where
    showsPrec p = showsPrec p . castFunPtrToPtr