archive/ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2025-09-15 16:44:01 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

merge revision(s) 52869: [Backport #11766]

Browse source 
* sprintf.c (rb_str_format): fix wrong shifting position in
	  Rational conversion when not at the beginning of the result.
	  [ruby-core:71806] [Bug #11766]


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_2@52874 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
nagachika 2015-12-03 19:55:23 +00:00
parent c35409c276
commit f50d0b98bd
4 changed files with 20 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

6
ChangeLog
View file

@ -1,3 +1,9 @@
Fri Dec 4 04:46:33 2015 Nobuyoshi Nakada <nobu@ruby-lang.org>
* sprintf.c (rb_str_format): fix wrong shifting position in
Rational conversion when not at the beginning of the result.
[ruby-core:71806] [Bug #11766]
Fri Dec 4 02:42:37 2015 Nobuyoshi Nakada <nobu@ruby-lang.org> Fri Dec 4 02:42:37 2015 Nobuyoshi Nakada <nobu@ruby-lang.org>
* range.c (range_to_s): should be infected by the receiver. * range.c (range_to_s): should be infected by the receiver.

17
sprintf.c
View file

@ -1095,16 +1095,19 @@ rb_str_format(int argc, const VALUE *argv, VALUE fmt)
done += prec; done += prec;
} }
if ((flags & FWIDTH) && width > done) { if ((flags & FWIDTH) && width > done) {
int fill = ' ';
long shifting = 0;
if (!(flags&FMINUS)) { if (!(flags&FMINUS)) {
long i, shifting = (flags&FZERO) ? done - prefix : done; shifting = done;
for (i = 1; i <= shifting; i++) if (flags&FZERO) {
buf[width - i] = buf[done - i]; shifting -= prefix;
fill = '0';
}
blen -= shifting; blen -= shifting;
FILL((flags&FZERO) ? '0' : ' ', width - done); memmove(&buf[blen + width - done], &buf[blen], shifting);
blen += shifting;
} else {
FILL(' ', width - done);
} }
FILL(fill, width - done);
blen += shifting;
} }
RB_GC_GUARD(val); RB_GC_GUARD(val);
break; break;

3
test/ruby/test_sprintf.rb
View file

@ -166,6 +166,9 @@ class TestSprintf < Test::Unit::TestCase
end end
end end
end end
bug11766 = '[ruby-core:71806] [Bug #11766]'
assert_equal("x"*10+" 1.0", sprintf("x"*10+"%8.1f", 1r))
end end
def test_hash def test_hash

2
version.h
View file

@ -1,6 +1,6 @@
#define RUBY_VERSION "2.2.4" #define RUBY_VERSION "2.2.4"
#define RUBY_RELEASE_DATE "2015-12-04" #define RUBY_RELEASE_DATE "2015-12-04"
#define RUBY_PATCHLEVEL 219 #define RUBY_PATCHLEVEL 220
#define RUBY_RELEASE_YEAR 2015 #define RUBY_RELEASE_YEAR 2015
#define RUBY_RELEASE_MONTH 12 #define RUBY_RELEASE_MONTH 12