perf(lexer): finish_next only clear kind and flags

oxc-project · Jan 18, 2025 · a5e9929 · a5e9929
1 parent 63eb298
commit a5e9929
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 5 deletions.
diff --git a/crates/oxc_parser/src/lexer/mod.rs b/crates/oxc_parser/src/lexer/mod.rs
@@ -215,12 +215,12 @@ impl<'a> Lexer<'a> {
     }
 
     fn finish_next(&mut self, kind: Kind) -> Token {
-        self.token.kind = kind;
-        self.token.end = self.offset();
-        debug_assert!(self.token.start <= self.token.end);
-        let token = self.token;
+        let mut token = self.token;
+        token.kind = kind;
+        token.end = self.offset();
+        debug_assert!(token.start <= token.end);
         self.trivia_builder.handle_token(token);
-        self.token = Token::default();
+        self.token.clear_kind_and_flags();
         token
     }
 

diff --git a/crates/oxc_parser/src/lexer/token.rs b/crates/oxc_parser/src/lexer/token.rs
@@ -62,6 +62,14 @@ impl Token {
         debug_assert!(!self.has_separator || self.kind.is_number() || self.kind == Kind::default());
         self.has_separator = true;
     }
+
+    #[inline]
+    pub fn clear_kind_and_flags(&mut self) {
+        self.kind = Kind::default();
+        self.is_on_new_line = false;
+        self.escaped = false;
+        self.has_separator = false;
+    }
 }
 
 #[cfg(test)]