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 | b58e36da4aaddd8d62c8750c1727c5849c56dc89 (patch) | |
tree | 88df7585dc5b15aad5b0db5fcc87c7f98fe9517b /object.c | |
parent | f0ca4e868d1385282195ab8103b980e947690aef (diff) | |
download | ruby-b58e36da4aaddd8d62c8750c1727c5849c56dc89.tar.gz |
* 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
Diffstat (limited to 'object.c')
-rw-r--r-- | object.c | 20 |
1 files changed, 10 insertions, 10 deletions
@@ -166,10 +166,10 @@ init_copy(VALUE dest, VALUE obj) rb_gc_copy_finalizer(dest, obj); switch (TYPE(obj)) { case T_OBJECT: - if (!(RBASIC(dest)->flags & ROBJECT_EMBED) && ROBJECT_PTR(dest)) { - xfree(ROBJECT_PTR(dest)); - ROBJECT(dest)->as.heap.ptr = 0; - ROBJECT(dest)->as.heap.len = 0; + if (!(RBASIC(dest)->flags & ROBJECT_EMBED) && ROBJECT_IVPTR(dest)) { + xfree(ROBJECT_IVPTR(dest)); + ROBJECT(dest)->as.heap.ivptr = 0; + ROBJECT(dest)->as.heap.numiv = 0; ROBJECT(dest)->as.heap.iv_index_tbl = 0; } if (RBASIC(obj)->flags & ROBJECT_EMBED) { @@ -177,11 +177,11 @@ init_copy(VALUE dest, VALUE obj) RBASIC(dest)->flags |= ROBJECT_EMBED; } else { - long len = ROBJECT(obj)->as.heap.len; + long len = ROBJECT(obj)->as.heap.numiv; VALUE *ptr = ALLOC_N(VALUE, len); - MEMCPY(ptr, ROBJECT(obj)->as.heap.ptr, VALUE, len); - ROBJECT(dest)->as.heap.ptr = ptr; - ROBJECT(dest)->as.heap.len = len; + MEMCPY(ptr, ROBJECT(obj)->as.heap.ivptr, VALUE, len); + ROBJECT(dest)->as.heap.ivptr = ptr; + ROBJECT(dest)->as.heap.numiv = len; ROBJECT(dest)->as.heap.iv_index_tbl = ROBJECT(obj)->as.heap.iv_index_tbl; RBASIC(dest)->flags &= ~ROBJECT_EMBED; } @@ -374,8 +374,8 @@ rb_obj_inspect(VALUE obj) if (TYPE(obj) == T_OBJECT) { int has_ivar = 0; - VALUE *ptr = ROBJECT_PTR(obj); - long len = ROBJECT_LEN(obj); + VALUE *ptr = ROBJECT_IVPTR(obj); + long len = ROBJECT_NUMIV(obj); long i; for (i = 0; i < len; i++) { |