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

improve error message for empty value

Browse Source
This commit is contained in:
ToruNiina
2018-12-13 20:37:40 +09:00
parent e86777d19c
commit 57de57a1de
1 changed files with 15 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
toml/parser.hpp
View File

@@ -954,11 +954,25 @@ parse_key_value_pair(location<Container>& loc)
return err(std::move(msg)); return err(std::move(msg));
} }
const auto after_kvsp = loc.iter(); // err msg
auto val = parse_value(loc); auto val = parse_value(loc);
if(!val) if(!val)
{ {
std::string msg;
loc.iter() = after_kvsp;
if(sequence<maybe<lex_ws>, maybe<lex_comment>, lex_newline>::invoke(loc))
{
loc.iter() = after_kvsp;
msg = format_underline("[error] toml::parse_key_value_pair: "
"missing value after key-value separator '='", loc,
"expected value, but got nothing");
}
else
{
msg = val.unwrap_err();
}
loc.iter() = first; loc.iter() = first;
return err(val.unwrap_err()); return err(msg);
} }
return ok(std::make_pair(std::move(key.unwrap()), std::move(val.unwrap()))); return ok(std::make_pair(std::move(key.unwrap()), std::move(val.unwrap())));
} }