From ccc3de2cacd903d28c9ddbc34ffa2c2ef7fcc00d Mon Sep 17 00:00:00 2001 From: Andrew Keller Date: Mon, 21 Mar 2016 21:46:38 -0700 Subject: [PATCH] Revert unnecessary changes to complex.jl --- base/complex.jl | 14 +++----------- 1 file changed, 3 insertions(+), 11 deletions(-) diff --git a/base/complex.jl b/base/complex.jl index 2375f77691475..afa246b6a04a2 100644 --- a/base/complex.jl +++ b/base/complex.jl @@ -62,29 +62,21 @@ complex(z::Complex) = z flipsign(x::Complex, y::Real) = ifelse(signbit(y), -x, x) function show(io::IO, z::Complex) - if unitless(z) != z - print(io, "(") - end - r, i = reim(unitless(z)) + r, i = reim(z) compact = limit_output(io) - Base.showcompact_lim(io, r) + showcompact_lim(io, r) if signbit(i) && !isnan(i) i = -i print(io, compact ? "-" : " - ") else print(io, compact ? "+" : " + ") end - Base.showcompact_lim(io, i) + showcompact_lim(io, i) if !(isa(i,Integer) && !isa(i,Bool) || isa(i,AbstractFloat) && isfinite(i)) print(io, "*") end print(io, "im") - if unitless(z) != z - print(io, ") ") - print(io, unit(z)) - end end - show(io::IO, z::Complex{Bool}) = print(io, z == im ? "im" : "Complex($(z.re),$(z.im))")