Merge pull request #26 from ephemient/kt/day3

ephemient · Dec 3, 2024 · 6f32b54 · 6f32b54
2 parents e6da013 + 22d7ba6
commit 6f32b54
Showing 1 changed file with 8 additions and 23 deletions.
diff --git a/kt/aoc2024-lib/src/commonMain/kotlin/com/github/ephemient/aoc2024/Day3.kt b/kt/aoc2024-lib/src/commonMain/kotlin/com/github/ephemient/aoc2024/Day3.kt
@@ -1,31 +1,16 @@
 package com.github.ephemient.aoc2024
 
 class Day3(private val input: String) {
-    fun part1(): Int = regex1.findAll(input).sumOf { match ->
-        val (x, y) = match.destructured
-        x.toInt() * y.toInt()
-    }
+    fun part1(): Int = part1(input)
 
-    fun part2(): Int {
-        var enable = true
-        return regex2.findAll(input)
-            .filter { match ->
-                val (yes, no) = match.destructured
-                enable = when {
-                    yes.isNotEmpty() -> true
-                    no.isNotEmpty() -> false
-                    else -> return@filter enable
-                }
-                false
-            }
-            .sumOf { match ->
-                val (_, _, x, y) = match.destructured
-                x.toInt() * y.toInt()
-            }
-    }
+    fun part2(): Int = input.splitToSequence("do()").sumOf { part1(it.substringBefore("don't()")) }
 
     companion object {
-        private val regex1 = """mul\((\d+),(\d+)\)""".toRegex()
-        private val regex2 = """(do\(\))|(don't\(\))|mul\((\d+),(\d+)\)""".toRegex()
+        private val regex = """mul\((\d+),(\d+)\)""".toRegex()
+
+        private fun part1(input: String): Int = regex.findAll(input).sumOf { match ->
+            val (x, y) = match.destructured
+            x.toInt() * y.toInt()
+        }
     }
 }