Changeset 1288

Timestamp:

12/06/23 03:32:58 (12 months ago)

Author:

Maciej Komosinski

Message:

Added helper functions

Location:

cpp/common

Files:

• util-stl.h (modified) (3 diffs)
• util-string.cpp (modified) (2 diffs)
• util-string.h (modified) (2 diffs)

cpp/common/util-stl.h

@@ -1 +1 @@
 // This file is a part of Framsticks SDK.  http://www.framsticks.com/
-// Copyright (C) 1999-2021  Maciej Komosinski and Szymon Ulatowski.
+// Copyright (C) 1999-2023  Maciej Komosinski and Szymon Ulatowski.
 // See LICENSE.txt for details.
 
@@ -13 +13 @@
         for (unsigned int i = 0; i < N; i++)
                 v.push_back(d[i]);
+}
+
+template<typename T> void push_back(vector<T>& to, const vector<T>& from)
+{
+        for (auto &e : from)
+                to.push_back(e);
 }
 
@@ -37 +43 @@
 }
 
-template<typename Key,typename Value> Value mapValueOrDefault(const std::map<Key,Value> &map, const Key& key, const Value& default_value)
+template<typename Key, typename Value> Value mapValueOrDefault(const std::map<Key, Value> &map, const Key& key, const Value& default_value)
 {
         auto found = map.find(key);

cpp/common/util-string.cpp

@@ -113 +113 @@
 }
 
+bool strip_prefix(string& modify_me, const char* prefix)
+{
+        if (starts_with(modify_me, prefix))
+        {
+                modify_me = modify_me.substr(strlen(prefix));
+                return true;
+        }
+        return false;
+}
 
 char* strmove(char *a, char *b) //strcpy that works well for overlapping strings ("Source and destination overlap")
@@ -162 +171 @@
         size_t slash = filename.rfind(PATH_SEPARATOR_CHAR);
         if (slash == string::npos) return string("");
-        return filename.substr(0, slash);
+        return (slash == 0) ? string(PATH_SEPARATOR_STRING) : filename.substr(0, slash);
+}
+
+string concatPath(const string& path, const string& other_path)
+{
+        string result = path;
+        if (!result.empty() && result.back() != PATH_SEPARATOR_CHAR && !other_path.empty())
+                result += PATH_SEPARATOR_CHAR;
+        result += other_path;
+        return result;
 }
 

cpp/common/util-string.h

@@ -13 +13 @@
 char* strmove(char *a, char *b); //strcpy that works well for overlapping strings ("Source and destination overlap")
 bool str_starts_with(const char *str, const char *prefix);
-inline bool starts_with(const string& str, const char *prefix) { return str_starts_with(str.c_str(),prefix); } //std::string.starts_with(...) since c++20
+inline bool starts_with(const string& str, const char *prefix) { return str_starts_with(str.c_str(), prefix); } //std::string.starts_with(...) since c++20
 bool ends_with(std::string_view str, std::string_view suffix);
+bool strip_prefix(string& modify_me, const char* prefix); //@return true if the prefix is found and removed
 
 string ssprintf(const char* format, ...);
@@ -23 +24 @@
 string getFileDir(const string& filename); // get path component excluding filename ("" if no dir in file)
 string stripFileDir(const string& filename); // strip path component from filename
+string concatPath(const string& path, const string& other_path); // concatenate paths, adding PATH_SEPARATOR_CHAR if necessary
 
 void ltrim_inplace(string &s);