fix tests

Author: madsodgaard

Sources/JExtractSwift/AnalysisResult.swift

@@ -1,4 +1,5 @@
 struct AnalysisResult {
   let importedTypes: [String: ImportedNominalType]
+  let importedGlobalVariables: [ImportedFunc]
   let importedGlobalFuncs: [ImportedFunc]
 }

Sources/JExtractSwift/CDeclLowering/CRepresentation.swift renamed to Sources/JExtractSwift/FFM/CDeclLowering/CRepresentation.swift

@@ -15,7 +15,7 @@
 import JavaTypes
 import SwiftSyntax
 
-extension Swift2JavaTranslator {
+extension FFMSwift2JavaGenerator {
   /// Lower the given function declaration to a C-compatible entrypoint,
   /// providing all of the mappings between the parameter and result types
   /// of the original function and its `@_cdecl` counterpart.

Sources/JExtractSwift/CDeclLowering/Swift2JavaTranslator+FunctionLowering.swift renamed to Sources/JExtractSwift/FFM/CDeclLowering/FFMSwift2JavaGenerator+FunctionLowering.swift

@@ -33,7 +33,7 @@ extension FFMSwift2JavaGenerator {
   }
 
   /// Print FFM Java binding descriptors for the imported Swift API.
-  func printJavaBindingDescriptorClass(
+  package func printJavaBindingDescriptorClass(
     _ printer: inout CodePrinter,
     _ decl: ImportedFunc
   ) {

Sources/JExtractSwift/ConversionStep.swift renamed to Sources/JExtractSwift/FFM/ConversionStep.swift

@@ -14,7 +14,7 @@
 
 import JavaTypes
 
-extension Swift2JavaTranslator {
+extension FFMSwift2JavaGenerator {
   func translatedSignature(
     for decl: ImportedFunc
   ) -> TranslatedFunctionSignature? {

Sources/JExtractSwift/FFM/FFMSwift2JavaGenerator+JavaBindingsPrinting.swift

@@ -15,14 +15,13 @@
 import SwiftSyntax
 import SwiftSyntaxBuilder
 
-extension Swift2JavaTranslator {
-  public func writeSwiftThunkSources(outputDirectory: String) throws {
+extension FFMSwift2JavaGenerator {
+  package func writeSwiftThunkSources() throws {
     var printer = CodePrinter()
-
-    try writeSwiftThunkSources(outputDirectory: outputDirectory, printer: &printer)
+    try writeSwiftThunkSources(printer: &printer)
   }
 
-  public func writeSwiftThunkSources(outputDirectory: String, printer: inout CodePrinter) throws {
+  package func writeSwiftThunkSources(printer: inout CodePrinter) throws {
     let moduleFilenameBase = "\(self.swiftModuleName)Module+SwiftJava"
     let moduleFilename = "\(moduleFilenameBase).swift"
     do {
@@ -31,7 +30,7 @@ extension Swift2JavaTranslator {
       try printGlobalSwiftThunkSources(&printer)
 
       if let outputFile = try printer.writeContents(
-        outputDirectory: outputDirectory,
+        outputDirectory: self.swiftOutputDirectory,
         javaPackagePath: nil,
         filename: moduleFilename)
       {
@@ -42,7 +41,7 @@ extension Swift2JavaTranslator {
     }
 
     // === All types
-    for (_, ty) in importedTypes.sorted(by: { (lhs, rhs) in lhs.key < rhs.key }) {
+    for (_, ty) in self.analysis.importedTypes.sorted(by: { (lhs, rhs) in lhs.key < rhs.key }) {
       let fileNameBase = "\(ty.swiftNominal.qualifiedName)+SwiftJava"
       let filename = "\(fileNameBase).swift"
       log.info("Printing contents: \(filename)")
@@ -51,7 +50,7 @@ extension Swift2JavaTranslator {
         try printSwiftThunkSources(&printer, ty: ty)
 
         if let outputFile = try printer.writeContents(
-          outputDirectory: outputDirectory,
+          outputDirectory: self.swiftOutputDirectory,
           javaPackagePath: nil,
           filename: filename)
         {
@@ -110,23 +109,23 @@ extension Swift2JavaTranslator {
 
 struct SwiftThunkTranslator {
 
-  let st: Swift2JavaTranslator
+  let st: FFMSwift2JavaGenerator
 
-  init(_ st: Swift2JavaTranslator) {
+  init(_ st: FFMSwift2JavaGenerator) {
     self.st = st
   }
 
   func renderGlobalThunks() -> [DeclSyntax] {
     var decls: [DeclSyntax] = []
     decls.reserveCapacity(
-      st.importedGlobalVariables.count + st.importedGlobalFuncs.count
+      st.analysis.importedGlobalVariables.count + st.analysis.importedGlobalFuncs.count
     )
 
-    for decl in st.importedGlobalVariables {
+    for decl in st.analysis.importedGlobalVariables {
       decls.append(contentsOf: render(forFunc: decl))
     }
 
-    for decl in st.importedGlobalFuncs {
+    for decl in st.analysis.importedGlobalFuncs {
       decls.append(contentsOf: render(forFunc: decl))
     }
 

Sources/JExtractSwift/FFM/FFMSwift2JavaGenerator+JavaTranslation.swift

@@ -16,41 +16,44 @@ import JavaTypes
 import SwiftSyntax
 import SwiftSyntaxBuilder
 
-class FFMSwift2JavaGenerator: Swift2JavaGenerator {
-  private let log = Logger(label: "ffm-generator", logLevel: .info)
+package class FFMSwift2JavaGenerator: Swift2JavaGenerator {
+  let log = Logger(label: "ffm-generator", logLevel: .info)
 
   let analysis: AnalysisResult
   let swiftModuleName: String
   let javaPackage: String
   let swiftOutputDirectory: String
   let javaOutputDirectory: String
   let swiftStdlibTypes: SwiftStandardLibraryTypes
+  let symbolTable: SwiftSymbolTable
 
   var javaPackagePath: String {
     javaPackage.replacingOccurrences(of: ".", with: "/")
   }
 
   var thunkNameRegistry: ThunkNameRegistry = ThunkNameRegistry()
 
-  init(
-    analysis: AnalysisResult,
-    swiftModuleName: String,
+  /// Cached Java translation result. 'nil' indicates failed translation.
+  var translatedSignatures: [ImportedFunc: TranslatedFunctionSignature?] = [:]
+
+  package init(
+    translator: Swift2JavaTranslator,
     javaPackage: String,
     swiftOutputDirectory: String,
-    javaOutputDirectory: String
+    javaOutputDirectory: String,
   ) {
-    self.analysis = analysis
-    self.swiftModuleName = swiftModuleName
+    self.analysis = translator.result
+    self.swiftModuleName = translator.swiftModuleName
     self.javaPackage = javaPackage
     self.swiftOutputDirectory = swiftOutputDirectory
     self.javaOutputDirectory = javaOutputDirectory
-
-    var parsedSwiftModule = SwiftParsedModuleSymbolTable(moduleName: "Swift")
-    self.swiftStdlibTypes = SwiftStandardLibraryTypes(into: &parsedSwiftModule)
+    self.symbolTable = translator.symbolTable
+    self.swiftStdlibTypes = translator.swiftStdlibTypes
   }
 
   func generate() throws {
     try writeExportedJavaSources()
+    try writeSwiftThunkSources()
   }
 }
 
@@ -80,10 +83,13 @@ extension FFMSwift2JavaGenerator {
 
 
 extension FFMSwift2JavaGenerator {
+  package func writeExportedJavaSources() throws {
+    var printer = CodePrinter()
+    try writeExportedJavaSources(printer: &printer)
+  }
 
   /// Every imported public type becomes a public class in its own file in Java.
-  func writeExportedJavaSources() throws {
-    var printer = CodePrinter()
+  package func writeExportedJavaSources(printer: inout CodePrinter) throws {
     for (_, ty) in analysis.importedTypes.sorted(by: { (lhs, rhs) in lhs.key < rhs.key }) {
       let filename = "\(ty.swiftNominal.name).java"
       log.info("Printing contents: \(filename)")

Sources/JExtractSwift/Swift2JavaTranslator+SwiftThunkPrinting.swift renamed to Sources/JExtractSwift/FFM/FFMSwift2JavaGenerator+SwiftThunkPrinting.swift

@@ -0,0 +1,6 @@
+import ArgumentParser
+
+public enum GenerationMode: String, ExpressibleByArgument {
+  /// Foreign Value and Memory API
+  case ffm
+}

Sources/JExtractSwift/FFM/FFMSwift2JavaGenerator.swift

@@ -45,14 +45,18 @@ public struct SwiftToJava: ParsableCommand {
   @Option(name: .shortAndLong, help: "Configure the level of lots that should be printed")
   var logLevel: Logger.Level = .info
 
+  @Option(
+    name: .long,
+    help: "The mode of generation to use for the output files.")
+  var mode: GenerationMode = .ffm
+
   @Argument(help: "The Swift files or directories to recursively export to Java.")
   var input: [String]
 
   public func run() throws {
     let inputPaths = self.input.dropFirst().map { URL(string: $0)! }
 
     let translator = Swift2JavaTranslator(
-      javaPackage: packageName,
       swiftModuleName: swiftModule
     )
     translator.log.logLevel = logLevel
@@ -90,18 +94,18 @@ public struct SwiftToJava: ParsableCommand {
 
     try translator.analyze()
 
-    let generator = FFMSwift2JavaGenerator(
-      analysis: translator.result,
-      swiftModuleName: self.swiftModule,
-      javaPackage: self.packageName,
-      swiftOutputDirectory: outputDirectorySwift,
-      javaOutputDirectory: outputDirectoryJava
-    )
+    switch mode {
+    case .ffm:
+      let generator = FFMSwift2JavaGenerator(
+        translator: translator,
+        javaPackage: self.packageName,
+        swiftOutputDirectory: outputDirectorySwift,
+        javaOutputDirectory: outputDirectoryJava
+      )
 
-    try generator.generate()
+      try generator.generate()
+    }
 
-//    try translator.writeSwiftThunkSources(outputDirectory: outputDirectorySwift)
-//    try translator.writeExportedJavaSources(outputDirectory: outputDirectoryJava)
     print("[swift-java] Generated Java sources (\(packageName)) in: \(outputDirectoryJava)/")
     print("[swift-java] Imported Swift module '\(swiftModule)': " + "done.".green)
   }