Merge #57

bors[bot] · burrbull · web-flow · commit ca927b33009b · 2021-05-28T12:59:21.000Z
57: clear_field r=adamgreig a=burrbull



Co-authored-by: Andrey Zgarbul &lt;zgarbul.andrey@gmail.com&gt;
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,6 +2,8 @@
 
 ## [Unreleased]
 
+* Add `_clear` for deleting all `enumeratedValues` from field
+
 ## [v0.1.13] 2021-04-16
 
 * Fix use of `vendorExtensions` tag in SVD files (#53)
diff --git a/svdtools/patch.py b/svdtools/patch.py
@@ -995,7 +995,10 @@ def process_register(self, rspec, register, update_fields=True):
             rcount += 1
             # Handle deletions
             for fspec in register.get("_delete", []):
-                r.delete(fspec)
+                r.delete_field(fspec)
+            # Handle field clearing
+            for fspec in register.get("_clear", []):
+                r.clear_field(fspec)
             # Handle modifications
             for fspec in register.get("_modify", []):
                 fmod = register["_modify"][fspec]
@@ -1108,11 +1111,19 @@ def add_field(self, fname, fadd):
             ET.SubElement(fnew, key).text = str(value)
         fnew.tail = "\n            "
 
-    def delete(self, fspec):
+    def delete_field(self, fspec):
         """Delete fields matched by fspec inside rtag."""
         for ftag in list(self.iter_fields(fspec)):
             self.rtag.find("fields").remove(ftag)
 
+    def clear_field(self, fspec):
+        """Clear contents of fields matched by fspec inside rtag."""
+        for ftag in list(self.iter_fields(fspec)):
+            for tag in ftag.findall("enumeratedValues"):
+                ftag.remove(tag)
+            for tag in ftag.findall("writeConstraint"):
+                ftag.remove(tag)
+
     def merge_fields(self, fspec):
         """Merge all fspec in rtag."""
         fields = list(self.iter_fields(fspec))
