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

Reuse parse_format_string in scan

Browse Source
This commit is contained in:
Victor Zverovich
2019-05-18 13:15:00 -07:00
parent 2346779d6b
commit 4fcd4a4bd0
1 changed files with 17 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
test/scan-test.cc
View File

@ -14,23 +14,10 @@
FMT_BEGIN_NAMESPACE FMT_BEGIN_NAMESPACE
namespace internal { namespace internal {
struct scan_arg { struct scan_arg {
int* value; int* value;
// TODO: more types // TODO: more types
}; };
template <typename Handler>
void parse_scan_format(string_view format_str, Handler&& handler) {
const char* p = format_str.data();
const char* end = p + format_str.size();
while (p != end) {
char c = *p++;
if (c != '{' || p == end || *p++ != '}')
throw format_error("invalid format string");
handler.on_arg();
}
}
} // namespace internal } // namespace internal
struct scan_args { struct scan_args {
@ -45,7 +32,7 @@ struct scan_args {
}; };
namespace internal { namespace internal {
struct scan_handler { struct scan_handler : error_handler {
const char* begin; const char* begin;
const char* end; const char* end;
scan_args args; scan_args args;
@ -57,22 +44,33 @@ struct scan_handler {
args(args), args(args),
next_arg_id(0) {} next_arg_id(0) {}
void on_arg() { void on_text(const char*, const char*) { on_error("invalid format"); }
void on_arg_id() {
if (next_arg_id >= args.size) on_error("argument index out of range");
}
void on_arg_id(unsigned) { on_error("invalid format"); }
void on_arg_id(string_view) { on_error("invalid format"); }
void on_replacement_field(const char*) {
int value = 0; int value = 0;
while (begin != end) { while (begin != end) {
char c = *begin++; char c = *begin++;
if (c < '0' || c > '9') throw format_error("invalid input"); if (c < '0' || c > '9') on_error("invalid input");
value = value * 10 + (c - '0'); value = value * 10 + (c - '0');
} }
if (next_arg_id >= args.size)
throw format_error("argument index out of range");
*args.data[0].value = value; *args.data[0].value = value;
} }
const char* on_format_specs(const char* begin, const char*) {
return begin;
}
}; };
} // namespace internal } // namespace internal
void vscan(string_view input, string_view format_str, scan_args args) { void vscan(string_view input, string_view format_str, scan_args args) {
internal::parse_scan_format(format_str, internal::scan_handler(input, args)); internal::parse_format_string<false>(format_str,
internal::scan_handler(input, args));
} }
template <typename... Args> template <typename... Args>