Some cleanup

Author: bmsherman

Foreign/Matlab/Array.hsc

@@ -1,3 +1,4 @@
+{-# LANGUAGE ScopedTypeVariables, UndecidableInstances #-}
 {-|
   Array access, including cell arrays and structures.
 

Foreign/Matlab/Config.hs.in

@@ -22,7 +22,6 @@ import Foreign.C.Types
 import Data.List
 import Foreign.Matlab.Util
 import Foreign.Matlab.Internal
-import Foreign.Matlab.Config
 
 #include <engine.h>
 
@@ -36,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/Engine.hsc

@@ -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>
@@ -178,18 +177,18 @@ data MAny
 type MAnyArray = MXArray MAny
 
 -- |Tag for a NULL array
-data MNull deriving (Typeable)
+data MNull 
 instance MType MNull MNull where 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)
+newtype MCell = MCell { mCell :: MAnyArray }
 instance MType MCell MCell where 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)
+newtype MStruct = MStruct { mStruct :: [(String,MAnyArray)] }
 instance MType MStruct MStruct where mxClassOf _ = MXClassStruct
 
 type MXFun = CInt -> Ptr MXArrayPtr -> CInt -> Ptr MXArrayPtr -> IO ()

Foreign/Matlab/Internal.hsc

@@ -102,13 +102,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 ()

Foreign/Matlab/MAT.hsc

@@ -22,9 +22,10 @@ import Foreign.C.Types
 import System.Posix.DynamicLinker
 import Data.List
 import qualified Data.Char
+import Distribution.Simple.BuildPaths (dllExtension)
 import Control.Concurrent.MVar
-import System.FilePath
-import Foreign.Matlab.Config
+import System.FilePath (splitFileName, dropExtensions, extSeparator
+  , (<.>), (</>))
 import Foreign.Matlab.Util
 import Foreign.Matlab.Internal
 

Foreign/Matlab/Runtime.hsc

@@ -9,37 +9,49 @@ import Control.Monad
 import Data.Maybe
 import System.Directory
 import System.FilePath
+
 defhooks = autoconfUserHooks
-programs = [
-    simpleProgram "matlab", 
-    (simpleProgram "mcr") { programFindLocation =
+
+programs =
+  [ simpleProgram "matlab" 
+  , (simpleProgram "mcr") { programFindLocation =
             \_ -> return (return Nothing) }
   ]
-runtime desc = maybe False (elem ["Foreign","Matlab","Runtime"] . map components . exposedModules) $ library desc
+
+runtime desc = maybe False (elem ["Foreign","Matlab","Runtime"] 
+  . map components . exposedModules) $ library desc
+
 postconf args flags desc build = do
   confExists <- doesFileExist "configure"
   unless confExists $ rawSystemExit verb "autoconf" []
   postConf defhooks args flags{ configConfigureArgs = configConfigureArgs flags ++ confargs } desc build
   where 
     verb = fromFlag $ configVerbosity flags
-    confargs = ("--" ++ (if runtime desc then "enable" else "disable") ++ "-runtime") : map pconfarg pconf
+    confargs = ("--" ++ (if runtime desc then "enable" else "disable") ++ "-runtime") 
+      : map pconfarg pconf
     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"]
+  when (runtime desc) $ 
+    rawSystemExit (fromFlag $ buildVerbosity flags) "make" ["-Csrc"]
   buildHook defhooks desc binfo hooks flags
+
 clean desc binfo hooks flags = do
   makeExists <- doesFileExist "src/Makefile"
-  when makeExists $ rawSystemExit (fromFlag $ cleanVerbosity flags) "make" ["-Csrc", "clean"]
+  when makeExists $ 
+    rawSystemExit (fromFlag $ cleanVerbosity flags) "make" ["-Csrc", "clean"]
   cleanHook defhooks desc binfo hooks flags
+
 install desc binfo hooks flags = do
   instHook defhooks desc binfo hooks flags
   when (runtime desc) $ mapM_ (\f -> 
       copyFileVerbose (fromFlag $ installVerbosity flags) 
 	("src" </> f) 
 	(libdir (absoluteInstallDirs desc binfo NoCopyDest) </> f))
     ["libhsmatlab.so"{-,"libhsmatlab.ctf"-}]
+
 reg desc binfo hooks flags = do
   pwd <- getCurrentDirectory
   let
@@ -51,6 +63,7 @@ reg desc binfo hooks flags = do
       | fromFlag $ regInPlace flags = pwd </> "src"
       | otherwise = libdir (absoluteInstallDirs desc binfo NoCopyDest)
   regHook defhooks desc' binfo hooks flags
+
 hooks = defhooks {
     hookedPrograms = programs,
     postConf = postconf,
@@ -59,4 +72,5 @@ hooks = defhooks {
     instHook = install,
     regHook = reg
   }
+
 main = defaultMainWithHooks hooks