Skip to content

refactor(parser): improve lexer pointer maths #5233

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
graphite-app merged 1 commit into from
Aug 26, 2024
Merged

refactor(parser): improve lexer pointer maths #5233

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 3 additions & 7 deletions crates/oxc_parser/src/lexer/comment.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -115,10 +115,7 @@ impl<'a> Lexer<'a> {
cold_branch(|| {
// SAFETY: Next byte is `0xE2` which is always 1st byte of a 3-byte UTF-8 char.
// So safe to advance `pos` by 1 and read 2 bytes.
let next2 = unsafe {
pos = pos.add(1);
pos.read2()
};
let next2 = unsafe { pos.add(1).read2() };
if matches!(next2, LS_BYTES_2_AND_3 | PS_BYTES_2_AND_3) {
// Irregular line break
self.token.is_on_new_line = true;
Expand All @@ -127,11 +124,10 @@ impl<'a> Lexer<'a> {
// But irregular line breaks are rare anyway.
}
// Either way, continue searching.
// Skip 3 bytes (skipped 1 byte above, macro skips 1 more, so skip 1 more here
// to make 3), and continue searching.
// Skip 3 bytes (macro skips 1 already, so skip 2 here), and continue searching.
// SAFETY: `0xE2` is always 1st byte of a 3-byte UTF-8 char,
// so consuming 3 bytes will place `pos` on next UTF-8 char boundary.
pos = unsafe { pos.add(1) };
pos = unsafe { pos.add(2) };
true
})
} else {
Expand Down
4 changes: 2 additions & 2 deletions crates/oxc_parser/src/lexer/template.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ impl<'a> Lexer<'a> {
if unsafe { after_dollar.read() } == b'{' {
// Skip `${` and stop searching.
// SAFETY: Consuming `${` leaves `pos` on a UTF-8 char boundary.
pos = unsafe { after_dollar.add(1) };
pos = unsafe { pos.add(2) };
false
} else {
// Not `${`. Continue searching.
Expand Down Expand Up @@ -212,7 +212,7 @@ impl<'a> Lexer<'a> {

// Skip `${` and stop searching.
// SAFETY: Consuming `${` leaves `pos` on a UTF-8 char boundary.
pos = after_dollar.add(1);
pos = pos.add(2);
false
} else {
// Not `${`. Continue searching.
Expand Down