leavelet/fmt
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Make format spec parsing context-independent

Browse Source
This commit is contained in:
Victor Zverovich
2017-07-30 08:58:24 -07:00
parent 45911770c5
commit 1102d46508
3 changed files with 205 additions and 98 deletions
Download Patch File Download Diff File Expand all files Collapse all files
fmt/printf.h
+8 -2
View File
@@ -367,8 +367,14 @@ typename printf_context<Char, AF>::format_arg printf_context<Char, AF>::get_arg(
iterator it, unsigned arg_index) {
(void)it;
const char *error = 0;
format_arg arg = arg_index == std::numeric_limits<unsigned>::max() ?
this->next_arg(error) : Base::get_arg(arg_index - 1, error);
format_arg arg;
if (arg_index == std::numeric_limits<unsigned>::max()) {
arg_index = this->next_arg_index(error);
if (!error)
arg = this->do_get_arg(arg_index, error);
} else {
arg = Base::get_arg(arg_index - 1, error);
}
if (error)
FMT_THROW(format_error(!*it ? "invalid format string" : error));
return arg;