diff --git a/include/ircd/lex_cast.h b/include/ircd/lex_cast.h index 075e10b99..d03038e5c 100644 --- a/include/ircd/lex_cast.h +++ b/include/ircd/lex_cast.h @@ -18,7 +18,7 @@ namespace ircd { IRCD_EXCEPTION_HIDENAME(ircd::error, bad_lex_cast) - template bool try_lex_cast(const string_view &); + template bool lex_castable(const string_view &); template T lex_cast(std::string &); template T lex_cast(const std::string &); @@ -36,25 +36,25 @@ namespace ircd namespace ircd { - template<> bool try_lex_cast(const string_view &); // stub always true - template<> bool try_lex_cast(const string_view &); // stub always true - template<> bool try_lex_cast(const string_view &); // stub always true - template<> bool try_lex_cast(const string_view &); - template<> bool try_lex_cast(const string_view &); - template<> bool try_lex_cast(const string_view &); - template<> bool try_lex_cast(const string_view &); - template<> bool try_lex_cast(const string_view &); - template<> bool try_lex_cast(const string_view &); - template<> bool try_lex_cast(const string_view &); - template<> bool try_lex_cast(const string_view &); - template<> bool try_lex_cast(const string_view &); - template<> bool try_lex_cast(const string_view &); - template<> bool try_lex_cast(const string_view &); - template<> bool try_lex_cast(const string_view &); - template<> bool try_lex_cast(const string_view &); - template<> bool try_lex_cast(const string_view &); - template<> bool try_lex_cast(const string_view &); - template<> bool try_lex_cast(const string_view &); + template<> bool lex_castable(const string_view &); // stub always true + template<> bool lex_castable(const string_view &); // stub always true + template<> bool lex_castable(const string_view &); // stub always true + template<> bool lex_castable(const string_view &); + template<> bool lex_castable(const string_view &); + template<> bool lex_castable(const string_view &); + template<> bool lex_castable(const string_view &); + template<> bool lex_castable(const string_view &); + template<> bool lex_castable(const string_view &); + template<> bool lex_castable(const string_view &); + template<> bool lex_castable(const string_view &); + template<> bool lex_castable(const string_view &); + template<> bool lex_castable(const string_view &); + template<> bool lex_castable(const string_view &); + template<> bool lex_castable(const string_view &); + template<> bool lex_castable(const string_view &); + template<> bool lex_castable(const string_view &); + template<> bool lex_castable(const string_view &); + template<> bool lex_castable(const string_view &); template<> std::string &lex_cast(std::string &); // trivial template<> std::string lex_cast(const std::string &); // trivial @@ -235,7 +235,7 @@ ircd::lex_cast(T t, template IRCD_LEX_CAST_UNNECESSARY bool -ircd::try_lex_cast(const string_view &s) +ircd::lex_castable(const string_view &s) { assert(0); return false; @@ -244,7 +244,7 @@ ircd::try_lex_cast(const string_view &s) /// Trivial conversion; always returns true template<> inline bool -ircd::try_lex_cast(const string_view &) +ircd::lex_castable(const string_view &) { return true; } @@ -252,7 +252,7 @@ ircd::try_lex_cast(const string_view &) /// Trivial conversion; always returns true template<> inline bool -ircd::try_lex_cast(const string_view &) +ircd::lex_castable(const string_view &) { return true; } @@ -260,7 +260,7 @@ ircd::try_lex_cast(const string_view &) /// Trivial conversion; always returns true template<> inline bool -ircd::try_lex_cast(const string_view &s) +ircd::lex_castable(const string_view &s) { return true; } diff --git a/ircd/info.cc b/ircd/info.cc index 3be71c686..1b753ca9d 100644 --- a/ircd/info.cc +++ b/ircd/info.cc @@ -279,7 +279,7 @@ ircd::info::kernel_version [] // major { const auto str(split(kernel_release, '.').first); - return try_lex_cast(str)? + return lex_castable(str)? lex_cast(str): 0; }(), @@ -288,7 +288,7 @@ ircd::info::kernel_version { auto str(split(kernel_release, '.').second); str = split(str, '.').first; - return try_lex_cast(str)? + return lex_castable(str)? lex_cast(str): 0; }(), diff --git a/ircd/lex_cast.cc b/ircd/lex_cast.cc index e10867dc0..bbeb1c768 100644 --- a/ircd/lex_cast.cc +++ b/ircd/lex_cast.cc @@ -323,112 +323,112 @@ ircd::lex_cast(const string_view &s) } template<> bool -ircd::try_lex_cast(const string_view &s) +ircd::lex_castable(const string_view &s) { bool i; return boost::conversion::try_lexical_convert(s, i); } template<> bool -ircd::try_lex_cast(const string_view &s) +ircd::lex_castable(const string_view &s) { int8_t i; return boost::conversion::try_lexical_convert(s, i); } template<> bool -ircd::try_lex_cast(const string_view &s) +ircd::lex_castable(const string_view &s) { uint8_t i; return boost::conversion::try_lexical_convert(s, i); } template<> bool -ircd::try_lex_cast(const string_view &s) +ircd::lex_castable(const string_view &s) { short i; return boost::conversion::try_lexical_convert(s, i); } template<> bool -ircd::try_lex_cast(const string_view &s) +ircd::lex_castable(const string_view &s) { ushort i; return boost::conversion::try_lexical_convert(s, i); } template<> bool -ircd::try_lex_cast(const string_view &s) +ircd::lex_castable(const string_view &s) { int i; return boost::conversion::try_lexical_convert(s, i); } template<> bool -ircd::try_lex_cast(const string_view &s) +ircd::lex_castable(const string_view &s) { unsigned int i; return boost::conversion::try_lexical_convert(s, i); } template<> bool -ircd::try_lex_cast(const string_view &s) +ircd::lex_castable(const string_view &s) { long i; return boost::conversion::try_lexical_convert(s, i); } template<> bool -ircd::try_lex_cast(const string_view &s) +ircd::lex_castable(const string_view &s) { unsigned long i; return boost::conversion::try_lexical_convert(s, i); } template<> bool -ircd::try_lex_cast(const string_view &s) +ircd::lex_castable(const string_view &s) { float i; return boost::conversion::try_lexical_convert(s, i); } template<> bool -ircd::try_lex_cast(const string_view &s) +ircd::lex_castable(const string_view &s) { double i; return boost::conversion::try_lexical_convert(s, i); } template<> bool -ircd::try_lex_cast(const string_view &s) +ircd::lex_castable(const string_view &s) { long double i; return boost::conversion::try_lexical_convert(s, i); } template<> bool -ircd::try_lex_cast(const string_view &s) +ircd::lex_castable(const string_view &s) { time_t i; //TODO: XXX return boost::conversion::try_lexical_convert(s, i); } template<> bool -ircd::try_lex_cast(const string_view &s) +ircd::lex_castable(const string_view &s) { time_t i; //TODO: XXX return boost::conversion::try_lexical_convert(s, i); } template<> bool -ircd::try_lex_cast(const string_view &s) +ircd::lex_castable(const string_view &s) { time_t i; //TODO: XXX return boost::conversion::try_lexical_convert(s, i); } template<> bool -ircd::try_lex_cast(const string_view &s) +ircd::lex_castable(const string_view &s) { time_t i; //TODO: XXX return boost::conversion::try_lexical_convert(s, i); diff --git a/modules/console.cc b/modules/console.cc index 7406228ba..5783dc79e 100644 --- a/modules/console.cc +++ b/modules/console.cc @@ -262,7 +262,7 @@ console_command_derived(opt &out, const string_view &line) // First check if the line starts with a number, this is a special case // sent to a custom dispatcher (which right now is specifically for the // event stager suite). - if(try_lex_cast(id)) + if(lex_castable(id)) return console_command_numeric(out, line); if(m::has_sigil(id)) switch(m::sigil(id)) @@ -2780,7 +2780,7 @@ try const bool integer { - begin? try_lex_cast(begin) : false + begin? lex_castable(begin) : false }; const uint64_t integers[2] @@ -4186,7 +4186,7 @@ try const bool is_integer_key { - try_lex_cast(param["key"]) + lex_castable(param["key"]) }; const uint64_t integer_key[2] @@ -7052,7 +7052,7 @@ console_cmd__event(opt &out, const string_view &line) }}; m::event::id::buf event_id_buf; - if(try_lex_cast(param.at("event_id"))) + if(lex_castable(param.at("event_id"))) event_id_buf = m::event_id(param.at("event_id")); const m::event::id event_id @@ -7554,7 +7554,7 @@ console_cmd__event__cached(opt &out, const string_view &line) return true; } - else if(try_lex_cast(id)) + else if(lex_castable(id)) { const m::event::idx event_idx { @@ -9672,14 +9672,14 @@ console_cmd__room__state__history(opt &out, const string_view &line) const m::event::id &event_id { - !try_lex_cast(point)? + !lex_castable(point)? m::event::id{point}: m::event::id{} }; const int64_t bound { - try_lex_cast(point)? + lex_castable(point)? lex_cast(point): -1L }; diff --git a/modules/m_room_power_levels.cc b/modules/m_room_power_levels.cc index e3e146a34..0dfa9d907 100644 --- a/modules/m_room_power_levels.cc +++ b/modules/m_room_power_levels.cc @@ -91,7 +91,7 @@ ircd::m::auth_room_power_levels(const m::event &event, continue; } - if(!try_lex_cast(unquote(value))) + if(!lex_castable(unquote(value))) throw FAIL { "m.room.power_levels content.users value is not an integer."