Merge pull request #1 from basvandijk/master

Fix build on GHC-7.4.1-rc1 and some other patches

16 files changed, 33 insertions, 19 deletions

diff --git a/lib/Data/Packed/Internal/Matrix.hs b/lib/Data/Packed/Internal/Matrix.hs
index d5fa5a0..5d05e50 100644
--- a/lib/Data/Packed/Internal/Matrix.hs
+++ b/lib/Data/Packed/Internal/Matrix.hs
@@ -44,7 +44,7 @@ import Foreign.Marshal.Array(newArray)
 import Foreign.Ptr(Ptr, castPtr)
 import Foreign.Storable(Storable, peekElemOff, pokeElemOff, poke, sizeOf)
 import Data.Complex(Complex)
-import Foreign.C.Types(CInt, CChar)
+import Foreign.C.Types
 import Foreign.C.String(newCString)
 import System.IO.Unsafe(unsafePerformIO)
 
diff --git a/lib/Data/Packed/Internal/Signatures.hs b/lib/Data/Packed/Internal/Signatures.hs
index b81efa4..2835720 100644
--- a/lib/Data/Packed/Internal/Signatures.hs
+++ b/lib/Data/Packed/Internal/Signatures.hs
@@ -14,9 +14,9 @@
 
 module Data.Packed.Internal.Signatures where
 
-import Foreign
-import Data.Complex
-import Foreign.C.Types
+import Foreign.Ptr(Ptr)
+import Data.Complex(Complex)
+import Foreign.C.Types(CInt)
 
 type PF = Ptr Float                             --
 type PD = Ptr Double                            --
diff --git a/lib/Data/Packed/Internal/Vector.hs b/lib/Data/Packed/Internal/Vector.hs
index 43b3fd8..b9dba8e 100644
--- a/lib/Data/Packed/Internal/Vector.hs
+++ b/lib/Data/Packed/Internal/Vector.hs
@@ -38,7 +38,7 @@ import Foreign.ForeignPtr(ForeignPtr, castForeignPtr)
 import Foreign.Ptr(Ptr)
 import Foreign.Storable(Storable, peekElemOff, pokeElemOff, sizeOf)
 import Foreign.C.String
-import Foreign.C.Types(CInt,CChar)
+import Foreign.C.Types
 import Data.Complex
 import Control.Monad(when)
 import System.IO.Unsafe(unsafePerformIO)
