Use typed_hcat in typed_hvcat (#18398)

Fixes 18395
JuliaLang · Sep 10, 2016 · fa4c02c · fa4c02c · nanosoldier · Sep 11, 2016
1 parent 600d363
commit fa4c02c
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git a/base/abstractarray.jl b/base/abstractarray.jl
@@ -1425,7 +1425,7 @@ function typed_hvcat{T}(::Type{T}, rows::Tuple{Vararg{Int}}, as...)
     rs = Array{Any,1}(nbr)
     a = 1
     for i = 1:nbr
-        rs[i] = hcat(as[a:a-1+rows[i]]...)
+        rs[i] = typed_hcat(T, as[a:a-1+rows[i]]...)
         a += rows[i]
     end
     T[rs...;]

diff --git a/test/abstractarray.jl b/test/abstractarray.jl
@@ -560,6 +560,9 @@ function test_cat(::Type{TestAbstractArray})
     # check for # of columns mismatch b/w rows
     @test_throws ArgumentError hvcat((3, 2), 1, 2, 3, 4, 5, 6)
     @test_throws ArgumentError Base.typed_hvcat(Int, (3, 2), 1, 2, 3, 4, 5, 6)
+
+    # 18395
+    @test isa(Any["a" 5; 2//3 1.0][2,1], Rational{Int})
 end
 
 function test_ind2sub(::Type{TestAbstractArray})