From 28eb7acf2c8c8b883090617599ec3439dc55e8e9 Mon Sep 17 00:00:00 2001 From: naruse Date: Fri, 13 Feb 2009 22:31:46 +0000 Subject: [PATCH] * 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 --- ChangeLog | 5 +++++ string.c | 4 ++-- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 71cdfdcf07..6fff51848a 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +Sat Feb 14 07:23:52 2009 NARUSE, Yui + + * string.c (rb_external_str_new_with_enc): change evaluatioin order + for speed. + Sat Feb 14 02:20:04 2009 Tanaka Akira * ext/socket/sockport.h (SET_SA_LEN): cast to void for supressing a diff --git a/string.c b/string.c index 8eb83efcec..28410a448c 100644 --- a/string.c +++ b/string.c @@ -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; }