Review fixes.

Author: pelekon

Sources/JExtractSwiftLib/FFM/CDeclLowering/CRepresentation.swift

@@ -126,8 +126,8 @@ extension SwiftKnownTypeDeclKind {
     )
     case .void: .void
     case .unsafePointer, .unsafeMutablePointer, .unsafeRawBufferPointer, .unsafeMutableRawBufferPointer, 
-    .unsafeBufferPointer, .unsafeMutableBufferPointer, .string, .data, .dataProtocol, .essentialsData, 
-    .essentialsDataProtocol, .optional:
+      .unsafeBufferPointer, .unsafeMutableBufferPointer, .string, .foundationData, .foundationDataProtocol, 
+      .essentialsData, .essentialsDataProtocol, .optional:
        nil
     }
   }

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

@@ -282,7 +282,7 @@ struct CdeclLowering {
             )
           }
 
-        case .data, .essentialsData:
+        case .foundationData, .essentialsData:
           break
 
         default:
@@ -375,7 +375,7 @@ struct CdeclLowering {
     case .nominal(let nominal):
       if let knownType = nominal.nominalTypeDecl.knownTypeKind {
         switch knownType {
-        case .data, .essentialsData:
+        case .foundationData, .essentialsData:
           break
         case .unsafeRawPointer, .unsafeMutableRawPointer:
           throw LoweringError.unhandledType(.optional(wrappedType))
@@ -387,7 +387,7 @@ struct CdeclLowering {
           throw LoweringError.unhandledType(.optional(wrappedType))
         case .void, .string:
           throw LoweringError.unhandledType(.optional(wrappedType))
-        case .dataProtocol, .essentialsDataProtocol:
+        case .foundationDataProtocol, .essentialsDataProtocol:
           throw LoweringError.unhandledType(.optional(wrappedType))
         default:
           // Unreachable? Should be handled by `CType(cdeclType:)` lowering above.
@@ -505,7 +505,7 @@ struct CdeclLowering {
             ])
           )
 
-        case .data, .essentialsData:
+        case .foundationData, .essentialsData:
           break
 
         default:
@@ -606,7 +606,7 @@ struct CdeclLowering {
         case .void:
           return LoweredResult(cdeclResultType: .void, cdeclOutParameters: [], conversion: .placeholder)
 
-        case .data, .essentialsData:
+        case .foundationData, .essentialsData:
           break
 
         case .string, .optional:

Sources/JExtractSwiftLib/FFM/FFMSwift2JavaGenerator+JavaTranslation.swift

@@ -411,7 +411,7 @@ extension FFMSwift2JavaGenerator {
               conversion: .call(.placeholder, function: "SwiftRuntime.toCString", withArena: true)
             )
 
-          case .data, .essentialsData:
+          case .foundationData, .essentialsData:
             break
 
           default:
@@ -515,7 +515,7 @@ extension FFMSwift2JavaGenerator {
       case .nominal(let nominal):
         if let knownType = nominal.nominalTypeDecl.knownTypeKind {
           switch knownType {
-          case .data, .dataProtocol, .essentialsData, .essentialsDataProtocol:
+          case .foundationData, .foundationDataProtocol, .essentialsData, .essentialsDataProtocol:
             break
           default:
             throw JavaTranslationError.unhandledType(.optional(swiftType))
@@ -658,7 +658,7 @@ extension FFMSwift2JavaGenerator {
               )
             )
 
-          case .data, .essentialsData:
+          case .foundationData, .essentialsData:
             break
 
           case .unsafePointer, .unsafeMutablePointer:

Sources/JExtractSwiftLib/JNI/JNIJavaTypeTranslator.swift

@@ -50,7 +50,7 @@ enum JNIJavaTypeTranslator {
         .unsafePointer, .unsafeMutablePointer,
         .unsafeRawBufferPointer, .unsafeMutableRawBufferPointer,
         .unsafeBufferPointer, .unsafeMutableBufferPointer,
-        .optional, .data, .dataProtocol, .essentialsData, .essentialsDataProtocol:
+        .optional, .foundationData, .foundationDataProtocol, .essentialsData, .essentialsDataProtocol:
       return nil
     }
   }

Sources/JExtractSwiftLib/Swift2JavaTranslator.swift

@@ -110,8 +110,8 @@ extension Swift2JavaTranslator {
 
     // If any API uses 'Foundation.Data' or 'FoundationEssentials.Data', 
     // import 'Data' as if it's declared in this module.
-    if let dataDecl = self.symbolTable[.data] ?? self.symbolTable[.essentialsData] {
-      let dataProtocolDecl = (self.symbolTable[.dataProtocol] ?? self.symbolTable[.essentialsDataProtocol])!
+    if let dataDecl = self.symbolTable[.foundationData] ?? self.symbolTable[.essentialsData] {
+      let dataProtocolDecl = (self.symbolTable[.foundationDataProtocol] ?? self.symbolTable[.essentialsDataProtocol])!
       if self.isUsing(where: { $0 == dataDecl || $0 == dataProtocolDecl }) {
         visitor.visit(nominalDecl: dataDecl.syntax!.asNominal!, in: nil)
       }

Sources/JExtractSwiftLib/SwiftTypes/SwiftKnownTypeDecls.swift

@@ -15,7 +15,7 @@
 import SwiftSyntax
 
 enum SwiftKnownTypeDeclKind: String, Hashable {
-  // MARK: -Std
+  // Swift
   case bool = "Swift.Bool"
   case int = "Swift.Int"
   case uint = "Swift.UInt"
@@ -41,10 +41,10 @@ enum SwiftKnownTypeDeclKind: String, Hashable {
   case void = "Swift.Void"
   case string = "Swift.String"
 
-  // MARK: -Foundation
-  case dataProtocol = "Foundation.DataProtocol"
+  // Foundation
+  case foundationDataProtocol = "Foundation.DataProtocol"
   case essentialsDataProtocol = "FoundationEssentials.DataProtocol"
-  case data = "Foundation.Data"
+  case foundationData = "Foundation.Data"
   case essentialsData = "FoundationEssentials.Data"
 
   var moduleAndName: (module: String, name: String) {

Sources/JExtractSwiftLib/SwiftTypes/SwiftKnownTypes.swift

@@ -35,8 +35,8 @@ struct SwiftKnownTypes {
   var unsafeRawPointer: SwiftType { .nominal(SwiftNominalType(nominalTypeDecl: symbolTable[.unsafeRawPointer])) }
   var unsafeMutableRawPointer: SwiftType { .nominal(SwiftNominalType(nominalTypeDecl: symbolTable[.unsafeMutableRawPointer])) }
 
-  var dataProtocol: SwiftType { .nominal(SwiftNominalType(nominalTypeDecl: symbolTable[.dataProtocol])) }
-  var data: SwiftType { .nominal(SwiftNominalType(nominalTypeDecl: symbolTable[.data])) }
+  var foundationDataProtocol: SwiftType { .nominal(SwiftNominalType(nominalTypeDecl: symbolTable[.foundationDataProtocol])) }
+  var foundationData: SwiftType { .nominal(SwiftNominalType(nominalTypeDecl: symbolTable[.foundationData])) }
   var essentialsDataProtocol: SwiftType { .nominal(SwiftNominalType(nominalTypeDecl: symbolTable[.essentialsDataProtocol])) }
   var essentialsData: SwiftType { .nominal(SwiftNominalType(nominalTypeDecl: symbolTable[.essentialsData])) }
 
@@ -80,7 +80,7 @@ struct SwiftKnownTypes {
   /// given protocol kind. E.g. `String` for `StringProtocol`
   func representativeType(of knownProtocol: SwiftKnownTypeDeclKind) -> SwiftType? {
     switch knownProtocol {
-    case .dataProtocol: return self.data
+    case .foundationDataProtocol: return self.foundationData
     case .essentialsDataProtocol: return self.essentialsData
     default: return nil
     }