summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authornobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2006-07-24 13:04:39 +0000
committernobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2006-07-24 13:04:39 +0000
commitc3b44b0a3b3fcdc04e85b47f704d318d96c74928 (patch)
tree9953b53b5759772428deaf5d685e16185abdcc1a
parent641d9318c61920344c0857ed39e4ffca6dcd9c00 (diff)
downloadruby-c3b44b0a3b3fcdc04e85b47f704d318d96c74928.tar.gz
ruby-c3b44b0a3b3fcdc04e85b47f704d318d96c74928.tar.xz
ruby-c3b44b0a3b3fcdc04e85b47f704d318d96c74928.zip
* eval.c (backtrace): skip frames successive on node and method name.
git-svn-id: http://svn.ruby-lang.org/repos/ruby/trunk@10593 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog4
-rw-r--r--eval.c4
2 files changed, 7 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 0d0f10d7a..f4bd53840 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -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 15:19:55 2006 Yukihiro Matsumoto <matz@ruby-lang.org>
* eval.c (rb_call0): revert last change. [ruby-dev:29112]
diff --git a/eval.c b/eval.c
index 4bef97c7b..d2f8d7823 100644
--- a/eval.c
+++ b/eval.c
@@ -6161,7 +6161,9 @@ backtrace(int lev)
}
for (; frame && (n = frame->node); frame = frame->prev) {
if (frame->prev && frame->prev->this_func) {
- if (frame->prev->node == n) continue;
+ if (frame->prev->node == n) {
+ if (frame->prev->last_func == frame->last_func) continue;
+ }
str = error_line(frame->prev, n);
}
else {