Clean up JSON operator tokenizing code #923
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
alamb
force-pushed
the
alamb/clean_up_json_code
branch
from
38f1864
to
4802385
Compare
alamb
commented
Jul 17, 2023
| @@ -1086,8 +1079,8 @@ impl<'a> Tokenizer<'a> { | |||
| } | |||
|
|
|||
| /// Tokenize an identifier or keyword, after the first char is already consumed. | |||
| fn tokenize_word(&self, first_chars: String, chars: &mut State) -> String { | |||
| let mut s = first_chars; | |||
| fn tokenize_word(&self, first_chars: impl Into<String>, chars: &mut State) -> String { | |||
There was a problem hiding this comment.
Uses some generics to avoid having to manually construct Strings in several places.
alamb
commented
Jul 17, 2023
| @@ -934,19 +932,14 @@ impl<'a> Tokenizer<'a> { | |||
| match chars.peek() { | |||
| Some(' ') => Ok(Some(Token::AtAt)), | |||
| Some(tch) if self.dialect.is_identifier_start('@') => { | |||
| let mut s = ch.to_string(); | |||
There was a problem hiding this comment.
I think the new construction is both less verbose and clearer about intent
Pull Request Test Coverage Report for Build 5579571678
💛 - Coveralls |
|
Thanks @Dandandan and @izveigor |
serprex
pushed a commit
to serprex/sqlparser-rs
that referenced
this pull request
Nov 6, 2023
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.
This has some small cleanups of the changes made in #913 by @izveigor