Changeset 1016

Timestamp:

07/20/20 14:15:14 (4 years ago)

Author:

Maciej Komosinski

Message:

Added whitespace-trimming functions for std::string

Location:

cpp/common

Files:

• nonstd.h (modified) (1 diff)
• util-string.cpp (modified) (2 diffs)
• util-string.h (modified) (1 diff)

cpp/common/nonstd.h

@@ -80 +80 @@
 
 
+
+#if defined(__ANDROID__) && !defined(PRIuPTR)
+#define PRIuPTR "u" //w ktorejs z wersji kompilacji 32 albo 64 bit pewnie brakuje tej definicji w naglowku <inttypes.h>, a w tej drugiej wersji jest. Nie wiem czy "u" jest wlasciwe ale i tak prawdopodobnie naprawili w nowszym ndk...
 #endif
+
+
+#endif

cpp/common/util-string.cpp

@@ -79 +79 @@
 bool str_starts_with(const char *str, const char *prefix)
 {
-        return strncmp(str,prefix,strlen(prefix))==0;
+        return strncmp(str, prefix, strlen(prefix)) == 0;
 }
 
@@ -132 +132 @@
         return filename.substr(0, slash);
 }
+
+//trimming functions, https://stackoverflow.com/questions/216823/whats-the-best-way-to-trim-stdstring
+
+void ltrim_inplace(string &s)
+{
+        s.erase(s.begin(), find_if(s.begin(), s.end(), [](int ch) {
+                return !isspace(ch);
+                }));
+}
+
+void rtrim_inplace(string &s)
+{
+        s.erase(find_if(s.rbegin(), s.rend(), [](int ch) {
+                return !isspace(ch);
+                }).base(), s.end());
+}
+
+void trim_inplace(string &s)
+{
+        ltrim_inplace(s);
+        rtrim_inplace(s);
+}
+
+string ltrim(string s)
+{
+        ltrim_inplace(s);
+        return s;
+}
+
+string rtrim(string s)
+{
+        rtrim_inplace(s);
+        return s;
+}
+
+string trim(string s)
+{
+        trim_inplace(s);
+        return s;
+}

cpp/common/util-string.h

@@ -21 +21 @@
 string stripFileDir(const string& filename); // strip path component from filename
 
+void ltrim_inplace(string &s);
+void rtrim_inplace(string &s);
+void trim_inplace(string &s);
+string ltrim(string s);
+string rtrim(string s);
+string trim(string s);
+
 #endif