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

skip whitespace before/inside/after dotted-keys

Browse Source
This commit is contained in:
ToruNiina
2018-12-12 01:30:47 +09:00
parent 765ab97d8b
commit a1a81089c5
1 changed files with 9 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
toml/parser.hpp
View File

@@ -784,7 +784,7 @@ template<typename Container>
result<std::vector<key>, std::string> parse_key(location<Container>& loc) result<std::vector<key>, std::string> parse_key(location<Container>& loc)
{ {
const auto first = loc.iter(); const auto first = loc.iter();
// dotted key -> foo.bar.baz // dotted key -> foo.bar.baz whitespaces are allowed
if(const auto token = lex_dotted_key::invoke(loc)) if(const auto token = lex_dotted_key::invoke(loc))
{ {
location<std::string> inner_loc(loc.name(), token.unwrap().str()); location<std::string> inner_loc(loc.name(), token.unwrap().str());
@@ -792,6 +792,7 @@ result<std::vector<key>, std::string> parse_key(location<Container>& loc)
while(inner_loc.iter() != inner_loc.end()) while(inner_loc.iter() != inner_loc.end())
{ {
lex_ws::invoke(inner_loc);
if(const auto k = parse_simple_key(inner_loc)) if(const auto k = parse_simple_key(inner_loc))
{ {
keys.push_back(k.unwrap()); keys.push_back(k.unwrap());
@@ -803,6 +804,7 @@ result<std::vector<key>, std::string> parse_key(location<Container>& loc)
inner_loc, k.unwrap_err())); inner_loc, k.unwrap_err()));
} }
lex_ws::invoke(inner_loc);
if(inner_loc.iter() == inner_loc.end()) if(inner_loc.iter() == inner_loc.end())
{ {
break; break;
@@ -1173,12 +1175,18 @@ parse_table_key(location<Container>& loc)
throw internal_error(format_underline("[error] " throw internal_error(format_underline("[error] "
"toml::parse_table_key: no `[`", inner_loc, "should be `[`")); "toml::parse_table_key: no `[`", inner_loc, "should be `[`"));
} }
// to skip [ a . b . c ]
// ^----------- this whitespace
lex_ws::invoke(inner_loc);
const auto keys = parse_key(inner_loc); const auto keys = parse_key(inner_loc);
if(!keys) if(!keys)
{ {
throw internal_error(format_underline("[error] " throw internal_error(format_underline("[error] "
"toml::parse_table_key: invalid key", inner_loc, "not key")); "toml::parse_table_key: invalid key", inner_loc, "not key"));
} }
// to skip [ a . b . c ]
// ^-- this whitespace
lex_ws::invoke(inner_loc);
const auto close = lex_std_table_close::invoke(inner_loc); const auto close = lex_std_table_close::invoke(inner_loc);
if(!close) if(!close)
{ {