Merge pull request godotengine#47502 from KoBeWi/add_0

Always add decimal when converting float to string

Author: Repiteo

core/extension/extension_api_dump.cpp

@@ -1371,6 +1371,9 @@ static bool compare_dict_array(const Dictionary &p_old_api, const Dictionary &p_
 		Dictionary elem = var;
 		ERR_FAIL_COND_V_MSG(!elem.has(p_name_field), false, vformat("Validate extension JSON: Element of base_array '%s' is missing field '%s'. This is a bug.", base_array, p_name_field));
 		String name = elem[p_name_field];
+		if (name.is_valid_float()) {
+			name = name.trim_suffix(".0"); // Make "integers" stringified as integers.
+		}
 		if (p_compare_operators && elem.has("right_type")) {
 			name += " " + String(elem["right_type"]);
 		}
@@ -1386,6 +1389,9 @@ static bool compare_dict_array(const Dictionary &p_old_api, const Dictionary &p_
 			continue;
 		}
 		String name = old_elem[p_name_field];
+		if (name.is_valid_float()) {
+			name = name.trim_suffix(".0"); // Make "integers" stringified as integers.
+		}
 		if (p_compare_operators && old_elem.has("right_type")) {
 			name += " " + String(old_elem["right_type"]);
 		}

core/math/rect2.cpp

@@ -283,7 +283,7 @@ bool Rect2::intersects_transformed(const Transform2D &p_xform, const Rect2 &p_re
 }
 
 Rect2::operator String() const {
-	return "[P: " + position.operator String() + ", S: " + size + "]";
+	return "[P: " + position.operator String() + ", S: " + size.operator String() + "]";
 }
 
 Rect2::operator Rect2i() const {

core/math/vector2.cpp

@@ -203,7 +203,7 @@ bool Vector2::is_finite() const {
 }
 
 Vector2::operator String() const {
-	return "(" + String::num_real(x, false) + ", " + String::num_real(y, false) + ")";
+	return "(" + String::num_real(x, true) + ", " + String::num_real(y, true) + ")";
 }
 
 Vector2::operator Vector2i() const {

core/math/vector3.cpp

@@ -165,7 +165,7 @@ bool Vector3::is_finite() const {
 }
 
 Vector3::operator String() const {
-	return "(" + String::num_real(x, false) + ", " + String::num_real(y, false) + ", " + String::num_real(z, false) + ")";
+	return "(" + String::num_real(x, true) + ", " + String::num_real(y, true) + ", " + String::num_real(z, true) + ")";
 }
 
 Vector3::operator Vector3i() const {

core/string/ustring.cpp

@@ -1819,7 +1819,7 @@ String String::num(double p_num, int p_decimals) {
 #endif
 
 	buf[324] = 0;
-	//destroy trailing zeroes
+	// Destroy trailing zeroes, except one after period.
 	{
 		bool period = false;
 		int z = 0;
@@ -1836,7 +1836,7 @@ String String::num(double p_num, int p_decimals) {
 				if (buf[z] == '0') {
 					buf[z] = 0;
 				} else if (buf[z] == '.') {
-					buf[z] = 0;
+					buf[z + 1] = '0';
 					break;
 				} else {
 					break;
@@ -1929,14 +1929,28 @@ String String::num_real(double p_num, bool p_trailing) {
 			return num_int64((int64_t)p_num);
 		}
 	}
-#ifdef REAL_T_IS_DOUBLE
 	int decimals = 14;
-#else
+	// We want to align the digits to the above sane default, so we only need
+	// to subtract log10 for numbers with a positive power of ten magnitude.
+	const double abs_num = Math::abs(p_num);
+	if (abs_num > 10) {
+		decimals -= (int)floor(log10(abs_num));
+	}
+	return num(p_num, decimals);
+}
+
+String String::num_real(float p_num, bool p_trailing) {
+	if (p_num == (float)(int64_t)p_num) {
+		if (p_trailing) {
+			return num_int64((int64_t)p_num) + ".0";
+		} else {
+			return num_int64((int64_t)p_num);
+		}
+	}
 	int decimals = 6;
-#endif
 	// We want to align the digits to the above sane default, so we only need
 	// to subtract log10 for numbers with a positive power of ten magnitude.
-	double abs_num = Math::abs(p_num);
+	const float abs_num = Math::abs(p_num);
 	if (abs_num > 10) {
 		decimals -= (int)floor(log10(abs_num));
 	}
@@ -4616,7 +4630,7 @@ String String::humanize_size(uint64_t p_size) {
 	}
 
 	if (magnitude == 0) {
-		return String::num(p_size) + " " + RTR("B");
+		return String::num_uint64(p_size) + " " + RTR("B");
 	} else {
 		String suffix;
 		switch (magnitude) {

core/string/ustring.h

@@ -332,6 +332,7 @@ class String {
 	static String num(double p_num, int p_decimals = -1);
 	static String num_scientific(double p_num);
 	static String num_real(double p_num, bool p_trailing = true);
+	static String num_real(float p_num, bool p_trailing = true);
 	static String num_int64(int64_t p_num, int base = 10, bool capitalize_hex = false);
 	static String num_uint64(uint64_t p_num, int base = 10, bool capitalize_hex = false);
 	static String chr(char32_t p_char);

core/variant/variant.cpp

@@ -1736,7 +1736,7 @@ String Variant::stringify(int recursion_count) const {
 		case INT:
 			return itos(_data._int);
 		case FLOAT:
-			return rtos(_data._float);
+			return String::num_real(_data._float, true);
 		case STRING:
 			return *reinterpret_cast<const String *>(_data._mem);
 		case VECTOR2:

modules/gdscript/tests/scripts/analyzer/features/class_inference_is_weak.out

@@ -1,2 +1,2 @@
 GDTEST_OK
-0
+0.0

modules/gdscript/tests/scripts/analyzer/features/const_conversions.gd

@@ -7,17 +7,17 @@ const const_packed_ints: PackedFloat64Array = [52]
 
 func test():
 	Utils.check(typeof(const_float_int) == TYPE_FLOAT)
-	Utils.check(str(const_float_int) == '19')
+	Utils.check(str(const_float_int) == '19.0')
 	Utils.check(typeof(const_float_plus) == TYPE_FLOAT)
-	Utils.check(str(const_float_plus) == '34')
+	Utils.check(str(const_float_plus) == '34.0')
 	Utils.check(typeof(const_float_cast) == TYPE_FLOAT)
-	Utils.check(str(const_float_cast) == '76')
+	Utils.check(str(const_float_cast) == '76.0')
 
 	Utils.check(typeof(const_packed_empty) == TYPE_PACKED_FLOAT64_ARRAY)
 	Utils.check(str(const_packed_empty) == '[]')
 	Utils.check(typeof(const_packed_ints) == TYPE_PACKED_FLOAT64_ARRAY)
-	Utils.check(str(const_packed_ints) == '[52]')
+	Utils.check(str(const_packed_ints) == '[52.0]')
 	Utils.check(typeof(const_packed_ints[0]) == TYPE_FLOAT)
-	Utils.check(str(const_packed_ints[0]) == '52')
+	Utils.check(str(const_packed_ints[0]) == '52.0')
 
 	print('ok')

modules/gdscript/tests/scripts/analyzer/features/external_inner_class_as_constant.out

@@ -1,2 +1,2 @@
 GDTEST_OK
-4
+4.0