MirrorHub/construct
0
0
Fork 0
mirror of https://github.com/matrix-construct/construct synced 2024-06-17 17:38:22 +02:00
Code Issues Releases Wiki Activity

ircd::json: Consolidate type grammars; move outside functions; apply visibility.

Browse source
This commit is contained in:
Jason Volk 2020-05-14 21:13:02 -07:00
parent 648d6e42b4
commit 005d1226b2
1 changed files with 15 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

27
ircd/json.cc
View file

@ -4099,17 +4099,25 @@ ircd::json::serialized(const string_view &v)
// json/type.h
//
namespace ircd::json
{
using type_rule = parser::rule<enum json::type>;
[[gnu::visibility("internal")]] extern const type_rule type_strict;
}
decltype(ircd::json::type_strict)
ircd::json::type_strict
{
-parser.ws >> parser.type_strict >> -parser.ws >> eoi
};
enum ircd::json::type
ircd::json::type(const string_view &buf,
strict_t)
{
static const parser::rule<enum json::type> rule
{
-parser.ws >> parser.type_strict >> -parser.ws >> eoi
};
enum type ret;
if(!qi::parse(begin(buf), end(buf), rule , ret))
if(!qi::parse(begin(buf), end(buf), type_strict, ret))
throw type_error
{
"Failed to derive JSON value type from input buffer."
@ -4123,13 +4131,8 @@ ircd::json::type(const string_view &buf,
strict_t,
std::nothrow_t)
{
static const parser::rule<enum json::type> rule
{
-parser.ws >> parser.type_strict >> -parser.ws >> eoi
};
enum type ret;
if(!qi::parse(begin(buf), end(buf), rule, ret))
if(!qi::parse(begin(buf), end(buf), type_strict, ret))
return STRING;
return ret;