nordic-dev.net/rust
nordic-dev.net/rust
2
0
Fork 0
mirror of https://github.com/rust-lang/rust.git synced 2024-11-25 16:24:46 +00:00
Code Issues Packages Projects Releases Wiki Activity

Rearrange ExtFmt.RT.pad to recover some horizontal space

Browse Source
This commit is contained in:
Brian Anderson 2011-04-18 21:35:45 -04:00
parent 869b28e393
commit 59d5267936
1 changed files with 49 additions and 47 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

96
src/lib/ExtFmt.rs
View File

@ -458,64 +458,66 @@ mod RT {
}
fn pad(&conv cv, str s, pad_type pt) -> str {
auto uwidth;
alt (cv.width) {
case (count_implied) {
ret s;
}
case (count_is(?width)) {
// FIXME: Maybe width should be uint
auto uwidth = width as uint;
auto strlen = _str.char_len(s);
if (strlen < uwidth) {
auto padchar = ' ';
auto diff = uwidth - strlen;
if (have_flag(cv.flags, flag_left_justify)) {
auto padstr = str_init_elt(padchar, diff);
ret s + padstr;
} else {
auto zero_padding = false;
auto signed = false;
alt (pt) {
case (pad_nozero) {
// fallthrough
}
case (pad_signed) {
signed = true;
if (have_flag(cv.flags, flag_left_zero_pad)) {
padchar = '0';
zero_padding = true;
}
}
case (pad_unsigned) {
if (have_flag(cv.flags, flag_left_zero_pad)) {
padchar = '0';
zero_padding = true;
}
}
}
uwidth = width as uint;
}
}
auto padstr = str_init_elt(padchar, diff);
auto strlen = _str.char_len(s);
if (uwidth <= strlen) {
ret s;
}
// This is completely heinous. If we have a signed
// value then potentially rip apart the intermediate
// result and insert some zeros. It may make sense
// to convert zero padding to a precision instead.
if (signed
&& zero_padding
&& _str.byte_len(s) > 0u
&& s.(0) == '-' as u8) {
auto bytelen = _str.byte_len(s);
auto numpart = _str.substr(s, 1u, bytelen - 1u);
ret "-" + padstr + numpart;
}
ret padstr + s;
auto padchar = ' ';
auto diff = uwidth - strlen;
if (have_flag(cv.flags, flag_left_justify)) {
auto padstr = str_init_elt(padchar, diff);
ret s + padstr;
} else {
auto zero_padding = false;
auto signed = false;
alt (pt) {
case (pad_nozero) {
// fallthrough
}
case (pad_signed) {
signed = true;
if (have_flag(cv.flags, flag_left_zero_pad)) {
padchar = '0';
zero_padding = true;
}
}
case (pad_unsigned) {
if (have_flag(cv.flags, flag_left_zero_pad)) {
padchar = '0';
zero_padding = true;
}
} else {
ret s;
}
}
auto padstr = str_init_elt(padchar, diff);
// This is completely heinous. If we have a signed value then
// potentially rip apart the intermediate result and insert some
// zeros. It may make sense to convert zero padding to a precision
// instead.
if (signed
&& zero_padding
&& _str.byte_len(s) > 0u
&& s.(0) == '-' as u8) {
auto bytelen = _str.byte_len(s);
auto numpart = _str.substr(s, 1u, bytelen - 1u);
ret "-" + padstr + numpart;
}
ret padstr + s;
}
}