make input non-optional

gereons · Dec 1, 2023 · b6c7bbe · b6c7bbe
1 parent e34f276
commit b6c7bbe
Show file tree

Hide file tree

Showing 27 changed files with 32 additions and 31 deletions.
diff --git a/Package.resolved b/Package.resolved
@@ -5,8 +5,8 @@
       "kind" : "remoteSourceControl",
       "location" : "https://github.com/gereons/AoCTools",
       "state" : {
-        "revision" : "689dbf8aa5897c5ab520cae6a9e6a339b12dddfe",
-        "version" : "0.0.40"
+        "revision" : "ea420cd028878482b9e80e556d75abe7048e2d27",
+        "version" : "0.0.41"
       }
     }
   ],

diff --git a/Sources/AoC.swift b/Sources/AoC.swift
@@ -38,11 +38,12 @@ struct AdventOfCode {
     private static func run(_ day: Day) {
         switch day {
         case .all:
-            days.forEach { day in
-                day.init(input: nil).run()
+            for day in days {
+                day.init(input: day.input).run()
             }
         case .day(let day):
-            days[day-1].init(input: nil).run()
+            let day = days[day - 1]
+            day.init(input: day.input).run()
         }
     }
 

diff --git a/Sources/Day01/Day01.swift b/Sources/Day01/Day01.swift
@@ -9,8 +9,8 @@ import AoCTools
 final class Day01: AOCDay {
     let lines: [String]
 
-    init(input: String?) {
-        lines = (input ?? Self.input).lines
+    init(input: String) {
+        lines = input.lines
     }
 
     func part1() -> Int {

diff --git a/Sources/Day02/Day02.swift b/Sources/Day02/Day02.swift
@@ -8,7 +8,7 @@ import AoCTools
 
 final class Day02: AOCDay {
 
-    init(input: String?) {
+    init(input: String) {
         // let input = input ?? Self.input
     }
 

diff --git a/Sources/Day03/Day03.swift b/Sources/Day03/Day03.swift
@@ -8,7 +8,7 @@ import AoCTools
 
 final class Day03: AOCDay {
 
-    init(input: String?) {
+    init(input: String) {
         // let input = input ?? Self.input
     }
 

diff --git a/Sources/Day04/Day04.swift b/Sources/Day04/Day04.swift
@@ -8,7 +8,7 @@ import AoCTools
 
 final class Day04: AOCDay {
 
-    init(input: String?) {
+    init(input: String) {
         // let input = input ?? Self.input
     }
 

diff --git a/Sources/Day05/Day05.swift b/Sources/Day05/Day05.swift
@@ -8,7 +8,7 @@ import AoCTools
 
 final class Day05: AOCDay {
 
-    init(input: String?) {
+    init(input: String) {
         // let input = input ?? Self.input
     }
 

diff --git a/Sources/Day06/Day06.swift b/Sources/Day06/Day06.swift
@@ -8,7 +8,7 @@ import AoCTools
 
 final class Day06: AOCDay {
 
-    init(input: String?) {
+    init(input: String) {
         // let input = input ?? Self.input
     }
 

diff --git a/Sources/Day07/Day07.swift b/Sources/Day07/Day07.swift
@@ -8,7 +8,7 @@ import AoCTools
 
 final class Day07: AOCDay {
 
-    init(input: String?) {
+    init(input: String) {
         // let input = input ?? Self.input
     }
 

diff --git a/Sources/Day08/Day08.swift b/Sources/Day08/Day08.swift
@@ -8,7 +8,7 @@ import AoCTools
 
 final class Day08: AOCDay {
 
-    init(input: String?) {
+    init(input: String) {
         // let input = input ?? Self.input
     }
 

diff --git a/Sources/Day09/Day09.swift b/Sources/Day09/Day09.swift
@@ -8,7 +8,7 @@ import AoCTools
 
 final class Day09: AOCDay {
 
-    init(input: String?) {
+    init(input: String) {
         // let input = input ?? Self.input
     }
 

diff --git a/Sources/Day10/Day10.swift b/Sources/Day10/Day10.swift
@@ -8,7 +8,7 @@ import AoCTools
 
 final class Day10: AOCDay {
 
-    init(input: String?) {
+    init(input: String) {
         // let input = input ?? Self.input
     }
 

diff --git a/Sources/Day11/Day11.swift b/Sources/Day11/Day11.swift
@@ -8,7 +8,7 @@ import AoCTools
 
 final class Day11: AOCDay {
 
-    init(input: String?) {
+    init(input: String) {
         // let input = input ?? Self.input
     }
 

diff --git a/Sources/Day12/Day12.swift b/Sources/Day12/Day12.swift
@@ -8,7 +8,7 @@ import AoCTools
 
 final class Day12: AOCDay {
 
-    init(input: String?) {
+    init(input: String) {
         // let input = input ?? Self.input
     }
 

diff --git a/Sources/Day13/Day13.swift b/Sources/Day13/Day13.swift
@@ -8,7 +8,7 @@ import AoCTools
 
 final class Day13: AOCDay {
 
-    init(input: String?) {
+    init(input: String) {
         // let input = input ?? Self.input
     }
 

diff --git a/Sources/Day14/Day14.swift b/Sources/Day14/Day14.swift
@@ -8,7 +8,7 @@ import AoCTools
 
 final class Day14: AOCDay {
 
-    init(input: String?) {
+    init(input: String) {
         // let input = input ?? Self.input
     }
 

diff --git a/Sources/Day15/Day15.swift b/Sources/Day15/Day15.swift
@@ -8,7 +8,7 @@ import AoCTools
 
 final class Day15: AOCDay {
 
-    init(input: String?) {
+    init(input: String) {
         // let input = input ?? Self.input
     }
 

diff --git a/Sources/Day16/Day16.swift b/Sources/Day16/Day16.swift
@@ -8,7 +8,7 @@ import AoCTools
 
 final class Day16: AOCDay {
 
-    init(input: String?) {
+    init(input: String) {
         // let input = input ?? Self.input
     }
 

diff --git a/Sources/Day17/Day17.swift b/Sources/Day17/Day17.swift
@@ -8,7 +8,7 @@ import AoCTools
 
 final class Day17: AOCDay {
 
-    init(input: String?) {
+    init(input: String) {
         // let input = input ?? Self.input
     }
 

diff --git a/Sources/Day18/Day18.swift b/Sources/Day18/Day18.swift
@@ -8,7 +8,7 @@ import AoCTools
 
 final class Day18: AOCDay {
 
-    init(input: String?) {
+    init(input: String) {
         // let input = input ?? Self.input
     }
 

diff --git a/Sources/Day19/Day19.swift b/Sources/Day19/Day19.swift
@@ -8,7 +8,7 @@ import AoCTools
 
 final class Day19: AOCDay {
 
-    init(input: String?) {
+    init(input: String) {
         // let input = input ?? Self.input
     }
 

diff --git a/Sources/Day20/Day20.swift b/Sources/Day20/Day20.swift
@@ -8,7 +8,7 @@ import AoCTools
 
 final class Day20: AOCDay {
 
-    init(input: String?) {
+    init(input: String) {
         // let input = input ?? Self.input
     }
 

diff --git a/Sources/Day21/Day21.swift b/Sources/Day21/Day21.swift
@@ -8,7 +8,7 @@ import AoCTools
 
 final class Day21: AOCDay {
 
-    init(input: String?) {
+    init(input: String) {
         // let input = input ?? Self.input
     }
 

diff --git a/Sources/Day22/Day22.swift b/Sources/Day22/Day22.swift
@@ -8,7 +8,7 @@ import AoCTools
 
 final class Day22: AOCDay {
 
-    init(input: String?) {
+    init(input: String) {
         // let input = input ?? Self.input
     }
 

diff --git a/Sources/Day23/Day23.swift b/Sources/Day23/Day23.swift
@@ -8,7 +8,7 @@ import AoCTools
 
 final class Day23: AOCDay {
 
-    init(input: String?) {
+    init(input: String) {
         // let input = input ?? Self.input
     }
 

diff --git a/Sources/Day24/Day24.swift b/Sources/Day24/Day24.swift
@@ -8,7 +8,7 @@ import AoCTools
 
 final class Day24: AOCDay {
 
-    init(input: String?) {
+    init(input: String) {
         // let input = input ?? Self.input
     }
 

diff --git a/Sources/Day25/Day25.swift b/Sources/Day25/Day25.swift
@@ -8,7 +8,7 @@ import AoCTools
 
 final class Day25: AOCDay {
 
-    init(input: String?) {
+    init(input: String) {
         // let input = input ?? Self.input
     }