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

Rename length_set_unknown -> length_set_unknown_chars

Browse source
This commit is contained in:
Max Brunsfeld 2016-10-16 21:21:53 -07:00
parent 44b0c96579
commit 5638fea120
2 changed files with 8 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

8
src/runtime/length.h
View file

@ -12,11 +12,11 @@ typedef struct {
TSPoint extent;
} TSLength;
static inline bool ts_length_is_unknown(TSLength self) {
static inline bool ts_length_has_unknown_chars(TSLength self) {
return self.bytes > 0 && self.chars == 0;
}
static inline void ts_length_set_unknown(TSLength *self) {
static inline void ts_length_set_unknown_chars(TSLength *self) {
self->chars = 0;
}
@ -30,7 +30,7 @@ static inline TSLength ts_length_add(TSLength len1, TSLength len2) {
result.bytes = len1.bytes + len2.bytes;
result.extent = ts_point_add(len1.extent, len2.extent);
if (ts_length_is_unknown(len1) || ts_length_is_unknown(len2)) {
if (ts_length_has_unknown_chars(len1) || ts_length_has_unknown_chars(len2)) {
result.chars = 0;
} else {
result.chars = len1.chars + len2.chars;
@ -44,7 +44,7 @@ static inline TSLength ts_length_sub(TSLength len1, TSLength len2) {
result.bytes = len1.bytes - len2.bytes;
result.extent = ts_point_sub(len1.extent, len2.extent);
if (ts_length_is_unknown(len1) || ts_length_is_unknown(len2)) {
if (ts_length_has_unknown_chars(len1) || ts_length_has_unknown_chars(len2)) {
result.chars = 0;
} else {
result.chars = len1.chars - len2.chars;

8
src/runtime/tree.c
View file

@ -320,14 +320,14 @@ void ts_tree_edit(TSTree *self, const TSInputEdit *edit) {
self->has_changes = true;
if (edit->start_byte < self->padding.bytes) {
ts_length_set_unknown(&self->padding);
ts_length_set_unknown_chars(&self->padding);
if (self->padding.bytes >= old_end_byte) {
size_t trailing_padding_bytes = self->padding.bytes - old_end_byte;
TSPoint trailing_padding_extent = ts_point_sub(self->padding.extent, old_end_point);
self->padding.bytes = new_end_byte + trailing_padding_bytes;
self->padding.extent = ts_point_add(new_end_point, trailing_padding_extent);
} else {
ts_length_set_unknown(&self->size);
ts_length_set_unknown_chars(&self->size);
size_t removed_content_bytes = old_end_byte - self->padding.bytes;
TSPoint removed_content_extent = ts_point_sub(old_end_point, self->padding.extent);
self->size.bytes = self->size.bytes - removed_content_bytes;
@ -336,11 +336,11 @@ void ts_tree_edit(TSTree *self, const TSInputEdit *edit) {
self->padding.extent = new_end_point;
}
} else if (edit->start_byte == self->padding.bytes && edit->bytes_removed == 0) {
ts_length_set_unknown(&self->padding);
ts_length_set_unknown_chars(&self->padding);
self->padding.bytes = self->padding.bytes + edit->bytes_added;
self->padding.extent = ts_point_add(self->padding.extent, edit->extent_added);
} else {
ts_length_set_unknown(&self->size);
ts_length_set_unknown_chars(&self->size);
size_t trailing_content_bytes = ts_tree_total_bytes(self) - old_end_byte;
TSPoint trailing_content_extent = ts_point_sub(ts_tree_total_extent(self), old_end_point);
self->size.bytes = new_end_byte + trailing_content_bytes - self->padding.bytes;