X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=GHC%2FPtr.lhs;h=bf78f713bd04105f6264e53ce6b73af745431fc9;hb=HEAD;hp=8763a3efedd5cd24658bacda8087f7a7d39daab2;hpb=4ef39162b8ae3ab239009e6386b5787475f172d9;p=ghc-base.git

diff --git a/GHC/Ptr.lhs b/GHC/Ptr.lhs
index 8763a3e..bf78f71 100644
--- a/GHC/Ptr.lhs
+++ b/GHC/Ptr.lhs
@@ -1,6 +1,7 @@
 \begin{code}
-{-# OPTIONS_GHC -fno-implicit-prelude #-}
+{-# LANGUAGE CPP, NoImplicitPrelude, MagicHash #-}
 {-# OPTIONS_HADDOCK hide #-}
+
 -----------------------------------------------------------------------------
 -- |
 -- Module      :  GHC.Ptr
@@ -22,7 +23,7 @@ import GHC.Base
 import GHC.Show
 import GHC.Num
 import GHC.List ( length, replicate )
-import Numeric		( showHex )
+import Numeric          ( showHex )
 
 #include "MachDeps.h"
 
@@ -79,7 +80,7 @@ data FunPtr a = FunPtr Addr# deriving (Eq, Ord)
 -- a function type with zero or more arguments where
 --
 -- * the argument types are /marshallable foreign types/,
---   i.e. 'Char', 'Int', 'Prelude.Double', 'Prelude.Float',
+--   i.e. 'Char', 'Int', 'Double', 'Float',
 --   'Bool', 'Data.Int.Int8', 'Data.Int.Int16', 'Data.Int.Int32',
 --   'Data.Int.Int64', 'Data.Word.Word8', 'Data.Word.Word16',
 --   'Data.Word.Word32', 'Data.Word.Word64', @'Ptr' a@, @'FunPtr' a@,
@@ -87,7 +88,7 @@ data FunPtr a = FunPtr Addr# deriving (Eq, Ord)
 --   using @newtype@.
 -- 
 -- * the return type is either a marshallable foreign type or has the form
---   @'Prelude.IO' t@ where @t@ is a marshallable foreign type or @()@.
+--   @'IO' t@ where @t@ is a marshallable foreign type or @()@.
 --
 -- A value of type @'FunPtr' a@ may be a pointer to a foreign function,
 -- either returned by another foreign function or imported with a
@@ -145,21 +146,15 @@ castPtrToFunPtr (Ptr addr) = FunPtr addr
 
 ------------------------------------------------------------------------
 -- Show instances for Ptr and FunPtr
--- I have absolutely no idea why the WORD_SIZE_IN_BITS stuff is here
 
-#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 _ (Ptr a) rs = pad_out (showHex (wordToInteger(int2Word#(addr2Int# a))) "")
      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
+       pad_out ls = 
+          '0':'x':(replicate (2*SIZEOF_HSPTR - length ls) '0') ++ ls ++ rs
 
 instance Show (FunPtr a) where
    showsPrec p = showsPrec p . castFunPtrToPtr
-#endif
 \end{code}