diff options
author | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2008-01-27 14:33:37 +0000 |
---|---|---|
committer | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2008-01-27 14:33:37 +0000 |
commit | 9faf42c280c2b5153e180dbdc71f8791645b9ed7 (patch) | |
tree | 9e49b29ba9bb241a9b2ef3eb2bfccd80f866bdfe /sprintf.c | |
parent | a2e8e2022bcab4dd87ee5cf6f1ef1d9df1cf4c98 (diff) | |
download | ruby-9faf42c280c2b5153e180dbdc71f8791645b9ed7.tar.gz ruby-9faf42c280c2b5153e180dbdc71f8791645b9ed7.tar.xz ruby-9faf42c280c2b5153e180dbdc71f8791645b9ed7.zip |
* sprintf.c (rb_str_format): fix for left justify flag.
* sprintf.c (rb_str_format): zero-precision zero bug revised.
[ruby-dev:33419]
git-svn-id: http://svn.ruby-lang.org/repos/ruby/trunk@15281 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'sprintf.c')
-rw-r--r-- | sprintf.c | 9 |
1 files changed, 6 insertions, 3 deletions
@@ -699,12 +699,15 @@ rb_str_format(int argc, const VALUE *argv, VALUE fmt) if (prefix) { width -= strlen(prefix); } - if ((flags&(FZERO|FPREC)) == FZERO) { + if ((flags & (FZERO|FMINUS|FPREC)) == FZERO) { prec = width; 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)) { @@ -726,7 +729,7 @@ rb_str_format(int argc, const VALUE *argv, VALUE fmt) buf[blen++] = c; } } - else { + else if ((flags & (FMINUS|FPREC)) != FMINUS) { char c; if (!sign && bignum && !RBIGNUM_SIGN(val)) |