0
0
Fork 0
mirror of https://github.com/matrix-construct/construct synced 2024-11-17 07:20:55 +01:00

ircd::util::params: Modernize; remove allocation.

This commit is contained in:
Jason Volk 2019-12-10 17:49:09 -08:00
parent 0912ca12a0
commit 5b3cc11859

View file

@ -14,23 +14,30 @@
// This file is not part of the standard include stack. It is included // This file is not part of the standard include stack. It is included
// manually as needed. // manually as needed.
namespace ircd { namespace ircd
inline namespace util
{ {
inline namespace util
{
struct params; struct params;
}} }
}
struct ircd::util::params struct ircd::util::params
{ {
static const size_t MAX
{
12
};
IRCD_EXCEPTION(ircd::error, error) IRCD_EXCEPTION(ircd::error, error)
IRCD_EXCEPTION(error, missing) IRCD_EXCEPTION(error, missing)
IRCD_EXCEPTION(error, invalid) IRCD_EXCEPTION(error, invalid)
string_view in; string_view in;
const char *sep; const char *sep;
std::vector<const char *> names; std::array<string_view, MAX> names;
const char *name(const size_t &i) const; string_view name(const size_t &i) const;
size_t name(const string_view &) const; size_t name(const string_view &) const;
public: public:
@ -50,13 +57,13 @@ struct ircd::util::params
params(const string_view &in, params(const string_view &in,
const char *const &sep, const char *const &sep,
const std::initializer_list<const char *> &names = {}); const std::array<string_view, MAX> &names = {});
}; };
inline inline
ircd::util::params::params(const string_view &in, ircd::util::params::params(const string_view &in,
const char *const &sep, const char *const &sep,
const std::initializer_list<const char *> &names) const std::array<string_view, MAX> &names)
:in{in} :in{in}
,sep{sep} ,sep{sep}
,names{names} ,names{names}
@ -143,7 +150,9 @@ inline ircd::string_view
ircd::util::params::operator[](const size_t &i) ircd::util::params::operator[](const size_t &i)
const const
{ {
return count() > i? token(in, sep, i) : string_view{}; return count() > i?
token(in, sep, i):
string_view{};
} }
inline size_t inline size_t
@ -160,9 +169,11 @@ const
return util::index(begin(names), end(names), name); return util::index(begin(names), end(names), name);
} }
inline const char * inline ircd::string_view
ircd::util::params::name(const size_t &i) ircd::util::params::name(const size_t &i)
const const
{ {
return names.size() > i? *std::next(begin(names), i) : "<unnamed>"; return names.size() > i?
*std::next(begin(names), i):
"<unnamed>";
} }