Merge pull request #35 from Shimuuar/new-unbox

New design for unboxed vectors

fixed-vector/ChangeLog.md

@@ -12,6 +12,10 @@ Changes in 1.3.0.0
   * In `ArityPeano` type class methods `reverseF` and `gunfoldF` are replaced
     with more general `accumPeano` and `reducePeano`.
 
+  * `Unbox` vector are fully reworked. All uses of data types with `Unbox`
+    instances which are defined in the library except `Bool` should work without
+    changes.
+
   * `Data.Vector.Fixed.Cont.arity` dropped
 
   * Type of `D.V.F.Cont.withFun` generalized

fixed-vector/Data/Vector/Fixed/Cont.hs

@@ -29,6 +29,7 @@ module Data.Vector.Fixed.Cont (
   , apLast
   , shuffleFun
   , withFun
+  , dimapFun
     -- * Vector type class
   , Dim
   , Vector(..)
@@ -417,6 +418,15 @@ shuffleFun f0
 
 newtype T_shuffle x a r n = T_shuffle (x -> Fn n a r)
 
+-- | Apply function to parameters and result of @Fun@ simultaneously.
+dimapFun :: ArityPeano n => (a -> b) -> (c -> d) -> Fun n b c -> Fun n a d
+{-# INLINE dimapFun #-}
+dimapFun fA fR fun
+  = accum (\(T_Flip g) a -> T_Flip (curryFirst g (fA a)))
+          (\(T_Flip x)   -> fR (unFun x))
+          (T_Flip fun)
+
+
 
 
 ----------------------------------------------------------------
@@ -881,7 +891,8 @@ zipWith f vecA vecB = ContVec $ \funC ->
 zipWith3 :: (ArityPeano n) => (a -> b -> c -> d)
          -> ContVec n a -> ContVec n b -> ContVec n c -> ContVec n d
 {-# INLINE zipWith3 #-}
-zipWith3 f v1 v2 v3 = zipWith (\a (b, c) -> f a b c) v1 (zipWith (,) v2 v3)
+zipWith3 f v1 v2 v3
+  = zipWith ($) (zipWith f v1 v2) v3
 
 -- | Zip two vector together using function which takes element index
 --   as well.