Changeset 171

Timestamp:

03/13/14 01:00:33 (11 years ago)

Author:

sz

Message:

getObjectTarget is now the recommended way to retrieve object from ExtValue?, can post the standard warning message about missing object

Location:

cpp/frams

Files:

• _demos/serial_test.cpp (modified) (2 diffs)
• util/extvalue.cpp (modified) (10 diffs)
• util/extvalue.h (modified) (2 diffs)
• vm/classes/3dobject.cpp (modified) (3 diffs)
• vm/classes/collectionobj.cpp (modified) (2 diffs)
• vm/classes/collectionobj.h (modified) (2 diffs)
• vm/classes/genoobj.cpp (modified) (1 diff)
• vm/classes/genoobj.h (modified) (1 diff)

cpp/frams/_demos/serial_test.cpp

@@ -44 +44 @@
                         return;
                         }
-                VectorObject *vec=VectorObject::fromObject(v->getObject());
+                VectorObject *vec=VectorObject::fromObject(v->getObject(),false);
                 if (vec)
                         {
@@ -52 +52 @@
                         return;
                         }
-                DictionaryObject *dict=DictionaryObject::fromObject(v->getObject());
+                DictionaryObject *dict=DictionaryObject::fromObject(v->getObject(),false);
                 if (dict)
                         {

cpp/frams/util/extvalue.cpp

@@ -56 +56 @@
 if (!(subtype&1)) return false;
 if (dbobject->refcount==1) return false;
-VectorObject* v=VectorObject::fromObject(*this);
+VectorObject* v=VectorObject::fromObject(*this,false);
 if (v)
         {
@@ -72 +72 @@
 }
 
-void* ExtObject::getTarget(const char* classname, bool through_barrier) const
+void* ExtObject::getTarget(const char* classname, bool through_barrier, bool warn) const
 {
 if (!strcmp(interfaceName(),classname))
@@ -81 +81 @@
         BarrierObject *bo=BarrierObject::fromObject(*this);
         if (bo)
-                return bo->getSourceObject().getTarget(classname);
+                return bo->getSourceObject().getTarget(classname,true,warn);
         }
 #endif
+
+if (warn)
+        {
+        FMprintf("ExtValue","getObjectTarget",FMLV_WARN,"%s object expected, %s found",classname,interfaceName());
+        }
+
 return NULL;
 }
@@ -173 +179 @@
 
 if (isEmpty()) return SString();
-VectorObject *vec=VectorObject::fromObject(*this);
+VectorObject *vec=VectorObject::fromObject(*this,false);
 if (vec)
         return vec->serialize();
-DictionaryObject *dic=DictionaryObject::fromObject(*this);
+DictionaryObject *dic=DictionaryObject::fromObject(*this,false);
 if (dic)
         return dic->serialize();
@@ -215 +221 @@
 ///////////////////////////////////////
 
