diff options
author | naruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2009-02-13 22:31:46 +0000 |
---|---|---|
committer | naruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2009-02-13 22:31:46 +0000 |
commit | 28eb7acf2c8c8b883090617599ec3439dc55e8e9 (patch) | |
tree | 7496039ad360314637012c421394cadb0f6a95c8 | |
parent | 9d37857e2b8a4b227e52ff8438e44968d6249f95 (diff) | |
download | ruby-28eb7acf2c8c8b883090617599ec3439dc55e8e9.tar.gz |
* string.c (rb_external_str_new_with_enc): change evaluatioin order
for speed.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@22297 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r-- | ChangeLog | 5 | ||||
-rw-r--r-- | string.c | 4 |
2 files changed, 7 insertions, 2 deletions
@@ -1,3 +1,8 @@ +Sat Feb 14 07:23:52 2009 NARUSE, Yui <naruse@ruby-lang.org> + + * string.c (rb_external_str_new_with_enc): change evaluatioin order + for speed. + Sat Feb 14 02:20:04 2009 Tanaka Akira <akr@fsij.org> * ext/socket/sockport.h (SET_SA_LEN): cast to void for supressing a @@ -538,8 +538,8 @@ rb_external_str_new_with_enc(const char *ptr, long len, rb_encoding *eenc) VALUE str; str = rb_tainted_str_new(ptr, len); - if (rb_enc_str_coderange(str) != ENC_CODERANGE_7BIT && - eenc == rb_usascii_encoding()) { + if (eenc == rb_usascii_encoding() && + rb_enc_str_coderange(str) != ENC_CODERANGE_7BIT) { rb_enc_associate(str, rb_ascii8bit_encoding()); return str; } |