@@ -608,8 +608,8 @@ inline constexpr directive_modifier<directives::none, directives::none, directiv
608
608
inline constexpr directive_modifier<directives::postskip, directives::none, directives::eps> skip_after{};
609
609
inline constexpr directive_modifier<directives::preskip, directives::postskip, directives::eps> skip_before{};
610
610
template <unicode::ctype Property> struct ctype_combinator { void operator ()(encoder& d) const { d.match_any (Property); } };
611
- template <typename Op> struct test_conditional_combinator { template <class C > [[nodiscard]] constexpr auto operator ()(C&& condition) const ; };
612
- template <bool Value> struct modify_conditional_combinator { template <class C > [[nodiscard]] constexpr auto operator ()(C&& condition) const ; };
611
+ template <typename Op> struct test_condition_combinator { template <class C > [[nodiscard]] constexpr auto operator ()(C&& condition) const ; };
612
+ template <bool Value> struct modify_condition_combinator { template <class C > [[nodiscard]] constexpr auto operator ()(C&& condition) const ; };
613
613
614
614
namespace language {
615
615
@@ -633,8 +633,8 @@ inline constexpr ctype_combinator<ctype::alpha> alpha{}; inline constexpr ctype_
633
633
inline constexpr ctype_combinator<ctype::upper> upper{}; inline constexpr ctype_combinator<ctype::digit> digit{}; inline constexpr ctype_combinator<ctype::xdigit> xdigit{};
634
634
inline constexpr ctype_combinator<ctype::space> space{}; inline constexpr ctype_combinator<ctype::blank> blank{}; inline constexpr ctype_combinator<ctype::punct> punct{};
635
635
inline constexpr ctype_combinator<ctype::graph> graph{}; inline constexpr ctype_combinator<ctype::print> print{};
636
- inline constexpr test_conditional_combinator <detail::identity> when{}; inline constexpr test_conditional_combinator <std::logical_not<>> unless{};
637
- inline constexpr modify_conditional_combinator <true > set{}; inline constexpr modify_conditional_combinator <false > unset{};
636
+ inline constexpr test_condition_combinator <detail::identity> when{}; inline constexpr test_condition_combinator <std::logical_not<>> unless{};
637
+ inline constexpr modify_condition_combinator <true > set{}; inline constexpr modify_condition_combinator <false > unset{};
638
638
639
639
inline constexpr struct
640
640
{
@@ -1392,7 +1392,7 @@ inline std::string_view environment::match() const { return parser().match(); }
1392
1392
inline syntax_position const & environment::position_at (std::size_t index) { return parser ().position_at (index); }
1393
1393
1394
1394
template <class Op > template <class C >
1395
- [[nodiscard]] constexpr auto test_conditional_combinator <Op>::operator ()(C&& condition) const
1395
+ [[nodiscard]] constexpr auto test_condition_combinator <Op>::operator ()(C&& condition) const
1396
1396
{
1397
1397
if constexpr (std::is_invocable_r_v<bool , C, parser&>)
1398
1398
return [c = std::decay_t <C>{std::forward<C>(condition)}](parser& p) -> bool { return Op{}(c (p)); };
@@ -1407,7 +1407,7 @@ template <class Op> template <class C>
1407
1407
}
1408
1408
1409
1409
template <bool Value> template <class C >
1410
- [[nodiscard]] constexpr auto modify_conditional_combinator <Value>::operator ()(C&& condition) const
1410
+ [[nodiscard]] constexpr auto modify_condition_combinator <Value>::operator ()(C&& condition) const
1411
1411
{
1412
1412
if constexpr (std::is_same_v<std::string_view, std::decay_t <C>> || std::is_same_v<char const *, std::decay_t <C>>)
1413
1413
return [c = std::string_view{std::forward<C>(condition)}](parser& p) -> bool { p.environment ().modify_condition <Value>(c); return true ; };
0 commit comments