Changeset 104 for cpp/gdk/param.cpp

Timestamp:

07/23/13 18:15:30 (11 years ago)

Author:

sz

Message:

introducing object de/serialization - see serialtest.cpp
the core GDK classes can be now used in multiple threads (ifdef MULTITHREADED)

File:

• cpp/gdk/param.cpp (modified) (12 diffs)

cpp/gdk/param.cpp

@@ -231 +231 @@
 }
 
+const char* ParamInterface::SERIALIZATION_PREFIX="@Serialized:";
+
 int ParamInterface::saveprop(VirtFILE* f,int i,const char* p,bool force)
 {
@@ -243 +245 @@
 err|=(fputs(p,f)==EOF); fputc(':',f);
 cr=0;
-ws=get(i);
+if (*typ=='x')
+        {
+        ExtValue ex;
+        get(i,ex);
+        ws=SString(SERIALIZATION_PREFIX)+ex.serialize();
+        }
+else
+        ws=get(i);
 quoteTilde(ws);
 w=ws;
@@ -497 +506 @@
         {
         ExtValue e;
-        if (isdigit(*v)||((*v=='-')&&isdigit(v[1])))
-                {
-                if (strchr(v,'.')) e.setDouble(atof(v));
-                else e.setInt(atol(v));
+        const char* after;
+        if (!strncmp(v,SERIALIZATION_PREFIX,strlen(SERIALIZATION_PREFIX)))
+                {
+                after=e.deserialize(v+strlen(SERIALIZATION_PREFIX));
+                if ((after==NULL)||(*after))
+                        FMprintf("ParamInterface","set",FMLV_WARN,"serialization format mismatch in %s.%s",(getName()?getName():"<Unknown>"),id(i));
+                }
+        else if ((after=e.parseNumber(v))&&(*after==0)) //consumed the whole string
+                {
+                //OK!
                 }
         else
@@ -566 +581 @@
 long SimpleAbstractParam::getInt(int i)
 {
-static ExtValue v;
+ExtValue v;
 ParamEntry *pe=entry(i);
 if (pe->fun1)
@@ -582 +597 @@
 double SimpleAbstractParam::getDouble(int i)
 {
-static ExtValue v;
+ExtValue v;
 ParamEntry *pe=entry(i);
 if (pe->fun1)
@@ -598 +613 @@
 SString SimpleAbstractParam::getString(int i)
 {
-static ExtValue v;
+ExtValue v;
 ParamEntry *pe=entry(i);
 if (pe->fun1)
@@ -614 +629 @@
 ExtObject SimpleAbstractParam::getObject(int i)
 {
-static ExtValue v;
+ExtValue v;
 ParamEntry *pe=entry(i);
 if (pe->fun1)
@@ -630 +645 @@
 ExtValue SimpleAbstractParam::getExtValue(int i)
 {
-static ExtValue v;
+ExtValue v;
 ParamEntry *pe=entry(i);
 if (pe->fun1)
@@ -649 +664 @@
 int SimpleAbstractParam::setInt(int i,long x)
 {
-static ExtValue v;
+ExtValue v;
 ParamEntry *pe=entry(i);
 if (pe->flags&PARAM_READONLY) return PSET_RONLY;
-long xcopy=x; //only needed for helpful printed messages: retain original, requested value of x because it may be changed below
+long xcopy=x; //only needed for messageOnExceedRange(): retain original, requested value of x because it may be changed below
 long a=0,b=0;
 int result=0;
@@ -684 +699 @@
 int SimpleAbstractParam::setDouble(int i,double x)
 {
-static ExtValue v;
+ExtValue v;
 ParamEntry *pe=entry(i);
 if (pe->flags&PARAM_READONLY) return PSET_RONLY;
-double xcopy=x; //only needed for helpful printed messages: retain original, requested value of x because it may be changed below
+double xcopy=x; //only needed for messageOnExceedRange(): retain original, requested value of x because it may be changed below
 double a=0,b=0;
 int result=0;
@@ -719 +734 @@
 int SimpleAbstractParam::setString(int i,const SString& x)
 {
-static ExtValue v;
-static SString vs;
+ExtValue v;
+SString vs;
 const SString *xx=&x;
 ParamEntry *pe=entry(i);
 if (pe->flags&PARAM_READONLY) return PSET_RONLY;
-SString xcopy=x; //only needed for helpful printed messages: retain original, requested value of x because it may be changed below
+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;
 while(*t) if (*t==' ') break; else t++;
@@ -759 +774 @@
 int SimpleAbstractParam::setObject(int i,const ExtObject& x)
 {
-static ExtValue v;
+ExtValue v;
 ParamEntry *pe=entry(i);
 if (pe->flags&PARAM_READONLY) return PSET_RONLY;
-ExtObject xcopy=x; //only needed for helpful printed messages: retain original, requested value of x because it may be changed below
+ExtObject xcopy=x; //only needed for messageOnExceedRange(): retain original, requested value of x because it may be changed below
 if (pe->fun2)
         {