Merge pull request #203 from rdeits/fsa-construction

RFC: fix construction of FSA types with heterogeneous types

Author: c42f

src/FixedSizeArrays.jl

@@ -120,6 +120,7 @@ macro fixed_vector(name, parent)
             $(name){1, T}((x,))
         end
         @inline (::Type{$(name)}){S}(x::NTuple{S}) = $(name){S}(x)
+        @inline (::Type{$(name)}){S, T <: Tuple{Vararg{Any, S}}}(x::T) = $(name){S, StaticArrays.promote_tuple_eltype(T)}(x)
         @inline function (::Type{$(name){S}}){S, T <: Tuple}(x::T)
             $(name){S, StaticArrays.promote_tuple_eltype(T)}(x)
         end

test/fixed_size_arrays.jl

@@ -204,6 +204,18 @@ for N = (1, 10)
         end
     end
 end
+
+@testset "heterogeneous construction" begin
+    @test @inferred(Vec(0.0, 0)) isa Vec{2, Float64}
+    @test @inferred(Vec(0, 0.0)) isa Vec{2, Float64}
+    @test @inferred(Point(0.0, 0)) isa Point{2, Float64}
+    @test @inferred(Point(0, 0.0)) isa Point{2, Float64}
+    @test @inferred(Vec(0.0, 0, 0)) isa Vec{3, Float64}
+    @test @inferred(Vec(0, 0.0, 0)) isa Vec{3, Float64}
+    @test @inferred(Point(0.0, 0, 0)) isa Point{3, Float64}
+    @test @inferred(Point(0, 0.0, 0)) isa Point{3, Float64}
+end
+
 map(-, Vec(1,2,3))
 map(+, Vec(1,2,3), Vec(1,1, 1))
 (+).(Vec(1,2,3), 1.0)