Merge pull request #18 from Mikolaj/master

Make error display consistent

Author: augustss

Data/Array/Dynamic/MatMul.hs

@@ -25,7 +25,7 @@ matMul x y | [m, n] <- shX, [n', o] <- shY, n == n' =
         yv = reshape [n] $ slice [(0, n), (j, 1)] y
     in  sum $ zipWithA (*) xv yv
            | otherwise =
-  error $ "matMul: bad shapes " ++
+  error $ "matMul: bad shapes: " ++
           show shX ++ " * " ++ show shY
   where shX = shapeL x
         shY = shapeL y

Data/Array/Internal.hs

@@ -488,7 +488,7 @@ padT v aps ash at = (ss, fromVectorT ss $ vConcat $ pad' aps ash st at)
         pad' [] sh _ t = [toVectorT sh t]
         pad' ((l,h):ps) (s:sh) (n:ns) t =
           [vReplicate (n*l) v] ++ concatMap (pad' ps sh ns . indexT t) [0..s-1] ++ [vReplicate (n*h) v]
-        pad' _ _ _ _ = error $ "pad: rank mismatch: " ++ show (length aps, length ash)
+        pad' _ _ _ _ = error $ "pad: rank mismatch " ++ show (length aps, length ash)
         _ : st = getStridesT ss
         ss = zipWithLong2 (\ (l,h) s -> l+s+h) aps ash
 
@@ -507,7 +507,7 @@ simpleReshape osts os ns
       loop [] [] = []
       loop (1:ss)     sts  = 0  : loop ss sts
       loop (_:ss) (st:sts) = st : loop ss sts
-      loop _ _ = error $ "simpleReshape: shouldn't happen: " ++ show (osts, os, ns)
+      loop _ _ = error $ "simpleReshape: shouldn't happen " ++ show (osts, os, ns)
 simpleReshape _ _ _ = Nothing
 
 -- Note: assumes + is commutative&associative.

Data/Array/Internal/DynamicG.hs

@@ -125,7 +125,7 @@ toVector (A sh t) = toVectorT sh t
 -- O(n) time.
 {-# INLINE fromList #-}
 fromList :: (HasCallStack, Vector v, VecElem v a) => ShapeL -> [a] -> Array v a
-fromList ss vs | n /= l = error $ "fromList: size mismatch" ++ show (n, l)
+fromList ss vs | n /= l = error $ "fromList: size mismatch " ++ show (n, l)
                | otherwise = A ss $ T st 0 $ vFromList vs
   where n : st = getStridesT ss
         l = length vs
@@ -135,7 +135,7 @@ fromList ss vs | n /= l = error $ "fromList: size mismatch" ++ show (n, l)
 -- O(1) time.
 {-# INLINE fromVector #-}
 fromVector :: (HasCallStack, Vector v, VecElem v a) => ShapeL -> v a -> Array v a
-fromVector ss v | n /= l = error $ "fromList: size mismatch" ++ show (n, l)
+fromVector ss v | n /= l = error $ "fromList: size mismatch " ++ show (n, l)
                 | otherwise = A ss $ T st 0 v
   where n : st = getStridesT ss
         l = vLength v
@@ -211,31 +211,31 @@ mapA f (A s t) = A s (mapT s f t)
 zipWithA :: (HasCallStack, Vector v, VecElem v a, VecElem v b, VecElem v c) =>
             (a -> b -> c) -> Array v a -> Array v b -> Array v c
 zipWithA f (A s t) (A s' t') | s == s' = A s (zipWithT s f t t')
-                             | otherwise = error $ "zipWithA: shape mismatch: " ++ show (s, s')
+                             | otherwise = error $ "zipWithA: shape mismatch " ++ show (s, s')
 
 -- | Map over the array elements.
 -- O(n) time.
 {-# INLINE zipWith3A #-}
 zipWith3A :: (HasCallStack, Vector v, VecElem v a, VecElem v b, VecElem v c, VecElem v d) =>
              (a -> b -> c -> d) -> Array v a -> Array v b -> Array v c -> Array v d
 zipWith3A f (A s t) (A s' t') (A s'' t'') | s == s' && s == s'' = A s (zipWith3T s f t t' t'')
-                                          | otherwise = error $ "zipWith3A: shape mismatch: " ++ show (s, s', s'')
+                                          | otherwise = error $ "zipWith3A: shape mismatch " ++ show (s, s', s'')
 
 -- | Map over the array elements.
 -- O(n) time.
 {-# INLINE zipWith4A #-}
 zipWith4A :: (HasCallStack, Vector v, VecElem v a, VecElem v b, VecElem v c, VecElem v d, VecElem v e) =>
              (a -> b -> c -> d -> e) -> Array v a -> Array v b -> Array v c -> Array v d -> Array v e
 zipWith4A f (A s t) (A s' t') (A s'' t'') (A s''' t''') | s == s' && s == s'' && s == s''' = A s (zipWith4T s f t t' t'' t''')
-                                                        | otherwise = error $ "zipWith4A: shape mismatch: " ++ show (s, s', s'', s''')
+                                                        | otherwise = error $ "zipWith4A: shape mismatch " ++ show (s, s', s'', s''')
 
 -- | Map over the array elements.
 -- O(n) time.
 {-# INLINE zipWith5A #-}
 zipWith5A :: (HasCallStack, Vector v, VecElem v a, VecElem v b, VecElem v c, VecElem v d, VecElem v e, VecElem v f) =>
              (a -> b -> c -> d -> e -> f) -> Array v a -> Array v b -> Array v c -> Array v d -> Array v e -> Array v f
 zipWith5A f (A s t) (A s' t') (A s'' t'') (A s''' t''') (A s'''' t'''') | s == s' && s == s'' && s == s''' && s == s'''' = A s (zipWith5T s f t t' t'' t''' t'''')
-                                                                        | otherwise = error $ "zipWith5A: shape mismatch: " ++ show (s, s', s'', s''', s'''')
+                                                                        | otherwise = error $ "zipWith5A: shape mismatch " ++ show (s, s', s'', s''', s'''')
 
 -- | Pad each dimension on the low and high side with the given value.
 -- O(n) time.
@@ -317,9 +317,9 @@ window :: (HasCallStack, Vector v) => [Int] -> Array v a -> Array v a
 window aws (A ash (T ss o v)) = A (win aws ash) (T (ss' ++ ss) o v)
   where ss' = zipWith const ss aws
         win (w:ws) (s:sh) | w <= s = s - w + 1 : win ws sh
-                          | otherwise = error $ "window: bad window size : " ++ show (w, s)
+                          | otherwise = error $ "window: bad window size " ++ show (w, s)
         win [] sh = aws ++ sh
-        win _ _ = error $ "window: rank mismatch: " ++ show (aws, ash)
+        win _ _ = error $ "window: rank mismatch " ++ show (aws, ash)
 
 -- | Stride the outermost dimensions.
 -- E.g., if the array shape is @[10,12,8]@ and the strides are
@@ -331,7 +331,7 @@ stride :: (HasCallStack, Vector v) => [Int] -> Array v a -> Array v a
 stride ats (A ash (T ss o v)) = A (str ats ash) (T (zipWith (*) (ats ++ repeat 1) ss) o v)
   where str (t:ts) (s:sh) = (s+t-1) `quot` t : str ts sh
         str [] sh = sh
-        str _ _ = error $ "stride: rank mismatch: " ++ show (ats, ash)
+        str _ _ = error $ "stride: rank mismatch " ++ show (ats, ash)
 
 -- | Rotate the array k times along the d'th dimension.
 -- E.g., if the array shape is @[2, 3, 2]@, d is 1, and k is 4,
@@ -496,7 +496,7 @@ broadcast ds sh a | length ds /= rank a = error "broadcast: wrong number of broa
 update :: (HasCallStack, Vector v, VecElem v a) =>
           Array v a -> [([Int], a)] -> Array v a
 update (A sh t) us | all (ok . fst) us = A sh $ updateT sh t us
-                   | otherwise = error $ "update: index out of bounds " ++ show (filter (not . ok) $ map fst us)
+                   | otherwise = error $ "update: index out of bounds: " ++ show (filter (not . ok) $ map fst us)
   where ok is = length is == r && and (zipWith (\ i s -> 0 <= i && i < s) is sh)
         r = length sh
 

Data/Array/Internal/RankedG.hs

@@ -151,7 +151,7 @@ fromList ss vs | n /= l = error $ "fromList: size mismatch " ++ show (n, l)
 {-# INLINE fromVector #-}
 fromVector :: forall n v a . (HasCallStack, Vector v, VecElem v a, KnownNat n) =>
               ShapeL -> v a -> Array n v a
-fromVector ss v | n /= l = error $ "fromVector: size mismatch" ++ show (n, l)
+fromVector ss v | n /= l = error $ "fromVector: size mismatch " ++ show (n, l)
                 | length ss /= valueOf @n = error $ "fromVector: rank mismatch " ++ show (length ss, valueOf @n :: Int)
                 | otherwise = A ss $ T st 0 v
   where n : st = getStridesT ss
@@ -233,15 +233,15 @@ mapA f (A s t) = A s (mapT s f t)
 zipWithA :: (Vector v, VecElem v a, VecElem v b, VecElem v c) =>
             (a -> b -> c) -> Array n v a -> Array n v b -> Array n v c
 zipWithA f (A s t) (A s' t') | s == s' = A s (zipWithT s f t t')
-                             | otherwise = error $ "zipWithA: shape mismatch: " ++ show (s, s')
+                             | otherwise = error $ "zipWithA: shape mismatch " ++ show (s, s')
 
 -- | Map over the array elements.
 -- O(n) time.
 {-# INLINE zipWith3A #-}
 zipWith3A :: (Vector v, VecElem v a, VecElem v b, VecElem v c, VecElem v d) =>
              (a -> b -> c -> d) -> Array n v a -> Array n v b -> Array n v c -> Array n v d
 zipWith3A f (A s t) (A s' t') (A s'' t'') | s == s' && s == s'' = A s (zipWith3T s f t t' t'')
-                                          | otherwise = error $ "zipWith3A: shape mismatch: " ++ show (s, s', s'')
+                                          | otherwise = error $ "zipWith3A: shape mismatch " ++ show (s, s', s'')
 
 -- | Pad each dimension on the low and high side with the given value.
 -- O(n) time.
@@ -322,13 +322,13 @@ unravel = rerank @1 scalar
 {-# INLINE window #-}
 window :: forall n n' v a . (Vector v, KnownNat n, KnownNat n') =>
           [Int] -> Array n v a -> Array n' v a
-window aws _ | valueOf @n' /= length aws + valueOf @n = error $ "window: rank mismatch: " ++ show (valueOf @n' :: Int, length aws, valueOf @n :: Int)
+window aws _ | valueOf @n' /= length aws + valueOf @n = error $ "window: rank mismatch " ++ show (valueOf @n' :: Int, length aws, valueOf @n :: Int)
 window aws (A ash (T ss o v)) = A (win aws ash) (T (ss' ++ ss) o v)
   where ss' = zipWith const ss aws
         win (w:ws) (s:sh) | w <= s = s - w + 1 : win ws sh
-                          | otherwise = error $ "window: bad window size : " ++ show (w, s)
+                          | otherwise = error $ "window: bad window size " ++ show (w, s)
         win [] sh = aws ++ sh
-        win _ _ = error $ "window: rank mismatch: " ++ show (aws, ash)
+        win _ _ = error $ "window: rank mismatch " ++ show (aws, ash)
 
 -- | Stride the outermost dimensions.
 -- E.g., if the array shape is @[10,12,8]@ and the strides are
@@ -339,7 +339,7 @@ stride :: (Vector v) => [Int] -> Array n v a -> Array n v a
 stride ats (A ash (T ss o v)) = A (str ats ash) (T (zipWith (*) (ats ++ repeat 1) ss) o v)
   where str (t:ts) (s:sh) = (s+t-1) `quot` t : str ts sh
         str [] sh = sh
-        str _ _ = error $ "stride: rank mismatch: " ++ show (ats, ash)
+        str _ _ = error $ "stride: rank mismatch " ++ show (ats, ash)
 
 -- | Rotate the array k times along the d'th dimension.
 -- E.g., if the array shape is @[2, 3, 2]@, d is 1, and k is 4,

Data/Array/Internal/Shape.hs

@@ -203,7 +203,7 @@ withShapeP [] f = f (Proxy :: Proxy ('[] :: [Nat]))
 withShapeP (n:ns) f =
   case someNatVal (toInteger n) of
     Just (SomeNat (_ :: Proxy n)) -> withShapeP ns (\ (_ :: Proxy ns) -> f (Proxy :: Proxy (n ': ns)))
-    _ -> error $ "withShape: bad size " ++ show n
+    _ -> error $ "withShape: bad size: " ++ show n
 
 withShape :: [Int] -> (forall sh . (Shape sh) => r) -> r
 withShape sh f = withShapeP sh (\ (_ :: Proxy sh) -> f @sh)

Data/Array/Internal/ShapedG.hs

@@ -121,7 +121,7 @@ rank _ = valueOf @(Rank sh)
 {-# INLINE index #-}
 index :: forall s sh v a . (HasCallStack, Vector v, KnownNat s) =>
          Array (s:sh) v a -> Int -> Array sh v a
-index (A t) i | i < 0 || i >= s = error $ "index: out of bounds " ++ show i ++ " >= " ++ show s
+index (A t) i | i < 0 || i >= s = error $ "index: out of bounds: " ++ show i ++ " >= " ++ show s
               | otherwise = A $ indexT t i
   where s = valueOf @s
 
@@ -155,7 +155,7 @@ fromList vs | n /= l = error $ "fromList: size mismatch " ++ show (n, l)
 {-# INLINE fromVector #-}
 fromVector :: forall sh v a . (HasCallStack, Vector v, VecElem v a, Shape sh) =>
               v a -> Array sh v a
-fromVector v | n /= l = error $ "fromVector: size mismatch" ++ show (n, l)
+fromVector v | n /= l = error $ "fromVector: size mismatch " ++ show (n, l)
              | otherwise = A $ T st 0 v
   where n : st = getStridesT ss
         l = vLength v