system/coreutils
system/coreutils
1
0
Fork 0
mirror of https://github.com/uutils/coreutils synced 2024-10-03 06:24:47 +00:00
Code Issues Packages Projects Releases Wiki Activity

core: refactor parse_number in size parser

Browse source
This commit is contained in:
John Shin 2023-05-30 00:33:14 -07:00 committed by Sylvestre Ledru
parent 0465553f6e
commit a397920183
1 changed files with 13 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
src/uucore/src/lib/parser/parse_size.rs
View file

@ -156,25 +156,16 @@ impl<'parser> Parser<'parser> {
if numeric_string.is_empty() {
1
} else {
match numeric_string.parse() {
Ok(n) => n,
Err(_) => return Err(ParseSizeError::parse_failure(size)),
}
self.parse_number(&numeric_string, 10, size)?
}
}
NumberSystem::Octal => {
let trimmed_string = numeric_string.trim_start_matches('0');
match u64::from_str_radix(trimmed_string, 8) {
Ok(res) => res,
Err(_) => return Err(ParseSizeError::parse_failure(size)),
}
self.parse_number(trimmed_string, 8, size)?
}
NumberSystem::Hexadecimal => {
let trimmed_string = numeric_string.trim_start_matches("0x");
match u64::from_str_radix(trimmed_string, 16) {
Ok(res) => res,
Err(_) => return Err(ParseSizeError::parse_failure(size)),
}
self.parse_number(trimmed_string, 16, size)?
}
};
@ -204,6 +195,16 @@ impl<'parser> Parser<'parser> {
NumberSystem::Decimal
}
fn parse_number(
&self,
numeric_string: &str,
radix: u32,
original_size: &str,
) -> Result<u64, ParseSizeError> {
u64::from_str_radix(numeric_string, radix)
.map_err(|_| ParseSizeError::ParseFailure(original_size.to_string()))
}
}
/// Parse a size string into a number of bytes.