diff --git a/base/exports.jl b/base/exports.jl index 2606a4ae9bf85..79f69ce9fb465 100644 --- a/base/exports.jl +++ b/base/exports.jl @@ -216,7 +216,6 @@ export .-, .*, ./, - ++, .<, .<=, .≤, diff --git a/base/operators.jl b/base/operators.jl index 9ceb4fc619c48..a99f2df8d81ac 100644 --- a/base/operators.jl +++ b/base/operators.jl @@ -424,7 +424,7 @@ getindex(p::Pair,i::Real) = getfield(p, convert(Int, i)) reverse(p::Pair) = Pair(p.second, p.first) # some operators not defined yet -global //, >:, <|, hcat, hvcat, ++, ⋅, ×, ∈, ∉, ∋, ∌, ⊆, ⊈, ⊊, ∩, ∪, √, ∛ +global //, >:, <|, hcat, hvcat, ⋅, ×, ∈, ∉, ∋, ∌, ⊆, ⊈, ⊊, ∩, ∪, √, ∛ this_module = current_module() baremodule Operators @@ -446,7 +446,6 @@ export .-, .*, ./, - ++, .<, .<=, .==, @@ -504,7 +503,7 @@ export ctranspose, call -import ..this_module: !, !=, $, %, .%, &, *, +, -, .!=, .+, .-, .*, ./, ++, .<, .<=, .==, .>, +import ..this_module: !, !=, $, %, .%, &, *, +, -, .!=, .+, .-, .*, ./, .<, .<=, .==, .>, .>=, .\, .^, /, //, <, <:, <<, <=, ==, >, >=, >>, .>>, .<<, >>>, <|, |>, \, ^, |, ~, !==, ===, >:, colon, hcat, vcat, hvcat, getindex, setindex!, transpose, ctranspose, call, diff --git a/base/show.jl b/base/show.jl index 29186081f3bf6..17148c799061f 100644 --- a/base/show.jl +++ b/base/show.jl @@ -513,7 +513,7 @@ function show_unquoted(io::IO, ex::Expr, indent::Int, prec::Int) # unary operator (i.e. "!z") elseif isa(func,Symbol) && func in uni_ops && length(func_args) == 1 show_unquoted(io, func, indent) - #for safety, always wrap a call on an operator in parens + #always wrap a call on an operator in parens arg_is_op = func_args[1] in union(uni_ops, expr_infix_any) if arg_is_op || isa(func_args[1], Expr) show_enclosed_list(io, '(', func_args, ",", ')', indent, func_prec) diff --git a/base/string.jl b/base/string.jl index 76753ece65ea7..1542296b8280d 100644 --- a/base/string.jl +++ b/base/string.jl @@ -78,7 +78,6 @@ sizeof(s::AbstractString) = error("type $(typeof(s)) has no canonical binary rep eltype{T<:AbstractString}(::Type{T}) = Char (*)(s1::AbstractString, ss::AbstractString...) = string(s1, ss...) -(++)(s1::AbstractString, ss::AbstractString...) = string(s1, ss...) (^)(s::AbstractString, r::Integer) = repeat(s,r) length(s::DirectIndexString) = endof(s)