kotovalexarian-likes-github/ruby--ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2022-11-09 12:17:21 -05:00
Code Releases Activity

* marshal.c (w_object, marshal_dump, r_object0, marshal_load): search

Browse source 
private methods too.  [ruby-dev:34671]

* object.c (convert_type): ditto.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8@16654 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
nobu 2008-05-28 03:52:44 +00:00
parent 2321ea3d7b
commit c7454c6335
3 changed files with 22 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

7
ChangeLog
View file

@ -1,3 +1,10 @@
Wed May 28 12:52:41 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
* marshal.c (w_object, marshal_dump, r_object0, marshal_load): search
private methods too. [ruby-dev:34671]
* object.c (convert_type): ditto.
Tue May 27 20:19:22 2008 Akinori MUSHA <knu@iDaemons.org> Tue May 27 20:19:22 2008 Akinori MUSHA <knu@iDaemons.org>
* array.c (rb_ary_slice_bang): Return an empty array instead of * array.c (rb_ary_slice_bang): Return an empty array instead of

27
marshal.c
View file

@ -511,7 +511,7 @@ w_object(obj, arg, limit)
if (OBJ_TAINTED(obj)) arg->taint = Qtrue; if (OBJ_TAINTED(obj)) arg->taint = Qtrue;
st_add_direct(arg->data, obj, arg->data->num_entries); st_add_direct(arg->data, obj, arg->data->num_entries);
if (rb_respond_to(obj, s_mdump)) { if (rb_obj_respond_to(obj, s_mdump, Qtrue)) {
volatile VALUE v; volatile VALUE v;
v = rb_funcall(obj, s_mdump, 0, 0); v = rb_funcall(obj, s_mdump, 0, 0);
@ -521,7 +521,7 @@ w_object(obj, arg, limit)
if (ivtbl) w_ivar(0, &c_arg); if (ivtbl) w_ivar(0, &c_arg);
return; return;
} }
if (rb_respond_to(obj, s_dump)) { if (rb_obj_respond_to(obj, s_dump, Qtrue)) {
VALUE v; VALUE v;
v = rb_funcall(obj, s_dump, 1, INT2NUM(limit)); v = rb_funcall(obj, s_dump, 1, INT2NUM(limit));
@ -664,7 +664,7 @@ w_object(obj, arg, limit)
{ {
VALUE v; VALUE v;
if (!rb_respond_to(obj, s_dump_data)) { if (!rb_obj_respond_to(obj, s_dump_data, Qtrue)) {
rb_raise(rb_eTypeError, rb_raise(rb_eTypeError,
"no marshal_dump is defined for class %s", "no marshal_dump is defined for class %s",
rb_obj_classname(obj)); rb_obj_classname(obj));
@ -765,12 +765,12 @@ marshal_dump(argc, argv)
arg.str = rb_str_buf_new(0); arg.str = rb_str_buf_new(0);
RBASIC(arg.str)->klass = 0; RBASIC(arg.str)->klass = 0;
if (!NIL_P(port)) { if (!NIL_P(port)) {
if (!rb_respond_to(port, s_write)) { if (!rb_obj_respond_to(port, s_write, Qtrue)) {
type_error: type_error:
rb_raise(rb_eTypeError, "instance of IO needed"); rb_raise(rb_eTypeError, "instance of IO needed");
} }
arg.dest = port; arg.dest = port;
if (rb_respond_to(port, s_binmode)) { if (rb_obj_respond_to(port, s_binmode, Qtrue)) {
rb_funcall2(port, s_binmode, 0, 0); rb_funcall2(port, s_binmode, 0, 0);
reentrant_check(arg.str, s_dump_data); reentrant_check(arg.str, s_dump_data);
} }
@ -1245,7 +1245,7 @@ r_object0(arg, proc, ivp, 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, Qtrue)) {
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));
} }
@ -1272,7 +1272,7 @@ r_object0(arg, proc, ivp, extmod)
rb_extend_object(v, m); rb_extend_object(v, m);
} }
} }
if (!rb_respond_to(v, s_mload)) { if (!rb_obj_respond_to(v, s_mload, Qtrue)) {
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));
} }
@ -1299,7 +1299,7 @@ r_object0(arg, proc, ivp, extmod)
case TYPE_DATA: case TYPE_DATA:
{ {
VALUE klass = path2class(r_unique(arg)); VALUE klass = path2class(r_unique(arg));
if (rb_respond_to(klass, s_alloc)) { if (rb_obj_respond_to(klass, s_alloc, Qtrue)) {
static int warn = Qtrue; static int warn = Qtrue;
if (warn) { if (warn) {
rb_warn("define `allocate' instead of `_alloc'"); rb_warn("define `allocate' instead of `_alloc'");
@ -1315,7 +1315,7 @@ r_object0(arg, proc, ivp, extmod)
rb_raise(rb_eArgError, "dump format error"); rb_raise(rb_eArgError, "dump format error");
} }
r_entry(v, arg); r_entry(v, arg);
if (!rb_respond_to(v, s_load_data)) { if (!rb_obj_respond_to(v, s_load_data, Qtrue)) {
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));
@ -1415,12 +1415,13 @@ marshal_load(argc, argv)
struct load_arg arg; struct load_arg arg;
rb_scan_args(argc, argv, "11", &port, &proc); rb_scan_args(argc, argv, "11", &port, &proc);
if (rb_respond_to(port, rb_intern("to_str"))) { v = rb_check_string_type(port);
if (!NIL_P(v)) {
arg.taint = OBJ_TAINTED(port); /* original taintedness */ arg.taint = OBJ_TAINTED(port); /* original taintedness */
StringValue(port); /* possible conversion */ port = v;
} }
else if (rb_respond_to(port, s_getc) && rb_respond_to(port, s_read)) { else if (rb_obj_respond_to(port, s_getc, Qtrue) && rb_obj_respond_to(port, s_read, Qtrue)) {
if (rb_respond_to(port, s_binmode)) { if (rb_obj_respond_to(port, s_binmode, Qtrue)) {
rb_funcall2(port, s_binmode, 0, 0); rb_funcall2(port, s_binmode, 0, 0);
} }
arg.taint = Qtrue; arg.taint = Qtrue;

2
object.c
View file

@ -2193,7 +2193,7 @@ convert_type(val, tname, method, raise)
ID m; ID m;
m = rb_intern(method); m = rb_intern(method);
if (!rb_respond_to(val, m)) { if (!rb_obj_respond_to(val, m, Qtrue)) {
if (raise) { if (raise) {
rb_raise(rb_eTypeError, "can't convert %s into %s", rb_raise(rb_eTypeError, "can't convert %s into %s",
NIL_P(val) ? "nil" : NIL_P(val) ? "nil" :