Skip to content

Commit 314f114

Browse files
tkelmanandyferris
authored andcommitted
modify varargs signatures to ensure at least one input (#126)
1 parent 549f1f4 commit 314f114

File tree

2 files changed

+8
-8
lines changed

2 files changed

+8
-8
lines changed

src/broadcast.jl

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@
44

55
# TODO: bad codegen for `broadcast(-, SVector(1,2,3))`
66

7-
@propagate_inbounds function broadcast(f, a::Union{Number, StaticArray}...)
8-
_broadcast(f, broadcast_sizes(a...), a...)
7+
@propagate_inbounds function broadcast(f, a::Union{Number, StaticArray}, b::Union{Number, StaticArray}...)
8+
_broadcast(f, broadcast_sizes(a, b...), a, b...)
99
end
1010

1111
@inline broadcast_sizes(a...) = _broadcast_sizes((), a...)

src/mapreduce.jl

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,8 @@ end
1515
## map / map! ##
1616
################
1717

18-
@inline function map(f, a::StaticArray...)
19-
_map(f, same_size(a...), a...)
18+
@inline function map(f, a::StaticArray, b::StaticArray...)
19+
_map(f, same_size(a, b...), a, b...)
2020
end
2121

2222
@generated function _map(f, ::Size{S}, a::StaticArray...) where {S}
@@ -62,12 +62,12 @@ end
6262
## mapreduce ##
6363
###############
6464

65-
@inline function mapreduce(f, op, a::StaticArray...)
66-
_mapreduce(f, op, same_size(a...), a...)
65+
@inline function mapreduce(f, op, a::StaticArray, b::StaticArray...)
66+
_mapreduce(f, op, same_size(a, b...), a, b...)
6767
end
6868

69-
@inline function mapreduce(f, op, v0, a::StaticArray...)
70-
_mapreduce(f, op, v0, same_size(a...), a...)
69+
@inline function mapreduce(f, op, v0, a::StaticArray, b::StaticArray...)
70+
_mapreduce(f, op, v0, same_size(a, b...), a, b...)
7171
end
7272

7373
@generated function _mapreduce(f, op, ::Size{S}, a::StaticArray...) where {S}

0 commit comments

Comments
 (0)