josh/jes
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

introduce a PieceTable::Change structure to record changes

Browse Source
This commit is contained in:
Josh Holtrop 2016-09-26 22:30:41 -04:00
parent 0a1bb6eb92
commit 249fd87067
2 changed files with 39 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

47
src/core/PieceTable.cc
View File

@ -11,6 +11,7 @@ PieceTable::PieceTable(const uint8_t * file_buffer, unsigned long file_buffer_si
m_piece_index = 2u; m_piece_index = 2u;
tabstop = 4u; tabstop = 4u;
m_append_buffer_index = 0u; m_append_buffer_index = 0u;
m_changes_buffer_index = 0u;
} }
void PieceTable::append_initial_line_piece(uint8_t * start, uint32_t length, bool eol) void PieceTable::append_initial_line_piece(uint8_t * start, uint32_t length, bool eol)
@ -342,6 +343,13 @@ void PieceTable::insertion_test(Cursor & c)
m_append_buffer[m_append_buffer_index++] = 'x'; m_append_buffer[m_append_buffer_index++] = 'x';
m_append_buffer[m_append_buffer_index++] = 'y'; m_append_buffer[m_append_buffer_index++] = 'y';
m_append_buffer[m_append_buffer_index++] = 'z'; m_append_buffer[m_append_buffer_index++] = 'z';
Change * change = &m_changes_buffer[m_changes_buffer_index++];
change->prior_link[0][0] = c.iterator.piece->prev;
change->prior_link[0][1] = c.iterator.piece;
change->prior_link[1][0] = c.iterator.piece;
change->prior_link[1][1] = c.iterator.piece->next;
if (c.iterator.valid()) if (c.iterator.valid())
{ {
if (c.iterator.offset > 0u) if (c.iterator.offset > 0u)
@ -356,42 +364,47 @@ void PieceTable::insertion_test(Cursor & c)
piece3->length = c.iterator.piece->length - c.iterator.offset; piece3->length = c.iterator.piece->length - c.iterator.offset;
piece3->flags = c.iterator.piece->flags; piece3->flags = c.iterator.piece->flags;
c.iterator.piece->prev->next = piece2;
piece2->prev = c.iterator.piece->prev;
piece2->next = piece; piece2->next = piece;
piece->prev = piece2; piece->prev = piece2;
piece->next = piece3; piece->next = piece3;
piece3->prev = piece; piece3->prev = piece;
piece3->next = c.iterator.piece->next;
piece3->next->prev = piece3; change->new_link[0][0] = c.iterator.piece->prev;
change->new_link[0][1] = piece2;
change->new_link[1][0] = piece3;
change->new_link[1][1] = c.iterator.piece->next;
} }
else else
{ {
if (c.iterator.piece->length == 0u) if (c.iterator.piece->length == 0u)
{ {
piece->flags = c.iterator.piece->flags; piece->flags = c.iterator.piece->flags;
c.iterator.piece->prev->next = piece; change->new_link[0][0] = c.iterator.piece->prev;
c.iterator.piece->next->prev = piece; change->new_link[0][1] = piece;
piece->prev = c.iterator.piece->prev; change->new_link[1][0] = piece;
piece->next = c.iterator.piece->next; change->new_link[1][1] = c.iterator.piece->next;
} }
else else
{ {
c.iterator.piece->prev->next = piece; change->new_link[0][0] = c.iterator.piece->prev;
piece->prev = c.iterator.piece->prev; change->new_link[0][1] = piece;
c.iterator.piece->prev = piece; change->new_link[1][0] = piece;
piece->next = c.iterator.piece; change->new_link[1][1] = c.iterator.piece;
} }
} }
} }
else else
{ {
start_piece->next = piece; change->new_link[0][0] = start_piece;
piece->prev = start_piece; change->new_link[0][1] = piece;
end_piece->prev = piece; change->new_link[1][0] = piece;
piece->next = end_piece; change->new_link[1][1] = end_piece;
} }
change->new_link[0][0]->next = change->new_link[0][1];
change->new_link[0][1]->prev = change->new_link[0][0];
change->new_link[1][0]->next = change->new_link[1][1];
change->new_link[1][1]->prev = change->new_link[1][0];
c.warp_to_inserted_piece(piece); c.warp_to_inserted_piece(piece);
} }

9
src/core/PieceTable.h
View File

@ -132,6 +132,13 @@ public:
void forward_to_column(uint32_t c); void forward_to_column(uint32_t c);
}; };
struct Change
{
Piece * prior_link[2][2];
Piece * new_link[2][2];
bool insert;
};
Piece * start_piece; Piece * start_piece;
Piece * end_piece; Piece * end_piece;
uint8_t tabstop; uint8_t tabstop;
@ -168,6 +175,8 @@ protected:
PagedBuffer<uint8_t> m_append_buffer; PagedBuffer<uint8_t> m_append_buffer;
uint32_t m_append_buffer_index; uint32_t m_append_buffer_index;
PagedBuffer<Piece> m_pieces; PagedBuffer<Piece> m_pieces;
PagedBuffer<Change> m_changes_buffer;
uint32_t m_changes_buffer_index;
std::list<std::shared_ptr<Cursor>> m_cursors; std::list<std::shared_ptr<Cursor>> m_cursors;
}; };