[Gnash-commit] gnash ChangeLog server/sprite_instance.cpp test...

[Sandro Santilli]

CVSROOT:        /sources/gnash
Module name:    gnash
Changes by:     Sandro Santilli <strk>  06/12/13 21:03:57

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

Log message:
                * server/sprite_instance.cpp (sprite_create_empty_movieclip):
                  accept more then 2 args, just discarding the one in excess.
                * testsuite/actionscript.all/MovieClip.as: don't expect
                  failures when createEmptyMovieClip is called with more then
                  2 args.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.1936&r2=1.1937
http://cvs.savannah.gnu.org/viewcvs/gnash/server/sprite_instance.cpp?cvsroot=gnash&r1=1.106&r2=1.107
http://cvs.savannah.gnu.org/viewcvs/gnash/testsuite/actionscript.all/MovieClip.as?cvsroot=gnash&r1=1.22&r2=1.23

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.1936
retrieving revision 1.1937
diff -u -b -r1.1936 -r1.1937
--- ChangeLog   13 Dec 2006 15:15:07 -0000      1.1936
+++ ChangeLog   13 Dec 2006 21:03:56 -0000      1.1937
@@ -1,5 +1,13 @@
 2006-12-13 Sandro Santilli <address@hidden>
 
+       * server/sprite_instance.cpp (sprite_create_empty_movieclip):
+         accept more then 2 args, just discarding the one in excess.
+       * testsuite/actionscript.all/MovieClip.as: don't expect
+         failures when createEmptyMovieClip is called with more then
+         2 args.
+
+2006-12-13 Sandro Santilli <address@hidden>
+
        * testsuite/Makefile.am: don't attempt to build Dejagnu.swf
          if Ming isn't enabled.
        * testsuite/actionscript.all/Makefile.am: don't attempt

Index: server/sprite_instance.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/sprite_instance.cpp,v
retrieving revision 1.106
retrieving revision 1.107
diff -u -b -r1.106 -r1.107
--- server/sprite_instance.cpp  13 Dec 2006 09:38:16 -0000      1.106
+++ server/sprite_instance.cpp  13 Dec 2006 21:03:56 -0000      1.107
@@ -231,9 +231,27 @@
 
        if (fn.nargs != 2)
        {
-           log_error("createEmptyMovieClip needs 2 args\n");
+               if (fn.nargs < 2)
+               {
+                       IF_VERBOSE_ASCODING_ERRORS(
+                               log_warning("createEmptyMovieClip needs "
+                                       "2 args, but %d given,"
+                                       " returning undefined.",
+                                       fn.nargs);
+                       );
+                       fn.result->set_undefined();
            return;
        }
+               else
+               {
+                       IF_VERBOSE_ASCODING_ERRORS(
+                               log_warning("createEmptyMovieClip takes "
+                                       "2 args, but %d given, discarding"
+                                       " the one in excess.",
+                                       fn.nargs);
+                       )
+               }
+       }
 
        character* ch = sprite->add_empty_movieclip(fn.arg(0).to_string(), 
int(fn.arg(1).to_number()));
        fn.result->set_as_object(ch);

Index: testsuite/actionscript.all/MovieClip.as
===================================================================
RCS file: /sources/gnash/gnash/testsuite/actionscript.all/MovieClip.as,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -b -r1.22 -r1.23
--- testsuite/actionscript.all/MovieClip.as     12 Dec 2006 19:46:18 -0000      
1.22
+++ testsuite/actionscript.all/MovieClip.as     13 Dec 2006 21:03:57 -0000      
1.23
@@ -22,7 +22,7 @@
 // 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.22 2006/12/12 19:46:18 strk Exp $";
+rcsid="$Id: MovieClip.as,v 1.23 2006/12/13 21:03:57 strk Exp $";
 
 #include "check.as"
 
@@ -211,11 +211,11 @@
 #if OUTPUT_VERSION >= 6
 // Test movieclip creation
 var mc2 = createEmptyMovieClip("mc2_mc", 50, 0, 0, 0);
-xcheck(mc2 != undefined);
-xcheck_equals(mc2_mc.getBytesLoaded(), 0);
-xcheck_equals(mc2_mc.getBytesTotal(), 0);
-xcheck_equals(mc2.getBytesLoaded(), 0);
-xcheck_equals(mc2.getBytesTotal(), 0);
+check(mc2 != undefined);
+check_equals(mc2_mc.getBytesLoaded(), 0);
+check_equals(mc2_mc.getBytesTotal(), 0);
+check_equals(mc2.getBytesLoaded(), 0);
+check_equals(mc2.getBytesTotal(), 0);
 
 var mc3 = createEmptyMovieClip("mc3_mc", 50);
 check(mc3 != undefined);