RGBCube/uutils-coreutils
1
Fork 0
mirror of https://github.com/RGBCube/uutils-coreutils synced 2025-07-29 03:57:44 +00:00
Code Issues Activity

uucore: format: Fix printing of floating hex exponents

Browse source 
Floating hex format is supposed to be `[-]0xh.hhhp±d`. Note that
the exponent is a decimal value, not an hex number: fix that.

Also, add basic tests for this format, while we're at it.

Test: `cargo test --package uucore --all-features float`

Fixes #7362.
This commit is contained in:
Nicolas Boichat 2025-02-26 18:09:09 +01:00
parent bd9564cfea
commit 576655b926
1 changed files with 22 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

25
src/uucore/src/lib/features/format/num_format.rs
View file

@ -476,9 +476,9 @@ fn format_float_hexadecimal(
}; };
let mut s = match (precision, force_decimal) { let mut s = match (precision, force_decimal) {
(0, ForceDecimal::No) => format!("0x{first_digit}p{exponent:+x}"), (0, ForceDecimal::No) => format!("0x{first_digit}p{exponent:+}"),
(0, ForceDecimal::Yes) => format!("0x{first_digit}.p{exponent:+x}"), (0, ForceDecimal::Yes) => format!("0x{first_digit}.p{exponent:+}"),
_ => format!("0x{first_digit}.{mantissa:0>13x}p{exponent:+x}"), _ => format!("0x{first_digit}.{mantissa:0>13x}p{exponent:+}"),
}; };
if case == Case::Uppercase { if case == Case::Uppercase {
@ -654,6 +654,25 @@ mod test {
assert_eq!(f(99_999_999.0), "1.e+08"); assert_eq!(f(99_999_999.0), "1.e+08");
} }
#[test]
fn hexadecimal_float() {
use super::format_float_hexadecimal;
let f = |x| format_float_hexadecimal(x, 6, Case::Lowercase, ForceDecimal::No);
// TODO(#7364): These values do not match coreutils output, but are possible correct representations.
assert_eq!(f(0.00001), "0x1.4f8b588e368f1p-17");
assert_eq!(f(0.125), "0x1.0000000000000p-3");
assert_eq!(f(256.0), "0x1.0000000000000p+8");
assert_eq!(f(65536.0), "0x1.0000000000000p+16");
let f = |x| format_float_hexadecimal(x, 0, Case::Lowercase, ForceDecimal::No);
assert_eq!(f(0.125), "0x1p-3");
assert_eq!(f(256.0), "0x1p+8");
let f = |x| format_float_hexadecimal(x, 0, Case::Lowercase, ForceDecimal::Yes);
assert_eq!(f(0.125), "0x1.p-3");
assert_eq!(f(256.0), "0x1.p+8");
}
#[test] #[test]
fn strip_insignificant_end() { fn strip_insignificant_end() {
use super::strip_fractional_zeroes_and_dot; use super::strip_fractional_zeroes_and_dot;