From 565eccf63162387d2529eb314d51c29923ceb688 Mon Sep 17 00:00:00 2001 From: overlookmotel <557937+overlookmotel@users.noreply.github.com> Date: Wed, 31 Jul 2024 00:28:48 +0000 Subject: [PATCH] refactor(parser): shorten lexer code (#4562) Use `lexer.peek_byte()` instead of `lexer.source.peek_byte()`. --- crates/oxc_parser/src/lexer/identifier.rs | 2 +- crates/oxc_parser/src/lexer/jsx.rs | 2 +- crates/oxc_parser/src/lexer/mod.rs | 2 +- crates/oxc_parser/src/lexer/string.rs | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/crates/oxc_parser/src/lexer/identifier.rs b/crates/oxc_parser/src/lexer/identifier.rs index 6b464e68b..961af1da5 100644 --- a/crates/oxc_parser/src/lexer/identifier.rs +++ b/crates/oxc_parser/src/lexer/identifier.rs @@ -270,7 +270,7 @@ impl<'a> Lexer<'a> { /// Handle private identifier whose first byte is not an ASCII identifier start byte. #[cold] fn private_identifier_not_ascii_id(&mut self) -> Kind { - let b = self.source.peek_byte().unwrap(); + let b = self.peek_byte().unwrap(); if !b.is_ascii() { let c = self.peek_char().unwrap(); if is_identifier_start_unicode(c) { diff --git a/crates/oxc_parser/src/lexer/jsx.rs b/crates/oxc_parser/src/lexer/jsx.rs index dc97462a5..1646b6f28 100644 --- a/crates/oxc_parser/src/lexer/jsx.rs +++ b/crates/oxc_parser/src/lexer/jsx.rs @@ -99,7 +99,7 @@ impl<'a> Lexer<'a> { /// `JSXIdentifier` `IdentifierPart` /// `JSXIdentifier` [no `WhiteSpace` or Comment here] - pub(crate) fn continue_lex_jsx_identifier(&mut self) -> Option { - if self.source.peek_byte() != Some(b'-') { + if self.peek_byte() != Some(b'-') { return None; } self.consume_char(); diff --git a/crates/oxc_parser/src/lexer/mod.rs b/crates/oxc_parser/src/lexer/mod.rs index f242f24a9..f33c6740c 100644 --- a/crates/oxc_parser/src/lexer/mod.rs +++ b/crates/oxc_parser/src/lexer/mod.rs @@ -309,7 +309,7 @@ impl<'a> Lexer<'a> { let offset = self.offset(); self.token.start = offset; - let Some(byte) = self.source.peek_byte() else { + let Some(byte) = self.peek_byte() else { return Kind::Eof; }; diff --git a/crates/oxc_parser/src/lexer/string.rs b/crates/oxc_parser/src/lexer/string.rs index a1a7b7db7..73c9635c8 100644 --- a/crates/oxc_parser/src/lexer/string.rs +++ b/crates/oxc_parser/src/lexer/string.rs @@ -100,7 +100,7 @@ macro_rules! handle_string_literal_escape { // Consume bytes until reach end of string, line break, or another escape let chunk_start = $lexer.source.position(); - while let Some(b) = $lexer.source.peek_byte() { + while let Some(b) = $lexer.peek_byte() { match b { b if !$table.matches(b) => { // SAFETY: A byte is available, as we just peeked it.