Skip to content

Commit

Permalink
Description: Allow unicode chars in package-name in driver.
Browse files Browse the repository at this point in the history
Frontend already allows them but the same change was not made in
driver. This PR fixes that for consistency.
Risk: Low. Frontend already allows unicode chars.
Original PR: #1367
Reivewers: @artemcm
Testing: Modified an existing test to allow unicode chars in package-name
Resolves: rdar://110021211
  • Loading branch information
elsh committed May 30, 2023
1 parent 1d8848d commit 9049e6a
Show file tree
Hide file tree
Showing 3 changed files with 11 additions and 13 deletions.
9 changes: 5 additions & 4 deletions Sources/SwiftDriver/Driver/Driver.swift
Original file line number Diff line number Diff line change
Expand Up @@ -641,11 +641,12 @@ public struct Driver {
// Compute debug information output.
self.debugInfo = Self.computeDebugInfo(&parsedOptions, diagnosticsEngine: diagnosticEngine)

// Validate package name; if package name is nil, it will be checked
// in the frontend during type check on `package` symbols
// Error if package-name is passed but the input is empty;
// If package-name is not passed but `package` decls exist, error will
// occur during the frontend type check.
self.packageName = parsedOptions.getLastArgument(.packageName)?.asSingle
if let packageName = packageName, !packageName.sd_isSwiftIdentifier {
diagnosticsEngine.emit(.error_bad_package_name(packageName))
if let packageName = packageName, packageName.isEmpty {
diagnosticsEngine.emit(.error_empty_package_name)
}

// Determine the module we're building and whether/how the module file itself will be emitted.
Expand Down
7 changes: 2 additions & 5 deletions Sources/SwiftDriver/Utilities/Diagnostics.swift
Original file line number Diff line number Diff line change
Expand Up @@ -123,11 +123,8 @@ extension Diagnostic.Message {
return .error("bad module alias \"\(arg)\"")
}

static func error_bad_package_name(_ packageName: String) -> Diagnostic.Message {
if packageName.isEmpty {
return .error("package name is empty; pass a non-empty string or remove \'-package-name\'")
}
return .error("package name \"\(packageName)\" is not a valid identifier")
static var error_empty_package_name: Diagnostic.Message {
return .error("package-name is empty")
}

static var error_hermetic_seal_cannot_have_library_evolution: Diagnostic.Message {
Expand Down
8 changes: 4 additions & 4 deletions Tests/SwiftDriverTests/SwiftDriverTests.swift
Original file line number Diff line number Diff line change
Expand Up @@ -690,13 +690,13 @@ final class SwiftDriverTests: XCTestCase {
}

func testPackageNameFlag() throws {
// -package-name mypkg (valid string)
try assertNoDriverDiagnostics(args: "swiftc", "file.swift", "bar.swift", "-module-name", "MyModule", "-package-name", "mypkg", "-emit-module", "-emit-module-path", "../../path/to/MyModule.swiftmodule") { driver in
XCTAssertEqual(driver.packageName, "mypkg")
// -package-name com.perf.my-pkg (valid string)
try assertNoDriverDiagnostics(args: "swiftc", "file.swift", "bar.swift", "-module-name", "MyModule", "-package-name", "com.perf.my-pkg", "-emit-module", "-emit-module-path", "../../path/to/MyModule.swiftmodule") { driver in
XCTAssertEqual(driver.packageName, "com.perf.my-pkg")
XCTAssertEqual(driver.moduleOutputInfo.output, .topLevel(try VirtualPath.intern(path: "../../path/to/MyModule.swiftmodule")))
}

// -package-name is not passed
// -package-name is not passed and file doesn't contain `package` decls
try assertNoDriverDiagnostics(args: "swiftc", "file.swift") { driver in
XCTAssertNil(driver.packageName)
XCTAssertEqual(driver.moduleOutputInfo.name, "file")
Expand Down

0 comments on commit 9049e6a

Please sign in to comment.