Merge pull request #187 from rust-embedded/include

_include in root peripherals

Author: burrbull

CHANGELOG-python.md

@@ -5,6 +5,7 @@ This changelog tracks the Python `svdtools` project. See
 
 ## [Unreleased]
 
+* Support `_include` in peripherals in `device.yaml`
 * `-1` for default enum value
 * Strip `alternateRegister` too
 

CHANGELOG-rust.md

@@ -5,6 +5,7 @@ This changelog tracks the Rust `svdtools` project. See
 
 ## [Unreleased]
 
+* Support `_include` in peripherals in `device.yaml`
 * Add `--enum_derive` flag
 * Strip `alternateRegister` too
 * Add `modifiedWriteValues` and `readAction` field patch (#156)

src/patch/mod.rs

@@ -142,6 +142,21 @@ pub fn yaml_includes(parent: &mut Hash) -> Result<Vec<PathBuf>> {
     let y_path = "_path".to_yaml();
     let mut included = vec![];
     let self_path = PathBuf::from(parent.get(&y_path).unwrap().str()?);
+
+    // Process any peripheral-level includes in child
+    for (pspec, val) in parent.iter_mut() {
+        if !pspec.str()?.starts_with('_') {
+            match val {
+                Yaml::Hash(val) if val.contains_key(&"_include".to_yaml()) => {
+                    let ypath = self_path.to_str().unwrap().to_yaml();
+                    val.insert(y_path.clone(), ypath.clone());
+                    included.extend(yaml_includes(val)?);
+                }
+                _ => {}
+            }
+        }
+    }
+
     let inc = parent.get_vec("_include")?.unwrap_or(&Vec::new()).clone();
     for relpath in inc {
         let relpath = relpath.as_str().unwrap();
@@ -162,19 +177,6 @@ pub fn yaml_includes(parent: &mut Hash) -> Result<Vec<PathBuf>> {
         child.insert(y_path.clone(), ypath.clone());
         included.push(path.clone());
 
-        // Process any peripheral-level includes in child
-        for (pspec, val) in child.iter_mut() {
-            if !pspec.str()?.starts_with('_') {
-                match val {
-                    Yaml::Hash(val) if val.contains_key(&"_include".to_yaml()) => {
-                        val.insert(y_path.clone(), ypath.clone());
-                        included.extend(yaml_includes(val)?);
-                    }
-                    _ => {}
-                }
-            }
-        }
-
         // Process any top-level includes in child
         included.extend(yaml_includes(child)?);
         update_dict(parent, child)?;

svdtools/patch.py

@@ -119,6 +119,11 @@ def update_dict(parent, child):
 def yaml_includes(parent):
     """Recursively loads any included YAML files."""
     included = []
+    # Process any peripheral-level includes in child
+    for pspec in parent:
+        if not pspec.startswith("_") and "_include" in parent[pspec]:
+            parent[pspec]["_path"] = parent["_path"]
+            included += yaml_includes(parent[pspec])
     for relpath in parent.get("_include", []):
         path = abspath(parent["_path"], relpath)
         if path in included:
@@ -127,11 +132,6 @@ def yaml_includes(parent):
             child = yaml.safe_load(f)
         child["_path"] = path
         included.append(path)
-        # Process any peripheral-level includes in child
-        for pspec in child:
-            if not pspec.startswith("_") and "_include" in child[pspec]:
-                child[pspec]["_path"] = path
-                included += yaml_includes(child[pspec])
         # Process any top-level includes in child
         included += yaml_includes(child)
         update_dict(parent, child)