Changeset 478 for cpp/frams/param

Timestamp:

03/22/16 01:19:47 (8 years ago)

Author:

Maciej Komosinski

Message:

Accessing const objects, short -> paInt, less critical messages when not necessary, accessing dictionaries with "->"

Location:

cpp/frams/param

Files:

• mutableparam.cpp (modified) (1 diff)
• param.cpp (modified) (5 diffs)
• param.h (modified) (3 diffs)
• paramobj.cpp (modified) (2 diffs)
• paramtabobj.cpp (modified) (2 diffs)

cpp/frams/param/mutableparam.cpp

@@ -171 +171 @@
 ParamEntry *pe=new ParamEntry();
 pe->fun1=0; pe->fun2=0;
-pe->group=(short)group;
-pe->flags=(short)(flags | MUTPARAM_ALLOCENTRY);
+pe->group=(paInt)group;
+pe->flags=(paInt)(flags | MUTPARAM_ALLOCENTRY);
 pe->offset=(intptr_t)data;
 pe->id=strdup(id);

cpp/frams/param/param.cpp

@@ -602 +602 @@
                         if (v.type == TObj)
                         {
-                                logPrintf("ParamInterface", "set", LOG_WARN, "Getting integer value from object reference (%s)", v.getString().c_str());
+                                logPrintf("ParamInterface", "set", LOG_ERROR, "Setting int '%s.%s' from object reference (%s)", getName(), id(i), v.getString().c_str());
                                 return 0;
                         }
@@ -614 +614 @@
                         if (v.type == TObj)
                         {
-                                logPrintf("ParamInterface", "set", LOG_WARN, "Getting floating point value from object reference (%s)", v.getString().c_str());
+                                logPrintf("ParamInterface", "set", LOG_ERROR, "Setting float '%s.%s' from object reference (%s)", getName(), id(i), v.getString().c_str());
                                 return 0;
                         }
@@ -621 +621 @@
                 }
         case 's': { SString t = v.getString(); return setString(i, t); }
-        case 'o': return setObject(i, v.getObject());
+        case 'o':
+                if ((v.type!=TUnknown)&&(v.type!=TObj))
+                        logPrintf("ParamInterface", "set", LOG_ERROR, "Setting object '%s.%s' from %s", getName(), id(i), v.typeAndValue().c_str());
+                else
+                        return setObject(i, v.getObject());
+                break;
         case 'x': return setExtValue(i, v);
         default: logPrintf("ParamInterface", "set", LOG_ERROR, "'%s.%s' is not a field", getName(), id(i));
@@ -645 +650 @@
                         if ((after == NULL) || (*after))
                         {
-                                logPrintf("ParamInterface", "set", LOG_WARN, "serialization format mismatch in %s.%s", (getName() ? getName() : "<Unknown>"), id(i));
+                                logPrintf("ParamInterface", "set", LOG_ERROR, "serialization format mismatch in %s.%s", (getName() ? getName() : "<Unknown>"), id(i));
                                 e.setEmpty();
                         }
@@ -956 +961 @@
         ParamEntry *pe = entry(i);
         if (pe->flags&PARAM_READONLY) return PSET_RONLY;
+        if (pe->flags&PARAM_OBJECTSET)
+                {
+                ExtObject o=getObject(i);
+                Param tmp;
+                ParamInterface* oif=o.getParamInterface(tmp);
+                int ass;
+                if (oif && ((ass=oif->findId("assign"))>=0))
+                        {
+                        ExtValue arg=x;
+                        oif->call(ass,&arg,&v);
+                        }
+                else
+                        logPrintf("SimpleAbstractParam", "setObject", LOG_ERROR,
+                                  "'%s.%s' is PARAM_OBJECTSET but no 'assign()' in %s", getName(), pe->id, o.interfaceName());
+                return PSET_CHANGED;
+                }
         ExtObject xcopy = x; //only needed for messageOnExceedRange(): retain original, requested value of x because it may be changed below
         if (pe->fun2)

cpp/frams/param/param.h

@@ -33 +33 @@
 #define PARAM_DEPRECATED  8192  //< this member is deprecated
 #define PARAM_LINECOMMENT 16384 //< Param::load() adds "@line ..." comment when loading multiline (internal use)
+#define PARAM_OBJECTSET 32768   //< setting this field is handled by the object's assign(...) function and cannot change the object reference
 
 typedef int32_t paInt;
@@ -216 +217 @@
 {
         const char *id;
-        short group, flags;
+        paInt group, flags;
         const char *name, *type;
         intptr_t offset;
@@ -227 +228 @@
 {
 public:
-        ParamEntryConstructor(const char *_id, short _group = 0, short _flags = 0, const char *_name = 0, const char *_type = 0, intptr_t _offset = 0, void *_fun1 = 0, void *_fun2 = 0, const char *_help = 0)
+        ParamEntryConstructor(const char *_id, paInt _group = 0, paInt _flags = 0, const char *_name = 0, const char *_type = 0, intptr_t _offset = 0, void *_fun1 = 0, void *_fun2 = 0, const char *_help = 0)
         {
                 id = _id; group = _group; flags = _flags; name = _name; type = _type; offset = _offset; fun1 = _fun1; fun2 = _fun2; help = _help;

cpp/frams/param/paramobj.cpp

@@ -41 +41 @@
         if (addnew) count++;
         t = tab = (ParamEntry*)malloc(sizeof(ParamEntry)*(count + gcount + 1));
-        t->group = (short)gcount;
-        t->flags = (short)count;
+        t->group = (paInt)gcount;
+        t->flags = (paInt)count;
         t->name = maybedup(dupentries, rename ? rename : pi->getName());
         t->type = maybedup(dupentries, pi->getDescription());
@@ -82 +82 @@
                                         offset += sizeof(ExtValue);
                                         }
-                                t->group = (short)(stripgroups ? 0 : pi->group(i));
-                                t->flags = (short)pi->flags(i);
+                                t->group = (paInt)(stripgroups ? 0 : pi->group(i));
+                                t->flags = (paInt)pi->flags(i);
                                 if (readonly_into_userreadonly && (t->flags & PARAM_READONLY))
                                         t->flags=(t->flags & ~PARAM_READONLY) | PARAM_USERREADONLY;

cpp/frams/param/paramtabobj.cpp

@@ -25 +25 @@
 memmove(tab+siz-count,p,sizeof(ParamEntry)*count);
 memset(tab+siz,0,sizeof(ParamEntry));
-if (siz>0) tab[0].flags=(short)(siz-tab[0].group);
+if (siz>0) tab[0].flags=(paInt)(siz-tab[0].group);
 return siz-1;
 }
@@ -34 +34 @@
 resize(siz-count);
 memset(tab+siz,0,sizeof(ParamEntry));
-if (siz>0) tab[0].flags=(short)(siz-tab[0].group);
+if (siz>0) tab[0].flags=(paInt)(siz-tab[0].group);
 }