Skip to content

Commit ecb0652

Browse files
committed
[jextract] Remove NominalTypeResolution
Instead, use SwiftSymbolTable mechanism.
1 parent 7a9ecb8 commit ecb0652

11 files changed

+125
-491
lines changed

Sources/JExtractSwift/ImportedDecls.swift

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -25,25 +25,25 @@ public typealias JavaPackage = String
2525

2626
/// Describes a Swift nominal type (e.g., a class, struct, enum) that has been
2727
/// imported and is being translated into Java.
28-
public struct ImportedNominalType: ImportedDecl {
29-
public let swiftTypeName: String
30-
public let javaType: JavaType
31-
public var kind: NominalTypeKind
28+
package struct ImportedNominalType: ImportedDecl {
29+
let swiftNominal: SwiftNominalTypeDeclaration
30+
let javaType: JavaType
31+
var kind: NominalTypeKind
3232

33-
public var initializers: [ImportedFunc] = []
34-
public var methods: [ImportedFunc] = []
35-
public var variables: [ImportedVariable] = []
33+
package var initializers: [ImportedFunc] = []
34+
package var methods: [ImportedFunc] = []
35+
package var variables: [ImportedVariable] = []
3636

37-
public init(swiftTypeName: String, javaType: JavaType, kind: NominalTypeKind) {
38-
self.swiftTypeName = swiftTypeName
37+
init(swiftNominal: SwiftNominalTypeDeclaration, javaType: JavaType, kind: NominalTypeKind) {
38+
self.swiftNominal = swiftNominal
3939
self.javaType = javaType
4040
self.kind = kind
4141
}
4242

4343
var translatedType: TranslatedType {
4444
TranslatedType(
4545
cCompatibleConvention: .direct,
46-
originalSwiftType: "\(raw: swiftTypeName)",
46+
originalSwiftType: "\(raw: swiftNominal.qualifiedName)",
4747
originalSwiftTypeKind: self.kind,
4848
cCompatibleSwiftType: "UnsafeRawPointer",
4949
cCompatibleJavaMemoryLayout: .heapObject,

Sources/JExtractSwift/NominalTypeResolution.swift

Lines changed: 0 additions & 354 deletions
This file was deleted.

0 commit comments

Comments
 (0)