Changeset 973 for cpp/frams/param

Timestamp:

07/03/20 00:37:13 (5 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

Location:

cpp/frams/param

Files:

• multiparamload.cpp (modified) (4 diffs)
• mutableparam.cpp (modified) (3 diffs)
• param.cpp (modified) (25 diffs)

cpp/frams/param/multiparamload.cpp

@@ -1 +1 @@
 // This file is a part of Framsticks SDK.  http://www.framsticks.com/
-// Copyright (C) 1999-2018  Maciej Komosinski and Szymon Ulatowski.
+// Copyright (C) 1999-2020  Maciej Komosinski and Szymon Ulatowski.
 // See LICENSE.txt for details.
 
@@ -158 +158 @@
                 }
                 buf = trim(buf);
-                if (buf.len() == 0)
-                        unexpected_line = 0;
-                else if ((buf.len() > 1) && (buf[buf.len() - 1] == ':'))
+                if (buf.length() == 0)
+                        unexpected_line = 0;
+                else if ((buf.length() > 1) && (buf[buf.length() - 1] == ':'))
                 {
                         unexpected_line = 0;
                         lastunknown = 0;
-                        lastunknown = buf.substr(0, buf.len() - 1);
+                        lastunknown = buf.substr(0, buf.length() - 1);
                         lastobject.setEmpty();
                         FOREACH(ExtObject*, o, objects)
@@ -193 +193 @@
                                         thisfilename ? SString::sprintf(" while reading '%s'", thisfilename).c_str() : "");
                         }
-                                break;
+                        break;
 
                         case 1:
@@ -293 +293 @@
                 if (stat == OnError)
                 {
-                abort();
-                return 0;
+                        abort();
+                        return 0;
                 }
         return 1;

cpp/frams/param/mutableparam.cpp

@@ -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.
 
