Test product

Author: FlickerSoul

Sources/BinaryParseKit/CustomExtensions.swift

@@ -88,6 +88,14 @@ extension Int: EndianParsable {
     }
 }
 
+// MARK: - MatchableRawValue
+
+public extension MatchableRawRepresentable where Self.RawValue == UInt8 {
+    func bytesToMatch() -> [UInt8] {
+        [rawValue]
+    }
+}
+
 // MARK: - RawRepresentable
 
 //

Sources/BinaryParseKit/ParsableProtocols.swift

@@ -142,3 +142,7 @@ public extension SizedParsable {
         self = result
     }
 }
+
+public protocol MatchableRawRepresentable: RawRepresentable {
+    func bytesToMatch() -> [UInt8]
+}

Sources/BinaryParseKitMacros/Macros/ParseEnum/ConsructParseEnumMacro.swift

@@ -42,14 +42,16 @@ public struct ConstructEnumParseMacro: ExtensionMacro {
                         let toBeMatched = if let matchBytes = caseParseInfo.matchAction.matchBytes {
                             matchBytes
                         } else {
-                            ExprSyntax("[\(type).\(caseParseInfo.caseElementName).rawValue]") // TODO: add UInt8 __match
+                            ExprSyntax(
+                                "(\(type).\(caseParseInfo.caseElementName) as MatchableRawRepresentable) .bytesToMatch()",
+                            )
                         }
 
                         try IfExprSyntax(
                             "if \(raw: Constants.UtilityFunctions.matchBytes)(\(toBeMatched), in: &span)",
                         ) {
                             if caseParseInfo.matchAction.matchPolicy == .matchAndTake {
-                                "try input.seek(toRelativeOffset: \(toBeMatched).count)"
+                                "try span.seek(toRelativeOffset: \(toBeMatched).count)"
                             }
 
                             var arguments: OrderedDictionary<TokenSyntax, EnumCaseParameterParseInfo> = [:]

Tests/BinaryParseKitMacroTests/BinaryParseKitEnumTests.swift

@@ -208,7 +208,7 @@ extension BinaryParseKitMacroTests {
                 extension TestEnum: BinaryParseKit.Parsable {
                     init(parsing span: inout BinaryParsing.ParserSpan) throws(BinaryParsing.ThrownParsingError) {
                         if BinaryParseKit.__match([0x01], in: &span) {
-                            try input.seek(toRelativeOffset: [0x01].count)
+                            try span.seek(toRelativeOffset: [0x01].count)
                             self = .a
                             return
                         }
@@ -247,7 +247,7 @@ extension BinaryParseKitMacroTests {
                 extension TestEnum: BinaryParseKit.Parsable {
                     init(parsing span: inout BinaryParsing.ParserSpan) throws(BinaryParsing.ThrownParsingError) {
                         if BinaryParseKit.__match([0x01], in: &span) {
-                            try input.seek(toRelativeOffset: [0x01].count)
+                            try span.seek(toRelativeOffset: [0x01].count)
                             self = .a
                             return
                         }