implement Buffer::write_to_file()

This commit is contained in:
Josh Holtrop 2016-11-07 22:34:10 -05:00
parent 18f3af443e
commit d5e3fdf919
4 changed files with 42 additions and 6 deletions

View File

@ -24,6 +24,7 @@ void Buffer::load_empty_buffer()
{ {
m_gap_buffer = std::make_shared<GapBuffer>(Encoding::UTF_8); m_gap_buffer = std::make_shared<GapBuffer>(Encoding::UTF_8);
m_eol_at_eof = true; m_eol_at_eof = true;
m_line_endings = LineEndings::LF;
} }
bool Buffer::load_from_file(const char * filename) bool Buffer::load_from_file(const char * filename)
@ -59,6 +60,7 @@ bool Buffer::load_from_file(const char * filename)
m_gap_buffer = std::make_shared<GapBuffer>(buffer, buffer_size, loaded_size, text_loader.get_encoding()); m_gap_buffer = std::make_shared<GapBuffer>(buffer, buffer_size, loaded_size, text_loader.get_encoding());
m_eol_at_eof = text_loader.get_eol_at_eof(); m_eol_at_eof = text_loader.get_eol_at_eof();
m_line_endings = text_loader.get_line_endings();
return true; return true;
} }
@ -71,7 +73,39 @@ bool Buffer::write_to_file(const char * filename)
return false; return false;
} }
/* TODO */ m_gap_buffer->compact();
GapBuffer::Cursor start_of_line(&*m_gap_buffer);
size_t bytes_written = 0u;
while (start_of_line.valid())
{
GapBuffer::Cursor cursor = start_of_line;
cursor.go_end_of_line(true);
size_t len = cursor.address() - start_of_line.address();
if (len > 0u)
{
if (!file.write(start_of_line.address(), len))
{
return false;
}
bytes_written += len;
}
bool moved_down = cursor.go_down(0u);
if (moved_down || m_eol_at_eof)
{
if (!file.write(LineEndings::spans[m_line_endings]))
{
return false;
}
bytes_written += LineEndings::spans[m_line_endings].length;
}
if (!moved_down)
{
break;
}
start_of_line = cursor;
}
return true; return true;
} }

View File

@ -15,6 +15,7 @@ public:
protected: protected:
bool m_eol_at_eof; bool m_eol_at_eof;
LineEndings::Type m_line_endings;
std::shared_ptr<GapBuffer> m_gap_buffer; std::shared_ptr<GapBuffer> m_gap_buffer;
bool load_from_file(const char * filename); bool load_from_file(const char * filename);

View File

@ -153,14 +153,14 @@ bool GapBuffer::Cursor::go_start_of_line()
return moved; return moved;
} }
bool GapBuffer::Cursor::go_end_of_line() bool GapBuffer::Cursor::go_end_of_line(bool allow_eol)
{ {
bool moved = false; bool moved = false;
if (go_right(false)) if (go_right(allow_eol))
{ {
moved = true; moved = true;
} }
while (go_right(false)) while (go_right(allow_eol))
{ {
; ;
} }
@ -230,7 +230,7 @@ bool GapBuffer::Cursor::go_up(size_t target_column)
bool GapBuffer::Cursor::go_down(size_t target_column) bool GapBuffer::Cursor::go_down(size_t target_column)
{ {
Cursor c2 = *this; Cursor c2 = *this;
c2.go_end_of_line(); c2.go_end_of_line(true);
if (!c2.m_iterator.check_go_forward()) if (!c2.m_iterator.check_go_forward())
{ {
return false; return false;

View File

@ -64,7 +64,7 @@ public:
bool is_start_of_line(); bool is_start_of_line();
bool is_end_of_line(bool allow_eol); bool is_end_of_line(bool allow_eol);
bool go_start_of_line(); bool go_start_of_line();
bool go_end_of_line(); bool go_end_of_line(bool allow_eol);
bool go_left(); bool go_left();
bool go_right(bool allow_eol); bool go_right(bool allow_eol);
bool go_up(size_t target_column); bool go_up(size_t target_column);
@ -75,6 +75,7 @@ public:
} }
uint32_t operator*() const { return *m_iterator; } uint32_t operator*() const { return *m_iterator; }
uint8_t * address() const { return m_iterator.address(); } uint8_t * address() const { return m_iterator.address(); }
bool valid() const { return m_iterator.valid(); }
protected: protected:
Iterator m_iterator; Iterator m_iterator;