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

[Sandro Santilli]

CVSROOT:        /sources/gnash
Module name:    gnash
Changes by:     Sandro Santilli <strk>  06/10/24 14:37:12

Modified files:
        .              : ChangeLog 
        testsuite/actionscript.all: Inheritance.as Makefile.am 
Removed files:
        testsuite/actionscript.all: inheritance.as 

Log message:
        * testsuite/actionscript.all/: merged inheritance.as into Inheritance.as

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.1384&r2=1.1385
http://cvs.savannah.gnu.org/viewcvs/gnash/testsuite/actionscript.all/Inheritance.as?cvsroot=gnash&r1=1.6&r2=1.7
http://cvs.savannah.gnu.org/viewcvs/gnash/testsuite/actionscript.all/Makefile.am?cvsroot=gnash&r1=1.39&r2=1.40
http://cvs.savannah.gnu.org/viewcvs/gnash/testsuite/actionscript.all/inheritance.as?cvsroot=gnash&r1=1.2&r2=0

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.1384
retrieving revision 1.1385
diff -u -b -r1.1384 -r1.1385
--- ChangeLog   24 Oct 2006 14:36:25 -0000      1.1384
+++ ChangeLog   24 Oct 2006 14:37:12 -0000      1.1385
@@ -1,5 +1,7 @@
 2006-10-25 Sandro Santilli <address@hidden>
 
+       * testsuite/actionscript.all/: merged inheritance.as into
+         Inheritance.as
        * server/asobj/: Global.cpp, Makefile.am, Object.{cpp,h}:
          added Object class.
 

Index: testsuite/actionscript.all/Inheritance.as
===================================================================
RCS file: /sources/gnash/gnash/testsuite/actionscript.all/Inheritance.as,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -b -r1.6 -r1.7
--- testsuite/actionscript.all/Inheritance.as   15 Oct 2006 02:30:55 -0000      
1.6
+++ testsuite/actionscript.all/Inheritance.as   24 Oct 2006 14:37:12 -0000      
1.7
@@ -41,7 +41,7 @@
 // execute it like this gnash -1 -r 0 -v out.swf
 
 
-rcsid="$Id: Inheritance.as,v 1.6 2006/10/15 02:30:55 rsavoye Exp $";
+rcsid="$Id: Inheritance.as,v 1.7 2006/10/24 14:37:12 strk Exp $";
 
 #include "check.as"
 
@@ -122,4 +122,33 @@
 // Test the instanceOf operator
 check(subInstance instanceOf Sub);
 check(subInstance instanceOf Super);
-xcheck(subInstance instanceOf Object);
+check(subInstance instanceOf Object);
+
+
+/// THese have been moved here from inheritance.as
+var obj = new Object({a:1});
+
+xcheck_equals(obj.__proto__.constructor, Object);
+check(obj instanceOf Object);
+
+function SubObj1() {}
+var sobj1 = new SubObj1();
+
+check_equals(sobj1.__proto__.constructor, SubObj1);
+check(SubObj1 instanceOf Function);
+check(Function instanceOf Object);
+check(SubObj1 instanceOf Object);
+
+// inheritance chain is NOT subobj1,SubObj1,Function,Object, as the
+// above might suggest...
+xcheck(!sobj1 instanceOf Function);
+
+// but still, sobj1 is an instance of Object *and* SubObj1
+check(sobj1 instanceOf Object);
+check(sobj1 instanceOf SubObj1);
+
+check(SubObj1.prototype != undefined);
+check_equals(SubObj1.prototype.constructor, SubObj1);
+
+check_equals(SubObj1.prototype.constructor.__proto__.constructor, Function);
+

Index: testsuite/actionscript.all/Makefile.am
===================================================================
RCS file: /sources/gnash/gnash/testsuite/actionscript.all/Makefile.am,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -b -r1.39 -r1.40
--- testsuite/actionscript.all/Makefile.am      20 Oct 2006 09:12:00 -0000      
1.39
+++ testsuite/actionscript.all/Makefile.am      24 Oct 2006 14:37:12 -0000      
1.40
@@ -35,7 +35,7 @@
 # also makes it possible to release a modified version which carries
 # forward this exception.
 
-# $Id: Makefile.am,v 1.39 2006/10/20 09:12:00 strk Exp $
+# $Id: Makefile.am,v 1.40 2006/10/24 14:37:12 strk Exp $
 
 AUTOMAKE_OPTIONS = dejagnu
 
@@ -95,8 +95,7 @@
        XML.swf                 \
        XMLNode.swf             \
        Function.swf            \
-       with.swf                \
-       inheritance.swf
+       with.swf
 
 EXTRA_DIST = $(GENERATED:.swf=.as) \
        check.as \

Index: testsuite/actionscript.all/inheritance.as
===================================================================
RCS file: testsuite/actionscript.all/inheritance.as
diff -N testsuite/actionscript.all/inheritance.as
--- testsuite/actionscript.all/inheritance.as   15 Oct 2006 02:30:55 -0000      
1.2
+++ /dev/null   1 Jan 1970 00:00:00 -0000
@@ -1,72 +0,0 @@
-// 
-//   Copyright (C) 2005, 2006 Free Software Foundation, Inc.
-//
-// This program is free software; you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation; either version 2 of the License, or
-// (at your option) any later version.
-//
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-//
-// You should have received a copy of the GNU General Public License
-//
-// along with this program; if not, write to the Free Software
-// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
-//
-// Linking Gnash statically or dynamically with other modules is making a
-// combined work based on Gnash. Thus, the terms and conditions of the GNU
-// General Public License cover the whole combination.
-//
-// As a special exception, the copyright holders of Gnash give you
-// permission to combine Gnash with free software programs or libraries
-// that are released under the GNU LGPL and with code included in any
-// release of Talkback distributed by the Mozilla Foundation. You may
-// copy and distribute such a system following the terms of the GNU GPL
-// for all but the LGPL-covered parts and Talkback, and following the
-// LGPL for the LGPL-covered parts.
-//
-// Note that people who make modified versions of Gnash are not obligated
-// to grant this special exception for their modified versions; it is their
-// choice whether to do so. The GNU General Public License gives permission
-// to release a modified version without this exception; this exception
-// also makes it possible to release a modified version which carries
-// forward this exception.
-//
-//
-// Test case for Function ActionScript class
-// 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.2 2006/10/15 02:30:55 rsavoye Exp $";
-
-#include "check.as"
-
-var obj = new Object({a:1});
-
-xcheck_equals(obj.__proto__.constructor, Object);
-xcheck(obj instanceOf Object);
-
-function SubObj1() {}
-var sobj1 = new SubObj1();
-
-check_equals(sobj1.__proto__.constructor, SubObj1);
-check(SubObj1 instanceOf Function);
-xcheck(Function instanceOf Object);
-xcheck(SubObj1 instanceOf Object);
-
-// inheritance chain is NOT subobj1,SubObj1,Function,Object, as the
-// above might suggest...
-xcheck(!sobj1 instanceOf Function);
-
-// but still, sobj1 is an instance of Object *and* SubObj1
-xcheck(sobj1 instanceOf Object);
-check(sobj1 instanceOf SubObj1);
-
-check(SubObj1.prototype != undefined);
-check_equals(SubObj1.prototype.constructor, SubObj1);
-
-check_equals(SubObj1.prototype.constructor.__proto__.constructor, Function);
-