naruse	2009-02-14 07:31:46 +0900 (Sat, 14 Feb 2009)

  New Revision: 22297

  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=22297

  Log:
    * string.c (rb_external_str_new_with_enc): change evaluatioin order
      for speed.

  Modified files:
    trunk/ChangeLog
    trunk/string.c

Index: ChangeLog
===================================================================
--- ChangeLog	(revision 22296)
+++ ChangeLog	(revision 22297)
@@ -1,3 +1,8 @@
+Sat Feb 14 07:23:52 2009  NARUSE, Yui  <naruse@r...>
+
+	* string.c (rb_external_str_new_with_enc): change evaluatioin order
+	  for speed.
+
 Sat Feb 14 02:20:04 2009  Tanaka Akira  <akr@f...>
 
 	* ext/socket/sockport.h (SET_SA_LEN): cast to void for supressing a
Index: string.c
===================================================================
--- string.c	(revision 22296)
+++ string.c	(revision 22297)
@@ -538,8 +538,8 @@
     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;
     }

--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/