print discriminator native

Author: madsodgaard

Sources/JExtractSwiftLib/JNI/JNISwift2JavaGenerator+JavaTranslation.swift

@@ -88,27 +88,13 @@ extension JNISwift2JavaGenerator {
         parentName: parentName
       )
 
-      let conversions = try enumCase.parameters.map {
-        let result = SwiftResult(convention: .direct, type: $0.type)
+      let conversions = try enumCase.parameters.enumerated().map { idx, parameter in
+        let result = SwiftResult(convention: .direct, type: parameter.type)
         let translatedResult = try self.translate(swiftResult: result)
-        let nativeResult = try nativeTranslation.translate(swiftResult: result)
+        let nativeResult = try nativeTranslation.translate(swiftResult: result, resultName: parameter.name ?? "arg\(idx)")
         return (translatedResult, nativeResult)
       }
 
-//      let nativeParameters = try nativeTranslation.translateParameters(
-//        enumCase.parameters.map {
-//          SwiftParameter(
-//            convention: .byValue,
-//            argumentLabel: $0.name,
-//            parameterName: $0.name,
-//            type: $0.type
-//          )
-//        },
-//        translatedParameters: translatedParameters,
-//        methodName: methodName,
-//        parentName: parentName
-//      )
-
       return TranslatedEnumCase(
         name: enumCase.name.firstCharacterUppercased,
         enumName: enumCase.enumType.nominalTypeDecl.name,

Sources/JExtractSwiftLib/JNI/JNISwift2JavaGenerator+NativeTranslation.swift

@@ -385,7 +385,8 @@ extension JNISwift2JavaGenerator {
     }
 
     func translate(
-      swiftResult: SwiftResult
+      swiftResult: SwiftResult,
+      resultName: String = "result"
     ) throws -> NativeResult {
       switch swiftResult.type {
       case .nominal(let nominalType):
@@ -416,7 +417,7 @@ extension JNISwift2JavaGenerator {
 
         return NativeResult(
           javaType: .long,
-          conversion: .getJNIValue(.allocateSwiftValue(name: "result", swiftType: swiftResult.type)),
+          conversion: .getJNIValue(.allocateSwiftValue(name: resultName, swiftType: swiftResult.type)),
           outParameters: []
         )
 

Sources/JExtractSwiftLib/JNI/JNISwift2JavaGenerator+SwiftThunkPrinting.swift

@@ -102,9 +102,14 @@ extension JNISwift2JavaGenerator {
       printer.println()
     }
 
-    for enumCase in type.cases {
-      printEnumCase(&printer, enumCase)
+    if type.swiftNominal.kind == .enum {
+      printEnumDiscriminator(&printer, type)
       printer.println()
+
+      for enumCase in type.cases {
+        printEnumCase(&printer, enumCase)
+        printer.println()
+      }
     }
 
     for method in type.methods {
@@ -120,6 +125,28 @@ extension JNISwift2JavaGenerator {
     printDestroyFunctionThunk(&printer, type)
   }
 
+  private func printEnumDiscriminator(_ printer: inout CodePrinter, _ type: ImportedNominalType) {
+    let selfPointerParam = JavaParameter(name: "selfPointer", type: .long)
+    printCDecl(
+      &printer,
+      javaMethodName: "$getDiscriminator",
+      parentName: type.swiftNominal.name,
+      parameters: [selfPointerParam],
+      resultType: .int
+    ) { printer in
+      let selfPointer = self.printSelfJLongToUnsafeMutablePointer(
+        &printer,
+        swiftParentName: type.swiftNominal.name,
+        selfPointerParam
+      )
+      printer.printBraceBlock("switch (\(selfPointer).pointee)") { printer in
+        for (idx, enumCase) in type.cases.enumerated() {
+          printer.print("case .\(enumCase.name): return \(idx)")
+        }
+      }
+    }
+  }
+
   private func printEnumCase(_ printer: inout CodePrinter, _ enumCase: ImportedEnumCase) {
     guard let translatedCase = self.translatedEnumCase(for: enumCase) else {
       return