Fix typo, properly handle invoking subscripts in cdecl function.

Author: pelekon

Sources/JExtractSwiftLib/FFM/CDeclLowering/FFMSwift2JavaGenerator+FunctionLowering.swift

@@ -812,11 +812,10 @@ extension LoweredFunctionSignature {
 
     // Build callee expression.
     let callee: ExprSyntax = if let selfExpr {
-      if case .initializer = apiKind {
+      switch apiKind {
         // Don't bother to create explicit ${Self}.init expression.
-        selfExpr
-      } else {
-        ExprSyntax(MemberAccessExprSyntax(base: selfExpr, name: .identifier(swiftAPIName)))
+        case .initializer, .subscriptGetter, .subscriptSetter: selfExpr
+        default: ExprSyntax(MemberAccessExprSyntax(base: selfExpr, name: .identifier(swiftAPIName)))
       }
     } else {
       ExprSyntax(DeclReferenceExprSyntax(baseName: .identifier(swiftAPIName)))
@@ -845,6 +844,18 @@ extension LoweredFunctionSignature {
     case .enumCase:
       // This should not be called, but let's fatalError.
       fatalError("Enum cases are not supported with FFM.")
+
+    case .subscriptGetter:
+      let parameters = paramExprs.map { $0.description }.joined(separator: ", ")
+      resultExpr = "\(callee)[\(raw: parameters)]"
+    case .subscriptSetter:
+      assert(paramExprs.count >= 1)
+
+      var argumentsWithoutNewValue = paramExprs
+      let newValueArgument = argumentsWithoutNewValue.removeLast()
+
+      let parameters = argumentsWithoutNewValue.map { $0.description }.joined(separator: ", ")
+      resultExpr = "\(callee)[\(raw: parameters)] = \(newValueArgument)"
     }
 
     // Lower the result.

Sources/JExtractSwiftLib/FFM/FFMSwift2JavaGenerator+JavaTranslation.swift

@@ -144,8 +144,8 @@ extension FFMSwift2JavaGenerator {
 
       // Name.
       let javaName = switch decl.apiKind {
-      case .getter: decl.javaGetterName
-      case .setter: decl.javaSetterName
+      case .getter, .subscriptGetter: decl.javaGetterName
+      case .setter, .subscriptSetter: decl.javaSetterName
       case .function, .initializer, .enumCase: decl.name
       }
 

Sources/JExtractSwiftLib/ImportedDecls.swift

@@ -23,6 +23,8 @@ package enum SwiftAPIKind {
   case getter
   case setter
   case enumCase
+  case subscriptGetter
+  case subscriptSetter
 }
 
 /// Describes a Swift nominal type (e.g., a class, struct, enum) that has been
@@ -179,6 +181,8 @@ public final class ImportedFunc: ImportedDecl, CustomStringConvertible {
     case .setter: "setter:"
     case .enumCase: "case:"
     case .function, .initializer: ""
+    case .subscriptGetter: "subscriptGetter:"
+    case .subscriptSetter: "subscriptSetter:"
     }
 
     let context = if let parentType {

Sources/JExtractSwiftLib/JNI/JNISwift2JavaGenerator+JavaTranslation.swift

@@ -176,8 +176,8 @@ extension JNISwift2JavaGenerator {
 
       // Name.
       let javaName = switch decl.apiKind {
-      case .getter: decl.javaGetterName
-      case .setter: decl.javaSetterName
+      case .getter, .subscriptGetter: decl.javaGetterName
+      case .setter, .subscriptSetter: decl.javaSetterName
       case .function, .initializer, .enumCase: decl.name
       }
 

Sources/JExtractSwiftLib/JNI/JNISwift2JavaGenerator+SwiftThunkPrinting.swift

@@ -348,6 +348,19 @@ extension JNISwift2JavaGenerator {
       }
 
       result = "\(callee).\(decl.name) = \(newValueArgument)"
+    case .subscriptGetter:
+      let parameters = arguments.joined(separator: ", ")
+      result = "\(callee)[\(parameters)]"
+    case .subscriptSetter:
+      guard let newValueArgument = arguments.last else {
+        fatalError("Setter did not contain newValue parameter: \(decl)")
+      }
+
+      var argumentsWithoutNewValue = arguments
+      argumentsWithoutNewValue.removeLast()
+
+      let parameters = argumentsWithoutNewValue.joined(separator: ", ")
+      result = "\(callee)[\(parameters)] = \(newValueArgument)"
     }
 
     // Lower the result.

Sources/JExtractSwiftLib/Swift2JavaVisitor.swift

@@ -287,19 +287,20 @@ final class Swift2JavaVisitor {
 
     let name = "subscript"
     let accessors = accessorBlock.supportedAccessorKinds()
+
     do {
       if accessors.contains(.get) {
         try importAccessor(
           from: DeclSyntax(node),
           in: typeContext,
-          kind: .getter,
+          kind: .subscriptGetter,
           name: name)
       }
       if accessors.contains(.set) {
         try importAccessor(
           from: DeclSyntax(node),
           in: typeContext,
-          kind: .setter,
+          kind: .subscriptSetter,
           name: name)
       }
     } catch {
@@ -325,7 +326,7 @@ final class Swift2JavaVisitor {
     case .subscriptDecl(let subscriptNode):
       signature = try SwiftFunctionSignature(
         subscriptNode,
-        isSet: kind == .setter,
+        isSet: kind == .subscriptSetter,
         enclosingType: typeContext?.swiftType,
         lookupContext: translator.lookupContext)
     default:

Sources/JExtractSwiftLib/SwiftTypes/SwiftFunctionSignature.swift

@@ -325,8 +325,11 @@ extension SwiftFunctionSignature {
       enclosingType: enclosingType,
       isSet: isSet)
 
-    let valueType = try SwiftType(subscriptNode.returnClause.type, lookupContext: lookupContext)
-
+    let valueType: SwiftType = try SwiftType(subscriptNode.returnClause.type, lookupContext: lookupContext)
+    var nodeParameters = try subscriptNode.parameterClause.parameters.map { param in
+      try SwiftParameter(param, lookupContext: lookupContext)
+    }
+    
     var effectSpecifiers: [SwiftEffectSpecifier]? = nil
     switch subscriptNode.accessorBlock?.accessors {
     case .getter(let getter):
@@ -344,14 +347,13 @@ extension SwiftFunctionSignature {
     self.effectSpecifiers = effectSpecifiers ?? []
 
     if isSet {
-      self.parameters = [
-        SwiftParameter(convention: .byValue, parameterName: "newValue", type: valueType)
-      ]
+      nodeParameters.append(SwiftParameter(convention: .byValue, parameterName: "newValue", type: valueType))
       self.result = .void
     } else {
-      self.parameters = []
       self.result = .init(convention: .direct, type: valueType)
     }
+
+    self.parameters = nodeParameters
     self.genericParameters = []
     self.genericRequirements = []
   }

Sources/JExtractSwiftLib/ThunkNameRegistry.swift

@@ -32,9 +32,9 @@ package struct ThunkNameRegistry {
 
     let suffix: String
     switch decl.apiKind {
-    case .getter:
+    case .getter, .subscriptGetter:
       suffix = "$get"
-    case .setter:
+    case .setter, .subscriptSetter:
       suffix = "$set"
     default:
       suffix = decl.functionSignature.parameters