+void *ExtValue::getObjectTarget(const char* classname,bool warn) const
+{
+if (type!=TObj)
+        {
+        if (warn)
+                {
+                SString tmp=getString();
+                if (tmp.len()>30) tmp=tmp.substr(0,30)+"...";
+                if (type==TString) tmp=SString("\"")+tmp+SString("\"");
+                FMprintf("ExtValue","getObjectTarget",FMLV_WARN,"%s object expected, %s found",classname,(const char*)tmp);
+                }
+        return NULL;
+        }
+
+return getObject().getTarget(classname,true,warn);
+}
+
 void ExtValue::set(const ExtValue& src)
 {
@@ -326 +349 @@
         case TObj:
                 {
-                VectorObject *vec=VectorObject::fromObject(getObject());
-                VectorObject *vec2=VectorObject::fromObject(src.getObject());
+                VectorObject *vec=VectorObject::fromObject(getObject(),false);
+                VectorObject *vec2=VectorObject::fromObject(src.getObject(),false);
                 if (vec && vec2)
                         {
@@ -368 +391 @@
         case TObj:
                 {
-                VectorObject *vec=VectorObject::fromObject(getObject());
+                VectorObject *vec=VectorObject::fromObject(getObject(),false);
                 if (vec)
                         {
@@ -532 +555 @@
         case TString:
         {
-        VectorObject *vec=VectorObject::fromObject(src.getObject());
+        VectorObject *vec=VectorObject::fromObject(src.getObject(),false);
         if (vec)
                 sdata()=format(sdata(),(const ExtValue**)&vec->data.getref(0),vec->data.size());
@@ -815 +838 @@
         if (cls && (tmp.getType()!=TUnknown) && (tmp.getType()!=TInvalid))
                 {
-                VectorObject *vec=VectorObject::fromObject(tmp.getObject());
+                VectorObject *vec=VectorObject::fromObject(tmp.getObject(),false);
                 if (vec)
                         {
@@ -826 +849 @@
                                 }
                         }
-                DictionaryObject *dic=DictionaryObject::fromObject(tmp.getObject());
+                DictionaryObject *dic=DictionaryObject::fromObject(tmp.getObject(),false);
                 if (dic)
                         {

cpp/frams/util/extvalue.h

@@ -58 +58 @@
 bool matchesInterfaceName(ParamInterface* pi) const {return !strcmp(interfaceName(),pi->getName());}
 void* getTarget() const {return (subtype&1)?dbobject:object;}
-void* getTarget(const char* classname, bool through_barrier=true) const;
+void* getTarget(const char* classname, bool through_barrier=true, bool warn=true) const;
 void setEmpty() {decref();subtype=0;param=NULL;object=NULL;}
 int isEmpty() const {return !param;}
@@ -142 +142 @@
 bool makeUnique() {return (type==TObj) && odata().makeUnique();} //< @return false if nothing has changed
 ExtPType getType() {return type;}
-void *getObjectTarget(const char* classname) {return (type==TObj)?getObject().getTarget(classname):0;}
+void *getObjectTarget(const char* classname,bool warn=true) const;
 void setInt(long v) {if (type!=TInt) setri(v); else idata()=v;}
 void setDouble(double v) {if (type!=TDouble) setrd(v); else ddata()=v;}

cpp/frams/vm/classes/3dobject.cpp

@@ -193 +193 @@
 Pt3D_Ext* Pt3D_Ext::fromObject(const ExtValue& v)
 {
-if (v.type!=TObj) return 0;
-const ExtObject& o=v.getObject();
-return (Pt3D_Ext*)o.getTarget(getStaticParam().getName());
+return (Pt3D_Ext*)v.getObjectTarget(getStaticParam().getName());
 }
 
@@ -444 +442 @@
 Orient_Ext* Orient_Ext::fromObject(const ExtValue& v)
 {
-if (v.type!=TObj) return 0;
-const ExtObject& o=v.getObject();
-return (Orient_Ext*)o.getTarget(getStaticParam().getName());
+return (Orient_Ext*)v.getObjectTarget(getStaticParam().getName());
 }
 
@@ -573 +569 @@
 ReferenceObj* ReferenceObj::fromObject(const ExtValue& v)
 {
-if (v.type!=TObj) return 0;
-const ExtObject& o=v.getObject();
-return (ReferenceObj*)o.getTarget(getStaticParam().getName());
-}
+return (ReferenceObj*)v.getObjectTarget(getStaticParam().getName());
+}

cpp/frams/vm/classes/collectionobj.cpp

@@ -266 +266 @@
 }
 
-VectorObject* VectorObject::fromObject(const ExtObject& o)
-{
-return (VectorObject*)o.getTarget(par.getName());
+VectorObject* VectorObject::fromObject(const ExtObject& o, bool warn)
+{
+return (VectorObject*)o.getTarget(par.getName(),true,warn);
 }
 
@@ -424 +424 @@
 }
 
-DictionaryObject* DictionaryObject::fromObject(const ExtObject& o)
-{
-return (DictionaryObject*)o.getTarget(par.getName());
+DictionaryObject* DictionaryObject::fromObject(const ExtObject& o, bool warn)
+{
+return (DictionaryObject*)o.getTarget(par.getName(), true, warn);
 }
 

cpp/frams/vm/classes/collectionobj.h

@@ -44 +44 @@
 ExtObject makeObject() {return ExtObject(&par,this);}
 
-static VectorObject* fromObject(const ExtObject& o);
+static VectorObject* fromObject(const ExtObject& o, bool warn=true);
 };
 
@@ -74 +74 @@
 static void p_new(void*,ExtValue*args,ExtValue*ret)
         {ret->setObject(ExtObject(&par,new DictionaryObject));}
-static DictionaryObject* fromObject(const ExtObject& v);
+static DictionaryObject* fromObject(const ExtObject& v, bool warn=true);
 ExtObject makeObject() {return ExtObject(&par,this);}
 };

cpp/frams/vm/classes/genoobj.cpp

@@ -107 +107 @@
 }
 
-Geno* GenoObj::fromObject(const ExtValue& v)
+Geno* GenoObj::fromObject(const ExtValue& v, bool warn)
 {
-if (v.type!=TObj) return 0;
-const ExtObject& o=v.getObject();
-//if ((o.param!=&getStaticParam())&&(o.param!=&getDynamicParam())) return 0;
-return (Geno*)o.getTarget(getStaticParam().getName());
+return (Geno*)v.getObjectTarget(getStaticParam().getName(), warn);
 }

cpp/frams/vm/classes/genoobj.h

@@ -33 +33 @@
 static ExtObject makeDynamicObject(Geno* g);
 static ExtObject makeDynamicObjectAndDecRef(Geno* g);
-static Geno* fromObject(const ExtValue& v);
+static Geno* fromObject(const ExtValue& v, bool warn=true);
 static ParamInterface* getInterface();