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

Generalize with_parser_mods(), so that some functions can be recursive, and

Browse Source 
others can be non-recursive.

See #160.
This commit is contained in:
Zach Laine
2024-12-14 15:28:53 -06:00
parent 2f7e5964a6
commit fcd257abca
1 changed files with 104 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

138
include/boost/parser/parser.hpp
View File

@@ -2965,14 +2965,19 @@ namespace boost { namespace parser {
template<typename F, typename... Parsers>
auto modify_parsers(F f, tuple<Parsers...> parsers)
{
return modify_parsers_impl(
f,
parsers,
std::make_integer_sequence<int, sizeof...(Parsers)>{});
if constexpr (f.recursive) {
return modify_parsers_impl(
f,
parsers,
std::make_integer_sequence<int, sizeof...(Parsers)>{});
} else {
return parsers;
}
}
inline constexpr struct omit_attr_t
{
static constexpr std::true_type recursive{};
template<bool OmitAttr>
constexpr auto operator()(parser_modifiers<OmitAttr> const &) const
{
@@ -3293,7 +3298,11 @@ namespace boost { namespace parser {
template<typename F>
constexpr auto with_parser_mods(F f) const
{
if constexpr (std::is_same_v<DelimiterParser, detail::nope>) {
if constexpr (!f.recursive) {
return parser::repeat_parser(
parser_, detail::nope{}, min_, max_, f(mods_));
} else if constexpr (std::
is_same_v<DelimiterParser, detail::nope>) {
return parser::repeat_parser(
parser_.with_parser_mods(f),
detail::nope{},
@@ -3333,8 +3342,12 @@ namespace boost { namespace parser {
template<typename F>
constexpr auto with_parser_mods(F f) const
{
return parser::zero_plus_parser(
this->parser_.with_parser_mods(f), f(this->mods_));
if constexpr (f.recursive) {
return parser::zero_plus_parser(
this->parser_.with_parser_mods(f), f(this->mods_));
} else {
return parser::zero_plus_parser(this->parser_, f(this->mods_));
}
}
};
@@ -3353,8 +3366,12 @@ namespace boost { namespace parser {
template<typename F>
constexpr auto with_parser_mods(F f) const
{
return parser::one_plus_parser(
this->parser_.with_parser_mods(f), f(this->mods_));
if constexpr (f.recursive) {
return parser::one_plus_parser(
this->parser_.with_parser_mods(f), f(this->mods_));
} else {
return parser::one_plus_parser(this->parser_, f(this->mods_));
}
}
};
@@ -3377,10 +3394,15 @@ namespace boost { namespace parser {
template<typename F>
constexpr auto with_parser_mods(F f) const
{
return parser::delimited_seq_parser(
this->parser_.with_parser_mods(f),
this->delimiter_parser_.with_parser_mods(f),
f(this->mods_));
if constexpr (f.recursive) {
return parser::delimited_seq_parser(
this->parser_.with_parser_mods(f),
this->delimiter_parser_.with_parser_mods(f),
f(this->mods_));
} else {
return parser::delimited_seq_parser(
this->parser_, this->delimiter_parser_, f(this->mods_));
}
}
};
@@ -3458,11 +3480,18 @@ namespace boost { namespace parser {
}
//]
//[ opt_parser_with_parser_mods
template<typename F>
constexpr auto with_parser_mods(F f) const
{
return parser::opt_parser(parser_.with_parser_mods(f), f(mods_));
if constexpr (f.recursive) {
return parser::opt_parser(
parser_.with_parser_mods(f), f(mods_));
} else {
return parser::opt_parser(parser_, f(mods_));
}
}
//]
//[ opt_parser_end
Parser parser_;
@@ -4895,8 +4924,12 @@ namespace boost { namespace parser {
template<typename F>
constexpr auto with_parser_mods(F f) const
{
return parser::action_parser(
parser_.with_parser_mods(f), action_, f(mods_));
if constexpr (f.recursive) {
return parser::action_parser(
parser_.with_parser_mods(f), action_, f(mods_));
} else {
return parser::action_parser(parser_, action_, f(mods_));
}
}
Parser parser_;
@@ -4970,8 +5003,12 @@ namespace boost { namespace parser {
template<typename F2>
constexpr auto with_parser_mods(F2 f) const
{
return parser::transform_parser(
parser_.with_parser_mods(f), f_, f(mods_));
if constexpr (f.recursive) {
return parser::transform_parser(
parser_.with_parser_mods(f), f_, f(mods_));
} else {
return parser::transform_parser(parser_, f_, f(mods_));
}
}
Parser parser_;
@@ -5047,7 +5084,12 @@ namespace boost { namespace parser {
template<typename F>
constexpr auto with_parser_mods(F f) const
{
return parser::raw_parser(parser_.with_parser_mods(f), f(mods_));
if constexpr (f.recursive) {
return parser::raw_parser(
parser_.with_parser_mods(f), f(mods_));
} else {
return parser::raw_parser(parser_, f(mods_));
}
}
Parser parser_;
@@ -5147,8 +5189,12 @@ namespace boost { namespace parser {
template<typename F>
constexpr auto with_parser_mods(F f) const
{
return parser::string_view_parser(
parser_.with_parser_mods(f), f(mods_));
if constexpr (f.recursive) {
return parser::string_view_parser(
parser_.with_parser_mods(f), f(mods_));
} else {
return parser::string_view_parser(parser_, f(mods_));
}
}
Parser parser_;
@@ -5216,7 +5262,12 @@ namespace boost { namespace parser {
template<typename F>
constexpr auto with_parser_mods(F f) const
{
return parser::lexeme_parser(parser_.with_parser_mods(f), f(mods_));
if constexpr (f.recursive) {
return parser::lexeme_parser(
parser_.with_parser_mods(f), f(mods_));
} else {
return parser::lexeme_parser(parser_, f(mods_));
}
}
Parser parser_;
@@ -5282,8 +5333,12 @@ namespace boost { namespace parser {
template<typename F>
constexpr auto with_parser_mods(F f) const
{
return parser::no_case_parser(
parser_.with_parser_mods(f), f(mods_));
if constexpr (f.recursive) {
return parser::no_case_parser(
parser_.with_parser_mods(f), f(mods_));
} else {
return parser::no_case_parser(parser_, f(mods_));
}
}
Parser parser_;
@@ -5362,10 +5417,14 @@ namespace boost { namespace parser {
template<typename F>
constexpr auto with_parser_mods(F f) const
{
return parser::skip_parser(
parser_.with_parser_mods(f),
skip_parser_.with_parser_mods(f),
f(mods_));
if constexpr (f.recursive) {
return parser::skip_parser(
parser_.with_parser_mods(f),
skip_parser_.with_parser_mods(f),
f(mods_));
} else {
return parser::skip_parser(parser_, skip_parser_, f(mods_));
}
}
Parser parser_;
@@ -5435,10 +5494,16 @@ namespace boost { namespace parser {
constexpr auto with_parser_mods(F f) const
{
auto mods = f(mods_);
return expect_parser<
decltype(parser_.with_parser_mods(f)),
FailOnMatch,
decltype(mods)>{parser_.with_parser_mods(f), std::move(mods)};
if constexpr (f.recursive) {
return expect_parser<
decltype(parser_.with_parser_mods(f)),
FailOnMatch,
decltype(mods)>{
parser_.with_parser_mods(f), std::move(mods)};
} else {
return expect_parser<Parser, FailOnMatch, decltype(mods)>{
parser_, std::move(mods)};
}
}
Parser parser_;
@@ -8876,8 +8941,13 @@ namespace boost { namespace parser {
template<typename F>
constexpr auto with_parser_mods(F f) const
{
return parser::switch_parser(
switch_value_, or_parser_with_parser_mods(f), f(mods_));
if constexpr (f.recursive) {
return parser::switch_parser(
switch_value_, or_parser_.with_parser_mods(f), f(mods_));
} else {
return parser::switch_parser(
switch_value_, or_parser_, f(mods_));
}
}
SwitchValue switch_value_;