use super::{ Program, Address, Instruction }; impl Program { pub(crate) fn remove_definition_addresses(&mut self) { for instr in &mut self.instructions { for arg in &mut instr.args { if let Address::Definitions(name) = arg { *arg = self.definitions[name].clone(); } } } } pub(crate) fn collapse_instructions(&mut self) { let mut collapsed = Vec::new(); let mut update_addrs = Vec::new(); for instr in &mut self.instructions { update_addrs.push(collapsed.len()); collapsed.extend(instr.collapse()); } for instr in &mut self.instructions { for arg in &mut instr.args { if let Address::Instruction(num) = arg { *arg = Address::Instruction(update_addrs[*num]); } } } self.instructions = collapsed; } }