[Xcodeproj] Match Xcode's c99names

Author: aciidgh

Fixtures/Miscellaneous/PackageWithNonc99NameModules/Package.swift

@@ -0,0 +1,7 @@
+import PackageDescription
+
+let package = Package(
+    name: "PackageWithNonc99NameModules",
+    targets: [
+        Target(name: "A-B", dependencies: ["B-C"])]
+)

Fixtures/Miscellaneous/PackageWithNonc99NameModules/Sources/A-B/ab.swift

@@ -0,0 +1,5 @@
+import B_C
+
+func ab() {
+    bc()
+}

Fixtures/Miscellaneous/PackageWithNonc99NameModules/Sources/B-C/bc.swift

@@ -0,0 +1,2 @@
+public func bc() {
+}

Fixtures/Miscellaneous/Spaces Fixture/Sources/Module Name 2/Foo.swift

@@ -1,5 +1,5 @@
-import ModuleName1
+import Module_Name_1
 
 public class Foo {
     var bar: Int = 0
-}
+}

Sources/PackageType/c99name().swift

@@ -12,7 +12,7 @@
  Removes characters from name that are invalid in C99 module-names.
 */
 public func c99name(name: String) throws  -> String {
-    var mapped = name.unicodeScalars.filter {
+    var mapped: [UnicodeScalar] = name.unicodeScalars.map {
         switch $0.value {
         case//  a-z       A-Z      0-9   _
             65...90, 97...122, 48...57, 95,
@@ -178,9 +178,9 @@ public func c99name(name: String) throws  -> String {
             0x4E00...0x9FA5,
             // Hangul,
             0xAC00...0xD7A3:
-            return true
+            return $0
         default:
-            return false
+            return "_"
         }
     }
 

Tests/Functional/MiscellaneousTests.swift

@@ -369,7 +369,7 @@ class MiscellaneousTestCase: XCTestCase {
     func testSpaces() {
         fixture(name: "Miscellaneous/Spaces Fixture") { prefix in
             XCTAssertBuilds(prefix)
-            XCTAssertFileExists(prefix, ".build/debug/ModuleName1.build/Foo.swift.o")
+            XCTAssertFileExists(prefix, ".build/debug/Module_Name_1.build/Foo.swift.o")
         }
     }
 }

Tests/PackageType/c99nameTests.swift

@@ -0,0 +1,33 @@
+/*
+ This source file is part of the Swift.org open source project
+
+ Copyright 2015 - 2016 Apple Inc. and the Swift project authors
+ Licensed under Apache License v2.0 with Runtime Library Exception
+
+ See http://swift.org/LICENSE.txt for license information
+ See http://swift.org/CONTRIBUTORS.txt for Swift project authors
+*/
+
+@testable import PackageType
+import XCTest
+
+class c99nameTests: XCTestCase {
+    func testSimpleName() {
+        let name = assertc99Name("foo")
+        XCTAssertEqual(name, "foo")
+    }
+
+    func testNameWithInvalidCharacter() {
+        let name = assertc99Name("foo-bar")
+        XCTAssertEqual(name, "foo_bar")
+    }
+}
+
+func assertc99Name(_ name: String) -> String {
+    do {
+        return try c99name(name: name)
+    } catch {
+        XCTFail("Couldn't find the c99name: \(error)")
+        fatalError()
+    }
+}

Tests/Xcodeproj/FunctionalTests.swift

@@ -78,6 +78,18 @@ class FunctionalTests: XCTestCase {
             XCTAssertFileExists(moduleUser, "build", "Debug", "SystemModuleUser")
         }
     }
+
+    func testModuleNamesWithNonC99Names() {
+        fixture(name: "Miscellaneous/PackageWithNonc99NameModules") { prefix in
+            XCTAssertXcodeprojGen(prefix)
+            let pbx = Path.join(prefix, "PackageWithNonc99NameModules.xcodeproj")
+            XCTAssertDirectoryExists(pbx)
+            XCTAssertXcodeBuild(project: pbx)
+            let build = Path.join(prefix, "build", "Debug")
+            XCTAssertFileExists(build, "libA-B.dylib")
+            XCTAssertFileExists(build, "libB-C.dylib")
+        }
+    }
 }
 
 func write(path: String, write: (OutputByteStream) -> Void) throws -> String {