2 files changed, 102 insertions, 68 deletions

diff --git a/lib/Numeric/GSL/Special/Internal.hs b/lib/Numeric/GSL/Special/Internal.hs
deleted file mode 100644
index ca36009..0000000
--- a/lib/Numeric/GSL/Special/Internal.hs
+++ /dev/null
@@ -1,68 +0,0 @@
-{-# OPTIONS #-}
------------------------------------------------------------------------------
-{- |
-Module      :  Numeric.GSL.Special.Internal
-Copyright   :  (c) Alberto Ruiz 2007
-License     :  GPL-style
-
-Maintainer  :  Alberto Ruiz (aruiz at um dot es)
-Stability   :  provisional
-Portability :  uses ffi
-
-Support for Special functions.
-
-<http://www.gnu.org/software/gsl/manual/html_node/Special-Functions.html#Special-Functions>
--}
------------------------------------------------------------------------------
-
-module Numeric.GSL.Special.Internal (
-    createSFR,
-    createSFR_E10,
-    Precision(..),
-    Gsl_mode_t,
-    Size_t,
-    precCode
-)
-where
-
-import Foreign
-import Data.Packed.Internal(check,(//))
-
-
-data Precision = PrecDouble | PrecSingle | PrecApprox
-
-precCode :: Precision -> Int
-precCode PrecDouble = 0
-precCode PrecSingle = 1
-precCode PrecApprox = 2
-
-type Gsl_mode_t = Int
-
-type Size_t = Int
-
-----------------------------------------------------------------
--- | access to a sf_result
-createSFR :: Storable a => String -> (Ptr a -> IO Int) -> (a, a)
-createSFR s f = unsafePerformIO $ do
-    p <- mallocArray 2
-    f p // check s
-    [val,err] <- peekArray 2 p
-    free p
-    return (val,err)
-
-
----------------------------------------------------------------------
--- the sf_result_e10 contains two doubles and the exponent
-
--- | acces to sf_result_e10
-createSFR_E10 :: (Storable t2, Storable t3, Storable t1) => String -> (Ptr a -> IO Int) -> (t1, t2, t3)
-createSFR_E10 s f = unsafePerformIO $ do
-    let sd = sizeOf (0::Double)
-    let si = sizeOf (0::Int)
-    p <- mallocBytes (2*sd + si)
-    f p // check s
-    val <- peekByteOff p 0
-    err <- peekByteOff p sd
-    expo <- peekByteOff p (2*sd) 
-    free p
-    return (val,expo,err)
diff --git a/lib/Numeric/GSL/Special/Internal.hsc b/lib/Numeric/GSL/Special/Internal.hsc
new file mode 100644
index 0000000..03a431c
--- /dev/null
+++ b/lib/Numeric/GSL/Special/Internal.hsc
@@ -0,0 +1,102 @@
+{-# OPTIONS -ffi #-}
+-----------------------------------------------------------------------------
+{- |
+Module      :  Numeric.GSL.Special.Internal
+Copyright   :  (c) Alberto Ruiz 2007
+License     :  GPL-style
+
+Maintainer  :  Alberto Ruiz (aruiz at um dot es)
+Stability   :  provisional
+Portability :  uses ffi
+
+Support for Special functions.
+
+<http://www.gnu.org/software/gsl/manual/html_node/Special-Functions.html#Special-Functions>
+-}
+-----------------------------------------------------------------------------
+
+#include <gsl/gsl_sf_result.h>
+#let alignment t = "%lu", (unsigned long)offsetof(struct {char x__; t (y__); }, y__)
+
+module Numeric.GSL.Special.Internal (
+    createSFR,
+    createSFR_E10,
+    Precision(..),
+    Gsl_mode_t,
+    Size_t,
+    precCode
+)
+where
+
+import Foreign
+import Data.Packed.Internal(check,(//))
+import Foreign.C.Types(CSize)
+
+
+data Precision = PrecDouble | PrecSingle | PrecApprox
+
+precCode :: Precision -> Int
+precCode PrecDouble = 0
+precCode PrecSingle = 1
+precCode PrecApprox = 2
+
+type Gsl_mode_t = Int
+
+type Size_t = CSize
+
+---------------------------------------------------
+
+data Gsl_sf_result = SF Double Double
+  deriving (Show)
+
+instance Storable Gsl_sf_result where
+  sizeOf _ = #size gsl_sf_result
+  alignment _ = #alignment gsl_sf_result
+  peek ptr = do
+    val <- (#peek gsl_sf_result, val) ptr
+    err <- (#peek gsl_sf_result, err) ptr
+    return (SF val err)
+  poke ptr (SF val err) = do
+    (#poke gsl_sf_result, val) ptr val
+    (#poke gsl_sf_result, err) ptr err
+
+
+data Gsl_sf_result_e10 = SFE Double Double Int
+  deriving (Show)
+
+instance Storable Gsl_sf_result_e10 where
+  sizeOf _ = #size gsl_sf_result_e10
+  alignment _ = #alignment gsl_sf_result_e10
+  peek ptr = do
+    val <- (#peek gsl_sf_result_e10, val) ptr
+    err <- (#peek gsl_sf_result_e10, err) ptr
+    e10 <- (#peek gsl_sf_result_e10, e10) ptr
+    return (SFE val err e10)
+  poke ptr (SFE val err e10) = do
+    (#poke gsl_sf_result_e10, val) ptr val
+    (#poke gsl_sf_result_e10, err) ptr err
+    (#poke gsl_sf_result_e10, e10) ptr e10
+
+
+----------------------------------------------------------------
+-- | access to a sf_result
+createSFR :: String -> (Ptr a -> IO Int) -> (Double, Double)
+createSFR s f = unsafePerformIO $ do
+    p <- malloc :: IO (Ptr Gsl_sf_result)
+    f (castPtr p) // check s
+    SF val err <- peek p
+    free p
+    return (val,err)
+
+
+---------------------------------------------------------------------
+-- the sf_result_e10 contains two doubles and the exponent
+
+-- | access to sf_result_e10
+createSFR_E10 :: String -> (Ptr a -> IO Int) -> (Double, Int, Double)
+createSFR_E10 s f = unsafePerformIO $ do
+    p <- malloc :: IO (Ptr Gsl_sf_result_e10)
+    f (castPtr p) // check s
+    SFE val err expo  <- peek p
+    free p
+    return (val,expo,err)