aljaz/turso
1
0
Fork 0
mirror of https://github.com/aljazceru/turso.git synced 2026-01-07 18:24:20 +01:00
Code Issues Packages Projects Releases Wiki Activity

better BadNumber

Browse Source
This commit is contained in:
pedrocarlo
2025-04-11 10:09:00 -03:00
parent 4d1ecd2d50
commit a2ca9e5a46
2 changed files with 13 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
vendored/sqlite3-parser/src/lexer/sql/error.rs
View File

@@ -41,6 +41,7 @@ pub enum Error {
BadNumber(
Option<(u64, usize)>,
#[label("here")] Option<miette::SourceSpan>,
Option<usize>,
),
/// Invalid or missing sign after `!`
ExpectedEqualsSign(
@@ -84,7 +85,7 @@ impl fmt::Display for Error {
write!(f, "non-terminated block comment at {:?}", pos.unwrap())
}
Self::BadVariableName(pos, _) => write!(f, "bad variable name at {:?}", pos.unwrap()),
Self::BadNumber(pos, _) => write!(f, "bad number at {:?}", pos.unwrap()),
Self::BadNumber(pos, _, _) => write!(f, "bad number at {:?}", pos.unwrap()),
Self::ExpectedEqualsSign(pos, _) => write!(f, "expected = sign at {:?}", pos.unwrap()),
Self::MalformedBlobLiteral(pos, _) => {
write!(f, "malformed blob literal at {:?}", pos.unwrap())
@@ -136,10 +137,6 @@ impl ScanError for Error {
*pos = Some((line, column));
*src = Some((offset).into());
}
Self::BadNumber(ref mut pos, ref mut src) => {
*pos = Some((line, column));
*src = Some((offset).into());
}
Self::ExpectedEqualsSign(ref mut pos, ref mut src) => {
*pos = Some((line, column));
*src = Some((offset).into());
@@ -148,7 +145,9 @@ impl ScanError for Error {
*pos = Some((line, column));
*src = Some((offset).into());
}
Self::MalformedHexInteger(ref mut pos, ref mut src, len, _) => {
// Exact same handling here
Self::MalformedHexInteger(ref mut pos, ref mut src, len, _)
| Self::BadNumber(ref mut pos, ref mut src, len) => {
*pos = Some((line, column));
*src = Some((offset, len.unwrap_or(0)).into());
}

15
vendored/sqlite3-parser/src/lexer/sql/mod.rs
View File

@@ -596,7 +596,7 @@ fn number(data: &[u8]) -> Result<(Option<Token<'_>>, usize), Error> {
} else if b == b'e' || b == b'E' {
return exponential_part(data, i);
} else if is_identifier_start(b) {
return Err(Error::BadNumber(None, None));
return Err(Error::BadNumber(None, None, Some(i + 1)));
}
Ok((Some((&data[..i], TK_INTEGER)), i))
} else {
@@ -643,7 +643,7 @@ fn fractional_part(data: &[u8], i: usize) -> Result<(Option<Token<'_>>, usize),
if b == b'e' || b == b'E' {
return exponential_part(data, i);
} else if is_identifier_start(b) {
return Err(Error::BadNumber(None, None));
return Err(Error::BadNumber(None, None, Some(i + 1)));
}
Ok((Some((&data[..i], TK_FLOAT)), i))
} else {
@@ -658,17 +658,18 @@ fn exponential_part(data: &[u8], i: usize) -> Result<(Option<Token<'_>>, usize),
let i = if *b == b'+' || *b == b'-' { i + 1 } else { i };
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, None));
let len = if is_identifier_start(b) { j + 1 } else { j };
return Err(Error::BadNumber(None, None, Some(len)));
}
Ok((Some((&data[..j], TK_FLOAT)), j))
} else {
if data.len() == i + 1 {
return Err(Error::BadNumber(None, None));
return Err(Error::BadNumber(None, None, Some(i + 1)));
}
Ok((Some((data, TK_FLOAT)), data.len()))
}
} else {
Err(Error::BadNumber(None, None))
Err(Error::BadNumber(None, None, Some(data.len())))
}
}
@@ -685,7 +686,7 @@ fn find_end_of_number(
{
continue;
}
return Err(Error::BadNumber(None, None));
return Err(Error::BadNumber(None, None, Some(j)));
} else {
return Ok(Some((j, b)));
}
@@ -739,7 +740,7 @@ mod tests {
let mut s = Scanner::new(tokenizer);
expect_token(&mut s, input, b"SELECT", TokenType::TK_SELECT)?;
let err = s.scan(input).unwrap_err();
assert!(matches!(err, Error::BadNumber(_, _)));
assert!(matches!(err, Error::BadNumber(_, _, _)));
Ok(())
}