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

Fix incremental parsing

Browse source 
Stop collapsing hidden symbols upon reducing them.
Sadly, this messes up the ability to re-use parse
trees. Instead, for now, hide these nodes when
stringifying parse trees
This commit is contained in:
Max Brunsfeld 2014-03-19 19:27:31 -07:00
parent 7e94a4f1b2
commit fbe8b0a905
8 changed files with 89 additions and 68 deletions
Download patch file Download diff file Expand all files Collapse all files

38
include/tree_sitter/parser.h
View file

@ -269,30 +269,44 @@ static ts_lr_parser * ts_lr_parser_make() {
return result;
}
// static const char * ts_symbol_names[];
// static void dump_stack(ts_lr_parser *parser) {
// for (size_t i = 0; i < parser->stack.size; i++) {
// printf("\n%ld %s", i, ts_symbol_names[parser->stack.entries[i].node->symbol]);
// }
// }
static size_t ts_lr_parser_breakdown_stack(ts_lr_parser *parser, ts_input_edit *edit) {
if (parser->stack.size == 0) return 0;
ts_tree *node = ts_stack_top_node(&parser->stack);
parser->stack.size--;
state_id parse_state = 0;
size_t position = 0;
size_t left_position = 0;
size_t right_position = node->offset + node->size;
size_t child_count;
ts_tree ** children = ts_tree_children(node, &child_count);
for (size_t i = 0; i < child_count; i++) {
ts_tree *child = children[i];
position += child->offset + child->size;
ts_tree_retain(child);
ts_stack_push(&parser->stack, parse_state, child);
parse_state = ts_parse_actions[parse_state][child->symbol].data.to_state;
while (right_position > edit->position || children) {
parser->stack.size--;
ts_tree *child;
for (size_t i = 0; i < child_count; i++) {
child = children[i];
right_position = left_position + child->offset + child->size;
ts_tree_retain(child);
state_id parse_state = ts_parse_actions[ts_stack_top_state(&parser->stack)][child->symbol].data.to_state;
ts_stack_push(&parser->stack, parse_state, child);
if (right_position >= edit->position) break;
left_position = right_position;
}
ts_tree_release(node);
node = child;
children = ts_tree_children(node, &child_count);
}
ts_tree_release(node);
return position;
return right_position;
}
static void ts_lr_parser_initialize(ts_lr_parser *parser, ts_input input, ts_input_edit *edit) {
if (!edit) ts_stack_shrink(&parser->stack, 0);
parser->lookahead = NULL;
parser->next_lookahead = NULL;