Delete OutputType from Parser

cpisciotta · Feb 23, 2024 · 050c0c7 · 050c0c7
1 parent c695fa7
commit 050c0c7
Show file tree

Hide file tree

Showing 6 changed files with 7 additions and 83 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,
@@ -92,15 +91,11 @@ package class Parser {
 
     // MARK: - Init
 
-    public init() { }
+    package init() { }
 
-    public func parse(line: String) -> CaptureGroup? {
+    package func parse(line: String) -> CaptureGroup? {
         // 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
         }
 
@@ -115,8 +110,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/XcbeautifyLib/Regex.swift b/Sources/XcbeautifyLib/Regex.swift
@@ -1,6 +1,6 @@
 import Foundation
 
-public final class Regex {
+package final class Regex {
     let pattern: String
 
     private lazy var regex: NSRegularExpression? = try? NSRegularExpression(pattern: "^" + pattern, options: [.caseInsensitive])

diff --git a/Sources/xcbeautify/Xcbeautify.swift b/Sources/xcbeautify/Xcbeautify.swift
@@ -66,7 +66,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 {