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.

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

perf(transformer): pre-calculate unsupported flags in RegExp transform #5482

Merged
merged 1 commit into from
Sep 5, 2024
Merged

perf(transformer): pre-calculate unsupported flags in RegExp transform #5482

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
38 changes: 22 additions & 16 deletions crates/oxc_transformer/src/regexp/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,12 +60,31 @@ use crate::context::Ctx;

pub struct RegExp<'a> {
_ctx: Ctx<'a>,
unsupported_flags: RegExpFlags,
options: RegExpOptions,
}

impl<'a> RegExp<'a> {
pub fn new(options: RegExpOptions, ctx: Ctx<'a>) -> Self {
Self { _ctx: ctx, options }
// Get unsupported flags
let mut unsupported_flags = RegExpFlags::empty();
if options.dot_all_flag {
unsupported_flags |= RegExpFlags::S;
}
if options.sticky_flag {
unsupported_flags |= RegExpFlags::Y;
}
if options.unicode_flag {
unsupported_flags |= RegExpFlags::U;
}
if options.match_indices {
unsupported_flags |= RegExpFlags::D;
}
if options.set_notation {
unsupported_flags |= RegExpFlags::V;
}

Self { _ctx: ctx, unsupported_flags, options }
}
}

Expand All @@ -79,9 +98,8 @@ impl<'a> Traverse<'a> for RegExp<'a> {
return;
};

if !self.has_unsupported_regular_expression_flags(regexp.regex.flags)
&& self.requires_pattern_analysis()
{
let has_unsupported_flags = regexp.regex.flags.intersects(self.unsupported_flags);
if !has_unsupported_flags && self.requires_pattern_analysis() {
match try_parse_pattern(regexp, ctx) {
Ok(pattern) => {
let is_unsupported = self.has_unsupported_regular_expression_pattern(&pattern);
Expand Down Expand Up @@ -141,18 +159,6 @@ impl<'a> RegExp<'a> {
|| self.options.look_behind_assertions
}

/// Check if the regular expression contains any unsupported flags.
fn has_unsupported_regular_expression_flags(&self, flags: RegExpFlags) -> bool {
flags.iter().any(|f| match f {
RegExpFlags::S if self.options.dot_all_flag => true,
RegExpFlags::Y if self.options.sticky_flag => true,
RegExpFlags::U if self.options.unicode_flag => true,
RegExpFlags::D if self.options.match_indices => true,
RegExpFlags::V if self.options.set_notation => true,
_ => false,
})
}

/// Check if the regular expression contains any unsupported syntax.
///
/// Based on parsed regular expression pattern.
Expand Down