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

ircd::json: Simplify grammar instantiations.

Browse source
This commit is contained in:
Jason Volk 2020-05-19 16:11:09 -07:00
parent 00d4a488c6
commit 8c2b203426
1 changed files with 21 additions and 36 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

57
ircd/json.cc
View file

@ -13,9 +13,6 @@ namespace ircd::json
{
using namespace ircd::spirit;
struct input;
struct output;
// Instantiations of the grammars
struct parser extern const parser;
struct printer extern const printer;
@ -43,7 +40,7 @@ BOOST_FUSION_ADAPT_STRUCT
#pragma GCC visibility pop
struct [[gnu::visibility("internal")]]
ircd::json::input
ircd::json::parser
:qi::grammar<const char *, unused_type>
{
using it = const char *;
@ -212,8 +209,8 @@ ircd::json::input
,"type"
};
input()
:input::base_type{rule<>{}} // required by spirit
parser()
:parser::base_type{rule<>{}} // required by spirit
{
// synthesized repropagation of recursive rules
value %= (&quote >> string)
@ -225,10 +222,11 @@ ircd::json::input
| lit_null
;
}
};
}
const ircd::json::parser;
struct [[gnu::visibility("internal")]]
ircd::json::output
ircd::json::printer
:karma::grammar<char *, unused_type>
{
using it = char *;
@ -341,8 +339,20 @@ ircd::json::output
,"array"
};
output()
:output::base_type{rule<>{}}
template<class it_a,
class it_b,
class closure>
static void list_protocol(mutable_buffer &, it_a begin, const it_b &end, closure&&);
template<class gen,
class... attr>
bool operator()(mutable_buffer &out, gen&&, attr&&...) const;
template<class gen>
bool operator()(mutable_buffer &out, gen&&) const;
printer()
:printer::base_type{rule<>{}}
{
for(const auto &p : escapes)
escaped.add(p.first, p.second);
@ -358,31 +368,6 @@ ircd::json::output
| string
;
}
};
struct [[gnu::visibility("internal")]]
ircd::json::parser
:input
{
using input::input;
}
const ircd::json::parser;
struct [[gnu::visibility("internal")]]
ircd::json::printer
:output
{
template<class gen,
class... attr>
bool operator()(mutable_buffer &out, gen&&, attr&&...) const;
template<class gen>
bool operator()(mutable_buffer &out, gen&&) const;
template<class it_a,
class it_b,
class closure>
static void list_protocol(mutable_buffer &, it_a begin, const it_b &end, closure&&);
}
const ircd::json::printer;
@ -473,7 +458,7 @@ ircd::json::printer::list_protocol(mutable_buffer &out,
[[gnu::visibility("internal")]]
void
ircd::json::input::throws_exceeded()
ircd::json::parser::throws_exceeded()
{
throw recursion_limit
{