Support single char StringView

remove single char escape function overload, add unescape function

1 files changed, 7 insertions, 6 deletions

diff --git a/src/string.cc b/src/string.cc
index 79da055b..474b15b4 100644
--- a/src/string.cc
+++ b/src/string.cc
@@ -62,26 +62,27 @@ std::vector<StringView> split(StringView str, char separator)
     return res;
 }
 
-String escape(StringView str, char character, char escape)
+String escape(StringView str, StringView characters, char escape)
 {
     String res;
     for (auto& c : str)
     {
-        if (c == character)
+        if (contains(characters, c))
             res += escape;
         res += c;
     }
     return res;
 }
 
-String escape(StringView str, StringView characters, char escape)
+String unescape(StringView str, StringView characters, char escape)
 {
     String res;
     for (auto& c : str)
     {
-        if (contains(characters, c))
-            res += escape;
-        res += c;
+        if (contains(characters, c) and not res.empty() and res.back() == escape)
+            res.back() = c;
+        else
+            res += c;
     }
     return res;
 }