From 8c217096f4f23409f3486c3775cd75ec9bd0e2ed Mon Sep 17 00:00:00 2001 From: nobu Date: Mon, 24 Jul 2006 13:04:39 +0000 Subject: * eval.c (backtrace): skip frames successive on node and method name. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8@10593 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 4 ++++ eval.c | 5 +++-- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 788daa8429..ec7df7991c 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +Mon Jul 24 22:03:40 2006 Nobuyoshi Nakada + + * eval.c (backtrace): skip frames successive on node and method name. + Mon Jul 24 17:55:55 2006 Yukihiro Matsumoto * process.c (rb_f_system): add security check. [ruby-talk:202947] diff --git a/eval.c b/eval.c index ad06a37b12..56c96954ac 100644 --- a/eval.c +++ b/eval.c @@ -5848,7 +5848,6 @@ rb_call0(klass, recv, id, oid, argc, argv, body, flags) NODE *saved_cref = 0; PUSH_SCOPE(); - ruby_current_node = body; if (body->nd_rval) { saved_cref = ruby_cref; ruby_cref = (NODE*)body->nd_rval; @@ -6254,7 +6253,9 @@ backtrace(lev) } for (; frame && (n = frame->node); frame = frame->prev) { if (frame->prev && frame->prev->last_func) { - if (frame->prev->node == n) continue; + if (frame->prev->node == n) { + if (frame->prev->last_func == frame->last_func) continue; + } snprintf(buf, BUFSIZ, "%s:%d:in `%s'", n->nd_file, nd_line(n), rb_id2name(frame->prev->last_func)); -- cgit v1.2.3