bert/adventofcode
1
0
Fork 0
mirror of https://github.com/bertptrs/adventofcode.git synced 2025-12-25 21:00:31 +01:00
Code Issues Projects Releases Wiki Activity

More cleanup.

Browse Source
This commit is contained in:
Bert Peters
2018-12-19 08:25:15 +01:00
parent 68c5809e43
commit 9d1fdc63c9
3 changed files with 34 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
2018/src/day16.rs
View File

@@ -6,8 +6,8 @@ use std::io::Read;
use regex::Regex;
use common::Solution;
use cpu::OpCode;
use cpu::CPU;
use cpu::OpCode;
pub struct Day16 {
matcher: Regex,
@@ -17,7 +17,7 @@ pub struct Day16 {
impl Day16 {
pub fn new() -> Self {
Day16 {
matcher: Regex::new(r"(\d+),? (\d+),? (\d+),? (\d+)").unwrap(),
matcher: Regex::new(r"\d+").unwrap(),
buf: String::new(),
}
}
@@ -28,15 +28,14 @@ impl Day16 {
return false;
}
if let Some(captures) = self.matcher.captures(&self.buf) {
for (target, cap) in target.iter_mut().zip(captures.iter().skip(1)) {
*target = cap.unwrap().as_str().parse().unwrap();
}
let mut found = false;
true
} else {
false
for (target, num) in target.iter_mut().zip(self.matcher.find_iter(&self.buf)) {
*target = num.as_str().parse().unwrap();
found = true
}
found
}
fn determine_options(&mut self, mut reader: &mut BufReader<&mut Read>) -> [HashSet<OpCode>; 16] {
@@ -49,9 +48,9 @@ impl Day16 {
let mut before = [0; 6];
let mut op = [0; 4];
let mut after = [0; 6];
while self.read(&mut reader, &mut before[..4]) {
while self.read(&mut reader, &mut before) {
self.read(&mut reader, &mut op);
self.read(&mut reader, &mut after[..4]);
self.read(&mut reader, &mut after);
reader.read_line(&mut self.buf).unwrap_or(0);
if mappings[op[0] as usize].is_empty() {
@@ -114,9 +113,9 @@ impl Solution for Day16 {
let mut after = [0; 6];
let mut counter = 0;
while self.read(&mut reader, &mut before[..4]) {
while self.read(&mut reader, &mut before) {
self.read(&mut reader, &mut op);
self.read(&mut reader, &mut after[..4]);
self.read(&mut reader, &mut after);
reader.read_line(&mut self.buf).unwrap_or(0);
let valid = OpCode::values()

4
2018/src/day19.rs
View File

@@ -28,8 +28,8 @@ impl Day19 {
let mut parts = line.split(' ');
let opcode = OpCode::from(parts.next().unwrap());
let mut operands = [0; 3];
for i in 0..3 {
operands[i] = parts.next().unwrap().parse().unwrap();
for (target, part) in operands.iter_mut().zip(parts) {
*target = part.parse().unwrap();
}
self.program.push((opcode, operands));