Changeset 348 for cpp/frams/param/param.cpp

Timestamp:

04/09/15 23:51:28 (10 years ago)

Author:

Maciej Komosinski

Message:

• explicit c_str() in SString instead of (const char*) cast
• genetic converters and GenMan? are now thread-local which enables multi-threaded simulator separation

File:

• cpp/frams/param/param.cpp (modified) (13 diffs)

cpp/frams/param/param.cpp

@@ -301 +301 @@
                 ws = get(i);
         quoteTilde(ws);
-        w = ws;
+        w = ws.c_str();
         if (ws.len() > 50) cr = 1;
         else for (t = w; *t; t++) if ((*t == 10) || (*t == 13)) { cr = 1; break; }
@@ -372 +372 @@
                         { // string - special case
                                 SString str = getString(i);
-                                if (strContainsOneOf(str, ", \\\n\r\t\""))
+                                if (strContainsOneOf(str.c_str(), ", \\\n\r\t\""))
                                 {
                                         t += "\"";
@@ -403 +403 @@
         {
                 if (linenum) (*linenum)++;
-                const char* t = (const char*)buf;
+                const char* t = buf.c_str();
                 p0 = t; while ((*p0 == ' ') || (*p0 == '\t')) p0++;
                 if (!*p0) break;
@@ -419 +419 @@
                                         czytdotyldy(f, s);
                                         int lfcount = 1;
-                                        const char* tmp = s;
+                                        const char* tmp = s.c_str();
                                         while (tmp)
                                                 if ((tmp = strchr(tmp, '\n')))
@@ -430 +430 @@
                                         if (linenum && (flags(i)&PARAM_LINECOMMENT))
                                                 s = SString::sprintf("@file %s\n@line %d\n", f->VgetPath(), *linenum + 1) + s;
-                                        set(i, (const char*)s);
+                                        set(i, s.c_str());
                                         if (linenum)
                                                 (*linenum) += lfcount;
@@ -445 +445 @@
                 {
                         SString name(p0, p_len);
-                        FMprintf("ParamInterface", "load", FMLV_WARN, "Unknown property '%s' while reading object '%s' (ignored)", (const char*)name, getName());
+                        FMprintf("ParamInterface", "load", FMLV_WARN, "Unknown property '%s' while reading object '%s' (ignored)", name.c_str(), getName());
                 }
 
@@ -454 +454 @@
                         if (linenum)
                         {
-                                const char* tmp = s;
+                                const char* tmp = s.c_str();
                                 int lfcount = 1;
                                 while (tmp)
@@ -562 +562 @@
                         if (v.type == TObj)
                         {
-                                FMprintf("ParamInterface", "set", FMLV_WARN, "Getting integer value from object reference (%s)", (const char*)v.getString());
+                                FMprintf("ParamInterface", "set", FMLV_WARN, "Getting integer value from object reference (%s)", v.getString().c_str());
                                 return 0;
                         }
                         else
-                                return setInt(i, (const char*)v.getString());
+                                return setInt(i, v.getString().c_str());
                 }
         case 'f':
@@ -574 +574 @@
                         if (v.type == TObj)
                         {
-                                FMprintf("ParamInterface", "set", FMLV_WARN, "Getting floating point value from object reference (%s)", (const char*)v.getString());
+                                FMprintf("ParamInterface", "set", FMLV_WARN, "Getting floating point value from object reference (%s)", v.getString().c_str());
                                 return 0;
                         }
                         else
-                                return setDouble(i, (const char*)v.getString());
+                                return setDouble(i, v.getString().c_str());
                 }
         case 's': { SString t = v.getString(); return setString(i, t); }
@@ -990 +990 @@
 static const char *getline(const SString &s, int &poz, int &len)
 {
-        const char *beg = (const char*)s + poz;
-        if (poz >= s.len()) { poz = s.len(); len = 0; return (const char*)s + s.len(); }
+        const char *beg = s.c_str() + poz;
+        if (poz >= s.len()) { poz = s.len(); len = 0; return s.c_str() + s.len(); }
         const char *lf = strchr(beg, '\n');
-        if (!lf) { lf = (const char*)s + s.len() - 1; poz = s.len(); }
-        else { poz = (int)(lf - (const char*)s) + 1; if (poz > s.len()) poz = s.len(); }
+        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(); }
         while (lf >= beg) if ((*lf == '\n') || (*lf == '\r')) lf--; else break;
         len = (int)(lf - beg) + 1;
@@ -1014 +1014 @@
         SString tmpvalue;
         if (poz >= s.len()) return fields_loaded;
-        t = (const char*)s + poz;
+        t = s.c_str() + poz;
 
         lin = getline(s, poz, len); // all fields must be encoded in a single line
@@ -1060 +1060 @@
                         {
                                 SString name(t, (int)(equals_sign - t));
-                                FMprintf("Param", "load2", FMLV_WARN, "Unknown property '%s' while reading object '%s' (ignored)", (const char*)name, getName());
+                                FMprintf("Param", "load2", FMLV_WARN, "Unknown property '%s' while reading object '%s' (ignored)", name.c_str(), getName());
                         }
                         t = equals_sign + 1; // t=value
@@ -1081 +1081 @@
                                 tmpvalue.copyFrom(quote + 1, (int)(quote2 - quote) - 1);
                                 sstringUnquote(tmpvalue);
-                                value = tmpvalue;
+                                value = tmpvalue.c_str();
                                 valstop = quote2;
                         }