Merge pull request #71 from owenv/basename-fix

Make module naming consistent with the integrated driver when the output filename has 2+ extensions

Author: DougGregor

Sources/SwiftDriver/Driver/Driver.swift

@@ -1163,12 +1163,12 @@ extension Driver {
   private static func baseNameWithoutExtension(_ path: String, hasExtension: inout Bool) -> String {
     if let absolute = try? AbsolutePath(validating: path) {
       hasExtension = absolute.extension != nil
-      return absolute.basenameWithoutAllExts
+      return absolute.basenameWithoutExt
     }
 
     if let relative = try? RelativePath(validating: path) {
       hasExtension = relative.extension != nil
-      return relative.basenameWithoutAllExts
+      return relative.basenameWithoutExt
     }
 
     hasExtension = false

Tests/SwiftDriverTests/SwiftDriverTests.swift

@@ -422,6 +422,19 @@ final class SwiftDriverTests: XCTestCase {
     XCTAssertTrue(plannedJobs3[0].commandLine.contains(.flag("-parse-as-library")))
   }
 
+  func testModuleNaming() throws {
+    XCTAssertEqual(try Driver(args: ["swiftc", "foo.swift"]).moduleName, "foo")
+    XCTAssertEqual(try Driver(args: ["swiftc", "foo.swift", "-o", "a.out"]).moduleName, "a")
+
+    // This is silly, but necesary for compatibility with the integrated driver.
+    XCTAssertEqual(try Driver(args: ["swiftc", "foo.swift", "-o", "a.out.optimized"]).moduleName, "main")
+
+    XCTAssertEqual(try Driver(args: ["swiftc", "foo.swift", "-o", "a.out.optimized", "-module-name", "bar"]).moduleName, "bar")
+    XCTAssertEqual(try Driver(args: ["swiftc", "foo.swift", "-o", "+++.out"]).moduleName, "main")
+    XCTAssertEqual(try Driver(args: ["swift"]).moduleName, "REPL")
+    XCTAssertEqual(try Driver(args: ["swiftc", "foo.swift", "-emit-library", "-o", "libBaz.dylib"]).moduleName, "Baz")
+  }
+
   func testOutputFileMapLoading() throws {
     let contents = """
     {