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

[Sandro Santilli]

CVSROOT:        /sources/gnash
Module name:    gnash
Changes by:     Sandro Santilli <strk>  07/11/21 21:57:52

Modified files:
        .              : ChangeLog 
        server/vm      : ASHandlers.cpp 
        testsuite/swfdec: PASSING 

Log message:
        ActionLessThen and ActionEqual return a number rather then a bool in 
swf4 or lower.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.4910&r2=1.4911
http://cvs.savannah.gnu.org/viewcvs/gnash/server/vm/ASHandlers.cpp?cvsroot=gnash&r1=1.156&r2=1.157
http://cvs.savannah.gnu.org/viewcvs/gnash/testsuite/swfdec/PASSING?cvsroot=gnash&r1=1.63&r2=1.64

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.4910
retrieving revision 1.4911
diff -u -b -r1.4910 -r1.4911
--- ChangeLog   21 Nov 2007 19:35:55 -0000      1.4910
+++ ChangeLog   21 Nov 2007 21:57:51 -0000      1.4911
@@ -1,5 +1,10 @@
 2007-11-21 Sandro Santilli <address@hidden>
 
+       * server/vm/ASHandlers.cpp (ActionLessThen, ActionEqual):
+         return a number rather then a bool in swf4 or lower.
+
+2007-11-21 Sandro Santilli <address@hidden>
+
        * testsuite/misc-swfc.all/swf4opcode.sc: found a way for better
          test result reporting (can be improved to become a full SWF4
          compatible Dejagnu thing - lacks actual result message so far).

Index: server/vm/ASHandlers.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/vm/ASHandlers.cpp,v
retrieving revision 1.156
retrieving revision 1.157
diff -u -b -r1.156 -r1.157
--- server/vm/ASHandlers.cpp    20 Nov 2007 16:31:58 -0000      1.156
+++ server/vm/ASHandlers.cpp    21 Nov 2007 21:57:51 -0000      1.157
@@ -17,7 +17,7 @@
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 //
 
-/* $Id: ASHandlers.cpp,v 1.156 2007/11/20 16:31:58 bjacques Exp $ */
+/* $Id: ASHandlers.cpp,v 1.157 2007/11/21 21:57:51 strk Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -801,9 +801,7 @@
     env.top(1).set_bool(op1.to_number() == op2.to_number());
 
     // Flash4 used 1 and 0 as return from this tag
-    if ( env.get_version() < 5 ) {
-      env.top(1).to_number();
-    }
+    if ( env.get_version() < 5 ) env.top(1).convert_to_number();
 
     env.drop(1);
 }
@@ -815,6 +813,10 @@
     as_environment& env = thread.env;
     thread.ensureStack(2);
     env.top(1).set_bool(env.top(1).to_number() < env.top(0).to_number());
+
+    // Flash4 used 1 and 0 as return from this tag
+    if ( env.get_version() < 5 ) env.top(1).convert_to_number();
+
     env.drop(1);
 }
 

Index: testsuite/swfdec/PASSING
===================================================================
RCS file: /sources/gnash/gnash/testsuite/swfdec/PASSING,v
retrieving revision 1.63
retrieving revision 1.64
diff -u -b -r1.63 -r1.64
--- testsuite/swfdec/PASSING    17 Nov 2007 11:50:35 -0000      1.63
+++ testsuite/swfdec/PASSING    21 Nov 2007 21:57:51 -0000      1.64
@@ -64,6 +64,7 @@
 color-setTransform-empty.swf:2a72a5273ab8713ee289ff1726b0959c
 color-setTransform-negative.swf:0bc0510c35fc5c82de31b0db887fe535
 color1.swf:3cc52a41193d342cfdfaeffe56edc3db
+comparisons-4.swf:e0bb89e492f3f35e51b1beb190935a14
 comparisons-5.swf:d4dfeb4ec80ec1f5a7390eb699e269ee
 comparisons-6.swf:5a7bf1ffb3a4dd23828d6e180f1871b0
 comparisons-7.swf:2e53fca820ad47ebb1bfef696f61527a