Merge pull request JuliaLang#10314 from JuliaLang/teh/ducktype_functi…

…ons2 Duck type the function in map, reduce, etc.
jiahao · Mar 1, 2015 · 3782d2f · 3782d2f
2 parents e56d38d + 6cb7d5b
commit 3782d2f
Show file tree

Hide file tree

Showing 15 changed files with 422 additions and 41 deletions.
diff --git a/base/abstractarray.jl b/base/abstractarray.jl
@@ -1499,4 +1499,3 @@ function randsubseq!(S::AbstractArray, A::AbstractArray, p::Real)
 end
 
 randsubseq{T}(A::AbstractArray{T}, p::Real) = randsubseq!(T[], A, p)
-
diff --git a/base/array.jl b/base/array.jl
@@ -1298,9 +1298,9 @@ end
 ## Filter ##
 
 # given a function returning a boolean and an array, return matching elements
-filter(f::Function, As::AbstractArray) = As[map(f, As)::AbstractArray{Bool}]
+filter(f, As::AbstractArray) = As[map(f, As)::AbstractArray{Bool}]
 
-function filter!(f::Function, a::Vector)
+function filter!(f, a::Vector)
  insrt = 1
  for curr = 1:length(a)
  if f(a[curr])
@@ -1312,7 +1312,7 @@ function filter!(f::Function, a::Vector)
  return a
 end
 
-function filter(f::Function, a::Vector)
+function filter(f, a::Vector)
  r = Array(eltype(a), 0)
  for i = 1:length(a)
  if f(a[i])

diff --git a/base/base.jl b/base/base.jl
@@ -222,7 +222,7 @@ function length_checked_equal(args...)
  n
 end
 
-map(f::Callable, a::Array{Any,1}) = Any[ f(a[i]) for i=1:length(a) ]
+map(f, a::Array{Any,1}) = Any[ f(a[i]) for i=1:length(a) ]
 
 macro thunk(ex); :(()->$(esc(ex))); end
 macro L_str(s); s; end

diff --git a/base/bitarray.jl b/base/bitarray.jl
@@ -1579,7 +1579,7 @@ map(f::Callable, A::BitArray, B::BitArray) = map(specialized_bitwise_binary(f),
 map(f::BitFunctorUnary, A::BitArray) = map!(f, similar(A), A)
 map(f::BitFunctorBinary, A::BitArray, B::BitArray) = map!(f, similar(A), A, B)
 
-map!(f::Callable, A::BitArray) = map!(f, A, A)
+map!(f, A::BitArray) = map!(f, A, A)
 map!(f::Callable, dest::BitArray, A::BitArray) = map!(specialized_bitwise_unary(f), dest, A)
 map!(f::Callable, dest::BitArray, A::BitArray, B::BitArray) = map!(specialized_bitwise_binary(f), dest, A, B)
 
@@ -1607,7 +1607,7 @@ end
 
 ## Filter ##
 
-function filter(f::Function, Bs::BitArray)
+function filter(f, Bs::BitArray)
  boolmap::Array{Bool} = map(f, Bs)
  Bs[boolmap]
 end