allow setting off GSL default error handler

6 files changed, 18 insertions, 62 deletions

diff --git a/lib/GSL/Differentiation.hs b/lib/GSL/Differentiation.hs
index 6fd7565..e8e22d2 100644
--- a/lib/GSL/Differentiation.hs
+++ b/lib/GSL/Differentiation.hs
@@ -23,7 +23,7 @@ module GSL.Differentiation (
 ) where
 
 import Foreign
-import Data.Packed.Internal.Common(mkfun,check,(//))
+import Data.Packed.Internal(mkfun,check,(//))
 
 derivGen ::
     Int                   -- ^ type: 0 central, 1 forward, 2 backward
diff --git a/lib/GSL/Integration.hs b/lib/GSL/Integration.hs
index dd76be8..4152c9d 100644
--- a/lib/GSL/Integration.hs
+++ b/lib/GSL/Integration.hs
@@ -21,7 +21,7 @@ module GSL.Integration (
 ) where
 
 import Foreign
-import Data.Packed.Internal.Common(mkfun,check,(//))
+import Data.Packed.Internal(mkfun,check,(//))
 
 
 --------------------------------------------------------------------
diff --git a/lib/GSL/Special.hs b/lib/GSL/Special.hs
index 9eaf733..bdee1b2 100644
--- a/lib/GSL/Special.hs
+++ b/lib/GSL/Special.hs
@@ -41,6 +41,7 @@ module GSL.Special (
 , module GSL.Special.Synchrotron
 , module GSL.Special.Trig
 , module GSL.Special.Zeta
+, setErrorHandlerOff
 )
 where
 
@@ -74,51 +75,6 @@ import GSL.Special.Trig
 import GSL.Special.Zeta
 
 
--------------------- simple functions --------------------------
-
-{- | The error function (/gsl_sf_erf/), defined as 2\/ \\sqrt \\pi * \int\_0\^t \\exp -t\^2 dt.
-
-@> erf 1.5
-0.9661051464753108@
-
--}
-foreign import ccall "gsl-aux.h gsl_sf_erf" erf :: Double -> Double
-
-{- | The Gaussian probability density function (/gsl_sf_erf_Z/), defined as (1\/\\sqrt\{2\\pi\}) \\exp(-x\^2\/2).
-
->> erf_Z 1.5
->0.12951759566589172
-
--}
-foreign import ccall "gsl-aux.h gsl_sf_erf_Z" erf_Z :: Double -> Double
-
--------------------- functions returning sf_result -------------
-
-{- | The regular cylindrical Bessel function of zeroth order, J_0(x). This is
-   the example in the GSL manual, returning the value of the function and
-   the error term: 
-
-@\> bessel_J0_e 5.0
-(-0.1775967713143383,1.9302109579684196e-16)@
-
--}
-bessel_J0_e :: Double -> (Double,Double)
-bessel_J0_e x = createSFR "bessel_J0_e" (gsl_sf_bessel_J0_e x)
-foreign import ccall "gsl-aux.h gsl_sf_bessel_J0_e" gsl_sf_bessel_J0_e :: Double -> Ptr Double -> IO Int
-
--------------------- functions returning sf_result_e10 -------------
-
-{- | (From the GSL manual) \"This function computes the exponential \exp(x) using the @gsl_sf_result_e10@ type to return a result with extended range. This function may be useful if the value of \exp(x) would overflow the numeric range of double\". 
-
-For example:
-
-@\> exp_e10_e 30.0
-(1.0686474581524432,1.4711818964275088e-14,13)@
-
-@\> exp 30.0
-1.0686474581524463e13@
-
--}
-exp_e10_e :: Double -> (Double,Int,Double)
-exp_e10_e x = createSFR_E10 "exp_e10_e" (gsl_sf_exp_e10_e x)
-foreign import ccall "gsl-aux.h gsl_sf_exp_e10_e" gsl_sf_exp_e10_e :: Double -> Ptr Double -> IO Int
+-- | This action removes the GSL default error handler which aborts the program, so that
+-- GSL errors can be handled by Haskell (using Control.Exception) and ghci doesn't abort.
+foreign import ccall "gsl-aux.h no_abort_on_error" setErrorHandlerOff :: IO ()
diff --git a/lib/GSL/Special/Internal.hs b/lib/GSL/Special/Internal.hs
index c7455d9..ad1aaa2 100644
--- a/lib/GSL/Special/Internal.hs
+++ b/lib/GSL/Special/Internal.hs
@@ -25,7 +25,7 @@ module GSL.Special.Internal (
 where
 
 import Foreign
-import Data.Packed.Internal.Common(check,(//))
+import Data.Packed.Internal(check,(//))
 
 
 data Precision = PrecDouble | PrecSingle | PrecApprox
@@ -39,10 +39,10 @@ type Gsl_mode_t = Int
 
 ----------------------------------------------------------------
 -- | access to a sf_result
-createSFR :: Storable a => t -> (Ptr a -> IO Int) -> (a, a)
+createSFR :: Storable a => String -> (Ptr a -> IO Int) -> (a, a)
 createSFR s f = unsafePerformIO $ do
     p <- mallocArray 2
-    f p // check "createSFR" []
+    f p // check s []
     [val,err] <- peekArray 2 p
     free p
     return (val,err)
@@ -52,12 +52,12 @@ createSFR s f = unsafePerformIO $ do
 -- the sf_result_e10 contains two doubles and the exponent
 
 -- | acces to sf_result_e10
-createSFR_E10 :: (Storable t2, Storable t3, Storable t1) => t -> (Ptr a -> IO Int) -> (t1, t2, t3)
+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 "createSFR_E10" []
+    f p // check s []
     val <- peekByteOff p 0
     err <- peekByteOff p sd
     expo <- peekByteOff p (2*sd) 
diff --git a/lib/GSL/gsl-aux.c b/lib/GSL/gsl-aux.c
index fc95e6f..eec3e5f 100644
--- a/lib/GSL/gsl-aux.c
+++ b/lib/GSL/gsl-aux.c
@@ -64,6 +64,11 @@
 #define BAD_FILE 1003
 
 
+void no_abort_on_error() {
+    gsl_set_error_handler_off();
+}
+
+
 int toScalarR(int code, KRVEC(x), RVEC(r)) { 
     REQUIRES(rn==1,BAD_SIZE);
     DEBUGMSG("toScalarR");
diff --git a/lib/GSL/gsl-aux.h b/lib/GSL/gsl-aux.h
index 2be07c1..8f8618a 100644
--- a/lib/GSL/gsl-aux.h
+++ b/lib/GSL/gsl-aux.h
@@ -10,6 +10,8 @@
 #define KCVEC(A) int A##n, const gsl_complex*A##p
 #define KCMAT(A) int A##r, int A##c, const gsl_complex* A##p
 
+void no_abort_on_error();
+
 int toScalarR(int code, KRVEC(x), RVEC(r));
 /* norm2, absdif, maximum, posmax, etc. */
 
@@ -58,10 +60,3 @@ int minimizeWithDeriv(double f(int, double*), void df(int, double*, double*),
                       KRVEC(xi), RMAT(sol));
 
 int deriv(int code, double f(double, void*), double x, double h, double * result, double * abserr);
-
-double gsl_sf_erf(double);
-double gsl_sf_erf_Z(double);
-double gsl_sf_gamma(double);
-
-int gsl_sf_bessel_J0_e(double, double*); // hmmm...
-int gsl_sf_exp_e10_e(double, double*);   // HMMMMM...