summaryrefslogtreecommitdiffstats
path: root/string.c
diff options
context:
space:
mode:
authornaruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2009-02-13 22:31:46 +0000
committernaruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2009-02-13 22:31:46 +0000
commitf0108fa417167e6d9d429f53c36ed17875c12777 (patch)
tree7496039ad360314637012c421394cadb0f6a95c8 /string.c
parente3906914edabcdc9cf4c15cf2fe6ab11368efbc2 (diff)
downloadruby-f0108fa417167e6d9d429f53c36ed17875c12777.tar.gz
ruby-f0108fa417167e6d9d429f53c36ed17875c12777.tar.xz
ruby-f0108fa417167e6d9d429f53c36ed17875c12777.zip
* string.c (rb_external_str_new_with_enc): change evaluatioin order
for speed. git-svn-id: http://svn.ruby-lang.org/repos/ruby/trunk@22297 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'string.c')
-rw-r--r--string.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/string.c b/string.c
index 8eb83efce..28410a448 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;
}