Move the details of C99 identifier mangling out of ProjectModel and down into Utility. It looks as if at some point this was meant to be able to fail because it might remove all the characters and end up with an empty string, but now that it replaces characters it doesn't seem possible for it to end up with an empty string assuming it was given a non-empty string. Instead we just define it to never generate an empty string if given a non-empty string. It will continue to be the caller's responsibility to check separately for non-empty strings, for which it is likely to want different errors anyway (e.g. reporting a missing module name as different from a malformed module name or whatever).

Author: abertelrud

Sources/Commands/init.swift

@@ -55,9 +55,10 @@ final class InitPackage {
 
     init(mode: InitMode) throws {
         self.mode = mode
-        pkgname = rootd.basename
-        // Also validates that the name is valid.
-        moduleName = try c99name(name: rootd.basename)
+        let dirname = rootd.basename
+        assert(!dirname.isEmpty)  // a base name is never empty
+        self.pkgname = dirname
+        self.moduleName = dirname.mangledToC99ExtendedIdentifier()
     }
 
     func writePackageStructure() throws {

Sources/PackageModel/Module.swift

@@ -63,7 +63,7 @@ public class Module: ModuleProtocol {
         self.type = type
         self.sources = sources
         self.dependencies = []
-        self.c99name = try PackageModel.c99name(name: self.name)
+        self.c99name = self.name.mangledToC99ExtendedIdentifier()
         self.isTest = isTest
     }