From 320fa9994afefe835f401914891020011fdaf470 Mon Sep 17 00:00:00 2001 From: Alex Arslan Date: Sat, 24 Jun 2017 18:21:33 -0700 Subject: [PATCH 1/2] Deprecate no space between expression and ? in ternary --- src/julia-parser.scm | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/julia-parser.scm b/src/julia-parser.scm index e15e23d7fb016..00d9b728003c1 100644 --- a/src/julia-parser.scm +++ b/src/julia-parser.scm @@ -728,7 +728,9 @@ (define (parse-cond s) (let ((ex (parse-arrow s))) (cond ((eq? (peek-token s) '?) - (begin (take-token s) + (begin (if (not (ts:space? s)) + (syntax-deprecation s (string (deparse ex) "?") (string (deparse ex) " ?"))) + (take-token s) (let ((then (without-range-colon (parse-eq* s)))) (if (not (eq? (take-token s) ':)) (error "colon expected in \"?\" expression") From 03d118771b92f51af675880a75586a0d9628a029 Mon Sep 17 00:00:00 2001 From: Alex Arslan Date: Sat, 24 Jun 2017 18:39:46 -0700 Subject: [PATCH 2/2] Replace uses of expr? in Base --- base/cartesian.jl | 2 +- base/docs/utils.jl | 4 ++-- base/filesystem.jl | 2 +- base/libc.jl | 2 +- base/libgit2/commit.jl | 4 ++-- base/libuv.jl | 2 +- base/linalg/bidiag.jl | 4 ++-- base/linalg/lapack.jl | 2 +- base/linalg/triangular.jl | 8 ++++---- base/pcre.jl | 2 +- base/printf.jl | 24 ++++++++++++------------ base/sparse/linalg.jl | 4 ++-- test/broadcast.jl | 2 +- test/distributed_exec.jl | 4 ++-- test/linalg/bidiag.jl | 8 ++++---- 15 files changed, 37 insertions(+), 37 deletions(-) diff --git a/base/cartesian.jl b/base/cartesian.jl index 86068a28baded..e17a1ee6da421 100644 --- a/base/cartesian.jl +++ b/base/cartesian.jl @@ -417,7 +417,7 @@ function exprresolve(ex::Expr) if ex.head == :if can_eval, tf = exprresolve_conditional(ex.args[1]) if can_eval - ex = tf?ex.args[2]:ex.args[3] + ex = tf ? ex.args[2] : ex.args[3] end end ex diff --git a/base/docs/utils.jl b/base/docs/utils.jl index 220f5db5626ab..a4e4be3bc5603 100644 --- a/base/docs/utils.jl +++ b/base/docs/utils.jl @@ -253,7 +253,7 @@ avgdistance(xs) = function fuzzyscore(needle, haystack) score = 0. is, acro = bestmatch(needle, haystack) - score += (acro?2:1)*length(is) # Matched characters + score += (acro ? 2 : 1)*length(is) # Matched characters score -= 2(length(needle)-length(is)) # Missing characters !acro && (score -= avgdistance(is)/10) # Contiguous !isempty(is) && (score -= mean(is)/100) # Closer to beginning @@ -330,7 +330,7 @@ function print_joined_cols(io::IO, ss, delim = "", last = delim; cols = displays total = 0 for i = 1:length(ss) total += length(ss[i]) - total + max(i-2,0)*length(delim) + (i>1?1:0)*length(last) > cols && (i-=1; break) + total + max(i-2,0)*length(delim) + (i>1 ? 1 : 0)*length(last) > cols && (i-=1; break) end join(io, ss[1:i], delim, last) end diff --git a/base/filesystem.jl b/base/filesystem.jl index bdbd8a0d6d305..0a04e0f3e98f9 100644 --- a/base/filesystem.jl +++ b/base/filesystem.jl @@ -52,7 +52,7 @@ include("path.jl") include("stat.jl") include("file.jl") include("poll.jl") -include(string(length(Core.ARGS)>=2?Core.ARGS[2]:"","file_constants.jl")) # include($BUILDROOT/base/file_constants.jl) +include(string(length(Core.ARGS) >= 2 ? Core.ARGS[2] : "", "file_constants.jl")) # include($BUILDROOT/base/file_constants.jl) ## Operations with File (fd) objects ## diff --git a/base/libc.jl b/base/libc.jl index bfce78f823896..3eae38c4e54e5 100644 --- a/base/libc.jl +++ b/base/libc.jl @@ -10,7 +10,7 @@ if is_windows() export GetLastError, FormatMessage end -include(string(length(Core.ARGS)>=2?Core.ARGS[2]:"","errno_h.jl")) # include($BUILDROOT/base/errno_h.jl) +include(string(length(Core.ARGS) >= 2 ? Core.ARGS[2] : "", "errno_h.jl")) # include($BUILDROOT/base/errno_h.jl) ## RawFD ## diff --git a/base/libgit2/commit.jl b/base/libgit2/commit.jl index 39feb982a3e4f..63ae8825e8175 100644 --- a/base/libgit2/commit.jl +++ b/base/libgit2/commit.jl @@ -2,8 +2,8 @@ function message(c::GitCommit, raw::Bool=false) local msg_ptr::Cstring - msg_ptr = raw? ccall((:git_commit_message_raw, :libgit2), Cstring, (Ptr{Void},), c.ptr) : - ccall((:git_commit_message, :libgit2), Cstring, (Ptr{Void},), c.ptr) + msg_ptr = raw ? ccall((:git_commit_message_raw, :libgit2), Cstring, (Ptr{Void},), c.ptr) : + ccall((:git_commit_message, :libgit2), Cstring, (Ptr{Void},), c.ptr) if msg_ptr == C_NULL return nothing end diff --git a/base/libuv.jl b/base/libuv.jl index 702fad7392081..99bc52281c96f 100644 --- a/base/libuv.jl +++ b/base/libuv.jl @@ -2,7 +2,7 @@ # Core definitions for interacting with the libuv library from Julia -include(string(length(Core.ARGS)>=2?Core.ARGS[2]:"","uv_constants.jl")) # include($BUILDROOT/base/uv_constants.jl) +include(string(length(Core.ARGS) >= 2 ? Core.ARGS[2] : "", "uv_constants.jl")) # include($BUILDROOT/base/uv_constants.jl) # convert UV handle data to julia object, checking for null function uv_sizeof_handle(handle) diff --git a/base/linalg/bidiag.jl b/base/linalg/bidiag.jl index 9e9af0bb890ff..b54dce69018f2 100644 --- a/base/linalg/bidiag.jl +++ b/base/linalg/bidiag.jl @@ -142,7 +142,7 @@ julia> Bidiagonal(A, false) #contains the main diagonal and first subdiagonal of ⋅ ⋅ 4 4 ``` """ -Bidiagonal(A::AbstractMatrix, isupper::Bool)=Bidiagonal(diag(A), diag(A, isupper?1:-1), isupper) +Bidiagonal(A::AbstractMatrix, isupper::Bool)=Bidiagonal(diag(A), diag(A, isupper ? 1 : -1), isupper) function getindex(A::Bidiagonal{T}, i::Integer, j::Integer) where T if !((1 <= i <= size(A,2)) && (1 <= j <= size(A,2))) @@ -241,7 +241,7 @@ function show(io::IO, M::Bidiagonal) println(io, summary(M), ":") print(io, " diag:") print_matrix(io, (M.dv)') - print(io, M.isupper?"\n super:":"\n sub:") + print(io, M.isupper ? "\n super:" : "\n sub:") print_matrix(io, (M.ev)') end diff --git a/base/linalg/lapack.jl b/base/linalg/lapack.jl index aaec8c49d51fb..11e23b7be8aea 100644 --- a/base/linalg/lapack.jl +++ b/base/linalg/lapack.jl @@ -867,7 +867,7 @@ for (gels, gesv, getrs, getri, elty) in (Ptr{UInt8}, Ptr{BlasInt}, Ptr{BlasInt}, Ptr{BlasInt}, Ptr{$elty}, Ptr{BlasInt}, Ptr{$elty}, Ptr{BlasInt}, Ptr{$elty}, Ptr{BlasInt}, Ptr{BlasInt}), - &(btrn?'T':'N'), &m, &n, &size(B,2), A, &max(1,stride(A,2)), + &(btrn ? 'T' : 'N'), &m, &n, &size(B,2), A, &max(1,stride(A,2)), B, &max(1,stride(B,2)), work, &lwork, info) chklapackerror(info[]) if i == 1 diff --git a/base/linalg/triangular.jl b/base/linalg/triangular.jl index 8c95da6f19839..27a671abacf4c 100644 --- a/base/linalg/triangular.jl +++ b/base/linalg/triangular.jl @@ -372,7 +372,7 @@ end function copy!(A::T, B::T) where T<:Union{UpperTriangular,UnitUpperTriangular} n = size(B,1) for j = 1:n - for i = 1:(isa(B, UnitUpperTriangular)?j-1:j) + for i = 1:(isa(B, UnitUpperTriangular) ? j-1 : j) @inbounds A[i,j] = B[i,j] end end @@ -381,7 +381,7 @@ end function copy!(A::T, B::T) where T<:Union{LowerTriangular,UnitLowerTriangular} n = size(B,1) for j = 1:n - for i = (isa(B, UnitLowerTriangular)?j+1:j):n + for i = (isa(B, UnitLowerTriangular) ? j+1 : j):n @inbounds A[i,j] = B[i,j] end end @@ -394,7 +394,7 @@ function scale!(A::UpperTriangular, B::Union{UpperTriangular,UnitUpperTriangular if isa(B, UnitUpperTriangular) @inbounds A[j,j] = c end - for i = 1:(isa(B, UnitUpperTriangular)?j-1:j) + for i = 1:(isa(B, UnitUpperTriangular) ? j-1 : j) @inbounds A[i,j] = c * B[i,j] end end @@ -406,7 +406,7 @@ function scale!(A::LowerTriangular, B::Union{LowerTriangular,UnitLowerTriangular if isa(B, UnitLowerTriangular) @inbounds A[j,j] = c end - for i = (isa(B, UnitLowerTriangular)?j+1:j):n + for i = (isa(B, UnitLowerTriangular) ? j+1 : j):n @inbounds A[i,j] = c * B[i,j] end end diff --git a/base/pcre.jl b/base/pcre.jl index 316a5821c23fa..97b7fae7000d7 100644 --- a/base/pcre.jl +++ b/base/pcre.jl @@ -4,7 +4,7 @@ module PCRE -include(string(length(Core.ARGS)>=2?Core.ARGS[2]:"","pcre_h.jl")) # include($BUILDROOT/base/pcre_h.jl) +include(string(length(Core.ARGS) >= 2 ? Core.ARGS[2] : "", "pcre_h.jl")) # include($BUILDROOT/base/pcre_h.jl) const PCRE_LIB = "libpcre2-8" diff --git a/base/printf.jl b/base/printf.jl index b743ab6e05529..c2dea8210f4a5 100644 --- a/base/printf.jl +++ b/base/printf.jl @@ -299,8 +299,8 @@ function gen_d(flags::String, width::Int, precision::Int, c::Char) push!(blk.args, pad(width-precision, padding, ' ')) end # print sign - '+' in flags ? push!(blk.args, :(write(out, neg?'-':'+'))) : - ' ' in flags ? push!(blk.args, :(write(out, neg?'-':' '))) : + '+' in flags ? push!(blk.args, :(write(out, neg ? '-' : '+'))) : + ' ' in flags ? push!(blk.args, :(write(out, neg ? '-' : ' '))) : push!(blk.args, :(neg && write(out, '-'))) # print prefix for ch in prefix @@ -362,8 +362,8 @@ function gen_f(flags::String, width::Int, precision::Int, c::Char) push!(blk.args, pad(width-1, padding, ' ')) end # print sign - '+' in flags ? push!(blk.args, :(write(out, neg?'-':'+'))) : - ' ' in flags ? push!(blk.args, :(write(out, neg?'-':' '))) : + '+' in flags ? push!(blk.args, :(write(out, neg ? '-' : '+'))) : + ' ' in flags ? push!(blk.args, :(write(out, neg ? '-' : ' '))) : push!(blk.args, :(neg && write(out, '-'))) # print zero padding if padding !== nothing && !('-' in flags) && '0' in flags @@ -456,8 +456,8 @@ function gen_e(flags::String, width::Int, precision::Int, c::Char, inside_g::Boo push!(blk.args, pad(width, padding, ' ')) end # print sign - '+' in flags ? push!(blk.args, :(write(out, neg?'-':'+'))) : - ' ' in flags ? push!(blk.args, :(write(out, neg?'-':' '))) : + '+' in flags ? push!(blk.args, :(write(out, neg ? '-' : '+'))) : + ' ' in flags ? push!(blk.args, :(write(out, neg ? '-' : ' '))) : push!(blk.args, :(neg && write(out, '-'))) # print zero padding if padding !== nothing && !('-' in flags) && '0' in flags @@ -554,7 +554,7 @@ function gen_a(flags::String, width::Int, precision::Int, c::Char) if '#' in flags padding = :($padding - (len-1)) else - padding = :($padding - (len>1?len:0)) + padding = :($padding - (len>1 ? len : 0)) end end # print space padding @@ -562,8 +562,8 @@ function gen_a(flags::String, width::Int, precision::Int, c::Char) push!(blk.args, pad(width, padding, ' ')) end # print sign - '+' in flags ? push!(blk.args, :(write(out, neg?'-':'+'))) : - ' ' in flags ? push!(blk.args, :(write(out, neg?'-':' '))) : + '+' in flags ? push!(blk.args, :(write(out, neg ? '-' : '+'))) : + ' ' in flags ? push!(blk.args, :(write(out, neg ? '-' : ' '))) : push!(blk.args, :(neg && write(out, '-'))) # hex prefix for ch in hexmark @@ -630,7 +630,7 @@ function _limit(s, prec) prec >= sizeof(s) && return s p = prevind(s, prec+1) n = nextind(s, p)-1 - s[1:(prec>=n?n:prevind(s,p))] + s[1:(prec>=n ? n : prevind(s,p))] end function gen_s(flags::String, width::Int, precision::Int, c::Char) @@ -755,8 +755,8 @@ function gen_g(flags::String, width::Int, precision::Int, c::Char) $padexpr; end)) end # print sign - '+' in flags ? push!(blk.args, :(write(out, neg?'-':'+'))) : - ' ' in flags ? push!(blk.args, :(write(out, neg?'-':' '))) : + '+' in flags ? push!(blk.args, :(write(out, neg ? '-' : '+'))) : + ' ' in flags ? push!(blk.args, :(write(out, neg ? '-' : ' '))) : push!(blk.args, :(neg && write(out, '-'))) # print zero padding if !('-' in flags) && '0' in flags diff --git a/base/sparse/linalg.jl b/base/sparse/linalg.jl index 2e63f6b63dc83..d65961bb28819 100644 --- a/base/sparse/linalg.jl +++ b/base/sparse/linalg.jl @@ -586,7 +586,7 @@ function normestinv(A::SparseMatrixCSC{T}, t::Integer = min(2,maximum(size(A)))) function _rand_pm1!(v) for i in eachindex(v) - v[i] = rand()<0.5?1:-1 + v[i] = rand()<0.5 ? 1 : -1 end end @@ -643,7 +643,7 @@ function normestinv(A::SparseMatrixCSC{T}, t::Integer = min(2,maximum(size(A)))) S_old = copy(S) for j = 1:t for i = 1:n - S[i,j] = Y[i,j]==0?one(Y[i,j]):sign(Y[i,j]) + S[i,j] = Y[i,j]==0 ? one(Y[i,j]) : sign(Y[i,j]) end end diff --git a/test/broadcast.jl b/test/broadcast.jl index b9b07c11f54fc..00134b3df0ec5 100644 --- a/test/broadcast.jl +++ b/test/broadcast.jl @@ -200,7 +200,7 @@ end # issue #4883 @test isa(broadcast(tuple, [1 2 3], ["a", "b", "c"]), Matrix{Tuple{Int,String}}) -@test isa(broadcast((x,y)->(x==1?1.0:x,y), [1 2 3], ["a", "b", "c"]), Matrix{Tuple{Real,String}}) +@test isa(broadcast((x,y)->(x==1 ? 1.0 : x, y), [1 2 3], ["a", "b", "c"]), Matrix{Tuple{Real,String}}) let a = length.(["foo", "bar"]) @test isa(a, Vector{Int}) @test a == [3, 3] diff --git a/test/distributed_exec.jl b/test/distributed_exec.jl index 402948cf96ec4..24f456b49b3e6 100644 --- a/test/distributed_exec.jl +++ b/test/distributed_exec.jl @@ -902,9 +902,9 @@ function testmap_equivalence(f, c...) end testmap_equivalence(identity, (1,2,3,4)) -testmap_equivalence(x->x>0?1.0:0.0, sparse(eye(5))) +testmap_equivalence(x->x>0 ? 1.0 : 0.0, sparse(eye(5))) testmap_equivalence((x,y,z)->x+y+z, 1,2,3) -testmap_equivalence(x->x?false:true, BitArray(10,10)) +testmap_equivalence(x->x ? false : true, BitArray(10,10)) testmap_equivalence(x->"foobar", BitArray(10,10)) testmap_equivalence((x,y,z)->string(x,y,z), BitArray(10), ones(10), "1234567890") diff --git a/test/linalg/bidiag.jl b/test/linalg/bidiag.jl index 7e128844eec7a..515a175b26f4c 100644 --- a/test/linalg/bidiag.jl +++ b/test/linalg/bidiag.jl @@ -84,12 +84,12 @@ srand(1) @testset "Constructor and basic properties" begin @test size(T, 1) == size(T, 2) == n @test size(T) == (n, n) - @test Array(T) == diagm(dv) + diagm(ev, isupper?1:-1) + @test Array(T) == diagm(dv) + diagm(ev, isupper ? 1 : -1) @test Bidiagonal(Array(T), isupper) == T @test big.(T) == T - @test Array(abs.(T)) == abs.(diagm(dv)) + abs.(diagm(ev, isupper?1:-1)) - @test Array(real(T)) == real(diagm(dv)) + real(diagm(ev, isupper?1:-1)) - @test Array(imag(T)) == imag(diagm(dv)) + imag(diagm(ev, isupper?1:-1)) + @test Array(abs.(T)) == abs.(diagm(dv)) + abs.(diagm(ev, isupper ? 1 : -1)) + @test Array(real(T)) == real(diagm(dv)) + real(diagm(ev, isupper ? 1 : -1)) + @test Array(imag(T)) == imag(diagm(dv)) + imag(diagm(ev, isupper ? 1 : -1)) end z = zeros(elty, n)