Skip to content

Reimplemented glob stripping with regex #297

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

Open
egormanga wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Reimplemented glob stripping with regex #297

Show file tree
Hide file tree
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
62 changes: 14 additions & 48 deletions src/patch/peripheral.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -524,81 +524,47 @@ pub(crate) trait RegisterBlockExt: Name {

/// Delete substring from the beginning of register names inside ptag
fn strip_start(&mut self, prefix: &str) -> PatchResult {
let len = prefix.len();
let glob = globset::Glob::new(&(prefix.to_string() + "*"))?.compile_matcher();
let re = regex::Regex::new(&globset::Glob::new(prefix)?.regex().replace("(?-u)", "").replace("*", "*?").strip_suffix("$").unwrap())?;

@burrbull burrbull May 16, 2026

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It is hard to read. Format this or better split it into two separate statements.

for rtag in self.regs_mut() {
if glob.is_match(&rtag.name) {
rtag.name.drain(..len);
}
rtag.name = re.replace(&rtag.name, "").to_string();
if let Some(dname) = rtag.display_name.as_mut() {
if glob.is_match(dname.as_str()) {
dname.drain(..len);
}
*dname = re.replace(dname, "").to_string();
}
if let Some(name) = rtag.alternate_register.as_mut() {
if glob.is_match(name.as_str()) {
name.drain(..len);
}
*name = re.replace(name, "").to_string();
}
}
for ctag in self.clstrs_mut() {
if glob.is_match(&ctag.name) {
ctag.name.drain(..len);
}
ctag.name = re.replace(&ctag.name, "").to_string();
if let Some(dname) = ctag.header_struct_name.as_mut() {
if glob.is_match(dname.as_str()) {
dname.drain(..len);
}
*dname = re.replace(dname, "").to_string();
}
if let Some(name) = ctag.alternate_cluster.as_mut() {
if glob.is_match(name.as_str()) {
name.drain(..len);
}
*name = re.replace(name, "").to_string();
}
}
Ok(())
}

/// Delete substring from the ending of register names inside ptag
fn strip_end(&mut self, suffix: &str) -> PatchResult {
let len = suffix.len();
let glob = globset::Glob::new(&("*".to_string() + suffix))
.unwrap()
.compile_matcher();
let re = regex::Regex::new(&globset::Glob::new(suffix)?.regex().replace("(?-u)^", "").replace("*", "*?"))?;
for rtag in self.regs_mut() {
if glob.is_match(&rtag.name) {
let nlen = rtag.name.len();
rtag.name.truncate(nlen - len);
}
rtag.name = re.replace(&rtag.name, "").to_string();
if let Some(dname) = rtag.display_name.as_mut() {
if glob.is_match(dname.as_str()) {
let nlen = dname.len();
dname.truncate(nlen - len);
}
*dname = re.replace(dname, "").to_string();
}
if let Some(name) = rtag.alternate_register.as_mut() {
if glob.is_match(name.as_str()) {
let nlen = name.len();
name.truncate(nlen - len);
}
*name = re.replace(name, "").to_string();
}
}
for ctag in self.clstrs_mut() {
if glob.is_match(&ctag.name) {
let nlen = ctag.name.len();
ctag.name.truncate(nlen - len);
}
ctag.name = re.replace(&ctag.name, "").to_string();
if let Some(dname) = ctag.header_struct_name.as_mut() {
if glob.is_match(dname.as_str()) {
let nlen = dname.len();
dname.truncate(nlen - len);
}
*dname = re.replace(dname, "").to_string();
}
if let Some(name) = ctag.alternate_cluster.as_mut() {
if glob.is_match(name.as_str()) {
let nlen = name.len();
name.truncate(nlen - len);
}
*name = re.replace(name, "").to_string();
}
}
Ok(())
Expand Down
15 changes: 4 additions & 11 deletions src/patch/register.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -283,24 +283,17 @@ impl RegisterExt for Register {
}

fn strip_start(&mut self, substr: &str) -> PatchResult {
let len = substr.len();
let glob = globset::Glob::new(&(substr.to_string() + "*"))?.compile_matcher();
let re = regex::Regex::new(&globset::Glob::new(substr)?.regex().replace("(?-u)", "").replace("*", "*?").strip_suffix("$").unwrap())?;
for ftag in self.fields_mut() {
if glob.is_match(&ftag.name) {
ftag.name.drain(..len);
}
ftag.name = re.replace(&ftag.name, "").to_string();
}
Ok(())
}

fn strip_end(&mut self, substr: &str) -> PatchResult {
let len = substr.len();
let glob = globset::Glob::new(&("*".to_string() + substr))?.compile_matcher();
let re = regex::Regex::new(&globset::Glob::new(substr)?.regex().replace("(?-u)^", "").replace("*", "*?"))?;
for ftag in self.fields_mut() {
if glob.is_match(&ftag.name) {
let nlen = ftag.name.len();
ftag.name.truncate(nlen - len);
}
ftag.name = re.replace(&ftag.name, "").to_string();
}
Ok(())
}
Expand Down
Loading