traxys/tree-sitter
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Include names of in-progress rules in shift/reduce conflicts

Browse source
This commit is contained in:
Max Brunsfeld 2014-11-05 18:39:50 -08:00
parent ec31249fe6
commit 5dc08ccce9
14 changed files with 426 additions and 295 deletions
Download patch file Download diff file Expand all files Collapse all files

3
src/runtime/parser.c
View file

@ -106,8 +106,7 @@ static TSTree *break_down_right_stack(TSParser *parser) {
TSParseAction action = get_action(parser->language, state, node->symbol);
bool is_usable = (action.type != TSParseActionTypeError) &&
!ts_tree_has_error(node) &&
!ts_tree_is_extra(node);
!ts_tree_has_error(node) && !ts_tree_is_extra(node);
if (is_usable && right_subtree_start == current_position.chars) {
ts_stack_shrink(&parser->right_stack, parser->right_stack.size - 1);
return node;