#9 Simplified scanner interface

Andrei15193 · May 30, 2020 · e4772c1 · e4772c1
1 parent f3dd54e
commit e4772c1
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 104 deletions.
diff --git a/Mup.Tests/CreoleScannerTests.cs b/Mup.Tests/CreoleScannerTests.cs
@@ -5,118 +5,43 @@
 using System.Linq;
 using System.Text;
 using Xunit;
-using static Mup.Tests.CreoleScannerTestData;
-using static Mup.Tests.ScannerTestData;
 
 namespace Mup.Tests
 {
     public class CreoleScannerTests
     {
-        private static readonly CreoleScanner _scanner = new CreoleScanner();
-
-        private const string _textMethod = (nameof(CreoleScanner) + ".Scan(string): ");
-        private const string _readerMethod = (nameof(CreoleScanner) + ".Scan(TextReader): ");
-        private const string _readerWithBufferMethod = (nameof(CreoleScanner) + ".Scan(TextReader, int): ");
-
-        [Fact]
-        public void CannotScanFromNullText()
-        {
-            Assert.Throws<ArgumentNullException>(() => _scanner.Scan(text: null));
-        }
-
-        [Fact]
-        public void CannotScanFromNullTextReader()
-        {
-            Assert.Throws<ArgumentNullException>(() => _scanner.Scan(reader: null));
-        }
+        private readonly CreoleScanner _scanner = new CreoleScanner();
 
         [Fact]
         public void CannotScanFromNullTextReaderWithBuffer()
         {
-            Assert.Throws<ArgumentNullException>(() => _scanner.Scan(reader: null, bufferSize: 0));
+            Assert.Throws<ArgumentNullException>(() => _scanner.Scan(null, 0));
         }
 
-        [Theory, MemberData(nameof(InvalidBufferSizeTestData), MemberType = typeof(ScannerTestData))]
+        [Theory, MemberData(nameof(ScannerTestData.InvalidBufferSizeTestData), MemberType = typeof(ScannerTestData))]
         public void CannotScanWithNegativeOrZeroBufferSize(int bufferSize)
         {
-            using (var reader = new StringReader(string.Empty))
-                Assert.Throws<ArgumentException>(() => _scanner.Scan(reader, bufferSize));
-        }
+            using var reader = new StringReader(string.Empty);
 
-        [Theory, MemberData(nameof(TextToTokensTestData), MemberType = typeof(CreoleScannerTestData))]
-
-        public void ScanText(string text, IEnumerable<object> tokens)
-        {
-            _scanner.Scan(text);
-            Assert.Equal(tokens.Cast<CreoleTokenCode>().ToArray(), _scanner.Result.Select(token => token.Code).ToArray());
+            Assert.Throws<ArgumentException>(() => _scanner.Scan(reader, bufferSize));
         }
 
-        [Theory, MemberData(nameof(TextFromTokensTestData), MemberType = typeof(CreoleScannerTestData))]
-        public void ScannedTextFromTokens(string text, string textFromTokens)
-        {
-            _scanner.Scan(text);
-            Assert.Equal(
-                textFromTokens,
-                _scanner
-                    .Result
-                    .Aggregate(
-                        new StringBuilder(),
-                        (builder, token) => builder.Append(token.Text))
-                    .ToString());
-        }
-
-        [Theory, MemberData(nameof(TextToTokensTestData), MemberType = typeof(CreoleScannerTestData))]
-        public void ScanTextUsingReader(string text, IEnumerable<object> tokens)
-        {
-            using (var stringReader = new StringReader(text))
-            {
-                _scanner.Scan(stringReader);
-                Assert.Equal(tokens.Cast<CreoleTokenCode>().ToArray(), _scanner.Result.Select(token => token.Code).ToArray());
-            }
-        }
-
-        [Theory, MemberData(nameof(TextFromTokensTestData), MemberType = typeof(CreoleScannerTestData))]
-        public void ScannedTextFromTokensUsingReader(string text, string textFromTokens)
-        {
-            using (var stringReader = new StringReader(text))
-            {
-                _scanner.Scan(stringReader);
-                Assert.Equal(
-                    textFromTokens,
-                    _scanner
-                        .Result
-                        .Aggregate(
-                            new StringBuilder(),
-                            (builder, token) => builder.Append(token.Text))
-                        .ToString());
-            }
-        }
-
-        [Theory, MemberData(nameof(TextToTokensTestData), MemberType = typeof(CreoleScannerTestData))]
+        [Theory, MemberData(nameof(CreoleScannerTestData.TextToTokensTestData), MemberType = typeof(CreoleScannerTestData))]
         public void ScanTextUsingReaderWithBuffer(string text, IEnumerable<object> tokens)
         {
-            using (var stringReader = new StringReader(text))
-            {
-                _scanner.Scan(stringReader, 10);
-                Assert.Equal(tokens.Cast<CreoleTokenCode>().ToArray(), _scanner.Result.Select(token => token.Code).ToArray());
-            }
+            using var stringReader = new StringReader(text);
+
+            _scanner.Scan(stringReader, 10);
+            Assert.Equal(tokens.Cast<CreoleTokenCode>().ToArray(), _scanner.Result.Select(token => token.Code).ToArray());
         }
 
-        [Theory, MemberData(nameof(TextFromTokensTestData), MemberType = typeof(CreoleScannerTestData))]
+        [Theory, MemberData(nameof(CreoleScannerTestData.TextFromTokensTestData), MemberType = typeof(CreoleScannerTestData))]
         public void ScannedTextFromTokensUsingReaderWithBuffer(string text, string textFromTokens)
         {
-            using (var stringReader = new StringReader(text))
-            {
-                _scanner.Scan(stringReader, 10);
-                Assert.Equal(
-                    textFromTokens,
-                    _scanner
-                        .Result
-                        .Aggregate(
-                            new StringBuilder(),
-                            (builder, token) => builder.Append(token.Text))
-                        .ToString());
-            }
+            using var stringReader = new StringReader(text);
+
+            _scanner.Scan(stringReader, 10);
+            Assert.Equal(textFromTokens, _scanner.Result.Aggregate(new StringBuilder(), (builder, token) => builder.Append(token.Text)).ToString());
         }
     }
 }
diff --git a/Mup/Scanner/CharacterScanner.cs b/Mup/Scanner/CharacterScanner.cs
@@ -7,20 +7,6 @@ internal abstract class CharacterScanner
     {
         private const int _defaultBufferSize = 2048;
 
-        internal void Scan(string text)
-        {
-            if (text == null)
-                throw new ArgumentNullException(nameof(text));
-
-            _Reset();
-            foreach (var character in text)
-                _Process(character);
-            ScanCompleted();
-        }
-
-        internal void Scan(TextReader reader)
-            => Scan(reader, DefaultBuffer);
-
         internal void Scan(TextReader reader, int bufferSize)
         {
             if (reader == null)