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

uucore: format: Fix hexadecimal uppercase print (again)

Browse source 
When '%A' format is specified, we also need to capitalize the
`0x`, i.e. `0XEP-3`, not `0xEP-3`.
This commit is contained in:
Nicolas Boichat 2025-03-25 11:57:57 +01:00
parent 17d81bb9a1
commit 3ab68bad10
1 changed files with 7 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -509,9 +509,9 @@ fn format_float_hexadecimal(
) -> String { ) -> String {
debug_assert!(!bd.is_negative()); debug_assert!(!bd.is_negative());
let exp_char = match case { let (prefix, exp_char) = match case {
Case::Lowercase => 'p', Case::Lowercase => ("0x", 'p'),
Case::Uppercase => 'P', Case::Uppercase => ("0X", 'P'),
}; };
if BigDecimal::zero().eq(bd) { if BigDecimal::zero().eq(bd) {
@ -607,7 +607,7 @@ fn format_float_hexadecimal(
"" ""
}; };
format!("0x{first_digit}{dot}{remaining_digits}{exp_char}{exponent:+}") format!("{prefix}{first_digit}{dot}{remaining_digits}{exp_char}{exponent:+}")
} }
fn strip_fractional_zeroes_and_dot(s: &mut String) { fn strip_fractional_zeroes_and_dot(s: &mut String) {
@ -964,8 +964,8 @@ mod test {
ForceDecimal::No, ForceDecimal::No,
) )
}; };
assert_eq!(f("0.00001"), "0xA.7C5AC4P-20"); assert_eq!(f("0.00001"), "0XA.7C5AC4P-20");
assert_eq!(f("0.125"), "0x8.000000P-6"); assert_eq!(f("0.125"), "0X8.000000P-6");
// Test "0e10"/"0e-10". From cppreference.com: "If the value is ​0​, the exponent is also ​0​." // Test "0e10"/"0e-10". From cppreference.com: "If the value is ​0​, the exponent is also ​0​."
let f = |digits, scale| { let f = |digits, scale| {
@ -1178,7 +1178,7 @@ mod test {
assert_eq!(f("%e", &(-123.0).into()), "-1.230000e+02"); assert_eq!(f("%e", &(-123.0).into()), "-1.230000e+02");
assert_eq!(f("%#09.e", &(-100.0).into()), "-001.e+02"); assert_eq!(f("%#09.e", &(-100.0).into()), "-001.e+02");
assert_eq!(f("%# 9.E", &100.0.into()), " 1.E+02"); assert_eq!(f("%# 9.E", &100.0.into()), " 1.E+02");
assert_eq!(f("% 12.2A", &(-100.0).into()), " -0xC.80P+3"); assert_eq!(f("% 12.2A", &(-100.0).into()), " -0XC.80P+3");
} }
#[test] #[test]