Skip to content

M
mruby
Commit cff4ac6b authored by Yukihiro "Matz" Matsumoto's avatar Yukihiro "Matz" Matsumoto
Browse files
Options

skip "trace:" header if no backtrace line exists

parent 1cdf2838
Hide whitespace changes
Inline Side-by-side
Showing with 5 additions and 2 deletions
src/backtrace.c
View file @ cff4ac6b
...@@ -62,9 +62,8 @@ mrb_output_backtrace(mrb_state *mrb, struct RObject *exc, output_stream_func fun ...@@ -62,9 +62,8 @@ mrb_output_backtrace(mrb_state *mrb, struct RObject *exc, output_stream_func fun
mrb_callinfo *ci; mrb_callinfo *ci;
mrb_int ciidx; mrb_int ciidx;
const char *filename, *method, *sep; const char *filename, *method, *sep;
int i, lineno; int i, lineno, tracehead = 1;
func(mrb, stream, 1, "trace:\n");
ciidx = mrb_fixnum(mrb_obj_iv_get(mrb, exc, mrb_intern_lit(mrb, "ciidx"))); ciidx = mrb_fixnum(mrb_obj_iv_get(mrb, exc, mrb_intern_lit(mrb, "ciidx")));
if (ciidx >= mrb->c->ciend - mrb->c->cibase) if (ciidx >= mrb->c->ciend - mrb->c->cibase)
ciidx = 10; /* ciidx is broken... */ ciidx = 10; /* ciidx is broken... */
...@@ -103,6 +102,10 @@ mrb_output_backtrace(mrb_state *mrb, struct RObject *exc, output_stream_func fun ...@@ -103,6 +102,10 @@ mrb_output_backtrace(mrb_state *mrb, struct RObject *exc, output_stream_func fun
filename = "(unknown)"; filename = "(unknown)";
} }
if (tracehead) {
func(mrb, stream, 1, "trace:\n");
tracehead = 0;
}
method = mrb_sym2name(mrb, ci->mid); method = mrb_sym2name(mrb, ci->mid);
if (method) { if (method) {
const char *cn = mrb_class_name(mrb, ci->proc->target_class); const char *cn = mrb_class_name(mrb, ci->proc->target_class);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment