fix ghc-6.12 warnings

10 files changed, 20 insertions, 36 deletions

diff --git a/INSTALL b/INSTALL
index 287e0e8..180609d 100644
--- a/INSTALL
+++ b/INSTALL
@@ -4,8 +4,8 @@
 
 INSTALLATION
 
-Recommended method:
-    $ sudo apt-get install libgsl0-dev refblas3-dev lapack3-dev atlas3-[your arch]-dev
+Recommended method (ok in Ubuntu/Debian systems):
+    $ sudo apt-get install libgsl0-dev liblapack-dev
     $ cabal install hmatrix
 
 Detailed installation instructions:
diff --git a/README b/README
index 37e2d60..61be22a 100644
--- a/README
+++ b/README
@@ -4,25 +4,13 @@
 
 INSTALLATION
 
-Recommended method (ok in Ubuntu/Debian systems):
-    $ sudo apt-get install libgsl0-dev refblas3-dev lapack3-dev atlas3-[your_arch]-dev
-    $ cabal install hmatrix
-
-Detailed installation instructions:
-    http://www.hmatrix.googlepages.com/installation
-
-For installation in Windows see the companion INSTALL file.
+See the INSTALL file.
 
 TESTS ---------------------------------------------
 
 $ ghci
-GHCi, version 6.8.2: http://www.haskell.org/ghc/  :? for help
 Prelude> Numeric.LinearAlgebra.Tests.runTests 20
 
-Additional tests with big matrices (taking a few minutes):
-
-$ runhaskell examples/experiments/bigtests
-
 EXAMPLES ------------------------------------------------------
 
 $ ghci
@@ -60,9 +48,6 @@ KNOWN PROBLEMS / BUGS -------------------------------
   produced segmentation faults when working with big matrices
   on compiled programs.
 
-- On distributions with old GSL versions you should comment out a couple of functions
-  in the export lists of Ellint.hs and Debye.hs
-
 ACKNOWLEDGEMENTS -----------------------------------------------------
 
 I thank Don Stewart, Henning Thielemann, Bulat Ziganshin and all the people
diff --git a/hmatrix.cabal b/hmatrix.cabal
index 64fef13..a7662b9 100644
--- a/hmatrix.cabal
+++ b/hmatrix.cabal
@@ -1,5 +1,5 @@
 Name:               hmatrix
-Version:            0.7.2.0
+Version:            0.7.2.1
 License:            GPL
 License-file:       LICENSE
 Author:             Alberto Ruiz
@@ -11,7 +11,7 @@ Description:        This library provides a purely functional interface to basic
                     and other numerical computations, internally implemented using
                     GSL, BLAS and LAPACK.
 Category:           Math
-tested-with:        GHC ==6.10.4
+tested-with:        GHC ==6.12.1
 
 cabal-version:      >=1.2
 build-type:         Custom
diff --git a/lib/Data/Packed/Internal/Vector.hs b/lib/Data/Packed/Internal/Vector.hs
index 009297a..bc623de 100644
--- a/lib/Data/Packed/Internal/Vector.hs
+++ b/lib/Data/Packed/Internal/Vector.hs
@@ -41,7 +41,9 @@ import Foreign.ForeignPtr       (mallocForeignPtrBytes)
 #endif
 
 import GHC.Base
+#if __GLASGOW_HASKELL__ < 612
 import GHC.IOBase
+#endif
 
 -- | A one-dimensional array of objects stored in a contiguous memory block.
 data Vector t =
diff --git a/lib/Graphics/Plot.hs b/lib/Graphics/Plot.hs
index b3cf9d9..510e1b7 100644
--- a/lib/Graphics/Plot.hs
+++ b/lib/Graphics/Plot.hs
@@ -51,7 +51,7 @@ meshdom :: Vector Double -> Vector Double -> (Matrix Double , Matrix Double)
 meshdom r1 r2 = (outer r1 (constant 1 (size r2)), outer (constant 1 (size r1)) r2)
 
 gnuplotX :: String -> IO ()
-gnuplotX command = do {system cmdstr; return()} where
+gnuplotX command = do { _ <- system cmdstr; return()} where
     cmdstr = "echo \""++command++"\" | gnuplot -persist"
 
 datafollows = "\\\"-\\\""
@@ -76,8 +76,8 @@ mesh' m = do
     writeFile "splot-gnu-command" "splot \"splot-tmp.txt\" matrix with lines; pause -1"; 
     toFile' "splot-tmp.txt" m
     putStr "Press [Return] to close the graphic and continue... "
