diff --git a/include/boost/parser/detail/printing.hpp b/include/boost/parser/detail/printing.hpp index adf5749f..7d2fd862 100644 --- a/include/boost/parser/detail/printing.hpp +++ b/include/boost/parser/detail/printing.hpp @@ -182,24 +182,24 @@ namespace boost { namespace parser { namespace detail { std::ostream & os, int components = 0); - template + template void parser_name( Context const & context, - char_parser const & parser, + char_parser const & parser, std::ostream & os, int components = 0); - template + template void parser_name( Context const & context, - char_parser const & parser, + char_parser const & parser, std::ostream & os, int components = 0); - template + template void parser_name( Context const & context, - omit_parser> const & parser, + omit_parser> const & parser, std::ostream & os, int components = 0); diff --git a/include/boost/parser/detail/printing_impl.hpp b/include/boost/parser/detail/printing_impl.hpp index 7aa721b4..931d73d8 100644 --- a/include/boost/parser/detail/printing_impl.hpp +++ b/include/boost/parser/detail/printing_impl.hpp @@ -393,10 +393,10 @@ namespace boost { namespace parser { namespace detail { } }; - template + template void parser_name( Context const & context, - char_parser const & parser, + char_parser const & parser, std::ostream & os, int components) { @@ -404,20 +404,20 @@ namespace boost { namespace parser { namespace detail { context, os, parser.expected_); } - template + template void parser_name( Context const & context, - char_parser const & parser, + char_parser const & parser, std::ostream & os, int components) { os << "char_"; } - template + template void parser_name( Context const & context, - omit_parser> const & parser, + omit_parser> const & parser, std::ostream & os, int components) { diff --git a/include/boost/parser/parser.hpp b/include/boost/parser/parser.hpp index a9f74333..0854788d 100644 --- a/include/boost/parser/parser.hpp +++ b/include/boost/parser/parser.hpp @@ -4026,8 +4026,8 @@ namespace boost { namespace parser { std::is_same{}, "If you're seeing this, you tried to chain calls on char_, " "like 'char_('a')('b')'. Quit it!'"); - return parser_interface>{ - char_parser{std::move(x)}}; + return parser_interface>{ + char_parser{std::move(x)}}; } // TODO: Document this conversion to string_view. @@ -4039,7 +4039,7 @@ namespace boost { namespace parser { "like 'char_(\"chars\")(\"chars\")'. Quit it!'"); std::string_view const range(s); using char_range_t = detail::char_range; - using char_parser_t = char_parser; + using char_parser_t = char_parser; return parser_interface( char_parser_t(char_range_t(range.begin(), range.end()))); } @@ -4051,10 +4051,10 @@ namespace boost { namespace parser { std::is_same{}, "If you're seeing this, you tried to chain calls on char_, " "like 'char_('a', 'b')('c', 'd')'. Quit it!'"); - using pair_type = detail::char_pair; - return parser_interface>( - char_parser( - pair_type{std::move(lo), std::move(hi)})); + using char_pair_t = detail::char_pair; + using char_parser_t = char_parser; + return parser_interface( + char_parser_t(char_pair_t{std::move(lo), std::move(hi)})); } template @@ -4070,7 +4070,7 @@ namespace boost { namespace parser { "like 'char_(char-set)(char-set)'. Quit it!'"); auto range = make_range(r.begin(), r.end()); using char_range_t = detail::char_range; - using char_parser_t = char_parser; + using char_parser_t = char_parser; return parser_interface( char_parser_t(char_range_t(range.begin(), range.end()))); }