Skip to content
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.

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

refactor(parser): slice regex pattern in lexer #2556

Closed
Show file tree
Hide file tree
Changes from all commits
Commits
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
6 changes: 3 additions & 3 deletions crates/oxc_parser/src/cursor.rs
Original file line number Diff line number Diff line change
Expand Up @@ -207,10 +207,10 @@ impl<'a> ParserImpl<'a> {
}

/// Tell lexer to read a regex
pub(crate) fn read_regex(&mut self) -> (u32, RegExpFlags) {
let (token, pattern_end, flags) = self.lexer.next_regex(self.cur_kind());
pub(crate) fn read_regex(&mut self) -> (&'a str, RegExpFlags) {
let (token, pattern, flags) = self.lexer.next_regex(self.cur_kind());
self.token = token;
(pattern_end, flags)
(pattern, flags)
}

/// Tell lexer to read a template substitution tail
Expand Down
7 changes: 1 addition & 6 deletions crates/oxc_parser/src/js/expression.rs
Original file line number Diff line number Diff line change
Expand Up @@ -319,12 +319,7 @@ impl<'a> ParserImpl<'a> {

pub(crate) fn parse_literal_regexp(&mut self) -> RegExpLiteral<'a> {
let span = self.start_span();

// split out pattern
let (pattern_end, flags) = self.read_regex();
let pattern_start = self.cur_token().start + 1; // +1 to exclude `/`
let pattern = &self.source_text[pattern_start as usize..pattern_end as usize];

let (pattern, flags) = self.read_regex();
self.bump_any();
self.ast.reg_exp_literal(self.end_span(span), pattern, flags)
}
Expand Down
30 changes: 17 additions & 13 deletions crates/oxc_parser/src/lexer/regex.rs
Original file line number Diff line number Diff line change
Expand Up @@ -28,38 +28,40 @@ impl<'a> Lexer<'a> {
/// where a `RegularExpressionLiteral` is permitted
/// Which means the parser needs to re-tokenize on `PrimaryExpression`,
/// `RegularExpressionLiteral` only appear on the right hand side of `PrimaryExpression`
pub(crate) fn next_regex(&mut self, kind: Kind) -> (Token, u32, RegExpFlags) {
self.token.start = self.offset()
- match kind {
Kind::Slash => 1,
Kind::SlashEq => 2,
_ => unreachable!(),
};
let (pattern_end, flags) = self.read_regex();
pub(crate) fn next_regex(&mut self, kind: Kind) -> (Token, &'a str, RegExpFlags) {
if kind == Kind::SlashEq {
self.source.back(1);
}

self.token.start = self.offset() - 1;
let (pattern, flags) = self.read_regex();
self.lookahead.clear();
let token = self.finish_next(Kind::RegExp);
(token, pattern_end, flags)
(token, pattern, flags)
}

/// 12.9.5 Regular Expression Literals
fn read_regex(&mut self) -> (u32, RegExpFlags) {
fn read_regex(&mut self) -> (&'a str, RegExpFlags) {
let start = self.source.position();
let mut in_character_class = false;

byte_search! {
lexer: self,
table: REGEX_END_TABLE,
start: start,
continue_if: (next_byte, pos) {
// Match found. Decide whether to continue searching.
match next_byte {
b'/' => {
if in_character_class {
true
} else {
let pattern_end = self.source.offset_of(pos);
// SAFETY: Search only proceeds forwards, so `start` cannot be after `pos`
let pattern = unsafe { self.source.str_between_positions_unchecked(start, pos) };
// SAFETY: Next byte is `/`, so `pos + 1` is UTF-8 char boundary
self.source.set_position(unsafe { pos.add(1) });
let flags = self.read_regex_flags();
return (pattern_end, flags);
return (pattern, flags);
}
},
b'[' => {
Expand Down Expand Up @@ -138,7 +140,9 @@ impl<'a> Lexer<'a> {

// Line break found (legal end is handled above)
self.error(diagnostics::UnterminatedRegExp(self.unterminated_range()));
(self.offset(), RegExpFlags::empty())
// SAFETY: `self.source` only advances during search, so `start` cannot be after current position
let pattern = unsafe { self.source.str_from_pos_to_current_unchecked(start) };
(pattern, RegExpFlags::empty())
}

/// Read regex flags.
Expand Down
Loading