diff options
author | yugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2008-11-18 16:46:47 +0000 |
---|---|---|
committer | yugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2008-11-18 16:46:47 +0000 |
commit | 5f2d8e4ecaba40497b7bc97fda312f84774a3f6d (patch) | |
tree | a58fae9fd67b354a6cbef074ba0d5ee1c2bbbcab | |
parent | 5cf6cefc0426ce38d832fdae2ab15943b281d528 (diff) |
merges r20224 from trunk into ruby_1_9_1
* include/ruby/intern.h (rb_{external,locale}_str_new_cstr): optimized
versions for literal strings.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_1@20261 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r-- | ChangeLog | 5 | ||||
-rw-r--r-- | include/ruby/intern.h | 12 | ||||
-rw-r--r-- | string.c | 2 |
3 files changed, 19 insertions, 0 deletions
@@ -1,3 +1,8 @@ +Wed Nov 12 03:30:59 2008 Nobuyoshi Nakada <nobu@ruby-lang.org> + + * include/ruby/intern.h (rb_{external,locale}_str_new_cstr): optimized + versions for literal strings. + Wed Nov 12 03:28:41 2008 Nobuyoshi Nakada <nobu@ruby-lang.org> * load.c (rb_require_safe): destroys barrier after successfully diff --git a/include/ruby/intern.h b/include/ruby/intern.h index a04ae309b8..a2d4fcb91a 100644 --- a/include/ruby/intern.h +++ b/include/ruby/intern.h @@ -621,6 +621,18 @@ size_t rb_str_capacity(VALUE); rb_usascii_str_new(str, strlen(str)) : \ rb_usascii_str_new_cstr(str); \ }) +#define rb_external_str_new_cstr(str) __extension__ ( \ +{ \ + (__builtin_constant_p(str)) ? \ + rb_external_str_new(str, strlen(str)) : \ + rb_external_str_new_cstr(str); \ +}) +#define rb_locale_str_new_cstr(str) __extension__ ( \ +{ \ + (__builtin_constant_p(str)) ? \ + rb_locale_str_new(str, strlen(str)) : \ + rb_locale_str_new_cstr(str); \ +}) #define rb_str_buf_new_cstr(str) __extension__ ( \ { \ (__builtin_constant_p(str)) ? \ @@ -28,6 +28,8 @@ #undef rb_str_new_cstr #undef rb_tainted_str_new_cstr #undef rb_usascii_str_new_cstr +#undef rb_external_str_new_cstr +#undef rb_locale_str_new_cstr #undef rb_str_new2 #undef rb_str_new3 #undef rb_str_new4 |