Skip to content

Replace 'ParsableMessage' factory methods with an initializer. #32

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Nov 8, 2019
Merged

Replace 'ParsableMessage' factory methods with an initializer. #32

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b053aaf
Rename argument label 'msg:' to 'message:'.
rxwei Nov 5, 2019
36e505e
Drop static methods and add a public initializer.
rxwei Nov 6, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions Sources/SwiftDriver/Driver/ToolExecutionDelegate.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ public struct ToolExecutionDelegate: JobExecutorDelegate {
commandArguments: arguments[1...].map{ String($0) }
)

let message = ParsableMessage.beganMessage(name: job.kind.rawValue, msg: beganMessage)
let message = ParsableMessage(name: job.kind.rawValue, kind: .began(beganMessage))
emit(message)
}
}
Expand All @@ -75,12 +75,12 @@ public struct ToolExecutionDelegate: JobExecutorDelegate {
switch result.exitStatus {
case .terminated(let code):
let finishedMessage = FinishedMessage(exitStatus: Int(code), pid: pid, output: output)
message = ParsableMessage.finishedMessage(name: job.kind.rawValue, msg: finishedMessage)
message = ParsableMessage(name: job.kind.rawValue, kind: .finished(finishedMessage))

case .signalled(let signal):
let errorMessage = strsignal(signal).map { String(cString: $0) } ?? ""
let signalledMessage = SignalledMessage(pid: pid, output: output, errorMessage: errorMessage, signal: Int(signal))
message = ParsableMessage.signalledMessage(name: job.kind.rawValue, msg: signalledMessage)
message = ParsableMessage(name: job.kind.rawValue, kind: .signalled(signalledMessage))
}
emit(message)
}
Expand Down
22 changes: 3 additions & 19 deletions Sources/SwiftDriver/Execution/ParsableOutput.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,25 +23,9 @@ public struct ParsableMessage {
public let name: String
public let kind: Kind

public static func beganMessage(
name: String,
msg: BeganMessage
) -> ParsableMessage {
return ParsableMessage(name: name, kind: .began(msg))
}

public static func finishedMessage(
name: String,
msg: FinishedMessage
) -> ParsableMessage {
return ParsableMessage(name: name, kind: .finished(msg))
}

public static func signalledMessage(
name: String,
msg: SignalledMessage
) -> ParsableMessage {
return ParsableMessage(name: name, kind: .signalled(msg))
public init(name: String, kind: Kind) {
self.name = name
self.kind = kind
}

public func toJSON() throws -> Data {
Expand Down
12 changes: 6 additions & 6 deletions Tests/SwiftDriverTests/ParsableMessageTests.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ import SwiftDriver

final class ParsableMessageTests: XCTestCase {
func testBeganMessage() throws {
let msg = BeganMessage(
let message = BeganMessage(
pid: 1,
inputs: ["/path/to/foo.swift"],
outputs: [
Expand All @@ -26,7 +26,7 @@ final class ParsableMessageTests: XCTestCase {
commandArguments: ["-frontend", "compile"]
)

let beganMessage = ParsableMessage.beganMessage(name: "compile", msg: msg)
let beganMessage = ParsableMessage(name: "compile", kind: .began(message))

let encoded = try beganMessage.toJSON()
let string = String(data: encoded, encoding: .utf8)!
Expand Down Expand Up @@ -55,8 +55,8 @@ final class ParsableMessageTests: XCTestCase {
}

func testFinishedMessage() throws {
let msg = FinishedMessage(exitStatus: 1, pid: 1, output: "hello")
let finishedMessage = ParsableMessage.finishedMessage(name: "compile", msg: msg)
let message = FinishedMessage(exitStatus: 1, pid: 1, output: "hello")
let finishedMessage = ParsableMessage(name: "compile", kind: .finished(message))
let encoded = try finishedMessage.toJSON()
let string = String(data: encoded, encoding: .utf8)!

Expand All @@ -72,8 +72,8 @@ final class ParsableMessageTests: XCTestCase {
}

func testSignalledMessage() throws {
let msg = SignalledMessage(pid: 2, output: "sig", errorMessage: "err", signal: 3)
let signalledMessage = ParsableMessage.signalledMessage(name: "compile", msg: msg)
let message = SignalledMessage(pid: 2, output: "sig", errorMessage: "err", signal: 3)
let signalledMessage = ParsableMessage(name: "compile", kind: .signalled(message))
let encoded = try signalledMessage.toJSON()
let string = String(data: encoded, encoding: .utf8)!

Expand Down