Skip to content

Modernize Swift code generation to silence compiler warnings #109

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
yonilevy wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Modernize Swift code generation to silence compiler warnings #109

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion projects/Swift/Proto/Fbe/Source/ChronoxorFbe/ClientProtocol.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
import Foundation

// Fast Binary Encoding base client
public protocol ClientProtocol: class {
public protocol ClientProtocol: AnyObject {

// Get the send bytes buffer
var sendBuffer: Buffer { get set }
Expand Down Expand Up @@ -269,6 +269,7 @@ public extension ClientProtocol {
fbeStructSize = Int(Buffer.readUInt32(buffer: messageBuffer, offset: messageOffset + fbeStructOffset))
fbeStructType = Int(Buffer.readUInt32(buffer: messageBuffer, offset: messageOffset + fbeStructOffset + 4))
}
_ = fbeStructSize // part of wire format; kept for readability

// Handle the message
_ = onReceive(type: fbeStructType, buffer: messageBuffer.data, offset: messageOffset, size: messageSize)
Expand Down
2 changes: 1 addition & 1 deletion projects/Swift/Proto/Fbe/Source/ChronoxorFbe/FieldModel.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
import Foundation

// Fast Binary Encoding base field model
public protocol FieldModel: class {
public protocol FieldModel: AnyObject {
var _buffer: Buffer { get set }
var _offset: Int { get set }

Expand Down
2 changes: 1 addition & 1 deletion projects/Swift/Proto/Fbe/Source/ChronoxorFbe/FinalModel.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
import Foundation

// Fast Binary Encoding base final model
public protocol FinalModel: class {
public protocol FinalModel: AnyObject {
var _buffer: Buffer { get set }
var _offset: Int { get set }

Expand Down
3 changes: 2 additions & 1 deletion projects/Swift/Proto/Fbe/Source/ChronoxorFbe/ReceiverProtocol.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
import Foundation

// Fast Binary Encoding base receiver
public protocol ReceiverProtocol: class {
public protocol ReceiverProtocol: AnyObject {

// Get the bytes buffer
var buffer: Buffer { get set }
Expand Down Expand Up @@ -244,6 +244,7 @@ public extension ReceiverProtocol {
fbeStructSize = Int(Buffer.readUInt32(buffer: messageBuffer, offset: messageOffset + fbeStructOffset))
fbeStructType = Int(Buffer.readUInt32(buffer: messageBuffer, offset: messageOffset + fbeStructOffset + 4))
}
_ = fbeStructSize // part of wire format; kept for readability

// Handle the message
_ = onReceive(type: fbeStructType, buffer: messageBuffer.data, offset: messageOffset, size: messageSize)
Expand Down
4 changes: 2 additions & 2 deletions projects/Swift/Proto/Fbe/Source/ChronoxorFbe/SenderProtocol.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
import Foundation

// Fast Binary Encoding base sender
public protocol SenderProtocol: class {
public protocol SenderProtocol: AnyObject {

// Get the bytes buffer
var buffer: Buffer { get set }
Expand Down Expand Up @@ -45,7 +45,7 @@ public extension SenderProtocol {

// Send the value
let sent = try listener.onSend(buffer: buffer.data, offset: 0, size: buffer.size)
try _ = buffer.remove(offset: 0, size: sent)
try buffer.remove(offset: 0, size: sent)
return sent
}
}
2 changes: 1 addition & 1 deletion projects/Swift/Proto/Fbe/Source/ChronoxorFbe/UUIDGenerator.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ public struct UUIDGenerator {
}
}

extension UUID: Comparable {
extension UUID: @retroactive Comparable {
public static func < (lhs: UUID, rhs: UUID) -> Bool {
return lhs.hashValue < rhs.hashValue
}
Expand Down
16 changes: 9 additions & 7 deletions source/generator_swift.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -216,7 +216,7 @@ public struct UUIDGenerator {
}
}

extension UUID: Comparable {
extension UUID: @retroactive Comparable {
public static func < (lhs: UUID, rhs: UUID) -> Bool {
return lhs.hashValue < rhs.hashValue
}
Expand Down Expand Up @@ -795,7 +795,7 @@ void GeneratorSwift::GenerateFBEFieldModel(const std::string& domain, const std:

std::string code = R"CODE(
// Fast Binary Encoding base field model
public protocol FieldModel: class {
public protocol FieldModel: AnyObject {
var _buffer: Buffer { get set }
var _offset: Int { get set }

Expand Down Expand Up @@ -2268,7 +2268,7 @@ void GeneratorSwift::GenerateFBEFinalModel(const std::string& domain, const std:

std::string code = R"CODE(
// Fast Binary Encoding base final model
public protocol FinalModel: class {
public protocol FinalModel: AnyObject {
var _buffer: Buffer { get set }
var _offset: Int { get set }

Expand Down Expand Up @@ -3496,7 +3496,7 @@ void GeneratorSwift::GenerateFBESender(const std::string& domain, const std::str

std::string code = R"CODE(
// Fast Binary Encoding base sender
public protocol SenderProtocol: class {
public protocol SenderProtocol: AnyObject {

// Get the bytes buffer
var buffer: Buffer { get set }
Expand Down Expand Up @@ -3533,7 +3533,7 @@ public extension SenderProtocol {

// Send the value
let sent = try listener.onSend(buffer: buffer.data, offset: 0, size: buffer.size)
try _ = buffer.remove(offset: 0, size: sent)
try buffer.remove(offset: 0, size: sent)
return sent
}
}
Expand Down Expand Up @@ -3566,7 +3566,7 @@ void GeneratorSwift::GenerateFBEReceiver(const std::string& domain, const std::s

std::string code = R"CODE(
// Fast Binary Encoding base receiver
public protocol ReceiverProtocol: class {
public protocol ReceiverProtocol: AnyObject {

// Get the bytes buffer
var buffer: Buffer { get set }
Expand Down Expand Up @@ -3802,6 +3802,7 @@ public extension ReceiverProtocol {
fbeStructSize = Int(Buffer.readUInt32(buffer: messageBuffer, offset: messageOffset + fbeStructOffset))
fbeStructType = Int(Buffer.readUInt32(buffer: messageBuffer, offset: messageOffset + fbeStructOffset + 4))
}
_ = fbeStructSize // part of wire format; kept for readability

// Handle the message
_ = onReceive(type: fbeStructType, buffer: messageBuffer.data, offset: messageOffset, size: messageSize)
Expand Down Expand Up @@ -3902,7 +3903,7 @@ void GeneratorSwift::GenerateFBEClient(const std::string& domain, const std::str

std::string code = R"CODE(
// Fast Binary Encoding base client
public protocol ClientProtocol: class {
public protocol ClientProtocol: AnyObject {

// Get the send bytes buffer
var sendBuffer: Buffer { get set }
Expand Down Expand Up @@ -4163,6 +4164,7 @@ public extension ClientProtocol {
fbeStructSize = Int(Buffer.readUInt32(buffer: messageBuffer, offset: messageOffset + fbeStructOffset))
fbeStructType = Int(Buffer.readUInt32(buffer: messageBuffer, offset: messageOffset + fbeStructOffset + 4))
}
_ = fbeStructSize // part of wire format; kept for readability

// Handle the message
_ = onReceive(type: fbeStructType, buffer: messageBuffer.data, offset: messageOffset, size: messageSize)
Expand Down