[Parser] Cleanup UnicodeScalar handling #2516
Merged
Conversation
This file contains hidden or 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
rintaro
commented
Feb 29, 2024
Comment on lines
-74
to
+79
| var text = content.text | ||
| text.withUTF8 { buffer in | ||
| let rawText = content.rawText | ||
| if !rawText.contains("\\") { | ||
| // Fast path. No escape sequence. | ||
| output.append(String(syntaxText: rawText)) | ||
| return | ||
| } |
There was a problem hiding this comment.
This fast path is an addition. It's probably just faster than always lexing the UTF8 sequence.
|
@swift-ci Please test |
ahoppen
approved these changes
Feb 29, 2024
Make both EscapedCharacterLex and CharacterLex return 'Unicode.Scalar' for escaped character result. It didn't have to be 'UTF32' or 'Character'. Avoid unnecessary conversions.
…Value() If the segment doesn't have '\' in it. We don't need to go back to Lexer to get the unescaped chanacters.
Unicode.Scalar conforms to 'ExpressibleByUnicodeScalarLiteral'. Literal is enough.'
rintaro
force-pushed
the
parser-unicodescalar
branch
from
69eae7b to
e07ae2b
Compare
|
@swift-ci Please smoke test |
|
@swift-ci Please test |
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.
Mostly just removing redundant
UnicodeScalar()callings.Change associated type of
EscapedCharacterLex.success(UInt32)andCharacterLex.validatedEscapeSequence(Character)to bothUnicode.Scalarbecause there's no reason not to use it, and to avoid unnecessary conversions.