diff options
author | shyouhei <shyouhei@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2007-08-21 23:27:29 +0000 |
---|---|---|
committer | shyouhei <shyouhei@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2007-08-21 23:27:29 +0000 |
commit | f281362a1ab12a08fb7c145d8a8a3902e108bede (patch) | |
tree | c3743188a6a880dc769f6b4a28e4b0616d44b809 | |
parent | 4da4302e056072975dd010ba2f3789ecbfb3db16 (diff) |
* marshal.c (w_extended): erroneous check condition when dump
method is defined. [ruby-core:10646]
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8_6@13132 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r-- | ChangeLog | 5 | ||||
-rw-r--r-- | marshal.c | 6 | ||||
-rw-r--r-- | version.h | 8 |
3 files changed, 12 insertions, 7 deletions
@@ -1,3 +1,8 @@ +Wed Aug 22 08:26:33 2007 Yukihiro Matsumoto <matz@ruby-lang.org> + + * marshal.c (w_extended): erroneous check condition when dump + method is defined. [ruby-core:10646] + Mon Jun 18 11:29:49 2007 Nobuyoshi Nakada <nobu@ruby-lang.org> * intern.h, ext/thread/thread.c: moved prototype of rb_thread_status() @@ -373,8 +373,8 @@ w_extended(klass, arg, check) { char *path; - if (FL_TEST(klass, FL_SINGLETON)) { - if (check && RCLASS(klass)->m_tbl->num_entries || + if (check && FL_TEST(klass, FL_SINGLETON)) { + if (RCLASS(klass)->m_tbl->num_entries || (RCLASS(klass)->iv_tbl && RCLASS(klass)->iv_tbl->num_entries > 1)) { rb_raise(rb_eTypeError, "singleton can't be dumped"); } @@ -652,13 +652,13 @@ w_object(obj, arg, limit) { VALUE v; - w_class(TYPE_DATA, obj, arg, Qtrue); if (!rb_respond_to(obj, s_dump_data)) { rb_raise(rb_eTypeError, "no marshal_dump is defined for class %s", rb_obj_classname(obj)); } v = rb_funcall(obj, s_dump_data, 0); + w_class(TYPE_DATA, obj, arg, Qtrue); w_object(v, arg, limit); } break; @@ -1,15 +1,15 @@ #define RUBY_VERSION "1.8.6" -#define RUBY_RELEASE_DATE "2008-08-16" +#define RUBY_RELEASE_DATE "2007-08-22" #define RUBY_VERSION_CODE 186 -#define RUBY_RELEASE_CODE 20070816 -#define RUBY_PATCHLEVEL 40 +#define RUBY_RELEASE_CODE 20070822 +#define RUBY_PATCHLEVEL 41 #define RUBY_VERSION_MAJOR 1 #define RUBY_VERSION_MINOR 8 #define RUBY_VERSION_TEENY 6 #define RUBY_RELEASE_YEAR 2007 #define RUBY_RELEASE_MONTH 8 -#define RUBY_RELEASE_DAY 16 +#define RUBY_RELEASE_DAY 22 #ifdef RUBY_EXTERN RUBY_EXTERN const char ruby_version[]; |