From 776f4b9fbda8eeec006b24ed5f1548be752eae3c Mon Sep 17 00:00:00 2001
From: Alberto Ruiz <aruiz@um.es>
Date: Sat, 7 Jan 2012 18:51:20 +0100
Subject: remove warnings

---
 lib/Data/Packed/Internal/Matrix.hs | 10 +++-------
 lib/Data/Packed/ST.hs              |  2 +-
 2 files changed, 4 insertions(+), 8 deletions(-)

(limited to 'lib')

diff --git a/lib/Data/Packed/Internal/Matrix.hs b/lib/Data/Packed/Internal/Matrix.hs
index 28bebbc..257e4fc 100644
--- a/lib/Data/Packed/Internal/Matrix.hs
+++ b/lib/Data/Packed/Internal/Matrix.hs
@@ -180,11 +180,7 @@ toColumns m = toRows . trans $ m
 -- | Reads a matrix position.
 (@@>) :: Storable t => Matrix t -> (Int,Int) -> t
 infixl 9 @@>
---m@M {rows = r, cols = c} @@> (i,j)
---    | i<0 || i>=r || j<0 || j>=c = error "matrix indexing out of range"
---    | otherwise   = cdat m `at` (i*c+j)
-
-m@Matrix {irows = r, icols = c, xdat = v, order = o} @@> (i,j)
+m@Matrix {irows = r, icols = c} @@> (i,j)
     | safe      = if i<0 || i>=r || j<0 || j>=c
                     then error "matrix indexing out of range"
                     else atM' m i j
@@ -205,9 +201,9 @@ matrixFromVector o c v = Matrix { irows = r, icols = c, xdat = v, order = o }
 
 -- allocates memory for a new matrix
 createMatrix :: (Storable a) => MatrixOrder -> Int -> Int -> IO (Matrix a)
-createMatrix order r c = do
+createMatrix ord r c = do
     p <- createVector (r*c)
-    return (matrixFromVector order c p)
+    return (matrixFromVector ord c p)
 
 {- | Creates a matrix from a vector by grouping the elements in rows with the desired number of columns. (GNU-Octave groups by columns. To do it you can define @reshapeF r = trans . reshape r@
 where r is the desired number of rows.)
diff --git a/lib/Data/Packed/ST.hs b/lib/Data/Packed/ST.hs
index c96a209..c1e7aef 100644
--- a/lib/Data/Packed/ST.hs
+++ b/lib/Data/Packed/ST.hs
@@ -171,7 +171,7 @@ writeMatrix :: Storable t => STMatrix s t -> Int -> Int -> t -> ST s ()
 writeMatrix = safeIndexM unsafeWriteMatrix
 
 newUndefinedMatrix :: Storable t => MatrixOrder -> Int -> Int -> ST s (STMatrix s t)
-newUndefinedMatrix order r c = unsafeIOToST $ fmap STMatrix $ createMatrix order r c
+newUndefinedMatrix ord r c = unsafeIOToST $ fmap STMatrix $ createMatrix ord r c
 
 {-# NOINLINE newMatrix #-}
 newMatrix :: Storable t => t -> Int -> Int -> ST s (STMatrix s t)
-- 
cgit v1.2.3