Skip to content

jextract/jni: Use switch expressions in getCase() #717

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 1 commit into from
Apr 22, 2026
Merged

jextract/jni: Use switch expressions in getCase() #717

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
4 changes: 3 additions & 1 deletion Sources/CodePrinting/CodePrinter.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -91,6 +91,7 @@ public struct CodePrinter {
public mutating func printBraceBlock(
_ header: Any,
parameters: [String]? = nil,
_ terminator: PrinterTerminator = .sloc,
function: String = #function,
file: String = #fileID,
line: UInt = #line,
Expand All @@ -104,7 +105,7 @@ public struct CodePrinter {
indent()
try body(&self)
outdent()
print("}", .sloc, function: function, file: file, line: line)
print("}", terminator, function: function, file: file, line: line)
}

public mutating func printIfBlock(
Expand Down Expand Up @@ -224,6 +225,7 @@ public enum PrinterTerminator: String {
case commaNewLine = ",\n"
case `continue` = ""
case sloc = "// <source location>"
case semicolonNewLine = ";\n"

public static func parameterSeparator(_ isLast: Bool) -> Self {
if isLast {
Expand Down
6 changes: 2 additions & 4 deletions Sources/JExtractSwiftLib/JNI/JNISwift2JavaGenerator+JavaBindingsPrinting.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -528,19 +528,17 @@ extension JNISwift2JavaGenerator {
}.contains(where: \.requiresSwiftArena)

printer.printBraceBlock("public Case getCase(\(requiresSwiftArena ? "SwiftArena swiftArena" : ""))") { printer in
printer.print("Discriminator discriminator = this.getDiscriminator();")
printer.printBraceBlock("switch (discriminator)") { printer in
printer.printBraceBlock("return switch (this.getDiscriminator())", .semicolonNewLine) { printer in
for enumCase in decl.cases {
guard let translatedCase = self.translatedEnumCase(for: enumCase) else {
continue
}
let arenaArgument = translatedCase.requiresSwiftArena ? "swiftArena" : ""
printer.print(
"case \(enumCase.name.uppercased()): return this.getAs\(enumCase.name.firstCharacterUppercased)(\(arenaArgument)).orElseThrow();"
"case \(enumCase.name.uppercased()) -> this.getAs\(enumCase.name.firstCharacterUppercased)(\(arenaArgument)).orElseThrow();"
)
}
}
printer.print(#"throw new RuntimeException("Unknown discriminator value " + discriminator);"#)
}
}

Expand Down
10 changes: 4 additions & 6 deletions Tests/JExtractSwiftTests/JNI/JNIEnumTests.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -177,13 +177,11 @@ struct JNIEnumTests {
""",
"""
public Case getCase() {
Discriminator discriminator = this.getDiscriminator();
switch (discriminator) {
case FIRST: return this.getAsFirst().orElseThrow();
case SECOND: return this.getAsSecond().orElseThrow();
case THIRD: return this.getAsThird().orElseThrow();
return switch (this.getDiscriminator()) {
case FIRST -> this.getAsFirst().orElseThrow();
case SECOND -> this.getAsSecond().orElseThrow();
case THIRD -> this.getAsThird().orElseThrow();
}
throw new RuntimeException("Unknown discriminator value " + discriminator);
}
""",
]
Expand Down
Loading