[Gnash-commit] gnash/server Property.h Property.cpp

[Chad Musick]

CVSROOT:        /sources/gnash
Module name:    gnash
Changes by:     Chad Musick <cmusick>   07/10/29 21:50:14

Modified files:
        server         : Property.h Property.cpp 

Log message:
        getGetter and getSetter

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/server/Property.h?cvsroot=gnash&r1=1.12&r2=1.13
http://cvs.savannah.gnu.org/viewcvs/gnash/server/Property.cpp?cvsroot=gnash&r1=1.1&r2=1.2

Patches:
Index: Property.h
===================================================================
RCS file: /sources/gnash/gnash/server/Property.h,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -b -r1.12 -r1.13
--- Property.h  27 Oct 2007 16:43:44 -0000      1.12
+++ Property.h  29 Oct 2007 21:50:14 -0000      1.13
@@ -198,9 +198,15 @@
 
        /// Set the setter
        void setSetter(as_function*);
+       /// Get the setter, throws if not a getter/setter
+       as_function *getSetter()
+       { return boost::get<as_accessors>(mBound).mSetter; }
 
        /// Set the getter
        void setGetter(as_function*);
+       /// Get the getter, throws if not a getter/setter
+       as_function *getGetter()
+       { return boost::get<as_accessors>(mBound).mGetter; }
 
        /// is this a read-only member ?
        bool isReadOnly() const { return _flags.get_read_only(); }

Index: Property.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/Property.cpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- Property.cpp        18 Oct 2007 11:47:53 -0000      1.1
+++ Property.cpp        29 Oct 2007 21:50:14 -0000      1.2
@@ -43,8 +43,8 @@
        return (*a->mGetter)(fn);
 
        as_value v;     
-       VM::get().getMachine()->immediateFunction(a->mGetter, v,
-               const_cast<as_object*>(&this_ptr));
+       VM::get().getMachine()->immediateFunction(a->mGetter, 
+               const_cast<as_object*>(&this_ptr),      v, 0, 0);
        if (mDestructive)
        {
                ((boundType) mBound) = v;
@@ -63,8 +63,9 @@
        (*a->mSetter)(fn);
        return;
 
-       VM::get().getMachine()->immediateProcedure(a->mSetter, &this_ptr,
-               &value, 1);
+       // TODO: Push value
+       VM::get().getMachine()->immediateProcedure(a->mSetter,
+               const_cast<as_object*>(&this_ptr), 1, 0);
 }
 
 void