WIP

Author: rintaro

Sources/JExtractSwift/Swift2JavaVisitor.swift

@@ -195,7 +195,7 @@ final class Swift2JavaVisitor: SyntaxVisitor {
     }
 
     do {
-      let supportedAccessors = supportedAccessorKinds(varDecl: node, binding: binding)
+      let supportedAccessors = node.supportedAccessorKinds(binding: binding)
       if supportedAccessors.contains(.get) {
         try importAccessor(kind: .getter)
       }
@@ -272,47 +272,3 @@ extension DeclSyntaxProtocol where Self: WithModifiersSyntax & WithAttributesSyn
     return true
   }
 }
-
-
-struct SupportedAccessorKinds: OptionSet {
-  var rawValue: UInt8
-
-  static var get: Self = .init(rawValue: 1 << 0)
-  static var set: Self = .init(rawValue: 1 << 1)
-}
-
-private func supportedAccessorKinds(varDecl: VariableDeclSyntax, binding: PatternBindingSyntax) -> SupportedAccessorKinds {
-  if varDecl.bindingSpecifier == .keyword(.let) {
-    return [.get]
-  }
-
-  if let accessorBlock = binding.accessorBlock {
-    switch accessorBlock.accessors {
-    case .getter:
-      return [.get]
-    case .accessors(let accessors):
-      var hasGetter = false
-      var hasSetter = false
-
-      for accessor in accessors {
-        switch accessor.accessorSpecifier {
-        case .keyword(.get), .keyword(._read), .keyword(.unsafeAddress):
-          hasGetter = true
-        case .keyword(.set), .keyword(._modify), .keyword(.unsafeMutableAddress):
-          hasSetter = true
-        default: // Ignore willSet/didSet and unknown accessors.
-          break
-        }
-      }
-
-      switch (hasGetter, hasSetter) {
-      case (true, true): return [.get, .set]
-      case (true, false): return [.get]
-      case (false, true): return [.set]
-      case (false, false): break
-      }
-    }
-  }
-
-  return [.get, .set]
-}

Tests/JExtractSwiftTests/FunctionLoweringTests.swift

@@ -26,7 +26,7 @@ final class FunctionLoweringTests {
       expectedCDecl: """
       @_cdecl("c_f")
       public func c_f(_ x: Int, _ y: Float, _ z_pointer: UnsafeRawPointer, _ z_count: Int) {
-        f(x: x, y: y, z: UnsafeBufferPointer<Bool>(start: z_pointer.assumingMemoryBound(to: Bool.self),count: z_count))
+        f(x: x, y: y, z: UnsafeBufferPointer<Bool>(start: z_pointer.assumingMemoryBound(to: Bool.self), count: z_count))
       }
       """,
       expectedCFunction: "void c_f(ptrdiff_t x, float y, const void *z_pointer, ptrdiff_t z_count)"