BigfootDev/flatbuffers
1
0
Fork 1
mirror of https://github.com/google/flatbuffers.git synced 2026-06-22 03:28:29 +00:00
Code Issues Packages Projects Releases Wiki Activity

[Swift] Inline arrays (#8755)

Browse Source 
Implements InlineArrays which allow us to use Flatbuffers arrays within
Structs natively, and also implements FlatbufferVectors as a secondary API
when using mutable Structs

Fixes mutations within fixed sizes arrays

Adds tests and remove inout and mutating from generated objects in favor of borrowing

---------

Co-authored-by: Wouter van Oortmerssen <aardappel@gmail.com>
This commit is contained in:
mustiikhalil
2025-11-15 00:33:16 +01:00
committed by GitHub
parent 7150dfb5c4
commit cbf0850828
18 changed files with 995 additions and 359 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
tests/swift/fuzzer/CodeGenerationTests/test_import_generated.swift
View File

@@ -36,10 +36,9 @@ internal struct Message: FlatBufferTable, FlatbuffersVectorInitializable, Verifi
Message.add(internalMessage: internalMessage, &fbb)
return Message.endMessage(&fbb, start: __start)
}
internal mutating func unpack() -> MessageT {
return MessageT(&self)
internal func unpack() -> MessageT {
return MessageT(self)
}
internal static func pack(_ builder: inout FlatBufferBuilder, obj: inout MessageT?) -> Offset {
guard var obj = obj else { return Offset() }
@@ -81,7 +80,7 @@ internal class MessageT: NativeObject {
internal var internalMessage: String?
internal init(_ _t: inout Message) {
internal init(_ _t: borrowing Message) {
internalMessage = _t.internalMessage
}

27
tests/swift/fuzzer/CodeGenerationTests/test_no_include_generated.swift
View File

@@ -9,8 +9,7 @@ public struct BytesCount: NativeStruct, FlatbuffersVectorInitializable, Verifiab
private var _x: Int64
public init(_ bb: ByteBuffer, o: Int32) {
let _accessor = Struct(bb: bb, position: o)
_x = _accessor.readBuffer(of: Int64.self, at: 0)
self = bb.read(def: Self.self, position: Int(o))
}
public init(x: Int64) {
@@ -21,7 +20,7 @@ public struct BytesCount: NativeStruct, FlatbuffersVectorInitializable, Verifiab
_x = 0
}
public init(_ _t: inout BytesCount_Mutable) {
public init(_ _t: borrowing BytesCount_Mutable) {
_x = _t.x
}
@@ -55,10 +54,9 @@ public struct BytesCount_Mutable: FlatBufferStruct, FlatbuffersVectorInitializab
public var x: Int64 { return _accessor.readBuffer(of: Int64.self, at: 0) }
@discardableResult public func mutate(x: Int64) -> Bool { return _accessor.mutate(x, index: 0) }
public mutating func unpack() -> BytesCount {
return BytesCount(&self)
public func unpack() -> BytesCount {
return BytesCount(self)
}
public static func pack(_ builder: inout FlatBufferBuilder, obj: inout BytesCount?) -> Offset {
guard var obj = obj else { return Offset() }
@@ -98,10 +96,9 @@ public struct InternalMessage: FlatBufferTable, FlatbuffersVectorInitializable,
InternalMessage.add(str: str, &fbb)
return InternalMessage.endInternalMessage(&fbb, start: __start)
}
public mutating func unpack() -> InternalMessageT {
return InternalMessageT(&self)
public func unpack() -> InternalMessageT {
return InternalMessageT(self)
}
public static func pack(_ builder: inout FlatBufferBuilder, obj: inout InternalMessageT?) -> Offset {
guard var obj = obj else { return Offset() }
@@ -143,7 +140,7 @@ public class InternalMessageT: NativeObject {
public var str: String?
public init(_ _t: inout InternalMessage) {
public init(_ _t: borrowing InternalMessage) {
str = _t.str
}
@@ -192,10 +189,9 @@ public struct Message: FlatBufferTable, FlatbuffersVectorInitializable, Verifiab
Message.add(pointer: pointer, &fbb)
return Message.endMessage(&fbb, start: __start)
}
public mutating func unpack() -> MessageT {
return MessageT(&self)
public func unpack() -> MessageT {
return MessageT(self)
}
public static func pack(_ builder: inout FlatBufferBuilder, obj: inout MessageT?) -> Offset {
guard var obj = obj else { return Offset() }
@@ -243,11 +239,10 @@ public class MessageT: NativeObject {
public var position: BytesCount
public var pointer: InternalMessageT
public init(_ _t: inout Message) {
public init(_ _t: borrowing Message) {
id = _t.id
position = _t.position
var __pointer = _t.pointer
pointer = __pointer!.unpack()
pointer = _t.pointer!.unpack()
}
public init() {