diff options
| author | Brian Anderson <[email protected]> | 2011-04-17 18:19:26 -0400 |
|---|---|---|
| committer | Brian Anderson <[email protected]> | 2011-04-17 18:19:26 -0400 |
| commit | 86a43c24d627131c7c543ffc2df7793939141404 (patch) | |
| tree | 33891d314a6d14457b9628455c7a3b8a868ef5b6 /src/lib | |
| parent | Support #fmt precision for bools, with same rules as strings (diff) | |
| download | rust-86a43c24d627131c7c543ffc2df7793939141404.tar.xz rust-86a43c24d627131c7c543ffc2df7793939141404.zip | |
Support + flag in #fmt
Diffstat (limited to 'src/lib')
| -rw-r--r-- | src/lib/ExtFmt.rs | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/src/lib/ExtFmt.rs b/src/lib/ExtFmt.rs index 4be03858..c2cce279 100644 --- a/src/lib/ExtFmt.rs +++ b/src/lib/ExtFmt.rs @@ -53,7 +53,7 @@ mod CT { flag_left_justify; flag_left_zero_pad; flag_left_space_pad; - flag_plus_if_positive; + flag_sign_always; flag_alternate; } @@ -203,7 +203,7 @@ mod CT { } else if (f == (' ' as u8)) { ret more(flag_left_space_pad); } else if (f == ('+' as u8)) { - ret more(flag_plus_if_positive); + ret more(flag_sign_always); } else if (f == ('#' as u8)) { ret more(flag_alternate); } else { @@ -306,6 +306,7 @@ mod RT { tag flag { flag_left_justify; + flag_sign_always; // FIXME: This is a hack to avoid creating 0-length vec exprs, // which have some difficulty typechecking currently. See // comments in front.extfmt.make_flags @@ -334,7 +335,11 @@ mod RT { fn conv_int(&conv cv, int i) -> str { auto radix = 10u; auto prec = get_int_precision(cv); - ret pad(cv, int_to_str_prec(i, radix, prec)); + auto s = int_to_str_prec(i, radix, prec); + if (0 <= i && have_flag(cv.flags, flag_sign_always)) { + s = "+" + s; + } + ret pad(cv, s); } fn conv_uint(&conv cv, uint u) -> str { |