Skip to content

Commit

Permalink
fix replutil test on llvm3.3
Browse files Browse the repository at this point in the history
  • Loading branch information
vtjnash committed Feb 12, 2016
1 parent 48ea28a commit 140d004
Showing 1 changed file with 3 additions and 1 deletion.
4 changes: 3 additions & 1 deletion base/replutil.jl
Original file line number Diff line number Diff line change
Expand Up @@ -126,7 +126,9 @@ function showerror(io::IO, ex::DomainError, bt; backtrace=true)
print(io,"\n$(code.func) will only return a complex result if called with a complex argument. Try $(string(code.func))(complex(x)).")
elseif (code.func == :^ && code.file == symbol("intfuncs.jl")) || code.func == :power_by_squaring #3024
print(io, "\nCannot raise an integer x to a negative power -n. \nMake x a float by adding a zero decimal (e.g. 2.0^-n instead of 2^-n), or write 1/x^n, float(x)^-n, or (x//1)^-n.")
elseif code.func == :^ && (code.file == symbol(joinpath(".","promotion.jl")) || code.file == symbol(joinpath(".","math.jl")))
elseif code.func == :^ &&
(code.file == symbol("promotion.jl") || code.file == symbol("math.jl") ||
code.file == symbol(joinpath(".","promotion.jl")) || code.file == symbol(joinpath(".","math.jl")))
print(io, "\nExponentiation yielding a complex result requires a complex argument.\nReplace x^y with (x+0im)^y, Complex(x)^y, or similar.")
end
break
Expand Down

0 comments on commit 140d004

Please sign in to comment.