diff options
-rw-r--r-- | ChangeLog | 12 | ||||
-rw-r--r-- | ext/stringio/stringio.c | 19 | ||||
-rw-r--r-- | version.h | 4 |
3 files changed, 29 insertions, 6 deletions
@@ -1,3 +1,15 @@ +Tue Apr 9 12:44:59 2002 Nobuyoshi Nakada <nobu.nakada@nifty.ne.jp> + + * ext/stringio/stringio.c (check_modifiable): performance + improvement. avoid calling rb_str_modify() twice. + + * ext/stringio/stringio.c (strio_ungetc): ditto. + + * ext/stringio/stringio.c (strio_putc): ditto. + + * ext/stringio/stringio.c (strio_write): ditto, and use + rb_str_cat() as possible. + Tue Apr 9 05:17:48 2002 Akinori MUSHA <knu@iDaemons.org> * re.c (match_select): fix index references and make diff --git a/ext/stringio/stringio.c b/ext/stringio/stringio.c index 27b8aba8ba..11fe8ef455 100644 --- a/ext/stringio/stringio.c +++ b/ext/stringio/stringio.c @@ -125,7 +125,6 @@ check_modifiable(ptr) if (OBJ_FROZEN(ptr->string)) { rb_raise(rb_eIOError, "not modifiable string"); } - rb_str_modify(ptr->string); } static VALUE strio_s_allocate _((VALUE)); @@ -548,6 +547,7 @@ strio_ungetc(self, ch) if ((unsigned char)RSTRING(ptr->string)->ptr[--ptr->pos] != (unsigned char)cc) { check_modifiable(ptr); + rb_str_modify(ptr->string); RSTRING(ptr->string)->ptr[ptr->pos] = cc; } } @@ -740,10 +740,18 @@ strio_write(self, str) if (ptr->flags & STRIO_APPEND) { ptr->pos = RSTRING(ptr->string)->len; } - if (ptr->pos + len > RSTRING(ptr->string)->len) { - rb_str_resize(ptr->string, ptr->pos + len); + if (ptr->pos == RSTRING(ptr->string)->len) { + rb_str_cat(ptr->string, RSTRING(str)->ptr, len); + } + else { + if (ptr->pos + len > RSTRING(ptr->string)->len) { + rb_str_resize(ptr->string, ptr->pos + len); + } + else { + rb_str_modify(ptr->string); + } + rb_str_update(ptr->string, ptr->pos, len, str); } - rb_str_update(ptr->string, ptr->pos, len, str); ptr->pos += len; return LONG2NUM(len); } @@ -768,6 +776,9 @@ strio_putc(self, ch) if (ptr->pos >= RSTRING(ptr->string)->len) { rb_str_resize(ptr->string, ptr->pos + 1); } + else { + rb_str_modify(ptr->string); + } RSTRING(ptr->string)->ptr[ptr->pos++] = c; return ch; } @@ -1,4 +1,4 @@ #define RUBY_VERSION "1.7.2" -#define RUBY_RELEASE_DATE "2002-04-08" +#define RUBY_RELEASE_DATE "2002-04-09" #define RUBY_VERSION_CODE 172 -#define RUBY_RELEASE_CODE 20020408 +#define RUBY_RELEASE_CODE 20020409 |