Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

do not merge rules #179

Draft
wants to merge 1 commit into
base: master
Choose a base branch
from
+54 −11
Draft

do not merge rules #179

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/patch/device.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -171,7 +171,7 @@ impl DeviceExt for Device {

// Now process all peripherals
for (periphspec, val) in device {
let periphspec = periphspec.str()?;
let periphspec = periphspec.key()?;
if !Self::KEYWORDS.contains(&periphspec) {
//val["_path"] = device["_path"]; // TODO: check
self.process_peripheral(periphspec, val.hash()?, config)
Expand Down
37 changes: 32 additions & 5 deletions src/patch/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -221,11 +221,11 @@ fn update_dict(parent: &mut Hash, child: &Hash) -> Result<()> {
for (key, val) in child.iter() {
match key {
Yaml::String(key) if key == "_path" || key == "_include" => continue,
key if parent.contains_key(key) => {
Yaml::String(k) if parent.contains_key(key) && k.starts_with('_') => {
if let Entry::Occupied(mut e) = parent.entry(key.clone()) {
match e.get_mut() {
el if el == val => {
println!("In {key:?}: dublicate rule {val:?}, ignored");
println!("In {k}: dublicate rule {val:?}, ignored");
}
Yaml::Array(a) => match val {
Yaml::Array(val) => {
Expand All @@ -235,7 +235,7 @@ fn update_dict(parent: &mut Hash, child: &Hash) -> Result<()> {
if !a.contains(val) {
a.push(val.clone());
} else {
println!("In {key:?}: dublicate rule {val:?}, ignored");
println!("In {k}: dublicate rule {val:?}, ignored");
}
}
_ => {}
Expand All @@ -250,18 +250,45 @@ fn update_dict(parent: &mut Hash, child: &Hash) -> Result<()> {
a.insert(0, s.clone());
e.insert(Yaml::Array(a));
} else {
println!("In {key:?}: dublicate rule {s:?}, ignored");
println!("In {k}: dublicate rule {s:?}, ignored");
}
}
s2 if matches!(s2, Yaml::String(_)) => {
println!("In {key:?}: conflicting rules {s:?} and {s2:?}, ignored");
println!("In {k}: conflicting rules {s:?} and {s2:?}, ignored");
}
_ => {}
},
_ => {}
}
}
}
Yaml::String(_) if parent.contains_key(key) => {
let mut i = 0;
loop {
let key = Yaml::Array(vec![key.clone(), Yaml::Integer(i)]);
if !parent.contains_key(&key) {
parent.insert(key, val.clone());
break;
}
i += 1;
}
}
Yaml::Array(a)
if parent.contains_key(key)
&& matches!(a.as_slice(), [Yaml::String(_), Yaml::Integer(_)]) =>
{
if let [k @ Yaml::String(_), Yaml::Integer(_)] = a.as_slice() {
let mut i = 0;
loop {
let key = Yaml::Array(vec![k.clone(), Yaml::Integer(i)]);
if !parent.contains_key(&key) {
parent.insert(key, val.clone());
break;
}
i += 1;
}
}
}
_ => {
parent.insert(key.clone(), val.clone());
}
Expand Down
8 changes: 4 additions & 4 deletions src/patch/peripheral.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1251,7 +1251,7 @@ impl PeripheralExt for Peripheral {

// Handle registers or clusters
for (rcspec, rcmod) in pmod {
let rcspec = rcspec.str()?;
let rcspec = rcspec.key()?;
if Self::KEYWORDS.contains(&rcspec) {
continue;
}
Expand Down Expand Up @@ -1281,7 +1281,7 @@ impl PeripheralExt for Peripheral {

// Handle clusters
for (cspec, cluster) in pmod.hash_iter("_clusters") {
let cspec = cspec.str()?;
let cspec = cspec.key()?;
self.process_cluster(cspec, cluster.hash()?, &ppath, config)
.with_context(|| format!("According to `{cspec}`"))?;
}
Expand Down Expand Up @@ -1561,14 +1561,14 @@ impl ClusterExt for Cluster {

// Handle clusters
for (cspec, cluster) in cmod.hash_iter("_clusters") {
let cspec = cspec.str()?;
let cspec = cspec.key()?;
self.process_cluster(cspec, cluster.hash()?, &cpath, config)
.with_context(|| format!("According to `{cspec}`"))?;
}

// Handle registers or clusters
for (rcspec, rcmod) in cmod {
let rcspec = rcspec.str()?;
let rcspec = rcspec.key()?;
if Self::KEYWORDS.contains(&rcspec) {
continue;
}
Expand Down
2 changes: 1 addition & 1 deletion src/patch/register.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -263,7 +263,7 @@ impl RegisterExt for Register {
// Handle fields
if config.update_fields {
for (fspec, field) in rmod {
let fspec = fspec.str()?;
let fspec = fspec.key()?;
if Self::KEYWORDS.contains(&fspec) {
continue;
}
Expand Down
16 changes: 16 additions & 0 deletions src/patch/yaml_ext.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,8 @@ pub enum YamlError {
NotVec(Yaml),
#[error("Value is not a string: {0:?}")]
NotStr(Yaml),
#[error("Value is not a supported hash key: {0:?}")]
NotKey(Yaml),
#[error("Value is not integer: {0:?}")]
NotInt(Yaml),
#[error("Value is not boolean: {0:?}")]
Expand All @@ -23,6 +25,7 @@ pub trait AsType {
fn hash(&self) -> Result<&Hash, YamlError>;
fn vec(&self) -> Result<&Vec<Yaml>, YamlError>;
fn str(&self) -> Result<&str, YamlError>;
fn key(&self) -> Result<&str, YamlError>;
fn i64(&self) -> Result<i64, YamlError>;
fn bool(&self) -> Result<bool, YamlError>;
}
Expand All @@ -44,6 +47,19 @@ impl AsType for Yaml {
fn str(&self) -> Result<&str, YamlError> {
self.as_str().ok_or_else(|| YamlError::NotStr(self.clone()))
}
fn key(&self) -> Result<&str, YamlError> {
match self {
Yaml::String(k) => Ok(k),
Yaml::Array(a) if matches!(a.as_slice(), [Yaml::String(_), Yaml::Integer(_)]) => {
if let [Yaml::String(k), Yaml::Integer(_)] = a.as_slice() {
Ok(k)
} else {
unreachable!()
}
}
_ => Err(YamlError::NotKey(self.clone())),
}
}
fn i64(&self) -> Result<i64, YamlError> {
parse_i64(self).ok_or_else(|| YamlError::NotInt(self.clone()))
}
Expand Down
Loading