From f30e1642327b8ef4ceb967236192a833ace8e078 Mon Sep 17 00:00:00 2001
From: Maxime Coste <mawww@kakoune.org>
Date: Mon, 30 Jan 2017 12:05:04 +0000
Subject: [PATCH] Make SharedString::create take a list of StringViews

---
 src/buffer.cc        | 16 ++++++++--------
 src/shared_string.hh | 17 ++++++++++++-----
 2 files changed, 20 insertions(+), 13 deletions(-)

diff --git a/src/buffer.cc b/src/buffer.cc
index 27556262..5b37895a 100644
--- a/src/buffer.cc
+++ b/src/buffer.cc
@@ -46,7 +46,7 @@ static ParsedLines parse_lines(StringView data)
     while (pos < data.end())
     {
         const char* eol = std::find(pos, data.end(), '\n');
-        res.lines.emplace_back(StringData::create({pos, eol - (crlf and eol != data.end() ? 1 : 0)}, '\n'));
+        res.lines.emplace_back(StringData::create({{pos, eol - (crlf and eol != data.end() ? 1 : 0)}, "\n"}));
         pos = eol + 1;
     }
 
@@ -76,7 +76,7 @@ Buffer::Buffer(String name, Flags flags, StringView data,
     ParsedLines parsed_lines = parse_lines(data);
 
     if (parsed_lines.lines.empty())
-        parsed_lines.lines.emplace_back(StringData::create("\n"));
+        parsed_lines.lines.emplace_back(StringData::create({"\n"}));
 
     #ifdef KAK_DEBUG
     for (auto& line : parsed_lines.lines)
@@ -230,7 +230,7 @@ void Buffer::reload(StringView data, timespec fs_timestamp)
     ParsedLines parsed_lines = parse_lines(data);
 
     if (parsed_lines.lines.empty())
-        parsed_lines.lines.emplace_back(StringData::create("\n"));
+        parsed_lines.lines.emplace_back(StringData::create({"\n"}));
 
     const bool record_undo = not (m_flags & Flags::NoUndo);
 
@@ -470,9 +470,9 @@ BufferCoord Buffer::do_insert(BufferCoord pos, StringView content)
         }
     }
     if (start == 0)
-        new_lines.push_back(StringData::create(prefix + content + suffix));
+        new_lines.push_back(StringData::create({prefix, content, suffix}));
     else if (start != content.length() or not suffix.empty())
-        new_lines.push_back(StringData::create(content.substr(start) + suffix));
+        new_lines.push_back(StringData::create({content.substr(start), suffix}));
 
     auto line_it = m_lines.begin() + (int)pos.line;
     auto new_lines_it = new_lines.begin();
@@ -497,13 +497,13 @@ BufferCoord Buffer::do_erase(BufferCoord begin, BufferCoord end)
     kak_assert(is_valid(end));
     StringView prefix = m_lines[begin.line].substr(0, begin.column);
     StringView suffix = m_lines[end.line].substr(end.column);
-    String new_line = prefix + suffix;
 
     BufferCoord next;
-    if (new_line.length() != 0)
+    if (not prefix.empty() or not suffix.empty())
     {
+        auto new_line = StringData::create({prefix, suffix});
         m_lines.erase(m_lines.begin() + (int)begin.line, m_lines.begin() + (int)end.line);
-        m_lines.get_storage(begin.line) = StringData::create(new_line);
+        m_lines.get_storage(begin.line) = std::move(new_line);
         next = begin;
     }
     else
diff --git a/src/shared_string.hh b/src/shared_string.hh
index a6522edb..ffd8bf04 100644
--- a/src/shared_string.hh
+++ b/src/shared_string.hh
@@ -6,6 +6,8 @@
 #include "utils.hh"
 #include "unordered_map.hh"
 
+#include <numeric>
+
 namespace Kakoune
 {
 
@@ -30,14 +32,19 @@ struct StringData : UseMemoryDomain<MemoryDomain::SharedString>
         static void ptr_moved(StringData*, void*, void*) noexcept {}
     };
 
-    static RefPtr<StringData, PtrPolicy> create(StringView str, char back = 0)
+    static RefPtr<StringData, PtrPolicy> create(ArrayView<const StringView> strs)
     {
-        const int len = (int)str.length() + (back != 0 ? 1 : 0);
+        const int len = std::accumulate(strs.begin(), strs.end(), 0,
+                                        [](int l, StringView s)
+                                        { return l + (int)s.length(); });
         void* ptr = StringData::operator new(sizeof(StringData) + len + 1);
         auto* res = new (ptr) StringData(0, len);
-        std::copy(str.begin(), str.end(), res->data());
-        if (back != 0)
-            res->data()[len-1] = back;
+        auto* data = res->data();
+        for (auto& str : strs)
+        {
+            memcpy(data, str.begin(), (size_t)str.length());
+            data += (int)str.length();
+        }
         res->data()[len] = 0;
         return RefPtr<StringData, PtrPolicy>{res};
     }