mirrors/ruff
1
0
Fork 0
mirror of https://github.com/astral-sh/ruff.git synced 2025-08-18 17:40:37 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Use cursor offset for lexer checkpoint (#11734)

Browse source 
## Summary

This PR updates the lexer checkpoint to store the cursor offset instead
of cloning the cursor itself. This reduces the size of `LexerCheckpoint`
from 136 to 112 bytes and also removes the need for lifetime.

## Test Plan

`cargo insta test`
This commit is contained in:
Dhruv Manilawala 2024-06-04 14:13:57 +05:30 • committed by GitHub
parent 6ffb96171a
commit 3b19df04d7
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
3 changed files with 18 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

16
crates/ruff_python_parser/src/lexer.rs
View file

@ -1338,13 +1338,13 @@ impl<'src> Lexer<'src> {
}
/// Creates a checkpoint to which the lexer can later return to using [`Self::rewind`].
pub(crate) fn checkpoint(&self) -> LexerCheckpoint<'src> {
pub(crate) fn checkpoint(&self) -> LexerCheckpoint {
LexerCheckpoint {
value: self.current_value.clone(),
current_kind: self.current_kind,
current_range: self.current_range,
current_flags: self.current_flags,
cursor: self.cursor.clone(),
cursor_offset: self.offset(),
state: self.state,
nesting: self.nesting,
indentations_checkpoint: self.indentations.checkpoint(),
@ -1355,13 +1355,13 @@ impl<'src> Lexer<'src> {
}
/// Restore the lexer to the given checkpoint.
pub(crate) fn rewind(&mut self, checkpoint: LexerCheckpoint<'src>) {
pub(crate) fn rewind(&mut self, checkpoint: LexerCheckpoint) {
let LexerCheckpoint {
value,
current_kind,
current_range,
current_flags,
cursor,
cursor_offset,
state,
nesting,
indentations_checkpoint,
@ -1370,6 +1370,10 @@ impl<'src> Lexer<'src> {
errors_position,
} = checkpoint;
let mut cursor = Cursor::new(self.source);
// We preserve the previous char using this method.
cursor.skip_bytes(cursor_offset.to_usize());
self.current_value = value;
self.current_kind = current_kind;
self.current_range = current_range;
@ -1700,12 +1704,12 @@ pub(crate) enum TokenValue {
},
}
pub(crate) struct LexerCheckpoint<'src> {
pub(crate) struct LexerCheckpoint {
value: TokenValue,
current_kind: TokenKind,
current_range: TextRange,
current_flags: TokenFlags,
cursor: Cursor<'src>,
cursor_offset: TextSize,
state: State,
nesting: u32,
indentations_checkpoint: IndentationsCheckpoint,