[Gnash-commit] gnash ChangeLog testsuite/actionscript.all/Obje...

[Sandro Santilli]

CVSROOT:        /sources/gnash
Module name:    gnash
Changes by:     Sandro Santilli <strk>  07/10/23 17:33:42

Modified files:
        .              : ChangeLog 
        testsuite/actionscript.all: Object.as 

Log message:
                * testsuite/actionscript.all/Object.as: more failures about
                  setting members which has a  normal property in the 
inheritance
                  chain but a getter-setter higher in the chain.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.4675&r2=1.4676
http://cvs.savannah.gnu.org/viewcvs/gnash/testsuite/actionscript.all/Object.as?cvsroot=gnash&r1=1.35&r2=1.36

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.4675
retrieving revision 1.4676
diff -u -b -r1.4675 -r1.4676
--- ChangeLog   23 Oct 2007 15:32:54 -0000      1.4675
+++ ChangeLog   23 Oct 2007 17:33:42 -0000      1.4676
@@ -1,5 +1,8 @@
 2007-10-23 Sandro Santilli <address@hidden>
 
+       * testsuite/actionscript.all/Object.as: more failures about 
+         setting members which has a  normal property in the inheritance
+         chain but a getter-setter higher in the chain.
        * testsuite/actionscript.all/with.as: more failures !
        * macros/sdl.m4: cleanups
        * configure.ac: use test, not the ``['' command, in m4 macros.

Index: testsuite/actionscript.all/Object.as
===================================================================
RCS file: /sources/gnash/gnash/testsuite/actionscript.all/Object.as,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -b -r1.35 -r1.36
--- testsuite/actionscript.all/Object.as        29 Sep 2007 16:22:58 -0000      
1.35
+++ testsuite/actionscript.all/Object.as        23 Oct 2007 17:33:42 -0000      
1.36
@@ -20,7 +20,7 @@
 // compile this test case with Ming makeswf, and then
 // execute it like this gnash -1 -r 0 -v out.swf
 
-rcsid="$Id: Object.as,v 1.35 2007/09/29 16:22:58 strk Exp $";
+rcsid="$Id: Object.as,v 1.36 2007/10/23 17:33:42 strk Exp $";
 
 #include "check.as"
 
@@ -279,6 +279,31 @@
 check_equals (inh2.len, 7);
 check_equals (proto.len, undefined);
 
+inh2.ogs = 5; // overridden getter-setter
+var inh2d = new Object;
+check(proto.addProperty("ogs", getLen, setLen));
+inh2d.__proto__ = inh2;
+inh2d._len = 8;
+proto._len = 14;
+
+//
+// Inheritance is: inh2d : inh2 : proto
+//     inh2d.ogs doesn't exist at this time
+//     inh2.ogs is a normal member (value: 5)
+//     proto.ogs is a getter-setter (changes: this._len)
+//
+check( ! inh2d.hasOwnProperty("ogs") );
+check( inh2d.__proto__.hasOwnProperty("ogs") );
+check( inh2d.__proto__.__proto__.hasOwnProperty("ogs") );
+check_equals(inh2d.ogs, 5); // find inh2.ogs
+check_equals(inh2.ogs, 5); // find inh2.ogs
+check_equals(inh2.__proto__.ogs, 14); // find proto.ogs
+inh2d.ogs = 54; // sets what ?
+xcheck_equals(inh2d._len, 54); // this._len ! So the getter-setter takes 
precedence
+xcheck_equals(inh2d.ogs, 5); // does NOT override inh2.ogs normal member
+check_equals(inh2.ogs, 5); // find inh2.ogs
+check_equals(inh2.__proto__.ogs, 14); // find proto.ogs
+
 // Override addProperty member
 var o = new Object();
 o.addProperty = function(a, b) { return a+b; };
@@ -432,4 +457,10 @@
 // TODO: add tests here !
 
 #endif // OUTPUT_VERSION > 5
-totals();
+
+
+#if OUTPUT_VERSION > 5
+totals(156);
+#else
+totals(63);
+#endif