Correctly tokenize nested comments #1629
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
The tokenizer currently throws EOF error for `select 'foo' /*/**/*/` `last_ch` causes problems when tokenizing nested comments, we have to consume the combination of /* or */ The existing `tokenize_nested_multiline_comment` test fails after fixing this logic: /*multi-line\n* \n/* comment \n /*comment*/*/ */ /comment*/ ^^ Start ^^ End nested comment Relevant: apache#726
|
@iffyio I'm thinking about adding an option in the dialect, cause not every database supports these nested comments. |
iffyio
reviewed
Jan 5, 2025
src/tokenizer.rs
Outdated
| if last_ch == '/' && ch == '*' { | ||
| if ch == '/' && matches!(chars.peek(), Some('*')) && supports_nested_comments { | ||
| s.push(ch); | ||
| s.push(chars.next().unwrap()); // consume the '*' |
There was a problem hiding this comment.
can we rewrite this to return an error in order to avoid the unwrap?
src/tokenizer.rs
Outdated
| break Ok(Some(Token::Whitespace(Whitespace::MultiLineComment(s)))); | ||
| } | ||
| s.push(slash.unwrap()); |
There was a problem hiding this comment.
same here, it would be nice if we can avoid unwraping in code
src/tokenizer.rs
Outdated
|
|
||
| loop { | ||
| match chars.next() { | ||
| Some(ch) => { | ||
| if last_ch == '/' && ch == '*' { | ||
| if ch == '/' && matches!(chars.peek(), Some('*')) && supports_nested_comments { |
There was a problem hiding this comment.
could we move some of the condition out to the match statement? thinking that way we avoid extra nesting + continue. And the different cases are clearer. e.g.
Some('/') if matches!(chars.peek(), Some('*')) && supports_nested_comments => { ... }
Some('*') if matches!(chars.peek(), Some('/')) => { ... }
Some(ch) => { ... }
None => { ... }There was a problem hiding this comment.
Makes sense, will do!
|
@iffyio Addressed your feedback, thanks a lot! Tests passing ✅ |
hansott
added a commit
to hansott/datafusion-sqlparser-rs
that referenced
this pull request
Jan 7, 2025
…o patch-carriage-return * 'main' of github.com:hansott/datafusion-sqlparser-rs: Add support for MySQL's INSERT INTO ... SET syntax (apache#1641) Add support for Snowflake LIST and REMOVE (apache#1639) Add support for the SQL OVERLAPS predicate (apache#1638) Add support for various Snowflake grantees (apache#1640) Add support for USE SECONDARY ROLE (vs. ROLES) (apache#1637) Correctly tokenize nested comments (apache#1629) Add support for MYSQL's `RENAME TABLE` (apache#1616) Test benchmarks and Improve benchmark README.md (apache#1627)
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
The tokenizer currently throws EOF error for
select 'foo' /*/**/*/last_chcauses problems when tokenizing nested comments, we have to consume the combination of/*or*/The existing
tokenize_nested_multiline_commenttest fails after fixing this logic:proof:
Relevant: #726