MirrorHub
/
construct
mirror of https://github.com/matrix-construct/construct
0
0
Fork 0
Code Issues Releases Wiki Activity

ircd::json: Optimize json::type() ABI. 

ircd::json: Fix indentation; minor cleanup.
This commit is contained in:
Jason Volk 2023-04-17 19:29:24 -07:00
parent 55a73624d2
commit c77df219b5
4 changed files with 33 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
include/ircd/json/stack/stack.h
View File

@ -105,28 +105,28 @@ template<>
inline ircd::json::stack::array &
ircd::json::stack::stack::top<ircd::json::stack::array>(stack &s)
{
return array::top(s);
return array::top(s);
}
template<>
inline const ircd::json::stack::array &
ircd::json::stack::stack::top<ircd::json::stack::array>(const stack &s)
{
return array::top(s);
return array::top(s);
}
template<>
inline ircd::json::stack::object &
ircd::json::stack::stack::top<ircd::json::stack::object>(stack &s)
{
return object::top(s);
return object::top(s);
}
template<>
inline const ircd::json::stack::object &
ircd::json::stack::stack::top<ircd::json::stack::object>(const stack &s)
{
return object::top(s);
return object::top(s);
}
template<>

28
include/ircd/json/type.h
View File

@ -29,26 +29,18 @@ namespace ircd::json
/// not use the strict overload.
IRCD_OVERLOAD(strict)
// Determine the type
enum type type(const string_view &);
enum type type(const string_view &, std::nothrow_t);
enum type type(const string_view &, strict_t);
enum type type(const string_view &, strict_t, std::nothrow_t);
// Query if type
bool type(const string_view &, const enum type &, strict_t);
bool type(const string_view &, const enum type &);
// Utils
string_view reflect(const enum type &);
[[gnu::pure]] string_view reflect(const enum type) noexcept;
extern const string_view literal_null;
extern const string_view literal_true;
extern const string_view literal_false;
extern const string_view empty_string;
extern const string_view empty_object;
extern const string_view empty_array;
extern const int64_t undefined_number;
// Determine the type w/ strict correctness (full scan)
[[gnu::pure]] bool type(const string_view &, const enum type, strict_t) noexcept;
[[gnu::pure]] enum type type(const string_view &, strict_t, std::nothrow_t) noexcept;
enum type type(const string_view &, strict_t);
// Determine the type quickly
[[gnu::pure]] bool type(const string_view &, const enum type) noexcept;
[[gnu::pure]] enum type type(const string_view &, std::nothrow_t) noexcept;
enum type type(const string_view &);
}
enum ircd::json::type

10
include/ircd/json/util.h
View File

@ -36,7 +36,15 @@ namespace ircd::json
void valid(const string_view &);
std::string why(const string_view &);
struct stats extern stats;
extern const string_view literal_null;
extern const string_view literal_true;
extern const string_view literal_false;
extern const string_view empty_string;
extern const string_view empty_object;
extern const string_view empty_array;
extern const int64_t undefined_number;
extern struct stats stats;
}
/// Statistics counter access; unfortunately these cannot participate as

17
ircd/json.cc
View File

@ -4754,7 +4754,8 @@ namespace ircd::json::parser
bool
ircd::json::type(const string_view &buf,
const enum type &type)
const enum type type)
noexcept
{
const bool ret
{
@ -4780,6 +4781,7 @@ ircd::json::type(const string_view &buf)
enum ircd::json::type
ircd::json::type(const string_view &buf,
std::nothrow_t)
noexcept
{
enum type ret;
if(!parser::parse(begin(buf), end(buf), parser::type_parse, ret))
@ -4842,8 +4844,9 @@ namespace ircd::json::parser
bool
ircd::json::type(const string_view &buf,
const enum type &type,
const enum type type,
strict_t)
noexcept
{
const bool ret
{
@ -4871,6 +4874,7 @@ enum ircd::json::type
ircd::json::type(const string_view &buf,
strict_t,
std::nothrow_t)
noexcept
{
enum type ret;
if(!parser::parse(begin(buf), end(buf), parser::type_parse_strict, ret))
@ -4880,7 +4884,8 @@ ircd::json::type(const string_view &buf,
}
ircd::string_view
ircd::json::reflect(const enum type &type)
ircd::json::reflect(const enum type type)
noexcept
{
switch(type)
{
@ -4891,8 +4896,6 @@ ircd::json::reflect(const enum type &type)
case STRING: return "STRING";
}
throw type_error
{
"Unknown type %x", uint(type)
};
assert(false);
return "STRING";
}