AuroraMiddleware/toml11
1
0
Fork 0
mirror of https://github.com/ToruNiina/toml11.git synced 2024-11-22 12:30:04 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: disallow trailing comma in an inline table

Browse Source
This commit is contained in:
ToruNiina 2021-06-27 18:54:28 +09:00
parent cf9e86a84f
commit 0dc51f95d9
1 changed files with 21 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
toml/parser.hpp
View File

@ -1497,17 +1497,18 @@ parse_inline_table(location& loc)
{{source_location(loc), "the next token is not an inline table"}}));
}
loc.advance();
// check if the inline table is an empty table = { }
maybe<lex_ws>::invoke(loc);
if(loc.iter() != loc.end() && *loc.iter() == '}')
{
loc.advance(); // skip `}`
return ok(std::make_pair(retval, region(loc, first, loc.iter())));
}
// it starts from "{". it should be formatted as inline-table
while(loc.iter() != loc.end())
{
maybe<lex_ws>::invoke(loc);
if(loc.iter() != loc.end() && *loc.iter() == '}')
{
loc.advance(); // skip `}`
return ok(std::make_pair(retval,
region(loc, first, loc.iter())));
}
const auto kv_r = parse_key_value_pair<value_type>(loc);
if(!kv_r)
{
@ -1563,6 +1564,18 @@ parse_inline_table(location& loc)
source_location(loc));
}
}
else // `,` is found
{
maybe<lex_ws>::invoke(loc);
if(loc.iter() != loc.end() && *loc.iter() == '}')
{
throw syntax_error(format_underline(
"toml::parse_inline_table: trailing comma is not allowed in"
" an inline table",
{{source_location(loc), "should be `}`"}}),
source_location(loc));
}
}
}
loc.reset(first);
throw syntax_error(format_underline("toml::parse_inline_table: "