env

Author: burrbull

src/patch/device.rs

@@ -9,7 +9,7 @@ use std::{fs::File, io::Read, path::Path};
 use super::iterators::{MatchIter, Matched};
 use super::peripheral::{PeripheralExt, RegisterBlockExt};
 use super::yaml_ext::{AsType, GetVal};
-use super::{abspath, matchname, Config, PatchResult, Spec, VAL_LVL};
+use super::{abspath, matchname, update_env, Config, Env, PatchResult, Spec, VAL_LVL};
 use super::{make_address_block, make_address_blocks, make_cpu, make_interrupt, make_peripheral};
 use super::{make_dim_element, modify_dim_element, modify_register_properties};
 
@@ -55,6 +55,7 @@ pub trait DeviceExt {
         pspec: &str,
         peripheral: &Hash,
         config: &Config,
+        env: &Env,
     ) -> PatchResult;
 }
 
@@ -64,6 +65,9 @@ impl DeviceExt for Device {
     }
 
     fn process(&mut self, device: &Hash, config: &Config) -> PatchResult {
+        let mut env = Env::new();
+        update_env(&mut env, device)?;
+
         // Handle any deletions
         for pspec in device.str_vec_iter("_delete")? {
             self.delete_peripheral(pspec)
@@ -154,7 +158,7 @@ impl DeviceExt for Device {
             let periphspec = periphspec.str()?;
             if !periphspec.starts_with('_') {
                 //val["_path"] = device["_path"]; // TODO: check
-                self.process_peripheral(periphspec, val.hash()?, config)
+                self.process_peripheral(periphspec, val.hash()?, config, &env)
                     .with_context(|| format!("According to `{periphspec}`"))?;
             }
         }
@@ -415,13 +419,14 @@ impl DeviceExt for Device {
         pspec: &str,
         peripheral: &Hash,
         config: &Config,
+        env: &Env,
     ) -> PatchResult {
         // Find all peripherals that match the spec
         let mut pcount = 0;
         let (pspec, ignore) = pspec.spec();
         for ptag in self.iter_peripherals(pspec) {
             pcount += 1;
-            ptag.process(peripheral, config)
+            ptag.process(peripheral, config, env.clone())
                 .with_context(|| format!("Processing peripheral `{}`", ptag.name))?;
         }
         if !ignore && pcount == 0 {

src/patch/mod.rs

@@ -1,5 +1,7 @@
 pub mod patch_cli;
 
+use std::borrow::Cow;
+use std::collections::HashMap;
 use std::fs::File;
 use std::io::{Read, Write};
 use std::path::{Path, PathBuf};
@@ -30,6 +32,17 @@ use crate::get_encoder_config;
 
 const VAL_LVL: ValidateLevel = ValidateLevel::Weak;
 
+pub type Env = HashMap<Cow<'static, str>, String>;
+
+fn update_env(env: &mut Env, dict: &Hash) -> PatchResult {
+    for (key, val) in dict.hash_iter("_env") {
+        let key = key.str()?;
+        let val = val.str()?;
+        env.insert(key.to_string().into(), val.to_string());
+    }
+    Ok(())
+}
+
 #[non_exhaustive]
 #[derive(Clone, Debug)]
 pub struct Config {