MirrorHub/construct
0
0
Fork 0
mirror of https://github.com/matrix-construct/construct synced 2024-09-26 18:38:52 +02:00
Code Issues Releases Wiki Activity

ircd: Move params back into ircd::util... (w/ manual inclusion).

Browse source
This commit is contained in:
Jason Volk 2018-02-06 13:03:38 -08:00
parent 44f8868598
commit ee0d6423f3
3 changed files with 31 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
charybdis/console.cc
View file

@ -11,8 +11,8 @@
#include <ircd/ircd.h> #include <ircd/ircd.h>
#include <ircd/asio.h> #include <ircd/asio.h>
#include <ircd/m/m.h> #include <ircd/m/m.h>
#include <ircd/util/params.h>
#include "charybdis.h" #include "charybdis.h"
#include "params.h"
using namespace ircd; using namespace ircd;

48
charybdis/params.h → include/ircd/util/params.h
View file

@ -9,11 +9,19 @@
// full license for this software is available in the LICENSE file. // full license for this software is available in the LICENSE file.
#pragma once #pragma once
#define HAVE_CONSTRUCT_PARAMS_H #define HAVE_IRCD_UTIL_PARAMS_H
class params // This file is not part of the standard include stack. It is included
// manually as needed.
namespace ircd::util
{ {
ircd::string_view in; struct params;
}
class ircd::util::params
{
string_view in;
const char *sep; const char *sep;
std::vector<const char *> names; std::vector<const char *> names;
@ -25,20 +33,20 @@ class params
IRCD_EXCEPTION(error, invalid) IRCD_EXCEPTION(error, invalid)
size_t count() const; size_t count() const;
ircd::string_view operator[](const size_t &i) const; // returns empty string_view operator[](const size_t &i) const; // returns empty
template<class T> T at(const size_t &i, const T &def) const; // throws invalid template<class T> T at(const size_t &i, const T &def) const; // throws invalid
template<class T> T at(const size_t &i) const; // throws missing or invalid template<class T> T at(const size_t &i) const; // throws missing or invalid
ircd::string_view at(const size_t &i) const; // throws missing string_view at(const size_t &i) const; // throws missing
params(const ircd::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::initializer_list<const char *> &names = {});
}; };
inline inline
params::params(const ircd::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::initializer_list<const char *> &names)
:in{in} :in{in}
,sep{sep} ,sep{sep}
,names{names} ,names{names}
@ -47,31 +55,31 @@ params::params(const ircd::string_view &in,
template<class T> template<class T>
T T
params::at(const size_t &i, ircd::util::params::at(const size_t &i,
const T &def) const T &def)
const try const try
{ {
return count() > i? at<T>(i) : def; return count() > i? at<T>(i) : def;
} }
catch(const ircd::bad_lex_cast &e) catch(const bad_lex_cast &e)
{ {
throw invalid("parameter #%zu <%s>", i, name(i)); throw invalid("parameter #%zu <%s>", i, name(i));
} }
template<class T> template<class T>
T T
params::at(const size_t &i) ircd::util::params::at(const size_t &i)
const try const try
{ {
return ircd::lex_cast<T>(at(i)); return lex_cast<T>(at(i));
} }
catch(const ircd::bad_lex_cast &e) catch(const bad_lex_cast &e)
{ {
throw invalid("parameter #%zu <%s>", i, name(i)); throw invalid("parameter #%zu <%s>", i, name(i));
} }
inline ircd::string_view inline ircd::string_view
params::at(const size_t &i) ircd::util::params::at(const size_t &i)
const try const try
{ {
return token(in, sep, i); return token(in, sep, i);
@ -82,21 +90,21 @@ catch(const std::out_of_range &e)
} }
inline ircd::string_view inline ircd::string_view
params::operator[](const size_t &i) ircd::util::params::operator[](const size_t &i)
const const
{ {
return count() > i? token(in, sep, i) : ircd::string_view{}; return count() > i? token(in, sep, i) : string_view{};
} }
inline size_t inline size_t
params::count() ircd::util::params::count()
const const
{ {
return token_count(in, sep); return token_count(in, sep);
} }
inline const char * inline const char *
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>";

2
modules/console.cc
View file

@ -8,6 +8,8 @@
// copyright notice and this permission notice is present in all copies. The // copyright notice and this permission notice is present in all copies. The
// full license for this software is available in the LICENSE file. // full license for this software is available in the LICENSE file.
#include <ircd/util/params.h>
using namespace ircd; using namespace ircd;
mapi::header IRCD_MODULE mapi::header IRCD_MODULE