add support for variables

Author: madsodgaard

Samples/JExtractJNISampleApp/Sources/MySwiftLibrary/MySwiftClass.swift

@@ -16,6 +16,25 @@ public class MySwiftClass {
   let x: Int64
   let y: Int64
 
+  public let constant: Int64 = 100
+  public var mutable: Int64 = 0
+  public var product: Int64 {
+    return x * y
+  }
+  public var throwingVariable: Int64 {
+    get throws {
+      throw MySwiftClassError.swiftError
+    }
+  }
+  public var mutableDividedByTwo: Int64 {
+    get {
+      return mutable / 2
+    }
+    set {
+      mutable = newValue * 2
+    }
+  }
+
   public static func method() {
     p("Hello from static method in a class!")
   }

Samples/JExtractJNISampleApp/Sources/MySwiftLibrary/MySwiftLibrary.swift

@@ -23,6 +23,8 @@
   import Darwin.C
 #endif
 
+public var globalVariable: Int64 = 0
+
 public func helloWorld() {
   p("\(#function)")
 }

Samples/JExtractJNISampleApp/Sources/MySwiftLibrary/swift-java.config

@@ -1,4 +1,4 @@
 {
   "javaPackage": "com.example.swift",
-  "mode": "jni"
+  "mode": "jni",
 }

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

@@ -61,4 +61,55 @@ void throwingFunction() {
             assertEquals("swiftError", exception.getMessage());
         }
     }
+
+    @Test
+    void constant() {
+        try (var arena = new ConfinedSwiftMemorySession(Thread.currentThread())) {
+            MySwiftClass c = MySwiftClass.init(20, 10, arena);
+            assertEquals(100, c.getConstant());
+        }
+    }
+
+    @Test
+    void mutable() {
+        try (var arena = new ConfinedSwiftMemorySession(Thread.currentThread())) {
+            MySwiftClass c = MySwiftClass.init(20, 10, arena);
+            assertEquals(0, c.getMutable());
+            c.setMutable(42);
+            assertEquals(42, c.getMutable());
+        }
+    }
+
+    @Test
+    void product() {
+        try (var arena = new ConfinedSwiftMemorySession(Thread.currentThread())) {
+            MySwiftClass c = MySwiftClass.init(20, 10, arena);
+            assertEquals(200, c.getProduct());
+        }
+    }
+
+    @Test
+    void throwingVariable() {
+        try (var arena = new ConfinedSwiftMemorySession(Thread.currentThread())) {
+            MySwiftClass c = MySwiftClass.init(20, 10, arena);
+
+            Exception exception = assertThrows(Exception.class, () -> c.getThrowingVariable());
+
+            assertEquals("swiftError", exception.getMessage());
+        }
+    }
+
+    @Test
+    void mutableDividedByTwo() {
+        try (var arena = new ConfinedSwiftMemorySession(Thread.currentThread())) {
+            MySwiftClass c = MySwiftClass.init(20, 10, arena);
+            assertEquals(0, c.getMutableDividedByTwo());
+            c.setMutable(20);
+            assertEquals(10, c.getMutableDividedByTwo());
+            c.setMutableDividedByTwo(5);
+            assertEquals(10, c.getMutable());
+        }
+    }
+
+
 }

Samples/JExtractJNISampleApp/src/test/java/com/example/swift/MySwiftLibraryTest.java

@@ -54,4 +54,11 @@ void call_writeString_jextract() {
 
         assertEquals(string.length(), reply);
     }
+
+    @Test
+    void globalVariable() {
+        assertEquals(0, MySwiftLibrary.getGlobalVariable());
+        MySwiftLibrary.setGlobalVariable(100);
+        assertEquals(100, MySwiftLibrary.getGlobalVariable());
+    }
 }

Sources/JExtractSwiftLib/ImportedDecls.swift

@@ -91,7 +91,7 @@ public final class ImportedFunc: ImportedDecl, CustomStringConvertible {
     }
     return false
   }
-
+  
   /// If this function/method is member of a class/struct/protocol,
   /// this will contain that declaration's imported name.
   ///

Sources/JExtractSwiftLib/JNI/JNISwift2JavaGenerator+JavaBindingsPrinting.swift

@@ -79,6 +79,11 @@ extension JNISwift2JavaGenerator {
         printFunctionBinding(&printer, decl)
         printer.println()
       }
+
+      for decl in analysis.importedGlobalVariables {
+        printFunctionBinding(&printer, decl)
+        printer.println()
+      }
     }
   }
 