@@ -33 +33 @@
 int MutableParam::findGroup(const SString name, int ignoreprefix)
 {
-        int skipprefix = grprefix.len() ? grprefix.len() + 2 : 0;
+        int skipprefix = grprefix.length() ? grprefix.length() + 2 : 0;
         for (int i = 0; i < groups.size(); i++)
         {
@@ -57 +57 @@
         {
                 tmp = grprefix;
-                if (tmp.len()) tmp += ": ";
+                if (tmp.length()) tmp += ": ";
                 tmp += gname;
         }

cpp/frams/param/param.cpp

@@ -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.
 
@@ -56 +56 @@
         int j;
         for (int i = 0; i < n; i++)
-                if ((!(flags(i)&PARAM_READONLY))
+                if ((!(flags(i) & PARAM_READONLY))
                         && (*type(i) != 'p'))
                 {
@@ -71 +71 @@
         ExtValue v;
         for (int i = 0; i < n; i++)
-                if ((!(flags(i)&PARAM_READONLY))
+                if ((!(flags(i) & PARAM_READONLY))
                         && (*type(i) != 'p'))
                 {
@@ -178 +178 @@
                 else
                 {
-                        if (def.len() > 0) setExtValue(i, ExtValue(def)); else setExtValue(i, ExtValue::empty());
+                        if (def.length() > 0) setExtValue(i, ExtValue(def)); else setExtValue(i, ExtValue::empty());
                 }
         }
@@ -303 +303 @@
 int ParamInterface::saveprop(VirtFILE* f, int i, const char* p, bool force)
 {
-        if ((flags(i)&PARAM_DONTSAVE) && (!force)) return 0;
+        if ((flags(i) & PARAM_DONTSAVE) && (!force)) return 0;
         const char *typ = type(i);
         if (*typ == 'p') return 0;
@@ -323 +323 @@
         quoteTilde(ws);
         w = ws.c_str();
-        if (ws.len() > 50) cr = 1;
+        if (ws.length() > 50) cr = 1;
         else for (t = w; *t; t++) if ((*t == 10) || (*t == 13)) { cr = 1; break; }
         if (cr) f->Vputs("~\n");
@@ -334 +334 @@
 {
         SString ret = getName();
-        ret+=".";
-        ret+=id(prop);
+        ret += ".";
+        ret += id(prop);
         return ret;
 }
@@ -342 +342 @@
 {
         SString name_dot_prop = nameDotProperty(prop);
-        if (strcmp(getName(),getLongName())==0)
-                {
-                if (strcmp(id(prop),name(prop))==0)
+        if (strcmp(getName(), getLongName()) == 0)
+        {
+                if (strcmp(id(prop), name(prop)) == 0)
                         return name_dot_prop;
                 else
-                        return SString("'")+name(prop)+"': "+name_dot_prop;
-                }
-        else
-                return SString("'")+name(prop)+"' in '"+getLongName()+"': "+name_dot_prop;
+                        return SString("'") + name(prop) + "': " + name_dot_prop;
+        }
+        else
+                return SString("'") + name(prop) + "' in '" + getLongName() + "': " + name_dot_prop;
 }
 
@@ -394 +394 @@
         // t+=SString(getName()); t+=':';
         for (i = 0; p = id(i); i++)
-                if (!((fl = flags(i))&PARAM_DONTSAVE))
+                if (!((fl = flags(i)) & PARAM_DONTSAVE))
                 {
                         if (defdata && isequal(i, defdata))
@@ -469 +469 @@
                         nameDotPropertyForMessages(i).c_str(),
                         ::sstringDelimitAndShorten(svaluetoset, 30, show_length, quote, quote).c_str(),
-                        (setflags&PSET_HITMAX) ? (s_type ? "long" : "big") : "small", s_type ? "Truncated" : "Adjusted",
+                        (setflags & PSET_HITMAX) ? (s_type ? "long" : "big") : "small", s_type ? "Truncated" : "Adjusted",
                         ::sstringDelimitAndShorten(actual, 30, show_length, quote, quote).c_str()
                 );
@@ -583 +583 @@
                         else
                                 seen[i] = true;
-                        if (!(flags(i)&PARAM_DONTLOAD))
+                        if (!(flags(i) & PARAM_DONTLOAD))
                         {
                                 if (p0[p_len + 1] == '~')
@@ -600 +600 @@
                                         int ch; while ((ch = f->Vgetc()) != EOF) if (ch == '\n') break;
                                         unquoteTilde(s);
-                                        if (options.linenum && (flags(i)&PARAM_LINECOMMENT))
+                                        if (options.linenum && (flags(i) & PARAM_LINECOMMENT))
                                                 s = SString::sprintf("@file %s\n@line %d\n", f->VgetPath(), *options.linenum + 1) + s;
                                         setFromString(i, s.c_str(), false);
@@ -943 +943 @@
         if (err != NULL)
                 logPrintf("SimpleAbstractParam", "sanityCheck", LOG_ERROR,
-                          "Invalid ParamEntry for %s (%s)", nameDotPropertyForMessages(i).c_str(), err);
+                        "Invalid ParamEntry for %s (%s)", nameDotPropertyForMessages(i).c_str(), err);
 }
 #endif
@@ -1054 +1054 @@
         ExtValue v;
         ParamEntry *pe = entry(i);
-        if (pe->flags&PARAM_READONLY) return PSET_RONLY;
+        if (pe->flags & PARAM_READONLY) return PSET_RONLY;
         paInt xcopy = x; //only needed for messageOnExceedRange(): retain original, requested value of x because it may be changed below
         paInt mn = 0, mx = 0, de = 0;
@@ -1088 +1088 @@
         ExtValue v;
         ParamEntry *pe = entry(i);
-        if (pe->flags&PARAM_READONLY) return PSET_RONLY;
+        if (pe->flags & PARAM_READONLY) return PSET_RONLY;
         double xcopy = x; //only needed for messageOnExceedRange(): retain original, requested value of x because it may be changed below
         double mn = 0, mx = 0, de = 0;
@@ -1124 +1124 @@
         const SString *xx = &x;
         ParamEntry *pe = entry(i);
-        if (pe->flags&PARAM_READONLY) return PSET_RONLY;
+        if (pe->flags & PARAM_READONLY) return PSET_RONLY;
         SString xcopy = x; //only needed for messageOnExceedRange(): retain original, requested value of x because it may be changed below
         const char* t = pe->type + 1;
@@ -1132 +1132 @@
         if (sscanf(t, "%d %d", &mn, &mx) == 2) //using getMinMax would also get default value, which is not needed here
         {
-                if ((x.len() > mx) && (mx > 0))
+                if ((x.length() > mx) && (mx > 0))
                 {
                         vs = x.substr(0, mx);
@@ -1163 +1163 @@
         ExtValue v;
         ParamEntry *pe = entry(i);
-        if (pe->flags&PARAM_READONLY) return PSET_RONLY;
-        if (pe->flags&PARAM_OBJECTSET)
+        if (pe->flags & PARAM_READONLY) return PSET_RONLY;
+        if (pe->flags & PARAM_OBJECTSET)
         {
                 ExtObject o = getObject(i);
@@ -1200 +1200 @@
         SANITY_CHECK(i);
         ParamEntry *pe = entry(i);
-        if (pe->flags&PARAM_READONLY) return PSET_RONLY;
+        if (pe->flags & PARAM_READONLY) return PSET_RONLY;
         ExtValue xcopy = x; //only needed for messageOnExceedRange(): retain original, requested value of x because it may be changed below
         if (pe->fun2)
@@ -1255 +1255 @@
 {
         const char *beg = s.c_str() + poz;
-        if (poz >= s.len()) { poz = s.len(); len = 0; return s.c_str() + s.len(); }
+        if (poz >= s.length()) { poz = s.length(); len = 0; return s.c_str() + s.length(); }
         const char *lf = strchr(beg, '\n');
-        if (!lf) { lf = s.c_str() + s.len() - 1; poz = s.len(); }
-        else { poz = (int)(lf - s.c_str()) + 1; if (poz > s.len()) poz = s.len(); }
+        if (!lf) { lf = s.c_str() + s.length() - 1; poz = s.length(); }
+        else { poz = (int)(lf - s.c_str()) + 1; if (poz > s.length()) poz = s.length(); }
         while (lf >= beg) if ((*lf == '\n') || (*lf == '\r')) lf--; else break;
         len = (int)(lf - beg) + 1;
@@ -1278 +1278 @@
         SString tmpvalue;
         bool parse_failed = false;
-        if (options.offset >= s.len()) return fields_loaded;
+        if (options.offset >= s.length()) return fields_loaded;
         t = s.c_str() + options.offset;
 
@@ -1316 +1316 @@
                 if (field_end == t)     // skip empty value
                 {
-                        t++; if (i>=0) i++;
+                        t++; if (i >= 0) i++;
                         continue;
                 }
@@ -1332 +1332 @@
 #ifdef WARN_MISSING_NAME
                 else // no parameter name
-                        {
+                {
 #ifdef SAVE_SELECTED_NAMES
                         if ((i < 0) // field after unknown field
-                            || (i >= getPropCount()) // field after last field
-                            || !(flags(i)&PARAM_CANOMITNAME)) // valid field but it can't be skipped
+                                || (i >= getPropCount()) // field after last field
+                                || !(flags(i) & PARAM_CANOMITNAME)) // valid field but it can't be skipped
 #endif
                         {
@@ -1344 +1344 @@
                                         logPrintf("Param", "loadSingleLine", LOG_WARN, "Value after the last property of '%s'", getName());
                         }
-                        }
+                }
                 //else skipping a skippable field
 #endif
@@ -1364 +1364 @@
                         ret = setFromString(i, value, true);
                         fields_loaded++;
-                        if (ret&PSET_PARSEFAILED)
+                        if (ret & PSET_PARSEFAILED)
                                 parse_failed = true;
                         *(char*)valstop = remember;