зеркало из https://github.com/github/ruby.git
use `RSTRUCT_CONST_PTR` carefully.
* struct.c: should not use `RSTRUCT_CONST_PTR` with method dispatch because pointers can be obsolete after method dispatch. `rb_equal()` and so on can dispatch Ruby's methods. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@65549 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
Родитель
972cf8c91e
Коммит
05711c45af
14
struct.c
14
struct.c
|
@ -1135,15 +1135,12 @@ rb_struct_select(int argc, VALUE *argv, VALUE s)
|
|||
static VALUE
|
||||
recursive_equal(VALUE s, VALUE s2, int recur)
|
||||
{
|
||||
const VALUE *ptr, *ptr2;
|
||||
long i, len;
|
||||
|
||||
if (recur) return Qtrue; /* Subtle! */
|
||||
ptr = RSTRUCT_CONST_PTR(s);
|
||||
ptr2 = RSTRUCT_CONST_PTR(s2);
|
||||
len = RSTRUCT_LEN(s);
|
||||
for (i=0; i<len; i++) {
|
||||
if (!rb_equal(ptr[i], ptr2[i])) return Qfalse;
|
||||
if (!rb_equal(RSTRUCT_GET(s, i), RSTRUCT_GET(s2, i))) return Qfalse;
|
||||
}
|
||||
return Qtrue;
|
||||
}
|
||||
|
@ -1191,13 +1188,11 @@ rb_struct_hash(VALUE s)
|
|||
long i, len;
|
||||
st_index_t h;
|
||||
VALUE n;
|
||||
const VALUE *ptr;
|
||||
|
||||
h = rb_hash_start(rb_hash(rb_obj_class(s)));
|
||||
ptr = RSTRUCT_CONST_PTR(s);
|
||||
len = RSTRUCT_LEN(s);
|
||||
for (i = 0; i < len; i++) {
|
||||
n = rb_hash(ptr[i]);
|
||||
n = rb_hash(RSTRUCT_GET(s, i));
|
||||
h = rb_hash_uint(h, NUM2LONG(n));
|
||||
}
|
||||
h = rb_hash_end(h);
|
||||
|
@ -1207,15 +1202,12 @@ rb_struct_hash(VALUE s)
|
|||
static VALUE
|
||||
recursive_eql(VALUE s, VALUE s2, int recur)
|
||||
{
|
||||
const VALUE *ptr, *ptr2;
|
||||
long i, len;
|
||||
|
||||
if (recur) return Qtrue; /* Subtle! */
|
||||
ptr = RSTRUCT_CONST_PTR(s);
|
||||
ptr2 = RSTRUCT_CONST_PTR(s2);
|
||||
len = RSTRUCT_LEN(s);
|
||||
for (i=0; i<len; i++) {
|
||||
if (!rb_eql(ptr[i], ptr2[i])) return Qfalse;
|
||||
if (!rb_eql(RSTRUCT_GET(s, i), RSTRUCT_GET(s2, i))) return Qfalse;
|
||||
}
|
||||
return Qtrue;
|
||||
}
|
||||
|
|
Загрузка…
Ссылка в новой задаче