[JExtract] Move the 'arena' parameter to the end

Because that seems to be more common

Author: rintaro

Samples/SwiftAndJavaJarSampleLib/src/jmh/java/org/swift/swiftkit/JavaToSwiftBenchmark.java

@@ -45,7 +45,7 @@ public void beforeALl() {
             System.setProperty("jextract.trace.downcalls", "false");
 
             arena = SwiftArena.ofConfined();
-            obj = new MySwiftClass(arena, 1, 2);
+            obj = new MySwiftClass(1, 2, arena);
         }
 
         @TearDown(Level.Trial)

Samples/SwiftAndJavaJarSampleLib/src/main/java/com/example/swift/HelloJava2Swift.java

@@ -44,7 +44,7 @@ static void examples() {
 
         // Example of using an arena; MyClass.deinit is run at end of scope
         try (var arena = SwiftArena.ofConfined()) {
-            MySwiftClass obj = new MySwiftClass(arena, 2222, 7777);
+            MySwiftClass obj = new MySwiftClass(2222, 7777, arena);
 
             // just checking retains/releases work
             SwiftKit.retain(obj);

Samples/SwiftAndJavaJarSampleLib/src/test/java/com/example/swift/MySwiftClassTest.java

@@ -43,7 +43,7 @@ void checkPaths(Throwable throwable) {
     @Test
     void test_MySwiftClass_voidMethod() {
         try(var arena = SwiftArena.ofConfined()) {
-            MySwiftClass o = new MySwiftClass(arena, 12, 42);
+            MySwiftClass o = new MySwiftClass(12, 42, arena);
             o.voidMethod();
         } catch (Throwable throwable) {
             checkPaths(throwable);
@@ -53,7 +53,7 @@ void test_MySwiftClass_voidMethod() {
     @Test
     void test_MySwiftClass_makeIntMethod() {
         try(var arena = SwiftArena.ofConfined()) {
-            MySwiftClass o = new MySwiftClass(arena, 12, 42);
+            MySwiftClass o = new MySwiftClass(12, 42, arena);
             var got = o.makeIntMethod();
             assertEquals(12, got);
         }
@@ -63,7 +63,7 @@ void test_MySwiftClass_makeIntMethod() {
     @Disabled // TODO: Need var mangled names in interfaces
     void test_MySwiftClass_property_len() {
         try(var arena = SwiftArena.ofConfined()) {
-            MySwiftClass o = new MySwiftClass(arena, 12, 42);
+            MySwiftClass o = new MySwiftClass(12, 42, arena);
             var got = o.getLen();
             assertEquals(12, got);
         }

Samples/SwiftAndJavaJarSampleLib/src/test/java/org/swift/swiftkit/MySwiftClassTest.java

@@ -25,7 +25,7 @@ public class MySwiftClassTest {
     @Test
     void call_retain_retainCount_release() {
         var arena = SwiftArena.ofConfined();
-        var obj = new MySwiftClass(arena, 1, 2);
+        var obj = new MySwiftClass(1, 2, arena);
 
         assertEquals(1, SwiftKit.retainCount(obj));
         // TODO: test directly on SwiftHeapObject inheriting obj

Samples/SwiftAndJavaJarSampleLib/src/test/java/org/swift/swiftkit/SwiftArenaTest.java

@@ -39,7 +39,7 @@ static boolean isAmd64() {
     @DisabledIf("isAmd64")
     public void arena_releaseClassOnClose_class_ok() {
         try (var arena = SwiftArena.ofConfined()) {
-            var obj = new MySwiftClass(arena,1, 2);
+            var obj = new MySwiftClass(1, 2, arena);
 
             retain(obj);
             assertEquals(2, retainCount(obj));

Samples/SwiftKitSampleApp/src/jmh/java/org/swift/swiftkit/JavaToSwiftBenchmark.java

@@ -37,7 +37,7 @@ public static class BenchmarkState {
         @Setup(Level.Trial)
         public void beforeAll() {
             arena = SwiftArena.ofConfined();
-            obj = new MySwiftClass(arena, 1, 2);
+            obj = new MySwiftClass(1, 2, arena);
         }
 
         @TearDown(Level.Trial)

Samples/SwiftKitSampleApp/src/jmh/java/org/swift/swiftkit/StringPassingBenchmark.java

@@ -46,7 +46,7 @@ public class StringPassingBenchmark {
     @Setup(Level.Trial)
     public void beforeAll() {
         arena = SwiftArena.ofConfined();
-        obj = new MySwiftClass(arena, 1, 2);
+        obj = new MySwiftClass(1, 2, arena);
         string = makeString(stringLen);
     }
 

Samples/SwiftKitSampleApp/src/main/java/com/example/swift/HelloJava2Swift.java

@@ -42,7 +42,7 @@ static void examples() {
 
         // Example of using an arena; MyClass.deinit is run at end of scope
         try (var arena = SwiftArena.ofConfined()) {
-             MySwiftClass obj = new MySwiftClass(arena, 2222, 7777);
+             MySwiftClass obj = new MySwiftClass(2222, 7777, arena);
 
              // just checking retains/releases work
              SwiftKit.trace("retainCount = " + SwiftKit.retainCount(obj));
@@ -54,7 +54,7 @@ static void examples() {
              obj.voidMethod();
              obj.takeIntMethod(42);
 
-            MySwiftStruct swiftValue = new MySwiftStruct(arena, 2222, 1111);
+            MySwiftStruct swiftValue = new MySwiftStruct(2222, 1111, arena);
         }
 
         System.out.println("DONE.");

Samples/SwiftKitSampleApp/src/test/java/com/example/swift/MySwiftClassTest.java

@@ -42,7 +42,7 @@ void checkPaths(Throwable throwable) {
     @Test
     void test_MySwiftClass_voidMethod() {
         try(var arena = SwiftArena.ofConfined()) {
-            MySwiftClass o = new MySwiftClass(arena, 12, 42);
+            MySwiftClass o = new MySwiftClass(12, 42, arena);
             o.voidMethod();
         } catch (Throwable throwable) {
             checkPaths(throwable);
@@ -52,7 +52,7 @@ void test_MySwiftClass_voidMethod() {
     @Test
     void test_MySwiftClass_makeIntMethod() {
         try(var arena = SwiftArena.ofConfined()) {
-            MySwiftClass o = new MySwiftClass(arena, 12, 42);
+            MySwiftClass o = new MySwiftClass(12, 42, arena);
             var got = o.makeIntMethod();
             assertEquals(12, got);
         }
@@ -62,7 +62,7 @@ void test_MySwiftClass_makeIntMethod() {
     @Disabled // TODO: Need var mangled names in interfaces
     void test_MySwiftClass_property_len() {
         try(var arena = SwiftArena.ofConfined()) {
-            MySwiftClass o = new MySwiftClass(arena, 12, 42);
+            MySwiftClass o = new MySwiftClass(12, 42, arena);
             var got = o.getLen();
             assertEquals(12, got);
         }

Samples/SwiftKitSampleApp/src/test/java/org/swift/swiftkit/MySwiftClassTest.java

@@ -25,7 +25,7 @@ public class MySwiftClassTest {
     @Test
     void call_retain_retainCount_release() {
         var arena = SwiftArena.ofConfined();
-        var obj = new MySwiftClass(arena, 1, 2);
+        var obj = new MySwiftClass(1, 2, arena);
 
         assertEquals(1, SwiftKit.retainCount(obj));
         // TODO: test directly on SwiftHeapObject inheriting obj

Samples/SwiftKitSampleApp/src/test/java/org/swift/swiftkit/MySwiftStructTest.java

@@ -26,7 +26,7 @@ void create_struct() {
         try (var arena = SwiftArena.ofConfined()) {
             long cap = 12;
             long len = 34;
-            var struct = new MySwiftStruct(arena, cap, len);
+            var struct = new MySwiftStruct(cap, len, arena);
 
             assertEquals(cap, struct.getCapacity());
             assertEquals(len, struct.getLength());

Samples/SwiftKitSampleApp/src/test/java/org/swift/swiftkit/SwiftArenaTest.java

@@ -40,7 +40,7 @@ static boolean isAmd64() {
     @DisabledIf("isAmd64")
     public void arena_releaseClassOnClose_class_ok() {
         try (var arena = SwiftArena.ofConfined()) {
-            var obj = new MySwiftClass(arena,1, 2);
+            var obj = new MySwiftClass(1, 2, arena);
 
             retain(obj);
             assertEquals(2, retainCount(obj));
@@ -57,7 +57,7 @@ public void arena_markAsDestroyed_preventUseAfterFree_class() {
         MySwiftClass unsafelyEscapedOutsideArenaScope = null;
 
         try (var arena = SwiftArena.ofConfined()) {
-            var obj = new MySwiftClass(arena,1, 2);
+            var obj = new MySwiftClass(1, 2, arena);
             unsafelyEscapedOutsideArenaScope = obj;
         }
 
@@ -76,7 +76,7 @@ public void arena_markAsDestroyed_preventUseAfterFree_struct() {
         MySwiftStruct unsafelyEscapedOutsideArenaScope = null;
 
         try (var arena = SwiftArena.ofConfined()) {
-            var s = new MySwiftStruct(arena,1, 2);
+            var s = new MySwiftStruct(1, 2, arena);
             unsafelyEscapedOutsideArenaScope = s;
         }
 

Sources/JExtractSwift/Swift2JavaTranslator+Printing.swift

@@ -440,7 +440,7 @@ extension Swift2JavaTranslator {
        *
       \(decl.renderCommentSnippet ?? " *")
        */
-      public \(parentName.unqualifiedJavaTypeName)(SwiftArena arena, \(renderJavaParamDecls(decl, paramPassingStyle: .wrapper))) {
+      public \(parentName.unqualifiedJavaTypeName)(\(renderJavaParamDecls(decl, paramPassingStyle: .wrapper)), SwiftArena arena) {
         super(() -> {
           var mh$ = \(descClassIdentifier).HANDLE;
           try {

Tests/JExtractSwiftTests/MethodImportTests.swift

@@ -423,7 +423,7 @@ final class MethodImportTests {
          * public init(len: Swift.Int, cap: Swift.Int)
          * }
          */
-        public MySwiftClass(SwiftArena arena, long len, long cap) {
+        public MySwiftClass(long len, long cap, SwiftArena arena) {
           super(() -> {
             var mh$ = init_len_cap.HANDLE;
             try {
@@ -475,7 +475,7 @@ final class MethodImportTests {
          * public init(len: Swift.Int, cap: Swift.Int)
          * }
          */
-        public MySwiftStruct(SwiftArena arena, long len, long cap) {
+        public MySwiftStruct(long len, long cap, SwiftArena arena) {
           super(() -> {
             var mh$ = init_len_cap.HANDLE;
             try {