Clean up logging in PIFSupport, use product name for target node values

PIF/Sources/PIFSupport/PIF.swift

@@ -306,8 +306,7 @@ public enum PIF {
 					case FileReference.type:
 						return try childrenContainer.decode(FileReference.self)
 					default:
-						// TODO: use logger here
-						print("unknown reference type: \(child.type ?? "<nil>")")
+						logger.debug("unknown reference type: \(child.type ?? "<nil>")")
 						return nil
 					}
 				}
@@ -508,8 +507,7 @@ public enum PIF {
 			case ResourcesBuildPhase.type:
 				return try container.decode(ResourcesBuildPhase.self)
 			default:
-				// TODO: replace with logger
-				print("unknown build phase: \(type)")
+				logger.debug("unknown build phase: \(type)")
 				return nil
 				// TODO: we should probably handle these:
 				/*

PIF/Sources/PIFSupport/PIFSupport.swift

@@ -1,4 +1,7 @@
 import Foundation
+import Logging
+
+var logger: Logger!
 
 public class PIFParser {
 	private let cachePath: URL
@@ -8,7 +11,8 @@ public class PIFParser {
 		case workspaceNotFound
 	}
 
-	public init(cachePath: URL) throws {
+	public init(cachePath: URL, logger log: Logger) throws {
+		logger = log
 		self.cachePath = cachePath
 
 		let data = try Data(contentsOf: try Self.workspacePath(in: cachePath))

Sources/GenIR/Dependency Graph/DependencyGraph.swift

@@ -44,24 +44,6 @@ class DependencyGraph<Value: NodeValue> {
 		return depthFirstSearch(startingAt: node)
 	}
 
-	func toDot(_ path: String) throws {
-		var contents = "digraph DependencyGraph {\n"
-
-		for node in nodes.values {
-			for edge in node.edges.filter({ $0.relationship == .dependency }) {
-				func dotSanitized(for name: String) -> String {
-					name
-						.replacingOccurrences(of: "-", with: "_")
-						.replacingOccurrences(of: ".", with: "_")
-				}
-				contents.append("\(dotSanitized(for: node.valueName)) -> \(dotSanitized(for: edge.to.valueName))\n")
-			}
-		}
-
-		contents.append("}")
-		try contents.write(toFile: path, atomically: true, encoding: .utf8)
-	}
-
 	/// Perform a depth-first search starting at the provided node
 	/// - Parameter node: the node whose children to search through
 	/// - Returns: an array of nodes ordered by a depth-first search approach
@@ -76,9 +58,8 @@ class DependencyGraph<Value: NodeValue> {
 			logger.debug("visited: \(visited)")
 
 			for edge in node.edges where edge.relationship == .dependency {
-				logger.debug("edge to: \(edge.to)")
 				if visited.insert(edge.to).inserted {
-					logger.debug("inserted, recursing")
+					logger.debug("edge to: \(edge.to)")
 					depthFirst(node: edge.to)
 				} else {
 					logger.debug("edge already in visited: \(visited)")
@@ -92,6 +73,19 @@ class DependencyGraph<Value: NodeValue> {
 		depthFirst(node: node)
 		return chain
 	}
+
+	func toDot(_ path: String) throws {
+		var contents = "digraph DependencyGraph {\n"
+
+		for node in nodes.values {
+			for edge in node.edges.filter({ $0.relationship == .dependency }) {
+				contents.append("\"\(node.valueName)\" -> \"\(edge.to.valueName)\"\n")
+			}
+		}
+
+		contents.append("}")
+		try contents.write(toFile: path, atomically: true, encoding: .utf8)
+	}
 }
 
 extension DependencyGraph: CustomStringConvertible {

Sources/GenIR/PIFCache.swift

@@ -16,7 +16,7 @@ class PIFCache {
 		self.pifCachePath = try Self.pifCachePath(in: buildCache)
 
 		do {
-			let cache = try PIFParser(cachePath: pifCachePath)
+			let cache = try PIFParser(cachePath: pifCachePath, logger: logger)
 			workspace = cache.workspace
 		} catch {
 			throw Error.pifError(error)

Sources/GenIR/Target.swift

@@ -39,7 +39,7 @@ extension Target {
 
 extension Target: NodeValue {
 	var value: Self { self }
-	var valueName: String { name }
+	var valueName: String { productName }
 }
 
 extension Target: Hashable {