mirror of
https://github.com/uutils/coreutils
synced 2024-12-12 14:22:41 +00:00
Merge pull request #6928 from artP2/scientific-notation-uppercase-E
seq: handle scientific notation with uppercase 'E'
This commit is contained in:
commit
f7c38a3079
2 changed files with 7 additions and 1 deletions
|
@ -333,7 +333,7 @@ impl FromStr for PreciseNumber {
|
||||||
// number differently depending on its form. This is important
|
// number differently depending on its form. This is important
|
||||||
// because the form of the input dictates how the output will be
|
// because the form of the input dictates how the output will be
|
||||||
// presented.
|
// presented.
|
||||||
match (s.find('.'), s.find('e')) {
|
match (s.find('.'), s.find(['e', 'E'])) {
|
||||||
// For example, "123456" or "inf".
|
// For example, "123456" or "inf".
|
||||||
(None, None) => parse_no_decimal_no_exponent(s),
|
(None, None) => parse_no_decimal_no_exponent(s),
|
||||||
// For example, "123e456" or "1e-2".
|
// For example, "123e456" or "1e-2".
|
||||||
|
@ -392,6 +392,7 @@ mod tests {
|
||||||
fn test_parse_big_int() {
|
fn test_parse_big_int() {
|
||||||
assert_eq!(parse("0"), ExtendedBigDecimal::zero());
|
assert_eq!(parse("0"), ExtendedBigDecimal::zero());
|
||||||
assert_eq!(parse("0.1e1"), ExtendedBigDecimal::one());
|
assert_eq!(parse("0.1e1"), ExtendedBigDecimal::one());
|
||||||
|
assert_eq!(parse("0.1E1"), ExtendedBigDecimal::one());
|
||||||
assert_eq!(
|
assert_eq!(
|
||||||
parse("1.0e1"),
|
parse("1.0e1"),
|
||||||
ExtendedBigDecimal::BigDecimal("10".parse::<BigDecimal>().unwrap())
|
ExtendedBigDecimal::BigDecimal("10".parse::<BigDecimal>().unwrap())
|
||||||
|
|
|
@ -333,6 +333,11 @@ fn test_width_scientific_notation() {
|
||||||
.succeeds()
|
.succeeds()
|
||||||
.stdout_is("0999\n1000\n")
|
.stdout_is("0999\n1000\n")
|
||||||
.no_stderr();
|
.no_stderr();
|
||||||
|
new_ucmd!()
|
||||||
|
.args(&["-w", "999", "1E3"])
|
||||||
|
.succeeds()
|
||||||
|
.stdout_is("0999\n1000\n")
|
||||||
|
.no_stderr();
|
||||||
}
|
}
|
||||||
|
|
||||||
#[test]
|
#[test]
|
||||||
|
|
Loading…
Reference in a new issue