Skip to content

Commit 8c21ec9

Browse files
committed
Deprecate array-reducing isinteger.
1 parent 28a11ff commit 8c21ec9

File tree

5 files changed

+7
-8
lines changed

5 files changed

+7
-8
lines changed

Diff for: base/abstractarraymath.jl

+1-2
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,10 @@
22

33
## Basic functions ##
44

5-
isinteger(x::AbstractArray) = all(isinteger,x)
6-
isinteger{T<:Integer,n}(x::AbstractArray{T,n}) = true
75
isreal(x::AbstractArray) = all(isreal,x)
86
iszero(x::AbstractArray) = all(iszero,x)
97
isreal{T<:Real,n}(x::AbstractArray{T,n}) = true
8+
all{T<:Integer}(::typeof(isinteger), ::AbstractArray{T}) = true
109
ctranspose(a::AbstractArray) = error("ctranspose not implemented for $(typeof(a)). Consider adding parentheses, e.g. A*(B*C') instead of A*B*C' to avoid explicit calculation of the transposed matrix.")
1110
transpose(a::AbstractArray) = error("transpose not implemented for $(typeof(a)). Consider adding parentheses, e.g. A*(B*C.') instead of A*B*C' to avoid explicit calculation of the transposed matrix.")
1211

Diff for: base/deprecated.jl

+3
Original file line numberDiff line numberDiff line change
@@ -1496,6 +1496,9 @@ function frexp{T<:AbstractFloat}(A::Array{T})
14961496
return (F, E)
14971497
end
14981498

1499+
# Deprecate reducing isinteger over arrays
1500+
@deprecate isinteger(A::AbstractArray) all(isinteger, A)
1501+
14991502
# Calling promote_op is likely a bad idea, so deprecate its convenience wrapper promote_eltype_op
15001503
@deprecate promote_eltype_op(op, As...) promote_op(op, map(eltype, As)...)
15011504

Diff for: base/number.jl

+1-4
Original file line numberDiff line numberDiff line change
@@ -4,14 +4,11 @@
44
"""
55
isinteger(x) -> Bool
66
7-
Test whether `x` or all its elements are numerically equal to some integer.
7+
Test whether `x` is numerically equal to some integer.
88
99
```jldoctest
1010
julia> isinteger(4.0)
1111
true
12-
13-
julia> isinteger([1; 2; 5.5])
14-
false
1512
```
1613
"""
1714
isinteger(x::Integer) = true

Diff for: test/abstractarray.jl

+1-1
Original file line numberDiff line numberDiff line change
@@ -747,7 +747,7 @@ let
747747
end
748748

749749
# isinteger and isreal
750-
@test isinteger(Diagonal(rand(1:5,5)))
750+
@test all(isinteger, Diagonal(rand(1:5, 5))) # reducing isinteger(...) deprecated
751751
@test isreal(Diagonal(rand(5)))
752752

753753
# unary ops

Diff for: test/arrayops.jl

+1-1
Original file line numberDiff line numberDiff line change
@@ -277,7 +277,7 @@ end
277277
X = get(A, -5:5, NaN32)
278278
@test eltype(X) == Float32
279279
@test Base.elsize(X) == sizeof(Float32)
280-
@test !isinteger(X)
280+
@test !all(isinteger, X)
281281
@test isnan.(X) == [trues(6);falses(5)]
282282
@test X[7:11] == [1:5;]
283283
X = get(A, (2:4, 9:-2:-13), 0)

0 commit comments

Comments
 (0)