Changeset 36501 in vbox

Timestamp:

Apr 1, 2011 1:40:21 PM (14 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

70912

Message:

IPRT: add join/split and + operators to the string class

Location:

trunk

Files:

• include/iprt/cpp/ministring.h (modified) (4 diffs)
• src/VBox/Runtime/common/string/ministring.cpp (modified) (1 diff)
• src/VBox/Runtime/testcase/tstIprtMiniString.cpp (modified) (1 diff)

trunk/include/iprt/cpp/ministring.h

@@ -30 +30 @@
 #include <iprt/string.h>
 #include <iprt/stdarg.h>
+#include <iprt/cpp/list.h>
 
 #include <new>
@@ -35 +36 @@
 namespace iprt
 {
+
+/**
+ * @defgroup grp_rt_cpp_string     C++ String support
+ * @ingroup grp_rt_cpp
+ * @{
+ */
 
 /**
@@ -808 +815 @@
     int toInt(uint32_t &i) const;
 
+    /** Splitting behavior regarding empty sections in the string. */
+    enum SplitMode
+    {
+        KeepEmptyParts,  /**< Empty parts are added as empty strings to the result list. */
+        RemoveEmptyParts /**< Empty parts are skipped. */
+    };
+
+    /**
+     * Splits a string separated by strSep into its parts.
+     *
+     * @param   strSep       The separator to search for.
+     * @param   mode         How should empty parts be handled.
+     * @returns separated strings as string list.
+     */
+    iprt::list<iprt::MiniString, iprt::MiniString*> split(const iprt::MiniString &strSep, SplitMode mode = RemoveEmptyParts);
+
+    /**
+     * Joins a list of strings together using the provided separator.
+     *
+     * @param   list         The list to join.
+     * @param   strSep       The separator used for joining.
+     * @returns joined string.
+     */
+    static iprt::MiniString join(const iprt::list<iprt::MiniString, iprt::MiniString*> &list, const iprt::MiniString &strSep = "");
+        
 protected:
 
@@ -883 +915 @@
 };
 
-} // namespace iprt
+/** @} */
+
+} /* namespace iprt */
+
+/**
+ * @addtogroup grp_rt_cpp_string
+ * @{
+ */
+
+/**
+ * @relates iprt::MiniString
+ *
+ * Concatenate two strings.
+ *
+ * @param   one        String one.
+ * @param   other      String two.
+ * @returns the concatenate string.
+ */
+RTDECL(const iprt::MiniString) operator+(const iprt::MiniString &one, const iprt::MiniString &other);
+
+/**
+ * @relates iprt::MiniString
+ *
+ * Concatenate two strings.
+ *
+ * @param   one        String one.
+ * @param   pcszOther  String two.
+ * @returns the concatenate string.
+ */
+RTDECL(const iprt::MiniString) operator+(const iprt::MiniString &one, const char *pcszOther);
+
+/**
+ * @relates iprt::MiniString
+ *
+ * Concatenate two strings.
+ *
+ * @param   pcszOne    String one.
+ * @param   other      String two.
+ * @returns the concatenate string.
+ */
+RTDECL(const iprt::MiniString) operator+(const char *pcszOne, const iprt::MiniString &other);
+
+/** @} */
 
 #endif

trunk/src/VBox/Runtime/common/string/ministring.cpp

@@ -332 +332 @@
 }
 
