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

[Sandro Santilli]

CVSROOT:        /sources/gnash
Module name:    gnash
Changes by:     Sandro Santilli <strk>  07/08/25 16:10:38

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

Log message:
                * server/vm/ASHandlers.cpp (ActionNewLessThan): convert 
operands to
                  primitive value before proceeding.
                * testsuite/actionscript.all/ops.as: xcheck => check

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.4100&r2=1.4101
http://cvs.savannah.gnu.org/viewcvs/gnash/server/vm/ASHandlers.cpp?cvsroot=gnash&r1=1.126&r2=1.127
http://cvs.savannah.gnu.org/viewcvs/gnash/testsuite/actionscript.all/ops.as?cvsroot=gnash&r1=1.18&r2=1.19

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.4100
retrieving revision 1.4101
diff -u -b -r1.4100 -r1.4101
--- ChangeLog   25 Aug 2007 14:15:49 -0000      1.4100
+++ ChangeLog   25 Aug 2007 16:10:37 -0000      1.4101
@@ -1,5 +1,11 @@
 2007-08-25 Sandro Santilli <address@hidden>
 
+       * server/vm/ASHandlers.cpp (ActionNewLessThan): convert operands to
+         primitive value before proceeding.
+       * testsuite/actionscript.all/ops.as: xcheck => check
+
+2007-08-25 Sandro Santilli <address@hidden>
+
        * server/vm/ASHandlers.cpp (ActionNewAdd): convert operands to
          primitive value before proceeding.
        * server/as_value.h: make to_primitive() public

Index: server/vm/ASHandlers.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/vm/ASHandlers.cpp,v
retrieving revision 1.126
retrieving revision 1.127
diff -u -b -r1.126 -r1.127
--- server/vm/ASHandlers.cpp    25 Aug 2007 14:15:51 -0000      1.126
+++ server/vm/ASHandlers.cpp    25 Aug 2007 16:10:37 -0000      1.127
@@ -17,7 +17,7 @@
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 //
 
-/* $Id: ASHandlers.cpp,v 1.126 2007/08/25 14:15:51 strk Exp $ */
+/* $Id: ASHandlers.cpp,v 1.127 2007/08/25 16:10:37 strk Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -2805,8 +2805,11 @@
 
        thread.ensureStack(2);
 
-       as_value& operand1 = env.top(1);
-       as_value& operand2 = env.top(0);
+       as_value& op1_in = env.top(1);
+       as_value& op2_in = env.top(0);
+
+       as_value operand1 = op1_in.to_primitive(env);
+       as_value operand2 = op2_in.to_primitive(env);
 
        if ( operand1.is_string() && operand2.is_string() )
        {

Index: testsuite/actionscript.all/ops.as
===================================================================
RCS file: /sources/gnash/gnash/testsuite/actionscript.all/ops.as,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -b -r1.18 -r1.19
--- testsuite/actionscript.all/ops.as   25 Aug 2007 14:15:51 -0000      1.18
+++ testsuite/actionscript.all/ops.as   25 Aug 2007 16:10:37 -0000      1.19
@@ -20,7 +20,7 @@
  *  Test binary predicates (equal, less_then, greater_then, logical and 
bitwise ops)
  */
 
-rcsid="$Id: ops.as,v 1.18 2007/08/25 14:15:51 strk Exp $";
+rcsid="$Id: ops.as,v 1.19 2007/08/25 16:10:37 strk Exp $";
 
 #include "check.as"
 
@@ -110,11 +110,11 @@
 
 x=String("A");
 y=String("a");
-xcheck(x<y);
+check(x<y);
 
 x=String("abc");
 y=String("abcd");
-xcheck(x<y);
+check(x<y);
 
 x=0.999;
 y=String("1.000");