Move BasicStringLexer out of fly::detail namespace

Author: trflynn89

build/win/libfly/libfly.vcxproj

@@ -223,11 +223,11 @@
     <ClInclude Include="..\..\..\fly\types\string\detail\string_converter.hpp" />
     <ClInclude Include="..\..\..\fly\types\string\detail\string_formatter.hpp" />
     <ClInclude Include="..\..\..\fly\types\string\detail\string_formatter_types.hpp" />
-    <ClInclude Include="..\..\..\fly\types\string\detail\string_lexer.hpp" />
     <ClInclude Include="..\..\..\fly\types\string\detail\string_stream_util.hpp" />
     <ClInclude Include="..\..\..\fly\types\string\detail\string_traits.hpp" />
     <ClInclude Include="..\..\..\fly\types\string\detail\string_unicode.hpp" />
     <ClInclude Include="..\..\..\fly\types\string\string.hpp" />
+    <ClInclude Include="..\..\..\fly\types\string\string_lexer.hpp" />
     <ClInclude Include="..\..\..\fly\types\string\string_literal.hpp" />
   </ItemGroup>
   <ItemGroup>

build/win/libfly/libfly.vcxproj.filters

@@ -265,6 +265,9 @@
     <ClInclude Include="..\..\..\fly\types\string\string.hpp">
       <Filter>types\string</Filter>
     </ClInclude>
+    <ClInclude Include="..\..\..\fly\types\string\string_lexer.hpp">
+      <Filter>types\string</Filter>
+    </ClInclude>
     <ClInclude Include="..\..\..\fly\types\string\string_literal.hpp">
       <Filter>types\string</Filter>
     </ClInclude>
@@ -280,9 +283,6 @@
     <ClInclude Include="..\..\..\fly\types\string\detail\string_formatter_types.hpp">
       <Filter>types\string\detail</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\fly\types\string\detail\string_lexer.hpp">
-      <Filter>types\string\detail</Filter>
-    </ClInclude>
     <ClInclude Include="..\..\..\fly\types\string\detail\string_stream_util.hpp">
       <Filter>types\string\detail</Filter>
     </ClInclude>

fly/types/string/detail/string_formatter_types.hpp

@@ -2,8 +2,8 @@
 
 #include "fly/fly.hpp"
 #include "fly/types/string/detail/string_classifier.hpp"
-#include "fly/types/string/detail/string_lexer.hpp"
 #include "fly/types/string/detail/string_traits.hpp"
+#include "fly/types/string/string_lexer.hpp"
 #include "fly/types/string/string_literal.hpp"
 
 #include <array>
@@ -385,7 +385,7 @@ class BasicFormatString
 {
     using traits = BasicStringTraits<StringType>;
     using classifier = BasicStringClassifier<StringType>;
-    using lexer = BasicStringLexer<StringType>;
+    using lexer = fly::BasicStringLexer<StringType>;
     using char_type = typename traits::char_type;
     using view_type = typename traits::view_type;
 

fly/types/string/detail/string_lexer.hpp fly/types/string/string_lexer.hpp

@@ -7,7 +7,7 @@
 #include <cstdint>
 #include <optional>
 
-namespace fly::detail {
+namespace fly {
 
 /**
  * Helper class to perform lexical analysis of a C-string literal. All methods are constant
@@ -19,15 +19,14 @@ namespace fly::detail {
 template <typename StringType>
 class BasicStringLexer
 {
-    using traits = BasicStringTraits<StringType>;
-    using classifier = BasicStringClassifier<StringType>;
+    using traits = detail::BasicStringTraits<StringType>;
+    using classifier = detail::BasicStringClassifier<StringType>;
     using char_type = typename traits::char_type;
     using view_type = typename traits::view_type;
 
 public:
     /**
-     * Constructor. Stores a view into a C-string literal. This class is not interested in the null
-     * terminator, thus if provided, it is excluded from the view.
+     * Constructor. Stores a view into a C-string literal.
      *
      * @tparam N The size of the C-string literal.
      *
@@ -36,6 +35,13 @@ class BasicStringLexer
     template <std::size_t N>
     constexpr explicit BasicStringLexer(const char_type (&literals)[N]) noexcept;
 
+    /**
+     * Constructor. Stores an existing view into a string.
+     *
+     * @param view The existing view into the string.
+     */
+    constexpr explicit BasicStringLexer(view_type view) noexcept;
+
     /**
      * @return A string view into the C-string literal.
      */
@@ -116,6 +122,14 @@ constexpr BasicStringLexer<StringType>::BasicStringLexer(const char_type (&liter
 {
 }
 
+//==================================================================================================
+template <typename StringType>
+constexpr BasicStringLexer<StringType>::BasicStringLexer(view_type view) noexcept :
+    m_size(view.size()),
+    m_view(std::move(view))
+{
+}
+
 //==================================================================================================
 template <typename StringType>
 constexpr auto BasicStringLexer<StringType>::view() const -> view_type
@@ -199,4 +213,4 @@ constexpr std::optional<std::size_t> BasicStringLexer<StringType>::consume_numbe
     return parsed_number ? std::optional<std::size_t>(number) : std::nullopt;
 }
 
-} // namespace fly::detail
+} // namespace fly

test/types/string/string_lexer.cpp

@@ -1,4 +1,4 @@
-#include "fly/types/string/detail/string_lexer.hpp"
+#include "fly/types/string/string_lexer.hpp"
 
 #include "fly/types/string/string_literal.hpp"
 
@@ -18,7 +18,7 @@ CATCH_TEMPLATE_TEST_CASE(
 {
     using StringType = TestType;
     using char_type = typename StringType::value_type;
-    using Lexer = fly::detail::BasicStringLexer<StringType>;
+    using Lexer = fly::BasicStringLexer<StringType>;
 
     CATCH_SECTION("Cannot consume from empty lexer")
     {
@@ -56,6 +56,19 @@ CATCH_TEMPLATE_TEST_CASE(
         CATCH_CHECK_FALSE(lexer.consume());
     }
 
+    CATCH_SECTION("Lexer accepts an already-existing string view")
+    {
+        const char_type *str = FLY_STR(char_type, "ab");
+        auto view = std::basic_string_view<char_type>(str);
+
+        Lexer lexer(view);
+        CATCH_CHECK(lexer.view() == FLY_ARR(char_type, "ab"));
+
+        CATCH_CHECK(lexer.consume_if(FLY_CHR(char_type, 'a')));
+        CATCH_CHECK(lexer.consume_if(FLY_CHR(char_type, 'b')));
+        CATCH_CHECK_FALSE(lexer.consume());
+    }
+
     CATCH_SECTION("Peeking does not advance internal pointer")
     {
         Lexer lexer(FLY_ARR(char_type, "ab"));