[前][次][番号順一覧][スレッド一覧]

ruby-changes:23815

From: naruse <ko1@a...>
Date: Sat, 2 Jun 2012 18:50:29 +0900 (JST)
Subject: [ruby-changes:23815] naruse:r35866 (ruby_1_9_3): merge revision(s) 35863,35864:

naruse	2012-06-02 18:50:18 +0900 (Sat, 02 Jun 2012)

  New Revision: 35866

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

  Log:
    merge revision(s) 35863,35864:
    
    * string.c (rb_enc_cr_str_buf_cat): don't reset coderange as unknown.
      the condition 'ptr_a8 && str_cr != ENC_CODERANGE_7BIT' means not
      unknown, str is also ASCII-8BIT because str_encindex == ptr_encindex,
      and nont (str_cr == ENC_CODERANGE_UNKNOWN) and
      str_cr != ENC_CODERANGE_7BIT means str_cr is valid because ASCII-8BIT
      can't be broken. [ruby-dev:45688] [Bug #6509]

  Modified files:
    branches/ruby_1_9_3/ChangeLog
    branches/ruby_1_9_3/string.c
    branches/ruby_1_9_3/version.h

Index: ruby_1_9_3/ChangeLog
===================================================================
--- ruby_1_9_3/ChangeLog	(revision 35865)
+++ ruby_1_9_3/ChangeLog	(revision 35866)
@@ -1,3 +1,12 @@
+Sat Jun  2 18:49:39 2012  NARUSE, Yui  <naruse@r...>
+
+	* string.c (rb_enc_cr_str_buf_cat): don't reset coderange as unknown.
+	  the condition 'ptr_a8 && str_cr != ENC_CODERANGE_7BIT' means not
+	  unknown, str is also ASCII-8BIT because str_encindex == ptr_encindex,
+	  and nont (str_cr == ENC_CODERANGE_UNKNOWN) and
+	  str_cr != ENC_CODERANGE_7BIT means str_cr is valid because ASCII-8BIT
+	  can't be broken. [ruby-dev:45688] [Bug #6509]
+
 Wed May 30 17:19:56 2012  Eric Hodel  <drbrain@s...>
 
 	* ext/zlib/zlib.c (do_inflate):  Inflate more data if buffered data
Index: ruby_1_9_3/string.c
===================================================================
--- ruby_1_9_3/string.c	(revision 35865)
+++ ruby_1_9_3/string.c	(revision 35866)
@@ -1909,15 +1909,12 @@
     int str_encindex = ENCODING_GET(str);
     int res_encindex;
     int str_cr, res_cr;
-    int ptr_a8 = ptr_encindex == 0;
 
     str_cr = ENC_CODERANGE(str);
 
     if (str_encindex == ptr_encindex) {
-        if (str_cr == ENC_CODERANGE_UNKNOWN ||
-            (ptr_a8 && str_cr != ENC_CODERANGE_7BIT)) {
+        if (str_cr == ENC_CODERANGE_UNKNOWN)
             ptr_cr = ENC_CODERANGE_UNKNOWN;
-        }
         else if (ptr_cr == ENC_CODERANGE_UNKNOWN) {
             ptr_cr = coderange_scan(ptr, len, rb_enc_from_index(ptr_encindex));
         }
Index: ruby_1_9_3/version.h
===================================================================
--- ruby_1_9_3/version.h	(revision 35865)
+++ ruby_1_9_3/version.h	(revision 35866)
@@ -1,10 +1,10 @@
 #define RUBY_VERSION "1.9.3"
-#define RUBY_PATCHLEVEL 233
+#define RUBY_PATCHLEVEL 234
 
-#define RUBY_RELEASE_DATE "2012-05-30"
+#define RUBY_RELEASE_DATE "2012-06-02"
 #define RUBY_RELEASE_YEAR 2012
-#define RUBY_RELEASE_MONTH 5
-#define RUBY_RELEASE_DAY 30
+#define RUBY_RELEASE_MONTH 6
+#define RUBY_RELEASE_DAY 2
 
 #include "ruby/version.h"
 

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

[前][次][番号順一覧][スレッド一覧]