mirror of
https://github.com/Relintai/pandemonium_engine.git
synced 2024-12-22 11:56:49 +01:00
parent
8e301d27ba
commit
42ff9cf8bc
@ -1774,15 +1774,18 @@ String String::sprintf(const Array &values, bool *error) const {
|
||||
double value = values[value_index];
|
||||
bool is_negative = (value < 0);
|
||||
String str = String::num(ABS(value), min_decimals);
|
||||
bool not_numeric = isinf(value) || isnan(value);
|
||||
|
||||
// Pad decimals out.
|
||||
if (!not_numeric) {
|
||||
str = str.pad_decimals(min_decimals);
|
||||
}
|
||||
|
||||
int initial_len = str.length();
|
||||
|
||||
// Padding. Leave room for sign later if required.
|
||||
int pad_chars_count = (is_negative || show_sign) ? min_chars - 1 : min_chars;
|
||||
String pad_char = pad_with_zeros ? String("0") : String(" ");
|
||||
String pad_char = (pad_with_zeros && !not_numeric) ? String("0") : String(" "); // Never pad NaN or inf with zeros
|
||||
if (left_justified) {
|
||||
str = str.rpad(pad_chars_count, pad_char);
|
||||
} else {
|
||||
|
@ -638,6 +638,14 @@ bool test_28() {
|
||||
OS::get_singleton()->print(output_format, format.get_data(), output.get_data(), success ? "OK" : "FAIL");
|
||||
state = state && success;
|
||||
|
||||
// Real (infinity) left-padded
|
||||
format = "fish %11f frog";
|
||||
args.clear();
|
||||
args.push_back(INFINITY);
|
||||
output = format.sprintf(args, &error);
|
||||
success = (output == String("fish inf frog") && !error);
|
||||
state = state && success;
|
||||
|
||||
// Real right-padded
|
||||
format = "fish %-11f frog";
|
||||
args.clear();
|
||||
|
Loading…
Reference in New Issue
Block a user