Skip to content

jextract: Move JNI pattern matching for Java Known interfaces #849

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
AmrDeveloper wants to merge 1 commit into
base: main
Choose a base branch
from
+56 −82
Open

jextract: Move JNI pattern matching for Java Known interfaces #849

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
52 changes: 17 additions & 35 deletions Sources/JExtractSwiftLib/JNI/JNISwift2JavaGenerator+JavaTranslation.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -696,25 +696,6 @@ extension JNISwift2JavaGenerator {
nativeFunctionSignature.result.outParameters.append(.init(name: "result_future", type: nativeFutureType))
}

func extractKnownJavaFunctionalInterfaceType(
swiftType: SwiftType,
functionType: SwiftFunctionType,
parameterName: String,
parameterAnnotations: [JavaAnnotation]
) -> TranslatedParameter? {
if !functionType.isEscaping && functionType.parameters.isEmpty && functionType.resultType.isVoid {
return TranslatedParameter(
parameter: JavaParameter(
name: parameterName,
type: JavaType.javaLangRunnable,
annotations: parameterAnnotations,
),
conversion: .placeholder,
)
}
return nil
}

func translateFunctionParameter(
swiftType: SwiftType,
functionType: SwiftFunctionType,
Expand All @@ -723,23 +704,24 @@ extension JNISwift2JavaGenerator {
parentName: SwiftQualifiedTypeName,
parameterAnnotations: [JavaAnnotation]
) -> TranslatedParameter {
extractKnownJavaFunctionalInterfaceType(
swiftType: swiftType,
functionType: functionType,
parameterName: parameterName,
parameterAnnotations: parameterAnnotations
let interfacejavaType =
if let known = KnownJavaFunctionalInterface.find(functionType) {
known.javaType
} else {
JavaType.class(
package: javaPackage,
name: String.javaQualifiedName(parentName.fullName, methodName, parameterName)
)
}

return TranslatedParameter(
parameter: JavaParameter(
name: parameterName,
type: interfacejavaType,
annotations: parameterAnnotations,
),
conversion: .placeholder,
)
?? TranslatedParameter(
parameter: JavaParameter(
name: parameterName,
type: .class(
package: javaPackage,
name: String.javaQualifiedName(parentName.fullName, methodName, parameterName)
),
annotations: parameterAnnotations,
),
conversion: .placeholder,
)
}

func translateProtocolParameter(
Expand Down
70 changes: 23 additions & 47 deletions Sources/JExtractSwiftLib/JNI/JNISwift2JavaGenerator+NativeTranslation.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -362,31 +362,6 @@ extension JNISwift2JavaGenerator {
)
}

func extractKnownJavaFunctionalInterfaceType(
functionType: SwiftFunctionType,
parameterName: String,
parameters: [JNISwift2JavaGenerator.NativeParameter],
result: JNISwift2JavaGenerator.NativeResult
) -> NativeParameter? {
if !functionType.isEscaping && functionType.parameters.isEmpty && functionType.resultType.isVoid {
return NativeParameter(
parameters: [
JavaParameter(
name: parameterName,
type: JavaType.javaLangRunnable
)
],
conversion: .closureLowering(
parameters: parameters,
result: result
),
indirectConversion: nil,
conversionCheck: nil
)
}
return nil
}

func translateFunctionParameter(
swiftType: SwiftType,
functionType: SwiftFunctionType,
Expand Down Expand Up @@ -456,29 +431,30 @@ extension JNISwift2JavaGenerator {
}

let result = try translateClosureResult(functionType.resultType)
return extractKnownJavaFunctionalInterfaceType(
functionType: functionType,
parameterName: parameterName,
parameters: parameters,
result: result
let interfaceJavaType =
if let known = KnownJavaFunctionalInterface.find(functionType) {
known.javaType
} else {
JavaType.class(
package: javaPackage,
name: String.javaQualifiedName(parentName.fullName, methodName, parameterName)
)
}

return NativeParameter(
parameters: [
JavaParameter(
name: parameterName,
type: interfaceJavaType
)
],
conversion: .closureLowering(
parameters: parameters,
result: result
),
indirectConversion: nil,
conversionCheck: nil
)
?? NativeParameter(
parameters: [
JavaParameter(
name: parameterName,
type: .class(
package: javaPackage,
name: String.javaQualifiedName(parentName.fullName, methodName, parameterName)
)
)
],
conversion: .closureLowering(
parameters: parameters,
result: result
),
indirectConversion: nil,
conversionCheck: nil
)
}

func translateProtocolParameter(
Expand Down
16 changes: 16 additions & 0 deletions Sources/JExtractSwiftLib/KnownFunctionalInterfaces.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@
//
//===----------------------------------------------------------------------===//

import SwiftExtract
import SwiftJavaJNICore

/// Describes a known functional interface such as `Runnable.run()` and similar.
Expand Down Expand Up @@ -48,6 +49,21 @@ struct KnownJavaFunctionalInterface: Sendable {
find(parameters: methodSignature.parameterTypes, result: methodSignature.resultType)
}

static func find(_ functionType: SwiftFunctionType) -> KnownJavaFunctionalInterface? {
if functionType.isEscaping {
return nil
}

let parameters = functionType.parameters
let result = functionType.resultType
return switch (parameters, result) {
case ([], _) where result.isVoid:
runnable
default:
nil
}
}

static func find(_ functionType: JNISwift2JavaGenerator.TranslatedFunctionType) -> KnownJavaFunctionalInterface? {
if functionType.isEscaping {
return nil
Expand Down