Skip to content

Correctly rewrite bounded repetitions following an explicit class #29

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

Merged
masklinn merged 1 commit into from
May 11, 2025
Merged

Correctly rewrite bounded repetitions following an explicit class #29

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
14 changes: 13 additions & 1 deletion ua-parser/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -664,7 +664,7 @@ fn rewrite_regex(re: &str) -> std::borrow::Cow<'_, str> {
inclass += 1;
}
']' if !escape => {
inclass += 1;
inclass -= 1;
}
// no need for special cases because regex allows nesting
// character classes, whereas js or python don't \o/
Expand Down Expand Up @@ -721,6 +721,18 @@ mod test_rewrite_regex {
assert_eq!(rewrite(".{1,300}x"), ".+x");
}

#[test]
fn rewrite_all_repetitions() {
assert_eq!(
rewrite("; {0,2}(T-(?:07|[^0][0-9])[^;/]{1,100}?)(?: Build|\\) AppleWebKit)"),
"; {0,2}(T-(?:07|[^0][0-9])[^;/]+?)(?: Build|\\) AppleWebKit)",
);
assert_eq!(
rewrite("; {0,2}(SH\\-?[0-9][0-9][^;/]{1,100}|SBM[0-9][^;/]{1,100}?)(?: Build|\\) AppleWebKit)"),
"; {0,2}(SH\\-?[0-9][0-9][^;/]+|SBM[0-9][^;/]+?)(?: Build|\\) AppleWebKit)",
)
}

#[test]
fn ignore_non_repetitions() {
assert_eq!(
Expand Down