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

improve error message for invalid line

Browse Source 
like a = 12 = true, newline is expected after 12
This commit is contained in:
ToruNiina
2018-12-10 21:43:02 +09:00
parent ff83a6a477
commit 4e57c5f5df
1 changed files with 14 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
toml/parser.hpp
View File

@@ -1209,8 +1209,9 @@ result<table, std::string> parse_ml_table(location<Container>& loc)
return err(std::string("toml::parse_ml_table: input is empty")); return err(std::string("toml::parse_ml_table: input is empty"));
} }
// XXX at lest one newline is needed
using skip_line = repeat< using skip_line = repeat<
sequence<maybe<lex_ws>, maybe<lex_comment>, lex_newline>, unlimited>; sequence<maybe<lex_ws>, maybe<lex_comment>, lex_newline>, at_least<1>>;
skip_line::invoke(loc); skip_line::invoke(loc);
table tab; table tab;
@@ -1244,7 +1245,18 @@ result<table, std::string> parse_ml_table(location<Container>& loc)
return err(kv.unwrap_err()); return err(kv.unwrap_err());
} }
skip_line::invoke(loc); const auto newline = skip_line::invoke(loc);
if(!newline && loc.iter() != loc.end())
{
const auto before = loc.iter();
lex_ws::invoke(loc); // skip whitespace
const auto msg = format_underline("[error] toml::parse_table: "
"invalid line format", loc, concat_to_string(
"expected newline, but got '", show_char(*loc.iter()), "'."));
loc.iter() = before;
return err(msg);
}
// comment lines are skipped by the above function call. // comment lines are skipped by the above function call.
// However, if the file ends with comment without newline, // However, if the file ends with comment without newline,
// it might cause parsing error because skip_line matches // it might cause parsing error because skip_line matches