Set up some extension methods for ITextReader.

Author: MeltyPlayer

…/text/reader/TextReaderExtensionTests.cs …/reader/TextReaderExtensionTests_Read.csSchema Tests/text/reader/TextReaderExtensionTests.cs renamed to Schema Tests/text/reader/TextReaderExtensionTests_Read.cs Schema Tests/text/reader/TextReaderExtensionTests.cs renamed to Schema Tests/text/reader/TextReaderExtensionTests_Read.cs

@@ -3,7 +3,21 @@
 
 namespace schema.text.reader;
 
-internal class TextReaderExtensionTests {
+internal partial class TextReaderExtensionTests {
+  [Test]
+  [TestCase("", ExpectedResult = "")]
+  [TestCase("    ", ExpectedResult = "")]
+  [TestCase("  foo  ", ExpectedResult = "foo")]
+  [TestCase(" \n foo \t  ", ExpectedResult = "foo")]
+  [TestCase("foo bar", ExpectedResult = "foo")]
+  [TestCase("`foo bar`", ExpectedResult = "`foo bar`")]
+  [TestCase("'foo bar'", ExpectedResult = "'foo bar'")]
+  [TestCase("\"foo bar\"", ExpectedResult = "\"foo bar\"")]
+  public string TestReadWord(string text) {
+    using var tr = TextSchemaTestUtil.CreateTextReader(text);
+    return tr.ReadWord();
+  }
+
   [Test]
   // Empty cases
   [TestCase("", ExpectedResult = new string[] { })]

Schema Tests/text/reader/TextReaderExtensionTests_Skip.cs

@@ -0,0 +1,8 @@
+using NUnit.Framework;
+
+
+namespace schema.text.reader;
+
+internal partial class TextReaderExtensionTests {
+  // TODO
+}

…/src/text/reader/TextReaderExtensions.cs …text/reader/TextReaderExtensions_Read.csSchema/src/text/reader/TextReaderExtensions.cs renamed to Schema/src/text/reader/TextReaderExtensions_Read.cs Schema/src/text/reader/TextReaderExtensions.cs renamed to Schema/src/text/reader/TextReaderExtensions_Read.cs

@@ -5,33 +5,13 @@
 namespace schema.text.reader;
 
 public static partial class TextReaderExtensions {
-  public static void SkipWhitespace(this ITextReader tr)
-    => tr.SkipManyIfPresent(TextReaderConstants.WHITESPACE_CHARS);
-
   public static string ReadWord(this ITextReader tr) {
     tr.SkipWhitespace();
     return tr.ReadUpToStartOfTerminator([
         " ", "\t", "\n", "\r\n", ",", "{", "[", "}", "]", ":"
     ]);
   }
 
-  public static bool TryToSkipComment(
-      this ITextReader tr,
-      string lineCommentPrefix = "//") {
-    tr.SkipWhitespace();
-    if (tr.Matches(lineCommentPrefix)) {
-      tr.ReadLine();
-      return true;
-    }
-
-    if (tr.Matches("/*")) {
-      tr.ReadUpToAndPastTerminator("*/");
-      return true;
-    }
-
-    return false;
-  }
-
   public static string[] ReadArguments(
       this ITextReader tr,
       ReadOnlySpan<char> separators,

Schema/src/text/reader/TextReaderExtensions_Skip.cs

@@ -0,0 +1,39 @@
+namespace schema.text.reader;
+
+public static partial class TextReaderExtensions {
+  public static void SkipWhitespace(this ITextReader tr)
+    => tr.SkipManyIfPresent(TextReaderConstants.WHITESPACE_CHARS);
+
+  public static void SkipToEndOfLine(this ITextReader tr) {
+    if (tr.Eof) {
+      return;
+    }
+
+    char c;
+    do {
+      c = tr.ReadChar();
+    } while (c is not ('\n' or '\r'));
+
+    if (c == '\r') {
+      tr.SkipOnceIfPresent('\n');
+    }
+  }
+
+  public static void SkipComments(
+      this ITextReader tr,
+      string lineCommentPrefix = "//") {
+    TryAgain:
+
+    tr.SkipWhitespace();
+
+    if (tr.Matches(lineCommentPrefix)) {
+      tr.SkipToEndOfLine();
+      goto TryAgain;
+    }
+
+    if (tr.Matches("/*")) {
+      tr.ReadUpToAndPastTerminator("*/");
+      goto TryAgain;
+    }
+  }
+}