It seems to be working!

Author: bmsherman

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

@@ -19,19 +19,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

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,7 @@
 -}
 module Foreign.Matlab.Array.IMX (
     IMXData(..),
-    IMXArrayElem,
+    IMXArrayElem (imxConstr, imxArray),
 
     -- * Interface with "Foreign.Matlab.Array"
     imxData, iMXData,
@@ -16,7 +16,6 @@ module Foreign.Matlab.Array.IMX (
 
     -- * Construction and access
     imxSize,
-    imxConstr, imxArray,
     listIMX, scalarIMX,
     imxList, imxScalar,
     listIMXStruct,
@@ -27,7 +26,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 +189,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

@@ -1 +1,11 @@
--- FIXME: This file needs to be regenerated from Config.hs.in by configure, but is required to exist for sdist.
+module Foreign.Matlab.Config (matlabPath, matlabBin, matlabArch, dllExtension) where
+
+import Distribution.Simple.BuildPaths (dllExtension)
+
+matlabPath :: FilePath
+matlabBin :: FilePath
+matlabArch :: String
+
+matlabPath = "/usr/local/MATLAB/R2013a"
+matlabBin = "/usr/local/MATLAB/R2013a/bin/matlab"
+matlabArch = "glnxa64"

Foreign/Matlab/Engine.hsc

@@ -22,7 +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>

Foreign/Matlab/Runtime.hsc

@@ -16,8 +16,7 @@ module Foreign.Matlab.Runtime (
     mlGenericFeval
   ) where
 
-import Control.Monad
-import Foreign
+import Foreign hiding (unsafePerformIO)
 import Foreign.C.String
 import Foreign.C.Types
 import System.Posix.DynamicLinker
@@ -28,7 +27,8 @@ import System.FilePath
 import Foreign.Matlab.Config
 import Foreign.Matlab.Util
 import Foreign.Matlab.Internal
-import Foreign.Matlab.Types
+
+import System.IO.Unsafe (unsafePerformIO)
 
 #include "hsc_sym.h"
 #include "libhsmatlab.h"
@@ -65,16 +65,16 @@ initialize = initializeApp mclInitializeApplication
 terminate = terminateApp mclTerminateApplication
 -}
 
-foreign import ccall "dynamic" mkInitApp :: FunPtr a -> InitApp
-foreign import ccall "dynamic" mkTermApp :: FunPtr a -> TermApp
+foreign import ccall "dynamic" mkInitApp :: FunPtr InitApp -> InitApp
+foreign import ccall "dynamic" mkTermApp :: FunPtr TermApp -> TermApp
 
 type InitFun = IO CBool
 type FiniFun = IO ()
 type MLXFun = CInt -> Ptr MXArrayPtr -> CInt -> Ptr MXArrayPtr -> IO CBool
 
-foreign import ccall "dynamic" mkInitFun :: FunPtr a -> InitFun
-foreign import ccall "dynamic" mkFiniFun :: FunPtr a -> FiniFun
-foreign import ccall "dynamic" mkMLXFun :: FunPtr a -> MLXFun
+foreign import ccall "dynamic" mkInitFun :: FunPtr InitFun -> InitFun
+foreign import ccall "dynamic" mkFiniFun :: FunPtr FiniFun -> FiniFun
+foreign import ccall "dynamic" mkMLXFun :: FunPtr MLXFun -> MLXFun
 
 -- |A Matlab library handle
 data MLibrary = MLibrary { mlName :: String, mlDL :: DL }
@@ -129,7 +129,7 @@ mLibraryCall ml f arg no = do
   fun <- mLibraryFun ml f
   fun arg no
 
-foreign import ccall "dynamic" mkFeval :: FunPtr a -> CString -> MLXFun
+foreign import ccall "dynamic" mkFeval :: FunPtr (CString -> MLXFun) -> CString -> MLXFun
 
 -- |Internal use only.  See "Foreign.Matlab.Runtime.Generic"
 mlGenericFeval :: MLibrary -> IO (CString -> MFun)

Foreign/Matlab/Runtime/Generic.hs

@@ -14,7 +14,6 @@ module Foreign.Matlab.Runtime.Generic (
     mlGenericCapture
   ) where
 
-import Control.Monad
 import Foreign.C.String
 --import System.FilePath
 import Foreign.Matlab.Util
@@ -61,7 +60,7 @@ mlGenericSetVar :: MLGeneric -> String -> MXArray a -> IO ()
 mlGenericSetVar mlg v x = do
   b <- createRowVector "base"
   v <- createRowVector v
-  mlGenericFun mlg "assignin" [anyMXArray b,anyMXArray v,anyMXArray x] 0
+  _ <- mlGenericFun mlg "assignin" [anyMXArray b,anyMXArray v,anyMXArray x] 0
   freeMXArray v
   freeMXArray b
 

Setup.hs

@@ -12,7 +12,8 @@ import System.FilePath
 defhooks = autoconfUserHooks
 programs = [
     simpleProgram "matlab", 
-    (simpleProgram "mcr") { programFindLocation = \_ -> return Nothing }
+    (simpleProgram "mcr") { programFindLocation =
+            \_ -> return (return Nothing) }
   ]
 runtime desc = maybe False (elem ["Foreign","Matlab","Runtime"] . map components . exposedModules) $ library desc
 postconf args flags desc build = do
@@ -22,7 +23,8 @@ postconf args flags desc build = do
   where 
     verb = fromFlag $ configVerbosity flags
     confargs = ("--" ++ (if runtime desc then "enable" else "disable") ++ "-runtime") : map pconfarg pconf
-    pconfarg p = "--with-" ++ programId p ++ "=" ++ programPath p ++ " " ++ unwords (programArgs p)
+    pconfarg p = "--with-" ++ programId p ++ "=" ++ programPath p 
+      -- ++ " " ++ unwords (programArgs p)
     pconf = mapMaybe (\p -> lookupProgram p (withPrograms build)) programs
 build desc binfo hooks flags = do
   when (runtime desc) $ rawSystemExit (fromFlag $ buildVerbosity flags) "make" ["-Csrc"]
@@ -37,13 +39,14 @@ install desc binfo hooks flags = do
       copyFileVerbose (fromFlag $ installVerbosity flags) 
 	("src" </> f) 
 	(libdir (absoluteInstallDirs desc binfo NoCopyDest) </> f))
-    ["libhsmatlab.so","libhsmatlab.ctf"]
+    ["libhsmatlab.so"{-,"libhsmatlab.ctf"-}]
 reg desc binfo hooks flags = do
   pwd <- getCurrentDirectory
   let
     desc' = desc{ library = fmap lm (library desc) }
-    lm l = l{ libBuildInfo = (libBuildInfo l)
-	{ ldOptions = ("-Wl,-rpath," ++ lib) : ldOptions (libBuildInfo l) } }
+    lm l = l { libBuildInfo = (libBuildInfo l)
+	{ ldOptions = ("-Wl,-rpath," ++ lib) : ldOptions (libBuildInfo l),
+          extraLibDirs = (pwd </> "src") : extraLibDirs (libBuildInfo l) } }
     lib
       | fromFlag $ regInPlace flags = pwd </> "src"
       | otherwise = libdir (absoluteInstallDirs desc binfo NoCopyDest)