Remove swiftDemangledMangledName; we'll use names derived from source code

Author: DougGregor

Sources/JExtractSwift/ImportedDecls.swift

@@ -86,7 +86,6 @@ public struct ImportedTypeName: Hashable {
   public var swiftTypeName: String
 
   public var swiftMangledName: String = ""
-  public var swiftDemangledMangledName: String = ""
 
   public var javaType: JavaType
 
@@ -124,7 +123,8 @@ public struct ImportedFunc: ImportedDecl, CustomStringConvertible {
   public var parentName: ImportedTypeName?
   public var hasParent: Bool { parentName != nil }
 
-  public var identifier: String  // FIXME: this is init(cap:name:) complete swift identifier; change that to be base
+  /// This is a full name such as init(cap:name:).
+  public var identifier: String
 
   public var baseIdentifier: String {
     guard let idx = identifier.firstIndex(of: "(") else {
@@ -133,6 +133,16 @@ public struct ImportedFunc: ImportedDecl, CustomStringConvertible {
     return String(identifier[..<idx])
   }
 
+  /// A display name to use to refer to the Swift declaration with its
+  /// enclosing type.
+  public var displayName: String {
+    if let parentName {
+      return "\(parentName.swiftTypeName).\(identifier)"
+    }
+
+    return identifier
+  }
+
   public var returnType: ImportedTypeName
   public var parameters: [ImportedParam]
 
@@ -173,7 +183,6 @@ public struct ImportedFunc: ImportedDecl, CustomStringConvertible {
   }
 
   public var swiftMangledName: String = ""
-  public var swiftDemangledMangledName: String = ""
 
   public var swiftDeclRaw: String? = nil
 

Sources/JExtractSwift/Swift2JavaTranslator+Printing.swift

@@ -502,9 +502,8 @@ extension Swift2JavaTranslator {
     printer.print(
       """
       /**
-       * Demangled representation:
        * {@snippet lang = Swift:
-       * \(decl.swiftDemangledMangledName)
+       * \(decl.displayName)
        * }
        */
       public static final MemorySegment ADDR = \(swiftModuleName).findOrThrow("\(decl.swiftMangledName)");

Sources/JExtractSwift/SwiftDylib.swift

@@ -46,7 +46,6 @@ package struct SwiftDylib {  // FIXME: remove this entire utility; replace with
     if let name = names.first {
       log.trace("Selected mangled name for '\(decl.name.javaType.description)': \(name)")
       decl.name.swiftMangledName = name.mangledName
-      decl.name.swiftDemangledMangledName = name.descriptiveName
     }
 
     return decl
@@ -64,7 +63,6 @@ package struct SwiftDylib {  // FIXME: remove this entire utility; replace with
     if let name = names.first {
       log.trace("Selected mangled name for '\(decl.identifier)': \(name)")
       decl.swiftMangledName = name.mangledName
-      decl.swiftDemangledMangledName = name.descriptiveName
     }
 
     return decl
@@ -85,7 +83,6 @@ package struct SwiftDylib {  // FIXME: remove this entire utility; replace with
     if let name = names.first {
       log.trace("Selected mangled name for '\(decl.identifier)': \(name)")
       decl.swiftMangledName = name.mangledName
-      decl.swiftDemangledMangledName = name.descriptiveName
     }
 
     return decl
@@ -103,7 +100,6 @@ package struct SwiftDylib {  // FIXME: remove this entire utility; replace with
     if let name = names.first {
       log.trace("Selected mangled name: \(name)")
       decl.swiftMangledName = name.mangledName
-      decl.swiftDemangledMangledName = name.descriptiveName
     }
 
     return decl