summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorshyouhei <shyouhei@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2007-06-07 08:27:00 +0000
committershyouhei <shyouhei@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2007-06-07 08:27:00 +0000
commitb014aae8ce4c4b756275dd4becfcf21394476759 (patch)
treec677d53499a5ffa3aee214a365a55e984a004f71
parent01a8933f4ae7bfb18b27b4c69e3fa637d35904ea (diff)
downloadruby-b014aae8ce4c4b756275dd4becfcf21394476759.tar.gz
ruby-b014aae8ce4c4b756275dd4becfcf21394476759.tar.xz
ruby-b014aae8ce4c4b756275dd4becfcf21394476759.zip
* eval.c (method_inspect): show proper class name.
[ruby-talk:248647], Thanks Calamitas. git-svn-id: http://svn.ruby-lang.org/repos/ruby/branches/ruby_1_8_6@12459 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog5
-rw-r--r--eval.c6
-rw-r--r--version.h8
3 files changed, 14 insertions, 5 deletions
diff --git a/ChangeLog b/ChangeLog
index 49d9c4d14..85061fbdc 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Thu Jun 7 14:53:46 2007 URABE Shyouhei <shyouhei@ruby-lang.org>
+
+ * eval.c (method_inspect): show proper class name.
+ [ruby-talk:248647], Thanks Calamitas.
+
Sun May 27 05:24:56 2007 URABE Shyouhei <shyouhei@ruby-lang.org>
* runruby.rb: eliminate uninitialized variable.
diff --git a/eval.c b/eval.c
index 3c49ca082..e4f3330d9 100644
--- a/eval.c
+++ b/eval.c
@@ -9451,8 +9451,12 @@ method_inspect(method)
else {
rb_str_buf_cat2(str, rb_class2name(data->rklass));
if (data->rklass != data->klass) {
+ VALUE klass = data -> klass;
+ if (TYPE(klass) == T_ICLASS) {
+ klass = RBASIC(klass)->klass;
+ }
rb_str_buf_cat2(str, "(");
- rb_str_buf_cat2(str, rb_class2name(data->klass));
+ rb_str_buf_cat2(str, rb_class2name(klass));
rb_str_buf_cat2(str, ")");
}
}
diff --git a/version.h b/version.h
index 6946acca4..a25e60528 100644
--- a/version.h
+++ b/version.h
@@ -1,15 +1,15 @@
#define RUBY_VERSION "1.8.6"
#define RUBY_RELEASE_DATE "2007-05-23"
#define RUBY_VERSION_CODE 186
-#define RUBY_RELEASE_CODE 20070527
-#define RUBY_PATCHLEVEL 29
+#define RUBY_RELEASE_CODE 20070607
+#define RUBY_PATCHLEVEL 30
#define RUBY_VERSION_MAJOR 1
#define RUBY_VERSION_MINOR 8
#define RUBY_VERSION_TEENY 6
#define RUBY_RELEASE_YEAR 2007
-#define RUBY_RELEASE_MONTH 5
-#define RUBY_RELEASE_DAY 27
+#define RUBY_RELEASE_MONTH 6
+#define RUBY_RELEASE_DAY 07
#ifdef RUBY_EXTERN
RUBY_EXTERN const char ruby_version[];