Changeset 171 for cpp/frams/vm/classes

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/vm/classes

Files:

• 3dobject.cpp (modified) (3 diffs)
• collectionobj.cpp (modified) (2 diffs)
• collectionobj.h (modified) (2 diffs)
• genoobj.cpp (modified) (1 diff)
• genoobj.h (modified) (1 diff)

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();