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

Consolidate TSInput interface down to one function

Browse source
This commit is contained in:
Max Brunsfeld 2018-06-19 09:34:40 -07:00
parent 2a507f0739
commit b0b3b2e5f3
8 changed files with 39 additions and 65 deletions
Download patch file Download diff file Expand all files Collapse all files

25
test/helpers/spy_input.cc
View file

@ -11,7 +11,6 @@ using std::vector;
SpyInput::SpyInput(string content, size_t chars_per_chunk) :
buffer(nullptr),
byte_offset(0),
chars_per_chunk(chars_per_chunk),
content(content),
encoding(TSInputEncodingUTF8),
@ -42,22 +41,23 @@ static void add_byte_range(vector<pair<uint32_t, uint32_t>> *ranges,
ranges->push_back({start, end});
}
const char * SpyInput::read(void *payload, uint32_t *bytes_read) {
const char *SpyInput::read(void *payload, uint32_t byte_offset,
TSPoint position, uint32_t *bytes_read) {
auto spy = static_cast<SpyInput *>(payload);
if (spy->byte_offset > spy->content.size()) {
if (byte_offset >= spy->content.size()) {
*bytes_read = 0;
return "";
}
long byte_count = string_byte_for_character(spy->encoding, spy->content, spy->byte_offset, spy->chars_per_chunk);
if (byte_count < 0)
byte_count = spy->content.size() - spy->byte_offset;
long byte_count = string_byte_for_character(spy->encoding, spy->content, byte_offset, spy->chars_per_chunk);
if (byte_count < 0) {
byte_count = spy->content.size() - byte_offset;
}
string result = spy->content.substr(spy->byte_offset, byte_count);
string result = spy->content.substr(byte_offset, byte_count);
*bytes_read = byte_count;
add_byte_range(&spy->ranges_read, spy->byte_offset, byte_count);
spy->byte_offset += byte_count;
add_byte_range(&spy->ranges_read, byte_offset, byte_count);
/*
* This class stores its entire `content` in a contiguous buffer, but we want
@ -79,12 +79,6 @@ const char * SpyInput::read(void *payload, uint32_t *bytes_read) {
return spy->buffer;
}
int SpyInput::seek(void *payload, uint32_t byte, TSPoint position) {
auto spy = static_cast<SpyInput *>(payload);
spy->byte_offset = byte;
return 0;
}
vector<string> SpyInput::strings_read() const {
vector<string> result;
for (auto &range : ranges_read) {
@ -97,7 +91,6 @@ TSInput SpyInput::input() {
TSInput result;
result.payload = this;
result.encoding = encoding;
result.seek = seek;
result.read = read;
return result;
}

4
test/helpers/spy_input.h
View file

@ -13,11 +13,9 @@ struct SpyInputEdit {
class SpyInput {
char *buffer;
uint32_t byte_offset;
std::vector<SpyInputEdit> undo_stack;
static const char * read(void *, uint32_t *);
static int seek(void *, uint32_t, TSPoint);
static const char *read(void *, uint32_t, TSPoint, uint32_t *);
std::pair<std::string, TSPoint> swap_substr(size_t, size_t, std::string);
public:

10
test/runtime/parser_test.cc
View file

@ -630,15 +630,12 @@ describe("Parser", [&]() {
size_t read_count = 0;
TSInput infinite_input = {
&read_count,
[](void *payload, uint32_t *bytes_read) {
[](void *payload, uint32_t byte, TSPoint position, uint32_t *bytes_read) {
size_t *read_count = static_cast<size_t *>(payload);
assert((*read_count)++ < 100000);
*bytes_read = 1;
return "[";
},
[](void *payload, unsigned byte, TSPoint position) -> int {
return true;
},
TSInputEncodingUTF8
};
@ -681,15 +678,12 @@ describe("Parser", [&]() {
// it has been read.
TSInput infinite_input = {
&state,
[](void *payload, uint32_t *bytes_read) {
[](void *payload, uint32_t byte, TSPoint position, uint32_t *bytes_read) {
InputState *state = static_cast<InputState *>(payload);
assert(state->read_count++ <= 10);
*bytes_read = strlen(state->string);
return state->string;
},
[](void *payload, unsigned byte, TSPoint position) -> int {
return true;
},
TSInputEncodingUTF8
};