From 05c2cc90895750255f64254f2491ff0ad77cc13a Mon Sep 17 00:00:00 2001 From: naruse Date: Fri, 9 Sep 2011 07:02:31 +0000 Subject: merge revision(s) r32791: * insns.def (concatstrings): don't use initial ASCII-8BIT string. [ruby-core:38635] [Bug #5126] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_3@33236 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 5 +++++ insns.def | 4 ++-- version.h | 4 ++-- 3 files changed, 9 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index 3c7571d8ea..462c1c6cd5 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +Fri Sep 9 16:02:04 2011 NARUSE, Yui + + * insns.def (concatstrings): don't use initial ASCII-8BIT string. + [ruby-core:38635] [Bug #5126] + Thu Sep 8 21:17:36 2011 NARUSE, Yui * ext/nkf/nkf-utf8/nkf.c: import nkf 2.1.2 (be9c280) diff --git a/insns.def b/insns.def index df36c6323b..ea00e413a3 100644 --- a/insns.def +++ b/insns.def @@ -392,9 +392,9 @@ concatstrings (...) (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); diff --git a/version.h b/version.h index 5ed19e4231..4b2194489c 100644 --- a/version.h +++ b/version.h @@ -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" -- cgit v1.2.3