summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorshyouhei <shyouhei@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2007-06-07 08:55:45 +0000
committershyouhei <shyouhei@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2007-06-07 08:55:45 +0000
commitf202608e56f5f270564ede04642068978f4cea70 (patch)
treeda04b390285fdee802f9c2e0fe0da2540602e155
parentd16617c041d3ee3003de50a12f19a2dd42b1b795 (diff)
* eval.c (method_inspect): show proper class name.
[ruby-talk:248647], Thanks Calamitas. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8_5@12461 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 6cad8b0e714..59dffcea1cb 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.
+
Mon May 28 19:37:24 2007 NAKAMURA Usaku <usa@ruby-lang.org>
* win32/win32.c (move_to_next_entry): revert r12338. not necessary
diff --git a/eval.c b/eval.c
index 5a1a7ed75e9..520eb987af1 100644
--- a/eval.c
+++ b/eval.c
@@ -9377,8 +9377,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 6feb792651c..409713292ca 100644
--- a/version.h
+++ b/version.h
@@ -1,15 +1,15 @@
#define RUBY_VERSION "1.8.5"
#define RUBY_RELEASE_DATE "2007-05-28"
#define RUBY_VERSION_CODE 185
-#define RUBY_RELEASE_CODE 20070528
-#define RUBY_PATCHLEVEL 51
+#define RUBY_RELEASE_CODE 20070607
+#define RUBY_PATCHLEVEL 52
#define RUBY_VERSION_MAJOR 1
#define RUBY_VERSION_MINOR 8
#define RUBY_VERSION_TEENY 5
#define RUBY_RELEASE_YEAR 2007
-#define RUBY_RELEASE_MONTH 5
-#define RUBY_RELEASE_DAY 28
+#define RUBY_RELEASE_MONTH 6
+#define RUBY_RELEASE_DAY 7
#ifdef RUBY_EXTERN
RUBY_EXTERN const char ruby_version[];