Implement Scanner::ScanUntil() which doesn't allow escaping.

Change: 133899299

1 files changed, 8 insertions, 2 deletions

diff --git a/tensorflow/core/lib/strings/scanner.h b/tensorflow/core/lib/strings/scanner.h
index 32c0d6d4a5..8bcf05104c 100644
--- a/tensorflow/core/lib/strings/scanner.h
+++ b/tensorflow/core/lib/strings/scanner.h
@@ -128,10 +128,16 @@ class Scanner {
   Scanner& AnySpace() { return Any(SPACE); }
 
   // This scans input until <end_ch> is reached. <end_ch> is NOT consumed.
+  Scanner& ScanUntil(char end_ch) {
+    ScanUntilImpl(end_ch, false);
+    return *this;
+  }
+
+  // This scans input until <end_ch> is reached. <end_ch> is NOT consumed.
   // Backslash escape sequences are skipped.
   // Used for implementing quoted string scanning.
   Scanner& ScanEscapedUntil(char end_ch) {
-    ScanEscapedUntilImpl(end_ch);
+    ScanUntilImpl(end_ch, true);
     return *this;
   }
 
@@ -154,7 +160,7 @@ class Scanner {
                  StringPiece* capture = nullptr);
 
  private:
-  void ScanEscapedUntilImpl(char end_ch);
+  void ScanUntilImpl(char end_ch, bool escaped);
 
   Scanner& Error() {
     error_ = true;