MirrorHub/construct
0
0
Fork 0
mirror of https://github.com/matrix-construct/construct synced 2024-12-26 07:23:53 +01:00
Code Issues Releases Wiki Activity

ircd::spirit: Increase expectation rule buffer size.

Browse source 
ircd::spirit: Simplify expectation failure wrapper.
This commit is contained in:
Jason Volk 2020-10-31 01:15:57 -07:00
parent cd2a71d3c2
commit 231bcf3f95
2 changed files with 7 additions and 27 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

30
include/ircd/spirit/expectation_failure.h
View file

@ -15,10 +15,11 @@ namespace ircd {
namespace spirit
__attribute__((visibility("default")))
{
template<class parent_error> struct expectation_failure;
template<class parent_error>
struct expectation_failure;
// parse.cc
extern thread_local char rule_buffer[64];
extern thread_local char rule_buffer[128];
}}
template<class parent_error>
@ -28,12 +29,7 @@ ircd::spirit::expectation_failure
{
template<class it = const char *>
expectation_failure(const qi::expectation_failure<it> &e,
const ssize_t &show_max = 64);
template<class it = const char *>
expectation_failure(const qi::expectation_failure<it> &e,
const it &start,
const ssize_t &show_max = 64);
const ssize_t &show_max = 128);
};
template<class parent>
@ -42,25 +38,9 @@ ircd::spirit::expectation_failure<parent>::expectation_failure(const qi::expecta
const ssize_t &show_max)
:parent
{
"Expected %s. You input %zd invalid characters :%s",
"expected %s with %zu characters remaining '%s'...",
ircd::string(rule_buffer, e.what_),
std::distance(e.first, e.last),
string_view{e.first, e.first + std::min(std::distance(e.first, e.last), show_max)}
}
{}
template<class parent>
template<class it>
ircd::spirit::expectation_failure<parent>::expectation_failure(const qi::expectation_failure<it> &e,
const it &start,
const ssize_t &show_max)
:parent
{
"Expected %s. You input %zd invalid characters somewhere between position %zd and %zd :%s",
ircd::string(rule_buffer, e.what_),
std::distance(e.first, e.last),
std::distance(start, e.first),
std::distance(start, e.last),
string_view{e.first, e.first + std::min(std::distance(e.first, e.last), show_max)}
}
{}

4
include/ircd/spirit/parse.h
View file

@ -27,7 +27,7 @@ __attribute__((visibility("internal")))
bool parse(const char *&start, const char *const &stop, gen&&, attr&&...);
template<class parent_error,
size_t error_show_max = 48,
size_t error_show_max = 128,
class gen,
class... attr>
bool parse(const char *&start, const char *const &stop, gen&&, attr&&...);
@ -159,7 +159,7 @@ catch(const qi::expectation_failure<const char *> &e)
{
throw expectation_failure<parent_error>
{
e, start, error_show_max
e, error_show_max
};
}