update tools

Package.resolved

@@ -1,13 +1,13 @@
 {
-  "originHash" : "5dd3524b7d5f73e2fcb51fd6a068ef044dbff1de9d2bc21ebb551fc79a4362ad",
+  "originHash" : "0143f3c2b660563bca033f76ffa9c8ca98618131218ccc5e53ccba3c5aed7255",
   "pins" : [
     {
       "identity" : "aoctools",
       "kind" : "remoteSourceControl",
       "location" : "https://github.com/gereons/AoCTools",
       "state" : {
-        "revision" : "4d9a9622e206981fc79c03473864f85c77b05a00",
-        "version" : "0.1.5"
+        "revision" : "d363eb88c324269a870d3fe233dd622c04ba3e60",
+        "version" : "0.1.6"
       }
     },
     {

Package.swift

@@ -10,7 +10,7 @@ let package = Package(
     ],
     dependencies: [
         .package(url: "https://github.com/lukepistrol/SwiftLintPlugin", from: "0.55.1"),
-        .package(url: "https://github.com/gereons/AoCTools", from: "0.1.3")
+        .package(url: "https://github.com/gereons/AoCTools", from: "0.1.6")
 //        .package(path: "../AoCTools")
     ],
     targets: [

Sources/Day01/Day01.swift

@@ -14,7 +14,7 @@ final class Day01: AOCDay {
 
     init(input: String) {
         let pairs = input.lines
-            .map { $0.allInts() }
+            .map { $0.integers() }
 
         left = pairs.map { $0[0] }
         right = pairs.map { $0[1] }

Sources/Day02/Day02.swift

@@ -58,7 +58,7 @@ final class Day02: AOCDay {
     private let reports: [Report]
 
     init(input: String) {
-        reports = input.lines.map { Report(data: $0.allInts()) }
+        reports = input.lines.map { Report(data: $0.integers()) }
     }
 
     func part1() -> Int {

Sources/Day05/Day05.swift

@@ -21,12 +21,12 @@ final class Day05: AOCDay {
         let groups = input.lines.grouped(by: \.isEmpty)
 
         rules = groups[0]
-            .map { $0.allInts() }
+            .map { $0.integers() }
             .map { Rule(page1: $0[0], page2: $0[1]) }
             .makeSet()
 
         updates = groups[1]
-            .map { $0.allInts() }
+            .map { $0.integers() }
     }
 
     func part1() -> Int {

Sources/Day07/Day07.swift

@@ -5,14 +5,13 @@
 //
 
 import AoCTools
-import Foundation
 
 final class Day07: AOCDay {
     let title = "Bridge Repair"
 
     let equations: [[Int]]
     init(input: String) {
-        equations = input.lines.map { $0.allInts() }
+        equations = input.lines.map { $0.integers() }
     }
 
     func part1() -> Int {

Sources/Day11/Day11.swift

@@ -13,7 +13,7 @@ final class Day11: AOCDay {
     let stones: [Int]
 
     init(input: String) {
-        stones = input.allInts()
+        stones = input.integers()
     }
 
     func part1() -> Int {

Sources/Day13/Day13.swift

@@ -21,9 +21,9 @@ final class Day13: AOCDay {
         let groups = input.lines.grouped(by: \.isEmpty)
 
         machines = groups.map {
-            let btnA = $0[0].allInts()
-            let btnB = $0[1].allInts()
-            let prize = $0[2].allInts()
+            let btnA = $0[0].integers()
+            let btnB = $0[1].integers()
+            let prize = $0[2].integers()
             return Machine(
                 buttonA: Point(btnA[0], btnA[1]),
                 buttonB: Point(btnB[0], btnB[1]),

Sources/Day14/Day14.swift

@@ -24,7 +24,7 @@ final class Day14: AOCDay {
 
     init(input: String, width: Int, height: Int) {
         robots = input.lines
-            .map { $0.allInts() }
+            .map { $0.integers() }
             .map { Robot(position: Point($0[0], $0[1]), velocity: Point($0[2], $0[3])) }
         self.height = height
         self.width = width

Sources/Day17/Day17.swift

@@ -75,10 +75,10 @@ final class Day17: AOCDay {
 
     init(input: String) {
         let lines = input.lines
-        let regA = lines[0].allInts()[0]
-        let regB = lines[1].allInts()[0]
-        let regC = lines[2].allInts()[0]
-        let program = lines[4].allInts()
+        let regA = lines[0].integers()[0]
+        let regB = lines[1].integers()[0]
+        let regC = lines[2].integers()[0]
+        let program = lines[4].integers()
 
         cpu = ChronospatialComputer(program: program, initialRegisters: [regA, regB, regC])
     }

Sources/Day18/Day18.swift

@@ -13,7 +13,7 @@ final class Day18: AOCDay {
     var ram = [Point: Character]()
 
     init(input: String) {
-        bytes = input.lines.map { $0.allInts() }.map { Point($0[0], $0[1]) }
+        bytes = input.lines.map { $0.integers() }.map { Point($0[0], $0[1]) }
     }
 
     func part1() -> Int {

Sources/Day21/Day21.swift

@@ -115,21 +115,9 @@ final class Day21: AOCDay {
             guard let nextChar = map[startPoint + dir] else { continue }
             if nextChar != "X" && !visited.contains(nextChar) {
                 let nextSteps = generateSteps(map: map, start: nextChar, end: end, visited: visited + start)
-                results.append(contentsOf: nextSteps.map { dir.char + $0 })
+                results.append(contentsOf: nextSteps.map { dir.description + $0 })
             }
         }
         return results
     }
 }
-
-extension Direction {
-    var char: String {
-        switch self {
-        case .n: "^"
-        case .e: ">"
-        case .w: "<"
-        case .s: "v"
-        default: fatalError()
-        }
-    }
-}