jextract: Support Java DoubleUnaryOperator func interface (#889)

Author: AmrDeveloper

Samples/SwiftAndJavaJarFFMSampleLib/Sources/MySwiftLibrary/MySwiftLibrary.swift

@@ -84,6 +84,10 @@ public func globalCallMeLongUnaryOperator(run: (Int64) -> Int64) -> Int64 {
   run(1)
 }
 
+public func globalCallMeDoubleUnaryOperator(run: (Double) -> Double) -> Double {
+  run(1.0)
+}
+
 public func globalCallMeIntBinaryOperator(run: (Int32, Int32) -> Int32) -> Int32 {
   run(1, 2)
 }

Samples/SwiftAndJavaJarFFMSampleLib/src/test/java/com/example/swift/MySwiftLibraryTest.java

@@ -123,6 +123,12 @@ void call_globalCallMeLongUnaryOperator_noThrow() {
         assertEquals(1L, result);
     }
 
+    @Test
+    void call_globalCallMeDoubleUnaryOperator_noThrow() {
+        double result = MySwiftLibrary.globalCallMeDoubleBinaryOperator((double a) -> { return a; });
+        assertEquals(1.0, result);
+    }
+
     @Test
     void call_globalCallMeIntBinaryOperator_noThrow() {
         int result = MySwiftLibrary.globalCallMeIntBinaryOperator((int a, int b) -> { return a + b; });

Samples/SwiftJavaExtractFFMSampleApp/Sources/MySwiftLibrary/MySwiftLibrary.swift

@@ -96,6 +96,10 @@ public func globalCallMeLongUnaryOperator(run: (Int64) -> Int64) -> Int64 {
   run(1)
 }
 
+public func globalCallMeDoubleUnaryOperator(run: (Double) -> Double) -> Double {
+  run(1.0)
+}
+
 public func globalCallMeIntBinaryOperator(run: (Int32, Int32) -> Int32) -> Int32 {
   run(1, 2)
 }

Samples/SwiftJavaExtractFFMSampleApp/src/test/java/com/example/swift/MySwiftLibraryTest.java

@@ -235,6 +235,12 @@ void call_globalCallMeLongUnaryOperator_noThrow() {
         assertEquals(1L, result);
     }
 
+    @Test
+    void call_globalCallMeDoubleUnaryOperator_noThrow() {
+        double result = MySwiftLibrary.globalCallMeDoubleUnaryOperator((double a) -> { return a; });
+        assertEquals(1.0, result);
+    }
+
     @Test
     void call_globalCallMeIntBinaryOperator_noThrow() {
         int result = MySwiftLibrary.globalCallMeIntBinaryOperator((int a, int b) -> { return a + b; });

Samples/SwiftJavaExtractJNISampleApp/Sources/MySwiftLibrary/Closures.swift

@@ -69,6 +69,10 @@ public func globalCallMeLongUnaryOperator(run: (Int64) -> Int64) -> Int64 {
   run(1)
 }
 
+public func globalCallMeDoubleUnaryOperator(run: (Double) -> Double) -> Double {
+  run(1.0)
+}
+
 public func globalCallMeIntBinaryOperator(run: (Int32, Int32) -> Int32) -> Int32 {
   run(1, 2)
 }

Samples/SwiftJavaExtractJNISampleApp/src/test/java/com/example/swift/ClosuresTest.java

@@ -117,6 +117,12 @@ void globalCallMeLongUnaryOperator() {
         assertEquals(1L, result);
     }
 
+    @Test
+    void globalCallMeDoubleUnaryOperator() {
+        double result = MySwiftLibrary.globalCallMeDoubleUnaryOperator((double a) -> { return a; });
+        assertEquals(1.0, result);
+    }
+
     @Test
     void globalCallMeIntBinaryOperator() {
         int result = MySwiftLibrary.globalCallMeIntBinaryOperator((int a, int b) -> { return a + b; });

Sources/ExampleSwiftLibrary/MySwiftLibrary.swift

@@ -91,6 +91,10 @@ public func globalCallMeLongUnaryOperator(run: (Int64) -> Int64) -> Int64 {
   run(1)
 }
 
+public func globalCallMeDoubleUnaryOperator(run: (Double) -> Double) -> Double {
+  run(1.0)
+}
+
 public func globalCallMeIntBinaryOperator(run: (Int32, Int32) -> Int32) -> Int32 {
   run(1, 2)
 }

Sources/JExtractSwiftLib/JavaTypes/JavaType+JDK.swift

@@ -90,6 +90,11 @@ extension JavaType {
     .class(package: "java.util.function", name: "LongUnaryOperator")
   }
 
+  /// The description of the type java.util.function.DoubleUnaryOperator.
+  static var javaUtilFunctionDoubleUnaryOperator: JavaType {
+    .class(package: "java.util.function", name: "DoubleUnaryOperator")
+  }
+
   /// The description of the type java.util.function.IntBinaryOperator.
   static var javaUtilFunctionIntBinaryOperator: JavaType {
     .class(package: "java.util.function", name: "IntBinaryOperator")

Sources/JExtractSwiftLib/KnownFunctionalInterfaces.swift

@@ -113,6 +113,13 @@ struct KnownJavaFunctionalInterface: Sendable {
     result: .long
   )
 
+  static let doubleUnaryOperator = KnownJavaFunctionalInterface(
+    JavaType.javaUtilFunctionDoubleUnaryOperator,
+    method: "applyAsDouble",
+    parameters: [.double],
+    result: .double
+  )
+
   static let intBinaryOperator = KnownJavaFunctionalInterface(
     JavaType.javaUtilFunctionIntBinaryOperator,
     method: "applyAsInt",
@@ -148,6 +155,7 @@ struct KnownJavaFunctionalInterface: Sendable {
     .doublePredicate,
     .intUnaryOperator,
     .longUnaryOperator,
+    .doubleUnaryOperator,
     .intBinaryOperator,
     .longBinaryOperator,
     .doubleBinaryOperator,
@@ -233,6 +241,8 @@ struct KnownJavaFunctionalInterface: Sendable {
         intUnaryOperator
       case _ where parameter.isInt64:
         longUnaryOperator
+      case _ where parameter.isDouble:
+        doubleUnaryOperator
       default:
         nil
       }

Tests/JExtractSwiftTests/FuncCallbackImportTests.swift

@@ -49,6 +49,7 @@ final class FuncCallbackImportTests {
 
     public func callMeIntUnaryOperator(callback: (Int32) -> Int32)
     public func callMeLongUnaryOperator(callback: (Int64) -> Int64)
+    public func callMeDoubleUnaryOperator(callback: (Double) -> Double)
 
     public func callMeIntBinaryOperator(callback: (Int32, Int32) -> Int32)
     public func callMeLongBinaryOperator(callback: (Int64, Int64) -> Int64)
@@ -810,6 +811,49 @@ final class FuncCallbackImportTests {
     )
   }
 
+  @Test("Import: public func callMecallMeDoubleUnaryOperatorFunc(callback: (Double) -> Double)")
+  func func_callMecallMeDoubleUnaryOperatorFunc_callback() throws {
+    var config = Configuration()
+    config.swiftModule = "__FakeModule"
+    let st = makeSwiftJavaAnalyzer(config: config)
+    st.log.logLevel = .error
+
+    try st.analyze(path: "Fake.swift", text: Self.class_interfaceFile)
+
+    let funcDecl = st.extractedGlobalFuncs.first { $0.name == "callMeDoubleUnaryOperator" }!
+
+    let generator = FFMSwift2JavaGenerator(
+      config: config,
+      translator: st,
+      javaPackage: "com.example.swift",
+      swiftOutputDirectory: "/fake",
+      javaOutputDirectory: "/fake"
+    )
+
+    let output = JavaPrinter.toString { printer in
+      generator.printFunctionDowncallMethods(&printer, funcDecl)
+    }
+
+    assertOutput(
+      output,
+      expectedChunks: [
+        """
+        /**
+         * Downcall to Swift:
+         * {@snippet lang=swift :
+         * public func callMeDoubleUnaryOperator(callback: (Double) -> Double)
+         * }
+         */
+        public static void callMeDoubleUnaryOperator(java.util.function.DoubleUnaryOperator callback) {
+          try(var arena$ = Arena.ofConfined()) {
+            swiftjava___FakeModule_callMeDoubleUnaryOperator_callback.call(callMeDoubleUnaryOperator.$toUpcallStub(callback, arena$));
+          }
+        }
+        """
+      ]
+    )
+  }
+
   @Test("Import: public func callMecallMeIntBinaryOperatorFunc(callback: (Int32, Int32) -> Int32)")
   func func_callMecallMeIntBinaryOperatorFunc_callback() throws {
     var config = Configuration()