Clean up

Author: drewolson

src/aoc/year2024/day15.gleam

@@ -81,31 +81,15 @@ fn push(
   case next_v {
     "." -> Ok(grid)
     "O" -> push(grid, next_c, next_v, v, dir)
-    _ -> Error(Nil)
-  }
-}
-
-fn push2(
-  grid: Grid,
-  coord: Coord,
-  v: String,
-  rep: String,
-  dir: Dir,
-) -> Result(Grid, Nil) {
-  let grid = dict.insert(grid, coord, rep)
-  use #(next_c, next_v) <- result.try(next(grid, coord, dir))
-  let grid = dict.insert(grid, next_c, v)
-  case next_v {
-    "." -> Ok(grid)
     "[" | "]" if dir == Left || dir == Right ->
-      push2(grid, next_c, next_v, v, dir)
+      push(grid, next_c, next_v, v, dir)
     "[" -> {
-      use grid <- result.try(push2(grid, next_c, next_v, v, dir))
-      push2(grid, #(next_c.0 + 1, next_c.1), "]", ".", dir)
+      use grid <- result.try(push(grid, next_c, next_v, v, dir))
+      push(grid, #(next_c.0 + 1, next_c.1), "]", ".", dir)
     }
     "]" -> {
-      use grid <- result.try(push2(grid, next_c, next_v, v, dir))
-      push2(grid, #(next_c.0 - 1, next_c.1), "[", ".", dir)
+      use grid <- result.try(push(grid, next_c, next_v, v, dir))
+      push(grid, #(next_c.0 - 1, next_c.1), "[", ".", dir)
     }
     _ -> Error(Nil)
   }
@@ -120,8 +104,8 @@ fn expand(c: String) -> List(String) {
   }
 }
 
-pub fn part1(input: String) -> Int {
-  let #(grid, dirs) = parse(input, fn(c) { [c] })
+pub fn solve(input: String, block: String, f: fn(String) -> List(String)) -> Int {
+  let #(grid, dirs) = parse(input, f)
   let robot = find_robot(grid)
   let #(grid, _) =
     list.fold(dirs, #(grid, robot), fn(acc, dir) {
@@ -134,27 +118,15 @@ pub fn part1(input: String) -> Int {
       result.unwrap(res, acc)
     })
   grid
-  |> dict.filter(fn(_k, v) { v == "O" })
+  |> dict.filter(fn(_k, v) { v == block })
   |> dict.keys
   |> list.fold(0, fn(s, k) { s + k.0 + 100 * k.1 })
 }
 
-pub fn part2(input: String) -> Int {
-  let #(grid, dirs) = parse(input, expand)
-  let robot = find_robot(grid)
-  let #(grid, _) =
-    list.fold(dirs, #(grid, robot), fn(acc, dir) {
-      let #(grid, robot) = acc
-      let res = {
-        use next_g <- result.try(push2(grid, robot, "@", ".", dir))
-        use #(next_r, _) <- result.map(next(grid, robot, dir))
-        #(next_g, next_r)
-      }
-      result.unwrap(res, acc)
-    })
+pub fn part1(input: String) -> Int {
+  solve(input, "O", fn(c) { [c] })
+}
 
-  grid
-  |> dict.filter(fn(_k, v) { v == "[" })
-  |> dict.keys
-  |> list.fold(0, fn(s, k) { s + k.0 + 100 * k.1 })
+pub fn part2(input: String) -> Int {
+  solve(input, "[", expand)
 }