Added guard against register inheritance using derivedFrom

grossws · grossws · commit e94b369d73b9 · 2016-12-13T15:36:34.000+03:00
diff --git a/src/main.rs b/src/main.rs
@@ -68,6 +68,8 @@ fn gen_peripheral_desc(p: &svd::Peripheral, def: &svd::Defaults) -> String {
 }
 
 fn merge(p: &svd::Peripheral, bp: &svd::Peripheral) -> svd::Peripheral {
+    assert!(p.registers.is_none() || bp.registers.is_none(), "Either {} registers or {} registers must be absent in SVD", p.name, bp.name);
+
     svd::Peripheral {
         name: p.name.clone(),
         base_address: p.base_address,

Original file line number	Diff line number	Diff line change
`@@ -68,6 +68,8 @@ fn gen_peripheral_desc(p: &svd::Peripheral, def: &svd::Defaults) -> String {`
`68`	`68`	`}`
`69`	`69`
`70`	`70`	`fn merge(p: &svd::Peripheral, bp: &svd::Peripheral) -> svd::Peripheral {`
	`71`	`+ assert!(p.registers.is_none() \|\| bp.registers.is_none(), "Either {} registers or {} registers must be absent in SVD", p.name, bp.name);`
	`72`	`+`
`71`	`73`	`svd::Peripheral {`
`72`	`74`	`name: p.name.clone(),`
`73`	`75`	`base_address: p.base_address,`