fmtlib/fmt
1
0
Fork 1
mirror of https://github.com/fmtlib/fmt.git synced 2025-07-31 11:17:35 +02:00
Code Issues Packages Projects Releases Wiki Activity

numeric -> arithmetic

Browse Source
This commit is contained in:
Victor Zverovich
2017-12-09 06:19:15 -08:00
parent 5328907f7f
commit 7cea163809
3 changed files with 6 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
include/fmt/core.h
View File

@ -318,7 +318,7 @@ constexpr bool is_integral(type t) {
return t > internal::NONE && t <= internal::LAST_INTEGER_TYPE; return t > internal::NONE && t <= internal::LAST_INTEGER_TYPE;
} }
constexpr bool is_numeric(type t) { constexpr bool is_arithmetic(type t) {
FMT_ASSERT(t != internal::NAMED_ARG, "invalid argument type"); FMT_ASSERT(t != internal::NAMED_ARG, "invalid argument type");
return t > internal::NONE && t <= internal::LAST_NUMERIC_TYPE; return t > internal::NONE && t <= internal::LAST_NUMERIC_TYPE;
} }
@ -591,7 +591,7 @@ class basic_arg {
internal::type type() const { return type_; } internal::type type() const { return type_; }
bool is_integral() const { return internal::is_integral(type_); } bool is_integral() const { return internal::is_integral(type_); }
bool is_numeric() const { return internal::is_numeric(type_); } bool is_arithmetic() const { return internal::is_arithmetic(type_); }
bool is_pointer() const { return type_ == internal::POINTER; } bool is_pointer() const { return type_ == internal::POINTER; }
}; };
@ -909,11 +909,9 @@ inline internal::named_arg<wcontext> arg(wstring_view name, const T &arg) {
// The following two functions are deleted intentionally to disable // The following two functions are deleted intentionally to disable
// nested named arguments as in ``format("{}", arg("a", arg("b", 42)))``. // nested named arguments as in ``format("{}", arg("a", arg("b", 42)))``.
template <typename Context> template <typename Context>
void arg(string_view, const internal::named_arg<Context>&) void arg(string_view, internal::named_arg<Context>) FMT_DELETED_OR_UNDEFINED;
FMT_DELETED_OR_UNDEFINED;
template <typename Context> template <typename Context>
void arg(wstring_view, const internal::named_arg<Context>&) void arg(wstring_view, internal::named_arg<Context>) FMT_DELETED_OR_UNDEFINED;
FMT_DELETED_OR_UNDEFINED;
enum Color { BLACK, RED, GREEN, YELLOW, BLUE, MAGENTA, CYAN, WHITE }; enum Color { BLACK, RED, GREEN, YELLOW, BLUE, MAGENTA, CYAN, WHITE };

2
include/fmt/format.h
View File

@ -1517,7 +1517,7 @@ class specs_checker : public Handler {
private: private:
constexpr void require_numeric_argument() { constexpr void require_numeric_argument() {
if (!is_numeric(arg_type_)) if (!is_arithmetic(arg_type_))
this->on_error("format specifier requires numeric argument"); this->on_error("format specifier requires numeric argument");
} }

2
include/fmt/printf.h
View File

@ -450,7 +450,7 @@ void printf_context<Char, AF>::format(basic_buffer<Char> &buffer) {
if (spec.flag(HASH_FLAG) && visit(internal::IsZeroInt(), arg)) if (spec.flag(HASH_FLAG) && visit(internal::IsZeroInt(), arg))
spec.flags_ &= ~internal::to_unsigned<int>(HASH_FLAG); spec.flags_ &= ~internal::to_unsigned<int>(HASH_FLAG);
if (spec.fill_ == '0') { if (spec.fill_ == '0') {
if (arg.is_numeric()) if (arg.is_arithmetic())
spec.align_ = ALIGN_NUMERIC; spec.align_ = ALIGN_NUMERIC;
else else
spec.fill_ = ' '; // Ignore '0' flag for non-numeric types. spec.fill_ = ' '; // Ignore '0' flag for non-numeric types.