mwojcik
/
nac3
forked from M-Labs/nac3
1
0
Fork 0
Code Pull Requests Activity

composer part fixes and cleanup

This commit is contained in:
mwojcik 2024-11-01 16:54:26 +08:00
parent 26059208ff
commit 2c390572d2
1 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
nac3core/src/toplevel/composer.rs
View File

@ -2140,14 +2140,17 @@ impl TopLevelComposer {
{ {
let subkernel_dest = keywords.iter().find(|keyword| { let subkernel_dest = keywords.iter().find(|keyword| {
if keyword.node.arg == Some("destination".into()) { if keyword.node.arg == Some("destination".into()) {
if let ExprKind::Constant { value, .. } = &keyword.node.value.node { match &keyword.node.value.node {
return true; ExprKind::Constant { .. } => true,
} _ => false
} }
} else {
false false
} }
}
).node.value.node.value; ).node.value.node.value;
if let Some(Constant::Int(sk_dest)) == subkernel_dest { // treat subkernel as kernel if the destination is the same as currently compiled
if let Some(Constant::Int(sk_dest)) = subkernel_dest {
if sk_dest != destination.unwrap_or(0) { if sk_dest != destination.unwrap_or(0) {
instance_to_symbol.insert(String::new(), simple_name.to_string()); instance_to_symbol.insert(String::new(), simple_name.to_string());
} }