Skip to content

Some small cleanups. #1773

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

Merged
merged 1 commit into from
May 9, 2025
Merged

Some small cleanups. #1773

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
15 changes: 6 additions & 9 deletions Sources/SwiftProtobuf/TextFormatDecoder.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,19 +23,15 @@ import Foundation
internal struct TextFormatDecoder: Decoder {
internal var scanner: TextFormatScanner
private var fieldCount = 0
private var terminator: UInt8?
private var fieldNameMap: _NameMap?
private var messageType: any Message.Type
private let terminator: UInt8?
private let fieldNameMap: _NameMap
private let messageType: any Message.Type

internal var options: TextFormatDecodingOptions {
scanner.options
}

internal var complete: Bool {
mutating get {
scanner.complete
}
}
internal var complete: Bool { scanner.complete }

internal init(
messageType: any Message.Type,
Expand All @@ -50,6 +46,7 @@ internal struct TextFormatDecoder: Decoder {
}
fieldNameMap = nameProviding._protobuf_nameMap
self.messageType = messageType
self.terminator = nil
}

internal init(messageType: any Message.Type, scanner: TextFormatScanner, terminator: UInt8?) throws {
Expand All @@ -71,7 +68,7 @@ internal struct TextFormatDecoder: Decoder {
scanner.skipOptionalSeparator()
}
if let fieldNumber = try scanner.nextFieldNumber(
names: fieldNameMap!,
names: fieldNameMap,
messageType: messageType,
terminator: terminator
) {
Expand Down
12 changes: 4 additions & 8 deletions Sources/SwiftProtobuf/TextFormatScanner.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -240,19 +240,15 @@ private func decodeString(_ s: String) -> String? {
/// TextFormatScanner has no public members.
///
internal struct TextFormatScanner {
internal var extensions: (any ExtensionMap)?
internal let extensions: (any ExtensionMap)?
private var p: UnsafeRawPointer
private var end: UnsafeRawPointer
private var doubleParser = DoubleParser()
private let end: UnsafeRawPointer
private let doubleParser = DoubleParser()

internal let options: TextFormatDecodingOptions
internal var recursionBudget: Int

internal var complete: Bool {
mutating get {
p == end
}
}
internal var complete: Bool { p == end }

internal init(
utf8Pointer: UnsafeRawPointer,
Expand Down
Loading