Replace plain error with DimensionMismatch/ArgumentError (#728)

* replace plain `error` with DimensionMismatch in some places
* plain `error` -> `ArgumentError` in some macros
* add some @ boundscheck annotations

Author: matbesancon

src/FieldArray.jl

@@ -111,11 +111,10 @@ array operations as in the example below.
 abstract type FieldVector{N, T} <: FieldArray{Tuple{N}, T, 1} end
 
 @inline function (::Type{FA})(x::Tuple{Vararg{Any, N}}) where {N, FA <: FieldArray}
-   if length(FA) == length(x)
-      FA(x...)
-   else
-      throw(DimensionMismatch("No precise constructor for $FA found. Length of input was $(length(x))."))
-   end
+    @boundscheck if length(FA) != length(x)
+        throw(DimensionMismatch("No precise constructor for $FA found. Length of input was $(length(x))."))
+    end
+    return FA(x...)
 end
 
 @propagate_inbounds getindex(a::FieldArray, i::Int) = getfield(a, i)

src/MArray.jl

@@ -134,7 +134,7 @@ macro MArray(ex)
             s2s = map(i -> ((isa(ex.args[i], Expr) && ex.args[i].head == :row) ? length(ex.args[i].args) : 1), 1:s1)
             s2 = minimum(s2s)
             if maximum(s2s) != s2
-                error("Rows must be of matching lengths")
+                throw(ArgumentError("Rows must be of matching lengths"))
             end
 
             exprs = [ex.args[i].args[j] for i = 1:s1, j = 1:s2]

src/MMatrix.jl

@@ -88,7 +88,7 @@ macro MMatrix(ex)
             s2s = map(i -> ((isa(ex.args[i], Expr) && ex.args[i].head == :row) ? length(ex.args[i].args) : 1), 1:s1)
             s2 = minimum(s2s)
             if maximum(s2s) != s2
-                error("Rows must be of matching lengths")
+                throw(ArgumentError("Rows must be of matching lengths"))
             end
 
             exprs = [ex.args[i].args[j] for i = 1:s1, j = 1:s2]
@@ -103,7 +103,7 @@ macro MMatrix(ex)
             s2s = map(i -> ((isa(ex.args[i+1], Expr) && ex.args[i+1].head == :row) ? length(ex.args[i+1].args) : 1), 1:s1)
             s2 = minimum(s2s)
             if maximum(s2s) != s2
-                error("Rows must be of matching lengths")
+                throw(ArgumentError("Rows must be of matching lengths"))
             end
 
             exprs = [ex.args[i+1].args[j] for i = 1:s1, j = 1:s2]

src/SArray.jl

@@ -93,7 +93,7 @@ macro SArray(ex)
             s2s = map(i -> ((isa(ex.args[i], Expr) && ex.args[i].head == :row) ? length(ex.args[i].args) : 1), 1:s1)
             s2 = minimum(s2s)
             if maximum(s2s) != s2
-                error("Rows must be of matching lengths")
+                throw(ArgumentError("Rows must be of matching lengths"))
             end
 
             exprs = [ex.args[i].args[j] for i = 1:s1, j = 1:s2]
@@ -108,7 +108,7 @@ macro SArray(ex)
             s2s = map(i -> ((isa(ex.args[i+1], Expr) && ex.args[i+1].head == :row) ? length(ex.args[i+1].args) : 1), 1:s1)
             s2 = minimum(s2s)
             if maximum(s2s) != s2
-                error("Rows must be of matching lengths")
+                throw(ArgumentError("Rows must be of matching lengths"))
             end
 
             exprs = [ex.args[i+1].args[j] for i = 1:s1, j = 1:s2]

src/SMatrix.jl

@@ -93,7 +93,7 @@ macro SMatrix(ex)
             s2s = map(i -> ((isa(ex.args[i], Expr) && ex.args[i].head == :row) ? length(ex.args[i].args) : 1), 1:s1)
             s2 = minimum(s2s)
             if maximum(s2s) != s2
-                error("Rows must be of matching lengths")
+                throw(ArgumentError("Rows must be of matching lengths"))
             end
 
             exprs = [ex.args[i].args[j] for i = 1:s1, j = 1:s2]
@@ -108,7 +108,7 @@ macro SMatrix(ex)
             s2s = map(i -> ((isa(ex.args[i+1], Expr) && ex.args[i+1].head == :row) ? length(ex.args[i+1].args) : 1), 1:s1)
             s2 = minimum(s2s)
             if maximum(s2s) != s2
-                error("Rows must be of matching lengths")
+                throw(ArgumentError("Rows must be of matching lengths"))
             end
 
             exprs = [ex.args[i+1].args[j] for i = 1:s1, j = 1:s2]

src/SizedArray.jl

@@ -16,7 +16,7 @@ struct SizedArray{S <: Tuple, T, N, M} <: StaticArray{S, T, N}
 
     function SizedArray{S, T, N, M}(a::Array) where {S, T, N, M}
         if length(a) != tuple_prod(S)
-            error("Dimensions $(size(a)) don't match static size $S")
+            throw(DimensionMismatch("Dimensions $(size(a)) don't match static size $S"))
         end
         if size(a) != size_to_tuple(S)
             Base.depwarn("Construction of `SizedArray` with an `Array` of a different

src/indexing.jl

@@ -141,7 +141,7 @@ end
     exprs = [:(a[$i] = v[$i]) for i = 1:L]
     return quote
         @_propagate_inbounds_meta
-        if length(v) != L
+        @boundscheck if length(v) != L
             throw(DimensionMismatch("tried to assign $(length(v))-element array to length-$L destination"))
         end
         @inbounds $(Expr(:block, exprs...))
@@ -152,7 +152,7 @@ end
     exprs = [:(a[$i] = v[$i]) for i = 1:L]
     return quote
         @_propagate_inbounds_meta
-        if Length(typeof(v)) != L
+        @boundscheck if Length(typeof(v)) != L
             throw(DimensionMismatch("tried to assign $(length(v))-element array to length-$L destination"))
         end
         $(Expr(:block, exprs...))
@@ -176,7 +176,7 @@ end
     exprs = [:(a[inds[$i]] = v[$i]) for i = 1:prod(S)]
     return quote
         @_propagate_inbounds_meta
-        if length(v) != $(prod(S))
+        @boundscheck if length(v) != $(prod(S))
             throw(DimensionMismatch("tried to assign $(length(v))-element array to length-$(length(inds)) destination"))
         end
         $(Expr(:block, exprs...))
@@ -187,7 +187,7 @@ end
     exprs = [:(a[inds[$i]] = v[$i]) for i = 1:prod(S)]
     return quote
         @_propagate_inbounds_meta
-        if Length(typeof(v)) != Length(s)
+        @boundscheck if Length(typeof(v)) != Length(s)
             throw(DimensionMismatch("tried to assign $(length(v))-element array to length-$(length(inds)) destination"))
         end
         $(Expr(:block, exprs...))
@@ -342,7 +342,7 @@ end
     end
 
     if v <: StaticArray
-        if Length(v) != prod(linearsizes)
+        @boundscheck if Length(v) != prod(linearsizes)
             return DimensionMismatch("tried to assign $(length(v))-element array to $newsize destination")
         end
         quote