Merge pull request #4 from DougGregor/jextract-nominal-type-resolution

Author: ktoso

Sources/JExtractSwift/ImportedDecls.swift

@@ -25,19 +25,28 @@ public struct ImportedProtocol: ImportedDecl {
   public var identifier: String
 }
 
-public struct ImportedClass: ImportedDecl {
+/// Describes a Swift nominal type (e.g., a class, struct, enum) that has been
+/// imported and is being translated into Java.
+public struct ImportedNominalType: ImportedDecl {
   public var name: ImportedTypeName
-
-  public var implementedInterfaces: Set<ImportedTypeName> = []
+  public var kind: NominalTypeKind
 
   public var initializers: [ImportedFunc] = []
   public var methods: [ImportedFunc] = []
 
-  public init(name: ImportedTypeName) {
+  public init(name: ImportedTypeName, kind: NominalTypeKind) {
     self.name = name
+    self.kind = kind
   }
 }
 
+public enum NominalTypeKind {
+  case `actor`
+  case `class`
+  case `enum`
+  case `struct`
+}
+
 public struct ImportedParam: Hashable {
   let param: FunctionParameterSyntax
 
@@ -99,9 +108,10 @@ public struct ImportedTypeName: Hashable {
     javaType.className
   }
 
-  public init(swiftTypeName: String, javaType: JavaType) {
+  public init(swiftTypeName: String, javaType: JavaType, swiftMangledName: String? = nil) {
     self.swiftTypeName = swiftTypeName
     self.javaType = javaType
+    self.swiftMangledName = swiftMangledName ?? ""
   }
 }
 
@@ -126,6 +136,8 @@ public struct ImportedFunc: ImportedDecl, CustomStringConvertible {
   /// This is a full name such as init(cap:name:).
   public var identifier: String
 
+  /// This is the base identifier for the function, e.g., "init" for an
+  /// initializer or "f" for "f(a:b:)".
   public var baseIdentifier: String {
     guard let idx = identifier.firstIndex(of: "(") else {
       return identifier
@@ -134,7 +146,7 @@ public struct ImportedFunc: ImportedDecl, CustomStringConvertible {
   }
 
   /// A display name to use to refer to the Swift declaration with its
-  /// enclosing type.
+  /// enclosing type, if there is one.
   public var displayName: String {
     if let parentName {
       return "\(parentName.swiftTypeName).\(identifier)"