zhangyiss/toml11
1
0
Fork 0
mirror of https://github.com/ToruNiina/toml11.git synced 2025-09-17 17:28:12 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

perf: check integer prefix before trying to parse

Browse Source 
all the parsers generate error messages and error message generation is
not a lightweight task. It concatenates a lot of strings, it formats
many values, etc. To avoid useless error-message generation, first check
which prefix is used and then parse special integers. Additionally, by
checking that, the quality of the error message can be improved (later).
This commit is contained in:
ToruNiina
2019-04-16 21:37:12 +09:00
parent 91966a6917
commit 4db486d76d
1 changed files with 22 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
toml/parser.hpp
View File

@@ -116,10 +116,28 @@ parse_integer(location<Container>& loc)
const auto first = loc.iter(); const auto first = loc.iter();
if(first != loc.end() && *first == '0') if(first != loc.end() && *first == '0')
{ {
if(const auto bin = parse_binary_integer (loc)) {return bin;} const auto second = std::next(first);
if(const auto oct = parse_octal_integer (loc)) {return oct;} if(second == loc.end()) // the token is just zero.
if(const auto hex = parse_hexadecimal_integer(loc)) {return hex;} {
// else, maybe just zero. return ok(std::make_pair(0, region<Container>(loc, first, second)));
}
if(*second == 'b') {return parse_binary_integer (loc);} // 0b1100
if(*second == 'o') {return parse_octal_integer (loc);} // 0o775
if(*second == 'x') {return parse_hexadecimal_integer(loc);} // 0xC0FFEE
if(std::isdigit(*second))
{
return err(format_underline("[error] toml::parse_integer: "
"leading zero in an Integer is not allowed.",
{{std::addressof(loc), "leading zero"}}));
}
else if(std::isalpha(*second))
{
return err(format_underline("[error] toml::parse_integer: "
"unknown integer prefix appeared.",
{{std::addressof(loc), "none of 0x, 0o, 0b"}}));
}
} }
if(const auto token = lex_dec_int::invoke(loc)) if(const auto token = lex_dec_int::invoke(loc))