aljaz/turso
1
0
Fork 0
mirror of https://github.com/aljazceru/turso.git synced 2026-01-03 16:34:19 +01:00
Code Issues Packages Projects Releases Wiki Activity

better MalformedHexInteger

Browse Source
This commit is contained in:
pedrocarlo
2025-04-11 01:36:36 -03:00
parent 1fd9a7ad9c
commit 4d1ecd2d50
4 changed files with 65 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -56,6 +56,8 @@ pub enum Error {
MalformedHexInteger(
Option<(u64, usize)>,
#[label("here")] Option<miette::SourceSpan>,
Option<usize>,
#[help] Option<&'static str>,
),
/// Grammar error
ParserError(
@@ -87,7 +89,7 @@ impl fmt::Display for Error {
Self::MalformedBlobLiteral(pos, _) => {
write!(f, "malformed blob literal at {:?}", pos.unwrap())
}
Self::MalformedHexInteger(pos, _) => {
Self::MalformedHexInteger(pos, _, _, _) => {
write!(f, "malformed hex integer at {:?}", pos.unwrap())
}
Self::ParserError(ref msg, Some(pos), _) => write!(f, "{msg} at {pos:?}"),
@@ -111,18 +113,45 @@ impl From<ParserError> for Error {
}
impl ScanError for Error {
fn position(&mut self, line: u64, column: usize) {
fn position(&mut self, line: u64, column: usize, offset: usize) {
match *self {
Self::Io(_) => {}
Self::UnrecognizedToken(ref mut pos, _) => *pos = Some((line, column)),
Self::UnterminatedLiteral(ref mut pos, _) => *pos = Some((line, column)),
Self::UnterminatedBracket(ref mut pos, _) => *pos = Some((line, column)),
Self::UnterminatedBlockComment(ref mut pos, _) => *pos = Some((line, column)),
Self::BadVariableName(ref mut pos, _) => *pos = Some((line, column)),
Self::BadNumber(ref mut pos, _) => *pos = Some((line, column)),
Self::ExpectedEqualsSign(ref mut pos, _) => *pos = Some((line, column)),
Self::MalformedBlobLiteral(ref mut pos, _) => *pos = Some((line, column)),
Self::MalformedHexInteger(ref mut pos, _) => *pos = Some((line, column)),
Self::UnrecognizedToken(ref mut pos, ref mut src) => {
*pos = Some((line, column));
*src = Some((offset).into());
}
Self::UnterminatedLiteral(ref mut pos, ref mut src) => {
*pos = Some((line, column));
*src = Some((offset).into());
}
Self::UnterminatedBracket(ref mut pos, ref mut src) => {
*pos = Some((line, column));
*src = Some((offset).into());
}
Self::UnterminatedBlockComment(ref mut pos, ref mut src) => {
*pos = Some((line, column));
*src = Some((offset).into());
}
Self::BadVariableName(ref mut pos, ref mut src) => {
*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());
}
Self::MalformedBlobLiteral(ref mut pos, ref mut src) => {
*pos = Some((line, column));
*src = Some((offset).into());
}
Self::MalformedHexInteger(ref mut pos, ref mut src, len, _) => {
*pos = Some((line, column));
*src = Some((offset, len.unwrap_or(0)).into());
}
Self::ParserError(_, ref mut pos, _) => *pos = Some((line, column)),
}
}