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

check on self-derive in expand #262

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
+36 −15
Open

check on self-derive in expand #262

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
51 changes: 36 additions & 15 deletions svd-parser/src/expand.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -391,16 +391,20 @@ pub fn derive_cluster(
let (dparent, dname) = BlockPath::parse_str(dpath);
let rdpath;
let cluster_path;
let d = (if let Some(dparent) = dparent {
if let Some(dparent) = dparent {
cluster_path = dparent.new_cluster(dname);
rdpath = dparent;
index.clusters.get(&cluster_path)
} else {
cluster_path = path.new_cluster(dname);
rdpath = path.clone();
index.clusters.get(&cluster_path)
})
.ok_or_else(|| anyhow!("cluster {} not found", dpath))?;
}
if &rdpath == path && dname == &c.name {
return Err(anyhow!("Cluster {cluster_path} is self-derived"));
}
let d = index
.clusters
.get(&cluster_path)
.ok_or_else(|| anyhow!("cluster {} not found", dpath))?;

let mut cpath = None;
if c.children.is_empty() {
Expand All @@ -422,16 +426,20 @@ pub fn derive_register(
let (dblock, dname) = RegisterPath::parse_str(dpath);
let rdpath;
let reg_path;
let d = (if let Some(dblock) = dblock {
if let Some(dblock) = dblock {
reg_path = dblock.new_register(dname);
rdpath = dblock;
index.registers.get(&reg_path)
} else {
reg_path = path.new_register(dname);
rdpath = path.clone();
index.registers.get(&reg_path)
})
.ok_or_else(|| anyhow!("register {} not found", dpath))?;
}
if &rdpath == path && dname == &r.name {
return Err(anyhow!("Register {reg_path} is self-derived"));
}
let d = index
.registers
.get(&reg_path)
.ok_or_else(|| anyhow!("register {} not found", dpath))?;

let mut rpath = None;
if r.fields.is_none() {
Expand All @@ -453,16 +461,20 @@ pub fn derive_field(
let (dregister, dname) = FieldPath::parse_str(dpath);
let rdpath;
let field_path;
let d = (if let Some(dregister) = dregister {
if let Some(dregister) = dregister {
field_path = dregister.new_field(dname);
rdpath = dregister;
index.fields.get(&field_path)
} else {
field_path = rpath.new_field(dname);
rdpath = rpath.clone();
index.fields.get(&field_path)
})
.ok_or_else(|| anyhow!("field {} not found", dpath))?;
}
if &rdpath == rpath && dname == &f.name {
return Err(anyhow!("Field {field_path} is self-derived"));
}
let d = index
.fields
.get(&field_path)
.ok_or_else(|| anyhow!("field {} not found", dpath))?;

let mut fpath = None;
if f.enumerated_values.is_empty() {
Expand Down Expand Up @@ -556,6 +568,9 @@ pub fn derive_enumerated_values(
fpath: &FieldPath,
index: &Index,
) -> Result<EnumPath> {
if Some(dpath) == ev.name.as_deref() {
return Err(anyhow!("EnumeratedValues {fpath}.{dpath} is self-derived"));
}
let mut v: Vec<&str> = dpath.split('.').collect();
let dname = v.pop().unwrap();
let d = if v.is_empty() {
Expand Down Expand Up @@ -590,6 +605,9 @@ pub fn derive_enumerated_values(
};
FieldPath::new(rdpath, fdname)
};
if &fdpath == fpath && Some(dname) == ev.name.as_deref() {
return Err(anyhow!("EnumeratedValues {fpath}.{dname} is self-derived"));
}
let epath = EnumPath::new(fdpath, dname);
index.evs.get(&epath).map(|d| (d, epath))
};
Expand All @@ -615,6 +633,9 @@ pub fn derive_peripheral(
dpath: &str,
index: &Index,
) -> Result<Option<BlockPath>> {
if dpath == &p.name {
return Err(anyhow!("Peripheral {dpath} is self-derived"));
}
let mut path = None;
let derpath = BlockPath::new(dpath);
let d = index
Expand Down