Skip to content

jextract/jni: Skip discriminator generation if enum has no cases #573

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

Open
sidepelican wants to merge 1 commit into
base: main
Choose a base branch
from
Open

jextract/jni: Skip discriminator generation if enum has no cases #573

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();
}
}
}
8 changes: 8 additions & 0 deletions Sources/JExtractSwiftLib/JNI/JNISwift2JavaGenerator+JavaBindingsPrinting.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -360,6 +360,10 @@ extension JNISwift2JavaGenerator {
}

private func printEnumDiscriminator(_ printer: inout CodePrinter, _ decl: ImportedNominalType) {
if decl.cases.isEmpty {
return
}

printer.printBraceBlock("public enum Discriminator") { printer in
printer.print(
decl.cases.map { $0.name.uppercased() }.joined(separator: ",\n")
Expand All @@ -374,6 +378,10 @@ extension JNISwift2JavaGenerator {
}

private func printEnumCaseInterface(_ printer: inout CodePrinter, _ decl: ImportedNominalType) {
if decl.cases.isEmpty {
return
}

printer.print("public sealed interface Case {}")
printer.println()

Expand Down
4 changes: 4 additions & 0 deletions Sources/JExtractSwiftLib/JNI/JNISwift2JavaGenerator+SwiftThunkPrinting.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -286,6 +286,10 @@ extension JNISwift2JavaGenerator {
}

private func printEnumDiscriminator(_ printer: inout CodePrinter, _ type: ImportedNominalType) {
if type.cases.isEmpty {
return
}

let selfPointerParam = JavaParameter(name: "selfPointer", type: .long)
printCDecl(
&printer,
Expand Down