Add function for split line by separators and quotes.

Also add tests for it.

5 files changed, 390 insertions, 0 deletions

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 6a5902882..fe622c0c0 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -790,6 +790,8 @@ SET(SRCS
     utils/langs.cpp
     utils/langs.h
     utils/mathutils.h
+    utils/paramerers.cpp
+    utils/paramerers.h
     utils/paths.cpp
     utils/paths.h
     utils/perfomance.cpp
diff --git a/src/Makefile.am b/src/Makefile.am
index b6bc50334..f0ec53a9e 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -441,6 +441,8 @@ SRC += events/actionevent.h \
 	      utils/mathutils.h \
 	      utils/mkdir.cpp \
 	      utils/mkdir.h \
+	      utils/paramerers.cpp \
+	      utils/paramerers.h \
 	      utils/paths.cpp \
 	      utils/paths.h \
 	      utils/perfomance.cpp \
@@ -1725,6 +1727,7 @@ manaplustests_CXXFLAGS = ${manaplus_CXXFLAGS} \
 	      -DUNITTESTS
 manaplustests_SOURCES = ${manaplus_SOURCES} \
 	      enums/enums_unittest.cc \
+	      utils/paramerers_unittest.cc \
 	      utils/xml_unittest.cc \
 	      utils/xmlutils_unittest.cc \
 	      utils/mathutils_unittest.cc \
diff --git a/src/utils/paramerers.cpp b/src/utils/paramerers.cpp
new file mode 100644
index 000000000..42050c2a4
--- /dev/null
+++ b/src/utils/paramerers.cpp
@@ -0,0 +1,118 @@
+/*
+ *  The ManaPlus Client
+ *  Copyright (C) 2016  The ManaPlus Developers
+ *
+ *  This file is part of The ManaPlus Client.
+ *
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2 of the License, or
+ *  any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include "utils/paramerers.h"
+
+#include "logger.h"
+
+#include "utils/stringutils.h"
+
+#include <sstream>
+
+#include "debug.h"
+
+static inline void addToken(StringVect &tokens,
+                            std::string str)
+{
+    const size_t sz = str.size();
+    std::string item;
+    if (sz > 1)
+    {
+        if (str[0] == '\"' &&
+            str[sz - 1] == '\"' &&
+            str[sz - 2] != '\\')
+        {
+            str = str.substr(1, sz - 2);
+            item = trim(str);
+            replaceAll(item, "\\\"", "\"");
+            tokens.push_back(item);
+            return;
+        }
+    }
+    item = trim(str);
+    replaceAll(item, "\\\"", "\"");
+    if (!item.empty())
+        tokens.push_back(item);
+}
+
+static inline size_t findNextQuote(const std::string &str,
+                                   const char quote,
+                                   const size_t pos)
+{
+    size_t idx = str.find(quote, pos);
+    if (idx == std::string::npos)
+        return idx;
+    while (idx > 0 && str[idx - 1] == '\\')
+        idx = str.find(quote, idx + 1);
+    return idx;
+}
+
+static inline size_t findNextSplit(std::string &str,
+                                   const char separator,
+                                   const char quote)
+{
+    size_t pos = 0;
+    size_t idx1 = 0;
+    while (true)
+    {
+        // search for next separator
+        idx1 = str.find(separator, pos);
+        // search for next open quote, skipping escaped quotes
+        size_t idx2 = findNextQuote(str, quote, pos);
+        if (idx2 == std::string::npos)  // not quotes, return next separator
+            return idx1;
+        else if (idx1 == std::string::npos)  // also no separators, return npos
+            return std::string::npos;
+
+        if (idx2 < idx1)
+        {   // first is quote and after separator: for example "test line", ...
+            idx2 = findNextQuote(str, quote, idx2 + 1);
+            if (idx2 == std::string::npos)
+                return std::string::npos;  // no close quote, here error
+            // searching next 
+            pos = idx2 + 1;
+        }
+        else
+        {
+            return idx1;
+        }
+    }
+    return idx1;
+}
+
+bool splitParameters(StringVect &tokens,
+                     std::string text,
+                     const char separator,
+                     const char quote)
+{
+    size_t idx = findNextSplit(text, separator, quote);
+    std::string item;
+
+    while (idx != std::string::npos)
+    {
+        std::string item = text.substr(0, idx);
+        addToken(tokens, item);
+        text = text.substr(idx + 1);
+        idx = findNextSplit(text, separator, quote);
+    }
+
+    addToken(tokens, text);
+    return true;
+}
diff --git a/src/utils/paramerers.h b/src/utils/paramerers.h
new file mode 100644
index 000000000..bdd91a9f2
--- /dev/null
+++ b/src/utils/paramerers.h
@@ -0,0 +1,33 @@
+/*
+ *  The ManaPlus Client
+ *  Copyright (C) 2016  The ManaPlus Developers
+ *
+ *  This file is part of The ManaPlus Client.
+ *
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2 of the License, or
+ *  any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#ifndef UTILS_PARAMETERS_H
+#define UTILS_PARAMETERS_H
+
+#include "utils/stringvector.h"
+
+#include "localconsts.h"
+
+bool splitParameters(StringVect &tokens,
+                     std::string text,
+                     const char separator,
+                     const char quote);
+
+#endif  // UTILS_PARAMETERS_H
diff --git a/src/utils/paramerers_unittest.cc b/src/utils/paramerers_unittest.cc
new file mode 100644
index 000000000..6303331e5
--- /dev/null
+++ b/src/utils/paramerers_unittest.cc
@@ -0,0 +1,234 @@
+/*
+ *  The ManaPlus Client
+ *  Copyright (C) 2012-2016  The ManaPlus Developers
+ *
+ *  This file is part of The ManaPlus Client.
+ *
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2 of the License, or
+ *  any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include "catch.hpp"
+
+#include "utils/paramerers.h"
+
+#include "debug.h"
+
+TEST_CASE("parameters basic 1")
+{
+    StringVect pars;
+    REQUIRE(splitParameters(pars, "", ',', '\"') == true);
+    REQUIRE(pars.size() == 0);
+}
+
+TEST_CASE("parameters basic 2")
+{
+    StringVect pars;
+    REQUIRE(splitParameters(pars, "one,two, tree", ',', '\"') == true);
+    REQUIRE(pars.size() == 3);
+    REQUIRE(pars[0] == "one");
+    REQUIRE(pars[1] == "two");
+    REQUIRE(pars[2] == "tree");
+}
+
+TEST_CASE("parameters basic 3")
+{
+    StringVect pars;
+    REQUIRE(splitParameters(pars, ", ,,,", ',', '\"') == true);
+    REQUIRE(pars.size() == 0);
+}
+
+TEST_CASE("parameters basic 4")
+{
+    StringVect pars;
+    REQUIRE(splitParameters(pars, "one,,two, tree", ',', '\"') == true);
+    REQUIRE(pars.size() == 3);
+    REQUIRE(pars[0] == "one");
+    REQUIRE(pars[1] == "two");
+    REQUIRE(pars[2] == "tree");
+}
+
+TEST_CASE("parameters escape 1")
+{
+    StringVect pars;
+    REQUIRE(splitParameters(pars, "\\\"", ',', '\"') == true);
+    REQUIRE(pars.size() == 1);
+    REQUIRE(pars[0] == "\"");
+}
+
+TEST_CASE("parameters escape 2")
+{
+    StringVect pars;
+    REQUIRE(splitParameters(pars, "\\\", test", ',', '\"') == true);
+    REQUIRE(pars.size() == 2);
+    REQUIRE(pars[0] == "\"");
+    REQUIRE(pars[1] == "test");
+}
+
+TEST_CASE("parameters escape 3")
+{
+    StringVect pars;
+    REQUIRE(splitParameters(pars, "test,\\\"", ',', '\"') == true);
+    REQUIRE(pars.size() == 2);
+    REQUIRE(pars[0] == "test");
+    REQUIRE(pars[1] == "\"");
+}
+
+TEST_CASE("parameters quote 1")
+{
+    StringVect pars;
+    REQUIRE(splitParameters(pars, "\"one\",,two, tree", ',', '\"') == true);
+    REQUIRE(pars.size() == 3);
+    REQUIRE(pars[0] == "one");
+    REQUIRE(pars[1] == "two");
+    REQUIRE(pars[2] == "tree");
+}
+
+TEST_CASE("parameters quote 2")
+{
+    StringVect pars;
+    REQUIRE(splitParameters(pars, "\"\",,two, tree", ',', '\"') == true);
+    REQUIRE(pars.size() == 3);
+    REQUIRE(pars[0] == "");
+    REQUIRE(pars[1] == "two");
+    REQUIRE(pars[2] == "tree");
+}
+
+TEST_CASE("parameters quote 3")
+{
+    StringVect pars;
+    REQUIRE(splitParameters(pars, "\"one test\",,two, tree", ',', '\"') ==
+        true);
+    REQUIRE(pars.size() == 3);
+    REQUIRE(pars[0] == "one test");
+    REQUIRE(pars[1] == "two");
+    REQUIRE(pars[2] == "tree");
+}
+
+TEST_CASE("parameters quote 4")
+{
+    StringVect pars;
+    REQUIRE(splitParameters(pars, "\"\\\"one test\\\"\",,two, tree", ',', '\"')
+        == true);
+    REQUIRE(pars.size() == 3);
+    REQUIRE(pars[0] == "\"one test\"");
+    REQUIRE(pars[1] == "two");
+    REQUIRE(pars[2] == "tree");
+}
+
+TEST_CASE("parameters quote 5")
+{
+    StringVect pars;
+    REQUIRE(splitParameters(pars, "\"\\\"one \\\"test\\\"\",,two, tree", ',', '\"')
+        == true);
+    REQUIRE(pars.size() == 3);
+    REQUIRE(pars[0] == "\"one \"test\"");
+    REQUIRE(pars[1] == "two");
+    REQUIRE(pars[2] == "tree");
+}
+
+TEST_CASE("parameters quote 6")
+{
+    StringVect pars;
+    REQUIRE(splitParameters(pars, "\"one, test\",,two, tree", ',', '\"')
+        == true);
+    REQUIRE(pars.size() == 3);
+    REQUIRE(pars[0] == "one, test");
+    REQUIRE(pars[1] == "two");
+    REQUIRE(pars[2] == "tree");
+}
+
+TEST_CASE("parameters quote 7")
+{
+    StringVect pars;
+    REQUIRE(splitParameters(pars, "\"\\\"one, test\\\"\",,two, tree", ',', '\"')
+        == true);
+    REQUIRE(pars.size() == 3);
+    REQUIRE(pars[0] == "\"one, test\"");
+    REQUIRE(pars[1] == "two");
+    REQUIRE(pars[2] == "tree");
+}
+
+TEST_CASE("parameters quote 8")
+{
+    StringVect pars;
+    REQUIRE(splitParameters(pars, "\"\\\"\",,two, tree", ',', '\"')
+        == true);
+    REQUIRE(pars.size() == 3);
+    REQUIRE(pars[0] == "\"");
+    REQUIRE(pars[1] == "two");
+    REQUIRE(pars[2] == "tree");
+}
+
+TEST_CASE("parameters quote 9")
+{
+    StringVect pars;
+    REQUIRE(splitParameters(pars, "\"\\\",,two, tree", ',', '\"')
+        == true);
+    REQUIRE(pars.size() == 1);
+    REQUIRE(pars[0] == "\"\",,two, tree");
+}
+
+TEST_CASE("parameters quote 10")
+{
+    StringVect pars;
+    REQUIRE(splitParameters(pars, "\"", ',', '\"')
+        == true);
+    REQUIRE(pars.size() == 1);
+    REQUIRE(pars[0] == "\"");
+}
+
+TEST_CASE("parameters quote 11")
+{
+    StringVect pars;
+    REQUIRE(splitParameters(pars, "\\\"", ',', '\"')
+        == true);
+    REQUIRE(pars.size() == 1);
+    REQUIRE(pars[0] == "\"");
+}
+
+TEST_CASE("parameters quote 12")
+{
+    StringVect pars;
+    REQUIRE(splitParameters(pars, ",\"", ',', '\"')
+        == true);
+    REQUIRE(pars.size() == 1);
+    REQUIRE(pars[0] == "\"");
+}
+
+TEST_CASE("parameters quote 13")
+{
+    StringVect pars;
+    REQUIRE(splitParameters(pars, "\",", ',', '\"')
+        == true);
+    REQUIRE(pars.size() == 1);
+    REQUIRE(pars[0] == "\",");
+}
+
+TEST_CASE("parameters quote 14")
+{
+    StringVect pars;
+    REQUIRE(splitParameters(pars, "\\\",", ',', '\"')
+        == true);
+    REQUIRE(pars.size() == 1);
+    REQUIRE(pars[0] == "\"");
+}
+
+TEST_CASE("parameters quote 15")
+{
+    StringVect pars;
+    REQUIRE(splitParameters(pars, ",\\\"", ',', '\"')
+        == true);
+    REQUIRE(pars.size() == 1);
+    REQUIRE(pars[0] == "\"");
+}