Changeset 792 for cpp/frams/param/paramobj.cpp

Timestamp:

05/29/18 16:32:45 (7 years ago)

Author:

Maciej Komosinski

Message:

Code formatting

File:

• cpp/frams/param/paramobj.cpp (modified) (4 diffs)

cpp/frams/param/paramobj.cpp

@@ -23 +23 @@
 
 ParamEntry* ParamObject::makeParamTab(ParamInterface *pi, bool stripgroups, bool stripproc,
-                                      int firstprop, int maxprops, bool dupentries, int flagsexclude_data, int flagsexclude_tab, bool addnew, const char* rename, bool readonly_into_userreadonly)
-{
-// flagsexclude_data - skip while calculating data offsets
-// flagsexclude_tab - skip while creating paramtab
-// usually _data==_tab, but vmneuron public properties need _data=0 and _tab=PARAM_USERHIDDEN (data object has all fields, paramtab skips private fields)
+        int firstprop, int maxprops, bool dupentries, int flagsexclude_data, int flagsexclude_tab, bool addnew, const char* rename, bool readonly_into_userreadonly)
+{
+        // flagsexclude_data - skip while calculating data offsets
+        // flagsexclude_tab - skip while creating paramtab
+        // usually _data==_tab, but vmneuron public properties need _data=0 and _tab=PARAM_USERHIDDEN (data object has all fields, paramtab skips private fields)
         ParamEntry *tab, *t;
         int i, n, offset;
@@ -72 +72 @@
         for (i = firstprop; i < pi->getPropCount(); i++)
         {
-                const char* type=pi->type(i);
+                const char* type = pi->type(i);
                 if ((!stripproc) || (strchr("dfsox", type[0])))
                 {
-                        paInt flag=pi->flags(i);
+                        paInt flag = pi->flags(i);
                         int tmp_offset;
                         if ((!flagsexclude_data) || (!(flag&flagsexclude_data)))
                         {
-                                if (type[0]=='p')
-                                        tmp_offset=0;
+                                if (type[0] == 'p')
+                                        tmp_offset = 0;
                                 else
-                                        {
+                                {
                                         tmp_offset = offset;
                                         if (type[0] != 'x') tmp_offset += (((char*)&ex.data[0]) - ((char*)&ex));
                                         offset += sizeof(ExtValue);
-                                        }
+                                }
                         }
 
                         if ((!flagsexclude_tab) || (!(flag&flagsexclude_tab)))
                         {
-                                t->offset=tmp_offset;
+                                t->offset = tmp_offset;
                                 t->group = (paInt)(stripgroups ? 0 : pi->group(i));
                                 t->flags = (paInt)flag;
                                 if (readonly_into_userreadonly && (t->flags & PARAM_READONLY))
-                                        t->flags=(t->flags & ~PARAM_READONLY) | PARAM_USERREADONLY;
+                                        t->flags = (t->flags & ~PARAM_READONLY) | PARAM_USERREADONLY;
                                 t->fun1 = 0;
                                 t->fun2 = 0;
@@ -185 +185 @@
 {
         if (!tab) return NULL;
-        int n=tab->flags, used_fields=0;
-        for (ParamEntry *t=tab+tab->group; n > 0; n--, t++)
-                if (strchr("dfsox",t->type[0]))
+        int n = tab->flags, used_fields = 0;
+        for (ParamEntry *t = tab + tab->group; n > 0; n--, t++)
+                if (strchr("dfsox", t->type[0]))
                         used_fields++;
 
-        if (used_fields==0) return NULL;
+        if (used_fields == 0) return NULL;
         ParamObject *obj = new(used_fields)ParamObject(used_fields, tab); // new(n): allocate n fields ; ParamObject(n,...): tell the object it has n fields
         ExtValue *v = &obj->fields[0];
-        n=tab->flags;
-        for (ParamEntry *t=tab+tab->group; n > 0; n--, t++)
+        n = tab->flags;
+        for (ParamEntry *t = tab + tab->group; n > 0; n--, t++)
                 switch (*t->type)
         {
@@ -201 +201 @@
                 case 's': v->setString(SString::empty()); v++; break;
                 case 'o':
-                        {
+                {
                         ExtObject new_obj;
                         if (t->flags & PARAM_OBJECTSET)
+                        {
+                                ParamInterface *cls = ExtValue::findDeserializableClass(t->type + 1);
+                                if (cls)
                                 {
-                                ParamInterface *cls=ExtValue::findDeserializableClass(t->type+1);
-                                if (cls)
+                                        int new_fun = cls->findId("new");
+                                        if (new_fun >= 0)
                                         {
-                                        int new_fun = cls->findId("new");
-                                        if (new_fun>=0)
-                                                {
-                                                ExtValue dummy,new_value;
+                                                ExtValue dummy, new_value;
                                                 cls->call(new_fun, &dummy, &new_value);
-                                                new_obj=new_value.getObject();
-                                                }
+                                                new_obj = new_value.getObject();
                                         }
                                 }
+                        }
                         v->setObject(new_obj);
                         v++;
-                        }
+                }
                         break;
                 case 'x': v++; break;