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

Rename type ts_tree -> TSTree

Browse source
This commit is contained in:
Max Brunsfeld 2014-06-28 18:45:22 -07:00
parent 2795078633
commit 5f59de72a8
16 changed files with 120 additions and 120 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/runtime/document.c
View file

@ -3,7 +3,7 @@
struct TSDocument {
ts_parser parser;
const ts_tree *tree;
const TSTree *tree;
ts_input input;
size_t error_count;
};
@ -24,7 +24,7 @@ void ts_document_set_parser(TSDocument *document, ts_parser parser) {
document->parser = parser;
}
const ts_tree * ts_document_tree(const TSDocument *document) {
const TSTree * ts_document_tree(const TSDocument *document) {
return document->tree;
}
@ -41,7 +41,7 @@ void ts_document_edit(TSDocument *document, ts_input_edit edit) {
document->tree = document->parser.parse_fn(document->parser.data, document->input, &edit);
}
const char * ts_document_symbol_name(const TSDocument *document, const ts_tree *tree) {
const char * ts_document_symbol_name(const TSDocument *document, const TSTree *tree) {
return document->parser.symbol_names[ts_tree_symbol(tree)];
}

22
src/runtime/lr_parser.c
View file

@ -32,19 +32,19 @@ static size_t breakdown_stack(ts_lr_parser *parser, ts_input_edit *edit) {
size_t position = 0;
for (;;) {
ts_tree *node = ts_stack_top_node(stack);
TSTree *node = ts_stack_top_node(stack);
if (!node) break;
position = ts_stack_right_position(stack);
size_t child_count;
ts_tree **children = ts_tree_immediate_children(node, &child_count);
TSTree **children = ts_tree_immediate_children(node, &child_count);
if (position <= edit->position && !children) break;
stack->size--;
position -= ts_tree_total_size(node);
for (size_t i = 0; i < child_count && position < edit->position; i++) {
ts_tree *child = children[i];
TSTree *child = children[i];
ts_state_id state = ts_stack_top_state(stack);
ts_state_id next_state = actions_for_state(parser, state)[ts_tree_symbol(child)].data.to_state;
ts_stack_push(stack, next_state, child);
@ -77,7 +77,7 @@ ts_symbol * expected_symbols(ts_lr_parser *parser, size_t *count) {
int handle_error(ts_lr_parser *parser) {
size_t count = 0;
const ts_symbol *inputs = expected_symbols(parser, &count);
ts_tree *error = ts_tree_make_error(ts_lexer_lookahead_char(&parser->lexer),
TSTree *error = ts_tree_make_error(ts_lexer_lookahead_char(&parser->lexer),
count,
inputs,
0,
@ -117,20 +117,20 @@ int handle_error(ts_lr_parser *parser) {
}
}
ts_tree * get_tree_root(ts_lr_parser *parser) {
TSTree * get_tree_root(ts_lr_parser *parser) {
ts_stack *stack = &parser->stack;
ts_tree *top_node = ts_stack_top_node(stack);
TSTree *top_node = ts_stack_top_node(stack);
if (stack->size <= 1)
return top_node;
if (ts_tree_symbol(top_node) == ts_builtin_sym_error)
return top_node;
size_t immediate_child_count;
ts_tree **immedate_children = ts_tree_immediate_children(top_node, &immediate_child_count);
TSTree **immedate_children = ts_tree_immediate_children(top_node, &immediate_child_count);
stack->size--;
for (size_t i = 0; i < immediate_child_count; i++) {
ts_tree *child = immedate_children[i];
TSTree *child = immedate_children[i];
child->is_extra = 0;
ts_tree_retain(child);
ts_state_id state = ts_stack_top_state(stack);
@ -138,7 +138,7 @@ ts_tree * get_tree_root(ts_lr_parser *parser) {
ts_stack_push(stack, next_state, child);
}
ts_tree *new_node = ts_stack_reduce(stack,
TSTree *new_node = ts_stack_reduce(stack,
top_node->symbol,
stack->size,
parser->config.hidden_symbol_flags,
@ -161,7 +161,7 @@ ts_parse_action get_next_action(ts_lr_parser *parser) {
ts_lr_parser * ts_lr_parser_make(size_t symbol_count,
const ts_parse_action *parse_table,
const ts_state_id *lex_states,
ts_tree * (* lex_fn)(ts_lexer *, ts_state_id),
TSTree * (* lex_fn)(ts_lexer *, ts_state_id),
const int *hidden_symbol_flags) {
ts_lr_parser *result = malloc(sizeof(ts_lr_parser));
*result = (ts_lr_parser) {
@ -208,7 +208,7 @@ void ts_lr_parser_initialize(ts_lr_parser *parser, ts_input input, ts_input_edit
#define DEBUG_PARSE(...)
#endif
ts_tree * ts_lr_parser_parse(ts_lr_parser *parser, const char **symbol_names) {
TSTree * ts_lr_parser_parse(ts_lr_parser *parser, const char **symbol_names) {
ts_parse_action action = get_next_action(parser);
DEBUG_PARSE("LOOKAHEAD %s", symbol_names[ts_tree_symbol(parser->lookahead)]);
switch (action.type) {

24
src/runtime/stack.c
View file

@ -24,12 +24,12 @@ ts_state_id ts_stack_top_state(const ts_stack *stack) {
return stack->entries[stack->size - 1].state;
}
ts_tree * ts_stack_top_node(const ts_stack *stack) {
TSTree * ts_stack_top_node(const ts_stack *stack) {
if (stack->size == 0) return NULL;
return stack->entries[stack->size - 1].node;
}
void ts_stack_push(ts_stack *stack, ts_state_id state, ts_tree *node) {
void ts_stack_push(ts_stack *stack, ts_state_id state, TSTree *node) {
stack->entries[stack->size].state = state;
stack->entries[stack->size].node = node;
stack->size++;
@ -45,13 +45,13 @@ void ts_stack_shrink(ts_stack *stack, size_t new_size) {
size_t ts_stack_right_position(const ts_stack *stack) {
size_t result = 0;
for (size_t i = 0; i < stack->size; i++) {
ts_tree *node = stack->entries[i].node;
TSTree *node = stack->entries[i].node;
result += ts_tree_total_size(node);
}
return result;
}
ts_tree * ts_stack_reduce(ts_stack *stack,
TSTree * ts_stack_reduce(ts_stack *stack,
ts_symbol symbol,
size_t immediate_child_count,
const int *hidden_symbol_flags,
@ -66,9 +66,9 @@ ts_tree * ts_stack_reduce(ts_stack *stack,
int child_count = 0;
for (size_t i = 0; i < immediate_child_count; i++) {
size_t stack_index = stack->size - 1 - i;
ts_tree *child = stack->entries[stack_index].node;
TSTree *child = stack->entries[stack_index].node;
size_t grandchild_count;
ts_tree **grandchildren = ts_tree_children(child, &grandchild_count);
TSTree **grandchildren = ts_tree_children(child, &grandchild_count);
ts_symbol child_symbol = ts_tree_symbol(child);
collapse_flags[i] = (
@ -89,25 +89,25 @@ ts_tree * ts_stack_reduce(ts_stack *stack,
// We store the children and immediate children in the same array,
// to reduce allocations.
size_t child_index = child_count;
ts_tree **children = malloc((child_count + immediate_child_count) * sizeof(ts_tree *));
ts_tree **immediate_children = children + child_count;
TSTree **children = malloc((child_count + immediate_child_count) * sizeof(TSTree *));
TSTree **immediate_children = children + child_count;
for (size_t i = 0; i < immediate_child_count; i++) {
ts_tree *child = stack->entries[stack->size - 1 - i].node;
TSTree *child = stack->entries[stack->size - 1 - i].node;
immediate_children[immediate_child_count - 1 - i] = child;
if (collapse_flags[i]) {
size_t grandchild_count;
ts_tree **grandchildren = ts_tree_children(child, &grandchild_count);
TSTree **grandchildren = ts_tree_children(child, &grandchild_count);
child_index -= grandchild_count;
memcpy(children + child_index, grandchildren, (grandchild_count * sizeof(ts_tree *)));
memcpy(children + child_index, grandchildren, (grandchild_count * sizeof(TSTree *)));
} else {
child_index--;
children[child_index] = child;
}
}
ts_tree *lookahead = ts_tree_make_node(symbol, child_count, immediate_child_count, children);
TSTree *lookahead = ts_tree_make_node(symbol, child_count, immediate_child_count, children);
ts_stack_shrink(stack, stack->size - immediate_child_count);
return lookahead;
}

54
src/runtime/tree.c
View file

@ -3,9 +3,9 @@
#include <stdio.h>
#include "runtime/tree.h"
static ts_tree * ts_tree_make(ts_symbol symbol, size_t size, size_t offset) {
ts_tree *result = malloc(sizeof(ts_tree));
*result = (ts_tree) {
static TSTree * ts_tree_make(ts_symbol symbol, size_t size, size_t offset) {
TSTree *result = malloc(sizeof(TSTree));
*result = (TSTree) {
.ref_count = 1,
.symbol = symbol,
.size = size,
@ -14,19 +14,19 @@ static ts_tree * ts_tree_make(ts_symbol symbol, size_t size, size_t offset) {
return result;
}
ts_tree * ts_tree_make_leaf(ts_symbol symbol, size_t size, size_t offset) {
ts_tree *result = ts_tree_make(symbol, size, offset);
TSTree * ts_tree_make_leaf(ts_symbol symbol, size_t size, size_t offset) {
TSTree *result = ts_tree_make(symbol, size, offset);
result->data.children.count = 0;
result->data.children.immediate_count = 0;
result->data.children.contents = NULL;
return result;
}
ts_tree * ts_tree_make_node(ts_symbol symbol, size_t child_count, size_t immediate_child_count, ts_tree **children) {
ts_tree **immediate_children = children + child_count;
TSTree * ts_tree_make_node(ts_symbol symbol, size_t child_count, size_t immediate_child_count, TSTree **children) {
TSTree **immediate_children = children + child_count;
size_t size = 0, offset = 0;
for (size_t i = 0; i < immediate_child_count; i++) {
ts_tree *child = immediate_children[i];
TSTree *child = immediate_children[i];
ts_tree_retain(child);
if (i == 0) {
offset = ts_tree_offset(child);
@ -35,42 +35,42 @@ ts_tree * ts_tree_make_node(ts_symbol symbol, size_t child_count, size_t immedia
size += ts_tree_offset(child) + ts_tree_size(child);
}
}
ts_tree *result = ts_tree_make(symbol, size, offset);
TSTree *result = ts_tree_make(symbol, size, offset);
result->data.children.count = child_count;
result->data.children.immediate_count = immediate_child_count;
result->data.children.contents = children;
return result;
}
ts_tree * ts_tree_make_error(char lookahead_char, size_t expected_input_count, const ts_symbol *expected_inputs, size_t size, size_t offset) {
ts_tree *result = ts_tree_make(ts_builtin_sym_error, size, offset);
TSTree * ts_tree_make_error(char lookahead_char, size_t expected_input_count, const ts_symbol *expected_inputs, size_t size, size_t offset) {
TSTree *result = ts_tree_make(ts_builtin_sym_error, size, offset);
result->data.error.lookahead_char = lookahead_char;
result->data.error.expected_input_count = expected_input_count;
result->data.error.expected_inputs = expected_inputs;
return result;
}
ts_symbol ts_tree_symbol(const ts_tree *tree) {
ts_symbol ts_tree_symbol(const TSTree *tree) {
return tree->symbol;
}
void ts_tree_retain(ts_tree *tree) {
void ts_tree_retain(TSTree *tree) {
tree->ref_count++;
}
size_t ts_tree_offset(const ts_tree *tree) {
size_t ts_tree_offset(const TSTree *tree) {
return tree->offset;
}
size_t ts_tree_size(const ts_tree *tree) {
size_t ts_tree_size(const TSTree *tree) {
return tree->size;
}
size_t ts_tree_total_size(const ts_tree *tree) {
size_t ts_tree_total_size(const TSTree *tree) {
return ts_tree_offset(tree) + ts_tree_size(tree);
}
ts_tree ** ts_tree_immediate_children(const ts_tree *tree, size_t *count) {
TSTree ** ts_tree_immediate_children(const TSTree *tree, size_t *count) {
if (!tree || tree->symbol == ts_builtin_sym_error) {
if (count) *count = 0;
return NULL;
@ -79,11 +79,11 @@ ts_tree ** ts_tree_immediate_children(const ts_tree *tree, size_t *count) {
return tree->data.children.contents + tree->data.children.count;
}
void ts_tree_release(ts_tree *tree) {
void ts_tree_release(TSTree *tree) {
tree->ref_count--;
if (tree->ref_count == 0) {
size_t count;
ts_tree **children = ts_tree_immediate_children(tree, &count);
TSTree **children = ts_tree_immediate_children(tree, &count);
for (size_t i = 0; i < count; i++)
ts_tree_release(children[i]);
free(tree->data.children.contents);
@ -91,14 +91,14 @@ void ts_tree_release(ts_tree *tree) {
}
}
int ts_tree_equals(const ts_tree *node1, const ts_tree *node2) {
int ts_tree_equals(const TSTree *node1, const TSTree *node2) {
if (node1->symbol != node2->symbol) return 0;
if (node1->symbol == ts_builtin_sym_error) {
// check error equality
} else {
size_t count1, count2;
ts_tree **children1 = ts_tree_children(node1, &count1);
ts_tree **children2 = ts_tree_children(node2, &count2);
TSTree **children1 = ts_tree_children(node1, &count1);
TSTree **children2 = ts_tree_children(node2, &count2);
if (count1 != count2) return 0;
for (size_t i = 0; i < count1; i++)
if (!ts_tree_equals(children1[i], children2[i])) return 0;
@ -106,7 +106,7 @@ int ts_tree_equals(const ts_tree *node1, const ts_tree *node2) {
return 1;
}
ts_tree ** ts_tree_children(const ts_tree *tree, size_t *count) {
TSTree ** ts_tree_children(const TSTree *tree, size_t *count) {
if (!tree || tree->symbol == ts_builtin_sym_error) {
if (count) *count = 0;
return NULL;
@ -124,7 +124,7 @@ static size_t write_lookahead_to_string(char *string, size_t limit, char lookahe
}
}
static size_t tree_write_to_string(const ts_tree *tree, const char **symbol_names, char *string, size_t limit) {
static size_t tree_write_to_string(const TSTree *tree, const char **symbol_names, char *string, size_t limit) {
char *cursor = string;
char **destination = (limit > 0) ? &cursor : &string;
@ -139,7 +139,7 @@ static size_t tree_write_to_string(const ts_tree *tree, const char **symbol_name
cursor += snprintf(*destination, limit, "(%s", symbol_names[tree->symbol]);
size_t count;
ts_tree **children = ts_tree_children(tree, &count);
TSTree **children = ts_tree_children(tree, &count);
for (size_t i = 0; i < count; i++) {
cursor += snprintf(*destination, limit, " ");
cursor += tree_write_to_string(children[i], symbol_names, *destination, limit);
@ -149,7 +149,7 @@ static size_t tree_write_to_string(const ts_tree *tree, const char **symbol_name
return cursor - string;
}
char * ts_tree_string(const ts_tree *tree, const char **symbol_names) {
char * ts_tree_string(const TSTree *tree, const char **symbol_names) {
static char SCRATCH_STRING[1];
size_t size = tree_write_to_string(tree, symbol_names, SCRATCH_STRING, 0) + 1;
char *result = malloc(size * sizeof(char));
@ -157,6 +157,6 @@ char * ts_tree_string(const ts_tree *tree, const char **symbol_names) {
return result;
}
char * ts_tree_error_string(const ts_tree *tree, const char **symbol_names) {
char * ts_tree_error_string(const TSTree *tree, const char **symbol_names) {
return NULL;
}

4
src/runtime/tree.h
View file

@ -3,7 +3,7 @@
#include "tree_sitter/runtime.h"
struct ts_tree {
struct TSTree {
ts_symbol symbol;
size_t ref_count;
size_t offset;
@ -13,7 +13,7 @@ struct ts_tree {
struct {
size_t count;
size_t immediate_count;
struct ts_tree **contents;
struct TSTree **contents;
} children;
struct {
char lookahead_char;