Skip to content

Integer serialization fix for 32 bit platform compatibility #52

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
Dec 12, 2024
Merged

Integer serialization fix for 32 bit platform compatibility #52

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
10 changes: 5 additions & 5 deletions Sources/RawStructuredFieldValues/ComponentTypes.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -94,7 +94,7 @@ extension BareItem {
self = .bool(b)

case .integer(let i):
self = .integer(i)
self = .integer(Int(i))

case .decimal(let d):
self = .decimal(d)
Expand Down Expand Up @@ -126,7 +126,7 @@ public enum RFC9651BareItem: Sendable {
case bool(Bool)

/// An integer item.
case integer(Int)
case integer(Int64)

/// A decimal item.
case decimal(PseudoDecimal)
Expand All @@ -142,7 +142,7 @@ public enum RFC9651BareItem: Sendable {
case token(String)

/// A date item.
case date(Int)
case date(Int64)

/// A display string item.
case displayString(String)
Expand All @@ -155,7 +155,7 @@ extension RFC9651BareItem: ExpressibleByBooleanLiteral {
}

extension RFC9651BareItem: ExpressibleByIntegerLiteral {
public init(integerLiteral value: Int) {
public init(integerLiteral value: Int64) {
self = .integer(value)
}
}
Expand Down Expand Up @@ -184,7 +184,7 @@ extension RFC9651BareItem {
self = .bool(b)

case .integer(let i):
self = .integer(i)
self = .integer(Int64(i))

case .decimal(let d):
self = .decimal(d)
Expand Down
4 changes: 2 additions & 2 deletions Sources/RawStructuredFieldValues/FieldParser.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -232,7 +232,7 @@ extension StructuredFieldValueParser {
}

private mutating func _parseAnIntegerOrDecimal(isDate: Bool) throws -> RFC9651BareItem {
var sign = 1
var sign = Int64(1)
var type = IntegerOrDecimal.integer

if let first = self.underlyingData.first, first == asciiDash {
Expand Down Expand Up @@ -304,7 +304,7 @@ extension StructuredFieldValueParser {
case .integer:
// This intermediate string is sad, we should rewrite this manually to avoid it.
// This force-unwrap is safe, as we have validated that all characters are ascii digits.
let baseInt = Int(String(decoding: integerBytes, as: UTF8.self), radix: 10)!
let baseInt = Int64(String(decoding: integerBytes, as: UTF8.self), radix: 10)!
let resultingInt = baseInt * sign

if isDate {
Expand Down
12 changes: 6 additions & 6 deletions Sources/StructuredFieldValues/Encoder/StructuredFieldValueEncoder.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -313,7 +313,7 @@ extension _StructuredFieldEncoder: SingleValueEncodingContainer {
}

func encode(_ data: Date) throws {
let date = Int(data.timeIntervalSince1970)
let date = Int64(data.timeIntervalSince1970)
try self.currentStackEntry.storage.insertBareItem(.date(date))
}

Expand Down Expand Up @@ -371,7 +371,7 @@ extension _StructuredFieldEncoder: SingleValueEncodingContainer {
}

private func _encodeFixedWidthInteger<T: FixedWidthInteger>(_ value: T) throws {
guard let base = Int(exactly: value) else {
guard let base = Int64(exactly: value) else {
throw StructuredHeaderError.integerOutOfRange
}
try self.currentStackEntry.storage.insertBareItem(.integer(base))
Expand Down Expand Up @@ -483,7 +483,7 @@ extension _StructuredFieldEncoder {
}

func append(_ value: Date) throws {
let date = Int(value.timeIntervalSince1970)
let date = Int64(value.timeIntervalSince1970)
try self.currentStackEntry.storage.appendBareItem(.date(date))
}

Expand Down Expand Up @@ -562,7 +562,7 @@ extension _StructuredFieldEncoder {
}

private func _appendFixedWidthInteger<T: FixedWidthInteger>(_ value: T) throws {
guard let base = Int(exactly: value) else {
guard let base = Int64(exactly: value) else {
throw StructuredHeaderError.integerOutOfRange
}
try self.currentStackEntry.storage.appendBareItem(.integer(base))
Expand Down Expand Up @@ -667,7 +667,7 @@ extension _StructuredFieldEncoder {

func encode(_ value: Date, forKey key: String) throws {
let key = self.sanitizeKey(key)
let date = Int(value.timeIntervalSince1970)
let date = Int64(value.timeIntervalSince1970)
try self.currentStackEntry.storage.insertBareItem(.date(date), atKey: key)
}

Expand Down Expand Up @@ -789,7 +789,7 @@ extension _StructuredFieldEncoder {
}

private func _encodeFixedWidthInteger<T: FixedWidthInteger>(_ value: T, forKey key: String) throws {
guard let base = Int(exactly: value) else {
guard let base = Int64(exactly: value) else {
throw StructuredHeaderError.integerOutOfRange
}
try self.currentStackEntry.storage.insertBareItem(.integer(base), atKey: key)
Expand Down
4 changes: 2 additions & 2 deletions Tests/StructuredFieldValuesTests/Fixtures.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -119,7 +119,7 @@ struct StructuredHeaderTestFixture: Decodable {
enum JSONSchema: Decodable {
case dictionary([String: JSONSchema])
case array([JSONSchema])
case integer(Int)
case integer(Int64)
case double(Double)
case string(String)
case bool(Bool)
Expand All @@ -130,7 +130,7 @@ enum JSONSchema: Decodable {
self = .string(value)
} else if let bool = try? container.decode(Bool.self) {
self = .bool(bool)
} else if let value = try? container.decode(Int.self) {
} else if let value = try? container.decode(Int64.self) {
self = .integer(value)
} else if let value = try? container.decode(Double.self) {
self = .double(value)
Expand Down
Loading