[Gnash-commit] gnash ChangeLog server/as_value.cpp testsuite/a...

[Sandro Santilli]

CVSROOT:        /sources/gnash
Module name:    gnash
Changes by:     Sandro Santilli <strk>  07/11/15 19:41:34

Modified files:
        .              : ChangeLog 
        server         : as_value.cpp 
        testsuite/actionscript.all: MovieClip.as 
        testsuite/swfdec: PASSING 

Log message:
        as_value::to_string returns the empty string for dangling MOVIECLIP 
types.
        dangling-print-{6,7,8}.swf from swfdec testsuite succeed, added other
        tests for it in actionscript.all/MovieClip.as

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.4869&r2=1.4870
http://cvs.savannah.gnu.org/viewcvs/gnash/server/as_value.cpp?cvsroot=gnash&r1=1.93&r2=1.94
http://cvs.savannah.gnu.org/viewcvs/gnash/testsuite/actionscript.all/MovieClip.as?cvsroot=gnash&r1=1.98&r2=1.99
http://cvs.savannah.gnu.org/viewcvs/gnash/testsuite/swfdec/PASSING?cvsroot=gnash&r1=1.58&r2=1.59

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.4869
retrieving revision 1.4870
diff -u -b -r1.4869 -r1.4870
--- ChangeLog   15 Nov 2007 16:57:23 -0000      1.4869
+++ ChangeLog   15 Nov 2007 19:41:33 -0000      1.4870
@@ -1,5 +1,13 @@
 2007-11-15 Sandro Santilli <address@hidden>
 
+       * server/as_value.cpp (to_string): for MOVIECLIP types return
+         the empty string when dangling.
+       * testsuite/actionscript.all/MovieClip.as: add test for convertion
+         of dangling movieclip values to a string.
+       * testsuite/swfdec/PASSING: dangling-print-{6,7,8}.swf succeed now.
+
+2007-11-15 Sandro Santilli <address@hidden>
+
        * server/sprite_instance.cpp: construct instance on CONSTRUCT
          event (not INITIALIZE). YouTube works, and we push all init
          actions now.

Index: server/as_value.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/as_value.cpp,v
retrieving revision 1.93
retrieving revision 1.94
diff -u -b -r1.93 -r1.94
--- server/as_value.cpp 8 Nov 2007 15:03:58 -0000       1.93
+++ server/as_value.cpp 15 Nov 2007 19:41:34 -0000      1.94
@@ -87,7 +87,15 @@
 
                case MOVIECLIP:
                {
-                       return getSpriteProxy().getTarget();
+                       const SpriteProxy& sp = getSpriteProxy();
+                       if ( sp.isDangling() )
+                       {
+                               return "";
+                       }
+                       else
+                       {
+                               return sp.getTarget();
+                       }
                }
 
                case NUMBER:

Index: testsuite/actionscript.all/MovieClip.as
===================================================================
RCS file: /sources/gnash/gnash/testsuite/actionscript.all/MovieClip.as,v
retrieving revision 1.98
retrieving revision 1.99
diff -u -b -r1.98 -r1.99
--- testsuite/actionscript.all/MovieClip.as     25 Oct 2007 17:07:57 -0000      
1.98
+++ testsuite/actionscript.all/MovieClip.as     15 Nov 2007 19:41:34 -0000      
1.99
@@ -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: MovieClip.as,v 1.98 2007/10/25 17:07:57 strk Exp $";
+rcsid="$Id: MovieClip.as,v 1.99 2007/11/15 19:41:34 strk Exp $";
 
 #include "check.as"
 
@@ -511,6 +511,7 @@
 check_equals(typeof(softref3child), 'movieclip');
 check_equals(typeof(softref.member), 'undefined');
 check_equals(typeof(softref._target), 'undefined');
+check_equals("x"+softref, 'x');
 check_equals(softref2.member, 2);
 check_equals(softref2._target, '/hardref2');
 check_equals(softref3.member, 3);
@@ -1266,12 +1267,12 @@
  check_totals(158); // SWF5
 #else
 #if OUTPUT_VERSION < 7
- check_totals(503); // SWF6
+ check_totals(504); // SWF6
 #else
 #if OUTPUT_VERSION < 8
- check_totals(520); // SWF7
+ check_totals(521); // SWF7
 #else
- check_totals(521); // SWF8+
+ check_totals(522); // SWF8+
 #endif
 #endif
 #endif

Index: testsuite/swfdec/PASSING
===================================================================
RCS file: /sources/gnash/gnash/testsuite/swfdec/PASSING,v
retrieving revision 1.58
retrieving revision 1.59
diff -u -b -r1.58 -r1.59
--- testsuite/swfdec/PASSING    15 Nov 2007 16:57:24 -0000      1.58
+++ testsuite/swfdec/PASSING    15 Nov 2007 19:41:34 -0000      1.59
@@ -88,6 +88,9 @@
 dangling-compare-7.swf:24d431c7f3c88cb2aa0a5403a07f86cf
 dangling-compare-8.swf:e7fbd5ecb9fd775c7cf9fe8e1a6a1a3f
 dangling-print-5.swf:855e5915af40cccf07caceb3a61336c1
+dangling-print-6.swf:9c079b270d7ce76fbb1f0209a01de3c6
+dangling-print-7.swf:5338574e04b055fe168b443a5ca1da98
+dangling-print-8.swf:3a8af45c5348dd5da7417b75d7aef8c6
 definefunction-target-5.swf:9c305491a9b6c379938c607f246ea268
 definefunction-target-6.swf:ef3eab96ea46f557056b61c3ddd5fc2a
 definefunction-target-7.swf:f6517c6aa11a3d99ef3ae7f88ed91748