Changeset 973 for cpp/frams/util/sstringutils.cpp

Timestamp:

07/03/20 00:37:13 (3 years ago)

Author:

Maciej Komosinski

Message:

Increased SString and std::string compatibility: introduced length(), size(), and capacity(), and removed legacy methods that have std::string equivalents

File:

• cpp/frams/util/sstringutils.cpp (modified) (15 diffs)

cpp/frams/util/sstringutils.cpp

@@ -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.
 
@@ -79 +79 @@
                 else
                 {
-                        if (tmp.len() == 0) return 0; // nothing was changed!
+                        if (tmp.length() == 0) return 0; // nothing was changed!
                         tmp += x;
                         target = tmp;
@@ -112 +112 @@
                 else
                 {
-                        if (tmp.len() == 0) return 0; // nothing was changed!
+                        if (tmp.length() == 0) return 0; // nothing was changed!
                         tmp += x;
                         target = tmp;
@@ -139 +139 @@
         bool changed = 0;
         SString tmp;
-        tmp.memoryHint(target.len());
+        tmp.reserve(target.length());
         while (*x)
         {
@@ -160 +160 @@
 {
         SString out;
-        if (in.len() > maxlen)
-                out = in.substr(0, maxlen / 2) + "..." + in.substr(in.len() - maxlen + maxlen / 2);
+        if (in.length() > maxlen)
+                out = in.substr(0, maxlen / 2) + "..." + in.substr(in.length() - maxlen + maxlen / 2);
         else
         {
@@ -169 +169 @@
         out = before + out + after;
         if (show_length)
-                out += SString::sprintf(" (length %d)", in.len());
+                out += SString::sprintf(" (length %d)", in.length());
         return out;
 }
@@ -208 +208 @@
                 else
                 {
-                        if (tmp.len() == 0) return 0; // nothing was changed!
+                        if (tmp.length() == 0) return 0; // nothing was changed!
                         tmp += x;
                         target = tmp;
@@ -223 +223 @@
         {
                 n = strchr(t + pos, ',');
-                if ((!strncmp(t + pos, name.c_str(), name.len())) && (t[pos + name.len()] == '='))
-                {
-                        if (n) end = n - t; else end = txt.len();
+                if ((!strncmp(t + pos, name.c_str(), name.length())) && (t[pos + name.length()] == '='))
+                {
+                        if (n) end = n - t; else end = txt.length();
                         return pos;
                 }
@@ -238 +238 @@
         p = strFindField(txt, name, e);
         if (p < 0) return SString();
-        p += name.len() + 1;
+        p += name.length() + 1;
         return SString(txt.substr(p, e - p));
 }
@@ -248 +248 @@
         if (p < 0)
         {
-                if (!value.len()) return;
-                char *t = txt.directAppend(1 + name.len() + value.len());
+                if (!value.length()) return;
+                char *t = txt.directAppend(1 + name.length() + value.length());
                 char *b = t;
-                if (txt.len()) *(t++) = ',';
-                strcpy(t, name.c_str()); t += name.len();
+                if (txt.length()) *(t++) = ',';
+                strcpy(t, name.c_str()); t += name.length();
                 *(t++) = '=';
-                strcpy(t, value.c_str()); t += value.len();
+                strcpy(t, value.c_str()); t += value.length();
                 txt.endAppend(t - b);
         }
         else
         {
-                if (!value.len())
-                {
-                        if (p > 0) p--; else if (e < txt.len()) e++;
+                if (!value.length())
+                {
+                        if (p > 0) p--; else if (e < txt.length()) e++;
                         char *t = txt.directWrite(0);
-                        memmove(t + p, t + e, txt.len() - e);
-                        txt.endWrite(txt.len() + value.len() - (e - p));
-                }
-                else
-                {
-                        p += name.len() + 1;
-                        char *t = txt.directWrite(txt.len() + value.len() - (e - p));
-                        memmove(t + p + value.len(), t + e, txt.len() - e);
-                        memmove(t + p, value.c_str(), value.len());
-                        txt.endWrite(txt.len() + value.len() - (e - p));
+                        memmove(t + p, t + e, txt.length() - e);
+                        txt.endWrite(txt.length() + value.length() - (e - p));
+                }
+                else
+                {
+                        p += name.length() + 1;
+                        char *t = txt.directWrite(txt.length() + value.length() - (e - p));
+                        memmove(t + p + value.length(), t + e, txt.length() - e);
+                        memmove(t + p, value.c_str(), value.length());
+                        txt.endWrite(txt.length() + value.length() - (e - p));
                 }
         }
@@ -280 +280 @@
 {
         const unsigned char*b = (const unsigned char*)s.c_str();
-        const unsigned char*e = b + s.len();
+        const unsigned char*e = b + s.length();
         while ((b < e) && (*b <= ' ')) b++;
         while ((b < e) && (e[-1] <= ' ')) e--;
-        if ((e - b) == s.len()) return s;
+        if ((e - b) == s.length()) return s;
         SString newstring;
         char* t = newstring.directWrite(e - b);
@@ -291 +291 @@
 }
 
-SString concatPath(const SString& in1,const SString& in2)
-{
-        SString out=in1;
-        if (out.len()>0 && out[out.len()-1]!=PATH_SEPARATOR_CHAR)
-                out+=PATH_SEPARATOR_CHAR;
-        out+=in2;
+SString concatPath(const SString& in1, const SString& in2)
+{
+        SString out = in1;
+        if (out.length() > 0 && out[out.length() - 1] != PATH_SEPARATOR_CHAR)
+                out += PATH_SEPARATOR_CHAR;
+        out += in2;
         return out;
 }
@@ -318 +318 @@
 bool matchWildcard(const SString& word, const SString& pattern)
 {
-        if (pattern.len() == 0)
-                return word.len() == 0;
+        if (pattern.length() == 0)
+                return word.length() == 0;
         int aster = pattern.indexOf('*');
         if (aster >= 0)
@@ -325 +325 @@
                 SString before = pattern.substr(0, aster);
                 SString after = pattern.substr(aster + 1);
-                if (!word.len()) return false;
-                if (before.len()) if (!word.startsWith(before.c_str())) return false;
-                if (after.len())
-                        if ((word.len() < after.len())
-                                || (strcmp(after.c_str(), word.c_str() + word.len() - after.len())))
+                if (!word.length()) return false;
+                if (before.length()) if (!word.startsWith(before.c_str())) return false;
+                if (after.length())
+                        if ((word.length() < after.length())
+                                || (strcmp(after.c_str(), word.c_str() + word.length() - after.length())))
                                 return false;
                 return true;
@@ -339 +339 @@
 bool matchWildcardList(const SString& word, const SString& patterns)
 {
-        if (patterns.len() == 0)
-                return word.len() == 0;
+        if (patterns.length() == 0)
+                return word.length() == 0;
         int pos = 0;
         SString pattern;