remove applyRaw

3 files changed, 5 insertions, 27 deletions

diff --git a/packages/base/src/Internal/Devel.hs b/packages/base/src/Internal/Devel.hs
index 710d626..89b5103 100644
--- a/packages/base/src/Internal/Devel.hs
+++ b/packages/base/src/Internal/Devel.hs
@@ -64,34 +64,25 @@ mbCatch act = E.catch (Just `fmap` act) f
 
 --------------------------------------------------------------------------------
 
-type CM b r = CInt -> CInt -> Ptr b -> r
 type CV b r = CInt -> Ptr b -> r
 type OM b r = CInt -> CInt -> CInt -> CInt -> Ptr b -> r
 
 type CIdxs r = CV CInt r
 type Ok = IO CInt
 
-infixr 5 :>, ::>, ..>
+infixr 5 :>, ::>
 type (:>)  t r = CV t r
 type (::>) t r = OM t r
-type (..>) t r = CM t r
 
 class TransArray c
   where
     type Trans c b
-    type TransRaw c b
-    type Elem c
     apply      :: (Trans c b) -> c -> b
-    applyRaw   :: (TransRaw c b) -> c -> b
-    infixl 1 `apply`, `applyRaw`
+    infixl 1 `apply`
 
 instance Storable t => TransArray (Vector t)
   where
     type Trans (Vector t) b    = CInt -> Ptr t -> b
-    type TransRaw (Vector t) b = CInt -> Ptr t -> b
-    type Elem (Vector t)       = t
     apply = avec
     {-# INLINE apply #-}
-    applyRaw = avec
-    {-# INLINE applyRaw #-}
 
diff --git a/packages/base/src/Internal/Matrix.hs b/packages/base/src/Internal/Matrix.hs
index 5163421..12ef05a 100644
--- a/packages/base/src/Internal/Matrix.hs
+++ b/packages/base/src/Internal/Matrix.hs
@@ -108,14 +108,6 @@ fmat m
     | otherwise  = extractAll ColumnMajor m
 
 
--- C-Haskell matrix adapters
-{-# INLINE amatr #-}
-amatr :: Storable a => (CInt -> CInt -> Ptr a -> b) -> Matrix a -> b
-amatr f x = inlinePerformIO (unsafeWith (xdat x) (return . f r c))
-  where
-    r  = fi (rows x)
-    c  = fi (cols x)
-
 {-# INLINE amat #-}
 amat :: Storable a => (CInt -> CInt -> CInt -> CInt -> Ptr a -> b) -> Matrix a -> b
 amat f x = inlinePerformIO (unsafeWith (xdat x) (return . f r c sr sc))
@@ -125,16 +117,11 @@ amat f x = inlinePerformIO (unsafeWith (xdat x) (return . f r c sr sc))
     sr = fi (xRow x)
     sc = fi (xCol x)
 
-
 instance Storable t => TransArray (Matrix t)
   where
-    type Elem (Matrix t)       = t
-    type TransRaw (Matrix t) b = CInt -> CInt -> Ptr t -> b
     type Trans (Matrix t) b    = CInt -> CInt -> CInt -> CInt -> Ptr t -> b
     apply = amat
     {-# INLINE apply #-}
-    applyRaw = amatr
-    {-# INLINE applyRaw #-}
 
 infixl 1 #
 a # b = apply a b
@@ -577,7 +564,7 @@ foreign import ccall unsafe "gemm_mod_int64_t" c_gemmML :: Z -> Tgemm Z
 --------------------------------------------------------------------------------
 
 foreign import ccall unsafe "saveMatrix" c_saveMatrix
-    :: CString -> CString -> Double ..> Ok
+    :: CString -> CString -> Double ::> Ok
 
 {- | save a matrix as a 2D ASCII table
 -}
@@ -589,7 +576,7 @@ saveMatrix
 saveMatrix name format m = do
     cname   <- newCString name
     cformat <- newCString format
-    c_saveMatrix cname cformat `applyRaw` m #|"saveMatrix"
+    c_saveMatrix cname cformat `apply` m #|"saveMatrix"
     free cname
     free cformat
     return ()
diff --git a/packages/base/src/Internal/Vectorized.hs b/packages/base/src/Internal/Vectorized.hs
index 03bcf90..a68261b 100644
--- a/packages/base/src/Internal/Vectorized.hs
+++ b/packages/base/src/Internal/Vectorized.hs
@@ -28,7 +28,7 @@ import System.IO.Unsafe(unsafePerformIO)
 import Control.Monad(when)
 
 infixl 1 #
-a # b = applyRaw a b
+a # b = apply a b
 {-# INLINE (#) #-}
 
 fromei x = fromIntegral (fromEnum x) :: CInt