Changeset 929 for cpp

Timestamp:

05/25/20 15:23:43 (5 years ago)

Author:

Maciej Komosinski

Message:

Introduced strSplit() - a function that splits an SString and stores results in any class that implements push_back(const SString&), e.g. std::vector<SString>

Location:

cpp/frams

Files:

• util/sstringutils.h (modified) (3 diffs)
• vm/classes/collectionobj.h (modified) (2 diffs)

cpp/frams/util/sstringutils.h

@@ -1 +1 @@
 // This file is a part of Framsticks SDK.  http://www.framsticks.com/
-// Copyright (C) 1999-2015  Maciej Komosinski and Szymon Ulatowski.
+// Copyright (C) 1999-2020  Maciej Komosinski and Szymon Ulatowski.
 // See LICENSE.txt for details.
 
@@ -28 +28 @@
 
 SString trim(const SString& s); ///< remove leading/trailing whitespace
-SString concatPath(const SString& in1,const SString& in2); ///< concatenate path components inserting PATH_SEPARATOR_CHAR if not already present
+SString concatPath(const SString& in1, const SString& in2); ///< concatenate path components inserting PATH_SEPARATOR_CHAR if not already present
 bool removeCR(SString& s); ///< remove '\r' return true if changed
 bool matchWildcard(const SString& word, const SString& pattern);///< '*' in pattern matches any substring
@@ -35 +35 @@
 bool parseUIDString(const char* str, char prefix, uint64_t &uid, bool err);
 
+// SplitResult can be any class implementing push_back(const SString&), e.g. std::vector<SString>
+template <class SplitResult> void strSplit(const SString& text, const SString& separator, bool merge_separators, SplitResult& result)
+{
+        int i, next = 0;
+        bool first = true;
+        if (!separator.len()) { result.push_back(text); return; }
+        while (1)
+        {
+                i = text.indexOf(separator.c_str(), next);
+                if (i < 0)
+                {
+                        if ((next <= text.len()) || first)
+                                result.push_back(text.substr(next));
+                        return;
+                }
+                if ((!merge_separators) || (i > next) || (i == 0))
+                {
+                        result.push_back(text.substr(next, i - next));
+                        first = false;
+                }
+                next = i + separator.len();
+        }
+}
+
+
 #endif

cpp/frams/vm/classes/collectionobj.h

@@ -1 +1 @@
 // This file is a part of Framsticks SDK.  http://www.framsticks.com/
-// Copyright (C) 1999-2019  Maciej Komosinski and Szymon Ulatowski.
+// Copyright (C) 1999-2020  Maciej Komosinski and Szymon Ulatowski.
 // See LICENSE.txt for details.
 
@@ -20 +20 @@
         ExtValue *get(int i) { return (ExtValue*)data.get(i); }
         void set_or_insert(int i, const ExtValue& val, bool insert);
+        void push_back(const SString& s) { data += new ExtValue(s); } //for strSplit()
 
         static Param par;