AuroraMiddleware/fmtlegacy
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Check integral type specs at compile time

Browse Source
This commit is contained in:
Victor Zverovich 2017-11-08 06:43:56 -08:00
parent 92847a0d11
commit 9fda7a36fd
1 changed files with 23 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
include/fmt/format.h
View File

@ -1707,8 +1707,14 @@ typedef basic_format_specs<char> format_specs;
namespace internal { namespace internal {
struct error_handler {
void on_error(const char *message) {
FMT_THROW(format_error(message));
}
};
template <typename Handler> template <typename Handler>
void handle_integral_type_spec(char c, Handler &&handler) { constexpr void handle_integral_type_spec(char c, Handler &&handler) {
switch (c) { switch (c) {
case 0: case 'd': case 0: case 'd':
handler.on_dec(); handler.on_dec();
@ -1730,6 +1736,20 @@ void handle_integral_type_spec(char c, Handler &&handler) {
} }
} }
struct int_type_checker {
constexpr void on_dec() {}
constexpr void on_hex() {}
constexpr void on_bin() {}
constexpr void on_oct() {}
constexpr void on_num() {}
template <typename T = void>
constexpr void on_error() {
error_handler eh;
eh.on_error("invalid type specifier");
}
};
template <typename Context> template <typename Context>
class arg_map { class arg_map {
private: private:
@ -3169,12 +3189,6 @@ class precision_checker {
ErrorHandler &handler_; ErrorHandler &handler_;
}; };
struct error_handler {
void on_error(const char *message) {
FMT_THROW(format_error(message));
}
};
// A format specifier handler that sets fields in basic_format_specs. // A format specifier handler that sets fields in basic_format_specs.
template <typename Char> template <typename Char>
class specs_setter : public error_handler { class specs_setter : public error_handler {
@ -3658,6 +3672,8 @@ struct formatter<
internal::specs_checker<handler_type> internal::specs_checker<handler_type>
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)
handle_integral_type_spec(specs_.type(), internal::int_type_checker());
return pointer_from(it); return pointer_from(it);
} }