naruse	2011-09-09 16:02:31 +0900 (Fri, 09 Sep 2011)

  New Revision: 33236

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

  Log:
    merge revision(s) r32791:
    
    * insns.def (concatstrings): don't use initial ASCII-8BIT string.
      [ruby-core:38635] [Bug #5126]

  Modified files:
    branches/ruby_1_9_3/ChangeLog
    branches/ruby_1_9_3/insns.def
    branches/ruby_1_9_3/version.h

Index: ruby_1_9_3/ChangeLog
===================================================================
--- ruby_1_9_3/ChangeLog	(revision 33235)
+++ ruby_1_9_3/ChangeLog	(revision 33236)
@@ -1,3 +1,8 @@
+Fri Sep  9 16:02:04 2011  NARUSE, Yui  <naruse@r...>
+
+	* insns.def (concatstrings): don't use initial ASCII-8BIT string.
+	  [ruby-core:38635] [Bug #5126]
+
 Thu Sep  8 21:17:36 2011  NARUSE, Yui  <naruse@r...>
 
 	* ext/nkf/nkf-utf8/nkf.c: import nkf 2.1.2 (be9c280)
Index: ruby_1_9_3/insns.def
===================================================================
--- ruby_1_9_3/insns.def	(revision 33235)
+++ ruby_1_9_3/insns.def	(revision 33236)
@@ -392,9 +392,9 @@
 (...)
 (VALUE val) // inc += 1 - num;
 {
-    rb_num_t i = num;
+    rb_num_t i = num - 1;
 
-    val = rb_str_new(0, 0);
+    val = rb_str_resurrect(TOPN(i));
     while (i-- > 0) {
 	const VALUE v = TOPN(i);
 	rb_str_append(val, v);
Index: ruby_1_9_3/version.h
===================================================================
--- ruby_1_9_3/version.h	(revision 33235)
+++ ruby_1_9_3/version.h	(revision 33236)
@@ -1,10 +1,10 @@
 #define RUBY_VERSION "1.9.3"
 #define RUBY_PATCHLEVEL -1
 
-#define RUBY_RELEASE_DATE "2011-09-08"
+#define RUBY_RELEASE_DATE "2011-09-09"
 #define RUBY_RELEASE_YEAR 2011
 #define RUBY_RELEASE_MONTH 9
-#define RUBY_RELEASE_DAY 8
+#define RUBY_RELEASE_DAY 9
 
 #include "ruby/version.h"
 

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