Add a new test for reading lines and fix two bugs

Author: Frizlab

Sources/StreamReader/Core/StreamReader.swift

@@ -203,10 +203,11 @@ public extension StreamReader {
 		let (line, separator) = try readData(upTo: separators, matchingMode: .shortestDataWins, failIfNotFound: false, includeDelimiter: false)
 		_ = try readData(size: separator.count, allowReadingLess: false) /* We must read the line separator! */
 
-		if !allowWindowsNewLines || !allowLegacyMacOSNewLines || separator == lf {
+		if !allowWindowsNewLines || !allowLegacyMacOSNewLines || separator == lf || separator.isEmpty {
 			/* If Windows new lines are not allowed, or the separator that matched
-			 * was lf, or if legacy MacOS new lines are not allowed, we can
-			 * directly return the data we found as there is no ambiguity possible. */
+			 * was lf or empty (end of stream), or if legacy MacOS new lines are
+			 * not allowed, we can directly return the data we found as there is no
+			 * ambiguity possible. */
 			return (line: line, newLineChars: separator)
 		} else {
 			/* Windows and legacy MacOS new lines are allowed, and the separator

Sources/StreamReader/Utils.swift

@@ -22,7 +22,7 @@ internal func matchDelimiters(inData data: UnsafeRawBufferPointer, usingMatching
 	/* Reversed enumeration in order to be able to remove an element from the
 	 * unmatchedDelimiters array while still enumerating it and keeping valid
 	 * indexes. Not 100% sure this is valid, but it seems to work… */
-	for enumeratedDelimiter in unmatchedDelimiters.reversed().enumerated() {
+	for enumeratedDelimiter in unmatchedDelimiters.enumerated().reversed() {
 		if let range = data.firstRange(of: enumeratedDelimiter.element.element) {
 			/* Found one of the delimiter. Let's see what we do with it... */
 			let matchedLength = range.lowerBound + (includeDelimiter ? enumeratedDelimiter.element.element.count : 0)

Tests/StreamReaderTests/StreamReaderTests.swift

@@ -26,6 +26,22 @@ class StreamReaderTests : XCTestCase {
 		super.tearDown()
 	}
 
+	private func checkReadLine(reader r: StreamReader, expectedLine: String, expectedSeparator: String) throws {
+		let ret = try r.readLine(allowUnixNewLines: true, allowLegacyMacOSNewLines: true, allowWindowsNewLines: true)
+		XCTAssertEqual(ret.line, Data(expectedLine.utf8))
+		XCTAssertEqual(ret.newLineChars, Data(expectedSeparator.utf8))
+	}
+	
+	func testDataStreamReadLine() throws {
+		let r = DataReader(data: Data("Hello World,\r\nHow are you\ntoday?\rHope you’re\n\rokay!".utf8))
+		try checkReadLine(reader: r, expectedLine: "Hello World,", expectedSeparator: "\r\n")
+		try checkReadLine(reader: r, expectedLine: "How are you", expectedSeparator: "\n")
+		try checkReadLine(reader: r, expectedLine: "today?", expectedSeparator: "\r")
+		try checkReadLine(reader: r, expectedLine: "Hope you’re", expectedSeparator: "\n")
+		try checkReadLine(reader: r, expectedLine: "", expectedSeparator: "\r")
+		try checkReadLine(reader: r, expectedLine: "okay!", expectedSeparator: "")
+	}
+	
 	func testDataStreamBasicUpToDelimiterRead() throws {
 		let delim = Data(hexEncoded: "45")!
 		let d = Data(hexEncoded: "01 23 45 67 89")!