@@ -113,10 +118,17 @@ extension JNISwift2JavaGenerator {
 
       for initializer in decl.initializers {
         printInitializerBindings(&printer, initializer, type: decl)
+        printer.println()
       }
 
       for method in decl.methods {
         printFunctionBinding(&printer, method)
+        printer.println()
+      }
+
+      for variable in decl.variables {
+        printFunctionBinding(&printer, variable)
+        printer.println()
       }
 
       printDestroyFunction(&printer, decl)

Sources/JExtractSwiftLib/JNI/JNISwift2JavaGenerator+JavaTranslation.swift

@@ -37,8 +37,15 @@ extension JNISwift2JavaGenerator {
       // Types with no parent will be outputted inside a "module" class.
       let parentName = decl.parentType?.asNominalType?.nominalTypeDecl.qualifiedName ?? swiftModuleName
 
+      // Name.
+      let javaName = switch decl.apiKind {
+      case .getter: "get\(decl.name.toCamelCase)"
+      case .setter: "set\(decl.name.toCamelCase)"
+      case .function, .initializer: decl.name
+      }
+
       return TranslatedFunctionDecl(
-        name: decl.name,
+        name: javaName,
         parentName: parentName,
         translatedFunctionSignature: translatedFunctionSignature
       )

Sources/JExtractSwiftLib/JNI/JNISwift2JavaGenerator+SwiftThunkPrinting.swift

@@ -87,6 +87,11 @@ extension JNISwift2JavaGenerator {
       printSwiftFunctionThunk(&printer, decl)
       printer.println()
     }
+
+    for decl in analysis.importedGlobalVariables {
+      printSwiftFunctionThunk(&printer, decl)
+      printer.println()
+    }
   }
 
   private func printNominalTypeThunks(_ printer: inout CodePrinter, _ type: ImportedNominalType) throws {
@@ -102,6 +107,11 @@ extension JNISwift2JavaGenerator {
       printer.println()
     }
 
+    for variable in type.variables {
+      printSwiftFunctionThunk(&printer, variable)
+      printer.println()
+    }
+
     printDestroyFunctionThunk(&printer, type)
   }
 
@@ -192,19 +202,32 @@ extension JNISwift2JavaGenerator {
     let translatedDecl = self.translatedDecl(for: decl)
     let swiftReturnType = decl.functionSignature.result.type
 
-    let downcallParameters = renderDowncallArguments(
-      swiftFunctionSignature: decl.functionSignature,
-      translatedFunctionSignature: translatedDecl.translatedFunctionSignature
-    )
     let tryClause: String = decl.isThrowing ? "try " : ""
-    let functionDowncall = "\(tryClause)\(calleeName).\(decl.name)(\(downcallParameters))"
+
+    let result: String
+    switch decl.apiKind {
+    case .function, .initializer:
+      let downcallParameters = renderDowncallArguments(
+        swiftFunctionSignature: decl.functionSignature,
+        translatedFunctionSignature: translatedDecl.translatedFunctionSignature
+      )
+      result = "\(tryClause)\(calleeName).\(decl.name)(\(downcallParameters))"
+
+    case .getter:
+      result = "\(tryClause)\(calleeName).\(decl.name)"
+
+    case .setter:
+      assert(decl.functionSignature.parameters.count == 1)
+      let newValueParameter = decl.functionSignature.parameters[0]
+      result = "\(calleeName).\(decl.name) = \(renderJNIToSwiftConversion("newValue", type: newValueParameter.type))"
+    }
 
     let returnStatement =
     if swiftReturnType.isVoid {
-      functionDowncall
+      result
     } else {
       """
-      let result = \(functionDowncall)
+      let result = \(result)
       return result.getJNIValue(in: environment)
       """
     }
@@ -320,6 +343,10 @@ extension JNISwift2JavaGenerator {
     }
     .joined(separator: ", ")
   }
+
+  private func renderJNIToSwiftConversion(_ variableName: String, type: SwiftType) -> String {
+    "\(type)(fromJNI: \(variableName), in: environment!)"
+  }
 }
 
 extension String {

Sources/JExtractSwiftLib/SwiftTypes/SwiftFunctionSignature.swift

@@ -254,7 +254,7 @@ extension VariableDeclSyntax {
   /// - Parameters:
   ///   - binding the pattern binding in this declaration.
   func supportedAccessorKinds(binding: PatternBindingSyntax) -> SupportedAccessorKinds {
-    if self.bindingSpecifier == .keyword(.let) {
+    if self.bindingSpecifier.tokenKind == .keyword(.let) {
       return [.get]
     }