[Gnash-commit] gnash ChangeLog server/as_function.cpp testsuit...

[Zou Lunkai]

CVSROOT:        /sources/gnash
Module name:    gnash
Changes by:     Zou Lunkai <zoulunkai>  07/08/17 03:21:47

Modified files:
        .              : ChangeLog 
        server         : as_function.cpp 
        testsuite/actionscript.all: Inheritance.as 

Log message:
        * server/as_function.cpp: initialize '__proto__' instead of 
'constructor'.
        * testsuite/actionscript.all/Inheritance.as: more passes.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.4013&r2=1.4014
http://cvs.savannah.gnu.org/viewcvs/gnash/server/as_function.cpp?cvsroot=gnash&r1=1.36&r2=1.37
http://cvs.savannah.gnu.org/viewcvs/gnash/testsuite/actionscript.all/Inheritance.as?cvsroot=gnash&r1=1.34&r2=1.35

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.4013
retrieving revision 1.4014
diff -u -b -r1.4013 -r1.4014
--- ChangeLog   16 Aug 2007 23:26:02 -0000      1.4013
+++ ChangeLog   17 Aug 2007 03:21:46 -0000      1.4014
@@ -1,4 +1,9 @@
-2007-08-13  Alfred M. Szmidt  <address@hidden>
+2007-08-17 Zou Lunkai <address@hidden>
+       
+       * server/as_function.cpp: initialize '__proto__' instead of 
'constructor'.
+       * testsuite/actionscript.all/Inheritance.as: more passes.
+
+2007-08-17  Alfred M. Szmidt  <address@hidden>
 
        * configure.ac: State that a <= 2.4 version of AGG is an error.
 

Index: server/as_function.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/as_function.cpp,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -b -r1.36 -r1.37
--- server/as_function.cpp      2 Aug 2007 21:14:35 -0000       1.36
+++ server/as_function.cpp      17 Aug 2007 03:21:47 -0000      1.37
@@ -124,7 +124,7 @@
 as_function::extends(as_function& superclass)
 {
        _properties = new as_object(superclass.getPrototype());
-       _properties->init_member("constructor", &superclass); 
+       _properties->init_member("__proto__", superclass.getPrototype());
        if ( VM::get().getSWFVersion() > 5 )
        {
                _properties->init_member("__constructor__", &superclass); 

Index: testsuite/actionscript.all/Inheritance.as
===================================================================
RCS file: /sources/gnash/gnash/testsuite/actionscript.all/Inheritance.as,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -b -r1.34 -r1.35
--- testsuite/actionscript.all/Inheritance.as   16 Aug 2007 09:29:33 -0000      
1.34
+++ testsuite/actionscript.all/Inheritance.as   17 Aug 2007 03:21:47 -0000      
1.35
@@ -21,7 +21,7 @@
 // compile this test case with Ming makeswf, and then
 // execute it like this gnash -1 -r 0 -v out.swf
 
-rcsid="$Id: Inheritance.as,v 1.34 2007/08/16 09:29:33 zoulunkai Exp $";
+rcsid="$Id: Inheritance.as,v 1.35 2007/08/17 03:21:47 zoulunkai Exp $";
 
 #include "check.as"
 
@@ -264,7 +264,7 @@
 check_equals(typeof(DerivedClass1.prototype.constructor), 'function');
 check_equals(typeof(DerivedClass1.constructor), 'function');
 #if OUTPUT_VERSION >= 6
-xcheck(DerivedClass1.prototype.hasOwnProperty('__proto__'));
+check(DerivedClass1.prototype.hasOwnProperty('__proto__'));
 check(DerivedClass1.prototype.hasOwnProperty('__constructor__'));
 check(DerivedClass1.prototype.__proto__.hasOwnProperty('var1'));
 
@@ -273,12 +273,12 @@
 check_equals(DerivedClass1.var3, undefined);
 check(! DerivedClass1.prototype.hasOwnProperty('toString'));
 check(! DerivedClass1.prototype.hasOwnProperty('valueOf'));
-xcheck(! DerivedClass1.prototype.hasOwnProperty('constructor'));
+check(! DerivedClass1.prototype.hasOwnProperty('constructor'));
 check(DerivedClass1.hasOwnProperty('constructor'));
 #endif
 check_equals(DerivedClass1.constructor, Function);
 check_equals(DerivedClass1.prototype.__proto__.constructor, BaseClass1);
-//check_equals(DerivedClass1.prototype.constructor, BaseClass1);
+check_equals(DerivedClass1.prototype.__proto__, BaseClass1.prototype);
 
 DerivedClass1.prototype.var2 = "var_in_Derived_prototype";
 var obj = new DerivedClass1;