-
Notifications
You must be signed in to change notification settings - Fork 118
jextract: support extracting class members #890
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.
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
Merged
Changes from all commits
Commits
Show all changes
5 commits
Select commit
Hold shift + click to select a range
84620c8
support extracting `class` members
AbdAlRahmanGad a712e34
jextract: Support class methods and variables in FFM and JNI mode
AbdAlRahmanGad bdfb255
jextract: Add runtime tests
AbdAlRahmanGad 1044ae1
jextract: add docs
AbdAlRahmanGad 9f8741b
fix typo
AbdAlRahmanGad File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,94 @@ | ||
| //===----------------------------------------------------------------------===// | ||
| // | ||
| // This source file is part of the Swift.org open source project | ||
| // | ||
| // Copyright (c) 2026 Apple Inc. and the Swift.org project authors | ||
| // Licensed under Apache License v2.0 | ||
| // | ||
| // See LICENSE.txt for license information | ||
| // See CONTRIBUTORS.txt for the list of Swift.org project authors | ||
| // | ||
| // SPDX-License-Identifier: Apache-2.0 | ||
| // | ||
| //===----------------------------------------------------------------------===// | ||
|
|
||
| import JExtractSwiftLib | ||
| import Testing | ||
|
|
||
| @Suite | ||
| struct FFMClassMemberTests { | ||
| let source = """ | ||
| public class MyClass { | ||
| public class func classMethod() -> Int64 { 42 } | ||
| public class var classVariable: Int64 { 7 } | ||
| } | ||
| """ | ||
|
|
||
| @Test | ||
| func classMethod_javaBindings() throws { | ||
| try assertOutput( | ||
| input: source, | ||
| .ffm, | ||
| .java, | ||
| expectedChunks: [ | ||
| """ | ||
| /** | ||
| * Downcall to Swift: | ||
| * {@snippet lang=swift : | ||
| * public class func classMethod() -> Int64 | ||
| * } | ||
| */ | ||
| public static long classMethod() { | ||
| return swiftjava_SwiftModule_MyClass_classMethod.call(); | ||
| } | ||
| """ | ||
| ] | ||
| ) | ||
| } | ||
|
|
||
| @Test | ||
| func classVariable_javaBindings() throws { | ||
| try assertOutput( | ||
| input: source, | ||
| .ffm, | ||
| .java, | ||
| expectedChunks: [ | ||
| """ | ||
| /** | ||
| * Downcall to Swift: | ||
| * {@snippet lang=swift : | ||
| * public class var classVariable: Int64 | ||
| * } | ||
| */ | ||
| public static long getClassVariable() { | ||
| return swiftjava_SwiftModule_MyClass_classVariable$get.call(); | ||
| } | ||
| """ | ||
| ] | ||
| ) | ||
| } | ||
|
|
||
| @Test | ||
| func classMembers_swiftThunks() throws { | ||
| try assertOutput( | ||
| input: source, | ||
| .ffm, | ||
| .swift, | ||
| detectChunkByInitialLines: 1, | ||
| expectedChunks: [ | ||
| """ | ||
| @_cdecl("swiftjava_SwiftModule_MyClass_classMethod") | ||
| public func swiftjava_SwiftModule_MyClass_classMethod() -> Int64 { | ||
| return MyClass.classMethod() | ||
| } | ||
| """, | ||
| """ | ||
| @_cdecl("swiftjava_SwiftModule_MyClass_classVariable$get") | ||
| public func swiftjava_SwiftModule_MyClass_classVariable$get() -> Int64 { | ||
| return MyClass.classVariable | ||
| } | ||
| """, | ||
| ] | ||
| ) | ||
| } | ||
| } |
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Thanks for adding snippets but we're not using them it seems -- can you add a small bit in
FeaturesJextract.mdaround static methods somewhere:And make sure we have the snippets for the usage as well