Merge pull request rarestype#121 from rarestype/typed-throws

[major]: port the parser over to typed throws

Author: tayloraswift

Package.swift

@@ -15,7 +15,7 @@ let package: Package = .init(
     ],
     dependencies: [
         .package(url: "https://github.com/ordo-one/dollup", from: "1.0.1"),
-        .package(url: "https://github.com/rarestype/gram", from: "1.0.0"),
+        .package(url: "https://github.com/rarestype/gram", from: "2.0.0"),
     ],
     targets: [
         .target(name: "JSONAST"),

Snippets/ParsingErrors.swift

@@ -6,6 +6,6 @@ let invalid: String = """
 """
 do {
     let _: JSON.Node = try .init(parsing: invalid)
-} catch is Pattern.UnexpectedValueError {
-    print("JSON failed to parse!")
+} catch let error {
+    print("JSON failed to parse! (\(error))")
 }

Sources/JSONAST/JSON.Number.Inline.swift

@@ -38,11 +38,11 @@ extension JSON.Number {
     }
 }
 extension JSON.Number.Inline {
-    @available(*, deprecated, message: "prefer initializing 'JSON.Number' directly")
+    @available(*, unavailable, message: "prefer initializing 'JSON.Number' directly")
     @inlinable public init<T>(_ signed: T) where T: SignedInteger {
         self.init(sign: signed < 0 ? .minus : .plus, units: UInt64.init(signed.magnitude))
     }
-    @available(*, deprecated, message: "prefer initializing 'JSON.Number' directly")
+    @available(*, unavailable, message: "prefer initializing 'JSON.Number' directly")
     @inlinable public init<T>(_ unsigned: T) where T: UnsignedInteger {
         self.init(sign: .plus, units: UInt64.init(unsigned))
     }

Sources/JSONDecoding/Decoding/JSON.DecodingError.swift

@@ -21,7 +21,7 @@ extension JSON.DecodingError: Equatable where Location: Equatable {
     /// the underlying ``Error`` existentials are not ``Equatable``.
     public static func == (lhs: Self, rhs: Self) -> Bool {
         lhs.location == rhs.location &&
-        lhs.underlying == rhs.underlying
+        lhs.underlying ~= rhs.underlying
     }
 }
 extension JSON.DecodingError: TraceableError {

Sources/JSONParsing/JSON.Array (ext).swift

@@ -26,6 +26,6 @@ extension JSON.Array {
 extension JSON.Array: LosslessStringConvertible {
     /// See ``init(parsing:) (String)``.
     public init?(_ description: String) {
-        do      { try self.init(parsing: description) } catch   { return nil }
+        do { try self.init(parsing: description) } catch { return nil }
     }
 }

Sources/JSONParsing/JSON.Node (ext).swift

@@ -37,6 +37,6 @@ extension JSON.Node {
 extension JSON.Node: LosslessStringConvertible {
     /// See ``init(parsingFragment:) (String)``.
     public init?(_ description: String) {
-        do      { try self.init(parsingFragment: description) } catch   { return nil }
+        do { try self.init(parsingFragment: description) } catch { return nil }
     }
 }

Sources/JSONParsing/JSON.Object (ext).swift

@@ -35,6 +35,6 @@ extension JSON.Object {
 extension JSON.Object: LosslessStringConvertible {
     /// See ``init(parsing:) (String)``.
     public init?(_ description: String) {
-        do      { try self.init(parsing: description) } catch   { return nil }
+        do { try self.init(parsing: description) } catch { return nil }
     }
 }

Sources/JSONParsing/Rules/JSON.NodeRule.Array.swift

@@ -6,17 +6,15 @@ extension JSON.NodeRule {
     /// Array literals begin and end with square brackets (`[` and `]`), and
     /// recursively contain instances of ``JSON.NodeRule`` separated by ``JSON.CommaRule``s.
     /// Trailing commas (a JSON5 extension) are not allowed.
-    enum Array {
-    }
+    enum Array {}
 }
 extension JSON.NodeRule.Array: ParsingRule {
     typealias Terminal = UInt8
 
     static func parse<Source>(
         _ input: inout ParsingInput<some ParsingDiagnostics<Source>>
-    ) throws -> [JSON.Node]
-        where   Source.Element == Terminal,
-        Source.Index == Location {
+    ) throws(PatternMatchingError) -> [JSON.Node]
+        where Source.Element == Terminal, Source.Index == Location {
         try input.parse(as: JSON.BracketLeftRule<Location>.self)
         var elements: [JSON.Node]
         if let head: JSON.Node = try? input.parse(as: JSON.NodeRule<Location>.self) {

Sources/JSONParsing/Rules/JSON.NodeRule.Nonfinite.swift

@@ -6,7 +6,7 @@ extension JSON.NodeRule {
 
         static func parse<Source>(
             _ input: inout ParsingInput<some ParsingDiagnostics<Source>>
-        ) throws -> JSON.Number
+        ) throws(PatternMatchingError) -> JSON.Number
             where Source.Element == Terminal, Source.Index == Location {
 
             if  let _: Void = input.parse(

Sources/JSONParsing/Rules/JSON.NodeRule.Object.Item.swift

@@ -5,15 +5,14 @@ extension JSON.NodeRule.Object {
     ///
     /// A key-value expression consists of a ``JSON.StringRule``, a ``JSON.ColonRule``, and
     /// a recursive instance of ``JSON.NodeRule``.
-    enum Item {
-    }
+    enum Item {}
 }
 extension JSON.NodeRule.Object.Item: ParsingRule {
     typealias Terminal = UInt8
 
     static func parse<Source>(
         _ input: inout ParsingInput<some ParsingDiagnostics<Source>>
-    ) throws -> (
+    ) throws(PatternMatchingError) -> (
         key: JSON.Key,
         value: JSON.Node
     )