1berry/ruby
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

marshal.c: private methods

Browse Source 
* marshal.c (w_object, r_object0): call private marshal methods.
  [Feature #6539]


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@38118 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
nobu 2012-12-01 10:01:40 +00:00
parent 4090ec1017
commit 4f0c9b2bc6
2 changed files with 20 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog
View File

@ -1,3 +1,8 @@
Sat Dec 1 19:01:36 2012 Nobuyoshi Nakada <nobu@ruby-lang.org>
* marshal.c (w_object, r_object0): call private marshal methods.
[Feature #6539]
Sat Dec 1 18:52:22 2012 Eric Hodel <drbrain@segment7.net> Sat Dec 1 18:52:22 2012 Eric Hodel <drbrain@segment7.net>
* lib/rubygems/commands/cleanup_command.rb: Fix cleanup command for * lib/rubygems/commands/cleanup_command.rb: Fix cleanup command for

27
marshal.c
View File

@ -644,12 +644,12 @@ w_object(VALUE obj, struct dump_arg *arg, int limit)
else { else {
arg->infection |= (int)FL_TEST(obj, MARSHAL_INFECTION); arg->infection |= (int)FL_TEST(obj, MARSHAL_INFECTION);
if (rb_respond_to(obj, s_mdump)) { if (rb_obj_respond_to(obj, s_mdump, TRUE)) {
volatile VALUE v; volatile VALUE v;
st_add_direct(arg->data, obj, arg->data->num_entries); st_add_direct(arg->data, obj, arg->data->num_entries);
v = rb_funcall(obj, s_mdump, 0, 0); v = rb_funcall2(obj, s_mdump, 0, 0);
check_dump_arg(arg, s_mdump); check_dump_arg(arg, s_mdump);
hasiv = has_ivars(obj, ivtbl); hasiv = has_ivars(obj, ivtbl);
if (hasiv) w_byte(TYPE_IVAR, arg); if (hasiv) w_byte(TYPE_IVAR, arg);
@ -658,12 +658,13 @@ w_object(VALUE obj, struct dump_arg *arg, int limit)
if (hasiv) w_ivar(obj, ivtbl, &c_arg); if (hasiv) w_ivar(obj, ivtbl, &c_arg);
return; return;
} }
if (rb_respond_to(obj, s_dump)) { if (rb_obj_respond_to(obj, s_dump, TRUE)) {
VALUE v; VALUE v;
st_table *ivtbl2 = 0; st_table *ivtbl2 = 0;
int hasiv2; int hasiv2;
v = rb_funcall(obj, s_dump, 1, INT2NUM(limit)); v = INT2NUM(limit);
v = rb_funcall2(obj, s_dump, 1, &v);
check_dump_arg(arg, s_dump); check_dump_arg(arg, s_dump);
if (!RB_TYPE_P(v, T_STRING)) { if (!RB_TYPE_P(v, T_STRING)) {
rb_raise(rb_eTypeError, "_dump() must return string"); rb_raise(rb_eTypeError, "_dump() must return string");
@ -831,12 +832,12 @@ w_object(VALUE obj, struct dump_arg *arg, int limit)
{ {
VALUE v; VALUE v;
if (!rb_respond_to(obj, s_dump_data)) { if (!rb_obj_respond_to(obj, s_dump_data, TRUE)) {
rb_raise(rb_eTypeError, rb_raise(rb_eTypeError,
"no _dump_data is defined for class %s", "no _dump_data is defined for class %s",
rb_obj_classname(obj)); rb_obj_classname(obj));
} }
v = rb_funcall(obj, s_dump_data, 0); v = rb_funcall2(obj, s_dump_data, 0, 0);
check_dump_arg(arg, s_dump_data); check_dump_arg(arg, s_dump_data);
w_class(TYPE_DATA, obj, arg, TRUE); w_class(TYPE_DATA, obj, arg, TRUE);
w_object(v, arg, limit); w_object(v, arg, limit);
@ -1716,7 +1717,7 @@ r_object0(struct load_arg *arg, int *ivp, VALUE extmod)
VALUE klass = path2class(r_unique(arg)); VALUE klass = path2class(r_unique(arg));
VALUE data; VALUE data;
if (!rb_respond_to(klass, s_load)) { if (!rb_obj_respond_to(klass, s_load, TRUE)) {
rb_raise(rb_eTypeError, "class %s needs to have method `_load'", rb_raise(rb_eTypeError, "class %s needs to have method `_load'",
rb_class2name(klass)); rb_class2name(klass));
} }
@ -1725,7 +1726,7 @@ r_object0(struct load_arg *arg, int *ivp, VALUE extmod)
r_ivar(data, NULL, arg); r_ivar(data, NULL, arg);
*ivp = FALSE; *ivp = FALSE;
} }
v = rb_funcall(klass, s_load, 1, data); v = rb_funcall2(klass, s_load, 1, &data);
check_load_arg(arg, s_load); check_load_arg(arg, s_load);
v = r_entry(v, arg); v = r_entry(v, arg);
v = r_leave(v, arg); v = r_leave(v, arg);
@ -1743,13 +1744,13 @@ r_object0(struct load_arg *arg, int *ivp, VALUE extmod)
/* for the case marshal_load is overridden */ /* for the case marshal_load is overridden */
append_extmod(v, extmod); append_extmod(v, extmod);
} }
if (!rb_respond_to(v, s_mload)) { if (!rb_obj_respond_to(v, s_mload, TRUE)) {
rb_raise(rb_eTypeError, "instance of %s needs to have method `marshal_load'", rb_raise(rb_eTypeError, "instance of %s needs to have method `marshal_load'",
rb_class2name(klass)); rb_class2name(klass));
} }
v = r_entry(v, arg); v = r_entry(v, arg);
data = r_object(arg); data = r_object(arg);
rb_funcall(v, s_mload, 1, data); rb_funcall2(v, s_mload, 1, &data);
check_load_arg(arg, s_mload); check_load_arg(arg, s_mload);
v = r_leave(v, arg); v = r_leave(v, arg);
if (!NIL_P(extmod)) { if (!NIL_P(extmod)) {
@ -1776,18 +1777,20 @@ r_object0(struct load_arg *arg, int *ivp, VALUE extmod)
{ {
VALUE klass = path2class(r_unique(arg)); VALUE klass = path2class(r_unique(arg));
VALUE oldclass = 0; VALUE oldclass = 0;
VALUE r;
v = obj_alloc_by_klass(klass, arg, &oldclass); v = obj_alloc_by_klass(klass, arg, &oldclass);
if (!RB_TYPE_P(v, T_DATA)) { if (!RB_TYPE_P(v, T_DATA)) {
rb_raise(rb_eArgError, "dump format error"); rb_raise(rb_eArgError, "dump format error");
} }
v = r_entry(v, arg); v = r_entry(v, arg);
if (!rb_respond_to(v, s_load_data)) { if (!rb_obj_respond_to(v, s_load_data, TRUE)) {
rb_raise(rb_eTypeError, rb_raise(rb_eTypeError,
"class %s needs to have instance method `_load_data'", "class %s needs to have instance method `_load_data'",
rb_class2name(klass)); rb_class2name(klass));
} }
rb_funcall(v, s_load_data, 1, r_object0(arg, 0, extmod)); r = r_object0(arg, 0, extmod);
rb_funcall2(v, s_load_data, 1, &r);
check_load_arg(arg, s_load_data); check_load_arg(arg, s_load_data);
v = r_leave(v, arg); v = r_leave(v, arg);
} }