remove tabstop from GapBuffer

src/core/Buffer.cc

@@ -104,7 +104,7 @@ bool Buffer::write_to_file(const char * filename)
 
     m_gap_buffer->compact();
 
-    Cursor start_of_line(&*m_gap_buffer, m_encoding);
+    Cursor start_of_line(&*m_gap_buffer, m_encoding, 4u);
     size_t bytes_written = 0u;
 
     while (start_of_line.valid())

src/core/Buffer.h

@@ -18,7 +18,7 @@ public:
 
     std::shared_ptr<Cursor> add_cursor()
     {
-        return std::make_shared<Cursor>(&*m_gap_buffer, m_encoding);
+        return std::make_shared<Cursor>(&*m_gap_buffer, m_encoding, 4u);
     }
     auto get_string() { return m_gap_buffer->get_string(); }
 

src/core/Cursor.cc

@@ -154,8 +154,7 @@ bool Cursor::go_right(bool allow_eol)
             uint32_t chr = *m_iterator;
             if (chr == '\t')
             {
-                uint8_t tabstop = m_iterator.gap_buffer()->tabstop;
+                m_column += m_tabstop - (m_column + 1u) % m_tabstop;
-                m_column += tabstop - (m_column + 1u) % tabstop;
             }
             else
             {
@@ -203,7 +202,7 @@ void Cursor::init_column()
 {
     if (*m_iterator == '\t')
     {
-        m_column = m_iterator.gap_buffer()->tabstop - 1u;
+        m_column = m_tabstop - 1u;
     }
     else
     {

src/core/Cursor.h

@@ -55,10 +55,11 @@ protected:
 class Cursor
 {
 public:
-    Cursor(GapBuffer * gap_buffer, Encoding::Type encoding)
+    Cursor(GapBuffer * gap_buffer, Encoding::Type encoding, uint8_t tabstop)
         : m_iterator(gap_buffer, encoding)
     {
         m_line = 0u;
+        m_tabstop = tabstop;
         init_column();
     }
     bool is_start_of_line();
@@ -86,6 +87,7 @@ protected:
     Iterator m_iterator;
     size_t m_line;
     size_t m_column;
+    uint8_t m_tabstop;
 
     void init_column();
     void forward_to_column(size_t target_column);

src/core/GapBuffer.cc

@@ -8,7 +8,6 @@ GapBuffer::GapBuffer()
     m_buffer_size = System::page_size;
     m_size = 0u;
     m_gap_position = 0u;
-    tabstop = 4u;
 }
 
 GapBuffer::GapBuffer(uint8_t * buffer, size_t buffer_size, size_t size)
@@ -17,7 +16,6 @@ GapBuffer::GapBuffer(uint8_t * buffer, size_t buffer_size, size_t size)
     m_buffer_size = buffer_size;
     m_size = size;
     m_gap_position = size;
-    tabstop = 4u;
 }
 
 GapBuffer::~GapBuffer()

src/core/GapBuffer.h

@@ -10,8 +10,6 @@
 class GapBuffer
 {
 public:
-    uint8_t tabstop;
-
     GapBuffer();
     GapBuffer(uint8_t * buffer, size_t buffer_size, size_t size);
     ~GapBuffer();