1berry/ruby
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

* string.c (rb_str_justify): fixed the case a fill size is a

Browse Source 
multiple of the length of the padding.  [ruby-dev:39856]


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@26052 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
nobu 2009-12-09 00:50:37 +00:00
parent 0f406d278f
commit c9c095fc7b
4 changed files with 16 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog
View File

@ -1,3 +1,8 @@
Wed Dec 9 09:50:35 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
* string.c (rb_str_justify): fixed the case a fill size is a
multiple of the length of the padding. [ruby-dev:39856]
Tue Dec 8 23:41:34 2009 NAKAMURA Usaku <usa@ruby-lang.org> Tue Dec 8 23:41:34 2009 NAKAMURA Usaku <usa@ruby-lang.org>
* win32/configure.bat: now recognize --with-*-{dir,include,lib} options * win32/configure.bat: now recognize --with-*-{dir,include,lib} options

4
string.c
View File

@ -6635,7 +6635,7 @@ rb_str_justify(int argc, VALUE *argv, VALUE str, char jflag)
p += llen; p += llen;
} }
else { else {
while (llen > fclen) { while (llen >= fclen) {
memcpy(p,f,flen); memcpy(p,f,flen);
p += flen; p += flen;
llen -= fclen; llen -= fclen;
@ -6652,7 +6652,7 @@ rb_str_justify(int argc, VALUE *argv, VALUE str, char jflag)
p += rlen; p += rlen;
} }
else { else {
while (rlen > fclen) { while (rlen >= fclen) {
memcpy(p,f,flen); memcpy(p,f,flen);
p += flen; p += flen;
rlen -= fclen; rlen -= fclen;

7
test/ruby/test_string.rb
View File

@ -320,9 +320,12 @@ class TestString < Test::Unit::TestCase
end end
Bug2463 = '[ruby-dev:39856]'
def test_center def test_center
assert_equal(S("hello"), S("hello").center(4)) assert_equal(S("hello"), S("hello").center(4))
assert_equal(S(" hello "), S("hello").center(11)) assert_equal(S(" hello "), S("hello").center(11))
assert_equal(S("ababaababa"), S("").center(10, "ab"), Bug2463)
assert_equal(S("ababaababab"), S("").center(11, "ab"), Bug2463)
end end
def test_chomp def test_chomp
@ -779,6 +782,8 @@ class TestString < Test::Unit::TestCase
def test_ljust def test_ljust
assert_equal(S("hello"), S("hello").ljust(4)) assert_equal(S("hello"), S("hello").ljust(4))
assert_equal(S("hello "), S("hello").ljust(11)) assert_equal(S("hello "), S("hello").ljust(11))
assert_equal(S("ababababab"), S("").ljust(10, "ab"), Bug2463)
assert_equal(S("abababababa"), S("").ljust(11, "ab"), Bug2463)
end end
def test_next def test_next
@ -917,6 +922,8 @@ class TestString < Test::Unit::TestCase
def test_rjust def test_rjust
assert_equal(S("hello"), S("hello").rjust(4)) assert_equal(S("hello"), S("hello").rjust(4))
assert_equal(S(" hello"), S("hello").rjust(11)) assert_equal(S(" hello"), S("hello").rjust(11))
assert_equal(S("ababababab"), S("").rjust(10, "ab"), Bug2463)
assert_equal(S("abababababa"), S("").rjust(11, "ab"), Bug2463)
end end
def test_scan def test_scan

4
version.h
View File

@ -1,5 +1,5 @@
#define RUBY_VERSION "1.9.2" #define RUBY_VERSION "1.9.2"
#define RUBY_RELEASE_DATE "2009-12-08" #define RUBY_RELEASE_DATE "2009-12-09"
#define RUBY_PATCHLEVEL -1 #define RUBY_PATCHLEVEL -1
#define RUBY_BRANCH_NAME "trunk" #define RUBY_BRANCH_NAME "trunk"
@ -8,7 +8,7 @@
#define RUBY_VERSION_TEENY 1 #define RUBY_VERSION_TEENY 1
#define RUBY_RELEASE_YEAR 2009 #define RUBY_RELEASE_YEAR 2009
#define RUBY_RELEASE_MONTH 12 #define RUBY_RELEASE_MONTH 12
#define RUBY_RELEASE_DAY 8 #define RUBY_RELEASE_DAY 9
#include "ruby/version.h" #include "ruby/version.h"