From 174772b5b8d9f5bf5e3c8e8152adfd89f0e83f6b Mon Sep 17 00:00:00 2001 From: Justin Wernick Date: Tue, 19 Apr 2022 20:22:56 +0200 Subject: Refile for merging repos --- aoc23/Cargo.lock | 98 ---------------------- aoc23/Cargo.toml | 7 -- aoc23/input.txt | 26 ------ aoc23/src/main.rs | 247 ------------------------------------------------------ 4 files changed, 378 deletions(-) delete mode 100644 aoc23/Cargo.lock delete mode 100644 aoc23/Cargo.toml delete mode 100644 aoc23/input.txt delete mode 100644 aoc23/src/main.rs (limited to 'aoc23') diff --git a/aoc23/Cargo.lock b/aoc23/Cargo.lock deleted file mode 100644 index c6ab041..0000000 --- a/aoc23/Cargo.lock +++ /dev/null @@ -1,98 +0,0 @@ -[root] -name = "aoc23" -version = "0.1.0" -dependencies = [ - "regex 0.1.80 (registry+https://github.com/rust-lang/crates.io-index)", -] - -[[package]] -name = "aho-corasick" -version = "0.5.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -dependencies = [ - "memchr 0.1.11 (registry+https://github.com/rust-lang/crates.io-index)", -] - -[[package]] -name = "kernel32-sys" -version = "0.2.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -dependencies = [ - "winapi 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)", - "winapi-build 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", -] - -[[package]] -name = "libc" -version = "0.2.18" -source = "registry+https://github.com/rust-lang/crates.io-index" - -[[package]] -name = "memchr" -version = "0.1.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -dependencies = [ - "libc 0.2.18 (registry+https://github.com/rust-lang/crates.io-index)", -] - -[[package]] -name = "regex" -version = "0.1.80" -source = "registry+https://github.com/rust-lang/crates.io-index" -dependencies = [ - "aho-corasick 0.5.3 (registry+https://github.com/rust-lang/crates.io-index)", - "memchr 0.1.11 (registry+https://github.com/rust-lang/crates.io-index)", - "regex-syntax 0.3.9 (registry+https://github.com/rust-lang/crates.io-index)", - "thread_local 0.2.7 (registry+https://github.com/rust-lang/crates.io-index)", - "utf8-ranges 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)", -] - -[[package]] -name = "regex-syntax" -version = "0.3.9" -source = "registry+https://github.com/rust-lang/crates.io-index" - -[[package]] -name = "thread-id" -version = "2.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -dependencies = [ - "kernel32-sys 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)", - "libc 0.2.18 (registry+https://github.com/rust-lang/crates.io-index)", -] - -[[package]] -name = "thread_local" -version = "0.2.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -dependencies = [ - "thread-id 2.0.0 (registry+https://github.com/rust-lang/crates.io-index)", -] - -[[package]] -name = "utf8-ranges" -version = "0.1.3" -source = "registry+https://github.com/rust-lang/crates.io-index" - -[[package]] -name = "winapi" -version = "0.2.8" -source = "registry+https://github.com/rust-lang/crates.io-index" - -[[package]] -name = "winapi-build" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" - -[metadata] -"checksum aho-corasick 0.5.3 (registry+https://github.com/rust-lang/crates.io-index)" = "ca972c2ea5f742bfce5687b9aef75506a764f61d37f8f649047846a9686ddb66" -"checksum kernel32-sys 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)" = "7507624b29483431c0ba2d82aece8ca6cdba9382bff4ddd0f7490560c056098d" -"checksum libc 0.2.18 (registry+https://github.com/rust-lang/crates.io-index)" = "a51822fc847e7a8101514d1d44e354ba2ffa7d4c194dcab48870740e327cac70" -"checksum memchr 0.1.11 (registry+https://github.com/rust-lang/crates.io-index)" = "d8b629fb514376c675b98c1421e80b151d3817ac42d7c667717d282761418d20" -"checksum regex 0.1.80 (registry+https://github.com/rust-lang/crates.io-index)" = "4fd4ace6a8cf7860714a2c2280d6c1f7e6a413486c13298bbc86fd3da019402f" -"checksum regex-syntax 0.3.9 (registry+https://github.com/rust-lang/crates.io-index)" = "f9ec002c35e86791825ed294b50008eea9ddfc8def4420124fbc6b08db834957" -"checksum thread-id 2.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "a9539db560102d1cef46b8b78ce737ff0bb64e7e18d35b2a5688f7d097d0ff03" -"checksum thread_local 0.2.7 (registry+https://github.com/rust-lang/crates.io-index)" = "8576dbbfcaef9641452d5cf0df9b0e7eeab7694956dd33bb61515fb8f18cfdd5" -"checksum utf8-ranges 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)" = "a1ca13c08c41c9c3e04224ed9ff80461d97e121589ff27c753a16cb10830ae0f" -"checksum winapi 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)" = "167dc9d6949a9b857f3451275e911c3f44255842c1f7a76f33c55103a909087a" -"checksum winapi-build 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "2d315eee3b34aca4797b2da6b13ed88266e6d612562a0c46390af8299fc699bc" diff --git a/aoc23/Cargo.toml b/aoc23/Cargo.toml deleted file mode 100644 index 39fd06e..0000000 --- a/aoc23/Cargo.toml +++ /dev/null @@ -1,7 +0,0 @@ -[package] -name = "aoc23" -version = "0.1.0" -authors = ["Justin Worthe "] - -[dependencies] -regex = "0.1" \ No newline at end of file diff --git a/aoc23/input.txt b/aoc23/input.txt deleted file mode 100644 index 3ff0460..0000000 --- a/aoc23/input.txt +++ /dev/null @@ -1,26 +0,0 @@ -cpy a b -dec b -cpy a d -cpy 0 a -cpy b c -inc a -dec c -jnz c -2 -dec d -jnz d -5 -dec b -cpy b c -cpy c d -dec d -inc c -jnz d -2 -tgl c -cpy -16 c -jnz 1 c -cpy 90 c -jnz 90 d -inc a -inc d -jnz d -2 -inc c -jnz c -5 diff --git a/aoc23/src/main.rs b/aoc23/src/main.rs deleted file mode 100644 index a12fa18..0000000 --- a/aoc23/src/main.rs +++ /dev/null @@ -1,247 +0,0 @@ -extern crate regex; -use regex::Regex; - -use std::io::BufReader; -use std::io::prelude::*; -use std::fs::File; - -enum Instruction { - Inc(usize), - Dec(usize), - - TglLit(i32), - TglReg(usize), - - CpyLitReg(i32, usize), - CpyRegReg(usize, usize), - CpyLitLit(i32, i32), - CpyRegLit(usize, i32), - - JnzLitLit(i32, i32), - JnzRegLit(usize, i32), - JnzLitReg(i32, usize), - JnzRegReg(usize, usize), - - Noop -} - -impl Instruction { - fn parse(line: &str) -> Instruction { - match Regex::new(r"inc (a|b|c|d)").unwrap().captures(line) { - Some(cap) => { - let reg = to_register_index(cap.at(1).unwrap()); - return Instruction::Inc(reg); - }, - _ => {} - } - - match Regex::new(r"dec (a|b|c|d)").unwrap().captures(line) { - Some(cap) => { - let reg = to_register_index(cap.at(1).unwrap()); - return Instruction::Dec(reg); - }, - _ => {} - } - - - match Regex::new(r"tgl (a|b|c|d)").unwrap().captures(line) { - Some(cap) => { - let reg = to_register_index(cap.at(1).unwrap()); - return Instruction::TglReg(reg); - }, - _ => {} - } - - match Regex::new(r"tgl ([-\d]+)").unwrap().captures(line) { - Some(cap) => { - let lit = cap.at(1).unwrap().parse().unwrap(); - return Instruction::TglLit(lit); - }, - _ => {} - } - - - match Regex::new(r"cpy ([-\d]+) (a|b|c|d)").unwrap().captures(line) { - Some(cap) => { - let src = cap.at(1).unwrap().parse().unwrap(); - let dest = to_register_index(cap.at(2).unwrap()); - return Instruction::CpyLitReg(src, dest); - }, - _ => {} - } - - match Regex::new(r"cpy (a|b|c|d) (a|b|c|d)").unwrap().captures(line) { - Some(cap) => { - let src = to_register_index(cap.at(1).unwrap()); - let dest = to_register_index(cap.at(2).unwrap()); - return Instruction::CpyRegReg(src, dest); - }, - _ => {} - } - - match Regex::new(r"cpy ([-\d]+) ([-\d]+)").unwrap().captures(line) { - Some(cap) => { - let src = cap.at(1).unwrap().parse().unwrap(); - let dest = cap.at(2).unwrap().parse().unwrap(); - return Instruction::CpyLitLit(src, dest); - }, - _ => {} - } - - match Regex::new(r"cpy (a|b|c|d) ([-\d]+)").unwrap().captures(line) { - Some(cap) => { - let src = to_register_index(cap.at(1).unwrap()); - let dest = cap.at(2).unwrap().parse().unwrap(); - return Instruction::CpyRegReg(src, dest); - }, - _ => {} - } - - - match Regex::new(r"jnz ([-\d]+) (a|b|c|d)").unwrap().captures(line) { - Some(cap) => { - let src = cap.at(1).unwrap().parse().unwrap(); - let dest = to_register_index(cap.at(2).unwrap()); - return Instruction::JnzLitReg(src, dest); - }, - _ => {} - } - - match Regex::new(r"jnz (a|b|c|d) (a|b|c|d)").unwrap().captures(line) { - Some(cap) => { - let src = to_register_index(cap.at(1).unwrap()); - let dest = to_register_index(cap.at(2).unwrap()); - return Instruction::JnzRegReg(src, dest); - }, - _ => {} - } - - match Regex::new(r"jnz ([-\d]+) ([-\d]+)").unwrap().captures(line) { - Some(cap) => { - let src = cap.at(1).unwrap().parse().unwrap(); - let dest = cap.at(2).unwrap().parse().unwrap(); - return Instruction::JnzLitLit(src, dest); - }, - _ => {} - } - - match Regex::new(r"jnz (a|b|c|d) ([-\d]+)").unwrap().captures(line) { - Some(cap) => { - let src = to_register_index(cap.at(1).unwrap()); - let dest = cap.at(2).unwrap().parse().unwrap(); - return Instruction::JnzRegLit(src, dest); - }, - _ => {} - } - - panic!("Invalid instruction line"); - } - - fn toggle(&self) -> Self { - match *self { - Instruction::Inc(a) => Instruction::Dec(a), - Instruction::Dec(a) => Instruction::Inc(a), - - Instruction::TglLit(_) => Instruction::Noop, - Instruction::TglReg(a) => Instruction::Inc(a), - - Instruction::CpyLitReg(a, b) => Instruction::JnzLitReg(a, b), - Instruction::CpyRegReg(a, b) => Instruction::JnzRegReg(a, b), - Instruction::CpyLitLit(a, b) => Instruction::JnzLitLit(a, b), - Instruction::CpyRegLit(a, b) => Instruction::JnzRegLit(a, b), - - Instruction::JnzLitLit(a, b) => Instruction::CpyLitLit(a, b), - Instruction::JnzRegLit(a, b) => Instruction::CpyRegLit(a, b), - Instruction::JnzLitReg(a, b) => Instruction::CpyLitReg(a, b), - Instruction::JnzRegReg(a, b) => Instruction::CpyRegReg(a, b), - Instruction::Noop => Instruction::Noop - } - } -} - -fn main() { - let mut program = read_file(); - - let mut registers: [i32; 4] = [12, 0, 0, 0]; - let mut pc: usize = 0; - - while pc < program.len() { - let mut pc_next: usize = pc+1; - - match program[pc] { - Instruction::Inc(dest) => { - registers[dest] += 1; - }, - Instruction::Dec(dest) => { - registers[dest] -= 1; - }, - - Instruction::TglReg(offset) => { - let line_to_toggle = (pc as i32 + registers[offset]) as usize; - if line_to_toggle > 0 && line_to_toggle < program.len() { - program[line_to_toggle] = program[line_to_toggle].toggle(); - } - }, - Instruction::TglLit(offset) => { - let line_to_toggle = (pc as i32 + offset) as usize; - if line_to_toggle > 0 && line_to_toggle < program.len() { - program[line_to_toggle] = program[line_to_toggle].toggle(); - } - }, - - Instruction::CpyLitReg(src, dest) => { - registers[dest] = src; - }, - Instruction::CpyRegReg(src, dest) => { - registers[dest] = registers[src]; - }, - Instruction::CpyLitLit(_, _) | Instruction::CpyRegLit(_, _) => {}, - - Instruction::JnzRegLit(condition, offset) => { - if registers[condition] != 0 { - pc_next = (pc as i32 + offset) as usize; - } - }, - Instruction::JnzLitLit(condition, offset) => { - if condition != 0 { - pc_next = (pc as i32 + offset) as usize; - } - }, - Instruction::JnzRegReg(condition, offset) => { - if registers[condition] != 0 { - pc_next = (pc as i32 + registers[offset]) as usize; - } - }, - Instruction::JnzLitReg(condition, offset) => { - if condition != 0 { - pc_next = (pc as i32 + registers[offset]) as usize; - } - }, - Instruction::Noop => {} - } - - pc = pc_next; - } - - println!("a: {}, b: {}, c: {}, d: {}", registers[0], registers[1], registers[2], registers[3]); - -} - -fn to_register_index(name: &str) -> usize { - match name { - "a" => 0, - "b" => 1, - "c" => 2, - "d" => 3, - _ => panic!("Invalid register provided") - } -} - -fn read_file() -> Vec { - let file = BufReader::new(File::open("input.txt").unwrap()); - file.lines() - .map(|line| line.unwrap()) - .filter(|line| line.len() > 0) - .map(|line| Instruction::parse(line.trim())) - .collect() -} -- cgit v1.2.3