Changeset 247 for cpp/frams/vm/classes

Timestamp:

11/07/14 17:51:01 (10 years ago)

Author:

Maciej Komosinski

Message:

Sources support both 32-bit and 64-bit, and more compilers

Location:

cpp/frams/vm/classes

Files:

• 3dobject.cpp (modified) (1 diff)
• 3dobject.h (modified) (1 diff)

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

@@ -472 +472 @@
 {return ExtObject(&getStaticParam(),p);}
 
-ParamEntry* ReferenceObj::getStaticParamtab()
-{
-#define FIELDSTRUCT ReferenceObj
-static ParamEntry paramtab[]=
-{
-{"Ref",1,5,"Ref","Reference objects. Useful for returning things from functions.\n\nExample:\nvar x=111;\nsquare(&x);// '&' creates the Reference object\nSimulator.print(x);//x is now 12321\n\nfunction square(r)\n{r.value=r.value*r.value;}\n//square receives the Reference objects and changes its 'value' field"},
-
-{"value",0,PARAM_NOSTATIC,"value","x",GETSET(value),},
-{"newS",0,0,"create new reference","p",PROCEDURE(p_newS),"(for internal use only) use &variablename to create Ref objects.",},
-{"newO",0,0,"create new reference","p",PROCEDURE(p_newO),"(for internal use only) use &variablename to create Ref objects.",},
-{"copyFrom",0,0,"copy the reference","p(oRef)",PROCEDURE(p_copyFrom),"make the reference point to the same target,"},
-{"toString",0,PARAM_READONLY | PARAM_NOSTATIC,"textual form","s",GETONLY(toString),},
-{0,0,0,},
-};
-#undef FIELDSTRUCT
-return paramtab;
-}
-
-Param& ReferenceObj::getStaticParam()
-{
-#ifdef __CODEGUARD__
-static ReferenceObj static_referenceobj;
-static Param static_refobjectparam(getStaticParamtab(),&static_referenceobj);
-#else
-static Param static_refobjectparam(getStaticParamtab());
-#endif
-return static_refobjectparam;
-}
-
-void ReferenceObj::p_newS(ExtValue *args,ExtValue *ret)
-{
-*ret=makeDynamicObject(new ReferenceObj((ExtValue*)args->getInt()));
-}
-
-void ReferenceObj::p_newO(ExtValue *args,ExtValue *ret)
-{
-if (args[0].type==TInt)
-        *ret=makeDynamicObject(new ReferenceObj(args[1].getObject(),args[0].getInt()));
-else
-        *ret=makeDynamicObject(new ReferenceObj(args[1].getObject(),args[0].getString()));
-}
-
-void ReferenceObj::p_copyFrom(ExtValue *args,ExtValue *ret)
-{
-ReferenceObj* other=fromObject(args[0]);
-if (other)
-        {
-        value=other->value;
-        obj=other->obj;
-        prop=other->prop;
-        }
-}
-
-void ReferenceObj::get_toString(ExtValue *ret)
-{
-SString s="(";
-static SListTempl<ReferenceObj*> trace;
-if (trace.find(this)>=0)
-        s+="...";
-else
-        {
-        trace+=this;
-        if (value)
-                s+=value->getString();
-        else
-                {
-                ExtValue v;
-                Param tmp_param;
-                ParamInterface *pi=obj.getParamInterface(tmp_param);
-                pi->get(prop,v);
-                s+=v.getString();
-                }
-        trace-=this;
-        }
-s+=")";
-ret->setString(s);
-}
-
-void ReferenceObj::get_value(ExtValue *ret)
-{
-if (value)
-        *ret=*value;
-else
-        {
-        Param tmp_param;
-        ParamInterface *pi=obj.getParamInterface(tmp_param);
-        pi->get(prop,*ret);
-        }
-}
-
-int ReferenceObj::set_value(const ExtValue *val)
-{
-if (value)
-        *value=*val;
-else
-        {
-        Param tmp_param;
-        ParamInterface *pi=obj.getParamInterface(tmp_param);
-        pi->set(prop,*val);
-        }
-return PSET_CHANGED;
-}
-
-ReferenceObj::ReferenceObj(const ExtObject &o,const SString &p)
-        :value(0),obj(o)
-{
-Param tmp_param;
-ParamInterface *pi=obj.getParamInterface(tmp_param);
-prop=pi->findId(p);
-}
-
-ExtObject ReferenceObj::makeDynamicObject(ReferenceObj* r)
-{return ExtObject(&getStaticParam(),r);}
-
-ReferenceObj* ReferenceObj::fromObject(const ExtValue& v)
-{
-return (ReferenceObj*)v.getObjectTarget(getStaticParam().getName());
-}
-
 /////////////
 

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

@@ -82 +82 @@
 };
 
-class ReferenceObj: public DestrBase
-{
-  public:
-ExtValue *value;
-ExtObject obj;
-int prop;
-
-ReferenceObj(ExtValue *val):value(val) {}
-ReferenceObj() {}
-ReferenceObj(const ExtObject &o,int p):value(0),obj(o),prop(p) {}
-ReferenceObj(const ExtObject &o,const SString &p);
-#define STATRICKCLASS ReferenceObj
-PARAMPROCDEF(p_newS);
-PARAMPROCDEF(p_newO);
-PARAMPROCDEF(p_copyFrom);
-PARAMGETDEF(toString);
-PARAMGETDEF(value);
-PARAMSETDEF(value);
-#undef STATRICKCLASS
-
-static ParamInterface* getInterface();
-static ExtObject makeDynamicObject(ReferenceObj* r);
-static ReferenceObj* fromObject(const ExtValue& v);
-static Param& getStaticParam();
-static ParamEntry* getStaticParamtab();
-};
-
 #endif