[JSON] expect(_:) should throw 'unexpectedEndOfFile' at EOF

rintaro · rintaro · commit 27fc2935db43 · 2024-04-17T18:10:57.000-07:00
diff --git a/Sources/SwiftCompilerPluginMessageHandling/JSON/JSONDecoding.swift b/Sources/SwiftCompilerPluginMessageHandling/JSON/JSONDecoding.swift
@@ -208,9 +208,13 @@ private struct JSONScanner {
 
   @inline(__always)
   mutating func expect(_ char: UnicodeScalar) throws {
-    guard advance(if: char) else {
+    guard hasData else {
+      throw JSONError.unexpectedEndOfFile
+    }
+    guard ptr.pointee == UInt8(ascii: char) else {
       throw JSONError.unexpectedCharacter(ptr.pointee, context: "expected \(char)")
     }
+    ptr += 1
   }
 
   mutating func scanNull() throws {

Original file line number	Diff line number	Diff line change
`@@ -208,9 +208,13 @@ private struct JSONScanner {`
`208`	`208`
`209`	`209`	`@inline(__always)`
`210`	`210`	`mutating func expect(_ char: UnicodeScalar) throws {`
`211`		`- guard advance(if: char) else {`
	`211`	`+ guard hasData else {`
	`212`	`+ throw JSONError.unexpectedEndOfFile`
	`213`	`+ }`
	`214`	`+ guard ptr.pointee == UInt8(ascii: char) else {`
`212`	`215`	`throw JSONError.unexpectedCharacter(ptr.pointee, context: "expected \(char)")`
`213`	`216`	`}`
	`217`	`+ ptr += 1`
`214`	`218`	`}`
`215`	`219`
`216`	`220`	`mutating func scanNull() throws {`