diff options
| author | akr <akr@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2008-02-25 16:18:18 +0000 |
|---|---|---|
| committer | akr <akr@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2008-02-25 16:18:18 +0000 |
| commit | 18717ec72e3ca1cf33ba62d949b629c43dbd9dbe (patch) | |
| tree | 88df7585dc5b15aad5b0db5fcc87c7f98fe9517b /include/ruby | |
| parent | 2600f4d6ff910ca2880ebc58139751b7417b0be2 (diff) | |
| download | ruby-18717ec72e3ca1cf33ba62d949b629c43dbd9dbe.tar.gz ruby-18717ec72e3ca1cf33ba62d949b629c43dbd9dbe.tar.xz ruby-18717ec72e3ca1cf33ba62d949b629c43dbd9dbe.zip | |
* 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: http://svn.ruby-lang.org/repos/ruby/trunk@15604 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'include/ruby')
| -rw-r--r-- | include/ruby/ruby.h | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/include/ruby/ruby.h b/include/ruby/ruby.h index 2ba47ab9f..b8a7bba8c 100644 --- a/include/ruby/ruby.h +++ b/include/ruby/ruby.h @@ -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)) : \ |