MirrorHub/construct
0
0
Fork 0
mirror of https://github.com/matrix-construct/construct synced 2024-11-18 07:50:57 +01:00
Code Issues Releases Wiki Activity

ircd::json::object: Reuse/reorg member rule instance; out-of-line static durations.

Browse source
This commit is contained in:
Jason Volk 2020-04-17 15:46:30 -07:00
parent bdbad2ddb9
commit f151eb2e6c
1 changed files with 52 additions and 37 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

89
ircd/json.cc
View file

@ -2617,34 +2617,66 @@ const
}); });
} }
namespace ircd::json
{
extern const parser::rule<object::member> object_member;
extern const parser::rule<object::member> object_next;
extern const parser::rule<object::member> object_begin;
extern const parser::rule<object::member> object_next_parse;
extern const parser::rule<object::member> object_begin_parse;
}
[[gnu::visibility("internal")]]
decltype(ircd::json::object_member)
ircd::json::object_member
{
parser.name >> -parser.ws >> parser.name_sep >> -parser.ws >> raw[parser.value(0)]
,"object member"
};
[[gnu::visibility("internal")]]
decltype(ircd::json::object_next)
ircd::json::object_next
{
parser.object_end | (parser.value_sep >> -parser.ws >> object_member)
,"object member"
};
[[gnu::visibility("internal")]]
decltype(ircd::json::object_begin)
ircd::json::object_begin
{
parser.object_begin >> -parser.ws >> (parser.object_end | object_member)
,"object"
};
[[gnu::visibility("internal")]]
decltype(ircd::json::object_next_parse)
ircd::json::object_next_parse
{
expect[object_next >> -parser.ws]
,"object increment"
};
[[gnu::visibility("internal")]]
decltype(ircd::json::object_begin_parse)
ircd::json::object_begin_parse
{
expect[-parser.ws >> object_begin >> -parser.ws]
,"object begin"
};
ircd::json::object::const_iterator ircd::json::object::const_iterator
ircd::json::object::begin() ircd::json::object::begin()
const try const try
{ {
static const auto &ws
{
parser.ws
};
static const parser::rule<json::object::member> object_member
{
parser.name >> -ws >> parser.name_sep >> -ws >> raw[parser.value(0)]
,"object member"
};
static const parser::rule<json::object::member> parse_begin
{
-ws >> parser.object_begin >> -ws >> (parser.object_end | object_member) >> -ws
,"object begin and member or end"
};
const_iterator ret const_iterator ret
{ {
string_view::begin(), string_view::end() string_view::begin(), string_view::end()
}; };
if(!string_view{*this}.empty()) if(likely(!string_view{*this}.empty()))
qi::parse(ret.start, ret.stop, eps > parse_begin, ret.state); qi::parse(ret.start, ret.stop, object_begin_parse, ret.state);
return ret; return ret;
} }
@ -2675,26 +2707,9 @@ ircd::json::object::const_iterator &
ircd::json::object::const_iterator::operator++() ircd::json::object::const_iterator::operator++()
try try
{ {
static const auto &ws
{
parser.ws
};
static const parser::rule<json::object::member> member
{
parser.name >> -ws >> parser.name_sep >> -ws >> raw[parser.value(0)]
,"next object member"
};
static const parser::rule<json::object::member> parse_next
{
(parser.object_end | (parser.value_sep >> -ws >> member)) >> -ws
,"next object member or end"
};
state.first = string_view{}; state.first = string_view{};
state.second = string_view{}; state.second = string_view{};
qi::parse(start, stop, eps > parse_next, state); qi::parse(start, stop, object_next_parse, state);
return *this; return *this;
} }
catch(const qi::expectation_failure<const char *> &e) catch(const qi::expectation_failure<const char *> &e)