From dc642f8afaf71b319be6f506ab08cac5b8127b90 Mon Sep 17 00:00:00 2001
From: Maxime Coste <frrrwww@gmail.com>
Date: Sun, 27 Nov 2011 18:41:25 +0000
Subject: [PATCH] Buffer: refactor to remove do_{insert,erase} methods

---
 src/buffer.cc | 24 +++++++-----------------
 src/buffer.hh |  6 ------
 2 files changed, 7 insertions(+), 23 deletions(-)

diff --git a/src/buffer.cc b/src/buffer.cc
index 6ac647b6..33f2ae3b 100644
--- a/src/buffer.cc
+++ b/src/buffer.cc
@@ -46,18 +46,6 @@ void Buffer::insert(const BufferIterator& position, const BufferString& string)
     append_modification(BufferModification(BufferModification::Insert, position, string));
 }
 
-void Buffer::do_erase(const BufferIterator& begin, const BufferIterator& end)
-{
-    m_content.erase(begin.m_position, end - begin);
-    compute_lines();
-}
-
-void Buffer::do_insert(const BufferIterator& position, const BufferString& string)
-{
-    m_content.insert(position.m_position, string);
-    compute_lines();
-}
-
 BufferIterator Buffer::iterator_at(const BufferCoord& line_and_column) const
 {
     if (m_lines.empty())
@@ -207,19 +195,21 @@ void Buffer::apply_modification(const BufferModification& modification)
     switch (modification.type)
     {
     case BufferModification::Insert:
-        do_insert(modification.position, modification.content);
+        m_content.insert(modification.position.m_position,
+                         modification.content);
         break;
     case BufferModification::Erase:
     {
-        BufferIterator begin = modification.position;
-        BufferIterator end   = begin + modification.content.size();
-        assert(string(begin, end) == modification.content);
-        do_erase(begin, end);
+        size_t size = modification.content.size();
+        assert(string(modification.position, modification.position + size)
+               == modification.content);
+        m_content.erase(modification.position.m_position, size);
         break;
     }
     default:
         assert(false);
     }
+    compute_lines();
     for (auto listener : m_modification_listeners)
         listener->on_modification(modification);
 }
diff --git a/src/buffer.hh b/src/buffer.hh
index 490dc2d2..be0e0d47 100644
--- a/src/buffer.hh
+++ b/src/buffer.hh
@@ -152,12 +152,6 @@ public:
 private:
     BufferChar at(BufferPos position) const;
 
-    void       do_erase(const BufferIterator& begin,
-                        const BufferIterator& end);
-
-    void       do_insert(const BufferIterator& position,
-                         const BufferString& string);
-
     friend class BufferIterator;
 
     std::vector<BufferPos> m_lines;