boost/spirit
2
0
Fork 0
mirror of https://github.com/boostorg/spirit.git synced 2026-01-19 04:42:11 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #841 from joaquintides/joaquintidesfix/lexertl-iterator-concepts-compliance

Browse Source 
Fix concept compliance for `lexertl` iterator
This commit is contained in:
Joel de Guzman
2025-11-30 08:56:13 +08:00
committed by GitHub
parent 5ca46986f1 04b443b72c
commit 9bcd344fc1
2 changed files with 24 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
include/boost/spirit/home/lex/lexer/lexertl/iterator.hpp
View File

@@ -1,4 +1,5 @@
// Copyright (c) 2001-2011 Hartmut Kaiser
// Copyright (c) 2025 Joaquin M Lopez Munoz
//
// Distributed under the Boost Software License, Version 1.0. (See accompanying
// file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
@@ -115,6 +116,19 @@ namespace boost { namespace spirit { namespace lex { namespace lexertl
? unique_functor_type::map_state(*this, statename)
: 0;
}
iterator& operator++()
{
this->base_type::operator++();
return *this;
}
iterator operator++(int)
{
iterator tmp(*this);
this->base_type::operator++();
return tmp;
}
};
}}

11
test/support/iterator_concepts.cpp
View File

@@ -6,12 +6,14 @@
// Compliance with Boost.ConceptCheck/C++20 iterator concepts
#include <boost/config.hpp>
#include <boost/mpl/bool.hpp>
#include <boost/mpl/vector.hpp>
#include <boost/spirit/home/classic/iterator/file_iterator.hpp>
#include <boost/spirit/home/classic/iterator/fixed_size_queue.hpp>
#include <boost/spirit/home/classic/iterator/multi_pass.hpp>
#include <boost/spirit/home/classic/iterator/position_iterator.hpp>
#include <boost/spirit/home/karma/stream/ostream_iterator.hpp>
#include <boost/spirit/home/lex/lexer/lexertl/iterator.hpp>
#include <boost/spirit/home/lex/lexer_lexertl.hpp>
#include <boost/spirit/home/support/iterators/istream_iterator.hpp>
#include <boost/spirit/home/support/iterators/line_pos_iterator.hpp>
#include <boost/spirit/home/support/iterators/look_ahead.hpp>
@@ -19,6 +21,7 @@
#include <boost/spirit/home/support/iterators/ostream_iterator.hpp>
#include <istream>
#include <ostream>
#include <string>
template<typename F> struct unparens;
template<typename T> struct unparens<void(T)> { typedef T type; };
@@ -64,6 +67,12 @@ STATIC_ASSERT_FORWARD_ITERATOR((
STATIC_ASSERT_OUTPUT_ITERATOR(
(boost::spirit::karma::ostream_iterator<char, char>),
char);
STATIC_ASSERT_FORWARD_ITERATOR((
boost::spirit::lex::lexertl::lexer<
boost::spirit::lex::lexertl::token<
std::string::iterator,
boost::mpl::vector<int>,
boost::mpl::false_>>::iterator_type));
STATIC_ASSERT_FORWARD_ITERATOR((
boost::spirit::istream_iterator));
STATIC_ASSERT_FORWARD_ITERATOR((