diff options
52 files changed, 70 insertions, 83 deletions
@@ -16,4 +16,3 @@ | |||
16 | > let pkg_descr = localPkgDescr binfo | 16 | > let pkg_descr = localPkgDescr binfo |
17 | > return $ binfo { localPkgDescr = updatePackageDescription pbi pkg_descr } | 17 | > return $ binfo { localPkgDescr = updatePackageDescription pbi pkg_descr } |
18 | 18 | ||
19 | |||
diff --git a/hmatrix.cabal b/hmatrix.cabal index 79ac491..906e4cf 100644 --- a/hmatrix.cabal +++ b/hmatrix.cabal | |||
@@ -23,7 +23,7 @@ Description: Purely functional interface to basic linear algebra | |||
23 | Category: Math | 23 | Category: Math |
24 | tested-with: GHC ==7.4 | 24 | tested-with: GHC ==7.4 |
25 | 25 | ||
26 | cabal-version: >=1.6 | 26 | cabal-version: >=1.8 |
27 | 27 | ||
28 | build-type: Custom | 28 | build-type: Custom |
29 | 29 | ||
@@ -148,16 +148,9 @@ library | |||
148 | 148 | ||
149 | -- ghc-prof-options: -auto | 149 | -- ghc-prof-options: -auto |
150 | 150 | ||
151 | 151 | ghc-options: -Wall -fno-warn-missing-signatures | |
152 | if impl(ghc < 7.4) | 152 | -fno-warn-orphans |
153 | ghc-options: -Wall -fno-warn-missing-signatures | 153 | -fno-warn-unused-binds |
154 | -fno-warn-orphans | ||
155 | -fno-warn-unused-binds | ||
156 | -fno-warn-dodgy-imports | ||
157 | else | ||
158 | ghc-options: -Wall -fno-warn-missing-signatures | ||
159 | -fno-warn-orphans | ||
160 | -fno-warn-unused-binds | ||
161 | 154 | ||
162 | if flag(unsafe) | 155 | if flag(unsafe) |
163 | cpp-options: -DUNSAFE | 156 | cpp-options: -DUNSAFE |
@@ -186,9 +179,6 @@ library | |||
186 | if impl(ghc == 7.0.1) | 179 | if impl(ghc == 7.0.1) |
187 | cpp-options: -DNONORMVTEST | 180 | cpp-options: -DNONORMVTEST |
188 | 181 | ||
189 | if impl(ghc < 7.4) | ||
190 | cpp-options: -DNOPOLYKINDS -DABSTRACTCINT | ||
191 | |||
192 | if flag(mkl) | 182 | if flag(mkl) |
193 | if arch(x86_64) | 183 | if arch(x86_64) |
194 | extra-libraries: gsl mkl_lapack mkl_intel_lp64 mkl_sequential mkl_core | 184 | extra-libraries: gsl mkl_lapack mkl_intel_lp64 mkl_sequential mkl_core |
diff --git a/lib/Data/Packed/Internal/Matrix.hs b/lib/Data/Packed/Internal/Matrix.hs index 9fbaf6d..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) | |||
44 | import Foreign.Ptr(Ptr, castPtr) | 44 | import Foreign.Ptr(Ptr, castPtr) |
45 | import Foreign.Storable(Storable, peekElemOff, pokeElemOff, poke, sizeOf) | 45 | import Foreign.Storable(Storable, peekElemOff, pokeElemOff, poke, sizeOf) |
46 | import Data.Complex(Complex) | 46 | import Data.Complex(Complex) |
47 | import Foreign.C.Types(CInt(..), CChar) | 47 | import Foreign.C.Types |
48 | import Foreign.C.String(newCString) | 48 | import Foreign.C.String(newCString) |
49 | import System.IO.Unsafe(unsafePerformIO) | 49 | import System.IO.Unsafe(unsafePerformIO) |
50 | 50 | ||
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 @@ | |||
14 | 14 | ||
15 | module Data.Packed.Internal.Signatures where | 15 | module Data.Packed.Internal.Signatures where |
16 | 16 | ||
17 | import Foreign | 17 | import Foreign.Ptr(Ptr) |
18 | import Data.Complex | 18 | import Data.Complex(Complex) |
19 | import Foreign.C.Types | 19 | import Foreign.C.Types(CInt) |
20 | 20 | ||
21 | type PF = Ptr Float -- | 21 | type PF = Ptr Float -- |
22 | type PD = Ptr Double -- | 22 | type PD = Ptr Double -- |
diff --git a/lib/Data/Packed/Internal/Vector.hs b/lib/Data/Packed/Internal/Vector.hs index e85ba6e..936479d 100644 --- a/lib/Data/Packed/Internal/Vector.hs +++ b/lib/Data/Packed/Internal/Vector.hs | |||
@@ -39,7 +39,7 @@ import Foreign.ForeignPtr(ForeignPtr, castForeignPtr) | |||
39 | import Foreign.Ptr(Ptr) | 39 | import Foreign.Ptr(Ptr) |
40 | import Foreign.Storable(Storable, peekElemOff, pokeElemOff, sizeOf) | 40 | import Foreign.Storable(Storable, peekElemOff, pokeElemOff, sizeOf) |
41 | import Foreign.C.String | 41 | import Foreign.C.String |
42 | import Foreign.C.Types(CInt(..),CChar) | 42 | import Foreign.C.Types |
43 | import Data.Complex | 43 | import Data.Complex |
44 | import Control.Monad(when) | 44 | import Control.Monad(when) |
45 | import System.IO.Unsafe(unsafePerformIO) | 45 | import System.IO.Unsafe(unsafePerformIO) |
diff --git a/lib/Numeric/ContainerBoot.hs b/lib/Numeric/ContainerBoot.hs index 6ce4760..d50dd36 100644 --- a/lib/Numeric/ContainerBoot.hs +++ b/lib/Numeric/ContainerBoot.hs | |||
@@ -1,11 +1,9 @@ | |||
1 | {-# LANGUAGE CPP #-} | ||
1 | {-# LANGUAGE TypeFamilies #-} | 2 | {-# LANGUAGE TypeFamilies #-} |
2 | {-# LANGUAGE FlexibleContexts #-} | 3 | {-# LANGUAGE FlexibleContexts #-} |
3 | {-# LANGUAGE FlexibleInstances #-} | 4 | {-# LANGUAGE FlexibleInstances #-} |
4 | {-# LANGUAGE MultiParamTypeClasses #-} | 5 | {-# LANGUAGE MultiParamTypeClasses #-} |
5 | {-# LANGUAGE UndecidableInstances #-} | 6 | {-# LANGUAGE UndecidableInstances #-} |
6 | #ifndef NOPOLYKINDS | ||
7 | {-# LANGUAGE PolyKinds #-} | ||
8 | #endif | ||
9 | 7 | ||
10 | ----------------------------------------------------------------------------- | 8 | ----------------------------------------------------------------------------- |
11 | -- | | 9 | -- | |
@@ -55,12 +53,12 @@ import Numeric.LinearAlgebra.LAPACK(multiplyR,multiplyC,multiplyF,multiplyQ) | |||
55 | 53 | ||
56 | ------------------------------------------------------------------- | 54 | ------------------------------------------------------------------- |
57 | 55 | ||
58 | type family IndexOf c | 56 | type family IndexOf (c :: * -> *) |
59 | 57 | ||
60 | type instance IndexOf Vector = Int | 58 | type instance IndexOf Vector = Int |
61 | type instance IndexOf Matrix = (Int,Int) | 59 | type instance IndexOf Matrix = (Int,Int) |
62 | 60 | ||
63 | type family ArgOf c a | 61 | type family ArgOf (c :: * -> *) a |
64 | 62 | ||
65 | type instance ArgOf Vector a = a -> a | 63 | type instance ArgOf Vector a = a -> a |
66 | type instance ArgOf Matrix a = a -> a -> a | 64 | type instance ArgOf Matrix a = a -> a -> a |
diff --git a/lib/Numeric/GSL/Differentiation.hs b/lib/Numeric/GSL/Differentiation.hs index 1df58a1..ab5eb50 100644 --- a/lib/Numeric/GSL/Differentiation.hs +++ b/lib/Numeric/GSL/Differentiation.hs | |||
@@ -22,7 +22,7 @@ module Numeric.GSL.Differentiation ( | |||
22 | derivBackward | 22 | derivBackward |
23 | ) where | 23 | ) where |
24 | 24 | ||
25 | import Foreign.C.Types(CInt(..)) | 25 | import Foreign.C.Types |
26 | import Foreign.Marshal.Alloc(malloc, free) | 26 | import Foreign.Marshal.Alloc(malloc, free) |
27 | import Foreign.Ptr(Ptr, FunPtr, freeHaskellFunPtr) | 27 | import Foreign.Ptr(Ptr, FunPtr, freeHaskellFunPtr) |
28 | import Foreign.Storable(peek) | 28 | import Foreign.Storable(peek) |
diff --git a/lib/Numeric/GSL/Fitting.hs b/lib/Numeric/GSL/Fitting.hs index da5c0fc..79db23f 100644 --- a/lib/Numeric/GSL/Fitting.hs +++ b/lib/Numeric/GSL/Fitting.hs | |||
@@ -54,7 +54,7 @@ import Numeric.LinearAlgebra | |||
54 | import Numeric.GSL.Internal | 54 | import Numeric.GSL.Internal |
55 | 55 | ||
56 | import Foreign.Ptr(FunPtr, freeHaskellFunPtr) | 56 | import Foreign.Ptr(FunPtr, freeHaskellFunPtr) |
57 | import Foreign.C.Types(CInt(..)) | 57 | import Foreign.C.Types |
58 | import System.IO.Unsafe(unsafePerformIO) | 58 | import System.IO.Unsafe(unsafePerformIO) |
59 | 59 | ||
60 | ------------------------------------------------------------------------- | 60 | ------------------------------------------------------------------------- |
diff --git a/lib/Numeric/GSL/Fourier.hs b/lib/Numeric/GSL/Fourier.hs index 5cc50dc..71bc8a1 100644 --- a/lib/Numeric/GSL/Fourier.hs +++ b/lib/Numeric/GSL/Fourier.hs | |||
@@ -22,7 +22,7 @@ module Numeric.GSL.Fourier ( | |||
22 | 22 | ||
23 | import Data.Packed.Internal | 23 | import Data.Packed.Internal |
24 | import Data.Complex | 24 | import Data.Complex |
25 | import Foreign.C.Types(CInt(..)) | 25 | import Foreign.C.Types |
26 | import System.IO.Unsafe (unsafePerformIO) | 26 | import System.IO.Unsafe (unsafePerformIO) |
27 | 27 | ||
28 | genfft code v = unsafePerformIO $ do | 28 | genfft code v = unsafePerformIO $ do |
diff --git a/lib/Numeric/GSL/Integration.hs b/lib/Numeric/GSL/Integration.hs index a59862a..a0e922b 100644 --- a/lib/Numeric/GSL/Integration.hs +++ b/lib/Numeric/GSL/Integration.hs | |||
@@ -20,7 +20,7 @@ module Numeric.GSL.Integration ( | |||
20 | integrateQAGS | 20 | integrateQAGS |
21 | ) where | 21 | ) where |
22 | 22 | ||
23 | import Foreign.C.Types(CInt(..)) | 23 | import Foreign.C.Types |
24 | import Foreign.Marshal.Alloc(malloc, free) | 24 | import Foreign.Marshal.Alloc(malloc, free) |
25 | import Foreign.Ptr(Ptr, FunPtr, freeHaskellFunPtr) | 25 | import Foreign.Ptr(Ptr, FunPtr, freeHaskellFunPtr) |
26 | import Foreign.Storable(peek) | 26 | import Foreign.Storable(peek) |
diff --git a/lib/Numeric/GSL/Internal.hs b/lib/Numeric/GSL/Internal.hs index a6c81ee..303e7e1 100644 --- a/lib/Numeric/GSL/Internal.hs +++ b/lib/Numeric/GSL/Internal.hs | |||
@@ -16,7 +16,7 @@ import Data.Packed.Internal | |||
16 | 16 | ||
17 | import Foreign.Marshal.Array(copyArray) | 17 | import Foreign.Marshal.Array(copyArray) |
18 | import Foreign.Ptr(Ptr, FunPtr) | 18 | import Foreign.Ptr(Ptr, FunPtr) |
19 | import Foreign.C.Types(CInt(..)) | 19 | import Foreign.C.Types |
20 | import System.IO.Unsafe(unsafePerformIO) | 20 | import System.IO.Unsafe(unsafePerformIO) |
21 | 21 | ||
22 | iv :: (Vector Double -> Double) -> (CInt -> Ptr Double -> Double) | 22 | iv :: (Vector Double -> Double) -> (CInt -> Ptr Double -> Double) |
diff --git a/lib/Numeric/GSL/Minimization.hs b/lib/Numeric/GSL/Minimization.hs index 6fac640..88acfac 100644 --- a/lib/Numeric/GSL/Minimization.hs +++ b/lib/Numeric/GSL/Minimization.hs | |||
@@ -65,7 +65,7 @@ import Data.Packed.Matrix | |||
65 | import Numeric.GSL.Internal | 65 | import Numeric.GSL.Internal |
66 | 66 | ||
67 | import Foreign.Ptr(Ptr, FunPtr, freeHaskellFunPtr) | 67 | import Foreign.Ptr(Ptr, FunPtr, freeHaskellFunPtr) |
68 | import Foreign.C.Types(CInt(..)) | 68 | import Foreign.C.Types |
69 | import System.IO.Unsafe(unsafePerformIO) | 69 | import System.IO.Unsafe(unsafePerformIO) |
70 | 70 | ||
71 | ------------------------------------------------------------------------ | 71 | ------------------------------------------------------------------------ |
diff --git a/lib/Numeric/GSL/ODE.hs b/lib/Numeric/GSL/ODE.hs index 86c8bab..2251acd 100644 --- a/lib/Numeric/GSL/ODE.hs +++ b/lib/Numeric/GSL/ODE.hs | |||
@@ -36,7 +36,7 @@ import Data.Packed.Internal | |||
36 | import Numeric.GSL.Internal | 36 | import Numeric.GSL.Internal |
37 | 37 | ||
38 | import Foreign.Ptr(FunPtr, nullFunPtr, freeHaskellFunPtr) | 38 | import Foreign.Ptr(FunPtr, nullFunPtr, freeHaskellFunPtr) |
39 | import Foreign.C.Types(CInt(..)) | 39 | import Foreign.C.Types |
40 | import System.IO.Unsafe(unsafePerformIO) | 40 | import System.IO.Unsafe(unsafePerformIO) |
41 | 41 | ||
42 | ------------------------------------------------------------------------- | 42 | ------------------------------------------------------------------------- |
diff --git a/lib/Numeric/GSL/Polynomials.hs b/lib/Numeric/GSL/Polynomials.hs index c0318d7..b21b1b6 100644 --- a/lib/Numeric/GSL/Polynomials.hs +++ b/lib/Numeric/GSL/Polynomials.hs | |||
@@ -1,4 +1,4 @@ | |||
1 | {-# LANGUAGE ForeignFunctionInterface #-} | 1 | {-# LANGUAGE CPP, ForeignFunctionInterface #-} |
2 | ----------------------------------------------------------------------------- | 2 | ----------------------------------------------------------------------------- |
3 | {- | | 3 | {- | |
4 | Module : Numeric.GSL.Polynomials | 4 | Module : Numeric.GSL.Polynomials |
@@ -19,13 +19,14 @@ module Numeric.GSL.Polynomials ( | |||
19 | polySolve | 19 | polySolve |
20 | ) where | 20 | ) where |
21 | 21 | ||
22 | #ifndef ABSTRACTCINT | ||
23 | import Foreign.C.Types(CInt(..)) | ||
24 | #endif | ||
25 | import Data.Packed.Internal | 22 | import Data.Packed.Internal |
26 | import Data.Complex | 23 | import Data.Complex |
27 | import System.IO.Unsafe (unsafePerformIO) | 24 | import System.IO.Unsafe (unsafePerformIO) |
28 | 25 | ||
26 | #if __GLASGOW_HASKELL__ >= 704 | ||
27 | import Foreign.C.Types (CInt(..)) | ||
28 | #endif | ||
29 | |||
29 | {- | Solution of general polynomial equations, using /gsl_poly_complex_solve/. For example, | 30 | {- | Solution of general polynomial equations, using /gsl_poly_complex_solve/. For example, |
30 | the three solutions of x^3 + 8 = 0 | 31 | the three solutions of x^3 + 8 = 0 |
31 | 32 | ||
diff --git a/lib/Numeric/GSL/Root.hs b/lib/Numeric/GSL/Root.hs index 9969e8a..41f7fb3 100644 --- a/lib/Numeric/GSL/Root.hs +++ b/lib/Numeric/GSL/Root.hs | |||
@@ -52,9 +52,8 @@ module Numeric.GSL.Root ( | |||
52 | import Data.Packed.Internal | 52 | import Data.Packed.Internal |
53 | import Data.Packed.Matrix | 53 | import Data.Packed.Matrix |
54 | import Numeric.GSL.Internal | 54 | import Numeric.GSL.Internal |
55 | 55 | import Foreign.Ptr(FunPtr, freeHaskellFunPtr) | |
56 | import Foreign.Ptr(FunPtr, freeHaskellFunPtr) | 56 | import Foreign.C.Types |
57 | import Foreign.C.Types(CInt(..)) | ||
58 | import System.IO.Unsafe(unsafePerformIO) | 57 | import System.IO.Unsafe(unsafePerformIO) |
59 | 58 | ||
60 | ------------------------------------------------------------------------- | 59 | ------------------------------------------------------------------------- |
diff --git a/lib/Numeric/GSL/Vector.hs b/lib/Numeric/GSL/Vector.hs index d0f419b..b8c6d04 100644 --- a/lib/Numeric/GSL/Vector.hs +++ b/lib/Numeric/GSL/Vector.hs | |||
@@ -31,7 +31,7 @@ import Data.Complex | |||
31 | import Foreign.Marshal.Alloc(free) | 31 | import Foreign.Marshal.Alloc(free) |
32 | import Foreign.Marshal.Array(newArray) | 32 | import Foreign.Marshal.Array(newArray) |
33 | import Foreign.Ptr(Ptr) | 33 | import Foreign.Ptr(Ptr) |
34 | import Foreign.C.Types(CInt(..)) | 34 | import Foreign.C.Types |
35 | import System.IO.Unsafe(unsafePerformIO) | 35 | import System.IO.Unsafe(unsafePerformIO) |
36 | 36 | ||
37 | fromei x = fromIntegral (fromEnum x) :: CInt | 37 | fromei x = fromIntegral (fromEnum x) :: CInt |
diff --git a/lib/Numeric/LinearAlgebra/Algorithms.hs b/lib/Numeric/LinearAlgebra/Algorithms.hs index 9806d6f..e2ecd4d 100644 --- a/lib/Numeric/LinearAlgebra/Algorithms.hs +++ b/lib/Numeric/LinearAlgebra/Algorithms.hs | |||
@@ -568,11 +568,19 @@ epslist = [ (fromIntegral k, golubeps k k) | k <- [1..]] | |||
568 | 568 | ||
569 | geps delta = head [ k | (k,g) <- epslist, g<delta] | 569 | geps delta = head [ k | (k,g) <- epslist, g<delta] |
570 | 570 | ||
571 | |||
571 | {- | Matrix exponential. It uses a direct translation of Algorithm 11.3.1 in Golub & Van Loan, | 572 | {- | Matrix exponential. It uses a direct translation of Algorithm 11.3.1 in Golub & Van Loan, |
572 | based on a scaled Pade approximation. | 573 | based on a scaled Pade approximation. |
573 | -} | 574 | -} |
574 | expm :: Field t => Matrix t -> Matrix t | 575 | expm :: Field t => Matrix t -> Matrix t |
575 | expm m = iterate msq f !! j | 576 | expm = expGolub |
577 | |||
578 | expGolub :: ( Fractional t, Element t, Field t | ||
579 | , Normed Matrix t | ||
580 | , RealFrac (RealOf t) | ||
581 | , Floating (RealOf t) | ||
582 | ) => Matrix t -> Matrix t | ||
583 | expGolub m = iterate msq f !! j | ||
576 | where j = max 0 $ floor $ logBase 2 $ pnorm Infinity m | 584 | where j = max 0 $ floor $ logBase 2 $ pnorm Infinity m |
577 | a = m */ fromIntegral ((2::Int)^j) | 585 | a = m */ fromIntegral ((2::Int)^j) |
578 | q = geps eps -- 7 steps | 586 | q = geps eps -- 7 steps |
diff --git a/lib/Numeric/LinearAlgebra/LAPACK.hs b/lib/Numeric/LinearAlgebra/LAPACK.hs index 14e121b..d1aa564 100644 --- a/lib/Numeric/LinearAlgebra/LAPACK.hs +++ b/lib/Numeric/LinearAlgebra/LAPACK.hs | |||
@@ -47,7 +47,7 @@ import Numeric.Conversion | |||
47 | import Numeric.GSL.Vector(vectorMapValR, FunCodeSV(Scale)) | 47 | import Numeric.GSL.Vector(vectorMapValR, FunCodeSV(Scale)) |
48 | 48 | ||
49 | import Foreign.Ptr(nullPtr) | 49 | import Foreign.Ptr(nullPtr) |
50 | import Foreign.C.Types(CInt(..)) | 50 | import Foreign.C.Types |
51 | import Control.Monad(when) | 51 | import Control.Monad(when) |
52 | import System.IO.Unsafe(unsafePerformIO) | 52 | import System.IO.Unsafe(unsafePerformIO) |
53 | 53 | ||
diff --git a/packages/glpk/hmatrix-glpk.cabal b/packages/glpk/hmatrix-glpk.cabal index 3231ef7..f9655d4 100644 --- a/packages/glpk/hmatrix-glpk.cabal +++ b/packages/glpk/hmatrix-glpk.cabal | |||
@@ -30,10 +30,7 @@ library | |||
30 | 30 | ||
31 | c-sources: lib/Numeric/LinearProgramming/glpk.c | 31 | c-sources: lib/Numeric/LinearProgramming/glpk.c |
32 | 32 | ||
33 | if impl(ghc < 7.4) | 33 | ghc-options: -Wall |
34 | ghc-options: -Wall -fno-warn-dodgy-imports | ||
35 | else | ||
36 | ghc-options: -Wall | ||
37 | 34 | ||
38 | extra-libraries: glpk | 35 | extra-libraries: glpk |
39 | 36 | ||
diff --git a/packages/glpk/lib/Numeric/LinearProgramming.hs b/packages/glpk/lib/Numeric/LinearProgramming.hs index c8cb0e1..b832bac 100644 --- a/packages/glpk/lib/Numeric/LinearProgramming.hs +++ b/packages/glpk/lib/Numeric/LinearProgramming.hs | |||
@@ -71,7 +71,7 @@ import Numeric.LinearAlgebra hiding (i) | |||
71 | import Data.Packed.Development | 71 | import Data.Packed.Development |
72 | import Foreign(Ptr) | 72 | import Foreign(Ptr) |
73 | import System.IO.Unsafe(unsafePerformIO) | 73 | import System.IO.Unsafe(unsafePerformIO) |
74 | import Foreign.C.Types(CInt(..)) | 74 | import Foreign.C.Types |
75 | import Data.List((\\),sortBy,nub) | 75 | import Data.List((\\),sortBy,nub) |
76 | import Data.Function(on) | 76 | import Data.Function(on) |
77 | 77 | ||
diff --git a/packages/special/hmatrix-special.cabal b/packages/special/hmatrix-special.cabal index 25880a9..22e989f 100644 --- a/packages/special/hmatrix-special.cabal +++ b/packages/special/hmatrix-special.cabal | |||
@@ -66,11 +66,7 @@ library | |||
66 | 66 | ||
67 | other-modules: Numeric.GSL.Special.Internal | 67 | other-modules: Numeric.GSL.Special.Internal |
68 | 68 | ||
69 | if impl(ghc < 7.4) | 69 | ghc-options: -Wall -fno-warn-unused-binds |
70 | ghc-options: -Wall -fno-warn-unused-binds | ||
71 | -fno-warn-dodgy-imports | ||
72 | else | ||
73 | ghc-options: -Wall -fno-warn-orphans | ||
74 | 70 | ||
75 | if flag(safe-cheap) | 71 | if flag(safe-cheap) |
76 | cpp-options: -DSAFE_CHEAP=safe | 72 | cpp-options: -DSAFE_CHEAP=safe |
diff --git a/packages/special/lib/Numeric/GSL/Special/Airy.hs b/packages/special/lib/Numeric/GSL/Special/Airy.hs index 2438b71..737de7c 100644 --- a/packages/special/lib/Numeric/GSL/Special/Airy.hs +++ b/packages/special/lib/Numeric/GSL/Special/Airy.hs | |||
@@ -41,7 +41,7 @@ module Numeric.GSL.Special.Airy( | |||
41 | ) where | 41 | ) where |
42 | 42 | ||
43 | import Foreign(Ptr) | 43 | import Foreign(Ptr) |
44 | import Foreign.C.Types(CInt(..)) | 44 | import Foreign.C.Types |
45 | import Numeric.GSL.Special.Internal | 45 | import Numeric.GSL.Special.Internal |
46 | 46 | ||
47 | airy_Ai_e :: Double -> Precision -> (Double,Double) | 47 | airy_Ai_e :: Double -> Precision -> (Double,Double) |
diff --git a/packages/special/lib/Numeric/GSL/Special/Bessel.hs b/packages/special/lib/Numeric/GSL/Special/Bessel.hs index e88c3b0..4a80c28 100644 --- a/packages/special/lib/Numeric/GSL/Special/Bessel.hs +++ b/packages/special/lib/Numeric/GSL/Special/Bessel.hs | |||
@@ -105,7 +105,7 @@ module Numeric.GSL.Special.Bessel( | |||
105 | ) where | 105 | ) where |
106 | 106 | ||
107 | import Foreign(Ptr) | 107 | import Foreign(Ptr) |
108 | import Foreign.C.Types(CInt(..),CSize(..)) | 108 | import Foreign.C.Types |
109 | import Numeric.GSL.Special.Internal | 109 | import Numeric.GSL.Special.Internal |
110 | 110 | ||
111 | bessel_J0_e :: Double -> (Double,Double) | 111 | bessel_J0_e :: Double -> (Double,Double) |
diff --git a/packages/special/lib/Numeric/GSL/Special/Clausen.hs b/packages/special/lib/Numeric/GSL/Special/Clausen.hs index 59547ec..80bd45c 100644 --- a/packages/special/lib/Numeric/GSL/Special/Clausen.hs +++ b/packages/special/lib/Numeric/GSL/Special/Clausen.hs | |||
@@ -18,7 +18,7 @@ module Numeric.GSL.Special.Clausen( | |||
18 | ) where | 18 | ) where |
19 | 19 | ||
20 | import Foreign(Ptr) | 20 | import Foreign(Ptr) |
21 | import Foreign.C.Types(CInt(..)) | 21 | import Foreign.C.Types |
22 | import Numeric.GSL.Special.Internal | 22 | import Numeric.GSL.Special.Internal |
23 | 23 | ||
24 | clausen_e :: Double -> (Double,Double) | 24 | clausen_e :: Double -> (Double,Double) |
diff --git a/packages/special/lib/Numeric/GSL/Special/Coulomb.hs b/packages/special/lib/Numeric/GSL/Special/Coulomb.hs index c282d7b..218213a 100644 --- a/packages/special/lib/Numeric/GSL/Special/Coulomb.hs +++ b/packages/special/lib/Numeric/GSL/Special/Coulomb.hs | |||
@@ -21,7 +21,7 @@ module Numeric.GSL.Special.Coulomb( | |||
21 | ) where | 21 | ) where |
22 | 22 | ||
23 | import Foreign(Ptr) | 23 | import Foreign(Ptr) |
24 | import Foreign.C.Types(CInt(..)) | 24 | import Foreign.C.Types |
25 | import Numeric.GSL.Special.Internal | 25 | import Numeric.GSL.Special.Internal |
26 | 26 | ||
27 | hydrogenicR_1_e :: Double -> Double -> (Double,Double) | 27 | hydrogenicR_1_e :: Double -> Double -> (Double,Double) |
diff --git a/packages/special/lib/Numeric/GSL/Special/Coupling.hs b/packages/special/lib/Numeric/GSL/Special/Coupling.hs index 390c6bb..326f53f 100644 --- a/packages/special/lib/Numeric/GSL/Special/Coupling.hs +++ b/packages/special/lib/Numeric/GSL/Special/Coupling.hs | |||
@@ -24,7 +24,7 @@ module Numeric.GSL.Special.Coupling( | |||
24 | ) where | 24 | ) where |
25 | 25 | ||
26 | import Foreign(Ptr) | 26 | import Foreign(Ptr) |
27 | import Foreign.C.Types(CInt(..)) | 27 | import Foreign.C.Types |
28 | import Numeric.GSL.Special.Internal | 28 | import Numeric.GSL.Special.Internal |
29 | 29 | ||
30 | coupling_3j_e :: CInt -> CInt -> CInt -> CInt -> CInt -> CInt -> (Double,Double) | 30 | coupling_3j_e :: CInt -> CInt -> CInt -> CInt -> CInt -> CInt -> (Double,Double) |
diff --git a/packages/special/lib/Numeric/GSL/Special/Dawson.hs b/packages/special/lib/Numeric/GSL/Special/Dawson.hs index 2486a57..9f73767 100644 --- a/packages/special/lib/Numeric/GSL/Special/Dawson.hs +++ b/packages/special/lib/Numeric/GSL/Special/Dawson.hs | |||
@@ -18,7 +18,7 @@ module Numeric.GSL.Special.Dawson( | |||
18 | ) where | 18 | ) where |
19 | 19 | ||
20 | import Foreign(Ptr) | 20 | import Foreign(Ptr) |
21 | import Foreign.C.Types(CInt(..)) | 21 | import Foreign.C.Types |
22 | import Numeric.GSL.Special.Internal | 22 | import Numeric.GSL.Special.Internal |
23 | 23 | ||
24 | dawson_e :: Double -> (Double,Double) | 24 | dawson_e :: Double -> (Double,Double) |
diff --git a/packages/special/lib/Numeric/GSL/Special/Debye.hs b/packages/special/lib/Numeric/GSL/Special/Debye.hs index 5a54e37..7ca17e4 100644 --- a/packages/special/lib/Numeric/GSL/Special/Debye.hs +++ b/packages/special/lib/Numeric/GSL/Special/Debye.hs | |||
@@ -28,7 +28,7 @@ module Numeric.GSL.Special.Debye( | |||
28 | ) where | 28 | ) where |
29 | 29 | ||
30 | import Foreign(Ptr) | 30 | import Foreign(Ptr) |
31 | import Foreign.C.Types(CInt(..)) | 31 | import Foreign.C.Types |
32 | import Numeric.GSL.Special.Internal | 32 | import Numeric.GSL.Special.Internal |
33 | 33 | ||
34 | debye_1_e :: Double -> (Double,Double) | 34 | debye_1_e :: Double -> (Double,Double) |
diff --git a/packages/special/lib/Numeric/GSL/Special/Dilog.hs b/packages/special/lib/Numeric/GSL/Special/Dilog.hs index a7e8e86..32cceba 100644 --- a/packages/special/lib/Numeric/GSL/Special/Dilog.hs +++ b/packages/special/lib/Numeric/GSL/Special/Dilog.hs | |||
@@ -21,7 +21,7 @@ module Numeric.GSL.Special.Dilog( | |||
21 | ) where | 21 | ) where |
22 | 22 | ||
23 | import Foreign(Ptr) | 23 | import Foreign(Ptr) |
24 | import Foreign.C.Types(CInt(..)) | 24 | import Foreign.C.Types |
25 | import Numeric.GSL.Special.Internal | 25 | import Numeric.GSL.Special.Internal |
26 | 26 | ||
27 | dilog_e :: Double -> (Double,Double) | 27 | dilog_e :: Double -> (Double,Double) |
diff --git a/packages/special/lib/Numeric/GSL/Special/Elementary.hs b/packages/special/lib/Numeric/GSL/Special/Elementary.hs index 710e0ce..e58a697 100644 --- a/packages/special/lib/Numeric/GSL/Special/Elementary.hs +++ b/packages/special/lib/Numeric/GSL/Special/Elementary.hs | |||
@@ -19,7 +19,7 @@ module Numeric.GSL.Special.Elementary( | |||
19 | ) where | 19 | ) where |
20 | 20 | ||
21 | import Foreign(Ptr) | 21 | import Foreign(Ptr) |
22 | import Foreign.C.Types(CInt(..)) | 22 | import Foreign.C.Types |
23 | import Numeric.GSL.Special.Internal | 23 | import Numeric.GSL.Special.Internal |
24 | 24 | ||
25 | multiply_e :: Double -> Double -> (Double,Double) | 25 | multiply_e :: Double -> Double -> (Double,Double) |
diff --git a/packages/special/lib/Numeric/GSL/Special/Ellint.hs b/packages/special/lib/Numeric/GSL/Special/Ellint.hs index 0d171bf..365c366 100644 --- a/packages/special/lib/Numeric/GSL/Special/Ellint.hs +++ b/packages/special/lib/Numeric/GSL/Special/Ellint.hs | |||
@@ -40,7 +40,7 @@ module Numeric.GSL.Special.Ellint( | |||
40 | ) where | 40 | ) where |
41 | 41 | ||
42 | import Foreign(Ptr) | 42 | import Foreign(Ptr) |
43 | import Foreign.C.Types(CInt(..)) | 43 | import Foreign.C.Types |
44 | import Numeric.GSL.Special.Internal | 44 | import Numeric.GSL.Special.Internal |
45 | 45 | ||
46 | ellint_Kcomp_e :: Double -> Precision -> (Double,Double) | 46 | ellint_Kcomp_e :: Double -> Precision -> (Double,Double) |
diff --git a/packages/special/lib/Numeric/GSL/Special/Elljac.hs b/packages/special/lib/Numeric/GSL/Special/Elljac.hs index 18c7f06..553350c 100644 --- a/packages/special/lib/Numeric/GSL/Special/Elljac.hs +++ b/packages/special/lib/Numeric/GSL/Special/Elljac.hs | |||
@@ -20,7 +20,7 @@ import System.IO.Unsafe | |||
20 | import Foreign.Ptr | 20 | import Foreign.Ptr |
21 | import Foreign.Storable | 21 | import Foreign.Storable |
22 | import Foreign.Marshal | 22 | import Foreign.Marshal |
23 | import Foreign.C.Types(CInt(..)) | 23 | import Foreign.C.Types |
24 | 24 | ||
25 | elljac_e :: Double -> Double -> (Double,Double,Double) | 25 | elljac_e :: Double -> Double -> (Double,Double,Double) |
26 | elljac_e u m = unsafePerformIO $ do | 26 | elljac_e u m = unsafePerformIO $ do |
diff --git a/packages/special/lib/Numeric/GSL/Special/Erf.hs b/packages/special/lib/Numeric/GSL/Special/Erf.hs index 69a5c9e..171a3c5 100644 --- a/packages/special/lib/Numeric/GSL/Special/Erf.hs +++ b/packages/special/lib/Numeric/GSL/Special/Erf.hs | |||
@@ -28,7 +28,7 @@ module Numeric.GSL.Special.Erf( | |||
28 | ) where | 28 | ) where |
29 | 29 | ||
30 | import Foreign(Ptr) | 30 | import Foreign(Ptr) |
31 | import Foreign.C.Types(CInt(..)) | 31 | import Foreign.C.Types |
32 | import Numeric.GSL.Special.Internal | 32 | import Numeric.GSL.Special.Internal |
33 | 33 | ||
34 | erfc_e :: Double -> (Double,Double) | 34 | erfc_e :: Double -> (Double,Double) |
diff --git a/packages/special/lib/Numeric/GSL/Special/Exp.hs b/packages/special/lib/Numeric/GSL/Special/Exp.hs index 0cc2b1c..3b70078 100644 --- a/packages/special/lib/Numeric/GSL/Special/Exp.hs +++ b/packages/special/lib/Numeric/GSL/Special/Exp.hs | |||
@@ -35,7 +35,7 @@ module Numeric.GSL.Special.Exp( | |||
35 | ) where | 35 | ) where |
36 | 36 | ||
37 | import Foreign(Ptr) | 37 | import Foreign(Ptr) |
38 | import Foreign.C.Types(CInt(..)) | 38 | import Foreign.C.Types |
39 | import Numeric.GSL.Special.Internal | 39 | import Numeric.GSL.Special.Internal |
40 | 40 | ||
41 | exp_e :: Double -> (Double,Double) | 41 | exp_e :: Double -> (Double,Double) |
diff --git a/packages/special/lib/Numeric/GSL/Special/Expint.hs b/packages/special/lib/Numeric/GSL/Special/Expint.hs index be01007..06f4594 100644 --- a/packages/special/lib/Numeric/GSL/Special/Expint.hs +++ b/packages/special/lib/Numeric/GSL/Special/Expint.hs | |||
@@ -44,7 +44,7 @@ module Numeric.GSL.Special.Expint( | |||
44 | ) where | 44 | ) where |
45 | 45 | ||
46 | import Foreign(Ptr) | 46 | import Foreign(Ptr) |
47 | import Foreign.C.Types(CInt(..)) | 47 | import Foreign.C.Types |
48 | import Numeric.GSL.Special.Internal | 48 | import Numeric.GSL.Special.Internal |
49 | 49 | ||
50 | expint_E1_e :: Double -> (Double,Double) | 50 | expint_E1_e :: Double -> (Double,Double) |
diff --git a/packages/special/lib/Numeric/GSL/Special/Fermi_dirac.hs b/packages/special/lib/Numeric/GSL/Special/Fermi_dirac.hs index a28b6e3..c39c096 100644 --- a/packages/special/lib/Numeric/GSL/Special/Fermi_dirac.hs +++ b/packages/special/lib/Numeric/GSL/Special/Fermi_dirac.hs | |||
@@ -34,7 +34,7 @@ module Numeric.GSL.Special.Fermi_dirac( | |||
34 | ) where | 34 | ) where |
35 | 35 | ||
36 | import Foreign(Ptr) | 36 | import Foreign(Ptr) |
37 | import Foreign.C.Types(CInt(..)) | 37 | import Foreign.C.Types |
38 | import Numeric.GSL.Special.Internal | 38 | import Numeric.GSL.Special.Internal |
39 | 39 | ||
40 | fermi_dirac_m1_e :: Double -> (Double,Double) | 40 | fermi_dirac_m1_e :: Double -> (Double,Double) |
diff --git a/packages/special/lib/Numeric/GSL/Special/Gamma.hs b/packages/special/lib/Numeric/GSL/Special/Gamma.hs index f5a573b..78115f1 100644 --- a/packages/special/lib/Numeric/GSL/Special/Gamma.hs +++ b/packages/special/lib/Numeric/GSL/Special/Gamma.hs | |||
@@ -57,7 +57,7 @@ module Numeric.GSL.Special.Gamma( | |||
57 | ) where | 57 | ) where |
58 | 58 | ||
59 | import Foreign(Ptr) | 59 | import Foreign(Ptr) |
60 | import Foreign.C.Types(CInt(..)) | 60 | import Foreign.C.Types |
61 | import Numeric.GSL.Special.Internal | 61 | import Numeric.GSL.Special.Internal |
62 | 62 | ||
63 | lngamma_e :: Double -> (Double,Double) | 63 | lngamma_e :: Double -> (Double,Double) |
diff --git a/packages/special/lib/Numeric/GSL/Special/Gegenbauer.hs b/packages/special/lib/Numeric/GSL/Special/Gegenbauer.hs index 78fbaf4..a3c998a 100644 --- a/packages/special/lib/Numeric/GSL/Special/Gegenbauer.hs +++ b/packages/special/lib/Numeric/GSL/Special/Gegenbauer.hs | |||
@@ -24,7 +24,7 @@ module Numeric.GSL.Special.Gegenbauer( | |||
24 | ) where | 24 | ) where |
25 | 25 | ||
26 | import Foreign(Ptr) | 26 | import Foreign(Ptr) |
27 | import Foreign.C.Types(CInt(..)) | 27 | import Foreign.C.Types |
28 | import Numeric.GSL.Special.Internal | 28 | import Numeric.GSL.Special.Internal |
29 | 29 | ||
30 | gegenpoly_1_e :: Double -> Double -> (Double,Double) | 30 | gegenpoly_1_e :: Double -> Double -> (Double,Double) |
diff --git a/packages/special/lib/Numeric/GSL/Special/Hyperg.hs b/packages/special/lib/Numeric/GSL/Special/Hyperg.hs index 958503f..ac237a5 100644 --- a/packages/special/lib/Numeric/GSL/Special/Hyperg.hs +++ b/packages/special/lib/Numeric/GSL/Special/Hyperg.hs | |||
@@ -38,7 +38,7 @@ module Numeric.GSL.Special.Hyperg( | |||
38 | ) where | 38 | ) where |
39 | 39 | ||
40 | import Foreign(Ptr) | 40 | import Foreign(Ptr) |
41 | import Foreign.C.Types(CInt(..)) | 41 | import Foreign.C.Types |
42 | import Numeric.GSL.Special.Internal | 42 | import Numeric.GSL.Special.Internal |
43 | 43 | ||
44 | hyperg_0F1_e :: Double -> Double -> (Double,Double) | 44 | hyperg_0F1_e :: Double -> Double -> (Double,Double) |
diff --git a/packages/special/lib/Numeric/GSL/Special/Internal.hsc b/packages/special/lib/Numeric/GSL/Special/Internal.hsc index 338ed40..e7c38e8 100644 --- a/packages/special/lib/Numeric/GSL/Special/Internal.hsc +++ b/packages/special/lib/Numeric/GSL/Special/Internal.hsc | |||
@@ -34,7 +34,7 @@ import Foreign.Ptr | |||
34 | import Foreign.Marshal | 34 | import Foreign.Marshal |
35 | import System.IO.Unsafe(unsafePerformIO) | 35 | import System.IO.Unsafe(unsafePerformIO) |
36 | import Data.Packed.Development(check,(//)) | 36 | import Data.Packed.Development(check,(//)) |
37 | import Foreign.C.Types(CSize,CInt) | 37 | import Foreign.C.Types |
38 | 38 | ||
39 | data Precision = PrecDouble | PrecSingle | PrecApprox | 39 | data Precision = PrecDouble | PrecSingle | PrecApprox |
40 | 40 | ||
diff --git a/packages/special/lib/Numeric/GSL/Special/Laguerre.hs b/packages/special/lib/Numeric/GSL/Special/Laguerre.hs index 33d7769..28b3d20 100644 --- a/packages/special/lib/Numeric/GSL/Special/Laguerre.hs +++ b/packages/special/lib/Numeric/GSL/Special/Laguerre.hs | |||
@@ -24,7 +24,7 @@ module Numeric.GSL.Special.Laguerre( | |||
24 | ) where | 24 | ) where |
25 | 25 | ||
26 | import Foreign(Ptr) | 26 | import Foreign(Ptr) |
27 | import Foreign.C.Types(CInt(..)) | 27 | import Foreign.C.Types |
28 | import Numeric.GSL.Special.Internal | 28 | import Numeric.GSL.Special.Internal |
29 | 29 | ||
30 | laguerre_1_e :: Double -> Double -> (Double,Double) | 30 | laguerre_1_e :: Double -> Double -> (Double,Double) |
diff --git a/packages/special/lib/Numeric/GSL/Special/Lambert.hs b/packages/special/lib/Numeric/GSL/Special/Lambert.hs index 4c410d7..44fbfb1 100644 --- a/packages/special/lib/Numeric/GSL/Special/Lambert.hs +++ b/packages/special/lib/Numeric/GSL/Special/Lambert.hs | |||
@@ -20,7 +20,7 @@ module Numeric.GSL.Special.Lambert( | |||
20 | ) where | 20 | ) where |
21 | 21 | ||
22 | import Foreign(Ptr) | 22 | import Foreign(Ptr) |
23 | import Foreign.C.Types(CInt(..)) | 23 | import Foreign.C.Types |
24 | import Numeric.GSL.Special.Internal | 24 | import Numeric.GSL.Special.Internal |
25 | 25 | ||
26 | lambert_W0_e :: Double -> (Double,Double) | 26 | lambert_W0_e :: Double -> (Double,Double) |
diff --git a/packages/special/lib/Numeric/GSL/Special/Legendre.hs b/packages/special/lib/Numeric/GSL/Special/Legendre.hs index 0042656..cb33e2e 100644 --- a/packages/special/lib/Numeric/GSL/Special/Legendre.hs +++ b/packages/special/lib/Numeric/GSL/Special/Legendre.hs | |||
@@ -53,7 +53,7 @@ module Numeric.GSL.Special.Legendre( | |||
53 | ) where | 53 | ) where |
54 | 54 | ||
55 | import Foreign(Ptr) | 55 | import Foreign(Ptr) |
56 | import Foreign.C.Types(CInt(..)) | 56 | import Foreign.C.Types |
57 | import Numeric.GSL.Special.Internal | 57 | import Numeric.GSL.Special.Internal |
58 | 58 | ||
59 | legendre_Pl_e :: CInt -> Double -> (Double,Double) | 59 | legendre_Pl_e :: CInt -> Double -> (Double,Double) |
diff --git a/packages/special/lib/Numeric/GSL/Special/Log.hs b/packages/special/lib/Numeric/GSL/Special/Log.hs index 46b6a0a..3becf15 100644 --- a/packages/special/lib/Numeric/GSL/Special/Log.hs +++ b/packages/special/lib/Numeric/GSL/Special/Log.hs | |||
@@ -25,7 +25,7 @@ module Numeric.GSL.Special.Log( | |||
25 | ) where | 25 | ) where |
26 | 26 | ||
27 | import Foreign(Ptr) | 27 | import Foreign(Ptr) |
28 | import Foreign.C.Types(CInt(..)) | 28 | import Foreign.C.Types |
29 | import Numeric.GSL.Special.Internal | 29 | import Numeric.GSL.Special.Internal |
30 | 30 | ||
31 | log_e :: Double -> (Double,Double) | 31 | log_e :: Double -> (Double,Double) |
diff --git a/packages/special/lib/Numeric/GSL/Special/Pow_int.hs b/packages/special/lib/Numeric/GSL/Special/Pow_int.hs index bccdde7..08fd497 100644 --- a/packages/special/lib/Numeric/GSL/Special/Pow_int.hs +++ b/packages/special/lib/Numeric/GSL/Special/Pow_int.hs | |||
@@ -18,7 +18,7 @@ module Numeric.GSL.Special.Pow_int( | |||
18 | ) where | 18 | ) where |
19 | 19 | ||
20 | import Foreign(Ptr) | 20 | import Foreign(Ptr) |
21 | import Foreign.C.Types(CInt(..)) | 21 | import Foreign.C.Types |
22 | import Numeric.GSL.Special.Internal | 22 | import Numeric.GSL.Special.Internal |
23 | 23 | ||
24 | pow_int_e :: Double -> CInt -> (Double,Double) | 24 | pow_int_e :: Double -> CInt -> (Double,Double) |
diff --git a/packages/special/lib/Numeric/GSL/Special/Psi.hs b/packages/special/lib/Numeric/GSL/Special/Psi.hs index b99817f..da53d1b 100644 --- a/packages/special/lib/Numeric/GSL/Special/Psi.hs +++ b/packages/special/lib/Numeric/GSL/Special/Psi.hs | |||
@@ -29,7 +29,7 @@ module Numeric.GSL.Special.Psi( | |||
29 | ) where | 29 | ) where |
30 | 30 | ||
31 | import Foreign(Ptr) | 31 | import Foreign(Ptr) |
32 | import Foreign.C.Types(CInt(..)) | 32 | import Foreign.C.Types |
33 | import Numeric.GSL.Special.Internal | 33 | import Numeric.GSL.Special.Internal |
34 | 34 | ||
35 | psi_int_e :: CInt -> (Double,Double) | 35 | psi_int_e :: CInt -> (Double,Double) |
diff --git a/packages/special/lib/Numeric/GSL/Special/Synchrotron.hs b/packages/special/lib/Numeric/GSL/Special/Synchrotron.hs index 6b5cbf6..b3292a6 100644 --- a/packages/special/lib/Numeric/GSL/Special/Synchrotron.hs +++ b/packages/special/lib/Numeric/GSL/Special/Synchrotron.hs | |||
@@ -20,7 +20,7 @@ module Numeric.GSL.Special.Synchrotron( | |||
20 | ) where | 20 | ) where |
21 | 21 | ||
22 | import Foreign(Ptr) | 22 | import Foreign(Ptr) |
23 | import Foreign.C.Types(CInt(..)) | 23 | import Foreign.C.Types |
24 | import Numeric.GSL.Special.Internal | 24 | import Numeric.GSL.Special.Internal |
25 | 25 | ||
26 | synchrotron_1_e :: Double -> (Double,Double) | 26 | synchrotron_1_e :: Double -> (Double,Double) |
diff --git a/packages/special/lib/Numeric/GSL/Special/Transport.hs b/packages/special/lib/Numeric/GSL/Special/Transport.hs index 4f3b469..b92b578 100644 --- a/packages/special/lib/Numeric/GSL/Special/Transport.hs +++ b/packages/special/lib/Numeric/GSL/Special/Transport.hs | |||
@@ -24,7 +24,7 @@ module Numeric.GSL.Special.Transport( | |||
24 | ) where | 24 | ) where |
25 | 25 | ||
26 | import Foreign(Ptr) | 26 | import Foreign(Ptr) |
27 | import Foreign.C.Types(CInt(..)) | 27 | import Foreign.C.Types |
28 | import Numeric.GSL.Special.Internal | 28 | import Numeric.GSL.Special.Internal |
29 | 29 | ||
30 | transport_2_e :: Double -> (Double,Double) | 30 | transport_2_e :: Double -> (Double,Double) |
diff --git a/packages/special/lib/Numeric/GSL/Special/Trig.hs b/packages/special/lib/Numeric/GSL/Special/Trig.hs index 2f1bda9..43fdc95 100644 --- a/packages/special/lib/Numeric/GSL/Special/Trig.hs +++ b/packages/special/lib/Numeric/GSL/Special/Trig.hs | |||
@@ -39,7 +39,7 @@ module Numeric.GSL.Special.Trig( | |||
39 | ) where | 39 | ) where |
40 | 40 | ||
41 | import Foreign(Ptr) | 41 | import Foreign(Ptr) |
42 | import Foreign.C.Types(CInt(..)) | 42 | import Foreign.C.Types |
43 | import Numeric.GSL.Special.Internal | 43 | import Numeric.GSL.Special.Internal |
44 | 44 | ||
45 | sin_e :: Double -> (Double,Double) | 45 | sin_e :: Double -> (Double,Double) |
diff --git a/packages/special/lib/Numeric/GSL/Special/Zeta.hs b/packages/special/lib/Numeric/GSL/Special/Zeta.hs index b29b026..a57a918 100644 --- a/packages/special/lib/Numeric/GSL/Special/Zeta.hs +++ b/packages/special/lib/Numeric/GSL/Special/Zeta.hs | |||
@@ -30,7 +30,7 @@ module Numeric.GSL.Special.Zeta( | |||
30 | ) where | 30 | ) where |
31 | 31 | ||
32 | import Foreign(Ptr) | 32 | import Foreign(Ptr) |
33 | import Foreign.C.Types(CInt(..)) | 33 | import Foreign.C.Types |
34 | import Numeric.GSL.Special.Internal | 34 | import Numeric.GSL.Special.Internal |
35 | 35 | ||
36 | zeta_int_e :: CInt -> (Double,Double) | 36 | zeta_int_e :: CInt -> (Double,Double) |
diff --git a/packages/special/lib/Numeric/GSL/Special/auto.hs b/packages/special/lib/Numeric/GSL/Special/auto.hs index d3461b2..36947ad 100755 --- a/packages/special/lib/Numeric/GSL/Special/auto.hs +++ b/packages/special/lib/Numeric/GSL/Special/auto.hs | |||
@@ -66,7 +66,7 @@ main = do | |||
66 | let exports = rep (")",") where") $ rep ("(\n","(\n ") $ rep (",\n",", ") $ unlines $ ["("]++intersperse "," (map (\(Header _ n _) -> hName n) (filter safe parsed))++[")"] | 66 | let exports = rep (")",") where") $ rep ("(\n","(\n ") $ rep (",\n",", ") $ unlines $ ["("]++intersperse "," (map (\(Header _ n _) -> hName n) (filter safe parsed))++[")"] |
67 | let defs = unlines $ map (showFull (name ++".h")) parsed | 67 | let defs = unlines $ map (showFull (name ++".h")) parsed |
68 | let imports = "\nimport Foreign(Ptr)\n" | 68 | let imports = "\nimport Foreign(Ptr)\n" |
69 | ++"import Foreign.C.Types(CInt(..))\n" | 69 | ++"import Foreign.C.Types\n" |
70 | ++"import Numeric.GSL.Special.Internal\n" | 70 | ++"import Numeric.GSL.Special.Internal\n" |
71 | let mod = modhead name ++ "module Numeric.GSL.Special."++ upperFirst name++exports++imports++defs | 71 | let mod = modhead name ++ "module Numeric.GSL.Special."++ upperFirst name++exports++imports++defs |
72 | writeFile (upperFirst name ++ ".hs") mod | 72 | writeFile (upperFirst name ++ ".hs") mod |
diff --git a/packages/special/lib/Numeric/GSL/Special/autoall.sh b/packages/special/lib/Numeric/GSL/Special/autoall.sh index 68a2d2d..18d0a6e 100755 --- a/packages/special/lib/Numeric/GSL/Special/autoall.sh +++ b/packages/special/lib/Numeric/GSL/Special/autoall.sh | |||
@@ -10,7 +10,6 @@ rm -f funs.txt | |||
10 | ./auto.hs airy | 10 | ./auto.hs airy |
11 | rep ') where' ', Precision(..)\n) where' Airy.hs | 11 | rep ') where' ', Precision(..)\n) where' Airy.hs |
12 | ./auto.hs bessel | 12 | ./auto.hs bessel |
13 | rep 'Foreign.C.Types(CInt(..))' 'Foreign.C.Types(CInt(..),CSize(..))' Bessel.hs | ||
14 | ./auto.hs clausen | 13 | ./auto.hs clausen |
15 | ./auto.hs coulomb | 14 | ./auto.hs coulomb |
16 | ./auto.hs coupling | 15 | ./auto.hs coupling |