asgardius/virtualx-engine
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix zero padding formatting

Browse source
This commit is contained in:
volzhs 2017-02-08 10:40:35 +09:00
parent 903a3aa5f0
commit b8e58b2b7b
1 changed files with 9 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
core/ustring.cpp
View file

@ -4069,12 +4069,8 @@ String String::sprintf(const Array& values, bool* error) const {
case 'X': base = 16; capitalize = true; break;
}
// Get basic number.
String str = String::num_int64(value, base, capitalize);
// Sign.
if (show_sign && value >= 0) {
str = str.insert(0, "+");
}
String str = String::num_int64(ABS(value), base, capitalize);
int number_len = str.length();
// Padding.
String pad_char = pad_with_zeroes ? String("0") : String(" ");
@ -4084,6 +4080,13 @@ String String::sprintf(const Array& values, bool* error) const {
str = str.lpad(min_chars, pad_char);
}
// Sign.
if (show_sign && value >= 0) {
str = str.insert(pad_with_zeroes?0:str.length()-number_len, "+");
} else if (value < 0) {
str = str.insert(pad_with_zeroes?0:str.length()-number_len, "-");
}
formatted += str;
++value_index;
in_format = false;