Cleanup

Author: peterkovacs

.gitignore

@@ -6,3 +6,4 @@ DerivedData/
 .swiftpm/configuration/registries.json
 .swiftpm/xcode/package.xcworkspace/contents.xcworkspacedata
 .netrc
+input/

Sources/AdventOfCode.swift

@@ -1,11 +1,6 @@
-// The Swift Programming Language
-// https://docs.swift.org/swift-book
-//
-// Swift Argument Parser
-// https://swiftpackageindex.com/apple/swift-argument-parser/documentation
-
 import ArgumentParser
 import Foundation
+import Parsing
 
 extension ParsableCommand {
   var input: AnyIterator<String> {
@@ -33,7 +28,19 @@ extension ParsableCommand {
       default: `default`
     )
   }
+}
+
+protocol ParsingCommand: ParsableCommand {
+    associatedtype Output
+    associatedtype ParserType where ParserType: Parser<Substring.UTF8View, Output>
+    static var parser: ParserType { get }
+    func parsed() throws -> Output
+}
 
+extension ParsingCommand {
+    func parsed() throws -> Output {
+        try Self.parser.parse(stdin)
+    }
 }
 
 @main struct AdventOfCode: ParsableCommand {

Sources/Day1.swift

@@ -2,20 +2,25 @@ import ArgumentParser
 import Foundation
 import Parsing
 
-struct Day1: ParsableCommand {
-    static var parser: some Parser<Substring, (Int, Int)> {
-        Parse(input: Substring.self) {
-            Int.parser()
-            Skip {
-                Whitespace()
+
+struct Day1: ParsingCommand {
+    static var parser: some Parser<Substring.UTF8View, [(Int, Int)]> {
+        Parse(input: Substring.UTF8View.self) {
+            Many {
+                Int.parser()
+                Whitespace(.horizontal)
+                Int.parser()
+            } separator: {
+                Whitespace(.vertical)
+            } terminator: {
+                Whitespace(.vertical)
             }
-            Int.parser()
         }
     }
 
 
     func run() throws {
-        let numbers = try input.map { try Self.parser.parse($0) }
+        let numbers = try parsed()
         let first = numbers.map(\.0)
         let second = numbers.map(\.1)