[project @ 1999-03-01 08:38:36 by sof]

Reinstate old signature for 'makeForeignObj', i.e.

  makeForeignObj :: Addr -> Addr -> IO ForeignObj

combining the primitive 'makeForeignObj' and addForeignFinalizer(+).

The primitive ForeignObj constructor is now exported as 'mkForeignObj'

diff --git a/ghc/lib/exts/Foreign.lhs b/ghc/lib/exts/Foreign.lhs
index 9297fbc..b15c0df 100644 (file)
--- a/ghc/lib/exts/Foreign.lhs
+++ b/ghc/lib/exts/Foreign.lhs
@@ -7,23 +7,25 @@
 \begin{code}
 module Foreign 
        ( 
-        ForeignObj       -- abstract, instance of: Eq
-       , makeForeignObj   -- :: Addr{-obj-} -> IO ForeignObj
-       , writeForeignObj  -- :: ForeignObj  -> Addr{-new obj-}   -> IO ()
+        ForeignObj          -- abstract, instance of: Eq
+       , makeForeignObj      -- :: Addr{-obj-} -> Addr{-finaliser-} -> IO ForeignObj
+       , mkForeignObj        -- :: Addr -> IO ForeignObj
+       , writeForeignObj     -- :: ForeignObj  -> Addr{-new obj-}   -> IO ()
        , addForeignFinalizer -- :: ForeignObj -> IO () -> IO ()
-       , foreignObjToAddr -- :: ForeignObj  -> IO Addr
-           -- the coercion from a foreign obj. to an addr. is unsafe,
+
+           -- the coercion from a foreign obj to an addr is unsafe,
           -- and should not be used unless absolutely necessary.
+       , foreignObjToAddr    -- :: ForeignObj  -> IO Addr
        
-       , StablePtr {-a-} -- abstract.
-       , makeStablePtr   -- :: a -> IO (StablePtr a)
-       , deRefStablePtr  -- :: StablePtr a -> IO a
-       , freeStablePtr   -- :: StablePtr a -> IO ()
+       , StablePtr {-a-}     -- abstract.
+       , makeStablePtr       -- :: a -> IO (StablePtr a)
+       , deRefStablePtr      -- :: StablePtr a -> IO a
+       , freeStablePtr       -- :: StablePtr a -> IO ()
        ) where
 
-import PrelForeign --hiding ( makeForeignObj )
+import PrelForeign hiding ( makeForeignObj )
 import PrelStable
---import qualified PrelForeign as PF ( makeForeignObj )
+import qualified PrelForeign as PF ( makeForeignObj )
 import PrelBase    ( Int(..), Double(..), Float(..), Char(..) )
 import PrelGHC     ( indexCharOffForeignObj#, indexIntOffForeignObj#, 
                     indexAddrOffForeignObj#, indexFloatOffForeignObj#, 
@@ -70,15 +72,18 @@ foreignObjToAddr :: ForeignObj -> IO Addr
 foreignObjToAddr fo = _casm_ `` %r=(StgAddr)%0; '' fo
 \end{code}
 
-begin{code}
+\begin{code}
 makeForeignObj :: Addr -> Addr -> IO ForeignObj
 makeForeignObj obj finalizer = do
    fobj <- PF.makeForeignObj obj
-   addForeignFinalizer fobj (app0 finalizer)
+   addForeignFinalizer fobj (app0 finalizer fobj)
    return fobj
 
-foreign import dynamic unsafe app0 :: Addr -> IO ()
-end{code}
+mkForeignObj :: Addr -> IO ForeignObj
+mkForeignObj = PF.makeForeignObj
+
+foreign import dynamic unsafe app0 :: Addr -> (ForeignObj -> IO ())
+\end{code}