Update inlining message, and fix poplinenum.

JuliaLang · Aug 27, 2015 · 013f906 · 013f906
1 parent eb867a9
commit 013f906
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/base/cartesian.jl b/base/cartesian.jl
@@ -224,6 +224,8 @@ function poplinenum(ex::Expr)
             return ex.args[1]
         elseif length(ex.args) == 2 && isa(ex.args[1], LineNumberNode)
             return ex.args[2]
+        elseif (length(ex.args) == 2 && isa(ex.args[1], Expr) && ex.args[1].head == :line)
+            return ex.args[2]
         end
     end
     ex

diff --git a/base/replutil.jl b/base/replutil.jl
@@ -345,7 +345,7 @@ function show_trace_entry(io, fname, file, line, inlinedfile, inlinedline, n)
 
     if (inlinedfile != symbol(""))
         print(io, " at ", inlinedfile, ":", inlinedline)
-        print(io, " \n    [ thrown by inlined function defined at ]\n    ")
+        print(io, " \n    by code inlined from:   \n")
     else
         print(io, " at ")
     end