fixes

Snapchat · Aug 29, 2024 · 539df09 · 539df09
1 parent 6e986dd
commit 539df09
Show file tree

Hide file tree

Showing 81 changed files with 853 additions and 848 deletions.
diff --git a/examples/generated-src/swift/ItemList+Private.swift b/examples/generated-src/swift/ItemList+Private.swift
@@ -7,15 +7,15 @@ import Foundation
 import TextSort
 import TextSortCxx
 
-enum ItemListMarshaller: DjinniSupport.Marshaller {
-    typealias SwiftType = TextSort.ItemList
-    static func fromCpp(_ c: djinni.swift.AnyValue) -> SwiftType {
+public enum ItemListMarshaller: DjinniSupport.Marshaller {
+    public typealias SwiftType = TextSort.ItemList
+    public static func fromCpp(_ c: djinni.swift.AnyValue) -> SwiftType {
         return withUnsafePointer(to: c) { p in
             let items = ListMarshaller<StringMarshaller>.fromCpp(djinni.swift.getMember(p, 0))
             return SwiftType(items: items)
         }
     }
-    static func toCpp(_ s: SwiftType) -> djinni.swift.AnyValue {
+    public static func toCpp(_ s: SwiftType) -> djinni.swift.AnyValue {
         var ret = djinni.swift.makeCompositeValue()
         djinni.swift.addMember(&ret, ListMarshaller<StringMarshaller>.toCpp(s.items))
         return ret

diff --git a/examples/generated-src/swift/SortItems+Private.swift b/examples/generated-src/swift/SortItems+Private.swift
@@ -10,35 +10,35 @@ import TextSortCxx
 final class SortItemsCppProxy: DjinniSupport.CppProxy, TextSort.SortItems {
     init(_ inst: djinni.swift.AnyValue) { super.init(inst:inst) } 
     func sort(_ order: TextSort.SortOrder, items: TextSort.ItemList) throws -> Void {
-        var params = djinni.swift.ParameterList()
-        params.addValue(inst)
-        params.addValue(SortOrderMarshaller.toCpp(order))
-        params.addValue(ItemListMarshaller.toCpp(items))
-        var ret = djinni_generated.SortItems_sort(&params)
+        var _params = djinni.swift.ParameterList()
+        _params.addValue(inst)
+        _params.addValue(SortOrderMarshaller.toCpp(order))
+        _params.addValue(ItemListMarshaller.toCpp(items))
+        var ret = djinni_generated.SortItems_sort(&_params)
         try handleCppErrors(&ret)
     }
 }
-enum SortItemsMarshaller: DjinniSupport.Marshaller {
-    typealias SwiftType = TextSort.SortItems
-    static func fromCpp(_ c: djinni.swift.AnyValue) -> SwiftType {
+public enum SortItemsMarshaller: DjinniSupport.Marshaller {
+    public typealias SwiftType = TextSort.SortItems
+    public static func fromCpp(_ c: djinni.swift.AnyValue) -> SwiftType {
         return cppInterfaceToSwift(c, { SortItemsCppProxy(c) as SwiftType })
     }
-    static func toCpp(_ s: SwiftType) -> djinni.swift.AnyValue {
+    public static func toCpp(_ s: SwiftType) -> djinni.swift.AnyValue {
         return swiftInterfaceToCpp(s, { fatalError("n/a") })
     }
 }
 public class SortItems_statics {
-    static func createWithListener(_ listener: TextSort.TextboxListener) throws -> TextSort.SortItems {
-        var params = djinni.swift.ParameterList()
-        params.addValue(TextboxListenerMarshaller.toCpp(listener))
-        var ret = djinni_generated.SortItems_createWithListener(&params)
+    public static func createWithListener(_ listener: TextSort.TextboxListener) throws -> TextSort.SortItems {
+        var _params = djinni.swift.ParameterList()
+        _params.addValue(TextboxListenerMarshaller.toCpp(listener))
+        var ret = djinni_generated.SortItems_createWithListener(&_params)
         try handleCppErrors(&ret)
         return SortItemsMarshaller.fromCpp(ret)
     }
-    static func runSort(_ items: TextSort.ItemList) throws -> TextSort.ItemList {
-        var params = djinni.swift.ParameterList()
-        params.addValue(ItemListMarshaller.toCpp(items))
-        var ret = djinni_generated.SortItems_runSort(&params)
+    public static func runSort(_ items: TextSort.ItemList) throws -> TextSort.ItemList {
+        var _params = djinni.swift.ParameterList()
+        _params.addValue(ItemListMarshaller.toCpp(items))
+        var ret = djinni_generated.SortItems_runSort(&_params)
         try handleCppErrors(&ret)
         return ItemListMarshaller.fromCpp(ret)
     }

diff --git a/examples/generated-src/swift/SortOrder+Private.swift b/examples/generated-src/swift/SortOrder+Private.swift
@@ -4,4 +4,4 @@
 import DjinniSupport
 import TextSort
 
-typealias SortOrderMarshaller = DjinniSupport.EnumMarshaller<SortOrder>
+public typealias SortOrderMarshaller = DjinniSupport.EnumMarshaller<SortOrder>
diff --git a/examples/generated-src/swift/TextboxListener+Private.swift b/examples/generated-src/swift/TextboxListener+Private.swift
@@ -14,12 +14,12 @@ let textboxListenerMethods: Vtbl<TextboxListener> = [
     },
 ]
 
-enum TextboxListenerMarshaller: DjinniSupport.Marshaller {
-    typealias SwiftType = TextSort.TextboxListener
-    static func fromCpp(_ c: djinni.swift.AnyValue) -> SwiftType {
+public enum TextboxListenerMarshaller: DjinniSupport.Marshaller {
+    public typealias SwiftType = TextSort.TextboxListener
+    public static func fromCpp(_ c: djinni.swift.AnyValue) -> SwiftType {
         return cppInterfaceToSwift(c, { fatalError("n/a") })
     }
-    static func toCpp(_ s: SwiftType) -> djinni.swift.AnyValue {
+    public static func toCpp(_ s: SwiftType) -> djinni.swift.AnyValue {
         return swiftInterfaceToCpp(s, { djinni_generated.TextboxListenerSwiftProxy.make(ctxPtr(s, textboxListenerMethods), dispatcherProtocalCall)})
     }
 }
diff --git a/src/source/SwiftMarshal.scala b/src/source/SwiftMarshal.scala
@@ -59,7 +59,7 @@ class SwiftMarshal(spec: Spec) extends Marshal(spec) {
             case MOptional => throw new AssertionError("nested optional?")
             case m => s"Optional<${f(arg)}>"
           }
-        case e: MExtern => e.swift.module + "." + e.swift.typename + (if (e.swift.generic) args(tm) else "")
+        case e: MExtern => Array(e.swift.module, e.swift.typename).filter(s => !s.isEmpty).mkString(".") + (if (e.swift.generic) args(tm) else "")
         case p: MProtobuf => p.body.swift match {
           case Some(o) => o.prefix + p.name
           case None => p.name
@@ -102,7 +102,7 @@ class SwiftMarshal(spec: Spec) extends Marshal(spec) {
   private def helperClass(tm: MExpr): String = helperName(tm) + helperTemplates(tm)
   def helperName(tm: MExpr): String = tm.base match {
     case d: MDef => helperClass(d.name)
-    case e: MExtern => e.swift.translator
+    case e: MExtern => Array(e.swift.translatorModule, e.swift.translator).filter(s => !s.isEmpty).mkString(".")
     case o => o match {
       case p: MPrimitive => p.idlName match {
         case "i8" => "I8Marshaller"

diff --git a/test-suite/djinni/vendor/third-party/date.yaml b/test-suite/djinni/vendor/third-party/date.yaml
@@ -40,7 +40,7 @@ ts:
 swift:
   typename: 'Date'
   translator: 'DateMarshaller'
-  module: 'DjinniSupport'
+  translatorModule: 'TestSuite'
 swiftxx:
   translator: '::djinni::swift::Date'
   header: '"djinni_support.hpp"'
diff --git a/test-suite/djinni/vendor/third-party/duration.yaml b/test-suite/djinni/vendor/third-party/duration.yaml
@@ -41,6 +41,7 @@ ts:
 swift:
   typename: 'Duration'
   translator: 'DurationMarshaller'
+  translator.module: 'TestSuite'
 swiftxx:
   translator: '::djinni::swift::Duration'
   header: '"Duration-swift.hpp"'
@@ -83,6 +84,7 @@ ts:
 swift:
   typename: 'Duration'
   translator: 'DurationH'
+  translator.module: 'TestSuite'
 swiftxx:
   translator: '::djinni::swift::Duration_h'
   header: '"Duration-swift.hpp"'
@@ -125,6 +127,7 @@ ts:
 swift:
   typename: 'Duration'
   translator: 'DurationMin'
+  translator.module: 'TestSuite'
 swiftxx:
   translator: '::djinni::swift::Duration_min'
   header: '"Duration-swift.hpp"'
@@ -167,6 +170,7 @@ ts:
 swift:
   typename: 'Duration'
   translator: 'DurationS'
+  translator.module: 'TestSuite'
 swiftxx:
   translator: '::djinni::swift::Duration_s'
   header: '"Duration-swift.hpp"'
@@ -209,6 +213,7 @@ ts:
 swift:
   typename: 'Duration'
   translator: 'DurationMs'
+  translator.module: 'TestSuite'
 swiftxx:
   translator: '::djinni::swift::Duration_ms'
   header: '"Duration-swift.hpp"'
@@ -251,6 +256,7 @@ ts:
 swift:
   typename: 'Duration'
   translator: 'DurationUs'
+  translator.module: 'TestSuite'
 swiftxx:
   translator: '::djinni::swift::Duration_us'
   header: '"Duration-swift.hpp"'
@@ -293,6 +299,7 @@ ts:
 swift:
   typename: 'Duration'
   translator: 'DurationNs'
+  translator.module: 'TestSuite'
 swiftxx:
   translator: '::djinni::swift::Duration_ns'
   header: '"Duration-swift.hpp"'
diff --git a/test-suite/generated-src/swift/AccessFlags+Private.swift b/test-suite/generated-src/swift/AccessFlags+Private.swift
@@ -4,4 +4,4 @@
 import DjinniSupport
 import TestSuite
 
-typealias AccessFlagsMarshaller = DjinniSupport.EnumMarshaller<AccessFlags>
+public typealias AccessFlagsMarshaller = DjinniSupport.EnumMarshaller<AccessFlags>
diff --git a/test-suite/generated-src/swift/AssortedPrimitives+Private.swift b/test-suite/generated-src/swift/AssortedPrimitives+Private.swift
@@ -7,9 +7,9 @@ import Foundation
 import TestSuite
 import TestSuiteCxx
 
-enum AssortedPrimitivesMarshaller: DjinniSupport.Marshaller {
-    typealias SwiftType = TestSuite.AssortedPrimitives
-    static func fromCpp(_ c: djinni.swift.AnyValue) -> SwiftType {
+public enum AssortedPrimitivesMarshaller: DjinniSupport.Marshaller {
+    public typealias SwiftType = TestSuite.AssortedPrimitives
+    public static func fromCpp(_ c: djinni.swift.AnyValue) -> SwiftType {
         return withUnsafePointer(to: c) { p in
             let b = BoolMarshaller.fromCpp(djinni.swift.getMember(p, 0))
             let eight = I8Marshaller.fromCpp(djinni.swift.getMember(p, 1))
@@ -28,7 +28,7 @@ enum AssortedPrimitivesMarshaller: DjinniSupport.Marshaller {
             return SwiftType(b: b, eight: eight, sixteen: sixteen, thirtytwo: thirtytwo, sixtyfour: sixtyfour, fthirtytwo: fthirtytwo, fsixtyfour: fsixtyfour, oB: oB, oEight: oEight, oSixteen: oSixteen, oThirtytwo: oThirtytwo, oSixtyfour: oSixtyfour, oFthirtytwo: oFthirtytwo, oFsixtyfour: oFsixtyfour)
         }
     }
-    static func toCpp(_ s: SwiftType) -> djinni.swift.AnyValue {
+    public static func toCpp(_ s: SwiftType) -> djinni.swift.AnyValue {
         var ret = djinni.swift.makeCompositeValue()
         djinni.swift.addMember(&ret, BoolMarshaller.toCpp(s.b))
         djinni.swift.addMember(&ret, I8Marshaller.toCpp(s.eight))

diff --git a/test-suite/generated-src/swift/AsyncInterface+Private.swift b/test-suite/generated-src/swift/AsyncInterface+Private.swift
@@ -9,17 +9,17 @@ import TestSuiteCxx
 
 let asyncInterfaceMethods: Vtbl<AsyncInterface> = [
     { inst, params, ret in
-        let _f = FutureMarshaller<I32Marshaller>.fromCpp(djinni.swift.getMember(params, 0))
-        djinni.swift.setReturnValue(ret, try FutureMarshaller<StringMarshaller>.toCpp(inst.futureRoundtrip(_f)))
+        let _f = DjinniSupport.FutureMarshaller<I32Marshaller>.fromCpp(djinni.swift.getMember(params, 0))
+        djinni.swift.setReturnValue(ret, try DjinniSupport.FutureMarshaller<StringMarshaller>.toCpp(inst.futureRoundtrip(_f)))
     },
 ]
 
-enum AsyncInterfaceMarshaller: DjinniSupport.Marshaller {
-    typealias SwiftType = TestSuite.AsyncInterface
-    static func fromCpp(_ c: djinni.swift.AnyValue) -> SwiftType {
+public enum AsyncInterfaceMarshaller: DjinniSupport.Marshaller {
+    public typealias SwiftType = TestSuite.AsyncInterface
+    public static func fromCpp(_ c: djinni.swift.AnyValue) -> SwiftType {
         return cppInterfaceToSwift(c, { fatalError("n/a") })
     }
-    static func toCpp(_ s: SwiftType) -> djinni.swift.AnyValue {
+    public static func toCpp(_ s: SwiftType) -> djinni.swift.AnyValue {
         return swiftInterfaceToCpp(s, { djinni_generated.AsyncInterfaceSwiftProxy.make(ctxPtr(s, asyncInterfaceMethods), dispatcherProtocalCall)})
     }
 }
diff --git a/test-suite/generated-src/swift/AsyncInterface.swift b/test-suite/generated-src/swift/AsyncInterface.swift
@@ -5,5 +5,5 @@ import DjinniSupport
 import Foundation
 
 public protocol AsyncInterface: AnyObject {
-    func futureRoundtrip(_ f: DJFuture<Int32>) throws -> DJFuture<String>
+    func futureRoundtrip(_ f: DjinniSupport.DJFuture<Int32>) throws -> DjinniSupport.DJFuture<String>
 }
diff --git a/test-suite/generated-src/swift/ClientInterface+Private.swift b/test-suite/generated-src/swift/ClientInterface+Private.swift
@@ -34,12 +34,12 @@ let clientInterfaceMethods: Vtbl<ClientInterface> = [
     },
 ]
 
-enum ClientInterfaceMarshaller: DjinniSupport.Marshaller {
-    typealias SwiftType = TestSuite.ClientInterface
-    static func fromCpp(_ c: djinni.swift.AnyValue) -> SwiftType {
+public enum ClientInterfaceMarshaller: DjinniSupport.Marshaller {
+    public typealias SwiftType = TestSuite.ClientInterface
+    public static func fromCpp(_ c: djinni.swift.AnyValue) -> SwiftType {
         return cppInterfaceToSwift(c, { fatalError("n/a") })
     }
-    static func toCpp(_ s: SwiftType) -> djinni.swift.AnyValue {
+    public static func toCpp(_ s: SwiftType) -> djinni.swift.AnyValue {
         return swiftInterfaceToCpp(s, { djinni_generated.ClientInterfaceSwiftProxy.make(ctxPtr(s, clientInterfaceMethods), dispatcherProtocalCall)})
     }
 }
diff --git a/test-suite/generated-src/swift/ClientReturnedRecord+Private.swift b/test-suite/generated-src/swift/ClientReturnedRecord+Private.swift
@@ -7,17 +7,17 @@ import Foundation
 import TestSuite
 import TestSuiteCxx
 
-enum ClientReturnedRecordMarshaller: DjinniSupport.Marshaller {
-    typealias SwiftType = TestSuite.ClientReturnedRecord
-    static func fromCpp(_ c: djinni.swift.AnyValue) -> SwiftType {
+public enum ClientReturnedRecordMarshaller: DjinniSupport.Marshaller {
+    public typealias SwiftType = TestSuite.ClientReturnedRecord
+    public static func fromCpp(_ c: djinni.swift.AnyValue) -> SwiftType {
         return withUnsafePointer(to: c) { p in
             let recordId = I64Marshaller.fromCpp(djinni.swift.getMember(p, 0))
             let content = StringMarshaller.fromCpp(djinni.swift.getMember(p, 1))
             let misc = OptionalMarshaller<StringMarshaller>.fromCpp(djinni.swift.getMember(p, 2))
             return SwiftType(recordId: recordId, content: content, misc: misc)
         }
     }
-    static func toCpp(_ s: SwiftType) -> djinni.swift.AnyValue {
+    public static func toCpp(_ s: SwiftType) -> djinni.swift.AnyValue {
         var ret = djinni.swift.makeCompositeValue()
         djinni.swift.addMember(&ret, I64Marshaller.toCpp(s.recordId))
         djinni.swift.addMember(&ret, StringMarshaller.toCpp(s.content))

diff --git a/test-suite/generated-src/swift/Color+Private.swift b/test-suite/generated-src/swift/Color+Private.swift
@@ -4,4 +4,4 @@
 import DjinniSupport
 import TestSuite
 
-typealias ColorMarshaller = DjinniSupport.EnumMarshaller<Color>
+public typealias ColorMarshaller = DjinniSupport.EnumMarshaller<Color>
diff --git a/test-suite/generated-src/swift/Conflict+Private.swift b/test-suite/generated-src/swift/Conflict+Private.swift
@@ -14,12 +14,12 @@ import TestSuiteCxx
 final class ConflictCppProxy: DjinniSupport.CppProxy, TestSuite.Conflict {
     init(_ inst: djinni.swift.AnyValue) { super.init(inst:inst) } 
 }
-enum ConflictMarshaller: DjinniSupport.Marshaller {
-    typealias SwiftType = TestSuite.Conflict
-    static func fromCpp(_ c: djinni.swift.AnyValue) -> SwiftType {
+public enum ConflictMarshaller: DjinniSupport.Marshaller {
+    public typealias SwiftType = TestSuite.Conflict
+    public static func fromCpp(_ c: djinni.swift.AnyValue) -> SwiftType {
         return cppInterfaceToSwift(c, { ConflictCppProxy(c) as SwiftType })
     }
-    static func toCpp(_ s: SwiftType) -> djinni.swift.AnyValue {
+    public static func toCpp(_ s: SwiftType) -> djinni.swift.AnyValue {
         return swiftInterfaceToCpp(s, { fatalError("n/a") })
     }
 }
diff --git a/test-suite/generated-src/swift/ConflictUser+Private.swift b/test-suite/generated-src/swift/ConflictUser+Private.swift
@@ -10,27 +10,27 @@ import TestSuiteCxx
 final class ConflictUserCppProxy: DjinniSupport.CppProxy, TestSuite.ConflictUser {
     init(_ inst: djinni.swift.AnyValue) { super.init(inst:inst) } 
     func Conflict() throws -> TestSuite.Conflict {
-        var params = djinni.swift.ParameterList()
-        params.addValue(inst)
-        var ret = djinni_generated.ConflictUser_Conflict(&params)
+        var _params = djinni.swift.ParameterList()
+        _params.addValue(inst)
+        var ret = djinni_generated.ConflictUser_Conflict(&_params)
         try handleCppErrors(&ret)
         return ConflictMarshaller.fromCpp(ret)
     }
     func conflictArg(_ cs: Array<TestSuite.Conflict>) throws -> Bool {
-        var params = djinni.swift.ParameterList()
-        params.addValue(inst)
-        params.addValue(ListMarshaller<ConflictMarshaller>.toCpp(cs))
-        var ret = djinni_generated.ConflictUser_conflictArg(&params)
+        var _params = djinni.swift.ParameterList()
+        _params.addValue(inst)
+        _params.addValue(ListMarshaller<ConflictMarshaller>.toCpp(cs))
+        var ret = djinni_generated.ConflictUser_conflictArg(&_params)
         try handleCppErrors(&ret)
         return BoolMarshaller.fromCpp(ret)
     }
 }
-enum ConflictUserMarshaller: DjinniSupport.Marshaller {
-    typealias SwiftType = TestSuite.ConflictUser
-    static func fromCpp(_ c: djinni.swift.AnyValue) -> SwiftType {
+public enum ConflictUserMarshaller: DjinniSupport.Marshaller {
+    public typealias SwiftType = TestSuite.ConflictUser
+    public static func fromCpp(_ c: djinni.swift.AnyValue) -> SwiftType {
         return cppInterfaceToSwift(c, { ConflictUserCppProxy(c) as SwiftType })
     }
-    static func toCpp(_ s: SwiftType) -> djinni.swift.AnyValue {
+    public static func toCpp(_ s: SwiftType) -> djinni.swift.AnyValue {
         return swiftInterfaceToCpp(s, { fatalError("n/a") })
     }
 }
diff --git a/test-suite/generated-src/swift/ConstantEnum+Private.swift b/test-suite/generated-src/swift/ConstantEnum+Private.swift
@@ -4,4 +4,4 @@
 import DjinniSupport
 import TestSuite
 
-typealias ConstantEnumMarshaller = DjinniSupport.EnumMarshaller<ConstantEnum>
+public typealias ConstantEnumMarshaller = DjinniSupport.EnumMarshaller<ConstantEnum>
diff --git a/test-suite/generated-src/swift/ConstantInterfaceWithEnum+Private.swift b/test-suite/generated-src/swift/ConstantInterfaceWithEnum+Private.swift
@@ -11,12 +11,12 @@ import TestSuiteCxx
 final class ConstantInterfaceWithEnumCppProxy: DjinniSupport.CppProxy, TestSuite.ConstantInterfaceWithEnum {
     init(_ inst: djinni.swift.AnyValue) { super.init(inst:inst) } 
 }
-enum ConstantInterfaceWithEnumMarshaller: DjinniSupport.Marshaller {
-    typealias SwiftType = TestSuite.ConstantInterfaceWithEnum
-    static func fromCpp(_ c: djinni.swift.AnyValue) -> SwiftType {
+public enum ConstantInterfaceWithEnumMarshaller: DjinniSupport.Marshaller {
+    public typealias SwiftType = TestSuite.ConstantInterfaceWithEnum
+    public static func fromCpp(_ c: djinni.swift.AnyValue) -> SwiftType {
         return cppInterfaceToSwift(c, { ConstantInterfaceWithEnumCppProxy(c) as SwiftType })
     }
-    static func toCpp(_ s: SwiftType) -> djinni.swift.AnyValue {
+    public static func toCpp(_ s: SwiftType) -> djinni.swift.AnyValue {
         return swiftInterfaceToCpp(s, { fatalError("n/a") })
     }
 }
diff --git a/test-suite/generated-src/swift/ConstantRecord+Private.swift b/test-suite/generated-src/swift/ConstantRecord+Private.swift
@@ -7,16 +7,16 @@ import Foundation
 import TestSuite
 import TestSuiteCxx
 
-enum ConstantRecordMarshaller: DjinniSupport.Marshaller {
-    typealias SwiftType = TestSuite.ConstantRecord
-    static func fromCpp(_ c: djinni.swift.AnyValue) -> SwiftType {
+public enum ConstantRecordMarshaller: DjinniSupport.Marshaller {
+    public typealias SwiftType = TestSuite.ConstantRecord
+    public static func fromCpp(_ c: djinni.swift.AnyValue) -> SwiftType {
         return withUnsafePointer(to: c) { p in
             let someInteger = I32Marshaller.fromCpp(djinni.swift.getMember(p, 0))
             let someString = StringMarshaller.fromCpp(djinni.swift.getMember(p, 1))
             return SwiftType(someInteger: someInteger, someString: someString)
         }
     }
-    static func toCpp(_ s: SwiftType) -> djinni.swift.AnyValue {
+    public static func toCpp(_ s: SwiftType) -> djinni.swift.AnyValue {
         var ret = djinni.swift.makeCompositeValue()
         djinni.swift.addMember(&ret, I32Marshaller.toCpp(s.someInteger))
         djinni.swift.addMember(&ret, StringMarshaller.toCpp(s.someString))