Skip to content

Commit

Permalink
refactor: remove unnecessary header files
Browse files Browse the repository at this point in the history
  • Loading branch information
ObserverOfTime committed May 18, 2024
1 parent d694939 commit 8042a8f
Show file tree
Hide file tree
Showing 21 changed files with 76 additions and 371 deletions.
2 changes: 1 addition & 1 deletion MANIFEST.in
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
include tree_sitter/binding/*.h
include tree_sitter/binding/types.h

prune tree_sitter/core
graft tree_sitter/core/lib/src
Expand Down
13 changes: 0 additions & 13 deletions tree_sitter/binding/docs.h

This file was deleted.

2 changes: 1 addition & 1 deletion tree_sitter/binding/language.c
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#include "language.h"
#include "types.h"

int language_init(Language *self, PyObject *args, PyObject *Py_UNUSED(kwargs)) {
PyObject *language;
Expand Down
43 changes: 0 additions & 43 deletions tree_sitter/binding/language.h

This file was deleted.

3 changes: 1 addition & 2 deletions tree_sitter/binding/lookahead_iterator.c
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
#include "lookahead_iterator.h"
#include "language.h"
#include "types.h"

void lookahead_iterator_dealloc(LookaheadIterator *self) {
if (self->lookahead_iterator) {
Expand Down
23 changes: 0 additions & 23 deletions tree_sitter/binding/lookahead_iterator.h

This file was deleted.

2 changes: 1 addition & 1 deletion tree_sitter/binding/lookahead_names_iterator.c
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#include "lookahead_names_iterator.h"
#include "types.h"

PyObject *lookahead_names_iterator_repr(LookaheadNamesIterator *self) {
return PyUnicode_FromFormat("<LookaheadNamesIterator %p>", self->lookahead_iterator);
Expand Down
11 changes: 0 additions & 11 deletions tree_sitter/binding/lookahead_names_iterator.h

This file was deleted.

2 changes: 1 addition & 1 deletion tree_sitter/binding/node.c
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#include "node.h"
#include "types.h"

PyObject *node_new_internal(ModuleState *state, TSNode node, PyObject *tree) {
Node *self = PyObject_New(Node, state->node_type);
Expand Down
103 changes: 0 additions & 103 deletions tree_sitter/binding/node.h

This file was deleted.

64 changes: 34 additions & 30 deletions tree_sitter/binding/parser.c
Original file line number Diff line number Diff line change
@@ -1,10 +1,14 @@
#include "parser.h"

#include <string.h>
#include "types.h"

#define SET_ATTRIBUTE_ERROR(name) \
(name != NULL && name != Py_None && parser_set_##name(self, name, NULL) < 0)

typedef struct {
PyObject *read_cb;
PyObject *previous_return_value;
ModuleState *state;
} ReadWrapperPayload;

PyObject *parser_new(PyTypeObject *cls, PyObject *Py_UNUSED(args), PyObject *Py_UNUSED(kwargs)) {
Parser *self = (Parser *)cls->tp_alloc(cls, 0);
if (self != NULL) {
Expand All @@ -14,33 +18,6 @@ PyObject *parser_new(PyTypeObject *cls, PyObject *Py_UNUSED(args), PyObject *Py_
return (PyObject *)self;
}

int parser_init(Parser *self, PyObject *args, PyObject *kwargs) {
ModuleState *state = GET_MODULE_STATE(self);
PyObject *language = NULL, *included_ranges = NULL, *timeout_micros = NULL;
char *keywords[] = {
"language",
"included_ranges",
"timeout_micros",
NULL,
};
if (!PyArg_ParseTupleAndKeywords(args, kwargs, "|O!$OO:__init__", keywords,
state->language_type, &language, &included_ranges,
&timeout_micros)) {
return -1;
}

if (SET_ATTRIBUTE_ERROR(language)) {
return -1;
}
if (SET_ATTRIBUTE_ERROR(included_ranges)) {
return -1;
}
if (SET_ATTRIBUTE_ERROR(timeout_micros)) {
return -1;
}
return 0;
}

void parser_dealloc(Parser *self) {
ts_parser_delete(self->parser);
Py_XDECREF(self->language);
Expand Down Expand Up @@ -374,6 +351,33 @@ PyObject *parser_set_language_old(Parser *self, PyObject *arg) {
Py_RETURN_NONE;
}

int parser_init(Parser *self, PyObject *args, PyObject *kwargs) {
ModuleState *state = GET_MODULE_STATE(self);
PyObject *language = NULL, *included_ranges = NULL, *timeout_micros = NULL;
char *keywords[] = {
"language",
"included_ranges",
"timeout_micros",
NULL,
};
if (!PyArg_ParseTupleAndKeywords(args, kwargs, "|O!$OO:__init__", keywords,
state->language_type, &language, &included_ranges,
&timeout_micros)) {
return -1;
}

if (SET_ATTRIBUTE_ERROR(language)) {
return -1;
}
if (SET_ATTRIBUTE_ERROR(included_ranges)) {
return -1;
}
if (SET_ATTRIBUTE_ERROR(timeout_micros)) {
return -1;
}
return 0;
}

PyDoc_STRVAR(
parser_parse_doc,
"parse(self, source, /, old_tree=None, encoding=\"utf8\", keep_text=True)\n--\n\n"
Expand Down
37 changes: 0 additions & 37 deletions tree_sitter/binding/parser.h

This file was deleted.

25 changes: 14 additions & 11 deletions tree_sitter/binding/query.c
Original file line number Diff line number Diff line change
@@ -1,5 +1,8 @@
#include "query.h"
#include "node.h"
#include "types.h"

PyObject *node_new_internal(ModuleState *state, TSNode node, PyObject *tree);

PyObject *node_get_text(Node *self, void *payload);

// QueryCapture {{{

Expand Down Expand Up @@ -298,6 +301,15 @@ static inline bool is_list_capture(TSQuery *query, TSQueryMatch *match,
return quantifier == TSQuantifierZeroOrMore || quantifier == TSQuantifierOneOrMore;
}

void query_dealloc(Query *self) {
if (self->query) {
ts_query_delete(self->query);
}
Py_XDECREF(self->capture_names);
Py_XDECREF(self->text_predicates);
Py_TYPE(self)->tp_free(self);
}

PyObject *query_new(PyTypeObject *cls, PyObject *args, PyObject *Py_UNUSED(kwargs)) {
Query *query = (Query *)cls->tp_alloc(cls, 0);
if (query == NULL) {
Expand Down Expand Up @@ -475,15 +487,6 @@ PyObject *query_new(PyTypeObject *cls, PyObject *args, PyObject *Py_UNUSED(kwarg
return NULL;
}

void query_dealloc(Query *self) {
if (self->query) {
ts_query_delete(self->query);
}
Py_XDECREF(self->capture_names);
Py_XDECREF(self->text_predicates);
Py_TYPE(self)->tp_free(self);
}

PyObject *query_matches(Query *self, PyObject *args, PyObject *kwargs) {
ModuleState *state = GET_MODULE_STATE(self);
char *keywords[] = {
Expand Down
Loading

0 comments on commit 8042a8f

Please sign in to comment.