From 4923dde9c0776bdbde27e89fb29cf9eb000dc8ce Mon Sep 17 00:00:00 2001 From: Aman Date: Tue, 3 Mar 2026 17:59:35 +0530 Subject: [PATCH] fix/remove-dollar-from-params --- .../example/swift/ProtocolCallbacksTest.java | 6 +++--- .../java/com/example/swift/ProtocolTest.java | 2 +- ...ft2JavaGenerator+JavaBindingsPrinting.swift | 8 ++++---- ...FMSwift2JavaGenerator+JavaTranslation.swift | 2 +- ...ft2JavaGenerator+JavaBindingsPrinting.swift | 16 ++++++++-------- ...NISwift2JavaGenerator+JavaTranslation.swift | 6 +++--- .../TranslatedDocumentation.swift | 4 ++-- Tests/JExtractSwiftTests/DataImportTests.swift | 16 ++++++++-------- Tests/JExtractSwiftTests/DateTests.swift | 6 +++--- .../JExtractSwiftTests/JNI/JNIArrayTest.swift | 4 ++-- .../JExtractSwiftTests/JNI/JNIAsyncTests.swift | 8 ++++---- .../JExtractSwiftTests/JNI/JNIClassTests.swift | 12 ++++++------ .../JExtractSwiftTests/JNI/JNIEnumTests.swift | 12 ++++++------ .../JNI/JNIGenericTypeTests.swift | 4 ++-- .../JNI/JNINestedTypesTests.swift | 2 +- .../JNI/JNIOptionalTests.swift | 4 ++-- .../JNI/JNIProtocolTests.swift | 4 ++-- .../JNI/JNIStructTests.swift | 4 ++-- .../MemoryManagementModeTests.swift | 10 +++++----- .../JExtractSwiftTests/MethodImportTests.swift | 18 +++++++++--------- .../SwiftDocumentationParsingTests.swift | 8 ++++---- 21 files changed, 78 insertions(+), 78 deletions(-) diff --git a/Samples/SwiftJavaExtractJNISampleApp/src/test/java/com/example/swift/ProtocolCallbacksTest.java b/Samples/SwiftJavaExtractJNISampleApp/src/test/java/com/example/swift/ProtocolCallbacksTest.java index 0e23fcf6b..139015df2 100644 --- a/Samples/SwiftJavaExtractJNISampleApp/src/test/java/com/example/swift/ProtocolCallbacksTest.java +++ b/Samples/SwiftJavaExtractJNISampleApp/src/test/java/com/example/swift/ProtocolCallbacksTest.java @@ -74,7 +74,7 @@ public String withString(String input) { public void withVoid() {} @Override - public MySwiftClass withObject(MySwiftClass input, SwiftArena swiftArena$) { + public MySwiftClass withObject(MySwiftClass input, SwiftArena swiftArena) { return input; } @@ -84,7 +84,7 @@ public OptionalLong withOptionalInt64(OptionalLong input) { } @Override - public Optional withOptionalObject(Optional input, SwiftArena swiftArena$) { + public Optional withOptionalObject(Optional input, SwiftArena swiftArena) { return input; } @@ -99,7 +99,7 @@ public String[] withStringArray(String[] input) { } @Override - public MySwiftClass[] withObjectArray(MySwiftClass[] input, SwiftArena swiftArena$) { + public MySwiftClass[] withObjectArray(MySwiftClass[] input, SwiftArena swiftArena) { return input; } diff --git a/Samples/SwiftJavaExtractJNISampleApp/src/test/java/com/example/swift/ProtocolTest.java b/Samples/SwiftJavaExtractJNISampleApp/src/test/java/com/example/swift/ProtocolTest.java index 42683ac96..098babf16 100644 --- a/Samples/SwiftJavaExtractJNISampleApp/src/test/java/com/example/swift/ProtocolTest.java +++ b/Samples/SwiftJavaExtractJNISampleApp/src/test/java/com/example/swift/ProtocolTest.java @@ -89,7 +89,7 @@ static class JavaStorage implements Storage { } @Override - public StorageItem load(SwiftArena swiftArena$) { + public StorageItem load(SwiftArena swiftArena) { return item; } diff --git a/Sources/JExtractSwiftLib/FFM/FFMSwift2JavaGenerator+JavaBindingsPrinting.swift b/Sources/JExtractSwiftLib/FFM/FFMSwift2JavaGenerator+JavaBindingsPrinting.swift index 17d5440a0..859db24c9 100644 --- a/Sources/JExtractSwiftLib/FFM/FFMSwift2JavaGenerator+JavaBindingsPrinting.swift +++ b/Sources/JExtractSwiftLib/FFM/FFMSwift2JavaGenerator+JavaBindingsPrinting.swift @@ -378,7 +378,7 @@ extension FFMSwift2JavaGenerator { .flatMap(\.javaParameters) .map { $0.renderParameter() } if translatedSignature.requiresSwiftArena { - paramDecls.append("AllocatingSwiftArena swiftArena$") + paramDecls.append("AllocatingSwiftArena swiftArena") } TranslatedDocumentation.printDocumentation( @@ -444,7 +444,7 @@ extension FFMSwift2JavaGenerator { analysis.importedTypes[className] != nil { // Use passed-in 'SwiftArena' for 'SwiftValue'. - "swiftArena$" + "swiftArena" } else { // Otherwise use the temporary 'Arena'. "arena$" @@ -664,11 +664,11 @@ extension FFMSwift2JavaGenerator.JavaConversionStep { case .constructSwiftValue(let inner, let javaType): let inner = inner.render(&printer, placeholder, placeholderForDowncall: placeholderForDowncall) - return "new \(javaType.className!)(\(inner), swiftArena$)" + return "new \(javaType.className!)(\(inner), swiftArena)" case .wrapMemoryAddressUnsafe(let inner, let javaType): let inner = inner.render(&printer, placeholder, placeholderForDowncall: placeholderForDowncall) - return "\(javaType.className!).wrapMemoryAddressUnsafe(\(inner), swiftArena$)" + return "\(javaType.className!).wrapMemoryAddressUnsafe(\(inner), swiftArena)" case .construct(let inner, let javaType): let inner = inner.render(&printer, placeholder, placeholderForDowncall: placeholderForDowncall) diff --git a/Sources/JExtractSwiftLib/FFM/FFMSwift2JavaGenerator+JavaTranslation.swift b/Sources/JExtractSwiftLib/FFM/FFMSwift2JavaGenerator+JavaTranslation.swift index a066fa40d..40d744473 100644 --- a/Sources/JExtractSwiftLib/FFM/FFMSwift2JavaGenerator+JavaTranslation.swift +++ b/Sources/JExtractSwiftLib/FFM/FFMSwift2JavaGenerator+JavaTranslation.swift @@ -811,7 +811,7 @@ extension FFMSwift2JavaGenerator { /// Similar to 'method', however for a property i.e. without adding the '()' after the name indirect case property(JavaConversionStep, propertyName: String) - /// Call 'new \(Type)(\(placeholder), swiftArena$)'. + /// Call 'new \(Type)(\(placeholder), swiftArena)'. indirect case constructSwiftValue(JavaConversionStep, JavaType) /// Construct the type using the placeholder as arguments. diff --git a/Sources/JExtractSwiftLib/JNI/JNISwift2JavaGenerator+JavaBindingsPrinting.swift b/Sources/JExtractSwiftLib/JNI/JNISwift2JavaGenerator+JavaBindingsPrinting.swift index 06bd97409..4a8b243b7 100644 --- a/Sources/JExtractSwiftLib/JNI/JNISwift2JavaGenerator+JavaBindingsPrinting.swift +++ b/Sources/JExtractSwiftLib/JNI/JNISwift2JavaGenerator+JavaBindingsPrinting.swift @@ -420,14 +420,14 @@ extension JNISwift2JavaGenerator { self.translatedEnumCase(for: $0) }.contains(where: \.requiresSwiftArena) - printer.printBraceBlock("public Case getCase(\(requiresSwiftArena ? "SwiftArena swiftArena$" : ""))") { printer in + printer.printBraceBlock("public Case getCase(\(requiresSwiftArena ? "SwiftArena swiftArena" : ""))") { printer in printer.print("Discriminator discriminator = this.getDiscriminator();") printer.printBraceBlock("switch (discriminator)") { printer in for enumCase in decl.cases { guard let translatedCase = self.translatedEnumCase(for: enumCase) else { continue } - let arenaArgument = translatedCase.requiresSwiftArena ? "swiftArena$" : "" + let arenaArgument = translatedCase.requiresSwiftArena ? "swiftArena" : "" printer.print( "case \(enumCase.name.uppercased()): return this.getAs\(enumCase.name.firstCharacterUppercased)(\(arenaArgument)).orElseThrow();" ) @@ -620,7 +620,7 @@ extension JNISwift2JavaGenerator { } if translatedSignature.requiresSwiftArena { - parameters.append("SwiftArena swiftArena$") + parameters.append("SwiftArena swiftArena") } if let importedFunc { TranslatedDocumentation.printDocumentation( @@ -837,10 +837,10 @@ extension JNISwift2JavaGenerator { * @param instant The source timestamp to convert. * @return A date derived from the input instant with microsecond precision. */ - public static Date fromInstant(java.time.Instant instant, SwiftArena swiftArena$) { + public static Date fromInstant(java.time.Instant instant, SwiftArena swiftArena) { Objects.requireNonNull(instant, "Instant cannot be null"); double timeIntervalSince1970 = instant.getEpochSecond() + (instant.getNano() / 1_000_000_000.0); - return Date.init(timeIntervalSince1970, swiftArena$); + return Date.init(timeIntervalSince1970, swiftArena); } """ ) @@ -853,12 +853,12 @@ extension JNISwift2JavaGenerator { * Creates a new Swift @{link Data} instance from a byte array. * * @param bytes The byte array to copy into the Data - * @param swiftArena$ The arena for memory management + * @param swiftArena The arena for memory management * @return A new Data instance containing a copy of the bytes */ - public static Data fromByteArray(byte[] bytes, SwiftArena swiftArena$) { + public static Data fromByteArray(byte[] bytes, SwiftArena swiftArena) { Objects.requireNonNull(bytes, "bytes cannot be null"); - return Data.init(bytes, swiftArena$); + return Data.init(bytes, swiftArena); } """ ) diff --git a/Sources/JExtractSwiftLib/JNI/JNISwift2JavaGenerator+JavaTranslation.swift b/Sources/JExtractSwiftLib/JNI/JNISwift2JavaGenerator+JavaTranslation.swift index 0ff525ae3..3a4803add 100644 --- a/Sources/JExtractSwiftLib/JNI/JNISwift2JavaGenerator+JavaTranslation.swift +++ b/Sources/JExtractSwiftLib/JNI/JNISwift2JavaGenerator+JavaTranslation.swift @@ -1251,7 +1251,7 @@ extension JNISwift2JavaGenerator { /// `value.$typeMetadataAddress()` indirect case typeMetadataAddress(JavaNativeConversionStep) - /// Call `new \(Type)(\(placeholder), swiftArena$)` + /// Call `new \(Type)(\(placeholder), swiftArena)` indirect case constructSwiftValue(JavaNativeConversionStep, JavaType) /// Call `new \(Type)(\(placeholder))` @@ -1360,11 +1360,11 @@ extension JNISwift2JavaGenerator { case .constructSwiftValue(let inner, let javaType): let inner = inner.render(&printer, placeholder) - return "new \(javaType.className!)(\(inner), swiftArena$)" + return "new \(javaType.className!)(\(inner), swiftArena)" case .wrapMemoryAddressUnsafe(let inner, let javaType): let inner = inner.render(&printer, placeholder) - return "\(javaType.className!).wrapMemoryAddressUnsafe(\(inner), swiftArena$)" + return "\(javaType.className!).wrapMemoryAddressUnsafe(\(inner), swiftArena)" case .constructJavaClass(let inner, let javaType): let inner = inner.render(&printer, placeholder) diff --git a/Sources/JExtractSwiftLib/TranslatedDocumentation.swift b/Sources/JExtractSwiftLib/TranslatedDocumentation.swift index aa721e619..456df6991 100644 --- a/Sources/JExtractSwiftLib/TranslatedDocumentation.swift +++ b/Sources/JExtractSwiftLib/TranslatedDocumentation.swift @@ -25,7 +25,7 @@ enum TranslatedDocumentation { if translatedDecl.translatedSignature.requiresSwiftArena { documentation?.parameters.append( SwiftDocumentation.Parameter( - name: "swiftArena$", + name: "swiftArena", description: "the arena that will manage the lifetime and allocation of Swift objects" ) ) @@ -44,7 +44,7 @@ enum TranslatedDocumentation { if translatedDecl.translatedFunctionSignature.requiresSwiftArena { documentation?.parameters.append( SwiftDocumentation.Parameter( - name: "swiftArena$", + name: "swiftArena", description: "the arena that the the returned object will be attached to" ) ) diff --git a/Tests/JExtractSwiftTests/DataImportTests.swift b/Tests/JExtractSwiftTests/DataImportTests.swift index 45c73b765..a597038a0 100644 --- a/Tests/JExtractSwiftTests/DataImportTests.swift +++ b/Tests/JExtractSwiftTests/DataImportTests.swift @@ -212,10 +212,10 @@ final class DataImportTests { * public func returnData() -> Data * } */ - public static Data returnData(AllocatingSwiftArena swiftArena$) { - MemorySegment _result = swiftArena$.allocate(Data.$LAYOUT); + public static Data returnData(AllocatingSwiftArena swiftArena) { + MemorySegment _result = swiftArena.allocate(Data.$LAYOUT); swiftjava_SwiftModule_returnData.call(_result); - return Data.wrapMemoryAddressUnsafe(_result, swiftArena$); + return Data.wrapMemoryAddressUnsafe(_result, swiftArena); } """, @@ -254,10 +254,10 @@ final class DataImportTests { * public init(bytes: UnsafeRawPointer, count: Int) * } */ - public static Data init(java.lang.foreign.MemorySegment bytes, long count, AllocatingSwiftArena swiftArena$) { - MemorySegment _result = swiftArena$.allocate(Data.$LAYOUT); + public static Data init(java.lang.foreign.MemorySegment bytes, long count, AllocatingSwiftArena swiftArena) { + MemorySegment _result = swiftArena.allocate(Data.$LAYOUT); swiftjava_SwiftModule_Data_init_bytes_count.call(bytes, count, _result); - return Data.wrapMemoryAddressUnsafe(_result, swiftArena$); + return Data.wrapMemoryAddressUnsafe(_result, swiftArena); } """, @@ -522,7 +522,7 @@ final class DataImportTests { .java, expectedChunks: [ """ - public static Data returnData(SwiftArena swiftArena$) { + public static Data returnData(SwiftArena swiftArena) { """ ] ) @@ -556,7 +556,7 @@ final class DataImportTests { "public final class Data implements JNISwiftInstance, DataProtocol {", "public long getCount() {", - "public static Data fromByteArray(byte[] bytes, SwiftArena swiftArena$) {", + "public static Data fromByteArray(byte[] bytes, SwiftArena swiftArena) {", "public byte[] toByteArray() {", "private static native byte[] $toByteArray(long selfPointer);", diff --git a/Tests/JExtractSwiftTests/DateTests.swift b/Tests/JExtractSwiftTests/DateTests.swift index b2a7be08a..b9142d2e6 100644 --- a/Tests/JExtractSwiftTests/DateTests.swift +++ b/Tests/JExtractSwiftTests/DateTests.swift @@ -77,7 +77,7 @@ struct DateTests { /* expected Java chunks */ [ """ - public static Date returnDate(SwiftArena swiftArena$) { + public static Date returnDate(SwiftArena swiftArena) { """ ], /* expected Swift chunks */ @@ -127,13 +127,13 @@ struct DateTests { public final class Date implements JNISwiftInstance { """, """ - public static Date init(double timeIntervalSince1970, SwiftArena swiftArena$) { + public static Date init(double timeIntervalSince1970, SwiftArena swiftArena) { """, """ public double getTimeIntervalSince1970() { """, """ - public static Date fromInstant(java.time.Instant instant, SwiftArena swiftArena$) { + public static Date fromInstant(java.time.Instant instant, SwiftArena swiftArena) { """, """ public java.time.Instant toInstant() { diff --git a/Tests/JExtractSwiftTests/JNI/JNIArrayTest.swift b/Tests/JExtractSwiftTests/JNI/JNIArrayTest.swift index 84325c1ed..a2dfd054a 100644 --- a/Tests/JExtractSwiftTests/JNI/JNIArrayTest.swift +++ b/Tests/JExtractSwiftTests/JNI/JNIArrayTest.swift @@ -144,9 +144,9 @@ struct JNIArrayTest { detectChunkByInitialLines: 1, expectedChunks: [ """ - public static MySwiftClass[] f(MySwiftClass[] array, SwiftArena swiftArena$) { + public static MySwiftClass[] f(MySwiftClass[] array, SwiftArena swiftArena) { return Arrays.stream(SwiftModule.$f(Arrays.stream(Objects.requireNonNull(array, "array must not be null")).mapToLong(MySwiftClass::$memoryAddress).toArray())).mapToObj((pointer) -> { - return MySwiftClass.wrapMemoryAddressUnsafe(pointer, swiftArena$); + return MySwiftClass.wrapMemoryAddressUnsafe(pointer, swiftArena); } ).toArray(MySwiftClass[]::new); } diff --git a/Tests/JExtractSwiftTests/JNI/JNIAsyncTests.swift b/Tests/JExtractSwiftTests/JNI/JNIAsyncTests.swift index 4d0f17ce9..0a31a9b82 100644 --- a/Tests/JExtractSwiftTests/JNI/JNIAsyncTests.swift +++ b/Tests/JExtractSwiftTests/JNI/JNIAsyncTests.swift @@ -283,11 +283,11 @@ struct JNIAsyncTests { * public func async(c: MyClass) async -> MyClass * } */ - public static java.util.concurrent.CompletableFuture async(MyClass c, SwiftArena swiftArena$) { + public static java.util.concurrent.CompletableFuture async(MyClass c, SwiftArena swiftArena) { java.util.concurrent.CompletableFuture future$ = new java.util.concurrent.CompletableFuture(); SwiftModule.$async(c.$memoryAddress(), future$); return future$.thenApply((futureResult$) -> { - return MyClass.wrapMemoryAddressUnsafe(futureResult$, swiftArena$); + return MyClass.wrapMemoryAddressUnsafe(futureResult$, swiftArena); } ); } @@ -437,11 +437,11 @@ struct JNIAsyncTests { detectChunkByInitialLines: 1, expectedChunks: [ """ - public static java.util.concurrent.Future async(MyClass c, SwiftArena swiftArena$) { + public static java.util.concurrent.Future async(MyClass c, SwiftArena swiftArena) { org.swift.swiftkit.core.SimpleCompletableFuture future$ = new org.swift.swiftkit.core.SimpleCompletableFuture(); SwiftModule.$async(c.$memoryAddress(), future$); return future$.thenApply((futureResult$) -> { - return MyClass.wrapMemoryAddressUnsafe(futureResult$, swiftArena$); + return MyClass.wrapMemoryAddressUnsafe(futureResult$, swiftArena); } ); } diff --git a/Tests/JExtractSwiftTests/JNI/JNIClassTests.swift b/Tests/JExtractSwiftTests/JNI/JNIClassTests.swift index 3fba9755d..61afbf2b1 100644 --- a/Tests/JExtractSwiftTests/JNI/JNIClassTests.swift +++ b/Tests/JExtractSwiftTests/JNI/JNIClassTests.swift @@ -191,8 +191,8 @@ struct JNIClassTests { * public init(x: Int64, y: Int64) * } */ - public static MyClass init(long x, long y, SwiftArena swiftArena$) { - return MyClass.wrapMemoryAddressUnsafe(MyClass.$init(x, y), swiftArena$); + public static MyClass init(long x, long y, SwiftArena swiftArena) { + return MyClass.wrapMemoryAddressUnsafe(MyClass.$init(x, y), swiftArena); } """, """ @@ -202,8 +202,8 @@ struct JNIClassTests { * public init() * } */ - public static MyClass init(SwiftArena swiftArena$) { - return MyClass.wrapMemoryAddressUnsafe(MyClass.$init(), swiftArena$); + public static MyClass init(SwiftArena swiftArena) { + return MyClass.wrapMemoryAddressUnsafe(MyClass.$init(), swiftArena); } """, """ @@ -336,8 +336,8 @@ struct JNIClassTests { * public func copy() -> MyClass * } */ - public MyClass copy(SwiftArena swiftArena$) { - return MyClass.wrapMemoryAddressUnsafe(MyClass.$copy(this.$memoryAddress()), swiftArena$); + public MyClass copy(SwiftArena swiftArena) { + return MyClass.wrapMemoryAddressUnsafe(MyClass.$copy(this.$memoryAddress()), swiftArena); } """, """ diff --git a/Tests/JExtractSwiftTests/JNI/JNIEnumTests.swift b/Tests/JExtractSwiftTests/JNI/JNIEnumTests.swift index a211227ba..52d727ee8 100644 --- a/Tests/JExtractSwiftTests/JNI/JNIEnumTests.swift +++ b/Tests/JExtractSwiftTests/JNI/JNIEnumTests.swift @@ -204,18 +204,18 @@ struct JNIEnumTests { detectChunkByInitialLines: 1, expectedChunks: [ """ - public static MyEnum first(SwiftArena swiftArena$) { - return MyEnum.wrapMemoryAddressUnsafe(MyEnum.$first(), swiftArena$); + public static MyEnum first(SwiftArena swiftArena) { + return MyEnum.wrapMemoryAddressUnsafe(MyEnum.$first(), swiftArena); } """, """ - public static MyEnum second(java.lang.String arg0, SwiftArena swiftArena$) { - return MyEnum.wrapMemoryAddressUnsafe(MyEnum.$second(arg0), swiftArena$); + public static MyEnum second(java.lang.String arg0, SwiftArena swiftArena) { + return MyEnum.wrapMemoryAddressUnsafe(MyEnum.$second(arg0), swiftArena); } """, """ - public static MyEnum third(long x, int y, SwiftArena swiftArena$) { - return MyEnum.wrapMemoryAddressUnsafe(MyEnum.$third(x, y), swiftArena$); + public static MyEnum third(long x, int y, SwiftArena swiftArena) { + return MyEnum.wrapMemoryAddressUnsafe(MyEnum.$third(x, y), swiftArena); } """, ] diff --git a/Tests/JExtractSwiftTests/JNI/JNIGenericTypeTests.swift b/Tests/JExtractSwiftTests/JNI/JNIGenericTypeTests.swift index cc9bdbdba..edcea576e 100644 --- a/Tests/JExtractSwiftTests/JNI/JNIGenericTypeTests.swift +++ b/Tests/JExtractSwiftTests/JNI/JNIGenericTypeTests.swift @@ -151,10 +151,10 @@ struct JNIGenericTypeTests { detectChunkByInitialLines: 2, expectedChunks: [ """ - public static MyID makeStringID(java.lang.String value, SwiftArena swiftArena$) { + public static MyID makeStringID(java.lang.String value, SwiftArena swiftArena) { org.swift.swiftkit.core._OutSwiftGenericInstance instance = new org.swift.swiftkit.core._OutSwiftGenericInstance(); SwiftModule.$makeStringID(value, instance); - return MyID.wrapMemoryAddressUnsafe(instance.selfPointer, instance.selfTypePointer, swiftArena$); + return MyID.wrapMemoryAddressUnsafe(instance.selfPointer, instance.selfTypePointer, swiftArena); } """, """ diff --git a/Tests/JExtractSwiftTests/JNI/JNINestedTypesTests.swift b/Tests/JExtractSwiftTests/JNI/JNINestedTypesTests.swift index 808fe99c7..bc36ac69c 100644 --- a/Tests/JExtractSwiftTests/JNI/JNINestedTypesTests.swift +++ b/Tests/JExtractSwiftTests/JNI/JNINestedTypesTests.swift @@ -125,7 +125,7 @@ struct JNINestedTypesTests { ... } ... - public static MyError text(MyError.TextMessage arg0, SwiftArena swiftArena$) { + public static MyError text(MyError.TextMessage arg0, SwiftArena swiftArena) { ... } """, diff --git a/Tests/JExtractSwiftTests/JNI/JNIOptionalTests.swift b/Tests/JExtractSwiftTests/JNI/JNIOptionalTests.swift index c43d56835..b60724efc 100644 --- a/Tests/JExtractSwiftTests/JNI/JNIOptionalTests.swift +++ b/Tests/JExtractSwiftTests/JNI/JNIOptionalTests.swift @@ -155,10 +155,10 @@ struct JNIOptionalTests { * public func optionalClass(_ arg: MyClass?) -> MyClass? * } */ - public static Optional optionalClass(Optional arg, SwiftArena swiftArena$) { + public static Optional optionalClass(Optional arg, SwiftArena swiftArena) { byte[] result$_discriminator$ = new byte[1]; long result$ = SwiftModule.$optionalClass(arg.map(MyClass::$memoryAddress).orElse(0L), result$_discriminator$); - return (result$_discriminator$[0] == 1) ? Optional.of(MyClass.wrapMemoryAddressUnsafe(result$, swiftArena$)) : Optional.empty(); + return (result$_discriminator$[0] == 1) ? Optional.of(MyClass.wrapMemoryAddressUnsafe(result$, swiftArena)) : Optional.empty(); } """, """ diff --git a/Tests/JExtractSwiftTests/JNI/JNIProtocolTests.swift b/Tests/JExtractSwiftTests/JNI/JNIProtocolTests.swift index 57c7a4a7a..0c5046930 100644 --- a/Tests/JExtractSwiftTests/JNI/JNIProtocolTests.swift +++ b/Tests/JExtractSwiftTests/JNI/JNIProtocolTests.swift @@ -64,7 +64,7 @@ struct JNIProtocolTests { ... public void method(); ... - public SomeClass withObject(SomeClass c, SwiftArena swiftArena$); + public SomeClass withObject(SomeClass c, SwiftArena swiftArena); ... } """, @@ -84,7 +84,7 @@ struct JNIProtocolTests { """ public final class SomeClass implements JNISwiftInstance, SomeProtocol { ... - public SomeClass makeClass(SwiftArena swiftArena$) { + public SomeClass makeClass(SwiftArena swiftArena) { ... } """ diff --git a/Tests/JExtractSwiftTests/JNI/JNIStructTests.swift b/Tests/JExtractSwiftTests/JNI/JNIStructTests.swift index e98d5fb2e..023e72a33 100644 --- a/Tests/JExtractSwiftTests/JNI/JNIStructTests.swift +++ b/Tests/JExtractSwiftTests/JNI/JNIStructTests.swift @@ -135,8 +135,8 @@ struct JNIStructTests { * public init(x: Int64, y: Int64) * } */ - public static MyStruct init(long x, long y, SwiftArena swiftArena$) { - return MyStruct.wrapMemoryAddressUnsafe(MyStruct.$init(x, y), swiftArena$); + public static MyStruct init(long x, long y, SwiftArena swiftArena) { + return MyStruct.wrapMemoryAddressUnsafe(MyStruct.$init(x, y), swiftArena); } """, """ diff --git a/Tests/JExtractSwiftTests/MemoryManagementModeTests.swift b/Tests/JExtractSwiftTests/MemoryManagementModeTests.swift index e1dbba451..ff4c4ecbf 100644 --- a/Tests/JExtractSwiftTests/MemoryManagementModeTests.swift +++ b/Tests/JExtractSwiftTests/MemoryManagementModeTests.swift @@ -43,8 +43,8 @@ struct MemoryManagementModeTests { * public func f() -> MyClass * } */ - public static MyClass f(SwiftArena swiftArena$) { - return MyClass.wrapMemoryAddressUnsafe(SwiftModule.$f(), swiftArena$); + public static MyClass f(SwiftArena swiftArena) { + return MyClass.wrapMemoryAddressUnsafe(SwiftModule.$f(), swiftArena); } """ ] @@ -69,8 +69,8 @@ struct MemoryManagementModeTests { } """, """ - public static MyClass f(SwiftArena swiftArena$) { - return MyClass.wrapMemoryAddressUnsafe(SwiftModule.$f(), swiftArena$); + public static MyClass f(SwiftArena swiftArena) { + return MyClass.wrapMemoryAddressUnsafe(SwiftModule.$f(), swiftArena); } """, ] @@ -102,7 +102,7 @@ struct MemoryManagementModeTests { } """, """ - public MyClass f(SwiftArena swiftArena$); + public MyClass f(SwiftArena swiftArena); """, ] ) diff --git a/Tests/JExtractSwiftTests/MethodImportTests.swift b/Tests/JExtractSwiftTests/MethodImportTests.swift index 0bb2c64df..90c108ec2 100644 --- a/Tests/JExtractSwiftTests/MethodImportTests.swift +++ b/Tests/JExtractSwiftTests/MethodImportTests.swift @@ -228,10 +228,10 @@ final class MethodImportTests { * public func globalReturnClass() -> MySwiftClass * } */ - public static MySwiftClass globalReturnClass(AllocatingSwiftArena swiftArena$) { - MemorySegment _result = swiftArena$.allocate(MySwiftClass.$LAYOUT); + public static MySwiftClass globalReturnClass(AllocatingSwiftArena swiftArena) { + MemorySegment _result = swiftArena.allocate(MySwiftClass.$LAYOUT); swiftjava___FakeModule_globalReturnClass.call(_result); - return MySwiftClass.wrapMemoryAddressUnsafe(_result, swiftArena$); + return MySwiftClass.wrapMemoryAddressUnsafe(_result, swiftArena); } """ ) @@ -405,10 +405,10 @@ final class MethodImportTests { * public init(len: Swift.Int, cap: Swift.Int) * } */ - public static MySwiftClass init(long len, long cap, AllocatingSwiftArena swiftArena$) { - MemorySegment _result = swiftArena$.allocate(MySwiftClass.$LAYOUT); + public static MySwiftClass init(long len, long cap, AllocatingSwiftArena swiftArena) { + MemorySegment _result = swiftArena.allocate(MySwiftClass.$LAYOUT); swiftjava___FakeModule_MySwiftClass_init_len_cap.call(len, cap, _result) - return MySwiftClass.wrapMemoryAddressUnsafe(_result, swiftArena$); + return MySwiftClass.wrapMemoryAddressUnsafe(_result, swiftArena); } """ ) @@ -450,10 +450,10 @@ final class MethodImportTests { * public init(len: Swift.Int, cap: Swift.Int) * } */ - public static MySwiftStruct init(long len, long cap, AllocatingSwiftArena swiftArena$) { - MemorySegment _result = swiftArena$.allocate(MySwiftStruct.$LAYOUT); + public static MySwiftStruct init(long len, long cap, AllocatingSwiftArena swiftArena) { + MemorySegment _result = swiftArena.allocate(MySwiftStruct.$LAYOUT); swiftjava___FakeModule_MySwiftStruct_init_len_cap.call(len, cap, _result) - return MySwiftStruct.wrapMemoryAddressUnsafe(_result, swiftArena$); + return MySwiftStruct.wrapMemoryAddressUnsafe(_result, swiftArena); } """ ) diff --git a/Tests/JExtractSwiftTests/SwiftDocumentationParsingTests.swift b/Tests/JExtractSwiftTests/SwiftDocumentationParsingTests.swift index 50fc4876d..d49010c89 100644 --- a/Tests/JExtractSwiftTests/SwiftDocumentationParsingTests.swift +++ b/Tests/JExtractSwiftTests/SwiftDocumentationParsingTests.swift @@ -163,9 +163,9 @@ struct SwiftDocumentationParsingTests { * public func f() -> MyClass * } * - * @param swiftArena$ the arena that the the returned object will be attached to + * @param swiftArena the arena that the the returned object will be attached to */ - public static MyClass f(SwiftArena swiftArena$) { + public static MyClass f(SwiftArena swiftArena) { """ ] ), @@ -181,9 +181,9 @@ struct SwiftDocumentationParsingTests { * public func f() -> MyClass * } * - * @param swiftArena$ the arena that will manage the lifetime and allocation of Swift objects + * @param swiftArena the arena that will manage the lifetime and allocation of Swift objects */ - public static MyClass f(AllocatingSwiftArena swiftArena$) + public static MyClass f(AllocatingSwiftArena swiftArena) """ ] ),