Merge pull request #125 from dolio/master

Fix iscanr/l functions

Author: dolio

Data/Vector/Generic.hs

@@ -1757,15 +1757,15 @@ iscanl :: (Vector v a, Vector v b) => (Int -> a -> b -> a) -> a -> v b -> v a
 {-# INLINE iscanl #-}
 iscanl f z =
     unstream
-  . inplace (S.scanl (\a (i, b) -> f i a b) z . S.indexed) id
+  . inplace (S.scanl (\a (i, b) -> f i a b) z . S.indexed) (+1)
   . stream
 
 -- | /O(n)/ Scan over a vector (strictly) with its index
 iscanl' :: (Vector v a, Vector v b) => (Int -> a -> b -> a) -> a -> v b -> v a
 {-# INLINE iscanl' #-}
 iscanl' f z =
     unstream
-  . inplace (S.scanl' (\a (i, b) -> f i a b) z . S.indexed) id
+  . inplace (S.scanl' (\a (i, b) -> f i a b) z . S.indexed) (+1)
   . stream
 
 
@@ -1822,18 +1822,22 @@ scanr' f z = unstreamR . Bundle.scanl' (flip f) z . streamR
 -- | /O(n)/ Right-to-left scan over a vector with its index
 iscanr :: (Vector v a, Vector v b) => (Int -> a -> b -> b) -> b -> v a -> v b
 {-# INLINE iscanr #-}
-iscanr f z =
+iscanr f z v =
     unstreamR
-  . inplace (S.scanl (flip $ uncurry f) z . S.indexed) id
+  . inplace (S.scanl (flip $ uncurry f) z . S.indexedR n) (+1)
   . streamR
+  $ v
+ where n = length v
 
 -- | /O(n)/ Right-to-left scan over a vector (strictly) with its index
 iscanr' :: (Vector v a, Vector v b) => (Int -> a -> b -> b) -> b -> v a -> v b
 {-# INLINE iscanr' #-}
-iscanr' f z =
+iscanr' f z v =
     unstreamR
-  . inplace (S.scanl' (flip $ uncurry f) z . S.indexed) id
+  . inplace (S.scanl' (flip $ uncurry f) z . S.indexedR n) (+1)
   . streamR
+  $ v
+ where n = length v
 
 -- | /O(n)/ Right-to-left scan over a non-empty vector
 scanr1 :: Vector v a => (a -> a -> a) -> v a -> v a