ruby-changes:5888
From: nobu <ko1@a...>
Date: Wed, 18 Jun 2008 12:06:33 +0900 (JST)
Subject: [ruby-changes:5888] Ruby:r17396 (ruby_1_8, trunk): * marshal.c (w_object, marshal_dump, r_object0, marshal_load): search
nobu 2008-06-18 12:05:33 +0900 (Wed, 18 Jun 2008)
New Revision: 17396
Modified files:
branches/ruby_1_8/ChangeLog
branches/ruby_1_8/lib/singleton.rb
branches/ruby_1_8/marshal.c
branches/ruby_1_8/object.c
trunk/ChangeLog
trunk/lib/singleton.rb
trunk/marshal.c
trunk/object.c
Log:
* marshal.c (w_object, marshal_dump, r_object0, marshal_load): search
public methods only. [ruby-core:17283]
* object.c (convert_type): ditto.
* lib/singleton.rb (Singleton#_dump): conversion method should be
public.
http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/branches/ruby_1_8/lib/singleton.rb?r1=17396&r2=17395&diff_format=u
http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/trunk/lib/singleton.rb?r1=17396&r2=17395&diff_format=u
http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/branches/ruby_1_8/ChangeLog?r1=17396&r2=17395&diff_format=u
http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/trunk/ChangeLog?r1=17396&r2=17395&diff_format=u
http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/trunk/marshal.c?r1=17396&r2=17395&diff_format=u
http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/trunk/object.c?r1=17396&r2=17395&diff_format=u
http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/branches/ruby_1_8/marshal.c?r1=17396&r2=17395&diff_format=u
http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/branches/ruby_1_8/object.c?r1=17396&r2=17395&diff_format=u
Index: ChangeLog
===================================================================
--- ChangeLog (revision 17395)
+++ ChangeLog (revision 17396)
@@ -1,3 +1,13 @@
+Wed Jun 18 12:05:30 2008 Nobuyoshi Nakada <nobu@r...>
+
+ * marshal.c (w_object, marshal_dump, r_object0, marshal_load): search
+ public methods only. [ruby-core:17283]
+
+ * object.c (convert_type): ditto.
+
+ * lib/singleton.rb (Singleton#_dump): conversion method should be
+ public.
+
Wed Jun 18 10:18:11 2008 Nobuyoshi Nakada <nobu@r...>
* ext/etc/etc.c (etc_passwd, etc_group): fixed rdoc. a patch from
Index: object.c
===================================================================
--- object.c (revision 17395)
+++ object.c (revision 17396)
@@ -1904,7 +1904,7 @@
ID m;
m = rb_intern(method);
- if (!rb_obj_respond_to(val, m, Qtrue)) {
+ if (!rb_respond_to(val, m)) {
if (raise) {
rb_raise(rb_eTypeError, "can't convert %s into %s",
NIL_P(val) ? "nil" :
Index: lib/singleton.rb
===================================================================
--- lib/singleton.rb (revision 17395)
+++ lib/singleton.rb (revision 17396)
@@ -71,8 +71,6 @@
raise TypeError, "can't dup instance of singleton #{self.class}"
end
- private
-
# default marshalling strategy
def _dump(depth = -1)
''
Index: marshal.c
===================================================================
--- marshal.c (revision 17395)
+++ marshal.c (revision 17396)
@@ -582,7 +582,7 @@
else {
if (OBJ_TAINTED(obj)) arg->taint = Qtrue;
- if (rb_obj_respond_to(obj, s_mdump, Qtrue)) {
+ if (rb_respond_to(obj, s_mdump)) {
volatile VALUE v;
st_add_direct(arg->data, obj, arg->data->num_entries);
@@ -594,7 +594,7 @@
if (hasiv) w_ivar(obj, 0, &c_arg);
return;
}
- if (rb_obj_respond_to(obj, s_dump, Qtrue)) {
+ if (rb_respond_to(obj, s_dump)) {
VALUE v;
st_table *ivtbl2 = 0;
int hasiv2;
@@ -759,7 +759,7 @@
{
VALUE v;
- if (!rb_obj_respond_to(obj, s_dump_data, 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));
@@ -856,13 +856,13 @@
}
arg.dest = 0;
if (!NIL_P(port)) {
- if (!rb_obj_respond_to(port, s_write, Qtrue)) {
+ if (!rb_respond_to(port, s_write)) {
type_error:
rb_raise(rb_eTypeError, "instance of IO needed");
}
arg.str = rb_str_buf_new(0);
arg.dest = port;
- if (rb_obj_respond_to(port, s_binmode, Qtrue)) {
+ if (rb_respond_to(port, s_binmode)) {
rb_funcall2(port, s_binmode, 0, 0);
}
}
@@ -1420,7 +1420,7 @@
VALUE klass = path2class(r_unique(arg));
VALUE data;
- if (!rb_obj_respond_to(klass, s_load, Qtrue)) {
+ if (!rb_respond_to(klass, s_load)) {
rb_raise(rb_eTypeError, "class %s needs to have method `_load'",
rb_class2name(klass));
}
@@ -1448,7 +1448,7 @@
rb_extend_object(v, m);
}
}
- if (!rb_obj_respond_to(v, s_mload, Qtrue)) {
+ if (!rb_respond_to(v, s_mload)) {
rb_raise(rb_eTypeError, "instance of %s needs to have method `marshal_load'",
rb_class2name(klass));
}
@@ -1475,7 +1475,7 @@
case TYPE_DATA:
{
VALUE klass = path2class(r_unique(arg));
- if (rb_obj_respond_to(klass, s_alloc, Qtrue)) {
+ if (rb_respond_to(klass, s_alloc)) {
static int warn = Qtrue;
if (warn) {
rb_warn("define `allocate' instead of `_alloc'");
@@ -1491,7 +1491,7 @@
rb_raise(rb_eArgError, "dump format error");
}
v = r_entry(v, arg);
- if (!rb_obj_respond_to(v, s_load_data, Qtrue)) {
+ if (!rb_respond_to(v, s_load_data)) {
rb_raise(rb_eTypeError,
"class %s needs to have instance method `_load_data'",
rb_class2name(klass));
@@ -1596,8 +1596,8 @@
arg.taint = OBJ_TAINTED(port); /* original taintedness */
port = v;
}
- else if (rb_obj_respond_to(port, s_getbyte, Qtrue) && rb_obj_respond_to(port, s_read, Qtrue)) {
- if (rb_obj_respond_to(port, s_binmode, Qtrue)) {
+ else if (rb_respond_to(port, s_getbyte) && rb_respond_to(port, s_read)) {
+ if (rb_respond_to(port, s_binmode)) {
rb_funcall2(port, s_binmode, 0, 0);
}
arg.taint = Qtrue;
Index: ruby_1_8/ChangeLog
===================================================================
--- ruby_1_8/ChangeLog (revision 17395)
+++ ruby_1_8/ChangeLog (revision 17396)
@@ -1,3 +1,13 @@
+Wed Jun 18 12:05:30 2008 Nobuyoshi Nakada <nobu@r...>
+
+ * marshal.c (w_object, marshal_dump, r_object0, marshal_load): search
+ public methods only. [ruby-core:17283]
+
+ * object.c (convert_type): ditto.
+
+ * lib/singleton.rb (Singleton#_dump): conversion method should be
+ public.
+
Wed Jun 18 10:18:11 2008 Nobuyoshi Nakada <nobu@r...>
* ext/etc/etc.c (etc_passwd, etc_group): fixed rdoc. a patch from
Index: ruby_1_8/object.c
===================================================================
--- ruby_1_8/object.c (revision 17395)
+++ ruby_1_8/object.c (revision 17396)
@@ -2205,7 +2205,7 @@
ID m;
m = rb_intern(method);
- if (!rb_obj_respond_to(val, m, Qtrue)) {
+ if (!rb_respond_to(val, m)) {
if (raise) {
rb_raise(rb_eTypeError, "can't convert %s into %s",
NIL_P(val) ? "nil" :
Index: ruby_1_8/lib/singleton.rb
===================================================================
--- ruby_1_8/lib/singleton.rb (revision 17395)
+++ ruby_1_8/lib/singleton.rb (revision 17396)
@@ -71,7 +71,6 @@
raise TypeError, "can't dup instance of singleton #{self.class}"
end
- private
# default marshalling strategy
def _dump(depth=-1)
''
Index: ruby_1_8/marshal.c
===================================================================
--- ruby_1_8/marshal.c (revision 17395)
+++ ruby_1_8/marshal.c (revision 17396)
@@ -511,7 +511,7 @@
if (OBJ_TAINTED(obj)) arg->taint = Qtrue;
st_add_direct(arg->data, obj, arg->data->num_entries);
- if (rb_obj_respond_to(obj, s_mdump, Qtrue)) {
+ if (rb_respond_to(obj, s_mdump)) {
volatile VALUE v;
v = rb_funcall(obj, s_mdump, 0, 0);
@@ -521,7 +521,7 @@
if (ivtbl) w_ivar(0, &c_arg);
return;
}
- if (rb_obj_respond_to(obj, s_dump, Qtrue)) {
+ if (rb_respond_to(obj, s_dump)) {
VALUE v;
v = rb_funcall(obj, s_dump, 1, INT2NUM(limit));
@@ -664,7 +664,7 @@
{
VALUE v;
- if (!rb_obj_respond_to(obj, s_dump_data, 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));
@@ -765,12 +765,12 @@
arg.str = rb_str_buf_new(0);
RBASIC(arg.str)->klass = 0;
if (!NIL_P(port)) {
- if (!rb_obj_respond_to(port, s_write, Qtrue)) {
+ if (!rb_respond_to(port, s_write)) {
type_error:
rb_raise(rb_eTypeError, "instance of IO needed");
}
arg.dest = port;
- if (rb_obj_respond_to(port, s_binmode, Qtrue)) {
+ if (rb_respond_to(port, s_binmode)) {
rb_funcall2(port, s_binmode, 0, 0);
reentrant_check(arg.str, s_dump_data);
}
@@ -1245,7 +1245,7 @@
VALUE klass = path2class(r_unique(arg));
VALUE data;
- if (!rb_obj_respond_to(klass, s_load, Qtrue)) {
+ if (!rb_respond_to(klass, s_load)) {
rb_raise(rb_eTypeError, "class %s needs to have method `_load'",
rb_class2name(klass));
}
@@ -1272,7 +1272,7 @@
rb_extend_object(v, m);
}
}
- if (!rb_obj_respond_to(v, s_mload, Qtrue)) {
+ if (!rb_respond_to(v, s_mload)) {
rb_raise(rb_eTypeError, "instance of %s needs to have method `marshal_load'",
rb_class2name(klass));
}
@@ -1299,7 +1299,7 @@
case TYPE_DATA:
{
VALUE klass = path2class(r_unique(arg));
- if (rb_obj_respond_to(klass, s_alloc, Qtrue)) {
+ if (rb_respond_to(klass, s_alloc)) {
static int warn = Qtrue;
if (warn) {
rb_warn("define `allocate' instead of `_alloc'");
@@ -1315,7 +1315,7 @@
rb_raise(rb_eArgError, "dump format error");
}
r_entry(v, arg);
- if (!rb_obj_respond_to(v, s_load_data, Qtrue)) {
+ if (!rb_respond_to(v, s_load_data)) {
rb_raise(rb_eTypeError,
"class %s needs to have instance method `_load_data'",
rb_class2name(klass));
@@ -1420,8 +1420,8 @@
arg.taint = OBJ_TAINTED(port); /* original taintedness */
port = v;
}
- else if (rb_obj_respond_to(port, s_getc, Qtrue) && rb_obj_respond_to(port, s_read, Qtrue)) {
- if (rb_obj_respond_to(port, s_binmode, Qtrue)) {
+ else if (rb_respond_to(port, s_getc) && rb_respond_to(port, s_read)) {
+ if (rb_respond_to(port, s_binmode)) {
rb_funcall2(port, s_binmode, 0, 0);
}
arg.taint = Qtrue;
--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/