diff options
| author | Nobuyoshi Nakada <[email protected]> | 2021-10-23 01:38:45 +0900 |
|---|---|---|
| committer | Nobuyoshi Nakada <[email protected]> | 2021-10-24 17:50:35 +0900 |
| commit | b69c38e62e0b7006d2c345a88a400f2fe2cb80b9 () | |
| tree | db96ec396012c86db047f6a2c61fd68a37ae2f80 /pack.c | |
| parent | 8d6e9b66580278900020abf77dc1aa6427a060f9 (diff) | |
Refactor associated pointer
Notes: Merged: https://.com/ruby/ruby/pull/5014
| -rw-r--r-- | pack.c | 68 |
1 files changed, 25 insertions, 43 deletions
@@ -135,7 +135,23 @@ str_associate(VALUE str, VALUE add) static VALUE str_associated(VALUE str) { - return rb_ivar_lookup(str, id_associated, Qfalse); } static void @@ -933,7 +949,7 @@ pack_unpack_internal(VALUE str, VALUE fmt, int mode) #define hexdigits ruby_hexdigits char *s, *send; char *p, *pend; - VALUE ary; char type; long len; AVOID_CC_BUG long tmp_len; @@ -1540,29 +1556,11 @@ pack_unpack_internal(VALUE str, VALUE fmt, int mode) UNPACK_FETCH(&t, char *); if (t) { - VALUE a; - const VALUE *p, *pend; - - if (!(a = str_associated(str))) { - rb_raise(rb_eArgError, "no associated pointer"); - } - p = RARRAY_CONST_PTR(a); - pend = p + RARRAY_LEN(a); - while (p < pend) { - if (RB_TYPE_P(*p, T_STRING) && RSTRING_PTR(*p) == t) { - if (len < RSTRING_LEN(*p)) { - tmp = rb_str_new(t, len); - str_associate(tmp, a); - } - else { - tmp = *p; - } - break; - } - p++; - } - if (p == pend) { - rb_raise(rb_eArgError, "non associated pointer"); } } UNPACK_PUSH(tmp); @@ -1581,24 +1579,8 @@ pack_unpack_internal(VALUE str, VALUE fmt, int mode) UNPACK_FETCH(&t, char *); if (t) { - VALUE a; - const VALUE *p, *pend; - - if (!(a = str_associated(str))) { - rb_raise(rb_eArgError, "no associated pointer"); - } - p = RARRAY_CONST_PTR(a); - pend = p + RARRAY_LEN(a); - while (p < pend) { - if (RB_TYPE_P(*p, T_STRING) && RSTRING_PTR(*p) == t) { - tmp = *p; - break; - } - p++; - } - if (p == pend) { - rb_raise(rb_eArgError, "non associated pointer"); - } } UNPACK_PUSH(tmp); } |