clean up

Author: SimonDanisch

src/FixedSizeArrays.jl

@@ -170,24 +170,13 @@ macro fixed_vector(name, parent)
         end
         size_or(::Type{$(name)}, or) = or
         eltype_or(::Type{$(name)}, or) = or
+        eltype_or{T}(::Type{$(name){S, T} where S}, or) = T
+        eltype_or{S}(::Type{$(name){S, T} where T}, or) = or
+        eltype_or{S, T}(::Type{$(name){S, T}}, or) = T
 
-        if VERSION < v"0.6.0-dev"
-            eltype_or{T}(::Type{$(name){TypeVar(:S), T}}, or) = T
-            eltype_or{S}(::Type{$(name){S, TypeVar(:T)}}, or) = or
-            eltype_or{S, T}(::Type{$(name){S, T}}, or) = T
-
-            size_or{T}(::Type{$(name){S where S, T}}, or) = or
-            size_or{S}(::Type{$(name){S, T where T}}, or) = Size{(S,)}()
-            size_or{S, T}(::Type{$(name){S, T}}, or) = (S,)
-        else
-            eltype_or{T}(::Type{$(name){S, T} where S}, or) = T
-            eltype_or{S}(::Type{$(name){S, T} where T}, or) = or
-            eltype_or{S, T}(::Type{$(name){S, T}}, or) = T
-
-            size_or{T}(::Type{$(name){S, T} where S}, or) = or
-            size_or{S}(::Type{$(name){S, T} where T}, or) = Size{(S,)}()
-            size_or{S, T}(::Type{$(name){S, T}}, or) = (S,)
-        end
+        size_or{T}(::Type{$(name){S, T} where S}, or) = or
+        size_or{S}(::Type{$(name){S, T} where T}, or) = Size{(S,)}()
+        size_or{S, T}(::Type{$(name){S, T}}, or) = (S,)
     end)
 end
 

src/StaticArrays.jl

@@ -93,7 +93,7 @@ include("eigen.jl")
 include("cholesky.jl")
 include("deque.jl")
 
-include("FixedSizeArrays.jl")  # Currently defunct
+include("FixedSizeArrays.jl")
 include("ImmutableArrays.jl")
 
 end # module

src/util.jl

@@ -39,23 +39,21 @@ end
 @pure tuple_minimum(T::Tuple) = minimum(T)
 
 # Something doesn't match up type wise
-@generated function check_array_parameters(Size, T, N, L)
-    (!isa(Size, DataType) || (Size.name !== Tuple.name)) && return :(throw(ArgumentError("Static Array parameter Size must be a Tuple type, got $Size")))
-    !isa(T, Type) && return :(throw(ArgumentError("Static Array parameter T must be a type, got $T")))
-    !isa(N.parameters[1], Int) && return :(throw(ArgumenError("Static Array parameter N must be an integer, got $(N.parameters[1])")))
-    !isa(L.parameters[1], Int) && return :(throw(ArgumentError("Static Array parameter L must be an integer, got $(L.parameters[1])")))
+function check_array_parameters(Size, T, N, L)
+    (!isa(Size, DataType) || (Size.name !== Tuple.name)) && return throw(ArgumentError("Static Array parameter Size must be a Tuple type, got $Size"))
+    !isa(T, Type) && return throw(ArgumentError("Static Array parameter T must be a type, got $T"))
+    !isa(N.parameters[1], Int) && return throw(ArgumenError("Static Array parameter N must be an integer, got $(N.parameters[1])"))
+    !isa(L.parameters[1], Int) && return throw(ArgumentError("Static Array parameter L must be an integer, got $(L.parameters[1])"))
     # shouldn't reach here. Anything else should have made it to the function below
-    return :(error("Internal error. Please file a bug"))
+    return error("Internal error. Please file a bug")
 end
 
-@generated function check_array_parameters{Size,T,N,L}(::Type{Size}, ::Type{T}, ::Type{Val{N}}, ::Type{Val{L}})
+function check_array_parameters{Size,T,N,L}(::Type{Size}, ::Type{T}, ::Type{Val{N}}, ::Type{Val{L}})
     if !all(x->isa(x, Int), Size.parameters)
-        return :(throw(ArgumentError("Static Array parameter Size must be a tuple of Ints (e.g. `SArray{Tuple{3,3}}` or `SMatrix{3,3}`).")))
+        return throw(ArgumentError("Static Array parameter Size must be a tuple of Ints (e.g. `SArray{Tuple{3,3}}` or `SMatrix{3,3}`)."))
     end
-
     if L != tuple_prod(Size) || L < 0 || tuple_minimum(Size) < 0 || tuple_length(Size) != N
-        return :(throw(ArgumentError("Size mismatch in Static Array parameters. Got size $Size, dimension $N and length $L.")))
+        return throw(ArgumentError("Size mismatch in Static Array parameters. Got size $Size, dimension $N and length $L."))
     end
-
     return nothing
 end