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

Merge pull request #1884 from mattmassicotte/fix/subtree-and-query-integer-sizing

Browse source 
lib: fix subtree and query integer sizing
This commit is contained in:
Andrew Hlynskyi 2023-04-04 18:33:16 +03:00 • committed by GitHub
commit 550bf4c9a8
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 13 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

22
lib/src/query.c
View file

@ -331,7 +331,7 @@ static bool stream_advance(Stream *self) {
if (self->input < self->end) {
uint32_t size = ts_decode_utf8(
(const uint8_t *)self->input,
self->end - self->input,
(uint32_t)(self->end - self->input),
&self->next
);
if (size > 0) {
@ -398,7 +398,7 @@ static void stream_scan_identifier(Stream *stream) {
}
static uint32_t stream_offset(Stream *self) {
return self->input - self->start;
return (uint32_t)(self->input - self->start);
}
/******************
@ -2064,7 +2064,7 @@ static TSQueryError ts_query__parse_predicate(
if (!stream_is_ident_start(stream)) return TSQueryErrorSyntax;
const char *predicate_name = stream->input;
stream_scan_identifier(stream);
uint32_t length = stream->input - predicate_name;
uint32_t length = (uint32_t)(stream->input - predicate_name);
uint16_t id = symbol_table_insert_name(
&self->predicate_values,
predicate_name,
@ -2095,7 +2095,7 @@ static TSQueryError ts_query__parse_predicate(
if (!stream_is_ident_start(stream)) return TSQueryErrorSyntax;
const char *capture_name = stream->input;
stream_scan_identifier(stream);
uint32_t length = stream->input - capture_name;
uint32_t length = (uint32_t)(stream->input - capture_name);
// Add the capture id to the first step of the pattern
int capture_id = symbol_table_id_for_name(
@ -2133,7 +2133,7 @@ static TSQueryError ts_query__parse_predicate(
else if (stream_is_ident_start(stream)) {
const char *symbol_start = stream->input;
stream_scan_identifier(stream);
uint32_t length = stream->input - symbol_start;
uint32_t length = (uint32_t)(stream->input - symbol_start);
uint16_t id = symbol_table_insert_name(
&self->predicate_values,
symbol_start,
@ -2302,7 +2302,7 @@ static TSQueryError ts_query__parse_pattern(
if (stream_is_ident_start(stream)) {
const char *node_name = stream->input;
stream_scan_identifier(stream);
uint32_t length = stream->input - node_name;
uint32_t length = (uint32_t)(stream->input - node_name);
// TODO - remove.
// For temporary backward compatibility, handle predicates without the leading '#' sign.
@ -2353,7 +2353,7 @@ static TSQueryError ts_query__parse_pattern(
const char *node_name = stream->input;
stream_scan_identifier(stream);
uint32_t length = stream->input - node_name;
uint32_t length = (uint32_t)(stream->input - node_name);
step->symbol = ts_language_symbol_for_name(
self->language,
@ -2386,7 +2386,7 @@ static TSQueryError ts_query__parse_pattern(
}
const char *field_name = stream->input;
stream_scan_identifier(stream);
uint32_t length = stream->input - field_name;
uint32_t length = (uint32_t)(stream->input - field_name);
stream_skip_whitespace(stream);
TSFieldId field_id = ts_language_field_id_for_name(
@ -2497,7 +2497,7 @@ static TSQueryError ts_query__parse_pattern(
// Parse the field name
const char *field_name = stream->input;
stream_scan_identifier(stream);
uint32_t length = stream->input - field_name;
uint32_t length = (uint32_t)(stream->input - field_name);
stream_skip_whitespace(stream);
if (stream->next != ':') {
@ -2616,7 +2616,7 @@ static TSQueryError ts_query__parse_pattern(
if (!stream_is_ident_start(stream)) return TSQueryErrorSyntax;
const char *capture_name = stream->input;
stream_scan_identifier(stream);
uint32_t length = stream->input - capture_name;
uint32_t length = (uint32_t)(stream->input - capture_name);
stream_skip_whitespace(stream);
// Add the capture id to the first step of the pattern
@ -3323,7 +3323,7 @@ static QueryState *ts_query_cursor__copy_state(
QueryState **state_ref
) {
const QueryState *state = *state_ref;
uint32_t state_index = state - self->states.contents;
uint32_t state_index = (uint32_t)(state - self->states.contents);
QueryState copy = *state;
copy.capture_list_id = NONE;

4
lib/src/subtree.c
View file

@ -348,7 +348,7 @@ void ts_subtree_balance(Subtree self, SubtreePool *pool, const TSLanguage *langu
Subtree child2 = ts_subtree_children(tree)[tree.ptr->child_count - 1];
long repeat_delta = (long)ts_subtree_repeat_depth(child1) - (long)ts_subtree_repeat_depth(child2);
if (repeat_delta > 0) {
unsigned n = repeat_delta;
unsigned n = (unsigned)repeat_delta;
for (unsigned i = n / 2; i > 0; i /= 2) {
ts_subtree__compress(tree, i, language, &pool->tree_stack);
n -= i;
@ -513,7 +513,7 @@ MutableSubtree ts_subtree_new_node(
size_t new_byte_size = ts_subtree_alloc_size(children->size);
if (children->capacity * sizeof(Subtree) < new_byte_size) {
children->contents = ts_realloc(children->contents, new_byte_size);
children->capacity = new_byte_size / sizeof(Subtree);
children->capacity = (uint32_t)(new_byte_size / sizeof(Subtree));
}
SubtreeHeapData *data = (SubtreeHeapData *)&children->contents[children->size];