Skip to content

Commit 37bf363

Browse files
author
Andy Ferris
committed
Added .^, .% and .\
Fixes #63
1 parent 870564a commit 37bf363

File tree

1 file changed

+10
-1
lines changed

1 file changed

+10
-1
lines changed

src/arraymath.jl

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,24 +5,33 @@ Base.promote_op{Op,A<:StaticArray,T<:Number}(op::Op, ::Type{A}, ::Type{T}) = sim
55
Base.promote_op{Op,T<:Number,A<:StaticArray}(op::Op, ::Type{T}, ::Type{A}) = similar_type(A, promote_op(op, T, eltype(A)))
66

77

8-
# TODO lots more operators
8+
# TODO any more operators?
99

1010
@inline .-(a1::StaticArray) = broadcast(-, a1)
1111

1212
@inline .+(a1::StaticArray, a2::StaticArray) = broadcast(+, a1, a2)
1313
@inline .-(a1::StaticArray, a2::StaticArray) = broadcast(-, a1, a2)
1414
@inline .*(a1::StaticArray, a2::StaticArray) = broadcast(*, a1, a2)
1515
@inline ./(a1::StaticArray, a2::StaticArray) = broadcast(/, a1, a2)
16+
@inline .\(a1::StaticArray, a2::StaticArray) = broadcast(\, a1, a2)
17+
@inline .%(a1::StaticArray, a2::StaticArray) = broadcast(%, a1, a2)
18+
@inline .^(a1::StaticArray, a2::StaticArray) = broadcast(^, a1, a2)
1619

1720
@inline .+(a1::StaticArray, a2::Number) = broadcast(+, a1, a2)
1821
@inline .-(a1::StaticArray, a2::Number) = broadcast(-, a1, a2)
1922
@inline .*(a1::StaticArray, a2::Number) = broadcast(*, a1, a2)
2023
@inline ./(a1::StaticArray, a2::Number) = broadcast(/, a1, a2)
24+
@inline .\(a1::StaticArray, a2::Number) = broadcast(\, a1, a2)
25+
@inline .%(a1::StaticArray, a2::Number) = broadcast(%, a1, a2)
26+
@inline .^(a1::StaticArray, a2::Number) = broadcast(^, a1, a2)
2127

2228
@inline .+(a1::Number, a2::StaticArray) = broadcast(+, a1, a2)
2329
@inline .-(a1::Number, a2::StaticArray) = broadcast(-, a1, a2)
2430
@inline .*(a1::Number, a2::StaticArray) = broadcast(*, a1, a2)
2531
@inline ./(a1::Number, a2::StaticArray) = broadcast(/, a1, a2)
32+
@inline .\(a1::Number, a2::StaticArray) = broadcast(\, a1, a2)
33+
@inline .%(a1::Number, a2::StaticArray) = broadcast(%, a1, a2)
34+
@inline .^(a1::Number, a2::StaticArray) = broadcast(^, a1, a2)
2635

2736
@generated function Base.zeros{SA <: StaticArray}(::Union{SA,Type{SA}})
2837
s = size(SA)

0 commit comments

Comments
 (0)