-    system "gnuplot -persist splot-gnu-command"
-    system "rm splot-tmp.txt splot-gnu-command"
+    _ <- system "gnuplot -persist splot-gnu-command"
+    _ <- system "rm splot-tmp.txt splot-gnu-command"
     return ()
 
 {- | Draws the surface represented by the function f in the desired ranges and number of points, internally using 'mesh'.
@@ -161,7 +161,7 @@ matrixToPGM m = header ++ unlines (map unwords ll) where
 -- | imshow shows a representation of a matrix as a gray level image using ImageMagick's display.
 imshow :: Matrix Double -> IO ()
 imshow m = do
-    system $ "echo \""++ matrixToPGM m ++"\"| display -antialias -resize 300 - &"
+    _ <- system $ "echo \""++ matrixToPGM m ++"\"| display -antialias -resize 300 - &"
     return ()
 
 ----------------------------------------------------
@@ -173,12 +173,12 @@ gnuplotpdf title command ds = gnuplot (prelude ++ command ++" "++ draw) >> postp
     draw = concat (intersperse ", " (map ("\"-\" "++) defs)) ++ "\n" ++
            concatMap pr dats
     postproc = do
-        system $ "epstopdf "++title++".eps"
+        _ <- system $ "epstopdf "++title++".eps"
         mklatex
-        system $ "pdflatex "++title++"aux.tex > /dev/null"
-        system $ "pdfcrop "++title++"aux.pdf > /dev/null"
-        system $ "mv "++title++"aux-crop.pdf "++title++".pdf"
-        system $ "rm "++title++"aux.* "++title++".eps "++title++".tex"
+        _ <- system $ "pdflatex "++title++"aux.tex > /dev/null"
+        _ <- system $ "pdfcrop "++title++"aux.pdf > /dev/null"
+        _ <- system $ "mv "++title++"aux-crop.pdf "++title++".pdf"
+        _ <- system $ "rm "++title++"aux.* "++title++".eps "++title++".tex"
         return ()
 
     mklatex = writeFile (title++"aux.tex") $
@@ -201,5 +201,6 @@ gnuplotpdf title command ds = gnuplot (prelude ++ command ++" "++ draw) >> postp
 
     gnuplot cmd = do
         writeFile "gnuplotcommand" cmd
-        system "gnuplot gnuplotcommand"
-        system "rm gnuplotcommand"
+        _ <- system "gnuplot gnuplotcommand"
+        _ <- system "rm gnuplotcommand"
+        return ()
diff --git a/lib/Numeric/GSL.hs b/lib/Numeric/GSL.hs
index 2e90fff..cc5d156 100644
--- a/lib/Numeric/GSL.hs
+++ b/lib/Numeric/GSL.hs
@@ -32,7 +32,6 @@ import Numeric.GSL.Polynomials
 import Numeric.GSL.Minimization
 import Numeric.GSL.Root
 import Complex
-import Numeric.GSL.Special
 
 
 -- | This action removes the GSL default error handler (which aborts the program), so that
diff --git a/lib/Numeric/LinearAlgebra/Algorithms.hs b/lib/Numeric/LinearAlgebra/Algorithms.hs
index 954b214..e0cc0a0 100644
--- a/lib/Numeric/LinearAlgebra/Algorithms.hs
+++ b/lib/Numeric/LinearAlgebra/Algorithms.hs
@@ -72,7 +72,6 @@ import Data.Packed.Internal hiding (fromComplex, toComplex, conj, (//))
 import Data.Packed
 import Numeric.GSL.Vector
 import Numeric.LinearAlgebra.LAPACK as LAPACK
-import Complex
 import Numeric.LinearAlgebra.Linear
 import Data.List(foldl1')
 import Data.Array
diff --git a/lib/Numeric/LinearAlgebra/LAPACK.hs b/lib/Numeric/LinearAlgebra/LAPACK.hs
index ffa2cb5..30a3d3b 100644
--- a/lib/Numeric/LinearAlgebra/LAPACK.hs
+++ b/lib/Numeric/LinearAlgebra/LAPACK.hs
@@ -30,7 +30,6 @@ module Numeric.LinearAlgebra.LAPACK (
 import Data.Packed.Internal hiding (toComplex)
 import Data.Packed
 import Numeric.GSL.Vector(vectorMapValR, FunCodeSV(Scale))
-import Complex
 import Foreign
 import Foreign.C.Types (CInt)
 import Control.Monad(when)
diff --git a/lib/Numeric/LinearAlgebra/Linear.hs b/lib/Numeric/LinearAlgebra/Linear.hs
index 0426bb7..699985f 100644
--- a/lib/Numeric/LinearAlgebra/Linear.hs
+++ b/lib/Numeric/LinearAlgebra/Linear.hs
@@ -20,7 +20,6 @@ module Numeric.LinearAlgebra.Linear (
 
 import Data.Packed
 import Numeric.GSL.Vector
-import Complex
 
 -- | A generic interface for vectors and matrices to a few element-by-element functions in Numeric.GSL.Vector.
 class (Container c e) => Linear c e where
diff --git a/lib/Numeric/LinearAlgebra/Tests.hs b/lib/Numeric/LinearAlgebra/Tests.hs
index bf29ee9..e591285 100644
--- a/lib/Numeric/LinearAlgebra/Tests.hs
+++ b/lib/Numeric/LinearAlgebra/Tests.hs
@@ -225,7 +225,7 @@ runTests n = do
     test (\m -> toRows (m::RM) == read (show (toRows m)))
     test (\m -> toRows (m::CM) == read (show (toRows m)))
     putStrLn "------ some unit tests"
-    runTestTT $ TestList
+    _ <- runTestTT $ TestList
         [ utest "1E5 rots" rotTest
         , utest "det1" detTest1
         , utest "expm1" (expmTest1)