+iprt::list<iprt::MiniString, iprt::MiniString*> MiniString::split(const iprt::MiniString &strSep, SplitMode mode /* = RemoveEmptyParts */)
+{
+    iprt::list<iprt::MiniString> res;
+    if (!m_psz)
+        return res;
+    if (strSep.isEmpty())
+    {
+        res.append(iprt::MiniString(m_psz));
+        return res;
+    }
+
+    size_t cch = m_cch;
+    char *pszTmp = m_psz;
+    while(cch > 0)
+    {
+        char *pszNext = strstr(pszTmp, strSep.c_str());
+        if (!pszNext)
+            break;
+        size_t chNext = pszNext - pszTmp;
+        if (   chNext > 0
+            || mode == KeepEmptyParts)
+            res.append(iprt::MiniString(pszTmp, chNext));
+        pszTmp += chNext + strSep.length();
+        cch    -= chNext + strSep.length();
+    }
+    /* Some characters left at the end? */
+    if (cch > 0)
+        res.append(iprt::MiniString(pszTmp, cch));
+
+    return res;
+}
+
+/* static */
+iprt::MiniString MiniString::join(const iprt::list<iprt::MiniString, iprt::MiniString*> &list, const iprt::MiniString &strSep /* = "" */)
+{
+    MiniString res;
+    if (list.size() > 1)
+    {
+        for(size_t i = 0; i < list.size() - 1; ++i)
+            res += list.at(i) + strSep;
+        res += list.last();
+    }
+
+    return res;
+}
+
+const iprt::MiniString operator+(const iprt::MiniString &one, const iprt::MiniString &other)
+{
+    iprt::MiniString res(one);
+
+    return res += other;
+}
+
+const iprt::MiniString operator+(const iprt::MiniString &one, const char *pcszOther)
+{
+    iprt::MiniString res(one);
+
+    return res += pcszOther;
+}
+
+const iprt::MiniString operator+(const char *pcszOne, const iprt::MiniString &other)
+{
+    iprt::MiniString res(pcszOne);
+
+    return res += other;
+}
+

trunk/src/VBox/Runtime/testcase/tstIprtMiniString.cpp

@@ -256 +256 @@
     CHECK_EQUAL(strTest.substr(pos), "ßäbcdef");
 
+    /* split */
+    iprt::list<iprt::MiniString> spList1 = iprt::MiniString("##abcdef##abcdef####abcdef##").split("##", iprt::MiniString::RemoveEmptyParts);
+    RTTESTI_CHECK(spList1.size() == 3);
+    for (size_t i = 0; i < spList1.size(); ++i)
+        RTTESTI_CHECK(spList1.at(i) == "abcdef");
+    iprt::list<iprt::MiniString> spList2 = iprt::MiniString("##abcdef##abcdef####abcdef##").split("##", iprt::MiniString::KeepEmptyParts);
+    RTTESTI_CHECK_RETV(spList2.size() == 5);
+    RTTESTI_CHECK(spList2.at(0) == "");
+    RTTESTI_CHECK(spList2.at(1) == "abcdef");
+    RTTESTI_CHECK(spList2.at(2) == "abcdef");
+    RTTESTI_CHECK(spList2.at(3) == "");
+    RTTESTI_CHECK(spList2.at(4) == "abcdef");
+    iprt::list<iprt::MiniString> spList3 = iprt::MiniString().split("##", iprt::MiniString::KeepEmptyParts);
+    RTTESTI_CHECK(spList3.size() == 0);
+    iprt::list<iprt::MiniString> spList4 = iprt::MiniString().split("");
+    RTTESTI_CHECK(spList4.size() == 0);
+    iprt::list<iprt::MiniString> spList5 = iprt::MiniString("abcdef").split("");
+    RTTESTI_CHECK_RETV(spList5.size() == 1);
+    RTTESTI_CHECK(spList5.at(0) == "abcdef");
+
+    /* join */
+    iprt::list<iprt::MiniString> jnList;
+    strTest = iprt::MiniString::join(jnList);
+    RTTESTI_CHECK(strTest == "");
+    strTest = iprt::MiniString::join(jnList, "##");
+    RTTESTI_CHECK(strTest == "");
+    for (size_t i = 0; i < 5; ++i)
+        jnList.append("abcdef");
+    strTest = iprt::MiniString::join(jnList);
+    RTTESTI_CHECK(strTest == "abcdefabcdefabcdefabcdefabcdef");
+    strTest = iprt::MiniString::join(jnList, "##");
+    RTTESTI_CHECK(strTest == "abcdef##abcdef##abcdef##abcdef##abcdef");
+
     /* special constructor and assignment arguments */
     iprt::MiniString StrCtor1("");