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

Merge 'remove UnterminatedBlockComment error' from Lâm Hoàng Phúc

Browse Source 
close #3425

Closes #3446
This commit is contained in:
Jussi Saurio
2025-09-30 10:35:23 +03:00
committed by GitHub
parent e6a2e2a9cf 4211460ef3
commit 63906e8f44
2 changed files with 20 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
parser/src/error.rs
View File

@@ -14,9 +14,6 @@ pub enum Error {
/// Missing `]`
#[error("non-terminated bracket at {0:?}")]
UnterminatedBracket(#[label("here")] miette::SourceSpan),
/// Missing `*/`
#[error("non-terminated block comment at {0:?}")]
UnterminatedBlockComment(#[label("here")] miette::SourceSpan),
/// Invalid parameter name
#[error("bad variable name at {0:?}")]
BadVariableName(#[label("here")] miette::SourceSpan),

30
parser/src/lexer.rs
View File

@@ -400,6 +400,9 @@ impl<'a> Lexer<'a> {
let start = self.offset;
self.eat_and_assert(|b| b == b'/');
match self.peek() {
// C-style comments begin with "/*" and extend up to and
// including the next "*/" character pair or until
// the end of input, whichever comes first.
Some(b'*') => {
self.eat_and_assert(|b| b == b'*');
loop {
@@ -412,19 +415,11 @@ impl<'a> Lexer<'a> {
self.eat_and_assert(|b| b == b'/');
break; // End of block comment
}
None => {
return Err(Error::UnterminatedBlockComment(
(start, self.offset - start).into(),
))
}
None => break,
_ => {}
}
}
None => {
return Err(Error::UnterminatedBlockComment(
(start, self.offset - start).into(),
))
}
None => break,
_ => unreachable!(), // We should not reach here
}
}
@@ -1250,6 +1245,21 @@ mod tests {
token_type: Some(TokenType::TK_FLOAT),
},
),
// issue 3425
(
b"/*".as_slice(),
Token {
value: b"/*".as_slice(),
token_type: None,
},
),
(
b"/**".as_slice(),
Token {
value: b"/**".as_slice(),
token_type: None,
},
),
];
for (input, expected) in test_cases {