cleanup some warnings and docs

darcs-hash:20080706201124-dd378-7eaa237d42b2368d40c8bd6dd56b51194fa3a44a

Author: dylan

Foreign/Matlab/Array/Able.hs

@@ -9,7 +9,6 @@ module Foreign.Matlab.Array.Able (
     withMatlabArray, fromMatlabArray
   ) where
 
-import Control.Applicative
 import Foreign.Matlab.Util
 import Foreign.Matlab.Types
 import Foreign.Matlab.Array.IMX
@@ -46,7 +45,7 @@ instance Matlabable () where
   fromMatlab _ = Nothing
 
 -- |Generate a temporary 'MXArray'
-withMatlabArray :: Matlabable a => With a MAnyArray (IO a)
+withMatlabArray :: Matlabable a => a -> (MAnyArray -> IO a) -> IO a
 withMatlabArray = withIMXData . toMatlab
 
 -- |Convert directly from 'MXArray' (without freeing the original array)

Foreign/Matlab/Array/Auto.hs

@@ -27,7 +27,7 @@ mxAuto (MXArray a)
   | otherwise = MXAuto =.< newForeignPtr mxDestroyArray_ptr a
 
 -- |Use a 'MXAuto'
-withMXAuto :: With (MXAuto a) (MXArray a) (IO b)
+withMXAuto :: MXAuto a -> (MXArray a -> IO b) -> IO b
 withMXAuto (MXAuto a) f = withForeignPtr a (f . MXArray)
 
 type MAnyAuto = MXAuto MAny

Foreign/Matlab/Array/IMX.hs

@@ -8,7 +8,7 @@ module Foreign.Matlab.Array.IMX (
     IMXData(..),
     IMXArrayElem,
 
-    -- * Interface with "Matlab.Array"
+    -- * Interface with "Foreign.Matlab.Array"
     imxData, iMXData,
     imxFun, iMXFun,
     withIMXData, takeIMXData,
@@ -96,8 +96,8 @@ listIMX s = imxConstr . listIMXArray s
 -- |Generic 'IMXData' scalar constructor
 scalarIMX :: IMXArrayElem a => a -> IMXData
 scalarIMX = imxConstr . scalarIMXArray
-emptyIMX :: IMXArrayElem a => a -> IMXData
-emptyIMX a = listIMX [0] ([] `asTypeOf` [a])
+--emptyIMX :: IMXArrayElem a => a -> IMXData
+--emptyIMX a = listIMX [0] ([] `asTypeOf` [a])
 
 -- |Generic 'IMXData' array size accessor
 imxSize :: IMXData -> MSize
@@ -218,14 +218,14 @@ iMXData = imxd where
     mxArraySetAll m =<< mapM f (elems a)
     return $ anyMXArray m
 
-withIMXData :: With IMXData MAnyArray (IO a)
+withIMXData :: IMXData -> (MAnyArray -> IO a) -> IO a
 withIMXData d f = do
   a <- iMXData d
   r <- f a
   freeMXArray a
   return r
 
-withIMXDataList :: With [IMXData] [MAnyArray] (IO a)
+withIMXDataList :: [IMXData] -> ([MAnyArray] -> IO a) -> IO a
 withIMXDataList = mapWith withIMXData
 
 takeIMXData :: MXArray a -> IO IMXData

Foreign/Matlab/Array/MArray.hs

@@ -17,10 +17,10 @@ import Foreign.Matlab.Array
 -- |A wrapper for 'MXArray' to allow for a 'Data.Array.MArray.MArray' instance.  All instances of this type will have 'MIndex' as @i@
 newtype MMXArray i e = MMXArray { mmxArray :: MXArray e }
 
--- |Get an 'MArray' instance for an 'MXArray'.  The resulting object is just a different interface to the same underlying array.
+-- |Get an 'Data.Array.MArray.MArray' instance for an 'MXArray'.  The resulting object is just a different interface to the same underlying array.
 mxMArray :: MXArrayComponent a => MXArray a -> MMXArray MIndex a
 mxMArray = MMXArray
--- |Get a 'MXArray' back from its 'MArray' instance
+-- |Get a 'MXArray' back from its 'Data.Array.MArray.MArray' instance
 unMmxArray :: MXArrayComponent a => MMXArray MIndex a -> MXArray a
 unMmxArray = mmxArray
 

Foreign/Matlab/Engine.hsc

@@ -73,7 +73,7 @@ data EngineEvalArg a = EvalArray (MXArray a) | EvalVar String
 -- This automates 'engineSetVar' on arguments (using \"hseval_inN\"), 'engineEval', and 'engineGetVar' on results (using \"hseval_outN\").
 engineEvalFun :: Engine -> String -> [EngineEvalArg a] -> Int -> IO [MAnyArray]
 engineEvalFun eng fun arg no = do
-  arg <- zipWithM makearg arg [1..]
+  arg <- zipWithM makearg arg [1 :: Int ..]
   let out = map makeout [1..no]
   let outs = if out == [] then "" else "[" ++ unwords out ++ "] = "
   engineEval eng (outs ++ fun ++ "(" ++ intercalate "," arg ++ ")")

Foreign/Matlab/Internal.hsc

@@ -108,6 +108,7 @@ instance MType MXClassID MXClass where
   hs2mx MXClassUint64   = #const mxUINT64_CLASS
   hs2mx MXClassFun      = #const mxFUNCTION_CLASS
   hs2mx MXClassObject   = #const mxOBJECT_CLASS	 
+  mxClassOf _ = error "mxClassOf: no class for MXClassID"
 
 type MXChar = #type mxChar
 type MChar = Char

Foreign/Matlab/Runtime.hsc

@@ -57,10 +57,12 @@ terminateApp term = modifyMVar_ initialized maybeterm where
       else fail "mclTerminateApplication"
   maybeterm n = return $ pred n
 
+{-
 foreign import ccall unsafe mclInitializeApplication :: InitApp
 foreign import ccall unsafe mclTerminateApplication :: TermApp
 initialize = initializeApp mclInitializeApplication
 terminate = terminateApp mclTerminateApplication
+-}
 
 foreign import ccall "dynamic" mkInitApp :: FunPtr a -> InitApp
 foreign import ccall "dynamic" mkTermApp :: FunPtr a -> TermApp

Foreign/Matlab/Util.hs

@@ -50,10 +50,10 @@ mapWithArrayLen w l f =
     in set l 0
 
 segment :: Int -> [a] -> [[a]]
-segment n [] = []
+segment _ [] = []
 segment n l = a : segment n r where (a,r) = splitAt n l
 
 replaceIndex :: [a] -> Int -> a -> [a]
 replaceIndex [] _ _ = error "replaceIndex: index too large"
-replaceIndex (x:l) 0 y = y:l
+replaceIndex (_:l) 0 y = y:l
 replaceIndex (x:l) n y = x : replaceIndex l (pred n) y