Merge pull request #7 from BrettRToomey/byte-order-mark

Byte order mark bug fix
BrettRToomey · Mar 12, 2017 · 029406f · 029406f
2 parents dd40e76 + 77ffdb3
commit 029406f
Show file tree

Hide file tree

Showing 2 changed files with 23 additions and 1 deletion.
diff --git a/Sources/Parser.swift b/Sources/Parser.swift
@@ -71,13 +71,25 @@ extension XMLParser {
 
     public static func parse(_ bytes: Bytes) throws -> BML {
         var parser = XMLParser(scanner: Scanner(bytes))
-
+
+        parser.trimByteOrderMark()
+
         guard let root = try parser.extractTag() else {
            throw Error.malformedXML("Expected root element.")
         }
 
         return root
     }
+
+    mutating func trimByteOrderMark() {
+        if
+            scanner.peek() == 0xEF,
+            scanner.peek(aheadBy: 1) == 0xBB,
+            scanner.peek(aheadBy: 2) == 0xBF
+        {
+            scanner.pop(3)
+        }
+    }
 }
 
 extension XMLParser {

diff --git a/Tests/BMLTests/BMLTests.swift b/Tests/BMLTests/BMLTests.swift
@@ -11,6 +11,7 @@ class BMLTests: XCTestCase {
         ("testArrayBasic", testArrayBasic),
         ("testObjectBasic", testObjectBasic),
         ("testObjectUTF8", testObjectUTF8),
+        ("testUTF8ByteOrderMark", testUTF8ByteOrderMark),
         ("testObjectEmbedded", testObjectEmbedded),
         ("testSelfClosing", testSelfClosing),
         ("testSelfClosingWithAttributes", testSelfClosingWithAttributes),
@@ -93,6 +94,15 @@ class BMLTests: XCTestCase {
         }
     }
 
+    func testUTF8ByteOrderMark() {
+        do {
+            let result = try XMLParser.parse("\u{FEFF}<Book></Book>")
+            result.expect(BML(name: "Book"))
+        } catch {
+            XCTFail("Parser failed: \(error)")
+        }
+    }
+
     func testObjectEmbedded() {
         do {
             let result = try XMLParser.parse(