Merge pull request #6126 from JuliaLang/anj/arraydiv

Add missing .\ methods for arrays and numbers. Remove some obsolete methods.
JuliaLang · Mar 12, 2014 · bc1ced6 · bc1ced6
2 parents 6b88580 + cf8ef14
commit bc1ced6
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 8 deletions.
diff --git a/base/abstractarray.jl b/base/abstractarray.jl
@@ -331,13 +331,6 @@ imag{T<:Real}(x::AbstractArray{T}) = zero(x)
 
 \(A::Number, B::AbstractArray) = B ./ A
 
-./(x::Number,y::AbstractArray )         = throw(MethodError(./, (x,y)))
-./(x::AbstractArray, y::Number)         = throw(MethodError(./, (x,y)))
-
-.^(x::Number,y::AbstractArray )         = throw(MethodError(.^, (x,y)))
-.^(x::AbstractArray, y::Number)         = throw(MethodError(.^, (x,y)))
-
-
 ## Indexing: getindex ##
 
 getindex(t::AbstractArray, i::Real) = error("indexing not defined for ", typeof(t))

diff --git a/base/array.jl b/base/array.jl
@@ -786,7 +786,7 @@ for f in (:+, :-, :div, :mod, :&, :|, :$)
         end
     end
 end
-for f in (:.+, :.-, :.*, :./, :.%, :div, :mod, :rem, :&, :|, :$)
+for f in (:.+, :.-, :.*, :./, :.\, :.%, :div, :mod, :rem, :&, :|, :$)
     @eval begin
         function ($f){T}(A::Number, B::StridedArray{T})
             F = similar(B, promote_array_type(typeof(A),T))