Skip to content

jextract/jni: Support enums that have no cases #577

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

Closed
sidepelican wants to merge 1 commit into from
Closed

jextract/jni: Support enums that have no cases #577

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
6 changes: 6 additions & 0 deletions Samples/SwiftJavaExtractJNISampleApp/Sources/MySwiftLibrary/NestedTypes.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,3 +45,9 @@ public enum NestedEnum {
public init() {}
}
}

public enum NamespaceEnum {
public enum Nested {
public static func something() {}
}
}
9 changes: 8 additions & 1 deletion Samples/SwiftJavaExtractJNISampleApp/src/test/java/com/example/swift/NestedTypesTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,4 +42,11 @@ void testStructInEnum() {
assertTrue(one.isPresent());
}
}
}

@Test
void testNamespaceEnum() {
try (var arena = SwiftArena.ofConfined()) {
NamespaceEnum.Nested.something();
}
}
}
6 changes: 5 additions & 1 deletion Sources/JExtractSwiftLib/JNI/JNISwift2JavaGenerator+JavaBindingsPrinting.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -374,7 +374,11 @@ extension JNISwift2JavaGenerator {
}

private func printEnumCaseInterface(_ printer: inout CodePrinter, _ decl: ImportedNominalType) {
printer.print("public sealed interface Case {}")
if decl.cases.isEmpty {
printer.print("public interface Case {}")
} else {
printer.print("public sealed interface Case {}")
}
printer.println()

let requiresSwiftArena = decl.cases.compactMap {
Expand Down
2 changes: 1 addition & 1 deletion Sources/JExtractSwiftLib/JNI/JNISwift2JavaGenerator+SwiftThunkPrinting.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -296,7 +296,7 @@ extension JNISwift2JavaGenerator {
) { printer in
let selfPointer = self.printSelfJLongToUnsafeMutablePointer(
&printer,
swiftParentName: type.swiftNominal.name,
swiftParentName: type.swiftNominal.qualifiedName,
Copy link
Contributor Author

@sidepelican sidepelican Feb 27, 2026

Choose a reason for hiding this comment

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

I have found another problem again

error: cannot find type 'Nested' in scope
544 |   assert(selfPointer != 0, "selfPointer memory address was null")
545 |   let selfBits$ = Int(Int64(fromJNI: selfPointer, in: env$))
546 |   guard let self$ = UnsafeMutablePointer<Nested>(bitPattern: selfBits$) else {
    |                                          `- error: cannot find type 'Nested' in scope
547 |     fatalError("self memory address was null in call to \(#function)!")
548 |   }

Copy link
Collaborator

@ktoso ktoso Feb 27, 2026

Choose a reason for hiding this comment

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

Hah ouch

selfPointerParam
)
printer.printBraceBlock("switch (\(selfPointer).pointee)") { printer in
Expand Down
Loading