Fixed the MarkableStreamReader to copy previously buffered data into …

…the new buffer when there are still unread characters in the old buffer.
FubarDevelopment · Jul 10, 2015 · eb70926 · eb70926
1 parent 5991ffa
commit eb70926
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 3 deletions.
diff --git a/BeanIO.Test/Stream/FixedLengthReaderTest.cs b/BeanIO.Test/Stream/FixedLengthReaderTest.cs
@@ -124,7 +124,7 @@ public void TestComments()
                 "/+" +
                 "+" +
                 "// ignored+" +
-                "//++");
+                "//");
 
             var reader = new FixedLengthReader(input, config);
             Assert.Equal("one", reader.Read());

diff --git a/BeanIO/Internal/Util/MarkableTextReader.cs b/BeanIO/Internal/Util/MarkableTextReader.cs
@@ -62,8 +62,20 @@ public override int Read()
 
         public virtual void Mark(int readAheadLimit)
         {
-            _markBuffer = new int[readAheadLimit];
-            _markBufferSize = _markBufferPosition = 0;
+            var oldBuffer = _markBuffer;
+            if (oldBuffer != null && _markBufferPosition != _markBufferSize)
+            {
+                var remainingSize = _markBufferSize - _markBufferPosition;
+                _markBuffer = new int[Math.Max(readAheadLimit, remainingSize)];
+                Array.Copy(oldBuffer, _markBufferPosition, _markBuffer, 0, remainingSize);
+                _markBufferSize = remainingSize;
+            }
+            else
+            {
+                _markBuffer = new int[readAheadLimit];
+                _markBufferSize = 0;
+            }
+            _markBufferPosition = 0;
         }
 
         public virtual void Reset()