WIP

Author: rintaro

Sources/JExtractSwift/Swift2JavaTranslator+JavaBindingsPrinting.swift

@@ -403,7 +403,7 @@ extension Swift2JavaTranslator {
 
     var paramDecls = decl.translatedSignature.parameters
       .flatMap(\.javaParameters)
-      .map { "\($0.javaType) \($0.parameterName)" }
+      .map { "\($0.type) \($0.name)" }
       .joined(separator: ", ")
     assert(decl.translatedSignature.requiresSwiftArena, "constructor always require the SwiftArena")
     paramDecls += ", SwiftArena swiftArena$"
@@ -451,7 +451,7 @@ extension Swift2JavaTranslator {
 
     var paramDecls = decl.translatedSignature.parameters
       .flatMap(\.javaParameters)
-      .map { "\($0.javaType) \($0.parameterName)" }
+      .map { "\($0.type) \($0.name)" }
       .joined(separator: ", ")
 
     if decl.translatedSignature.requiresSwiftArena {
@@ -526,9 +526,9 @@ extension Swift2JavaTranslator {
 
     // Indirect return receivers.
     for outParameter in decl.translatedSignature.result.outParameters {
-      let memoryLayout = renderMemoryLayoutValue(for: outParameter.javaType)
+      let memoryLayout = renderMemoryLayoutValue(for: outParameter.type)
 
-      let arena = if let className = outParameter.javaType.className,
+      let arena = if let className = outParameter.type.className,
          self.importedTypes[className] != nil {
         // Use passed-in 'SwiftArena' for 'SwiftValue'.
         "swiftArena$"
@@ -538,9 +538,9 @@ extension Swift2JavaTranslator {
       }
 
       printer.print(
-        "MemorySegment \(outParameter.parameterName) = \(arena).allocate(\(memoryLayout));"
+        "MemorySegment \(outParameter.name) = \(arena).allocate(\(memoryLayout));"
       )
-      downCallArguments.append(outParameter.parameterName)
+      downCallArguments.append(outParameter.name)
     }
 
     //=== Part 3: Downcall.
@@ -557,7 +557,7 @@ extension Swift2JavaTranslator {
     if isConstructor {
       // For constructors, the caller expects the "self" memory segment.
       printer.print("\(downCall);")
-      let outParameterName = decl.translatedSignature.result.outParameters[0].parameterName
+      let outParameterName = decl.translatedSignature.result.outParameters[0].name
       printer.print("return \(outParameterName);")
     } else if decl.translatedSignature.result.javaResultType == .void {
       printer.print("\(downCall);")