mirror of
https://github.com/RGBCube/uutils-coreutils
synced 2025-07-30 04:27:45 +00:00
seq: remove zero padding from parse_decimal_and_exponent
This adds the same fix applied to `parse_exponent_no_decimal`. This way we don't need to create large strings
This commit is contained in:
parent
cdfcae4d4f
commit
0fdefc3767
1 changed files with 6 additions and 25 deletions
|
@ -206,7 +206,11 @@ fn parse_decimal_and_exponent(
|
||||||
let minimum: usize = {
|
let minimum: usize = {
|
||||||
let integral_part: f64 = s[..j].parse().map_err(|_| ParseNumberError::Float)?;
|
let integral_part: f64 = s[..j].parse().map_err(|_| ParseNumberError::Float)?;
|
||||||
if integral_part.is_sign_negative() {
|
if integral_part.is_sign_negative() {
|
||||||
2
|
if exponent > 0 {
|
||||||
|
2usize + exponent as usize
|
||||||
|
} else {
|
||||||
|
2usize
|
||||||
|
}
|
||||||
} else {
|
} else {
|
||||||
1
|
1
|
||||||
}
|
}
|
||||||
|
@ -233,30 +237,7 @@ fn parse_decimal_and_exponent(
|
||||||
.unwrap()
|
.unwrap()
|
||||||
};
|
};
|
||||||
|
|
||||||
if num_digits_between_decimal_point_and_e <= exponent {
|
if is_minus_zero_float(s, &val) {
|
||||||
if is_minus_zero_float(s, &val) {
|
|
||||||
Ok(PreciseNumber::new(
|
|
||||||
ExtendedBigDecimal::MinusZero,
|
|
||||||
num_integral_digits,
|
|
||||||
num_fractional_digits,
|
|
||||||
))
|
|
||||||
} else {
|
|
||||||
let zeros: String = "0".repeat(
|
|
||||||
(exponent - num_digits_between_decimal_point_and_e)
|
|
||||||
.try_into()
|
|
||||||
.unwrap(),
|
|
||||||
);
|
|
||||||
let expanded = [&s[0..i], &s[i + 1..j], &zeros].concat();
|
|
||||||
let n = expanded
|
|
||||||
.parse::<BigDecimal>()
|
|
||||||
.map_err(|_| ParseNumberError::Float)?;
|
|
||||||
Ok(PreciseNumber::new(
|
|
||||||
ExtendedBigDecimal::BigDecimal(n),
|
|
||||||
num_integral_digits,
|
|
||||||
num_fractional_digits,
|
|
||||||
))
|
|
||||||
}
|
|
||||||
} else if is_minus_zero_float(s, &val) {
|
|
||||||
Ok(PreciseNumber::new(
|
Ok(PreciseNumber::new(
|
||||||
ExtendedBigDecimal::MinusZero,
|
ExtendedBigDecimal::MinusZero,
|
||||||
num_integral_digits,
|
num_integral_digits,
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue