naruse	2008-02-22 04:54:48 +0900 (Fri, 22 Feb 2008)

  New Revision: 15566

  Modified files:
    trunk/ChangeLog
    trunk/encoding.c
    trunk/string.c

  Log:
    * string.c (rb_str_times): empty string's coderange is CODERANGE_7BIT.
    
    * string.c (rb_str_substr): ditto.
    
    * encoding.c (rb_enc_compatible): empty string is compatible with not
      only nonasciicompatible strings. [ruby-dev:33895]

  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/trunk/string.c?r1=15566&r2=15565&diff_format=u
  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/trunk/ChangeLog?r1=15566&r2=15565&diff_format=u
  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/trunk/encoding.c?r1=15566&r2=15565&diff_format=u

Index: encoding.c
===================================================================
--- encoding.c	(revision 15565)
+++ encoding.c	(revision 15566)
@@ -670,11 +670,11 @@
     enc1 = rb_enc_from_index(idx1);
     enc2 = rb_enc_from_index(idx2);
 
+    if (TYPE(str2) == T_STRING && RSTRING_LEN(str2) == 0)
+	return enc1;
+    if (TYPE(str1) == T_STRING && RSTRING_LEN(str1) == 0)
+	return enc2;
     if (!rb_enc_asciicompat(enc1) || !rb_enc_asciicompat(enc2)) {
-        if (TYPE(str2) == T_STRING && RSTRING_LEN(str2) == 0)
-            return enc1;
-        if (TYPE(str1) == T_STRING && RSTRING_LEN(str1) == 0)
-            return enc2;
 	return 0;
     }
 
Index: ChangeLog
===================================================================
--- ChangeLog	(revision 15565)
+++ ChangeLog	(revision 15566)
@@ -1,3 +1,12 @@
+Fri Feb 22 04:48:22 2008  NARUSE, Yui  <naruse@r...>
+
+	* string.c (rb_str_times): empty string's coderange is CODERANGE_7BIT.
+
+	* string.c (rb_str_substr): ditto.
+
+	* encoding.c (rb_enc_compatible): empty string is compatible with not
+	  only nonasciicompatible strings. [ruby-dev:33895]
+
 Thu Feb 21 17:15:15 2008  Martin Duerst  <duerst@i...>
 
 	* transcode.c: Added basic support for passing options to String#encode
Index: string.c
===================================================================
--- string.c	(revision 15565)
+++ string.c	(revision 15566)
@@ -857,11 +857,14 @@
             n *= 2;
         }
         memcpy(RSTRING_PTR(str2) + n, RSTRING_PTR(str2), len-n);
+	cr = ENC_CODERANGE(str);
+	if (cr == ENC_CODERANGE_BROKEN) cr = ENC_CODERANGE_UNKNOWN;
     }
+    else {
+	cr = ENC_CODERANGE_7BIT;
+    }
     RSTRING_PTR(str2)[RSTRING_LEN(str2)] = '\0';
     OBJ_INFECT(str2, str);
-    cr = ENC_CODERANGE(str);
-    if (cr == ENC_CODERANGE_BROKEN) cr = ENC_CODERANGE_UNKNOWN;
     ENCODING_CODERANGE_SET(str2, rb_enc_get_index(str), cr);
 
     return str2;
@@ -1238,7 +1241,8 @@
     }
     else {
 	str2 = rb_str_new5(str, p, len);
-	rb_enc_cr_str_copy(str2, str);
+	if (len) rb_enc_cr_str_copy(str2, str);
+	else ENC_CODERANGE_SET(str2, ENC_CODERANGE_7BIT);
 	OBJ_INFECT(str2, str);
     }
 

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