diff options
-rw-r--r-- | ChangeLog | 7 | ||||
-rw-r--r-- | sprintf.c | 9 |
2 files changed, 13 insertions, 3 deletions
@@ -1,3 +1,10 @@ +Sun Jan 27 23:33:35 2008 Nobuyoshi Nakada <nobu@ruby-lang.org> + + * sprintf.c (rb_str_format): fix for left justify flag. + + * sprintf.c (rb_str_format): zero-precision zero bug revised. + [ruby-dev:33419] + Sun Jan 27 23:20:54 2008 Tanaka Akira <akr@fsij.org> * include/ruby/oniguruma.h: precise mbclen API redesigned to avoid @@ -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)) |