fix blockisequalorscalar(ax, a) when a is Ref (#153)

* change blockisequalorscalar() to work for ::Ref input

* fix failing diagonal tests

This actually seems unrelated to the rest of this commit but without importing Diagonal some tests fail here. Maybe Diagonal should be exported? In any case, this fixes the failing tests for now.

* add tests for minimal failing examples on previous version

* v0.14.4

Author: TSGut

Project.toml

@@ -1,6 +1,6 @@
 name = "BlockArrays"
 uuid = "8e7c35d0-a365-5155-bbbb-fb81a777f24e"
-version = "0.14.3"
+version = "0.14.4"
 
 [deps]
 ArrayLayouts = "4c555306-a7a7-4459-81d9-ec55ddd5c99a"

src/blockbroadcast.jl

@@ -209,7 +209,7 @@ _hasscalarlikevec(a, b...) = _hasscalarlikevec(b...)
 _hasscalarlikevec(a::AbstractVector, b...) = size(a,1) == 1 || _hasscalarlikevec(b...)
 
 blockisequalorscalar(ax, ::Number) = true
-blockisequalorscalar(ax, a) = blockisequal(ax, axes(a,1))
+blockisequalorscalar(ax, a) = blockisequal(ax, Base.axes1(a))
 
 function copyto!(dest::AbstractVector,
         bc::Broadcasted{<:AbstractBlockStyle{1}, <:Any, <:Any, Args}) where {Args <: Tuple}

test/test_blockbroadcast.jl

@@ -1,5 +1,5 @@
 using BlockArrays, FillArrays, LazyArrays, Test
-import BlockArrays: SubBlockIterator, BlockIndexRange
+import BlockArrays: SubBlockIterator, BlockIndexRange, Diagonal
 
 @testset "broadcast" begin
     @testset "BlockArray" begin
@@ -115,6 +115,19 @@ import BlockArrays: SubBlockIterator, BlockIndexRange
         @test broadcast(*, 2, v) == 2Vector(v)
     end
 
+    @testset "BlockVector broadcast" begin
+        a = BlockArray(randn(3),[1,2])
+        b = broadcast(+, Ref(1), a)
+        @test b isa BlockArray{eltype(a),1}
+        @test Base.axes1(a) == Base.axes1(b)
+        @test Vector(b) == broadcast(+, Ref(1), Vector(a))
+        a = BlockArray(randn(16),[1,3,5,7])
+        b = broadcast(+, Ref(1), a)
+        @test b isa BlockArray{eltype(a),1}
+        @test Base.axes1(a) == Base.axes1(b)
+        @test Vector(b) == broadcast(+, Ref(1), Vector(a))
+    end
+
     @testset "special axes" begin
         A = BlockArray(randn(6), Ones{Int}(6))
         B = BlockArray(randn(6), Ones{Int}(6))
@@ -255,4 +268,4 @@ import BlockArrays: SubBlockIterator, BlockIndexRange
 
         @test [idx.indices[1] for idx in SubBlockIterator(subblock_lasts, block_lasts)] == [1:1,1:2,1:1,2:3]
     end
-end
+end