Reformat/cleanup

This commit is contained in:
2026-07-28 03:00:15 +01:00
parent 57dda2589e
commit 92f59cbb86
2 changed files with 8 additions and 11 deletions
-1
View File
@@ -2,7 +2,6 @@
#include "buffer.h"
#include "pch.h"
#include <cstdint>
struct AppendBuffer : Buffer {
static constexpr uint32_t CHUNK_SIZE = 1 << 16;
+8 -10
View File
@@ -1,5 +1,4 @@
#include "vase/buffer/append.h"
#include <cstdint>
AppendBuffer::AppendBuffer() {
new_text_chunk();
@@ -16,7 +15,9 @@ AppendBuffer::~AppendBuffer() {
inline void AppendBuffer::key(char c) {
if (t_offset == CHUNK_SIZE)
new_text_chunk();
(*t_current)[t_offset++] = c;
if (c == '\n') {
if (l_offset == CHUNK_SIZE)
new_line_chunk();
@@ -28,12 +29,15 @@ inline void AppendBuffer::key(char c) {
void AppendBuffer::append(const char *text, uint32_t length) {
while (length) {
uint32_t space = CHUNK_SIZE - t_offset;
if (space == 0) {
new_text_chunk();
space = CHUNK_SIZE;
}
uint32_t copy = length < space ? length : space;
_append(text, copy);
text += copy;
length -= copy;
}
@@ -42,12 +46,15 @@ void AppendBuffer::append(const char *text, uint32_t length) {
const char *AppendBuffer::read(uint32_t pos, uint32_t *out_len) {
if (pos >= current_offset)
return nullptr;
uint32_t local_offset = pos % CHUNK_SIZE;
if (out_len) {
uint32_t remaining = current_offset - pos;
uint32_t until_chunk_end = CHUNK_SIZE - local_offset;
*out_len = std::min(remaining, until_chunk_end);
}
return &(*buf[pos / CHUNK_SIZE])[local_offset];
}
@@ -57,15 +64,12 @@ uint32_t AppendBuffer::find_newline(uint32_t target, uint32_t low, uint32_t high
uint32_t first_chunk = low / CHUNK_SIZE;
uint32_t last_chunk = (high - 1) / CHUNK_SIZE;
uint32_t left = first_chunk;
uint32_t right = last_chunk;
while (left < right) {
uint32_t mid = left + (right - left) / 2;
uint32_t first_value = (*newlines[mid])[0];
if (first_value < target)
left = mid + 1;
else
@@ -73,28 +77,22 @@ uint32_t AppendBuffer::find_newline(uint32_t target, uint32_t low, uint32_t high
}
uint32_t chunk = left;
if (chunk > first_chunk) {
LChunk &prev = *newlines[chunk - 1];
uint32_t prev_size =
(chunk - 1 == newlines.size() - 1) ? l_offset : CHUNK_SIZE;
if (prev[prev_size - 1] >= target)
chunk--;
}
LChunk &c = *newlines[chunk];
uint32_t chunk_size =
(chunk == newlines.size() - 1) ? l_offset : CHUNK_SIZE;
uint32_t l = 0;
uint32_t r = chunk_size;
while (l < r) {
uint32_t m = l + (r - l) / 2;
if (c[m] < target)
l = m + 1;
else