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

Jump to bottom

Merge changes from SQLite official repository #55

Merged
merged 4 commits into from
Apr 10, 2024
Merged

Merge changes from SQLite official repository #55

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
978fbbd
Merge changes from SQLite official repository
gwenn Apr 4, 2024
88bc31f
Fix numeric literals parsing
gwenn Apr 8, 2024
94a469c
Fix numeric literal parsing
gwenn Apr 10, 2024
49b18c3
Remove FIXME
gwenn Apr 10, 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
65 changes: 34 additions & 31 deletions src/lexer/sql/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -526,17 +526,12 @@ fn number(data: &[u8]) -> Result<(Option<Token<'_>>, usize), Error> {
return Ok((Some((data, TK_INTEGER)), data.len()));
}
}
return if let Some((i, b)) = data
.iter()
.enumerate()
.skip(1)
.find(|&(_, &b)| !b.is_ascii_digit())
{
if *b == b'.' {
return if let Some((i, b)) = find_end_of_number(data, 1, u8::is_ascii_digit)? {
if b == b'.' {
return fractional_part(data, i);
} else if *b == b'e' || *b == b'E' {
} else if b == b'e' || b == b'E' {
return exponential_part(data, i);
} else if is_identifier_start(*b) {
} else if is_identifier_start(b) {
return Err(Error::BadNumber(None));
}
Ok((Some((&data[..i], TK_INTEGER)), i))
Expand All @@ -548,14 +543,9 @@ fn number(data: &[u8]) -> Result<(Option<Token<'_>>, usize), Error> {
fn hex_integer(data: &[u8]) -> Result<(Option<Token<'_>>, usize), Error> {
debug_assert_eq!(data[0], b'0');
debug_assert!(data[1] == b'x' || data[1] == b'X');
return if let Some((i, b)) = data
.iter()
.enumerate()
.skip(2)
.find(|&(_, &b)| !b.is_ascii_hexdigit())
{
return if let Some((i, b)) = find_end_of_number(data, 2, u8::is_ascii_hexdigit)? {
// Must not be empty (Ox is invalid)
if i == 2 || is_identifier_start(*b) {
if i == 2 || is_identifier_start(b) {
return Err(Error::MalformedHexInteger(None));
}
Ok((Some((&data[..i], TK_INTEGER)), i))
Expand All @@ -570,15 +560,10 @@ fn hex_integer(data: &[u8]) -> Result<(Option<Token<'_>>, usize), Error> {

fn fractional_part(data: &[u8], i: usize) -> Result<(Option<Token<'_>>, usize), Error> {
debug_assert_eq!(data[i], b'.');
return if let Some((i, b)) = data
.iter()
.enumerate()
.skip(i + 1)
.find(|&(_, &b)| !b.is_ascii_digit())
{
if *b == b'e' || *b == b'E' {
return if let Some((i, b)) = find_end_of_number(data, i + 1, u8::is_ascii_digit)? {
if b == b'e' || b == b'E' {
return exponential_part(data, i);
} else if is_identifier_start(*b) {
} else if is_identifier_start(b) {
return Err(Error::BadNumber(None));
}
Ok((Some((&data[..i], TK_FLOAT)), i))
Expand All @@ -592,13 +577,8 @@ fn exponential_part(data: &[u8], i: usize) -> Result<(Option<Token<'_>>, usize),
// data[i] == 'e'|'E'
return if let Some(b) = data.get(i + 1) {
let i = if *b == b'+' || *b == b'-' { i + 1 } else { i };
if let Some((j, b)) = data
.iter()
.enumerate()
.skip(i + 1)
.find(|&(_, &b)| !b.is_ascii_digit())
{
if j == i + 1 || is_identifier_start(*b) {
if let Some((j, b)) = find_end_of_number(data, i + 1, u8::is_ascii_digit)? {
if j == i + 1 || is_identifier_start(b) {
return Err(Error::BadNumber(None));
}
Ok((Some((&data[..j], TK_FLOAT)), j))
Expand All @@ -613,6 +593,29 @@ fn exponential_part(data: &[u8], i: usize) -> Result<(Option<Token<'_>>, usize),
};
}

fn find_end_of_number(
data: &[u8],
i: usize,
test: fn(&u8) -> bool,
) -> Result<Option<(usize, u8)>, Error> {
for (j, &b) in data.iter().enumerate().skip(i) {
if test(&b) {
continue;
} else if b == b'_' {
if j >= 1
&& data.get(j - 1).map_or(false, |p| test(p))
&& data.get(j + 1).map_or(false, |n| test(n))
{
continue;
}
return Err(Error::BadNumber(None));
} else {
return Ok(Some((j, b)));
}
}
Ok(None)
}

impl Tokenizer {
fn identifierish<'input>(&mut self, data: &'input [u8]) -> (Option<Token<'input>>, usize) {
debug_assert!(is_identifier_start(data[0]));
Expand Down
Loading
Loading