feedc0de/fmt
1
0
Fork 0
forked from fmtlib/fmt
Code Pull Requests Activity

Add parse_context::error_handler()

Browse Source
This commit is contained in:
Victor Zverovich
2017-11-18 06:58:14 -08:00
parent 734e722da4
commit e3eb5ea074
1 changed files with 8 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
include/fmt/format.h
View File

@ -1741,9 +1741,9 @@ constexpr void handle_integral_type_spec(char c, Handler &&handler) {
} }
template <typename ErrorHandler> template <typename ErrorHandler>
class int_type_checker { class int_type_checker : private ErrorHandler {
public: public:
constexpr int_type_checker(ErrorHandler &eh) : eh_(eh) {} constexpr int_type_checker(ErrorHandler eh) : ErrorHandler(eh) {}
constexpr void on_dec() {} constexpr void on_dec() {}
constexpr void on_hex() {} constexpr void on_hex() {}
@ -1752,11 +1752,8 @@ class int_type_checker {
constexpr void on_num() {} constexpr void on_num() {}
constexpr void on_error() { constexpr void on_error() {
eh_.on_error("invalid type specifier"); ErrorHandler::on_error("invalid type specifier");
} }
private:
ErrorHandler &eh_;
}; };
template <typename Context> template <typename Context>
@ -2003,6 +2000,8 @@ class parse_context : public ErrorHandler {
} }
void check_arg_id(basic_string_view<Char>) {} void check_arg_id(basic_string_view<Char>) {}
constexpr ErrorHandler error_handler() const { return *this; }
}; };
template <typename Char, typename Context> template <typename Char, typename Context>
@ -3770,8 +3769,10 @@ struct formatter<
handler(handler_type(specs_, ctx), internal::get_type<T>()); handler(handler_type(specs_, ctx), internal::get_type<T>());
it = parse_format_specs(it, handler); it = parse_format_specs(it, handler);
if (std::is_integral<T>::value) { if (std::is_integral<T>::value) {
using type_checker =
internal::int_type_checker<decltype(ctx.error_handler())>;
handle_integral_type_spec( handle_integral_type_spec(
specs_.type(), internal::int_type_checker<ParseContext>(ctx)); specs_.type(), type_checker(ctx.error_handler()));
} }
return pointer_from(it); return pointer_from(it);
} }