mirror of
https://github.com/ruby/ruby.git
synced 2025-09-21 03:24:00 +02:00
* include/ruby/ruby.h (ROBJECT_NUMIV): renamed from ROBJECT_LEN.
(ROBJECT_IVPTR): renamed from ROBJECT_PTR. * variable.c: follow the above renaming. * object.c: ditto. * gc.c: ditto. * marshal.c: ditto. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@15604 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
parent
f0ca4e868d
commit
b58e36da4a
6 changed files with 51 additions and 38 deletions
|
@ -396,22 +396,22 @@ struct RObject {
|
|||
struct RBasic basic;
|
||||
union {
|
||||
struct {
|
||||
long len;
|
||||
VALUE *ptr;
|
||||
long numiv;
|
||||
VALUE *ivptr;
|
||||
struct st_table *iv_index_tbl; /* shortcut for RCLASS_IV_INDEX_TBL(rb_obj_class(obj)) */
|
||||
} heap;
|
||||
VALUE ary[ROBJECT_EMBED_LEN_MAX];
|
||||
} as;
|
||||
};
|
||||
#define ROBJECT_EMBED FL_USER1
|
||||
#define ROBJECT_LEN(o) \
|
||||
#define ROBJECT_NUMIV(o) \
|
||||
((RBASIC(o)->flags & ROBJECT_EMBED) ? \
|
||||
ROBJECT_EMBED_LEN_MAX : \
|
||||
ROBJECT(o)->as.heap.len)
|
||||
#define ROBJECT_PTR(o) \
|
||||
ROBJECT(o)->as.heap.numiv)
|
||||
#define ROBJECT_IVPTR(o) \
|
||||
((RBASIC(o)->flags & ROBJECT_EMBED) ? \
|
||||
ROBJECT(o)->as.ary : \
|
||||
ROBJECT(o)->as.heap.ptr)
|
||||
ROBJECT(o)->as.heap.ivptr)
|
||||
#define ROBJECT_IV_INDEX_TBL(o) \
|
||||
((RBASIC(o)->flags & ROBJECT_EMBED) ? \
|
||||
RCLASS_IV_INDEX_TBL(rb_obj_class(o)) : \
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue