Delete OutputType from Parser

cpisciotta · Feb 25, 2024 · 1f8cf1b · 1f8cf1b
1 parent 9e64508
commit 1f8cf1b
Show file tree

Hide file tree

Showing 5 changed files with 4 additions and 81 deletions.
diff --git a/Sources/XcbeautifyLib/CaptureGroups.swift b/Sources/XcbeautifyLib/CaptureGroups.swift
@@ -6,9 +6,11 @@ package protocol CaptureGroup {
     init?(groups: [String])
 }
 
-extension CaptureGroup {
+package extension CaptureGroup {
     var outputType: OutputType { Self.outputType }
+}
 
+extension CaptureGroup {
     static var pattern: String { regex.pattern }
     var pattern: String { Self.regex.pattern }
 }

diff --git a/Sources/XcbeautifyLib/Parser.swift b/Sources/XcbeautifyLib/Parser.swift
@@ -1,7 +1,6 @@
 import Foundation
 
 package class Parser {
-    package private(set) var outputType = OutputType.undefined
 
     private lazy var captureGroupTypes: [CaptureGroup.Type] = [
         AnalyzeCaptureGroup.self,
@@ -96,16 +95,11 @@ package class Parser {
 
     package func parse(line: String) -> CaptureGroup? {
         if line.isEmpty {
-            outputType = .undefined
             return nil
         }
 
         // Find first parser that can parse specified string
         guard let idx = captureGroupTypes.firstIndex(where: { $0.regex.match(string: line) }) else {
-            // Some uncommon cases, which have additional logic and don't follow default flow
-
-            // Nothing found?
-            outputType = OutputType.undefined
             return nil
         }
 
@@ -120,8 +114,6 @@ package class Parser {
             return nil
         }
 
-        outputType = captureGroupType.outputType
-
         // Move found parser to the top, so next time it will be checked first
         captureGroupTypes.insert(captureGroupTypes.remove(at: idx), at: 0)
 

diff --git a/Sources/xcbeautify/Xcbeautify.swift b/Sources/xcbeautify/Xcbeautify.swift
@@ -76,7 +76,7 @@ struct Xcbeautify: ParsableCommand {
                 continue
             }
             guard let formatted = formatter.format(captureGroup: captureGroup) else { continue }
-            output.write(parser.outputType, formatted)
+            output.write(captureGroup.outputType, formatted)
         }
 
         if !report.isEmpty {