organicmaps/pugixml
13
Fork 0
Code Issues 1 Pull requests Projects Releases Wiki Activity Actions

XPath: Improve error message for expressions like .[1]

Browse source 
W3C specification does not allow predicates after abbreviated steps.
Currently this results in parsing terminating at the step, which leads
to confusing error messages like "Invalid query" or "Unmatched braces".
This commit is contained in:
Arseny Kapoulkine 2017-01-30 08:54:09 -08:00
parent bc1e444694
commit 1ed6d2102b
1 changed files with 6 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/pugixml.cpp
View file

@ -11398,12 +11398,18 @@ PUGI__NS_BEGIN
{
_lexer.next();
if (_lexer.current() == lex_open_square_brace)
return error("Predicates are not allowed after an abbreviated step");
return alloc_node(ast_step, set, axis_self, nodetest_type_node, 0);
}
else if (_lexer.current() == lex_double_dot)
{
_lexer.next();
if (_lexer.current() == lex_open_square_brace)
return error("Predicates are not allowed after an abbreviated step");
return alloc_node(ast_step, set, axis_parent, nodetest_type_node, 0);
}