Split StringReader into its own header

Author: petrhosek

libc/src/stdio/CMakeLists.txt

@@ -117,8 +117,8 @@ add_entrypoint_object(
     sscanf.h
   DEPENDS
     libc.src.__support.arg_list
-    libc.src.stdio.scanf_core.reader
     libc.src.stdio.scanf_core.scanf_main
+    libc.src.stdio.scanf_core.string_reader
 )
 
 add_entrypoint_object(
@@ -129,8 +129,8 @@ add_entrypoint_object(
     vsscanf.h
   DEPENDS
     libc.src.__support.arg_list
-    libc.src.stdio.scanf_core.reader
     libc.src.stdio.scanf_core.scanf_main
+    libc.src.stdio.scanf_core.string_reader
 )
 
 add_entrypoint_object(

libc/src/stdio/scanf_core/CMakeLists.txt

@@ -81,8 +81,15 @@ add_header_library(
     reader.h
   DEPENDS
     libc.src.__support.macros.attributes
-    ${file_deps}
-  ${use_system_file}
+)
+
+add_header_library(
+  string_reader
+  HDRS
+    string_reader.h
+  DEPENDS
+    .reader
+    libc.src.__support.macros.attributes
 )
 
 add_header_library(

libc/src/stdio/scanf_core/reader.h

@@ -39,31 +39,6 @@ template <typename Derived> class Reader {
   LIBC_INLINE size_t chars_read() { return cur_chars_read; }
 };
 
-class StringReader : public Reader<StringReader> {
-  const char *buffer;
-  [[maybe_unused]] size_t buff_len;
-  size_t buff_cur = 0;
-
-public:
-  LIBC_INLINE StringReader(const char *buffer, size_t buff_len)
-      : buffer(buffer), buff_len(buff_len) {}
-
-  LIBC_INLINE char getc() {
-    char output = buffer[buff_cur];
-    ++buff_cur;
-    return output;
-  }
-  LIBC_INLINE void ungetc(int) {
-    if (buff_cur > 0) {
-      // While technically c should be written back to the buffer, in scanf we
-      // always write the character that was already there. Additionally, the
-      // buffer is most likely to contain a string that isn't part of a file,
-      // which may not be writable.
-      --buff_cur;
-    }
-  }
-};
-
 } // namespace scanf_core
 } // namespace LIBC_NAMESPACE_DECL
 

libc/src/stdio/scanf_core/string_reader.h

@@ -0,0 +1,49 @@
+//===-- Reader definition for scanf -----------------------------*- C++ -*-===//
+//
+// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
+// See https://llvm.org/LICENSE.txt for license information.
+// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
+//
+//===----------------------------------------------------------------------===//
+
+#ifndef LLVM_LIBC_SRC_STDIO_SCANF_CORE_STRING_READER_H
+#define LLVM_LIBC_SRC_STDIO_SCANF_CORE_STRING_READER_H
+
+#include "src/__support/macros/attributes.h" // For LIBC_INLINE
+#include "src/__support/macros/config.h"
+#include "src/stdio/scanf_core/reader.h"
+
+#include <stddef.h>
+
+namespace LIBC_NAMESPACE_DECL {
+namespace scanf_core {
+
+class StringReader : public Reader<StringReader> {
+  const char *buffer;
+  [[maybe_unused]] size_t buff_len;
+  size_t buff_cur = 0;
+
+public:
+  LIBC_INLINE StringReader(const char *buffer, size_t buff_len)
+      : buffer(buffer), buff_len(buff_len) {}
+
+  LIBC_INLINE char getc() {
+    char output = buffer[buff_cur];
+    ++buff_cur;
+    return output;
+  }
+  LIBC_INLINE void ungetc(int) {
+    if (buff_cur > 0) {
+      // While technically c should be written back to the buffer, in scanf we
+      // always write the character that was already there. Additionally, the
+      // buffer is most likely to contain a string that isn't part of a file,
+      // which may not be writable.
+      --buff_cur;
+    }
+  }
+};
+
+} // namespace scanf_core
+} // namespace LIBC_NAMESPACE_DECL
+
+#endif // LLVM_LIBC_SRC_STDIO_SCANF_CORE_STRING_READER_H

libc/src/stdio/sscanf.cpp

@@ -11,8 +11,8 @@
 #include "src/__support/CPP/limits.h"
 #include "src/__support/arg_list.h"
 #include "src/__support/macros/config.h"
-#include "src/stdio/scanf_core/reader.h"
 #include "src/stdio/scanf_core/scanf_main.h"
+#include "src/stdio/scanf_core/string_reader.h"
 
 #include "hdr/stdio_macros.h"
 #include "hdr/types/FILE.h"

libc/src/stdio/vsscanf.cpp

@@ -11,8 +11,8 @@
 #include "hdr/stdio_macros.h"
 #include "src/__support/CPP/limits.h"
 #include "src/__support/arg_list.h"
-#include "src/stdio/scanf_core/reader.h"
 #include "src/stdio/scanf_core/scanf_main.h"
+#include "src/stdio/scanf_core/string_reader.h"
 
 #include <stdarg.h>
 

libc/test/src/stdio/scanf_core/CMakeLists.txt

@@ -32,7 +32,7 @@ add_libc_unittest(
   SRCS
     reader_test.cpp
   DEPENDS
-    libc.src.stdio.scanf_core.reader
+    libc.src.stdio.scanf_core.string_reader
     libc.src.__support.CPP.string_view
   COMPILE_OPTIONS
     ${use_system_file}
@@ -45,8 +45,8 @@ add_libc_unittest(
   SRCS
     converter_test.cpp
   DEPENDS
-    libc.src.stdio.scanf_core.reader
     libc.src.stdio.scanf_core.converter
+    libc.src.stdio.scanf_core.string_reader
     libc.src.__support.CPP.string_view
   COMPILE_OPTIONS
     ${use_system_file}

libc/test/src/stdio/scanf_core/converter_test.cpp

@@ -9,7 +9,7 @@
 #include "src/__support/CPP/string_view.h"
 #include "src/stdio/scanf_core/converter.h"
 #include "src/stdio/scanf_core/core_structs.h"
-#include "src/stdio/scanf_core/reader.h"
+#include "src/stdio/scanf_core/string_reader.h"
 
 #include "test/UnitTest/Test.h"
 

libc/test/src/stdio/scanf_core/reader_test.cpp

@@ -7,7 +7,7 @@
 //===----------------------------------------------------------------------===//
 
 #include "src/__support/CPP/string_view.h"
-#include "src/stdio/scanf_core/reader.h"
+#include "src/stdio/scanf_core/string_reader.h"
 
 #include "test/UnitTest/Test.h"