diff options
-rw-r--r-- | ChangeLog | 6 | ||||
-rw-r--r-- | include/ruby/intern.h | 7 | ||||
-rw-r--r-- | string.c | 5 |
3 files changed, 16 insertions, 2 deletions
@@ -1,3 +1,9 @@ +Tue Jul 22 04:26:16 2008 Nobuyoshi Nakada <nobu@ruby-lang.org> + + * include/ruby/intern.h (rb_str_buf_new2): optimization for literals. + + * string.c (str_buf_cat): returns VALUE. + Tue Jul 22 03:34:01 2008 Eric Hodel <drbrain@segment7.net> * lib/rdoc*: Update to RDoc 2.1.0 r112. diff --git a/include/ruby/intern.h b/include/ruby/intern.h index 29fa2c2a2..3d63c3877 100644 --- a/include/ruby/intern.h +++ b/include/ruby/intern.h @@ -597,6 +597,13 @@ VALUE rb_str_length(VALUE); rb_usascii_str_new(str, strlen(str)) : \ rb_usascii_str_new2(str); \ }) +#define rb_str_buf_new2(str) __extension__ ( \ +{ \ + (__builtin_constant_p(str)) ? \ + rb_str_buf_cat(rb_str_buf_new(strlen(str)), \ + str, strlen(str)) : \ + rb_str_buf_new2(str); \ +}) #define rb_str_buf_cat2(str, ptr) __extension__ ( \ { \ (__builtin_constant_p(ptr)) ? \ @@ -28,6 +28,7 @@ #undef rb_str_new2 #undef rb_tainted_str_new2 #undef rb_usascii_str_new2 +#undef rb_str_buf_new2 #undef rb_str_buf_cat2 #undef rb_str_cat2 @@ -1400,7 +1401,7 @@ rb_str_resize(VALUE str, long len) return str; } -static long +static VALUE str_buf_cat(VALUE str, const char *ptr, long len) { long capa, total, off = -1; @@ -3746,7 +3747,7 @@ rb_str_inspect(VALUE str) { rb_encoding *enc = STR_ENC_GET(str); char *p, *pend; - VALUE result = rb_str_buf_new2(""); + VALUE result = rb_str_buf_new(0); if (!rb_enc_asciicompat(enc)) enc = rb_usascii_encoding(); rb_enc_associate(result, enc); |