Merge branch 'master' into jb/rmsyntaxdeps

Author: tkelman

NEWS.md

@@ -169,6 +169,8 @@ This section lists changes that do not have deprecation warnings.
   * `A=>B` expressions are now parsed as calls instead of using `=>` as the
     expression head ([#20327]).
 
+  * The `count` function no longer sums non-boolean values ([#20404])
+
 Library improvements
 --------------------
 
@@ -239,6 +241,8 @@ Library improvements
 
   * Additional methods for `ones` and `zeros` functions to support the same signature as the `similar` function ([#19635]).
 
+  * `count` now has a `count(itr)` method equivalent to `count(identity, itr)` ([#20403]).
+
   * Methods for `map` and `filter` with `Nullable` arguments have been
     implemented; the semantics are as if the `Nullable` were a container with
     zero or one elements ([#16961]).

base/LineEdit.jl

@@ -1306,7 +1306,7 @@ end
 """
 `Base.LineEdit.tabwidth` controls the presumed tab width of code pasted into the REPL.
 
-You can modify it by doing `eval(Base.LineEdit, :(tabwidth = 4))`, for example.
+You can modify it by doing `@eval Base.LineEdit tabwidth = 4`, for example.
 
 Must satisfy `0 < tabwidth <= 16`.
 """

base/Terminals.jl

@@ -111,8 +111,8 @@ cmove_up(t::UnixTerminal, n) = write(t.out_stream, "$(CSI)$(n)A")
 cmove_down(t::UnixTerminal, n) = write(t.out_stream, "$(CSI)$(n)B")
 cmove_right(t::UnixTerminal, n) = write(t.out_stream, "$(CSI)$(n)C")
 cmove_left(t::UnixTerminal, n) = write(t.out_stream, "$(CSI)$(n)D")
-cmove_line_up(t::UnixTerminal, n) = (cmove_up(t, n); cmove_col(t, 0))
-cmove_line_down(t::UnixTerminal, n) = (cmove_down(t, n); cmove_col(t, 0))
+cmove_line_up(t::UnixTerminal, n) = (cmove_up(t, n); cmove_col(t, 1))
+cmove_line_down(t::UnixTerminal, n) = (cmove_down(t, n); cmove_col(t, 1))
 cmove_col(t::UnixTerminal, n) = write(t.out_stream, "$(CSI)$(n)G")
 
 if is_windows()

base/array.jl

@@ -26,11 +26,14 @@ typealias DenseVecOrMat{T} Union{DenseVector{T}, DenseMatrix{T}}
 import Core: arraysize, arrayset, arrayref
 
 """
+    Array{T}(dims)
     Array{T,N}(dims)
 
-Construct an uninitialized `N`-dimensional dense array with element type `T`. `dims` may
-be a tuple or a series of integer arguments corresponding to the length in each dimension.
-If the rank `N` is omitted, i.e. `Array{T}(dims)`, the rank is determined based on `dims`.
+Construct an uninitialized `N`-dimensional dense array with element type `T`,
+where `N` is determined from the length or number of `dims`.  `dims` may
+be a tuple or a series of integer arguments corresponding to the lengths in each dimension.
+If the rank `N` is supplied explicitly as in `Array{T,N}(dims)`, then it must
+match the length or number of `dims`.
 """
 Array
 

base/bitarray.jl

@@ -1575,6 +1575,7 @@ function countnz(B::BitArray)
     end
     return n
 end
+count(B::BitArray) = countnz(B)
 
 # returns the index of the next non-zero element, or 0 if all zeros
 function findnext(B::BitArray, start::Integer)

base/client.jl

@@ -356,7 +356,7 @@ function __atreplinit(repl)
         end
     end
 end
-_atreplinit(repl) = eval(Main, :($__atreplinit($repl)))
+_atreplinit(repl) = @eval Main $__atreplinit($repl)
 
 function _start()
     empty!(ARGS)

base/clusterserialize.jl

@@ -136,9 +136,9 @@ function deserialize_global_from_main(s::ClusterSerializer, sym)
     sym_isconst = deserialize(s)
     v = deserialize(s)
     if sym_isconst
-        eval(Main, :(const $sym = $v))
+        @eval Main const $sym = $v
     else
-        eval(Main, :($sym = $v))
+        @eval Main $sym = $v
     end
 end
 

base/deprecated.jl

@@ -249,7 +249,7 @@ for f in ( :acos_fast, :acosh_fast, :angle_fast, :asin_fast, :asinh_fast,
             :cosh_fast, :exp10_fast, :exp2_fast, :exp_fast, :expm1_fast,
             :lgamma_fast, :log10_fast, :log1p_fast, :log2_fast, :log_fast,
             :sin_fast, :sinh_fast, :sqrt_fast, :tan_fast, :tanh_fast )
-    eval(FastMath, :(Base.@dep_vectorize_1arg Number $f))
+    @eval FastMath Base.@dep_vectorize_1arg Number $f
 end
 for f in (
         :invdigamma, # base/special/gamma.jl
@@ -265,7 +265,7 @@ end
 @dep_vectorize_1arg Complex float
 # base/dates/*.jl
 for f in (:unix2datetime, :rata2datetime, :julian2datetime)  # base/dates/conversions.jl
-    eval(Dates, :(Base.@dep_vectorize_1arg Real $f))
+    @eval Dates Base.@dep_vectorize_1arg Real $f
 end
 for f in (
         # base/dates/accessors.jl
@@ -279,15 +279,15 @@ for f in (
         :daysofweekinmonth, :monthname, :monthabbr, :daysinmonth,
         :isleapyear, :dayofyear, :daysinyear, :quarterofyear, :dayofquarter,
     )
-    eval(Dates, :(Base.@dep_vectorize_1arg Dates.TimeType $f))
+    @eval Dates Base.@dep_vectorize_1arg Dates.TimeType $f
 end
 for f in (
     :hour, :minute, :second, :millisecond, # base/dates/accessors.jl
     :Date, :datetime2unix, :datetime2rata, :datetime2julian, # base/dates/conversions.jl
     )
-    eval(Dates, :(Base.@dep_vectorize_1arg Dates.DateTime $f))
+    @eval Dates Base.@dep_vectorize_1arg Dates.DateTime $f
 end
-eval(Dates, :(Base.@dep_vectorize_1arg Dates.Date Datetime)) # base/dates/conversions.jl
+@eval Dates Base.@dep_vectorize_1arg Dates.Date Datetime # base/dates/conversions.jl
 
 # Deprecate @vectorize_2arg-vectorized functions from...
 for f in (
@@ -304,7 +304,7 @@ for f in (
 end
 # base/fastmath.jl
 for f in (:pow_fast, :atan2_fast, :hypot_fast, :max_fast, :min_fast, :minmax_fast)
-    eval(FastMath, :(Base.@dep_vectorize_2arg Number $f))
+    @eval FastMath Base.@dep_vectorize_2arg Number $f
 end
 for f in (
         :max, :min, # base/math.jl
@@ -356,14 +356,14 @@ end
 @deprecate abs(x::AbstractSparseVector) abs.(x)
 
 # Deprecate @textmime into the Multimedia module, #18441
-eval(Multimedia, :(macro textmime(mime)
+@eval Multimedia macro textmime(mime)
     Base.depwarn(string("`@textmime \"mime\"` is deprecated; use ",
         "`Base.Multimedia.istextmime(::MIME\"mime\") = true` instead"
         ), :textmime)
     quote
         Base.Multimedia.istextmime(::MIME{$(Meta.quot(Symbol(mime)))}) = true
     end
-end))
+end
 
 @deprecate ipermutedims(A::AbstractArray,p) permutedims(A, invperm(p))
 
@@ -440,7 +440,7 @@ function reduced_dims0(a::AbstractArray, region)
 end
 
 # #18218
-eval(Base.LinAlg, quote
+@eval Base.LinAlg begin
     function arithtype(T)
         Base.depwarn(string("arithtype is now deprecated. If you were using it inside a ",
             "promote_op call, use promote_op(LinAlg.matprod, Ts...) instead. Otherwise, ",
@@ -455,7 +455,7 @@ eval(Base.LinAlg, quote
             :arithtype)
         Int
     end
-end)
+end
 
 # #19246
 @deprecate den denominator
@@ -468,7 +468,7 @@ Filesystem.stop_watching(stream::Filesystem._FDWatcher) = depwarn("stop_watching
 @deprecate takebuf_string(b) String(take!(b))
 
 # #19288
-eval(Base.Dates, quote
+@eval Base.Dates begin
     function recur{T<:TimeType}(fun::Function, dr::StepRange{T}; negate::Bool=false, limit::Int=10000)
         Base.depwarn("Dates.recur is deprecated, use filter instead.",:recur)
         if negate
@@ -478,7 +478,7 @@ eval(Base.Dates, quote
         end
      end
      recur{T<:TimeType}(fun::Function, start::T, stop::T; step::Period=Day(1), negate::Bool=false, limit::Int=10000) = recur(fun, start:step:stop; negate=negate)
-end)
+end
 
 # Index conversions revamp; #19730
 function getindex(A::LogicalIndex, i::Int)
@@ -655,13 +655,15 @@ function _depwarn_bczpres!(f, args...)
     depwarn(_depstring_bczpres(), :broadcast_zpreserving!)
     return _broadcast_zpreserving!(f, args...)
 end
-eval(SparseArrays, :(broadcast_zpreserving(f, args...) = Base._depwarn_bczpres(f, args...)))
-eval(SparseArrays, :(broadcast_zpreserving(f, A::SparseMatrixCSC, B::SparseMatrixCSC) = Base._depwarn_bczpres(f, A, B)))
-eval(SparseArrays, :(broadcast_zpreserving(f, A::SparseMatrixCSC, B::Union{Array,BitArray,Number}) = Base._depwarn_bczpres(f, A, B)))
-eval(SparseArrays, :(broadcast_zpreserving(f, A::Union{Array,BitArray,Number}, B::SparseMatrixCSC) = Base._depwarn_bczpres(f, A, B)))
-eval(SparseArrays, :(broadcast_zpreserving!(f, args...) = Base._depwarn_bczpres!(f, args...)))
-eval(SparseArrays, :(broadcast_zpreserving!(f, C::SparseMatrixCSC, A::SparseMatrixCSC, B::Union{Array,BitArray,Number}) = Base._depwarn_bczpres!(f, C, A, B)))
-eval(SparseArrays, :(broadcast_zpreserving!(f, C::SparseMatrixCSC, A::Union{Array,BitArray,Number}, B::SparseMatrixCSC) = Base._depwarn_bczpres!(f, C, A, B)))
+@eval SparseArrays begin
+    broadcast_zpreserving(f, args...) = Base._depwarn_bczpres(f, args...)
+    broadcast_zpreserving(f, A::SparseMatrixCSC, B::SparseMatrixCSC) = Base._depwarn_bczpres(f, A, B)
+    broadcast_zpreserving(f, A::SparseMatrixCSC, B::Union{Array,BitArray,Number}) = Base._depwarn_bczpres(f, A, B)
+    broadcast_zpreserving(f, A::Union{Array,BitArray,Number}, B::SparseMatrixCSC) = Base._depwarn_bczpres(f, A, B)
+    broadcast_zpreserving!(f, args...) = Base._depwarn_bczpres!(f, args...)
+    broadcast_zpreserving!(f, C::SparseMatrixCSC, A::SparseMatrixCSC, B::Union{Array,BitArray,Number}) = Base._depwarn_bczpres!(f, C, A, B)
+    broadcast_zpreserving!(f, C::SparseMatrixCSC, A::Union{Array,BitArray,Number}, B::SparseMatrixCSC) = Base._depwarn_bczpres!(f, C, A, B)
+end
 
 # #19719
 @deprecate getindex(t::Tuple, r::AbstractArray)       getindex(t, vec(r))
@@ -1030,7 +1032,7 @@ iteratoreltype(::Type{Task}) = EltypeUnknown()
 
 isempty(::Task) = error("isempty not defined for Tasks")
 
-eval(Base.Test, quote
+@eval Base.Test begin
     approx_full(x::AbstractArray) = x
     approx_full(x::Number) = x
     approx_full(x) = full(x)
@@ -1095,7 +1097,7 @@ eval(Base.Test, quote
         :(test_approx_eq($(esc(a)), $(esc(b)), $(string(a)), $(string(b))))
     end
     export @test_approx_eq
-end)
+end
 
 # Deprecate partial linear indexing
 function partial_linear_indexing_warning_lookup(nidxs_remaining)
@@ -1138,23 +1140,23 @@ function partial_linear_indexing_warning(n)
 end
 
 # Deprecate Array(T, dims...) in favor of proper type constructors
-@deprecate Array{T,N}(::Type{T}, d::NTuple{N,Int})               Array{T,N}(d)
-@deprecate Array{T}(::Type{T}, d::Int...)                        Array{T,length(d)}(d...)
-@deprecate Array{T}(::Type{T}, m::Int)                           Array{T,1}(m)
-@deprecate Array{T}(::Type{T}, m::Int,n::Int)                    Array{T,2}(m,n)
-@deprecate Array{T}(::Type{T}, m::Int,n::Int,o::Int)             Array{T,3}(m,n,o)
-@deprecate Array{T}(::Type{T}, d::Integer...)                    Array{T,length(d)}(convert(Tuple{Vararg{Int}}, d))
-@deprecate Array{T}(::Type{T}, m::Integer)                       Array{T,1}(Int(m))
-@deprecate Array{T}(::Type{T}, m::Integer,n::Integer)            Array{T,2}(Int(m),Int(n))
-@deprecate Array{T}(::Type{T}, m::Integer,n::Integer,o::Integer) Array{T,3}(Int(m),Int(n),Int(o))
+@deprecate Array{T,N}(::Type{T}, d::NTuple{N,Int})               Array{T}(d)
+@deprecate Array{T}(::Type{T}, d::Int...)                        Array{T}(d...)
+@deprecate Array{T}(::Type{T}, m::Int)                           Array{T}(m)
+@deprecate Array{T}(::Type{T}, m::Int,n::Int)                    Array{T}(m,n)
+@deprecate Array{T}(::Type{T}, m::Int,n::Int,o::Int)             Array{T}(m,n,o)
+@deprecate Array{T}(::Type{T}, d::Integer...)                    Array{T}(convert(Tuple{Vararg{Int}}, d))
+@deprecate Array{T}(::Type{T}, m::Integer)                       Array{T}(Int(m))
+@deprecate Array{T}(::Type{T}, m::Integer,n::Integer)            Array{T}(Int(m),Int(n))
+@deprecate Array{T}(::Type{T}, m::Integer,n::Integer,o::Integer) Array{T}(Int(m),Int(n),Int(o))
 
 # Likewise for SharedArrays
-@deprecate SharedArray{T,N}(::Type{T}, dims::Dims{N}; kwargs...) SharedArray{T,N}(dims; kwargs...)
-@deprecate SharedArray{T}(::Type{T}, dims::Int...; kwargs...)    SharedArray{T,length(dims)}(dims...; kwargs...)
+@deprecate SharedArray{T,N}(::Type{T}, dims::Dims{N}; kwargs...) SharedArray{T}(dims; kwargs...)
+@deprecate SharedArray{T}(::Type{T}, dims::Int...; kwargs...)    SharedArray{T}(dims...; kwargs...)
 @deprecate(SharedArray{T,N}(filename::AbstractString, ::Type{T}, dims::NTuple{N,Int}, offset; kwargs...),
-           SharedArray{T,N}(filename, dims, offset; kwargs...))
+           SharedArray{T}(filename, dims, offset; kwargs...))
 @deprecate(SharedArray{T}(filename::AbstractString, ::Type{T}, dims::NTuple, offset; kwargs...),
-           SharedArray{T,length(dims)}(filename, dims, offset; kwargs...))
+           SharedArray{T}(filename, dims, offset; kwargs...))
 
 @noinline function is_intrinsic_expr(x::ANY)
     Base.depwarn("is_intrinsic_expr is deprecated. There are no intrinsic functions anymore.", :is_intrinsic_expr)
@@ -1177,7 +1179,7 @@ function colon{T<:Dates.Period}(start::T, stop::T)
 end
 
 # LibGit2 refactor (#19839)
-eval(Base.LibGit2, quote
+@eval Base.LibGit2 begin
      Base.@deprecate_binding Oid GitHash
      Base.@deprecate_binding GitAnyObject GitUnknownObject
 
@@ -1187,23 +1189,21 @@ eval(Base.LibGit2, quote
      @deprecate revparse(repo::GitRepo, objname::AbstractString) GitObject(repo, objname) false
      @deprecate object(repo::GitRepo, te::GitTreeEntry) GitObject(repo, te) false
      @deprecate commit(ann::GitAnnotated) GitHash(ann) false
-end)
+end
 
 # when this deprecation is deleted, remove all calls to it, and all
 # negate=nothing keyword arguments, from base/dates/adjusters.jl
-eval(Dates, quote
-    function deprecate_negate(f, func, sig, negate)
-        if negate === nothing
-            return func
-        else
-            msg = "$f($sig; negate=$negate) is deprecated, use $f("
-            negate && (msg *= "!")
-            msg *= "$sig) instead."
-            Base.depwarn(msg, f)
-            return negate ? !func : func
-        end
+@eval Dates function deprecate_negate(f, func, sig, negate)
+    if negate === nothing
+        return func
+    else
+        msg = "$f($sig; negate=$negate) is deprecated, use $f("
+        negate && (msg *= "!")
+        msg *= "$sig) instead."
+        Base.depwarn(msg, f)
+        return negate ? !func : func
     end
-end)
+end
 
 # FloatRange replaced by StepRangeLen
 

base/dict.jl

@@ -662,7 +662,7 @@ end
 start(t::ImmutableDict) = t
 next{K,V}(::ImmutableDict{K,V}, t) = (Pair{K,V}(t.key, t.value), t.parent)
 done(::ImmutableDict, t) = !isdefined(t, :parent)
-length(t::ImmutableDict) = count(x->1, t)
+length(t::ImmutableDict) = count(x->true, t)
 isempty(t::ImmutableDict) = done(t, start(t))
 function similar(t::ImmutableDict)
     while isdefined(t, :parent)

base/expr.jl

@@ -109,12 +109,16 @@ evaluates expressions in that module.
 Core.eval
 
 """
-    @eval
+    @eval [mod,] ex
 
-Evaluate an expression and return the value.
+Evaluate an expression with values interpolated into it using `eval`.
+If two arguments are provided, the first is the module to evaluate in.
 """
-macro eval(x)
-    :($(esc(:eval))($(Expr(:quote,x))))
+macro eval(ex)
+    :(eval($(current_module()), $(Expr(:quote,ex))))
+end
+macro eval(mod, ex)
+    :(eval($(esc(mod)), $(Expr(:quote,ex))))
 end
 
 """

base/multi.jl

@@ -2371,4 +2371,4 @@ clear!(sym::Symbol, pids=workers(); mod=Main) = clear!([sym], pids; mod=mod)
 clear!(syms, pid::Int; mod=Main) = clear!(syms, [pid]; mod=mod)
 
 clear_impl!(syms, mod::Module) = foreach(x->clear_impl!(x,mod), syms)
-clear_impl!(sym::Symbol, mod::Module) = isdefined(mod, sym) && eval(mod, :(global $sym = nothing))
+clear_impl!(sym::Symbol, mod::Module) = isdefined(mod, sym) && @eval(mod, global $sym = nothing)