summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authormatz <matz@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2005-12-07 15:46:49 +0000
committermatz <matz@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2005-12-07 15:46:49 +0000
commit46776488011cef4320aa8c3d6d35594643726c94 (patch)
tree65da473267d0aa993e237539debfb0094d641ee7
parentbef0d03b4796b78cc2b1b28c680d528d8e9cda21 (diff)
* eval.c (call_trace_func): klass parameter should be a
class/module that defines calling method. [ruby-talk:169307] git-svn-id: http://svn.ruby-lang.org/repos/ruby/branches/ruby_1_8@9656 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog5
-rw-r--r--eval.c2
2 files changed, 6 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 6db067174..c59803f1f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Thu Dec 8 00:40:52 2005 Yukihiro Matsumoto <matz@ruby-lang.org>
+
+ * eval.c (call_trace_func): klass parameter should be a
+ class/module that defines calling method. [ruby-talk:169307]
+
Wed Dec 7 17:10:27 2005 Kazuhiro NISHIYAMA <zn@mbf.nifty.com>
* sprintf.c (rb_f_sprintf): [ruby-dev:27967]
diff --git a/eval.c b/eval.c
index 746531419..ceb95e4d2 100644
--- a/eval.c
+++ b/eval.c
@@ -2628,7 +2628,7 @@ call_trace_func(event, node, self, id, klass)
klass = RBASIC(klass)->klass;
}
else if (FL_TEST(klass, FL_SINGLETON)) {
- klass = self;
+ klass = rb_iv_get(klass, "__attached__");
}
}
PUSH_TAG(PROT_NONE);