godotengine/godot
1
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2025-11-11 13:10:58 +00:00
Code Releases Wiki Activity

Merge pull request #64833 from MarcusElg/naninfprinting

Browse Source 
Improve string formatting (%f and %v) for inf and nan
This commit is contained in:
Rémi Verschelde
2022-10-03 09:23:12 +02:00
parent adee79d7b5 b21460981d
commit cf6978f286
2 changed files with 28 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
core/string/ustring.cpp
View File

@@ -4651,15 +4651,18 @@ String String::sprintf(const Array &values, bool *error) const {
double value = values[value_index]; double value = values[value_index];
bool is_negative = (value < 0); bool is_negative = (value < 0);
String str = String::num(ABS(value), min_decimals); String str = String::num(ABS(value), min_decimals);
bool not_numeric = isinf(value) || isnan(value);
// Pad decimals out. // Pad decimals out.
str = str.pad_decimals(min_decimals); if (!not_numeric) {
str = str.pad_decimals(min_decimals);
}
int initial_len = str.length(); int initial_len = str.length();
// Padding. Leave room for sign later if required. // Padding. Leave room for sign later if required.
int pad_chars_count = (is_negative || show_sign) ? min_chars - 1 : min_chars; 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) { if (left_justified) {
str = str.rpad(pad_chars_count, pad_char); str = str.rpad(pad_chars_count, pad_char);
} else { } else {
@@ -4709,14 +4712,19 @@ String String::sprintf(const Array &values, bool *error) const {
String str = "("; String str = "(";
for (int i = 0; i < count; i++) { for (int i = 0; i < count; i++) {
double val = vec[i]; double val = vec[i];
String number_str = String::num(ABS(val), min_decimals);
bool not_numeric = isinf(val) || isnan(val);
// Pad decimals out. // Pad decimals out.
String number_str = String::num(ABS(val), min_decimals).pad_decimals(min_decimals); if (!not_numeric) {
number_str = number_str.pad_decimals(min_decimals);
}
int initial_len = number_str.length(); int initial_len = number_str.length();
// Padding. Leave room for sign later if required. // Padding. Leave room for sign later if required.
int pad_chars_count = val < 0 ? min_chars - 1 : min_chars; int pad_chars_count = val < 0 ? 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) { if (left_justified) {
number_str = number_str.rpad(pad_chars_count, pad_char); number_str = number_str.rpad(pad_chars_count, pad_char);
} else { } else {

16
tests/core/string/test_string.h
View File

@@ -740,6 +740,14 @@ TEST_CASE("[String] sprintf") {
REQUIRE(error == false); REQUIRE(error == false);
CHECK(output == String("fish 99.990000 frog")); CHECK(output == String("fish 99.990000 frog"));
// Real (infinity) left-padded
format = "fish %11f frog";
args.clear();
args.push_back(INFINITY);
output = format.sprintf(args, &error);
REQUIRE(error == false);
CHECK(output == String("fish inf frog"));
// Real right-padded. // Real right-padded.
format = "fish %-11f frog"; format = "fish %-11f frog";
args.clear(); args.clear();
@@ -840,6 +848,14 @@ TEST_CASE("[String] sprintf") {
REQUIRE(error == false); REQUIRE(error == false);
CHECK(output == String("fish ( 19.990000, 1.000000, -2.050000) frog")); CHECK(output == String("fish ( 19.990000, 1.000000, -2.050000) frog"));
// Vector left-padded with inf/nan
format = "fish %11v frog";
args.clear();
args.push_back(Variant(Vector2(INFINITY, NAN)));
output = format.sprintf(args, &error);
REQUIRE(error == false);
CHECK(output == String("fish ( inf, nan) frog"));
// Vector right-padded. // Vector right-padded.
format = "fish %-11v frog"; format = "fish %-11v frog";
args.clear(); args.clear();