holm/nushell
1
1
Fork 0
forked from extern/nushell
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix conflict between filesize and hexadecimal numbers (#9309)

Browse Source 
closes #9278 

# Description

removes ambiguity between the `b` the filesize `bytes` unit and `b` the
hex digit
This commit is contained in:
mike 2023-05-28 13:56:58 +03:00 committed by GitHub
parent 3005fe10e5
commit cc04b9a916
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 11 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
crates/nu-parser/src/parser.rs
View File

@ -2217,6 +2217,12 @@ pub fn parse_filesize(working_set: &mut StateWorkingSet, span: Span) -> Expressi
let bytes = working_set.get_span_contents(span); let bytes = working_set.get_span_contents(span);
// the hex digit `b` might be mistaken for the unit `b`, so check that first
if bytes.starts_with(b"0x") {
working_set.error(ParseError::Expected("filesize with valid units", span));
return garbage(span);
}
match parse_unit_value(bytes, span, FILESIZE_UNIT_GROUPS, Type::Filesize, |x| { match parse_unit_value(bytes, span, FILESIZE_UNIT_GROUPS, Type::Filesize, |x| {
x.to_uppercase() x.to_uppercase()
}) { }) {

5
src/tests/test_parser.rs
View File

@ -561,3 +561,8 @@ fn filesize_with_underscores_2() -> TestResult {
fn filesize_with_underscores_3() -> TestResult { fn filesize_with_underscores_3() -> TestResult {
fail_test("42m_b", "executable was not found") fail_test("42m_b", "executable was not found")
} }
#[test]
fn filesize_is_not_hex() -> TestResult {
run_test("0x42b", "1067")
}