[Gnash-commit] gnash ChangeLog server/vm/ASHandlers.cpp testsu...

[Sandro Santilli]

CVSROOT:        /sources/gnash
Module name:    gnash
Changes by:     Sandro Santilli <strk>  06/11/27 01:01:55

Modified files:
        .              : ChangeLog 
        server/vm      : ASHandlers.cpp 
        testsuite/actionscript.all: MovieClip.as 

Log message:
                * server/vm/ASHandlers.cpp (ActionTypeOf):
                  return "movieclip" when object is a sprite_instance.
                * testsuite/actionscript.all/MovieClip.as:
                  typeof(mc) == "movieclip" succeeds.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.1778&r2=1.1779
http://cvs.savannah.gnu.org/viewcvs/gnash/server/vm/ASHandlers.cpp?cvsroot=gnash&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/gnash/testsuite/actionscript.all/MovieClip.as?cvsroot=gnash&r1=1.13&r2=1.14

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.1778
retrieving revision 1.1779
diff -u -b -r1.1778 -r1.1779
--- ChangeLog   27 Nov 2006 00:56:06 -0000      1.1778
+++ ChangeLog   27 Nov 2006 01:01:54 -0000      1.1779
@@ -1,5 +1,9 @@
 2006-11-26 Sandro Santilli <address@hidden>
 
+       * server/vm/ASHandlers.cpp (ActionTypeOf):
+         return "movieclip" when object is a sprite_instance.
+       * testsuite/actionscript.all/MovieClip.as:
+         typeof(mc) == "movieclip" succeeds.
        * testsuite/actionscript.all/: Object.as, XML.as:
          don't expect case-based failure.
        * server/as_object.{h,cpp}: added getVM() function,

Index: server/vm/ASHandlers.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/vm/ASHandlers.cpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- server/vm/ASHandlers.cpp    24 Nov 2006 22:09:02 -0000      1.2
+++ server/vm/ASHandlers.cpp    27 Nov 2006 01:01:54 -0000      1.3
@@ -16,7 +16,7 @@
 
 //
 
-/* $Id: ASHandlers.cpp,v 1.2 2006/11/24 22:09:02 strk Exp $ */
+/* $Id: ASHandlers.cpp,v 1.3 2006/11/27 01:01:54 strk Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -2259,6 +2259,10 @@
           env.top(0).set_string("boolean");
           break;
       case as_value::OBJECT:
+         // Should we have as_object expose a typeOf() method ?
+          if ( dynamic_cast<sprite_instance*>(env.top(0).to_object()) )
+              env.top(0).set_string("movieclip");
+         else
           env.top(0).set_string("object");
           break;
       case as_value::NULLTYPE:

Index: testsuite/actionscript.all/MovieClip.as
===================================================================
RCS file: /sources/gnash/gnash/testsuite/actionscript.all/MovieClip.as,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -b -r1.13 -r1.14
--- testsuite/actionscript.all/MovieClip.as     24 Nov 2006 13:33:21 -0000      
1.13
+++ testsuite/actionscript.all/MovieClip.as     27 Nov 2006 01:01:54 -0000      
1.14
@@ -22,13 +22,13 @@
 // compile this test case with Ming makeswf, and then
 // execute it like this gnash -1 -r 0 -v out.swf
 
-rcsid="$Id: MovieClip.as,v 1.13 2006/11/24 13:33:21 strk Exp $";
+rcsid="$Id: MovieClip.as,v 1.14 2006/11/27 01:01:54 strk Exp $";
 
 #include "check.as"
 
 // Get a reference to a MovieClip
 var mc = _root;
-xcheck(typeof(mc)=="movieclip");
+check(typeof(mc)=="movieclip");
 
 // Check some references
 check(this != undefined);