Skip to content

Commit 17530b7

Browse files
committed
v0.14.4
1 parent da19801 commit 17530b7

File tree

3 files changed

+15
-2
lines changed

3 files changed

+15
-2
lines changed

Project.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
name = "LazyArrays"
22
uuid = "5078a376-72f3-5289-bfd5-ec5146d43c02"
3-
version = "0.14.3"
3+
version = "0.14.4"
44

55

66
[deps]

src/lazyconcat.jl

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -57,6 +57,8 @@ end
5757
@propagate_inbounds @inline getindex(f::Vcat{<:Any,2}, k::Integer, j::Integer) = vcat_getindex(f, k, j)
5858
getindex(f::Applied{DefaultArrayApplyStyle,typeof(vcat)}, k::Integer)= vcat_getindex(f, k)
5959
getindex(f::Applied{DefaultArrayApplyStyle,typeof(vcat)}, k::Integer, j::Integer)= vcat_getindex(f, k, j)
60+
getindex(f::Applied{<:Any,typeof(vcat)}, k::Integer)= vcat_getindex(f, k)
61+
getindex(f::Applied{<:Any,typeof(vcat)}, k::Integer, j::Integer)= vcat_getindex(f, k, j)
6062

6163
@propagate_inbounds @inline function setindex!(f::Vcat{T,1}, v, k::Integer) where T
6264
κ = k
@@ -113,6 +115,7 @@ end
113115

114116
getindex(f::Hcat, k::Integer, j::Integer) = hcat_getindex(f, k, j)
115117
getindex(f::Applied{DefaultArrayApplyStyle,typeof(hcat)}, k::Integer, j::Integer)= hcat_getindex(f, k, j)
118+
getindex(f::Applied{<:Any,typeof(hcat)}, k::Integer, j::Integer)= hcat_getindex(f, k, j)
116119

117120
function setindex!(f::Hcat{T}, v, k::Integer, j::Integer) where T
118121
ξ = j

test/concattests.jl

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
using LazyArrays, FillArrays, LinearAlgebra, StaticArrays, Test
2-
import LazyArrays: MemoryLayout, DenseColumnMajor, PaddedLayout, materialize!, MulAdd, Applied, ApplyLayout, arguments
2+
import LazyArrays: MemoryLayout, DenseColumnMajor, PaddedLayout, materialize!,
3+
MulAdd, Applied, ApplyLayout, arguments, DefaultApplyStyle
34

45
@testset "concat" begin
56
@testset "Vcat" begin
@@ -145,6 +146,15 @@ import LazyArrays: MemoryLayout, DenseColumnMajor, PaddedLayout, materialize!, M
145146
end
146147
end
147148

149+
@testset "DefaultApplyStyle" begin
150+
v = Applied{DefaultApplyStyle}(vcat, (1, zeros(3)))
151+
@test v[1] == 1
152+
v = Applied{DefaultApplyStyle}(vcat, (1, zeros(3,1)))
153+
@test v[1,1] == 1
154+
H = Applied{DefaultApplyStyle}(hcat, (1, zeros(1,3)))
155+
@test H[1,1] == 1
156+
end
157+
148158
@testset "Special pads" begin
149159
A = Vcat([1,2,3], Zeros(7))
150160
B = Vcat([1,2], Zeros(8))

0 commit comments

Comments
 (0)