MirrorHub/construct
0
0
Fork 0
mirror of https://github.com/matrix-construct/construct synced 2024-11-26 00:32:35 +01:00
Code Issues Releases Wiki Activity

ircd::fmt: Use universal reference for generate_string templates; simplify.

Browse source
This commit is contained in:
Jason Volk 2020-02-21 16:24:45 -08:00
parent b0c0970d69
commit f65839b1e5
1 changed files with 14 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
ircd/fmt.cc
View file

@ -40,7 +40,7 @@ __attribute__((visibility("hidden")))
bool is_specifier(const string_view &name); bool is_specifier(const string_view &name);
void handle_specifier(mutable_buffer &out, const uint &idx, const spec &, const arg &); void handle_specifier(mutable_buffer &out, const uint &idx, const spec &, const arg &);
template<class generator> bool generate_string(char *&out, const generator &gen, const arg &val); template<class generator> bool generate_string(char *&out, generator&&, const arg &val);
template<class T, class lambda> bool visit_type(const arg &val, lambda&& closure); template<class T, class lambda> bool visit_type(const arg &val, lambda&& closure);
}} }}
@ -1083,26 +1083,28 @@ const
} }
static const generator; static const generator;
const auto &mw(maxwidth(max)); static const auto ep
static const auto &ep(eps[throw_illegal]); {
eps[throw_illegal]
};
if(!spec.width) if(!spec.width)
return generate_string(out, mw[generator] | ep, val); return generate_string(out, maxwidth(max)[generator] | ep, val);
if(spec.sign == '-') if(spec.sign == '-')
{ {
const auto &g(generator.aligned_left(spec.width, spec.pad)); const auto &g(generator.aligned_left(spec.width, spec.pad));
return generate_string(out, mw[g] | ep, val); return generate_string(out, maxwidth(max)[g] | ep, val);
} }
const auto &g(generator.aligned_right(spec.width, spec.pad)); const auto &g(generator.aligned_right(spec.width, spec.pad));
return generate_string(out, mw[g] | ep, val); return generate_string(out, maxwidth(max)[g] | ep, val);
} }
template<class generator> template<class generator>
bool bool
ircd::fmt::generate_string(char *&out, ircd::fmt::generate_string(char *&out,
const generator &gen, generator&& gen,
const arg &val) const arg &val)
{ {
using karma::eps; using karma::eps;
@ -1115,22 +1117,22 @@ ircd::fmt::generate_string(char *&out,
type == typeid(ircd::json::array)) type == typeid(ircd::json::array))
{ {
const auto &str(*static_cast<const ircd::string_view *>(ptr)); const auto &str(*static_cast<const ircd::string_view *>(ptr));
return karma::generate(out, gen, str); return karma::generate(out, std::forward<generator>(gen), str);
} }
else if(type == typeid(std::string_view)) else if(type == typeid(std::string_view))
{ {
const auto &str(*static_cast<const std::string_view *>(ptr)); const auto &str(*static_cast<const std::string_view *>(ptr));
return karma::generate(out, gen, str); return karma::generate(out, std::forward<generator>(gen), str);
} }
else if(type == typeid(std::string)) else if(type == typeid(std::string))
{ {
const auto &str(*static_cast<const std::string *>(ptr)); const auto &str(*static_cast<const std::string *>(ptr));
return karma::generate(out, gen, string_view{str}); return karma::generate(out, std::forward<generator>(gen), string_view{str});
} }
else if(type == typeid(const char *)) else if(type == typeid(const char *))
{ {
const char *const &str{*static_cast<const char *const *>(ptr)}; const char *const &str{*static_cast<const char *const *>(ptr)};
return karma::generate(out, gen, string_view{str}); return karma::generate(out, std::forward<generator>(gen), string_view{str});
} }
// This for string literals which have unique array types depending on their size. // This for string literals which have unique array types depending on their size.
@ -1138,5 +1140,5 @@ ircd::fmt::generate_string(char *&out,
// grammar will fail gracefully (most of the time) or not print something bogus when // grammar will fail gracefully (most of the time) or not print something bogus when
// it happens to be legal. // it happens to be legal.
const auto &str(static_cast<const char *>(ptr)); const auto &str(static_cast<const char *>(ptr));
return karma::generate(out, gen, string_view{str}); return karma::generate(out, std::forward<generator>(gen), string_view{str});
} }