Merge pull request #188 from rust-embedded/strip-alternate

strip in alternateRegister

Author: Emilgardis

CHANGELOG-python.md

@@ -6,6 +6,7 @@ This changelog tracks the Python `svdtools` project. See
 ## [Unreleased]
 
 * `-1` for default enum value
+* Strip `alternateRegister` too
 
 ## [v0.1.26] 2023-03-28
 

CHANGELOG-rust.md

@@ -6,6 +6,7 @@ This changelog tracks the Rust `svdtools` project. See
 ## [Unreleased]
 
 * Add `--enum_derive` flag
+* Strip `alternateRegister` too
 
 ## [v0.3.6] 2023-11-01
 

src/patch/peripheral.rs

@@ -581,6 +581,11 @@ impl RegisterBlockExt for Peripheral {
                     dname.drain(..len);
                 }
             }
+            if let Some(name) = rtag.alternate_register.as_mut() {
+                if glob.is_match(&name) {
+                    name.drain(..len);
+                }
+            }
         }
         Ok(())
     }
@@ -601,6 +606,12 @@ impl RegisterBlockExt for Peripheral {
                     dname.truncate(nlen - len);
                 }
             }
+            if let Some(name) = rtag.alternate_register.as_mut() {
+                if glob.is_match(&name) {
+                    let nlen = name.len();
+                    name.truncate(nlen - len);
+                }
+            }
         }
         Ok(())
     }
@@ -1040,6 +1051,11 @@ impl RegisterBlockExt for Cluster {
                     dname.drain(..len);
                 }
             }
+            if let Some(name) = rtag.alternate_register.as_mut() {
+                if glob.is_match(&name) {
+                    name.drain(..len);
+                }
+            }
         }
         Ok(())
     }
@@ -1060,6 +1076,12 @@ impl RegisterBlockExt for Cluster {
                     dname.truncate(nlen - len);
                 }
             }
+            if let Some(name) = rtag.alternate_register.as_mut() {
+                if glob.is_match(&name) {
+                    let nlen = name.len();
+                    name.truncate(nlen - len);
+                }
+            }
         }
         Ok(())
     }

svdtools/patch.py

@@ -1019,6 +1019,10 @@ def strip(self, substr, strip_end=False):
             if dnametag is not None:
                 dnametag.text = regex.sub("", dnametag.text)
 
+            alttag = rtag.find("alternateRegister")
+            if alttag is not None:
+                alttag.text = regex.sub("", alttag.text)
+
     def collect_in_array(self, rspec, rmod):
         """Collect same registers in peripheral into register array."""
         registers = []
@@ -1345,6 +1349,9 @@ def strip(self, substr: str, strip_end: bool = False) -> None:
             if dnametag is not None:
                 assert isinstance(dnametag.text, str)
                 dnametag.text = regex.sub("", dnametag.text)
+            alttag = rtag.find("alternateRegister")
+            if alttag is not None:
+                alttag.text = regex.sub("", alttag.text)
 
 
 def sorted_fields(fields):