Reimplemented glob stripping with regex.

Author: egormanga

src/patch/peripheral.rs

@@ -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())?;
         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(())

src/patch/register.rs

@@ -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(())
     }