update message for DomainError

Sacha0 · Sep 18, 2013 · dfea709 · dfea709
1 parent fb18349
commit dfea709
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 14 deletions.
diff --git a/base/repl.jl b/base/repl.jl
@@ -70,20 +70,19 @@ function showerror(io::IO, e::LoadError, bt)
 end
 
 function showerror(io::IO, e::DomainError, bt)
- try
- print(io, "DomainError")
- for b in bt
- code = ccall(:jl_lookup_code_address, Any, (Ptr{Void}, Int32), b, 0)
- if length(code) == 3
- if code[1] in (:log, :log2, :log10, :sqrt) # TODO add :besselj, :besseli, :bessely, :besselk
- print(io, "\n ", code[1]," will only return complex result if called width a complex argument. Eg: ", code[1], "(complex(x))")
- end
- break
+ print(io, "DomainError")
+ for b in bt
+ code = ccall(:jl_lookup_code_address, Any, (Ptr{Void}, Int32), b, 0)
+ if length(code) == 3
+ if code[1] in (:log, :log2, :log10, :sqrt) # TODO add :besselj, :besseli, :bessely, :besselk
+ print(io, "\n", code[1],
+ " will only return a complex result if called width a complex argument.",
+ "\ntry ", code[1], "(complex(x))")
  end
+ break
  end
- finally
- show_backtrace(io, bt)
  end
+ show_backtrace(io, bt)
 end
 
 showerror(io::IO, e::SystemError) = print(io, "$(e.prefix): $(strerror(e.errnum))")

diff --git a/doc/stdlib/base.rst b/doc/stdlib/base.rst
@@ -2345,7 +2345,7 @@ Mathematical Functions
 
 .. function:: log(x)
 
- Compute the natural logarithm of ``x``. Throws ``DomainError`` for negative ``Real`` arguments. Use ``Complex`` negative arguments instead.
+ Compute the natural logarithm of ``x``. Throws ``DomainError`` for negative ``Real`` arguments. Use complex negative arguments instead.
 
 .. function:: log2(x)
 
@@ -2357,7 +2357,7 @@ Mathematical Functions
 
 .. function:: log1p(x)
 
- Accurate natural logarithm of ``1+x``. Throws ``DomainError`` for negative ``Real`` arguments.
+ Accurate natural logarithm of ``1+x``. Throws ``DomainError`` for ``Real`` arguments less than -1.
 
 .. function:: frexp(val, exp)
 
@@ -2463,7 +2463,7 @@ Mathematical Functions
 
 .. function:: sqrt(x)
 
- Return :math:`\sqrt{x}`. Throws ``DomainError`` for negative ``Real`` arguments. Use ``Complex`` negative arguments instead.
+ Return :math:`\sqrt{x}`. Throws ``DomainError`` for negative ``Real`` arguments. Use complex negative arguments instead.
 
 .. function:: isqrt(x)