godotengine
/
godot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[String] Fix string conversion for -0.0 float values.

This commit is contained in:
bruvzg 2023-09-05 09:31:29 +03:00
parent e7208420bc
commit 2b3bbde6da
No known key found for this signature in database
GPG Key ID: 7960FCF39844EC38
2 changed files with 21 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
core/string/ustring.cpp
View File

@ -1493,9 +1493,9 @@ String String::num(double p_num, int p_decimals) {
if (p_decimals < 0) { if (p_decimals < 0) {
p_decimals = 14; p_decimals = 14;
const double abs_num = ABS(p_num); const double abs_num = Math::abs(p_num);
if (abs_num > 10) { if (abs_num > 10) {
// We want to align the digits to the above sane default, so we only // We want to align the digits to the above reasonable default, so we only
// need to subtract log10 for numbers with a positive power of ten. // need to subtract log10 for numbers with a positive power of ten.
p_decimals -= (int)floor(log10(abs_num)); p_decimals -= (int)floor(log10(abs_num));
} }
@ -4890,8 +4890,8 @@ 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 = signbit(value);
String str = String::num(ABS(value), min_decimals); String str = String::num(Math::abs(value), min_decimals);
const bool is_finite = Math::is_finite(value); const bool is_finite = Math::is_finite(value);
// Pad decimals out. // Pad decimals out.
@ -4953,7 +4953,7 @@ 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); String number_str = String::num(Math::abs(val), min_decimals);
const bool is_finite = Math::is_finite(val); const bool is_finite = Math::is_finite(val);
// Pad decimals out. // Pad decimals out.

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

@ -805,6 +805,22 @@ 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 with sign (negative zero).
format = "fish %+f frog";
args.clear();
args.push_back(-0.0);
output = format.sprintf(args, &error);
REQUIRE(error == false);
CHECK(output == String("fish -0.000000 frog"));
// Real with sign (positive zero).
format = "fish %+f frog";
args.clear();
args.push_back(0.0);
output = format.sprintf(args, &error);
REQUIRE(error == false);
CHECK(output == String("fish +0.000000 frog"));
// Real with 1 decimal. // Real with 1 decimal.
format = "fish %.1f frog"; format = "fish %.1f frog";
args.clear(); args.clear();