Skip to content

jextract: [SwiftType] optional, array, dictionary, and set into nominal type #649

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
ktoso merged 11 commits into from
Mar 30, 2026
Merged

jextract: [SwiftType] optional, array, dictionary, and set into nominal type #649

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
773cf20
Treat optional, array, dictionary, set types as nominal type
sidepelican Mar 27, 2026
5aba410
Fix byteArray treated as raw c type
sidepelican Mar 27, 2026
cb098fa
Introduce asKnownType
sidepelican Mar 27, 2026
f9fdfe2
Use known type when to using generic parameter type
sidepelican Mar 27, 2026
1ae7808
format
sidepelican Mar 27, 2026
8ad3df1
Remove unused sugar name constants
sidepelican Mar 27, 2026
0c8bbb5
remove duplicated properties
sidepelican Mar 27, 2026
bc2ab21
Remove unrelated changes
sidepelican Mar 27, 2026
e19b67d
Remove duplicated description logic
sidepelican Mar 27, 2026
818602d
Merge remote-tracking branch 'origin/main' into asnominal
sidepelican Mar 30, 2026
2223792
Update Sources/JExtractSwiftLib/FFM/FFMSwift2JavaGenerator+JavaTransl…
ktoso Mar 30, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 5 additions & 3 deletions Sources/JExtractSwiftLib/Common/TypeAnnotations.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,10 +18,12 @@ import SwiftJavaJNICore
/// Determine if the given type needs any extra annotations that should be included
/// in Java sources when the corresponding Java type is rendered.
func getTypeAnnotations(swiftType: SwiftType, config: Configuration) -> [JavaAnnotation] {
switch swiftType {
case .array(let wrapped) where wrapped.isUnsignedInteger:
if swiftType.isUnsignedInteger {
return [JavaAnnotation.unsigned]
case _ where swiftType.isUnsignedInteger:
}

switch swiftType.asNominalType?.asKnownType {
Copy link
Copy Markdown
Collaborator

@ktoso ktoso Mar 30, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

OKey yeah I think this is a nice improvement

case .array(let element) where element.isUnsignedInteger:
return [JavaAnnotation.unsigned]
default:
return []
Expand Down
23 changes: 11 additions & 12 deletions Sources/JExtractSwiftLib/FFM/CDeclLowering/CRepresentation.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,20 +24,24 @@ extension CType {
init(cdeclType: SwiftType) throws {
switch cdeclType {
case .nominal(let nominalType):
if let knownType = nominalType.nominalTypeDecl.knownTypeKind {
if let primitiveCType = knownType.primitiveCType {
if let knownType = nominalType.asKnownType {
if let primitiveCType = knownType.kind.primitiveCType {
self = primitiveCType
return
}

switch knownType {
case .unsafePointer where nominalType.genericArguments?.count == 1:
case .optional(let wrapped) where wrapped.isPointer:
try self.init(cdeclType: wrapped)
return

case .unsafePointer(let pointee):
self = .pointer(
.qualified(const: true, volatile: false, type: try CType(cdeclType: nominalType.genericArguments![0]))
.qualified(const: true, volatile: false, type: try CType(cdeclType: pointee))
)
return
case .unsafeMutablePointer where nominalType.genericArguments?.count == 1:
self = .pointer(try CType(cdeclType: nominalType.genericArguments![0]))
case .unsafeMutablePointer(let pointee):
self = .pointer(try CType(cdeclType: pointee))
return
default:
break
Expand Down Expand Up @@ -67,10 +71,7 @@ extension CType {
case .tuple([]):
self = .void

case .optional(let wrapped) where wrapped.isPointer:
try self.init(cdeclType: wrapped)

case .genericParameter, .metatype, .optional, .tuple, .opaque, .existential, .composite, .array, .dictionary, .set:
case .genericParameter, .metatype, .tuple, .opaque, .existential, .composite:
throw CDeclToCLoweringError.invalidCDeclType(cdeclType)
}
}
Expand Down Expand Up @@ -127,8 +128,6 @@ extension SwiftKnownTypeDeclKind {
.pointer(
.qualified(const: true, volatile: false, type: .void)
)
case .array:
.pointer(.qualified(const: false, volatile: false, type: .void))
case .void: .void
default:
nil // Since we know the set of all primitives, we can safely assume all others are not primitive
Expand Down
Loading
Loading