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

Add MakeArg constructor

Browse Source
This commit is contained in:
Dean Moldovan 2015-10-24 20:16:46 +02:00
parent 8a9ad00ab3
commit 1383efb6c0
1 changed files with 17 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
format.h
View File

@ -1200,6 +1200,16 @@ class MakeValue : public Value {
static uint64_t type(const NamedArg<Char_> &) { return Arg::NAMED_ARG; } static uint64_t type(const NamedArg<Char_> &) { return Arg::NAMED_ARG; }
}; };
template <typename Formatter>
class MakeArg : public Arg {
public:
template <typename T>
MakeArg(const T &x) {
value = MakeValue<Formatter>(x);
type = static_cast<Arg::Type>(MakeValue<Formatter>::type(x));
}
};
template <typename Char> template <typename Char>
struct NamedArg : Arg { struct NamedArg : Arg {
BasicStringRef<Char> name; BasicStringRef<Char> name;
@ -1908,36 +1918,20 @@ inline uint64_t make_type(const Arg &first, const Args & ... tail) {
return make_type(first) | (make_type(tail...) << 4); return make_type(first) | (make_type(tail...) << 4);
} }
inline void do_set_types(Arg *) {} template <typename Formatter>
inline void store_args(Arg *args) {
template <typename T, typename... Args> *args = Arg{0, Arg::NONE};
inline void do_set_types(Arg *args, const T &arg, const Args & ... tail) {
args->type = static_cast<Arg::Type>(
MakeValue< BasicFormatter<char> >::type(arg));
do_set_types(args + 1, tail...);
} }
template <typename... Args>
inline void set_types(Arg *array, const Args & ... args) {
if (check(sizeof...(Args) > ArgList::MAX_PACKED_ARGS))
do_set_types(array, args...);
array[sizeof...(Args)].type = Arg::NONE;
}
template <typename... Args>
inline void set_types(Value *, const Args & ...) {
// Do nothing as types are passed separately from values.
}
template <typename Formatter, typename Value>
inline void store_args(Value *) {}
template <typename Formatter, typename T, typename... Args> template <typename Formatter, typename T, typename... Args>
inline void store_args(Arg *args, const T &arg, const Args & ... tail) { inline void store_args(Arg *args, const T &arg, const Args & ... tail) {
args->value = MakeValue<Formatter>(arg); *args = MakeArg<Formatter>(arg);
store_args<Formatter>(args + 1, tail...); store_args<Formatter>(args + 1, tail...);
} }
template <typename Formatter>
inline void store_args(Value *) {}
template <typename Formatter, typename T, typename... Args> template <typename Formatter, typename T, typename... Args>
inline void store_args(Value *args, const T &arg, const Args & ... tail) { inline void store_args(Value *args, const T &arg, const Args & ... tail) {
*args = MakeValue<Formatter>(arg); *args = MakeValue<Formatter>(arg);
@ -1947,8 +1941,6 @@ inline void store_args(Value *args, const T &arg, const Args & ... tail) {
template <typename Formatter, typename... Args> template <typename Formatter, typename... Args>
ArgList make_arg_list(typename ArgArray<sizeof...(Args)>::Type array, ArgList make_arg_list(typename ArgArray<sizeof...(Args)>::Type array,
const Args & ... args) { const Args & ... args) {
if (check(sizeof...(Args) >= ArgList::MAX_PACKED_ARGS))
set_types(array, args...);
store_args<Formatter>(array, args...); store_args<Formatter>(array, args...);
return ArgList(make_type(args...), array); return ArgList(make_type(args...), array);
} }