Merge pull request #99 from tayloraswift/fix-sendable

Fix #95

Author: tayloraswift

Sources/JSONAST/JSON.IntegerOverflowError.swift

@@ -3,37 +3,12 @@ extension JSON {
     ///
     /// This error is thrown by decoders, and is different from
     /// `Grammar.Pattern.IntegerOverflowError`, which is thrown by the parser.
-    public struct IntegerOverflowError: Error, Sendable {
+    public struct IntegerOverflowError<Representation>: NumericOverflowError, Equatable {
         /// The number literal that could not be converted.
         public let number: Number
 
-        /// The metatype of the desired integer type.
-        public let overflows: any FixedWidthInteger.Type
-
-        public init(number: Number, overflows: any FixedWidthInteger.Type) {
+        public init(number: Number) {
             self.number = number
-            self.overflows = overflows
         }
     }
 }
-extension JSON.IntegerOverflowError {
-    @available(
-        swift, deprecated: 5.7,
-        message: "use the more strongly-typed 'overflows' property"
-    ) public var type: Any.Type { self.overflows }
-}
-extension JSON.IntegerOverflowError: Equatable {
-    public static func == (lhs: Self, rhs: Self) -> Bool {
-        lhs.equals(number: rhs.number, overflows: rhs.overflows)
-    }
-
-    private func equals<Integer>(number: JSON.Number, overflows _: Integer.Type) -> Bool
-        where Integer: FixedWidthInteger {
-        self.number == number && self.overflows is Integer.Type
-    }
-}
-extension JSON.IntegerOverflowError: CustomStringConvertible {
-    public var description: String {
-        "integer literal '\(number)' overflows decoded type '\(self.overflows)'"
-    }
-}

Sources/JSONAST/JSON.Node.swift

@@ -174,7 +174,7 @@ extension JSON.Node {
             return nil
         }
         guard let integer: Integer = number.as(Integer.self) else {
-            throw JSON.IntegerOverflowError.init(number: number, overflows: Integer.self)
+            throw JSON.IntegerOverflowError<Integer>.init(number: number)
         }
         return integer
     }
@@ -201,7 +201,7 @@ extension JSON.Node {
             return nil
         }
         guard let integer: Integer = number.as(Integer.self) else {
-            throw JSON.IntegerOverflowError.init(number: number, overflows: Integer.self)
+            throw JSON.IntegerOverflowError<Integer>.init(number: number)
         }
         return integer
     }

Sources/JSONAST/JSON.NumericOverflowError.swift

@@ -0,0 +1,16 @@
+extension JSON {
+    /// An integer overflow occurred while converting a number literal to a desired type.
+    ///
+    /// This error is thrown by decoders, and is different from
+    /// `Grammar.Pattern.IntegerOverflowError`, which is thrown by the parser.
+    public protocol NumericOverflowError<Representation>: Error, CustomStringConvertible {
+        associatedtype Representation
+        /// The number literal that could not be converted.
+        var number: Number { get }
+    }
+}
+extension JSON.NumericOverflowError {
+    public var description: String {
+        "numeric literal '\(self.number)' overflows decoded type '\(Representation.self)'"
+    }
+}