diff options
| author | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2006-07-24 13:04:39 +0000 |
|---|---|---|
| committer | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2006-07-24 13:04:39 +0000 |
| commit | 2d8020ec75c7263768a2b9cd53d534e5e9f0b665 (patch) | |
| tree | 9578778396f76400d9f7b80389fc8190a34d6035 | |
| parent | 65dc6d04dcf5e8c2bc48ae1594309d16f0493517 (diff) | |
| download | ruby-2d8020ec75c7263768a2b9cd53d534e5e9f0b665.tar.gz ruby-2d8020ec75c7263768a2b9cd53d534e5e9f0b665.tar.xz ruby-2d8020ec75c7263768a2b9cd53d534e5e9f0b665.zip | |
* eval.c (backtrace): skip frames successive on node and method name.
git-svn-id: http://svn.ruby-lang.org/repos/ruby/branches/ruby_1_8@10593 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
| -rw-r--r-- | ChangeLog | 4 | ||||
| -rw-r--r-- | eval.c | 5 |
2 files changed, 7 insertions, 2 deletions
@@ -1,3 +1,7 @@ +Mon Jul 24 22:03:40 2006 Nobuyoshi Nakada <nobu@ruby-lang.org> + + * eval.c (backtrace): skip frames successive on node and method name. + Mon Jul 24 17:55:55 2006 Yukihiro Matsumoto <matz@ruby-lang.org> * process.c (rb_f_system): add security check. [ruby-talk:202947] @@ -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)); |