diff --git a/lib/Numeric/ContainerBoot.hs b/lib/Numeric/ContainerBoot.hs
index a605545..0215711 100644
--- a/lib/Numeric/ContainerBoot.hs
+++ b/lib/Numeric/ContainerBoot.hs
@@ -1,3 +1,4 @@
+{-# LANGUAGE CPP #-}
 {-# LANGUAGE TypeFamilies #-}
 {-# LANGUAGE FlexibleContexts #-}
 {-# LANGUAGE FlexibleInstances #-}
@@ -50,6 +51,10 @@ import Numeric.Conversion
 import Data.Packed.Internal
 import Numeric.GSL.Vector
 
+#if __GLASGOW_HASKELL__ >= 704
+import Foreign.C.Types(CInt(..))
+#endif
+
 import Data.Complex
 import Control.Monad(ap)
 
@@ -59,12 +64,12 @@ import System.IO.Unsafe
 
 -------------------------------------------------------------------
 
-type family IndexOf c
+type family IndexOf (c :: * -> *)
 
 type instance IndexOf Vector = Int
 type instance IndexOf Matrix = (Int,Int)
 
-type family ArgOf c a
+type family ArgOf (c :: * -> *) a
 
 type instance ArgOf Vector a = a -> a
 type instance ArgOf Matrix a = a -> a -> a
diff --git a/lib/Numeric/GSL/Differentiation.hs b/lib/Numeric/GSL/Differentiation.hs
index a3c1aea..ab5eb50 100644
--- a/lib/Numeric/GSL/Differentiation.hs
+++ b/lib/Numeric/GSL/Differentiation.hs
@@ -22,7 +22,7 @@ module Numeric.GSL.Differentiation (
     derivBackward
 ) where
 
-import Foreign.C.Types(CInt)
+import Foreign.C.Types
 import Foreign.Marshal.Alloc(malloc, free)
 import Foreign.Ptr(Ptr, FunPtr, freeHaskellFunPtr)
 import Foreign.Storable(peek)
diff --git a/lib/Numeric/GSL/Fitting.hs b/lib/Numeric/GSL/Fitting.hs
index 337dc6a..79db23f 100644
--- a/lib/Numeric/GSL/Fitting.hs
+++ b/lib/Numeric/GSL/Fitting.hs
@@ -54,7 +54,7 @@ import Numeric.LinearAlgebra
 import Numeric.GSL.Internal
 
 import Foreign.Ptr(FunPtr, freeHaskellFunPtr)
-import Foreign.C.Types(CInt)
+import Foreign.C.Types
 import System.IO.Unsafe(unsafePerformIO)
 
 -------------------------------------------------------------------------
diff --git a/lib/Numeric/GSL/Fourier.hs b/lib/Numeric/GSL/Fourier.hs
index 25487d4..71bc8a1 100644
--- a/lib/Numeric/GSL/Fourier.hs
+++ b/lib/Numeric/GSL/Fourier.hs
@@ -22,7 +22,7 @@ module Numeric.GSL.Fourier (
 
 import Data.Packed.Internal
 import Data.Complex
-import Foreign.C.Types(CInt)
+import Foreign.C.Types
 import System.IO.Unsafe (unsafePerformIO)
 
 genfft code v = unsafePerformIO $ do
diff --git a/lib/Numeric/GSL/Integration.hs b/lib/Numeric/GSL/Integration.hs
index 84e8546..a0e922b 100644
--- a/lib/Numeric/GSL/Integration.hs
+++ b/lib/Numeric/GSL/Integration.hs
@@ -20,7 +20,7 @@ module Numeric.GSL.Integration (
     integrateQAGS
 ) where
 
-import Foreign.C.Types(CInt)
+import Foreign.C.Types
 import Foreign.Marshal.Alloc(malloc, free)
 import Foreign.Ptr(Ptr, FunPtr, freeHaskellFunPtr)
 import Foreign.Storable(peek)
diff --git a/lib/Numeric/GSL/Internal.hs b/lib/Numeric/GSL/Internal.hs
index db2c633..303e7e1 100644
--- a/lib/Numeric/GSL/Internal.hs
+++ b/lib/Numeric/GSL/Internal.hs
@@ -16,7 +16,7 @@ import Data.Packed.Internal
 
 import Foreign.Marshal.Array(copyArray)
 import Foreign.Ptr(Ptr, FunPtr)
-import Foreign.C.Types(CInt)
+import Foreign.C.Types
 import System.IO.Unsafe(unsafePerformIO)
 
 iv :: (Vector Double -> Double) -> (CInt -> Ptr Double -> Double)
diff --git a/lib/Numeric/GSL/Minimization.hs b/lib/Numeric/GSL/Minimization.hs
index 5770c91..88acfac 100644
--- a/lib/Numeric/GSL/Minimization.hs
+++ b/lib/Numeric/GSL/Minimization.hs
@@ -65,7 +65,7 @@ import Data.Packed.Matrix
 import Numeric.GSL.Internal
 
 import Foreign.Ptr(Ptr, FunPtr, freeHaskellFunPtr)
-import Foreign.C.Types(CInt)
+import Foreign.C.Types
 import System.IO.Unsafe(unsafePerformIO)
 
 ------------------------------------------------------------------------
diff --git a/lib/Numeric/GSL/ODE.hs b/lib/Numeric/GSL/ODE.hs
index ea064d6..2251acd 100644
--- a/lib/Numeric/GSL/ODE.hs
+++ b/lib/Numeric/GSL/ODE.hs
@@ -36,7 +36,7 @@ import Data.Packed.Internal
 import Numeric.GSL.Internal
 
 import Foreign.Ptr(FunPtr, nullFunPtr, freeHaskellFunPtr)
-import Foreign.C.Types(CInt)
+import Foreign.C.Types
 import System.IO.Unsafe(unsafePerformIO)
 
 -------------------------------------------------------------------------
diff --git a/lib/Numeric/GSL/Polynomials.hs b/lib/Numeric/GSL/Polynomials.hs
index 9885920..b21b1b6 100644
--- a/lib/Numeric/GSL/Polynomials.hs
+++ b/lib/Numeric/GSL/Polynomials.hs
@@ -1,4 +1,4 @@
-{-# LANGUAGE ForeignFunctionInterface #-}
+{-# LANGUAGE CPP, ForeignFunctionInterface #-}
 -----------------------------------------------------------------------------
 {- |
 Module      :  Numeric.GSL.Polynomials
@@ -23,6 +23,10 @@ import Data.Packed.Internal
 import Data.Complex
 import System.IO.Unsafe (unsafePerformIO)
 
+#if __GLASGOW_HASKELL__ >= 704
+import Foreign.C.Types (CInt(..))
+#endif
+
 {- | Solution of general polynomial equations, using /gsl_poly_complex_solve/. For example,
      the three solutions of x^3 + 8 = 0
 
diff --git a/lib/Numeric/GSL/Root.hs b/lib/Numeric/GSL/Root.hs
index 784bbd4..9c2e5ab 100644
--- a/lib/Numeric/GSL/Root.hs
+++ b/lib/Numeric/GSL/Root.hs
@@ -53,8 +53,8 @@ import Data.Packed.Internal
 import Data.Packed.Matrix
 import Numeric.GSL.Internal
 
-import  Foreign.Ptr(FunPtr, freeHaskellFunPtr)
-import Foreign.C.Types(CInt)
+import Foreign.Ptr(FunPtr, freeHaskellFunPtr)
+import Foreign.C.Types
 import System.IO.Unsafe(unsafePerformIO)
 
 -------------------------------------------------------------------------
diff --git a/lib/Numeric/GSL/Vector.hs b/lib/Numeric/GSL/Vector.hs
index e912953..b8c6d04 100644
--- a/lib/Numeric/GSL/Vector.hs
+++ b/lib/Numeric/GSL/Vector.hs
@@ -31,7 +31,7 @@ import Data.Complex
 import Foreign.Marshal.Alloc(free)
 import Foreign.Marshal.Array(newArray)
 import Foreign.Ptr(Ptr)
-import Foreign.C.Types(CInt)
+import Foreign.C.Types
 import System.IO.Unsafe(unsafePerformIO)
 
 fromei x = fromIntegral (fromEnum x) :: CInt
diff --git a/lib/Numeric/LinearAlgebra/Algorithms.hs b/lib/Numeric/LinearAlgebra/Algorithms.hs
index bea33ea..a6b4dae 100644
--- a/lib/Numeric/LinearAlgebra/Algorithms.hs
+++ b/lib/Numeric/LinearAlgebra/Algorithms.hs
@@ -567,6 +567,11 @@ epslist = [ (fromIntegral k, golubeps k k) | k <- [1..]]
 
 geps delta = head [ k | (k,g) <- epslist, g<delta]
 
+expGolub :: ( Fractional t, Element t, Field t
+            , Normed Matrix t
+            , RealFrac (RealOf t)
+            , Floating (RealOf t)
+            ) => Matrix t -> Matrix t
 expGolub m = iterate msq f !! j
     where j = max 0 $ floor $ logBase 2 $ pnorm Infinity m
           a = m */ fromIntegral ((2::Int)^j)
diff --git a/lib/Numeric/LinearAlgebra/LAPACK.hs b/lib/Numeric/LinearAlgebra/LAPACK.hs
index 2fac1ee..d1aa564 100644
--- a/lib/Numeric/LinearAlgebra/LAPACK.hs
+++ b/lib/Numeric/LinearAlgebra/LAPACK.hs
@@ -47,7 +47,7 @@ import Numeric.Conversion
 import Numeric.GSL.Vector(vectorMapValR, FunCodeSV(Scale))
 
 import Foreign.Ptr(nullPtr)
-import Foreign.C.Types(CInt)
+import Foreign.C.Types
 import Control.Monad(when)
 import System.IO.Unsafe(unsafePerformIO)