kageru/advent-of-code
1
0
Fork 0
Code Issues 1 Pull Requests Releases Wiki Activity

Intcode: add method for single step execution

This commit is contained in:
kageru 2019-12-13 10:44:13 +01:00
parent 1d164979c6
commit b3f7431be4
2 changed files with 20 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
2019/intcode/src/intcomputer.rs
View File

@ -9,6 +9,7 @@ pub struct IntComputer {
pub enum IntComputerResult {
Halt,
Output(i64),
Continue,
}
impl IntComputerResult {
@ -16,6 +17,7 @@ impl IntComputerResult {
match self {
IntComputerResult::Halt => panic!("Attempted to get value of halt operation"),
IntComputerResult::Output(o) => o,
IntComputerResult::Continue => panic!("Attempted to get value of non-output operation"),
}
}
}
@ -31,15 +33,25 @@ impl IntComputer {
}
}
pub fn step(&mut self) -> IntComputerResult {
match self.cmd_buffer.pop().unwrap_or_else(|| self.decode_next()) {
Operation::Halt {} => return IntComputerResult::Halt,
op => {
if let Some(o) = self.execute(op.to_owned()) {
return IntComputerResult::Output(o);
} else {
return IntComputerResult::Continue;
}
}
}
}
pub fn run(&mut self) -> IntComputerResult {
loop {
match self.cmd_buffer.pop().unwrap_or_else(|| self.decode_next()) {
Operation::Halt {} => return IntComputerResult::Halt,
op => {
if let Some(o) = self.execute(op.to_owned()) {
return IntComputerResult::Output(o);
}
}
match self.step() {
IntComputerResult::Halt => return IntComputerResult::Halt,
IntComputerResult::Output(o) => return IntComputerResult::Output(o),
IntComputerResult::Continue => (),
}
}
}

1
2019/intcode/src/lib.rs
View File

@ -22,6 +22,7 @@ pub fn run_for_input(input: &Vec<i64>, acc: &mut i64, amp_phases: Vec<i64>) -> i
match amplifier.run() {
IntComputerResult::Output(output) => *acc = output,
IntComputerResult::Halt => break,
IntComputerResult::Continue => unreachable!()
}
}
*acc