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

* sprintf.c (rb_str_format): zero-precision zero should be empty.

Browse Source 
[ruby-dev:33363]

* sprintf.c (rb_str_format): not prepend octal prefix to negative or
  zero value.  [ruby-dev:33363], [ruby-dev:33367]


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@15257 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
nobu 2008-01-26 14:46:36 +00:00
parent 259526006e
commit f356662f6b
2 changed files with 14 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
ChangeLog
View File

@ -1,3 +1,11 @@
Sat Jan 26 23:46:33 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
* sprintf.c (rb_str_format): zero-precision zero should be empty.
[ruby-dev:33363]
* sprintf.c (rb_str_format): not prepend octal prefix to negative or
zero value. [ruby-dev:33363], [ruby-dev:33367]
Sat Jan 26 23:42:15 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
* parse.y (assignable_gen, keyword_to_name): __ENCODING__ was missing.

12
sprintf.c
View File

@ -692,7 +692,10 @@ rb_str_format(int argc, const VALUE *argv, VALUE fmt)
width = 0;
}
else {
if (prec < len) prec = len;
if (prec < len) {
if ((flags & FPREC) && len == 1 && *s == '0') len = 0;
else prec = len;
}
width -= prec;
}
if (!(flags&FMINUS)) {
@ -702,15 +705,12 @@ rb_str_format(int argc, const VALUE *argv, VALUE fmt)
}
}
if (sc) PUSH(&sc, 1);
if (prefix) {
if (prefix && (prefix[1] || !(dots || (len && s[0] == '0')))) {
int plen = strlen(prefix);
PUSH(prefix, plen);
}
CHECK(prec - len);
if (dots) {
memcpy(&buf[blen], "..", 2);
blen += 2;
}
if (dots) PUSH("..", 2);
if (!bignum && v < 0) {
char c = sign_bits(base, p);
while (len < prec--) {