jextract: Remove $ from generated method parameters

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<MySwiftClass> withOptionalObject(Optional<MySwiftClass> input, SwiftArena swiftArena$) {
+        public Optional<MySwiftClass> withOptionalObject(Optional<MySwiftClass> 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;
         }
 

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;
         }
 

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)

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.

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);
       }
       """
     )

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)

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"
         )
       )

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);",

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() {

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);
         }

Tests/JExtractSwiftTests/JNI/JNIAsyncTests.swift

@@ -283,11 +283,11 @@ struct JNIAsyncTests {
          * public func async(c: MyClass) async -> MyClass
          * }
          */
-        public static java.util.concurrent.CompletableFuture<MyClass> async(MyClass c, SwiftArena swiftArena$) {
+        public static java.util.concurrent.CompletableFuture<MyClass> async(MyClass c, SwiftArena swiftArena) {
           java.util.concurrent.CompletableFuture<java.lang.Long> future$ = new java.util.concurrent.CompletableFuture<java.lang.Long>();
           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<MyClass> async(MyClass c, SwiftArena swiftArena$) {
+        public static java.util.concurrent.Future<MyClass> async(MyClass c, SwiftArena swiftArena) {
           org.swift.swiftkit.core.SimpleCompletableFuture<java.lang.Long> future$ = new org.swift.swiftkit.core.SimpleCompletableFuture<java.lang.Long>();
           SwiftModule.$async(c.$memoryAddress(), future$);
           return future$.thenApply((futureResult$) -> {
-            return MyClass.wrapMemoryAddressUnsafe(futureResult$, swiftArena$);
+            return MyClass.wrapMemoryAddressUnsafe(futureResult$, swiftArena);
           }
           );
         }

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);
         }
         """,
         """

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);
         }
         """,
       ]

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);
         }
         """,
         """

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) {
           ...
         }
         """,

Tests/JExtractSwiftTests/JNI/JNIOptionalTests.swift

@@ -155,10 +155,10 @@ struct JNIOptionalTests {
          * public func optionalClass(_ arg: MyClass?) -> MyClass?
          * }
          */
-        public static Optional<MyClass> optionalClass(Optional<MyClass> arg, SwiftArena swiftArena$) {
+        public static Optional<MyClass> optionalClass(Optional<MyClass> 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();
         }
         """,
         """

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) {
           ...
         }
         """