Skip to content

Commit 2da3d8f

Browse files
committed
Changed name from C99 to C99ExtendedIdentifier to make things more
clear, based on feedback.
1 parent 764aef2 commit 2da3d8f

File tree

4 files changed

+11
-11
lines changed

4 files changed

+11
-11
lines changed

Sources/Basic/StringConversions.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@ public extension String {
7676

7777
/// Creates a string that contains only value C99 characters.
7878
/// FIXME: We will likely want a better name...
79-
public func mangledForC99() -> String {
79+
public func mangledToC99ExtendedIdentifier() -> String {
8080
// Map invalid C99-invalid Unicode scalars to a replacement character.
8181
let replacementUnichar: UnicodeScalar = "_"
8282
var mangledUnichars: [UnicodeScalar] = self.unicodeScalars.map {

Sources/Commands/init.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ final class InitPackage {
5656
init(mode: InitMode) throws {
5757
self.mode = mode
5858
self.pkgname = rootd.basename
59-
self.moduleName = rootd.basename.mangledForC99()
59+
self.moduleName = rootd.basename.mangledToC99ExtendedIdentifier()
6060
}
6161

6262
func writePackageStructure() throws {

Sources/PackageModel/Module.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ public class Module: ModuleProtocol {
6363
self.type = type
6464
self.sources = sources
6565
self.dependencies = []
66-
self.c99name = self.name.mangledForC99()
66+
self.c99name = self.name.mangledToC99ExtendedIdentifier()
6767
self.isTest = isTest
6868
}
6969

Tests/Basic/StringConversionsTests.swift

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -41,20 +41,20 @@ class StringConversionTests: XCTestCase {
4141
func testManglingForC99() {
4242

4343
// Simple cases.
44-
XCTAssertEqual("foo".mangledForC99(), "foo")
44+
XCTAssertEqual("foo".mangledToC99ExtendedIdentifier(), "foo")
4545

4646
// Edge cases.
47-
XCTAssertEqual("".mangledForC99(), "")
48-
XCTAssertEqual("_".mangledForC99(), "_")
49-
XCTAssertEqual("\n".mangledForC99(), "_")
47+
XCTAssertEqual("".mangledToC99ExtendedIdentifier(), "")
48+
XCTAssertEqual("_".mangledToC99ExtendedIdentifier(), "_")
49+
XCTAssertEqual("\n".mangledToC99ExtendedIdentifier(), "_")
5050

5151
// Invalid non-leading characters.
52-
XCTAssertEqual("_-".mangledForC99(), "__")
53-
XCTAssertEqual("foo-bar".mangledForC99(), "foo_bar")
52+
XCTAssertEqual("_-".mangledToC99ExtendedIdentifier(), "__")
53+
XCTAssertEqual("foo-bar".mangledToC99ExtendedIdentifier(), "foo_bar")
5454

5555
// Invalid leading characters.
56-
XCTAssertEqual("1".mangledForC99(), "_")
57-
XCTAssertEqual("1foo".mangledForC99(), "_foo")
56+
XCTAssertEqual("1".mangledToC99ExtendedIdentifier(), "_")
57+
XCTAssertEqual("1foo".mangledToC99ExtendedIdentifier(), "_foo")
5858

5959
// FIXME: There are lots more interesting test cases to add here.
6060
}

0 commit comments

Comments
 (0)