External/fmt
8
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Move check_sign to anonymous namespace.

Browse Source
This commit is contained in:
Victor Zverovich 2014-08-29 06:57:53 -07:00
parent ab35af53c5
commit 3947a7a98c
2 changed files with 14 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
format.cc
View File

@ -188,6 +188,20 @@ const Char *find_closing_brace(const Char *s, int num_open_braces = 1) {
throw fmt::FormatError("unmatched '{' in format"); throw fmt::FormatError("unmatched '{' in format");
} }
template <typename Char>
void check_sign(const Char *&s, const Arg &arg) {
char sign = static_cast<char>(*s);
if (arg.type > Arg::LAST_NUMERIC_TYPE) {
throw fmt::FormatError(fmt::format(
"format specifier '{}' requires numeric argument", sign));
}
if (arg.type == Arg::UINT || arg.type == Arg::ULONG_LONG) {
throw fmt::FormatError(fmt::format(
"format specifier '{}' requires signed argument", sign));
}
++s;
}
// Checks if an argument is a valid printf width specifier and sets // Checks if an argument is a valid printf width specifier and sets
// left alignment if it is negative. // left alignment if it is negative.
class WidthHandler : public fmt::internal::ArgVisitor<WidthHandler, unsigned> { class WidthHandler : public fmt::internal::ArgVisitor<WidthHandler, unsigned> {
@ -759,21 +773,6 @@ inline const Arg &fmt::BasicFormatter<Char>::parse_arg_index(const Char *&s) {
return *arg; return *arg;
} }
template <typename Char>
void fmt::BasicFormatter<Char>::check_sign(
const Char *&s, const Arg &arg) {
char sign = static_cast<char>(*s);
if (arg.type > Arg::LAST_NUMERIC_TYPE) {
throw FormatError(fmt::format(
"format specifier '{}' requires numeric argument", sign));
}
if (arg.type == Arg::UINT || arg.type == Arg::ULONG_LONG) {
throw FormatError(fmt::format(
"format specifier '{}' requires signed argument", sign));
}
++s;
}
const Arg *fmt::internal::FormatterBase::next_arg(const char *&error) { const Arg *fmt::internal::FormatterBase::next_arg(const char *&error) {
if (next_arg_index_ < 0) { if (next_arg_index_ < 0) {
error = "cannot switch from manual to automatic argument indexing"; error = "cannot switch from manual to automatic argument indexing";

2
format.h
View File

@ -889,8 +889,6 @@ private:
// Parses argument index and returns corresponding argument. // Parses argument index and returns corresponding argument.
const internal::Arg &parse_arg_index(const Char *&s); const internal::Arg &parse_arg_index(const Char *&s);
void check_sign(const Char *&s, const internal::Arg &arg);
public: public:
explicit BasicFormatter(BasicWriter<Char> &w) : writer_(w) {} explicit BasicFormatter(BasicWriter<Char> &w) : writer_(w) {}