Fix multiple thinkos in tokens_view.

See #202.
boostorg · Nov 10, 2024 · a55603c · a55603c
1 parent ff22ab1
commit a55603c
Showing 1 changed file with 13 additions and 4 deletions.
diff --git a/include/boost/parser/lexer.hpp b/include/boost/parser/lexer.hpp
@@ -750,10 +750,10 @@ namespace boost { namespace parser {
     template<
         std::ranges::contiguous_range V,
         typename Lexer,
-        typename TokenCache = std::vector<typename Lexer::token_type>>
+        typename TokenCache>
         requires std::ranges::view<V>
     struct tokens_view
-        : public std::ranges::view_interface<tokens_view<V, Lexer>>
+        : public std::ranges::view_interface<tokens_view<V, Lexer, TokenCache>>
     {
     private:
         template<bool>
@@ -934,8 +934,17 @@ namespace boost { namespace parser {
                 return token_offset_ == rhs.token_offset_;
             }
 
-            auto range_begin() const { std::ranges::begin(parent_->base_); }
-            auto range_end() const { std::ranges::end(parent_->base_); }
+            auto range_begin() const
+            {
+                return std::ranges::begin(parent_->base_);
+            }
+            auto range_end() const { return std::ranges::end(parent_->base_); }
+
+            using base_type = detail::stl_interfaces::proxy_iterator_interface<
+                iterator<Const>,
+                std::forward_iterator_tag,
+                token_type>;
+            using base_type::operator++;
         };
 
         template<bool Const>