[move Ptr type declarations to Jhc.Addr, make Foreign.Storable not depend on the Prelude
John Meacham <john@repetae.net>**20061115022627] hunk ./Name/Names.hs 86
-tc_Ptr = toName TypeConstructor   ("Foreign.Ptr","Ptr")
+tc_Ptr = toName TypeConstructor   ("Jhc.Addr","Ptr")
hunk ./lib/base/Foreign/Ptr.hs 2
-    Ptr,
+    Ptr(),
hunk ./lib/base/Foreign/Ptr.hs 8
-    FunPtr,
+    FunPtr(),
hunk ./lib/base/Foreign/Ptr.hs 21
-newtype Ptr a = Ptr Addr
-newtype FunPtr a = FunPtr FunAddr
hunk ./lib/base/Foreign/Storable.hs 1
-module Foreign.Storable where
+{-# OPTIONS_JHC -N #-}
+module Foreign.Storable(Storable(..)) where
hunk ./lib/base/Foreign/Storable.hs 4
-import Foreign.Ptr
+import Jhc.Basics
+import Jhc.Addr
+import Jhc.Int
+import Jhc.IO
+
+plusPtr :: Ptr a -> Int -> Ptr b
+plusPtr (Ptr addr) off = Ptr (plusAddr addr off)
hunk ./lib/base/Foreign/Storable.hs 23
-    peekElemOff addr idx = do
-        peek (addr `plusPtr` (idx * sizeOf (_f addr)))
-    pokeElemOff addr idx x = poke (addr `plusPtr` (idx * sizeOf x)) x
+    peekElemOff addr idx = peek (addr `plusPtr` (idx `times` sizeOf (_f addr)))
+    pokeElemOff addr idx x = poke (addr `plusPtr` (idx `times` sizeOf x)) x
hunk ./lib/base/Foreign/Storable.hs 31
+
+
hunk ./lib/base/Jhc/Addr.hs 6
+    Ptr(..),
+    FunPtr(..),
hunk ./lib/base/Jhc/Addr.hs 23
+newtype Ptr a = Ptr Addr
+newtype FunPtr a = FunPtr FunAddr
+