Changeset 144 for cpp/frams/param

Timestamp:

02/26/14 20:04:49 (11 years ago)

Author:

sz

Message:

Param and ExtValue? improvements (better control on conversions, "load" returns the number of loaded fields)

Location:

cpp/frams/param

Files:

• param.cpp (modified) (13 diffs)
• param.h (modified) (1 diff)

cpp/frams/param/param.cpp

@@ -331 +331 @@
 }
 
-void ParamInterface::load(VirtFILE* f)
+int ParamInterface::load(VirtFILE* f)
 {
 SString buf;
@@ -338 +338 @@
 int p_len;
 bool loaded;
+int fields_loaded=0;
 while(loadSStringLine(f,buf))
         {
@@ -361 +362 @@
                         set(i,p0+p_len+1);
                         }
+                fields_loaded++;
                 loaded=true;
                 }
@@ -370 +372 @@
                 }
         }
+return fields_loaded;
 }
 
@@ -444 +447 @@
         }
 else
-        return setInt(i,atol(str));
+        return setInt(i,ExtValue::getInt(str));
 }
 
@@ -458 +461 @@
         }
 else
-        return setDouble(i,atof(str));
+        return setDouble(i,ExtValue::getDouble(str));
 }
 
@@ -465 +468 @@
 switch(type(i)[0])
         {
-        case 'd': if (v.type!=TObj) return setInt(i,v.getInt()); else return setInt(i,(const char*)v.getString());
-        case 'f': if (v.type!=TObj) return setDouble(i,v.getDouble()); else return setDouble(i,(const char*)v.getString());
+        case 'd':
+                if ((v.type==TInt)||(v.type==TDouble)) return setInt(i,v.getInt());
+                else
+                        {
+                        if (v.type==TObj)
+                                FMprintf("ParamInterface","set",FMLV_WARN,"Getting integer value from object reference (%s)",(const char*)v.getString());
+                        return setInt(i,(const char*)v.getString());
+                        }
+        case 'f':
+                if ((v.type==TInt)||(v.type==TDouble)) return setDouble(i,v.getDouble());
+                else
+                        {
+                        if (v.type==TObj)
+                                FMprintf("ParamInterface","set",FMLV_WARN,"Getting floating point value from object reference (%s)",(const char*)v.getString());
+                        return setDouble(i,(const char*)v.getString());
+                        }
         case 's': { SString t=v.getString(); return setString(i,t); }
         case 'o': return setObject(i,v.getObject());
         case 'x': return setExtValue(i,v);
-        default: FMprintf("ParamInterface","get",FMLV_ERROR,"'%s.%s' is not a field",getName(),id(i));
+        default: FMprintf("ParamInterface","set",FMLV_ERROR,"'%s.%s' is not a field",getName(),id(i));
         }
 return 0;
@@ -826 +843 @@
 }
 
-void ParamInterface::load2(const SString &s,int &poz)
+int ParamInterface::load2(const SString &s,int &poz)
 {
 int i; // numer akt. parametru
@@ -832 +849 @@
 int len;
 int ret;
+int fields_loaded=0;
 const char *t,*lin,*end;
 const char *rownasie,*przecinek;
@@ -838 +856 @@
 const char *value,*valstop;
 SString tmpvalue;
-if (poz>=s.len()) return;
+if (poz>=s.len()) return fields_loaded;
 t=(const char*)s+poz;
 
 // na razie wszystko musi byc w jednej linii...
 lin=getline(s,poz,len);
-if (!len) return; // pusta linia = koniec
+if (!len) return fields_loaded; // pusta linia = koniec
 i=0;
 end=lin+len;
@@ -849 +867 @@
 {
 // przetwarzanie jednego par
-while (strchr(" \n\r\t",*t)) if (t<end) t++; else return;
+while (strchr(" \n\r\t",*t)) if (t<end) t++; else return fields_loaded;
 
 przecinek=strchrlimit(t,',',end); if (!przecinek) przecinek=end;
@@ -908 +926 @@
         *(char*)valstop=0;
         ret=set(i,value);
+        fields_loaded++;
         if (ret&(PSET_HITMAX|PSET_HITMIN))
                 FMprintf("Param","load2",FMLV_WARN,"Adjusted '%s' in '%s' (was too %s)",
@@ -916 +935 @@
 if (i>=0) i++;
 #ifdef __CODEGUARD__ 
-if (przecinek<end-1) t=przecinek+1; else return;
+if (przecinek<end-1) t=przecinek+1; else return fields_loaded;
 #else
 t=przecinek+1;
 #endif
 }
-return;
+return fields_loaded;
 }
 

cpp/frams/param/param.h

@@ -154 +154 @@
 int save(VirtFILE*,const char* altname=NULL,bool force=0);
 int saveprop(VirtFILE*,int i,const char* p,bool force=0);
-void load(VirtFILE*);
-void load2(const SString &,int &);
+int load(VirtFILE*);///< @return number of fields loaded
+int load2(const SString &,int &);///< @return number of fields loaded
 
 static const char* SERIALIZATION_PREFIX;