Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat(hurl_core) Add support for underscores in numeric #3482

Closed
wants to merge 2 commits into from
Closed

feat(hurl_core) Add support for underscores in numeric #3482

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
82843aa
Update number.rs
0xb-s Dec 4, 2024
bddb6e9
format
0xb-s Dec 4, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
127 changes: 117 additions & 10 deletions packages/hurl_core/src/parser/number.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,16 +38,18 @@ pub fn natural(reader: &mut Reader) -> ParseResult<u64> {
}

let save = reader.cursor();
let s = reader.read_while(|c| c.is_ascii_digit());
let s = reader.read_while(|c| c.is_ascii_digit() || c == '_');

// if the first digit is zero, you should not have any more digits
if first_digit == '0' && !s.is_empty() {
// if the first digit is zero, you should not have any more digits (except underscores)
if first_digit == '0' && s.chars().any(|c| c.is_ascii_digit()) {
let kind = ParseErrorKind::Expecting {
value: String::from("natural"),
};
return Err(ParseError::new(save.pos, false, kind));
}
match format!("{first_digit}{s}").parse() {

let sanitized = format!("{first_digit}{s}").replace('_', "");
match sanitized.parse() {
Ok(value) => Ok(value),
Err(_) => {
let kind = ParseErrorKind::Expecting {
Expand All @@ -73,14 +75,14 @@ pub fn number(reader: &mut Reader) -> ParseResult<Number> {
Err(_) => "",
Ok(_) => "-",
};
let integer_digits = reader.read_while(|c| c.is_ascii_digit());
let integer_digits = reader.read_while(|c| c.is_ascii_digit() || c == '_');
if integer_digits.is_empty() {
let kind = ParseErrorKind::Expecting {
value: "number".to_string(),
};
return Err(ParseError::new(reader.cursor().pos, true, kind));

// if the first digit is zero, you should not have any more digits
// if the first digit is zero, you should not have any more digits (except underscores)
} else if integer_digits.len() > 1 && integer_digits.starts_with('0') {
let save = reader.cursor();
let kind = ParseErrorKind::Expecting {
Expand All @@ -92,14 +94,16 @@ pub fn number(reader: &mut Reader) -> ParseResult<Number> {
// Float
if try_literal(".", reader).is_ok() {
let save = reader.cursor();
let decimal_digits = reader.read_while(|c| c.is_ascii_digit());
let decimal_digits = reader.read_while(|c| c.is_ascii_digit() || c == '_');
if decimal_digits.is_empty() {
let kind = ParseErrorKind::Expecting {
value: String::from("decimal digits"),
};
return Err(ParseError::new(save.pos, false, kind));
}
match format!("{sign}{integer_digits}.{decimal_digits}").parse() {
let sanitized_integer = integer_digits.replace('_', "");
let sanitized_decimal = decimal_digits.replace('_', "");
match format!("{sign}{sanitized_integer}.{sanitized_decimal}").parse() {
Ok(value) => {
let encoded = reader.read_from(start.index);
Ok(Number::Float(Float { value, encoded }))
Expand All @@ -114,9 +118,10 @@ pub fn number(reader: &mut Reader) -> ParseResult<Number> {

// Integer or BigInteger
} else {
match format!("{sign}{integer_digits}").parse() {
let sanitized_integer = integer_digits.replace('_', "");
match format!("{sign}{sanitized_integer}").parse() {
Ok(value) => Ok(Number::Integer(value)),
Err(_) => Ok(Number::BigInteger(integer_digits)),
Err(_) => Ok(Number::BigInteger(sanitized_integer)),
}
}
}
Expand Down Expand Up @@ -326,4 +331,106 @@ mod tests {
);
assert!(!error.recoverable);
}

#[test]
fn test_natural_with_underscores() {
let mut reader = Reader::new("1_000");
assert_eq!(natural(&mut reader).unwrap(), 1000);
assert_eq!(reader.cursor().index, 5);

let mut reader = Reader::new("32_000");
assert_eq!(natural(&mut reader).unwrap(), 32000);
assert_eq!(reader.cursor().index, 6);

let mut reader = Reader::new("0");
assert_eq!(natural(&mut reader).unwrap(), 0);
assert_eq!(reader.cursor().index, 1);
}

#[test]
fn test_natural_error_with_underscores() {
let mut reader = Reader::new("01_000");
let error = natural(&mut reader).err().unwrap();
assert_eq!(error.pos, Pos { line: 1, column: 2 });
assert_eq!(
error.kind,
ParseErrorKind::Expecting {
value: String::from("natural")
}
);
assert!(!error.recoverable);

let mut reader = Reader::new("_1000");
let error = natural(&mut reader).err().unwrap();
assert_eq!(error.pos, Pos { line: 1, column: 1 });
assert_eq!(
error.kind,
ParseErrorKind::Expecting {
value: String::from("natural")
}
);
assert!(error.recoverable);
}

#[test]
fn test_integer_with_underscores() {
let mut reader = Reader::new("1_000");
assert_eq!(integer(&mut reader).unwrap(), 1000);
assert_eq!(reader.cursor().index, 5);

let mut reader = Reader::new("-1_000");
assert_eq!(integer(&mut reader).unwrap(), -1000);
assert_eq!(reader.cursor().index, 6);

let mut reader = Reader::new("0");
assert_eq!(integer(&mut reader).unwrap(), 0);
assert_eq!(reader.cursor().index, 1);
}

#[test]
fn test_integer_error_with_underscores() {
let mut reader = Reader::new("-_1000");
let error = integer(&mut reader).err().unwrap();
assert_eq!(error.pos, Pos { line: 1, column: 2 });
assert_eq!(
error.kind,
ParseErrorKind::Expecting {
value: String::from("natural")
}
);
assert!(error.recoverable);
}

#[test]
fn test_float_with_underscores() {
let mut reader = Reader::new("1_000.5_00");
assert_eq!(
number(&mut reader).unwrap(),
Number::Float(Float {
value: 1000.5,
encoded: "1_000.5_00".to_string()
})
);
assert_eq!(reader.cursor().index, 10);

let mut reader = Reader::new("-1_000.50");
assert_eq!(
number(&mut reader).unwrap(),
Number::Float(Float {
value: -1000.5,
encoded: "-1_000.50".to_string()
})
);
assert_eq!(reader.cursor().index, 9);

let mut reader = Reader::new("0.1_2_3");
assert_eq!(
number(&mut reader).unwrap(),
Number::Float(Float {
value: 0.123,
encoded: "0.1_2_3".to_string()
})
);
assert_eq!(reader.cursor().index, 7);
}
}
Loading