Merge branch 'master' into unify

Author: dylex

Foreign/Matlab.hs

@@ -1,4 +1,4 @@
-{-# OPTIONS_GHC -fno-implicit-prelude #-}
+{-# LANGUAGE NoImplicitPrelude #-}
 
 {-|
   Bundles Matlab data structure and general-purpose routines.

Foreign/Matlab/Array.hsc

@@ -1,3 +1,4 @@
+{-# LANGUAGE ScopedTypeVariables, UndecidableInstances #-}
 {-|
   Array access, including cell arrays and structures.
 
@@ -19,19 +20,16 @@ module Foreign.Matlab.Array (
     mIndexOffset,
 
     -- * Array element access
-    MXArrayComponent,
+    MXArrayComponent (mxArrayGetOffset, mxArraySetOffset
+      , mxArrayGetOffsetList, mxArraySetOffsetList
+      , mxScalarGet, isMXScalar
+      , createMXArray, createMXScalar
+      , createColVector, createRowVector),
     castMXArray,
-    -- |raw array element access
-    mxArrayGetOffset, mxArraySetOffset,
-    -- |raw array list access
-    mxArrayGetOffsetList, mxArraySetOffsetList,
-    -- |array element access
+    -- | array element access
     mxArrayGet, mxArraySet,
-    -- |array list access
+    -- | array list access
     mxArrayGetList, mxArraySetList,
-    mxScalarGet, isMXScalar,
-    createMXArray, createMXScalar,
-    createColVector, createRowVector,
     mxArrayGetAll, mxArraySetAll,
 
     -- * Struct access
@@ -273,19 +271,18 @@ createNumericArray :: MXClass -> Bool -> MWSize -> Ptr MWSize -> IO MXArrayPtr
 createNumericArray t c n s = mxCreateNumericArray n s (hs2mx t) (if c then (#const mxCOMPLEX) else (#const mxREAL))
 
 #let numarray t = "\
-foreign import ccall unsafe mxIs%1$s :: MXArrayPtr -> IO CBool\n\
-instance MXArrayComponent M%1$s where\n\
-  isMXArray a = boolC =.< withMXArray a mxIs%1$s\n\
-  createMXArray s = withNDims s (uncurry $ createNumericArray (mxClassOf (undefined :: M%1$s)) False) >>= mkMXArray\n\
+foreign import ccall unsafe mxIs%s :: MXArrayPtr -> IO CBool\n\
+instance MXArrayComponent M%s where\n\
+  isMXArray a = boolC =.< withMXArray a mxIs%s\n\
+  createMXArray s = withNDims s (uncurry $ createNumericArray (mxClassOf (undefined :: M%s)) False) >>= mkMXArray\n\
   \
 mxArrayGetOffset = arrayDataGet ;\
 mxArraySetOffset = arrayDataSet ;\
 mxArrayGetOffsetList = arrayDataGetList ;\
 mxArraySetOffsetList = arrayDataSetList\
   \n\
-instance MXArrayData MX%1$s M%1$s\
-", #t
---"
+instance MXArrayData MX%s M%s\
+", #t, #t, #t, #t, #t, #t
 
 foreign import ccall unsafe mxIsDouble :: MXArrayPtr -> IO CBool
 foreign import ccall unsafe mxCreateDoubleScalar :: MXDouble -> IO MXArrayPtr

Foreign/Matlab/Array/Able.hs

@@ -4,8 +4,7 @@
   In general, scalars convert to the obvious, and lists to row vectors.
 -}
 module Foreign.Matlab.Array.Able (
-    Matlabable,
-    toMatlab, fromMatlab,
+    Matlabable (toMatlab, fromMatlab),
     withMatlabArray, fromMatlabArray
   ) where
 

Foreign/Matlab/Array/Auto.hs

@@ -13,7 +13,6 @@ module Foreign.Matlab.Array.Auto (
 import Foreign
 import Foreign.Matlab.Util
 import Foreign.Matlab.Internal
-import Foreign.Matlab.Types
 
 -- |A 'MXArray' that is automatically freed with 'Foreign.Matlab.Array.freeMXArray'
 newtype MXAuto a = MXAuto (ForeignPtr MXArrayType)

Foreign/Matlab/Array/IMX.hs

@@ -6,7 +6,8 @@
 -}
 module Foreign.Matlab.Array.IMX (
     IMXData(..),
-    IMXArrayElem,
+    IMXArray,
+    IMXArrayElem (imxConstr, imxArray),
 
     -- * Interface with "Foreign.Matlab.Array"
     imxData, iMXData,
@@ -16,7 +17,6 @@ module Foreign.Matlab.Array.IMX (
 
     -- * Construction and access
     imxSize,
-    imxConstr, imxArray,
     listIMX, scalarIMX,
     imxList, imxScalar,
     listIMXStruct,
@@ -27,7 +27,6 @@ import Control.Monad
 import Data.Array.IArray
 import Data.Complex
 import Data.List
-import Text.Show
 import Foreign.Matlab.Util
 import Foreign.Matlab.Internal
 import Foreign.Matlab.Types
@@ -191,7 +190,7 @@ iMXData = imxd where
   imxd (IMXStruct f a) = do
     let ((r0,_),(r1,_)) = bounds a
     m <- createStruct (mRangeSize (r0,r1)) f
-    zipWithM (\i -> mStructSetFields m (mOffset i) <=< mapM iMXData) [0..] (segment (length f) (elems a))
+    zipWithM_ (\i -> mStructSetFields m (mOffset i) <=< mapM iMXData) [0..] (segment (length f) (elems a))
     return $ anyMXArray m
   imxd (IMXLogical a)	= imxa a return
   imxd (IMXChar a)	= imxa a return

Foreign/Matlab/Config.hs

@@ -22,8 +22,6 @@ import Foreign.C.Types
 import Data.List
 import Foreign.Matlab.Util
 import Foreign.Matlab.Internal
-import Foreign.Matlab.Types
-import Foreign.Matlab.Config
 
 #include <engine.h>
 
@@ -37,9 +35,8 @@ foreign import ccall unsafe engOpen :: CString -> IO EnginePtr
 foreign import ccall unsafe "&" engClose :: FunPtr (EnginePtr -> IO ()) -- CInt
 
 -- |Start Matlab server process.  It will automatically be closed down when no longer in use.
-newEngine :: Maybe FilePath -> IO Engine
-newEngine Nothing = newEngine (Just matlabBin)
-newEngine (Just bin) = do
+newEngine :: FilePath -> IO Engine
+newEngine bin = do
   eng <- withCString bin engOpen
   if eng == nullPtr
     then fail "engOpen"

Foreign/Matlab/Config.hs.in

@@ -30,7 +30,6 @@ module Foreign.Matlab.Internal (
 import Foreign
 import Foreign.C.Types
 import qualified Data.Char
-import Data.Typeable
 import Foreign.Matlab.Util
 
 #include <matrix.h>
@@ -137,21 +136,20 @@ instance MType MXSingle MSingle where
   mx2hs = id
   mxClassOf _ = MXClassSingle
 
-#let inttype u, n = "\
-type MX%2$s%1$u = %3$s%1$u\n\
-type M%2$s%1$u = %3$s%1$u\n\
-instance MType MX%2$s%1$u M%2$s%1$u where { hs2mx = id ; mx2hs = id ; mxClassOf _ = MXClass%2$s%1$u }\
-", n, u ? "Uint" : "Int", u ? "Word" : "Int"
---"
-
-#inttype 0, 8
-#inttype 0, 16
-#inttype 0, 32
-#inttype 0, 64
-#inttype 1, 8
-#inttype 1, 16
-#inttype 1, 32
-#inttype 1, 64
+#let inttype u, v, n = "\
+type MX%s%u = %s%u\r\n\
+type M%s%u = %s%u\r\n\
+instance MType MX%s%u M%s%u where { hs2mx = id ; mx2hs = id ; mxClassOf _ = MXClass%s%u }\
+", u, n, v, n, u, n, v, n, u, n, u, n, u, n
+
+#inttype "Int", "Int", 8
+#inttype "Int", "Int", 16
+#inttype "Int", "Int", 32
+#inttype "Int", "Int", 64
+#inttype "Uint", "Word", 8
+#inttype "Uint", "Word", 16
+#inttype "Uint", "Word", 32
+#inttype "Uint", "Word", 64
 
 data MXArrayType
 type MXArrayPtr = Ptr MXArrayType
@@ -178,19 +176,28 @@ data MAny
 type MAnyArray = MXArray MAny
 
 -- |Tag for a NULL array
-data MNull deriving (Typeable)
-instance MType MNull MNull where mxClassOf _ = MXClassNull
+data MNull 
+instance MType MNull MNull where
+  hs2mx = id
+  mx2hs = id
+  mxClassOf _ = MXClassNull
 
 mNullArray :: MXArray MNull
 mNullArray = MXArray nullPtr
 
 -- |A wrapper for a member of a cell array, which itself simply any other array
-newtype MCell = MCell { mCell :: MAnyArray } deriving (Typeable)
-instance MType MCell MCell where mxClassOf _ = MXClassCell
+newtype MCell = MCell { mCell :: MAnyArray }
+instance MType MCell MCell where
+  hs2mx = id
+  mx2hs = id
+  mxClassOf _ = MXClassCell
 
 -- |A single struct in an array, represented by an (ordered) list of key-value pairs
-newtype MStruct = MStruct { mStruct :: [(String,MAnyArray)] } deriving (Typeable)
-instance MType MStruct MStruct where mxClassOf _ = MXClassStruct
+newtype MStruct = MStruct { mStruct :: [(String,MAnyArray)] }
+instance MType MStruct MStruct where
+  hs2mx = id
+  mx2hs = id
+  mxClassOf _ = MXClassStruct
 
 type MXFun = CInt -> Ptr MXArrayPtr -> CInt -> Ptr MXArrayPtr -> IO ()
 -- |A Matlab function
@@ -210,6 +217,12 @@ instance MType MXFun MFun where
     map MXArray =.< peekArray no outp
   mxClassOf _ = MXClassFun
 
+#ifdef mingw32_HOST_OS
+type MWSize = Word32
+type MWIndex = Word32
+type MWSignedIndex = Int32
+#else
 type MWSize = #type mwSize
 type MWIndex = #type mwIndex
 type MWSignedIndex = #type mwSignedIndex
+#endif

Foreign/Matlab/Engine.hsc

@@ -21,7 +21,6 @@ import Foreign.C.String
 import Foreign.C.Error
 import Foreign.Matlab.Util
 import Foreign.Matlab.Internal
-import Foreign.Matlab.Types
 
 #include <mat.h>
 
@@ -102,13 +101,14 @@ matLoad file = do
   matClose mat
   return vars
   where
-    load m =
-      alloca $ \n -> do
+    load m = alloca $ \n -> do
       a <- matGetNextVariable m n
-      if a == nullPtr then return [] else do
-      a <- mkMXArray a
-      n <- peek n >>= peekCString
-      ((n,a) :) =.< load m
+      if a == nullPtr 
+	then return [] 
+	else do
+	  a <- mkMXArray a
+	  n <- peek n >>= peekCString
+	  ((n,a) :) =.< load m
 
 -- |Write all the variables to a new MAT file
 matSave :: FilePath -> [(String,MXArray a)] -> IO ()