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

Add serialize, deserialize and reset callbacks to external scanners

Browse source 
Signed-off-by: Nathan Sobo <nathan@github.com>
This commit is contained in:
Max Brunsfeld 2016-12-20 13:12:01 -08:00 • committed by Nathan Sobo
parent 727727623a
commit 2b3da512a4
8 changed files with 74 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/compiler/generate_code/c_code.cc
View file

@ -356,6 +356,9 @@ class CCodeGenerator {
line("void *" + external_scanner_name + "_create();");
line("bool " + external_scanner_name + "_scan(void *, TSLexer *, const bool *);");
line("void " + external_scanner_name + "_reset(void *);");
line("bool " + external_scanner_name + "_serialize(void *, TSExternalTokenState);");
line("void " + external_scanner_name + "_deserialize(void *, TSExternalTokenState);");
line("void " + external_scanner_name + "_destroy();");
line();
@ -366,6 +369,9 @@ class CCodeGenerator {
indent([&]() {
line(external_scanner_name + "_create,");
line(external_scanner_name + "_scan,");
line(external_scanner_name + "_reset,");
line(external_scanner_name + "_serialize,");
line(external_scanner_name + "_deserialize,");
line(external_scanner_name + "_destroy,");
});
line(");");

24
src/runtime/node.c
View file

@ -39,7 +39,15 @@ static inline bool ts_node__is_relevant(TSNode self, bool include_anonymous) {
static inline uint32_t ts_node__relevant_child_count(TSNode self,
bool include_anonymous) {
const Tree *tree = ts_node__tree(self);
return include_anonymous ? tree->visible_child_count : tree->named_child_count;
if (tree->child_count > 0) {
if (include_anonymous) {
return tree->visible_child_count;
} else {
return tree->named_child_count;
}
} else {
return 0;
}
}
static inline TSNode ts_node__direct_parent(TSNode self, uint32_t *index) {
@ -324,11 +332,21 @@ TSNode ts_node_named_child(TSNode self, uint32_t child_index) {
}
uint32_t ts_node_child_count(TSNode self) {
return ts_node__tree(self)->visible_child_count;
const Tree *tree = ts_node__tree(self);
if (tree->child_count > 0) {
return tree->visible_child_count;
} else {
return 0;
}
}
uint32_t ts_node_named_child_count(TSNode self) {
return ts_node__tree(self)->named_child_count;
const Tree *tree = ts_node__tree(self);
if (tree->child_count > 0) {
return tree->named_child_count;
} else {
return 0;
}
}
TSNode ts_node_next_sibling(TSNode self) {

5
src/runtime/parser.c
View file

@ -752,8 +752,9 @@ static void parser__start(Parser *self, TSInput input, Tree *previous_tree) {
LOG("new_parse");
}
if (self->language->external_scanner.create)
self->language->external_scanner.create();
if (self->language->external_scanner.reset) {
self->language->external_scanner.reset(self->external_scanner_payload);
}
ts_lexer_set_input(&self->lexer, input);
ts_stack_clear(self->stack);

9
src/runtime/tree.h
View file

@ -22,10 +22,13 @@ typedef struct Tree {
} context;
uint32_t child_count;
uint32_t visible_child_count;
uint32_t named_child_count;
union {
struct Tree **children;
struct {
uint32_t visible_child_count;
uint32_t named_child_count;
struct Tree **children;
};
TSExternalTokenState external_token_state;
int32_t lookahead_char;
};