Merge pull request JuliaLang#14139 from eschnett/eschnett/dot-div

Implement dot-div (.÷) operator, corresponding to ./ or .%
Sacha0 · Dec 8, 2015 · 8039d1b · 8039d1b
2 parents f5f3b57 + dbd7765
commit 8039d1b
Show file tree

Hide file tree

Showing 6 changed files with 26 additions and 6 deletions.
diff --git a/base/arraymath.jl b/base/arraymath.jl
@@ -104,6 +104,7 @@ end
 for (f,F) in ((:.+, DotAddFun()),
  (:.-, DotSubFun()),
  (:.*, DotMulFun()),
+ (:.÷, DotIDivFun()),
  (:.%, DotRemFun()),
  (:.<<, DotLSFun()),
  (:.>>, DotRSFun()),

diff --git a/base/broadcast.jl b/base/broadcast.jl
@@ -5,7 +5,7 @@ module Broadcast
 using ..Cartesian
 using Base: promote_op, promote_eltype, promote_eltype_op, @get!, _msk_end, unsafe_bitgetindex
 using Base: AddFun, SubFun, MulFun, LDivFun, RDivFun, PowFun
-import Base: .+, .-, .*, ./, .\, .//, .==, .<, .!=, .<=, .%, .<<, .>>, .^
+import Base: .+, .-, .*, ./, .\, .//, .==, .<, .!=, .<=, .÷, .%, .<<, .>>, .^
 export broadcast, broadcast!, broadcast_function, broadcast!_function, bitbroadcast
 export broadcast_getindex, broadcast_setindex!
 
@@ -303,6 +303,7 @@ end
 
 ## elementwise operators ##
 
+.÷(A::AbstractArray, B::AbstractArray) = broadcast(÷, A, B)
 .%(A::AbstractArray, B::AbstractArray) = broadcast(%, A, B)
 .<<(A::AbstractArray, B::AbstractArray) = broadcast(<<, A, B)
 .>>(A::AbstractArray, B::AbstractArray) = broadcast(>>, A, B)

diff --git a/base/exports.jl b/base/exports.jl
@@ -214,6 +214,7 @@ export
  ≢,
  $,
  %,
+ ÷,
  &,
  *,
  +,
@@ -224,6 +225,7 @@ export
  .-,
  .*,
  ./,
+ .÷,
  .%,
  .<,
  .<=,
@@ -256,7 +258,6 @@ export
  |>,
  ~,
  :,
- ÷,
  =>,
  A_ldiv_B!,
  A_ldiv_Bc,

diff --git a/base/functors.jl b/base/functors.jl
@@ -67,14 +67,17 @@ call(::LDivFun, x, y) = x \ y
 immutable IDivFun <: Func{2} end
 call(::IDivFun, x, y) = div(x, y)
 
+immutable DotIDivFun <: Func{2} end
+call(::DotIDivFun, x, y) = x .÷ y
+
 immutable ModFun <: Func{2} end
 call(::ModFun, x, y) = mod(x, y)
 
 immutable RemFun <: Func{2} end
 call(::RemFun, x, y) = rem(x, y)
 
 immutable DotRemFun <: Func{2} end
-call(::RemFun, x, y) = x .% y
+call(::DotRemFun, x, y) = x .% y
 
 immutable PowFun <: Func{2} end
 call(::PowFun, x, y) = x ^ y
@@ -190,6 +193,9 @@ function specialized_binary(f::Function)
  is(f, ^) ? PowFun() :
  is(f, &) ? AndFun() :
  is(f, |) ? OrFun() :
+ is(f, %) ? RemFun() :
+ is(f, rem) ? RemFun() :
+ is(f, ÷) ? IDivFun() :
  is(f, div) ? IDivFun() :
  UnspecializedFun{2}(f)
 end

diff --git a/base/operators.jl b/base/operators.jl
@@ -148,6 +148,7 @@ modCeil{T<:Real}(x::T, y::T) = convert(T,x-y*ceil(x/y))
 const % = rem
 .%(x::Real, y::Real) = x%y
 const ÷ = div
+.÷(x::Real, y::Real) = x÷y
 
 # mod returns in [0,y) or (y,0] (for negative y),
 # whereas mod1 returns in (0,y] or [y,0)
@@ -468,6 +469,8 @@ export
  $,
  %,
  .%,
+ ÷,
+ .÷,
  &,
  *,
  +,
@@ -510,7 +513,6 @@ export
  |>,
  <|,
  ~,
- ÷,
  ⋅,
  ×,
  ∈,
@@ -534,10 +536,10 @@ export
  ctranspose,
  call
 
-import ..this_module: !, !=, $, %, .%, &, *, +, -, .!=, .+, .-, .*, ./, .<, .<=, .==, .>,
+import ..this_module: !, !=, $, %, .%, ÷, .÷, &, *, +, -, .!=, .+, .-, .*, ./, .<, .<=, .==, .>,
  .>=, .\, .^, /, //, <, <:, <<, <=, ==, >, >=, >>, .>>, .<<, >>>,
  <|, |>, \, ^, |, ~, !==, ===, >:, colon, hcat, vcat, hvcat, getindex, setindex!,
  transpose, ctranspose, call,
- ≥, ≤, ≠, .≥, .≤, .≠, ÷, ⋅, ×, ∈, ∉, ∋, ∌, ⊆, ⊈, ⊊, ∩, ∪, √, ∛
+ ≥, ≤, ≠, .≥, .≤, .≠, ⋅, ×, ∈, ∉, ∋, ∌, ⊆, ⊈, ⊊, ∩, ∪, √, ∛
 
 end
diff --git a/test/arrayops.jl b/test/arrayops.jl
@@ -24,6 +24,15 @@ b = a+a
 @test isequal(1./[1,2,5], [1.0,0.5,0.2])
 @test isequal([1,2,3]/5, [0.2,0.4,0.6])
 
+@test isequal(2.%[1,2,3], [0,0,2])
+@test isequal([1,2,3].%2, [1,0,1])
+@test isequal(2.÷[1,2,3], [2,1,0])
+@test isequal([1,2,3].÷2, [0,1,1])
+@test isequal(-2.%[1,2,3], [0,0,-2])
+@test isequal([-1,-2,-3].%2, [-1,0,-1])
+@test isequal(-2.÷[1,2,3], [-2,-1,0])
+@test isequal([-1,-2,-3].÷2, [0,-1,-1])
+
 @test isequal(1.<<[1,2,5], [2,4,32])
 @test isequal(128.>>[1,2,5], [64,32,4])
 @test isequal(2.>>1, 1)